ptbletter:trim

antragsbestaetigung/ptb-confirm-en.lco

@@ -16,18 +16,7 @@ Scheduled date: & \vl@ScheduleDate \\
 Calibration fee:  & \vl@Fee\,€ \\
 \end{tabularx}
 
-\medskip\noindent Your order will be settled with a separate invoice that uses
-fixed calibration fees according to the decree of the Ministry of Commerce of
-Germany. If the working time for your device~/ devices will exceed more than
-25\,\% of the working time used for the determination of the fee, the actual
-costs have to be charged.
-
-The procedure of PTB keeps to German laws. General terms of business of the
-customer cannot be accepted.
-
-Please, consider that for safety reasons and for protection of our primary
-standards, we cannot start a calibration before we have not received the
-enclosed declaration.
+\medskip\noindent \vl@ConstantText
 
 \closing{\MFg}
 

ptbletter/ptbletter.cls

@@ -3,8 +3,7 @@
 \setcounter{errorcontextlines}{100}  \listfiles
 
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
-\ProvidesClass{ptbletter}
-    [2017/12/04 v0.2c PTB-Brief-Klasse (RN)]
+\ProvidesClass{ptbletter}[2018/01/10 v0.2d PTB-Brief-Klasse (RN)]
 
 \let\ptb@tempdima=\@ovxx
 \let\ptb@tempdimb=\@ovyy
@@ -17,6 +16,8 @@
 \newif\ifptb@serif \ptb@seriftrue
 
 \newcommand*\ptb@lang{main=ngerman}
+\newcommand*\ptb@tempa{}
+\newcommand*\ptb@tempb{}
 
 \DeclareOption{german}{\def\ptb@lang{main=ngerman}}
 \DeclareOption{ngerman}{\def\ptb@lang{main=ngerman}}
@@ -217,19 +218,29 @@
   \setkomavar{backaddress}{PTB\\Postfach 33 45\\38023 Braunschweig}
 \fi
 
-\newcommand*\handledby[1]{\setkomavar{handledby}{#1}}
-\newcommand*\myref[1]{\setkomavar{myref}{#1}}
-\newcommand*\mymail[1]{\setkomavar{mymail}{#1}}
-\newcommand*\myphone[1]{\setkomavar{myphone}{#1}}
-\newcommand*\myfax[1]{\setkomavar{myfax}{#1}}
-\newcommand*\myemail[1]{\setkomavar{fromemail}{#1}}
+\newcommand*\ptb@setcommand[3][]{%  #1=default (opt.), #2=macro, #3=value
+  \edef\ptb@tempa{\trim@spaces@noexp{#3}}%
+  \expandafter\protected@edef\csname #2\endcsname{%
+    \ifx\@empty\ptb@tempa #1\else\ptb@tempa\fi}%
+}
+\newcommand*\ptb@setkomavar[2]{%
+  \ptb@setcommand{ptb@tempb}{#2}%
+  \edef\ptb@tempa{\noexpand\setkomavar{#1}{\ptb@tempb}}%
+  \ptb@tempa
+}
+\newcommand*\handledby[1]{\ptb@setkomavar{handledby}{#1}}
+\newcommand*\myref[1]{\ptb@setkomavar{myref}{#1}}
+\newcommand*\mymail[1]{\ptb@setkomavar{mymail}{#1}}
+\newcommand*\myphone[1]{\ptb@setkomavar{myphone}{#1}}
+\newcommand*\myfax[1]{\ptb@setkomavar{myfax}{#1}}
+\newcommand*\myemail[1]{\ptb@setkomavar{fromemail}{#1}}
 
-\newcommand*\yourref[1]{\setkomavar{yourref}{#1}}
-\newcommand*\yourmail[1]{\setkomavar{yourmail}{#1}}
+\newcommand*\yourref[1]{\ptb@setkomavar{yourref}{#1}}
+\newcommand*\yourmail[1]{\ptb@setkomavar{yourmail}{#1}}
 
-\newcommand*\backaddress[1]{\setkomavar{backaddress}{#1}}
+\newcommand*\backaddress[1]{\ptb@setkomavar{backaddress}{#1}}
 \newcommand*\subject[1]{\setkomavar{subject}{#1}}
-\renewcommand*\date[1]{\setkomavar{date}{#1}}
+\renewcommand*\date[1]{\ptb@setkomavar{date}{#1}}
 
 \newkomavar[\mymailname]{mymail}
 \newkomavar[\myphonename]{myphone}