CTAN sync 202303190301

author: Norbert Preining <norbert@preining.info> 2023-03-19 03:01:21 +0000
committer: Norbert Preining <norbert@preining.info> 2023-03-19 03:01:21 +0000
commit: 41b65de3ca404c665b94ea7716f036ce4f024619 (patch)
tree: 79b818f56264510a85b019c02e6d7b26238d9cfb /macros/latex
parent: b0cfbb3bcaeafdcb4da817c21937f10ce07f5dca (diff)
259 files changed, 1694 insertions, 1760 deletions
diff --git a/macros/latex/contrib/babel-contrib/greek/Makefile b/macros/latex/contrib/babel-contrib/greek/Makefile
deleted file mode 100644
index c88acae1ef..0000000000
--- a/macros/latex/contrib/babel-contrib/greek/Makefile
+++ /dev/null
@@ -1,145 +0,0 @@
-# This Makefile updates the source and documentation for the
-# babel-greek LateX package
-#
-# © 2019 Günter Milde
-#
-# SRCDIR (and the other variables) can be easily modified as parameters
-# while calling `make', e.g.
-#
-#   make install SRCDIR=~/texmf/tex/latex/
-
-# Global variables
-# =================
-
-# for installation into a users local texmf tree
-DESTDIR = ~/texmf/tex/latex/greek/babel-greek
-DOCDIR = ~/texmf/doc/latex/greek/babel-greek
-
-CHDIR = cd
-COPY = cp --update
-SH = sh
-
-# programs
-PYLIT = pylit        # text <-> source converter for literal programming
-RST2HTML = rst2html5 # text -> HTML converter, see docutils.sf.net
-RUBBER = rubber --force --pdf # latex-wrapper running until refs are resolved
-LATEX = pdflatex -interaction batchmode # suppress logging to terminal
-
-
-.PHONY: all
-
-all: packages doc test
-
-# LaTeX source files
-# ==================
-
-.PHONY: packages
-
-packages: greek.ldf athnum.sty grmath.sty
-
-greek.ldf: babel-greek.dtx
-	tex babel-greek.ins
-
-athnum.sty: athnum.dtx
-	tex babel-greek.ins
-
-grmath.sty: athnum.dtx
-	tex babel-greek.ins
-
-# Documentation
-# =============
-
-.PHONY: doc html pdf test
-
-doc: html pdf
-
-html: babel-greek-doc.html
-
-babel-greek-doc.html: babel-greek-doc.rst
-	$(RST2HTML) babel-greek-doc.rst babel-greek-doc.html
-
-
-pdf: babel-greek.pdf athnum.pdf grmath.pdf usage.pdf
-
-test: test-greek.pdf test-greek-tu.pdf test-greek-8bitcompat.pdf \
-      test-greek-ini.pdf \
-      test-lgr-fixes.pdf test-case-changing.pdf\
-      test-greeknum.pdf test-greeknum-tu.pdf \
-      test-athnum.pdf test-athnum-tu.pdf
-
-babel-greek.pdf: babel-greek.dtx
-	$(RUBBER) -m hyperref babel-greek.dtx
-	makeindex -s gglo.ist -o babel-greek.gls babel-greek.glo
-	$(RUBBER) -m hyperref babel-greek.dtx
-
-athnum.pdf: athnum.dtx
-	$(RUBBER) athnum.dtx
-
-grmath.pdf: grmath.dtx
-	$(RUBBER) grmath.dtx
-
-usage.pdf: usage.tex greek.ldf
-	$(RUBBER) usage.tex
-
-test-greek.pdf: test-greek.tex greek.ldf
-	$(RUBBER) -m hyperref test-greek.tex
-
-test-greek-tu.pdf: test-greek.tex greek.ldf
-	$(RUBBER) -m xelatex --jobname=test-greek-tu test-greek.tex
-
-# requires rubber >= 1.6, otherwise `-m lualatex` is ignored.
-test-greek-8bitcompat.pdf: test-greek-8bitcompat.tex test-greek.tex greek.ldf
-	$(RUBBER) -m hyperref -m lualatex test-greek-8bitcompat.tex
-
-test-greek-ini.pdf: test-greek-ini.tex test-greek.tex greek.ldf
-	$(RUBBER) -m hyperref -m xelatex test-greek-ini.tex
-
-test-case-changing.pdf: test-case-changing.tex greek.ldf
-	$(RUBBER) -m hyperref test-case-changing.tex
-
-test-athnum.pdf: test-athnum.tex greek.ldf athnum.sty
-	$(RUBBER) test-athnum.tex
-
-test-athnum-tu.pdf: test-athnum.tex greek.ldf athnum.sty
-	$(RUBBER) -m xelatex --jobname=test-athnum-tu test-athnum.tex
-
-test-greeknum.pdf: test-greeknum.tex greek.ldf
-	$(RUBBER) test-greeknum.tex
-
-test-greeknum-tu.pdf: test-greeknum.tex greek.ldf
-	$(RUBBER) -m xelatex --jobname=test-greeknum-tu test-greeknum.tex
-
-test-lgr-fixes.pdf: test-lgr-fixes.tex greek.ldf
-	$(RUBBER) -m hyperref -m index test-lgr-fixes.tex
-
-
-# Installation/Update
-# ===================
-
-update: packages test
-	$(COPY) *.ldf $(DESTDIR)
-	$(COPY) *.sty $(DESTDIR)
-
-update-package: packages doc test
-	$(COPY) README.md $(DOCDIR)
-	$(COPY) babel-greek-doc.rst $(DOCDIR)
-	$(COPY) babel-greek-doc.html $(DOCDIR)
-	# selected PDFs
-	$(COPY) [!t]*.pdf $(DOCDIR)
-	$(COPY) test-greek.pdf $(DOCDIR)
-	$(COPY) test-athnum.pdf $(DOCDIR)
-	# also copy all sources
-	$(COPY) *.dtx $(DOCDIR)
-	$(COPY) *.ins $(DOCDIR)
-	$(COPY) *.tex $(DOCDIR)
-	$(COPY) Makefile $(DOCDIR)
-
-
-# Cleanup
-# =======
-
-.PHONY: clean
-
-clean:
-	rm -f *~ *.aux *.bbl *.bcf *.blg *.run.xml *.glo *.gls \
-	      *.idx *.ilg *.ind *.log *.out *.rubbercache *.toc
diff --git a/macros/latex/contrib/babel-contrib/greek/README.md b/macros/latex/contrib/babel-contrib/greek/README.md
index c6a10c1292..ce85bc77bd 100644
--- a/macros/latex/contrib/babel-contrib/greek/README.md
+++ b/macros/latex/contrib/babel-contrib/greek/README.md
@@ -4,7 +4,7 @@ babel-greek
 Comprehensive support for the Greek language and script with
 [Babel](https://ctan.org/pkg/babel).
 
-**Version**: 1.13
+**Version**: 1.13.1
 
 **Copyright**: © 1997 Apostolos Syropoulos, Claudio Beccari, Johannes Brahms,
                © 2013 - 2023 Günter Milde.
@@ -32,4 +32,5 @@ See the **documentation** for options, peculiarities, and other details:
 * [babel-greek-doc.rst](https://codeberg.org/milde/greek-tex/src/branch/master/babel-greek/babel-greek-doc.rst)
   (🡥codeberg.org)
 
-or the shell command `texdoc babel-greek` to view local documentation.
+The shell command `texdoc babel-greek` displays documentation from a local
+TeXLive installation.
diff --git a/macros/latex/contrib/babel-contrib/greek/athnum.dtx b/macros/latex/contrib/babel-contrib/greek/athnum.dtx
index 3c1f3f4636..fc199a4896 100644
--- a/macros/latex/contrib/babel-contrib/greek/athnum.dtx
+++ b/macros/latex/contrib/babel-contrib/greek/athnum.dtx
@@ -16,12 +16,12 @@
 % The Current Maintainer of this work is Günter Milde <milde@users.sf.net>.
 %
 % \fi
-%% \CheckSum{150}
+%% \CheckSum{146}
 %\iffalse
 %
 %% This is file `athnum.dtx'
 %% (c) 1997-2007 Apostolos Syropoulos.
-%% Changes in version 2.0 © 2022 Günter Milde
+%% Changes in version 2 © 2022, 2023 Günter Milde
 %% All rights reserved.
 %\fi
 %
@@ -29,6 +29,9 @@
 %    \begin{macrocode}
 %<*driver>
 \documentclass{ltxdoc}
+\usepackage{hyperref}
+\hypersetup{colorlinks=true,linkcolor=blue,urlcolor=blue,citecolor=black}
+% auxiliary macro to keep the documentation independent of Greek text fonts
 \def\PiIt#1{{%
     \newdimen\boxW \newdimen\boxH
     \settowidth{\boxW}{#1}%
@@ -45,9 +48,8 @@
 %</driver>
 %    \end{macrocode}
 % \fi
-%\title{Attic (or Athenian) Numerals}
-% \author{Apostolos Syropoulos\\366, 28th October Str.\\
-% GR-671 00 Xanthi, HELLAS\\ Email:\texttt{apostolo@platon.ee.duth.gr}}
+%%\title{Athenian (Attic) Numerals}
+% \author{Apostolos Syropoulos}
 % \date{2003/08/24}
 %\maketitle
 %
@@ -57,10 +59,12 @@
 %
 % This \LaTeX\ package implements the macro
 % \DescribeMacro{\athnum}
-% |\athnum|. The macro transforms an Arabic numeral, i.e., the kind
-% of numerals we all use (e.g., 1, 5, 789 etc), to the corresponding
-% {\itshape Athenian} (or \emph{Attic} numeral. Athenian numerals were in
-% use mainly in ancient Athens. The package requires a Greek text font and
+% |\athnum|.
+% The macro transforms an Arabic numeral, i.e., the kind of numerals
+% we all use (e.g., 1, 5, 789 etc), to the corresponding
+% \href{https://en.wikipedia.org/wiki/Attic_numerals}{\emph{Athenian} numeral}.
+% It can also be used to display counters.
+% The package requires a Greek text font and
 % the |greek-fontenc| package.\footnote{%
 %   Up to version 1.1, `athnum' required that Babel was loaded with the
 %   |greek| option. Version 2.0 sets up Greek font support autonomously.}
@@ -93,23 +97,16 @@
 %
 % \section{The Code}
 %
-% \changes{athnum-2.0}{2022/12/08}{%
-%   Do not require Babel to be loaded with the |greek| option.\\
-%   Use LICR macros instead of the Latin transliteration for Greek letters
-%   to fix working with Unicode fonts.\\
-%   Drop the backwards compatibility definitions for PiDelta, PiEta,
-%   PiChi, and PiMu.}
-%
 % Before we do anything further, we have to identify the package.
 % \StopEventually
 %
 %    \begin{macrocode}
 %<*package>
 \NeedsTeXFormat{LaTeX2e}[1996/01/01]
-\ProvidesPackage{athnum}[2022/12/08\space v2.0]
-\typeout{Package: `athnum' v2.0\space <2022/12/08> (A. Syropoulos)}
+\ProvidesPackage{athnum}[2023/03/17 v2.0.1 Athenian numerals]
 %    \end{macrocode}
-% \section{Font setup}
+%
+% \subsection{Font Setup}
 %
 % Typesetting Greek texts requires a font with Greek characters:
 %
@@ -142,10 +139,9 @@
   \InputIfFileExists{\athnum@greek@fontencdef .def}{}{% else
     \PackageError{athnum}{Font support for the Greek script missing.\\
                can't typeset Greek symbols.\\
-               Install the "greek-fontenc" package\\
-               or use XeTeX/LuaTeX.}
+               Install the "greek-fontenc" package.}
               {I can't find the \athnum@greek@fontencdef .def file
-               for the Greek fonts (encoding \greekfontencoding)}
+               for the Greek fonts (encoding \greekfontencoding).}
     \@@end
   }
 }
@@ -160,6 +156,8 @@
 %    \end{macrocode}
 % \end{macro}
 %
+% \subsection{Transform Arabic Numeral to Athenian Numeral}
+%
 %\begin{macro}{\@@athnum}
 % Now, we turn our attention to the definition of the macro
 % |\@@athnum|. This macro uses one integer variable (or counter in
@@ -272,20 +270,32 @@
 %    \end{macrocode}
 %\end{macro}
 %\begin{macro}{\athnum}
-% The command |\athnum| is a wrapper that declares
-% a new counter in a local scope, assigns to it the argument of the command
-% and calls the macro |\@athnum|. This way the command can process correctly
-% either a number or a counter.
+% The command |\athnum| is a wrapper that declares a new counter
+% in a local scope, assigns to it the argument of the command
+% and calls the macro |\@athnum|.
+% This way the command can process correctly either a number or a counter.
+% It also ensures that the argument is set with a Greek text font.
 %    \begin{macrocode}
 \def\athnum#1{%
-     \ensuregreek{%
+     \textrm{\ensuregreek{%
        \@ath@num#1\relax
        \@athnum{\@ath@num}}%
-     }
+     }}
 %</package>
 %    \end{macrocode}
 %\end{macro}
 %
+% \section{Changes}
+% \begin{description}
+%   \item [athnum-2.0 2022/12/08]
+%     Do not require Babel.
+%     Support Unicode fonts.
+%     Drop the backwards compatibility definitions
+%     for |\PiDelta|, |\PiEta|, |\PiChi|, and |\PiMu|.
+%   \item [athnum-2.0.1 2023/03/17]
+%     Fix behaviour in math mode.
+% \end{description}
+%
 % \section*{Acknowledgment}
 % I would like to thank Claudio Beccari for reading the documentation
 % and for his very helpful suggestions. In addition, Antonis Tsolomitis
@@ -294,6 +304,8 @@
 % \section*{Dedication}
 % I would like to dedicate this piece of work to my son
 % \begin{center}Demetrios-Georgios.\end{center}
+%
+%
 % \Finale
 %
 \endinput
diff --git a/macros/latex/contrib/babel-contrib/greek/athnum.pdf b/macros/latex/contrib/babel-contrib/greek/athnum.pdf
index 060d16210b..85ca90ad8b 100644
--- a/macros/latex/contrib/babel-contrib/greek/athnum.pdf
+++ b/macros/latex/contrib/babel-contrib/greek/athnum.pdf
diff --git a/macros/latex/contrib/babel-contrib/greek/babel-greek-doc.html b/macros/latex/contrib/babel-contrib/greek/babel-greek-doc.html
index 395fe33fd2..26648f07c8 100644
--- a/macros/latex/contrib/babel-contrib/greek/babel-greek-doc.html
+++ b/macros/latex/contrib/babel-contrib/greek/babel-greek-doc.html
@@ -793,7 +793,7 @@ mstyle.mathscr, mi.mathscr {
 <p class="subtitle" id="babel-support-for-the-greek-language-and-script">Babel support for the Greek language and script</p>
 <dl class="docinfo">
 <dt class="version">Version<span class="colon">:</span></dt>
-<dd class="version">1.13 (<a class="reference internal" href="#changelog">changelog</a>)</dd>
+<dd class="version">1.13.1 (<a class="reference internal" href="#changelog">changelog</a>)</dd>
 <dt class="copyright">Copyright<span class="colon">:</span></dt>
 <dd class="copyright">© 1997 Apostolos Syropoulos, Claudio Beccari, Johannes Brahms,
 © 2013 – 2023 Günter Milde.</dd>
@@ -1383,6 +1383,12 @@ Use LICR macros instead of the Latin transliteration.</p></li>
 <li><p>Fix links, update documentation.</p></li>
 </ul>
 </dd>
+<dt>1.13.1 (2023-03-17)</dt>
+<dd><ul class="simple">
+<li><p>Don’t use text command in math mode with “keep-semicolon”.</p></li>
+<li><p><a class="reference external" href="athnum.dtx">athnum.dtx</a> 2.0.1: Fix behaviour in math mode.</p></li>
+</ul>
+</dd>
 </dl>
 </section>
 <section id="references">
diff --git a/macros/latex/contrib/babel-contrib/greek/babel-greek-doc.rst b/macros/latex/contrib/babel-contrib/greek/babel-greek-doc.rst
index 2c65158b9a..08bc93633b 100644
--- a/macros/latex/contrib/babel-contrib/greek/babel-greek-doc.rst
+++ b/macros/latex/contrib/babel-contrib/greek/babel-greek-doc.rst
@@ -3,7 +3,7 @@ babel-greek
 Babel support for the Greek language and script
 ===============================================
 
-:Version: 1.13 (changelog_)
+:Version: 1.13.1 (changelog_)
 
 :Copyright: © 1997 Apostolos Syropoulos, Claudio Beccari, Johannes Brahms,
             © 2013 -- 2023 Günter Milde.
@@ -398,6 +398,9 @@ Changelog
      - New language attribute "keep-semicolon_".
      - Rename ``\greek@tilde`` to ``\bbl@greek@tilde``, simplify definition.
      - Fix links, update documentation.
+1.13.1 (2023-03-17)
+     - Don't use text command in math mode with "keep-semicolon".
+     - `athnum.dtx`_ 2.0.1: Fix behaviour in math mode.
 
 .. _babel/4303: http://www.latex-project.org/cgi-bin/ltxbugs2html?pr=babel/4303
 .. _babel/4305: http://www.latex-project.org/cgi-bin/ltxbugs2html?pr=babel/4305
diff --git a/macros/latex/contrib/babel-contrib/greek/babel-greek.dtx b/macros/latex/contrib/babel-contrib/greek/babel-greek.dtx
index 3d75104121..0eb7071284 100644
--- a/macros/latex/contrib/babel-contrib/greek/babel-greek.dtx
+++ b/macros/latex/contrib/babel-contrib/greek/babel-greek.dtx
@@ -37,7 +37,7 @@
 %<code>\ProvidesLanguage{greek}
 %\fi
 %\ProvidesFile{babel-greek.dtx}
-        [2023/03/15 1.13 Greek support for the babel system]
+        [2023/03/17 1.13.1 Greek support for the babel system]
 %\iffalse
 %% File `babel-greek.dtx'
 %% Greek language Definition File
@@ -600,6 +600,8 @@
 %
 % \changes{babel-greek-1.13}{2023/03/15}{
 %    New language attribute \Lopt{keep-semicolon}.}
+% \changes{babel-greek-1.13}{2023/03/15}{
+%    Don't use text command in math mode.}
 % The LGR font encoding uses the Latin question mark as input for
 % the Greek question mark (\emph{erotimatiko}) and maps the semicolon
 % to a middle dot (\emph{ano teleia}).
@@ -613,11 +615,11 @@
   \def\bbl@tempa{LGR}
   \ifx\greekfontencoding\bbl@tempa
     \ProvideTextCommandDefault{\textsemicolon}{;}
-    \ProvideTextCommand{\textsemicolon}{LGR}{\TextOrMath{\texterotimatiko}{;}}
+    \ProvideTextCommand{\textsemicolon}{LGR}{\texterotimatiko}
     \initiate@active@char{;}
     \addto\extrasgreek{\bbl@activate{;}}
     \addto\noextrasgreek{\bbl@deactivate{;}}
-    \declare@shorthand{greek}{;}{\textsemicolon}
+    \declare@shorthand{greek}{;}{\TextOrMath{\textsemicolon}{;}}
   \fi
 }
 %    \end{macrocode}
diff --git a/macros/latex/contrib/babel-contrib/greek/babel-greek.pdf b/macros/latex/contrib/babel-contrib/greek/babel-greek.pdf
index 8699cde837..3da9b8a926 100644
--- a/macros/latex/contrib/babel-contrib/greek/babel-greek.pdf
+++ b/macros/latex/contrib/babel-contrib/greek/babel-greek.pdf
diff --git a/macros/latex/contrib/babel-contrib/greek/test-athnum.pdf b/macros/latex/contrib/babel-contrib/greek/test-athnum.pdf
index 4f1fd57796..f76f2c8e06 100644
--- a/macros/latex/contrib/babel-contrib/greek/test-athnum.pdf
+++ b/macros/latex/contrib/babel-contrib/greek/test-athnum.pdf
diff --git a/macros/latex/contrib/babel-contrib/greek/test-athnum.tex b/macros/latex/contrib/babel-contrib/greek/test-athnum.tex
index 0d8a6bfb6b..4de8a01ff8 100644
--- a/macros/latex/contrib/babel-contrib/greek/test-athnum.tex
+++ b/macros/latex/contrib/babel-contrib/greek/test-athnum.tex
@@ -67,4 +67,6 @@ Largest allowed number: 249999 = \athnum{249999}
 
 Hexadecimal input works, too: \texttt{"10} = \athnum{"10}
 
+Attic numerals in math mode: $a = \textrm{\athnum{678}}, b = \athnum{2022}$
+
 \end{document}
diff --git a/macros/latex/contrib/babel-contrib/greek/test-case-changing-minimal.tex b/macros/latex/contrib/babel-contrib/greek/test-case-changing-minimal.tex
deleted file mode 100644
index f90e2e1e24..0000000000
--- a/macros/latex/contrib/babel-contrib/greek/test-case-changing-minimal.tex
+++ /dev/null
@@ -1,75 +0,0 @@
-\documentclass[a4paper]{article}
-% \usepackage[greek,english]{babel}  % babel-greek
-\usepackage[greek,english,provide=*]{babel}    % Babel's Greek "ini"
-
-\usepackage{parskip}
-\newcommand{\langGreek}{\foreignlanguage{greek}}
-% \renewcommand{\langGreek}{}  % check without language change
-
-
-\ifdefined \UnicodeEncodingName
-  \usepackage{fontspec}
-  \setmainfont{FreeSerif}
-  \newcommand*{\texengine}{Xe/LuaLaTeX}
-\else
-  \usepackage{lmodern}
-  \newcommand*{\texengine}{pdfLaTeX}
-\fi
-
-
-\begin{document}
-
-Greek question mark:
-\langGreek{; → \MakeUppercase{;}}
-
-Latin accents: 
-\langGreek{ᾰ Ᾰ ῐ Ῐ ῠ ᾱ Ᾱ ῑ Ῑ ῡ → \MakeUppercase{ᾰ Ᾰ ῐ Ῐ ῠ ᾱ Ᾱ ῑ Ῑ ῡ}}
-
-hiatus:
-\newcommand*{\hiatest}{άι, άυ, έι, ἄι, ἄυ, ἔι, ἀυ}
-\langGreek{\hiatest{} → \MakeUppercase{\hiatest{}}}
-
-\langGreek{ἀυπνία → \MakeUppercase{ἀυπνία}}
-
-Spacing prosgegrammeni:
-\langGreek{ι → \MakeUppercase{ι}}
-
-Spacing accents:
-\langGreek{῀ ` ´ ῾ ᾽ ᾿ \quad  ῍ ῎ ῝ ῞ ῟ ῏ ῭ ΅ ῁ → 
-  \MakeUppercase{῀ ` ´ ῾ ᾽ ᾿ \quad ῍ ῎ ῝ ῞ ῟ ῏ ῭ ΅ ῁}}
-
-Eta with tonos:
-\langGreek{ή, Ή → \MakeUppercase{ή, Ή}}.
-
-\end{document}
-
-Upcasing/downcasing literal chars of the "Greek and Coptic" and "Greek
-Extended" Unicode block now works without errors.
-
-Problems (in order of urgence):
-
-* Uppercase of character 0x37E GREEK QUESTION MARK is 0x3B SEMICOLON which is
-  mapped to a middle dot (0x387 GREEK ANO TELEIA) by LGR:
-
-* The “educational”/“Latin” accents *macron* and *breve* (*vrachy*) should
-  be kept (they stay above capital letters similar to the dialytika,
-  they are kept by Apostolos Syropoulos' “xgreek” package and in babel-greek
-  “since ages”):
-
-* Auto-Hiatus also required after
-  0x1F00 GREEK SMALL LETTER ALPHA WITH PSILI + iota or upsilon.
-
-* Spacing prosgegrammeni turned to capital Iota (kept as prosgegrammeni with
-  old MakeUppercase).
-
-* Spacing 0x1FEF GREEK VARIA becomes 0x2018 LEFT SINGLE QUOTATION MARK
-  (visible difference with XeTeX and DejaVu),
-
-* Non-uniform handling of spacing diacritics: Single diacritics are kept,
-  combining diacritics are mapped to single diacritics.
-  (The old implementation handled spacing diacritics similar to
-  diacritics in accented letters.)  
-
-* How to treat MakeUppercase of a single captial GREEK CAPITAL LETTER ETA
-  WITH TONOS? Currently, it is treated differently from the small
-  equivalent.
diff --git a/macros/latex/contrib/babel-contrib/greek/test-case-changing-varia-tu.tex b/macros/latex/contrib/babel-contrib/greek/test-case-changing-varia-tu.tex
deleted file mode 100644
index a70e127ffa..0000000000
--- a/macros/latex/contrib/babel-contrib/greek/test-case-changing-varia-tu.tex
+++ /dev/null
@@ -1,41 +0,0 @@
-\documentclass[a4paper]{article}
-\usepackage[greek,english,provide=*]{babel}    % Babel's Greek "ini"
-\newcommand{\langGreek}{\foreignlanguage{greek}}
-
-\usepackage{fontspec}
-\setmainfont{FreeSerif}
-% \setmainfont{DejaVu Serif}
-% \setmainfont{Droid Sans}
-% \setmainfont{Linux Libertine O}
-% \setmainfont{Liberation Serif}
-% \setmainfont{cmunrm.otf}
-
-\begin{document}
-
-
-U+1FEF GREEK VARIA and U+1FFD GREEK OXIA
-
-English:  ` ´ → \MakeUppercase{` ´}
-
-Greek: \langGreek{` ´ → \MakeUppercase{` ´}}
-
-
-U+0060 GRAVE ACCENT and U+00B4 ACUTE ACCENT
-
-English:  ` ´ → \MakeUppercase{` ´}
-
-Greek: \langGreek{` ´ → \MakeUppercase{` ´}}
-
-
-\end{document}
-
-
-* Spacing U+1FEF GREEK VARIA becomes U+2018 LEFT SINGLE QUOTATION MARK
-  (visible difference with XeTeX and DejaVu),
-
-With old MakeUppercase: Spacing accents: ῀ ` ´ ῾ ᾽ ᾿ → ῀ ` ´ ῾ ᾽ ᾿
-
-With new MakeUppercase: Spacing accents: ῀ ` ´ ῾ ᾽ ᾿ → ῀ ‘ ´ ῾ ᾽ ᾿
-
-U+0060 GRAVE ACCENT and U+00B4 ACUTE ACCENT
-English: ‘ ´ → ‘ ´
diff --git a/macros/latex/contrib/babel-contrib/greek/test-case-changing.tex b/macros/latex/contrib/babel-contrib/greek/test-case-changing.tex
index 053cfb7330..e5cc0d15e5 100644
--- a/macros/latex/contrib/babel-contrib/greek/test-case-changing.tex
+++ b/macros/latex/contrib/babel-contrib/greek/test-case-changing.tex
@@ -173,7 +173,12 @@ MakeLowercase:
 % Accents dropped with MakeUppercase (not for single letter ή) :)
 % TODO: how to treat MakeUppercase of a single captial «΄Η»?
 %
-% The "Latin" accents macron and breve should be kept. (minor)
+% Should the “educational”/“Latin” accents *macron* and *breve* (*vrachy*)
+% be kept (they stay above capital letters similar to the dialytika,
+% they are kept by Apostolos Syropoulos' “xgreek” package and in babel-greek
+% “since ages”) or dropped (they are optional even in lowercase or titlecase
+% and dropped for the entry by the English wiktionary).
+% https://en.wiktionary.org/wiki/Wiktionary:About_Ancient_Greek#Diacritics_and_accentuation
 %
 % Spacing prosgegrammeni (ι) turned to capital Iota. (minor)
 %
diff --git a/macros/latex/contrib/babel-contrib/greek/test-greek-8bitcompat.tex b/macros/latex/contrib/babel-contrib/greek/test-greek-8bitcompat.tex
index 5fba328dc6..2de0e68ed6 100644
--- a/macros/latex/contrib/babel-contrib/greek/test-greek-8bitcompat.tex
+++ b/macros/latex/contrib/babel-contrib/greek/test-greek-8bitcompat.tex
@@ -6,6 +6,8 @@
   % LGR must be defined before loading "luainputenc" (bug in luainputenc?)
   \usepackage[LGR,T1]{fontenc}
   \usepackage{lmodern}
+  % \usepackage[largesc]{newtxtext}
+  % \DeclareFontFamilySubstitution{LGR}{ntxtlf}{NimbusSerif}
   \usepackage[utf8]{luainputenc}
   \newcommand*{\greekfontencoding}{LGR} % force LGR setup¹
 
diff --git a/macros/latex/contrib/babel-contrib/greek/test-greek.pdf b/macros/latex/contrib/babel-contrib/greek/test-greek.pdf
index 2f1b83bc17..0f4879f944 100644
--- a/macros/latex/contrib/babel-contrib/greek/test-greek.pdf
+++ b/macros/latex/contrib/babel-contrib/greek/test-greek.pdf
diff --git a/macros/latex/contrib/babel-contrib/greek/test-tildeshorthand.tex b/macros/latex/contrib/babel-contrib/greek/test-tildeshorthand.tex
deleted file mode 100644
index 47bc628236..0000000000
--- a/macros/latex/contrib/babel-contrib/greek/test-tildeshorthand.tex
+++ /dev/null
@@ -1,106 +0,0 @@
-% Backrolling does not work for \MakeUppercase (cf. LaTeX News 35)
-% \RequirePackage{latexbug}
-%\RequirePackage[2022-05-01]{latexrelease}
-
-\documentclass[a4paper]{article}
-
-\usepackage[LGR,T1]{fontenc}
-\usepackage{lmodern}
-
-\ifdefined \UnicodeEncodingName
-  \usepackage{fontspec}
-  \setmainfont{FreeSerif}
-  \newcommand*{\texengine}{Xe/LuaLaTeX}
-\else
-  \usepackage{lmodern}
-  \newcommand*{\texengine}{pdfLaTeX}
-\fi
-
-% Load encoding definitions
-\usepackage[normalize-symbols]{textalpha}  % "Greek script everywhere"
-
-% With TL22, the special handling of Greek UPPERCASE is only triggered
-% if the text language is set to "greek" with Babel:
-%
-\usepackage[greek,english]{babel}  % babel-greek
-% \usepackage[greek,english,provide=*]{babel}    % Babel's Greek "ini"
-\languageattribute{greek}{polutoniko}  % "modern" polytonic Greek
-
-
-\usepackage[unicode,colorlinks,linkcolor=blue]{hyperref}
-\usepackage{bookmark}
-
-% Auxiliary commands
-
-\newcommand{\langGreek}{\foreignlanguage{greek}}
-
-% print the selected language variant
-\newcommand{\GreekLanguageVariant}{%
-  \ifx\captionsgreek\captionspolutonikogreek
-    \ifx\captionsgreek\captionsancientgreek
-      ancient%
-    \else
-      polutoniko%
-    \fi
-  \else
-    monotoniko%
-  \fi
-}
-
-% test effect of new implementations on compilation time:
-%
-% pdflatex from TL22 is about 7 times slower than the version from TL21
-% (7s vs. 1s for this document with 13 pages).
-% With the dummy definitons,
-% \renewcommand{\MakeUppercase}{}
-% \renewcommand{\MakeLowercase}{}
-% pdflatex from TL22 is a bit faster than before
-% (0.7s vs. 1s for this document),
-
-% -----------------------------------------------------------------------
-
-\begin{document}
-
-  \selectlanguage{greek}
-
-
-\raggedright
-            % ἀ   ἁ    ἂ    ἃ    ἄ    ἅ    ἆ    ἇ     Ἀ    Ἁ    Ἂ    Ἃ    Ἄ    Ἅ    Ἆ    Ἇ   \\
-  % \lgrfont{>a  <a  >`a  <`a  >'a  <'a  >~a  <~a    >A   <A  >`A  <`A  >'A  <'A  >~A  <~A } \\
-            % ἐ   ἑ    ἒ    ἓ    ἔ    ἕ    ␣    ␣     Ἐ    Ἑ    Ἒ    Ἓ    Ἔ    Ἕ             \\
-  % \lgrfont{>e  <e  >`e  <`e  >'e  <'e    \:   \:   >E   <E  >`E  <`E  >'E  <'E           } \\
-            % ἠ   ἡ    ἢ    ἣ    ἤ    ἥ    ἦ    ἧ     Ἠ    Ἡ    Ἢ    Ἣ    Ἤ    Ἥ    Ἦ    Ἧ   \\
-  % \lgrfont{>h  <h  >`h  <`h  >'h  <'h  >~h  <~h    >H   <H  >`H  <`H  >'H  <'H  >~H  <~H } \\
-            % ἰ   ἱ    ἲ    ἳ    ἴ    ἵ    ἶ    ἷ     Ἰ    Ἱ    Ἲ    Ἳ    Ἴ    Ἵ    Ἶ    Ἷ   \\
-  % \lgrfont{>i  <i  >`i  <`i  >'i  <'i  >~i  <~i    >I   <I  >`I  <`I  >'I  <'I  >~I  <~I } \\
-            % ὀ   ὁ    ὂ    ὃ    ὄ    ὅ    ␣    ␣     Ὀ    Ὁ    Ὂ    Ὃ    Ὄ    Ὅ             \\
-  % \lgrfont{>o  <o  >`o  <`o  >'o  <'o    \:   \:   >O   <O  >`O  <`O  >'O  <'O           } \\
-            % ὐ   ὑ    ὒ    ὓ    ὔ    ὕ    ὖ    ὗ     ␣    Ὑ    ␣    Ὓ    ␣    Ὕ    ␣    Ὗ   \\
-  % \lgrfont{>u  <u  >`u  <`u  >'u  <'u  >~u  <~u     \:  <U    \: <`U    \: <'U    \: <~U } \\
-            % ὠ   ὡ    ὢ    ὣ    ὤ    ὥ    ὦ    ὧ     Ὠ    Ὡ    Ὢ    Ὣ    Ὤ    Ὥ    Ὦ    Ὧ   \\
-  % \lgrfont{>w  <w  >`w  <`w  >'w  <'w  >~w  <~w    >W   <W  >`W  <`W  >'W  <'W  >~W  <~W } \\
-            % ὰ   ά    ὲ    έ    ὴ    ή    ὶ    ί     ὸ    ό    ὺ    ύ    ὼ    ώ             \\
-  % \lgrfont{`a  'a   `e   'e   `h   'h   `i   'i    `o   'o   `u   'u   `w   'w           } \\
-            % ᾀ   ᾁ    ᾂ    ᾃ    ᾄ    ᾅ    ᾆ    ᾇ     ᾈ    ᾉ    ᾊ    ᾋ    ᾌ    ᾍ    ᾎ    ᾏ   \\
-  % \lgrfont{>a| <a| >`a| <`a| >'a| <'a| >~a| <~a|   >A|  <A| >`A| <`A| >'A| <'A| >~A| <~A|} \\
-            % ᾐ   ᾑ    ᾒ    ᾓ    ᾔ    ᾕ    ᾖ    ᾗ     ᾘ    ᾙ    ᾚ    ᾛ    ᾜ    ᾝ    ᾞ    ᾟ   \\
-  % \lgrfont{>h| <h| >`h| <`h| >'h| <'h| >~h| <~h|   >H|  <H| >`H| <`H| >'H| <'H| >~H| <~H|} \\
-            % ᾠ   ᾡ    ᾢ    ᾣ    ᾤ    ᾦ    ᾧ    ᾥ     ᾨ    ᾩ    ᾪ    ᾫ    ᾬ    ᾭ    ᾮ    ᾯ   \\
-  % \lgrfont{>w| <w| >`w| <`w| >'w| <'w| >~w| <~w|   >W|  <W| >`W| <`W| >'W| <'W| >~W| <~W|} \\
-            % ᾰ   ᾱ    ᾲ    ᾳ    ᾴ    ␣    ᾶ    ᾷ     Ᾰ    Ᾱ    Ὰ    Ά    ᾼ    ᾽    ι    ᾿   \\
-% \lgrfont{\u{a} \=a  `a|   a|  'a|   \:  ~a   ~a| \u{A} \=A   `A   'A    A|   >    |    > } \\
-            % ῀   ῁    ῂ    ῃ    ῄ    ␣    ῆ    ῇ     Ὲ    Έ    Ὴ    Ή    ῌ    ῍     ῎   ῏   \\
-\lgrfont{~   "~   `h|   h|  'h|   
-         % \:  ~h   ~h|   `E   
-         % 'E   `H   'H    H|   >`   >'  ~> 
-	} \\
-            % ῐ   ῑ    ῒ    ΐ    ␣    ␣    ῖ    ῗ     Ῐ    Ῑ    Ὶ    Ί    ␣    ῝     ῞   ῟   \\
-% \lgrfont{\u{i} \=i `"i  '"i    \:   \:  ~i  ~"i  \u{I} \=I   `I   'I    \:  <`    <'  ~< } \\
-            % ῠ   ῡ    ῢ    ΰ    ␣    ␣    ῤ    ῥ     ῦ    ῧ    Ὺ    Ύ    Ῥ    ῭     ΅   `   \\
-% \lgrfont{\u{u} \=u `"u  '"u    \:   \:  >r   <r    ~u  ~"u   `U   'U   <R   `"    '"   ` } \\
-            %  ␣   ␣   ῲ    ῳ    ῴ    ␣    ῶ    ῷ     Ὸ    Ό    Ὼ    Ώ    ῼ    ´     ῾       \\
-  % \lgrfont{  \:  \: `w|   w|  'w|   \:  ~w   ~w|   `O   'O   `W   'W    W| '   < }
-
-
-
-\end{document}
diff --git a/macros/latex/contrib/babel-contrib/greek/unicode-examples.pdf b/macros/latex/contrib/babel-contrib/greek/unicode-examples.pdf
deleted file mode 100644
index d9be7bf69e..0000000000
--- a/macros/latex/contrib/babel-contrib/greek/unicode-examples.pdf
+++ /dev/null
diff --git a/macros/latex/contrib/babel-contrib/greek/unicode-examples.tex b/macros/latex/contrib/babel-contrib/greek/unicode-examples.tex
deleted file mode 100644
index 6a466c05dc..0000000000
--- a/macros/latex/contrib/babel-contrib/greek/unicode-examples.tex
+++ /dev/null
@@ -1,57 +0,0 @@
-\documentclass{article}
-
-\ifdefined \UnicodeEncodingName
-  \usepackage{fontspec}
-  \setmainfont[Scale=0.92]{DejaVu Serif}
-\fi
-
-% Babel is required for hyphenation and the post-2022/06 \MakeUppercase
-% \usepackage[greek]{babel} 
-
-\usepackage{xgreek}
-
-\newcommand*\uppercasetest[1]{\noindent#1 →\par\MakeUppercase{#1}\par}
-
-\begin{document}
-
-% examples from https://icu.unicode.org/design/case/greek-upper
-% See there for the expected output
-\uppercasetest{άδικος, κείμενο, ίριδα}
-\uppercasetest{Πατάτα}
-\uppercasetest{Αέρας, Μυστήριο, Ωραίο}
-\uppercasetest{Μαΐου, Πόρος, Ρύθμιση}
-\uppercasetest{ΰ, Τηρώ, Μάιος}
-\uppercasetest{άυλος}
-\uppercasetest{ΑΫΛΟΣ}
-\uppercasetest{Άκλιτα ρήματα ή άκλιτες μετοχές}
-\uppercasetest{Επειδή η αναγνώριση της αξιοπρέπειας}
-\uppercasetest{νομικού ή διεθνούς}
-\uppercasetest{Ἐπειδὴ ἡ ἀναγνώριση}
-\uppercasetest{νομικοῦ ἢ διεθνοῦς} % I need to look at this one
-\uppercasetest{Νέο, Δημιουργία}
-\uppercasetest{Ελάτε να φάτε τα καλύτερα παϊδάκια!}
-\uppercasetest{Μαΐου, τρόλεϊ}
-\uppercasetest{Το ένα ή το άλλο.}
-\uppercasetest{ρωμέικα}
-
-\end{document}
-
-% from http://www.polytoniko.org/kano.php?newlang=en
-% Words with rough breathing
-αἷμα, Αἷμος, αἵρεση,
-εἱρμός, εὑρετήριο
-υἱός
-
-ρολόι → ΡΟΛΟΪ
-
-If a capitalized word begins with a diphthong, the breathing mark is still
-over the second vowel (Αἰτέω). If the word begins with two vowels that do
-not form a diphthong, the breathing mark stands in front of the capital (
-᾽Ιησοῦς).
-
-
-
-
-If placed over a DIPHTHONG, a breathing mark is always above the SECOND
-vowel (e.g. οἱ, εἰ, and Εὐρώπη).
-<https://pressbooks.pub/ancientgreek/chapter/3/>
diff --git a/macros/latex/contrib/babel-contrib/greek/usage.pdf b/macros/latex/contrib/babel-contrib/greek/usage.pdf
index b05188b9d6..83841db067 100644
--- a/macros/latex/contrib/babel-contrib/greek/usage.pdf
+++ b/macros/latex/contrib/babel-contrib/greek/usage.pdf
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/CHANGES.md b/macros/latex/contrib/biblatex-contrib/biblatex-ext/CHANGES.md
index dc1cf2dbca..5db7f997b0 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/CHANGES.md
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/CHANGES.md
@@ -1,5 +1,14 @@
 # Changelog
 
+## Version 0.17 (2023-03-18)
+
+See <https://github.com/moewew/biblatex-ext/compare/v0.16...v0.17>
+
+### Changed
+- Synced `\textcite` implementation in `-comp` styles with
+  `biblatex` 3.19.
+- Synced `\printbibtabular` implementation with `biblatex` 3.19.
+
 ## Version 0.16 (2022-06-18)
 
 See <https://github.com/moewew/biblatex-ext/compare/v0.15...v0.16>
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/README.md b/macros/latex/contrib/biblatex-contrib/biblatex-ext/README.md
index 12adbae3f8..0b521793f2 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/README.md
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/README.md
@@ -91,7 +91,7 @@ installation instructions.
 
 ## Licence
 
-Copyright 2017-2022 Moritz Wemheuer
+Copyright 2017-2023 Moritz Wemheuer
 
 This work consists of the `.bbx`, `.cbx`, `.def`, `.sty` and `.lua`
 files mentioned above.
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oa-doiapi.sty b/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oa-doiapi.sty
index ead7525d94..3269b0cc0e 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oa-doiapi.sty
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oa-doiapi.sty
@@ -1,5 +1,5 @@
 \ProvidesPackage{biblatex-ext-oa-doiapi}
-  [2022/06/18 v0.16 Obtain open access information from DOI via
+  [2023/03/18 v0.17 Obtain open access information from DOI via
    unpaywall.org and doi.org (MW)]
 
 \RequirePackage{etoolbox}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oa.sty b/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oa.sty
index d3ba47fc06..88cf6f39ee 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oa.sty
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oa.sty
@@ -1,5 +1,5 @@
 \ProvidesPackage{biblatex-ext-oa}
-  [2022/06/18 v0.16 mark open access in biblatex bibliographies (MW)]
+  [2023/03/18 v0.17 mark open access in biblatex bibliographies (MW)]
 
 \RequirePackage{etoolbox}
 
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oasymb-l3draw.sty b/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oasymb-l3draw.sty
index 9258f8bce1..88d996ae60 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oasymb-l3draw.sty
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oasymb-l3draw.sty
@@ -1,7 +1,7 @@
 \RequirePackage{expl3}
 
 \ProvidesExplPackage {biblatex-ext-oasymb-l3draw}
-  {2022/06/18} {0.16}
+  {2023/03/18} {0.17}
   {open access symbols with l3draw (MW)}
 
 \RequirePackage{xparse}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oasymb-pict2e.sty b/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oasymb-pict2e.sty
index 4cce43762f..071f3be201 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oasymb-pict2e.sty
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oasymb-pict2e.sty
@@ -1,5 +1,5 @@
 \ProvidesPackage{biblatex-ext-oasymb-pict2e}
-  [2022/06/18 v0.16 open access symbols with pict2e (MW)]
+  [2023/03/18 v0.17 open access symbols with pict2e (MW)]
 
 \RequirePackage{etoolbox}
 \RequirePackage{kvoptions}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oasymb-tikz.sty b/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oasymb-tikz.sty
index 598703615b..6a0ad571f9 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oasymb-tikz.sty
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oasymb-tikz.sty
@@ -1,5 +1,5 @@
 \ProvidesPackage{biblatex-ext-oasymb-tikz}
-  [2022/06/18 v0.16 open access symbols with TikZ (MW)]
+  [2023/03/18 v0.17 open access symbols with TikZ (MW)]
 
 \RequirePackage{etoolbox}
 \RequirePackage{kvoptions}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-tabular.sty b/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-tabular.sty
index a1a65e638a..b057a9ae79 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-tabular.sty
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-tabular.sty
@@ -1,5 +1,5 @@
 \ProvidesPackage{biblatex-ext-tabular}
-  [2022/06/18 v0.16 tabular bibliographies for biblatex (MW)]
+  [2023/03/18 v0.17 tabular bibliographies for biblatex (MW)]
 
 % Code based on Audrey's
 % (https://tex.stackexchange.com/users/4483/audrey)
@@ -33,8 +33,8 @@
       This is a fatal error. I'm aborting now}%
    \endinput}
 
-\def\extblxtab@requiredbiblatexversion{3.15}
-\def\extblxtab@requiredbiblatexdate{2020/08/19}
+\def\extblxtab@requiredbiblatexversion{3.19}
+\def\extblxtab@requiredbiblatexdate{2023/03/05}
 
 \@ifpackagelater{biblatex}{\extblxtab@requiredbiblatexdate}
   {}
@@ -84,6 +84,9 @@
   \ifundef\blx@default@thetitle
     {\let\blx@thetitle\@empty}
     {\let\blx@thetitle\blx@default@thetitle}%
+  \ifundef\blx@default@thefilter
+    {\let\blx@thefilter\@empty}
+    {\let\blx@thefilter\blx@default@thefilter}%
   \let\blx@key@env\extblxtab@key@env % redirect the 'env' option
                                      % to tabular envs
   % defaults
@@ -117,6 +120,8 @@
   % \printbibliography following one with this set will inherit any
   % previous "true" value
   \togglefalse{blx@omitnumbers}%
+  \expandafter\blx@key@filter\expandafter{\blx@thefilter}%
+  % Can only be defaulted once \blx@tempa is set since it filters on this
   \blx@kv@setkeys{blx@bib2}{#1}% ... now we have correct \blx@tempa,
   % set rest of options
   \blx@rest@actives
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext.pdf b/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext.pdf
index 825d00e6de..5bd4760f39 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext.pdf
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext.pdf
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext.tex b/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext.tex
index 12ee61f955..c823940c09 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext.tex
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext.tex
@@ -586,7 +586,7 @@
 
 \newcommand*{\ctan}{\mkbibacro{CTAN}}
 \newcommand*{\gitbaseurl}{https://github.com/moewew/biblatex-ext}
-\newcommand*{\extblxversion}{0.16}
+\newcommand*{\extblxversion}{0.17}
 \newcommand*{\biber}{Biber}
 \newcommand*{\gitissuelink}[1]{%
   \href{\gitbaseurl/issues/#1}{issue \##1 on github}}
@@ -659,7 +659,7 @@
   author   = {Moritz Wemheuer},
   email    = {mwemheu@posteo.de},%
   revision = {\extblxversion},
-  date     = {\DTMDate{2022-06-18}},
+  date     = {\DTMDate{2023-03-18}},
 }
 
 \hypersetup{%
@@ -824,7 +824,7 @@ under the terms of the \lppl, version 1.3c%
 \fnurl{https://www.latex-project.org/lppl/lppl-1-3c.txt}
 or (at your option) any later version%
 \fnurl{https://www.latex-project.org/lppl.txt}.
-This bundle is maintained by Moritz Wemheuer (\textcopyright 2017--2022).
+This bundle is maintained by Moritz Wemheuer (\textcopyright 2017--2023).
 
 
 \subsection{Feedback}\label{sec:feedback}
@@ -3818,7 +3818,7 @@ they are always open access.
 }
 \makeatother
 \begin{bibexample}
-\exampleprintbib{cipriani,meckes,sigfridsson}
+\exampleprintbib{cipriani,meckes,sigfridsson,kastenholz}
 \end{bibexample}
 
 If the \opt{openaccess} option is set to one specific field only, only
@@ -4078,6 +4078,12 @@ See also \filename{CHANGES.md}.
 
 The numbers on the right indicate the relevant section of the manual.
 \begin{changelog}
+\begin{release}{0.17}{2023-03-18}
+  \item Synced \cmd{textcite} implementation in some styles
+    with \sty{biblatex} 3.19 changes.
+  \item Synced \hypercmd{printbibtabular} implementation
+     with \sty{biblatex} 3.19.\see{sec:tabularbib}
+\end{release}
 \begin{release}{0.16}{2022-06-18}
   \item Reworked \hyperopt{citexref} implementation\see{sec:opt}
 \end{release}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/blxextdoiapi.lua b/macros/latex/contrib/biblatex-contrib/biblatex-ext/blxextdoiapi.lua
index 4e13ac2c66..3d6931be6d 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/blxextdoiapi.lua
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/blxextdoiapi.lua
@@ -2,8 +2,8 @@ blxextdoiapi = blxextdoiapi or {}
 
 local blxextdoiapi_module = {
   name          = "blxextdoiapi",
-  version       = "v0.16",
-  date          = "2022/06/18",
+  version       = "v0.17",
+  date          = "2023/03/18",
   description   = "Obtain open access information from DOI via unpaywall.org",
   author        = "Moritz Wemheuer",
   license       = "LPPL v1.3c",
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic-verb.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic-verb.bbx
index 22657b5deb..873e623a6a 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic-verb.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic-verb.bbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-alphabetic-verb.bbx}
-  [2022/06/18 v0.16 extended biblatex alphabetic-verb
+  [2023/03/18 v0.17 extended biblatex alphabetic-verb
    bibliography style (MW)]
 
 \RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic-verb.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic-verb.cbx
index ddea05768a..ca73cae727 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic-verb.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic-verb.cbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-alphabetic-verb.cbx}
-  [2022/06/18 v0.16 extended biblatex alphabetic-verb citation style
+  [2023/03/18 v0.17 extended biblatex alphabetic-verb citation style
    (MW)]
 
 \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic.bbx
index 8c0fcca71d..0897a71103 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic.bbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-alphabetic.bbx}
-  [2022/06/18 v0.16 extended biblatex alphabetic bibliography style (MW)]
+  [2023/03/18 v0.17 extended biblatex alphabetic bibliography style (MW)]
 
 \RequireBibliographyStyle{ext-standard}
 \RequireBibliographyStyle{alphabetic}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic.cbx
index d9e0d963f7..3b9b17893b 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic.cbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-alphabetic.cbx}
-  [2022/06/18 v0.16 extended biblatex alphabetic citation style (MW)]
+  [2023/03/18 v0.17 extended biblatex alphabetic citation style (MW)]
 
 \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
   {}{}{}{}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authornumber-comp.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authornumber-comp.bbx
index cab62fa538..0b139c0959 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authornumber-comp.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authornumber-comp.bbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-authornumber-comp.bbx}
-  [2022/06/18 v0.16 extended biblatex authoryear bibliography style (MW)]
+  [2023/03/18 v0.17 extended biblatex authoryear bibliography style (MW)]
 
 \RequireBibliographyStyle{ext-authornumber}
 
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authornumber-comp.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authornumber-comp.cbx
index 4b600532c9..0785921a02 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authornumber-comp.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authornumber-comp.cbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-authornumber-comp.cbx}
-  [2022/06/18 v0.16 extended biblatex authoryear citation style (MW)]
+  [2023/03/18 v0.17 extended biblatex authoryear citation style (MW)]
 
 \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
   {}{}{}{}
@@ -265,7 +265,10 @@
 \newrobustcmd{\cbx@textcite@init}[2]{%
   \setcounter{textcitetotal}{0}%
   \setcounter{textcitecount}{0}%
-  \def\cbx@savedcites{#1}#2\cbx@savedcites\empty}
+  \def\cbx@savedcites{#1}#2%
+  \ifnumgreater{\value{textcitetotal}}{0}
+    {\cbx@savedcites}
+    {}}
 
 \DeclareMultiCiteCommand{\cbx@textcites}{\cbx@textcite}{}
 \DeclareMultiCiteCommand{\textcites}[\cbx@textcites@init\cbx@textcites]{\textcite}{}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authornumber-ecomp.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authornumber-ecomp.bbx
index cab62fa538..0b139c0959 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authornumber-ecomp.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authornumber-ecomp.bbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-authornumber-comp.bbx}
-  [2022/06/18 v0.16 extended biblatex authoryear bibliography style (MW)]
+  [2023/03/18 v0.17 extended biblatex authoryear bibliography style (MW)]
 
 \RequireBibliographyStyle{ext-authornumber}
 
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authornumber-ecomp.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authornumber-ecomp.cbx
index 1719bc00ff..5c3030fe7b 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authornumber-ecomp.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authornumber-ecomp.cbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-authornumber-ecomp.cbx}
-  [2022/06/18 v0.16 extended biblatex authoryear citation style (MW)]
+  [2023/03/18 v0.17 extended biblatex authoryear citation style (MW)]
 
 \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
   {}{}{}{}
@@ -375,7 +375,10 @@
 \newrobustcmd{\cbx@textcite@init}[2]{%
   \setcounter{textcitetotal}{0}%
   \setcounter{textcitecount}{0}%
-  \def\cbx@savedcites{#1}#2\cbx@savedcites\empty}
+  \def\cbx@savedcites{#1}#2%
+  \ifnumgreater{\value{textcitetotal}}{0}
+    {\cbx@savedcites}
+    {}}
 
 \DeclareMultiCiteCommand{\cbx@textcites}{\cbx@textcite}{}
 \DeclareMultiCiteCommand{\textcites}[\cbx@textcites@init\cbx@textcites]{\textcite}{}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authornumber-tcomp.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authornumber-tcomp.bbx
index c0f384ce08..604a9bdb57 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authornumber-tcomp.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authornumber-tcomp.bbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-authornumber-tcomp.bbx}
-  [2022/06/18 v0.16 extended biblatex authoryear bibliography style (MW)]
+  [2023/03/18 v0.17 extended biblatex authoryear bibliography style (MW)]
 
 \RequireBibliographyStyle{ext-authornumber-terse}
 
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authornumber-tcomp.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authornumber-tcomp.cbx
index 6e4fb3b208..59c79bf053 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authornumber-tcomp.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authornumber-tcomp.cbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-authornumber-tcomp.cbx}
-  [2022/06/18 v0.16 extended biblatex authoryear citation style (MW)]
+  [2023/03/18 v0.17 extended biblatex authoryear citation style (MW)]
 
 \RequireCitationStyle{ext-authornumber-comp}
 
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authornumber-tecomp.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authornumber-tecomp.bbx
index 578592e89b..5c10ac9a88 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authornumber-tecomp.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authornumber-tecomp.bbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-authornumber-tecomp.bbx}
-  [2022/06/18 v0.16 extended biblatex authoryear bibliography style (MW)]
+  [2023/03/18 v0.17 extended biblatex authoryear bibliography style (MW)]
 
 \RequireBibliographyStyle{ext-authornumber-terse}
 
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authornumber-tecomp.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authornumber-tecomp.cbx
index e3df1d844a..a9004aed2b 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authornumber-tecomp.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authornumber-tecomp.cbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-authornumber-tecomp.cbx}
-  [2022/06/18 v0.16 extended biblatex authoryear citation style (MW)]
+  [2023/03/18 v0.17 extended biblatex authoryear citation style (MW)]
 
 \RequireCitationStyle{ext-authornumber-ecomp}
 
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authornumber-terse.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authornumber-terse.bbx
index 31de6eddab..c07caead30 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authornumber-terse.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authornumber-terse.bbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-authornumber-terse.bbx}
-  [2022/06/18 v0.16 extended biblatex authoryear bibliography style (MW)]
+  [2023/03/18 v0.17 extended biblatex authoryear bibliography style (MW)]
 
 \RequireBibliographyStyle{ext-authornumber}
 
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authornumber-terse.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authornumber-terse.cbx
index 6e7e4c5071..c1e679c4e3 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authornumber-terse.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authornumber-terse.cbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-authornumber-terse.cbx}
-  [2022/06/18 v0.16 extended biblatex authoryear citation style (MW)]
+  [2023/03/18 v0.17 extended biblatex authoryear citation style (MW)]
 
 \RequireCitationStyle{ext-authornumber}
 
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authornumber.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authornumber.bbx
index cbf5219fad..f2f6fbbfea 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authornumber.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authornumber.bbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-authornumber.bbx}
-  [2022/06/18 v0.16 extended biblatex authoryear bibliography style (MW)]
+  [2023/03/18 v0.17 extended biblatex authoryear bibliography style (MW)]
 
 \RequireBibliographyStyle{ext-standard}
 \RequireBibliographyStyle{ext-authortitle}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authornumber.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authornumber.cbx
