From: Marei (peiTeX) <marei@peitex.de>
Date: Wed, 3 Jun 2020 11:41:03 +0000 (+0200)
Subject: marei: fix spacing around shipping_addr_box
X-Git-Tag: kivitendo-mebil_0.1-0~9^2~734
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=04ad59308509c54ea6110d444325a5fd20f7eef4;p=kivitendo-erp.git

marei: fix spacing around shipping_addr_box
---

diff --git a/templates/print/marei/kiviletter.sty b/templates/print/marei/kiviletter.sty
index fcc496768..d8e669da6 100644
--- a/templates/print/marei/kiviletter.sty
+++ b/templates/print/marei/kiviletter.sty
@@ -1,7 +1,6 @@
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{kiviletter}[2020/04/24 Letter Layouts for Kivitendo]
 
-
 \newif\if@kivi@infobox
 \DeclareOption{reffields}{\@kivi@infoboxfalse}
 \DeclareOption{infobox}{\@kivi@infoboxtrue}
@@ -69,7 +68,7 @@
 \DeclareNewLayer[
 foreground,
 hoffset=\useplength{toaddrhpos},
-voffset=\dimexpr\useplength{toaddrvpos}+\useplength{toaddrheight}+4\baselineskip,
+voffset=\dimexpr\useplength{toaddrvpos}+\useplength{toaddrheight}+4\baselineskip,%sep to shippingaddressbox
 contents={\usebox\shippingAddressBox}
 ]{kivitendo.shippingaddress}
 
@@ -345,8 +344,8 @@ align=bl,
 \removereffields
 \AtBeginLetter{
 	\ifdim\ht\shippingAddressBox>\z@
-	\addtoplength{refvpos}{\ht\shippingAddressBox}
-	\addtoplength{refvpos}{4\baselineskip}
+	\addtoplength{refvpos}{\dimexpr\ht\shippingAddressBox+\dp\shippingAddressBox}
+	\addtoplength{refvpos}{4\baselineskip}%sep between address boxes
 	\fi
 }
 \ExplSyntaxOff