diff --git a/ptbposter/ptbposter-2018.clo b/ptbposter/ptbposter-2018.clo
index 0ddbaf8e84358503346a2ad83b7f0789a001b0db..a1e589976be8b58558cbb6ee71208a69769bff0b 100644
--- a/ptbposter/ptbposter-2018.clo
+++ b/ptbposter/ptbposter-2018.clo
@@ -1,10 +1,46 @@
% Rolf Niepraschk, Rolf.Niepraschk@ptb.de
\ProvidesFile{ptbposter-2018.clo}%
- [2020/03/05 v0.1a `PTB-Poster' layout 2018 (RN/PTB)]
+ [2020/03/09 v0.1b `PTB-Poster' layout 2018 (RN/PTB)]
\typeout{*** LAYOUT 2018 ***}
+\ifPTB@XeOrLua
+ \setfontfamily\PTBdesignFont{texgyreheros}[
+ Ligatures=TeX,
+ Extension=.otf,
+ UprightFont=*-regular,
+ BoldFont=*-bold,
+ ItalicFont=*-italic,
+ BoldItalicFont=*-bolditalic]
+ \let\sffamily=\PTBdesignFont
+\else
+ \let\PTBdesignFont=\sffamily
+\fi
+
+\AtEndPreamble{%
+ \ifx\@author\@empty
+ \setlength\PTB@topmargin{0.152\PTB@scale@base}%
+ \else
+ \setlength\PTB@topmargin{0.180824222418\PTB@scale@base}%
+ \fi
+ \ifPTBlandscape
+ \setlength\PTB@framewidth{0.950378471315\PTB@scale@base}% 3215pt (1130mm) bei A0
+ \ifx\@author\@empty
+ \setlength\PTB@frameheight{0.490824222418\PTB@scale@base}% 1660pt (584mm) bei A0
+ \else
+ \setlength\PTB@frameheight{0.462\PTB@scale@base}% 1563pt (549mm) bei A0
+ \fi
+ \else
+ \setlength\PTB@framewidth{0.656013458076\PTB@scale@base}% 2219pt (780mm) bei A0
+ \ifx\@author\@empty
+ \setlength\PTB@frameheight{0.769\PTB@scale@base}% 2602pt (914mm) bei A0
+ \else
+ \setlength\PTB@frameheight{0.740117747573\PTB@scale@base}% 2504pt (880mm) bei A0
+ \fi
+ \fi
+}
+
\AddToShipoutPictureBG*{% Kopf (relativ zur oberen Blattkante)
\PTB@tempdima=-0.077\PTB@scale@base
\put(\PTB@leftmargin,\PTB@tempdima){%
@@ -37,7 +73,7 @@
}
}%
\def\PTB@tempa{\parbox[c]{\PTB@framewidth}{% Komplette Titeldefinition
- \PTB@title@justification\PTB@title@series\sffamily\titleFontSize
+ \PTB@title@justification\PTB@title@series\PTBdesignFont\titleFontSize
\microtypesetup{protrusion=false}\@title}}%
\begingroup
\@tempcnta=\@ne \@tempcntb=10499 %
@@ -58,7 +94,7 @@
\PTB@tempdima=-0.172\PTB@scale@base
\def\and{, }%
\put(\PTB@leftmargin,\PTB@tempdima){\parbox[b]{\PTB@framewidth}{% Autoren
- \PTB@authors@justification\sffamily\authorFontSize\@author}}%
+ \PTB@authors@justification\PTBdesignFont\authorFontSize\@author}}%
% hier wird \@thanks gefüllt
\linethickness{\PTB@framethickness}\color{PTBcolor}%\color{PTBcolor}%
\PTB@tempdima=-0.0883095039717\PTB@scale@base
diff --git a/ptbposter/ptbposter-2020.clo b/ptbposter/ptbposter-2020.clo
index 7283c2e688fb96b8ab593f361e183a6f71be5b15..01fd4f22a41f54c65f716323c948c70f1f3d5c71 100644
--- a/ptbposter/ptbposter-2020.clo
+++ b/ptbposter/ptbposter-2020.clo
@@ -1,10 +1,168 @@
% Rolf Niepraschk, Rolf.Niepraschk@ptb.de
\ProvidesFile{ptbposter-2020.clo}%
- [2020/03/05 v0.1b `PTB-Poster' layout 2020 (RN/PTB)]
+ [2020/03/09 v0.1b `PTB-Poster' layout 2020 (RN/PTB)]
\typeout{*** LAYOUT 2020 ***}
-\input{ptbposter-2018.clo}
+\ifPTB@XeOrLua
+ \setfontfamily\PTBdesignFont{UniversNextPro-Light}[%
+ Scale=.905,% ???
+ BoldFont=*,
+ Extension=.ttf]
+ \setsansfont{texgyreheros}[
+ Ligatures=TeX,
+ Extension=.otf,
+ UprightFont=*-regular,
+ BoldFont=*-bold,
+ ItalicFont=*-italic,
+ BoldItalicFont=*-bolditalic]
+\else
+ \let\PTBdesignFont=\sffamily% ???
+\fi
+
+\AtEndPreamble{%
+ \ifx\@author\@empty
+ \setlength\PTB@topmargin{0.152\PTB@scale@base}%
+ \else
+ \setlength\PTB@topmargin{0.180824222418\PTB@scale@base}%
+ \fi
+ \ifPTBlandscape
+ \setlength\PTB@framewidth{0.950378471315\PTB@scale@base}% 3215pt (1130mm) bei A0
+ \ifx\@author\@empty
+ \setlength\PTB@frameheight{0.490824222418\PTB@scale@base}% 1660pt (584mm) bei A0
+ \else
+ \setlength\PTB@frameheight{0.462\PTB@scale@base}% 1563pt (549mm) bei A0
+ \fi
+ \else
+ \setlength\PTB@framewidth{0.656013458076\PTB@scale@base}% 2219pt (780mm) bei A0
+ \ifx\@author\@empty
+ \setlength\PTB@frameheight{0.769\PTB@scale@base}% 2602pt (914mm) bei A0
+ \else
+ \setlength\PTB@frameheight{0.740117747573\PTB@scale@base}% 2504pt (880mm) bei A0
+ \fi
+ \fi
+}
+
+\AddToShipoutPictureBG*{% Kopf (relativ zur oberen Blattkante)
+ \PTB@tempdima=-0.077\PTB@scale@base
+ \put(\PTB@leftmargin,\PTB@tempdima){%
+ \parbox[b]{\PTB@framewidth}{% TODO: vereinfachen?
+ \parbox[b]{.401\PTB@scale@base}{%
+ \textcolor{PTBcolor}{% TODO: Tikz-Grafik erzeugen (autom.?) und verwenden
+ \includegraphics[height=.055\PTB@scale@base]{ptbposter-logo-A.mps}
+ }% 1,58365758755
+ \ifPTB@logo@long@
+ \hfill
+ \raisebox{.0025\PTB@scale@base}{%
+ %\includegraphics[width=.612\linewidth]{ptbposter-logo-B.mps}%
+ \resizebox{.61\linewidth}{!}{%
+ \hspace{-.2ex}%
+ \begin{varwidth}[b]{\linewidth}%
+ \PTBdesignFont\bfseries
+ Physikalisch-Technische Bundesanstalt\\
+ Braunschweig und Berlin\\
+ \mdseries
+ Nationales Metrologieinstitut
+ \end{varwidth}%
+ }%
+ }%
+ \fi
+ }%
+ \hfill
+ \ifx\PTB@logo\@empty\else
+ \includegraphics[height=.055\PTB@scale@base]{\PTB@logo}%
+ \fi
+ }
+ }%
+ \def\PTB@tempa{\parbox[c]{\PTB@framewidth}{% Komplette Titeldefinition
+ \PTB@title@justification\PTB@title@series\PTBdesignFont\titleFontSize
+ \microtypesetup{protrusion=false}\@title}}%
+ \begingroup
+ \@tempcnta=\@ne \@tempcntb=10499 %
+ \loop\ifnum\@tempcnta<25 % Finden der ersten passenden titleFontSize
+ \multiply\@tempcntb 10000 \divide\@tempcntb by 10500 % jeweils um 5% kleiner
+ \PTB@scaleTitleFontSize{0.\the\@tempcntb}% 1:0.9999, 2:0.9522, 3:0.9068, ...
+ %\typeout{\the\@tempcnta\space XXX: \titleFontSize, 0.\the\@tempcntb}%
+ \setbox\z@ \hbox{\PTB@tempa}%
+ \ifdim\dimexpr\ht\z@+\dp\z@>\PTB@maxtitleheight
+ \advance\@tempcnta\@ne % weiter, wenn zu gross
+ \else
+ \@tempcnta=999 % Abbruch
+ \fi
+ \repeat
+ \endgroup
+ \PTB@tempdima=-0.127\PTB@scale@base
+ \put(\PTB@leftmargin,\PTB@tempdima){\PTB@tempa}% Title
+ \PTB@tempdima=-0.172\PTB@scale@base
+ \def\and{, }%
+ \put(\PTB@leftmargin,\PTB@tempdima){\parbox[b]{\PTB@framewidth}{% Autoren
+ \PTB@authors@justification\PTBdesignFont\authorFontSize\@author}}%
+ % hier wird \@thanks gefüllt
+ \linethickness{\PTB@framethickness}\color{PTBcolor}%\color{PTBcolor}%
+ \PTB@tempdima=-0.0883095039717\PTB@scale@base
+ \put(\PTB@leftmargin,\PTB@tempdima){%
+ \line(1,0){\dimexpr\paperwidth-2\PTB@leftmargin}}%
+ % blauer Rahmen
+ \put(\PTB@leftmargin,\dimexpr-\textheight-2\PTB@textvsep-\PTB@topmargin)%
+ {\framebox(\dimexpr\textwidth+2\PTB@texthsep,%
+ \dimexpr\textheight+2\PTB@textvsep){\backgroundContent}}%
+}
+
+\AddToShipoutPictureFG*{% Fuß (relativ zur unteren Kante des Textbereichs)
+ \AtTextLowerLeft{%
+ \put(-\PTB@texthsep,-\PTB@textvsep){%
+ \PTB@tempdimb=0.000420521447484\PTB@scale@base
+ \linethickness{\PTB@tempdimb}\normalcolor
+ \PTB@tempdima=-0.0420521447484\PTB@scale@base
+ \put(-.5\@wholewidth,\PTB@tempdima){%
+ \PTB@tempdima=0.0386879731686\PTB@scale@base
+ \PTB@tempdimb=0.00168208578994\PTB@scale@base
+ \ifx\PTB@qrcode\@empty
+ \color{PTBcolor}\framebox(\PTB@tempdima,\PTB@tempdima){}%
+ \else
+ \sbox\@tempboxa{\qrcode[height=\PTB@tempdima,tight]{\PTB@qrcode}}%
+ \raisebox{\dp\@tempboxa}{\usebox\@tempboxa}%
+ \fi
+ \color{PTBcolor}
+ \hspace{\PTB@tempdimb}\raisebox{-\@wholewidth}{%
+ \rule{\dimexpr\PTB@tempdima+2\@wholewidth}%
+ {\dimexpr\PTB@tempdima+2\@wholewidth}}%
+ \hspace{\PTB@tempdimb}\framebox(\PTB@tempdima,\PTB@tempdima){}%
+ }
+ \PTB@tempdimb=-0.00841042894969\PTB@scale@base
+ \footFontSize\sffamily\normalcolor
+ \PTB@tempdima=0.122792262665\PTB@scale@base
+ \put(\PTB@tempdima,\PTB@tempdimb){%
+ \begin{tabular}[t]{@{}l@{}}
+ Physikalisch-Technische Bundesanstalt \\
+ Braunschweig und Berlin \\[\f@baselineskip]
+ \ifx\first@author\@empty\else \textbf{\first@author}\\\fi
+ \ifx\PTB@department\@empty\else \PTB@department\\\fi
+ \ifx\PTB@workingGroup\@empty\else \PTB@workingGroup\\\fi
+ \end{tabular}%
+ }
+ \PTB@tempdima=0.263246426125\PTB@scale@base
+ \put(\PTB@tempdima,\PTB@tempdimb){%
+ \begin{tabular}[t]{@{}ll@{}}
+ \ifx\PTB@street\@empty\else\multicolumn{2}{@{}l@{}}{\PTB@street}\\\fi
+ \ifx\PTB@location\@empty\else\multicolumn{2}{@{}l@{}}{\PTB@location}\\\fi
+ \ifx\PTB@phone\@empty\else\ifPTB@german@ Telefon\else Phone\fi:
+ &\PTB@phone\\\fi
+ \ifx\PTB@fax\@empty\else Fax:&\PTB@fax\\\fi
+ \ifx\PTB@email\@empty\else\ifPTB@german@ E-Mail\else E-mail\fi:
+ &\href{mailto:\PTB@email}{\PTB@email}\\\fi
+ \multicolumn{2}{@{}l@{}}{\href{http://www.ptb.de/}{www.ptb.de}}
+ \end{tabular}%
+ }
+ \PTB@tempdima=0.378469302736\PTB@scale@base
+ \put(\PTB@tempdima,\PTB@tempdimb){%
+ \begin{tabular}[t]{@{}l@{}}
+ \@thanks % wurde bei der Ausführung von \@author gefüllt.
+ \end{tabular}%
+ }
+ }
+ }
+}
\endinput
diff --git a/ptbposter/ptbposter-new-engines.clo b/ptbposter/ptbposter-new-engines.clo
index 2dc9a677763b56ec084cfd99e3d3bbae60690874..bee42cdaf56165da8a917d1c7db3bcffb3f017bf 100644
--- a/ptbposter/ptbposter-new-engines.clo
+++ b/ptbposter/ptbposter-new-engines.clo
@@ -1,7 +1,7 @@
% Rolf Niepraschk, Rolf.Niepraschk@ptb.de
\ProvidesFile{ptbposter-new-engines.clo}%
- [2019/07/08 v0.1e `PTB-Poster' new engines (RN/PTB)]
+ [2020/03/09 v0.1f `PTB-Poster' new engines (RN/PTB)]
\RequirePackage{unicode-math}
\setmainfont{texgyrepagella}[
@@ -11,13 +11,6 @@
BoldFont=*-bold,
ItalicFont=*-italic,
BoldItalicFont=*-bolditalic]
-\newfontfamily\PTBdesignFont{texgyreheros}[
- Ligatures=TeX,
- Extension=.otf,
- UprightFont=*-regular,
- BoldFont=*-bold,
- ItalicFont=*-italic,
- BoldItalicFont=*-bolditalic]
\setmonofont{AnonymousPro-Regular}[%
Extension = .ttf,
BoldFont = AnonymousPro-Bold,
@@ -26,7 +19,6 @@
Scale = MatchLowercase]
\setmathfont{texgyrepagella-math.otf}[math-style=ISO,bold-style=ISO]
-\let\sffamily=\PTBdesignFont
\unimathsetup{partial=upright}
diff --git a/ptbposter/ptbposter-old-engines.clo b/ptbposter/ptbposter-old-engines.clo
index 6121fb4b983ac640a39a1104af0f6a7c555c3de2..c58138ecfd20f0f27b3a0438c1e159f8b356a628 100644
--- a/ptbposter/ptbposter-old-engines.clo
+++ b/ptbposter/ptbposter-old-engines.clo
@@ -1,14 +1,13 @@
% Rolf Niepraschk, Rolf.Niepraschk@ptb.de
\ProvidesFile{ptbposter-old-engines.clo}%
- [2019/06/27 v0.1b `PTB-Poster' old engines (RN/PTB)]
+ [2020/03/09 v0.1c `PTB-Poster' old engines (RN/PTB)]
\RequirePackage[utf8]{inputenc}
\RequirePackage[T1]{fontenc}
\RequirePackage{textcomp}
\RequirePackage{tgpagella}
\RequirePackage{tgheros}
-\let\PTBdesignFont=\sffamily
\RequirePackage[ttdefault=true,scale=1.034]{AnonymousPro}
\makeatletter % wegen Laden aus normalem LaTeX-Dokument
diff --git a/ptbposter/ptbposter.cls b/ptbposter/ptbposter.cls
index 6ae0577bbcc5b3aabb74f4a0edc58c463c1c2944..41ebe0d2d162686596a65485a39cf2a1ea02785e 100644
--- a/ptbposter/ptbposter.cls
+++ b/ptbposter/ptbposter.cls
@@ -259,13 +259,6 @@
\RequirePackage{pict2e,picture,ifdraft,booktabs}
\RequirePackage{varwidth,qrcode}
-\ifcase \PTB@layout
- % 0
- \input{ptbposter-2018.clo}
-\or % 1
- \input{ptbposter-2020.clo}
-\fi
-
% ===== Behandlung der Autoren (siehe ptb-abstracts.sty ) =====
\newcommand*\first@author{}
@@ -368,6 +361,13 @@
%\renewcommand*\labelitemii{$\m@th\diamond$}
%\renewcommand*\labelitemii{$\m@th\triangleright$}%
+\ifcase \PTB@layout
+ % 0
+ \input{ptbposter-2018.clo}
+\or % 1
+ \input{ptbposter-2020.clo}
+\fi
+
\AtEndPreamble{%
% Skalierungen in der Präambel sind passiert.
\changefontsizes{\the\PTB@default@fsize}%
@@ -379,54 +379,15 @@
\setlength\PTB@framethickness{0.00168208578994\PTB@scale@base}%
\setlength\fboxsep{0.00355\PTB@scale@base} % 3pt bei A4
\setlength\fboxrule{0.0004722\PTB@scale@base}% 0.4pt bei A4
- \ifx\@author\@empty
- \setlength\PTB@topmargin{0.152\PTB@scale@base}%
- \else
- \setlength\PTB@topmargin{0.180824222418\PTB@scale@base}%
- \fi
- \ifPTBlandscape
- \setlength\PTB@framewidth{0.950378471315\PTB@scale@base}% 3215pt (1130mm) bei A0
- \ifx\@author\@empty
- \setlength\PTB@frameheight{0.490824222418\PTB@scale@base}% 1565pt (550mm) bei A0
- \else
- \setlength\PTB@frameheight{0.462\PTB@scale@base}% 1565pt (550mm) bei A0
- \fi
- \else
- \setlength\PTB@framewidth{0.656013458076\PTB@scale@base}% 2219pt (780mm) bei A0
- \ifx\@author\@empty
- \setlength\PTB@frameheight{0.769\PTB@scale@base}% 2504pt (880mm) bei A0
- \else
- \setlength\PTB@frameheight{0.740117747573\PTB@scale@base}% 2504pt (880mm) bei A0
- \fi
- \fi
\setlength\PTB@leftmargin{0.5\dimexpr\paperwidth-\PTB@framewidth}%
- \iftrue
\@tempdima=\dimexpr\PTB@leftmargin+\PTB@texthsep %
- \geometry{%
- verbose,
- top=\dimexpr\PTB@topmargin+\PTB@textvsep,%
- left=\@tempdima,
- right=\@tempdima,
- textheight=\dimexpr\PTB@frameheight-2\PTB@textvsep,%
- columnsep=1.5em,hcentering}
- \else
- \paperwidth=2392.87701pt %
- \paperheight=3383.03302pt %
- \textwidth=2153.24045pt %
- \textheight=2437.77531pt %
- \oddsidemargin=47.5483pt %
- \evensidemargin=47.5483pt %
- \topmargin=535.06322pt %
- \headheight=17.0pt %
- \headsep=20.40001pt %
- \topskip=11.0pt %
- \footskip=47.6pt %
- \marginparwidth=598.21925pt %
- \marginparsep=12.8401pt %
- \columnsep=66.04904pt %
- \hoffset=0.0pt %
- \voffset=0.0pt %
- \fi
+ \geometry{%
+ verbose,
+ top=\dimexpr\PTB@topmargin+\PTB@textvsep,%
+ left=\@tempdima,
+ right=\@tempdima,
+ textheight=\dimexpr\PTB@frameheight-2\PTB@textvsep,%
+ columnsep=1.5em,hcentering}
\setlength\emergencystretch{3em}%