index b0c3cc231a..1c4bc08b63 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authornumber.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authornumber.cbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-authornumber.cbx}
-  [2022/06/18 v0.16 extended biblatex authoryear citation style (MW)]
+  [2023/03/18 v0.17 extended biblatex authoryear citation style (MW)]
 
 \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
   {}{}{}{}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-common.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-common.bbx
index a11dae44ba..fb845abc14 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-common.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-common.bbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-authortitle-common.bbx}
-  [2022/06/18 v0.16 common files for extended biblatex
+  [2023/03/18 v0.17 common files for extended biblatex
    authortitle bibliography styles (MW)]
 
 \RequireBibliographyStyle{ext-dashed-common}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-comp.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-comp.bbx
index cae2bde083..f1711f3717 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-comp.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-comp.bbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-authortitle-comp.bbx}
-  [2022/06/18 v0.16 extended biblatex authortitle-comp
+  [2023/03/18 v0.17 extended biblatex authortitle-comp
    bibliography style (MW)]
 
 \RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-comp.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-comp.cbx
index b19a3ddc05..4ef136717a 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-comp.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-comp.cbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-authortitle-comp.cbx}
-  [2022/06/18 v0.16 extended biblatex authortitle-comp
+  [2023/03/18 v0.17 extended biblatex authortitle-comp
    citation style (MW)]
 
 \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ibid.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ibid.bbx
index f8df7a8dbc..316a55ac3a 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ibid.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ibid.bbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-authortitle-ibid.bbx}
-  [2022/06/18 v0.16 extended biblatex authortitle-ibid
+  [2023/03/18 v0.17 extended biblatex authortitle-ibid
    bibliography style (MW)]
 
 \RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ibid.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ibid.cbx
index 7c904f83ae..b42d58a93d 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ibid.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ibid.cbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-authortitle-ibid.cbx}
-  [2022/06/18 v0.16 extended biblatex authortitle-ibid
+  [2023/03/18 v0.17 extended biblatex authortitle-ibid
    citation style (MW)]
 
 \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-icomp.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-icomp.bbx
index ba381c0a27..1e313f9447 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-icomp.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-icomp.bbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-authortitle-icomp.bbx}
-  [2022/06/18 v0.16 extended biblatex authortitle-icomp
+  [2023/03/18 v0.17 extended biblatex authortitle-icomp
    bibliography style (MW)]
 
 \RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-icomp.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-icomp.cbx
index da400c2739..21ee41c1dd 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-icomp.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-icomp.cbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-authortitle-icomp.cbx}
-  [2022/06/18 v0.16 extended biblatex authortitle-icomp
+  [2023/03/18 v0.17 extended biblatex authortitle-icomp
    citation style (MW)]
 
 \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-tcomp.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-tcomp.bbx
index f9e54a1c08..52cf0c1e41 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-tcomp.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-tcomp.bbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-authortitle-tcomp.bbx}
-  [2022/06/18 v0.16 extended biblatex authortitle-tcomp
+  [2023/03/18 v0.17 extended biblatex authortitle-tcomp
    bibliography style (MW)]
 
 \RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-tcomp.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-tcomp.cbx
index 5c9abc38c6..f1fc8ef129 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-tcomp.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-tcomp.cbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-authortitle-tcomp.cbx}
-  [2022/06/18 v0.16 extended biblatex authortitle-tcomp
+  [2023/03/18 v0.17 extended biblatex authortitle-tcomp
    citation style (MW)]
 
 \RequireCitationStyle{ext-authortitle-comp}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-terse.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-terse.bbx
index 6c2b172172..ca8c6d6d30 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-terse.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-terse.bbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-authortitle-terse.bbx}
-  [2022/06/18 v0.16 extended biblatex authortitle-terse
+  [2023/03/18 v0.17 extended biblatex authortitle-terse
    bibliography style (MW)]
 
 \RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-terse.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-terse.cbx
index 716af58d42..d5526a9925 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-terse.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-terse.cbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-authortitle-terse.cbx}
-  [2022/06/18 v0.16 extended biblatex authortitle-terse
+  [2023/03/18 v0.17 extended biblatex authortitle-terse
    citation style (MW)]
 
 \RequireCitationStyle{ext-authortitle}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ticomp.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ticomp.bbx
index ca3555bd8c..f18bf65b11 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ticomp.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ticomp.bbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-authortitle-ticomp.bbx}
-  [2022/06/18 v0.16 extended biblatex authortitle-ticomp
+  [2023/03/18 v0.17 extended biblatex authortitle-ticomp
    bibliography style (MW)]
 
 \RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ticomp.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ticomp.cbx
index 9ed7521061..ca87fa14b6 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ticomp.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ticomp.cbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-authortitle-ticomp.cbx}
-  [2022/06/18 v0.16 extended biblatex authortitle-ticomp citation style
+  [2023/03/18 v0.17 extended biblatex authortitle-ticomp citation style
    (MW)]
 
 \RequireCitationStyle{ext-authortitle-icomp}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle.bbx
index 541307177f..1b6eb2f6bf 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle.bbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-authortitle.bbx}
-  [2022/06/18 v0.16 extended biblatex authortitle
+  [2023/03/18 v0.17 extended biblatex authortitle
    bibliography style (MW)]
 
 \RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle.cbx
index d35a920059..1567ccf834 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle.cbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-authortitle.cbx}
-  [2022/06/18 v0.16 extended biblatex authortitle citation style (MW)]
+  [2023/03/18 v0.17 extended biblatex authortitle citation style (MW)]
 
 \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
   {}{}{}{}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-common.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-common.bbx
index 1c1ec212e6..85eb1f2e52 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-common.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-common.bbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-authoryear-common.bbx}
-  [2022/06/18 v0.16 common files for extended biblatex
+  [2023/03/18 v0.17 common files for extended biblatex
    authoryear bibliography styles (MW)]
 
 \RequireBibliographyStyle{ext-dashed-common}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-comp.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-comp.bbx
index 6f086f03ad..5f905d3187 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-comp.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-comp.bbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-authoryear-comp.bbx}
-  [2022/06/18 v0.16 extended biblatex authoryear-comp
+  [2023/03/18 v0.17 extended biblatex authoryear-comp
    bibliography style (MW)]
 
 \RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-comp.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-comp.cbx
index dbc22bd4d0..066ea16659 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-comp.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-comp.cbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-authoryear-comp.cbx}
-  [2022/06/18 v0.16 extended biblatex authoryear-comp
+  [2023/03/18 v0.17 extended biblatex authoryear-comp
    citation style (MW)]
 
 \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ecomp.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ecomp.bbx
index 12c4bd2257..905e4b7980 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ecomp.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ecomp.bbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-authoryear-ecomp.bbx}
-  [2022/06/18 v0.16 biblatex authoryear-ecomp
+  [2023/03/18 v0.17 biblatex authoryear-ecomp
    bibliography style (MW)]
 
 \RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ecomp.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ecomp.cbx
index ecbeb3148b..e41781703b 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ecomp.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ecomp.cbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-authoryear-ecomp.cbx}
-  [2022/06/18 v0.16 biblatex authoryear-ecomp
+  [2023/03/18 v0.17 biblatex authoryear-ecomp
    citation style (MW)]
 
 \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ibid.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ibid.bbx
index fe1d491941..cad88b1a47 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ibid.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ibid.bbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-authoryear-ibid.bbx}
-  [2022/06/18 v0.16 extended biblatex authoryear-ibid
+  [2023/03/18 v0.17 extended biblatex authoryear-ibid
    bibliography style (MW)]
 
 \RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ibid.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ibid.cbx
index 74d64aa636..c46cea912c 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ibid.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ibid.cbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-authoryear-ibid.cbx}
-  [2022/06/18 v0.16 extended biblatex authoryear-ibid
+  [2023/03/18 v0.17 extended biblatex authoryear-ibid
    citation style (MW)]
 
 \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-icomp.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-icomp.bbx
index c6407a0455..15e25f0f15 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-icomp.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-icomp.bbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-authoryear-icomp.bbx}
-  [2022/06/18 v0.16 extended biblatex authoryear-icomp
+  [2023/03/18 v0.17 extended biblatex authoryear-icomp
    bibliography style (MW)]
 
 \RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-icomp.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-icomp.cbx
index 20f45c5468..f4c29738ad 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-icomp.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-icomp.cbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-authoryear-icomp.cbx}
-  [2022/06/18 v0.16 extended biblatex authoryear-icomp
+  [2023/03/18 v0.17 extended biblatex authoryear-icomp
    citation style (MW)]
 
 \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-iecomp.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-iecomp.bbx
index 537e37699e..a3b50241a3 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-iecomp.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-iecomp.bbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-authoryear-iecomp.bbx}
-  [2022/06/18 v0.16 biblatex authoryear-iecomp
+  [2023/03/18 v0.17 biblatex authoryear-iecomp
    bibliography style (MW)]
 
 \RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-iecomp.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-iecomp.cbx
index 39d3ae90cf..8d77b08a8d 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-iecomp.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-iecomp.cbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-authoryear-iecomp.cbx}
-  [2022/06/18 v0.16 biblatex authoryear-iecomp
+  [2023/03/18 v0.17 biblatex authoryear-iecomp
    citation style (MW)]
 
 \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tcomp.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tcomp.bbx
index bca8652c8b..4a138ea8c1 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tcomp.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tcomp.bbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-authoryear-tcomp.bbx}
-  [2022/06/18 v0.16 extended biblatex authoryear-tcomp
+  [2023/03/18 v0.17 extended biblatex authoryear-tcomp
    bibliography style (MW)]
 
 \RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tcomp.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tcomp.cbx
index 282e8c59ea..f263767188 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tcomp.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tcomp.cbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-authoryear-tcomp.cbx}
-  [2022/06/18 v0.16 extended biblatex authoryear-tcomp
+  [2023/03/18 v0.17 extended biblatex authoryear-tcomp
    citation style (MW)]
 
 \RequireCitationStyle{ext-authoryear-comp}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tecomp.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tecomp.bbx
index 72c68f6d73..7af3c159d4 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tecomp.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tecomp.bbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-authoryear-tecomp.bbx}
-  [2022/06/18 v0.16 extended biblatex authoryear-tecomp
+  [2023/03/18 v0.17 extended biblatex authoryear-tecomp
    bibliography style (MW)]
 
 \RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tecomp.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tecomp.cbx
index 8ec7615f75..11b95fb345 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tecomp.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tecomp.cbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-authoryear-tecomp.cbx}
-  [2022/06/18 v0.16 extended biblatex authoryear-tecomp
+  [2023/03/18 v0.17 extended biblatex authoryear-tecomp
    citation style (MW)]
 
 \RequireCitationStyle{ext-authoryear-ecomp}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-terse.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-terse.bbx
index 9953ffe1ee..cd416934e4 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-terse.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-terse.bbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-authoryear-terse.bbx}
-  [2022/06/18 v0.16 extended biblatex authoryear-terse
+  [2023/03/18 v0.17 extended biblatex authoryear-terse
    bibliography style (MW)]
 
 \RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-terse.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-terse.cbx
index cfc3e8ebf3..9e20e67b7b 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-terse.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-terse.cbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-authoryear-terse.cbx}
-  [2022/06/18 v0.16 extended biblatex authoryear-terse
+  [2023/03/18 v0.17 extended biblatex authoryear-terse
    citation style (MW)]
 
 \RequireCitationStyle{ext-authoryear}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ticomp.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ticomp.bbx
index bbed7bff74..21f919201c 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ticomp.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ticomp.bbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-authoryear-ticomp.bbx}
-  [2022/06/18 v0.16 extended biblatex authoryear-ticomp
+  [2023/03/18 v0.17 extended biblatex authoryear-ticomp
    bibliography style (MW)]
 
 \RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ticomp.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ticomp.cbx
index e1cfa0ee24..b3c6e83b23 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ticomp.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ticomp.cbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-authoryear-ticomp.cbx}
-  [2022/06/18 v0.16 extended biblatex authoryear-ticomp citation style
+  [2023/03/18 v0.17 extended biblatex authoryear-ticomp citation style
    (MW)]
 
 \RequireCitationStyle{ext-authoryear-icomp}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tiecomp.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tiecomp.bbx
index 83f682bb0e..a7eeecf3e1 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tiecomp.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tiecomp.bbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-authoryear-tiecomp.bbx}
-  [2022/06/18 v0.16 extended biblatex authoryear-tiecomp
+  [2023/03/18 v0.17 extended biblatex authoryear-tiecomp
    bibliography style (MW)]
 
 \RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tiecomp.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tiecomp.cbx
index 1a2ea80cfb..03cac6f42e 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tiecomp.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tiecomp.cbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-authoryear-tiecomp.cbx}
-  [2022/06/18 v0.16 extended biblatex authoryear-tiecomp citation style
+  [2023/03/18 v0.17 extended biblatex authoryear-tiecomp citation style
    (MW)]
 
 \RequireCitationStyle{ext-authoryear-iecomp}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear.bbx
index d7c30aa1ca..03ef7fbc19 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear.bbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-authoryear.bbx}
-  [2022/06/18 v0.16 extended biblatex authoryear bibliography style (MW)]
+  [2023/03/18 v0.17 extended biblatex authoryear bibliography style (MW)]
 
 \RequireBibliographyStyle{ext-standard}
 \RequireBibliographyStyle{authoryear}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear.cbx
