Skip to content
Snippets Groups Projects
Commit f802a3d7 authored by Tereza Vrabcová's avatar Tereza Vrabcová
Browse files

Merge branch 'feature/neuehaas-option' into 'master'

Added `neuehaas` and `noneuehaas` options

See merge request !32
parents 9195f6ba f8ce6add
No related branches found
No related tags found
1 merge request!32Added `neuehaas` and `noneuehaas` options
Pipeline #
...@@ -24,6 +24,10 @@ ...@@ -24,6 +24,10 @@
nosansbold, %% The `nosansbold` option prevents the use of the nosansbold, %% The `nosansbold` option prevents the use of the
%% sans-serif type face for bold text. Replace with %% sans-serif type face for bold text. Replace with
%% `sansbold` to use sans-serif type face for bold text. %% `sansbold` to use sans-serif type face for bold text.
noneuehaas, %% The `noneuehaas` option prevents the use of the
%% sans-serif font family Neue Haas (TeX Gyre Heros) as
%% the main sans-serif font. Replace with `neuehaas` to
%% use the Neue Haas as the main sans-serif font.
%</fi> %</fi>
%<*econ,fsps,fss,law,med,ped,phil,sci,pharm> %<*econ,fsps,fss,law,med,ped,phil,sci,pharm>
twoside, %% The `twoside` option enables double-sided typesetting. twoside, %% The `twoside` option enables double-sided typesetting.
......
...@@ -65,6 +65,22 @@ ...@@ -65,6 +65,22 @@
\DeclareOption{palatino}{\thesis@palatino@true} \DeclareOption{palatino}{\thesis@palatino@true}
\DeclareOption{nopalatino}{\thesis@palatino@false} \DeclareOption{nopalatino}{\thesis@palatino@false}
% \end{macrocode} % \end{macrocode}
% \item\texttt{neuehaas}, \texttt{noneuehaas} -- The sans serif
% text font family is going to be either set to Neue Haas
% (TeX Gyre Heros) or left untouched, respectively. The
% \DescribeMacro{\ifthesis@neuehaas@}|\ifthesis@|^^A
% \discretionary{}{}{}|neuehaas@| conditional is set to either
% \texttt{true} or \texttt{false}, respectively. The Neue Haas
% font is a sans serif font chosen to represent the Masaryk
% University in Brno as per its Graphic manual.
% \changes{v1.0.3}{2022/08/15}{^^A
% Added the \texttt{neuehas} and \texttt{noneuehaas} package options
% for the Masaryk University in Brno. [TV]}
% \begin{macrocode}
\newif\ifthesis@neuehaas@
\DeclareOption{neuehaas}{\thesis@neuehaas@true}
\DeclareOption{noneuehaas}{\thesis@neuehaas@false}
% \end{macrocode}
% \item\texttt{color}, \texttt{monochrome} -- Certain % \item\texttt{color}, \texttt{monochrome} -- Certain
% typographical elements either are or aren't going to be % typographical elements either are or aren't going to be
% typeset in color, respectively. The % typeset in color, respectively. The
...@@ -185,7 +201,7 @@ ...@@ -185,7 +201,7 @@
% for the Masaryk University in Brno. [VN]} % for the Masaryk University in Brno. [VN]}
% \begin{macrocode} % \begin{macrocode}
\ExecuteOptions{% \ExecuteOptions{%
printed,12pt,twoside,final,microtype,sansbold,palatino,oldtable,lot,lof} printed,12pt,twoside,final,microtype,sansbold,palatino,neuehaas,oldtable,lot,lof}
\ProcessOptions* \ProcessOptions*
% \end{macrocode} % \end{macrocode}
% The file uses English locale strings within the macros. % The file uses English locale strings within the macros.
...@@ -276,19 +292,26 @@ ...@@ -276,19 +292,26 @@
% \changes{v1.0.0}{2018/11/18}{^^A % \changes{v1.0.0}{2018/11/18}{^^A
% The \TeX{} Gyre Heros is used as the main sans serif font % The \TeX{} Gyre Heros is used as the main sans serif font
% instead of Latin Modern. [VN]} % instead of Latin Modern. [VN]}
% \changes{v1.0.3}{2022/08/15}{^^A
% Added the \texttt{neuehas} and \texttt{noneuehaas} package options
% for the Masaryk University in Brno. [TV]}
% \begin{macrocode} % \begin{macrocode}
\ifthesis@xeluatex \ifthesis@xeluatex
\ifthesis@palatino@ \ifthesis@palatino@
\thesis@require{fontspec} \thesis@require{fontspec}
\thesis@require{unicode-math} \thesis@require{unicode-math}
\setmainfont[Ligatures=TeX]{TeX Gyre Pagella} \setmainfont[Ligatures=TeX]{TeX Gyre Pagella}
\setsansfont[Ligatures=TeX,Scale=MatchLowercase]{TeX Gyre Heros}
\setmathfont[math-style=ISO,bold-style=ISO]{texgyrepagella-math.otf} \setmathfont[math-style=ISO,bold-style=ISO]{texgyrepagella-math.otf}
\fi \fi
\ifthesis@neuehaas@
\thesis@require{fontspec}
\setsansfont[Ligatures=TeX,Scale=MatchLowercase]{TeX Gyre Heros}
\fi
% \end{macrocode} % \end{macrocode}
% The following packages get only loaded, when the document is not % The following packages get only loaded, when the document is not
% being typeset using the \Hologo{XeTeX} or \Hologo{LuaTeX} engine % being typeset using the \Hologo{XeTeX} or \Hologo{LuaTeX} engine,
% and the |\ifthesis@palatino@| conditional is \texttt{true}: % the |\ifthesis@palatino@| conditional is \texttt{true}, and the
% |\ifthesis@neuehaas@| conditional is \texttt{true}:
% \begin{itemize} % \begin{itemize}
% \item\textsf{cmap} -- Places an explicit \texttt{ToUnicode} % \item\textsf{cmap} -- Places an explicit \texttt{ToUnicode}
% map in the resulting PDF file, allowing for the extraction of % map in the resulting PDF file, allowing for the extraction of
...@@ -314,6 +337,9 @@ ...@@ -314,6 +337,9 @@
\thesis@require{lmodern} \thesis@require{lmodern}
\thesis@require{mathpazo} \thesis@require{mathpazo}
\thesis@require{tgpagella} \thesis@require{tgpagella}
\RequirePackage[T1]{fontenc}
\fi
\ifthesis@neuehaas@
\thesis@require[scale=0.863]{tgheros} \thesis@require[scale=0.863]{tgheros}
\RequirePackage[T1]{fontenc} \RequirePackage[T1]{fontenc}
\fi \fi
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment