From 70dd7f1e202296528e40f09a80ecd11a6ce29db0 Mon Sep 17 00:00:00 2001 From: Sébastien Dailly Date: Sun, 5 May 2024 17:17:02 +0200 Subject: Updated the resources --- common/10_fonts.tex | 11 +++++++++++ model_1/resources/10_fonts.tex | 8 ++------ model_2/resources/10_fonts.tex | 11 ++++------- model_3/resources/10_fonts.tex | 7 ++++--- model_4/resources/10_fonts.tex | 8 ++------ model_6/resources/10_fonts.tex | 15 ++++++--------- model_6/resources/CaviarDreams.ttf | Bin 58864 -> 0 bytes model_8/resources/10-fonts.tex | 8 +------- 8 files changed, 30 insertions(+), 38 deletions(-) create mode 100644 common/10_fonts.tex delete mode 100644 model_6/resources/CaviarDreams.ttf diff --git a/common/10_fonts.tex b/common/10_fonts.tex new file mode 100644 index 0000000..17df6e1 --- /dev/null +++ b/common/10_fonts.tex @@ -0,0 +1,11 @@ +\usepackage{fontspec} + +\newfontfamily\CaviarDreamsFont{CaviarDreams} + [ Path=../fonts/ + , BoldFont = *_Bold, + , Mapping=tex-text + ] + +\newfontfamily\LibertineFont{Linux Libertine O} + [ Mapping=tex-text + ] diff --git a/model_1/resources/10_fonts.tex b/model_1/resources/10_fonts.tex index 24f6cfc..5455f8a 100755 --- a/model_1/resources/10_fonts.tex +++ b/model_1/resources/10_fonts.tex @@ -1,15 +1,12 @@ \usepackage{fontspec} \defaultfontfeatures{Ligatures={Common, Required, Contextual}} \setmainfont{EB Garamond} + [ BoldFont = {Linux Libertine O Bold}] \newcommand{\DUtitletitle}[1]{% {\begin{center}\textbf{\textsc{#1}}\end{center}} } -% Change the font for bold text -\let\bf\textbf -\renewcommand{\textbf}[1]{{\AltFont\selectfont\bf{#1}}} - \setmonofont{Latin Modern Mono Light} \newfontfamily\EBGaramond {EB Garamond} @@ -25,5 +22,4 @@ , Historic } ] \newfontfamily\AltFont[Mapping=tex-text]{Linux Libertine O} -\newfontfamily\CaviarDreamsFont[Path=../fonts/, Mapping=tex-text]{CaviarDreams} -\newfontfamily\CaviarDreamsBoldFont[Path=../fonts/, Mapping=tex-text]{CaviarDreams_Bold} +\input{../common/10_fonts.tex} diff --git a/model_2/resources/10_fonts.tex b/model_2/resources/10_fonts.tex index 928f801..7d98468 100755 --- a/model_2/resources/10_fonts.tex +++ b/model_2/resources/10_fonts.tex @@ -1,17 +1,14 @@ \usepackage{fontspec} + \defaultfontfeatures{Ligatures={Common, Required, Contextual}} \setmainfont{EB Garamond} - -% Change the font for bold text -\let\bf\textbf -\renewcommand{\textbf}[1]{{\AltFont\selectfont\bf{#1}}} + [ BoldFont = {Linux Libertine O Bold}] \setmonofont{Latin Modern Mono Light} + \newfontfamily\EBLigatures{EB Garamond}[ Mapping=tex-text, Ligatures={Common, Required, Contextual, Historic} ] \newfontfamily\AltFont[Mapping=tex-text]{Linux Libertine O} -\newfontfamily\CaviarDreamsFont[Path=../fonts/, Mapping=tex-text]{CaviarDreams} -\newfontfamily\CaviarDreamsBoldFont[Path=../fonts/, Mapping=tex-text]{CaviarDreams_Bold} - +\input{../common/10_fonts.tex} diff --git a/model_3/resources/10_fonts.tex b/model_3/resources/10_fonts.tex index d437a25..7c05521 100755 --- a/model_3/resources/10_fonts.tex +++ b/model_3/resources/10_fonts.tex @@ -1,3 +1,5 @@ +\usepackage{fontspec} + \newfontfamily\EBGaramond{EB Garamond}[ Mapping=tex-text, Ligatures={Common, Required, Contextual} @@ -7,12 +9,11 @@ Ligatures={Common, Required, Contextual, Historic} ] \newfontfamily\AltFont[Mapping=tex-text]{Linux Libertine O} -\newfontfamily\CaviarDreamsFont[Path=../fonts/, Mapping=tex-text]{CaviarDreams} -\newfontfamily\CaviarDreamsBoldFont[Path=../fonts/, Mapping=tex-text]{CaviarDreams_Bold} -\usepackage{fontspec} \setmainfont{Quicksand-Light}[ Path=../fonts/, BoldFont = Quicksand-Medium] \setmonofont{Latin Modern Mono Light} + +\input{../common/10_fonts.tex} diff --git a/model_4/resources/10_fonts.tex b/model_4/resources/10_fonts.tex index 424bb0e..e8014fb 100755 --- a/model_4/resources/10_fonts.tex +++ b/model_4/resources/10_fonts.tex @@ -1,15 +1,11 @@ \usepackage{fontspec} \newfontfamily\AltFont[Mapping=tex-text]{Linux Libertine O} -\newfontfamily\CaviarDreamsFont[Path=../fonts/, Mapping=tex-text]{CaviarDreams} -\newfontfamily\CaviarDreamsBoldFont[Path=../fonts/, Mapping=tex-text]{CaviarDreams_Bold} \newfontfamily\BeatrixFont[Path=../fonts/,Mapping=tex-text]{Beatrix} \defaultfontfeatures{Ligatures={Common, Required, Contextual}} \setmainfont{EB Garamond} - -% Change the font for bold text -\let\bf\textbf -\renewcommand{\textbf}[1]{{\AltFont\selectfont\bf{#1}}} + [ BoldFont = {Linux Libertine O Bold}] \setmonofont{Latin Modern Mono Light} +\input{../common/10_fonts.tex} diff --git a/model_6/resources/10_fonts.tex b/model_6/resources/10_fonts.tex index 0dc179e..84eb7a0 100755 --- a/model_6/resources/10_fonts.tex +++ b/model_6/resources/10_fonts.tex @@ -1,14 +1,11 @@ \usepackage{fontspec} -\setmainfont[Mapping=tex-text]{EB Garamond} - -% Set the bold font as Linux Libertine as the EB Garamond miss some characters -\newfontfamily\LibertineFont[Mapping=tex-text]{Linux Libertine O} -\let\bf\textbf -\renewcommand{\textbf}[1]{{\LibertineFont\selectfont\bf{#1}}} +\setmainfont{EB Garamond} + [ BoldFont = {Linux Libertine O Bold} + , Mapping=tex-text + ] \setmonofont{Latin Modern Mono Light} -\newfontfamily\TitleFont[Path=resources/, Mapping=tex-text]{CaviarDreams} -\newfontfamily\CaviarDreamsFont[Path=resources/, Mapping=tex-text]{CaviarDreams} +\newfontfamily\TitleFont[Path=../fonts/, Mapping=tex-text]{CaviarDreams} -%\newfontfamily\AltFont[Mapping=tex-text]{Linux Libertine O} +\input{../common/10_fonts.tex} diff --git a/model_6/resources/CaviarDreams.ttf b/model_6/resources/CaviarDreams.ttf deleted file mode 100644 index 4ba4279..0000000 Binary files a/model_6/resources/CaviarDreams.ttf and /dev/null differ diff --git a/model_8/resources/10-fonts.tex b/model_8/resources/10-fonts.tex index fab8755..bf1a23a 100644 --- a/model_8/resources/10-fonts.tex +++ b/model_8/resources/10-fonts.tex @@ -1,10 +1,4 @@ \usepackage{fontspec} \setmainfont[Mapping=tex-text]{Linux Libertine O} - -\newfontfamily\LibertineFont[Mapping=tex-text]{Linux Libertine O} -\newfontfamily\CaviarDreamsFont{CaviarDreams} - [ Path=../fonts/ - , BoldFont = *_Bold, - , Mapping=tex-text - ] +\input{../common/10_fonts.tex} -- cgit v1.2.3