setcounter robuster (2)

versandauftrag/test-versandauftrag.tex

@@ -25,7 +25,7 @@
 
 \TransportType{0}
 % Standard: 0 ("Transportunternehmen"); 1="Kundenveranlassung", 2="PTB"
-\ShippingCompany{0}% nur relevant, wenn TransportType=0
+\ShippingCompany{2}% nur relevant, wenn TransportType=0
 % Standard: 4 ("DHL"); 0="Logiline", 1="TNT", 2="UPS", 3="FedEx", 5="Sonstige"
 \ShippingNo{4711-0815}% nur relevant, wenn TransportType=0
 \ShippingType{1}% Standard: 0 ("Standard"); 1="Express", 2="Special"

versandauftrag/vl-versandauftrag.cls

@@ -38,10 +38,14 @@
 \let\vl@tempdimc=\@ovdx
 \newcommand\vl@tempa{}
 
-\newcommand*\vl@setcounter[3]{% #1=counter, #2=default, #3=value
+\newcommand*\vl@setcounterX[3]{% #1=counter, #2=default, #3=value
   \edef\vl@tempa{\trim@spaces{#3}}%
   \setcounter{#1}{\ifx\@empty\vl@tempa #2\else\vl@tempa\fi}%
 }
+\newcommand*\vl@setcounter[3][0]{%  #1=default (opt.), #2=counter, #3=value
+  \edef\vl@tempa{\trim@spaces{#3}}%
+  \setcounter{#2}{\ifx\@empty\vl@tempa #1\else\vl@tempa\fi}%
+}
 
 \newif\ifInland \Inlandtrue
 \newcommand*\Inland[1]{\expandafter\csname Inland\trim@spaces{#1}\endcsname}
@@ -87,13 +91,13 @@
 \newcommand*\Referee[1]{\xdef\vl@Referee{#1}}
 
 \newcounter{vl@TransportType} \setcounter{vl@TransportType}{0}
-\newcommand*\TransportType[1]{\vl@setcounter{vl@TransportType}{0}{#1}}
+\newcommand*\TransportType[1]{\vl@setcounter{vl@TransportType}{#1}}
 \newcounter{vl@Shippingtype} \setcounter{vl@Shippingtype}{0}
-\newcommand*\ShippingType[1]{\vl@setcounter{vl@Shippingtype}{0}{#1}}
+\newcommand*\ShippingType[1]{\vl@setcounter{vl@Shippingtype}{#1}}
 \newcounter{vl@ShippingCompany} \setcounter{vl@ShippingCompany}{4}
-\newcommand*\ShippingCompany[1]{\vl@setcounter{vl@ShippingCompany}{4}{#1}}
+\newcommand*\ShippingCompany[1]{\vl@setcounter[4]{vl@ShippingCompany}{#1}}
 \newcounter{vl@ShippingPayment} \setcounter{vl@ShippingPayment}{0}
-\newcommand*\ShippingPayment[1]{\vl@setcounter{vl@ShippingPayment}{0}{#1}}
+\newcommand*\ShippingPayment[1]{\vl@setcounter{vl@ShippingPayment}{#1}}
 
 \newif\ifInflammable \Inflammablefalse
 \newcommand*\LabelInflammable[1]{\expandafter\csname Inflammable\trim@spaces{#1}\endcsname}