CTAN sync 202311090302

author: Norbert Preining <norbert@preining.info> 2023-11-09 03:02:39 +0000
committer: Norbert Preining <norbert@preining.info> 2023-11-09 03:02:39 +0000
commit: 3425ad695d75cc781b0fe3412db3aa2ad5985959 (patch)
tree: 9ec65bca1de4085db47511e67369ea2b71a488fa /macros/latex/contrib
parent: dada699771828d1aa3c78ecf55a2131e5f5799f3 (diff)
53 files changed, 837 insertions, 756 deletions
diff --git a/macros/latex/contrib/acmart/README b/macros/latex/contrib/acmart/README
index 3e301435a9..c354989831 100644
--- a/macros/latex/contrib/acmart/README
+++ b/macros/latex/contrib/acmart/README
@@ -12,6 +12,11 @@ The production version is the one on CTAN and ACM sites.
 
 Changes
 
+Version 2.00   ACM switches to electronic only version.
+	       We do not print article tabs anymore.
+	       New copyright wording.
+	       Deleted acmPrice.
+
 Version 1.93   Added PACMSE
 
 Version 1.92   Documentation update
diff --git a/macros/latex/contrib/acmart/acmart.dtx b/macros/latex/contrib/acmart/acmart.dtx
index 85f52456c4..b2f1d411b6 100644
--- a/macros/latex/contrib/acmart/acmart.dtx
+++ b/macros/latex/contrib/acmart/acmart.dtx
@@ -867,14 +867,12 @@
 %
 % \DescribeMacro{\acmArticleSeq}%
 % The articles in the same issue of a journal have a \emph{sequence
-% number}.  It is used to vertically position the black blob on the first
-% page of some formats.  By default it is the same as the article number,
+% number}.  By default it is the same as the article number,
 % but the command \cs{acmArticleSeq}\marg{n} can be used to change it:
 % \begin{verbatim}
 % \acmArticle{39}   % The sequence number will be 39 by default
 % \acmArticleSeq{5} % We redefine it to 5
 % \end{verbatim}
-% Setting this number to zero suppresses the blob.
 %
 % \DescribeMacro{\acmSubmissionID}%
 % If your paper got a Submission~ID from the Conference Management
@@ -884,18 +882,6 @@
 % \end{verbatim}
 %
 %
-% \DescribeMacro{\acmPrice}%
-% The macro \cs{acmPrice}\marg{price} sets the price for the article,
-% for example,
-% \begin{verbatim}
-% \acmPrice{25.00}
-% \end{verbatim}
-% Note that you do not need to put the dollar sign here, just the
-% amount.  By default the price is \$15.00, unless the copyright is
-% set to |usgov|, |rightsretained|, |iw3c2w3|, or |iw3c2w3g|, when it
-% is suppressed.  Note that to override the defaults you need to set
-% the price \emph{after} the \cs{setcopyright} command.  Also, the
-% command |\acmPrice{}| suppresses the printing of the price.
 %
 % \DescribeMacro{\acmISBN}%
 % Book-like volumes have ISBN numbers attached to them.  The macro
@@ -1004,8 +990,8 @@
 %
 % \DescribeMacro{\setcopyright}
 % There are several possibilities for the copyright of the papers
-% published by the ACM: the authors may transfer the rights to the ACM,
-% license them to the ACM, some or all authors might be employees of the
+% published by the ACM: the authors may license the paper 
+% to the ACM, some or all authors might be employees of the
 % US or Canadian governments, etc.  Accordingly the command
 % \verb|\setcopyright{...}| is introduced.  Its argument is the
 % copyright status of the paper, for example,
@@ -1025,8 +1011,6 @@
 %     \midrule
 %     \texttt{none} & The copyright and permission information is not
 %     typeset.  (This is the option for some ACM conferences.) \\
-%     \texttt{acmcopyright} & The authors transfer the copyright to the
-%     ACM (the ``traditional'' choice).\\
 %     \texttt{acmlicensed} & The authors retain the copyright but
 %     license the publication rights to ACM\@. \\
 %     \texttt{rightsretained} & The authors retain the copyright and
@@ -1058,8 +1042,15 @@
 %     \texttt{cc} & Creative Commons license.  If this key is set,
 %     \textsl{doclicense} images are used to typeset the license. See
 %     also \cs{setcctype} command.  Note that at present this license
-%     can be used only for \texttt{acmengage} format or for
-%     \texttt{nonacm} publications.\\
+%     can be used only either for \texttt{acmengage} format, or for
+%     \texttt{nonacm} publications, or for the authors that meet any
+%     of the following requirements: (a)~part of the ACM Open Program;
+%     (b)~publishing in a Gold Open Access publication;
+%     (c)~paying the Open Access APC;
+%     (d)~part of the Google publishing agreement.\\
+%     \texttt{acmcopyright} & The authors transfer the copyright to the
+%     ACM.  This choice is no longer available for the
+%     non-commissioned authors and will trigger a warning.\\
 %     \bottomrule
 %   \end{tabularx}
 % \end{table}
@@ -2103,10 +2094,7 @@
 %
 % \DescribeMacro{\AtBeginMaketitle}%
 % Another hook is \cs{AtBeginMaketitle}.  The commands in this hook
-% are executed before \cs{maketitle}, for example,
-% \begin{verbatim}
-% \AtBeginMaketitle{\acmPrice{125.00}}
-% \end{verbatim}
+% are executed before \cs{maketitle}.
 %
 %
 %\subsection{Currently supported publications}
@@ -2278,7 +2266,7 @@
 \ProvidesFile{acmart.dtx}
 %</gobble>
 %<class>\ProvidesClass{acmart}
-[2023/10/22 v1.93 Typesetting articles for the Association for Computing Machinery]
+[2023/11/05 v2.00 Typesetting articles for the Association for Computing Machinery]
 %    \end{macrocode}
 %
 % \changes{v1.00}{2016/04/14}{First released version}
@@ -5220,12 +5208,8 @@
 % \end{macro}
 %
 % \begin{macro}{\acmPrice}
-%   The price
-%    \begin{macrocode}
-\def\acmPrice#1{\def\@acmPrice{#1}}
-\acmPrice{15.00}
-%    \end{macrocode}
-%
+% \changes{v2.00}{2023/10/22}{Deleted macro}
+%   The price---obsolete
 % \end{macro}
 %
 %
@@ -5758,6 +5742,8 @@
 % to iw3c2w3 or iw3c2w3g}
 % \changes{v1.51}{2018/04/05}{Corrected the bug with price suppression}
 % \changes{v1.85}{2022/05/08}{Added CC licenses}
+% \changes{v2.00}{2023/10/22}{Deleted acmPrice}
+% \changes{v2.00}{2023/10/22}{Deleted acmPrice}
 % Keys:
 %    \begin{macrocode}
 \define@choicekey*{ACM@}{acmcopyrightmode}[%
@@ -5779,13 +5765,11 @@
   \fi
   \ifnum\acm@copyrightmode=3\relax % rightsretained
    \@acmownedfalse
-   \AtBeginDocument{\acmPrice{}}%
   \fi
   \ifnum\acm@copyrightmode=4\relax % usgov
    \@printpermissiontrue
    \@printcopyrightfalse
    \@acmownedfalse
-   \AtBeginDocument{\acmPrice{}}%
   \fi
   \ifnum\acm@copyrightmode=6\relax % cagov
    \@acmownedfalse
@@ -5807,15 +5791,12 @@
   \fi
   \ifnum\acm@copyrightmode=13\relax % iw3c2w3
    \@acmownedfalse
-   \AtBeginDocument{\acmPrice{}}%
   \fi
   \ifnum\acm@copyrightmode=14\relax % iw3c2w3g
    \@acmownedfalse
-   \AtBeginDocument{\acmPrice{}}%
   \fi
   \ifnum\acm@copyrightmode=15\relax % cc
    \@acmownedfalse
-   \AtBeginDocument{\acmPrice{}}%
   \fi}
 %    \end{macrocode}
 %
@@ -5823,7 +5804,7 @@
 %   This is the syntactic sugar around setting keys.
 %    \begin{macrocode}
 \def\setcopyright#1{\setkeys{ACM@}{acmcopyrightmode=#1}}
-\setcopyright{acmcopyright}
+\setcopyright{acmlicensed}
 %    \end{macrocode}
 %
 % \end{macro}
@@ -5845,12 +5826,13 @@
 % licensedcagov}
 % \changes{v1.52}{2018/04/09}{Rewording of licenses}
 % \changes{v1.85}{2022/05/08}{Added CC licenses}
