From fcf99c6a3c6fe1570e2d76a060e36f3d36b9ff68 Mon Sep 17 00:00:00 2001
From: Rolf Niepraschk <Rolf.Niepraschk@ptb.de>
Date: Thu, 9 Jul 2020 11:06:13 +0200
Subject: [PATCH] =?UTF-8?q?pict2e-=C3=84nderung;=20nur=20noch=20LuaLaTeX?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../gefahrgutformular-new-engines.clo | 26 ------
.../gefahrgutformular-old-engines.clo | 16 ----
gefahrgutformular/gefahrgutformular.cls | 87 ++++++++++++-------
3 files changed, 58 insertions(+), 71 deletions(-)
delete mode 100644 gefahrgutformular/gefahrgutformular-new-engines.clo
delete mode 100644 gefahrgutformular/gefahrgutformular-old-engines.clo
diff --git a/gefahrgutformular/gefahrgutformular-new-engines.clo b/gefahrgutformular/gefahrgutformular-new-engines.clo
deleted file mode 100644
index 19ce855..0000000
--- a/gefahrgutformular/gefahrgutformular-new-engines.clo
+++ /dev/null
@@ -1,26 +0,0 @@
-\ProvidesFile{gefahrgutformular-new-engines.clo}%
- [Definitionen f. luaLaTeX/XeLaTeX]
-
-\RequirePackage{fontspec}
-%\setsansfont[Ligatures=TeX]{TeX Gyre Pagella}
-\setmonofont{AnonymousPro-Regular}[%
- Extension = .ttf,
- BoldFont = AnonymousPro-Bold,
- ItalicFont = AnonymousPro-Italic,
- BoldItalicFont = AnonymousPro-BoldItalic,
- Scale = 1.034
-]
-\setsansfont{texgyreheros}[
- Ligatures=TeX,
- Extension=.otf,
- UprightFont=*-regular,
- BoldFont=*-bold,
- ItalicFont=*-italic,
- BoldItalicFont=*-bolditalic.otf]
-
-\RequirePackage{newunicodechar}
-\newunicodechar{^^^^202f}{\,}% 'NARROW NO-BREAK SPACE' (\u202F, 8239)
-\newunicodechar{^^^^2009}{\,\hspace{0pt}}% 'THIN SPACE'
-\newunicodechar{^^^^00ad}{\-}% 'SOFT HYPHEN'
-
-\endinput
diff --git a/gefahrgutformular/gefahrgutformular-old-engines.clo b/gefahrgutformular/gefahrgutformular-old-engines.clo
deleted file mode 100644
index 9d303ad..0000000
--- a/gefahrgutformular/gefahrgutformular-old-engines.clo
+++ /dev/null
@@ -1,16 +0,0 @@
-\ProvidesFile{gefahrgutformular-old-engines.clo}%
- [Definitionen f. pdfLaTeX]
-
-\RequirePackage[utf8]{inputenc}
-\RequirePackage[T1]{fontenc}
-\RequirePackage{textcomp}
-\RequirePackage{lmodern}
-\RequirePackage{tgheros}
-\RequirePackage[ttdefault=true,scale=1.034]{AnonymousPro}
-%\RequirePackage[scaled=1.05]{zlmtt}% ist lmodern!
-
-\DeclareUnicodeCharacter{202F}{\,}% 'NARROW NO-BREAK SPACE'
-\DeclareUnicodeCharacter{2009}{\,\hspace{0pt}}% 'THIN SPACE'
-\DeclareUnicodeCharacter{00AD}{\-}% 'SOFT HYPHEN'
-
-\endinput
diff --git a/gefahrgutformular/gefahrgutformular.cls b/gefahrgutformular/gefahrgutformular.cls
index 6c6ac64..3f5f07d 100644
--- a/gefahrgutformular/gefahrgutformular.cls
+++ b/gefahrgutformular/gefahrgutformular.cls
@@ -2,7 +2,7 @@
\listfiles
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesClass{gefahrgutformular}
- [2019/10/07 v0.1b Gefahrgutformular (RN/PTB)]
+ [2020/07/09 v0.1c Gefahrgutformular (RN/PTB)]
\DeclareOption*{\PassOptionsToClass{\CurrentOption}{scrartcl}}
\ProcessOptions\relax
@@ -15,17 +15,37 @@
\setlength\textwidth{490bp}
\setlength\textheight{709bp}
-\RequirePackage{ifxetex,ifluatex}
+\RequirePackage{iftex}
-\newif\ifXeOrLua \XeOrLuafalse
-\ifxetex\XeOrLuatrue\else\ifluatex\XeOrLuatrue\fi\fi
-
-\ifXeOrLua% XeLaTeX oder luaLaTeX
- \input{gefahrgutformular-new-engines.clo}
-\else
- \input{gefahrgutformular-old-engines.clo}
+\ifluatex\else
+ \ClassError{gefahrgutformular}{LuaTeX is required for this class. Aborting.}{%
+ This class can only be used with the LuaTeX engine\MessageBreak
+ (command `lualatex').}
+ \expandafter\luacode@sty@endinput
\fi
+\RequirePackage{fontspec}
+%\setsansfont[Ligatures=TeX]{TeX Gyre Pagella}
+\setmonofont{AnonymousPro-Regular}[%
+ Extension = .ttf,
+ BoldFont = AnonymousPro-Bold,
+ ItalicFont = AnonymousPro-Italic,
+ BoldItalicFont = AnonymousPro-BoldItalic,
+ Scale = 1.034
+]
+\setsansfont{texgyreheros}[
+ Ligatures=TeX,
+ Extension=.otf,
+ UprightFont=*-regular,
+ BoldFont=*-bold,
+ ItalicFont=*-italic,
+ BoldItalicFont=*-bolditalic.otf]
+
+\RequirePackage{newunicodechar}
+\newunicodechar{^^^^202f}{\,}% 'NARROW NO-BREAK SPACE' (\u202F, 8239)
+\newunicodechar{^^^^2009}{\,\hspace{0pt}}% 'THIN SPACE'
+\newunicodechar{^^^^00ad}{\-}% 'SOFT HYPHEN'
+
\renewcommand*\familydefault{\sfdefault}
\newcommand*\vl@doc@style@code{616~00~h}
@@ -93,7 +113,7 @@
\put(\vl@tempdima,68bp){\framebox(\textwidth,\textheight){}}%
%------ alle waagerechten Linien und Texte in der Nähe ------
\vl@tempdimb=694bp %
- \put(\vl@tempdima,\vl@tempdimb){\line(1,0){\textwidth}%
+ \put(\vl@tempdima,\vl@tempdimb){
\put(4bp,65bp){\resizebox{202bp}{!}{\textbf{\Large Beförderung von
Gefahrgütern}}}%
\put(4bp,35bp){\resizebox{106bp}{!}{\Large In Braunschweig an:}}%
@@ -104,10 +124,11 @@
\put(171bp,\vl@tempdimc){Hausruf:}%
\put(171bp,2.5\vl@tempdimc){\vl@Telephon}%
\put(332bp,\vl@tempdimc){Ort, Datum:}%
- \put(332bp,2.5\vl@tempdimc){\vl@Place, \vl@Date}%
+ \put(332bp,2.5\vl@tempdimc){\vl@Place, \vl@Date}%
+ \line(1,0){\textwidth}%
}%
\vl@tempdimb=644bp %
- \put(\vl@tempdima,\vl@tempdimb){\line(1,0){\textwidth}%
+ \put(\vl@tempdima,\vl@tempdimb){%
\vl@tempdimc=-17bp %
\put(4bp,\vl@tempdimc){%
\parbox[t]{314bp}{%
@@ -122,24 +143,26 @@
\end{itemize}%
\fi
}%
- }
+ }%
\put(347bp,\vl@tempdimc){%
\parbox[t]{137bp}{%
\textbf{Netto-Gewicht} in kg (bei mehr als einem Gut
Einzelgewichte):\par\medskip\vl@Weight
}%
- }
+ }%
+ \line(1,0){\textwidth}%
}%
\vl@tempdimb=406bp %
- \put(\vl@tempdima,\vl@tempdimb){\line(1,0){\textwidth}%
+ \put(\vl@tempdima,\vl@tempdimb){%
\vl@tempdimc=-17bp %
\put(4bp,\vl@tempdimc){\textbf{Ansprechpartner} (für Rückfragen)}%
\put(4bp,2.1\vl@tempdimc){\vl@ContactPerson}%
\put(347bp,\vl@tempdimc){\textbf{Hausruf:}}%
- \put(347bp,2.1\vl@tempdimc){\vl@ContactPersonTelephon}%
+ \put(347bp,2.1\vl@tempdimc){\vl@ContactPersonTelephon}%
+ \line(1,0){\textwidth}%
}%
\vl@tempdimb=363bp %
- \put(\vl@tempdima,\vl@tempdimb){\line(1,0){\textwidth}%
+ \put(\vl@tempdima,\vl@tempdimb){%
\vl@tempdimc=-17bp %
\put(4bp,\vl@tempdimc){\textbf{Bei Luft-/See- oder Schienentransport
24\,h Notfallrufnummer des Absenders erforderlich:}}%
@@ -147,9 +170,10 @@
\put(4bp,\vl@tempdimc){%
\textbf{Kontaktperson}\hspace{165bp}24\,h~Notfallrufnummer:
}%
+ \line(1,0){\textwidth}%
}%
\vl@tempdimb=295bp %
- \put(\vl@tempdima,\vl@tempdimb){\line(1,0){\textwidth}%
+ \put(\vl@tempdima,\vl@tempdimb){%
\vl@tempdimc=-17bp %
\put(4bp,\vl@tempdimc){%
\parbox[t]{236bp}{%
@@ -162,20 +186,22 @@
\textbf{Empfänger}~(vollständige Adresse)\par\medskip
\vl@RecipientAddress
}%
- }
+ }%
+ \line(1,0){\textwidth}%
}%
\vl@tempdimb=173bp %
- \put(\vl@tempdima,\vl@tempdimb){\line(1,0){\textwidth}%
+ \put(\vl@tempdima,\vl@tempdimb){%
\vl@tempdimc=-17bp %
\put(4bp,\vl@tempdimc){\textbf{Bemerkungen:}}%
- \put(77bp,\vl@tempdimc){%
- \parbox[t]{409bp}{%
- \vl@Comment
- }%
- }
+ \put(77bp,\vl@tempdimc){%
+ \parbox[t]{409bp}{%
+ \vl@Comment
+ }%
+ }%
+ \line(1,0){\textwidth}%
}%
\vl@tempdimb=124bp %
- \put(\vl@tempdima,\vl@tempdimb){\line(1,0){\textwidth}%
+ \put(\vl@tempdima,\vl@tempdimb){%
\put(12bp,-34bp){\line(1,0){171}}%
\vl@tempdimc=95bp %
\put(\vl@tempdimc,-17bp){\makebox(0,0)[c]{%
@@ -188,20 +214,23 @@
\includegraphics[height=26bp]{\vl@SignatureGraphic}%
\fi
}}%
- \put(\vl@tempdimc,-45bp){\makebox(0,0)[c]{Unterschrift}}%
+ \put(\vl@tempdimc,-45bp){\makebox(0,0)[c]{Unterschrift}}%
+ \line(1,0){\textwidth}%
}%
%
\vl@tempdima=397bp %
\vl@tempdimc=147bp % kurze waag. Linien
- \put(\vl@tempdima,525bp){\line(1,0){\vl@tempdimc}%
+ \put(\vl@tempdima,525bp){%
\vl@tempdimb=-15bp %
\put(4bp,\vl@tempdimb){\textbf{Verpackung:}~\vl@Package}%
+ \line(1,0){\vl@tempdimc}%
}%
- \put(\vl@tempdima,502bp){\line(1,0){\vl@tempdimc}%
+ \put(\vl@tempdima,502bp){%
\vl@tempdimb=-17bp %
\put(4bp,\vl@tempdimb){%
\parbox[t]{139bp}{\textbf{Art:}\par\medskip\vl@Type}%
}%
+ \line(1,0){\vl@tempdimc}%
}%
%------ Symbole ------
\vl@tempdima=145mm %
--
GitLab