diff --git a/ptbposter/Makefile b/ptbposter/Makefile index 1c2a2a6cb5c6656859b0c056e33ed2da7d1bd56e..3535f19586cd5dab203d6f5e3e4872d84a193519 100644 --- a/ptbposter/Makefile +++ b/ptbposter/Makefile @@ -1,5 +1,5 @@ -# Rolf Niepraschk, 2015/03/27, Rolf.Niepraschk@ptb.de +# Rolf Niepraschk, 2015/09/27, Rolf.Niepraschk@ptb.de .SUFFIXES : .tex .ltx .dvi .ps .pdf .eps @@ -8,7 +8,7 @@ DOC2 = ptbposter-doc-2 ARCHNAME = ptbposter-$(shell date +%Y-%m-%d).zip -ADDINPUTS = ptbposter.cls ptbposter-logo-A.pdf ptbposter-logo-B.pdf +ADDINPUTS = ptbposter.cls ptbposter-logo-A.mps ptbposter-logo-B.mps all : $(DOC1).pdf $(DOC2).pdf diff --git a/ptbposter/ptbposter-doc-1.pdf b/ptbposter/ptbposter-doc-1.pdf index 570393ce53ba8323030e9e9e66dbb28b13c81807..dc3c83aae4969e19b348b5eabb91c9a1307c442c 100644 Binary files a/ptbposter/ptbposter-doc-1.pdf and b/ptbposter/ptbposter-doc-1.pdf differ diff --git a/ptbposter/ptbposter-doc-2.pdf b/ptbposter/ptbposter-doc-2.pdf index 345c5af3ae4c8ca97a344bab6becf8705b198fd4..f3360055ca05d9b1967ce2101b20cc6ebcc02d20 100644 Binary files a/ptbposter/ptbposter-doc-2.pdf and b/ptbposter/ptbposter-doc-2.pdf differ diff --git a/ptbposter/ptbposter.cls b/ptbposter/ptbposter.cls index ca58ade1df091b07555cebb0bc795a46a2b1fe06..e9c1e5707e5aeef4324c4fb69e6f0d437569e81d 100644 --- a/ptbposter/ptbposter.cls +++ b/ptbposter/ptbposter.cls @@ -4,7 +4,9 @@ \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesClass{ptbposter} - [2016/09/26 v0.4b PTB-Poster-Klasse (RN)] + [2016/09/28 v0.4b PTB-Poster-Klasse (RN)] + +\newif\ifPTB@useCMYK \PTB@useCMYKfalse % vorerst \newdimen\PTB@topmargin % Abstand zum Rahmen \newdimen\PTB@leftmargin % Abstand zum Rahmen @@ -216,12 +218,15 @@ \newcommand*\PTB@fax{} \newcommand*\fax[1]{\gdef\PTB@fax{#1}} \newcommand*\PTB@final@paper{} -\newcommand*\scaletoPaper[1]{\gdef\PTB@final@paper{#1}} +\newcommand*\scaletoPaper[1]{\gdef\PTB@final@paper{#1}} -%%%\definecolor{PTBcolor}{rgb}{0,0.67451,0.87451} -%%%\definecolor{PTBcolor}{HTML}{00ACDF} -\definecolor{PTBcolor}{cmyk}{1,0.32549,0.12549,0.12549} +\ifPTB@useCMYK + \definecolor{PTBcolor}{cmyk}{1,0.32549,0.12549,0.12549} % icc:model: Europe ISO Coated FOGRA27 +\else +%%%\definecolor{PTBcolor}{rgb}{0,0.67451,0.87451} + \definecolor{PTBcolor}{HTML}{00ACDF} +\fi \RequirePackage[texcoord]{eso-pic} \RequirePackage{pict2e,picture,ifdraft,booktabs} @@ -231,10 +236,10 @@ \PTB@tempdima=-0.077\PTB@scale@base \put(\PTB@leftmargin,\PTB@tempdima){% \parbox[b]{.401\PTB@scale@base}{% - \textcolor{PTBcolor}{% + \textcolor{PTBcolor}{% TODO: Tikz-Grafik erzeugen (autom.?) und verwenden \includegraphics[width=.379\linewidth]{ptbposter-logo-A.mps}}% \hfill - \raisebox{-.01\height}{% + \raisebox{-.01\height}{% TODO: Text (Arial?) verwenden \includegraphics[width=.612\linewidth]{ptbposter-logo-B.mps}}% }% }%