+% \changes{v2.00}{2023/10/22}{Changed wording}
 %   Here is the owner of the copyright
 %    \begin{macrocode}
 \def\@copyrightowner{%
   \ifcase\acm@copyrightmode\relax % none
   \or % acmcopyright
-  Association for Computing Machinery.
+  ACM\@.
   \or % acmlicensed
   Copyright held by the owner/author(s). Publication rights licensed to
   ACM\@.
@@ -5858,22 +5840,21 @@
   Copyright held by the owner/author(s).
   \or % usgov
   \or % usgovmixed
-  Association for Computing Machinery.
+  Copyright held by the owner/author(s).
   \or % cagov
-  Crown in Right of Canada.
+  Copyright Crown in Right of Canada.
   \or %cagovmixed
-  Association for Computing Machinery.
+  Copyright held by the owner/author(s).
   \or %licensedusgovmixed
   Copyright held by the owner/author(s). Publication rights licensed to
   ACM\@.
   \or % licensedcagov
-  Crown in Right of Canada. Publication rights licensed to
-  ACM\@.
+  Copyright held by the owner/author(s). 
   \or %licensedcagovmixed
   Copyright held by the owner/author(s). Publication rights licensed to
   ACM\@.
   \or % othergov
-  Association for Computing Machinery.
+  Copyright held by the owner/author(s). 
   \or % licensedothergov
   Copyright held by the owner/author(s). Publication rights licensed to
   ACM\@.
@@ -5905,6 +5886,7 @@
 % At present cC licenses can be used only for acmengage format or for
 % non-acm stuff.  This macro checks whether the CC license is
 % applicable and generates an error if not.
+% \changes{v2.00}{2023/10/22}{Moved to warning}
 %    \begin{macrocode}
 \def\@ACM@copyright@check@cc{%
   \if@ACM@nonacm
@@ -5915,7 +5897,7 @@
         \ClassInfo{\@classname}{Using CC license with ACM Enage
           material}%
       \else
-      \ClassError{\@classname}{%
+      \ClassWarning{\@classname}{%
         Sorry, Creative Commons licenses are\MessageBreak
         currently not used with ACM publications\MessageBreak
         typeset by the authors}{Please use nonacm 
@@ -5934,6 +5916,7 @@
 % \changes{v1.85}{2022/05/08}{Added CC licenses}
 % \changes{v1.87}{2022/07/30}{CC licenses now are allowed only for
 % non-acm or ACM engage publications}
+% \changes{v2.00}{2023/10/24}{Rewrote wording}
 %   The canned permission block.
 %    \begin{macrocode}
 \def\@copyrightpermission{%
@@ -5945,10 +5928,10 @@
    advantage and that copies bear this notice and the full citation on
    the first page. Copyrights for components of this work owned by
    others than ACM must be honored. Abstracting with credit is
-   permitted. To copy otherwise, or republish, to post on servers or to
-   redistribute to lists, requires prior specific permission
-   and\hspace*{.5pt}/or  a fee. Request permissions from
-   permissions@acm.org.
+   permitted. To copy otherwise, or republish, to post on servers or
+   to redistribute to lists, requires prior specific permission
+   and\hspace*{.5pt}/or 
+   a fee. Request permissions from permissions@acm.org.
   \or % acmlicensed
    Permission to make digital or hard copies of all or part of this
    work for personal or classroom use is granted without fee provided
@@ -5956,97 +5939,102 @@
    advantage and that copies bear this notice and the full citation on
    the first page. Copyrights for components of this work owned by
    others than the author(s) must be honored. Abstracting with credit
-   is permitted.  To copy otherwise, or republish, to post on servers
-   or to  redistribute to lists, requires prior specific permission
-   and\hspace*{.5pt}/or  a fee. Request permissions from
-   permissions@acm.org.
+   is permitted. To copy otherwise, or republish, to post on servers
+   or to redistribute to lists, requires prior specific permission
+   and\hspace*{.5pt}/or a fee. Request permissions from
+   permissions@acm.org. 
   \or % rightsretained
-   Permission to make digital or hard copies of part or all of this work
-   for personal or classroom use is granted without fee provided that
-   copies are not made or distributed for profit or commercial advantage
-   and that copies bear this notice and the full citation on the first
-   page. Copyrights for third-party components of this work must be
-   honored. For all other uses, contact the
-   owner\hspace*{.5pt}/author(s).
+   Permission to make digital or hard copies of part or all of this
+   work for personal or classroom use is granted without fee provided
+   that copies are not made or distributed for profit or commercial
+   advantage and that copies bear this notice and the full citation on
+   the first page. Copyrights for third-party components of this work
+   must be honored. For all other uses, contact the
+   owner\hspace*{.5pt}/author(s). 
   \or % usgov
    This paper is authored by an employee(s) of the United States
    Government and is in the public domain. Non-exclusive copying or
    redistribution is allowed, provided that the article citation is
    given and the authors and agency are clearly identified as its
-   source.
+   source. All others Request permissions from
+   owner\hspace*{.5pt}/author(s). 
   \or % usgovmixed
    ACM acknowledges that this contribution was authored or co-authored
    by an employee, contractor, or affiliate of the United States
    government. As such, the United States government retains a
    nonexclusive, royalty-free right to publish or reproduce this
-   article, or to allow others to do so, for government purposes only.
+   article, or to allow others to do so, for government purposes
+   only. Request permissions from owner\hspace*{.5pt}/author(s). 
   \or % cagov
-   This article was authored by employees of the Government of Canada.
-   As such, the Canadian government retains all interest in the
-   copyright to this work and grants to ACM a nonexclusive,
-   royalty-free right to publish or reproduce this article, or to allow
-   others to do so, provided that clear attribution is given both to
-   the authors and the Canadian government agency employing them.
-   Permission to make digital or hard copies for personal or classroom
-   use is granted. Copies must bear this notice and the full citation
-   on the first page.  Copyrights for components of this work owned by
-   others than the Canadian Government must be honored. To copy
-   otherwise, distribute, republish, or post, requires prior specific
-   permission and\hspace*{.5pt}/or a fee. Request permissions from
-   permissions@acm.org.
+   This article was authored by employees of the Government of
+   Canada. As such, the Canadian government retains all interest in
+   the copyright to this work and grants to ACM a nonexclusive,
+   royalty-free right to publish or reproduce this article, or to
+   allow others to do so, provided that clear attribution is given
+   both to the authors and the Canadian government agency employing
+   them. Permission to make digital or hard copies for personal or
+   classroom use is granted. Copies must bear this notice and the full
+   citation on the first page. Copyrights for components of this work
+   owned by others than the Canadian Government must be honored. To
+   copy otherwise, distribute, republish, or post, requires prior
+   specific permission and/or a fee. Request permissions from
+   owner\hspace*{.5pt}/author(s). 
   \or % cagovmixed
    ACM acknowledges that this contribution was co-authored by an
    affiliate of the national government of Canada. As such, the Crown
-   in Right of Canada retains an equal interest in the copyright.
-   Reprints must include clear attribution to ACM and the author's
-   government agency affiliation.  Permission to make digital or hard
-   copies for personal or classroom use is granted.  Copies must bear
-   this notice and the full citation on the first page. Copyrights for
-   components of this work owned by others than ACM must be honored.
-   To copy otherwise, distribute, republish, or post, requires prior
-   specific permission and\hspace*{.5pt}/or a fee. Request permissions
-   from permissions@acm.org.
+   in Right of Canada retains an equal interest in the
+   copyright. Reprints must include clear attribution to ACM and the
+   author’s government agency affiliation. Permission to make digital
+   or hard copies for personal or classroom use is granted. Copies
+   must bear this notice and the full citation on the first
+   page. Copyrights for components of this work owned by others than
+   ACM must be honored. To copy otherwise, distribute, republish, or
+   post, requires prior specific permission and/or a fee. Request
+   permissions from owner\hspace*{.5pt}/author(s). 
   \or % licensedusgovmixed
    Publication rights licensed to ACM\@. ACM acknowledges that this
    contribution was authored or co-authored by an employee, contractor
    or affiliate of the United States government. As such, the
    Government retains a nonexclusive, royalty-free right to publish or
    reproduce this article, or to allow others to do so, for Government
-   purposes only.
+   purposes only. Request permissions from
+   owner\hspace*{.5pt}/author(s). 
   \or % licensedcagov
-   This article was authored by employees of the Government of Canada.
-   As such, the Canadian government retains all interest in the
-   copyright to this work and grants to ACM a nonexclusive,
-   royalty-free right to publish or reproduce this article, or to allow
-   others to do so, provided that clear attribution is given both to
-   the authors and the Canadian government agency employing them.
-   Permission to make digital or hard copies for personal or classroom
-   use is granted. Copies must bear this notice and the full citation
-   on the first page.  Copyrights for components of this work owned by
-   others than the Canadian Government must be honored. To copy
-   otherwise, distribute, republish, or post, requires prior specific
-   permission and\hspace*{.5pt}/or a fee. Request permissions from
-   permissions@acm.org.
+   This article was authored by employees of the Government of
+   Canada. As such, the Canadian government retains all interest in
+   the copyright to this work and grants to ACM a nonexclusive,
+   royalty-free right to publish or reproduce this article, or to
+   allow others to do so, provided that clear attribution is given
+   both to the authors and the Canadian government agency employing
+   them. Permission to make digital or hard copies for personal or
+   classroom use is granted. Copies must bear this notice and the full
+   citation on the first page. Copyrights for components of this work
+   owned by others than the Canadian Government must be honored. To
+   copy otherwise, distribute, republish, or post, requires prior
+   specific permission and/or a fee. Request permissions from
+   owner\hspace*{.5pt}/author(s). 
   \or % licensedcagovmixed
-   Publication rights licensed to ACM\@. ACM acknowledges that this
+   Publication rights licensed to ACM. ACM acknowledges that this
    contribution was authored or co-authored by an employee, contractor
    or affiliate of the national government of Canada. As such, the
    Government retains a nonexclusive, royalty-free right to publish or
    reproduce this article, or to allow others to do so, for Government
-   purposes only.
+   purposes only. Request permissions from
+   owner\hspace*{.5pt}/author(s). 
   \or % othergov
    ACM acknowledges that this contribution was authored or co-authored
-   by an employee, contractor or affiliate of a national government. As
-   such, the Government retains a nonexclusive, royalty-free right to
-   publish or reproduce this article, or to allow others to do so, for
-   Government purposes only.
+   by an employee, contractor or affiliate of a national
+   government. As such, the Government retains a nonexclusive,
+   royalty-free right to publish or reproduce this article, or to
+   allow others to do so, for Government purposes only. Request
+   permissions from owner\hspace*{.5pt}/author(s). 
   \or % licensedothergov
    Publication rights licensed to ACM\@. ACM acknowledges that this
    contribution was authored or co-authored by an employee, contractor
    or affiliate of a national government. As such, the Government
    retains a nonexclusive, royalty-free right to publish or reproduce
    this article, or to allow others to do so, for Government purposes
-   only.
+   only. Request permissions from owner\hspace*{.5pt}/author(s). 
  \or % iw3c2w3
    This paper is published under the Creative Commons Attribution~4.0
    International (CC-BY~4.0) license. Authors reserve their rights to
@@ -6248,7 +6236,10 @@
 % \changes{v1.76}{2021/04/05}{Put \cs{par} inside group for keywords}
 % \changes{v1.83}{2022/02/20}{I13n}
 % \changes{v1.85}{2022/05/08}{acmengage}
-% \changes{v1.87}{2022/07/30}{CC license are allowed for non-acm publications}
+% \changes{v1.87}{2022/07/30}{CC license are allowed for non-acm
+% publications}
+% \changes{v2.00}{2023/10/24}{Deleted acmPrice}
+% \changes{v2.00}{2023/11/05}{Added ``ACM'' for papers}
 %   The (in)famous \cs{maketitle}.  Note that in |sigchi-a| mode, authors
 %   are \emph{not} in the title box.
 %
@@ -6346,12 +6337,10 @@
         \else
           \if@ACM@nonacm\else
             \if@ACM@journal@bibstrip
-              \@permissionCodeOne/\@acmYear/\@acmMonth-ART\@acmArticle
-              \ifx\@acmPrice\@empty\else\ \$\@acmPrice\fi\\
+              ACM~\@permissionCodeOne/\@acmYear/\@acmMonth-ART\@acmArticle\\
               \@formatdoi{\@acmDOI}%
             \else % Conference
-              \ifx\@acmISBN\@empty\else ACM~ISBN~\@acmISBN
-              \ifx\@acmPrice\@empty.\else\dots\$\@acmPrice\fi\\\fi
+              \ifx\@acmISBN\@empty\else ACM~ISBN~\@acmISBN\\\fi
               \ifx\@acmDOI\@empty\else\@formatdoi{\@acmDOI}\fi%
             \fi
           \fi
@@ -7817,33 +7806,14 @@
 % \end{macro}
 %
 % \begin{macro}{\@folio@wd}
+% \changes{v2.00}{2023/10/22}{Obsoleted macro}
 % \begin{macro}{\@folio@ht}
+% \changes{v2.00}{2023/10/22}{Obsoleted macro}
 % \begin{macro}{\@folio@voffset}
+% \changes{v2.00}{2023/10/22}{Obsoleted macro}
 % \begin{macro}{\@folio@max}
+% \changes{v2.00}{2023/10/22}{Obsoleted macro}
 %   Folio blob width, height, offsets and max number
-%    \begin{macrocode}
-\newdimen\@folio@wd
-\@folio@wd=\z@
-\newdimen\@folio@ht
-\@folio@ht=\z@
-\newdimen\@folio@voffset
-\@folio@voffset=\z@
-\def\@folio@max{1}
-\ifcase\ACM@format@nr
-\relax % manuscript
-\or % acmsmall
-  \@folio@wd=45.75pt\relax
-  \@folio@ht=1.25in\relax
-  \@folio@voffset=.2in\relax
-  \def\@folio@max{8}
-\or % acmlarge
-  \@folio@wd=43.25pt\relax
-  \@folio@ht=79pt\relax
-  \@folio@voffset=.55in\relax
-  \def\@folio@max{10}
-\fi
-%    \end{macrocode}
-%
 % \end{macro}
 % \end{macro}
 % \end{macro}
@@ -7853,36 +7823,8 @@
 % \changes{v1.44}{2017/08/11}{Suppress the blob if acmArticleSeq is empty}
 % \changes{v1.45}{2017/08/15}{Switched \cs{bfeseries}\cs{sffamily} to
 % \cs{sffamily}\cs{bfseries}}
+% \changes{v2.00}{2023/10/22}{Obsoleted macro}
 %   The macro to typeset the folio blob.
-%    \begin{macrocode}
-\def\@folioblob{\@tempcnta=0\@acmArticleSeq\relax
-  \ifnum\@tempcnta=0\relax\else
-%    \end{macrocode}
-% First, we calculate \cs{@acmArticleSeq} modulo \cs{@folio@max}
-%    \begin{macrocode}
-  \loop
-     \ifnum\@tempcnta>\@folio@max\relax
-      \advance\@tempcnta by - \@folio@max
-   \repeat
-%    \end{macrocode}
-%
-%    \begin{macrocode}
-    \advance\@tempcnta by -1\relax
-    \@tempdima=\@folio@ht\relax
-    \multiply\@tempdima by \the\@tempcnta\relax
-    \advance\@tempdima by -\@folio@voffset\relax
-    \begin{picture}(0,0)
-    \makebox[\z@]{\raisebox{-\@tempdima}{%
-        \rlap{%
-          \raisebox{-0.45\@folio@ht}[\z@][\z@]{%
-            \rule{\@folio@wd}{\@folio@ht}}}%
-        \parbox{\@folio@wd}{%
-          \centering
-          \textcolor{white}{\LARGE\sffamily\bfseries\@acmArticle}}}}
-  \end{picture}\fi}
-
-%    \end{macrocode}
-%
 %
 % \end{macro}
 %
@@ -7899,6 +7841,7 @@
 % \changes{v1.59}{2019/04/20}{Moved page styles to \cs{AtBeginDocument}}
 % \changes{v1.87}{2022/08/14}{Special treatment for acmcp}
 % \changes{v1.89}{2022/12/27}{Moved badges here}
+% \changes{v2.00}{2023/10/22}{Deleted blobs}
 %   The page style for the first page only.
 %    \begin{macrocode}
 \AtBeginDocument{%
@@ -7921,22 +7864,20 @@
         \@acmNumber, Article \@acmArticle.  Publication date:
         \@acmPubDate.}%
       \fi%
-      \fancyhead[LE]{\ACM@linecountL\@folioblob\@acmBadgeL}%
+      \fancyhead[LE]{\ACM@linecountL\@acmBadgeL}%
       \fancyhead[LO]{\ACM@linecountL\@acmBadgeL}%
-      \fancyhead[RO]{\@acmBadgeR\@folioblob}%
+      \fancyhead[RO]{\@acmBadgeR}%
       \fancyhead[RE]{\@acmBadgeR}%
-      \fancyheadoffset[RO,LE]{0.6\@folio@wd}%
     \or % acmlarge
       \if@ACM@nonacm\else%
         \fancyfoot[RO,LE]{\footnotesize \@journalNameShort, Vol. \@acmVolume, No.
         \@acmNumber, Article \@acmArticle.  Publication date:
         \@acmPubDate.}%
       \fi%
-      \fancyhead[RO]{\@acmBadgeR\@folioblob}%
+      \fancyhead[RO]{\@acmBadgeR}%
       \fancyhead[RE]{\@acmBadgeR}%
-      \fancyhead[LE]{\ACM@linecountL\@folioblob\@acmBadgeL}%
+      \fancyhead[LE]{\ACM@linecountL\@acmBadgeL}%
       \fancyhead[LO]{\ACM@linecountL\@acmBadgeL}%
-      \fancyheadoffset[RO,LE]{1.4\@folio@wd}%
     \or % acmtog
       \if@ACM@nonacm\else%
         \fancyfoot[RO,LE]{\footnotesize \@journalNameShort, Vol. \@acmVolume, No.
diff --git a/macros/latex/contrib/acmart/acmart.pdf b/macros/latex/contrib/acmart/acmart.pdf
index ddbd0be338..c913a47d4c 100644
--- a/macros/latex/contrib/acmart/acmart.pdf
+++ b/macros/latex/contrib/acmart/acmart.pdf
diff --git a/macros/latex/contrib/acmart/acmguide.pdf b/macros/latex/contrib/acmart/acmguide.pdf
index a05de826e3..b3d7e385b0 100644
--- a/macros/latex/contrib/acmart/acmguide.pdf
+++ b/macros/latex/contrib/acmart/acmguide.pdf
diff --git a/macros/latex/contrib/acmart/samples/sample-acmcp.pdf b/macros/latex/contrib/acmart/samples/sample-acmcp.pdf
index 7bbe90e88a..655f9179a4 100644
--- a/macros/latex/contrib/acmart/samples/sample-acmcp.pdf
+++ b/macros/latex/contrib/acmart/samples/sample-acmcp.pdf
diff --git a/macros/latex/contrib/acmart/samples/sample-acmengage.pdf b/macros/latex/contrib/acmart/samples/sample-acmengage.pdf
index e04738a35f..085b9cfad7 100644
--- a/macros/latex/contrib/acmart/samples/sample-acmengage.pdf
+++ b/macros/latex/contrib/acmart/samples/sample-acmengage.pdf
diff --git a/macros/latex/contrib/acmart/samples/sample-acmlarge.pdf b/macros/latex/contrib/acmart/samples/sample-acmlarge.pdf
index 5897c7d07c..7520d0f5fe 100644
--- a/macros/latex/contrib/acmart/samples/sample-acmlarge.pdf
+++ b/macros/latex/contrib/acmart/samples/sample-acmlarge.pdf
diff --git a/macros/latex/contrib/acmart/samples/sample-acmsmall-biblatex.pdf b/macros/latex/contrib/acmart/samples/sample-acmsmall-biblatex.pdf
index 30f9bd362c..c6db217566 100644
--- a/macros/latex/contrib/acmart/samples/sample-acmsmall-biblatex.pdf
+++ b/macros/latex/contrib/acmart/samples/sample-acmsmall-biblatex.pdf
diff --git a/macros/latex/contrib/acmart/samples/sample-acmsmall-conf.pdf b/macros/latex/contrib/acmart/samples/sample-acmsmall-conf.pdf
index 0173d1db05..032fa512e0 100644
--- a/macros/latex/contrib/acmart/samples/sample-acmsmall-conf.pdf
+++ b/macros/latex/contrib/acmart/samples/sample-acmsmall-conf.pdf
diff --git a/macros/latex/contrib/acmart/samples/sample-acmsmall-submission.pdf b/macros/latex/contrib/acmart/samples/sample-acmsmall-submission.pdf
index 820223b983..a76c447705 100644
--- a/macros/latex/contrib/acmart/samples/sample-acmsmall-submission.pdf
+++ b/macros/latex/contrib/acmart/samples/sample-acmsmall-submission.pdf
diff --git a/macros/latex/contrib/acmart/samples/sample-acmsmall.pdf b/macros/latex/contrib/acmart/samples/sample-acmsmall.pdf
index 94e18b39b4..a794f82dd2 100644
--- a/macros/latex/contrib/acmart/samples/sample-acmsmall.pdf
+++ b/macros/latex/contrib/acmart/samples/sample-acmsmall.pdf
diff --git a/macros/latex/contrib/acmart/samples/sample-acmtog.pdf b/macros/latex/contrib/acmart/samples/sample-acmtog.pdf
index d199c8c450..a46ef43225 100644
--- a/macros/latex/contrib/acmart/samples/sample-acmtog.pdf
+++ b/macros/latex/contrib/acmart/samples/sample-acmtog.pdf
diff --git a/macros/latex/contrib/acmart/samples/sample-authordraft.pdf b/macros/latex/contrib/acmart/samples/sample-authordraft.pdf
index 2094e4c8b8..6947dbf64d 100644
--- a/macros/latex/contrib/acmart/samples/sample-authordraft.pdf
+++ b/macros/latex/contrib/acmart/samples/sample-authordraft.pdf
diff --git a/macros/latex/contrib/acmart/samples/sample-lualatex.pdf b/macros/latex/contrib/acmart/samples/sample-lualatex.pdf
index 559e6a9a7e..19fe246de3 100644
--- a/macros/latex/contrib/acmart/samples/sample-lualatex.pdf
+++ b/macros/latex/contrib/acmart/samples/sample-lualatex.pdf
diff --git a/macros/latex/contrib/acmart/samples/sample-manuscript.pdf b/macros/latex/contrib/acmart/samples/sample-manuscript.pdf
index afe006230b..32543cc1db 100644
--- a/macros/latex/contrib/acmart/samples/sample-manuscript.pdf
+++ b/macros/latex/contrib/acmart/samples/sample-manuscript.pdf
diff --git a/macros/latex/contrib/acmart/samples/sample-sigconf-biblatex.pdf b/macros/latex/contrib/acmart/samples/sample-sigconf-biblatex.pdf
index 6a506cf32f..90a3155de7 100644
--- a/macros/latex/contrib/acmart/samples/sample-sigconf-biblatex.pdf
+++ b/macros/latex/contrib/acmart/samples/sample-sigconf-biblatex.pdf
diff --git a/macros/latex/contrib/acmart/samples/sample-sigconf-i13n.pdf b/macros/latex/contrib/acmart/samples/sample-sigconf-i13n.pdf
index 72bf2739e5..8b336f003d 100644
--- a/macros/latex/contrib/acmart/samples/sample-sigconf-i13n.pdf
+++ b/macros/latex/contrib/acmart/samples/sample-sigconf-i13n.pdf
diff --git a/macros/latex/contrib/acmart/samples/sample-sigconf.pdf b/macros/latex/contrib/acmart/samples/sample-sigconf.pdf
index 5ed27710ae..1cf2c92ff4 100644
--- a/macros/latex/contrib/acmart/samples/sample-sigconf.pdf
+++ b/macros/latex/contrib/acmart/samples/sample-sigconf.pdf
diff --git a/macros/latex/contrib/acmart/samples/sample-sigplan.pdf b/macros/latex/contrib/acmart/samples/sample-sigplan.pdf
index 36bc1678dd..1a745c54fc 100644
--- a/macros/latex/contrib/acmart/samples/sample-sigplan.pdf
+++ b/macros/latex/contrib/acmart/samples/sample-sigplan.pdf
diff --git a/macros/latex/contrib/acmart/samples/sample-xelatex.pdf b/macros/latex/contrib/acmart/samples/sample-xelatex.pdf
index 18a01f2b0d..27fa5857dc 100644
--- a/macros/latex/contrib/acmart/samples/sample-xelatex.pdf
+++ b/macros/latex/contrib/acmart/samples/sample-xelatex.pdf
diff --git a/macros/latex/contrib/acmart/samples/samples.dtx b/macros/latex/contrib/acmart/samples/samples.dtx
index 1dccd8c8fe..d970b49ffb 100644
--- a/macros/latex/contrib/acmart/samples/samples.dtx
+++ b/macros/latex/contrib/acmart/samples/samples.dtx
@@ -54,7 +54,7 @@
 %% the commands and values with those provided to you when you
 %% complete the rights form.
 %
-\setcopyright{acmcopyright}
+\setcopyright{acmlicensed}
 \copyrightyear{2018}
 \acmYear{2018}
 \acmDOI{XXXXXXX.XXXXXXX}
@@ -71,7 +71,6 @@
 %%
 %%\acmBooktitle{Woodstock '18: ACM Symposium on Neural Gaze Detection,
 %%  June 03--05, 2018, Woodstock, NY} 
-\acmPrice{15.00}
 \acmISBN{978-1-4503-XXXX-X/18/06}
 %</manuscript|sigconf|authordraft|sigplan|sigchi|sigchi-a|acmsmall-conf|sigconf-i13n>
 
diff --git a/macros/latex/contrib/newpax/README.md b/macros/latex/contrib/newpax/README.md
index 16512aeda4..4bb419f2a2 100644
--- a/macros/latex/contrib/newpax/README.md
+++ b/macros/latex/contrib/newpax/README.md
@@ -7,7 +7,7 @@ a lua script first.
 
 The package is based on and uses code from [pax](https://ctan.org/pkg/pax) by Heiko Oberdiek.
 
-Packageversion: 0.54 
+Packageversion: 0.55 
 Packagedate: 2023-09-11 Author: Ulrike Fischer 
 
 ## License
diff --git a/macros/latex/contrib/newpax/doc-input1.pdf b/macros/latex/contrib/newpax/doc-input1.pdf
index e91cf726d2..6d0cfb31ca 100644
--- a/macros/latex/contrib/newpax/doc-input1.pdf
+++ b/macros/latex/contrib/newpax/doc-input1.pdf
@@ -435,17 +435,17 @@ stream
    </dc:language>
    <dc:date>
     <rdf:Seq>
-     <rdf:li>2023-09-11T09:45:32+02:00</rdf:li>
+     <rdf:li>2023-11-08T16:29:09+01:00</rdf:li>
     </rdf:Seq>
    </dc:date>
    <dc:format>application/pdf</dc:format>
    <dc:source>doc-input1.tex</dc:source>
    <xmp:CreatorTool>creator</xmp:CreatorTool>
-   <xmp:CreateDate>2023-09-11T09:45:32+02:00</xmp:CreateDate>
-   <xmp:ModifyDate>2023-09-11T09:45:32+02:00</xmp:ModifyDate>
-   <xmp:MetadataDate>2023-09-11T09:45:32+02:00</xmp:MetadataDate>
+   <xmp:CreateDate>2023-11-08T16:29:09+01:00</xmp:CreateDate>
+   <xmp:ModifyDate>2023-11-08T16:29:09+01:00</xmp:ModifyDate>
+   <xmp:MetadataDate>2023-11-08T16:29:09+01:00</xmp:MetadataDate>
    <xmpMM:DocumentID>uuid:1514a2cc-94f2-4cd2-8421-7b05d4a0d0e4</xmpMM:DocumentID>
-   <xmpMM:InstanceID>uuid:4ab49bf9-52f4-4808-80ab-b09816843af0</xmpMM:InstanceID>
+   <xmpMM:InstanceID>uuid:99a4c8a3-a305-4089-8a75-bbf0223458c8</xmpMM:InstanceID>
    <prism:complianceProfile>three</prism:complianceProfile>
    <prism:pageCount>4</prism:pageCount>
   </rdf:Description>
@@ -793,7 +793,7 @@ endobj
 << /Type /Catalog /Pages 36 0 R /Outlines 85 0 R /Names 87 0 R /Lang (en-US)/PageMode /UseOutlines/OpenAction [5 0 R /Fit]/PageLabels <</Nums[0<</S/D>>]>>/Metadata 53 0 R >>
 endobj
 89 0 obj
-<< /Producer (luahbtex-1.17.0)/Creator <FEFF00630072006500610074006F0072>/Author <FEFF0041007500740068006F0072>/Title <FEFF007400690074006C0065>/CreationDate (D:20230911094532+02'00')/ModDate (D:20230911094532+02'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.17.0 (TeX Live 2023)) >>
+<< /Producer (luahbtex-1.17.0)/Creator <FEFF00630072006500610074006F0072>/Author <FEFF0041007500740068006F0072>/Title <FEFF007400690074006C0065>/CreationDate (D:20231108162909+01'00')/ModDate (D:20231108162909+01'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.17.0 (TeX Live 2023)) >>
 endobj
 xref
 0 90
@@ -888,7 +888,7 @@ xref
 0000040337 00000 n 
 0000040527 00000 n 
 trailer
-<< /Size 90 /Root 88 0 R /Info 89 0 R /ID [ <FDB59370C120935595D5CC14A47A4CAB> <FDB59370C120935595D5CC14A47A4CAB> ] >>
+<< /Size 90 /Root 88 0 R /Info 89 0 R /ID [ <A4E45761D8FBA6478D60B5DCD3DC6C4F> <A4E45761D8FBA6478D60B5DCD3DC6C4F> ] >>
 startxref
 40848
 %%EOF
diff --git a/macros/latex/contrib/newpax/doc-input2.pdf b/macros/latex/contrib/newpax/doc-input2.pdf
index 3f1a700642..df9f2ea640 100644
--- a/macros/latex/contrib/newpax/doc-input2.pdf
+++ b/macros/latex/contrib/newpax/doc-input2.pdf
@@ -431,17 +431,17 @@ stream
    </dc:language>
    <dc:date>
     <rdf:Seq>
-     <rdf:li>2023-09-11T09:45:49+02:00</rdf:li>
+     <rdf:li>2023-11-08T16:29:29+01:00</rdf:li>
     </rdf:Seq>
    </dc:date>
    <dc:format>application/pdf</dc:format>
    <dc:source>doc-input2.tex</dc:source>
    <xmp:CreatorTool>creator</xmp:CreatorTool>
-   <xmp:CreateDate>2023-09-11T09:45:49+02:00</xmp:CreateDate>
-   <xmp:ModifyDate>2023-09-11T09:45:49+02:00</xmp:ModifyDate>
-   <xmp:MetadataDate>2023-09-11T09:45:49+02:00</xmp:MetadataDate>
+   <xmp:CreateDate>2023-11-08T16:29:29+01:00</xmp:CreateDate>
+   <xmp:ModifyDate>2023-11-08T16:29:29+01:00</xmp:ModifyDate>
+   <xmp:MetadataDate>2023-11-08T16:29:29+01:00</xmp:MetadataDate>
    <xmpMM:DocumentID>uuid:f7ab701c-3045-4af6-8721-3e4af6706f34</xmpMM:DocumentID>
-   <xmpMM:InstanceID>uuid:5d3e8026-12da-4ae0-807e-b252296394f8</xmpMM:InstanceID>
+   <xmpMM:InstanceID>uuid:492a912b-2983-45bc-83b5-6abca7837fcc</xmpMM:InstanceID>
    <prism:complianceProfile>three</prism:complianceProfile>
    <prism:pageCount>4</prism:pageCount>
   </rdf:Description>
@@ -789,7 +789,7 @@ endobj
 << /Type /Catalog /Pages 35 0 R /Outlines 84 0 R /Names 86 0 R /Lang (en-US)/PageMode /UseOutlines/OpenAction [5 0 R /Fit]/PageLabels <</Nums[0<</S/D>>]>>/Metadata 52 0 R >>
 endobj
 88 0 obj
-<< /Producer (luahbtex-1.17.0)/Creator <FEFF00630072006500610074006F0072>/Author <FEFF0041007500740068006F0072>/Title <FEFF007400690074006C0065>/CreationDate (D:20230911094549+02'00')/ModDate (D:20230911094549+02'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.17.0 (TeX Live 2023)) >>
+<< /Producer (luahbtex-1.17.0)/Creator <FEFF00630072006500610074006F0072>/Author <FEFF0041007500740068006F0072>/Title <FEFF007400690074006C0065>/CreationDate (D:20231108162929+01'00')/ModDate (D:20231108162929+01'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.17.0 (TeX Live 2023)) >>
 endobj
 xref
 0 89
@@ -883,7 +883,7 @@ xref
 0000040068 00000 n 
 0000040258 00000 n 
 trailer
-<< /Size 89 /Root 87 0 R /Info 88 0 R /ID [ <62CD8693677EF115C92FE23BA5EE804C> <62CD8693677EF115C92FE23BA5EE804C> ] >>
+<< /Size 89 /Root 87 0 R /Info 88 0 R /ID [ <E5150FD8F27B54081E4DFB9B6972E3E4> <E5150FD8F27B54081E4DFB9B6972E3E4> ] >>
 startxref
 40579
 %%EOF
diff --git a/macros/latex/contrib/newpax/doc-use-newpax.pdf b/macros/latex/contrib/newpax/doc-use-newpax.pdf
index dcbeb8af5c..70a9d5a860 100644
--- a/macros/latex/contrib/newpax/doc-use-newpax.pdf
+++ b/macros/latex/contrib/newpax/doc-use-newpax.pdf
@@ -74,7 +74,7 @@ Q
 endstream
 endobj
 6 0 obj
-<< /Type /XObject /Subtype /Form /FormType 1 /PTEX.PageNumber 1 /PTEX.InfoDict << /Producer (luahbtex-1.17.0) /Creator <FEFF00630072006500610074006F0072> /Author <FEFF0041007500740068006F0072> /Title <FEFF007400690074006C0065> /CreationDate (D:20230911094532+02'00') /ModDate (D:20230911094532+02'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.17.0 (TeX Live 2023)) >> /BBox [ 0 0 612 792 ] /Resources << /ExtGState 69 0 R /Font << /F15 70 0 R /F16 71 0 R /F28 72 0 R >> /ProcSet [ /PDF /Text ] >> /Length 4809 >>       
+<< /Type /XObject /Subtype /Form /FormType 1 /PTEX.PageNumber 1 /PTEX.InfoDict << /Producer (luahbtex-1.17.0) /Creator <FEFF00630072006500610074006F0072> /Author <FEFF0041007500740068006F0072> /Title <FEFF007400690074006C0065> /CreationDate (D:20231108162909+01'00') /ModDate (D:20231108162909+01'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.17.0 (TeX Live 2023)) >> /BBox [ 0 0 612 792 ] /Resources << /ExtGState 69 0 R /Font << /F15 70 0 R /F16 71 0 R /F28 72 0 R >> /ProcSet [ /PDF /Text ] >> /Length 4809 >>       
 stream
 /opacity1 gs
 BT
@@ -383,7 +383,7 @@ Q
 endstream
 endobj
 23 0 obj
-<< /Type /XObject /Subtype /Form /FormType 1 /PTEX.PageNumber 2 /PTEX.InfoDict << /Producer (luahbtex-1.17.0) /Creator <FEFF00630072006500610074006F0072> /Author <FEFF0041007500740068006F0072> /Title <FEFF007400690074006C0065> /CreationDate (D:20230911094532+02'00') /ModDate (D:20230911094532+02'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.17.0 (TeX Live 2023)) >> /BBox [ 0 0 612 792 ] /Resources << /ExtGState 69 0 R /Font << /F16 71 0 R /F15 70 0 R >> /ProcSet [ /PDF /Text ] >> /Length 302 >>        
+<< /Type /XObject /Subtype /Form /FormType 1 /PTEX.PageNumber 2 /PTEX.InfoDict << /Producer (luahbtex-1.17.0) /Creator <FEFF00630072006500610074006F0072> /Author <FEFF0041007500740068006F0072> /Title <FEFF007400690074006C0065> /CreationDate (D:20231108162909+01'00') /ModDate (D:20231108162909+01'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.17.0 (TeX Live 2023)) >> /BBox [ 0 0 612 792 ] /Resources << /ExtGState 69 0 R /Font << /F16 71 0 R /F15 70 0 R >> /ProcSet [ /PDF /Text ] >> /Length 302 >>        
 stream
 /opacity1 gs
 BT
@@ -439,118 +439,118 @@ endobj
 << /XObject << /Im1 6 0 R >> /ProcSet [ /PDF ] >>
 endobj
 10 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>>  /Rect [ 170.027 634.719 247.113 640.314 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</W 1/S/U>>  /Rect [ 170.027 634.719 247.113 640.314 ] >>
 endobj
 11 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>>  /Rect [ 165.877 628.861 284.634 634.446 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</W 1/S/U>>  /Rect [ 165.877 628.861 284.634 634.446 ] >>
 endobj
 12 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>>  /Rect [ 158.903 623.377 284.634 627.915 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</W 1/S/U>>  /Rect [ 158.903 623.377 284.634 627.915 ] >>
 endobj
 13 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>>  /Rect [ 158.903 617.399 284.634 621.937 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</W 1/S/U>>  /Rect [ 158.903 617.399 284.634 621.937 ] >>
 endobj
 14 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>>  /Rect [ 158.903 611.422 284.634 615.96 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</W 1/S/U>>  /Rect [ 158.903 611.422 284.634 615.96 ] >>
 endobj
 15 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>>  /Rect [ 158.903 605.449 284.634 610.037 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</W 1/S/U>>  /Rect [ 158.903 605.449 284.634 610.037 ] >>
 endobj
 16 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>>  /Rect [ 158.903 599.472 284.634 604.005 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</W 1/S/U>>  /Rect [ 158.903 599.472 284.634 604.005 ] >>
 endobj
 17 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>>  /Rect [ 158.903 593.494 284.634 598.027 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</W 1/S/U>>  /Rect [ 158.903 593.494 284.634 598.027 ] >>
 endobj
 18 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>>  /Rect [ 158.903 587.512 284.634 592.05 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</W 1/S/U>>  /Rect [ 158.903 587.512 284.634 592.05 ] >>
 endobj
 19 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>>  /Rect [ 158.903 581.594 284.634 586.072 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</W 1/S/U>>  /Rect [ 158.903 581.594 284.634 586.072 ] >>
 endobj
 20 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>>  /Rect [ 158.903 575.561 284.634 580.094 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</W 1/S/U>>  /Rect [ 158.903 575.561 284.634 580.094 ] >>
 endobj
 21 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>>  /Rect [ 158.903 569.579 284.634 574.117 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</W 1/S/U>>  /Rect [ 158.903 569.579 284.634 574.117 ] >>
 endobj
 22 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.444706 0.456472 0.680002 ] /A <</Type/Action/S/GoToR/F<</AFRelationship/Unspecified/F <FEFF002F0063002F007400650078006C006900760065002F0032003000320030002F007400650078006D0066002D0064006900730074002F0064006F0063002F006C0061007400650078002F0062006100730065002F0064006F0063002E007000640066>/Subtype/application#2Fpdf/Type/Filespec/UF <FEFF002F0063002F007400650078006C006900760065002F0032003000320030002F007400650078006D0066002D0064006900730074002F0064006F0063002F006C0061007400650078002F0062006100730065002F0064006F0063002E007000640066>>>/D(chapter.1)>> /BS <</S/U/W 1>>  /Rect [ 165.877 563.163 174.077 568.637 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.444706 0.456472 0.680002 ] /A <</Type/Action/S/GoToR/F<</AFRelationship/Unspecified/F <FEFF002F0063002F007400650078006C006900760065002F0032003000320030002F007400650078006D0066002D0064006900730074002F0064006F0063002F006C0061007400650078002F0062006100730065002F0064006F0063002E007000640066>/Subtype/application#2Fpdf/Type/Filespec/UF <FEFF002F0063002F007400650078006C006900760065002F0032003000320030002F007400650078006D0066002D0064006900730074002F0064006F0063002F006C0061007400650078002F0062006100730065002F0064006F0063002E007000640066>>>/D(chapter.1)>> /BS <</W 1/S/U>>  /Rect [ 165.877 563.163 174.077 568.637 ] >>
 endobj
 25 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>>  /Rect [ 290.943 640.697 368.029 646.291 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</W 1/S/U>>  /Rect [ 290.943 640.697 368.029 646.291 ] >>
 endobj
 32 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>>  /Rect [ 170.027 492.841 247.113 498.436 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</W 1/S/U>>  /Rect [ 170.027 492.841 247.113 498.436 ] >>
 endobj
 33 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>>  /Rect [ 165.877 486.983 284.634 492.568 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</W 1/S/U>>  /Rect [ 165.877 486.983 284.634 492.568 ] >>
 endobj
 34 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>>  /Rect [ 158.903 481.499 284.634 486.037 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</W 1/S/U>>  /Rect [ 158.903 481.499 284.634 486.037 ] >>
 endobj
 35 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>>  /Rect [ 158.903 475.521 284.634 480.059 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</W 1/S/U>>  /Rect [ 158.903 475.521 284.634 480.059 ] >>
 endobj
 36 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>>  /Rect [ 158.903 469.544 284.634 474.082 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</W 1/S/U>>  /Rect [ 158.903 469.544 284.634 474.082 ] >>
 endobj
 37 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>>  /Rect [ 158.903 463.571 284.634 468.159 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</W 1/S/U>>  /Rect [ 158.903 463.571 284.634 468.159 ] >>
 endobj
 38 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>>  /Rect [ 158.903 457.594 284.634 462.127 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</W 1/S/U>>  /Rect [ 158.903 457.594 284.634 462.127 ] >>
 endobj
 39 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>>  /Rect [ 158.903 451.616 284.634 456.149 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</W 1/S/U>>  /Rect [ 158.903 451.616 284.634 456.149 ] >>
 endobj
 40 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>>  /Rect [ 158.903 445.634 284.634 450.172 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</W 1/S/U>>  /Rect [ 158.903 445.634 284.634 450.172 ] >>
 endobj
 41 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>>  /Rect [ 158.903 439.716 284.634 444.194 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</W 1/S/U>>  /Rect [ 158.903 439.716 284.634 444.194 ] >>
 endobj
 42 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>>  /Rect [ 158.903 433.683 284.634 438.216 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</W 1/S/U>>  /Rect [ 158.903 433.683 284.634 438.216 ] >>
 endobj
 43 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>>  /Rect [ 158.903 427.701 284.634 432.239 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</W 1/S/U>>  /Rect [ 158.903 427.701 284.634 432.239 ] >>
 endobj
 44 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.444706 0.456472 0.680002 ] /A <</Type/Action/S/GoToR/F<</AFRelationship/Unspecified/F <FEFF002F0063002F007400650078006C006900760065002F0032003000320030002F007400650078006D0066002D0064006900730074002F0064006F0063002F006C0061007400650078002F0062006100730065002F0064006F0063002E007000640066>/Subtype/application#2Fpdf/Type/Filespec/UF <FEFF002F0063002F007400650078006C006900760065002F0032003000320030002F007400650078006D0066002D0064006900730074002F0064006F0063002F006C0061007400650078002F0062006100730065002F0064006F0063002E007000640066>>>/D(chapter.1)>> /BS <</S/U/W 1>>  /Rect [ 165.877 421.285 174.077 426.759 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.444706 0.456472 0.680002 ] /A <</Type/Action/S/GoToR/F<</AFRelationship/Unspecified/F <FEFF002F0063002F007400650078006C006900760065002F0032003000320030002F007400650078006D0066002D0064006900730074002F0064006F0063002F006C0061007400650078002F0062006100730065002F0064006F0063002E007000640066>/Subtype/application#2Fpdf/Type/Filespec/UF <FEFF002F0063002F007400650078006C006900760065002F0032003000320030002F007400650078006D0066002D0064006900730074002F0064006F0063002F006C0061007400650078002F0062006100730065002F0064006F0063002E007000640066>>>/D(chapter.1)>> /BS <</W 1/S/U>>  /Rect [ 165.877 421.285 174.077 426.759 ] >>
 endobj
 46 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>>  /Rect [ 290.943 498.819 368.029 504.413 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</W 1/S/U>>  /Rect [ 290.943 498.819 368.029 504.413 ] >>
 endobj
 8 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.701176 0.4 0.414118 ] /BS <</S/U/W 1>>  /Rect [ 167.511 640.787 187.387 647.287 ]/A  << /S /GoTo /D (doc-input1.newpax@section.2) >> >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.701176 0.4 0.414118 ] /BS <</W 1/S/U>>  /Rect [ 167.511 640.787 187.387 647.287 ]/A  << /S /GoTo /D (doc-input1.newpax@section.2) >> >>
 endobj
 9 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.701176 0.4 0.414118 ] /BS <</S/U/W 1>>  /Rect [ 164.881 633.723 170.361 641.31 ]/A  << /S /GoTo /D (doc-input1.newpax@section.1) >> >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.701176 0.4 0.414118 ] /BS <</W 1/S/U>>  /Rect [ 164.881 633.723 170.361 641.31 ]/A  << /S /GoTo /D (doc-input1.newpax@section.1) >> >>
 endobj
 26 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.701176 0.4 0.414118 ] /BS <</S/U/W 1>>  /Rect [ 289.946 634.754 295.426 641.17 ]/A  << /S /GoTo /D (doc-input1.newpax@section.1) >> >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.701176 0.4 0.414118 ] /BS <</W 1/S/U>>  /Rect [ 289.946 634.754 295.426 641.17 ]/A  << /S /GoTo /D (doc-input1.newpax@section.1) >> >>
 endobj
 27 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.701176 0.4 0.414118 ] /BS <</S/U/W 1>>  /Rect [ 299.077 634.754 304.556 641.17 ]/A  << /S /GoTo /D (doc-input1.newpax@section.2) >> >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.701176 0.4 0.414118 ] /BS <</W 1/S/U>>  /Rect [ 299.077 634.754 304.556 641.17 ]/A  << /S /GoTo /D (doc-input1.newpax@section.2) >> >>
 endobj
 28 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.701176 0.4 0.414118 ] /BS <</S/U/W 1>>  /Rect [ 308.208 634.754 313.687 641.17 ]/A  << /S /GoTo /D (doc-input1.newpax@section.3) >> >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.701176 0.4 0.414118 ] /BS <</W 1/S/U>>  /Rect [ 308.208 634.754 313.687 641.17 ]/A  << /S /GoTo /D (doc-input1.newpax@section.3) >> >>
 endobj
 30 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.701176 0.4 0.414118 ] /BS <</S/U/W 1>>  /Rect [ 167.511 498.909 187.387 505.409 ]/A  << /S /GoTo /D (doc-input1.newpax@section.2@B) >> >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.701176 0.4 0.414118 ] /BS <</W 1/S/U>>  /Rect [ 167.511 498.909 187.387 505.409 ]/A  << /S /GoTo /D (doc-input1.newpax@section.2@B) >> >>
 endobj
 31 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.701176 0.4 0.414118 ] /BS <</S/U/W 1>>  /Rect [ 164.881 491.845 170.361 499.432 ]/A  << /S /GoTo /D (doc-input1.newpax@section.1@B) >> >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.701176 0.4 0.414118 ] /BS <</W 1/S/U>>  /Rect [ 164.881 491.845 170.361 499.432 ]/A  << /S /GoTo /D (doc-input1.newpax@section.1@B) >> >>
 endobj
 47 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.701176 0.4 0.414118 ] /BS <</S/U/W 1>>  /Rect [ 289.946 492.876 295.426 499.292 ]/A  << /S /GoTo /D (doc-input1.newpax@section.1@B) >> >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.701176 0.4 0.414118 ] /BS <</W 1/S/U>>  /Rect [ 289.946 492.876 295.426 499.292 ]/A  << /S /GoTo /D (doc-input1.newpax@section.1@B) >> >>
 endobj
 48 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.701176 0.4 0.414118 ] /BS <</S/U/W 1>>  /Rect [ 299.077 492.876 304.556 499.292 ]/A  << /S /GoTo /D (doc-input1.newpax@section.2@B) >> >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.701176 0.4 0.414118 ] /BS <</W 1/S/U>>  /Rect [ 299.077 492.876 304.556 499.292 ]/A  << /S /GoTo /D (doc-input1.newpax@section.2@B) >> >>
 endobj
 49 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.701176 0.4 0.414118 ] /BS <</S/U/W 1>>  /Rect [ 308.208 492.876 313.687 499.292 ]/A  << /S /GoTo /D (doc-input1.newpax@section.3@B) >> >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.701176 0.4 0.414118 ] /BS <</W 1/S/U>>  /Rect [ 308.208 492.876 313.687 499.292 ]/A  << /S /GoTo /D (doc-input1.newpax@section.3@B) >> >>
 endobj
 57 0 obj
 << /D [ 5 0 R /XYZ 132.768 705.06 null ] >>
@@ -605,7 +605,7 @@ endobj
 [ 96 0 R 97 0 R 98 0 R 99 0 R 100 0 R 101 0 R 102 0 R 103 0 R 104 0 R 105 0 R 106 0 R 107 0 R 108 0 R 109 0 R 95 0 R ]
 endobj
 54 0 obj
-<< /Type /XObject /Subtype /Form /FormType 1 /PTEX.PageNumber 1 /PTEX.InfoDict << /Producer (luahbtex-1.17.0) /Creator <FEFF00630072006500610074006F0072> /Author <FEFF0041007500740068006F0072> /Title <FEFF007400690074006C0065> /CreationDate (D:20230911094549+02'00') /ModDate (D:20230911094549+02'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.17.0 (TeX Live 2023)) >> /BBox [ 0 0 612 792 ] /Resources << /ExtGState 118 0 R /Font << /F15 119 0 R /F16 120 0 R /F28 121 0 R >> /ProcSet [ /PDF /Text ] >> /Length 4740 >>       
+<< /Type /XObject /Subtype /Form /FormType 1 /PTEX.PageNumber 1 /PTEX.InfoDict << /Producer (luahbtex-1.17.0) /Creator <FEFF00630072006500610074006F0072> /Author <FEFF0041007500740068006F0072> /Title <FEFF007400690074006C0065> /CreationDate (D:20231108162929+01'00') /ModDate (D:20231108162929+01'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.17.0 (TeX Live 2023)) >> /BBox [ 0 0 612 792 ] /Resources << /ExtGState 118 0 R /Font << /F15 119 0 R /F16 120 0 R /F28 121 0 R >> /ProcSet [ /PDF /Text ] >> /Length 4740 >>       
 stream
 /opacity1 gs
 BT
@@ -985,7 +985,7 @@ endobj
 [ 141 0 R 142 0 R 143 0 R 144 0 R ]
 endobj
 140 0 obj
-<< /Type /XObject /Subtype /Form /FormType 1 /PTEX.PageNumber 2 /PTEX.InfoDict << /Producer (luahbtex-1.17.0) /Creator <FEFF00630072006500610074006F0072> /Author <FEFF0041007500740068006F0072> /Title <FEFF007400690074006C0065> /CreationDate (D:20230911094549+02'00') /ModDate (D:20230911094549+02'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.17.0 (TeX Live 2023)) >> /BBox [ 0 0 612 792 ] /Resources << /ExtGState 118 0 R /Font << /F16 120 0 R /F15 119 0 R >> /ProcSet [ /PDF /Text ] >> /Length 302 >>        
+<< /Type /XObject /Subtype /Form /FormType 1 /PTEX.PageNumber 2 /PTEX.InfoDict << /Producer (luahbtex-1.17.0) /Creator <FEFF00630072006500610074006F0072> /Author <FEFF0041007500740068006F0072> /Title <FEFF007400690074006C0065> /CreationDate (D:20231108162929+01'00') /ModDate (D:20231108162929+01'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.17.0 (TeX Live 2023)) >> /BBox [ 0 0 612 792 ] /Resources << /ExtGState 118 0 R /Font << /F16 120 0 R /F15 119 0 R >> /ProcSet [ /PDF /Text ] >> /Length 302 >>        
 stream
 /opacity1 gs
 BT
@@ -1042,7 +1042,7 @@ endobj
 [ 151 0 R ]
 endobj
 150 0 obj
-<< /Type /XObject /Subtype /Form /FormType 1 /PTEX.PageNumber 3 /PTEX.InfoDict << /Producer (luahbtex-1.17.0) /Creator <FEFF00630072006500610074006F0072> /Author <FEFF0041007500740068006F0072> /Title <FEFF007400690074006C0065> /CreationDate (D:20230911094549+02'00') /ModDate (D:20230911094549+02'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.17.0 (TeX Live 2023)) >> /BBox [ 0 0 612 792 ] /Resources << /ExtGState 118 0 R /Font << /F15 119 0 R >> /ProcSet [ /PDF /Text ] >> /Length 172 >>        
+<< /Type /XObject /Subtype /Form /FormType 1 /PTEX.PageNumber 3 /PTEX.InfoDict << /Producer (luahbtex-1.17.0) /Creator <FEFF00630072006500610074006F0072> /Author <FEFF0041007500740068006F0072> /Title <FEFF007400690074006C0065> /CreationDate (D:20231108162929+01'00') /ModDate (D:20231108162929+01'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.17.0 (TeX Live 2023)) >> /BBox [ 0 0 612 792 ] /Resources << /ExtGState 118 0 R /Font << /F15 119 0 R >> /ProcSet [ /PDF /Text ] >> /Length 172 >>        
 stream
 /opacity1 gs
 BT
@@ -1272,17 +1272,17 @@ stream
    </dc:language>
    <dc:date>
     <rdf:Seq>
-     <rdf:li>2023-09-11T09:46:44+02:00</rdf:li>
+     <rdf:li>2023-11-08T16:30:29+01:00</rdf:li>
     </rdf:Seq>
    </dc:date>
    <dc:format>application/pdf</dc:format>
    <dc:source>doc-use-newpax.tex</dc:source>
    <xmp:CreatorTool>LaTeX with hyperref</xmp:CreatorTool>
-   <xmp:CreateDate>2023-09-11T09:46:44+02:00</xmp:CreateDate>
-   <xmp:ModifyDate>2023-09-11T09:46:44+02:00</xmp:ModifyDate>
-   <xmp:MetadataDate>2023-09-11T09:46:44+02:00</xmp:MetadataDate>
+   <xmp:CreateDate>2023-11-08T16:30:29+01:00</xmp:CreateDate>
+   <xmp:ModifyDate>2023-11-08T16:30:29+01:00</xmp:ModifyDate>
+   <xmp:MetadataDate>2023-11-08T16:30:29+01:00</xmp:MetadataDate>
    <xmpMM:DocumentID>uuid:2b04bf6a-81b7-45a6-83db-ec9cdd83b4f4</xmpMM:DocumentID>
-   <xmpMM:InstanceID>uuid:ecb9eb32-a3fb-4a01-8611-a65d1c136af9</xmpMM:InstanceID>
+   <xmpMM:InstanceID>uuid:7fc5aad5-24c8-4e4a-868c-bd0f0e5ba379</xmpMM:InstanceID>
    <prism:complianceProfile>three</prism:complianceProfile>
    <prism:pageCount>5</prism:pageCount>
   </rdf:Description>
@@ -1324,7 +1324,7 @@ endobj
 << /Type /Page /Contents 161 0 R /Resources 159 0 R /MediaBox [ 0 0 612 792 ] /Parent 66 0 R >>
 endobj
 157 0 obj
-<< /Type /XObject /Subtype /Form /FormType 1 /PTEX.PageNumber 4 /PTEX.InfoDict << /Producer (luahbtex-1.17.0) /Creator <FEFF00630072006500610074006F0072> /Author <FEFF0041007500740068006F0072> /Title <FEFF007400690074006C0065> /CreationDate (D:20230911094549+02'00') /ModDate (D:20230911094549+02'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.17.0 (TeX Live 2023)) >> /BBox [ 0 0 612 792 ] /Resources << /ExtGState 118 0 R /Font << /F15 119 0 R >> /ProcSet [ /PDF /Text ] >> /Length 122 >>        
+<< /Type /XObject /Subtype /Form /FormType 1 /PTEX.PageNumber 4 /PTEX.InfoDict << /Producer (luahbtex-1.17.0) /Creator <FEFF00630072006500610074006F0072> /Author <FEFF0041007500740068006F0072> /Title <FEFF007400690074006C0065> /CreationDate (D:20231108162929+01'00') /ModDate (D:20231108162929+01'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.17.0 (TeX Live 2023)) >> /BBox [ 0 0 612 792 ] /Resources << /ExtGState 118 0 R /Font << /F15 119 0 R >> /ProcSet [ /PDF /Text ] >> /Length 122 >>        
 stream
 /opacity1 gs
 BT
@@ -1419,7 +1419,7 @@ endobj
 << /Type /Catalog /Pages 66 0 R /Names 170 0 R /Lang (en-US)/PageMode /UseOutlines/OpenAction [5 0 R /Fit]/PageLabels <</Nums[0<</S/D>>]>>/Metadata 158 0 R >>
 endobj
 172 0 obj
-<< /Producer (luahbtex-1.17.0)/Creator <FEFF004C006100540065005800200077006900740068002000680079007000650072007200650066>/CreationDate (D:20230911094644+02'00')/ModDate (D:20230911094644+02'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.17.0 (TeX Live 2023)) >>
+<< /Producer (luahbtex-1.17.0)/Creator <FEFF004C006100540065005800200077006900740068002000680079007000650072007200650066>/CreationDate (D:20231108163029+01'00')/ModDate (D:20231108163029+01'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.17.0 (TeX Live 2023)) >>
 endobj
 xref
 0 173
@@ -1597,7 +1597,7 @@ xref
 0000076943 00000 n 
 0000077119 00000 n 
 trailer
-<< /Size 173 /Root 171 0 R /Info 172 0 R /ID [ <6E61351897C7EE291BE8A2D5DE959B0C> <6E61351897C7EE291BE8A2D5DE959B0C> ] >>
+<< /Size 173 /Root 171 0 R /Info 172 0 R /ID [ <45AB31A78B914671E232BACBB367518A> <45AB31A78B914671E232BACBB367518A> ] >>
 startxref
 77418
 %%EOF
diff --git a/macros/latex/contrib/newpax/doc-use-pax.pdf b/macros/latex/contrib/newpax/doc-use-pax.pdf
index d3bb80f7ab..2c26efed2a 100644
--- a/macros/latex/contrib/newpax/doc-use-pax.pdf
+++ b/macros/latex/contrib/newpax/doc-use-pax.pdf
diff --git a/macros/latex/contrib/newpax/newpax.dtx b/macros/latex/contrib/newpax/newpax.dtx
index e0557589fd..662062242c 100644
--- a/macros/latex/contrib/newpax/newpax.dtx
+++ b/macros/latex/contrib/newpax/newpax.dtx
@@ -29,7 +29,7 @@
 %<@@=newpax>
 \NeedsTeXFormat{LaTeX2e}[2022-11-01]
 \ProvidesPackage{newpax}%
-  [2023-09-11 v0.54 Annotation support for PDF graphics based on pax.sty adapted by (UF)]%
+  [2023-11-08 v0.55 Annotation support for PDF graphics based on pax.sty adapted by (UF)]%
 %    \end{macrocode}
 % Test if the pdfmanagement is loaded:
 %    \begin{macrocode}
@@ -919,8 +919,8 @@
 %<*lua>
 local ProvidesLuaModule = {
     name          = "newpax",
-    version       = "0.54",       --TAGVERSION
-    date          = "2023-09-11", --TAGDATE
+    version       = "0.55",       --TAGVERSION
+    date          = "2023-11-08", --TAGDATE
     description   = "newpax lua code",
     license       = "The LATEX Project Public License 1.3c"
 }
@@ -1085,9 +1085,17 @@ end
 -- destinations can be an dict (/D [array]) or only an array!
 
 local function getdestdata (name,pagereftonum,destnamestoref)
-   local destref = destnamestoref[name]
+   local destref
    local type,ref,pagenum,destx,desty = nil, nil, 1,0,0
    local data = {{0,0}, {5,constDEST_XYZ}}
+   -- if we get directly an array
+   if (TYPE(name) == "pdfe.array") then
+     data = ARRAYTOTABLE(name)
+     type, ref, pageref = GETFROMARRAY(name,1)
+     pagenum = pagereftonum[pageref]
+   else
+    destref = destnamestoref[name]
+   end   
    if destref then
      type,value,detail = GETFROMREFERENCE(destref)
      if TYPE(value) == "pdfe.dictionary" then
@@ -1103,9 +1111,11 @@ local function getdestdata (name,pagereftonum,destnamestoref)
         pagenum = pagereftonum[pageref]
      end
    end
+  -- print("XXXXXXXXXX",table.serialize(data),pagenum)
   return pagenum, data
 end
 
+
 -- output functions
 -- write the info
 -- XXXXXX encode/escape the file name?
@@ -1481,14 +1491,22 @@ local function __writepax (ext,file)
    WRITE (collected_destinations[i])
   end
   -- write out the rest of the destinations.
+  -- We order first the table so that the newpax file doesn't change between 
+  -- compilations, see issue #25 and PR #25
+  local destnamessorted = {}
   for k,v in pairs (destnamestorefVAR) do
    -- ignore use dests and page destinations. 
     i=string.find(k,"page.",1) 
     if not useddestnames[k] and not i then
-      destcountVAR=destcountVAR + 1
-      WRITE(outputENTRY_dest(destcountVAR,k,pagereftonumVAR,destnamestorefVAR,docVAR))
+      table.insert (destnamessorted,k)
     end
   end  
+  table.sort(destnamessorted)
+  for i = 1, #destnamessorted do
+      k=destnamessorted[i]
+      destcountVAR=destcountVAR + 1
+      WRITE(outputENTRY_dest(destcountVAR,k,pagereftonumVAR,destnamestorefVAR,docVAR))
+  end    
   io.close(writeVAR)
 end
 
diff --git a/macros/latex/contrib/newpax/newpax.pdf b/macros/latex/contrib/newpax/newpax.pdf
index 44854b08c9..e2bb97ec27 100644
--- a/macros/latex/contrib/newpax/newpax.pdf
+++ b/macros/latex/contrib/newpax/newpax.pdf
@@ -1,7 +1,7 @@
 %PDF-1.7
 %���������
 7 0 obj
-<< /Length 12145 >>      
+<< /Length 12143 >>      
 stream
 /opacity1 gs
 0 g 0 G
@@ -18,13 +18,13 @@ stream
 0 g 0 G
 BT
 /F46 20.66252 Tf
-1 0 0 1 168.673 714.049 Tm [<0068003F0032>]TJ
+1 0 0 1 168.394 714.049 Tm [<0068003F0032>]TJ
  
 /F47 20.66252 Tf
-1 0 0 1 213.552 714.049 Tm [<004D003200720054001C0074>]TJ
+1 0 0 1 213.273 714.049 Tm [<004D003200720054001C0074>]TJ
 0 g 0 G
 /F46 20.66252 Tf
-1 0 0 1 286.222 714.049 Tm [<0054001C002B0046001C003B0032002D>-367<00700079005800380039>]TJ
+1 0 0 1 285.943 714.049 Tm [<0054001C002B0046001C003B0032002D>-367<00700079005800380038>]TJ
 0 g 0 G
 0 g 0 G
 /F46 11.95517 Tf
@@ -35,7 +35,7 @@ BT
 /F49 12.95146 Tf
 1 0 0 1 342.914 666.57 Tm [<000B>]TJ
 /F49 14.3462 Tf
-1 0 0 1 261.794 636.963 Tm [<0013001100130014000E0011001A000E00120012>]TJ
+1 0 0 1 261.6 636.963 Tm [<0013001100130014000E00120012000E00110019>]TJ
 0 g 0 G
 /F46 14.3462 Tf
 1 0 0 1 74.008 559.773 Tm [<0052>-500<0041004D006900600051>-31<002F006D002B006900420051004D>]TJ
@@ -1866,7 +1866,7 @@ Q
 endstream
 endobj
 111 0 obj
-<< /Type /XObject /Subtype /Form /FormType 1 /PTEX.PageNumber 1 /PTEX.InfoDict << /Producer (luahbtex-1.17.0) /Creator <FEFF00630072006500610074006F0072> /Author <FEFF0041007500740068006F0072> /Title <FEFF007400690074006C0065> /CreationDate (D:20230911094532+02'00') /ModDate (D:20230911094532+02'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.17.0 (TeX Live 2023)) >> /BBox [ 0 0 612 792 ] /Resources << /ExtGState 158 0 R /Font << /F15 159 0 R /F16 160 0 R /F28 161 0 R >> /ProcSet [ /PDF /Text ] >> /Length 4809 >>       
+<< /Type /XObject /Subtype /Form /FormType 1 /PTEX.PageNumber 1 /PTEX.InfoDict << /Producer (luahbtex-1.17.0) /Creator <FEFF00630072006500610074006F0072> /Author <FEFF0041007500740068006F0072> /Title <FEFF007400690074006C0065> /CreationDate (D:20231108162909+01'00') /ModDate (D:20231108162909+01'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.17.0 (TeX Live 2023)) >> /BBox [ 0 0 612 792 ] /Resources << /ExtGState 158 0 R /Font << /F15 159 0 R /F16 160 0 R /F28 161 0 R >> /ProcSet [ /PDF /Text ] >> /Length 4809 >>       
 stream
 /opacity1 gs
 BT
@@ -2175,7 +2175,7 @@ Q
 endstream
 endobj
 128 0 obj
-<< /Type /XObject /Subtype /Form /FormType 1 /PTEX.PageNumber 2 /PTEX.InfoDict << /Producer (luahbtex-1.17.0) /Creator <FEFF00630072006500610074006F0072> /Author <FEFF0041007500740068006F0072> /Title <FEFF007400690074006C0065> /CreationDate (D:20230911094532+02'00') /ModDate (D:20230911094532+02'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.17.0 (TeX Live 2023)) >> /BBox [ 0 0 612 792 ] /Resources << /ExtGState 158 0 R /Font << /F16 160 0 R /F15 159 0 R >> /ProcSet [ /PDF /Text ] >> /Length 302 >>        
+<< /Type /XObject /Subtype /Form /FormType 1 /PTEX.PageNumber 2 /PTEX.InfoDict << /Producer (luahbtex-1.17.0) /Creator <FEFF00630072006500610074006F0072> /Author <FEFF0041007500740068006F0072> /Title <FEFF007400690074006C0065> /CreationDate (D:20231108162909+01'00') /ModDate (D:20231108162909+01'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.17.0 (TeX Live 2023)) >> /BBox [ 0 0 612 792 ] /Resources << /ExtGState 158 0 R /Font << /F16 160 0 R /F15 159 0 R >> /ProcSet [ /PDF /Text ] >> /Length 302 >>        
 stream
 /opacity1 gs
 BT
@@ -2192,61 +2192,61 @@ endobj
 << /XObject << /Im2 128 0 R >> /ProcSet [ /PDF ] >>
 endobj
 115 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>>  /Rect [ 99.111 517.97 176.197 523.564 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</W 1/S/U>>  /Rect [ 99.111 517.97 176.197 523.564 ] >>
 endobj
 116 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>>  /Rect [ 94.962 512.112 213.718 517.696 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</W 1/S/U>>  /Rect [ 94.962 512.112 213.718 517.696 ] >>
 endobj
 117 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>>  /Rect [ 87.988 506.628 213.718 511.166 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</W 1/S/U>>  /Rect [ 87.988 506.628 213.718 511.166 ] >>
 endobj
 118 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>>  /Rect [ 87.988 500.65 213.718 505.188 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</W 1/S/U>>  /Rect [ 87.988 500.65 213.718 505.188 ] >>
 endobj
 119 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>>  /Rect [ 87.988 494.672 213.718 499.21 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</W 1/S/U>>  /Rect [ 87.988 494.672 213.718 499.21 ] >>
 endobj
 120 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>>  /Rect [ 87.988 488.7 213.718 493.288 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</W 1/S/U>>  /Rect [ 87.988 488.7 213.718 493.288 ] >>
 endobj
 121 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>>  /Rect [ 87.988 482.722 213.718 487.255 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</W 1/S/U>>  /Rect [ 87.988 482.722 213.718 487.255 ] >>
 endobj
 122 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>>  /Rect [ 87.988 476.745 213.718 481.278 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</W 1/S/U>>  /Rect [ 87.988 476.745 213.718 481.278 ] >>
 endobj
 123 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>>  /Rect [ 87.988 470.762 213.718 475.3 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</W 1/S/U>>  /Rect [ 87.988 470.762 213.718 475.3 ] >>
 endobj
 124 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>>  /Rect [ 87.988 464.844 213.718 469.322 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</W 1/S/U>>  /Rect [ 87.988 464.844 213.718 469.322 ] >>
 endobj
 125 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>>  /Rect [ 87.988 458.812 213.718 463.345 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</W 1/S/U>>  /Rect [ 87.988 458.812 213.718 463.345 ] >>
 endobj
 126 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>>  /Rect [ 87.988 452.829 213.718 457.367 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</W 1/S/U>>  /Rect [ 87.988 452.829 213.718 457.367 ] >>
 endobj
 127 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.444706 0.456472 0.680002 ] /A <</Type/Action/S/GoToR/F<</AFRelationship/Unspecified/F <FEFF002F0063002F007400650078006C006900760065002F0032003000320030002F007400650078006D0066002D0064006900730074002F0064006F0063002F006C0061007400650078002F0062006100730065002F0064006F0063002E007000640066>/Subtype/application#2Fpdf/Type/Filespec/UF <FEFF002F0063002F007400650078006C006900760065002F0032003000320030002F007400650078006D0066002D0064006900730074002F0064006F0063002F006C0061007400650078002F0062006100730065002F0064006F0063002E007000640066>>>/D(chapter.1)>> /BS <</S/U/W 1>>  /Rect [ 94.962 446.413 103.161 451.888 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.444706 0.456472 0.680002 ] /A <</Type/Action/S/GoToR/F<</AFRelationship/Unspecified/F <FEFF002F0063002F007400650078006C006900760065002F0032003000320030002F007400650078006D0066002D0064006900730074002F0064006F0063002F006C0061007400650078002F0062006100730065002F0064006F0063002E007000640066>/Subtype/application#2Fpdf/Type/Filespec/UF <FEFF002F0063002F007400650078006C006900760065002F0032003000320030002F007400650078006D0066002D0064006900730074002F0064006F0063002F006C0061007400650078002F0062006100730065002F0064006F0063002E007000640066>>>/D(chapter.1)>> /BS <</W 1/S/U>>  /Rect [ 94.962 446.413 103.161 451.888 ] >>
 endobj
 130 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</S/U/W 1>>  /Rect [ 225.939 523.948 303.025 529.542 ] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.724708 0.4 0.717646 ] /A <</Type/Action/S/URI/URI(https://www.latex-project.org)>> /BS <</W 1/S/U>>  /Rect [ 225.939 523.948 303.025 529.542 ] >>
 endobj
 113 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.701176 0.4 0.414118 ] /BS <</S/U/W 1>>  /Rect [ 96.596 524.037 116.471 530.538 ]/A  << /S /GoTo /D (doc-input1.newpax@section.2) >> >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.701176 0.4 0.414118 ] /BS <</W 1/S/U>>  /Rect [ 96.596 524.037 116.471 530.538 ]/A  << /S /GoTo /D (doc-input1.newpax@section.2) >> >>
 endobj
 114 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.701176 0.4 0.414118 ] /BS <</S/U/W 1>>  /Rect [ 93.966 516.973 99.445 524.56 ]/A  << /S /GoTo /D (doc-input1.newpax@section.1) >> >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.701176 0.4 0.414118 ] /BS <</W 1/S/U>>  /Rect [ 93.966 516.973 99.445 524.56 ]/A  << /S /GoTo /D (doc-input1.newpax@section.1) >> >>
 endobj
 131 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.701176 0.4 0.414118 ] /BS <</S/U/W 1>>  /Rect [ 224.942 518.005 230.422 524.421 ]/A  << /S /GoTo /D (doc-input1.newpax@section.1) >> >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.701176 0.4 0.414118 ] /BS <</W 1/S/U>>  /Rect [ 224.942 518.005 230.422 524.421 ]/A  << /S /GoTo /D (doc-input1.newpax@section.1) >> >>
 endobj
 132 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.701176 0.4 0.414118 ] /BS <</S/U/W 1>>  /Rect [ 234.073 518.005 239.552 524.421 ]/A  << /S /GoTo /D (doc-input1.newpax@section.2) >> >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.701176 0.4 0.414118 ] /BS <</W 1/S/U>>  /Rect [ 234.073 518.005 239.552 524.421 ]/A  << /S /GoTo /D (doc-input1.newpax@section.2) >> >>
 endobj
 133 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.701176 0.4 0.414118 ] /BS <</S/U/W 1>>  /Rect [ 243.204 518.005 248.683 524.421 ]/A  << /S /GoTo /D (doc-input1.newpax@section.3) >> >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1 ] /H /I /C [0.701176 0.4 0.414118 ] /BS <</W 1/S/U>>  /Rect [ 243.204 518.005 248.683 524.421 ]/A  << /S /GoTo /D (doc-input1.newpax@section.3) >> >>
 endobj
 137 0 obj
 << /D [ 135 0 R /XYZ 73.409 809.993 null ] >>
@@ -2922,17 +2922,17 @@ stream
    </dc:language>
    <dc:date>
     <rdf:Seq>
-     <rdf:li>2023-09-11T09:46:22+02:00</rdf:li>
+     <rdf:li>2023-11-08T16:30:04+01:00</rdf:li>
     </rdf:Seq>
    </dc:date>
    <dc:format>application/pdf</dc:format>
    <dc:source>newpax.tex</dc:source>
    <xmp:CreatorTool>LaTeX with hyperref</xmp:CreatorTool>
-   <xmp:CreateDate>2023-09-11T09:46:22+02:00</xmp:CreateDate>
-   <xmp:ModifyDate>2023-09-11T09:46:22+02:00</xmp:ModifyDate>
-   <xmp:MetadataDate>2023-09-11T09:46:22+02:00</xmp:MetadataDate>
+   <xmp:CreateDate>2023-11-08T16:30:04+01:00</xmp:CreateDate>
+   <xmp:ModifyDate>2023-11-08T16:30:04+01:00</xmp:ModifyDate>
+   <xmp:MetadataDate>2023-11-08T16:30:04+01:00</xmp:MetadataDate>
    <xmpMM:DocumentID>uuid:1b6e7a55-7c43-42af-8daf-1a09c372d47a</xmpMM:DocumentID>
-   <xmpMM:InstanceID>uuid:2b9e8c6c-cee7-4834-84d5-ce3bb8f508dd</xmpMM:InstanceID>
+   <xmpMM:InstanceID>uuid:71867ad4-e866-4c8c-84e7-6ee45beea9be</xmpMM:InstanceID>
    <prism:complianceProfile>three</prism:complianceProfile>
    <prism:pageCount>9</prism:pageCount>
   </rdf:Description>
@@ -3866,324 +3866,324 @@ endobj
 << /Type /Catalog /Pages 15 0 R /Outlines 302 0 R /Names 309 0 R /ViewerPreferences 226 0 R/Lang (en-UK)/PageMode /UseOutlines/OpenAction [5 0 R /Fit]/PageLabels <</Nums[0<</S/D>>]>>/Metadata 211 0 R >>
 endobj
 311 0 obj
-<< /Producer (luahbtex-1.17.0)/Creator <FEFF004C006100540065005800200077006900740068002000680079007000650072007200650066>/Title <FEFF0054006800650020006E006500770070006100780020007000610063006B006100670065>/Author <FEFF0055006C00720069006B006500200046006900730063006800650072>/CreationDate (D:20230911094622+02'00')/ModDate (D:20230911094622+02'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.17.0 (TeX Live 2023)) >>
+<< /Producer (luahbtex-1.17.0)/Creator <FEFF004C006100540065005800200077006900740068002000680079007000650072007200650066>/Title <FEFF0054006800650020006E006500770070006100780020007000610063006B006100670065>/Author <FEFF0055006C00720069006B006500200046006900730063006800650072>/CreationDate (D:20231108163004+01'00')/ModDate (D:20231108163004+01'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.17.0 (TeX Live 2023)) >>
 endobj
 xref
 0 312
 0000000002 65535 f 
-0000156498 00000 n 
+0000156496 00000 n 
 0000000003 00000 f 
 0000000004 00000 f 
 0000000000 00000 f 
-0000012224 00000 n 
-0000012516 00000 n 
+0000012222 00000 n 
+0000012514 00000 n 
 0000000020 00000 n 
-0000012338 00000 n 
-0000012397 00000 n 
-0000203333 00000 n 
-0000194502 00000 n 
-0000187420 00000 n 
-0000012456 00000 n 
-0000174942 00000 n 
-0000203684 00000 n 
-0000027117 00000 n 
-0000026026 00000 n 
-0000012638 00000 n 
-0000026143 00000 n 
-0000026204 00000 n 
-0000026265 00000 n 
-0000026326 00000 n 
-0000026386 00000 n 
-0000026447 00000 n 
-0000026508 00000 n 
-0000026569 00000 n 
-0000026630 00000 n 
-0000026691 00000 n 
-0000026752 00000 n 
-0000026813 00000 n 
-0000026874 00000 n 
-0000026935 00000 n 
-0000026996 00000 n 
-0000027056 00000 n 
-0000163293 00000 n 
-0000042593 00000 n 
-0000039976 00000 n 
-0000027252 00000 n 
-0000040093 00000 n 
-0000040154 00000 n 
-0000040215 00000 n 
-0000040277 00000 n 
-0000040339 00000 n 
-0000040401 00000 n 
-0000040462 00000 n 
-0000040523 00000 n 
-0000040583 00000 n 
-0000040644 00000 n 
-0000040705 00000 n 
-0000040766 00000 n 
-0000040827 00000 n 
-0000040888 00000 n 
-0000040949 00000 n 
-0000041010 00000 n 
-0000041071 00000 n 
-0000041132 00000 n 
-0000041193 00000 n 
-0000041254 00000 n 
-0000041314 00000 n 
-0000041374 00000 n 
-0000041435 00000 n 
-0000041496 00000 n 
-0000041557 00000 n 
-0000041618 00000 n 
-0000041679 00000 n 
-0000041740 00000 n 
-0000041801 00000 n 
-0000041862 00000 n 
-0000041923 00000 n 
-0000041984 00000 n 
-0000042045 00000 n 
-0000042105 00000 n 
-0000042166 00000 n 
-0000042227 00000 n 
-0000042288 00000 n 
-0000042349 00000 n 
-0000042410 00000 n 
-0000042471 00000 n 
-0000042532 00000 n 
-0000055615 00000 n 
-0000056647 00000 n 
-0000055456 00000 n 
-0000042716 00000 n 
-0000055795 00000 n 
-0000055856 00000 n 
-0000055917 00000 n 
-0000055977 00000 n 
-0000056038 00000 n 
-0000056098 00000 n 
-0000056159 00000 n 
-0000056220 00000 n 
-0000056281 00000 n 
-0000056342 00000 n 
-0000056403 00000 n 
-0000056464 00000 n 
-0000056525 00000 n 
-0000056586 00000 n 
-0000055588 00000 n 
-0000088356 00000 n 
-0000072557 00000 n 
-0000072311 00000 n 
-0000056770 00000 n 
-0000072431 00000 n 
-0000072494 00000 n 
-0000088418 00000 n 
-0000088047 00000 n 
-0000072681 00000 n 
-0000088167 00000 n 
-0000088230 00000 n 
-0000088293 00000 n 
-0000099070 00000 n 
-0000098853 00000 n 
-0000124058 00000 n 
-0000124270 00000 n 
-0000120487 00000 n 
-0000120708 00000 n 
-0000120930 00000 n 
-0000121152 00000 n 
-0000121373 00000 n 
-0000121594 00000 n 
-0000121814 00000 n 
-0000122036 00000 n 
-0000122258 00000 n 
-0000122478 00000 n 
-0000122700 00000 n 
-0000122922 00000 n 
-0000123144 00000 n 
-0000119549 00000 n 
-0000119332 00000 n 
-0000123835 00000 n 
-0000124480 00000 n 
-0000124693 00000 n 
-0000124906 00000 n 
-0000126320 00000 n 
-0000098544 00000 n 
-0000088542 00000 n 
-0000125119 00000 n 
-0000125182 00000 n 
-0000125245 00000 n 
-0000125309 00000 n 
-0000125373 00000 n 
-0000125437 00000 n 
-0000125501 00000 n 
-0000125564 00000 n 
-0000125627 00000 n 
-0000125690 00000 n 
-0000125753 00000 n 
-0000125816 00000 n 
-0000125879 00000 n 
-0000125942 00000 n 
-0000126005 00000 n 
-0000126068 00000 n 
-0000126131 00000 n 
-0000126194 00000 n 
-0000126257 00000 n 
-0000098680 00000 n 
-0000119263 00000 n 
-0000104459 00000 n 
-0000104510 00000 n 
-0000104667 00000 n 
-0000104823 00000 n 
-0000104977 00000 n 
-0000105180 00000 n 
-0000106463 00000 n 
-0000106665 00000 n 
-0000107644 00000 n 
-0000107844 00000 n 
-0000108644 00000 n 
-0000108883 00000 n 
-0000109242 00000 n 
-0000109480 00000 n 
-0000109689 00000 n 
-0000109926 00000 n 
-0000110007 00000 n 
-0000115293 00000 n 
-0000115361 00000 n 
-0000117859 00000 n 
-0000117926 00000 n 
-0000119197 00000 n 
-0000120418 00000 n 
-0000140363 00000 n 
-0000138545 00000 n 
-0000126485 00000 n 
-0000138665 00000 n 
-0000138728 00000 n 
-0000138791 00000 n 
-0000138854 00000 n 
-0000138917 00000 n 
-0000138980 00000 n 
-0000139043 00000 n 
-0000139106 00000 n 
-0000139169 00000 n 
-0000139232 00000 n 
-0000139295 00000 n 
-0000139358 00000 n 
-0000139420 00000 n 
-0000139483 00000 n 
-0000139546 00000 n 
-0000139609 00000 n 
-0000139672 00000 n 
-0000139735 00000 n 
-0000139798 00000 n 
-0000139861 00000 n 
-0000139924 00000 n 
-0000139987 00000 n 
-0000140050 00000 n 
-0000140113 00000 n 
-0000140175 00000 n 
-0000140237 00000 n 
-0000140300 00000 n 
-0000140487 00000 n 
-0000156386 00000 n 
-0000155574 00000 n 
-0000152202 00000 n 
-0000155694 00000 n 
-0000155757 00000 n 
-0000155820 00000 n 
-0000155883 00000 n 
-0000155946 00000 n 
-0000156009 00000 n 
-0000156072 00000 n 
-0000156135 00000 n 
-0000156198 00000 n 
-0000156261 00000 n 
-0000156324 00000 n 
-0000156545 00000 n 
-0000156591 00000 n 
-0000205215 00000 n 
-0000156638 00000 n 
-0000156727 00000 n 
-0000205083 00000 n 
-0000156774 00000 n 
-0000156919 00000 n 
-0000205004 00000 n 
-0000156971 00000 n 
-0000157233 00000 n 
-0000204911 00000 n 
-0000157285 00000 n 
-0000157542 00000 n 
-0000204832 00000 n 
-0000157594 00000 n 
-0000157724 00000 n 
-0000204739 00000 n 
-0000157771 00000 n 
-0000157868 00000 n 
-0000204607 00000 n 
-0000157915 00000 n 
-0000158022 00000 n 
-0000204542 00000 n 
-0000158074 00000 n 
-0000158282 00000 n 
-0000204449 00000 n 
-0000158329 00000 n 
-0000158466 00000 n 
-0000204317 00000 n 
-0000158513 00000 n 
-0000158615 00000 n 
-0000204252 00000 n 
-0000158667 00000 n 
-0000158836 00000 n 
-0000204159 00000 n 
-0000158883 00000 n 
-0000158980 00000 n 
-0000204041 00000 n 
-0000159027 00000 n 
-0000159203 00000 n 
-0000203962 00000 n 
-0000159255 00000 n 
-0000159466 00000 n 
-0000203883 00000 n 
-0000159518 00000 n 
-0000159765 00000 n 
-0000162131 00000 n 
-0000159880 00000 n 
-0000159952 00000 n 
-0000162371 00000 n 
-0000163449 00000 n 
-0000163652 00000 n 
-0000172933 00000 n 
-0000164100 00000 n 
-0000164177 00000 n 
-0000173171 00000 n 
-0000175097 00000 n 
-0000175299 00000 n 
-0000185338 00000 n 
-0000175747 00000 n 
-0000175982 00000 n 
-0000185577 00000 n 
-0000187577 00000 n 
-0000187781 00000 n 
-0000192989 00000 n 
-0000188169 00000 n 
-0000188246 00000 n 
-0000193226 00000 n 
-0000194656 00000 n 
-0000194857 00000 n 
-0000201687 00000 n 
-0000195257 00000 n 
-0000195381 00000 n 
-0000201923 00000 n 
-0000203485 00000 n 
-0000203806 00000 n 
-0000205294 00000 n 
-0000206168 00000 n 
-0000207005 00000 n 
-0000207860 00000 n 
-0000208615 00000 n 
-0000208901 00000 n 
-0000209015 00000 n 
-0000209053 00000 n 
-0000209273 00000 n 
+0000012336 00000 n 
+0000012395 00000 n 
+0000203331 00000 n 
+0000194500 00000 n 
+0000187418 00000 n 
+0000012454 00000 n 
+0000174940 00000 n 
+0000203682 00000 n 
+0000027115 00000 n 
+0000026024 00000 n 
+0000012636 00000 n 
+0000026141 00000 n 
+0000026202 00000 n 
+0000026263 00000 n 
+0000026324 00000 n 
+0000026384 00000 n 
+0000026445 00000 n 
+0000026506 00000 n 
+0000026567 00000 n 
+0000026628 00000 n 
+0000026689 00000 n 
+0000026750 00000 n 
+0000026811 00000 n 
+0000026872 00000 n 
+0000026933 00000 n 
+0000026994 00000 n 
+0000027054 00000 n 
+0000163291 00000 n 
+0000042591 00000 n 
+0000039974 00000 n 
+0000027250 00000 n 
+0000040091 00000 n 
+0000040152 00000 n 
+0000040213 00000 n 
+0000040275 00000 n 
+0000040337 00000 n 
+0000040399 00000 n 
+0000040460 00000 n 
+0000040521 00000 n 
+0000040581 00000 n 
+0000040642 00000 n 
+0000040703 00000 n 
+0000040764 00000 n 
+0000040825 00000 n 
+0000040886 00000 n 
+0000040947 00000 n 
+0000041008 00000 n 
+0000041069 00000 n 
+0000041130 00000 n 
+0000041191 00000 n 
+0000041252 00000 n 
+0000041312 00000 n 
+0000041372 00000 n 
+0000041433 00000 n 
+0000041494 00000 n 
+0000041555 00000 n 
+0000041616 00000 n 
+0000041677 00000 n 
+0000041738 00000 n 
+0000041799 00000 n 
+0000041860 00000 n 
+0000041921 00000 n 
+0000041982 00000 n 
+0000042043 00000 n 
+0000042103 00000 n 
+0000042164 00000 n 
+0000042225 00000 n 
+0000042286 00000 n 
+0000042347 00000 n 
+0000042408 00000 n 
+0000042469 00000 n 
+0000042530 00000 n 
+0000055613 00000 n 
+0000056645 00000 n 
+0000055454 00000 n 
+0000042714 00000 n 
+0000055793 00000 n 
+0000055854 00000 n 
+0000055915 00000 n 
+0000055975 00000 n 
+0000056036 00000 n 
+0000056096 00000 n 
+0000056157 00000 n 
+0000056218 00000 n 
+0000056279 00000 n 
+0000056340 00000 n 
+0000056401 00000 n 
+0000056462 00000 n 
+0000056523 00000 n 
+0000056584 00000 n 
+0000055586 00000 n 
+0000088354 00000 n 
+0000072555 00000 n 
+0000072309 00000 n 
+0000056768 00000 n 
+0000072429 00000 n 
+0000072492 00000 n 
+0000088416 00000 n 
+0000088045 00000 n 
+0000072679 00000 n 
+0000088165 00000 n 
+0000088228 00000 n 
+0000088291 00000 n 
+0000099068 00000 n 
+0000098851 00000 n 
+0000124056 00000 n 
+0000124268 00000 n 
+0000120485 00000 n 
+0000120706 00000 n 
+0000120928 00000 n 
+0000121150 00000 n 
+0000121371 00000 n 
+0000121592 00000 n 
+0000121812 00000 n 
+0000122034 00000 n 
+0000122256 00000 n 
+0000122476 00000 n 
+0000122698 00000 n 
+0000122920 00000 n 
+0000123142 00000 n 
+0000119547 00000 n 
+0000119330 00000 n 
+0000123833 00000 n 
+0000124478 00000 n 
+0000124691 00000 n 
+0000124904 00000 n 
+0000126318 00000 n 
+0000098542 00000 n 
+0000088540 00000 n 
+0000125117 00000 n 
+0000125180 00000 n 
+0000125243 00000 n 
+0000125307 00000 n 
+0000125371 00000 n 
+0000125435 00000 n 
+0000125499 00000 n 
+0000125562 00000 n 
+0000125625 00000 n 
+0000125688 00000 n 
+0000125751 00000 n 
+0000125814 00000 n 
+0000125877 00000 n 
+0000125940 00000 n 
+0000126003 00000 n 
+0000126066 00000 n 
+0000126129 00000 n 
+0000126192 00000 n 
+0000126255 00000 n 
+0000098678 00000 n 
+0000119261 00000 n 
+0000104457 00000 n 
+0000104508 00000 n 
+0000104665 00000 n 
+0000104821 00000 n 
+0000104975 00000 n 
+0000105178 00000 n 
+0000106461 00000 n 
+0000106663 00000 n 
+0000107642 00000 n 
+0000107842 00000 n 
+0000108642 00000 n 
+0000108881 00000 n 
+0000109240 00000 n 
+0000109478 00000 n 
+0000109687 00000 n 
+0000109924 00000 n 
+0000110005 00000 n 
+0000115291 00000 n 
+0000115359 00000 n 
+0000117857 00000 n 
+0000117924 00000 n 
+0000119195 00000 n 
+0000120416 00000 n 
+0000140361 00000 n 
+0000138543 00000 n 
+0000126483 00000 n 
+0000138663 00000 n 
+0000138726 00000 n 
+0000138789 00000 n 
+0000138852 00000 n 
+0000138915 00000 n 
+0000138978 00000 n 
+0000139041 00000 n 
+0000139104 00000 n 
+0000139167 00000 n 
+0000139230 00000 n 
+0000139293 00000 n 
+0000139356 00000 n 
+0000139418 00000 n 
+0000139481 00000 n 
+0000139544 00000 n 
+0000139607 00000 n 
+0000139670 00000 n 
+0000139733 00000 n 
+0000139796 00000 n 
+0000139859 00000 n 
+0000139922 00000 n 
+0000139985 00000 n 
+0000140048 00000 n 
+0000140111 00000 n 
+0000140173 00000 n 
+0000140235 00000 n 
+0000140298 00000 n 
+0000140485 00000 n 
+0000156384 00000 n 
+0000155572 00000 n 
+0000152200 00000 n 
+0000155692 00000 n 
+0000155755 00000 n 
+0000155818 00000 n 
+0000155881 00000 n 
+0000155944 00000 n 
+0000156007 00000 n 
+0000156070 00000 n 
+0000156133 00000 n 
+0000156196 00000 n 
+0000156259 00000 n 
+0000156322 00000 n 
+0000156543 00000 n 
+0000156589 00000 n 
+0000205213 00000 n 
+0000156636 00000 n 
+0000156725 00000 n 
+0000205081 00000 n 
+0000156772 00000 n 
+0000156917 00000 n 
+0000205002 00000 n 
+0000156969 00000 n 
+0000157231 00000 n 
+0000204909 00000 n 
+0000157283 00000 n 
+0000157540 00000 n 
+0000204830 00000 n 
+0000157592 00000 n 
+0000157722 00000 n 
+0000204737 00000 n 
+0000157769 00000 n 
+0000157866 00000 n 
+0000204605 00000 n 
+0000157913 00000 n 
+0000158020 00000 n 
+0000204540 00000 n 
+0000158072 00000 n 
+0000158280 00000 n 
+0000204447 00000 n 
+0000158327 00000 n 
+0000158464 00000 n 
+0000204315 00000 n 
+0000158511 00000 n 
+0000158613 00000 n 
+0000204250 00000 n 
+0000158665 00000 n 
+0000158834 00000 n 
+0000204157 00000 n 
+0000158881 00000 n 
+0000158978 00000 n 
+0000204039 00000 n 
+0000159025 00000 n 
+0000159201 00000 n 
+0000203960 00000 n 
+0000159253 00000 n 
+0000159464 00000 n 
+0000203881 00000 n 
+0000159516 00000 n 
+0000159763 00000 n 
+0000162129 00000 n 
+0000159878 00000 n 
+0000159950 00000 n 
+0000162369 00000 n 
+0000163447 00000 n 
+0000163650 00000 n 
+0000172931 00000 n 
+0000164098 00000 n 
+0000164175 00000 n 
+0000173169 00000 n 
+0000175095 00000 n 
+0000175297 00000 n 
+0000185336 00000 n 
+0000175745 00000 n 
+0000175980 00000 n 
+0000185575 00000 n 
+0000187575 00000 n 
+0000187779 00000 n 
+0000192987 00000 n 
+0000188167 00000 n 
+0000188244 00000 n 
+0000193224 00000 n 
+0000194654 00000 n 
+0000194855 00000 n 
+0000201685 00000 n 
+0000195255 00000 n 
+0000195379 00000 n 
+0000201921 00000 n 
+0000203483 00000 n 
+0000203804 00000 n 
+0000205292 00000 n 
+0000206166 00000 n 
+0000207003 00000 n 
+0000207858 00000 n 
+0000208613 00000 n 
+0000208899 00000 n 
+0000209013 00000 n 
+0000209051 00000 n 
+0000209271 00000 n 
 trailer
-<< /Size 312 /Root 310 0 R /Info 311 0 R /ID [ <B32865517BA2FB7E4BB1ABDF40E12A6D> <B32865517BA2FB7E4BB1ABDF40E12A6D> ] >>
+<< /Size 312 /Root 310 0 R /Info 311 0 R /ID [ <2EBC32D4093757117F58BA4CD501AE61> <2EBC32D4093757117F58BA4CD501AE61> ] >>
 startxref
-209727
+209725
 %%EOF
diff --git a/macros/latex/contrib/newpax/newpax.tex b/macros/latex/contrib/newpax/newpax.tex
index 65cda2cf83..a7dd3c82c6 100644
--- a/macros/latex/contrib/newpax/newpax.tex
+++ b/macros/latex/contrib/newpax/newpax.tex
@@ -1,7 +1,7 @@
 % !Mode:: "TeX:UTF-8:Main"
 \makeatletter
-\def\UlrikeFischer@package@version{0.54}
-\def\UlrikeFischer@package@date{2023-09-11}
+\def\UlrikeFischer@package@version{0.55}
+\def\UlrikeFischer@package@date{2023-11-08}
 \makeatother
 \DocumentMetadata{pdfversion=1.7,lang=en-UK, uncompress}
 
diff --git a/macros/latex/contrib/notebeamer/README.md b/macros/latex/contrib/notebeamer/README.md
index db7f75a9f8..70e97e633b 100644
--- a/macros/latex/contrib/notebeamer/README.md
+++ b/macros/latex/contrib/notebeamer/README.md
@@ -19,4 +19,4 @@ either version 1.3c of this license or (at your option) any later version.
 This work has the LPPL maintenance status `maintained`.
 
 The Current Maintainer of this work is
-[Mingyu Xia](https://www.ctan.org/author/xiamyphys).
-\ No newline at end of file
+[Mingyu Xia](https://www.ctan.org/author/xia-my).
+\ No newline at end of file
diff --git a/macros/latex/contrib/notebeamer/doc/images/Inuyasa.jpg b/macros/latex/contrib/notebeamer/doc/images/Inuyasa.jpg
index 26861434df..3d473bf869 100644
--- a/macros/latex/contrib/notebeamer/doc/images/Inuyasa.jpg
+++ b/macros/latex/contrib/notebeamer/doc/images/Inuyasa.jpg
diff --git a/macros/latex/contrib/notebeamer/doc/images/newnote3sdemo.pdf b/macros/latex/contrib/notebeamer/doc/images/newnote3sdemo.pdf
index bcea2a2522..4df7320730 100644
--- a/macros/latex/contrib/notebeamer/doc/images/newnote3sdemo.pdf
+++ b/macros/latex/contrib/notebeamer/doc/images/newnote3sdemo.pdf
diff --git a/macros/latex/contrib/notebeamer/doc/images/newnote4sdemo.pdf b/macros/latex/contrib/notebeamer/doc/images/newnote4sdemo.pdf
index 4f87c9c7b0..581fbd1b1d 100644
--- a/macros/latex/contrib/notebeamer/doc/images/newnote4sdemo.pdf
+++ b/macros/latex/contrib/notebeamer/doc/images/newnote4sdemo.pdf
diff --git a/macros/latex/contrib/notebeamer/doc/images/newnotedemo.pdf b/macros/latex/contrib/notebeamer/doc/images/newnotedemo.pdf
index ef3b388d31..5c0c4ab077 100644
--- a/macros/latex/contrib/notebeamer/doc/images/newnotedemo.pdf
+++ b/macros/latex/contrib/notebeamer/doc/images/newnotedemo.pdf
diff --git a/macros/latex/contrib/notebeamer/doc/images/titlepage1.pdf b/macros/latex/contrib/notebeamer/doc/images/titlepage1.pdf
new file mode 100644
index 0000000000..fd79019286
--- /dev/null
+++ b/macros/latex/contrib/notebeamer/doc/images/titlepage1.pdf
diff --git a/macros/latex/contrib/notebeamer/doc/images/titlepage.pdf b/macros/latex/contrib/notebeamer/doc/images/titlepage2.pdf
index bd9ddb1eb2..bd9ddb1eb2 100644
--- a/macros/latex/contrib/notebeamer/doc/images/titlepage.pdf
+++ b/macros/latex/contrib/notebeamer/doc/images/titlepage2.pdf
diff --git a/macros/latex/contrib/notebeamer/doc/notebeamer-demo.pdf b/macros/latex/contrib/notebeamer/doc/notebeamer-demo.pdf
index a1321329ba..d36511b6f5 100644
--- a/macros/latex/contrib/notebeamer/doc/notebeamer-demo.pdf
+++ b/macros/latex/contrib/notebeamer/doc/notebeamer-demo.pdf
diff --git a/macros/latex/contrib/notebeamer/doc/notebeamer-demo.tex b/macros/latex/contrib/notebeamer/doc/notebeamer-demo.tex
index 6e90534b3d..cadf4dfb76 100644
--- a/macros/latex/contrib/notebeamer/doc/notebeamer-demo.tex
+++ b/macros/latex/contrib/notebeamer/doc/notebeamer-demo.tex
@@ -1,27 +1,29 @@
-\documentclass[darker]{notebeamer}
+\documentclass[darker,libertinus]{notebeamer}
 \begin{document}
     % Assign the author & mail address
     \author{Axia}              \mail{xiamyphys@gmail.com}
     % Assign the titlepage, sitcker and logo file
-    \flyleaf{titlepage.pdf}    \sticker{Inuyasa.jpg}
+    \flyleaf{titlepage1.pdf}   \sticker{Inuyasa.jpg}
     % Assign the logo link and info
     \logo[https://sci.hdu.edu.cn]{HDU.pdf}[Hangzhou·Zhejiang]
     % Create a cover page with color H6, title and subtitle 
     \notebook[H6]{Quantum Transport}[Dirac Fermion Discussion Group]
     % Assign the chapter title and the file will be inserted after
     \chapter[PHYSICAL REVIEW B VOLUME 50, NUMBER 8]{newnotedemo.pdf}
-    % Insert the first page of the file with the format 1 image per page
-    \newnote{1}{1}
+    % Insert the page 3--4 of the file with the format 1 image per page
+    \newnote{3}{4}
+    % Change the titlepage in the subsequent notebooks
+    \flyleaf{titlepage2.pdf}
     % Create a cover page with color H5, title
-    \notebook[H5]{Advanced Quantum Mechanics}
+    \notebook[H5]{AQM \& SPD}
     \chapter[Introduction \& Fundamental Concepts]{newnote3sdemo.pdf}
-    % Insert the file from page 1 to 3 with the format 3 images per page
-    \newnotesss{1}{3}
+    % Insert the page 1--2, 4--6 of the file with the format 3 images per page
+    \newnotesss{1}{2}           \newnotesss{4}{6}
     \chapter[SPD Basic: Transport]{newnote4sdemo.pdf}
-    % Insert the file from page 1 to 4 with the format 4 images per page
-    \newnotessss{1}{4}
+    % Insert the page 1--2, 4--6, 7--10 of the file with the format 4 images per page
+    \newnotessss{1}{2}          \newnotessss{4}{6}          \newnotessss{7}{10}
     % Create an empty note paper with no page number
-    \emptynote*
+    \emptynote*[3]
     % Create an empty note paper with logo and info but no page number
-    \newhdunote*
+    \emptyhdunote*[2]
 \end{document}
 \ No newline at end of file
diff --git a/macros/latex/contrib/notebeamer/doc/notebeamer-demo9.pdf b/macros/latex/contrib/notebeamer/doc/notebeamer-demo9.pdf
deleted file mode 100644
index 9d9da5e08a..0000000000
--- a/macros/latex/contrib/notebeamer/doc/notebeamer-demo9.pdf
+++ /dev/null
diff --git a/macros/latex/contrib/notebeamer/doc/notebeamer-doc.pdf b/macros/latex/contrib/notebeamer/doc/notebeamer-doc.pdf
index e938755eca..4905a3c915 100644
--- a/macros/latex/contrib/notebeamer/doc/notebeamer-doc.pdf
+++ b/macros/latex/contrib/notebeamer/doc/notebeamer-doc.pdf
diff --git a/macros/latex/contrib/notebeamer/doc/notebeamer-doc.tex b/macros/latex/contrib/notebeamer/doc/notebeamer-doc.tex
index 8e3d57472a..8caa538d0b 100644
--- a/macros/latex/contrib/notebeamer/doc/notebeamer-doc.tex
+++ b/macros/latex/contrib/notebeamer/doc/notebeamer-doc.tex
@@ -6,7 +6,8 @@
 %% * version.                                           *
 %% ******************************************************
 \documentclass[11pt]{article}
-\usepackage{geometry,pdfpages}
+\usepackage{geometry}
+\usepackage{pdfpages}
 \usepackage[level]{datetime}
 \usepackage{unicode-math}
 \usepackage{authblk}
@@ -31,7 +32,7 @@
     keywordstyle  =  \color{H3},
     commentstyle  =  \color{darkgray},
     tabsize       =  2,
-    keywords      =  {mail,flyleaf,sticker,logo,notebook,chapter,newnote,newnotesss,newnotessss,emptynote,newhdunote}
+    keywords      =  {mail,flyleaf,sticker,logo,notebook,chapter,newnote,newnotesss,newnotessss,emptynote,emptyhdunote}
 }
 \usepackage{hyperref,xcolor,verbatim}
 \definecolor{pkgcolor}{Hsb}{103,.8,.5}
@@ -59,18 +60,18 @@
   \noindent\makebox[0pt][r]{\makebox[-3em][r]{\small\textbf{\textcolor{H7}{#1}}}\;\;}{\sffamily Update: \ignorespaces#2}}
 \makeatother
 
-\title{The \pkg{notebeamer} Template}
-\author[1]{Xia Ming-Yu, \href{https://www.hdu.edu.cn}{Hangzhou Dianzi University}}
+\title{The \pkg{NoteBeamer} Template}
+\author[1]{Xia Ming Yu, \href{https://www.hdu.edu.cn}{Hangzhou Dianzi University}}
 \ddmmyyyydate
 \date{\today}
 \affil[1]{\href{mailto:xiamyphys@gmail.com}{\texttt{xiamyphys@gmail.com}}}
 \date{\today\quad Version 2.0a\thanks{%
-  \url{https://github.com/xiamyphys/notebeamer}}}
+  \url{https://github.com/xiamyphys/NoteBeamer}}}
 \begin{document}
 \maketitle
 
 \begin{abstract}
-This is the document for \pkg{notebeamer} template, which provides a method to input Beamers on note papers and make notebook quickly.
+This is the document for \pkg{NoteBeamer} template, which provides a method to input Beamers on note papers and make notebook quickly.
 
 \end{abstract}
 
@@ -96,21 +97,26 @@ I strongly suggest that you should use cmd to implement the commands to update a
 
 If you are in some areas with awful Internet environment, you can choose proper mirror source or use other means\footnote{Please comply with local network regulations.}. To learn more, please refer to \href{https://tex.stackexchange.com/questions/55437/how-do-i-update-my-tex-distribution}{How do I update my TEX distribution?}
 
-\subsection{Loading \pkg{notebeamer} and its modes}
+\subsection{Loading \pkg{NoteBeamer} and its modes}
 Save the file \verb|notebeamer.cls| to your project's root directory, and then create a \verb|.tex| file, just input the command \verb|\documentclass{notebeamer}| on the first line.
 
 The template provides two modes, \mode{draft} and \mode{color}. Just add the options of the modes you want separately in the square bracket of the command \verb|\documentclass[options]{notebeamer}| in your \verb|.tex| file.
 
-\section{Modes of \pkg{notebeamer}}
+\section{Modes of \pkg{NoteBeamer}}
+
+
 \subsection{The \mode{draft} mode}
-Like most of the templates, this template also provide \mode{draft} mode (with the support of package \pkg{graphics}), tex will only read for size info of pages you input, and a box of the correct size is printed with the filename in.
+Like most of the templates, this template also provide \mode{draft} mode (with the support of package \pkg{graphics}), \sffamily\TeX{} will only read for size info of pages you input, and a box of the correct size is printed with the filename in.
 
 This can accelerate the speed of compile and you can preview the effect quickly when you input a file with too many pages and (or) its size is too large. After you make sure that there's no formatting errors, you can cancel this mode just to wait until compiled.
 
 \subsection{The \mode{normal}, \mode{lighter}, \& \mode{darker} modes}
-This mode can make the color of the covers you creates in this template get lighter or darker, and the default opinion is \mode{normal}.
+This mode can make the color of the covers you create in this template get lighter or darker, and the default opinion is \mode{normal}.
 
-\section{Commands of \pkg{notebeamer}}
+\subsection{The \mode{times} \& \mode{libertinus} modes}
+This mode can deside which font the notebook will use: The default \emph{New Times Roman} font or the \emph{Libertinus} font. You can use Libertinus fonts if you've installed it on your computer, and the default opinion is \mode{times}.
+
+\section{Commands of \pkg{NoteBeamer}}
 
 \subsection{The \cmd{author}, \cmd{mail}, \cmd{flyleaf}, \cmd{sticker} and \cmd{logo} commands}
 \begin{verbatim}
@@ -121,11 +127,11 @@ This mode can make the color of the covers you creates in this template get ligh
 \begin{itemize}
     \item \cmd{author}, \cmd{mail} and \cmd{flyleaf} command.
     
-    There will be an authorname or (and) mail on the cover page after you use the command \cmd{author} or (and) \cmd{mail}, also a hyperlink will be added to the email address. A titlpage will automatically be added after the cover page after you use the command \cmd{flyleaf}.
+    There will be an author's name or (and) mail on the cover page after you use the command \cmd{author} or (and) \cmd{mail}, also a hyperlink will be added to the email address. A titlepage will automatically be added after the cover page after you use the command \cmd{flyleaf}.
 
     \item  \cmd{sticker} and \cmd{logo} command.
     
-    There will be a sticker on the south east of the note paper after you add, and there will be a logo on the north west corner of the cover page and hdu note paper; otherwise it won't.
+    There will be a sticker on the south east of the note paper after you add, and there will be a logo on the north west corner of the cover page and HDU note paper; otherwise it won't.
 
     The first and third variable of the command \cmd{logo} can assign the link and info of the logo, which are optional.
 
@@ -153,15 +159,18 @@ This command has 2 variables: \verb|chaptertitle| and \verb|filename|, will assi
 
 If a star (*) is added after this command, the counter \verb|chap| won't take effect.
 
-\subsection{The \cmd{emptynote} \& \cmd{newhdunote} command}
+\subsection{The \cmd{emptynote} \& \cmd{emptyhdunote} command}
 \begin{verbatim}
-    \emptynote  \emptynote*  \newhdunote  \newhdunote*
+    \emptynote    \emptynote*    \emptyhdunote    \emptyhdunote*
+    \emptynote[1] \emptynote*[2] \emptyhdunote[3] \emptyhdunote*[4]
 \end{verbatim}
 
-Command \cmd{emptynote} will create an empty note paper with the chapter title before and page number following the previous page, and command \cmd{newhdunote} will create an empty note paper with logo (may include link) and info were assigned by the command \cmd{logo} but without chapter title on the top of the note paper.
+Command \cmd{emptynote} will create an empty note paper with the chapter title before and page number following the previous page, and command \cmd{emptyhdunote} will create an empty note paper with logo (may include link) and info were assigned by the command \cmd{logo} but without chapter title on the top of the note paper.
 
 If a star (*) is added after this command, then the note paper created won't include the chapter title and page number. Also, the counter \verb|page| won't take effect.
 
+There's one optional variable of these command, it decides the number of note papers you will create, and the default value is 1 certainly.
+
 \subsection{The \cmd{newnote (sss) (ssss)} commands}
 \begin{verbatim}
     \newnote{start page}{end page}      % insert 1 image per page
@@ -171,7 +180,6 @@ If a star (*) is added after this command, then the note paper created won't inc
 
 These commands will create note papers that were inserted images on the left side, the two variables is the start page number and the end page number of the file that was already assigned by the second variable of the command \cmd{chapter}.
 
-\newpage
 \section{Version History}
 
 In the Advanced Quantum Mechanics class on 19 October, 2023, my \emph{obsessive-compulsive disorder} forced me to copy all the content projected by the teacher onto the whiteboard on my iPad, and I found that I only got a few pages full of notes without any knowledge understood in my brain after a class is over. Then, an idea suddenly occurred me: Why not create an automated program to quickly insert the Beamers given by the teacher before class with the format of several images per page? So I can just annotate on it and pay more attention to listen to the teacher. After the class ended that day, I went back to my dormitory and started writing programs in \textsf\LaTeX{}.
@@ -182,64 +190,69 @@ On 24 October, 2023, a member in the CMC competition WeChat group praised for my
 
 While considering the suggestions from friends, I am also thinking about how to simplify the previous code. Because in version 1.0, if one want to insert a Beamer with 78 images and make 3 images per page, then he should write the command \cmd{newnotesss} for 26 times, it's so inelegant... However, no matter how I write the loop, it's can't meet my expectations or report errors. Then, I asked stackexchange for help, and finally a LaTeX programmer \href{https://tex.stackexchange.com/users/51799/wipet}{wipet} wrote the loop module for me. Here, I want to express my gratitude to him.
 
-\textsf{\bfseries Version 2.0a} was finished developing on 1 November, 2023. This version not only simplified the commands to insert Beamers from to dozens of commands to only 1 command, but redesigned some details and functions. Firstly, this version supports to insert only one page of notes on the left side. What's more, this version supports to insert your school's logo on the cover page and empty note paper. Also, this version supports insert empty pages without page number and chapter title with just add a star (*) after the command. Finally, this version can add a subtitle on the cover page, and redesign the colors (chosen from Hangzhou MTR) of the cover pages.
+\textsf{\bfseries Version 2.0a} was finished developing on 1 November, 2023. This version not only simplified the commands to insert Beamers from to dozens of commands to only 1 command, but redesigned some details and functions. Firstly, this version supports to insert only one page of notes on the left side. What's more, this version supports to insert your school's logo on the cover page and empty note paper. Also, this version supports insert empty note papers without page number and chapter title with just add a star (*) after the command. Finally, this version can add a subtitle on the cover page, and redesign the colors (chosen from Hangzhou MTR) of the cover pages.
+
+\textsf{\bfseries Version 2.1a} was finished developing on 9 November, 2023. This version has fixed some bugs, and now supports inserting non-consecutive page numbers of the same file, and you can inserting a certain number of empty note papers with only one command. Also, this version has redesigned the top and bottom margins and the height between note lines in response to the suggestion from \href{https://qm.qq.com/q/OnHzbNvVAG}{QQ Group} member. What's more, this version supports the `Libertinus' font, which can make users have a better visual effect.
 
-\datechange{\today}{Version 2.0a }
+\datechange{01/11/2023}{Version 2.0a}
 \begin{itemize}
-    \item Simplify the command of inserting 3 \& 4 images per page
-    \item Redesign the cover page \& note paper title
-    \item Add commands to create empty note paper with(out) chapter title \& page number
-    \item Add commands to create empty note paper with logo and info on the top
+    \item Simplify the command of inserting 3 \& 4 images per page.
+    \item Redesign the cover page \& note paper title.
+    \item Add commands to create empty note paper with(out) chapter title \& page number.
+    \item Add commands to create empty note paper with logo and info on the top.
+\end{itemize}
+
+\datechange{\today}{Version 2.1a}
+\begin{itemize}
+    \item Fixed the bug of page number errors when inserting the titlepage.
+    \item Fixed the bug of picture string position when inserting the first page number of courseware when the page number is not 1.
+    \item Supports inserting non-consecutive page numbers of the same file.
+    \item Supports inserting a certain number of empty note papers \& HDU empty note papers with only one command.
+    \item Support the `Libertinus' font.
+    \item Increased the top and bottom margins of the page by 18.8\% than before.
+    \item Other detailed adjustments.
 \end{itemize}
 
 \newpage
 \appendix
 \section{Document Example}
-\begin{lstlisting}[style=TeX]
-\documentclass[darker]{notebeamer}
-\begin{document}
-    % Assign the author & mail address
-    \author{Axia}              \mail{xiamyphys@gmail.com}
-    % Assign the titlepage, sitcker and logo file
-    \flyleaf{titlepage.pdf}    \sticker{Inuyasa.jpg}
-    % Assign the logo link and info
-    \logo[https://sci.hdu.edu.cn]{HDU.pdf}[Hangzhou·Zhejiang]
-    % Create a cover page with color H6, title and subtitle 
-    \notebook[H6]{Quantum Transport}[Dirac Fermion Discussion Group]
-    % Assign the chapter title and the file will be inserted after
-    \chapter[PHYSICAL REVIEW B VOLUME 50, NUMBER 8]{newnotedemo.pdf}
-    % Insert the first page of the file with the format 1 image per page
-    \newnote{1}{1}
-    % Create a cover page with color H5, title
-    \notebook[H5]{Advanced Quantum Mechanics}
-    \chapter[Introduction \& Fundamental Concepts]{newnote3sdemo.pdf}
-    % Insert the file from page 1 to 3 with the format 3 images per page
-    \newnotesss{1}{3}
-    \chapter[SPD Basic: Transport]{newnote4sdemo.pdf}
-    % Insert the file from page 1 to 4 with the format 4 images per page
-    \newnotessss{1}{4}
-    % Create an empty note paper with no page number
-    \emptynote*
-    % Create an empty note paper with logo and info but no page number
-    \newhdunote*
-\end{document}
-\end{lstlisting}
+\lstinputlisting[style=TeX]{notebeamer-demo.tex}
 
-\label{dirtree}
-\dirtree{%
-.1 tex/.
-.2 figures/.
-.3 HDU.pdf.
-.3 Inuyasa.jpg.
-.3 titlepage.pdf.
-.3 newnotedemo.pdf.
-.3 newnote3sdemo.pdf.
-.3 newnote4sdemo.pdf.
-.2 notebeamer-demo.tex.
-.2 notebeamer.cls.
-.2 License.
-.2 README.md.
-}
+\vspace{0.5em}\hrule\vspace{0.5em}
 
-\includepdf{notebeamer-demo9.pdf}
+\label{dirtree}
+\begin{minipage}{0.48\textwidth}
+    \dirtree{%
+    .1 doc/.
+    .2 images/.
+    .3 HDU.pdf.
+    .3 Inuyasa.jpg.
+    .3 titlepage1.pdf.
+    .3 titlepage2.pdf.
+    .3 newnotedemo.pdf.
+    .3 newnote3sdemo.pdf.
+    .3 newnote4sdemo.pdf.
+    .2 notebeamer-demo.tex.
+    .2 notebeamer-demo.pdf.
+    }
+\end{minipage}
+\hfill
+\begin{minipage}{0.48\textwidth}
+    \dirtree{%
+    .1 notebeamer/.
+    .2 doc/.
+    .3 images/.
+    .3 notebeamer-demo.tex.
+    .3 notebeamer-demo.pdf.
+    .3 notebeamer-doc.tex.
+    .3 notebeamer-doc.pdf.
+    .2 tex/.
+    .3 notebeamer.cls.
+    .2 License.
+    .2 README.md.
+    }
+\end{minipage}
+
+
+\includepdf[pages=-,nup=4x4]{notebeamer-demo.pdf}
 \end{document}
 \ No newline at end of file
diff --git a/macros/latex/contrib/notebeamer/tex/notebeamer.cls b/macros/latex/contrib/notebeamer/tex/notebeamer.cls
index 98fc9f5af2..1827871355 100644
--- a/macros/latex/contrib/notebeamer/tex/notebeamer.cls
+++ b/macros/latex/contrib/notebeamer/tex/notebeamer.cls
@@ -8,22 +8,29 @@
 %% ******************************************************           *****  ** *   *    ***  *   *             *
 %% start of file `notebeamer.cls'.                                                                            *
 %% Copyright 2023 LiteLaTeX (xiamyphys@gmail.com)                                                             *
-%% available at https://github.com/xiamyphys/Note-template-imitated-from-Goodnotes-made-by-LaTeX-             *
+%% available at https://github.com/xiamyphys/NoteBeamer                                                       *
 %% Thanks `wipet' (https://petr.olsak.net/) provides Beamers automatically inserts module                     *
 %% !Mode:: "TeX:UTF-8"                                                                                        *
 %% ************************************************************************************************************
+
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{notebeamer}[2023/11/01 v2.0a NoteBeamer document class]
+\ProvidesClass{notebeamer}[09/11/2023 v2.1a NoteBeamer document class]
 
-%% Global opinion
+%% Global opinions
 \RequirePackage{kvoptions}
 \RequirePackage{etoolbox}
 \SetupKeyvalOptions{family=NB, prefix=NB@, setkeys=\kvsetkeys}
 \newcommand{\ekv}[1]{\kvsetkeys{NB}{#1}}
+
 \DeclareStringOption[normal]{color}
 \DeclareVoidOption{lighter}{\ekv{color=lighter}}
 \DeclareVoidOption{normal}{\ekv{color=normal}}
 \DeclareVoidOption{darker}{\ekv{color=darker}}
+
+\DeclareStringOption[times]{font}
+\DeclareVoidOption{times}{\ekv{font=times}}
+\DeclareVoidOption{libertinus}{\ekv{font=libertinus}}
+
 \DeclareDefaultOption{\PassOptionsToClass{\CurrentOption}{standalone}}
 \ProcessKeyvalOptions*\relax
 \PassOptionsToPackage{quiet}{fontspec}
@@ -50,47 +57,60 @@
 }
 \newcommand{\flyleaf}[1]{\gdef\@flyleaf{#1}}
 \newcommand{\sticker}[1]{\gdef\@sticker{#1}}
-\NewDocumentCommand\logo{O{https://www.hdu.edu.cn} m O{浙江·杭州·下沙高教园}}{\gdef\@edu{#1}\gdef\@logo{#2}\gdef\@address{#3}}
+\NewDocumentCommand\logo{O{https://www.hdu.edu.cn} m O{Hangzhou·Zhejiang}}{\gdef\@edu{#1}\gdef\@logo{#2}\gdef\@address{#3}}
+
+%% Fonts
+\ifdefstring{\NB@font}{libertinus}{
+\setmainfont{Libertinus Serif}
+\setsansfont{Libertinus Sans}
+\setmonofont{NotoSansMono}[
+  Scale=MatchLowercase,
+  Extension=.ttf,
+  UprightFont=*-Light,
+  BoldFont=*-Medium
+]
+}{\relax}
 
 %% notepages
 \RequirePackage{graphics}
-\graphicspath{{./beamer/}{./figure/}{./figures/}{./image/}{./images/}{./graphics/}{./graphic/}{./pictures/}{./picture/}}% 路径索引
-\definecolor{lightyello}{HTML}{F8F7E9}
+\graphicspath{{./beamer/}{./figure/}{./figures/}{./image/}{./images/}{./graphics/}{./graphic/}{./pictures/}{./picture/}}% Paths
+\definecolor{lightyellow}{HTML}{F7F6E9}
 \definecolor{紺色}{HTML}{223A70}
 \newcounter{chap}
 \newcounter{note}
-\newcommand{\chaptername}{\faIcon{envira} Chapter}
+\newcommand{\chaptername}{\faIcon{seedling} Chapter}
 
 %%%% 1 note per page
 \newcommand{\newnote}[2]{
     \refstepcounter{note}
+    \addtocounter{note}{-1}
     \foreach \n in {#1,...,#2}{
     \begin{tikzpicture}
-        \fill [lightyello!20] (0,0) rectangle (\notewidth in,\noteheight in);% 边界
-        \ifcsname @sticker\endcsname\node [anchor=east,opacity=0.24,inner sep=0pt] at (0.985*\notewidth in,0.0684*\noteheight in) {\includegraphics[height=0.85072 in]{\@sticker}};\fi
+        \fill [lightyellow!50] (0,0) rectangle (\notewidth in,\noteheight in);% 边界
+        \ifcsname @sticker\endcsname\node [anchor=south east,opacity=0.24,inner sep=0pt] at (0.985*\notewidth in,0.012*\noteheight in) {\includegraphics[height=1.07158 in]{\@sticker}};\fi
 
         %%%%%% imput file
-        \node [yshift=\thenote*36*0.026*\noteheight in,inner sep=0pt] at (0.4*\notewidth in,0.032*\noteheight in-13.5*0.026*\noteheight in) {\ifcsname @chapter\endcsname\includegraphics[height=5.63602 in,page=\n]{\@courseware}\fi};
+        \node [yshift=(\thenote+1)*33*0.028*\noteheight in,inner sep=0pt] at (0.4*\notewidth in,0.038*\noteheight in-12.5*0.028*\noteheight in) {\ifcsname @chapter\endcsname\includegraphics[height=5.61148 in,page=\n]{\@courseware}\fi};
 
         %%%%%% draw lines & dots: right
-        \foreach \a in {10,...,36}
-        \foreach \b in {29,...,35}
-        \fill [fill=gray,xshift=\b*0.025*\notewidth in,yshift=\a*\noteheight*0.026 in] (0.05*\notewidth in,0.032*\noteheight in) circle (0.006);% 点
-        \foreach \a in {10,...,35}
-        \draw [line cap=round,opacity=0.5,gray!80,yshift=\a*\noteheight*0.026 in] (0.75*\notewidth in+0.25*0.026*\notewidth in,0.032*\noteheight in) --++ (0.2*\notewidth in-0.25*0.026*\notewidth in,0);% 横线
+        \foreach \a in {9,...,33}
+        \foreach \b in {24,...,29}
+        \fill [fill=gray,xshift=\b*0.03*\notewidth in,yshift=\a*\noteheight*0.028 in] (0.05*\notewidth in,0.038*\noteheight in) circle (0.006);% 点
+        \foreach \a in {9,...,32}
+        \draw [line cap=round,opacity=0.5,gray!80,yshift=\a*\noteheight*0.028 in] (0.75*\notewidth in+0.25*0.028*\notewidth in,0.038*\noteheight in) --++ (0.2*\notewidth in-0.25*0.028*\notewidth in,0);% 横线
 
         %%%%%% draw lines & dots: bottom
-        \foreach \a in {0,...,9,9}
-        \foreach \b in {1,...,35}
-        \fill [fill=gray,xshift=\b*0.025*\notewidth in,yshift=\a*\noteheight*0.026 in] (0.05*\notewidth in,0.032*\noteheight in) circle (0.006);% 点
-        \foreach \a in {1,...,9,9}
-        \draw [line cap=round,opacity=0.5,gray!80,yshift=\a*\noteheight*0.026 in] (0.05*\notewidth in,0.032*\noteheight in) --++ (0.9*\notewidth in,0);% 横线
+        \foreach \a in {0,...,8,8}
+        \foreach \b in {1,...,29}
+        \fill [fill=gray,xshift=\b*0.03*\notewidth in,yshift=\a*\noteheight*0.028 in] (0.05*\notewidth in,0.038*\noteheight in) circle (0.006);% 点
+        \foreach \a in {1,...,8,8}
+        \draw [line cap=round,opacity=0.5,gray!80,yshift=\a*\noteheight*0.028 in] (0.05*\notewidth in,0.038*\noteheight in) --++ (0.9*\notewidth in,0);% 横线
 
-        \draw [line cap=round,紺色!80,opacity=0.8,thick] (0.05*\notewidth in,0.032*\noteheight in) --++ (0.9*\notewidth in,0);% 底部粗线
+        \draw [line cap=round,紺色!80,opacity=0.8,thick] (0.05*\notewidth in,0.038*\noteheight in) --++ (0.9*\notewidth in,0);% 底部粗线
 
-        \draw [line cap=round,紺色!80,opacity=0.8,thick,yshift=36*0.026*\noteheight in] (0.05*\notewidth in,0.032*\noteheight in) --++ (0.9*\notewidth in,0) node [anchor=south west,at start] {\small\color{紺色}\bfseries\sffamily\chaptername~\ifcsname @chapter\endcsname\thechap. \@chapter\fi} node [anchor=south east] {\small\color{紺色}\bfseries\sffamily Page \thepage\quad};% 顶部粗线
+        \draw [line cap=round,紺色!80,opacity=0.8,thick,yshift=33*0.028*\noteheight in] (0.05*\notewidth in,0.038*\noteheight in) --++ (0.9*\notewidth in,0) node [anchor=south west,at start] {\small\color{紺色}\bfseries\sffamily\chaptername~\ifcsname @chapter\endcsname\thechap. \@chapter\fi} node [anchor=south east] {\small\color{紺色}\bfseries\sffamily Page \thepage\quad};% 顶部粗线
 
-        \draw [line cap=round,thick,opacity=0.4,gray] (0.75*\notewidth in,0.032*\noteheight in+9.25*0.026*\noteheight in) -- (0.75*\notewidth in,0.032*\noteheight in+35.75*0.026*\noteheight in);% 分栏线
+        \draw [line cap=round,thick,opacity=0.4,gray] (0.75*\notewidth in,0.038*\noteheight in+8.25*0.028*\noteheight in) -- (0.75*\notewidth in,0.038*\noteheight in+32.75*0.028*\noteheight in);% 分栏线
     \end{tikzpicture}
     }
 }
@@ -99,31 +119,33 @@
 \newcommand{\threebeamers}[3]{
     \refstepcounter{note}
     \begin{tikzpicture}
-        \fill [lightyello!20] (0,0) rectangle (\notewidth in,\noteheight in);% 边界
-        \ifcsname @sticker\endcsname\node [anchor=east,opacity=0.24,inner sep=0pt] at (0.985*\notewidth in,0.0684*\noteheight in) {\includegraphics[height=0.85072 in]{\@sticker}};\fi
+        \fill [lightyellow!50] (0,0) rectangle (\notewidth in,\noteheight in);% 边界
+        \ifcsname @sticker\endcsname\node [anchor=south east,opacity=0.24,inner sep=0pt] at (0.985*\notewidth in,0.012*\noteheight in) {\includegraphics[height=1.07158 in]{\@sticker}};\fi
 
         %%%%%% imput file
         \foreach \n in {#1,#2,#3}
-        \node [yshift=((42-\n*12+(\thenote-1)*36)*0.026*\noteheight in),inner sep=0pt] at (0.3125*\notewidth in,0.032*\noteheight in) {\ifcsname @chapter\endcsname\includegraphics[height=2.44582 in,page=\n]{\@courseware}\fi};
+        \node [yshift=((27.5-(\n-#1)*11+\thenote*33)*0.028*\noteheight in),inner sep=0pt] at (0.3125*\notewidth in,0.038*\noteheight in) {\ifcsname @chapter\endcsname\includegraphics[height=2.40492 in,page=\n]{\@courseware}\fi};
 
         %%%%%% draw lines & dots
-        \foreach \a in {0,...,36}
-        \foreach \b in {22,...,35}
-        \fill [fill=gray,xshift=\b*0.025*\notewidth in,yshift=\a*\noteheight*0.026 in] (0.05*\notewidth in,0.032*\noteheight in) circle (0.006);% 点
-        \foreach \a in {1,...,35}
-        \draw [line cap=round,opacity=0.5,gray!80,yshift=\a*\noteheight*0.026 in] (0.575*\notewidth in+0.25*0.026*\notewidth in,0.032*\noteheight in) --++ (0.375*\notewidth in-0.25*0.026*\notewidth in,0);% 横线
+        \foreach \a in {0,...,33}
+        \foreach \b in {18,...,29}
+        \fill [fill=gray,xshift=\b*0.03*\notewidth in,yshift=\a*\noteheight*0.028 in] (0.05*\notewidth in,0.038*\noteheight in) circle (0.006);% 点
+        \foreach \a in {1,...,32}
+        \draw [line cap=round,opacity=0.5,gray!80,yshift=\a*\noteheight*0.028 in] (0.575*\notewidth in+0.25*0.028*\notewidth in,0.038*\noteheight in) --++ (0.375*\notewidth in-0.25*0.028*\notewidth in,0);% 横线
 
-        \draw [line cap=round,紺色!80,opacity=0.8,thick] (0.05*\notewidth in,0.032*\noteheight in) --++ (0.9*\notewidth in,0);% 底部粗线
+        \draw [line cap=round,紺色!80,opacity=0.8,thick] (0.05*\notewidth in,0.038*\noteheight in) --++ (0.9*\notewidth in,0);% 底部粗线
 
-        \draw [line cap=round,紺色!80,opacity=0.8,thick,yshift=36*0.026*\noteheight in] (0.05*\notewidth in,0.032*\noteheight in) --++ (0.9*\notewidth in,0) node [anchor=south west,at start] {\small\color{紺色}\bfseries\sffamily\chaptername~\ifcsname @chapter\endcsname\thechap. \@chapter\fi} node [anchor=south east] {\small\color{紺色}\bfseries\sffamily Page \thepage\quad};% 顶部粗线
+        \draw [line cap=round,紺色!80,opacity=0.8,thick,yshift=33*0.028*\noteheight in] (0.05*\notewidth in,0.038*\noteheight in) --++ (0.9*\notewidth in,0) node [anchor=south west,at start] {\small\color{紺色}\bfseries\sffamily\chaptername~\ifcsname @chapter\endcsname\thechap. \@chapter\fi} node [anchor=south east] {\small\color{紺色}\bfseries\sffamily Page \thepage\quad};% 顶部粗线
 
-        \draw [line cap=round,thick,opacity=0.4,gray] (0.575*\notewidth in,0.032*\noteheight in+0.25*0.026*\noteheight in) -- (0.575*\notewidth in,0.032*\noteheight in+35.75*0.026*\noteheight in);% 分栏线
+        \draw [line cap=round,thick,opacity=0.4,gray] (0.575*\notewidth in,0.038*\noteheight in+0.25*0.028*\noteheight in) -- (0.575*\notewidth in,0.038*\noteheight in+32.75*0.028*\noteheight in);% 分栏线
     \end{tikzpicture}
 }
+
 %%%%%% Simplify loop 3
 \newcount\tmpnum
 \def\newnotesss#1#2{%
-   \def\maxnum{#2}\tmpnum=1 
+\addtocounter{note}{-1}
+   \def\maxnum{#2}\tmpnum=#1
    \loop
       \unless\ifnum\tmpnum>#2 \threebeamers{\valnum0}{\valnum1}{\valnum2}
       \advance\tmpnum by3
@@ -138,29 +160,31 @@
 \newcommand{\fourbeamers}[4]{
     \refstepcounter{note}
     \begin{tikzpicture}
-        \fill [lightyello!20] (0,0) rectangle (\notewidth in,\noteheight in);% 边界
-        \ifcsname @sticker\endcsname\node [anchor=east,opacity=0.24,inner sep=0pt] at (0.985*\notewidth in,0.0684*\noteheight in) {\includegraphics[height=0.85072 in]{\@sticker}};\fi
+        \fill [lightyellow!50] (0,0) rectangle (\notewidth in,\noteheight in);% 边界
+        \ifcsname @sticker\endcsname\node [anchor=south east,opacity=0.24,inner sep=0pt] at (0.985*\notewidth in,0.012*\noteheight in) {\includegraphics[height=1.07158 in]{\@sticker}};\fi
         %%%%%% imput file
         \foreach \n in {#1,#2,#3,#4}
-        \node [yshift=((40.5-\n*9+(\thenote-1)*36)*0.026*\noteheight in),inner sep=0pt] at (0.3125*\notewidth in,0.032*\noteheight in) {\ifcsname @chapter\endcsname\includegraphics[height=1.80778 in,page=\n]{\@courseware}\fi};
+        \node [yshift=((28.875-(\n-#1)*8.25+\thenote*33)*0.028*\noteheight in),inner sep=0pt] at (0.3125*\notewidth in,0.038*\noteheight in) {\ifcsname @chapter\endcsname\includegraphics[height=1.77506 in,page=\n]{\@courseware}\fi};
 
-        \foreach \a in {0,...,36}
-        \foreach \b in {22,...,35}
-        \fill [fill=gray,xshift=\b*0.025*\notewidth in,yshift=\a*\noteheight*0.026 in] (0.05*\notewidth in,0.032*\noteheight in) circle (0.006);% 点
-        \foreach \a in {1,...,35}
-        \draw [line cap=round,opacity=0.5,gray!80,yshift=\a*\noteheight*0.026 in] (0.575*\notewidth in+0.25*0.026*\notewidth in,0.032*\noteheight in) --++ (0.375*\notewidth in-0.25*0.026*\notewidth in,0);% 横线
+        \foreach \a in {0,...,33}
+        \foreach \b in {18,...,29}
+        \fill [fill=gray,xshift=\b*0.03*\notewidth in,yshift=\a*\noteheight*0.028 in] (0.05*\notewidth in,0.038*\noteheight in) circle (0.006);% 点
+        \foreach \a in {1,...,32}
+        \draw [line cap=round,opacity=0.5,gray!80,yshift=\a*\noteheight*0.028 in] (0.575*\notewidth in+0.25*0.028*\notewidth in,0.038*\noteheight in) --++ (0.375*\notewidth in-0.25*0.028*\notewidth in,0);% 横线
 
-        \draw [line cap=round,紺色!80,opacity=0.8,thick] (0.05*\notewidth in,0.032*\noteheight in) --++ (0.9*\notewidth in,0);% 底部粗线
+        \draw [line cap=round,紺色!80,opacity=0.8,thick] (0.05*\notewidth in,0.038*\noteheight in) --++ (0.9*\notewidth in,0);% 底部粗线
 
-        \draw [line cap=round,紺色!80,opacity=0.8,thick,yshift=36*0.026*\noteheight in] (0.05*\notewidth in,0.032*\noteheight in) --++ (0.9*\notewidth in,0) node [anchor=south west,at start] {\small\color{紺色}\bfseries\sffamily\chaptername~\ifcsname @chapter\endcsname\thechap. \@chapter\fi} node [anchor=south east] {\small\color{紺色}\bfseries\sffamily Page \thepage\quad};% 顶部粗线
+        \draw [line cap=round,紺色!80,opacity=0.8,thick,yshift=33*0.028*\noteheight in] (0.05*\notewidth in,0.038*\noteheight in) --++ (0.9*\notewidth in,0) node [anchor=south west,at start] {\small\color{紺色}\bfseries\sffamily\chaptername~\ifcsname @chapter\endcsname\thechap. \@chapter\fi} node [anchor=south east] {\small\color{紺色}\bfseries\sffamily Page \thepage\quad};% 顶部粗线
 
-        \draw [line cap=round,thick,opacity=0.4,gray] (0.575*\notewidth in,0.032*\noteheight in+0.25*0.026*\noteheight in) -- (0.575*\notewidth in,0.032*\noteheight in+35.75*0.026*\noteheight in);% 分栏线
+        \draw [line cap=round,thick,opacity=0.4,gray] (0.575*\notewidth in,0.038*\noteheight in+0.25*0.028*\noteheight in) -- (0.575*\notewidth in,0.038*\noteheight in+32.75*0.028*\noteheight in);% 分栏线
     \end{tikzpicture}
 }
+
 %%%%%% Simplify loop 4
 \newcount\tmpnum
 \def\newnotessss#1#2{%   
-    \def\maxnum{#2}\tmpnum=1
+\addtocounter{note}{-1}
+    \def\maxnum{#2}\tmpnum=#1
     \loop      
       \unless\ifnum\tmpnum>#2 \fourbeamers{\valnum0}{\valnum1}{\valnum2}{\valnum3}      
       \advance\tmpnum by4   
@@ -172,54 +196,70 @@
 }
 
 %%%% emptynote (*without chapter title & page number)
-\NewDocumentCommand\emptynote{s}{
+\NewDocumentCommand\clearnote{s}{
 \begin{tikzpicture}
-    \fill [lightyello!20] (0,0) rectangle (\notewidth in,\noteheight in);% 边界
-    \ifcsname @sticker\endcsname\node [anchor=east,opacity=0.24,inner sep=0pt] at (0.985*\notewidth in,0.0684*\noteheight in) {\includegraphics[height=0.85072 in]{\@sticker}};\fi
-    \foreach \a in {0,...,36}
-    \foreach \b in {1,...,35}
-    \fill [fill=gray,xshift=\b*0.025*\notewidth in,yshift=\a*\noteheight*0.026 in] (0.05*\notewidth in,0.032*\noteheight in) circle (0.006);% 点
-    \foreach \a in {1,...,35}
-    \draw [line cap=round,opacity=0.5,gray!80,yshift=\a*\noteheight*0.026 in] (0.05*\notewidth in,0.032*\noteheight in) --++ (0.9*\notewidth in,0);% 横线
+    \fill [lightyellow!50] (0,0) rectangle (\notewidth in,\noteheight in);% 边界
+    \ifcsname @sticker\endcsname\node [anchor=south east,opacity=0.24,inner sep=0pt] at (0.985*\notewidth in,0.012*\noteheight in) {\includegraphics[height=1.07158 in]{\@sticker}};\fi
+    \foreach \a in {0,...,33}
+    \foreach \b in {1,...,29}
+    \fill [fill=gray,xshift=\b*0.03*\notewidth in,yshift=\a*\noteheight*0.028 in] (0.05*\notewidth in,0.038*\noteheight in) circle (0.006);% 点
+    \foreach \a in {1,...,32}
+    \draw [line cap=round,opacity=0.5,gray!80,yshift=\a*\noteheight*0.028 in] (0.05*\notewidth in,0.038*\noteheight in) --++ (0.9*\notewidth in,0);% 横线
 
-    \draw [line cap=round,紺色!80,opacity=0.8,thick] (0.05*\notewidth in,0.032*\noteheight in) --++ (0.9*\notewidth in,0);% 底部粗线
+    \draw [line cap=round,紺色!80,opacity=0.8,thick] (0.05*\notewidth in,0.038*\noteheight in) --++ (0.9*\notewidth in,0);% 底部粗线
 
     \IfBooleanTF{#1}
     {
-    \draw [line cap=round,紺色!80,opacity=0.8,thick,yshift=36*0.026*\noteheight in] (0.05*\notewidth in,0.032*\noteheight in) --++ (0.9*\notewidth in,0) node [anchor=south west,at start] {\small\color{紺色}\bfseries\sffamily\chaptername} node [anchor=south east] {\small\color{紺色}\bfseries\sffamily Page\addtocounter{page}{-1}\quad\quad};% 顶部粗线
+    \draw [line cap=round,紺色!80,opacity=0.8,thick,yshift=33*0.028*\noteheight in] (0.05*\notewidth in,0.038*\noteheight in) --++ (0.9*\notewidth in,0) node [anchor=south west,at start] {\small\color{紺色}\bfseries\sffamily\chaptername} node [anchor=south east] {\small\color{紺色}\bfseries\sffamily Page\addtocounter{page}{-1}\quad\quad};% 顶部粗线
     }
     {
-    \draw [line cap=round,紺色!80,opacity=0.8,thick,yshift=36*0.026*\noteheight in] (0.05*\notewidth in,0.032*\noteheight in) --++ (0.9*\notewidth in,0) node [anchor=south west,at start] {\small\color{紺色}\bfseries\sffamily\chaptername~\ifcsname @chapter\endcsname\thechap. \@chapter\fi} node [anchor=south east] {\small\color{紺色}\bfseries\sffamily Page \thepage\quad};% 顶部粗线
+    \draw [line cap=round,紺色!80,opacity=0.8,thick,yshift=33*0.028*\noteheight in] (0.05*\notewidth in,0.038*\noteheight in) --++ (0.9*\notewidth in,0) node [anchor=south west,at start] {\small\color{紺色}\bfseries\sffamily\chaptername~\ifcsname @chapter\endcsname\thechap. \@chapter\fi} node [anchor=south east] {\small\color{紺色}\bfseries\sffamily Page \thepage\quad};% 顶部粗线
     }
 
-    \draw [line cap=round,thick,opacity=0.4,gray] (0.5*\notewidth in,0.032*\noteheight in+0.25*0.026*\noteheight in) -- (0.5*\notewidth in,0.032*\noteheight in+35.75*0.026*\noteheight in);% 分栏线
+    \draw [line cap=round,thick,opacity=0.4,gray] (0.5*\notewidth in,0.038*\noteheight in+0.25*0.028*\noteheight in) -- (0.5*\notewidth in,0.038*\noteheight in+32.75*0.028*\noteheight in);% 分栏线
 \end{tikzpicture}
 }
 
+\NewDocumentCommand\emptynote{s O{1}}
+{\IfBooleanTF{#1}{
+    \Repeat{#2}{\clearnote*}
+    }{
+    \Repeat{#2}{\clearnote}
+    }
+}
+
 %%%% emptynote with school title (*without chapter title & page number)
-\NewDocumentCommand\newhdunote{s}{
+\NewDocumentCommand\clearhdunote{s}{
 \begin{tikzpicture}
-    \fill [lightyello!20] (0,0) rectangle (\notewidth in,\noteheight in);% 边界
-    \ifcsname @sticker\endcsname\node [anchor=east,opacity=0.24,inner sep=0pt] at (0.985*\notewidth in,0.0684*\noteheight in) {\includegraphics[height=0.85072 in]{\@sticker}};\fi
-    \foreach \a in {0,...,35}
+    \fill [lightyellow!50] (0,0) rectangle (\notewidth in,\noteheight in);% 边界
+    \ifcsname @sticker\endcsname\node [anchor=south east,opacity=0.24,inner sep=0pt] at (0.985*\notewidth in,0.012*\noteheight in) {\includegraphics[height=1.07158 in]{\@sticker}};\fi
+    \foreach \a in {0,...,32}
     \foreach \b in {1,...,29}
-    \fill [fill=gray,xshift=\b*0.03*\notewidth in,yshift=\a*\noteheight*0.026 in] (0.05*\notewidth in,0.032*\noteheight in) circle (0.006);% 点
-    \foreach \a in {1,...,34}
-    \draw [line cap=round,opacity=0.5,gray!80,yshift=\a*\noteheight*0.026 in] (0.05*\notewidth in,0.032*\noteheight in) --++ (0.9*\notewidth in,0);% 横线
+    \fill [fill=gray,xshift=\b*0.03*\notewidth in,yshift=\a*\noteheight*0.028 in] (0.05*\notewidth in,0.038*\noteheight in) circle (0.006);% 点
+    \foreach \a in {1,...,31}
+    \draw [line cap=round,opacity=0.5,gray!80,yshift=\a*\noteheight*0.028 in] (0.05*\notewidth in,0.038*\noteheight in) --++ (0.9*\notewidth in,0);% 横线
 
     \IfBooleanTF{#1}
     {
-    \draw [line cap=round,紺色!80,opacity=0.8,thick] (0.05*\notewidth in,0.032*\noteheight in) --++ (0.9*\notewidth in,0) node [anchor=north east,darkgray] {\small\color{紺色}\bfseries\sffamily Page\addtocounter{page}{-1}\quad\quad};% 底部粗线
+    \draw [line cap=round,紺色!80,opacity=0.8,thick] (0.05*\notewidth in,0.038*\noteheight in) --++ (0.9*\notewidth in,0) node [anchor=north east,darkgray] {\small\color{紺色}\bfseries\sffamily Page\addtocounter{page}{-1}\quad\quad};% 底部粗线
     }{
-    \draw [line cap=round,紺色!80,opacity=0.8,thick] (0.05*\notewidth in,0.032*\noteheight in) --++ (0.9*\notewidth in,0) node [anchor=north east,darkgray] {\small\color{紺色}\bfseries\sffamily Page \thepage\quad};% 底部粗线
+    \draw [line cap=round,紺色!80,opacity=0.8,thick] (0.05*\notewidth in,0.038*\noteheight in) --++ (0.9*\notewidth in,0) node [anchor=north east,darkgray] {\small\color{紺色}\bfseries\sffamily Page \thepage\quad};% 底部粗线
     }
 
-    \draw [line cap=round,紺色!80,opacity=0.8,thick,yshift=35*0.026*\noteheight in] (0.05*\notewidth in,0.032*\noteheight in) --++ (0.9*\notewidth in,0)\ifcsname @logo\endcsname node [anchor=west,at start,,yshift=0.029*\noteheight in,inner sep=0pt] {\href{\@edu}{\includegraphics[height=0.42536 in]{\@logo}}} node [anchor=east,yshift=0.029*\noteheight in] {\small\bfseries\heiti\color{紺色}\faIcon{map-pin} \@address\quad\quad}\fi;% 顶部粗线
+    \draw [line cap=round,紺色!80,opacity=0.8,thick,yshift=32*0.028*\noteheight in] (0.05*\notewidth in,0.038*\noteheight in) --++ (0.9*\notewidth in,0)\ifcsname @logo\endcsname node [anchor=west,at start,yshift=0.033*\noteheight in,inner sep=0pt] {\href{\@edu}{\includegraphics[height=0.45808 in]{\@logo}}} node [anchor=east,yshift=0.033*\noteheight in] {\bfseries\heiti\color{紺色}\faIcon{map-pin} \@address\quad\quad}\fi;% 顶部粗线
 
-    \draw [line cap=round,thick,opacity=0.4,gray] (0.5*\notewidth in,0.032*\noteheight in+0.25*0.026*\noteheight in) -- (0.5*\notewidth in,0.032*\noteheight in+34.75*0.026*\noteheight in);% 分栏线
+    \draw [line cap=round,thick,opacity=0.4,gray] (0.5*\notewidth in,0.038*\noteheight in+0.25*0.028*\noteheight in) -- (0.5*\notewidth in,0.038*\noteheight in+31.75*0.028*\noteheight in);% 分栏线
 \end{tikzpicture}
 }
 
+\NewDocumentCommand\emptyhdunote{s O{1}}
+{\IfBooleanTF{#1}{
+    \Repeat{#2}{\clearhdunote*}
+    }{
+    \Repeat{#2}{\clearhdunote}
+    }
+}
+
 %% covers
 \ifdefstring{\NB@color}{lighter}{\newcommand{\@saturation}{.16}}{\relax}
 \ifdefstring{\NB@color}{normal}{\newcommand{\@saturation}{.12}}{\relax}
@@ -235,15 +275,14 @@
 
 \NewDocumentCommand\notebook{s O{H5} m O{}}{
     \setcounter{chap}{0}
-    \setcounter{page}{1}
-    \addtocounter{page}{-1}
+    \setcounter{page}{0}
     \begin{tikzpicture}
         \fill [#2] (0,0) rectangle (\notewidth in,\noteheight in);% 边界
         \fill [white,opacity=0.17] (0.2*\notewidth in,0.6*\noteheight in) rectangle (\notewidth in,0);
         \fill [white,opacity=0.17] (0.3*\notewidth in,0.7*\noteheight in) rectangle (\notewidth in,0);
         \node at (0.65*\notewidth in,0.65*\noteheight in) {\LARGE\bfseries\sffamily #3};
         \node [rotate=90,opacity=0.4] at (0.25*\notewidth in,0.3*\noteheight in) {\sffamily\Large\bfseries\MakeUppercase{#4}};
-        \draw [thick,line cap=round] (0.65*\notewidth in,0.05*\noteheight in) --++ (0.25*\notewidth in,0) node [anchor=south west] {\large\faIcon{pen}} \ifcsname @mail\endcsname node [midway,anchor=south] {\bfseries\texttt{\@mail}}\fi node [midway,anchor=south,yshift=2em] {\bfseries\sffamily\large\ifcsname @author\endcsname\@author\fi};
+        \draw [thick,line cap=round] (0.65*\notewidth in,0.05*\noteheight in) --++ (0.25*\notewidth in,0) node [anchor=south west] {\large\faIcon{feather-alt}} \ifcsname @mail\endcsname node [midway,anchor=south] {\bfseries\texttt{\@mail}}\fi node [midway,anchor=south,yshift=2em] {\bfseries\sffamily\large\ifcsname @author\endcsname\@author\fi};
         \ifcsname @logo\endcsname\node [anchor=north west] at (0.025*\notewidth in,0.991*\noteheight in) {\href{\@edu}{\includegraphics[width=2.212 in]{\@logo}}};\fi
     \end{tikzpicture}
     \ifcsname @flyleaf\endcsname
@@ -253,4 +292,9 @@
     \end{tikzpicture}
     \fi
     \IfBooleanTF{#1}{\emptynote*}{}
-}
-\ No newline at end of file
+}
+
+%% LaTeX 3 \Repeat supports
+\ExplSyntaxOn
+\cs_new_eq:NN \Repeat \prg_replicate:nn
+\ExplSyntaxOff
+\ No newline at end of file
diff --git a/macros/latex/contrib/ppt-slides/DEPENDS.txt b/macros/latex/contrib/ppt-slides/DEPENDS.txt
index 6607b6fe61..9234b174c7 100644
--- a/macros/latex/contrib/ppt-slides/DEPENDS.txt
+++ b/macros/latex/contrib/ppt-slides/DEPENDS.txt
@@ -1,4 +1,3 @@
-
 hard anyfontsize
 hard changepage
 hard crumbs
@@ -40,6 +39,7 @@ soft microtype
 soft newtx
 soft pdfcrop
 soft qrcode
+soft upquote
 soft scheme-basic
 soft setspace
 soft standalone
diff --git a/macros/latex/contrib/ppt-slides/ppt-slides.dtx b/macros/latex/contrib/ppt-slides/ppt-slides.dtx
index 515a43cd9b..54abab106f 100644
--- a/macros/latex/contrib/ppt-slides/ppt-slides.dtx
+++ b/macros/latex/contrib/ppt-slides/ppt-slides.dtx
@@ -50,7 +50,7 @@
 %<package>\NeedsTeXFormat{LaTeX2e}
 %<package>\ProvidesPackage{ppt-slides}
 %<*package>
-[2023-09-08 0.2.3 Slide Decks a la Power Point]
+[2023-11-08 0.3.0 Slide Decks a la Power Point]
 %</package>
 %<*driver>
 \documentclass{ltxdoc}
@@ -533,19 +533,31 @@
 % \end{macro}
 
 % \begin{macro}{\pptQuote}
-% Then, we define the |\pptQuote| command:
+% Then, we define the |\pptQuote| command, with one optional and three mandatory arguments:
+% \changes{0.3.0}{2023/11/08}{The \texttt{\char`\\pptQuote} command has got an optional parameter, where the name of the person on the photo can be specified.}
 %    \begin{macrocode}
 \RequirePackage{tabularx}
-\newcommand\pptQuote[3]{%
+\newcommand\pptQuote[4][]{%
   \begin{tabularx}{\columnwidth}{c>{\raggedright\arraybackslash}X}%
-    \raisebox{\dimexpr-\height+\ht\strutbox}{\pptPic{0.25}{#1}}%
+    \raisebox{\dimexpr-\height+\ht\strutbox}{
+      \parbox{0.25\textwidth+2pt}{%
+        \raggedright%
+        \pptPic{0.25}{#2}%
+        \def\person{#1}%
+        \ifx\person\empty\else%
+          \par%
+          \small%
+          \person%
+        \fi%
+      }%
+    }%
     &%
-    ``#2''%
-    \def\param{#3}%
+    ``#3''%
+    \def\param{#4}%
     \ifx\param\empty\else%
       \newline\newline%
       \small%
-      --- #3%
+      --- \param%
     \fi%
     \\%
   \end{tabularx}%
@@ -595,6 +607,7 @@
 % \end{macro}
 
 % \begin{macro}{\pptThought}
+% \changes{0.3.0}{2023/09/19}{The \texttt{\char`\\pptThought} command aligns text to the left.}
 % Then, we define the |\pptThought| command:
 %    \begin{macrocode}
 \newcommand\pptThought[1]{%
@@ -602,7 +615,7 @@
     \tikz{%
       \node [inner sep=18pt] (z) {%
         \begin{varwidth}{0.8\textwidth}%
-          \Large #1%
+          \raggedright\Large #1%
         \end{varwidth}%
       };
       \path [draw=green,line width=8pt] (z.north west) -- (z.south west);
diff --git a/macros/latex/contrib/ppt-slides/ppt-slides.pdf b/macros/latex/contrib/ppt-slides/ppt-slides.pdf
index 7b23a4fc98..9e22a9e1aa 100644
--- a/macros/latex/contrib/ppt-slides/ppt-slides.pdf
+++ b/macros/latex/contrib/ppt-slides/ppt-slides.pdf
diff --git a/macros/latex/contrib/q-and-a/Q-and-A.cls b/macros/latex/contrib/q-and-a/Q-and-A.cls
index 82e1cd7d5a..95de42d609 100644
--- a/macros/latex/contrib/q-and-a/Q-and-A.cls
+++ b/macros/latex/contrib/q-and-a/Q-and-A.cls
@@ -12,7 +12,7 @@
 \NeedsTeXFormat{LaTeX2e}[2022-06-01]
 \ProvidesExplClass
   {Q-and-A}
-  {2023/11/07} {}
+  {2023/11/08} {}
   {Document class for typesetting Q&A conversation}
 
 \keys_define:nn { Q-and-A }
@@ -320,6 +320,7 @@
     NewDocumentCommand,NewDocumentEnvironment,
     includegraphics,
     definecolor, colorlet, color, textcolor,
+    tikz, draw, fill, filldraw, node, clip,
   }
   {% LaTeX3 commands
   }
@@ -379,12 +380,19 @@
     \group_end:
   }
 
+\def\QAendmark{}
 \NewDocumentCommand \QAInput { m }
   {
     \file_get:nnN { #1 } { } \l_tmpa_tl
     \exp_args:No \QAtext { \l_tmpa_tl }
     % Currently, for some reason, the following adjustment is needed
-    \vspace{-2\parskip}
+    \peek_regex:nF { (\ *)? (\c{par}*)? (\ *)? \c{QAendmark} }
+      {
+        \peek_meaning:NF \QAendmark
+          {% only do this in the middle of the text
+            \vspace{-2\parskip}
+          }
+      }
   }
 \NewDocumentCommand \QAInclude { m }
   {
@@ -1134,6 +1142,7 @@
           }
       }
     \__QA_put_current_content:n { #1 }
+    \tl_gput_right:Nn #1 { \QAendmark }
   }
 
 \box_new:N \l__QA_tmp_box
diff --git a/macros/latex/contrib/q-and-a/README.md b/macros/latex/contrib/q-and-a/README.md
index 4c3d474cc1..d9937df788 100644
--- a/macros/latex/contrib/q-and-a/README.md
+++ b/macros/latex/contrib/q-and-a/README.md
@@ -59,3 +59,6 @@ The scroll mode is achieved by directly accessing `\pdfpageheight` (pdfTeX and X
 # License
 
 This work is released under the LaTeX Project Public License, v1.3c or later.
+
+The ChatGPT logo image used in the demo document is *not* an official version. It has been created by the author by overlaying the OpenAI logo onto a colored background, with the background color being extracted directly from the ChatGPT interface using a color picker tool. This was done solely for the purpose of replicating the layout of the actual ChatGPT interface.
+The author does not assert any copyright claims or ownership over the design of this logo. Users are kindly advised to replace this logo image in their respective documents with their own authorized version.
diff --git a/macros/latex/contrib/q-and-a/demo/theme-ChatGPT/Q-and-A-demo-ChatGPT-dark.pdf b/macros/latex/contrib/q-and-a/demo/theme-ChatGPT/Q-and-A-demo-ChatGPT-dark.pdf
index 99b80904b1..9ccbae5242 100644
--- a/macros/latex/contrib/q-and-a/demo/theme-ChatGPT/Q-and-A-demo-ChatGPT-dark.pdf
+++ b/macros/latex/contrib/q-and-a/demo/theme-ChatGPT/Q-and-A-demo-ChatGPT-dark.pdf
diff --git a/macros/latex/contrib/q-and-a/demo/theme-ChatGPT/Q-and-A-demo-ChatGPT-light.pdf b/macros/latex/contrib/q-and-a/demo/theme-ChatGPT/Q-and-A-demo-ChatGPT-light.pdf
index 69175ceb7f..82349a5414 100644
--- a/macros/latex/contrib/q-and-a/demo/theme-ChatGPT/Q-and-A-demo-ChatGPT-light.pdf
+++ b/macros/latex/contrib/q-and-a/demo/theme-ChatGPT/Q-and-A-demo-ChatGPT-light.pdf
diff --git a/macros/latex/contrib/q-and-a/demo/theme-ChatGPT/Q-and-A-demo-ChatGPT.tex b/macros/latex/contrib/q-and-a/demo/theme-ChatGPT/Q-and-A-demo-ChatGPT.tex
index 318bc65ee7..fb5be3e4ce 100644
--- a/macros/latex/contrib/q-and-a/demo/theme-ChatGPT/Q-and-A-demo-ChatGPT.tex
+++ b/macros/latex/contrib/q-and-a/demo/theme-ChatGPT/Q-and-A-demo-ChatGPT.tex
@@ -4,9 +4,40 @@
   scroll,
 ]{Q-and-A}
 
-
-\SetLogoCode[Q]{\smash{\raisebox{-.45\baselineskip}{\includegraphics[height=1.35\baselineskip]{Q-and-A-demo-logo-User}}}}
-\SetLogoCode[A]{\smash{\raisebox{-.45\baselineskip}{\includegraphics[height=1.35\baselineskip]{Q-and-A-demo-logo-ChatGPT}}}}
+% The User Logo
+\SetLogoCode[Q]{%
+  \smash{\raisebox{-.65\baselineskip}{%
+    \begin{tikzpicture}
+      \node [inner sep=0pt] at (0,0) {\includegraphics[height=1.5\baselineskip]{Q-and-A-demo-logo-User}};
+      \draw [QA-Q-back, rounded corners=.15\baselineskip, line width=.2\baselineskip]
+        (current bounding box.north west) --
+        (current bounding box.north east) --
+        (current bounding box.south east) --
+        (current bounding box.south west) -- cycle;
+      \clip (current bounding box.north west) --
+        (current bounding box.north east) --
+        (current bounding box.south east) --
+        (current bounding box.south west) -- cycle;
+    \end{tikzpicture}%
+  }\hspace{-.25em}%
+  }}
+% The ChatGPT Logo
+\SetLogoCode[A]{%
+  \smash{\raisebox{-.65\baselineskip}{%
+    \begin{tikzpicture}
+      \node [inner sep=0pt] at (0,0) {\includegraphics[height=1.5\baselineskip]{Q-and-A-demo-logo-ChatGPT}};
+      \draw [QA-A-back, rounded corners=.15\baselineskip, line width=.2\baselineskip]
+        (current bounding box.north west) --
+        (current bounding box.north east) --
+        (current bounding box.south east) --
+        (current bounding box.south west) -- cycle;
+      \clip (current bounding box.north west) --
+        (current bounding box.north east) --
+        (current bounding box.south east) --
+        (current bounding box.south west) -- cycle;
+    \end{tikzpicture}%
+  }\hspace{-.25em}%
+  }}
 
 
 \begin{document}
diff --git a/macros/latex/contrib/q-and-a/demo/theme-ChatGPT/images/Q-and-A-demo-logo-ChatGPT.pdf b/macros/latex/contrib/q-and-a/demo/theme-ChatGPT/images/Q-and-A-demo-logo-ChatGPT.pdf
index 6ab76f7083..bd89da4131 100644
--- a/macros/latex/contrib/q-and-a/demo/theme-ChatGPT/images/Q-and-A-demo-logo-ChatGPT.pdf
+++ b/macros/latex/contrib/q-and-a/demo/theme-ChatGPT/images/Q-and-A-demo-logo-ChatGPT.pdf
diff --git a/macros/latex/contrib/q-and-a/doc/Q-and-A-doc.pdf b/macros/latex/contrib/q-and-a/doc/Q-and-A-doc.pdf
index dadca3b63e..137559f16a 100644
--- a/macros/latex/contrib/q-and-a/doc/Q-and-A-doc.pdf
+++ b/macros/latex/contrib/q-and-a/doc/Q-and-A-doc.pdf
diff --git a/macros/latex/contrib/q-and-a/doc/Q-and-A-doc.tex b/macros/latex/contrib/q-and-a/doc/Q-and-A-doc.tex
index 48894878d7..5cdaa152bd 100644
--- a/macros/latex/contrib/q-and-a/doc/Q-and-A-doc.tex
+++ b/macros/latex/contrib/q-and-a/doc/Q-and-A-doc.tex
@@ -5,7 +5,7 @@
   scroll,
 ]{Q-and-A}
 
-\def\PackageVersion{2023/11/07}
+\def\PackageVersion{2023/11/08}
 \def\PackageSubVersion{}
 
 \newcommand{\QApackage}{{\normalfont\textsf{Q-and-A}}}
@@ -247,10 +247,13 @@
 
   \begin{itemize}
     \item Currently, the code highlight is done by the package `listings`. Due to its own limitations, the result is still far from satisfactory. Using `minted` instead could improve the situation, but this would require `-shell-escape` and some external tweaking, thus it would still take some effort to make it work with the current document class.
+    \item Due to the current implementation, one cannot direct write code (either inline or displayed) within the text (alternative solution has been proposed above).
+    \item Due to the current implementation, one may not be able to directly write certain characters (such as `\textasterisk`) in the text, this might be especially inconvenient in math mode (temporary alternative solution has been proposed above).
+    \item Due to the current implementation, the method for inputting and including subfiles doesn't really work like `\textbackslash input` and `\textbackslash include`. In particular, the current type of conversation would be reset, this might cause some confusion in certain cases.
     % \item The code block containing long piece of code usually won't properly break across the page (which is essentially why this documentation and the demo documents enabled the `scroll` mode).
     %% 2023-11-05, solved with the new option "answer outside the box".
     \item Due to the current implementation, though it is already possible to automatically adopt the identifiers and labels for supported languages, you still need to use the identifiers `Q`, `A` and `N` when setting them.
-    \item Currently, for typesetting questions and answers, the text is in fact being put into some sort of `description` list. As a result, the level of lists might be slightly messed up, which could sometimes lead to issues with the list labels.
+    \item Currently, for typesetting questions and answers, the text is in fact being put into some sort of `description` list (upon reflection, why did I do this? I could have simply put the label into margin...). As a result, the level of lists might be slightly messed up, which could sometimes lead to issues with the list labels.
   \end{itemize}
author	Norbert Preining <norbert@preining.info>	2023-11-09 03:02:39 +0000
committer	Norbert Preining <norbert@preining.info>	2023-11-09 03:02:39 +0000
commit	3425ad695d75cc781b0fe3412db3aa2ad5985959 (patch)
tree	9ec65bca1de4085db47511e67369ea2b71a488fa /macros/latex/contrib
parent	dada699771828d1aa3c78ecf55a2131e5f5799f3 (diff)