qrbill (29jun20)

git-svn-id: svn://tug.org/texlive/trunk@55700 c570f23f-e606-0410-a88d-b1316a301751

2 files changed, 50 insertions, 10 deletions

diff --git a/Master/texmf-dist/source/latex/qrbill/qrbill.dtx b/Master/texmf-dist/source/latex/qrbill/qrbill.dtx
index 3d4fabcec5e..9005496f3dc 100644
--- a/Master/texmf-dist/source/latex/qrbill/qrbill.dtx
+++ b/Master/texmf-dist/source/latex/qrbill/qrbill.dtx
@@ -54,7 +54,7 @@
 % \fi
 % \iffalse
 %<*driver>
-\ProvidesFile{qrbill.dtx}[2020/06/28 v1.0 \ create QR-bills based on the Swiss standard]
+\ProvidesFile{qrbill.dtx}[2020/06/29 v1.01 \ create QR-bills based on the Swiss standard]
 \documentclass[english, parskip=half-]{scrartcl}
 \usepackage{iftex}
 \ifPDFTeX
@@ -270,6 +270,10 @@
 
 % \item[qrscheme (Name of a custom QRbill scheme) (swiss)]
 % Loads the definitions for the QRcode and the BillingInformation. Currently only the swiss qrbill scheme is available, but one can define own variants based on this file. Users can copy the file swiss.qrbill-cfg.tex as an example.
+%
+% \changes{v1.01}{2020/06/29}{Add separate option to modify the top rule of the QR bill}
+% \item[separate (false/text/symbol) (text)]
+% Setup the separation rule between the document and the qrbill. If the value is text or symbol the Info \enquote{\qrbillseparatename} or the corresponding translation will be printed on top of the frame. This option will be ignored it the frame has no top rule.
 % \end{optionlist}
 % 
 % \section{Data setup}
@@ -390,7 +394,7 @@
 % \section{Implementation}
 %    \begin{macrocode}
 \RequirePackage{expl3}
