From 62504abca77aa8d7b5e7fb1b323702dcced86b44 Mon Sep 17 00:00:00 2001 From: Rolf Niepraschk <Rolf.Niepraschk@ptb.de> Date: Mon, 24 Feb 2020 10:21:21 +0100 Subject: [PATCH] \ifSERIF, "arc" geringer --- ptbposter/ptbposter-new-engines.clo | 9 +++++++-- ptbposter/ptbposter-old-engines.clo | 7 ++++++- ptbposter/ptbposter-tcb.sty | 6 +++--- ptbposter/ptbposter.cls | 6 +++--- 4 files changed, 19 insertions(+), 9 deletions(-) diff --git a/ptbposter/ptbposter-new-engines.clo b/ptbposter/ptbposter-new-engines.clo index 7f814fa..2dc9a67 100644 --- a/ptbposter/ptbposter-new-engines.clo +++ b/ptbposter/ptbposter-new-engines.clo @@ -28,9 +28,14 @@ \setmathfont{texgyrepagella-math.otf}[math-style=ISO,bold-style=ISO] \let\sffamily=\PTBdesignFont -\unimathsetup{partial=upright} +\unimathsetup{partial=upright} -\ifPTB@serif\else +\makeatletter % wegen Laden aus normalem LaTeX-Dokument +\@ifundefined{ifSERIF}{% + \newif\ifSERIF \SERIFfalse +}{} + +\ifSERIF\else \RequirePackage[usefilenames,weight=Regular]{firamath-otf} \setmathfont[range=it]{texgyreheros-italic.otf} \setoperatorfont\mathsf diff --git a/ptbposter/ptbposter-old-engines.clo b/ptbposter/ptbposter-old-engines.clo index 3c0f16c..6121fb4 100644 --- a/ptbposter/ptbposter-old-engines.clo +++ b/ptbposter/ptbposter-old-engines.clo @@ -11,7 +11,12 @@ \let\PTBdesignFont=\sffamily \RequirePackage[ttdefault=true,scale=1.034]{AnonymousPro} -\ifPTB@serif +\makeatletter % wegen Laden aus normalem LaTeX-Dokument +\@ifundefined{ifSERIF}{% + \newif\ifSERIF \SERIFfalse +}{} + +\ifSERIF \RequirePackage{qpxmath} \else %%%\renewcommand*\familydefault{\sfdefault} diff --git a/ptbposter/ptbposter-tcb.sty b/ptbposter/ptbposter-tcb.sty index c092a53..29ffe49 100644 --- a/ptbposter/ptbposter-tcb.sty +++ b/ptbposter/ptbposter-tcb.sty @@ -21,11 +21,11 @@ \ifcase \PTB@boxlayout % 0 - \g@addto@macro\PTB@boxesSet{enhanced jigsaw,sharp corners=downhill,} + \g@addto@macro\PTB@boxesSet{enhanced jigsaw,sharp corners=downhill,arc=.8ex} \or % 1 - \g@addto@macro\PTB@boxesSet{enhanced jigsaw,sharp corners=uphill,} + \g@addto@macro\PTB@boxesSet{enhanced jigsaw,sharp corners=uphill,arc=.8ex} \or % 2 - \g@addto@macro\PTB@boxesSet{enhanced jigsaw,} + \g@addto@macro\PTB@boxesSet{enhanced jigsaw,arc=.8ex} \or % 3 \g@addto@macro\PTB@boxesSet{arc=0pt} \fi diff --git a/ptbposter/ptbposter.cls b/ptbposter/ptbposter.cls index 6b6cb83..d08c21e 100644 --- a/ptbposter/ptbposter.cls +++ b/ptbposter/ptbposter.cls @@ -45,7 +45,7 @@ \newif\ifPTBlandscape \PTBlandscapefalse \newif\ifPTB@XeOrLua \PTB@XeOrLuafalse -\newif\ifPTB@serif \PTB@seriffalse +\newif\ifSERIF \SERIFfalse \newif\ifPTB@logo@long@ \PTB@logo@long@true \RequirePackage{ifluatex,ifxetex} @@ -68,10 +68,10 @@ } \DeclareOption{sanserif}{% noch experimentell! Besser: LuaTeX/XeTeX + OTF - \PTB@seriffalse + \SERIFfalse } \DeclareOption{serif}{% - \PTB@seriftrue + \SERIFtrue } \DeclareOption{boldTitle}{% \global\let\PTB@title@series=\bfseries -- GitLab