diff --git a/antragsbestaetigung/antragsbestaetigung-test-de.pdf b/antragsbestaetigung/antragsbestaetigung-test-de.pdf
index b7c6d256cfcfe01cc25b9e99de38db97208443f0..2b20ba0df4ff1d9d12e35eee4be8d9c20e3c8b63 100644
Binary files a/antragsbestaetigung/antragsbestaetigung-test-de.pdf and b/antragsbestaetigung/antragsbestaetigung-test-de.pdf differ
diff --git a/antragsbestaetigung/antragsbestaetigung-test-de.tex b/antragsbestaetigung/antragsbestaetigung-test-de.tex
index 6664263487008a825aea13dbcc8483cdf9c7a1a1..72cadc673ba5e584025843bcb43bfcc42d0fc115 100644
--- a/antragsbestaetigung/antragsbestaetigung-test-de.tex
+++ b/antragsbestaetigung/antragsbestaetigung-test-de.tex
@@ -3,33 +3,36 @@
\missingEntries{ 17 }
-\yourref{4711-0815}
-\yourmail{2015-05-08}
-
-\handledby{Dr. Karl Jousten}
-\myref{7.5-1V-15-05}
-\mymail{2015-05-14}
-\myphone{7316}
-\myfax{7777}
-\myemail{Karl.Jousten@ptb.de}
-
-\DateOfApplication{2015-04-23}
-\KindOfEnquiry{E-Mail}
-\DateOfEnquiry{}% wenn leer, dann identisch zu \DateOfApplication
-
-\Company{Oerlikon Leybold Vakuum GmbH}
-\Name{Hans-Günter Eichner}
-\Street{Bonner Str. 498}
-\Zipcode{50968}
-\Town{Köln}
-\Land{}
-
-\Device{CDG 1\,Torr}
-\Condition{Mondschein}
-\ScheduleDate{2015-07-13}
-\Fee{1789.98}
-
-\date{2015-05-26}
+\handledby{Ute Becker}%{{DB}}
+\myref{7.5-1V-17-54}%{{DB}}
+%%%\mymail{}%{{DB}}
+\myphone{7467}%{{DB}}?
+\myfax{7490}%{{DB}}?
+\myemail{Ute.Becker@ptb.de}%{{DB}}
+
+\yourref{4711-0815}%{{DB}}
+\yourmail{2017-07-14}%{{DB}}
+\KindOfEnquiry{E-Mail}%{{DB}}?
+\DateOfEnquiry{}%{{DB}}
+
+\Company{INFICON GmbH}%{{DB}}
+\Name{Christian Scherer}%{{DB}}
+\Street{Postfach 51 07 60}%{{DB}} zusätzl. Makro \POB (Post Office Box)?
+\Zipcode{50943}%{{DB}}
+\Town{Köln}%{{DB}}
+\Land{}%{{DB}} Leer, wenn Deutschland
+
+\Device{{Testleck gegen Atmosphäre Helium},
+ {Testleck gegen Atmosphäre R134a}}%{{DB}}
+%^-- besser zu enumerate-Liste wandeln
+\Condition{\SI{23+-0.5}{\degreeCelsius}}%{{DB}}
+\ScheduleDate{2017-08-28}%{{DB}}
+\Fee{1626.98}
+
+\subject{Antragsbestätigung %{{DB}}
+7.5-1V-17-54}
+
+\date{2017-07-18}%{{DB}}
\begin{document}
\end{document}
diff --git a/antragsbestaetigung/ptb-confirm-de.lco b/antragsbestaetigung/ptb-confirm-de.lco
index ca34b67836dc4d3724d60a0f8747995b7252d58f..1c0c960df547542f91bb6bc1ec1fd56d1df068bd 100644
--- a/antragsbestaetigung/ptb-confirm-de.lco
+++ b/antragsbestaetigung/ptb-confirm-de.lco
@@ -1,16 +1,16 @@
-\ProvidesFile{ptb-confirm-de.lco}[2015/05/26 v0.1a (ptb-confirm, german)]
+\ProvidesFile{ptb-confirm-de.lco}[2017/12/04 v0.1b (ptb-confirm, german)]
\makeatletter
\opening{}
-Aufgrund Ihres Antrags vom \vl@DateOfApplication{}, hier eingegangen per
+Aufgrund Ihres Antrags vom \usekomavar{yourmail}, hier eingegangen per
\vl@KindOfEnquiry{} am \vl@DateOfEnquiry{}, führt die PTB folgende
Kalibrierung durch:
\medskip\noindent
\begin{tabular}{@{}l@{~~}l@{}}
-Gerät: & \vl@Device \\
+Gerät(e): & \vl@Device \\
Kalibrierbedingungen: & \vl@Condition \\
Vorgesehenes Datum: & \vl@ScheduleDate \\
Gebühr: & \vl@Fee\,€ \\
diff --git a/antragsbestaetigung/ptb-confirm-en.lco b/antragsbestaetigung/ptb-confirm-en.lco
index d2387708730cb44d91dd2b93bbae48c30647ee36..82118f732cfa54df08437c97edb94c32014c21b1 100644
--- a/antragsbestaetigung/ptb-confirm-en.lco
+++ b/antragsbestaetigung/ptb-confirm-en.lco
@@ -1,16 +1,16 @@
-\ProvidesFile{ptb-confirm-en.lco}[2015/05/26 v0.1a (ptb-confirm, englisch)]
+\ProvidesFile{ptb-confirm-en.lco}[2017/12/04 v0.1b (ptb-confirm, englisch)]
\makeatletter
\opening{}
-According to your order of \vl@DateOfApplication{}, received here via
+According to your order of \usekomavar{yourmail}, received here via
\vl@KindOfEnquiry{} on \vl@DateOfEnquiry{}, PTB will carry out the following
calibration:
\medskip\noindent
\begin{tabular}{@{}l@{~~}l@{}}
-Device: & \vl@Device \\
+Device(s): & \vl@Device \\
Calibration conditions: & \vl@Condition \\
Scheduled date: & \vl@ScheduleDate \\
Calibration fee: & \vl@Fee\,€ \\
diff --git a/antragsbestaetigung/ptb-confirm.cls b/antragsbestaetigung/ptb-confirm.cls
index 5f776520cf6336a10d6af78b7731738a94ed72ca..2583891698c7be11c0066fad5c3d178d7fa8fb8c 100644
--- a/antragsbestaetigung/ptb-confirm.cls
+++ b/antragsbestaetigung/ptb-confirm.cls
@@ -4,7 +4,10 @@
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesClass{ptb-confirm}
- [2016/11/17 v0.1b PTB-Brief-Klasse (RN)]
+ [2017/12/04 v0.2a Bestaetigung (RN)]
+
+\RequirePackage{eso-pic,graphicx,xcolor}
+\RequirePackage{trimspaces,amsmath}
\DeclareOption*{\PassOptionsToClass{\CurrentOption}{ptbletter}}
@@ -14,19 +17,26 @@
,BLN
]{ptbletter}
-\RequirePackage{eso-pic,graphicx,xcolor}
+\RequirePackage{siunitx-PTB}
+
+\providecommand*\vl@tempa{}
+\providecommand*\vl@tempb{}
+\providecommand*\vl@tempc{}
+\providecommand*\vl@tempd{}
+\providecommand*\vl@tempe{}
\newcommand*\vl@setcommand[3][]{% #1=default (opt.), #2=macro, #3=value
\edef\vl@tempa{\trim@spaces@noexp{#3}}%
\expandafter\protected@xdef\csname #2\endcsname{%
\ifx\@empty\vl@tempa #1\else\vl@tempa\fi}%
}
+\newcommand*\vl@Setcommand[2]{% #1=macro, #2=value
+ \@namedef{#1}{#2}%
+}
-\RequirePackage{trimspaces,siunitx}
-
-\newcommand*\DateOfApplication[1]{\vl@setcommand{vl@DateOfApplication}{#1}}
\newcommand*\KindOfEnquiry[1]{\vl@setcommand{vl@KindOfEnquiry}{#1}}
-\newcommand*\DateOfEnquiry[1]{\vl@setcommand[\vl@DateOfApplication]{vl@DateOfEnquiry}{#1}}
+\newcommand*\DateOfEnquiry[1]{%
+ \vl@setcommand[\usekomavar{yourmail}]{vl@DateOfEnquiry}{#1}}
\newcommand*\Company[1]{\vl@setcommand{vl@Company}{#1}}
\newcommand*\Name[1]{\vl@setcommand{vl@Name}{#1}}
\newcommand*\Street[1]{\vl@setcommand{vl@Street}{#1}}
@@ -34,12 +44,11 @@
\newcommand*\Town[1]{\vl@setcommand{vl@Town}{#1}}
\newcommand*\Land[1]{\vl@setcommand{vl@Land}{#1}}
\newcommand*\Device[1]{\vl@setcommand{vl@Device}{#1}}
-\newcommand*\Condition[1]{\vl@setcommand{vl@Condition}{#1}}
+\newcommand*\Condition[1]{\vl@Setcommand{vl@Condition}{#1}}
\newcommand*\ScheduleDate[1]{\vl@setcommand{vl@ScheduleDate}{#1}}
-\newcommand*\Fee[1]{\vl@setcommand{vl@Fee}{\num{#1}}}
+\newcommand*\Fee[1]{\vl@Setcommand{vl@Fee}{\num{#1}}}
\newcommand*\missingEntries[1]{\vl@setcommand{vl@missingEntries}{#1}}
-\newcommand*\vl@DateOfApplication{}
\newcommand*\vl@KindOfEnquiry{}
\newcommand*\vl@DateOfEnquiry{}
\newcommand*\vl@Company{}
@@ -73,12 +82,12 @@
\ifx\vl@Land\@empty\else \bigskip \\ \textls[75]{\MakeUppercase{\vl@Land}} \fi
}
\iflanguage{ngerman}{%
- \sisetup{locale=DE}
- \subject{Antragsbestätigung}%
+ %\sisetup{locale=DE}
+ \subject{Antragsbestätigung~\usekomavar{myref}}%
\input{ptb-confirm-de.lco}%
}{%
- \sisetup{locale=UK}
- \subject{Confirmation of Order}%
+ %\sisetup{locale=UK}
+ \subject{Confirmation of Order~\usekomavar{myref}}%
\input{ptb-confirm-en.lco}%
}%
\end{letter}
diff --git a/kalibrierschein/siunitx-PTB.sty b/kalibrierschein/siunitx-PTB.sty
index cd998ebcdeb2a293dba23815f529e9dc778146a2..b8085e51e149a6f684b35c48364122972b685f23 100644
--- a/kalibrierschein/siunitx-PTB.sty
+++ b/kalibrierschein/siunitx-PTB.sty
@@ -2,7 +2,13 @@
\ProvidesPackage{siunitx-PTB}[2017/12/01 v0.1b Addionions to `siunitx'' (PTB/RN)]
-\RequirePackage{siunitx}
+\RequirePackage{amsmath,siunitx}
+
+\providecommand*\vl@tempa{}
+\providecommand*\vl@tempb{}
+\providecommand*\vl@tempc{}
+\providecommand*\vl@tempd{}
+\providecommand*\vl@tempe{}
\DeclareSIUnit\torr{torr}
\DeclareSIUnit\mbar{mbar}
@@ -45,24 +51,24 @@
\let\ke@orig@SI=\SI
\renewcommand*\SI[2][]{% tolerant gegenüber "?" statt Zahl
- \def\ks@tempa{#1}%
- \edef\ks@tempb{\trim@spaces{#2}}%
+ \def\vl@tempa{#1}%
+ \edef\vl@tempb{\trim@spaces{#2}}%
\ks@SI@i
}
\newcommand*\ks@SI@i[2][]{%
- \def\ks@tempc{?}%
- \ifx\ks@tempb\ks@tempc
+ \def\vl@tempc{?}%
+ \ifx\vl@tempb\vl@tempc
\ensuremath{\textbf{??}}\,\si[#1]{#2}%
\else
- \edef\ks@tempe{\noexpand\ke@orig@SI[\ks@tempa]{\ks@tempb}[#1]{#2}}%
- \ks@tempe
+ \edef\vl@tempe{\noexpand\ke@orig@SI[\vl@tempa]{\vl@tempb}[#1]{#2}}%
+ \vl@tempe
\fi
}
\let\ke@orig@num=\num
\renewcommand*\num[1]{% tolerant gegenüber "?" statt Zahl
- \edef\ks@tempb{\trim@spaces{#1}}%
- \def\ks@tempc{?}%
- \ifx\ks@tempb\ks@tempc
+ \edef\vl@tempb{\trim@spaces{#1}}%
+ \def\vl@tempc{?}%
+ \ifx\vl@tempb\vl@tempc
\ensuremath{\textbf{??}}%
\else
\ke@orig@num{#1}%
@@ -70,10 +76,12 @@
}
\RequirePackage{iflang}
-\IfLanguageName{ngerman}{%
- \AtBeginDocument{\sisetup{locale=DE}}
-}{%
- \AtBeginDocument{\sisetup{locale=UK}}
+\AtBeginDocument{%
+ \IfLanguageName{ngerman}{
+ \sisetup{locale=DE}
+ }{%
+ \sisetup{locale=UK}
+ }
}
\endinput
diff --git a/ptbletter/ptbletter.cls b/ptbletter/ptbletter.cls
index 5377d7bbe43baba0fef52fd6f64536ae1399b968..074cc7f87facfb12c1eb2803962683bc9d008dcd 100644
--- a/ptbletter/ptbletter.cls
+++ b/ptbletter/ptbletter.cls
@@ -4,7 +4,7 @@
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesClass{ptbletter}
- [2017/12/01 v0.2b PTB-Brief-Klasse (RN)]
+ [2017/12/04 v0.2c PTB-Brief-Klasse (RN)]
\let\ptb@tempdima=\@ovxx
\let\ptb@tempdimb=\@ovyy
@@ -73,9 +73,22 @@
% TODO: Mathematik?
\ifXeOrLua% XeLaTeX oder luaLaTeX
\RequirePackage{fontspec}
+ \RequirePackage{unicode-math}
\AtBeginDocument{% ???
- \setromanfont{TeX Gyre Pagella}[Scale=1,Ligatures=TeX]
- \setsansfont{TeX Gyre Heros}[Scale=MatchUppercase,Ligatures=TeX]
+ \setromanfont{texgyrepagella}[
+ Ligatures=TeX,
+ Extension=.otf,
+ UprightFont=*-regular,
+ BoldFont=*-bold,
+ ItalicFont=*-italic,
+ BoldItalicFont=*-bolditalic]
+ \setsansfont{texgyreheros}[
+ Ligatures=TeX,
+ Extension=.otf,
+ UprightFont=*-regular,
+ BoldFont=*-bold,
+ ItalicFont=*-italic,
+ BoldItalicFont=*-bolditalic]
}
\RequirePackage[TT={Scale=0.85}]{dejavu-otf}
\iffalse
@@ -111,18 +124,19 @@
\RequirePackage[\ptb@lang]{babel}
\RequirePackage{iflang}
-\IfLanguageName{ngerman}{%
- \RequirePackage[babel=once,german=guillemets]{csquotes}
-}{%
- \RequirePackage[babel=once]{csquotes}
- \useshorthands*{"}
+\AtBeginDocument{%
+ \IfLanguageName{ngerman}{
+ \RequirePackage[babel=once,german=guillemets]{csquotes}
+ }{%
+ \RequirePackage[babel=once]{csquotes}
+ \useshorthands*{"}
+ }
+ \MakeAutoQuote{»}{«}
+ \defineshorthand{"`}{\openautoquote}
+ \defineshorthand{"'}{\closeautoquote}
}
-\MakeAutoQuote{»}{«}
-\defineshorthand{"`}{\openautoquote}
-\defineshorthand{"'}{\closeautoquote}
-\AtEndOfClass{\shorthandon{"}}
-\RequirePackage{amsmath,siunitx-PTB}
+\AtEndOfClass{\shorthandon{"}}
\@setplength{toaddrhpos}{72bp}
\@setplength{toaddrvpos}{124bp}