diff --git a/gefahrgutformular/gefahrgutformular.cls b/gefahrgutformular/gefahrgutformular.cls index 395787659b74abd90de39467a4a448edbf8e08a9..c6e7b39b85dfba467c38d655cd2aa0a69311c5cc 100644 --- a/gefahrgutformular/gefahrgutformular.cls +++ b/gefahrgutformular/gefahrgutformular.cls @@ -32,6 +32,7 @@ \RequirePackage{graphicx,eso-pic,pict2e,picture,xcolor,trimspaces} \RequirePackage[ngerman]{babel} +\RequirePackage{siunitx-PTB} \let\vl@tempdima=\@ovxx \let\vl@tempdimb=\@ovyy @@ -39,9 +40,35 @@ \let\vl@tempdimd=\@clnwd \let\vl@tempdime=\@clnht \let\vl@tempdimf=\@dashdim -\newcommand\vl@tempa{} -\newcommand*\signatureGraphic[1]{\gdef\vl@signatureGraphic{#1}} +\newcommand*\vl@WorkingGroup{} +\newcommand*\WorkingGroup[1]{\gdef\vl@WorkingGroup{#1}} +\newcommand*\vl@Telephon{} +\newcommand*\Telephon[1]{\gdef\vl@Telephon{#1}} +\newcommand*\vl@Place{} +\newcommand*\Place[1]{\gdef\vl@Place{#1}} +\newcommand*\vl@Date{} +\newcommand*\Date[1]{\gdef\vl@Date{#1}} +\newcommand*\vl@Weight{} +\newcommand*\Weight[1]{\gdef\vl@Weight{#1}} +\newcommand*\vl@Package{} +\newcommand*\Package[1]{\gdef\vl@Package{#1}} +\newcommand*\vl@Type{} +\newcommand*\Type[1]{\gdef\vl@Type{#1}} +\newcommand*\vl@ContactPerson{} +\newcommand*\ContactPerson[1]{\gdef\vl@ContactPerson{#1}} +\newcommand*\vl@ContactPersonTelephon{} +\newcommand*\ContactPersonTelephon[1]{\gdef\vl@ContactPersonTelephon{#1}} +\newcommand*\vl@SignatureGraphic{} +\newcommand*\SignatureGraphic[1]{\gdef\vl@SignatureGraphic{#1}} +\newcommand*\vl@SenderAddress{} +\newcommand*\SenderAddress[1]{\long\gdef\vl@SenderAddress{#1}} +\newcommand*\vl@RecipientAddress{} +\newcommand*\RecipientAddress[1]{\long\gdef\vl@RecipientAddress{#1}} +\newcommand*\vl@Comment{} +\newcommand*\Comment[1]{\gdef\vl@Comment{#1}} +\newcommand*\vl@Items{} +\newcommand*\Items[1]{\long\gdef\vl@Items{#1}} \AddToShipoutPictureBG{% \frenchspacing @@ -58,7 +85,8 @@ \put(4bp,35bp){\resizebox{106bp}{!}{\Large In Braunschweig an:}}% \put(4bp,7bp){\resizebox{31bp}{!}{\textbf{\Large Q.212}}}% \vl@tempdimc=-17bp % - \put(4bp,\vl@tempdimc){Organisationseinheit:}% + \put(4bp,\vl@tempdimc){Organisationseinheit:}% + \put(4bp,2.5\vl@tempdimc){\vl@WorkingGroup}% \put(171bp,\vl@tempdimc){Hausruf:}% \put(332bp,\vl@tempdimc){Ort, Datum:}% }% @@ -111,9 +139,9 @@ \put(\vl@tempdima,\vl@tempdimb){\line(1,0){\textwidth}% \put(12bp,-34bp){\line(1,0){171}}% \vl@tempdimc=95bp % - \ifx\vl@signatureGraphic\@empty\else + \ifx\vl@SignatureGraphic\@empty\else \put(\vl@tempdimc,-17bp){\makebox(0,0)[c]{% - \includegraphics[height=26bp]{\vl@signatureGraphic}}}% + \includegraphics[height=26bp]{\vl@SignatureGraphic}}}% \fi \put(\vl@tempdimc,-45bp){\makebox(0,0)[c]{Unterschrift}}% }% diff --git a/gefahrgutformular/test-gefahrgutformular.pdf b/gefahrgutformular/test-gefahrgutformular.pdf new file mode 100644 index 0000000000000000000000000000000000000000..9cce5483d2b42d77924446805febaa75359204a0 Binary files /dev/null and b/gefahrgutformular/test-gefahrgutformular.pdf differ diff --git a/gefahrgutformular/test-gefahrgutformular.tex b/gefahrgutformular/test-gefahrgutformular.tex index d53f59e6f76b89b6acc763d05bbfc4bb1b72e2db..9e65859cad44f08d2fa9c8403802458c47d1e6a1 100644 --- a/gefahrgutformular/test-gefahrgutformular.tex +++ b/gefahrgutformular/test-gefahrgutformular.tex @@ -1,6 +1,30 @@ \documentclass{gefahrgutformular} -\signatureGraphic{SIG_Ute_Becker.png} +\WorkingGroup{ 7.54} +\Telephon{7216} +\Place{Berlin} +\Date{2019-12-31} +\Weight{\Si{20}{\kilogram}} +\Package{???} +\Type{Paket} +\ContactPerson{Ute Becker} +\ContactPersonTelephon{7216} +\SignatureGraphic{SIG_Ute_Becker.png} +\SenderAddress{% +PTB\\ +AG 7.54\\ +Abbestraße 2--12\\ +10587 Berlin +} +\RecipientAddress{% +Pfeiffer-vacuum SAS\\ +96, Avenue de Brogny-BP 2069\\ +74009 Annecy Cedex-France +} +\Comment{Im Dunkeln ist gut munkeln!} +\Items{ + \item 6 Lecks; Druck \SI{1.5}{XXX} +} \begin{document} \end{document}