index 1835e77634..88076192e3 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear.cbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-authoryear.cbx}
-  [2022/06/18 v0.16 extended biblatex authoryear citation style (MW)]
+  [2023/03/18 v0.17 extended biblatex authoryear citation style (MW)]
 
 \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
   {}{}{}{}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-biblatex-aux.def b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-biblatex-aux.def
index f54ad39faf..8029f25833 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-biblatex-aux.def
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-biblatex-aux.def
@@ -1,9 +1,9 @@
 \ProvidesFile{ext-biblatex-aux.def}
-  [2022/06/18 v0.16 auxiliaries for extended biblatex citation style
+  [2023/03/18 v0.17 auxiliaries for extended biblatex citation style
    (MW)]
 
-\def\extblx@requiredbiblatexversion{3.17}
-\def\extblx@requiredbiblatexdate{2022/02/02}
+\def\extblx@requiredbiblatexversion{3.19}
+\def\extblx@requiredbiblatexdate{2023/03/05}
 
 \protected\def\extblx@info{\PackageInfo{biblatex-ext}}
 \protected\def\extblx@warning{\PackageWarning{biblatex-ext}}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-dashed-common.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-dashed-common.bbx
index 246569a3bb..c6366ff59c 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-dashed-common.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-dashed-common.bbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-dashed-common.bbx}
-  [2022/06/18 v0.16 common files for extended biblatex
+  [2023/03/18 v0.17 common files for extended biblatex
    dashed bibliography styles (MW)]
 
 \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-comp.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-comp.bbx
index bbeb7faf63..10ccdd770f 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-comp.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-comp.bbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-numeric-comp.bbx}
-  [2022/06/18 v0.16 extended biblatex numeric-comp
+  [2023/03/18 v0.17 extended biblatex numeric-comp
    bibliography style (MW)]
 
 \RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-comp.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-comp.cbx
index f77af8c920..07d3b86abc 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-comp.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-comp.cbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-numeric-comp.cbx}
-  [2022/06/18 v0.16 extended biblatex numeric-comp citation style (MW)]
+  [2023/03/18 v0.17 extended biblatex numeric-comp citation style (MW)]
 
 \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
   {}{}{}{}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-verb.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-verb.bbx
index 55eaacbfef..5d61ef9865 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-verb.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-verb.bbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-numeric-verb.bbx}
-  [2022/06/18 v0.16 extended biblatex numeric-verb
+  [2023/03/18 v0.17 extended biblatex numeric-verb
    bibliography style (MW)]
 
 \RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-verb.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-verb.cbx
index 4efbff9493..42cfbb20ae 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-verb.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-verb.cbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-numeric-verb.cbx}
-  [2022/06/18 v0.16 extended biblatex numeric-verb citation style (MW)]
+  [2023/03/18 v0.17 extended biblatex numeric-verb citation style (MW)]
 
 \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
   {}{}{}{}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric.bbx
index 53361a1243..0cf786cf75 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric.bbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-numeric.bbx}
-  [2022/06/18 v0.16 extended biblatex numeric bibliography style (MW)]
+  [2023/03/18 v0.17 extended biblatex numeric bibliography style (MW)]
 
 \RequireBibliographyStyle{ext-standard}
 \RequireBibliographyStyle{numeric}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric.cbx
index 40647f2e4e..fb9783e35f 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric.cbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-numeric.cbx}
-  [2022/06/18 v0.16 extended biblatex numeric citation style (MW)]
+  [2023/03/18 v0.17 extended biblatex numeric citation style (MW)]
 
 \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
   {}{}{}{}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-standard.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-standard.bbx
index 215ca654fe..dc624ca2bf 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-standard.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-standard.bbx
@@ -1,9 +1,9 @@
-% biblatex-ext v0.16 (2022-06-18)
+% biblatex-ext v0.17 (2023-03-18)
 % Maintainer:  Moritz Wemheuer
 % Licence:     LaTeX Project Public License v1.3c or later
 %
 \ProvidesFile{ext-standard.bbx}
-  [2022/06/18 v0.16 extended biblatex standard style (MW)]
+  [2023/03/18 v0.17 extended biblatex standard style (MW)]
 
 \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
   {}{}{}{}
@@ -1321,7 +1321,7 @@
 
 \endinput
 
-% Copyright 2017-2022 Moritz Wemheuer
+% Copyright 2017-2023 Moritz Wemheuer
 %
 % This work consists of the `.bbx`, `.cbx`, `.def`, `.sty` and `.lua`
 % files
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-common.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-common.cbx
index 3a76030b91..a70ef6f5ae 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-common.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-common.cbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-verbose-common.cbx}
-  [2022/06/18 v0.16 extended biblatex verbose citation style (MW)]
+  [2023/03/18 v0.17 extended biblatex verbose citation style (MW)]
 
 \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
   {}{}{}{}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-ibid.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-ibid.bbx
index db3df1ce81..887c04b978 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-ibid.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-ibid.bbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-verbose-ibid.bbx}
-  [2022/06/18 v0.16 extended biblatex verbose-ibid
+  [2023/03/18 v0.17 extended biblatex verbose-ibid
    bibliography style (MW)]
 
 \RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-ibid.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-ibid.cbx
index 91f4f7685c..a1f3e76b5e 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-ibid.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-ibid.cbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-verbose-ibid.cbx}
-  [2022/06/18 v0.16 extended biblatex verbose-ibid citation style (MW)]
+  [2023/03/18 v0.17 extended biblatex verbose-ibid citation style (MW)]
 
 \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
   {}{}{}{}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-inote.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-inote.bbx
index e489ac0460..6951edd3cf 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-inote.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-inote.bbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-verbose-inote.bbx}
-  [2022/06/18 v0.16 extended biblatex verbose-inote
+  [2023/03/18 v0.17 extended biblatex verbose-inote
    bibliography style (MW)]
 
 \RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-inote.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-inote.cbx
index 8d58e61675..d7fd8e290f 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-inote.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-inote.cbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-verbose-inote.cbx}
-  [2022/06/18 v0.16 extended biblatex verbose-inote citation style (MW)]
+  [2023/03/18 v0.17 extended biblatex verbose-inote citation style (MW)]
 
 \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
   {}{}{}{}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-note-common.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-note-common.cbx
index 01dc1baac2..6b7c114946 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-note-common.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-note-common.cbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-verbose-note-common.cbx}
-  [2022/06/18 v0.16 extended biblatex verbose citation style (MW)]
+  [2023/03/18 v0.17 extended biblatex verbose citation style (MW)]
 
 \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
   {}{}{}{}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-note.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-note.bbx
index d83c21bb8c..7ff143346a 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-note.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-note.bbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-verbose-note.bbx}
-  [2022/06/18 v0.16 extended biblatex verbose-note
+  [2023/03/18 v0.17 extended biblatex verbose-note
    bibliography style (MW)]
 
 \RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-note.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-note.cbx
index 1d66a439db..ffb9b13cb5 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-note.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-note.cbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-verbose-note.cbx}
-  [2022/06/18 v0.16 extended biblatex verbose-note citation style (MW)]
+  [2023/03/18 v0.17 extended biblatex verbose-note citation style (MW)]
 
 \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
   {}{}{}{}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad1.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad1.bbx
index 8e9acd8c27..7e4d7499c4 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad1.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad1.bbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-verbose-trad1.bbx}
-  [2022/06/18 v0.16 extended biblatex verbose-trad1
+  [2023/03/18 v0.17 extended biblatex verbose-trad1
    bibliography style (MW)]
 
 \RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad1.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad1.cbx
index cbe0e5ca25..44cda15c61 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad1.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad1.cbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-verbose-trad1.cbx}
-  [2022/06/18 v0.16 extended biblatex verbose-trad1 citation style (MW)]
+  [2023/03/18 v0.17 extended biblatex verbose-trad1 citation style (MW)]
 
 \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
   {}{}{}{}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad2.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad2.bbx
index 52b19ab055..94812c065a 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad2.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad2.bbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-verbose-trad2.bbx}
-  [2022/06/18 v0.16 extended biblatex verbose-trad2
+  [2023/03/18 v0.17 extended biblatex verbose-trad2
    bibliography style (MW)]
 
 \RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad2.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad2.cbx
index b752ef7dd0..80c36dc6d8 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad2.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad2.cbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-verbose-trad2.cbx}
-  [2022/06/18 v0.16 extended biblatex verbose-trad2 citation style (MW)]
+  [2023/03/18 v0.17 extended biblatex verbose-trad2 citation style (MW)]
 
 \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
   {}{}{}{}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad3.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad3.bbx
index 24c40fb0cf..406d496895 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad3.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad3.bbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-verbose-trad3.bbx}
-  [2022/06/18 v0.16 extended biblatex verbose-trad3
+  [2023/03/18 v0.17 extended biblatex verbose-trad3
    bibliography style (MW)]
 
 \RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad3.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad3.cbx
index ca0dfa236d..a2245405ab 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad3.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad3.cbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-verbose-trad3.cbx}
-  [2022/06/18 v0.16 extended biblatex verbose-trad3 citation style (MW)]
+  [2023/03/18 v0.17 extended biblatex verbose-trad3 citation style (MW)]
 
 \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
   {}{}{}{}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose.bbx
index 0847a361af..3317b39d6c 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose.bbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-verbose.bbx}
-  [2022/06/18 v0.16 extended biblatex verbose
+  [2023/03/18 v0.17 extended biblatex verbose
    bibliography style (MW)]
 
 \RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose.cbx
index 4b5af0622a..395a1259d3 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose.cbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-verbose.cbx}
-  [2022/06/18 v0.16 extended biblatex verbose citation style (MW)]
+  [2023/03/18 v0.17 extended biblatex verbose citation style (MW)]
 
 \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
   {}{}{}{}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-publist/README b/macros/latex/contrib/biblatex-contrib/biblatex-publist/README
index a5c0f0781d..db58cebe33 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-publist/README
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-publist/README
@@ -46,6 +46,10 @@ instructions.
 
 == CHANGES ==
 
