diff options
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r-- | Master/texmf-dist/tex/latex/qrbill/epc.qrbill-cfg.tex | 6 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/qrbill/qrbill.sty | 21 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/qrbill/swiss.qrbill-cfg.tex | 6 |
3 files changed, 19 insertions, 14 deletions
diff --git a/Master/texmf-dist/tex/latex/qrbill/epc.qrbill-cfg.tex b/Master/texmf-dist/tex/latex/qrbill/epc.qrbill-cfg.tex index b3963a20b8c..bdfd62f92df 100644 --- a/Master/texmf-dist/tex/latex/qrbill/epc.qrbill-cfg.tex +++ b/Master/texmf-dist/tex/latex/qrbill/epc.qrbill-cfg.tex @@ -6,17 +6,17 @@ %% %% qrbill.dtx (with options: `epc.qrbill-cfg.tex') %% -%% Copyright (C) 2020–2022 by Marei Peischl (peiTeX) <marei@peitex.de> +%% Copyright (C) 2020–2023 by Marei Peischl (peiTeX) <marei@peitex.de> %% %% This work is a collaboration of %% Marei Peischl (peiTeX) and Alex Antener (foobar LLC). %% %% This work may be distributed and/or modified under the -%% conditions of the LaTeX Project Public License, either version 1.3 +%% conditions of the LaTeX Project Public License, either version 1.3c %% of this license or (at your option) any later version. %% The latest version of this license is in %% http://www.latex-project.org/lppl.txt -%% and version 1.3 or later is part of all distributions of LaTeX +%% and version 1.3c or later is part of all distributions of LaTeX %% version 2005/12/01 or later. %% %% This work has the LPPL maintenance status `maintained'. diff --git a/Master/texmf-dist/tex/latex/qrbill/qrbill.sty b/Master/texmf-dist/tex/latex/qrbill/qrbill.sty index a4c16da040e..19048cbe269 100644 --- a/Master/texmf-dist/tex/latex/qrbill/qrbill.sty +++ b/Master/texmf-dist/tex/latex/qrbill/qrbill.sty @@ -6,17 +6,17 @@ %% %% qrbill.dtx (with options: `qrbill.sty,package') %% -%% Copyright (C) 2020–2022 by Marei Peischl (peiTeX) <marei@peitex.de> +%% Copyright (C) 2020–2023 by Marei Peischl (peiTeX) <marei@peitex.de> %% %% This work is a collaboration of %% Marei Peischl (peiTeX) and Alex Antener (foobar LLC). %% %% This work may be distributed and/or modified under the -%% conditions of the LaTeX Project Public License, either version 1.3 +%% conditions of the LaTeX Project Public License, either version 1.3c %% of this license or (at your option) any later version. %% The latest version of this license is in %% http://www.latex-project.org/lppl.txt -%% and version 1.3 or later is part of all distributions of LaTeX +%% and version 1.3c or later is part of all distributions of LaTeX %% version 2005/12/01 or later. %% %% This work has the LPPL maintenance status `maintained'. @@ -37,7 +37,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \RequirePackage{expl3} -\ProvidesExplPackage{qrbill}{2022/10/20}{1.07}{ +\ProvidesExplPackage{qrbill}{2023/02/28}{2.00}{ Template for QR-bills based on the Swiss Payment Standards } \RequirePackage{iftex} @@ -364,7 +364,7 @@ num, string = printQRcode("\lua_escape:n {#1}") \skip_vertical:n {\c_qrbill_sep_dim-\g__qrbill_rule_dim} \skip_horizontal:n {\c_qrbill_sep_dim-\g__qrbill_rule_dim} \begin{minipage}[c][95mm][t]{52mm} -\vbox_to_ht:nn {7mm} {\qrbill_title_font:\qrbillreceiptname} +\vbox_to_ht:nn {7mm} {\qrbill_title_font:\qrbillreceiptname\vfill} \par\nointerlineskip \vbox_to_ht:nn {56mm}{ {\qrbill_headingR_font:\qrbillaccountname\par} @@ -394,6 +394,7 @@ num, string = printQRcode("\lua_escape:n {#1}") \par } } + \vfill } \par\nointerlineskip \vbox_to_ht:nn {14mm}{ @@ -416,12 +417,13 @@ num, string = printQRcode("\lua_escape:n {#1}") \par\nointerlineskip \vbox_to_ht:nn {18mm} { \makebox[\linewidth][r]{\qrbill_headingR_font:\qrbillacceptantname}\par +\vfill } \end{minipage}% \skip_horizontal:n {2\c_qrbill_sep_dim} \begin{minipage}[c][95mm][t]{138mm} \begin{minipage}[c][85mm][t]{51mm} -\parbox[t][7mm][t]{\linewidth}{\qrbill_title_font:\qrbillpaymentpartname} +\parbox[t][7mm][t]{\linewidth}{\qrbill_title_font:\qrbillpaymentpartname\vfill} \par\nointerlineskip \skip_vertical:n {\c_qrbill_sep_dim} \qrcode_setup_QRcode: @@ -448,10 +450,11 @@ num, string = printQRcode("\lua_escape:n {#1}") \tl_if_empty:NTF \l_qrbill_data_Amount_tl { \hfill \raisebox{\dimexpr-\height+\ht\strutbox}[\z@]{ -\llap{\__qrbill_placeholder:nn {40mm} {15mm} -}} +\llap{\__qrbill_placeholder:nn {40mm} {15mm}} } } +\vfill +} \end{minipage} \begin{minipage}[c][85mm][t]{87mm} \par\nointerlineskip @@ -462,6 +465,7 @@ num, string = printQRcode("\lua_escape:n {#1}") \qrbill_insert_address:N \g__qrbill_creditorprefix_tl \par\vskip\baselineskip } +\raggedright \tl_if_empty:NF \l_qrbill_data_Reference_tl { {\qrbill_headingP_font:\qrbillreferencename\par} {\qrbill_valueP_font: @@ -515,6 +519,7 @@ num, string = printQRcode("\lua_escape:n {#1}") {\rule{\g__qrbill_rule_dim}{\c_qrbill_height_dim}} {\rule{\g__qrbill_rule_dim}{\c_zero_dim}} } +\vfill } } \endgroup diff --git a/Master/texmf-dist/tex/latex/qrbill/swiss.qrbill-cfg.tex b/Master/texmf-dist/tex/latex/qrbill/swiss.qrbill-cfg.tex index 8e02f34eac8..3ca4c8dd296 100644 --- a/Master/texmf-dist/tex/latex/qrbill/swiss.qrbill-cfg.tex +++ b/Master/texmf-dist/tex/latex/qrbill/swiss.qrbill-cfg.tex @@ -6,17 +6,17 @@ %% %% qrbill.dtx (with options: `swiss.qrbill-cfg.tex') %% -%% Copyright (C) 2020–2022 by Marei Peischl (peiTeX) <marei@peitex.de> +%% Copyright (C) 2020–2023 by Marei Peischl (peiTeX) <marei@peitex.de> %% %% This work is a collaboration of %% Marei Peischl (peiTeX) and Alex Antener (foobar LLC). %% %% This work may be distributed and/or modified under the -%% conditions of the LaTeX Project Public License, either version 1.3 +%% conditions of the LaTeX Project Public License, either version 1.3c %% of this license or (at your option) any later version. %% The latest version of this license is in %% http://www.latex-project.org/lppl.txt -%% and version 1.3 or later is part of all distributions of LaTeX +%% and version 1.3c or later is part of all distributions of LaTeX %% version 2005/12/01 or later. %% %% This work has the LPPL maintenance status `maintained'. |