-\ProvidesExplPackage{qrbill}{2020/06/28}{1.0}{
+\ProvidesExplPackage{qrbill}{2020/06/29}{1.01}{
   Template for QR-bills based on the Swiss Payment Standards
 }
 \RequirePackage{iftex}
@@ -401,6 +405,7 @@
 \bool_new:N \g__qrbill_bottom_frame_bool
 \bool_new:N \g__qrbill_left_frame_bool
 \bool_new:N \g__qrbill_right_frame_bool
+\bool_new:N \g__qrbill_separateinfo_bool
 
 \keys_define:nn {qrbill} {
   font .choices:nn = {Frutiger, Arial, Helvetica, Liberation Sans} {
@@ -454,6 +459,35 @@
   icon .initial:n =,
   iconwidth .dim_gset:N = \g_qrbill_iconwidth_dim,
   iconwidth .initial:n = 7mm,
+  separate .choice:,
+  separate / symbol .code:n = {
+    \bool_gset_true:N \g__qrbill_separateinfo_bool
+    \RequirePackage{marvosym}
+    \cs_set:Nn \qrbill_print_separate_info: {
+      \par\leaders\vbox_to_ht:nn {1sp} {
+        \smash{
+        \hbox_to_wd:nn {\c_qrbill_width_dim }{
+            \leaders\hbox{\rule{1mm}{\g__qrbill_rule_dim}\hspace{1mm}}\hskip 0pt\@plus1 fill\relax
+            \llap{\raisebox{-.5\height}{\LeftScissors}}
+            \leaders\hbox{\rule{1mm}{\g__qrbill_rule_dim}\hspace{1mm}}\hskip 0pt\@plus4 fill\relax
+        }
+        }
+      }
+      \vskip 1sp
+      \vskip -1sp
+    }
+    },
+  separate / text .code:n = {
+    \bool_gset_true:N \g__qrbill_separateinfo_bool
+    \cs_set:Nn \qrbill_print_separate_info: {
+      \centerline{\footnotesize\qrbillseparatename}
+    \par\nointerlineskip
+    \rule{\c_qrbill_width_dim}{\g__qrbill_rule_dim}
+    }
+  }
+  ,
+  separate / false .code:n = {\bool_gset_false:N \g__qrbill_separateinfo_bool},
+  separate .initial:n = text,
 }
 
 \ProcessKeysOptions{qrbill}
@@ -536,7 +570,11 @@
   \parbox{\c_qrbill_width_dim }{
     \vbox to \c_qrbill_height_dim {
       \bool_if:NTF \g__qrbill_top_frame_bool
-        {\rule{\c_qrbill_width_dim}{\g__qrbill_rule_dim}}
+        {
+          \bool_if:NTF \g__qrbill_separateinfo_bool
+            {\qrbill_print_separate_info:}
+            {\rule{\c_qrbill_width_dim}{\g__qrbill_rule_dim}}
+        }
         {\rule{\c_zero_dim}{\g__qrbill_rule_dim}}
       \par\nointerlineskip
       \skip_vertical:n {\c_qrbill_sep_dim-\g__qrbill_rule_dim}
@@ -885,6 +923,7 @@
 %    \end{macrocode}
 %    \begin{macrocode}
 %</qrbill.sty>
+% \section{The file swiss.qrbill-cfg.tex as a custom qrbill scheme}
 %<*swiss.qrbill-cfg.tex>
 %    \end{macrocode}
 % \fi
@@ -958,6 +997,11 @@
 %    \end{macrocode}
 % \fi
 %
+% \PrintChanges
+% \begin{thebibliography}{99}
+% \bibitem{qrbill-spec} Swiss Implementation Guidelines QR-bill: Technical and professional specifications of the payment part with Swiss QR Code and of the receipt. Version 2.1, with effect from 30 September 2019. \url{https://www.paymentstandards.ch/dam/downloads/ig-qr-bill-en.pdf}
+% \bibitem{qrbill-design} Style Guide QR-billStyle Guide QR-bill: The right layout pays off. Layout rules and recommendations for the payment part with Swiss QR Code and for the receipt. \url{https://www.paymentstandards.ch/dam/downloads/style-guide-en.pdf}
+% \end{thebibliography}
 % \appendix
 % \section{Example of standalone qrbill}
 % \label{standalone-complete}
@@ -972,7 +1016,7 @@
 \usepackage[nswissgerman]{babel}
 
 \RequirePackage{xcolor}
-\usepackage[icon=swiss-cross]{qrbill}
+\usepackage[icon=swiss-cross,separate=false]{qrbill}
 
 \begin{document}
 
@@ -1075,9 +1119,5 @@ Text
 %</qrbill-letter-demo.tex>
 %    \end{macrocode}
 % \fi
-% \begin{thebibliography}{99}
-% \bibitem{qrbill-spec} Swiss Implementation Guidelines QR-bill: Technical and professional specifications of the payment part with Swiss QR Code and of the receipt. Version 2.1, with effect from 30 September 2019. \url{https://www.paymentstandards.ch/dam/downloads/ig-qr-bill-en.pdf}
-% \bibitem{qrbill-design} Style Guide QR-billStyle Guide QR-bill: The right layout pays off. Layout rules and recommendations for the payment part with Swiss QR Code and for the receipt. \url{https://www.paymentstandards.ch/dam/downloads/style-guide-en.pdf}
-% \end{thebibliography}
 %\Finale
 \endinput
diff --git a/Master/texmf-dist/source/latex/qrbill/qrbill.ins b/Master/texmf-dist/source/latex/qrbill/qrbill.ins
index 48d4c6c8f66..116adcb78c7 100644
--- a/Master/texmf-dist/source/latex/qrbill/qrbill.ins
+++ b/Master/texmf-dist/source/latex/qrbill/qrbill.ins
@@ -1,7 +1,7 @@
 \input l3docstrip
 
-\def\filedate{2020/06/28}
-\def\fileversion{1.0}
+\def\filedate{2020/06/29}
+\def\fileversion{1.01}
 
 \preamble