X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=templates%2Fprint%2Fmarei%2Fkiviletter.sty;h=983e189ca6d84a65649bf0cfdf4252ecf63f343c;hb=a89ea81fbadf34d0780b3a8b549ce1b9a7529223;hp=5dab372f75a84d98982fcaeaa09f8b87aedfffa2;hpb=c1c33278b2d9487ee9dc37e43a742a35b0277a2a;p=kivitendo-erp.git

diff --git a/templates/print/marei/kiviletter.sty b/templates/print/marei/kiviletter.sty
index 5dab372f7..983e189ca 100644
--- 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
@@ -58,7 +59,6 @@
 \bool_new:N \l_kivi_tmp_bool
 \bool_new:N  \g_kivi_TableFoot_bool
 \dim_new:N \g_kivi_orig@textheight_dim
-\int_new:N \g_PricingTabular_firstpage_int
 \ExplSyntaxOff
 
 \newsavebox{\shippingAddressBox}
@@ -67,33 +67,12 @@
 \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}
 
 
 \ExplSyntaxOn
-\DeclareNewLayer[
-foreground,
-mode=picture,
-hoffset=\g_kivi_margin_dim,
-voffset=\g_kivi_margin_dim,
-align=tl,
-height=\box_ht:N \g_kivi_LT@head_box,
-contents={\box_use:N \g_kivi_LT@head_box},
-]{kivitendo.TableHead}
-
-
-\DeclareNewLayer[
-foreground,
-textarea,
-mode=picture,
-voffset=\dim_eval:n {\paperheight-\g_kivi_margin_dim},
-height=\box_ht:N \g_kivi_LT@foot_box,
-contents=\bool_if:NT \g_kivi_TableFoot_bool {\box_use:N \g_kivi_LT@foot_box},
-align=bl,
-]{kivitendo.TableFoot}
-
 \AtBeginLetter{\dim_gset:Nn \g_kivi_orig@textheight_dim {\textheight}}
 \ExplSyntaxOff
 
@@ -124,119 +103,242 @@ align=bl,
 \@setplength{locwidth}{6cm}
 
 \ExplSyntaxOn
