CTAN sync 202203220301

author: Norbert Preining <norbert@preining.info> 2022-03-22 03:01:37 +0000
committer: Norbert Preining <norbert@preining.info> 2022-03-22 03:01:37 +0000
commit: 51119d11f3700a5be7da086dacad56dd219a5c90 (patch)
tree: 004fca9000d3b9524fc2dad4bb7e01c45eb25665 /macros
parent: 418f27fe2e2b233c282c7388ed4f2bf3461a958f (diff)
95 files changed, 1544 insertions, 1382 deletions
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-iso690/README.md b/macros/latex/contrib/biblatex-contrib/biblatex-iso690/README.md
index cdf10a4892..26f6e2ac1c 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-iso690/README.md
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-iso690/README.md
@@ -41,10 +41,21 @@ here. You should be able to use `biblatex-iso690` now.
 \usepackage[english,czech]{babel} % the main document language is the last one
 \usepackage[
   backend=biber,        % if we want unicode and many other features (biber is already by default)
-  style=iso-authoryear, % or iso-numeric for numeric citation method
+  style=iso-authoryear, % or another iso-<style>
 ]{biblatex}
 ```
 
+### Citation and bibliography styles
+
+`biblatex-iso690` provides the following styles (both for citations
+and bibliographies). You can select one with `style` keyword in the
+package options of `biblatex`.
+
+* `iso-alphabetic`
+* `iso-authortitle`
+* `iso-authoryear`
+* `iso-numeric`
+
 ### Custom options
 
 Above and beyond the scope of package options provided by `biblatex` itself,
@@ -89,6 +100,15 @@ here are also some more. Default values are in **bold**.
   `publisher` fields) for an `@article` entry type
   *   [true]    Journal of Money, Credit and Banking. Ohio State University Press, vol. 38, no. 1, pp. 119–140.
   * **[false]** Journal of Money, Credit and Banking. Vol. 38, no. 1, pp. 119–140.
+* `currentlang`
+  print localization bibliography strings in the currently selected language
+  *   [true]    `context dependent`
+  * **[false]** `context dependent`
+* `noenddot`
+  enable or disable printing an end dot at the very end of
+  bibliography entries
+  *   [true]    ... ISSN 1082-9873. Available from DOI : 10.1045/july2005-lynch
+  * **[false]** ... ISSN 1082-9873. Available from DOI : 10.1045/july2005-lynch.
 
 ### Bibliographic fields
 
@@ -135,7 +155,7 @@ supervisor = {Petr Sojka},
 dateaddon = {\mkbibbrackets{16th century}},
 ```
 
-For more details see the example bibliography file [mybib.bib](./mybib.bib).
+For more details see the example bibliography file [biblatex-iso690-examples.bib](./biblatex-iso690-examples.bib).
 
 ## Contributing
 
@@ -151,7 +171,7 @@ If the `<langid>.lbx` is already included in `biblatex`, adding a
 of this package. Otherwise, please consider [a contribution to the `biblatex`
 package](https://github.com/plk/biblatex/#translation) first.
 
-If you also aim to add new localisation strings, you have to define them via
+If you also aim to add new localization strings, you have to define them via
 `\NewBibliographyString` command at the beginning of the [iso.bbx](iso.bbx)
 file.
 
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-iso690/mybib.bib b/macros/latex/contrib/biblatex-contrib/biblatex-iso690/biblatex-iso690-examples.bib
index f87684085f..0d123236e4 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-iso690/mybib.bib
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-iso690/biblatex-iso690-examples.bib
@@ -187,6 +187,35 @@
   crossref = {tugboat1980},
 }
 
+% Book with volume field example
+@book{knuth1998sorting,
+  author    = {Knuth, Donald E.},
+  maintitle = {The Art of Computer Programming},
+  title     = {Sorting and Searching},
+  date      = {1998},
+  volume    = {3},
+  edition   = {2},
+  publisher = {Addison–Wesley},
+  isbn      = {978-0-201-89685-5},
+}
+
+% Multi-volume book example (volumes field)
+% Gratefully borrowed from biblatex-examples.bib
+@mvbook{knuth:ct,
+  author         = {Knuth, Donald E.},
+  title          = {Computers \& Typesetting},
+  date           = {1984/1986},
+  volumes        = 5,
+  publisher      = {Addison-Wesley},
+  location       = {Reading, Mass.},
+  langid         = {english},
+  langidopts     = {variant=american},
+  sorttitle      = {Computers & Typesetting},
+  indexsorttitle = {Computers & Typesetting},
+  annotation     = {A five-volume book cited as a whole. This is a \texttt{mvbook}
+                    entry, note the \texttt{volumes} field},
+}
+
 % Made-up bib entry
 @collection{sbornik2007,
   title     = {Mimořádně užitečný sborník},
@@ -229,17 +258,31 @@
 }
 
 @patent{groll2008method,
-  author      = {Clad Metals LLC Canonsburg, PA 15317 (US)},
+  holder      = {{Clad Metals LLC Canonsburg, PA 15317 (US)}},
   title       = {Method of making a copper core five-ply composite and cooking vessel},
-  editora     = {Groll, W. A.},
-  editoratype = {inventor},
+  author      = {Groll, W. A.},
   publisher   = {Google Patents},
   number      = {EP 1 094 937 B1},
   type        = {patenteu},
   date        = {2008-07-30},
+  origdate    = {1999-05-04},
   url         = {https://patents.google.com/patent/EP1094937B1},
 }
 
+@patent{winget1967detachable,
+  holder          = {{Winget Ltd}},
+  title           = {Detachable bulldozer attachment for dumper vehicles},
+  author          = {Reginald John England},
+  number          = {1060631},
+  type            = {patentuk},
+  date            = {1967-03-08},
+  origdate        = {1963-06-10},
+  note            = {Int\adddotspace CI\addcolon\addabbrvspace E02F 3/76\adddotspace
+                     GB\addabbrvspace CI\addcolon\addabbrvspace E1F 12},
+  url             = {https://patents.google.com/patent/GB1060631},
+  langid          = {english},
+}
+
 % Made-up bib entry
 % No date example
 @book{applebyND,
@@ -329,7 +372,7 @@
   options      = {useeditor=false},% title first
 }
 
-% Movie type exaple #2
+% Movie type example #2
 % Someone has a dominant role (e.g. clearly responsible for the intellectual
 % content) ==> given as the creator at the first place
 @movie{vlacil1967marketa,
@@ -409,7 +452,48 @@
   urldate    = {2020-03-25},
 }
 
+% Organization (corporate name) as author example
+% Organization bib field example
+@manual{dialog1985enhancements,
+  author       = {{Dialog Information Services}},
+  title        = {Enhancements to the DIALOG Search System},
+  subtitle     = {DIALOG version 2 (user manual update)},
+  date         = {1985-11},
+  location     = {Palo Alto (California)},
+  organization = {Dialog},
+  note         = {Technical Memo 5},
+}
+
+% currentlang package option example 1
+@article{tex:zpravodajchlebikova91,
+  author  = {Chlebíková, Jana},
+  title   = {Ako rozděliť (slovo) Československo},
+  journal = {Zpravodaj CSTUG},
+  volume  = 1,
+  number  = 4,
+  year    = 1991,
+  month   = {04},
+  pages   = {10-13},
+  doi     = {10.5300/1991-4/10},
+  note    = {No langid},
+}
+
+% currentlang package option example 2
+@article{tex:zpravodajchlebikova91cz,
+  author  = {Chlebíková, Jana},
+  title   = {Ako rozděliť (slovo) Československo},
+  journal = {Zpravodaj CSTUG},
+  volume  = 1,
+  number  = 4,
+  year    = 1991,
+  month   = {04},
+  pages   = {10-13},
+  doi     = {10.5300/1991-4/10},
+  langid  = {czech},
+  note    = {Czech langid},
+}
+
 % Made-up ISBNs generated by https://generate.plus/en/number/isbn
 
-% biber --tool --validate-datamodel --tool-fieldcase=lower --output-align mybib.bib
+% biber --tool --validate-datamodel --tool-fieldcase=lower --output-align biblatex-iso690-examples.bib
 % + sort fields in the meaningful order
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-iso690/biblatex-iso690.pdf b/macros/latex/contrib/biblatex-contrib/biblatex-iso690/biblatex-iso690.pdf
index 9a9386f5c7..027d98e299 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-iso690/biblatex-iso690.pdf
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-iso690/biblatex-iso690.pdf
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-iso690/biblatex-iso690.tex b/macros/latex/contrib/biblatex-contrib/biblatex-iso690/biblatex-iso690.tex
index 92fa8bd246..18a49018e4 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-iso690/biblatex-iso690.tex
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-iso690/biblatex-iso690.tex
@@ -32,8 +32,9 @@
   %   but the main document language is English
   pagetotal=true,
 ]{biblatex}
+\usepackage{expl3}
 
-\addbibresource{mybib.bib}
+\addbibresource{biblatex-iso690-examples.bib}
 
 % Support diacritics in Czech examples
 % ref.: https://stackoverflow.com/a/16084246
@@ -77,8 +78,8 @@
   url={https://github.com/michal-h21/biblatex-iso690},
   author={Michal Hoftich},
   email={michal.h21@gmail.com},
-  revision={0.4.0},
-  date={\DTMDate{2020-03-25}}}
+  revision={0.4.1},
+  date={\DTMDate{2022-03-20}}}
 
 \hypersetup{%
   pdftitle={ISO~690 \biblatex style},
@@ -144,13 +145,11 @@ so feel free to use the possibilities provided there for reporting issues and th
 A minimal working example for \t|babel| package:
 \begin{ltxexample}
 \documentclass{article}
-\usepackage[utf8]{inputenc}
 \usepackage[english,czech]{babel}
-% \usepackage[main=czech,english]{babel}
 \usepackage{csquotes}
 
 \usepackage[style=iso-authoryear]{biblatex}
-\addbibresource{mybib.bib}
+\addbibresource{biblatex-iso690-examples.bib}
 
 \begin{document}
 \cite{knuth1990virtual}
@@ -162,14 +161,13 @@ A minimal working example for \t|babel| package:
 A minimal working example for \t|polyglossia| package:
 \begin{ltxexample}
 \documentclass{article}
-\usepackage[utf8]{inputenc}
 \usepackage{polyglossia}
 \setmainlanguage{czech}
 \setotherlanguage{english}
 \usepackage{csquotes}
 
 \usepackage[style=iso-authoryear]{biblatex}
-\addbibresource{mybib.bib}
+\addbibresource{biblatex-iso690-examples.bib}
 
 \begin{document}
 \cite{knuth1990virtual}
@@ -185,6 +183,15 @@ per-entry basis in a resource (\t|.bib|) file. In addition, all of the
 languages specified in these fields have to be loaded by the \t|babel| or
 \t|polyglossia| package respectively.
 
+The affected fields that should be printed as they appear in the
+original source (in the language of resource, using the \t|langid|
+field) are, e.g. numeration information (volume, number, edition,
+etc.), while availability and access information (\textit{available
+from}), medium designation (\t|howpubished| field), pages range, or
+the relations of subsidiary creators (\textit{translated by},
+\textit{revised by}, etc.) are examples of using the main document
+language.
+
 Note that for correct support of localization functionality, the \t|babel|
 or \t|polyglossia| package should be used. The main document language
 is:
@@ -198,6 +205,50 @@ is:
     \cmd{setotherlanguage}) (see MWE above)
 \end{description}
 
+\subsubsection{Switching multiple languages}
+\label{sec:general:currentlang}
+
+Sometimes the main document language is selected in the document
+class, and the user can only switch the active language, not the main
+language. This is usually a case of journals/collections of articles
+that can be prepared (in their entirety) in one main language, but
+where individual articles might also be written in a different
+language (e.g., this is the case with \t|csbulletin| class). Then you
+can use \t|currentlang| option (see also~\ref{sec:pkg:opt:iso690}),
+which allows switching to the active surrounding language, and print
+\biblatex localization strings accordingly to this currently selected
+language, not the main language.
+
+The following MWE illustrates switching the active languages (English
+and German over the main Czech language) on two bibliography entries,
+one with the Czech \t|langid| field and the other without specified
+language.
+
+\begin{ltxexample}
+  \documentclass{article}
+  \usepackage[T1]{fontenc}
+  \usepackage[main=czech,english,ngerman]{babel}
+  \usepackage{csquotes}
+  
+  \usepackage[style=iso-numeric,currentlang]{biblatex}
+  \addbibresource{biblatex-iso690-examples.bib}
+  
+  \begin{document}
+  
+  \nocite{tex:zpravodajchlebikova91}
+  \nocite{tex:zpravodajchlebikova91cz}
+  \printbibliography
+  
+  \selectlanguage{english}
+  \printbibliography
+  
+  \selectlanguage{ngerman}
+  \printbibliography
+  
+  \end{document}
+\end{ltxexample}
+
+
 \subsection{Citation systems}
 \label{sec:citation:systems}
 
@@ -380,6 +431,19 @@ Enable or disable printing publication information (\t|location| and
 \t|false| since it is very unusual behavior and rarely used by either other
 citation styles or citation managers.
 
+\boolitem[false]{currentlang}
+
+By default, the main document language is used for printing of bibliography
+strings. Some classes load the \t|babel| package and user cannot select the main
+document language easily. With this option, the currently selected language 
+will be used instead (see also~\ref{sec:general:currentlang}).
+
+\boolitem[false]{noenddot}
+
+Enable or disable printing an end dot at the very end of bibliography
+entries. The default value is \t|false|, meaning a dot is printed at
+the end.
+
 \end{optionlist}
 
 
@@ -566,12 +630,12 @@ supervisor and school (institution) can be entered into the fields
 \paragraph{Patent}\hfill\\
 \label{sec:patent}
 
+The dominant role as an author has the holder of a patent (\t|holder|
+field). The subsidiary author is an inventor (if known) of the patent
+(\t|author| field). Application date fits in the \t|origdate| field,
+while date of publication in the \t|date| field.
 The field \t|number| is available for the patent classification
 or request number.
-If the inventor is also known, we can use \t|editora| and \t|editoratype|
-fields to specify that. Use an additionally created role \t|inventor| for the
-\t|editoratype| field; it is the key that translates based on the localization
-strings.
 For the patent type, we can use localization strings as well, e.g.
 \t|patenteu|.
 \newline
@@ -579,15 +643,15 @@ For the patent type, we can use localization strings as well, e.g.
 \c{groll2008method}
 \begin{ltxexample}
 @patent{groll2008method,
-  author      = {Clad Metals LLC Canonsburg, PA 15317 (US)},
+  holder      = {{Clad Metals LLC Canonsburg, PA 15317 (US)}},
   title       = {Method of making a copper core five-ply composite
                   and cooking vessel},
-  editora     = {Groll, W. A.},
-  editoratype = {inventor},
+  author      = {Groll, W. A.},% <---------- inventor
   publisher   = {Google Patents},
   number      = {EP 1 094 937 B1},
   type        = {patenteu},
-  date        = {2008-07-30},
+  date        = {2008-07-30},% <------------ publication date
+  origdate    = {1999-05-04},% <------------ application date
   url         = {https://patents.google.com/patent/EP1094937B1},
 }
 \end{ltxexample}
@@ -605,7 +669,16 @@ to the \biblatex documentation.
 \subsubsection{Creators}
 
 The persons or organizations responsible for the cited work should be
-primarily given in the \t|author| field. If it is not appropriate,
+primarily given in the \t|author| field. Please note that organization
+names (so-called corporate authors) need to be protected with doubled
+curly braces to avoid being (mis)parsed into family/given names
+(resulting in wrong order and formatting).
+
+\begin{ltxexample}
+  author = {{Dialog Information Services}},
+\end{ltxexample}
+
+If the \t|author| is not appropriate,
 other fields like \t|editor| and \t|editorX| family fields or some
 specific ones (e.g. \t|translator|) can be used. Note also the field
 \t|editortype| and \t|editortypeX| family fields which can be used
@@ -765,6 +838,21 @@ see~\parencite{gosse1912garden}.
 
 \begin{changelog}
 
+\begin{release}{0.4.1}{2022-03-20}
+\item Added \t|currentlang| package option.\see{sec:pkg:opt:iso690}
+\item Added mapping from \t|ngerman| to \t|german| language.
+\item Added Spanish language support.
+\item Removed \t|inputenc| package from examples.
+\item Added \t|expl3| package in the documentation to fix compilation error.
+\item Prevent capitalisation of the \t|[online]| bibliography string.\see{sec:howpublished}
+\item Fix punctuation before \t|urldate| if publisher info is missing.
+\item Print \t|organization| field in publisher \t|location+publisher| list.
+\item Improved support for \t|@patent| entries.\see{sec:patent}
+\item Improved documentation.
+\item Fixed missing \t|volume| and \t|volumes| fields.
+\item Added \t|noenddot| package option.\see{sec:pkg:opt:iso690}
+\end{release}
+
 \begin{release}{0.4.0}{2020-03-25}
 \item Fixed deprecated name handling
 \item Declared mapping suffix (\t|<lang>-iso.lbx|) for localization files
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-iso690/bulgarian-iso.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-iso690/bulgarian-iso.lbx
index 858f936995..3f596587e9 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-iso690/bulgarian-iso.lbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-iso690/bulgarian-iso.lbx
@@ -1,5 +1,5 @@
 \ProvidesFile{bulgarian-iso.lbx}
-  [2020/03/25 v0.4.0 ISO 690 extended biblatex localization]
+  [2022/03/20 v0.4.1 ISO 690 extended biblatex localization]
 
 \InheritBibliographyExtras{bulgarian}
 \InheritBibliographyStrings{bulgarian}
@@ -25,6 +25,10 @@
                   {онлайн}},
   film         = {{филм}%
                   {филм}},
+% application  = {{}%
+%                 {}},% FIXME: missing
+% publication  = {{}%
+%                 {}},% FIXME: missing
 }
 
 \endinput
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-iso690/czech-iso.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-iso690/czech-iso.lbx
index ff7967e00f..8e1dc21366 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-iso690/czech-iso.lbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-iso690/czech-iso.lbx
@@ -1,5 +1,5 @@
 \ProvidesFile{czech-iso.lbx}
-  [2020/03/25 v0.4.0 ISO 690 extended biblatex localization]
+  [2022/03/20 v0.4.1 ISO 690 extended biblatex localization]
 
 \InheritBibliographyExtras{czech}
 \InheritBibliographyStrings{czech}
@@ -25,6 +25,10 @@
                   {online}},
   film         = {{film}%
                   {film}},
+  application  = {{p\v{r}ihl\'{a}\v{s}ka}%
+                  {p\v{r}ihl\adddot}},
+  publication  = {{publikov\'{a}no}%
+                  {publ\adddot}},
 }
 
 \endinput
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-iso690/english-iso.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-iso690/english-iso.lbx
index 916128b6b8..a627d0171b 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-iso690/english-iso.lbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-iso690/english-iso.lbx
@@ -1,5 +1,5 @@
 \ProvidesFile{english-iso.lbx}
-  [2020/03/25 v0.4.0 ISO 690 extended biblatex localization]
+  [2022/03/20 v0.4.1 ISO 690 extended biblatex localization]
 
 \InheritBibliographyExtras{english}
 \InheritBibliographyStrings{english}
@@ -23,6 +23,10 @@
                   {online}},
   film         = {{film}%
                   {film}},
+  application  = {{application}%
+                  {appl\adddot}},
+  publication  = {{publication}%
+                  {publ\adddot}},
 }
 
 \endinput
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-iso690/french-iso.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-iso690/french-iso.lbx
index e249655c71..e5c880c076 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-iso690/french-iso.lbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-iso690/french-iso.lbx
@@ -1,5 +1,5 @@
 \ProvidesFile{french-iso.lbx}
-  [2020/03/25 v0.4.0 ISO 690 extended biblatex localization]
+  [2022/03/20 v0.4.1 ISO 690 extended biblatex localization]
 
 \InheritBibliographyExtras{french}
 \InheritBibliographyStrings{french}
@@ -30,6 +30,10 @@
                   {en ligne}},
   film         = {{film}%
                   {film}},
+% application  = {{}%
+%                 {}},% FIXME: missing
+% publication  = {{}%
+%                 {}},% FIXME: missing
 }
 
 \endinput
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-iso690/german-iso.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-iso690/german-iso.lbx
index 7146b27e7c..ccfebd2777 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-iso690/german-iso.lbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-iso690/german-iso.lbx
@@ -1,5 +1,5 @@
 \ProvidesFile{german-iso.lbx}
-  [2020/03/25 v0.4.0 ISO 690 extended biblatex localization]
+  [2022/03/20 v0.4.1 ISO 690 extended biblatex localization]
 
 \InheritBibliographyExtras{german}
 \InheritBibliographyStrings{german}
@@ -11,18 +11,22 @@
                   {betreut von}},
   urlalso      = {{auch verf\"{u}gbar unter}
                   {auch verf\"{u}gbar unter}},
-% director     = {{}%
-%                 {}},% FIXME: missing
-% bydirector   = {{}%
-%                 {}},% FIXME: missing
-% inventor     = {{}%
-%                 {}},% FIXME: missing
-% byinventor   = {{}%
-%                 {}},% FIXME: missing
-% online       = {{}%
-%                 {}},% FIXME: missing
-% film         = {{}%
-%                 {}},% FIXME: missing
+  director     = {{Regisseur}
+                  {Regisseur}},
+  bydirector   = {{Regie}
+                  {Regie}},
+  inventor     = {{Erfinder}
+                  {Erfinder}},
+  byinventor   = {{erfunden von}
+                  {erfunden von}},
+  online       = {{online}
+                  {online}},
+  film         = {{Film}
+                  {Film}},
+  application  = {{Anmeldung}
+                  {Anmeldung}},
+  publication  = {{Veröffentlichungstag}
+                  {Veröffentlichungstag}},
 }
 
 \endinput
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-iso690/iso-alphabetic.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-iso690/iso-alphabetic.bbx
index beef88d414..1c6c71be3f 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-iso690/iso-alphabetic.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-iso690/iso-alphabetic.bbx
@@ -1,5 +1,5 @@
 \ProvidesFile{iso-alphabetic.bbx}
-  [2020/03/25 v0.4.0 ISO 690 biblatex bibliography style]
+  [2022/03/20 v0.4.1 ISO 690 biblatex bibliography style]
 
 % This is a copy of alphabetic.bbx
 % It only uses iso as base style, instead of standard
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-iso690/iso-alphabetic.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-iso690/iso-alphabetic.cbx
index 2d90c118d0..34ee9223d5 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-iso690/iso-alphabetic.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-iso690/iso-alphabetic.cbx
@@ -1,5 +1,5 @@
 \ProvidesFile{iso-alphabetic.cbx}
-  [2020/03/25 v0.4.0 ISO 690 biblatex citation style]
+  [2022/03/20 v0.4.1 ISO 690 biblatex citation style]
 
 \RequireCitationStyle{alphabetic}
 
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-iso690/iso-alphabetic.dbx b/macros/latex/contrib/biblatex-contrib/biblatex-iso690/iso-alphabetic.dbx
index 2248f37e35..98dfa30195 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-iso690/iso-alphabetic.dbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-iso690/iso-alphabetic.dbx
@@ -1,5 +1,5 @@
 \ProvidesFile{iso-alphabetic.dbx}
-  [2020/03/25 v0.4.0 ISO 690 biblatex data model extension]
+  [2022/03/20 v0.4.1 ISO 690 biblatex data model extension]
 
 \RequireBiber[3]
 
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-iso690/iso-authortitle.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-iso690/iso-authortitle.bbx
index ab683014ce..298c5a04e7 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-iso690/iso-authortitle.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-iso690/iso-authortitle.bbx
@@ -1,9 +1,42 @@
 \ProvidesFile{iso-authortitle.bbx}
-  [2020/03/25 v0.4.0 ISO 690 biblatex bibliography style]
+  [2022/03/20 v0.4.1 ISO 690 biblatex bibliography style]
 
 \RequireBibliographyStyle{iso}
 \ExecuteBibliographyOptions{%
   sorting=nty,
 }
 
+% Sorting based on the default definition, but adding
+% holder and origyear to work with patent entry types.
+\DeclareSortingTemplate{nty}{
+  \sort{
+    \field{presort}
+  }
+  \sort[final]{
+    \field{sortkey}
+  }
+  \sort{
+    \field{sortname}
+    \field{holder}
+    \field{author}
+    \field{editor}
+    \field{translator}
+    \field{sorttitle}
+    \field{title}
+  }
+  \sort{
+    \field{sorttitle}
+    \field{title}
+  }
+  \sort{
+    \field{sortyear}
+    \field{origyear}
+    \field{year}
+  }
+  \sort{
+    \field{volume}
+    \literal{0}
+  }
+}
+
 \endinput
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-iso690/iso-authortitle.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-iso690/iso-authortitle.cbx
index 8226b9bc92..a6df2b4dbb 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-iso690/iso-authortitle.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-iso690/iso-authortitle.cbx
@@ -1,5 +1,5 @@
 \ProvidesFile{iso-authortitle.cbx}
-  [2020/03/25 v0.4.0 ISO 690 biblatex citation style]
+  [2022/03/20 v0.4.1 ISO 690 biblatex citation style]
 
 \ExecuteBibliographyOptions{%
    maxcitenames=1,
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-iso690/iso-authortitle.dbx b/macros/latex/contrib/biblatex-contrib/biblatex-iso690/iso-authortitle.dbx
index f6d17afa40..60f65fdb6d 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-iso690/iso-authortitle.dbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-iso690/iso-authortitle.dbx
@@ -1,5 +1,5 @@
 \ProvidesFile{iso-authortitle.dbx}
-  [2020/03/25 v0.4.0 ISO 690 biblatex data model extension]
+  [2022/03/20 v0.4.1 ISO 690 biblatex data model extension]
 
 \RequireBiber[3]
 
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-iso690/iso-authoryear.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-iso690/iso-authoryear.bbx
index 6a8da0a12d..ae08a57a39 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-iso690/iso-authoryear.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-iso690/iso-authoryear.bbx
@@ -1,5 +1,5 @@
 \ProvidesFile{iso-authoryear.bbx}
-  [2020/03/25 v0.4.0 ISO 690 biblatex bibliography style]
+  [2022/03/20 v0.4.1 ISO 690 biblatex bibliography style]
 
 \RequireBibliographyStyle{iso}
 \ExecuteBibliographyOptions{%
@@ -54,33 +54,33 @@
 \renewbibmacro*{date}{}%
 
 % Overwrite names:primary to print year right after:
+% 0) holder (only for patents)
 % 1) author
 % 2) editor
 % 3) label/title
 % Need to handle not to print editor twice (primary
 % and subsidiary names): editor macro includes \clearname{editor}
 \renewbibmacro*{names:primary}{%
-  % First check if we have author(s) available
-  \ifboolexpr{
-    test \ifuseauthor
-    and
-    not test {\ifnameundef{author}}
-  }
-    {\usebibmacro{author}%
-     \setunit{\addspace}%
-     \printfield{nameaddon}%
-     \setunit{\printdelim{nameyeardelim}}}%
-    {% If no author(s) is available, check for editor(s)
-      \ifboolexpr{
-        test \ifuseeditor
-        and
-        not test {\ifnameundef{editor}}
-      }
+  % If we have a patent with holder field, we will use that.
+  \ifboolexpr{test \ifuseholder and test {\ifentrytype{patent}}
+                                and not test {\ifnameundef{holder}}}
+    {\usebibmacro{byholder}%
+    \setunit{\addspace}%
+    \printfield{nameaddon}%
+    \setunit{\printdelim{nameyeardelim}}}%
+    {% Otherwise, first check if we have author(s) available
+    \ifboolexpr{test \ifuseauthor and not test {\ifnameundef{author}}}
+      {\usebibmacro{author}%
+      \setunit{\addspace}%
+      \printfield{nameaddon}%
+      \setunit{\printdelim{nameyeardelim}}}%
+      {% If no author(s) is available, check for editor(s)
+      \ifboolexpr{test \ifuseeditor and not test {\ifnameundef{editor}}}
         {\usebibmacro{editor}%
-         \setunit{\printdelim{nameyeardelim}}}%
+        \setunit{\printdelim{nameyeardelim}}}%
         {% If no editor(s) is available, use label/title
-         \usebibmacro{labeltitle}%
-         \setunit{\printdelim{nonameyeardelim}}}}%
+        \usebibmacro{labeltitle}%
+        \setunit{\printdelim{nonameyeardelim}}}}}%
   % And finally print date
   \usebibmacro{date+extradate}%
 }
@@ -96,6 +96,17 @@
        {\printfield[title]{shorttitle}}}
     {\printfield{label}}}
 
