marei: cleanup

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

diff --git a/templates/print/marei/kiviletter.sty b/templates/print/marei/kiviletter.sty
index 5630270..6aedf1b 100644 (file)
--- a/templates/print/marei/kiviletter.sty
+++ b/templates/print/marei/kiviletter.sty
@@ -2,9 +2,15 @@
 \ProvidesPackage{kiviletter}[2020/04/24 Letter Layouts for Kivitendo]
 
 \newif\if@kivi@infobox
+\newif\if@kivi@footer
 \DeclareOption{reffields}{\@kivi@infoboxfalse}
 \DeclareOption{infobox}{\@kivi@infoboxtrue}
+\DeclareOption{nofooter}{\@kivi@footerfalse}
+\DeclareOption{footer}{\@kivi@footertrue}
 \@kivi@infoboxtrue
+\@kivi@footertrue
+
+\DeclareOption*{\PassOptionsToPackage{\CurrentOption}{scrletter}}
 
 \ProcessOptions\relax
 
@@ -21,9 +27,7 @@
 \RequirePackage{fontspec}
 \fi
 
-%\RequirePackage{xltabular}
-\RequirePackage{tabularx}
-\RequirePackage{longtable}
+\RequirePackage{xltabular}
 \RequirePackage{booktabs}
 \RequirePackage{graphicx}
 
@@ -50,7 +54,6 @@
 \dim_new:N \g_kivi_margin_dim
 \dim_gset:Nn \g_kivi_margin_dim {\useplength{toaddrhpos}}
 \geometry{a4paper,margin=\g_kivi_margin_dim,heightrounded}
-\savegeometry{kivi.letter@default}
 %Scratch variables
 \int_new:N \l_kivi_tmp_int
 \bool_new:N \l_kivi_tmp_bool
@@ -68,25 +71,14 @@ voffset=\dimexpr\useplength{toaddrvpos}+\useplength{toaddrheight}+4\baselineskip
 contents={\usebox\shippingAddressBox}
 ]{kivitendo.shippingaddress}
 
-
-\ExplSyntaxOn
-\AtBeginLetter{\dim_gset:Nn \g_kivi_orig@textheight_dim {\textheight}}
-\ExplSyntaxOff
-
 \newpairofpagestyles{kivitendo.letter}{}
+
 \renewcommand*{\letterpagestyle}{kivitendo.letter}
 
-\DeclareNewPageStyleByLayers{kivitendo.letter.PricingTable}{
-       kivitendo.TableHead,
-       kivitendo.TableFoot
-       kivitendo.letter.head.odd,kivitendo.letter.head.even,kivitendo.letter.head.oneside,%
-       kivitendo.letter.foot.odd,kivitendo.letter.foot.even,kivitendo.letter.foot.oneside,%
-}
 \DeclareNewPageStyleByLayers{kivitendo.letter.first}{
        kivitendo.shippingaddress,
-       kivitendo.TableFoot,
-       kivitendo.letter.head.odd,kivitendo.letter.head.even,kivitendo.letter.head.oneside,%
-       kivitendo.letter.foot.odd,kivitendo.letter.foot.even,kivitendo.letter.foot.oneside,%
+       plain.kivitendo.letter.head.odd,plain.kivitendo.letter.head.even,plain.kivitendo.letter.head.oneside,%
+       plain.kivitendo.letter.foot.odd,plain.kivitendo.letter.foot.even,plain.kivitendo.letter.foot.oneside,%
 }
 
 \setkomavar{backaddress}{\firma\ $\cdot$ \strasse\ $\cdot$ \ort}