+* V. 2.3 (2023-03-18)
+	- Change of sorting by means of \ExecutePublistOptions (via plsorting
+	  or plauthorhandling) now works for all subsequent refsections.
+
 * V. 2.2 (2022-03-01)
 	- Fix plsorting with custom sorting schemes (#44).
 
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-publist/biblatex-publist.pdf b/macros/latex/contrib/biblatex-contrib/biblatex-publist/biblatex-publist.pdf
index e9cc7db2f9..3de8c85aaa 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-publist/biblatex-publist.pdf
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-publist/biblatex-publist.pdf
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-publist/biblatex-publist.tex b/macros/latex/contrib/biblatex-contrib/biblatex-publist/biblatex-publist.tex
index 56d686a6c4..16c7241d6e 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-publist/biblatex-publist.tex
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-publist/biblatex-publist.tex
@@ -113,7 +113,7 @@
 \thanks{Please report issues via \protect\url{https://github.com/jspitz/biblatex-publist}.}%
 }
 
-\date{Version 2.2, 2023/03/01}
+\date{Version 2.3, 2023/03/18}
 \maketitle
 
 \begin{abstract}
@@ -369,20 +369,9 @@ The executed options apply as of the next bibliography (\jfcsmacro{printbibliogr
 Options that \emph{cannot} be changed within a document that way are \joption{plnumbering} and \joption{pubstateextra},
 as these options employ features that can only be set once per document.
 However, please refer to sec.~\ref{sec:numbers} on how to address some frequently requested numbering changes.
+Also note that with the \joption{plauthor*} options, as opposed to repeated \jcsmacro{plauthorname} calls,
+repeated setting of these name options respectively \emph{overwrite}, and not extend, the previous name settings.
 
-Also note that 
-\begin{itemize}
-	\setlength\itemsep{0pt}
-	\item with the \joption{plauthor*} options, as opposed to repeated \jcsmacro{plauthorname} calls,
-	      repeated setting of these name options respectively \emph{overwrite}, and not extend, the previous name
-	      settings.
-	\item With \joption{plauthorhandling}, \bpl\ uses different sorting schemes for \joption{omit} (\texttt{ydt})
-	      and \joption{highlight} (\texttt{yndt}), considering the names as sorting factor only in the latter case
-	      (cf. sec.~\ref{sec:sorting}).
-	      Changing this option within a document, however, does \emph{not} adjust the sorting scheme if you use
-	      refsections (to make it work, \jfcsmacro{newrefcontext[sorting=<sorting scheme>]} will have to be set
-	      within each refsection). This is a \bibltx\ limitation which also applies to \joption{plsorting}.
-\end{itemize}
 
 \subsection{Numbers Games}\label{sec:numbers}
 
@@ -903,13 +892,20 @@ or
 \endrefcontext
 \end{lstlisting}
 %
-Note that if you use refsections, local sorting changes will only apply to the current
-refsection.
+Note that if you use refsections, the third approach will only apply to the current
+refsection (\jcsmacro{ExecutePublistOptions} will apply to all subsequent refsections
+until further change).
 
 \section{Revision Log}
 
 \begin{description}
 	
+	\item [{V. 2.3 (2023/03/18):}]~
+	\begin{itemize}
+		\item Change of sorting by means of \jcsmacro{ExecutePublistOptions} (via \joption{plsorting}
+		or \joption{plauthorhandling}) now works for all subsequent refsections.
+	\end{itemize}
+	
 	\item [{V. 2.2 (2023/03/01):}]~
 	\begin{itemize}
 		\item Fix \joption{plsorting} with custom sorting schemes.
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-publist/publist.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-publist/publist.bbx
index f52cbaf12b..cdb4ea966f 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-publist/publist.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-publist/publist.bbx
@@ -25,8 +25,8 @@
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-\def\bpl@version{2.2}
-\def\bpl@rdate{2023/03/01}
+\def\bpl@version{2.3}
+\def\bpl@rdate{2023/03/18}
 
 \ProvidesFile{publist.bbx}[\bpl@rdate\space v.\bpl@version\space
                            biblatex bibliography style (JSP)]
@@ -499,6 +499,7 @@
     \fi
     \ifx\@onlypreamble\@notprerr
         \newrefcontext[sorting=\bpl@scheme]
+        \AtFollowingRefsections{\newrefcontext[sorting=\bpl@scheme]}
     \else
         \ExecuteBibliographyOptions{sorting=\bpl@scheme}
     \fi
@@ -538,6 +539,15 @@
      {}{\PackageWarning{biblatex-publist}{Patching refsection failed!}}
 }{}
 
+% Only provided by biblatex 3.20ff., so we roll our own
+\@ifundefined{AtFollowingRefsections}{%
+  \newrobustcmd*{\AtFollowingRefsections}{\gappto\blx@hook@refsection@following}
+  \patchcmd{\blx@refsection@i}%
+     {\csuse{blx@hook@refsectioninit}}%
+     {\csuse{blx@hook@refsectioninit}\csuse{blx@hook@refsection@following}}
+     {}{\PackageWarning{biblatex-publist}{Patching refsection failed!}}
+}{}
+
 %
 % Removing braces from names (courtesy of egreg at
 % http://tex.stackexchange.com/a/79583/19291)
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-publist/publist.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-publist/publist.cbx
index cdbcc08d90..ee07e698c3 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-publist/publist.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-publist/publist.cbx
@@ -26,8 +26,8 @@
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-\def\bpl@version{2.2}
-\def\bpl@rdate{2023/03/01}
+\def\bpl@version{2.3}
+\def\bpl@rdate{2023/03/18}
 
 \ProvidesFile{publist.cbx}[\bpl@rdate\space v.\bpl@version\space
                            biblatex citation style (JSP)]
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-publist/publist.dbx b/macros/latex/contrib/biblatex-contrib/biblatex-publist/publist.dbx
index 2e2ba62090..3ebf0da52e 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-publist/publist.dbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-publist/publist.dbx
@@ -1,5 +1,5 @@
 % publist.dbx, biblatex data model specification for the biblatex-publist
-% package, version 2.2 (2023/03/01). 
+% package, version 2.3 (2023/03/18). 
 %
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3
diff --git a/macros/latex/contrib/flexipage/README.txt b/macros/latex/contrib/flexipage/README.txt
index 64936e8a48..4136e52f27 100644
--- a/macros/latex/contrib/flexipage/README.txt
+++ b/macros/latex/contrib/flexipage/README.txt
@@ -2,6 +2,7 @@ LaTeX package flexipage
 Copyright (c) Anton Vrba, 2022
 -------------------------------------------------------------------
 Version:
+  2023/03/17 1.02  fixd bug with fixed page sizes
   2022/10/01 1.01  added the option: extrafirstfoot
   2022/07/09 1.00  Initial release
 Licence:
diff --git a/macros/latex/contrib/flexipage/flexipage.dtx b/macros/latex/contrib/flexipage/flexipage.dtx
index 0315c1c102..b3f4667854 100644
--- a/macros/latex/contrib/flexipage/flexipage.dtx
+++ b/macros/latex/contrib/flexipage/flexipage.dtx
@@ -27,7 +27,8 @@
 %<package>\ProvidesPackage{flexipage}
 %<*package>
 %    [2022/07/09 1.00 Easy page geometry]
-    [2022/10/01 1.01 First Page different footer]
+%    [2022/10/01 1.01 First Page different footer]
+    [2023/03/17 1.02 Fixed bug re fixed page sizes]
 %</package>
 %
 %<*driver>
@@ -343,7 +344,7 @@
 
 \NewDocumentCommand \flx@setpapersize {o o m}{
 \setlength{\flx@paperheight}{#2#3}
-\setlength{\flx@paperwidth}{#2#3}
+\setlength{\flx@paperwidth}{#1#3}
 }
 
 
diff --git a/macros/latex/contrib/flexipage/flexipage.pdf b/macros/latex/contrib/flexipage/flexipage.pdf
index 290f8f7b16..8076bab7f8 100644
--- a/macros/latex/contrib/flexipage/flexipage.pdf
+++ b/macros/latex/contrib/flexipage/flexipage.pdf
diff --git a/macros/latex/contrib/fnbreak/ChangeLog b/macros/latex/contrib/fnbreak/ChangeLog
index 301dbe53ed..28fa704ae9 100644
--- a/macros/latex/contrib/fnbreak/ChangeLog
+++ b/macros/latex/contrib/fnbreak/ChangeLog
@@ -1,3 +1,7 @@
+v1.40 2023-03-18:
+	- Using the new LaTeX hook management.
+	- Fixed some typos in the documentation.
+
 v1.30 2012/01/01:
 	- Fix verbose mode for non-numeric labels
 	- Add options `nonverbose' and `label'
@@ -21,4 +25,4 @@ v1.00 2004/04/01:
 	- Patch \@footnotetext instead of re-writing it.
 
 v0.10 2003/04/03:
-	- Initial version
+	- Initial version
+\ No newline at end of file
diff --git a/macros/latex/contrib/fnbreak/Makefile b/macros/latex/contrib/fnbreak/Makefile
index 31d0846124..1dd53218e2 100644
--- a/macros/latex/contrib/fnbreak/Makefile
+++ b/macros/latex/contrib/fnbreak/Makefile
@@ -75,5 +75,4 @@ install: all
 	install -m644 fnbreak.pdf $(DOCDIR)
 	texhash
 
-fnbreak.sty: fnbreak.ins fnbreak.dtx
-
+fnbreak.sty: fnbreak.ins fnbreak.dtx
+\ No newline at end of file
diff --git a/macros/latex/contrib/fnbreak/README b/macros/latex/contrib/fnbreak/README
index b2f0911a84..4e675a703e 100644
--- a/macros/latex/contrib/fnbreak/README
+++ b/macros/latex/contrib/fnbreak/README
@@ -4,20 +4,23 @@ fnbreak.sty
 This package detects footnotes that are split over several pages. It
 writes a warning into the log file.
 
-
-Copyright 2003, 2004, 2006, 2010, 2012 Harald Harders
-
-This program can be redistributed and/or modified under the terms
-of the LaTeX Project Public License Distributed from CTAN
-archives in directory macros/latex/base/lppl.txt; either
-version 1 of the License, or any later version.
-
-
+Copyright © 2003, 2004, 2006, 2010, 2012, 2023 Harald Harders (harald.harders@gmx.de; inactive)
+(2023-03-18 update done by H.-Martin Münch, Martin.Muench AT Uni-Bonn.de)
+
+This work may be distributed and/or modified under the
+conditions of the LaTeX Project Public License, either
+version 1.3c of this license or (at your option) any later
+version. This version of this license is in
+   https://www.latex-project.org/lppl/lppl-1-3c.txt
+and the latest version of this license is in
+   https://www.latex-project.org/lppl.txt
+and version 1.3c or later is part of all distributions of
+LaTeX version 2005-12-01 or later.
 
 Installation:
 
 automatic: - run make install
-	 or
+  or
            - run make
            - copy fnbreak.sty to a place where LaTeX can find it
            - run texhash or the corresponding command of your distribution
@@ -27,7 +30,4 @@ by hand: - execute latex on fnbreak.ins
          - copy fnbreak.sty to a place LaTeX can find it
          - run texhash or the corresponding command of your distribution
 
-
-2012/01/01
-Harald Harders
-harald.harders@gmx.de
+2023-03-18
+\ No newline at end of file
diff --git a/macros/latex/contrib/fnbreak/fnbreak.dtx b/macros/latex/contrib/fnbreak/fnbreak.dtx
index 1cc54cdfda..5306cef84c 100644
--- a/macros/latex/contrib/fnbreak/fnbreak.dtx
+++ b/macros/latex/contrib/fnbreak/fnbreak.dtx
@@ -1,5 +1,9 @@
-% \iffalse meta comment
-% File: fnbreak.dtx Copyright (C) 2003, 2004, 2006, 2010, 2012 Harald Harders
+% \iffalse meta-comment
+%
+% File: fnbreak.dtx
+% Copyright © 2003, 2004, 2006, 2010, 2012, 2023 Harald Harders (inactive)
+% (2023-03-18 update done by H.-Martin Münch, Martin.Muench AT Uni-Bonn.de)
+% Info: Warning for pagebreak in footnote (HH)
 % \fi
 %
 % \iffalse
@@ -7,7 +11,7 @@
 %<*driver>
 \documentclass{ltxdoc}
 \title{The \texttt{fnbreak} package}
-\author{Harald Harders\\\texttt{harald.harders@gmx.de}}
+\author{Harald Harders\\\texttt{harald.harders@gmx.de}\\(inactive)}
 \date{Version \fileversion, \filedate, Printed \today}
 \EnableCrossrefs
 \CodelineIndex
@@ -15,13 +19,12 @@
 \DoNotIndex{\setcounter,\space,\ifx,\else,\fi}
 \CodelineNumbered
 \RecordChanges
-\CheckSum{202}
 \IfFileExists{fnbreak-v.tex}{%
   \input{fnbreak-v.tex}
   \GetFileInfo{fnbreak-v.tex}
 }{%
   \PackageError{fnbreak}{File fnbreak-v.tex not found,
-    please\MessageBreak 
+    please\MessageBreak
     run `latex fnbreak.ins' first}{No additional help}%
   \def\fileversion{\textbf{??}}%
   \def\filedate{\textbf{??}}%
@@ -43,12 +46,12 @@
 % \tableofcontents
 %
 % \section*{Copyright}
-% Copyright 2003, 2004, 2006, 2010, 2012 Harald Harders.
+% Copyright 2003, 2004, 2006, 2010, 2012, 2023 Harald Harders.
 %
 % This program can be redistributed and/or modified under the terms
 % of the LaTeX Project Public License Distributed from CTAN
 % archives in directory macros/latex/base/lppl.txt; either
-% version 1.3 of the License, or any later version.
+% version 1.3c of the License, or any later version.
 %
 % \section{The user interface}
 %
@@ -68,13 +71,15 @@
 %\end{verbatim}
 % Sometimes, complicated footnote labels are used (for example, when
 % using symbols):
+% \pagebreak
+%
 %\begin{verbatim}
 %Package fnbreak Warning: Footnote number 1
 %(fnbreak)                (label `\ensuremath {*}')
 %(fnbreak)                has been split over different pages:
 %(fnbreak)                page 1 to page 2.
 %\end{verbatim}
-% In some cases may complex footnote labels may prevent |fnbreak| from
+% In some cases complex footnote labels may prevent |fnbreak| from
 % functioning.
 % \begin{macro}{nolabel}
 % \begin{macro}{label}
@@ -84,7 +89,7 @@
 %\end{verbatim}
 % Then the label is omitted in the warning:
 %\begin{verbatim}
-%Package fnbreak Warning: Footnote number 1 
+%Package fnbreak Warning: Footnote number 1
 %(fnbreak)                has been split over different pages:
 %(fnbreak)                page 1 to page 2.
 %\end{verbatim}
@@ -93,7 +98,7 @@
 %
 % \begin{macro}{\fnbreaknolabel}
 % \begin{macro}{\fnbreaklabel}
-% You may switsch on and off printing of the footnote label in the
+% You may switch on and off printing of the footnote label in the
 % warnings also by using the macros \cs{fnbreaknolabel} and \cs{fnbreaklabel}.
 % \end{macro}
 % \end{macro}
@@ -102,13 +107,13 @@
 % the footnote spans over a double page or flipsides.
 % The result is shown in the warning:
 %\begin{verbatim}
-%Package fnbreak Warning: Footnote number 1 
+%Package fnbreak Warning: Footnote number 1
 %(fnbreak)                has been split over different pages (flipsides):
 %(fnbreak)                page 1 to page 2.
 %\end{verbatim}
 % or:
 %\begin{verbatim}
-%Package fnbreak Warning: Footnote number 1 
+%Package fnbreak Warning: Footnote number 1
 %(fnbreak)                has been split over different pages (double page):
 %(fnbreak)                page 2 to page 3.
 %\end{verbatim}
@@ -124,7 +129,7 @@
 % The output looks as follows:
 %\begin{verbatim}
 %Package fnbreak Note:    Footnote number 2
-%(fnbreak)                (label `2') 
+%(fnbreak)                (label `2')
 %(fnbreak)                completely on page 3.
 %\end{verbatim}
 % \end{macro}
@@ -132,16 +137,15 @@
 %
 % \begin{macro}{\fnbreaknonverbose}
 % \begin{macro}{\fnbreakverbose}
-% You may switsch on and off printing footnote information for
+% You may switch on and off printing footnote information for
 % non-split footnotes using the macros \cs{fnbreaknonverbose} and
 % \cs{fnbreakverbose}.
 % \end{macro}
 % \end{macro}
 %
-%
-%
 % \StopEventually{\PrintChanges \PrintIndex}
 %
+% \pagebreak
 % \section{The implementation}
 %
 % The approach of this package is very simple:
@@ -151,16 +155,19 @@
 %
 % Heading of the package:
 %    \begin{macrocode}
+%<package>\NeedsTeXFormat{LaTeX2e}[2017/04/15]
 %<package>\ProvidesPackage{fnbreak}
 %<version>\ProvidesFile{fnbreak-v.tex}
-%<package|version>  [2012/01/01  v1.30  Warning for pagebreak in footnote (HH)]
+%<package|version> [2023-03-18 v1.40 Warning for pagebreak in footnote (HH)]
 %<*package>
 %    \end{macrocode}
 % Declare an option to show not only the footnote number but also the
 % label.
 % \changes{1.11}{2006/05/08}{Allow commands in page number}%
 %    \begin{macrocode}
+
 \RequirePackage{ifthen}
+
 %    \end{macrocode}
 % Declare an option to show not only the footnote number but also the
 % label.
@@ -169,12 +176,14 @@
 %    \begin{macrocode}
 \newif\iffnb@showlabel
 \newif\iffnb@verbose
+
 \DeclareOption{label}{\fnb@showlabeltrue}
 \DeclareOption{nolabel}{\fnb@showlabelfalse}
 \DeclareOption{verbose}{\fnb@verbosetrue}
 \DeclareOption{nonverbose}{\fnb@verbosefalse}
 \ExecuteOptions{label,nonverbose}
 \ProcessOptions\relax
+
 %    \end{macrocode}
 % \begin{macro}{\fnbreakverbose}
 % \begin{macro}{\fnbreaknonverbose}
@@ -191,33 +200,66 @@
 %    \begin{macrocode}
 \newcommand*\fnbreaklabel{\fnb@showlabeltrue}
 \newcommand*\fnbreaknolabel{\fnb@showlabelfalse}
+
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
 % Define new counter and boolean for determining whether a split
-% footnote spans ofer a double page or flipsides.
+% footnote spans over a double page or flipsides.
 % \changes{1.20}{2010/08/09}{Distinguish between split over double
 %   page or flipsides}%
 %    \begin{macrocode}
 \newcounter{fnb@@numberpages}
+
 \newif\iffnb@@isdoublepage
+
 %    \end{macrocode}
 % Define default values in order to avoid possible problems:
 % \changes{1.00}{2004/04/01}{Correct some internal macro names}%
 %    \begin{macrocode}
 \xdef\fnb@@footnotestartnum{0}
 \xdef\fnb@@footnotestartpage{0}
+\def\fnb@globalwarning{}
 %    \end{macrocode}
 % When the aux file is read the first time (before \cs{begin\{document\}},
 % do nothing:
 %    \begin{macrocode}
 \def\fnb@footnotestart#1#2#3{}
 \def\fnb@footnoteend#1#2#3{}
+
+%    \end{macrocode}
+% Define command that writes the footnote start marker to the aux
+% file:
+%    \begin{macrocode}
+\def\fnb@fnstart{\@bsphack
+  \protected@write\@auxout{}{%
+    \string\fnb@footnotestart{\the\c@footnote}{\thefootnote}{\thepage}%
+    }%
+  \@esphack%
+  }
+
+%    \end{macrocode}
+% Define command that writes the footnote end marker to the aux file:
+%    \begin{macrocode}
+\def\fnb@fnend{\@bsphack
+  \protected@write\@auxout{}{%
+    \string\fnb@footnoteend{\the\c@footnote}{\thefootnote}{\thepage}%
+    }%
+  \@esphack%
+  }
+
+%    \end{macrocode}
+% Provide the command \cs{IfFormatAtLeastTF} for old \LaTeX-formats
+% which did not know it yet:
+% 
+%    \begin{macrocode}
+\providecommand\IfFormatAtLeastTF{\@ifl@t@r\fmtversion}
+
 %    \end{macrocode}
 % Define the working commands at \cs{begin\{document\}} in order to
 % activate them when the aux file is read at the end of the document:
 %    \begin{macrocode}
-\AtBeginDocument{%
+\AtBeginDocument{% = \AddToHook{begindocument}
 %    \end{macrocode}
 % If the start of a footnote has been found, just define commands
 % containing the footnote number (only for debugging) and the start page:
@@ -232,8 +274,8 @@
 %   anymore}%
 % \changes{1.00}{2004/04/01}{Use the footnote number instead of the
 %   label, show both in the warning}%
-% If the end of a footnote has been found, test wheather the footnote
-% numbers fit and wheather the start and end pages are the same. If
+% If the end of a footnote has been found, test whether the footnote
+% numbers fit and whether the start and end pages are the same. If
 % one of the tests fails, generate a warning:\footnote{Thanks to
 %   Bastien Roucaries for pointing at a problem with symbol footnote
 %   marks.}
@@ -244,7 +286,7 @@
 %    \end{macrocode}
 % Test if start and end refer to the same footnote.
 %    \begin{macrocode}
-    \ifx\fnb@@footnotestartnum\fnb@@footnoteendnum
+    \ifx\fnb@@footnotestartnum\fnb@@footnoteendnum%
 %    \end{macrocode}
 % Test if the footnote ends on the same page it has started.
 % \changes{1.11}{2006/05/08}{Allow commands in page number}%
@@ -256,30 +298,31 @@
 % Simulate a variant of \cs{PackageInfo} which is also written to the
 % output rather than only to the log file.
 % \changes{1.30}{2012/01/01}{Fix verbose mode for non-numeric labels}
+% \pagebreak
 %    \begin{macrocode}
-        \iffnb@verbose
-          \begingroup
+        \iffnb@verbose%
+          \begingroup%
             \def\MessageBreak{^^J(fnbreak)\@spaces\@spaces\@spaces\@spaces}%
-            \set@display@protect
+            \set@display@protect%
             \immediate\write\@unused{^^JPackage fnbreak Note:%
-              \space\space\space\space Footnote number #1
-            \iffnb@showlabel\MessageBreak (label `#2') \fi
-            \MessageBreak
+              \space\space\space\space Footnote number #1%
+            \iffnb@showlabel\MessageBreak (label `#2') \fi%
+            \MessageBreak%
             completely on page #3.^^J}%
-          \endgroup
-        \fi
+          \endgroup%
+        \fi%
       }{%
 %    \end{macrocode}
 % No, the footnote contains a pagebreak.
 %
-% If the page labels are plain numbers we can determine whether a
-% footnot spans over a double page or a flipside.\footnote{Thanks to
-%   Martin M\"unch for the idea of determining double pages.}
+% If the page labels are plain (arabic) numbers we can determine whether a
+% footnote spans over a double page or a flipside.\footnote{Thanks to
+%   H.-Martin Münch for the idea of determining double pages.}
 % \changes{1.20}{2010/08/09}{Distinguish between split over double
 %   page or flipsides}%
 % |fnb@@numberpages = 0| is used if the code cannot find out whether a
 % footnote spans over a double page (i.\,e., for non-integer page
-% numbers or single-side documents).
+% numbers or single-sided documents).
 %    \begin{macrocode}
         \setcounter{fnb@@numberpages}{0}%
 %    \end{macrocode}
@@ -288,7 +331,7 @@
 % If this is not the case please report to the author including a
 % minimal example file.
 %    \begin{macrocode}
-        \if@twoside
+        \if@twoside%
 %    \end{macrocode}
 % We can find double pages only if the start page as well as the end
 % page are numbers.
@@ -306,128 +349,105 @@
 % If the footnote starts on an odd page, flipside occurs in any case.
 %    \begin{macrocode}
               \ifodd \fnb@@footnotestartpage{}%
-                \fnb@@isdoublepagefalse
+                \fnb@@isdoublepagefalse%
 %    \end{macrocode}
 % If the footnote starts on an odd page, a double page is found if the
 % number of pages equals two.
 %    \begin{macrocode}
-              \else
+              \else%
                 \ifnum \thefnb@@numberpages=2{}%
-                  \fnb@@isdoublepagetrue
+                  \fnb@@isdoublepagetrue%
 %    \end{macrocode}
 % If the number of pages is larger, flipside.
 %    \begin{macrocode}
-                \else
-                  \fnb@@isdoublepagefalse
-                \fi
-              \fi
-            \fi
-          \fi
-        \fi
+                \else%
+                  \fnb@@isdoublepagefalse%
+                \fi%
+              \fi%
+            \fi%
+          \fi%
+        \fi%
 %    \end{macrocode}
 % Print a warning.
 %
-% If not determined whether a double page occurs:
+% \noindent If not determined whether a double page occurs:
 %    \begin{macrocode}
-        \ifnum\thefnb@@numberpages=0
-          \PackageWarningNoLine{fnbreak}{Footnote number #1
-            \iffnb@showlabel\MessageBreak (label `#2')\fi
-            \MessageBreak
-            has been split over different pages:\MessageBreak
+        \ifnum\thefnb@@numberpages=0%
+          \PackageWarningNoLine{fnbreak}{Footnote number #1%
+            \iffnb@showlabel\MessageBreak (label `#2')\fi%
+            \MessageBreak%
+            has been split over different pages:\MessageBreak%
             page \fnb@@footnotestartpage\space to page #3}%
 %    \end{macrocode}
 % For a double page:
 %    \begin{macrocode}
-        \else
-          \iffnb@@isdoublepage
-            \PackageWarningNoLine{fnbreak}{Footnote number #1
-              \iffnb@showlabel\MessageBreak (label `#2')\fi
-              \MessageBreak
-              has been split over different pages (double page):\MessageBreak
+        \else%
+          \iffnb@@isdoublepage%
+            \PackageWarningNoLine{fnbreak}{Footnote number #1%
+              \iffnb@showlabel\MessageBreak (label `#2')\fi%
+              \MessageBreak%
+              has been split over different pages (double page):\MessageBreak%
               page \fnb@@footnotestartpage\space to page #3}%
 %    \end{macrocode}
 % For a flipside:
 %    \begin{macrocode}
-          \else
-            \PackageWarningNoLine{fnbreak}{Footnote number #1
-              \iffnb@showlabel\MessageBreak (label `#2')\fi
-              \MessageBreak
-              has been split over different pages (flipside):\MessageBreak
+          \else%
+            \PackageWarningNoLine{fnbreak}{Footnote number #1%
+              \iffnb@showlabel\MessageBreak (label `#2')\fi%
+              \MessageBreak%
+              has been split over different pages (flipside):\MessageBreak%
               page \fnb@@footnotestartpage\space to page #3}%
-          \fi
-        \fi
+          \fi%
+        \fi%
 %    \end{macrocode}
 % Redefine the \cs{fnb@globalwarning} to print a warning at the end of
 % the log file.
 %    \begin{macrocode}
         \def\fnb@globalwarning{%
-          \PackageWarningNoLine{fnbreak}{There are footnotes with a
-            pagebreak.\MessageBreak
+          \PackageWarningNoLine{fnbreak}{There are footnotes with a %
+            pagebreak.\MessageBreak%
             Check if they are acceptable}%
         }%
       }%
-    \else
+    \else%
 %    \end{macrocode}
 % This macro trys to handle different footnotes.
 % This may not happen and is an internal error.
 %    \begin{macrocode}
-      \PackageError{fnbreak}{Internal problem:\MessageBreak
-        Start and stop marker of footnote do not fit:\MessageBreak
-        start: \fnb@@footnotestartnum, page \fnb@@footnotestartpage,
+      \PackageError{fnbreak}{Internal problem:\MessageBreak%
+        Start and stop marker of footnote do not fit:\MessageBreak%
+        start: \fnb@@footnotestartnum, page \fnb@@footnotestartpage, %
         end: #1, page #3}{%
-        This error may not happen.
-        Please try to make a short example which shows this behaviour
+        This error may not happen. %
+        Please try to make a short example which shows this behaviour %
         and send a bug report to harald.harders@gmx.de.}%
-    \fi
-    }%
-  }
-%    \end{macrocode}
-% Define command that writes the footnote start marker to the aux
-% file:
-%    \begin{macrocode}
-  \def\fnb@fnstart{\@bsphack
-    \protected@write\@auxout{}{%
-      \string\fnb@footnotestart{\the\c@footnote}{\thefootnote}{\thepage}%
-    }%
-    \@esphack
-  }
-%    \end{macrocode}
-% Define command that writes the footnote end marker to the aux file:
-%    \begin{macrocode}
-  \def\fnb@fnend{\@bsphack
-    \protected@write\@auxout{}{%
-      \string\fnb@footnoteend{\the\c@footnote}{\thefootnote}{\thepage}%
+    \fi%
     }%
-    \@esphack
-  }
 %    \end{macrocode}
 % \changes{1.00}{2004/04/01}{Patch \cs{@footnotetext} instead of
 %   re-writing it}%
 % Redefine \cs{@footnotetext} by patching the calls \cs{fnb@fnstart}
 % and \cs{fnb@fnend} after all other packages have been
-% loaded.\footnote{Thanks to Bastien Roucaries for that patch}
+% loaded.\footnote{Thanks to Bastien Roucaries for that patch.}
 %    \begin{macrocode}
-\AtBeginDocument{%
   \newcommand\fnb@orig@footnotetext{}%
-  \let\fnb@orig@footnotetext\@footnotetext
+  \let\fnb@orig@footnotetext\@footnotetext%
   \long\def\@footnotetext#1{\fnb@orig@footnotetext{\fnb@fnstart#1\fnb@fnend}}%
 %    \end{macrocode}
-% \changes{1.10}{2004/04/06}{Write a warning at the end of the log
-%   file}%
-% Append \cs{fnb@globalwarning} to \cs{@dofilelist} in order to print
-% the global warning \cs{fnb@globalwarning} after all other messages,
-% e.g., the \cs{listfiles} list.
+% \changes{1.10}{2004/04/06}{Write a warning at the end of the log file}%
+% \changes{1.40}{2023-03-18}{Do not mess with \cs{@dofilelist}, use \cs{AddToHook{enddocument/info}}}%
+% Add \cs{fnb@globalwarning} to the info/warning messages
+% printed at the end of the .log file after the \cs{listfiles} list.
 %    \begin{macrocode}
-  \newcommand\fnb@dofilelist{}%
-  \let\fnb@dofilelist\@dofilelist
-  \def\@dofilelist{\fnb@dofilelist\fnb@globalwarning}%
-}
-%    \end{macrocode}
-% Initialise \cs{fnb@globalwarning} to print no warning by default.
-%    \begin{macrocode}
-\newcommand\fnb@globalwarning{}%
-\let\fnb@globalwarning\relax
+  \IfFormatAtLeastTF{2021-11-15}{%
+     \AddToHook{enddocument/info}{\fnb@globalwarning}%
+   }{\newcommand\fnb@dofilelist{}%
+     \let\fnb@dofilelist\@dofilelist%
+     \def\@dofilelist{\fnb@dofilelist\fnb@globalwarning}%
+    }%
+  }
 %</package>
 %    \end{macrocode}
 %
 % \Finale
+\endinput
+\ No newline at end of file
diff --git a/macros/latex/contrib/fnbreak/fnbreak.ins b/macros/latex/contrib/fnbreak/fnbreak.ins
index dd3b8bd3dc..279c4b2584 100644
--- a/macros/latex/contrib/fnbreak/fnbreak.ins
+++ b/macros/latex/contrib/fnbreak/fnbreak.ins
@@ -3,14 +3,18 @@
 
   fnbreak package
 
-  Copyright 2003, 2004, 2006, 2010, 2012 Harald Harders
-
-  This program can be redistributed and/or modified under the terms
-  of the LaTeX Project Public License Distributed from CTAN
-  archives in directory macros/latex/base/lppl.txt; either
-  version 1.3 of the License, or any later version.
-
-  harald.harders@gmx.de
+  Copyright (c) 2003, 2004, 2006, 2010, 2012, 2023 Harald Harders (harald.harders@gmx.de; inactive)
+  (2023-03-18 update done by H.-Martin Muench, Martin.Muench AT Uni-Bonn.de)
+
+  This work may be distributed and/or modified under the
+  conditions of the LaTeX Project Public License, either
+  version 1.3c of this license or (at your option) any later
+  version. This version of this license is in
+     https://www.latex-project.org/lppl/lppl-1-3c.txt
+  and the latest version of this license is in
+     https://www.latex-project.org/lppl.txt
+  and version 1.3c or later is part of all distributions of
+  LaTeX version 2005-12-01 or later.
 
 \endpreamble
 
diff --git a/macros/latex/contrib/fnbreak/fnbreak.pdf b/macros/latex/contrib/fnbreak/fnbreak.pdf
index 6ae5f00b07..982a38a392 100644
--- a/macros/latex/contrib/fnbreak/fnbreak.pdf
+++ b/macros/latex/contrib/fnbreak/fnbreak.pdf
diff --git a/macros/latex/contrib/fnbreak/fnbreak.xml b/macros/latex/contrib/fnbreak/fnbreak.xml
index 72d4cfd055..99c0f191c9 100644
--- a/macros/latex/contrib/fnbreak/fnbreak.xml
+++ b/macros/latex/contrib/fnbreak/fnbreak.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0"?>
 <!DOCTYPE entry SYSTEM "../catalogue.dtd">
 <entry id="fnbreak" 
-       datestamp="2012/01/01" 
+       datestamp="2023-03-18" 
        modifier="harald.harders@gmx.de">
   <about>
     <name>fnbreak</name>
     <caption>Warn for footnotes split over pages.</caption>
     <author>
-      <name>Harald Harders</name>
+      <name>Harald Harders (inactive)</name>
       <email>harald.harders@gmx.de</email>
     </author>
     <license type="lppl"/>
     <version>
-      <number>1.30</number>
+      <number>1.40</number>
     </version>
   </about>
   <description>
@@ -25,4 +25,4 @@
     <texlive>latex3</texlive>
     <ctan>macros/latex/contrib/fnbreak</ctan>
   </distribution>
-</entry>
+</entry>
+\ No newline at end of file
diff --git a/macros/latex/contrib/fnbreak/fnbreaktest.tex b/macros/latex/contrib/fnbreak/fnbreaktest.tex
index 4fdeb31373..53ac082f3d 100644
--- a/macros/latex/contrib/fnbreak/fnbreaktest.tex
+++ b/macros/latex/contrib/fnbreak/fnbreaktest.tex
@@ -8,476 +8,482 @@
 \usepackage[symbol]{footmisc}
 \def\thepage{\textsc{\roman{page}}}
 \begin{document}
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.\footnote{%
-  Hier ist eine Fu\ss note. Hier ist eine Fu\ss note.
-  Hier ist eine Fu\ss note. Hier ist eine Fu\ss note.
-  Hier ist eine Fu\ss note. Hier ist eine Fu\ss note.
-  Hier ist eine Fu\ss note.}
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.\footnote{Hallo}
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.\footnote{%
-  Hier ist eine Fu\ss note. Hier ist eine Fu\ss note.
-  Hier ist eine Fu\ss note. Hier ist eine Fu\ss note.
-  Hier ist eine Fu\ss note. Hier ist eine Fu\ss note.
-  Hier ist eine Fu\ss note. Hier ist eine Fu\ss note.
-  Hier ist eine Fu\ss note. Hier ist eine Fu\ss note.
-  Hier ist eine Fu\ss note. Hier ist eine Fu\ss note.
-  Hier ist eine Fu\ss note. Hier ist eine Fu\ss note.
-  Hier ist eine Fu\ss note.}
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-Das ist ein langer Text. Das ist ein langer Text.
-\end{document}
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.\footnote{%
+  Here is a footnote. Here is a footnote.
+  Here is a footnote. Here is a footnote.
+  Here is a footnote. Here is a footnote.
+  Here is a footnote. Here is a footnote.
+  Here is a footnote. Here is a footnote.
+  Here is a footnote. Here is a footnote.
+  Here is a footnote. Here is a footnote.
+  Here is a footnote. Here is a footnote.
+  Here is a footnote. Here is a footnote.
+  Here is a footnote. Here is a footnote.}
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.\footnote{Hello!}
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.\footnote{%
+  Here is a footnote. Here is a footnote.
+  Here is a footnote. Here is a footnote.
+  Here is a footnote. Here is a footnote.
+  Here is a footnote. Here is a footnote.
+  Here is a footnote. Here is a footnote.
+  Here is a footnote. Here is a footnote.
+  Here is a footnote. Here is a footnote.
+  Here is a footnote.}
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+This is a long text. This is a long text.
+\end{document}
+\ No newline at end of file
diff --git a/macros/latex/contrib/jeuxcartes/README.md b/macros/latex/contrib/jeuxcartes/README.md
index f7d63ad098..85921d2e46 100644
--- a/macros/latex/contrib/jeuxcartes/README.md
+++ b/macros/latex/contrib/jeuxcartes/README.md
@@ -10,5 +10,7 @@ Poker v2 cards Image's Licence : Public Domain    https://tekeye.uk/playing_card
 Poker v3 cards Image's Licence : Public Domain    https://www.me.uk/cards/
 Poker v4 cards Image's Licence : CC BY-SA 4.0     https://commons.wikimedia.org/wiki/File:Computer_screen_playing_cards_deck.svg
 Poker v5 cards Image's Licence : Public Domain    https://www.me.uk/cards/
+Poker fr cards Image's Licence.: LGPL-2.1 license https://svg-cards.sourceforge.net/
+Poker bi cards Image's Licence.: LGPL-3 license   https://github.com/tfbkny/blackjack
 Tarot v1 cards Image's Licence : Public Domain    https://freesvg.org/deck-of-french-tarot-playing-cards
 Uno v1 cards Image's Licence   : MIT License      https://eperezcosano.github.io/uno-part1/
 \ No newline at end of file
diff --git a/macros/latex/contrib/jeuxcartes/doc/JeuxCartes-doc.pdf b/macros/latex/contrib/jeuxcartes/doc/JeuxCartes-doc.pdf
index c67a9202b5..d4451abc83 100644
--- a/macros/latex/contrib/jeuxcartes/doc/JeuxCartes-doc.pdf
+++ b/macros/latex/contrib/jeuxcartes/doc/JeuxCartes-doc.pdf
diff --git a/macros/latex/contrib/jeuxcartes/doc/JeuxCartes-doc.tex b/macros/latex/contrib/jeuxcartes/doc/JeuxCartes-doc.tex
index 3ac8a72802..9f4bb4a337 100644
--- a/macros/latex/contrib/jeuxcartes/doc/JeuxCartes-doc.tex
+++ b/macros/latex/contrib/jeuxcartes/doc/JeuxCartes-doc.tex
@@ -2,8 +2,8 @@
 % arara: pdflatex: {shell: yes, synctex: no, interaction: batchmode}
 % arara: pdflatex: {shell: yes, synctex: no, interaction: batchmode} if found('log', '(undefined references|Please rerun|Rerun to get)')
 
-\documentclass{article}
-\usepackage[french]{babel}
+\documentclass[a4paper]{article}
+\usepackage[svgnames]{xcolor}
 \usepackage{iftex,ifpdf,ifxetex,ifluatex}
 \ifpdftex
 	\usepackage[utf8]{inputenc}
@@ -15,17 +15,17 @@
 	\usepackage{amsmath,amssymb}
 \fi
 \ifluatex
-	\RequirePackage[math-style=french,bold-style=ISO]{fourier-otf}
-\fi
-\ifxetex
-	\RequirePackage[math-style=french,bold-style=ISO]{fourier-otf}
+	\usepackage[bold-style=ISO,math-style=french]{fourier-otf}
+	\setsansfont{Fira Sans}[Scale=MatchLowercase]
 \fi
 \usepackage{fontawesome5}
 \usepackage{enumitem}
 \usepackage{JeuxCartes}
 \usepackage{tabularray}
+\usepackage{textcomp}
 \usepackage{fancyvrb}
 \usepackage{fancyhdr}
+\usepackage{multicol}
 \fancyhf{}
 \renewcommand{\headrulewidth}{0pt}
 \lfoot{\sffamily \small [JeuxCartes]}
@@ -69,13 +69,15 @@
 \setlength{\parindent}{0pt}
 \definecolor{LightGray}{gray}{0.9}
 
-\def\TPversion{0.2.3}
-\def\TPdate{25 Février 2023}
+\def\TPversion{0.2.4}
+\def\TPdate{18 Mars 2023}
 
 \usepackage[most]{tcolorbox}
 \usepackage[outputdir=build]{minted}
 \tcbuselibrary{minted}
 
+\usepackage[french]{babel}
+
 \tcbset{vignettes/.style={%
 		nobeforeafter,box align=base,boxsep=0pt,enhanced,sharp corners=all,rounded corners=southeast,%
 		boxrule=0.75pt,left=7pt,right=1pt,top=0pt,bottom=0.25pt,%
@@ -86,7 +88,16 @@
 		vignettes,%
 		colframe=CadetBlue,coltitle=white,colback=CadetBlue!5,%
 		overlay={\begin{tcbclipinterior}%
-				\fill[fill=lightgray!50]($(interior.south west)$) rectangle node[rotate=90]{\tiny \sffamily{\textcolor{CadetBlue}{\scalebox{0.6}[0.75]{\textbf{\LaTeX}}}}} ($(interior.north west)+(5pt,0pt)$);%
+				\fill[fill=lightgray!50]($(interior.south west)$) rectangle node[rotate=90]{\tiny \sffamily{\textcolor{CadetBlue}{\scalebox{0.75}[0.75]{\textbf{\LaTeX}}}}} ($(interior.north west)+(5pt,0pt)$);%
+		\end{tcbclipinterior}}
+	}
+}
+\tcbset{vignetteMaJ/.style={%
+		fontupper={\vphantom{pf}\footnotesize\ttfamily},
+		vignettes,%
+		colframe=ForestGreen!50!black,coltitle=white,colback=ForestGreen!25,%
+		overlay={\begin{tcbclipinterior}%
+				\fill[fill=ForestGreen!75]($(interior.south west)$) rectangle node[rotate=90]{\tiny \sffamily{\textcolor{Black}{\scalebox{0.85}[0.75]{\textbf{MàJ}}}}} ($(interior.north west)+(5pt,0pt)$);%
 		\end{tcbclipinterior}}
 	}
 }
@@ -110,7 +121,10 @@
 	colback=white,colframe=ForestGreen!75,title={\small \faPaperclip} Clés et options,fonttitle=\sffamily\bfseries,left=3pt,right=3pt,top=2pt,bottom=2pt,#1}
 
 %petite vignette tex
-\newcommand\ctex[1]{\tcbox[vignettelatex]{#1}}
+\newcommand\ctex[1]{\tcbox[vignettelatex]{#1}\xspace}
+
+%petite vignette màj
+\newcommand\cmaj[1]{\tcbox[vignetteMaJ]{#1}\xspace}
 
 \title{%
 \begin{minipage}{0.85\linewidth}
@@ -163,7 +177,7 @@ Une commande pour des cartes en version \og miniatures \fg{} (individuelle, main
 \vspace{0.5cm}
 
 \begin{center}
-	\MainCartesJeu[Eventail,EspH=0,EspV=0.1]{7K § 8P § DT § AP § 10C § AC § 8T § 2K § VC}\hspace{0.5cm}\MainCartesJeu[TypeJeu=Tarot,EspH=0.85,EspV=0.2]{Exc § 1AT § CC § 8T § 2K § 5AT § 2AT § DP § 7T § 10C § 19AT § VP}
+	\MainCartesJeu[StyleJeu=bicycl,Eventail,EspH=0,EspV=0.1]{7K § 8P § DT § AP § 10C § AC § 8T § 2K § VC}\hspace{0.5cm}\MainCartesJeu[TypeJeu=Tarot,EspH=0.85,EspV=0.2]{Exc § 1AT § CC § 8T § 2K § 5AT § 2AT § DP § 7T § 10C § 19AT § VP}
 \end{center}
 
 \hfill{}\textit{Merci aux membres du groupe \faFacebook{} du \og Coin \LaTeX{} \fg{} pour leur aide et leurs idées !}
@@ -195,23 +209,25 @@ Une commande pour des cartes en version \og miniatures \fg{} (individuelle, main
 
 \part{Historique}
 
-{\small \bverb|v0.2.3 |~:~~~~Ajout d'une clé \textsf{inverse} + dos Uno + style v5 pour le Poker
+{\small \bverb|v0.2.4|~:~~~~Ajout du style carte Poker \textsf{fr} + style Bicycle \textsf{bicycl} + ajout d'une clé \textsf{<StyleJeu>}
+
+{\small \bverb|v0.2.3|~:~~~~Ajout d'une clé \textsf{<inverse>} + dos Uno + style \textsf{v5} pour le Poker
 
-{\small \bverb|v0.2.2a|~:~~~~Ajout d'un style v4 pour le Poker
+{\small \bverb|v0.2.2|~:~~~~Ajout d'un style \textsf{v4} pour le Poker
 
-{\small \bverb|v0.2.1 |~:~~~~Correction du nom d'une carte Poker (v1)...
+{\small \bverb|v0.2.1|~:~~~~Correction du nom d'une carte Poker \textsf{v1}
 
-{\small \bverb|v0.2.0 |~:~~~~Modification du design des cartes (pdf pour Poker/Uno + png pour Tarot) + alternatives pour le Poker
+{\small \bverb|v0.2.0|~:~~~~Modification du design des cartes (pdf pour Poker/Uno + png pour Tarot) + alternatives pour le Poker
 
-{\small \bverb|v0.1.4 |~:~~~~Réduction de la taille des images \texttt{png}
+{\small \bverb|v0.1.4|~:~~~~Réduction de la taille des images \texttt{png}
 
-{\small \bverb|v0.1.3 |~:~~~~Ajout de cartes Uno (CC1.0 par AlexDer) + modification des commandes + rami
+{\small \bverb|v0.1.3|~:~~~~Ajout de cartes Uno (CC1.0 par AlexDer) + modification des commandes + rami
 
-{\small \bverb|v0.1.2 |~:~~~~Modification du nom (et de la source) des images de Tarot (CC0)
+{\small \bverb|v0.1.2|~:~~~~Modification du nom (et de la source) des images de Tarot (CC0)
 
-{\small \bverb|v0.1.1 |~:~~~~Ajout de commandes pour des mini-cartes
+{\small \bverb|v0.1.1|~:~~~~Ajout de commandes pour des mini-cartes
 
-{\small \bverb|v0.1   |~:~~~~Version initiale
+{\small \bverb|v0.1  |~:~~~~Version initiale
 
 \vfill~
 
@@ -229,13 +245,15 @@ L'idée de ce package est de proposer, comme le fait \ctex{pst-poker}, des comma
 Les cartes disponibles sont : :
 %
 \begin{itemize}
-	\item les cartes type \textsf{Poker v1} (Licence : LGPL-2.1 license)  \url{https://github.com/htdebeer/SVG-cards}
-	\item les cartes type \textsf{Poker v2} (Licence : Public Domain)  \url{https://tekeye.uk/playing_cards/svg-playing-cards}
-	\item les cartes type \textsf{Poker v3} (Licence : Public Domain) \url{https://www.me.uk/cards/}
-	\item les cartes type \textsf{Poker v4} (Licence : CC BY-SA 4.0) \url{https://commons.wikimedia.org/wiki/File:Computer_screen_playing_cards_deck.svg}
-	\item les cartes type \textsf{Poker v5} (Licence : Public Domain) \url{https://www.me.uk/cards/}
-	\item les cartes type \textsf{Tarot} (Licence : Public Domain) \url{https://freesvg.org/deck-of-french-tarot-playing-cards}
-	\item les cartes type \textsf{Uno} (Licence : MIT License) \url{https://eperezcosano.github.io/uno-part1/}
+	\item les cartes type \textsf{Poker v1} (LGPL-2.1 license)  \url{https://github.com/htdebeer/SVG-cards}
+	\item les cartes type \textsf{Poker v2} (Public Domain)  \url{https://tekeye.uk/playing_cards/svg-playing-cards}
+	\item les cartes type \textsf{Poker v3} (Public Domain) \url{https://www.me.uk/cards/}
+	\item les cartes type \textsf{Poker v4} (CC BY-SA 4.0) \url{https://commons.wikimedia.org/wiki/File:Computer_screen_playing_cards_deck.svg}
+	\item les cartes type \textsf{Poker v5} (Public Domain) \url{https://www.me.uk/cards/}
+	\item \cmaj{0.2.4} les cartes type \textsf{Poker fr} (LGPL-2.1 license) \url{https://svg-cards.sourceforge.net/}
+	\item \cmaj{0.2.4} les cartes type \textsf{bicycle} (LGPL-3.0 license) \url{https://github.com/tfbkny/blackjack}
+	\item les cartes type \textsf{Tarot} (Public Domain) \url{https://freesvg.org/deck-of-french-tarot-playing-cards}
+	\item les cartes type \textsf{Uno} (MIT License) \url{https://eperezcosano.github.io/uno-part1/}
 \end{itemize}
 \end{codeidee}
 
@@ -243,9 +261,8 @@ Les cartes disponibles sont : :
 Le {package} \ctex{JeuxCartes} charge les {packages} :
 
 \begin{itemize}
-	\item \ctex{tikz}, \ctex{pifont}, \ctex{xfp}, \ctex{pgffor}, \ctex{xinttools} ;
-	\item \ctex{listofitems}, \ctex{xstring} et \ctex{simplekv} ;
-	\item \ctex{randomlist}, \ctex{xcolor} avec les options \ctex{[table,svgnames]}.
+	\item \ctex{tikz}, \ctex{pifont}, \ctex{pgffor}, \ctex{xinttools} ;
+	\item \ctex{listofitems}, \ctex{xstring}, \ctex{simplekv} et \ctex{randomlist}.
 \end{itemize}
 \end{codeinfo}
 
@@ -323,8 +340,8 @@ Les \textsf{codes} seront présentés dans des \textsf{boîtes} \textcolor{red!7
 Les \textit{Jeux} disponibles sont :
 
 \begin{itemize}
-	\item \Cle{Poker(vX)}, \Cle{Tarot} et \Cle{Uno} pour l'affichage des cartes ;
-	\item \Cle{Poker(vX)}, \Cle{Bataille(vX)}, \Cle{Rami(vX)}, \Cle{Belote(vX)}, \Cle{Tarot}  et \Cle{Uno} pour les mains aléatoires ;
+	\item \Cle{Poker}, \Cle{Tarot} et \Cle{Uno} pour l'affichage des cartes ;
+	\item \Cle{Poker}, \Cle{Bataille}, \Cle{Rami}, \Cle{Belote}, \Cle{Tarot}  et \Cle{Uno} pour les mains aléatoires ;
 	\item \Cle{Poker} et \Cle{Tarot} pour les \textit{mini-}cartes.
 \end{itemize}
 \end{codeinfo}
@@ -361,9 +378,9 @@ Les \textit{Jeux} disponibles sont :
 \subsection{Introduction}
 
 \begin{codeinfo}
-La commande \ctex{AffCarteJeu} affiche une carte, avec un système de clés/options.
+La commande \ctex{\textbackslash AffCarteJeu} affiche une carte, avec un système de \textsf{clés/options}.
 
-La commande \ctex{AffCartesJeu} affiche une liste de cartes en mode \textit{côte à côte}, avec un système de clés/options.
+La commande \ctex{\textbackslash AffCartesJeu} affiche une liste de cartes en mode \textit{côte à côte}, avec un système de \textsf{clés/options}.
 \end{codeinfo}
 
 \begin{codetex}[]
@@ -427,7 +444,8 @@ Concernant les \Cle{options} :
 
 \begin{itemize}
 	\item la clé \Cle{Hauteur} correspond à la hauteur voulue, en cm, de la carte ; \hfill{}défaut \Cle{4.25}
-	\item la clé \Cle{TypeJeu} (parmi \Cle{Poker(vX)} ou \Cle{Tarot} ou \Cle{Uno}) pour spécifier les cartes à utiliser ; \hfill{}défaut \Cle{Poker}
+	\item la clé \Cle{TypeJeu} (parmi \Cle{Poker} ou \Cle{Tarot} ou \Cle{Uno}) pour spécifier les cartes à utiliser ; \hfill{}défaut \Cle{Poker}
+	\item \cmaj{0.2.4} la clé \Cle{Stylejeu} (parmi \Cle{v1}, \ldots, \Cle{v5}, \Cle{fr} ou \Cle{bicycl}) pour spécifier le style des cartes \textsf{Poker} ; \hfill{}défaut \Cle{v1}
 	\item la clé \Cle{Rotation} pour une éventuelle rotation de la carte ; \hfill{}défaut \Cle{0}
 	\item la clé \Cle{AlignementV} pour l'alignement vertical (lié à \ctex{raisebox} ou à \TikZ) ; \hfill{}défaut \Cle{0.5}
 	\item le booléen \Cle{Tikz} pour préciser que la carte est \textit{autonome}, dans un environnement \ctex{tikzpicture} ; \hfill{}défaut \Cle{false}
@@ -469,28 +487,29 @@ On obtient la main \AffCartesJeu[Hauteur=2,TypeJeu=Uno]{9B § 8R § P2J § P4 §
 \subsection{Designs disponibles pour les cartes classiques (Poker)}
 
 \begin{codeinfo}
-Il existe 5 versions de design des cartes \textit{classiques}, accessibles via les clés :
-
+Il existe 7 versions de design des cartes \textit{classiques}, accessibles via les clés :
+\vspace*{-0.75\baselineskip}
+\begin{multicols}{4}
 \begin{itemize}
-	\item \Cle{Poker} ;
-	\item \Cle{Pokerv2} ;
-	\item \Cle{Pokerv3} ;
-	\item \Cle{Pokerv4} ;
-	\item \Cle{Pokerv5}.
+	\item \Cle{v1} ;
+	\item \Cle{v2} ;
+	\item \Cle{v3} ;
+	\item \Cle{v4} ;
+	\item \Cle{v5} ;
+	\item \Cle{fr} \cmaj{0.2.4} ;
+	\item \Cle{bicycl} \cmaj{0.2.4}.
 \end{itemize}
+\end{multicols}
 \end{codeinfo}
 
 \begin{codetex}[]
-\textbf{Design v1} :\\
-\AffCartesJeu[Hauteur=2]{DK § AP § 10T § VP § 8T § RT § 9C} \\ \\
-\textbf{Design v2} :\\
-\AffCartesJeu[Hauteur=2,TypeJeu=Pokerv2]{DK § AP § 10T § VP § 8T § RT § 9C} \\ \\
-\textbf{Design v3} :\\
-\AffCartesJeu[Hauteur=2,TypeJeu=Pokerv3]{DK § AP § 10T § VP § 8T § RT § 9C} \\ \\
-\textbf{Design v4} :\\
-\AffCartesJeu[Hauteur=2,TypeJeu=Pokerv4]{DK § AP § 10T § VP § 8T § RT § 9C} \\ \\
-\textbf{Design v5} :\\
-\AffCartesJeu[Hauteur=2,TypeJeu=Pokerv5]{DK § AP § 10T § VP § 8T § RT § 9C} \\
+\textbf{Design v1} :\\ \AffCartesJeu[Hauteur=2,StyleJeu=v1]{DK § AP § 10T § VP § 8T § RT § 9C} \\ \\
+\textbf{Design v2} :\\ \AffCartesJeu[Hauteur=2,StyleJeu=v2]{DK § AP § 10T § VP § 8T § RT § 9C} \\ \\
+\textbf{Design v3} :\\ \AffCartesJeu[Hauteur=2,StyleJeu=v3]{DK § AP § 10T § VP § 8T § RT § 9C} \\ \\
+\textbf{Design v4} :\\ \AffCartesJeu[Hauteur=2,StyleJeu=v4]{DK § AP § 10T § VP § 8T § RT § 9C} \\ \\
+\textbf{Design v5} :\\ \AffCartesJeu[Hauteur=2,StyleJeu=v5]{DK § AP § 10T § VP § 8T § RT § 9C} \\ \\
+\textbf{Design fr} :\\ \AffCartesJeu[Hauteur=2,StyleJeu=fr]{DK § AP § 10T § VP § 8T § RT § 9C} \hfill\cmaj{0.2.4}\\ \\
+\textbf{Design bi} :\\ \AffCartesJeu[Hauteur=2,StyleJeu=bicycl]{DK § AP § 10T § VP § 8T § RT § 9C}\hfill\cmaj{0.2.4} \\
 \end{codetex}
 
 \pagebreak
@@ -524,7 +543,8 @@ Les \Cle{options} sont les suivantes :
 
 \begin{itemize}
 	\item la clé \Cle{Hauteur} correspond à la hauteur voulue, en cm, des cartes ; \hfill{}défaut \Cle{4.25}
-	\item la clé \Cle{TypeJeu} (parmi \Cle{Poker(vX)} ou \Cle{Tarot} ou \Cle{Uno}) pour spécifier les cartes à utiliser ; \hfill{}défaut \Cle{Poker}
+	\item la clé \Cle{TypeJeu} (parmi \Cle{Poker} ou \Cle{Tarot} ou \Cle{Uno}) pour spécifier les cartes à utiliser ; \hfill{}défaut \Cle{Poker}
+	\item \cmaj{0.2.4} la clé \Cle{Stylejeu} (parmi \Cle{v1}, \ldots, \Cle{v5}, \Cle{fr} ou \Cle{bicycl}) pour spécifier le style des cartes \textsf{Poker} ; \hfill{}défaut \Cle{v1}
 	\item la clé \Cle{EspH} correspond à coefficient d'espacement horizontal (\textit{proche} du cm en taille réelle) entre les cartes ; \hfill{}défaut \Cle{1}
 	\item la clé \Cle{EspH} correspond à coefficient d'espacement vertical (\textit{proche} du cm en taille réelle) entre les cartes ; \hfill{}défaut \Cle{0}
 	\item le booléen \Cle{Eventail} pour une présentation en éventail ; \hfill{}défaut \Cle{false}
@@ -600,7 +620,8 @@ Les \Cle{options} sont les suivantes :
 
 \begin{itemize}
 	\item la clé \Cle{Hauteur} correspond à la hauteur voulue, en cm, des cartes ; \hfill{}défaut \Cle{4.25}
-	\item la clé \Cle{TypeJeu} (parmi \Cle{Poker(vX)} ou \Cle{Belote(vX)} ou \Cle{Bataille(vX)} ou \Cle{Rami(vX)} ou \Cle{Uno} ou \Cle{Tarot}) ; \hfill{}défaut \Cle{Poker}
+	\item la clé \Cle{TypeJeu} (parmi \Cle{Poker} ou \Cle{Belote} ou \Cle{Bataille} ou \Cle{Rami} ou \Cle{Uno} ou \Cle{Tarot}) ; \hfill{}défaut \Cle{Poker}
+	\item \cmaj{0.2.4} la clé \Cle{Stylejeu} (parmi \Cle{v1}, \ldots, \Cle{v5}, \Cle{fr} ou \Cle{bicycl}) pour spécifier le style des cartes type \textsf{Poker/Belote/Rami/Bataille} ; \hfill{}défaut \Cle{v1}
 	\item la clé \Cle{EspH} correspond à coefficient d'espacement horizontal (\textit{proche} du cm en taille réelle) entre les cartes ; \hfill{}défaut \Cle{1}
 	\item la clé \Cle{EspH} correspond à coefficient d'espacement vertical (\textit{proche} du cm en taille réelle) entre les cartes ; \hfill{}défaut \Cle{0}
 	\item le booléen \Cle{Eventail} pour une présentation en éventail ; \hfill{}défaut \Cle{false}
@@ -614,10 +635,10 @@ Les \Cle{options} sont les suivantes :
 En ce qui concerne les \textit{jeux} disponibles (non modifiables) :
 
 \begin{itemize}
-	\item \Cle{Poker(vX)} : 52 cartes (sans Joker) ;
-	\item \Cle{Belote(vX)} : 32 cartes (sans Joker) ;
-	\item \Cle{Bataille(vX)} : 54 cartes (avec Jokers) ;
-	\item \Cle{Rami(vX)} : 108 cartes (avec Jokers) ;
+	\item \Cle{Poker} : 52 cartes (sans Joker) ;
+	\item \Cle{Belote} : 32 cartes (sans Joker) ;
+	\item \Cle{Bataille} : 54 cartes (avec Jokers) ;
+	\item \Cle{Rami} : 108 cartes (avec Jokers) ;
 	\item \Cle{Tarot} : 78 cartes ;
 	\item \Cle{Uno}.
 \end{itemize}
@@ -627,19 +648,19 @@ En ce qui concerne les \textit{jeux} disponibles (non modifiables) :
 
 \begin{codetex}[]
 \textbf{\large Belote v1 \& Belote v4 \& Belote v5 :} \\ \\
-\MainCartesJeuAleatoire[Hauteur=2.5,TypeJeu=Belote]{8} ou \MainCartesJeuAleatoire[Hauteur=2.5,TypeJeu=Belotev4]{8} ou \MainCartesJeuAleatoire[Hauteur=2.5,TypeJeu=Belotev5]{8}.\\ \\
-\textbf{\large Poker v1 \& Poker v3 :} \\ \\
-\MainCartesJeuAleatoire[Hauteur=2.5,Eventail,EspH=0,EspV=0.1]{5} ou  \MainCartesJeuAleatoire[Hauteur=2.5,Eventail,EspH=0,EspV=0.1,TypeJeu=Pokerv3]{5}.\\ \\
+\MainCartesJeuAleatoire[Hauteur=2.5,TypeJeu=Belote]{8} ou \MainCartesJeuAleatoire[Hauteur=2.5,TypeJeu=Belote,StyleJeu=v4]{8} ou \MainCartesJeuAleatoire[Hauteur=2.5,TypeJeu=Belote,StyleJeu=v5]{8}.\\ \\
+\textbf{\large Poker fr \& Poker v3 :} \\ \\
+\MainCartesJeuAleatoire[Hauteur=2.5,Eventail,EspH=0,EspV=0.1]{5} ou  \MainCartesJeuAleatoire[Hauteur=2.5,Eventail,EspH=0,EspV=0.1,StyleJeu=v3]{5}.\\ \\
 \textbf{\large Bataille v2 :} \\ \\
-\MainCartesJeuAleatoire[Hauteur=2.5,TypeJeu=Bataillev2]{27}\\ \\
+\MainCartesJeuAleatoire[Hauteur=2.5,TypeJeu=Bataille,StyleJeu=v2]{27}\\ \\
 \textbf{\large Tarot :} \\
 \MainCartesJeuAleatoire[Hauteur=3.25,TypeJeu=Tarot]{10} ou~
 \MainCartesJeuAleatoire[Hauteur=3.25,Eventail,TypeJeu=Tarot,EspH=0,EspV=0.1]{10}.
 \end{codetex}
 
 \begin{codetex}[]
-\textbf{\large Rami v2 :} \\ \\
-\MainCartesJeuAleatoire[Hauteur=3.75,TypeJeu=Ramiv2]{15}\\ \\
+\textbf{\large Rami bicycl :} \\ \\
+\MainCartesJeuAleatoire[Hauteur=3.75,TypeJeu=Rami,StyleJeu=bicycl]{15}\\ \\
 \textbf{\large Uno :} \\ \\
 \MainCartesJeuAleatoire[Hauteur=4,TypeJeu=Uno,Eventail,EspH=-0.1,Rotation=15,EspV=0.1]{7}
 \end{codetex}
@@ -694,14 +715,14 @@ Quelques \Cle{options} pour les \textit{mini-}cartes :
 
 \begin{itemize}
 	\item la clé \Cle{Largeur} pour gérer la largeur des miniatures ; \hfill{}défaut \Cle{0.55cm}
-	\item la clé \Cle{FondAtout} pour gérer la couleur de fond pour les atouts. \hfill{}défaut \Cle{PeachPuff}
+	\item la clé \Cle{FondAtout} pour gérer la couleur de fond pour les atouts. \hfill{}défaut \Cle{yellow}
 \end{itemize}
 \end{codecles}
 
 \begin{codetex}[]
 \foreach \EECARTE in {2,3,4,5,6,7,8,9,10,V,C,D,R,A}{\AffMiniCarteJeu[Largeur=0.75cm]{\EECARTE.K}}\\
-\AffMiniCarteJeu[FondAtout=LightSkyBlue,Largeur=0.75cm]{Exc}%
-\foreach \EECARTE in {1,2,...,21}{\AffMiniCarteJeu[FondAtout=LightSkyBlue,Largeur=0.75cm]{\EECARTE.AT}}
+\AffMiniCarteJeu[FondAtout=cyan,Largeur=0.75cm]{Exc}%
+\foreach \EECARTE in {1,2,...,21}{\AffMiniCarteJeu[FondAtout=cyan,Largeur=0.75cm]{\EECARTE.AT}}
 \end{codetex}
 
 \subsection{\textit{Mini}-Mains et \textit{mini}-mains aléatoires}
@@ -757,15 +778,15 @@ Dos disponibles : \texttt{Dos}
 
 \medskip
 
-\xintFor #1 in {2,3,4,5,6,7,8,9,10,V,D,R,A}\do{\AffCarteJeu[Hauteur=1.85]{#1P}}
+\xintFor #1 in {2,3,4,5,6,7,8,9,10,V,D,R,A}\do{\AffCarteJeu[Hauteur=1.85,StyleJeu=v1]{#1P}}
 
-\xintFor #1 in {2,3,4,5,6,7,8,9,10,V,D,R,A}\do{\AffCarteJeu[Hauteur=1.85]{#1C}}
+\xintFor #1 in {2,3,4,5,6,7,8,9,10,V,D,R,A}\do{\AffCarteJeu[Hauteur=1.85,StyleJeu=v1]{#1C}}
 
-\xintFor #1 in {2,3,4,5,6,7,8,9,10,V,D,R,A}\do{\AffCarteJeu[Hauteur=1.85]{#1K}}
+\xintFor #1 in {2,3,4,5,6,7,8,9,10,V,D,R,A}\do{\AffCarteJeu[Hauteur=1.85,StyleJeu=v1]{#1K}}
 
-\xintFor #1 in {2,3,4,5,6,7,8,9,10,V,D,R,A}\do{\AffCarteJeu[Hauteur=1.85]{#1T}}
+\xintFor #1 in {2,3,4,5,6,7,8,9,10,V,D,R,A}\do{\AffCarteJeu[Hauteur=1.85,StyleJeu=v1]{#1T}}
 
-\AffCarteJeu[Hauteur=1.85]{JN}\AffCarteJeu[Hauteur=1.85]{JR}\AffCarteJeu[Hauteur=1.85]{Dos}%
+\AffCarteJeu[Hauteur=1.85,StyleJeu=v1]{JN}\AffCarteJeu[Hauteur=1.85,StyleJeu=v1]{JR}\AffCarteJeu[Hauteur=1.85,StyleJeu=v1]{Dos}%
 %\xintFor #1 in {Bleu,BleuVert,Fuchsia,Gris,Jaune,Marron,Navy,Noir,Olive,Vert,Violet}\do{\AffCarteJeu[Hauteur=1.75]{Dos#1}}
 
 \subsection{Poker/Bataille/Belote/Rami (v2)}
@@ -774,15 +795,15 @@ Dos disponibles : \texttt{DosBleu} ou \texttt{DosRouge} ou \texttt{DosBleu2} ou
 
 \medskip
 
-\xintFor #1 in {2,3,4,5,6,7,8,9,10,V,D,R,A}\do{\AffCarteJeu[TypeJeu=Pokerv2,Hauteur=1.85]{#1P}}
+\xintFor #1 in {2,3,4,5,6,7,8,9,10,V,D,R,A}\do{\AffCarteJeu[StyleJeu=v2,Hauteur=1.85]{#1P}}
 
-\xintFor #1 in {2,3,4,5,6,7,8,9,10,V,D,R,A}\do{\AffCarteJeu[TypeJeu=Pokerv2,Hauteur=1.85]{#1C}}
+\xintFor #1 in {2,3,4,5,6,7,8,9,10,V,D,R,A}\do{\AffCarteJeu[StyleJeu=v2,Hauteur=1.85]{#1C}}
 
-\xintFor #1 in {2,3,4,5,6,7,8,9,10,V,D,R,A}\do{\AffCarteJeu[TypeJeu=Pokerv2,Hauteur=1.85]{#1K}}
+\xintFor #1 in {2,3,4,5,6,7,8,9,10,V,D,R,A}\do{\AffCarteJeu[StyleJeu=v2,Hauteur=1.85]{#1K}}
 
-\xintFor #1 in {2,3,4,5,6,7,8,9,10,V,D,R,A}\do{\AffCarteJeu[TypeJeu=Pokerv2,Hauteur=1.85]{#1T}}
+\xintFor #1 in {2,3,4,5,6,7,8,9,10,V,D,R,A}\do{\AffCarteJeu[StyleJeu=v2,Hauteur=1.85]{#1T}}
 
-\AffCarteJeu[TypeJeu=Pokerv2,Hauteur=1.85]{JN}\AffCarteJeu[TypeJeu=Pokerv2,Hauteur=1.85]{JR}\AffCarteJeu[TypeJeu=Pokerv2,Hauteur=1.85]{DosBleu}\AffCarteJeu[TypeJeu=Pokerv2,Hauteur=1.85]{DosRouge}\AffCarteJeu[TypeJeu=Pokerv2,Hauteur=1.85]{DosBleu2}\AffCarteJeu[TypeJeu=Pokerv2,Hauteur=1.85]{DosRouge2}%
+\AffCarteJeu[StyleJeu=v2,Hauteur=1.85]{JN}\AffCarteJeu[StyleJeu=v2,Hauteur=1.85]{JR}\AffCarteJeu[StyleJeu=v2,Hauteur=1.85]{DosBleu}\AffCarteJeu[StyleJeu=v2,Hauteur=1.85]{DosRouge}\AffCarteJeu[StyleJeu=v2,Hauteur=1.85]{DosBleu2}\AffCarteJeu[StyleJeu=v2,Hauteur=1.85]{DosRouge2}%
 %\xintFor #1 in {Bleu,BleuVert,Fuchsia,Gris,Jaune,Marron,Navy,Noir,Olive,Vert,Violet}\do{\AffCarteJeu[Hauteur=1.75]{Dos#1}}
 
 \pagebreak
@@ -793,15 +814,15 @@ Dos disponibles : \texttt{DosNoir} ou \texttt{DosRouge}
 
 \medskip
 
-\xintFor #1 in {2,3,4,5,6,7,8,9,10,V,D,R,A}\do{\AffCarteJeu[TypeJeu=Pokerv3,Hauteur=1.85]{#1P}}
+\xintFor #1 in {2,3,4,5,6,7,8,9,10,V,D,R,A}\do{\AffCarteJeu[StyleJeu=v3,Hauteur=1.85]{#1P}}
 
-\xintFor #1 in {2,3,4,5,6,7,8,9,10,V,D,R,A}\do{\AffCarteJeu[TypeJeu=Pokerv3,Hauteur=1.85]{#1C}}
+\xintFor #1 in {2,3,4,5,6,7,8,9,10,V,D,R,A}\do{\AffCarteJeu[StyleJeu=v3,Hauteur=1.85]{#1C}}
 
-\xintFor #1 in {2,3,4,5,6,7,8,9,10,V,D,R,A}\do{\AffCarteJeu[TypeJeu=Pokerv3,Hauteur=1.85]{#1K}}
+\xintFor #1 in {2,3,4,5,6,7,8,9,10,V,D,R,A}\do{\AffCarteJeu[StyleJeu=v3,Hauteur=1.85]{#1K}}
 
-\xintFor #1 in {2,3,4,5,6,7,8,9,10,V,D,R,A}\do{\AffCarteJeu[TypeJeu=Pokerv3,Hauteur=1.85]{#1T}}
+\xintFor #1 in {2,3,4,5,6,7,8,9,10,V,D,R,A}\do{\AffCarteJeu[StyleJeu=v3,Hauteur=1.85]{#1T}}
 
-\AffCarteJeu[TypeJeu=Pokerv3,Hauteur=1.85]{JN}\AffCarteJeu[TypeJeu=Pokerv3,Hauteur=1.85]{JR}\AffCarteJeu[TypeJeu=Pokerv3,Hauteur=1.85]{DosNoir}\AffCarteJeu[TypeJeu=Pokerv3,Hauteur=1.85]{DosRouge}%
+\AffCarteJeu[StyleJeu=v3,Hauteur=1.85]{JN}\AffCarteJeu[StyleJeu=v3,Hauteur=1.85]{JR}\AffCarteJeu[StyleJeu=v3,Hauteur=1.85]{DosNoir}\AffCarteJeu[StyleJeu=v3,Hauteur=1.85]{DosRouge}%
 
 \subsection{Poker/Bataille/Belote/Rami (v4)}
 
@@ -809,15 +830,15 @@ Dos disponibles : \texttt{DosBleu} ou \texttt{DosRouge}
 
 \medskip
 
-\xintFor #1 in {2,3,4,5,6,7,8,9,10,V,D,R,A}\do{\AffCarteJeu[TypeJeu=Pokerv4,Hauteur=1.85]{#1P}}
+\xintFor #1 in {2,3,4,5,6,7,8,9,10,V,D,R,A}\do{\AffCarteJeu[StyleJeu=v4,Hauteur=1.85]{#1P}}
 
-\xintFor #1 in {2,3,4,5,6,7,8,9,10,V,D,R,A}\do{\AffCarteJeu[TypeJeu=Pokerv4,Hauteur=1.85]{#1C}}
+\xintFor #1 in {2,3,4,5,6,7,8,9,10,V,D,R,A}\do{\AffCarteJeu[StyleJeu=v4,Hauteur=1.85]{#1C}}
 
-\xintFor #1 in {2,3,4,5,6,7,8,9,10,V,D,R,A}\do{\AffCarteJeu[TypeJeu=Pokerv4,Hauteur=1.85]{#1K}}
+\xintFor #1 in {2,3,4,5,6,7,8,9,10,V,D,R,A}\do{\AffCarteJeu[StyleJeu=v4,Hauteur=1.85]{#1K}}
 
-\xintFor #1 in {2,3,4,5,6,7,8,9,10,V,D,R,A}\do{\AffCarteJeu[TypeJeu=Pokerv4,Hauteur=1.85]{#1T}}
+\xintFor #1 in {2,3,4,5,6,7,8,9,10,V,D,R,A}\do{\AffCarteJeu[StyleJeu=v4,Hauteur=1.85]{#1T}}
 
-\AffCarteJeu[TypeJeu=Pokerv4,Hauteur=1.85]{JN}\AffCarteJeu[TypeJeu=Pokerv4,Hauteur=1.85]{JR}\AffCarteJeu[TypeJeu=Pokerv4,Hauteur=1.85]{DosRouge}\AffCarteJeu[TypeJeu=Pokerv4,Hauteur=1.85]{DosBleu}%
+\AffCarteJeu[StyleJeu=v4,Hauteur=1.85]{JN}\AffCarteJeu[StyleJeu=v4,Hauteur=1.85]{JR}\AffCarteJeu[StyleJeu=v4,Hauteur=1.85]{DosRouge}\AffCarteJeu[StyleJeu=v4,Hauteur=1.85]{DosBleu}%
 
 \pagebreak
 
@@ -827,15 +848,49 @@ Dos disponibles : \texttt{DosNoir} ou \texttt{DosRouge}
 
 \medskip
 
-\xintFor #1 in {2,3,4,5,6,7,8,9,10,V,D,R,A}\do{\AffCarteJeu[TypeJeu=Pokerv5,Hauteur=1.85]{#1P}}
+\xintFor #1 in {2,3,4,5,6,7,8,9,10,V,D,R,A}\do{\AffCarteJeu[StyleJeu=v5,Hauteur=1.85]{#1P}}
+
+\xintFor #1 in {2,3,4,5,6,7,8,9,10,V,D,R,A}\do{\AffCarteJeu[StyleJeu=v5,Hauteur=1.85]{#1C}}
+
+\xintFor #1 in {2,3,4,5,6,7,8,9,10,V,D,R,A}\do{\AffCarteJeu[StyleJeu=v5,Hauteur=1.85]{#1K}}
+
+\xintFor #1 in {2,3,4,5,6,7,8,9,10,V,D,R,A}\do{\AffCarteJeu[StyleJeu=v5,Hauteur=1.85]{#1T}}
+
+\AffCarteJeu[StyleJeu=v5,Hauteur=1.85]{JN}\AffCarteJeu[StyleJeu=v5,Hauteur=1.85]{JR}\AffCarteJeu[StyleJeu=v5,Hauteur=1.85]{DosRouge}\AffCarteJeu[StyleJeu=v5,Hauteur=1.85]{DosNoir}%
+
+\subsection{Poker/Bataille/Belote/Rami (fr)}
+
+Dos disponibles : \texttt{DosBleu} ou \texttt{DosRouge}
+
+\medskip
+
+\xintFor #1 in {2,3,4,5,6,7,8,9,10,V,D,R,A}\do{\AffCarteJeu[StyleJeu=fr,Hauteur=1.85]{#1P}}
+
+\xintFor #1 in {2,3,4,5,6,7,8,9,10,V,D,R,A}\do{\AffCarteJeu[StyleJeu=fr,Hauteur=1.85]{#1C}}
+
+\xintFor #1 in {2,3,4,5,6,7,8,9,10,V,D,R,A}\do{\AffCarteJeu[StyleJeu=fr,Hauteur=1.85]{#1K}}
+
+\xintFor #1 in {2,3,4,5,6,7,8,9,10,V,D,R,A}\do{\AffCarteJeu[StyleJeu=fr,Hauteur=1.85]{#1T}}
+
+\AffCarteJeu[StyleJeu=fr,Hauteur=1.85]{JN}\AffCarteJeu[StyleJeu=fr,Hauteur=1.85]{JR}\AffCarteJeu[StyleJeu=fr,Hauteur=1.85]{DosRouge}\AffCarteJeu[StyleJeu=fr,Hauteur=1.85]{DosBleu}%
+
+\pagebreak
+
+\subsection{Poker/Bataille/Belote/Rami (bic)}
+
+Dos disponibles : \texttt{DosBleu} ou \texttt{DosRouge}
+
+\medskip
+
+\xintFor #1 in {2,3,4,5,6,7,8,9,10,V,D,R,A}\do{\AffCarteJeu[StyleJeu=bicycl,Hauteur=1.85]{#1P}}
 
-\xintFor #1 in {2,3,4,5,6,7,8,9,10,V,D,R,A}\do{\AffCarteJeu[TypeJeu=Pokerv5,Hauteur=1.85]{#1C}}
+\xintFor #1 in {2,3,4,5,6,7,8,9,10,V,D,R,A}\do{\AffCarteJeu[StyleJeu=bicycl,Hauteur=1.85]{#1C}}
 
-\xintFor #1 in {2,3,4,5,6,7,8,9,10,V,D,R,A}\do{\AffCarteJeu[TypeJeu=Pokerv5,Hauteur=1.85]{#1K}}
+\xintFor #1 in {2,3,4,5,6,7,8,9,10,V,D,R,A}\do{\AffCarteJeu[StyleJeu=bicycl,Hauteur=1.85]{#1K}}
 
-\xintFor #1 in {2,3,4,5,6,7,8,9,10,V,D,R,A}\do{\AffCarteJeu[TypeJeu=Pokerv5,Hauteur=1.85]{#1T}}
+\xintFor #1 in {2,3,4,5,6,7,8,9,10,V,D,R,A}\do{\AffCarteJeu[StyleJeu=bicycl,Hauteur=1.85]{#1T}}
 
-\AffCarteJeu[TypeJeu=Pokerv5,Hauteur=1.85]{JN}\AffCarteJeu[TypeJeu=Pokerv5,Hauteur=1.85]{JR}\AffCarteJeu[TypeJeu=Pokerv3,Hauteur=1.85]{DosRouge}\AffCarteJeu[TypeJeu=Pokerv5,Hauteur=1.85]{DosNoir}%
+\AffCarteJeu[StyleJeu=bicycl,Hauteur=1.85]{JN}\AffCarteJeu[StyleJeu=bicycl,Hauteur=1.85]{JR}\AffCarteJeu[StyleJeu=bicycl,Hauteur=1.85]{DosRouge}\AffCarteJeu[StyleJeu=bicycl,Hauteur=1.85]{DosBleu}%
 
 \subsection{Cartes Tarot}
 
@@ -903,12 +958,12 @@ L'\textit{origine} des cartes est fixée, au coin bas-gauche, et la \Cle{Rotatio
 \begin{tikzpicture}
 	\draw[thin,lightgray] (-5,-5) grid (5,3) ; %grille rajoutée pour la lisibilité du code
 	\foreach \ptsupport in {(0,0),(3,-4),(-3,-1),(-2,-3.5),(2,2.75),(-4.5,-4.5),,(1,-2.5)}%
-		{\filldraw[Gray] \ptsupport circle[radius=2pt] ;}  %poits rajouté pour la lisibilité du code
+		{\filldraw[gray] \ptsupport circle[radius=2pt] ;}  %points rajouté pour la lisibilité du code
 	\foreach \x in {-5,-4,...,5} \draw[lightgray] (\x,-5) node[below,font=\small] {$\x$} ;
 	\foreach \y in {-5,-4,...,3} \draw[lightgray] (-5,\y) node[left,font=\small] {$\y$} ;
 	\AffCarteJeu[Hauteur=2,Tikz=true,TikzAutonome=false]%
 		{10C}
-	\AffCarteJeu[TypeJeu=Pokerv2,Hauteur=2.5,Tikz=true,TikzAutonome=false,DecalageX=3,DecalageY=-4]%
+	\AffCarteJeu[StyleJeu=v2,Hauteur=2.5,Tikz=true,TikzAutonome=false,DecalageX=3,DecalageY=-4]%
 		{JN}
 	\AffCarteJeu[Hauteur=3,Tikz=true,TikzAutonome=false,DecalageX=-3,DecalageY=-1,Rotation=20]%
 		{JR}
@@ -920,7 +975,7 @@ L'\textit{origine} des cartes est fixée, au coin bas-gauche, et la \Cle{Rotatio
 	\AffCarteJeu[TypeJeu=Uno,Hauteur=2,Tikz=true,TikzAutonome=false,DecalageX=-4.5,DecalageY=-4.5]%
 		{P4}
 	\AffCarteJeu%
-		[TypeJeu=Pokerv4,Hauteur=1.75,Tikz=true,TikzAutonome=false,Rotation=-10,DecalageX=1,DecalageY=-2.5]%
+		[StyleJeu=v4,Hauteur=1.75,Tikz=true,TikzAutonome=false,Rotation=-10,DecalageX=1,DecalageY=-2.5]%
 		{RP}
 \end{tikzpicture}
 \end{codetex}
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-10C.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-10C.pdf
new file mode 100644
index 0000000000..4ad326b690
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-10C.pdf
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-10K.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-10K.pdf
new file mode 100644
index 0000000000..9be209cc9e
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-10K.pdf
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-10P.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-10P.pdf
new file mode 100644
index 0000000000..bb56c47cfb
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-10P.pdf
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-10T.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-10T.pdf
new file mode 100644
index 0000000000..975b7e8087
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-10T.pdf
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-2C.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-2C.pdf
new file mode 100644
index 0000000000..f8e7009274
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-2C.pdf
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-2K.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-2K.pdf
new file mode 100644
index 0000000000..bddec87453
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-2K.pdf
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-2P.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-2P.pdf
new file mode 100644
index 0000000000..f4cc44b58a
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-2P.pdf
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-2T.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-2T.pdf
new file mode 100644
index 0000000000..0d9ef07904
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-2T.pdf
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-3C.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-3C.pdf
new file mode 100644
index 0000000000..ef67c1132b
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-3C.pdf
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-3K.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-3K.pdf
new file mode 100644
index 0000000000..b46c379c13
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-3K.pdf
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-3P.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-3P.pdf
new file mode 100644
index 0000000000..ff4036f80d
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-3P.pdf
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-3T.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-3T.pdf
new file mode 100644
index 0000000000..d61d8810ae
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-3T.pdf
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-4C.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-4C.pdf
new file mode 100644
index 0000000000..f27b9f9873
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-4C.pdf
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-4K.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-4K.pdf
new file mode 100644
index 0000000000..b842544514
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-4K.pdf
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-4P.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-4P.pdf
new file mode 100644
index 0000000000..40de7bfa8e
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-4P.pdf
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-4T.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-4T.pdf
new file mode 100644
index 0000000000..c68c98b9a0
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-4T.pdf
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-5C.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-5C.pdf
new file mode 100644
index 0000000000..17ddda9257
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-5C.pdf
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-5K.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-5K.pdf
new file mode 100644
index 0000000000..a2117ddf38
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-5K.pdf
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-5P.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-5P.pdf
new file mode 100644
index 0000000000..cd55583dae
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-5P.pdf
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-5T.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-5T.pdf
new file mode 100644
index 0000000000..aef4763d9f
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-5T.pdf
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-6C.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-6C.pdf
new file mode 100644
index 0000000000..e4d20e1f2b
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-6C.pdf
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-6K.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-6K.pdf
new file mode 100644
index 0000000000..adf94585a7
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-6K.pdf
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-6P.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-6P.pdf
new file mode 100644
index 0000000000..66b7a3c3e4
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-6P.pdf
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-6T.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-6T.pdf
new file mode 100644
index 0000000000..3e54d161bc
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-6T.pdf
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-7C.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-7C.pdf
new file mode 100644
index 0000000000..2b153dde68
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-7C.pdf
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-7K.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-7K.pdf
new file mode 100644
index 0000000000..f786953c4b
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-7K.pdf
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-7P.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-7P.pdf
new file mode 100644
index 0000000000..a2d510e9aa
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-7P.pdf
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-7T.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-7T.pdf
new file mode 100644
index 0000000000..6e38543e32
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-7T.pdf
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-8C.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-8C.pdf
new file mode 100644
index 0000000000..bb51e314b2
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-8C.pdf
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-8K.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-8K.pdf
new file mode 100644
index 0000000000..320c41ecab
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-8K.pdf
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-8P.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-8P.pdf
new file mode 100644
index 0000000000..94f1383823
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-8P.pdf
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-8T.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-8T.pdf
new file mode 100644
index 0000000000..5716f364bc
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-8T.pdf
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-9C.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-9C.pdf
new file mode 100644
index 0000000000..04da204df8
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-9C.pdf
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-9K.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-9K.pdf
new file mode 100644
index 0000000000..fa3c156764
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-9K.pdf
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-9P.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-9P.pdf
new file mode 100644
index 0000000000..e04f4318d6
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-9P.pdf
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-9T.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-9T.pdf
new file mode 100644
index 0000000000..67c5185f99
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-9T.pdf
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-AC.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-AC.pdf
new file mode 100644
index 0000000000..16398e779a
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-AC.pdf
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-AK.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-AK.pdf
new file mode 100644
index 0000000000..cbe3b7b271
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-AK.pdf
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-AP.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-AP.pdf
new file mode 100644
index 0000000000..6f30c87833
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-AP.pdf
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-AT.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-AT.pdf
new file mode 100644
index 0000000000..2c617c3565
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-AT.pdf
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-DC.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-DC.pdf
new file mode 100644
index 0000000000..9b49ceec16
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-DC.pdf
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-DK.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-DK.pdf
new file mode 100644
index 0000000000..bdeedededb
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-DK.pdf
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-DP.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-DP.pdf
new file mode 100644
index 0000000000..c6f44ca4e1
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-DP.pdf
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-DT.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-DT.pdf
new file mode 100644
index 0000000000..1b3d279c2e
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-DT.pdf
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-DosBleu.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-DosBleu.pdf
new file mode 100644
index 0000000000..f569a19858
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-DosBleu.pdf
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-DosRouge.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-DosRouge.pdf
new file mode 100644
index 0000000000..09c7b32c22
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-DosRouge.pdf
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-JN.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-JN.pdf
new file mode 100644
index 0000000000..ac36b4c188
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-JN.pdf
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-JR.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-JR.pdf
new file mode 100644
index 0000000000..28414290b4
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-JR.pdf
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-RC.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-RC.pdf
new file mode 100644
index 0000000000..145d34040f
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-RC.pdf
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-RK.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-RK.pdf
new file mode 100644
index 0000000000..38e448802e
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-RK.pdf
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-RP.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-RP.pdf
new file mode 100644
index 0000000000..7558c9dfaa
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-RP.pdf
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-RT.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-RT.pdf
new file mode 100644
index 0000000000..38cdab31aa
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-RT.pdf
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-VC.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-VC.pdf
new file mode 100644
index 0000000000..58209aa897
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-VC.pdf
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-VK.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-VK.pdf
new file mode 100644
index 0000000000..a9cc425f17
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-VK.pdf
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-VP.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-VP.pdf
new file mode 100644
index 0000000000..127e34e285
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-VP.pdf
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-VT.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-VT.pdf
new file mode 100644
index 0000000000..856a00e082
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRbic-VT.pdf
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-10C.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-10C.pdf
new file mode 100644
index 0000000000..d3ea15096c
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-10C.pdf
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-10K.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-10K.pdf
new file mode 100644
index 0000000000..f9064ca98a
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-10K.pdf
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-10P.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-10P.pdf
new file mode 100644
index 0000000000..2f88d2b495
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-10P.pdf
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-10T.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-10T.pdf
new file mode 100644
index 0000000000..53926efa75
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-10T.pdf
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-2C.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-2C.pdf
new file mode 100644
index 0000000000..8f970c732a
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-2C.pdf
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-2K.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-2K.pdf
new file mode 100644
index 0000000000..36935196da
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-2K.pdf
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-2P.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-2P.pdf
new file mode 100644
index 0000000000..9c9cf1b4c4
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-2P.pdf
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-2T.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-2T.pdf
new file mode 100644
index 0000000000..6531cee845
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-2T.pdf
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-3C.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-3C.pdf
new file mode 100644
index 0000000000..360a11bace
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-3C.pdf
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-3K.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-3K.pdf
new file mode 100644
index 0000000000..128abdb8da
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-3K.pdf
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-3P.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-3P.pdf
new file mode 100644
index 0000000000..24a2dec75f
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-3P.pdf
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-3T.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-3T.pdf
new file mode 100644
index 0000000000..7bf8c9319f
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-3T.pdf
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-4C.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-4C.pdf
new file mode 100644
index 0000000000..ab1bf3d22f
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-4C.pdf
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-4K.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-4K.pdf
new file mode 100644
index 0000000000..0e2576c0f2
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-4K.pdf
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-4P.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-4P.pdf
new file mode 100644
index 0000000000..af9bb0f956
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-4P.pdf
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-4T.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-4T.pdf
new file mode 100644
index 0000000000..21037bf381
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-4T.pdf
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-5C.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-5C.pdf
new file mode 100644
index 0000000000..82bc4a8b16
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-5C.pdf
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-5K.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-5K.pdf
new file mode 100644
index 0000000000..804916da41
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-5K.pdf
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-5P.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-5P.pdf
new file mode 100644
index 0000000000..2b3b227593
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-5P.pdf
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-5T.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-5T.pdf
new file mode 100644
index 0000000000..0bdfc70d09
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-5T.pdf
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-6C.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-6C.pdf
new file mode 100644
index 0000000000..ec7f91cfce
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-6C.pdf
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-6K.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-6K.pdf
new file mode 100644
index 0000000000..18a15ed861
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-6K.pdf
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-6P.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-6P.pdf
new file mode 100644
index 0000000000..26d4120fed
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-6P.pdf
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-6T.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-6T.pdf
new file mode 100644
index 0000000000..519349a547
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-6T.pdf
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-7C.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-7C.pdf
new file mode 100644
index 0000000000..28800f4ad3
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-7C.pdf
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-7K.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-7K.pdf
new file mode 100644
index 0000000000..36fb4123d3
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-7K.pdf
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-7P.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-7P.pdf
new file mode 100644
index 0000000000..00454470a4
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-7P.pdf
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-7T.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-7T.pdf
new file mode 100644
index 0000000000..8ce9fd17be
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-7T.pdf
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-8C.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-8C.pdf
new file mode 100644
index 0000000000..ad92a53df1
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-8C.pdf
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-8K.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-8K.pdf
new file mode 100644
index 0000000000..8bf8ea2d15
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-8K.pdf
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-8P.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-8P.pdf
new file mode 100644
index 0000000000..2abac1f7fd
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-8P.pdf
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-8T.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-8T.pdf
new file mode 100644
index 0000000000..c079d0c4c9
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-8T.pdf
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-9C.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-9C.pdf
new file mode 100644
index 0000000000..9901f3574d
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-9C.pdf
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-9K.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-9K.pdf
new file mode 100644
index 0000000000..6aac0f9f31
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-9K.pdf
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-9P.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-9P.pdf
new file mode 100644
index 0000000000..f0dbb861aa
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-9P.pdf
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-9T.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-9T.pdf
new file mode 100644
index 0000000000..b49b71d9e4
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-9T.pdf
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-AC.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-AC.pdf
new file mode 100644
index 0000000000..0e86ce2bce
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-AC.pdf
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-AK.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-AK.pdf
new file mode 100644
index 0000000000..6ea1e4d82f
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-AK.pdf
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-AP.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-AP.pdf
new file mode 100644
index 0000000000..8c17ced4af
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-AP.pdf
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-AT.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-AT.pdf
new file mode 100644
index 0000000000..a7621fa99e
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-AT.pdf
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-DC.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-DC.pdf
new file mode 100644
index 0000000000..d88f1e264a
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-DC.pdf
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-DK.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-DK.pdf
new file mode 100644
index 0000000000..cc1764f7ac
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-DK.pdf
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-DP.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-DP.pdf
new file mode 100644
index 0000000000..97ba07ef05
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-DP.pdf
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-DT.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-DT.pdf
new file mode 100644
index 0000000000..9136fc1377
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-DT.pdf
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-DosBleu.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-DosBleu.pdf
new file mode 100644
index 0000000000..b740f37ff1
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-DosBleu.pdf
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-DosRouge.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-DosRouge.pdf
new file mode 100644
index 0000000000..3fdcce6e66
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-DosRouge.pdf
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-JN.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-JN.pdf
new file mode 100644
index 0000000000..8803b227d4
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-JN.pdf
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-JR.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-JR.pdf
new file mode 100644
index 0000000000..dd458024f2
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-JR.pdf
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-RC.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-RC.pdf
new file mode 100644
index 0000000000..d98e0172d0
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-RC.pdf
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-RK.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-RK.pdf
new file mode 100644
index 0000000000..97da1a445e
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-RK.pdf
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-RP.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-RP.pdf
new file mode 100644
index 0000000000..160cd14e00
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-RP.pdf
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-RT.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-RT.pdf
new file mode 100644
index 0000000000..7183bb13d1
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-RT.pdf
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-VC.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-VC.pdf
new file mode 100644
index 0000000000..a44243ebeb
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-VC.pdf
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-VK.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-VK.pdf
new file mode 100644
index 0000000000..26bf0f2cb7
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-VK.pdf
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-VP.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-VP.pdf
new file mode 100644
index 0000000000..18e137c04a
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-VP.pdf
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-VT.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-VT.pdf
new file mode 100644
index 0000000000..202c4ec5df
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRfr-VT.pdf
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv3-JS.pdf b/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv3-JS.pdf
deleted file mode 100644
index e84827104b..0000000000
--- a/macros/latex/contrib/jeuxcartes/tex/CaJ-PokeRv3-JS.pdf
+++ /dev/null
diff --git a/macros/latex/contrib/jeuxcartes/tex/JeuxCartes.sty b/macros/latex/contrib/jeuxcartes/tex/JeuxCartes.sty
index b5f2b94ac5..b0579a4086 100644
--- a/macros/latex/contrib/jeuxcartes/tex/JeuxCartes.sty
+++ b/macros/latex/contrib/jeuxcartes/tex/JeuxCartes.sty
@@ -1,38 +1,38 @@
-% Author                         : C. Pierquet
-% licence                        : Released under the LaTeX Project Public License v1.3c or later, see http://www.latex-project.org/lppl.txtf
-% Poker v1 cards Image's Licence : LGPL-2.1 license https://github.com/htdebeer/SVG-cards
-% Poker v2 cards Image's Licence : Public Domain https://tekeye.uk/playing_cards/svg-playing-cards
-% Poker v3 cards Image's Licence : Public Domain https://www.me.uk/cards/
-% Poker v4 cards Image's Licence : CC BY-SA 4.0) https://commons.wikimedia.org/wiki/File:Computer_screen_playing_cards_deck.svg
-% Poker v5 cards Image's Licence : Public Domain https://www.me.uk/cards/
-% Tarot v1 cards Image's Licence : Public Domain https://freesvg.org/deck-of-french-tarot-playing-cards
-% Uno v1 cards Image's Licence   : MIT License https://eperezcosano.github.io/uno-part1/
+% Author.........................: C. Pierquet
+% licence........................: Released under the LaTeX Project Public License v1.3c or later, see http://www.latex-project.org/lppl.txtf
+% Poker v1 cards Image's Licence.: LGPL-2.1 license https://github.com/htdebeer/SVG-cards
+% Poker v2 cards Image's Licence.: Public Domain https://tekeye.uk/playing_cards/svg-playing-cards
+% Poker v3 cards Image's Licence.: Public Domain https://www.me.uk/cards/
+% Poker v4 cards Image's Licence.: CC BY-SA 4.0 https://commons.wikimedia.org/wiki/File:Computer_screen_playing_cards_deck.svg
+% Poker v5 cards Image's Licence.: Public Domain https://www.me.uk/cards/
+% Poker fr cards Image's Licence.: LGPL-2.1 license https://svg-cards.sourceforge.net/
+% Poker bi cards Image's Licence.: LGPL-3 license https://github.com/tfbkny/blackjack
+% Tarot v1 cards Image's Licence.: Public Domain https://freesvg.org/deck-of-french-tarot-playing-cards
+% Uno   v1 cards Image's Licence.: MIT License https://eperezcosano.github.io/uno-part1/
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{JeuxCartes}[2023/02/25 v0.2.3 Jeux de cartes]
-% 0.2.3		Ajout d'une option pour présenter une main "inversée" + style v5
-% 0.2.2a	Correction de 2 cartes de pokerv4
-% 0.2.2		Ajout d'un style v4 pour le poker
-% 0.2.1a	Correction d'un bug avec une carte de poker...
-% 0.2.0		Modification des images (en mode pdf !) + v3 Poker + réduction taille Tarot
-% 0.1.7		Correction d'un bug avec les noms de Uno
-% 0.1.5		Ajout v2 pour le Poker
-% 0.1.4		Réduction de la taille des images
-% 0.1.3		Ajout de cartes Uno (CC1.0 par AlexDer) + modification des commandes + rami
-%			Amélioration de la qualité des cartes de Tarot (sans augmenter la taille)
-% 0.1.2		Modification du nom (et de la source) des images de Tarot (CC0)
-% 0.1.1		Ajout de commandes pour des mini-cartes
-% 0.1		Version initiale
+\ProvidesPackage{JeuxCartes}[2023/03/18 v0.2.4 Jeux de cartes]
+% 0.2.4	Style <fr> avec carte française + <bicycl> + modification des clés avec l'ajout de <StyleJeu> + Suppression xcolor
+% 0.2.3	Ajout d'une option pour présenter une main "inversée" + style <v5>
+% 0.2.2	Correction de 2 cartes de pokerv4
+% 0.2.2	Ajout d'un style <v4> pour le poker
+% 0.2.1	Correction d'un bug avec une carte de poker...
+% 0.2.0	Modification des images (en mode pdf !) + <v3> Poker + réduction taille Tarot
+% 0.1.7	Correction d'un bug avec les noms de Uno
+% 0.1.5	Ajout <v2> pour le Poker
+% 0.1.4	Réduction de la taille des images
+% 0.1.3	Ajout de cartes Uno (CC1.0 par AlexDer) + modification des commandes + rami
+%		Amélioration de la qualité des cartes de Tarot (sans augmenter la taille)
+% 0.1.2	Modification du nom (et de la source) des images de Tarot (CC0)
+% 0.1.1	Ajout de commandes pour des mini-cartes
+% 0.1	Version initiale
 
 %------Packages utiles
 \RequirePackage{graphicx}
-\RequirePackage[table,svgnames]{xcolor}
 \RequirePackage{tikz}
 \RequirePackage{pgffor}
-\RequirePackage{xfp}
 \RequirePackage{listofitems}
 \RequirePackage{xstring}
-\RequirePackage{xparse}
 \RequirePackage{simplekv}
 \RequirePackage{xinttools}
 \RequirePackage{randomlist}
@@ -47,7 +47,8 @@
 	DecalageY=\def\AffCarteJeuDecalageY{#1},%
 	Rotation=\def\AffCarteJeuRotation{#1},%
 	AlignementV=\def\AffCarteJeuAlignementV{#1},%
-	TypeJeu=\def\AffCarteJeuType{#1}
+	TypeJeu=\def\AffCarteJeuType{#1},%
+	StyleJeu=\def\AffCarteJeuStyle{#1}
 }
 \setKVdefault[AffCarteJeu]{%
 	Hauteur=4.25,%
@@ -57,32 +58,44 @@
 	DecalageY=0,%
 	Rotation=0,%
 	AlignementV=0.5,%
-	TypeJeu=Poker
+	TypeJeu=Poker,%
+	StyleJeu=v1
 }
 
-\NewDocumentCommand\AffCarteJeu{ O{} m }{%1=options,2=cartenommée
+\NewDocumentCommand\AffCarteJeu{ O{} m }{%1=options,2=cartenommée (OK)
 	\useKVdefault[AffCarteJeu]%
 	\setKV[AffCarteJeu]{#1}%
 	%cas poker
-	\IfStrEq{\AffCarteJeuType}{Poker}%poker
-		{\def\CartePrefixe{CaJ-PokeRv1-}}{}%
-	%cas pokerv2
-	\IfStrEq{\AffCarteJeuType}{Pokerv2}%poker2
-		{\def\CartePrefixe{CaJ-PokeRv2-}}{}%
-	%cas pokerv3
-	\IfStrEq{\AffCarteJeuType}{Pokerv3}%poker3
-		{\def\CartePrefixe{CaJ-PokeRv3-}}{}%
-	%cas pokerv4
-	\IfStrEq{\AffCarteJeuType}{Pokerv4}%poker4
-		{\def\CartePrefixe{CaJ-PokeRv4-}}{}%
-	%cas pokerv5
-	\IfStrEq{\AffCarteJeuType}{Pokerv5}%poker5
-		{\def\CartePrefixe{CaJ-PokeRv5-}}{}%
+	\IfStrEq{\AffCarteJeuType}{Poker}%poker et ensuite style
+		{%
+			%cas pokerv1
+			\IfStrEq{\AffCarteJeuStyle}{v1}%pokerv1
+				{\def\CartePrefixe{CaJ-PokeRv1-}}{}%
+			%cas pokerv2
+			\IfStrEq{\AffCarteJeuStyle}{v2}%pokerv2
+				{\def\CartePrefixe{CaJ-PokeRv2-}}{}%
+			%cas pokerv3
+			\IfStrEq{\AffCarteJeuStyle}{v3}%pokerv3
+				{\def\CartePrefixe{CaJ-PokeRv3-}}{}%
+			%cas pokerv4
+			\IfStrEq{\AffCarteJeuStyle}{v4}%pokerv4
+				{\def\CartePrefixe{CaJ-PokeRv4-}}{}%
+			%cas pokerv5
+			\IfStrEq{\AffCarteJeuStyle}{v5}%pokerv5
+				{\def\CartePrefixe{CaJ-PokeRv5-}}{}%
+			%cas pokerfr
+			\IfStrEq{\AffCarteJeuStyle}{fr}%pokerfr
+				{\def\CartePrefixe{CaJ-PokeRfr-}}{}%
+			%cas pokerbicycle
+			\IfStrEq{\AffCarteJeuStyle}{bicycl}%pokerbic
+				{\def\CartePrefixe{CaJ-PokeRbic-}}{}%
+		}%
+		{}%
 	%cas tarot
-	\IfStrEq{\AffCarteJeuType}{Tarot}%tarot
+	\IfStrEq{\AffCarteJeuType}{Tarot}%tarot (un seul style)
 		{\def\CartePrefixe{CaJ-TaroTv1-}}{}%
 	%cas uno
-	\IfStrEq{\AffCarteJeuType}{Uno}%uno
+	\IfStrEq{\AffCarteJeuType}{Uno}%uno (un seul style)
 		{\def\CartePrefixe{CaJ-UnOv1-}}{}%
 	%transformation valign en tikz
 	\def\OptionTikzCBB{current bounding box.center}%
@@ -111,14 +124,16 @@
 %------commande main simple (cartes côte à côte)
 \defKV[AffMainSimpleCartes]{%
 	Hauteur=\def\MainSimpleHauteur{#1},%
-	TypeJeu=\def\MainSimpleJeuType{#1}
+	TypeJeu=\def\MainSimpleJeuType{#1},%
+	StyleJeu=\def\MainSimpleJeuStyle{#1}
 }
 \setKVdefault[AffMainSimpleCartes]{%
 	Hauteur=4.25,%
-	TypeJeu=Poker
+	TypeJeu=Poker,%
+	StyleJeu=v1
 }
 
-\NewDocumentCommand\AffCartesJeu{ O{} m }{%1=options,2=listecartes
+\NewDocumentCommand\AffCartesJeu{ O{} m }{%1=options,2=listecartes (OK)
 	\useKVdefault[AffMainSimpleCartes]%
 	\setKV[AffMainSimpleCartes]{#1}%
 	%calculs et traitement des variables
@@ -128,7 +143,7 @@
 	%main côte à côte
 	\foreach \i in {1,2,...,\ListeCartesMainlen}{%
 		\itemtomacro\ListeCartesMain[\i]\CarteMain%
-		\AffCarteJeu[TypeJeu=\MainSimpleJeuType,Hauteur=\MainSimpleHauteur]{\CarteMain}%
+		\AffCarteJeu[TypeJeu=\MainSimpleJeuType,StyleJeu=\MainSimpleJeuStyle,Hauteur=\MainSimpleHauteur]{\CarteMain}%
 	}%
 }
 
@@ -139,6 +154,7 @@
 	EspV=\def\MainDecalV{#1},%
 	Rotation=\def\MainRotation{#1},%
 	TypeJeu=\def\MainJeuType{#1},%
+	StyleJeu=\def\MainJeuStyle{#1},%
 	AlignementV=\def\MainAlignementV{#1}
 }
 
@@ -149,11 +165,12 @@
 	Rotation=10,%
 	Eventail=false,%
 	TypeJeu=Poker,%
+	StyleJeu=v1,%
 	AlignementV=0.5,%
 	Inverse=false
 }
 
-\NewDocumentCommand\MainCartesJeu{ O{} m }{%1=options,2=listecartes
+\NewDocumentCommand\MainCartesJeu{ O{} m }{%1=options,2=listecartes (OK)
 	\useKVdefault[AffMainCartes]%
 	\setKV[AffMainCartes]{#1}%
 	%calculs et traitement des variables
@@ -161,16 +178,26 @@
 	\setsepchar{§}%
 	\readlist*\ListeCartesMain{#2}%
 	\def\NbCartesMain{\ListeCartesMainlen}%nbcartes
+	%le cas du poker
 	\IfStrEq{\MainJeuType}{Poker}%poker
-		{\def\HauteurGenerique{8.5}\def\CarteMainPrefixe{CaJ-PokeRv1-}}{}%
-	\IfStrEq{\MainJeuType}{Pokerv2}%poker2
-		{\def\HauteurGenerique{8.5}\def\CarteMainPrefixe{CaJ-PokeRv2-}}{}%
-	\IfStrEq{\MainJeuType}{Pokerv3}%poker3
-		{\def\HauteurGenerique{8.5}\def\CarteMainPrefixe{CaJ-PokeRv3-}}{}%
-	\IfStrEq{\MainJeuType}{Pokerv4}%poker4
-		{\def\HauteurGenerique{8.5}\def\CarteMainPrefixe{CaJ-PokeRv4-}}{}%
-	\IfStrEq{\MainJeuType}{Pokerv5}%poker5
-		{\def\HauteurGenerique{8.5}\def\CarteMainPrefixe{CaJ-PokeRv5-}}{}%
+		{%
+			\def\HauteurGenerique{8.5}%
+			\IfStrEq{\MainJeuStyle}{v1}%pokerv1
+				{\def\CarteMainPrefixe{CaJ-PokeRv1-}}{}%
+			\IfStrEq{\MainJeuStyle}{v2}%poker2
+				{\def\CarteMainPrefixe{CaJ-PokeRv2-}}{}%
+			\IfStrEq{\MainJeuStyle}{v3}%poker3
+				{\def\CarteMainPrefixe{CaJ-PokeRv3-}}{}%
+			\IfStrEq{\MainJeuStyle}{v4}%poker4
+				{\def\CarteMainPrefixe{CaJ-PokeRv4-}}{}%
+			\IfStrEq{\MainJeuStyle}{v5}%poker5
+				{\def\CarteMainPrefixe{CaJ-PokeRv5-}}{}%
+			\IfStrEq{\MainJeuStyle}{fr}%pokerfr
+				{\def\CarteMainPrefixe{CaJ-PokeRfr-}}{}%
+			\IfStrEq{\MainJeuStyle}{bicycl}%pokerbic
+				{\def\CarteMainPrefixe{CaJ-PokeRbic-}}{}%
+		}%
+		{}%
 	\IfStrEq{\MainJeuType}{Tarot}%tarot
 		{\def\HauteurGenerique{5.5}\def\CarteMainPrefixe{CaJ-TaroTv1-}}{}%
 	\IfStrEq{\MainJeuType}{Uno}%uno
@@ -199,12 +226,12 @@
 				\def\MainOffset{\fpeval{\EchelleCarteDecalage*\MainDecalV*(\i-1)}}%
 				\def\SecondOffset{\fpeval{\EchelleCarteDecalage*\MainDecalH*(\i-1)}}%
 				\def\DecAngleMain{\fpeval{0.5*\NbCartesMain*\MainRotation}}%
-				\AffCarteJeu[TypeJeu=\MainJeuType,Tikz,TikzAutonome=false,Hauteur=\MainHauteur,DecalageY=\MainOffset,DecalageX=\SecondOffset,Rotation={\DecAngleMain-(\i-1)*\MainRotation}]{\CarteMain}%
+				\AffCarteJeu[TypeJeu=\MainJeuType,StyleJeu=\MainJeuStyle,Tikz,TikzAutonome=false,Hauteur=\MainHauteur,DecalageY=\MainOffset,DecalageX=\SecondOffset,Rotation={\DecAngleMain-(\i-1)*\MainRotation}]{\CarteMain}%
 			}%
 			{%
 				\def\MainOffset{\fpeval{\EchelleCarteDecalage*\MainDecalH*(\i-1)}}%
 				\def\SecondOffset{\fpeval{\EchelleCarteDecalage*\MainDecalV*(\i-1)}}%
-				\AffCarteJeu[TypeJeu=\MainJeuType,Tikz,TikzAutonome=false,Hauteur=\MainHauteur,DecalageX=\MainOffset,DecalageY=\SecondOffset]{\CarteMain}%
+				\AffCarteJeu[TypeJeu=\MainJeuType,StyleJeu=\MainJeuStyle,Tikz,TikzAutonome=false,Hauteur=\MainHauteur,DecalageX=\MainOffset,DecalageY=\SecondOffset]{\CarteMain}%
 			}%
 		}%finpour
 	\end{tikzpicture}%
@@ -212,12 +239,13 @@
 
 %------commande main aléatoire
 \defKV[AffMainAleaCartes]{%
-	Hauteur=\def\MainHauteur{#1},%
-	EspH=\def\MainDecalH{#1},%
-	EspV=\def\MainDecalV{#1},%
-	Rotation=\def\MainRotation{#1},%
-	TypeJeu=\def\MainJeuType{#1},%
-	AlignementV=\def\MainAlignementV{#1}
+	Hauteur=\def\MainAleaHauteur{#1},%
+	EspH=\def\MainAleaDecalH{#1},%
+	EspV=\def\MainAleaDecalV{#1},%
+	Rotation=\def\MainAleaRotation{#1},%
+	TypeJeu=\def\MainAleaJeuType{#1},%
+	StyleJeu=\def\MainAleaJeuStyle{#1},%
+	AlignementV=\def\MainAleaAlignementV{#1}
 }
 \setKVdefault[AffMainAleaCartes]{%
 	Hauteur=4.25,%
@@ -226,6 +254,7 @@
 	Rotation=10,%
 	Eventail=false,%
 	TypeJeu=Poker,%
+	StyleJeu=v1,%
 	AlignementV=0.5,%
 	Inverse=false
 }
@@ -238,193 +267,85 @@
 \xdef\CartesJeuUno{0B,1B,1B,2B,2B,3B,3B,4B,4B,5B,5B,6B,6B,7B,7B,8B,8B,9B,9B,PTB,PTB,CSB,CSB,P2B,P2B,0V,1V,1V,2V,2V,3V,3V,4V,4V,5V,5V,6V,6V,7V,7V,8V,8V,9V,9V,PTV,PTV,CSV,CSV,P2V,P2V,0J,1J,1J,2J,2J,3J,3J,4J,4J,5J,5J,6J,6J,7J,7J,8J,8J,9J,9J,PTJ,PTJ,CSJ,CSJ,P2J,P2J,0R,1R,1R,2R,2R,3R,3R,4R,4R,5R,5R,6R,6R,7R,7R,8R,8R,9R,9R,PTR,PTR,CSR,CSR,P2R,P2R,P4,P4,P4,P4,Coul,Coul,Coul,Coul}%
 \NewList{CartesJeuMelange}
 
-\NewDocumentCommand\MainCartesJeuAleatoire{ O{} m }{%1=options,2=nbcartes
+\NewDocumentCommand\MainCartesJeuAleatoire{ O{} m }{%1=options,2=nbcartes (OK)
 	\useKVdefault[AffMainAleaCartes]%
 	\setKV[AffMainAleaCartes]{#1}%
 	%calculs et traitement des variables
-	\IfStrEq{\MainJeuType}{Poker}%poker
-		{\def\HauteurGenerique{8.5}\def\CarteMainType{Poker}\xdef\CarteDebutRand{\fpeval{randint(0,52-#2)}}}{}%
-	\IfStrEq{\MainJeuType}{Pokerv2}%pokerv2
-		{\def\HauteurGenerique{8.5}\def\CarteMainType{Pokerv2}\xdef\CarteDebutRand{\fpeval{randint(0,52-#2)}}}{}%
-	\IfStrEq{\MainJeuType}{Pokerv3}%pokerv3
-		{\def\HauteurGenerique{8.5}\def\CarteMainType{Pokerv3}\xdef\CarteDebutRand{\fpeval{randint(0,52-#2)}}}{}%
-	\IfStrEq{\MainJeuType}{Pokerv4}%pokerv4
-		{\def\HauteurGenerique{8.5}\def\CarteMainType{Pokerv4}\xdef\CarteDebutRand{\fpeval{randint(0,52-#2)}}}{}%
-	\IfStrEq{\MainJeuType}{Pokerv5}%pokerv5
-		{\def\HauteurGenerique{8.5}\def\CarteMainType{Pokerv5}\xdef\CarteDebutRand{\fpeval{randint(0,52-#2)}}}{}%
-	\IfStrEq{\MainJeuType}{Uno}%uno
-		{\def\HauteurGenerique{8.5}\def\CarteMainType{Uno}\xdef\CarteDebutRand{\fpeval{randint(0,108-#2)}}}{}%
-	\IfStrEq{\MainJeuType}{Bataille}%bataille
-		{\def\HauteurGenerique{8.5}\def\CarteMainType{Poker}\xdef\CarteDebutRand{\fpeval{randint(0,54-#2)}}}{}%
-	\IfStrEq{\MainJeuType}{Bataillev2}%bataillev2
-		{\def\HauteurGenerique{8.5}\def\CarteMainType{Pokerv2}\xdef\CarteDebutRand{\fpeval{randint(0,54-#2)}}}{}%
-	\IfStrEq{\MainJeuType}{Bataillev3}%bataillev3
-		{\def\HauteurGenerique{8.5}\def\CarteMainType{Pokerv3}\xdef\CarteDebutRand{\fpeval{randint(0,54-#2)}}}{}%
-	\IfStrEq{\MainJeuType}{Bataillev4}%bataillev4
-		{\def\HauteurGenerique{8.5}\def\CarteMainType{Pokerv4}\xdef\CarteDebutRand{\fpeval{randint(0,54-#2)}}}{}%
-	\IfStrEq{\MainJeuType}{Bataillev5}%bataillev5
-		{\def\HauteurGenerique{8.5}\def\CarteMainType{Pokerv5}\xdef\CarteDebutRand{\fpeval{randint(0,54-#2)}}}{}%
-	\IfStrEq{\MainJeuType}{Belote}%belote
-		{\def\HauteurGenerique{8.5}\def\CarteMainType{Poker}\xdef\CarteDebutRand{\fpeval{randint(0,32-#2)}}}{}%
-	\IfStrEq{\MainJeuType}{Belotev2}%belotev2
-		{\def\HauteurGenerique{8.5}\def\CarteMainType{Pokerv2}\xdef\CarteDebutRand{\fpeval{randint(0,32-#2)}}}{}%
-	\IfStrEq{\MainJeuType}{Belotev3}%belotev3
-		{\def\HauteurGenerique{8.5}\def\CarteMainType{Pokerv3}\xdef\CarteDebutRand{\fpeval{randint(0,32-#2)}}}{}%
-	\IfStrEq{\MainJeuType}{Belotev4}%belotev4
-		{\def\HauteurGenerique{8.5}\def\CarteMainType{Pokerv4}\xdef\CarteDebutRand{\fpeval{randint(0,32-#2)}}}{}%
-	\IfStrEq{\MainJeuType}{Belotev5}%belotev5
-		{\def\HauteurGenerique{8.5}\def\CarteMainType{Pokerv5}\xdef\CarteDebutRand{\fpeval{randint(0,32-#2)}}}{}%
-	\IfStrEq{\MainJeuType}{Rami}%rami
-		{\def\HauteurGenerique{8.5}\def\CarteMainType{Poker}\xdef\CarteDebutRand{\fpeval{randint(0,108-#2)}}}{}%
-	\IfStrEq{\MainJeuType}{Ramiv2}%ramiv2
-		{\def\HauteurGenerique{8.5}\def\CarteMainType{Pokerv2}\xdef\CarteDebutRand{\fpeval{randint(0,108-#2)}}}{}%
-	\IfStrEq{\MainJeuType}{Ramiv3}%ramiv3
-		{\def\HauteurGenerique{8.5}\def\CarteMainType{Pokerv3}\xdef\CarteDebutRand{\fpeval{randint(0,108-#2)}}}{}%
-	\IfStrEq{\MainJeuType}{Ramiv4}%ramiv4
-		{\def\HauteurGenerique{8.5}\def\CarteMainType{Pokerv4}\xdef\CarteDebutRand{\fpeval{randint(0,108-#2)}}}{}%
-	\IfStrEq{\MainJeuType}{Ramiv5}%ramiv5
-		{\def\HauteurGenerique{8.5}\def\CarteMainType{Pokerv5}\xdef\CarteDebutRand{\fpeval{randint(0,108-#2)}}}{}%
-	\IfStrEq{\MainJeuType}{Tarot}%tarot
-		{\def\HauteurGenerique{6.375}\def\CarteMainType{Tarot}\xdef\CarteDebutRand{\fpeval{randint(0,78-#2)}}}{}%
-	%échelle relative des cartes
-	\def\EchelleCarteDecalage{\fpeval{\MainHauteur/\HauteurGenerique}}%
-	%transformation valign en tikz
-	\def\OptionTikzCBB{current bounding box.center}%
-	\IfStrEq{\MainAlignementV}{0}%
-		{\def\OptionTikzCBB{current bounding box.south}}{}%
-	\IfStrEq{\MainAlignementV}{1}%
-		{\def\OptionTikzCBB{current bounding box.north}}{}%
-	%melange du jeu
-	\ClearList{CartesJeuMelange}%
-	\IfStrEq{\MainJeuType}{Poker}%si c'est le poker
+	\IfStrEq{\MainAleaJeuType}{Poker}%poker
 		{%
-			\xintFor* ##1 in {\xintCSVtoList{\CartesJeuPoker}}%
-			\do{\InsertRandomItem{CartesJeuMelange}{##1}}%
+			\def\HauteurGenerique{8.5}%hauteur générique
+			\def\CarteMainType{Poker}%on stocke le typejeu poker
+			\xdef\CarteDebutRand{\fpeval{randint(0,52-#2)}}%
 		}%
 		{}%
-	\IfStrEq{\MainJeuType}{Pokerv2}%si c'est le pokerv2
+	\IfStrEq{\MainAleaJeuType}{Bataille}%bataille
 		{%
-			\xintFor* ##1 in {\xintCSVtoList{\CartesJeuPoker}}%
-			\do{\InsertRandomItem{CartesJeuMelange}{##1}}%
+			\def\HauteurGenerique{8.5}%hauteur générique
+			\def\CarteMainType{Poker}%on stocke le typejeu Bataille
+			\xdef\CarteDebutRand{\fpeval{randint(0,54-#2)}}%
 		}%
 		{}%
-	\IfStrEq{\MainJeuType}{Pokerv3}%si c'est le pokerv3
+	\IfStrEq{\MainAleaJeuType}{Belote}%belote
 		{%
-			\xintFor* ##1 in {\xintCSVtoList{\CartesJeuPoker}}%
-			\do{\InsertRandomItem{CartesJeuMelange}{##1}}%
+			\def\HauteurGenerique{8.5}%hauteur générique
+			\def\CarteMainType{Poker}%on stocke le typejeu poker
+			\xdef\CarteDebutRand{\fpeval{randint(0,32-#2)}}%
 		}%
 		{}%
-	\IfStrEq{\MainJeuType}{Pokerv4}%si c'est le pokerv4
+	\IfStrEq{\MainAleaJeuType}{Rami}%rami
 		{%
-			\xintFor* ##1 in {\xintCSVtoList{\CartesJeuPoker}}%
-			\do{\InsertRandomItem{CartesJeuMelange}{##1}}%
+			\def\HauteurGenerique{8.5}%hauteur générique
+			\def\CarteMainType{Poker}%on stocke le typejeu poker
+			\xdef\CarteDebutRand{\fpeval{randint(0,108-#2)}}%
 		}%
 		{}%
-	\IfStrEq{\MainJeuType}{Pokerv5}%si c'est le pokerv5
+	\IfStrEq{\MainAleaJeuType}{Uno}%uno
+		{\def\HauteurGenerique{8.5}\def\CarteMainType{Uno}\xdef\CarteDebutRand{\fpeval{randint(0,108-#2)}}}{}%
+	\IfStrEq{\MainAleaJeuType}{Tarot}%tarot
+		{\def\HauteurGenerique{6.375}\def\CarteMainType{Tarot}\xdef\CarteDebutRand{\fpeval{randint(0,78-#2)}}}{}%
+	%échelle relative des cartes
+	\def\EchelleCarteDecalage{\fpeval{\MainAleaHauteur/\HauteurGenerique}}%
+	%transformation valign en tikz
+	\def\OptionTikzCBB{current bounding box.center}%
+	\IfStrEq{\MainAleaAlignementV}{0}%
+		{\def\OptionTikzCBB{current bounding box.south}}{}%
+	\IfStrEq{\MainAleaAlignementV}{1}%
+		{\def\OptionTikzCBB{current bounding box.north}}{}%
+	%melange du jeu
+	\ClearList{CartesJeuMelange}%
+	\IfStrEq{\MainAleaJeuType}{Poker}%si c'est le poker
 		{%
 			\xintFor* ##1 in {\xintCSVtoList{\CartesJeuPoker}}%
 			\do{\InsertRandomItem{CartesJeuMelange}{##1}}%
 		}%
 		{}%
-	\IfStrEq{\MainJeuType}{Bataille}%si c'est la bataille
-		{%
-			\xintFor* ##1 in {\xintCSVtoList{\CartesJeuBataille}}%
-			\do{\InsertRandomItem{CartesJeuMelange}{##1}}%
-		}%
-		{}%
-	\IfStrEq{\MainJeuType}{Bataillev2}%si c'est la bataillev2
-		{%
-			\xintFor* ##1 in {\xintCSVtoList{\CartesJeuBataille}}%
-			\do{\InsertRandomItem{CartesJeuMelange}{##1}}%
-		}%
-		{}%
-	\IfStrEq{\MainJeuType}{Bataillev3}%si c'est la bataillev3
-		{%
-			\xintFor* ##1 in {\xintCSVtoList{\CartesJeuBataille}}%
-			\do{\InsertRandomItem{CartesJeuMelange}{##1}}%
-		}%
-		{}%
-	\IfStrEq{\MainJeuType}{Bataillev4}%si c'est la bataillev4
-		{%
-			\xintFor* ##1 in {\xintCSVtoList{\CartesJeuBataille}}%
-			\do{\InsertRandomItem{CartesJeuMelange}{##1}}%
-		}%
-		{}%
-	\IfStrEq{\MainJeuType}{Bataillev5}%si c'est la bataillev5
+	\IfStrEq{\MainAleaJeuType}{Bataille}%si c'est la bataille
 		{%
 			\xintFor* ##1 in {\xintCSVtoList{\CartesJeuBataille}}%
 			\do{\InsertRandomItem{CartesJeuMelange}{##1}}%
 		}%
 		{}%
-	\IfStrEq{\MainJeuType}{Rami}%si c'est le rami
+	\IfStrEq{\MainAleaJeuType}{Rami}%si c'est le rami
 		{%
 			\xintFor* ##1 in {\xintCSVtoList{\CartesJeuRami}}%
 			\do{\InsertRandomItem{CartesJeuMelange}{##1}}%
 		}%
 		{}%
-	\IfStrEq{\MainJeuType}{Ramiv2}%si c'est le ramiv2
-		{%
-			\xintFor* ##1 in {\xintCSVtoList{\CartesJeuRami}}%
-			\do{\InsertRandomItem{CartesJeuMelange}{##1}}%
-		}%
-		{}%
-	\IfStrEq{\MainJeuType}{Ramiv3}%si c'est le ramiv3
-		{%
-			\xintFor* ##1 in {\xintCSVtoList{\CartesJeuRami}}%
-			\do{\InsertRandomItem{CartesJeuMelange}{##1}}%
-		}%
-		{}%
-	\IfStrEq{\MainJeuType}{Ramiv4}%si c'est le ramiv4
-		{%
-			\xintFor* ##1 in {\xintCSVtoList{\CartesJeuRami}}%
-			\do{\InsertRandomItem{CartesJeuMelange}{##1}}%
-		}%
-		{}%
-	\IfStrEq{\MainJeuType}{Ramiv5}%si c'est le ramiv5
-		{%
-			\xintFor* ##1 in {\xintCSVtoList{\CartesJeuRami}}%
-			\do{\InsertRandomItem{CartesJeuMelange}{##1}}%
-		}%
-		{}%
-	\IfStrEq{\MainJeuType}{Uno}%si c'est le uno
-		{%
-			\xintFor* ##1 in {\xintCSVtoList{\CartesJeuUno}}%
-			\do{\InsertRandomItem{CartesJeuMelange}{##1}}%
-		}%
-		{}%
-	\IfStrEq{\MainJeuType}{Belote}%si c'est la belote
+	\IfStrEq{\MainAleaJeuType}{Belote}%si c'est la belote
 		{%
 			\xintFor* ##1 in {\xintCSVtoList{\CartesJeuBelote}}%
 			\do{\InsertRandomItem{CartesJeuMelange}{##1}}%
 		}%
 		{}%
-	\IfStrEq{\MainJeuType}{Belotev2}%si c'est la belotev2
+	\IfStrEq{\MainAleaJeuType}{Tarot}%si c'est le tarot
 		{%
-			\xintFor* ##1 in {\xintCSVtoList{\CartesJeuBelote}}%
-			\do{\InsertRandomItem{CartesJeuMelange}{##1}}%
-		}%
-		{}%
-	\IfStrEq{\MainJeuType}{Belotev3}%si c'est la belotev3
-		{%
-			\xintFor* ##1 in {\xintCSVtoList{\CartesJeuBelote}}%
-			\do{\InsertRandomItem{CartesJeuMelange}{##1}}%
-		}%
-		{}%
-	\IfStrEq{\MainJeuType}{Belotev4}%si c'est la belotev4
-		{%
-			\xintFor* ##1 in {\xintCSVtoList{\CartesJeuBelote}}%
-			\do{\InsertRandomItem{CartesJeuMelange}{##1}}%
-		}%
-		{}%
-	\IfStrEq{\MainJeuType}{Belotev5}%si c'est la belotev5
-		{%
-			\xintFor* ##1 in {\xintCSVtoList{\CartesJeuBelote}}%
+			\xintFor* ##1 in {\xintCSVtoList{\CartesJeuTarot}}%
 			\do{\InsertRandomItem{CartesJeuMelange}{##1}}%
 		}%
 		{}%
-	\IfStrEq{\MainJeuType}{Tarot}%si c'est le tarot
+		\IfStrEq{\MainAleaJeuType}{Uno}%si c'est le uno
 		{%
-			\xintFor* ##1 in {\xintCSVtoList{\CartesJeuTarot}}%
+			\xintFor* ##1 in {\xintCSVtoList{\CartesJeuUno}}%
 			\do{\InsertRandomItem{CartesJeuMelange}{##1}}%
 		}%
 		{}%
@@ -437,22 +358,21 @@
 			{%
 				\foreach \i in {1,2,...,#2}
 			}%
-		{%
-		%\foreach \i in {1,2,...,#2}{%
+		{%début du foreach
 			\GetItem{CartesJeuMelange}{\inteval{\CarteDebutRand+\i-1}}{CarteMainChoisie}%
 			\ifboolKV[AffMainAleaCartes]{Eventail}%
 			{%
-				\def\MainOffset{\fpeval{\EchelleCarteDecalage*\MainDecalV*(\i-1)}}%
-				\def\SecondOffset{\fpeval{\EchelleCarteDecalage*\MainDecalH*(\i-1)}}%
-				\def\DecAngleMain{\fpeval{0.5*#2*\MainRotation}}%
-				\AffCarteJeu[TypeJeu=\CarteMainType,Tikz,TikzAutonome=false,Hauteur=\MainHauteur,DecalageY=\MainOffset,DecalageX=\SecondOffset,Rotation={\DecAngleMain-(\i-1)*\MainRotation}]{\CarteMainChoisie}%
+				\def\MainOffset{\fpeval{\EchelleCarteDecalage*\MainAleaDecalV*(\i-1)}}%
+				\def\SecondOffset{\fpeval{\EchelleCarteDecalage*\MainAleaDecalH*(\i-1)}}%
+				\def\DecAngleMain{\fpeval{0.5*#2*\MainAleaRotation}}%
+				\AffCarteJeu[TypeJeu=\CarteMainType,StyleJeu=\MainAleaJeuStyle,Tikz,TikzAutonome=false,Hauteur=\MainAleaHauteur,DecalageY=\MainOffset,DecalageX=\SecondOffset,Rotation={\DecAngleMain-(\i-1)*\MainAleaRotation}]{\CarteMainChoisie}%
 			}%
 			{%
-				\def\MainOffset{\fpeval{\EchelleCarteDecalage*\MainDecalH*(\i-1)}}%
-				\def\SecondOffset{\fpeval{\EchelleCarteDecalage*\MainDecalV*(\i-1)}}%
-				\AffCarteJeu[TypeJeu=\CarteMainType,Tikz,TikzAutonome=false,Hauteur=\MainHauteur,DecalageX=\MainOffset,DecalageY=\SecondOffset]{\CarteMainChoisie}%
+				\def\MainOffset{\fpeval{\EchelleCarteDecalage*\MainAleaDecalH*(\i-1)}}%
+				\def\SecondOffset{\fpeval{\EchelleCarteDecalage*\MainAleaDecalV*(\i-1)}}%
+				\AffCarteJeu[TypeJeu=\CarteMainType,StyleJeu=\MainAleaJeuStyle,Tikz,TikzAutonome=false,Hauteur=\MainAleaHauteur,DecalageX=\MainOffset,DecalageY=\SecondOffset]{\CarteMainChoisie}%
 			}%
-		}%finpour
+		}%finforeach
 	\end{tikzpicture}%
 }
 
@@ -463,7 +383,7 @@
 }
 \setKVdefault[AffMiniCartes]{%
 	Largeur=0.55cm,%
-	FondAtout=PeachPuff
+	FondAtout=yellow
 }
 
 \NewDocumentCommand\AffMiniCarteJeu{ O{} m }{%1=options,2=nbcartes
@@ -472,7 +392,7 @@
 	%découpage de l'argument
 	\StrCut{#2}{.}\csVal\csCplt%
 	%couleur de fond
-	\def\csFond{White}%
+	\def\csFond{white}%
 	\def\csCoul{black}%
 	%le cas du 10.11...21
 	\IfStrEq{\csVal}{10}{\def\csVal{\scalebox{0.5}[1]{10}}}{}%
@@ -513,7 +433,7 @@
 	\IfStrEq{\csCplt}{R}%
 		{\def\csCoul{red}}{}%
 	%minicarte
-	\tikz[baseline=(char.base)]\node[anchor=north west,line width=0.7pt,draw=Gray,rectangle,rounded corners,inner sep=1.6pt,fill=\csFond,text=\csCoul,font=\ttfamily,minimum width=\MiniCarteLargeur](char){\csVal\scalebox{0.75}[0.75]{\csSymb}};%
+	\tikz[baseline=(char.base)]\node[anchor=north west,line width=0.7pt,draw=gray,rectangle,rounded corners,inner sep=1.6pt,fill=\csFond,text=\csCoul,font=\ttfamily,minimum width=\MiniCarteLargeur](char){\csVal\scalebox{0.75}[0.75]{\csSymb}};%
 }
 
 %------commande mini-main-cartes
@@ -523,7 +443,7 @@
 }
 \setKVdefault[AffMiniMainCartes]{%
 	Largeur=0.55cm,%
-	FondAtout=PeachPuff
+	FondAtout=yellow
 }
 
 \NewDocumentCommand\MainMiniCartesJeu{ O{} m }{%1=options,2=liste
@@ -546,7 +466,7 @@
 \setKVdefault[MiniMainAleaCartes]{%
 	Largeur=0.55cm,%
 	TypeJeu=Poker,%
-	FondAtout=PeachPuff
+	FondAtout=yellow
 }
 
 \xdef\MiniCartesJeuPoker{2.P,3.P,4.P,5.P,6.P,7.P,8.P,9.P,10.P,V.P,D.P,R.P,A.P,2.T,3.T,4.T,5.T,6.T,7.T,8.T,9.T,10.T,V.T,D.T,R.T,A.T,2.C,3.C,4.C,5.C,6.C,7.C,8.C,9.C,10.C,V.C,D.C,R.C,A.C,2.K,3.K,4.K,5.K,6.K,7.K,8.K,9.K,10.K,V.K,D.K,R.K,A.K}%
diff --git a/macros/latex/contrib/photobook/DEPENDS.txt b/macros/latex/contrib/photobook/DEPENDS.txt
new file mode 100644
index 0000000000..1b2a77253b
--- /dev/null
+++ b/macros/latex/contrib/photobook/DEPENDS.txt
diff --git a/macros/latex/contrib/photobook/Makefile b/macros/latex/contrib/photobook/Makefile
index ddbd047536..7bebae3ec8 100644
--- a/macros/latex/contrib/photobook/Makefile
+++ b/macros/latex/contrib/photobook/Makefile
@@ -45,7 +45,6 @@
 
 .EXPORT_ALL_VARIABLES:
 
-#.ONESHELL:
 
 # NOTE: this makes things run consistently on different systems including 
 # 		things like Android...
@@ -60,8 +59,9 @@ MODULE := photobook
 VERSION = $(strip $(shell \
 	cat $(MODULE).cls \
 		| grep 'VERSION{' \
-	 	| sed 's/.*{\(.*\)}.*/\1/' \
-		| sed 's/v//'))
+	 	| sed \
+			-e 's/.*{\(.*\)}.*/\1/' \
+			-e 's/v//'))
 DATE = $(strip $(shell date "+%Y%m%d%H%M"))
 COMMIT = $(strip $(shell git rev-parse HEAD))
 
@@ -125,6 +125,7 @@ DIST_NORMAL_FILES = \
 	README.md \
 	LICENSE \
 	Makefile \
+	DEPENDS.txt \
 	$(MODULE).cls \
 	$(MODULE).pdf
 DIST_FILES = \
@@ -241,6 +242,16 @@ LN := cp -l
 		> $@
 
 
+# list of dependencies...
+#
+DEPENDS.txt: $(MODULE).cls
+	cat $< \
+		| egrep -zo '\s*\\RequirePackage(\[[^]]*\])?\{[^}]*\}' \
+		| sed 's/.*{\(.*\)}/hard \1\n/' \
+		| grep -a hard \
+		> $@
+
+
 
 #----------------------------------------------------------------------
 # Info targets...
@@ -295,6 +306,7 @@ tag:
 	@echo "    v$(VERSION)"
 	@echo "Last 5 tags:"
 	@git tag -l 'v[0-9]*'\
+		| sort -V \
 		| tail -n 5 \
 		| sed 's/^/    /' \
 		| tac
@@ -408,7 +420,7 @@ sweep:
 
 .PHONY: clean
 clean: sweep
-	rm -rf $(DIST_DIR) $(BUILD_DIR) $(MODULE).md *.pdf
+	rm -rf $(DIST_DIR) $(BUILD_DIR) $(MODULE).md DEPENDS.txt *.pdf
 
 
 
diff --git a/macros/latex/contrib/photobook/photobook.cls b/macros/latex/contrib/photobook/photobook.cls
index fc9a349c3a..0ade3c4ac0 100644
--- a/macros/latex/contrib/photobook/photobook.cls
+++ b/macros/latex/contrib/photobook/photobook.cls
@@ -76,8 +76,8 @@
 
 %%% NOTE: \def\<module-name>@[A-Z]+ macros will be visible to both the 
 %%%		code and the generated docs...
-\edef\photobook@FILEVERSION{v0.1.13}
-\edef\photobook@FILEDATE{2023-03-13}
+\edef\photobook@FILEVERSION{v0.1.15}
+\edef\photobook@FILEDATE{2023-03-18}
 
 
 %% \documentclass{ltxdoc}
diff --git a/macros/latex/contrib/photobook/photobook.pdf b/macros/latex/contrib/photobook/photobook.pdf
index 59b9da74cd..cf3f1d0754 100644
--- a/macros/latex/contrib/photobook/photobook.pdf
+++ b/macros/latex/contrib/photobook/photobook.pdf
diff --git a/macros/latex/contrib/photobook/scripts/README.md b/macros/latex/contrib/photobook/scripts/README.md
index 223578f7bb..2e00881f70 100644
--- a/macros/latex/contrib/photobook/scripts/README.md
+++ b/macros/latex/contrib/photobook/scripts/README.md
@@ -4,9 +4,9 @@ Support scripts
 
 <!-- TOC depthfrom:2 -->
 
-- [make-spreads.sh](#make-imagessh)
-	- [The process](#the-process)
-		- [Automatic template inferenceing](#automatic-template-inferenceing)
+- [make-spreads.sh](#make-spreadssh)
+	- [Theory of operation](#theory-of-operation)
+		- [Automatic template inferencing](#automatic-template-inferencing)
 		- [Manual template selection](#manual-template-selection)
 		- [Template tweaking](#template-tweaking)
 		- [Manual spread layouts](#manual-spread-layouts)
@@ -23,6 +23,8 @@ Support scripts
 `make-spreads.sh`
 ----------------
 
+<!-- XXX add a TL;DR, "quick start" or "cheat sheet" section... abstract? -->
+
 Generate LaTeX block of pages/spreads from a directory tree.
 
 This was initially intended as a means to convert the exported directory 
@@ -104,7 +106,7 @@ $ make-spreads.sh --help
 ```
 
 
-### The process
+### Theory of operation
 
 <!-- XXX spreads vs. pages -->
 
@@ -196,7 +198,18 @@ If only one image/text file is provided then `make-spreads.sh` will set it
 on the right page of the spread using the appropriate page template and
 leave the left page blank.
 
-<!-- XXX do we need a `blankpage.tex` template??? -->
+A black page uses `blankpage.tex` template if available, otherwise a
+trivial blank page is used:
+```latex
+\null
+\newpage
+```
+
+<!-- XXX
+Template search order:
+- spread directory
+- template directory
+-->
 
 
 #### Manual template selection
@@ -250,6 +263,8 @@ If `layout.tex` is present it will be included as the page layout/template.
 Any paths in the `layout.tex` should be relative to the location the
 built block .tex file will be located, usually to the project root.
 
+Template field substitution is done as for all other templates.
+
 
 ### Templates
 
@@ -379,6 +394,7 @@ $ cls2tex.sh --help
 ```
 
 The `--help` says it all:
+<!-- :r !cl2tex.sh --help -->
 ```
 Generate docs from latex package/class
 
@@ -396,8 +412,8 @@ This will:
   - read the INPUT
   - keep lines starting with \def\<module-name>@[A-Z]\+
   - keep lines starting with '%%'
-  - %%%%% Text -> \subsection(Text)
-  - %%%% Text -> \section(Text)
+  - %%%%% Text -> \subsection{Text}
+  - %%%% Text -> \section{Text}
   - %% >> code -> \begin{verbatim}code\end{verbatim}
   - write the result to OUTPUT
 
diff --git a/macros/latex/contrib/photobook/scripts/cls2tex.sh b/macros/latex/contrib/photobook/scripts/cls2tex.sh
index d7e6c1013e..34cf872b1d 100755
--- a/macros/latex/contrib/photobook/scripts/cls2tex.sh
+++ b/macros/latex/contrib/photobook/scripts/cls2tex.sh
@@ -26,8 +26,8 @@ printhelp(){
 	echo "  - read the INPUT"
 	echo "  - keep lines starting with \\def\\<module-name>@[A-Z]\\+"
 	echo "  - keep lines starting with '%%'"
-	echo "  - %%%%% Text -> \\subsection(Text)"
-	echo "  - %%%% Text -> \\section(Text)"
+	echo "  - %%%%% Text -> \\subsection{Text}"
+	echo "  - %%%% Text -> \\section{Text}"
 	echo "  - %% >> code -> \\begin{verbatim}code\\end{verbatim}"
 	echo "  - write the result to OUTPUT"
 	echo
diff --git a/macros/latex/contrib/photobook/scripts/make-spreads.sh b/macros/latex/contrib/photobook/scripts/make-spreads.sh
index 05979ae03d..1b10fc56cc 100644
--- a/macros/latex/contrib/photobook/scripts/make-spreads.sh
+++ b/macros/latex/contrib/photobook/scripts/make-spreads.sh
@@ -2,75 +2,15 @@
 shopt -s nullglob extglob
 
 #----------------------------------------------------------------------
-# 
-# TIP: It is better to think of a visual book as a set of spreads 
-#		rather than a set of pages, hence the focus on spreads in the 
-#		code below.
-#		The main unit of a "visual" book is a spread, it's the thing 
-#		you see when you hold the book open, and the main workflow 
-#		when building a book is creating spreads and ordering them so 
-#		a single page is almost never treated as an independent unit.
-# TIP: it is not recommended to use too many templates, the layout 
-#		should be and feel structured and this structure should not be 
-#		too complex for the average reader to get comfortable in.
-# 
+#
+# For docs see README.md
+#
 #
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-# 
-# Template structure:
-#	$TEMPLATE_DIR/
-#		spread.tex
-#		imagepage.tex
-#		textpage.tex
-#		...
-#	$CAPTION_DIR/
-#		<image>.txt
-#			image caption.
-#			this is separated to decouple caption writing from the 
-#			changes to the layout/sequencing and this drastically 
-#			simplify the work with writers.
-#			For this reason this takes priority over local captions (XXX revise).
-#		...
-#	$SPREADS_DIR/
+#
+# XXX DOC:
 #		$spread/
-#			tweaks.tex
-#				template tweaks.
-#				loaded before the templates are handled.
-#			layout.tex
-#				manual layout of spread.
-#				if given rest of directory contents are 
-#				ignored.
-#				fields:
-#					${IMAGE0}
-#						replaced with image path
-#					${CAPTION0}
-#						replaced with content of caption file if found
-#						and empty otherwise.
-#					${TEXT0}
-#						replaced with the content of a text file if 
-#						found and empty otherwise.
-#					...
-#				NOTE: if images are included, hi-res source
-#					substitution is not done here.
-#				NOTE: fields are ordered and matched according to their
-#					position and not their number, e.g. in the following 
-#					sequence:
-#						IMAGE, IMAGE10, IMAGE20, ..,
-#						CAPTION2, CAPTION7, CAPTION12, ..
-#					IMAGE10 will be filled with the second found image 
-#					and CAPTION7 will be filled with the second found 
-#					caption.
-#			<spread-template-name>.tpl
-#				indicates the spread template to use.
-#				if given the rest of the .tex files in 
-#				directory are ignored.
-#				resolves to:
-#					templates/<spread-template-name>.tex
-#				fields:
-#					${IMAGE0}
-#					${CAPTION0}
-#					${TEXT0}
-#					...
+#			...
 #			imagepage.tex
 #				image page template.
 #				fields:
@@ -87,46 +27,7 @@ shopt -s nullglob extglob
 #			<spread-template-name>-textpage.tpl
 #				indicates the image/text page template to use.
 #				ignored if explicit templates are given.
-#				fields:
-#					${IMAGE}
-#					${CAPTION}
-#					${TEXT}
-#					...
-#			00-<image>.png
-#				image.
-#				if $IMAGE_HIRES_DIR is set then this will 
-#				resolve to:
-#					$IMAGE_HIRES_DIR/<image>
-#				supported formats:
-#					.jpeg, .png, .pdf, .svg, .eps 
-#					(see $IMAGE_FORMATS)
-#			00-<image>.txt
-#				local image caption text.
-#				NOTE: this must be named the same as the image.
-#			01-<text>.txt
-#				text.
 #			...
-#		...
-#
-#
-# Env variables:
-#	ANOTATE_IMAGE_PATHS=
-#	TEXT_FORMATS=<ext>|..
-#	IMAGE_FORMATS=<ext>|..
-#	SPREADS_DIR=<path>
-#	IMAGE_HIRES_DIR=<path>
-#		sets the path to which the hi-res images are resolved.
-#	CAPTION_DIR=<path>
-#	TEMPLATE_DIR=<path>
-#	EMPTY_PAGE=<name>
-#	TEXT_PAGE=<name>
-#	IMAGE_PAGE=<name>
-#	IMAGE_SPREAD=<array>
-#
-#
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-#
-# XXX 
 #
 #
 #
@@ -190,7 +91,7 @@ IMAGE_PAGE=${IMAGE_PAGE:=imagepage}
 # NOTE: the index here corresponds to the number of images found in a 
 #		spread directory...
 if [ ${#IMAGE_SPREAD[@]} = 0 ] ; then
-	if ! [ ${#CFG_IMAGE_SPREAD[@]} = 0 ] ; then
+	if [ ${#CFG_IMAGE_SPREAD[@]} != 0 ] ; then
 		IMAGE_SPREAD=()
 		for i in ${!CFG_IMAGE_SPREAD[@]} ; do
 			IMAGE_SPREAD[$i]=${CFG_IMAGE_SPREAD[$i]}
@@ -378,24 +279,44 @@ readCaption(){
 #	getTemplate SPREAD TYPE
 #
 getTemplate(){
-	local SPREAD=$1
-	local TYPE=$2
-	local TEMPLATE=($SPREAD/*-$TYPE.tex)
-	if [ -z $TEMPLATE ] ; then
-		TEMPLATE=($SPREAD/*-$TYPE.tpl)
-		if ! [ -z $TEMPLATE ] ; then
-			TEMPLATE=${TEMPLATE/$SPREAD\//}
-			TEMPLATE=${TEMPLATE/[0-9]-/}
-			TEMPLATE="$TEMPLATE_DIR/${TEMPLATE[0]%-${TYPE}.*}.tex"
+	local spread=$1
+	local name=$2
+	local template
+
+	if [[ $name =~ .*\.tex ]] ; then 
+		# already an existing template...
+		if [ -e "$name" ] ; then
+			echo $name
+			return
 		fi
+		# normalize...
+		name=${name%.tex}
+	# normalize template name...
+	elif [[ $name =~ .*\.tpl ]] ; then
+		name=$( echo $name \
+			| sed \
+				-e 's/.tpl$//' \
+				-e "s%$spread/%%" \
+				-e 's/^[0-9]\+-//' )
 	fi
-	if [ -z $TEMPLATE ] ; then
-		 TEMPLATE="$TEMPLATE_DIR/${TYPE}.tex"
+
+	# local template...
+	template=($spread/*-$name.tex)
+	if [ ${#template[@]} != 0 ] ; then
+		template=${template[0]}
+	else
+		template=($spread/$name.tex)
 	fi
-	if ! [ -e $TEMPLATE ] ; then
-		return
+	# global template...
+	if [ -z $template ] \
+			|| ! [ -e "$template" ] ; then
+		 template="$TEMPLATE_DIR/${name}.tex"
 	fi
-	echo $TEMPLATE
+	# check if the thing exists...
+	if ! [ -e $template ] ; then
+		return 1
+	fi
+	echo $template
 }
 
 
@@ -459,7 +380,7 @@ populateTemplate(){
 	local i=0
 	for var in ${slots[@]} ; do
 		name=${var//[0-9]/}
-		if ! [ ${name} = "IMAGE" ] ; then
+		if [ ${name} != "IMAGE" ] ; then
 			continue
 		fi
 
@@ -479,14 +400,14 @@ populateTemplate(){
 		i=$(( i + 1 ))
 
 		val=${val//\//\\/}
-		text=$(echo -e "${text}" | \
+		text=$(echo "${text}" | \
 			sed "s/\${${var}}/${val%.*}/g")
 	done
 
 	# pass 2: captions...
 	for var in ${slots[@]} ; do
 		name=${var//[0-9]/}
-		if ! [ ${name} = "CAPTION" ] ; then
+		if [ ${name} != "CAPTION" ] ; then
 			continue
 		fi
 
@@ -502,7 +423,7 @@ populateTemplate(){
 			val=$(readCaption "${val}")
 		fi
 
-		text=$(echo -e "${text}" | \
+		text=$(echo "${text}" | \
 			sed "s/\${${var}}/${val}/g")
 	done
 
@@ -523,14 +444,14 @@ populateTemplate(){
 		done
 
 		val=${val//\//\\/}
-		text=$(echo -e "${text}" | \
+		text=$(echo "${text}" | \
 			sed "s/\${${var}}/${val}/g")
 	done
 
 	# print out the filled template...
 	echo % template: $tpl
-	echo -e "${text}"
-	return 0
+	echo "${text}"
+	return
 }
 
 
@@ -671,27 +592,29 @@ handleSpread(){
 					# ignore the rest of the items when we are done 
 					# creating two pages...
 					[ $C == 2 ] \
-						&& return 0
+						&& return
 				done
 			fi
 		fi
 		# formatting done...
 		[ -z $template ] \
-			&& return 0
-
-		# format template path...
-		template=${template/$spread\//}
-		template=${template/[0-9]-/}
-		# get...
-		template="${template[0]%.*}.tex"
-		if ! [ -e "$template" ] ; then
-			template="$TEMPLATE_DIR/${template[0]%.*}.tex"
+			&& return
+
+		# resolve the template path...
+		local p=$template
+		template=$(getTemplate "$spread" "$template")
+
+		# not found...
+		if [ -z $template ] ; then
+			echo "%"
+			echo "% ERROR: could not resolve template: $p" | tee >(cat >&2)
+			echo "%"
 		fi
 	fi
 
 	populateTemplate "$spread" "$template" "${img[@]}" "${txt[@]}"
 
-	return 0
+	return $?
 }
 
 
diff --git a/macros/latex/contrib/warning/README b/macros/latex/contrib/warning/README
new file mode 100644
index 0000000000..b80a18f268
--- /dev/null
+++ b/macros/latex/contrib/warning/README
@@ -0,0 +1,77 @@
+README for warning package, 2023-03-18, v0.10
+
+
+TABLE OF CONTENTS
+=================
+
+1 Introduction
+2 Download
+3 Installation
+
+
+1 INTRODUCTION
+==============
+
+Note 1: This package is obsolete. For LaTeX-format 2020-10-01 and newer:
+Instead of \addglobalwarning{ something } use
+\AddToHook{enddocument/info}{ something } and do not load the warning package.
+
+Note 2: The package author, Harald Harders, is inactive.
+
+
+Sometimes a class or package has to make a global warning such as
+"Rerun for this or that reason" or "This is draft, change this
+before the final run". If you are generating them with
+\AtEndDocument{\PackageWarningNoLine{<packagename>}{<warning>}}
+the warning appears very early before the filelist. Then the warning can easily be
+overseen. This package provides a command that surely puts the warning at the end
+near to the global warnings generated by LaTeX itself. You can add a warning to a list
+of user defined warnings using the command \addglobalwarning as it can be seen in
+the example below.
+
+This material is published under the LPPL 1.3c: This work may be
+distributed and/or modified under the conditions of the LaTeX Project
+Public License, either version 1.3c of this license or (at your option)
+any later version. This version of this license is in
+https://www.latex-project.org/lppl/lppl-1-3c.txt
+and the latest version of this license is in
+https://www.latex-project.org/lppl.txt
+and version 1.3c or later is part of all distributions of
+LaTeX version 2005-12-01 or later.
+
+
+2 DOWNLOAD
+==========
+
+"warning" is available on CTAN:
+https://ctan.org/pkg/warning
+
+Also a ZIP file is provided that contains the files:
+the manual (warning-doc.tex and warning-doc.pdf,
+including examples),
+the style file (warning.sty),
+and this README:
+https://mirrors.ctan.org/macros/latex/contrib/warning.zip
+
+
+3 INSTALLATION
+==============
+
+a) Download the warning files from CTAN.
+   If necessary, unpack them.
+b) Install the file "warning.sty" in your TDS tree:
+     cp warning.sty TDS:tex/latex/warning/
+   Replace "TDS:" by the prefix of your TDS tree
+   (texmf directory).
+c) Create the documentation, if necessary, e.g.
+     pdflatex warning.tex
+     pdflatex warning.tex
+d) Update the databases if necessary, e.g. for TeX Live
+     texhash or mktexlsr.
+e) Create the warning-example.pdf, if necessary,
+     by copying the example code from the documentation
+     into (a) separate .tex file(s) and compiling that (those).
+f) Copy the documentation files to
+   "TDS:doc/latex/warning/":
+   README, warning.pdf, warning.tex,
+   and the example(s), if you created any.
+\ No newline at end of file
diff --git a/macros/latex/contrib/warning/warning-doc.pdf b/macros/latex/contrib/warning/warning-doc.pdf
index 8d12e159cf..b3c6f60b2d 100644
--- a/macros/latex/contrib/warning/warning-doc.pdf
+++ b/macros/latex/contrib/warning/warning-doc.pdf
diff --git a/macros/latex/contrib/warning/warning-doc.tex b/macros/latex/contrib/warning/warning-doc.tex
index d8b78dbdf6..82a93be17e 100644
--- a/macros/latex/contrib/warning/warning-doc.tex
+++ b/macros/latex/contrib/warning/warning-doc.tex
@@ -1,10 +1,6 @@
-\documentclass[pagesize=auto, parskip=half, fontsize=12pt, DIV=11]{scrartcl}
-
-\usepackage{fixltx2e}
-\usepackage{etex}
+\documentclass[parskip=half,fontsize=12pt,DIV=11]{scrartcl}
 \usepackage{lmodern}
 \usepackage[T1]{fontenc}
-\usepackage{textcomp}
 \usepackage[svgnames]{xcolor}
 \usepackage{listings}
 \usepackage{microtype}
@@ -34,16 +30,19 @@
   numberstyle=\scriptsize\color{SlateGray}%
 }
 
-\title{The \pkg{warning} package\thanks{This manual corresponds to \pkg{warning.sty}~v0.01, dated~2001/08/17.}}
+\title{The \pkg{warning} package\thanks{This manual corresponds to \pkg{warning.sty}~v0.10, dated~2023-03-18.}}
 \subtitle{Global warnings at the end of the screen output\\and the logfile}
-\author{Harald Harders\thanks{\mail{h.harders@tu-bs.de}}}
-\date{2001/08/17}
-
+\author{Harald Harders\thanks{\mail{harald.harders@gmx.de}}\hspace{0.7em}(inactive)}
+\date{2023-03-18}% (2023-03-18 update done by H.-Martin Münch, <Martin dot Muench at Uni-Bonn dot de>)
 
 \begin{document}
-
 \maketitle
 
+{\large\color{red}
+\textbf{Note: This package is obsolete. For \LaTeX-format \hbox{2020-10-01} and newer:
+Instead of }\verb|\addglobalwarning{ something }|\textbf{ use }
+\verb|\AddToHook{enddocument/info}{ something }|\textbf{ and do not load the warning package.}}
+
 Sometimes a class or package has to make a global warning such as
 ``Rerun for this or that reason'' or ``This is draft, change this
 before the final run''. If you are generating them with
@@ -60,6 +59,7 @@ the packages \pkg{changebar.sty} or \pkg{longtable.sty}.
 
 Harald Harders
 
+\newpage
 
 \minisec{Example:}
 
@@ -75,4 +75,15 @@ Hello
 \end{document}
 \end{lstlisting}
 
+For \LaTeX-format 2020-10-01 and newer use:
+\begin{lstlisting}
+\documentclass{article}
+\AddToHook{enddocument/info}{%
+  \ClassWarningNoLine{testclass}{This is a global warning}}
+\AddToHook{enddocument/info}{%
+  \PackageWarningNoLine{testpackage}{This is another global warning}}
+\begin{document}
+Hello
 \end{document}
+\end{lstlisting}
+\end{document}
+\ No newline at end of file
diff --git a/macros/latex/contrib/warning/warning.sty b/macros/latex/contrib/warning/warning.sty
index 67f9746839..0a8e3e5b7d 100644
--- a/macros/latex/contrib/warning/warning.sty
+++ b/macros/latex/contrib/warning/warning.sty
@@ -1,80 +1,72 @@
 %%
-%% warning.sty
+%% Project: warning
+%% Version: 2023-03-18 v0.10
+%% Info: Global warnings at the end of the screen output and the logfile
 %%
-%% Global warnings at the end of the screen output and the logfile
+%% Copyright © 2001, 2023 Harald Harders (harald.harders@gmx.de; inactive)
+%% (2023-03-18 update done by H.-Martin Münch, <Martin dot Muench at Uni-Bonn dot de>)
 %%
-%% Copyright 2001  Harald Harders (h.harders@tu-bs.de)
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either
+%% version 1.3c of this license or (at your option) any later
+%% version. This version of this license is in
+%%    https://www.latex-project.org/lppl/lppl-1-3c.txt
+%% and the latest version of this license is in
+%%    https://www.latex-project.org/lppl.txt
+%% and version 1.3c or later is part of all distributions of
+%% LaTeX version 2005-12-01 or later.
 %%
-%% License: LPPL
+%% Note: This package is obsolete. For LaTeX-format 2020-10-01 and newer:
+%% Instead of \addglobalwarning{ something } use
+%% \AddToHook{enddocument/info}{ something }
+%% and do not load the warning package.
 %%
-%% Sometimes a class or package has to make a global warning such as
-%% ``Rerun for this or that reason'' or ``This is draft, change this
-%% before the final run''. If you are generating them with
-%% \AtEndDocument{\PackageWarningNoLine{packagename}{warning}}
-%% the warning appears very early before the filelist. Then the
-%% warning can easily be overseen. This package provides a command
-%% that surely puts the warning at the end near to the global
-%% warnings generated by LaTeX itself.
-%% You can add a warning to a list of user defined warnings using the
-%% command \addglobalwarning as it can be seen in the example below.
-%%
-%% This package could be useful for the warnings generated e.g. by
-%% the packages changebar.sty or longtable.sty.
-%%
-%% Harald Harders
-%%
-%%
-%% Example:
-%%
-%% \documentclass{article}
-%% \usepackage{warning}
-%% \addglobalwarning{%
-%%   \ClassWarningNoLine{testclass}{This is a global warning}}
-%% \addglobalwarning{%
-%%   \PackageWarningNoLine{testpackage}{This is another global warning}}
-%% \begin{document}
-%% Hello
-%% \end{document}
-%%
-%%
-\ProvidesPackage{warning}[2001/08/17 v0.01 Global warnings at end of logfile]
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{warning}[2023/03/18 v0.10 Global warnings at end of logfile]
+
+\providecommand\IfFormatAtLeastTF{\@ifl@t@r\fmtversion}
+\IfFormatAtLeastTF{2020/10/01}{
+  \NewDocumentCommand\addglobalwarning{m}{\AddToHook{enddocument/info}{#1}}
+  \addglobalwarning{%
+    \PackageWarningNoLine{warning}{Package warning is obsolete.\MessageBreak%
+      Instead of \string\addglobalwarning{ something } use \MessageBreak%
+      \string\AddToHook{enddocument/info}{ something }\MessageBreak%
+      and do not load the warning package}
+    }
+  \def\wrn@warning{\endinput}
+  }{\let\wrn@warning\relax
+    \AtBeginDocument{\addglobalwarning{\PackageWarningNoLine{warning}{%
+      Used LaTeX-format: \fmtversion, more recent LaTeX-format is available}}}
+   }
+
+\wrn@warning% is \endinput for LaTeX since 2020-10-01 and \relax for older LaTeX.
 
 % Define a command that adds new warnings to the list of warnings.
 % Modification of the \addto command provided by babel.def.
 \def\addglobalwarning#1{%
-  \ifx\wrn@warning\@undefined
-    \def\wrn@warning{#1}%
-  \else
-    \ifx\wrn@warning\relax
-      \def\wrn@warning{#1}%
-    \else
-      {\toks@\expandafter{\wrn@warning#1}%
-        \xdef\wrn@warning{\the\toks@}}%
-    \fi
-  \fi
+  {\toks@\expandafter{\wrn@warning#1}%
+   \xdef\wrn@warning{\the\toks@}}%
 }
 
-% Expand \@@end command. I have the feeling that is not too stable.
-% Thus not used.
-%\let\wrn@end\@@end
-%\def\@@end{\wrn@warning\wrn@end}
-
-% Expand \@refundefined command. This does not work if undefined
-% references appear after the execution of \AtEndDocument which can happen.
-% Thus not used.
-%\AtEndDocument{%
-%  \let\wrn@refundefined=\@refundefined
-%  \def\@refundefined{\wrn@refundefined\wrn@warning}}
-
 % Expand \@dofilelist
-% This works with or without \listfiles because \listfile has to be
-% used in the preamble and therefor is executed before this definition.
 \AtBeginDocument{%
-  \let\wrn@dofilelist\@dofilelist
+  \let\wrn@dofilelist\@dofilelist%
   \def\@dofilelist{\wrn@dofilelist\wrn@warning}%
 }
-
-\let\wrn@warning\relax
-
 \endinput
+% This works with or without \listfiles because \listfile has to be
+% used in the preamble and therefor is executed before this definition.
+%
+% Expand \@@end command
+% I have the feeling that is not too stable. Thus not used.
+%\let\wrn@end\@@end
+%\def\@@end{\wrn@warning\wrn@end}
+%
+% Expand \@refundefined command
+% This does not work if undefined references appear after the execution
+% of \AtEndDocument which can happen. Thus not used.
+%\AtEndDocument{%
+%  \let\wrn@refundefined=\@refundefined
+%  \def\@refundefined{\wrn@refundefined\wrn@warning}}
+%
 %% EOF
 \ No newline at end of file
diff --git a/macros/latex/contrib/writeongrid/doc/WriteOnGrid-doc-en.pdf b/macros/latex/contrib/writeongrid/doc/WriteOnGrid-doc-en.pdf
index 113d469a38..ea99e67782 100644
--- a/macros/latex/contrib/writeongrid/doc/WriteOnGrid-doc-en.pdf
+++ b/macros/latex/contrib/writeongrid/doc/WriteOnGrid-doc-en.pdf
diff --git a/macros/latex/contrib/writeongrid/doc/WriteOnGrid-doc-en.tex b/macros/latex/contrib/writeongrid/doc/WriteOnGrid-doc-en.tex
index 739738cd0f..43d5f7ec15 100644
--- a/macros/latex/contrib/writeongrid/doc/WriteOnGrid-doc-en.tex
+++ b/macros/latex/contrib/writeongrid/doc/WriteOnGrid-doc-en.tex
@@ -45,8 +45,8 @@
 \setlength{\parindent}{0pt}
 \definecolor{LightGray}{gray}{0.9}
 
-\def\TPversion{0.1.2}
-\def\TPdate{30/01/2023}
+\def\TPversion{0.1.3}
+\def\TPdate{18/03/2023}
 
 \usepackage[most]{tcolorbox}
 \tcbuselibrary{minted}
@@ -242,7 +242,65 @@ The package \textsf{WriteOnGrid} proposes "shortcuts" for classic colors !
 
 \section{Commands, keys and options}
 
-\subsection{The environement}
+\subsection{The command}
+
+\begin{PresentationCode}{listing only}
+%command, with keys to prepare the grid
+
+\DispGrid[keys]<color>
+\end{PresentationCode}
+
+The first argument, \textit{optional}, between \texttt{[...]} give the \Cle{keys} :
+
+\begin{itemize}
+	\item \Cle{NumSquares} to specify the size of the grid, under \texttt{(nbCol)x(nbRow)} ; \hfill~default : \Cle{17x5}
+	\item \Cle{Unit} to specify the scale of the grid ; \hfill~default : \Cle{1}
+	\item \Cle{Margin} to specify the global \textcolor{orange}{margin} at the beginning of the lines ; \hfill~default : \Cle{0}
+	\item the boolean \Cle{DispBar} to display or not the bar ; \hfill~défaut : \Cle{true}
+	\item \Cle{Enlarge} to specify the squares-overtakings, globally with \texttt{\textcolor{red}{L}\textcolor{blue}{R}} or side by side with \texttt{\textcolor{red}{L}/\textcolor{blue}{R}} ;\hfill~default : \Cle{0}
+	\item the boolean \Cle{Border} to display the basis border of the grid ;\hfill~default : \Cle{false}
+	\item the key\Cle{Grille}, from \Cle{5x5/Seyes/Ruled}, to specify the grid's type.\hfill~défaut : \Cle{5x5}
+\end{itemize}
+
+The second argument, \textit{optional}, between \texttt{<...>} is the color(s) of the grid :
+
+\begin{itemize}
+	\item by \Cle{Color} (\Cle{lightgray!50} by default) for $5\times5$  ;
+	\item by \Cle{ColorA/ColorB} (\Cle{lightgray!50/lightgray!25} by default) for Seyes or Ruled.
+\end{itemize}
+
+\medskip
+
+\begin{PresentationCode}{listing only}
+%18x4 big squares, w/o overtaking, Seyes colors, w/o margin/bar
+\DispGrid[NumSquares=18x4,Grid=Seyes,DispBar=false]<\ColSeyes>
+
+%36x8 small squares, overtakings 3/3, LightSteelBlue color
+\DispGrid[NumSquares=36x8,Enlarge=3/3]<LightSteelBlue>
+
+%12x3 lines "Ruled", w/o overtakins, Ruled colors, centered, with 2-margin
+\begin{center}
+	\DispGrid[NumSquares=12x3,Grid=Ruled,Margin=2]<\ColRuled>
+\end{center}
+\end{PresentationCode}
+
+\medskip
+
+\DispGrid[NumSquares=18x4,Grid=Seyes,DispBar=false]<\ColSeyes>
+
+\medskip
+
+\DispGrid[NumSquares=36x8,Enlarge=3/3]<LightSteelBlue>
+
+\smallskip
+
+\begin{center}
+	\DispGrid[NumSquares=12x3,Grid=Ruled,Margin=2]<\ColRuled>
+\end{center}
+
+\pagebreak
+
+\subsection{The environment}
 
 \begin{PresentationCode}{listing only}
 %environment, with keys to prepare the grid
@@ -258,6 +316,7 @@ The first argument, \textit{optional}, between \texttt{[...]} give the \Cle{keys
 	\item \Cle{NumSquares} to specify the size of the grid, under \texttt{(nbCol)x(nbRow)} ; \hfill~default : \Cle{17x5}
 	\item \Cle{Unit} to specify the scale of the grid ; \hfill~default : \Cle{1}
 	\item \Cle{Margin} to specify the global \textcolor{orange}{margin} at the beginning of the lines ; \hfill~default : \Cle{0}
+	\item the boolean \Cle{DispBar} to display or not the bar ; \hfill~défaut : \Cle{true}
 	\item \Cle{Enlarge} to specify the squares-overtakings, globally with \texttt{\textcolor{red}{L}\textcolor{blue}{R}} or side by side with \texttt{\textcolor{red}{L}/\textcolor{blue}{R}} ;\hfill~default : \Cle{0}
 	\item the boolean \Cle{Border} to display the basis border of the grid ;\hfill~default : \Cle{false}
 	\item the key\Cle{Grille}, from \Cle{5x5/Seyes/Ruled}, to specify the grid's type.\hfill~défaut : \Cle{5x5}
@@ -309,7 +368,7 @@ The second argument, \textit{optional}, between \texttt{<...>} is the color(s) o
 
 \subsection{Write on the lines}
 
-The idea is to write on the created grid. In order to write \textit{right} on the lines, we can :
+The idea is to write on the created grid (environment !). In order to write \textit{right} on the lines, we can :
 
 \begin{itemize}
 	\item give the lines one by one ;
@@ -429,6 +488,8 @@ To sum up, they create full paper grid (by preference for \texttt{\textbf{a4pape
 
 \part*{History}
 
+\verb|v0.1.3|~:~~~~Command to display a grid (w/o writing on it)
+
 \verb|v0.1.2|~:~~~~Shortcuts for default colors + small bugfixes
 
 \verb|v0.1.1|~:~~~~Best color choice
diff --git a/macros/latex/contrib/writeongrid/doc/WriteOnGrid-doc-fr.pdf b/macros/latex/contrib/writeongrid/doc/WriteOnGrid-doc-fr.pdf
index add8699922..192f3003b0 100644
--- a/macros/latex/contrib/writeongrid/doc/WriteOnGrid-doc-fr.pdf
+++ b/macros/latex/contrib/writeongrid/doc/WriteOnGrid-doc-fr.pdf
diff --git a/macros/latex/contrib/writeongrid/doc/WriteOnGrid-doc-fr.tex b/macros/latex/contrib/writeongrid/doc/WriteOnGrid-doc-fr.tex
index 6ed93fa269..9de5e053b8 100644
--- a/macros/latex/contrib/writeongrid/doc/WriteOnGrid-doc-fr.tex
+++ b/macros/latex/contrib/writeongrid/doc/WriteOnGrid-doc-fr.tex
@@ -48,8 +48,8 @@
 \setlength{\parindent}{0pt}
 \definecolor{LightGray}{gray}{0.9}
 
-\def\TPversion{0.1.2}
-\def\TPdate{30 Janvier 2023}
+\def\TPversion{0.1.3}
+\def\TPdate{18 Mars 2023}
 
 \usepackage[most]{tcolorbox}
 \tcbuselibrary{minted}
@@ -254,6 +254,65 @@ Le package \textsf{WriteOnGrid} définit également des couleurs pour une saisie
 
 \section{Grilles individuelles}
 
+\subsection{La commande}
+
+\begin{PresentationCode}{listing only}
+%commande francisée, avec clés en français pour préparer la grille
+
+\AffQuadrillage[clés]<couleur(s)>
+\end{PresentationCode}
+
+Le premier argument, \textit{optionnel}, entre \texttt{[...]} propose les \Cle{clés} :
+
+\begin{itemize}
+	\item \Cle{NbCarreaux} pour spécifier le nombre de carreaux, sous la forme \texttt{(nbCol)x(nbLig)} ; \hfill~défaut : \Cle{17x5}
+	\item \Cle{Unite} pour spécifier l'échelle de la figure ; \hfill~défaut : \Cle{1}
+	\item \Cle{Marge} pour spécifier la \textcolor{orange}{marge} du début des lignes ; \hfill~défaut : \Cle{0}
+	\item le booléen \Cle{AffBarre} pour afficher ou non la marge ; \hfill~défaut : \Cle{true}
+	\item \Cle{Elargir} pour préciser les carreaux de débordements, sous la forme unique \texttt{\textcolor{red}{G}\textcolor{blue}{D}} ou par côté \texttt{\textcolor{red}{G}/\textcolor{blue}{D}} ;\hfill~défaut : \Cle{0}
+	\item le booléen \Cle{Cadre} pour afficher le cadre de base du quadrillage ;\hfill~défaut : \Cle{false}
+	\item la clé \Cle{Grille}, parmi \Cle{5x5 / Seyes / Ruled}, pour spécifier le type de quadrillage ;\hfill~défaut : \Cle{5x5}
+	\item la clé \Cle{CouleurBarreSeyes} pour rajouter un trait vertical pour le papier Seyes .\hfill~défaut : \Cle{red!75}
+\end{itemize}
+
+Le second argument, \textit{optionnel}, entre \texttt{<...>} correspond quant à lui à la couleur de base du quadrillage :
+
+\begin{itemize}
+	\item sous la forme \Cle{Couleur} (\Cle{lightgray!50} par défaut) pour le quadrillage $5\times5$ ;
+	\item sous la forme \Cle{CouleurP/CouleurS} (\Cle{lightgray!50/lightgray!25} par défaut) pour le Seyes ou le Ruled.
+\end{itemize}
+
+\medskip
+
+\begin{PresentationCode}{listing only}
+%des cadres ont été rajoutés pour la sortie
+
+%18x4 grands carreaux, sans dépassement, couleurs adaptées, sans marge/barre
+\AffQuadrillage[NbCarreaux=18x4,Grille=Seyes,AffBarre=false]<\CoulSeyes>
+
+%36x8 petits carreaux, avec débordements 3/3, couleur LightSteelBlue!50
+\AffQuadrillage[NbCarreaux=36x8,Elargir=3/3]<LightSteelBlue!50>
+
+%12x3 lignes "Ruled", sans débordements, couleur Ruled, centré, avec marge
+\begin{center}
+	\AffQuadrillage[NbCarreaux=12x3,Elargir=2/2,Grille=Ruled,Marge=2]<\CoulRuled>
+\end{center}
+\end{PresentationCode}
+
+\medskip
+
+\AffQuadrillage[NbCarreaux=18x4,Grille=Seyes,AffBarre=false]<\CoulSeyes>
+
+\medskip
+
+\AffQuadrillage[NbCarreaux=36x8,Elargir=3/3]<LightSteelBlue!50>
+
+\begin{center}
+	\AffQuadrillage[NbCarreaux=12x3,Elargir=2/2,Grille=Ruled,Marge=2]<\CoulRuled>
+\end{center}
+
+\pagebreak
+
 \subsection{L'environnement}
 
 \begin{PresentationCode}{listing only}
@@ -270,6 +329,7 @@ Le premier argument, \textit{optionnel}, entre \texttt{[...]} propose les \Cle{c
 	\item \Cle{NbCarreaux} pour spécifier le nombre de carreaux, sous la forme \texttt{(nbCol)x(nbLig)} ; \hfill~défaut : \Cle{17x5}
 	\item \Cle{Unite} pour spécifier l'échelle de la figure ; \hfill~défaut : \Cle{1}
 	\item \Cle{Marge} pour spécifier la \textcolor{orange}{marge} du début des lignes ; \hfill~défaut : \Cle{0}
+	\item le booléen \Cle{AffBarre} pour afficher ou non la marge ; \hfill~défaut : \Cle{true}
 	\item \Cle{Elargir} pour préciser les carreaux de débordements, sous la forme unique \texttt{\textcolor{red}{G}\textcolor{blue}{D}} ou par côté \texttt{\textcolor{red}{G}/\textcolor{blue}{D}} ;\hfill~défaut : \Cle{0}
 	\item le booléen \Cle{Cadre} pour afficher le cadre de base du quadrillage ;\hfill~défaut : \Cle{false}
 	\item la clé \Cle{Grille}, parmi \Cle{5x5 / Seyes / Ruled}, pour spécifier le type de quadrillage ;\hfill~défaut : \Cle{5x5}
@@ -322,7 +382,7 @@ Le second argument, \textit{optionnel}, entre \texttt{<...>} correspond quant à
 
 \subsection{Écrire sur les lignes}
 
-L'idée est maintenant de pouvoir écrire sur les lignes du quadrillage créé, et pour garantir le fait d'écrire \textit{pile} sur le ligne, on applique les recommandations suivantes :
+L'idée est maintenant de pouvoir écrire sur les lignes du quadrillage créé (environnement !), et pour garantir le fait d'écrire \textit{pile} sur le ligne, on applique les recommandations suivantes :
 
 \begin{itemize}
 	\item les lignes doivent être saisies une par une, du \og haut \fg{} vers le \og bas \fg{} ;
@@ -692,6 +752,8 @@ Les exemples des pages suivantes ont été obtenus de la même manière que celu
 
 \section{Historique}
 
+\verb|v0.1.3|~:~~~~Ajout d'une commande pour afficher (sans écrire dessus) une grille
+
 \verb|v0.1.2|~:~~~~Ajustement au niveau des couleurs + raccourcis couleurs par défaut
 
 \verb|v0.1.1|~:~~~~Meilleure gestion des couleurs du quadrillage + Ajout pages complètes
diff --git a/macros/latex/contrib/writeongrid/tex/WriteOnGrid.sty b/macros/latex/contrib/writeongrid/tex/WriteOnGrid.sty
index d0b82ea5c1..3936233bff 100644
--- a/macros/latex/contrib/writeongrid/tex/WriteOnGrid.sty
+++ b/macros/latex/contrib/writeongrid/tex/WriteOnGrid.sty
@@ -2,7 +2,8 @@
 % licence                        : Released under the LaTeX Project Public License v1.3c or later, see http://www.latex-project.org/lppl.txtf
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{WriteOnGrid}[2023/01/30 v0.1.2 package to write on grid lines]
+\ProvidesPackage{WriteOnGrid}[2023/03/18 v0.1.3 package to write on grid lines]
+% 0.1.3		Ajout de commandes simples pour des mini-quadrillages autonomes, sans texte
 % 0.1.2		Modification locale des couleurs + raccourcis couleurs Seyes / Ruled
 % 0.1.1		Ajout de la couleur + modifications mineures + grille "Ruled" + grilles pleine page !
 % 0.1.0		Version initiale [fr] & [en]
@@ -37,12 +38,15 @@
 	\node[text width=\fpeval{\ValeurCarreau*\QuadNbCol/\QuadEchelle-\ValeurCarreau*\useKV[Quadrill]{Marge}/\QuadEchelle}cm,align=#2,scale=\QuadEchelle,anchor=base west,inner sep={\useKV[LigneQuadrill]{Sep}}] at ($({\ValeurCarreau*\useKV[Quadrill]{Marge}+\ValeurCarreau*\useKV[LigneQuadrill]{DecalH}},{-\ValeurCarreau*\thelgquadri})+(0.025,\useKV[LigneQuadrill]{DecalV})$) {\strut #3} ;
 }
 
+%déf des clés
+
 \defKV[Quadrill]{%
 	Grille=\xdef\QuadType{#1},%
 	NbCarreaux=\xdef\QuadNbCar{#1},%
 	Elargir=\xdef\QuadElar{#1},%
 	CouleurBarreSeyes=\xdef\QuadCoulSeyes{#1}
-	}%déf des clés
+}
+
 \setKVdefault[Quadrill]{%
 	NbCarreaux=17x5,%
 	Unite=1,%
@@ -50,8 +54,62 @@
 	Elargir=0,%
 	Cadre=false,%
 	Grille=5x5,%
+	AffBarre=true,%
 	CouleurBarreSeyes={red!75}
-	}
+}
+
+\NewDocumentCommand\AffQuadrillage{ O{} D<>{lightgray!50/lightgray!25} }{%affichage simple du quadrillage
+	\setcounter{lgquadri}{0}%on réinitialise les lignes
+	\useKVdefault[Quadrill]%on met les clés par défaut
+	\setKV[Quadrill]{#1}%on lit les clés
+	\IfSubStr{#2}{/}%on récupère les couleurs
+		{\StrCut{#2}{/}{\QuadCoulA}{\QuadCoulB}}
+		{\def\QuadCoulA{#2}\def\QuadCoulB{#2}}%
+	\StrCut{\QuadNbCar}{x}{\QuadNbCol}{\QuadNbLig}%
+	\IfStrEq{\QuadType}{Seyes}%les types de quadrillages
+		{\xdef\ValeurCarreau{0.8}}%
+		{}%
+	\IfStrEq{\QuadType}{5x5}%
+		{\xdef\ValeurCarreau{0.5}}%
+		{}%
+	\IfStrEq{\QuadType}{Ruled}%
+		{\xdef\ValeurCarreau{0.9}}%
+		{}%
+	\IfSubStr{\QuadElar}{/}%on récupère les élargissements G et D
+		{\StrCut{\QuadElar}{/}{\QuadElarG}{\QuadElarD}}%
+		{\def\QuadElarG{\QuadElar}\def\QuadElarD{\QuadElar}}%
+	\begin{tikzpicture}[xscale={\useKV[Quadrill]{Unite}},yscale={\useKV[Quadrill]{Unite}}]
+		\useasboundingbox (0,0) rectangle ({\ValeurCarreau*\QuadNbCol},{-\ValeurCarreau*\QuadNbLig}) ;%on fixe la grille de base, avant élargissement éventuel
+		\IfStrEq{\QuadType}{Seyes}%
+			{%
+				\draw[xstep=0.8,ystep=0.2,thin,\QuadCoulB] ({-\ValeurCarreau*\QuadElarG},0) grid ({\ValeurCarreau*\QuadNbCol+\ValeurCarreau*\QuadElarD},{-\ValeurCarreau*\QuadNbLig}) ;%grille seyes
+				\draw[xstep=0.8,ystep=0.8,\QuadCoulA] ({-\ValeurCarreau*\QuadElarG},0) grid ({\ValeurCarreau*\QuadNbCol+\ValeurCarreau*\QuadElarD},{-\ValeurCarreau*\QuadNbLig}) ;%grille seyes
+				\ifboolKV[Quadrill]{AffBarre}
+					{
+						\draw[thick,\QuadCoulSeyes] ({\ValeurCarreau*\useKV[Quadrill]{Marge}},0) -- ({\ValeurCarreau*\useKV[Quadrill]{Marge}},{-\ValeurCarreau*\QuadNbLig}) ;%barre Seyes
+					}{}
+			}%
+			{}%
+		\IfStrEq{\QuadType}{5x5}%
+			{%
+				\draw[xstep=0.5,ystep=0.5,thin,\QuadCoulA] ({-\ValeurCarreau*\QuadElarG},0) grid ({\ValeurCarreau*\QuadNbCol+\ValeurCarreau*\QuadElarD},{-\ValeurCarreau*\QuadNbLig}) ;%grille 5x5
+			}%
+			{}%
+		\IfStrEq{\QuadType}{Ruled}%
+		{%
+			\foreach \LLL in {0,1,...,\QuadNbLig} {\draw[,thin,\QuadCoulA] ({-\ValeurCarreau*\QuadElarG},{-\LLL*\ValeurCarreau}) -- ({\ValeurCarreau*\QuadNbCol+\ValeurCarreau*\QuadElarD},{-\ValeurCarreau*\LLL}) ; }
+			%\draw[xstep={\ValeurCarreau*\QuadNbCol},ystep=0.9,thin,\QuadCoulA] ({-\ValeurCarreau*\QuadElarG},0) grid ({\ValeurCarreau*\QuadNbCol+\ValeurCarreau*\QuadElarD},{-\ValeurCarreau*\QuadNbLig}) ;%grille college
+			\ifboolKV[Quadrill]{AffBarre}
+				{
+					\draw[thick,\QuadCoulB] ({\ValeurCarreau*\useKV[Quadrill]{Marge}},0) -- ({\ValeurCarreau*\useKV[Quadrill]{Marge}},{-\ValeurCarreau*\QuadNbLig}) ;%barre college
+				}{}
+		}%
+		{}%
+		\ifboolKV[Quadrill]{Cadre}%cadre pour visualiser la "marge" (officielle)
+			{\draw[thick] (0,0) rectangle ({\ValeurCarreau*\QuadNbCol},{-\ValeurCarreau*\QuadNbLig}) ;}%
+			{}%
+	\end{tikzpicture}%
+}
 
 \NewDocumentEnvironment{EnvQuadrillage}{ O{} D<>{lightgray!50/lightgray!25} }%créer le quadrillage, couleurs ?
 {%
@@ -80,7 +138,10 @@
 			{%
 				\draw[xstep=0.8,ystep=0.2,thin,\QuadCoulB] ({-\ValeurCarreau*\QuadElarG},0) grid ({\ValeurCarreau*\QuadNbCol+\ValeurCarreau*\QuadElarD},{-\ValeurCarreau*\QuadNbLig}) ;%grille seyes
 				\draw[xstep=0.8,ystep=0.8,\QuadCoulA] ({-\ValeurCarreau*\QuadElarG},0) grid ({\ValeurCarreau*\QuadNbCol+\ValeurCarreau*\QuadElarD},{-\ValeurCarreau*\QuadNbLig}) ;%grille seyes
-				\draw[thick,\QuadCoulSeyes] ({\ValeurCarreau*\useKV[Quadrill]{Marge}},0) -- ({\ValeurCarreau*\useKV[Quadrill]{Marge}},{-\ValeurCarreau*\QuadNbLig}) ;%barre Seyes
+				\ifboolKV[Quadrill]{AffBarre}
+					{
+						\draw[thick,\QuadCoulSeyes] ({\ValeurCarreau*\useKV[Quadrill]{Marge}},0) -- ({\ValeurCarreau*\useKV[Quadrill]{Marge}},{-\ValeurCarreau*\QuadNbLig}) ;%barre Seyes
+					}{}
 			}%
 			{}%
 		\IfStrEq{\QuadType}{5x5}%
@@ -92,7 +153,10 @@
 		{%
 			\foreach \LLL in {0,1,...,\QuadNbLig} {\draw[,thin,\QuadCoulA] ({-\ValeurCarreau*\QuadElarG},{-\LLL*\ValeurCarreau}) -- ({\ValeurCarreau*\QuadNbCol+\ValeurCarreau*\QuadElarD},{-\ValeurCarreau*\LLL}) ; }
 			%\draw[xstep={\ValeurCarreau*\QuadNbCol},ystep=0.9,thin,\QuadCoulA] ({-\ValeurCarreau*\QuadElarG},0) grid ({\ValeurCarreau*\QuadNbCol+\ValeurCarreau*\QuadElarD},{-\ValeurCarreau*\QuadNbLig}) ;%grille college
-			\draw[thick,\QuadCoulB] ({\ValeurCarreau*\useKV[Quadrill]{Marge}},0) -- ({\ValeurCarreau*\useKV[Quadrill]{Marge}},{-\ValeurCarreau*\QuadNbLig}) ;%barre college
+			\ifboolKV[Quadrill]{AffBarre}
+				{
+					\draw[thick,\QuadCoulB] ({\ValeurCarreau*\useKV[Quadrill]{Marge}},0) -- ({\ValeurCarreau*\useKV[Quadrill]{Marge}},{-\ValeurCarreau*\QuadNbLig}) ;%barre college
+				}{}
 		}%
 		{}%
 		\ifboolKV[Quadrill]{Cadre}%cadre pour visualiser la "marge" (officielle)
@@ -117,7 +181,60 @@
 }
 
 \defKV[Quadril]{Grid=\xdef\QuadType{#1},NumSquares=\xdef\QuadNbCar{#1},Enlarge=\xdef\QuadElar{#1}}%déf des clés
-\setKVdefault[Quadril]{Grid=5x5,NumSquares=17x5,Unit=1,Margin=0,Enlarge=0,Border=false}%valeurs par défaut
+\setKVdefault[Quadril]{Grid=5x5,NumSquares=17x5,Unit=1,Margin=0,Enlarge=0,Border=false,DispBar=true}%valeurs par défaut
+
+\NewDocumentCommand\DispGrid{ O{} D<>{lightgray!50/lightgray!25} }{%créer le quadrillage
+	\setcounter{lgquadri}{0}%on réinitialise les lignes
+	\useKVdefault[Quadril]%on met les clés par défaut
+	\setKV[Quadril]{#1}%on lit les clés
+	\IfSubStr{#2}{/}%on récupère les couleurs
+		{\StrCut{#2}{/}{\QuadCoulA}{\QuadCoulB}}
+		{\def\QuadCoulA{#2}\def\QuadCoulB{#2}}%
+	\StrCut{\QuadNbCar}{x}{\QuadNbCol}{\QuadNbLig}%
+	\IfStrEq{\QuadType}{Seyes}%les types de quadrillages
+		{\xdef\ValeurCarreau{0.8}}%
+		{}%
+	\IfStrEq{\QuadType}{5x5}%
+		{\xdef\ValeurCarreau{0.5}}%
+		{}%
+	\IfStrEq{\QuadType}{Ruled}%
+		{\xdef\ValeurCarreau{0.9}}%
+		{}%
+	\IfSubStr{\QuadElar}{/}%on récupère les élargissements G et D
+		{\StrCut{\QuadElar}{/}{\QuadElarG}{\QuadElarD}}%
+		{\def\QuadElarG{\QuadElar}\def\QuadElarD{\QuadElar}}%
+	\begin{tikzpicture}[xscale={\useKV[Quadril]{Unit}},yscale={\useKV[Quadril]{Unit}}]
+		\useasboundingbox (0,0) rectangle ({\ValeurCarreau*\QuadNbCol},{-\ValeurCarreau*\QuadNbLig}) ;%on fixe la grille de base, avant élargissement éventuel
+		\IfStrEq{\QuadType}{Seyes}%
+			{%
+				\draw[xstep=0.8,ystep=0.2,thin,\QuadCoulB] ({-\ValeurCarreau*\QuadElarG},0) grid ({\ValeurCarreau*\QuadNbCol+\ValeurCarreau*\QuadElarD},{-\ValeurCarreau*\QuadNbLig}) ;%grille seyes
+				\draw[xstep=0.8,ystep=0.8,\QuadCoulA] ({-\ValeurCarreau*\QuadElarG},0) grid ({\ValeurCarreau*\QuadNbCol+\ValeurCarreau*\QuadElarD},{-\ValeurCarreau*\QuadNbLig}) ;%grille seyes
+				\ifboolKV[Quadril]{DispBar}
+					{
+						\draw[thick,\QuadCoulSeyes] ({\ValeurCarreau*\useKV[Quadril]{Margin}},0) -- ({\ValeurCarreau*\useKV[Quadril]{Margin}},{-\ValeurCarreau*\QuadNbLig}) ;%barre Seyes
+					}{}
+			}%
+			{}%
+		\IfStrEq{\QuadType}{5x5}%
+			{%
+				\draw[xstep=0.5,ystep=0.5,thin,\QuadCoulA] ({-\ValeurCarreau*\QuadElarG},0) grid ({\ValeurCarreau*\QuadNbCol+\ValeurCarreau*\QuadElarD},{-\ValeurCarreau*\QuadNbLig}) ;%grille 5x5
+			}%
+			{}%
+		\IfStrEq{\QuadType}{Ruled}%
+		{%
+			\foreach \LLL in {0,1,...,\QuadNbLig} {\draw[,thin,\QuadCoulA] ({-\ValeurCarreau*\QuadElarG},{-\LLL*\ValeurCarreau}) -- ({\ValeurCarreau*\QuadNbCol+\ValeurCarreau*\QuadElarD},{-\ValeurCarreau*\LLL}) ; }
+			%\draw[xstep={\ValeurCarreau*\QuadNbCol},ystep=0.9,thin,\QuadCoulA] ({-\ValeurCarreau*\QuadElarG},0) grid ({\ValeurCarreau*\QuadNbCol+\ValeurCarreau*\QuadElarD},{-\ValeurCarreau*\QuadNbLig}) ;%grille college
+			\ifboolKV[Quadril]{DispBar}
+					{
+						\draw[thick,\QuadCoulB] ({\ValeurCarreau*\useKV[Quadril]{Margin}},0) -- ({\ValeurCarreau*\useKV[Quadril]{Margin}},{-\ValeurCarreau*\QuadNbLig}) ;%barre college
+					}{}
+		}%
+		{}%
+		\ifboolKV[Quadril]{Border}%cadre pour la "marge"
+			{\draw[thick] (0,0) rectangle ({\ValeurCarreau*\QuadNbCol},{-\ValeurCarreau*\QuadNbLig}) ;}%
+			{}%
+	\end{tikzpicture}%
+}%
 
 \NewDocumentEnvironment{EnvGrid}{ O{} D<>{lightgray!50/lightgray!25} }%créer le quadrillage
 {%
@@ -146,7 +263,10 @@
 			{%
 				\draw[xstep=0.8,ystep=0.2,thin,\QuadCoulB] ({-\ValeurCarreau*\QuadElarG},0) grid ({\ValeurCarreau*\QuadNbCol+\ValeurCarreau*\QuadElarD},{-\ValeurCarreau*\QuadNbLig}) ;%grille seyes
 				\draw[xstep=0.8,ystep=0.8,\QuadCoulA] ({-\ValeurCarreau*\QuadElarG},0) grid ({\ValeurCarreau*\QuadNbCol+\ValeurCarreau*\QuadElarD},{-\ValeurCarreau*\QuadNbLig}) ;%grille seyes
-				\draw[thick,\QuadCoulSeyes] ({\ValeurCarreau*\useKV[Quadril]{Margin}},0) -- ({\ValeurCarreau*\useKV[Quadril]{Margin}},{-\ValeurCarreau*\QuadNbLig}) ;%barre Seyes
+				\ifboolKV[Quadril]{DispBar}
+					{
+						\draw[thick,\QuadCoulSeyes] ({\ValeurCarreau*\useKV[Quadril]{Margin}},0) -- ({\ValeurCarreau*\useKV[Quadril]{Margin}},{-\ValeurCarreau*\QuadNbLig}) ;%barre Seyes
+					}{}
 			}%
 			{}%
 		\IfStrEq{\QuadType}{5x5}%
@@ -158,7 +278,10 @@
 		{%
 			\foreach \LLL in {0,1,...,\QuadNbLig} {\draw[,thin,\QuadCoulA] ({-\ValeurCarreau*\QuadElarG},{-\LLL*\ValeurCarreau}) -- ({\ValeurCarreau*\QuadNbCol+\ValeurCarreau*\QuadElarD},{-\ValeurCarreau*\LLL}) ; }
 			%\draw[xstep={\ValeurCarreau*\QuadNbCol},ystep=0.9,thin,\QuadCoulA] ({-\ValeurCarreau*\QuadElarG},0) grid ({\ValeurCarreau*\QuadNbCol+\ValeurCarreau*\QuadElarD},{-\ValeurCarreau*\QuadNbLig}) ;%grille college
-			\draw[thick,\QuadCoulB] ({\ValeurCarreau*\useKV[Quadril]{Margin}},0) -- ({\ValeurCarreau*\useKV[Quadril]{Margin}},{-\ValeurCarreau*\QuadNbLig}) ;%barre college
+			\ifboolKV[Quadril]{DispBar}
+					{
+						\draw[thick,\QuadCoulB] ({\ValeurCarreau*\useKV[Quadril]{Margin}},0) -- ({\ValeurCarreau*\useKV[Quadril]{Margin}},{-\ValeurCarreau*\QuadNbLig}) ;%barre college
+					}{}
 		}%
 		{}%
 		\ifboolKV[Quadril]{Border}%cadre pour la "marge"
author	Norbert Preining <norbert@preining.info>	2023-03-19 03:01:21 +0000
committer	Norbert Preining <norbert@preining.info>	2023-03-19 03:01:21 +0000
commit	41b65de3ca404c665b94ea7716f036ce4f024619 (patch)
tree	79b818f56264510a85b019c02e6d7b26238d9cfb /macros/latex
parent	b0cfbb3bcaeafdcb4da817c21937f10ce07f5dca (diff)