qrbill

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

10 files changed, 56 insertions, 29 deletions

diff --git a/Master/texmf-dist/doc/latex/qrbill/README.md b/Master/texmf-dist/doc/latex/qrbill/README.md
index 6d82af8ebf1..d2de2374ae4 100644
--- a/Master/texmf-dist/doc/latex/qrbill/README.md
+++ b/Master/texmf-dist/doc/latex/qrbill/README.md
@@ -1,10 +1,10 @@
 # qrbill – create QR-bills based on the swiss payment standard
 
-Copyright (C) Marei Peischl (peiTeX)  <marei@peitex.de>, 2020
+Copyright (C) Marei Peischl (peiTeX)  <marei@peitex.de>, 2020–2021
 
 This work is part of a collaborative project of Marei Peischl (peiTeX) and Alex Antener (foobar LLC).
 
-qrbill 2020/08/25 v1.02
+qrbill 2021/05/10 v1.03
 
 ***************************************************************************
 
@@ -44,5 +44,8 @@ To simplify this, you can have a look at the qrbill.tds.zip, which provides an a
  * v1.01 (2020-06-29) Add tds package and the separate option
  * v1.02 (2020-08-25)
    - Fix placement issue with separate option
-   - add sep-iban/sep-reference mechanism
-   - not on version number inconsistency
\ No newline at end of file
+   - Add sep-iban/sep-reference mechanism
+   - Not on version number inconsistency
+ * v1.03 (2021-05-10)
+   - Update to swiss qrbill payments standard v2.2
+   - Add seb-iban and sep-reference to the example files
\ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/qrbill/qrbill-letter-demo.pdf b/Master/texmf-dist/doc/latex/qrbill/qrbill-letter-demo.pdf
new file mode 100644
index 00000000000..cadf7dcfb01
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/qrbill/qrbill-letter-demo.pdf
diff --git a/Master/texmf-dist/doc/latex/qrbill/qrbill-letter-demo.tex b/Master/texmf-dist/doc/latex/qrbill/qrbill-letter-demo.tex
index c89e9fda752..d67df446d90 100644
--- a/Master/texmf-dist/doc/latex/qrbill/qrbill-letter-demo.tex
+++ b/Master/texmf-dist/doc/latex/qrbill/qrbill-letter-demo.tex
@@ -6,7 +6,7 @@
 %%
 %% qrbill.dtx  (with options: `qrbill-letter-demo.tex')
 %% 
-%% Copyright (C) 2020 by Marei Peischl (peiTeX) <marei@peitex.de>
+%% Copyright (C) 2020–2021 by Marei Peischl (peiTeX) <marei@peitex.de>
 %% 
 %% This work is a collaboration of
 %%   Marei Peischl (peiTeX) and Alex Antener (foobar LLC).
@@ -37,7 +37,11 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \documentclass[foldmarks=b]{scrletter}
-\usepackage[frame=top]{qrbill}
+\usepackage[
+  frame=top,
+  sep-iban=4,
+  sep-reference=-5,
+]{qrbill}
 
 \DeclareNewLayer[
 align=bl,
diff --git a/Master/texmf-dist/doc/latex/qrbill/qrbill-standalone-demo.pdf b/Master/texmf-dist/doc/latex/qrbill/qrbill-standalone-demo.pdf
new file mode 100644
index 00000000000..6f9cac0388a
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/qrbill/qrbill-standalone-demo.pdf
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 2004d8d0efa..055531d1d14 100644
--- a/Master/texmf-dist/doc/latex/qrbill/qrbill-standalone-demo.tex
+++ b/Master/texmf-dist/doc/latex/qrbill/qrbill-standalone-demo.tex
@@ -6,7 +6,7 @@
 %%
 %% qrbill.dtx  (with options: `qrbill-standalone-demo.tex')
 %% 
-%% Copyright (C) 2020 by Marei Peischl (peiTeX) <marei@peitex.de>
+%% Copyright (C) 2020–2021 by Marei Peischl (peiTeX) <marei@peitex.de>
 %% 
 %% This work is a collaboration of
 %%   Marei Peischl (peiTeX) and Alex Antener (foobar LLC).
@@ -40,7 +40,12 @@
 \usepackage[nswissgerman]{babel}
 
 \RequirePackage{xcolor}
-\usepackage[icon=swiss-cross,separate=false]{qrbill}
+\usepackage[
+  icon=swiss-cross,
+  separate=false,
+  sep-iban=4,
+  sep-reference=-5
+]{qrbill}
 
 \begin{document}
 
diff --git a/Master/texmf-dist/doc/latex/qrbill/qrbill.pdf b/Master/texmf-dist/doc/latex/qrbill/qrbill.pdf
index 7aad2960564..cc5a14617db 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 09e705814da..21126cf9731 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 by Marei Peischl (peiTeX) <marei@peitex.de>
+% Copyright (C) 2020–2021 by Marei Peischl (peiTeX) <marei@peitex.de>
 %
 % This work is a collaboration of
 %   Marei Peischl (peiTeX) and Alex Antener (foobar LLC).
@@ -54,7 +54,7 @@
 % \fi
 % \iffalse
 %<*driver>
-\ProvidesFile{qrbill.dtx}[2020/08/25 v1.02 \ create QR-bills based on the Swiss standard]
+\ProvidesFile{qrbill.dtx}[2021/05/10 v1.03 \ create QR-bills based on the Swiss standard]
 \documentclass[english, parskip=half-]{scrartcl}
 \usepackage{iftex}
 \ifPDFTeX
@@ -175,7 +175,7 @@
 % \GetFileInfo{qrbill.dtx}
 %
 % \DoNotIndex{\newcommand,\newenvironment}
-% \title{qrbill v1.02}
+% \title{qrbill v1.03}
 % \subtitle{\LaTeX-package to create QR-bills based on the Swiss payments standards}
 % \author{Marei Peischl \href{mailto:marei@peitex.de}{<marei@peitex.de>}}
 % \publishers{A collaborative project of pei\TeX{} and foobar LLC}
@@ -311,22 +311,27 @@
 %
 % \section{Setup for the preconfigured Swiss QR-bill}
 % \subsection{Preconfigured data}
+% \changes{v1.03}{2021/05/07}{Update to swiss qrbill standard version 2.2}
 % The initial configuration which uses the Swiss standard already adds the following data:
 % \begin{doccode}
 % \SetupQrBill{
 %   QRType=SPC,
-%   Version=0210,
+%   Version=0200,
 %   CodingType=1,
 %   Trailer=EPD,
 % }
 % \end{doccode}
-% These fields are required to use these values for Version 2.1 of the QRbill standard. If any future changes on the standard would require changes, they can be overwritten or redefined by using a custom implementation file, similar to swiss.qrbill-cfg.tex.
+% These fields are required to use these values for Version 2.2 of the QRbill standard. If any future changes on the standard would require changes, they can be overwritten or redefined by using a custom implementation file, similar to swiss.qrbill-cfg.tex.
 %
 % \changes{v1.02}{2020/08/25}{Note the version number inconsistency in the official guidelines}
-% Be aware that we use the versioncode \code{0210}, as this is the current, implemented standard from the official guidelines, which replaced version 2.0 in 09/2019.
-% As the mentioned example in v2.1 of the official guidelines use an outdated version code (e.g. \code{0200}), some banking apps may refuse the processing of the QR code. Hence, this is not a bug of the qrbill package, but of these apps.
-% Feel free to change the version back to \code{0200} to override and support the replaced standard.
-% The corresponding issue and discussion can be found at \url{https://github.com/peiTeX/qrbill/issues/3}.
+% Be aware that version 2.1 of the standard requested to use the versioncode \code{0210}.
+% With the update to version 2.2 of the standard this was changed to \code{0200}.
+% This change was caused by a discrepancy between the standard and the commong implementation.
+% Most of them continued to use the version code \code{0200} therefore SIX decided to keep this error and created a workaround with finally documenting this change in version 2.2 of the guildelines.
+% \begin{quote}
+%Note: In collaboration with representatives of the financial center, SIX has decided that only the version designation “0200” is permitted in master version 02. From master version 03 onwards, depiction of subversions is enabled.\\\hspace*{\fill}\cite{qrbill-spec}
+% \end{quote}
+% The corresponding issue and discussion concerning this especially for version 2.1 can be found at \url{https://github.com/peiTeX/qrbill/issues/3}.
 %
 % Additionally the Currency has been initialized to use \enquote{CHF}. This also can be overwritten. Currently the Swiss standards only allow the values \code{CHF} or \code{EUR}.
 % \subsection{Address data}
@@ -426,7 +431,7 @@
 % \section{Implementation}
 %    \begin{macrocode}
 \RequirePackage{expl3}
-\ProvidesExplPackage{qrbill}{2020/08/25}{1.02}{
+\ProvidesExplPackage{qrbill}{2021/05/10}{1.03}{
   Template for QR-bills based on the Swiss Payment Standards
 }
 \RequirePackage{iftex}
@@ -1057,7 +1062,7 @@
 
 \SetupQrBill{
         QRType=SPC,
-        Version=0210,
+        Version=0200,
         CodingType=1,
         Trailer=EPD,
         Currency=CHF,
@@ -1072,11 +1077,12 @@
 %
 % \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-spec} Swiss Implementation Guidelines QR-bill: Technical and professional specifications of the payment part with Swiss QR Code and of the receipt. Version 2.2, with effect from 22 February 2021. \url{https://www.paymentstandards.ch/dam/downloads/ig-qr-bill-en.pdf}. Last checked 2021-05-07
 % \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}
+% \changes{v1.03}{2021/05/07}{set sep-iban and sep-reference in examples}
 % \label{standalone-complete}
 % \iffalse
 %    \begin{macrocode}
@@ -1089,7 +1095,12 @@
 \usepackage[nswissgerman]{babel}
 
 \RequirePackage{xcolor}
-\usepackage[icon=swiss-cross,separate=false]{qrbill}
+\usepackage[
+  icon=swiss-cross,
+  separate=false,
+  sep-iban=4,
+  sep-reference=-5
+]{qrbill}
 
 \begin{document}
 
@@ -1129,7 +1140,11 @@
 %    \begin{macrocode}
 % !TeX Program=lualatex
 \documentclass[foldmarks=b]{scrletter}
-\usepackage[frame=top]{qrbill}
+\usepackage[
+  frame=top,
+  sep-iban=4,
+  sep-reference=-5,
+]{qrbill}
 
 % Setup layer
 \DeclareNewLayer[
diff --git a/Master/texmf-dist/source/latex/qrbill/qrbill.ins b/Master/texmf-dist/source/latex/qrbill/qrbill.ins
index 5af7e8fb785..26eec8166b4 100644
--- a/Master/texmf-dist/source/latex/qrbill/qrbill.ins
+++ b/Master/texmf-dist/source/latex/qrbill/qrbill.ins
@@ -1,11 +1,11 @@
 \input l3docstrip
 
-\def\filedate{2020/08/25}
-\def\fileversion{1.02}
+\def\filedate{2021/05/10}
+\def\fileversion{1.03}
 
 \preamble
 
-Copyright (C) 2020 by Marei Peischl (peiTeX) <marei@peitex.de>
+Copyright (C) 2020–2021 by Marei Peischl (peiTeX) <marei@peitex.de>
 
 This work is a collaboration of
   Marei Peischl (peiTeX) and Alex Antener (foobar LLC).
diff --git a/Master/texmf-dist/tex/latex/qrbill/qrbill.sty b/Master/texmf-dist/tex/latex/qrbill/qrbill.sty
index ec784ae5bbe..c1b047be6cc 100644
--- a/Master/texmf-dist/tex/latex/qrbill/qrbill.sty
+++ b/Master/texmf-dist/tex/latex/qrbill/qrbill.sty
@@ -6,7 +6,7 @@
 %%
 %% qrbill.dtx  (with options: `qrbill.sty,package')
 %% 
-%% Copyright (C) 2020 by Marei Peischl (peiTeX) <marei@peitex.de>
+%% Copyright (C) 2020–2021 by Marei Peischl (peiTeX) <marei@peitex.de>
 %% 
 %% This work is a collaboration of
 %%   Marei Peischl (peiTeX) and Alex Antener (foobar LLC).
@@ -38,7 +38,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \RequirePackage{expl3}
-\ProvidesExplPackage{qrbill}{2020/08/25}{1.02}{
+\ProvidesExplPackage{qrbill}{2021/05/10}{1.03}{
   Template for QR-bills based on the Swiss Payment Standards
 }
 \RequirePackage{iftex}
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 8c35a1a2dd5..d4ff7747ee2 100644
--- a/Master/texmf-dist/tex/latex/qrbill/swiss.qrbill-cfg.tex
+++ b/Master/texmf-dist/tex/latex/qrbill/swiss.qrbill-cfg.tex
@@ -6,7 +6,7 @@
 %%
 %% qrbill.dtx  (with options: `swiss.qrbill-cfg.tex')
 %% 
-%% Copyright (C) 2020 by Marei Peischl (peiTeX) <marei@peitex.de>
+%% Copyright (C) 2020–2021 by Marei Peischl (peiTeX) <marei@peitex.de>
 %% 
 %% This work is a collaboration of
 %%   Marei Peischl (peiTeX) and Alex Antener (foobar LLC).
@@ -92,7 +92,7 @@
 
 \SetupQrBill{
         QRType=SPC,
-        Version=0210,
+        Version=0200,
         CodingType=1,
         Trailer=EPD,
         Currency=CHF,