@@ -193,7 +185,6 @@ contents={\usebox\shippingAddressBox}
 
 \newcolumntype{P}[1]{>{\raggedleft\arraybackslash}p{#1}<{\__kivi_tab_column_currency:}}
 
-
 \RequirePackage{tcolorbox}
 \tcbuselibrary{breakable, skins}
 
@@ -244,6 +235,7 @@ contents={\usebox\shippingAddressBox}
        \seq_set_split:Nnn \l_kivi_PricingTable_seq {\tabularnewline} {#1}
        \seq_remove_all:Nn \l_kivi_PricingTable_seq {}
        \begingroup
+       \setlength{\parskip}{\c_zero_dim}
        \let\ExtraDescription\__kivi_addExtraDescription:n
        \setlength{\tabcolsep}{\g_kivi_tabcolsep_dim}
        \seq_map_inline:Nn \l_kivi_PricingTable_seq {
@@ -264,7 +256,7 @@ contents={\usebox\shippingAddressBox}
        \setlength{\leftskip}{\l_kivi_tab_desc_leftskip_dim}
        \usekomafont{extraDescription}
        \seq_use:Nn \g_kivi_extraDescription_seq {\\}
-       \par\nointerlineskip
+       \par
        \endgroup
        }
        }
@@ -333,8 +325,7 @@ contents={\usebox\shippingAddressBox}
 
 %Macht es sinn hier eine Variante zu machen, in der alle Spalten Belegbar sind?
 \newenvironment{PricingTotal}{
-       \par
-       \vspace{-\ht\strutbox}
+       \par\nointerlineskip
        \unskip
        \tabular[t]{@{}p{\dim_eval:n {\linewidth-\l_kivi_tab_pricetotal_dim-2\tabcolsep}}P{\l_kivi_tab_pricetotal_dim}@{}}
        \midrule
@@ -352,6 +343,7 @@ contents={\usebox\shippingAddressBox}
 
 \newenvironment{PricingTabular}[1][]{
        \begingroup
+       \dim_set:Nn \parskip {\c_zero_dim}
        \tl_if_empty:nF {#1} {\keys_set:nn {kivi/PricingTable} {#1}}
        \setlength{\tabcolsep}{\g_kivi_tabcolsep_dim}
        \__kivi_calc_desc_column:
@@ -386,7 +378,6 @@ contents={\usebox\shippingAddressBox}
        \midrule
 }
 
-\RequirePackage{xltabular}
 
 \keys_define:nn {kivi/SimpleTabular} {
        colspec .tl_set:N =\l_kivi_SimpleTabular_colspec_tl,
@@ -395,10 +386,14 @@ contents={\usebox\shippingAddressBox}
        headline .initial:n = {\bfseries\position & \bfseries\menge & \bfseries\bezeichnung},
 }
 
+\newcommand*{\SetupSimpleTabular}[1]{\keys_set:nn {kivi/SimpleTabular} {#1}}
+\newcommand*{\SetupPricingTabular}[1]{\keys_set:nn {kivi/PricingTable} {#1}}
+
 \newenvironment{SimpleTabular}[1][]
 {
        \tl_if_in:nnTF {#1} {=} {\keys_set:nn {kivi/SimpleTabular} {#1}} {\tl_if_empty:nF {#1} {\tl_set:Nn \l_kivi_SimpleTabular_headline_tl {#1}}}
        \setlength{\tabcolsep}{\g_kivi_tabcolsep_dim}
+       \dim_set:Nn \parskip {\c_zero_dim}
        \tl_put_right:Nn \l_kivi_SimpleTabular_colspec_tl {@{}}
        \tl_put_left:Nn \l_kivi_SimpleTabular_colspec_tl {@{}}
        \exp_args:NnV \xltabular{\linewidth}\l_kivi_SimpleTabular_colspec_tl
@@ -429,6 +424,7 @@ contents={\usebox\shippingAddressBox}
        \tl_if_empty:nF {#1} {\keys_set:nn {kivi/PricingTable} {#1}}
        \__kivi_setup_LT_boxes:
        \__kivi_setup_FakeTable:
+       \dim_set:Nn \parskip {\c_zero_dim}
        \PricingTabularBox\ignorespaces
 }{\endPricingTabularBox}
 
@@ -480,8 +476,43 @@ contents={\usebox\shippingAddressBox}
 \cs_if_exist:NF \Ifstr {\let\Ifstr\ifstr}
 \cs_if_exist:NF \Ifkomavarempty {\let\Ifkomavarempty\ifkomavarempty}
 
+%Definitionen für die insettings.tex
+
+\newcommand*{\setupIdentpath}[1]{
+       \int_set:Nn \l_kivi_tmp_int {1}
+       \bool_set_true:N \l_kivi_tmp_bool
+       \bool_while_do:Nn \l_kivi_tmp_bool {
+               \file_if_exist:nTF {firma\int_use:N \l_kivi_tmp_int/ident.tex}
+               {
+                       \exp_args:Nf \str_if_in:nnTF {#1} {Firma\int_use:N \l_kivi_tmp_int}
+                       {
+                               \newcommand*{\identpath}{firma\int_use:N \l_kivi_tmpa_int}
+                               \bool_set_false:N \l_kivi_tmp_bool
+                       }
+                       {\int_incr:N \l_kivi_tmp_int}
+               }
+               {
+                       \bool_set_false:N \l_kivi_tmp_bool
+                       \newcommand*{\identpath}{firma}
+               }
+       }
+}
+
+\newcommand*{\setupCurrencyConfig}[2]{
+       \tl_new:N \g_kivi_currency_tl
+       \exp_args:Nf \str_if_in:nnT {#2} {USD} {\tl_gset:Nn \g_kivi_currency_tl {usd}}
+       \exp_args:Nf \str_if_in:nnT {#2} {CHF} {\tl_gset:Nn \g_kivi_currency_tl {chf}}
+       \exp_args:Nf \str_if_in:nnT {#2} {EUR} {\tl_gset:Nn \g_kivi_currency_tl {euro}}
+       \tl_if_empty:NT  \g_kivi_currency_tl {
+               \tl_gset:Nn \g_kivi_currency_tl {default}
+               \edef \currency {\tl_to_str:N \lxcurrency}
+       }
+       \input{#1/\g_kivi_currency_tl _account.tex}
+}
+
 \ExplSyntaxOff
 
+
 \renewcommand*{\raggedsignature}{\raggedright}
 
 \newkomafont{extraDescription}{}