From: Marei (peiTeX) <marei@peitex.de>
Date: Wed, 3 Jun 2020 15:36:01 +0000 (+0200)
Subject: marei: fix expansion for outdated tex live versions
X-Git-Tag: kivitendo-mebil_0.1-0~9^2~730
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=18e3b9433a5b51f7ddb360b36926906210e54202;p=kivitendo-erp.git

marei: fix expansion for outdated tex live versions
---

diff --git a/templates/print/marei/kiviletter.sty b/templates/print/marei/kiviletter.sty
index 84f9cdb14..aa18080e1 100644
--- a/templates/print/marei/kiviletter.sty
+++ b/templates/print/marei/kiviletter.sty
@@ -240,8 +240,8 @@ contents={\usebox\shippingAddressBox}
 	\bool_if:NT \l_kivi_col_id_bool {p{\l_kivi_tab_id_dim}}
 	p{\l_kivi_tab_desc_dim}
 	\bool_if:NT \l_kivi_col_amount_bool {\exp_not:n {>{\raggedleft\arraybackslash}p{\l_kivi_tab_amount_dim}}}
-	\bool_if:NT \l_kivi_col_price_bool {>{\raggedleft\arraybackslash}p{\l_kivi_tab_price_dim}<{\,\currency}}
-	\bool_if:NT \l_kivi_col_pricetotal_bool {>{\raggedleft\arraybackslash}p{\l_kivi_tab_pricetotal_dim}<{\,\currency}}
+	\bool_if:NT \l_kivi_col_price_bool {\exp_not:n {>{\raggedleft\arraybackslash}p{\l_kivi_tab_price_dim}<{\,\currency}}}
+	\bool_if:NT \l_kivi_col_pricetotal_bool {\exp_not:n {>{\raggedleft\arraybackslash}p{\l_kivi_tab_pricetotal_dim}<{\,\currency}}}
 	@{}
 }
 
@@ -376,8 +376,8 @@ contents={\usebox\shippingAddressBox}
 \removereffields
 \AtBeginLetter{
 	\ifdim\ht\shippingAddressBox>\z@
-	\addtoplength{refvpos}{\dimexpr\ht\shippingAddressBox+\dp\shippingAddressBox}
-	\addtoplength{refvpos}{4\baselineskip}%sep between address boxes
+	\@addtoplength{refvpos}{\dimexpr\ht\shippingAddressBox+\dp\shippingAddressBox}
+	\@addtoplength{refvpos}{4\baselineskip}%sep between address boxes
 	\fi
 }
 \ExplSyntaxOff