diff --git a/kalibrierschein/IK-2019.clo b/kalibrierschein/IK-2019.clo
index 6c90a9ba603f88abd92d9390453f43e847af0def..551ed6849734c843c59d08f57faccaad0a418703 100644
--- a/kalibrierschein/IK-2019.clo
+++ b/kalibrierschein/IK-2019.clo
@@ -3,7 +3,10 @@
% Interne Kalibrierung
-\newcommand\ks@nationalEmblem{}
+\newcommand*\ks@nationalEmblem{\includegraphics[width=62bp]{Adler.pdf}}
+
+\newcommand*\ks@first@signature{}
+\newcommand*\ks@first@signature@content{}
\endinput
%%
diff --git a/kalibrierschein/KK-2019.clo b/kalibrierschein/KK-2019.clo
index 3772a23833b9c717ec93fef71f09337c4009f181..251f8ed401a63c71386b8610c6895328786ece41 100644
--- a/kalibrierschein/KK-2019.clo
+++ b/kalibrierschein/KK-2019.clo
@@ -3,7 +3,14 @@
% Kundenkalibrierung
-\newcommand\ks@nationalEmblem{\includegraphics[width=62bp]{Adler.pdf}}
+\newcommand*\ks@nationalEmblem{\includegraphics[width=62bp]{Adler.pdf}}
+\newcommand*\ks@first@signature{%
+ \put(\@tempdima,\@tempdimb){Im Auftrag}%
+ \put(\@tempdima,\@tempdimc){\scriptsize\itshape On behalf of PTB}%
+}
+\newcommand*\ks@first@signature@content{%
+ \put(\@tempdima,\@tempdimb){\ks@byOrder}%
+}
\endinput
%%
diff --git a/kalibrierschein/kalibrierschein-2019.cls b/kalibrierschein/kalibrierschein-2019.cls
deleted file mode 100644
index 94a6d175c19a237242ada2f921ce3e72184aefbb..0000000000000000000000000000000000000000
--- a/kalibrierschein/kalibrierschein-2019.cls
+++ /dev/null
@@ -1,447 +0,0 @@
-
-\setcounter{errorcontextlines}{100}
-\RequirePackage{ifdraft}
-\newcommand*\ks@location{Berlin}
-\newcommand*\ks@kalType{KK}
-\newcommand*\ks@layout{-2019}% derzeit nicht variabel
-\newcommand*\ks@langs{ngerman,main=english}
-\NeedsTeXFormat{LaTeX2e}[1999/12/01]
-\ProvidesClass{kalibrierschein}
- [2019/03/06 v0.4a Dokumentenklasse (RN/PTB)]
-\DeclareOption{BS}{\def\ks@location{Braunschweig}}
-\DeclareOption{BLN}{\def\ks@location{Berlin}}
-\DeclareOption{KK}{\edef\ks@kalType{\CurrentOption}}
-\DeclareOption{IK}{\edef\ks@kalType{\CurrentOption}}
-%\DeclareOption{2015}{\edef\ks@layout{-\CurrentOption}}
-\DeclareOption{german}{\def\ks@langs{english,main=ngerman}}
-\DeclareOption{ngerman}{\def\ks@langs{english,main=ngerman}}
-\DeclareOption{de}{\def\ks@langs{english,main=ngerman}}
-\DeclareOption{english}{\def\ks@langs{ngerman,main=english}}
-\DeclareOption{en}{\def\ks@langs{ngerman,main=english}}
-\DeclareOption*{\PassOptionsToClass{\CurrentOption}{scrartcl}}
-\ProcessOptions\relax
-\PassOptionsToPackage{paper=a4,pagesize,twoside=false,headinclude}
- {typearea}
-
-\newcommand*\ks@doc@style@code{391 00B o}% Kennung der Word-Vorlage
-
-\LoadClass[%
-,fontsize=11pt
-,headings=small
-,numbers=enddot
-,parskip=half
-]{scrartcl}
-
-\RequirePackage[%
-headheight=0bp,
-marginparwidth=0pt,
-left=69bp,
-textwidth=489bp,
-textheight=669bp,
-top=85bp,
-headsep=0bp,
-footskip=0bp,
-]{geometry}
-
-\raggedbottom % ???
-
-%\RequirePackage{showframe}
-
-\RequirePackage[\ks@langs]{babel}
-\RequirePackage[autostyle=true,german=guillemets,maxlevel=3]{csquotes}%
-\RequirePackage{iflang}
-\IfLanguageName{ngerman}{%
- \newcommand*\ks@draftName{Entwurf}%
- \AtEndOfClass{\shorthandon{"}}
- \defineshorthand{"`}{\openautoquote}
- \defineshorthand{"'}{\closeautoquote}
-}{%
- \newcommand*\ks@draftName{Draft}%
-}
-\MakeAutoQuote{»}{«}
-\AtEndOfClass{%
- \@ifpackageloaded{inputenc}{}{%
- \catcode`\»=\active
- \catcode`\«=\active
- }%
-}
-
-% nach scrsize11pt.clo
-\def\normalsize{%
- \@setfontsize\normalsize{11.2}{12.85}%
- \abovedisplayskip 11\p@ \@plus3\p@ \@minus6\p@
- \abovedisplayshortskip \z@ \@plus3\p@
- \belowdisplayshortskip 6.5\p@ \@plus3.5\p@ \@minus3\p@
- \belowdisplayskip \abovedisplayskip
- \let\@listi\@listI
-}
-
-\def\huge{\@setfontsize\huge{20.26}{25.3}}
-\def\large{\@setfontsize\large{12.17}{14.2}}
-\def\tiny{\@setfontsize\tiny\@viipt\@viiipt}
-
-\RequirePackage{textcomp}
-
-\RequirePackage{tabularx}
-\let\ks@TX@endtabularx=\TX@endtabularx
-\newcommand*\origTabularx{%
- \let\TX@endtabularx=\ks@TX@endtabularx
-}
-\RequirePackage{ltablex}\keepXColumns{}
-\setcounter{LTchunksize}{100}
-
-\PassOptionsToPackage{final}{graphicx}
-\RequirePackage{eso-pic,graphicx,booktabs}
-\RequirePackage{zref-totpages}
-
-\newif\ifXeOrLua \XeOrLuafalse
-\RequirePackage{ifxetex,ifluatex,ifpdf}
-
-\ifxetex% XeTeX
- \XeOrLuatrue
-\else
- \ifluatex% LuaTeX
- \XeOrLuatrue
- \else
- \ifpdf% pdfTeX
- \else% TeX+dvips
- \fi
- \fi
-\fi
-
-\RequirePackage{amsmath}
-
-\ifXeOrLua% XeLaTeX oder luaLaTeX
-
-\typeout{#### XeLaTeX oder luaLaTeX}
-
-%\RequirePackage[no-math]{fontspec}
-\RequirePackage{unicode-math}
-\setmainfont{texgyreheros}[
- Ligatures=TeX,
- Extension=.otf,
- UprightFont=*-regular,
- BoldFont=*-bold,
- ItalicFont=*-italic,
- BoldItalicFont=*-bolditalic.otf]
-\setsansfont{texgyreheros}[
- Ligatures=TeX,
- Extension=.otf,
- UprightFont=*-regular,
- BoldFont=*-bold,
- ItalicFont=*-italic,
- BoldItalicFont=*-bolditalic.otf]
-\setmathfont{Asana-Math.otf}[math-style=ISO,bold-style=ISO]% damit sind Einheiten kursiv
-\setmathfont{texgyreheros-regular.otf}[range=\mathup,Scale=MatchLowercase]
-\setmathfont{texgyreheros-italic.otf}[range=\mathit,Scale=MatchLowercase]
-\setmathfont{texgyreheros-bold.otf}[range=\mathbfup,Scale=MatchLowercase]
-\setmathfont{texgyreheros-bolditalic.otf}[range=\mathbfit,Scale=MatchLowercase]
-\setmathfont{texgyreheros-regular.otf}[range=\mathsfup,Scale=MatchLowercase]
-\setmathfont{texgyreheros-italic.otf}[range=\mathsfit,Scale=MatchLowercase]
-\setmathfont{texgyreheros-bold.otf}[range=\mathbfsfup,Scale=MatchLowercase]
-\setmathfont{texgyreheros-bolditalic.otf}[range=\mathbfsfit,Scale=MatchLowercase]
-\setmathfont{texgyreheros-regular.otf}[range=\mathpunct]
-\setmathfont{Asana-Math.otf}[range=\int]
-% (Ulrike): )als letztes immer einen
-% richtiger Mathfont, damit diverse Werte korrekt gesetzt werden.
-% Wirklich nötig?
-
-\RequirePackage{newunicodechar}
-\newunicodechar{^^^^202f}{\,}% 'NARROW NO-BREAK SPACE' (\u202F, 8239)
-\newunicodechar{^^^^2009}{\,\hspace{0pt}}% 'THIN SPACE'
-\newunicodechar{^^^^00ad}{\-}% 'SOFT HYPHEN'
-\newunicodechar{^^^^2207}{{\setmathfont{Asana Math}^^^^2207}}% 'NABLA'
-
-%%% TODO: ^^^^ unschädlich machen für pdflatex
-
-\else
-
-\typeout{#### pdfLaTeX}
-
-\RequirePackage{fix-cm}% ???
-\RequirePackage[T1]{fontenc}
-\RequirePackage[utf8]{inputenc}
-\DeclareUnicodeCharacter{202F}{\,}
-\DeclareUnicodeCharacter{2009}{\,\hspace{0pt}}
-\DeclareUnicodeCharacter{22C5}{\cdot}
-\DeclareUnicodeCharacter{03B8}{\theta}
-\RequirePackage[scale=1]{tgheros}
-%%%\RequirePackage[scaled=1]{helvet}
-\renewcommand*\familydefault{\sfdefault}
-%%%\newcommand*\mathfamilydefault{\familydefault}
-%%\newcommand*\math@sfdefault{\sfdefault}
-
-\RequirePackage{sfmath}
-
-\fi
-
-\RequirePackage[neverdecrease]{paralist}
-\let\itemize\compactitem
-\let\enditemize\endcompactitem
-\let\enumerate\compactenum
-\let\endenumerate\endcompactenum
-\let\description\compactdesc
-\let\enddescription\endcompactdesc
-\pltopsep=\medskipamount
-\plitemsep=\smallskipamount
-
-\newcommand*\ks@PTB{Physikalisch-Technische Bundesanstalt}
-\newcommand*\ks@BSuB{Braunschweig und Berlin}
-
-\RequirePackage{picture}
-
-\let\@tempdimd=\@clnwd
-\let\@tempdime=\@clnht
-\let\@tempdimf=\@dashdim
-
-\newcommand*\ks@tempa{}
-\newcommand*\ks@tempb{}
-\newcommand*\ks@tempc{}
-\newcommand*\ks@tempd{}
-\newcommand*\ks@tempe{}
-
-\newtoks\ks@tab
-\newcommand*\ks@colSpec{}
-
-\newcommand*\ks@add[1]{%
- \ks@tab\expandafter{\the\ks@tab#1}%
-}
-
-\newcommand*\ks@addTabLine[1]{%
- \def\@tempc{}%
- \@for\@tempa:=#1\do{%
- \edef\@tempb{\noexpand\ks@tab\noexpand\expandafter{%
- \the\noexpand\ks@tab\@tempc\@tempa}}%
- \@tempb
- \def\@tempc{\noexpand&}% \noexpand hier unnötig, aber ...
- }%
-}
-
-\newcommand*\ks@getColSpec[2]{%
- \let#2=\@empty
- \@for\@tempa:=#1\do{%
- \edef#2{#2X}%
- }%
- \ifx#2\@empty
- %\def#2{l}%
- \def#2{X}%
- \fi
-}
-
-\newcommand*\ks@printDevicesTable[3]{% #1 = width, #2 = 1. offset, #3 = 2. offset
- \ks@tab{}%
- \ks@getColSpec{\ks@type}{\ks@colSpec}%
- \edef\@tempa{\noexpand\begin{tabularx}{#1}[t]{@{}\ks@colSpec @{}}}%
- \ks@tab\expandafter{\@tempa}%
- \ks@addTabLine{\ks@manufacturer}%
- \ks@add{\tabularnewline[#2]}%
- \ks@addTabLine{\ks@type}%
- \ks@add{\tabularnewline[#3]}%
- \ks@addTabLine{\ks@serialNo}%
- %%\ks@add{\ks@serialNo}%
- %%\ks@addCommaItems{\ks@serialNo}% ???
- \ks@add{\end{tabularx}}%
- \begingroup
- \tabcolsep=1em %
- \origTabularx
- %\showthe\ks@tab
- \the\ks@tab
- \endgroup
-}
-
-%\RequirePackage[manualmark]{scrpage2}
-\RequirePackage[manualmark,draft=false]{scrlayer-scrpage}
-\clearpairofpagestyles
-\lohead{\ks@head}
-\lofoot{\ks@foot}
-
-\definecolor{PTBcolor}{RGB}{0,155,206}
-
-
-\input{ks-common.clo}% Titelseiten- und Layout-Definition
-\input{\ks@kalType\ks@layout.clo}% Titelseiten- und Layout-Definition
-
-\newcommand*\ks@type{%
- Typ des Ger\"ates}
-\newcommand*\type[1]{\xdef\ks@type{\trim@spaces{#1}}}
-
-\newcommand*\ks@manufacturer{Namen der Hersteller}
-\newcommand*\manufacturer[1]{%
- \xdef\ks@manufacturer{\trim@spaces{\detokenize{#1}}}%
-}
-
-\newcommand*\ks@object{%
- Name des Ger\"ates, kurze Charakterisierung}
-\newcommand*\object[1]{\xdef\ks@object{\trim@spaces{#1}}}
-
-\newcommand*\ks@applicant{%
- Name des Auftraggebers, Stra\ss e, Firmensitz}
-\newcommand*\applicant[1]{\long\gdef\ks@applicant{#1}}
-
-\newcommand*\ks@serialNo{XXX,YYY}
-\newcommand*\serialNo[1]{%
- \xdef\ks@serialNo{\trim@spaces{\detokenize{#1}}}%
-}
-
-\newcommand*\ks@refNo{YYY-ZZZZZZZZ}
-\newcommand*\refNo[1]{\xdef\ks@refNo{\trim@spaces{#1}}}
-
-\newcommand*\ks@calibMark{YYY-XXXXXXX}
-\newcommand*\calibMark[1]{\xdef\ks@calibMark{\trim@spaces{#1}}}
-
-\newcommand*\ks@referenceMark{YYY-XXXXXXX}
-\newcommand*\referenceMark[1]{\xdef\ks@referenceMark{\trim@spaces{#1}}}
-
-\newcommand*\ks@calibDate{????-??-??}
-\newcommand*\calibDate[1]{\xdef\ks@calibDate{\trim@spaces{#1}}}
-
-\newcommand*\ks@certificateDate{????-??-??}
-\newcommand*\certificateDate[1]{\xdef\ks@certificateDate{\trim@spaces{#1}}}
-
-\newcommand*\ks@byOrder{Peter Silie}
-\newcommand*\byOrder[1]{\xdef\ks@byOrder{\trim@spaces{#1}}}
-
-\newcommand*\ks@examiner{Ellen Bogen}
-\newcommand*\examiner[1]{\xdef\ks@examiner{\trim@spaces{#1}}}
-
-\newcommand*\ks@missingEntries{0}
-\newcommand*\missingEntries[1]{\xdef\ks@missingEntries{\trim@spaces{#1}}}
-
-\newcolumntype{C}{>{\centering\arraybackslash}X}
-
-\RequirePackage{siunitx-PTB}
-
-\newcommand\resultTable[3][]{%
- %\begingroup
- \@tempcnta=#2 %
- \@tempcntb=\numexpr(\@tempcnta-1)*2 %
- \@tempdimc=\dimexpr (\textwidth - \@tempcntb\tabcolsep) / \@tempcnta %
- \@tempcntb=\@tempcnta
- \def\@tempa{}%
- \loop\ifnum\@tempcnta>\z@
- %%%\edef\@tempa{\@tempa S[table-column-width=\the\@tempdimc]}% ???
- \edef\@tempa{\@tempa r}%
- \advance\@tempcnta\m@ne
- \repeat
- \edef\@tempa{\noexpand\begin{longtable}{@{}\@tempa @{}}}%
- \expandafter\ks@add\expandafter{\@tempa}%
- \ks@add{\\\toprule}%
- \ifx\relax#1\relax\else
- \ks@add{\multicolumn{\the\@tempcntb}{@{}c@{}}{#1}\\\toprule}%
- \fi
- \ks@add{#3}%
- \ks@add{\bottomrule\end{longtable}}%
- %\endgroup
-}
-
-\newcommand*\printFirstPage{%
- \thispagestyle{empty}%
- \AddToShipoutPicture*{\ks@printFirstPage}%
- \mbox{}\clearpage
- \global\let\ks@printFirstPage\@empty
- \global\let\printFirstPage\@empty
-}
-
-\newcommand*\ks@@foot{}
-
-\newcommand*\printLastPage{%
- \clearpage
- \global\let\ks@@foot=\ks@foot@add
- \ks@lastPage
-}
-
-\newcommand*\printResultTable{%
- \begingroup
- \LTleft=\fill \LTright=\fill% Tabelle zentriert
- \sisetup{%
- retain-zero-exponent
- }%
- \the\ks@tab
- \endgroup
-}
-
-\newcommand*\ks@applicant@table{%
- \begingroup
- \let\ks@tempa=\\%
- \let\\=\relax
- \ks@tab{}%
- \expandafter\@tfor\expandafter\ks@tempb\expandafter
- :\expandafter=\ks@applicant\do{%
- \expandafter\edef\expandafter\ks@tempb\expandafter{%
- \expandafter\trim@spaces\expandafter{\ks@tempb}}%
- \ifx\ks@tempb\@empty\else
- \expandafter\ks@add\expandafter{\ks@tempb\tabularnewline}%
- \fi
- }%
- \let\\=\ks@tempa
- \extrarowheight=-.1ex %
- \begin{tabular}[t]{@{}l@{}}%
- \the\ks@tab
- \end{tabular}%
- \endgroup
-}
-
-\AtBeginDocument{
- \ifdraft{
- \AddToShipoutPictureBG{%
- \AtTextCenter{%
- \makebox(0,0)[c]{\resizebox{\textwidth}{!}{%
- \rotatebox{54.7}{%
- \textnormal{\textsf{\textbf{%
- \color{lightgray}\ks@draftName}}}}}}%
- }%
- }%
- }{%
- \ifnum\number\ks@missingEntries>0 %
- \AddToShipoutPictureBG{%
- \AtTextCenter{%
- \makebox(0,0)[c]{\resizebox{\textwidth}{!}{%
- \rotatebox{54.7}{%
- \textnormal{\textsf{\textbf{%
- \color{lightgray}Fehler:~\ks@missingEntries}}}}}}%
- }%
- }%
- \fi
- }
-}
-
-\RequirePackage[
-% factor=1500
-% ,verbose=true
-,final=true
-% ,letterspace=100
-,babel=true
-]{microtype}
-
-\emergencystretch=1em %
-\pagestyle{scrheadings}
-
-\renewcommand\section{%
- \@startsection{section}% name
- {1}% level
- {\z@}% indent
- {-3ex \@plus -.5ex \@minus -.2ex}% beforeskip (abs.!)
- {.6ex \@plus.2ex}% afterskip
- {\ifnum \scr@compatibility>\@nameuse{scr@v@2.96}\relax
- \setlength{\parfillskip}{\z@ plus 1fil}\fi
- \raggedsection\normalfont\sectfont\nobreak\size@section}%
-}
-
-\endinput
-%%
-%% End of file `kailbrierschein.cls'.
-
-sudo cp $(kpsewhich --var-value TEXMFSYSVAR)/fonts/conf/texlive-fontconfig.conf /etc/fonts/conf.d/09-texlive.conf
-
-sudo fc-cache -fsv
-
-mkluatexfontdb --force --verbose=-1 -vvv
-
-
-
-
-
-
-
-
-
diff --git a/kalibrierschein/kalibrierschein.cls b/kalibrierschein/kalibrierschein.cls
index dd4d8fd0bdffef87fae4b1a79d56958865b7dc91..75255015312477f0dce779ce731647a09b899b8f 100644
--- a/kalibrierschein/kalibrierschein.cls
+++ b/kalibrierschein/kalibrierschein.cls
@@ -3,16 +3,16 @@
\RequirePackage{ifdraft}
\newcommand*\ks@location{Berlin}
\newcommand*\ks@kalType{KK}
-\newcommand*\ks@layout{-0000}
+\newcommand*\ks@layout{-2019}% derzeit nicht variabel
\newcommand*\ks@langs{ngerman,main=english}
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesClass{kalibrierschein}
- [2019/02/15 v0.3b Dokumentenklasse (RN/PTB)]
+ [2019/03/07 v0.4a Dokumentenklasse (RN/PTB)]
\DeclareOption{BS}{\def\ks@location{Braunschweig}}
\DeclareOption{BLN}{\def\ks@location{Berlin}}
\DeclareOption{KK}{\edef\ks@kalType{\CurrentOption}}
\DeclareOption{IK}{\edef\ks@kalType{\CurrentOption}}
-\DeclareOption{2015}{\edef\ks@layout{-\CurrentOption}}
+%\DeclareOption{2015}{\edef\ks@layout{-\CurrentOption}}
\DeclareOption{german}{\def\ks@langs{english,main=ngerman}}
\DeclareOption{ngerman}{\def\ks@langs{english,main=ngerman}}
\DeclareOption{de}{\def\ks@langs{english,main=ngerman}}
@@ -20,10 +20,10 @@
\DeclareOption{en}{\def\ks@langs{ngerman,main=english}}
\DeclareOption*{\PassOptionsToClass{\CurrentOption}{scrartcl}}
\ProcessOptions\relax
-\PassOptionsToPackage{paper=a4,pagesize,twoside=false,headinclude}{typearea}
+\PassOptionsToPackage{paper=a4,pagesize,twoside=false,headinclude}
+ {typearea}
-% Wegen bug in fontspec v2.4a
-%\RequirePackage{fixltx2e}
+\newcommand*\ks@doc@style@code{391 00B o}% Kennung der Word-Vorlage
\LoadClass[%
,fontsize=11pt
@@ -32,6 +32,19 @@
,parskip=half
]{scrartcl}
+\RequirePackage[%
+headheight=0bp,
+marginparwidth=0pt,
+left=69bp,
+textwidth=489bp,
+textheight=669bp,
+top=85bp,
+headsep=0bp,
+footskip=0bp,
+]{geometry}
+
+\raggedbottom % ???
+
%\RequirePackage{showframe}
\RequirePackage[\ks@langs]{babel}
@@ -53,30 +66,21 @@
}%
}
+% nach scrsize11pt.clo
+\def\normalsize{%
+ \@setfontsize\normalsize{11.2}{12.85}%
+ \abovedisplayskip 11\p@ \@plus3\p@ \@minus6\p@
+ \abovedisplayshortskip \z@ \@plus3\p@
+ \belowdisplayshortskip 6.5\p@ \@plus3.5\p@ \@minus3\p@
+ \belowdisplayskip \abovedisplayskip
+ \let\@listi\@listI
+}
+
\def\huge{\@setfontsize\huge{20.26}{25.3}}
\def\large{\@setfontsize\large{12.17}{14.2}}
\def\tiny{\@setfontsize\tiny\@viipt\@viiipt}
-\raggedbottom% ???
-
-
\RequirePackage{textcomp}
-%%%\RequirePackage[standard-baselineskips]{cmbright}
-%%%\RequirePackage[math]{iwona}
-%%%\RequirePackage[math]{kurier}
-%%%\RequirePackage{lxfonts}
-% 1 %\RequirePackage{arevmath}
-
-
-
-%\let\celsius=\relax \let\ohm=\relax
-%\RequirePackage{gensymb}
-
-
-
-%%%\RequirePackage[T1,small]{eulervm}
-
-%%%\RequirePackage{ziffer}
\RequirePackage{tabularx}
\let\ks@TX@endtabularx=\TX@endtabularx
@@ -171,22 +175,6 @@
\fi
-%%%\RequirePackage{babel}
-%\RequirePackage{gensymb} %% ???
-%\let\ks@celsius=\celsius
-%\let\celsius=\relax
-%\let\ohm=\relax
-%\RequirePackage{siunitx}
-%\let\celsius=\ks@celsius
-
-\iffalse
-\AtBeginDocument{%
- \RequirePackage[babel=once,german=guillemets]{csquotes}
- \defineshorthand{"`}{\openautoquote}
- \defineshorthand{"'}{\closeautoquote}
-}
-\fi
-
\RequirePackage[neverdecrease]{paralist}
\let\itemize\compactitem
\let\enditemize\endcompactitem
@@ -201,7 +189,6 @@
\newcommand*\ks@BSuB{Braunschweig und Berlin}
\RequirePackage{picture}
-\RequirePackage[manualmark]{scrpage2}
\let\@tempdimd=\@clnwd
\let\@tempdime=\@clnht
@@ -262,28 +249,16 @@
\endgroup
}
-\defpagestyle{headings}%
-{% Kopf
- %(OLL,OLD)% Linie
- {\pagemark\hfill}% Gerade Seiten
- {\hfill\pagemark}% Ungerade Seiten
- {% Einseitig
- \ks@head
- }
- %(\textwidth,.8pt)% Linie
-}%
-{% Fuss
- %(OLL,OLD)% Linie
- {}% Gerade Seiten
- {}% Ungerade Seiten
- {% Einseitig
- \ks@foot
- }
- %(ULL,ULD)% Linie
-}
+%\RequirePackage[manualmark]{scrpage2}
+\RequirePackage[manualmark,draft=false]{scrlayer-scrpage}
+\clearpairofpagestyles
+\lohead{\ks@head}
+\lofoot{\ks@foot}
-\newcommand*\ks@foot{}
+\definecolor{PTBcolor}{RGB}{0,155,206}
+
+\input{ks-common.clo}% Titelseiten- und Layout-Definition
\input{\ks@kalType\ks@layout.clo}% Titelseiten- und Layout-Definition
\newcommand*\ks@type{%
@@ -329,7 +304,7 @@
\newcommand*\ks@examiner{Ellen Bogen}
\newcommand*\examiner[1]{\xdef\ks@examiner{\trim@spaces{#1}}}
-\newcommand*\ks@missingEntries{1}
+\newcommand*\ks@missingEntries{0}
\newcommand*\missingEntries[1]{\xdef\ks@missingEntries{\trim@spaces{#1}}}
\newcolumntype{C}{>{\centering\arraybackslash}X}
@@ -367,9 +342,11 @@
\global\let\printFirstPage\@empty
}
+\newcommand*\ks@@foot{}
+
\newcommand*\printLastPage{%
\clearpage
- \global\let\ks@foot=\ks@@foot
+ \global\let\ks@@foot=\ks@foot@add
\ks@lastPage
}
@@ -393,10 +370,11 @@
\expandafter\edef\expandafter\ks@tempb\expandafter{%
\expandafter\trim@spaces\expandafter{\ks@tempb}}%
\ifx\ks@tempb\@empty\else
- \expandafter\ks@add\expandafter{\ks@tempb\tabularnewline[.3ex]}%
+ \expandafter\ks@add\expandafter{\ks@tempb\tabularnewline}%
\fi
}%
\let\\=\ks@tempa
+ \extrarowheight=-.1ex %
\begin{tabular}[t]{@{}l@{}}%
\the\ks@tab
\end{tabular}%
@@ -436,7 +414,7 @@
]{microtype}
\emergencystretch=1em %
-\pagestyle{headings}
+\pagestyle{scrheadings}
\renewcommand\section{%
\@startsection{section}% name
diff --git a/kalibrierschein/ks-common.clo b/kalibrierschein/ks-common.clo
index 923e195dd511f8225c498faf8b214c29803bd1cd..1c7d7f6b699290e22fc71e8fb700733271ab938e 100644
--- a/kalibrierschein/ks-common.clo
+++ b/kalibrierschein/ks-common.clo
@@ -109,8 +109,7 @@
\advance\@tempdimb-30bp %
%%%\@tempdimb=204bp %
\@tempdimc=\@tempdimb \advance\@tempdimc-10bp %
- \put(\@tempdima,\@tempdimb){Im Auftrag}
- \put(\@tempdima,\@tempdimc){\scriptsize\itshape On behalf of PTB}
+ \ks@first@signature
\put(\@tempdimd,\@tempdimb){\ks@location, \ks@certificateDate}
\put(\@tempdime,\@tempdimb){Im Auftrag}
\put(\@tempdime,\@tempdimc){\scriptsize\itshape On behalf of PTB}
@@ -120,7 +119,7 @@
\put(\@tempdimd,\@tempdimc){\scriptsize\itshape Seal}
%--------------------------------
\advance\@tempdimb-40bp %
- \put(\@tempdima,\@tempdimb){\ks@byOrder}
+ \ks@first@signature@content
\put(\@tempdime,\@tempdimb){\ks@examiner}
%--------------------------------
\put(46bp,256bp){\rotatebox[origin=c]{90}{\tiny \ks@doc@style@code}}
diff --git a/kalibrierschein/test-ks-IK-2019.tex b/kalibrierschein/test-ks-IK-2019.tex
index 373f5424de021099ee4ab511cd0aeb8542c8b984..0c6f22f758e2b3eb28fa9c7e1807914d4406518a 100644
--- a/kalibrierschein/test-ks-IK-2019.tex
+++ b/kalibrierschein/test-ks-IK-2019.tex
@@ -1,7 +1,6 @@
%---------------------------
-\listfiles
-\documentclass[en,IK,BLN]{kalibrierschein-2019}
+\documentclass[en,IK,BLN]{kalibrierschein}
\resultTable{ 6 }{%
{\(p_{cal}\)}&{\(p_{ind}\)}&{\(p_r\)}&{\(p_{ind} - p_r\)}&{\(e\)}&{\(U(k=2)\)}\\
mbar&mbar&mbar&mbar&&\\\toprule\endhead
diff --git a/kalibrierschein/test-ks-KK-2019.tex b/kalibrierschein/test-ks-KK-2019.tex
index c7e8062b4a01e71e85408239abcecebcaa7c812b..c8a3a9fecfc4ab53059da5bfa0e82f4deb00d921 100644
--- a/kalibrierschein/test-ks-KK-2019.tex
+++ b/kalibrierschein/test-ks-KK-2019.tex
@@ -1,7 +1,6 @@
%---------------------------
-\listfiles
-\documentclass[en,KK,BLN]{kalibrierschein-2019}
+\documentclass[en,KK,BLN]{kalibrierschein}
\resultTable[Gas:~N$_2$]{ 6 }{%
{\(p_{cal}\)}&{\(p_{ind}\)}&{\(p_r\)}&{\(p_{ind} - p_r\)}&{\(e\)}&{\(U(k=2)\)}\\
mbar&mbar&mbar&mbar&&\\\toprule\endhead
@@ -51,7 +50,8 @@ mbar&mbar&mbar&mbar&&\\\toprule\endhead
% Anzahl Kommas bei \type gibt die Spaltenzahl vor.
% \manufacturer und \serialNo sollten dieselbe Anzahl Kommas haben.
\serialNo{ YEA06800, 1449 }
-\applicant{ { BOC EDWARDS } { Marshall Road } { EASTBOURNE, EAST SUSSEX } { BN22 9BA } }
+\applicant{ { BOC EDWARDS } { Marshall Road } { EASTBOURNE, EAST SUSSEX }
+{ BN22 9BA } }
\refNo{ ? }
\calibMark{ 75120 PTB 13 }
\calibDate{ 2013-11-26 }