+\renewbibmacro*{urldate-space}{%
+  % if there is no publisher specified in the bib file, set unit to dot,
+  % so there is a separation between previous block
+  % this version doesn't check date, as it isn't printed in the publisher block
+  \ifboolexpr{%
+    test {\iflistundef{publisher}}%
+    and test {\iflistundef{location}}%
+    and test {\iffieldundef{version}}%
+  }{\setunit{\adddot\addspace}}%
+  {\setunit{\addspace}}%
+}
 
 \newbool{bbx@inset}
 \DeclareBibliographyDriver{set}{%
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-iso690/iso-authoryear.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-iso690/iso-authoryear.cbx
index abdd15db20..780cb53eea 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-iso690/iso-authoryear.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-iso690/iso-authoryear.cbx
@@ -1,5 +1,5 @@
 \ProvidesFile{iso-authoryear.cbx}
-  [2020/03/25 v0.4.0 ISO 690 biblatex citation style]
+  [2022/03/20 v0.4.1 ISO 690 biblatex citation style]
 
 % Use only one name in citation to be consistent
 \ExecuteBibliographyOptions{%
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-iso690/iso-authoryear.dbx b/macros/latex/contrib/biblatex-contrib/biblatex-iso690/iso-authoryear.dbx
index 8b08856bba..9b0e106bf4 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-iso690/iso-authoryear.dbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-iso690/iso-authoryear.dbx
@@ -1,5 +1,5 @@
 \ProvidesFile{iso-authoryear.dbx}
-  [2020/03/25 v0.4.0 ISO 690 biblatex data model extension]
+  [2022/03/20 v0.4.1 ISO 690 biblatex data model extension]
 
 \RequireBiber[3]
 
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-iso690/iso-fullcite.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-iso690/iso-fullcite.cbx
index 4e3af0c95a..82960e2cee 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-iso690/iso-fullcite.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-iso690/iso-fullcite.cbx
@@ -1,5 +1,5 @@
 \ProvidesFile{iso-fullcite.cbx}
-  [2020/03/25 v0.4.0 ISO 690 biblatex fullcite modifications]
+  [2022/03/20 v0.4.1 ISO 690 biblatex fullcite modifications]
 
 % Fix for fullcite
 
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-iso690/iso-numeric.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-iso690/iso-numeric.bbx
index c4bb9b742b..db50802ba5 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-iso690/iso-numeric.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-iso690/iso-numeric.bbx
@@ -1,5 +1,5 @@
 \ProvidesFile{iso-numeric.bbx}
-  [2020/03/25 v0.4.0 ISO 690 biblatex bibliography style]
+  [2022/03/20 v0.4.1 ISO 690 biblatex bibliography style]
 
 \RequireBibliographyStyle{iso}
 \ExecuteBibliographyOptions{%
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-iso690/iso-numeric.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-iso690/iso-numeric.cbx
index a7dbe8e970..73806fc3f7 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-iso690/iso-numeric.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-iso690/iso-numeric.cbx
@@ -1,5 +1,5 @@
 \ProvidesFile{iso-numeric.cbx}
-  [2020/03/25 v0.4.0 ISO 690 biblatex citation style]
+  [2022/03/20 v0.4.1 ISO 690 biblatex citation style]
 
 \RequireCitationStyle{numeric}
 \RequireCitationStyle{iso-fullcite}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-iso690/iso-numeric.dbx b/macros/latex/contrib/biblatex-contrib/biblatex-iso690/iso-numeric.dbx
index 6cf14fe74e..c6a41c48b5 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-iso690/iso-numeric.dbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-iso690/iso-numeric.dbx
@@ -1,5 +1,5 @@
 \ProvidesFile{iso-numeric.dbx}
-  [2020/03/25 v0.4.0 ISO 690 biblatex data model extension]
+  [2022/03/20 v0.4.1 ISO 690 biblatex data model extension]
 
 \RequireBiber[3]
 
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-iso690/iso.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-iso690/iso.bbx
index ce2668f718..a43c6a81e9 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-iso690/iso.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-iso690/iso.bbx
@@ -1,13 +1,15 @@
 \ProvidesFile{iso.bbx}
-  [2020/03/25 v0.4.0 ISO 690 biblatex bibliography style]
+  [2022/03/20 v0.4.1 ISO 690 biblatex bibliography style]
 
 % Currently available language mappings:
-% Czech, English, Slovak, German, Polish, Bulgarian,
-% French
+% Czech, English, German, Polish, Slovak, and more.
+% You can list them directly with `$ ls *lbx`.
+% Or you can check the translation matrix at the wiki page:
+% https://github.com/michal-h21/biblatex-iso690/wiki/Translation-Guideline#translation-matrix
 \DeclareLanguageMappingSuffix{-iso}
 % Currently needed the following additional language strings:
 \NewBibliographyString{at,bysupervisor,urlalso,
-  director,bydirector,inventor,byinventor,online,film}
+  director,bydirector,inventor,byinventor,online,film,application,publication}
 
 % PACKAGE OPTIONS
 
@@ -22,6 +24,8 @@
 \newtoggle{bbx:doi}
 \newtoggle{bbx:eprint}
 \newtoggle{bbx:articlepubinfo}
+\newtoggle{bbx:currentlang}
+\newtoggle{bbx:noenddot}
 
 % Print info about package options into .log file
 \protected\def\isoblx@info@noline#1{%
@@ -48,7 +52,7 @@
 
 \DeclareBibliographyOption{thesisinfoinnotes}[true]{%
   \settoggle{bbx:thesisinfoinnotes}{#1}%
-  \isoblx@info@noline{Printing thesis info at the end enabled: #1}}
+  \isoblx@info@noline{Thesis info in the notes section enabled: #1}}
 
 \DeclareBibliographyOption{url}[true]{%
   \settoggle{bbx:url}{#1}%
@@ -70,6 +74,15 @@
   \settoggle{bbx:articlepubinfo}{#1}%
   \isoblx@info@noline{Article publication info enabled: #1}}
 
+\DeclareBibliographyOption{currentlang}[true]{
+  \settoggle{bbx:currentlang}{#1}%
+  \isoblx@info@noline{Use current language for the bibliography: #1}}
+
+\DeclareBibliographyOption{noenddot}[true]{
+  \settoggle{bbx:noenddot}{#1}%
+  \isoblx@info@noline{Use no end dot for the bibliography entries: #1}}
+
+
 % Set default package options
 \ExecuteBibliographyOptions{%
   spacecolon=false,
@@ -87,8 +100,11 @@
   autolang=other,% Use the 'langid' language for the entry
   date=year,% Use only years
   urldate=iso,% Use ISO8601 Extended Format (yyyy-mm-dd) for URL 'seen' dates
-  seconds=true,% ISO8601 format requires 'seconds=true'
+  origdate=iso,% Use ISO8601 Extended Format (yyyy-mm-dd) for patent appl. dates
+  seconds=true,% iso (ISO8601) format requires 'seconds=true'
   datecirca=true,% Use circa for approximate dates
+  currentlang=false,% Use main document language for printing of bibliography strings
+  noenddot=false,% Use an end dot for the bibliography entries
 }
 
 % Default definitions of beginning and closing macro
@@ -113,6 +129,13 @@
 % The separator between 'dates' and the numeration section
 \newcommand{\numerationpunct}{\addcomma\space}
 
+% No seperator or a dot at the very end of an entry
+\renewcommand{\finentrypunct}{%
+  \iftoggle{bbx:noenddot}
+    {}
+    {\addperiod}%
+}
+
 % A colon preceded with or without space
 \newcommand{\addspacecolon}{%
   \iftoggle{bbx:spcolon}
@@ -227,6 +250,11 @@
     {\mainlangbibstring{#1}}
     {#1}%
 }
+\DeclareFieldFormat[patent]{type}{%
+  \ifbibstring{#1}
+    {\mainlangbiblstring{#1}}
+    {#1}%
+}
 
 % Format supervisor of thesis (precedes the name with a localisation string)
 \DeclareFieldFormat{supervisor}{%
@@ -300,19 +328,64 @@
         {#1}}% This is the go-to format
 }
 
+% Define names to consider for 'labelname', based on
+% the default definition, but adding holder as the
+% very first choice for patents.
+\DeclareLabelname[patent]{%
+  \field{holder}
+  \field{shortauthor}
+  \field{author}
+  \field{shorteditor}
+  \field{editor}
+  \field{translator}
+}
+
 % Define dates to consider for 'labeldate', based on
 % the default definition, but without 'urldate' field,
 % preventing printing url seen date in place of the year
 % of a publication.
 \DeclareLabeldate{%
+  \field{origdate}% <----- used by patents
   \field{date}
   \field{year}
   \field{dateaddon}% <---- biblatex-iso690 data model extension
   \field{eventdate}
-  \field{origdate}
   \literal{nodate}
 }
 
+% Sorting based on the default definition, but adding
+% holder and origyear to work with patent entry types.
+\DeclareSortingTemplate{nyt}{
+  \sort{
+    \field{presort}
+  }
+  \sort[final]{
+    \field{sortkey}
+  }
+  \sort{
+    \field{sortname}
+    \field{holder}
+    \field{author}
+    \field{editor}
+    \field{translator}
+    \field{sorttitle}
+    \field{title}
+  }
+  \sort{
+    \field{sortyear}
+    \field{origyear}
+    \field{year}
+  }
+  \sort{
+    \field{sorttitle}
+    \field{title}
+  }
+  \sort{
+    \field{volume}
+    \literal{0}
+  }
+}
+
 % Format chapter of book with preceding localisation string
 \DeclareFieldFormat{chapter}{\bibstring{chapter}\addnbspace#1\isdot}
 
@@ -354,6 +427,26 @@
 % given (first) name followed by last (family) name,
 % so it may sound more naturally in this order
 \DeclareNameAlias{supervisor}{given-family}
+% For patents, the author field is supposed to be the inventor
+% of the patent, which we want to have in reverse name order,
+% since it may sound more naturally in this order
+\DeclareNameAlias[patent]{author}{given-family}
+% However, if there is no holder field for a patent,
+% author field should be in the default order since it acts
+% as a primary creator of the patent at the beginning
+% of the bib reference (consistency rule)
+\DeclareStyleSourcemap{
+  \maps[datatype=bibtex]{
+    \map{
+      \pertype{patent}
+      \step[fieldsource=author]
+      \step[fieldset=holder, origfieldval]
+    }
+  }
+}
+
+
+
 
 % BIBLIOGRAPHY MACROS
 
@@ -362,15 +455,16 @@
 % Based on author/editor macro
 % Adds nameaddon field to author names
 \newbibmacro*{names:primary}{%
-  \ifboolexpr{
-    test \ifuseauthor
-    and
-    not test {\ifnameundef{author}}
-  }
-    {\usebibmacro{author}%
-     \setunit{\addspace}%
-     \printfield{nameaddon}}%
-    {\usebibmacro{editor}}%
+  \ifboolexpr{test \ifuseholder and test {\ifentrytype{patent}}
+                                and not test {\ifnameundef{holder}}}
+    {\usebibmacro{byholder}%
+    \setunit{\addspace}%
+    \printfield{nameaddon}}%
+    {\ifboolexpr{test \ifuseauthor and not test {\ifnameundef{author}}}
+      {\usebibmacro{author}%
+      \setunit{\addspace}%
+      \printfield{nameaddon}}%
+      {\usebibmacro{editor}}}%
 }
 
 % Macro for secondary authors with their role
@@ -398,6 +492,16 @@
      \printnames{supervisor}}%
 }
 
+% Macro for printing the inventor of a patent
+\newbibmacro*{patentinventor}{%
+  \ifnameundef{author}
+    {}
+    {\mainlangbibstring{inventor}%
+     \setunit{\addcolon\space}%
+     \usebibmacro{author}}%
+}
+
+
 % TITLES MACROS
 
 % Macro for formatting <prefix>titles
@@ -432,7 +536,8 @@
 \newbibmacro{multi:titles}{%
   \iffieldundef{maintitle}
     {\iffieldundef{booktitle}
-      {\usebibmacro{titles}{}{emph}}
+      {\usebibmacro{titles}{}{emph}%
+       \usebibmacro{volume}}
       {\usebibmacro{titles}{book}{emph}%
        \usebibmacro{volume}%
        \usebibmacro{titles}{}{}}}%
@@ -462,6 +567,7 @@
     {\usebibmacro{titles}{issue}{}}%
 }
 
+
 % MEDIUM TYPE MACROS
 
 \newbibmacro*{medium-type}{%
@@ -476,7 +582,7 @@
              or test {\ifentrytype{online}})
       }
         % Use a localisation string 'online' in the main document language
-        {\mainlangbibstring[\mkbibbrackets]{online}}%
+        {\midsentence\mainlangbibstring[\mkbibbrackets]{online}}%
         {}}% Don't print anything
     {% The only situation when we don't want to print
      % 'howpublished' field is when
@@ -495,6 +601,9 @@
         {\printfield{howpublished}}}%
 }
 
+
+
+
 % PUBLICATION INFO MACROS
 
 % By default only year is used, but for some entries,
@@ -523,18 +632,23 @@
 }
 
 % Based on publisher+location+date macro (defined in standard.bbx)
-% Differs only in punctuation
+% Differs only in punctuation, and printing the organization field
 %
 % Wrapper for printing normal or full date. 1st argument:
-% * empty: \usebibmacro{date}
-% * 'full': \usebibmacro{fulldate}
+% a) <empty>: \usebibmacro{date}
+% b) 'full' : \usebibmacro{fulldate}
 \newbibmacro*{location+publisher+dateform}[1]{%
   \printlist{location}%
-  \iflistundef{publisher}
+  \ifboolexpr{
+    test {\iflistundef{publisher}}
+    and
+    test {\iflistundef{organization}}}
     {\setunit*{\addcomma\space}}
     {\setunit*{\subtitlepunct}}% <---- different punctuation
   \printlist{publisher}%
   \setunit*{\addcomma\space}%
+  \printlist{organization}%
+  \setunit*{\addcomma\space}%
   \usebibmacro{#1date}%
   \newunit}
 
@@ -544,6 +658,25 @@
 \newbibmacro*{location+publisher+fulldate}{%
   \usebibmacro{location+publisher+dateform}{full}}
 
+
+
+% ADDITIONAL DATE MACROS FOR PATENTS
+
+% Application date
+\newbibmacro{applicationdate}{%
+  \iffieldundef{origyear}
+    {}
+    {\mainlangbibstring{application}\addcolon\space\printorigdate}
+}
+
+% Publication date
+\newbibmacro{publicationdate}{%
+  \iffieldundef{year}
+    {}
+    {\mainlangbibstring{publication}\addcolon\space\usebibmacro{fulldate}}
+}
+
+
 % NUMERATION MACROS
 
 \newbibmacro*{serial:numeration}{%
@@ -560,6 +693,7 @@
   \printfield{chapter}%
 }
 
+
 % SERIES TITLE AND NUMBER MACROS
 
 % Based on series+number macro (defined in standard.bbx)
@@ -570,6 +704,7 @@
   \printfield{number}%
 }%
 
+
 % STANDARD IDENTIFIERS MACROS
 
 % Bunch of standard identifiers
@@ -590,6 +725,7 @@
     {}%
 }
 
+
 % AVAILABILITY AND ACCESS MACROS
 
 % Precedes DOI field with urlfrom localisation string
@@ -634,6 +770,18 @@
     {}%
 }
 
+\newbibmacro*{urldate-space}{%
+  % if there is no publisher specified in the bib file, set unit to dot,
+  % so there is a separation between previous block
+  \ifboolexpr{%
+    test {\iflistundef{publisher}}%
+    and test {\iflistundef{location}}%
+    and test {\iffieldundef{date}}%
+    and test {\iffieldundef{version}}%
+  }{\setunit{\adddot\addspace}}%
+  {\setunit{\addspace}}%
+}
+
 % The url seen date of @online entries is always printed
 \renewbibmacro*{urldate}{%
   \ifboolexpr{
@@ -644,6 +792,7 @@
     {}%
 }
 
+
 % LOCATION MACROS
 
 % Additional location information (e.g. library, repository)
@@ -654,6 +803,7 @@
      \printfield{library}}%
 }
 
+
 % OTHER MACROS
 
 % Redeclare in: bibmacro to use the main document language.
@@ -673,6 +823,7 @@
   \printunit{\intitlepunct}%
 }
 
+
 % BIBLATEX CORE ADJUSTMENTS
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -692,19 +843,32 @@
 \newrobustcmd*{\blx@imc@mainlangbibsstring}[2][\@firstofone]{%
   \blx@mainlangbibstring{#1}{abx@sstr}{#2}}
 
+% We use Babel or Polyglossia main document language for some
+% bibliography strings. With currentlang option, the currently
+% selected language is used instead. It is useful in some classes
+% that don't support selection of the main language.
+% https://github.com/michal-h21/biblatex-iso690/issues/90
+\newcommand\blx@selectlangmacro{%
+  \ifboolexpr{%
+        test {\iftoggle{bbx:currentlang}}%
+        and test {\ifdef{\textouterlang}}%
+      }%
+      {\let\iso@mainlang\textouterlang}{\let\iso@mainlang\textmainlang}%
+}
+
 \protected\def\blx@mainlangbibstring#1#2#3{%
-  {\mainlang% <---- use main document language
-  \blx@begunit
-  \blx@hyphenreset
-  \blx@bibstringsimple
+  \blx@begunit%
+  \blx@hyphenreset%
+  \blx@bibstringsimple%
+  \blx@selectlangmacro%
   \lowercase{\edef\blx@tempa{#3}}%
-  \ifcsundef{#2@\blx@tempa}
-    {\blx@warn@nostring\blx@tempa
-     \blx@endnounit}
-    {\blx@imc@ifcapital
-       {#1{\MakeCapital{\csuse{#2@\blx@tempa}}}}
-       {#1{\csuse{#2@\blx@tempa}}}%
-     \blx@endunit}}}
+  \ifcsundef{#2@\blx@tempa}%
+    {\blx@warn@nostring\blx@tempa%
+     \blx@endnounit}%
+    {\blx@imc@ifcapital%
+       {\iso@mainlang{#1{\MakeCapital{\csuse{#2@\blx@tempa}}}}}%
+       {\iso@mainlang{#1{\csuse{#2@\blx@tempa}}}}%
+     \blx@endunit}}
 
 \blx@regimcs{%
   \mainlangbibstring \mainlangbiblstring \mainlangbibsstring
@@ -988,7 +1152,7 @@
       {\blx@nounit}
       {\printtext[{#1date}]{%
          \datecircaprint
-         % Such a season component can only come from an  ISO8601 season which replaces
+         % Such a season component can only come from an ISO8601 season which replaces
          % a normal month so if it exists, we know that a normal date print is ruled out
          \iffieldundef{#1season}
            {\blx@ymddate{#1}{}%
@@ -1061,13 +1225,15 @@
   \usebibmacro{names:subsidiary}%
   \newunit\newblock
   \usebibmacro{location+publisher+date}%
-  \newunit
+  \newunit%
   \printfield{version}%
-  \setunit{\addspace}%
+  \usebibmacro{urldate-space}%
   \usebibmacro{urldate}%
   \newunit\newblock
   \usebibmacro{series+number}%
   \newunit\newblock
+  \printfield{volumes}
+  \newunit\newblock
   \usebibmacro{identifier}%
   \newunit\newblock
   \usebibmacro{availability+access}%
@@ -1250,7 +1416,7 @@
   \usebibmacro{location+publisher+fulldate}%
   \newunit
   \printfield{version}%
-  \setunit{\addspace}%
+  \usebibmacro{urldate-space}%
   \usebibmacro{urldate}%
   \newunit\newblock
   \usebibmacro{series+number}%
@@ -1281,7 +1447,7 @@
   \usebibmacro{location+publisher+date}%
   \newunit
   \printfield{version}%
-  \setunit{\addspace}%
+  \usebibmacro{urldate-space}%
   \usebibmacro{urldate}%
   \newunit\newblock
   \usebibmacro{identifier}%
@@ -1326,7 +1492,7 @@
   \usebibmacro{location+publisher+fulldate}%
   \newunit
   \printfield{version}%
-  \setunit{\addspace}%
+  \usebibmacro{urldate-space}%
   \usebibmacro{urldate}%
   \newunit\newblock
   \iffieldundef{type}
@@ -1360,28 +1526,33 @@
   \newunit\newblock
   \usebibmacro{names:subsidiary}%
   \newunit\newblock
+  \usebibmacro{patentinventor}%
+  \newunit
+  \usebibmacro{publicationdate}%
+  \newunit
+  \usebibmacro{applicationdate}%
+  \newunit
+  \printfield{note}%
+  \newunit\newblock
   \printlist{location}%
   \newunit\newblock
   \iffieldundef{type}
     {}
     {\printfield{type}%
-     \setunit*{\addcomma\space}}%
+     \setunit*{\addspace}}%
   \printfield{number}%
   \newunit\newblock
-  \usebibmacro{fulldate}%
-  \setunit{\addspace}%
   \usebibmacro{urldate}%
   \newunit\newblock
   \usebibmacro{availability+access}%
   \newunit\newblock
-  \printfield{note}%
-  \newunit\newblock
   \setunit{\bibpagerefpunct}\newblock
   \usebibmacro{pageref}%
   \usebibmacro{finentry}}%
 
 % BIBLIOGRAPHY ALIASES
 
+\DeclareBibliographyAlias{mvbook}{book}
 \DeclareBibliographyAlias{bookinbook}{inbook}
 \DeclareBibliographyAlias{suppbook}{inbook}
 \DeclareBibliographyAlias{booklet}{book}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-iso690/ngerman-iso.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-iso690/ngerman-iso.lbx
new file mode 100644
index 0000000000..fe95d8de6b
--- /dev/null
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-iso690/ngerman-iso.lbx
@@ -0,0 +1,14 @@
+\ProvidesFile{ngerman-iso.lbx}
+  [2022/03/20 v0.4.1 ISO 690 extended biblatex localization]
+
+\InheritBibliographyExtras{ngerman}
+\InheritBibliographyStrings{ngerman}
+
+% 'ngerman.lbx' inherits from 'german.lbx',
+% so biblatex recursively loads also 'german-iso.lbx'.
+% In case some strings should differ between german
+% and ngerman, let's override them below.
+\DeclareBibliographyStrings{%
+}
+
+\endinput
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-iso690/polish-iso.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-iso690/polish-iso.lbx
index b3b7f148da..6ede0c40be 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-iso690/polish-iso.lbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-iso690/polish-iso.lbx
@@ -1,5 +1,5 @@
 \ProvidesFile{polish-iso.lbx}
-  [2020/03/25 v0.4.0 ISO 690 extended biblatex localization]
+  [2022/03/20 v0.4.1 ISO 690 extended biblatex localization]
 
 \InheritBibliographyExtras{polish}
 \InheritBibliographyStrings{polish}
@@ -25,6 +25,10 @@
 %                 {}},% FIXME: missing
 % film         = {{}%
 %                 {}},% FIXME: missing
+% application  = {{}%
+%                 {}},% FIXME: missing
+% publication  = {{}%
+%                 {}},% FIXME: missing
 }
 
 \endinput
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-iso690/slovak-iso.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-iso690/slovak-iso.lbx
index 8bd4e4b096..0fe12d68e2 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-iso690/slovak-iso.lbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-iso690/slovak-iso.lbx
@@ -1,5 +1,5 @@
 \ProvidesFile{slovak-iso.lbx}
-  [2020/03/25 v0.4.0 ISO 690 extended biblatex localization]
+  [2022/03/20 v0.4.1 ISO 690 extended biblatex localization]
 
 \InheritBibliographyExtras{slovak}
 \InheritBibliographyStrings{slovak}
@@ -23,6 +23,10 @@
                   {online}},
   film         = {{film}%
                   {film}},
+  application  = {{prihl\'{a}\v{s}ka}%
+                  {prihl\adddot}},
+  publication  = {{publikovan\'{e}}%
+                  {publ\adddot}},
 }
 
 \endinput
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-iso690/spanish-iso.lbx b/macros/latex/contrib/biblatex-contrib/biblatex-iso690/spanish-iso.lbx
new file mode 100644
index 0000000000..dc83728836
--- /dev/null
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-iso690/spanish-iso.lbx
@@ -0,0 +1,35 @@
+\ProvidesFile{spanish-iso.lbx}
+  [2022/03/20 v0.4.1 ISO 690 extended biblatex localization]
+
+\InheritBibliographyExtras{spanish}
+\InheritBibliographyStrings{spanish}
+
+\DeclareBibliographyStrings{%
+  at           = {{en}%
+                  {en}},
+  bysupervisor = {{supervisado por}%
+                  {supervisado por}},
+  urlalso      = {{disponible también desde}%
+                  {disponible también desde}},
+  director     = {{director}%
+                  {director}},
+  bydirector   = {{dirigido por}%
+                  {dirigido por}},
+  inventor     = {{inventor}%
+                  {inventor}},
+  byinventor   = {{inventado por}%
+                  {inventado por}},
+  online       = {{online}%
+                  {online}},
+  film         = {{film}%
+                  {film}},
+  andothers    = {{et\addabbrvspace al\adddot}%
+                  {et\addabbrvspace al\adddot}},
+  % if not, y col. will be used instead of et al.
+% application  = {{}%
+%                 {}},% FIXME: missing
+% publication  = {{}%
+%                 {}},% FIXME: missing
+}
+
+\endinput
diff --git a/macros/latex/contrib/projlib/ProjLib.dtx b/macros/latex/contrib/projlib/ProjLib.dtx
index db18403a5c..32903be29b 100644
--- a/macros/latex/contrib/projlib/ProjLib.dtx
+++ b/macros/latex/contrib/projlib/ProjLib.dtx
@@ -20,70 +20,70 @@
 %<*ProjLib>
 \ProvidesExplPackage
   {ProjLib}
-  {2022/03/19} {}
+  {2022/03/21} {}
   {Collective interface of the ProjLib toolkit}
 %</ProjLib>
 %
 %<*projlib-author>
 \ProvidesExplPackage
   {projlib-author}
-  {2022/03/19} {}
+  {2022/03/21} {}
   {Enhanced author information block}
 %</projlib-author>
 %
 %<*projlib-datetime>
 \ProvidesExplPackage
   {projlib-datetime}
-  {2022/03/19} {}
+  {2022/03/21} {}
   {Convert numeric date-time string to natural language}
 %</projlib-datetime>
 %
 %<*projlib-draft>
 \ProvidesExplPackage
   {projlib-draft}
-  {2022/03/19} {}
+  {2022/03/21} {}
   {Useful commands during draft stage}
 %</projlib-draft>
 %
 %<*projlib-font>
 \ProvidesExplPackage
   {projlib-font}
-  {2022/03/19} {}
+  {2022/03/21} {}
   {Font selection and configuration}
 %</projlib-font>
 %
 %<*projlib-language>
 \ProvidesExplPackage
   {projlib-language}
-  {2022/03/19} {}
+  {2022/03/21} {}
   {Multi-language configuration}
 %</projlib-language>
 %
 %<*projlib-logo>
 \ProvidesExplPackage
   {projlib-logo}
-  {2022/03/19} {}
+  {2022/03/21} {}
   {The ProjLib logo}
 %</projlib-logo>
 %
 %<*projlib-math>
 \ProvidesExplPackage
   {projlib-math}
-  {2022/03/19} {}
+  {2022/03/21} {}
   {Efficient math setup}
 %</projlib-math>
 %
 %<*projlib-paper>
 \ProvidesExplPackage
   {projlib-paper}
-  {2022/03/19} {}
+  {2022/03/21} {}
   {Configuration of the paper style}
 %</projlib-paper>
 %
 %<*projlib-theorem>
 \ProvidesExplPackage
   {projlib-theorem}
-  {2022/03/19} {}
+  {2022/03/21} {}
   {Configuration of theorem-like environments}
 %</projlib-theorem>
 
@@ -2091,42 +2091,76 @@
 %<*projlib-draft>
 \keys_define:nn { projlib-draft }
   {
-    , draft   .bool_set:N   = \l__projlib_draft_fast_bool
-    , draft   .initial:n    = { false }
-    , fast    .bool_set:N   = \l__projlib_draft_fast_bool
-    , unknown .code:n       = {}
+    , draft             .bool_set:N   = \l__projlib_draft_fast_bool
+    , draft             .initial:n    = { false }
+    , fast              .bool_set:N   = \l__projlib_draft_fast_bool
+    , no-report-page    .bool_set:N   = \l__projlib_draft_no_report_page_bool
+    , no-report-page    .initial:n    = { false }
+    , no~report~page    .bool_set:N   = \l__projlib_draft_no_report_page_bool
+    , no report page    .bool_set:N   = \l__projlib_draft_no_report_page_bool
+    , unknown           .code:n       = {}
   }
 \ProcessKeysOptions { projlib-draft }
 
 \RequirePackage { projlib-language }
 \RequirePackage { xcolor }
+\RequirePackage { ulem }
 
-\bool_if:NTF \l__projlib_draft_fast_bool
+\cs_new_protected:Nn \projlib_draft_plain_box_lines:n
   {
-    \NewDocumentCommand \projlib_draft_plain_box { O{-paper} m }
-      {
-        \group_begin:
-          \color { #1 }
-          \dim_set:Nn \fboxsep  { 1.5pt }
-          \dim_set:Nn \fboxrule { 1.5pt }
-          \fbox { #2 }
-        \group_end:
-      }
+    \bgroup\markoverwith{
+      \rule[-0.6ex]{1pt}{1.25pt}
+      \skip_horizontal:n { -1pt }
+      \rule[1.8ex]{1pt}{1.25pt}
+      \skip_horizontal:n { -.1pt }
+    }\ULon { #1 }
+  }
+
+  \bool_if:NTF \l__projlib_draft_fast_bool
+  {
+    \tl_const:Nn \l_projlib_draft_plain_box_begin_tl { $[$ }
+    \tl_const:Nn \l_projlib_draft_plain_box_after_tl { $]$ }
   }
   {
-    \PassOptionsToPackage { many } { tcolorbox }
-    \RequirePackage { tcolorbox }
-    \NewTCBox \projlib_draft_plain_box { O{-paper} }
+    \RequirePackage { tikz }
+    \tl_const:Nn \l_projlib_draft_plain_box_begin_tl
+      {
+        \tikz[line~width=1.25pt,baseline=-.625pt]
+          \draw (1ex,-.6ex) -- (.5ex,-.6ex)
+                (0,-.1ex) arc [start~angle=180, end~angle=270, radius=.5ex]
+                (0,-.1ex) -- (0,1.3ex)
+                (0,1.3ex) arc [start~angle=180, end~angle=90, radius=.5ex]
+                (0.5ex,1.8ex) -- (1ex,1.8ex);
+      }
+    \tl_const:Nn \l_projlib_draft_plain_box_after_tl
       {
-        enhanced~jigsaw, breakable,
-        on~line, arc = 1.2pt, outer~arc = 1pt,
-        colframe = #1, colupper = #1, opacityback = 0,
-        boxsep = 1pt, boxrule = 1.2pt,
-        left = 1pt, right = 1pt, top = 0pt, bottom = 0pt,
+        \tikz[line~width=1.25pt,baseline=-.625pt]
+          \draw (-1ex,-.6ex) -- (-.5ex,-.6ex)
+                (0,-.1ex) arc [start~angle=0, end~angle=-90, radius=.5ex]
+                (0,-.1ex) -- (0,1.3ex)
+                (0,1.3ex) arc [start~angle=0, end~angle=90, radius=.5ex]
+                (-0.5ex,1.8ex) -- (-1ex,1.8ex);
       }
   }
 
-\projlib_langauge_define_multilingual_text:Nn \__projlib_draft_dnf_text
+\cs_new_protected:Nn \projlib_draft_plain_box:nn
+  {
+    \group_begin:
+      \color{ #1 }
+      \l_projlib_draft_plain_box_begin_tl
+      \nobreak
+      \hspace{-.5ex}
+      \nobreak
+      \projlib_draft_plain_box_lines:n { #2 }
+      \nobreak
+      \hspace{-.5ex}
+      \nobreak
+      \l_projlib_draft_plain_box_after_tl
+    \group_end:
+  }
+
+
+\projlib_langauge_define_multilingual_text:Nn \projlib_draft_dnf_text
   {
     EN = To\ be\ finished     ,
     FR = Pas\ encore\ fini    ,
@@ -2141,7 +2175,7 @@
     RU = Не\ закончен         ,
   }
 
-\projlib_langauge_define_multilingual_text:Nn \__projlib_draft_dnf_report_text
+\projlib_langauge_define_multilingual_text:Nn \projlib_draft_dnf_report_text
   {
     EN = { Below\ is\ a\ list\ of\ outstanding\ items,
            \ followed\ by\ the\ corresponding\ page\ numbers.         }     ,
@@ -2164,65 +2198,71 @@
            \ с\ соответствующими\ номерами\ страниц\ в\ скобках.      }     ,
   }
 
-\tl_new:c    { __projlib_draft_dnf_font }
-\tl_gset:cn  { __projlib_draft_dnf_font }        { \normalfont \ttfamily \bfseries \small }
+\tl_new:c    { projlib_draft_dnf_font }
+\tl_gset:cn  { projlib_draft_dnf_font }        { \normalfont \ttfamily \bfseries \small }
 
-\definecolor { __projlib_draft_dnf_color }       { RGB } {  21, 122,  20 }
+\definecolor { projlib_draft_dnf_color }       { RGB } {  21, 122,  20 }
 
-\newcounter  { __projlib_draft_dnf_counter }
+\newcounter  { projlib_draft_dnf_counter }
 
 \tl_new:N \g__projlib_draft_dnf_report_tl
 
-\NewDocumentCommand \dnf { d<> }
+\NewDocumentCommand \dnf { D<>{} }
   {
     \noindent
-    \projlib_draft_plain_box [ __projlib_draft_dnf_color ]
+    \group_begin:
+    \projlib_draft_dnf_font
+    \stepcounter { projlib_draft_dnf_counter }
+    \projlib_draft_plain_box:nn { projlib_draft_dnf_color }
       {
-        \stepcounter { __projlib_draft_dnf_counter }
-        \__projlib_draft_dnf_font
-        \__projlib_draft_dnf_text
-        \c_space_tl
-        \# \the__projlib_draft_dnf_counter
-        \IfNoValueF { #1 } { \, : ~ #1 }
-        \tl_gput_right:Nx \g__projlib_draft_dnf_report_tl
+        \projlib_draft_dnf_text
+        \nobreakspace
+        \# \theprojlib_draft_dnf_counter
+        \tl_if_blank:nF { #1 } { \, : ~ }
+        #1
+      }
+    \group_end:
+    \tl_gput_right:Nx \g__projlib_draft_dnf_report_tl
+      {
+        \# \,
+        \int_value:w \theprojlib_draft_dnf_counter
+        \c_space_tl \c_space_tl
+        $\langle$
+        \skip_horizontal:n { 0.1em }
+        \cs_if_exist:cTF { hyperlink }
           {
-            \# \,
-            \int_value:w \the__projlib_draft_dnf_counter
-            \c_space_tl \c_space_tl
-            $\langle$
-            \skip_horizontal:n { 0.1em }
-            \cs_if_exist:cTF { hyperlink }
-              {
-                \exp_not:N \hyperlink { page.\thepage } { \thepage }
-              }
-              {
-                \thepage
-              }
-            \skip_horizontal:n { 0.1em }
-            $\rangle$
-            \c_space_tl
-            \IfNoValueF { #1 } { : ~ #1 }
-            \\
+            \exp_not:N \hyperlink { page.\thepage } { \thepage }
+          }
+          {
+            \thepage
           }
+        \skip_horizontal:n { 0.1em }
+        $\rangle$
+        \nobreakspace
+        \IfNoValueF { #1 } { : ~ }
+        #1 \\
       }
   }
 
-\hook_gput_code:nnn { enddocument } { projlib-draft }
+\bool_if:NF \l__projlib_draft_no_report_page_bool
   {
-    \tl_if_blank:VF \g__projlib_draft_dnf_report_tl
+    \hook_gput_code:nnn { enddocument } { projlib-draft }
       {
-        \clearpage
-        \pagestyle{empty}
-        \noindent
-        \color { __projlib_draft_dnf_color }
-        \__projlib_draft_dnf_font
-        \__projlib_draft_dnf_report_text \\[0.75\baselineskip]
-        \g__projlib_draft_dnf_report_tl
+        \tl_if_blank:VF \g__projlib_draft_dnf_report_tl
+          {
+            \clearpage
+            \pagestyle{empty}
+            \noindent
+            \color { projlib_draft_dnf_color }
+            \projlib_draft_dnf_font
+            \projlib_draft_dnf_report_text \\[0.75\baselineskip]
+            \g__projlib_draft_dnf_report_tl
+          }
       }
   }
 
 
-\projlib_langauge_define_multilingual_text:Nn \__projlib_draft_blind_text_tl
+\projlib_langauge_define_multilingual_text:Nn \projlib_draft_blind_text_tl
   {
     , EN = {
               Hello,~here~is~some~text~without~a~meaning.~This~text~should~show~what~a~printed~text~will~look~like~at~this~place.~If~you~read~this~text,~you~will~get~no~information.~Really?~Is~there~no~information?~Is~there~a~difference~between~this~text~and~some~nonsense~like~``Huardest~gefburn''?~Not~at~all!~A~blind~text~like~this~gives~you~information~about~the~selected~font,~how~the~letters~are~written~and~an~impression~of~the~look.~This~text~should~contain~all~letters~of~the~alphabet~and~it~should~be~written~in~of~the~original~language.~There~is~no~need~for~special~content,~but~the~length~of~words~should~match~the~language.
@@ -2264,7 +2304,7 @@
     \int_set:Nn \l_tmpa_int { #1 }
     \int_do_until:nNnn { \l_tmpa_int } = { 0 }
       {
-        \__projlib_draft_blind_text_tl
+        \projlib_draft_blind_text_tl
         \c_space_tl
         \int_add:Nn \l_tmpa_int { -1 }
       }
@@ -2276,7 +2316,7 @@
       {
         \tl_if_blank:nTF { #1 }
           {
-            \__projlib_draft_blind_text_tl
+            \projlib_draft_blind_text_tl
           }
           {
             \projlib_draft_blind_text:n { #1 }
@@ -3002,7 +3042,13 @@
     \DeclareRobustCommand * \ProjLib
       {
         \group_begin:
-          \normalfont ProjLib
+          \normalfont\sffamily ProjLib
+        \group_end:
+      }
+    \DeclareRobustCommand * \ProjLibText
+      {
+        \group_begin:
+          \normalfont\sffamily ProjLib
         \group_end:
       }
     \endinput
@@ -3083,45 +3129,52 @@
 
 \RequirePackage { tikz }
 
-\cs_new_protected:Nn \projlib_logo_generic:
+\cs_new_protected:Nn \projlib_logo_generic:nn
   {
+    \colorlet{projlib-logo-saved-color}{.}
     \skip_horizontal:n { .2em }
     \begin{tikzpicture}[line~width=.1em, baseline=0]
-      \begin{scope}[color=blue!50!cyan!30!black]
+      \begin{scope}[color=#1!30!projlib-logo-saved-color]
         \draw (0.22em,.5em) circle (.22em);
         \draw (0em,0em) -- (0em,.5em);
       \end{scope}
-      \begin{scope}[color=blue!50!cyan!40!black, xshift=.65em]
+      \begin{scope}[color=#1!40!projlib-logo-saved-color, xshift=.65em]
         \draw (0em,0em) -- (0em,.25em) arc [start~angle=180, end~angle=90, radius=.2em];
       \end{scope}
-      \begin{scope}[color=blue!50!cyan!45!black, xshift=1.0em]
+      \begin{scope}[color=#1!45!projlib-logo-saved-color, xshift=1.0em]
         \draw (0.2em,.24em) circle (.2em);
       \end{scope}
-      \begin{scope}[color=blue!50!cyan!50!black, xshift=1.65em]
+      \begin{scope}[color=#1!50!projlib-logo-saved-color, xshift=1.65em]
         \draw (0em,-.25em) -- (0em,.5em);
         \begin{scope}[yshift=.75em]
-          % \draw[line~width=.032em, color=orange!60!yellow, xshift=.01em, yshift=-.003em] (0,0) circle (.13em);
+          % \draw[line~width=.032em, color=#2, xshift=.01em, yshift=-.003em] (0,0) circle (.13em);
           % \node[rotate=-15,scale=0.45, xshift=.033em] { \usefont{U}{zeur}{b}{n} \symbol{"02} };
-          \draw[line~width=.06em, color=orange!60!yellow] (0,0) circle (.13em);
+          \draw[line~width=.06em, color=#2] (0,0) circle (.13em);
         \end{scope}
       \end{scope}
-      \begin{scope}[color=blue!50!cyan!67!black, xshift=2.0em]
+      \begin{scope}[color=#1!67!projlib-logo-saved-color, xshift=2.0em]
         \draw (0em,0em) -- (0em,.75em);
       \end{scope}
-      \begin{scope}[color=blue!50!cyan!75!black, xshift=2.35em]
+      \begin{scope}[color=#1!75!projlib-logo-saved-color, xshift=2.35em]
         \draw (0em,0em) -- (0em,.5em);
       \end{scope}
-      \begin{scope}[color=blue!50!cyan!90!black, xshift=2.63em]
+      \begin{scope}[color=#1!90!projlib-logo-saved-color, xshift=2.63em]
         \draw (0.2em,.24em) circle (.2em);
         \draw (0em,0.24em) -- (0em,.75em);
       \end{scope}
     \end{tikzpicture}
-    \skip_horizontal:n { .2em }
+    \skip_horizontal:n { .1em }
   }
 
 \DeclareRobustCommand * \ProjLib
   {
-    \projlib_logo_generic:
+    \projlib_logo_generic:nn { blue!50!cyan } { orange!60!yellow }
+  }
+
+
+\DeclareRobustCommand * \ProjLibText
+  {
+    \projlib_logo_generic:nn { projlib-logo-saved-color } { projlib-logo-saved-color }
   }
 %</projlib-logo>
 %
diff --git a/macros/latex/contrib/projlib/README.md b/macros/latex/contrib/projlib/README.md
index 3c25a992a8..cfac379f40 100644
--- a/macros/latex/contrib/projlib/README.md
+++ b/macros/latex/contrib/projlib/README.md
@@ -1,14 +1,14 @@
 <!-- Copyright (C) 2021-2022 by Jinwen XU -->
 
-# ProjLib Toolkit
+![image](https://github.com/Jinwen-XU/ProjLib/raw/main/logo/ProjLib-logo.png)
 
-The bundle is dated 2022/03/19
+# The `ProjLib` Toolkit
 
-![image](https://i.imgur.com/bOOJLve.png)
+The bundle is dated 2022/03/21
 
 ## **Important note**
 
-The whole project is being rewritten with `expl3`. The new modules are basically finished but are **not yet documented**. They have filenames with the prefix "projlib-", and they are in many ways better and more powerful than their predecessors.
+The whole project is being rewritten with `expl3`. The new modules are basically finished but are **not yet documented**. They have filenames with the prefix `projlib-`, and they are in many ways better and more powerful than their predecessors.
 
 The new modules are:
 - projlib-author
diff --git a/macros/latex/contrib/tuda-ci/README.md b/macros/latex/contrib/tuda-ci/README.md
index 1d32be8f41..22889ae11b 100644
--- a/macros/latex/contrib/tuda-ci/README.md
+++ b/macros/latex/contrib/tuda-ci/README.md
@@ -2,7 +2,7 @@
 
  Copyright (C) Marei Peischl <marei@peitex.de>, 2018–2022
 
- tuda-ci 2022/02/08 v3.22
+ tuda-ci 2022/03/21 v3.23
 
 ***************************************************************************
 
@@ -305,3 +305,5 @@ leaflets 				| DEMO-TUDaLeaflet.tex							| tudaleaflet.cls
  * 3.22 (2022-02-08)
    - improve alignment for reviewers if `type=thesis`
    - fix bug in handling of `\Metadata`
+ * 3.23 (2022-03-21)
+   - fix font selection for reviewers in uppertitleback
diff --git a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaAnnouncement.pdf b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaAnnouncement.pdf
index 418dcdf635..b19af47979 100644
--- a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaAnnouncement.pdf
+++ b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaAnnouncement.pdf
diff --git a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaBeamer.pdf b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaBeamer.pdf
index 8eac4cd623..8e020519a6 100644
--- a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaBeamer.pdf
+++ b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaBeamer.pdf
diff --git a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaExercise.pdf b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaExercise.pdf
index 8d22813c2f..8614237505 100644
--- a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaExercise.pdf
+++ b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaExercise.pdf
diff --git a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaLeaflet.pdf b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaLeaflet.pdf
deleted file mode 100644
index 93c2ab22eb..0000000000
--- a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaLeaflet.pdf
+++ /dev/null
diff --git a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaLetter.pdf b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaLetter.pdf
index e54221552e..8c68e18601 100644
--- a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaLetter.pdf
+++ b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaLetter.pdf
diff --git a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaPhD.pdf b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaPhD.pdf
index 62018d3670..e02be75c05 100644
--- a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaPhD.pdf
+++ b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaPhD.pdf
diff --git a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaPoster.pdf b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaPoster.pdf
index 74a9fb9d32..e9a2976734 100644
--- a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaPoster.pdf
+++ b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaPoster.pdf
diff --git a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaPub.pdf b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaPub.pdf
index 35bf6ed958..6f649add82 100644
--- a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaPub.pdf
+++ b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaPub.pdf
diff --git a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaReport.pdf b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaReport.pdf
index f1ebc78134..9aa05f3685 100644
--- a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaReport.pdf
+++ b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaReport.pdf
diff --git a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaSciPoster.pdf b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaSciPoster.pdf
index ed2348c566..2b59a3632f 100644
--- a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaSciPoster.pdf
+++ b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaSciPoster.pdf
diff --git a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaThesis.pdf b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaThesis.pdf
index a1a9f69ebd..02c9e32c3f 100644
--- a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaThesis.pdf
+++ b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaThesis.pdf
diff --git a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaAnnouncement.tex b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaAnnouncement.tex
index 8d6099a8e4..8431f03384 100644
--- a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaAnnouncement.tex
+++ b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaAnnouncement.tex
@@ -1,4 +1,4 @@
-%% This is file `DEMO-TUDaAnnouncement.tex' version 3.22 (2022/02/08),
+%% This is file `DEMO-TUDaAnnouncement.tex' version 3.23 (2022/03/21),
 %% it is part of
 %% TUDa-CI -- Corporate Design for TU Darmstadt
 %% ----------------------------------------------------------------------------
diff --git a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaBeamer.tex b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaBeamer.tex
index 1d56b54d2e..bdfe7034e2 100644
--- a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaBeamer.tex
+++ b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaBeamer.tex
@@ -1,4 +1,4 @@
-%% This is file `DEMO-TUDaBeamer.tex' version 3.22 (2022/02/08),
+%% This is file `DEMO-TUDaBeamer.tex' version 3.23 (2022/03/21),
 %% it is part of
 %% TUDa-CI -- Corporate Design for TU Darmstadt
 %% ----------------------------------------------------------------------------
diff --git a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaBibliography.bib b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaBibliography.bib
index ac0556c495..321d21b3ad 100644
--- a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaBibliography.bib
+++ b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaBibliography.bib
@@ -1,4 +1,4 @@
-%% This is file `DEMO-TUDaBibliography.bib' version 3.22 (2022/02/08),
+%% This is file `DEMO-TUDaBibliography.bib' version 3.23 (2022/03/21),
 %% it is part of
 %% TUDa-CI -- Corporate Design for TU Darmstadt
 %% ----------------------------------------------------------------------------
diff --git a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaExercise.tex b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaExercise.tex
index c3594ae9a5..5ef68d1882 100644
--- a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaExercise.tex
+++ b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaExercise.tex
@@ -1,4 +1,4 @@
-%% This is file `DEMO-TUDaExercise.tex' version 3.22 (2022/02/08),
+%% This is file `DEMO-TUDaExercise.tex' version 3.23 (2022/03/21),
 %% it is part of
 %% TUDa-CI -- Corporate Design for TU Darmstadt
 %% ----------------------------------------------------------------------------
diff --git a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaFromaddress.lco b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaFromaddress.lco
index b33846a80c..8942513a16 100644
--- a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaFromaddress.lco
+++ b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaFromaddress.lco
@@ -1,4 +1,4 @@
-%% This is file `DEMO-TUDaFromaddress.lco' version 3.22 (2022/02/08),
+%% This is file `DEMO-TUDaFromaddress.lco' version 3.23 (2022/03/21),
 %% it is part of
 %% TUDa-CI -- Corporate Design for TU Darmstadt
 %% ----------------------------------------------------------------------------
diff --git a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaLeaflet.tex b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaLeaflet.tex
index f255073c1a..c64a7414ae 100644
--- a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaLeaflet.tex
+++ b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaLeaflet.tex
@@ -1,4 +1,4 @@
-%% This is file `DEMO-TUDaLeaflet.tex' version 3.22 (2022/02/08),
+%% This is file `DEMO-TUDaLeaflet.tex' version 3.23 (2022/03/21),
 %% it is part of
 %% TUDa-CI -- Corporate Design for TU Darmstadt
 %% ----------------------------------------------------------------------------
diff --git a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaLetter.tex b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaLetter.tex
index fa3364b432..cdac4bd86e 100644
--- a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaLetter.tex
+++ b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaLetter.tex
@@ -1,4 +1,4 @@
-%% This is file `DEMO-TUDaLetter.tex' version 3.22 (2022/02/08),
+%% This is file `DEMO-TUDaLetter.tex' version 3.23 (2022/03/21),
 %% it is part of
 %% TUDa-CI -- Corporate Design for TU Darmstadt
 %% ----------------------------------------------------------------------------
diff --git a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaPhD.tex b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaPhD.tex
index 930de05d14..32396f562a 100644
--- a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaPhD.tex
+++ b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaPhD.tex
@@ -1,4 +1,4 @@
-%% This is file `DEMO-TUDaPhD.tex' version 3.22 (2022/02/08),
+%% This is file `DEMO-TUDaPhD.tex' version 3.23 (2022/03/21),
 %% it is part of
 %% TUDa-CI -- Corporate Design for TU Darmstadt
 %% ----------------------------------------------------------------------------
diff --git a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaPoster.tex b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaPoster.tex
index 2896021e47..a42cd97def 100644
--- a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaPoster.tex
+++ b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaPoster.tex
@@ -1,4 +1,4 @@
-%% This is file `DEMO-TUDaPoster.tex' version 3.22 (2022/02/08),
+%% This is file `DEMO-TUDaPoster.tex' version 3.23 (2022/03/21),
 %% it is part of
 %% TUDa-CI -- Corporate Design for TU Darmstadt
 %% ----------------------------------------------------------------------------
diff --git a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaPub.tex b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaPub.tex
index 780eea093c..d912b35dc4 100644
--- a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaPub.tex
+++ b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaPub.tex
@@ -1,4 +1,4 @@
-%% This is file `DEMO-TUDaPub.tex' version 3.22 (2022/02/08),
+%% This is file `DEMO-TUDaPub.tex' version 3.23 (2022/03/21),
 %% it is part of
 %% TUDa-CI -- Corporate Design for TU Darmstadt
 %% ----------------------------------------------------------------------------
diff --git a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaReport.tex b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaReport.tex
index 7b7b2eddf2..61482496d0 100644
--- a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaReport.tex
+++ b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaReport.tex
@@ -1,4 +1,4 @@
-%% This is file `DEMO-TUDaReport.tex' version 3.22 (2022/02/08),
+%% This is file `DEMO-TUDaReport.tex' version 3.23 (2022/03/21),
 %% it is part of
 %% TUDa-CI -- Corporate Design for TU Darmstadt
 %% ----------------------------------------------------------------------------
diff --git a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaSciPoster.tex b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaSciPoster.tex
index ffeaf6ca5d..8822228bfd 100644
--- a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaSciPoster.tex
+++ b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaSciPoster.tex
@@ -1,4 +1,4 @@
-%% This is file `DEMO-TUDaSciPoster.tex' version 3.22 (2022/02/08),
+%% This is file `DEMO-TUDaSciPoster.tex' version 3.23 (2022/03/21),
 %% it is part of
 %% TUDa-CI -- Corporate Design for TU Darmstadt
 %% ----------------------------------------------------------------------------
diff --git a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaThesis.tex b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaThesis.tex
index 71ddb999fc..8ac908715f 100644
--- a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaThesis.tex
+++ b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaThesis.tex
@@ -1,4 +1,4 @@
-%% This is file `DEMO-TUDaThesis.tex' version 3.22 (2022/02/08),
+%% This is file `DEMO-TUDaThesis.tex' version 3.23 (2022/03/21),
 %% it is part of
 %% TUDa-CI -- Corporate Design for TU Darmstadt
 %% ----------------------------------------------------------------------------
diff --git a/macros/latex/contrib/tuda-ci/tex/beamercolorthemeTUDa.sty b/macros/latex/contrib/tuda-ci/tex/beamercolorthemeTUDa.sty
index f23e844b43..0955997a9f 100644
--- a/macros/latex/contrib/tuda-ci/tex/beamercolorthemeTUDa.sty
+++ b/macros/latex/contrib/tuda-ci/tex/beamercolorthemeTUDa.sty
@@ -1,4 +1,4 @@
-%% This is file `beamercolorthemeTUDa.sty' version 3.22 (2022/02/08),
+%% This is file `beamercolorthemeTUDa.sty' version 3.23 (2022/03/21),
 %% it is part of
 %% TUDa-CI -- Corporate Design for TU Darmstadt
 %% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
 %%
 %% ============================================================================
 %%
-\def\fileversion{3.22}
-\def\filedate{2022/02/08}
+\def\fileversion{3.23}
+\def\filedate{2022/03/21}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{beamercolorthemeTUDa}
 [\filedate\space\fileversion]
diff --git a/macros/latex/contrib/tuda-ci/tex/beamerfontthemeTUDa.sty b/macros/latex/contrib/tuda-ci/tex/beamerfontthemeTUDa.sty
index 588af107b4..8891e07422 100644
--- a/macros/latex/contrib/tuda-ci/tex/beamerfontthemeTUDa.sty
+++ b/macros/latex/contrib/tuda-ci/tex/beamerfontthemeTUDa.sty
@@ -1,4 +1,4 @@
-%% This is file `beamerfontthemeTUDa.sty' version 3.22 (2022/02/08),
+%% This is file `beamerfontthemeTUDa.sty' version 3.23 (2022/03/21),
 %% it is part of
 %% TUDa-CI -- Corporate Design for TU Darmstadt
 %% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
 %%
 %% ============================================================================
 %%
-\def\fileversion{3.22}
-\def\filedate{2022/02/08}
+\def\fileversion{3.23}
+\def\filedate{2022/03/21}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{beamerfontthemeTUDa}
  [\filedate\space\fileversion]
diff --git a/macros/latex/contrib/tuda-ci/tex/beamerinnerthemeTUDa.sty b/macros/latex/contrib/tuda-ci/tex/beamerinnerthemeTUDa.sty
index 954ca53a2d..6b2ee5998b 100644
--- a/macros/latex/contrib/tuda-ci/tex/beamerinnerthemeTUDa.sty
+++ b/macros/latex/contrib/tuda-ci/tex/beamerinnerthemeTUDa.sty
@@ -1,4 +1,4 @@
-%% This is file `beamerinnerthemeTUDa.sty' version 3.22 (2022/02/08),
+%% This is file `beamerinnerthemeTUDa.sty' version 3.23 (2022/03/21),
 %% it is part of
 %% TUDa-CI -- Corporate Design for TU Darmstadt
 %% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
 %%
 %% ============================================================================
 %%
-\def\fileversion{3.22}
-\def\filedate{2022/02/08}
+\def\fileversion{3.23}
+\def\filedate{2022/03/21}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesExplPackage{beamerinnerthemeTUDa}{\filedate}{\fileversion}{Inner~beamer~theme~of~tuda-ci}
 
diff --git a/macros/latex/contrib/tuda-ci/tex/beamerouterthemeTUDa.sty b/macros/latex/contrib/tuda-ci/tex/beamerouterthemeTUDa.sty
index 68803aedbd..7442ad0d8e 100644
--- a/macros/latex/contrib/tuda-ci/tex/beamerouterthemeTUDa.sty
+++ b/macros/latex/contrib/tuda-ci/tex/beamerouterthemeTUDa.sty
@@ -1,4 +1,4 @@
-%% This is file `beamerouterthemeTUDa.sty' version 3.22 (2022/02/08),
+%% This is file `beamerouterthemeTUDa.sty' version 3.23 (2022/03/21),
 %% it is part of
 %% TUDa-CI -- Corporate Design for TU Darmstadt
 %% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
 %%
 %% ============================================================================
 %%
-\def\fileversion{3.22}
-\def\filedate{2022/02/08}
+\def\fileversion{3.23}
+\def\filedate{2022/03/21}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesExplPackage{beamerouterthemeTUDa}{\filedate}{\fileversion}{Outer~beamer~theme~of~tuda-ci}
 
diff --git a/macros/latex/contrib/tuda-ci/tex/beamerthemeTUDa-mecheng.sty b/macros/latex/contrib/tuda-ci/tex/beamerthemeTUDa-mecheng.sty
index c98405a463..a821a4a674 100644
--- a/macros/latex/contrib/tuda-ci/tex/beamerthemeTUDa-mecheng.sty
+++ b/macros/latex/contrib/tuda-ci/tex/beamerthemeTUDa-mecheng.sty
@@ -1,4 +1,4 @@
-%% This is file `beamerthemeTUDa-mecheng.sty' version 3.22 (2022/02/08),
+%% This is file `beamerthemeTUDa-mecheng.sty' version 3.23 (2022/03/21),
 %% it is part of
 %% TUDa-CI -- Corporate Design for TU Darmstadt
 %% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
 %%
 %% ============================================================================
 %%
-\def\fileversion{3.22}
-\def\filedate{2022/02/08}
+\def\fileversion{3.23}
+\def\filedate{2022/03/21}
 \RequirePackage{expl3}
 \ProvidesExplPackage{beamerthemeTUDa-mecheng}{\filedate}{\fileversion}{specific tudabeamer configuration for the department of mechanical engineering}
 
diff --git a/macros/latex/contrib/tuda-ci/tex/beamerthemeTUDa.sty b/macros/latex/contrib/tuda-ci/tex/beamerthemeTUDa.sty
index 61b3c69300..acee328ae3 100644
--- a/macros/latex/contrib/tuda-ci/tex/beamerthemeTUDa.sty
+++ b/macros/latex/contrib/tuda-ci/tex/beamerthemeTUDa.sty
@@ -1,4 +1,4 @@
-%% This is file `beamerthemeTUDa.sty' version 3.22 (2022/02/08),
+%% This is file `beamerthemeTUDa.sty' version 3.23 (2022/03/21),
 %% it is part of
 %% TUDa-CI -- Corporate Design for TU Darmstadt
 %% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
 %%
 %% ============================================================================
 %%
-\def\fileversion{3.22}
-\def\filedate{2022/02/08}
+\def\fileversion{3.23}
+\def\filedate{2022/03/21}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{beamerthemeTUDa}
  [\filedate\space\fileversion\space beamer theme using the Corporate Design of TU Darmstadt]
diff --git a/macros/latex/contrib/tuda-ci/tex/tuda-a0paper.clo b/macros/latex/contrib/tuda-ci/tex/tuda-a0paper.clo
index 4f9521020a..ed56d10672 100644
--- a/macros/latex/contrib/tuda-ci/tex/tuda-a0paper.clo
+++ b/macros/latex/contrib/tuda-ci/tex/tuda-a0paper.clo
@@ -1,4 +1,4 @@
-%% This is file `tuda-a0paper.clo' version 3.22 (2022/02/08),
+%% This is file `tuda-a0paper.clo' version 3.23 (2022/03/21),
 %% it is part of
 %% TUDa-CI -- Corporate Design for TU Darmstadt
 %% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
 %%
 %% ============================================================================
 %%
-\def\fileversion{3.22}
-\def\filedate{2022/02/08}
+\def\fileversion{3.23}
+\def\filedate{2022/03/21}
 \ProvidesExplFile{tuda-a0paper.clo}{\filedate}{\fileversion}{tuda-ci~size~adjustments~for~a0paper}
 \cs_set:Nn \ptxcd_setup_title_sizes: {
   \cs_set:Nn \ptxcd_title_fontsize: {{125pt}{165pt}}
diff --git a/macros/latex/contrib/tuda-ci/tex/tuda-a1paper.clo b/macros/latex/contrib/tuda-ci/tex/tuda-a1paper.clo
index 50bc5222a6..f3f7081f10 100644
--- a/macros/latex/contrib/tuda-ci/tex/tuda-a1paper.clo
+++ b/macros/latex/contrib/tuda-ci/tex/tuda-a1paper.clo
@@ -1,4 +1,4 @@
-%% This is file `tuda-a1paper.clo' version 3.22 (2022/02/08),
+%% This is file `tuda-a1paper.clo' version 3.23 (2022/03/21),
 %% it is part of
 %% TUDa-CI -- Corporate Design for TU Darmstadt
 %% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
 %%
 %% ============================================================================
 %%
-\def\fileversion{3.22}
-\def\filedate{2022/02/08}
+\def\fileversion{3.23}
+\def\filedate{2022/03/21}
 \ProvidesExplFile{tuda-a1paper.clo}{\filedate}{\fileversion}{tuda-ci~size~adjustments~for~a1paper}
 \cs_set:Nn \ptxcd_setup_title_sizes: {
   \cs_set:Nn \ptxcd_title_fontsize: {{86pt}{120pt}}
diff --git a/macros/latex/contrib/tuda-ci/tex/tuda-a2paper.clo b/macros/latex/contrib/tuda-ci/tex/tuda-a2paper.clo
index a47bda8675..7ab26bbcfd 100644
--- a/macros/latex/contrib/tuda-ci/tex/tuda-a2paper.clo
+++ b/macros/latex/contrib/tuda-ci/tex/tuda-a2paper.clo
@@ -1,4 +1,4 @@
-%% This is file `tuda-a2paper.clo' version 3.22 (2022/02/08),
+%% This is file `tuda-a2paper.clo' version 3.23 (2022/03/21),
 %% it is part of
 %% TUDa-CI -- Corporate Design for TU Darmstadt
 %% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
 %%
 %% ============================================================================
 %%
-\def\fileversion{3.22}
-\def\filedate{2022/02/08}
+\def\fileversion{3.23}
+\def\filedate{2022/03/21}
 \ProvidesExplFile{tuda-a2paper.clo}{\filedate}{\fileversion}{tuda-ci~size~adjustments~for~a0paper}
 \cs_set:Nn \ptxcd_setup_title_sizes: {
 		\cs_set:Nn \ptxcd_title_fontsize: {{65pt}{82pt}}
diff --git a/macros/latex/contrib/tuda-ci/tex/tuda-a3paper.clo b/macros/latex/contrib/tuda-ci/tex/tuda-a3paper.clo
index 00fd6ae6cb..675da89209 100644
--- a/macros/latex/contrib/tuda-ci/tex/tuda-a3paper.clo
+++ b/macros/latex/contrib/tuda-ci/tex/tuda-a3paper.clo
@@ -1,4 +1,4 @@
-%% This is file `tuda-a3paper.clo' version 3.22 (2022/02/08),
+%% This is file `tuda-a3paper.clo' version 3.23 (2022/03/21),
 %% it is part of
 %% TUDa-CI -- Corporate Design for TU Darmstadt
 %% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
 %%
 %% ============================================================================
 %%
-\def\fileversion{3.22}
-\def\filedate{2022/02/08}
+\def\fileversion{3.23}
+\def\filedate{2022/03/21}
 \ProvidesExplFile{tuda-a3paper.clo}{\filedate}{\fileversion}{tuda-ci~size~adjustments~for~a3paper}
 \cs_set:Nn \ptxcd_setup_title_sizes: {
   \cs_set:Nn \ptxcd_title_fontsize: {{47pt}{61pt}}
diff --git a/macros/latex/contrib/tuda-ci/tex/tuda-a4paper.clo b/macros/latex/contrib/tuda-ci/tex/tuda-a4paper.clo
index 794bce564f..77e3699934 100644
--- a/macros/latex/contrib/tuda-ci/tex/tuda-a4paper.clo
+++ b/macros/latex/contrib/tuda-ci/tex/tuda-a4paper.clo
@@ -1,4 +1,4 @@
-%% This is file `tuda-a4paper.clo' version 3.22 (2022/02/08),
+%% This is file `tuda-a4paper.clo' version 3.23 (2022/03/21),
 %% it is part of
 %% TUDa-CI -- Corporate Design for TU Darmstadt
 %% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
 %%
 %% ============================================================================
 %%
-\def\fileversion{3.22}
-\def\filedate{2022/02/08}
+\def\fileversion{3.23}
+\def\filedate{2022/03/21}
 \ProvidesExplFile{tuda-a4paper.clo}{\filedate}{\fileversion}{tuda-ci~size~adjustments~for~a4paper}
 \cs_set:Nn \ptxcd_setup_title_sizes: {
   \cs_set:Nn \ptxcd_title_fontsize: {{36pt}{47pt}}
diff --git a/macros/latex/contrib/tuda-ci/tex/tuda-a5paper.clo b/macros/latex/contrib/tuda-ci/tex/tuda-a5paper.clo
index 08cba2a638..46289ed392 100644
--- a/macros/latex/contrib/tuda-ci/tex/tuda-a5paper.clo
+++ b/macros/latex/contrib/tuda-ci/tex/tuda-a5paper.clo
@@ -1,4 +1,4 @@
-%% This is file `tuda-a5paper.clo' version 3.22 (2022/02/08),
+%% This is file `tuda-a5paper.clo' version 3.23 (2022/03/21),
 %% it is part of
 %% TUDa-CI -- Corporate Design for TU Darmstadt
 %% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
 %%
 %% ============================================================================
 %%
-\def\fileversion{3.22}
-\def\filedate{2022/02/08}
+\def\fileversion{3.23}
+\def\filedate{2022/03/21}
 \ProvidesExplFile{tuda-a5paper.clo}{\filedate}{\fileversion}{tuda-ci~size~adjustments~for~a5paper}
 \cs_set:Nn \ptxcd_setup_title_sizes: {
   \cs_set:Nn \ptxcd_title_fontsize: {{22pt}{28pt}}
diff --git a/macros/latex/contrib/tuda-ci/tex/tuda-pgfplots.sty b/macros/latex/contrib/tuda-ci/tex/tuda-pgfplots.sty
index ac22d86747..b954d5b53e 100644
--- a/macros/latex/contrib/tuda-ci/tex/tuda-pgfplots.sty
+++ b/macros/latex/contrib/tuda-ci/tex/tuda-pgfplots.sty
@@ -1,4 +1,4 @@
-%% This is file `tuda-pgfplots.sty' version 3.22 (2022/02/08),
+%% This is file `tuda-pgfplots.sty' version 3.23 (2022/03/21),
 %% it is part of
 %% TUDa-CI -- Corporate Design for TU Darmstadt
 %% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
 %%
 %% ============================================================================
 %%
-\def\fileversion{3.22}
-\def\filedate{2022/02/08}
+\def\fileversion{3.23}
+\def\filedate{2022/03/21}
 % Special thanks to: Sebastian Schöps Institut Theorie Elektromagnetischer Felder (TEMF), TU Darmstadt
 % The original version of this file has been inspired by the colorscheme in the Metropolis beamer theme by Matthias Vogelgesang https://github.com/matze/mtheme
 \ProvidesPackage{tuda-pgfplots}[\filedate\space\fileversion\space tuda-ci pgfplots color schemes]
diff --git a/macros/latex/contrib/tuda-ci/tex/tudabeamer.cls b/macros/latex/contrib/tuda-ci/tex/tudabeamer.cls
index b1b858ce59..12c1d7def0 100644
--- a/macros/latex/contrib/tuda-ci/tex/tudabeamer.cls
+++ b/macros/latex/contrib/tuda-ci/tex/tudabeamer.cls
@@ -1,4 +1,4 @@
-%% This is file `tudabeamer.cls' version 3.22 (2022/02/08),
+%% This is file `tudabeamer.cls' version 3.23 (2022/03/21),
 %% it is part of
 %% TUDa-CI -- Corporate Design for TU Darmstadt
 %% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
 %%
 %% ============================================================================
 %%
-\def\fileversion{3.22}
-\def\filedate{2022/02/08}
+\def\fileversion{3.23}
+\def\filedate{2022/03/21}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesClass{tudabeamer}
  [\filedate\space\fileversion\space]
diff --git a/macros/latex/contrib/tuda-ci/tex/tudacolors.def b/macros/latex/contrib/tuda-ci/tex/tudacolors.def
index 9db7347dd0..393b44ccf8 100644
--- a/macros/latex/contrib/tuda-ci/tex/tudacolors.def
+++ b/macros/latex/contrib/tuda-ci/tex/tudacolors.def
@@ -1,4 +1,4 @@
-%% This is file `tudacolors.def' version 3.22 (2022/02/08),
+%% This is file `tudacolors.def' version 3.23 (2022/03/21),
 %% it is part of
 %% TUDa-CI -- Corporate Design for TU Darmstadt
 %% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
 %%
 %% ============================================================================
 %%
-\def\fileversion{3.22}
-\def\filedate{2022/02/08}
+\def\fileversion{3.23}
+\def\filedate{2022/03/21}
 \ProvidesFile{tudacolors.def}
 [\filedate\space\fileversion\space Color definitions for tuda-ci]
 
diff --git a/macros/latex/contrib/tuda-ci/tex/tudacolors.sty b/macros/latex/contrib/tuda-ci/tex/tudacolors.sty
index 5b403ddd64..a73b166161 100644
--- a/macros/latex/contrib/tuda-ci/tex/tudacolors.sty
+++ b/macros/latex/contrib/tuda-ci/tex/tudacolors.sty
@@ -1,4 +1,4 @@
-%% This is file `tudacolors.sty' version 3.22 (2022/02/08),
+%% This is file `tudacolors.sty' version 3.23 (2022/03/21),
 %% it is part of
 %% TUDa-CI -- Corporate Design for TU Darmstadt
 %% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
 %%
 %% ============================================================================
 %%
-\def\fileversion{3.22}
-\def\filedate{2022/02/08}
+\def\fileversion{3.23}
+\def\filedate{2022/03/21}
 \NeedsTeXFormat{LaTeX2e}
 \RequirePackage{expl3}
 \ProvidesExplPackage{tudacolors}{\filedate}{\fileversion}{Color definition for TU Darmstadt's tuda-ci bundle}
diff --git a/macros/latex/contrib/tuda-ci/tex/tudaexercise.cls b/macros/latex/contrib/tuda-ci/tex/tudaexercise.cls
index b1f3a217c9..e2ca89b016 100644
--- a/macros/latex/contrib/tuda-ci/tex/tudaexercise.cls
+++ b/macros/latex/contrib/tuda-ci/tex/tudaexercise.cls
@@ -1,4 +1,4 @@
-%% This is file `tudaexercise.cls' version 3.22 (2022/02/08),
+%% This is file `tudaexercise.cls' version 3.23 (2022/03/21),
 %% it is part of
 %% TUDa-CI -- Corporate Design for TU Darmstadt
 %% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
 %%
 %% ============================================================================
 %%
-\def\fileversion{3.22}
-\def\filedate{2022/02/08}
+\def\fileversion{3.23}
+\def\filedate{2022/03/21}
 \NeedsTeXFormat{LaTeX2e}
 \RequirePackage{expl3}
 \ProvidesExplClass{tudaexercise}
diff --git a/macros/latex/contrib/tuda-ci/tex/tudafonts.sty b/macros/latex/contrib/tuda-ci/tex/tudafonts.sty
index 57a2eb6e09..dd4c39d650 100644
--- a/macros/latex/contrib/tuda-ci/tex/tudafonts.sty
+++ b/macros/latex/contrib/tuda-ci/tex/tudafonts.sty
@@ -1,4 +1,4 @@
-%% This is file `tudafonts.sty' version 3.22 (2022/02/08),
+%% This is file `tudafonts.sty' version 3.23 (2022/03/21),
 %% it is part of
 %% TUDa-CI -- Corporate Design for TU Darmstadt
 %% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
 %%
 %% ============================================================================
 %%
-\def\fileversion{3.22}
-\def\filedate{2022/02/08}
+\def\fileversion{3.23}
+\def\filedate{2022/03/21}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{tudafonts}
  [\filedate\space\fileversion\space
diff --git a/macros/latex/contrib/tuda-ci/tex/tudaleaflet.cls b/macros/latex/contrib/tuda-ci/tex/tudaleaflet.cls
index 396b281fd0..7c520dee40 100644
--- a/macros/latex/contrib/tuda-ci/tex/tudaleaflet.cls
+++ b/macros/latex/contrib/tuda-ci/tex/tudaleaflet.cls
@@ -1,4 +1,4 @@
-%% This is file `tudaleaflet.cls' version 3.22 (2022/02/08),
+%% This is file `tudaleaflet.cls' version 3.23 (2022/03/21),
 %% it is part of
 %% TUDa-CI -- Corporate Design for TU Darmstadt
 %% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
 %%
 %% ============================================================================
 %%
-\def\fileversion{3.22}
-\def\filedate{2022/02/08}
+\def\fileversion{3.23}
+\def\filedate{2022/03/21}
 \NeedsTeXFormat{LaTeX2e}
 \RequirePackage{expl3}
 \ProvidesExplPackage{tudaleaflet}{\filedate}{\fileversion}{Leaflets using the Corporate Design of TU Darmstadt}
diff --git a/macros/latex/contrib/tuda-ci/tex/tudaletter.cls b/macros/latex/contrib/tuda-ci/tex/tudaletter.cls
index e7878738d3..454112720b 100644
--- a/macros/latex/contrib/tuda-ci/tex/tudaletter.cls
+++ b/macros/latex/contrib/tuda-ci/tex/tudaletter.cls
@@ -1,4 +1,4 @@
-%% This is file `tudaletter.cls' version 3.22 (2022/02/08),
+%% This is file `tudaletter.cls' version 3.23 (2022/03/21),
 %% it is part of
 %% TUDa-CI -- Corporate Design for TU Darmstadt
 %% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
 %%
 %% ============================================================================
 %%
-\def\fileversion{3.22}
-\def\filedate{2022/02/08}
+\def\fileversion{3.23}
+\def\filedate{2022/03/21}
 \NeedsTeXFormat{LaTeX2e}
 \RequirePackage{expl3}
 \ProvidesExplClass{tudaletter}
diff --git a/macros/latex/contrib/tuda-ci/tex/tudalettersize10pt.clo b/macros/latex/contrib/tuda-ci/tex/tudalettersize10pt.clo
index 46e1e5f7e5..8509583501 100644
--- a/macros/latex/contrib/tuda-ci/tex/tudalettersize10pt.clo
+++ b/macros/latex/contrib/tuda-ci/tex/tudalettersize10pt.clo
@@ -1,4 +1,4 @@
-%% This is file `tudalettersize10pt.clo' version 3.22 (2022/02/08),
+%% This is file `tudalettersize10pt.clo' version 3.23 (2022/03/21),
 %% it is part of
 %% TUDa-CI -- Corporate Design for TU Darmstadt
 %% ----------------------------------------------------------------------------
diff --git a/macros/latex/contrib/tuda-ci/tex/tudamecheng.cfg b/macros/latex/contrib/tuda-ci/tex/tudamecheng.cfg
index c5f9f3bf92..9803673f18 100644
--- a/macros/latex/contrib/tuda-ci/tex/tudamecheng.cfg
+++ b/macros/latex/contrib/tuda-ci/tex/tudamecheng.cfg
@@ -1,4 +1,4 @@
-%% This is file `tudamecheng.cfg' version 3.22 (2022/02/08),
+%% This is file `tudamecheng.cfg' version 3.23 (2022/03/21),
 %% it is part of
 %% TUDa-CI -- Corporate Design for TU Darmstadt
 %% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
 %%
 %% ============================================================================
 %%
-\def\fileversion{3.22}
-\def\filedate{2022/02/08}
+\def\fileversion{3.23}
+\def\filedate{2022/03/21}
 \RequirePackage{expl3}
 \ProvidesExplFile{tudamecheng.cfg}
 {\filedate}{\fileversion}{Special Features the department of mechanical engineering of Darmstadt's Corporate Design (tuda-ci)}
diff --git a/macros/latex/contrib/tuda-ci/tex/tudaposter.cls b/macros/latex/contrib/tuda-ci/tex/tudaposter.cls
index 59bbb4588a..ec08c2164a 100644
--- a/macros/latex/contrib/tuda-ci/tex/tudaposter.cls
+++ b/macros/latex/contrib/tuda-ci/tex/tudaposter.cls
@@ -1,4 +1,4 @@
-%% This is file `tudaposter.cls' version 3.22 (2022/02/08),
+%% This is file `tudaposter.cls' version 3.23 (2022/03/21),
 %% it is part of
 %% TUDa-CI -- Corporate Design for TU Darmstadt
 %% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
 %%
 %% ============================================================================
 %%
-\def\fileversion{3.22}
-\def\filedate{2022/02/08}
+\def\fileversion{3.23}
+\def\filedate{2022/03/21}
 \NeedsTeXFormat{LaTeX2e}
 \RequirePackage{expl3}
 \ProvidesExplPackage{tudaposter}{\filedate}{\fileversion}{Poster Layouts for the Corporate Design of TU Darmstadt}
diff --git a/macros/latex/contrib/tuda-ci/tex/tudapub.cls b/macros/latex/contrib/tuda-ci/tex/tudapub.cls
index e6b1870fa8..8d9ca5de98 100644
--- a/macros/latex/contrib/tuda-ci/tex/tudapub.cls
+++ b/macros/latex/contrib/tuda-ci/tex/tudapub.cls
@@ -1,4 +1,4 @@
-%% This is file `tudapub.cls' version 3.22 (2022/02/08),
+%% This is file `tudapub.cls' version 3.23 (2022/03/21),
 %% it is part of
 %% TUDa-CI -- Corporate Design for TU Darmstadt
 %% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
 %%
 %% ============================================================================
 %%
-\def\fileversion{3.22}
-\def\filedate{2022/02/08}
+\def\fileversion{3.23}
+\def\filedate{2022/03/21}
 \NeedsTeXFormat{LaTeX2e}
 \RequirePackage{expl3}
 \ProvidesExplClass{tudapub}
@@ -691,8 +691,7 @@
 
 
 \newkomafont{institution}{\sffamily}
-\newkomafont{titleinfo}{\sffamily}
-\newkomafont{reviewer}{\ptxcd@sffamily@lining}
+\newkomafont{titleinfo}{\ptxcd@sffamily@lining}
 \setkomafont{subtitle}{\bfseries}
 \setkomafont{subject}{}
 \setkomafont{publishers}{}
diff --git a/macros/latex/contrib/tuda-ci/tex/tudarules.sty b/macros/latex/contrib/tuda-ci/tex/tudarules.sty
index 303573a89e..722383b394 100644
--- a/macros/latex/contrib/tuda-ci/tex/tudarules.sty
+++ b/macros/latex/contrib/tuda-ci/tex/tudarules.sty
@@ -1,4 +1,4 @@
-%% This is file `tudarules.sty' version 3.22 (2022/02/08),
+%% This is file `tudarules.sty' version 3.23 (2022/03/21),
 %% it is part of
 %% TUDa-CI -- Corporate Design for TU Darmstadt
 %% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
 %%
 %% ============================================================================
 %%
-\def\fileversion{3.22}
-\def\filedate{2022/02/08}
+\def\fileversion{3.23}
+\def\filedate{2022/03/21}
 \NeedsTeXFormat{LaTeX2e}
 \RequirePackage{expl3}
 \ProvidesExplPackage{tudarules}{\filedate}{\fileversion}{Creation of colored bars for tuda-ci bundle}
diff --git a/macros/latex/contrib/tuda-ci/tex/tudasciposter.cls b/macros/latex/contrib/tuda-ci/tex/tudasciposter.cls
index e4c2766c8e..f4bfad84a2 100644
--- a/macros/latex/contrib/tuda-ci/tex/tudasciposter.cls
+++ b/macros/latex/contrib/tuda-ci/tex/tudasciposter.cls
@@ -1,4 +1,4 @@
-%% This is file `tudasciposter.cls' version 3.22 (2022/02/08),
+%% This is file `tudasciposter.cls' version 3.23 (2022/03/21),
 %% it is part of
 %% TUDa-CI -- Corporate Design for TU Darmstadt
 %% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
 %%
 %% ============================================================================
 %%
-\def\fileversion{3.22}
-\def\filedate{2022/02/08}
+\def\fileversion{3.23}
+\def\filedate{2022/03/21}
 \NeedsTeXFormat{LaTeX2e}
 \RequirePackage{expl3}
 \ProvidesExplPackage{tudasciposter}{\filedate}{\fileversion}{Scientific Poster Layout for TU Darmstadt}
diff --git a/macros/latex/contrib/tuda-ci/tex/tudasize9pt.clo b/macros/latex/contrib/tuda-ci/tex/tudasize9pt.clo
index ff10869f4b..ea428520cd 100644
--- a/macros/latex/contrib/tuda-ci/tex/tudasize9pt.clo
+++ b/macros/latex/contrib/tuda-ci/tex/tudasize9pt.clo
@@ -1,4 +1,4 @@
-%% This is file `tudasize9pt.clo' version 3.22 (2022/02/08),
+%% This is file `tudasize9pt.clo' version 3.23 (2022/03/21),
 %% it is part of
 %% TUDa-CI -- Corporate Design for TU Darmstadt
 %% ----------------------------------------------------------------------------
diff --git a/macros/latex/contrib/tuda-ci/tex/tudathesis.cfg b/macros/latex/contrib/tuda-ci/tex/tudathesis.cfg
index 907f344f5a..7d62c46e5b 100644
--- a/macros/latex/contrib/tuda-ci/tex/tudathesis.cfg
+++ b/macros/latex/contrib/tuda-ci/tex/tudathesis.cfg
@@ -1,4 +1,4 @@
-%% This is file `tudathesis.cfg' version 3.22 (2022/02/08),
+%% This is file `tudathesis.cfg' version 3.23 (2022/03/21),
 %% it is part of
 %% TUDa-CI -- Corporate Design for TU Darmstadt
 %% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
 %%
 %% ============================================================================
 %%
-\def\fileversion{3.22}
-\def\filedate{2022/02/08}
+\def\fileversion{3.23}
+\def\filedate{2022/03/21}
 \RequirePackage{expl3}
 \ProvidesExplFile{tudathesis.cfg}
 {\filedate}{\fileversion}{Special Features for publication type 'thesis' using TU Darmstadt's Corporate Design (tuda-ci)}
@@ -242,13 +242,13 @@
 	}
 	\int_zero:N \l_tmpb_int
 	\par\vspace*{\baselineskip}
-	{\usekomafont{reviewer}
+	{
 	\seq_map_inline:Nn \g_ptxcd_reviewer_seq
 		{
-		\int_incr:N \l_tmpb_int
-		\cs_if_exist_use:cF {__ptxcd_reviewname_\int_use:N \l_tmpb_int :}
-			{\int_to_arabic:n {\l_tmpb_int}.~\text_titlecase:n{\ptxcd_reviewname}}
-		:~\exp_not:n {##1}\\
+			\int_incr:N \l_tmpb_int
+			\cs_if_exist_use:cF {__ptxcd_reviewname_\int_use:N \l_tmpb_int :}
+				{\int_to_arabic:n {\l_tmpb_int}.~\text_titlecase:n{\ptxcd_reviewname}}
+			:~\exp_not:n {##1}\\
 		}
 	}
 }
@@ -383,6 +383,7 @@
 }
 
 \uppertitleback{
+	\liningnums
 	\raggedright
 	\@title\par\@subtitle
 	\par\vspace*{\baselineskip}
diff --git a/macros/luatex/generic/lua-widow-control/README.md b/macros/luatex/generic/lua-widow-control/README.md
index e6e9ce0b29..b147c83768 100644
--- a/macros/luatex/generic/lua-widow-control/README.md
+++ b/macros/luatex/generic/lua-widow-control/README.md
@@ -48,4 +48,4 @@ Lua-widow-control is licensed under the [_Mozilla Public License_, version 2.0](
 Please note that a compiled document is absolutely **not** considered to be an "Executable Form" as defined by the MPL. The use of lua-widow-control in a document does not place **any** obligations on the document's author or distributors. The MPL and CC-BY-SA licenses **only** apply to you if you distribute the lua-widow-control source code or documentation.
 
 ---
-_v2.0.1 (2022-03-18)_ <!--%%version %%dashdate-->
+_v2.0.2 (2022-03-20)_ <!--%%version %%dashdate-->
diff --git a/macros/luatex/generic/lua-widow-control/lua-widow-control.lua b/macros/luatex/generic/lua-widow-control/lua-widow-control.lua
index be9cab16cb..a6fd0bdc2a 100644
--- a/macros/luatex/generic/lua-widow-control/lua-widow-control.lua
+++ b/macros/luatex/generic/lua-widow-control/lua-widow-control.lua
@@ -107,8 +107,8 @@ elseif plain or latex or optex then
         debug_print("Plain/LaTeX")
         luatexbase.provides_module {
             name = lwc.name,
-            date = "2022/03/18", --%%slashdate
-            version = "2.0.1", --%%version
+            date = "2022/03/20", --%%slashdate
+            version = "2.0.2", --%%version
             description = [[
 
 This module provides a LuaTeX-based solution to prevent
diff --git a/macros/luatex/generic/lua-widow-control/lua-widow-control.opm b/macros/luatex/generic/lua-widow-control/lua-widow-control.opm
index 8980ca6007..b8870d992b 100644
--- a/macros/luatex/generic/lua-widow-control/lua-widow-control.opm
+++ b/macros/luatex/generic/lua-widow-control/lua-widow-control.opm
@@ -3,7 +3,7 @@
 % SPDX-License-Identifier: MPL-2.0+
 % SPDX-FileCopyrightText: 2022 Max Chernoff
 
-\_codedecl\lwcenable{lua-widow-control <v2.0.1>} %%version
+\_codedecl\lwcenable{lua-widow-control <v2.0.2>} %%version
 
 \_clubpenalty=1
 \_widowpenalty=1
diff --git a/macros/luatex/generic/lua-widow-control/lua-widow-control.pdf b/macros/luatex/generic/lua-widow-control/lua-widow-control.pdf
index 106f106a08..ac383d9618 100644
--- a/macros/luatex/generic/lua-widow-control/lua-widow-control.pdf
+++ b/macros/luatex/generic/lua-widow-control/lua-widow-control.pdf
diff --git a/macros/luatex/generic/lua-widow-control/lua-widow-control.sty b/macros/luatex/generic/lua-widow-control/lua-widow-control.sty
index fc80a58cfb..6124a13b4d 100644
--- a/macros/luatex/generic/lua-widow-control/lua-widow-control.sty
+++ b/macros/luatex/generic/lua-widow-control/lua-widow-control.sty
@@ -13,7 +13,7 @@
 
 \DeclareRelease{}{0000-00-00}{lua-widow-control-2022-02-22.sty}
 \DeclareRelease{v1.1.6}{2022-02-22}{lua-widow-control-2022-02-22.sty}
-\DeclareCurrentRelease{v2.0.1}{2022-03-18} %%version %%dashdate
+\DeclareCurrentRelease{v2.0.2}{2022-03-20} %%version %%dashdate
 
 % If this version of LaTeX doesn't support command hooks, then we load
 % the last v1.1.X version of the package.
@@ -23,8 +23,8 @@
 
 \ProvidesExplPackage
     {lua-widow-control}
-    {2022/03/18} %%slashdate
-    {v2.0.1} %%version
+    {2022/03/20} %%slashdate
+    {v2.0.2} %%version
     {Use Lua to remove widows and orphans}
 
 % Unconditional Package Loads
@@ -93,7 +93,7 @@
 
     brokenpenalty .int_gset:N       = \tex_brokenpenalty:D,
     brokenpenalty .value_required:n = true,
-    brokenpenalty .initial:x        = 1,
+    brokenpenalty .initial:n        = 1,
 
     microtype .bool_gset:N      = \g__lwc_use_microtype_bool,
     microtype .value_required:n = true,
@@ -200,14 +200,29 @@
     strict .meta:n = { emergencystretch = 0pt,
                        max-cost         = 5000,
                        nobreak          = warn,
+                       widowpenalty     = 1,
+                       orphanpenalty    = 1,
+                       brokenpenalty    = 1,
                      },
     strict .value_forbidden:n = true,
 
     default .meta:n = { emergencystretch = 3em,
                         max-cost         = \c_max_int,
                         nobreak          = keep,
+                        widowpenalty     = 1,
+                        orphanpenalty    = 1,
+                        brokenpenalty    = 1,
                       },
     default .value_forbidden:n = true,
+
+    balanced .meta:n = { emergencystretch = 1em,
+                         max-cost         = 10000,
+                         nobreak          = keep,
+                         widowpenalty     = 500,
+                         orphanpenalty    = 500,
+                         brokenpenalty    = 500,
+                      },
+    balanced .value_forbidden:n = true,
 }
 
 % Add the user interface for the keys
diff --git a/macros/luatex/generic/lua-widow-control/lua-widow-control.tex b/macros/luatex/generic/lua-widow-control/lua-widow-control.tex
index 6d4f0722e3..e86c932604 100644
--- a/macros/luatex/generic/lua-widow-control/lua-widow-control.tex
+++ b/macros/luatex/generic/lua-widow-control/lua-widow-control.tex
@@ -3,7 +3,7 @@
 % SPDX-License-Identifier: MPL-2.0+
 % SPDX-FileCopyrightText: 2022 Max Chernoff
 
-\wlog{lua-widow-control v2.0.1} %%version
+\wlog{lua-widow-control v2.0.2} %%version
 
 \ifx\directlua\undefined
     \errmessage{%
diff --git a/macros/luatex/generic/lua-widow-control/lwc-documentation.tex b/macros/luatex/generic/lua-widow-control/lwc-documentation.tex
index 6e9eaacc66..24a58aecd4 100644
--- a/macros/luatex/generic/lua-widow-control/lwc-documentation.tex
+++ b/macros/luatex/generic/lua-widow-control/lwc-documentation.tex
@@ -37,7 +37,7 @@
 \startdocument[
     title=lua-widow-control,
     author=Max Chernoff,
-    version=2.0.1, %%version
+    version=2.0.2, %%version
     github=https://github.com/gucci-on-fleek/lua-widow-control,
     ctan=https://www.ctan.org/pkg/lua-widow-control,
 ]
diff --git a/macros/luatex/generic/lua-widow-control/t-lua-widow-control.mkiv b/macros/luatex/generic/lua-widow-control/t-lua-widow-control.mkiv
index 716e45dcf5..6b294eaa38 100644
--- a/macros/luatex/generic/lua-widow-control/t-lua-widow-control.mkiv
+++ b/macros/luatex/generic/lua-widow-control/t-lua-widow-control.mkiv
@@ -1,10 +1,10 @@
 %D \module
 %D   [     file=t-lua-widow-control,
-%D      version=2.0.1, %%version
+%D      version=2.0.2, %%version
 %D        title=lua-widow-control,
 %D     subtitle=\ConTeXt module for lua-widow-control,
 %D       author=Max Chernoff,
-%D         date=2022-03-18, %%dashdate
+%D         date=2022-03-20, %%dashdate
 %D    copyright=Max Chernoff,
 %D      license=MPL-2.0+,
 %D          url=https://github.com/gucci-on-fleek/lua-widow-control]
diff --git a/macros/luatex/generic/lua-widow-control/t-lua-widow-control.mkxl b/macros/luatex/generic/lua-widow-control/t-lua-widow-control.mkxl
index 716e45dcf5..6b294eaa38 100644
--- a/macros/luatex/generic/lua-widow-control/t-lua-widow-control.mkxl
+++ b/macros/luatex/generic/lua-widow-control/t-lua-widow-control.mkxl
@@ -1,10 +1,10 @@
 %D \module
 %D   [     file=t-lua-widow-control,
-%D      version=2.0.1, %%version
+%D      version=2.0.2, %%version
 %D        title=lua-widow-control,
 %D     subtitle=\ConTeXt module for lua-widow-control,
 %D       author=Max Chernoff,
-%D         date=2022-03-18, %%dashdate
+%D         date=2022-03-20, %%dashdate
 %D    copyright=Max Chernoff,
 %D      license=MPL-2.0+,
 %D          url=https://github.com/gucci-on-fleek/lua-widow-control]
diff --git a/macros/unicodetex/latex/nwafuthesis/README.md b/macros/unicodetex/latex/nwafuthesis/README.md
index d37c15fee0..0d1d0d0a36 100644
--- a/macros/unicodetex/latex/nwafuthesis/README.md
+++ b/macros/unicodetex/latex/nwafuthesis/README.md
@@ -1,7 +1,7 @@
-The nwafuthesis Class
-LaTeX thesis template for Northwest A&F University, China, v1.01
+## The nwafuthesis Class
+LaTeX thesis template for Northwest A&F University, China, v1.10
 
-Overview
+## Overview
 This template supports doctoral or master dissertion and undergraduate thesis in Chinese. With the help of modern LaTeX3 technology, nwafuthesis aims to create a simple interface, a normative format, as well as a hackable class for the users.
 
 At present, nwafuthesis only supports XeTeX and LuaTEX engines. nwafuthesis only allows UTF-8 encoding.
@@ -10,7 +10,7 @@ The documentation can be found in nwafuthesis.pdf (in Chinese).
 
 Gitee repository: https://gitee.com/nwafu_nan/nwafuthesis-l3.
 
-Installation
+## Installation
 To install nwafuthesis, you can use one of the following methods:
 
 If you are running TeX Live or MikTeX, the simplest way is to use that distribution's package manager.
@@ -24,10 +24,10 @@ For permanent installation, you may move the following files into a directory wh
 nwafuthesis.cls
 Do not forget to update the filename database afterwards.
 
-Contributing
+## Contributing
 Issues and pull requests are always welcome.
 
-License
+## License
 This work may be distributed and/or modified under the conditions of the LaTeX Project Public License, either version 1.3c of this license or (at your option) any later version.
 
-Copyright (C) 2017–2021 by Nan Geng <nangeng@nwafu.edu.cn>.
+Copyright (C) 2017–2022 by Nan Geng <nangeng@nwafu.edu.cn>.
diff --git a/macros/unicodetex/latex/nwafuthesis/build-win.bat b/macros/unicodetex/latex/nwafuthesis/build-win.bat
index e8f223950b..e8f223950b 100755..100644
--- a/macros/unicodetex/latex/nwafuthesis/build-win.bat
+++ b/macros/unicodetex/latex/nwafuthesis/build-win.bat
diff --git a/macros/unicodetex/latex/nwafuthesis/nwafuthesis.dtx b/macros/unicodetex/latex/nwafuthesis/nwafuthesis.dtx
index 8acbeab6ce..37bb596074 100644
--- a/macros/unicodetex/latex/nwafuthesis/nwafuthesis.dtx
+++ b/macros/unicodetex/latex/nwafuthesis/nwafuthesis.dtx
@@ -110,7 +110,7 @@
 %<class|doc>\NeedsTeXFormat{LaTeX2e}
 %<class|doc>\RequirePackage{expl3}
 %<*!(driver|install)>
-%<!readme>\GetIdInfo $Id: nwafuthesis.dtx 1.01 2021-08-07 Nan Geng <nangeng@nwafu.edu.cn> $
+%<!readme>\GetIdInfo $Id: nwafuthesis.dtx 1.10 2022-03-17 Nan Geng <nangeng@nwafu.edu.cn> $
 %<class>  {Thesis template for Northwest A\&F University}
 %<class>\ProvidesExplClass{\ExplFileName}
 %<definition>  {Definition file for nwafuthesis}
@@ -143,12 +143,12 @@
   \textbf{\nwafuthesis: 西北农林科技大学学位论文
           \xpinyin[font=\sffamily,format=\color{MaterialIndigo800}]{模}{mu2}板}}}
 \author{耿楠}
-\date{\today\quad v1.01%
+\date{\today\quad v1.10%
   \thanks{\url{https://gitee.com/nwafu_nan/nwafuthesis-l3}.}}
 
 \begin{document}
 %<!--CODEDOC-->  \DisableImplementation
-  \EnableImplementation
+ \EnableImplementation
 %<!--CODEDOC-->  \def\nwafuCODEDOC{}
   \DocInput{nwafuthesis.dtx}
   \DocInput{nwafuthesis-doc.dtx}
@@ -159,6 +159,7 @@
 %</driver>
 % \fi
 %
+% \changes{v1.10}{2022/03/17}{更新实现细节。}
 % \changes{v1.00}{2021/06/06}{开始发布测试。}
 % \changes{v1.00}{2021/05/12}{开始编写模板。}
 %
@@ -245,7 +246,8 @@
 % 建议先阅读相关入门文档，如刘海洋编著的《\LaTeX{} 入门》
 % \scite{刘海洋2013latex入门} 第一章，或大名鼎鼎的“\pkg{lshort}”
 % \scite{lshort} 及其中文翻译版 \scite{lshort-zh-cn}。当然，
-% 网络上诸如耿楠录制的\LaTeX{}教学系列视频等入门教程多如牛毛，可以自行选取学习。
+% 网络上诸如耿楠录制的\LaTeX{}教学系列视频等入门教程多如牛毛，
+% 可以自行选取学习。
 %
 % \subsection*{关于本文档}
 %
@@ -350,7 +352,6 @@
 %     \file{nwafuthesis.cls} & 模板文档类 \\
 %     \file{nwafudoc.cls}    & 编译该用户手册时需要的文档类 \\
 %     \file{nwafuthesis.pdf} & 用户手册 \\
-%     \file{main.tex}        & 空白模板，可以此为基础撰写论文 \\
 %     \bottomrule
 %   \end{tabular}
 % \end{table}
@@ -359,8 +360,10 @@
 %
 % \subsection{基本用法}
 %
-% 在当前工作目录下创建一个名为logo的文件夹，并将学校的\enquote{\texttt{nwafu-bar.pdf}}
-% logo矢量图保存在该文件夹内，然后建立如下一份简单的 \TeX{} 文档，它演示了 \cls{nwafuthesis}
+% 在当前工作目录下创建一个名为logo的文件夹，
+% 并将学校的\enquote{\texttt{nwafu-bar.pdf}}
+% logo矢量图保存在该文件夹内，然后建立如下一份
+% 简单的 \TeX{} 文档，它演示了 \cls{nwafuthesis}
 % 的最基本用法：
 % \begin{latexexample}[deletetexcs={\documentclass},%
 %     moretexcs={\chapter},morekeywords={\documentclass},%
@@ -377,12 +380,11 @@
 % 按照 \ref{subsec:编译方式}~小节中的方式编译该文档，应当得到
 % 一篇包含封面、独创声明等在内的空白论文(研究生7页，本科生3页)。
 %
-%
 % \subsection{编译方式} \label{subsec:编译方式}
 %
 % 本模板不支持 \pdfTeX{} 引擎，请使用 \XeLaTeX{} 或 \LuaLaTeX{}
-% 编译，推荐使用 \XeLaTeX{}编译。为了生成正确的目录、脚注、参考文献以及交叉引用，
-% 至少需要连续编译四次。
+% 编译，推荐使用 \XeLaTeX{}编译。为了生成正确的目录、脚注、参考
+% 文献以及交叉引用，至少需要连续编译4次。
 %
 % 假设\TeX{} 源文件名为 \file{main.tex}，使用 \XeLaTeX{} 编译论文。
 % 则在命令行中可以顺序执行：
@@ -434,7 +436,7 @@
 %     type = (*<doctor|master|(bachelor)>*)
 %   \end{nwafusyntax}
 %   选择论文类型。三种选项分别代表博士学位论文、硕士学位论文和本科
-%   毕业论文。
+%   毕业论文(设计)。
 % \end{function}
 %
 % \begin{function}[added=2021-05-12]{oneside,twoside}
@@ -478,7 +480,7 @@
 %   所有选项均可通过统一的\cs{nwafuset}命令进行设置。
 % \end{function}
 %
-% \cs{nwafuset} 的参数是一组由（英文）逗号隔开的选项列表，列表中的
+% \cs{nwafuset} 的参数是一组由（英文）逗号分隔的选项列表，列表中的
 % 选项通常是 \kvopt{\meta{key}}{\meta{value}} 形式。部分选项的
 % \meta{value} 可以省略。对于同一项，后续设置会覆盖以前的设置。
 % 在下文的说明中，将用\textbf{粗体}表示默认值。
@@ -528,7 +530,7 @@
 %     style = (*\marg{键值列表}*)
 %     style/(*\meta{key}*) = (*\meta{value}*)
 %   \end{nwafusyntax}
-%   该选项包含多个子项目，用于设置字体、字号等论文格式，具体内容见下。
+%   该选项包含多个子项目，用于设置字体、字号等论文格式。
 % \end{function}
 %
 % \begin{function}[added=2021-05-12]{style/font}
@@ -781,9 +783,6 @@
 %
 % \subsubsection{信息录入} \label{subsubsec:信息录入}
 %
-% \emph{这一部分代码基于\cls{fduthesis}，并针对西北农林科技大学的要求，
-% 进行了必要的删除和添加}。
-%
 % \begin{function}[added=2021-05-12]{info}
 %   \begin{nwafusyntax}[emph={[1]info}]
 %     info = (*\marg{键值列表}*)
@@ -1054,6 +1053,18 @@
 %
 % \subsubsection{凤头}
 %
+% \begin{function}[added=2021-05-29]{\frontmatter,\frontmatter*}
+%   \begin{nwafusyntax}[deletetexcs={\frontmatter,\frontmatter*},
+%                       morekeywords={\frontmatter,\frontmatter*}]
+%     \frontmatter(*\oarg{编号格式|(Roman)}*)
+%     \frontmatter*(*\oarg{编号格式|(Roman)}*)
+%   \end{nwafusyntax}
+%   \cs{frontmatter} 为前言区命令，章标题不编号，
+%   默认页码为从I开始计数的大写罗马数字，也可以指定你页码格式
+%   带有星号的命令 \cs{frontmatter*} 不使用清双页命令 \tn{cleardoublepage}。
+%
+% \end{function}
+%
 % 对于研究生学位论文，该部分包含封面(研究生包括封面一$\sim$七，
 % 本科生包括封面一和封面七)、中英文摘要、主要符号对照表和目录。
 % 在前置部分中，中英文摘要开始至主要符号对照表，页码采用大写罗马字母，并且与目录分开计数。
@@ -1077,8 +1088,8 @@
 % \begin{function}[added=2021-05-29]{\mainmatter,\mainmatter*}
 %   \begin{nwafusyntax}[deletetexcs={\mainmatter,\mainmatter*},
 %                       morekeywords={\mainmatter,\mainmatter*}]
-%     \mainmatter(*\oarg{编号格式|(Roman)}*)
-%     \mainmatter*(*\oarg{编号格式|(Roman)}*)
+%     \mainmatter
+%     \mainmatter*
 %   \end{nwafusyntax}
 %   \cs{mainmatter} 为主文区命令，章标题正常编号，
 %   且页码为从1开始计数的阿拉伯数字，
@@ -1425,8 +1436,6 @@
 %       \item \pkg{footmisc}，处理脚注。
 %       \item \pkg{ntheorem}，提供增强版的定理类环境。
 %       \item \pkg{graphicx}，提供图形插入的接口。
-%       \item \pkg{longtable}，长表格（允许跨页）支持。
-%       \item \pkg{booktabs}，三线表支持。
 %       \item \pkg{caption}，用于设置标题。
 %       \item \pkg{bicaption}，用于设置标题。
 %       \item \pkg{xcolor}，提供彩色支持。
@@ -1437,7 +1446,8 @@
 %   \item 开启 \kvopt{style/footnote-style}{pifont} 后，会调用
 %     \pkg{pifont} 宏包。它属于 \pkg{psnfss} 套件。
 %   \item \pkg{biblatex} 宏包需要依赖 \biber{} 程序。参考文献样式由
-%     \pkg{biblatex-gb7714-2015} 宏包提供\scite{biblatex,biblatex-gb7714-2015}。
+%     \pkg{biblatex-gb7714-2015} 宏包提供的\texttt{gb7714-NWAFU}样式
+%     文件控制，请注意将其升级到最新版\scite{biblatex,biblatex-gb7714-2015}。
 % \end{itemize}
 %
 % 这里只列出了本模板直接调用的宏包。这些宏包自身的调用情况，
@@ -1635,7 +1645,7 @@
 % 单独一行代码的归属。这些 guard 的颜色深浅不一，用以明确嵌套关系。
 %
 % 另有若干形如 \textcolor{MaterialPink}{\textsf{<@@=nwafu>}} 的 guard，
-% 它们由 \pkg{l3docstrip} 定义，用来标识名字空间（模块）。
+% 它们用来标识名字空间（模块）。
 %
 % \subsection{准备}
 %
@@ -1646,10 +1656,10 @@
 %
 % 检查 \LaTeX3 编程环境。
 %    \begin{macrocode}
-\RequirePackage { xparse, xtemplate, l3keys2e }
-\clist_map_inline:nn { expl3, xparse, xtemplate, l3keys2e }
+\RequirePackage {xtemplate, l3keys2e }
+\clist_map_inline:nn { xtemplate, l3keys2e }
   {
-    \@ifpackagelater {#1} { 2018/05/12 }
+    \@ifpackagelater {#1} { 2020/07/17 }
       { } { \msg_error:nnn { nwafuthesis } { l3-too-old } {#1} }
   }
 \msg_new:nnn { nwafuthesis } { l3-too-old }
@@ -1677,7 +1687,6 @@
     "#1"~ is~ not~ supported~ at~ present.~ You~ must~ change \\
     your~ typesetting~ engine~ to~ "xelatex"~ or~ "lualatex".
   }
-\hook_gset_rule:nnnn { begindocument/before } { nwafuthesis } { < } { xeCJK }
 %    \end{macrocode}
 %
 % \subsubsection{内部变量声明}
@@ -1735,15 +1744,6 @@
 %    \end{macrocode}
 % \end{variable}
 %
-% \begin{variable}{\l_@@_withchap_bool}
-% 是否按章编写论文(默认按章编写)。
-% 该选项是针对部分学院需要按报告形式(类似"1 绪论")撰写本科毕业论文(设计)
-% 而设置的。
-%    \begin{macrocode}
-\bool_new:N \l_@@_withchap_bool
-%    \end{macrocode}
-% \end{variable}
-%
 % \begin{variable}{\g_@@_twoside_bool}
 % 是否开启双页模式（默认打开）。
 % 本模板中，目前使用双页与单页模式的排版结果是一样的，
@@ -1761,17 +1761,24 @@
 %    \end{macrocode}
 % \end{variable}
 %
+% \begin{variable}{\l_@@_withchap_bool}
+% 是否按章编写论文(默认按章编写)。
+% 该选项是针对部分学院需要按报告形式(类似``1\ 绪论'')的形式
+% 撰写本科毕业论文(设计)而设置的。
+%    \begin{macrocode}
+\bool_new:N \l_@@_withchap_bool
+%    \end{macrocode}
+% \end{variable}
+%
 % \subsubsection{内部函数}
 %
-% \begin{macro}{\cs_generate_variant:cn,
-%   \file_input:V,
+% \begin{macro}{\file_input:V,
 %   \int_to_arabic:v,
 %   \keys_define:nx,
 %   \tl_map_inline:xn}
 % \begin{macro}[TF]{\tl_if_eq:Vn}
 % \LaTeX3{} 函数的函数变体。
 %    \begin{macrocode}
-\cs_generate_variant:Nn \cs_generate_variant:Nn { cn }
 \cs_generate_variant:Nn \file_input:n           { V  }
 \cs_generate_variant:Nn \int_to_arabic:n        { v  }
 \cs_generate_variant:Nn \keys_define:nn         { nx }
@@ -1825,6 +1832,18 @@
 %    \end{macrocode}
 % \end{macro}
 %
+% \changes{v1.10}{2022/03/17}{统一使用 \LaTeX{} 2020/10/01 新钩子机制。}
+%
+% \begin{macro}{\@@_gadd_ltxhook:nn}
+% 封装 \LaTeX{} 的钩子管理机制。本模板中的字体加载命令位于
+% |begindocument/before| 钩子中，需确保在 \pkg{xeCJK} 之前执行。
+%    \begin{macrocode}
+\cs_new_protected:Npn \@@_gadd_ltxhook:nn #1#2
+  { \hook_gput_code:nnn {#1} { . } {#2} }
+\hook_gset_rule:nnnn { begindocument/before } { . } { < } { xeCJK }
+%    \end{macrocode}
+% \end{macro}
+%
 % \begin{macro}{\@@_patch_cmd:Nnn,\@@_preto_cmd:Nn,\@@_appto_cmd:Nn}
 % 补丁工具，来自 \pkg{ctexpatch} 宏包。
 %    \begin{macrocode}
@@ -1899,6 +1918,7 @@
 \cs_new:Npn \@@_error:nn    { \msg_error:nnn    { nwafuthesis } }
 \cs_new:Npn \@@_error:nx    { \msg_error:nnx    { nwafuthesis } }
 \cs_new:Npn \@@_error:nnn   { \msg_error:nnnn   { nwafuthesis } }
+\cs_new:Npn \@@_error:nnnn  { \msg_error:nnnnn  { nwafuthesis } }
 \cs_new:Npn \@@_warning:n   { \msg_warning:nn   { nwafuthesis } }
 \cs_new:Npn \@@_warning:nn  { \msg_warning:nnn  { nwafuthesis } }
 \cs_new:Npn \@@_warning:nxx { \msg_warning:nnxx { nwafuthesis } }
@@ -1940,7 +1960,7 @@
     twoside .code:n =
       {
 %    \end{macrocode}
-% 将双面设置为openany，从结果来讲与单面一样，
+% 将双面设置为openany(我校特例)，从结果来讲与单面一样，
 % 此处是为后续诸如页边距调整为左右不同保留的设置。
 %    \begin{macrocode}
         \clist_gput_right:Nn \g_@@_to_ctexbook_clist { twoside, openany }
@@ -1980,7 +2000,7 @@
 %
 % \subsection{模板参数配置}
 %
-% \subsubsection{定义模板LOGO和中英文年月命令}
+% \subsubsection{定义NWAFU LOGO和中英文年月命令}
 %
 % \begin{macro}{\nwafuthesis}
 % nwafuthesis模板的LOGO。
@@ -1988,7 +2008,8 @@
 \NewDocumentCommand \nwafuthesis { }
   {%
     \makebox{\rmfamily%
-      N\hspace{-0.2ex}\raisebox{-0.5ex}{W}\raisebox{0.5ex}{\hspace{-0.2ex}\textsc{AFU}}\hspace{0.3ex}%
+      N\hspace{-0.2ex}\raisebox{-0.5ex}{W}\raisebox{0.5ex}
+      {\hspace{-0.2ex}\textsc{AFU}}\hspace{0.3ex}%
       \textsc{Thesis}
     }
   }
@@ -2007,18 +2028,18 @@
 % \end{macro}
 %
 % \begin{macro}{\dateen}
-% 取得英文月年，详见：
-% 1  = Jan.(January),
-% 2  = Feb.(February),
-% 3  = Mar.(March),
-% 4  = Apr.(April),
-% 5  = May.(May),
-% 6  = Jun.(June),
-% 7  = Jul.(July),
-% 8  = Aug.(August),
-% 9  = Sept.(September),
-% 10 = Oct.(October),
-% 11 = Nov.(November),
+% 取得英文月年，详见：\\
+% 1  = Jan.(January),\\
+% 2  = Feb.(February),\\
+% 3  = Mar.(March),\\
+% 4  = Apr.(April),\\
+% 5  = May.(May),\\
+% 6  = Jun.(June),\\
+% 7  = Jul.(July),\\
+% 8  = Aug.(August),\\
+% 9  = Sept.(September),\\
+% 10 = Oct.(October),\\
+% 11 = Nov.(November),\\
 % 12 = Dec.(December),
 %    \begin{macrocode}
 \prop_new:N \l_@@_dateen_prop
@@ -2048,7 +2069,7 @@
 % \subsubsection{通用常量}
 %
 % 这一部分内容在原\cls{fduthesis}中，是通过``*.def''文件实现的，
-% 由于针对本校而言这些内容极少发生改变，为了减少文件依赖，将其
+% 由于针对我校而言这些内容极少发生改变，为了减少文件依赖，将其
 % 全部写入了\cls{nwafuthesis.cls}文件。
 %
 % \begin{variable}{\c_@@_name_simp_tl,\c_@@_name_trad_tl,
@@ -2115,40 +2136,46 @@
 % \begin{variable}{\c_@@_orig_decl_text_tl}
 % 论文独创性声明。
 %    \begin{macrocode}
-\int_compare:nNnTF { \g_@@_thesis_type_int } < { 3 }
+\cs_new_protected:Npn \@@_define_orig_decl_text:
   {
+    \int_compare:nNnTF { \g_@@_thesis_type_int } < { 3 }
+      {
 %    \end{macrocode}
-% 研究生独创性声明，注意测试后，此处分段只能用\tn{par}实现。
+% 研究生独创性声明，注意此处分段只能用\tn{par}实现。
 %    \begin{macrocode}
-    \tl_const:Nn \c_@@_orig_decl_text_tl
-      {
-        本人声明:所呈交的学位论文是我个人在导师指导下独立进行的研究工作及取
-        得的研究结果;论文中的研究数据及结果的获得完全符合学校《关于规范西北
-        农林科技大学研究生学术道德的暂行规定》,如果违反此规定,一切后果与法
-        律责任均由本人承担。\par
-        尽我所知,除了文中特别加以标注和致谢的地方外,论文中不包含其他人已经
-        发表或撰写过的研究结果,也不包含其他人和自己本人已获得西北农林科技大
-        学或其它教育机构的学位或证书而使用过的材料。与我一同工作的同事对本
-        研究所做的任何贡献均已在论文的致谢中作了明确的说明并表示了谢意。
+        \tl_const:Nn \c_@@_orig_decl_text_tl
+          {
+            本人声明:所呈交的学位论文是我个人在导师指导下独立进行的研究工作及取
+            得的研究结果;论文中的研究数据及结果的获得完全符合学校《关于规范西北
+            农林科技大学研究生学术道德的暂行规定》,如果违反此规定,一切后果与法
+            律责任均由本人承担。\par
+
+            尽我所知,除了文中特别加以标注和致谢的地方外,论文中不包含其他人已经
+            发表或撰写过的研究结果,也不包含其他人和自己本人已获得西北农林科技大
+            学或其它教育机构的学位或证书而使用过的材料。与我一同工作的同事对本
+            研究所做的任何贡献均已在论文的致谢中作了明确的说明并表示了谢意。
+          }
       }
-  }
-  {
+      {
 %    \end{macrocode}
-% 本科生生独创性声明，注意测试后，此处分段只能用\tn{par}实现。
+% 本科生生独创性声明，注意此处分段只能用\tn{par}实现。
 %    \begin{macrocode}
-    \tl_const:Nn \c_@@_orig_decl_text_tl
-      {
-        本人声明：所呈交的毕业
-        \clist_item:Nn \c__@@_bachelor_type_clist { \l__@@_info_bachelor_type_int }
-        是我个人在导师指导下
-        独立进行的研究工作及取得的研究结果。尽我所知，除了文中特别加
-        以标注和致谢的地方外，论文中不包含其他人已经发表或撰写过的研究结果，
-        也不包含其他人和自己本人已获得\c_@@_name_simp_tl{}或其它教育
-        机构的学位或证书而使用过的材料。与我一同工作的同事对本研究所做
-        的任何贡献均已在论文的致谢中作了明确的说明并表示了谢意。
-        如违反此声明，一切后果与法律责任均由本人承担。
+        \tl_const:Nn \c_@@_orig_decl_text_tl
+          {
+            本人声明：所呈交的毕业
+            \clist_item:Nn \c__@@_bachelor_type_clist
+              { \l__@@_info_bachelor_type_int }
+            是我个人在导师指导下
+            独立进行的研究工作及取得的研究结果。尽我所知，除了文中特别加
+            以标注和致谢的地方外，论文中不包含其他人已经发表或撰写过的研究结果，
+            也不包含其他人和自己本人已获得\c_@@_name_simp_tl{}或其它教育
+            机构的学位或证书而使用过的材料。与我一同工作的同事对本研究所做
+            的任何贡献均已在论文的致谢中作了明确的说明并表示了谢意。
+            如违反此声明，一切后果与法律责任均由本人承担。
+          }
       }
   }
+\@@_define_orig_decl_text:
 %    \end{macrocode}
 % \end{variable}
 %
@@ -2170,56 +2197,62 @@
 % \begin{variable}{\c_@@_auth_decl_text_tl}
 % 论文使用授权声明。
 %    \begin{macrocode}
-\int_compare:nNnTF { \g_@@_thesis_type_int } < { 3 }
+\cs_new_protected:Npn \@@_auth_orig_decl_text:
   {
+    \int_compare:nNnTF { \g_@@_thesis_type_int } < { 3 }
+      {
 %    \end{macrocode}
-% 研究生使用授权声明，注意测试后，此处分段只能用\tn{par}实现。
+% 研究生使用授权声明，注意此处分段只能用\tn{par}实现。
 %    \begin{macrocode}
-    \tl_const:Nn \c_@@_auth_decl_text_tl
-      {
-        本学位论文的知识产权归属西北农林科技大学。本人同意西北农林科技大学
-        保存或向国家有关部门或机构送交论文的纸质版和电子版,允许论文被查阅和
-        借阅;同意西北农林科技大学将本学位论文的全部或部分内容授权汇编录入
-        中国博士/硕士学位论文全文数据库》和《中国学位论文全文数据库》进行
-        出版,并享受相关权益。\par
+        \tl_const:Nn \c_@@_auth_decl_text_tl
+          {
+            本学位论文的知识产权归属西北农林科技大学。本人同意西北农林科技大学
+            保存或向国家有关部门或机构送交论文的纸质版和电子版,允许论文被查阅和
+            借阅;同意西北农林科技大学将本学位论文的全部或部分内容授权汇编录入
+            中国博士/硕士学位论文全文数据库》和《中国学位论文全文数据库》进行
+            出版,并享受相关权益。\par
 
-        本人保证,在毕业离开(或者工作调离)西北农林科技大学后,发表或者使用本
-        学位论文及其相关的工作成果时,将以西北农林科技大学为第一署名单位,否
-        则,愿意按《中华人民共和国著作权法》等有关规定接受处理并承担法律责任。\par
+            本人保证,在毕业离开(或者工作调离)西北农林科技大学后,发表或者使用本
+            学位论文及其相关的工作成果时,将以西北农林科技大学为第一署名单位,否
+            则,愿意按《中华人民共和国著作权法》等有关规定接受处理并承担法律责任。\par
 
-        任何收存和保管本论文各种版本的其他单位和个人(包括研究生本人)未经本
-        论文作者的导师同意,不得有对本论文进行复制、修改、发行、出租、改编等
-        侵犯著作权的行为,否则,按违背《中华人民共和国著作权法》等有关规定处
-        理并追究法律责任。\par
+            任何收存和保管本论文各种版本的其他单位和个人(包括研究生本人)未经本
+            论文作者的导师同意,不得有对本论文进行复制、修改、发行、出租、改编等
+            侵犯著作权的行为,否则,按违背《中华人民共和国著作权法》等有关规定处
+            理并追究法律责任。\par
 
-        {\sffamily (保密的学位论文在保密期限内，不得以任何方式发表、借阅、复印、
-            缩印或扫描复制手段保存、汇编论文)}
+            {\sffamily (保密的学位论文在保密期限内，不得以任何方式发表、借阅、复印、
+                缩印或扫描复制手段保存、汇编论文)}
+          }
       }
-  }
-  {
+      {
 %    \end{macrocode}
-% 本科生使用授权声明，注意测试后，此处分段只能用\tn{par}实现。
+% 本科生使用授权声明，注意此处分段只能用\tn{par}实现。
 %    \begin{macrocode}
-    \tl_const:Nn \c_@@_auth_decl_text_tl
-      {
-        本毕业
-        \clist_item:Nn \c__@@_bachelor_type_clist { \l__@@_info_bachelor_type_int }
-        的知识产权归属\c_@@_name_simp_tl{}。
-        本人同意\c_@@_name_simp_tl{}保存或向国家有关部门或机构
-        送交论文的纸质版和电子版，允许论文被查阅和借阅。\par
+        \tl_const:Nn \c_@@_auth_decl_text_tl
+          {
+            本毕业
+            \clist_item:Nn \c__@@_bachelor_type_clist
+              { \l__@@_info_bachelor_type_int }
+            的知识产权归属\c_@@_name_simp_tl{}。
+            本人同意\c_@@_name_simp_tl{}保存或向国家有关部门或机构
+            送交论文的纸质版和电子版，允许论文被查阅和借阅。\par
 
-        本人保证，在毕业离开\c_@@_name_simp_tl{}后，发表或者使用本毕业
-        \clist_item:Nn \c__@@_bachelor_type_clist { \l__@@_info_bachelor_type_int }
-        及其相关的工作成果时，将以\c_@@_name_simp_tl{}
-        为第一署名单位，否则，愿意按《中华人民共和国著作权法》等
-        有关规定接受处理并承担法律责任。\par
+            本人保证，在毕业离开\c_@@_name_simp_tl{}后，发表或者使用本毕业
+            \clist_item:Nn \c__@@_bachelor_type_clist
+              { \l__@@_info_bachelor_type_int }
+            及其相关的工作成果时，将以\c_@@_name_simp_tl{}
+            为第一署名单位，否则，愿意按《中华人民共和国著作权法》等
+            有关规定接受处理并承担法律责任。\par
 
-        任何收存和保管本论文各种版本的其他单位和个人(包括作者本人)未经
-        本论文作者的导师同意，不得有对本论文进行复制、修改、发行、出租、
-        改编等侵犯著作权的行为，否则，按违背《中华人民共和国著作权法》
-        等有关规定处理并追究法律责任。
+            任何收存和保管本论文各种版本的其他单位和个人(包括作者本人)未经
+            本论文作者的导师同意，不得有对本论文进行复制、修改、发行、出租、
+            改编等侵犯著作权的行为，否则，按违背《中华人民共和国著作权法》
+            等有关规定处理并追究法律责任。
+          }
       }
   }
+\@@_auth_orig_decl_text:
 %    \end{macrocode}
 % \end{variable}
 %
@@ -2227,25 +2260,29 @@
 %   \c_@@_super_decl_sign_tl}
 % 声明页签名项目。
 %    \begin{macrocode}
-\int_compare:nNnTF { \g_@@_thesis_type_int } < { 3 }
+\cs_new_protected:Npn \@@_orig_decl_sign:
   {
+    \int_compare:nNnTF { \g_@@_thesis_type_int } < { 3 }
+      {
 %    \end{macrocode}
 % 研究生。
 %    \begin{macrocode}
-    \tl_const:Nn \c_@@_orig_decl_sign_tl
-      { 研究生签名 }
-    \tl_const:Nn \c_@@_super_decl_sign_tl
-      { 导师签名 }
-  }
-  {
+        \tl_const:Nn \c_@@_orig_decl_sign_tl
+          { 研究生签名 }
+        \tl_const:Nn \c_@@_super_decl_sign_tl
+          { 导师签名 }
+      }
+      {
 %    \end{macrocode}
 % 本科生。
 %    \begin{macrocode}
-    \tl_const:Nn \c_@@_orig_decl_sign_tl
-      { 本科生签名 }
-    \tl_const:Nn \c_@@_super_decl_sign_tl
-      { 指导教师签名 }
+        \tl_const:Nn \c_@@_orig_decl_sign_tl
+          { 本科生签名 }
+        \tl_const:Nn \c_@@_super_decl_sign_tl
+          { 指导教师签名 }
+      }
   }
+\@@_orig_decl_sign:
 \clist_const:Nn \c_@@_auth_decl_sign_clist
   { 作者签名, 导师签名, 日期 }
 %    \end{macrocode}
@@ -2268,7 +2305,7 @@
 % \end{variable}
 %
 % \begin{variable}{\c_@@_secret_clist}
-% 四种密级，公开直接用，未列入。
+% 四种密级，公开无需列入。
 %    \begin{macrocode}
 \clist_const:Nn \c_@@_secret_clist { 限制, 秘密, 机密, 绝密 }
 %    \end{macrocode}
@@ -2301,45 +2338,50 @@
    { pdf_creator       } { LaTeX~ with~ nwafuthesis~ class },
  }
  { \@@_define_name:nn #1 }
-\int_compare:nNnTF { \g_@@_thesis_type_int } < { 3 }
+
+\cs_new_protected:Npn \@@_define_name_const_zh:
   {
+    \int_compare:nNnTF { \g_@@_thesis_type_int } < { 3 }
+      {
 %
 %    \end{macrocode}
 % 研究生的字段。
 %    \begin{macrocode}
 %
-    \clist_map_inline:nn
-      {
-        { student_id      } { 研究生学号                       },
-        { orig_decl       } { 研究生学位论文的独创性声明       },
-        { super_decl      } { 导师指导研究生学位论文的承诺     },
-        { auth_decl       } { 关于研究生学位论文使用授权的说明 }
-      }
-      { \@@_define_name:nn #1 }
-   }{
+        \clist_map_inline:nn
+          {
+            { student_id      } { 研究生学号                       },
+            { orig_decl       } { 研究生学位论文的独创性声明       },
+            { super_decl      } { 导师指导研究生学位论文的承诺     },
+            { auth_decl       } { 关于研究生学位论文使用授权的说明 }
+          }
+          { \@@_define_name:nn ##1 }
+       }{
 %
 %    \end{macrocode}
 % 本科生的字段。
 %    \begin{macrocode}
 %
-    \clist_map_inline:nn
-      {
-        { major           } { 专业                           },
-        { student_id      } { 学号                           },
-        { author          } { 学生姓名                       },
-        { cosupervisor    } { 协助指导教师                   },
-        { date            } { 完成日期                       },
-        { orig_decl       } { 本科生毕业\clist_item:Nn
-                              \c__@@_bachelor_type_clist {
-                              \l__@@_info_bachelor_type_int
-                              }的独创性声明                  },
-        { auth_decl       } { 关于本科生毕业\clist_item:Nn
-                              \c__@@_bachelor_type_clist {
-                              \l__@@_info_bachelor_type_int
-                              }知识产权的说明                }
+        \clist_map_inline:nn
+          {
+            { major           } { 专业                           },
+            { student_id      } { 学号                           },
+            { author          } { 学生姓名                       },
+            { cosupervisor    } { 协助指导教师                   },
+            { date            } { 完成日期                       },
+            { orig_decl       } { 本科生毕业\clist_item:Nn
+                                  \c__@@_bachelor_type_clist {
+                                  \l__@@_info_bachelor_type_int
+                                  }的独创性声明                  },
+            { auth_decl       } { 关于本科生毕业\clist_item:Nn
+                                  \c__@@_bachelor_type_clist {
+                                  \l__@@_info_bachelor_type_int
+                                  }知识产权的说明                }
+          }
+          { \@@_define_name:nn ##1 }
       }
-      { \@@_define_name:nn #1 }
   }
+\@@_define_name_const_zh:
 %
 %    \end{macrocode}
 % 研究生与本科生相同的中英文字段。
@@ -2351,45 +2393,49 @@
   }
   { \@@_define_name:nnn #1 }
 %
-\int_compare:nNnTF { \g_@@_thesis_type_int } < { 3 }
+\cs_new_protected:Npn \@@_define_name_const_zh_en:
   {
+    \int_compare:nNnTF { \g_@@_thesis_type_int } < { 3 }
+      {
 %
 %    \end{macrocode}
 % 研究生。
 %    \begin{macrocode}
 %
-    \clist_map_inline:nn
-      {
-        { major             } { 学科专业       } { Major                },
-        { researchfield     } { 研究方向       } { Research~ Field      },
-        { professionaltype  } { 专业学位类型   } { Degree~ Type         },
-        { professionalfield } { 领域名称       } { Field                },
-        { author            } { 论文作者       } { Candidate            },
-        { cosupervisor      } { 联合指导教师   } { Co-Supervisor        },
-        { date              } { 论文提交时间   } { Date~ of~ Submission },
-        { abstract          } { 摘 \quad 要    } { ABSTRACT             },
-        { keywords          } { 关键字         } { KEYWORDS             },
-        { clc               } { 分类号         } { CLC~ number:         },
-        { notation          } { 主要符号对照表 } { List~ of~ Symbols    }
-      }
-      { \@@_define_name:nnn #1 }
-  }{
+        \clist_map_inline:nn
+          {
+            { major             } { 学科专业       } { Major                },
+            { researchfield     } { 研究方向       } { Research~ Field      },
+            { professionaltype  } { 专业学位类型   } { Degree~ Type         },
+            { professionalfield } { 领域名称       } { Field                },
+            { author            } { 论文作者       } { Candidate            },
+            { cosupervisor      } { 联合指导教师   } { Co-Supervisor        },
+            { date              } { 论文提交时间   } { Date~ of~ Submission },
+            { abstract          } { 摘 \quad 要    } { ABSTRACT             },
+            { keywords          } { 关键字         } { KEYWORDS             },
+            { clc               } { 分类号         } { CLC~ number:         },
+            { notation          } { 主要符号对照表 } { List~ of~ Symbols    }
+          }
+          { \@@_define_name:nnn ##1 }
+      }{
 %
 %    \end{macrocode}
 % 本科生。
 %    \begin{macrocode}
 %
-    \clist_map_inline:nn
-      {
-        { abstract } { 摘要        } { Abstract          },
-        { keywords } { 关键字      } { Keywords          },
-        { clc      } { 分类号      } { CLC~ number       },
+        \clist_map_inline:nn
+          {
+            { abstract } { 摘要        } { Abstract          },
+            { keywords } { 关键字      } { Keywords          },
+            { clc      } { 分类号      } { CLC~ number       },
+          }
+          { \@@_define_name:nnn ##1 }
       }
-      { \@@_define_name:nnn #1 }
   }
+\@@_define_name_const_zh_en:
 %    \end{macrocode}
 %
-% 定理标题中英文名称常量。
+% 定理定理类标题中英文名称常量。
 %    \begin{macrocode}
 %
 \clist_map_inline:nn
@@ -2433,17 +2479,6 @@
   { \PassOptionsToPackage #1 }
 %    \end{macrocode}
 %
-% 本模板会在 \pkg{ctexhook} 提供的钩子 \cs{ctex_at_end_preamble:n}
-% 中调用 \pkg{biblatex}，而 \pkg{biblatex} 自身又会使用 \pkg{etoolbox}
-% 的钩子 \tn{AtEndPreamble}，因此需要在载入 \cls{ctexbook} 之前调用
-% \pkg{etoolbox}。钩子的顺序为：
-% \[ \text{\tn{CTEX@document@left@hook}}
-%    \prec \text{\tn{@endpreamblehook}}
-%    \prec \text{\texttt{\textbackslash begin\{document\}}}. \]
-%    \begin{macrocode}
-\RequirePackage { etoolbox }
-%    \end{macrocode}
-%
 % 载入 \cls{ctexbook} 文档类。
 % 在使用 \XeLaTeX{} 编译时，\cls{ctexbook} 的底层将调用 \pkg{xeCJK}
 % 宏包；而在使用 \LuaLaTeX{} 编译时，则将调用 \pkg{LuaTeX-ja} 宏包。
@@ -2466,28 +2501,34 @@
     ntheorem,
     enumitem,
     graphicx,
-    longtable,
-    booktabs,
     caption,
+    bicaption,
     xcolor,
   }
 %    \end{macrocode}
 %
+% \changes{v1.10}{2022/03/17}{只检查 \cls{ctexbook} 和 \pkg{xeCJK} 的版本。}
+%
 % \begin{macro}{\@@_check_package:nnn}
 % 检查过时宏包。
 %    \begin{macrocode}
 \cs_new_protected:Npn \@@_check_package:nnn #1#2#3
   {
     \@ifpackagelater {#1} {#2}
-      { } { \@@_error:nnn { package-too-old } {#1} {#3} }
+      { } { \@@_error:nnnn { package-too-old } { Package } {#1} {#3} }
+  }
+\cs_new_protected:Npn \@@_check_class:nnn #1#2#3
+  {
+    \@ifclasslater {#1} {#2}
+      { } { \@@_error:nnnn { package-too-old } { Class } {#1} {#3} }
   }
 \@@_msg_new:nn { package-too-old }
   {
-    Package~ "#1"~ is~ too~ old. \\
-    The~ nwafuthesis~ class~ only~ supports~ "#1"~ with~ a~ version \\
-    higher~ than~ v#2. \\\\
-    Please~ update~ an~ up-to-date~ version~ of~ it~ using~ your \\
-    TeX~ package~ manager~ or~ from~ CTAN.
+    #1~ "#2"~ is~ too~ old. \\
+    The~ nwafuthesis~ class~ only~ supports~ "#2" \\
+    with~ a~ version~ higher~ than~ v#3. \\\\
+    Please~ update~ an~ up-to-date~ version~ of~ it \\
+    using~ your~ TeX~ package~ manager~ or~ from~ CTAN.
   }
 %    \end{macrocode}
 % \end{macro}
@@ -2495,13 +2536,9 @@
 % \changes{v1.01}{2021/08/06}{由于无法获取ctex版本信息，暂时关闭对ctex版本检测。}
 %
 %    \begin{macrocode}
-%\@@_check_package:nnn { ctex         } { 2020/04/30 } { 2.5 }
-\@@_check_package:nnn { fontspec     } { 2017/09/22 } { 2.6e   }
-\@@_check_package:nnn { unicode-math } { 2017/11/18 } { 0.8i   }
+\@@_check_class:nnn { ctexbook } { 2021/03/14 } { 2.5.6 }
 \sys_if_engine_xetex:T
-  { \@@_check_package:nnn { xeCJK          } { 2017/08/07 } { 3.5.0 } }
-\sys_if_engine_luatex:T
-  { \@@_check_package:nnn { xunicode-addon } { 2018/04/30 } { 3.7.1 } }
+  { \@@_check_package:nnn { xeCJK } { 2020/05/01 } { 3.8.3 } }
 %    \end{macrocode}
 %
 % \subsection{页面布局}
@@ -2513,40 +2550,44 @@
 % 研究论文页面尺寸与本科生毕业论文(设计)的
 % 页面尺寸不一致，需要分开设置。
 %    \begin{macrocode}
-\int_compare:nNnTF { \g_@@_thesis_type_int } < { 3 }
+\cs_new_protected:Npn \@@_thesis_geometry:
   {
+    \int_compare:nNnTF { \g_@@_thesis_type_int } < { 3 }
+      {
 %    \end{macrocode}
 % 研究生论文页边距
 %    \begin{macrocode}
-    \geometry
-      {
-        paper=a4paper,
-        top=3.1cm,
-        bottom=3.3cm,
-        left=2.6cm,
-        right=2.6cm,
-        headheight=0.8cm,
-        headsep=0.7cm,
-        footskip=1.4cm,
-        %includehead,
-        %includefoot,
-      }
-  }{
+        \geometry
+          {
+            paper=a4paper,
+            top=3.1cm,
+            bottom=3.3cm,
+            left=2.6cm,
+            right=2.6cm,
+            headheight=0.8cm,
+            headsep=0.7cm,
+            footskip=1.4cm,
+            %includehead,
+            %includefoot,
+          }
+      }{
 %    \end{macrocode}
 % 本科生论文页边距
 %    \begin{macrocode}
-    \geometry
-      {
-        paper=a4paper,
-        top=3.14cm,
-        bottom=3.8cm,
-        left=2.45cm,
-        right=2.45cm,
-        headheight=0.8cm,
-        headsep=0.63cm,
-        footskip=2.3cm,
+        \geometry
+          {
+            paper=a4paper,
+            top=3.14cm,
+            bottom=3.8cm,
+            left=2.45cm,
+            right=2.45cm,
+            headheight=0.8cm,
+            headsep=0.63cm,
+            footskip=2.3cm,
+          }
       }
   }
+\@@_thesis_geometry:
 %    \end{macrocode}
 %
 % 草稿模式下显示页面边框及页眉、页脚线 。
@@ -2581,7 +2622,6 @@
 % \begin{macro}{style/cjk-font}
 % 预定义中文字体。
 %    \begin{macrocode}
-%<*class>
 \keys_define:nn { nwafu / style }
   {
     cjk-font .choices:nn =
@@ -2589,7 +2629,6 @@
       { \tl_set_eq:NN \g_@@_cjk_fontset_tl \l_keys_choice_tl }
   }
 %    \end{macrocode}
-%</class>
 % \end{macro}
 %
 % \begin{macro}{withchapter}
@@ -2632,13 +2671,12 @@
 %   \@@_setCJKmonofont:nn}
 % 用于设置中文字体的辅助函数，来源于 \pkg{xeCJK} 和 \pkg{ctex} 宏包。
 %    \begin{macrocode}
-%<*class>
 \cs_new_protected:Npn \@@_setCJKmainfont:nn #1#2
-  { \@@_set_family:nnn { \CJKrmdefault } {#2} {#1} }
+  { \@@_set_family:xnn { \CJKrmdefault } {#2} {#1} }
 \cs_new_protected:Npn \@@_setCJKsansfont:nn #1#2
-  { \@@_set_family:nnn { \CJKsfdefault } {#2} {#1} }
+  { \@@_set_family:xnn { \CJKsfdefault } {#2} {#1} }
 \cs_new_protected:Npn \@@_setCJKmonofont:nn #1#2
-  { \@@_set_family:nnn { \CJKttdefault } {#2} {#1} }
+  { \@@_set_family:xnn { \CJKttdefault } {#2} {#1} }
 %    \end{macrocode}
 % \end{macro}
 %
@@ -2707,7 +2745,7 @@
 %    \end{macrocode}
 % \end{macro}
 %
-% \begin{macro}{\@@_set_family:nnn,\@@_switch_family:n}
+% \begin{macro}{\@@_set_family:nnn,\@@_set_family:xnn,\@@_switch_family:n}
 % 封装 CJK 字体族的设定和切换命令。
 %    \begin{macrocode}
 \sys_if_engine_xetex:TF
@@ -2719,7 +2757,7 @@
     \cs_new_eq:NN \@@_set_family:nnn  \ctex_ltj_set_family:nnn
     \cs_new_eq:NN \@@_switch_family:n \ctex_ltj_switch_family:n
   }
-%</class>
+\cs_generate_variant:Nn \@@_set_family:nnn { x }
 %    \end{macrocode}
 % \end{macro}
 %
@@ -2748,6 +2786,8 @@
 %    \end{macrocode}
 % \end{macro}
 %
+% \changes{v1.10}{2022/03/17}{判断 Libertinus Sans Bold Oblique 字体是否存在。}
+%
 % \begin{macro}{
 %   \g_@@_font_family_libertinus_serif_tl,
 %   \g_@@_font_family_libertinus_sans_tl,
@@ -2796,7 +2836,12 @@
     \tl_set:Nn \g_@@_font_style_libertinus_bf_tl     { Bold            }
     \tl_set:Nn \g_@@_font_style_libertinus_it_tl     { Italic          }
     \tl_set:Nn \g_@@_font_style_libertinus_bfit_tl   { BoldItalic      }
-    \tl_set:Nn \g_@@_font_style_libertinus_bfsl_tl   { BoldOblique     }
+%    \end{macrocode}
+% 较新版本中 Libertinus Sans Bold Oblique 字体被移除，需进行额外判断。
+%    \begin{macrocode}
+    \fontspec_font_if_exist:nTF { LibertinusSans-BoldOblique.otf }
+      { \tl_set:Nn \g_@@_font_style_libertinus_bfsl_tl { BoldOblique } }
+      { \tl_set:Nn \g_@@_font_style_libertinus_bfsl_tl { Bold        } }
   }
   {
     \tl_set:Nn \g_@@_font_family_libertinus_serif_tl { libertinusserif }
@@ -3068,12 +3113,7 @@
 %    \begin{macrocode}
 \cs_new_protected:Npn \@@_load_cjk_font_founder:
   {
-    \@@_setCJKmainfont:nn   { FZShuSong-Z01 }
-      {
-        UprightFont    = *,
-        BoldFont       = FZHei-B01,
-        ItalicFont     = FZKai-Z03,
-      }
+    \@@_setCJKmainfont:n   { FZShuSong-Z01 }
     \@@_setCJKsansfont:n   { FZHei-B01      }
     \@@_setCJKmonofont:n   { FZFangSong-Z02 }
     \@@_set_cjk_font_hei:n { FZHei-B01      }
@@ -3176,8 +3216,8 @@
 %
 % 探测操作系统，以设置中英文字体。
 %    \begin{macrocode}
-\tl_new:N \l_@@_cjkfont_tl
 \tl_new:N \l_@@_font_tl
+\tl_new:N \l_@@_cjkfont_tl
 \cs_new_protected:Npn \@@_detect_platform:
   {
     \sys_if_platform_windows:TF
@@ -3205,17 +3245,15 @@
 %    \begin{macrocode}
 \cs_new_protected:Npn \@@_load_font:
   {
-    \tl_if_empty:NTF \g_@@_fontset_tl
+    \tl_if_empty:NT \g_@@_fontset_tl
       {
         \@@_detect_platform:
         \tl_gset_eq:NN \g_@@_fontset_tl \l_@@_font_tl
-      }{
       }
-    \tl_if_empty:NTF \g_@@_cjk_fontset_tl
+    \tl_if_empty:NT \g_@@_cjk_fontset_tl
       {
         \@@_detect_platform:
         \tl_gset_eq:NN \g_@@_cjk_fontset_tl \l_@@_cjkfont_tl
-      }{
       }
     \use:c { @@_load_font_     \g_@@_fontset_tl     : }
     \use:c { @@_load_cjk_font_ \g_@@_cjk_fontset_tl : }
@@ -3271,12 +3309,11 @@
         \RenewDocumentCommand \LARGE        { } { \zihao { -2 } }
         \RenewDocumentCommand \huge         { } { \zihao {  2 } }
         \RenewDocumentCommand \Huge         { } { \zihao {  1 } }
-%<*class>
       },
 %    \end{macrocode}
 % \end{macro}
 %
-% \subsubsection{句号}
+% \subsubsection{其它设置}
 %
 % \begin{macro}{style/fullwidth-stop}
 % 设置句号形状（圆圈或是圆点）。
@@ -3330,13 +3367,25 @@
 %    \begin{macrocode}
 \cs_new:Npn \@@_set_fullwidth_stop_catcode:
   {
-    \char_set_active_eq:nN { "3002 } \c_@@_fwid_full_stop_tl
-    \char_set_catcode_active:n { "3002 }
+    \char_set_active_eq:NN ^^^^3002 \c_@@_fwid_full_stop_tl
+    \char_set_catcode_active:N ^^^^3002
+    \clist_map_inline:nn
+      { \c_@@_orig_decl_text_tl, \c_@@_auth_decl_text_tl }
+      { \tl_set_rescan:Nno ##1 { } {##1} }
   }
-%</class>
 %    \end{macrocode}
 % \end{macro}
 %
+% \changes{v1.10}{2022/03/17}{允许 \tn{emph} 对中文生效。}
+%
+% 声明 \tn{emph} 样式序列，使得中文强调以楷体显示。
+%    \begin{macrocode}
+\DeclareEmphSequence
+  {
+    \bfseries,
+    \upshape \CJKfamily { \CJKfamilydefault },
+  }
+%    \end{macrocode}
 %
 % \subsection{页眉页脚}
 %
@@ -3359,7 +3408,7 @@
 %    \end{macrocode}
 %
 % \begin{macro}{\cleardoublepage}
-% 重定义 \tn{cleardoublepage}，使得偶数页面在没有内容时也不显示页眉页脚，见
+% 重定义 \tn{cleardoublepage}，使得偶数页面在没有内容时不显示页眉页脚，见
 % \url{https://tex.stackexchange.com/a/1683}。最后清空中间页眉，确保正文部分
 % 页眉显示正确。
 %    \begin{macrocode}
@@ -3390,9 +3439,9 @@
 \cs_gset_eq:NN \nwafuhead\fancyhead
 \cs_gset_eq:NN \nwafufoot\fancyfoot
 %    \end{macrocode}
-% 重定义 \tn{frontmatter}，带星号的命令不会启用\cs{cleardoublepage}。
+% 重定义 \tn{frontmatter}，带星号的命令不启用\cs{cleardoublepage}。
 %    \begin{macrocode}
-\RenewDocumentCommand{\frontmatter}{sO{Roman}}
+\RenewDocumentCommand{\frontmatter}{s O{Roman}}
   {
 %    \end{macrocode}
 % 判断是否有*号参数
@@ -3418,8 +3467,9 @@
 % 研究生偶数页页眉
 %    \begin{macrocode}
             \nwafuhead[EC]{\small \nouppercase{
-                \c_@@_name_simp_tl \clist_item:Nn
-                \c_@@_thesis_type_clist { \g_@@_thesis_type_int } }
+                \c_@@_name_simp_tl
+                \clist_item:Nn \c_@@_thesis_type_clist
+                  { \g_@@_thesis_type_int } }
               }
           }{
 %    \end{macrocode}
@@ -3467,8 +3517,9 @@
 % 研究生偶数页页眉
 %    \begin{macrocode}
             \nwafuhead[EC]{\small \nouppercase{
-                \c_@@_name_simp_tl \clist_item:Nn
-                \c_@@_thesis_type_clist { \g_@@_thesis_type_int } }
+                \c_@@_name_simp_tl
+                \clist_item:Nn \c_@@_thesis_type_clist
+                  { \g_@@_thesis_type_int } }
               }
           }{
 %    \end{macrocode}
@@ -3478,7 +3529,7 @@
           }
       }{
 %    \end{macrocode}
-% 单面模式，奇偶页设成一样
+% 单面模式
 %    \begin{macrocode}
         \nwafuhead [ C ]
           {
@@ -3495,8 +3546,9 @@
 % 研究生偶数页页眉
 %    \begin{macrocode}
                     \small \nouppercase{
-                        \c_@@_name_simp_tl \clist_item:Nn
-                        \c_@@_thesis_type_clist { \g_@@_thesis_type_int } }
+                        \c_@@_name_simp_tl
+                        \clist_item:Nn \c_@@_thesis_type_clist
+                          { \g_@@_thesis_type_int } }
                   }{
 %    \end{macrocode}
 % 本科生偶数页页眉
@@ -3547,8 +3599,9 @@
 % 研究生偶数页页眉
 %    \begin{macrocode}
             \nwafuhead[EC]{\small \nouppercase{
-                \c_@@_name_simp_tl \clist_item:Nn
-                \c_@@_thesis_type_clist { \g_@@_thesis_type_int } }
+                \c_@@_name_simp_tl
+                \clist_item:Nn \c_@@_thesis_type_clist
+                  { \g_@@_thesis_type_int } }
               }
           }{
 %    \end{macrocode}
@@ -3575,8 +3628,9 @@
 % 研究生偶数页页眉
 %    \begin{macrocode}
                     \small \nouppercase{
-                        \c_@@_name_simp_tl \clist_item:Nn
-                        \c_@@_thesis_type_clist { \g_@@_thesis_type_int } }
+                        \c_@@_name_simp_tl
+                        \clist_item:Nn \c_@@_thesis_type_clist
+                          { \g_@@_thesis_type_int } }
                   }{
 %    \end{macrocode}
 % 本科生偶数页页眉
@@ -3612,8 +3666,9 @@
 % 研究生偶数页页眉
 %    \begin{macrocode}
             \nwafuhead[EC]{\small \nouppercase{
-                \c_@@_name_simp_tl \clist_item:Nn
-                \c_@@_thesis_type_clist { \g_@@_thesis_type_int } }
+                \c_@@_name_simp_tl
+                \clist_item:Nn \c_@@_thesis_type_clist
+                  { \g_@@_thesis_type_int } }
               }
           }{
 %    \end{macrocode}
@@ -3640,8 +3695,9 @@
 % 研究生偶数页页眉
 %    \begin{macrocode}
                     \small \nouppercase{
-                        \c_@@_name_simp_tl \clist_item:Nn
-                        \c_@@_thesis_type_clist { \g_@@_thesis_type_int } }
+                        \c_@@_name_simp_tl
+                        \clist_item:Nn \c_@@_thesis_type_clist
+                          { \g_@@_thesis_type_int } }
                   }{
 %    \end{macrocode}
 % 本科生偶数页页眉
@@ -3668,8 +3724,9 @@
 % 研究生偶数页页眉
 %    \begin{macrocode}
             \nwafuhead[EC]{\small \nouppercase{
-                \c_@@_name_simp_tl \clist_item:Nn
-                \c_@@_thesis_type_clist { \g_@@_thesis_type_int } }
+                \c_@@_name_simp_tl
+                \clist_item:Nn \c_@@_thesis_type_clist
+                  { \g_@@_thesis_type_int } }
               }
           }{
 %    \end{macrocode}
@@ -3713,109 +3770,112 @@
 %
 % \subsection{章节标题设置}
 %
-% |\keys_set:nn{ctex}| 实际相当于 \cs{ctexset}。
+% |\keys_set:nn{ctex}| 实际相当于调用 \cs{ctexset}。
 %
 % 设置章（chapter）、节（section）与小节（sub-section）标题样式。
 % 此处使用 \kvopt{fixskip}{true} 选项来抑制前后的多余间距。
 %
 % 设置标题级别
 %    \begin{macrocode}
-\int_compare:nNnTF{ \g_@@_thesis_type_int } < { 3 }
+\cs_new_protected:Npn \@@_ctexset_caption:
   {
+    \int_compare:nNnTF{ \g_@@_thesis_type_int } < { 3 }
+      {
 %    \end{macrocode}
 % 研究生
 %    \begin{macrocode}
-    \keys_set:nn { ctex }
-      {
-        secnumdepth = 3,
-        chapter =
-          {
-            pagestyle   = fancy,
-            aftername   = \hspace*{1.0\ccwd},
-            format      = \zihao{3} \normalfont \nwafu@hei \bfseries \centering,
-            beforeskip  = 1.47\baselineskip,
-            afterskip   = 1.24\baselineskip,
-            number      = \@@_arabic:n { chapter },
-            fixskip     = true
-          },
-        section =
-          {
-            format      = \zihao{-3} \normalfont \nwafu@hei \bfseries \raggedright,
-            beforeskip  = 1.09\baselineskip,
-            afterskip   = 0.80\baselineskip,
-            fixskip     = true
-          },
-        subsection =
+        \keys_set:nn { ctex }
           {
-            format      = \zihao{4} \normalfont \nwafu@hei \bfseries \raggedright,
-            beforeskip  = 0.80\baselineskip,
-            fixskip     = true
-          },
-        subsubsection =
-          {
-            format      = \zihao{-4} \normalfont \nwafu@hei \bfseries \raggedright,
-            beforeskip  = 0.40\baselineskip,
-            afterskip   = 0.40\baselineskip,
-            fixskip     = true
+            secnumdepth = 3,
+            chapter =
+              {
+                pagestyle   = fancy,
+                aftername   = \hspace*{1.0\ccwd},
+                format      = \zihao{3} \normalfont \nwafu@hei \bfseries \centering,
+                beforeskip  = 1.47\baselineskip,
+                afterskip   = 1.24\baselineskip,
+                number      = \@@_arabic:n { chapter },
+                fixskip     = true
+              },
+            section =
+              {
+                format      = \zihao{-3} \normalfont \nwafu@hei \bfseries \raggedright,
+                beforeskip  = 1.09\baselineskip,
+                afterskip   = 0.80\baselineskip,
+                fixskip     = true
+              },
+            subsection =
+              {
+                format      = \zihao{4} \normalfont \nwafu@hei \bfseries \raggedright,
+                beforeskip  = 0.80\baselineskip,
+                fixskip     = true
+              },
+            subsubsection =
+              {
+                format      = \zihao{-4} \normalfont \nwafu@hei \bfseries \raggedright,
+                beforeskip  = 0.40\baselineskip,
+                afterskip   = 0.40\baselineskip,
+                fixskip     = true
+              }
           }
-      }
-  }{
+      }{
 %    \end{macrocode}
 % 本科生
 %    \begin{macrocode}
-    \keys_set:nn { ctex }
-      {
-        secnumdepth = 3,
-        chapter =
-          {
-            pagestyle   = fancy,
-            name = { \bool_if:NT \l_@@_withchap_bool {第},
-                     \bool_if:NT \l_@@_withchap_bool {章} },
-            number      = \@@_arabic:n { chapter },
-            aftername   = \hspace*{\ccwd},
-            format      = \zihao{3} \normalfont \nwafu@hei \bfseries \centering,
-            beforeskip  = 0.25\baselineskip,
-            afterskip   = 0.65\baselineskip,
-            fixskip     = true
-          },
-        section =
-          {
-            aftername   = \hspace*{0.5\ccwd},
-            format      = \zihao{4} \normalfont \nwafu@hei \bfseries \raggedright,
-            beforeskip  = 0.60\baselineskip,
-            afterskip   = 0.65\baselineskip,
-            fixskip     = true,
-            afterindent = true,
-          },
-        subsection =
+        \keys_set:nn { ctex }
           {
-            aftername   = \hspace*{0.5\ccwd},
-            format      = \zihao{-4} \normalfont \nwafu@hei \bfseries,
-            beforeskip  = 0.60\baselineskip,
-            afterskip   = 0.65\baselineskip,
-            fixskip     = true,
-            afterindent = true,
-            % indent      = 2\ccwd,
-          },
-        subsubsection =
-          {
-            name        = {(,)},
-            aftername   = \hspace*{0.5\ccwd},
-            number      = \@@_arabic:n { subsubsection },
-            format      = \zihao{-4} \normalfont,
-            beforeskip  = 0.60\baselineskip,
-            afterskip   = 0.65\baselineskip,
-            fixskip     = true,
-            % afterindent = true,
-            indent      = 2\ccwd,
+            secnumdepth = 3,
+            chapter =
+              {
+                pagestyle   = fancy,
+                name = { \bool_if:NT \l_@@_withchap_bool {第},
+                         \bool_if:NT \l_@@_withchap_bool {章} },
+                number      = \@@_arabic:n { chapter },
+                aftername   = \hspace*{\ccwd},
+                format      = \zihao{3} \normalfont \nwafu@hei \bfseries \centering,
+                beforeskip  = 0.25\baselineskip,
+                afterskip   = 0.65\baselineskip,
+                fixskip     = true
+              },
+            section =
+              {
+                aftername   = \hspace*{0.5\ccwd},
+                format      = \zihao{4} \normalfont \nwafu@hei \bfseries \raggedright,
+                beforeskip  = 0.60\baselineskip,
+                afterskip   = 0.65\baselineskip,
+                fixskip     = true,
+                afterindent = true,
+              },
+            subsection =
+              {
+                aftername   = \hspace*{0.5\ccwd},
+                format      = \zihao{-4} \normalfont \nwafu@hei \bfseries,
+                beforeskip  = 0.60\baselineskip,
+                afterskip   = 0.65\baselineskip,
+                fixskip     = true,
+                afterindent = true,
+                % indent      = 2\ccwd,
+              },
+            subsubsection =
+              {
+                name        = {(,)},
+                aftername   = \hspace*{0.5\ccwd},
+                number      = \@@_arabic:n { subsubsection },
+                format      = \zihao{-4} \normalfont,
+                beforeskip  = 0.60\baselineskip,
+                afterskip   = 0.65\baselineskip,
+                fixskip     = true,
+                % afterindent = true,
+                indent      = 2\ccwd,
+              }
           }
       }
   }
+\@@_ctexset_caption:
 %    \end{macrocode}
 %
-%
 % \begin{macro}{\@@_chapter:n,\@@_chapter:V}
-% 手动生成章的标题，用于摘要、参考文献等。
+% 手动生成章标题，用于摘要、参考文献等。
 %    \begin{macrocode}
 \cs_new_protected:Npn \@@_chapter:n #1
   {
@@ -3830,7 +3890,7 @@
 % \end{macro}
 %
 % \begin{macro}{\@@_chapter_no_toc:n,\@@_chapter_no_toc:V}
-% 目录自身不出现在目录中，需特别处理。参考
+% 目录自身不应出现在目录中，需特别处理。参考
 % \url{https://tex.stackexchange.com/a/1821}。
 %    \begin{macrocode}
 \cs_new_protected:Npn \@@_chapter_no_toc:n #1
@@ -3844,7 +3904,7 @@
 % \end{macro}
 %
 % \begin{macro}{\@@_chapter_header:n}
-% 单页模式下，目录、摘要、符号表等的页眉中间为相应标题，左右为空。
+% 单面排版模式下，目录、摘要、符号表等的页眉中间为相应标题，左右为空。
 %    \begin{macrocode}
 \cs_new_protected:Npn \@@_chapter_header:n #1
   {
@@ -4177,7 +4237,6 @@
 %    \end{macrocode}
 % \end{macro}
 %
-%
 % \begin{macro}{\newtheorem}
 % 定义新的定理环境。
 %    \begin{macrocode}
@@ -4194,7 +4253,6 @@
 %    \end{macrocode}
 % 设置默认样式为 \opt{plain}。
 %    \begin{macrocode}
-% TODO: (2017-12-07) Move to interface
     \tl_set:Nn \l_@@_thm_style_tl { plain }
 %    \end{macrocode}
 % 处理可选参数。利用 |nwafu/theorem| 键值对设置，并按此修改证毕符号、
@@ -4778,8 +4836,7 @@
     \dim_set:Nn \l_@@_tmpt_dim {#1}
     \dim_add:Nn \l_@@_tmpt_dim {0.6em}
     \makebox[0cm][l]{\rule[-0.5ex]{\l_@@_tmpt_dim}{0.4 pt}}
-      {\hbox_to_wd:nn {\l_@@_tmpt_dim} { \hfil #2 \hfil }}
-    % \fbox[b]{\parbox {#1} { \centering #2 }}
+    \hbox_to_wd:nn {\l_@@_tmpt_dim} { \hfil #2 \hfil }
   }
 \cs_generate_variant:Nn \@@_center_box:nn  { Vn }
 %    \end{macrocode}
@@ -4894,7 +4951,7 @@
 %    \begin{macrocode}
         \group_begin:
 %    \end{macrocode}
-% 将中图分类号、udc码和密级标记名称存入逗号分隔列表，并计算最宽宽度赋给
+% 将中图分类号、udc码和密级名称常量存入逗号分隔列表，并计算最宽宽度赋给
 % \cs{l_@@_tmpa_dim}。
 %    \begin{macrocode}
         \clist_clear:N \l_@@_tmpa_clist
@@ -4906,7 +4963,7 @@
           }
         \@@_get_max_text_width:NN \l_@@_tmpa_dim \l_@@_tmpa_clist
 %    \end{macrocode}
-% 将中图分类号、udc码和密级信息值存入逗号分隔列表，并计算最宽宽度赋给
+% 将中图分类号、udc码和密级变量值存入逗号分隔列表，并计算最宽宽度赋给
 % \cs{l_@@_tmpb_dim}。
 %    \begin{macrocode}
         \clist_set:Nx \l_@@_tmpb_clist
@@ -4928,7 +4985,7 @@
           }
         \@@_get_max_text_width:NN \l_@@_tmpc_dim \l_@@_tmpc_clist
 %    \end{macrocode}
-% 将学校代码、研究生学号信息值存入逗号分隔列表，并计算最宽宽度赋给
+% 将学校代码、研究生学号变量值存入逗号分隔列表，并计算最宽宽度赋给
 % \cs{l_@@_tmpd_dim}。
 %    \begin{macrocode}
         \clist_set:Nx \l_@@_tmpd_clist
@@ -5061,7 +5118,7 @@
     \begin{minipage} [ c ] { \textwidth }
       \centering
 %    \end{macrocode}
-% 根据论文类型(博士、硕士、本科)分支输出不同信息
+% 根据论文类型(博士、硕士、本科)输出不同信息
 %    \begin{macrocode}
       \int_case:nn {\g_@@_thesis_type_int}
         {
@@ -5070,21 +5127,21 @@
 %    \begin{macrocode}
           {1}{
 %    \end{macrocode}
-% 读取左侧作者信息标识名称字段，并将最宽者的宽度赋给
+% 读取作者信息标识常量，并将最宽者的宽度赋给
 % \cs{l_@@_tmpa_dim}。
 %    \begin{macrocode}
             \clist_set:Nx \l_@@_tmpa_clist
               {
-                \c_@@_name_major_tl,
-                \c_@@_name_researchfield_tl,
-                \c_@@_name_author_tl,
-                \c_@@_name_supervisor_tl,
-                \c_@@_name_cosupervisor_tl,
-                \c_@@_name_date_tl,
+                { \c_@@_name_major_tl         },
+                { \c_@@_name_researchfield_tl },
+                { \c_@@_name_author_tl        },
+                { \c_@@_name_supervisor_tl    },
+                { \c_@@_name_cosupervisor_tl  },
+                { \c_@@_name_date_tl          }
               }
             \@@_get_max_text_width:NN \l_@@_tmpa_dim \l_@@_tmpa_clist
 %    \end{macrocode}
-% 读取右侧作者信息各栏字段，并将最宽者的宽度赋给
+% 读取作者信息变量值，并将最宽者的宽度赋给
 % \cs{l_@@_tmpb_dim}。
 %    \begin{macrocode}
             \clist_set:Nx \l_@@_tmpb_clist
@@ -5109,21 +5166,21 @@
 %    \begin{macrocode}
               {1}{
 %    \end{macrocode}
-% 读取左侧作者信息标识名称字段，并将最宽者的宽度赋给
+% 读取作者信息标识常量，并将最宽者的宽度赋给
 % \cs{l_@@_tmpa_dim}。
 %    \begin{macrocode}
                 \clist_set:Nx \l_@@_tmpa_clist
                   {
-                    \c_@@_name_major_tl,
-                    \c_@@_name_researchfield_tl,
-                    \c_@@_name_author_tl,
-                    \c_@@_name_supervisor_tl,
-                    \c_@@_name_cosupervisor_tl,
-                    \c_@@_name_date_tl,
+                    { \c_@@_name_major_tl         },
+                    { \c_@@_name_researchfield_tl },
+                    { \c_@@_name_author_tl        },
+                    { \c_@@_name_supervisor_tl    },
+                    { \c_@@_name_cosupervisor_tl  },
+                    { \c_@@_name_date_tl,         }
                   }
                 \@@_get_max_text_width:NN \l_@@_tmpa_dim \l_@@_tmpa_clist
 %    \end{macrocode}
-% 读取右侧作者信息各栏字段，并将最宽者的宽度赋给
+% 读取作者信息变量值，并将最宽者的宽度赋给
 % \cs{l_@@_tmpb_dim}。
 %    \begin{macrocode}
                 \clist_set:Nx \l_@@_tmpb_clist
@@ -5142,21 +5199,21 @@
 %    \begin{macrocode}
               {2}{
 %    \end{macrocode}
-% 读取左侧作者信息标识名称字段，并将最宽者的宽度赋给
+% 读取作者信息标识常量，并将最宽者的宽度赋给
 % \cs{l_@@_tmpa_dim}。
 %    \begin{macrocode}
                 \clist_set:Nx \l_@@_tmpa_clist
                   {
-                    \c_@@_name_professionaltype_tl,
-                    \c_@@_name_professionalfield_tl,
-                    \c_@@_name_author_tl,
-                    \c_@@_name_supervisor_tl,
-                    \c_@@_name_cosupervisor_tl,
-                    \c_@@_name_date_tl,
+                    { \c_@@_name_professionaltype_tl  },
+                    { \c_@@_name_professionalfield_tl },
+                    { \c_@@_name_author_tl            },
+                    { \c_@@_name_supervisor_tl        },
+                    { \c_@@_name_cosupervisor_tl      },
+                    { \c_@@_name_date_tl              }
                   }
                 \@@_get_max_text_width:NN \l_@@_tmpa_dim \l_@@_tmpa_clist
 %    \end{macrocode}
-% 读取右侧作者信息各栏字段，并将最宽者的宽度赋给
+% 读取作者信息变量值，并将最宽者的宽度赋给
 % \cs{l_@@_tmpb_dim}。
 %    \begin{macrocode}
                 \clist_set:Nx \l_@@_tmpb_clist
@@ -5177,22 +5234,22 @@
 %    \begin{macrocode}
           {3}{
 %    \end{macrocode}
-% 读取左侧作者信息标识名称字段，并将最宽者的宽度赋给
+% 读取作者信息标识常量，并将最宽者的宽度赋给
 % \cs{l_@@_tmpa_dim}。
 %    \begin{macrocode}
             \clist_set:Nx \l_@@_tmpa_clist
               {
-                \c_@@_name_department_tl,
-                \c_@@_name_major_tl,
-                \c_@@_name_enroll_tl\c_@@_name_class_id_tl,
-                \c_@@_name_author_tl,
-                \c_@@_name_supervisor_tl,
-                \c_@@_name_cosupervisor_tl,
-                \c_@@_name_date_tl,
+                { \c_@@_name_department_tl                   },
+                { \c_@@_name_major_tl                        },
+                { \c_@@_name_enroll_tl\c_@@_name_class_id_tl },
+                { \c_@@_name_author_tl                       },
+                { \c_@@_name_supervisor_tl                   },
+                { \c_@@_name_cosupervisor_tl                 },
+                { \c_@@_name_date_tl                         }
               }
             \@@_get_max_text_width:NN \l_@@_tmpa_dim \l_@@_tmpa_clist
 %    \end{macrocode}
-% 读取右侧作者信息各栏字段，并将最宽者的宽度赋给
+% 读取作者信息变量值，并将最宽者的宽度赋给
 % \cs{l_@@_tmpb_dim}。
 %    \begin{macrocode}
             \clist_set:Nx \l_@@_tmpb_clist
@@ -5240,12 +5297,12 @@
 %    \begin{macrocode}
           \clist_set:Nx \l_@@_tmpa_clist
             {
-              {\c_@@_name_major_en_tl{\l_@@_info_major_en_tl}},
-              {\c_@@_name_researchfield_en_tl{\l_@@_info_researchfield_en_tl}},
-              {\c_@@_name_author_en_tl{\l_@@_info_author_en_tl}},
-              {\c_@@_name_supervisor_en_tl{\l_@@_info_supervisor_en_tl}},
-              {\c_@@_name_cosupervisor_en_tl{\l_@@_info_cosupervisor_en_tl}},
-              {\c_@@_name_date_en_tl{\l_@@_info_date_en_tl}},
+              {\c_@@_name_major_en_tl{\l_@@_info_major_en_tl}                 },
+              {\c_@@_name_researchfield_en_tl{\l_@@_info_researchfield_en_tl} },
+              {\c_@@_name_author_en_tl{\l_@@_info_author_en_tl}               },
+              {\c_@@_name_supervisor_en_tl{\l_@@_info_supervisor_en_tl}       },
+              {\c_@@_name_cosupervisor_en_tl{\l_@@_info_cosupervisor_en_tl}   },
+              {\c_@@_name_date_en_tl{\l_@@_info_date_en_tl}                   }
             }
           \@@_get_max_text_width:NN \l_@@_tmpa_dim \l_@@_tmpa_clist
 %    \end{macrocode}
@@ -5255,20 +5312,20 @@
           \begin{minipage} [ c ] { \l_@@_tmpa_dim }
             \flushleft
 %    \end{macrocode}
-% 读取左侧作者信息标识名称字段，并将最宽者的宽度赋给
+% 读取作者信息标识变量值，并将最宽者的宽度赋给
 % \cs{l_@@_tmpa_dim}。
 %    \begin{macrocode}
             \clist_set:Nx \l_@@_tmpa_clist
               {
-                \c_@@_name_major_en_tl,
-                \c_@@_name_researchfield_en_tl,
-                \c_@@_name_author_en_tl,
-                \c_@@_name_supervisor_en_tl,
-                \c_@@_name_cosupervisor_en_tl,
-                \c_@@_name_date_en_tl,
+                { \c_@@_name_major_en_tl         },
+                { \c_@@_name_researchfield_en_tl },
+                { \c_@@_name_author_en_tl        },
+                { \c_@@_name_supervisor_en_tl    },
+                { \c_@@_name_cosupervisor_en_tl  },
+                { \c_@@_name_date_en_tl          }
               }
 %    \end{macrocode}
-% 读取右侧作者信息各栏字段，并将最宽者的宽度赋给
+% 读取作者信息变量值，并将最宽者的宽度赋给
 % \cs{l_@@_tmpb_dim}。
 %    \begin{macrocode}
             \clist_set:Nx \l_@@_tmpb_clist
@@ -5309,12 +5366,12 @@
 %    \begin{macrocode}
                 \clist_set:Nx \l_@@_tmpa_clist
                   {
-                    {\c_@@_name_major_en_tl{\l_@@_info_major_en_tl}},
-                    {\c_@@_name_researchfield_en_tl{\l_@@_info_researchfield_en_tl}},
-                    {\c_@@_name_author_en_tl{\l_@@_info_author_en_tl}},
-                    {\c_@@_name_supervisor_en_tl{\l_@@_info_supervisor_en_tl}},
-                    {\c_@@_name_cosupervisor_en_tl{\l_@@_info_cosupervisor_en_tl}},
-                    {\c_@@_name_date_en_tl{\l_@@_info_date_en_tl}},
+                    {\c_@@_name_major_en_tl{\l_@@_info_major_en_tl}                 },
+                    {\c_@@_name_researchfield_en_tl{\l_@@_info_researchfield_en_tl} },
+                    {\c_@@_name_author_en_tl{\l_@@_info_author_en_tl}               },
+                    {\c_@@_name_supervisor_en_tl{\l_@@_info_supervisor_en_tl}       },
+                    {\c_@@_name_cosupervisor_en_tl{\l_@@_info_cosupervisor_en_tl}   },
+                    {\c_@@_name_date_en_tl{\l_@@_info_date_en_tl}                   }
                   }
                 \@@_get_max_text_width:NN \l_@@_tmpa_dim \l_@@_tmpa_clist
 %    \end{macrocode}
@@ -5324,20 +5381,20 @@
                 \begin{minipage} [ c ] { \l_@@_tmpa_dim }
                   \flushleft
 %    \end{macrocode}
-% 读取左侧作者信息标识名称字段，并将最宽者的宽度赋给
+% 读取作者信息标识常量，并将最宽者的宽度赋给
 % \cs{l_@@_tmpa_dim}。
 %    \begin{macrocode}
                   \clist_set:Nx \l_@@_tmpa_clist
                      {
-                       \c_@@_name_major_en_tl,
-                       \c_@@_name_researchfield_en_tl,
-                       \c_@@_name_author_en_tl,
-                       \c_@@_name_supervisor_en_tl,
-                       \c_@@_name_cosupervisor_en_tl,
-                       \c_@@_name_date_en_tl,
+                       { \c_@@_name_major_en_tl         },
+                       { \c_@@_name_researchfield_en_tl },
+                       { \c_@@_name_author_en_tl        },
+                       { \c_@@_name_supervisor_en_tl    },
+                       { \c_@@_name_cosupervisor_en_tl  },
+                       { \c_@@_name_date_en_tl          }
                      }
 %    \end{macrocode}
-% 读取右侧作者信息各栏字段，并将最宽者的宽度赋给
+% 读取作者信息变量值，并将最宽者的宽度赋给
 % \cs{l_@@_tmpb_dim}。
 %    \begin{macrocode}
                   \clist_set:Nx \l_@@_tmpb_clist
@@ -5389,20 +5446,20 @@
                 \begin{minipage} [ c ] { \l_@@_tmpa_dim }
                   \flushleft
 %    \end{macrocode}
-% 读取左侧作者信息标识名称字段，并将最宽者的宽度赋给
+% 读取作者信息标识常量，并将最宽者的宽度赋给
 % \cs{l_@@_tmpa_dim}。
 %    \begin{macrocode}
                   \clist_set:Nx \l_@@_tmpa_clist
                      {
-                       \c_@@_name_professionaltype_en_tl,
-                       \c_@@_name_professionalfield_en_tl,
-                       \c_@@_name_author_en_tl,
-                       \c_@@_name_supervisor_en_tl,
-                       \c_@@_name_cosupervisor_en_tl,
-                       \c_@@_name_date_en_tl,
+                       { \c_@@_name_professionaltype_en_tl  },
+                       { \c_@@_name_professionalfield_en_tl },
+                       { \c_@@_name_author_en_tl            },
+                       { \c_@@_name_supervisor_en_tl        },
+                       { \c_@@_name_cosupervisor_en_tl      },
+                       { \c_@@_name_date_en_tl              }
                      }
 %    \end{macrocode}
-% 读取右侧作者信息各栏字段，并将最宽者的宽度赋给
+% 读取作者信息变量值，并将最宽者的宽度赋给
 % \cs{l_@@_tmpb_dim}。
 %    \begin{macrocode}
                   \clist_set:Nx \l_@@_tmpb_clist
@@ -5449,7 +5506,7 @@
 %    \begin{macrocode}
         {1}{
 %    \end{macrocode}
-% 作者、导师、指导小组标识，并取得最宽宽度。
+% 作者、导师、指导小组标识常量，并取得最宽宽度。
 %    \begin{macrocode}
           \clist_set:Nx \l_@@_tmpa_clist
             {
@@ -5463,7 +5520,7 @@
 %    \begin{macrocode}
           \tl_set:Nn \l_@@_tmpa_tl {\clist_use:Nn \l_@@_info_instructors_clist {\@@_quad: }}
 %    \end{macrocode}
-% 作者、导师、指导小组信息，并取得最宽宽度。
+% 作者、导师、指导小组信息变量值，并取得最宽宽度。
 %    \begin{macrocode}
           \clist_set:Nx \l_@@_tmpb_clist
             {
@@ -5909,7 +5966,7 @@
 %
 % \begin{macro}{\makecoveri,\makecoverii,\makecoveriii,
 %     \makecoveriv,\makecoverv,\makecovervi,\makecovervii}
-% 封面一～七，其中一～六为研究生使用，一和七为本科生使用。
+% 封面一$\sim$七，其中一$\sim$六为研究生使用，一和七为本科生使用。
 %    \begin{macrocode}
 % 封面一，研究生、本科生中文封面
 \NewDocumentCommand \makecoveri { }
@@ -5989,20 +6046,24 @@
 %
 % 声明各封面模板组成部分。
 %    \begin{macrocode}
-\int_compare:nNnTF { \g_@@_thesis_type_int } < { 3 }
+\cs_new_protected:Npn \@@_declare_cover_i_template:
   {
+    \int_compare:nNnTF { \g_@@_thesis_type_int } < { 3 }
+      {
 %    \end{macrocode}
 % 研究生封面一
 %    \begin{macrocode}
-    \DeclareCoverTemplate { cover-i   }
-      { logo, type, title, info }
-  }{
+        \DeclareCoverTemplate { cover-i   }
+          { logo, type, title, info }
+      }{
 %    \end{macrocode}
 % 本科生封面一
 %    \begin{macrocode}
-    \DeclareCoverTemplate { cover-i   }
-      { id, logo, type, title, info }
+        \DeclareCoverTemplate { cover-i   }
+          { id, logo, type, title, info }
+      }
   }
+\@@_declare_cover_i_template:
 %    \end{macrocode}
 % 研究生封面二
 %    \begin{macrocode}
@@ -6059,144 +6120,152 @@
 % 定义封面的具体配置参数。
 % 封面一
 %    \begin{macrocode}
-\int_compare:nNnTF { \g_@@_thesis_type_int } < { 3 }
+\cs_new_protected:Npn \@@_define_cover_i_entities:
   {
+    \int_compare:nNnTF { \g_@@_thesis_type_int } < { 3 }
+      {
 %    \end{macrocode}
 % 研究生
 %    \begin{macrocode}
-    \DeclareInstance { nwafu / cover } { cover-i-default } { cover-i }
-      {
-        bottom-skip            = 0 pt plus 1.5 fill,
-        logo     / content     = \@@_cover_logo:,
-        logo     / bottom-skip = -45 pt plus 0.3 fill,
-        logo     / align       = center,
-        type     / content     = \@@_cover_type:,
-        type     / format      = \sffamily \zihao {  0 },% \bfseries,
-        type     / bottom-skip = -20 pt plus 0.3 fill,
-        type     / align       = center,
-        title    / content     =
-          \@@_fixed_width_center_box:nn
-            { 0.9 \textwidth } { \l_@@_info_title_tl },
-        title    / format      = \nwafu@hei \bfseries \zihao { 2 },
-        title    / bottom-skip = 80 pt plus 0.3 fill,
-        title    / align       = center,
-        info     / content     = \@@_cover_info:,
-        info     / format      = \@@_line_spread:n {1.05}\nwafu@hei \zihao { -3 },
-        info     / align       = center,
-      }
-  }{
+        \DeclareInstance { nwafu / cover } { cover-i-default } { cover-i }
+          {
+            bottom-skip            = 0 pt plus 1.5 fill,
+            logo     / content     = \@@_cover_logo:,
+            logo     / bottom-skip = -45 pt plus 0.3 fill,
+            logo     / align       = center,
+            type     / content     = \@@_cover_type:,
+            type     / format      = \sffamily \zihao {  0 },% \bfseries,
+            type     / bottom-skip = -20 pt plus 0.3 fill,
+            type     / align       = center,
+            title    / content     =
+              \@@_fixed_width_center_box:nn
+                { 0.9 \textwidth } { \l_@@_info_title_tl },
+            title    / format      = \nwafu@hei \bfseries \zihao { 2 },
+            title    / bottom-skip = 80 pt plus 0.3 fill,
+            title    / align       = center,
+            info     / content     = \@@_cover_info:,
+            info     / format      = \@@_line_spread:n {1.05}\nwafu@hei \zihao { -3 },
+            info     / align       = center,
+          }
+      }{
 %    \end{macrocode}
 % 本科生
 %    \begin{macrocode}
-    \DeclareInstance { nwafu / cover } { cover-i-default } { cover-i }
-      {
-        bottom-skip            = 0 pt plus 0.5 fill,
-        id       / content     = \@@_cover_id:,
-        id       / format      = \bfseries\zihao { 4 },
-        id       / bottom-skip = 0 pt plus 0.3 fill,
-        id       / align       = right,
-        logo     / content     = \@@_cover_logo:,
-        logo     / bottom-skip = -30 pt,% plus 0.3 fill,
-        logo     / align       = center,
-        type     / content     = \@@_cover_type:,
-        type     / format      = \bfseries\nwafu@kai\zihao {  1 },
-        type     / bottom-skip = -20 pt plus 0.3 fill,
-        type     / align       = center,
-        title    / content     =
-          \@@_fixed_width_center_box:nn
-            { 0.9 \textwidth } { \l_@@_info_title_tl },
-        title    / format      = \nwafu@hei \bfseries\zihao { 2 },
-        title    / bottom-skip = 80 pt plus 0.3 fill,
-        title    / align       = center,
-        info     / content     = \@@_cover_info:,
-        info     / format      = \rmfamily\zihao { 3 },
-        info     / align       = center,
+        \DeclareInstance { nwafu / cover } { cover-i-default } { cover-i }
+          {
+            bottom-skip            = 0 pt plus 0.5 fill,
+            id       / content     = \@@_cover_id:,
+            id       / format      = \bfseries\zihao { 4 },
+            id       / bottom-skip = 0 pt plus 0.3 fill,
+            id       / align       = right,
+            logo     / content     = \@@_cover_logo:,
+            logo     / bottom-skip = -30 pt,% plus 0.3 fill,
+            logo     / align       = center,
+            type     / content     = \@@_cover_type:,
+            type     / format      = \bfseries\nwafu@kai\zihao {  1 },
+            type     / bottom-skip = -20 pt plus 0.3 fill,
+            type     / align       = center,
+            title    / content     =
+              \@@_fixed_width_center_box:nn
+                { 0.9 \textwidth } { \l_@@_info_title_tl },
+            title    / format      = \nwafu@hei \bfseries\zihao { 2 },
+            title    / bottom-skip = 80 pt plus 0.3 fill,
+            title    / align       = center,
+            info     / content     = \@@_cover_info:,
+            info     / format      = \rmfamily\zihao { 3 },
+            info     / align       = center,
+          }
       }
   }
+\@@_define_cover_i_entities:
 %    \end{macrocode}
 % 封面二
 %    \begin{macrocode}
-\int_case:nn {\g_@@_thesis_type_int}
+\cs_new_protected:Npn \@@_define_cover_ii_entities:
   {
-    {1}{
+    \int_case:nn {\g_@@_thesis_type_int}
+      {
+        {1}{
 %    \end{macrocode}
 % 博士研究生
 %    \begin{macrocode}
-         \DeclareInstance { nwafu / cover } { cover-ii-default } { cover-ii }
-           {
-             bottom-skip            = 0 pt plus 0.5 fill,
-             type     / content =
-               \@@_fixed_width_center_box:nn { 0.7\textwidth } {
-                  Thesis~Submitted~to~\c_@@_name_en_tl\\
-                  in~Partial~Fulfillment~of~the~Requirements\\
-                  for~Degree~of\\
-                  Doctor~of~Philosophy
-              },
-             type     / format  = \@@_line_spread:n {1.22} \zihao { -3 },
-             type     / bottom-skip = 42 pt,% plus 0.3 fill,
-             type     / align   = center,
-             title     / content = \l_@@_info_title_en_tl,
-             title     / format  = \@@_line_spread:n {0.90}
-                                   \zihao { 1 } \bfseries,
-             title     / bottom-skip = 35 pt,% plus 0.3 fill,
-             title     / align   = center,
-             info     / content     = \@@_cover_info_en:,
-             info     / format      = \@@_line_spread:n {1.12} \zihao { -3 },
-             info    / bottom-skip = 72 pt,% plus 0.3 fill,
-             info     / align       = center,
-             department     / content     = \l_@@_info_department_en_tl,
-             department     / format      = \zihao { -3 },
-             department     / bottom-skip = -32 pt,% plus 0.3 fill,
-             department     / align       = center,
-             nwafu     / content     = \c_@@_name_en_tl,
-             nwafu     / format      = \zihao { -3 },
-             nwafu     / align       = center,
-           }
-    }
-    {2}{
+             \DeclareInstance { nwafu / cover } { cover-ii-default } { cover-ii }
+               {
+                 bottom-skip            = 0 pt plus 0.5 fill,
+                 type     / content =
+                   \@@_fixed_width_center_box:nn { 0.7\textwidth } {
+                      Thesis~Submitted~to~\c_@@_name_en_tl\\
+                      in~Partial~Fulfillment~of~the~Requirements\\
+                      for~Degree~of\\
+                      Doctor~of~Philosophy
+                  },
+                 type     / format  = \@@_line_spread:n {1.22} \zihao { -3 },
+                 type     / bottom-skip = 42 pt,% plus 0.3 fill,
+                 type     / align   = center,
+                 title     / content = \l_@@_info_title_en_tl,
+                 title     / format  = \@@_line_spread:n {0.90}
+                                       \zihao { 1 } \bfseries,
+                 title     / bottom-skip = 35 pt,% plus 0.3 fill,
+                 title     / align   = center,
+                 info     / content     = \@@_cover_info_en:,
+                 info     / format      = \@@_line_spread:n {1.12} \zihao { -3 },
+                 info    / bottom-skip = 72 pt,% plus 0.3 fill,
+                 info     / align       = center,
+                 department     / content     = \l_@@_info_department_en_tl,
+                 department     / format      = \zihao { -3 },
+                 department     / bottom-skip = -32 pt,% plus 0.3 fill,
+                 department     / align       = center,
+                 nwafu     / content     = \c_@@_name_en_tl,
+                 nwafu     / format      = \zihao { -3 },
+                 nwafu     / align       = center,
+               }
+        }
+        {2}{
 %    \end{macrocode}
 % 硕士研究生
 %    \begin{macrocode}
-         \DeclareInstance { nwafu / cover } { cover-ii-default } { cover-ii }
-           {
-             bottom-skip            = 0 pt plus 0.5 fill,
-             type     / content =
-               \@@_fixed_width_center_box:nn { 0.7\textwidth } {
-                  Thesis~Submitted~to~\c_@@_name_en_tl\\
-                  in~Partial~Fulfillment~of~the~Requirements\\
-                  for~Degree~of\\
-                  Master~of
-                 \int_case:nn {\l_@@_info_degree_type_int}
-                  {
-                    {1}{
-                      \@@_text_uline:V \l_@@_info_mastertype_en_tl
-                    }
-                    {2}{
-                      \@@_text_uline:V \l_@@_info_professionaltype_en_tl
-                    }
-                  }
-               },
-             type     / format  = \@@_line_spread:n {1.22} \zihao { -3 },
-             type     / bottom-skip = 42 pt,% plus 0.3 fill,
-             type     / align   = center,
-             title     / content = \l_@@_info_title_en_tl,
-             title     / format  = \@@_line_spread:n {0.90} \zihao { 1 } \bfseries,
-             title     / bottom-skip = 35 pt,% plus 0.3 fill,
-             title     / align   = center,
-             info     / content     = \@@_cover_info_en:,
-             info     / format      = \@@_line_spread:n {1.12} \zihao { -3 },
-             info    / bottom-skip = 72 pt,% plus 0.3 fill,
-             info     / align       = center,
-             department     / content     = \l_@@_info_department_en_tl,
-             department     / format      = \zihao { -3 },
-             department     / bottom-skip = -32 pt,% plus 0.3 fill,
-             department     / align       = center,
-             nwafu     / content     = \c_@@_name_en_tl,
-             nwafu     / format      = \zihao { -3 },
-             nwafu     / align       = center,
-           }
-    }
+             \DeclareInstance { nwafu / cover } { cover-ii-default } { cover-ii }
+               {
+                 bottom-skip            = 0 pt plus 0.5 fill,
+                 type     / content =
+                   \@@_fixed_width_center_box:nn { 0.7\textwidth } {
+                      Thesis~Submitted~to~\c_@@_name_en_tl\\
+                      in~Partial~Fulfillment~of~the~Requirements\\
+                      for~Degree~of\\
+                      Master~of
+                     \int_case:nn {\l_@@_info_degree_type_int}
+                      {
+                        {1}{
+                          \@@_text_uline:V \l_@@_info_mastertype_en_tl
+                        }
+                        {2}{
+                          \@@_text_uline:V \l_@@_info_professionaltype_en_tl
+                        }
+                      }
+                   },
+                 type     / format  = \@@_line_spread:n {1.22} \zihao { -3 },
+                 type     / bottom-skip = 42 pt,% plus 0.3 fill,
+                 type     / align   = center,
+                 title     / content = \l_@@_info_title_en_tl,
+                 title     / format  = \@@_line_spread:n {0.90} \zihao { 1 } \bfseries,
+                 title     / bottom-skip = 35 pt,% plus 0.3 fill,
+                 title     / align   = center,
+                 info     / content     = \@@_cover_info_en:,
+                 info     / format      = \@@_line_spread:n {1.12} \zihao { -3 },
+                 info    / bottom-skip = 72 pt,% plus 0.3 fill,
+                 info     / align       = center,
+                 department     / content     = \l_@@_info_department_en_tl,
+                 department     / format      = \zihao { -3 },
+                 department     / bottom-skip = -32 pt,% plus 0.3 fill,
+                 department     / align       = center,
+                 nwafu     / content     = \c_@@_name_en_tl,
+                 nwafu     / format      = \zihao { -3 },
+                 nwafu     / align       = center,
+               }
+        }
+      }
   }
+\@@_define_cover_ii_entities:
 %    \end{macrocode}
 % 封面三
 %    \begin{macrocode}
@@ -6456,7 +6525,7 @@
         \tl_if_empty:NF \l_@@_abstract_file_tl
           {
 %    \end{macrocode}
-% 根据提供的文件，排版中文摘要，否则什么都不做。
+% 根据提供的文件，排版中文摘要，如果提供的文件为空，则什么都不做。
 %    \begin{macrocode}
             \begin{abstract}
               \file_input:V \l_@@_abstract_file_tl
@@ -6465,7 +6534,7 @@
         \tl_if_empty:NF \l_@@_abstract_file_en_tl
           {
 %    \end{macrocode}
-% 根据提供的文件，排版英文摘要，否则什么都不做。
+% 根据提供的文件，排版英文摘要，如果提供的文件为空，则什么都不做。
 %    \begin{macrocode}
             \begin{abstract*}
               \file_input:V \l_@@_abstract_file_en_tl
@@ -6484,7 +6553,7 @@
         \tl_if_empty:NF \l_@@_notation_file_tl
           {
 %    \end{macrocode}
-% 根据提供的文件，排版主要符号对照表，否则什么都不做。
+% 根据提供的文件，排版主要符号对照表，如果提供的文件为空，则什么都不做。
 %    \begin{macrocode}
             \cleardoublepage
             \pagenumbering{Roman}
@@ -6499,7 +6568,7 @@
         \tl_if_empty:NF \l_@@_abstract_file_tl
           {
 %    \end{macrocode}
-% 根据提供的文件，排版中文摘要，否则什么都不做。
+% 根据提供的文件，排版中文摘要，如果提供的文件为空，则什么都不做。
 %    \begin{macrocode}
             \begin{abstract}
               \@@_get_text_width:Nn \l_@@_tmpa_dim {\c_@@_name_keywords_tl}
@@ -6518,7 +6587,7 @@
         \tl_if_empty:NF \l_@@_abstract_file_en_tl
           {
 %    \end{macrocode}
-% 根据提供的文件，排版英文摘要，否则什么都不做。
+% 根据提供的文件，排版英文摘要，如果提供的文件为空，则什么都不做。
 %    \begin{macrocode}
             \begin{abstract*}
               \group_begin:
@@ -6537,8 +6606,10 @@
 %    \end{macrocode}
 % \end{macro}
 %
+% 在 \env{document} 开始位置添加封面以及指导小组成员名单。
+%
 %    \begin{macrocode}
-\AfterEndPreamble
+\ctex_after_end_preamble:n
   {
     \bool_if:NT \l_@@_auto_make_cover_bool
       {
@@ -6858,10 +6929,8 @@
 %    \begin{macrocode}
 \NewDocumentEnvironment { abstract  } { }
   { \@@_abstract_begin:    } { \@@_abstract_end:      }
-%<*class>
 \NewDocumentEnvironment { abstract* } { }
   { \@@_abstract_en_begin: } { \@@_abstract_en_end:   }
-%</class>
 %    \end{macrocode}
 % \end{environment}
 % \end{environment}
@@ -6869,7 +6938,6 @@
 % \begin{macro}{\@@_abstract_begin:,\@@_abstract_en_begin:}
 % 摘要页标题。
 %    \begin{macrocode}
-%<*class>
 \cs_new_protected:Npn \@@_abstract_begin:
   {
     \int_compare:nNnTF { \g_@@_thesis_type_int } < { 3 }
@@ -6880,7 +6948,6 @@
         \begin{center}\nwafu@hei\bfseries\zihao{3}\l_@@_info_title_tl\end{center}
       }
   }
-%</class>
 \cs_new_protected:Npn \@@_abstract_en_begin:
   {
     \int_compare:nNnTF { \g_@@_thesis_type_int } < { 3 }
@@ -6897,14 +6964,12 @@
 % \begin{macro}{\@@_abstract_end:,\@@_abstract_en_end:}
 % 摘要正文完成后，输出关键字列表。
 %    \begin{macrocode}
-%<*class>
 \cs_new_protected:Npn \@@_abstract_end:
   {
     \@@_keywords:nNn
       { \sffamily \zihao{-4} \c_@@_name_keywords_tl \c_@@_fwid_colon_tl  }
       \l_@@_abstract_keywords_clist { ; ~}
   }
-%</class>
 \cs_new_protected:Npn \@@_abstract_en_end:
   {
     \@@_keywords:nNn
@@ -7002,7 +7067,7 @@
 % \subsection{个人简历}
 %
 % \begin{environment}{resume}
-% 致谢环境，只是简单地设置章节不编号标题。
+% 个人简历环境，只是简单地设置章节不编号标题。
 %    \begin{macrocode}
 \NewDocumentEnvironment { resume } { }
   {
@@ -7016,12 +7081,15 @@
 % \end{environment}
 %
 % \begin{macro}{\resumeitem,\researchitem}
-% 摘要页标题。
+% 学习经历。
 %    \begin{macrocode}
 \NewDocumentCommand{ \resumitem }{ O{ 学习经历 } }
   {%
     \vspace{24bp}{\zihao{-4}\nwafu@hei\bfseries\centerline{#1}}\par\vspace{6bp}
   }
+%    \end{macrocode}
+% 学术成果。
+%    \begin{macrocode}
 \NewDocumentCommand{ \researchitem }{ O{ 发表的学术论文 } }
   {%
     \vspace{32bp}{\zihao{-4}\nwafu@hei\bfseries\centerline{#1}}\par\vspace{14bp}
@@ -7034,16 +7102,18 @@
 % 个人简历中发论文和研究成果列表环境。
 %    \begin{macrocode}
 \newlist{publications}{enumerate}{1}
-\setlist[publications]{label=[\arabic*],align=left,nosep,itemsep=6bp,
-  leftmargin=10mm,before=\zihao{-4},resume}
+\setlist[publications]{label=[\arabic*],align=left,nosep,itemsep=3bp,
+  leftmargin=10mm,before=\zihao{5},resume}
 \newlist{achievements}{enumerate}{1}
-\setlist[achievements]{label=[\arabic*],align=left,nosep,itemsep=6bp,
-  leftmargin=10mm,before=\zihao{-4}}
+\setlist[achievements]{label=[\arabic*],align=left,nosep,itemsep=3bp,
+  leftmargin=10mm,before=\zihao{5}}
 \def\publicationskip{\bigskip\bigskip}
 %    \end{macrocode}
 % \end{environment}
 % \end{environment}
 %
+% \changes{v1.10}{2022/03/17}{直接使用胡振震制定的gb7714-NWAFU实现参考文献样式控制。}
+%
 % \subsection{参考文献著录与引用}
 %
 % \begin{variable}{\l_@@_bib_resource_clist}
@@ -7068,8 +7138,6 @@
 % 为了保证导言区中的设置能起作用，\pkg{biblatex} 宏包均需要在
 % 导言区末尾载入（仍在 \pkg{hyperref} 之前），并做相关设置。
 %    \begin{macrocode}
-% \AddToHook
-%   { env/document/begin }
 \@@_at_end_preamble:n
   {
     \@@_biblatex_pre_setup:
@@ -7089,24 +7157,18 @@
 %    \end{macrocode}
 % 参考文献引用与著录样式。
 %    \begin{macrocode}
-    \@@_pass_options_to_biblatex:n { style = gb7714-2015ay }
+    \@@_pass_options_to_biblatex:n { style = gb7714-NWAFU }
 %    \end{macrocode}
 % 其它参数。
 %    \begin{macrocode}
-    \@@_pass_options_to_biblatex:n { backend = biber, sortlocale=zh__pinyin,
-        gbtype=false, maxbibnames=99, maxcitenames=2, mincitenames=1,
-        gbpub=false, uniquename=false, uniquelist=false, gbnamefmt=lowercase,
-        doi=false, isbn=false, gbfieldtype=true, gbpunctin=false,
-      }
+    \@@_pass_options_to_biblatex:n { backend = biber, }
   }
 \cs_new_protected:Npn \@@_biblatex_post_setup:
   {
 %    \end{macrocode}
 % 载入参考文献数据源文件。
 %    \begin{macrocode}
-    \@@_biblatex_misc:
     \clist_map_function:NN \l_@@_bib_resource_clist \addbibresource
-    \@@_biblatex_allow_url_break:
 %    \end{macrocode}
 % 修改参考文献标题。
 %    \begin{macrocode}
@@ -7117,462 +7179,13 @@
 %    \end{macrocode}
 % \end{macro}
 %
-% \begin{macro}{\@@_biblatex_misc:}
-% \pkg{biblatex} 中需要针对西北农林科技大学参考文献规范的特殊设置。
-% 由符合 GB/T 7714-2015 标准的 biblatex 参考文献样式
-% (\url{https://github.com/hushidong/biblatex-gb7714-2015})
-% 作者胡振震协助实现。
-%    \begin{macrocode}
-\cs_new:Npn \@@_biblatex_misc:
-  {
-%    \end{macrocode}
-% 表示范围的波浪线符号
-%    \begin{macrocode}
-    \DefineBibliographyExtras{english}{\renewcommand*{\bibrangedash}{$\sim$}}
-%    \end{macrocode}
-% 设置全局字体字号(5号字，行间距为1.3)
-%    \begin{macrocode}
-    \newcommand\nwafu@font@bib{\@@_line_spread:n {1.3}\zihao{5}}
-    \renewcommand{\bibfont}{\nwafu@font@bib}
-%    \end{macrocode}
-% 英文期刊名称用斜休(Italic体)
-%    \begin{macrocode}
-    \DeclareFieldFormat[article]{journaltitle}{\iffieldequalstr{userd}{chinese}{##1}{\textit{##1}}\isdot}
-%    \end{macrocode}
-% \tn{parencite}命令引用标注后导分割符
-%    \begin{macrocode}
-    \renewcommand{\postnotedelim}{\addcolon\space}
-%    \end{macrocode}
-% 删除\tn{parencite}命令引用标注中有页码选项时的p. pp.字符
-%    \begin{macrocode}
-    \DeclareFieldFormat{postnote}{##1}
-%    \end{macrocode}
-% 引用标注作者年制中作者和年份之间的标点(人名与年之间用空格分隔)
-%    \begin{macrocode}
-    \DeclareDelimFormat[cite,parencite,pagescite]{nameyeardelim}{\space}
-    \DeclareDelimFormat[textcite]{nameyeardelim}{\space}
-%    \end{macrocode}
-% 文献著录列表中作者与年之间的分割符(最后一个作者后用点)
-%    \begin{macrocode}
-    \DeclareDelimFormat[bib,biblist]{nameyeardelim}{\addperiod\space}
-%    \end{macrocode}
-% 删除文献著录列表中最后的点
-%    \begin{macrocode}
-    \renewcommand*{\finentrypunct}{}
-%    \end{macrocode}
-% 修改部分中文化字符串
-%    \begin{macrocode}
-    \DefineBibliographyStrings{english}{
-        andincitecn = {和},
-        andincite   = {and},
-        mathesiscn={[硕士学位论文]},
-        phdthesiscn={[博士学位论文]},
-        in={In:\addspace},
-        incn={见:\addspace},
-      }
-%    \end{macrocode}
-% 修改最后一个作者前的字符串，比如“and”、“和”。
-%
-% 原理方法:默认情况下判断作者或译者是否中文，若中文用字符andcn=“和”，否则用and=“and”。
-% 非默认情况，根据选项信息，选择选择强制中文或英文
-% 首先设置全局的，然后设置文献表中的，这一等价于将所有的cite命令环境都设置过了
-% 而不用对每一个引用命令单独设置，比如cite，parancite，textcite都设置
-%    \begin{macrocode}
-    \DeclareDelimFormat{finalnamedelim}{%
-        \ifnumgreater{\value{liststop}}{2}{\finalandcomma}{}%
-        \edef\userfieldabcde{userd}%
-        \ifcurrentname{translator}{\edef\userfieldabcde{usere}}{}%
-        \ifcurrentname{editor}{\edef\userfieldabcde{userc}}{}%
-        \ifcurrentname{author}{\edef\userfieldabcde{userf}}{}%
-        \ifcurrentname{bookauthor}{\edef\userfieldabcde{userb}}{}%
-        \ifcase\value{gbcitelocalcase}%
-          \iffieldequalstr{\userfieldabcde}{chinese}{\bibstring{andincitecn}}{}%
-          \iffieldequalstr{\userfieldabcde}{korean}{\bibstring{andkr}}{}%
-          \iffieldequalstr{\userfieldabcde}{japnese}{\bibstring{andjp}}{}%
-          \iffieldequalstr{\userfieldabcde}{english}{\addspace\bibstring{andincite}\addspace}{}%
-          \iffieldequalstr{\userfieldabcde}{french}{\addspace\bibstring{and}\addspace}{}%
-          \iffieldequalstr{\userfieldabcde}{russian}{\addspace\bibstring{and}\addspace}{}%
-        \or%
-        \bibstring{andincitecn}%
-        \or%
-        \addspace\bibstring{andincite}\addspace%
-        \fi
-      }
-%    \end{macrocode}
-% 20190215， 胡振震邮件指导代码
-% 去掉超过3个著者时汉字“等”前的空格(GB/T 7714-2015规定需要有空格)
-%    \begin{macrocode}
-    \DeclareDelimFormat{strandothersdelim}{%
-        \ifnumgreater{\value{liststop}}{2}{\finalandcomma}{}%
-        %\addspace%
-        \edef\userfieldabcde{userd}%
-        \ifcurrentname{translator}{\edef\userfieldabcde{usere}}{}%
-        \ifcurrentname{editor}{\edef\userfieldabcde{userc}}{}%
-        \ifcurrentname{author}{\edef\userfieldabcde{userf}}{}%
-        \ifcurrentname{bookauthor}{\edef\userfieldabcde{userb}}{}%
-        \ifcase\value{gbcitelocalcase}%
-          \iffieldequalstr{\userfieldabcde}{chinese}{\bibstring{andothersincitecn}}{}%
-          \iffieldequalstr{\userfieldabcde}{korean}{\bibstring{andotherskr}}{}%
-          \iffieldequalstr{\userfieldabcde}{japnese}{\bibstring{andothersjp}}{}%
-          \iffieldequalstr{\userfieldabcde}{english}{\bibstring{andothersincite}}{}%
-          \iffieldequalstr{\userfieldabcde}{french}{\bibstring{andothers}}{}%
-          \iffieldequalstr{\userfieldabcde}{russian}{\bibstring{andothers}}{}%
-        \or%
-        \bibstring{andothersincitecn}%
-        \or%
-        \bibstring{andothersincite}%
-        \fi
-      }
-%    \end{macrocode}
-% 设置andothersdelim
-%    \begin{macrocode}
-    \AtEveryCitekey{%
-        \iffieldequalstr{userf}{chinese}{\renewcommand*{\andothersdelim}{}}%\addthinspace
-        {\renewcommand*{\andothersdelim}{\addspace}}%
-      }
-%    \end{macrocode}
-% 标注压缩时，直接用date+extradate代替extradate实现2006a，2006b的效果
-%    \begin{macrocode}
-    \renewbibmacro*{cite:extradate}{%
-        \iffieldundef{extradate} {}
-        {\printtext[bibhyperref]{\printlabeldateextra}}%\printfield{extradate}
-      }
-%    \end{macrocode}
-% 文献表中的日期格式
-%    \begin{macrocode}
-    \renewbibmacro*{date+extradate}{%
-        \iffieldundef{labelyear}{}%
-        {\ifboolexpr{%
-           test {\ifentrytype{patent}}
-           or
-           (test {\ifentrytype{newspaper}} )%
-         }%
-         {\printtext{\blx@isodate{}{}}}%
-         {\printtext{%
-             \iflabeldateisdate
-             {\printdateextra}
-             {\printlabeldateextra}
-          }
-         }%
-        }%
-      }
-    \newbibmacro*{origdate+extradate}{%
-        \printtext{\printorigdate}%
-      }
-%    \end{macrocode}
-% 修改译者位置格式
-%    \begin{macrocode}
-    \renewbibmacro*{bytranslator+others}{%
-        \ifnameundef{translator}
-          {}
-          {\printnames[bytranslator]{translator}%
-           \usebibmacro{bytranslator+othersstrg}%“译”的位置换到下面来，即放到译者后面。
-           \newunit
-          }%
-        \usebibmacro{withothers}%
-        \ifboolexpr{%
-          test {\iffieldundef{origyear}} or test {\ifnameundef{translator}}%%
-        }{}{\printtext{\printdate}}%
-      }
-%    \end{macrocode}
-% url和url日期格式
-%    \begin{macrocode}
-    \renewbibmacro*{url+urldate}{%
-        \usebibmacro{url}%
-        \iffieldundef{urlyear}%
-        {}
-        {\usebibmacro{urldate}
-        }
-      }
-    \DeclareFieldFormat{addnumflag}{%
-        \ifentrytype{newspaper}
-        {\setunit{\addcomma\addspace}\printtext{##1}}
-        {\nobreak\printtext{(}\nobreak ##1\nobreak\printtext{)}}
-      }
-%    \end{macrocode}
-% 重设专利title的输出，输出文献类型标识符
-%    \begin{macrocode}
-    \renewbibmacro*{patenttitle}{%原输出来自biblatex.def文件
-        \ifboolexpr{%
-          test{\iffieldundef{title}}%
-          and%
-          test{\iffieldundef{subtitle}}%
-        }%
-        {}%
-        {
-          \printtext[title]{\bibtitlefont%
-          \printfield[titlecase]{title}%
-          \ifboolexpr{test {\iffieldundef{subtitle}}}%这里增加了对子标题的判断，解决不判断多一个点的问题
-          {}
-          {
-            \setunit{\subtitlepunct}%
-            \printfield[titlecase]{subtitle}}%
-            \iffieldundef{titleaddon}{}%判断一下titleaddon，否则直接加可能多一个空格
-            {\setunit{\subtitlepunct}\printfield{titleaddon}}%
-            \setunit{\adddot\addspace}\printfield{number}%写专利号
-            \iftoggle{bbx:gbtype}{\printfield[gbtypeflag]{usera}}{}%
-          }%
-        }%
-      }
-%    \end{macrocode}
-% 修改作者数量超过限定值，省略时的处理格式
-% 20190103,hzz,修改利用新定义的一个分隔符strandothersdelim
-%
-% 原理方法:判断作者或译者是否中文，若中文用字符等，否则用et al. 。
-%    \begin{macrocode}
-    \renewbibmacro*{name:andothers}{%
-        \ifboolexpr{
-          test {\ifnumequal{\value{listcount}}{\value{liststop}}}
-          and
-          test \ifmorenames
-        }{\ifnumgreater{\value{liststop}}{1}%
-            {\finalandcomma}%
-            {}%
-            \printdelim{andothersdelim}\printdelim{strandothersdelim}%
-        }{%当是译者的时候需要特殊处理
-          \ifcurrentname{translator}{\addcomma}{}%
-        }
-      }
-%    \end{macrocode}
-% 修改对edition版本信息格式
-%    \begin{macrocode}
-    \DeclareFieldFormat{edition}{%
-        \testCJKfirst{userd}%
-        \iftoggle{ifCJKforgbt}%
-        {\ifinteger{##1}%
-          {\printtext{\bibstring{serialcn}\zhnumber{##1}\str@edition}}%
-          {##1\isdot}
-        }%
-        {\ifinteger{##1}%
-          {\mkbibordedition{##1}~\bibstring{edition}}%
-          {##1\isdot}
-        }
-      }
-%    \end{macrocode}
-% 注意这里当没有作者只有标题时在年份之前的标点是否需要
-% 标准并未涉及，所以未做处理。
-%    \begin{macrocode}
-    \renewbibmacro*{author}{%
-        \ifboolexpr{
-          test \ifuseauthor
-          and
-          not test {\ifnameundef{author}}
-        }{\usebibmacro{bbx:dashcheck}
-           {\printnames{author}\setunit{\printdelim{nameyeardelim}}%把标点也带上
-           }{\usebibmacro{bbx:savehash}%
-             \printnames{author}%
-             \iffieldundef{authortype}
-               {\setunit{\printdelim{nameyeardelim}}}
-               {\setunit{\printdelim{authortypedelim}}}
-           }%
-           \iffieldundef{authortype}
-             {}
-             {\usebibmacro{authorstrg}%
-              \setunit{\printdelim{nameyeardelim}}
-             }
-        }%
-        {\global\undef\bbx@lasthash
-         \usebibmacro{labeltitle}%
-         \setunit*{\printdelim{nonameyeardelim}}
-        }%
-        \ifboolexpr{%
-          test {\iffieldundef{origyear}} or test {\ifnameundef{translator}}%
-        }{\usebibmacro{date+extradate}}%
-        {\usebibmacro{origdate+extradate}}%
-      }
-%    \end{macrocode}
-% book条目类的驱动
-%    \begin{macrocode}
-    \DeclareBibliographyDriver{book}{%源来自standard.bbx文件
-        \usebibmacro{bibindex}%
-        \usebibmacro{begentry}%
-        \usebibmacro{author/editor+others/translator+others}%
-        \ifnameundef{author}{}{\setunit{\labelnamepunct}\newblock}%这一段用于去除作者不存在时多出的标点
-        \usebibmacro{maintitle+title}%
-        \iftoggle{bbx:gbstrict}{}{%
-          \newunit%
-          \printlist{language}%
-          \newunit\newblock%
-          \usebibmacro{byauthor}%
-          \newunit\newblock%
-        }%
-        \newunit%
-        \printfield{edition}%
-        \newunit%
-        \usebibmacro{byeditor+others}%
-        \newunit\newblock%
-        \iftoggle{bbx:gbstrict}{}{%
-          \iffieldundef{maintitle}%
-          {%
-            \printfield{volume}%
-            \printfield{part}%
-          }%
-          {}%
-          \newunit%
-          \printfield{volumes}%
-          \newunit\newblock%
-          \usebibmacro{series+number}%
-        }%
-        \newunit\newblock%
-        \usebibmacro{publisher+location+date}%
-        \usebibmacro{chapter+pages}%
-        \iffieldundef{url}{}{%当没有网址时也不输出
-          \usebibmacro{modifydate}%带括号的修改或更新日期，
-        }%
-        \usebibmacro{doi+eprint+url}%从下面移动到上面来，因为gbt2015的url需直接放在页码后面。
-        \newunit\newblock%
-        \printfield{pagetotal}%
-        \newunit\newblock%
-        \iftoggle{bbx:isbn}%
-          {\printfield{isbn}}
-          {}%
-        \newunit\newblock%
-        \usebibmacro{addendum+pubstate}%
-        \setunit{\bibpagerefpunct}\newblock
-        \usebibmacro{pageref}%
-        \newunit\newblock%
-        \iftoggle{bbx:related}%
-          {\usebibmacro{related:init}%
-           \usebibmacro{related}%
-          }{}%
-        \usebibmacro{finentry}
-      }
-%    \end{macrocode}
-% 在线文献驱动
-%    \begin{macrocode}
-    \DeclareBibliographyDriver{online}{%源来自standard.BBX
-        \usebibmacro{bibindex}%
-        \usebibmacro{begentry}%
-        \usebibmacro{author/editor+others/translator+others}%
-        \ifnameundef{author}{}{\setunit{\labelnamepunct}\newblock}%这一段用于去除作者不存在时多出的标点
-        \usebibmacro{title}%
-        \iftoggle{bbx:gbstrict}{}{%
-          \newunit%
-          \printlist{language}%
-          \newunit\newblock
-          \usebibmacro{byauthor}%
-          \newunit\newblock
-          \usebibmacro{byeditor+others}%
-          \newunit\newblock
-          \printfield{note}
-        }%
-        \newunit
-        \printfield{version}%
-        \newunit\newblock
-        \printlist{institution}%
-        \newunit\newblock
-        \ifboolexpr{%
-          test{\iffieldundef{day}} and test{\iffieldundef{endday}} and test{\iffieldundef{eventday}}%
-        }{\usebibmacro{date}}%
-        \usebibmacro{url+urldate}%从下面移上来
-        \newunit\newblock
-        \iftoggle{bbx:eprint}
-          {\usebibmacro{eprint}}
-          {}%
-        \newunit\newblock
-        \usebibmacro{addendum+pubstate}%
-        \setunit{\bibpagerefpunct}\newblock
-        \usebibmacro{pageref}%
-        \newunit\newblock
-        \iftoggle{bbx:related}
-          {\usebibmacro{related:init}%
-           \usebibmacro{related}}
-          {}%
-        \usebibmacro{finentry}
-      }
-%    \end{macrocode}
-% 专利文献驱动
-%    \begin{macrocode}
-    \DeclareBibliographyDriver{patent}{%源来自standard.BBX
-        \usebibmacro{bibindex}%
-        \usebibmacro{begentry}%
-        \usebibmacro{author}%
-        \ifnameundef{author}{}{\setunit{\labelnamepunct}\newblock}%这一段用于去除作者不存在时多出的标点
-        \usebibmacro{patenttitle}%给出专利专用的标题输出
-        \iftoggle{bbx:gbstrict}{}{%
-          \newunit%
-          \printlist{language}%
-          \newunit\newblock
-          \usebibmacro{byauthor}
-        }%
-        \newunit\newblock
-        \printfield{type}%
-        \setunit*{\addspace}%
-        \iflistundef{location}
-          {}
-          {\setunit*{\addspace}%
-           \printtext{%[parens]
-           \printlist[][-\value{listtotal}]{location}}
-          }%
-        \newunit\newblock
-        \usebibmacro{byholder}%
-        \newunit\newblock
-        \printfield{note}%
-        \newunit\newblock
-        \usebibmacro{doi+eprint+url}%
-        \newunit\newblock
-        \usebibmacro{addendum+pubstate}%
-        \setunit{\bibpagerefpunct}\newblock
-        \usebibmacro{pageref}%
-        \newunit\newblock
-        \iftoggle{bbx:related}
-          {\usebibmacro{related:init}%
-           \usebibmacro{related}
-          }
-          {}%
-        \usebibmacro{finentry}
-      }
-%    \end{macrocode}
-% 间距的控制
-%    \begin{macrocode}
-    \setlength{\bibitemsep}{2pt}
-    \setlength{\bibnamesep}{0ex}
-    \setlength{\bibinitsep}{0ex}
-%    \end{macrocode}
-% 文献著录条目缩进控制(悬挂缩进4英文字符)
-%    \begin{macrocode}
-    \setlength{\bibitemindent}{-2\ccwd}% bibitemindent表示一条文献中第一行相对后面各行的缩进
-    \setlength{\bibhang}{2\ccwd} % 表示的各行起始位置到页边的距离
-  }
-%    \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\@@_biblatex_allow_url_break:}
-% \pkg{biblatex} 下允许 URL 在字母、数字和一些特殊符号处断行。
-%    \begin{macrocode}
-\cs_new:Npn \@@_biblatex_allow_url_break:
-  {
-    \int_set_eq:NN \c@biburlucpenalty  \c_one_int
-    \int_set_eq:NN \c@biburlnumpenalty \c_one_int
-    \int_set_eq:NN \c@biburllcpenalty  \c_one_int
-  }
-%    \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\@@_set_cite_style_author_year:}
-% 著者—出版年制下的引用样式。
-%    \begin{macrocode}
-\cs_new:Npn \@@_set_cite_style_author_year:
-  {
-    \NAT@numbersfalse
-%<*class>
-    \cs_set_eq:NN \NAT@open  \c_@@_fwid_left_paren_tl
-    \cs_set_eq:NN \NAT@close \c_@@_fwid_right_paren_tl
-    \cs_set_eq:NN \NAT@sep   \c_@@_fwid_semicolon_tl
-    \cs_set_eq:NN \NAT@aysep \c_@@_fwid_comma_tl
-    \cs_set_eq:NN \NAT@yrsep \c_@@_ideo_comma_tl
-%</class>
-  }
-%    \end{macrocode}
-% \end{macro}
-%
 % \subsection{间距设置}
 %
 % 段落间距
 %    \begin{macrocode}
 \skip_set:Nn \parskip { 0pt plus 2pt minus 1pt }
 %    \end{macrocode}
-% 浮动体顶商与底端所留距离
+% 浮动体顶端与底端所留距离
 %    \begin{macrocode}
 \skip_set:Nn \intextsep { 14pt plus 2pt minus 2pt }
 %    \end{macrocode}
@@ -7611,12 +7224,9 @@
     { bullet   } { \textbullet                      },
     { endash   } { \normalfont\bfseries\textendash  },
     { asterisk } { \textasteriskcentered            },
-    { arabic   } { \bool_if:NTF \l_@@_withchap_bool
-                      { \arabic*. }{ (\arabic*) }   },
-    { alph     } { \bool_if:NTF \l_@@_withchap_bool
-                      { \alph*. }{ (\alph*) }       },
-    { roman    } { \bool_if:NTF \l_@@_withchap_bool
-                      { \roman*. }{ (\roman*) }     },
+    { arabic   } { (\arabic*)                       },
+    { alph     } { (\alph*)                         },
+    { roman    } { (\roman*)                        },
     { alph     } { (\alph*)                         },
     { roman    } { \roman*.                         },
     { outline  } { \upshape\ding{111}               }
@@ -7884,7 +7494,6 @@
 % 模板预定义的常用数学环境。
 % 其中的“证明”比较特殊，它不编号，但会添加证毕符号。
 %    \begin{macrocode}
-%<*class>
 \newtheorem* { proof       } { \c_@@_name_proof_tl      }
 \newtheorem  { axiom       } { \c_@@_name_axiom_tl      }
 \newtheorem  { corollary   } { \c_@@_name_corollary_tl  }
@@ -7893,7 +7502,6 @@
 \newtheorem  { lemma       } { \c_@@_name_lemma_tl      }
 \newtheorem  { theorem     } { \c_@@_name_theorem_tl    }
 %</class>
-%</class>
 %    \end{macrocode}
 % \end{environment}
 % \end{environment}
diff --git a/macros/unicodetex/latex/nwafuthesis/nwafuthesis.pdf b/macros/unicodetex/latex/nwafuthesis/nwafuthesis.pdf
index 1d605186a8..17858a0099 100644
--- a/macros/unicodetex/latex/nwafuthesis/nwafuthesis.pdf
+++ b/macros/unicodetex/latex/nwafuthesis/nwafuthesis.pdf
author	Norbert Preining <norbert@preining.info>	2022-03-22 03:01:37 +0000
committer	Norbert Preining <norbert@preining.info>	2022-03-22 03:01:37 +0000
commit	51119d11f3700a5be7da086dacad56dd219a5c90 (patch)
tree	004fca9000d3b9524fc2dad4bb7e01c45eb25665 /macros
parent	418f27fe2e2b233c282c7388ed4f2bf3461a958f (diff)