marei: fix spacing around shipping_addr_box

[kivitendo-erp.git] / templates / print / marei / kiviletter.sty

diff --git a/templates/print/marei/kiviletter.sty b/templates/print/marei/kiviletter.sty
index 5dab372..d8e669d 100644 (file)
--- a/templates/print/marei/kiviletter.sty
+++ b/templates/print/marei/kiviletter.sty
@@ -1,5 +1,5 @@
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{kiviletter}[2019/10/10 Letter Layouts for Kivitendo]
+\ProvidesPackage{kiviletter}[2020/04/24 Letter Layouts for Kivitendo]
 
 \newif\if@kivi@infobox
 \DeclareOption{reffields}{\@kivi@infoboxfalse}
@@ -16,6 +16,7 @@
 \ifPDFTeX
 \RequirePackage[utf8]{inputenc}% Nur notwendig, wenn Basis älter als TL2018
 \RequirePackage[T1]{fontenc}
+\RequirePackage{lmodern}
 \else
 \RequirePackage{fontspec}
 \fi
@@ -67,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}
 
@@ -343,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