From f9fbc5e084bdd517dd7a4668e211e9af3e89a6e9 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 2 Mar 2023 21:03:02 +0000 Subject: qrbill (2mar23) (branch) git-svn-id: svn://tug.org/texlive/branches/branch2022.final@66304 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/source/latex/qrbill/qrbill.dtx | 21 +++++++++++++-------- Master/texmf-dist/source/latex/qrbill/qrbill.ins | 6 +++--- 2 files changed, 16 insertions(+), 11 deletions(-) (limited to 'Master/texmf-dist/source') diff --git a/Master/texmf-dist/source/latex/qrbill/qrbill.dtx b/Master/texmf-dist/source/latex/qrbill/qrbill.dtx index 6d169404d5a..c7739d81d32 100644 --- a/Master/texmf-dist/source/latex/qrbill/qrbill.dtx +++ b/Master/texmf-dist/source/latex/qrbill/qrbill.dtx @@ -2,7 +2,7 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % -% Copyright (C) 2020–2022 by Marei Peischl (peiTeX) +% Copyright (C) 2020–2023 by Marei Peischl (peiTeX) % % This work is a collaboration of % Marei Peischl (peiTeX) and Alex Antener (foobar LLC). @@ -54,7 +54,7 @@ % \fi % \iffalse %<*driver> -\ProvidesFile{qrbill.dtx}[2022/10/20 v1.07 \ create QR-bills based on the Swiss standard] +\ProvidesFile{qrbill.dtx}[2023/02/28 v2.00 \ create QR-bills based on the Swiss standard] \documentclass[english, parskip=half-]{scrartcl} \usepackage{iftex} \ifPDFTeX @@ -284,8 +284,8 @@ % \changes{v1.06}{2022/10/18}{Add ignore-if-empty option} % % \item[qrmode (package/lua) (package)] Selects the mechanism for QRcode generation. +% \changes{v2.00}{2023/02/28}{qrencode.lua now is part of the qrbill package} % With Version 2.0 the package supports usage of the the luaqrcode library \cite{luaqrcode}. This can be enabled by using the \latexinline{qmode=lua} option. -% In that case the luaqrcode libary has to be installed within the \verb+$LUAINPUTS+. % % \item[qrscheme (Name of a custom QRbill scheme) (swiss)] % Loads the definitions for the QRcode and the BillingInformation. Currently only the @@ -514,7 +514,7 @@ % \section{Implementation} % \begin{macrocode} \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} @@ -866,7 +866,7 @@ \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} @@ -896,6 +896,7 @@ \par } } + \vfill } \par\nointerlineskip \vbox_to_ht:nn {14mm}{ @@ -918,12 +919,13 @@ \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: @@ -950,9 +952,10 @@ \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} @@ -964,6 +967,7 @@ \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: @@ -1017,6 +1021,7 @@ {\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/source/latex/qrbill/qrbill.ins b/Master/texmf-dist/source/latex/qrbill/qrbill.ins index 00a86976230..1fe8b6669ed 100644 --- a/Master/texmf-dist/source/latex/qrbill/qrbill.ins +++ b/Master/texmf-dist/source/latex/qrbill/qrbill.ins @@ -2,17 +2,17 @@ \preamble -Copyright (C) 2020–2022 by Marei Peischl (peiTeX) +Copyright (C) 2020–2023 by Marei Peischl (peiTeX) 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'. -- cgit v1.2.3