diff --git a/ptbposter/ptbposter-test-hoch.pdf b/ptbposter/ptbposter-test-hoch.pdf
index 3a5fc60fbd2844dd4bc3e6b66a730e4d87d2f66a..02b9db4247e8ae8250e356f20d66b0fc46fdde6e 100644
Binary files a/ptbposter/ptbposter-test-hoch.pdf and b/ptbposter/ptbposter-test-hoch.pdf differ
diff --git a/ptbposter/ptbposter-test-quer.pdf b/ptbposter/ptbposter-test-quer.pdf
index c0337a29e6b5cf69402e2ce716f71e87d031e9a6..3f5c4363634866dabf7b808a29e23f3f89afe7bf 100644
Binary files a/ptbposter/ptbposter-test-quer.pdf and b/ptbposter/ptbposter-test-quer.pdf differ
diff --git a/ptbposter/ptbposter.cls b/ptbposter/ptbposter.cls
index dfb0f5d98e9d11167873859a093a89b4c20f4683..e31a1e36b5ac204c3484c072ab4cf71903d5d5c0 100644
--- a/ptbposter/ptbposter.cls
+++ b/ptbposter/ptbposter.cls
@@ -4,18 +4,18 @@
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesClass{ptbposter}
- [2015/03/19 v0.2e PTB-Poster-Klasse (RN)]
+ [2015/03/20 v0.2f PTB-Poster-Klasse (RN)]
-\PassOptionsToPackage{paper=a0paper}{geometry}
-
-\newdimen\PTB@topmargin
-\newdimen\PTB@leftmargin
+\newdimen\PTB@topmargin % Abstand zum Rahmen
+\newdimen\PTB@leftmargin % Abstand zum Rahmen
\newdimen\PTB@default@fsize
-\newdimen\PTB@textsep
+\newdimen\PTB@texthsep
+\newdimen\PTB@textvsep
\setlength\PTB@default@fsize{41pt}
-\setlength\PTB@topmargin{230mm}
-\setlength\PTB@textsep{.5\PTB@default@fsize}
+\setlength\PTB@topmargin{215mm}
+\setlength\PTB@texthsep{.5\PTB@default@fsize}
+\setlength\PTB@textvsep{.75\PTB@default@fsize}
\newcommand\PTB@tempa{}
\newcommand\PTB@tempb{}
@@ -24,22 +24,24 @@
\newcommand\PTB@tempe{}
\let\PTB@tempdima=\@ovxx
-\let\PTB@tempdimb=\@ovyy
+\let\PTB@tempdimb=\@ovyy{}
+
+\edef\PTB@tempa{\noexpand\PassOptionsToPackage{paper=a0paper,
+ top=\the\dimexpr\PTB@topmargin+\PTB@textvsep}{geometry}}
+\PTB@tempa
\DeclareOption{portrait}{%
\setlength\PTB@leftmargin{0.5\dimexpr 841mm-780mm}
\edef\PTB@tempa{\noexpand\PassOptionsToPackage{portrait,
- textwidth=\the\dimexpr780mm-2\PTB@textsep,
- textheight=\the\dimexpr880mm-2\PTB@textsep,hcentering,
- top=\the\dimexpr\PTB@topmargin-\PTB@textsep}{geometry}}
+ textwidth=\the\dimexpr780mm-2\PTB@texthsep,
+ textheight=\the\dimexpr880mm-2\PTB@textvsep,hcentering}{geometry}}
\PTB@tempa
}
\DeclareOption{landscape}{%
\setlength\PTB@leftmargin{0.5\dimexpr 1189mm-1130mm}
\edef\PTB@tempa{\noexpand\PassOptionsToPackage{landscape,
- textwidth=\the\dimexpr1130mm-2\PTB@textsep,
- textheight=\the\dimexpr550mm-2\PTB@textsep,hcentering,
- top=\the\dimexpr\PTB@topmargin-\PTB@textsep}{geometry}}
+ textwidth=\the\dimexpr1130mm-2\PTB@texthsep,
+ textheight=\the\dimexpr550mm-2\PTB@textvsep,hcentering}{geometry}}
\PTB@tempa
}
@@ -154,53 +156,54 @@
\def\and{, }%
\put(\PTB@leftmargin,-190mm){\sffamily\authorFontSize\@author}%
% hier wird \@thanks gefüllt
- \put(\PTB@leftmargin,-105mm){\linethickness{2mm}\color{PTBcolor}%
- \line(1,0){\dimexpr\paperwidth-2\PTB@leftmargin}}
- \linethickness{2mm}
- \AtTextLowerLeft{%
- \color{PTBcolor}%
- \put(-\PTB@textsep,-\PTB@textsep){\framebox(\dimexpr\textwidth+2\PTB@textsep,
- \dimexpr\textheight+2\PTB@textsep){}}
- }%
+ \linethickness{2mm}\color{PTBcolor}
+ \put(\PTB@leftmargin,-105mm){%
+ \line(1,0){\dimexpr\paperwidth-2\PTB@leftmargin}}%
+ \put(\PTB@leftmargin,\dimexpr-\textheight-2\PTB@textvsep-\PTB@topmargin)%
+ {\framebox(\dimexpr\textwidth+2\PTB@texthsep,%
+ \dimexpr\textheight+2\PTB@textvsep){}}%
}
\AddToShipoutPictureBG*{% Fuß (relativ zur unteren Kante des Textbereichs)
\AtTextLowerLeft{%
- \linethickness{.5mm}%
- \put(-.5\@wholewidth-\PTB@textsep,-57mm){%
- \ifx\PTB@qrcode\@empty
- \color{PTBcolor}\framebox(46mm,46mm){}%
- \else
- \raisebox{19mm}{\qrcode[height=47mm,tight]{\PTB@qrcode}}%
- \fi
- \color{PTBcolor}
- \hspace{2mm}\raisebox{-.5mm}{\rule{47mm}{47mm}}%
- \hspace{2mm}\framebox(46mm,46mm){}%
- }
- \footFontSize\sffamily\color{black}%
- \put(140mm,-17mm){%
- \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}%
- }
- \put(307mm,-17mm){%
- \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 Telefon:&\PTB@phone\\\fi
- \ifx\PTB@fax\@empty\else Fax:&\PTB@fax\\\fi
- \ifx\PTB@email\@empty\else E-Mail:&\href{mailto:\PTB@email}{\PTB@email}\\\fi
- \multicolumn{2}{@{}l@{}}{www.ptb.de}
- \end{tabular}%
- }
- \put(444mm,-17mm){%
- \begin{tabular}[t]{@{}l@{}}
- \@thanks % wurde bei der Ausführung von \@author gefüllt.
- \end{tabular}%
+ \put(-\PTB@texthsep,-\PTB@textvsep){%
+ \linethickness{.5mm}\normalcolor
+ \put(-.5\@wholewidth,-50mm){%
+ \ifx\PTB@qrcode\@empty
+ \color{PTBcolor}\framebox(46mm,46mm){}%
+ \else
+ \raisebox{19mm}{\qrcode[height=47mm,tight]{\PTB@qrcode}}%
+ \fi
+ \color{PTBcolor}
+ \hspace{2mm}\raisebox{-.5mm}{\rule{47mm}{47mm}}%
+ \hspace{2mm}\framebox(46mm,46mm){}%
+ }
+ \setlength\PTB@tempdima{-10mm}%
+ \footFontSize\sffamily\normalcolor
+ \put(146mm,\PTB@tempdima){%
+ \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}%
+ }
+ \put(313mm,\PTB@tempdima){%
+ \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 Telefon:&\PTB@phone\\\fi
+ \ifx\PTB@fax\@empty\else Fax:&\PTB@fax\\\fi
+ \ifx\PTB@email\@empty\else E-Mail:&\href{mailto:\PTB@email}{\PTB@email}\\\fi
+ \multicolumn{2}{@{}l@{}}{www.ptb.de}
+ \end{tabular}%
+ }
+ \put(450mm,\PTB@tempdima){%
+ \begin{tabular}[t]{@{}l@{}}
+ \@thanks % wurde bei der Ausführung von \@author gefüllt.
+ \end{tabular}%
+ }
}
}
}