378 files changed, 1665 insertions, 722 deletions

diff --git a/macros/latex/contrib/bxcalc/README-ja.md b/macros/latex/contrib/bxcalc/README-ja.md
index ed83dd6091..a7df704b32 100644
--- a/macros/latex/contrib/bxcalc/README-ja.md
+++ b/macros/latex/contrib/bxcalc/README-ja.md
@@ -51,6 +51,9 @@ bxcalcux パッケージ ― 新��長����追加
 更新履歴
 --------
 
+  * Version 1.1  〈2020/09/25〉
+      - LaTeX カー�ル 2020/10/01 版��対応。
+
   * Version 1.0b 〈2019/11/24〉
       - �グ修正。
 
diff --git a/macros/latex/contrib/bxcalc/README.md b/macros/latex/contrib/bxcalc/README.md
index 7819e5c1eb..d260021cb7 100644
--- a/macros/latex/contrib/bxcalc/README.md
+++ b/macros/latex/contrib/bxcalc/README.md
@@ -33,6 +33,10 @@ bxcalc package ― main
 
 This package simply loads all other packages in this bundle.
 
+Note: Under the LaTeX kernel of the version 2020/10/01 or later, the
+bxcalcize package is not loaded since it is no longer needed.
+
+
 bxcalcize package ― to make calc expressions available in more places
 ----------------------------------------------------------------------
 
@@ -41,6 +45,10 @@ the use of calc expressions. This package makes such uses possible.
 
 See the manual bxcalcize.pdf for detail.
 
+Note: The functionality of this package will be provided by the LaTeX
+kernel of the version 2020/10/01.
+
+
 bxcalcux package ― to add user-defined units to the calc syntax
 ----------------------------------------------------------------
 
@@ -49,9 +57,13 @@ calc expressions.
 
 See the manual bxcalcux.pdf for detail.
 
+
 Revision History
 ----------------
 
+  * Version 1.1  〈2020/09/25〉
+      - Support LaTeX kernel 2020/10/01.
+
   * Version 1.0b 〈2019/11/24〉
       - Bug fix.
 
diff --git a/macros/latex/contrib/bxcalc/bxcalc.sty b/macros/latex/contrib/bxcalc/bxcalc.sty
index d71eb2a361..3336088f5b 100644
--- a/macros/latex/contrib/bxcalc/bxcalc.sty
+++ b/macros/latex/contrib/bxcalc/bxcalc.sty
@@ -1,7 +1,7 @@
 %%
 %% This is file 'bxcalc.sty'.
 %% 
-%% Copyright (c) 2018-2019 Takayuki YATO (aka. "ZR")
+%% Copyright (c) 2018-2020 Takayuki YATO (aka. "ZR")
 %%   GitHub:   https://github.com/zr-tex8r
 %%   Twitter:  @zr_tex8r
 %%
@@ -10,14 +10,16 @@
 
 %% package declaration
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{bxcalc}[2019/11/24 v1.0b]
+\ProvidesPackage{bxcalc}[2020/09/25 v1.1]
 \def\bxqcz@pkgname{bxcalc}
 
 %--------------------------------------- main
 
 %% packages
 \RequirePackage{calc}[]
-\RequirePackage{bxcalcize}[2017/05/21]% v1.0
+\@ifl@t@r\fmtversion{2020/10/01}{}{%else
+  \RequirePackage{bxcalcize}[2017/05/21]% v1.0
+}
 \RequirePackage{bxcalcux}[2017/05/21]% v1.0
 
 %--------------------------------------- \usepTeXunits
diff --git a/macros/latex/contrib/bxcalc/bxcalcize.pdf b/macros/latex/contrib/bxcalc/bxcalcize.pdf
index cc15e7cb16..23fe3879ef 100644
--- a/macros/latex/contrib/bxcalc/bxcalcize.pdf
+++ b/macros/latex/contrib/bxcalc/bxcalcize.pdf
diff --git a/macros/latex/contrib/bxcalc/bxcalcize.sty b/macros/latex/contrib/bxcalc/bxcalcize.sty
index f469cd4ab9..ebb119ae01 100644
--- a/macros/latex/contrib/bxcalc/bxcalcize.sty
+++ b/macros/latex/contrib/bxcalc/bxcalcize.sty
@@ -1,7 +1,7 @@
 %%
 %% This is file 'bxcalcize.sty'.
 %% 
-%% Copyright (c) 2018-2019 Takayuki YATO (aka. "ZR")
+%% Copyright (c) 2018-2020 Takayuki YATO (aka. "ZR")
 %%   GitHub:   https://github.com/zr-tex8r
 %%   Twitter:  @zr_tex8r
 %%
@@ -10,7 +10,7 @@
 
 %% package declaration
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{bxcalcize}[2019/11/24 v1.0b]
+\ProvidesPackage{bxcalcize}[2020/09/25 v1.1]
 \def\bxcy@pkgname{bxcalcize}
 
 %% code guards
@@ -36,6 +36,14 @@
 \RequirePackage{etoolbox}[]
 \ifx\numdef\@undefined\endinput\fi
 
+% check kernel version
+\@ifl@t@r\fmtversion{2020/10/01}{%
+  \PackageWarningNoLine\bxcy@pkgname
+   {Functionality of this package is already\MessageBreak
+    provided by LaTeX}%
+  \endinput
+}{}
+
 %% variables
 \newdimen\bxcy@resdim
 
diff --git a/macros/latex/contrib/bxcalc/bxcalcize.tex b/macros/latex/contrib/bxcalc/bxcalcize.tex
index d4663a7b66..5645aa9b06 100644
--- a/macros/latex/contrib/bxcalc/bxcalcize.tex
+++ b/macros/latex/contrib/bxcalc/bxcalcize.tex
@@ -2,8 +2,8 @@
 \usepackage[scale=0.75]{geometry}
 \usepackage{shortvrb}
 \MakeShortVerb{\|}
-\newcommand{\PkgVersion}{1.0b}
-\newcommand{\PkgDate}{2019/11/24}
+\newcommand{\PkgVersion}{1.1}
+\newcommand{\PkgDate}{2020/09/25}
 \newcommand{\Pkg}[1]{\textsf{#1}}
 \newcommand{\Meta}[1]{$\langle$\textit{#1}$\rangle$}
 \newcommand{\Note}{\par\noindent \textbf{NB:}\quad}
@@ -17,6 +17,12 @@
 \maketitle
 
 %===========================================================
+\section{Notice}
+
+Functionality of this package will be provided by the LaTeX
+kernel of the version 2020/10/01.
+
+%===========================================================
 \section{Overview}
 
 After loading \Pkg{calc}, most of the length specifications
diff --git a/macros/latex/contrib/bxcalc/bxcalcux.pdf b/macros/latex/contrib/bxcalc/bxcalcux.pdf
index 61ff9003b2..fa530e451f 100644
--- a/macros/latex/contrib/bxcalc/bxcalcux.pdf
+++ b/macros/latex/contrib/bxcalc/bxcalcux.pdf
diff --git a/macros/latex/contrib/bxcalc/bxcalcux.sty b/macros/latex/contrib/bxcalc/bxcalcux.sty
index 9c55a6f781..90e222643a 100644
--- a/macros/latex/contrib/bxcalc/bxcalcux.sty
+++ b/macros/latex/contrib/bxcalc/bxcalcux.sty
@@ -1,7 +1,7 @@
 %%
 %% This is file 'bxcalcux.sty'.
 %% 
-%% Copyright (c) 2018-2019 Takayuki YATO (aka. "ZR")
+%% Copyright (c) 2018-2020 Takayuki YATO (aka. "ZR")
 %%   GitHub:   https://github.com/zr-tex8r
 %%   Twitter:  @zr_tex8r
 %%
@@ -10,7 +10,7 @@
 
 %% package declaration
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{bxcalcux}[2019/11/24 v1.0b]
+\ProvidesPackage{bxcalcux}[2020/09/25 v1.1]
 \def\bxcx@pkgname{bxcalcux}
 
 %% code guards
diff --git a/macros/latex/contrib/bxcalc/bxcalcux.tex b/macros/latex/contrib/bxcalc/bxcalcux.tex
index 4f6ca48b41..2dd90a17c3 100644
--- a/macros/latex/contrib/bxcalc/bxcalcux.tex
+++ b/macros/latex/contrib/bxcalc/bxcalcux.tex
@@ -2,8 +2,8 @@
 \usepackage[scale=0.75]{geometry}
 \usepackage{shortvrb}
 \MakeShortVerb{\|}
-\newcommand{\PkgVersion}{1.0b}
-\newcommand{\PkgDate}{2019/11/24}
+\newcommand{\PkgVersion}{1.1}
+\newcommand{\PkgDate}{2020/09/25}
 \newcommand{\Pkg}[1]{\textsf{#1}}
 \newcommand{\Meta}[1]{$\langle$\textit{#1}$\rangle$}
 \newcommand{\Note}{\par\noindent \textbf{NB:}\quad}
diff --git a/macros/latex/contrib/doclicense/doclicense.dtx b/macros/latex/contrib/doclicense/doclicense.dtx
index ef894621f8..75e34f64a8 100644
--- a/macros/latex/contrib/doclicense/doclicense.dtx
+++ b/macros/latex/contrib/doclicense/doclicense.dtx
@@ -27,7 +27,7 @@
 %<package>\NeedsTeXFormat{LaTeX2e}[1998/12/01]
 %<package>\ProvidesPackage{doclicense}
 %<*package>
-    [2020/09/18 v2.2.1.dev Support for putting documents under a license]
+    [2020/09/25 v2.2.1 Support for putting documents under a license]
 %</package>
 %
 %<*driver>
@@ -51,10 +51,8 @@
   babel,
   csquotes,
   xcolor,
-  hyperxmp,
   hypdoc,
   nameref,
-  xspace,
   eqlist,
 }
 \usepackage[iso]{isodate}
@@ -139,6 +137,7 @@ corresponds to \PackageName\nobreakspace\fileversion, dated \printdateTeX{\filed
 % \changes{2.0.1}{2020/06/26}{Fix backwards compatibility by still accepting imagemodifier={-eu} and imagemodifier={-us}. Thanks to Jürgen Spitzmüller for reporting. Fix ability to modify currency of \cmd{\doclicenseIcon} macro using imagemodifier to Japan currency JP without breaking \cmd{\doclicenseImage}.}
 % \changes{2.1.0}{2020/07/26}{Fix regression: Proper language default image variants (Euro variants for example) was broken and the US variant was always used. This bug was introduced in v2.0.0. Documentation fixes. Added Marathi translation.}
 % \changes{2.2.0}{2020/09/18}{Add Japanese and Bulgarian translation. Add hint how to use Chinese to docs. Load hyperxmp by default when it is installed. Before, doclicense just suggested to load it and made use of the package when the user did.}
+% \changes{2.2.1}{2020/09/25}{Fix compatibility issue with newer versions of hyperxmp (bug confirmed with Tex Live 2020) resulting in an compile error by loading hyperxmp and hyperref in the order the packages expect it.}
 %
 %
 
@@ -623,18 +622,20 @@ corresponds to \PackageName\nobreakspace\fileversion, dated \printdateTeX{\filed
   \@ifpackageloaded{graphicx}{}{\RequirePackage{graphicx}}
     %% For \doclicenseImage
   \@ifpackageloaded{hyperref}{}{\RequirePackage{hyperref}}
-  \IfFileExists{hyperxmp.sty}{
-    \@ifpackageloaded{hyperxmp}{}{\RequirePackage{hyperxmp}}
+  \@ifpackageloaded{hyperxmp}{
     %% The following options are only defined when the hyperxmp package was loaded.
     \hypersetup{
       pdfcopyright  = {\doclicenseLongText},
       pdflicenseurl = {\doclicenseURL},
     }
-  }{
-    \PackageWarning{doclicense}{%
-      The hyperxmp package is missing so no license metadata can be embedded
-      into the PDF. Consider installing hyperxmp.% chktex 13
-    }
+  }{}
+}
+\IfFileExists{hyperxmp.sty}{
+  \@ifpackageloaded{hyperxmp}{}{\RequirePackage{hyperxmp}}
+}{
+  \PackageWarning{doclicense}{%
+    The hyperxmp package is missing so no license metadata can be embedded
+    into the PDF. Consider installing hyperxmp.% chktex 13
   }
 }
 %% )))
diff --git a/macros/latex/contrib/doclicense/doclicense.pdf b/macros/latex/contrib/doclicense/doclicense.pdf
index 1f3aed15a3..0ae88d6b61 100644
--- a/macros/latex/contrib/doclicense/doclicense.pdf
+++ b/macros/latex/contrib/doclicense/doclicense.pdf
diff --git a/macros/latex/contrib/gentombow/LICENSE b/macros/latex/contrib/gentombow/LICENSE
index c463b620a9..9661ce7b8d 100644
--- a/macros/latex/contrib/gentombow/LICENSE
+++ b/macros/latex/contrib/gentombow/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2016-2019 Hironobu Yamashita
+Copyright (c) 2016-2020 Hironobu Yamashita
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/macros/latex/contrib/gentombow/Makefile b/macros/latex/contrib/gentombow/Makefile
deleted file mode 100644
index f376d1ade0..0000000000
--- a/macros/latex/contrib/gentombow/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-KANJI = -kanji=utf8
-FONTMAP = -f ipaex.map -f ptex-ipaex.map
-TEXMF = $(shell kpsewhich -var-value=TEXMFHOME)
-
-all: bounddvi.pdf bounddvi-en.pdf \
-	gentombow.pdf gentombow-ja.pdf #pxgentombow.pdf
-
-.SUFFIXES: .tex .dvi .pdf
-.tex.dvi:
-	platex $(KANJI) $<
-	platex $(KANJI) $<
-	rm *.aux *.log
-.dvi.pdf:
-	dvipdfmx $(FONTMAP) $<
-
-bounddvi-en.dvi: bounddvi-en.tex
-	latex $<
-	latex $<
-	rm *.aux *.log
-gentombow.pdf: gentombow.tex
-	pdflatex $<
-	pdflatex $<
-	rm *.aux *.log
-
-.PHONY: install clean
-install:
-	mkdir -p ${TEXMF}/doc/latex/gentombow
-	cp ./Makefile ${TEXMF}/doc/latex/gentombow/
-	cp ./LICENSE ${TEXMF}/doc/latex/gentombow/
-	cp ./README.md ${TEXMF}/doc/latex/gentombow/
-	cp ./*.pdf ${TEXMF}/doc/latex/gentombow/
-	cp ./*.tex ${TEXMF}/doc/latex/gentombow/
-	mkdir -p ${TEXMF}/tex/latex/gentombow
-	cp ./*.sty ${TEXMF}/tex/latex/gentombow/
-clean:
-	rm -f *.dvi *.pdf
diff --git a/macros/latex/contrib/gentombow/README.md b/macros/latex/contrib/gentombow/README.md
index 82fc0584d5..6ea7f2aea5 100644
--- a/macros/latex/contrib/gentombow/README.md
+++ b/macros/latex/contrib/gentombow/README.md
@@ -44,6 +44,6 @@ the 3-clause BSD license (see [LICENSE](./LICENSE)).
 
 ## Release Date
 
-2019-07-21
+2020-09-25
 
 Hironobu Yamashita
diff --git a/macros/latex/contrib/gentombow/bounddvi-en.pdf b/macros/latex/contrib/gentombow/bounddvi-en.pdf
index cbbdb00ef2..fb9647d1ec 100644
--- a/macros/latex/contrib/gentombow/bounddvi-en.pdf
+++ b/macros/latex/contrib/gentombow/bounddvi-en.pdf
diff --git a/macros/latex/contrib/gentombow/bounddvi-en.tex b/macros/latex/contrib/gentombow/bounddvi-en.tex
index 61e78f985b..82046f888a 100644
--- a/macros/latex/contrib/gentombow/bounddvi-en.tex
+++ b/macros/latex/contrib/gentombow/bounddvi-en.tex
@@ -130,6 +130,7 @@ using \textsf{bounddvi} package.
   \item 2016/10/25 v7.1 (HY) Support for p\LaTeXe\ tombow option,
                              compatibility with \textsf{graphics}/\textsf{color} packages
   \item 2016/12/28 v7.2 (HY) Documentation for the new \texttt{dvips} behavior
+  \item 2020/09/25 v8.0 (HY) Support for \LaTeXe/p\LaTeXe~2020-10-01
 \end{itemize}
 
 \end{document}
diff --git a/macros/latex/contrib/gentombow/bounddvi.pdf b/macros/latex/contrib/gentombow/bounddvi.pdf
index ca36021fc9..c0a2b20af6 100644
--- a/macros/latex/contrib/gentombow/bounddvi.pdf
+++ b/macros/latex/contrib/gentombow/bounddvi.pdf
diff --git a/macros/latex/contrib/gentombow/bounddvi.sty b/macros/latex/contrib/gentombow/bounddvi.sty
index 35432df5f0..3e355d63c1 100644
--- a/macros/latex/contrib/gentombow/bounddvi.sty
+++ b/macros/latex/contrib/gentombow/bounddvi.sty
@@ -1,7 +1,7 @@
 %
 % bounddvi.sty
-% 2016/12/28 v7.2-v7.0 h.y.acetaminophen@gmail.com
-% 2004/12/15 v6.0-v1.0 inoue@ma.ns.tcu.ac.jp
+% 2020/09/25 v8.0-v7.0 h.y.acetaminophen [at] gmail.com
+% 2004/12/15 v6.0-v1.0 inoue [at] ma.ns.tcu.ac.jp
 %
 % This package, originally written by Koichi Inoue
 % and modified by Hironobu Yamashita, is distributed
@@ -10,7 +10,7 @@
 %
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{bounddvi}[2016/12/28 v7.2 bounddvi]
+\ProvidesPackage{bounddvi}[2020/09/25 v8.0 bounddvi]
 
 % catcode trick to hide \iftombow ... \else ... \fi
 % since \iftombow is defined only in pLaTeX.
@@ -50,6 +50,33 @@ Q \fi
 % reset catcode trick
 \catcode`\Q=11\relax
 
+%% Since LaTeX2e 2020-10-01, \@begindocumenthook is deprecated
+%% and \UseHook{begindocument} etc. are used.
+%% This code appends papersize special to the _end_ of the hook.
+%% (Note: support for old dvips is removed.)
+\ifx\AddToHook\@undefined\else
+  \AtBeginDocument{\AtBeginDvi{%
+    \begingroup
+      % if \stockwidth/\stockheight are defined & have effective
+      % values, copy them to \paperwidth/\paperheight
+      % for current group
+      \ifx\stockwidth\@undefined\else \ifdim\stockwidth>\z@
+        \paperwidth\stockwidth
+      \fi\fi
+      \ifx\stockheight\@undefined\else \ifdim\stockheight>\z@
+        \paperheight\stockheight
+      \fi\fi
+      % adjust for \mag and emit papersize special
+      \divide\paperwidth\@m\multiply\paperwidth\mag
+      \divide\paperheight\@m\multiply\paperheight\mag
+      \special{papersize=\the\paperwidth,\the\paperheight}%
+    \endgroup}}
+  \expandafter\endinput
+\fi
+
+%% The rest of this package is meant for
+%% LaTeX2e 2020-02-02 PL5 or older.
+
 % following code is almost equivalent to
 %   \AtBeginDocument{\AtBeginDvi{...}}
 % however, we append the specification to the _beginning_ of
@@ -59,16 +86,12 @@ Q \fi
 \def\@prependto@begindocumenthook{\global\setbox\@begindvibox
   \vbox{\csname yoko\endcsname\unvbox\@begindvibox
     \begingroup
-      % if \stockwidth/\stockheight are defined & have effective
-      % values, copy them to \paperwidth/\paperheight
-      % for current group
       \ifx\stockwidth\@undefined\else \ifdim\stockwidth>\z@
         \paperwidth\stockwidth
       \fi\fi
       \ifx\stockheight\@undefined\else \ifdim\stockheight>\z@
         \paperheight\stockheight
       \fi\fi
-      % adjust for \mag and emit papersize special
       \divide\paperwidth\@m\multiply\paperwidth\mag
       \divide\paperheight\@m\multiply\paperheight\mag
       \special{papersize=\the\paperwidth,\the\paperheight}%
diff --git a/macros/latex/contrib/gentombow/bounddvi.tex b/macros/latex/contrib/gentombow/bounddvi.tex
index b21b9c33a5..198bbb7fb9 100644
--- a/macros/latex/contrib/gentombow/bounddvi.tex
+++ b/macros/latex/contrib/gentombow/bounddvi.tex
@@ -143,6 +143,7 @@ DVIファイルã�¯ç”¨ç´™ã‚µã‚¤ã‚ºæƒ…報をå�«ã�¿ã�¾ã�›ã‚“ã�Œã€�PostScriptã‚„PDFã
   \item 2016/10/25 v7.1 (HY) p\LaTeXe{}�トンボサ�ート�
                              2016年�新��\textsf{graphics}/\textsf{color}�対応
   \item 2016/12/28 v7.2 (HY) 新仕様�\texttt{dvips}をドキュメント化
+  \item 2020/09/25 v8.0 (HY) \LaTeXe/p\LaTeXe~2020-10-01（予定）��対応
 \end{itemize}
 
 \end{document}
diff --git a/macros/latex/contrib/gentombow/gentombow-ja.pdf b/macros/latex/contrib/gentombow/gentombow-ja.pdf
index 7d26cf32e7..ada6318d41 100644
--- a/macros/latex/contrib/gentombow/gentombow-ja.pdf
+++ b/macros/latex/contrib/gentombow/gentombow-ja.pdf
diff --git a/macros/latex/contrib/gentombow/gentombow-ja.tex b/macros/latex/contrib/gentombow/gentombow-ja.tex
index ce0d6e767e..763f790020 100644
--- a/macros/latex/contrib/gentombow/gentombow-ja.tex
+++ b/macros/latex/contrib/gentombow/gentombow-ja.tex
@@ -393,6 +393,11 @@ $30\,\mathrm{mm}$ã�«ã�—ã�Ÿã�„ã�¨ã��\footnote{ã�“ã�“ã�§ã�¯ã€Œæœ¬æ–‡ã�®é ˜åŸŸä»¥å¤
 \end{verbatim}
 \end{dangerous}
 
+���\textsf{geometry}パッケージ�用紙サイズ
+(\verb+\paperwidth+, \verb+\paperheight+)を変更�る場�も�り��。
+����場��備��\textsf{gentombow}パッケージ�
+\textsf{geometry}パッケージよりも後�読�込むよ��������。
+
 \section*{雑記}
 
 発端���話��。
diff --git a/macros/latex/contrib/gentombow/gentombow.pdf b/macros/latex/contrib/gentombow/gentombow.pdf
index b346075d67..c47dab8edb 100644
--- a/macros/latex/contrib/gentombow/gentombow.pdf
+++ b/macros/latex/contrib/gentombow/gentombow.pdf
diff --git a/macros/latex/contrib/gentombow/gentombow.tex b/macros/latex/contrib/gentombow/gentombow.tex
index 3f6a1ada64..81be1fe6c5 100644
--- a/macros/latex/contrib/gentombow/gentombow.tex
+++ b/macros/latex/contrib/gentombow/gentombow.tex
@@ -280,6 +280,10 @@ conflict with the feature of \textsf{gentombow} package.
 To set page layout correctly, you should adjust \verb+\oddsidemargin+
 or \verb+\topmargin+, or leave it to \textsf{geometry} package.
 
+Note: since the package \textsf{geometry} also has a feature to
+change the paper size (\verb+\paperwidth+, \verb+\paperheight+),
+please load \textsf{gentombow} after \textsf{geometry}.
+
 \section*{Change History}
 
 \begin{itemize}
diff --git a/macros/latex/contrib/hyperxmp/README b/macros/latex/contrib/hyperxmp/README
index c5365e41b0..4fb504485d 100644
--- a/macros/latex/contrib/hyperxmp/README
+++ b/macros/latex/contrib/hyperxmp/README
@@ -23,8 +23,8 @@ for specifying PDF metadata.  hyperxmp can embed a wide variety of
 metadata as XMP, including the list of authors, document title,
 contact information (telephone number, postal address, email address,
 etc.), copyright statement, keywords, natural language, and much more.
-hyperxmp is compatible with pdflatex, latex+dvips+ps2pdf,
-latex+dvipdfm, xelatex, and lualatex.
+hyperxmp is compatible with pdflatex, lualatex, xelatex,
+latex+dvipdfm, and latex+dvips+Distiller.
 
 Installation
 ============
diff --git a/macros/latex/contrib/hyperxmp/einstein-xmp.tex b/macros/latex/contrib/hyperxmp/einstein-xmp.tex
index f1b4d2ed06..7fad01f38a 100644
--- a/macros/latex/contrib/hyperxmp/einstein-xmp.tex
+++ b/macros/latex/contrib/hyperxmp/einstein-xmp.tex
@@ -6,45 +6,48 @@
 \let\todayISO=\hyxmp@today
 \makeatother
 
-\begin{alltt}
+\begin{Verbatim}[fontsize=\small,commandchars=\\\{\}]
     <?xpacket begin="\string\357\string\273\string\277" id="W5M0MpCehiHzreSzNTczkc9d"?>
     <x:xmpmeta xmlns:x="adobe:ns:meta/">
       <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
         <rdf:Description rdf:about=""
-                         xmlns:pdf="http://ns.adobe.com/pdf/1.3/"
-                         xmlns:xmpRights="http://ns.adobe.com/xap/1.0/rights/"
-                         xmlns:dc="http://purl.org/dc/elements/1.1/"
-                         xmlns:photoshop="http://ns.adobe.com/photoshop/1.0/"
-                         xmlns:xmp="http://ns.adobe.com/xap/1.0/"
-                         xmlns:xmpMM="http://ns.adobe.com/xap/1.0/mm/"
-                         xmlns:stEvt="http://ns.adobe.com/xap/1.0/sType/ResourceEvent#"
-                         xmlns:pdfaid="http://www.aiim.org/pdfa/ns/id/"
-                         xmlns:pdfuaid="http://www.aiim.org/pdfua/ns/id/"
-                         xmlns:pdfx="http://ns.adobe.com/pdfx/1.3/"
-                         xmlns:pdfxid="http://www.npes.org/pdfx/ns/id/"
-                         xmlns:prism="http://prismstandard.org/namespaces/basic/2.1/"
-                         xmlns:Iptc4xmpCore="http://iptc.org/std/Iptc4xmpCore/1.0/xmlns/"
-                         xmlns:pdfaExtension="http://www.aiim.org/pdfa/ns/extension/"
-                         xmlns:pdfaSchema="http://www.aiim.org/pdfa/ns/schema#"
-                         xmlns:pdfaProperty="http://www.aiim.org/pdfa/ns/property#"
-                         xmlns:pdfaType="http://www.aiim.org/pdfa/ns/type#"
-                         xmlns:pdfaField="http://www.aiim.org/pdfa/ns/field#">
+                 xmlns:pdf="http://ns.adobe.com/pdf/1.3/"
+                 xmlns:xmpRights="http://ns.adobe.com/xap/1.0/rights/"
+                 xmlns:dc="http://purl.org/dc/elements/1.1/"
+                 xmlns:photoshop="http://ns.adobe.com/photoshop/1.0/"
+                 xmlns:xmp="http://ns.adobe.com/xap/1.0/"
+                 xmlns:xmpMM="http://ns.adobe.com/xap/1.0/mm/"
+                 xmlns:stEvt="http://ns.adobe.com/xap/1.0/sType/ResourceEvent#"
+                 xmlns:pdfaid="http://www.aiim.org/pdfa/ns/id/"
+                 xmlns:pdfuaid="http://www.aiim.org/pdfua/ns/id/"
+                 xmlns:pdfx="http://ns.adobe.com/pdfx/1.3/"
+                 xmlns:pdfxid="http://www.npes.org/pdfx/ns/id/"
+                 xmlns:prism="http://prismstandard.org/namespaces/basic/3.0/"
+                 xmlns:jav="http://www.niso.org/schemas/jav/1.0/"
+                 xmlns:xmpTPg="http://ns.adobe.com/xap/1.0/t/pg/"
+                 xmlns:stFnt="http://ns.adobe.com/xap/1.0/sType/Font#"
+                 xmlns:Iptc4xmpCore="http://iptc.org/std/Iptc4xmpCore/1.0/xmlns/"
+                 xmlns:pdfaExtension="http://www.aiim.org/pdfa/ns/extension/"
+                 xmlns:pdfaSchema="http://www.aiim.org/pdfa/ns/schema#"
+                 xmlns:pdfaProperty="http://www.aiim.org/pdfa/ns/property#"
+                 xmlns:pdfaType="http://www.aiim.org/pdfa/ns/type#"
+                 xmlns:pdfaField="http://www.aiim.org/pdfa/ns/field#">
           <pdfaExtension:schemas>
             <rdf:Bag>
-\end{alltt}
+\end{Verbatim}
 \begin{center}
   $\vdots$\par
   \emph{[over 200 lines of boilerplate definitions not shown]}\par
   $\vdots$\par
 \end{center}
-\begin{alltt}
+\begin{Verbatim}[fontsize=\small,commandchars=\\\{\}]
             </rdf:Bag>
           </pdfaExtension:schemas>
           <pdf:Keywords>
             \metavalue{energy quanta, Hertz effect, quantum physics}
           </pdf:Keywords>
           <pdf:Producer>
-            \metavalue{pdfTeX, Version 3.14159265-2.6-1.40.20 (TeX Live 2019/Debian)}
+            \metavalue{LuaHBTeX, Version 1.12.0 (TeX Live 2020)}
           </pdf:Producer>
           <pdf:PDFVersion>\metavalue{1.5}</pdf:PDFVersion>
           <xmpRights:Marked>\metavalue{True}</xmpRights:Marked>
@@ -54,34 +57,28 @@
           <dc:format>\metavalue{application/pdf}</dc:format>
           <dc:title>
             <rdf:Alt>
-              <rdf:li xml:lang="en">
-                \metavalue{On a heuristic viewpoint concerning the production
-                and transformation of light}
-              </rdf:li>
               <rdf:li xml:lang="x-default">
-                \metavalue{On a heuristic viewpoint concerning the production
-                and transformation of light}
+                \metavalue{On a heuristic viewpoint concerning the production}
+                \metavalue{and transformation of light}
+              </rdf:li>
+              <rdf:li xml:lang="en">
+                \metavalue{On a heuristic viewpoint concerning the production}
+                \metavalue{and transformation of light}
               </rdf:li>
               <rdf:li xml:lang="de">
-                \metavalue{\"Uber einen die Erzeugung und Verwandlung des Lichtes
-                betreffenden heuristischen Gesichtspunkt}
+                \metavalue{\"Uber einen die Erzeugung und Verwandlung des Lichtes}
+                \metavalue{betreffenden heuristischen Gesichtspunkt}
               </rdf:li>
             </rdf:Alt>
           </dc:title>
           <dc:description>
             <rdf:Alt>
               <rdf:li xml:lang="en">\metavalue{photoelectric effect}</rdf:li>
-              <rdf:li xml:lang="x-default">\metavalue{photoelectric effect}</rdf:li>
             </rdf:Alt>
           </dc:description>
           <dc:rights>
             <rdf:Alt>
-              <rdf:li xml:lang="en">
-                \metavalue{Copyright (C) 1905, Albert Einstein}
-              </rdf:li>
-              <rdf:li xml:lang="x-default">
-                \metavalue{Copyright (C) 1905, Albert Einstein}
-              </rdf:li>
+              <rdf:li xml:lang="en">\metavalue{Copyright (C) 1905, Albert Einstein}</rdf:li>
             </rdf:Alt>
           </dc:rights>
           <dc:publisher>
@@ -122,9 +119,9 @@
             \metavalue{Technical Assistant, Level III}
           </photoshop:AuthorsPosition>
           <photoshop:CaptionWriter>\metavalue{Scott Pakin}</photoshop:CaptionWriter>
-          <xmp:CreateDate>\metavalue{2019-03-16T23:07:38-06:00}</xmp:CreateDate>
-          <xmp:ModifyDate>\metavalue{2019-03-16T23:07:38-06:00}</xmp:ModifyDate>
-          <xmp:MetadataDate>\metavalue{2019-03-16T23:07:38-06:00}</xmp:MetadataDate>
+          <xmp:CreateDate>\metavalue{2020-07-25T21:37:02-06:00}</xmp:CreateDate>
+          <xmp:ModifyDate>\metavalue{2020-07-25T21:37:02-06:00}</xmp:ModifyDate>
+          <xmp:MetadataDate>\metavalue{2020-07-25T21:37:02-06:00}</xmp:MetadataDate>
           <xmp:CreatorTool>\metavalue{LaTeX with hyperref package}</xmp:CreatorTool>
           <xmpMM:DocumentID>
             \metavalue{uuid:6d1ac9ec-4ff2-515a-954b-648eeb4853b0}
@@ -163,10 +160,76 @@
           <prism:url>
             \metavalue{http://www.physik.uni-augsburg.de/annalen/history/einstein-papers/190517132-148.pdf}
           </prism:url>
-          <prism:byteCount>\metavalue{59846}</prism:byteCount>
-          <prism:pageCount>\metavalue{17}</prism:pageCount>
+          <prism:byteCount>\metavalue{41197}</prism:byteCount>
+          <prism:pageCount>\metavalue{1}</prism:pageCount>
+          <jav:journal_article_version>\metavalue{VoR}</jav:journal_article_version>
+          <xmpTPg:Fonts>
+            <rdf:Bag>
+              <rdf:li rdf:parseType="Resource">
+                <stFnt:fontFace>\metavalue{LMRoman10-Regular}</stFnt:fontFace>
+                <stFnt:fontFamily>\metavalue{LM Roman 10}</stFnt:fontFamily>
+                <stFnt:fontName>\metavalue{LMRoman10-Regular}</stFnt:fontName>
+                <stFnt:versionString>
+                  \metavalue{2.004;PS 2.004;hotconv 1.0.49;makeotf.lib2.0.14853}
+                </stFnt:versionString>
+                <stFnt:fontFileName>\metavalue{lmroman10-regular.otf}</stFnt:fontFileName>
+                <stFnt:fontType>\metavalue{opentype}</stFnt:fontType>
+              </rdf:li>
+              <rdf:li rdf:parseType="Resource">
+                <stFnt:fontFace>\metavalue{LMRoman17-Regular}</stFnt:fontFace>
+                <stFnt:fontFamily>\metavalue{LM Roman 17}</stFnt:fontFamily>
+                <stFnt:fontName>\metavalue{LMRoman17-Regular}</stFnt:fontName>
+                <stFnt:versionString>
+                  \metavalue{2.004;PS 2.004;hotconv 1.0.49;makeotf.lib2.0.14853}
+                </stFnt:versionString>
+                <stFnt:fontFileName>\metavalue{lmroman17-regular.otf}</stFnt:fontFileName>
+                <stFnt:fontType>\metavalue{opentype}</stFnt:fontType>
+              </rdf:li>
+              <rdf:li rdf:parseType="Resource">
+                <stFnt:fontFace>\metavalue{LMRoman12-Regular}</stFnt:fontFace>
+                <stFnt:fontFamily>\metavalue{LM Roman 12}</stFnt:fontFamily>
+                <stFnt:fontName>\metavalue{LMRoman12-Regular}</stFnt:fontName>
+                <stFnt:versionString>
+                  \metavalue{2.004;PS 2.004;hotconv 1.0.49;makeotf.lib2.0.14853}
+                </stFnt:versionString>
+                <stFnt:fontFileName>\metavalue{lmroman12-regular.otf}</stFnt:fontFileName>
+                <stFnt:fontType>\metavalue{opentype}</stFnt:fontType>
+              </rdf:li>
+              <rdf:li rdf:parseType="Resource">
+                <stFnt:fontName>\metavalue{cmr12}</stFnt:fontName>
+              </rdf:li>
+              <rdf:li rdf:parseType="Resource">
+                <stFnt:fontName>\metavalue{cmr8}</stFnt:fontName>
+              </rdf:li>
+              <rdf:li rdf:parseType="Resource">
+                <stFnt:fontName>\metavalue{cmr6}</stFnt:fontName>
+              </rdf:li>
+              <rdf:li rdf:parseType="Resource">
+                <stFnt:fontName>\metavalue{cmmi12}</stFnt:fontName>
+              </rdf:li>
+              <rdf:li rdf:parseType="Resource">
+                <stFnt:fontName>\metavalue{cmmi8}</stFnt:fontName>
+              </rdf:li>
+              <rdf:li rdf:parseType="Resource">
+                <stFnt:fontName>\metavalue{cmmi6}</stFnt:fontName>
+              </rdf:li>
+              <rdf:li rdf:parseType="Resource">
+                <stFnt:fontName>\metavalue{cmsy10}</stFnt:fontName>
+              </rdf:li>
+              <rdf:li rdf:parseType="Resource">
+                <stFnt:fontName>\metavalue{cmsy8}</stFnt:fontName>
+              </rdf:li>
+              <rdf:li rdf:parseType="Resource">
+                <stFnt:fontName>\metavalue{cmsy6}</stFnt:fontName>
+              </rdf:li>
+              <rdf:li rdf:parseType="Resource">
+                <stFnt:fontName>\metavalue{cmex10}</stFnt:fontName>
+              </rdf:li>
+            </rdf:Bag>
+          </xmpTPg:Fonts>
+          <xmpTPg:NPages>\metavalue{1}</xmpTPg:NPages>
         </rdf:Description>
       </rdf:RDF>
     </x:xmpmeta>
     <?xpacket end="w"?>
-\end{alltt}
+\end{Verbatim}
diff --git a/macros/latex/contrib/hyperxmp/hyperxmp.dtx b/macros/latex/contrib/hyperxmp/hyperxmp.dtx
index 9861784479..08e6d2fab8 100644
--- a/macros/latex/contrib/hyperxmp/hyperxmp.dtx
+++ b/macros/latex/contrib/hyperxmp/hyperxmp.dtx
@@ -22,7 +22,7 @@
 %<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
 %<package>\ProvidesPackage{hyperxmp}
 %<*package>
-    [2020/06/19 v5.4 Store hyperref metadata in XMP format]
+    [2020/09/24 v5.5 Store hyperref metadata in XMP format]
 %</package>
 %
 %<*driver>
@@ -39,11 +39,15 @@
 \usepackage{microtype}
 \usepackage{needspace}
 \usepackage{varioref}
-\usepackage{alltt}
+\usepackage{fancyvrb}
 \usepackage{multicol}
 \usepackage{makeidx}
 \usepackage{mmap}
 \usepackage{enumitem}
+\usepackage{listings}
+\usepackage[labelformat=simple]{subcaption}
+\renewcommand\thesubfigure{(\alph{subfigure})}
+\usepackage{array}
 \usepackage{booktabs}
 \usepackage{marginfix}
 \usepackage{ifmtarg}
@@ -112,7 +116,7 @@
 %</driver>
 % \fi
 %
-% \CheckSum{2671}
+% \CheckSum{2804}
 %
 % \CharacterTable
 %  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -174,6 +178,19 @@
 % \changes{v5.2}{2020/04/29}{Introduced the \protect\optname{pdfidentifier}
 %   package option, which enables an author to specify a unique identifier
 %   for the document}
+% \changes{v5.5}{2020/07/23}{Introduced the \protect\optname{pdfpubstatus}
+%   package option, which enables an author to specify the document's
+%   publication status.  Thanks to Robin Schwab for pointing me to the
+%   Journal Article Versions recommendation~\protect\cite{NISO2008:jav}}
+% \changes{v5.5}{2020/07/25}{Automatically assign
+%   \protect\optname{pdfnumpages} and \protect\optname{pdfbytes} under
+%   \protect\pdfLaTeX\ and \protect\LuaLaTeX}
+% \changes{v5.5}{2020/09/23}{Defer \protect\cs{AtEndPreamble} execution
+%   until the end of the document.  This enables
+%   \protect\pkgname{hyperxmp} itself to be loaded from
+%   \protect\cs{AtEndPreamble}, as is done by
+%   \protect\pkgname{doclicense}~v2.2.0.  Thanks to Tommaso Pecorella
+%   for the bug report and help testing}
 %
 % ^^A \GetFileInfo{hyperxmp.dtx}
 %
@@ -325,6 +342,44 @@
 % }
 % \makeatother
 %
+% ^^A  Index schemata.
+% \DeleteShortVerb{\|}
+% \makeatletter
+% \newenvironment{schemadesc}[2][]{^^A
+%   \@ifmtarg{#1}{^^A
+%     \index{#2 schema|(}^^A
+%     \index{schemata&#2|(}^^A
+%     \def\closeschemedesc{^^A
+%       \index{schemata&#2|)}^^A
+%       \index{#2 schema|)}^^A
+%     }^^A
+%   }{^^A
+%     \index{#1 schema=#2 schema|(}^^A
+%     \index{schemata&#1=#2|(}^^A
+%     \def\closeschemedesc{^^A
+%       \index{schemata&#1=#2|)}^^A
+%       \index{#1 schema=#2 schema|)}^^A
+%     }^^A
+%   }^^A
+% }{^^A
+%   \closeschemedesc
+% }
+% \newcommand{\schema}[2][]{^^A
+%   \@ifmtarg{#1}{^^A
+%     \kern0pt^^A
+%     \index{#2 schema}^^A
+%     \index{schemata&#2}^^A
+%     #2^^A
+%   }{^^A
+%     \kern0pt^^A
+%     \index{#1 schema=#2 schema}^^A
+%     \index{schemata&#1=#2}^^A
+%     #2^^A
+%   }^^A
+% }
+% \makeatother
+% \MakeShortVerb{\|}
+%
 % ^^A  Pack figures a bit tighter onto the page.
 % \renewcommand{\floatpagefraction}{0.8}
 %
@@ -380,9 +435,9 @@
 % \end{verbatim}
 %
 % In the preceding code, the |dc| namespace refers to the
-% \href{http://purl.org/DC/}{Dublin Core schema}, a collection of
-% metadata properties.  The \xmpprop{dc:creator} property surrounds the
-% list of authors.  The \textsf{rdf} namespace is the
+% \href{http://purl.org/DC/}{\schema{Dublin Core} schema}, a collection
+% of metadata properties.  The \xmpprop{dc:creator} property surrounds
+% the list of authors.  The \textsf{rdf} namespace is the
 % \href{http://www.w3.org/RDF/}{Resource Description Framework}, which
 % defines \xmpterm{rdf:Seq} as an ordered list of values.  Each author
 % is represented by an individual list item (\xmpterm{rdf:li}), making
@@ -393,7 +448,8 @@
 % is intended to make it easy for computer applications to identify and
 % categorize the document.
 %
-% \paragraph{What metadata does \textsf{hyperxmp} process?}
+% \subsection{Supported metadata}
+%
 % \pkgname{hyperxmp} knows how to embed all of the following types of
 % metadata within a document:
 %
@@ -419,6 +475,7 @@
 %   \item \acro{ISBN} (\xmpprop{prism:isbn})
 %   \item \acro{ISSN}---both print (\xmpprop{prism:issn}) and electronic (\xmpprop{prism:eIssn})
 %   \item issue number of parent publication (\xmpprop{prism:number})
+%   \item journal article version (\xmpprop{jav:journal\_article\_version})
 %   \item keywords (\xmpprop{pdf:Keywords} and \xmpprop{dc:subject})
 %   \item language used (\xmpprop{dc:language})
 %   \item license \acro{URL} (\xmpprop{xmpRights:WebStatement})
@@ -454,15 +511,16 @@
 % \noindent
 % More types of metadata may be added in a future release.
 %
-% \paragraph{How does \textsf{hyperxmp} compare to the \textsf{xmpincl}
-% package?}
-% The short answer is that \pkgname{xmpincl} is more flexible but
-% \pkgname{hyperxmp} is easier to use.  With \pkgname{xmpincl}, the
-% author manually constructs a file of arbitrary \acro{XMP} data and the
-% package merely embeds it within the generated \acro{PDF} file.  With
-% \pkgname{hyperxmp}, the author specifies values for various predefined
-% metadata types and the package formats those values as \acro{XMP} and embeds
-% the result within the generated \acro{PDF} file.
+% \subsection{Comparisons with similar packages}
+%
+% \paragraph{\textsf{xmpincl}}
+% In short, \pkgname{xmpincl} is more flexible but \pkgname{hyperxmp} is
+% easier to use.  With \pkgname{xmpincl}, the author manually constructs
+% a file of arbitrary \acro{XMP} data and the package merely embeds it
+% within the generated \acro{PDF} file.  With \pkgname{hyperxmp}, the
+% author specifies values for various predefined metadata types and the
+% package formats those values as \acro{XMP} and embeds the result
+% within the generated \acro{PDF} file.
 %
 % \pkgname{xmpincl} can embed \acro{XMP} only when running under \pdfLaTeX\ and
 % only when in \acro{PDF}-generating mode.  \pkgname{hyperxmp} additionally
@@ -475,6 +533,96 @@
 % \pkgname{hyperxmp}, and use \pkgname{xmpincl} to include the modified
 % \acro{XMP} code in the \acro{PDF} file.
 %
+% \paragraph{\textsf{pdfx}}
+% The main difference between \pkgname{hyperxmp} and \pkgname{pdfx} is
+% that \pkgname{hyperxmp} tries to integrate as seamlessly as possible
+% into an existing document.  It leverages \pkgname{hyperref}'s
+% \cs{hypersetup} command and many of \cs{hypersetup}'s options and
+% defines its own options in a compatible manner.  In contrast,
+% \pkgname{pdfx} requires the user to create a separate
+% |\jobname.xmpdata| file containing \pkgname{pdfx}-defined commands for
+% each metadata element.
+%
+% \iffalse
+%<*listings>
+% \fi
+\newsavebox{\pdfxbox}
+\begin{lrbox}{\pdfxbox}
+  \begin{lstlisting}[
+      language=tex,
+      columns=fullflexible,
+      linewidth=14pc,
+      frame=single,
+      basicstyle=\footnotesize,
+      showlines,
+      morekeywords={\Title,\Author,\Language,\Keywords,\Publisher,\sep}
+    ]
+
+\Title{Baking through the ages}
+\Author{A. Baker\sep C. Kneader}
+\Language{en-GB}
+\Keywords{cookies\sep muffins\sep cakes}
+\Publisher{Baking International}
+
+  \end{lstlisting}
+\end{lrbox}
+
+\newsavebox{\hyxmpbox}
+\begin{lrbox}{\hyxmpbox}
+  \begin{lstlisting}[
+      language=tex,
+      columns=fullflexible,
+      linewidth=13pc,
+      frame=single,
+      basicstyle=\footnotesize,
+      morekeywords={\hypersetup}
+    ]
+\hypersetup{%
+  pdftitle={Baking through the ages},
+  pdfauthor={A. Baker, C. Kneader},
+  pdflang={en-GB},
+  pdfkeywords={cookies, muffins, cakes},
+  pdfpublisher={Baking International}
+}
+  \end{lstlisting}
+\end{lrbox}
+% \iffalse
+%</listings>
+% \fi
+%
+% Figure~\ref{fig:pdfx-hyxmp} adapts an example appearing in the
+% \pkgname{pdfx} manual to \pkgname{hyperxmp}.
+% \begin{figure}
+%   \centering
+%   \subcaptionbox{\pkgname{pdfx} (separate \texttt{.xmpdata} file)
+%     \label{fig:ph-pdfx}}{%
+%     \usebox{\pdfxbox}%
+%   }
+%   \hfil
+%   \subcaptionbox{\pkgname{hyperxmp} (main document)
+%     \label{fig:ph-hyxmp}}{%
+%     \usebox{\hyxmpbox}}
+%   \caption{Comparison of \pkgname{pdfx} and \pkgname{hyperxmp}}
+%   \label{fig:pdfx-hyxmp}
+% \end{figure}
+% The two are comparable line-by-line in terms of how one specifies the
+% title, author, document language, keywords, and publisher.  However,
+% \pkgname{hyperxmp} implicitly writes a wealth of additional metadata
+% into the \acro{XMP} packet such as the document date, creation date,
+% creator tool, file format, \acro{PDF} version, and unique document and
+% instance IDs.  In fact, if a document omits all of the code shown in
+% Figure~\ref{fig:ph-hyxmp}, it will still store the \cs{title} and
+% \cs{author} data in the \acro{XMP} packet.
+%
+% One can therefore summarize the difference between \pkgname{hyperxmp}
+% and \pkgname{pdfx} as follows: \pkgname{pdfx} requires the author to
+% be fully explicit about the document's metadata while
+% \pkgname{hyperxmp} allows some metadata to be specified implicitly,
+% automatically inferring it when possible.  In general,
+% \pkgname{hyperxmp} tries to simplify the author's task as much as
+% possible.
+%
+%
 % \section{Usage}
 %
 % \pkgname{hyperxmp} works by postprocessing some of the package options
@@ -540,6 +688,7 @@
 %   \item \optname{pdfpagerange}
 %   \item \optname{pdfpublication}
 %   \item \optname{pdfpublisher}
+%   \item \optname{pdfpubstatus}
 %   \item \optname{pdfpubtype}
 %   \item \optname{pdfrendition}
 %   \item \optname{pdfsource}
@@ -615,10 +764,7 @@
 % the same as the document language (\pkgname{hyperref}'s
 % \moptname{pdflang} option).  If neither \optname{pdfmetalang} nor
 % \optname{pdflang} is specified, \pkgname{hyperxmp} uses only
-% ``|x-default|'' as the metadata language.  Note that ``|x-default|''
-% metadata are always included in addition to the specified metadata
-% language, as the user reading the document may not have specified a
-% language preference.
+% ``\xmpterm{x-default}'' as the metadata language.
 %
 % \acro{XMP} can include a universally unique identifier (\acro{UUID})
 % for each document and for each instance of a given document.  By
@@ -700,25 +846,47 @@
 % \moptname{pdfpubtype} indicates the type of publication in which the
 % document was published.  This should be one of the \acro{PRISM}
 % aggregation types~\cite{PRISM2012:cont-voc} such as |book|, |journal|,
-% |magazine|, |manual|, |report|, or |whitepaper|.  For publications in
-% journals, magazines, and similar periodicals, a document can specify
-% the volume number with \moptname{pdfvolumenum} and the issue number
-% within the volume with \moptname{pdfissuenum}.
+% |magazine|, |manual|, |report|, or |whitepaper|.
+%
+% For publications in journals, magazines, and similar periodicals, a
+% document can specify the volume number with \moptname{pdfvolumenum}
+% and the issue number within the volume with \moptname{pdfissuenum}.
 % \moptname{pdfpagerange} indicates the page numbers at which the
 % document appears within the publication.  The intention is that this
 % be a comma-separated list of dash-separated ranges, as in
 % |pdfpagerange={1,4-5}|.  See Note~\ref{note:page-counting} on
 % page~\pageref{note:page-counting} for advice on how to assign
-% \optname{pdfpagerange} semi-automatically.  For books,
-% \moptname{pdfbookedition} names the edition of the book.  This is
-% specified as text, not a number.  As with \optname{pdfpublication}
-% (above), \optname{pdfbookedition} accepts a bracketed language code,
-% as in |pdfbookedition={[en]Second| |edition}|.
-%
-% The number of pages in the published, print version of the document
-% can be expressed with \moptname{pdfnumpages}.
-% Note~\ref{note:page-counting} on page~\pageref{note:page-counting}
-% explains how to automatically assign a value to \optname{pdfnumpages}.
+% \optname{pdfpagerange} semi-automatically.  A journal article's
+% publication status can be indicated with \moptname{pdfpubstatus}.
+% This option expects to take one of the values listed in
+% Table~\ref{tbl:jav}.  See the \acro{NISO}/\acro{ALPSP} Journal Article
+% Versions recommendation~\cite{NISO2008:jav} for an explanation of each
+% of those values and when to use them.
+%
+% \begin{table}
+%   \centering
+%   \caption{Valid arguments for \optname{pdfpubstatus}}
+%   \label{tbl:jav}
+%   \begin{tabular}{@{}>{\ttfamily}ll@{}}
+%   \toprule
+%   \multicolumn{1}{@{}l}{Value} & Meaning \\
+%   \midrule
+%   AO   & Author's Original \\
+%   SMUR & Submitted Manuscript Under Review \\
+%   AM   & Accepted Manuscript \\
+%   P    & Proof \\
+%   VoR  & Version of Record \\
+%   CVoR & Corrected Version of Record \\
+%   EVoR & Enhanced Version of Record \\
+%   \bottomrule
+%   \end{tabular}
+% \end{table}
+%
+% For books, \moptname{pdfbookedition} names the edition of the book.
+% This is specified as text, not a number.  As with
+% \optname{pdfpublication} (above), \optname{pdfbookedition} accepts a
+% bracketed language code, as in |pdfbookedition={[en]Second|
+%   |edition}|.
 %
 % \acro{XMP} metadata can include a number of dates (in fact,
 % timestamps, as they include both date and time components).
@@ -780,43 +948,29 @@
 % |\documentclass|, in which case \pkgname{hyperxmp} defaults to
 % |draft|.
 %
-% The \moptname{pdfbytes} option expresses the document's file size in
-% bytes.  The intention is for this to be used to display an estimate of
-% download time to a user or to serve as a quick check on whether a file
-% was transmitted correctly between systems.  This feature is easiest to
-% use in conjunction with \pdfTeX's |\pdffilesize| primitive:
-% ``|pdfbytes={\pdffilesize{\jobname.pdf}}|''.  Note that this requires
-% a second run of |pdftex| because it queries the size of the \acro{PDF}
-% file from the \emph{previous} run.
-%
 % \pkgname{hyperxmp} honors \pkgname{hyperref}'s \moptname{pdftrapped}
 % option.  A document can indicate whether it employs
 % \href{https://en.wikipedia.org/wiki/Trap_(printing)}{color trapping}
 % by specifying \optname{pdftrapped}=|True| or
 % \optname{pdftrapped}=|False|.  (\optname{pdftrapped}=|Unknown| is also
-% allowed.)  A current limitation of \pkgname{hyperxmp} is that if a
-% value other than |False| is provided, a document will additionally
-% need to specify \optname{keeppdfinfo}
-% (page~\pageref{page:keeppdfinfo}) to ensure that the \acro{PDF}
-% \pdfterm{Info} dictionary specifies the correct trapping value.
+% allowed.)
 %
 % \moptname{pdfapart} and \moptname{pdfaconformance}, are used in
 % conjunction with \pkgname{hyperref}'s \optname{pdfa} option to claim a
 % particular \acro{PDF/A} standard by which the document abides.  They
 % default to \optname{pdfapart}=|1| and \optname{pdfaconformance}=|B|,
-% indicating the \PDFstd{A}{1}{b}{} standard.  These can be
-% changed (with caution) to assert that the document abides by a
-% different standard (e.g.,~\PDFstd{A}{2}{u}{}).  A document that
-% conforms to the \acro{PDF/UA} standard can use \moptname{pdfuapart} to
-% indicate the \acro{PDF/UA} conformance level.  For example,
-% \optname{pdfuapart}=|1| asserts that the document respects
-% \PDFstd{UA}{1}{}{}.  \moptname{pdfxstandard} indicates
-% the particular \acro{PDF/X} standard by which the document abides.
-% Unlike \optname{pdfapart} and \optname{pdfaconformance}, which accept a
-% number and a letter, respectively, \optname{pdfxstandard} expects a
-% textual identification of a standard name.  The following are the
-% \acro{PDF/X} standard names that are considered acceptable at the time
-% of this writing.
+% indicating the \PDFstd{A}{1}{b}{} standard.  These can be changed
+% (with caution) to assert that the document abides by a different
+% standard (e.g.,~\PDFstd{A}{2}{u}{}).  A document that conforms to the
+% \acro{PDF/UA} standard can use \moptname{pdfuapart} to indicate the
+% \acro{PDF/UA} conformance level.  For example, \optname{pdfuapart}=|1|
+% asserts that the document respects \PDFstd{UA}{1}{}{}.
+% \moptname{pdfxstandard} indicates the particular \acro{PDF/X} standard
+% by which the document abides.  Unlike \optname{pdfapart} and
+% \optname{pdfaconformance}, which accept a number and a letter,
+% respectively, \optname{pdfxstandard} expects a textual identification
+% of a standard name.  The following are the acceptable \acro{PDF/X}
+% standard names as of at the time of this writing.
 %
 % ^^A  This list needs to be kept up-to-date with the standards checked
 % ^^A  by \@pdfxstandard.
@@ -842,16 +996,30 @@
 % \PDFstd{X}{4}{p}{}, \PDFstd{X}{5}{n}{}, and \PDFstd{X}{5}{pg}{}
 % standards has not been tested.
 %
-% A rarely needed option, \moptname{pdfsource}, overrides the name of
-% the \LaTeX\ source file.  It defaults to |\jobname.tex| but can be
-% replaced by any other string.  If \optname{pdfsource} is given an
-% empty argument, no document source will be specified at all.
+% \subsubsection*{Rarely needed options}
+%
+% \moptname{pdfsource} overrides the name of the \LaTeX\ source file.
+% It defaults to |\jobname.tex| but can be replaced by any other string.
+% If \optname{pdfsource} is given an empty argument, no document source
+% will be specified at all.
+%
+% The number of pages in the published, print version of the document
+% can be expressed with \moptname{pdfnumpages}.  This is computed
+% automatically when the document is built using either \pdfLaTeX\ or
+% \LuaLaTeX\@.
+%
+% The \moptname{pdfbytes} option expresses the document's file size in
+% bytes.  The intention is for this to be used to display an estimate of
+% download time to a user or to serve as a quick check on whether a file
+% was transmitted correctly between systems.  \optname{pdfbytes} is
+% computed automatically by both \pdfLaTeX\ and \LuaLaTeX, using the
+% file size from the previous build of the document.
 %
 % \bigskip
 %
-% It is usually more convenient to provide values for the preceding
-% options using \pkgname{hyperref}'s |\hypersetup| command than on the
-% |\usepackage| command line.  See
+% It is usually more convenient to provide values for all of the options
+% presented in this section using \pkgname{hyperref}'s |\hypersetup|
+% command than on the |\usepackage| command line.  See
 % \href{http://mirrors.ctan.org/macros/latex/contrib/hyperref/hyperref.pdf}{the
 %   \pkgname{hyperref} manual} for more information.
 %
@@ -907,15 +1075,14 @@
 %      pdfvolumenum={322},
 %      pdfissuenum={6},
 %      pdfpagerange={132-148},
-%      pdfnumpages={17},
 %      pdfissn={0003-3804},
 %      pdfeissn={1521-3889},
+%      pdfpubstatus={VoR},
 %      pdflang={en},
 %      pdfmetalang={en},
 %      pdfurl={http://www.physik.uni-augsburg.de/annalen/history/einstein-papers/1905_17_132-148.pdf},
 %      pdfdoi={10.1002/andp.19053220607},
-%      pdfidentifier={info:lccn/50013519},
-%      pdfbytes={\pdffilesize{\jobname.pdf}}   % Requires pdflatex
+%      pdfidentifier={info:lccn/50013519}
 %    }
 %    \XMPLangAlt{de}{pdftitle={Ãœber einen die Erzeugung und Verwandlung des
 %      Lichtes betreffenden heuristischen Gesichtspunkt}}
@@ -937,9 +1104,9 @@
 % \begin{itemize}
 %   \item \pdfLaTeX
 %   \item \LuaLaTeX
+%   \item \XeLaTeX
 %   \item \LaTeX~$+$ Dvipdfm
 %   \item \LaTeX~$+$ \Dvips~$+$ Adobe Acrobat Distiller
-%   \item \XeLaTeX
 % \end{itemize}
 %
 % \noindent
@@ -1162,7 +1329,7 @@
 % document's author(s) as specified by |\author{|\dots|}|.
 % \optname{pdfdate} defaults to the current date and time.
 % \optname{pdfmetalang} defaults to the same value as \optname{pdflang}
-% if non-empty, ``|x-default|'' otherwise.  \pkgname{hyperxmp}
+% if non-empty, ``\xmpterm{x-default}'' otherwise.  \pkgname{hyperxmp}
 % recognizes some class-specific metadata as well, such as that provided
 % via the \Koma\ letter classes (e.g.,~\clsname{scrlttr2}) and the
 % \ACMclass\ article class (\clsname{acmart}).
@@ -1248,25 +1415,16 @@
 % package in the output file to ensure that any macros used in arguments
 % to \pkgname{hyperxmp} options produced the expected output.
 %
-% \usagenote{Automatic page counting}
+% \usagenote{Semi-automatic page ranges}
 % \label{note:page-counting}
-% Although \optname{pdfnumpages} and \optname{pdfpagerange} are intended
-% to refer to pages in the final, published version of a document, it
-% would be convenient for them to be generated automatically when
-% producing a standalone \acro{PDF} file that is not intended to be
-% incorporated into a book, journal, or other publication (or if it is
-% known that the pages will not be renumbered for publication).  One
-% approach is to use the \pkgname{totpages} package to keep track of the
-% number of pages.
-%
-% \begin{verbatim}
-%     \hypersetup{%
-%       pdfnumpages={\ref*{TotPages}}
-%     }
-% \end{verbatim}
-%
-% \pkgname{totpages} can likewise help generate \optname{pdfpagerange}.
-% For documents numbered from~1 to~$n$, a simple
+% Although \optname{pdfpagerange} is intended to refer to pages in the
+% final, published version of a document, it would be convenient for
+% them to be generated automatically when producing a standalone
+% \acro{PDF} file that is not intended to be incorporated into a book,
+% journal, or other publication (or if it is known that the pages will
+% not be renumbered for publication).  One approach is to use the
+% \pkgname{totpages} package help generate \optname{pdfpagerange}.  For
+% documents numbered from~1 to~$n$, a simple
 %
 % \begin{verbatim}
 %     \hypersetup{%
@@ -1294,21 +1452,20 @@
 %
 % I don't know how unnumbered pages (e.g.,~blank pages and the title
 % page) are supposed to be handled.  I suppose blank pages can be
-% omitted from \optname{pdfpagerange}, and title page can be either
-% omitted or listed as |title|, for example.
+% omitted from \optname{pdfpagerange}, and the title page can be either
+% omitted or listed as \texttt{title}, for example.
 %
 % It appears that at least with version~2.00 of \pkgname{totpages}, the
 % |TotPages| label is not defined until after the |\begin{document}|.
 % Consequently, using |TotPages| within a \cs{hypersetup} invocation in
 % the document's preamble will produce ``|??|'' as the page count in the
 % \acro{XMP} packet.  The solution is either to assign
-% \optname{pdfnumpages} and \optname{pdfpagerange} after the
-% |\begin{document}| or to ask \LaTeX\ to do that on your behalf:
+% \optname{pdfpagerange} after the |\begin{document}| or to ask
+% \LaTeX\ to do that on your behalf:
 %
 % \begin{verbatim}
 %     \AtBeginDocument{%
 %       \hypersetup{%
-%         pdfnumpages={\ref*{TotPages}},
 %         pdfpagerange={1-\ref*{TotPages}}
 %       }%
 %     }
@@ -1342,6 +1499,17 @@
 % \input{einstein-xmp}
 %
 % \begin{thebibliography}{99}
+% \bibitem{NISO2008:jav}
+% Beverley Acreman, Claire Bird, Catherine Jones, Peter McCracken, Cliff Morgan,
+%   John Ober, Evan Owens, T.~Scott Plutchak, Bernie Rous, and Andrew Wray.
+% \newblock {J}ournal {A}rticle {V}ersions ({JAV}): Recommendations of the
+%   {NISO}/{ALPSP} {JAV} {T}echnical {W}orking {G}roup.
+% \newblock Recommended practice, National Information Standards Organization,
+%   Baltimore, Maryland, USA, April 2008.
+% \newblock ISBN~\mbox{978-1-880124-79-6}.
+% \newblock Available from
+%   \url{https://www.niso.org/sites/default/files/2017-08/RP-8-2008.pdf}.
+%
 % \bibitem{Adobe2010:pdfmark}
 % Adobe Systems, Inc., San Jose, California.
 % \newblock \emph{{A}dobe {A}crobat~{X} {SDK} Help, pdfmark Reference}.
@@ -1491,6 +1659,70 @@
 %    \end{macrocode}
 % \end{macro}
 %
+% \begin{macro}{\hyxmp@set@jobname}
+% Given an expanded \cs{jobname} followed by \cs{relax}, invoke the
+% \cs{hyxmp@set@jobname@dbl} macro if the job name is surrounded by
+% double quotes and the \cs{hyxmp@set@jobname@plain} macro otherwise.
+%    \begin{macrocode}
+\def\hyxmp@set@jobname#1\relax{%
+  \@ifnextchar"{\hyxmp@set@jobname@dbl}{\hyxmp@set@jobname@plain}#1\relax
+}
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\hyxmp@set@jobname@dbl}
+% \begin{macro}{\hyxmp@jobname}
+% Set \cs{hyxmp@jobname} to to |#1|, discarding the surrounding double
+% quotes.
+%    \begin{macrocode}
+\def\hyxmp@set@jobname@dbl"#1"\relax{\xdef\hyxmp@jobname{#1}}
+%    \end{macrocode}
+% \end{macro}
+% \end{macro}
+%
+% \begin{macro}{\hyxmp@set@jobname@plain}
+% \begin{macro}{\hyxmp@jobname}
+% Set \cs{hyxmp@jobname} to to |#1|.
+%    \begin{macrocode}
+\def\hyxmp@set@jobname@plain#1\relax{\xdef\hyxmp@jobname{#1}}
+%    \end{macrocode}
+% \end{macro}
+% \end{macro}
+%
+% Define \cs{hyxmp@jobname} as a sanitized version of \cs{jobname}.  The
+% problem with using \cs{jobname} directly is that it surrounds the
+% filename with double quotes if it contains a space character.  For
+% example, a source file named \texttt{my-file.tex} results in a
+% \cs{jobname} of ``\texttt{my-file}'', but a source file named
+% \texttt{my file.tex} results in a \cs{jobname} of ``|"my file"|''.
+% Trying to access |"my file".log| (as is done on
+% page~\pageref{page:jobname-log}) will fail because the filename does
+% not in fact contain literal double quotes.
+% \changes{v5.5}{2020/07/28}{Correctly handle source files with spaces
+%   in their name.  Thanks to Peter Dyballa for the bug report}
+%    \begin{macrocode}
+\expandafter\hyxmp@set@jobname\jobname\relax
+%    \end{macrocode}
+%
+% \begin{macro}{\hyxmp@aep@toks}
+% In order for \pkgname{hyperxmp} to be loaded safely during
+% \cs{AtEndPreamble} we need to ensure that we perform no
+% \cs{AtEndPreamble} actions until all top-level macro definitions have
+% been made.  The most straightforward approach would be to move all of
+% \pkgname{hyperxmp}'s \cs{AtEndPreamble} stanzas to the end of the
+% package.  However, this degrades readability of the source code.  For
+% instance, an \cs{AtEndPreamble} stanza related to integration with
+% \pkgname{hyperref} could no longer appear in the ``Integration with
+% \pkgname{hyperref}'' section (Section~\ref{sec:hyperref-int}).  Hence,
+% we instead store in a token list, \cs{hyxmp@aep@toks}, each
+% \cs{AtEndPreamble} stanza as we encounter it.  This token list is
+% evaluated as one of the package's final actions
+% (Section~\ref{sec:clean-up}).
+%    \begin{macrocode}
+\newtoks{\hyxmp@aep@toks}
+%    \end{macrocode}
+% \end{macro}
+%
 %
 % \subsection{Integration with \textsf{hyperref}}
 % \label{sec:hyperref-int}
@@ -1531,6 +1763,15 @@
 \RequirePackage{ifthen}
 %    \end{macrocode}
 %
+% There are a few places where \pkgname{hyperxmp} can take advantage of
+% \LuaTeX\ features.  To simplify the use of \LuaTeX\ we load the
+% \pkgname{luacode} package.
+%    \begin{macrocode}
+\ifLuaTeX
+  \RequirePackage{luacode}
+\fi
+%    \end{macrocode}
+%
 % \begin{macro}{\@ifmtargexp}
 % \begin{macro}{\@ifnotmtargexp}
 % |\@ifmtarg| and |\@ifnotmtarg| do not expand their first argument.
@@ -1824,7 +2065,7 @@
 % \changes{v3.3}{2017/07/16}{Added this macro and the corresponding
 %   \protect\optname{pdfsource} option, at Niklas Beisert's request}
 %    \begin{macrocode}
-\edef\@pdfsource{\jobname.tex}
+\edef\@pdfsource{\hyxmp@jobname.tex}
 \define@key{Hyp}{pdfsource}{\hyxmp@pdfstringdef\@pdfsource{#1}}
 %    \end{macrocode}
 % \end{macro}
@@ -2030,6 +2271,14 @@
 %    \end{macrocode}
 % \end{macro}
 %
+% \begin{macro}{\@pdfpubstatus}
+% Prepare to store the document's journal article version.
+%    \begin{macrocode}
+\def\@pdfpubstatus{}
+\define@key{Hyp}{pdfpubstatus}{\hyxmp@pdfstringdef\@pdfpubstatus{#1}}
+%    \end{macrocode}
+% \end{macro}
+%
 % The following eight macros---|\@pdfcontactaddress|,
 % |\@pdfcontactcity|, |\@pdfcontactregion|, |\@pdfcontactpostcode|,
 % |\@pdfcontactcountry|, |\@pdfcontactphone|, |\@pdfcontactemail|, and
@@ -2364,23 +2613,27 @@
 % Assume that if the document loaded either \pkgname{babel} or
 % \pkgname{polyglossia} it will eventually define one or more languages
 % that \pkgname{hyperxmp} can list within a \xmpprop{dc:language}
-% element.
+% element.  As explained in Section~\ref{sec:initial-prep}, we defer the
+% invocation of \cs{AtEndPreamble} to the end of the file.
 %    \begin{macrocode}
 \edef\hyxmp@concated@metadata{}
-\AtEndPreamble{%
-  \@ifpackageloaded{babel}{%
-    \edef\hyxmp@concated@metadata{babel}%
-  }{%
-    \@ifpackageloaded{polyglossia}{%
-      \edef\hyxmp@concated@metadata{polyglossia}%
+\expandafter\hyxmp@aep@toks\expandafter=\expandafter{%
+  \the\hyxmp@aep@toks
+  \AtEndPreamble{%
+    \@ifpackageloaded{babel}{%
+      \edef\hyxmp@concated@metadata{babel}%
     }{%
+      \@ifpackageloaded{polyglossia}{%
+        \edef\hyxmp@concated@metadata{polyglossia}%
+      }{%
+      }%
     }%
   }%
 }
 %    \end{macrocode}
 % \end{macro}
 %
-% \begin{macro}{\hyxmp@find@metadata}
+% \begin{macro}{\hyxmp@warn@if@no@metadata}
 % \begin{macro}{\hyxmp@concated@metadata}
 % Issue a warning message if the author failed to specify any metadata
 % at all.  This excludes metadata that is included automatically such as
@@ -2389,7 +2642,7 @@
 % with other information.  We also don't examine |\@pdfapart| or
 % |\@pdfaconformance| because those have nonempty default values.
 %    \begin{macrocode}
-\newcommand*{\hyxmp@find@metadata}{%
+\newcommand*{\hyxmp@warn@if@no@metadata}{%
   \edef\hyxmp@concated@metadata{%
     \hyxmp@concated@metadata
     \@baseurl
@@ -2434,7 +2687,7 @@
   }%
   \ifx\hyxmp@concated@metadata\@empty
     \PackageWarningNoLine{hyperxmp}{%
-      \jobname.tex did not specify any metadata to\MessageBreak
+      \hyxmp@jobname.tex did not specify any metadata to\MessageBreak
       include in the XMP packet.\space\space Please see the\MessageBreak
       hyperxmp documentation for instructions on how to\MessageBreak
       provide metadata values to hyperxmp}%
@@ -2496,54 +2749,25 @@
 % \end{macro}
 % \end{macro}
 %
-% Rather than load \pkgname{hyperref} ourself we let the author do it
-% then verify he actually did.  This approach gives the author the
-% flexibility to load \pkgname{hyperxmp} and \pkgname{hyperref} in
-% either order and to call |\hypersetup| anywhere in the document's
-% preamble, not just before \pkgname{hyperxmp} is loaded.
-%    \begin{macrocode}
-\AtEndPreamble{%
-  \@ifpackageloaded{hyperref}{%
-%    \end{macrocode}
-% If \cs{@pdflang} is not set, see if we can detect the document
-% language via either the \pkgname{babel} or \pkgname{polyglossia}
-% packages.
+% Right before we reach the |\begin{document}| we check if
+% \pkgname{hyperref} was loaded.  In normal usage, the document will
+% already have done a |\usepackage{hyperref}| because otherwise,
+% \cs{hypersetup} will not have been defined, and only a limited amount
+% of metadata will be included.  However, in case the author is relying
+% exclusively on \pkgname{hyperxmp}'s automatically detected metadata,
+% we'll need to load \pkgname{hyperref} now.  As explained in
+% Section~\ref{sec:initial-prep}, we defer the invocation of
+% \cs{AtEndPreamble} to the end of the file.
+% \changes{v5.5}{2020/06/24}{Load \protect\pkgname{hyperref} automatically
+%   if the document does not do so explicitly, as requested by Robin Schwab}
 %    \begin{macrocode}
-    \@if@def@and@nonempty{@pdflang}{%
-    }{%
-      \hyxmp@detect@langs
-    }%
-%    \end{macrocode}
-% Fill in any missing metadata we can using values provided by the author
-% via mechanisms other than the \cs{hypersetup} command.
-%    \begin{macrocode}
-    \hyxmp@auto@assign@data
-%    \end{macrocode}
-% Most \acro{PDF} standards dictate that if the same metadata appear in
-% both the \acro{XMP} packet and the \acro{PDF} \pdfterm{Info}
-% dictionary, the metadata must match.  This requirement poses a problem
-% for a user-unspecified \optname{pdfcreationdate} in the context of
-% \XeLaTeX\@.  In this case we explicitly define |\@pdfcreationdate| as
-% |\hyxmp@today@pdf| to prevent the \cmdname{xdvipdfmx} back-end
-% processor from detecting a missing \pdfterm{CreationDate} in the
-% \pdfterm{Info} dictionary and adding its own---typically a few seconds
-% after \pkgname{hyperxmp} has constructed an \xmpprop{xmp:CreateDate}
-% for the \acro{XMP} metadata and leading to a metadata mismatch.
-%    \begin{macrocode}
-    \@ifundefined{XeTeXversion}{}{%
-      \@ifmtargexp{\@pdfcreationdate}{%
-        \let\@pdfcreationdate=\hyxmp@today@pdf
-      }%
-      {}%
-    }%
-%    \end{macrocode}
-% If the document claims to comply with one or more \acro{PDF}
-% standards, check that all of the requisite metadata are present.
-%    \begin{macrocode}
-    \hyxmp@check@standards
+\expandafter\hyxmp@aep@toks\expandafter=\expandafter{%
+  \the\hyxmp@aep@toks
+  \AtEndPreamble{%
+    \RequirePackage{hyperref}%
 %    \end{macrocode}
 % Older versions of \pkgname{hyperref} write the \pdfterm{Info}
-% dictionary to the \acro{PDF} file at the end of the document.  New
+% dictionary to the \acro{PDF} file at the end of the document.  Newer
 % versions of \pkgname{hyperref} write the \pdfterm{Info} dictionary to
 % the \acro{PDF} file at the \emph{beginning} of the document.  For
 % compatibility with both old and new \pkgname{hyperref} implementations
@@ -2556,39 +2780,44 @@
 %    \begin{macrocode}
     \hyxmp@no@info@lists
 %    \end{macrocode}
-% We wait until the end of the document to construct the \acro{XMP}
-% packet and write it to the \acro{PDF} document catalog.  This gives
-% the author ample opportunity to provide metadata to \pkgname{hyperref}
-% and thereby \pkgname{hyperxmp}.
-%    \begin{macrocode}
-    \hyxmp@at@end{%
-      \hyxmp@find@metadata
-      \hyxmp@embed@packet
-    }%
-  }{%
-    \PackageWarningNoLine{hyperxmp}{%
-      \jobname.tex failed to include a\MessageBreak
-      \string\usepackage\string{hyperref\string}
-      in the preamble.\MessageBreak
-      Consequently, all hyperxmp functionality will be\MessageBreak
-      disabled}%
+% If \optname{pdftitle} is undefined but the author invoked \cs{title},
+% we copy the latter to the former.  This addresses two problems:
+% (1)~handling \LaTeX\ classes in which \cs{maketitle} clears \cs{title}
+% and (2)~ensuring that \pkgname{hyperref} writes the same title to the
+% \acro{PDF} \pdfterm{Info} dictionary that \pkgname{hyperxmp} writes to
+% the \acro{XMP} packet.  We do likewise for \cs{author}~$\rightarrow$
+% \optname{pdfauthor}.
+%
+% One tricky bit is that the standard \LaTeX\ classes do not define
+% \cs{@title} and \cs{@author} as empty strings but rather as calls to
+% \cs{@latex@warning@no@line} that complain about a missing
+% title/author.  Hence, we can't simply test if the title and author are
+% empty because they're not.  Instead, we first locally redefine
+% \cs{@latex@warning@no@line} to discard its argument then test if any
+% text remains.
+% \changes{v5.5}{2020/07/24}{Copy \protect\cs{title} to
+%   \protect\optname{pdftitle} and \protect\cs{author} to
+%   \protect\optname{pdfauthor} at the start of the document to improve
+%   consistency between \protect\acro{XMP} and \protect\acro{PDF} metadata}
+%    \begin{macrocode}
+    \begingroup
+      \let\@latex@warning@no@line=\@gobble
+      \hyxmp@use@first@valid{pdftitle}{\@pdftitle}{%
+        \scr@subject@var,%
+        \@title
+      }%
+      \hyxmp@use@first@valid{pdfauthor}{\@pdfauthor}{%
+        \scr@fromname@var,%
+        \@author
+      }%
+    \endgroup
   }%
 }
 %    \end{macrocode}
 %
-% A number of classes either require or recommend that authors declare
-% various class-specific metadata \emph{after} the |\begin{document}|.
-% So where do we invoke \cs{hyxmp@auto@assign@data}?  On one hand, we
-% want to invoke it before the |\begin{document}| because this may
-% obviate \pkgname{hyperxmp}'s ``\meta{job name} did not specify any
-% metadata'' warning message.  On the other hand, we want to invoke it
-% after the |\begin{document}| so it picks up metadata not specified in
-% the preamble.  Our solution is to invoke \cs{hyxmp@auto@assign@data}
-% twice: both before the |\begin{document}| and at the |\end{document}|.
-% We additionally identify here the natural language(s) in use because
-% these aren't known until the end of the document when provided by
-% \pkgname{babel} or \pkgname{polyglossia}.  Also, \pkgname{hyperref}
-% forbids changes to \optname{pdflang} past the |\begin{document}|.
+% When we reach the |\end{document}| we need to gather up the metadata
+% specified explicitly by the user, infer additional metadata where
+% possible, and write the \acro{XMP} packet to the \acro{PDF} file.
 % \changes{v1.3}{2011/04/25}{Introduced the \protect\optname{pdfmetalang}
 %   package option, which enables an author to specify the language in which he
 %   wrote the document's metadata}
@@ -2596,24 +2825,32 @@
 %   Oberdiek to properly encode \cs{@pdfmetalang}}
 % \changes{v3.3}{2017/07/21}{Don't overwrite an existing
 %   \protect\optname{pdfmetalang} with \protect\optname{pdflang} or
-%   \protect\texttt{x-default}.  This addresses a bug report by Niklas
+%   \protect\xmpterm{x-default}.  This addresses a bug report by Niklas
 %   Beisert}
 % \changes{v5.4}{2020/06/18}{Moved the automatic assignment of
 %   \protect\cs{@pdflang} and \protect\cs{@pdfmetalang} from
 %   \protect\cs{hyxmp@auto@assign@data} to within a call to
 %   \protect\cs{hyxmp@at@end}}
+% \changes{v5.5}{2020/07/21}{Move most of the \protect\cs{AtEndPreamble}
+%   code to \protect\cs{hyxmp@at@end}}
 %    \begin{macrocode}
 \hyxmp@at@end{%
-  \hyxmp@set@dc@lang
-  \ifx\@pdfmetalang\@empty
-    \ifx\@pdflang\@empty
-      \let\@pdfmetalang=\hyxmp@x@default
-    \else
-      \edef\@pdfmetalang{\@pdflang}%
-    \fi
-  \fi
-  \hyxmp@xmlify\@pdfmetalang
+%    \end{macrocode}
+% Fill in any missing metadata we can using values provided by the author
+% via mechanisms other than the \cs{hypersetup} command.
+%    \begin{macrocode}
   \hyxmp@auto@assign@data
+%    \end{macrocode}
+% If the document claims to comply with one or more \acro{PDF}
+% standards, check that all of the requisite metadata are present.
+%    \begin{macrocode}
+  \hyxmp@check@standards
+%    \end{macrocode}
+% We can finally construct the \acro{XMP} packet and write it to the
+% \acro{PDF} document catalog.
+%    \begin{macrocode}
+  \hyxmp@warn@if@no@metadata
+  \hyxmp@embed@packet
 }
 %    \end{macrocode}
 %
@@ -2638,23 +2875,29 @@
 %
 % \begin{macro}{\hyxmp@set@koma@phones}
 % \changes{v5.3}{2020/06/07}{Added this macro}
+% \changes{v5.5}{2020/07/08}{Support hyperlinks and other markup in
+%   \protect\texttt{frommobilephone} and \protect\texttt{fromphone},
+%   as requested by Robin Schwab}
 % \begin{macro}{\hyxmp@koma@phones}
 % Define \cs{hyxmp@koma@phones} as a comma-separated list of the phone
 % numbers provided to a \Koma\ letter class (mobile and landline).
 %    \begin{macrocode}
 \newcommand*{\hyxmp@set@koma@phones}{%
-  \@if@def@and@nonempty{scr@frommobilephone@var}{%
-    \@if@def@and@nonempty{scr@fromphone@var}{%
-      \edef\hyxmp@koma@phones{\scr@frommobilephone@var,\scr@fromphone@var}%
-    }{%
-      \edef\hyxmp@koma@phones{\scr@frommobilephone@var}%
-    }%
-  }{%
-    \@if@def@and@nonempty{scr@fromphone@var}{%
-      \edef\hyxmp@koma@phones{\scr@fromphone@var}%
+  \begingroup
+    \Hy@unicodefalse
+    \@if@def@and@nonempty{scr@frommobilephone@var}{%
+      \@if@def@and@nonempty{scr@fromphone@var}{%
+        \hyxmp@pdfstringdef\hyxmp@koma@phones{\scr@frommobilephone@var,\scr@fromphone@var}%
+      }{%
+        \hyxmp@pdfstringdef\hyxmp@koma@phones{\scr@frommobilephone@var}%
+      }%
     }{%
+      \@if@def@and@nonempty{scr@fromphone@var}{%
+        \hyxmp@pdfstringdef\hyxmp@koma@phones{\scr@fromphone@var}%
+      }{%
+      }%
     }%
-  }%
+  \endgroup
 }
 %    \end{macrocode}
 % \end{macro}
@@ -2709,9 +2952,28 @@
 %    \begin{macrocode}
 \newcommand*{\hyxmp@auto@assign@data}{%
 %    \end{macrocode}
-% If the author left \optname{pdftitle} blank but specified |\title|,
-% use the title for \optname{pdftitle}.  Do likewise for various other
-% metadata: identify author-provided information that can be co-opted
+% If \cs{@pdflang} is not set, see if we can detect the document
+% language via either the \pkgname{babel} or \pkgname{polyglossia}
+% packages.
+%    \begin{macrocode}
+  \@if@def@and@nonempty{@pdflang}{%
+    \let\hyxmp@dc@lang=\@pdflang
+  }{%
+    \hyxmp@detect@langs
+  }%
+%    \end{macrocode}
+% Replace an empty \cs{@pdfmetalang}.  If \cs{@pdflang} is defined, use
+% that as the metadata language.  Otherwise, use \xmpterm{x-default}.
+%    \begin{macrocode}
+  \ifx\@pdfmetalang\@empty
+    \ifx\@pdflang\@empty
+      \let\@pdfmetalang=\hyxmp@x@default
+    \else
+      \edef\@pdfmetalang{\@pdflang}%
+    \fi
+  \fi
+%    \end{macrocode}
+% Identify various author-provided information that can be co-opted
 % for use as \acro{XMP} metadata.
 % \changes{v2.7}{2016/02/01}{Automatically use \cs{title} and \cs{author}
 %   if \protect\optname{pdftitle} and \protect\optname{pdfauthor} are left
@@ -2719,15 +2981,14 @@
 % \changes{v5.3}{2020/05/29}{Consider other author-provided sources of
 %   metadata.  Thanks to Robin Schwab for proposing that
 %  \protect\pkgname{hyperxmp} use the \Koma\ letter classes's metadata}
+% \changes{v5.5}{2020/07/24}{Moved the language-detection and
+%   \protect\XeTeX\ date-detection code here from the
+%   \protect\cs{hyxmp@at@end} block}
+% \changes{v5.5}{2020/07/24}{Use \protect\LuaTeX\ mechanisms, when available,
+%   to automatically compute the page count}
+% \changes{v5.5}{2020/07/24}{Moved title and author autodetection to the
+%   \protect\cs{AtEndPreamble}}
 %    \begin{macrocode}
-  \hyxmp@use@first@valid{pdftitle}{\@pdftitle}{%
-    \scr@subject@var,%
-    \@title
-  }%
-  \hyxmp@use@first@valid{pdfauthor}{\@pdfauthor}{%
-    \scr@fromname@var,%
-    \@author
-  }%
   \hyxmp@use@first@valid{pdfcontactemail}{\@pdfcontactemail}{%
     \scr@fromemail@var
   }%
@@ -2752,6 +3013,98 @@
 % redefined to do nothing.
 %    \begin{macrocode}
   \hyxmp@parse@acmart
+%    \end{macrocode}
+% Most \acro{PDF} standards dictate that if the same metadata appear in
+% both the \acro{XMP} packet and the \acro{PDF} \pdfterm{Info}
+% dictionary, the metadata must match.  This requirement poses a problem
+% for a user-unspecified \optname{pdfcreationdate} in the context of
+% \XeLaTeX\@.  In this case we explicitly define |\@pdfcreationdate| as
+% |\hyxmp@today@pdf| to prevent the \cmdname{xdvipdfmx} back-end
+% processor from detecting a missing \pdfterm{CreationDate} in the
+% \pdfterm{Info} dictionary and adding its own---typically a few seconds
+% after \pkgname{hyperxmp} has constructed an \xmpprop{xmp:CreateDate}
+% for the \acro{XMP} metadata and leading to a metadata mismatch.
+%    \begin{macrocode}
+  \@ifundefined{XeTeXversion}{}{%
+    \@ifmtargexp{\@pdfcreationdate}{%
+      \let\@pdfcreationdate=\hyxmp@today@pdf
+    }%
+    {}%
+  }%
+%    \end{macrocode}
+% Query the document currently being built for page and byte counts.
+%    \begin{macrocode}
+  \hyxmp@query@self
+}
+%    \end{macrocode}
+% \end{macro}
+%
+% \pkgname{hyperxmp} can directly query the page count using
+% \LuaTeX\ features.  When any other \TeX\ engine is used,
+% \pkgname{hyperxmp} employs the \pkgname{totpages} package to help
+% tally the total number of pages.
+%    \begin{macrocode}
+\ifLuaTeX
+\else
+  \RequirePackage{totpages}
+\fi
+%    \end{macrocode}
+%
+% Determine the size of the output file from the \emph{previous} run of
+% \LuaLaTeX\ or \pdfLaTeX\@.  This action has to be performed before the
+% |\begin{document}| because at that point the size of the output file
+% is reset to zero.  We use |\jobname.pdf| as the name of the output
+% file even in the \LuaLaTeX\ case because |status.output_file_name| is
+% not defined at this point.
+%    \begin{macrocode}
+\ifLuaTeX
+  \edef\hyxmp@prev@pdf@size{%
+    \luadirect{%
+local nbytes = lfs.attributes("\hyxmp@jobname.pdf", "size")
+if nbytes then
+  tex.write(nbytes)
+end
+    }%
+  }%
+\else
+  \ifPDFTeX
+    \edef\hyxmp@prev@pdf@size{\pdffilesize{\hyxmp@jobname.pdf}}%
+  \fi
+\fi
+%    \end{macrocode}
+%
+% \begin{macro}{\hyxmp@query@self}
+% Query the document currently being built to acquire page and byte counts.
+% \changes{v5.5}{2020/07/25}{Added this macro}
+%    \begin{macrocode}
+\newcommand*{\hyxmp@query@self}{%
+%    \end{macrocode}
+% \LuaTeX\ exposes via \texttt{status.total\_pages} the number of pages
+% written.  We use this mechanism when available to assign
+% \cs{@pdfnumpages}.  To finalize the page count we first issue a
+% \cs{clearpage}.
+%    \begin{macrocode}
+  \ifLuaTeX
+    \@if@def@and@nonempty{@pdfnumpages}{%
+    }{%
+      \clearpage
+      \xdef\@pdfnumpages{\luadirect{tex.print(status.total_pages)}}%
+    }%
+  \else
+%    \end{macrocode}
+% Without \LuaTeX\ we rely on the \pkgname{totpages} package to help
+% count the number of pages.  This may require an additional run of
+% \LaTeX, but the user will be notified in that case.
+%    \begin{macrocode}
+    \pdfstringdef\@pdfnumpages{\ref*{TotPages}}%
+  \fi
+%    \end{macrocode}
+% If \optname{pdfbytes} hasn't been set, set it to the output file's size
+% from the previous run.
+%    \begin{macrocode}
+  \hyxmp@use@first@valid{pdfbytes}{\@pdfbytes}{%
+    \hyxmp@prev@pdf@size
+  }%
 }
 %    \end{macrocode}
 % \end{macro}
@@ -2979,39 +3332,25 @@
 \@ifclassloaded{acmart}{}{\let\hyxmp@parse@acmart=\relax}
 %    \end{macrocode}
 %
-% \begin{macro}{\hyxmp@set@dc@lang}
 % \begin{macro}{\hyxmp@dc@lang}
-% \cs{@pdflang} is used in both the \acro{PDF} document catalog (the
-% \pdfterm{Lang} key, written to the \acro{PDF} file by
-% \pkgname{hyperref}) and in the Dublin Core \xmpprop{dc:language} tag
-% (Section~\ref{sec:dublin-core}).  Normally, these are the same.
-% However, \pdfterm{Lang} accepts only a single language while
-% \xmpprop{dc:language} accepts multiple languages.  If the document
-% loads either \pkgname{babel} or \pkgname{polyglossia} and does not
-% specify \optname{pdflang} in \cs{hypersetup}, \cs{hyxmp@set@dc@lang}
-% is redefined below (in \cs{hyxmp@detect@langs}) to set
-% \cs{hyxmp@dc@lang} to \pkgname{babel}\slash\pkgname{polyglossia}'s
-% list of used languages (once this is known).  Otherwise,
-% \cs{hyxmp@set@dc@lang} assigns the language specified by
-% \optname{pdflang} (if any) to \cs{hyxmp@dc@lang}.
+% \cs{hyxmp@dc@lang} is a comma-separated list of all languages used in
+% the document.
 %    \begin{macrocode}
-\newcommand*{\hyxmp@set@dc@lang}{%
-  \let\hyxmp@dc@lang=\@pdflang
-}
+\let\hyxmp@dc@lang=\@empty
 %    \end{macrocode}
 % \end{macro}
-% \end{macro}
 %
 % \begin{macro}{\hyxmp@detect@langs}
 % If \optname{pdflang} was not specified, try to determine the document
 % language(s) using either \pkgname{babel}'s or \pkgname{polyglossia}'s
-% definitions.  If so, we redefine \cs{hyxmp@set@dc@lang} as a
-% comma-separate list of languages used in the document.
+% definitions.
 % \changes{v5.3}{2020/06/08}{Acquire the default language from the
 %   \protect\pkgname{polyglossia} package, if loaded.  Thanks to
 %   Robin Schwab for bringing that package to my attention}
 % \changes{v5.4}{2020/06/16}{Refactored language detection into a
-% separate command}
+%   separate command}
+% \changes{v5.5}{2020/07/21}{Set the language(s) immediately instead of
+%   deferring them to \protect\cs{hyxmp@set@dc@lang}}
 %    \begin{macrocode}
 \newcommand*{\hyxmp@detect@langs}{%
   \@ifundefined{mainbcp47id}{%
@@ -3034,103 +3373,45 @@
       \let\@pdflang=\@empty
     }{%
 %    \end{macrocode}
-% Use \pkgname{babel}'s \cs{LocaleForEach} and \cs{getlocaleproperty} to
-% construct a comma-separate list of all document languages.  We also
-% set \cs{@pdflang} within \cs{hyxmp@set@dc@lang}.
-% (\cs{hyxmp@detect@langs} should only be called if \cs{@pdflang} is
-% empty.)  Unlike \pkgname{polyglossia}, \pkgname{babel} does not
-% provide information about the main language until after the
-% |\begin{document}| so we have to wait until \cs{hyxmp@set@dc@lang} is
-% called to set it.
 % \changes{v5.4}{2020/06/17}{Added support for \protect\pkgname{babel}}
+% \changes{v5.5}{2020/07/16}{Store the main language in \protect\cs{@pdflang}.
+%   Thanks to Javier Bezos for his help with the \protect\pkgname{hyperxmp}
+%   code and for modifying \protect\pkgname{babel} for
+%   \protect\pkgname{hyperxmp}'s benefit}
+% \begin{macro}{\hyxmp@dc@lang}
+% \begin{macro}{\hyxmp@lang@tag}
+% \begin{macro}{\hyxmp@lang@name}
+% \begin{macro}{\@pdflang}
+% Use \pkgname{babel}'s \cs{LocaleForEach} and \cs{getlocaleproperty} to
+% set \cs{@pdflang} to the document's main language and
+% \cs{hyxmp@dc@lang} to a comma-separated list of all languages used.
 %    \begin{macrocode}
       \BabelEnsureInfo
-      \renewcommand*{\hyxmp@set@dc@lang}{%
-        \getlocaleproperty\@pdflang{\bbl@main@language}{identification/tag.bcp47}%
-        \hyxmp@write@pdflang
-        \let\hyxmp@dc@lang=\relax
-        \LocaleForEach{%
-          \getlocaleproperty\hyxmp@lang@tag{####1}{identification/tag.bcp47}%
-          \ifx\hyxmp@dc@lang\relax
-            \edef\hyxmp@dc@lang{\hyxmp@lang@tag}%
-          \else
-            \edef\hyxmp@dc@lang{\hyxmp@dc@lang,\hyxmp@lang@tag}%
-          \fi
-        }%
+      \LocaleForEach{%
+        \getlocaleproperty\hyxmp@lang@tag{##1}{identification/tag.bcp47}%
+        \ifx\hyxmp@dc@lang\@empty
+          \xdef\hyxmp@dc@lang{\hyxmp@lang@tag}%
+        \else
+          \xdef\hyxmp@dc@lang{\hyxmp@dc@lang,\hyxmp@lang@tag}%
+        \fi
+        \def\hyxmp@lang@name{##1}%
+        \ifx\hyxmp@lang@name\bbl@main@language
+          \edef\@pdflang{\hyxmp@lang@tag}%
+        \fi
       }%
     }%
   }{%
 %    \end{macrocode}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
 % Use \pkgname{polyglossia}'s \cs{mainbcp47id} as the document's main
 % language and its \cs{xpg@bcp@loaded} as a comma-separated list of all
 % document languages.
 %    \begin{macrocode}
     \xdef\@pdflang{\csname mainbcp47id\endcsname}%
-    \renewcommand*{\hyxmp@set@dc@lang}{%
-      \edef\hyxmp@dc@lang{\xpg@bcp@loaded}%
-    }%
-  }%
-}
-%    \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\hyxmp@write@pdflang}
-% Here's a conundrum: \pkgname{babel} doesn't provide access to
-% information on the document's main language until after the
-% |\begin{document}|.  However, \pkgname{hyperref} allows
-% \optname{pdflang} to be set only \emph{before} the |\begin{document}|.
-% So what do we do?
-%
-% Note that the underlying \cs{@pdflang} macro serves two purposes:
-% \pkgname{hyperref} uses it to set the \pdfterm{Lang} entry in the
-% \acro{PDF} document catalog, and \pkgname{hyperxmp} uses it as the
-% default metadata language.  The latter is used in \xmpprop{dc:title}
-% and other \acro{XMP} properties that can include per-language
-% variants.  We set \cs{@pdflang} once we have the main-language
-% information from \pkgname{babel}.  As this is too late for
-% \pkgname{hyperref}, we bypass \pkgname{hyperref} and manually write
-% the \pdfterm{Lang} key into the document catalog.  This is a bit
-% kludgy, but we do leverage as much of \pkgname{hyperref}'s
-% infrastructure as possible to increase \cs{hyxmp@write@pdflang}'s
-% robustness.
-% \changes{v5.4}{2020/06/19}{Added this macro}
-%    \begin{macrocode}
-\newcommand*{\hyxmp@write@pdflang}{%
-  \@ifundefined{pdfmark}{%
-    \@ifundefined{@pdfm@mark}{%
-      \@ifundefined{pdfcatalog}{%
-%    \end{macrocode}
-% We don't recognize the \tex\ engine or \acro{PDF} generator.  (This is
-% unexpected.)  We therefore issue a warning message and take no further
-% action.
-%    \begin{macrocode}
-        \PackageWarning{hyperxmp}{Unknown PDF generator; not setting the language (\@pdflang) in the PDF catalog}%
-      }{%
-%    \end{macrocode}
-% We're running either \pdfTeX\ or \LuaTeX\@.  (\pkgname{hyperref}
-% defines \cs{pdfcatalog} in the latter case.)
-%    \begin{macrocode}
-        \pdfcatalog{/Lang (\@pdflang)}%
-      }%
-    }{%
-%    \end{macrocode}
-% We're running either \XeTeX\ or \tex~+
-% \texttt{dvipdfm}.\SortIndex{dvipdfm}{\texttt{dvipdfm}}.
-%    \begin{macrocode}
-      \@pdfm@mark{docview << /Lang (\@pdflang) >>}%
-    }%
-}{%
-%    \end{macrocode}
-% We're running either \tex~+ \Dvips~+ Adobe Acrobat Distiller (or other
-% converter from PostScript to \acro{PDF}).
-%    \begin{macrocode}
-    \pdfmark{%
-      pdfmark=/PUT,Raw={%
-        \string{Catalog\string} <<
-        /Lang (\@pdflang)
-        >>
-      }%
-    }%
+    \edef\hyxmp@dc@lang{\xpg@bcp@loaded}%
   }%
 }
 %    \end{macrocode}
@@ -3659,6 +3940,7 @@
 % Case 3: |\filemoddate| is defined (\XeLaTeX).
 % In this case, we treat the timestamp of the job's |.log| file as the
 % current date/time.
+% \label{page:jobname-log}
 % \changes{v5.1}{2020/04/08}{Don't rely on
 %   \string\cs{jobname}\string\texttt{.aux} existing to query the
 %   current time under \string\XeLaTeX\string\@.  Instead, use
@@ -3666,7 +3948,7 @@
 %   for the bug report and for her suggestion to use the log file.}
 %    \begin{macrocode}
 \hyxmp@try@today{filemoddate}{%
-  \edef\hyxmp@today@xmp{\filemoddate{\jobname.log}}%
+  \edef\hyxmp@today@xmp{\filemoddate{\hyxmp@jobname.log}}%
   \edef\next{%
     \edef\noexpand\hyxmp@today@xmp{\noexpand\hyxmp@as@xmp@date{\hyxmp@today@xmp}}%
   }%
@@ -4244,7 +4526,7 @@
 % and typesets the text within the \acro{XML} tag.
 %    \begin{macrocode}
 \newcommand*{\hyxmp@add@simple@lang@i}{%
-  \@ifnextchar[\hyxmp@add@simple@lang@ii{\hyxmp@add@simple@lang@ii[]}%
+  \@ifnextchar[\hyxmp@add@simple@lang@ii{\hyxmp@add@simple@lang@ii[\@pdfmetalang]}%
 }
 %    \end{macrocode}
 % \end{macro}
@@ -4302,9 +4584,10 @@ ______<#3 xml:lang="#1">\hyxmp@xmlified</#3>^^J%
 % \xmpprop{dc:description}, and \xmpprop{dc:rights} (and others?  Let me
 % know.)---can be expressed in multiple languages.  The same text is
 % used for both language \optname{pdfmetalang} (default:
-% \optname{pdflang}) and language ``|x-default|''.  To express the same
-% metadata in multiple languages, we provide an |\XMPLangAlt| macro to
-% construct a list of alternative forms for a piece of metadata.
+% \optname{pdflang}) and language ``\xmpterm{x-default}''.  To express
+% the same metadata in multiple languages, we provide an |\XMPLangAlt|
+% macro to construct a list of alternative forms for a piece of
+% metadata.
 %
 % \begin{macro}{\hyxmp@alt@title}
 % \begin{macro}{\hyxmp@alt@description}
@@ -4572,7 +4855,7 @@ ______<#3 xml:lang="#1">\hyxmp@xmlified</#3>^^J%
 %   Bug reported by Ga\"etan Leurent}
 %    \begin{macrocode}
 \newcommand*{\hyxmp@def@DocumentID}{%
-  \edef\hyxmp@seed@string{\jobname:\@pdftitle:\@pdfauthor:}%
+  \edef\hyxmp@seed@string{\hyxmp@jobname:\@pdftitle:\@pdfauthor:}%
   \expandafter\hyxmp@seed@rng\expandafter{\hyxmp@seed@string}%
   \edef\hyxmp@rand@num{\the\@tempcnta}%
   \hyxmp@create@uuid\hyxmp@DocumentID
@@ -4600,7 +4883,7 @@ ______<#3 xml:lang="#1">\hyxmp@xmlified</#3>^^J%
 \newcommand*{\hyxmp@def@InstanceID}{%
   \hyxmp@today@xmp@define{\hyxmp@seed@string}%
   \edef\hyxmp@seed@string{%
-    \jobname:\@pdftitle:\@pdfauthor:\hyxmp@today@xmp:\hyxmp@seed@string
+    \hyxmp@jobname:\@pdftitle:\@pdfauthor:\hyxmp@today@xmp:\hyxmp@seed@string
   }%
   \expandafter\hyxmp@seed@rng\expandafter{\hyxmp@seed@string}%
   \edef\hyxmp@rand@num{\the\@tempcnta}%
@@ -4617,20 +4900,32 @@ ______<#3 xml:lang="#1">\hyxmp@xmlified</#3>^^J%
 % An \acro{XMP} packet ``shall consist of the following, in order: a
 % header \acro{PI}, the serialized \acro{XMP} data model (the \acro{XMP}
 % packet) with optional white-space padding, and a trailer
-% \acro{PI}''~\cite{Adobe2012:XMP}.  (``\acro{PI}'' is an abbreviation
-% for ``processing instructions'').  The serialized \acro{XMP} includes
-% blocks of \acro{XML} for various \acro{XMP} schemata: Adobe \acro{PDF}
-% (Section~\ref{sec:adobe-pdf}), Dublin Core
-% (Section~\ref{sec:dublin-core}), \acro{XMP} Rights Management
-% (Section~\ref{sec:xmp-rights}), \acro{XMP} Media Management
-% (Section~\ref{sec:xmp-media}), \acro{XMP} Basic
-% (Section~\ref{sec:xmp-basic}), Photoshop
-% (Section~\ref{sec:photoshop}), \acro{IPTC} Photo Metadata
-% (Section~\ref{sec:photo-meta}), and \acro{PDF}\textsc{/*} Identification
-% (Section~\ref{sec:pdfX-id}).  The |\hyxmp@construct@packet| macro
-% (Section~\ref{sec:combining-schemata}) constructs the \acro{XMP}
-% packet into |\hyxmp@xml|.  It first writes the appropriate \acro{XML}
-% header, then calls the various schema-writing macros, then injects
+% \acro{PI}''~\cite{Adobe2012:XMP}.  (``\acro{PI}'' is an abbreviation for
+% ``processing instructions'').  The serialized \acro{XMP} includes blocks
+% of \acro{XML} for various \acro{XMP} schemata:
+% ^^A
+% \schema[Adobe PDF]{Adobe \protect\acro{PDF}} (Section~\ref{sec:adobe-pdf}),
+% \schema{Dublin Core} (Section~\ref{sec:dublin-core}),
+% \schema[XMP Rights Management]{\protect\acro{XMP} Rights Management} (Section~\ref{sec:xmp-rights}),
+% \schema[XMP Media Management]{\protect\acro{XMP} Media Management} (Section~\ref{sec:xmp-media}),
+% \schema[XMP Basic]{\protect\acro{XMP} Basic} (Section~\ref{sec:xmp-basic}),
+% \schema{Photoshop} (Section~\ref{sec:photoshop}),
+% \index{PDF/A Identification schema=\acro {PDF/A} Identification schema}
+% \index{PDF/X Identification schema=\acro {PDF/X} Identification schema}
+% \index{PDF/UA Identification schema=\acro {PDF/UA} Identification schema}
+% \index{schemata&PDF/A Identification=\acro {PDF/A} Identification}
+% \index{schemata&PDF/X Identification=\acro {PDF/X} Identification}
+% \index{schemata&PDF/UA Identification=\acro {PDF/UA} Identification}
+% \acro{PDF}\textsc{/*} Identification (Section~\ref{sec:pdfX-id}),
+% \schema[IPTC Photo Metadata]{\protect\acro{IPTC} Photo Metadata} (Section~\ref{sec:photo-meta}),
+% \schema[PRISM Basic Metadata]{\protect\acro{PRISM} Basic Metadata} (Section~\ref{sec:prism-meta}),
+% \schema{Journal Article Versions} (Section~\ref{sec:niso-jav-meta}), and
+% \schema[XMP Paged-Text]{\protect\acro{XMP} Paged-Text} (Section~\ref{sec:xmp-paged-text}).
+% ^^A
+% The |\hyxmp@construct@packet| macro
+% (Section~\ref{sec:combining-schemata}) constructs the \acro{XMP} packet
+% into |\hyxmp@xml|.  It first writes the appropriate \acro{XML} header,
+% then calls the various schema-writing macros, then injects
 % |\hyxmp@padding| as padding, and finally writes the appropriate
 % \acro{XML} trailer.
 %
@@ -4705,8 +5000,8 @@ _______________________________________________________________^^J%
 % \end{macro}
 %
 % \begin{macro}{\hyxmp@x@default}
-% Define an |x-default| string that we can use in comparisons with
-% |\@pdfmetalang|.
+% Define an \xmpterm{x-default} string that we can use in comparisons
+% with |\@pdfmetalang|.
 %    \begin{macrocode}
 \newcommand*{\hyxmp@x@default}{x-default}
 %    \end{macrocode}
@@ -4716,6 +5011,8 @@ _______________________________________________________________^^J%
 % \subsubsection{The Adobe PDF schema}
 % \label{sec:adobe-pdf}
 %
+% \begin{schemadesc}[Adobe PDF]{Adobe \protect\acro{PDF}}
+%
 % Older versions of \pkgname{hyperref} defined a default producer; newer
 % versions do not.  Instead, they let the \tex\ engine define the
 % producer itself.  This poses a problem for \acro{PDF/A} compliance
@@ -4891,20 +5188,44 @@ _______________________________________________________________^^J%
 %    \end{macrocode}
 % \end{macro}
 %
+% \end{schemadesc}
+%
 %
 % \subsubsection{The Dublin Core schema}
 % \label{sec:dublin-core}
 %
+% \begin{schemadesc}{Dublin Core}
+%
+% \begin{macro}{\ifhyxmp@multi@langs}
+% \begin{macro}{\hyxmp@multi@langstrue}
+% \begin{macro}{\hyxmp@multi@langsfalse}
+% These macros are used locally to \cs{hyxmp@rdf@dc}.  If the property
+% being processed has values in different languages,
+% \cs{ifhyxmp@multi@langs} evaluates to \textsc{true}.  If it has a
+% value in only a single language, \cs{ifhyxmp@multi@langs} evaluates to
+% \textsc{false}.
+%    \begin{macrocode}
+\newif\ifhyxmp@multi@langs
+%    \end{macrocode}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+%
 % \begin{macro}{\hyxmp@rdf@dc}
 % Given an optional |\if|\meta{something} statement (|#1|), a Dublin Core
 % property~(|#2|) and a macro containing some |\pdfstringdef|-defined
 % text~(|#3|), append the appropriate block of \acro{XML} to the |\hyxmp@xml|
 % macro.
-% \changes{v1.4}{2011/06/12}{Included metadata in the \texttt{x-default}
+% \changes{v1.4}{2011/06/12}{Included metadata in the \xmpterm{x-default}
 %   language regardless of the specified metadata language}
 % \changes{v3.3}{2017/07/22}{Bug fix: Output the metadata language as
 %   correct \noexpand\acro{XML} even when \noexpand\pkgname{hyperref} is
 %   loaded with the \noexpand\optname{unicode} option}
+% \changes{v5.5}{2020/07/17}{List \protect\xmpterm{x-default} alternatives
+%   before language-specific alternatives, as dictated by the
+%   \protect\acro{XMP} specification~\protect\cite{Adobe2012:XMP}}
+% \changes{v5.5}{2020/07/21}{Rewrite the core part of this macro to
+%   divide it into four, cleanly defined cases}
 %    \begin{macrocode}
 \newcommand*{\hyxmp@rdf@dc}[3][\iffalse]{%
 %    \end{macrocode}
@@ -4930,27 +5251,90 @@ _______________________________________________________________^^J%
 ______<dc:#2>^^J%
 ________<rdf:Alt>^^J%
     }%
+%    \end{macrocode}
+% Record whether property~|#2| has definitions in multiple languages.
+%    \begin{macrocode}
+    \@if@def@and@nonempty{hyxmp@alt@#2}{%
+      \hyxmp@multi@langstrue
+    }{%
+      \hyxmp@multi@langsfalse
+    }%
+%    \end{macrocode}
+% There are now four cases to consider: the cross product of
+% \{\optname{pdfmetalang}~$=$ ``\xmpterm{x-default}'',
+% \optname{pdfmetalang}~$\neq$ ``\xmpterm{x-default}''\} and
+% \{\cs{XMPLangAlt} was specified, \cs{XMPLangAlt} was not specified\}.
+% We handle each of these in turn.
+%    \begin{macrocode}
     \ifx\@pdfmetalang\hyxmp@x@default
+      \ifhyxmp@multi@langs
+%    \end{macrocode}
+% \textbf{Case~1}: No \optname{pdfmetalang} but \cs{XMPLangAlt}.
+% We consider this an error because the \xmpterm{x-default} language will
+% not have a matching non-default language, in violation of the
+% \acro{XMP} specification's guidance~\cite[p.~23]{Adobe2012:XMP}:
+%
+% \begin{quote}
+%   \sffamily
+%
+%   An \textbf{xml:lang} value of ``x-default'' may be used to
+%   explicitly denote a default item.  If used, the ``x-default'' item
+%   shall be first in the array and its simple text value should be
+%   repeated in another item in which \textbf{xml:lang} specifies its
+%   actual language.  However, an ``x-default'' item may be the only
+%   item, in which case there is only a default value in no defined
+%   language.
+% \end{quote}
+%    \begin{macrocode}
+        \PackageError{hyperxmp}%
+          {\string\XMPLangAlt\space was used without specifying
+           pdfmetalang\MessageBreak
+           or pdflang}%
+          {Be sure to assign a language code to the pdfmetalang key and/or a
+           document\MessageBreak
+           language to the pdflang key (e.g., \string\hypersetup{pdfmetalang={en}}).}%
+      \else
+%    \end{macrocode}
+% \textbf{Case~2}: No \optname{pdfmetalang} and no \cs{XMPLangAlt}.
+% Here we specify only \xmpterm{x-default} as the language, as per the
+% guidance quoted above.
+%    \begin{macrocode}
+        \hyxmp@add@to@xml{%
+__________<rdf:li xml:lang="\hyxmp@x@default">\hyxmp@value</rdf:li>^^J%
+        }%
+      \fi
     \else
-      \hyxmp@xmlify{\@pdfmetalang}%
-      \hyxmp@add@to@xml{%
-__________<rdf:li xml:lang="\hyxmp@xmlified">\hyxmp@value</rdf:li>^^J%
-      }%
-    \fi
-    \hyxmp@add@to@xml{%
+      \ifhyxmp@multi@langs
+%    \end{macrocode}
+% \textbf{Case~3}: Both \optname{pdfmetalang} and \cs{XMPLangAlt}.  In
+% this case, we include an \xmpterm{x-default} followed by the
+% \optname{pdfmetalang} language, followed by all of the language
+% alternatives.
+%    \begin{macrocode}
+        \hyxmp@xmlify{\@pdfmetalang}%
+        \hyxmp@add@to@xml{%
 __________<rdf:li xml:lang="\hyxmp@x@default">\hyxmp@value</rdf:li>^^J%
-    }%
+__________<rdf:li xml:lang="\hyxmp@xmlified">\hyxmp@value</rdf:li>^^J%
+        }%
+        \def\do##1##2{
+          \hyxmp@xmlify{##2}%
+          \hyxmp@add@to@xml{%
+    __________<rdf:li xml:lang="##1">\hyxmp@xmlified</rdf:li>^^J%
+          }%
+        }%
+        \csname hyxmp@alt@#2\endcsname
+      \else
 %    \end{macrocode}
-% Include variants of the text expressed in other languages, as specified by
-% the author using |\XMPLangAlt| (Section~\ref{sec:lang-alt}).
+% \textbf{Case~4}: \optname{pdfmetalang} but no \cs{XMPLangAlt}.  To
+% reduce redundancy we omit the \xmpterm{x-default} and include the
+% single language in which the text appears.
 %    \begin{macrocode}
-    \def\do##1##2{
-      \hyxmp@xmlify{##2}%
-      \hyxmp@add@to@xml{%
-__________<rdf:li xml:lang="##1">\hyxmp@xmlified</rdf:li>^^J%
-      }%
-    }%
-    \csname hyxmp@alt@#2\endcsname
+        \hyxmp@xmlify{\@pdfmetalang}%
+        \hyxmp@add@to@xml{%
+__________<rdf:li xml:lang="\hyxmp@xmlified">\hyxmp@value</rdf:li>^^J%
+        }%
+      \fi
+    \fi
 %    \end{macrocode}
 % Complete this \acro{XMP} element.
 %    \begin{macrocode}
@@ -5118,9 +5502,14 @@ ______</dc:#2>^^J%
 %    \end{macrocode}
 % \end{macro}
 %
+% \end{schemadesc}
+%
+%
 % \subsubsection{The XMP Rights Management schema}
 % \label{sec:xmp-rights}
 %
+% \begin{schemadesc}[XMP Rights Management]{\protect\acro{XMP} Rights Management}
+%
 % \begin{macro}{\hyxmp@xmpRights@schema}
 % Add properties defined by the \acro{XMP} Rights Management schema to the
 % |\hyxmp@xml| macro.  Currently, these are only the
@@ -5169,10 +5558,14 @@ ______</dc:#2>^^J%
 % \end{macro}
 % \end{macro}
 %
+% \end{schemadesc}
+%
 %
 % \subsubsection{The XMP Media Management schema}
 % \label{sec:xmp-media}
 %
+% \begin{schemadesc}[XMP Media Management]{\protect\acro{XMP} Media Management}
+%
 % \begin{macro}{\hyxmp@mm@schema}
 % Add properties defined by the \acro{XMP} Media Management schema to
 % the |\hyxmp@xml| macro.  According to the \acro{XMP} specification,
@@ -5203,10 +5596,14 @@ ______</dc:#2>^^J%
 %    \end{macrocode}
 % \end{macro}
 %
+% \end{schemadesc}
+%
 %
 % \subsubsection{The XMP Basic schema}
 % \label{sec:xmp-basic}
 %
+% \begin{schemadesc}[XMP Basic]{\protect\acro{XMP} Basic}
+
 % \begin{macro}{\hyxmp@xmp@basic@schema}
 % Add properties defined by the \acro{XMP} Basic schema to the
 % |\hyxmp@xml| macro.  These include a bunch of dates (all set to the
@@ -5265,10 +5662,14 @@ ______</dc:#2>^^J%
 %    \end{macrocode}
 % \end{macro}
 %
+% \end{schemadesc}
+%
 %
 % \subsubsection{The Photoshop schema}
 % \label{sec:photoshop}
 %
+% \begin{schemadesc}{Photoshop}
+%
 % \begin{macro}{\hyxmp@photoshop@schema}
 % \changes{v2.0}{2012/08/26}{Simplified using
 %   \texttt{\string\string\string\hyxmp@add@simple}}
@@ -5287,10 +5688,16 @@ ______</dc:#2>^^J%
 % \end{macro}
 % \end{macro}
 %
+% \end{schemadesc}
+%
 %
 % \subsubsection{PDF/* Identification schemata}
 % \label{sec:pdfX-id}
 %
+% \begin{schemadesc}[PDF/A Identification]{\protect\acro{PDF/A} Identification}
+% \begin{schemadesc}[PDF/X Identification]{\protect\acro{PDF/X} Identification}
+% \begin{schemadesc}[PDF/UA Identification]{\protect\acro{PDF/UA} Identification}
+%
 % \begin{macro}{\hyxmp@pdfa@id@schema}
 % Add properties defined by the \acro{PDF/A} Identification
 % schema~\cite{PDFA2008:xmp-props} to the |\hyxmp@xml| macro.  These
@@ -5350,10 +5757,16 @@ ______</dc:#2>^^J%
 %    \end{macrocode}
 % \end{macro}
 %
+% \end{schemadesc}
+% \end{schemadesc}
+% \end{schemadesc}
+%
 %
 % \subsubsection{The IPTC Photo Metadata schema}
 % \label{sec:photo-meta}
 %
+% \begin{schemadesc}[IPTC Photo Metadata]{\protect\acro{IPTC} Photo Metadata}
+%
 % \begin{macro}{\xmplinesep}
 % Lines in multiline fields are separated by |\xmplinesep| in the
 % generated \acro{XML}.  This defaults to an \acro{LF} (|^^J|) character
@@ -5486,9 +5899,14 @@ ______</Iptc4xmpCore:CreatorContactInfo>^^J%
 % \end{macro}
 % \end{macro}
 %
+% \end{schemadesc}
+%
+%
 % \subsubsection{The PRISM Basic Metadata schema}
 % \label{sec:prism-meta}
 %
+% \begin{schemadesc}[PRISM Basic Metadata]{\protect\acro{PRISM} Basic Metadata}
+%
 % \begin{macro}{\hyxmp@prism@schema}
 % \changes{v4.0}{2019/03/10}{Added this macro}
 % Add properties defined by the \acro{PRISM} Basic Metadata
@@ -5517,6 +5935,110 @@ ______</Iptc4xmpCore:CreatorContactInfo>^^J%
 %    \end{macrocode}
 % \end{macro}
 %
+% \end{schemadesc}
+%
+%
+% \subsubsection{The Journal Article Versions (JAV) schema}
+% \label{sec:niso-jav-meta}
+%
+% \begin{schemadesc}{Journal Article Versions}
+%
+% \begin{macro}{\hyxmp@jav@schema}
+% \changes{v5.5}{2020/07/23}{Added this macro}
+% Add properties defined by the \acro{NISO}/\acro{ALPSP} Journal Article
+% Versions schema~\cite{NISO2008:jav}.
+%    \begin{macrocode}
+\newcommand*{\hyxmp@jav@schema}{%
+  \hyxmp@add@simple{jav:journal_article_version}{\@pdfpubstatus}%
+}
+%    \end{macrocode}
+% \end{macro}
+%
+% \end{schemadesc}
+%
+% \subsubsection{The XMP Paged-Text schema}
+% \label{sec:xmp-paged-text}
+%
+% \begin{schemadesc}[XMP Paged-Text]{\protect\acro{XMP} Paged-Text}
+%
+% \begin{macro}{\hyxmp@xmptpg@schema}
+% The \acro{XMP} Paged-Text schema~\cite{Adobe2012:XMP} includes
+% properties related to the construction of the \acro{PDF} file itself.
+% We acquire most of this information through \LuaTeX\ mechanisms and
+% therefore include much less information when run from other \TeX\ engines.
+% \changes{v5.5}{2020/07/25}{Added this macro}
+%    \begin{macrocode}
+\newcommand*{\hyxmp@xmptpg@schema}{%
+  \ifLuaTeX
+    \luadirect{write_xmp_font_list(\the\hyxmp@cct)}%
+  \fi
+  \hyxmp@add@simple{xmpTPg:NPages}{\@pdfnumpages}%
+}
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\hyxmp@cct}
+% We store the current category-code table to ensure that
+% |write_xmp_font_list|'s output uses our redefined category codes.
+%    \begin{macrocode}
+\ifLuaTeX
+  \newcatcodetable\hyxmp@cct
+  \savecatcodetable\hyxmp@cct
+\fi
+%    \end{macrocode}
+% \end{macro}
+%
+% Here we define a Lua\index{Lua} function, |write_xmp_font_list|, that
+% writes font information to the \acro{XMP} packet.
+%    \begin{macrocode}
+\ifLuaTeX
+  \begin{luacode*}
+function write_xmp_font_list (cct)
+    local function show_field(name, ...)
+    for i = 1, select("#", ...) do
+      local val = select(i, ...)
+      if val then
+        local xml = string.gsub(val, "&", "&amp;")
+        xml = string.gsub(xml, "<", "&lt;")
+        xml = string.gsub(xml, ">", "&gt;")
+        tex.print(cct, "____________<stFnt:" .. name .. ">" ..
+                  val .. "</stFnt:" .. name .. ">^^J%")
+        return
+      end
+    end
+  end
+  tex.print(cct, "\\hyxmp@add@to@xml{%")
+  tex.print(cct, "______<xmpTPg:Fonts>^^J%")
+  tex.print(cct, "________<rdf:Bag>^^J%")
+  for i, f in font.each() do
+    tex.print(cct, "__________<rdf:li rdf:parseType=\"Resource\">^^J%")
+    if f.filename then
+      local info = fontloader.info(f.filename)
+      show_field("fontFace", info.fullname)
+      show_field("fontFamily", info.familyname)
+      show_field("fontName", info.fontname)
+      show_field("versionString", info.version)
+      local baseName = string.gsub(f.filename, ".*[/\\](.*)", "%1")
+      show_field("fontFileName", baseName)
+    else
+      show_field("fontName", f.psname, f.fullname, f.name)
+    end
+    if f.format and f.format ~= "unknown" then
+      show_field("fontType", f.format)
+    end
+    tex.print(cct, "__________</rdf:li>^^J%")
+  end
+  tex.print(cct, "________</rdf:Bag>^^J%")
+  tex.print(cct, "______</xmpTPg:Fonts>^^J%")
+  tex.print(cct, "}")
+end
+  \end{luacode*}
+\fi
+%    \end{macrocode}
+%
+% \end{schemadesc}
+%
+%
 % \subsubsection{XMP extension schemata}
 % \label{sec:extension-schemata}
 %
@@ -5529,13 +6051,11 @@ ______</Iptc4xmpCore:CreatorContactInfo>^^J%
 % declare only those schemata we actually use.
 %
 % \begin{macro}{\hyxmp@check@iptc@data}
+% \begin{macro}{\hyxmp@iptc@data}
 % Define |\hyxmp@iptc@data| as the concatenation of all \acro{IPTC}
 % photo metadata supplied by the document.
 %    \begin{macrocode}
 \newcommand*{\hyxmp@check@iptc@data}{%
-%    \end{macrocode}
-% \begin{macro}{\hyxmp@iptc@data}
-%    \begin{macrocode}
   \edef\hyxmp@iptc@data{%
     \@pdfcontactaddress
     \@pdfcontactcity
@@ -5552,13 +6072,11 @@ ______</Iptc4xmpCore:CreatorContactInfo>^^J%
 % \end{macro}
 %
 % \begin{macro}{\hyxmp@check@prism@data}
+% \begin{macro}{\hyxmp@prism@data}
 % Define |\hyxmp@prism@data| as the concatenation of all \acro{PRISM}
 % metadata supplied by the document.
 %    \begin{macrocode}
 \newcommand*{\hyxmp@check@prism@data}{%
-%    \end{macrocode}
-% \begin{macro}{\hyxmp@prism@data}
-%    \begin{macrocode}
   \edef\hyxmp@prism@data{%
     \@pdfbookedition
     \@pdfbytes
@@ -5580,6 +6098,20 @@ ______</Iptc4xmpCore:CreatorContactInfo>^^J%
 % \end{macro}
 % \end{macro}
 %
+% \begin{macro}{\hyxmp@check@jav@data}
+% \begin{macro}{\hyxmp@jav@data}
+% Define |\hyxmp@jav@data| as the concatenation of all \acro{JAV}
+% metadata supplied by the document.
+%    \begin{macrocode}
+\newcommand*{\hyxmp@check@jav@data}{%
+  \edef\hyxmp@jav@data{%
+    \@pdfpubstatus
+  }%
+}
+%    \end{macrocode}
+% \end{macro}
+% \end{macro}
+%
 % \begin{macro}{\hyxmp@begin@extension@decls}
 % Begin a block of \acro{XML} tags that indicates we're declaring one or
 % more extension schemata.
@@ -5701,6 +6233,9 @@ ______________________</rdf:li>^^J%
 % \begin{macro}{\hyxmp@mm@extensions}
 % Declare the \acro{XMP} Media Management schema.
 % \changes{v4.0}{2019/03/15}{Added this macro}
+% \changes{v5.5}{2020/07/23}{Corrected the type of
+%   \protect\xmpprop{xmpMM:RenditionClass}.  Thanks to Thorsten Wi{\ss}mann
+%   for the bug report and patch}
 %    \begin{macrocode}
 \newcommand*{\hyxmp@mm@extensions}{%
   \hyxmp@begin@ext@decl
@@ -5722,6 +6257,7 @@ ______________________</rdf:li>^^J%
       {internal}%
       {Document version identifier}%
   \hyxmp@declare@property
+      [RenditionClass]%
       {RenditionClass}%
       {internal}%
       {The manner in which a document is rendered}%
@@ -5909,7 +6445,7 @@ __________</rdf:li>^^J%
   \hyxmp@begin@ext@decl
       {PRISM Basic Metadata}%
       {prism}%
-      {http://prismstandard.org/namespaces/basic/2.1/}%
+      {http://prismstandard.org/namespaces/basic/3.0/}%
   \hyxmp@declare@property
       {complianceProfile}%
       {internal}%
@@ -5978,6 +6514,29 @@ __________</rdf:li>^^J%
 %    \end{macrocode}
 % \end{macro}
 %
+% \begin{macro}{\hyxmp@jav@extensions}
+% \changes{v5.5}{2020/07/23}{Added this macro}
+% Because \acro{JAV} metadata are not recognized by the \acro{PDF/A}
+% standard, \acro{PDF/A} conversion would normally fail for documents
+% that utilize \acro{JAV} metadata.  Declaring the \acro{JAV} metadata
+% we support enables the document to be converted to \acro{PDF/A}
+% format.
+%    \begin{macrocode}
+\newcommand*{\hyxmp@jav@extensions}{%
+  \hyxmp@begin@ext@decl
+      {NISO/ALPSP Journal Article Versions}%
+      {jav}%
+      {http://www.niso.org/schemas/jav/1.0/}%
+  \hyxmp@declare@property
+      [Closed Choice of Text]%
+      {journal_article_version}%
+      {external}%
+      {Article status, one of "AO", "SMUR", "AM", "P", "VoR", "CVoR", or "EVoR"}%
+  \hyxmp@end@ext@decl
+}%
+%    \end{macrocode}
+% \end{macro}
+%
 % \begin{macro}{\hyxmp@declare@extensions}
 % Declare all \acro{XMP} extension schemata.  We'll always have at least
 % one, the \acro{XMP} Media Management extensions, because we
@@ -6034,6 +6593,13 @@ __________</rdf:li>^^J%
     \hyxmp@prism@extensions
   \fi
 %    \end{macrocode}
+% Conditionally declare \acro{JAV} metadata.
+%    \begin{macrocode}
+  \ifx\hyxmp@jav@data\@empty
+  \else
+    \hyxmp@jav@extensions
+  \fi
+%    \end{macrocode}
 %    \begin{macrocode}
   \hyxmp@end@extension@decls
 }
@@ -6098,7 +6664,10 @@ _____________________xmlns:pdfaid="http://www.aiim.org/pdfa/ns/id/"^^J%
 _____________________xmlns:pdfuaid="http://www.aiim.org/pdfua/ns/id/"^^J%
 _____________________xmlns:pdfx="http://ns.adobe.com/pdfx/1.3/"^^J%
 _____________________xmlns:pdfxid="http://www.npes.org/pdfx/ns/id/"^^J%
-_____________________xmlns:prism="http://prismstandard.org/namespaces/basic/2.1/"^^J%
+_____________________xmlns:prism="http://prismstandard.org/namespaces/basic/3.0/"^^J%
+_____________________xmlns:jav="http://www.niso.org/schemas/jav/1.0/"^^J%
+_____________________xmlns:xmpTPg="http://ns.adobe.com/xap/1.0/t/pg/"^^J%
+_____________________xmlns:stFnt="http://ns.adobe.com/xap/1.0/sType/Font\hyxmp@hash"^^J%
 _____________________xmlns:Iptc4xmpCore="http://iptc.org/std/Iptc4xmpCore/1.0/xmlns/"^^J%
 _____________________xmlns:pdfaExtension="http://www.aiim.org/pdfa/ns/extension/"^^J%
 _____________________xmlns:pdfaSchema="http://www.aiim.org/pdfa/ns/schema\hyxmp@hash"^^J%
@@ -6111,6 +6680,7 @@ _____________________xmlns:pdfaField="http://www.aiim.org/pdfa/ns/field\hyxmp@ha
 %    \begin{macrocode}
   \hyxmp@check@iptc@data
   \hyxmp@check@prism@data
+  \hyxmp@check@jav@data
   \hyxmp@declare@extensions
 %    \end{macrocode}
 % Insert all the metadata we know how to insert.
@@ -6126,6 +6696,8 @@ _____________________xmlns:pdfaField="http://www.aiim.org/pdfa/ns/field\hyxmp@ha
   \hyxmp@mm@schema
   \hyxmp@iptc@schema
   \hyxmp@prism@schema
+  \hyxmp@jav@schema
+  \hyxmp@xmptpg@schema
   \hyxmp@add@to@xml{%
 ____</rdf:Description>^^J%
 __</rdf:RDF>^^J%
@@ -6171,7 +6743,7 @@ __</rdf:RDF>^^J%
           \@ifundefined{pdfmark}{%
             \PackageWarningNoLine{hyperxmp}{%
               Unrecognized hyperref driver `\Hy@driver'.\MessageBreak
-              \jobname.tex's XMP metadata will *not* be\MessageBreak
+              \hyxmp@jobname.tex's XMP metadata will *not* be\MessageBreak
               embedded in the resulting file}%
           }{%
             \hyxmp@embed@packet@pdfmark
@@ -6402,6 +6974,15 @@ __</rdf:RDF>^^J%
 % \subsection{Final clean-up}
 % \label{sec:clean-up}
 %
+% As explained in Section~\ref{sec:initial-prep}, all invocations of
+% \cs{AtEndPreamble} have been stored in \cs{hyxmp@aep@toks} rather than
+% executed.  Now that \pkgname{hyperxmp} has been initialized
+% completely, it is finally safe to execute the accumulated
+% \cs{AtEndPreamble} stanzas.
+%    \begin{macrocode}
+\the\hyxmp@aep@toks
+%    \end{macrocode}
+%
 % Having saved the category code of
 % ``\,{\fontencoding{T1}\selectfont\textquotedbl}\,'' at the start of
 % the package code (Section~\ref{sec:initial-prep}), we now restore that
diff --git a/macros/latex/contrib/hyperxmp/hyperxmp.ins b/macros/latex/contrib/hyperxmp/hyperxmp.ins
index 7a81974604..81db9d155a 100644
--- a/macros/latex/contrib/hyperxmp/hyperxmp.ins
+++ b/macros/latex/contrib/hyperxmp/hyperxmp.ins
@@ -5,9 +5,9 @@
 %% the LaTeX Project Public License, either version 1.3c of this license
 %% or (at your option) any later version.  The latest version of this
 %% license is in:
-%% 
+%%
 %%    http://www.latex-project.org/lppl.txt
-%% 
+%%
 %% and version 1.3c or later is part of all distributions of LaTeX version
 %% 2008/05/04 or later.
 %%
diff --git a/macros/latex/contrib/hyperxmp/hyperxmp.pdf b/macros/latex/contrib/hyperxmp/hyperxmp.pdf
index 998059c14e..713d57a2b6 100644
--- a/macros/latex/contrib/hyperxmp/hyperxmp.pdf
+++ b/macros/latex/contrib/hyperxmp/hyperxmp.pdf
diff --git a/macros/latex/contrib/repltext/README b/macros/latex/contrib/repltext/README
index 54ba09bd33..3d5b0c1a76 100644
--- a/macros/latex/contrib/repltext/README
+++ b/macros/latex/contrib/repltext/README
@@ -25,7 +25,7 @@ the filename database, if necessary, using mktexlsr or a similar tool.
 Copyright and license
 =====================
 
-Copyright (C) 2014 by Scott Pakin <scott+repl@pakin.org>
+Copyright (C) 2014-2020 Scott Pakin <scott+repl@pakin.org>
 
 This file may be distributed and/or modified under the conditions of
 the LaTeX Project Public License, either version 1.3c of this license
diff --git a/macros/latex/contrib/repltext/repltext.dtx b/macros/latex/contrib/repltext/repltext.dtx
index 3cc1e9fcf9..9a116df516 100644
--- a/macros/latex/contrib/repltext/repltext.dtx
+++ b/macros/latex/contrib/repltext/repltext.dtx
@@ -1,7 +1,7 @@
 % \iffalse meta-comment
 %
-% Copyright (C) 2014 by Scott Pakin <scott+repl@pakin.org>
-% ---------------------------------------------------------
+% Copyright (C) 2014-2020 Scott Pakin <scott+repl@pakin.org>
+% ----------------------------------------------------------
 %
 % This file may be distributed and/or modified under the conditions of
 % the LaTeX Project Public License, either version 1.3c of this license
@@ -22,11 +22,12 @@
 %<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
 %<package>\ProvidesPackage{repltext}
 %<*package>
-    [2014/04/11 v1.0 PDF replacement text]
+    [2020/09/25 v1.1 PDF replacement text]
 %</package>
 %
 %<*driver>
 \documentclass{ltxdoc}
+\usepackage[T1]{fontenc}
 \usepackage{repltext}
 \usepackage{graphicx}
 \usepackage{color}
@@ -46,7 +47,7 @@
   pdfauthor={Scott Pakin},
   pdfsubject={LaTeX package for PDF replacement text},
   pdfkeywords={LaTeX, PDF, replacement text, ActualText, copy and paste},
-  pdfcopyright={Copyright (C) 2014, Scott Pakin},
+  pdfcopyright={Copyright (C) 2014-2020 Scott Pakin},
   pdflicenseurl={http://www.latex-project.org/lppl/},
   pdfcaptionwriter={Scott Pakin},
   pdfcontactemail={scott+repl@pakin.org},
@@ -60,13 +61,13 @@
 
 \begin{document}
   \DocInput{repltext.dtx}
-%  \PrintChanges
+  \PrintChanges
   \PrintIndex
 \end{document}
 %</driver>
 % \fi
 %
-% \CheckSum{38}
+% \CheckSum{59}
 %
 % \CharacterTable
 %  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -86,11 +87,12 @@
 %
 %
 % \changes{v1.0}{2014/04/11}{Initial version}
+% \changes{v1.1}{2020/09/25}{Support modern Lua\protect\LaTeX\ versions}
 %
 % \GetFileInfo{repltext.dtx}
 %
-% \DoNotIndex{\bgroup,\catcode,\egroup,\expandafter,\global,\let}
-% \DoNotIndex{\newcommand,\newenvironment,\the}
+% \DoNotIndex{\{,\},\bgroup,\catcode,\def,\egroup,\expandafter,\global,\let}
+% \DoNotIndex{\newcommand,\newenvironment,\protected,\providecommand,\the}
 %
 % ^^A  Define some logical styles.
 % \newcommand{\pkgname}[1]{^^A
@@ -322,13 +324,58 @@
 %
 % \section{Implementation}
 %
-% \pkgname{repltext} relies on the \cs{pdfliteral} and
-% \cs{pdfescapestring} primitives, which are defined only by
-% pdf\LaTeX\ and Lua\LaTeX\@.  We use the \pkgname{ifpdf} package to
-% test for one of those two \tex\ engines.
+% This section presents the documented source code for
+% \pkgname{repltext}.  Most users can ignore this section.
 %
+% \begin{macro}{\@ifdefined}
+% I find \cs{@ifdefined} a more natural construct than \cs{@ifundefined}.
 %    \begin{macrocode}
-\RequirePackage{ifpdf}
+\providecommand{\@ifdefined}[3]{\@ifundefined{#1}{#3}{#2}}
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\repl@literal}
+% \pkgname{repltext} needs a mechanism to insert literal PDF code.  This
+% varies by \TeX\ engine so we have to define \cs{repl@literal} on an
+% engine-by-engine basis.
+% \changes{v1.1}{2020/09/25}{Add this macro}
+%    \begin{macrocode}
+\@ifdefined{pdfliteral}{%
+%    \end{macrocode}
+% \latex[pdf]
+%    \begin{macrocode}
+  \let\repl@literal=\pdfliteral
+}{%
+  \@ifdefined{pdfextension}{%
+%    \end{macrocode}
+% \latex[Lua]
+%    \begin{macrocode}
+    \protected\def\repl@literal{\pdfextension literal}%
+  }{%
+%    \end{macrocode}
+% Other
+%    \begin{macrocode}
+    \PackageError{repltext}{Unrecognized TeX engine}{%
+      The repltext package currently works only with pdfLaTeX and\MessageBreak
+      LuaLaTeX.\space\space Please use of those engines to build your document.%
+    }%
+  }%
+}%
+%    \end{macrocode}
+% \end{macro}
+%
+% \pkgname{repltext} additionally needs a mechanism to escape
+% backslashes and parentheses in a string to make it usable as a PDF
+% string.  This is easy in pdf\LaTeX, which provides
+% \cs{pdfescapestring}.  Unfortunately, to my knowledge, no other
+% \TeX\ engine provides equivalent functionality.  Rather than write our
+% own function, we leverage \pkgname{hyperref}'s \cs{Hy@pstringdef},
+% which provides similar functionality.
+%    \begin{macrocode}
+\RequirePackage{etoolbox}
+\AtEndPreamble{%
+  \@ifpackageloaded{hyperref}{}{\RequirePackage{hyperref}}%
+}
 %    \end{macrocode}
 %
 % The \cs{repl@text@ii} macro invokes \cs{scalebox}, which is defined by
@@ -381,6 +428,7 @@
 % \end{macro}
 %
 % \begin{macro}{\repl@text@ii}
+% \begin{macro}{\repl@escaped}
 % \cs{repl@text@ii} is the macro that finally outputs something.  It
 % takes ordinary \LaTeX\ code as its argument and writes a PDF
 % marked-content sequence that uses an \pdfname{ActualText} entry to
@@ -389,8 +437,9 @@
 % second argument (\cs{repl@text@ii}'s |#1|~argument).
 %    \begin{macrocode}
 \newcommand{\repl@text@ii}[1]{%
-  \pdfliteral{
-    /Span << /ActualText (\pdfescapestring{\the\repl@text@toks}) >>
+  \Hy@pstringdef\repl@escaped{\the\repl@text@toks}%
+  \repl@literal{
+    /Span << /ActualText (\repl@escaped) >>
     BDC
   }%
   #1%
@@ -402,10 +451,11 @@
 % without being noticeable.
 %    \begin{macrocode}
   \scalebox{0.000001}{-}%
-  \pdfliteral{EMC}%
+  \repl@literal{EMC}%
 }
 %    \end{macrocode}
 % \end{macro}
+% \end{macro}
 %
 % \begin{macro}{\prevrepl}
 % For the author's convenience we define \cs{prevrepl} to refer to the
diff --git a/macros/latex/contrib/repltext/repltext.ins b/macros/latex/contrib/repltext/repltext.ins
index 1e637b10c4..b876b5535c 100644
--- a/macros/latex/contrib/repltext/repltext.ins
+++ b/macros/latex/contrib/repltext/repltext.ins
@@ -1,13 +1,13 @@
 %%
-%% Copyright (C) 2014 by Scott Pakin <scott+repl@pakin.org>
+%% Copyright (C) 2014-2020 by Scott Pakin <scott+repl@pakin.org>
 %%
 %% This file 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.  The latest version of this
 %% license is in:
-%% 
+%%
 %%    http://www.latex-project.org/lppl.txt
-%% 
+%%
 %% and version 1.3c or later is part of all distributions of LaTeX version
 %% 2006/05/20 or later.
 %%
@@ -19,7 +19,7 @@
 
 \preamble
 
-Copyright (C) 2014 by Scott Pakin <scott+repl@pakin.org>
+Copyright (C) 2014-2020 by Scott Pakin <scott+repl@pakin.org>
 
 This file may be distributed and/or modified under the conditions of
 the LaTeX Project Public License, either version 1.3c of this license
diff --git a/macros/latex/contrib/repltext/repltext.pdf b/macros/latex/contrib/repltext/repltext.pdf
index 42ed086531..b34575b92b 100644
--- a/macros/latex/contrib/repltext/repltext.pdf
+++ b/macros/latex/contrib/repltext/repltext.pdf
diff --git a/macros/latex/contrib/tcolorbox/CHANGES b/macros/latex/contrib/tcolorbox/CHANGES
index d48ba782dc..fd31f14db6 100644
--- a/macros/latex/contrib/tcolorbox/CHANGES
+++ b/macros/latex/contrib/tcolorbox/CHANGES
@@ -1,4 +1,4 @@
-%% The LaTeX package tcolorbox - version 4.32 (2020/09/17)
+%% The LaTeX package tcolorbox - version 4.40 (2020/09/25)
 %%
 %% -------------------------------------------------------------------------------------------
 %% Copyright (c) 2006-2020 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
@@ -1164,3 +1164,20 @@ version 4.32 (2020/09/17)
 - library 'xparse':
   * new options (#111): 'IfNoValueT', 'IfNoValueF', 'IfValueT', 'IfValueF',
       'IfBooleanT', 'IfBooleanF'
+
+version 4.40 (2020/09/25)
+- bug fix (#114): 'IfBooleanT', 'IfBooleanF'
+- bug fix (#117): 'widget' set 'toprule at break' and needed the breakable library
+- (bug) fix: style 'marker' set 'breakable' and needed the breakable library
+- (#113) 'capture=hbox' applies '\@parboxrestore' now to allow e.g. hbox style
+    listings inside indented environments like itemize
+- (#2) support 'hbox' for 'minted' listings
+- (#115) New default vertical space options
+        'before skip balanced', 'after skip balanced', 'beforeafter skip balanced'
+  NOTE: These options replace the current default options
+        'parskip', 'noparskip', 'autoparskip'
+  WARNING: Old documents may need adapted manual page breaks where used.
+           Otherwise: Use \tcbsetforeverylayer{autoparskip}
+           to restore the old behavior!
+- 'before skip' and 'before skip balanced' do not insert glue now, if
+  the tcolorbox is the first element in a minipage (or sourrounding tcolorbox)
diff --git a/macros/latex/contrib/tcolorbox/README b/macros/latex/contrib/tcolorbox/README
index f421faa8eb..67c4e5df05 100644
--- a/macros/latex/contrib/tcolorbox/README
+++ b/macros/latex/contrib/tcolorbox/README
@@ -1,4 +1,4 @@
-%% The LaTeX package tcolorbox - version 4.32 (2020/09/17)
+%% The LaTeX package tcolorbox - version 4.40 (2020/09/25)
 %%
 %% -------------------------------------------------------------------------------------------
 %% Copyright (c) 2006-2020 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
diff --git a/macros/latex/contrib/tcolorbox/tcbbreakable.code.tex b/macros/latex/contrib/tcolorbox/tcbbreakable.code.tex
index 2405db4b60..2779d615ef 100644
--- a/macros/latex/contrib/tcolorbox/tcbbreakable.code.tex
+++ b/macros/latex/contrib/tcolorbox/tcbbreakable.code.tex
@@ -1,4 +1,4 @@
-%% The LaTeX package tcolorbox - version 4.32 (2020/09/17)
+%% The LaTeX package tcolorbox - version 4.40 (2020/09/25)
 %% tcbbreakable.code.tex: Code for breakable colorboxes
 %%
 %% -------------------------------------------------------------------------------------------
@@ -17,7 +17,7 @@
 %%
 %% This work consists of all files listed in README
 %%
-\tcb@set@library@version{4.32}
+\tcb@set@library@version{4.40}
 
 \RequirePackage{pdfcol}
 \pdfcolInitStack{tcb@breakable}
@@ -274,14 +274,16 @@
       \tcb@multicolfalse%
     \fi}%
   \ifx\kvtcb@float\@empty\relax%
-    \iftcb@nobreak{%
+    \iftcb@nobreak
       \let\tcb@nobreak@warning\tcb@do@nobreak@warning%
       \iftcb@ignorenobreak%
         \kvtcb@beforebox%
       \else%
         \tcb@handle@nobreak%
       \fi%
-    }{\kvtcb@beforebox}%
+    \else%
+      \kvtcb@beforebox%
+    \fi%
     \def\kvtcb@beforebox{\parskip\z@\nointerlineskip\noindent}%
     \noindent% applies parskip
     \vskip\lineskip{\parskip\z@\par\vskip\z@}\bgroup\@nobreakfalse\addpenalty\z@\egroup% force update vertical list
diff --git a/macros/latex/contrib/tcolorbox/tcbdocumentation.code.tex b/macros/latex/contrib/tcolorbox/tcbdocumentation.code.tex
index 2c69a26a06..cdf255e7ab 100644
--- a/macros/latex/contrib/tcolorbox/tcbdocumentation.code.tex
+++ b/macros/latex/contrib/tcolorbox/tcbdocumentation.code.tex
@@ -1,4 +1,4 @@
-%% The LaTeX package tcolorbox - version 4.32 (2020/09/17)
+%% The LaTeX package tcolorbox - version 4.40 (2020/09/25)
 %% tcbdocumentation.code.tex: Code for LaTeX documentations
 %%
 %% -------------------------------------------------------------------------------------------
@@ -17,7 +17,7 @@
 %%
 %% This work consists of all files listed in README
 %%
-\tcb@set@library@version{4.32}
+\tcb@set@library@version{4.40}
 
 \tcbuselibrary{listings,skins,xparse,external,raster}
 
diff --git a/macros/latex/contrib/tcolorbox/tcbexternal.code.tex b/macros/latex/contrib/tcolorbox/tcbexternal.code.tex
index b4dd73e40c..0f6d235e21 100644
--- a/macros/latex/contrib/tcolorbox/tcbexternal.code.tex
+++ b/macros/latex/contrib/tcolorbox/tcbexternal.code.tex
@@ -1,4 +1,4 @@
-%% The LaTeX package tcolorbox - version 4.32 (2020/09/17)
+%% The LaTeX package tcolorbox - version 4.40 (2020/09/25)
 %% tcbexternal.code.tex: Code for externalization
 %%
 %% -------------------------------------------------------------------------------------------
@@ -17,7 +17,7 @@
 %%
 %% This work consists of all files listed in README
 %%
-\tcb@set@library@version{4.32}
+\tcb@set@library@version{4.40}
 
 \tcbuselibrary{pro@cessing}
 
diff --git a/macros/latex/contrib/tcolorbox/tcbfitting.code.tex b/macros/latex/contrib/tcolorbox/tcbfitting.code.tex
index 2240147a9e..2e88a1e015 100644
--- a/macros/latex/contrib/tcolorbox/tcbfitting.code.tex
+++ b/macros/latex/contrib/tcolorbox/tcbfitting.code.tex
@@ -1,4 +1,4 @@
-%% The LaTeX package tcolorbox - version 4.32 (2020/09/17)
+%% The LaTeX package tcolorbox - version 4.40 (2020/09/25)
 %% tcbfitting.code.tex: Code for fit boxes
 %%
 %% -------------------------------------------------------------------------------------------
@@ -18,7 +18,7 @@
 %% This work consists of all files listed in README
 %%
 %\makeatletter
-\tcb@set@library@version{4.32}
+\tcb@set@library@version{4.40}
 
 \newdimen\tcbfitdim
 \newdimen\tcb@lowerfitdim
diff --git a/macros/latex/contrib/tcolorbox/tcbhooks.code.tex b/macros/latex/contrib/tcolorbox/tcbhooks.code.tex
index 63f1cd944b..09f13ac059 100644
--- a/macros/latex/contrib/tcolorbox/tcbhooks.code.tex
+++ b/macros/latex/contrib/tcolorbox/tcbhooks.code.tex
@@ -1,4 +1,4 @@
-%% The LaTeX package tcolorbox - version 4.32 (2020/09/17)
+%% The LaTeX package tcolorbox - version 4.40 (2020/09/25)
 %% tcbhooks.code.tex: Code for adding hooks
 %%
 %% -------------------------------------------------------------------------------------------
@@ -18,7 +18,7 @@
 %% This work consists of all files listed in README
 %%
 %\makeatletter
-\tcb@set@library@version{4.32}
+\tcb@set@library@version{4.40}
 
 \tcbset{%
   before upper app/.code={\appto\kvtcb@before@upper{#1}},%
diff --git a/macros/latex/contrib/tcolorbox/tcblistings.code.tex b/macros/latex/contrib/tcolorbox/tcblistings.code.tex
index 8604e6896f..e51b1b775f 100644
--- a/macros/latex/contrib/tcolorbox/tcblistings.code.tex
+++ b/macros/latex/contrib/tcolorbox/tcblistings.code.tex
@@ -1,4 +1,4 @@
-%% The LaTeX package tcolorbox - version 4.32 (2020/09/17)
+%% The LaTeX package tcolorbox - version 4.40 (2020/09/25)
 %% tcblistings.code.tex: Code for colorboxes with listings
 %%
 %% -------------------------------------------------------------------------------------------
@@ -18,7 +18,7 @@
 %% This work consists of all files listed in README
 %%
 %\makeatletter
-\tcb@set@library@version{4.32}
+\tcb@set@library@version{4.40}
 
 \RequirePackage{listings}[2007/02/22]
 
diff --git a/macros/latex/contrib/tcolorbox/tcblistingscore.code.tex b/macros/latex/contrib/tcolorbox/tcblistingscore.code.tex
index c0460a3c1e..d18c86c141 100644
--- a/macros/latex/contrib/tcolorbox/tcblistingscore.code.tex
+++ b/macros/latex/contrib/tcolorbox/tcblistingscore.code.tex
@@ -1,4 +1,4 @@
-%% The LaTeX package tcolorbox - version 4.32 (2020/09/17)
+%% The LaTeX package tcolorbox - version 4.40 (2020/09/25)
 %% tcblistingscode.code.tex: Auxiliary code for colorboxes with listings
 %%
 %% -------------------------------------------------------------------------------------------
@@ -18,7 +18,7 @@
 %% This work consists of all files listed in README
 %%
 %\makeatletter
-\tcb@set@library@version{4.32}
+\tcb@set@library@version{4.40}
 
 \tcbuselibrary{pro@cessing}
 
diff --git a/macros/latex/contrib/tcolorbox/tcblistingsutf8.code.tex b/macros/latex/contrib/tcolorbox/tcblistingsutf8.code.tex
index 78eae82da9..47b54affba 100644
--- a/macros/latex/contrib/tcolorbox/tcblistingsutf8.code.tex
+++ b/macros/latex/contrib/tcolorbox/tcblistingsutf8.code.tex
@@ -1,4 +1,4 @@
-%% The LaTeX package tcolorbox - version 4.32 (2020/09/17)
+%% The LaTeX package tcolorbox - version 4.40 (2020/09/25)
 %% tcblistingsutf8.code.tex: Code for colorboxes with listings in UTF-8
 %%
 %% -------------------------------------------------------------------------------------------
@@ -17,7 +17,7 @@
 %%
 %% This work consists of all files listed in README
 %%
-\tcb@set@library@version{4.32}
+\tcb@set@library@version{4.40}
 
 \tcbuselibrary{listings}
 
diff --git a/macros/latex/contrib/tcolorbox/tcbmagazine.code.tex b/macros/latex/contrib/tcolorbox/tcbmagazine.code.tex
index 297ecf5cb0..3fdd32a04f 100644
--- a/macros/latex/contrib/tcolorbox/tcbmagazine.code.tex
+++ b/macros/latex/contrib/tcolorbox/tcbmagazine.code.tex
@@ -1,4 +1,4 @@
-%% The LaTeX package tcolorbox - version 4.32 (2020/09/17)
+%% The LaTeX package tcolorbox - version 4.40 (2020/09/25)
 %% tcbmagazine.code.tex: Code for box sets and magazine styles
 %%
 %% -------------------------------------------------------------------------------------------
@@ -17,7 +17,7 @@
 %%
 %% This work consists of all files listed in README
 %%
-\tcb@set@library@version{4.32}
+\tcb@set@library@version{4.40}
 
 \tcbuselibrary{breakable}
 
diff --git a/macros/latex/contrib/tcolorbox/tcbminted.code.tex b/macros/latex/contrib/tcolorbox/tcbminted.code.tex
index 30a01ea7ad..5d8558f825 100644
--- a/macros/latex/contrib/tcolorbox/tcbminted.code.tex
+++ b/macros/latex/contrib/tcolorbox/tcbminted.code.tex
@@ -1,4 +1,4 @@
-%% The LaTeX package tcolorbox - version 4.32 (2020/09/17)
+%% The LaTeX package tcolorbox - version 4.40 (2020/09/25)
 %% tcbminted.code.tex: Code for colorboxes with listings
 %%
 %% -------------------------------------------------------------------------------------------
@@ -18,10 +18,13 @@
 %% This work consists of all files listed in README
 %%
 %\makeatletter
-\tcb@set@library@version{4.32}
+\tcb@set@library@version{4.40}
 
 \RequirePackage{minted}[2011/09/17]
 
+% to be removed, if integrated into the minted package (#281)
+\minted@def@optcl{envname}{-P envname}{#1}
+
 \tcbuselibrary{listings@core}
 
 \def\tcb@minted@input@listing#1#2#3#4{%
@@ -32,7 +35,11 @@
     \edef\tcb@temp{\noexpand\usemintedstyle{\the\toks@}}%
     \tcb@temp%
   \fi%
-  \toks@=\expandafter{#1}%
+  \ifdefstring{\tcb@listing@capture}{hbox}{%
+    \toks@=\expandafter{#1,envname=BVerbatim}%
+  }{%
+    \toks@=\expandafter{#1}%
+  }%
   \edef\tcb@temp{\noexpand\inputminted[\the\toks@]}%
   \IfFileExists{\minted@outputdir#3}%
     {\tcb@temp{#2}{\minted@outputdir#3}}%
diff --git a/macros/latex/contrib/tcolorbox/tcbposter.code.tex b/macros/latex/contrib/tcolorbox/tcbposter.code.tex
index 64f96c0251..96e31805df 100644
--- a/macros/latex/contrib/tcolorbox/tcbposter.code.tex
+++ b/macros/latex/contrib/tcolorbox/tcbposter.code.tex
@@ -1,4 +1,4 @@
-%% The LaTeX package tcolorbox - version 4.32 (2020/09/17)
+%% The LaTeX package tcolorbox - version 4.40 (2020/09/25)
 %% tcbposter.code.tex: Code for posters
 %%
 %% -------------------------------------------------------------------------------------------
@@ -17,7 +17,7 @@
 %%
 %% This work consists of all files listed in README
 %%
-\tcb@set@library@version{4.32}
+\tcb@set@library@version{4.40}
 
 \tcbuselibrary{breakable,magazine,skins,fitting}
 
diff --git a/macros/latex/contrib/tcolorbox/tcbprocessing.code.tex b/macros/latex/contrib/tcolorbox/tcbprocessing.code.tex
index 88169a0b87..af49bd855c 100644
--- a/macros/latex/contrib/tcolorbox/tcbprocessing.code.tex
+++ b/macros/latex/contrib/tcolorbox/tcbprocessing.code.tex
@@ -1,4 +1,4 @@
-%% The LaTeX package tcolorbox - version 4.32 (2020/09/17)
+%% The LaTeX package tcolorbox - version 4.40 (2020/09/25)
 %% tcbprocessing.code.tex: Code for conditional processing
 %%
 %% -------------------------------------------------------------------------------------------
@@ -17,7 +17,7 @@
 %%
 %% This work consists of all files listed in README
 %%
-\tcb@set@library@version{4.32}
+\tcb@set@library@version{4.40}
 
 \RequirePackage{pdftexcmds}
 \RequirePackage{shellesc}
diff --git a/macros/latex/contrib/tcolorbox/tcbraster.code.tex b/macros/latex/contrib/tcolorbox/tcbraster.code.tex
index e6abad21ec..8b1d3a36db 100644
--- a/macros/latex/contrib/tcolorbox/tcbraster.code.tex
+++ b/macros/latex/contrib/tcolorbox/tcbraster.code.tex
@@ -1,4 +1,4 @@
-%% The LaTeX package tcolorbox - version 4.32 (2020/09/17)
+%% The LaTeX package tcolorbox - version 4.40 (2020/09/25)
 %% tcbskinsjigsaw.code.tex: Code for colorboxes with different skins
 %%
 %% -------------------------------------------------------------------------------------------
@@ -17,7 +17,7 @@
 %%
 %% This work consists of all files listed in README
 %%
-\tcb@set@library@version{4.32}
+\tcb@set@library@version{4.40}
 
 \newcounter{tcbrastercolumn}
 \newcounter{tcbrasterrow}
diff --git a/macros/latex/contrib/tcolorbox/tcbskins.code.tex b/macros/latex/contrib/tcolorbox/tcbskins.code.tex
index 28cadb737a..7deee187e9 100644
--- a/macros/latex/contrib/tcolorbox/tcbskins.code.tex
+++ b/macros/latex/contrib/tcolorbox/tcbskins.code.tex
@@ -1,4 +1,4 @@
-%% The LaTeX package tcolorbox - version 4.32 (2020/09/17)
+%% The LaTeX package tcolorbox - version 4.40 (2020/09/25)
 %% tcbskins.code.tex: Code for colorboxes with different skins
 %%
 %% -------------------------------------------------------------------------------------------
@@ -17,7 +17,7 @@
 %%
 %% This work consists of all files listed in README
 %%
-\tcb@set@library@version{4.32}
+\tcb@set@library@version{4.40}
 
 \RequirePackage{tikz}[2010/10/13]
 
@@ -771,7 +771,7 @@
   segmentation code={\tcb@drawspec@widgetsegment},%
   skin first=widgetfirst,skin middle=widgetmiddle,skin last=widgetlast}
 
-\tcbset{widget/.style={skin=widget,arc=0.5mm,fonttitle=\bfseries,titlerule=0mm,toprule at break=0mm}}
+\tcbset{widget/.style={skin=widget,arc=0.5mm,fonttitle=\bfseries,titlerule=0mm}}
 
 \tcb@new@skin{widgetfirst}{base@first,%
   frame engine=pathfirst,interior titled engine=pathfirst,interior engine=pathfirst,segmentation engine=empty,title engine=empty,%
@@ -1336,7 +1336,7 @@
 
 \tcbset{marker/.style={%
   skin=enhancedmiddle jigsaw,
-  breakable,parbox=false,
+  parbox=false,
   boxrule=0mm,leftrule=5mm,rightrule=5mm,boxsep=0mm,
   left=3mm,right=3mm,top=1mm,bottom=1mm,
   toptitle=1mm,bottomtitle=1mm,fonttitle=\bfseries,
diff --git a/macros/latex/contrib/tcolorbox/tcbskinsjigsaw.code.tex b/macros/latex/contrib/tcolorbox/tcbskinsjigsaw.code.tex
index b608e7c157..40e3b7dff8 100644
--- a/macros/latex/contrib/tcolorbox/tcbskinsjigsaw.code.tex
+++ b/macros/latex/contrib/tcolorbox/tcbskinsjigsaw.code.tex
@@ -1,4 +1,4 @@
-%% The LaTeX package tcolorbox - version 4.32 (2020/09/17)
+%% The LaTeX package tcolorbox - version 4.40 (2020/09/25)
 %% tcbskinsjigsaw.code.tex: Code for colorboxes with different skins
 %%
 %% -------------------------------------------------------------------------------------------
@@ -17,7 +17,7 @@
 %%
 %% This work consists of all files listed in README
 %%
-\tcb@set@library@version{4.32}
+\tcb@set@library@version{4.40}
 
 \tcbuselibrary{skins}
 
diff --git a/macros/latex/contrib/tcolorbox/tcbtheorems.code.tex b/macros/latex/contrib/tcolorbox/tcbtheorems.code.tex
index 2ee69469f3..d86cf5aa7a 100644
--- a/macros/latex/contrib/tcolorbox/tcbtheorems.code.tex
+++ b/macros/latex/contrib/tcolorbox/tcbtheorems.code.tex
@@ -1,4 +1,4 @@
-%% The LaTeX package tcolorbox - version 4.32 (2020/09/17)
+%% The LaTeX package tcolorbox - version 4.40 (2020/09/25)
 %% tcbtheorems.code.tex: Code for theorems in colorboxes
 %%
 %% -------------------------------------------------------------------------------------------
@@ -18,7 +18,7 @@
 %% This work consists of all files listed in README
 %%
 %\makeatletter
-\tcb@set@library@version{4.32}
+\tcb@set@library@version{4.40}
 
 \RequirePackage{amsmath}
 
diff --git a/macros/latex/contrib/tcolorbox/tcbvignette.code.tex b/macros/latex/contrib/tcolorbox/tcbvignette.code.tex
index 71f6f5c32e..e7fdadcdf2 100644
--- a/macros/latex/contrib/tcolorbox/tcbvignette.code.tex
+++ b/macros/latex/contrib/tcolorbox/tcbvignette.code.tex
@@ -1,4 +1,4 @@
-%% The LaTeX package tcolorbox - version 4.32 (2020/09/17)
+%% The LaTeX package tcolorbox - version 4.40 (2020/09/25)
 %% tcbvignette.code.tex: Code for ornamental frames
 %%
 %% -------------------------------------------------------------------------------------------
@@ -17,7 +17,7 @@
 %%
 %% This work consists of all files listed in README
 %%
-\tcb@set@library@version{4.32}
+\tcb@set@library@version{4.40}
 
 \tcbuselibrary{skins}
 
diff --git a/macros/latex/contrib/tcolorbox/tcbxparse.code.tex b/macros/latex/contrib/tcolorbox/tcbxparse.code.tex
index 7eaea506ee..ec86d3fab4 100644
--- a/macros/latex/contrib/tcolorbox/tcbxparse.code.tex
+++ b/macros/latex/contrib/tcolorbox/tcbxparse.code.tex
@@ -1,4 +1,4 @@
-%% The LaTeX package tcolorbox - version 4.32 (2020/09/17)
+%% The LaTeX package tcolorbox - version 4.40 (2020/09/25)
 %% tcbxparse.code.tex: Code for xparse features
 %%
 %% -------------------------------------------------------------------------------------------
@@ -18,7 +18,7 @@
 %% This work consists of all files listed in README
 %%
 %\makeatletter
-\tcb@set@library@version{4.32}
+\tcb@set@library@version{4.40}
 
 \RequirePackage{xparse}[2013/12/31]
 
@@ -30,8 +30,8 @@
   IfValueT/.code n args={2}{\IfValueT{#1}{\pgfkeysalso{#2}}},
   IfValueF/.code n args={2}{\IfValueF{#1}{\pgfkeysalso{#2}}},
   IfBooleanTF/.code n args={3}{\IfBooleanTF{#1}{\pgfkeysalso{#2}}{\pgfkeysalso{#3}}},
-  IfBooleanT/.code n args={3}{\IfBooleanT{#1}{\pgfkeysalso{#2}}},
-  IfBooleanF/.code n args={3}{\IfBooleanF{#1}{\pgfkeysalso{#2}}},
+  IfBooleanT/.code n args={2}{\IfBooleanT{#1}{\pgfkeysalso{#2}}},
+  IfBooleanF/.code n args={2}{\IfBooleanF{#1}{\pgfkeysalso{#2}}},
   verbatim/.style={fontupper=\ttfamily,nobeforeafter,tcbox raise base,top=0pt,bottom=0pt,left=1mm,right=1mm,boxrule=0.3mm}
 }
 
diff --git a/macros/latex/contrib/tcolorbox/tcolorbox-example-poster.pdf b/macros/latex/contrib/tcolorbox/tcolorbox-example-poster.pdf
index 2f8c59debe..6cdb9974d8 100644
--- a/macros/latex/contrib/tcolorbox/tcolorbox-example-poster.pdf
+++ b/macros/latex/contrib/tcolorbox/tcolorbox-example-poster.pdf
diff --git a/macros/latex/contrib/tcolorbox/tcolorbox-example-poster.tex b/macros/latex/contrib/tcolorbox/tcolorbox-example-poster.tex
index 74eb419478..9db17546ef 100644
--- a/macros/latex/contrib/tcolorbox/tcolorbox-example-poster.tex
+++ b/macros/latex/contrib/tcolorbox/tcolorbox-example-poster.tex
@@ -1,4 +1,4 @@
-%% The LaTeX package tcolorbox - version 4.32 (2020/09/17)
+%% The LaTeX package tcolorbox - version 4.40 (2020/09/25)
 %% tcolorbox-example-poster.tex: a poster example for tcolorbox
 %%
 %% -------------------------------------------------------------------------------------------
diff --git a/macros/latex/contrib/tcolorbox/tcolorbox-example.pdf b/macros/latex/contrib/tcolorbox/tcolorbox-example.pdf
index b623da1676..c5eb25044c 100644
--- a/macros/latex/contrib/tcolorbox/tcolorbox-example.pdf
+++ b/macros/latex/contrib/tcolorbox/tcolorbox-example.pdf
diff --git a/macros/latex/contrib/tcolorbox/tcolorbox-example.tex b/macros/latex/contrib/tcolorbox/tcolorbox-example.tex
index 3a62669872..8a119c7448 100644
--- a/macros/latex/contrib/tcolorbox/tcolorbox-example.tex
+++ b/macros/latex/contrib/tcolorbox/tcolorbox-example.tex
@@ -1,4 +1,4 @@
-%% The LaTeX package tcolorbox - version 4.32 (2020/09/17)
+%% The LaTeX package tcolorbox - version 4.40 (2020/09/25)
 %% tcolorbox-example.tex: an example for tcolorbox
 %%
 %% -------------------------------------------------------------------------------------------
diff --git a/macros/latex/contrib/tcolorbox/tcolorbox-tutorial-poster.pdf b/macros/latex/contrib/tcolorbox/tcolorbox-tutorial-poster.pdf
index 837d8ba475..6cec00a3af 100644
--- a/macros/latex/contrib/tcolorbox/tcolorbox-tutorial-poster.pdf
+++ b/macros/latex/contrib/tcolorbox/tcolorbox-tutorial-poster.pdf
diff --git a/macros/latex/contrib/tcolorbox/tcolorbox-tutorial-poster.tex b/macros/latex/contrib/tcolorbox/tcolorbox-tutorial-poster.tex
index a84d704590..ab9b50b369 100644
--- a/macros/latex/contrib/tcolorbox/tcolorbox-tutorial-poster.tex
+++ b/macros/latex/contrib/tcolorbox/tcolorbox-tutorial-poster.tex
@@ -1,5 +1,5 @@
 % \LaTeX-Main\
-%% The LaTeX package tcolorbox - version 4.32 (2020/09/17)
+%% The LaTeX package tcolorbox - version 4.40 (2020/09/25)
 %% tcolorbox-tutorial-poster.tex: a tutorial for poster creation with tcolorbox
 %%
 %% -------------------------------------------------------------------------------------------
diff --git a/macros/latex/contrib/tcolorbox/tcolorbox.doc.breakable.tex b/macros/latex/contrib/tcolorbox/tcolorbox.doc.breakable.tex
index c714bfd445..b8d678d8d2 100644
--- a/macros/latex/contrib/tcolorbox/tcolorbox.doc.breakable.tex
+++ b/macros/latex/contrib/tcolorbox/tcolorbox.doc.breakable.tex
@@ -128,7 +128,7 @@ parameters. The differences are:
   \refKey{/tcb/before} and \refKey{/tcb/after} settings, especially, if there
   is an automatic page break before the box.
 \item\tcbdocmarginnote{\tcbdocnew{2016-05-25}}
-  Lua\TeX\ version 0.95 changes the behaviour of the basic |\vsplit| (a bug?!)
+  Lua\TeX\ version 0.95 changes the behavior of the basic |\vsplit| (a bug?!)
   resulting in badly broken boxes. Thanks to Jeremy Engel,
   the \mylib{breakable} library contains a patch for this which
   also loads the the |ifluatex| package.
diff --git a/macros/latex/contrib/tcolorbox/tcolorbox.doc.coreoptions.tex b/macros/latex/contrib/tcolorbox/tcolorbox.doc.coreoptions.tex
index ba853c46e3..d885f48279 100644
--- a/macros/latex/contrib/tcolorbox/tcolorbox.doc.coreoptions.tex
+++ b/macros/latex/contrib/tcolorbox/tcolorbox.doc.coreoptions.tex
@@ -240,8 +240,6 @@ and an optional \emph{lower part}. These parts are separated by
 This is a \textbf{tcolorbox} (but invisible).
 \end{tcolorbox}
 
-\bigskip
-
 \begin{tcolorbox}[upperbox=invisible,colback=white]
 This is a \textbf{tcolorbox} (but invisible).
 \tcblower
@@ -426,6 +424,8 @@ Now, the saved part is used:
 \end{tcolorbox}
 \end{exdispExample}
 
+\enlargethispage*{1cm}
+
 The |savedelimiter| is used implicitely with \refCom{newtcolorbox} which
 allows a more convenient usage:
 \begin{exdispExample}{savedelimiter2}
@@ -2805,52 +2805,34 @@ are drawn by the codes given with
 \subsection{Embedding into the Surroundings}\label{subsec:surroundings}
 Typically, but not necessarily, a |tcolorbox| is put inside a separate paragraph
 and has some vertical space before and after it.
-This behavior is controlled by the keys |before| and |after|.
+This behavior is controlled by the keys \refKey{/tcb/before} and \refKey{/tcb/after}.
+
+\begin{marker}
+Before version 4.40, the default setting for \refKey{/tcb/before}
+and \refKey{/tcb/after} was given by \refKey{/tcb/autoparskip}.
+Starting with version 4.40, the default setting is given by
+\refKey{/tcb/before skip balanced} and \refKey{/tcb/after skip balanced}.\par
+Note that old documents may need adaptions of page breaks.\par
+Alternatively, the old default setting can be restored by using
+\begin{dispListing}
+\tcbsetforeverylayer{autoparskip}
+\end{dispListing}
+inside the document preamble.
+\end{marker}
 
-\begin{docTcbKey}{before}{=\meta{code}}{no default, initially see \refKey{/tcb/autoparskip}}
+
+\begin{docTcbKey}{before}{=\meta{code}}{no default, initially see \refKey{/tcb/before skip balanced}}
   Sets the \meta{code} which is executed before the colored box.
   It is not used for floating boxes.
   Also, it is not used, if the box follows a heading immediately
   and \refKey{/tcb/ignore nobreak} is set to \docValue{false}.
 \end{docTcbKey}
 
-\begin{docTcbKey}{after}{=\meta{code}}{no default, initially see \refKey{/tcb/autoparskip}}
+\begin{docTcbKey}{after}{=\meta{code}}{no default, initially see \refKey{/tcb/after skip balanced}}
   Sets the \meta{code} which is executed after the colored box.
   It is not used for floating boxes.
 \end{docTcbKey}
 
-\begin{docTcbKey}[][doc updated=2017-02-01]{parskip}{}{style, no value}
-  Sets the keys |before| and |after| to values which are
-  recommended, if the package |parskip| \emph{is} used and there is no better
-  idea for |before| and |after|. This is similar to:
-\begin{dispListing}
-\tcbset{parskip/.style={before={\par\pagebreak[0]\parindent=0pt},
-                        after={\par}}}
-\end{dispListing}
-\end{docTcbKey}
-
-\begin{docTcbKey}[][doc updated=2017-02-01]{noparskip}{}{style, no value}
-  Sets the keys |before| and |after| to values which are
-  recommended, if the package |parskip| is \emph{not} used and there is no better
-  idea for |before| and |after|. This is similar to:
-\begin{dispListing}
-\tcbset{noparskip/.style={before={\par\pagebreak[0]\smallskip\parindent=0pt},
-                          after={\par\smallskip}}}
-\end{dispListing}
-\end{docTcbKey}
-
-\begin{docTcbKey}{autoparskip}{}{style, no value, initially set}
-  Tries to detect the usage of the package |parskip| and sets
-  the keys |before| and |after| accordingly. Actually, the following is done:
-  \begin{itemize}
-  \item If the length of |\parskip| is greater than |0pt| at the beginning of the document,
-    \refKey{/tcb/parskip} is executed. Here, the usage of package |parskip| is \emph{assumed}.
-  \item Otherwise, if the length of |\parskip| is not greater than |0pt| at the beginning of the document,
-    \refKey{/tcb/noparskip} is executed. Here, the absence of package |parskip| is \emph{assumed}.
-  \end{itemize}
-  |autoparskip| is the default for the package |tcolorbox|, if |before| or |after|
-  are not changed otherwise.
-\end{docTcbKey}
 
 \begin{docTcbKey}{nobeforeafter}{}{style, no value}
   Abbreviation for clearing the keys |before| and |after|. The colored box
@@ -2865,7 +2847,6 @@ This behavior is controlled by the keys |before| and |after|.
 \end{exdispExample}
 \end{docTcbKey}
 
-\enlargethispage*{1cm}
 \begin{docTcbKey}{force nobeforeafter}{}{style, no value}
   Forces the setting of \refKey{/tcb/nobeforeafter} even if
   \refKey{/tcb/before} and \refKey{/tcb/after} are set to other values
@@ -2876,78 +2857,80 @@ This behavior is controlled by the keys |before| and |after|.
 
 \clearpage
 
-\begin{docTcbKey}{baseline}{=\meta{length}}{no default, initially |0pt|}
-  Used to set the |\pgfsetbaseline| value of the resulting |tcolorbox|.
-\begin{exdispExample}{baseline}
-\tcbset{colframe=red!50!white,width=4cm,nobeforeafter}
-Some text\dotfill
-\begin{tcolorbox}[baseline=3mm]
-One line.
-\end{tcolorbox}
-\begin{tcolorbox}[baseline=3mm]
-First line.\\Second line.
+\begin{docTcbKey}[][doc new={2020-09-25}]{before skip balanced}{=\meta{glue}}{no default, initially |0.5\textbackslash baselineskip plus 2pt|}
+  Inserts some vertical space before the colored box. This style sets \refKey{/tcb/before}.\par
+  If the depth of the
+  preceeding \TeX\ box is between |0pt| and |0.3\baselineskip|,
+  the distance between the \emph{baseline} of the preceeding \TeX\ box and the tcolorbox
+  ist set to \meta{glue}$+$|0.3\baselineskip|.\par
+  If the depth is larger, the distance of the preceeding \TeX\ box and the tcolorbox
+  ist set to \meta{glue}.\par
+  Alternatively, see \refKey{/tcb/before skip} which ignores the \emph{baseline}.
+
+\begin{exdispExample*}{before_skip_balanced}{sbs,lefthand ratio=0.6}
+Some text.
+\begin{tcolorbox}[before skip balanced=1cm,
+    colframe=red!50!white]
+  This is a \textbf{tcolorbox}.
 \end{tcolorbox}
-\end{exdispExample}
+\end{exdispExample*}
 \end{docTcbKey}
 
+\begin{docTcbKey}[][doc new={2020-09-25}]{after skip balanced}{=\meta{glue}}{no default, initially |0.5\textbackslash baselineskip plus 2pt|}
+  Inserts some vertical space of the given \meta{glue} after the colored box.
+  This style sets \refKey{/tcb/after}.
+  Additionally, |\prevdepth| is set to |0.3\baselineskip|. The following
+  \TeX\ box may enlarge the space by further glue to adjust its \emph{baseline}.
+  Alternatively, see \refKey{/tcb/after skip} which ignores the \emph{baseline}.
 
-\begin{docTcbKey}[][doc new=2014-10-10]{box align}{=\meta{alignment}}{style, no default, initially |bottom|}
-  Used to set the \refKey{/tcb/baseline} value of the resulting |tcolorbox|.
-  Feasible values for \meta{alignment} are:
-  \begin{itemize}
-  \item\docValue{bottom}: alignment with the box bottom,
-  \item\docValue{top}: alignment with the box top,
-  \item\docValue{center}: alignment with the box center,
-  \item\docValue{base}: alignment with the box content base. This option
-    is not applicable for a \refEnv{tcolorbox} but for a \refCom{tcbox} only.
-    It is an alias for \refKey{/tcb/tcbox raise base}.
-  \end{itemize}
-
-\begin{exdispExample}{box_align_1}
-\tcbset{colframe=red!50!white,width=4cm,nobeforeafter}
-Some text\dotfill
-\begin{tcolorbox}[box align=bottom]
-One line.
-\end{tcolorbox}
-\begin{tcolorbox}[box align=bottom]
-First line.\\Second line.
-\end{tcolorbox}
-\end{exdispExample}
-
-\begin{exdispExample}{box_align_2}
-\tcbset{colframe=red!50!white,width=4cm,nobeforeafter}
-Some text\dotfill
-\begin{tcolorbox}[box align=top]
-One line.
-\end{tcolorbox}
-\begin{tcolorbox}[box align=top]
-First line.\\Second line.
+\begin{exdispExample*}{after_skip_balanced}{sbs,lefthand ratio=0.6}
+\begin{tcolorbox}[after skip balanced=1cm,
+    colframe=red!50!white]
+  This is a \textbf{tcolorbox}.
 \end{tcolorbox}
-\end{exdispExample}
+Some text.
+\end{exdispExample*}
+\end{docTcbKey}
 
-\begin{exdispExample}{box_align_3}
-\tcbset{colframe=red!50!white,width=4cm,nobeforeafter}
-Some text\dotfill
-\begin{tcolorbox}[box align=center]
-One line.
-\end{tcolorbox}
-\begin{tcolorbox}[box align=center]
-First line.\\Second line.
-\end{tcolorbox}
-\end{exdispExample}
 
-\begin{exdispExample}{box_align_4}
-\tcbset{colframe=red!50!white,nobeforeafter}
-Some text\dotfill
-\tcbox[nobeforeafter,box align=base]{One line}
-\tcbox[nobeforeafter,box align=base,size=fbox]{Another line}
-\end{exdispExample}
+\begin{docTcbKey}[][doc new={2020-09-25}]{beforeafter skip balanced}{=\meta{glue}}{no default, initially |0.5\textbackslash baselineskip plus 2pt|}
+  Inserts some vertical space of the given \meta{glue} before \emph{and} after the colored box.
+  This style sets \refKey{/tcb/before skip balanced} and \refKey{/tcb/after skip balanced}.
+\begin{exdispExample*}{beforeafter_skip_balanced}{sbs,lefthand ratio=0.6}
+\newtcolorbox{doubleline}[1][]{
+  beforeafter skip balanced=0pt,
+  height=1.8\baselineskip,
+  enlarge top by=.1\baselineskip,
+  enlarge bottom by=.1\baselineskip,
+  colframe=blue!20,colback=blue!5,
+  size=small,valign upper=center,#1 }
+
+\noindent\begin{tikzpicture}
+\path[use as bounding box] (0,0)
+  rectangle (0.1,0.1);
+\foreach \y in {0,1,...,9}  {
+  \draw[very thin,red]
+    (-0.2,-\y*\baselineskip) --
+    (\linewidth+0.2cm,-\y*\baselineskip); }
+\end{tikzpicture}
+line 1\par
+\begin{doubleline}  Abc  \end{doubleline}
+\begin{doubleline}  Def  \end{doubleline}
+line 2g\par
+\begin{doubleline}  Ghi  \end{doubleline}
+line 3\par
+line 4 g
+\end{exdispExample*}
 \end{docTcbKey}
 
 
-\begin{docTcbKey}[][doc new and updated={2014-10-10}{2015-03-16}]{before skip}{=\meta{glue}}{style, no default}
+\clearpage
+
+\begin{docTcbKey}[][doc new and updated={2020-09-25}{2015-03-16}]{before skip}{=\meta{glue}}{style, no default}
   Inserts some vertical space of the given \meta{glue} before the colored box.
   This style sets \refKey{/tcb/before}.
+  In contrast to \refKey{/tcb/before skip balanced}, this \meta{glue} is
+  relative to the lower edge of the preceeding box and not to the baseline.
 \begin{exdispExample*}{before_skip}{sbs,lefthand ratio=0.6}
 Some text.
 \begin{tcolorbox}[before skip=1cm,
@@ -2957,9 +2940,11 @@ Some text.
 \end{exdispExample*}
 \end{docTcbKey}
 
-\begin{docTcbKey}[][doc new and updated={2014-10-10}{2017-02-01}]{after skip}{=\meta{glue}}{style, no default}
+\begin{docTcbKey}[][doc new and updated={2020-09-25}{2017-02-01}]{after skip}{=\meta{glue}}{style, no default}
   Inserts some vertical space of the given \meta{glue} after the colored box.
   This style sets \refKey{/tcb/after}.
+  In contrast to \refKey{/tcb/after skip balanced}, this \meta{glue} is
+  relative to the upper edge of the following box and not to the baseline.
 \begin{exdispExample*}{after_skip}{sbs,lefthand ratio=0.6}
 \begin{tcolorbox}[after skip=1cm,
     colframe=red!50!white]
@@ -2971,19 +2956,23 @@ Some text.
 
 \begin{docTcbKey}[][doc new=2014-10-10]{beforeafter skip}{=\meta{glue}}{style, no default}
   Inserts some vertical space of the given \meta{glue} before \emph{and} after the colored box.
-  This style sets \refKey{/tcb/before} and \refKey{/tcb/after}.
+  This style sets \refKey{/tcb/before skip} and \refKey{/tcb/after skip}.
 \begin{exdispExample*}{beforeafter_skip}{sbs,lefthand ratio=0.6}
 \tcbset{beforeafter skip=0pt,
   colframe=red!50!white}
+
+text before
 \begin{tcolorbox}
   This is a \textbf{tcolorbox}.
 \end{tcolorbox}
 \begin{tcolorbox}
   Second box.
 \end{tcolorbox}
+text after
 \end{exdispExample*}
 \end{docTcbKey}
 
+
 \clearpage
 
 \begin{docTcbKey}[][doc new=2014-11-07]{left skip}{=\meta{length}}{style, no default, initially |0mm|}
@@ -3028,6 +3017,122 @@ Some text.
 \end{docTcbKey}
 
 
+\clearpage
+
+\begin{docTcbKey}[][doc updated=2017-02-01]{parskip}{}{style, no value}
+  This options is considered to be superseded by
+  \refKey{/tcb/before skip balanced} and \refKey{/tcb/after skip balanced}
+  (see note on page~\pageref{subsec:surroundings}).\par
+  Sets the keys |before| and |after| to values which are
+  recommended, if the package |parskip| \emph{is} used and there is no better
+  idea for |before| and |after|. This is similar to:
+\begin{dispListing}
+\tcbset{parskip/.style={before={\par\pagebreak[0]\parindent=0pt},
+                        after={\par}}}
+\end{dispListing}
+\end{docTcbKey}
+
+\begin{docTcbKey}[][doc updated=2017-02-01]{noparskip}{}{style, no value}
+  This options is considered to be superseded by
+  \refKey{/tcb/before skip balanced} and \refKey{/tcb/after skip balanced}
+  (see note on page~\pageref{subsec:surroundings}).\par
+  Sets the keys |before| and |after| to values which are
+  recommended, if the package |parskip| is \emph{not} used and there is no better
+  idea for |before| and |after|. This is similar to:
+\begin{dispListing}
+\tcbset{noparskip/.style={before={\par\pagebreak[0]\smallskip\parindent=0pt},
+                          after={\par\smallskip}}}
+\end{dispListing}
+\end{docTcbKey}
+
+\begin{docTcbKey}{autoparskip}{}{style, no value}
+  This options is considered to be superseded by
+  \refKey{/tcb/before skip balanced} and \refKey{/tcb/after skip balanced}
+  (see note on page~\pageref{subsec:surroundings}).\par
+  Tries to detect the usage of the package |parskip| and sets
+  the keys |before| and |after| accordingly. Actually, the following is done:
+  \begin{itemize}
+  \item If the length of |\parskip| is greater than |0pt| at the beginning of the document,
+    \refKey{/tcb/parskip} is executed. Here, the usage of package |parskip| is \emph{assumed}.
+  \item Otherwise, if the length of |\parskip| is not greater than |0pt| at the beginning of the document,
+    \refKey{/tcb/noparskip} is executed. Here, the absence of package |parskip| is \emph{assumed}.
+  \end{itemize}
+\end{docTcbKey}
+
+
+\clearpage
+
+\begin{docTcbKey}{baseline}{=\meta{length}}{no default, initially |0pt|}
+  Used to set the |\pgfsetbaseline| value of the resulting |tcolorbox|.
+\begin{exdispExample}{baseline}
+\tcbset{colframe=red!50!white,width=4cm,nobeforeafter}
+Some text\dotfill
+\begin{tcolorbox}[baseline=3mm]
+One line.
+\end{tcolorbox}
+\begin{tcolorbox}[baseline=3mm]
+First line.\\Second line.
+\end{tcolorbox}
+\end{exdispExample}
+\end{docTcbKey}
+
+
+\begin{docTcbKey}[][doc new=2014-10-10]{box align}{=\meta{alignment}}{style, no default, initially |bottom|}
+  Used to set the \refKey{/tcb/baseline} value of the resulting |tcolorbox|.
+  Feasible values for \meta{alignment} are:
+  \begin{itemize}
+  \item\docValue{bottom}: alignment with the box bottom,
+  \item\docValue{top}: alignment with the box top,
+  \item\docValue{center}: alignment with the box center,
+  \item\docValue{base}: alignment with the box content base. This option
+    is not applicable for a \refEnv{tcolorbox} but for a \refCom{tcbox} only.
+    It is an alias for \refKey{/tcb/tcbox raise base}.
+  \end{itemize}
+
+\begin{exdispExample}{box_align_1}
+\tcbset{colframe=red!50!white,width=4cm,nobeforeafter}
+Some text\dotfill
+\begin{tcolorbox}[box align=bottom]
+One line.
+\end{tcolorbox}
+\begin{tcolorbox}[box align=bottom]
+First line.\\Second line.
+\end{tcolorbox}
+\end{exdispExample}
+
+\begin{exdispExample}{box_align_2}
+\tcbset{colframe=red!50!white,width=4cm,nobeforeafter}
+Some text\dotfill
+\begin{tcolorbox}[box align=top]
+One line.
+\end{tcolorbox}
+\begin{tcolorbox}[box align=top]
+First line.\\Second line.
+\end{tcolorbox}
+\end{exdispExample}
+
+\begin{exdispExample}{box_align_3}
+\tcbset{colframe=red!50!white,width=4cm,nobeforeafter}
+Some text\dotfill
+\begin{tcolorbox}[box align=center]
+One line.
+\end{tcolorbox}
+\begin{tcolorbox}[box align=center]
+First line.\\Second line.
+\end{tcolorbox}
+\end{exdispExample}
+
+\begin{exdispExample}{box_align_4}
+\tcbset{colframe=red!50!white,nobeforeafter}
+Some text\dotfill
+\tcbox[nobeforeafter,box align=base]{One line}
+\tcbox[nobeforeafter,box align=base,size=fbox]{Another line}
+\end{exdispExample}
+\end{docTcbKey}
+
+
+
+
 \begin{docTcbKey}[][doc new=2014-12-11]{ignore nobreak}{\colOpt{=true\textbar false}}{default |true|, initially |false|}
 After a heading, \LaTeX\ tries to avoid a break by setting a |nobreak| boolean value.
 Starting from version |3.33|, the \refKey{/tcb/before} respectively \refKey{/tcb/before skip}
@@ -3048,7 +3153,6 @@ enforce the \refKey{/tcb/before} setting.
   the box follows a heading.
 \end{docTcbKey}
 
-\enlargethispage*{1cm}
 
 \begin{docTcbKey}[][doc new=2017-02-23]{parfillskip restore}{\colOpt{=true\textbar false}}{default |true|, initially |true|}
   If this option is set to be |true|, the minimum value of |\parfillskip| is
diff --git a/macros/latex/contrib/tcolorbox/tcolorbox.doc.documentation.tex b/macros/latex/contrib/tcolorbox/tcolorbox.doc.documentation.tex
index 9c2cfe8f6d..3f301b0033 100644
--- a/macros/latex/contrib/tcolorbox/tcolorbox.doc.documentation.tex
+++ b/macros/latex/contrib/tcolorbox/tcolorbox.doc.documentation.tex
@@ -1279,6 +1279,8 @@ instead. Also see \refKey{/tcb/docexample}.
 \end{deprecated}
 \end{docTcbKey}
 
+\enlargethispage*{1cm}
+
 \begin{docTcbKey}{after example}{=\meta{macros}}{no default, initially empty}
 \smallskip\begin{deprecated}
   Sets the \meta{macros} which are executed after \refEnv{dispExample} and \refEnv{dispListing}
@@ -1363,6 +1365,7 @@ instead. Also see \refKey{/tcb/docexample}.
   \refKey{/tcb/index level}.
 \end{docTcbKey}
 
+\enlargethispage*{1cm}
 
 \begin{docTcbKey}{index german settings}{}{style, no value}
   Sets the |makeindex| values recommended for German language texts.
diff --git a/macros/latex/contrib/tcolorbox/tcolorbox.doc.filling.tex b/macros/latex/contrib/tcolorbox/tcolorbox.doc.filling.tex
index c91bc1bb19..7b207b6255 100644
--- a/macros/latex/contrib/tcolorbox/tcolorbox.doc.filling.tex
+++ b/macros/latex/contrib/tcolorbox/tcolorbox.doc.filling.tex
@@ -45,6 +45,7 @@ See \Vref{sec:skins} for the documentation of all other options of the \mylib{sk
 \end{dispExample*}
 \end{docTikzKey}
 
+\enlargethispage*{1cm}
 
 \begin{docTikzKey}{fill plain picture}{=\meta{graphical code}}{no default, initially unset}
   Fills the current path with the given \meta{graphical code}.
diff --git a/macros/latex/contrib/tcolorbox/tcolorbox.doc.s_main.sty b/macros/latex/contrib/tcolorbox/tcolorbox.doc.s_main.sty
index 32e77fc9f0..e9379a6fdd 100644
--- a/macros/latex/contrib/tcolorbox/tcolorbox.doc.s_main.sty
+++ b/macros/latex/contrib/tcolorbox/tcolorbox.doc.s_main.sty
@@ -138,7 +138,7 @@
 
 
 \newtcolorbox{marker}[1][]{enhanced,
-  before skip=2mm,after skip=3mm,
+  before skip balanced=2mm,after skip balanced=3mm,
   boxrule=0.4pt,left=5mm,right=2mm,top=1mm,bottom=1mm,
   colback=yellow!50,
   colframe=yellow!20!black,
@@ -244,8 +244,8 @@
     docexample/.style={docexample original},%
     },
   beforeafter example/.style={
-    before skip=4pt plus 2pt minus 1pt,
-    after skip=8pt plus 4pt minus 2pt
+    before skip balanced=4pt plus 2pt minus 1pt,
+    after skip balanced=5pt plus 2pt minus 1pt
   },
   base example/.style={bicolor,
     beforeafter example,arc is angular,fonttitle=\bfseries,
@@ -272,7 +272,9 @@
     base example,coltitle=black,fonttitle=\itshape,titlerule=0pt,
     colbacktitle=Navy!15!ExampleBack,
     top=0mm,
-    before=\par\smallskip,%
+    %before=\par\smallskip,%
+    before skip balanced=4pt plus 2pt minus 1pt,
+    after skip balanced=5pt plus 2pt minus 1pt,
     listing style=mydocumentation,
     listing only,listing file={\jobname_preamble_#1.tex}}%
 }
diff --git a/macros/latex/contrib/tcolorbox/tcolorbox.doc.skins.tex b/macros/latex/contrib/tcolorbox/tcolorbox.doc.skins.tex
index 646d4229ae..32b395673d 100644
--- a/macros/latex/contrib/tcolorbox/tcolorbox.doc.skins.tex
+++ b/macros/latex/contrib/tcolorbox/tcolorbox.doc.skins.tex
@@ -472,6 +472,8 @@ the bottom left corner of the main box.
 \end{exdispExample*}
 \end{docTcbKey}
 
+\enlargethispage*{1cm}
+
 \begin{docTcbKey}{attach boxed title to bottom center}{\colOpt{=\marg{boxtitle options}}}{style, default empty}
 The title is boxed with a \refCom{tcbox} and attached to
 the bottom of the main box.
@@ -1168,7 +1170,8 @@ This example uses a public domain picture from\\
 \end{dispExample}
 \end{docTcbKey}
 
-\enlargethispage{5mm}
+\enlargethispage*{1cm}
+
 \begin{docTcbKey}{watermark zoom}{=\meta{fraction}}{no default, initially |0.75|}
   Sets the zoom value for a watermark. The zoom respects the aspect ratio.
   The value $1.0$ means to fill the whole box until the watermark touches the frame.
@@ -3688,7 +3691,7 @@ Nevertheless, this skin can be applied independently.
               as seen in the third line.}}
 git commit
 git commit -a
-git commit -am `changes to my example'
+git commit -am 'changes to my example'
 \end{tcblisting}
 \end{dispExample}
 
@@ -3847,9 +3850,10 @@ Nevertheless, this skin can be applied independently.
 \end{tcolorbox}
 \end{docSkin}
 
-\begin{docTcbKey}[][doc new=2016-02-25]{tile}{}{style, no value}
-  This is an abbreviation for setting |skin=tile|.
-  \begin{marker}It also changes the geometry and some style options.\end{marker}
+\begin{docTcbKey}[][doc new=2016-02-25]{tile}{}{style, initially\\
+  |skin=tile,boxrule=0pt,sharp corners,title filled,fonttitle=\textbackslash bfseries|
+}
+  This key applies |skin=tile| and in addition changes the geometry and some style options.
 \end{docTcbKey}
 
 
@@ -4016,11 +4020,7 @@ Nevertheless, this skin can be applied independently.
 \begin{docSkin}{beamer}
   This skin resembles boxes known from the |beamer| class and therefore is
   called \enquote{beamer}. It uses the normal colors from the core package but shades
-  them a little bit. To use this skin, the |tikz| library |shadings|
-  has to be included in the preamble by:
-\begin{dispListing}
-\usetikzlibrary{shadings}
-\end{dispListing}
+  them a little bit.
 \begin{tcolorbox}[skintable=beamer]
   \begin{tabbing}
     \refKey{/tcb/interior titled engine}: \=\kill
@@ -4036,9 +4036,11 @@ Nevertheless, this skin can be applied independently.
 
 
 
-\begin{docTcbKey}{beamer}{}{style, no value}
-  This is an abbreviation for setting |skin=beamer|.
-  \begin{marker}It also changes the geometry and some style options.\end{marker}
+\begin{docTcbKey}{beamer}{}{style, initially\\
+  |skin=beamer,boxrule=0mm,titlerule=1mm,toptitle=0.5mm,|\\
+  |arc=2mm,fonttitle=\textbackslash bfseries,drop fuzzy shadow|
+}
+  This key applies |skin=beamer| and in addition changes the geometry and some style options.
 \end{docTcbKey}
 
 
@@ -4230,14 +4232,10 @@ Nevertheless, this skin can be applied independently.
 \subsection{Skin Family \enquote{widget}}
 \begin{docSkin}{widget}
   This skin uses the normal colors from the core package but shades
-  them a little bit. To use this skin, the |tikz| library |shadings|
-  has to be included in the preamble by:
-\begin{dispListing}
-\usetikzlibrary{shadings}
-\end{dispListing}
-The appearance of the skin can be controlled by \refKey{/tcb/frame style},
-\refKey{/tcb/interior style}, and \refKey{/tcb/segmentation style},
-if needed.
+  them a little bit.
+  The appearance of the skin can be controlled by \refKey{/tcb/frame style},
+  \refKey{/tcb/interior style}, and \refKey{/tcb/segmentation style},
+  if needed.
 \begin{tcolorbox}[skintable=widget]
   \begin{tabbing}
     \refKey{/tcb/interior titled engine}: \=\kill
@@ -4252,12 +4250,14 @@ if needed.
 \end{docSkin}
 
 
-\begin{docTcbKey}{widget}{}{style, no value}
-  This is an abbreviation for setting |skin=widget|.
-  \begin{marker}It also changes the geometry and some style options.\end{marker}
+\begin{docTcbKey}[][doc updated={2020-09-23}]{widget}{}{style, initially\\
+  |skin=widget,arc=0.5mm,fonttitle=\bfseries,titlerule=0mm|
+}
+  This key applies |skin=widget| and in addition changes the geometry and some style options.
 \end{docTcbKey}
 
 
+
 \begin{dispExample}
 \begin{tcbraster}[widget,raster equal height,raster columns=4,
     colback=LightGreen,colframe=DarkGreen,
@@ -4289,7 +4289,7 @@ This is my content.
 \end{tcolorbox}
 \end{dispExample}
 
-
+\clearpage
 
 \begin{docSkin}{widgetfirst}
 This is a flavor of \refSkin{widget} which is used as a \emph{first} part
diff --git a/macros/latex/contrib/tcolorbox/tcolorbox.doc.technical.tex b/macros/latex/contrib/tcolorbox/tcolorbox.doc.technical.tex
index 2d637f4678..21e8153de4 100644
--- a/macros/latex/contrib/tcolorbox/tcolorbox.doc.technical.tex
+++ b/macros/latex/contrib/tcolorbox/tcolorbox.doc.technical.tex
@@ -30,7 +30,7 @@ option from the core package has to be set.
 \begin{tcolorbox}[adjusted title=My title]
   This is my content.
 \end{tcolorbox}
-\begin{tcolorbox}[skin=beamer,beamer,adjusted title=My title]
+\begin{tcolorbox}[beamer,adjusted title=My title]
   This is my content.
 \end{tcolorbox}
 \end{dispExample}
diff --git a/macros/latex/contrib/tcolorbox/tcolorbox.doc.theorems.tex b/macros/latex/contrib/tcolorbox/tcolorbox.doc.theorems.tex
index 672ff20421..2d316a3379 100644
--- a/macros/latex/contrib/tcolorbox/tcolorbox.doc.theorems.tex
+++ b/macros/latex/contrib/tcolorbox/tcolorbox.doc.theorems.tex
@@ -593,7 +593,7 @@ created by hand or using \refCom{tcbmaketheorem} or using its successor
   of the lower part.
 \end{docTcbKey}
 
-\enlargethispage*{1cm}
+\enlargethispage*{2cm}
 \begin{docTcbKey}[][doc updated=2014-10-30]{ams equation*}{}{style, no value}
   Adds an |amsmath| |equation*| environment to the start and end
   of the upper \emph{and} lower part.
diff --git a/macros/latex/contrib/tcolorbox/tcolorbox.doc.xparse.tex b/macros/latex/contrib/tcolorbox/tcolorbox.doc.xparse.tex
index bad6fd6a60..752b5b35ad 100644
--- a/macros/latex/contrib/tcolorbox/tcolorbox.doc.xparse.tex
+++ b/macros/latex/contrib/tcolorbox/tcolorbox.doc.xparse.tex
@@ -124,7 +124,7 @@ This is a tcolorbox.
     }
   }
   Wraps the |\IfBoolean(TF)| command(s) of |xparse| for option setting.
-  If the \meta{argument} is |\BooleanTue|, the \meta{true options} are set.
+  If the \meta{argument} is |\BooleanTrue|, the \meta{true options} are set.
   If the \meta{argument} is |\BooleanFalse|, the \meta{false options} are set.
 
 \begin{dispExample}
@@ -163,7 +163,7 @@ This is a tcolorbox.
 \DeclareTColorBox[use counter from=pabox]{mybox}{ O{red} m d"" !O{} }
   {enhanced,colframe=#1!75!black,colback=#1!5!white,
    fonttitle=\bfseries,title={\thetcbcounter~#2},
-   IfValueTF={#3}{watermark text={#3}}{},#4}
+   IfValueT={#3}{watermark text={#3}},#4}
 
 \begin{mybox}{My title}
 This is a tcolorbox.
@@ -271,8 +271,8 @@ This is a tcolorbox.
 \DeclareTCBox[use counter from=pabox]{\mybox}{ s m s }
 { nobeforeafter,colback=red!5!white,colframe=red!75!black,
   title={#2 (Box \thetcbcounter)},fonttitle=\bfseries,
-  IfBooleanTF={#1}{enhanced,drop shadow}{},
-  IfBooleanTF={#3}{colbacktitle=red!50!white}{}  }
+  IfBooleanT={#1}{enhanced,drop shadow},
+  IfBooleanT={#3}{colbacktitle=red!50!white} }
 
 \mybox{Bird}{This is my first box.}
   \hfill
@@ -339,7 +339,7 @@ typeset the verbatim content.
 % \usepackage{listings} or \tcbuselibrary{listings}
 \DeclareTotalTCBox{\commandbox}{ s v }
 {verbatim,colupper=white,colback=black!75!white,colframe=black}
-{\IfBooleanTF{#1}{\textcolor{red}{\ttfamily\bfseries > }}{}%
+{\IfBooleanT{#1}{\textcolor{red}{\ttfamily\bfseries > }}%
   \lstinline[language=command.com,keywordstyle=\color{blue!35!white}\bfseries]^#2^}
 
 \commandbox*{cd "My Documents"} changes to directory \commandbox{My Documents}.
@@ -459,7 +459,7 @@ With date of 2018-05-12, the |xparse| \cite{latexproject:xparse} package
 changed the argument collection process.
 Now, spaces are ignored which leads to a serious change for listing environments
 ending with an optional argument like \verb+O{}+.
-The former behaviour of respecting spaces can be preserved by adding a \flqq\verb+!+\frqq.
+The former behavior of respecting spaces can be preserved by adding a \flqq\verb+!+\frqq.
 Note that the following code uses \verb+!O{}+ now.
 \begin{itemize}
 \item For older |xparse| versions, the following code is correct when using \verb+O{}+.
@@ -570,7 +570,7 @@ The following commands need the \mylib{fitting} library to be included.
  {colback=red!5!white,
   colframe=red!75!black,
   width=#2,height=#2/3*2,
-  IfValueTF={#3}{height=#3}{},
+  IfValueT={#3}{height=#3},
   #1}
 
 \mybox[colback=yellow]{5cm}%
diff --git a/macros/latex/contrib/tcolorbox/tcolorbox.pdf b/macros/latex/contrib/tcolorbox/tcolorbox.pdf
index ef1068931f..015a9bd926 100644
--- a/macros/latex/contrib/tcolorbox/tcolorbox.pdf
+++ b/macros/latex/contrib/tcolorbox/tcolorbox.pdf
diff --git a/macros/latex/contrib/tcolorbox/tcolorbox.sty b/macros/latex/contrib/tcolorbox/tcolorbox.sty
index a934739908..4ca0de43f6 100644
--- a/macros/latex/contrib/tcolorbox/tcolorbox.sty
+++ b/macros/latex/contrib/tcolorbox/tcolorbox.sty
@@ -1,4 +1,4 @@
-%% The LaTeX package tcolorbox - version 4.32 (2020/09/17)
+%% The LaTeX package tcolorbox - version 4.40 (2020/09/25)
 %% tcolorbox.sty: Text color boxes
 %%
 %% -------------------------------------------------------------------------------------------
@@ -18,8 +18,8 @@
 %% This work consists of all files listed in README
 %%
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{tcolorbox}[2020/09/17 version 4.32 text color boxes]
-\def\tcb@version{4.32}
+\ProvidesPackage{tcolorbox}[2020/09/25 version 4.40 text color boxes]
+\def\tcb@version{4.40}
 
 \RequirePackage{pgf}[2008/01/15]
 \RequirePackage{verbatim}[2003/08/22]
@@ -286,6 +286,46 @@
   parfillskip restore/false/.code={\let\tcb@parfillskip@check=\@empty},%
   before/.code={\def\kvtcb@beforebox{#1}\let\tcb@undo@before=\@empty\let\tcb@use@autoparskip=\relax},
   after/.code={\def\kvtcb@afterbox{#1}\let\tcb@use@autoparskip=\relax},
+  before skip balanced/.style={before={%
+    \ifnum\lastnodetype=-1\relax%
+    \else%
+      \par%
+      \ifvmode%
+        \iftcb@minipage%
+          \ifdim\parskip>\z@\relax%
+            \addvspace{-\parskip}%
+          \fi%
+        \else%
+          \ifdim\prevdepth<\z@\relax%
+            \tcbdimto\tcb@prevdepth{\prevdepth}%
+            \addvspace{\glueexpr#1-\parskip}%
+            \def\tcb@undo@before{\addvspace{-\glueexpr#1+\tcb@prevdepth}}%
+          \else%
+            \ifdim\prevdepth>.3\baselineskip\relax%
+              \tcbdimto\tcb@prevdepth{\prevdepth}%
+              \addvspace{\glueexpr#1-\parskip}%
+            \else%
+              \tcbdimto\tcb@prevdepth{.3\baselineskip}%
+              \addvspace{\glueexpr#1+.3\baselineskip-\prevdepth-\parskip}%
+            \fi%
+            \def\tcb@undo@before{\addvspace{-\glueexpr#1+\tcb@prevdepth}}%
+          \fi%
+        \fi%
+        \nointerlineskip%
+      \fi%
+    \fi%
+    \lineskip\z@skip%
+    \noindent%
+  }},
+  after skip balanced/.style={after={%
+    \tcb@parfillskip@check%
+    \par%
+    \ifvmode%
+      \prevdepth=.3\baselineskip%
+      \addvspace{\glueexpr#1-\parskip}%
+    \fi%
+  }},
+  beforeafter skip balanced/.style={before skip balanced={#1},after skip balanced={#1}},
   autoparskip/.code={\let\tcb@use@autoparskip=\tcb@use@auto@parskip},
   parskip/.style={before={\ifnum\lastnodetype=-1\relax\else\par%
       \ifvmode\edef\tcb@prevdepth{\the\glueexpr\prevdepth+\lineskip+\parskip}%
@@ -303,16 +343,29 @@
     \ifnum\lastnodetype=-1\relax%
     \else%
       \par%
-      \ifvmode\tcbdimto\tcb@prevdepth{\prevdepth}\nointerlineskip%
-        \addvspace{\glueexpr#1-\parskip}%
-        \def\tcb@undo@before{\addvspace{-\glueexpr#1+\tcb@prevdepth}}%
+      \ifvmode%
+        \iftcb@minipage%
+          \ifdim\parskip>\z@\relax%
+            \addvspace{-\parskip}%
+          \fi%
+        \else%
+          \tcbdimto\tcb@prevdepth{\prevdepth}%
+          \addvspace{\glueexpr#1-\parskip}%
+          \def\tcb@undo@before{\addvspace{-\glueexpr#1+\tcb@prevdepth}}%
+        \fi%
+        \nointerlineskip%
       \fi%
     \fi%
-    \lineskip\z@skip\noindent%
+    \lineskip\z@skip%
+    \noindent%
     }},
   after skip/.style={after={%
-    \tcb@parfillskip@check\par\ifvmode\nointerlineskip%
-    \addvspace{\glueexpr#1-\parskip}\fi%
+    \tcb@parfillskip@check%
+    \par%
+    \ifvmode%
+      \nointerlineskip%
+      \addvspace{\glueexpr#1-\parskip}%
+    \fi%
     }},
   beforeafter skip/.style={before skip={#1},after skip={#1}},
   before nobreak/.store in=\kvtcb@beforebox@nobreak,
@@ -1098,11 +1151,8 @@
   \let\tcbtextheight\tcb@zpt%
   \let\tcbtextwidth\tcb@zpt%
   \tcbset{#1}\tcb@lateoptions@hook\tcb@afteroptions@hook%
-  \if@nobreak%
-    \let\iftcb@nobreak\@firstoftwo%
-  \else%
-    \let\iftcb@nobreak\@secondoftwo%
-  \fi%
+  \let\iftcb@minipage\if@minipage%
+  \let\iftcb@nobreak\if@nobreak%
 }
 
 \long\def\tcb@@icolorbox[#1]{%
@@ -1684,11 +1734,11 @@
 
 \def\tcb@set@normal@unbroken@beforeafter{%
   \let\tcb@before@unbroken=\kvtcb@beforebox%
-  \iftcb@nobreak{%
+  \iftcb@nobreak%
     \iftcb@ignorenobreak\else%
       \let\tcb@before@unbroken=\kvtcb@beforebox@nobreak%
     \fi%
-  }{}%
+  \fi%
   \let\tcb@after@unbroken=\kvtcb@afterbox%
 }
 
@@ -1752,7 +1802,10 @@
 \long\def\tcbox@inner@hbox#1{%
   \tcbset{breakable@false,sidebyside=false}%
   \tcb@set@@phantom%
-  \sbox\tcb@upperbox{\tcb@embed@tcbox{\color{tcbcolupper}\kvtcb@fontupper\kvtcb@halignupper\tcb@insert@before@upper#1\tcb@insert@after@upper}}%
+  \sbox\tcb@upperbox{\tcb@embed@tcbox{%
+    \csname tcb@parbox@use@\kvtcb@parbox\endcsname%
+    \@parboxrestore%
+    \color{tcbcolupper}\kvtcb@fontupper\kvtcb@halignupper\tcb@insert@before@upper#1\tcb@insert@after@upper}}%
   \tcbdimto\tcb@val@raisebase{\the\dimexpr\dp\tcb@upperbox+\kvtcb@bottom+\kvtcb@boxsep+\kvtcb@bottom@rule@stand+\kvtcb@bbbottom@stand\relax}%
   \tcbdimto\kvtcb@width{\wd\tcb@upperbox+\kvtcb@left@rule+\kvtcb@leftupper+\kvtcb@boxsep*2+\kvtcb@rightupper+\kvtcb@right@rule}%
   \tcb@hasLowerfalse%
@@ -2154,7 +2207,7 @@
       \let\tcb@lowerdraw@begin@hook\@empty%
       \let\tcb@lowerdraw@end@hook\@empty%
     },
-    width=\linewidth,autoparskip,arc is curved,
+    width=\linewidth,beforeafter skip balanced=0.5\baselineskip plus 2pt,arc is curved,
     natural height,height plus=0pt,space to lower,valign=top,valign lower=top,
     size=normal,rounded corners,parfillskip restore,
     enlarge top by=0mm,enlarge bottom by=0mm,enlarge left by=0mm,enlarge right by=0mm,
diff --git a/macros/latex/contrib/tcolorbox/tcolorbox.tex b/macros/latex/contrib/tcolorbox/tcolorbox.tex
index 2b2a2d9102..0aebc2ca47 100644
--- a/macros/latex/contrib/tcolorbox/tcolorbox.tex
+++ b/macros/latex/contrib/tcolorbox/tcolorbox.tex
@@ -1,5 +1,5 @@
 % \LaTeX-Main\
-%% The LaTeX package tcolorbox - version 4.32 (2020/09/17)
+%% The LaTeX package tcolorbox - version 4.40 (2020/09/25)
 %% tcolorbox.tex: Manual
 %%
 %% -------------------------------------------------------------------------------------------
@@ -43,8 +43,8 @@
 \setlength{\bibitemsep}{\smallskipamount}
 \addbibresource{tcolorbox.doc.bib}
 
-\def\version{4.32}%
-\def\datum{2020/09/17}%
+\def\version{4.40}%
+\def\datum{2020/09/25}%
 \makeindex
 
 \hypersetup{
@@ -62,7 +62,7 @@
 %\geometry{showframe}
 %\tcbset{draftmode}
 \tcbset{/tcb/external/-}% for final run
-%\includeonly{tcolorbox.doc.breakable}
+%\includeonly{tcolorbox.doc.intro,tcolorbox.doc.quickref,tcolorbox.doc.coremacros}
 
 %\hypersetup{colorlinks=false}
 
diff --git a/macros/latex/contrib/thucoursework/thucoursework.dtx b/macros/latex/contrib/thucoursework/thucoursework.dtx
index 7aa62a8bf5..2ba0a5433e 100644
--- a/macros/latex/contrib/thucoursework/thucoursework.dtx
+++ b/macros/latex/contrib/thucoursework/thucoursework.dtx
@@ -56,7 +56,7 @@ through LaTeX.
 \endgroup
 %</internal>
 %<*driver>
-\ProvidesFile{thucoursework.dtx}[2020/02/23 2.5.1 Tsinghua University Coursework Template]
+\ProvidesFile{thucoursework.dtx}[2020/09/09 2.6 Tsinghua University Coursework Template]
 \documentclass{ltxdoc}
 \usepackage{dtx-style}
 
@@ -247,8 +247,8 @@ through LaTeX.
 % 按照优先级推��问的�置如下：
 %
 % \begin{itemize}
-% \item \href{http://github.com/zhaofeng-shu33/thucoursework/issues}{Github Issues}
-% \item \href{http://bbs.ctex.org/nForum/#!board/TeX}{ctex 论�}
+% \item \href{https://github.com/zhaofeng-shu33/thucoursework/issues}{Github Issues}
+% \item \href{https://github.com/CTeX-org/forum/issues}{ctex 论�}
 % \end{itemize}
 %
 % \subsection{示例文件}
@@ -396,17 +396,18 @@ through LaTeX.
 % \section{实现细节}
 %
 % \subsection{基本信�}
-%    \begin{macrocode}
 % \changes{v2.0}{2018/03/22}{[\zhaofeng] Make it a latex package(.sty)}
+%    \begin{macrocode}
 %<*sty>
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
 \ProvidesClass{iidef}
-[2020/02/23 2.5.1 Tsinghua University Coursework Template]
+[2020/09/09 2.6 Tsinghua University Coursework Template]
 %    \end{macrocode}
 % \subsection{装载�包}
 % \label{sec:loadpackage}
 %
 % 引用的�包和相应的定义。
+% \changes{v2.6}{2020/09/09}{[\zhaofeng] support \texttt{exam} document class}
 %    \begin{macrocode}
 %% configuration of nested enumerate env
 \RequirePackage{enumitem}
@@ -415,7 +416,8 @@ through LaTeX.
 %% required by macro DeclareMathOperator
 \RequirePackage{amsmath}
 %% Set up page headers using with fancyhdr
-\RequirePackage{fancyhdr}
+\@ifundefined{lhead}{\RequirePackage{fancyhdr}}
+{\def\@thulhead{thulhead}}
 %define the solution env with amsthm proof
 \RequirePackage{amsthm}
 %    \end{macrocode}
@@ -465,6 +467,7 @@ through LaTeX.
   \underline{\bf \@hwname\;\thehwcnt} \\
 \end{center}
 }
+\@ifundefined{@thulhead}{
 \fancypagestyle{runningpage}
 {
   \fancyhead[L]{\small\@coursename}
@@ -472,6 +475,7 @@ through LaTeX.
 }
 %% use runningpage style from second page on 
 \pagestyle{runningpage}
+}{}
 %% *********************************************************************************************
 %    \end{macrocode}
 %
@@ -509,6 +513,7 @@ through LaTeX.
 \def\@slname{Solution}
 \def\slname#1{\renewcommand\@slname{#1}}
 
+\@ifundefined{solution}{
 \newenvironment{solution}
 {
 \proof[\@slname]
@@ -518,6 +523,7 @@ through LaTeX.
 \renewcommand{\qedsymbol}{}
 \endproof
 }
+}{}
 %%******************************
 %    \end{macrocode}
 % \subsection{常用数学符�}
diff --git a/macros/latex/contrib/thucoursework/thucoursework.pdf b/macros/latex/contrib/thucoursework/thucoursework.pdf
index ea6c3ddde0..5eacb1b5fe 100644
--- a/macros/latex/contrib/thucoursework/thucoursework.pdf
+++ b/macros/latex/contrib/thucoursework/thucoursework.pdf
diff --git a/macros/latex/required/latexbug/changes.txt b/macros/latex/required/latexbug/changes.txt
index 50db5d48f3..6b0ccd6d8e 100644
--- a/macros/latex/required/latexbug/changes.txt
+++ b/macros/latex/required/latexbug/changes.txt
@@ -1,3 +1,7 @@
+2020-09-25  Joseph Wright  <Joseph.WRight@latex-project.org>
+
+	* latexbug.dtx: update l3backend file list
+
 2019-09-13  Frank Mittelbach  <Frank.Mittelbach@latex-project.org>
 
 	* latexbug.dtx: added rotating.sty (graphics)
diff --git a/macros/latex/required/latexbug/latexbug.dtx b/macros/latex/required/latexbug/latexbug.dtx
index 822c52fc73..9a11e56466 100644
--- a/macros/latex/required/latexbug/latexbug.dtx
+++ b/macros/latex/required/latexbug/latexbug.dtx
@@ -2,7 +2,7 @@
 %
 % Package latexbug for use with LaTeX2e
 %
-% Copyright 2016-2019
+% Copyright 2016-2020
 %
 % The LaTeX3 Project and any individual authors listed elsewhere
 % in this file. 
@@ -231,7 +231,7 @@
 %    \begin{macrocode}
 %<*package>
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{latexbug}[2019/10/15 v1.0g Bug-classification]
+\ProvidesPackage{latexbug}[2020/09/25 v1.0h Bug-classification]
 %    \end{macrocode}
 %
 % \begin{macro}{\latexbug@empty}
@@ -742,8 +742,11 @@ l3deprecation.def = ignore ,
 l3backend-dvipdfmx.def = ignore ,
 l3backend-dvips.def = ignore ,
 l3backend-dvisvgm.def = ignore ,
+l3backend-luatex.def = ignore ,
 l3backend-pdfmode.def = ignore ,
+l3backend-pdftex.def = ignore ,
 l3backend-xdvipdfmx.def = ignore ,
+l3backend-xetex.def = ignore ,
 %---------------------------------  HYPERREF
 hluatex.def  = ignore ,               
 hpdftex.def  = ignore ,
diff --git a/macros/latex/required/latexbug/latexbug.pdf b/macros/latex/required/latexbug/latexbug.pdf
index 0453e446ed..66b3f89228 100644
--- a/macros/latex/required/latexbug/latexbug.pdf
+++ b/macros/latex/required/latexbug/latexbug.pdf
diff --git a/macros/unicodetex/README.txt b/macros/unicodetex/README.txt
new file mode 100644
index 0000000000..351c0bd7d4
--- /dev/null
+++ b/macros/unicodetex/README.txt
@@ -0,0 +1,13 @@
+
+ README.txt for CTAN:/macros/unicodetex/ :
+
+ This directory tree is meant for packages that work with
+ _either_ of the “modern� TeX engines XeTeX or LuaTeX,
+ but _not_ with the “traditional� TeX engines TeX and pdfTeX.
+
+ For packages that require LuaTeX (and will work with _none_
+ of the other engines!) go to CTAN:/macros/luatex/ .
+
+ For packages that require XeTeX (and will work with _none_
+ of the other engines!) go to CTAN:/macros/xetex/ .
+
diff --git a/macros/unicodetex/generic/README.txt b/macros/unicodetex/generic/README.txt
new file mode 100644
index 0000000000..d702a21ea4
--- /dev/null
+++ b/macros/unicodetex/generic/README.txt
@@ -0,0 +1,7 @@
+
+ README.txt for CTAN:/macros/unicodetex/generic/ :
+ 
+ This directory tree is meant for packages that
+  -> require a “modern� TeX engine like XeTeX or LuaTeX
+  and
+  -> are compatible with LaTeX _and_ Plain formats. 
diff --git a/macros/latex/contrib/fontsetup/README b/macros/unicodetex/latex/fontsetup/README
index 377b78a5f5..377b78a5f5 100644
--- a/macros/latex/contrib/fontsetup/README
+++ b/macros/unicodetex/latex/fontsetup/README
diff --git a/macros/latex/contrib/fontsetup/doc/fontsetup-doc.pdf b/macros/unicodetex/latex/fontsetup/doc/fontsetup-doc.pdf
index 7bbc3d52ba..7bbc3d52ba 100644
--- a/macros/latex/contrib/fontsetup/doc/fontsetup-doc.pdf
+++ b/macros/unicodetex/latex/fontsetup/doc/fontsetup-doc.pdf
diff --git a/macros/latex/contrib/fontsetup/doc/fontsetup-doc.tex b/macros/unicodetex/latex/fontsetup/doc/fontsetup-doc.tex
index b9ddc3ddcd..b9ddc3ddcd 100644
--- a/macros/latex/contrib/fontsetup/doc/fontsetup-doc.tex
+++ b/macros/unicodetex/latex/fontsetup/doc/fontsetup-doc.tex
diff --git a/macros/latex/contrib/fontsetup/doc/fspsample-cambria.pdf b/macros/unicodetex/latex/fontsetup/doc/fspsample-cambria.pdf
index f003f22208..f003f22208 100644
--- a/macros/latex/contrib/fontsetup/doc/fspsample-cambria.pdf
+++ b/macros/unicodetex/latex/fontsetup/doc/fspsample-cambria.pdf
diff --git a/macros/latex/contrib/fontsetup/doc/fspsample-cmr.pdf b/macros/unicodetex/latex/fontsetup/doc/fspsample-cmr.pdf
index 8423318316..8423318316 100644
--- a/macros/latex/contrib/fontsetup/doc/fspsample-cmr.pdf
+++ b/macros/unicodetex/latex/fontsetup/doc/fspsample-cmr.pdf
diff --git a/macros/latex/contrib/fontsetup/doc/fspsample-ebgaramond.pdf b/macros/unicodetex/latex/fontsetup/doc/fspsample-ebgaramond.pdf
index 6084e0e3bf..6084e0e3bf 100644
--- a/macros/latex/contrib/fontsetup/doc/fspsample-ebgaramond.pdf
+++ b/macros/unicodetex/latex/fontsetup/doc/fspsample-ebgaramond.pdf
diff --git a/macros/latex/contrib/fontsetup/doc/fspsample-fira.pdf b/macros/unicodetex/latex/fontsetup/doc/fspsample-fira.pdf
index 479fecca54..479fecca54 100644
--- a/macros/latex/contrib/fontsetup/doc/fspsample-fira.pdf
+++ b/macros/unicodetex/latex/fontsetup/doc/fspsample-fira.pdf
diff --git a/macros/latex/contrib/fontsetup/doc/fspsample-gfsartemisia.pdf b/macros/unicodetex/latex/fontsetup/doc/fspsample-gfsartemisia.pdf
index 1d1365d8ca..1d1365d8ca 100644
--- a/macros/latex/contrib/fontsetup/doc/fspsample-gfsartemisia.pdf
+++ b/macros/unicodetex/latex/fontsetup/doc/fspsample-gfsartemisia.pdf
diff --git a/macros/latex/contrib/fontsetup/doc/fspsample-gfsdidot.pdf b/macros/unicodetex/latex/fontsetup/doc/fspsample-gfsdidot.pdf
index 9e4ccd3545..9e4ccd3545 100644
--- a/macros/latex/contrib/fontsetup/doc/fspsample-gfsdidot.pdf
+++ b/macros/unicodetex/latex/fontsetup/doc/fspsample-gfsdidot.pdf
diff --git a/macros/latex/contrib/fontsetup/doc/fspsample-gfsdidotclassic.pdf b/macros/unicodetex/latex/fontsetup/doc/fspsample-gfsdidotclassic.pdf
index 873efb92dc..873efb92dc 100644
--- a/macros/latex/contrib/fontsetup/doc/fspsample-gfsdidotclassic.pdf
+++ b/macros/unicodetex/latex/fontsetup/doc/fspsample-gfsdidotclassic.pdf
diff --git a/macros/latex/contrib/fontsetup/doc/fspsample-gfsneohellenic.pdf b/macros/unicodetex/latex/fontsetup/doc/fspsample-gfsneohellenic.pdf
index 3f1817a12e..3f1817a12e 100644
--- a/macros/latex/contrib/fontsetup/doc/fspsample-gfsneohellenic.pdf
+++ b/macros/unicodetex/latex/fontsetup/doc/fspsample-gfsneohellenic.pdf
diff --git a/macros/latex/contrib/fontsetup/doc/fspsample-kerkis.pdf b/macros/unicodetex/latex/fontsetup/doc/fspsample-kerkis.pdf
index 5161451c9f..5161451c9f 100644
--- a/macros/latex/contrib/fontsetup/doc/fspsample-kerkis.pdf
+++ b/macros/unicodetex/latex/fontsetup/doc/fspsample-kerkis.pdf
diff --git a/macros/latex/contrib/fontsetup/doc/fspsample-libertinus.pdf b/macros/unicodetex/latex/fontsetup/doc/fspsample-libertinus.pdf
index 845f5cf7be..845f5cf7be 100644
--- a/macros/latex/contrib/fontsetup/doc/fspsample-libertinus.pdf
+++ b/macros/unicodetex/latex/fontsetup/doc/fspsample-libertinus.pdf
diff --git a/macros/latex/contrib/fontsetup/doc/fspsample-lucida.pdf b/macros/unicodetex/latex/fontsetup/doc/fspsample-lucida.pdf
index bebf3ceff9..bebf3ceff9 100644
--- a/macros/latex/contrib/fontsetup/doc/fspsample-lucida.pdf
+++ b/macros/unicodetex/latex/fontsetup/doc/fspsample-lucida.pdf
diff --git a/macros/latex/contrib/fontsetup/doc/fspsample-minion.pdf b/macros/unicodetex/latex/fontsetup/doc/fspsample-minion.pdf
index ef26ae6481..ef26ae6481 100644
--- a/macros/latex/contrib/fontsetup/doc/fspsample-minion.pdf
+++ b/macros/unicodetex/latex/fontsetup/doc/fspsample-minion.pdf
diff --git a/macros/latex/contrib/fontsetup/doc/fspsample-msgaramond.pdf b/macros/unicodetex/latex/fontsetup/doc/fspsample-msgaramond.pdf
index e411c077d6..e411c077d6 100644
--- a/macros/latex/contrib/fontsetup/doc/fspsample-msgaramond.pdf
+++ b/macros/unicodetex/latex/fontsetup/doc/fspsample-msgaramond.pdf
diff --git a/macros/latex/contrib/fontsetup/doc/fspsample-neoeuler.pdf b/macros/unicodetex/latex/fontsetup/doc/fspsample-neoeuler.pdf
index 545c0d7ace..545c0d7ace 100644
--- a/macros/latex/contrib/fontsetup/doc/fspsample-neoeuler.pdf
+++ b/macros/unicodetex/latex/fontsetup/doc/fspsample-neoeuler.pdf
diff --git a/macros/latex/contrib/fontsetup/doc/fspsample-newdefault.pdf b/macros/unicodetex/latex/fontsetup/doc/fspsample-newdefault.pdf
index 736690886c..736690886c 100644
--- a/macros/latex/contrib/fontsetup/doc/fspsample-newdefault.pdf
+++ b/macros/unicodetex/latex/fontsetup/doc/fspsample-newdefault.pdf
diff --git a/macros/latex/contrib/fontsetup/doc/fspsample-palatino.pdf b/macros/unicodetex/latex/fontsetup/doc/fspsample-palatino.pdf
index 48644e576d..48644e576d 100644
--- a/macros/latex/contrib/fontsetup/doc/fspsample-palatino.pdf
+++ b/macros/unicodetex/latex/fontsetup/doc/fspsample-palatino.pdf
diff --git a/macros/latex/contrib/fontsetup/doc/fspsample-stixtwo.pdf b/macros/unicodetex/latex/fontsetup/doc/fspsample-stixtwo.pdf
index bcec3a110a..bcec3a110a 100644
--- a/macros/latex/contrib/fontsetup/doc/fspsample-stixtwo.pdf
+++ b/macros/unicodetex/latex/fontsetup/doc/fspsample-stixtwo.pdf
diff --git a/macros/latex/contrib/fontsetup/doc/fspsample-times.pdf b/macros/unicodetex/latex/fontsetup/doc/fspsample-times.pdf
index f1dea75182..f1dea75182 100644
--- a/macros/latex/contrib/fontsetup/doc/fspsample-times.pdf
+++ b/macros/unicodetex/latex/fontsetup/doc/fspsample-times.pdf
diff --git a/macros/latex/contrib/fontsetup/doc/fspsample.tex b/macros/unicodetex/latex/fontsetup/doc/fspsample.tex
index 23ec736e02..23ec736e02 100644
--- a/macros/latex/contrib/fontsetup/doc/fspsample.tex
+++ b/macros/unicodetex/latex/fontsetup/doc/fspsample.tex
diff --git a/macros/latex/contrib/fontsetup/fontsetup.sty b/macros/unicodetex/latex/fontsetup/fontsetup.sty
index 32ed9bc0d4..32ed9bc0d4 100644
--- a/macros/latex/contrib/fontsetup/fontsetup.sty
+++ b/macros/unicodetex/latex/fontsetup/fontsetup.sty
diff --git a/macros/latex/contrib/fontsetup/fspcambria.sty b/macros/unicodetex/latex/fontsetup/fspcambria.sty
index b2947bb3d6..b2947bb3d6 100644
--- a/macros/latex/contrib/fontsetup/fspcambria.sty
+++ b/macros/unicodetex/latex/fontsetup/fspcambria.sty
diff --git a/macros/latex/contrib/fontsetup/fspdefault.sty b/macros/unicodetex/latex/fontsetup/fspdefault.sty
index da0a494155..da0a494155 100644
--- a/macros/latex/contrib/fontsetup/fspdefault.sty
+++ b/macros/unicodetex/latex/fontsetup/fspdefault.sty
diff --git a/macros/latex/contrib/fontsetup/fspebgaramondot.sty b/macros/unicodetex/latex/fontsetup/fspebgaramondot.sty
index a819513535..a819513535 100644
--- a/macros/latex/contrib/fontsetup/fspebgaramondot.sty
+++ b/macros/unicodetex/latex/fontsetup/fspebgaramondot.sty
diff --git a/macros/latex/contrib/fontsetup/fspfiraot.sty b/macros/unicodetex/latex/fontsetup/fspfiraot.sty
index 172bf45dab..172bf45dab 100644
--- a/macros/latex/contrib/fontsetup/fspfiraot.sty
+++ b/macros/unicodetex/latex/fontsetup/fspfiraot.sty
diff --git a/macros/latex/contrib/fontsetup/fspgfsartemisiaot.sty b/macros/unicodetex/latex/fontsetup/fspgfsartemisiaot.sty
index c4dc761f87..c4dc761f87 100644
--- a/macros/latex/contrib/fontsetup/fspgfsartemisiaot.sty
+++ b/macros/unicodetex/latex/fontsetup/fspgfsartemisiaot.sty
diff --git a/macros/latex/contrib/fontsetup/fspgfsdidotclassicot.sty b/macros/unicodetex/latex/fontsetup/fspgfsdidotclassicot.sty
index d1f26d14c7..d1f26d14c7 100644
--- a/macros/latex/contrib/fontsetup/fspgfsdidotclassicot.sty
+++ b/macros/unicodetex/latex/fontsetup/fspgfsdidotclassicot.sty
diff --git a/macros/latex/contrib/fontsetup/fspgfsdidotot.sty b/macros/unicodetex/latex/fontsetup/fspgfsdidotot.sty
index f8c312c02c..f8c312c02c 100644
--- a/macros/latex/contrib/fontsetup/fspgfsdidotot.sty
+++ b/macros/unicodetex/latex/fontsetup/fspgfsdidotot.sty
diff --git a/macros/latex/contrib/fontsetup/fspgfsneohellenicot.sty b/macros/unicodetex/latex/fontsetup/fspgfsneohellenicot.sty
index 76e0d0a653..76e0d0a653 100644
--- a/macros/latex/contrib/fontsetup/fspgfsneohellenicot.sty
+++ b/macros/unicodetex/latex/fontsetup/fspgfsneohellenicot.sty
diff --git a/macros/latex/contrib/fontsetup/fspkerkisot.sty b/macros/unicodetex/latex/fontsetup/fspkerkisot.sty
index 8315fa6f9e..8315fa6f9e 100644
--- a/macros/latex/contrib/fontsetup/fspkerkisot.sty
+++ b/macros/unicodetex/latex/fontsetup/fspkerkisot.sty
diff --git a/macros/latex/contrib/fontsetup/fsplucidaot.sty b/macros/unicodetex/latex/fontsetup/fsplucidaot.sty
index 2287f48685..2287f48685 100644
--- a/macros/latex/contrib/fontsetup/fsplucidaot.sty
+++ b/macros/unicodetex/latex/fontsetup/fsplucidaot.sty
diff --git a/macros/latex/contrib/fontsetup/fspminion.sty b/macros/unicodetex/latex/fontsetup/fspminion.sty
index f39448227f..f39448227f 100644
--- a/macros/latex/contrib/fontsetup/fspminion.sty
+++ b/macros/unicodetex/latex/fontsetup/fspminion.sty
diff --git a/macros/latex/contrib/fontsetup/fspmsgaramondot.sty b/macros/unicodetex/latex/fontsetup/fspmsgaramondot.sty
index 3d3907cb8b..3d3907cb8b 100644
--- a/macros/latex/contrib/fontsetup/fspmsgaramondot.sty
+++ b/macros/unicodetex/latex/fontsetup/fspmsgaramondot.sty
diff --git a/macros/latex/contrib/fontsetup/fspneoeulerot.sty b/macros/unicodetex/latex/fontsetup/fspneoeulerot.sty
index 725686c3a8..725686c3a8 100644
--- a/macros/latex/contrib/fontsetup/fspneoeulerot.sty
+++ b/macros/unicodetex/latex/fontsetup/fspneoeulerot.sty
diff --git a/macros/latex/contrib/fontsetup/fspolddefault.sty b/macros/unicodetex/latex/fontsetup/fspolddefault.sty
index 1c52a8ff0c..1c52a8ff0c 100644
--- a/macros/latex/contrib/fontsetup/fspolddefault.sty
+++ b/macros/unicodetex/latex/fontsetup/fspolddefault.sty
diff --git a/macros/latex/contrib/fontsetup/fsppalatinoot.sty b/macros/unicodetex/latex/fontsetup/fsppalatinoot.sty
index 3487754dde..3487754dde 100644
--- a/macros/latex/contrib/fontsetup/fsppalatinoot.sty
+++ b/macros/unicodetex/latex/fontsetup/fsppalatinoot.sty
diff --git a/macros/latex/contrib/fontsetup/fspstixtwoot.sty b/macros/unicodetex/latex/fontsetup/fspstixtwoot.sty
index f38c44654d..f38c44654d 100644
--- a/macros/latex/contrib/fontsetup/fspstixtwoot.sty
+++ b/macros/unicodetex/latex/fontsetup/fspstixtwoot.sty
diff --git a/macros/latex/contrib/fontsetup/fsptimesot.sty b/macros/unicodetex/latex/fontsetup/fsptimesot.sty
index 772be2b633..772be2b633 100644
--- a/macros/latex/contrib/fontsetup/fsptimesot.sty
+++ b/macros/unicodetex/latex/fontsetup/fsptimesot.sty
diff --git a/macros/latex/contrib/fontsetup/system-install-fonts/fsplpscel.otf b/macros/unicodetex/latex/fontsetup/system-install-fonts/fsplpscel.otf
index b505b6b96f..b505b6b96f 100644
--- a/macros/latex/contrib/fontsetup/system-install-fonts/fsplpscel.otf
+++ b/macros/unicodetex/latex/fontsetup/system-install-fonts/fsplpscel.otf
diff --git a/macros/latex/contrib/fontsetup/system-install-fonts/fspmnscel.otf b/macros/unicodetex/latex/fontsetup/system-install-fonts/fspmnscel.otf
index c0e233f43c..c0e233f43c 100644
--- a/macros/latex/contrib/fontsetup/system-install-fonts/fspmnscel.otf
+++ b/macros/unicodetex/latex/fontsetup/system-install-fonts/fspmnscel.otf
diff --git a/macros/latex/contrib/fontspec/CHANGES.md b/macros/unicodetex/latex/fontspec/CHANGES.md
index 63ae8620b4..63ae8620b4 100644
--- a/macros/latex/contrib/fontspec/CHANGES.md
+++ b/macros/unicodetex/latex/fontspec/CHANGES.md
diff --git a/macros/latex/contrib/fontspec/LICENSE b/macros/unicodetex/latex/fontspec/LICENSE
index 2244313901..2244313901 100644
--- a/macros/latex/contrib/fontspec/LICENSE
+++ b/macros/unicodetex/latex/fontspec/LICENSE
diff --git a/macros/latex/contrib/fontspec/README.md b/macros/unicodetex/latex/fontspec/README.md
index cd01b539d8..cd01b539d8 100644
--- a/macros/latex/contrib/fontspec/README.md
+++ b/macros/unicodetex/latex/fontspec/README.md
diff --git a/macros/latex/contrib/fontspec/fontspec-code-api.dtx b/macros/unicodetex/latex/fontspec/fontspec-code-api.dtx
index b0b6b0a87d..b0b6b0a87d 100644
--- a/macros/latex/contrib/fontspec/fontspec-code-api.dtx
+++ b/macros/unicodetex/latex/fontspec/fontspec-code-api.dtx
diff --git a/macros/latex/contrib/fontspec/fontspec-code-closing.dtx b/macros/unicodetex/latex/fontspec/fontspec-code-closing.dtx
index 4dca137a7d..4dca137a7d 100644
--- a/macros/latex/contrib/fontspec/fontspec-code-closing.dtx
+++ b/macros/unicodetex/latex/fontspec/fontspec-code-closing.dtx
diff --git a/macros/latex/contrib/fontspec/fontspec-code-enc.dtx b/macros/unicodetex/latex/fontspec/fontspec-code-enc.dtx
index 7d30448002..7d30448002 100644
--- a/macros/latex/contrib/fontspec/fontspec-code-enc.dtx
+++ b/macros/unicodetex/latex/fontspec/fontspec-code-enc.dtx
diff --git a/macros/latex/contrib/fontspec/fontspec-code-feat-aat.dtx b/macros/unicodetex/latex/fontspec/fontspec-code-feat-aat.dtx
index cf9736c035..cf9736c035 100644
--- a/macros/latex/contrib/fontspec/fontspec-code-feat-aat.dtx
+++ b/macros/unicodetex/latex/fontspec/fontspec-code-feat-aat.dtx
diff --git a/macros/latex/contrib/fontspec/fontspec-code-feat-opentype.dtx b/macros/unicodetex/latex/fontspec/fontspec-code-feat-opentype.dtx
index 77d431ccf8..77d431ccf8 100644
--- a/macros/latex/contrib/fontspec/fontspec-code-feat-opentype.dtx
+++ b/macros/unicodetex/latex/fontspec/fontspec-code-feat-opentype.dtx
diff --git a/macros/latex/contrib/fontspec/fontspec-code-fontload.dtx b/macros/unicodetex/latex/fontspec/fontspec-code-fontload.dtx
index ac403028e1..ac403028e1 100644
--- a/macros/latex/contrib/fontspec/fontspec-code-fontload.dtx
+++ b/macros/unicodetex/latex/fontspec/fontspec-code-fontload.dtx
diff --git a/macros/latex/contrib/fontspec/fontspec-code-graphite.dtx b/macros/unicodetex/latex/fontspec/fontspec-code-graphite.dtx
index c840d2af60..c840d2af60 100644
--- a/macros/latex/contrib/fontspec/fontspec-code-graphite.dtx
+++ b/macros/unicodetex/latex/fontspec/fontspec-code-graphite.dtx
diff --git a/macros/latex/contrib/fontspec/fontspec-code-interfaces.dtx b/macros/unicodetex/latex/fontspec/fontspec-code-interfaces.dtx
index b5c909fcfc..b5c909fcfc 100644
--- a/macros/latex/contrib/fontspec/fontspec-code-interfaces.dtx
+++ b/macros/unicodetex/latex/fontspec/fontspec-code-interfaces.dtx
diff --git a/macros/latex/contrib/fontspec/fontspec-code-internal.dtx b/macros/unicodetex/latex/fontspec/fontspec-code-internal.dtx
index 375fc7be2e..375fc7be2e 100644
--- a/macros/latex/contrib/fontspec/fontspec-code-internal.dtx
+++ b/macros/unicodetex/latex/fontspec/fontspec-code-internal.dtx
diff --git a/macros/latex/contrib/fontspec/fontspec-code-keyval.dtx b/macros/unicodetex/latex/fontspec/fontspec-code-keyval.dtx
index 87a93c176b..87a93c176b 100644
--- a/macros/latex/contrib/fontspec/fontspec-code-keyval.dtx
+++ b/macros/unicodetex/latex/fontspec/fontspec-code-keyval.dtx
diff --git a/macros/latex/contrib/fontspec/fontspec-code-lang.dtx b/macros/unicodetex/latex/fontspec/fontspec-code-lang.dtx
index f9ea7f6cd7..f9ea7f6cd7 100644
--- a/macros/latex/contrib/fontspec/fontspec-code-lang.dtx
+++ b/macros/unicodetex/latex/fontspec/fontspec-code-lang.dtx
diff --git a/macros/latex/contrib/fontspec/fontspec-code-load.dtx b/macros/unicodetex/latex/fontspec/fontspec-code-load.dtx
index 7d0501b89e..7d0501b89e 100644
--- a/macros/latex/contrib/fontspec/fontspec-code-load.dtx
+++ b/macros/unicodetex/latex/fontspec/fontspec-code-load.dtx
diff --git a/macros/latex/contrib/fontspec/fontspec-code-math.dtx b/macros/unicodetex/latex/fontspec/fontspec-code-math.dtx
index bbe70ef437..bbe70ef437 100644
--- a/macros/latex/contrib/fontspec/fontspec-code-math.dtx
+++ b/macros/unicodetex/latex/fontspec/fontspec-code-math.dtx
diff --git a/macros/latex/contrib/fontspec/fontspec-code-msg.dtx b/macros/unicodetex/latex/fontspec/fontspec-code-msg.dtx
index f23ec2d85f..f23ec2d85f 100644
--- a/macros/latex/contrib/fontspec/fontspec-code-msg.dtx
+++ b/macros/unicodetex/latex/fontspec/fontspec-code-msg.dtx
diff --git a/macros/latex/contrib/fontspec/fontspec-code-opening.dtx b/macros/unicodetex/latex/fontspec/fontspec-code-opening.dtx
index b8fb02e9e8..b8fb02e9e8 100644
--- a/macros/latex/contrib/fontspec/fontspec-code-opening.dtx
+++ b/macros/unicodetex/latex/fontspec/fontspec-code-opening.dtx
diff --git a/macros/latex/contrib/fontspec/fontspec-code-opentype.dtx b/macros/unicodetex/latex/fontspec/fontspec-code-opentype.dtx
index be0b8be768..be0b8be768 100644
--- a/macros/latex/contrib/fontspec/fontspec-code-opentype.dtx
+++ b/macros/unicodetex/latex/fontspec/fontspec-code-opentype.dtx
diff --git a/macros/latex/contrib/fontspec/fontspec-code-scripts.dtx b/macros/unicodetex/latex/fontspec/fontspec-code-scripts.dtx
index 32e861f566..32e861f566 100644
--- a/macros/latex/contrib/fontspec/fontspec-code-scripts.dtx
+++ b/macros/unicodetex/latex/fontspec/fontspec-code-scripts.dtx
diff --git a/macros/latex/contrib/fontspec/fontspec-code-user.dtx b/macros/unicodetex/latex/fontspec/fontspec-code-user.dtx
index a4a754d598..a4a754d598 100644
--- a/macros/latex/contrib/fontspec/fontspec-code-user.dtx
+++ b/macros/unicodetex/latex/fontspec/fontspec-code-user.dtx
diff --git a/macros/latex/contrib/fontspec/fontspec-code-vars.dtx b/macros/unicodetex/latex/fontspec/fontspec-code-vars.dtx
index 6350d24cc5..6350d24cc5 100644
--- a/macros/latex/contrib/fontspec/fontspec-code-vars.dtx
+++ b/macros/unicodetex/latex/fontspec/fontspec-code-vars.dtx
diff --git a/macros/latex/contrib/fontspec/fontspec-code-xfss.dtx b/macros/unicodetex/latex/fontspec/fontspec-code-xfss.dtx
index fef300a078..fef300a078 100644
--- a/macros/latex/contrib/fontspec/fontspec-code-xfss.dtx
+++ b/macros/unicodetex/latex/fontspec/fontspec-code-xfss.dtx
diff --git a/macros/latex/contrib/fontspec/fontspec-code.ltx b/macros/unicodetex/latex/fontspec/fontspec-code.ltx
index 1dcdea07cb..1dcdea07cb 100644
--- a/macros/latex/contrib/fontspec/fontspec-code.ltx
+++ b/macros/unicodetex/latex/fontspec/fontspec-code.ltx
diff --git a/macros/latex/contrib/fontspec/fontspec-code.pdf b/macros/unicodetex/latex/fontspec/fontspec-code.pdf
index 52d9e28cde..52d9e28cde 100644
--- a/macros/latex/contrib/fontspec/fontspec-code.pdf
+++ b/macros/unicodetex/latex/fontspec/fontspec-code.pdf
diff --git a/macros/latex/contrib/fontspec/fontspec-doc-api.tex b/macros/unicodetex/latex/fontspec/fontspec-doc-api.tex
index 3ef857e914..3ef857e914 100644
--- a/macros/latex/contrib/fontspec/fontspec-doc-api.tex
+++ b/macros/unicodetex/latex/fontspec/fontspec-doc-api.tex
diff --git a/macros/latex/contrib/fontspec/fontspec-doc-enc.tex b/macros/unicodetex/latex/fontspec/fontspec-doc-enc.tex
index 2a706a6252..2a706a6252 100644
--- a/macros/latex/contrib/fontspec/fontspec-doc-enc.tex
+++ b/macros/unicodetex/latex/fontspec/fontspec-doc-enc.tex
diff --git a/macros/latex/contrib/fontspec/fontspec-doc-featset.tex b/macros/unicodetex/latex/fontspec/fontspec-doc-featset.tex
index 90b1019561..90b1019561 100644
--- a/macros/latex/contrib/fontspec/fontspec-doc-featset.tex
+++ b/macros/unicodetex/latex/fontspec/fontspec-doc-featset.tex
diff --git a/macros/latex/contrib/fontspec/fontspec-doc-fontsel.tex b/macros/unicodetex/latex/fontspec/fontspec-doc-fontsel.tex
index 85ad1ea75d..85ad1ea75d 100644
--- a/macros/latex/contrib/fontspec/fontspec-doc-fontsel.tex
+++ b/macros/unicodetex/latex/fontspec/fontspec-doc-fontsel.tex
diff --git a/macros/latex/contrib/fontspec/fontspec-doc-intro.tex b/macros/unicodetex/latex/fontspec/fontspec-doc-intro.tex
index 7f32adb009..7f32adb009 100644
--- a/macros/latex/contrib/fontspec/fontspec-doc-intro.tex
+++ b/macros/unicodetex/latex/fontspec/fontspec-doc-intro.tex
diff --git a/macros/latex/contrib/fontspec/fontspec-doc-luatex.tex b/macros/unicodetex/latex/fontspec/fontspec-doc-luatex.tex
index 7365160b49..7365160b49 100644
--- a/macros/latex/contrib/fontspec/fontspec-doc-luatex.tex
+++ b/macros/unicodetex/latex/fontspec/fontspec-doc-luatex.tex
diff --git a/macros/latex/contrib/fontspec/fontspec-doc-opentype.tex b/macros/unicodetex/latex/fontspec/fontspec-doc-opentype.tex
index fb08645abb..fb08645abb 100644
--- a/macros/latex/contrib/fontspec/fontspec-doc-opentype.tex
+++ b/macros/unicodetex/latex/fontspec/fontspec-doc-opentype.tex
diff --git a/macros/latex/contrib/fontspec/fontspec-doc-style.sty b/macros/unicodetex/latex/fontspec/fontspec-doc-style.sty
index 751e7a150d..751e7a150d 100644
--- a/macros/latex/contrib/fontspec/fontspec-doc-style.sty
+++ b/macros/unicodetex/latex/fontspec/fontspec-doc-style.sty
diff --git a/macros/latex/contrib/fontspec/fontspec-doc-xetex.tex b/macros/unicodetex/latex/fontspec/fontspec-doc-xetex.tex
index 5c1e3e3e7d..5c1e3e3e7d 100644
--- a/macros/latex/contrib/fontspec/fontspec-doc-xetex.tex
+++ b/macros/unicodetex/latex/fontspec/fontspec-doc-xetex.tex
diff --git a/macros/latex/contrib/fontspec/fontspec-example.tex b/macros/unicodetex/latex/fontspec/fontspec-example.tex
index bf2831b134..bf2831b134 100644
--- a/macros/latex/contrib/fontspec/fontspec-example.tex
+++ b/macros/unicodetex/latex/fontspec/fontspec-example.tex
diff --git a/macros/latex/contrib/fontspec/fontspec-lua.dtx b/macros/unicodetex/latex/fontspec/fontspec-lua.dtx
index fdbe11e9d1..fdbe11e9d1 100644
--- a/macros/latex/contrib/fontspec/fontspec-lua.dtx
+++ b/macros/unicodetex/latex/fontspec/fontspec-lua.dtx
diff --git a/macros/latex/contrib/fontspec/fontspec.cfg b/macros/unicodetex/latex/fontspec/fontspec.cfg
index f7dbe9fc68..f7dbe9fc68 100644
--- a/macros/latex/contrib/fontspec/fontspec.cfg
+++ b/macros/unicodetex/latex/fontspec/fontspec.cfg
diff --git a/macros/latex/contrib/fontspec/fontspec.dtx b/macros/unicodetex/latex/fontspec/fontspec.dtx
index 5d07989465..5d07989465 100644
--- a/macros/latex/contrib/fontspec/fontspec.dtx
+++ b/macros/unicodetex/latex/fontspec/fontspec.dtx
diff --git a/macros/latex/contrib/fontspec/fontspec.ins b/macros/unicodetex/latex/fontspec/fontspec.ins
index adace502d2..adace502d2 100644
--- a/macros/latex/contrib/fontspec/fontspec.ins
+++ b/macros/unicodetex/latex/fontspec/fontspec.ins
diff --git a/macros/latex/contrib/fontspec/fontspec.ltx b/macros/unicodetex/latex/fontspec/fontspec.ltx
index b497948696..b497948696 100644
--- a/macros/latex/contrib/fontspec/fontspec.ltx
+++ b/macros/unicodetex/latex/fontspec/fontspec.ltx
diff --git a/macros/latex/contrib/fontspec/fontspec.pdf b/macros/unicodetex/latex/fontspec/fontspec.pdf
index 97e8a293a0..97e8a293a0 100644
--- a/macros/latex/contrib/fontspec/fontspec.pdf
+++ b/macros/unicodetex/latex/fontspec/fontspec.pdf
diff --git a/macros/luatex/latex/lilyglyphs/CHANGES.md b/macros/unicodetex/latex/lilyglyphs/CHANGES.md
index f99c28209e..f99c28209e 100644
--- a/macros/luatex/latex/lilyglyphs/CHANGES.md
+++ b/macros/unicodetex/latex/lilyglyphs/CHANGES.md
diff --git a/macros/luatex/latex/lilyglyphs/INSTALL b/macros/unicodetex/latex/lilyglyphs/INSTALL
index fcc757b722..fcc757b722 100644
--- a/macros/luatex/latex/lilyglyphs/INSTALL
+++ b/macros/unicodetex/latex/lilyglyphs/INSTALL
diff --git a/macros/luatex/latex/lilyglyphs/README b/macros/unicodetex/latex/lilyglyphs/README
index ce1bc35768..ce1bc35768 100644
--- a/macros/luatex/latex/lilyglyphs/README
+++ b/macros/unicodetex/latex/lilyglyphs/README
diff --git a/macros/luatex/latex/lilyglyphs/VERSION b/macros/unicodetex/latex/lilyglyphs/VERSION
index c202238f1b..c202238f1b 100644
--- a/macros/luatex/latex/lilyglyphs/VERSION
+++ b/macros/unicodetex/latex/lilyglyphs/VERSION
diff --git a/macros/luatex/latex/lilyglyphs/documentation/lilyglyphs-example-400.png b/macros/unicodetex/latex/lilyglyphs/documentation/lilyglyphs-example-400.png
index 6c0228629d..6c0228629d 100644
--- a/macros/luatex/latex/lilyglyphs/documentation/lilyglyphs-example-400.png
+++ b/macros/unicodetex/latex/lilyglyphs/documentation/lilyglyphs-example-400.png
diff --git a/macros/luatex/latex/lilyglyphs/documentation/lilyglyphs-example-600.png b/macros/unicodetex/latex/lilyglyphs/documentation/lilyglyphs-example-600.png
index d524ca3b0f..d524ca3b0f 100644
--- a/macros/luatex/latex/lilyglyphs/documentation/lilyglyphs-example-600.png
+++ b/macros/unicodetex/latex/lilyglyphs/documentation/lilyglyphs-example-600.png
diff --git a/macros/luatex/latex/lilyglyphs/documentation/lilyglyphs-example-de.pdf b/macros/unicodetex/latex/lilyglyphs/documentation/lilyglyphs-example-de.pdf
index a50d91876f..a50d91876f 100644
--- a/macros/luatex/latex/lilyglyphs/documentation/lilyglyphs-example-de.pdf
+++ b/macros/unicodetex/latex/lilyglyphs/documentation/lilyglyphs-example-de.pdf
diff --git a/macros/luatex/latex/lilyglyphs/documentation/lilyglyphs-example-de.tex b/macros/unicodetex/latex/lilyglyphs/documentation/lilyglyphs-example-de.tex
index 07f63a33bf..07f63a33bf 100644
--- a/macros/luatex/latex/lilyglyphs/documentation/lilyglyphs-example-de.tex
+++ b/macros/unicodetex/latex/lilyglyphs/documentation/lilyglyphs-example-de.tex
diff --git a/macros/luatex/latex/lilyglyphs/documentation/lilyglyphs-example.pdf b/macros/unicodetex/latex/lilyglyphs/documentation/lilyglyphs-example.pdf
index 6a36397d37..6a36397d37 100644
--- a/macros/luatex/latex/lilyglyphs/documentation/lilyglyphs-example.pdf
+++ b/macros/unicodetex/latex/lilyglyphs/documentation/lilyglyphs-example.pdf
diff --git a/macros/luatex/latex/lilyglyphs/documentation/lilyglyphs-example.png b/macros/unicodetex/latex/lilyglyphs/documentation/lilyglyphs-example.png
index bf668e9a8d..bf668e9a8d 100644
--- a/macros/luatex/latex/lilyglyphs/documentation/lilyglyphs-example.png
+++ b/macros/unicodetex/latex/lilyglyphs/documentation/lilyglyphs-example.png
diff --git a/macros/luatex/latex/lilyglyphs/documentation/lilyglyphs-example.tex b/macros/unicodetex/latex/lilyglyphs/documentation/lilyglyphs-example.tex
index 4761593809..4761593809 100644
--- a/macros/luatex/latex/lilyglyphs/documentation/lilyglyphs-example.tex
+++ b/macros/unicodetex/latex/lilyglyphs/documentation/lilyglyphs-example.tex
diff --git a/macros/luatex/latex/lilyglyphs/documentation/lilyglyphs.pdf b/macros/unicodetex/latex/lilyglyphs/documentation/lilyglyphs.pdf
index c73d2be2e3..c73d2be2e3 100644
--- a/macros/luatex/latex/lilyglyphs/documentation/lilyglyphs.pdf
+++ b/macros/unicodetex/latex/lilyglyphs/documentation/lilyglyphs.pdf
diff --git a/macros/luatex/latex/lilyglyphs/documentation/lilyglyphs.tex b/macros/unicodetex/latex/lilyglyphs/documentation/lilyglyphs.tex
index 078aae2a88..078aae2a88 100644
--- a/macros/luatex/latex/lilyglyphs/documentation/lilyglyphs.tex
+++ b/macros/unicodetex/latex/lilyglyphs/documentation/lilyglyphs.tex
diff --git a/macros/luatex/latex/lilyglyphs/documentation/lilyglyphs_logo/lilyglyphs_logo.pdf b/macros/unicodetex/latex/lilyglyphs/documentation/lilyglyphs_logo/lilyglyphs_logo.pdf
index 00f399ac2e..00f399ac2e 100644
--- a/macros/luatex/latex/lilyglyphs/documentation/lilyglyphs_logo/lilyglyphs_logo.pdf
+++ b/macros/unicodetex/latex/lilyglyphs/documentation/lilyglyphs_logo/lilyglyphs_logo.pdf
diff --git a/macros/luatex/latex/lilyglyphs/documentation/lilyglyphs_logo/lilyglyphs_logo.png b/macros/unicodetex/latex/lilyglyphs/documentation/lilyglyphs_logo/lilyglyphs_logo.png
index 84fb0770be..84fb0770be 100644
--- a/macros/luatex/latex/lilyglyphs/documentation/lilyglyphs_logo/lilyglyphs_logo.png
+++ b/macros/unicodetex/latex/lilyglyphs/documentation/lilyglyphs_logo/lilyglyphs_logo.png
diff --git a/macros/luatex/latex/lilyglyphs/documentation/lilyglyphs_logo/lilyglyphs_logo.tex b/macros/unicodetex/latex/lilyglyphs/documentation/lilyglyphs_logo/lilyglyphs_logo.tex
index 8186f7c9d3..8186f7c9d3 100644
--- a/macros/luatex/latex/lilyglyphs/documentation/lilyglyphs_logo/lilyglyphs_logo.tex
+++ b/macros/unicodetex/latex/lilyglyphs/documentation/lilyglyphs_logo/lilyglyphs_logo.tex
diff --git a/macros/luatex/latex/lilyglyphs/documentation/resources/lily-088c978c.png b/macros/unicodetex/latex/lilyglyphs/documentation/resources/lily-088c978c.png
index 6e4a5e68e4..6e4a5e68e4 100644
--- a/macros/luatex/latex/lilyglyphs/documentation/resources/lily-088c978c.png
+++ b/macros/unicodetex/latex/lilyglyphs/documentation/resources/lily-088c978c.png
diff --git a/macros/luatex/latex/lilyglyphs/documentation/resources/lily-1981c3c7.png b/macros/unicodetex/latex/lilyglyphs/documentation/resources/lily-1981c3c7.png
index 6ff4d13129..6ff4d13129 100644
--- a/macros/luatex/latex/lilyglyphs/documentation/resources/lily-1981c3c7.png
+++ b/macros/unicodetex/latex/lilyglyphs/documentation/resources/lily-1981c3c7.png
diff --git a/macros/luatex/latex/lilyglyphs/documentation/resources/lily-20e8632d.png b/macros/unicodetex/latex/lilyglyphs/documentation/resources/lily-20e8632d.png
index 9d8a0acab1..9d8a0acab1 100644
--- a/macros/luatex/latex/lilyglyphs/documentation/resources/lily-20e8632d.png
+++ b/macros/unicodetex/latex/lilyglyphs/documentation/resources/lily-20e8632d.png
diff --git a/macros/luatex/latex/lilyglyphs/documentation/resources/lily-2abb8a04.png b/macros/unicodetex/latex/lilyglyphs/documentation/resources/lily-2abb8a04.png
index 3ce8d17b35..3ce8d17b35 100644
--- a/macros/luatex/latex/lilyglyphs/documentation/resources/lily-2abb8a04.png
+++ b/macros/unicodetex/latex/lilyglyphs/documentation/resources/lily-2abb8a04.png
diff --git a/macros/luatex/latex/lilyglyphs/documentation/resources/lily-2be182be.png b/macros/unicodetex/latex/lilyglyphs/documentation/resources/lily-2be182be.png
index ef5b6e07c7..ef5b6e07c7 100644
--- a/macros/luatex/latex/lilyglyphs/documentation/resources/lily-2be182be.png
+++ b/macros/unicodetex/latex/lilyglyphs/documentation/resources/lily-2be182be.png
diff --git a/macros/luatex/latex/lilyglyphs/documentation/resources/lily-3b47d3fe.png b/macros/unicodetex/latex/lilyglyphs/documentation/resources/lily-3b47d3fe.png
index 130d1b161b..130d1b161b 100644
--- a/macros/luatex/latex/lilyglyphs/documentation/resources/lily-3b47d3fe.png
+++ b/macros/unicodetex/latex/lilyglyphs/documentation/resources/lily-3b47d3fe.png
diff --git a/macros/luatex/latex/lilyglyphs/documentation/resources/lily-3f4afecc.png b/macros/unicodetex/latex/lilyglyphs/documentation/resources/lily-3f4afecc.png
index be58e46305..be58e46305 100644
--- a/macros/luatex/latex/lilyglyphs/documentation/resources/lily-3f4afecc.png
+++ b/macros/unicodetex/latex/lilyglyphs/documentation/resources/lily-3f4afecc.png
diff --git a/macros/luatex/latex/lilyglyphs/documentation/resources/lily-40869867.png b/macros/unicodetex/latex/lilyglyphs/documentation/resources/lily-40869867.png
index 2f149b1d89..2f149b1d89 100644
--- a/macros/luatex/latex/lilyglyphs/documentation/resources/lily-40869867.png
+++ b/macros/unicodetex/latex/lilyglyphs/documentation/resources/lily-40869867.png
diff --git a/macros/luatex/latex/lilyglyphs/documentation/resources/lily-5b13ce04.png b/macros/unicodetex/latex/lilyglyphs/documentation/resources/lily-5b13ce04.png
index 7feeee464a..7feeee464a 100644
--- a/macros/luatex/latex/lilyglyphs/documentation/resources/lily-5b13ce04.png
+++ b/macros/unicodetex/latex/lilyglyphs/documentation/resources/lily-5b13ce04.png
diff --git a/macros/luatex/latex/lilyglyphs/documentation/resources/lily-5c91a201.png b/macros/unicodetex/latex/lilyglyphs/documentation/resources/lily-5c91a201.png
index bd3d3b8664..bd3d3b8664 100644
--- a/macros/luatex/latex/lilyglyphs/documentation/resources/lily-5c91a201.png
+++ b/macros/unicodetex/latex/lilyglyphs/documentation/resources/lily-5c91a201.png
diff --git a/macros/luatex/latex/lilyglyphs/documentation/resources/lily-707477b7.png b/macros/unicodetex/latex/lilyglyphs/documentation/resources/lily-707477b7.png
index b55caf19d7..b55caf19d7 100644
--- a/macros/luatex/latex/lilyglyphs/documentation/resources/lily-707477b7.png
+++ b/macros/unicodetex/latex/lilyglyphs/documentation/resources/lily-707477b7.png
diff --git a/macros/luatex/latex/lilyglyphs/documentation/resources/lily-76dbcd67.png b/macros/unicodetex/latex/lilyglyphs/documentation/resources/lily-76dbcd67.png
index 3c90e65b86..3c90e65b86 100644
--- a/macros/luatex/latex/lilyglyphs/documentation/resources/lily-76dbcd67.png
+++ b/macros/unicodetex/latex/lilyglyphs/documentation/resources/lily-76dbcd67.png
diff --git a/macros/luatex/latex/lilyglyphs/documentation/resources/lily-7fd84ff8.png b/macros/unicodetex/latex/lilyglyphs/documentation/resources/lily-7fd84ff8.png
index dff2d3596e..dff2d3596e 100644
--- a/macros/luatex/latex/lilyglyphs/documentation/resources/lily-7fd84ff8.png
+++ b/macros/unicodetex/latex/lilyglyphs/documentation/resources/lily-7fd84ff8.png
diff --git a/macros/luatex/latex/lilyglyphs/documentation/resources/lily-8155deab.png b/macros/unicodetex/latex/lilyglyphs/documentation/resources/lily-8155deab.png
index b8d8775d60..b8d8775d60 100644
--- a/macros/luatex/latex/lilyglyphs/documentation/resources/lily-8155deab.png
+++ b/macros/unicodetex/latex/lilyglyphs/documentation/resources/lily-8155deab.png
diff --git a/macros/luatex/latex/lilyglyphs/documentation/resources/lily-8b332c94.png b/macros/unicodetex/latex/lilyglyphs/documentation/resources/lily-8b332c94.png
index 969abdd8f3..969abdd8f3 100644
--- a/macros/luatex/latex/lilyglyphs/documentation/resources/lily-8b332c94.png
+++ b/macros/unicodetex/latex/lilyglyphs/documentation/resources/lily-8b332c94.png
diff --git a/macros/luatex/latex/lilyglyphs/documentation/resources/lily-8d82df0c.png b/macros/unicodetex/latex/lilyglyphs/documentation/resources/lily-8d82df0c.png
index 67a96d63ad..67a96d63ad 100644
--- a/macros/luatex/latex/lilyglyphs/documentation/resources/lily-8d82df0c.png
+++ b/macros/unicodetex/latex/lilyglyphs/documentation/resources/lily-8d82df0c.png
diff --git a/macros/luatex/latex/lilyglyphs/documentation/resources/lily-8d8bb8a3.png b/macros/unicodetex/latex/lilyglyphs/documentation/resources/lily-8d8bb8a3.png
index 2fbbaab19b..2fbbaab19b 100644
--- a/macros/luatex/latex/lilyglyphs/documentation/resources/lily-8d8bb8a3.png
+++ b/macros/unicodetex/latex/lilyglyphs/documentation/resources/lily-8d8bb8a3.png
diff --git a/macros/luatex/latex/lilyglyphs/documentation/resources/lily-907bc72d.png b/macros/unicodetex/latex/lilyglyphs/documentation/resources/lily-907bc72d.png
index 8b75a51946..8b75a51946 100644
--- a/macros/luatex/latex/lilyglyphs/documentation/resources/lily-907bc72d.png
+++ b/macros/unicodetex/latex/lilyglyphs/documentation/resources/lily-907bc72d.png
diff --git a/macros/luatex/latex/lilyglyphs/documentation/resources/lily-a2bf82dd.png b/macros/unicodetex/latex/lilyglyphs/documentation/resources/lily-a2bf82dd.png
index b26e80a272..b26e80a272 100644
--- a/macros/luatex/latex/lilyglyphs/documentation/resources/lily-a2bf82dd.png
+++ b/macros/unicodetex/latex/lilyglyphs/documentation/resources/lily-a2bf82dd.png
diff --git a/macros/luatex/latex/lilyglyphs/documentation/resources/lily-ae3fd948.png b/macros/unicodetex/latex/lilyglyphs/documentation/resources/lily-ae3fd948.png
index 3f802d4363..3f802d4363 100644
--- a/macros/luatex/latex/lilyglyphs/documentation/resources/lily-ae3fd948.png
+++ b/macros/unicodetex/latex/lilyglyphs/documentation/resources/lily-ae3fd948.png
diff --git a/macros/luatex/latex/lilyglyphs/documentation/resources/lily-b3dc0958.png b/macros/unicodetex/latex/lilyglyphs/documentation/resources/lily-b3dc0958.png
index d21b581033..d21b581033 100644
--- a/macros/luatex/latex/lilyglyphs/documentation/resources/lily-b3dc0958.png
+++ b/macros/unicodetex/latex/lilyglyphs/documentation/resources/lily-b3dc0958.png
diff --git a/macros/luatex/latex/lilyglyphs/documentation/resources/lily-b69af986.png b/macros/unicodetex/latex/lilyglyphs/documentation/resources/lily-b69af986.png
index 631f9de6f2..631f9de6f2 100644
--- a/macros/luatex/latex/lilyglyphs/documentation/resources/lily-b69af986.png
+++ b/macros/unicodetex/latex/lilyglyphs/documentation/resources/lily-b69af986.png
diff --git a/macros/luatex/latex/lilyglyphs/documentation/resources/lily-d9988a2c.png b/macros/unicodetex/latex/lilyglyphs/documentation/resources/lily-d9988a2c.png
index 03e03c0acc..03e03c0acc 100644
--- a/macros/luatex/latex/lilyglyphs/documentation/resources/lily-d9988a2c.png
+++ b/macros/unicodetex/latex/lilyglyphs/documentation/resources/lily-d9988a2c.png
diff --git a/macros/luatex/latex/lilyglyphs/documentation/resources/lily-dffaecd2.png b/macros/unicodetex/latex/lilyglyphs/documentation/resources/lily-dffaecd2.png
index 4d70851eb0..4d70851eb0 100644
--- a/macros/luatex/latex/lilyglyphs/documentation/resources/lily-dffaecd2.png
+++ b/macros/unicodetex/latex/lilyglyphs/documentation/resources/lily-dffaecd2.png
diff --git a/macros/luatex/latex/lilyglyphs/documentation/resources/lily-f4d0afc9.png b/macros/unicodetex/latex/lilyglyphs/documentation/resources/lily-f4d0afc9.png
index 8ba90ae872..8ba90ae872 100644
--- a/macros/luatex/latex/lilyglyphs/documentation/resources/lily-f4d0afc9.png
+++ b/macros/unicodetex/latex/lilyglyphs/documentation/resources/lily-f4d0afc9.png
diff --git a/macros/luatex/latex/lilyglyphs/documentation/resources/lilyglyphsManualFonts.sty b/macros/unicodetex/latex/lilyglyphs/documentation/resources/lilyglyphsManualFonts.sty
index f91ca70a0d..f91ca70a0d 100644
--- a/macros/luatex/latex/lilyglyphs/documentation/resources/lilyglyphsManualFonts.sty
+++ b/macros/unicodetex/latex/lilyglyphs/documentation/resources/lilyglyphsManualFonts.sty
diff --git a/macros/luatex/latex/lilyglyphs/documentation/resources/lilyglyphsStyle.sty b/macros/unicodetex/latex/lilyglyphs/documentation/resources/lilyglyphsStyle.sty
index bff6ad1c84..bff6ad1c84 100644
--- a/macros/luatex/latex/lilyglyphs/documentation/resources/lilyglyphsStyle.sty
+++ b/macros/unicodetex/latex/lilyglyphs/documentation/resources/lilyglyphsStyle.sty
diff --git a/macros/luatex/latex/lilyglyphs/documentation/resources/lilypond-manuals.css b/macros/unicodetex/latex/lilyglyphs/documentation/resources/lilypond-manuals.css
index 0da009ed24..0da009ed24 100644
--- a/macros/luatex/latex/lilyglyphs/documentation/resources/lilypond-manuals.css
+++ b/macros/unicodetex/latex/lilyglyphs/documentation/resources/lilypond-manuals.css
diff --git a/macros/luatex/latex/lilyglyphs/documentation/the-feta-font-2-18-0.html b/macros/unicodetex/latex/lilyglyphs/documentation/the-feta-font-2-18-0.html
index 4d3fbe2f4b..4d3fbe2f4b 100644
--- a/macros/luatex/latex/lilyglyphs/documentation/the-feta-font-2-18-0.html
+++ b/macros/unicodetex/latex/lilyglyphs/documentation/the-feta-font-2-18-0.html
diff --git a/macros/luatex/latex/lilyglyphs/fonts/FONTLOG b/macros/unicodetex/latex/lilyglyphs/fonts/FONTLOG
index 1c423c35df..1c423c35df 100644
--- a/macros/luatex/latex/lilyglyphs/fonts/FONTLOG
+++ b/macros/unicodetex/latex/lilyglyphs/fonts/FONTLOG
diff --git a/macros/luatex/latex/lilyglyphs/fonts/LICENSE.OFL b/macros/unicodetex/latex/lilyglyphs/fonts/LICENSE.OFL
index 41e80d6039..41e80d6039 100644
--- a/macros/luatex/latex/lilyglyphs/fonts/LICENSE.OFL
+++ b/macros/unicodetex/latex/lilyglyphs/fonts/LICENSE.OFL
diff --git a/macros/luatex/latex/lilyglyphs/fonts/emmentaler-11.otf b/macros/unicodetex/latex/lilyglyphs/fonts/emmentaler-11.otf
index b749fe4b68..b749fe4b68 100644
--- a/macros/luatex/latex/lilyglyphs/fonts/emmentaler-11.otf
+++ b/macros/unicodetex/latex/lilyglyphs/fonts/emmentaler-11.otf
diff --git a/macros/luatex/latex/lilyglyphs/fonts/emmentaler-13.otf b/macros/unicodetex/latex/lilyglyphs/fonts/emmentaler-13.otf
index da5a686cbf..da5a686cbf 100644
--- a/macros/luatex/latex/lilyglyphs/fonts/emmentaler-13.otf
+++ b/macros/unicodetex/latex/lilyglyphs/fonts/emmentaler-13.otf
diff --git a/macros/luatex/latex/lilyglyphs/fonts/emmentaler-14.otf b/macros/unicodetex/latex/lilyglyphs/fonts/emmentaler-14.otf
index c8bf9e71d8..c8bf9e71d8 100644
--- a/macros/luatex/latex/lilyglyphs/fonts/emmentaler-14.otf
+++ b/macros/unicodetex/latex/lilyglyphs/fonts/emmentaler-14.otf
diff --git a/macros/luatex/latex/lilyglyphs/fonts/emmentaler-16.otf b/macros/unicodetex/latex/lilyglyphs/fonts/emmentaler-16.otf
index 1ed1212fa0..1ed1212fa0 100644
--- a/macros/luatex/latex/lilyglyphs/fonts/emmentaler-16.otf
+++ b/macros/unicodetex/latex/lilyglyphs/fonts/emmentaler-16.otf
diff --git a/macros/luatex/latex/lilyglyphs/fonts/emmentaler-18.otf b/macros/unicodetex/latex/lilyglyphs/fonts/emmentaler-18.otf
index bad36f2f5c..bad36f2f5c 100644
--- a/macros/luatex/latex/lilyglyphs/fonts/emmentaler-18.otf
+++ b/macros/unicodetex/latex/lilyglyphs/fonts/emmentaler-18.otf
diff --git a/macros/luatex/latex/lilyglyphs/fonts/emmentaler-20.otf b/macros/unicodetex/latex/lilyglyphs/fonts/emmentaler-20.otf
index 07ce75c902..07ce75c902 100644
--- a/macros/luatex/latex/lilyglyphs/fonts/emmentaler-20.otf
+++ b/macros/unicodetex/latex/lilyglyphs/fonts/emmentaler-20.otf
diff --git a/macros/luatex/latex/lilyglyphs/fonts/emmentaler-23.otf b/macros/unicodetex/latex/lilyglyphs/fonts/emmentaler-23.otf
index d7597ddb13..d7597ddb13 100644
--- a/macros/luatex/latex/lilyglyphs/fonts/emmentaler-23.otf
+++ b/macros/unicodetex/latex/lilyglyphs/fonts/emmentaler-23.otf
diff --git a/macros/luatex/latex/lilyglyphs/fonts/emmentaler-26.otf b/macros/unicodetex/latex/lilyglyphs/fonts/emmentaler-26.otf
index df5c42ea81..df5c42ea81 100644
--- a/macros/luatex/latex/lilyglyphs/fonts/emmentaler-26.otf
+++ b/macros/unicodetex/latex/lilyglyphs/fonts/emmentaler-26.otf
diff --git a/macros/luatex/latex/lilyglyphs/fonts/emmentaler-brace.otf b/macros/unicodetex/latex/lilyglyphs/fonts/emmentaler-brace.otf
index c850072863..c850072863 100644
--- a/macros/luatex/latex/lilyglyphs/fonts/emmentaler-brace.otf
+++ b/macros/unicodetex/latex/lilyglyphs/fonts/emmentaler-brace.otf
diff --git a/macros/luatex/latex/lilyglyphs/license/COPYING.LPPL b/macros/unicodetex/latex/lilyglyphs/license/COPYING.LPPL
index f24b18cd79..f24b18cd79 100644
--- a/macros/luatex/latex/lilyglyphs/license/COPYING.LPPL
+++ b/macros/unicodetex/latex/lilyglyphs/license/COPYING.LPPL
diff --git a/macros/luatex/latex/lilyglyphs/license/MANIFEST b/macros/unicodetex/latex/lilyglyphs/license/MANIFEST
index 8b9030f086..8b9030f086 100644
--- a/macros/luatex/latex/lilyglyphs/license/MANIFEST
+++ b/macros/unicodetex/latex/lilyglyphs/license/MANIFEST
diff --git a/macros/luatex/latex/lilyglyphs/license/license-preamble.inp b/macros/unicodetex/latex/lilyglyphs/license/license-preamble.inp
index 9e3b129dba..9e3b129dba 100644
--- a/macros/luatex/latex/lilyglyphs/license/license-preamble.inp
+++ b/macros/unicodetex/latex/lilyglyphs/license/license-preamble.inp
diff --git a/macros/luatex/latex/lilyglyphs/scripts/README-scripts b/macros/unicodetex/latex/lilyglyphs/scripts/README-scripts
index a05dd12651..a05dd12651 100644
--- a/macros/luatex/latex/lilyglyphs/scripts/README-scripts
+++ b/macros/unicodetex/latex/lilyglyphs/scripts/README-scripts
diff --git a/macros/luatex/latex/lilyglyphs/scripts/lily-glyph-commands.py b/macros/unicodetex/latex/lilyglyphs/scripts/lily-glyph-commands.py
index 691652ece6..691652ece6 100755
--- a/macros/luatex/latex/lilyglyphs/scripts/lily-glyph-commands.py
+++ b/macros/unicodetex/latex/lilyglyphs/scripts/lily-glyph-commands.py
diff --git a/macros/luatex/latex/lilyglyphs/scripts/lily-image-commands.py b/macros/unicodetex/latex/lilyglyphs/scripts/lily-image-commands.py
index fce67ad53c..fce67ad53c 100755
--- a/macros/luatex/latex/lilyglyphs/scripts/lily-image-commands.py
+++ b/macros/unicodetex/latex/lilyglyphs/scripts/lily-image-commands.py
diff --git a/macros/luatex/latex/lilyglyphs/scripts/lily-rebuild-pdfs.py b/macros/unicodetex/latex/lilyglyphs/scripts/lily-rebuild-pdfs.py
index b74ab26c6b..b74ab26c6b 100755
--- a/macros/luatex/latex/lilyglyphs/scripts/lily-rebuild-pdfs.py
+++ b/macros/unicodetex/latex/lilyglyphs/scripts/lily-rebuild-pdfs.py
diff --git a/macros/luatex/latex/lilyglyphs/scripts/lilyglyphs_common.py b/macros/unicodetex/latex/lilyglyphs/scripts/lilyglyphs_common.py
index 92a2c023c9..92a2c023c9 100644
--- a/macros/luatex/latex/lilyglyphs/scripts/lilyglyphs_common.py
+++ b/macros/unicodetex/latex/lilyglyphs/scripts/lilyglyphs_common.py
diff --git a/macros/luatex/latex/lilyglyphs/source/fonts/README-emmentaler b/macros/unicodetex/latex/lilyglyphs/source/fonts/README-emmentaler
index 4208f11aa0..4208f11aa0 100644
--- a/macros/luatex/latex/lilyglyphs/source/fonts/README-emmentaler
+++ b/macros/unicodetex/latex/lilyglyphs/source/fonts/README-emmentaler
diff --git a/macros/luatex/latex/lilyglyphs/source/glyphimages/definitions/_template.ly b/macros/unicodetex/latex/lilyglyphs/source/glyphimages/definitions/_template.ly
index 2854b4ed7d..2854b4ed7d 100644
--- a/macros/luatex/latex/lilyglyphs/source/glyphimages/definitions/_template.ly
+++ b/macros/unicodetex/latex/lilyglyphs/source/glyphimages/definitions/_template.ly
diff --git a/macros/luatex/latex/lilyglyphs/source/glyphimages/definitions/beamednotes.ly b/macros/unicodetex/latex/lilyglyphs/source/glyphimages/definitions/beamednotes.ly
index 1175c8c203..1175c8c203 100644
--- a/macros/luatex/latex/lilyglyphs/source/glyphimages/definitions/beamednotes.ly
+++ b/macros/unicodetex/latex/lilyglyphs/source/glyphimages/definitions/beamednotes.ly
diff --git a/macros/luatex/latex/lilyglyphs/source/glyphimages/definitions/dynamicsigns.ly b/macros/unicodetex/latex/lilyglyphs/source/glyphimages/definitions/dynamicsigns.ly
index f9a8e66d0f..f9a8e66d0f 100644
--- a/macros/luatex/latex/lilyglyphs/source/glyphimages/definitions/dynamicsigns.ly
+++ b/macros/unicodetex/latex/lilyglyphs/source/glyphimages/definitions/dynamicsigns.ly
diff --git a/macros/luatex/latex/lilyglyphs/source/glyphimages/definitions/fancyexamples.ly b/macros/unicodetex/latex/lilyglyphs/source/glyphimages/definitions/fancyexamples.ly
index 2479478563..2479478563 100644
--- a/macros/luatex/latex/lilyglyphs/source/glyphimages/definitions/fancyexamples.ly
+++ b/macros/unicodetex/latex/lilyglyphs/source/glyphimages/definitions/fancyexamples.ly
diff --git a/macros/luatex/latex/lilyglyphs/source/glyphimages/definitions/score.ily b/macros/unicodetex/latex/lilyglyphs/source/glyphimages/definitions/score.ily
index a61c465e68..a61c465e68 100644
--- a/macros/luatex/latex/lilyglyphs/source/glyphimages/definitions/score.ily
+++ b/macros/unicodetex/latex/lilyglyphs/source/glyphimages/definitions/score.ily
diff --git a/macros/luatex/latex/lilyglyphs/source/glyphimages/definitions/singlenotes.ly b/macros/unicodetex/latex/lilyglyphs/source/glyphimages/definitions/singlenotes.ly
index dc239da35d..dc239da35d 100644
--- a/macros/luatex/latex/lilyglyphs/source/glyphimages/definitions/singlenotes.ly
+++ b/macros/unicodetex/latex/lilyglyphs/source/glyphimages/definitions/singlenotes.ly
diff --git a/macros/luatex/latex/lilyglyphs/source/glyphimages/definitions/singlenotes.pdf b/macros/unicodetex/latex/lilyglyphs/source/glyphimages/definitions/singlenotes.pdf
index c44e140145..c44e140145 100644
--- a/macros/luatex/latex/lilyglyphs/source/glyphimages/definitions/singlenotes.pdf
+++ b/macros/unicodetex/latex/lilyglyphs/source/glyphimages/definitions/singlenotes.pdf
diff --git a/macros/luatex/latex/lilyglyphs/source/glyphimages/generated_src/lily-crescHairpin.ly b/macros/unicodetex/latex/lilyglyphs/source/glyphimages/generated_src/lily-crescHairpin.ly
index cecaf8f6ee..cecaf8f6ee 100644
--- a/macros/luatex/latex/lilyglyphs/source/glyphimages/generated_src/lily-crescHairpin.ly
+++ b/macros/unicodetex/latex/lilyglyphs/source/glyphimages/generated_src/lily-crescHairpin.ly
diff --git a/macros/luatex/latex/lilyglyphs/source/glyphimages/generated_src/lily-crotchet.ly b/macros/unicodetex/latex/lilyglyphs/source/glyphimages/generated_src/lily-crotchet.ly
index 1ecec3a380..1ecec3a380 100644
--- a/macros/luatex/latex/lilyglyphs/source/glyphimages/generated_src/lily-crotchet.ly
+++ b/macros/unicodetex/latex/lilyglyphs/source/glyphimages/generated_src/lily-crotchet.ly
diff --git a/macros/luatex/latex/lilyglyphs/source/glyphimages/generated_src/lily-crotchetDotted.ly b/macros/unicodetex/latex/lilyglyphs/source/glyphimages/generated_src/lily-crotchetDotted.ly
index 53412ee6db..53412ee6db 100644
--- a/macros/luatex/latex/lilyglyphs/source/glyphimages/generated_src/lily-crotchetDotted.ly
+++ b/macros/unicodetex/latex/lilyglyphs/source/glyphimages/generated_src/lily-crotchetDotted.ly
diff --git a/macros/luatex/latex/lilyglyphs/source/glyphimages/generated_src/lily-crotchetDottedDouble.ly b/macros/unicodetex/latex/lilyglyphs/source/glyphimages/generated_src/lily-crotchetDottedDouble.ly
index e3ac2e02c9..e3ac2e02c9 100644
--- a/macros/luatex/latex/lilyglyphs/source/glyphimages/generated_src/lily-crotchetDottedDouble.ly
+++ b/macros/unicodetex/latex/lilyglyphs/source/glyphimages/generated_src/lily-crotchetDottedDouble.ly
diff --git a/macros/luatex/latex/lilyglyphs/source/glyphimages/generated_src/lily-crotchetDottedDoubleDown.ly b/macros/unicodetex/latex/lilyglyphs/source/glyphimages/generated_src/lily-crotchetDottedDoubleDown.ly
index eed0a26613..eed0a26613 100644
--- a/macros/luatex/latex/lilyglyphs/source/glyphimages/generated_src/lily-crotchetDottedDoubleDown.ly
+++ b/macros/unicodetex/latex/lilyglyphs/source/glyphimages/generated_src/lily-crotchetDottedDoubleDown.ly
diff --git a/macros/luatex/latex/lilyglyphs/source/glyphimages/generated_src/lily-crotchetDottedDown.ly b/macros/unicodetex/latex/lilyglyphs/source/glyphimages/generated_src/lily-crotchetDottedDown.ly
index 41282b207a..41282b207a 100644
--- a/macros/luatex/latex/lilyglyphs/source/glyphimages/generated_src/lily-crotchetDottedDown.ly
+++ b/macros/unicodetex/latex/lilyglyphs/source/glyphimages/generated_src/lily-crotchetDottedDown.ly
diff --git a/macros/luatex/latex/lilyglyphs/source/glyphimages/generated_src/lily-crotchetDown.ly b/macros/unicodetex/latex/lilyglyphs/source/glyphimages/generated_src/lily-crotchetDown.ly
index 2538434dd7..2538434dd7 100644
--- a/macros/luatex/latex/lilyglyphs/source/glyphimages/generated_src/lily-crotchetDown.ly
+++ b/macros/unicodetex/latex/lilyglyphs/source/glyphimages/generated_src/lily-crotchetDown.ly
diff --git a/macros/luatex/latex/lilyglyphs/source/glyphimages/generated_src/lily-decrescHairpin.ly b/macros/unicodetex/latex/lilyglyphs/source/glyphimages/generated_src/lily-decrescHairpin.ly
index 65cfa7fc4c..65cfa7fc4c 100644
--- a/macros/luatex/latex/lilyglyphs/source/glyphimages/generated_src/lily-decrescHairpin.ly
+++ b/macros/unicodetex/latex/lilyglyphs/source/glyphimages/generated_src/lily-decrescHairpin.ly
diff --git a/macros/luatex/latex/lilyglyphs/source/glyphimages/generated_src/lily-demisemiquaver.ly b/macros/unicodetex/latex/lilyglyphs/source/glyphimages/generated_src/lily-demisemiquaver.ly
index 209e4accdc..209e4accdc 100644
--- a/macros/luatex/latex/lilyglyphs/source/glyphimages/generated_src/lily-demisemiquaver.ly
+++ b/macros/unicodetex/latex/lilyglyphs/source/glyphimages/generated_src/lily-demisemiquaver.ly
diff --git a/macros/luatex/latex/lilyglyphs/source/glyphimages/generated_src/lily-demisemiquaverDotted.ly b/macros/unicodetex/latex/lilyglyphs/source/glyphimages/generated_src/lily-demisemiquaverDotted.ly
index 4eeddda1f2..4eeddda1f2 100644
--- a/macros/luatex/latex/lilyglyphs/source/glyphimages/generated_src/lily-demisemiquaverDotted.ly
+++ b/macros/unicodetex/latex/lilyglyphs/source/glyphimages/generated_src/lily-demisemiquaverDotted.ly
diff --git a/macros/luatex/latex/lilyglyphs/source/glyphimages/generated_src/lily-demisemiquaverDottedDouble.ly b/macros/unicodetex/latex/lilyglyphs/source/glyphimages/generated_src/lily-demisemiquaverDottedDouble.ly
index 58449d8ebf..58449d8ebf 100644
--- a/macros/luatex/latex/lilyglyphs/source/glyphimages/generated_src/lily-demisemiquaverDottedDouble.ly
+++ b/macros/unicodetex/latex/lilyglyphs/source/glyphimages/generated_src/lily-demisemiquaverDottedDouble.ly
diff --git a/macros/luatex/latex/lilyglyphs/source/glyphimages/generated_src/lily-demisemiquaverDottedDoubleDown.ly b/macros/unicodetex/latex/lilyglyphs/source/glyphimages/generated_src/lily-demisemiquaverDottedDoubleDown.ly
index 4147746cef..4147746cef 100644
--- a/macros/luatex/latex/lilyglyphs/source/glyphimages/generated_src/lily-demisemiquaverDottedDoubleDown.ly
+++ b/macros/unicodetex/latex/lilyglyphs/source/glyphimages/generated_src/lily-demisemiquaverDottedDoubleDown.ly
diff --git a/macros/luatex/latex/lilyglyphs/source/glyphimages/generated_src/lily-demisemiquaverDottedDown.ly b/macros/unicodetex/latex/lilyglyphs/source/glyphimages/generated_src/lily-demisemiquaverDottedDown.ly
index 5079edb323..5079edb323 100644
--- a/macros/luatex/latex/lilyglyphs/source/glyphimages/generated_src/lily-demisemiquaverDottedDown.ly
+++ b/macros/unicodetex/latex/lilyglyphs/source/glyphimages/generated_src/lily-demisemiquaverDottedDown.ly
diff --git a/macros/luatex/latex/lilyglyphs/source/glyphimages/generated_src/lily-demisemiquaverDown.ly b/macros/unicodetex/latex/lilyglyphs/source/glyphimages/generated_src/lily-demisemiquaverDown.ly
index 772ab223b9..772ab223b9 100644
--- a/macros/luatex/latex/lilyglyphs/source/glyphimages/generated_src/lily-demisemiquaverDown.ly
+++ b/macros/unicodetex/latex/lilyglyphs/source/glyphimages/generated_src/lily-demisemiquaverDown.ly
diff --git a/macros/luatex/latex/lilyglyphs/source/glyphimages/generated_src/lily-fancyExample.ly b/macros/unicodetex/latex/lilyglyphs/source/glyphimages/generated_src/lily-fancyExample.ly
index 5ce138f776..5ce138f776 100644
--- a/macros/luatex/latex/lilyglyphs/source/glyphimages/generated_src/lily-fancyExample.ly
+++ b/macros/unicodetex/latex/lilyglyphs/source/glyphimages/generated_src/lily-fancyExample.ly
diff --git a/macros/luatex/latex/lilyglyphs/source/glyphimages/generated_src/lily-halfNote.ly b/macros/unicodetex/latex/lilyglyphs/source/glyphimages/generated_src/lily-halfNote.ly
index 2f7065b2a9..2f7065b2a9 100644
--- a/macros/luatex/latex/lilyglyphs/source/glyphimages/generated_src/lily-halfNote.ly
+++ b/macros/unicodetex/latex/lilyglyphs/source/glyphimages/generated_src/lily-halfNote.ly
diff --git a/macros/luatex/latex/lilyglyphs/source/glyphimages/generated_src/lily-halfNoteDotted.ly b/macros/unicodetex/latex/lilyglyphs/source/glyphimages/generated_src/lily-halfNoteDotted.ly
index c2d4f6d187..c2d4f6d187 100644
--- a/macros/luatex/latex/lilyglyphs/source/glyphimages/generated_src/lily-halfNoteDotted.ly
+++ b/macros/unicodetex/latex/lilyglyphs/source/glyphimages/generated_src/lily-halfNoteDotted.ly
diff --git a/macros/luatex/latex/lilyglyphs/source/glyphimages/generated_src/lily-halfNoteDottedDouble.ly b/macros/unicodetex/latex/lilyglyphs/source/glyphimages/generated_src/lily-halfNoteDottedDouble.ly
index 46f8b4b606..46f8b4b606 100644
--- a/macros/luatex/latex/lilyglyphs/source/glyphimages/generated_src/lily-halfNoteDottedDouble.ly
+++ b/macros/unicodetex/latex/lilyglyphs/source/glyphimages/generated_src/lily-halfNoteDottedDouble.ly
diff --git a/macros/luatex/latex/lilyglyphs/source/glyphimages/generated_src/lily-halfNoteDottedDoubleDown.ly b/macros/unicodetex/latex/lilyglyphs/source/glyphimages/generated_src/lily-halfNoteDottedDoubleDown.ly
index 6c85b2f34c..6c85b2f34c 100644
--- a/macros/luatex/latex/lilyglyphs/source/glyphimages/generated_src/lily-halfNoteDottedDoubleDown.ly
+++ b/macros/unicodetex/latex/lilyglyphs/source/glyphimages/generated_src/lily-halfNoteDottedDoubleDown.ly
diff --git a/macros/luatex/latex/lilyglyphs/source/glyphimages/generated_src/lily-halfNoteDottedDown.ly b/macros/unicodetex/latex/lilyglyphs/source/glyphimages/generated_src/lily-halfNoteDottedDown.ly
index 1b8ca534f9..1b8ca534f9 100644
--- a/macros/luatex/latex/lilyglyphs/source/glyphimages/generated_src/lily-halfNoteDottedDown.ly
+++ b/macros/unicodetex/latex/lilyglyphs/source/glyphimages/generated_src/lily-halfNoteDottedDown.ly
diff --git a/macros/luatex/latex/lilyglyphs/source/glyphimages/generated_src/lily-halfNoteDown.ly b/macros/unicodetex/latex/lilyglyphs/source/glyphimages/generated_src/lily-halfNoteDown.ly
index 12891815cd..12891815cd 100644
--- a/macros/luatex/latex/lilyglyphs/source/glyphimages/generated_src/lily-halfNoteDown.ly
+++ b/macros/unicodetex/latex/lilyglyphs/source/glyphimages/generated_src/lily-halfNoteDown.ly
diff --git a/macros/luatex/latex/lilyglyphs/source/glyphimages/generated_src/lily-quaver.ly b/macros/unicodetex/latex/lilyglyphs/source/glyphimages/generated_src/lily-quaver.ly
index 73789d53f4..73789d53f4 100644
--- a/macros/luatex/latex/lilyglyphs/source/glyphimages/generated_src/lily-quaver.ly
+++ b/macros/unicodetex/latex/lilyglyphs/source/glyphimages/generated_src/lily-quaver.ly
diff --git a/macros/luatex/latex/lilyglyphs/source/glyphimages/generated_src/lily-quaverDotted.ly b/macros/unicodetex/latex/lilyglyphs/source/glyphimages/generated_src/lily-quaverDotted.ly
index d59ea8ba86..d59ea8ba86 100644
--- a/macros/luatex/latex/lilyglyphs/source/glyphimages/generated_src/lily-quaverDotted.ly
+++ b/macros/unicodetex/latex/lilyglyphs/source/glyphimages/generated_src/lily-quaverDotted.ly
diff --git a/macros/luatex/latex/lilyglyphs/source/glyphimages/generated_src/lily-quaverDottedDouble.ly b/macros/unicodetex/latex/lilyglyphs/source/glyphimages/generated_src/lily-quaverDottedDouble.ly
index d3b20053b3..d3b20053b3 100644
--- a/macros/luatex/latex/lilyglyphs/source/glyphimages/generated_src/lily-quaverDottedDouble.ly
+++ b/macros/unicodetex/latex/lilyglyphs/source/glyphimages/generated_src/lily-quaverDottedDouble.ly
diff --git a/macros/luatex/latex/lilyglyphs/source/glyphimages/generated_src/lily-quaverDottedDoubleDdown.ly b/macros/unicodetex/latex/lilyglyphs/source/glyphimages/generated_src/lily-quaverDottedDoubleDdown.ly
index 6cf3cd5e73..6cf3cd5e73 100644
--- a/macros/luatex/latex/lilyglyphs/source/glyphimages/generated_src/lily-quaverDottedDoubleDdown.ly
+++ b/macros/unicodetex/latex/lilyglyphs/source/glyphimages/generated_src/lily-quaverDottedDoubleDdown.ly
diff --git a/macros/luatex/latex/lilyglyphs/source/glyphimages/generated_src/lily-quaverDottedDoubleDown.ly b/macros/unicodetex/latex/lilyglyphs/source/glyphimages/generated_src/lily-quaverDottedDoubleDown.ly
index 211cd4f6fd..211cd4f6fd 100644
--- a/macros/luatex/latex/lilyglyphs/source/glyphimages/generated_src/lily-quaverDottedDoubleDown.ly
+++ b/macros/unicodetex/latex/lilyglyphs/source/glyphimages/generated_src/lily-quaverDottedDoubleDown.ly
diff --git a/macros/luatex/latex/lilyglyphs/source/glyphimages/generated_src/lily-quaverDottedDown.ly b/macros/unicodetex/latex/lilyglyphs/source/glyphimages/generated_src/lily-quaverDottedDown.ly
index 93ae3005f5..93ae3005f5 100644
--- a/macros/luatex/latex/lilyglyphs/source/glyphimages/generated_src/lily-quaverDottedDown.ly
+++ b/macros/unicodetex/latex/lilyglyphs/source/glyphimages/generated_src/lily-quaverDottedDown.ly
diff --git a/macros/luatex/latex/lilyglyphs/source/glyphimages/generated_src/lily-quaverDown.ly b/macros/unicodetex/latex/lilyglyphs/source/glyphimages/generated_src/lily-quaverDown.ly
index d181bdaf55..d181bdaf55 100644
--- a/macros/luatex/latex/lilyglyphs/source/glyphimages/generated_src/lily-quaverDown.ly
+++ b/macros/unicodetex/latex/lilyglyphs/source/glyphimages/generated_src/lily-quaverDown.ly
diff --git a/macros/luatex/latex/lilyglyphs/source/glyphimages/generated_src/lily-semiquaver.ly b/macros/unicodetex/latex/lilyglyphs/source/glyphimages/generated_src/lily-semiquaver.ly
index ebac65b3ce..ebac65b3ce 100644
--- a/macros/luatex/latex/lilyglyphs/source/glyphimages/generated_src/lily-semiquaver.ly
+++ b/macros/unicodetex/latex/lilyglyphs/source/glyphimages/generated_src/lily-semiquaver.ly
diff --git a/macros/luatex/latex/lilyglyphs/source/glyphimages/generated_src/lily-semiquaverDotted.ly b/macros/unicodetex/latex/lilyglyphs/source/glyphimages/generated_src/lily-semiquaverDotted.ly
index d516b7973e..d516b7973e 100644
--- a/macros/luatex/latex/lilyglyphs/source/glyphimages/generated_src/lily-semiquaverDotted.ly
+++ b/macros/unicodetex/latex/lilyglyphs/source/glyphimages/generated_src/lily-semiquaverDotted.ly
diff --git a/macros/luatex/latex/lilyglyphs/source/glyphimages/generated_src/lily-semiquaverDottedDouble.ly b/macros/unicodetex/latex/lilyglyphs/source/glyphimages/generated_src/lily-semiquaverDottedDouble.ly
index 0f757c89a3..0f757c89a3 100644
--- a/macros/luatex/latex/lilyglyphs/source/glyphimages/generated_src/lily-semiquaverDottedDouble.ly
+++ b/macros/unicodetex/latex/lilyglyphs/source/glyphimages/generated_src/lily-semiquaverDottedDouble.ly
diff --git a/macros/luatex/latex/lilyglyphs/source/glyphimages/generated_src/lily-semiquaverDottedDoubleDown.ly b/macros/unicodetex/latex/lilyglyphs/source/glyphimages/generated_src/lily-semiquaverDottedDoubleDown.ly
index 72b641db9a..72b641db9a 100644
--- a/macros/luatex/latex/lilyglyphs/source/glyphimages/generated_src/lily-semiquaverDottedDoubleDown.ly
+++ b/macros/unicodetex/latex/lilyglyphs/source/glyphimages/generated_src/lily-semiquaverDottedDoubleDown.ly
diff --git a/macros/luatex/latex/lilyglyphs/source/glyphimages/generated_src/lily-semiquaverDottedDown.ly b/macros/unicodetex/latex/lilyglyphs/source/glyphimages/generated_src/lily-semiquaverDottedDown.ly
index f4b725cdb8..f4b725cdb8 100644
--- a/macros/luatex/latex/lilyglyphs/source/glyphimages/generated_src/lily-semiquaverDottedDown.ly
+++ b/macros/unicodetex/latex/lilyglyphs/source/glyphimages/generated_src/lily-semiquaverDottedDown.ly
diff --git a/macros/luatex/latex/lilyglyphs/source/glyphimages/generated_src/lily-semiquaverDown.ly b/macros/unicodetex/latex/lilyglyphs/source/glyphimages/generated_src/lily-semiquaverDown.ly
index 09da96d378..09da96d378 100644
--- a/macros/luatex/latex/lilyglyphs/source/glyphimages/generated_src/lily-semiquaverDown.ly
+++ b/macros/unicodetex/latex/lilyglyphs/source/glyphimages/generated_src/lily-semiquaverDown.ly
diff --git a/macros/luatex/latex/lilyglyphs/source/glyphimages/generated_src/lily-threeBeamedQuavers.ly b/macros/unicodetex/latex/lilyglyphs/source/glyphimages/generated_src/lily-threeBeamedQuavers.ly
index 1ea9294685..1ea9294685 100644
--- a/macros/luatex/latex/lilyglyphs/source/glyphimages/generated_src/lily-threeBeamedQuavers.ly
+++ b/macros/unicodetex/latex/lilyglyphs/source/glyphimages/generated_src/lily-threeBeamedQuavers.ly
diff --git a/macros/luatex/latex/lilyglyphs/source/glyphimages/generated_src/lily-threeBeamedQuaversI.ly b/macros/unicodetex/latex/lilyglyphs/source/glyphimages/generated_src/lily-threeBeamedQuaversI.ly
index 5bdebca329..5bdebca329 100644
--- a/macros/luatex/latex/lilyglyphs/source/glyphimages/generated_src/lily-threeBeamedQuaversI.ly
+++ b/macros/unicodetex/latex/lilyglyphs/source/glyphimages/generated_src/lily-threeBeamedQuaversI.ly
diff --git a/macros/luatex/latex/lilyglyphs/source/glyphimages/generated_src/lily-threeBeamedQuaversII.ly b/macros/unicodetex/latex/lilyglyphs/source/glyphimages/generated_src/lily-threeBeamedQuaversII.ly
index 1304da565a..1304da565a 100644
--- a/macros/luatex/latex/lilyglyphs/source/glyphimages/generated_src/lily-threeBeamedQuaversII.ly
+++ b/macros/unicodetex/latex/lilyglyphs/source/glyphimages/generated_src/lily-threeBeamedQuaversII.ly
diff --git a/macros/luatex/latex/lilyglyphs/source/glyphimages/generated_src/lily-threeBeamedQuaversIII.ly b/macros/unicodetex/latex/lilyglyphs/source/glyphimages/generated_src/lily-threeBeamedQuaversIII.ly
index 846a687e0a..846a687e0a 100644
--- a/macros/luatex/latex/lilyglyphs/source/glyphimages/generated_src/lily-threeBeamedQuaversIII.ly
+++ b/macros/unicodetex/latex/lilyglyphs/source/glyphimages/generated_src/lily-threeBeamedQuaversIII.ly
diff --git a/macros/luatex/latex/lilyglyphs/source/glyphimages/generated_src/lily-twoBeamedQuavers.ly b/macros/unicodetex/latex/lilyglyphs/source/glyphimages/generated_src/lily-twoBeamedQuavers.ly
index a14e064594..a14e064594 100644
--- a/macros/luatex/latex/lilyglyphs/source/glyphimages/generated_src/lily-twoBeamedQuavers.ly
+++ b/macros/unicodetex/latex/lilyglyphs/source/glyphimages/generated_src/lily-twoBeamedQuavers.ly
diff --git a/macros/luatex/latex/lilyglyphs/tex/README-tex b/macros/unicodetex/latex/lilyglyphs/tex/README-tex
index 682ff49e92..682ff49e92 100644
--- a/macros/luatex/latex/lilyglyphs/tex/README-tex
+++ b/macros/unicodetex/latex/lilyglyphs/tex/README-tex
diff --git a/macros/luatex/latex/lilyglyphs/tex/commands/README-commands b/macros/unicodetex/latex/lilyglyphs/tex/commands/README-commands
index 4666f416f0..4666f416f0 100644
--- a/macros/luatex/latex/lilyglyphs/tex/commands/README-commands
+++ b/macros/unicodetex/latex/lilyglyphs/tex/commands/README-commands
diff --git a/macros/luatex/latex/lilyglyphs/tex/commands/accidentals.inp b/macros/unicodetex/latex/lilyglyphs/tex/commands/accidentals.inp
index e8b90a6c17..e8b90a6c17 100644
--- a/macros/luatex/latex/lilyglyphs/tex/commands/accidentals.inp
+++ b/macros/unicodetex/latex/lilyglyphs/tex/commands/accidentals.inp
diff --git a/macros/luatex/latex/lilyglyphs/tex/commands/accordion.inp b/macros/unicodetex/latex/lilyglyphs/tex/commands/accordion.inp
index b20f97203e..b20f97203e 100644
--- a/macros/luatex/latex/lilyglyphs/tex/commands/accordion.inp
+++ b/macros/unicodetex/latex/lilyglyphs/tex/commands/accordion.inp
diff --git a/macros/luatex/latex/lilyglyphs/tex/commands/beamednotes.inp b/macros/unicodetex/latex/lilyglyphs/tex/commands/beamednotes.inp
index c18e3315ae..c18e3315ae 100644
--- a/macros/luatex/latex/lilyglyphs/tex/commands/beamednotes.inp
+++ b/macros/unicodetex/latex/lilyglyphs/tex/commands/beamednotes.inp
diff --git a/macros/luatex/latex/lilyglyphs/tex/commands/clefs.inp b/macros/unicodetex/latex/lilyglyphs/tex/commands/clefs.inp
index 4f688e7f3e..4f688e7f3e 100644
--- a/macros/luatex/latex/lilyglyphs/tex/commands/clefs.inp
+++ b/macros/unicodetex/latex/lilyglyphs/tex/commands/clefs.inp
diff --git a/macros/luatex/latex/lilyglyphs/tex/commands/dynamics.inp b/macros/unicodetex/latex/lilyglyphs/tex/commands/dynamics.inp
index 1ecb8807d6..1ecb8807d6 100644
--- a/macros/luatex/latex/lilyglyphs/tex/commands/dynamics.inp
+++ b/macros/unicodetex/latex/lilyglyphs/tex/commands/dynamics.inp
diff --git a/macros/luatex/latex/lilyglyphs/tex/commands/fancyexamples.inp b/macros/unicodetex/latex/lilyglyphs/tex/commands/fancyexamples.inp
index 74c371cf31..74c371cf31 100644
--- a/macros/luatex/latex/lilyglyphs/tex/commands/fancyexamples.inp
+++ b/macros/unicodetex/latex/lilyglyphs/tex/commands/fancyexamples.inp
diff --git a/macros/luatex/latex/lilyglyphs/tex/commands/noteheads.inp b/macros/unicodetex/latex/lilyglyphs/tex/commands/noteheads.inp
index 7961971ca7..7961971ca7 100644
--- a/macros/luatex/latex/lilyglyphs/tex/commands/noteheads.inp
+++ b/macros/unicodetex/latex/lilyglyphs/tex/commands/noteheads.inp
diff --git a/macros/luatex/latex/lilyglyphs/tex/commands/numbers.inp b/macros/unicodetex/latex/lilyglyphs/tex/commands/numbers.inp
index b1bcfcd9fe..b1bcfcd9fe 100644
--- a/macros/luatex/latex/lilyglyphs/tex/commands/numbers.inp
+++ b/macros/unicodetex/latex/lilyglyphs/tex/commands/numbers.inp
diff --git a/macros/luatex/latex/lilyglyphs/tex/commands/rests.inp b/macros/unicodetex/latex/lilyglyphs/tex/commands/rests.inp
index 48538af3f7..48538af3f7 100644
--- a/macros/luatex/latex/lilyglyphs/tex/commands/rests.inp
+++ b/macros/unicodetex/latex/lilyglyphs/tex/commands/rests.inp
diff --git a/macros/luatex/latex/lilyglyphs/tex/commands/scripts.inp b/macros/unicodetex/latex/lilyglyphs/tex/commands/scripts.inp
index 16120f05ed..16120f05ed 100644
--- a/macros/luatex/latex/lilyglyphs/tex/commands/scripts.inp
+++ b/macros/unicodetex/latex/lilyglyphs/tex/commands/scripts.inp
diff --git a/macros/luatex/latex/lilyglyphs/tex/commands/singlenotes.inp b/macros/unicodetex/latex/lilyglyphs/tex/commands/singlenotes.inp
index 8c8f16f1cf..8c8f16f1cf 100644
--- a/macros/luatex/latex/lilyglyphs/tex/commands/singlenotes.inp
+++ b/macros/unicodetex/latex/lilyglyphs/tex/commands/singlenotes.inp
diff --git a/macros/luatex/latex/lilyglyphs/tex/commands/timesignatures.inp b/macros/unicodetex/latex/lilyglyphs/tex/commands/timesignatures.inp
index e4b248bd9b..e4b248bd9b 100644
--- a/macros/luatex/latex/lilyglyphs/tex/commands/timesignatures.inp
+++ b/macros/unicodetex/latex/lilyglyphs/tex/commands/timesignatures.inp
diff --git a/macros/luatex/latex/lilyglyphs/tex/core/README-core b/macros/unicodetex/latex/lilyglyphs/tex/core/README-core
index 23286b05f8..23286b05f8 100644
--- a/macros/luatex/latex/lilyglyphs/tex/core/README-core
+++ b/macros/unicodetex/latex/lilyglyphs/tex/core/README-core
diff --git a/macros/luatex/latex/lilyglyphs/tex/core/dotted.inp b/macros/unicodetex/latex/lilyglyphs/tex/core/dotted.inp
index 6b7b7f634b..6b7b7f634b 100644
--- a/macros/luatex/latex/lilyglyphs/tex/core/dotted.inp
+++ b/macros/unicodetex/latex/lilyglyphs/tex/core/dotted.inp
diff --git a/macros/luatex/latex/lilyglyphs/tex/core/genericAccess.inp b/macros/unicodetex/latex/lilyglyphs/tex/core/genericAccess.inp
index 095dd2de64..095dd2de64 100644
--- a/macros/luatex/latex/lilyglyphs/tex/core/genericAccess.inp
+++ b/macros/unicodetex/latex/lilyglyphs/tex/core/genericAccess.inp
diff --git a/macros/luatex/latex/lilyglyphs/tex/core/keyval.inp b/macros/unicodetex/latex/lilyglyphs/tex/core/keyval.inp
index 840bbacc36..840bbacc36 100644
--- a/macros/luatex/latex/lilyglyphs/tex/core/keyval.inp
+++ b/macros/unicodetex/latex/lilyglyphs/tex/core/keyval.inp
diff --git a/macros/luatex/latex/lilyglyphs/tex/core/opticals.inp b/macros/unicodetex/latex/lilyglyphs/tex/core/opticals.inp
index 83c39ede6e..83c39ede6e 100644
--- a/macros/luatex/latex/lilyglyphs/tex/core/opticals.inp
+++ b/macros/unicodetex/latex/lilyglyphs/tex/core/opticals.inp
diff --git a/macros/luatex/latex/lilyglyphs/tex/lilyglyphs.sty b/macros/unicodetex/latex/lilyglyphs/tex/lilyglyphs.sty
index 7788f40755..7788f40755 100644
--- a/macros/luatex/latex/lilyglyphs/tex/lilyglyphs.sty
+++ b/macros/unicodetex/latex/lilyglyphs/tex/lilyglyphs.sty
diff --git a/macros/luatex/latex/lilyglyphs/tex/pdfs/lily-crescHairpin.pdf b/macros/unicodetex/latex/lilyglyphs/tex/pdfs/lily-crescHairpin.pdf
index cba460c570..cba460c570 100644
--- a/macros/luatex/latex/lilyglyphs/tex/pdfs/lily-crescHairpin.pdf
+++ b/macros/unicodetex/latex/lilyglyphs/tex/pdfs/lily-crescHairpin.pdf
diff --git a/macros/luatex/latex/lilyglyphs/tex/pdfs/lily-crotchet.pdf b/macros/unicodetex/latex/lilyglyphs/tex/pdfs/lily-crotchet.pdf
index 9ce5a793ab..9ce5a793ab 100644
--- a/macros/luatex/latex/lilyglyphs/tex/pdfs/lily-crotchet.pdf
+++ b/macros/unicodetex/latex/lilyglyphs/tex/pdfs/lily-crotchet.pdf
diff --git a/macros/luatex/latex/lilyglyphs/tex/pdfs/lily-crotchetDotted.pdf b/macros/unicodetex/latex/lilyglyphs/tex/pdfs/lily-crotchetDotted.pdf
index 1c55a09877..1c55a09877 100644
--- a/macros/luatex/latex/lilyglyphs/tex/pdfs/lily-crotchetDotted.pdf
+++ b/macros/unicodetex/latex/lilyglyphs/tex/pdfs/lily-crotchetDotted.pdf
diff --git a/macros/luatex/latex/lilyglyphs/tex/pdfs/lily-crotchetDottedDouble.pdf b/macros/unicodetex/latex/lilyglyphs/tex/pdfs/lily-crotchetDottedDouble.pdf
index 0f39bd0606..0f39bd0606 100644
--- a/macros/luatex/latex/lilyglyphs/tex/pdfs/lily-crotchetDottedDouble.pdf
+++ b/macros/unicodetex/latex/lilyglyphs/tex/pdfs/lily-crotchetDottedDouble.pdf
diff --git a/macros/luatex/latex/lilyglyphs/tex/pdfs/lily-crotchetDottedDoubleDown.pdf b/macros/unicodetex/latex/lilyglyphs/tex/pdfs/lily-crotchetDottedDoubleDown.pdf
index ccde99d755..ccde99d755 100644
--- a/macros/luatex/latex/lilyglyphs/tex/pdfs/lily-crotchetDottedDoubleDown.pdf
+++ b/macros/unicodetex/latex/lilyglyphs/tex/pdfs/lily-crotchetDottedDoubleDown.pdf
diff --git a/macros/luatex/latex/lilyglyphs/tex/pdfs/lily-crotchetDottedDown.pdf b/macros/unicodetex/latex/lilyglyphs/tex/pdfs/lily-crotchetDottedDown.pdf
index 963557dc53..963557dc53 100644
--- a/macros/luatex/latex/lilyglyphs/tex/pdfs/lily-crotchetDottedDown.pdf
+++ b/macros/unicodetex/latex/lilyglyphs/tex/pdfs/lily-crotchetDottedDown.pdf
diff --git a/macros/luatex/latex/lilyglyphs/tex/pdfs/lily-crotchetDown.pdf b/macros/unicodetex/latex/lilyglyphs/tex/pdfs/lily-crotchetDown.pdf
index 75db5762fe..75db5762fe 100644
--- a/macros/luatex/latex/lilyglyphs/tex/pdfs/lily-crotchetDown.pdf
+++ b/macros/unicodetex/latex/lilyglyphs/tex/pdfs/lily-crotchetDown.pdf
diff --git a/macros/luatex/latex/lilyglyphs/tex/pdfs/lily-decrescHairpin.pdf b/macros/unicodetex/latex/lilyglyphs/tex/pdfs/lily-decrescHairpin.pdf
index 3d676e5bee..3d676e5bee 100644
--- a/macros/luatex/latex/lilyglyphs/tex/pdfs/lily-decrescHairpin.pdf
+++ b/macros/unicodetex/latex/lilyglyphs/tex/pdfs/lily-decrescHairpin.pdf
diff --git a/macros/luatex/latex/lilyglyphs/tex/pdfs/lily-demisemiquaver.pdf b/macros/unicodetex/latex/lilyglyphs/tex/pdfs/lily-demisemiquaver.pdf
index edfe5bc1b4..edfe5bc1b4 100644
--- a/macros/luatex/latex/lilyglyphs/tex/pdfs/lily-demisemiquaver.pdf
+++ b/macros/unicodetex/latex/lilyglyphs/tex/pdfs/lily-demisemiquaver.pdf
diff --git a/macros/luatex/latex/lilyglyphs/tex/pdfs/lily-demisemiquaverDotted.pdf b/macros/unicodetex/latex/lilyglyphs/tex/pdfs/lily-demisemiquaverDotted.pdf
index 2ff802c1cf..2ff802c1cf 100644
--- a/macros/luatex/latex/lilyglyphs/tex/pdfs/lily-demisemiquaverDotted.pdf
+++ b/macros/unicodetex/latex/lilyglyphs/tex/pdfs/lily-demisemiquaverDotted.pdf
diff --git a/macros/luatex/latex/lilyglyphs/tex/pdfs/lily-demisemiquaverDottedDouble.pdf b/macros/unicodetex/latex/lilyglyphs/tex/pdfs/lily-demisemiquaverDottedDouble.pdf
index 899060302e..899060302e 100644
--- a/macros/luatex/latex/lilyglyphs/tex/pdfs/lily-demisemiquaverDottedDouble.pdf
+++ b/macros/unicodetex/latex/lilyglyphs/tex/pdfs/lily-demisemiquaverDottedDouble.pdf
diff --git a/macros/luatex/latex/lilyglyphs/tex/pdfs/lily-demisemiquaverDottedDoubleDown.pdf b/macros/unicodetex/latex/lilyglyphs/tex/pdfs/lily-demisemiquaverDottedDoubleDown.pdf
index 09fb1be424..09fb1be424 100644
--- a/macros/luatex/latex/lilyglyphs/tex/pdfs/lily-demisemiquaverDottedDoubleDown.pdf
+++ b/macros/unicodetex/latex/lilyglyphs/tex/pdfs/lily-demisemiquaverDottedDoubleDown.pdf
diff --git a/macros/luatex/latex/lilyglyphs/tex/pdfs/lily-demisemiquaverDottedDown.pdf b/macros/unicodetex/latex/lilyglyphs/tex/pdfs/lily-demisemiquaverDottedDown.pdf
index 85e89b8ca0..85e89b8ca0 100644
--- a/macros/luatex/latex/lilyglyphs/tex/pdfs/lily-demisemiquaverDottedDown.pdf
+++ b/macros/unicodetex/latex/lilyglyphs/tex/pdfs/lily-demisemiquaverDottedDown.pdf
diff --git a/macros/luatex/latex/lilyglyphs/tex/pdfs/lily-demisemiquaverDown.pdf b/macros/unicodetex/latex/lilyglyphs/tex/pdfs/lily-demisemiquaverDown.pdf
index ce361e340d..ce361e340d 100644
--- a/macros/luatex/latex/lilyglyphs/tex/pdfs/lily-demisemiquaverDown.pdf
+++ b/macros/unicodetex/latex/lilyglyphs/tex/pdfs/lily-demisemiquaverDown.pdf
diff --git a/macros/luatex/latex/lilyglyphs/tex/pdfs/lily-fancyExample.pdf b/macros/unicodetex/latex/lilyglyphs/tex/pdfs/lily-fancyExample.pdf
index 48c9e4c06c..48c9e4c06c 100644
--- a/macros/luatex/latex/lilyglyphs/tex/pdfs/lily-fancyExample.pdf
+++ b/macros/unicodetex/latex/lilyglyphs/tex/pdfs/lily-fancyExample.pdf
diff --git a/macros/luatex/latex/lilyglyphs/tex/pdfs/lily-halfNote.pdf b/macros/unicodetex/latex/lilyglyphs/tex/pdfs/lily-halfNote.pdf
index 639277692a..639277692a 100644
--- a/macros/luatex/latex/lilyglyphs/tex/pdfs/lily-halfNote.pdf
+++ b/macros/unicodetex/latex/lilyglyphs/tex/pdfs/lily-halfNote.pdf
diff --git a/macros/luatex/latex/lilyglyphs/tex/pdfs/lily-halfNoteDotted.pdf b/macros/unicodetex/latex/lilyglyphs/tex/pdfs/lily-halfNoteDotted.pdf
index 67f68c534d..67f68c534d 100644
--- a/macros/luatex/latex/lilyglyphs/tex/pdfs/lily-halfNoteDotted.pdf
+++ b/macros/unicodetex/latex/lilyglyphs/tex/pdfs/lily-halfNoteDotted.pdf
diff --git a/macros/luatex/latex/lilyglyphs/tex/pdfs/lily-halfNoteDottedDouble.pdf b/macros/unicodetex/latex/lilyglyphs/tex/pdfs/lily-halfNoteDottedDouble.pdf
index 6d8dd52076..6d8dd52076 100644
--- a/macros/luatex/latex/lilyglyphs/tex/pdfs/lily-halfNoteDottedDouble.pdf
+++ b/macros/unicodetex/latex/lilyglyphs/tex/pdfs/lily-halfNoteDottedDouble.pdf
diff --git a/macros/luatex/latex/lilyglyphs/tex/pdfs/lily-halfNoteDottedDoubleDown.pdf b/macros/unicodetex/latex/lilyglyphs/tex/pdfs/lily-halfNoteDottedDoubleDown.pdf
index f93e8c487f..f93e8c487f 100644
--- a/macros/luatex/latex/lilyglyphs/tex/pdfs/lily-halfNoteDottedDoubleDown.pdf
+++ b/macros/unicodetex/latex/lilyglyphs/tex/pdfs/lily-halfNoteDottedDoubleDown.pdf
diff --git a/macros/luatex/latex/lilyglyphs/tex/pdfs/lily-halfNoteDottedDown.pdf b/macros/unicodetex/latex/lilyglyphs/tex/pdfs/lily-halfNoteDottedDown.pdf
index 1ca33ca079..1ca33ca079 100644
--- a/macros/luatex/latex/lilyglyphs/tex/pdfs/lily-halfNoteDottedDown.pdf
+++ b/macros/unicodetex/latex/lilyglyphs/tex/pdfs/lily-halfNoteDottedDown.pdf
diff --git a/macros/luatex/latex/lilyglyphs/tex/pdfs/lily-halfNoteDown.pdf b/macros/unicodetex/latex/lilyglyphs/tex/pdfs/lily-halfNoteDown.pdf
index 699ba96fc5..699ba96fc5 100644
--- a/macros/luatex/latex/lilyglyphs/tex/pdfs/lily-halfNoteDown.pdf
+++ b/macros/unicodetex/latex/lilyglyphs/tex/pdfs/lily-halfNoteDown.pdf
diff --git a/macros/luatex/latex/lilyglyphs/tex/pdfs/lily-quaver.pdf b/macros/unicodetex/latex/lilyglyphs/tex/pdfs/lily-quaver.pdf
index c9b6e0a8d1..c9b6e0a8d1 100644
--- a/macros/luatex/latex/lilyglyphs/tex/pdfs/lily-quaver.pdf
+++ b/macros/unicodetex/latex/lilyglyphs/tex/pdfs/lily-quaver.pdf
diff --git a/macros/luatex/latex/lilyglyphs/tex/pdfs/lily-quaverDotted.pdf b/macros/unicodetex/latex/lilyglyphs/tex/pdfs/lily-quaverDotted.pdf
index 95d24f18fb..95d24f18fb 100644
--- a/macros/luatex/latex/lilyglyphs/tex/pdfs/lily-quaverDotted.pdf
+++ b/macros/unicodetex/latex/lilyglyphs/tex/pdfs/lily-quaverDotted.pdf
diff --git a/macros/luatex/latex/lilyglyphs/tex/pdfs/lily-quaverDottedDouble.pdf b/macros/unicodetex/latex/lilyglyphs/tex/pdfs/lily-quaverDottedDouble.pdf
index e448e06f15..e448e06f15 100644
--- a/macros/luatex/latex/lilyglyphs/tex/pdfs/lily-quaverDottedDouble.pdf
+++ b/macros/unicodetex/latex/lilyglyphs/tex/pdfs/lily-quaverDottedDouble.pdf
diff --git a/macros/luatex/latex/lilyglyphs/tex/pdfs/lily-quaverDottedDoubleDdown.pdf b/macros/unicodetex/latex/lilyglyphs/tex/pdfs/lily-quaverDottedDoubleDdown.pdf
index 4e2f48e68f..4e2f48e68f 100644
--- a/macros/luatex/latex/lilyglyphs/tex/pdfs/lily-quaverDottedDoubleDdown.pdf
+++ b/macros/unicodetex/latex/lilyglyphs/tex/pdfs/lily-quaverDottedDoubleDdown.pdf
diff --git a/macros/luatex/latex/lilyglyphs/tex/pdfs/lily-quaverDottedDoubleDown.pdf b/macros/unicodetex/latex/lilyglyphs/tex/pdfs/lily-quaverDottedDoubleDown.pdf
index e59325eed5..e59325eed5 100644
--- a/macros/luatex/latex/lilyglyphs/tex/pdfs/lily-quaverDottedDoubleDown.pdf
+++ b/macros/unicodetex/latex/lilyglyphs/tex/pdfs/lily-quaverDottedDoubleDown.pdf
diff --git a/macros/luatex/latex/lilyglyphs/tex/pdfs/lily-quaverDottedDown.pdf b/macros/unicodetex/latex/lilyglyphs/tex/pdfs/lily-quaverDottedDown.pdf
index b68c341da6..b68c341da6 100644
--- a/macros/luatex/latex/lilyglyphs/tex/pdfs/lily-quaverDottedDown.pdf
+++ b/macros/unicodetex/latex/lilyglyphs/tex/pdfs/lily-quaverDottedDown.pdf
diff --git a/macros/luatex/latex/lilyglyphs/tex/pdfs/lily-quaverDown.pdf b/macros/unicodetex/latex/lilyglyphs/tex/pdfs/lily-quaverDown.pdf
index 52ce2437b1..52ce2437b1 100644
--- a/macros/luatex/latex/lilyglyphs/tex/pdfs/lily-quaverDown.pdf
+++ b/macros/unicodetex/latex/lilyglyphs/tex/pdfs/lily-quaverDown.pdf
diff --git a/macros/luatex/latex/lilyglyphs/tex/pdfs/lily-semiquaver.pdf b/macros/unicodetex/latex/lilyglyphs/tex/pdfs/lily-semiquaver.pdf
index a72405f5b7..a72405f5b7 100644
--- a/macros/luatex/latex/lilyglyphs/tex/pdfs/lily-semiquaver.pdf
+++ b/macros/unicodetex/latex/lilyglyphs/tex/pdfs/lily-semiquaver.pdf
diff --git a/macros/luatex/latex/lilyglyphs/tex/pdfs/lily-semiquaverDotted.pdf b/macros/unicodetex/latex/lilyglyphs/tex/pdfs/lily-semiquaverDotted.pdf
index d810ea9339..d810ea9339 100644
--- a/macros/luatex/latex/lilyglyphs/tex/pdfs/lily-semiquaverDotted.pdf
+++ b/macros/unicodetex/latex/lilyglyphs/tex/pdfs/lily-semiquaverDotted.pdf
diff --git a/macros/luatex/latex/lilyglyphs/tex/pdfs/lily-semiquaverDottedDouble.pdf b/macros/unicodetex/latex/lilyglyphs/tex/pdfs/lily-semiquaverDottedDouble.pdf
index b2434a6c76..b2434a6c76 100644
--- a/macros/luatex/latex/lilyglyphs/tex/pdfs/lily-semiquaverDottedDouble.pdf
+++ b/macros/unicodetex/latex/lilyglyphs/tex/pdfs/lily-semiquaverDottedDouble.pdf
diff --git a/macros/luatex/latex/lilyglyphs/tex/pdfs/lily-semiquaverDottedDoubleDown.pdf b/macros/unicodetex/latex/lilyglyphs/tex/pdfs/lily-semiquaverDottedDoubleDown.pdf
index e8b391aae0..e8b391aae0 100644
--- a/macros/luatex/latex/lilyglyphs/tex/pdfs/lily-semiquaverDottedDoubleDown.pdf
+++ b/macros/unicodetex/latex/lilyglyphs/tex/pdfs/lily-semiquaverDottedDoubleDown.pdf
diff --git a/macros/luatex/latex/lilyglyphs/tex/pdfs/lily-semiquaverDottedDown.pdf b/macros/unicodetex/latex/lilyglyphs/tex/pdfs/lily-semiquaverDottedDown.pdf
index c980d5b86d..c980d5b86d 100644
--- a/macros/luatex/latex/lilyglyphs/tex/pdfs/lily-semiquaverDottedDown.pdf
+++ b/macros/unicodetex/latex/lilyglyphs/tex/pdfs/lily-semiquaverDottedDown.pdf
diff --git a/macros/luatex/latex/lilyglyphs/tex/pdfs/lily-semiquaverDown.pdf b/macros/unicodetex/latex/lilyglyphs/tex/pdfs/lily-semiquaverDown.pdf
index 3ea309c499..3ea309c499 100644
--- a/macros/luatex/latex/lilyglyphs/tex/pdfs/lily-semiquaverDown.pdf
+++ b/macros/unicodetex/latex/lilyglyphs/tex/pdfs/lily-semiquaverDown.pdf
diff --git a/macros/luatex/latex/lilyglyphs/tex/pdfs/lily-threeBeamedQuavers.pdf b/macros/unicodetex/latex/lilyglyphs/tex/pdfs/lily-threeBeamedQuavers.pdf
index c8503af46a..c8503af46a 100644
--- a/macros/luatex/latex/lilyglyphs/tex/pdfs/lily-threeBeamedQuavers.pdf
+++ b/macros/unicodetex/latex/lilyglyphs/tex/pdfs/lily-threeBeamedQuavers.pdf
diff --git a/macros/luatex/latex/lilyglyphs/tex/pdfs/lily-threeBeamedQuaversI.pdf b/macros/unicodetex/latex/lilyglyphs/tex/pdfs/lily-threeBeamedQuaversI.pdf
index 0743b08b5c..0743b08b5c 100644
--- a/macros/luatex/latex/lilyglyphs/tex/pdfs/lily-threeBeamedQuaversI.pdf
+++ b/macros/unicodetex/latex/lilyglyphs/tex/pdfs/lily-threeBeamedQuaversI.pdf
diff --git a/macros/luatex/latex/lilyglyphs/tex/pdfs/lily-threeBeamedQuaversII.pdf b/macros/unicodetex/latex/lilyglyphs/tex/pdfs/lily-threeBeamedQuaversII.pdf
index 3985befd88..3985befd88 100644
--- a/macros/luatex/latex/lilyglyphs/tex/pdfs/lily-threeBeamedQuaversII.pdf
+++ b/macros/unicodetex/latex/lilyglyphs/tex/pdfs/lily-threeBeamedQuaversII.pdf
diff --git a/macros/luatex/latex/lilyglyphs/tex/pdfs/lily-threeBeamedQuaversIII.pdf b/macros/unicodetex/latex/lilyglyphs/tex/pdfs/lily-threeBeamedQuaversIII.pdf
index 9b8cd50615..9b8cd50615 100644
--- a/macros/luatex/latex/lilyglyphs/tex/pdfs/lily-threeBeamedQuaversIII.pdf
+++ b/macros/unicodetex/latex/lilyglyphs/tex/pdfs/lily-threeBeamedQuaversIII.pdf
diff --git a/macros/luatex/latex/lilyglyphs/tex/pdfs/lily-twoBeamedQuavers.pdf b/macros/unicodetex/latex/lilyglyphs/tex/pdfs/lily-twoBeamedQuavers.pdf
index 45b88b27c5..45b88b27c5 100644
--- a/macros/luatex/latex/lilyglyphs/tex/pdfs/lily-twoBeamedQuavers.pdf
+++ b/macros/unicodetex/latex/lilyglyphs/tex/pdfs/lily-twoBeamedQuavers.pdf
diff --git a/macros/latex/contrib/polyglossia/README.md b/macros/unicodetex/latex/polyglossia/README.md
index 79b922ef93..79b922ef93 100644
--- a/macros/latex/contrib/polyglossia/README.md
+++ b/macros/unicodetex/latex/polyglossia/README.md
diff --git a/macros/latex/contrib/polyglossia/polyglossia.dtx b/macros/unicodetex/latex/polyglossia/polyglossia.dtx
index 246c37edb0..246c37edb0 100644
--- a/macros/latex/contrib/polyglossia/polyglossia.dtx
+++ b/macros/unicodetex/latex/polyglossia/polyglossia.dtx
diff --git a/macros/latex/contrib/polyglossia/polyglossia.pdf b/macros/unicodetex/latex/polyglossia/polyglossia.pdf
index 6c1979411b..6c1979411b 100644
--- a/macros/latex/contrib/polyglossia/polyglossia.pdf
+++ b/macros/unicodetex/latex/polyglossia/polyglossia.pdf
diff --git a/macros/latex/contrib/unicode-math/CHANGES.md b/macros/unicodetex/latex/unicode-math/CHANGES.md
index facafe8080..facafe8080 100644
--- a/macros/latex/contrib/unicode-math/CHANGES.md
+++ b/macros/unicodetex/latex/unicode-math/CHANGES.md
diff --git a/macros/latex/contrib/unicode-math/LICENSE b/macros/unicodetex/latex/unicode-math/LICENSE
index 2244313901..2244313901 100644
--- a/macros/latex/contrib/unicode-math/LICENSE
+++ b/macros/unicodetex/latex/unicode-math/LICENSE
diff --git a/macros/latex/contrib/unicode-math/MANIFEST.md b/macros/unicodetex/latex/unicode-math/MANIFEST.md
index 638be84dab..638be84dab 100644
--- a/macros/latex/contrib/unicode-math/MANIFEST.md
+++ b/macros/unicodetex/latex/unicode-math/MANIFEST.md
diff --git a/macros/latex/contrib/unicode-math/README.md b/macros/unicodetex/latex/unicode-math/README.md
index 12e0d1157a..12e0d1157a 100644
--- a/macros/latex/contrib/unicode-math/README.md
+++ b/macros/unicodetex/latex/unicode-math/README.md
diff --git a/macros/latex/contrib/unicode-math/RELEASE_CHECKLIST.md b/macros/unicodetex/latex/unicode-math/RELEASE_CHECKLIST.md
index ab250200e0..ab250200e0 100644
--- a/macros/latex/contrib/unicode-math/RELEASE_CHECKLIST.md
+++ b/macros/unicodetex/latex/unicode-math/RELEASE_CHECKLIST.md
diff --git a/macros/latex/contrib/unicode-math/um-code-alphabets.dtx b/macros/unicodetex/latex/unicode-math/um-code-alphabets.dtx
index fd6dd322c8..fd6dd322c8 100644
--- a/macros/latex/contrib/unicode-math/um-code-alphabets.dtx
+++ b/macros/unicodetex/latex/unicode-math/um-code-alphabets.dtx
diff --git a/macros/latex/contrib/unicode-math/um-code-amsmath.dtx b/macros/unicodetex/latex/unicode-math/um-code-amsmath.dtx
index ee1f0642bc..ee1f0642bc 100644
--- a/macros/latex/contrib/unicode-math/um-code-amsmath.dtx
+++ b/macros/unicodetex/latex/unicode-math/um-code-amsmath.dtx
diff --git a/macros/latex/contrib/unicode-math/um-code-api.dtx b/macros/unicodetex/latex/unicode-math/um-code-api.dtx
index 69a6f5a031..69a6f5a031 100644
--- a/macros/latex/contrib/unicode-math/um-code-api.dtx
+++ b/macros/unicodetex/latex/unicode-math/um-code-api.dtx
diff --git a/macros/latex/contrib/unicode-math/um-code-compat.dtx b/macros/unicodetex/latex/unicode-math/um-code-compat.dtx
index 72ce5186da..72ce5186da 100644
--- a/macros/latex/contrib/unicode-math/um-code-compat.dtx
+++ b/macros/unicodetex/latex/unicode-math/um-code-compat.dtx
diff --git a/macros/latex/contrib/unicode-math/um-code-epilogue.dtx b/macros/unicodetex/latex/unicode-math/um-code-epilogue.dtx
index 9c10ee0ddf..9c10ee0ddf 100644
--- a/macros/latex/contrib/unicode-math/um-code-epilogue.dtx
+++ b/macros/unicodetex/latex/unicode-math/um-code-epilogue.dtx
diff --git a/macros/latex/contrib/unicode-math/um-code-fontopt.dtx b/macros/unicodetex/latex/unicode-math/um-code-fontopt.dtx
index acd1117e34..acd1117e34 100644
--- a/macros/latex/contrib/unicode-math/um-code-fontopt.dtx
+++ b/macros/unicodetex/latex/unicode-math/um-code-fontopt.dtx
diff --git a/macros/latex/contrib/unicode-math/um-code-fontparam.dtx b/macros/unicodetex/latex/unicode-math/um-code-fontparam.dtx
index b801b6c0b9..b801b6c0b9 100644
--- a/macros/latex/contrib/unicode-math/um-code-fontparam.dtx
+++ b/macros/unicodetex/latex/unicode-math/um-code-fontparam.dtx
diff --git a/macros/latex/contrib/unicode-math/um-code-main.dtx b/macros/unicodetex/latex/unicode-math/um-code-main.dtx
index ff132044e0..ff132044e0 100644
--- a/macros/latex/contrib/unicode-math/um-code-main.dtx
+++ b/macros/unicodetex/latex/unicode-math/um-code-main.dtx
diff --git a/macros/latex/contrib/unicode-math/um-code-mathmap.dtx b/macros/unicodetex/latex/unicode-math/um-code-mathmap.dtx
index e55fe07c2c..e55fe07c2c 100644
--- a/macros/latex/contrib/unicode-math/um-code-mathmap.dtx
+++ b/macros/unicodetex/latex/unicode-math/um-code-mathmap.dtx
diff --git a/macros/latex/contrib/unicode-math/um-code-mathtext.dtx b/macros/unicodetex/latex/unicode-math/um-code-mathtext.dtx
index d002483378..d002483378 100644
--- a/macros/latex/contrib/unicode-math/um-code-mathtext.dtx
+++ b/macros/unicodetex/latex/unicode-math/um-code-mathtext.dtx
diff --git a/macros/latex/contrib/unicode-math/um-code-msg.dtx b/macros/unicodetex/latex/unicode-math/um-code-msg.dtx
index c93809cf4f..c93809cf4f 100644
--- a/macros/latex/contrib/unicode-math/um-code-msg.dtx
+++ b/macros/unicodetex/latex/unicode-math/um-code-msg.dtx
diff --git a/macros/latex/contrib/unicode-math/um-code-opening.dtx b/macros/unicodetex/latex/unicode-math/um-code-opening.dtx
index 16e3213998..16e3213998 100644
--- a/macros/latex/contrib/unicode-math/um-code-opening.dtx
+++ b/macros/unicodetex/latex/unicode-math/um-code-opening.dtx
diff --git a/macros/latex/contrib/unicode-math/um-code-pkgopt.dtx b/macros/unicodetex/latex/unicode-math/um-code-pkgopt.dtx
index 68d265674a..68d265674a 100644
--- a/macros/latex/contrib/unicode-math/um-code-pkgopt.dtx
+++ b/macros/unicodetex/latex/unicode-math/um-code-pkgopt.dtx
diff --git a/macros/latex/contrib/unicode-math/um-code-primes.dtx b/macros/unicodetex/latex/unicode-math/um-code-primes.dtx
index ad3f3be642..ad3f3be642 100644
--- a/macros/latex/contrib/unicode-math/um-code-primes.dtx
+++ b/macros/unicodetex/latex/unicode-math/um-code-primes.dtx
diff --git a/macros/latex/contrib/unicode-math/um-code-setchar.dtx b/macros/unicodetex/latex/unicode-math/um-code-setchar.dtx
index 8d2ba46e2a..8d2ba46e2a 100644
--- a/macros/latex/contrib/unicode-math/um-code-setchar.dtx
+++ b/macros/unicodetex/latex/unicode-math/um-code-setchar.dtx
diff --git a/macros/latex/contrib/unicode-math/um-code-sscript.dtx b/macros/unicodetex/latex/unicode-math/um-code-sscript.dtx
index a2192714dd..a2192714dd 100644
--- a/macros/latex/contrib/unicode-math/um-code-sscript.dtx
+++ b/macros/unicodetex/latex/unicode-math/um-code-sscript.dtx
diff --git a/macros/latex/contrib/unicode-math/um-code-sym-commands.dtx b/macros/unicodetex/latex/unicode-math/um-code-sym-commands.dtx
index b2450878fe..b2450878fe 100644
--- a/macros/latex/contrib/unicode-math/um-code-sym-commands.dtx
+++ b/macros/unicodetex/latex/unicode-math/um-code-sym-commands.dtx
diff --git a/macros/latex/contrib/unicode-math/um-code-ui.dtx b/macros/unicodetex/latex/unicode-math/um-code-ui.dtx
index 38c257d1dc..38c257d1dc 100644
--- a/macros/latex/contrib/unicode-math/um-code-ui.dtx
+++ b/macros/unicodetex/latex/unicode-math/um-code-ui.dtx
diff --git a/macros/latex/contrib/unicode-math/um-code-usv.dtx b/macros/unicodetex/latex/unicode-math/um-code-usv.dtx
index ce24cc4267..ce24cc4267 100644
--- a/macros/latex/contrib/unicode-math/um-code-usv.dtx
+++ b/macros/unicodetex/latex/unicode-math/um-code-usv.dtx
diff --git a/macros/latex/contrib/unicode-math/um-code-variables.dtx b/macros/unicodetex/latex/unicode-math/um-code-variables.dtx
index 840b1ebec5..840b1ebec5 100644
--- a/macros/latex/contrib/unicode-math/um-code-variables.dtx
+++ b/macros/unicodetex/latex/unicode-math/um-code-variables.dtx
diff --git a/macros/latex/contrib/unicode-math/um-doc-legacyfontdimen.tex b/macros/unicodetex/latex/unicode-math/um-doc-legacyfontdimen.tex
index 5adb24e9f6..5adb24e9f6 100644
--- a/macros/latex/contrib/unicode-math/um-doc-legacyfontdimen.tex
+++ b/macros/unicodetex/latex/unicode-math/um-doc-legacyfontdimen.tex
diff --git a/macros/latex/contrib/unicode-math/um-doc-main.tex b/macros/unicodetex/latex/unicode-math/um-doc-main.tex
index 5c0bc22ed1..5c0bc22ed1 100644
--- a/macros/latex/contrib/unicode-math/um-doc-main.tex
+++ b/macros/unicodetex/latex/unicode-math/um-doc-main.tex
diff --git a/macros/latex/contrib/unicode-math/um-doc-mathfontdimen.tex b/macros/unicodetex/latex/unicode-math/um-doc-mathfontdimen.tex
index 906a786db3..906a786db3 100644
--- a/macros/latex/contrib/unicode-math/um-doc-mathfontdimen.tex
+++ b/macros/unicodetex/latex/unicode-math/um-doc-mathfontdimen.tex
diff --git a/macros/latex/contrib/unicode-math/um-doc-nfsssummary.tex b/macros/unicodetex/latex/unicode-math/um-doc-nfsssummary.tex
index a322ac7f42..a322ac7f42 100644
--- a/macros/latex/contrib/unicode-math/um-doc-nfsssummary.tex
+++ b/macros/unicodetex/latex/unicode-math/um-doc-nfsssummary.tex
diff --git a/macros/latex/contrib/unicode-math/um-doc-stixextract.tex b/macros/unicodetex/latex/unicode-math/um-doc-stixextract.tex
index 53a86a8ab7..53a86a8ab7 100644
--- a/macros/latex/contrib/unicode-math/um-doc-stixextract.tex
+++ b/macros/unicodetex/latex/unicode-math/um-doc-stixextract.tex
diff --git a/macros/latex/contrib/unicode-math/um-doc-style.tex b/macros/unicodetex/latex/unicode-math/um-doc-style.tex
index 729a102ebe..729a102ebe 100644
--- a/macros/latex/contrib/unicode-math/um-doc-style.tex
+++ b/macros/unicodetex/latex/unicode-math/um-doc-style.tex
diff --git a/macros/latex/contrib/unicode-math/unicode-math-code.ltx b/macros/unicodetex/latex/unicode-math/unicode-math-code.ltx
index cff887daed..cff887daed 100644
--- a/macros/latex/contrib/unicode-math/unicode-math-code.ltx
+++ b/macros/unicodetex/latex/unicode-math/unicode-math-code.ltx
diff --git a/macros/latex/contrib/unicode-math/unicode-math-code.pdf b/macros/unicodetex/latex/unicode-math/unicode-math-code.pdf
index 9d87097173..9d87097173 100644
--- a/macros/latex/contrib/unicode-math/unicode-math-code.pdf
+++ b/macros/unicodetex/latex/unicode-math/unicode-math-code.pdf
diff --git a/macros/latex/contrib/unicode-math/unicode-math-table.tex b/macros/unicodetex/latex/unicode-math/unicode-math-table.tex
index 511b67e8ce..511b67e8ce 100644
--- a/macros/latex/contrib/unicode-math/unicode-math-table.tex
+++ b/macros/unicodetex/latex/unicode-math/unicode-math-table.tex
diff --git a/macros/latex/contrib/unicode-math/unicode-math.dtx b/macros/unicodetex/latex/unicode-math/unicode-math.dtx
index 1253cab5d4..1253cab5d4 100644
--- a/macros/latex/contrib/unicode-math/unicode-math.dtx
+++ b/macros/unicodetex/latex/unicode-math/unicode-math.dtx
diff --git a/macros/latex/contrib/unicode-math/unicode-math.ins b/macros/unicodetex/latex/unicode-math/unicode-math.ins
index d0b4dc08d1..d0b4dc08d1 100644
--- a/macros/latex/contrib/unicode-math/unicode-math.ins
+++ b/macros/unicodetex/latex/unicode-math/unicode-math.ins
diff --git a/macros/latex/contrib/unicode-math/unicode-math.ltx b/macros/unicodetex/latex/unicode-math/unicode-math.ltx
index c3a13fd370..c3a13fd370 100644
--- a/macros/latex/contrib/unicode-math/unicode-math.ltx
+++ b/macros/unicodetex/latex/unicode-math/unicode-math.ltx
diff --git a/macros/latex/contrib/unicode-math/unicode-math.pdf b/macros/unicodetex/latex/unicode-math/unicode-math.pdf
index 1d2cf0948a..1d2cf0948a 100644
--- a/macros/latex/contrib/unicode-math/unicode-math.pdf
+++ b/macros/unicodetex/latex/unicode-math/unicode-math.pdf
diff --git a/macros/latex/contrib/unicode-math/unimath-example.ltx b/macros/unicodetex/latex/unicode-math/unimath-example.ltx
index d8f75961a8..d8f75961a8 100644
--- a/macros/latex/contrib/unicode-math/unimath-example.ltx
+++ b/macros/unicodetex/latex/unicode-math/unimath-example.ltx
diff --git a/macros/latex/contrib/unicode-math/unimath-example.pdf b/macros/unicodetex/latex/unicode-math/unimath-example.pdf
index a339e72f9d..a339e72f9d 100644
--- a/macros/latex/contrib/unicode-math/unimath-example.pdf
+++ b/macros/unicodetex/latex/unicode-math/unimath-example.pdf
diff --git a/macros/latex/contrib/unicode-math/unimath-symbols.ltx b/macros/unicodetex/latex/unicode-math/unimath-symbols.ltx
index df6ac0e986..df6ac0e986 100644
--- a/macros/latex/contrib/unicode-math/unimath-symbols.ltx
+++ b/macros/unicodetex/latex/unicode-math/unimath-symbols.ltx
diff --git a/macros/latex/contrib/unicode-math/unimath-symbols.pdf b/macros/unicodetex/latex/unicode-math/unimath-symbols.pdf
index c2b54bc257..c2b54bc257 100644
--- a/macros/latex/contrib/unicode-math/unimath-symbols.pdf
+++ b/macros/unicodetex/latex/unicode-math/unimath-symbols.pdf
diff --git a/macros/xetex/latex/fontspec b/macros/xetex/latex/fontspec
deleted file mode 120000
index 4cd5eea22e..0000000000
--- a/macros/xetex/latex/fontspec
+++ /dev/null
@@ -1 +0,0 @@
-../../latex/contrib/fontspec
\ No newline at end of file
diff --git a/macros/xetex/latex/lilyglyphs b/macros/xetex/latex/lilyglyphs
deleted file mode 120000
index 759c02dab2..0000000000
--- a/macros/xetex/latex/lilyglyphs
+++ /dev/null
@@ -1 +0,0 @@
-../../..//macros/luatex/latex/lilyglyphs
\ No newline at end of file
diff --git a/macros/xetex/latex/polyglossia b/macros/xetex/latex/polyglossia
deleted file mode 120000
index dc1ba1aab2..0000000000
--- a/macros/xetex/latex/polyglossia
+++ /dev/null
@@ -1 +0,0 @@
-../../latex/contrib/polyglossia
\ No newline at end of file