10 files changed, 98 insertions, 18 deletions
diff --git a/Master/texmf-dist/doc/latex/qrbill/README.md b/Master/texmf-dist/doc/latex/qrbill/README.md
index 745b4ed75f2..14ca52239f2 100644
--- a/Master/texmf-dist/doc/latex/qrbill/README.md
+++ b/Master/texmf-dist/doc/latex/qrbill/README.md
@@ -4,7 +4,7 @@ Copyright (C) Marei Peischl (peiTeX)  <marei@peitex.de>, 2020
 
 This work is part of a collaborative project of Marei Peischl (peiTeX) and Alex Antener (foobar LLC).
 
-qrbill 2020/06/28 v1.0
+qrbill 2020/06/29 v1.01
 
 ***************************************************************************
 
@@ -19,6 +19,7 @@ qrbill 2020/06/28 v1.0
 * qrbill.dtx
 * qrbill.ins
 * qrbill-vocab.csv
+* qrbill_swiss-cross.pdf
 
 The files
 * qrbill.sty
@@ -28,7 +29,16 @@ as well as the demo files
 * qrbill-letter-demo.tex
 can be created from the qrbill.dtx by processing the qrbill.ins-file.
 
+## Installation Notes
+
+To be able to compile the package, the files
+qrbill.sty, swiss.qrbill-cfg.tex, qrbill_swiss-cross.pdf and qrbill-vocab.csv
+have to be placed in the $TEXINPUTS path.
+
+To simplify this, you can have a look at the qrbill.tds.zip, which provides an already prestructured variant to be extracted to any tds tree.
+
 
 ## Version History
 
- * v1.00 First official version - published on 2020-06-28
-\ No newline at end of file
+ * v1.00 (2020-06-28) First official version
+ * v1.01 (2020-06-29) Add tds package and the separate option
+\ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/qrbill/qrbill-standalone-demo.tex b/Master/texmf-dist/doc/latex/qrbill/qrbill-standalone-demo.tex
index 85b277dcc95..2004d8d0efa 100644
--- a/Master/texmf-dist/doc/latex/qrbill/qrbill-standalone-demo.tex
+++ b/Master/texmf-dist/doc/latex/qrbill/qrbill-standalone-demo.tex
@@ -40,7 +40,7 @@
 \usepackage[nswissgerman]{babel}
 
 \RequirePackage{xcolor}
-\usepackage[icon=swiss-cross]{qrbill}
+\usepackage[icon=swiss-cross,separate=false]{qrbill}
 
 \begin{document}
 
diff --git a/Master/texmf-dist/doc/latex/qrbill/qrbill.pdf b/Master/texmf-dist/doc/latex/qrbill/qrbill.pdf
index e8cb0644fc2..aedbe44c7f0 100644
--- a/Master/texmf-dist/doc/latex/qrbill/qrbill.pdf
+++ b/Master/texmf-dist/doc/latex/qrbill/qrbill.pdf
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
 
diff --git a/Master/texmf-dist/doc/latex/qrbill/qrbill-vocab.csv b/Master/texmf-dist/tex/latex/qrbill/qrbill-vocab.csv
index e9df8266aca..e9df8266aca 100644
--- a/Master/texmf-dist/doc/latex/qrbill/qrbill-vocab.csv
+++ b/Master/texmf-dist/tex/latex/qrbill/qrbill-vocab.csv
diff --git a/Master/texmf-dist/tex/latex/qrbill/qrbill.sty b/Master/texmf-dist/tex/latex/qrbill/qrbill.sty
index d3a665b250f..ff602b56172 100644
--- a/Master/texmf-dist/tex/latex/qrbill/qrbill.sty
+++ b/Master/texmf-dist/tex/latex/qrbill/qrbill.sty
@@ -49,6 +49,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} {
@@ -102,6 +103,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}
@@ -183,7 +213,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}
diff --git a/Master/texmf-dist/doc/latex/qrbill/qrbill_swiss-cross.pdf b/Master/texmf-dist/tex/latex/qrbill/qrbill_swiss-cross.pdf
index 09076134335..09076134335 100644
--- a/Master/texmf-dist/doc/latex/qrbill/qrbill_swiss-cross.pdf
+++ b/Master/texmf-dist/tex/latex/qrbill/qrbill_swiss-cross.pdf
diff --git a/Master/texmf-dist/doc/latex/qrbill/swiss.qrbill-cfg.tex b/Master/texmf-dist/tex/latex/qrbill/swiss.qrbill-cfg.tex
index 8c35a1a2dd5..8c35a1a2dd5 100644
--- a/Master/texmf-dist/doc/latex/qrbill/swiss.qrbill-cfg.tex
+++ b/Master/texmf-dist/tex/latex/qrbill/swiss.qrbill-cfg.tex
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index f6c5f1de07e..57eed6dcb72 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -1117,7 +1117,6 @@ chomp (my $ctan_root = `tlpkginfo --ctan-root`);
  'pxtxalfa',    "&MAKEcopy",
  'pxufont',	"&MAKEflatten",
  'pzccal',      "die 'skipping, obsoleted by urwchancal'",
- 'qrbill',	"&MAKEflatten",
  'qrcstamps',	"die 'skipping, requires adobe (dps'",
  'qualitype',	"&MAKEflatten",
  'quran',	"&MAKEflatten",
@@ -1696,7 +1695,6 @@ $standarddest = "texmf-dist";
  'passivetex',  'xmltex',
  'pdcmac',      'plain',
  'pdf-trans',   'generic',
- 'pdftexcmds',	'generic',
  'philokalia',  'xelatex',
  'pictex',      'generic',
  'placeins-plain',      'plain',
@@ -2385,7 +2383,6 @@ $standardtex
  'pdcmac',              'plain',
  'pdf-trans',           'generic',
  'pdfcrop',             'support',
- 'pdftexcmds',		'generic',
  'pedigree-perl',       'support',
  'persian-bib',         'xelatex',
  'phaistos',            'fonts',
@@ -2555,7 +2552,6 @@ $standarddocfmt='latex';
  'ot2cyr',      'fonts',
  'patch',       'generic',
  'pdcmac',      'plain',
- 'pdftexcmds',	'generic',
  'philokalia',  'xelatex',
  'pictex',      'generic',
  'pstricks',    'generic',