diff --git a/ptbposter/Makefile b/ptbposter/Makefile index a67364a7f5c9dff7d4beeec699adafbc25916f83..b2a389d6a9d73976378086b5313634bb0963974d 100644 --- a/ptbposter/Makefile +++ b/ptbposter/Makefile @@ -8,7 +8,7 @@ DOC2 = ptbposter-test-quer ARCHNAME = ptbposter-$(shell date +%Y-%m-%d).zip -ADDINPUTS = ptbposter-inc.tex ptbposter.cls ptbposter-logo.pdf PTB-logo-poster.pdf +ADDINPUTS = ptbposter-inc.tex ptbposter.cls ptbposter-logo.pdf all : ptbposter-test-hoch.pdf ptbposter-test-quer.pdf @@ -26,6 +26,6 @@ veryclean : clean $(RM) $(addprefix $(DOC2), .pdf) arch : - zip $(ARCHNAME) $(DOC1).tex $(DOC2).tex $(ADDINPUTS) + zip $(ARCHNAME) $(DOC1).tex $(DOC2).tex $(ADDINPUTS) Makefile @ echo $(ARCHNAME) diff --git a/ptbposter/ptbposter-inc.tex b/ptbposter/ptbposter-inc.tex index 8ecf4b4ccd59348657ef72040a76f54b63741db4..17f3c40b00ebc12bdbfe9317fc61131544bfdaf4 100644 --- a/ptbposter/ptbposter-inc.tex +++ b/ptbposter/ptbposter-inc.tex @@ -23,7 +23,7 @@ Ohne Angabe einer Sprachoption werden die Trennregeln für "`ngerman"' (neue deutsche Rechtschreibung) benutzt. Derzeit wird ausschließlich das Papierformat "`A0"' sowie die Eingabe-Kodierung -"`utf-8"' unterstützt. +"`UTF-8"' unterstützt. \section{Makros} diff --git a/ptbposter/ptbposter-test-hoch.pdf b/ptbposter/ptbposter-test-hoch.pdf index 02b9db4247e8ae8250e356f20d66b0fc46fdde6e..a8c7234434093c7b32fa5aae8da2ef513ed0bd5e 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 3f5c4363634866dabf7b808a29e23f3f89afe7bf..f364100f3962b2e16df4952002e45042f12933df 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 e31a1e36b5ac204c3484c072ab4cf71903d5d5c0..53e39bf472de03f5309f08c9967582e25e67e939 100644 --- a/ptbposter/ptbposter.cls +++ b/ptbposter/ptbposter.cls @@ -9,13 +9,13 @@ \newdimen\PTB@topmargin % Abstand zum Rahmen \newdimen\PTB@leftmargin % Abstand zum Rahmen \newdimen\PTB@default@fsize -\newdimen\PTB@texthsep -\newdimen\PTB@textvsep +\newdimen\PTB@texthsep % Abstand Textbereich zum Rand +\newdimen\PTB@textvsep % Abstand Textbereich zum Rand \setlength\PTB@default@fsize{41pt} \setlength\PTB@topmargin{215mm} -\setlength\PTB@texthsep{.5\PTB@default@fsize} -\setlength\PTB@textvsep{.75\PTB@default@fsize} + +\newif\ifPTB@is@landscape \PTB@is@landscapefalse \newcommand\PTB@tempa{} \newcommand\PTB@tempb{} @@ -24,26 +24,10 @@ \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@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@texthsep, - textheight=\the\dimexpr550mm-2\PTB@textvsep,hcentering}{geometry}} - \PTB@tempa -} +\DeclareOption{portrait}{\PTB@is@landscapefalse} +\DeclareOption{landscape}{\PTB@is@landscapetrue} \DeclareOption{sanserif}{% noch experimentell! Besser: luaTeX/xeTeX + OTF \AtEndOfClass{% @@ -90,8 +74,6 @@ } \scaleFontSizes{1}% -\RequirePackage[columnsep=2em]{geometry} - \RequirePackage[svgnames]{xcolor} \RequirePackage[newcommands,newparameters]{ragged2e}% ??? \RequirePackage{multicol,graphicx} @@ -172,7 +154,7 @@ \ifx\PTB@qrcode\@empty \color{PTBcolor}\framebox(46mm,46mm){}% \else - \raisebox{19mm}{\qrcode[height=47mm,tight]{\PTB@qrcode}}% + \raisebox{19mm}{\qrcode[height=46mm,tight]{\PTB@qrcode}}% \fi \color{PTBcolor} \hspace{2mm}\raisebox{-.5mm}{\rule{47mm}{47mm}}% @@ -196,7 +178,7 @@ \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} + \multicolumn{2}{@{}l@{}}{\href{http://www.ptb.de/}{www.ptb.de}} \end{tabular}% } \put(450mm,\PTB@tempdima){% @@ -313,7 +295,7 @@ \PTB@tempdima=106.6pt % \PTB@tempdima=#1\PTB@tempdima \PTB@tempdimb=1.2\PTB@tempdima - \xdef\titleFontSize{\noexpand\@setfontsize\noexpand{} + \xdef\titleFontSize{\noexpand\@setfontsize\noexpand \titleFontSize{\the\PTB@tempdima}{\the\PTB@tempdimb}}% } @@ -335,6 +317,32 @@ {\raggedsection\normalfont\sectfont\size@section}% } +\AtBeginDocument{% + % Skalierungen in der Präambel sind passiert. + \RequirePackage[paper=a0paper,columnsep=2em]{geometry}% + \setlength\PTB@texthsep{.5em}% + \setlength\PTB@textvsep{.75em}% + \ifPTB@is@landscape + \setlength\PTB@leftmargin{0.5\dimexpr 1189mm-1130mm}% + \else + \setlength\PTB@leftmargin{0.5\dimexpr 841mm-780mm}% + \fi + \edef\PTB@tempa{\noexpand\newgeometry{% + top=\the\dimexpr\PTB@topmargin+\PTB@textvsep,% + \ifPTB@is@landscape + landscape,% + textwidth=\the\dimexpr1130mm-2\PTB@texthsep,% + textheight=\the\dimexpr550mm-2\PTB@textvsep,hcentering% + \else + portrait,% + textwidth=\the\dimexpr780mm-2\PTB@texthsep,% + textheight=\the\dimexpr880mm-2\PTB@textvsep,hcentering% + \fi + }% + }% + \PTB@tempa +} + \setcounter{secnumdepth}{-2} \renewcommand*\maketitle[1][1]{} \renewcommand*\tableofcontents{}