diff --git a/antragsbestaetigung/antragsbestaetigung-test-de.tex b/antragsbestaetigung/antragsbestaetigung-test-de.tex index dcac2003d43b753f3076d135a07bb02ad8b66802..01e17af4cfd0354f78f18b048c54e8b6842f08fc 100644 --- a/antragsbestaetigung/antragsbestaetigung-test-de.tex +++ b/antragsbestaetigung/antragsbestaetigung-test-de.tex @@ -25,7 +25,7 @@ \Device{CDG 1\,Torr} \Condition{Mondschein} \ScheduleDate{2015-07-13} -\Fee{1789} +\Fee{1789.98} \date{2015-05-26} diff --git a/antragsbestaetigung/ptb-confirm.cls b/antragsbestaetigung/ptb-confirm.cls index ffdd65d421720fc201b46e7415038f9d1d90e6fd..01481fb62ad71c711a13301bf44b571fd5a9c064 100644 --- a/antragsbestaetigung/ptb-confirm.cls +++ b/antragsbestaetigung/ptb-confirm.cls @@ -20,7 +20,7 @@ \ifx\@empty\vl@tempa #1\else\vl@tempa\fi}% } -\RequirePackage{trimspaces} +\RequirePackage{trimspaces,siunitx} \newcommand*\DateOfApplication[1]{\vl@setcommand{vl@DateOfApplication}{#1}} \newcommand*\KindOfEnquiry[1]{\vl@setcommand{vl@KindOfEnquiry}{#1}} @@ -34,7 +34,7 @@ \newcommand*\Device[1]{\vl@setcommand{vl@Device}{#1}} \newcommand*\Condition[1]{\vl@setcommand{vl@Condition}{#1}} \newcommand*\ScheduleDate[1]{\vl@setcommand{vl@ScheduleDate}{#1}} -\newcommand*\Fee[1]{\vl@setcommand{vl@Fee}{#1}} +\newcommand*\Fee[1]{\vl@setcommand{vl@Fee}{\num{#1}}} \newcommand*\vl@DateOfApplication{} \newcommand*\vl@KindOfEnquiry{} @@ -48,7 +48,7 @@ \newcommand*\vl@Device{} \newcommand*\vl@Condition{} \newcommand*\vl@ScheduleDate{} -\newcommand*\vl@Fee{} % TODO: Kommazahlen bearbeiten? siunitx ? +\newcommand*\vl@Fee{} \AtBeginDocument{% \begin{letter}{% @@ -56,12 +56,14 @@ \vl@Name \smallskip \\ \vl@Street \\ \vl@Zipcode\ \vl@Town - \ifx\vl@Land\@empty\else \bigskip \\ \textls[100]{\MakeUppercase{\vl@Land}} \fi + \ifx\vl@Land\@empty\else \bigskip \\ \textls[75]{\MakeUppercase{\vl@Land}} \fi } \iflanguage{ngerman}{% + \sisetup{locale=DE} \subject{Antragsbestätigung}% \input{ptb-confirm-de.lco}% }{% + \sisetup{locale=UK} \subject{Confirmation of Order}% \input{ptb-confirm-en.lco}% }% diff --git a/ptbletter/ptbletter.cls b/ptbletter/ptbletter.cls index 16dcabce16a9bc2b3447a45e05073cb6d258be56..9536bed8472ea6771703446e0b32afc77cbec3ed 100644 --- a/ptbletter/ptbletter.cls +++ b/ptbletter/ptbletter.cls @@ -151,7 +151,7 @@ \setkomavar{location}{% \extrarowheight=-1bp % - \begin{tabular}{@{}>{\usekomafont{refname}}l<{:}@{~\,}>{\usekomafont{refvalue}}l@{}} + \begin{tabular}{@{}>{\strut\usekomafont{refname}}l<{:}@{~\,}>{\usekomafont{refvalue}}l@{}} \usekomavar*{yourref} & \usekomavar{yourref}\\ \usekomavar*{yourmail} & \usekomavar{yourmail}\\ \usekomavar*{myref} & \usekomavar{myref}\\