CTAN sync 202201060300

35 files changed, 433 insertions, 117 deletions

diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-publist/README b/macros/latex/contrib/biblatex-contrib/biblatex-publist/README
index 690c242cd6..03fc943a6a 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-publist/README
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-publist/README
@@ -32,6 +32,7 @@ The package consists of the following files:
 
 * publist.bbx (biblatex bibliography style file)
 * publist.cbx (biblatex citation style file)
+* publist.dbx (biblatex database model file)
 * biblatex-publist.pdf (package documentation)
 * biblatex-publist.tex (documentation source)
 * README (this very file)
@@ -45,6 +46,13 @@ instructions.
 
 == CHANGES ==
 
+* V. 1.26 (2022-01-05):
+	- Provide means to add peer review information.
+	- Add a data model (*.dbx) file.
+	- Fix \textcite output at least for the standard cases (#36).
+	- Do not highlight/omit author/editor names in related entries.
+	- Rename bpl:review:* macros to bpl:plain:* and add bpl:plain:editor.
+
 * V. 1.25 (2021-12-14):
 	- More robustification with names consisting of non-ASCII chars.
 	- With "pubstateextra", differentiate between pubstates.
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-publist/biblatex-publist.pdf b/macros/latex/contrib/biblatex-contrib/biblatex-publist/biblatex-publist.pdf
index 2ea2539720..449d209f27 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-publist/biblatex-publist.pdf
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-publist/biblatex-publist.pdf
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-publist/biblatex-publist.tex b/macros/latex/contrib/biblatex-contrib/biblatex-publist/biblatex-publist.tex
index a925e0c0ae..d36ea6480b 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-publist/biblatex-publist.tex
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-publist/biblatex-publist.tex
@@ -102,31 +102,30 @@
 \thanks{Please report issues via \protect\url{https://github.com/jspitz/biblatex-publist}.}%
 }
 
-\date{Version 1.25, 2021/12/14}
+\date{Version 1.26 2022/01/05}
 \maketitle
 
 \begin{abstract}
-\noindent The \bpl\ package provides a \bibltx\ style file
+\noindent The \bpl\ package provides a \bibltx\ \cite{bibltx} style file
 for publication lists, i.\,e., a bibliography containing one's own
 publications. It draws on \bibltx's \emph{authoryear} style by default
 (which can be changed), but provides some extra features needed for publication lists,
 such as the omission or highlighting of the own name from\slash in author or editor data.
-The package requires at least version 3.8 of the \bibltx\ package\footnote{For \bibltx, see
-\url{http://www.ctan.org/pkg/biblatex}.} and \texttt{biber} (the respective version as required by \bibltx).
+The package requires at least version 3.8 of \bibltx\ and \texttt{biber}
+(the respective version as required by \bibltx).
 \end{abstract}
 
 \tableofcontents
 
 \section{Aim of the package}
 
-The \bpl\ package provides a \bibltx\ bibliography style for a specific task:
-academic publication lists. Such lists, which are a central
-part of the academic CV, contain all or selected publications of a specific
-author, usually sorted by genre and year. Even though publication lists are actually
-nothing else than (specific) bibliographies, they diverge from those in some
-respects. Most notably, it is widespread practice to omit your own name in
-your publication list and only list your co-authors, if there are any, or to
-highlight your own name (e.\,g., with bold face letters).
+The \bpl\ package provides a \bibltx\ bibliography style specifically for academic publication lists.
+Such lists, which are a central part of the academic CV, contain all or selected
+publications of a specific author, usually sorted by genre and year.
+Even though publication lists are actually nothing else than (specific) bibliographies,
+they diverge from those in some respects. Most notably, it is widespread practice
+to omit your own name in your publication list and only list your co-authors,
+if there are any, or to highlight your own name (e.\,g., with bold face letters).
 If you want to follow this practice, a normal bibliography style does not
 produce the desired result.
 
@@ -154,6 +153,7 @@ The list of features includes:
 	\item Highlight year of publication
 	\item Indicate year of publication (sets) in the margin
 	\item Clickable titles, linking to the URL, DOI, or a web catalog
+	\item Indicate if/how a title has been peer-reviewed
 	\item List reviews of specific titles
 	\item Adjustable base bibliography style
 \end{itemize}
@@ -162,10 +162,18 @@ Many features have been suggested by users of the package.
 If you miss a specific feature, feel free to suggest it via
 \url{https://github.com/jspitz/biblatex-publist/issues}.
 
+\subsection*{Caveats}
+
 Note that \bpl\ relies on rather advanced features of \bibltx\ for some of its own features.
 These are only available with the \texttt{biber} backend of \bibltx. Hence \bpl\ requires
 the use of \texttt{biber} as well -- the \texttt{bibtex} backend won't work!
 
+Also note that the aim of \bpl\ is to generate publication lists, so it is not suitable
+for normal bibliographies. Specifically, while basic citing works, more advanced
+forms of citing may break or not produce the expected result. The reason is that
+\bpl\ needs to perform internal tweaks (e.\,g., to \textsf{shortauthor} and
+\textsf{labelname}) which might bite you with customized cite formats.
+
 
 \section{Usage}
 
@@ -267,7 +275,6 @@ If you prefer the numbering to start from 1 at each section instead, set this op
 
 If you do not want to have any numbers at all, set this option to \joption{false}.
 
-
 \item [{\joption{reversenumbering{[}=true|false{]}}}] default: \emph{false}.
 
 If this option is \joption{true}, the entries will be numbered in descending order, starting from the total
@@ -283,6 +290,12 @@ with abbreviated and full first name (\textsc{J. Doe} and well as \textsc{John D
 works of colleagues with the same surname (maybe your family members), which you will not want to mark as your own's.
 Of course, the solution does not help if there is an entry with same surname and same first name initial (such as \textsc{Jane Doe}).
 
+
+\item [{\joption{prinfo{[}=true|false{]}}}] default: \emph{true}.
+
+If this option is \joption{true}, peer review information, as specified via the \texttt{peerreview} field
+(see section~\ref{sec:peerreview}), will be appended to the entries.
+
 \end{description}
 %
 The following options are available if \textsf{hyperref} is loaded:
@@ -377,7 +390,28 @@ The omission indicator, \jcsmacro*{plnameomission}, can be redefined. The defaul
 \newcommand*\plnameomission{\bibellipsis\addcomma\addspace}
 \end{lstlisting}
 
-\condbr{4}
+\subsection{Adding Peer Review Information}\label{sec:peerreview}
+
+It is common, and sometimes mandatory, to add information to publication list entries indicating if
+and how listed work has been subject to peer review.
+To this end, \bpl\ provides a specific database field, \texttt{peerreview}, in which you can use
+the following shorthands:
+
+\begin{itemize}\setlength{\itemsep}{0pt}
+	\item{\texttt{sb}} (=~single blind peer review)
+	\item{\texttt{db}} (=~double blind peer review)
+	\item{\texttt{op}} (=~open peer review)
+	\item{\texttt{co}} (=~collaborative peer review)
+	\item{\texttt{cc}} (=~cascading peer review)
+	\item{\texttt{tp}} (=~third-party peer review)
+	\item{\texttt{pp}} (=~post-publication peer review)
+	\item{\texttt{no}} (=~no peer review)
+\end{itemize}
+%
+If the option \joption{prinfo} is true, then \bpl\ will append the respective information to the entries.
+A specific localizable bibkey is used for this purpose (see section~\ref{sec:localization}). Instead of
+the shorthands, you can also enter arbitrary text to the \texttt{peerreview} field, which is then output
+as is (and not localized).
 
 \section{Customization}
 
@@ -456,17 +490,25 @@ Note that the output of URLs, DOIs, ISBNs and ISSNs is not affected by the \jopt
 so you might get redundant output. To control (e.\,g., omit) them, use the \joption{url}, \joption{doi}
 and \joption{isbn} biblatex options. 
 
-\section{Localization}
+\section{Localization}\label{sec:localization}
 
 Since the package draws on \bibltx, it supports localization. 
 The following additional localization keys (\jfcsmacro{bibstrings})
 are added by the package:
 \begin{itemize}
 \item \emph{with}: the preposition ``with'' that precedes the list of
-co-authors by default (i.\,e., with \joption{plauthorhandling=omit}).
+                   co-authors by default (i.\,e., with \joption{plauthorhandling=omit}).
 \item \emph{parttranslationof}: the expression ``partial translation of''
-for entries referring to partially translated work via \bibltx's
-``related entries'' feature (see sec.~\ref{sec:partial-translations}).
+                   for entries referring to partially translated work via \bibltx's
+       ``related entries'' feature (see sec.~\ref{sec:partial-translations}).
+\item \emph{peerreview:sb}: the phrase ``single blind peer review''.
+\item \emph{peerreview:db}: the phrase ``double blind peer review''.
+\item \emph{peerreview:op}: the phrase ``open peer review''.
+\item \emph{peerreview:co}: the phrase ``collaborative peer review''.
+\item \emph{peerreview:cc}: the phrase ``cascading peer review''.
+\item \emph{peerreview:tp}: the phrase ``third-party peer review''.
+\item \emph{peerreview:pp}: the phrase ``post-publication peer review''.
+\item \emph{peerreview:no}: the phrase ``no peer review''.
 \end{itemize}
 Currently, these additional localization keys are available in the following
 languages: English, French and German.%
@@ -667,6 +709,16 @@ or
 
 \begin{description}
 	
+	\item [{V. 1.26 (2022-01-05):}]~
+	\begin{itemize}
+		\item Provide means to add peer review information (see section~\ref{sec:peerreview}).
+		\item Add a data model (\texttt{*.dbx}) file.
+		\item Fix \jcsmacro{textcite} output at least for the standard cases.
+		\item Do not highlight/omit author/editor names in related entries.
+		\item Rename \texttt{bpl:review:*} macros to \texttt{bpl:plain:*} and
+		      add \texttt{bpl:plain:editor}.
+	\end{itemize}
+	
 	\item [{V. 1.25 (2021-12-14):}]~
 	\begin{itemize}
 		\item More robustification with names consisting of non-ASCII chars.
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-publist/publist.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-publist/publist.bbx
index 100722aa9b..d8309df788 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-publist/publist.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-publist/publist.bbx
@@ -25,8 +25,8 @@
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-\def\bpl@version{1.25}
-\def\bpl@rdate{2021/12/14}
+\def\bpl@version{1.26}
+\def\bpl@rdate{2022/01/05}
 
 \ProvidesFile{publist.bbx}[\bpl@rdate\space v.\bpl@version\space
                            biblatex bibliography style (JSP)]
@@ -187,6 +187,12 @@
     }%
 }
 
+\newtoggle{bpl@prinfo}
+\toggletrue{bpl@prinfo}
+\DeclareBibliographyOption{prinfo}[true]{%
+    \ifstrequal{#1}{true}{\toggletrue{bpl@prinfo}}{\togglefalse{bpl@prinfo}}
+}
+
 \newif\if@bpl@reversenum\@bpl@reversenumfalse
 \DeclareBibliographyOption{reversenumbering}[true]{%
     \ifstrequal{#1}{true}{\@bpl@reversenumtrue}{\@bpl@reversenumfalse}
@@ -531,6 +537,19 @@
 
 
 %
+% Peer-review type
+%
+\newcommand\printprinfo[1]{%
+    \ifbibstring{peerreview:#1}%
+       {\bibstring{peerreview:#1}}%
+       {#1}%
+}
+
+\DeclareFieldFormat{peerreview}{%
+    \printtext[brackets]{\printprinfo{#1}}%
+}
+
+%
 % Bibliography filter
 %
 % Inspired by http://tex.stackexchange.com/a/28555/19291
@@ -736,7 +755,7 @@
     \else% \if@hlauthor false
         \ifthenelse{\value{listcount}=1}%
             {\ifthenelse{\value{nonpl#1s}>0\AND{\value{pl#1s}}>0}%
-                 {\bibopenparen\bibstring{with}\addspace}%
+                 {\iftoggle{isinrelated}{}{\bibopenparen\bibstring{with}\addspace}}%
                  {}%
              \iftoggle{isplauthor}%
                  {\global\toggletrue{plauthorprecedes}}%
@@ -776,7 +795,7 @@
         %
         \usebibmacro{bpl:name:andothers}%
         \ifthenelse{\value{nonpl#1s}>0\AND{\value{pl#1s}}>0\AND\value{listcount}=\value{liststop}}%
-            {\unspace\bibcloseparen}%
+            {\unspace\iftoggle{isinrelated}{}{\bibcloseparen}}%
             {}%
     \fi% end of \if@hlauthor else condition
 }
@@ -817,6 +836,24 @@
 %
 
 \renewbibmacro*{author}{%
+    \iftoggle{isinrelated}{%
+       \usebibmacro{bpl:plain:author}%
+    }{%
+       \usebibmacro{bpl:author}%
+    }%
+}
+
+
+\renewbibmacro*{editor}{%
+    \iftoggle{isinrelated}{%
+       \usebibmacro{bpl:plain:editor}%
+    }{%
+       \usebibmacro{bpl:editor}%
+    }%
+}
+
+
+\newbibmacro*{bpl:author}{%
     \if@hlauthor
         \ifnameundef{author}
             {}
@@ -854,7 +891,7 @@
     \fi% end of \if@hlauthor else condition
 }
 
-\renewbibmacro*{editor}{%
+\newbibmacro*{bpl:editor}{%
     \if@hlauthor
         \ifnameundef{editor}
             {}
@@ -1026,13 +1063,13 @@
     }%
 }
 
-\newbibmacro*{bpl:review:author/label}{%
+\newbibmacro*{bpl:plain:author/label}{%
     \ifnameundef{author}
         {\usebibmacro{label}}
-        {\usebibmacro{bpl:review:author}}
+        {\usebibmacro{bpl:plain:author}}
 }
 
-\newbibmacro*{bpl:review:author}{%
+\newbibmacro*{bpl:plain:author}{%
     \ifnameundef{author}
         {\let\bbx@lasthash\undefined}
         {%
@@ -1050,10 +1087,23 @@
          \mkbibbrackets{\bibstring[\unspace]{alias}\addspace\printfield{nameaddon}}%
          \addspace%
         }%
-    \usebibmacro{bpl:review:year+labelyear}%
+    \usebibmacro{bpl:plain:year+labelyear}%
+}
+
+\newbibmacro*{bpl:plain:editor}{%
+   \ifnameundef{editor}
+       {}
+       {%
+        \printnames{editor}%
+        \setunit{\printdelim{editortypedelim}}%
+        \usebibmacro{editorstrg}%
+       }%
+       \adddot\addspace%
+       \usebibmacro{bpl:plain:year+labelyear}%
+       \clearname{editor}%
 }
 
-\newbibmacro*{bpl:review:year+labelyear}{%
+\newbibmacro*{bpl:plain:year+labelyear}{%
     \iffieldundef{year}
         {}
         {%
@@ -1064,22 +1114,64 @@
         }%
 }
 
+\renewbibmacro*{addendum+pubstate}{%
+  \printfield{addendum}%
+  \newunit\newblock
+  \printfield{pubstate}%
+  \iftoggle{bpl@prinfo}{%
+    \newunit\newblock
+    \printfield{peerreview}%
+  }{}%
+}
+
 %
 % l7n
 %
 \NewBibliographyString{with}
 \NewBibliographyString{parttranslationof}
+\NewBibliographyString{peerreview:sb}
+\NewBibliographyString{peerreview:db}
+\NewBibliographyString{peerreview:op}
+\NewBibliographyString{peerreview:co}
+\NewBibliographyString{peerreview:cc}
+\NewBibliographyString{peerreview:tp}
+\NewBibliographyString{peerreview:pp}
+\NewBibliographyString{peerreview:no}
 \DefineBibliographyStrings{english}{%
     parttranslationof   = {partial translation of},
-    with                = {with}
+    with                = {with},
+    peerreview:sb       = {single blind peer review},
+    peerreview:db       = {double blind peer review},
+    peerreview:op       = {open peer review},
+    peerreview:co       = {collaborative peer review},
+    peerreview:cc       = {cascading peer review},
+    peerreview:tp       = {third-party peer review},
+    peerreview:pp       = {post-publication peer review},
+    peerreview:no       = {no peer review}
 }
 \DefineBibliographyStrings{french}{%
     parttranslationof   = {traduction partielle de},
-    with                = {avec}
+    with                = {avec},
+    peerreview:sb       = {\'{e}valuation par des pairs anonymis\'{e}s},
+    peerreview:db       = {\'{e}valuation par les pairs en double aveugle},
+    peerreview:op       = {\'{e}valuation par les pairs ouverte},
+    peerreview:co       = {\'{e}valuation par les pairs collaborative},
+    peerreview:cc       = {\'{e}valuation par les pairs en cascade},
+    peerreview:tp       = {\'{e}valuation par des pairs ext\'{e}rieurs},
+    peerreview:pp       = {\'{e}valuation par les pairs apr\`{e}s publication},
+    peerreview:no       = {pas d'\'{e}valuation par les pairs}
 }
 \DefineBibliographyStrings{german}{%
     parttranslationof   = {Teil\"ubersetzung von},
-    with                = {mit}
+    with                = {mit},
+    peerreview:sb       = {Blindbegutachtung},
+    peerreview:db       = {Doppelblindbegutachtung},
+    peerreview:op       = {Offene Begutachtung},
+    peerreview:co       = {Kollaborative Begutachtung},
+    peerreview:cc       = {Cascading-Begutachtung},
+    peerreview:tp       = {Begutachtung durch Dritte},
+    peerreview:pp       = {Post-Publication-Begutachtung},
+    peerreview:no       = {keine Begutachtung}
 }
 
 
@@ -1088,7 +1180,7 @@
 %
 
 \DeclareBibliographyDriver{review}{%
-    \usebibmacro{bpl:review:author/label}%
+    \usebibmacro{bpl:plain:author/label}%
     \setunit*{\addcolon\space}%
     \usebibmacro{title}%
     \newunit\newblock
@@ -1354,15 +1446,38 @@
 
 % Add a dummy constant shortauthor in order to
 % ignore author constellation on extralabel assignment.
+% Original entries are stored in namea.
 \if@hlauthor
 \else
     \DeclareStyleSourcemap{
         \maps[datatype=bibtex]{
+          \map{
+             \step[fieldsource=shortauthor]
+             \step[fieldset=namea, origfieldval]
+            }
             \map[overwrite]{
                 \step[fieldset=shortauthor, fieldvalue={1111}]
             }
         }
     }
+    % For proper labelname (e.g., \textcite), write back original
+    % shortauthor, author or editor after the extradate has been
+    % constructed.
+    \AtDataInput{%
+       \csgappto\blx@bbl@data{%
+           \let\c@shortauthor\c@namea
+           \let\abx@name@shortauthor\abx@name@namea
+           \ifdefstring\abx@field@labelnamesource{shortauthor}
+              {\ifundef\abx@name@shortauthor
+	          {\ifundef\abx@name@author
+		      {\def\abx@field@labelnamesource{editor}}
+		      {\def\abx@field@labelnamesource{author}}%
+                  }%
+		  {}%
+	      }%
+              {}%
+        }%
+     }%
 \fi
 
 % Correctly sort pubstates.
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-publist/publist.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-publist/publist.cbx
index 13c7945ed0..06b5b151c6 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-publist/publist.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-publist/publist.cbx
@@ -26,8 +26,8 @@
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-\def\bpl@version{1.25}
-\def\bpl@rdate{2021/12/14}
+\def\bpl@version{1.26}
+\def\bpl@rdate{2022/01/05}
 
 \ProvidesFile{publist.cbx}[\bpl@rdate\space v.\bpl@version\space
                            biblatex citation style (JSP)]
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-publist/publist.dbx b/macros/latex/contrib/biblatex-contrib/biblatex-publist/publist.dbx
new file mode 100644
index 0000000000..2248eece0b
--- /dev/null
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-publist/publist.dbx
@@ -0,0 +1,29 @@
+% publist.dbx, biblatex data model specification for the biblatex-publist
+% package, version 1.26 (2022-01-05). 
+%
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3
+% of this license or (at your option) any later version.
+% The latest version of this license is in
+%   http://www.latex-project.org/lppl.txt
+% and version 1.3 or later is part of all distributions of LaTeX
+% version 2003/12/01 or later.
+%
+% This work has the LPPL maintenance status "maintained".
+% 
+% This Current Maintainer of this work is Jürgen Spitzmüller.
+%
+%
+% Please send suggestions and bug reports to 
+% https://github.com/jspitz/biblatex-publist
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+
+% Add peerreview (literal) field
+\DeclareDatamodelFields[type=field, datatype=literal]{
+  peerreview}
+
+\DeclareDatamodelEntryfields{
+  peerreview}
+
diff --git a/macros/latex/contrib/cellspace/README b/macros/latex/contrib/cellspace/README
index 7adfa2eac6..17ccfb6c87 100644
--- a/macros/latex/contrib/cellspace/README
+++ b/macros/latex/contrib/cellspace/README
@@ -1,9 +1,9 @@
-% (C) 2006-2019 Josselin Noirel
+% (C) 2006-2022 Josselin Noirel
 % 
 % Package cellspace: Ensuring a minimal spacing of table cells.
 %
 % This material is subject to the LaTeX Project Public License. See
-% http://www.ctan.org/tex-archive/help/Catalogue/licenses.lppl.html .
+% https://www.latex-project.org/lppl/ .
 
 This package is intended to allow automatic spacing out of
 the lines of an array.  People often complain about text touching the
@@ -22,4 +22,10 @@ v1.7: New features as suggested by Bastien Roucaries: (1) Possibility
       math column independent of the colum name.
 
 v1.8.1: Package becomes aware of the latest modifications of the array
-      package.  Also the GitHub project is referenced in the documentation.
\ No newline at end of file
+      package.  Also the GitHub project is referenced in the documentation.
+
+v1.9.0: The new implementation solves a problem with empty
+      cells for paragraph-type columns (m, p, b) by
+      testing whether \prevdepth is greater than 1000~pt.
+      The package has now been made aware of the new
+      implementation of \@endpbox of array.
diff --git a/macros/latex/contrib/cellspace/cellspace.pdf b/macros/latex/contrib/cellspace/cellspace.pdf
index 5755b527f5..fa11211710 100644
--- a/macros/latex/contrib/cellspace/cellspace.pdf
+++ b/macros/latex/contrib/cellspace/cellspace.pdf
diff --git a/macros/latex/contrib/cellspace/cellspace.sty b/macros/latex/contrib/cellspace/cellspace.sty
index 8a7735490b..76a7db240a 100644
--- a/macros/latex/contrib/cellspace/cellspace.sty
+++ b/macros/latex/contrib/cellspace/cellspace.sty
@@ -1,12 +1,12 @@
-% (C) 2006-2019 Josselin Noirel
+% (C) 2006-2022 Josselin Noirel
 % 
 % Package cellspace: Ensuring a minimal spacing of table cells.
 %
 % This material is subject to the LaTeX Project Public License. See
-% http://www.ctan.org/tex-archive/help/Catalogue/licenses.lppl.html .
+% https://www.latex-project.org/lppl/ .
 %
-\def \filedate    {2019/03/11}%
-\def \fileversion {v1.8.1}%
+\def \filedate    {2022/01/04}%
+\def \fileversion {v1.9.0}%
 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{cellspace}%
@@ -20,6 +20,22 @@
 % 2. Check the definitions of \@startpbox and \@endpbox
 %    from array.sty
 
+\@ifpackagelater{array}{2021/04/20}{%
+      % New version of \@endpbox
+      % Includes a \par
+      \CheckCommand*{\@startpbox}[1]{%
+        \bgroup
+          \color@begingroup
+            \setlength\hsize{#1}%
+            \@arrayparboxrestore
+            \everypar{%
+                  \vrule \@height \ht\@arstrutbox \@width \z@
+                  \everypar{}}%
+      }%
+      %
+      \CheckCommand*{\@endpbox}%
+        {\@finalstrut \@arstrutbox \par \color@endgroup \egroup\hfil}%
+}{%
 \@ifpackagelater{array}{2018/12/30}{%
       % New versions of \@startpbox / \@endpbox
       % Includes a \color@...group
@@ -47,7 +63,7 @@
       }%
       %
       \CheckCommand*{\@endpbox}{\@finalstrut \@arstrutbox \egroup \hfil}%
-}
+}}
 
   % New version of array.sty
 
@@ -107,6 +123,7 @@
       \expandafter
     \egroup
     \ifcellspace@
+    \unless \ifdim \cellspace@lastdp = -1000pt %
       % Save the height of the first line
       \global \cellspace@firstht = \ht\@tempboxa
       \setbox \@tempboxa = \vbox {%
@@ -130,7 +147,7 @@
         \nointerlineskip
         \hbox{\vrule height 0pt depth \@tempdima width 0pt }%
       }%
-    \fi
+    \fi \fi
     \unvbox \@tempboxa
   \egroup
   \hfil
diff --git a/macros/latex/contrib/cellspace/cellspace.tex b/macros/latex/contrib/cellspace/cellspace.tex
index 5c4da1937e..e91b2a117f 100644
--- a/macros/latex/contrib/cellspace/cellspace.tex
+++ b/macros/latex/contrib/cellspace/cellspace.tex
@@ -1,12 +1,12 @@
-% (C) 2006-2019 Josselin Noirel
+% (C) 2006-2022 Josselin Noirel
 % 
 % Package cellspace: Ensuring a minimal spacing of table cells.
 %
 % This material is subject to the LaTeX Project Public License. See
-% http://www.ctan.org/tex-archive/help/Catalogue/licenses.lppl.html .
+% https://www.latex-project.org/lppl/ .
 %
-\def \filedate    {2019/03/11}%
-\def \fileversion {v1.8.1}%
+\def \filedate    {2022/01/04}%
+\def \fileversion {v1.9.0}%
 
 \ProvidesFile{cellspace}%
   [\filedate \space \fileversion \space cellspace documentation (JN)]
@@ -371,7 +371,6 @@ be passed to the package to that effect;
 can be used to provide cellspace's functionality through the \tex{O}
 column modifier instead of the \tex{S} column modifier.
 
-
 \section{Bugs and limitations}
 
 This package hasn't been heavily tested, so there may be plenty of bugs.
@@ -418,8 +417,16 @@ far as I can see, cannot work with \pack{array}.
 \section{What's new}
 
 \begin{description}
+\item [v1.9.0] The new implementation solves a problem with empty
+      cells for paragraph-type columns (\tex{m}, \tex{p}, \tex{b}) by
+      testing whether \cmd{prevdepth} is greater than 1000~pt (see
+      example below). The package has now been made aware of the new
+      implementation of \cmd{@endpbox} of \tex{array} (again).
+
+\begin{tabular}{S{p{4cm}}} \hline \\ \hline \end{tabular}
+      
 \item [v1.8.1] Package becomes aware of the latest version of the
-      array package
+      array package.
 \end{description}
 
 \end{document}
diff --git a/macros/latex/contrib/codebox/README.md b/macros/latex/contrib/codebox/README.md
index f5372b8900..38f669150c 100644
--- a/macros/latex/contrib/codebox/README.md
+++ b/macros/latex/contrib/codebox/README.md
@@ -43,7 +43,7 @@ Contributing
 Copyright and Licence
 ---------------------
 
-    Copyright (C) 2020-2021 by Nan Geng <nangeng@nwafu.edu.cn>
+    Copyright (C) 2020-2022 by Nan Geng <nangeng@nwafu.edu.cn>
     ----------------------------------------------------------------------
 
     This work may be distributed and/or modified under the
diff --git a/macros/latex/contrib/codebox/codebox-doc-en.pdf b/macros/latex/contrib/codebox/codebox-doc-en.pdf
index c95ab86dfc..f8edd671df 100644
--- a/macros/latex/contrib/codebox/codebox-doc-en.pdf
+++ b/macros/latex/contrib/codebox/codebox-doc-en.pdf
diff --git a/macros/latex/contrib/codebox/codebox-doc-en.tex b/macros/latex/contrib/codebox/codebox-doc-en.tex
index cf4232e088..3ad34985de 100644
--- a/macros/latex/contrib/codebox/codebox-doc-en.tex
+++ b/macros/latex/contrib/codebox/codebox-doc-en.tex
@@ -5,7 +5,7 @@
 \usepackage{xcolor-material}
 \usepackage{codebox}
 
-\renewcommand{\thecodecounter}{\thesection.\arabic{codecounter}}
+% \renewcommand{\thecvcounter}{\thesection.\arabic{cvcounter}}
 \NewDocumentCommand{\init}{+v}{\hspace{\fill}Init~=~\textcolor{blue}{\bfseries#1}}
 \DeclareDocumentCommand\opt{m}{\texttt{#1}}
 \DeclareDocumentCommand\kvopt{mm}
@@ -14,7 +14,7 @@
 
 \title{\bfseries\pkg{codebox}：programming code box}
 \author{Nan Geng\\ \url{nangeng@nwafu.edu.cn}}
-\date{2021/12/26\qquad v1.0.0\thanks{\url{https://github.com/registor/codebox}}
+\date{2022/01/04\qquad v1.0.3\thanks{\url{https://github.com/registor/codebox}}
 \thanks{\url{https://gitee.com/nwafu_nan/codebox}}}
 
 \begin{document}
@@ -322,6 +322,32 @@ or command's \oarg{options}.
   The default is\textbf{3.0}.
 \end{function}
 
+\subsection{label}
+
+\begin{function}[added=2022-1-4,updated=2022-1-4]{label}
+  \begin{syntax}
+    label = \Arg{label name} \init{nothing}
+  \end{syntax}
+  \opt{label} is used to set \tn{ref} 's label name,
+  it is for \env{codeview}/\env{codeview*} and \tn{cvfile}/\tn{cvfile*}.
+  The default is \textbf{nothing}.
+\end{function}
+
+\section{The counter}
+
+\begin{function}[added=2021-12-28,updated=2021-12-28]{cvconuter}
+  The \pkg{codebox} package provides a \texttt{cvcounter} counter 
+  that can be used to count code boxes with environment \env{codeview}/\env{codeview*}
+  and the command \tn{cvfile}/\tn{cvfile*}. 
+
+  By default, if \tn{thechapter} exists, its parent counter is set to \textbf{chapter}
+  otherwise it will be counted uniformly by full text. 
+
+  You can use
+  \tn{renewcommand\{\tn{thecvcounter}\}\{\tn{thechapter.\tn{arabic\{cvcounter\}}}\}}
+  or something like this macro to change the numbered output.
+\end{function}
+
 \section{Examples}
 
 The \pkg{codebox} package can be used in situations
@@ -348,16 +374,17 @@ The language can be set with \tn{codeset} macro.
 \end{center}
 
 \subsection{Python code}
-The language can be set with \opt{options}.
+The language can be set with \opt{options}, of course you can label and ref it
+such as code \ref{code-test}.
 
 \begin{Verbatim}[frame=none,numbers=left,gobble=2]
   \centering
-  \cvfile[lang=python]{Python CodeBox}{hellopy.py}
+  \cvfile[lang=python,label=code-test]{Python CodeBox}{hellopy.py}
 \end{Verbatim}
 
 \begin{center}
   \begin{minipage}{0.85\textwidth}
-    \cvfile[lang=python]{Python CodeBox}{hellopy.py}
+    \cvfile[lang=python,label=code-test]{Python CodeBox}{hellopy.py}
   \end{minipage}
 \end{center}
 
diff --git a/macros/latex/contrib/codebox/codebox.dtx b/macros/latex/contrib/codebox/codebox.dtx
index 4e7d767dbe..8365020d9f 100644
--- a/macros/latex/contrib/codebox/codebox.dtx
+++ b/macros/latex/contrib/codebox/codebox.dtx
@@ -49,7 +49,7 @@ Contributing
 Copyright and Licence
 ---------------------
 
-    Copyright (C) 2020-2021 by Nan Geng <nangeng@nwafu.edu.cn>
+    Copyright (C) 2020-2022 by Nan Geng <nangeng@nwafu.edu.cn>
     ----------------------------------------------------------------------
 
     This work may be distributed and/or modified under the
@@ -88,7 +88,7 @@ Copyright and Licence
 
 \preamble
 
-    Copyright (C) 2020-2021 by Nan Geng <nangeng@nwafu.edu.cn>
+    Copyright (C) 2020-2022 by Nan Geng <nangeng@nwafu.edu.cn>
 --------------------------------------------------------------------------
 
     This work may be distributed and/or modified under the
@@ -148,7 +148,7 @@ Copyright and Licence
 %</internal>
 %<package>\NeedsTeXFormat{LaTeX2e}[2020/10/01]
 %<package>\RequirePackage{expl3}
-%<+package>\GetIdInfo$Id: codebox.dtx 1.0.2 2022-01-02 08:00:00 +0800 Nan Geng <nangeng@nwafu.edu.cn> $
+%<+package>\GetIdInfo$Id: codebox.dtx 1.0.3 2022-01-04 08:00:00 +0800 Nan Geng <nangeng@nwafu.edu.cn> $
 %<package>  {Code Box with tcolorbox and minted/listings.}
 %<package>\ProvidesExplPackage{\ExplFileName}
 %<package>  {\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
@@ -180,7 +180,7 @@ Copyright and Licence
 %
 % \changes{v1.0.0}{2021/12/25}{开始编写模板}
 %
-% \CheckSum{295}
+% \CheckSum{313}
 % \GetFileId{codebox.sty}
 %
 % \CharacterTable
@@ -485,6 +485,20 @@ Copyright and Licence
 %   引擎有效，取浮点数，单位是mm。默认值为\textbf{3.0}。
 % \end{function}
 %
+% \changes{v1.0.3}{2022/1/4}{添加label引用标签选项的使用说明}
+%
+% \subsection{引用标签}
+%
+% \begin{function}[added=2022-1-4,updated=2022-1-4]{label}
+%   \begin{syntax}
+%     label = \Arg{引用标签名称} \init{空}
+%   \end{syntax}
+%   \opt{label} 用于设置带编号代码盒子的引用标签，
+%   该选项仅对\env{codeview}/\env{codeview*}环境
+%   或\tn{cvfile}/\tn{cvfile*}命令有效。
+%   默认值为\textbf{空}。
+% \end{function}
+%
 % \changes{v1.0.2}{2021/12/28}{添加cvcounter使用说明}
 %
 % \section{计数器}
@@ -524,15 +538,17 @@ Copyright and Licence
 %
 % \subsection{Python代码}
 % 还可以使用环境或命令的\oarg{外观选项}设置代码语言。
+% 当然，也可以通过使用\opt{label}选项为编号代码添加引用标签，
+% 并通过\tn{ref}命令引用该标签，如代码\ref{code-test}所示。
 %
 %   \begin{Verbatim}[frame=none,numbers=left,gobble=5]
 %     \centering
-%     \cvfile[lang=python]{Python代码示例}{hellopy.py}
+%     \cvfile[lang=python,label=code-test]{Python代码示例}{hellopy.py}
 %   \end{Verbatim}
 %
 %   \begin{center}
 % %     \begin{minipage}{0.85\textwidth}
-%       \cvfile[lang=python]{Python代码示例}{hellopy.py}
+%       \cvfile[lang=python,label=code-test]{Python代码示例}{hellopy.py}
 %     \end{minipage}
 %   \end{center}
 %
@@ -747,11 +763,14 @@ Copyright and Licence
 % \l_@@_code_name_tl,
 % \l_@@_comment_contents_tl,
 % \l_@@_comment_format_tl,
+% \l_@@_label_name_tl,
 % \l_@@_baseline_stretch_fp,
 % \l_@@_linenumber_sep_fp
 %  }
 % 定义变量。
 %
+% \changes{v1.0.3}{2022/1/4}{增加\tn{\_@@_label_name_tl}变量}
+%
 %    \begin{macrocode}
 \bool_new:N   \l_@@_minted_bool
 \bool_new:N   \l_@@_comment_bool
@@ -762,6 +781,7 @@ Copyright and Licence
 \tl_new:N     \l_@@_code_name_tl
 \tl_new:N     \l_@@_comment_contents_tl
 \tl_new:N     \l_@@_comment_format_tl
+\tl_new:N     \l_@@_label_name_tl
 \fp_new:N     \l_@@_baseline_stretch_fp
 \fp_new:N     \l_@@_linenumber_sep_fp
 %    \end{macrocode}
@@ -849,6 +869,16 @@ Copyright and Licence
 %    \end{macrocode}
 % \end{macro}
 %
+% \changes{v1.0.3}{2022/1/4}{增加引用标签label选项}
+%
+% \begin{macro}{label}
+% 注释格式
+%    \begin{macrocode}
+    label .tl_set:N = \l_@@_label_name_tl,
+    label .initial:n = {},
+%    \end{macrocode}
+% \end{macro}
+%
 % 处理未知选项。
 %    \begin{macrocode}
     unknown .code:n = { \@@_error:n { unknown-option } }
@@ -1065,6 +1095,7 @@ Copyright and Licence
 %    \end{macrocode}
 %
 % \changes{v1.0.2}{2021/12/28}{为计数器两端添加\tn{nobreakspace}}
+% \changes{v1.0.3}{2022/1/4}{为带编号代码盒子添加引用标签选项}
 %
 %  定义不带底线注释的代码盒子环境\env{codeview}
 %
@@ -1080,6 +1111,12 @@ Copyright and Licence
     \IfNoValueF{#1}{ \keys_set:nn { codebox } { #1 } }
     \@@_code_engine_tcbset:
     \@@_comment_tcbset:
+    \tl_if_empty:NF \l_@@_label_name_tl
+    {
+      \tcbset{
+        label=\tl_use:N \l_@@_label_name_tl,
+      }
+    }
     \tcbset{
       cv,
       overlay~unbroken~and~first ={
@@ -1099,6 +1136,7 @@ Copyright and Licence
   }
 %    \end{macrocode}
 %
+%
 %  定义带底线注释的代码盒子环境\env{codeview*}
 %
 %    \begin{macrocode}
@@ -1109,6 +1147,12 @@ Copyright and Licence
     \IfNoValueF{#1}{ \keys_set:nn { codebox } { #1 } }
     \@@_code_engine_tcbset:
     \@@_comment_tcbset:
+    \tl_if_empty:NF \l_@@_label_name_tl
+    {
+      \tcbset{
+        label=\tl_use:N \l_@@_label_name_tl,
+      }
+    }
     \tcbset{
       cv,
       overlay~unbroken~and~first ={
@@ -1148,6 +1192,12 @@ Copyright and Licence
     \IfNoValueF{#2}{ \keys_set:nn { codebox } { #2 } }
     \@@_code_engine_tcbset:
     \@@_comment_tcbset:
+    \tl_if_empty:NF \l_@@_label_name_tl
+    {
+      \tcbset{
+        label=\tl_use:N \l_@@_label_name_tl,
+      }
+    }
     \tcbset{
       cv,
       listing~file={#4},
diff --git a/macros/latex/contrib/codebox/codebox.pdf b/macros/latex/contrib/codebox/codebox.pdf
index 1b078356ac..b82446cb1c 100644
--- a/macros/latex/contrib/codebox/codebox.pdf
+++ b/macros/latex/contrib/codebox/codebox.pdf
diff --git a/macros/latex/contrib/codebox/hellopy.py b/macros/latex/contrib/codebox/hellopy.py
index af687ef384..af687ef384 100755..100644
--- a/macros/latex/contrib/codebox/hellopy.py
+++ b/macros/latex/contrib/codebox/hellopy.py
diff --git a/macros/latex/contrib/easybook/easybook.dtx b/macros/latex/contrib/easybook/easybook.dtx
index 4336d8da06..3e4820e2e0 100644
--- a/macros/latex/contrib/easybook/easybook.dtx
+++ b/macros/latex/contrib/easybook/easybook.dtx
@@ -15,7 +15,7 @@
 %<*class>
 \NeedsTeXFormat{LaTeX2e}[2020/10/01]
 \RequirePackage{l3keys2e}
-\ProvidesExplClass{easybook}{2022/01/04}{1.42L}
+\ProvidesExplClass{easybook}{2022/01/05}{1.42N}
   {Typeset Chinese theses or books}
 
 \bool_set_false:N \l__eb_compile_draft_bool
@@ -307,7 +307,7 @@
 %<*package>
 \NeedsTeXFormat{LaTeX2e}[2020/10/01]
 \RequirePackage{l3keys2e,etoolbox}
-\ProvidesExplPackage{easybase}{2022/01/04}{1.42L}
+\ProvidesExplPackage{easybase}{2022/01/05}{1.42N}
   {Typeset Chinese theses or books}
 
 \cs_generate_variant:Nn \dim_set:Nn { NV }
@@ -584,8 +584,8 @@
     columnsep       = 2em,
     headheight      = 2.04cm,
     headsep         = 0.5cm,
-    footskip        = 0.79cm,
     footnotesep     = 0.5cm,
+    footskip        = 0.79cm,
     marginparsep    = 8pt,
     marginparwidth  = 2.54cm
   }
@@ -594,6 +594,7 @@
     headruleskip .tl_set:N  = \headruleskip,
     headruleskip .initial:n = 1.5pt,
     footruleskip .tl_set:N  = \footruleskip,
+    footruleskip .initial:n = 3.5pt,
     unknown .code:n         =
       {
         \exp_args:Nx \geometry
@@ -1950,8 +1951,8 @@
 \cs_new_protected:Npn \eb_thm_biname_set:nnn #1#2#3
   {
     \tl_if_eq:NnTF \l__ctex_scheme_tl { chinese }
-      { \tl_set:cn { l__eb_thm_biname_#1_tl } {#3} }
-      { \tl_set:cn { l__eb_thm_biname_#1_tl } {#2} }
+      { \tl_set:cn { eb@thm@name@#1 } {#3} }
+      { \tl_set:cn { eb@thm@name@#1 } {#2} }
   }
 \cs_set_eq:NN \eb@declaretheorem@save \declaretheorem
 \cs_set_eq:NN \eb@declaretheoremsyle@save \declaretheoremstyle
@@ -1975,7 +1976,7 @@
       }
     \eb_thm_biname_set:nnn {#1} {#2} {#3}
     \declaretheorem{#1}[
-      name  = \tl_use:c { l__eb_thm_biname_#1_tl },
+      name  = \tl_use:c { eb@thm@name@#1 },
       style = fancy,#5
       ]
     \eb_if_thmframe_with_tcolorbox:TF
@@ -1986,7 +1987,7 @@
         \bool_if:cF { l__eb_tcb_repeat_env_#1_bool }
           { \tcolorboxenvironment{#1}{#4} }
       } { }
-    \labelformat{#1}{\tl_use:c { l__eb_thm_biname_#1_tl }~##1}
+    \labelformat{#1}{\tl_use:c { eb@thm@name@#1 }~##1}
   }
 
 \prop_new:N \l__eb_thmtools_entry_prop
@@ -2423,7 +2424,7 @@
   }
 %</package>
 %<*tcolorbox>
-\ProvidesExplFile{eb-tcolorbox.cfg}{2022/01/04}{1.42L}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2022/01/05}{1.42N}
   {Customization of tcolorbox for easybook}
 
 \cs_set_protected:Npn \setexercise #1
diff --git a/macros/latex/contrib/easybook/easybook.pdf b/macros/latex/contrib/easybook/easybook.pdf
index 6fed303430..0b5688124e 100644
--- a/macros/latex/contrib/easybook/easybook.pdf
+++ b/macros/latex/contrib/easybook/easybook.pdf
diff --git a/macros/latex/contrib/easybook/easybook.tex b/macros/latex/contrib/easybook/easybook.tex
index 5a55539db4..f9883f13f4 100644
--- a/macros/latex/contrib/easybook/easybook.tex
+++ b/macros/latex/contrib/easybook/easybook.tex
@@ -20,8 +20,8 @@
     name            = easybook,
     color-scheme    = blue,
     title           = EASYBOOK 使用手册,
-    version         = v1.42L,
-    date            = 2022/01/04,
+    version         = v1.42N,
+    date            = 2022/01/05,
     authors         = 瞿毅,
     info            = 排版简体中文学位论文和书籍,
     email           = q1jx@foxmail.com,
@@ -436,7 +436,7 @@
   \keychoice{fntnumwith}{part,chapter,page}\Default{chapter}
   使脚注跟随编号的计数器名。默认跟随章计数器，当开启新的一章时脚注编号从 1 开始。
   \keybool{uppercase}\Default{true}
-  使用 \cs*{rightmark} 及 \cs*{leftmark} 等标题标记命令获取标题内容时英文是否大写。
+  使用 \cs*{rightmark} 和 \cs*{leftmark} 等标题标记命令获取标题内容时英文是否大写。
   \kvsplit{brackets}{左括号,右括号}\Default{\Carg{(\black{,})}}
   设置行间公式编号标签的括号及格式，以英文逗号分隔，分别代表左右括号。\meta{左括号} 可以是带有一个参数的命令，用于接受编号和 \meta{右括号}。将标签括号设置为方括号，并使用无衬线字体：
   \begin{ctexexam}
@@ -680,7 +680,7 @@
 模块 \module*{geoset} 会将除了前两个附加的选项交给页面尺寸宏包 \pkg*{geometry} 处理，并且支持它的键值列表，预置的页面尺寸与 \cls*{Word} 的默认值接近。下面列举几种代表性选项，其它选项可查阅宏包帮助文档。当在此设置纸张规格时，会覆盖文类选项 \option{paper} 的设置。
 \begin{options}\noitemsep
   \keyval-{headruleskip}{页眉线间距}\Module{geoset}\Default*{1.5pt}
-  \keyval-{footruleskip}{页脚线间距}\Default*{0.3\cs*{normalbaselineskip}}
+  \keyval-{footruleskip}{页脚线间距}\Default*{3.5pt}
   \kvsplit*{hdivide}{左边距,页面文本宽度,右边距}
   \kvsplit*{hmargin}{左边距,右边距}
   \keyval*-{textheight}{页面文本高度}\default{}
diff --git a/macros/latex/contrib/leadsheets/README b/macros/latex/contrib/leadsheets/README
index c984872ee3..22675c0562 100644
--- a/macros/latex/contrib/leadsheets/README
+++ b/macros/latex/contrib/leadsheets/README
@@ -1,5 +1,5 @@
 --------------------------------------------------------------------------
-the LEADSHEETS package v0.6 2019/10/02
+the LEADSHEETS package v0.7 2022/01/05
 
   typesetting leadsheets and songbooks
 
@@ -8,7 +8,7 @@ Clemens Niederberger
 Web:    https://github.com/cgnieder/leadsheets
 E-Mail: contact@mychemistry.eu
 --------------------------------------------------------------------------
-Copyright 2014--2019 Clemens Niederberger
+Copyright 2014--2022 Clemens Niederberger
 
 This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either version 1.3
diff --git a/macros/latex/contrib/leadsheets/leadsheet.cls b/macros/latex/contrib/leadsheets/leadsheet.cls
index 2c5dadf4af..2787610a2f 100644
--- a/macros/latex/contrib/leadsheets/leadsheet.cls
+++ b/macros/latex/contrib/leadsheets/leadsheet.cls
@@ -7,7 +7,7 @@
 % Clemens Niederberger
 % E-Mail: contact@mychemistry.eu
 % --------------------------------------------------------------------------
-% Copyright 2014--2019 Clemens Niederberger
+% Copyright 2014--2022 Clemens Niederberger
 %
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3
diff --git a/macros/latex/contrib/leadsheets/leadsheets.library.chordnames.code.tex b/macros/latex/contrib/leadsheets/leadsheets.library.chordnames.code.tex
index 113b9788a3..6976363485 100644
--- a/macros/latex/contrib/leadsheets/leadsheets.library.chordnames.code.tex
+++ b/macros/latex/contrib/leadsheets/leadsheets.library.chordnames.code.tex
@@ -7,7 +7,7 @@
 % Clemens Niederberger
 % E-Mail: contact@mychemistry.eu
 % --------------------------------------------------------------------------
-% Copyright 2014--2019 Clemens Niederberger
+% Copyright 2014--2022 Clemens Niederberger
 %
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3
@@ -156,7 +156,7 @@
   }
 
 \cs_new_protected:Npn \__leadsheets_revert_minor:w #1 \l__leadsheets_minor_tl #2 \q_stop
-  { \tl_lower_case:n {#1} #2 }
+  { \text_lowercase:n {#1} #2 }
 
 \cs_new_protected:Npn \leadsheets_tension:w (#1)
   {
@@ -221,3 +221,4 @@ HISTORY:
              lowercase letters; requires user input `Dmi' in order to get `d';
              lowercase letters can of course be input directly but then are
              immune to transposing
+2020/01/16 - adapt to renaming of case changing functions
diff --git a/macros/latex/contrib/leadsheets/leadsheets.library.chords.code.tex b/macros/latex/contrib/leadsheets/leadsheets.library.chords.code.tex
index 11e8539cec..4dee48d95d 100644
--- a/macros/latex/contrib/leadsheets/leadsheets.library.chords.code.tex
+++ b/macros/latex/contrib/leadsheets/leadsheets.library.chords.code.tex
@@ -7,7 +7,7 @@
 % Clemens Niederberger
 % E-Mail: contact@mychemistry.eu
 % --------------------------------------------------------------------------
-% Copyright 2014--2019 Clemens Niederberger
+% Copyright 2014--2022 Clemens Niederberger
 %
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3
diff --git a/macros/latex/contrib/leadsheets/leadsheets.library.external.code.tex b/macros/latex/contrib/leadsheets/leadsheets.library.external.code.tex
index 77d414b410..ed62913b37 100644
--- a/macros/latex/contrib/leadsheets/leadsheets.library.external.code.tex
+++ b/macros/latex/contrib/leadsheets/leadsheets.library.external.code.tex
@@ -7,7 +7,7 @@
 % Clemens Niederberger
 % E-Mail: contact@mychemistry.eu
 % --------------------------------------------------------------------------
-% Copyright 2014--2019 Clemens Niederberger
+% Copyright 2014--2022 Clemens Niederberger
 %
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3
@@ -122,9 +122,9 @@
 % and \LeadsheetEndSurvive
 \cs_new_protected:Npn \leadsheets_include_external_file:nn #1#2
   {
-    \tl_set_from_file:Nnn \l__leadsheets_tmpa_tl
+    \file_get:nnN { #1 \tl_if_blank:nF {#2} {.} #2 }
       {}
-      { #1 \tl_if_blank:nF {#2} {.} #2 }
+      \l__leadsheets_tmpa_tl
     \cs_set:Npn \LeadsheetSurvive ##1 \LeadsheetEndSurvive ##2 \q_stop
       { ##1 \__leadsheets_extract_survival:ww ##2 \q_stop }
     \__leadsheets_include_external_file_aux:V \l__leadsheets_tmpa_tl
diff --git a/macros/latex/contrib/leadsheets/leadsheets.library.musejazz.code.tex b/macros/latex/contrib/leadsheets/leadsheets.library.musejazz.code.tex
index 6f6ffb9052..9f55fbd1b2 100644
--- a/macros/latex/contrib/leadsheets/leadsheets.library.musejazz.code.tex
+++ b/macros/latex/contrib/leadsheets/leadsheets.library.musejazz.code.tex
@@ -7,7 +7,7 @@
 % Clemens Niederberger
 % E-Mail: contact@mychemistry.eu
 % --------------------------------------------------------------------------
-% Copyright 2014--2019 Clemens Niederberger
+% Copyright 2014--2022 Clemens Niederberger
 %
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3
@@ -22,11 +22,11 @@
 % The Current Maintainer of this work is Clemens Niederberger.
 % --------------------------------------------------------------------------
 \LeadsheetsExplLibrary{musejazz}
-  {2014/08/10 using MuseScore's MuseJazz font for chordnames}
+  {2019/10/02 using MuseScore's MuseJazz font for chordnames}
 
 \leadsheets_load_library:n {chordnames}
 
-\msg_new:nnnn { leadsheets } { wrong-engine }
+\msg_new:nnnn {leadsheets} {wrong-engine}
   {
     the~ `musejazz'~ library~ needs~ either~ to~ be~ run~ with~ XeLaTeX~ or~
     with~ LuaLaTeX.
@@ -42,7 +42,7 @@
 
 \RequirePackage {fontspec}
 
-\newfontfamily \musejazz {MuseJazz}
+\newfontfamily \musejazz {MuseJazz~ Text}
 
 \cs_new_protected:Npn \leadsheets_char:Nn #1#2
   { \cs_set:Npx #1 { \tex_char:D "#2 \scan_stop: } }
@@ -267,3 +267,4 @@ HISTORY:
 
 2017/09/25 - the `literal' option has been dropped 2015/05/08 already - adopt
              file accordingly
+2019/10/02 - MuseScore's font has been renamed into `MuseJazz Text'
diff --git a/macros/latex/contrib/leadsheets/leadsheets.library.musicsymbols.code.tex b/macros/latex/contrib/leadsheets/leadsheets.library.musicsymbols.code.tex
index cce3dfbf76..3095250f48 100644
--- a/macros/latex/contrib/leadsheets/leadsheets.library.musicsymbols.code.tex
+++ b/macros/latex/contrib/leadsheets/leadsheets.library.musicsymbols.code.tex
@@ -7,7 +7,7 @@
 % Clemens Niederberger
 % E-Mail: contact@mychemistry.eu
 % --------------------------------------------------------------------------
-% Copyright 2014--2019 Clemens Niederberger
+% Copyright 2014--2022 Clemens Niederberger
 %
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3
diff --git a/macros/latex/contrib/leadsheets/leadsheets.library.properties.code.tex b/macros/latex/contrib/leadsheets/leadsheets.library.properties.code.tex
index ee01fbf3e9..0d7ce284cc 100644
--- a/macros/latex/contrib/leadsheets/leadsheets.library.properties.code.tex
+++ b/macros/latex/contrib/leadsheets/leadsheets.library.properties.code.tex
@@ -7,7 +7,7 @@
 % Clemens Niederberger
 % E-Mail: contact@mychemistry.eu
 % --------------------------------------------------------------------------
-% Copyright 2014--2019 Clemens Niederberger
+% Copyright 2014--2022 Clemens Niederberger
 %
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3
diff --git a/macros/latex/contrib/leadsheets/leadsheets.library.shorthands.code.tex b/macros/latex/contrib/leadsheets/leadsheets.library.shorthands.code.tex
index c3a2aac953..ce4f48cf4e 100644
--- a/macros/latex/contrib/leadsheets/leadsheets.library.shorthands.code.tex
+++ b/macros/latex/contrib/leadsheets/leadsheets.library.shorthands.code.tex
@@ -7,7 +7,7 @@
 % Clemens Niederberger
 % E-Mail: contact@mychemistry.eu
 % --------------------------------------------------------------------------
-% Copyright 2014--2019 Clemens Niederberger
+% Copyright 2014--2022 Clemens Niederberger
 %
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3
diff --git a/macros/latex/contrib/leadsheets/leadsheets.library.songs.code.tex b/macros/latex/contrib/leadsheets/leadsheets.library.songs.code.tex
index ca2c8cac7a..6d0e4d901e 100644
--- a/macros/latex/contrib/leadsheets/leadsheets.library.songs.code.tex
+++ b/macros/latex/contrib/leadsheets/leadsheets.library.songs.code.tex
@@ -7,7 +7,7 @@
 % Clemens Niederberger
 % E-Mail: contact@mychemistry.eu
 % --------------------------------------------------------------------------
-% Copyright 2014--2019 Clemens Niederberger
+% Copyright 2014--2022 Clemens Niederberger
 %
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3
diff --git a/macros/latex/contrib/leadsheets/leadsheets.library.templates.code.tex b/macros/latex/contrib/leadsheets/leadsheets.library.templates.code.tex
index 9514a03f1e..c6180d9ca3 100644
--- a/macros/latex/contrib/leadsheets/leadsheets.library.templates.code.tex
+++ b/macros/latex/contrib/leadsheets/leadsheets.library.templates.code.tex
@@ -7,7 +7,7 @@
 % Clemens Niederberger
 % E-Mail: contact@mychemistry.eu
 % --------------------------------------------------------------------------
-% Copyright 2014--2019 Clemens Niederberger
+% Copyright 2014--2022 Clemens Niederberger
 %
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3
diff --git a/macros/latex/contrib/leadsheets/leadsheets.library.translations.code.tex b/macros/latex/contrib/leadsheets/leadsheets.library.translations.code.tex
index d5992adcdb..02f8028fba 100644
--- a/macros/latex/contrib/leadsheets/leadsheets.library.translations.code.tex
+++ b/macros/latex/contrib/leadsheets/leadsheets.library.translations.code.tex
@@ -7,7 +7,7 @@
 % Clemens Niederberger
 % E-Mail: contact@mychemistry.eu
 % --------------------------------------------------------------------------
-% Copyright 2014--2019 Clemens Niederberger
+% Copyright 2014--2022 Clemens Niederberger
 %
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3
diff --git a/macros/latex/contrib/leadsheets/leadsheets.library.transposing.code.tex b/macros/latex/contrib/leadsheets/leadsheets.library.transposing.code.tex
index 91e21f0019..a23c5316c5 100644
--- a/macros/latex/contrib/leadsheets/leadsheets.library.transposing.code.tex
+++ b/macros/latex/contrib/leadsheets/leadsheets.library.transposing.code.tex
@@ -7,7 +7,7 @@
 % Clemens Niederberger
 % E-Mail: contact@mychemistry.eu
 % --------------------------------------------------------------------------
-% Copyright 2014--2019 Clemens Niederberger
+% Copyright 2014--2022 Clemens Niederberger
 %
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3
diff --git a/macros/latex/contrib/leadsheets/leadsheets.sty b/macros/latex/contrib/leadsheets/leadsheets.sty
index 382c436b7a..b360a6f8cb 100644
--- a/macros/latex/contrib/leadsheets/leadsheets.sty
+++ b/macros/latex/contrib/leadsheets/leadsheets.sty
@@ -7,7 +7,7 @@
 % Clemens Niederberger
 % E-Mail: contact@mychemistry.eu
 % --------------------------------------------------------------------------
-% Copyright 2014--2019 Clemens Niederberger
+% Copyright 2014--2022 Clemens Niederberger
 %
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3
@@ -27,8 +27,8 @@
 % --------------------------------------------------------------------------
 % package information:
 \ExplSyntaxOn
-\tl_const:Nn \leadsheetsdate    {2019/10/02}
-\tl_const:Nn \leadsheetsversion {0.6}
+\tl_const:Nn \leadsheetsdate    {2022/01/05}
+\tl_const:Nn \leadsheetsversion {0.7}
 \tl_const:Nn \leadsheetsinfo    {Typesetting leadsheets and songbooks}
 
 \ProvidesExplPackage
@@ -252,4 +252,6 @@
            - new library `external'
            - minor chords can now be typeset with lowercase letters
              (chordnames)
-
+2019/10/02 - adapt to name change of MuseJazz font
+           - allow commands which require an argument as formatting commands
+             for verse labels
diff --git a/macros/latex/contrib/leadsheets/leadsheets_en.pdf b/macros/latex/contrib/leadsheets/leadsheets_en.pdf
index 264c7e5c75..fc381678e3 100644
--- a/macros/latex/contrib/leadsheets/leadsheets_en.pdf
+++ b/macros/latex/contrib/leadsheets/leadsheets_en.pdf
diff --git a/macros/latex/contrib/leadsheets/leadsheets_en.tex b/macros/latex/contrib/leadsheets/leadsheets_en.tex
index dbf744685c..91a821c2ae 100644
--- a/macros/latex/contrib/leadsheets/leadsheets_en.tex
+++ b/macros/latex/contrib/leadsheets/leadsheets_en.tex
@@ -1,7 +1,7 @@
-% arara: pdflatex: { shell: on , action: nonstopmode }
+% arara: pdflatex: { shell: on , interaction: nonstopmode }
 % arara: biber
-% arara: pdflatex: { action: nonstopmode }
-% arara: pdflatex: { action: nonstopmode }
+% arara: pdflatex: { interaction: nonstopmode }
+% arara: pdflatex: { interaction: nonstopmode }
 % --------------------------------------------------------------------------
 % the LEADSHEETS package
 % 
@@ -11,7 +11,7 @@
 % Clemens Niederberger
 % E-Mail: contact@mychemistry.eu
 % --------------------------------------------------------------------------
-% Copyright 2014--2019 Clemens Niederberger
+% Copyright 2014--2022 Clemens Niederberger
 %
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3
@@ -26,7 +26,7 @@
 % The Current Maintainer of this work is Clemens Niederberger.
 % --------------------------------------------------------------------------
 \documentclass[load-preamble+]{cnltx-doc}
-\usepackage{leadsheets,bookmark}
+\usepackage{leadsheets,bookmark,csquotes}
 \setcnltx{
   package = leadsheets ,
   info    = Typesetting leadsheets and songbooks ,
@@ -99,8 +99,7 @@
 \defbibheading{bibliography}{\section{References}}
 \addbibresource{\jobname.bib}
 
-\usepackage{filecontents}
-\begin{filecontents}{\jobname.bib}
+\begin{filecontents}[overwrite]{\jobname.bib}
 @book{book:realbook,
   author    = {Various} ,
   title     = {The Real Book} ,
@@ -212,7 +211,7 @@ promising packages: \pkg{songs}~\cite{pkg:songs} and
 I wanted.  Just a bit too inflexible in the wrong places, needing tweaking
 here and there, and so on.  On the other hand I had quite some code lying on
 my hard drive with various attempts of typesetting leadsheets.  This package
-is now the attempt to have a clean, documented and customisable version of my
+is now the attempt to have a clean, documented and customizable version of my
 code\footnote{Plus new things!}.
 
 \section{The Structure of the Package}
@@ -259,7 +258,7 @@ The user-libraries are the following ones:
     part~\ref{part:chords-library}.  It also loads the
     \library{musicsymbols}library.
   \item[\library{musejazz}] \packageoption{musejazz}extends the \chords\
-    library to use MuseScore's \enquote{MuseJazz} font, see
+    library to use MuseScore's \enquote{MuseJazz Text} font, see
     section~\ref{sec:musejazz-libr}.  It loads the \library{chords}
     library.
   \item[\library{songs}] \packageoption{songs}This is the \emph{main
@@ -395,7 +394,7 @@ bars:
     The distance between two bar rules as in \cs{doublebar} or \cs{stopbar}.
 \end{commands}
 
-Finally \musicsymbols{} provides a macro for adding an abitrary meter:
+Finally \musicsymbols{} provides a macro for adding an arbitrary meter:
 \begin{commands}
   \command{meter}[\marg{numerator}\marg{denominator}]
     \sinceversion{0.5}For example \verbcode+\meter{6}{8}+: \meter{6}{8}
@@ -599,13 +598,13 @@ Let's see a few examples for the \option{input-notation} and
 \section{The \library*{musejazz} Library}\label{sec:musejazz-libr}
 
 The \musejazz\ library extends the \chords\ library to use
-MuseScore's\footnote{\url{http://musescore.com/}} font \enquote{MuseJazz} for
-the chord symbols.  The library contains the two lines which explains why it
-requires \LuaLaTeX\ or \XeLaTeX.  Well, and the font, obviously.
+MuseScore's\footnote{\url{http://musescore.com/}} font \enquote{MuseJazz Text}
+for the chord symbols.  The library contains the two lines which explains why
+it requires \LuaLaTeX\ or \XeLaTeX.  Well, and the font, obviously.
 
 \begin{sourcecode}
   \RequirePackage{fontspec}
-  \newfontfamily\musejazz{MuseJazz}
+  \newfontfamily\musejazz{MuseJazz Text}
 \end{sourcecode}
 
 Here is a small example of it's usage and the outcome:
@@ -698,7 +697,7 @@ to specify the different parts of a song.  They all are basically the same
 kind of environment, namely an \env*{itemize} environment internally where the
 only \cs*{item} has the name of the environment as option.  The \env{verse}
 environment is a little bit different since verses can be numbered.  If they
-are then each usage of \env{verse} inside \env{song} will step a vers number
+are then each usage of \env{verse} inside \env{song} will step a verse number
 and print it (as option to the internal \cs*{item}).
 
 \begin{environments}
@@ -775,7 +774,7 @@ Although I used the word \enquote{global} above \emph{all options are local to
     the \env{song} environment.  See sections~\ref{sec:special-characters}
     and~\ref{sec:typesetting-bars} for more details.
   \keybool{disable-measuring}\Default{false}
-    \sinceversion{0.4}This option turns of the song height measuring.  This
+    \sinceversion{0.4}This option turns off the song height measuring.  This
     makes song title template definitions easier (see section~\ref{sec:title-templates} for
     details).  \emph{The song property \property{height} will be set to 0pt then!}
 \end{options}
@@ -965,7 +964,8 @@ options:
     \meta{code} is inserted at the beginning of the environment and can thus
     be used to add formatting, \eg, \keyis{format}{\cs*{itshape}}.
   \keyval{label-format}{code}\Default
-    The same for the environment labels.
+    The same for the environment labels.  The last command may take the label
+    as an argument so you can also use \cs*{textbf} for example.
   \keyval{class}{class-name}\Default{default}
     The\sinceversion{0.2} \env{verse} environment and all related environments
     all belong to a class, the default class is called \code{default}.  This
@@ -1395,7 +1395,7 @@ They have more options.  Here's a complete list:
     different classes then \meta{class} needs to be \code{default}, see also
     page~\pageref{option:class}. The \option{class} to a \env{verse}-like
     environment allows for example to have verses with different chords which
-    are still counted reguarly together with the \option{remember-chords}
+    are still counted regularly together with the \option{remember-chords}
     option.
 \end{options}
 
@@ -1407,7 +1407,7 @@ options for all environments:
   \keyval{verses-label-format}{code}\Default
     Sets the label format for all \env{verse} like environments.
   \keyval{verses-after-label}{code}\Default{:}
-    Defeault \meta{code} that is inserted in the label after the label text of
+    Default \meta{code} that is inserted in the label after the label text of
     \env{verse} like environments.
 \end{options}
 This options only determine the formatting of an environment if the
@@ -1564,7 +1564,7 @@ contents or other auxiliary files.
     \leadsheets{} measures the height of a song body before it typesets it and
     it can often be necessary in a template to know if the measuring phase is
     active or not.  For example the song property \property{height} should
-    only be used if \emph{not} in the measuring phase: it's value get's
+    only be used if \emph{not} in the measuring phase: its value gets
     determined there and is not yet available.
   \command{expandcode}[\marg{code}]
     Exhaustively expands \meta{code}.  Experienced users won't need this.  It