diff --git a/arbeitsanweisung/vl-aa-new-engines.clo b/arbeitsanweisung/vl-aa-new-engines.clo
new file mode 100644
index 0000000000000000000000000000000000000000..c7c5d7a76940679240b40828aebe2e480592185c
--- /dev/null
+++ b/arbeitsanweisung/vl-aa-new-engines.clo
@@ -0,0 +1,20 @@
+% Rolf Niepraschk, Rolf.Niepraschk@ptb.de
+
+\ProvidesFile{vl-aa-new-engines.clo}[2018/05/15 v0.1a AA -- new engines (RN)]
+
+\RequirePackage[no-math]{fontspec}
+\RequirePackage{unicode-math}
+\setromanfont[Ligatures=TeX]{TeX Gyre Pagella}
+\setsansfont[Ligatures=TeX]{TeX Gyre Heros}
+\setmonofont{AnonymousPro-Regular}[%
+ Extension = .ttf,
+ BoldFont = AnonymousPro-Bold,
+ ItalicFont = AnonymousPro-Italic,
+ BoldItalicFont = AnonymousPro-BoldItalic,
+ Scale = MatchLowercase
+]
+
+\setmathfont[math-style=ISO,bold-style=ISO]{TeXGyrePagellaMath-Regular}
+%%%{TeX Gyre Pagella Math}
+
+\endinput
diff --git a/arbeitsanweisung/vl-aa-old-engines.clo b/arbeitsanweisung/vl-aa-old-engines.clo
new file mode 100644
index 0000000000000000000000000000000000000000..bbd3c81e7d244d86a84cee943e6f23c5d31aa1eb
--- /dev/null
+++ b/arbeitsanweisung/vl-aa-old-engines.clo
@@ -0,0 +1,12 @@
+% Rolf Niepraschk, Rolf.Niepraschk@ptb.de
+
+\ProvidesFile{vl-aa-old-engines.clo}[2018/05/15 v0.1a AA -- old engines (RN)]
+
+\RequirePackage[utf8]{inputenc}
+\RequirePackage[T1]{fontenc}
+\RequirePackage{textcomp}
+\RequirePackage{tgpagella,qpxmath}
+\RequirePackage{tgheros}
+\RequirePackage[ttdefault=true,scale=1.034]{AnonymousPro}
+
+\endinput
diff --git a/arbeitsanweisung/vl-arbeitsanweisung.cls b/arbeitsanweisung/vl-arbeitsanweisung.cls
index cd4277d2261c398ad19caa52e67a6bb2845ec3f2..8213f624ba172376f63883be2c4df8fe3ca96733 100644
--- a/arbeitsanweisung/vl-arbeitsanweisung.cls
+++ b/arbeitsanweisung/vl-arbeitsanweisung.cls
@@ -1,13 +1,13 @@
-\setcounter{errorcontextlines}{100}
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesClass{vl-arbeitsanweisung}
- [2014/08/15 v0.1d Dokumentenklasse (RN/PTB)]
+ [2018/05/15 v1.0a Dokumentenklasse (RN/PTB)]
\DeclareOption*{\PassOptionsToClass{\CurrentOption}{scrartcl}}
\ProcessOptions\relax
-\PassOptionsToPackage{paper=a4,pagesize,twoside,headinclude}{typearea}
+\PassOptionsToPackage{headinclude,usegeometry}{typearea}
\LoadClass[%
+,twoside
,fontsize=12pt% ???
,headings=normal
,toc=bibliographynumbered
@@ -16,6 +16,25 @@
%,origlongtable
]{scrartcl}
+\RequirePackage[%
+paper=a4paper,
+headheight=16mm,
+marginparwidth=5mm,
+left=22mm,
+right=16mm,
+textheight=238mm,
+top=20bp,
+headsep=10mm,
+footskip=15mm,
+]{geometry}
+
+\renewcommand*\maketitle[1][1]{%
+ \begingroup
+ \centering \noindent\usekomafont{title}
+ \Large \@title \par \bigskip\medskip
+ \endgroup
+}
+
\RequirePackage{babel}
\RequirePackage{tabularx}
\let\ptb@endtabularx=\TX@endtabularx
@@ -23,7 +42,8 @@
\RequirePackage{pdflscape,picture,trimspaces,url,varwidth,placeins}
\RequirePackage{zref-totpages,graphicx,booktabs,array,pdfpages}
\RequirePackage{longtable,siunitx,ragged2e,ifxetex,ifluatex,relsize}
-\RequirePackage[manualmark]{scrpage2}
+%%%\RequirePackage[manualmark]{scrpage2}
+\RequirePackage{siunitx-PTB}
\let\ptb@tempdima=\@clnwd
\let\ptb@tempdimb=\@clnht
@@ -38,12 +58,6 @@
\newcommand*\ptb@Date{}
\newcommand*\ptb@tempa{0}
-\newcommand*\Devision[1]{\xdef\ptb@Devision{\trim@spaces{#1}}}
-\newcommand*\Department[1]{\xdef\ptb@Department{\trim@spaces{#1}}}
-\newcommand*\WorkingGroup[1]{\xdef\ptb@WorkingGroup{\trim@spaces{#1}}}
-\newcommand*\Object[1]{\xdef\ptb@Object{\trim@spaces{#1}}}
-\newcommand*\Edition[1]{\xdef\ptb@Edition{\trim@spaces{#1}}}
-
\ifxetex
\def\ptb@tempa{1}%
\else
@@ -53,19 +67,9 @@
\fi
\ifcase\ptb@tempa % pdfTeX
- \RequirePackage[T1]{fontenc}
- \RequirePackage[utf8]{inputenc}
- \RequirePackage{textcomp}
- \RequirePackage{lmodern}
- \RequirePackage{tgpagella,qpxmath}
- %\RequirePackage{mathpazo}
- \RequirePackage{tgheros}
-\or % Unicode (XeTeX oder luaTeX)
- \RequirePackage{fontspec,unicode-math}
- \setmainfont[Ligatures=TeX]{TeX Gyre Pagella}
- \setsansfont[Ligatures=TeX]{TeX Gyre Heros}
- \setmonofont[Scale=MatchLowercase]{Latin Modern Mono}
- \setmathfont{TeX Gyre Pagella Math}
+ \input{vl-aa-old-engines.clo}
+\or % XeTeX oder luaTeX
+ \input{vl-aa-new-engines.clo}
\fi
\RequirePackage[
@@ -79,70 +83,24 @@
\MakeAutoQuote{»}{«}% Alt Gr + y / Alt Gr + x
\MakeAutoQuote{„}{“}% Alt Gr + v / Alt Gr + b
-\newcommand*\ptb@rulewidth{.4mm}
-
-\newcolumntype{C}{>{\centering}X}
-
-\newcommand*\ptb@f@@t{%
- \begingroup
- \let\TX@endtabularx=\ptb@endtabularx
- \normalfont\sffamily\tiny\extrarowheight=.3\baselineskip
- \arrayrulewidth=\ptb@rulewidth \extratabsurround=0pt %
- \renewcommand*\tabularxcolumn[1]{m{##1}}%
- \begin{tabularx}{\textwidth}[t]{@{}|C|C|C|C|C|@{}} \firsthline
- Erstellt: \\
- Abteilung~\ptb@Devision, Fachbereich~\ptb@Department
- &
- Ausgabe-Nr.: \\ \ptb@Edition
- &
- Datum: \\ \ptb@Date
- &
- Kurzbezeichnung: \\ \ptb@Ident
- &
- Seite von Seiten \\ \thepage~von \ztotpages
- \tabularnewline \lasthline
- \end{tabularx}%
- \endgroup
-}
-
-\newcommand*\ptb@VWD[1]{%
- \begin{varwidth}{\linewidth}\centering #1\end{varwidth}}
+\newcommand*\Devision[1]{\xdef\ptb@Devision{\trim@spaces{#1}}}
+\newcommand*\Department[1]{\xdef\ptb@Department{\trim@spaces{#1}}}
+\newcommand*\WorkingGroup[1]{\xdef\ptb@WorkingGroup{\trim@spaces{#1}}}
+\newcommand*\Object[1]{\xdef\ptb@Object{\trim@spaces{#1}}}
+\newcommand*\Edition[1]{\xdef\ptb@Edition{\trim@spaces{#1}}}
-\newcommand*\ptb@firstf@@t{%
-\begingroup
- \let\TX@endtabularx=\ptb@endtabularx
- \normalfont\sffamily\tiny\extrarowheight=.3\baselineskip
- \arrayrulewidth=\ptb@rulewidth \extratabsurround=0pt %
- \renewcommand\tabularxcolumn[1]{m{##1}}%
- \begin{tabularx}{\textwidth}{@{}|C|C|C|c|c|c|@{}} \firsthline
- Erstellt: \\
- Abteilung~\ptb@Devision, Fachbereich~\ptb@Department \\
- AG~\ptb@WorkingGroup
- &
- Geprüft: \\ Leiter~\ptb@Department \\~
- &
- Genehmigt: \\ QMV-\ptb@Devision \\~
- &
- \ptb@VWD{Ausgabe-Nr.: \\ \ptb@Edition\\~}
- &
- \ptb@VWD{Kurzbezeichnung: \\ \ptb@Ident\\~}
- &
- \ptb@VWD{Seite von Seiten \\ \thepage~von \ztotpages\\~}
- \tabularnewline
+\RequirePackage{tocstyle}
+\usetocstyle{allwithdot}
+\settocfeature{raggedhook}{\raggedright}% verhindert auch Trennung
+\settocfeature{pagenumberbox}{\makebox[1.5em][r]}
+\settocfeature{entryhook}{\overfullrule=\z@}
- &&&&& \tabularnewline
- &&&&& \tabularnewline
+\BeforeStartingTOC[toc]{\microtypesetup{protrusion=false}}
+\AfterStartingTOC[toc]{\microtypesetup{protrusion=true}}
- am:~\dotfill
- &
- am:~\dotfill
- &
- am:~\dotfill
- &
- && \tabularnewline \lasthline
- \end{tabularx}%
- \endgroup
-}
+\addtokomafont{caption}{\small}
+\addtokomafont{captionlabel}{\bfseries\sffamily}
+\setcapindent{1em}
\AtBeginDocument{%
\edef\ptb@Ident{\ptb@Department-AA-\ptb@Object}%
@@ -150,89 +108,119 @@
\date{}%
}
-\newcommand*\ptb@foot{%
- \ifnum\c@page=\@ne\ptb@firstf@@t\else\ptb@f@@t\fi
+\newcommand*\ptb@rulewidth{.4mm}
+\newcolumntype{C}{>{\centering}X}
+\newcommand*\ptb@VWD[1]{%
+ \begin{varwidth}{\linewidth}\centering #1\end{varwidth}}
+
+\newcommand*\ptb@head@even{%
+ \begin{picture}(0,0)
+ \linethickness{\ptb@rulewidth}%
+ \put(0,-2.5mm){\line(1,0){\textwidth}}%
+ \end{picture}
+ \normalfont\sffamily\bfseries\large
+ PTB\hfill Qualit\"atsmanagement-Arbeitsanweisung\hfill\ptb@Ident
}
-\newcommand*\ptb@head{%
+\newcommand*\ptb@head@odd{%
\begin{picture}(0,0)
\linethickness{\ptb@rulewidth}%
\put(0,-2.5mm){\line(1,0){\textwidth}}%
\end{picture}
\normalfont\sffamily\bfseries\large
- PTB\hfill Qualit\"atsmanagement-Arbeitsanweisung\hfill\ptb@Ident{}
+ \ptb@Ident \hfill Qualit\"atsmanagement-Arbeitsanweisung \hfill PTB
}
-\defpagestyle{headings}%
-{% Kopf
- %(OLL,OLD)% Linie
- {\ptb@head}% Gerade Seiten
- {\ptb@head}% Ungerade Seiten
- {% Einseitig
- }
- %(\textwidth,.8pt)% Linie
-}%
-{% Fuss
- %(OLL,OLD)% Linie
- {\ptb@foot}% Gerade Seiten
- {\ptb@foot}% Ungerade Seiten
- {% Einseitig
- }
- %(\textwidth,2mm)% Linie
-}
-\RequirePackage[%
-headheight=16mm,
-marginparwidth=5mm,
-left=22mm,
-right=16mm,
-textheight=225mm,
-top=35mm,
-headsep=14mm,
-footskip=15mm,
-]{geometry}
-
-\renewcommand*\maketitle[1][1]{%
+\newcommand*\ptb@first@foot{%
+ \raisebox{-4bp}[0pt][0pt]{%
\begingroup
- \centering \noindent\usekomafont{title}
- \Large \@title \par \bigskip\medskip
+ \let\TX@endtabularx=\ptb@endtabularx
+ \normalfont\sffamily\tiny\extrarowheight=.3\baselineskip
+ \arrayrulewidth=\ptb@rulewidth \extratabsurround=0pt %
+ \renewcommand\tabularxcolumn[1]{m{##1}}%
+ \begin{tabularx}{\textwidth}[b]{@{}|C|C|C|c|c|c|@{}} \firsthline
+ Erstellt: \\
+ Abteilung~\ptb@Devision, Fachbereich~\ptb@Department \\
+ AG~\ptb@WorkingGroup
+ &
+ Geprüft: \\ Leiter~\ptb@Department \\~
+ &
+ Genehmigt: \\ QMV-\ptb@Devision \\~
+ &
+ \ptb@VWD{Ausgabe-Nr.: \\ \ptb@Edition\\~}
+ &
+ \ptb@VWD{Kurzbezeichnung: \\ \ptb@Ident\\~}
+ &
+ \ptb@VWD{Seite von Seiten \\ \thepage~von \ztotpages\\~}
+ \tabularnewline
+
+ &&&&& \tabularnewline
+ &&&&& \tabularnewline
+
+ am:~\dotfill
+ &
+ am:~\dotfill
+ &
+ am:~\dotfill
+ &
+ && \tabularnewline \lasthline
+ \end{tabularx}%
+ \endgroup
+ }%
+}
+\newcommand*\ptb@foot@even{%
+ \begingroup
+ \let\TX@endtabularx=\ptb@endtabularx
+ \normalfont\sffamily\tiny\extrarowheight=.3\baselineskip
+ \arrayrulewidth=\ptb@rulewidth \extratabsurround=0pt %
+ \renewcommand*\tabularxcolumn[1]{m{##1}}%
+ \begin{tabularx}{\textwidth}[b]{@{}|C|C|C|C|C|@{}} \firsthline
+ Erstellt: \\
+ Abteilung~\ptb@Devision, Fachbereich~\ptb@Department
+ &
+ Ausgabe-Nr.: \\ \ptb@Edition
+ &
+ Datum: \\ \ptb@Date
+ &
+ Kurzbezeichnung: \\ \ptb@Ident
+ &
+ Seite von Seiten \\ \thepage~von \ztotpages
+ \tabularnewline \lasthline
+ \end{tabularx}%
+ \endgroup
+}
+\newcommand*\ptb@foot@odd{%
+ \begingroup
+ \let\TX@endtabularx=\ptb@endtabularx
+ \normalfont\sffamily\tiny\extrarowheight=.3\baselineskip
+ \arrayrulewidth=\ptb@rulewidth \extratabsurround=0pt %
+ \renewcommand*\tabularxcolumn[1]{m{##1}}%
+ \begin{tabularx}{\textwidth}[b]{@{}|C|C|C|C|C|@{}} \firsthline
+ Seite von Seiten \\ \thepage~von \ztotpages
+ &
+ Kurzbezeichnung: \\ \ptb@Ident
+ &
+ Datum: \\ \ptb@Date
+ &
+ Ausgabe-Nr.: \\ \ptb@Edition
+ &
+ Erstellt: \\
+ Abteilung~\ptb@Devision, Fachbereich~\ptb@Department
+ \tabularnewline \lasthline
+ \end{tabularx}%
\endgroup
}
-\emergencystretch=3em %
-\pagestyle{headings}
-\def\titlepagestyle{headings}
-
-\RequirePackage{tocstyle}
-%\RequirePackage[tocflat]{tocstyle}
-%\usetocstyle{KOMAlike}
-\usetocstyle{allwithdot}
-\settocfeature{raggedhook}{\raggedright}% verhindert auch Trennung
-\settocfeature{pagenumberbox}{\makebox[1.5em][r]}
-\settocfeature{entryhook}{\overfullrule=\z@}
-
-\BeforeStartingTOC[toc]{\microtypesetup{protrusion=false}}
-\AfterStartingTOC[toc]{\microtypesetup{protrusion=true}}
-
-\addtokomafont{caption}{\small}
-\addtokomafont{captionlabel}{\bfseries\sffamily}
-\setcapindent{1em}
-%\setcapwidth[c]{.8\textwidth}
-
-\renewcommand{\floatpagefraction}{.9}
-\renewcommand{\textfraction}{.1}
-\renewcommand{\topfraction}{.9}
-\renewcommand{\bottomfraction}{.5}
-\setcounter{topnumber}{3}
-\setcounter{bottomnumber}{1}
-\setcounter{totalnumber}{5}
-\renewcommand{\dbltopfraction}{.8}
-\renewcommand{\dblfloatpagefraction}{.6}
-
-% Einzelne Abbildungen nicht auf dem leeren Blatt zentrieren.
-\setlength\@fptop{0pt}
+\RequirePackage[manualmark,draft=false]{scrlayer-scrpage}
+\pagestyle{scrheadings}
+\clearpairofpagestyles
+\cehead{\ptb@head@even}
+\cohead{\ptb@head@odd}
+\cefoot{\ptb@foot@even}
+\cofoot{\ifnum\c@page=\@ne\ptb@first@foot\else\ptb@foot@odd\fi}
+\setkomafont{pageheadfoot}{\normalfont\normalsize}
% Kompaktere Listen
-
\RequirePackage[neverdecrease]{paralist}
\newcommand*\ptb@begin@list[1]{%
\ptb@tempdima=\parindent
@@ -256,9 +244,19 @@ footskip=15mm,
\pltopsep=\medskipamount
\plitemsep=\medskipamount
-\DeclareSIUnit\torr{Torr}
-\DeclareSIUnit\mbar{\milli bar}
+\renewcommand{\floatpagefraction}{.9}
+\renewcommand{\textfraction}{.1}
+\renewcommand{\topfraction}{.9}
+\renewcommand{\bottomfraction}{.5}
+\setcounter{topnumber}{3}
+\setcounter{bottomnumber}{1}
+\setcounter{totalnumber}{5}
+\renewcommand{\dbltopfraction}{.8}
+\renewcommand{\dblfloatpagefraction}{.6}
+% Einzelne Abbildungen nicht auf dem leeren Blatt zentrieren.
+\@fptop=0pt %
+% TODO: nach siunitx-PTB.sty ???
\sisetup{% Formatierung von Maßzahlen (z.B. Spaltentyp "S" in Tabellen)
,retain-zero-exponent=true
,retain-unity-mantissa=true
@@ -267,29 +265,8 @@ footskip=15mm,
,zero-decimal-to-integer=false
}
-\addto\extrasgerman{\sisetup{locale=DE}}
-\addto\extrasngerman{\sisetup{locale=DE}}
-\addto\extrasenglish{\sisetup{locale=US}}
-
-\renewcommand*\tabularxcolumn[1]{m{#1}}% vert. zentriert
-\keepXColumns
-
-\newcommand\tabsection[1]{%
- \multicolumn{\LT@cols}{@{}l@{}}{}\\[-.5em]
- \multicolumn{\LT@cols}{@{}l@{}}%
- {\makebox[0pt][l]{\parbox[b]{\TX@target}{%
- \usekomafont{disposition}#1}}} \\*[.25em]}
-
-\raggedbottom
+\emergencystretch=3em %
\RequirePackage[final]{hyperref}
\endinput
-%%
-%% End of file `arbeitsanweisung.cls'.
-
-Zu ltablex-Problemen:
-
-http://www.latex-community.org/forum/viewtopic.php?f=45&p=39984
-(Axel Sommerfeld)
-
diff --git a/kalibrierschein/siunitx-PTB.sty b/kalibrierschein/siunitx-PTB.sty
index 2ba7cbe14fe9ce04d51197b6ca44f1ec5c250059..a8de3b6f376163766b6a8e320830cc73fe4db2db 100644
--- a/kalibrierschein/siunitx-PTB.sty
+++ b/kalibrierschein/siunitx-PTB.sty
@@ -10,8 +10,8 @@
\providecommand*\vl@tempd{}
\providecommand*\vl@tempe{}
-\DeclareSIUnit\torr{torr}
-\DeclareSIUnit\mbar{mbar}
+\DeclareSIUnit\torr{Torr}
+\DeclareSIUnit\mbar{\milli bar}
%%%\AtBeginDocument{%
\sisetup{%