-\dim_new:N \g_kivi_tab_pos_dim
-\dim_gset:Nn \g_kivi_tab_pos_dim {3.5ex}
-\dim_new:N \g_kivi_tab_id_dim
-\dim_gset:Nn \g_kivi_tab_id_dim {4em}
-\dim_new:N \g_kivi_tab_num_dim
-\dim_gset:Nn \g_kivi_tab_num_dim {5em}
-\dim_new:N \g_kivi_tab_price_dim
-\dim_gset:Nn \g_kivi_tab_price_dim {7em}
-\dim_new:N \g_kivi_tab_desc_dim
+\dim_new:N \l_kivi_tab_desc_leftskip_dim
+
+
+
+\cs_new:Nn \__kivi_set_colwidth:nn  {
+	\dim_set:cn {l_kivi_tab_#1_dim} {#2}
+}
+
+
+\cs_new:Nn \__kivi_initialize_columns: {
+	\clist_map_inline:Nn \g_kivi_pricingtable_col_clist {
+		\bool_if_exist:cF {l_kivi_col_##1_bool} 
+		{
+			\bool_new:c {l_kivi_col_##1_bool}
+			\dim_new:c {l_kivi_tab_##1_dim}
+			\keys_define:nn {kivi/PricingTable} {
+				##1 .choice:,
+				##1 / true .code:n = \bool_set_true:c {l_kivi_col_##1_bool},
+				##1 / false .code:n = \bool_set_false:c {l_kivi_col_##1_bool},
+				##1 / unknown .code:n = {
+					\bool_set_true:c {l_kivi_col_##1_bool}
+					\dim_set:cn {l_kivi_tab_##1_dim} {####1}
+				},
+				##1 .default:n = true,
+				##1 .initial:n = true,
+				##1 / header .prop_put:c = {l_kivi_col_##1_prop},
+				##1 / colspec .prop_put:c = {l_kivi_col_##1_prop},
+			}
+		}
+	}
+}
+
+\clist_new:N \g_kivi_pricingtable_col_clist
+
+\keys_define:nn {kivi/PricingTable} {
+	columns .code:n = 
+	\clist_gset:Nn \g_kivi_pricingtable_col_clist {#1}
+	\__kivi_initialize_columns:,
+	columns .initial:n = {pos, id, desc, amount, price, pricetotal},
+}
+
+% set default values for colwidth
+\keys_set:nn {kivi/PricingTable} {
+	pos=5ex,
+	id=4em,
+	amount=5em,
+	price=7em,
+	pricetotal=7em,
+%	desc=auto,
+	pos/header=\position,
+	id/header=\artikelnummer,
+	desc/header=\bezeichnung,
+	amount/header=\menge,
+	price/header=\einzelpreis,
+	pricetotal/header=\gesamtpreis,
+	price / colspec = Price,
+	pricetotal / colspec = Price ,
+}
 
 \dim_new:N \g_kivi_tabcolsep_dim
 \dim_gset:Nn \g_kivi_tabcolsep_dim {.5\tabcolsep}
-\newcommand*{\CalcTabCols}{
-	\dim_gset:Nn \g_kivi_tab_desc_dim {\textwidth-\g_kivi_tab_pos_dim -\g_kivi_tab_id_dim-\g_kivi_tab_num_dim - 2\g_kivi_tab_price_dim - 10\g_kivi_tabcolsep_dim}
+
+\cs_new:Nn \__kivi_calc_desc_column: {
+	\dim_zero:N \l_kivi_tab_desc_leftskip_dim
+	\dim_zero:N \l_kivi_tab_desc_dim
+	\bool_set_false:N \l_tmpa_bool
+	\clist_map_inline:Nn \g_kivi_pricingtable_col_clist {
+		\tl_if_eq:nnTF {##1} {desc}  {
+			\dim_set:Nn \l_kivi_tab_desc_dim {
+				\textwidth-\l_kivi_tab_desc_leftskip_dim
+			}
+			\bool_set_true:N \l_tmpa_bool
+		
+		}{
+			\bool_if:NTF \l_tmpa_bool {
+				\bool_if:cT {l_kivi_col_##1_bool} {
+					\dim_sub:Nn \l_kivi_tab_desc_dim {
+						\dim_use:c {l_kivi_tab_##1_dim}+2\g_kivi_tabcolsep_dim
+					}
+				}
+			}{
+				\bool_if:cT {l_kivi_col_##1_bool} {
+					\dim_add:Nn \l_kivi_tab_desc_leftskip_dim {
+						\dim_use:c {l_kivi_tab_##1_dim}+2\g_kivi_tabcolsep_dim
+					}
+				}
+			}
+		}
+	}
 }
 
-\newcolumntype{P}{>{\raggedleft\arraybackslash}p{\g_kivi_tab_price_dim}<{\,\currency}}
+\newcolumntype{P}[1]{>{\raggedleft\arraybackslash}p{#1}<{\__kivi_tab_column_currency:}}
 
-%\if@kivi@faketable
 \RequirePackage{tcolorbox}
 \tcbuselibrary{breakable, skins}
+
+\tcb@new@skin{kivi@LT}{base@unbroken,%
+	frame~engine=empty,interior~titled~engine=empty,interior~engine=empty,segmentation~engine=empty,title~engine=empty,%
+	skin~first=kivi@LT@first,skin~middle=kivi@LT@middle,skin~last=kivi@LT@last,
+	underlay~first~and~middle={
+		\node[anchor=north]  at (interior.north)  {\csname box_use:c\endcsname  {g_kivi_LT@head_box}};
+		\node[anchor=south]  at (interior.south)  {\csname box_use:c\endcsname  {g_kivi_LT@foot_box}};
+	},
+	underlay~unbroken~and~last={
+	\node[anchor=north]  at (interior.north)  {\csname box_use:c\endcsname  {g_kivi_LT@head_box}};
+	},
+	boxsep=0pt,
+	boxrule=0pt,
+	left=0pt,
+	right=0pt,
+	bottom=\box_ht:N  \g_kivi_LT@foot_box+\box_dp:N  \g_kivi_LT@foot_box + \aboverulesep,
+	top=\box_ht:N  \g_kivi_LT@head_box+\box_dp:N  \g_kivi_LT@head_box +\belowrulesep,
+	parbox=false,
+}
+
+\tcb@new@skin{kivi@LT@first}{base@first,%
+	frame~engine=empty,interior~titled~engine=empty,interior~engine=empty,segmentation~engine=empty,title~engine=empty,%
+	skin~first=kivi@LT@first,skin~middle=kivi@LT@middle,skin~last=kivi@LT@middle,
+}
+
+\tcb@new@skin{kivi@LT@middle}{base@middle,%
+	frame~engine=empty,interior~titled~engine=empty,interior~engine=empty,segmentation~engine=empty,title~engine=empty,%
+	skin~first=kivi@LT@middle,skin~middle=kivi@LT@middle,skin~last=kivi@LT@middle,
+}
+
+\tcb@new@skin{kivi@LT@last}{base@last,%
+	frame~engine=empty,interior~titled~engine=empty,interior~engine=empty,segmentation~engine=empty,title~engine=empty,%
+	skin~first=kivi@LT@middle,skin~middle=kivi@LT@middle,skin~last=kivi@LT@last,
+}
+
+\tcbset{kivi@LT/.style={skin=kivi@LT}}%
+
+
+
 \seq_new:N \l_kivi_PricingTable_seq
+\seq_new:N \l_kivi_columns_seq
 \seq_new:N \g_kivi_extraDescription_seq
 \newcommand{\FakeTable}[1]{
 	\par
-	\CalcTabCols
 	\seq_set_split:Nnn \l_kivi_PricingTable_seq {\tabularnewline} {#1}
+	\seq_remove_all:Nn \l_kivi_PricingTable_seq {}
 	\begingroup
 	\setlength{\tabcolsep}{\g_kivi_tabcolsep_dim}
 	\seq_map_inline:Nn \l_kivi_PricingTable_seq {
+		\seq_set_split:Nnn  \l_kivi_columns_seq {&} {##1}
 	\seq_gclear:N \g_kivi_extraDescription_seq
-	\exp_args:NnV \use:n {\tabular[t]}\g_kivi_Pricing_colspec_tl
-	##1
+	\exp_args:Nnx \use:n {\tabular[t]}\g_kivi_Pricing_colspec_tl
+		\seq_pop_left:NN \__l_FakeTable_columns_seq \l_tmpa_tl
+		\seq_item:Nn \l_kivi_columns_seq {\l_tmpa_tl}
+		\seq_map_inline:Nn \__l_FakeTable_columns_seq {
+			&\seq_item:Nn \l_kivi_columns_seq {####1}
+		}
 	\endtabular
 	\seq_if_empty:NTF \g_kivi_extraDescription_seq
-	{\par\nointerlineskip}
-	{\par\nointerlineskip
-	\begin{tcolorbox}[
-		empty,
-		left=\dim_eval:n {\g_kivi_tab_pos_dim+ \g_kivi_tab_id_dim +4\g_kivi_tabcolsep_dim},
-		right=\dim_eval:n {\g_kivi_tab_num_dim+ 2\g_kivi_tab_price_dim +6\g_kivi_tabcolsep_dim},top=0pt,bottom=0pt,
-		boxsep=0pt,
-		breakable,
-		lines~before~break=1,
-	]
+	{\par}
+	{\par
+	\begingroup
+	\setlength{\hsize}{\dimexpr\l_kivi_tab_desc_dim+\l_kivi_tab_desc_leftskip_dim}
+	\setlength{\leftskip}{\l_kivi_tab_desc_leftskip_dim}
 	\seq_use:Nn \g_kivi_extraDescription_seq {\\}
-	\end{tcolorbox}
-	\nointerlineskip
+	\par\nointerlineskip
+	\endgroup
 	}
 	}
 	\endgroup
 }
 
 
+\seq_new:N  \__l_FakeTable_columns_seq
+\cs_new:Nn \__kivi_setup_FakeTable: {
+	\seq_clear:N \__l_FakeTable_columns_seq
+	\int_zero:N \l_tmpa_int
+	\clist_map_inline:Nn \g_kivi_pricingtable_col_clist {
+		\int_incr:N \l_tmpa_int
+		\bool_if:cT {l_kivi_col_##1_bool} {\seq_put_right:Nx \__l_FakeTable_columns_seq {\int_use:N \l_tmpa_int}}
+	}
+}
+
 \tl_new:N \g_kivi_Pricing_colspec_tl
-\tl_gset:Nn \g_kivi_Pricing_colspec_tl {@{}p{\g_kivi_tab_pos_dim}p{\g_kivi_tab_id_dim}p{\g_kivi_tab_desc_dim}>{\raggedleft\arraybackslash}p{\g_kivi_tab_num_dim}*2{P}@{}}
+\tl_gset:Nn \g_kivi_Pricing_colspec_tl {
+	@{}
+	\bool_if:NT \l_kivi_col_pos_bool {p{\l_kivi_tab_pos_dim}}
+	\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 {\exp_not:n {>{\raggedleft\arraybackslash}p{\l_kivi_tab_price_dim}<{\__kivi_tab_column_currency:}}}
+	\bool_if:NT \l_kivi_col_pricetotal_bool {\exp_not:n {>{\raggedleft\arraybackslash}p{\l_kivi_tab_pricetotal_dim}<{\__kivi_tab_column_currency:}}}
+	@{}
+}
 
+\cs_new:Nn \__kivi_tab_column_currency: {\,\currency}
+\cs_set:Nn \__kivi_tab_column_header_currency: {}
+\cs_set_eq:NN \__kivi_tab_column_body_currency:  \__kivi_tab_column_currency:
 
 \clist_map_inline:nn {head, foot, firsthead, lastfoot} {%TODO reduce
 	\box_new:c {g_kivi_LT@#1_box}
 }
 
-\AtBeginDocument{
-	\csname kivi_setup_LT_boxes:\endcsname
-	\geometry{a4paper,
-		hmargin=\g_kivi_margin_dim,
-		top=\dim_eval:n {\g_kivi_margin_dim + \box_ht:N \g_kivi_LT@head_box},
-		bottom=\dim_eval:n {\g_kivi_margin_dim + \box_ht:N \g_kivi_LT@foot_box},
-		heightrounded}
-	\savegeometry{kivi.letter@table}
-	\loadgeometry{kivi.letter@default}
-}
+\newkomafont{PricingTableHeader}{\bfseries}
 
-\cs_new:Nn \kivi_setup_LT_boxes: {
-	\CalcTabCols
+\cs_new:Nn \__kivi_setup_LT_boxes: {
+	\__kivi_calc_desc_column:
 	\hbox_gset:Nn \g_kivi_LT@head_box {
-	\setlength{\tabcolsep}{\g_kivi_tabcolsep_dim}
-	\exp_args:NnV \use:n {\tabular[b]}\g_kivi_Pricing_colspec_tl
-	\toprule
-	\bfseries\position & \bfseries\artikelnummer & \bfseries\bezeichnung & \bfseries\menge &\multicolumn{1}{P}{\bfseries\einzelpreis}&\multicolumn{1}{P@{}}{\bfseries\gesamtpreis}\\
-	\midrule
-	\endtabular
+		\setlength{\tabcolsep}{\g_kivi_tabcolsep_dim}
+		\exp_args:Nnx \use:n {\tabular[b]}\g_kivi_Pricing_colspec_tl
+		\__kivi_PricingTabular_header:
+		\endtabular
 	}
 	\hbox_gset:Nn \g_kivi_LT@foot_box {
-	\raisebox{\depth}{
-	\begin{tabular*}{\textwidth}{@{\extracolsep{\fill}}r@{}}
-	\midrule
-	\strut\weiteraufnaechsterseite
-	\end{tabular*}
-	}
+		\raisebox{\depth}{
+			\begin{tabular*}{\textwidth}{@{\extracolsep{\fill}}r@{}}
+				\midrule
+				\strut\weiteraufnaechsterseite
+			\end{tabular*}
+		}
 	}
 }
 
 
 %Macht es sinn hier eine Variante zu machen, in der alle Spalten Belegbar sind?
 \newenvironment{PricingTotal}{
-	\tabular[t]{@{}p{\dim_eval:n {\linewidth-\g_kivi_tab_price_dim-2\tabcolsep}}P@{}}
+	\tabular[t]{@{}p{\dim_eval:n {\linewidth-\l_kivi_tab_price_dim-2\tabcolsep}}P@{}}
 	\midrule
 }{
 	\bottomrule\endtabular
 }
 
 \newcommand{\ExtraDescription}[1]{\seq_gput_right:Nn \g_kivi_extraDescription_seq {#1}}
-%\else
+
 \newenvironment{PricingTabular}[1][]{
 	\begingroup
 	\setlength{\tabcolsep}{\g_kivi_tabcolsep_dim}
-	\CalcTabCols
-	\exp_args:NV \longtable \g_kivi_Pricing_colspec_tl
+	\__kivi_calc_desc_column:
+	\exp_args:Nx \longtable \g_kivi_Pricing_colspec_tl
 	% Tabellenkopf
-	\toprule
-	\bfseries\position & \bfseries\artikelnummer & \bfseries\bezeichnung & \bfseries\menge &\multicolumn{1}{P}{\bfseries\einzelpreis}&\multicolumn{1}{P@{}}{\bfseries\gesamtpreis}\\
-	\midrule
+	\__kivi_PricingTabular_header:
 	\endhead
 	\midrule
 	\multicolumn{6}{@{}r@{}}{\weiteraufnaechsterseite}\\
@@ -246,6 +348,23 @@ align=bl,
 	\endgroup
 }
 
+\cs_set:Nn \__kivi_PricingTabular_header: {
+	\toprule
+	\cs_gset_eq:NN \__kivi_tab_column_currency: \__kivi_tab_column_header_currency:
+	\bool_set_false:N \l_tmpa_bool
+	\clist_map_inline:Nn \g_kivi_pricingtable_col_clist	{
+		\bool_if:cT {l_kivi_col_##1_bool} {
+			\bool_if:NT \l_tmpa_bool {&}
+			\bool_set_true:N \l_tmpa_bool
+			\usekomafont{PricingTableHeader}
+			\prop_item:cn {l_kivi_col_##1_prop} {header}
+		}
+	}
+	\cs_gset_eq:NN \__kivi_tab_column_currency: \__kivi_tab_column_body_currency:
+	\\
+	\midrule
+}
+
 \RequirePackage{xltabular}
 
 
@@ -267,46 +386,20 @@ align=bl,
 	\endxltabular
 }
 
-
-\usepackage{afterpage}
-
-\cs_new:cpn {PricingTabular*}{
+%PricingTabular* kann automatisch spalten ignorieren
+% \begin{PricingTabular*}[id=false]
+% deaktiviert damit die Spalte der Produktnummer
+% analog ist dies für pos, amount, price, pricetotal möglich.
+% Die Spalte der Bezeichnung ist nicht deaktivierbar
+\newenvironment{PricingTabular*}[1][]{
 	\bool_gset_true:N \g_kivi_inTable_bool
-	\endgroup
-	\@nameuse{Gm@restore@@kivi.letter@table}%
-	\Gm@changelayout
-	\begingroup
-	\def \@currenvir {PricingTabular*}\edef \@currenvline {\on@line }
-	\int_gset:Nn \g_PricingTabular_firstpage_int {\c@page}
-	\addtolength{\vsize}{-\box_ht:N \g_kivi_LT@foot_box}
-	\pagegoal\vsize
-	\widowpenalty0
-	\clubpenalty0
-	\bool_gset_true:N \g_kivi_TableFoot_bool
-	\pagestyle{kivitendo.letter.PricingTable}
-	\leavevmode\box_use:N \g_kivi_LT@head_box
-	\par\nointerlineskip\ignorespaces
-}
-
-\cs_new:cpn {endPricingTabular*} {
-	\int_compare:nNnF \g_PricingTabular_firstpage_int = \c@page {\thispagestyle{kivitendo.letter.PricingTable}}
-	\bool_gset_false:N \g_kivi_TableFoot_bool
-	\@nameuse{Gm@restore@@kivi.letter@default}
-	\Gm@changelayout
-	\bool_gset_true:N \g_kivi_restore_geometry_bool
-	\afterpage{
-		\kivi_conditional_restore_geometry:
-	}
-}
+	\tl_if_empty:nF {#1} {\keys_set:nn {kivi/PricingTable} {#1}}
+	\__kivi_setup_LT_boxes:
+	\__kivi_setup_FakeTable:
+	\PricingTabularBox\ignorespaces
+}{\endPricingTabularBox}
 
-\cs_new:Nn \kivi_conditional_restore_geometry: {
-	\bool_if:NT \g_kivi_restore_geometry_bool
-	{
-	\@nameuse{Gm@restore@@kivi.letter@default}
-	\Gm@changelayout
-	}
-	\bool_gset_false:N \g_kivi_restore_geometry_bool
-}
+\newtcolorbox{PricingTabularBox}{breakable,skin=kivi@LT}
 
 
 
@@ -343,8 +436,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