diff --git a/ptbposter/ptbposter-new-engines.clo b/ptbposter/ptbposter-new-engines.clo index fd724e525bd714f7c49b5cb0513d3c3bc30f60c2..fe3dc9ab263fdc199eadd5fdbc10a57f77d76e63 100644 --- a/ptbposter/ptbposter-new-engines.clo +++ b/ptbposter/ptbposter-new-engines.clo @@ -1,39 +1,55 @@ % Rolf Niepraschk, Rolf.Niepraschk@ptb.de \ProvidesFile{ptbposter-new-engines.clo}% - [2020/03/09 v0.1f `PTB-Poster' new engines (RN/PTB)] + [2022/09/08 v0.1g `PTB-Poster' new engines (RN/PTB)] \RequirePackage{unicode-math} -\setmainfont{texgyrepagella}[ - Ligatures=TeX, - Extension=.otf, - UprightFont=*-regular, - BoldFont=*-bold, - ItalicFont=*-italic, - BoldItalicFont=*-bolditalic] -\setmonofont{AnonymousPro-Regular}[% - Extension = .ttf, - BoldFont = AnonymousPro-Bold, - ItalicFont = AnonymousPro-Italic, - BoldItalicFont = AnonymousPro-BoldItalic, - Scale = MatchLowercase] - -\setmathfont{texgyrepagella-math.otf}[math-style=ISO,bold-style=ISO] - -\unimathsetup{partial=upright}%TODO: fira-math \makeatletter % wegen Laden aus normalem LaTeX-Dokument \@ifundefined{ifSERIF}{% \newif\ifSERIF \SERIFfalse }{} +\@ifundefined{ifMATHSERIF}{% + \newif\ifMATHSERIF \MATHSERIFfalse +}{} -\ifSERIF\else +\ifSERIF + \setmainfont{texgyrepagella}[ + Ligatures=TeX, + Extension=.otf, + UprightFont=*-regular, + BoldFont=*-bold, + ItalicFont=*-italic, + BoldItalicFont=*-bolditalic] +\else + \setmainfont{texgyreheros}[ + Ligatures=TeX, + Extension=.otf, + UprightFont=*-regular, + BoldFont=*-bold, + ItalicFont=*-italic, + BoldItalicFont=*-bolditalic] + \renewcommand*\familydefault{\sfdefault}% ??? +\fi +\ifMATHSERIF + \setmathfont{texgyrepagella-math.otf}[ + math-style=TeX, + bold-style=TeX, + ] +\else \RequirePackage[usefilenames,weight=Regular]{firamath-otf} - \setmathfont[range=it]{texgyreheros-italic.otf} - \setoperatorfont\mathsf - \renewcommand*\familydefault{\sfdefault} + \setoperatorfont\mathsf + \unimathsetup{partial=upright}% + %\setmathfont{texgyreheros-italic.otf}[range=it] \fi +\setmonofont{AnonymousPro-Regular}[% + Extension = .ttf, + BoldFont = AnonymousPro-Bold, + ItalicFont = AnonymousPro-Italic, + BoldItalicFont = AnonymousPro-BoldItalic, + Scale = MatchLowercase] + \RequirePackage{newunicodechar} \newunicodechar{^^^^202f}{\,}% 'NARROW NO-BREAK SPACE' (\u202F, 8239) \newunicodechar{^^^^2009}{\,\hspace{0pt}}% 'THIN SPACE' diff --git a/ptbposter/ptbposter.cls b/ptbposter/ptbposter.cls index 32e03f242239ad6096af803c0229a71ab6878118..958f4a079c47810663c49acef4c8d6e91c549829 100644 --- a/ptbposter/ptbposter.cls +++ b/ptbposter/ptbposter.cls @@ -49,6 +49,7 @@ \newif\ifPTBlandscape \PTBlandscapefalse \newif\ifPTB@XeOrLua \PTB@XeOrLuafalse \newif\ifSERIF \SERIFfalse +\newif\ifMATHSERIF \MATHSERIFfalse \newif\ifPTB@logo@long@ \PTB@logo@long@true \RequirePackage{ifluatex,ifxetex} @@ -69,6 +70,12 @@ \DeclareOption{serif}{% \SERIFtrue } +\DeclareOption{mathsanserif}{% + \MATHSERIFfalse +} +\DeclareOption{mathserif}{% + \MATHSERIFtrue +} \DeclareOption{boldTitle}{% \global\let\PTB@title@series=\bfseries }