CTAN sync 201911160300

287 files changed, 7415 insertions, 13234 deletions

diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/README b/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/README
index bb47167ed2..1fad026530 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/README
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/README
@@ -2,8 +2,8 @@ biblatex-caspervector: Casper Ti. Vector's biblatex style
 ---------------------------------------------------------
 
 Maintainer: Casper Ti. Vector <CasperVector@gmail.com>
-Homepage: <https://gitlab.com/CasperVector/biblatex-caspervector>
-License: LaTeX Project Public License 1.3 or later
+Homepage: <https://gitea.com/CasperVector/biblatex-caspervector>
+Licence: LaTeX Project Public Licence 1.3 or later
 
 This package provides a simple, nice and easily extensible
 biblography/citation style for Chinese LaTeX users.
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/doc/ChangeLog.txt b/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/doc/ChangeLog.txt
index 15fb808f8a..1fcb3b6c81 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/doc/ChangeLog.txt
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/doc/ChangeLog.txt
@@ -1,7 +1,27 @@
-2018-06-29, v0.3.3
+2019-11-13, v0.3.4
+
+	* API changes:
+	- Add support for both Chinese and English `authortype'/`editortype'/...
+	- Add the `cparen' option to use Chinese parentheses in citations.
 
 	* Changes to package code:
+	- Facilitate customisation of the character before `等', `译' etc.
+	- Use more common words ("检索"/"retrieve" -> "访问"/"access").
+
+	* Changes to documentation:
+	- Migrate to latexmk.
+	- caspervector-ay.bbx: use upstreamed `bbx:ifmergeddate'.
+
+	* Misc:
+	- README: migrate to Gitea, "for obvious reasons".
+	- Minor fixes and cosmetics.
+
+2018-06-29, v0.3.3
+
+	* API changes:
 	- Add support for the `edition' field.
+
+	* Changes to package code:
 	- Refine `maxcitenames'/`mincitenames'.
 	- blx-caspervector-base.def: fix "et al" for citations.
 	- blx-caspervector-base.def: improve spacing between `title' and `type'.
@@ -45,9 +65,9 @@
 2018-05-28. v0.3.0
 
 	* API changes:
-	- Added the caspervector-ay style (`dashed' and `mergedate' supported).
-	- sorting: nty -> nyt.
-	- Reduced tolerance in `year'/`date'; `note' added for compensation.
+	- Add the caspervector-ay style (`dashed' and `mergedate' supported).
+	- Sorting: nty -> nyt.
+	- Reduced tolerance in `year'/`date'; `note' added in compensation.
 	- Support `useauthor'-related functionalities.
 
 	* Changes to package code:
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/doc/Makefile b/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/doc/Makefile
deleted file mode 100644
index e37bda40e6..0000000000
--- a/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/doc/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright (c) 2011-2013,2015-2016,2018 Casper Ti. Vector
-# Public domain.
-
-JOB = caspervector
-
-doc:
-	latex $(JOB)
-	biber -l zh__pinyin --output-safechars $(JOB)
-	xelatex $(JOB)
-	xelatex $(JOB)
-
-clean:
-	rm -f $(JOB).aux $(JOB).bbl $(JOB).bcf $(JOB).blg $(JOB).dvi $(JOB).log \
-		$(JOB).run.xml $(JOB).out missfont.log texput.log
-
-distclean: clean
-	rm -f $(JOB).pdf
-
-# vim:ts=4:sw=4
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/doc/caspervector-ay.pdf b/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/doc/caspervector-ay.pdf
index ef68b0d0c1..a43513a2de 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/doc/caspervector-ay.pdf
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/doc/caspervector-ay.pdf
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/doc/caspervector-ay.tex b/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/doc/caspervector-ay.tex
index 2b4fb867ec..a98f37b11e 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/doc/caspervector-ay.tex
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/doc/caspervector-ay.tex
@@ -45,14 +45,17 @@
 \begin{center}
 \begin{tabular}{ll}\hline
 引用命令 &	排版结果 \\\hline
-\verb|\cite{10-5, 10-6}| &	\cite{10-5, 10-6} \\
+\verb|\cite{10-7, 10-8}| &	\cite{10-7, 10-8} \\
 \verb|\parencite[见][第 4 页]{perelman}| &	\parencite[见][第 4 页]{perelman} \\
 \verb|\parencite{6-1, blx-gb7714-2015}| &	\parencite{6-1, blx-gb7714-2015} \\
 \verb|\textcite{biblatex, a2-3}| &	\textcite{biblatex, a2-3} \\\hline
-\multicolumn{2}{l}{（更多用法请参考 \texttt{texdoc 50-style-authoryear}。）} \\
 \end{tabular}
 \end{center}
 
+更多用法请参考 \verb|texdoc 50-style-authoryear|。此外 v0.3.4 的
+\verb|caspervector| 样式中新加入了 \verb|cparen| 选项，可在调用样式时
+开启（\verb|cparen = true|）以将上述命令产生的括号改为中文（全角）括号。
+
 \printbibliography[category = cited, title = {本文参考文献}]
 \printbibliography[notcategory = cited, title = {%
 	其它参考文献示例
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/doc/caspervector.bib b/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/doc/caspervector.bib
index ef920133ac..72484e316a 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/doc/caspervector.bib
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/doc/caspervector.bib
@@ -52,6 +52,16 @@
 	language = {english},
 }
 
+@book{liuxie,
+	author = {刘勰},
+	title = {文心雕龙译注},
+	editor = {陆侃如 and 牟世金},
+	editortype = {译注},
+	publisher = {齐鲁书社},
+	date = {1995},
+	language = {chinese},
+}
+
 @book{1-1,
 	author = {余敏},
 	title = {出版集团研究},
@@ -183,7 +193,7 @@
 }
 
 @incollection{2-2,
-	author = {陈晋镶 and 张惠民 and 朱士兴 and 其他作者},
+	author = {陈晋镳 and 张惠民 and 朱士兴 and 其他作者},
 	title = {蓟县震旦亚界研究},
 	type = {M},
 	bookauthor = {中国地质科学院天津地质矿产研究所},
@@ -529,7 +539,29 @@
 	language = {chinese},
 }
 
-@article{10-5,
+@book{10-5,
+	author = {Crane, D.},
+	title = {Invisible college},
+	type = {M},
+	location = {Chicago},
+	publisher = {Univ. of Chicago Press},
+	year = {1972},
+	language = {english},
+}
+
+@article{10-6,
+	author = {Stieg, M. F.},
+	title = {The information needs of historians},
+	type = {J},
+	journal = {College and Research Libraries},
+	year = {1981},
+	volume = {42},
+	number = {6},
+	pages = {549-560},
+	language = {english},
+}
+
+@article{10-7,
 	author = {Kennedy, W. J. and Garrison, R. E.},
 	title = {Morphology and genesis of nodular chalks and hardgrounds in the Upper Cretaceous of southern England},
 	type = {J},
@@ -540,7 +572,7 @@
 	language = {english},
 }
 
-@article{10-6,
+@article{10-8,
 	author = {Kennedy, W. J. and Garrison, R. E.},
 	title = {Morphology and genesis of nodular phosphates in the Cenomanian of south-east England},
 	type = {J},
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/doc/caspervector.pdf b/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/doc/caspervector.pdf
index caf3071af0..223d78746d 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/doc/caspervector.pdf
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/doc/caspervector.pdf
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/doc/caspervector.tex b/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/doc/caspervector.tex
index a3e9e51745..5465f92b50 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/doc/caspervector.tex
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/doc/caspervector.tex
@@ -1,6 +1,6 @@
 % Documentation for biblatex-caspervector
 %
-% Copyright (c) 2012-2016,2018 Casper Ti. Vector
+% Copyright (c) 2012-2016,2018-2019 Casper Ti. Vector
 %
 % This work may be distributed and/or modified under the conditions of the
 % LaTeX Project Public License, either version 1.3 of this license or (at
@@ -23,29 +23,37 @@
 	backend = biber, style = caspervector, utf8,
 	giveninits = true, sortgiveninits = true
 ]{biblatex}
-\usepackage{fancyhdr, hyperref, enumitem, fancyvrb, hologo}
+\usepackage{iftex, fancyhdr, hyperref, enumitem, fancyvrb, hologo}
 
 \hypersetup{colorlinks = true, allcolors = blue}
 \pagestyle{fancy}\fancyhf{}\cfoot{\thepage}
-\renewcommand{\headrulewidth}{0pt}
-\setlist{nolistsep}
-\setlength{\hfuzz}{3pt}
+\renewcommand*{\headrulewidth}{0pt}
 \ctexset{linestretch = {\maxdimen}}
-\renewcommand{\bibfont}{\small}
+\setlength{\hfuzz}{3pt}
+\setlist{nolistsep}
+\renewcommand*{\bibfont}{\small}
+
+\newcommand*{\cupercite}[1]{\supercite{#1}\mbox{}}
 \newcommand{\myemph}[1]{\emph{\textcolor{red}{#1}}}
+\RecustomVerbatimEnvironment{Verbatim}{Verbatim}%
+	{frame = single, tabsize = 4, formatcom = {\ifXeTeX\xeCJKVerbAddon\fi}}
+\RecustomVerbatimCommand{\VerbatimInput}{VerbatimInput}{
+	fontsize = {\small}, baselinestretch = 1,
+	tabsize = 4, formatcom = {\ifXeTeX\xeCJKVerbAddon\fi}
+}
 
 \DeclareBibliographyCategory{cited}
 \AtEveryCitekey{\addtocategory{cited}{\thefield{entrykey}}}
 \addbibresource{caspervector.bib}
 
 \begin{document}
-\title{\textbf{biblatex 参考文献和引用样式：\texttt{caspervector} v0.3.3}}
+\title{\textbf{biblatex 参考文献和引用样式：\texttt{caspervector} v0.3.4}}
 \author{%
 	Casper Ti.\ Vector\thanks{\ %
 		\href{mailto:CasperVector@gmail.com}{\texttt{CasperVector@gmail.com}}.%
 	}%
 }
-\date{2018/06/29}
+\date{2019/11/13}
 \maketitle
 
 \section{引言}
@@ -55,7 +63,7 @@
 使开发者难以入门和精通，更不便于一般用户进行自定义；
 其次，其排序方式很单一，
 无法直接实现中文 \hologo{TeX} 用户常常遇到的按汉语拼音排序等需求。
-与此相对应，biblatex\supercite{biblatex}/biber\supercite{biber}
+与此相对应，biblatex\cupercite{biblatex}/biber\cupercite{biber}
 是一套新兴的 \hologo{TeX} 参考文献排版引擎，
 其样式文件（设定参考文献样式的 \verb|bbx| 文件和设定引用样式的 \verb|cbx| 文件）
 使用 \hologo{LaTeX} 编写，便于学习；
@@ -64,28 +72,27 @@
 为了个人需要，同时也是为了给社区提供一个有益的参考，
 本文作者根据实际应用中遇到的常见需求编写了
 \verb|caspervector| 这个中西文 biblatex 样式。
-其逻辑框架基于国家标准 GB/T 7714--2005\supercite{gbt7714-2005}，
+其逻辑框架基于国家标准 GB/T 7714--2005\cupercite{gbt7714-2005}，
 但在后者基础上根据个人审美趣味和 biblatex 所能实现的功能而
 对参考文献和引用格式进行了较大幅度的修改。
 用户如果需要更严格符合国家标准的样式，可以参考
-\verb|gb7714-2015|\supercite{blx-gb7714-2015}。
+\verb|gb7714-2015|\cupercite{blx-gb7714-2015}。
 
 \section{许可协议}
 
-版权所有 \copyright\ 2012--2018 Casper Ti.\ Vector。%
+版权所有 \copyright\ 2012--2019 Casper Ti.\ Vector。%
 \verb|caspervector| 参考文献和引用样式以
 \hologo{LaTeX} Project Public License\footnote{\ %
 	\url{https://www.latex-project.org/lppl/}.%
 }发布。%
 \verb|caspervector| 样式目前由其作者维护。
 
-\section{系统要求和安装方式}
-\subsection{系统要求}
+\section{系统要求}
 
 \begin{itemize}
 	\item biblatex 宏包（2.0 或以上版本）：%
 		\verb|caspervector| 样式基于 biblatex 宏包。
-	\item biber 程序（和 biblatex 相应的版本）：
+	\item biber 程序（和 biblatex 的相应版本）：
 		用 biber 可以方便地实现文献按字母和拼音顺序排序。
 	\item 中文环境：%
 		\verb|caspervector| 样式虽支持中文，但其本身不提供中文环境。
@@ -100,7 +107,7 @@
 
 用户应当通过以下命令调用 \verb|caspervector| 样式（如果须要使用
 作者--年编码制，应将 \verb|caspervector| 换成 \verb|caspervector-ay|）：
-\begin{Verbatim}[frame = single]
+\begin{Verbatim}
 % “utf8”可能须要改为“gbk”，根据用户使用的字符编码而定。
 % “...” 代表其它选项。
 \usepackage[
@@ -108,7 +115,7 @@
 ]{biblatex}
 \end{Verbatim}
 其中 \verb|sorting| 选项用于（全局）指定按哪些字段排序，
-除 biblatex 提供的标准选项\supercite{biblatex}外，%
+除 biblatex 提供的标准选项\cupercite{biblatex}外，%
 \verb|caspervector| 样式还提供 \verb|cenyt| 和 \verb|ecnyt| 两种排序方案
 （\verb|caspervector| 默认设置为 \verb|none| 排序方案，即按引用顺序排序），
 表示依次按文献语言
@@ -126,7 +133,7 @@
 通过 \verb|\addbibresource| 命令导入，%
 \myemph{注意不要省略扩展名 \texttt{.bib}}。
 例如，本文的参考文献数据库就是通过下述命令导入的：
-\begin{Verbatim}[frame = single]
+\begin{Verbatim}
 \addbibresource{caspervector.bib}
 \end{Verbatim}
 用户可以多次使用 \verb|\addbibresource| 命令，
@@ -137,7 +144,7 @@
 \verb|caspervector| 样式在顺序编码制下支持 biblatex 所提供的引用命令，
 其中最常用的是 \verb|\supercite|、\verb|\parencite| 和 \verb|\cite|。
 三个命令的用法类似：
-\begin{Verbatim}[frame = single]
+\begin{Verbatim}
 % 可选参数 prenote 和 postnote 分别用于设定引用记号前、后的注释。
 \citecommand[prenote][postnote]{key}
 \end{Verbatim}
@@ -154,14 +161,14 @@
 例如，在本文中，%
 \verb|\parencite{gbt7714-2005}| 的输出是“\parencite{gbt7714-2005}”，
 而以下代码的输出是“\cite[文献][第 4 页]{gbt7714-2005}”：
-\begin{Verbatim}[frame = single]
+\begin{Verbatim}
 \cite[文献][第 4 页]{gbt7714-2005}
 \end{Verbatim}
 
 \subsection{文献列表}
 
 使用 \verb|\printbibliography| 命令可以在相应位置排版文献列表。
-其可（在方括号内）带一些可选参数\supercite{biblatex}，
+其可（在方括号内）带一些可选参数\cupercite{biblatex}，
 常见的有：
 \begin{itemize}
 	\item \verb|title = 标题|：
@@ -174,14 +181,14 @@
 \end{itemize}
 
 例如，以下代码可以将文献列表的标题改为 “文献”，并使文献列表参与章节编号：
-\begin{Verbatim}[frame = single]
+\begin{Verbatim}
 \printbibliography[title = {文献}, heading = bibnumbered]
 \end{Verbatim}
 
 \subsection{编译方法}
 
 一般情况下，依次执行以下代码即可实现正确的排版：
-\begin{Verbatim}[frame = single]
+\begin{Verbatim}
 # “texfile”是被 TeX 编译的文件名中除去“.tex”的部分。
 # “pdflatex”可改为其它 TeX 程序，使用纯 latex 编译时可能还须要运行 dvipdfmx。
 pdflatex texfile
@@ -218,7 +225,7 @@ pdflatex texfile
 		v0.3.2 和更早版本的 \texttt{caspervector} 样式不支持 \texttt{edition}
 		字段，但可手动在 \texttt{title} 字段中标注相应信息。%
 	}，若为整数则会自动排版为“第 2 版”或“2nd ed.”等形式。
-	\item \verb|type|：文献类型和电子文献载体标志代码\supercite{gbt7714-2005}。
+	\item \verb|type|：文献类型和电子文献载体标志代码\cupercite{gbt7714-2005}。
 	\item \verb|location|：出版地，或（在 \verb|@patent| 类条目中）专利申请地。
 	\item \verb|publisher|：出版者，或学位论文作者申请学位的单位。
 	\item \verb|journal|/\verb|journaltitle|：连续出版物题名，两个字段互相等价。
@@ -243,9 +250,11 @@ pdflatex texfile
 	\item \verb|language|：
 		值为 \verb|chinese| 时，相应条目在文献列表中用中文排版；
 		否则（为其他值或未定义时）用西文排版。
+	\item \verb|authortype|、\verb|editortype| 等：用于指定
+		作者、编者的具体角色，参考第 \ref{sec:editortype} 部分。
 	\item \verb|note|：用于排版一些特殊内容，参考第 \ref{sec:faq} 部分。
 	\item \verb|userf|：\verb|caspervector| 样式内部使用。
-	\item 其它通用特殊字段，见 biblatex 手册\supercite{biblatex}。
+	\item 其它通用特殊字段，见 biblatex 手册\cupercite{biblatex}。
 \end{itemize}
 
 \section{条目类型}\label{sec:entries}
@@ -341,14 +350,14 @@ pdflatex texfile
 例如，如须对被引用的文献按照引用顺序排序，
 而对未引用的文献按照西文文献在前、中文文献在后排序，
 则可以在导言区中加入下列几行代码：
-\begin{Verbatim}[frame = single]
+\begin{Verbatim}
 % 新建条目分类（category）用于区分被引用和未引用的文献条目。
 \DeclareBibliographyCategory{cited}
 % 每执行一次除 \nocite 之外的 \cite 类命令，将被引用的文献加到“cited”分类中。
 \AtEveryCitekey{\addtocategory{cited}{\thefield{entrykey}}}
 \end{Verbatim}
 在正文中准备排版文献列表的位置使用如下代码：
-\begin{Verbatim}[frame = single]
+\begin{Verbatim}
 % 按引用顺序排版“cited”分类，即被引用的文献条目。
 \begin{refcontext}[sorting = none]
 \printbibliography[category = cited, ..., title = {References}]
@@ -365,7 +374,7 @@ pdflatex texfile
 	\texttt{\string\cite} 类命令的引用顺序。
 }（例如，在本说明文档中，就是在 \verb|\end{document}| 之前一行）
 加入以下代码：
-\begin{Verbatim}[frame = single]
+\begin{Verbatim}
 % 将 .bib 文件中所有的参考文献都加到引用列表中，但不将它们加到“cited”分类中，
 % 也不会排版引用标号，只是在最后的 \printbibliography 命令中排版相应的文献条目。
 \nocite{*}
@@ -373,7 +382,7 @@ pdflatex texfile
 
 使用 biblatex 2.x 或更旧版本的用户须要
 将在正文中准备排版文献列表的位置使用的代码改为：
-\begin{Verbatim}[frame = single]
+\begin{Verbatim}
 % 按引用顺序排版“cited”分类，即被引用的文献条目。
 \printbibliography[category = cited, ..., sorting = none, title = {References}]
 % 按西文文献在前、中文文献在后排版“cited”分类之外，即未被引用的文献条目。
@@ -384,6 +393,44 @@ biblatex 3.0--3.3 中有一个 bug\footnote{\ %
 	可以参考 \url{https://tex.stackexchange.com/questions/250548/}。%
 } 导致分类排序失效，此问题基本无解。
 
+\section{指定作者、编者的角色}\label{sec:editortype}
+
+当 \verb|author|/\verb|editor| 字段对应的贡献者并不是标准的作者/编者时，
+可以使用 \verb|authortype|/\verb|editortype| 来指定作者/编者的具体角色，
+例如文献 \parencite{liuxie} 是通过 \verb|.bib| 文件中的以下代码排版的：
+\begin{Verbatim}
+@book{liuxie,
+	author = {刘勰},
+	title = {文心雕龙译注},
+	editor = {陆侃如 and 牟世金},
+	editortype = {译注},
+	...
+}
+\end{Verbatim}
+如果有多种角色的贡献者参与了文献的编写，还可以使用同被 biblatex 支持的
+\verb|editora|/\verb|editoratype|、\verb|editorb|/\verb|editorbtype|、%
+\verb|editorc|/\verb|editorctype| 字段。
+
+上述的 \verb|editortype| 类字段还可以设为 \verb|translatoran|
+等特殊值（biblatex 中预定义的列表见其手册\supercite{biblatex}），
+它们在通过类似于以下的代码定义之后会被展开为对应的内容：
+\begin{Verbatim}
+\NewBibliographyString{translatoran, bytranslatoran}
+\DefineBibliographyStrings{english}{
+    translatoran = {trans\adddot\ and annot\adddot},
+    bytranslatoran = {trans\adddot\ and annot\adddot\ by},
+}
+\end{Verbatim}
+对于中文文献，\verb|editortype| 类字段中的特殊值在定义时须加上前缀
+\verb|cn|，例如可以使用以下代码为中文文献定义特殊值 \verb|translatoran|：
+\begin{Verbatim}
+\NewBibliographyString{cntranslatoran}
+\DefineBibliographyStrings{english}{cntranslatoran = {译注}}
+\end{Verbatim}
+因为汉语语法的缘故，中文文献不需要定义 \verb|bytranslatoran|
+之类的特殊值；此外考虑到这一用法所需的额外代码，一般而言对于
+中文文献直接将 \verb|editortype| 类字段设为“译注”等显然更加方便。
+
 \section{FAQ 和其它使用提示}\label{sec:faq}
 
 用户可以通过省略可选字段的方式来避免排版相应的内容。
@@ -394,11 +441,11 @@ biblatex 的标准格式支持通过 \verb|eprint|、\verb|eprintclass|、\verb|
 故使用了自由格式的 \verb|eid| 字段。用户可以使用 \verb|\printtext|
 命令调用 biblatex 中内置的相应排版功能，例如文献 \parencite{perelman}
 中的电子标识码便是通过以下设定得到的：
-\begin{Verbatim}[frame = single]
+\begin{Verbatim}
 eid = {\printtext[eprint:arxiv]{math/0211159}},
 \end{Verbatim}
 其中 \verb|arxiv| 可以替换为其它在标准格式中被 \verb|eprinttype|
-字段支持的字符串，详见 biblatex 手册\supercite{biblatex}；
+字段支持的字符串，详见 biblatex 手册\cupercite{biblatex}；
 如果须要排版 DOI，应将方括号中的整个字符串替换为 \verb|doi|。%
 \myemph{%
 	须要特别注意的是，如果电子标识码中有特殊字符如
@@ -409,7 +456,7 @@ eid = {\printtext[eprint:arxiv]{math/0211159}},
 用户在很多时候可以通过手动调用格式化命令来临时覆盖预设的格式设定，
 例如对于一个 \verb|@article| 类型的条目，以下代码将使年卷期号排版为类似于
 “\textbf{2018}，\textit{14}(\hologo{TeX} 特刊)”的形式：
-\begin{Verbatim}[frame = single]
+\begin{Verbatim}
 year = {2018},
 volume = {14},
 number = {\hologo{TeX} 特刊},
@@ -425,7 +472,7 @@ number = {\hologo{TeX} 特刊},
 	\texttt{year} 字段中设定特殊内容；在之后的版本中，为了支持作者--年编码制，
 	\texttt{caspervector} 的内部实现进行了调整，导致其不再支持这样的用法。%
 }：
-\begin{Verbatim}[frame = single]
+\begin{Verbatim}
 origdate = {1845},
 note = {\textbf{1845}（\emph{清同治四年}）},
 \end{Verbatim}
@@ -442,7 +489,7 @@ biblatex 3.0--3.3 的功能调整导致分类排序失效。%
 \parencite{3-2} 中同时有出版起止年和起止期号的情况就无法自动排版，
 只能通过用户手动实现。下面两种方式均可实现上述需求
 （\verb|origdate| 字段的用法请参考第 \ref{sec:faq} 部分）：
-\begin{Verbatim}[frame = single]
+\begin{Verbatim}
 @periodical{3-2,
 	author = {中国图书馆学会},
 	title = {图书馆学通讯},
@@ -455,7 +502,7 @@ biblatex 3.0--3.3 的功能调整导致分类排序失效。%
 }
 \end{Verbatim}
 或
-\begin{Verbatim}[frame = single]
+\begin{Verbatim}
 @customf{3-2,
 	author = {中国图书馆学会},
 	title = {图书馆学通讯},
@@ -480,7 +527,7 @@ biblatex 3.0--3.3 的功能调整导致分类排序失效。%
 \end{refcontext}
 
 \section{更新记录}
-\VerbatimInput[tabsize = 4, fontsize = {\small}, baselinestretch = 1]{ChangeLog.txt}
+\VerbatimInput{ChangeLog.txt}
 
 \nocite{*}
 \end{document}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/doc/latexmkrc b/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/doc/latexmkrc
new file mode 100644
index 0000000000..55643379cf
--- /dev/null
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/doc/latexmkrc
@@ -0,0 +1,9 @@
+# Copyright (c) 2019 Casper Ti. Vector
+# Public domain.
+
+@default_files = ('caspervector', 'caspervector-ay');
+$pdf_mode = 5;
+$bibtex_use = 1.5;
+$biber = "biber -l zh__pinyin --output-safechars %O %S";
+$clean_ext = "run.xml";
+
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/tex/blx-caspervector-base.def b/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/tex/blx-caspervector-base.def
index 279b7e5281..bb46b2eb74 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/tex/blx-caspervector-base.def
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/tex/blx-caspervector-base.def
@@ -1,6 +1,6 @@
 % Casper Ti. Vector's biblatex style
 %
-% Copyright (c) 2012-2018 Casper Ti. Vector
+% Copyright (c) 2012-2019 Casper Ti. Vector
 %
 % This work may be distributed and/or modified under the conditions of the
 % LaTeX Project Public License, either version 1.3 of this license or (at
@@ -23,17 +23,19 @@
 %   blx-caspervector-utf8.def
 
 \ProvidesFile{blx-caspervector-base.def}%
-	[2018/06/29 v0.3.3 Casper Ti. Vector's biblatex library]
+	[2019/11/13 v0.3.4 Casper Ti. Vector's biblatex library]
 
 \RequireBiber[3]
 \newtoggle{bbx:gbk}
 \newtoggle{bbx:ugly}
+\newtoggle{bbx:cparen}
 \newtoggle{bbx:bfdate}\toggletrue{bbx:bfdate}
 \DeclareBibliographyOption{utf8}[true]{\togglefalse{bbx:gbk}}
 \DeclareBibliographyOption{gbk}[true]{\toggletrue{bbx:gbk}}
 \DeclareBibliographyOption{ugly}[true]{\settoggle{bbx:ugly}{#1}}
+\DeclareBibliographyOption{cparen}[true]{\settoggle{bbx:cparen}{#1}}
 \ExecuteBibliographyOptions{%
-	gbk, ugly = false, autopunct = false, alldates = iso,
+	gbk, ugly = false, cparen = false, autopunct = false, alldates = iso,
 	minnames = 3, minitems = 3, maxcitenames = 2, mincitenames = 1%
 }
 \AtEndOfPackage{%
@@ -88,10 +90,17 @@
 		}}%
 }
 
+\NewBibliographyString{cnauthor, cneditor, cntranslator}
 \newcommand*{\bbx@cetext}[2]{\iffieldequalstr{userf}{zh}{#1}{#2}}
-\newcommand*{\bbx@cietext}[2]{\ifboolexpr{%
+\newcommand*{\bbx@cietext}[2]{\ifboolexpr{
 	test {\ifcitation} or test {\iffieldequalstr{userf}{zh}}
 }{#1}{#2}}
+\newcommand*{\bbx@cieparen}[2]{\ifboolexpr{
+	test {\ifcitation} and test {\iftoggle{bbx:cparen}}
+}{#1}{#2}}
+\newcommand*{\bbx@ifstrg}[3]{\ifboolexpr{%
+	test {\ifstrequal{#1}{author}} and test {\iffieldundef{authortype}}
+}{#3}{#2}}
 \newcommand*{\bbx@cecomma}{\bbx@cepunct{\bbx@cncomma}{\addcomma\addspace}}
 \newcommand*{\bbx@cecolon}{\bbx@cepunct{\bbx@cncolon}{\addcolon\addspace}}
 \newcommand*{\bbx@cescolon}{\bbx@cepunct{\bbx@cnscolon}{\addsemicolon\addspace}}
@@ -109,9 +118,12 @@
 \DefineBibliographyExtras{english}{%
 	\renewcommand*{\finalandcomma}{}%
 }
+\renewcommand*{\bibleftparen}{\bbx@cieparen{\bbx@cnlparen}{\blx@postpunct(}}
+\renewcommand*{\bibrightparen}%
+	{\bbx@cieparen{\bbx@cnrparen}{\blx@postpunct)\midsentence}}
+\DeclareDelimFormat[textcite]{nameyeardelim}{\bbx@cieparen{}{\addspace}}
+\DeclareDelimFormat[textcite]{nonameyeardelim}{\bbx@cieparen{}{\addspace}}
 
-\DefineBibliographyStrings{english}%
-	{bibliography = {\bbx@cnbib}, references = {\bbx@cnbib}}
 \DeclareFieldFormat*{pages}{#1}
 \DeclareFieldFormat*{url}{\url{#1}}
 \DeclareFieldFormat*{urldate}{#1}
@@ -124,51 +136,79 @@
 		{\ifinteger{#1}{\mkbibordedition{#1}~\bibstring{edition}}{#1\isdot}}%
 }
 \newcommand*{\bbx@print}[1]{\iffieldundef{#1}{}{\printfield{#1}}}
-\newcommand*{\bbx@byspace}[1]%
-	{\ifnumgreater{\value{#1}}{\value{maxnames}}{}{\addspace}}
+\newbibmacro*{cntypedelim}[1]{\ifandothers{#1}{}{\printtext{\andothersdelim}}}
 \newbibmacro*{cein:}%
 	{\printtext{\bbx@cetext{\bbx@cnin}{In}\bbx@cecolon}\printtext{}}
 
-\newbibmacro*{ceedtrans}[1]{%
+\newbibmacro*{cnauedstrg}[2]{%
+	\printtext[#1type]{\iffieldundef{#1type}{\bibstring{cn#2}}{%
+		\ifbibxstring{cn\thefield{#1type}}%
+			{\bibstring{cn\thefield{#1type}}}{\thefield{#1type}}%
+	}}%
+}
+\newbibmacro*{cnauthorstrg}{\usebibmacro{cnauedstrg}{author}{author}}
+\newbibmacro*{cneditorstrg}{\usebibmacro{cnauedstrg}{editor}{editor}}
+\newbibmacro*{cntranslatorstrg}{\printtext{\bibstring{cntranslator}}}
+
+\newbibmacro*{ceauedtrans}[1]{%
 	\ifboolexpr{test {\iftoggle{blx@use#1}} and not test {\ifnameundef{#1}}}{%
-		\printnames{#1}%
-		\bbx@cetext%
-			{\printtext{\bbx@byspace{#1}\@nameuse{bbx@cn#1}}}%
-			{\setunit{\printdelim{#1typedelim}}\usebibmacro{#1strg}}%
-		\clearname{#1}%
+		\printnames{#1}\bbx@ifstrg{#1}{%
+			\bbx@cetext%
+				{\usebibmacro{cntypedelim}{#1}\usebibmacro{cn#1strg}}%
+				{\setunit{\printdelim{#1typedelim}}\usebibmacro{#1strg}}%
+		}{}\ifstrequal{#1}{author}{}{\clearname{#1}}%
 	}{}%
 }
-\renewbibmacro*{editor}{\usebibmacro{ceedtrans}{editor}}
-\renewbibmacro*{translator}{\usebibmacro{ceedtrans}{translator}}
+\renewbibmacro*{author}{\usebibmacro{ceauedtrans}{author}}
+\renewbibmacro*{editor}{\usebibmacro{ceauedtrans}{editor}}
+\renewbibmacro*{translator}{\usebibmacro{ceauedtrans}{translator}}
 \newbibmacro*{bookauthor/editor}{%
 	\ifnameundef{bookauthor}%
-		{\usebibmacro{ceedtrans}{editor}}{\printnames{bookauthor}}%
+		% Differs from `\usebibmacro{editor}' in caspervector-ay.
+		{\usebibmacro{ceauedtrans}{editor}}{\printnames{bookauthor}}%
 }
 
-\newbibmacro*{cebyauthx}[1]{%
-	\ifboolexpr{
-		test {\ifnameundef{#1}} or
-		(test {\ifstrequal{#1}{author}} and test {\ifuseauthor})
-	}{}{%
+\newbibmacro*{cebyauedbase}[2]{%
+	\bbx@cetext{%
+		\printnames[by#1]{#1}\usebibmacro{cntypedelim}{#1}%
+		\usebibmacro{cnauedstrg}{#1}{#2}%
+	}{%
+		\usebibmacro{bytypestrg}{#1}{#2}%
+		\setunit{\addspace}\printnames[by#1]{#1}%
+	}%
+}
+\renewbibmacro*{byauthor}{%
+	\ifboolexpr{test {\ifuseauthor} or test {\ifnameundef{author}}}%
+		{}{\usebibmacro{cebyauedbase}{author}{author}}%
+}
+\renewbibmacro*{byeditor}{%
+	\ifnameundef{editor}{}%
+		{\usebibmacro{cebyauedbase}{editor}{editor}\setunit*{\bbx@cescolon}}%
+	\ifnameundef{editora}{}%
+		{\usebibmacro{cebyauedbase}{editora}{editor}\setunit*{\bbx@cescolon}}%
+	\ifnameundef{editorb}{}%
+		{\usebibmacro{cebyauedbase}{editorb}{editor}\setunit*{\bbx@cescolon}}%
+	\ifnameundef{editorc}{}%
+		{\usebibmacro{cebyauedbase}{editorc}{editor}\setunit*{\bbx@cescolon}}%
+}
+\renewbibmacro*{bytranslator}{%
+	\ifnameundef{translator}{}{%
 		\bbx@cetext{%
-			\printnames[by#1]{#1}%
-			\printtext{\bbx@byspace{#1}\@nameuse{bbx@cn#1}}%
+			\printnames[bytranslator]{translator}%
+			\usebibmacro{cntypedelim}{translator}\usebibmacro{cntranslatorstrg}%
 		}{%
-			\bibstring{by#1}\setunit{\addspace}%
-			\printnames[by#1]{#1}%
+			\printtext{\bibstring{bytranslator}}%
+			\setunit{\addspace}\printnames[bytranslator]{translator}%
 		}%
 	}%
 }
-\renewbibmacro*{byauthor}{\usebibmacro{cebyauthx}{author}}
-\renewbibmacro*{byeditor}{\usebibmacro{cebyauthx}{editor}}
-\renewbibmacro*{bytranslator}{\usebibmacro{cebyauthx}{translator}}
 \newbibmacro*{byauthor+byeditor+bytranslator}{%
 	\usebibmacro{byauthor}\setunit*{\bbx@cescolon}%
 	\usebibmacro{byeditor}\setunit*{\bbx@cescolon}%
 	\usebibmacro{bytranslator}%
 }
 
-\providebibmacro*{bbx:ifnodate}[2]{#2}
+\providebibmacro*{bbx:ifmergeddate}[2]{#2}
 \newbibmacro*{journaltitle/title}{%
 	\iffieldundef{journaltitle}%
 		{\bbx@print{title}}{\printfield[title]{journaltitle}}%
@@ -178,8 +218,8 @@
 	\ifboolexpr{test {\iflistundef{location}} and test {\iflistundef{publisher}}}%
 		{}{\setunit{\bbx@cecomma}}%
 	\usebibmacro{date}\setunit*{\bbx@cecomma}\printfield{note}%
-	\ifboolexpr{%
-		(test {\usebibmacro{bbx:ifnodate}} or test {\ifdateunknown}) and
+	\ifboolexpr{
+		(test {\usebibmacro{bbx:ifmergeddate}} or test {\ifdateunknown}) and
 		test {\iffieldundef{note}}
 	}{}{\setunit{\bbx@cecolon}}%
 	\printfield{pages}%
@@ -188,8 +228,8 @@
 	\usebibmacro{date}%
 	\iffieldundef{volume}{}{\setunit*{\bbx@cecomma}\printfield{volume}}%
 	\bbx@print{number}\setunit*{\bbx@cecomma}\printfield{note}%
-	\ifboolexpr{%
-		(test {\usebibmacro{bbx:ifnodate}} or test {\ifdateunknown}) and
+	\ifboolexpr{
+		(test {\usebibmacro{bbx:ifmergeddate}} or test {\ifdateunknown}) and
 		test {\iffieldundef{volume}} and test {\iffieldundef{number}} and
 		test {\iffieldundef{note}}
 	}{}{\setunit{\bbx@cecolon}}%
@@ -199,7 +239,7 @@
 	\printfield{eid}\setunit*{\bbx@cecomma}%
 	\printfield{url}\setunit*{\bbx@cecomma}%
 	\iffieldundef{urlyear}{}{%
-		\printtext{\bbx@cetext{\bbx@cnretr}{retrieved on}\addspace}%
+		\printtext{\bbx@cetext{\bbx@cnretr}{accessed on}\addspace}%
 		\printurldate%
 	}%
 }
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/tex/blx-caspervector-gbk.def b/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/tex/blx-caspervector-gbk.def
index 9d76570a3b..7823cad294 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/tex/blx-caspervector-gbk.def
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/tex/blx-caspervector-gbk.def
@@ -1,6 +1,6 @@
 % Casper Ti. Vector's biblatex style
 %
-% Copyright (c) 2012-2016,2018 Casper Ti. Vector
+% Copyright (c) 2012-2016,2018-2019 Casper Ti. Vector
 %
 % This work may be distributed and/or modified under the conditions of the
 % LaTeX Project Public License, either version 1.3 of this license or (at
@@ -23,7 +23,7 @@
 %   blx-caspervector-utf8.def
 
 \ProvidesFile{blx-caspervector-gbk.def}%
-	[2018/06/29 v0.3.3 Chinese punctuations and captions in GBK]
+	[2019/11/13 v0.3.4 Chinese punctuations and captions in GBK]
 
 \newcommand*\bbx@cnldquot{��}
 \newcommand*\bbx@cnrdquot{��}
@@ -32,14 +32,20 @@
 \newcommand*\bbx@cnscolon{��}
 \newcommand*\bbx@cncolon{��}
 \newcommand*\bbx@cnperiod{��}
+\newcommand*\bbx@cnlparen{��}
+\newcommand*\bbx@cnrparen{��}
 \newcommand*\bbx@cnetal{��}
-\newcommand*\bbx@cnauthor{��}
-\newcommand*\bbx@cneditor{��}
-\newcommand*\bbx@cntranslator{��}
 \newcommand*\bbx@cnnr{��}
 \newcommand*\bbx@cnedition{��}
 \newcommand*\bbx@cnin{����}
-\newcommand*\bbx@cnretr{������}
-\newcommand*\bbx@cnbib{�����}
+\newcommand*\bbx@cnretr{������}
+
+\DefineBibliographyStrings{english}{
+	cnauthor = {��},
+	cneditor = {��},
+	cntranslator = {��},
+	bibliography = {�����},
+	references = {�����},
+}
 
 % vim:ft=tex:ts=2:sw=2
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/tex/blx-caspervector-utf8.def b/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/tex/blx-caspervector-utf8.def
index 8853f52ac4..0bf9e4bace 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/tex/blx-caspervector-utf8.def
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/tex/blx-caspervector-utf8.def
@@ -1,6 +1,6 @@
 % Casper Ti. Vector's biblatex style
 %
-% Copyright (c) 2012-2016,2018 Casper Ti. Vector
+% Copyright (c) 2012-2016,2018-2019 Casper Ti. Vector
 %
 % This work may be distributed and/or modified under the conditions of the
 % LaTeX Project Public License, either version 1.3 of this license or (at
@@ -23,7 +23,7 @@
 %   blx-caspervector-utf8.def
 
 \ProvidesFile{blx-caspervector-utf8.def}%
-	[2018/06/29 v0.3.3 Chinese punctuations and captions in UTF-8]
+	[2019/11/13 v0.3.4 Chinese punctuations and captions in UTF-8]
 
 \newcommand*\bbx@cnldquot{“}
 \newcommand*\bbx@cnrdquot{”}
@@ -32,14 +32,20 @@
 \newcommand*\bbx@cnscolon{；}
 \newcommand*\bbx@cncolon{：}
 \newcommand*\bbx@cnperiod{。}
+\newcommand*\bbx@cnlparen{（}
+\newcommand*\bbx@cnrparen{）}
 \newcommand*\bbx@cnetal{等}
-\newcommand*\bbx@cnauthor{著}
-\newcommand*\bbx@cneditor{编}
-\newcommand*\bbx@cntranslator{译}
 \newcommand*\bbx@cnnr{第}
 \newcommand*\bbx@cnedition{版}
 \newcommand*\bbx@cnin{出自}
-\newcommand*\bbx@cnretr{检索于}
-\newcommand*\bbx@cnbib{参考文献}
+\newcommand*\bbx@cnretr{访问于}
+
+\DefineBibliographyStrings{english}{
+	cnauthor = {著},
+	cneditor = {编},
+	cntranslator = {译},
+	bibliography = {参考文献},
+	references = {参考文献},
+}
 
 % vim:ft=tex:ts=2:sw=2
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/tex/caspervector-ay.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/tex/caspervector-ay.bbx
index 9e21d3d066..e7d66d5c2f 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/tex/caspervector-ay.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/tex/caspervector-ay.bbx
@@ -1,6 +1,6 @@
 % Casper Ti. Vector's biblatex style
 %
-% Copyright (c) 2012-2018 Casper Ti. Vector
+% Copyright (c) 2012-2019 Casper Ti. Vector
 %
 % This work may be distributed and/or modified under the conditions of the
 % LaTeX Project Public License, either version 1.3 of this license or (at
@@ -23,31 +23,15 @@
 %   blx-caspervector-utf8.def
 
 \ProvidesFile{caspervector-ay.bbx}%
-	[2018/06/29 v0.3.3 Casper Ti. Vector's author-year biblatex bibstyle]
+	[2019/11/13 v0.3.4 Casper Ti. Vector's author-year biblatex bibstyle]
 
 \RequireBibliographyStyle{authoryear-comp}
 \input{blx-caspervector-base.def}
-\appto\bbx@opt@mergedate@maximum{\renewbibmacro*{bbx:ifnodate}[2]{%
-	\iflabeldateisdate{#1}{#2}%
-}\togglefalse{bbx:bfdate}}
-\appto\bbx@opt@mergedate@compact{\renewbibmacro*{bbx:ifnodate}[2]{%
-	\iflabeldateisdate{#1}{#2}%
-}\togglefalse{bbx:bfdate}}
-\appto\bbx@opt@mergedate@basic{\renewbibmacro*{bbx:ifnodate}[2]{%
-	\ifboolexpr{
-		test {\iflabeldateisdate} and
-		not test {\ifdateshavedifferentprecision{label}{}}
-	}{#1}{#2}%
-}\toggletrue{bbx:bfdate}}
-\appto\bbx@opt@mergedate@minimum{\renewbibmacro*{bbx:ifnodate}[2]{%
-	\ifboolexpr{
-		test {\iflabeldateisdate} and test {\iffieldundef{extradate}} and
-		not test {\ifdateshavedifferentprecision{label}{}}
-	}{#1}{#2}%
-}\toggletrue{bbx:bfdate}}
-\appto\bbx@opt@mergedate@false%
-	{\renewbibmacro*{bbx:ifnodate}[2]{#2}\toggletrue{bbx:bfdate}}
-\renewbibmacro*{date}{\usebibmacro{bbx:ifnodate}{}{\printdate}}
+\appto\bbx@opt@mergedate@maximum{\togglefalse{bbx:bfdate}}
+\appto\bbx@opt@mergedate@compact{\togglefalse{bbx:bfdate}}
+\appto\bbx@opt@mergedate@basic{\toggletrue{bbx:bfdate}}
+\appto\bbx@opt@mergedate@minimum{\toggletrue{bbx:bfdate}}
+\appto\bbx@opt@mergedate@false{\toggletrue{bbx:bfdate}}
 
 \ExecuteBibliographyOptions%
 	{labeldate = year, mergedate = basic, dashed = false, sorting = ecnyt}
@@ -55,21 +39,24 @@
 \DeclareNameAlias{editor}{default}
 \DeclareNameAlias{translator}{default}
 
-\newbibmacro*{ayedtrans}[1]{%
+\newbibmacro*{ayauedtrans}[1]{%
 	\ifboolexpr{test {\iftoggle{blx@use#1}} and not test {\ifnameundef{#1}}}{%
 		\usebibmacro{bbx:dashcheck}{\bibnamedash}{%
-			\printnames{#1}%
-			\bbx@cetext%
-				{\printtext{\bbx@byspace{#1}}}{\setunit{\printdelim{#1typedelim}}}%
-			\usebibmacro{bbx:savehash}%
-		}\bbx@cetext{\printtext{\@nameuse{bbx@cn#1}}}{\usebibmacro{#1strg}}%
-		\setunit{\printdelim{nameyeardelim}}\clearname{#1}%
+			\usebibmacro{bbx:savehash}\printnames{#1}\bbx@ifstrg{#1}{%
+				\bbx@cetext%
+					{\usebibmacro{cntypedelim}{#1}}{\setunit{\printdelim{#1typedelim}}}%
+			}{\setunit{\printdelim{nameyeardelim}}}%
+		}\bbx@ifstrg{#1}{%
+			\bbx@cetext{\usebibmacro{cn#1strg}}{\usebibmacro{#1strg}}%
+			\setunit{\printdelim{nameyeardelim}}%
+		}{}\ifstrequal{#1}{author}{}{\clearname{#1}}%
 	}{%
 		\global\undef\bbx@lasthash
 		\usebibmacro{labeltitle}\setunit*{\printdelim{nonameyeardelim}}%
 	}\usebibmacro{date+extradate}%
 }
-\renewbibmacro*{editor}{\usebibmacro{ayedtrans}{editor}}
-\renewbibmacro*{translator}{\usebibmacro{ayedtrans}{translator}}
+\renewbibmacro*{author}{\usebibmacro{ayauedtrans}{author}}
+\renewbibmacro*{editor}{\usebibmacro{ayauedtrans}{editor}}
+\renewbibmacro*{translator}{\usebibmacro{ayauedtrans}{translator}}
 
 % vim:ft=tex:ts=2:sw=2
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/tex/caspervector-ay.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/tex/caspervector-ay.cbx
index 50a78e9d40..e712b44d84 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/tex/caspervector-ay.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/tex/caspervector-ay.cbx
@@ -23,7 +23,7 @@
 %   blx-caspervector-utf8.def
 
 \ProvidesFile{caspervector-ay.cbx}%
-	[2018/06/29 v0.3.3 Casper Ti. Vector's author-year biblatex citestyle]
+	[2019/11/13 v0.3.4 Casper Ti. Vector's author-year biblatex citestyle]
 
 \RequireCitationStyle{authoryear-comp}
 \renewcommand*{\compcitedelim}{\bbx@citebcomma}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/tex/caspervector.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/tex/caspervector.bbx
index e796044499..72e893981c 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/tex/caspervector.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/tex/caspervector.bbx
@@ -23,7 +23,7 @@
 %   blx-caspervector-utf8.def
 
 \ProvidesFile{caspervector.bbx}%
-	[2018/06/29 v0.3.3 Casper Ti. Vector's numeric biblatex bibstyle]
+	[2019/11/13 v0.3.4 Casper Ti. Vector's numeric biblatex bibstyle]
 
 \RequireBibliographyStyle{numeric-comp}
 \input{blx-caspervector-base.def}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/tex/caspervector.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/tex/caspervector.cbx
index 236f4c48ec..0b6f918f8d 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/tex/caspervector.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/tex/caspervector.cbx
@@ -23,7 +23,7 @@
 %   blx-caspervector-utf8.def
 
 \ProvidesFile{caspervector.cbx}%
-	[2018/06/29 v0.3.3 Casper Ti. Vector's numeric biblatex citestyle]
+	[2019/11/13 v0.3.4 Casper Ti. Vector's numeric biblatex citestyle]
 
 \RequireCitationStyle{numeric-comp}
 \ExecuteBibliographyOptions{autocite = superscript}
diff --git a/macros/latex/contrib/csquotes/csq-compat.def b/macros/latex/contrib/csquotes/csq-compat.def
index 6ed72d174b..81a37db6b9 100644
--- a/macros/latex/contrib/csquotes/csq-compat.def
+++ b/macros/latex/contrib/csquotes/csq-compat.def
@@ -1,5 +1,5 @@
 \ProvidesFile{csq-compat.def}
-  [2019-11-14 v5.2g csquotes backwards compatibility (JAW)]
+  [2019-11-15 v5.2h csquotes backwards compatibility (JAW)]
 
 \def\csq@getversion#1{%
   \expandafter\csq@getversion@i
diff --git a/macros/latex/contrib/csquotes/csquotes.def b/macros/latex/contrib/csquotes/csquotes.def
index ec7834d752..a870f8a2c6 100644
--- a/macros/latex/contrib/csquotes/csquotes.def
+++ b/macros/latex/contrib/csquotes/csquotes.def
@@ -1,5 +1,5 @@
 \ProvidesFile{csquotes.def}
-  [2019-11-14 v5.2g csquotes generic definitions (JAW)]
+  [2019-11-15 v5.2h csquotes generic definitions (JAW)]
 
 % Set defaults
 
diff --git a/macros/latex/contrib/csquotes/csquotes.pdf b/macros/latex/contrib/csquotes/csquotes.pdf
index a1507080d4..5044c7bac5 100644
--- a/macros/latex/contrib/csquotes/csquotes.pdf
+++ b/macros/latex/contrib/csquotes/csquotes.pdf
diff --git a/macros/latex/contrib/csquotes/csquotes.sty b/macros/latex/contrib/csquotes/csquotes.sty
index 9cc48633a2..0d61ab8b23 100644
--- a/macros/latex/contrib/csquotes/csquotes.sty
+++ b/macros/latex/contrib/csquotes/csquotes.sty
@@ -12,7 +12,7 @@
 
 \NeedsTeXFormat{LaTeX2e}[2005/12/01]
 \ProvidesPackage{csquotes}
-  [2019-11-14 v5.2g context-sensitive quotations (JAW)]
+  [2019-11-15 v5.2h context-sensitive quotations (JAW)]
 
 %% Compatibility and requirements
 
@@ -803,7 +803,9 @@
     {}
     {\ifdef\babelname
        {\edef\csq@mainlang{\babelname}}
-       {\edef\csq@mainlang{\langname}}}}
+       {\ifdef\languagename
+          {\edef\csq@mainlang{\languagename}}
+          {\csq@warn@multilang{Cannot detect main document language}}}}}
 
 \def\csq@resetlang{%
   \ifdef\csq@mainlang
diff --git a/macros/latex/contrib/csquotes/csquotes.tex b/macros/latex/contrib/csquotes/csquotes.tex
index a0e0090190..e08a46865e 100644
--- a/macros/latex/contrib/csquotes/csquotes.tex
+++ b/macros/latex/contrib/csquotes/csquotes.tex
@@ -18,8 +18,8 @@
   url={http://www.ctan.org/pkg/csquotes/},
   author={Philipp Lehman, Joseph Wright},
   email={joseph.wright@morningstar2.co.uk},
-  revision={5.2g},
-  date={2019-11-14}}
+  revision={v5.2h},
+  date={2019-11-15}}
 
 \hypersetup{%
   pdftitle={The csquotes Package},
@@ -1542,6 +1542,10 @@ The scope of these hooks must always be confined to a group.
 This revision history is a list of changes relevant to users of this package. Changes of a more technical nature which do not affect the user interface or the behavior of the package are not included in the list. If an entry in the revision history states that a feature has been \emph{extended}, this indicates a syntactically backwards compatible modification, such as the addition of an optional argument to an existing command. Entries stating that a feature has been \emph{modified}, \emph{renamed}, or \emph{removed} demand attention. They indicate a modification which may require changes to existing documents in some, hopefully rare, cases. The \opt{version} option from \secref{opt:opt} may be helpful in this case. The numbers on the right indicate the relevant section of this manual.
 
 \begin{changelog}
+\begin{release}{5.2h}{2019-11-15}
+\item Fix issue with \cmd{langname}
+\end{release}
+
 \begin{release}{5.2g}{2019-11-14}
 \item Fix issue with \cmd{languagename}
 \end{release}
diff --git a/macros/latex/contrib/hobsub/README.md b/macros/latex/contrib/hobsub/README.md
new file mode 100644
index 0000000000..42c2f208aa
--- /dev/null
+++ b/macros/latex/contrib/hobsub/README.md
@@ -0,0 +1,2 @@
+# hobsub
+Stub hobsub packages, extracted from the oberdiek bundle
diff --git a/macros/latex/contrib/oberdiek/hobsub-generic.sty b/macros/latex/contrib/hobsub/hobsub-generic.sty
index 1d7fe1745d..0fd3dc6de1 100644
--- a/macros/latex/contrib/oberdiek/hobsub-generic.sty
+++ b/macros/latex/contrib/hobsub/hobsub-generic.sty
@@ -1,5 +1,14 @@
+% hobsub bundle
+%
+% Copyright 2019 Oberdiek Package Support Group
+%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either
+%% version 1.3c of this license or (at your option) any later
+%% version.
+
 \ifx\ProvidesPackage\undefined\else
-\ProvidesPackage{hobsub-generic}[2019/10/27]
+\ProvidesPackage{hobsub-generic}[2019-11-14]
 \fi
 \wlog{hobsub not currently supported, see hobsub.dtx to extract original code}
 \RequirePackage{infwarerr}[2007/09/09]%
diff --git a/macros/latex/contrib/oberdiek/hobsub-hyperref.sty b/macros/latex/contrib/hobsub/hobsub-hyperref.sty
index 7c9f0605a0..66c94b6b62 100644
--- a/macros/latex/contrib/oberdiek/hobsub-hyperref.sty
+++ b/macros/latex/contrib/hobsub/hobsub-hyperref.sty
@@ -1,5 +1,14 @@
+% hobsub bundle
+%
+% Copyright 2019 Oberdiek Package Support Group
+%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either
+%% version 1.3c of this license or (at your option) any later
+%% version.
+
 \ifx\ProvidesPackage\undefined\else
-\ProvidesPackage{hobsub-hyperref}[2019/10/27]
+\ProvidesPackage{hobsub-hyperref}[2019-11-14]
 \fi
 \wlog{hobsub not currently supported, see hobsub.dtx to extract original code}
 \RequirePackage{ltxcmds}
diff --git a/macros/latex/contrib/hobsub/hobsub.pdf b/macros/latex/contrib/hobsub/hobsub.pdf
new file mode 100644
index 0000000000..7b00333bfb
--- /dev/null
+++ b/macros/latex/contrib/hobsub/hobsub.pdf
diff --git a/macros/latex/contrib/hobsub/hobsub.sty b/macros/latex/contrib/hobsub/hobsub.sty
new file mode 100644
index 0000000000..248ee35f8f
--- /dev/null
+++ b/macros/latex/contrib/hobsub/hobsub.sty
@@ -0,0 +1,14 @@
+% hobsub bundle
+%
+% Copyright 2019 Oberdiek Package Support Group
+%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either
+%% version 1.3c of this license or (at your option) any later
+%% version.
+
+\ifx\ProvidesPackage\undefined\else
+\ProvidesPackage{hobsub}[2019/11/14]
+\fi
+
+\wlog{hobsub not currently supported, see hobsub.dtx to extract original code}
diff --git a/macros/latex/contrib/hobsub/hobsub.tex b/macros/latex/contrib/hobsub/hobsub.tex
new file mode 100644
index 0000000000..120854d8d7
--- /dev/null
+++ b/macros/latex/contrib/hobsub/hobsub.tex
@@ -0,0 +1,42 @@
+% hobsub bundle
+%
+% Copyright 2019 Oberdiek Package Support Group
+%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either
+%% version 1.3c of this license or (at your option) any later
+%% version.
+
+\documentclass{article}
+\title{hobsub package}
+\author{Oberdiek Package Support Group}
+\date{2019-11-14}
+\usepackage{url}
+\raggedright
+\setlength\parskip{\baselineskip}
+\begin{document}
+
+
+\maketitle
+
+Heiko Oberdiek's \textsf{hobsub} package (and \textsf{hobsub-hyperref}
+and \textsf{hobsub-generic} packages) defined a mechanism for
+concatenating multiple files into a single file for faster loading.
+
+The disadvantage is that it introduces hard dependencies between the
+source files that are included and complicates distribution and
+updates.
+
+It was principally used with \textsf{hyperref} but is not currently
+used in any standard packages in texlive.
+
+The packages are still distributed as simple stubs that reference the
+included packages via \verb|\RequirePackage|  rather than copying
+their source.
+
+The documented source of the original packages is available at 
+\url{https://github.com/ho-tex/hobsub}
+but is not distributed to CTAN.
+
+
+\end{document}
diff --git a/macros/latex/contrib/makerobust/README.md b/macros/latex/contrib/makerobust/README.md
new file mode 100644
index 0000000000..3aae9e30f9
--- /dev/null
+++ b/macros/latex/contrib/makerobust/README.md
@@ -0,0 +1,2 @@
+# makerobust
+makerobust legacy package split from oberdiek LaTeX bundle
diff --git a/macros/latex/contrib/makerobust/makerobust.pdf b/macros/latex/contrib/makerobust/makerobust.pdf
new file mode 100644
index 0000000000..bbe2eb7682
--- /dev/null
+++ b/macros/latex/contrib/makerobust/makerobust.pdf
diff --git a/macros/latex/contrib/makerobust/makerobust.sty b/macros/latex/contrib/makerobust/makerobust.sty
new file mode 100644
index 0000000000..3a1ca3e449
--- /dev/null
+++ b/macros/latex/contrib/makerobust/makerobust.sty
@@ -0,0 +1,21 @@
+% makerobust
+%
+% Copyright 2019 Oberdiek Package Support Group
+%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either
+%% version 1.3c of this license or (at your option) any later
+%% version.
+
+\NeedsTeXFormat{LaTeX2e}[2015/01/01]
+\ProvidesPackage{makerobust}[2019/11/12 v2.0 Legacy MakeRobust(Command) definition]
+
+\let\MakeRobustCommand\MakeRobust
+
+\PackageInfo{makerobust}{%
+\MessageBreak
+Please use the standard \noexpand\MakeRobust command,\MessageBreak
+not the \noexpand\MakeRobustCommand command\MessageBreak
+defined by this package\@gobble
+}
+
diff --git a/macros/latex/contrib/makerobust/makerobust.tex b/macros/latex/contrib/makerobust/makerobust.tex
new file mode 100644
index 0000000000..e564524b4d
--- /dev/null
+++ b/macros/latex/contrib/makerobust/makerobust.tex
@@ -0,0 +1,33 @@
+% makerobust
+%
+% Copyright 2019 Oberdiek Package Support Group
+%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either
+%% version 1.3c of this license or (at your option) any later
+%% version.
+
+\documentclass{article}
+\title{makerobust package}
+\author{Oberdiek Package Support Group}
+\date{2019/11/12}
+\raggedright
+\setlength\parskip{\baselineskip}
+\begin{document}
+
+\maketitle
+
+Heiko Oberdiek's \textsf{makerobust} package defined a command with name
+\verb|\MakeRobustCommand| that can be used to make fragile commands
+robust.
+
+The \LaTeX\ format has, since 2015, included a command
+\verb|\MakeRobust| with the same syntax and behaviour.  Also by 2019,
+almost all commands in \LaTeX\ that may be used in a moving argument
+are already robust.
+
+This package is now just a simple one line package defining the name 
+\verb|\MakeRobustCommand| as an alias for \verb|\MakeRobust|, and
+should not be used in new documents.
+
+\end{document}
diff --git a/macros/latex/contrib/memoir/README b/macros/latex/contrib/memoir/README
index 45c21dd704..b133416d7b 100644
--- a/macros/latex/contrib/memoir/README
+++ b/macros/latex/contrib/memoir/README
@@ -7,8 +7,8 @@ you create your particular design. The class incorporates over 30 of the
 more popular packages.
 
     IF YOU HAVE ANY QUESTIONS PLEASE ASK THEM ON TEX.STACKEXCHANGE.COM 
-    (PLEASE USE THE MEMOIR TAG) OR ON THE COMP.TEXT.TEX NEWSGROUP, 
-    OR BY EMAIL TO THE MAINTAINER. PLEASE ADD MEMOIR TO THE SUBJECT.
+    (PLEASE USE THE MEMOIR TAG) OR BY EMAIL TO THE MAINTAINER.
+    PLEASE ADD MEMOIR TO THE SUBJECT.
 
     PLEASE DON'T WRITE PETER DIRECTLY AS HE IS AWAY MORE OFTEN THAN
     NOT.
@@ -16,14 +16,6 @@ more popular packages.
 Lars Madsen <daleif@math.au.dk> is maintaining memoir.
 
 
-   NOTE: If you are using the hyperref package dated earlier than 2006/11/15, 
-use the memhfixc package after the hyperref package, e.g.,
-...
-\usepackage[...]{hyperref}
-\usepackage{memhfixc}
-...
-Later versions of the hyperref package automatically load the memhfixc package.
-
     NOTE: The full User Manual (memman.pdf) is a large document of about
 550 pages in total. You do not need to print all of it, especially if you 
 already have an earlier edition. Roughly speaking, the main portions are:
@@ -36,6 +28,72 @@ o Backmatter:
     Bibliography, indexes                               ~  50 pages
 
 
+Changed (2019/11/15)
+
+o memoir v3.7i
+
+-- indexes now uses protection when being moved from the aux to the
+   idx file(s)
+
+-- changed loading ifpdf, ifetex, ifxetex and ifluatex to just loading
+   the new iftex package. Suggested by The LaTeX Support Team.
+
+-- new feature for \createmark: the <show> variable now accepts:
+   nonumber, shownumber and notitle (implies shownumber). The latter
+   enables chapter headers to be just of the form "Chapter <number>"
+
+-- By request, added a7paper and b7paper options (plus \stockavii,
+   \stockbvii, \pageavii and \pagebvii)
+
+-- changed the header construction for tableofcontents and
+   friends. The anchor that hyperref will use for TOC, LOF etc entries
+   in the TOC will now point above the header not below it.
+
+-- changed a few things in \subbottom, which hopefully fixes an issue
+   with hypcap, https://tex.stackexchange.com/q/440399/3929 (and
+   https://github.com/ho-tex/oberdiek/issues/42)
+
+-- the handling of \absindent, \absparsep is now correctly described in the
+   manual (any changes of these of use of them has to be delayed to the start of
+   the document via \AtBeginDocument)
+
+-- Updated the patched \InputIfFileExists to match the one used in the
+   2019/10/01 format (if using that format, we use the old version)
+
+-- Updated the embedded copy of the booktabs package, bringing it in ling with
+   booktabs v1.6180339.
+
+-- Changed the warning emitted at the start of loading the caption
+   package. Apparently users got spooked by it. The caption package works just
+   fine with with memoir, the warning is just there to remind users that once
+   the caption package is loaded, all caption related configurations should go
+   through the caption package interface, not through the class interface.
+
+-- Fixed a bug in \lofmark and \lotmark when using the oneside option. The
+   default headings style uses \markright for all marks under oneside, but due
+   to an ordering mistake, \lofmark and \lotmark would still be using \markboth
+   unless you explicitly issued \pagestyle{headings} in the preamble. This is
+   now fixed.
+
+-- fixed bug in \newfootnoteseries, the included footnote type did not support
+   more than one paragraph. Is now long.
+
+-- fixed bug in \pagenote[...]{...}. Under hyperref
+   \pagenote{.}\pagenote[.]{.}{\pagenote{.} did not add a separator as
+   expected. It does now.
+
+
+o memhfixc v1.18
+
+-- added a \par to \contcaption to get rid of a sporadic space coming
+   from \refstepcounter under hyperref
+
+-- additionally added a patch when hypcap is loaded, now using
+   \contcaption is no longer an error (hypcap looks to see if \caption
+   has been used)
+
+
+
 Changed (2018/12/12)
 
 o memoir v3.7h
@@ -477,8 +535,7 @@ o run: latex memoir.ins (which will generate memoir.cls,
 o Move memoir.cls, the mem*.clo files and any mem*.sty file to locations 
   where LaTeX will find them (typically in a local texmf tree at 
   /tex/latex/memoir) and refresh the file database. 
-  See the FAQ on CTAN at help
-  or http://www.tex.ac.uk/ for more information on this.
+  See the https://texfaq.org/ for more information on this.
 
 However, it is alway recommended that you update your LaTeX
 installation, instead of attempting to manually install a Package or
diff --git a/macros/latex/contrib/memoir/doc-src/memman.tex b/macros/latex/contrib/memoir/doc-src/memman.tex
index 63d653c5a9..965da3bb86 100644
--- a/macros/latex/contrib/memoir/doc-src/memman.tex
+++ b/macros/latex/contrib/memoir/doc-src/memman.tex
@@ -11,6 +11,8 @@
 \documentclass[10pt,letterpaper,extrafontsizes]{memoir}
 \usepackage{comment}
 
+\hfuzz=5pt
+
 
 % For (non-printing) notes  \PWnote{date}{text}
 \newcommand{\PWnote}[2]{} 
@@ -82,8 +84,8 @@
 
 % \svnidlong
 % {}
-% {$LastChangedDate: 2018-12-12 12:53:37 +0100 (Wed, 12 Dec 2018) $}
-% {$LastChangedRevision: 622 $}
+% {$LastChangedDate: 2019-11-14 18:06:44 +0100 (Thu, 14 Nov 2019) $}
+% {$LastChangedRevision: 662 $}
 % {$LastChangedBy: daleif@math.au.dk $}
 
 
@@ -115,10 +117,15 @@
 
 
 
+
+
 %% end preamble
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %#% extend
 
+
+\hfuzz=10pt
+
 \usepackage[draft]{fixme}
 \fxsetup{
   multiuser,
@@ -1305,9 +1312,9 @@ been answered.
 
 \svnidlong
 {$Ignore: $}
-{$LastChangedDate: 2015-04-22 17:17:51 +0200 (Wed, 22 Apr 2015) $}
-{$LastChangedRevision: 527 $}
-{$LastChangedBy: daleif $}
+{$LastChangedDate: 2019-11-14 18:06:44 +0100 (Thu, 14 Nov 2019) $}
+{$LastChangedRevision: 662 $}
+{$LastChangedBy: daleif@math.au.dk $}
 
 \chapter{Introduction to the eighth edition}
 
@@ -1338,7 +1345,7 @@ typesetting mathematics. On the other hand it is easy to configure a work
 produced with \Mname\ 
 to meet a university's thesis layout requirements.
 
-    \Mname\ has improved substantially since it was first released ---
+The \Mname\  class has improved substantially since it was first released ---
 over 50 \ltx ers have provided code or suggestions for improvements.
 The class is included in the \TeXUG\ \tx\ distributions and the latest 
 version of the class and its supporting documentation is always
@@ -1357,16 +1364,16 @@ and \Lbibtex.
 
 \section{General considerations}
 
-    The class is a large one consisting of about 10,000 lines of \ltx\ code
-documented in a 400 page report; there is no need for most users to look at 
-this~\cite{MEMCODE}. However if you want to see exactly how some part, 
-or all of, \Mname\ is defined it is there for you to peruse.
-The document you are now reading is the separate comprehensive 
-User Manual~\cite{MEMMAN} which runs to about 500 pages, and from time to 
-time an Addendum %\cite{MEMADD} 
-is released noting extensions to the class.\footnote{Currently not in use.}
-Again, if you want to see how something was done in this Manual, which
-of course was prepared using \Mname\ itself, the source
+The class is a large one consisting of about 10,000 lines of \ltx\
+code documented in a 400 page report; there is no need for most users
+to look at this~\cite{MEMCODE}. However if you want to see exactly how
+some part, or all of, \Mname\ is defined it is there for you to
+peruse.  The document you are now reading is the separate
+comprehensive User Manual~\cite{MEMMAN} which runs to about 500 pages,
+and from time to time an Addendum %\cite{MEMADD}
+is released noting extensions to the class.\footnote{Currently not in
+  use.}  Again, if you want to see how something was done in this
+Manual, which of course was prepared using \Mname\ itself, the source
 is available for you to read.
 % There is also the \Lpack{memexsupp} package by Lars Madsen~\cite{MEMEXSUPP} 
 % which provides some extra facilities for the class.
@@ -1468,10 +1475,20 @@ with the corresponding `\listofx'.
 
 \section{Tables}
 
-    Code from the \Lpack{array}, \Lpack{dcolumn}, \Lpack{delarray} and
-\Lpack{tabularx} packges is integrated within the class. To improve
-the appearance of rules in tabular material the \Lpack{booktabs}
-package is also included.
+%    Code from the \Lpack{array}, \Lpack{dcolumn}, \Lpack{delarray} and
+%\Lpack{tabularx} packges is integrated within the class. To improve
+%the appearance of rules in tabular material the \Lpack{booktabs}
+%package is also included.
+
+The \Lpack{array}, \Lpack{dcolumn}, \Lpack{delarray}, \Lpack{tabularx}
+are automatically loaded by the class. In earlier days their code were
+embedded into the class, nowadays we just load the respective
+packages. To improve the appearance of rules in tabular material the
+\Lpack{booktabs} package is also included (as a code copy, this may
+change in the future).
+
+
+
 
     Multipage tabulations are often set with the \Lpack{longtable} or
 \Lpack{xtab} packages, which can of course be used with the class. For
@@ -1622,65 +1639,73 @@ page, and so on and so forth.
 %% \appendix
 \section{Packages}
 
-    Most packages work with the \Mname\ class, the main exception being
-the \Lpack{hyperref} package. This package modifies
-many of the internals of the standard classes but does not cater for all of
-the differences between \Mname\ and the standard ones. If you wish to use
-\Lpack{hyperref} with \Mname\ then you must use the \Lpack{memhfixc}
+Most packages work with the \Mname\ class, the main exception being
+the \Lpack{hyperref} package. This package modifies many of the
+internals of the standard classes but does not cater for all of the
+differences between \Mname\ and the standard ones.
+
+If you use \Lpack{hyperref} with \Mname\ then the \Lpack{memhfixc}
 package\footnote{\Lpack{memhfixc} is supplied as part of the \Mname\
-distribution.} after using \Lpack{hyperref}. For example like:
-\begin{lcode}
-\documentclass[...]{memoir}
-...
-\usepackage[...]{hyperref}
-\usepackage{memhfixc}
-...
-\begin{document}
-\end{lcode}
-However, if you have a version of \Lpack{hyperref} dated 2006/11/15 or after, 
-\Lpack{hyperref}
-will automatically call in \Lpack{memhfixc} so that you don't have to do 
-anything.
+  distribution.} is automatically loaded by \Lpack{hyperref} to
+provide some class specific alterations.
+% For example like:
+% \begin{lcode}
+% \documentclass[...]{memoir}
+% ...
+% \usepackage[...]{hyperref}
+% \usepackage{memhfixc}
+% ...
+% \begin{document}
+% \end{lcode}
+% However, if you have a version of \Lpack{hyperref} dated 2006/11/15 or after, 
+% \Lpack{hyperref}
+% will automatically call in \Lpack{memhfixc} so that you don't have to do 
+% anything.
 
 The \Mname\ class includes code either equivalent to, or extensions of, the 
 following packages; that is, the set of commands and environments is at least
 the same as those in the packages: 
 %\begin{itemize}%\item 
-\begin{lineitems}
+\begin{adjustwidth}{2em}{2em}
+  \begin{center}
+    \begin{lineitems}
       \Lpack{abstract}
-\item \Lpack{appendix}
-\item \Lpack{array}
-\item \Lpack{booktabs}
-\item \Lpack{ccaption}
-\item \Lpack{chngcntr}
-\item \Lpack{chngpage}
-\item \Lpack{dcolumn}
-\item \Lpack{delarray}
-\item \Lpack{enumerate}
-\item \Lpack{epigraph}
-\item \Lpack{framed}
-\item \Lpack{ifmtarg}
-\item \Lpack{ifpdf}
-\item \Lpack{index}
-\item \Lpack{makeidx}
-\item \Lpack{moreverb}
-\item \Lpack{needspace}
-\item \Lpack{newfile}
-\item \Lpack{nextpage}
-\item \Lpack{parskip}
-\item \Lpack{patchcmd}
-\item \Lpack{setspace}
-\item \Lpack{shortvrb}
-\item \Lpack{showidx}
-\item \Lpack{tabularx}
-\item \Lpack{titleref}
-\item \Lpack{titling}
-\item \Lpack{tocbibind}
-\item \Lpack{tocloft}
-\item \Lpack{verbatim}
-\item \Lpack{verse}.
-\end{lineitems}
-%\end{itemize}
+    \item \Lpack{appendix}
+      % \item \Lpack{array}
+    \item \Lpack{booktabs}
+    \item \Lpack{ccaption}
+    \item \Lpack{chngcntr}
+    \item \Lpack{chngpage}
+      % \item \Lpack{dcolumn}
+      % \item \Lpack{delarray}
+    \item \Lpack{enumerate}
+    \item \Lpack{epigraph}
+    \item \Lpack{framed}
+    \item \Lpack{ifmtarg}
+      % \item \Lpack{ifpdf}
+    \item \Lpack{index}
+    \item \Lpack{makeidx}
+    \item \Lpack{moreverb}
+    \item \Lpack{needspace}
+    \item \Lpack{newfile}
+    \item \Lpack{nextpage}
+    \item \Lpack{parskip}
+    \item \Lpack{patchcmd}
+    \item \Lpack{setspace}
+    \item \Lpack{shortvrb}
+    \item \Lpack{showidx}
+      % \item \Lpack{tabularx}
+    \item \Lpack{titleref}
+    \item \Lpack{titling}
+    \item \Lpack{tocbibind}
+    \item \Lpack{tocloft}
+    \item \Lpack{verbatim}
+    \item \Lpack{verse}.
+    \end{lineitems}
+  \end{center}
+\end{adjustwidth}
+% \end{itemize}
+
 The class automatically ignores any 
 \verb?\usepackage? or \verb?\RequirePackage? related to these. However, if
 you want to specifically use one of these packages rather than the integrated
@@ -1705,14 +1730,16 @@ material; this has not occured with \Mname's implementation.
 The class also provides functions similar to those provided by the following 
 packages, although the commands are different: 
 %\begin{itemize}%\item 
-\begin{lineitems}%\item 
-\Lpack{crop}
-\item \Lpack{fancyhdr}
-\item \Lpack{geometry}
-\item \Lpack{sidecap}
-\item \Lpack{subfigure}
-\item \Lpack{titlesec}.
-\end{lineitems}
+\begin{center}
+  \begin{lineitems}%\item
+    \Lpack{crop}
+  \item \Lpack{fancyhdr}
+  \item \Lpack{geometry}
+  \item \Lpack{sidecap}
+  \item \Lpack{subfigure}
+  \item \Lpack{titlesec}.
+  \end{lineitems}
+\end{center}
 %\end{itemize}
 You can use these packages 
 if you wish, or just use the capabilities of the \Mname\ class.
@@ -1720,6 +1747,22 @@ if you wish, or just use the capabilities of the \Mname\ class.
     The class has built in support for the \Lpack{bidi} package for 
 bidirectional typesetting~\cite{BIDI}.
 
+The following packages are automatically loaded by the class:
+\begin{center}
+  \begin{lineitems}
+    \Lpack{array}
+  \item \Lpack{dcolumn}
+  \item \Lpack{delarray}
+  \item \Lpack{etex}
+%  \item \Lpack{ifetex}
+%  \item \Lpack{ifxetex}
+%  \item \Lpack{ifpdf}
+%  \item \Lpack{ifluatex}
+    \item \Lpack{iftex}
+  \item \Lpack{tabularx}
+  \item \Lpack{textcase}~(with~\texttt{overload}~option)
+  \end{lineitems}
+\end{center}
 
 \section{Resources} \label{sec:resources}
 
@@ -1786,11 +1829,19 @@ this is well worth looking at just as an example of fine typesetting.
 freely available from \pixctan\ if you wish to see exactly what it does
 and how it does it.
 
-    For a more interactive resource you can ask questions on the
-\url{comp.text.tex} newsgroup. If you are a newcomer to \pixctt\
-please read the FAQ~\cite{FAQ} before asking a question, and also read
-a few day's worth of messages to check that your question hasn't just
-been answered.
+For a more interactive resource you can ask questions on
+\begin{center}
+  \url{http://tex.stackexchange.com}.
+\end{center}
+-- if the question is \Mname\ related, please tag it so.
+
+
+
+%     For a more interactive resource you can ask questions on the
+% \url{comp.text.tex} newsgroup. If you are a newcomer to \pixctt\
+% please read the FAQ~\cite{FAQ} before asking a question, and also read
+% a few day's worth of messages to check that your question hasn't just
+% been answered.
 
 \section{Type conventions}
 
@@ -1941,7 +1992,8 @@ omisssion.% \footnote{Peter is currently occasionably reachable via email
 % the maintainer at \texttt{daleif at math dot au dot dk}}
 \footnote{Please write the maintainer at \texttt{daleif at math dot au
     dot dk}} Along those lines, if you have any questions you may
-direct them to the \url{comp.text.tex} newsgroup or post them on
+%direct them to the \url{comp.text.tex} newsgroup or
+post them on
 \url{http://tex.stackexchange.com} as you are likely to get a
 satisfactory and timely response.
 
@@ -1983,11 +2035,12 @@ and make the changes there. Do not expect any help if you change the
 \fancybreak{}
 
 As the years go by support for \Lclass{memoir} will devolve from one
-person to another.\footnote{This is currently (July 2009) happening as
-  Lars Madsen is taking over from Peter Wilson.}  Therefore it is
+person to another.\footnote{Lars Madsen took over from Peter Wilson in
+  2009.}  Therefore it is
 probably safer to ask questions, complain, make suggestions, etc., on
-a Q\&A site like \url{http://tex.stackexchange.com} or on the the
-newsgroup \url{comp.text.tex}, which is archived and read by many,
+a Q\&A site like \url{http://tex.stackexchange.com}%  or on the the
+% newsgroup \url{comp.text.tex}
+, which is archived and read by many,
 than correspond directly with the maintainer, who might well be away
 for some considerable time and perhaps not notice your email after
 having returned to base.
@@ -1999,12 +2052,11 @@ track of memoir related matters.
 
 \fancybreak{}
 
-\textit{From the maintainer:} It seems that traffic on
-\url{comp.text.tex} is less frequent. So most \theclass\ related
-questions should go to \url{http://tex.stackexchange.com}, please
-remember to tag them properly, that really helps locating the
-\theclass\ related questions. If no-one comes up with an answer, you
-can also write me directly via \texttt{daleif (at) math dot au dot dk}.
+\textit{From the maintainer:} Most \Mname\ related questions
+should go to \url{http://tex.stackexchange.com}, please remember to
+tag them properly, that really helps locating the \Mname\ related
+questions. If no-one comes up with an answer, you can also write me
+directly via \texttt{daleif (at) math dot au dot dk}.
 
 
 
@@ -2221,8 +2273,8 @@ an em, often a quad is 1em.
 
 \svnidlong
 {$Ignore: $}
-{$LastChangedDate: 2018-03-09 13:41:30 +0100 (Fri, 09 Mar 2018) $}
-{$LastChangedRevision: 587 $}
+{$LastChangedDate: 2019-11-04 16:13:21 +0100 (Mon, 04 Nov 2019) $}
+{$LastChangedRevision: 658 $}
 {$LastChangedBy: daleif@math.au.dk $}
 
 \chapter{Starting off} \label{chap:starting}
@@ -2249,6 +2301,8 @@ the same dimensions.
 \caption{Class stock metric paper size options, and commands}\label{tab:sizeoptsmetric}
 \begin{tabular}{llll} \toprule
 Option & Size & stock size command & page size command \\ \midrule
+\Lopt{a7paper}\index{paper!size!A7}\index{stock!size!A7} 
+   & \abybm{105}{74}{mm} & \cmd{\stockavii} & \cmd{\pageavii} \\
 \Lopt{a6paper}\index{paper!size!A6}\index{stock!size!A6} 
    & \abybm{148}{105}{mm} & \cmd{\stockavi} & \cmd{\pageavi} \\
 \Lopt{a5paper}\index{paper!size!A5}\index{stock!size!A5}
@@ -2257,6 +2311,8 @@ Option & Size & stock size command & page size command \\ \midrule
     & \abybm{297}{210}{mm} & \cmd{\stockaiv} & \cmd{\pageaiv} \\
 \Lopt{a3paper}\index{paper!size!A3}\index{stock!size!A3}
     & \abybm{420}{297}{mm} & \cmd{\stockaiii} & \cmd{\pageaiii} \\
+\Lopt{b7paper}\index{paper!size!B7}\index{stock!size!B7} 
+   & \abybm{125}{88}{mm} & \cmd{\stockbvii} & \cmd{\pagebvii} \\
 \Lopt{b6paper}\index{paper!size!B6}\index{stock!size!B6} 
    & \abybm{176}{125}{mm} & \cmd{\stockbvi} & \cmd{\pagebvi} \\
 \Lopt{b5paper}\index{paper!size!B5}\index{stock!size!B5} 
@@ -4839,8 +4895,8 @@ code below, and then the result is scaled down.
 
 \svnidlong
 {$Ignore: $}
-{$LastChangedDate: 2018-09-19 15:47:14 +0200 (Wed, 19 Sep 2018) $}
-{$LastChangedRevision: 621 $}
+{$LastChangedDate: 2019-10-22 14:49:52 +0200 (Tue, 22 Oct 2019) $}
+{$LastChangedRevision: 651 $}
 {$LastChangedBy: daleif@math.au.dk $}
 
 
@@ -5993,15 +6049,39 @@ odd line or to reword the text.
 \label{sec:text-case}
 
 The standard kernel \cmd{\MakeUppercase}\marg{text} and
-\cmd{\MakeLowercase}\marg{text} 
-basically upper or lower case everything it can get its hands on. This
-is not particularly nice if the \meta{text} contain, say, math.
-
-In order to help with this we provide the \cmd{\MakeTextUppercase} and
-\cmd{\MakeTextLowercase} macros from the \Lpack{textcase} package
-(\cite{textcase}) by David Carlisle. The following is DCs own
-documentation of the provided code changed to match the typography we
-use.
+\cmd{\MakeLowercase}\marg{text} basically upper or lower case
+everything it can get its hands on. This is not particularly nice if
+the \meta{text} contain, say, math.
+
+In order to help with this we load the \Lpack{textcase} package
+(\cite{textcase}) by David Carlisle (with the \texttt{overload}
+option) which provide the \cmd{\MakeTextUppercase} and
+\cmd{\MakeTextLowercase} macros.\footnote{Overload causes the original
+  \cmd{\MakeUppercase} and \cmd{\MakeLowercase} to be copies of
+  \cmd{\MakeTextUppercase} and \cmd{\MakeTextLowercase}.}
+
+
+\begin{caveat}
+  This change was made in October 2019, earlier we embedded a copy of
+  \texttt{textcase} into the class it self. Now we check to see of you
+  have a copy and use that, if found, if not we use our old embedded
+  copy.
+
+  If, for some reason, you want the original \cmd{\MakeUppercase} and
+  \cmd{\MakeLowercase} macros back, add
+\begin{syntax}
+  \cmd{\MemRestoreOrigMakecase}
+\end{syntax}
+to your preamble.
+\end{caveat}
+
+
+The following is DCs own documentation of the provided code changed to
+match the typography we use.\footnote{Note: This documentation will
+  probably be removed in a future version and replaced by a summary
+  and a reference to \cite{textcase}.}
+
+
 
 \fancybreak{}
 
@@ -7044,9 +7124,9 @@ and thanks notes are meant to be different.
 
 \svnidlong
 {$Ignore: $}
-{$LastChangedDate: 2014-03-31 11:34:44 +0200 (Mon, 31 Mar 2014) $}
-{$LastChangedRevision: 480 $}
-{$LastChangedBy: daleif $}
+{$LastChangedDate: 2019-10-22 18:09:22 +0200 (Tue, 22 Oct 2019) $}
+{$LastChangedRevision: 652 $}
+{$LastChangedBy: daleif@math.au.dk $}
 
 \chapter{Abstracts}
 
@@ -7191,6 +7271,23 @@ between paragraphs in this environment.
 The default values depend on whether or not the \Lopt{twocolumn}
 class option is used. The general layout parameters for lists are illustrated
 in \fref{fig:listlay}.
+\begin{caveat}
+  The default values for \cmd{\absparindent} and \cmd{\absparsep} are
+  \cmd{\parindent} and \cmd{\parskip}. But, since users may change
+  these values in the preamble, we delay setting \cmd{\absparindent}
+  and \cmd{\absparsep} to the beginning of the document. Thus if you
+  want to change these values remember to use
+\begin{verbatim}
+\AtBeginDocument{
+  \setlength{\absparindent}{...}
+  \setlength{\absparsep}{...}
+}
+\end{verbatim}
+
+\end{caveat}
+
+
+
 
 \begin{syntax}
 \cmd{\abslabeldelim}\marg{text} \\
@@ -7238,15 +7335,17 @@ other appropriate environment which is supported by a used package\index{package
 \lnc{\abstitleskip} is typeset
 before the heading. For example, if \lnc{\absparindent} is non-zero, then:
 \begin{lcode}
-\setlength{\abstitleskip}{-\absparindent}
+\AtBeginDocument{
+  \setlength{\abstitleskip}{-\absparindent}
+}
 \end{lcode}
- will typeset the heading flush left.
+will typeset the heading flush left (we have to delay as the value of
+\cmd{\absparindent} is zero in the preamble and is set at the start of
+the doc).
 
-Without the \cmd{\abstractrunin} declaration, \lnc{\abstitleskip} is 
-aditional vertical 
-space (either positive
-or negative) that is inserted between the abstract name and the text of
-the abstract.
+Without the \cmd{\abstractrunin} declaration, \lnc{\abstitleskip} is
+aditional vertical space (either positive or negative) that is
+inserted between the abstract name and the text of the abstract.
 
 \index{abstract!styling|)}
 
@@ -7315,9 +7414,9 @@ optional argument of the \cmd{\twocolumn} command. In fact,
 
 \svnidlong
 {$Ignore: $}
-{$LastChangedDate: 2015-07-17 12:08:47 +0200 (Fri, 17 Jul 2015) $}
-{$LastChangedRevision: 541 $}
-{$LastChangedBy: daleif $}
+{$LastChangedDate: 2019-11-04 16:13:21 +0100 (Mon, 04 Nov 2019) $}
+{$LastChangedRevision: 658 $}
+{$LastChangedBy: daleif@math.au.dk $}
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %   chapter style
@@ -7818,6 +7917,15 @@ The \cmd{\frontmatter} commands sets the numbering level to \texttt{none}.
 The commands \cmd{\mainmatter} and \cmd{\mainmatter*} set the
 numbering level to the value specified by \cmd{\maxsecnumdepth}.
 
+\begin{hint}
+  One will often set \cmd{\setsecnumdepth} in the preamble and then
+  wonder why it didn't do anything. That is probably because of
+  \cmd{\frontmatter} and \cmd{mainmatter}, so make it a habit of
+  setting them both like above.
+\end{hint}
+
+
+
     The number setting commands come from the \Lpack{tocvsec2}
 package~\cite{TOCVSEC2}.
 
@@ -9427,6 +9535,19 @@ centered, and in the normal font, you can do
 \setsubsubsecheadstyle{\normalfont\centering\MakeUppercase}
 \end{lcode}
 
+\fancybreak{$***$}
+
+Under very special circumstances, one might want to get completely rid
+of the sectional header (for example, if you are using a very small
+paper size, and you are placing the section information in the header
+instead), by creating a macro that takes on argument and ignores it
+\begin{lcode}
+  \newcommand\ignoreMe[1]{}
+  \setsecheadstyle{\ignoreMe}
+\end{lcode}
+
+\fancybreak{$***$}
+
     As another example, although I don't recommend this, you can draw a
 horizontal line under section titles via:
 \begin{lcode}
@@ -9512,10 +9633,13 @@ is to be located.
 \glossary(setsecnumformat)%
   {\cs{setsecnumformat}\marg{code}}%
   {Redefines \cs{@seccntformat} to \meta{code}.}
-Internally all the titling macros use a kernel macro called 
+Internally all the titling macros like \cmd{\section},
+\cmd{\subsection} etc. use a kernel macro called 
 \cmd{\@seccntformat} 
 which defines the formatting of sectional numbers in a title. Its
-default definition (in file \file{ltsect.dtx}) is effectively:
+default definition (in file \file{ltsect.dtx}) is
+effectively:\footnote{Because they all internally use the
+\cmd{\@startsection} macro.}
 \begin{lcode}
 \newcommand{\@seccntformat}[1]{\csname the#1\endcsname\quad}
 \end{lcode}
@@ -9740,7 +9864,22 @@ In this example we will provide separate formatting for \cmd{\section} and \cmd{
   \newcommand\subsectionsecnumformat{\fbox{\enspace\thesubsection\enspace}\enspace}
 \end{lcode}
 Since the macro is only called in the proper context, we can use
-\cmd{\thesection} directly in the code for \cmd{\section}.
+\cmd{\thesection} directly in the code for \cmd{\section}. However,
+this requires you to define formatting macros for all sectional
+headings. Here is how to reverse it, that is see if a format exists,
+use it, otherwise use a default:
+\begin{lcode}
+  \makeatletter
+  \setsecnumformat{%
+    \@ifundefined{#1secnumformat}{% nope, use a default
+      \csname the#1\endcsname\quad%
+    }{%
+      \csname #1secnumformat\endcsname%
+    }%
+  }
+\makeatother
+\end{lcode}
+
 
 
 
@@ -10188,8 +10327,8 @@ normal size by the time subsubsection heads are reached, or before.
 
 \svnidlong
 {$Ignore: $}
-{$LastChangedDate: 2018-09-06 15:05:23 +0200 (Thu, 06 Sep 2018) $}
-{$LastChangedRevision: 612 $}
+{$LastChangedDate: 2019-11-11 16:55:48 +0100 (Mon, 11 Nov 2019) $}
+{$LastChangedRevision: 661 $}
 {$LastChangedBy: daleif@math.au.dk $}
 
 \chapterstyle{demo3}
@@ -10247,6 +10386,26 @@ is changed, but sometimes it may be desirable to have a continuous sequence
 of numbers irrespective of their displayed form, which is where
 the starred version comes in handy.
 
+\begin{hint}
+  If you are using \Lpack{hyperref} and include a title page, the
+  following setup might be useful
+  \begin{lcode}
+\pagenumbering{Alpha}
+\begin{titlingpage}
+  ...
+\end{titlingpage}
+\frontmatter
+... % this has roman numbering
+\mainmatter
+... % this has arabic numbering
+\end{lcode}
+The code has the advantage that \Lpack{hyperref} does not warn that
+the page anchors for pages 1 and 2 are already defined (the
+\Ie{titlingpage} env does not show the A, B page numbers).
+\end{hint}
+
+
+
 \begin{syntax}
 \cmd{\savepagenumber} \\
 \cmd{\restorepagenumber} \\
@@ -10415,10 +10574,11 @@ Called from & Style \\ \midrule
 is \cmd{\uppercaseheads} which specifies that the titles are to be
 automatically uppercased.
 
-\textbf{Change 2012:} The upper casing macro used by \cmd{\uppercaseheads} has
-been changed into \cmd{\MakeTextUppercase} such that the upper casing
-does not touch math, references or citations.
-
+\begin{note*}{Change 2012} The upper casing macro used by
+  \cmd{\uppercaseheads} has been changed into \cmd{\MakeTextUppercase}
+  (from the \Lpack{textcase} package) such that the upper casing does
+  not touch math, references or citations.
+\end{note*}
 
     For the \pstyle{myheadings} pagestyle above, you have to define your own
 titles to go into the header\index{header}. Each sectioning command, 
@@ -10530,8 +10690,8 @@ are diagrammed in \fref{lay:header}.
 the \pstyle{plain} pagestyle is defined as
 \begin{lcode}
 \makepagestyle{plain}
-  \makeevenfoot{plain}{}{\thepage}{}
-  \makeoddfoot{plain}{}{\thepage}{}
+\makeevenfoot{plain}{}{\thepage}{}
+\makeoddfoot{plain}{}{\thepage}{}
 \end{lcode}
 which centers the page number at the bottom of the page. 
     
@@ -10725,11 +10885,12 @@ same as the \lnc{\textwidth}.
    setting any marks.}
 The last thing that the \cmd{\pagestyle}\marg{style} does is call the
 \meta{code} argument of the \cmd{\makepsmarks} macro for \meta{style}.
-This is normally used for specifying non-default code 
-(i.e., code not specifiable via any of the previous macros) for the 
-particular pagestyle. The code normally defines the marks, if any, 
-that will be used in
-the headers\index{header} and footers\index{footer}.
+If specified, this code will often redefine the various macros that
+provide the automated data for the headers (or footers). For example
+how \cmd{\chapter} makes the title and chapter number avaialble for
+the header. If no \meta{code} is specified (or \cmd{\makepsmarks} is
+not setup for this \meta{style}, the providing macros already active
+will be used.
 
 \LMnote{2010/06/25}{Added a mentioning of \cs{makeheadfootstrut}}
 \begin{syntax}
@@ -10742,6 +10903,211 @@ them to \cmd{\strut} (except the \pstyle{empty} style where the struts
 are empty). One can use the macro above to change these struts to
 something different.
 
+\fancybreak{$***$}
+
+\LMnote{2019/11/07}{Moved the explanation for \cmd{createmark} and
+  friends}
+
+Writing the \meta{code} part for \cmd{\makepsmarks} can be very
+daunting, as you will be needing to define most of the macros listed
+in Table~\ref{tab:markmacros}
+
+However, most uses are very similar, so we have provided some helper
+macros:
+\begin{syntax}
+\cmd{\createmark}\marg{sec}\marg{marks}\marg{show}\marg{prefix}\marg{postfix} \\
+\cmd{\createplainmark}\marg{type}\marg{marks}\marg{text} \\
+\cmd{\memUChead}\marg{text} \\
+\cmd{\uppercaseheads} \cmd{\nouppercaseheads} \\
+\end{syntax}
+\glossary(createplainmark)%
+  {\cs{createplainmark}\marg{type}\marg{marks}\marg{text}}%
+  {Defines the \cs{typemark} macro using \meta{text} as the mark, where
+  \meta{marks} is \texttt{left}, \texttt{both} or \texttt{right}.}
+\glossary(createmark)%
+  {\cs{createmark}\marg{sec}\marg{marks}\marg{show}\marg{prefix}\marg{postfix}}%
+  {Defines the \cs{secmark} macro where \meta{show} (\texttt{shownumber} 
+   or \texttt{nonumber}) controls whether the division number will be
+   displayed within \cs{mainmatter}, \meta{marks} is \texttt{left}, 
+   \texttt{both} or \texttt{right}, and \meta{prefix} and \meta{postfix}
+   are affixed before and after the \meta{sec} (division) number.}
+\glossary(memUChead)%
+  {\cs{memUChead}\marg{text}}%
+  {May uppercase \meta{text}, depending on \cs{uppercaseheads} and
+  \cs{nouppercaseheads}.}
+\glossary(uppercaseheads)%
+  {\cs{uppercaseheads}}%
+  {Defines \cs{memUChead} as equivalent to \cs{MakeUppercase}.}
+\glossary(nouppercaseheads)%
+  {\cs{nouppercaseheads}}%
+  {Defines \cs{memUChead} as \cs{relax} (i.e., do nothing).}
+
+\noindent
+The macro \cmd{\createmark}\marg{sec}\marg{marks}\marg{show}\marg{prefix}\marg{postfix}
+defines a new macro \verb?\<sec>mark? that will take one argument, where
+\begin{description}
+  \item[\meta{marks}] is either \texttt{left}, \texttt{right} or \texttt{both},
+\item[\meta{sec}] is a sectional division
+    such as \texttt{part}, \texttt{chapter}, \texttt{section}, etc.,
+\item[\meta{show}] is one of the terms \texttt{shownumber}, \texttt{nonumber} or
+  \texttt{notitle}. They control what is available in the provided
+  header text. The terms \texttt{shownumber}, \texttt{nonumber}
+  control whether the number is displayed within \cmd{\mainmatter}
+  (under \cmd{\frontmatter} no numbers are displayed.
+  
+  The term \texttt{notitle} (which implies \texttt{shownumber}) will
+  only show the number part (including the \meta{postfix} and
+  \meta{prefix} parts described below) and \emph{no} title.
+
+\item[\meta{pre-/postfix}] are affixed before and after the division number.
+\end{description}
+For example:
+\begin{lcode}
+\createmark{section}{left}{nonumber}{}{}
+\createmark{section}{both}{nonumber}{}{}
+\createmark{section}{right}{nonumber}{}{}
+\end{lcode}
+is equivalent to, respectively
+\begin{lcode}
+\def\sectionmark#1{\markboth{\memUChead{#1}}{}}
+\def\sectionmark#1{\markboth{\memUChead{#1}}{\memUChead{#1}}}
+\def\sectionmark#1{\markight{\memUChead{#1}}}
+\end{lcode}
+whereas 
+\begin{lcode}
+\createmark{section}{left}{shownumber}{}{}
+\end{lcode}
+is equivalent to the following pseudo code
+\begin{lcode}
+\def\sectionmark#1{\markboth{
+  \memUChead{
+    if secnumdepth > number:
+      if mainmatter:
+        prefix \thesection postfix
+      fi
+    fi
+    #1% aka the section title  
+  }
+}{}}
+\end{lcode}
+and 
+\begin{lcode}
+\createmark{section}{left}{notitle}{}{}
+\end{lcode}
+is equivalent to the following pseudo code
+\begin{lcode}
+\def\sectionmark#1{\markboth{
+  \memUChead{
+    if secnumdepth > number:
+      if mainmatter:
+        prefix \thesection postfix
+      fi
+    fi
+  }
+}{}}
+\end{lcode}
+
+\fancybreak{}
+
+The macro \cmd{\createplainmark} defines the \verb?\<type>mark?, where 
+\meta{type} is an unnumbered division-like head, such as \texttt{toc},
+\texttt{lof}, \texttt{index}, using \meta{text} as the mark value, and 
+\meta{marks} is \texttt{left}, \texttt{both} or \texttt{right}. For example:
+\begin{lcode}
+\createplainmark{toc}{left}{\contentsname}
+\createplainmark{lot}{right}{\listtablename}
+\createplainmark{bib}{both}{\bibname}
+\end{lcode}
+is equivalent to
+\begin{lcode}
+\def\tocmark{\markboth{\memUChead{\contentsname}}{}}
+\def\lotmark{\markright{\memUChead{\listtablename}}}
+\def\lofmark{\markboth{\memUChead{\bibname}}{\memUChead{\bibname}}}
+\end{lcode}
+
+\fancybreak{}
+
+Lastly the macro \cmd{\memUChead} is an internal macro handling the
+upper- or non-uppercasing. Its definition is usually controlled using
+\cmd{\uppercaseheads} which sets \cmd{\memUChead} to
+\cmd{\MakeTextUppercase} (from \Lpack{textcase}) whereas
+\cmd{\nouppercaseheads} defines it to output the argument
+unchanged. The class default is \cmd{\uppercaseheads}.
+
+\fancybreak{}
+
+The class' default page style is \pstyle{headings}, which has the
+following setup for \cmd{\makepsmarks} (slight pseudocode):
+\begin{lcode}
+if twopage setup:
+  \makepsmarks{headings}{%
+    \createmark{chapter}{left}{shownumber}{\@chapapp\ }{. \ }
+    \createmark{section}{right}{shownumber}{}{. \ }
+    \createplainmark{toc}{both}{\contentsname}
+    \createplainmark{lof}{both}{\listfigurename}
+    \createplainmark{lot}{both}{\listtablename}
+    \createplainmark{bib}{both}{\bibname}
+    \createplainmark{index}{both}{\indexname}
+    \createplainmark{glossary}{both}{\glossaryname}
+  }
+else: % aka oneside
+  \makepsmarks{headings}{%
+    \createmark{chapter}{right}{shownumber}{\@chapapp\ }{. \ }
+    \createplainmark{toc}{right}{\contentsname}
+    \createplainmark{lof}{right}{\listfigurename}
+    \createplainmark{lot}{right}{\listtablename}
+    \createplainmark{bib}{right}{\bibname}
+    \createplainmark{index}{right}{\indexname}
+    \createplainmark{glossary}{right}{\glossaryname}
+  }
+fi
+\end{lcode}
+Where \cmd{\@chapapp} is a special macro what equals
+\cmd{\chaptername} unless \cmd{\appendix} is active, where it is then
+equal to \cmd{\appendixname}.
+
+Note how the twosided setup only include marks for \cmd{\chapter} and
+\cmd{\section} and onesided only for \cmd{\chapter}.
+
+\fancybreak{}
+
+So what if we wanted to add support for \cmd{\subsection} to an
+already defined page style? Use this:
+\begin{syntax}
+\cmd{\addtopsmarks}\marg{pagestyle}\marg{prepend}\marg{append} \\
+\end{syntax}
+\glossary(addtopsmarks)%
+  {\cs{addtopsmarks}\marg{pagestyle}\marg{prepend}\marg{append}}%
+  {Inserts \meta{prepend} and \meta{append} before and after the current
+   definition of \cs{makepsmarks} for \meta{pagestyle}.}
+Here \meta{prepend} and \meta{append} is inserted
+\emph{before} and \emph{after} the current definition of \cs{makepsmarks} 
+for \meta{pagestyle}. So to answer our question we could use
+\begin{lcode}
+\addtopsmarks{headings}{}{%
+  \createmark{subsection}{right}{shownumber}{}{. \space}}
+\pagestyle{headings}
+\end{lcode}
+-- always remember to activate the page style afterwards.
+
+
+\fancybreak{}
+
+\LMnote{2010/02/08}{fixed typo}
+
+When the class runs the marks part of page style, it does not zero out
+old marks, i.e.\ if an old \cmd{\sectionmark} exist, it still exist
+even if we do not change it.  This is both a good and a bad thing. To
+help users redefine these marks to doing nothing we provide
+\begin{syntax}
+\cmd{\clearplainmark}\marg{type}\\
+\cmd{\clearmark}\marg{type}\\  
+\end{syntax}
+The used types are the same as for \cmd{\createplainmark} and \cmd{\createmark}.
+
+
+
+
 
 \subsection{Example pagestyles}
 
@@ -10766,9 +11132,12 @@ date will be typeset in italics at the bottom of each page by the spine
 margin. If any \pstyle{empty} pages should be marked as well, specify
 similar footers for that style as well.
 
+\fancybreak{}
+
+
     Here is part of the standard definition of the \pstyle{headings}
 pagestyle for the \Lclass{book} class which uses many internal \ltx\ commands;
-but note that \Mname\ does not use this.
+but note that the class does not use this!
 \begin{lcode}
 \def\ps@headings{%
   \let\@oddfoot\@empty\let\@evenfoot\@empty
@@ -10806,7 +11175,7 @@ the section's title, again all in upper case.
 \makeoddhead{headings}{\slshape\rightmark}{}{\thepage}
 \makepsmarks{headings}{%
   \def\chaptermark##1{%
-    \markboth{\MakeUppercase{%
+    \markboth{\MakeTextUppercase{%
       \ifnum\c@secnumdepth > \m@ne
         \if@mainmatter
           \@chapapp\ \thechapter. \ %
@@ -10814,74 +11183,96 @@ the section's title, again all in upper case.
       \fi
       ##1}}{}}%
   \def\sectionmark##1{%
-    \markright{\MakeUppercase{%
+    \markright{\MakeTextUppercase{%
       \ifnum\c@secnumdepth > \z@
         \thesection. \ %
       \fi
       ##1}}}
-  \def\tocmark{\markboth{\MakeUppercase{\contentsname}}{}}
-  \def\lofmark{\markboth{\MakeUppercase{\listfigurename}}{}}
-  \def\lotmark{\markboth{\MakeUppercase{\listtablename}}{}}
-  \def\bibmark{\markboth{\MakeUppercase{\bibname}}{}}
-  \def\indexmark{\markboth{\MakeUppercase{\indexname}}{}}
-  \def\glossarymark{\markboth{\MakeUppercase{\glossaryname}}{}}}
+  \def\tocmark{\markboth{\MakeTextUppercase{\contentsname}}{}}
+  \def\lofmark{\markboth{\MakeTextUppercase{\listfigurename}}{}}
+  \def\lotmark{\markboth{\MakeTextUppercase{\listtablename}}{}}
+  \def\bibmark{\markboth{\MakeTextUppercase{\bibname}}{}}
+  \def\indexmark{\markboth{\MakeTextUppercase{\indexname}}{}}
+  \def\glossarymark{\markboth{\MakeTextUppercase{\glossaryname}}{}}}
 \end{lcode}
 As you can see, defining the marks for a pagestyle is not necessarily the
-simplest thing in the world. However, courtesy of Lars\index{Madsen, Lars} Madsen,
-help is at hand.
+simplest thing in the world. With the extra tools described above,
+this code can be reduced to
+\begin{lcode}
+\makepagestyle{headings}
+\makeevenhead{headings}{\thepage}{}{\slshape\leftmark}
+\makeoddhead{headings}{\slshape\rightmark}{}{\thepage}
+\makepsmarks{headings}{%
+  \createmark{chapter}{left}{shownumber}{\@chapapp\ }{. \ }
+  \createmark{section}{right}{shownumber}{}{. \ }
+  \createplainmark{toc}{both}{\contentsname}
+  \createplainmark{lof}{both}{\listfigurename}
+  \createplainmark{lot}{both}{\listtablename}
+  \createplainmark{bib}{both}{\bibname}
+  \createplainmark{index}{both}{\indexname}
+  \createplainmark{glossary}{both}{\glossaryname}
+}
+\end{lcode}
+
 
-\begin{syntax}
-\cmd{\createplainmark}\marg{type}\marg{marks}\marg{text} \\
-\cmd{\memUChead}\marg{text} \\
-\cmd{\uppercaseheads} \cmd{\nouppercaseheads} \\
-\cmd{\createmark}\marg{sec}\marg{marks}\marg{show}\marg{prefix}\marg{postfix} \\
-\end{syntax}
-\glossary(createplainmark)%
-  {\cs{createplainmark}\marg{type}\marg{marks}\marg{text}}%
-  {Defines the \cs{typemark} macro using \meta{text} as the mark, where
-  \meta{marks} is \texttt{left}, \texttt{both} or \texttt{right}.}
-\glossary(createmark)%
-  {\cs{createmark}\marg{sec}\marg{marks}\marg{show}\marg{prefix}\marg{postfix}}%
-  {Defines the \cs{secmark} macro where \meta{show} (\texttt{shownumber} 
-   or \texttt{nonumber}) controls whether the division number will be
-   displayed within \cs{mainmatter}, \meta{marks} is \texttt{left}, 
-   \texttt{both} or \texttt{right}, and \meta{prefix} and \meta{postfix}
-   are affixed before and after the \meta{sec} (division) number.}
-\glossary(memUChead)%
-  {\cs{memUChead}\marg{text}}%
-  {May uppercase \meta{text}, depending on \cs{uppercaseheads} and
-  \cs{nouppercaseheads}.}
-\glossary(uppercaseheads)%
-  {\cs{uppercaseheads}}%
-  {Defines \cs{memUChead} as equivalent to \cs{MakeUppercase}.}
-\glossary(nouppercaseheads)%
-  {\cs{nouppercaseheads}}%
-  {Defines \cs{memUChead} as \cs{relax} (i.e., do nothing).}
 
 
-The macro \cmd{\createplainmark} defines the \verb?\<type>mark?, where 
-\meta{type} is an unnumbered division-like head, such as \texttt{toc},
-\texttt{lof}, \texttt{index}, using \meta{text} as the mark value, and 
-\meta{marks} is \texttt{left}, \texttt{both} or \texttt{right}. For example:
-\begin{lcode}
-\createplainmark{toc}{left}{\contentsname}
-\createplainmark{lot}{right}{\listtablename}
-\createplainmark{bib}{both}{\bibname}
-\end{lcode}
-is equivalent to
-\begin{lcode}
-\def\tocmark{\markboth{\memUChead{\contentsname}}{}}
-\def\lotmark{\markright{\memUChead{\listtablename}}}
-\def\lofmark{\markboth{\memUChead{\bibname}}{\memUChead{\bibname}}}
-\end{lcode}
 
-    Following the declaration \cmd{\uppercaseheads} the \cmd{\memUChead} 
-command is equivalent to \cmd{\MakeUppercase} but after the 
-\cmd{\nouppercaseheads} it is equivalent to \cmd{\relax} (which does nothing).
-The \cmd{\createplainmark} macro wraps \cmd{\memUChead} around the \meta{text}
-argument within the generated \cs{mark(both/right)} macro. By using the
-\cs{(no)uppercaseheads} declarations you can control the uppercasing, or
-otherwise, of the mark texts. The default is \cmd{\uppercaseheads}.
+% However, courtesy of Lars\index{Madsen, Lars} Madsen,
+% help is at hand.
+
+% \begin{syntax}
+% \cmd{\createplainmark}\marg{type}\marg{marks}\marg{text} \\
+% \cmd{\memUChead}\marg{text} \\
+% \cmd{\uppercaseheads} \cmd{\nouppercaseheads} \\
+% \cmd{\createmark}\marg{sec}\marg{marks}\marg{show}\marg{prefix}\marg{postfix} \\
+% \end{syntax}
+% \glossary(createplainmark)%
+%   {\cs{createplainmark}\marg{type}\marg{marks}\marg{text}}%
+%   {Defines the \cs{typemark} macro using \meta{text} as the mark, where
+%   \meta{marks} is \texttt{left}, \texttt{both} or \texttt{right}.}
+% \glossary(createmark)%
+%   {\cs{createmark}\marg{sec}\marg{marks}\marg{show}\marg{prefix}\marg{postfix}}%
+%   {Defines the \cs{secmark} macro where \meta{show} (\texttt{shownumber} 
+%    or \texttt{nonumber}) controls whether the division number will be
+%    displayed within \cs{mainmatter}, \meta{marks} is \texttt{left}, 
+%    \texttt{both} or \texttt{right}, and \meta{prefix} and \meta{postfix}
+%    are affixed before and after the \meta{sec} (division) number.}
+% \glossary(memUChead)%
+%   {\cs{memUChead}\marg{text}}%
+%   {May uppercase \meta{text}, depending on \cs{uppercaseheads} and
+%   \cs{nouppercaseheads}.}
+% \glossary(uppercaseheads)%
+%   {\cs{uppercaseheads}}%
+%   {Defines \cs{memUChead} as equivalent to \cs{MakeTextUppercase}.}
+% \glossary(nouppercaseheads)%
+%   {\cs{nouppercaseheads}}%
+%   {Defines \cs{memUChead} as \cs{relax} (i.e., do nothing).}
+
+
+% The macro \cmd{\createplainmark} defines the \verb?\<type>mark?, where 
+% \meta{type} is an unnumbered division-like head, such as \texttt{toc},
+% \texttt{lof}, \texttt{index}, using \meta{text} as the mark value, and 
+% \meta{marks} is \texttt{left}, \texttt{both} or \texttt{right}. For example:
+% \begin{lcode}
+% \createplainmark{toc}{left}{\contentsname}
+% \createplainmark{lot}{right}{\listtablename}
+% \createplainmark{bib}{both}{\bibname}
+% \end{lcode}
+% is equivalent to
+% \begin{lcode}
+% \def\tocmark{\markboth{\memUChead{\contentsname}}{}}
+% \def\lotmark{\markright{\memUChead{\listtablename}}}
+% \def\lofmark{\markboth{\memUChead{\bibname}}{\memUChead{\bibname}}}
+% \end{lcode}
+
+%     Following the declaration \cmd{\uppercaseheads} the \cmd{\memUChead} 
+% command is equivalent to \cmd{\MakeTextUppercase} but after the 
+% \cmd{\nouppercaseheads} it is equivalent to \cmd{\relax} (which does nothing).
+% The \cmd{\createplainmark} macro wraps \cmd{\memUChead} around the \meta{text}
+% argument within the generated \cs{mark(both/right)} macro. By using the
+% \cs{(no)uppercaseheads} declarations you can control the uppercasing, or
+% otherwise, of the mark texts. The default is \cmd{\uppercaseheads}.
 
 \LMnote{2010/02/08}{added the following paragraph}
 Note that if you want to use a predefined page style, but would like
@@ -10893,59 +11284,49 @@ reload the page style, for example with the default page style in \theclass\
 \end{lcode}
 
 
-    The macro \cmd{\createmark}\marg{sec}\marg{marks}\marg{show}\marg{prefix}\marg{postfix}
-defines the \verb?\<sec>mark? macro where \meta{sec} is a sectional division
-such as \texttt{part}, \texttt{chapter}, \texttt{section}, etc., 
-and \meta{show} (\texttt{shownumber} 
-or \texttt{nonumber}) controls whether the division number will be
-displayed within \cs{mainmatter}. The \meta{marks} argument is \texttt{left}, 
-\texttt{both} or \texttt{right}, and \meta{prefix} and \meta{postfix}
-are affixed before and after the division number. For example:
-\begin{lcode}
-\createmark{section}{left}{nonumber}{}{}
-\createmark{section}{both}{nonumber}{}{}
-\createmark{section}{right}{nonumber}{}{}
-\end{lcode}
-is equivalent to, respectively
-\begin{lcode}
-\def\sectionmark#1{\markboth{#1}{}}
-\def\sectionmark#1{\markboth{#1}{#1}}
-\def\sectionmark#1{\markight{#1}}
-\end{lcode}
+%     The macro \cmd{\createmark}\marg{sec}\marg{marks}\marg{show}\marg{prefix}\marg{postfix}
+% defines the \verb?\<sec>mark? macro where \meta{sec} is a sectional division
+% such as \texttt{part}, \texttt{chapter}, \texttt{section}, etc., 
+% and \meta{show} (\texttt{shownumber}, \texttt{nonumber} or
+% \texttt{notitle} (implies \texttt{shownumber})) controls whether the division number will be
+% displayed within \cs{mainmatter}. The \meta{marks} argument is \texttt{left}, 
+% \texttt{both} or \texttt{right}, and \meta{prefix} and \meta{postfix}
+% are affixed before and after the division number. For example:
+% \begin{lcode}
+% \createmark{section}{left}{nonumber}{}{}
+% \createmark{section}{both}{nonumber}{}{}
+% \createmark{section}{right}{nonumber}{}{}
+% \end{lcode}
+% is equivalent to, respectively
+% \begin{lcode}
+% \def\sectionmark#1{\markboth{#1}{}}
+% \def\sectionmark#1{\markboth{#1}{#1}}
+% \def\sectionmark#1{\markight{#1}}
+% \end{lcode}
 
-The difference between \cmd{\createmark} and \cmd{\createplainmark} is
-that the former create a macro that takes an argument, whereas
-\cmd{\createplainmark} does not.
+% The difference between \cmd{\createmark} and \cmd{\createplainmark} is
+% that the former create a macro that takes an argument, whereas
+% \cmd{\createplainmark} does not.
 
 
-    Using these macros \Mname's current definition of 
-\verb?\makepsmarks{headings}? is much simpler (it also leads to a 
-slightly different result as the \texttt{toc} etc., marks set both
-the \cmd{\leftmark} and \cmd{\rightmark} instead of just the 
-\cmd{\leftmark}):
-\begin{lcode}
-\makepsmarks{headings}{%
-  \createmark{chapter}{left}{shownumber}{\@chapapp\ }{. \ }
-  \createmark{section}{right}{shownumber}{}{. \ }
-  \createplainmark{toc}{both}{\contentsname}
-  \createplainmark{lof}{both}{\listfigurename}
-  \createplainmark{lot}{both}{\listtablename}
-  \createplainmark{bib}{both}{\bibname}
-  \createplainmark{index}{both}{\indexname}
-  \createplainmark{glossary}{both}{\glossaryname}}
-\end{lcode}
+%     Using these macros \Mname's current definition of 
+% \verb?\makepsmarks{headings}? is much simpler (it also leads to a 
+% slightly different result as the \texttt{toc} etc., marks set both
+% the \cmd{\leftmark} and \cmd{\rightmark} instead of just the 
+% \cmd{\leftmark}):
+% \begin{lcode}
+% \makepsmarks{headings}{%
+%   \createmark{chapter}{left}{shownumber}{\@chapapp\ }{. \ }
+%   \createmark{section}{right}{shownumber}{}{. \ }
+%   \createplainmark{toc}{both}{\contentsname}
+%   \createplainmark{lof}{both}{\listfigurename}
+%   \createplainmark{lot}{both}{\listtablename}
+%   \createplainmark{bib}{both}{\bibname}
+%   \createplainmark{index}{both}{\indexname}
+%   \createplainmark{glossary}{both}{\glossaryname}}
+% \end{lcode}
 
 
-\LMnote{2010/02/08}{fixed typo}
-When \Mname{} runs the marks part of page style, it does not zero out
-old marks, i.e.\ if an old \cmd{\sectionmark} exist, it still exist
-even if we do not change it.  This is both a good and a bad thing. To help
-users redefine these marks to doing nothing we provide
-\begin{syntax}
-\cmd{\clearplainmark}\marg{type}\\
-\cmd{\clearmark}\marg{type}\\  
-\end{syntax}
-The used types are the same as for \cmd{\createplainmark} and \cmd{\createmark}.
 
 
 
@@ -11066,17 +11447,18 @@ what goes into each header\index{header} and footer\index{footer} slot
 typeset with \pstyle{companion} pagestyle headers\index{header}. This pagestyle
 is part of the class.
 
-\begin{syntax}
-\cmd{\addtopsmarks}\marg{pagestyle}\marg{prepend}\marg{append} \\
-\end{syntax}
-\glossary(addtopsmarks)%
-  {\cs{addtopsmarks}\marg{pagestyle}\marg{prepend}\marg{append}}%
-  {Inserts \meta{prepend} and \meta{append} before and after the current
-   definition of \cs{makepsmarks} for \meta{pagestyle}.}
-\cmd{\addtopsmarks}\marg{pagestyle}\marg{prepend}\marg{append} is the last
-of this group of helper macros. It inserts \meta{prepend} and \meta{append} 
-before and after the current definition of \cs{makepsmarks} 
-for \meta{pagestyle}. For instance, if you wanted \cs{subsection} titles to appear
+% \begin{syntax}
+% \cmd{\addtopsmarks}\marg{pagestyle}\marg{prepend}\marg{append} \\
+% \end{syntax}
+% \glossary(addtopsmarks)%
+%   {\cs{addtopsmarks}\marg{pagestyle}\marg{prepend}\marg{append}}%
+%   {Inserts \meta{prepend} and \meta{append} before and after the current
+%    definition of \cs{makepsmarks} for \meta{pagestyle}.}
+% \cmd{\addtopsmarks}\marg{pagestyle}\marg{prepend}\marg{append} is the last
+% of this group of helper macros. It inserts \meta{prepend} and \meta{append} 
+% before and after the current definition of \cs{makepsmarks} 
+% for \meta{pagestyle}.
+For instance, if you wanted \cs{subsection} titles to appear
 in the page headers of the \pstyle{companion} pagestyle then this would be a way
 of doing it:
 \begin{lcode}
@@ -19894,8 +20276,8 @@ illustrate these points.
 
 \svnidlong
 {$Ignore: $}
-{$LastChangedDate: 2018-09-19 15:47:14 +0200 (Wed, 19 Sep 2018) $}
-{$LastChangedRevision: 621 $}
+{$LastChangedDate: 2019-11-14 18:06:44 +0100 (Thu, 14 Nov 2019) $}
+{$LastChangedRevision: 662 $}
 {$LastChangedBy: daleif@math.au.dk $}
 
 \chapter{Page notes} \label{chap:mnotes}
@@ -19911,6 +20293,7 @@ for fixed marginal notes and sidebars.
 
 \section{Footnotes}
 
+
     A footnote can be considered to be a special kind of float\index{float} 
 that is put at the bottom of a page.
 
@@ -19930,6 +20313,8 @@ bottom of the page, or in a \Ie{minipage} where it puts the note
 at the end of the \Ie{minipage}. Results are likely to be peculiar if
 it is used anywhere else (like in a \Ie{tabular}).
 
+
+
 \begin{syntax}
 \cmd{\footnotemark}\oarg{num} \\
 \cmd{\footnotetext}\oarg{num}\marg{text} \\
@@ -19954,6 +20339,8 @@ defined like:
 In any event, you can use a combination of \cmd{\footnotemark} and 
 \cmd{\footnotetext} to do footnoting where \ltx\ would normally get upset.
 
+
+
 \begin{syntax}
 \cmd{\footref}\marg{label} \\
 \end{syntax}
@@ -19964,18 +20351,18 @@ In any event, you can use a combination of \cmd{\footnotemark} and
 to the text of a footnote\index{footnote!reference}. This can be done by 
 putting a \cmd{\label} in the footnote and then using \cmd{\footref} to refer 
 to the label; this prints the footnote mark. For example:
-\begin{comment}
-%%% in memdesign, not memman
-\begin{lcode}
-...\footnote{... adults or babies.\label{fn:rabbits}}
-...
-... The footnote\footref{fn:rabbits} on \pref{fn:rabbits} ...
-\end{lcode}
-In this manual, the last line above prints:
-\begin{syntax}
-... The footnote\footref{fn:rabbits} on \pref{fn:rabbits} ... \\
-\end{syntax}
-\end{comment}
+% \begin{comment}
+% %%% in memdesign, not memman
+% \begin{lcode}
+% ...\footnote{... adults or babies.\label{fn:rabbits}}
+% ...
+% ... The footnote\footref{fn:rabbits} on \pref{fn:rabbits} ...
+% \end{lcode}
+% In this manual, the last line above prints:
+% \begin{syntax}
+% ... The footnote\footref{fn:rabbits} on \pref{fn:rabbits} ... \\
+% \end{syntax}
+% \end{comment}
 \begin{lcode}
 ...\footnote{...values for the kerning.\label{fn:kerning}} ...
 ...
@@ -19983,10 +20370,14 @@ In this manual, the last line above prints:
 \end{lcode}
 In this manual, the last line above prints:
 \begin{syntax}
-... The footnote\footref{fn:kerning} on \pref{fn:kerning} ... \\
+  ...
+  The footnote\footref{fn:kerning}
+%  on \pref{fn:kerning} ...
 \end{syntax}
 
 
+
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%%% from membook
 
@@ -20623,8 +21014,10 @@ Internally \cmd{\setfootins} also sets the skips being used by
 
 \index{footnote|)}
 
- \section{Marginal notes}
+\section{Marginal notes}
 
+
+ 
 \LMnote{2010/01/**}{added a reference back to \cs{setmarginnotes}}
      Some marginalia can also be considered to be kinds of floats. 
 The class provides the standard margin notes\index{margin note} 
@@ -27682,8 +28075,8 @@ pdflatex memman
 
 \svnidlong
 {$Ignore: $}
-{$LastChangedDate: 2018-04-05 11:07:48 +0200 (Thu, 05 Apr 2018) $}
-{$LastChangedRevision: 596 $}
+{$LastChangedDate: 2019-11-11 16:55:48 +0100 (Mon, 11 Nov 2019) $}
+{$LastChangedRevision: 661 $}
 {$LastChangedBy: daleif@math.au.dk $}
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -29104,9 +29497,9 @@ If you want a \file{dvi} file output use \ltx\ and if you want a
 \begin{syntax}
 \piif{ifpdf} ... \verb?\fi? \\
 \end{syntax}
-The class provides \piif{ifpdf} (by autoloading the \Lpack{ifpdf}
-package) which is \ptrue\ when the document is
-being processed by \pixpdfltx\ and \pfalse\ otherwise. You can use it like this:
+The class provides \piif{ifpdf} (by autoloading the \Lpack{iftex}
+package) which is \ptrue\ when the document is being processed by
+\pixpdfltx\ and \pfalse\ otherwise. You can use it like this:
 \begin{lcode}
 \ifpdf
   code for pdfLaTeX only 
@@ -29131,7 +29524,7 @@ available (Though, as of 2018, this is \emph{very} rare).
 {\ptrue\ if \etx\ is the underlying engine, otherwise \pfalse.}
 \piif{ifetex} can be used to determine if \pixetx\ is being used as
 the underlying engine; it is analagous to \piif{ifpdf} which tests for
-\pixpdfltx\ (provided by autoloading the \Lpack{ifetex} package). For
+\pixpdfltx\ (provided by autoloading the \Lpack{iftex} package). For
 example:
 \begin{lcode}
 \ifetex
@@ -29144,8 +29537,8 @@ example:
 
 \subsection{Checking for XeTeX}
 
-    You have been able to use \cs{ifpdf} to check if \pixpdfltx\ is being used 
-to process the document.
+You have been able to use \cs{ifpdf} to check if PDF output is being
+used to process the document.
 
 \begin{syntax}
 \piif{ifxetex} \\
@@ -29154,9 +29547,9 @@ to process the document.
   {\cs{ifxetex}}%
   {\ptrue\ if \xetx\ is being used to process the document.}
 
-In a similar manner you can use \piif{ifxetex} to check if the document
-is being processed by \pixxetx\ (provided by autoloading the
-\Lpack{ifxetex} package).
+  In a similar manner you can use \piif{ifxetex} to check if the
+  document is being processed by \pixxetx\ (provided by autoloading
+  the \Lpack{iftex} package).
 
 \begin{syntax}
 \cmd{\RequireXeTeX} \\
@@ -29164,7 +29557,7 @@ is being processed by \pixxetx\ (provided by autoloading the
 \glossary(RequireXeTeX)%
 {\cs{RequireXeTeX}}%
 {Generates an error if the document is not being processed by \xetx.}
-The \Lpack{ifxetex} package also provides \cmd{\RequireXeTeX}, which
+The \Lpack{iftex} package also provides \cmd{\RequireXeTeX}, which
 generates an error if \pixxetx\ is not being used to process the
 document. This can be useful if you make your own class building upon
 \Lclass{memoir}.
@@ -29179,7 +29572,8 @@ Similarly you can use
 \glossary(ifluatex)%
   {\cs{ifluatex}}%
   {\ptrue\ if \luatx\ is being used to process the document.}
-to check if the doc is being process by  \luatx.
+to check if the doc is being process by  \luatx. Again provided by
+loading \Lpack{iftex}.
 
 
 \section{Leading}
@@ -32137,6 +32531,7 @@ The \theclass\ memoir class has several features that involve a
 \emph{style} and it provide several of these styles. This chapter is
 used to showcase these styles.
 
+
 \begingroup
 % because of hyperref warnings
 
@@ -38116,8 +38511,8 @@ recognized.
 
 \svnidlong
 {$Ignore: $}
-{$LastChangedDate: 2018-04-05 11:07:48 +0200 (Thu, 05 Apr 2018) $}
-{$LastChangedRevision: 596 $}
+{$LastChangedDate: 2019-11-14 18:06:44 +0100 (Thu, 14 Nov 2019) $}
+{$LastChangedRevision: 662 $}
 {$LastChangedBy: daleif@math.au.dk $}
 
 \chapter{Comments}
@@ -38142,19 +38537,19 @@ used \cmd{\setmarginnotes}.
   \vskip-2\baselineskip
   \begin{small}
 \begin{verbatim}
-if twocolumn then
+if twocolumn then:
   marginparwidth = min{inner margin,outer margin}
 else
-  if twoside then
-    if marginpar always left or always right then
+  if twoside then:
+    if marginpar always left or always right then:
       marginparwidth = min{inner margin,outer margin}
-    else if marginpar in outer margin then
+    else if marginpar in outer margin then:
       marginparwidth = outer margin
-    else if marginpar in inner margin then
+    else if marginpar in inner margin then:
       marginparmargin = inner margin
     end if
   else
-    if marginpar in left margin then
+    if marginpar in left margin then:
       marginparwidth = inner margin
     else
       marginparwidth = outer margin
@@ -38162,7 +38557,7 @@ else
   end if
 end if
 marginparwidth = marginparwidth - 2marginparsep
-if marginparwidth < 1pt then
+if marginparwidth < 1pt then:
   marginparwidth = 1pt
 end if
 \end{verbatim}
@@ -38407,10 +38802,11 @@ access CTAN is available at \url{http://www.tug.org}.
   \newblock (Available from CTAN via
              \CTANurl{/macros/latex/required/tools/})
 
-\bibitem[Car04]{textcase} % casing intentional
+\LMnote{2019/10/2}{Updated year}
+\bibitem[Car19]{textcase} % casing intentional
  David Carlisle.
 \newblock \emph{The \Lpack{textcase} package}.
-\newblock October, 2004.
+\newblock September, 2019.
 \newblock (Available from CTAN in 
       \texttt{/macros/latex/contrib/textcase})
 
@@ -39473,26 +39869,26 @@ Peter Wilson.
   \newblock (Available from CTAN via 
             \CTANurl{/macros/latex/contrib/fonttable/})
 
-\bibitem[Wil09b]{MEMCODE}
+\bibitem[Wil19a]{MEMCODE}
 Peter Wilson (with the assistance of Lars Madsen).
   \newblock \emph{The \ltx\ memoir class for configurable book
     typesetting: source code} 
-  \newblock July, 2009.
+  \newblock November, 2019.
   \newblock (Available from CTAN via 
             \CTANurl{/macros/latex/contrib/memoir/})
 
-\bibitem[Wil07c]{MEMMAN}
+\bibitem[Wil19b]{MEMMAN}
 Peter Wilson (with the assistance of Lars Madsen).
   \newblock \emph{The Memoir Class for Configurable Typesetting ---
     User Guide} 
-  \newblock August, 2009. Regularly updated.
+  \newblock November, 2019. Regularly updated.
   \newblock (Available from CTAN via 
             \CTANurl{/macros/latex/contrib/memoir/})
 
-\bibitem[Wil09d]{MEMDESIGN}
+\bibitem[Wil18]{MEMDESIGN}
   Peter Wilson.
   \newblock \emph{A Few Notes on Book Design}
-  \newblock August, 2009.
+  \newblock September, 2018.
   \newblock (Available from CTAN via
             \CTANurl{/info/memdesign/})
 
@@ -39504,10 +39900,10 @@ Peter Wilson.
 \newblock To be published.
 
 
-\bibitem[Wri18]{SIUNITX}
+\bibitem[Wri19]{SIUNITX}
   Joseph Wright.
   \newblock \emph{Siunitx — A comprehensive (SI) units package}
-  \newblock May, 2018.
+  \newblock October, 2019.
   \newblock (Available from CTAN via \CTANurl{/macros/latex/contrib/siunitx})
 
 
diff --git a/macros/latex/contrib/memoir/doc-src/memsty.sty b/macros/latex/contrib/memoir/doc-src/memsty.sty
index a59bd4d455..a0427c232b 100644
--- a/macros/latex/contrib/memoir/doc-src/memsty.sty
+++ b/macros/latex/contrib/memoir/doc-src/memsty.sty
@@ -1125,6 +1125,7 @@ it to use the new width for the  margin par}
 
 \newenvironment{caveat}{\par\medskip\noindent\textbf{\textit{Caveat.}}\enskip\itshape}{\par\medskip}
 \newenvironment{note}{\par\medskip\noindent\textbf{\textit{Note.}}\enskip\itshape}{\par\medskip}
+\newenvironment{note*}[1]{\par\medskip\noindent\textbf{\textit{#1.}}\enskip\itshape}{\par\medskip}
 \newenvironment{hint}{\par\medskip\noindent\textbf{\textit{Hint.}}\enskip\itshape}{\par\medskip}
 \renewcommand{\cmdprint}[1]{\textup{\texttt{\string#1}}}
 
@@ -1151,7 +1152,8 @@ it to use the new width for the  margin par}
     \endshaded}
 
 
-
+%\renewcommand\theHfootnote{\thefootnote.\thesheetsequence}
+ 
 
 
 \typeout{End memsty.sty}
diff --git a/macros/latex/contrib/memoir/memman.pdf b/macros/latex/contrib/memoir/memman.pdf
index 38847b78a7..346b815bd3 100644
--- a/macros/latex/contrib/memoir/memman.pdf
+++ b/macros/latex/contrib/memoir/memman.pdf
diff --git a/macros/latex/contrib/memoir/memoir.dtx b/macros/latex/contrib/memoir/memoir.dtx
index 2fd0bb32a5..aefdd23d05 100644
--- a/macros/latex/contrib/memoir/memoir.dtx
+++ b/macros/latex/contrib/memoir/memoir.dtx
@@ -20,7 +20,7 @@
 % This work consists of the files listed in the README file.
 % 
 % \fi
-% \CheckSum{31004}
+% \CheckSum{31140}
 %
 % \changes{v0.1}{2001/05/20}{First public alpha release}
 % \changes{v0.2}{2001/06/03}{First beta release}
@@ -117,6 +117,7 @@
 % \changes{v3.7f}{2016/05/16}{Maintenance, luatex85 and booktabs update}
 % 
 % \changes{v3.7h}{2018/12/12}{Maintenance, removing some emulated packages}
+% \changes{v3.7i}{2019/11/15}{Maintenance, various edits}
 % 
 % \def\dtxfile{memoir.dtx}
 %
@@ -172,7 +173,8 @@
 % \def\fileversion{v3.7e}          \def\filedate{2015/07/08}
 % \def\fileversion{v3.7f}          \def\filedate{2016/05/16}
 % \def\fileversion{v3.7g}          \def\filedate{2018/04/04}
-% \def\fileversion{v3.7h}          \def\filedate{2018/12/12} ^^A remember to fix
+% \def\fileversion{v3.7h}          \def\filedate{2018/12/12} 
+% \def\fileversion{v3.7i}          \def\filedate{2019/11/15} 
 % \title{The LaTeX \Lpack{memoir} class for configurable book 
 %        typesetting: Source code\thanks{This
 %        file (\texttt{\dtxfile}) has version number \fileversion, last revised
@@ -403,11 +405,11 @@
 %    Announce the name, option files and version for LaTeX2e files:
 %    \begin{macrocode}
 %<class>\ProvidesClass{memoir}%
-%<class>  [2018/12/12 v3.7h configurable book, report, article document class]
+%<class>  [2019/11/15 v3.7i configurable book, report, article document class]
 %    \end{macrocode}
 %  In the manual it is useful to know the current version.
 %    \begin{macrocode}
-%<class>\newcommand\memversion{v3.7h, 2018/12/12}
+%<class>\newcommand\memversion{v3.7i, 2019/11/15}
 %<9pt>\ProvidesFile{mem9.clo}%
 %<9pt>             [2008/01/30 v0.4 memoir class 9pt size option]
 %<10pt>\ProvidesFile{mem10.clo}%
@@ -887,17 +889,43 @@
 %  \IfFileExists{#1}%
 %    {\#2\@addtofilelist{#1}\@@input \@filef@und}}
 % \end{verbatim}
+% and as of 2019/10/01:
+% \begin{verbatim}
+%  \DeclareRobustCommand \InputIfFileExists[2]{%
+%     \IfFileExists{#1}%
+%       {\expandafter\@swaptwoargs\expandafter
+%         {\@filef@und}{#2\@addtofilelist{#1}\@@input}}}
+% \end{verbatim}
+% Just to make sure we still work on formats prior and after
+% 2019/10/01 we `redefine' both
 %
 % \begin{macro}{\InputIfFileExists}
 % Effectively all file input is handled by this macro. Extend it
 % by adding pre- and post- input hooks.
-%    \begin{macrocode}
+% 
+% \changes{3.7i}{2019/10/22}{Added latest kernel changes, special
+% thanks to Phelype Oleinik}
+%    \begin{macrocode}
+\ifcsname InputIfFileExists \endcsname% looking for an explicit space
+                                % here aka the robust version
+  \DeclareRobustCommand \InputIfFileExists[2]{%
+    \IfFileExists{#1}%
+    {%
+      \expandafter\@swaptwoargs\expandafter
+      {\@filef@und\m@matendf{#1}\killm@matf{#1}}{%
+        #2\@addtofilelist{#1}\m@matbeginf{#1}\@@input%
+      }%
+    }%
+  }
+\else
+  % Old definition
 \renewcommand{\InputIfFileExists}[2]{%
   \IfFileExists{#1}%
     {#2\@addtofilelist{#1}\m@matbeginf{#1}%
      \@@input \@filef@und
      \m@matendf{#1}%
      \killm@matf{#1}}}
+\fi
 
 %    \end{macrocode}
 % \end{macro}
@@ -1128,112 +1156,143 @@
 %
 % \subsection{Checking the processor}
 %
-%     Prior to 2008/07/22 the \Lpack{hyperref} package was modified in such a 
-% way as to produce warnings about versions of the \Lpack{ifpdf} and 
-% \Lpack{ifxetex} packages when \Lpack{hyperref} was used with versions 
-% v1.618033, 
-% v1.61803, or v1.618 mempatch v4.9 of the class. 
-% \Lpack{hyperref}'s author refused to
-% make any changes to his package, insisting that emulating a package was 
-% `ugly hacking'. He did, though, provide an example code that could be 
-% added to memoir
-% to use a package if it was available. I have used it for the emulations
-% in this section. There will be no further changes to the class to accomodate
-% any further changes to \Lpack{hyperref} --- it's easy for a package to 
-% determine what class is being used and make arrangements accordingly, 
-% especially as there are not all that many classes. There are hundreds 
-% of packages that might be used with a particular class and it would be 
-% senseless for a class to attempt to take account of everything that might 
-% be used with it.
-%
+% As of November 2019, we load the \Lpack{iftex} package in order to
+% the the various processor tests. The package was updated in 2019 to
+% cover the functionality of the \Lpack{ifpdf}, \Lpack{ifetex},
+% \Lpack{ifxetex} and \Lpack{ifluatex} packages. You can find details
+% about its use in \cite{IFTEX}.
+% \changes{v3.7i}{2019/11/11}{Changed
+% ifX package loading to just loading the new \Lpack{iftex}
+% package. At the request of the LaTeX Project Team.}
+%    \begin{macrocode}
+\RequirePackage{iftex}[2019/11/07] 
+%    \end{macrocode}
+% The \Lpack{iftex} provides the following tests
+% (and several more):
+% \begin{macro}{\ifpdf}
+% True if the output mode is PDF. Useful if for example you are
+% working in an environment where you need to provide explicit code
+% for the LaTeX+dvips route.
+% \end{macro}
+% \begin{macro}{\ifxetex}
+% True if the XeTeX engine is being used.
+% \end{macro}
+% \begin{macro}{\ifluatex}
+% True if the LuaTeX engine is being used. Useful if you want to add
+% code that only apply under the LuaTeX based engines.
+% \end{macro}
+%
+%
+%
+% ^^A %     Prior to 2008/07/22 the \Lpack{hyperref} package was modified in such a 
+% ^^A % way as to produce warnings about versions of the \Lpack{ifpdf} and 
+% ^^A % \Lpack{ifxetex} packages when \Lpack{hyperref} was used with versions 
+% ^^A % v1.618033, 
+% ^^A % v1.61803, or v1.618 mempatch v4.9 of the class. 
+% ^^A % \Lpack{hyperref}'s author refused to
+% ^^A % make any changes to his package, insisting that emulating a package was 
+% ^^A % `ugly hacking'. He did, though, provide an example code that could be 
+% ^^A % added to memoir
+% ^^A % to use a package if it was available. I have used it for the emulations
+% ^^A % in this section. There will be no further changes to the class to accomodate
+% ^^A % any further changes to \Lpack{hyperref} --- it's easy for a package to 
+% ^^A % determine what class is being used and make arrangements accordingly, 
+% ^^A % especially as there are not all that many classes. There are hundreds 
+% ^^A % of packages that might be used with a particular class and it would be 
+% ^^A % senseless for a class to attempt to take account of everything that might 
+% ^^A % be used with it.
+% ^^A %
 % ^^A % Note (2016/05/16): Due to recent changes in Luatex, most notably the
 % ^^A % removal of several \cs{pdf...} macro, several PDF tests fail with
 % ^^A % LuaLaTeX. As a temporary measure the following is used to restore
 % ^^A % the old functionality when a newer LuaLaTeX is used. Code courtesy
 % ^^A % of David Carlisle. At some point we will include some of this into
 % ^^A % the class.
-% \changes{v3.7f}{2016/05/16}{Temp measure to make the class work with
-% updated luatex}
-% \changes{v3.7g}{2018/03/09}{\Lpack{luatex85} removed again, now
-% relying on external \cs{if<engine>} packages and have rewritten the
-% macros that use \cs{pdf...}}
+% ^^A % \changes{v3.7f}{2016/05/16}{Temp measure to make the class work with
+% ^^A % updated luatex}
+% ^^A % \changes{v3.7g}{2018/03/09}{\Lpack{luatex85} removed again, now
+% ^^A % relying on external \cs{if<engine>} packages and have rewritten the
+% ^^A % macros that use \cs{pdf...}}
+% ^^A % ^^A %    \begin{macrocode}
+% ^^A % ^^A \ifx\pdfextension\@undefined\else
+% ^^A % ^^A   \RequirePackage{luatex85}
+% ^^A % ^^A \fi    
+% ^^A % ^^A 
+% ^^A % ^^A %    \end{macrocode}
+% ^^A % 
+% ^^A %
+% ^^A % \begin{macro}{\ifpdf}
+% ^^A % This can be used to check whether or not a document is being processed
+% ^^A % by \LaTeX{} or pdf\LaTeX.  We will simply require the \Lpack{ifpdf} package.
+% ^^A % \changes{v1.0}{2001/09/21}{Made checking of \cs{pdfouput} more robust}
+% ^^A % \changes{v1.618}{2005/09/03}{Prohibit loading the ifpdf package (mempatch v3.9)}
+% ^^A % \changes{v1.618033}{2008/06/02}{Further improved pdf checking}
+% ^^A % \changes{v1.6180339}{2008/07/23}{Use ifpdf package if available}
+% ^^A % \changes{v1.61803398d}{2009/12/01}{if \cs{ifpdf} is already
+% ^^A % defined, e.g. using \cs{RequirePackage} before \cs{documentclass},
+% ^^A % then using \cs{newif}\cs{ifpdf} will cause TeX to eat up a lot of
+% ^^A % code. We fix this using a hint by Will Robertson.}
+% ^^A % \changes{v3.7g}{2018/03/08}{As of 2018, we will no longer be
+% ^^A % emulating \cs{if}\meta{engine} packages, you'll get an error if you
+% ^^A % do not have them}
 % ^^A %    \begin{macrocode}
-% ^^A \ifx\pdfextension\@undefined\else
-% ^^A   \RequirePackage{luatex85}
-% ^^A \fi    
-% ^^A 
+% ^^A % \RequirePackage{ifpdf}[2017/03/15] 
 % ^^A %    \end{macrocode}
-% 
+% ^^A % \end{macro}
+% ^^A %
+% ^^A % \begin{macro}{\ifetex}
+% ^^A % Check if \texttt{etex} is being used. We will simply require the \Lpack{ifetex} package.
+% ^^A % \changes{v1.61803}{2008/01/30}{Added check for etex (mempatch v4.9)}
+% ^^A % \changes{v1.618033}{2008/06/02}{Improved check for etex}
+% ^^A % \changes{v1.6180339}{2008/07/23}{Use an ifetex package if available}
+% ^^A % \changes{v1.6180339c}{2008/12/27}{Changed ifetex message from Warning to Info}
+% ^^A % \changes{v3.7g}{2018/03/08}{As of 2018, we will no longer be
+% ^^A % emulating \cs{if}\meta{engine} packages, you'll get an error if you
+% ^^A % do not have them}
+% ^^A %    \begin{macrocode}
+% ^^A  % \RequirePackage{ifetex}
+% ^^A %    \end{macrocode}
+% ^^A % \end{macro}
+% ^^A % Having supplied an \cs{ifpdf} to check if pdfLaTeX is being used,
+% ^^A % here's one for XeTeX.
+% ^^A %
+% ^^A % \begin{macro}{\ifxetex}
+% ^^A % Checks if XeTeX is being used. We will simply require the \Lpack{ifxetex} package.
+% ^^A % \changes{v1.61803}{2008/01/30}{Added checks for XeTeX (mempatch v4.9)}
+% ^^A % \changes{v1.6180339}{2008/07/23}{Use ifxetex package if available}
+% ^^A % \changes{v1.61803398d}{2009/12/01}{if \cs{ifxetex} is already
+% ^^A % defined, e.g. using \cs{RequirePackage} before \cs{documentclass},
+% ^^A % then using \cs{newif}\cs{ifxetex} will cause TeX to eat up a lot of
+% ^^A % code. We fix this using a hint by Will Robertson.}
+% ^^A % \changes{v3.7g}{2018/03/08}{As of 2018, we will no longer be
+% ^^A % emulating \cs{if}\meta{engine} packages, you'll get an error if you
+% ^^A % do not have them}
+% ^^A %    \begin{macrocode}
+% ^^A  % \RequirePackage{ifxetex}[2010/09/12]
+% ^^A %    \end{macrocode}
+% ^^A % \end{macro}
+% ^^A %
+% ^^A % \begin{macro}{\ifluatex}
+% ^^A % Check if \texttt{luatex} is being used.  We will simply require the \Lpack{ifluatex} package.
+% ^^A % \changes{v1.61803}{2008/01/30}{Added check for luatex}
+% ^^A % \changes{v1.6180339}{2008/07/23}{Use an ifluatex package if available}
+% ^^A % \changes{v1.6180339c}{2008/12/31}{It seems that Heiko Oberdiek has created an
+% ^^A %           ifluatex package.}
+% ^^A % \changes{v1.61803398d}{2009/12/01}{if \cs{ifluatex} is already
+% ^^A % defined, e.g. using \cs{RequirePackage} before \cs{documentclass},
+% ^^A % then using \cs{newif}\cs{ifluatex} will cause TeX to eat up a lot of
+% ^^A % code. We fix this using a hint by Will Robertson.}
+% ^^A % \changes{v3.7g}{2018/03/08}{As of 2018, we will no longer be
+% ^^A % emulating \cs{if}\meta{engine} packages, you'll get an error if you
+% ^^A % do not have them}
+% ^^A %    \begin{macrocode}
+% ^^A  % \RequirePackage{ifluatex}[2016/05/16]
+% ^^A  % 
+% ^^A %    \end{macrocode}
+% ^^A % \end{macro}
+% ^^A %
 %
-% \begin{macro}{\ifpdf}
-% This can be used to check whether or not a document is being processed
-% by \LaTeX{} or pdf\LaTeX.  We will simply require the \Lpack{ifpdf} package.
-% \changes{v1.0}{2001/09/21}{Made checking of \cs{pdfouput} more robust}
-% \changes{v1.618}{2005/09/03}{Prohibit loading the ifpdf package (mempatch v3.9)}
-% \changes{v1.618033}{2008/06/02}{Further improved pdf checking}
-% \changes{v1.6180339}{2008/07/23}{Use ifpdf package if available}
-% \changes{v1.61803398d}{2009/12/01}{if \cs{ifpdf} is already
-% defined, e.g. using \cs{RequirePackage} before \cs{documentclass},
-% then using \cs{newif}\cs{ifpdf} will cause TeX to eat up a lot of
-% code. We fix this using a hint by Will Robertson.}
-% \changes{v3.7g}{2018/03/08}{As of 2018, we will no longer be
-% emulating \cs{if}\meta{engine} packages, you'll get an error if you
-% do not have them}
-%    \begin{macrocode}
-\RequirePackage{ifpdf}[2017/03/15] 
-%    \end{macrocode}
-% \end{macro}
 %
-% \begin{macro}{\ifetex}
-% Check if \texttt{etex} is being used. We will simply require the \Lpack{ifetex} package.
-% \changes{v1.61803}{2008/01/30}{Added check for etex (mempatch v4.9)}
-% \changes{v1.618033}{2008/06/02}{Improved check for etex}
-% \changes{v1.6180339}{2008/07/23}{Use an ifetex package if available}
-% \changes{v1.6180339c}{2008/12/27}{Changed ifetex message from Warning to Info}
-% \changes{v3.7g}{2018/03/08}{As of 2018, we will no longer be
-% emulating \cs{if}\meta{engine} packages, you'll get an error if you
-% do not have them}
-%    \begin{macrocode}
-\RequirePackage{ifetex}
-%    \end{macrocode}
-% \end{macro}
-% Having supplied an \cs{ifpdf} to check if pdfLaTeX is being used,
-% here's one for XeTeX.
-%
-% \begin{macro}{\ifxetex}
-% Checks if XeTeX is being used. We will simply require the \Lpack{ifxetex} package.
-% \changes{v1.61803}{2008/01/30}{Added checks for XeTeX (mempatch v4.9)}
-% \changes{v1.6180339}{2008/07/23}{Use ifxetex package if available}
-% \changes{v1.61803398d}{2009/12/01}{if \cs{ifxetex} is already
-% defined, e.g. using \cs{RequirePackage} before \cs{documentclass},
-% then using \cs{newif}\cs{ifxetex} will cause TeX to eat up a lot of
-% code. We fix this using a hint by Will Robertson.}
-% \changes{v3.7g}{2018/03/08}{As of 2018, we will no longer be
-% emulating \cs{if}\meta{engine} packages, you'll get an error if you
-% do not have them}
-%    \begin{macrocode}
-\RequirePackage{ifxetex}[2010/09/12]
-%    \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\ifluatex}
-% Check if \texttt{luatex} is being used.  We will simply require the \Lpack{ifluatex} package.
-% \changes{v1.61803}{2008/01/30}{Added check for luatex}
-% \changes{v1.6180339}{2008/07/23}{Use an ifluatex package if available}
-% \changes{v1.6180339c}{2008/12/31}{It seems that Heiko Oberdiek has created an
-%           ifluatex package.}
-% \changes{v1.61803398d}{2009/12/01}{if \cs{ifluatex} is already
-% defined, e.g. using \cs{RequirePackage} before \cs{documentclass},
-% then using \cs{newif}\cs{ifluatex} will cause TeX to eat up a lot of
-% code. We fix this using a hint by Will Robertson.}
-% \changes{v3.7g}{2018/03/08}{As of 2018, we will no longer be
-% emulating \cs{if}\meta{engine} packages, you'll get an error if you
-% do not have them}
-%    \begin{macrocode}
-\RequirePackage{ifluatex}[2016/05/16]
-
-%    \end{macrocode}
-% \end{macro}
 %
 % \subsection{Extending an existing macro}
 %
@@ -1776,9 +1835,11 @@
 % \begin{macro}{\stockaiv}
 % \begin{macro}{\stockav}
 % \begin{macro}{\stockavi}
-% The A series, A0 --- A6.
+% \begin{macro}{\stockavii}
+% The A series, A0 --- A7.
 % \changes{v1.6180339c}{2008/12/26}{Extended the A and B stock/paper size
-%     seies with A/B0 through A/B2}
+%     seies with A/B0 through A/B6}
+% \changes{v3.7i}{2019/11/04}{Added A7 stock}
 %    \begin{macrocode}
 \newcommand*{\stockao}  {\stockheight=1189mm \stockwidth=841mm}
 \newcommand*{\stockai}  {\stockheight=841mm \stockwidth=594mm}
@@ -1787,6 +1848,7 @@
 \newcommand*{\stockaiv} {\stockheight=297mm \stockwidth=210mm}
 \newcommand*{\stockav}  {\stockheight=210mm \stockwidth=148mm}
 \newcommand*{\stockavi} {\stockheight=148mm \stockwidth=105mm}
+\newcommand*{\stockavii}{\stockheight=105mm \stockwidth=74mm}
 
 %    \end{macrocode}
 % \end{macro}
@@ -1796,6 +1858,7 @@
 % \end{macro}
 % \end{macro}
 % \end{macro}
+% \end{macro}
 %
 % \begin{macro}{\stockbo}
 % \begin{macro}{\stockbi}
@@ -1804,7 +1867,9 @@
 % \begin{macro}{\stockbiv}
 % \begin{macro}{\stockbv}
 % \begin{macro}{\stockbvi}
-% The B series, B0 --- B6.
+% \begin{macro}{\stockbvii}
+% The B series, B0 --- B7.
+% \changes{v3.7i}{2019/11/04}{added B7 stock}
 %    \begin{macrocode}
 \newcommand*{\stockbo}  {\stockheight=1414mm \stockwidth=1000mm}
 \newcommand*{\stockbi}  {\stockheight=1000mm \stockwidth=707mm}
@@ -1813,6 +1878,7 @@
 \newcommand*{\stockbiv} {\stockheight=353mm \stockwidth=250mm}
 \newcommand*{\stockbv}  {\stockheight=250mm \stockwidth=176mm}
 \newcommand*{\stockbvi} {\stockheight=176mm \stockwidth=125mm}
+\newcommand*{\stockbvii}{\stockheight=125mm \stockwidth=88mm}
 
 %    \end{macrocode}
 % \end{macro}
@@ -1822,6 +1888,7 @@
 % \end{macro}
 % \end{macro}
 % \end{macro}
+% \end{macro}
 %
 %    It will be useful also to provide macros that set the page sizes.
 %
@@ -1929,7 +1996,9 @@
 % \begin{macro}{\pageaiv}
 % \begin{macro}{\pageav}
 % \begin{macro}{\pageavi}
-% The A series, A0 --- A6.
+% \begin{macro}{\pageavii}
+% The A series, A0 --- A7.
+% \changes{v3.7i}{2019/11/04}{added A7 paper}
 %    \begin{macrocode}
 \newcommand*{\pageao}  {\paperheight=1189mm \paperwidth=841mm}
 \newcommand*{\pageai}  {\paperheight=841mm \paperwidth=594mm}
@@ -1938,6 +2007,7 @@
 \newcommand*{\pageaiv} {\paperheight=297mm \paperwidth=210mm}
 \newcommand*{\pageav}  {\paperheight=210mm \paperwidth=148mm}
 \newcommand*{\pageavi} {\paperheight=148mm \paperwidth=105mm}
+\newcommand*{\pageavii}{\paperheight=105mm \paperwidth=74mm}
 
 %    \end{macrocode}
 % \end{macro}
@@ -1947,6 +2017,7 @@
 % \end{macro}
 % \end{macro}
 % \end{macro}
+% \end{macro}
 %
 % \begin{macro}{\pagebo}
 % \begin{macro}{\pagebi}
@@ -1955,7 +2026,9 @@
 % \begin{macro}{\pagebiv}
 % \begin{macro}{\pagebv}
 % \begin{macro}{\pagebvi}
-% The B series, B0 --- B6.
+% \begin{macro}{\pagebvii}
+% The B series, B0 --- B7.
+% \changes{v3.7i}{2019/11/04}{Added B7 paper}
 %    \begin{macrocode}
 \newcommand*{\pagebo}  {\paperheight=1414mm \paperwidth=1000mm}
 \newcommand*{\pagebi}  {\paperheight=1000mm \paperwidth=707mm}
@@ -1964,6 +2037,7 @@
 \newcommand*{\pagebiv} {\paperheight=353mm \paperwidth=250mm}
 \newcommand*{\pagebv}  {\paperheight=250mm \paperwidth=176mm}
 \newcommand*{\pagebvi} {\paperheight=176mm \paperwidth=125mm}
+\newcommand*{\pagebvii}{\paperheight=125mm \paperwidth=88mm}
 
 %    \end{macrocode}
 % \end{macro}
@@ -1973,12 +2047,14 @@
 % \end{macro}
 % \end{macro}
 % \end{macro}
+% \end{macro}
 %
 %    Declare the stock size options.
 %
 % Metric paper stock sizes.
 % \changes{v1.6180339c}{2008/12/26}{Extended class options to include stock
 %                       sizes A0, A1, A2, B0, B1 and B2}
+% \changes{v3.7i}{2019/11/04}{Added a7paper and b7paper options}
 %    \begin{macrocode}
 \DeclareOption{a0paper}{\stockao}
 \DeclareOption{a1paper}{\stockai}
@@ -1987,6 +2063,7 @@
 \DeclareOption{a4paper}{\stockaiv}
 \DeclareOption{a5paper}{\stockav}
 \DeclareOption{a6paper}{\stockavi}
+\DeclareOption{a7paper}{\stockavii}
 \DeclareOption{b0paper}{\stockbo}
 \DeclareOption{b1paper}{\stockbi}
 \DeclareOption{b2paper}{\stockbii}
@@ -1994,6 +2071,7 @@
 \DeclareOption{b4paper}{\stockbiv}
 \DeclareOption{b5paper}{\stockbv}
 \DeclareOption{b6paper}{\stockbvi}
+\DeclareOption{b7paper}{\stockbvii}
 \DeclareOption{mcrownvopaper}{\stockmcrownvo}
 \DeclareOption{mlargecrownvopaper}{\stockmlargecrownvo}
 \DeclareOption{mdemyvopaper}{\stockmdemyvo}
@@ -6531,30 +6609,65 @@
 % \cs{createmark}\marg{division}\marg{marks}\marg{show}\marg{prefix}\marg{postfix}
 % creates a \cs{divisionmark} with \meta{marks} (= \texttt{left}, \texttt{both}
 % or \texttt{right}) controlling which marks are set, 
-% \meta{show} (= \texttt{shownumber} or \texttt{nonumber}) controls the
+% \meta{show} (= \texttt{shownumber}, \texttt{nonumber} or \texttt{notitle}) controls the
 % display of the divison number in \cs{mainmatter}, \meta{prefix} is text
 % before the number and \meta{postfix} is text after the number.
 %    \begin{macrocode}
 \newcommand\createmark[5]{%
 %    \end{macrocode}
-% Handle \texttt{(show/no)number}, fails to \texttt{shownumber}.
+% Handle \texttt{(show/no)number/notitle}.
+% \changes{v3.7i}{2019/11/07}{Added notitle show option and
+% reimplemented its checking a bit}
 %    \begin{macrocode}
-  \def\@tempa{00}
+  % \def\@tempa{00}
+  % \nametest{#3}{nonumber}%
+  % \ifsamename
+  %   \def\@tempa{01}%
+  % \else
+  %   \nametest{#3}{shownumber}
+  %   \ifsamename\else
+  %     \@memerror{Unknown numbering value `#3' for #1mark}%
+  %     {I expected `shownumber' or `nonumber'.\MessageBreak
+  %      I will assume you meant `shownumber'}%
+  %   \fi
+  % \fi
+  % \expandafter\if\@tempa%          compares the two \@tempa digits
+  %   \@namedef{#1marksn}##1{##1}%
+  % \else
+  %   \@namedef{#1marksn}{\@gobble}%
+  %   \fi
+  \def\@tempa{1}
   \nametest{#3}{nonumber}%
   \ifsamename
-    \def\@tempa{01}%
+    \def\@tempa{0}
   \else
     \nametest{#3}{shownumber}
-    \ifsamename\else
-      \@memerror{Unknown numbering value `#3' for #1mark}%
-      {I expected `shownumber' or `nonumber'.\MessageBreak
-       I will assume you meant `shownumber'}%
+    \ifsamename
+      \def\@tempa{1}
+    \else
+      \nametest{#3}{notitle}
+      \ifsamename
+        \def\@tempa{2}
+      \else
+        \@memerror{Unknown numbering value `#3' for
+          #1mark,\MessageBreak
+          please use   one of 'shownumber', 'nonumber' or 'notitle'}%
+        {I expected `shownumber', `nonumber' or 'notitle'.\MessageBreak
+          I will assume you meant `shownumber'}%
+      \fi
     \fi
   \fi
-  \expandafter\if\@tempa%          compares the two \@tempa digits
-    \@namedef{#1marksn}##1{##1}%
-  \else
+  \@namedef{#1markst}##1{##1}  
+  \ifcase\@tempa\relax
+    % nonumber
     \@namedef{#1marksn}{\@gobble}%
+  \or % 1
+    % shownumber
+    \@namedef{#1marksn}##1{##1}
+  \or % 2, 2 implies shownumber
+    % shownumber
+    \@namedef{#1marksn}##1{##1}
+    \@namedef{#1markst}{\@gobble}  
   \fi
 %    \end{macrocode}
 % The three \meta{marks} cases, \texttt{left}, \texttt{both} and
@@ -6573,7 +6686,14 @@
               \@nameuse{#1marksn}{#4\@nameuse{the#1}#5}%
             \fi
           \fi
-          ##1}}{}}%
+%    \end{macrocode}
+% \changes{v3.7i}{2019/11/07}{Added macro to get rid of the title if needed}
+%    \begin{macrocode}
+          \@nameuse{#1markst}{##1}%
+        }%
+      }%
+      {}% just left
+    }%
   \else
     \nametest{#2}{right}
     \ifsamename
@@ -6587,7 +6707,13 @@
                 \@nameuse{#1marksn}{#4\@nameuse{the#1}#5}%
               \fi%
             \fi%
-            ##1}}}%
+%    \end{macrocode}
+% \changes{v3.7i}{2019/11/07}{Added macro to get rid of the title if needed}
+%    \begin{macrocode}
+            \@nameuse{#1markst}{##1}%
+          }%
+        }%
+      }%
     \else
       \nametest{#2}{both}%
       \ifsamename\else
@@ -6606,16 +6732,28 @@
               \@nameuse{#1marksn}{#4\@nameuse{the#1}#5}%
             \fi
           \fi
-          ##1}}{%
+%    \end{macrocode}
+% \changes{v3.7i}{2019/11/07}{Added macro to get rid of the title if needed}
+%    \begin{macrocode}
+          \@nameuse{#1markst}{##1}%
+        }%
+      }{%
         \memUChead{%
           \ifnum \c@secnumdepth > \c@@memmarkcntra
             \if@mainmatter
               \@nameuse{#1marksn}{#4\@nameuse{the#1}#5}%
             \fi
           \fi
-          ##1}}}%
+%    \end{macrocode}
+% \changes{v3.7i}{2019/11/07}{Added macro to get rid of the title if needed}
+%    \begin{macrocode}
+          \@nameuse{#1markst}{##1}%
+        }%
+      }%
+    }%
     \fi
-  \fi}
+  \fi
+}
 
 %    \end{macrocode}
 % \end{macro}
@@ -18196,8 +18334,16 @@
   \else\ifx\hline\LT@hline
     \let\@BTswitch\@BLTrule
   \else
-    \let\@BTswitch\@BTnormal
-  \fi\fi
+%    \end{macrocode}
+% \changes{v3.7i}{2019/10/21}{Added this extra if construction to
+% bring the class back into line with the latest booktabs changes, now
+% matching booktabs v1.6180339}
+%    \begin{macrocode}
+    \ifx\xltabular\undefined  
+      \let\@BTswitch\@BTnormal
+    \else
+      \let\@BTswitch\@BLTrule
+  \fi\fi\fi
 %    \end{macrocode}
 % On with the code
 %    \begin{macrocode}
@@ -20480,8 +20626,12 @@
 % \begin{macro}{\subcaption}
 % \cs{subcaption}\oarg{list-entry}\marg{caption} is a generic
 % subcaption. There is no \Lpack{subfigure} equivalent.
+% 
+% \changes{v3.7i}{2019/10/24}{Added a \cs{par} to the start. This can
+% get rid of sporadic spaces caused by hyperref changing \cs{refstepcounter}}
 %    \begin{macrocode}
 \newcommand{\subcaption}{%
+  \par
   \bgroup
     \let\label=\memsub@label
     \ifdonemaincaption\else
@@ -20562,7 +20712,15 @@
 %    \end{macrocode}
 % \end{environment}
 %
-%
+% \begin{macro}{\mem@step@subcounter}
+%   \changes{v3.7i}{2019/10/24}{Added}
+%  Utility macro to save some typing.
+%    \begin{macrocode}
+\newcommand\mem@step@subcounter{%
+  \refstepcounter{sub\@captype}\@contkeep%
+}
+%    \end{macrocode}
+% \end{macro}
 %
 % \begin{macro}{\subbottom}
 % \begin{macro}{\@memsubbody}
@@ -20580,7 +20738,14 @@
   \ifdonemaincaption\else
     \advance\csname c@\@captype\endcsname\@ne
   \fi
-  \refstepcounter{sub\@captype}\@contkeep%
+%    \end{macrocode}
+% To help with hyperref target placement (hyperref usually uses
+% \cs{refstepcounter} to make the anchors) we move the counter
+% business into \cs{@memsubfloat} instead. This way they come right at
+% the top.
+%    \begin{macrocode}
+% \changes{v3.7i}{2019/10/24}{Moved \cs{refstepcounter}}
+  % \refstepcounter{sub\@captype}\@contkeep%
   \leavevmode
   \@ifnextchar [%
     {\@memsubfig}%
@@ -20602,7 +20767,13 @@
   \bgroup
   \let\label=\memsub@label
   \@contset
-  \refstepcounter{sub\@captype}\@contkeep%
+% To help with hyperref target placement (hyperref usually uses
+% \cs{refstepcounter} to make the anchors) we move the counter
+% business into \cs{@memsubfloat} instead. This way they come right at
+% the top.
+%    \begin{macrocode}
+% \changes{v3.7i}{2019/10/24}{Moved \cs{refstepcounter}}
+  % \refstepcounter{sub\@captype}\@contkeep%
   \leavevmode
   \@ifnextchar [%
     {\@memsubfig}%
@@ -20671,7 +20842,15 @@
   \fi
   \setbox\@tempboxa \hbox{#4}%
   \@tempdima=\wd\@tempboxa
-  \vtop\bgroup
+%    \end{macrocode}
+% We move the refstep business here to help \Lpack{hyperref} get
+% better anchors.
+% \changes{v3.7i}{2019/10/24}{moved counter stepping, additionally
+% changed \cs{vtop} to \cs{vbox}, otherwise we align the images at the
+% top}
+%    \begin{macrocode}
+  \vbox\bgroup%
+    \mem@step@subcounter%
     \vbox\bgroup
     \ifcase\@tempcnta
       \@minipagefalse
@@ -22573,8 +22752,13 @@
 %   and \cs{@plainZ}, to reduce code we now only use one, the argument
 %   of it takes care of differentiating between the stuff that are
 %   different. Two hooks is added just before and after importing the
-%   list file contents.
+%   list file contents. Additionally we have added a hook before the
+%   title is being executed, it comes after \cs{phantomsection} but
+%   before any \cs{addcontentsline}
 % \changes{v1.61803398d}{2010/02/14}{added the before and after hooks}
+% \changes{v3.7i}{2019/10/25}{moved the @\#2maketitle until after the
+% \cs{addcontentsline}, that way the hyperref anchor is above the
+% title, not below it. }
 %    \begin{macrocode}
   \@namedef{cft#2beforelisthook}{}%
   \@namedef{cft#2afterlisthook}{}%
@@ -22582,13 +22766,13 @@
     \ensureonecol
     \par
     \begingroup
-      \@nameuse{@#2maketitle}
+      \phantomsection
       \if##1
         \ifmem@em@starred@listof\else
-          \phantomsection
           \addcontentsline{toc}{chapter}{#3}
         \fi
       \fi
+      \@nameuse{@#2maketitle}
       \parskip\cftparskip
       \@nameuse{cft#2beforelisthook}%
       \@starttoc{#2}%
@@ -24762,12 +24946,14 @@
 % \changes{v1.618}{2005/09/02}{Made \cs{@@@wrindexm@m} obey \cs{nofiles}}
 % \changes{v1.618}{2005/09/25}{\cs{@@@wrindexm@m} now reads the aux
 %                  file at the end of the document}
+% \changes{v3.7i}{2019/11/15}{Changed the writing to protected}
 %    \begin{macrocode}
 \newcommand{\@@@wrindexm@m}[2]{\endgroup}
 \AtBeginDocument{%
   \def\@@@wrindexm@m#1#2{%
     \if@filesw
-      \immediate\write \@idxfile{\string\indexentry{#1}{#2}}%
+      %\immediate\write \@idxfile{\string\indexentry{#1}{#2}}%
+      \immediate@protected@write\@idxfile{}{\string\indexentry{#1}{#2}}%
     \fi
     \endgroup}%
 }
@@ -27206,7 +27392,11 @@
   \m@makefootfootmark{#1}%                       -> \footfootmark#1
   \m@makemakefootmark{#1}%                       -> \makefootmark#1
   \m@makefootmarkstyle{#1}%                      -> \footmarkstyle#1
-  \@namedef{@makefntext#1}##1{\@nameuse{makefootmark#1} ##1}%
+%    \end{macrocode}
+% \changes{3.7i}{2019/05/24}{@makefntext\#1 should of course be
+% long. Reported on TSE by meide, https://tex.stackexchange.com/q/491303/3929}
+%    \begin{macrocode}
+  \@namelongdef{@makefntext#1}##1{\@nameuse{makefootmark#1} ##1}%
   \m@make@footstart{#1}%                         -> \@footstart#1
   \m@make@footgroup{#1}%                         -> \@footgroup#1
   \expandafter\newinsert\csname @mpfootins#1\endcsname% -> \@mpfootins#1
@@ -29411,15 +29601,20 @@
 % \begin{macro}{\immediate@protected@write}
 % We might have to do some immediate writes. This is an immediate
 % version of the kernel \cs{protected@write}.
+% \changes{v3.7i}{2019/11/15}{changed to \cs{providecommand} and
+% removed the \cs{if@nobreak} line, also removed the edef part,
+% suggested by Davis Carlisle}
 %    \begin{macrocode}
-\newcommand{\immediate@protected@write}[3]{%
+\providecommand{\immediate@protected@write}[3]{%
   \begingroup
   #2%
   \let\protect\@unexpandable@protect
-  \edef\reserved@a{\immediate\write#1{#3}}%
-  \reserved@a
+  %\edef\reserved@a{\immediate\write#1{#3}}%
+  %\reserved@a
+  \immediate\write#1{#3}%
   \endgroup
-  \if@nobreak\ifvmode\nobreak\fi\fi}
+  %\if@nobreak\ifvmode\nobreak\fi\fi%
+}
 
 %    \end{macrocode}
 % \end{macro}
@@ -29433,11 +29628,16 @@
 % beast, \cs{immediate@protected@write} can write it to disk, but
 % \cs{m@m@pnwrite} cannot. To get past this we also include a version
 % that has an embedded \cs{detokenize} (thanks to Heiko Oberdiek for
-% that hint).
+% that hint). We also add a \% at the end of the \cs{m@m@pnwrited}
+% process (don't think \cs{m@m@pnwrite} needs it). This is handy in
+% those cases where the user is using a design which rely on there not
+% being any spaces after the note text.
 % \changes{v3.6k}{2011/04/06}{Added the version with \cs{detokenize}}
 %    \begin{macrocode}
+% \changes{v3.7i}{2019/06/07}{Added \cs{@percentchar} to
+% \cs{m@m@pnwrited}}
 \newcommand{\m@m@pnwrite}[3]{\immediate\write#1{#3}}
-\newcommand{\m@m@pnwrited}[3]{\immediate\write#1{\detokenize{#3}}}
+\newcommand{\m@m@pnwrited}[3]{\immediate\write#1{\detokenize{#3}\@percentchar}}
 
 %    \end{macrocode}
 % \end{macro}
@@ -29540,7 +29740,12 @@
         \m@mmf@prepare% rerun
       \fi%
       \mem@pn@multiple@marker{\notenumintext{\thepagenote}}% 
-    }{}%
+%    \end{macrocode}
+% \changes{3.7i}{2019/05/28}{Added the special kern also if the
+% optional arg is empty. Otherwise the multiple marker might not work
+% under hyperref. Reported in private email}
+%    \begin{macrocode}
+    }{\m@mmf@prepare}%
   \fi%
 %    \end{macrocode}
 % Check if this is the first note in a division, and if so indicate this 
@@ -35522,7 +35727,9 @@
 %
 % \subsection{Text case}
 % \changes{v3.6k}{2012/09/13}{Included a copy of the \texttt{textcase}
-% package.} 
+% package.}
+% 
+% \changes{3.7i}{2019/10/22}{Made textcase into a required package instead}
 %
 % Since, say, \cs{MakeUppercase} does too much, i.e.\ also upper case
 % math and arguments to, say, \cs{ref}, we provide a version that does
@@ -35532,6 +35739,27 @@
 % package as have been emulated. Loading \texttt{textcase} just
 % overwrites the macros if they exist.
 %
+% As of October 2019, we will instead load the  \texttt{textcase}
+% package if found. If not we resort to the old version we had
+% embedded. 
+%
+%
+%    \begin{macrocode}
+\expandafter\let\csname MemOrigMakeUppercase \expandafter\endcsname
+                \csname MakeUppercase \endcsname
+\expandafter\let\csname MemOrigMakeLowercase \expandafter\endcsname
+                \csname MakeLowercase \endcsname
+\def\MemRestoreOrigMakecase{
+  \expandafter\let\csname MakeUppercase \expandafter\endcsname
+                  \csname MemOrigMakeUppercase \endcsname
+  \expandafter\let\csname MakeLowercase \expandafter\endcsname
+                  \csname MemOrigMakeLowercase \endcsname
+}                   
+\IfFileExists{textcase.sty}{
+  \RequirePackage[overload]{textcase}
+  }{% resort to the 
+%    \end{macrocode}
+%
 % \MakeShortVerb{\|}
 %    \begin{macrocode}
 %%%% Nearly a carbon copy from textcase.dtx by David Carlisle
@@ -35698,6 +35926,9 @@
 %    \end{macrocode}
 % \DeleteShortVerb{\|}
 %
+%    \begin{macrocode}
+} % end of \IfFileExists
+%    \end{macrocode}
 %
 % \section{Initialization} \label{sec:init}
 %
@@ -35833,22 +36064,7 @@
 %    \end{macrocode}
 % \end{macro}
 %
-% \subsection{The page style and counters}
-%    We use the page style \pstyle{headings} by
-%    default and arabic page numbering. But if the \verb?article?
-%    class option is in effect, we will use the \pstyle{plain} style
-%    which is the default in the \verb?article? class.
-% \changes{v3.6d}{2010/05/13}{When emulating the article class the
-% plain page style should used instead of headings}
-%    \begin{macrocode}
-\ifartopt
-\pagestyle{plain}
-\else
-\pagestyle{headings}
-\fi
-\pagenumbering{arabic}
-
-%    \end{macrocode}
+% \subsection{Some counters}
 %    We set the sectional counters to zero, the \verb?tocdepth? to
 %    one (sections and above listed), the \verb?secnumdepth? to
 %    two (sections and above numbered), and \cs{maxsecnumdepth} to
@@ -36214,17 +36430,20 @@
 % \begin{macro}{\@caption}
 % \changes{v1.61803}{2008/01/30}{Killed memoir's captioning when the caption
 % package is used (mempatch v4.9).}
-% \changes{v3.6k}{2012/05/04}{Changed the warning text to be more informative.}
+% \changes{v3.6k}{2012/05/04}{Changed the warning text to be more
+% informative.}
+% \changes{v3.7i}{2018/12/19}{Users still get spooked by the warning,
+% tried to rewrite it in a better manner}
 %    \begin{macrocode}
 %%% revert changes to captioning macros if the caption package is used.
 \AtBeginPackage{caption}{
   \ClassWarningNoLine{memoir}{%
-    You are using the caption package with the memoir class.
-    To prepare we will now reset all captioning macros and 
-    configurations to kernel defaults, and then let the 
-    caption package take over. Please remember to use^^J
-    the caption package interfaces in order to^^J
-    configure your captions}
+    For the caption package to function properly with memoir,
+    we will now reset\string\caption\space and friends to
+    kernel defaults and then let the caption package take over.
+    Remember: all caption configuration now goves via the caption
+    package interface, not the interface from the memoir class.
+    }
 
   \long\def\@makecaption##1##2{%
     \vskip\abovecaptionskip
@@ -36291,6 +36510,36 @@
 
 %    \end{macrocode}
 %
+%
+%
+%
+% \subsection{Default page style}
+%    We use the page style \pstyle{headings} by
+%    default and arabic page numbering. But if the \verb?article?
+%    class option is in effect, we will use the \pstyle{plain} style
+%    which is the default in the \verb?article? class.
+% \changes{v3.6d}{2010/05/13}{When emulating the article class the
+% plain page style should used instead of headings}
+% \changes{v3.7i}{2019/01/07}{Moved here because
+% \cs{newlistof}{...}{X}{...} also defines \cs{Xmark}, but using
+% \cs{markboth}, and thus if \Lopt{oneside} is active \cs{lofmark}
+% will still be using \cs{mathboth} and not \cs{markright} that the
+% \pstyle{headings} style dictates}
+%    \begin{macrocode}
+\ifartopt
+\pagestyle{plain}
+\else
+\pagestyle{headings}
+\fi
+\pagenumbering{arabic}
+
+%    \end{macrocode}
+
+
+
+
+
+
 % ^^A\subsection{Patch file}
 % ^^A
 % ^^A At the suggestion of Danie Els (\texttt{DanieEls@sun.ac.za}), Dan Leucking
@@ -36425,10 +36674,10 @@ keyword "\\glossaryentry"
 %  \newblock (Available from CTAN in
 %             \texttt{/macros/latex/required/tools})
 %
-% \bibitem[Car04]{TEXTCASE}
+% \bibitem[Car19]{TEXTCASE}
 %  David Carlisle.
 % \newblock \emph{The \Lpack{textcase} package}.
-% \newblock October, 2004.
+% \newblock September, 2019.
 % \newblock (Available from CTAN in 
 %       \texttt{/macros/latex/contrib/textcase})
 %
@@ -36517,6 +36766,12 @@ keyword "\\glossaryentry"
 % \newblock (Available from CTAN as 
 %            \texttt{/macros/latex/base/classes.dtx})
 %
+% \bibitem[LPT19]{IFTEX}
+% The \LaTeX{} Project Team.
+% \newblock \emph{The iftex package}.
+% \newblock November, 2019.  
+% \newblock (Available from CTAN in \texttt{/macros/latex/contrib/iftex})
+%
 %  \bibitem[MC98]{ARRAY}
 %  Frank Mittelbach and David Carlisle.
 %  \newblock \emph{A new implementation of LaTeX's tabular and array 
diff --git a/macros/latex/contrib/memoir/memoir.ins b/macros/latex/contrib/memoir/memoir.ins
index 39ae4a93ae..9ab3871610 100644
--- a/macros/latex/contrib/memoir/memoir.ins
+++ b/macros/latex/contrib/memoir/memoir.ins
@@ -85,8 +85,8 @@
 \Msg{***********************************************************}
 \Msg{*}
 \Msg{* To finish the installation you have to move the following}
-\Msg{* files into a directory searched by LaTeX. See the FAQ on}
-\Msg{* CTAN at /help/uk-tex-faq for more on this.}
+\Msg{* files into a directory searched by LaTeX. See the FAQ}
+\Msg{* at https://texfaq.org/ for more on this.}
 \Msg{*}
 \Msg{* \space\space memoir.cls}
 \Msg{* \space\space mem9.clo}
diff --git a/macros/latex/contrib/memoir/mempatch.dtx b/macros/latex/contrib/memoir/mempatch.dtx
index 23423d346e..eeb291600c 100644
--- a/macros/latex/contrib/memoir/mempatch.dtx
+++ b/macros/latex/contrib/memoir/mempatch.dtx
@@ -20,7 +20,7 @@
 %
 % 
 % \fi
-% \CheckSum{614}
+% \CheckSum{634}
 %
 % \def\dtxfile{\texttt{mempatch.dtx}}
 % \def\fileversion{v1.0} \def\filedate{2003/10/04}
@@ -309,6 +309,7 @@
 %% With thanks to Heiko Oberdiek, if you use hyperref dated 2006/11/15
 %% or later, memhfixc will be automatically loaded after hyperref.
 %%
+%% Version 1.18  2019/10/24
 %% Version 1.17  2013/05/30
 %% Version 1.16  2013/05/16
 %% Version 1.15  2010/08/17
@@ -332,7 +333,7 @@
 % 
 %
 %    \begin{macrocode}
-\ProvidesPackage{memhfixc}[2013/05/30 v1.17 nameref/hyperref package fixes for memoir class]
+\ProvidesPackage{memhfixc}[2019/10/24 v1.18 nameref/hyperref package fixes for memoir class]
 %    \end{macrocode}
 %
 % \begin{macro}{\M@hfixcfinish}
@@ -721,8 +722,12 @@
 %
 % \begin{macro}{\contcaption}
 % Tweak the \cs{contcaption} macro.
+% 
+% \changes{v1.18}{2019/10/24}{Added a \cs{par} to get rid of a
+% sporadic space comming from \cs{refstepcounter} under hyperref}
 %    \begin{macrocode}
 \renewcommand{\contcaption}{%
+  \par%
   \refstepcounter{memhycontfloat}%
   \addtocounter{\@captype}{\m@ne}\H@refstepcounter{\@captype}%
   \@contcaption\@captype}
@@ -908,6 +913,31 @@
 
 %    \end{macrocode}
 %
+%
+% \subsection{Patch after \Lpack{hypcap}}
+%
+% The \Lpack{hypcap} package can help with some hyperref anchor placement in
+% figure refences. But it also requires every figure or table to have
+% a caption, thus it does not understand our \cmd{\contcaption} command.
+%
+% \changes{v3.7i}{2019/10/26}{added patch for \cmd{\contcaption} when
+% \Lpack{hypcap} is loaded}
+%    \begin{macrocode}
+\AtEndPackage{hypcap}{%
+  \long\def\@@contcaption##1##2{%
+  \par
+  \begingroup
+     \@parboxrestore
+     \if@minipage
+       \@setminipage
+     \fi
+     \global\@capstartfalse% added  
+     \normalsize
+     \@makecaption{\csname fnum@##1\endcsname}{\ignorespaces ##2}\par
+  \endgroup}
+}
+%    \end{macrocode}
+%
 % The end of the \Lpack{hyperref} related patches.
 %
 %    \begin{macrocode}
diff --git a/macros/latex/contrib/memoir/mempatch.ins b/macros/latex/contrib/memoir/mempatch.ins
index 715c0cfc51..39c858e3d7 100644
--- a/macros/latex/contrib/memoir/mempatch.ins
+++ b/macros/latex/contrib/memoir/mempatch.ins
@@ -64,8 +64,8 @@
 \Msg{***********************************************************}
 \Msg{*}
 \Msg{* To finish the installation you have to move the following}
-\Msg{* files into a directory searched by LaTeX. See the FAQ on}
-\Msg{* CTAN at /help/uk-tex-faq for more on this.}
+\Msg{* files into a directory searched by LaTeX. See the FAQ}
+\Msg{* at https://texfaq.org/ for more on this.}
 \Msg{*}
 \Msg{* \space\space memhfixc.sty}
 %\Msg{* \space\space mempatch.sty}
diff --git a/macros/latex/contrib/oberdiek/README.txt b/macros/latex/contrib/oberdiek/README.txt
index d2190414fb..978bccd476 100644
--- a/macros/latex/contrib/oberdiek/README.txt
+++ b/macros/latex/contrib/oberdiek/README.txt
@@ -1,4 +1,4 @@
-README           2019/11/07
+README           2019/11/12
 
 This file describes the directory
   CTAN:macros/latex/contrib/oberdiek/
diff --git a/macros/latex/contrib/oberdiek/accsupp.dtx b/macros/latex/contrib/oberdiek/accsupp.dtx
index 63c5cbf8a6..981873bce2 100644
--- a/macros/latex/contrib/oberdiek/accsupp.dtx
+++ b/macros/latex/contrib/oberdiek/accsupp.dtx
@@ -13,15 +13,17 @@
 % conditions of the LaTeX Project Public License, either
 % version 1.3c of this license or (at your option) any later
 % version. This version of this license is in
-%    http://www.latex-project.org/lppl/lppl-1-3c.txt
+%    https://www.latex-project.org/lppl/lppl-1-3c.txt
 % and the latest version of this license is in
-%    http://www.latex-project.org/lppl.txt
+%    https://www.latex-project.org/lppl.txt
 % and version 1.3 or later is part of all distributions of
 % LaTeX version 2005/12/01 or later.
 %
 % This work has the LPPL maintenance status "maintained".
 %
-% This Current Maintainer of this work is Heiko Oberdiek.
+% The Current Maintainers of this work are
+% Heiko Oberdiek and the Oberdiek Package Support Group
+% https://github.com/ho-tex/oberdiek/issues
 %
 % This work consists of the main source file accsupp.dtx
 % and the derived files
@@ -109,15 +111,18 @@ This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either
 version 1.3c of this license or (at your option) any later
 version. This version of this license is in
-   http://www.latex-project.org/lppl/lppl-1-3c.txt
+   https://www.latex-project.org/lppl/lppl-1-3c.txt
 and the latest version of this license is in
-   http://www.latex-project.org/lppl.txt
+   https://www.latex-project.org/lppl.txt
 and version 1.3 or later is part of all distributions of
 LaTeX version 2005/12/01 or later.
 
 This work has the LPPL maintenance status "maintained".
 
-This Current Maintainer of this work is Heiko Oberdiek.
+The Current Maintainers of this work are
+Heiko Oberdiek and the Oberdiek Package Support Group
+https://github.com/ho-tex/oberdiek/issues
+
 
 This work consists of the main source file accsupp.dtx
 and the derived files
@@ -206,8 +211,7 @@ and the derived files
 % \title{The \xpackage{accsupp} package}
 % \date{2018/03/28 v0.5}
 % \author{Heiko Oberdiek\thanks
-% {Please report any issues at https://github.com/ho-tex/oberdiek/issues}\\
-% \xemail{heiko.oberdiek at googlemail.com}}
+% {Please report any issues at \url{https://github.com/ho-tex/oberdiek/issues}}}
 %
 % \maketitle
 %
@@ -957,7 +961,7 @@ ed as
 % \subsection{Download}
 %
 % \paragraph{Package.} This package is available on
-% CTAN\footnote{\url{http://ctan.org/pkg/accsupp}}:
+% CTAN\footnote{\CTANpkg{accsupp}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/accsupp.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/accsupp.pdf}] Documentation.
@@ -969,7 +973,7 @@ ed as
 % the packages are already unpacked and the documentation files
 % are generated. The files and directories obey the TDS standard.
 % \begin{description}
-% \item[\CTAN{install/macros/latex/contrib/oberdiek.tds.zip}]
+% \item[\CTANinstall{install/macros/latex/contrib/oberdiek.tds.zip}]
 % \end{description}
 % \emph{TDS} refers to the standard ``A Directory Structure
 % for \TeX\ Files'' (\CTAN{tds/tds.pdf}). Directories
@@ -1095,16 +1099,6 @@ ed as
 %
 % \subsection{Some details for the interested}
 %
-% \paragraph{Attached source.}
-%
-% The PDF documentation on CTAN also includes the
-% \xfile{.dtx} source file. It can be extracted by
-% AcrobatReader 6 or higher. Another option is \textsf{pdftk},
-% e.g. unpack the file into the current directory:
-% \begin{quote}
-%   \verb|pdftk accsupp.pdf unpack_files output .|
-% \end{quote}
-%
 % \paragraph{Unpacking with \LaTeX.}
 % The \xfile{.dtx} chooses its action depending on the format:
 % \begin{description}
@@ -1140,42 +1134,6 @@ ed as
 %\end{verbatim}
 % \end{quote}
 %
-% \section{Catalogue}
-%
-% The following XML file can be used as source for the
-% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
-% The elements \texttt{caption} and \texttt{description} are imported
-% from the original XML file from the Catalogue.
-% The name of the XML file in the Catalogue is \xfile{accsupp.xml}.
-%    \begin{macrocode}
-%<*catalogue>
-<?xml version='1.0' encoding='us-ascii'?>
-<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
-<entry datestamp='$Date$' modifier='$Author$' id='accsupp'>
-  <name>accsupp</name>
-  <caption>Better accessibility support for PDF files.</caption>
-  <authorref id='auth:oberdiek'/>
-  <copyright owner='Heiko Oberdiek' year='2007,2010'/>
-  <license type='lppl1.3'/>
-  <version number='0.4'/>
-  <description>
-    Since PDF 1.5 portions of a page can be marked for better accessibility
-    support. For example, replacement texts or expansions of abbreviations can
-    be provided. This package starts with providing a minimal low-level
-    interface for programmers; its status is experimental.
-    <p/>
-    The package is part of the <xref refid='oberdiek'>oberdiek</xref> bundle.
-  </description>
-  <documentation details='Package documentation'
-      href='ctan:/macros/latex/contrib/oberdiek/accsupp.pdf'/>
-  <ctan file='true' path='/macros/latex/contrib/oberdiek/accsupp.dtx'/>
-  <miktex location='oberdiek'/>
-  <texlive location='oberdiek'/>
-  <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
-</entry>
-%</catalogue>
-%    \end{macrocode}
-%
 % \begin{thebibliography}{9}
 % \bibitem{pdfspec}
 % Adobe Systems Incorporated,
diff --git a/macros/latex/contrib/oberdiek/accsupp.pdf b/macros/latex/contrib/oberdiek/accsupp.pdf
index 5720cbfaf1..6f4ded0698 100644
--- a/macros/latex/contrib/oberdiek/accsupp.pdf
+++ b/macros/latex/contrib/oberdiek/accsupp.pdf
diff --git a/macros/latex/contrib/oberdiek/aliascnt.dtx b/macros/latex/contrib/oberdiek/aliascnt.dtx
index aee644f62e..fa0504ab83 100644
--- a/macros/latex/contrib/oberdiek/aliascnt.dtx
+++ b/macros/latex/contrib/oberdiek/aliascnt.dtx
@@ -13,15 +13,17 @@
 % conditions of the LaTeX Project Public License, either
 % version 1.3c of this license or (at your option) any later
 % version. This version of this license is in
-%    http://www.latex-project.org/lppl/lppl-1-3c.txt
+%    https://www.latex-project.org/lppl/lppl-1-3c.txt
 % and the latest version of this license is in
-%    http://www.latex-project.org/lppl.txt
+%    https://www.latex-project.org/lppl.txt
 % and version 1.3 or later is part of all distributions of
 % LaTeX version 2005/12/01 or later.
 %
 % This work has the LPPL maintenance status "maintained".
 %
-% This Current Maintainer of this work is Heiko Oberdiek.
+% The Current Maintainers of this work are
+% Heiko Oberdiek and the Oberdiek Package Support Group
+% https://github.com/ho-tex/oberdiek/issues
 %
 % This work consists of the main source file aliascnt.dtx
 % and the derived files
@@ -98,15 +100,18 @@ This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either
 version 1.3c of this license or (at your option) any later
 version. This version of this license is in
-   http://www.latex-project.org/lppl/lppl-1-3c.txt
+   https://www.latex-project.org/lppl/lppl-1-3c.txt
 and the latest version of this license is in
-   http://www.latex-project.org/lppl.txt
+   https://www.latex-project.org/lppl.txt
 and version 1.3 or later is part of all distributions of
 LaTeX version 2005/12/01 or later.
 
 This work has the LPPL maintenance status "maintained".
 
-This Current Maintainer of this work is Heiko Oberdiek.
+The Current Maintainers of this work are
+Heiko Oberdiek and the Oberdiek Package Support Group
+https://github.com/ho-tex/oberdiek/issues
+
 
 This work consists of the main source file aliascnt.dtx
 and the derived files
@@ -181,8 +186,7 @@ and the derived files
 % \title{The \xpackage{aliascnt} package}
 % \date{2018/09/07 v1.5}
 % \author{Heiko Oberdiek\thanks
-% {Please report any issues at https://github.com/ho-tex/oberdiek/issues}\\
-% \xemail{heiko.oberdiek at googlemail.com}}
+% {Please report any issues at \url{https://github.com/ho-tex/oberdiek/issues}}}
 %
 % \maketitle
 %
@@ -373,7 +377,7 @@ and the derived files
 % \subsection{Download}
 %
 % \paragraph{Package.} This package is available on
-% CTAN\footnote{\url{http://ctan.org/pkg/aliascnt}}:
+% CTAN\footnote{\CTANpkg{aliascnt}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/aliascnt.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/aliascnt.pdf}] Documentation.
@@ -385,7 +389,7 @@ and the derived files
 % the packages are already unpacked and the documentation files
 % are generated. The files and directories obey the TDS standard.
 % \begin{description}
-% \item[\CTAN{install/macros/latex/contrib/oberdiek.tds.zip}]
+% \item[\CTANinstall{install/macros/latex/contrib/oberdiek.tds.zip}]
 % \end{description}
 % \emph{TDS} refers to the standard ``A Directory Structure
 % for \TeX\ Files'' (\CTAN{tds/tds.pdf}). Directories
@@ -504,16 +508,6 @@ and the derived files
 %
 % \subsection{Some details for the interested}
 %
-% \paragraph{Attached source.}
-%
-% The PDF documentation on CTAN also includes the
-% \xfile{.dtx} source file. It can be extracted by
-% AcrobatReader 6 or higher. Another option is \textsf{pdftk},
-% e.g. unpack the file into the current directory:
-% \begin{quote}
-%   \verb|pdftk aliascnt.pdf unpack_files output .|
-% \end{quote}
-%
 % \paragraph{Unpacking with \LaTeX.}
 % The \xfile{.dtx} chooses its action depending on the format:
 % \begin{description}
@@ -549,41 +543,6 @@ and the derived files
 %\end{verbatim}
 % \end{quote}
 %
-% \section{Catalogue}
-%
-% The following XML file can be used as source for the
-% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
-% The elements \texttt{caption} and \texttt{description} are imported
-% from the original XML file from the Catalogue.
-% The name of the XML file in the Catalogue is \xfile{aliascnt.xml}.
-%    \begin{macrocode}
-%<*catalogue>
-<?xml version='1.0' encoding='us-ascii'?>
-<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
-<entry datestamp='$Date$' modifier='$Author$' id='aliascnt'>
-  <name>aliascnt</name>
-  <caption>Alias counters.</caption>
-  <authorref id='auth:oberdiek'/>
-  <copyright owner='Heiko Oberdiek' year='2006,2009'/>
-  <license type='lppl1.3'/>
-  <version number='1.5'/>
-  <description>
-    This package introduces aliases for counters, that
-    share the same counter register and clear list.
-    <p/>
-    The package is part of the <xref refid='oberdiek'>oberdiek</xref>
-    bundle.
-  </description>
-  <documentation details='Package documentation'
-      href='ctan:/macros/latex/contrib/oberdiek/aliascnt.pdf'/>
-  <ctan file='true' path='/macros/latex/contrib/oberdiek/aliascnt.dtx'/>
-  <miktex location='oberdiek'/>
-  <texlive location='oberdiek'/>
-  <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
-</entry>
-%</catalogue>
-%    \end{macrocode}
-%
 % \section{Acknowledgement}
 %
 % \begin{description}
@@ -607,7 +566,7 @@ and the derived files
 %   Sebastian Rahtz, Heiko Oberdiek:
 %   \textit{The \xpackage{hyperref} package};
 %   2006/08/16 v6.75c;
-%   \CTAN{macros/latex/contrib/hyperref/}.
+%   \CTANpkg{hyperref}.
 %
 % \end{thebibliography}
 %
diff --git a/macros/latex/contrib/oberdiek/aliascnt.pdf b/macros/latex/contrib/oberdiek/aliascnt.pdf
index 1ba95765c4..ceba0f2071 100644
--- a/macros/latex/contrib/oberdiek/aliascnt.pdf
+++ b/macros/latex/contrib/oberdiek/aliascnt.pdf
diff --git a/macros/latex/contrib/oberdiek/alphalph.dtx b/macros/latex/contrib/oberdiek/alphalph.dtx
index 4eeb4c1ffb..42d9f00288 100644
--- a/macros/latex/contrib/oberdiek/alphalph.dtx
+++ b/macros/latex/contrib/oberdiek/alphalph.dtx
@@ -13,15 +13,17 @@
 % conditions of the LaTeX Project Public License, either
 % version 1.3c of this license or (at your option) any later
 % version. This version of this license is in
-%    http://www.latex-project.org/lppl/lppl-1-3c.txt
+%    https://www.latex-project.org/lppl/lppl-1-3c.txt
 % and the latest version of this license is in
-%    http://www.latex-project.org/lppl.txt
+%    https://www.latex-project.org/lppl.txt
 % and version 1.3 or later is part of all distributions of
 % LaTeX version 2005/12/01 or later.
 %
 % This work has the LPPL maintenance status "maintained".
 %
-% This Current Maintainer of this work is Heiko Oberdiek.
+% The Current Maintainers of this work are
+% Heiko Oberdiek and the Oberdiek Package Support Group
+% https://github.com/ho-tex/oberdiek/issues
 %
 % The Base Interpreter refers to any `TeX-Format',
 % because some files are installed in TDS:tex/generic//.
@@ -105,15 +107,18 @@ This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either
 version 1.3c of this license or (at your option) any later
 version. This version of this license is in
-   http://www.latex-project.org/lppl/lppl-1-3c.txt
+   https://www.latex-project.org/lppl/lppl-1-3c.txt
 and the latest version of this license is in
-   http://www.latex-project.org/lppl.txt
+   https://www.latex-project.org/lppl.txt
 and version 1.3 or later is part of all distributions of
 LaTeX version 2005/12/01 or later.
 
 This work has the LPPL maintenance status "maintained".
 
-This Current Maintainer of this work is Heiko Oberdiek.
+The Current Maintainers of this work are
+Heiko Oberdiek and the Oberdiek Package Support Group
+https://github.com/ho-tex/oberdiek/issues
+
 
 The Base Interpreter refers to any `TeX-Format',
 because some files are installed in TDS:tex/generic//.
@@ -222,8 +227,7 @@ and the derived files
 % \title{The \xpackage{alphalph} package}
 % \date{2016/05/16 v2.5}
 % \author{Heiko Oberdiek\thanks
-% {Please report any issues at https://github.com/ho-tex/oberdiek/issues}\\
-% \xemail{heiko.oberdiek at googlemail.com}}
+% {Please report any issues at \url{https://github.com/ho-tex/oberdiek/issues}}}
 %
 % \maketitle
 %
@@ -1650,7 +1654,7 @@ and the derived files
 % \subsection{Download}
 %
 % \paragraph{Package.} This package is available on
-% CTAN\footnote{\url{http://ctan.org/pkg/alphalph}}:
+% CTAN\footnote{\CTANpkg{alphalph}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/alphalph.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/alphalph.pdf}] Documentation.
@@ -1662,7 +1666,7 @@ and the derived files
 % the packages are already unpacked and the documentation files
 % are generated. The files and directories obey the TDS standard.
 % \begin{description}
-% \item[\CTAN{install/macros/latex/contrib/oberdiek.tds.zip}]
+% \item[\CTANinstall{install/macros/latex/contrib/oberdiek.tds.zip}]
 % \end{description}
 % \emph{TDS} refers to the standard ``A Directory Structure
 % for \TeX\ Files'' (\CTAN{tds/tds.pdf}). Directories
@@ -1784,16 +1788,6 @@ and the derived files
 %
 % \subsection{Some details for the interested}
 %
-% \paragraph{Attached source.}
-%
-% The PDF documentation on CTAN also includes the
-% \xfile{.dtx} source file. It can be extracted by
-% AcrobatReader 6 or higher. Another option is \textsf{pdftk},
-% e.g. unpack the file into the current directory:
-% \begin{quote}
-%   \verb|pdftk alphalph.pdf unpack_files output .|
-% \end{quote}
-%
 % \paragraph{Unpacking with \LaTeX.}
 % The \xfile{.dtx} chooses its action depending on the format:
 % \begin{description}
@@ -1829,60 +1823,21 @@ and the derived files
 %\end{verbatim}
 % \end{quote}
 %
-% \section{Catalogue}
-%
-% The following XML file can be used as source for the
-% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
-% The elements \texttt{caption} and \texttt{description} are imported
-% from the original XML file from the Catalogue.
-% The name of the XML file in the Catalogue is \xfile{alphalph.xml}.
-%    \begin{macrocode}
-%<*catalogue>
-<?xml version='1.0' encoding='us-ascii'?>
-<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
-<entry datestamp='$Date$' modifier='$Author$' id='alphalph'>
-  <name>alphalph</name>
-  <caption>Convert numbers to letters.</caption>
-  <authorref id='auth:oberdiek'/>
-  <copyright owner='Heiko Oberdiek' year='1999,2006-2008,2010,2011'/>
-  <license type='lppl1.3'/>
-  <version number='2.5'/>
-  <description>
-    Provides commands <tt>\alphalph</tt> and <tt>\AlphAlph.</tt> They
-    are like <tt>\number</tt> but the expansion consists of lowercase
-    and uppercase letters respectively (1 to a, 26 to z, 27 to aa, 52
-    to zz, 53 to ba, 702 to zz, 703 to aaa, etc.). Can be used as a
-    replacement for LaTeX's <tt>\@alph</tt> and <tt>\@Alph</tt>
-    macros.
-    <p/>
-    The package is part of the <xref refid='oberdiek'>oberdiek</xref>
-    bundle.
-  </description>
-  <documentation details='Package documentation'
-      href='ctan:/macros/latex/contrib/oberdiek/alphalph.pdf'/>
-  <ctan file='true' path='/macros/latex/contrib/oberdiek/alphalph.dtx'/>
-  <miktex location='oberdiek'/>
-  <texlive location='oberdiek'/>
-  <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
-</entry>
-%</catalogue>
-%    \end{macrocode}
-%
 % \begin{History}
 %   \begin{Version}{1999/03/19 v0.1}
 %   \item
 %     The first version was built as a response to a
 %     \URL{\link{question}}^^A
-%     {http://groups.google.com/group/comp.text.tex/msg/17a74cd721641038}^^A
+%     {https://groups.google.com/group/comp.text.tex/msg/17a74cd721641038}^^A
 %     of \NameEmail{Will Douglas}{william.douglas@wolfson.ox.ac.uk}
 %     and the
 %     \URL{\link{request}}^^A
-%     {http://groups.google.com/group/comp.text.tex/msg/8f9768825640315f}^^A
+%     {https://groups.google.com/group/comp.text.tex/msg/8f9768825640315f}^^A
 %     of \NameEmail{Donald Arsenau}{asnd@reg.triumf.ca},
 %     published in the newsgroup
 %     \href{news:comp.text.tex}{comp.text.tex}:
 %     \URL{``\link{Re: alph counters \textgreater\ 26}''}^^A
-%     {http://groups.google.com/group/comp.text.tex/msg/cec563eef8bf65d0}
+%     {https://groups.google.com/group/comp.text.tex/msg/cec563eef8bf65d0}
 %   \item
 %     Copyright: LPPL (\CTAN{macros/latex/base/lppl.txt})
 %   \end{Version}
diff --git a/macros/latex/contrib/oberdiek/alphalph.pdf b/macros/latex/contrib/oberdiek/alphalph.pdf
index c0cee9c316..260650f030 100644
--- a/macros/latex/contrib/oberdiek/alphalph.pdf
+++ b/macros/latex/contrib/oberdiek/alphalph.pdf
diff --git a/macros/latex/contrib/oberdiek/askinclude.dtx b/macros/latex/contrib/oberdiek/askinclude.dtx
index 160c0de918..eb335f0936 100644
--- a/macros/latex/contrib/oberdiek/askinclude.dtx
+++ b/macros/latex/contrib/oberdiek/askinclude.dtx
@@ -14,15 +14,17 @@
 % conditions of the LaTeX Project Public License, either
 % version 1.3c of this license or (at your option) any later
 % version. This version of this license is in
-%    http://www.latex-project.org/lppl/lppl-1-3c.txt
+%    https://www.latex-project.org/lppl/lppl-1-3c.txt
 % and the latest version of this license is in
-%    http://www.latex-project.org/lppl.txt
+%    https://www.latex-project.org/lppl.txt
 % and version 1.3 or later is part of all distributions of
 % LaTeX version 2005/12/01 or later.
 %
 % This work has the LPPL maintenance status "maintained".
 %
-% This Current Maintainer of this work is Heiko Oberdiek.
+% The Current Maintainers of this work are
+% Heiko Oberdiek and the Oberdiek Package Support Group
+% https://github.com/ho-tex/oberdiek/issues
 %
 % This work consists of the main source file askinclude.dtx
 % and the derived files
@@ -142,15 +144,18 @@ This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either
 version 1.3c of this license or (at your option) any later
 version. This version of this license is in
-   http://www.latex-project.org/lppl/lppl-1-3c.txt
+   https://www.latex-project.org/lppl/lppl-1-3c.txt
 and the latest version of this license is in
-   http://www.latex-project.org/lppl.txt
+   https://www.latex-project.org/lppl.txt
 and version 1.3 or later is part of all distributions of
 LaTeX version 2005/12/01 or later.
 
 This work has the LPPL maintenance status "maintained".
 
-This Current Maintainer of this work is Heiko Oberdiek.
+The Current Maintainers of this work are
+Heiko Oberdiek and the Oberdiek Package Support Group
+https://github.com/ho-tex/oberdiek/issues
+
 
 This work consists of the main source file askinclude.dtx
 and the derived files
@@ -240,7 +245,7 @@ and the derived files
   author={Fairbairns, Robin},
   title={[tex-live] licence on includeonly.sty},
   date={2007-10-13},
-  url={http://www.tug.org/pipermail/tex-live/2007-October/014928.html},
+  url={https://www.tug.org/pipermail/tex-live/2007-October/014928.html},
   urldate={2011-12-02},
 }
 @online{newsthread,
@@ -249,7 +254,7 @@ and the derived files
   note={Thread in newsgroup {\xnewsgroup{comp.text.tex}};
       Message-ID: {\texttt{fev72m\$b35\$02\$2@news.t-online.com}}},
   date={2007-10-15},
-  url={http://groups.google.com/group/comp.text.tex/browse_thread/thread/728a3e73c04c6789/349e31865c40d00c},
+  url={https://groups.google.com/group/comp.text.tex/browse_thread/thread/728a3e73c04c6789/349e31865c40d00c},
   urldate={2011-12-02},
 }
 @manual{makematch,
@@ -257,14 +262,14 @@ and the derived files
   title={makematch.sty: Pattern matching with wildcards},
   date={2007-02-23},
   version={1.7925},
-  url={http://mirror.ctan.org/macros/latex/contrib/qstest/makematch.pdf},
+  url={\CTANpkg{makematch}},
   urldate={2011-12-02},
 }
 @manual{excludeonly,
   author={Luecking, Daniel H. and Arseneau, Donald},
   title={The excludeonly package},
   date={2003-03-14},
-  url={http://mirror.ctan.org/macros/latex/contrib/excludeonly/excludeonly.pdf},
+  url={\CTANpkg{excludeonly}},
   urldate={2011-12-02},
 }
 %</bib>
@@ -321,8 +326,7 @@ and the derived files
 % \author{
 %   Pablo A. Straub\\[1ex]
 %    Heiko Oberdiek\thanks
-% {Please report any issues at https://github.com/ho-tex/oberdiek/issues}\\
-% \xemail{heiko.oberdiek at googlemail.com}}
+% {Please report any issues at \url{https://github.com/ho-tex/oberdiek/issues}}}
 % 
 %
 % \maketitle
@@ -2660,7 +2664,7 @@ and the derived files
 % \subsection{Download}
 %
 % \paragraph{Package.} This package is available on
-% CTAN\footnote{\url{http://ctan.org/pkg/askinclude}}:
+% CTAN\footnote{\CTANpkg{askinclude}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/askinclude.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/askinclude.pdf}] Documentation.
@@ -2672,7 +2676,7 @@ and the derived files
 % the packages are already unpacked and the documentation files
 % are generated. The files and directories obey the TDS standard.
 % \begin{description}
-% \item[\CTAN{install/macros/latex/contrib/oberdiek.tds.zip}]
+% \item[\CTANinstall{install/macros/latex/contrib/oberdiek.tds.zip}]
 % \end{description}
 % \emph{TDS} refers to the standard ``A Directory Structure
 % for \TeX\ Files'' (\CTAN{tds/tds.pdf}). Directories
@@ -2818,16 +2822,6 @@ and the derived files
 %
 % \subsection{Some details for the interested}
 %
-% \paragraph{Attached source.}
-%
-% The PDF documentation on CTAN also includes the
-% \xfile{.dtx} source file. It can be extracted by
-% AcrobatReader 6 or higher. Another option is \textsf{pdftk},
-% e.g. unpack the file into the current directory:
-% \begin{quote}
-%   \verb|pdftk askinclude.pdf unpack_files output .|
-% \end{quote}
-%
 % \paragraph{Unpacking with \LaTeX.}
 % The \xfile{.dtx} chooses its action depending on the format:
 % \begin{description}
@@ -2864,43 +2858,6 @@ and the derived files
 %\end{verbatim}
 % \end{quote}
 %
-% \section{Catalogue}
-%
-% The following XML file can be used as source for the
-% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
-% The elements \texttt{caption} and \texttt{description} are imported
-% from the original XML file from the Catalogue.
-% The name of the XML file in the Catalogue is \xfile{askinclude.xml}.
-%    \begin{macrocode}
-%<*catalogue>
-<?xml version='1.0' encoding='us-ascii'?>
-<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
-<entry datestamp='$Date$' modifier='$Author$' id='askinclude'>
-  <name>askinclude</name>
-  <caption>Interactive use of \includeonly</caption>
-  <authorref id='auth:straub'/>
-  <authorref id='auth:oberdiek'/>
-  <copyright owner="Pablo A. Straub" year='1991-1994'/>
-  <copyright owner="Heiko Oberdiek" year='2007,2008,2011'/>
-  <license type='lppl1.3'/>
-  <version number='2.4'/>
-  <description>
-    The package asks the user which files to put in a \includeonly
-    command.  There is provision for answering &#x201C;same as last
-    time&#x201D; or &#x201C;all files&#x201D;.
-    <p/>
-    The package is part of the <xref refid='oberdiek'>oberdiek</xref> bundle.
-  </description>
-  <documentation details='Package documentation'
-      href='ctan:/macros/latex/contrib/oberdiek/askinclude.pdf'/>
-  <ctan file='true' path='/macros/latex/contrib/oberdiek/askinclude.dtx'/>
-  <miktex location='oberdiek'/>
-  <texlive location='oberdiek'/>
-  <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
-</entry>
-%</catalogue>
-%    \end{macrocode}
-%
 % \section{Acknowledgement}
 %
 % \begin{description}
@@ -2928,7 +2885,7 @@ and the derived files
 %   \item
 %     Changed prompts (sent to \xnewsgroup{comp.text.tex}):
 %     \URL{``\link{Interactive inclusion of files in LaTeX}''}^^A
-%     {http://groups.google.com/group/comp.text.tex/msg/34b770a7c277e79c}
+%     {https://groups.google.com/group/comp.text.tex/msg/34b770a7c277e79c}
 %   \end{Version}
 %   \begin{Version}{1991/12/13 v1.1}
 %   \item
@@ -2945,7 +2902,7 @@ and the derived files
 %     Reimplementation, published as \xpackage{askinc} in
 %     newsgroup \xnewsgroup{comp.text.tex}:\\
 %     \URL{``\link{Re: askinclude.sty}''}^^A
-%     {http://groups.google.com/group/comp.text.tex/msg/2d638b84a858fdc8}
+%     {https://groups.google.com/group/comp.text.tex/msg/2d638b84a858fdc8}
 %   \item
 %     Listing of included files, collected from the previous run before
 %     the question.
@@ -3002,7 +2959,7 @@ and the derived files
 %   \item
 %     Changed prompts (sent to \xnewsgroup{comp.text.tex}):
 %     \URL{``\link{Interactive inclusion of files in LaTeX}''}^^A
-%     {http://groups.google.com/group/comp.text.tex/msg/34b770a7c277e79c}
+%     {https://groups.google.com/group/comp.text.tex/msg/34b770a7c277e79c}
 %   \end{Version}
 %   \begin{Version}{1991/12/13 v1.1}
 %   \item
@@ -3019,7 +2976,7 @@ and the derived files
 %     Reimplementation, published as \xpackage{askinc} in
 %     newsgroup \xnewsgroup{comp.text.tex}:\\
 %     \URL{``\link{Re: askinclude.sty}''}^^A
-%     {http://groups.google.com/group/comp.text.tex/msg/2d638b84a858fdc8}
+%     {https://groups.google.com/group/comp.text.tex/msg/2d638b84a858fdc8}
 %   \item
 %     Listing of included files, collected from the previous run before
 %     the question.
diff --git a/macros/latex/contrib/oberdiek/askinclude.pdf b/macros/latex/contrib/oberdiek/askinclude.pdf
index 8b4bab5491..ba2c3aaaea 100644
--- a/macros/latex/contrib/oberdiek/askinclude.pdf
+++ b/macros/latex/contrib/oberdiek/askinclude.pdf
diff --git a/macros/latex/contrib/oberdiek/atbegshi.dtx b/macros/latex/contrib/oberdiek/atbegshi.dtx
index 2b249fa386..472a25ebdc 100644
--- a/macros/latex/contrib/oberdiek/atbegshi.dtx
+++ b/macros/latex/contrib/oberdiek/atbegshi.dtx
@@ -13,15 +13,17 @@
 % conditions of the LaTeX Project Public License, either
 % version 1.3c of this license or (at your option) any later
 % version. This version of this license is in
-%    http://www.latex-project.org/lppl/lppl-1-3c.txt
+%    https://www.latex-project.org/lppl/lppl-1-3c.txt
 % and the latest version of this license is in
-%    http://www.latex-project.org/lppl.txt
+%    https://www.latex-project.org/lppl.txt
 % and version 1.3 or later is part of all distributions of
 % LaTeX version 2005/12/01 or later.
 %
 % This work has the LPPL maintenance status "maintained".
 %
-% This Current Maintainer of this work is Heiko Oberdiek.
+% The Current Maintainers of this work are
+% Heiko Oberdiek and the Oberdiek Package Support Group
+% https://github.com/ho-tex/oberdiek/issues
 %
 % The Base Interpreter refers to any `TeX-Format',
 % because some files are installed in TDS:tex/generic//.
@@ -108,15 +110,18 @@ This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either
 version 1.3c of this license or (at your option) any later
 version. This version of this license is in
-   http://www.latex-project.org/lppl/lppl-1-3c.txt
+   https://www.latex-project.org/lppl/lppl-1-3c.txt
 and the latest version of this license is in
-   http://www.latex-project.org/lppl.txt
+   https://www.latex-project.org/lppl.txt
 and version 1.3 or later is part of all distributions of
 LaTeX version 2005/12/01 or later.
 
 This work has the LPPL maintenance status "maintained".
 
-This Current Maintainer of this work is Heiko Oberdiek.
+The Current Maintainers of this work are
+Heiko Oberdiek and the Oberdiek Package Support Group
+https://github.com/ho-tex/oberdiek/issues
+
 
 The Base Interpreter refers to any `TeX-Format',
 because some files are installed in TDS:tex/generic//.
@@ -203,8 +208,7 @@ and the derived files
 % \title{The \xpackage{atbegshi} package}
 % \date{2016/06/09 v1.18}
 % \author{Heiko Oberdiek\thanks
-% {Please report any issues at https://github.com/ho-tex/oberdiek/issues}\\
-% \xemail{heiko.oberdiek at googlemail.com}}
+% {Please report any issues at \url{https://github.com/ho-tex/oberdiek/issues}}}
 %
 % \maketitle
 %
@@ -2131,7 +2135,7 @@ Hello World
 % \subsection{Download}
 %
 % \paragraph{Package.} This package is available on
-% CTAN\footnote{\url{http://ctan.org/pkg/atbegshi}}:
+% CTAN\footnote{\CTANpkg{atbegshi}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/atbegshi.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/atbegshi.pdf}] Documentation.
@@ -2143,7 +2147,7 @@ Hello World
 % the packages are already unpacked and the documentation files
 % are generated. The files and directories obey the TDS standard.
 % \begin{description}
-% \item[\CTAN{install/macros/latex/contrib/oberdiek.tds.zip}]
+% \item[\CTANinstall{install/macros/latex/contrib/oberdiek.tds.zip}]
 % \end{description}
 % \emph{TDS} refers to the standard ``A Directory Structure
 % for \TeX\ Files'' (\CTAN{tds/tds.pdf}). Directories
@@ -2267,16 +2271,6 @@ Hello World
 %
 % \subsection{Some details for the interested}
 %
-% \paragraph{Attached source.}
-%
-% The PDF documentation on CTAN also includes the
-% \xfile{.dtx} source file. It can be extracted by
-% AcrobatReader 6 or higher. Another option is \textsf{pdftk},
-% e.g. unpack the file into the current directory:
-% \begin{quote}
-%   \verb|pdftk atbegshi.pdf unpack_files output .|
-% \end{quote}
-%
 % \paragraph{Unpacking with \LaTeX.}
 % The \xfile{.dtx} chooses its action depending on the format:
 % \begin{description}
@@ -2312,43 +2306,6 @@ Hello World
 %\end{verbatim}
 % \end{quote}
 %
-% \section{Catalogue}
-%
-% The following XML file can be used as source for the
-% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
-% The elements \texttt{caption} and \texttt{description} are imported
-% from the original XML file from the Catalogue.
-% The name of the XML file in the Catalogue is \xfile{atbegshi.xml}.
-%    \begin{macrocode}
-%<*catalogue>
-<?xml version='1.0' encoding='us-ascii'?>
-<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
-<entry datestamp='$Date$' modifier='$Author$' id='atbegshi'>
-  <name>atbegshi</name>
-  <caption>Execute stuff at \shipout time.</caption>
-  <authorref id='auth:oberdiek'/>
-  <copyright owner='Heiko Oberdiek' year='2007-2011'/>
-  <license type='lppl1.3'/>
-  <version number='1.18'/>
-  <description>
-    This package is a modern reimplementation of package
-    <xref refid='everyshi'>everyshi</xref>, providing various commands
-    to be executed before a <tt>\shipout</tt> command.  It makes use of
-    e-TeX&#x2019;s facilities if they are available.  The package may
-    be used either with LaTeX or with plain TeX.
-    <p/>
-    The package is part of the <xref refid='oberdiek'>oberdiek</xref> bundle.
-  </description>
-  <documentation details='Package documentation'
-      href='ctan:/macros/latex/contrib/oberdiek/atbegshi.pdf'/>
-  <ctan file='true' path='/macros/latex/contrib/oberdiek/atbegshi.dtx'/>
-  <miktex location='oberdiek'/>
-  <texlive location='oberdiek'/>
-  <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
-</entry>
-%</catalogue>
-%    \end{macrocode}
-%
 % \begin{History}
 %   \begin{Version}{2007/04/17 v1.0}
 %   \item
diff --git a/macros/latex/contrib/oberdiek/atbegshi.pdf b/macros/latex/contrib/oberdiek/atbegshi.pdf
index fbb2456103..67176c62b7 100644
--- a/macros/latex/contrib/oberdiek/atbegshi.pdf
+++ b/macros/latex/contrib/oberdiek/atbegshi.pdf
diff --git a/macros/latex/contrib/oberdiek/atenddvi.dtx b/macros/latex/contrib/oberdiek/atenddvi.dtx
index 5738ab584a..3632f221f0 100644
--- a/macros/latex/contrib/oberdiek/atenddvi.dtx
+++ b/macros/latex/contrib/oberdiek/atenddvi.dtx
@@ -13,15 +13,17 @@
 % conditions of the LaTeX Project Public License, either
 % version 1.3c of this license or (at your option) any later
 % version. This version of this license is in
-%    http://www.latex-project.org/lppl/lppl-1-3c.txt
+%    https://www.latex-project.org/lppl/lppl-1-3c.txt
 % and the latest version of this license is in
-%    http://www.latex-project.org/lppl.txt
+%    https://www.latex-project.org/lppl.txt
 % and version 1.3 or later is part of all distributions of
 % LaTeX version 2005/12/01 or later.
 %
 % This work has the LPPL maintenance status "maintained".
 %
-% This Current Maintainer of this work is Heiko Oberdiek.
+% The Current Maintainers of this work are
+% Heiko Oberdiek and the Oberdiek Package Support Group
+% https://github.com/ho-tex/oberdiek/issues
 %
 % This work consists of the main source file atenddvi.dtx
 % and the derived files
@@ -98,15 +100,18 @@ This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either
 version 1.3c of this license or (at your option) any later
 version. This version of this license is in
-   http://www.latex-project.org/lppl/lppl-1-3c.txt
+   https://www.latex-project.org/lppl/lppl-1-3c.txt
 and the latest version of this license is in
-   http://www.latex-project.org/lppl.txt
+   https://www.latex-project.org/lppl.txt
 and version 1.3 or later is part of all distributions of
 LaTeX version 2005/12/01 or later.
 
 This work has the LPPL maintenance status "maintained".
 
-This Current Maintainer of this work is Heiko Oberdiek.
+The Current Maintainers of this work are
+Heiko Oberdiek and the Oberdiek Package Support Group
+https://github.com/ho-tex/oberdiek/issues
+
 
 This work consists of the main source file atenddvi.dtx
 and the derived files
@@ -181,8 +186,7 @@ and the derived files
 % \title{The \xpackage{atenddvi} package}
 % \date{2016/05/16 v1.2}
 % \author{Heiko Oberdiek\thanks
-% {Please report any issues at https://github.com/ho-tex/oberdiek/issues}\\
-% \xemail{heiko.oberdiek at googlemail.com}}
+% {Please report any issues at \url{https://github.com/ho-tex/oberdiek/issues}}}
 %
 % \maketitle
 %
@@ -389,7 +393,7 @@ and the derived files
 % \subsection{Download}
 %
 % \paragraph{Package.} This package is available on
-% CTAN\footnote{\url{http://ctan.org/pkg/atenddvi}}:
+% CTAN\footnote{\CTANpkg{atenddvi}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/atenddvi.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/atenddvi.pdf}] Documentation.
@@ -401,7 +405,7 @@ and the derived files
 % the packages are already unpacked and the documentation files
 % are generated. The files and directories obey the TDS standard.
 % \begin{description}
-% \item[\CTAN{install/macros/latex/contrib/oberdiek.tds.zip}]
+% \item[\CTANinstall{install/macros/latex/contrib/oberdiek.tds.zip}]
 % \end{description}
 % \emph{TDS} refers to the standard ``A Directory Structure
 % for \TeX\ Files'' (\CTAN{tds/tds.pdf}). Directories
@@ -520,16 +524,6 @@ and the derived files
 %
 % \subsection{Some details for the interested}
 %
-% \paragraph{Attached source.}
-%
-% The PDF documentation on CTAN also includes the
-% \xfile{.dtx} source file. It can be extracted by
-% AcrobatReader 6 or higher. Another option is \textsf{pdftk},
-% e.g. unpack the file into the current directory:
-% \begin{quote}
-%   \verb|pdftk atenddvi.pdf unpack_files output .|
-% \end{quote}
-%
 % \paragraph{Unpacking with \LaTeX.}
 % The \xfile{.dtx} chooses its action depending on the format:
 % \begin{description}
@@ -565,44 +559,6 @@ and the derived files
 %\end{verbatim}
 % \end{quote}
 %
-% \section{Catalogue}
-%
-% The following XML file can be used as source for the
-% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
-% The elements \texttt{caption} and \texttt{description} are imported
-% from the original XML file from the Catalogue.
-% The name of the XML file in the Catalogue is \xfile{atenddvi.xml}.
-%    \begin{macrocode}
-%<*catalogue>
-<?xml version='1.0' encoding='us-ascii'?>
-<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
-<entry datestamp='$Date$' modifier='$Author$' id='atenddvi'>
-  <name>atenddvi</name>
-  <caption>Provides the \AtEndDvi command.</caption>
-  <authorref id='auth:oberdiek'/>
-  <copyright owner='Heiko Oberdiek' year='2007'/>
-  <license type='lppl1.3'/>
-  <version number='1.2'/>
-  <description>
-    LaTeX offers <tt>\AtBeginDvi</tt>.  This package provides the
-    counterpart <tt>\AtEndDvi</tt>. The execution of its argument is
-    delayed to the end of the document at the end of the last page.
-    At this point <tt>\special</tt> and <tt>\write</tt> remain
-    effective, because they are put into the last page.  This is the
-    main difference from the LaTeX command <tt>\AtEndDocument</tt>.
-    <p/>
-    The package is part of the <xref refid='oberdiek'>oberdiek</xref> bundle.
-  </description>
-  <documentation details='Package documentation'
-      href='ctan:/macros/latex/contrib/oberdiek/atenddvi.pdf'/>
-  <ctan file='true' path='/macros/latex/contrib/oberdiek/atenddvi.dtx'/>
-  <miktex location='oberdiek'/>
-  <texlive location='oberdiek'/>
-  <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
-</entry>
-%</catalogue>
-%    \end{macrocode}
-%
 % \begin{History}
 %   \begin{Version}{2007/03/20 v1.0}
 %   \item
diff --git a/macros/latex/contrib/oberdiek/atenddvi.pdf b/macros/latex/contrib/oberdiek/atenddvi.pdf
index 1b7c51480a..c0a3a54a89 100644
--- a/macros/latex/contrib/oberdiek/atenddvi.pdf
+++ b/macros/latex/contrib/oberdiek/atenddvi.pdf
diff --git a/macros/latex/contrib/oberdiek/attachfile2.dtx b/macros/latex/contrib/oberdiek/attachfile2.dtx
index 0fd7e1f6a3..6a0dfdc5de 100644
--- a/macros/latex/contrib/oberdiek/attachfile2.dtx
+++ b/macros/latex/contrib/oberdiek/attachfile2.dtx
@@ -13,15 +13,17 @@
 % conditions of the LaTeX Project Public License, either
 % version 1.3c of this license or (at your option) any later
 % version. This version of this license is in
-%    http://www.latex-project.org/lppl/lppl-1-3c.txt
+%    https://www.latex-project.org/lppl/lppl-1-3c.txt
 % and the latest version of this license is in
-%    http://www.latex-project.org/lppl.txt
+%    https://www.latex-project.org/lppl.txt
 % and version 1.3 or later is part of all distributions of
 % LaTeX version 2005/12/01 or later.
 %
 % This work has the LPPL maintenance status "maintained".
 %
-% This Current Maintainer of this work is Heiko Oberdiek.
+% The Current Maintainers of this work are
+% Heiko Oberdiek and the Oberdiek Package Support Group
+% https://github.com/ho-tex/oberdiek/issues
 %
 % This work consists of the main source file attachfile2.dtx
 % and the derived files
@@ -105,15 +107,18 @@ This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either
 version 1.3c of this license or (at your option) any later
 version. This version of this license is in
-   http://www.latex-project.org/lppl/lppl-1-3c.txt
+   https://www.latex-project.org/lppl/lppl-1-3c.txt
 and the latest version of this license is in
-   http://www.latex-project.org/lppl.txt
+   https://www.latex-project.org/lppl.txt
 and version 1.3 or later is part of all distributions of
 LaTeX version 2005/12/01 or later.
 
 This work has the LPPL maintenance status "maintained".
 
-This Current Maintainer of this work is Heiko Oberdiek.
+The Current Maintainers of this work are
+Heiko Oberdiek and the Oberdiek Package Support Group
+https://github.com/ho-tex/oberdiek/issues
+
 
 This work consists of the main source file attachfile2.dtx
 and the derived files
@@ -202,8 +207,7 @@ and the derived files
 % \title{The \xpackage{attachfile2} package}
 % \date{2019/07/24 v2.9}
 % \author{Heiko Oberdiek\thanks
-% {Please report any issues at https://github.com/ho-tex/oberdiek/issues}\\
-% \xemail{heiko.oberdiek at googlemail.com}}
+% {Please report any issues at \url{https://github.com/ho-tex/oberdiek/issues}}}
 %
 % \maketitle
 %
@@ -2763,15 +2767,18 @@ $^W=1; # turn warning on
 # conditions of the LaTeX Project Public License, either
 # version 1.3c of this license or (at your option) any later
 # version. This version of this license is in
-#    http://www.latex-project.org/lppl/lppl-1-3c.txt
+#    https://www.latex-project.org/lppl/lppl-1-3c.txt
 # and the latest version of this license is in
-#    http://www.latex-project.org/lppl.txt
+#    https://www.latex-project.org/lppl.txt
 # and version 1.3 or later is part of all distributions of
 # LaTeX version 2005/12/01 or later.
 #
 # This work has the LPPL maintenance status "maintained".
 #
-# This Current Maintainer of this work is Heiko Oberdiek.
+# The Current Maintainers of this work are
+Heiko Oberdiek and the Oberdiek Package Support Group
+https://github.com/ho-tex/oberdiek/issues
+
 #
 # See file "attachfile2.pdf" for a list of files that belong to
 # this project.
@@ -2979,7 +2986,7 @@ __END__
 % \subsection{Download}
 %
 % \paragraph{Package.} This package is available on
-% CTAN\footnote{\url{http://ctan.org/pkg/attachfile2}}:
+% CTAN\footnote{\CTANpkg{attachfile2}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/attachfile2.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/attachfile2.pdf}] Documentation.
@@ -2991,7 +2998,7 @@ __END__
 % the packages are already unpacked and the documentation files
 % are generated. The files and directories obey the TDS standard.
 % \begin{description}
-% \item[\CTAN{install/macros/latex/contrib/oberdiek.tds.zip}]
+% \item[\CTANinstall{install/macros/latex/contrib/oberdiek.tds.zip}]
 % \end{description}
 % \emph{TDS} refers to the standard ``A Directory Structure
 % for \TeX\ Files'' (\CTAN{tds/tds.pdf}). Directories
@@ -3127,16 +3134,6 @@ __END__
 %
 % \subsection{Some details for the interested}
 %
-% \paragraph{Attached source.}
-%
-% The PDF documentation on CTAN also includes the
-% \xfile{.dtx} source file. It can be extracted by
-% AcrobatReader 6 or higher. Another option is \textsf{pdftk},
-% e.g. unpack the file into the current directory:
-% \begin{quote}
-%   \verb|pdftk attachfile2.pdf unpack_files output .|
-% \end{quote}
-%
 % \paragraph{Unpacking with \LaTeX.}
 % The \xfile{.dtx} chooses its action depending on the format:
 % \begin{description}
@@ -3172,51 +3169,11 @@ __END__
 %\end{verbatim}
 % \end{quote}
 %
-% \section{Catalogue}
-%
-% The following XML file can be used as source for the
-% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
-% The elements \texttt{caption} and \texttt{description} are imported
-% from the original XML file from the Catalogue.
-% The name of the XML file in the Catalogue is \xfile{attachfile2.xml}.
-%    \begin{macrocode}
-%<*catalogue>
-<?xml version='1.0' encoding='us-ascii'?>
-<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
-<entry datestamp='$Date$' modifier='$Author$' id='attachfile2'>
-  <name>attachfile2</name>
-  <caption>Attach files into PDF.</caption>
-  <authorref id='auth:oberdiek'/>
-  <copyright owner='Heiko Oberdiek' year='2005-2010,2012'/>
-  <license type='lppl1.3'/>
-  <version number='2.9'/>
-  <description>
-    This package can be used to attach files to a PDF document.
-    It is a further development of Scott Pakin&#x2019;s package
-    <xref refid='attachfile'>attachfile</xref> for
-    <xref refid='pdftex'>pdfTeX</xref>.  Apart from bug fixes,
-    this package adds support for dvips,
-    some new options, and gets and writes meta information data about
-    the attached files.
-    <p/>
-    The package is part of the <xref refid='oberdiek'>oberdiek</xref>
-    bundle.
-  </description>
-  <documentation details='Package documentation'
-      href='ctan:/macros/latex/contrib/oberdiek/attachfile2.pdf'/>
-  <ctan file='true' path='/macros/latex/contrib/oberdiek/attachfile2.dtx'/>
-  <miktex location='oberdiek'/>
-  <texlive location='oberdiek'/>
-  <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
-</entry>
-%</catalogue>
-%    \end{macrocode}
-%
 % \begin{thebibliography}{9}
 % \bibitem{attachfile}
 %   Scott Pakin: \textit{The \xpackage{attachfile} package};
 %   2005/02/20 v1.2;
-%   \CTAN{macros/latex/contrib/attachfile/}.
+%   \CTANpkg{attachfile}.
 %
 % \bibitem{embedfile}
 %   Heiko Oberdiek: \textit{The \xpackage{embedfile} package};
@@ -3225,10 +3182,8 @@ __END__
 %
 % \bibitem{pdfspec}
 %   Adobe Systems Incorporated:
-%   \href{http://partners.adobe.com/public/developer/en/pdf/PDFReference16.pdf}%
-%       {\textit{PDF Reference, Fifth Edition, Version 1.6}},%
-%   November 2004;
-%   \url{http://partners.adobe.com/public/developer/pdf/index_reference.html}.
+%   \href{https://www.adobe.com/devnet/pdf/pdf_reference.html}%
+%       {\textit{PDF Reference, Version 1.7}},%
 %
 % \bibitem{mime}
 %   Network Working Group: RFC 2046, \textit{Multipurpose Internet Mail Extensions (MIME) Part Two:
diff --git a/macros/latex/contrib/oberdiek/attachfile2.pdf b/macros/latex/contrib/oberdiek/attachfile2.pdf
index d200c88772..1b8e6b30b3 100644
--- a/macros/latex/contrib/oberdiek/attachfile2.pdf
+++ b/macros/latex/contrib/oberdiek/attachfile2.pdf
diff --git a/macros/latex/contrib/oberdiek/atveryend.dtx b/macros/latex/contrib/oberdiek/atveryend.dtx
index 5e4dcdb759..0c47c7950e 100644
--- a/macros/latex/contrib/oberdiek/atveryend.dtx
+++ b/macros/latex/contrib/oberdiek/atveryend.dtx
@@ -13,15 +13,17 @@
 % conditions of the LaTeX Project Public License, either
 % version 1.3c of this license or (at your option) any later
 % version. This version of this license is in
-%    http://www.latex-project.org/lppl/lppl-1-3c.txt
+%    https://www.latex-project.org/lppl/lppl-1-3c.txt
 % and the latest version of this license is in
-%    http://www.latex-project.org/lppl.txt
+%    https://www.latex-project.org/lppl.txt
 % and version 1.3 or later is part of all distributions of
 % LaTeX version 2005/12/01 or later.
 %
 % This work has the LPPL maintenance status "maintained".
 %
-% This Current Maintainer of this work is Heiko Oberdiek.
+% The Current Maintainers of this work are
+% Heiko Oberdiek and the Oberdiek Package Support Group
+% https://github.com/ho-tex/oberdiek/issues
 %
 % This work consists of the main source file atveryend.dtx
 % and the derived files
@@ -100,15 +102,18 @@ This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either
 version 1.3c of this license or (at your option) any later
 version. This version of this license is in
-   http://www.latex-project.org/lppl/lppl-1-3c.txt
+   https://www.latex-project.org/lppl/lppl-1-3c.txt
 and the latest version of this license is in
-   http://www.latex-project.org/lppl.txt
+   https://www.latex-project.org/lppl.txt
 and version 1.3 or later is part of all distributions of
 LaTeX version 2005/12/01 or later.
 
 This work has the LPPL maintenance status "maintained".
 
-This Current Maintainer of this work is Heiko Oberdiek.
+The Current Maintainers of this work are
+Heiko Oberdiek and the Oberdiek Package Support Group
+https://github.com/ho-tex/oberdiek/issues
+
 
 This work consists of the main source file atveryend.dtx
 and the derived files
@@ -186,8 +191,7 @@ and the derived files
 % \title{The \xpackage{atveryend} package}
 % \date{2016/05/16 v1.9}
 % \author{Heiko Oberdiek\thanks
-% {Please report any issues at https://github.com/ho-tex/oberdiek/issues}\\
-% \xemail{heiko.oberdiek at googlemail.com}}
+% {Please report any issues at \url{https://github.com/ho-tex/oberdiek/issues}}}
 %
 % \maketitle
 %
@@ -1298,7 +1302,7 @@ and the derived files
 % \subsection{Download}
 %
 % \paragraph{Package.} This package is available on
-% CTAN\footnote{\url{http://ctan.org/pkg/atveryend}}:
+% CTAN\footnote{\CTANpkg{atveryend}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/atveryend.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/atveryend.pdf}] Documentation.
@@ -1310,7 +1314,7 @@ and the derived files
 % the packages are already unpacked and the documentation files
 % are generated. The files and directories obey the TDS standard.
 % \begin{description}
-% \item[\CTAN{install/macros/latex/contrib/oberdiek.tds.zip}]
+% \item[\CTANinstall{install/macros/latex/contrib/oberdiek.tds.zip}]
 % \end{description}
 % \emph{TDS} refers to the standard ``A Directory Structure
 % for \TeX\ Files'' (\CTAN{tds/tds.pdf}). Directories
@@ -1430,16 +1434,6 @@ and the derived files
 %
 % \subsection{Some details for the interested}
 %
-% \paragraph{Attached source.}
-%
-% The PDF documentation on CTAN also includes the
-% \xfile{.dtx} source file. It can be extracted by
-% AcrobatReader 6 or higher. Another option is \textsf{pdftk},
-% e.g. unpack the file into the current directory:
-% \begin{quote}
-%   \verb|pdftk atveryend.pdf unpack_files output .|
-% \end{quote}
-%
 % \paragraph{Unpacking with \LaTeX.}
 % The \xfile{.dtx} chooses its action depending on the format:
 % \begin{description}
@@ -1475,44 +1469,6 @@ and the derived files
 %\end{verbatim}
 % \end{quote}
 %
-% \section{Catalogue}
-%
-% The following XML file can be used as source for the
-% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
-% The elements \texttt{caption} and \texttt{description} are imported
-% from the original XML file from the Catalogue.
-% The name of the XML file in the Catalogue is \xfile{atveryend.xml}.
-%    \begin{macrocode}
-%<*catalogue>
-<?xml version='1.0' encoding='us-ascii'?>
-<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
-<entry datestamp='$Date$' modifier='$Author$' id='atveryend'>
-  <name>atveryend</name>
-  <caption>Hooks at the very end of a document.</caption>
-  <authorref id='auth:oberdiek'/>
-  <copyright owner='Heiko Oberdiek' year='2009-2011'/>
-  <license type='lppl1.3'/>
-  <version number='1.9'/>
-  <description>
-    This LaTeX packages provides two hooks for <tt>\end{document}</tt>
-    that are executed after the hook of <tt>\AtEndDocument</tt>:
-    <tt>\AfterLastShipout</tt> can be used for code that is to be executed
-    right after the last <tt>\clearpage</tt> before the `<tt>.aux</tt>' file
-    is closed. <tt>\AtVeryEndDocument</tt> is used for code after closing
-    and final reading of the `<tt>.aux</tt>' file.
-    <p/>
-    The package is part of the <xref refid='oberdiek'>oberdiek</xref> bundle.
-  </description>
-  <documentation details='Package documentation'
-      href='ctan:/macros/latex/contrib/oberdiek/atveryend.pdf'/>
-  <ctan file='true' path='/macros/latex/contrib/oberdiek/atveryend.dtx'/>
-  <miktex location='oberdiek'/>
-  <texlive location='oberdiek'/>
-  <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
-</entry>
-%</catalogue>
-%    \end{macrocode}
-%
 % \section{Acknowledgement}
 %
 % \begin{description}
@@ -1527,7 +1483,7 @@ and the derived files
 % The \LaTeX3 Project:
 % \textit{\LaTeX2e\ for class and package writers}
 % 2006/02/15;
-% \CTAN{macros/latex/doc/clsguide.pdf}.
+% \CTANpkg{clsguide}.
 %
 % \bibitem{endfloat}
 % James Darrell McCauley, Jeff Goldberg:
@@ -1545,19 +1501,19 @@ and the derived files
 % Sebastian Rahtz, Heiko Oberdiek:
 % \textit{The \xpackage{hyperref} package};
 % 2009/12/05 v6.79l;
-% \CTAN{macros/latex/contrib/hyperref/}.
+% \CTANpkg{hyperref}.
 %
 % \bibitem{koma}
 % Markus Kohm:
 % \textit{KOMA-Script};
 % 2009/07/24 v3.04a;
-% \url{http://www.komascript.de/}.
+% \url{https://www.komascript.de/}.
 %
 % \bibitem{lastpage}
 % Jeff Goldberg:
 % \textit{The \xpackage{lastpage} package};
 % 1994/07/20 v0.1b;
-% \CTAN{macros/latex/contrib/lastpage/lastpage.pdf}.
+% \CTANpkg{lastpage}.
 %
 % \bibitem{revtex}
 % APS, AIP, Arthur Orgawa;
diff --git a/macros/latex/contrib/oberdiek/atveryend.pdf b/macros/latex/contrib/oberdiek/atveryend.pdf
index 479142aa17..e9b4f26623 100644
--- a/macros/latex/contrib/oberdiek/atveryend.pdf
+++ b/macros/latex/contrib/oberdiek/atveryend.pdf
diff --git a/macros/latex/contrib/oberdiek/auxhook.dtx b/macros/latex/contrib/oberdiek/auxhook.dtx
index 5ca41d3d43..37a1dc4aab 100644
--- a/macros/latex/contrib/oberdiek/auxhook.dtx
+++ b/macros/latex/contrib/oberdiek/auxhook.dtx
@@ -13,15 +13,17 @@
 % conditions of the LaTeX Project Public License, either
 % version 1.3c of this license or (at your option) any later
 % version. This version of this license is in
-%    http://www.latex-project.org/lppl/lppl-1-3c.txt
+%    https://www.latex-project.org/lppl/lppl-1-3c.txt
 % and the latest version of this license is in
-%    http://www.latex-project.org/lppl.txt
+%    https://www.latex-project.org/lppl.txt
 % and version 1.3 or later is part of all distributions of
 % LaTeX version 2005/12/01 or later.
 %
 % This work has the LPPL maintenance status "maintained".
 %
-% This Current Maintainer of this work is Heiko Oberdiek.
+% The Current Maintainers of this work are
+% Heiko Oberdiek and the Oberdiek Package Support Group
+% https://github.com/ho-tex/oberdiek/issues
 %
 % This work consists of the main source file auxhook.dtx
 % and the derived files
@@ -98,15 +100,18 @@ This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either
 version 1.3c of this license or (at your option) any later
 version. This version of this license is in
-   http://www.latex-project.org/lppl/lppl-1-3c.txt
+   https://www.latex-project.org/lppl/lppl-1-3c.txt
 and the latest version of this license is in
-   http://www.latex-project.org/lppl.txt
+   https://www.latex-project.org/lppl.txt
 and version 1.3 or later is part of all distributions of
 LaTeX version 2005/12/01 or later.
 
 This work has the LPPL maintenance status "maintained".
 
-This Current Maintainer of this work is Heiko Oberdiek.
+The Current Maintainers of this work are
+Heiko Oberdiek and the Oberdiek Package Support Group
+https://github.com/ho-tex/oberdiek/issues
+
 
 This work consists of the main source file auxhook.dtx
 and the derived files
@@ -181,8 +186,7 @@ and the derived files
 % \title{The \xpackage{auxhook} package}
 % \date{2016/05/16 v1.4}
 % \author{Heiko Oberdiek\thanks
-% {Please report any issues at https://github.com/ho-tex/oberdiek/issues}\\
-% \xemail{heiko.oberdiek at googlemail.com}}
+% {Please report any issues at \url{https://github.com/ho-tex/oberdiek/issues}}}
 %
 % \maketitle
 %
@@ -417,7 +421,7 @@ and the derived files
 % \subsection{Download}
 %
 % \paragraph{Package.} This package is available on
-% CTAN\footnote{\url{http://ctan.org/pkg/auxhook}}:
+% CTAN\footnote{\CTANpkg{auxhook}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/auxhook.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/auxhook.pdf}] Documentation.
@@ -429,7 +433,7 @@ and the derived files
 % the packages are already unpacked and the documentation files
 % are generated. The files and directories obey the TDS standard.
 % \begin{description}
-% \item[\CTAN{install/macros/latex/contrib/oberdiek.tds.zip}]
+% \item[\CTANinstall{install/macros/latex/contrib/oberdiek.tds.zip}]
 % \end{description}
 % \emph{TDS} refers to the standard ``A Directory Structure
 % for \TeX\ Files'' (\CTAN{tds/tds.pdf}). Directories
@@ -548,16 +552,6 @@ and the derived files
 %
 % \subsection{Some details for the interested}
 %
-% \paragraph{Attached source.}
-%
-% The PDF documentation on CTAN also includes the
-% \xfile{.dtx} source file. It can be extracted by
-% AcrobatReader 6 or higher. Another option is \textsf{pdftk},
-% e.g. unpack the file into the current directory:
-% \begin{quote}
-%   \verb|pdftk auxhook.pdf unpack_files output .|
-% \end{quote}
-%
 % \paragraph{Unpacking with \LaTeX.}
 % The \xfile{.dtx} chooses its action depending on the format:
 % \begin{description}
@@ -593,40 +587,6 @@ and the derived files
 %\end{verbatim}
 % \end{quote}
 %
-% \section{Catalogue}
-%
-% The following XML file can be used as source for the
-% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
-% The elements \texttt{caption} and \texttt{description} are imported
-% from the original XML file from the Catalogue.
-% The name of the XML file in the Catalogue is \xfile{auxhook.xml}.
-%    \begin{macrocode}
-%<*catalogue>
-<?xml version='1.0' encoding='us-ascii'?>
-<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
-<entry datestamp='$Date$' modifier='$Author$' id='auxhook'>
-  <name>auxhook</name>
-  <caption>Hooks for auxiliary files.</caption>
-  <authorref id='auth:oberdiek'/>
-  <copyright owner='Heiko Oberdiek' year='2006,2007,2009,2011'/>
-  <license type='lppl1.3'/>
-  <version number='1.4'/>
-  <description>
-    This package auxhook provides hooks for adding stuff at
-    the begin of <tt>.aux</tt> files.
-    <p/>
-    The package is part of the <xref refid='oberdiek'>oberdiek</xref> bundle.
-  </description>
-  <documentation details='Package documentation'
-      href='ctan:/macros/latex/contrib/oberdiek/auxhook.pdf'/>
-  <ctan file='true' path='/macros/latex/contrib/oberdiek/auxhook.dtx'/>
-  <miktex location='oberdiek'/>
-  <texlive location='oberdiek'/>
-  <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
-</entry>
-%</catalogue>
-%    \end{macrocode}
-%
 % \begin{thebibliography}{9}
 %
 % \bibitem{hypdestopt}
@@ -638,7 +598,7 @@ and the derived files
 %   Sebastian Rahtz, Heiko Oberdiek:
 %   \textit{The \xpackage{hyperref} package};
 %   2006/08/16 v6.75c;
-%   \CTAN{macros/latex/contrib/hyperref/}.
+%   \CTANpkg{hyperref}.
 %
 % \bibitem{zref}
 %   Heiko Oberdiek: \textit{The \xpackage{zref} package};
diff --git a/macros/latex/contrib/oberdiek/auxhook.pdf b/macros/latex/contrib/oberdiek/auxhook.pdf
index bce7831dbb..87d7ba7ed2 100644
--- a/macros/latex/contrib/oberdiek/auxhook.pdf
+++ b/macros/latex/contrib/oberdiek/auxhook.pdf
diff --git a/macros/latex/contrib/oberdiek/bigintcalc.dtx b/macros/latex/contrib/oberdiek/bigintcalc.dtx
index 33f380783c..dbe43326ce 100644
--- a/macros/latex/contrib/oberdiek/bigintcalc.dtx
+++ b/macros/latex/contrib/oberdiek/bigintcalc.dtx
@@ -13,15 +13,17 @@
 % conditions of the LaTeX Project Public License, either
 % version 1.3c of this license or (at your option) any later
 % version. This version of this license is in
-%    http://www.latex-project.org/lppl/lppl-1-3c.txt
+%    https://www.latex-project.org/lppl/lppl-1-3c.txt
 % and the latest version of this license is in
-%    http://www.latex-project.org/lppl.txt
+%    https://www.latex-project.org/lppl.txt
 % and version 1.3 or later is part of all distributions of
 % LaTeX version 2005/12/01 or later.
 %
 % This work has the LPPL maintenance status "maintained".
 %
-% This Current Maintainer of this work is Heiko Oberdiek.
+% The Current Maintainers of this work are
+% Heiko Oberdiek and the Oberdiek Package Support Group
+% https://github.com/ho-tex/oberdiek/issues
 %
 % The Base Interpreter refers to any `TeX-Format',
 % because some files are installed in TDS:tex/generic//.
@@ -106,15 +108,18 @@ This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either
 version 1.3c of this license or (at your option) any later
 version. This version of this license is in
-   http://www.latex-project.org/lppl/lppl-1-3c.txt
+   https://www.latex-project.org/lppl/lppl-1-3c.txt
 and the latest version of this license is in
-   http://www.latex-project.org/lppl.txt
+   https://www.latex-project.org/lppl.txt
 and version 1.3 or later is part of all distributions of
 LaTeX version 2005/12/01 or later.
 
 This work has the LPPL maintenance status "maintained".
 
-This Current Maintainer of this work is Heiko Oberdiek.
+The Current Maintainers of this work are
+Heiko Oberdiek and the Oberdiek Package Support Group
+https://github.com/ho-tex/oberdiek/issues
+
 
 The Base Interpreter refers to any `TeX-Format',
 because some files are installed in TDS:tex/generic//.
@@ -233,8 +238,7 @@ and the derived files
 % \title{The \xpackage{bigintcalc} package}
 % \date{2016/05/16 v1.4}
 % \author{Heiko Oberdiek\thanks
-% {Please report any issues at https://github.com/ho-tex/oberdiek/issues}\\
-% \xemail{heiko.oberdiek at googlemail.com}}
+% {Please report any issues at \url{https://github.com/ho-tex/oberdiek/issues}}}
 %
 % \maketitle
 %
@@ -4320,7 +4324,7 @@ $ \BIC@Temp 9{18\or27\or36\or45\or54\or63\or72\or81}%
 % \subsection{Download}
 %
 % \paragraph{Package.} This package is available on
-% CTAN\footnote{\url{http://ctan.org/pkg/bigintcalc}}:
+% CTAN\footnote{\CTANpkg{bigintcalc}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/bigintcalc.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/bigintcalc.pdf}] Documentation.
@@ -4332,7 +4336,7 @@ $ \BIC@Temp 9{18\or27\or36\or45\or54\or63\or72\or81}%
 % the packages are already unpacked and the documentation files
 % are generated. The files and directories obey the TDS standard.
 % \begin{description}
-% \item[\CTAN{install/macros/latex/contrib/oberdiek.tds.zip}]
+% \item[\CTANinstall{install/macros/latex/contrib/oberdiek.tds.zip}]
 % \end{description}
 % \emph{TDS} refers to the standard ``A Directory Structure
 % for \TeX\ Files'' (\CTAN{tds/tds.pdf}). Directories
@@ -4454,16 +4458,6 @@ $ \BIC@Temp 9{18\or27\or36\or45\or54\or63\or72\or81}%
 %
 % \subsection{Some details for the interested}
 %
-% \paragraph{Attached source.}
-%
-% The PDF documentation on CTAN also includes the
-% \xfile{.dtx} source file. It can be extracted by
-% AcrobatReader 6 or higher. Another option is \textsf{pdftk},
-% e.g. unpack the file into the current directory:
-% \begin{quote}
-%   \verb|pdftk bigintcalc.pdf unpack_files output .|
-% \end{quote}
-%
 % \paragraph{Unpacking with \LaTeX.}
 % The \xfile{.dtx} chooses its action depending on the format:
 % \begin{description}
@@ -4499,40 +4493,6 @@ $ \BIC@Temp 9{18\or27\or36\or45\or54\or63\or72\or81}%
 %\end{verbatim}
 % \end{quote}
 %
-% \section{Catalogue}
-%
-% The following XML file can be used as source for the
-% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
-% The elements \texttt{caption} and \texttt{description} are imported
-% from the original XML file from the Catalogue.
-% The name of the XML file in the Catalogue is \xfile{bigintcalc.xml}.
-%    \begin{macrocode}
-%<*catalogue>
-<?xml version='1.0' encoding='us-ascii'?>
-<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
-<entry datestamp='$Date$' modifier='$Author$' id='bigintcalc'>
-  <name>bigintcalc</name>
-  <caption>Integer calculations on very large numbers.</caption>
-  <authorref id='auth:oberdiek'/>
-  <copyright owner='Heiko Oberdiek' year='2007,2011,2012'/>
-  <license type='lppl1.3'/>
-  <version number='1.4'/>
-  <description>
-    This package provides expandable arithmetic operations
-    with big integers that can exceed TeX's number limits.
-    <p/>
-    The package is part of the <xref refid='oberdiek'>oberdiek</xref> bundle.
-  </description>
-  <documentation details='Package documentation'
-      href='ctan:/macros/latex/contrib/oberdiek/bigintcalc.pdf'/>
-  <ctan file='true' path='/macros/latex/contrib/oberdiek/bigintcalc.dtx'/>
-  <miktex location='oberdiek'/>
-  <texlive location='oberdiek'/>
-  <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
-</entry>
-%</catalogue>
-%    \end{macrocode}
-%
 % \begin{History}
 %   \begin{Version}{2007/09/27 v1.0}
 %   \item
diff --git a/macros/latex/contrib/oberdiek/bigintcalc.pdf b/macros/latex/contrib/oberdiek/bigintcalc.pdf
index 10b8f45399..9697f34014 100644
--- a/macros/latex/contrib/oberdiek/bigintcalc.pdf
+++ b/macros/latex/contrib/oberdiek/bigintcalc.pdf
diff --git a/macros/latex/contrib/oberdiek/bitset.dtx b/macros/latex/contrib/oberdiek/bitset.dtx
index 94da1534e7..cfb470b749 100644
--- a/macros/latex/contrib/oberdiek/bitset.dtx
+++ b/macros/latex/contrib/oberdiek/bitset.dtx
@@ -13,15 +13,17 @@
 % conditions of the LaTeX Project Public License, either
 % version 1.3c of this license or (at your option) any later
 % version. This version of this license is in
-%    http://www.latex-project.org/lppl/lppl-1-3c.txt
+%    https://www.latex-project.org/lppl/lppl-1-3c.txt
 % and the latest version of this license is in
-%    http://www.latex-project.org/lppl.txt
+%    https://www.latex-project.org/lppl.txt
 % and version 1.3 or later is part of all distributions of
 % LaTeX version 2005/12/01 or later.
 %
 % This work has the LPPL maintenance status "maintained".
 %
-% This Current Maintainer of this work is Heiko Oberdiek.
+% The Current Maintainers of this work are
+% Heiko Oberdiek and the Oberdiek Package Support Group
+% https://github.com/ho-tex/oberdiek/issues
 %
 % The Base Interpreter refers to any `TeX-Format',
 % because some files are installed in TDS:tex/generic//.
@@ -105,15 +107,18 @@ This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either
 version 1.3c of this license or (at your option) any later
 version. This version of this license is in
-   http://www.latex-project.org/lppl/lppl-1-3c.txt
+   https://www.latex-project.org/lppl/lppl-1-3c.txt
 and the latest version of this license is in
-   http://www.latex-project.org/lppl.txt
+   https://www.latex-project.org/lppl.txt
 and version 1.3 or later is part of all distributions of
 LaTeX version 2005/12/01 or later.
 
 This work has the LPPL maintenance status "maintained".
 
-This Current Maintainer of this work is Heiko Oberdiek.
+The Current Maintainers of this work are
+Heiko Oberdiek and the Oberdiek Package Support Group
+https://github.com/ho-tex/oberdiek/issues
+
 
 The Base Interpreter refers to any `TeX-Format',
 because some files are installed in TDS:tex/generic//.
@@ -203,8 +208,7 @@ and the derived files
 % \title{The \xpackage{bitset} package}
 % \date{2016/05/16 v1.2}
 % \author{Heiko Oberdiek\thanks
-% {Please report any issues at https://github.com/ho-tex/oberdiek/issues}\\
-% \xemail{heiko.oberdiek at googlemail.com}}
+% {Please report any issues at \url{https://github.com/ho-tex/oberdiek/issues}}}
 %
 % \maketitle
 %
@@ -4015,7 +4019,7 @@ and the derived files
 % \subsection{Download}
 %
 % \paragraph{Package.} This package is available on
-% CTAN\footnote{\url{http://ctan.org/pkg/bitset}}:
+% CTAN\footnote{\CTANpkg{bitset}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/bitset.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/bitset.pdf}] Documentation.
@@ -4027,7 +4031,7 @@ and the derived files
 % the packages are already unpacked and the documentation files
 % are generated. The files and directories obey the TDS standard.
 % \begin{description}
-% \item[\CTAN{install/macros/latex/contrib/oberdiek.tds.zip}]
+% \item[\CTANinstall{install/macros/latex/contrib/oberdiek.tds.zip}]
 % \end{description}
 % \emph{TDS} refers to the standard ``A Directory Structure
 % for \TeX\ Files'' (\CTAN{tds/tds.pdf}). Directories
@@ -4149,16 +4153,6 @@ and the derived files
 %
 % \subsection{Some details for the interested}
 %
-% \paragraph{Attached source.}
-%
-% The PDF documentation on CTAN also includes the
-% \xfile{.dtx} source file. It can be extracted by
-% AcrobatReader 6 or higher. Another option is \textsf{pdftk},
-% e.g. unpack the file into the current directory:
-% \begin{quote}
-%   \verb|pdftk bitset.pdf unpack_files output .|
-% \end{quote}
-%
 % \paragraph{Unpacking with \LaTeX.}
 % The \xfile{.dtx} chooses its action depending on the format:
 % \begin{description}
@@ -4194,41 +4188,6 @@ and the derived files
 %\end{verbatim}
 % \end{quote}
 %
-% \section{Catalogue}
-%
-% The following XML file can be used as source for the
-% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
-% The elements \texttt{caption} and \texttt{description} are imported
-% from the original XML file from the Catalogue.
-% The name of the XML file in the Catalogue is \xfile{bitset.xml}.
-%    \begin{macrocode}
-%<*catalogue>
-<?xml version='1.0' encoding='us-ascii'?>
-<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
-<entry datestamp='$Date$' modifier='$Author$' id='bitset'>
-  <name>bitset</name>
-  <caption>Handle bit-vector datatype.</caption>
-  <authorref id='auth:oberdiek'/>
-  <copyright owner='Heiko Oberdiek' year='2007,2011'/>
-  <license type='lppl1.3'/>
-  <version number='1.2'/>
-  <description>
-    This package defines and implements the data type bit set,
-    a vector of bits. The size of the vector may grow dynamically.
-    Individual bits can be manipulated.
-    <p/>
-    The package is part of the <xref refid='oberdiek'>oberdiek</xref> bundle.
-  </description>
-  <documentation details='Package documentation'
-      href='ctan:/macros/latex/contrib/oberdiek/bitset.pdf'/>
-  <ctan file='true' path='/macros/latex/contrib/oberdiek/bitset.dtx'/>
-  <miktex location='oberdiek'/>
-  <texlive location='oberdiek'/>
-  <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
-</entry>
-%</catalogue>
-%    \end{macrocode}
-%
 % \begin{History}
 %   \begin{Version}{2007/09/28 v1.0}
 %   \item
diff --git a/macros/latex/contrib/oberdiek/bitset.pdf b/macros/latex/contrib/oberdiek/bitset.pdf
index 82cfc5191d..9417a95cc0 100644
--- a/macros/latex/contrib/oberdiek/bitset.pdf
+++ b/macros/latex/contrib/oberdiek/bitset.pdf
diff --git a/macros/latex/contrib/oberdiek/bmpsize.dtx b/macros/latex/contrib/oberdiek/bmpsize.dtx
index ec2013277c..6dc71d1a25 100644
--- a/macros/latex/contrib/oberdiek/bmpsize.dtx
+++ b/macros/latex/contrib/oberdiek/bmpsize.dtx
@@ -13,15 +13,17 @@
 % conditions of the LaTeX Project Public License, either
 % version 1.3c of this license or (at your option) any later
 % version. This version of this license is in
-%    http://www.latex-project.org/lppl/lppl-1-3c.txt
+%    https://www.latex-project.org/lppl/lppl-1-3c.txt
 % and the latest version of this license is in
-%    http://www.latex-project.org/lppl.txt
+%    https://www.latex-project.org/lppl.txt
 % and version 1.3 or later is part of all distributions of
 % LaTeX version 2005/12/01 or later.
 %
 % This work has the LPPL maintenance status "maintained".
 %
-% This Current Maintainer of this work is Heiko Oberdiek.
+% The Current Maintainers of this work are
+% Heiko Oberdiek and the Oberdiek Package Support Group
+% https://github.com/ho-tex/oberdiek/issues
 %
 % This work consists of the main source file bmpsize.dtx
 % and the derived files
@@ -105,15 +107,18 @@ This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either
 version 1.3c of this license or (at your option) any later
 version. This version of this license is in
-   http://www.latex-project.org/lppl/lppl-1-3c.txt
+   https://www.latex-project.org/lppl/lppl-1-3c.txt
 and the latest version of this license is in
-   http://www.latex-project.org/lppl.txt
+   https://www.latex-project.org/lppl.txt
 and version 1.3 or later is part of all distributions of
 LaTeX version 2005/12/01 or later.
 
 This work has the LPPL maintenance status "maintained".
 
-This Current Maintainer of this work is Heiko Oberdiek.
+The Current Maintainers of this work are
+Heiko Oberdiek and the Oberdiek Package Support Group
+https://github.com/ho-tex/oberdiek/issues
+
 
 This work consists of the main source file bmpsize.dtx
 and the derived files
@@ -197,8 +202,7 @@ and the derived files
 % \title{The \xpackage{bmpsize} package}
 % \date{2016/05/16 v1.7}
 % \author{Heiko Oberdiek\thanks
-% {Please report any issues at https://github.com/ho-tex/oberdiek/issues}\\
-% \xemail{heiko.oberdiek at googlemail.com}}
+% {Please report any issues at \url{https://github.com/ho-tex/oberdiek/issues}}}
 %
 % \maketitle
 %
@@ -3742,7 +3746,7 @@ and the derived files
 % \subsection{Download}
 %
 % \paragraph{Package.} This package is available on
-% CTAN\footnote{\url{http://ctan.org/pkg/bmpsize}}:
+% CTAN\footnote{\CTANpkg{bmpsize}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/bmpsize.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/bmpsize.pdf}] Documentation.
@@ -3754,7 +3758,7 @@ and the derived files
 % the packages are already unpacked and the documentation files
 % are generated. The files and directories obey the TDS standard.
 % \begin{description}
-% \item[\CTAN{install/macros/latex/contrib/oberdiek.tds.zip}]
+% \item[\CTANinstall{install/macros/latex/contrib/oberdiek.tds.zip}]
 % \end{description}
 % \emph{TDS} refers to the standard ``A Directory Structure
 % for \TeX\ Files'' (\CTAN{tds/tds.pdf}). Directories
@@ -3878,16 +3882,6 @@ and the derived files
 %
 % \subsection{Some details for the interested}
 %
-% \paragraph{Attached source.}
-%
-% The PDF documentation on CTAN also includes the
-% \xfile{.dtx} source file. It can be extracted by
-% AcrobatReader 6 or higher. Another option is \textsf{pdftk},
-% e.g. unpack the file into the current directory:
-% \begin{quote}
-%   \verb|pdftk bmpsize.pdf unpack_files output .|
-% \end{quote}
-%
 % \paragraph{Unpacking with \LaTeX.}
 % The \xfile{.dtx} chooses its action depending on the format:
 % \begin{description}
@@ -3923,49 +3917,6 @@ and the derived files
 %\end{verbatim}
 % \end{quote}
 %
-% \section{Catalogue}
-%
-% The following XML file can be used as source for the
-% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
-% The elements \texttt{caption} and \texttt{description} are imported
-% from the original XML file from the Catalogue.
-% The name of the XML file in the Catalogue is \xfile{bmpsize.xml}.
-%    \begin{macrocode}
-%<*catalogue>
-<?xml version='1.0' encoding='us-ascii'?>
-<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
-<entry datestamp='$Date$' modifier='$Author$' id='bmpsize'>
-  <name>bmpsize</name>
-  <caption>Extract size and resolution data from bitmap files.</caption>
-  <authorref id='auth:oberdiek'/>
-  <copyright owner='Heiko Oberdiek' year='2006-2009'/>
-  <license type='lppl1.3'/>
-  <version number='1.7'/>
-  <description>
-    This package analyzes bitmap images to extract size and resolution
-    data.  It adds this feature to the graphics package so it is no
-    longer necessary to provide a separate bounding box files for
-    bitmap images.  dditionally the implementation for the inclusion
-    of bitmap images in some drivers of package
-    <xref refid='graphicx'>graphicx</xref> are rewritten to support
-    options viewport, trim and clip.  The package requires
-    <xref refid='pdftex'>pdfTeX</xref> version 1.30.0 or later (the
-    relevant pdfTeX primitive operates in both DVI and PDF output
-    modes).
-    <p/>
-    The package is part of the <xref refid='oberdiek'>oberdiek</xref>
-    bundle.
-  </description>
-  <documentation details='Package documentation'
-      href='ctan:/macros/latex/contrib/oberdiek/bmpsize.pdf'/>
-  <ctan file='true' path='/macros/latex/contrib/oberdiek/bmpsize.dtx'/>
-  <miktex location='oberdiek'/>
-  <texlive location='oberdiek'/>
-  <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
-</entry>
-%</catalogue>
-%    \end{macrocode}
-%
 % \begin{thebibliography}{9}
 % \bibitem{grfguide}
 %   D.\,P.\,Carlisle, The \LaTeX\ Project:
@@ -3977,58 +3928,57 @@ and the derived files
 %
 % \subsubsection{JPEG}
 % \begin{itemize}
-% \item \url{http://www.w3.org/Graphics/JPEG/jfif3.pdf}
+% \item \url{https://www.w3.org/Graphics/JPEG/jfif3.pdf}
 % \item \url{http://exif.org/Exif2-2.PDF}
 % \end{itemize}
 %
 % \subsubsection{PNG}
 % \begin{itemize}
-% \item \url{http://en.wikipedia.org/wiki/PNG}
-% \item \url{http://www.w3.org/TR/PNG/}
+% \item \url{https://en.wikipedia.org/wiki/PNG}
+% \item \url{https://www.w3.org/TR/PNG/}
 % \end{itemize}
 %
 % \subsubsection{GIF}
 % \begin{itemize}
-% \item \url{http://www.w3.org/Graphics/GIF/spec-gif89a.txt}
+% \item \url{https://www.w3.org/Graphics/GIF/spec-gif89a.txt}
 % \end{itemize}
 %
 % \subsubsection{BMP}
 % \begin{itemize}
-% \item \url{http://en.wikipedia.org/wiki/Windows_bitmap}
-% \item \url{http://de.wikipedia.org/wiki/Windows_bitmap}
-% \item \url{http://msdn.microsoft.com/en-us/library/ms532311.aspx}
-% \item \url{http://msdn.microsoft.com/en-us/library/ms532321.aspx}
+% \item \url{https://en.wikipedia.org/wiki/Windows_bitmap}
+% \item \url{https://docs.microsoft.com/en-us/windows/win32/gdi/bitmap-storage}
+% \item \url{https://docs.microsoft.com/en-us/windows/win32/api/wingdi/ns-wingdi-bitmapfileheader}
 % \end{itemize}
 %
 % \subsubsection{PCX}
 % \begin{itemize}
-% \item \url{http://en.wikipedia.org/wiki/PCX}
-% \item \url{http://de.wikipedia.org/wiki/PCX}
+% \item \url{https://en.wikipedia.org/wiki/PCX}
+% \item \url{https://de.wikipedia.org/wiki/PCX}
 % \item \url{http://www.qzx.com/pc-gpe/pcx.txt}
 % \end{itemize}
 %
 % \subsubsection{MSP}
 % \begin{itemize}
-% \item \url{http://en.wikipedia.org/wiki/Microsoft_Paint}
+% \item \url{https://en.wikipedia.org/wiki/Microsoft_Paint}
 % \item Sources of \xpackage{dvips}.
 % \end{itemize}
 %
 % \subsubsection{TIFF}
 % \begin{itemize}
-% \item \url{http://en.wikipedia.org/wiki/TIFF}
-% \item \url{http://partners.adobe.com/public/developer/en/tiff/TIFF6.pdf}
+% \item \url{https://en.wikipedia.org/wiki/TIFF}
+% \item \url{https://www.adobe.io/content/dam/udp/en/open/standards/tiff/TIFF6.pdf}
 % \end{itemize}
 %
 % \subsubsection{TGA}
 % \begin{itemize}
-% \item \url{http://de.wikipedia.org/wiki/Targa_Image_File}
-% \item \url{http://en.wikipedia.org/wiki/Truevision_TGA}
+% \item \url{https://de.wikipedia.org/wiki/Targa_Image_File}
+% \item \url{https://en.wikipedia.org/wiki/Truevision_TGA}
 % \item \url{http://www.dca.fee.unicamp.br/~martino/disciplinas/ea978/tgaffs.pdf}
 % \end{itemize}
 %
 % \subsubsection{SGI}
 % \begin{itemize}
-% \item \url{http://en.wikipedia.org/wiki/Silicon_Graphics_Image}
+% \item \url{https://en.wikipedia.org/wiki/Silicon_Graphics_Image}
 % \item \url{ftp://ftp.sgi.com/graphics/SGIIMAGESPEC}
 % \end{itemize}
 %
@@ -4039,8 +3989,8 @@ and the derived files
 %
 % \subsubsection{XPM}
 % \begin{itemize}
-% \item \url{http://en.wikipedia.org/wiki/XPM_%28image_format%29}
-% \item \url{http://de.wikipedia.org/wiki/Xpm}
+% \item \url{https://en.wikipedia.org/wiki/XPM_%28image_format%29}
+% \item \url{https://de.wikipedia.org/wiki/Xpm}
 % \item \url{http://koala.ilog.fr/ftp/pub/xpm/xpm-README.html}
 % \end{itemize}
 %
diff --git a/macros/latex/contrib/oberdiek/bmpsize.pdf b/macros/latex/contrib/oberdiek/bmpsize.pdf
index 77166ad1cf..9f4ba7a9b4 100644
--- a/macros/latex/contrib/oberdiek/bmpsize.pdf
+++ b/macros/latex/contrib/oberdiek/bmpsize.pdf
diff --git a/macros/latex/contrib/oberdiek/bookmark.dtx b/macros/latex/contrib/oberdiek/bookmark.dtx
index 72c6b0d3eb..021ff10c4d 100644
--- a/macros/latex/contrib/oberdiek/bookmark.dtx
+++ b/macros/latex/contrib/oberdiek/bookmark.dtx
@@ -13,15 +13,17 @@
 % conditions of the LaTeX Project Public License, either
 % version 1.3c of this license or (at your option) any later
 % version. This version of this license is in
-%    http://www.latex-project.org/lppl/lppl-1-3c.txt
+%    https://www.latex-project.org/lppl/lppl-1-3c.txt
 % and the latest version of this license is in
-%    http://www.latex-project.org/lppl.txt
+%    https://www.latex-project.org/lppl.txt
 % and version 1.3 or later is part of all distributions of
 % LaTeX version 2005/12/01 or later.
 %
 % This work has the LPPL maintenance status "maintained".
 %
-% This Current Maintainer of this work is Heiko Oberdiek.
+% The Current Maintainers of this work are
+% Heiko Oberdiek and the Oberdiek Package Support Group
+% https://github.com/ho-tex/oberdiek/issues
 %
 % This work consists of the main source file bookmark.dtx
 % and the derived files
@@ -108,15 +110,18 @@ This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either
 version 1.3c of this license or (at your option) any later
 version. This version of this license is in
-   http://www.latex-project.org/lppl/lppl-1-3c.txt
+   https://www.latex-project.org/lppl/lppl-1-3c.txt
 and the latest version of this license is in
-   http://www.latex-project.org/lppl.txt
+   https://www.latex-project.org/lppl.txt
 and version 1.3 or later is part of all distributions of
 LaTeX version 2005/12/01 or later.
 
 This work has the LPPL maintenance status "maintained".
 
-This Current Maintainer of this work is Heiko Oberdiek.
+The Current Maintainers of this work are
+Heiko Oberdiek and the Oberdiek Package Support Group
+https://github.com/ho-tex/oberdiek/issues
+
 
 This work consists of the main source file bookmark.dtx
 and the derived files
@@ -204,8 +209,7 @@ and the derived files
 % \title{The \xpackage{bookmark} package}
 % \date{2019/06/04 v1.27}
 % \author{Heiko Oberdiek\thanks
-% {Please report any issues at https://github.com/ho-tex/oberdiek/issues}\\
-% \xemail{heiko.oberdiek at googlemail.com}}
+% {Please report any issues at \url{https://github.com/ho-tex/oberdiek/issues}}}
 %
 % \maketitle
 %
@@ -3079,7 +3083,7 @@ and the derived files
 % \subsection{Download}
 %
 % \paragraph{Package.} This package is available on
-% CTAN\footnote{\url{http://ctan.org/pkg/bookmark}}:
+% CTAN\footnote{\CTANpkg{bookmark}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/bookmark.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/bookmark.pdf}] Documentation.
@@ -3091,7 +3095,7 @@ and the derived files
 % the packages are already unpacked and the documentation files
 % are generated. The files and directories obey the TDS standard.
 % \begin{description}
-% \item[\CTAN{install/macros/latex/contrib/oberdiek.tds.zip}]
+% \item[\CTANinstall{install/macros/latex/contrib/oberdiek.tds.zip}]
 % \end{description}
 % \emph{TDS} refers to the standard ``A Directory Structure
 % for \TeX\ Files'' (\CTAN{tds/tds.pdf}). Directories
@@ -3217,16 +3221,6 @@ and the derived files
 %
 % \subsection{Some details for the interested}
 %
-% \paragraph{Attached source.}
-%
-% The PDF documentation on CTAN also includes the
-% \xfile{.dtx} source file. It can be extracted by
-% AcrobatReader 6 or higher. Another option is \textsf{pdftk},
-% e.g. unpack the file into the current directory:
-% \begin{quote}
-%   \verb|pdftk bookmark.pdf unpack_files output .|
-% \end{quote}
-%
 % \paragraph{Unpacking with \LaTeX.}
 % The \xfile{.dtx} chooses its action depending on the format:
 % \begin{description}
@@ -3262,58 +3256,19 @@ and the derived files
 %\end{verbatim}
 % \end{quote}
 %
-% \section{Catalogue}
-%
-% The following XML file can be used as source for the
-% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
-% The elements \texttt{caption} and \texttt{description} are imported
-% from the original XML file from the Catalogue.
-% The name of the XML file in the Catalogue is \xfile{bookmark.xml}.
-%    \begin{macrocode}
-%<*catalogue>
-<?xml version='1.0' encoding='us-ascii'?>
-<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
-<entry datestamp='$Date$' modifier='$Author$' id='bookmark'>
-  <name>bookmark</name>
-  <caption>A new bookmark (outline) organization for hyperref.</caption>
-  <authorref id='auth:oberdiek'/>
-  <copyright owner='Heiko Oberdiek' year='2007-2011'/>
-  <license type='lppl1.3'/>
-  <version number='1.26'/>
-  <description>
-    This package implements a new bookmark (outline) organization for
-    package <xref refid='hyperref'>hyperref</xref>. Bookmark properties such
-    as style and color can now be set. Other action types
-    are available (URI, GoToR, Named). The bookmarks are
-    generated in the first compile run. Package
-    <xref refid='hyperref'>hyperref</xref> uses two runs.
-    <p/>
-    The package is part of the <xref refid='oberdiek'>oberdiek</xref>
-    bundle.
-  </description>
-  <documentation details='Package documentation'
-      href='ctan:/macros/latex/contrib/oberdiek/bookmark.pdf'/>
-  <ctan file='true' path='/macros/latex/contrib/oberdiek/bookmark.dtx'/>
-  <miktex location='oberdiek'/>
-  <texlive location='oberdiek'/>
-  <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
-</entry>
-%</catalogue>
-%    \end{macrocode}
-%
 % \begin{thebibliography}{9}
 %
 % \bibitem{hyperref}
 %   Sebastian Rahtz, Heiko Oberdiek:
 %   \textit{The \xpackage{hyperref} package};
 %   2011/04/17 v6.82g;
-%   \CTAN{macros/latex/contrib/hyperref/}
+%   \CTANpkg{hyperref}
 %
 % \bibitem{currfile}
 %   Martin Scharrer:
 %   \textit{The \xpackage{currfile} package};
 %   2011/01/09 v0.4.
-%   \CTAN{macros/latex/contrib/currfile/}
+%   \CTANpkg{currfile}
 %
 % \end{thebibliography}
 %
diff --git a/macros/latex/contrib/oberdiek/bookmark.pdf b/macros/latex/contrib/oberdiek/bookmark.pdf
index 568903c084..39d08ee548 100644
--- a/macros/latex/contrib/oberdiek/bookmark.pdf
+++ b/macros/latex/contrib/oberdiek/bookmark.pdf
diff --git a/macros/latex/contrib/oberdiek/catchfile.dtx b/macros/latex/contrib/oberdiek/catchfile.dtx
index 5ab4124acb..86bbfc2d83 100644
--- a/macros/latex/contrib/oberdiek/catchfile.dtx
+++ b/macros/latex/contrib/oberdiek/catchfile.dtx
@@ -13,15 +13,17 @@
 % conditions of the LaTeX Project Public License, either
 % version 1.3c of this license or (at your option) any later
 % version. This version of this license is in
-%    http://www.latex-project.org/lppl/lppl-1-3c.txt
+%    https://www.latex-project.org/lppl/lppl-1-3c.txt
 % and the latest version of this license is in
-%    http://www.latex-project.org/lppl.txt
+%    https://www.latex-project.org/lppl.txt
 % and version 1.3 or later is part of all distributions of
 % LaTeX version 2005/12/01 or later.
 %
 % This work has the LPPL maintenance status "maintained".
 %
-% This Current Maintainer of this work is Heiko Oberdiek.
+% The Current Maintainers of this work are
+% Heiko Oberdiek and the Oberdiek Package Support Group
+% https://github.com/ho-tex/oberdiek/issues
 %
 % The Base Interpreter refers to any `TeX-Format',
 % because some files are installed in TDS:tex/generic//.
@@ -106,15 +108,18 @@ This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either
 version 1.3c of this license or (at your option) any later
 version. This version of this license is in
-   http://www.latex-project.org/lppl/lppl-1-3c.txt
+   https://www.latex-project.org/lppl/lppl-1-3c.txt
 and the latest version of this license is in
-   http://www.latex-project.org/lppl.txt
+   https://www.latex-project.org/lppl.txt
 and version 1.3 or later is part of all distributions of
 LaTeX version 2005/12/01 or later.
 
 This work has the LPPL maintenance status "maintained".
 
-This Current Maintainer of this work is Heiko Oberdiek.
+The Current Maintainers of this work are
+Heiko Oberdiek and the Oberdiek Package Support Group
+https://github.com/ho-tex/oberdiek/issues
+
 
 The Base Interpreter refers to any `TeX-Format',
 because some files are installed in TDS:tex/generic//.
@@ -198,8 +203,7 @@ and the derived files
 % \title{The \xpackage{catchfile} package}
 % \date{2016/05/16 v1.7}
 % \author{Heiko Oberdiek\thanks
-% {Please report any issues at https://github.com/ho-tex/oberdiek/issues}\\
-% \xemail{heiko.oberdiek at googlemail.com}}
+% {Please report any issues at \url{https://github.com/ho-tex/oberdiek/issues}}}
 %
 % \maketitle
 %
@@ -890,7 +894,7 @@ and the derived files
 % \subsection{Download}
 %
 % \paragraph{Package.} This package is available on
-% CTAN\footnote{\url{http://ctan.org/pkg/catchfile}}:
+% CTAN\footnote{\CTANpkg{catchfile}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/catchfile.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/catchfile.pdf}] Documentation.
@@ -902,7 +906,7 @@ and the derived files
 % the packages are already unpacked and the documentation files
 % are generated. The files and directories obey the TDS standard.
 % \begin{description}
-% \item[\CTAN{install/macros/latex/contrib/oberdiek.tds.zip}]
+% \item[\CTANinstall{install/macros/latex/contrib/oberdiek.tds.zip}]
 % \end{description}
 % \emph{TDS} refers to the standard ``A Directory Structure
 % for \TeX\ Files'' (\CTAN{tds/tds.pdf}). Directories
@@ -1024,16 +1028,6 @@ and the derived files
 %
 % \subsection{Some details for the interested}
 %
-% \paragraph{Attached source.}
-%
-% The PDF documentation on CTAN also includes the
-% \xfile{.dtx} source file. It can be extracted by
-% AcrobatReader 6 or higher. Another option is \textsf{pdftk},
-% e.g. unpack the file into the current directory:
-% \begin{quote}
-%   \verb|pdftk catchfile.pdf unpack_files output .|
-% \end{quote}
-%
 % \paragraph{Unpacking with \LaTeX.}
 % The \xfile{.dtx} chooses its action depending on the format:
 % \begin{description}
@@ -1069,43 +1063,6 @@ and the derived files
 %\end{verbatim}
 % \end{quote}
 %
-% \section{Catalogue}
-%
-% The following XML file can be used as source for the
-% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
-% The elements \texttt{caption} and \texttt{description} are imported
-% from the original XML file from the Catalogue.
-% The name of the XML file in the Catalogue is \xfile{catchfile.xml}.
-%    \begin{macrocode}
-%<*catalogue>
-<?xml version='1.0' encoding='us-ascii'?>
-<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
-<entry datestamp='$Date$' modifier='$Author$' id='catchfile'>
-  <name>catchfile</name>
-  <caption>Catch an external file into a macro.</caption>
-  <authorref id='auth:oberdiek'/>
-  <copyright owner='Heiko Oberdiek' year='2007,2010,2011'/>
-  <license type='lppl1.3'/>
-  <version number='1.7'/>
-  <description>
-    This package catches the contents of a file and puts it in a macro.
-    It requires <xref refid='etex'>e-TeX</xref>. Both
-    <xref refid='latex'>LaTeX</xref> and
-    <xref refid='plain'>plain TeX</xref> are supported.
-    <p/>
-    The package is part of the <xref refid='oberdiek'>oberdiek</xref>
-    bundle.
-  </description>
-  <documentation details='Package documentation'
-      href='ctan:/macros/latex/contrib/oberdiek/catchfile.pdf'/>
-  <ctan file='true' path='/macros/latex/contrib/oberdiek/catchfile.dtx'/>
-  <miktex location='oberdiek'/>
-  <texlive location='oberdiek'/>
-  <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
-</entry>
-%</catalogue>
-%    \end{macrocode}
-%
 % \begin{History}
 %   \begin{Version}{2007/05/30 v1.0}
 %   \item
diff --git a/macros/latex/contrib/oberdiek/catchfile.pdf b/macros/latex/contrib/oberdiek/catchfile.pdf
index 063ab4df97..83906d4a7e 100644
--- a/macros/latex/contrib/oberdiek/catchfile.pdf
+++ b/macros/latex/contrib/oberdiek/catchfile.pdf
diff --git a/macros/latex/contrib/oberdiek/centernot.dtx b/macros/latex/contrib/oberdiek/centernot.dtx
index 833ec9e034..44cefabee2 100644
--- a/macros/latex/contrib/oberdiek/centernot.dtx
+++ b/macros/latex/contrib/oberdiek/centernot.dtx
@@ -13,15 +13,17 @@
 % conditions of the LaTeX Project Public License, either
 % version 1.3c of this license or (at your option) any later
 % version. This version of this license is in
-%    http://www.latex-project.org/lppl/lppl-1-3c.txt
+%    https://www.latex-project.org/lppl/lppl-1-3c.txt
 % and the latest version of this license is in
-%    http://www.latex-project.org/lppl.txt
+%    https://www.latex-project.org/lppl.txt
 % and version 1.3 or later is part of all distributions of
 % LaTeX version 2005/12/01 or later.
 %
 % This work has the LPPL maintenance status "maintained".
 %
-% This Current Maintainer of this work is Heiko Oberdiek.
+% The Current Maintainers of this work are
+% Heiko Oberdiek and the Oberdiek Package Support Group
+% https://github.com/ho-tex/oberdiek/issues
 %
 % This work consists of the main source file centernot.dtx
 % and the derived files
@@ -98,15 +100,18 @@ This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either
 version 1.3c of this license or (at your option) any later
 version. This version of this license is in
-   http://www.latex-project.org/lppl/lppl-1-3c.txt
+   https://www.latex-project.org/lppl/lppl-1-3c.txt
 and the latest version of this license is in
-   http://www.latex-project.org/lppl.txt
+   https://www.latex-project.org/lppl.txt
 and version 1.3 or later is part of all distributions of
 LaTeX version 2005/12/01 or later.
 
 This work has the LPPL maintenance status "maintained".
 
-This Current Maintainer of this work is Heiko Oberdiek.
+The Current Maintainers of this work are
+Heiko Oberdiek and the Oberdiek Package Support Group
+https://github.com/ho-tex/oberdiek/issues
+
 
 This work consists of the main source file centernot.dtx
 and the derived files
@@ -196,8 +201,7 @@ and the derived files
 % \title{The \xpackage{centernot} package}
 % \date{2016/05/16 v1.4}
 % \author{Heiko Oberdiek\thanks
-% {Please report any issues at https://github.com/ho-tex/oberdiek/issues}\\
-% \xemail{heiko.oberdiek at googlemail.com}}
+% {Please report any issues at \url{https://github.com/ho-tex/oberdiek/issues}}}
 %
 % \maketitle
 %
@@ -330,7 +334,7 @@ and the derived files
 % \subsection{Download}
 %
 % \paragraph{Package.} This package is available on
-% CTAN\footnote{\url{http://ctan.org/pkg/centernot}}:
+% CTAN\footnote{\CTANpkg{centernot}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/centernot.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/centernot.pdf}] Documentation.
@@ -342,7 +346,7 @@ and the derived files
 % the packages are already unpacked and the documentation files
 % are generated. The files and directories obey the TDS standard.
 % \begin{description}
-% \item[\CTAN{install/macros/latex/contrib/oberdiek.tds.zip}]
+% \item[\CTANinstall{install/macros/latex/contrib/oberdiek.tds.zip}]
 % \end{description}
 % \emph{TDS} refers to the standard ``A Directory Structure
 % for \TeX\ Files'' (\CTAN{tds/tds.pdf}). Directories
@@ -461,16 +465,6 @@ and the derived files
 %
 % \subsection{Some details for the interested}
 %
-% \paragraph{Attached source.}
-%
-% The PDF documentation on CTAN also includes the
-% \xfile{.dtx} source file. It can be extracted by
-% AcrobatReader 6 or higher. Another option is \textsf{pdftk},
-% e.g. unpack the file into the current directory:
-% \begin{quote}
-%   \verb|pdftk centernot.pdf unpack_files output .|
-% \end{quote}
-%
 % \paragraph{Unpacking with \LaTeX.}
 % The \xfile{.dtx} chooses its action depending on the format:
 % \begin{description}
@@ -506,42 +500,6 @@ and the derived files
 %\end{verbatim}
 % \end{quote}
 %
-% \section{Catalogue}
-%
-% The following XML file can be used as source for the
-% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
-% The elements \texttt{caption} and \texttt{description} are imported
-% from the original XML file from the Catalogue.
-% The name of the XML file in the Catalogue is \xfile{centernot.xml}.
-%    \begin{macrocode}
-%<*catalogue>
-<?xml version='1.0' encoding='us-ascii'?>
-<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
-<entry datestamp='$Date$' modifier='$Author$' id='centernot'>
-  <name>centernot</name>
-  <caption>Centred \not command.</caption>
-  <authorref id='auth:oberdiek'/>
-  <copyright owner='Heiko Oberdiek' year='2006,2007,2010,2011'/>
-  <license type='lppl1.3'/>
-  <version number='1.4'/>
-  <description>
-    The package provides <tt>\centernot</tt> that prints the symbol
-    <tt>\not</tt> on the following argument.  Unlike the default
-    <tt>\not</tt> command, the symbol is horizontally centered.
-    <p/>
-    The package is part of the <xref refid='oberdiek'>oberdiek</xref>
-    bundle.
-  </description>
-  <documentation details='Package documentation'
-      href='ctan:/macros/latex/contrib/oberdiek/centernot.pdf'/>
-  <ctan file='true' path='/macros/latex/contrib/oberdiek/centernot.dtx'/>
-  <miktex location='oberdiek'/>
-  <texlive location='oberdiek'/>
-  <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
-</entry>
-%</catalogue>
-%    \end{macrocode}
-%
 % \begin{History}
 %   \begin{Version}{2006/12/02 v1.0}
 %   \item
diff --git a/macros/latex/contrib/oberdiek/centernot.pdf b/macros/latex/contrib/oberdiek/centernot.pdf
index 02379c4dc3..02f00e47c7 100644
--- a/macros/latex/contrib/oberdiek/centernot.pdf
+++ b/macros/latex/contrib/oberdiek/centernot.pdf
diff --git a/macros/latex/contrib/oberdiek/chemarr.dtx b/macros/latex/contrib/oberdiek/chemarr.dtx
index e6528a10a4..13f584a7b8 100644
--- a/macros/latex/contrib/oberdiek/chemarr.dtx
+++ b/macros/latex/contrib/oberdiek/chemarr.dtx
@@ -13,15 +13,17 @@
 % conditions of the LaTeX Project Public License, either
 % version 1.3c of this license or (at your option) any later
 % version. This version of this license is in
-%    http://www.latex-project.org/lppl/lppl-1-3c.txt
+%    https://www.latex-project.org/lppl/lppl-1-3c.txt
 % and the latest version of this license is in
-%    http://www.latex-project.org/lppl.txt
+%    https://www.latex-project.org/lppl.txt
 % and version 1.3 or later is part of all distributions of
 % LaTeX version 2005/12/01 or later.
 %
 % This work has the LPPL maintenance status "maintained".
 %
-% This Current Maintainer of this work is Heiko Oberdiek.
+% The Current Maintainers of this work are
+% Heiko Oberdiek and the Oberdiek Package Support Group
+% https://github.com/ho-tex/oberdiek/issues
 %
 % This work consists of the main source file chemarr.dtx
 % and the derived files
@@ -100,15 +102,18 @@ This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either
 version 1.3c of this license or (at your option) any later
 version. This version of this license is in
-   http://www.latex-project.org/lppl/lppl-1-3c.txt
+   https://www.latex-project.org/lppl/lppl-1-3c.txt
 and the latest version of this license is in
-   http://www.latex-project.org/lppl.txt
+   https://www.latex-project.org/lppl.txt
 and version 1.3 or later is part of all distributions of
 LaTeX version 2005/12/01 or later.
 
 This work has the LPPL maintenance status "maintained".
 
-This Current Maintainer of this work is Heiko Oberdiek.
+The Current Maintainers of this work are
+Heiko Oberdiek and the Oberdiek Package Support Group
+https://github.com/ho-tex/oberdiek/issues
+
 
 This work consists of the main source file chemarr.dtx
 and the derived files
@@ -187,8 +192,7 @@ and the derived files
 % \title{The \xpackage{chemarr} package}
 % \date{2016/05/16 v1.3}
 % \author{Heiko Oberdiek\thanks
-% {Please report any issues at https://github.com/ho-tex/oberdiek/issues}\\
-% \xemail{heiko.oberdiek at googlemail.com}}
+% {Please report any issues at \url{https://github.com/ho-tex/oberdiek/issues}}}
 %
 % \maketitle
 %
@@ -325,7 +329,7 @@ and the derived files
 % \subsection{Download}
 %
 % \paragraph{Package.} This package is available on
-% CTAN\footnote{\url{http://ctan.org/pkg/chemarr}}:
+% CTAN\footnote{\CTANpkg{chemarr}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/chemarr.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/chemarr.pdf}] Documentation.
@@ -337,7 +341,7 @@ and the derived files
 % the packages are already unpacked and the documentation files
 % are generated. The files and directories obey the TDS standard.
 % \begin{description}
-% \item[\CTAN{install/macros/latex/contrib/oberdiek.tds.zip}]
+% \item[\CTANinstall{install/macros/latex/contrib/oberdiek.tds.zip}]
 % \end{description}
 % \emph{TDS} refers to the standard ``A Directory Structure
 % for \TeX\ Files'' (\CTAN{tds/tds.pdf}). Directories
@@ -457,16 +461,6 @@ and the derived files
 %
 % \subsection{Some details for the interested}
 %
-% \paragraph{Attached source.}
-%
-% The PDF documentation on CTAN also includes the
-% \xfile{.dtx} source file. It can be extracted by
-% AcrobatReader 6 or higher. Another option is \textsf{pdftk},
-% e.g. unpack the file into the current directory:
-% \begin{quote}
-%   \verb|pdftk chemarr.pdf unpack_files output .|
-% \end{quote}
-%
 % \paragraph{Unpacking with \LaTeX.}
 % The \xfile{.dtx} chooses its action depending on the format:
 % \begin{description}
@@ -502,46 +496,6 @@ and the derived files
 %\end{verbatim}
 % \end{quote}
 %
-% \section{Catalogue}
-%
-% The following XML file can be used as source for the
-% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
-% The elements \texttt{caption} and \texttt{description} are imported
-% from the original XML file from the Catalogue.
-% The name of the XML file in the Catalogue is \xfile{chemarr.xml}.
-%    \begin{macrocode}
-%<*catalogue>
-<?xml version='1.0' encoding='us-ascii'?>
-<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
-<entry datestamp='$Date$' modifier='$Author$' id='chemarr'>
-  <name>chemarr</name>
-  <caption>Arrows for chemists.</caption>
-  <authorref id='auth:oberdiek'/>
-  <copyright owner='Heiko Oberdiek' year='2001,2006'/>
-  <license type='lppl1.3'/>
-  <version number='1.3'/>
-  <description>
-    Very often chemists need a longer version of reaction arrows
-    (<tt>\rightleftharpoons</tt>) with the possibility to put text
-    above and below.  Analogous to <xref refid='amsmath'>amsmath</xref>'s
-    <tt>\xrightarrow</tt> and <tt>\xleftarrow</tt> this package
-    provides the macro <tt>\xrightleftharpoons</tt>.  The package
-    requires amsmath.  To use it, <tt>\usepackage{chemarr}</tt>,
-    then <tt>\xrightleftharpoons[below]{above}</tt> .
-    <p/>
-    The package is part of the <xref refid='oberdiek'>oberdiek</xref>
-    bundle.
-  </description>
-  <documentation details='Package documentation'
-      href='ctan:/macros/latex/contrib/oberdiek/chemarr.pdf'/>
-  <ctan file='true' path='/macros/latex/contrib/oberdiek/chemarr.dtx'/>
-  <miktex location='oberdiek'/>
-  <texlive location='oberdiek'/>
-  <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
-</entry>
-%</catalogue>
-%    \end{macrocode}
-%
 % \begin{History}
 %   \begin{Version}{2001/06/21 v1.0}
 %   \item
diff --git a/macros/latex/contrib/oberdiek/chemarr.pdf b/macros/latex/contrib/oberdiek/chemarr.pdf
index 55fbe417d4..fd5924f8e2 100644
--- a/macros/latex/contrib/oberdiek/chemarr.pdf
+++ b/macros/latex/contrib/oberdiek/chemarr.pdf
diff --git a/macros/latex/contrib/oberdiek/classlist.dtx b/macros/latex/contrib/oberdiek/classlist.dtx
index f5e9506d3c..cc2e65b46b 100644
--- a/macros/latex/contrib/oberdiek/classlist.dtx
+++ b/macros/latex/contrib/oberdiek/classlist.dtx
@@ -13,15 +13,17 @@
 % conditions of the LaTeX Project Public License, either
 % version 1.3c of this license or (at your option) any later
 % version. This version of this license is in
-%    http://www.latex-project.org/lppl/lppl-1-3c.txt
+%    https://www.latex-project.org/lppl/lppl-1-3c.txt
 % and the latest version of this license is in
-%    http://www.latex-project.org/lppl.txt
+%    https://www.latex-project.org/lppl.txt
 % and version 1.3 or later is part of all distributions of
 % LaTeX version 2005/12/01 or later.
 %
 % This work has the LPPL maintenance status "maintained".
 %
-% This Current Maintainer of this work is Heiko Oberdiek.
+% The Current Maintainers of this work are
+% Heiko Oberdiek and the Oberdiek Package Support Group
+% https://github.com/ho-tex/oberdiek/issues
 %
 % This work consists of the main source file classlist.dtx
 % and the derived files
@@ -98,15 +100,18 @@ This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either
 version 1.3c of this license or (at your option) any later
 version. This version of this license is in
-   http://www.latex-project.org/lppl/lppl-1-3c.txt
+   https://www.latex-project.org/lppl/lppl-1-3c.txt
 and the latest version of this license is in
-   http://www.latex-project.org/lppl.txt
+   https://www.latex-project.org/lppl.txt
 and version 1.3 or later is part of all distributions of
 LaTeX version 2005/12/01 or later.
 
 This work has the LPPL maintenance status "maintained".
 
-This Current Maintainer of this work is Heiko Oberdiek.
+The Current Maintainers of this work are
+Heiko Oberdiek and the Oberdiek Package Support Group
+https://github.com/ho-tex/oberdiek/issues
+
 
 This work consists of the main source file classlist.dtx
 and the derived files
@@ -181,8 +186,7 @@ and the derived files
 % \title{The \xpackage{classlist} package}
 % \date{2016/05/16 v1.5}
 % \author{Heiko Oberdiek\thanks
-% {Please report any issues at https://github.com/ho-tex/oberdiek/issues}\\
-% \xemail{heiko.oberdiek at googlemail.com}}
+% {Please report any issues at \url{https://github.com/ho-tex/oberdiek/issues}}}
 %
 % \maketitle
 %
@@ -414,7 +418,7 @@ and the derived files
 % \subsection{Download}
 %
 % \paragraph{Package.} This package is available on
-% CTAN\footnote{\url{http://ctan.org/pkg/classlist}}:
+% CTAN\footnote{\CTANpkg{classlist}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/classlist.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/classlist.pdf}] Documentation.
@@ -426,7 +430,7 @@ and the derived files
 % the packages are already unpacked and the documentation files
 % are generated. The files and directories obey the TDS standard.
 % \begin{description}
-% \item[\CTAN{install/macros/latex/contrib/oberdiek.tds.zip}]
+% \item[\CTANinstall{install/macros/latex/contrib/oberdiek.tds.zip}]
 % \end{description}
 % \emph{TDS} refers to the standard ``A Directory Structure
 % for \TeX\ Files'' (\CTAN{tds/tds.pdf}). Directories
@@ -545,16 +549,6 @@ and the derived files
 %
 % \subsection{Some details for the interested}
 %
-% \paragraph{Attached source.}
-%
-% The PDF documentation on CTAN also includes the
-% \xfile{.dtx} source file. It can be extracted by
-% AcrobatReader 6 or higher. Another option is \textsf{pdftk},
-% e.g. unpack the file into the current directory:
-% \begin{quote}
-%   \verb|pdftk classlist.pdf unpack_files output .|
-% \end{quote}
-%
 % \paragraph{Unpacking with \LaTeX.}
 % The \xfile{.dtx} chooses its action depending on the format:
 % \begin{description}
@@ -590,56 +584,12 @@ and the derived files
 %\end{verbatim}
 % \end{quote}
 %
-% \section{Catalogue}
-%
-% The following XML file can be used as source for the
-% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
-% The elements \texttt{caption} and \texttt{description} are imported
-% from the original XML file from the Catalogue.
-% The name of the XML file in the Catalogue is \xfile{classlist.xml}.
-%    \begin{macrocode}
-%<*catalogue>
-<?xml version='1.0' encoding='us-ascii'?>
-<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
-<entry datestamp='$Date$' modifier='$Author$' id='classlist'>
-  <name>classlist</name>
-  <caption>Record classes used in a document.</caption>
-  <authorref id='auth:oberdiek'/>
-  <copyright owner='Heiko Oberdiek' year='2005,2006,2008,2011'/>
-  <license type='lppl1.3'/>
-  <version number='1.5'/>
-  <description>
-    Load this package before \documentclass:
-    <p/>
-    &nbsp;&nbsp;<tt>\RequirePackage{classlist}</tt><br/>
-    &nbsp;&nbsp;<tt>\documentclass[some,options]{whatever}</tt>
-    <p/>
-    After doing this, <tt>\MainClass</tt> contains the name of the
-    first loaded class, <tt>\ClassList</tt> contains a set of triples
-    &lt;class name&gt;, &lt;options directly requested&gt;, and
-    &lt;version requested&gt;.  (The package may also be loaded after
-    <tt>\documentclass</tt>, in which case some information is not
-    available.)
-    <p/>
-    The package is part of the <xref refid='oberdiek'>oberdiek</xref>
-    bundle.
-  </description>
-  <documentation details='Package documentation'
-      href='ctan:/macros/latex/contrib/oberdiek/classlist.pdf'/>
-  <ctan file='true' path='/macros/latex/contrib/oberdiek/classlist.dtx'/>
-  <miktex location='oberdiek'/>
-  <texlive location='oberdiek'/>
-  <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
-</entry>
-%</catalogue>
-%    \end{macrocode}
-%
 % \begin{History}
 %   \begin{Version}{2005/06/19 v1.0}
 %   \item
 %     First published version: CTAN and newsgroup \xnewsgroup{comp.text.tex}:
 %     \URL{``\link{Re: Finding the Document Class}''}^^A
-%     {http://groups.google.com/group/comp.text.tex/msg/8ee9523c2dc13666}
+%     {https://groups.google.com/group/comp.text.tex/msg/8ee9523c2dc13666}
 %   \end{Version}
 %   \begin{Version}{2005/06/19 v1.1}
 %   \item
diff --git a/macros/latex/contrib/oberdiek/classlist.pdf b/macros/latex/contrib/oberdiek/classlist.pdf
index b779543867..1f1510104f 100644
--- a/macros/latex/contrib/oberdiek/classlist.pdf
+++ b/macros/latex/contrib/oberdiek/classlist.pdf
diff --git a/macros/latex/contrib/oberdiek/colonequals.dtx b/macros/latex/contrib/oberdiek/colonequals.dtx
index 8fb8bb943b..53ceae893c 100644
--- a/macros/latex/contrib/oberdiek/colonequals.dtx
+++ b/macros/latex/contrib/oberdiek/colonequals.dtx
@@ -13,15 +13,17 @@
 % conditions of the LaTeX Project Public License, either
 % version 1.3c of this license or (at your option) any later
 % version. This version of this license is in
-%    http://www.latex-project.org/lppl/lppl-1-3c.txt
+%    https://www.latex-project.org/lppl/lppl-1-3c.txt
 % and the latest version of this license is in
-%    http://www.latex-project.org/lppl.txt
+%    https://www.latex-project.org/lppl.txt
 % and version 1.3 or later is part of all distributions of
 % LaTeX version 2005/12/01 or later.
 %
 % This work has the LPPL maintenance status "maintained".
 %
-% This Current Maintainer of this work is Heiko Oberdiek.
+% The Current Maintainers of this work are
+% Heiko Oberdiek and the Oberdiek Package Support Group
+% https://github.com/ho-tex/oberdiek/issues
 %
 % This work consists of the main source file colonequals.dtx
 % and the derived files
@@ -98,15 +100,18 @@ This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either
 version 1.3c of this license or (at your option) any later
 version. This version of this license is in
-   http://www.latex-project.org/lppl/lppl-1-3c.txt
+   https://www.latex-project.org/lppl/lppl-1-3c.txt
 and the latest version of this license is in
-   http://www.latex-project.org/lppl.txt
+   https://www.latex-project.org/lppl.txt
 and version 1.3 or later is part of all distributions of
 LaTeX version 2005/12/01 or later.
 
 This work has the LPPL maintenance status "maintained".
 
-This Current Maintainer of this work is Heiko Oberdiek.
+The Current Maintainers of this work are
+Heiko Oberdiek and the Oberdiek Package Support Group
+https://github.com/ho-tex/oberdiek/issues
+
 
 This work consists of the main source file colonequals.dtx
 and the derived files
@@ -185,8 +190,7 @@ and the derived files
 % \title{The \xpackage{colonequals} package}
 % \date{2016/05/16 v1.1}
 % \author{Heiko Oberdiek\thanks
-% {Please report any issues at https://github.com/ho-tex/oberdiek/issues}\\
-% \xemail{heiko.oberdiek at googlemail.com}}
+% {Please report any issues at \url{https://github.com/ho-tex/oberdiek/issues}}}
 %
 % \maketitle
 %
@@ -438,7 +442,7 @@ and the derived files
 % \subsection{Download}
 %
 % \paragraph{Package.} This package is available on
-% CTAN\footnote{\url{http://ctan.org/pkg/colonequals}}:
+% CTAN\footnote{\CTANpkg{colonequals}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/colonequals.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/colonequals.pdf}] Documentation.
@@ -450,7 +454,7 @@ and the derived files
 % the packages are already unpacked and the documentation files
 % are generated. The files and directories obey the TDS standard.
 % \begin{description}
-% \item[\CTAN{install/macros/latex/contrib/oberdiek.tds.zip}]
+% \item[\CTANinstall{install/macros/latex/contrib/oberdiek.tds.zip}]
 % \end{description}
 % \emph{TDS} refers to the standard ``A Directory Structure
 % for \TeX\ Files'' (\CTAN{tds/tds.pdf}). Directories
@@ -569,16 +573,6 @@ and the derived files
 %
 % \subsection{Some details for the interested}
 %
-% \paragraph{Attached source.}
-%
-% The PDF documentation on CTAN also includes the
-% \xfile{.dtx} source file. It can be extracted by
-% AcrobatReader 6 or higher. Another option is \textsf{pdftk},
-% e.g. unpack the file into the current directory:
-% \begin{quote}
-%   \verb|pdftk colonequals.pdf unpack_files output .|
-% \end{quote}
-%
 % \paragraph{Unpacking with \LaTeX.}
 % The \xfile{.dtx} chooses its action depending on the format:
 % \begin{description}
@@ -614,53 +608,17 @@ and the derived files
 %\end{verbatim}
 % \end{quote}
 %
-% \section{Catalogue}
-%
-% The following XML file can be used as source for the
-% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
-% The elements \texttt{caption} and \texttt{description} are imported
-% from the original XML file from the Catalogue.
-% The name of the XML file in the Catalogue is \xfile{colonequals.xml}.
-%    \begin{macrocode}
-%<*catalogue>
-<?xml version='1.0' encoding='us-ascii'?>
-<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
-<entry datestamp='$Date$' modifier='$Author$' id='colonequals'>
-  <name>colonequals</name>
-  <caption>Colon equals symbols.</caption>
-  <authorref id='auth:oberdiek'/>
-  <copyright owner='Heiko Oberdiek' year='2006'/>
-  <license type='lppl1.3'/>
-  <version number='1.1'/>
-  <description>
-    This package defines poor man&#x2018;s symbols for mathematical
-    relation symbols such as &#x201C;colon equals&#x201D;.
-    The colon is centered around the horizontal math axis.
-    <p/>
-    The package is part of the <xref refid='oberdiek'>oberdiek</xref>
-    bundle.
-  </description>
-  <documentation details='Package documentation'
-      href='ctan:/macros/latex/contrib/oberdiek/colonequals.pdf'/>
-  <ctan file='true' path='/macros/latex/contrib/oberdiek/colonequals.dtx'/>
-  <miktex location='oberdiek'/>
-  <texlive location='oberdiek'/>
-  <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
-</entry>
-%</catalogue>
-%    \end{macrocode}
-%
 % \begin{thebibliography}{9}
 %
 % \bibitem{txfonts}
 %   Young Ryu: \textit{The TX Fonts};
 %   2000/12/15;
-%   \CTAN{fonts/txfonts/}.
+%   \CTANpkg{txfonts}.
 %
 % \bibitem{mathabx}
 %   Anthony Phan: \textit{Mathabx font series};
 %   2005/05/16;
-%   \CTAN{fonts/mathabx/}.
+%   \CTANpkg{mathabx}.
 %
 % \end{thebibliography}
 %
diff --git a/macros/latex/contrib/oberdiek/colonequals.pdf b/macros/latex/contrib/oberdiek/colonequals.pdf
index dd0a4cb420..b07e4758c8 100644
--- a/macros/latex/contrib/oberdiek/colonequals.pdf
+++ b/macros/latex/contrib/oberdiek/colonequals.pdf
diff --git a/macros/latex/contrib/oberdiek/dvipscol.dtx b/macros/latex/contrib/oberdiek/dvipscol.dtx
index 100501d81e..22f9555e7d 100644
--- a/macros/latex/contrib/oberdiek/dvipscol.dtx
+++ b/macros/latex/contrib/oberdiek/dvipscol.dtx
@@ -13,15 +13,17 @@
 % conditions of the LaTeX Project Public License, either
 % version 1.3c of this license or (at your option) any later
 % version. This version of this license is in
-%    http://www.latex-project.org/lppl/lppl-1-3c.txt
+%    https://www.latex-project.org/lppl/lppl-1-3c.txt
 % and the latest version of this license is in
-%    http://www.latex-project.org/lppl.txt
+%    https://www.latex-project.org/lppl.txt
 % and version 1.3 or later is part of all distributions of
 % LaTeX version 2005/12/01 or later.
 %
 % This work has the LPPL maintenance status "maintained".
 %
-% This Current Maintainer of this work is Heiko Oberdiek.
+% The Current Maintainers of this work are
+% Heiko Oberdiek and the Oberdiek Package Support Group
+% https://github.com/ho-tex/oberdiek/issues
 %
 % This work consists of the main source file dvipscol.dtx
 % and the derived files
@@ -98,15 +100,18 @@ This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either
 version 1.3c of this license or (at your option) any later
 version. This version of this license is in
-   http://www.latex-project.org/lppl/lppl-1-3c.txt
+   https://www.latex-project.org/lppl/lppl-1-3c.txt
 and the latest version of this license is in
-   http://www.latex-project.org/lppl.txt
+   https://www.latex-project.org/lppl.txt
 and version 1.3 or later is part of all distributions of
 LaTeX version 2005/12/01 or later.
 
 This work has the LPPL maintenance status "maintained".
 
-This Current Maintainer of this work is Heiko Oberdiek.
+The Current Maintainers of this work are
+Heiko Oberdiek and the Oberdiek Package Support Group
+https://github.com/ho-tex/oberdiek/issues
+
 
 This work consists of the main source file dvipscol.dtx
 and the derived files
@@ -181,8 +186,7 @@ and the derived files
 % \title{The \xpackage{dvipscol} package}
 % \date{2016/05/16 v1.3}
 % \author{Heiko Oberdiek\thanks
-% {Please report any issues at https://github.com/ho-tex/oberdiek/issues}\\
-% \xemail{heiko.oberdiek at googlemail.com}}
+% {Please report any issues at \url{https://github.com/ho-tex/oberdiek/issues}}}
 %
 % \maketitle
 %
@@ -323,7 +327,7 @@ and the derived files
 % \subsection{Download}
 %
 % \paragraph{Package.} This package is available on
-% CTAN\footnote{\url{http://ctan.org/pkg/dvipscol}}:
+% CTAN\footnote{\CTANpkg{dvipscol}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/dvipscol.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/dvipscol.pdf}] Documentation.
@@ -335,7 +339,7 @@ and the derived files
 % the packages are already unpacked and the documentation files
 % are generated. The files and directories obey the TDS standard.
 % \begin{description}
-% \item[\CTAN{install/macros/latex/contrib/oberdiek.tds.zip}]
+% \item[\CTANinstall{install/macros/latex/contrib/oberdiek.tds.zip}]
 % \end{description}
 % \emph{TDS} refers to the standard ``A Directory Structure
 % for \TeX\ Files'' (\CTAN{tds/tds.pdf}). Directories
@@ -454,16 +458,6 @@ and the derived files
 %
 % \subsection{Some details for the interested}
 %
-% \paragraph{Attached source.}
-%
-% The PDF documentation on CTAN also includes the
-% \xfile{.dtx} source file. It can be extracted by
-% AcrobatReader 6 or higher. Another option is \textsf{pdftk},
-% e.g. unpack the file into the current directory:
-% \begin{quote}
-%   \verb|pdftk dvipscol.pdf unpack_files output .|
-% \end{quote}
-%
 % \paragraph{Unpacking with \LaTeX.}
 % The \xfile{.dtx} chooses its action depending on the format:
 % \begin{description}
@@ -499,49 +493,13 @@ and the derived files
 %\end{verbatim}
 % \end{quote}
 %
-% \section{Catalogue}
-%
-% The following XML file can be used as source for the
-% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
-% The elements \texttt{caption} and \texttt{description} are imported
-% from the original XML file from the Catalogue.
-% The name of the XML file in the Catalogue is \xfile{dvipscol.xml}.
-%    \begin{macrocode}
-%<*catalogue>
-<?xml version='1.0' encoding='us-ascii'?>
-<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
-<entry datestamp='$Date$' modifier='$Author$' id='dvipscol'>
-  <name>dvipscol</name>
-  <caption>Alter the usage of the dvips colour stack.</caption>
-  <authorref id='auth:oberdiek'/>
-  <copyright owner='Heiko Oberdiek' year='2000,2006,2008'/>
-  <license type='lppl1.3'/>
-  <version number='1.3'/>
-  <description>
-    The package modifies <tt>\color</tt> (and related commands) to
-    deal with the occasional dvips error: &#x201C;! out of color
-    stack space&#x201D;
-    <p/>
-    The package is part of the <xref refid='oberdiek'>oberdiek</xref>
-    bundle.
-  </description>
-  <documentation details='Package documentation'
-      href='ctan:/macros/latex/contrib/oberdiek/dvipscol.pdf'/>
-  <ctan file='true' path='/macros/latex/contrib/oberdiek/dvipscol.dtx'/>
-  <miktex location='oberdiek'/>
-  <texlive location='oberdiek'/>
-  <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
-</entry>
-%</catalogue>
-%    \end{macrocode}
-%
 % \begin{History}
 %   \begin{Version}{2000/08/31 v1.0}
 %   \item
 %     First public release created as answer to
 %     a question of Deepak Goel in \xnewsgroup{comp.text.tex}:
 %     \URL{``\link{Re: \cs{color{}} problems.\,. :Out of stack space.\,.}''}^^A
-%     {http://groups.google.com/group/comp.text.tex/msg/2d37bb1bf2939b31}
+%     {https://groups.google.com/group/comp.text.tex/msg/2d37bb1bf2939b31}
 %   \end{Version}
 %   \begin{Version}{2006/02/20 v1.1}
 %   \item
diff --git a/macros/latex/contrib/oberdiek/dvipscol.pdf b/macros/latex/contrib/oberdiek/dvipscol.pdf
index b5f6ba223d..f228486395 100644
--- a/macros/latex/contrib/oberdiek/dvipscol.pdf
+++ b/macros/latex/contrib/oberdiek/dvipscol.pdf
diff --git a/macros/latex/contrib/oberdiek/embedfile.dtx b/macros/latex/contrib/oberdiek/embedfile.dtx
index 43b0ab2770..6d4d2a0042 100644
--- a/macros/latex/contrib/oberdiek/embedfile.dtx
+++ b/macros/latex/contrib/oberdiek/embedfile.dtx
@@ -13,15 +13,17 @@
 % conditions of the LaTeX Project Public License, either
 % version 1.3c of this license or (at your option) any later
 % version. This version of this license is in
-%    http://www.latex-project.org/lppl/lppl-1-3c.txt
+%    https://www.latex-project.org/lppl/lppl-1-3c.txt
 % and the latest version of this license is in
-%    http://www.latex-project.org/lppl.txt
+%    https://www.latex-project.org/lppl.txt
 % and version 1.3 or later is part of all distributions of
 % LaTeX version 2005/12/01 or later.
 %
 % This work has the LPPL maintenance status "maintained".
 %
-% This Current Maintainer of this work is Heiko Oberdiek.
+% The Current Maintainers of this work are
+% Heiko Oberdiek and the Oberdiek Package Support Group
+% https://github.com/ho-tex/oberdiek/issues
 %
 % The Base Interpreter refers to any `TeX-Format',
 % because some files are installed in TDS:tex/generic//.
@@ -112,15 +114,18 @@ This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either
 version 1.3c of this license or (at your option) any later
 version. This version of this license is in
-   http://www.latex-project.org/lppl/lppl-1-3c.txt
+   https://www.latex-project.org/lppl/lppl-1-3c.txt
 and the latest version of this license is in
-   http://www.latex-project.org/lppl.txt
+   https://www.latex-project.org/lppl.txt
 and version 1.3 or later is part of all distributions of
 LaTeX version 2005/12/01 or later.
 
 This work has the LPPL maintenance status "maintained".
 
-This Current Maintainer of this work is Heiko Oberdiek.
+The Current Maintainers of this work are
+Heiko Oberdiek and the Oberdiek Package Support Group
+https://github.com/ho-tex/oberdiek/issues
+
 
 The Base Interpreter refers to any `TeX-Format',
 because some files are installed in TDS:tex/generic//.
@@ -212,8 +217,7 @@ and the derived files
 % \title{The \xpackage{embedfile} package}
 % \date{2018/11/01 v2.8}
 % \author{Heiko Oberdiek\thanks
-% {Please report any issues at https://github.com/ho-tex/oberdiek/issues}\\
-% \xemail{heiko.oberdiek at googlemail.com}}
+% {Please report any issues at \url{https://github.com/ho-tex/oberdiek/issues}}}
 %
 % \maketitle
 %
@@ -631,7 +635,7 @@ You need Acrobat Reader 8 or higher.
 %
 % Package \xpackage{dtx-attach} is just a small application of
 % package \xpackage{embedfile}. I am using it for the CTAN
-% documentation of my packages in \CTAN{macros/latex/contrib/oberdiek/}.
+% documentation of my packages in \CTANpkg{oberdiek}.
 % It also serves as small example for the use of the package with \LaTeX.
 %
 %    \begin{macrocode}
@@ -1870,7 +1874,7 @@ Test (plain-\TeX): {\tt embedfile.dtx} should be embedded.%
 % \subsection{Download}
 %
 % \paragraph{Package.} This package is available on
-% CTAN\footnote{\url{http://ctan.org/pkg/embedfile}}:
+% CTAN\footnote{\CTANpkg{embedfile}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/embedfile.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/embedfile.pdf}] Documentation.
@@ -1882,7 +1886,7 @@ Test (plain-\TeX): {\tt embedfile.dtx} should be embedded.%
 % the packages are already unpacked and the documentation files
 % are generated. The files and directories obey the TDS standard.
 % \begin{description}
-% \item[\CTAN{install/macros/latex/contrib/oberdiek.tds.zip}]
+% \item[\CTANinstall{install/macros/latex/contrib/oberdiek.tds.zip}]
 % \end{description}
 % \emph{TDS} refers to the standard ``A Directory Structure
 % for \TeX\ Files'' (\CTAN{tds/tds.pdf}). Directories
@@ -2008,16 +2012,6 @@ Test (plain-\TeX): {\tt embedfile.dtx} should be embedded.%
 %
 % \subsection{Some details for the interested}
 %
-% \paragraph{Attached source.}
-%
-% The PDF documentation on CTAN also includes the
-% \xfile{.dtx} source file. It can be extracted by
-% AcrobatReader 6 or higher. Another option is \textsf{pdftk},
-% e.g. unpack the file into the current directory:
-% \begin{quote}
-%   \verb|pdftk embedfile.pdf unpack_files output .|
-% \end{quote}
-%
 % \paragraph{Unpacking with \LaTeX.}
 % The \xfile{.dtx} chooses its action depending on the format:
 % \begin{description}
@@ -2053,51 +2047,11 @@ Test (plain-\TeX): {\tt embedfile.dtx} should be embedded.%
 %\end{verbatim}
 % \end{quote}
 %
-% \section{Catalogue}
-%
-% The following XML file can be used as source for the
-% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
-% The elements \texttt{caption} and \texttt{description} are imported
-% from the original XML file from the Catalogue.
-% The name of the XML file in the Catalogue is \xfile{embedfile.xml}.
-%    \begin{macrocode}
-%<*catalogue>
-<?xml version='1.0' encoding='us-ascii'?>
-<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
-<entry datestamp='$Date$' modifier='$Author$' id='embedfile'>
-  <name>embedfile</name>
-  <caption>Embed files into PDF.</caption>
-  <authorref id='auth:oberdiek'/>
-  <copyright owner='Heiko Oberdiek' year='2006-2011'/>
-  <license type='lppl1.3'/>
-  <version number='2.8'/>
-  <description>
-    This package embeds files in a PDF document, using the PDF
-    format's embedding operation (note the contrast with the attach
-    operation used by the <xref refid='attachfile'>attachfile</xref>
-    and <xref refid='attachfile2'>attachfile2</xref> packages).
-    Currently only <xref refid='pdftex'>pdfTeX</xref> &gt;=1.30, in
-    PDF mode, is supported.
-
-    <p/>
-    The package is part of the <xref refid='oberdiek'>oberdiek</xref>
-    bundle.
-  </description>
-  <documentation details='Package documentation'
-      href='ctan:/macros/latex/contrib/oberdiek/embedfile.pdf'/>
-  <ctan file='true' path='/macros/latex/contrib/oberdiek/embedfile.dtx'/>
-  <miktex location='oberdiek'/>
-  <texlive location='oberdiek'/>
-  <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
-</entry>
-%</catalogue>
-%    \end{macrocode}
-%
 % \begin{thebibliography}{9}
 % \bibitem{attachfile}
 %   Scott Pakin: \textit{The \xpackage{attachfile} package};
 %   2005/02/20 v1.2;
-%   \CTAN{macros/latex/contrib/attachfile/}.
+%   \CTANpkg{attachfile}.
 %
 % \bibitem{attachfile2}
 %   Heiko Oberdiek: \textit{The \xpackage{attachfile2} package};
diff --git a/macros/latex/contrib/oberdiek/embedfile.pdf b/macros/latex/contrib/oberdiek/embedfile.pdf
index 7d3c2e1f4b..9276b50ef2 100644
--- a/macros/latex/contrib/oberdiek/embedfile.pdf
+++ b/macros/latex/contrib/oberdiek/embedfile.pdf
diff --git a/macros/latex/contrib/oberdiek/engord.dtx b/macros/latex/contrib/oberdiek/engord.dtx
index 5fb4bed15a..335c147520 100644
--- a/macros/latex/contrib/oberdiek/engord.dtx
+++ b/macros/latex/contrib/oberdiek/engord.dtx
@@ -13,15 +13,17 @@
 % conditions of the LaTeX Project Public License, either
 % version 1.3c of this license or (at your option) any later
 % version. This version of this license is in
-%    http://www.latex-project.org/lppl/lppl-1-3c.txt
+%    https://www.latex-project.org/lppl/lppl-1-3c.txt
 % and the latest version of this license is in
-%    http://www.latex-project.org/lppl.txt
+%    https://www.latex-project.org/lppl.txt
 % and version 1.3 or later is part of all distributions of
 % LaTeX version 2005/12/01 or later.
 %
 % This work has the LPPL maintenance status "maintained".
 %
-% This Current Maintainer of this work is Heiko Oberdiek.
+% The Current Maintainers of this work are
+% Heiko Oberdiek and the Oberdiek Package Support Group
+% https://github.com/ho-tex/oberdiek/issues
 %
 % The Base Interpreter refers to any `TeX-Format',
 % because some files are installed in TDS:tex/generic//.
@@ -102,15 +104,18 @@ This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either
 version 1.3c of this license or (at your option) any later
 version. This version of this license is in
-   http://www.latex-project.org/lppl/lppl-1-3c.txt
+   https://www.latex-project.org/lppl/lppl-1-3c.txt
 and the latest version of this license is in
-   http://www.latex-project.org/lppl.txt
+   https://www.latex-project.org/lppl.txt
 and version 1.3 or later is part of all distributions of
 LaTeX version 2005/12/01 or later.
 
 This work has the LPPL maintenance status "maintained".
 
-This Current Maintainer of this work is Heiko Oberdiek.
+The Current Maintainers of this work are
+Heiko Oberdiek and the Oberdiek Package Support Group
+https://github.com/ho-tex/oberdiek/issues
+
 
 The Base Interpreter refers to any `TeX-Format',
 because some files are installed in TDS:tex/generic//.
@@ -190,8 +195,7 @@ and the derived files
 % \title{The \xpackage{engord} package}
 % \date{2016/05/16 v1.9}
 % \author{Heiko Oberdiek\thanks
-% {Please report any issues at https://github.com/ho-tex/oberdiek/issues}\\
-% \xemail{heiko.oberdiek at googlemail.com}}
+% {Please report any issues at \url{https://github.com/ho-tex/oberdiek/issues}}}
 %
 % \maketitle
 %
@@ -766,7 +770,7 @@ and the derived files
 % \subsection{Download}
 %
 % \paragraph{Package.} This package is available on
-% CTAN\footnote{\url{http://ctan.org/pkg/engord}}:
+% CTAN\footnote{\CTANpkg{engord}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/engord.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/engord.pdf}] Documentation.
@@ -778,7 +782,7 @@ and the derived files
 % the packages are already unpacked and the documentation files
 % are generated. The files and directories obey the TDS standard.
 % \begin{description}
-% \item[\CTAN{install/macros/latex/contrib/oberdiek.tds.zip}]
+% \item[\CTANinstall{install/macros/latex/contrib/oberdiek.tds.zip}]
 % \end{description}
 % \emph{TDS} refers to the standard ``A Directory Structure
 % for \TeX\ Files'' (\CTAN{tds/tds.pdf}). Directories
@@ -898,16 +902,6 @@ and the derived files
 %
 % \subsection{Some details for the interested}
 %
-% \paragraph{Attached source.}
-%
-% The PDF documentation on CTAN also includes the
-% \xfile{.dtx} source file. It can be extracted by
-% AcrobatReader 6 or higher. Another option is \textsf{pdftk},
-% e.g. unpack the file into the current directory:
-% \begin{quote}
-%   \verb|pdftk engord.pdf unpack_files output .|
-% \end{quote}
-%
 % \paragraph{Unpacking with \LaTeX.}
 % The \xfile{.dtx} chooses its action depending on the format:
 % \begin{description}
@@ -943,51 +937,12 @@ and the derived files
 %\end{verbatim}
 % \end{quote}
 %
-% \section{Catalogue}
-%
-% The following XML file can be used as source for the
-% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
-% The elements \texttt{caption} and \texttt{description} are imported
-% from the original XML file from the Catalogue.
-% The name of the XML file in the Catalogue is \xfile{engord.xml}.
-%    \begin{macrocode}
-%<*catalogue>
-<?xml version='1.0' encoding='us-ascii'?>
-<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
-<entry datestamp='$Date$' modifier='$Author$' id='engord'>
-  <name>engord</name>
-  <caption>Converts numbers to English ordinal numbers.</caption>
-  <authorref id='auth:oberdiek'/>
-  <copyright owner='Heiko Oberdiek' year='2000,2003,2006-2008,2010'/>
-  <license type='lppl1.3'/>
-  <version number='1.9'/>
-  <description>
-    Defines <tt>\engord</tt> (used like <tt>\arabic</tt>,
-    <tt>\roman</tt>, etc.), and <tt>\engordnumber</tt> (which formats
-    a &#x201C;TeX number&#x201D;).
-    <p/>
-    So <tt>\pagenumbering{engord}</tt> gives page numbers <tt>1st,
-    2nd, 3rd, ...</tt>
-    <p/>
-    The package is part of the <xref refid='oberdiek'>oberdiek</xref>
-    bundle.
-  </description>
-  <documentation details='Package documentation'
-      href='ctan:/macros/latex/contrib/oberdiek/engord.pdf'/>
-  <ctan file='true' path='/macros/latex/contrib/oberdiek/engord.dtx'/>
-  <miktex location='oberdiek'/>
-  <texlive location='oberdiek'/>
-  <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
-</entry>
-%</catalogue>
-%    \end{macrocode}
-%
 % \begin{History}
 %   \begin{Version}{2000/05/23 v1.0}
 %   \item
 %     First public release, published in newsgroup \xnewsgroup{de.comp.text.tex}:\\
 %     \URL{``\link{Re: Ordinalzahlen in LaTeX?}''}^^A
-%     {http://groups.google.com/group/de.comp.text.tex/msg/738e2cb4c51759d6}
+%     {https://groups.google.com/group/de.comp.text.tex/msg/738e2cb4c51759d6}
 %   \end{Version}
 %   \begin{Version}{2003/04/28 v1.1}
 %   \item
diff --git a/macros/latex/contrib/oberdiek/engord.pdf b/macros/latex/contrib/oberdiek/engord.pdf
index 40eaa44741..c3aaa41896 100644
--- a/macros/latex/contrib/oberdiek/engord.pdf
+++ b/macros/latex/contrib/oberdiek/engord.pdf
diff --git a/macros/latex/contrib/oberdiek/enparen.dtx b/macros/latex/contrib/oberdiek/enparen.dtx
index 301bbe3c3e..1bad972131 100644
--- a/macros/latex/contrib/oberdiek/enparen.dtx
+++ b/macros/latex/contrib/oberdiek/enparen.dtx
@@ -13,15 +13,17 @@
 % conditions of the LaTeX Project Public License, either
 % version 1.3c of this license or (at your option) any later
 % version. This version of this license is in
-%    http://www.latex-project.org/lppl/lppl-1-3c.txt
+%    https://www.latex-project.org/lppl/lppl-1-3c.txt
 % and the latest version of this license is in
-%    http://www.latex-project.org/lppl.txt
+%    https://www.latex-project.org/lppl.txt
 % and version 1.3 or later is part of all distributions of
 % LaTeX version 2005/12/01 or later.
 %
 % This work has the LPPL maintenance status "maintained".
 %
-% This Current Maintainer of this work is Heiko Oberdiek.
+% The Current Maintainers of this work are
+% Heiko Oberdiek and the Oberdiek Package Support Group
+% https://github.com/ho-tex/oberdiek/issues
 %
 % This work consists of the main source file enparen.dtx
 % and the derived files
@@ -98,15 +100,18 @@ This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either
 version 1.3c of this license or (at your option) any later
 version. This version of this license is in
-   http://www.latex-project.org/lppl/lppl-1-3c.txt
+   https://www.latex-project.org/lppl/lppl-1-3c.txt
 and the latest version of this license is in
-   http://www.latex-project.org/lppl.txt
+   https://www.latex-project.org/lppl.txt
 and version 1.3 or later is part of all distributions of
 LaTeX version 2005/12/01 or later.
 
 This work has the LPPL maintenance status "maintained".
 
-This Current Maintainer of this work is Heiko Oberdiek.
+The Current Maintainers of this work are
+Heiko Oberdiek and the Oberdiek Package Support Group
+https://github.com/ho-tex/oberdiek/issues
+
 
 This work consists of the main source file enparen.dtx
 and the derived files
@@ -178,8 +183,7 @@ and the derived files
 % \title{The \xpackage{enparen} package}
 % \date{2016/05/16 v1.1}
 % \author{Heiko Oberdiek\thanks
-% {Please report any issues at https://github.com/ho-tex/oberdiek/issues}\\
-% \xemail{heiko.oberdiek at googlemail.com}}
+% {Please report any issues at \url{https://github.com/ho-tex/oberdiek/issues}}}
 %
 % \maketitle
 %
@@ -784,7 +788,7 @@ and the derived files
 % \subsection{Download}
 %
 % \paragraph{Package.} This package is available on
-% CTAN\footnote{\url{http://ctan.org/pkg/enparen}}:
+% CTAN\footnote{\CTANpkg{enparen}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/enparen.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/enparen.pdf}] Documentation.
@@ -796,7 +800,7 @@ and the derived files
 % the packages are already unpacked and the documentation files
 % are generated. The files and directories obey the TDS standard.
 % \begin{description}
-% \item[\CTAN{install/macros/latex/contrib/oberdiek.tds.zip}]
+% \item[\CTANinstall{install/macros/latex/contrib/oberdiek.tds.zip}]
 % \end{description}
 % \emph{TDS} refers to the standard ``A Directory Structure
 % for \TeX\ Files'' (\CTAN{tds/tds.pdf}). Directories
@@ -915,16 +919,6 @@ and the derived files
 %
 % \subsection{Some details for the interested}
 %
-% \paragraph{Attached source.}
-%
-% The PDF documentation on CTAN also includes the
-% \xfile{.dtx} source file. It can be extracted by
-% AcrobatReader 6 or higher. Another option is \textsf{pdftk},
-% e.g. unpack the file into the current directory:
-% \begin{quote}
-%   \verb|pdftk enparen.pdf unpack_files output .|
-% \end{quote}
-%
 % \paragraph{Unpacking with \LaTeX.}
 % The \xfile{.dtx} chooses its action depending on the format:
 % \begin{description}
@@ -967,7 +961,7 @@ and the derived files
 %   newsgroup \xnewsgroup{comp.text.tex};
 %   message id \texttt{\small$\langle$9b07c9c8-ff92-4cbf-b3a9-84efecfeb506@l24g2000yqm.googlegroups.com$\rangle$}
 %   2012-01-05.
-%   \url{http://groups.google.com/group/comp.text.tex/msg/8774519da31c2352}
+%   \url{https://groups.google.com/group/comp.text.tex/msg/8774519da31c2352}
 % \end{thebibliography}
 %
 % \begin{History}
diff --git a/macros/latex/contrib/oberdiek/enparen.pdf b/macros/latex/contrib/oberdiek/enparen.pdf
index 733bdee9d4..ce913c04ea 100644
--- a/macros/latex/contrib/oberdiek/enparen.pdf
+++ b/macros/latex/contrib/oberdiek/enparen.pdf
diff --git a/macros/latex/contrib/oberdiek/eolgrab.dtx b/macros/latex/contrib/oberdiek/eolgrab.dtx
index 0965086c9a..8862ed738c 100644
--- a/macros/latex/contrib/oberdiek/eolgrab.dtx
+++ b/macros/latex/contrib/oberdiek/eolgrab.dtx
@@ -13,15 +13,17 @@
 % conditions of the LaTeX Project Public License, either
 % version 1.3c of this license or (at your option) any later
 % version. This version of this license is in
-%    http://www.latex-project.org/lppl/lppl-1-3c.txt
+%    https://www.latex-project.org/lppl/lppl-1-3c.txt
 % and the latest version of this license is in
-%    http://www.latex-project.org/lppl.txt
+%    https://www.latex-project.org/lppl.txt
 % and version 1.3 or later is part of all distributions of
 % LaTeX version 2005/12/01 or later.
 %
 % This work has the LPPL maintenance status "maintained".
 %
-% This Current Maintainer of this work is Heiko Oberdiek.
+% The Current Maintainers of this work are
+% Heiko Oberdiek and the Oberdiek Package Support Group
+% https://github.com/ho-tex/oberdiek/issues
 %
 % The Base Interpreter refers to any `TeX-Format',
 % because some files are installed in TDS:tex/generic//.
@@ -109,15 +111,18 @@ This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either
 version 1.3c of this license or (at your option) any later
 version. This version of this license is in
-   http://www.latex-project.org/lppl/lppl-1-3c.txt
+   https://www.latex-project.org/lppl/lppl-1-3c.txt
 and the latest version of this license is in
-   http://www.latex-project.org/lppl.txt
+   https://www.latex-project.org/lppl.txt
 and version 1.3 or later is part of all distributions of
 LaTeX version 2005/12/01 or later.
 
 This work has the LPPL maintenance status "maintained".
 
-This Current Maintainer of this work is Heiko Oberdiek.
+The Current Maintainers of this work are
+Heiko Oberdiek and the Oberdiek Package Support Group
+https://github.com/ho-tex/oberdiek/issues
+
 
 The Base Interpreter refers to any `TeX-Format',
 because some files are installed in TDS:tex/generic//.
@@ -205,8 +210,7 @@ and the derived files
 % \title{The \xpackage{eolgrab} package}
 % \date{2016/05/16 v1.1}
 % \author{Heiko Oberdiek\thanks
-% {Please report any issues at https://github.com/ho-tex/oberdiek/issues}\\
-% \xemail{heiko.oberdiek at googlemail.com}}
+% {Please report any issues at \url{https://github.com/ho-tex/oberdiek/issues}}}
 %
 % \maketitle
 %
@@ -217,7 +221,7 @@ and the derived files
 %
 % \tableofcontents
 %
-% \urldef\urltexhax\url{http://tug.org/mailman/listinfo/texhax}
+% \urldef\urltexhax\url{https://tug.org/mailman/listinfo/texhax}
 % \def\eol/{^^A
 %   \meta{\texttt{EOL}}^^A
 % }
@@ -833,7 +837,7 @@ and the derived files
 % \subsection{Download}
 %
 % \paragraph{Package.} This package is available on
-% CTAN\footnote{\url{http://ctan.org/pkg/eolgrab}}:
+% CTAN\footnote{\CTANpkg{eolgrab}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/eolgrab.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/eolgrab.pdf}] Documentation.
@@ -845,7 +849,7 @@ and the derived files
 % the packages are already unpacked and the documentation files
 % are generated. The files and directories obey the TDS standard.
 % \begin{description}
-% \item[\CTAN{install/macros/latex/contrib/oberdiek.tds.zip}]
+% \item[\CTANinstall{install/macros/latex/contrib/oberdiek.tds.zip}]
 % \end{description}
 % \emph{TDS} refers to the standard ``A Directory Structure
 % for \TeX\ Files'' (\CTAN{tds/tds.pdf}). Directories
@@ -969,16 +973,6 @@ and the derived files
 %
 % \subsection{Some details for the interested}
 %
-% \paragraph{Attached source.}
-%
-% The PDF documentation on CTAN also includes the
-% \xfile{.dtx} source file. It can be extracted by
-% AcrobatReader 6 or higher. Another option is \textsf{pdftk},
-% e.g. unpack the file into the current directory:
-% \begin{quote}
-%   \verb|pdftk eolgrab.pdf unpack_files output .|
-% \end{quote}
-%
 % \paragraph{Unpacking with \LaTeX.}
 % The \xfile{.dtx} chooses its action depending on the format:
 % \begin{description}
@@ -1014,46 +1008,6 @@ and the derived files
 %\end{verbatim}
 % \end{quote}
 %
-% \section{Catalogue}
-%
-% The following XML file can be used as source for the
-% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
-% The elements \texttt{caption} and \texttt{description} are imported
-% from the original XML file from the Catalogue.
-% The name of the XML file in the Catalogue is \xfile{eolgrab.xml}.
-%    \begin{macrocode}
-%<*catalogue>
-<?xml version='1.0' encoding='us-ascii'?>
-<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
-<entry datestamp='$Date$' modifier='$Author$' id='eolgrab'>
-  <name>eolgrab</name>
-  <caption>Catch arguments delimited by end of line.</caption>
-  <authorref id='auth:oberdiek'/>
-  <copyright owner='Heiko Oberdiek' year='2011'/>
-  <license type='lppl1.3'/>
-  <version number='1.1'/>
-  <description>
-    The package defines the command <tt>\eolgrab</tt> that reads an
-    string terminated by end of line, and then calls a macro with that
-    string as argument.  Thus
-    <pre>\eolgrab\section My title</pre> is equivalent to
-    <pre>\section{My title}</pre>
-    <p/>
-    A second command <tt>\eolgrabopt</tt> provides the string as an
-    optional argument (which is useful for <tt>\item</tt>, for example).
-    <p/>
-    The package is part of the <xref refid='oberdiek'>oberdiek</xref> bundle.
-  </description>
-  <documentation details='Package documentation'
-      href='ctan:/macros/latex/contrib/oberdiek/eolgrab.pdf'/>
-  <ctan file='true' path='/macros/latex/contrib/oberdiek/eolgrab.dtx'/>
-  <miktex location='oberdiek'/>
-  <texlive location='oberdiek'/>
-  <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
-</entry>
-%</catalogue>
-%    \end{macrocode}
-%
 % \begin{thebibliography}{9}
 % \raggedright
 % \bibitem{trautmann-request}
@@ -1061,21 +1015,21 @@ and the derived files
 % \textit{[texhax] read argument until EOL};
 % mailing list \texttt{texthax@tug.org},
 % 2011-01-06;
-% \url{http://tug.org/pipermail/texhax/2011-January/016517.html}.
+% \url{https://tug.org/pipermail/texhax/2011-January/016517.html}.
 %
 % \bibitem{taylor}
 % Philip Taylor,
 % \textit{Re: [texhax] read argument until EOL};
 % mailing list \texttt{texhax@tug.org},
 % 2011-01-06;
-% \url{http://tug.org/pipermail/texhax/2011-January/016519.html}.
+% \url{https://tug.org/pipermail/texhax/2011-January/016519.html}.
 %
 % \bibitem{oberdiek-eolgrab}
 % Heiko Oberdiek,
 % \textit{Re: [texhax] read argument until EOL};
 % mailing list \texttt{texhax@tug.org},
 % 2011-01-06;
-% \url{http://tug.org/pipermail/texhax/2011-January/016526.html}.
+% \url{https://tug.org/pipermail/texhax/2011-January/016526.html}.
 %
 % \end{thebibliography}
 %
diff --git a/macros/latex/contrib/oberdiek/eolgrab.pdf b/macros/latex/contrib/oberdiek/eolgrab.pdf
index 69ddccd2b8..368ccd0435 100644
--- a/macros/latex/contrib/oberdiek/eolgrab.pdf
+++ b/macros/latex/contrib/oberdiek/eolgrab.pdf
diff --git a/macros/latex/contrib/oberdiek/epstopdf.dtx b/macros/latex/contrib/oberdiek/epstopdf.dtx
index 7f9528f7b3..be5938f44d 100644
--- a/macros/latex/contrib/oberdiek/epstopdf.dtx
+++ b/macros/latex/contrib/oberdiek/epstopdf.dtx
@@ -11,15 +11,17 @@
 % conditions of the LaTeX Project Public License, either
 % version 1.3c of this license or (at your option) any later
 % version. This version of this license is in
-%    http://www.latex-project.org/lppl/lppl-1-3c.txt
+%    https://www.latex-project.org/lppl/lppl-1-3c.txt
 % and the latest version of this license is in
-%    http://www.latex-project.org/lppl.txt
+%    https://www.latex-project.org/lppl.txt
 % and version 1.3 or later is part of all distributions of
 % LaTeX version 2005/12/01 or later.
 %
 % This work has the LPPL maintenance status "maintained".
 %
-% This Current Maintainer of this work is Heiko Oberdiek.
+% The Current Maintainers of this work are
+% Heiko Oberdiek and the Oberdiek Package Support Group
+% https://github.com/ho-tex/oberdiek/issues
 %
 % This work consists of the main source file epstopdf.dtx
 % and the derived files
@@ -99,15 +101,18 @@ This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either
 version 1.3c of this license or (at your option) any later
 version. This version of this license is in
-   http://www.latex-project.org/lppl/lppl-1-3c.txt
+   https://www.latex-project.org/lppl/lppl-1-3c.txt
 and the latest version of this license is in
-   http://www.latex-project.org/lppl.txt
+   https://www.latex-project.org/lppl.txt
 and version 1.3 or later is part of all distributions of
 LaTeX version 2005/12/01 or later.
 
 This work has the LPPL maintenance status "maintained".
 
-This Current Maintainer of this work is Heiko Oberdiek.
+The Current Maintainers of this work are
+Heiko Oberdiek and the Oberdiek Package Support Group
+https://github.com/ho-tex/oberdiek/issues
+
 
 This work consists of the main source file epstopdf.dtx
 and the derived files
@@ -186,8 +191,7 @@ and the derived files
 % \title{The \xpackage{epstopdf} package}
 % \date{2016/05/15 v2.6}
 % \author{Heiko Oberdiek\thanks
-% {Please report any issues at https://github.com/ho-tex/oberdiek/issues}\\
-% \xemail{heiko.oberdiek at googlemail.com}}
+% {Please report any issues at \url{https://github.com/ho-tex/oberdiek/issues}}}
 %
 % \maketitle
 %
@@ -1310,7 +1314,7 @@ and the derived files
 % \subsection{Download}
 %
 % \paragraph{Package.} This package is available on
-% CTAN\footnote{\url{http://ctan.org/pkg/epstopdf}}:
+% CTAN\footnote{\CTANpkg{epstopdf}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/epstopdf.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/epstopdf.pdf}] Documentation.
@@ -1322,7 +1326,7 @@ and the derived files
 % the packages are already unpacked and the documentation files
 % are generated. The files and directories obey the TDS standard.
 % \begin{description}
-% \item[\CTAN{install/macros/latex/contrib/oberdiek.tds.zip}]
+% \item[\CTANinstall{install/macros/latex/contrib/oberdiek.tds.zip}]
 % \end{description}
 % \emph{TDS} refers to the standard ``A Directory Structure
 % for \TeX\ Files'' (\CTAN{tds/tds.pdf}). Directories
@@ -1443,16 +1447,6 @@ and the derived files
 %
 % \subsection{Some details for the interested}
 %
-% \paragraph{Attached source.}
-%
-% The PDF documentation on CTAN also includes the
-% \xfile{.dtx} source file. It can be extracted by
-% AcrobatReader 6 or higher. Another option is \textsf{pdftk},
-% e.g. unpack the file into the current directory:
-% \begin{quote}
-%   \verb|pdftk epstopdf.pdf unpack_files output .|
-% \end{quote}
-%
 % \paragraph{Unpacking with \LaTeX.}
 % The \xfile{.dtx} chooses its action depending on the format:
 % \begin{description}
@@ -1488,45 +1482,6 @@ and the derived files
 %\end{verbatim}
 % \end{quote}
 %
-% \section{Catalogue}
-%
-% The following XML file can be used as source for the
-% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
-% The elements \texttt{caption} and \texttt{description} are imported
-% from the original XML file from the Catalogue.
-% The name of the XML file in the Catalogue is \xfile{epstopdf-pkg.xml}.
-%    \begin{macrocode}
-%<*catalogue>
-<?xml version='1.0' encoding='us-ascii'?>
-<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
-<entry datestamp='$Date$' modifier='$Author$' id='epstopdf-pkg'>
-  <name>epstopdf-pkg</name>
-  <caption>Call epstopdf "on the fly"</caption>
-  <authorref id='auth:oberdiek'/>
-  <copyright owner='Heiko Oberdiek' year='2001,2006-2010'/>
-  <license type='lppl1.3'/>
-  <version number='2.6'/>
-  <description>
-    The package adds support for EPS files in the
-    <xref refid='graphicx'>graphicx</xref> package when running under
-    PDFTeX.  If an EPS graphic is detected, the package spawns a
-    process to convert the EPS to PDF, using the script
-    <xref refid='epstopdf'>epstopdf</xref>.  This of course requires
-    that shell escape is enabled for the PDFTeX run.
-    <p/>
-    The package is part of the <xref refid='oberdiek'>oberdiek</xref>
-    bundle.
-  </description>
-  <documentation details='Package documentation'
-      href='ctan:/macros/latex/contrib/oberdiek/epstopdf.pdf'/>
-  <ctan file='true' path='/macros/latex/contrib/oberdiek/epstopdf.dtx'/>
-  <miktex location='oberdiek'/>
-  <texlive location='oberdiek'/>
-  <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
-</entry>
-%</catalogue>
-%    \end{macrocode}
-%
 % \begin{History}
 %   \begin{Version}{2001/01/06 v1.0}
 %   \item
diff --git a/macros/latex/contrib/oberdiek/epstopdf.pdf b/macros/latex/contrib/oberdiek/epstopdf.pdf
index d779fcb6b1..2245631c92 100644
--- a/macros/latex/contrib/oberdiek/epstopdf.pdf
+++ b/macros/latex/contrib/oberdiek/epstopdf.pdf
diff --git a/macros/latex/contrib/oberdiek/etexcmds.dtx b/macros/latex/contrib/oberdiek/etexcmds.dtx
index 77b500ee14..b34e4d9891 100644
--- a/macros/latex/contrib/oberdiek/etexcmds.dtx
+++ b/macros/latex/contrib/oberdiek/etexcmds.dtx
@@ -13,15 +13,17 @@
 % conditions of the LaTeX Project Public License, either
 % version 1.3c of this license or (at your option) any later
 % version. This version of this license is in
-%    http://www.latex-project.org/lppl/lppl-1-3c.txt
+%    https://www.latex-project.org/lppl/lppl-1-3c.txt
 % and the latest version of this license is in
-%    http://www.latex-project.org/lppl.txt
+%    https://www.latex-project.org/lppl.txt
 % and version 1.3 or later is part of all distributions of
 % LaTeX version 2005/12/01 or later.
 %
 % This work has the LPPL maintenance status "maintained".
 %
-% This Current Maintainer of this work is Heiko Oberdiek.
+% The Current Maintainers of this work are
+% Heiko Oberdiek and the Oberdiek Package Support Group
+% https://github.com/ho-tex/oberdiek/issues
 %
 % The Base Interpreter refers to any `TeX-Format',
 % because some files are installed in TDS:tex/generic//.
@@ -107,15 +109,18 @@ This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either
 version 1.3c of this license or (at your option) any later
 version. This version of this license is in
-   http://www.latex-project.org/lppl/lppl-1-3c.txt
+   https://www.latex-project.org/lppl/lppl-1-3c.txt
 and the latest version of this license is in
-   http://www.latex-project.org/lppl.txt
+   https://www.latex-project.org/lppl.txt
 and version 1.3 or later is part of all distributions of
 LaTeX version 2005/12/01 or later.
 
 This work has the LPPL maintenance status "maintained".
 
-This Current Maintainer of this work is Heiko Oberdiek.
+The Current Maintainers of this work are
+Heiko Oberdiek and the Oberdiek Package Support Group
+https://github.com/ho-tex/oberdiek/issues
+
 
 The Base Interpreter refers to any `TeX-Format',
 because some files are installed in TDS:tex/generic//.
@@ -200,8 +205,7 @@ and the derived files
 % \title{The \xpackage{etexcmds} package}
 % \date{2016/05/16 v1.6}
 % \author{Heiko Oberdiek\thanks
-% {Please report any issues at https://github.com/ho-tex/oberdiek/issues}\\
-% \xemail{heiko.oberdiek at googlemail.com}}
+% {Please report any issues at \url{https://github.com/ho-tex/oberdiek/issues}}}
 %
 % \maketitle
 %
@@ -728,7 +732,7 @@ and the derived files
 % \subsection{Download}
 %
 % \paragraph{Package.} This package is available on
-% CTAN\footnote{\url{http://ctan.org/pkg/etexcmds}}:
+% CTAN\footnote{\CTANpkg{etexcmds}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/etexcmds.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/etexcmds.pdf}] Documentation.
@@ -740,7 +744,7 @@ and the derived files
 % the packages are already unpacked and the documentation files
 % are generated. The files and directories obey the TDS standard.
 % \begin{description}
-% \item[\CTAN{install/macros/latex/contrib/oberdiek.tds.zip}]
+% \item[\CTANinstall{install/macros/latex/contrib/oberdiek.tds.zip}]
 % \end{description}
 % \emph{TDS} refers to the standard ``A Directory Structure
 % for \TeX\ Files'' (\CTAN{tds/tds.pdf}). Directories
@@ -863,16 +867,6 @@ and the derived files
 %
 % \subsection{Some details for the interested}
 %
-% \paragraph{Attached source.}
-%
-% The PDF documentation on CTAN also includes the
-% \xfile{.dtx} source file. It can be extracted by
-% AcrobatReader 6 or higher. Another option is \textsf{pdftk},
-% e.g. unpack the file into the current directory:
-% \begin{quote}
-%   \verb|pdftk etexcmds.pdf unpack_files output .|
-% \end{quote}
-%
 % \paragraph{Unpacking with \LaTeX.}
 % The \xfile{.dtx} chooses its action depending on the format:
 % \begin{description}
@@ -908,45 +902,6 @@ and the derived files
 %\end{verbatim}
 % \end{quote}
 %
-% \section{Catalogue}
-%
-% The following XML file can be used as source for the
-% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
-% The elements \texttt{caption} and \texttt{description} are imported
-% from the original XML file from the Catalogue.
-% The name of the XML file in the Catalogue is \xfile{etexcmds.xml}.
-%    \begin{macrocode}
-%<*catalogue>
-<?xml version='1.0' encoding='us-ascii'?>
-<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
-<entry datestamp='$Date$' modifier='$Author$' id='etexcmds'>
-  <name>etexcmds</name>
-  <caption>Avoid name clashes with e-TeX commands.</caption>
-  <authorref id='auth:oberdiek'/>
-  <copyright owner='Heiko Oberdiek' year='2007,2010,2011'/>
-  <license type='lppl1.3'/>
-  <version number='1.6'/>
-  <description>
-    New primitive commands are introduced in e-TeX; sometimes the
-    names collide with existing macros.  This package solves the
-    name clashes by adding a prefix to e-TeX&#x2019;s commands.  For
-    example, eTeX&#x2019;s <tt>\unexpanded</tt> is provided as
-    <tt>\etex@unexpanded</tt>.
-
-    <p/>
-    The package is part of the <xref refid='oberdiek'>oberdiek</xref>
-    bundle.
-  </description>
-  <documentation details='Package documentation'
-      href='ctan:/macros/latex/contrib/oberdiek/etexcmds.pdf'/>
-  <ctan file='true' path='/macros/latex/contrib/oberdiek/etexcmds.dtx'/>
-  <miktex location='oberdiek'/>
-  <texlive location='oberdiek'/>
-  <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
-</entry>
-%</catalogue>
-%    \end{macrocode}
-%
 % \begin{History}
 %   \begin{Version}{2007/05/06 v1.0}
 %   \item
diff --git a/macros/latex/contrib/oberdiek/etexcmds.pdf b/macros/latex/contrib/oberdiek/etexcmds.pdf
index 336bd49136..66cb7f202a 100644
--- a/macros/latex/contrib/oberdiek/etexcmds.pdf
+++ b/macros/latex/contrib/oberdiek/etexcmds.pdf
diff --git a/macros/latex/contrib/oberdiek/fibnum.dtx b/macros/latex/contrib/oberdiek/fibnum.dtx
index ec9f12bcd7..5fb29a91f2 100644
--- a/macros/latex/contrib/oberdiek/fibnum.dtx
+++ b/macros/latex/contrib/oberdiek/fibnum.dtx
@@ -13,15 +13,17 @@
 % conditions of the LaTeX Project Public License, either
 % version 1.3c of this license or (at your option) any later
 % version. This version of this license is in
-%    http://www.latex-project.org/lppl/lppl-1-3c.txt
+%    https://www.latex-project.org/lppl/lppl-1-3c.txt
 % and the latest version of this license is in
-%    http://www.latex-project.org/lppl.txt
+%    https://www.latex-project.org/lppl.txt
 % and version 1.3 or later is part of all distributions of
 % LaTeX version 2005/12/01 or later.
 %
 % This work has the LPPL maintenance status "maintained".
 %
-% This Current Maintainer of this work is Heiko Oberdiek.
+% The Current Maintainers of this work are
+% Heiko Oberdiek and the Oberdiek Package Support Group
+% https://github.com/ho-tex/oberdiek/issues
 %
 % The Base Interpreter refers to any `TeX-Format',
 % because some files are installed in TDS:tex/generic//.
@@ -105,15 +107,18 @@ This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either
 version 1.3c of this license or (at your option) any later
 version. This version of this license is in
-   http://www.latex-project.org/lppl/lppl-1-3c.txt
+   https://www.latex-project.org/lppl/lppl-1-3c.txt
 and the latest version of this license is in
-   http://www.latex-project.org/lppl.txt
+   https://www.latex-project.org/lppl.txt
 and version 1.3 or later is part of all distributions of
 LaTeX version 2005/12/01 or later.
 
 This work has the LPPL maintenance status "maintained".
 
-This Current Maintainer of this work is Heiko Oberdiek.
+The Current Maintainers of this work are
+Heiko Oberdiek and the Oberdiek Package Support Group
+https://github.com/ho-tex/oberdiek/issues
+
 
 The Base Interpreter refers to any `TeX-Format',
 because some files are installed in TDS:tex/generic//.
@@ -164,7 +169,7 @@ and the derived files
   author={Abraham, Jan},
   title={[texhax] Beginner in TEX MACRO to compute functions},
   date={2012-04-07},
-  url={http://tug.org/pipermail/texhax/2012-April/019146.html},
+  url={https://tug.org/pipermail/texhax/2012-April/019146.html},
   urldate={2012-04-08},
 }
 @article{knuth:negafibonacci,
@@ -180,7 +185,7 @@ and the derived files
   language={langenglish},
   version={486266088},
   date={2012-04-08},
-  url={http://en.wikipedia.org/w/index.php?title=Fibonacci_number&oldid=486266088},
+  url={https://en.wikipedia.org/w/index.php?title=Fibonacci_number&oldid=486266088},
   urldate={2012-04-08},
 }
 %</bib>
@@ -234,8 +239,7 @@ and the derived files
 % \title{The \xpackage{fibnum} package}
 % \date{2016/05/16 v1.1}
 % \author{Heiko Oberdiek\thanks
-% {Please report any issues at https://github.com/ho-tex/oberdiek/issues}\\
-% \xemail{heiko.oberdiek at googlemail.com}}
+% {Please report any issues at \url{https://github.com/ho-tex/oberdiek/issues}}}
 %
 % \maketitle
 %
@@ -980,7 +984,7 @@ and the derived files
 % \subsection{Download}
 %
 % \paragraph{Package.} This package is available on
-% CTAN\footnote{\url{http://ctan.org/pkg/fibnum}}:
+% CTAN\footnote{\CTANpkg{fibnum}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/fibnum.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/fibnum.pdf}] Documentation.
@@ -992,7 +996,7 @@ and the derived files
 % the packages are already unpacked and the documentation files
 % are generated. The files and directories obey the TDS standard.
 % \begin{description}
-% \item[\CTAN{install/macros/latex/contrib/oberdiek.tds.zip}]
+% \item[\CTANinstall{install/macros/latex/contrib/oberdiek.tds.zip}]
 % \end{description}
 % \emph{TDS} refers to the standard ``A Directory Structure
 % for \TeX\ Files'' (\CTAN{tds/tds.pdf}). Directories
@@ -1113,16 +1117,6 @@ and the derived files
 %
 % \subsection{Some details for the interested}
 %
-% \paragraph{Attached source.}
-%
-% The PDF documentation on CTAN also includes the
-% \xfile{.dtx} source file. It can be extracted by
-% AcrobatReader 6 or higher. Another option is \textsf{pdftk},
-% e.g. unpack the file into the current directory:
-% \begin{quote}
-%   \verb|pdftk fibnum.pdf unpack_files output .|
-% \end{quote}
-%
 % \paragraph{Unpacking with \LaTeX.}
 % The \xfile{.dtx} chooses its action depending on the format:
 % \begin{description}
diff --git a/macros/latex/contrib/oberdiek/fibnum.pdf b/macros/latex/contrib/oberdiek/fibnum.pdf
index ec75840fa0..2daaba8c3a 100644
--- a/macros/latex/contrib/oberdiek/fibnum.pdf
+++ b/macros/latex/contrib/oberdiek/fibnum.pdf
diff --git a/macros/latex/contrib/oberdiek/flags.dtx b/macros/latex/contrib/oberdiek/flags.dtx
index d763f55168..2de01a65a0 100644
--- a/macros/latex/contrib/oberdiek/flags.dtx
+++ b/macros/latex/contrib/oberdiek/flags.dtx
@@ -13,15 +13,17 @@
 % conditions of the LaTeX Project Public License, either
 % version 1.3c of this license or (at your option) any later
 % version. This version of this license is in
-%    http://www.latex-project.org/lppl/lppl-1-3c.txt
+%    https://www.latex-project.org/lppl/lppl-1-3c.txt
 % and the latest version of this license is in
-%    http://www.latex-project.org/lppl.txt
+%    https://www.latex-project.org/lppl.txt
 % and version 1.3 or later is part of all distributions of
 % LaTeX version 2005/12/01 or later.
 %
 % This work has the LPPL maintenance status "maintained".
 %
-% This Current Maintainer of this work is Heiko Oberdiek.
+% The Current Maintainers of this work are
+% Heiko Oberdiek and the Oberdiek Package Support Group
+% https://github.com/ho-tex/oberdiek/issues
 %
 % This work consists of the main source file flags.dtx
 % and the derived files
@@ -98,15 +100,18 @@ This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either
 version 1.3c of this license or (at your option) any later
 version. This version of this license is in
-   http://www.latex-project.org/lppl/lppl-1-3c.txt
+   https://www.latex-project.org/lppl/lppl-1-3c.txt
 and the latest version of this license is in
-   http://www.latex-project.org/lppl.txt
+   https://www.latex-project.org/lppl.txt
 and version 1.3 or later is part of all distributions of
 LaTeX version 2005/12/01 or later.
 
 This work has the LPPL maintenance status "maintained".
 
-This Current Maintainer of this work is Heiko Oberdiek.
+The Current Maintainers of this work are
+Heiko Oberdiek and the Oberdiek Package Support Group
+https://github.com/ho-tex/oberdiek/issues
+
 
 This work consists of the main source file flags.dtx
 and the derived files
@@ -181,8 +186,7 @@ and the derived files
 % \title{The \xpackage{flags} package}
 % \date{2016/05/16 v0.5}
 % \author{Heiko Oberdiek\thanks
-% {Please report any issues at https://github.com/ho-tex/oberdiek/issues}\\
-% \xemail{heiko.oberdiek at googlemail.com}}
+% {Please report any issues at \url{https://github.com/ho-tex/oberdiek/issues}}}
 %
 % \maketitle
 %
@@ -473,7 +477,7 @@ and the derived files
 % \subsection{Download}
 %
 % \paragraph{Package.} This package is available on
-% CTAN\footnote{\url{http://ctan.org/pkg/flags}}:
+% CTAN\footnote{\CTANpkg{flags}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/flags.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/flags.pdf}] Documentation.
@@ -485,7 +489,7 @@ and the derived files
 % the packages are already unpacked and the documentation files
 % are generated. The files and directories obey the TDS standard.
 % \begin{description}
-% \item[\CTAN{install/macros/latex/contrib/oberdiek.tds.zip}]
+% \item[\CTANinstall{install/macros/latex/contrib/oberdiek.tds.zip}]
 % \end{description}
 % \emph{TDS} refers to the standard ``A Directory Structure
 % for \TeX\ Files'' (\CTAN{tds/tds.pdf}). Directories
@@ -604,16 +608,6 @@ and the derived files
 %
 % \subsection{Some details for the interested}
 %
-% \paragraph{Attached source.}
-%
-% The PDF documentation on CTAN also includes the
-% \xfile{.dtx} source file. It can be extracted by
-% AcrobatReader 6 or higher. Another option is \textsf{pdftk},
-% e.g. unpack the file into the current directory:
-% \begin{quote}
-%   \verb|pdftk flags.pdf unpack_files output .|
-% \end{quote}
-%
 % \paragraph{Unpacking with \LaTeX.}
 % The \xfile{.dtx} chooses its action depending on the format:
 % \begin{description}
@@ -649,45 +643,6 @@ and the derived files
 %\end{verbatim}
 % \end{quote}
 %
-% \section{Catalogue}
-%
-% The following XML file can be used as source for the
-% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
-% The elements \texttt{caption} and \texttt{description} are imported
-% from the original XML file from the Catalogue.
-% The name of the XML file in the Catalogue is \xfile{flags.xml}.
-%    \begin{macrocode}
-%<*catalogue>
-<?xml version='1.0' encoding='us-ascii'?>
-<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
-<entry datestamp='$Date$' modifier='$Author$' id='flags'>
-  <name>flags</name>
-  <caption>Setting and clearing of flags in bit fields.</caption>
-  <authorref id='auth:oberdiek'/>
-  <copyright owner='Heiko Oberdiek' year='2007'/>
-  <license type='lppl1.3'/>
-  <version number='0.5'/>
-  <description>
-    This package allows the setting and clearing
-    of flags in bit fields and converts the bit field into a
-    decimal number. Currently the bit field is limited to 31 bits.
-    <p/>
-    It is now deprecated because of new more powerful
-    package <xref refid='bitset'>bitset</xref>.
-    <p/>
-    The package is part of the <xref refid='oberdiek'>oberdiek</xref>
-    bundle.
-  </description>
-  <documentation details='Package documentation'
-      href='ctan:/macros/latex/contrib/oberdiek/flags.pdf'/>
-  <ctan file='true' path='/macros/latex/contrib/oberdiek/flags.dtx'/>
-  <miktex location='oberdiek'/>
-  <texlive location='oberdiek'/>
-  <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
-</entry>
-%</catalogue>
-%    \end{macrocode}
-%
 % \begin{History}
 %   \begin{Version}{2007/02/18 v0.1}
 %   \item
diff --git a/macros/latex/contrib/oberdiek/flags.pdf b/macros/latex/contrib/oberdiek/flags.pdf
index 5255e85dbd..4d68750740 100644
--- a/macros/latex/contrib/oberdiek/flags.pdf
+++ b/macros/latex/contrib/oberdiek/flags.pdf
diff --git a/macros/latex/contrib/oberdiek/gettitlestring.dtx b/macros/latex/contrib/oberdiek/gettitlestring.dtx
index 6ac8997800..a99f0af4ee 100644
--- a/macros/latex/contrib/oberdiek/gettitlestring.dtx
+++ b/macros/latex/contrib/oberdiek/gettitlestring.dtx
@@ -13,15 +13,17 @@
 % conditions of the LaTeX Project Public License, either
 % version 1.3c of this license or (at your option) any later
 % version. This version of this license is in
-%    http://www.latex-project.org/lppl/lppl-1-3c.txt
+%    https://www.latex-project.org/lppl/lppl-1-3c.txt
 % and the latest version of this license is in
-%    http://www.latex-project.org/lppl.txt
+%    https://www.latex-project.org/lppl.txt
 % and version 1.3 or later is part of all distributions of
 % LaTeX version 2005/12/01 or later.
 %
 % This work has the LPPL maintenance status "maintained".
 %
-% This Current Maintainer of this work is Heiko Oberdiek.
+% The Current Maintainers of this work are
+% Heiko Oberdiek and the Oberdiek Package Support Group
+% https://github.com/ho-tex/oberdiek/issues
 %
 % The Base Interpreter refers to any `TeX-Format',
 % because some files are installed in TDS:tex/generic//.
@@ -105,15 +107,18 @@ This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either
 version 1.3c of this license or (at your option) any later
 version. This version of this license is in
-   http://www.latex-project.org/lppl/lppl-1-3c.txt
+   https://www.latex-project.org/lppl/lppl-1-3c.txt
 and the latest version of this license is in
-   http://www.latex-project.org/lppl.txt
+   https://www.latex-project.org/lppl.txt
 and version 1.3 or later is part of all distributions of
 LaTeX version 2005/12/01 or later.
 
 This work has the LPPL maintenance status "maintained".
 
-This Current Maintainer of this work is Heiko Oberdiek.
+The Current Maintainers of this work are
+Heiko Oberdiek and the Oberdiek Package Support Group
+https://github.com/ho-tex/oberdiek/issues
+
 
 The Base Interpreter refers to any `TeX-Format',
 because some files are installed in TDS:tex/generic//.
@@ -196,8 +201,7 @@ and the derived files
 % \title{The \xpackage{gettitlestring} package}
 % \date{2016/05/16 v1.5}
 % \author{Heiko Oberdiek\thanks
-% {Please report any issues at https://github.com/ho-tex/oberdiek/issues}\\
-% \xemail{heiko.oberdiek at googlemail.com}}
+% {Please report any issues at \url{https://github.com/ho-tex/oberdiek/issues}}}
 %
 % \maketitle
 %
@@ -767,7 +771,7 @@ and the derived files
 % \subsection{Download}
 %
 % \paragraph{Package.} This package is available on
-% CTAN\footnote{\url{http://ctan.org/pkg/gettitlestring}}:
+% CTAN\footnote{\CTANpkg{gettitlestring}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/gettitlestring.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/gettitlestring.pdf}] Documentation.
@@ -779,7 +783,7 @@ and the derived files
 % the packages are already unpacked and the documentation files
 % are generated. The files and directories obey the TDS standard.
 % \begin{description}
-% \item[\CTAN{install/macros/latex/contrib/oberdiek.tds.zip}]
+% \item[\CTANinstall{install/macros/latex/contrib/oberdiek.tds.zip}]
 % \end{description}
 % \emph{TDS} refers to the standard ``A Directory Structure
 % for \TeX\ Files'' (\CTAN{tds/tds.pdf}). Directories
@@ -900,16 +904,6 @@ and the derived files
 %
 % \subsection{Some details for the interested}
 %
-% \paragraph{Attached source.}
-%
-% The PDF documentation on CTAN also includes the
-% \xfile{.dtx} source file. It can be extracted by
-% AcrobatReader 6 or higher. Another option is \textsf{pdftk},
-% e.g. unpack the file into the current directory:
-% \begin{quote}
-%   \verb|pdftk gettitlestring.pdf unpack_files output .|
-% \end{quote}
-%
 % \paragraph{Unpacking with \LaTeX.}
 % The \xfile{.dtx} chooses its action depending on the format:
 % \begin{description}
@@ -945,60 +939,25 @@ and the derived files
 %\end{verbatim}
 % \end{quote}
 %
-% \section{Catalogue}
-%
-% The following XML file can be used as source for the
-% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
-% The elements \texttt{caption} and \texttt{description} are imported
-% from the original XML file from the Catalogue.
-% The name of the XML file in the Catalogue is \xfile{gettitlestring.xml}.
-%    \begin{macrocode}
-%<*catalogue>
-<?xml version='1.0' encoding='us-ascii'?>
-<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
-<entry datestamp='$Date$' modifier='$Author$' id='gettitlestring'>
-  <name>gettitlestring</name>
-  <caption>Clean up title references.</caption>
-  <authorref id='auth:oberdiek'/>
-  <copyright owner='Heiko Oberdiek' year='2009,2010'/>
-  <license type='lppl1.3'/>
-  <version number='1.5'/>
-  <description>
-    Cleans up the title string (removing <tt>\label</tt> commands) for
-    packages (such as <xref refid='nameref'>nameref</xref>) that
-    typeset such strings.
-    <p/>
-    The package is part of the <xref refid='oberdiek'>oberdiek</xref> bundle.
-  </description>
-  <documentation details='Package documentation'
-      href='ctan:/macros/latex/contrib/oberdiek/gettitlestring.pdf'/>
-  <ctan file='true' path='/macros/latex/contrib/oberdiek/gettitlestring.dtx'/>
-  <miktex location='oberdiek'/>
-  <texlive location='oberdiek'/>
-  <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
-</entry>
-%</catalogue>
-%    \end{macrocode}
-%
 % \begin{thebibliography}{9}
 %
 % \bibitem{memoir}
 % Peter Wilson, Lars Madsen:
 % \textit{The Memoir Class};
 % 2009/11/17 v1.61803398c;
-% \CTAN{macros/latex/contrib/memoir/}
+% \CTANpkg{memoir}
 %
 % \bibitem{titleref}
 % Donald Arsenau:
 % \textit{Titleref.sty};
 % 2001/04/05 ver 3.1;
-% \CTAN{macros/latex/contrib/misc/titleref.sty}
+% \CTANpkg{titleref}
 %
 % \bibitem{zref}
 % Heiko Oberdiek:
 % \textit{The \xpackage{zref} package};
 % 2009/12/08 v2.7;
-% \CTAN{macros/latex/contrib/oberdiek/zref.pdf}
+% \CTANpkg{zref}
 %
 % \end{thebibliography}
 %
diff --git a/macros/latex/contrib/oberdiek/gettitlestring.pdf b/macros/latex/contrib/oberdiek/gettitlestring.pdf
index ce6c0846e6..c750737b38 100644
--- a/macros/latex/contrib/oberdiek/gettitlestring.pdf
+++ b/macros/latex/contrib/oberdiek/gettitlestring.pdf
diff --git a/macros/latex/contrib/oberdiek/grfext.dtx b/macros/latex/contrib/oberdiek/grfext.dtx
index fef35e9181..8ebd84fa4a 100644
--- a/macros/latex/contrib/oberdiek/grfext.dtx
+++ b/macros/latex/contrib/oberdiek/grfext.dtx
@@ -13,15 +13,17 @@
 % conditions of the LaTeX Project Public License, either
 % version 1.3c of this license or (at your option) any later
 % version. This version of this license is in
-%    http://www.latex-project.org/lppl/lppl-1-3c.txt
+%    https://www.latex-project.org/lppl/lppl-1-3c.txt
 % and the latest version of this license is in
-%    http://www.latex-project.org/lppl.txt
+%    https://www.latex-project.org/lppl.txt
 % and version 1.3 or later is part of all distributions of
 % LaTeX version 2005/12/01 or later.
 %
 % This work has the LPPL maintenance status "maintained".
 %
-% This Current Maintainer of this work is Heiko Oberdiek.
+% The Current Maintainers of this work are
+% Heiko Oberdiek and the Oberdiek Package Support Group
+% https://github.com/ho-tex/oberdiek/issues
 %
 % This work consists of the main source file grfext.dtx
 % and the derived files
@@ -101,15 +103,18 @@ This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either
 version 1.3c of this license or (at your option) any later
 version. This version of this license is in
-   http://www.latex-project.org/lppl/lppl-1-3c.txt
+   https://www.latex-project.org/lppl/lppl-1-3c.txt
 and the latest version of this license is in
-   http://www.latex-project.org/lppl.txt
+   https://www.latex-project.org/lppl.txt
 and version 1.3 or later is part of all distributions of
 LaTeX version 2005/12/01 or later.
 
 This work has the LPPL maintenance status "maintained".
 
-This Current Maintainer of this work is Heiko Oberdiek.
+The Current Maintainers of this work are
+Heiko Oberdiek and the Oberdiek Package Support Group
+https://github.com/ho-tex/oberdiek/issues
+
 
 This work consists of the main source file grfext.dtx
 and the derived files
@@ -188,8 +193,7 @@ and the derived files
 % \title{The \xpackage{grfext} package}
 % \date{2016/05/16 v1.2}
 % \author{Heiko Oberdiek\thanks
-% {Please report any issues at https://github.com/ho-tex/oberdiek/issues}\\
-% \xemail{heiko.oberdiek at googlemail.com}}
+% {Please report any issues at \url{https://github.com/ho-tex/oberdiek/issues}}}
 %
 % \maketitle
 %
@@ -938,7 +942,7 @@ and the derived files
 % \subsection{Download}
 %
 % \paragraph{Package.} This package is available on
-% CTAN\footnote{\url{http://ctan.org/pkg/grfext}}:
+% CTAN\footnote{\CTANpkg{grfext}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/grfext.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/grfext.pdf}] Documentation.
@@ -950,7 +954,7 @@ and the derived files
 % the packages are already unpacked and the documentation files
 % are generated. The files and directories obey the TDS standard.
 % \begin{description}
-% \item[\CTAN{install/macros/latex/contrib/oberdiek.tds.zip}]
+% \item[\CTANinstall{install/macros/latex/contrib/oberdiek.tds.zip}]
 % \end{description}
 % \emph{TDS} refers to the standard ``A Directory Structure
 % for \TeX\ Files'' (\CTAN{tds/tds.pdf}). Directories
@@ -1071,16 +1075,6 @@ and the derived files
 %
 % \subsection{Some details for the interested}
 %
-% \paragraph{Attached source.}
-%
-% The PDF documentation on CTAN also includes the
-% \xfile{.dtx} source file. It can be extracted by
-% AcrobatReader 6 or higher. Another option is \textsf{pdftk},
-% e.g. unpack the file into the current directory:
-% \begin{quote}
-%   \verb|pdftk grfext.pdf unpack_files output .|
-% \end{quote}
-%
 % \paragraph{Unpacking with \LaTeX.}
 % The \xfile{.dtx} chooses its action depending on the format:
 % \begin{description}
@@ -1116,41 +1110,6 @@ and the derived files
 %\end{verbatim}
 % \end{quote}
 %
-% \section{Catalogue}
-%
-% The following XML file can be used as source for the
-% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
-% The elements \texttt{caption} and \texttt{description} are imported
-% from the original XML file from the Catalogue.
-% The name of the XML file in the Catalogue is \xfile{grfext.xml}.
-%    \begin{macrocode}
-%<*catalogue>
-<?xml version='1.0' encoding='us-ascii'?>
-<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
-<entry datestamp='$Date$' modifier='$Author$' id='grfext'>
-  <name>grfext</name>
-  <caption>Manipulate the graphics package's list of extensions.</caption>
-  <authorref id='auth:oberdiek'/>
-  <copyright owner='Heiko Oberdiek' year='2007,2010'/>
-  <license type='lppl1.3'/>
-  <version number='1.2'/>
-  <description>
-    This package provides macros for adding to, and reordering the list of
-    graphics file extensions recognised by package
-    <xref refid='graphics'>graphics</xref>.
-    <p/>
-    The package is part of the <xref refid='oberdiek'>oberdiek</xref> bundle.
-  </description>
-  <documentation details='Package documentation'
-      href='ctan:/macros/latex/contrib/oberdiek/grfext.pdf'/>
-  <ctan file='true' path='/macros/latex/contrib/oberdiek/grfext.dtx'/>
-  <miktex location='oberdiek'/>
-  <texlive location='oberdiek'/>
-  <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
-</entry>
-%</catalogue>
-%    \end{macrocode}
-%
 % \begin{thebibliography}{9}
 %
 % \bibitem{graphics}
diff --git a/macros/latex/contrib/oberdiek/grfext.pdf b/macros/latex/contrib/oberdiek/grfext.pdf
index 354205ab63..f756c2bce0 100644
--- a/macros/latex/contrib/oberdiek/grfext.pdf
+++ b/macros/latex/contrib/oberdiek/grfext.pdf
diff --git a/macros/latex/contrib/oberdiek/hobsub.dtx b/macros/latex/contrib/oberdiek/hobsub.dtx
deleted file mode 100644
index dd01a4126e..0000000000
--- a/macros/latex/contrib/oberdiek/hobsub.dtx
+++ /dev/null
@@ -1,1490 +0,0 @@
-% \iffalse meta-comment
-%
-% File: hobsub.dtx
-% Version: 2016/05/16 v1.14
-% Info: Construct package bundles
-%
-% Copyright (C) 2011, 2012 by
-%    Heiko Oberdiek <heiko.oberdiek at googlemail.com>
-%    2016
-%    https://github.com/ho-tex/oberdiek/issues
-%
-% This work may be distributed and/or modified under the
-% conditions of the LaTeX Project Public License, either
-% version 1.3c of this license or (at your option) any later
-% version. This version of this license is in
-%    http://www.latex-project.org/lppl/lppl-1-3c.txt
-% and the latest version of this license is in
-%    http://www.latex-project.org/lppl.txt
-% and version 1.3 or later is part of all distributions of
-% LaTeX version 2005/12/01 or later.
-%
-% This work has the LPPL maintenance status "maintained".
-%
-% This Current Maintainer of this work is Heiko Oberdiek.
-%
-% The Base Interpreter refers to any `TeX-Format',
-% because some files are installed in TDS:tex/generic//.
-%
-% This work consists of the main source file hobsub.dtx
-% and the derived files
-%    hobsub.sty, hobsub.pdf, hobsub.ins, hobsub.drv, hobsub-generic.sty,
-%    hobsub-hyperref.sty, hobsub-test1.tex.
-%
-% Distribution:
-%    CTAN:macros/latex/contrib/oberdiek/hobsub.dtx
-%    CTAN:macros/latex/contrib/oberdiek/hobsub.pdf
-%
-% Unpacking:
-%    (a) If hobsub.ins is present:
-%           tex hobsub.ins
-%    (b) Without hobsub.ins:
-%           tex hobsub.dtx
-%    (c) If you insist on using LaTeX
-%           latex \let\install=y\input{hobsub.dtx}
-%        (quote the arguments according to the demands of your shell)
-%
-% Documentation:
-%    (a) If hobsub.drv is present:
-%           latex hobsub.drv
-%    (b) Without hobsub.drv:
-%           latex hobsub.dtx; ...
-%    The class ltxdoc loads the configuration file ltxdoc.cfg
-%    if available. Here you can specify further options, e.g.
-%    use A4 as paper format:
-%       \PassOptionsToClass{a4paper}{article}
-%
-%    Programm calls to get the documentation (example):
-%       pdflatex hobsub.dtx
-%       makeindex -s gind.ist hobsub.idx
-%       pdflatex hobsub.dtx
-%       makeindex -s gind.ist hobsub.idx
-%       pdflatex hobsub.dtx
-%
-% Installation:
-%    TDS:tex/generic/oberdiek/hobsub.sty
-%    TDS:tex/generic/oberdiek/hobsub-generic.sty
-%    TDS:tex/generic/oberdiek/hobsub-hyperref.sty
-%    TDS:doc/latex/oberdiek/hobsub.pdf
-%    TDS:doc/latex/oberdiek/test/hobsub-test1.tex
-%    TDS:source/latex/oberdiek/hobsub.dtx
-%
-%<*ignore>
-\begingroup
-  \catcode123=1 %
-  \catcode125=2 %
-  \def\x{LaTeX2e}%
-\expandafter\endgroup
-\ifcase 0\ifx\install y1\fi\expandafter
-         \ifx\csname processbatchFile\endcsname\relax\else1\fi
-         \ifx\fmtname\x\else 1\fi\relax
-\else\csname fi\endcsname
-%</ignore>
-%<*install>
-\input docstrip.tex
-\Msg{************************************************************************}
-\Msg{* Installation}
-\Msg{* Package: hobsub 2016/05/16 v1.14 Construct package bundles (HO)}
-\Msg{************************************************************************}
-
-\keepsilent
-\askforoverwritefalse
-
-\let\MetaPrefix\relax
-\preamble
-
-This is a generated file.
-
-Project: hobsub
-Version: 2016/05/16 v1.14
-
-Copyright (C) 2011, 2012 by
-   Heiko Oberdiek <heiko.oberdiek at googlemail.com>
-
-This work may be distributed and/or modified under the
-conditions of the LaTeX Project Public License, either
-version 1.3c of this license or (at your option) any later
-version. This version of this license is in
-   http://www.latex-project.org/lppl/lppl-1-3c.txt
-and the latest version of this license is in
-   http://www.latex-project.org/lppl.txt
-and version 1.3 or later is part of all distributions of
-LaTeX version 2005/12/01 or later.
-
-This work has the LPPL maintenance status "maintained".
-
-This Current Maintainer of this work is Heiko Oberdiek.
-
-The Base Interpreter refers to any `TeX-Format',
-because some files are installed in TDS:tex/generic//.
-
-This work consists of the main source file hobsub.dtx
-and the derived files
-   hobsub.sty, hobsub.pdf, hobsub.ins, hobsub.drv, hobsub-generic.sty,
-   hobsub-hyperref.sty, hobsub-test1.tex.
-
-\endpreamble
-\let\MetaPrefix\DoubleperCent
-
-\generate{%
-  \file{hobsub.ins}{\from{hobsub.dtx}{install}}%
-  \file{hobsub.drv}{\from{hobsub.dtx}{driver}}%
-  \usedir{tex/generic/oberdiek}%
-  \file{hobsub.sty}{\from{hobsub.dtx}{package}}%
-%  \usedir{doc/latex/oberdiek/test}%
-%  \file{hobsub-test1.tex}{\from{hobsub.dtx}{test1}}%
-  \nopreamble
-  \nopostamble
-%  \usedir{source/latex/oberdiek/catalogue}%
-%  \file{hobsub.xml}{\from{hobsub.dtx}{catalogue}}%
-}
-\let\hobsubSavedNormalLine\normalLine
-\def\hobsubGobble#1{}
-\begingroup
-  \lccode`\0=32 % space
-  \lccode`\1=35 % hash
-  \lccode`\2=37 % percent
-  \lccode`\3=92 % backslash
-  \lccode`\4=123 % {
-  \lccode`\5=125 % }
-\lowercase{\endgroup
-  \let\hobsubTokenSpaceOther= 0%
-  \let\hobsubTokenHash= 1%
-  \let\hobsubTokenPercent= 2%
-  \let\hobsubTokenBackslash= 3%
-  \let\hobsubTokenBraceLeft= 4%
-  \let\hobsubTokenBraceRight= 5%
-  \def\hobsubNormalLineWithSpace{%
-    \hobsubSavedNormalLine0%
-  }%
-}
-\def\normalLine{%
-  \futurelet\hobsubToken\hobsubFirst
-}
-\def\hobsubFirst{%
-  \ifx\hobsubToken\hobsubTokenSpaceOther
-    \expandafter\expandafter\expandafter\futurelet
-    \expandafter\expandafter\expandafter\hobsubToken
-    \expandafter\expandafter\expandafter\hobsubNext
-    \expandafter\hobsubGobble
-  \else
-    \expandafter\hobsubSavedNormalLine
-  \fi
-}
-\def\hobsubNext{%
-  \ifx\hobsubToken\hobsubTokenSpaceOther
-    \expandafter\expandafter\expandafter\futurelet
-    \expandafter\expandafter\expandafter\hobsubToken
-    \expandafter\expandafter\expandafter\hobsubNext 
-    \expandafter\hobsubGobble
-  \else
-    \let\hobsubWithSpace=Y%
-    \ifx\hobsubToken\hobsubTokenBackslash
-      \let\hobsubWithSpace=N%
-    \else
-      \ifx\hobsubToken\hobsubTokenBraceRight
-        \let\hobsubWithSpace=N%
-      \else
-        \ifx\hobsubToken\hobsubTokenBraceLeft
-          \let\hobsubWithSpace=N%
-        \else
-          \ifx\hobsubToken\hobsubTokenPercent
-            \let\hobsubWithSpace=N%
-          \else
-            \ifx\hobsubToken\hobsubTokenHash
-              \let\hobsubWithSpace=N%
-            \fi
-          \fi
-        \fi
-      \fi
-    \fi
-    \ifx\hobsubWithSpace Y%
-      \expandafter\expandafter\expandafter\hobsubNormalLineWithSpace
-    \else
-      \expandafter\expandafter\expandafter\hobsubSavedNormalLine
-    \fi
-  \fi
-}
-\generate{%
-  \usedir{tex/generic/oberdiek}%
-  \file{hobsub-generic.sty}{%
-    \from{hobsub.dtx}{generic,preamble,infwarerr}%
-    \from{infwarerr.dtx}{package}%
-    \from{hobsub.dtx}{post,ltxcmds}%
-    \from{ltxcmds.dtx}{package}%
-    \from{hobsub.dtx}{post,ifluatex}%
-    \from{ifluatex.dtx}{package}%
-    \from{hobsub.dtx}{post,ifvtex}%
-    \from{ifvtex.dtx}{package}%
-    \from{hobsub.dtx}{post,intcalc}%
-    \from{intcalc.dtx}{package}%
-    \from{hobsub.dtx}{post,ifpdf}%
-    \from{ifpdf.dtx}{package}%
-    \from{hobsub.dtx}{post,etexcmds}%
-    \from{etexcmds.dtx}{package}%
-    \from{hobsub.dtx}{post,kvsetkeys}%
-    \from{kvsetkeys.dtx}{package}%
-    \from{hobsub.dtx}{post,kvdefinekeys}%
-    \from{kvdefinekeys.dtx}{package}%
-    \from{hobsub.dtx}{post,luatex-loader}%
-    \from{luatex.dtx}{loader}%
-    \from{hobsub.dtx}{post,pdftexcmds}%
-    \from{pdftexcmds.dtx}{package}%
-    \from{hobsub.dtx}{post,pdfescape}%
-    \from{pdfescape.dtx}{package}%
-    \from{hobsub.dtx}{post,bigintcalc}%
-    \from{bigintcalc.dtx}{package}%
-    \from{hobsub.dtx}{post,bitset}%
-    \from{bitset.dtx}{package}%
-    \from{hobsub.dtx}{post,uniquecounter}%
-    \from{uniquecounter.dtx}{package}%
-    \from{hobsub.dtx}{post,atend}%
-  }%
-}
-\generate{%
-  \usedir{tex/generic/oberdiek}%
-  \file{hobsub-hyperref.sty}{%
-    \from{hobsub.dtx}{hyperref,preamble,,letltxmacro}%
-    \from{letltxmacro.dtx}{package}%
-    \from{hobsub.dtx}{post,hopatch}%
-    \from{hopatch.dtx}{package}%
-    \from{hobsub.dtx}{post,xcolor-patch}%
-    \from{hycolor.dtx}{xcolor}%
-    \from{hobsub.dtx}{post,atveryend}%
-    \from{atveryend.dtx}{package}%
-    \from{hobsub.dtx}{post,atbegshi}%
-    \from{atbegshi.dtx}{package}%
-    \from{hobsub.dtx}{post,refcount}%
-    \from{refcount.dtx}{package}%
-    \from{hobsub.dtx}{post,hycolor}%
-    \from{hycolor.dtx}{package}%
-    \from{hobsub.dtx}{post}%
-  }%
-}
-\let\normalLine\hobsubSavedNormalLine
-
-\catcode32=13\relax% active space
-\let =\space%
-\Msg{************************************************************************}
-\Msg{*}
-\Msg{* To finish the installation you have to move the following}
-\Msg{* files into a directory searched by TeX:}
-\Msg{*}
-\Msg{*     hobsub.sty, hobsub-generic.sty, hobsub-hyperref.sty}
-\Msg{*}
-\Msg{* To produce the documentation run the file `hobsub.drv'}
-\Msg{* through LaTeX.}
-\Msg{*}
-\Msg{* Happy TeXing!}
-\Msg{*}
-\Msg{************************************************************************}
-
-\endbatchfile
-%</install>
-%<*ignore>
-\fi
-%</ignore>
-%<*driver>
-\NeedsTeXFormat{LaTeX2e}
-\ProvidesFile{hobsub.drv}%
-  [2016/05/16 v1.14 Construct package bundles (HO)]%
-\documentclass{ltxdoc}
-\usepackage{holtxdoc}[2011/11/22]
-\usepackage{array}
-\usepackage{caption}
-\renewcommand*{\bottomfraction}{.5}
-\renewcommand*{\topfraction}{.5}
-\begin{document}
-  \DocInput{hobsub.dtx}%
-\end{document}
-%</driver>
-% \fi
-%
-%
-% \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
-%   Lower-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
-%   Digits        \0\1\2\3\4\5\6\7\8\9
-%   Exclamation   \!     Double quote  \"     Hash (number) \#
-%   Dollar        \$     Percent       \%     Ampersand     \&
-%   Acute accent  \'     Left paren    \(     Right paren   \)
-%   Asterisk      \*     Plus          \+     Comma         \,
-%   Minus         \-     Point         \.     Solidus       \/
-%   Colon         \:     Semicolon     \;     Less than     \<
-%   Equals        \=     Greater than  \>     Question mark \?
-%   Commercial at \@     Left bracket  \[     Backslash     \\
-%   Right bracket \]     Circumflex    \^     Underscore    \_
-%   Grave accent  \`     Left brace    \{     Vertical bar  \|
-%   Right brace   \}     Tilde         \~}
-%
-% \GetFileInfo{hobsub.drv}
-%
-% \title{The \xpackage{hobsub} package}
-% \date{2016/05/16 v1.14}
-% \author{Heiko Oberdiek\thanks
-% {Please report any issues at https://github.com/ho-tex/oberdiek/issues}\\
-% \xemail{heiko.oberdiek at googlemail.com}}
-%
-% \maketitle
-%
-% \begin{abstract}
-% Package \xpackage{hobsub} implements the idea of loading
-% several packages in one big collection package.
-% \end{abstract}
-%
-% \tableofcontents
-%
-% \def\TableGeneric{^^A
-%   \TableEntry{\xpackage{infwarerr}}{}{2010/04/08 v1.3}^^A
-%   \TableEntry{\xpackage{ltxcmds}}{}{2011/11/09 v1.22}^^A
-%   \TableEntry{\xpackage{ifluatex}}{}{2010/03/01 v1.3}^^A
-%   \TableEntry{\xpackage{ifvtex}}{}{2010/03/01 v1.5}^^A
-%   \TableEntry{\xpackage{intcalc}}{}{2007/09/27 v1.1}^^A
-%   \TableEntry{\xpackage{ifpdf}}{\xpackage{ifluatex}}{2011/01/30 v2.3}^^A
-%   \TableEntry{\xpackage{etexcmds}}{}{2011/02/16 v1.5}^^A
-%   \TableEntry{\xpackage{kvsetkeys}}{}{2012/04/25 v1.16}^^A
-%   \TableEntry{\xpackage{kvdefinekeys}}{}{2011/04/07 v1.3}^^A
-%   \TableEntry{\xpackage{luatex-loader}}{}{2010/03/09 v0.4}^^A
-%   \TableEntry{\xpackage{pdftexcmds}}{\xpackage{ifluatex}, \xpackage{ifpdf}, \xpackage{infwarerr}, \xpackage{ltxcmds}, \xpackage{luatex-loader}}{2011/11/29 v0.20}^^A
-%   \TableEntry{\xpackage{pdfescape}}{\xpackage{ltxcmds}, \xpackage{pdftexcmds}}{2011/11/25 v1.13}^^A
-%   \TableEntry{\xpackage{bigintcalc}}{\xpackage{pdftexcmds}}{2012/04/08 v1.3}^^A
-%   \TableEntry{\xpackage{bitset}}{\xpackage{bigintcalc}, \xpackage{infwarerr}, \xpackage{intcalc}}{2011/01/30 v1.1}^^A
-%   \TableEntry{\xpackage{uniquecounter}}{\xpackage{bigintcalc}, \xpackage{infwarerr}}{2011/01/30 v1.2}^^A
-% }
-% \def\TableHyperref{^^A
-%   \TableEntry{\xpackage{letltxmacro}}{}{2010/09/02 v1.4}^^A
-%   \TableEntry{\xpackage{hopatch}}{}{2016/05/16 v1.2}^^A
-%   \TableEntry{\xpackage{xcolor-patch}}{}{2011/01/30 v1.7}^^A
-%   \TableEntry{\xpackage{atveryend}}{}{2011/06/30 v1.8}^^A
-%   \TableEntry{\xpackage{atbegshi}}{\xpackage{ifpdf}, \xpackage{infwarerr}, \xpackage{ltxcmds}}{2011/10/05 v1.16}^^A
-%   \TableEntry{\xpackage{refcount}}{\xpackage{infwarerr}, \xpackage{ltxcmds}}{2011/10/16 v3.4}^^A
-%   \TableEntry{\xpackage{hycolor}}{\xpackage{xcolor-patch}}{2011/01/30 v1.7}^^A
-% }
-%
-% \newenvironment{TableList}[2][htbp]{^^A
-%   \begin{table}[{#1}]^^A
-%   \centering
-%   \caption{Overview \xpackage{hobsub-#2}}^^A
-%   \label{tab:#2}^^A
-%   \begin{tabular}{ll>{\raggedright}p{.4\linewidth}}^^A
-%   \bfseries Package & \bfseries Release &
-%   \bfseries Dependencies\tabularnewline
-%   \hline
-% }{^^A
-%   \end{tabular}^^A
-%   \end{table}^^A
-% }
-% \newcommand*{\TableEntry}[3]{%
-%   #1&#3&#2\tabularnewline
-% }
-%
-% \renewcommand*{\arraystretch}{1.1}
-% \setlength{\extrarowheight}{2pt}
-%
-% \section{Documentation}
-%
-% In January 2011 the mailing list lualatex-dev discussed
-% ``quietening lualatex console output'' \cite{lualatex:quiet}.
-% Inspired from this, I implemented this package \xpackage{hobsub}
-% to load several packages in one file. The package is applied for
-% two packages collections that are subsets of my package bundle
-% \xpackage{oberdiek}.
-% \begin{description}
-% \item[\xpackage{hobsub-generic}] is a collection of packages
-%   that can also be used with \hologo{plainTeX}.
-% \item[\xpackage{hobsub-hyperref}] is a collection of packages
-%   that is used by package \xpackage{hyperref}.
-% \end{description}
-%
-% Package \xpackage{hobsub} provides the macros that
-% are used in the collection packages and might be used
-% in other projects as well. But there are many caveats,
-% some of them are discussed below.
-%
-% The most serious problem is consistency. A package
-% that is available as standalone package and is part
-% of a collection might have different versions.
-% Because my packages are organized in a bundle and should
-% be installed and updated as bundle, the risk seems low
-% to me. However, if a single package is updated manually, for
-% example for testing, then it should be loaded before the
-% collection that contains the package with an older version.
-% In a collection, the package will not be loaded again if it
-% is already loaded.
-%
-% \subsection{Usage}
-%
-% The collection packages \xpackage{hobsub-generic} and
-% \xpackage{hobsub-hyperref} are loaded as usual:
-% \begin{quote}
-%  \begin{tabular}{@{}ll@{}}
-%    |\usepackage{hobsub-generic}| & \hologo{LaTeX}\\
-%    |\input hobsub-generic.sty| & \hologo{plainTeX}
-%  \end{tabular}
-% \end{quote}
-% or
-% \begin{quote}|\usepackage{hobsub-hyperref}|\end{quote}
-% Of course, both \cs{usepackage} or \cs{RequirePackage}
-% can be used.
-%
-% If you need requirements on the version date of a package
-% inside a collection, then specify them afterwards, for
-% example:
-% \begin{quote}
-%   |\usepackage{hobsub-generic}|\\
-%   |\usepackage{ltxcmds}[2010/12/04]% |^^A
-%   {\itshape |\ltx@ifblank is needed|}
-% \end{quote}
-%
-% Also it is not garanteed that a package will be always
-% part of a collection. Therefore it does not harm,
-% to make the requirements explicite \emph{after}
-% a collection is loaded, see the previous example.
-% \hologo{LaTeX} knows that a
-% package is already loaded and does not load it again.
-%
-% \subsection{Supported features}
-%
-% \begin{description}
-% \item[No reloads:] If a package is already loaded then it
-%  is not reloaded again if it is part of a collection package.
-% \item[\cs{listfiles}:]
-%   Each package that is loaded in a collection is also
-%   added to the output of \cs{listfiles}.
-% \item[\cs{@currname}, \cs{@currext}]
-%   are updated, they are used by \hologo{LaTeX}'s
-%  \cs{ProvidesPackage}.
-% \item[\cs{AtEndOfPackage}:]
-%   \hologo{LaTeX}'s hook mechanism that is used for
-%   \cs{AtEndOfPackage} is supported. However none of the
-%   packages in the collections are using \cs{AtEndOfPackage},
-%   therefore this feature is completely untested.
-% \end{description}
-%
-% \subsection{Common limitations}
-%
-% \begin{description}
-% \item[\cs{endinput}:]
-%   Often a package is using \cs{endinput}, either added by
-%   \xpackage{docstrip}, or to stop package loading at an earlier
-%   time. Therefore \cs{endinput} must be catched during package
-%   loading to prevent that the collection package is closed
-%   too early before reading all packages it contains.
-%
-%   This redefinition of \cs{endinput} fails if the package loads
-%   other files that contain \cs{endinput}. To some degree it could
-%   be catched by redefining macros that load files. But this will
-%   not work for the primitive \cs{input}.
-% \item[Options:]
-%   \hologo{LaTeX}'s package options are not supported.
-%   Therefore the packages that are put in a collection must
-%   not support options.
-% \item[Hook packages:]
-%   Some packages and classes provides hooks for packages, see
-%   packages \xpackage{scrlfile}, \xpackage{filehook}
-%   or class \xclass{memoir}. These hooks are not supported
-%   for embedded packages inside a collection package.
-%   Because of the problem with \cs{endinput}, these hooks
-%   are not supported. The hooks might contain code that
-%   loads other files that execute \cs{endinput}.
-% \end{description}
-%
-% \subsection{Package \xpackage{hobsub-generic}}
-%
-% \begin{TableList}[bp]{generic}\TableGeneric\end{TableList}
-%
-% Collection `generic' contains some of the \hologo{plainTeX} compatible
-% packages of my bundle, see table \ref{tab:generic}.
-% It adds the following restrictions to any package
-% that is part of this collection:
-% \begin{description}
-% \item[Generic formats:] The following formats must be supported:
-%   \hologo{LaTeX}, \hologo{plainTeX} and even \hologo{iniTeX}.
-%   This applies to the collection package \xpackage{hobsub-generic}
-%   the same way.
-% \item[Prefixed macros:]
-%   Any package of this collection should only define macros with
-%   prefixed names to avoid name clashes. Resources like registers
-%   must not be allocated and other global states should not be
-%   changed except for added macro definitions.
-% \end{description}
-% Thus the package \xpackage{hobsub-generic} can also preloaded
-% in the format file with \hologo{iniTeX}.
-%
-% \subsection{Package \xpackage{hobsub-hyperref}}
-%
-% \begin{TableList}[tp]{hyperref}\TableHyperref\end{TableList}
-%
-% Collection `hyperref' contains additional packages that are
-% used by package \xpackage{hyperref} and that does not fit
-% in collection `generic', see table{tab:hyperref}.
-% The latter collection package
-% \xpackage{hobsub-generic} is loaded via a conventional
-% \cs{RequirePackage}.
-%
-% Because most of the packages in the collection `hyperref'
-% needs \hologo{LaTeX}, the collection requires \hologo{LaTeX}.
-%
-% \subsection{Package \xpackage{hobsub}}
-%
-% This section is for advanced users that might want to
-% build a collection package. Then it can be done by
-% using \xpackage{hobsub}:
-% \begin{quote}
-%   \dots\\
-%   |\RequirePackage{hobsub}[2016/05/16]|\\
-%   \dots\\
-%   |\hobsub@StartPackage{foo1}|\\
-%   \textit{\dots\unskip\ package code of \xfile{foo1.sty} \dots}\\
-%   |\endinput|\\
-%   |<hobsub>|\\
-%   |\hobsub@StopPackage|\\
-%   |\hobsub@StartPackage{bar2}|\\
-%   \textit{\dots\unskip\ package code of \xfile{bar2.sty} \dots}\\
-%   |\endinput|\\
-%   |<hobsub>|\\
-%   |\hobsub@StopPackage|
-%   \dots
-% \end{quote}
-% But be aware of the caveats and limitations, see above.
-% Only quite a small portion of the packages can be embedded
-% like this.
-%
-% \clearpage
-%
-% \StopEventually{
-% }
-%
-% \section{Implementation}
-%
-% \subsection{Reload check and package identification}
-%
-% \subsubsection{Package \xpackage{hobsub}}
-%
-%    \begin{macrocode}
-%<*package>
-%    \end{macrocode}
-%    Reload check, especially if the package is not used with \LaTeX.
-%    \begin{macrocode}
-\begingroup\catcode61\catcode48\catcode32=10\relax%
-  \catcode13=5 % ^^M
-  \endlinechar=13 %
-  \catcode35=6 % #
-  \catcode39=12 % '
-  \catcode44=12 % ,
-  \catcode45=12 % -
-  \catcode46=12 % .
-  \catcode58=12 % :
-  \catcode64=11 % @
-  \catcode123=1 % {
-  \catcode125=2 % }
-  \expandafter\let\expandafter\x\csname ver@hobsub.sty\endcsname
-  \ifx\x\relax % plain-TeX, first loading
-  \else
-    \def\empty{}%
-    \ifx\x\empty % LaTeX, first loading,
-      % variable is initialized, but \ProvidesPackage not yet seen
-    \else
-      \expandafter\ifx\csname PackageInfo\endcsname\relax
-        \def\x#1#2{%
-          \immediate\write-1{Package #1 Info: #2.}%
-        }%
-      \else
-        \def\x#1#2{\PackageInfo{#1}{#2, stopped}}%
-      \fi
-      \x{hobsub}{The package is already loaded}%
-      \aftergroup\endinput
-    \fi
-  \fi
-\endgroup%
-%    \end{macrocode}
-%    Package identification:
-%    \begin{macrocode}
-\begingroup\catcode61\catcode48\catcode32=10\relax%
-  \catcode13=5 % ^^M
-  \endlinechar=13 %
-  \catcode35=6 % #
-  \catcode39=12 % '
-  \catcode40=12 % (
-  \catcode41=12 % )
-  \catcode44=12 % ,
-  \catcode45=12 % -
-  \catcode46=12 % .
-  \catcode47=12 % /
-  \catcode58=12 % :
-  \catcode64=11 % @
-  \catcode91=12 % [
-  \catcode93=12 % ]
-  \catcode123=1 % {
-  \catcode125=2 % }
-  \expandafter\ifx\csname ProvidesPackage\endcsname\relax
-    \def\x#1#2#3[#4]{\endgroup
-      \immediate\write-1{Package: #3 #4}%
-      \xdef#1{#4}%
-    }%
-  \else
-    \def\x#1#2[#3]{\endgroup
-      #2[{#3}]%
-      \ifx#1\@undefined
-        \xdef#1{#3}%
-      \fi
-      \ifx#1\relax
-        \xdef#1{#3}%
-      \fi
-    }%
-  \fi
-\expandafter\x\csname ver@hobsub.sty\endcsname
-\ProvidesPackage{hobsub}%
-  [2016/05/16 v1.14 Construct package bundles (HO)]%
-%    \end{macrocode}
-%    \begin{macrocode}
-%</package>
-%    \end{macrocode}
-%
-% \subsubsection{Package \xpackage{hobsub-generic}}
-%
-%    \begin{macrocode}
-%<*generic>
-%    \end{macrocode}
-%    Reload check, especially if the package is not used with \LaTeX.
-%    \begin{macrocode}
-\begingroup\catcode61\catcode48\catcode32=10\relax%
-  \catcode13=5 % ^^M
-  \endlinechar=13 %
-  \catcode35=6 % #
-  \catcode39=12 % '
-  \catcode44=12 % ,
-  \catcode45=12 % -
-  \catcode46=12 % .
-  \catcode58=12 % :
-  \catcode64=11 % @
-  \catcode123=1 % {
-  \catcode125=2 % }
-  \expandafter\let\expandafter\x\csname ver@hobsub-generic.sty\endcsname
-  \ifx\x\relax % plain-TeX, first loading
-  \else
-    \def\empty{}%
-    \ifx\x\empty % LaTeX, first loading,
-      % variable is initialized, but \ProvidesPackage not yet seen
-    \else
-      \expandafter\ifx\csname PackageInfo\endcsname\relax
-        \def\x#1#2{%
-          \immediate\write-1{Package #1 Info: #2.}%
-        }%
-      \else
-        \def\x#1#2{\PackageInfo{#1}{#2, stopped}}%
-      \fi
-      \x{hobsub-generic}{The package is already loaded}%
-      \aftergroup\endinput
-    \fi
-  \fi
-\endgroup%
-%    \end{macrocode}
-%    Package identification:
-%    \begin{macrocode}
-\begingroup\catcode61\catcode48\catcode32=10\relax%
-  \catcode13=5 % ^^M
-  \endlinechar=13 %
-  \catcode35=6 % #
-  \catcode39=12 % '
-  \catcode40=12 % (
-  \catcode41=12 % )
-  \catcode44=12 % ,
-  \catcode45=12 % -
-  \catcode46=12 % .
-  \catcode47=12 % /
-  \catcode58=12 % :
-  \catcode64=11 % @
-  \catcode91=12 % [
-  \catcode93=12 % ]
-  \catcode123=1 % {
-  \catcode125=2 % }
-  \expandafter\ifx\csname ProvidesPackage\endcsname\relax
-    \def\x#1#2#3[#4]{\endgroup
-      \immediate\write-1{Package: #3 #4}%
-      \xdef#1{#4}%
-    }%
-  \else
-    \def\x#1#2[#3]{\endgroup
-      #2[{#3}]%
-      \ifx#1\@undefined
-        \xdef#1{#3}%
-      \fi
-      \ifx#1\relax
-        \xdef#1{#3}%
-      \fi
-    }%
-  \fi
-\expandafter\x\csname ver@hobsub-generic.sty\endcsname
-\ProvidesPackage{hobsub-generic}%
-  [2016/05/16 v1.14 Bundle oberdiek, subset generic (HO)]%
-%    \end{macrocode}
-%    \begin{macrocode}
-%</generic>
-%    \end{macrocode}
-%
-% \subsubsection{Package \xpackage{hobsub-hyperref}}
-%
-%    \begin{macrocode}
-%<*hyperref>
-%    \end{macrocode}
-%    Reload check, especially if the package is not used with \LaTeX.
-%    \begin{macrocode}
-\begingroup\catcode61\catcode48\catcode32=10\relax%
-  \catcode13=5 % ^^M
-  \endlinechar=13 %
-  \catcode35=6 % #
-  \catcode39=12 % '
-  \catcode44=12 % ,
-  \catcode45=12 % -
-  \catcode46=12 % .
-  \catcode58=12 % :
-  \catcode64=11 % @
-  \catcode123=1 % {
-  \catcode125=2 % }
-  \expandafter\let\expandafter\x\csname ver@hobsub-hyperref.sty\endcsname
-  \ifx\x\relax % plain-TeX, first loading
-  \else
-    \def\empty{}%
-    \ifx\x\empty % LaTeX, first loading,
-      % variable is initialized, but \ProvidesPackage not yet seen
-    \else
-      \expandafter\ifx\csname PackageInfo\endcsname\relax
-        \def\x#1#2{%
-          \immediate\write-1{Package #1 Info: #2.}%
-        }%
-      \else
-        \def\x#1#2{\PackageInfo{#1}{#2, stopped}}%
-      \fi
-      \x{hobsub-hyperref}{The package is already loaded}%
-      \aftergroup\endinput
-    \fi
-  \fi
-\endgroup%
-%    \end{macrocode}
-%    Package identification:
-%    \begin{macrocode}
-\begingroup\catcode61\catcode48\catcode32=10\relax%
-  \catcode13=5 % ^^M
-  \endlinechar=13 %
-  \catcode35=6 % #
-  \catcode39=12 % '
-  \catcode40=12 % (
-  \catcode41=12 % )
-  \catcode44=12 % ,
-  \catcode45=12 % -
-  \catcode46=12 % .
-  \catcode47=12 % /
-  \catcode58=12 % :
-  \catcode64=11 % @
-  \catcode91=12 % [
-  \catcode93=12 % ]
-  \catcode123=1 % {
-  \catcode125=2 % }
-  \expandafter\ifx\csname ProvidesPackage\endcsname\relax
-    \def\x#1#2#3[#4]{\endgroup
-      \immediate\write-1{Package: #3 #4}%
-      \xdef#1{#4}%
-    }%
-  \else
-    \def\x#1#2[#3]{\endgroup
-      #2[{#3}]%
-      \ifx#1\@undefined
-        \xdef#1{#3}%
-      \fi
-      \ifx#1\relax
-        \xdef#1{#3}%
-      \fi
-    }%
-  \fi
-\expandafter\x\csname ver@hobsub-hyperref.sty\endcsname
-\ProvidesPackage{hobsub-hyperref}%
-  [2016/05/16 v1.14 Bundle oberdiek, subset hyperref (HO)]%
-%    \end{macrocode}
-%    \begin{macrocode}
-%</hyperref>
-%    \end{macrocode}
-%
-% \subsection{Catcodes}
-%
-%    \begin{macrocode}
-%<*package|generic|hyperref>
-\begingroup\catcode61\catcode48\catcode32=10\relax%
-  \catcode13=5 % ^^M
-  \endlinechar=13 %
-  \catcode123=1 % {
-  \catcode125=2 % }
-  \catcode64=11 % @
-  \def\x{\endgroup
-    \expandafter\edef\csname HOBsub@AtEnd\endcsname{%
-      \endlinechar=\the\endlinechar\relax
-      \catcode13=\the\catcode13\relax
-      \catcode32=\the\catcode32\relax
-      \catcode35=\the\catcode35\relax
-      \catcode61=\the\catcode61\relax
-      \catcode64=\the\catcode64\relax
-      \catcode123=\the\catcode123\relax
-      \catcode125=\the\catcode125\relax
-    }%
-  }%
-\x\catcode61\catcode48\catcode32=10\relax%
-\catcode13=5 % ^^M
-\endlinechar=13 %
-\catcode35=6 % #
-\catcode64=11 % @
-\catcode123=1 % {
-\catcode125=2 % }
-\def\TMP@EnsureCode#1#2{%
-  \edef\HOBsub@AtEnd{%
-    \HOBsub@AtEnd
-    \catcode#1=\the\catcode#1\relax
-  }%
-  \catcode#1=#2\relax
-}
-\TMP@EnsureCode{39}{12}% '
-\TMP@EnsureCode{40}{12}% (
-\TMP@EnsureCode{41}{12}% )
-\TMP@EnsureCode{45}{12}% -
-\TMP@EnsureCode{46}{12}% .
-\TMP@EnsureCode{47}{12}% /
-\TMP@EnsureCode{58}{12}% :
-\TMP@EnsureCode{60}{12}% <
-\TMP@EnsureCode{62}{12}% >
-\TMP@EnsureCode{96}{12}% `
-\edef\HOBsub@AtEnd{\HOBsub@AtEnd\noexpand\endinput}
-%    \end{macrocode}
-%
-%    \begin{macrocode}
-%</package|generic|hyperref>
-%    \end{macrocode}
-%
-% \subsection{Package \xpackage{hobsub-hyperref} loads \xpackage{hobsub-generic}}
-%
-%    \begin{macrocode}
-%<*hyperref>
-\NeedsTeXFormat{LaTeX2e}
-\RequirePackage{hobsub-generic}[2016/05/16]
-%</hyperref>
-%    \end{macrocode}
-%
-% \subsection{Preamble}
-%
-%    \begin{macrocode}
-%<*preamble>
-\begingroup\expandafter\expandafter\expandafter\endgroup
-\expandafter\ifx\csname ver@hobsub.sty\endcsname\relax
-\else
-  \expandafter\hobsub@GobbleRemainingPackage
-\fi
-%</preamble>
-%    \end{macrocode}
-%
-%
-%    \begin{macrocode}
-%<*package|preamble>
-%    \end{macrocode}
-%
-%    \begin{macro}{\HOBsub@OrgEndinput}
-%    \begin{macrocode}
-\begingroup\expandafter\expandafter\expandafter\endgroup
-\expandafter\ifx\csname HOBsub@OrgEndinput\endcsname\relax
-  \let\HOBsub@OrgEndinput\endinput
-\fi
-%    \end{macrocode}
-%    \end{macro}
-%    \begin{macro}{\hobsub@GobbleRemainingPackage}
-%    \begin{macrocode}
-\def\hobsub@GobbleRemainingPackage{%
-  \begingroup
-  \catcode92=14 % backslash: comment
-  \catcode32=14 % space: comment
-  \catcode35=14 % hash: comment
-  \catcode123=14 % left brace: comment
-  \catcode125=14 % right brace: comment
-  \catcode60=3 % less: math
-  \catcode62=4 % greater: align
-  \endlinechar=-1 %
-  \HOBsub@GobbleRemainingPackage
-}
-%    \end{macrocode}
-%    \end{macro}
-%    \begin{macro}{\HOBsub@GobbleRemainingPackage}
-%    \begin{macrocode}
-\catcode60=3 % less: dollar
-\catcode62=4 % greater: align
-\long\def\HOBsub@GobbleRemainingPackage#1<hobsub>{%
-  \endgroup
-}
-\catcode60=12 % less: other
-\catcode62=12 % greater: other
-%    \end{macrocode}
-%    \end{macro}
-%
-%    \begin{macro}{\hobsub@StartPackage}
-%    \begin{macrocode}
-\def\hobsub@StartPackage#1{%
-  \begingroup\expandafter\expandafter\expandafter\endgroup
-  \expandafter\ifx\csname ver@#1.sty\endcsname\relax
-    \let\HOBsub@OrgCurrName\@currname
-    \let\HOBsub@OrgCurrExt\@currext
-    \csname @pushfilename\endcsname
-    \def\@currname{#1}%
-    \def\@currext{sty}%
-    \expandafter\def\csname\@currname.\@currext-h@@k\endcsname{}%
-    \let\endinput\hobsub@GobbleRemainingPackage
-    \def\hobsub@StopPackage{%
-      \let\hobsub@StopPackage\relax
-      \HOBsub@StopPackage
-%     \hobsub@Info{hobsub}{Package `#1' loaded}%
-    }%
-    \hobsub@AddToFileList{#1.sty}%
-  \else
-    \hobsub@Info{hobsub}{Skipping package `#1' (already loaded)}%
-    \let\hobsub@StopPackage\relax
-    \expandafter\hobsub@GobbleRemainingPackage
-  \fi
-}
-%    \end{macrocode}
-%    \end{macro}
-%
-%    \begin{macro}{\hobsub@StopPackage}
-%    \begin{macrocode}
-\let\hobsub@StopPackage\relax
-%    \end{macrocode}
-%    \end{macro}
-%
-%    \begin{macro}{\hobsub@Info}
-%    \begin{macrocode}
-\def\hobsub@Info#1#2{%
-  \begingroup\expandafter\expandafter\expandafter\endgroup
-  \expandafter\ifx\csname @PackageInfoNoLine\endcsname\relax
-    \immediate\write-1{Package #1 Info: #2.}%
-  \else
-    \let\hobsub@Info\@PackageInfoNoLine
-    \hobsub@Info{#1}{#2}%
-  \fi
-}
-%    \end{macrocode}
-%    \end{macro}
-%
-%    \begin{macro}{\HOBsub@StopPackage}
-%    \begin{macrocode}
-\def\HOBsub@StopPackage{%
-  \csname\@currname.\@currext-h@@k\endcsname
-  \let\endinput\HOBsub@OrgEndinput
-  \csname @popfilename\endcsname
-  \let\@currname\HOBsub@OrgCurrName
-  \let\@currext\HOBsub@OrgCurrExt
-}
-%    \end{macrocode}
-%    \end{macro}
-%
-%    \begin{macro}{\hobsub@AddToFileList}
-%    \begin{macrocode}
-\begingroup\expandafter\expandafter\expandafter\endgroup
-\expandafter\ifx\csname @addtofilelist\endcsname\relax
-  \def\hobsub@AddToFileList#1{}%
-\else
-  \def\hobsub@AddToFileList#1{%
-    \@addtofilelist{#1}%
-  }%
-\fi
-%    \end{macrocode}
-%    \end{macro}
-%
-%    \begin{macrocode}
-%</package|preamble>
-%    \end{macrocode}
-%
-% \subsection{End of preamble for subset packages}
-%
-%    Add the end marker for possible skipping of previous
-%    macros, if package \xpackage{hobsub} was already loaded.
-%    \begin{macrocode}
-%<*preamble>
-\hobsub@GobbleRemainingPackage
-<hobsub>
-%    \end{macrocode}
-%
-%    All macros of package \xpackage{hobsub} are now available.
-%    Now we officially load the package \xpackage{hobsub} inline
-%    for proper package identification.
-%    \begin{macrocode}
-\hobsub@StartPackage{hobsub}%
-\begingroup\expandafter\expandafter\expandafter\endgroup
-\expandafter\ifx\csname ProvidesPackage\endcsname\relax
-  \immediate\write-1{%
-    Package: hobsub 2016/05/16 v1.14 Construct package bundles (HO)%
-  }%
-\else
-  \ProvidesPackage{hobsub}%
-  [2016/05/16 v1.14 Construct package bundles (HO)]%
-\fi
-%</preamble>
-%    \end{macrocode}
-%
-%
-%    \begin{macrocode}
-%<*post|preamble>
- \endinput
-<hobsub>
-\hobsub@StopPackage
-%</post|preamble>
-%    \end{macrocode}
-%
-% \subsection{Package list}
-%
-%    \begin{macrocode}
-%<infwarerr>\hobsub@StartPackage{infwarerr}
-%<ltxcmds>\hobsub@StartPackage{ltxcmds}
-%<ifluatex>\hobsub@StartPackage{ifluatex}
-%<ifvtex>\hobsub@StartPackage{ifvtex}
-%<intcalc>\hobsub@StartPackage{intcalc}
-%<ifpdf>\hobsub@StartPackage{ifpdf}
-%<etexcmds>\hobsub@StartPackage{etexcmds}
-%<kvsetkeys>\hobsub@StartPackage{kvsetkeys}
-%<kvdefinekeys>\hobsub@StartPackage{kvdefinekeys}
-%<*luatex-loader>
-\ifluatex
-\else
-  \expandafter\hobsub@GobbleRemainingPackage
-\fi
-\hobsub@StartPackage{luatex-loader}
-%</luatex-loader>
-%<pdftexcmds>\hobsub@StartPackage{pdftexcmds}
-%<pdfescape>\hobsub@StartPackage{pdfescape}
-%<bigintcalc>\hobsub@StartPackage{bigintcalc}
-%<bitset>\hobsub@StartPackage{bitset}
-%<uniquecounter>\hobsub@StartPackage{uniquecounter}
-%<letltxmacro>\hobsub@StartPackage{letltxmacro}
-%<hopatch>\hobsub@StartPackage{hopatch}
-%<xcolor-patch>\hobsub@StartPackage{xcolor-patch}
-%<atveryend>\hobsub@StartPackage{atveryend}
-%<atbegshi>\hobsub@StartPackage{atbegshi}
-%<refcount>\hobsub@StartPackage{refcount}
-%<hycolor>\hobsub@StartPackage{hycolor}
-%    \end{macrocode}
-%
-% \subsection{End of packages}
-%
-%    \begin{macrocode}
-%<package|atend>\HOBsub@AtEnd%
-%    \end{macrocode}
-%
-% \section{Test}
-%
-% \subsection{Catcode checks for loading}
-%
-%    \begin{macrocode}
-%<*test1>
-%    \end{macrocode}
-%    \begin{macrocode}
-\catcode`\{=1 %
-\catcode`\}=2 %
-\catcode`\#=6 %
-\catcode`\@=11 %
-\expandafter\ifx\csname count@\endcsname\relax
-  \countdef\count@=255 %
-\fi
-\expandafter\ifx\csname @gobble\endcsname\relax
-  \long\def\@gobble#1{}%
-\fi
-\expandafter\ifx\csname @firstofone\endcsname\relax
-  \long\def\@firstofone#1{#1}%
-\fi
-\expandafter\ifx\csname loop\endcsname\relax
-  \expandafter\@firstofone
-\else
-  \expandafter\@gobble
-\fi
-{%
-  \def\loop#1\repeat{%
-    \def\body{#1}%
-    \iterate
-  }%
-  \def\iterate{%
-    \body
-      \let\next\iterate
-    \else
-      \let\next\relax
-    \fi
-    \next
-  }%
-  \let\repeat=\fi
-}%
-\def\RestoreCatcodes{}
-\count@=0 %
-\loop
-  \edef\RestoreCatcodes{%
-    \RestoreCatcodes
-    \catcode\the\count@=\the\catcode\count@\relax
-  }%
-\ifnum\count@<255 %
-  \advance\count@ 1 %
-\repeat
-
-\def\RangeCatcodeInvalid#1#2{%
-  \count@=#1\relax
-  \loop
-    \catcode\count@=15 %
-  \ifnum\count@<#2\relax
-    \advance\count@ 1 %
-  \repeat
-}
-\def\RangeCatcodeCheck#1#2#3{%
-  \count@=#1\relax
-  \loop
-    \ifnum#3=\catcode\count@
-    \else
-      \errmessage{%
-        Character \the\count@\space
-        with wrong catcode \the\catcode\count@\space
-        instead of \number#3%
-      }%
-    \fi
-  \ifnum\count@<#2\relax
-    \advance\count@ 1 %
-  \repeat
-}
-\def\space{ }
-\expandafter\ifx\csname LoadCommand\endcsname\relax
-  \def\LoadCommand{\input hobsub.sty\relax}%
-\fi
-\def\Test{%
-  \RangeCatcodeInvalid{0}{47}%
-  \RangeCatcodeInvalid{58}{64}%
-  \RangeCatcodeInvalid{91}{96}%
-  \RangeCatcodeInvalid{123}{255}%
-  \catcode`\@=12 %
-  \catcode`\\=0 %
-  \catcode`\%=14 %
-  \LoadCommand
-  \RangeCatcodeCheck{0}{36}{15}%
-  \RangeCatcodeCheck{37}{37}{14}%
-  \RangeCatcodeCheck{38}{47}{15}%
-  \RangeCatcodeCheck{48}{57}{12}%
-  \RangeCatcodeCheck{58}{63}{15}%
-  \RangeCatcodeCheck{64}{64}{12}%
-  \RangeCatcodeCheck{65}{90}{11}%
-  \RangeCatcodeCheck{91}{91}{15}%
-  \RangeCatcodeCheck{92}{92}{0}%
-  \RangeCatcodeCheck{93}{96}{15}%
-  \RangeCatcodeCheck{97}{122}{11}%
-  \RangeCatcodeCheck{123}{255}{15}%
-  \RestoreCatcodes
-}
-\Test
-\csname @@end\endcsname
-\end
-%    \end{macrocode}
-%    \begin{macrocode}
-%</test1>
-%    \end{macrocode}
-%
-% \section{Installation}
-%
-% \subsection{Download}
-%
-% \paragraph{Package.} This package is available on
-% CTAN\footnote{\url{http://ctan.org/pkg/hobsub}}:
-% \begin{description}
-% \item[\CTAN{macros/latex/contrib/oberdiek/hobsub.dtx}] The source file.
-% \item[\CTAN{macros/latex/contrib/oberdiek/hobsub.pdf}] Documentation.
-% \end{description}
-%
-%
-% \paragraph{Bundle.} All the packages of the bundle `oberdiek'
-% are also available in a TDS compliant ZIP archive. There
-% the packages are already unpacked and the documentation files
-% are generated. The files and directories obey the TDS standard.
-% \begin{description}
-% \item[\CTAN{install/macros/latex/contrib/oberdiek.tds.zip}]
-% \end{description}
-% \emph{TDS} refers to the standard ``A Directory Structure
-% for \TeX\ Files'' (\CTAN{tds/tds.pdf}). Directories
-% with \xfile{texmf} in their name are usually organized this way.
-%
-% \subsection{Bundle installation}
-%
-% \paragraph{Unpacking.} Unpack the \xfile{oberdiek.tds.zip} in the
-% TDS tree (also known as \xfile{texmf} tree) of your choice.
-% Example (linux):
-% \begin{quote}
-%   |unzip oberdiek.tds.zip -d ~/texmf|
-% \end{quote}
-%
-% \paragraph{Script installation.}
-% Check the directory \xfile{TDS:scripts/oberdiek/} for
-% scripts that need further installation steps.
-% Package \xpackage{attachfile2} comes with the Perl script
-% \xfile{pdfatfi.pl} that should be installed in such a way
-% that it can be called as \texttt{pdfatfi}.
-% Example (linux):
-% \begin{quote}
-%   |chmod +x scripts/oberdiek/pdfatfi.pl|\\
-%   |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
-% \end{quote}
-%
-% \subsection{Package installation}
-%
-% \paragraph{Unpacking.} The \xfile{.dtx} file is a self-extracting
-% \docstrip\ archive. The files are extracted by running the
-% \xfile{.dtx} through \plainTeX:
-% \begin{quote}
-%   \verb|tex hobsub.dtx|
-% \end{quote}
-%
-% \paragraph{TDS.} Now the different files must be moved into
-% the different directories in your installation TDS tree
-% (also known as \xfile{texmf} tree):
-% \begin{quote}
-% \def\t{^^A
-% \begin{tabular}{@{}>{\ttfamily}l@{ $\rightarrow$ }>{\ttfamily}l@{}}
-%   hobsub.sty & tex/generic/oberdiek/hobsub.sty\\
-%   hobsub-generic.sty & tex/generic/oberdiek/hobsub-generic.sty\\
-%   hobsub-hyperref.sty & tex/generic/oberdiek/hobsub-hyperref.sty\\
-%   hobsub.pdf & doc/latex/oberdiek/hobsub.pdf\\
-%   test/hobsub-test1.tex & doc/latex/oberdiek/test/hobsub-test1.tex\\
-%   hobsub.dtx & source/latex/oberdiek/hobsub.dtx\\
-% \end{tabular}^^A
-% }^^A
-% \sbox0{\t}^^A
-% \ifdim\wd0>\linewidth
-%   \begingroup
-%     \advance\linewidth by\leftmargin
-%     \advance\linewidth by\rightmargin
-%   \edef\x{\endgroup
-%     \def\noexpand\lw{\the\linewidth}^^A
-%   }\x
-%   \def\lwbox{^^A
-%     \leavevmode
-%     \hbox to \linewidth{^^A
-%       \kern-\leftmargin\relax
-%       \hss
-%       \usebox0
-%       \hss
-%       \kern-\rightmargin\relax
-%     }^^A
-%   }^^A
-%   \ifdim\wd0>\lw
-%     \sbox0{\small\t}^^A
-%     \ifdim\wd0>\linewidth
-%       \ifdim\wd0>\lw
-%         \sbox0{\footnotesize\t}^^A
-%         \ifdim\wd0>\linewidth
-%           \ifdim\wd0>\lw
-%             \sbox0{\scriptsize\t}^^A
-%             \ifdim\wd0>\linewidth
-%               \ifdim\wd0>\lw
-%                 \sbox0{\tiny\t}^^A
-%                 \ifdim\wd0>\linewidth
-%                   \lwbox
-%                 \else
-%                   \usebox0
-%                 \fi
-%               \else
-%                 \lwbox
-%               \fi
-%             \else
-%               \usebox0
-%             \fi
-%           \else
-%             \lwbox
-%           \fi
-%         \else
-%           \usebox0
-%         \fi
-%       \else
-%         \lwbox
-%       \fi
-%     \else
-%       \usebox0
-%     \fi
-%   \else
-%     \lwbox
-%   \fi
-% \else
-%   \usebox0
-% \fi
-% \end{quote}
-% If you have a \xfile{docstrip.cfg} that configures and enables \docstrip's
-% TDS installing feature, then some files can already be in the right
-% place, see the documentation of \docstrip.
-%
-% \subsection{Refresh file name databases}
-%
-% If your \TeX~distribution
-% (\teTeX, \mikTeX, \dots) relies on file name databases, you must refresh
-% these. For example, \teTeX\ users run \verb|texhash| or
-% \verb|mktexlsr|.
-%
-% \subsection{Some details for the interested}
-%
-% \paragraph{Attached source.}
-%
-% The PDF documentation on CTAN also includes the
-% \xfile{.dtx} source file. It can be extracted by
-% AcrobatReader 6 or higher. Another option is \textsf{pdftk},
-% e.g. unpack the file into the current directory:
-% \begin{quote}
-%   \verb|pdftk hobsub.pdf unpack_files output .|
-% \end{quote}
-%
-% \paragraph{Unpacking with \LaTeX.}
-% The \xfile{.dtx} chooses its action depending on the format:
-% \begin{description}
-% \item[\plainTeX:] Run \docstrip\ and extract the files.
-% \item[\LaTeX:] Generate the documentation.
-% \end{description}
-% If you insist on using \LaTeX\ for \docstrip\ (really,
-% \docstrip\ does not need \LaTeX), then inform the autodetect routine
-% about your intention:
-% \begin{quote}
-%   \verb|latex \let\install=y\input{hobsub.dtx}|
-% \end{quote}
-% Do not forget to quote the argument according to the demands
-% of your shell.
-%
-% \paragraph{Generating the documentation.}
-% You can use both the \xfile{.dtx} or the \xfile{.drv} to generate
-% the documentation. The process can be configured by the
-% configuration file \xfile{ltxdoc.cfg}. For instance, put this
-% line into this file, if you want to have A4 as paper format:
-% \begin{quote}
-%   \verb|\PassOptionsToClass{a4paper}{article}|
-% \end{quote}
-% An example follows how to generate the
-% documentation with pdf\LaTeX:
-% \begin{quote}
-%\begin{verbatim}
-%pdflatex hobsub.dtx
-%makeindex -s gind.ist hobsub.idx
-%pdflatex hobsub.dtx
-%makeindex -s gind.ist hobsub.idx
-%pdflatex hobsub.dtx
-%\end{verbatim}
-% \end{quote}
-%
-% \section{Catalogue}
-%
-% The following XML file can be used as source for the
-% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
-% The elements \texttt{caption} and \texttt{description} are imported
-% from the original XML file from the Catalogue.
-% The name of the XML file in the Catalogue is \xfile{hobsub.xml}.
-%    \begin{macrocode}
-%<*catalogue>
-<?xml version='1.0' encoding='us-ascii'?>
-<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
-<entry datestamp='$Date$' modifier='$Author$' id='hobsub'>
-  <name>hobsub</name>
-  <caption>Construct package bundles</caption>
-  <authorref id='auth:oberdiek'/>
-  <copyright owner='Heiko Oberdiek' year='2011,2012'/>
-  <license type='lppl1.3'/>
-  <version number='1.14'/>
-  <description>
-    The package offers a means of loading a bundle of (other) packages
-    &#x201C;at once&#x201D;, offering a means of reducing the amount of log output
-    as the packages are loaded, and an aide-memoire for complicated
-    requirements.  In some ways, loading a package via hobsub behaves
-    much like loading the package in the normal way; for example,
-    reloads are suppressed, as in LaTeX proper, and correct
-    <tt>\listfiles</tt> output is produced.
-    <p/>
-    Examples provided are a &#x2018;generic&#x2019; bundle (comprising the author&#x2019;s
-    packages that can be used with Plain TeX) and a &#x2018;hyperref&#x2019; bundle
-    (comprising packages useful when generating hypertext output with
-    LaTeX).
-    <p/>
-    The package is part of the <xref refid='oberdiek'>oberdiek</xref> bundle.
-  </description>
-  <documentation details='Package documentation'
-      href='ctan:/macros/latex/contrib/oberdiek/hobsub.pdf'/>
-  <ctan file='true' path='/macros/latex/contrib/oberdiek/hobsub.dtx'/>
-  <miktex location='oberdiek'/>
-  <texlive location='oberdiek'/>
-  <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
-</entry>
-%</catalogue>
-%    \end{macrocode}
-%
-% \begin{thebibliography}{9}
-% \raggedright
-% \bibitem{lualatex:quiet}
-% Will Robertson,
-% \textit{[lltx] quietening lualatex console output};
-% mailing list \textsf{lualatex-dev at tug.org},
-% 2011-01-29;
-% \url{http://tug.org/pipermail/lualatex-dev/2011-January/001031.html}.
-%
-% \end{thebibliography}
-%
-% \begin{History}
-%   \begin{Version}{2011/01/30 v1.0}
-%   \item
-%     First public version.
-%   \end{Version}
-%   \begin{Version}{2011/04/16 v1.1}
-%   \item
-%     Package updates.
-%   \end{Version}
-%   \begin{Version}{2011/04/17 v1.2}
-%   \item
-%     White spaces at line begins are removed or reduced
-%     in the generated collection packages.
-%   \end{Version}
-%   \begin{Version}{2011/04/18 v1.3}
-%   \item
-%     Package updates.
-%   \end{Version}
-%   \begin{Version}{2011/04/23 v1.4}
-%   \item
-%     Package updates.
-%   \end{Version}
-%   \begin{Version}{2011/06/24 v1.5}
-%   \item
-%     Package updates.
-%   \end{Version}
-%   \begin{Version}{2011/06/30 v1.6}
-%   \item
-%     Package updates.
-%   \end{Version}
-%   \begin{Version}{2011/07/01 v1.7}
-%   \item
-%     Package updates.
-%   \end{Version}
-%   \begin{Version}{2011/07/28 v1.8}
-%   \item
-%     Package updates.
-%   \end{Version}
-%   \begin{Version}{2011/08/22 v1.9}
-%   \item
-%     Package updates.
-%   \end{Version}
-%   \begin{Version}{2011/10/16 v1.10}
-%   \item
-%     Package updates.
-%   \end{Version}
-%   \begin{Version}{2011/11/29 v1.11}
-%   \item
-%     Package updates.
-%   \end{Version}
-%   \begin{Version}{2012/04/25 v1.12}
-%   \item
-%     Package updates.
-%   \end{Version}
-%   \begin{Version}{2012/05/28 v1.13}
-%   \item
-%     Package updates.
-%   \end{Version}
-%   \begin{Version}{2016/05/16 v1.14}
-%   \item
-%     Documentation updates.
-%   \end{Version}
-% \end{History}
-%
-% \PrintIndex
-%
-% \Finale
-\endinput
diff --git a/macros/latex/contrib/oberdiek/hobsub.sty b/macros/latex/contrib/oberdiek/hobsub.sty
deleted file mode 100644
index ebfde8efe0..0000000000
--- a/macros/latex/contrib/oberdiek/hobsub.sty
+++ /dev/null
@@ -1,5 +0,0 @@
-\ifx\ProvidesPackage\undefined\else
-\ProvidesPackage{hobsub}[2019/10/27]
-\fi
-
-\wlog{hobsub not currently supported, see hobsub.dtx to extract original code}
diff --git a/macros/latex/contrib/oberdiek/hologo.dtx b/macros/latex/contrib/oberdiek/hologo.dtx
index 8ef086f21f..8b3d38914e 100644
--- a/macros/latex/contrib/oberdiek/hologo.dtx
+++ b/macros/latex/contrib/oberdiek/hologo.dtx
@@ -13,15 +13,17 @@
 % conditions of the LaTeX Project Public License, either
 % version 1.3c of this license or (at your option) any later
 % version. This version of this license is in
-%    http://www.latex-project.org/lppl/lppl-1-3c.txt
+%    https://www.latex-project.org/lppl/lppl-1-3c.txt
 % and the latest version of this license is in
-%    http://www.latex-project.org/lppl.txt
+%    https://www.latex-project.org/lppl.txt
 % and version 1.3 or later is part of all distributions of
 % LaTeX version 2005/12/01 or later.
 %
 % This work has the LPPL maintenance status "maintained".
 %
-% This Current Maintainer of this work is Heiko Oberdiek.
+% The Current Maintainers of this work are
+% Heiko Oberdiek and the Oberdiek Package Support Group
+% https://github.com/ho-tex/oberdiek/issues
 %
 % The Base Interpreter refers to any `TeX-Format',
 % because some files are installed in TDS:tex/generic//.
@@ -107,15 +109,18 @@ This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either
 version 1.3c of this license or (at your option) any later
 version. This version of this license is in
-   http://www.latex-project.org/lppl/lppl-1-3c.txt
+   https://www.latex-project.org/lppl/lppl-1-3c.txt
 and the latest version of this license is in
-   http://www.latex-project.org/lppl.txt
+   https://www.latex-project.org/lppl.txt
 and version 1.3 or later is part of all distributions of
 LaTeX version 2005/12/01 or later.
 
 This work has the LPPL maintenance status "maintained".
 
-This Current Maintainer of this work is Heiko Oberdiek.
+The Current Maintainers of this work are
+Heiko Oberdiek and the Oberdiek Package Support Group
+https://github.com/ho-tex/oberdiek/issues
+
 
 The Base Interpreter refers to any `TeX-Format',
 because some files are installed in TDS:tex/generic//.
@@ -207,8 +212,7 @@ and the derived files
 % \title{The \xpackage{hologo} package}
 % \date{2017/05/01 v1.13}
 % \author{Heiko Oberdiek\thanks
-% {Please report any issues at https://github.com/ho-tex/oberdiek/issues}\\
-% \xemail{heiko.oberdiek at googlemail.com}}
+% {Please report any issues at \url{https://github.com/ho-tex/oberdiek/issues}}}
 %
 % \maketitle
 %
@@ -4698,7 +4702,7 @@ $ #1{\string ^^^^0395}{\string ^^^^03b5}%
 % \subsection{Download}
 %
 % \paragraph{Package.} This package is available on
-% CTAN\footnote{\url{http://ctan.org/pkg/hologo}}:
+% CTAN\footnote{\CTANpkg{hologo}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/hologo.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/hologo.pdf}] Documentation.
@@ -4710,7 +4714,7 @@ $ #1{\string ^^^^0395}{\string ^^^^03b5}%
 % the packages are already unpacked and the documentation files
 % are generated. The files and directories obey the TDS standard.
 % \begin{description}
-% \item[\CTAN{install/macros/latex/contrib/oberdiek.tds.zip}]
+% \item[\CTANinstall{install/macros/latex/contrib/oberdiek.tds.zip}]
 % \end{description}
 % \emph{TDS} refers to the standard ``A Directory Structure
 % for \TeX\ Files'' (\CTAN{tds/tds.pdf}). Directories
@@ -4833,16 +4837,6 @@ $ #1{\string ^^^^0395}{\string ^^^^03b5}%
 %
 % \subsection{Some details for the interested}
 %
-% \paragraph{Attached source.}
-%
-% The PDF documentation on CTAN also includes the
-% \xfile{.dtx} source file. It can be extracted by
-% AcrobatReader 6 or higher. Another option is \textsf{pdftk},
-% e.g. unpack the file into the current directory:
-% \begin{quote}
-%   \verb|pdftk hologo.pdf unpack_files output .|
-% \end{quote}
-%
 % \paragraph{Unpacking with \LaTeX.}
 % The \xfile{.dtx} chooses its action depending on the format:
 % \begin{description}
@@ -4878,43 +4872,6 @@ $ #1{\string ^^^^0395}{\string ^^^^03b5}%
 %\end{verbatim}
 % \end{quote}
 %
-% \section{Catalogue}
-%
-% The following XML file can be used as source for the
-% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
-% The elements \texttt{caption} and \texttt{description} are imported
-% from the original XML file from the Catalogue.
-% The name of the XML file in the Catalogue is \xfile{hologo.xml}.
-%    \begin{macrocode}
-%<*catalogue>
-<?xml version='1.0' encoding='us-ascii'?>
-<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
-<entry datestamp='$Date$' modifier='$Author$' id='hologo'>
-  <name>hologo</name>
-  <caption>A collection of logos with bookmark support.</caption>
-  <authorref id='auth:oberdiek'/>
-  <copyright owner='Heiko Oberdiek' year='2010-2012'/>
-  <license type='lppl1.3'/>
-  <version number='1.10'/>
-  <description>
-    The package defines a single command <tt>\hologo</tt>, whose
-    argument is the usual case-confused ASCII version of the logo.
-    The command is bookmark-enabled, so that every logo becomes
-    available in bookmarks without further work.
-    <p/>
-    The package is part of the <xref refid='oberdiek'>oberdiek</xref>
-    bundle.
-  </description>
-  <documentation details='Package documentation'
-      href='ctan:/macros/latex/contrib/oberdiek/hologo.pdf'/>
-  <ctan file='true' path='/macros/latex/contrib/oberdiek/hologo.dtx'/>
-  <miktex location='oberdiek'/>
-  <texlive location='oberdiek'/>
-  <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
-</entry>
-%</catalogue>
-%    \end{macrocode}
-%
 % \begin{thebibliography}{9}
 % \raggedright
 %
@@ -4922,19 +4879,19 @@ $ #1{\string ^^^^0395}{\string ^^^^03b5}%
 % Oren Patashnik,
 % \textit{\hologo{BibTeX}ing},
 % 1988-02-08.\\
-% \CTAN{biblio/bibtex/base/}
+% \CTANpkg{base}
 %
 % \bibitem{dtklogos}
 % Gerd Neugebauer, DANTE,
 % \textit{Package \xpackage{dtklogos}},
 % 2011-04-25.\\
-% \CTAN{usergrps/dante/dtk/dtklogos.sty}
+% \url{http://mirrors.ctan.org/usergrps/dante/dtk/dtk-logos.sty}
 %
 % \bibitem{etexman}
 % The \hologo{NTS} Team,
 % \textit{The \hologo{eTeX} manual},
 % 1998-02.\\
-% \CTAN{systems/e-tex/v2/doc/}
+% \CTANpkg{doc}
 %
 % \bibitem{ExTeX-FAQ}
 % The \hologo{ExTeX} group,
@@ -4966,13 +4923,13 @@ $ #1{\string ^^^^0395}{\string ^^^^03b5}%
 % Michael Wichura,
 % \textit{The \hologo{PiCTeX} macro package},
 % 1987-09-21.
-% \CTAN{graphics/pictex/}
+% \CTANpkg{pictex}
 %
 % \bibitem{scrlogo}
 % Markus Kohm,
 % \textit{\hologo{KOMAScript} Datei \xfile{scrlogo.dtx}},
 % 2009-01-30.\\
-% \CTAN{install/macros/latex/contrib/komascript.tds.zip}
+% \CTANinstall{install/macros/latex/contrib/koma-script.tds.zip}
 %
 % \end{thebibliography}
 %
diff --git a/macros/latex/contrib/oberdiek/hologo.pdf b/macros/latex/contrib/oberdiek/hologo.pdf
index 3e613e31c4..a5ff0a727b 100644
--- a/macros/latex/contrib/oberdiek/hologo.pdf
+++ b/macros/latex/contrib/oberdiek/hologo.pdf
diff --git a/macros/latex/contrib/oberdiek/holtxdoc.dtx b/macros/latex/contrib/oberdiek/holtxdoc.dtx
index 9f7648bc68..62debb1dae 100644
--- a/macros/latex/contrib/oberdiek/holtxdoc.dtx
+++ b/macros/latex/contrib/oberdiek/holtxdoc.dtx
@@ -1,7 +1,7 @@
 % \iffalse meta-comment
 %
 % File: holtxdoc.dtx
-% Version: 2019/07/27 v0.28
+% Version: 2019/11/12 v0.29
 % Info: Private additional ltxdoc support
 %
 % Copyright (C) 1999-2012 by
@@ -13,15 +13,17 @@
 % conditions of the LaTeX Project Public License, either
 % version 1.3c of this license or (at your option) any later
 % version. This version of this license is in
-%    http://www.latex-project.org/lppl/lppl-1-3c.txt
+%    https://www.latex-project.org/lppl/lppl-1-3c.txt
 % and the latest version of this license is in
-%    http://www.latex-project.org/lppl.txt
+%    https://www.latex-project.org/lppl.txt
 % and version 1.3 or later is part of all distributions of
 % LaTeX version 2005/12/01 or later.
 %
 % This work has the LPPL maintenance status "maintained".
 %
-% This Current Maintainer of this work is Heiko Oberdiek.
+% The Current Maintainers of this work are
+% Heiko Oberdiek and the Oberdiek Package Support Group
+% https://github.com/ho-tex/oberdiek/issues
 %
 % This work consists of the main source file holtxdoc.dtx
 % and the derived files
@@ -77,7 +79,7 @@
 \input docstrip.tex
 \Msg{************************************************************************}
 \Msg{* Installation}
-\Msg{* Package: holtxdoc 2019/07/27 v0.28 Private additional ltxdoc support (HO)}
+\Msg{* Package: holtxdoc 2019/11/12 v0.29 Private additional ltxdoc support (HO)}
 \Msg{************************************************************************}
 
 \keepsilent
@@ -89,7 +91,7 @@
 This is a generated file.
 
 Project: holtxdoc
-Version: 2019/07/27 v0.28
+Version: 2019/11/12 v0.29
 
 Copyright (C) 1999-2012 by
    Heiko Oberdiek <heiko.oberdiek at googlemail.com>
@@ -98,15 +100,18 @@ This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either
 version 1.3c of this license or (at your option) any later
 version. This version of this license is in
-   http://www.latex-project.org/lppl/lppl-1-3c.txt
+   https://www.latex-project.org/lppl/lppl-1-3c.txt
 and the latest version of this license is in
-   http://www.latex-project.org/lppl.txt
+   https://www.latex-project.org/lppl.txt
 and version 1.3 or later is part of all distributions of
 LaTeX version 2005/12/01 or later.
 
 This work has the LPPL maintenance status "maintained".
 
-This Current Maintainer of this work is Heiko Oberdiek.
+The Current Maintainers of this work are
+Heiko Oberdiek and the Oberdiek Package Support Group
+https://github.com/ho-tex/oberdiek/issues
+
 
 This work consists of the main source file holtxdoc.dtx
 and the derived files
@@ -150,7 +155,7 @@ and the derived files
 %<*driver>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{holtxdoc.drv}%
-  [2019/07/27 v0.28 Private additional ltxdoc support (HO)]%
+  [2019/11/12 v0.29 Private additional ltxdoc support (HO)]%
 \documentclass{ltxdoc}
 \usepackage{holtxdoc}[2011/11/22]
 \begin{document}
@@ -179,10 +184,9 @@ and the derived files
 % \GetFileInfo{holtxdoc.drv}
 %
 % \title{The \xpackage{holtxdoc} package}
-% \date{2019/07/27 v0.28}
+% \date{2019/11/12 v0.29}
 % \author{Heiko Oberdiek\thanks
-% {Please report any issues at https://github.com/ho-tex/oberdiek/issues}\\
-% \xemail{heiko.oberdiek at googlemail.com}}
+% {Please report any issues at \url{https://github.com/ho-tex/oberdiek/issues}}}
 %
 % \maketitle
 %
@@ -200,7 +204,7 @@ and the derived files
 % Caution: \emph{This package is not intended for public use!}
 %
 % It contains the macros and settings to generate the
-% documentation of my packages in \CTAN{macros/latex/contrib/oberdiek/}.
+% documentation of my packages in \CTANpkg{oberdiek}.
 % Thus the package does not know anything about compatibility. Only
 % my current packages' documentation must compile.
 %
@@ -221,7 +225,7 @@ and the derived files
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{holtxdoc}%
-  [2019/07/27 v0.28 Private additional ltxdoc support (HO)]
+  [2019/11/12 v0.29 Private additional ltxdoc support (HO)]
 %    \end{macrocode}
 %
 %    \begin{macrocode}
@@ -402,13 +406,27 @@ and the derived files
 %    \end{macrocode}
 %
 %    \begin{macrocode}
+\newcommand*{\bibpackage}[4]{%
+  \bibitem{#1}
+  Package \xpackage{#1}, #2, #3.%
+  \ifx\\#4\\\else\space#4\fi\par
+}
+%    \end{macrocode}
+%
+%    \begin{macrocode}
 \newcommand*{\CTAN}[1]{%
-  \href{http://ctan.org/pkg/#1}{\nolinkurl{CTAN:#1}}%
+  \href{https://ctan.org/tex-archive/#1}{\nolinkurl{CTAN:#1}}%
+}
+\newcommand*{\CTANinstall}[1]{%
+  \href{http://mirrors.ctan.org/#1}{\nolinkurl{CTAN:#1}}%
+}
+\newcommand*{\CTANpkg}[1]{%
+  \href{http://ctan.org/pkg/#1}{\nolinkurl{CTAN:pkg/#1}}%
 }
 %    \end{macrocode}
 %    \begin{macrocode}
 \newcommand*{\Newsgroup}[1]{%
-  \href{http://groups.google.com/group/#1/topics}{\nolinkurl{news:#1}}%
+  \href{https://groups.google.com/group/#1/topics}{\nolinkurl{news:#1}}%
 }
 %    \end{macrocode}
 %
@@ -532,7 +550,7 @@ and the derived files
 % \subsection{Download}
 %
 % \paragraph{Package.} This package is available on
-% CTAN\footnote{\url{http://ctan.org/pkg/holtxdoc}}:
+% CTAN\footnote{\CTANpkg{holtxdoc}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/holtxdoc.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/holtxdoc.pdf}] Documentation.
@@ -544,7 +562,7 @@ and the derived files
 % the packages are already unpacked and the documentation files
 % are generated. The files and directories obey the TDS standard.
 % \begin{description}
-% \item[\CTAN{install/macros/latex/contrib/oberdiek.tds.zip}]
+% \item[\CTANinstall{install/macros/latex/contrib/oberdiek.tds.zip}]
 % \end{description}
 % \emph{TDS} refers to the standard ``A Directory Structure
 % for \TeX\ Files'' (\CTAN{tds/tds.pdf}). Directories
@@ -663,16 +681,6 @@ and the derived files
 %
 % \subsection{Some details for the interested}
 %
-% \paragraph{Attached source.}
-%
-% The PDF documentation on CTAN also includes the
-% \xfile{.dtx} source file. It can be extracted by
-% AcrobatReader 6 or higher. Another option is \textsf{pdftk},
-% e.g. unpack the file into the current directory:
-% \begin{quote}
-%   \verb|pdftk holtxdoc.pdf unpack_files output .|
-% \end{quote}
-%
 % \paragraph{Unpacking with \LaTeX.}
 % The \xfile{.dtx} chooses its action depending on the format:
 % \begin{description}
@@ -708,43 +716,6 @@ and the derived files
 %\end{verbatim}
 % \end{quote}
 %
-% \section{Catalogue}
-%
-% The following XML file can be used as source for the
-% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
-% The elements \texttt{caption} and \texttt{description} are imported
-% from the original XML file from the Catalogue.
-% The name of the XML file in the Catalogue is \xfile{holtxdoc.xml}.
-%    \begin{macrocode}
-%<*catalogue>
-<?xml version='1.0' encoding='us-ascii'?>
-<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
-<entry datestamp='$Date$' modifier='$Author$' id='holtxdoc'>
-  <name>holtxdoc</name>
-  <caption>Documentation macros for oberdiek bundle, etc.</caption>
-  <authorref id='auth:oberdiek'/>
-  <copyright owner='Heiko Oberdiek' year='1999-2012'/>
-  <license type='lppl1.3'/>
-  <version number='0.28'/>
-  <description>
-    These are personal macros, which are not necessarily useful to
-    other authors (they are provided as part off the source of others
-    of the author's packages).  Macros that may be of use to other
-    authors are available separately, in package
-    <xref refid='hypdoc'>hypdoc</xref>.
-    <p/>
-    The package is part of the <xref refid='oberdiek'>oberdiek</xref> bundle.
-  </description>
-  <documentation details='Package documentation'
-      href='ctan:/macros/latex/contrib/oberdiek/holtxdoc.pdf'/>
-  <ctan file='true' path='/macros/latex/contrib/oberdiek/holtxdoc.dtx'/>
-  <miktex location='oberdiek'/>
-  <texlive location='oberdiek'/>
-  <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
-</entry>
-%</catalogue>
-%    \end{macrocode}
-%
 % \begin{History}
 %   \begin{Version}{1999/06/26 v0.3}
 %   \item
@@ -854,6 +825,11 @@ and the derived files
 %   \item Use CTAN's preferred URL form for packages
 %     Documentation updates.
 %   \end{Version}
+%   \begin{Version}{2019/11/12 v0.29}
+%   \item
+%     Add \verb|\bibpackage| (previously defined inline in some of the packages).
+%     Adjust CTAN links.
+%   \end{Version}
 % \end{History}
 %
 % \PrintIndex
diff --git a/macros/latex/contrib/oberdiek/holtxdoc.pdf b/macros/latex/contrib/oberdiek/holtxdoc.pdf
index 2d8aabb6be..ecd091880c 100644
--- a/macros/latex/contrib/oberdiek/holtxdoc.pdf
+++ b/macros/latex/contrib/oberdiek/holtxdoc.pdf
diff --git a/macros/latex/contrib/oberdiek/hopatch.dtx b/macros/latex/contrib/oberdiek/hopatch.dtx
index 651396aeda..259be51436 100644
--- a/macros/latex/contrib/oberdiek/hopatch.dtx
+++ b/macros/latex/contrib/oberdiek/hopatch.dtx
@@ -13,15 +13,17 @@
 % conditions of the LaTeX Project Public License, either
 % version 1.3c of this license or (at your option) any later
 % version. This version of this license is in
-%    http://www.latex-project.org/lppl/lppl-1-3c.txt
+%    https://www.latex-project.org/lppl/lppl-1-3c.txt
 % and the latest version of this license is in
-%    http://www.latex-project.org/lppl.txt
+%    https://www.latex-project.org/lppl.txt
 % and version 1.3 or later is part of all distributions of
 % LaTeX version 2005/12/01 or later.
 %
 % This work has the LPPL maintenance status "maintained".
 %
-% This Current Maintainer of this work is Heiko Oberdiek.
+% The Current Maintainers of this work are
+% Heiko Oberdiek and the Oberdiek Package Support Group
+% https://github.com/ho-tex/oberdiek/issues
 %
 % This work consists of the main source file hopatch.dtx
 % and the derived files
@@ -101,15 +103,18 @@ This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either
 version 1.3c of this license or (at your option) any later
 version. This version of this license is in
-   http://www.latex-project.org/lppl/lppl-1-3c.txt
+   https://www.latex-project.org/lppl/lppl-1-3c.txt
 and the latest version of this license is in
-   http://www.latex-project.org/lppl.txt
+   https://www.latex-project.org/lppl.txt
 and version 1.3 or later is part of all distributions of
 LaTeX version 2005/12/01 or later.
 
 This work has the LPPL maintenance status "maintained".
 
-This Current Maintainer of this work is Heiko Oberdiek.
+The Current Maintainers of this work are
+Heiko Oberdiek and the Oberdiek Package Support Group
+https://github.com/ho-tex/oberdiek/issues
+
 
 This work consists of the main source file hopatch.dtx
 and the derived files
@@ -192,8 +197,7 @@ and the derived files
 % \title{The \xpackage{hopatch} package}
 % \date{2016/05/16 v1.3}
 % \author{Heiko Oberdiek\thanks
-% {Please report any issues at https://github.com/ho-tex/oberdiek/issues}\\
-% \xemail{heiko.oberdiek at googlemail.com}}
+% {Please report any issues at \url{https://github.com/ho-tex/oberdiek/issues}}}
 %
 % \maketitle
 %
@@ -686,7 +690,7 @@ and the derived files
 % \subsection{Download}
 %
 % \paragraph{Package.} This package is available on
-% CTAN\footnote{\url{http://ctan.org/pkg/hopatch}}:
+% CTAN\footnote{\CTANpkg{hopatch}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/hopatch.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/hopatch.pdf}] Documentation.
@@ -698,7 +702,7 @@ and the derived files
 % the packages are already unpacked and the documentation files
 % are generated. The files and directories obey the TDS standard.
 % \begin{description}
-% \item[\CTAN{install/macros/latex/contrib/oberdiek.tds.zip}]
+% \item[\CTANinstall{install/macros/latex/contrib/oberdiek.tds.zip}]
 % \end{description}
 % \emph{TDS} refers to the standard ``A Directory Structure
 % for \TeX\ Files'' (\CTAN{tds/tds.pdf}). Directories
@@ -819,16 +823,6 @@ and the derived files
 %
 % \subsection{Some details for the interested}
 %
-% \paragraph{Attached source.}
-%
-% The PDF documentation on CTAN also includes the
-% \xfile{.dtx} source file. It can be extracted by
-% AcrobatReader 6 or higher. Another option is \textsf{pdftk},
-% e.g. unpack the file into the current directory:
-% \begin{quote}
-%   \verb|pdftk hopatch.pdf unpack_files output .|
-% \end{quote}
-%
 % \paragraph{Unpacking with \LaTeX.}
 % The \xfile{.dtx} chooses its action depending on the format:
 % \begin{description}
@@ -864,43 +858,6 @@ and the derived files
 %\end{verbatim}
 % \end{quote}
 %
-% \section{Catalogue}
-%
-% The following XML file can be used as source for the
-% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
-% The elements \texttt{caption} and \texttt{description} are imported
-% from the original XML file from the Catalogue.
-% The name of the XML file in the Catalogue is \xfile{hopatch.xml}.
-%    \begin{macrocode}
-%<*catalogue>
-<?xml version='1.0' encoding='us-ascii'?>
-<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
-<entry datestamp='$Date$' modifier='$Author$' id='hopatch'>
-  <name>hopatch</name>
-  <caption>Load patches for packages.</caption>
-  <authorref id='auth:oberdiek'/>
-  <copyright owner='Heiko Oberdiek' year='2011,2012'/>
-  <license type='lppl1.3'/>
-  <version number='1.3'/>
-  <description>
-    The hopatch package provides a command with which the user may
-    register a piece of patch code for a particular package.  Hopatch
-    will apply the patch immediately, if the relevant package has
-    already been loaded; otherwise it will store the patch until the
-    package appears.
-    <p/>
-    The package is part of the <xref refid='oberdiek'>oberdiek</xref> bundle.
-  </description>
-  <documentation details='Package documentation'
-      href='ctan:/macros/latex/contrib/oberdiek/hopatch.pdf'/>
-  <ctan file='true' path='/macros/latex/contrib/oberdiek/hopatch.dtx'/>
-  <miktex location='oberdiek'/>
-  <texlive location='oberdiek'/>
-  <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
-</entry>
-%</catalogue>
-%    \end{macrocode}
-%
 % \begin{thebibliography}{9}
 % \raggedright
 %
diff --git a/macros/latex/contrib/oberdiek/hopatch.pdf b/macros/latex/contrib/oberdiek/hopatch.pdf
index e2fe0cb9fd..614aa20e65 100644
--- a/macros/latex/contrib/oberdiek/hopatch.pdf
+++ b/macros/latex/contrib/oberdiek/hopatch.pdf
diff --git a/macros/latex/contrib/oberdiek/hycolor.dtx b/macros/latex/contrib/oberdiek/hycolor.dtx
index 79bfe8d13f..85f2903936 100644
--- a/macros/latex/contrib/oberdiek/hycolor.dtx
+++ b/macros/latex/contrib/oberdiek/hycolor.dtx
@@ -13,15 +13,17 @@
 % conditions of the LaTeX Project Public License, either
 % version 1.3c of this license or (at your option) any later
 % version. This version of this license is in
-%    http://www.latex-project.org/lppl/lppl-1-3c.txt
+%    https://www.latex-project.org/lppl/lppl-1-3c.txt
 % and the latest version of this license is in
-%    http://www.latex-project.org/lppl.txt
+%    https://www.latex-project.org/lppl.txt
 % and version 1.3 or later is part of all distributions of
 % LaTeX version 2005/12/01 or later.
 %
 % This work has the LPPL maintenance status "maintained".
 %
-% This Current Maintainer of this work is Heiko Oberdiek.
+% The Current Maintainers of this work are
+% Heiko Oberdiek and the Oberdiek Package Support Group
+% https://github.com/ho-tex/oberdiek/issues
 %
 % This work consists of the main source file hycolor.dtx
 % and the derived files
@@ -110,15 +112,18 @@ This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either
 version 1.3c of this license or (at your option) any later
 version. This version of this license is in
-   http://www.latex-project.org/lppl/lppl-1-3c.txt
+   https://www.latex-project.org/lppl/lppl-1-3c.txt
 and the latest version of this license is in
-   http://www.latex-project.org/lppl.txt
+   https://www.latex-project.org/lppl.txt
 and version 1.3 or later is part of all distributions of
 LaTeX version 2005/12/01 or later.
 
 This work has the LPPL maintenance status "maintained".
 
-This Current Maintainer of this work is Heiko Oberdiek.
+The Current Maintainers of this work are
+Heiko Oberdiek and the Oberdiek Package Support Group
+https://github.com/ho-tex/oberdiek/issues
+
 
 This work consists of the main source file hycolor.dtx
 and the derived files
@@ -241,8 +246,7 @@ and the derived files
 % \title{The \xpackage{hycolor} package}
 % \date{2016/05/16 v1.8}
 % \author{Heiko Oberdiek\thanks
-% {Please report any issues at https://github.com/ho-tex/oberdiek/issues}\\
-% \xemail{heiko.oberdiek at googlemail.com}}
+% {Please report any issues at \url{https://github.com/ho-tex/oberdiek/issues}}}
 %
 % \maketitle
 %
@@ -1962,7 +1966,7 @@ and the derived files
 % \subsection{Download}
 %
 % \paragraph{Package.} This package is available on
-% CTAN\footnote{\url{http://ctan.org/pkg/hycolor}}:
+% CTAN\footnote{\CTANpkg{hycolor}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/hycolor.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/hycolor.pdf}] Documentation.
@@ -1974,7 +1978,7 @@ and the derived files
 % the packages are already unpacked and the documentation files
 % are generated. The files and directories obey the TDS standard.
 % \begin{description}
-% \item[\CTAN{install/macros/latex/contrib/oberdiek.tds.zip}]
+% \item[\CTANinstall{install/macros/latex/contrib/oberdiek.tds.zip}]
 % \end{description}
 % \emph{TDS} refers to the standard ``A Directory Structure
 % for \TeX\ Files'' (\CTAN{tds/tds.pdf}). Directories
@@ -2101,16 +2105,6 @@ and the derived files
 %
 % \subsection{Some details for the interested}
 %
-% \paragraph{Attached source.}
-%
-% The PDF documentation on CTAN also includes the
-% \xfile{.dtx} source file. It can be extracted by
-% AcrobatReader 6 or higher. Another option is \textsf{pdftk},
-% e.g. unpack the file into the current directory:
-% \begin{quote}
-%   \verb|pdftk hycolor.pdf unpack_files output .|
-% \end{quote}
-%
 % \paragraph{Unpacking with \LaTeX.}
 % The \xfile{.dtx} chooses its action depending on the format:
 % \begin{description}
@@ -2146,42 +2140,6 @@ and the derived files
 %\end{verbatim}
 % \end{quote}
 %
-% \section{Catalogue}
-%
-% The following XML file can be used as source for the
-% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
-% The elements \texttt{caption} and \texttt{description} are imported
-% from the original XML file from the Catalogue.
-% The name of the XML file in the Catalogue is \xfile{hycolor.xml}.
-%    \begin{macrocode}
-%<*catalogue>
-<?xml version='1.0' encoding='us-ascii'?>
-<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
-<entry datestamp='$Date$' modifier='$Author$' id='hycolor'>
-  <name>hycolor</name>
-  <caption>Implements colour for packages hyperref and bookmark.</caption>
-  <authorref id='auth:oberdiek'/>
-  <copyright owner='Heiko Oberdiek' year='2007-2011'/>
-  <license type='lppl1.3'/>
-  <version number='1.8'/>
-  <description>
-    This package provides the code for the color option
-    that is used by packages <xref refid='hyperref'>hyperref</xref>
-    and <xref refid='bookmark'>bookmark</xref>.
-    It is not intended as package for the user.
-    <p/>
-    The package is part of the <xref refid='oberdiek'>oberdiek</xref> bundle.
-  </description>
-  <documentation details='Package documentation'
-      href='ctan:/macros/latex/contrib/oberdiek/hycolor.pdf'/>
-  <ctan file='true' path='/macros/latex/contrib/oberdiek/hycolor.dtx'/>
-  <miktex location='oberdiek'/>
-  <texlive location='oberdiek'/>
-  <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
-</entry>
-%</catalogue>
-%    \end{macrocode}
-%
 % \begin{History}
 %   \begin{Version}{2007/04/09 v1.0}
 %   \item
diff --git a/macros/latex/contrib/oberdiek/hycolor.pdf b/macros/latex/contrib/oberdiek/hycolor.pdf
index c02a31b24c..65bd09f63f 100644
--- a/macros/latex/contrib/oberdiek/hycolor.pdf
+++ b/macros/latex/contrib/oberdiek/hycolor.pdf
diff --git a/macros/latex/contrib/oberdiek/hypbmsec.dtx b/macros/latex/contrib/oberdiek/hypbmsec.dtx
index 5288140146..60a716fca8 100644
--- a/macros/latex/contrib/oberdiek/hypbmsec.dtx
+++ b/macros/latex/contrib/oberdiek/hypbmsec.dtx
@@ -13,15 +13,17 @@
 % conditions of the LaTeX Project Public License, either
 % version 1.3c of this license or (at your option) any later
 % version. This version of this license is in
-%    http://www.latex-project.org/lppl/lppl-1-3c.txt
+%    https://www.latex-project.org/lppl/lppl-1-3c.txt
 % and the latest version of this license is in
-%    http://www.latex-project.org/lppl.txt
+%    https://www.latex-project.org/lppl.txt
 % and version 1.3 or later is part of all distributions of
 % LaTeX version 2005/12/01 or later.
 %
 % This work has the LPPL maintenance status "maintained".
 %
-% This Current Maintainer of this work is Heiko Oberdiek.
+% The Current Maintainers of this work are
+% Heiko Oberdiek and the Oberdiek Package Support Group
+% https://github.com/ho-tex/oberdiek/issues
 %
 % This work consists of the main source file hypbmsec.dtx
 % and the derived files
@@ -98,15 +100,18 @@ This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either
 version 1.3c of this license or (at your option) any later
 version. This version of this license is in
-   http://www.latex-project.org/lppl/lppl-1-3c.txt
+   https://www.latex-project.org/lppl/lppl-1-3c.txt
 and the latest version of this license is in
-   http://www.latex-project.org/lppl.txt
+   https://www.latex-project.org/lppl.txt
 and version 1.3 or later is part of all distributions of
 LaTeX version 2005/12/01 or later.
 
 This work has the LPPL maintenance status "maintained".
 
-This Current Maintainer of this work is Heiko Oberdiek.
+The Current Maintainers of this work are
+Heiko Oberdiek and the Oberdiek Package Support Group
+https://github.com/ho-tex/oberdiek/issues
+
 
 This work consists of the main source file hypbmsec.dtx
 and the derived files
@@ -181,8 +186,7 @@ and the derived files
 % \title{The \xpackage{hypbmsec} package}
 % \date{2016/05/16 v2.5}
 % \author{Heiko Oberdiek\thanks
-% {Please report any issues at https://github.com/ho-tex/oberdiek/issues}\\
-% \xemail{heiko.oberdiek at googlemail.com}}
+% {Please report any issues at \url{https://github.com/ho-tex/oberdiek/issues}}}
 %
 % \maketitle
 %
@@ -600,7 +604,7 @@ and the derived files
 % \subsection{Download}
 %
 % \paragraph{Package.} This package is available on
-% CTAN\footnote{\url{http://ctan.org/pkg/hypbmsec}}:
+% CTAN\footnote{\CTANpkg{hypbmsec}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/hypbmsec.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/hypbmsec.pdf}] Documentation.
@@ -612,7 +616,7 @@ and the derived files
 % the packages are already unpacked and the documentation files
 % are generated. The files and directories obey the TDS standard.
 % \begin{description}
-% \item[\CTAN{install/macros/latex/contrib/oberdiek.tds.zip}]
+% \item[\CTANinstall{install/macros/latex/contrib/oberdiek.tds.zip}]
 % \end{description}
 % \emph{TDS} refers to the standard ``A Directory Structure
 % for \TeX\ Files'' (\CTAN{tds/tds.pdf}). Directories
@@ -731,16 +735,6 @@ and the derived files
 %
 % \subsection{Some details for the interested}
 %
-% \paragraph{Attached source.}
-%
-% The PDF documentation on CTAN also includes the
-% \xfile{.dtx} source file. It can be extracted by
-% AcrobatReader 6 or higher. Another option is \textsf{pdftk},
-% e.g. unpack the file into the current directory:
-% \begin{quote}
-%   \verb|pdftk hypbmsec.pdf unpack_files output .|
-% \end{quote}
-%
 % \paragraph{Unpacking with \LaTeX.}
 % The \xfile{.dtx} chooses its action depending on the format:
 % \begin{description}
@@ -776,43 +770,6 @@ and the derived files
 %\end{verbatim}
 % \end{quote}
 %
-% \section{Catalogue}
-%
-% The following XML file can be used as source for the
-% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
-% The elements \texttt{caption} and \texttt{description} are imported
-% from the original XML file from the Catalogue.
-% The name of the XML file in the Catalogue is \xfile{hypbmsec.xml}.
-%    \begin{macrocode}
-%<*catalogue>
-<?xml version='1.0' encoding='us-ascii'?>
-<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
-<entry datestamp='$Date$' modifier='$Author$' id='hypbmsec'>
-  <name>hypbmsec</name>
-  <caption>Hypertext bookmarks in sectioning commands.</caption>
-  <authorref id='auth:oberdiek'/>
-  <copyright owner='Heiko Oberdiek' year='1998-2000,2006,2007'/>
-  <license type='lppl1.3'/>
-  <version number='2.5'/>
-  <description>
-    Bookmark entries can be given as another argument to the LaTeX
-    sectioning commands. The <xref refid='hyperref'>hyperref</xref>
-    package is required to get the bookmarks, but the syntax
-    works without it.
-    <p/>
-    This package is part of the <xref refid='oberdiek'>oberdiek</xref>
-    bundle.
-  </description>
-  <documentation details='Package documentation'
-      href='ctan:/macros/latex/contrib/oberdiek/hypbmsec.pdf'/>
-  <ctan file='true' path='/macros/latex/contrib/oberdiek/hypbmsec.dtx'/>
-  <miktex location='oberdiek'/>
-  <texlive location='oberdiek'/>
-  <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
-</entry>
-%</catalogue>
-%    \end{macrocode}
-%
 % \begin{History}
 %   \begin{Version}{1998/11/20 v1.0}
 %   \item
diff --git a/macros/latex/contrib/oberdiek/hypbmsec.pdf b/macros/latex/contrib/oberdiek/hypbmsec.pdf
index 3667c3a192..e3d7743e3c 100644
--- a/macros/latex/contrib/oberdiek/hypbmsec.pdf
+++ b/macros/latex/contrib/oberdiek/hypbmsec.pdf
diff --git a/macros/latex/contrib/oberdiek/hypcap.dtx b/macros/latex/contrib/oberdiek/hypcap.dtx
index e35d80e245..9ef57eb82e 100644
--- a/macros/latex/contrib/oberdiek/hypcap.dtx
+++ b/macros/latex/contrib/oberdiek/hypcap.dtx
@@ -13,15 +13,17 @@
 % conditions of the LaTeX Project Public License, either
 % version 1.3c of this license or (at your option) any later
 % version. This version of this license is in
-%    http://www.latex-project.org/lppl/lppl-1-3c.txt
+%    https://www.latex-project.org/lppl/lppl-1-3c.txt
 % and the latest version of this license is in
-%    http://www.latex-project.org/lppl.txt
+%    https://www.latex-project.org/lppl.txt
 % and version 1.3 or later is part of all distributions of
 % LaTeX version 2005/12/01 or later.
 %
 % This work has the LPPL maintenance status "maintained".
 %
-% This Current Maintainer of this work is Heiko Oberdiek.
+% The Current Maintainers of this work are
+% Heiko Oberdiek and the Oberdiek Package Support Group
+% https://github.com/ho-tex/oberdiek/issues
 %
 % This work consists of the main source file hypcap.dtx
 % and the derived files
@@ -98,15 +100,18 @@ This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either
 version 1.3c of this license or (at your option) any later
 version. This version of this license is in
-   http://www.latex-project.org/lppl/lppl-1-3c.txt
+   https://www.latex-project.org/lppl/lppl-1-3c.txt
 and the latest version of this license is in
-   http://www.latex-project.org/lppl.txt
+   https://www.latex-project.org/lppl.txt
 and version 1.3 or later is part of all distributions of
 LaTeX version 2005/12/01 or later.
 
 This work has the LPPL maintenance status "maintained".
 
-This Current Maintainer of this work is Heiko Oberdiek.
+The Current Maintainers of this work are
+Heiko Oberdiek and the Oberdiek Package Support Group
+https://github.com/ho-tex/oberdiek/issues
+
 
 This work consists of the main source file hypcap.dtx
 and the derived files
@@ -181,8 +186,7 @@ and the derived files
 % \title{The \xpackage{hypcap} package}
 % \date{2016/05/16 v1.12}
 % \author{Heiko Oberdiek\thanks
-% {Please report any issues at https://github.com/ho-tex/oberdiek/issues}\\
-% \xemail{heiko.oberdiek at googlemail.com}}
+% {Please report any issues at \url{https://github.com/ho-tex/oberdiek/issues}}}
 %
 % \maketitle
 %
@@ -509,7 +513,7 @@ and the derived files
 % \subsection{Download}
 %
 % \paragraph{Package.} This package is available on
-% CTAN\footnote{\url{http://ctan.org/pkg/hypcap}}:
+% CTAN\footnote{\CTANpkg{hypcap}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/hypcap.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/hypcap.pdf}] Documentation.
@@ -521,7 +525,7 @@ and the derived files
 % the packages are already unpacked and the documentation files
 % are generated. The files and directories obey the TDS standard.
 % \begin{description}
-% \item[\CTAN{install/macros/latex/contrib/oberdiek.tds.zip}]
+% \item[\CTANinstall{install/macros/latex/contrib/oberdiek.tds.zip}]
 % \end{description}
 % \emph{TDS} refers to the standard ``A Directory Structure
 % for \TeX\ Files'' (\CTAN{tds/tds.pdf}). Directories
@@ -640,16 +644,6 @@ and the derived files
 %
 % \subsection{Some details for the interested}
 %
-% \paragraph{Attached source.}
-%
-% The PDF documentation on CTAN also includes the
-% \xfile{.dtx} source file. It can be extracted by
-% AcrobatReader 6 or higher. Another option is \textsf{pdftk},
-% e.g. unpack the file into the current directory:
-% \begin{quote}
-%   \verb|pdftk hypcap.pdf unpack_files output .|
-% \end{quote}
-%
 % \paragraph{Unpacking with \LaTeX.}
 % The \xfile{.dtx} chooses its action depending on the format:
 % \begin{description}
@@ -685,53 +679,12 @@ and the derived files
 %\end{verbatim}
 % \end{quote}
 %
-% \section{Catalogue}
-%
-% The following XML file can be used as source for the
-% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
-% The elements \texttt{caption} and \texttt{description} are imported
-% from the original XML file from the Catalogue.
-% The name of the XML file in the Catalogue is \xfile{hypcap.xml}.
-%    \begin{macrocode}
-%<*catalogue>
-<?xml version='1.0' encoding='us-ascii'?>
-<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
-<entry datestamp='$Date$' modifier='$Author$' id='hypcap'>
-  <name>hypcap</name>
-  <caption>Adjusting the anchors of captions.</caption>
-  <authorref id='auth:oberdiek'/>
-  <copyright owner='Heiko Oberdiek' year='1999-2001,2006-2008,2011'/>
-  <license type='lppl1.3'/>
-  <version number='1.12'/>
-  <description>
-    The package offers a solution to the problem that when you link to
-    a float using <xref refid='hyperref'>hyperref</xref>, the link
-    anchors to below the float's caption, rather than the beginning of
-    the float.
-    <p/>
-    Hypcap defines a separate \capstart command, which you put where
-    you want links to end; you should have a \capstart command for each
-    \caption command.  Package options can be used to auto-insert a
-    \capstart at the start of a float environment.
-    <p/>
-    The package is part of the <xref refid='oberdiek'>oberdiek</xref> bundle.
-  </description>
-  <documentation details='Package documentation'
-      href='ctan:/macros/latex/contrib/oberdiek/hypcap.pdf'/>
-  <ctan file='true' path='/macros/latex/contrib/oberdiek/hypcap.dtx'/>
-  <miktex location='oberdiek'/>
-  <texlive location='oberdiek'/>
-  <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
-</entry>
-%</catalogue>
-%    \end{macrocode}
-%
 % \begin{History}
 %   \begin{Version}{1999/02/13 v1.0}
 %   \item
 %     A beginning version, published in newsgroup \xnewsgroup{comp.text.tex}:\\
 %     \URL{``\link{Re: \xpackage{hyperref} and figures}''}^^A
-%     {http://groups.google.com/group/comp.text.tex/msg/5c9b47b001a9379c}
+%     {https://groups.google.com/group/comp.text.tex/msg/5c9b47b001a9379c}
 %   \end{Version}
 %   \begin{Version}{2000/08/14 v1.1}
 %   \item
diff --git a/macros/latex/contrib/oberdiek/hypcap.pdf b/macros/latex/contrib/oberdiek/hypcap.pdf
index 03afde31e3..eb0ee6e7af 100644
--- a/macros/latex/contrib/oberdiek/hypcap.pdf
+++ b/macros/latex/contrib/oberdiek/hypcap.pdf
diff --git a/macros/latex/contrib/oberdiek/hypdestopt.dtx b/macros/latex/contrib/oberdiek/hypdestopt.dtx
index 26ca80e459..b8c9a76df0 100644
--- a/macros/latex/contrib/oberdiek/hypdestopt.dtx
+++ b/macros/latex/contrib/oberdiek/hypdestopt.dtx
@@ -13,15 +13,17 @@
 % conditions of the LaTeX Project Public License, either
 % version 1.3c of this license or (at your option) any later
 % version. This version of this license is in
-%    http://www.latex-project.org/lppl/lppl-1-3c.txt
+%    https://www.latex-project.org/lppl/lppl-1-3c.txt
 % and the latest version of this license is in
-%    http://www.latex-project.org/lppl.txt
+%    https://www.latex-project.org/lppl.txt
 % and version 1.3 or later is part of all distributions of
 % LaTeX version 2005/12/01 or later.
 %
 % This work has the LPPL maintenance status "maintained".
 %
-% This Current Maintainer of this work is Heiko Oberdiek.
+% The Current Maintainers of this work are
+% Heiko Oberdiek and the Oberdiek Package Support Group
+% https://github.com/ho-tex/oberdiek/issues
 %
 % This work consists of the main source file hypdestopt.dtx
 % and the derived files
@@ -98,15 +100,18 @@ This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either
 version 1.3c of this license or (at your option) any later
 version. This version of this license is in
-   http://www.latex-project.org/lppl/lppl-1-3c.txt
+   https://www.latex-project.org/lppl/lppl-1-3c.txt
 and the latest version of this license is in
-   http://www.latex-project.org/lppl.txt
+   https://www.latex-project.org/lppl.txt
 and version 1.3 or later is part of all distributions of
 LaTeX version 2005/12/01 or later.
 
 This work has the LPPL maintenance status "maintained".
 
-This Current Maintainer of this work is Heiko Oberdiek.
+The Current Maintainers of this work are
+Heiko Oberdiek and the Oberdiek Package Support Group
+https://github.com/ho-tex/oberdiek/issues
+
 
 This work consists of the main source file hypdestopt.dtx
 and the derived files
@@ -181,8 +186,7 @@ and the derived files
 % \title{The \xpackage{hypdestopt} package}
 % \date{2016/05/21 v2.5}
 % \author{Heiko Oberdiek\thanks
-% {Please report any issues at https://github.com/ho-tex/oberdiek/issues}\\
-% \xemail{heiko.oberdiek at googlemail.com}}
+% {Please report any issues at \url{https://github.com/ho-tex/oberdiek/issues}}}
 %
 % \maketitle
 %
@@ -764,7 +768,7 @@ and the derived files
 % \subsection{Download}
 %
 % \paragraph{Package.} This package is available on
-% CTAN\footnote{\url{http://ctan.org/pkg/hypdestopt}}:
+% CTAN\footnote{\CTANpkg{hypdestopt}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/hypdestopt.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/hypdestopt.pdf}] Documentation.
@@ -776,7 +780,7 @@ and the derived files
 % the packages are already unpacked and the documentation files
 % are generated. The files and directories obey the TDS standard.
 % \begin{description}
-% \item[\CTAN{install/macros/latex/contrib/oberdiek.tds.zip}]
+% \item[\CTANinstall{install/macros/latex/contrib/oberdiek.tds.zip}]
 % \end{description}
 % \emph{TDS} refers to the standard ``A Directory Structure
 % for \TeX\ Files'' (\CTAN{tds/tds.pdf}). Directories
@@ -895,16 +899,6 @@ and the derived files
 %
 % \subsection{Some details for the interested}
 %
-% \paragraph{Attached source.}
-%
-% The PDF documentation on CTAN also includes the
-% \xfile{.dtx} source file. It can be extracted by
-% AcrobatReader 6 or higher. Another option is \textsf{pdftk},
-% e.g. unpack the file into the current directory:
-% \begin{quote}
-%   \verb|pdftk hypdestopt.pdf unpack_files output .|
-% \end{quote}
-%
 % \paragraph{Unpacking with \LaTeX.}
 % The \xfile{.dtx} chooses its action depending on the format:
 % \begin{description}
@@ -940,43 +934,6 @@ and the derived files
 %\end{verbatim}
 % \end{quote}
 %
-% \section{Catalogue}
-%
-% The following XML file can be used as source for the
-% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
-% The elements \texttt{caption} and \texttt{description} are imported
-% from the original XML file from the Catalogue.
-% The name of the XML file in the Catalogue is \xfile{hypdestopt.xml}.
-%    \begin{macrocode}
-%<*catalogue>
-<?xml version='1.0' encoding='us-ascii'?>
-<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
-<entry datestamp='$Date$' modifier='$Author$' id='hypdestopt'>
-  <name>hypdestopt</name>
-  <caption>Hyperref destination optimizer.</caption>
-  <authorref id='auth:oberdiek'/>
-  <copyright owner='Heiko Oberdiek' year='2006-2008,2011'/>
-  <license type='lppl1.3'/>
-  <version number='2.5'/>
-  <description>
-    This package supports <xref refid='hyperref'>hyperref</xref>'s
-    pdftex driver. It removes unnecessary destinations
-    and shortens the destination names or uses numbered destinations
-    to get smaller PDF files.
-    <p/>
-    The package is part of the <xref refid='oberdiek'>oberdiek</xref>
-    bundle.
-  </description>
-  <documentation details='Package documentation'
-      href='ctan:/macros/latex/contrib/oberdiek/hypdestopt.pdf'/>
-  <ctan file='true' path='/macros/latex/contrib/oberdiek/hypdestopt.dtx'/>
-  <miktex location='oberdiek'/>
-  <texlive location='oberdiek'/>
-  <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
-</entry>
-%</catalogue>
-%    \end{macrocode}
-%
 % \begin{thebibliography}{9}
 %
 % \bibitem{alphalph}
@@ -988,12 +945,12 @@ and the derived files
 %   Sebastian Rahtz, Heiko Oberdiek:
 %   \textit{The \xpackage{hyperref} package};
 %   2006/06/01 v6.75a;
-%   \CTAN{macros/latex/contrib/hyperref/}.
+%   \CTANpkg{hyperref}.
 %
 % \bibitem{ifpdf}
 %   Heiko Oberdiek: \textit{The \xpackage{ifpdf} package};
 %   2006/02/20 v1.4;
-%   \CTAN{macros/latex/contrib/oberdiek/ifpdf.pdf}.
+%   \CTANpkg{ifpdf}.
 %
 % \end{thebibliography}
 %
diff --git a/macros/latex/contrib/oberdiek/hypdestopt.pdf b/macros/latex/contrib/oberdiek/hypdestopt.pdf
index 38119f52d9..8c5809d295 100644
--- a/macros/latex/contrib/oberdiek/hypdestopt.pdf
+++ b/macros/latex/contrib/oberdiek/hypdestopt.pdf
diff --git a/macros/latex/contrib/oberdiek/hypdoc.dtx b/macros/latex/contrib/oberdiek/hypdoc.dtx
index ba803c86e3..7d37511812 100644
--- a/macros/latex/contrib/oberdiek/hypdoc.dtx
+++ b/macros/latex/contrib/oberdiek/hypdoc.dtx
@@ -13,15 +13,17 @@
 % conditions of the LaTeX Project Public License, either
 % version 1.3c of this license or (at your option) any later
 % version. This version of this license is in
-%    http://www.latex-project.org/lppl/lppl-1-3c.txt
+%    https://www.latex-project.org/lppl/lppl-1-3c.txt
 % and the latest version of this license is in
-%    http://www.latex-project.org/lppl.txt
+%    https://www.latex-project.org/lppl.txt
 % and version 1.3 or later is part of all distributions of
 % LaTeX version 2005/12/01 or later.
 %
 % This work has the LPPL maintenance status "maintained".
 %
-% This Current Maintainer of this work is Heiko Oberdiek.
+% The Current Maintainers of this work are
+% Heiko Oberdiek and the Oberdiek Package Support Group
+% https://github.com/ho-tex/oberdiek/issues
 %
 % This work consists of the main source file hypdoc.dtx
 % and the derived files
@@ -98,15 +100,18 @@ This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either
 version 1.3c of this license or (at your option) any later
 version. This version of this license is in
-   http://www.latex-project.org/lppl/lppl-1-3c.txt
+   https://www.latex-project.org/lppl/lppl-1-3c.txt
 and the latest version of this license is in
-   http://www.latex-project.org/lppl.txt
+   https://www.latex-project.org/lppl.txt
 and version 1.3 or later is part of all distributions of
 LaTeX version 2005/12/01 or later.
 
 This work has the LPPL maintenance status "maintained".
 
-This Current Maintainer of this work is Heiko Oberdiek.
+The Current Maintainers of this work are
+Heiko Oberdiek and the Oberdiek Package Support Group
+https://github.com/ho-tex/oberdiek/issues
+
 
 This work consists of the main source file hypdoc.dtx
 and the derived files
@@ -181,8 +186,7 @@ and the derived files
 % \title{The \xpackage{hypdoc} package}
 % \date{2018/09/07 v1.14}
 % \author{Heiko Oberdiek\thanks
-% {Please report any issues at https://github.com/ho-tex/oberdiek/issues}\\
-% \xemail{heiko.oberdiek at googlemail.com}}
+% {Please report any issues at \url{https://github.com/ho-tex/oberdiek/issues}}}
 %
 % \maketitle
 %
@@ -1145,7 +1149,7 @@ and the derived files
 % \subsection{Download}
 %
 % \paragraph{Package.} This package is available on
-% CTAN\footnote{\url{http://ctan.org/pkg/hypdoc}}:
+% CTAN\footnote{\CTANpkg{hypdoc}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/hypdoc.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/hypdoc.pdf}] Documentation.
@@ -1157,7 +1161,7 @@ and the derived files
 % the packages are already unpacked and the documentation files
 % are generated. The files and directories obey the TDS standard.
 % \begin{description}
-% \item[\CTAN{install/macros/latex/contrib/oberdiek.tds.zip}]
+% \item[\CTANinstall{install/macros/latex/contrib/oberdiek.tds.zip}]
 % \end{description}
 % \emph{TDS} refers to the standard ``A Directory Structure
 % for \TeX\ Files'' (\CTAN{tds/tds.pdf}). Directories
@@ -1276,16 +1280,6 @@ and the derived files
 %
 % \subsection{Some details for the interested}
 %
-% \paragraph{Attached source.}
-%
-% The PDF documentation on CTAN also includes the
-% \xfile{.dtx} source file. It can be extracted by
-% AcrobatReader 6 or higher. Another option is \textsf{pdftk},
-% e.g. unpack the file into the current directory:
-% \begin{quote}
-%   \verb|pdftk hypdoc.pdf unpack_files output .|
-% \end{quote}
-%
 % \paragraph{Unpacking with \LaTeX.}
 % The \xfile{.dtx} chooses its action depending on the format:
 % \begin{description}
@@ -1321,43 +1315,6 @@ and the derived files
 %\end{verbatim}
 % \end{quote}
 %
-% \section{Catalogue}
-%
-% The following XML file can be used as source for the
-% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
-% The elements \texttt{caption} and \texttt{description} are imported
-% from the original XML file from the Catalogue.
-% The name of the XML file in the Catalogue is \xfile{hypdoc.xml}.
-%    \begin{macrocode}
-%<*catalogue>
-<?xml version='1.0' encoding='us-ascii'?>
-<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
-<entry datestamp='$Date$' modifier='$Author$' id='hypdoc'>
-  <name>hypdoc</name>
-  <caption>Hyper extensions for doc.sty.</caption>
-  <authorref id='auth:oberdiek'/>
-  <copyright owner='Heiko Oberdiek' year='2002,2006,2007,2009-2011'/>
-  <license type='lppl1.3'/>
-  <version number='1.14'/>
-  <description>
-    This package adds hypertext features to the package
-    <xref refid='doc'>doc</xref> that is used in the documentation
-    system of <xref refid='latex'>LaTeX2e</xref>. Bookmarks are added
-    and references are linked as far as possible.
-    <p/>
-    The package is part of the <xref refid='oberdiek'>oberdiek</xref>
-    bundle.
-  </description>
-  <documentation details='Package documentation'
-      href='ctan:/macros/latex/contrib/oberdiek/hypdoc.pdf'/>
-  <ctan file='true' path='/macros/latex/contrib/oberdiek/hypdoc.dtx'/>
-  <miktex location='oberdiek'/>
-  <texlive location='oberdiek'/>
-  <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
-</entry>
-%</catalogue>
-%    \end{macrocode}
-%
 % \begin{History}
 %   \begin{Version}{2002/05/10 v1.0}
 %   \item
diff --git a/macros/latex/contrib/oberdiek/hypdoc.pdf b/macros/latex/contrib/oberdiek/hypdoc.pdf
index c507c78149..9cbdc090c4 100644
--- a/macros/latex/contrib/oberdiek/hypdoc.pdf
+++ b/macros/latex/contrib/oberdiek/hypdoc.pdf
diff --git a/macros/latex/contrib/oberdiek/hypgotoe.dtx b/macros/latex/contrib/oberdiek/hypgotoe.dtx
index 14ee6417c7..ecf5b50782 100644
--- a/macros/latex/contrib/oberdiek/hypgotoe.dtx
+++ b/macros/latex/contrib/oberdiek/hypgotoe.dtx
@@ -13,15 +13,17 @@
 % conditions of the LaTeX Project Public License, either
 % version 1.3c of this license or (at your option) any later
 % version. This version of this license is in
-%    http://www.latex-project.org/lppl/lppl-1-3c.txt
+%    https://www.latex-project.org/lppl/lppl-1-3c.txt
 % and the latest version of this license is in
-%    http://www.latex-project.org/lppl.txt
+%    https://www.latex-project.org/lppl.txt
 % and version 1.3 or later is part of all distributions of
 % LaTeX version 2005/12/01 or later.
 %
 % This work has the LPPL maintenance status "maintained".
 %
-% This Current Maintainer of this work is Heiko Oberdiek.
+% The Current Maintainers of this work are
+% Heiko Oberdiek and the Oberdiek Package Support Group
+% https://github.com/ho-tex/oberdiek/issues
 %
 % This work consists of the main source file hypgotoe.dtx
 % and the derived files
@@ -100,15 +102,18 @@ This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either
 version 1.3c of this license or (at your option) any later
 version. This version of this license is in
-   http://www.latex-project.org/lppl/lppl-1-3c.txt
+   https://www.latex-project.org/lppl/lppl-1-3c.txt
 and the latest version of this license is in
-   http://www.latex-project.org/lppl.txt
+   https://www.latex-project.org/lppl.txt
 and version 1.3 or later is part of all distributions of
 LaTeX version 2005/12/01 or later.
 
 This work has the LPPL maintenance status "maintained".
 
-This Current Maintainer of this work is Heiko Oberdiek.
+The Current Maintainers of this work are
+Heiko Oberdiek and the Oberdiek Package Support Group
+https://github.com/ho-tex/oberdiek/issues
+
 
 This work consists of the main source file hypgotoe.dtx
 and the derived files
@@ -186,8 +191,7 @@ and the derived files
 % \title{The \xpackage{hypgotoe} package}
 % \date{2016/05/16 v0.2}
 % \author{Heiko Oberdiek\thanks
-% {Please report any issues at https://github.com/ho-tex/oberdiek/issues}\\
-% \xemail{heiko.oberdiek at googlemail.com}}
+% {Please report any issues at \url{https://github.com/ho-tex/oberdiek/issues}}}
 %
 % \maketitle
 %
@@ -488,7 +492,7 @@ Anker foobar is here.
 % \subsection{Download}
 %
 % \paragraph{Package.} This package is available on
-% CTAN\footnote{\url{http://ctan.org/pkg/hypgotoe}}:
+% CTAN\footnote{\CTANpkg{hypgotoe}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/hypgotoe.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/hypgotoe.pdf}] Documentation.
@@ -500,7 +504,7 @@ Anker foobar is here.
 % the packages are already unpacked and the documentation files
 % are generated. The files and directories obey the TDS standard.
 % \begin{description}
-% \item[\CTAN{install/macros/latex/contrib/oberdiek.tds.zip}]
+% \item[\CTANinstall{install/macros/latex/contrib/oberdiek.tds.zip}]
 % \end{description}
 % \emph{TDS} refers to the standard ``A Directory Structure
 % for \TeX\ Files'' (\CTAN{tds/tds.pdf}). Directories
@@ -620,16 +624,6 @@ Anker foobar is here.
 %
 % \subsection{Some details for the interested}
 %
-% \paragraph{Attached source.}
-%
-% The PDF documentation on CTAN also includes the
-% \xfile{.dtx} source file. It can be extracted by
-% AcrobatReader 6 or higher. Another option is \textsf{pdftk},
-% e.g. unpack the file into the current directory:
-% \begin{quote}
-%   \verb|pdftk hypgotoe.pdf unpack_files output .|
-% \end{quote}
-%
 % \paragraph{Unpacking with \LaTeX.}
 % The \xfile{.dtx} chooses its action depending on the format:
 % \begin{description}
@@ -665,41 +659,6 @@ Anker foobar is here.
 %\end{verbatim}
 % \end{quote}
 %
-% \section{Catalogue}
-%
-% The following XML file can be used as source for the
-% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
-% The elements \texttt{caption} and \texttt{description} are imported
-% from the original XML file from the Catalogue.
-% The name of the XML file in the Catalogue is \xfile{hypgotoe.xml}.
-%    \begin{macrocode}
-%<*catalogue>
-<?xml version='1.0' encoding='us-ascii'?>
-<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
-<entry datestamp='$Date$' modifier='$Author$' id='hypgotoe'>
-  <name>hypgotoe</name>
-  <caption>Links to embedded files.</caption>
-  <authorref id='auth:oberdiek'/>
-  <copyright owner='Heiko Oberdiek' year='2007'/>
-  <license type='lppl1.3'/>
-  <version number='0.2'/>
-  <description>
-    This experimental package  is a first experiment for links to embedded
-    files. It is named after the PDF action name <tt>/GoToE</tt>.
-    <p/>
-    The package is part of the <xref refid='oberdiek'>oberdiek</xref>
-    bundle.
-  </description>
-  <documentation details='Package documentation'
-      href='ctan:/macros/latex/contrib/oberdiek/hypgotoe.pdf'/>
-  <ctan file='true' path='/macros/latex/contrib/oberdiek/hypgotoe.dtx'/>
-  <miktex location='oberdiek'/>
-  <texlive location='oberdiek'/>
-  <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
-</entry>
-%</catalogue>
-%    \end{macrocode}
-%
 % \begin{thebibliography}{9}
 % \bibitem{pdfspec}
 %   Adobe Systems Incorporated:
diff --git a/macros/latex/contrib/oberdiek/hypgotoe.pdf b/macros/latex/contrib/oberdiek/hypgotoe.pdf
index 8ebda62f61..39b5f67c81 100644
--- a/macros/latex/contrib/oberdiek/hypgotoe.pdf
+++ b/macros/latex/contrib/oberdiek/hypgotoe.pdf
diff --git a/macros/latex/contrib/oberdiek/hyphsubst.dtx b/macros/latex/contrib/oberdiek/hyphsubst.dtx
index 64121a5020..50e8de4636 100644
--- a/macros/latex/contrib/oberdiek/hyphsubst.dtx
+++ b/macros/latex/contrib/oberdiek/hyphsubst.dtx
@@ -13,15 +13,17 @@
 % conditions of the LaTeX Project Public License, either
 % version 1.3c of this license or (at your option) any later
 % version. This version of this license is in
-%    http://www.latex-project.org/lppl/lppl-1-3c.txt
+%    https://www.latex-project.org/lppl/lppl-1-3c.txt
 % and the latest version of this license is in
-%    http://www.latex-project.org/lppl.txt
+%    https://www.latex-project.org/lppl.txt
 % and version 1.3 or later is part of all distributions of
 % LaTeX version 2005/12/01 or later.
 %
 % This work has the LPPL maintenance status "maintained".
 %
-% This Current Maintainer of this work is Heiko Oberdiek.
+% The Current Maintainers of this work are
+% Heiko Oberdiek and the Oberdiek Package Support Group
+% https://github.com/ho-tex/oberdiek/issues
 %
 % The Base Interpreter refers to any `TeX-Format',
 % because some files are installed in TDS:tex/generic//.
@@ -104,15 +106,18 @@ This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either
 version 1.3c of this license or (at your option) any later
 version. This version of this license is in
-   http://www.latex-project.org/lppl/lppl-1-3c.txt
+   https://www.latex-project.org/lppl/lppl-1-3c.txt
 and the latest version of this license is in
-   http://www.latex-project.org/lppl.txt
+   https://www.latex-project.org/lppl.txt
 and version 1.3 or later is part of all distributions of
 LaTeX version 2005/12/01 or later.
 
 This work has the LPPL maintenance status "maintained".
 
-This Current Maintainer of this work is Heiko Oberdiek.
+The Current Maintainers of this work are
+Heiko Oberdiek and the Oberdiek Package Support Group
+https://github.com/ho-tex/oberdiek/issues
+
 
 The Base Interpreter refers to any `TeX-Format',
 because some files are installed in TDS:tex/generic//.
@@ -194,8 +199,7 @@ and the derived files
 % \title{The \xpackage{hyphsubst} package}
 % \date{2016/05/16 v0.3}
 % \author{Heiko Oberdiek\thanks
-% {Please report any issues at https://github.com/ho-tex/oberdiek/issues}\\
-% \xemail{heiko.oberdiek at googlemail.com}}
+% {Please report any issues at \url{https://github.com/ho-tex/oberdiek/issues}}}
 %
 % \maketitle
 %
@@ -729,7 +733,7 @@ and the derived files
 % \subsection{Download}
 %
 % \paragraph{Package.} This package is available on
-% CTAN\footnote{\url{http://ctan.org/pkg/hyphsubst}}:
+% CTAN\footnote{\CTANpkg{hyphsubst}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/hyphsubst.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/hyphsubst.pdf}] Documentation.
@@ -741,7 +745,7 @@ and the derived files
 % the packages are already unpacked and the documentation files
 % are generated. The files and directories obey the TDS standard.
 % \begin{description}
-% \item[\CTAN{install/macros/latex/contrib/oberdiek.tds.zip}]
+% \item[\CTANinstall{install/macros/latex/contrib/oberdiek.tds.zip}]
 % \end{description}
 % \emph{TDS} refers to the standard ``A Directory Structure
 % for \TeX\ Files'' (\CTAN{tds/tds.pdf}). Directories
@@ -862,16 +866,6 @@ and the derived files
 %
 % \subsection{Some details for the interested}
 %
-% \paragraph{Attached source.}
-%
-% The PDF documentation on CTAN also includes the
-% \xfile{.dtx} source file. It can be extracted by
-% AcrobatReader 6 or higher. Another option is \textsf{pdftk},
-% e.g. unpack the file into the current directory:
-% \begin{quote}
-%   \verb|pdftk hyphsubst.pdf unpack_files output .|
-% \end{quote}
-%
 % \paragraph{Unpacking with \LaTeX.}
 % The \xfile{.dtx} chooses its action depending on the format:
 % \begin{description}
@@ -907,45 +901,6 @@ and the derived files
 %\end{verbatim}
 % \end{quote}
 %
-% \section{Catalogue}
-%
-% The following XML file can be used as source for the
-% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
-% The elements \texttt{caption} and \texttt{description} are imported
-% from the original XML file from the Catalogue.
-% The name of the XML file in the Catalogue is \xfile{hyphsubst.xml}.
-%    \begin{macrocode}
-%<*catalogue>
-<?xml version='1.0' encoding='us-ascii'?>
-<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
-<entry datestamp='$Date$' modifier='$Author$' id='hyphsubst'>
-  <name>hyphsubst</name>
-  <caption>Substitute hyphenation patterns.</caption>
-  <authorref id='auth:oberdiek'/>
-  <copyright owner='Heiko Oberdiek' year='2008'/>
-  <license type='lppl1.3'/>
-  <version number='0.3'/>
-  <description>
-    A TeX format file may include alternative hyphenation patterns
-    for a language with a different name. If the naming convention
-    follows <xref refid='babel'>babel&#x2019;s</xref> rules, then the
-    hyphenation patterns
-    for a language can be replaced by the alternative hyphenation patterns,
-    provided in the format file.
-    <p/>
-    The package is part of the <xref refid='oberdiek'>oberdiek</xref>
-    bundle.
-  </description>
-  <documentation details='Package documentation'
-      href='ctan:/macros/latex/contrib/oberdiek/hyphsubst.pdf'/>
-  <ctan file='true' path='/macros/latex/contrib/oberdiek/hyphsubst.dtx'/>
-  <miktex location='oberdiek'/>
-  <texlive location='oberdiek'/>
-  <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
-</entry>
-%</catalogue>
-%    \end{macrocode}
-%
 % \begin{History}
 %   \begin{Version}{2008/06/07 v0.1}
 %   \item
diff --git a/macros/latex/contrib/oberdiek/hyphsubst.pdf b/macros/latex/contrib/oberdiek/hyphsubst.pdf
index 2499cb9559..adcaaea2e5 100644
--- a/macros/latex/contrib/oberdiek/hyphsubst.pdf
+++ b/macros/latex/contrib/oberdiek/hyphsubst.pdf
diff --git a/macros/latex/contrib/oberdiek/ifdraft.dtx b/macros/latex/contrib/oberdiek/ifdraft.dtx
index e16cdd7c78..fb5e0a22bb 100644
--- a/macros/latex/contrib/oberdiek/ifdraft.dtx
+++ b/macros/latex/contrib/oberdiek/ifdraft.dtx
@@ -13,15 +13,17 @@
 % conditions of the LaTeX Project Public License, either
 % version 1.3c of this license or (at your option) any later
 % version. This version of this license is in
-%    http://www.latex-project.org/lppl/lppl-1-3c.txt
+%    https://www.latex-project.org/lppl/lppl-1-3c.txt
 % and the latest version of this license is in
-%    http://www.latex-project.org/lppl.txt
+%    https://www.latex-project.org/lppl.txt
 % and version 1.3 or later is part of all distributions of
 % LaTeX version 2005/12/01 or later.
 %
 % This work has the LPPL maintenance status "maintained".
 %
-% This Current Maintainer of this work is Heiko Oberdiek.
+% The Current Maintainers of this work are
+% Heiko Oberdiek and the Oberdiek Package Support Group
+% https://github.com/ho-tex/oberdiek/issues
 %
 % This work consists of the main source file ifdraft.dtx
 % and the derived files
@@ -98,15 +100,18 @@ This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either
 version 1.3c of this license or (at your option) any later
 version. This version of this license is in
-   http://www.latex-project.org/lppl/lppl-1-3c.txt
+   https://www.latex-project.org/lppl/lppl-1-3c.txt
 and the latest version of this license is in
-   http://www.latex-project.org/lppl.txt
+   https://www.latex-project.org/lppl.txt
 and version 1.3 or later is part of all distributions of
 LaTeX version 2005/12/01 or later.
 
 This work has the LPPL maintenance status "maintained".
 
-This Current Maintainer of this work is Heiko Oberdiek.
+The Current Maintainers of this work are
+Heiko Oberdiek and the Oberdiek Package Support Group
+https://github.com/ho-tex/oberdiek/issues
+
 
 This work consists of the main source file ifdraft.dtx
 and the derived files
@@ -181,8 +186,7 @@ and the derived files
 % \title{The \xpackage{ifdraft} package}
 % \date{2016/05/16 v1.4}
 % \author{Heiko Oberdiek\thanks
-% {Please report any issues at https://github.com/ho-tex/oberdiek/issues}\\
-% \xemail{heiko.oberdiek at googlemail.com}}
+% {Please report any issues at \url{https://github.com/ho-tex/oberdiek/issues}}}
 %
 % \maketitle
 %
@@ -337,7 +341,7 @@ and the derived files
 % \subsection{Download}
 %
 % \paragraph{Package.} This package is available on
-% CTAN\footnote{\url{http://ctan.org/pkg/ifdraft}}:
+% CTAN\footnote{\CTANpkg{ifdraft}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/ifdraft.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/ifdraft.pdf}] Documentation.
@@ -349,7 +353,7 @@ and the derived files
 % the packages are already unpacked and the documentation files
 % are generated. The files and directories obey the TDS standard.
 % \begin{description}
-% \item[\CTAN{install/macros/latex/contrib/oberdiek.tds.zip}]
+% \item[\CTANinstall{install/macros/latex/contrib/oberdiek.tds.zip}]
 % \end{description}
 % \emph{TDS} refers to the standard ``A Directory Structure
 % for \TeX\ Files'' (\CTAN{tds/tds.pdf}). Directories
@@ -468,16 +472,6 @@ and the derived files
 %
 % \subsection{Some details for the interested}
 %
-% \paragraph{Attached source.}
-%
-% The PDF documentation on CTAN also includes the
-% \xfile{.dtx} source file. It can be extracted by
-% AcrobatReader 6 or higher. Another option is \textsf{pdftk},
-% e.g. unpack the file into the current directory:
-% \begin{quote}
-%   \verb|pdftk ifdraft.pdf unpack_files output .|
-% \end{quote}
-%
 % \paragraph{Unpacking with \LaTeX.}
 % The \xfile{.dtx} chooses its action depending on the format:
 % \begin{description}
@@ -513,56 +507,12 @@ and the derived files
 %\end{verbatim}
 % \end{quote}
 %
-% \section{Catalogue}
-%
-% The following XML file can be used as source for the
-% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
-% The elements \texttt{caption} and \texttt{description} are imported
-% from the original XML file from the Catalogue.
-% The name of the XML file in the Catalogue is \xfile{ifdraft.xml}.
-%    \begin{macrocode}
-%<*catalogue>
-<?xml version='1.0' encoding='us-ascii'?>
-<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
-<entry datestamp='$Date$' modifier='$Author$' id='ifdraft'>
-  <name>ifdraft</name>
-  <caption>Detect "draft" and "final" class options.</caption>
-  <authorref id='auth:oberdiek'/>
-  <copyright owner='Heiko Oberdiek' year='1999,2005,2006,2008'/>
-  <license type='lppl1.3'/>
-  <version number='1.4'/>
-  <description>
-    The package defines commands that switch according to the
-    prevailing &#x2018;draft&#x2019; or &#x2018;final&#x2019;
-    options; each command takes two arguments, the first for the
-    &#x2018;true&#x2019;, the second for the &#x2018;false&#x2019;
-    case.  Commands are:<br/>
-    &#x2014; <tt>\ifdraft</tt> determines whether we're operating in
-      draft (&#x2018;true&#x2019;) or final mode;<br/>
-
-    &#x2014; <tt>\ifoptiondraft</tt> determines whether a
-      &#x2018;draft&#x2019; option has been given; and<br/>
-    &#x2014; <tt>\ifoptionfinal</tt> determines whether a
-      &#x2018;final&#x2019; option has been given.
-    <p/>
-    The package is part of the <xref refid='oberdiek'>oberdiek</xref> bundle.
-  </description>
-  <documentation details='Package documentation'
-      href='ctan:/macros/latex/contrib/oberdiek/ifdraft.pdf'/>
-  <ctan file='true' path='/macros/latex/contrib/oberdiek/ifdraft.dtx'/>
-  <miktex location='oberdiek'/>
-  <texlive location='oberdiek'/>
-  <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
-</entry>
-%</catalogue>
-%    \end{macrocode}
-%
 % \begin{History}
 %   \begin{Version}{1999/12/28 v1.0}
 %   \item
 %     First public release, published in newsgroup \xnewsgroup{de.comp.text.tex}:\\
 %     \URL{``\link{Re: auf vorhandensein der option "draft" pruefen}''}^^A
-%     {http://groups.google.com/group/de.comp.text.tex/msg/ccc1ccc9a8c224e9}
+%     {https://groups.google.com/group/de.comp.text.tex/msg/ccc1ccc9a8c224e9}
 %   \item
 %     LPPL 1.1
 %   \end{Version}
diff --git a/macros/latex/contrib/oberdiek/ifdraft.pdf b/macros/latex/contrib/oberdiek/ifdraft.pdf
index 2852542abc..61b4f95bd5 100644
--- a/macros/latex/contrib/oberdiek/ifdraft.pdf
+++ b/macros/latex/contrib/oberdiek/ifdraft.pdf
diff --git a/macros/latex/contrib/oberdiek/iflang.dtx b/macros/latex/contrib/oberdiek/iflang.dtx
index 21a6825bd8..f5d1303239 100644
--- a/macros/latex/contrib/oberdiek/iflang.dtx
+++ b/macros/latex/contrib/oberdiek/iflang.dtx
@@ -13,15 +13,17 @@
 % conditions of the LaTeX Project Public License, either
 % version 1.3c of this license or (at your option) any later
 % version. This version of this license is in
-%    http://www.latex-project.org/lppl/lppl-1-3c.txt
+%    https://www.latex-project.org/lppl/lppl-1-3c.txt
 % and the latest version of this license is in
-%    http://www.latex-project.org/lppl.txt
+%    https://www.latex-project.org/lppl.txt
 % and version 1.3 or later is part of all distributions of
 % LaTeX version 2005/12/01 or later.
 %
 % This work has the LPPL maintenance status "maintained".
 %
-% This Current Maintainer of this work is Heiko Oberdiek.
+% The Current Maintainers of this work are
+% Heiko Oberdiek and the Oberdiek Package Support Group
+% https://github.com/ho-tex/oberdiek/issues
 %
 % The Base Interpreter refers to any `TeX-Format',
 % because some files are installed in TDS:tex/generic//.
@@ -108,15 +110,18 @@ This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either
 version 1.3c of this license or (at your option) any later
 version. This version of this license is in
-   http://www.latex-project.org/lppl/lppl-1-3c.txt
+   https://www.latex-project.org/lppl/lppl-1-3c.txt
 and the latest version of this license is in
-   http://www.latex-project.org/lppl.txt
+   https://www.latex-project.org/lppl.txt
 and version 1.3 or later is part of all distributions of
 LaTeX version 2005/12/01 or later.
 
 This work has the LPPL maintenance status "maintained".
 
-This Current Maintainer of this work is Heiko Oberdiek.
+The Current Maintainers of this work are
+Heiko Oberdiek and the Oberdiek Package Support Group
+https://github.com/ho-tex/oberdiek/issues
+
 
 The Base Interpreter refers to any `TeX-Format',
 because some files are installed in TDS:tex/generic//.
@@ -202,8 +207,7 @@ and the derived files
 % \title{The \xpackage{iflang} package}
 % \date{2018/01/21 v1.7}
 % \author{Heiko Oberdiek\thanks
-% {Please report any issues at https://github.com/ho-tex/oberdiek/issues}\\
-% \xemail{heiko.oberdiek at googlemail.com}}
+% {Please report any issues at \url{https://github.com/ho-tex/oberdiek/issues}}}
 %
 % \maketitle
 %
@@ -579,7 +583,7 @@ and the derived files
 %    our own expandable string comparison. The following
 %    implementation is based on a \TeX\ pearl from David Kastrup, presented
 %    at the conference Bacho\TeX~2005:
-%    \url{http://www-stary.gust.org.pl/pearls/2005/david-kastrup/bachotex2005-david-kastrup-pearl1.pdf}
+%    \url{http://www.gust.org.pl/projects/pearls/2005p/david-kastrup/bachotex2005-david-kastrup-pearl1.pdf}
 %
 %    The orignal code allows macros inside the second string.
 %    Because also \cs{languagename} might consists of further
@@ -989,7 +993,7 @@ and the derived files
 % \subsection{Download}
 %
 % \paragraph{Package.} This package is available on
-% CTAN\footnote{\url{http://ctan.org/pkg/iflang}}:
+% CTAN\footnote{\CTANpkg{iflang}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/iflang.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/iflang.pdf}] Documentation.
@@ -1001,7 +1005,7 @@ and the derived files
 % the packages are already unpacked and the documentation files
 % are generated. The files and directories obey the TDS standard.
 % \begin{description}
-% \item[\CTAN{install/macros/latex/contrib/oberdiek.tds.zip}]
+% \item[\CTANinstall{install/macros/latex/contrib/oberdiek.tds.zip}]
 % \end{description}
 % \emph{TDS} refers to the standard ``A Directory Structure
 % for \TeX\ Files'' (\CTAN{tds/tds.pdf}). Directories
@@ -1125,16 +1129,6 @@ and the derived files
 %
 % \subsection{Some details for the interested}
 %
-% \paragraph{Attached source.}
-%
-% The PDF documentation on CTAN also includes the
-% \xfile{.dtx} source file. It can be extracted by
-% AcrobatReader 6 or higher. Another option is \textsf{pdftk},
-% e.g. unpack the file into the current directory:
-% \begin{quote}
-%   \verb|pdftk iflang.pdf unpack_files output .|
-% \end{quote}
-%
 % \paragraph{Unpacking with \LaTeX.}
 % The \xfile{.dtx} chooses its action depending on the format:
 % \begin{description}
@@ -1170,40 +1164,6 @@ and the derived files
 %\end{verbatim}
 % \end{quote}
 %
-% \section{Catalogue}
-%
-% The following XML file can be used as source for the
-% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
-% The elements \texttt{caption} and \texttt{description} are imported
-% from the original XML file from the Catalogue.
-% The name of the XML file in the Catalogue is \xfile{iflang.xml}.
-%    \begin{macrocode}
-%<*catalogue>
-<?xml version='1.0' encoding='us-ascii'?>
-<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
-<entry datestamp='$Date$' modifier='$Author$' id='iflang'>
-  <name>iflang</name>
-  <caption>Expandable checks for the current language.</caption>
-  <authorref id='auth:oberdiek'/>
-  <copyright owner='Heiko Oberdiek' year='2007'/>
-  <license type='lppl1.3'/>
-  <version number='1.7'/>
-  <description>
-    This package provides expandable checks for the current language
-    based on macro <tt>\languagename</tt> or hyphenation patterns.
-    <p/>
-    The package is part of the <xref refid='oberdiek'>oberdiek</xref> bundle.
-  </description>
-  <documentation details='Package documentation'
-      href='ctan:/macros/latex/contrib/oberdiek/iflang.pdf'/>
-  <ctan file='true' path='/macros/latex/contrib/oberdiek/iflang.dtx'/>
-  <miktex location='oberdiek'/>
-  <texlive location='oberdiek'/>
-  <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
-</entry>
-%</catalogue>
-%    \end{macrocode}
-%
 % \section{Acknowledgement}
 % I wish to thank:
 % \begin{description}
diff --git a/macros/latex/contrib/oberdiek/iflang.pdf b/macros/latex/contrib/oberdiek/iflang.pdf
index 1ad01d257b..5a903f19f4 100644
--- a/macros/latex/contrib/oberdiek/iflang.pdf
+++ b/macros/latex/contrib/oberdiek/iflang.pdf
diff --git a/macros/latex/contrib/oberdiek/ifluatex.dtx b/macros/latex/contrib/oberdiek/ifluatex.dtx
deleted file mode 100644
index 556dbfaef4..0000000000
--- a/macros/latex/contrib/oberdiek/ifluatex.dtx
+++ /dev/null
@@ -1,920 +0,0 @@
-% \iffalse meta-comment
-%
-% File: ifluatex.dtx
-% Version: 2016/05/16 v1.4
-% Info: Provides the ifluatex switch
-%
-% Copyright (C) 2007, 2009, 2010 by
-%    Heiko Oberdiek <heiko.oberdiek at googlemail.com>
-%    2016
-%    https://github.com/ho-tex/oberdiek/issues
-%
-% This work may be distributed and/or modified under the
-% conditions of the LaTeX Project Public License, either
-% version 1.3c of this license or (at your option) any later
-% version. This version of this license is in
-%    http://www.latex-project.org/lppl/lppl-1-3c.txt
-% and the latest version of this license is in
-%    http://www.latex-project.org/lppl.txt
-% and version 1.3 or later is part of all distributions of
-% LaTeX version 2005/12/01 or later.
-%
-% This work has the LPPL maintenance status "maintained".
-%
-% This Current Maintainer of this work is Heiko Oberdiek.
-%
-% The Base Interpreter refers to any `TeX-Format',
-% because some files are installed in TDS:tex/generic//.
-%
-% This work consists of the main source file ifluatex.dtx
-% and the derived files
-%    ifluatex.sty, ifluatex.pdf, ifluatex.ins, ifluatex.drv,
-%    ifluatex-test1.tex, ifluatex-test2.tex, ifluatex-test3.tex.
-%
-% Distribution:
-%    CTAN:macros/latex/contrib/oberdiek/ifluatex.dtx
-%    CTAN:macros/latex/contrib/oberdiek/ifluatex.pdf
-%
-% Unpacking:
-%    (a) If ifluatex.ins is present:
-%           tex ifluatex.ins
-%    (b) Without ifluatex.ins:
-%           tex ifluatex.dtx
-%    (c) If you insist on using LaTeX
-%           latex \let\install=y\input{ifluatex.dtx}
-%        (quote the arguments according to the demands of your shell)
-%
-% Documentation:
-%    (a) If ifluatex.drv is present:
-%           latex ifluatex.drv
-%    (b) Without ifluatex.drv:
-%           latex ifluatex.dtx; ...
-%    The class ltxdoc loads the configuration file ltxdoc.cfg
-%    if available. Here you can specify further options, e.g.
-%    use A4 as paper format:
-%       \PassOptionsToClass{a4paper}{article}
-%
-%    Programm calls to get the documentation (example):
-%       pdflatex ifluatex.dtx
-%       makeindex -s gind.ist ifluatex.idx
-%       pdflatex ifluatex.dtx
-%       makeindex -s gind.ist ifluatex.idx
-%       pdflatex ifluatex.dtx
-%
-% Installation:
-%    TDS:tex/generic/oberdiek/ifluatex.sty
-%    TDS:doc/latex/oberdiek/ifluatex.pdf
-%    TDS:doc/latex/oberdiek/test/ifluatex-test1.tex
-%    TDS:doc/latex/oberdiek/test/ifluatex-test2.tex
-%    TDS:doc/latex/oberdiek/test/ifluatex-test3.tex
-%    TDS:source/latex/oberdiek/ifluatex.dtx
-%
-%<*ignore>
-\begingroup
-  \catcode123=1 %
-  \catcode125=2 %
-  \def\x{LaTeX2e}%
-\expandafter\endgroup
-\ifcase 0\ifx\install y1\fi\expandafter
-         \ifx\csname processbatchFile\endcsname\relax\else1\fi
-         \ifx\fmtname\x\else 1\fi\relax
-\else\csname fi\endcsname
-%</ignore>
-%<*install>
-\input docstrip.tex
-\Msg{************************************************************************}
-\Msg{* Installation}
-\Msg{* Package: ifluatex 2016/05/16 v1.4 Provides the ifluatex switch (HO)}
-\Msg{************************************************************************}
-
-\keepsilent
-\askforoverwritefalse
-
-\let\MetaPrefix\relax
-\preamble
-
-This is a generated file.
-
-Project: ifluatex
-Version: 2016/05/16 v1.4
-
-Copyright (C) 2007, 2009, 2010 by
-   Heiko Oberdiek <heiko.oberdiek at googlemail.com>
-
-This work may be distributed and/or modified under the
-conditions of the LaTeX Project Public License, either
-version 1.3c of this license or (at your option) any later
-version. This version of this license is in
-   http://www.latex-project.org/lppl/lppl-1-3c.txt
-and the latest version of this license is in
-   http://www.latex-project.org/lppl.txt
-and version 1.3 or later is part of all distributions of
-LaTeX version 2005/12/01 or later.
-
-This work has the LPPL maintenance status "maintained".
-
-This Current Maintainer of this work is Heiko Oberdiek.
-
-The Base Interpreter refers to any `TeX-Format',
-because some files are installed in TDS:tex/generic//.
-
-This work consists of the main source file ifluatex.dtx
-and the derived files
-   ifluatex.sty, ifluatex.pdf, ifluatex.ins, ifluatex.drv,
-   ifluatex-test1.tex, ifluatex-test2.tex, ifluatex-test3.tex.
-
-\endpreamble
-\let\MetaPrefix\DoubleperCent
-
-\generate{%
-  \file{ifluatex.ins}{\from{ifluatex.dtx}{install}}%
-  \file{ifluatex.drv}{\from{ifluatex.dtx}{driver}}%
-  \usedir{tex/generic/oberdiek}%
-  \file{ifluatex.sty}{\from{ifluatex.dtx}{package}}%
-%  \usedir{doc/latex/oberdiek/test}%
-%  \file{ifluatex-test1.tex}{\from{ifluatex.dtx}{test1}}%
-%  \file{ifluatex-test2.tex}{\from{ifluatex.dtx}{test-reload1}}%
-%  \file{ifluatex-test3.tex}{\from{ifluatex.dtx}{test-reload2}}%
-  \nopreamble
-  \nopostamble
-%  \usedir{source/latex/oberdiek/catalogue}%
-%  \file{ifluatex.xml}{\from{ifluatex.dtx}{catalogue}}%
-}
-
-\catcode32=13\relax% active space
-\let =\space%
-\Msg{************************************************************************}
-\Msg{*}
-\Msg{* To finish the installation you have to move the following}
-\Msg{* file into a directory searched by TeX:}
-\Msg{*}
-\Msg{*     ifluatex.sty}
-\Msg{*}
-\Msg{* To produce the documentation run the file `ifluatex.drv'}
-\Msg{* through LaTeX.}
-\Msg{*}
-\Msg{* Happy TeXing!}
-\Msg{*}
-\Msg{************************************************************************}
-
-\endbatchfile
-%</install>
-%<*ignore>
-\fi
-%</ignore>
-%<*driver>
-\NeedsTeXFormat{LaTeX2e}
-\ProvidesFile{ifluatex.drv}%
-  [2016/05/16 v1.4 Provides the ifluatex switch (HO)]%
-\documentclass{ltxdoc}
-\usepackage{holtxdoc}[2011/11/22]
-\begin{document}
-  \DocInput{ifluatex.dtx}%
-\end{document}
-%</driver>
-% \fi
-%
-%
-% \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
-%   Lower-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
-%   Digits        \0\1\2\3\4\5\6\7\8\9
-%   Exclamation   \!     Double quote  \"     Hash (number) \#
-%   Dollar        \$     Percent       \%     Ampersand     \&
-%   Acute accent  \'     Left paren    \(     Right paren   \)
-%   Asterisk      \*     Plus          \+     Comma         \,
-%   Minus         \-     Point         \.     Solidus       \/
-%   Colon         \:     Semicolon     \;     Less than     \<
-%   Equals        \=     Greater than  \>     Question mark \?
-%   Commercial at \@     Left bracket  \[     Backslash     \\
-%   Right bracket \]     Circumflex    \^     Underscore    \_
-%   Grave accent  \`     Left brace    \{     Vertical bar  \|
-%   Right brace   \}     Tilde         \~}
-%
-% \GetFileInfo{ifluatex.drv}
-%
-% \title{The \xpackage{ifluatex} package}
-% \date{2016/05/16 v1.4}
-% \author{Heiko Oberdiek\thanks
-% {Please report any issues at https://github.com/ho-tex/oberdiek/issues}\\
-% \xemail{heiko.oberdiek at googlemail.com}}
-%
-% \maketitle
-%
-% \begin{abstract}
-% This package looks for \LuaTeX\ regardless of its mode
-% and provides the switch \cs{ifluatex}. Also it makes
-% \cs{luatexversion} available if it is not present.
-% It works with \plainTeX\ or \LaTeX.
-% \end{abstract}
-%
-% \tableofcontents
-%
-% \section{Documentation}
-%
-% The package \xpackage{ifluatex} can be used with both \plainTeX\
-% and \LaTeX:
-% \begin{description}
-% \item[\plainTeX:] |\input ifluatex.sty|
-% \item[\LaTeXe:]   |\usepackage{ifluatex}|
-% \end{description}
-%
-% \DescribeMacro{\ifluatex}
-% The package provides the switch \cs{ifluatex}:
-% \begin{quote}
-%   |\ifluatex|\\
-%   \hspace{1.5em}\LuaTeX\ is running\\
-%   |\else|\\
-%   \hspace{1.5em}Without \LuaTeX\\
-%   |\fi|
-% \end{quote}
-%
-% Since version 0.39 \LuaTeX\ only provides \cs{directlua} at startup
-% time. Also the syntax of \cs{directlua} changed in version 0.36.
-% Thus the user might want to check the LuaTeX version.
-% Therefore this package also makes \cs{luatexversion} and
-% \cs{luatexrevision} available, if it is not yet done.
-%
-% If you want to detect the mode (DVI or PDF), then use package
-% \xpackage{ifpdf}. \LuaTeX\ has inherited \cs{pdfoutput} from \pdfTeX.
-%
-% \StopEventually{
-% }
-%
-% \section{Implementation}
-%
-%    \begin{macrocode}
-%<*package>
-%    \end{macrocode}
-%
-% \subsection{Reload check and package identification}
-%    Reload check, especially if the package is not used with \LaTeX.
-%    \begin{macrocode}
-\begingroup\catcode61\catcode48\catcode32=10\relax%
-  \catcode13=5 % ^^M
-  \endlinechar=13 %
-  \catcode35=6 % #
-  \catcode39=12 % '
-  \catcode44=12 % ,
-  \catcode45=12 % -
-  \catcode46=12 % .
-  \catcode58=12 % :
-  \catcode64=11 % @
-  \catcode123=1 % {
-  \catcode125=2 % }
-  \expandafter\let\expandafter\x\csname ver@ifluatex.sty\endcsname
-  \ifx\x\relax % plain-TeX, first loading
-  \else
-    \def\empty{}%
-    \ifx\x\empty % LaTeX, first loading,
-      % variable is initialized, but \ProvidesPackage not yet seen
-    \else
-      \expandafter\ifx\csname PackageInfo\endcsname\relax
-        \def\x#1#2{%
-          \immediate\write-1{Package #1 Info: #2.}%
-        }%
-      \else
-        \def\x#1#2{\PackageInfo{#1}{#2, stopped}}%
-      \fi
-      \x{ifluatex}{The package is already loaded}%
-      \aftergroup\endinput
-    \fi
-  \fi
-\endgroup%
-%    \end{macrocode}
-%    Package identification:
-%    \begin{macrocode}
-\begingroup\catcode61\catcode48\catcode32=10\relax%
-  \catcode13=5 % ^^M
-  \endlinechar=13 %
-  \catcode35=6 % #
-  \catcode39=12 % '
-  \catcode40=12 % (
-  \catcode41=12 % )
-  \catcode44=12 % ,
-  \catcode45=12 % -
-  \catcode46=12 % .
-  \catcode47=12 % /
-  \catcode58=12 % :
-  \catcode64=11 % @
-  \catcode91=12 % [
-  \catcode93=12 % ]
-  \catcode123=1 % {
-  \catcode125=2 % }
-  \expandafter\ifx\csname ProvidesPackage\endcsname\relax
-    \def\x#1#2#3[#4]{\endgroup
-      \immediate\write-1{Package: #3 #4}%
-      \xdef#1{#4}%
-    }%
-  \else
-    \def\x#1#2[#3]{\endgroup
-      #2[{#3}]%
-      \ifx#1\@undefined
-        \xdef#1{#3}%
-      \fi
-      \ifx#1\relax
-        \xdef#1{#3}%
-      \fi
-    }%
-  \fi
-\expandafter\x\csname ver@ifluatex.sty\endcsname
-\ProvidesPackage{ifluatex}%
-  [2016/05/16 v1.4 Provides the ifluatex switch (HO)]%
-%    \end{macrocode}
-%
-% \subsection{Catcodes}
-%
-%    \begin{macrocode}
-\begingroup\catcode61\catcode48\catcode32=10\relax%
-  \catcode13=5 % ^^M
-  \endlinechar=13 %
-  \catcode123=1 % {
-  \catcode125=2 % }
-  \catcode64=11 % @
-  \def\x{\endgroup
-    \expandafter\edef\csname ifluatex@AtEnd\endcsname{%
-      \endlinechar=\the\endlinechar\relax
-      \catcode13=\the\catcode13\relax
-      \catcode32=\the\catcode32\relax
-      \catcode35=\the\catcode35\relax
-      \catcode61=\the\catcode61\relax
-      \catcode64=\the\catcode64\relax
-      \catcode123=\the\catcode123\relax
-      \catcode125=\the\catcode125\relax
-    }%
-  }%
-\x\catcode61\catcode48\catcode32=10\relax%
-\catcode13=5 % ^^M
-\endlinechar=13 %
-\catcode35=6 % #
-\catcode64=11 % @
-\catcode123=1 % {
-\catcode125=2 % }
-\def\TMP@EnsureCode#1#2{%
-  \edef\ifluatex@AtEnd{%
-    \ifluatex@AtEnd
-    \catcode#1=\the\catcode#1\relax
-  }%
-  \catcode#1=#2\relax
-}
-\TMP@EnsureCode{10}{12}% ^^J
-\TMP@EnsureCode{39}{12}% '
-\TMP@EnsureCode{40}{12}% (
-\TMP@EnsureCode{41}{12}% )
-\TMP@EnsureCode{44}{12}% ,
-\TMP@EnsureCode{45}{12}% -
-\TMP@EnsureCode{46}{12}% .
-\TMP@EnsureCode{47}{12}% /
-\TMP@EnsureCode{58}{12}% :
-\TMP@EnsureCode{60}{12}% <
-\TMP@EnsureCode{94}{7}% ^
-\TMP@EnsureCode{96}{12}% `
-\edef\ifluatex@AtEnd{\ifluatex@AtEnd\noexpand\endinput}
-%    \end{macrocode}
-%
-% \subsection{Macro for error messages}
-%
-%    \begin{macro}{\ifluatex@Error}
-%    \begin{macrocode}
-\begingroup\expandafter\expandafter\expandafter\endgroup
-\expandafter\ifx\csname PackageError\endcsname\relax
-  \def\ifluatex@Error#1#2{%
-    \begingroup
-      \newlinechar=10 %
-      \def\MessageBreak{^^J}%
-      \edef\x{\errhelp{#2}}%
-      \x
-      \errmessage{Package ifluatex Error: #1}%
-    \endgroup
-  }%
-\else
-  \def\ifluatex@Error{%
-    \PackageError{ifluatex}%
-  }%
-\fi
-%    \end{macrocode}
-%    \end{macro}
-%
-% \subsection{Check for previously defined \cs{ifluatex}}
-%
-%    \begin{macrocode}
-\begingroup
-  \expandafter\ifx\csname ifluatex\endcsname\relax
-  \else
-    \edef\i/{\expandafter\string\csname ifluatex\endcsname}%
-    \ifluatex@Error{Name clash, \i/ is already defined}{%
-      Incompatible versions of \i/ can cause problems,\MessageBreak
-      therefore package loading is aborted.%
-    }%
-    \endgroup
-    \expandafter\ifluatex@AtEnd
-  \fi%
-\endgroup
-%    \end{macrocode}
-%
-% \subsection{\cs{ifluatex}}
-%
-%    \begin{macro}{\ifluatex}
-%    \begin{macrocode}
-\let\ifluatex\iffalse
-%    \end{macrocode}
-%    \end{macro}
-%
-%    Test \cs{luatexversion}. Is it  defined and different from
-%    \cs{relax}? Someone could have used \LaTeX\ internal
-%    \cs{@ifundefined}, or something else involving.
-%    Notice, \cs{csname} is executed inside a group for the test
-%    to cancel the side effect of \cs{csname}.
-%    \begin{macrocode}
-\begingroup\expandafter\expandafter\expandafter\endgroup
-\expandafter\ifx\csname luatexversion\endcsname\relax
-\else
-  \expandafter\let\csname ifluatex\expandafter\endcsname
-                  \csname iftrue\endcsname
-\fi
-%    \end{macrocode}
-%
-% \subsection{Lua\TeX\ v0.39}
-%
-%     Starting with version 0.39 \LuaTeX\ wants to provide \cs{directlua}
-%     as only primitive at startup time beyond vanilla \TeX's primitives.
-%     Then \cs{directlua} exists, but \cs{luatexversion} cannot be found.
-%     Unhappily also the syntax of \cs{directlua} changed in v0.36,
-%     thus the user would want to check \cs{luatexversion}.
-%     Therefore we make \cs{luatexversion} available using
-%     \LuaTeX's Lua function |tex.enableprimitives|.
-%
-%    \begin{macrocode}
-\ifluatex
-\else
-  \begingroup\expandafter\expandafter\expandafter\endgroup
-  \expandafter\ifx\csname directlua\endcsname\relax
-  \else
-    \expandafter\let\csname ifluatex\expandafter\endcsname
-                    \csname iftrue\endcsname
-    \begingroup
-      \newlinechar=10 %
-      \endlinechar=\newlinechar%
-      \ifnum0%
-          \directlua{%
-            if tex.enableprimitives then
-              tex.enableprimitives('ifluatex', {'luatexversion'})
-              tex.print('1')
-            end
-          }%
-          \ifx\ifluatexluatexversion\@undefined\else 1\fi %
-          =11 %
-        \global\let\luatexversion\ifluatexluatexversion%
-      \else%
-        \ifluatex@Error{%
-          Missing \string\luatexversion%
-        }{%
-          Update LuaTeX.%
-        }%
-      \fi%
-    \endgroup%
-  \fi
-\fi
-%    \end{macrocode}
-%    \begin{macrocode}
-\ifluatex
-  \begingroup\expandafter\expandafter\expandafter\endgroup
-  \expandafter\ifx\csname luatexrevision\endcsname\relax
-    \ifnum\luatexversion<36 %
-    \else
-      \begingroup
-        \ifx\luatexrevision\relax
-          \let\luatexrevision\@undefined
-        \fi
-        \newlinechar=10 %
-        \endlinechar=\newlinechar%
-        \ifcase0%
-            \directlua{%
-              if tex.enableprimitives then
-                tex.enableprimitives('ifluatex', {'luatexrevision'})
-              else
-                tex.print('1')
-              end
-            }%
-            \ifx\ifluatexluatexrevision\@undefined 1\fi%
-            \relax%
-          \global\let\luatexrevision\ifluatexluatexrevision%
-        \fi%
-      \endgroup%
-    \fi
-    \begingroup\expandafter\expandafter\expandafter\endgroup
-    \expandafter\ifx\csname luatexrevision\endcsname\relax
-      \ifluatex@Error{%
-        Missing \string\luatexrevision%
-      }{%
-        Update LuaTeX.%
-      }%
-    \fi
-  \fi
-\fi
-%    \end{macrocode}
-%
-% \subsection{Protocol entry}
-%
-%     Log comment:
-%    \begin{macrocode}
-\begingroup
-  \expandafter\ifx\csname PackageInfo\endcsname\relax
-    \def\x#1#2{%
-      \immediate\write-1{Package #1 Info: #2.}%
-    }%
-  \else
-    \let\x\PackageInfo
-    \expandafter\let\csname on@line\endcsname\empty
-  \fi
-  \x{ifluatex}{LuaTeX \ifluatex\else not \fi detected}%
-\endgroup
-%    \end{macrocode}
-%    \begin{macrocode}
-\ifluatex@AtEnd%
-%    \end{macrocode}
-%    \begin{macrocode}
-%</package>
-%    \end{macrocode}
-%
-% \section{Test}
-%
-% \subsection{Catcode checks for loading}
-%
-%    \begin{macrocode}
-%<*test1>
-%    \end{macrocode}
-%    \begin{macrocode}
-\catcode`\{=1 %
-\catcode`\}=2 %
-\catcode`\#=6 %
-\catcode`\@=11 %
-\expandafter\ifx\csname count@\endcsname\relax
-  \countdef\count@=255 %
-\fi
-\expandafter\ifx\csname @gobble\endcsname\relax
-  \long\def\@gobble#1{}%
-\fi
-\expandafter\ifx\csname @firstofone\endcsname\relax
-  \long\def\@firstofone#1{#1}%
-\fi
-\expandafter\ifx\csname loop\endcsname\relax
-  \expandafter\@firstofone
-\else
-  \expandafter\@gobble
-\fi
-{%
-  \def\loop#1\repeat{%
-    \def\body{#1}%
-    \iterate
-  }%
-  \def\iterate{%
-    \body
-      \let\next\iterate
-    \else
-      \let\next\relax
-    \fi
-    \next
-  }%
-  \let\repeat=\fi
-}%
-\def\RestoreCatcodes{}
-\count@=0 %
-\loop
-  \edef\RestoreCatcodes{%
-    \RestoreCatcodes
-    \catcode\the\count@=\the\catcode\count@\relax
-  }%
-\ifnum\count@<255 %
-  \advance\count@ 1 %
-\repeat
-
-\def\RangeCatcodeInvalid#1#2{%
-  \count@=#1\relax
-  \loop
-    \catcode\count@=15 %
-  \ifnum\count@<#2\relax
-    \advance\count@ 1 %
-  \repeat
-}
-\def\RangeCatcodeCheck#1#2#3{%
-  \count@=#1\relax
-  \loop
-    \ifnum#3=\catcode\count@
-    \else
-      \errmessage{%
-        Character \the\count@\space
-        with wrong catcode \the\catcode\count@\space
-        instead of \number#3%
-      }%
-    \fi
-  \ifnum\count@<#2\relax
-    \advance\count@ 1 %
-  \repeat
-}
-\def\space{ }
-\expandafter\ifx\csname LoadCommand\endcsname\relax
-  \def\LoadCommand{\input ifluatex.sty\relax}%
-\fi
-\def\Test{%
-  \RangeCatcodeInvalid{0}{47}%
-  \RangeCatcodeInvalid{58}{64}%
-  \RangeCatcodeInvalid{91}{96}%
-  \RangeCatcodeInvalid{123}{255}%
-  \catcode`\@=12 %
-  \catcode`\\=0 %
-  \catcode`\%=14 %
-  \LoadCommand
-  \RangeCatcodeCheck{0}{36}{15}%
-  \RangeCatcodeCheck{37}{37}{14}%
-  \RangeCatcodeCheck{38}{47}{15}%
-  \RangeCatcodeCheck{48}{57}{12}%
-  \RangeCatcodeCheck{58}{63}{15}%
-  \RangeCatcodeCheck{64}{64}{12}%
-  \RangeCatcodeCheck{65}{90}{11}%
-  \RangeCatcodeCheck{91}{91}{15}%
-  \RangeCatcodeCheck{92}{92}{0}%
-  \RangeCatcodeCheck{93}{96}{15}%
-  \RangeCatcodeCheck{97}{122}{11}%
-  \RangeCatcodeCheck{123}{255}{15}%
-  \RestoreCatcodes
-}
-\Test
-\csname @@end\endcsname
-\end
-%    \end{macrocode}
-%    \begin{macrocode}
-%</test1>
-%    \end{macrocode}
-%
-% \section{Reload check for plain}
-%
-%    \begin{macrocode}
-%<*test-reload1>
-\input ifluatex.sty\relax
-\input ifluatex.sty\relax
-\csname @@end\endcsname\end
-%</test-reload1>
-%    \end{macrocode}
-%
-%    \begin{macrocode}
-%<*test-reload2>
-\input miniltx.tex\relax
-\input ifluatex.sty\relax
-\input ifluatex.sty\relax
-\csname @@end\endcsname\end
-%</test-reload2>
-%    \end{macrocode}
-%
-% \section{Installation}
-%
-% \subsection{Download}
-%
-% \paragraph{Package.} This package is available on
-% CTAN\footnote{\url{http://ctan.org/pkg/ifluatex}}:
-% \begin{description}
-% \item[\CTAN{macros/latex/contrib/oberdiek/ifluatex.dtx}] The source file.
-% \item[\CTAN{macros/latex/contrib/oberdiek/ifluatex.pdf}] Documentation.
-% \end{description}
-%
-%
-% \paragraph{Bundle.} All the packages of the bundle `oberdiek'
-% are also available in a TDS compliant ZIP archive. There
-% the packages are already unpacked and the documentation files
-% are generated. The files and directories obey the TDS standard.
-% \begin{description}
-% \item[\CTAN{install/macros/latex/contrib/oberdiek.tds.zip}]
-% \end{description}
-% \emph{TDS} refers to the standard ``A Directory Structure
-% for \TeX\ Files'' (\CTAN{tds/tds.pdf}). Directories
-% with \xfile{texmf} in their name are usually organized this way.
-%
-% \subsection{Bundle installation}
-%
-% \paragraph{Unpacking.} Unpack the \xfile{oberdiek.tds.zip} in the
-% TDS tree (also known as \xfile{texmf} tree) of your choice.
-% Example (linux):
-% \begin{quote}
-%   |unzip oberdiek.tds.zip -d ~/texmf|
-% \end{quote}
-%
-% \paragraph{Script installation.}
-% Check the directory \xfile{TDS:scripts/oberdiek/} for
-% scripts that need further installation steps.
-% Package \xpackage{attachfile2} comes with the Perl script
-% \xfile{pdfatfi.pl} that should be installed in such a way
-% that it can be called as \texttt{pdfatfi}.
-% Example (linux):
-% \begin{quote}
-%   |chmod +x scripts/oberdiek/pdfatfi.pl|\\
-%   |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
-% \end{quote}
-%
-% \subsection{Package installation}
-%
-% \paragraph{Unpacking.} The \xfile{.dtx} file is a self-extracting
-% \docstrip\ archive. The files are extracted by running the
-% \xfile{.dtx} through \plainTeX:
-% \begin{quote}
-%   \verb|tex ifluatex.dtx|
-% \end{quote}
-%
-% \paragraph{TDS.} Now the different files must be moved into
-% the different directories in your installation TDS tree
-% (also known as \xfile{texmf} tree):
-% \begin{quote}
-% \def\t{^^A
-% \begin{tabular}{@{}>{\ttfamily}l@{ $\rightarrow$ }>{\ttfamily}l@{}}
-%   ifluatex.sty & tex/generic/oberdiek/ifluatex.sty\\
-%   ifluatex.pdf & doc/latex/oberdiek/ifluatex.pdf\\
-%   test/ifluatex-test1.tex & doc/latex/oberdiek/test/ifluatex-test1.tex\\
-%   test/ifluatex-test2.tex & doc/latex/oberdiek/test/ifluatex-test2.tex\\
-%   test/ifluatex-test3.tex & doc/latex/oberdiek/test/ifluatex-test3.tex\\
-%   ifluatex.dtx & source/latex/oberdiek/ifluatex.dtx\\
-% \end{tabular}^^A
-% }^^A
-% \sbox0{\t}^^A
-% \ifdim\wd0>\linewidth
-%   \begingroup
-%     \advance\linewidth by\leftmargin
-%     \advance\linewidth by\rightmargin
-%   \edef\x{\endgroup
-%     \def\noexpand\lw{\the\linewidth}^^A
-%   }\x
-%   \def\lwbox{^^A
-%     \leavevmode
-%     \hbox to \linewidth{^^A
-%       \kern-\leftmargin\relax
-%       \hss
-%       \usebox0
-%       \hss
-%       \kern-\rightmargin\relax
-%     }^^A
-%   }^^A
-%   \ifdim\wd0>\lw
-%     \sbox0{\small\t}^^A
-%     \ifdim\wd0>\linewidth
-%       \ifdim\wd0>\lw
-%         \sbox0{\footnotesize\t}^^A
-%         \ifdim\wd0>\linewidth
-%           \ifdim\wd0>\lw
-%             \sbox0{\scriptsize\t}^^A
-%             \ifdim\wd0>\linewidth
-%               \ifdim\wd0>\lw
-%                 \sbox0{\tiny\t}^^A
-%                 \ifdim\wd0>\linewidth
-%                   \lwbox
-%                 \else
-%                   \usebox0
-%                 \fi
-%               \else
-%                 \lwbox
-%               \fi
-%             \else
-%               \usebox0
-%             \fi
-%           \else
-%             \lwbox
-%           \fi
-%         \else
-%           \usebox0
-%         \fi
-%       \else
-%         \lwbox
-%       \fi
-%     \else
-%       \usebox0
-%     \fi
-%   \else
-%     \lwbox
-%   \fi
-% \else
-%   \usebox0
-% \fi
-% \end{quote}
-% If you have a \xfile{docstrip.cfg} that configures and enables \docstrip's
-% TDS installing feature, then some files can already be in the right
-% place, see the documentation of \docstrip.
-%
-% \subsection{Refresh file name databases}
-%
-% If your \TeX~distribution
-% (\teTeX, \mikTeX, \dots) relies on file name databases, you must refresh
-% these. For example, \teTeX\ users run \verb|texhash| or
-% \verb|mktexlsr|.
-%
-% \subsection{Some details for the interested}
-%
-% \paragraph{Attached source.}
-%
-% The PDF documentation on CTAN also includes the
-% \xfile{.dtx} source file. It can be extracted by
-% AcrobatReader 6 or higher. Another option is \textsf{pdftk},
-% e.g. unpack the file into the current directory:
-% \begin{quote}
-%   \verb|pdftk ifluatex.pdf unpack_files output .|
-% \end{quote}
-%
-% \paragraph{Unpacking with \LaTeX.}
-% The \xfile{.dtx} chooses its action depending on the format:
-% \begin{description}
-% \item[\plainTeX:] Run \docstrip\ and extract the files.
-% \item[\LaTeX:] Generate the documentation.
-% \end{description}
-% If you insist on using \LaTeX\ for \docstrip\ (really,
-% \docstrip\ does not need \LaTeX), then inform the autodetect routine
-% about your intention:
-% \begin{quote}
-%   \verb|latex \let\install=y\input{ifluatex.dtx}|
-% \end{quote}
-% Do not forget to quote the argument according to the demands
-% of your shell.
-%
-% \paragraph{Generating the documentation.}
-% You can use both the \xfile{.dtx} or the \xfile{.drv} to generate
-% the documentation. The process can be configured by the
-% configuration file \xfile{ltxdoc.cfg}. For instance, put this
-% line into this file, if you want to have A4 as paper format:
-% \begin{quote}
-%   \verb|\PassOptionsToClass{a4paper}{article}|
-% \end{quote}
-% An example follows how to generate the
-% documentation with pdf\LaTeX:
-% \begin{quote}
-%\begin{verbatim}
-%pdflatex ifluatex.dtx
-%makeindex -s gind.ist ifluatex.idx
-%pdflatex ifluatex.dtx
-%makeindex -s gind.ist ifluatex.idx
-%pdflatex ifluatex.dtx
-%\end{verbatim}
-% \end{quote}
-%
-% \section{Catalogue}
-%
-% The following XML file can be used as source for the
-% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
-% The elements \texttt{caption} and \texttt{description} are imported
-% from the original XML file from the Catalogue.
-% The name of the XML file in the Catalogue is \xfile{ifluatex.xml}.
-%    \begin{macrocode}
-%<*catalogue>
-<?xml version='1.0' encoding='us-ascii'?>
-<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
-<entry datestamp='$Date$' modifier='$Author$' id='ifluatex'>
-  <name>ifluatex</name>
-  <caption>Provides the \ifluatex switch.</caption>
-  <authorref id='auth:oberdiek'/>
-  <copyright owner='Heiko Oberdiek' year='2007,2009,2010'/>
-  <license type='lppl1.3'/>
-  <version number='1.4'/>
-  <description>
-    The package looks for  LuaTeX regardless of its mode and provides
-    the switch <tt>\ifluatex</tt>; it works with Plain TeX or LaTeX.
-    <p/>
-    The package is part of the <xref refid='oberdiek'>oberdiek</xref>
-    bundle.
-  </description>
-  <documentation details='Package documentation'
-      href='ctan:/macros/latex/contrib/oberdiek/ifluatex.pdf'/>
-  <ctan file='true' path='/macros/latex/contrib/oberdiek/ifluatex.dtx'/>
-  <miktex location='oberdiek'/>
-  <texlive location='ifluatex'/>
-  <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
-</entry>
-%</catalogue>
-%    \end{macrocode}
-%
-% \begin{History}
-%   \begin{Version}{2007/12/12 v1.0}
-%   \item
-%     First public version.
-%   \end{Version}
-%   \begin{Version}{2009/04/10 v1.1}
-%   \item
-%     Test adopted for \LuaTeX\ 0.39.
-%   \item
-%     Makes \cs{luatexversion} available.
-%   \end{Version}
-%   \begin{Version}{2009/04/17 v1.2}
-%   \item
-%     Fixes (Manuel P\'egouri\'e-Gonnard).
-%   \item
-%     \cs{luatextrue} and \cs{luatexfalse} are no longer defined.
-%   \item
-%     Makes \cs{luatexrevision} available, too.
-%   \end{Version}
-%   \begin{Version}{2010/03/01 v1.3}
-%   \item
-%     Line ends fixed in case \cs{endlinechar} = \cs{newlinechar}.
-%   \end{Version}
-%   \begin{Version}{2016/05/16 v1.4}
-%   \item
-%     Documentation updates.
-%   \end{Version}
-% \end{History}
-%
-% \PrintIndex
-%
-% \Finale
-\endinput
diff --git a/macros/latex/contrib/oberdiek/ifpdf.dtx b/macros/latex/contrib/oberdiek/ifpdf.dtx
deleted file mode 100644
index 1aa3502128..0000000000
--- a/macros/latex/contrib/oberdiek/ifpdf.dtx
+++ /dev/null
@@ -1,143 +0,0 @@
-% \iffalse
-%% Source File: ifpdf.dtx
-%% Copyright 2016-2018 Heiko Oberdiek and LaTeX3 project
-%%
-%% This file may be distributed under the terms of the LPPL.
-%% https://www.latex-project.org/lppl/
-%
-%<*ignore>
-\ifx\ProvidesFile\undefined\let\install y\fi
-\ifx\install y\else
-\long\def\tmp#1\endbatchfile{}
-\expandafter\tmp
-\fi
-%</ignore>
-%<*install>
-\input docstrip
-\keepsilent
-\preamble
-\endpreamble
-
-\askforoverwritefalse
-
-\generate{
-%<*ignore>
-\file{ifpdf.ins}{\from{ifpdf.dtx}{install}}
-%</ignore>
-\file{ifpdf.sty}{\from{ifpdf.dtx}{package}}
-}
-
-\endbatchfile
-%</install>
-%<*dtx>
-          \ProvidesFile{ifpdf.dtx}
-%</dtx>
-%<*!install>
-%<package>\ifnum1=0\ifx\ProvidesPackage\undefined1\else\ifx\ProvidesPackage\relax1\fi\fi
-%<package>\def\next#1#2[#3]{\wlog{#2 #3}\expandafter\gdef
-%<package>\csname ver\string @ifpdf.sty\endcsname{#3}}
-%<package>\expandafter\next\fi
-%<package>\ProvidesPackage{ifpdf}%
-%<driver> \ProvidesFile{ifpdf.drv}
-% \fi
-%         \ProvidesFile{ifpdf.dtx}
-[2018/09/07 v3.3 Provides the ifpdf switch]
-% \iffalse
-%</!install>
-%
-%<*driver>
-\documentclass{ltxdoc}
-\usepackage{hyperref}
-\begin{document}
-\tableofcontents
-\DocInput{ifpdf.dtx}
-\end{document}
-%</driver>
-% \fi
-%
-% \GetFileInfo{ifpdf.dtx}
-%
-% \title{The \textsf{ifpdf} Package\thanks{This file
-%        has version number \fileversion, last
-%        revised \filedate.
-% Please report any issues at https://github.com/ho-tex/oberdiek/issues}}
-% \author{LaTeX3 project}
-% \date{\filedate}
-% \maketitle
-%
-% \section{Introduction}
-% 
-% A re-implementation of Heiko Oberdiek's \textsf{ifpdf} package
-% with simplified structure and updated to work with current Lua\TeX.
-%
-% The package defines a new boolean, \verb|\ifpdf| which is true
-% for pdf\TeX\ and Lua\TeX\ in PDF mode, and false otherwise.
-%
-% \section{Implementation}
-%
-%    \begin{macrocode}
-%<*package>
-%    \end{macrocode}
-%
-% If \verb|\ifpdf| is not defined define it, taking care that it is
-% outer in plain \TeX.
-%    \begin{macrocode}
-\expandafter\ifx\csname ifpdf\endcsname\relax
- \csname newif\expandafter\endcsname\csname ifpdf\endcsname
-\else
-%    \end{macrocode}
-% If \verb|\ifpdf| is already defined but \verb|\pdftrue| is not defined
-% give up.
-%    \begin{macrocode}
- \ifx\pdftrue\undefined
-  \ifx\PackageError\undefined
-  \begingroup\def\PackageError#1#2#3{\endgroup\errmessage{#2}}
-  \fi
-  \PackageError{ifpdf}{incompatible ifpdf definition}{}
-  \expandafter\expandafter\expandafter
- \fi
-\fi
-%    \end{macrocode}
-% Otherwise set the boolean to false unless pdfoutput (outputmode) is greater than zero.
-% For Lua\TeX, do the test in Lua as the tex primitivies may not be enabled, and
-% the primitive name may be \verb|\pdfoutput| or \verb|\outputmode| depending 
-% on the Lua\TeX\ version number.
-%    \begin{macrocode}
-\let\ifpdf\iffalse
-%    \end{macrocode}
-% 
-%    \begin{macrocode}
-\ifx\directlua\undefined
-%    \end{macrocode}
-% Not Lua\TeX.
-%    \begin{macrocode}
-\begingroup\expandafter\expandafter\expandafter\endgroup
-\expandafter\ifx\csname pdfoutput\endcsname\relax
-\else
-  \ifnum\pdfoutput>0 %
-    \pdftrue
-  \fi
-\fi
-\else
-%    \end{macrocode}
-% Lua\TeX.
-%    \begin{macrocode}
-\directlua{%
-if (tex.outputmode or tex.pdfoutput or 0) > 0 then
-  tex.print('\string\\pdftrue')
-end
-}
-\fi
-%    \end{macrocode}
-%
-%    \begin{macrocode}
-%</package>
-%    \end{macrocode}
-%
-% \endinput
-% 2016/04/04 v3.0  rewrite to be self standing and work with new luatex/
-% 2016/05/14 v3.1  define ver@ifpdf.sty in plain tex.
-% 2017/03/15 v3.2  define ver\string@ifpdf.sty in amstex tex.
-%                  https://github.com/ho-tex/oberdiek/issues/23
-% 2018/09/07 v3.3  guard against \ProvidesPackage being \relax
-%                  https://github.com/ho-tex/oberdiek/issues/38
diff --git a/macros/latex/contrib/oberdiek/ifvtex.dtx b/macros/latex/contrib/oberdiek/ifvtex.dtx
deleted file mode 100644
index dd405e6045..0000000000
--- a/macros/latex/contrib/oberdiek/ifvtex.dtx
+++ /dev/null
@@ -1,902 +0,0 @@
-% \iffalse meta-comment
-%
-% File: ifvtex.dtx
-% Version: 2016/05/16 v1.6
-% Info: Detect VTeX and its facilities
-%
-% Copyright (C) 2001, 2006-2008, 2010 by
-%    Heiko Oberdiek <heiko.oberdiek at googlemail.com>
-%    2016
-%    https://github.com/ho-tex/oberdiek/issues
-%
-% This work may be distributed and/or modified under the
-% conditions of the LaTeX Project Public License, either
-% version 1.3c of this license or (at your option) any later
-% version. This version of this license is in
-%    http://www.latex-project.org/lppl/lppl-1-3c.txt
-% and the latest version of this license is in
-%    http://www.latex-project.org/lppl.txt
-% and version 1.3 or later is part of all distributions of
-% LaTeX version 2005/12/01 or later.
-%
-% This work has the LPPL maintenance status "maintained".
-%
-% This Current Maintainer of this work is Heiko Oberdiek.
-%
-% The Base Interpreter refers to any `TeX-Format',
-% because some files are installed in TDS:tex/generic//.
-%
-% This work consists of the main source file ifvtex.dtx
-% and the derived files
-%    ifvtex.sty, ifvtex.pdf, ifvtex.ins, ifvtex.drv, ifvtex-test1.tex.
-%
-% Distribution:
-%    CTAN:macros/latex/contrib/oberdiek/ifvtex.dtx
-%    CTAN:macros/latex/contrib/oberdiek/ifvtex.pdf
-%
-% Unpacking:
-%    (a) If ifvtex.ins is present:
-%           tex ifvtex.ins
-%    (b) Without ifvtex.ins:
-%           tex ifvtex.dtx
-%    (c) If you insist on using LaTeX
-%           latex \let\install=y\input{ifvtex.dtx}
-%        (quote the arguments according to the demands of your shell)
-%
-% Documentation:
-%    (a) If ifvtex.drv is present:
-%           latex ifvtex.drv
-%    (b) Without ifvtex.drv:
-%           latex ifvtex.dtx; ...
-%    The class ltxdoc loads the configuration file ltxdoc.cfg
-%    if available. Here you can specify further options, e.g.
-%    use A4 as paper format:
-%       \PassOptionsToClass{a4paper}{article}
-%
-%    Programm calls to get the documentation (example):
-%       pdflatex ifvtex.dtx
-%       makeindex -s gind.ist ifvtex.idx
-%       pdflatex ifvtex.dtx
-%       makeindex -s gind.ist ifvtex.idx
-%       pdflatex ifvtex.dtx
-%
-% Installation:
-%    TDS:tex/generic/oberdiek/ifvtex.sty
-%    TDS:doc/latex/oberdiek/ifvtex.pdf
-%    TDS:doc/latex/oberdiek/test/ifvtex-test1.tex
-%    TDS:source/latex/oberdiek/ifvtex.dtx
-%
-%<*ignore>
-\begingroup
-  \catcode123=1 %
-  \catcode125=2 %
-  \def\x{LaTeX2e}%
-\expandafter\endgroup
-\ifcase 0\ifx\install y1\fi\expandafter
-         \ifx\csname processbatchFile\endcsname\relax\else1\fi
-         \ifx\fmtname\x\else 1\fi\relax
-\else\csname fi\endcsname
-%</ignore>
-%<*install>
-\input docstrip.tex
-\Msg{************************************************************************}
-\Msg{* Installation}
-\Msg{* Package: ifvtex 2016/05/16 v1.6 Detect VTeX and its facilities (HO)}
-\Msg{************************************************************************}
-
-\keepsilent
-\askforoverwritefalse
-
-\let\MetaPrefix\relax
-\preamble
-
-This is a generated file.
-
-Project: ifvtex
-Version: 2016/05/16 v1.6
-
-Copyright (C) 2001, 2006-2008, 2010 by
-   Heiko Oberdiek <heiko.oberdiek at googlemail.com>
-
-This work may be distributed and/or modified under the
-conditions of the LaTeX Project Public License, either
-version 1.3c of this license or (at your option) any later
-version. This version of this license is in
-   http://www.latex-project.org/lppl/lppl-1-3c.txt
-and the latest version of this license is in
-   http://www.latex-project.org/lppl.txt
-and version 1.3 or later is part of all distributions of
-LaTeX version 2005/12/01 or later.
-
-This work has the LPPL maintenance status "maintained".
-
-This Current Maintainer of this work is Heiko Oberdiek.
-
-The Base Interpreter refers to any `TeX-Format',
-because some files are installed in TDS:tex/generic//.
-
-This work consists of the main source file ifvtex.dtx
-and the derived files
-   ifvtex.sty, ifvtex.pdf, ifvtex.ins, ifvtex.drv, ifvtex-test1.tex.
-
-\endpreamble
-\let\MetaPrefix\DoubleperCent
-
-\generate{%
-  \file{ifvtex.ins}{\from{ifvtex.dtx}{install}}%
-  \file{ifvtex.drv}{\from{ifvtex.dtx}{driver}}%
-  \usedir{tex/generic/oberdiek}%
-  \file{ifvtex.sty}{\from{ifvtex.dtx}{package}}%
-%  \usedir{doc/latex/oberdiek/test}%
-%  \file{ifvtex-test1.tex}{\from{ifvtex.dtx}{test1}}%
-  \nopreamble
-  \nopostamble
-%  \usedir{source/latex/oberdiek/catalogue}%
-%  \file{ifvtex.xml}{\from{ifvtex.dtx}{catalogue}}%
-}
-
-\catcode32=13\relax% active space
-\let =\space%
-\Msg{************************************************************************}
-\Msg{*}
-\Msg{* To finish the installation you have to move the following}
-\Msg{* file into a directory searched by TeX:}
-\Msg{*}
-\Msg{*     ifvtex.sty}
-\Msg{*}
-\Msg{* To produce the documentation run the file `ifvtex.drv'}
-\Msg{* through LaTeX.}
-\Msg{*}
-\Msg{* Happy TeXing!}
-\Msg{*}
-\Msg{************************************************************************}
-
-\endbatchfile
-%</install>
-%<*ignore>
-\fi
-%</ignore>
-%<*driver>
-\NeedsTeXFormat{LaTeX2e}
-\ProvidesFile{ifvtex.drv}%
-  [2016/05/16 v1.6 Detect VTeX and its facilities (HO)]%
-\documentclass{ltxdoc}
-\usepackage{holtxdoc}[2011/11/22]
-\begin{document}
-  \DocInput{ifvtex.dtx}%
-\end{document}
-%</driver>
-% \fi
-%
-%
-% \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
-%   Lower-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
-%   Digits        \0\1\2\3\4\5\6\7\8\9
-%   Exclamation   \!     Double quote  \"     Hash (number) \#
-%   Dollar        \$     Percent       \%     Ampersand     \&
-%   Acute accent  \'     Left paren    \(     Right paren   \)
-%   Asterisk      \*     Plus          \+     Comma         \,
-%   Minus         \-     Point         \.     Solidus       \/
-%   Colon         \:     Semicolon     \;     Less than     \<
-%   Equals        \=     Greater than  \>     Question mark \?
-%   Commercial at \@     Left bracket  \[     Backslash     \\
-%   Right bracket \]     Circumflex    \^     Underscore    \_
-%   Grave accent  \`     Left brace    \{     Vertical bar  \|
-%   Right brace   \}     Tilde         \~}
-%
-% \GetFileInfo{ifvtex.drv}
-%
-% \title{The \xpackage{ifvtex} package}
-% \date{2016/05/16 v1.6}
-% \author{Heiko Oberdiek\thanks
-% {Please report any issues at https://github.com/ho-tex/oberdiek/issues}\\
-% \xemail{heiko.oberdiek at googlemail.com}}
-%
-% \maketitle
-%
-% \begin{abstract}
-% This package looks for \VTeX, implements
-% and sets the switches \cs{ifvtex}, \cs{ifvtex}\texttt{\meta{mode}},
-% \cs{ifvtexgex}. It works with plain or \LaTeX\ formats.
-% \end{abstract}
-%
-% \tableofcontents
-%
-% \section{Usage}
-%
-% The package \xpackage{ifvtex} can be used with both \plainTeX\
-% and \LaTeX:
-% \begin{description}
-% \item[\plainTeX:] |\input ifvtex.sty|
-% \item[\LaTeXe:]   |\usepackage{ifvtex}|\\
-% \end{description}
-%
-% The package implements switches for \VTeX\ and its different
-% modes and interprets \cs{VTeXversion}, \cs{OpMode}, and \cs{gexmode}.
-%
-% \begin{declcs}{ifvtex}
-% \end{declcs}
-% The package provides the switch \cs{ifvtex}:
-% \begin{quote}
-%   |\ifvtex|\\
-%   \hspace{1.5em}\dots\ do things, if \VTeX\ is running \dots\\
-%   |\else|\\
-%   \hspace{1.5em}\dots\ other \TeX\ compiler \dots\\
-%   |\fi|
-% \end{quote}
-% Users of the package \xpackage{ifthen} can use the switch as boolean:
-% \begin{quote}
-%   |\boolean{ifvtex}|
-% \end{quote}
-%
-% \begin{declcs}{ifvtexdvi}\\
-%   \cs{ifvtexpdf}\SpecialUsageIndex{\ifvtexpdf}\\
-%   \cs{ifvtexps}\SpecialUsageIndex{\ifvtexps}\\
-%   \cs{ifvtexhtml}\SpecialUsageIndex{\ifvtexhtml}
-% \end{declcs}
-% \VTeX\ knows different output modes that can be asked by these
-% switches.
-%
-% \begin{declcs}{ifvtexgex}
-% \end{declcs}
-% This switch shows, whether GeX is available.
-%
-% \StopEventually{
-% }
-%
-% \section{Implemenation}
-%
-% \subsection{Reload check and package identification}
-%
-%    \begin{macrocode}
-%<*package>
-%    \end{macrocode}
-%    Reload check, especially if the package is not used with \LaTeX.
-%    \begin{macrocode}
-\begingroup\catcode61\catcode48\catcode32=10\relax%
-  \catcode13=5 % ^^M
-  \endlinechar=13 %
-  \catcode35=6 % #
-  \catcode39=12 % '
-  \catcode44=12 % ,
-  \catcode45=12 % -
-  \catcode46=12 % .
-  \catcode58=12 % :
-  \catcode64=11 % @
-  \catcode123=1 % {
-  \catcode125=2 % }
-  \expandafter\let\expandafter\x\csname ver@ifvtex.sty\endcsname
-  \ifx\x\relax % plain-TeX, first loading
-  \else
-    \def\empty{}%
-    \ifx\x\empty % LaTeX, first loading,
-      % variable is initialized, but \ProvidesPackage not yet seen
-    \else
-      \expandafter\ifx\csname PackageInfo\endcsname\relax
-        \def\x#1#2{%
-          \immediate\write-1{Package #1 Info: #2.}%
-        }%
-      \else
-        \def\x#1#2{\PackageInfo{#1}{#2, stopped}}%
-      \fi
-      \x{ifvtex}{The package is already loaded}%
-      \aftergroup\endinput
-    \fi
-  \fi
-\endgroup%
-%    \end{macrocode}
-%    Package identification:
-%    \begin{macrocode}
-\begingroup\catcode61\catcode48\catcode32=10\relax%
-  \catcode13=5 % ^^M
-  \endlinechar=13 %
-  \catcode35=6 % #
-  \catcode39=12 % '
-  \catcode40=12 % (
-  \catcode41=12 % )
-  \catcode44=12 % ,
-  \catcode45=12 % -
-  \catcode46=12 % .
-  \catcode47=12 % /
-  \catcode58=12 % :
-  \catcode64=11 % @
-  \catcode91=12 % [
-  \catcode93=12 % ]
-  \catcode123=1 % {
-  \catcode125=2 % }
-  \expandafter\ifx\csname ProvidesPackage\endcsname\relax
-    \def\x#1#2#3[#4]{\endgroup
-      \immediate\write-1{Package: #3 #4}%
-      \xdef#1{#4}%
-    }%
-  \else
-    \def\x#1#2[#3]{\endgroup
-      #2[{#3}]%
-      \ifx#1\@undefined
-        \xdef#1{#3}%
-      \fi
-      \ifx#1\relax
-        \xdef#1{#3}%
-      \fi
-    }%
-  \fi
-\expandafter\x\csname ver@ifvtex.sty\endcsname
-\ProvidesPackage{ifvtex}%
-  [2016/05/16 v1.6 Detect VTeX and its facilities (HO)]%
-%    \end{macrocode}
-%
-% \subsection{Catcodes}
-%
-%    \begin{macrocode}
-\begingroup\catcode61\catcode48\catcode32=10\relax%
-  \catcode13=5 % ^^M
-  \endlinechar=13 %
-  \catcode123=1 % {
-  \catcode125=2 % }
-  \catcode64=11 % @
-  \def\x{\endgroup
-    \expandafter\edef\csname ifvtex@AtEnd\endcsname{%
-      \endlinechar=\the\endlinechar\relax
-      \catcode13=\the\catcode13\relax
-      \catcode32=\the\catcode32\relax
-      \catcode35=\the\catcode35\relax
-      \catcode61=\the\catcode61\relax
-      \catcode64=\the\catcode64\relax
-      \catcode123=\the\catcode123\relax
-      \catcode125=\the\catcode125\relax
-    }%
-  }%
-\x\catcode61\catcode48\catcode32=10\relax%
-\catcode13=5 % ^^M
-\endlinechar=13 %
-\catcode35=6 % #
-\catcode64=11 % @
-\catcode123=1 % {
-\catcode125=2 % }
-\def\TMP@EnsureCode#1#2{%
-  \edef\ifvtex@AtEnd{%
-    \ifvtex@AtEnd
-    \catcode#1=\the\catcode#1\relax
-  }%
-  \catcode#1=#2\relax
-}
-\TMP@EnsureCode{10}{12}% ^^J
-\TMP@EnsureCode{39}{12}% '
-\TMP@EnsureCode{44}{12}% ,
-\TMP@EnsureCode{45}{12}% -
-\TMP@EnsureCode{46}{12}% .
-\TMP@EnsureCode{47}{12}% /
-\TMP@EnsureCode{58}{12}% :
-\TMP@EnsureCode{60}{12}% <
-\TMP@EnsureCode{62}{12}% >
-\TMP@EnsureCode{94}{7}% ^
-\TMP@EnsureCode{96}{12}% `
-\edef\ifvtex@AtEnd{\ifvtex@AtEnd\noexpand\endinput}
-%    \end{macrocode}
-%
-% \subsection{Check for previously defined \cs{ifvtex}}
-%
-%    \begin{macrocode}
-\begingroup
-  \expandafter\ifx\csname ifvtex\endcsname\relax
-  \else
-    \edef\i/{\expandafter\string\csname ifvtex\endcsname}%
-    \expandafter\ifx\csname PackageError\endcsname\relax
-      \def\x#1#2{%
-        \edef\z{#2}%
-        \expandafter\errhelp\expandafter{\z}%
-        \errmessage{Package ifvtex Error: #1}%
-      }%
-      \def\y{^^J}%
-      \newlinechar=10 %
-    \else
-      \def\x#1#2{%
-        \PackageError{ifvtex}{#1}{#2}%
-      }%
-      \def\y{\MessageBreak}%
-    \fi
-    \x{Name clash, \i/ is already defined}{%
-      Incompatible versions of \i/ can cause problems,\y
-      therefore package loading is aborted.%
-    }%
-    \endgroup
-    \expandafter\ifvtex@AtEnd
-  \fi%
-\endgroup
-%    \end{macrocode}
-%
-% \subsection{Provide \cs{newif}}
-%
-%    \begin{macrocode}
-\begingroup\expandafter\expandafter\expandafter\endgroup
-\expandafter\ifx\csname newif\endcsname\relax
-%    \end{macrocode}
-%    \begin{macro}{\ifvtex@newif}
-%    \begin{macrocode}
-  \def\ifvtex@newif#1{%
-    \begingroup
-      \escapechar=-1 %
-    \expandafter\endgroup
-    \expandafter\ifvtex@@newif\string#1\@nil
-  }%
-%    \end{macrocode}
-%    \end{macro}
-%    \begin{macro}{\ifvtex@@newif}
-%    \begin{macrocode}
-  \def\ifvtex@@newif#1#2#3\@nil{%
-    \expandafter\edef\csname#3true\endcsname{%
-      \let
-      \expandafter\noexpand\csname if#3\endcsname
-      \expandafter\noexpand\csname iftrue\endcsname
-    }%
-    \expandafter\edef\csname#3false\endcsname{%
-      \let
-      \expandafter\noexpand\csname if#3\endcsname
-      \expandafter\noexpand\csname iffalse\endcsname
-    }%
-    \csname#3false\endcsname
-  }%
-%    \end{macrocode}
-%    \end{macro}
-%    \begin{macrocode}
-\else
-%    \end{macrocode}
-%    \begin{macro}{\ifvtex@newif}
-%    \begin{macrocode}
-  \expandafter\let\expandafter\ifvtex@newif\csname newif\endcsname
-\fi
-%    \end{macrocode}
-%    \end{macro}
-%
-% \subsection{\cs{ifvtex}}
-%
-%    \begin{macro}{\ifvtex}
-%    Create and set the switch. \cs{newif} initializes the
-%    switch with \cs{iffalse}.
-%    \begin{macrocode}
-\ifvtex@newif\ifvtex
-%    \end{macrocode}
-%    \begin{macrocode}
-\begingroup\expandafter\expandafter\expandafter\endgroup
-\expandafter\ifx\csname VTeXversion\endcsname\relax
-\else
-  \begingroup\expandafter\expandafter\expandafter\endgroup
-  \expandafter\ifx\csname OpMode\endcsname\relax
-  \else
-    \vtextrue
-  \fi
-\fi
-%    \end{macrocode}
-%    \end{macro}
-%
-% \subsection{Mode and GeX switches}
-%
-%    \begin{macrocode}
-\ifvtex@newif\ifvtexdvi
-\ifvtex@newif\ifvtexpdf
-\ifvtex@newif\ifvtexps
-\ifvtex@newif\ifvtexhtml
-\ifvtex@newif\ifvtexgex
-\ifvtex
-  \ifcase\OpMode\relax
-    \vtexdvitrue
-  \or % 1
-    \vtexpdftrue
-  \or % 2
-    \vtexpstrue
-  \or % 3
-    \vtexpstrue
-  \or\or\or\or\or\or\or % 10
-    \vtexhtmltrue
-  \fi
-  \begingroup\expandafter\expandafter\expandafter\endgroup
-  \expandafter\ifx\csname gexmode\endcsname\relax
-  \else
-    \ifnum\gexmode>0 %
-      \vtexgextrue
-    \fi
-  \fi
-\fi
-%    \end{macrocode}
-%
-% \subsection{Protocol entry}
-%
-%     Log comment:
-%    \begin{macrocode}
-\begingroup
-  \expandafter\ifx\csname PackageInfo\endcsname\relax
-    \def\x#1#2{%
-      \immediate\write-1{Package #1 Info: #2.}%
-    }%
-  \else
-    \let\x\PackageInfo
-    \expandafter\let\csname on@line\endcsname\empty
-  \fi
-  \x{ifvtex}{%
-    VTeX %
-    \ifvtex
-      in \ifvtexdvi DVI\fi
-         \ifvtexpdf PDF\fi
-         \ifvtexps PS\fi
-         \ifvtexhtml HTML\fi
-      \space mode %
-      with\ifvtexgex\else out\fi\space GeX %
-    \else
-      not %
-    \fi
-    detected%
-  }%
-\endgroup
-%    \end{macrocode}
-%
-%    \begin{macrocode}
-\ifvtex@AtEnd%
-%</package>
-%    \end{macrocode}
-%
-% \section{Test}
-%
-% \subsection{Catcode checks for loading}
-%
-%    \begin{macrocode}
-%<*test1>
-%    \end{macrocode}
-%    \begin{macrocode}
-\catcode`\{=1 %
-\catcode`\}=2 %
-\catcode`\#=6 %
-\catcode`\@=11 %
-\expandafter\ifx\csname count@\endcsname\relax
-  \countdef\count@=255 %
-\fi
-\expandafter\ifx\csname @gobble\endcsname\relax
-  \long\def\@gobble#1{}%
-\fi
-\expandafter\ifx\csname @firstofone\endcsname\relax
-  \long\def\@firstofone#1{#1}%
-\fi
-\expandafter\ifx\csname loop\endcsname\relax
-  \expandafter\@firstofone
-\else
-  \expandafter\@gobble
-\fi
-{%
-  \def\loop#1\repeat{%
-    \def\body{#1}%
-    \iterate
-  }%
-  \def\iterate{%
-    \body
-      \let\next\iterate
-    \else
-      \let\next\relax
-    \fi
-    \next
-  }%
-  \let\repeat=\fi
-}%
-\def\RestoreCatcodes{}
-\count@=0 %
-\loop
-  \edef\RestoreCatcodes{%
-    \RestoreCatcodes
-    \catcode\the\count@=\the\catcode\count@\relax
-  }%
-\ifnum\count@<255 %
-  \advance\count@ 1 %
-\repeat
-
-\def\RangeCatcodeInvalid#1#2{%
-  \count@=#1\relax
-  \loop
-    \catcode\count@=15 %
-  \ifnum\count@<#2\relax
-    \advance\count@ 1 %
-  \repeat
-}
-\def\RangeCatcodeCheck#1#2#3{%
-  \count@=#1\relax
-  \loop
-    \ifnum#3=\catcode\count@
-    \else
-      \errmessage{%
-        Character \the\count@\space
-        with wrong catcode \the\catcode\count@\space
-        instead of \number#3%
-      }%
-    \fi
-  \ifnum\count@<#2\relax
-    \advance\count@ 1 %
-  \repeat
-}
-\def\space{ }
-\expandafter\ifx\csname LoadCommand\endcsname\relax
-  \def\LoadCommand{\input ifvtex.sty\relax}%
-\fi
-\def\Test{%
-  \RangeCatcodeInvalid{0}{47}%
-  \RangeCatcodeInvalid{58}{64}%
-  \RangeCatcodeInvalid{91}{96}%
-  \RangeCatcodeInvalid{123}{255}%
-  \catcode`\@=12 %
-  \catcode`\\=0 %
-  \catcode`\%=14 %
-  \LoadCommand
-  \RangeCatcodeCheck{0}{36}{15}%
-  \RangeCatcodeCheck{37}{37}{14}%
-  \RangeCatcodeCheck{38}{47}{15}%
-  \RangeCatcodeCheck{48}{57}{12}%
-  \RangeCatcodeCheck{58}{63}{15}%
-  \RangeCatcodeCheck{64}{64}{12}%
-  \RangeCatcodeCheck{65}{90}{11}%
-  \RangeCatcodeCheck{91}{91}{15}%
-  \RangeCatcodeCheck{92}{92}{0}%
-  \RangeCatcodeCheck{93}{96}{15}%
-  \RangeCatcodeCheck{97}{122}{11}%
-  \RangeCatcodeCheck{123}{255}{15}%
-  \RestoreCatcodes
-}
-\Test
-\csname @@end\endcsname
-\end
-%    \end{macrocode}
-%    \begin{macrocode}
-%</test1>
-%    \end{macrocode}
-%
-% \section{Installation}
-%
-% \subsection{Download}
-%
-% \paragraph{Package.} This package is available on
-% CTAN\footnote{\url{http://ctan.org/pkg/ifvtex}}:
-% \begin{description}
-% \item[\CTAN{macros/latex/contrib/oberdiek/ifvtex.dtx}] The source file.
-% \item[\CTAN{macros/latex/contrib/oberdiek/ifvtex.pdf}] Documentation.
-% \end{description}
-%
-%
-% \paragraph{Bundle.} All the packages of the bundle `oberdiek'
-% are also available in a TDS compliant ZIP archive. There
-% the packages are already unpacked and the documentation files
-% are generated. The files and directories obey the TDS standard.
-% \begin{description}
-% \item[\CTAN{install/macros/latex/contrib/oberdiek.tds.zip}]
-% \end{description}
-% \emph{TDS} refers to the standard ``A Directory Structure
-% for \TeX\ Files'' (\CTAN{tds/tds.pdf}). Directories
-% with \xfile{texmf} in their name are usually organized this way.
-%
-% \subsection{Bundle installation}
-%
-% \paragraph{Unpacking.} Unpack the \xfile{oberdiek.tds.zip} in the
-% TDS tree (also known as \xfile{texmf} tree) of your choice.
-% Example (linux):
-% \begin{quote}
-%   |unzip oberdiek.tds.zip -d ~/texmf|
-% \end{quote}
-%
-% \paragraph{Script installation.}
-% Check the directory \xfile{TDS:scripts/oberdiek/} for
-% scripts that need further installation steps.
-% Package \xpackage{attachfile2} comes with the Perl script
-% \xfile{pdfatfi.pl} that should be installed in such a way
-% that it can be called as \texttt{pdfatfi}.
-% Example (linux):
-% \begin{quote}
-%   |chmod +x scripts/oberdiek/pdfatfi.pl|\\
-%   |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
-% \end{quote}
-%
-% \subsection{Package installation}
-%
-% \paragraph{Unpacking.} The \xfile{.dtx} file is a self-extracting
-% \docstrip\ archive. The files are extracted by running the
-% \xfile{.dtx} through \plainTeX:
-% \begin{quote}
-%   \verb|tex ifvtex.dtx|
-% \end{quote}
-%
-% \paragraph{TDS.} Now the different files must be moved into
-% the different directories in your installation TDS tree
-% (also known as \xfile{texmf} tree):
-% \begin{quote}
-% \def\t{^^A
-% \begin{tabular}{@{}>{\ttfamily}l@{ $\rightarrow$ }>{\ttfamily}l@{}}
-%   ifvtex.sty & tex/generic/oberdiek/ifvtex.sty\\
-%   ifvtex.pdf & doc/latex/oberdiek/ifvtex.pdf\\
-%   test/ifvtex-test1.tex & doc/latex/oberdiek/test/ifvtex-test1.tex\\
-%   ifvtex.dtx & source/latex/oberdiek/ifvtex.dtx\\
-% \end{tabular}^^A
-% }^^A
-% \sbox0{\t}^^A
-% \ifdim\wd0>\linewidth
-%   \begingroup
-%     \advance\linewidth by\leftmargin
-%     \advance\linewidth by\rightmargin
-%   \edef\x{\endgroup
-%     \def\noexpand\lw{\the\linewidth}^^A
-%   }\x
-%   \def\lwbox{^^A
-%     \leavevmode
-%     \hbox to \linewidth{^^A
-%       \kern-\leftmargin\relax
-%       \hss
-%       \usebox0
-%       \hss
-%       \kern-\rightmargin\relax
-%     }^^A
-%   }^^A
-%   \ifdim\wd0>\lw
-%     \sbox0{\small\t}^^A
-%     \ifdim\wd0>\linewidth
-%       \ifdim\wd0>\lw
-%         \sbox0{\footnotesize\t}^^A
-%         \ifdim\wd0>\linewidth
-%           \ifdim\wd0>\lw
-%             \sbox0{\scriptsize\t}^^A
-%             \ifdim\wd0>\linewidth
-%               \ifdim\wd0>\lw
-%                 \sbox0{\tiny\t}^^A
-%                 \ifdim\wd0>\linewidth
-%                   \lwbox
-%                 \else
-%                   \usebox0
-%                 \fi
-%               \else
-%                 \lwbox
-%               \fi
-%             \else
-%               \usebox0
-%             \fi
-%           \else
-%             \lwbox
-%           \fi
-%         \else
-%           \usebox0
-%         \fi
-%       \else
-%         \lwbox
-%       \fi
-%     \else
-%       \usebox0
-%     \fi
-%   \else
-%     \lwbox
-%   \fi
-% \else
-%   \usebox0
-% \fi
-% \end{quote}
-% If you have a \xfile{docstrip.cfg} that configures and enables \docstrip's
-% TDS installing feature, then some files can already be in the right
-% place, see the documentation of \docstrip.
-%
-% \subsection{Refresh file name databases}
-%
-% If your \TeX~distribution
-% (\teTeX, \mikTeX, \dots) relies on file name databases, you must refresh
-% these. For example, \teTeX\ users run \verb|texhash| or
-% \verb|mktexlsr|.
-%
-% \subsection{Some details for the interested}
-%
-% \paragraph{Attached source.}
-%
-% The PDF documentation on CTAN also includes the
-% \xfile{.dtx} source file. It can be extracted by
-% AcrobatReader 6 or higher. Another option is \textsf{pdftk},
-% e.g. unpack the file into the current directory:
-% \begin{quote}
-%   \verb|pdftk ifvtex.pdf unpack_files output .|
-% \end{quote}
-%
-% \paragraph{Unpacking with \LaTeX.}
-% The \xfile{.dtx} chooses its action depending on the format:
-% \begin{description}
-% \item[\plainTeX:] Run \docstrip\ and extract the files.
-% \item[\LaTeX:] Generate the documentation.
-% \end{description}
-% If you insist on using \LaTeX\ for \docstrip\ (really,
-% \docstrip\ does not need \LaTeX), then inform the autodetect routine
-% about your intention:
-% \begin{quote}
-%   \verb|latex \let\install=y\input{ifvtex.dtx}|
-% \end{quote}
-% Do not forget to quote the argument according to the demands
-% of your shell.
-%
-% \paragraph{Generating the documentation.}
-% You can use both the \xfile{.dtx} or the \xfile{.drv} to generate
-% the documentation. The process can be configured by the
-% configuration file \xfile{ltxdoc.cfg}. For instance, put this
-% line into this file, if you want to have A4 as paper format:
-% \begin{quote}
-%   \verb|\PassOptionsToClass{a4paper}{article}|
-% \end{quote}
-% An example follows how to generate the
-% documentation with pdf\LaTeX:
-% \begin{quote}
-%\begin{verbatim}
-%pdflatex ifvtex.dtx
-%makeindex -s gind.ist ifvtex.idx
-%pdflatex ifvtex.dtx
-%makeindex -s gind.ist ifvtex.idx
-%pdflatex ifvtex.dtx
-%\end{verbatim}
-% \end{quote}
-%
-% \section{Catalogue}
-%
-% The following XML file can be used as source for the
-% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
-% The elements \texttt{caption} and \texttt{description} are imported
-% from the original XML file from the Catalogue.
-% The name of the XML file in the Catalogue is \xfile{ifvtex.xml}.
-%    \begin{macrocode}
-%<*catalogue>
-<?xml version='1.0' encoding='us-ascii'?>
-<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
-<entry datestamp='$Date$' modifier='$Author$' id='ifvtex'>
-  <name>ifvtex</name>
-  <caption>Detects use of VTeX and its facilities.</caption>
-  <authorref id='auth:oberdiek'/>
-  <copyright owner='Heiko Oberdiek' year='2001,2006-2008,2010'/>
-  <license type='lppl1.3'/>
-  <version number='1.6'/>
-  <description>
-    The package looks for VTeX and sets the switch <tt>\ifvtex</tt>.
-    In the presence of VTeX, the mode switches <tt>\ifvtexdvi</tt>,
-    <tt>\ifvtexpdf</tt> and <tt>\ifvtexps</tt> are set;
-    <tt>\ifvtexgex</tt> tells you whether GeX is operating.
-    <p/>
-    The package is part of the <xref refid='oberdiek'>oberdiek</xref> bundle.
-  </description>
-  <documentation details='Package documentation'
-      href='ctan:/macros/latex/contrib/oberdiek/ifvtex.pdf'/>
-  <ctan file='true' path='/macros/latex/contrib/oberdiek/ifvtex.dtx'/>
-  <miktex location='oberdiek'/>
-  <texlive location='oberdiek'/>
-  <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
-</entry>
-%</catalogue>
-%    \end{macrocode}
-%
-% \begin{History}
-%   \begin{Version}{2001/09/26 v1.0}
-%   \item
-%     First public version.
-%   \end{Version}
-%   \begin{Version}{2006/02/20 v1.1}
-%   \item
-%     DTX framework.
-%   \item
-%     Undefined tests changed.
-%   \end{Version}
-%   \begin{Version}{2007/01/10 v1.2}
-%   \item
-%     Fix of the \cs{ProvidesPackage} description.
-%   \end{Version}
-%   \begin{Version}{2007/09/09 v1.3}
-%   \item
-%     Catcode section added.
-%   \end{Version}
-%   \begin{Version}{2008/11/04 v1.4}
-%   \item
-%     Bug fix: Mispelled \cs{OpMode} (found by Hideo Umeki).
-%   \end{Version}
-%   \begin{Version}{2010/03/01 v1.5}
-%   \item
-%     Compatibility with ini\TeX.
-%   \end{Version}
-%   \begin{Version}{2016/05/16 v1.6}
-%   \item
-%     Documentation updates.
-%   \end{Version}
-% \end{History}
-%
-% \PrintIndex
-%
-% \Finale
-\endinput
diff --git a/macros/latex/contrib/oberdiek/infwarerr.dtx b/macros/latex/contrib/oberdiek/infwarerr.dtx
index ffc6c01b40..89003edc2c 100644
--- a/macros/latex/contrib/oberdiek/infwarerr.dtx
+++ b/macros/latex/contrib/oberdiek/infwarerr.dtx
@@ -13,15 +13,17 @@
 % conditions of the LaTeX Project Public License, either
 % version 1.3c of this license or (at your option) any later
 % version. This version of this license is in
-%    http://www.latex-project.org/lppl/lppl-1-3c.txt
+%    https://www.latex-project.org/lppl/lppl-1-3c.txt
 % and the latest version of this license is in
-%    http://www.latex-project.org/lppl.txt
+%    https://www.latex-project.org/lppl.txt
 % and version 1.3 or later is part of all distributions of
 % LaTeX version 2005/12/01 or later.
 %
 % This work has the LPPL maintenance status "maintained".
 %
-% This Current Maintainer of this work is Heiko Oberdiek.
+% The Current Maintainers of this work are
+% Heiko Oberdiek and the Oberdiek Package Support Group
+% https://github.com/ho-tex/oberdiek/issues
 %
 % The Base Interpreter refers to any `TeX-Format',
 % because some files are installed in TDS:tex/generic//.
@@ -106,15 +108,18 @@ This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either
 version 1.3c of this license or (at your option) any later
 version. This version of this license is in
-   http://www.latex-project.org/lppl/lppl-1-3c.txt
+   https://www.latex-project.org/lppl/lppl-1-3c.txt
 and the latest version of this license is in
-   http://www.latex-project.org/lppl.txt
+   https://www.latex-project.org/lppl.txt
 and version 1.3 or later is part of all distributions of
 LaTeX version 2005/12/01 or later.
 
 This work has the LPPL maintenance status "maintained".
 
-This Current Maintainer of this work is Heiko Oberdiek.
+The Current Maintainers of this work are
+Heiko Oberdiek and the Oberdiek Package Support Group
+https://github.com/ho-tex/oberdiek/issues
+
 
 The Base Interpreter refers to any `TeX-Format',
 because some files are installed in TDS:tex/generic//.
@@ -198,8 +203,7 @@ and the derived files
 % \title{The \xpackage{infwarerr} package}
 % \date{2016/05/16 v1.4}
 % \author{Heiko Oberdiek\thanks
-% {Please report any issues at https://github.com/ho-tex/oberdiek/issues}\\
-% \xemail{heiko.oberdiek at googlemail.com}}
+% {Please report any issues at \url{https://github.com/ho-tex/oberdiek/issues}}}
 %
 % \maketitle
 %
@@ -1002,7 +1006,7 @@ and the derived files
 % \subsection{Download}
 %
 % \paragraph{Package.} This package is available on
-% CTAN\footnote{\url{http://ctan.org/pkg/infwarerr}}:
+% CTAN\footnote{\CTANpkg{infwarerr}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/infwarerr.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/infwarerr.pdf}] Documentation.
@@ -1014,7 +1018,7 @@ and the derived files
 % the packages are already unpacked and the documentation files
 % are generated. The files and directories obey the TDS standard.
 % \begin{description}
-% \item[\CTAN{install/macros/latex/contrib/oberdiek.tds.zip}]
+% \item[\CTANinstall{install/macros/latex/contrib/oberdiek.tds.zip}]
 % \end{description}
 % \emph{TDS} refers to the standard ``A Directory Structure
 % for \TeX\ Files'' (\CTAN{tds/tds.pdf}). Directories
@@ -1136,16 +1140,6 @@ and the derived files
 %
 % \subsection{Some details for the interested}
 %
-% \paragraph{Attached source.}
-%
-% The PDF documentation on CTAN also includes the
-% \xfile{.dtx} source file. It can be extracted by
-% AcrobatReader 6 or higher. Another option is \textsf{pdftk},
-% e.g. unpack the file into the current directory:
-% \begin{quote}
-%   \verb|pdftk infwarerr.pdf unpack_files output .|
-% \end{quote}
-%
 % \paragraph{Unpacking with \LaTeX.}
 % The \xfile{.dtx} chooses its action depending on the format:
 % \begin{description}
@@ -1181,43 +1175,6 @@ and the derived files
 %\end{verbatim}
 % \end{quote}
 %
-% \section{Catalogue}
-%
-% The following XML file can be used as source for the
-% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
-% The elements \texttt{caption} and \texttt{description} are imported
-% from the original XML file from the Catalogue.
-% The name of the XML file in the Catalogue is \xfile{infwarerr.xml}.
-%    \begin{macrocode}
-%<*catalogue>
-<?xml version='1.0' encoding='us-ascii'?>
-<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
-<entry datestamp='$Date$' modifier='$Author$' id='infwarerr'>
-  <name>infwarerr</name>
-  <caption>Complete set of information/warning/error messages.</caption>
-  <authorref id='auth:oberdiek'/>
-  <copyright owner='Heiko Oberdiek' year='2007,2010'/>
-  <license type='lppl1.3'/>
-  <version number='1.4'/>
-  <description>
-    This package provides a complete set of macros for information,
-    warning and error messages.  Under LaTeX, the commands are
-    wrappers for the corresponding LaTeX commands; under Plain TeX
-    they are also available as complete implementations.
-    <p/>
-    The package is part of the <xref refid='oberdiek'>oberdiek</xref>
-    bundle.
-  </description>
-  <documentation details='Package documentation'
-      href='ctan:/macros/latex/contrib/oberdiek/infwarerr.pdf'/>
-  <ctan file='true' path='/macros/latex/contrib/oberdiek/infwarerr.dtx'/>
-  <miktex location='oberdiek'/>
-  <texlive location='oberdiek'/>
-  <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
-</entry>
-%</catalogue>
-%    \end{macrocode}
-%
 % \begin{History}
 %   \begin{Version}{2007/04/26 v1.0}
 %   \item
diff --git a/macros/latex/contrib/oberdiek/infwarerr.pdf b/macros/latex/contrib/oberdiek/infwarerr.pdf
index 1729b5c169..1d196229aa 100644
--- a/macros/latex/contrib/oberdiek/infwarerr.pdf
+++ b/macros/latex/contrib/oberdiek/infwarerr.pdf
diff --git a/macros/latex/contrib/oberdiek/inputenx.dtx b/macros/latex/contrib/oberdiek/inputenx.dtx
index 8f7f6ddfeb..25688526bb 100644
--- a/macros/latex/contrib/oberdiek/inputenx.dtx
+++ b/macros/latex/contrib/oberdiek/inputenx.dtx
@@ -13,15 +13,17 @@
 % conditions of the LaTeX Project Public License, either
 % version 1.3c of this license or (at your option) any later
 % version. This version of this license is in
-%    http://www.latex-project.org/lppl/lppl-1-3c.txt
+%    https://www.latex-project.org/lppl/lppl-1-3c.txt
 % and the latest version of this license is in
-%    http://www.latex-project.org/lppl.txt
+%    https://www.latex-project.org/lppl.txt
 % and version 1.3 or later is part of all distributions of
 % LaTeX version 2005/12/01 or later.
 %
 % This work has the LPPL maintenance status "maintained".
 %
-% This Current Maintainer of this work is Heiko Oberdiek.
+% The Current Maintainers of this work are
+% Heiko Oberdiek and the Oberdiek Package Support Group
+% https://github.com/ho-tex/oberdiek/issues
 %
 % This work consists of the main source file inputenx.dtx
 % and the derived files
@@ -151,15 +153,18 @@ This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either
 version 1.3c of this license or (at your option) any later
 version. This version of this license is in
-   http://www.latex-project.org/lppl/lppl-1-3c.txt
+   https://www.latex-project.org/lppl/lppl-1-3c.txt
 and the latest version of this license is in
-   http://www.latex-project.org/lppl.txt
+   https://www.latex-project.org/lppl.txt
 and version 1.3 or later is part of all distributions of
 LaTeX version 2005/12/01 or later.
 
 This work has the LPPL maintenance status "maintained".
 
-This Current Maintainer of this work is Heiko Oberdiek.
+The Current Maintainers of this work are
+Heiko Oberdiek and the Oberdiek Package Support Group
+https://github.com/ho-tex/oberdiek/issues
+
 
 This work consists of the main source file inputenx.dtx
 and the derived files
@@ -300,8 +305,7 @@ and the derived files
 % \title{The \xpackage{inputenx} package}
 % \date{2016/05/16 v1.11}
 % \author{Heiko Oberdiek\thanks
-% {Please report any issues at https://github.com/ho-tex/oberdiek/issues}\\
-% \xemail{heiko.oberdiek at googlemail.com}}
+% {Please report any issues at \url{https://github.com/ho-tex/oberdiek/issues}}}
 %
 % \maketitle
 %
@@ -11754,7 +11758,7 @@ and the derived files
 % \subsection{Download}
 %
 % \paragraph{Package.} This package is available on
-% CTAN\footnote{\url{http://ctan.org/pkg/inputenx}}:
+% CTAN\footnote{\CTANpkg{inputenx}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/inputenx.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/inputenx.pdf}] Documentation.
@@ -11766,7 +11770,7 @@ and the derived files
 % the packages are already unpacked and the documentation files
 % are generated. The files and directories obey the TDS standard.
 % \begin{description}
-% \item[\CTAN{install/macros/latex/contrib/oberdiek.tds.zip}]
+% \item[\CTANinstall{install/macros/latex/contrib/oberdiek.tds.zip}]
 % \end{description}
 % \emph{TDS} refers to the standard ``A Directory Structure
 % for \TeX\ Files'' (\CTAN{tds/tds.pdf}). Directories
@@ -11926,16 +11930,6 @@ and the derived files
 %
 % \subsection{Some details for the interested}
 %
-% \paragraph{Attached source.}
-%
-% The PDF documentation on CTAN also includes the
-% \xfile{.dtx} source file. It can be extracted by
-% AcrobatReader 6 or higher. Another option is \textsf{pdftk},
-% e.g. unpack the file into the current directory:
-% \begin{quote}
-%   \verb|pdftk inputenx.pdf unpack_files output .|
-% \end{quote}
-%
 % \paragraph{Unpacking with \LaTeX.}
 % The \xfile{.dtx} chooses its action depending on the format:
 % \begin{description}
@@ -11971,43 +11965,6 @@ and the derived files
 %\end{verbatim}
 % \end{quote}
 %
-% \section{Catalogue}
-%
-% The following XML file can be used as source for the
-% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
-% The elements \texttt{caption} and \texttt{description} are imported
-% from the original XML file from the Catalogue.
-% The name of the XML file in the Catalogue is \xfile{inputenx.xml}.
-%    \begin{macrocode}
-%<*catalogue>
-<?xml version='1.0' encoding='us-ascii'?>
-<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
-<entry datestamp='$Date$' modifier='$Author$' id='inputenx'>
-  <name>inputenx</name>
-  <caption>Enhanced input encoding handling.</caption>
-  <authorref id='auth:oberdiek'/>
-  <copyright owner='Heiko Oberdiek' year='2006-2011'/>
-  <license type='lppl1.3'/>
-  <version number='1.11'/>
-  <description>
-    This package deals with input encodings. The first stage
-    provides input encodings using
-    standard mappings and covers nearly all slots. Thus it
-    serves as more uptodate replacement for package
-    <xref refid='inputenc'>inputenc</xref>.
-    <p/>
-    The package is part of the <xref refid='oberdiek'>oberdiek</xref> bundle.
-  </description>
-  <documentation details='Package documentation'
-      href='ctan:/macros/latex/contrib/oberdiek/inputenx.pdf'/>
-  <ctan file='true' path='/macros/latex/contrib/oberdiek/inputenx.dtx'/>
-  <miktex location='oberdiek'/>
-  <texlive location='oberdiek'/>
-  <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
-</entry>
-%</catalogue>
-%    \end{macrocode}
-%
 % \begin{thebibliography}{9}
 %
 % \bibitem{ltc}
@@ -12031,7 +11988,7 @@ and the derived files
 %
 % \bibitem{dash}
 %   Wikipedia, \textit{Dash}.
-%   \url{http://en.wikipedia.org/wiki/Dash}
+%   \url{https://en.wikipedia.org/wiki/Dash}
 %
 % \subsection{Mappings to Unicode}
 %
diff --git a/macros/latex/contrib/oberdiek/inputenx.pdf b/macros/latex/contrib/oberdiek/inputenx.pdf
index f162a17b8b..b203bf17d6 100644
--- a/macros/latex/contrib/oberdiek/inputenx.pdf
+++ b/macros/latex/contrib/oberdiek/inputenx.pdf
diff --git a/macros/latex/contrib/oberdiek/intcalc.dtx b/macros/latex/contrib/oberdiek/intcalc.dtx
index c44d7744c2..d52390fa74 100644
--- a/macros/latex/contrib/oberdiek/intcalc.dtx
+++ b/macros/latex/contrib/oberdiek/intcalc.dtx
@@ -13,15 +13,17 @@
 % conditions of the LaTeX Project Public License, either
 % version 1.3c of this license or (at your option) any later
 % version. This version of this license is in
-%    http://www.latex-project.org/lppl/lppl-1-3c.txt
+%    https://www.latex-project.org/lppl/lppl-1-3c.txt
 % and the latest version of this license is in
-%    http://www.latex-project.org/lppl.txt
+%    https://www.latex-project.org/lppl.txt
 % and version 1.3 or later is part of all distributions of
 % LaTeX version 2005/12/01 or later.
 %
 % This work has the LPPL maintenance status "maintained".
 %
-% This Current Maintainer of this work is Heiko Oberdiek.
+% The Current Maintainers of this work are
+% Heiko Oberdiek and the Oberdiek Package Support Group
+% https://github.com/ho-tex/oberdiek/issues
 %
 % The Base Interpreter refers to any `TeX-Format',
 % because some files are installed in TDS:tex/generic//.
@@ -107,15 +109,18 @@ This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either
 version 1.3c of this license or (at your option) any later
 version. This version of this license is in
-   http://www.latex-project.org/lppl/lppl-1-3c.txt
+   https://www.latex-project.org/lppl/lppl-1-3c.txt
 and the latest version of this license is in
-   http://www.latex-project.org/lppl.txt
+   https://www.latex-project.org/lppl.txt
 and version 1.3 or later is part of all distributions of
 LaTeX version 2005/12/01 or later.
 
 This work has the LPPL maintenance status "maintained".
 
-This Current Maintainer of this work is Heiko Oberdiek.
+The Current Maintainers of this work are
+Heiko Oberdiek and the Oberdiek Package Support Group
+https://github.com/ho-tex/oberdiek/issues
+
 
 The Base Interpreter refers to any `TeX-Format',
 because some files are installed in TDS:tex/generic//.
@@ -234,8 +239,7 @@ and the derived files
 % \title{The \xpackage{intcalc} package}
 % \date{2016/05/16 v1.2}
 % \author{Heiko Oberdiek\thanks
-% {Please report any issues at https://github.com/ho-tex/oberdiek/issues}\\
-% \xemail{heiko.oberdiek at googlemail.com}}
+% {Please report any issues at \url{https://github.com/ho-tex/oberdiek/issues}}}
 %
 % \maketitle
 %
@@ -4067,7 +4071,7 @@ and the derived files
 % \subsection{Download}
 %
 % \paragraph{Package.} This package is available on
-% CTAN\footnote{\url{http://ctan.org/pkg/intcalc}}:
+% CTAN\footnote{\CTANpkg{intcalc}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/intcalc.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/intcalc.pdf}] Documentation.
@@ -4079,7 +4083,7 @@ and the derived files
 % the packages are already unpacked and the documentation files
 % are generated. The files and directories obey the TDS standard.
 % \begin{description}
-% \item[\CTAN{install/macros/latex/contrib/oberdiek.tds.zip}]
+% \item[\CTANinstall{install/macros/latex/contrib/oberdiek.tds.zip}]
 % \end{description}
 % \emph{TDS} refers to the standard ``A Directory Structure
 % for \TeX\ Files'' (\CTAN{tds/tds.pdf}). Directories
@@ -4202,16 +4206,6 @@ and the derived files
 %
 % \subsection{Some details for the interested}
 %
-% \paragraph{Attached source.}
-%
-% The PDF documentation on CTAN also includes the
-% \xfile{.dtx} source file. It can be extracted by
-% AcrobatReader 6 or higher. Another option is \textsf{pdftk},
-% e.g. unpack the file into the current directory:
-% \begin{quote}
-%   \verb|pdftk intcalc.pdf unpack_files output .|
-% \end{quote}
-%
 % \paragraph{Unpacking with \LaTeX.}
 % The \xfile{.dtx} chooses its action depending on the format:
 % \begin{description}
@@ -4247,42 +4241,6 @@ and the derived files
 %\end{verbatim}
 % \end{quote}
 %
-% \section{Catalogue}
-%
-% The following XML file can be used as source for the
-% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
-% The elements \texttt{caption} and \texttt{description} are imported
-% from the original XML file from the Catalogue.
-% The name of the XML file in the Catalogue is \xfile{intcalc.xml}.
-%    \begin{macrocode}
-%<*catalogue>
-<?xml version='1.0' encoding='us-ascii'?>
-<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
-<entry datestamp='$Date$' modifier='$Author$' id='intcalc'>
-  <name>intcalc</name>
-  <caption>Expandable arithmetic operations with integers.</caption>
-  <authorref id='auth:oberdiek'/>
-  <copyright owner='Heiko Oberdiek' year='2007'/>
-  <license type='lppl1.3'/>
-  <version number='1.2'/>
-  <description>
-    This package provides expandable arithmetic operations
-    with integers, using the e-TeX extension <tt>\numexpr</tt> if it
-    is available.
-    <p/>
-    The package is part of the <xref refid='oberdiek'>oberdiek</xref>
-    bundle.
-  </description>
-  <documentation details='Package documentation'
-      href='ctan:/macros/latex/contrib/oberdiek/intcalc.pdf'/>
-  <ctan file='true' path='/macros/latex/contrib/oberdiek/intcalc.dtx'/>
-  <miktex location='oberdiek'/>
-  <texlive location='oberdiek'/>
-  <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
-</entry>
-%</catalogue>
-%    \end{macrocode}
-%
 % \begin{History}
 %   \begin{Version}{2007/09/09 v1.0}
 %   \item
diff --git a/macros/latex/contrib/oberdiek/intcalc.pdf b/macros/latex/contrib/oberdiek/intcalc.pdf
index 8bc91d57cf..69eb837905 100644
--- a/macros/latex/contrib/oberdiek/intcalc.pdf
+++ b/macros/latex/contrib/oberdiek/intcalc.pdf
diff --git a/macros/latex/contrib/oberdiek/kvdefinekeys.dtx b/macros/latex/contrib/oberdiek/kvdefinekeys.dtx
index f6d3313a6a..67ebac712d 100644
--- a/macros/latex/contrib/oberdiek/kvdefinekeys.dtx
+++ b/macros/latex/contrib/oberdiek/kvdefinekeys.dtx
@@ -13,15 +13,17 @@
 % conditions of the LaTeX Project Public License, either
 % version 1.3c of this license or (at your option) any later
 % version. This version of this license is in
-%    http://www.latex-project.org/lppl/lppl-1-3c.txt
+%    https://www.latex-project.org/lppl/lppl-1-3c.txt
 % and the latest version of this license is in
-%    http://www.latex-project.org/lppl.txt
+%    https://www.latex-project.org/lppl.txt
 % and version 1.3 or later is part of all distributions of
 % LaTeX version 2005/12/01 or later.
 %
 % This work has the LPPL maintenance status "maintained".
 %
-% This Current Maintainer of this work is Heiko Oberdiek.
+% The Current Maintainers of this work are
+% Heiko Oberdiek and the Oberdiek Package Support Group
+% https://github.com/ho-tex/oberdiek/issues
 %
 % The Base Interpreter refers to any `TeX-Format',
 % because some files are installed in TDS:tex/generic//.
@@ -103,15 +105,18 @@ This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either
 version 1.3c of this license or (at your option) any later
 version. This version of this license is in
-   http://www.latex-project.org/lppl/lppl-1-3c.txt
+   https://www.latex-project.org/lppl/lppl-1-3c.txt
 and the latest version of this license is in
-   http://www.latex-project.org/lppl.txt
+   https://www.latex-project.org/lppl.txt
 and version 1.3 or later is part of all distributions of
 LaTeX version 2005/12/01 or later.
 
 This work has the LPPL maintenance status "maintained".
 
-This Current Maintainer of this work is Heiko Oberdiek.
+The Current Maintainers of this work are
+Heiko Oberdiek and the Oberdiek Package Support Group
+https://github.com/ho-tex/oberdiek/issues
+
 
 The Base Interpreter refers to any `TeX-Format',
 because some files are installed in TDS:tex/generic//.
@@ -192,8 +197,7 @@ and the derived files
 % \title{The \xpackage{kvdefinekeys} package}
 % \date{2016/05/16 v1.4}
 % \author{Heiko Oberdiek\thanks
-% {Please report any issues at https://github.com/ho-tex/oberdiek/issues}\\
-% \xemail{heiko.oberdiek at googlemail.com}}
+% {Please report any issues at \url{https://github.com/ho-tex/oberdiek/issues}}}
 %
 % \maketitle
 %
@@ -539,7 +543,7 @@ and the derived files
 % \subsection{Download}
 %
 % \paragraph{Package.} This package is available on
-% CTAN\footnote{\url{http://ctan.org/pkg/kvdefinekeys}}:
+% CTAN\footnote{\CTANpkg{kvdefinekeys}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/kvdefinekeys.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/kvdefinekeys.pdf}] Documentation.
@@ -551,7 +555,7 @@ and the derived files
 % the packages are already unpacked and the documentation files
 % are generated. The files and directories obey the TDS standard.
 % \begin{description}
-% \item[\CTAN{install/macros/latex/contrib/oberdiek.tds.zip}]
+% \item[\CTANinstall{install/macros/latex/contrib/oberdiek.tds.zip}]
 % \end{description}
 % \emph{TDS} refers to the standard ``A Directory Structure
 % for \TeX\ Files'' (\CTAN{tds/tds.pdf}). Directories
@@ -671,16 +675,6 @@ and the derived files
 %
 % \subsection{Some details for the interested}
 %
-% \paragraph{Attached source.}
-%
-% The PDF documentation on CTAN also includes the
-% \xfile{.dtx} source file. It can be extracted by
-% AcrobatReader 6 or higher. Another option is \textsf{pdftk},
-% e.g. unpack the file into the current directory:
-% \begin{quote}
-%   \verb|pdftk kvdefinekeys.pdf unpack_files output .|
-% \end{quote}
-%
 % \paragraph{Unpacking with \LaTeX.}
 % The \xfile{.dtx} chooses its action depending on the format:
 % \begin{description}
@@ -716,42 +710,6 @@ and the derived files
 %\end{verbatim}
 % \end{quote}
 %
-% \section{Catalogue}
-%
-% The following XML file can be used as source for the
-% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
-% The elements \texttt{caption} and \texttt{description} are imported
-% from the original XML file from the Catalogue.
-% The name of the XML file in the Catalogue is \xfile{kvdefinekeys.xml}.
-%    \begin{macrocode}
-%<*catalogue>
-<?xml version='1.0' encoding='us-ascii'?>
-<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
-<entry datestamp='$Date$' modifier='$Author$' id='kvdefinekeys'>
-  <name>kvdefinekeys</name>
-  <caption>Define keys for use in the kvsetkeys package.</caption>
-  <authorref id='auth:oberdiek'/>
-  <copyright owner='Heiko Oberdiek' year='2010,2011'/>
-  <license type='lppl1.3'/>
-  <version number='1.4'/>
-  <description>
-    The package provides a macro <tt>\kv@define@key</tt> (analogous to
-    <xref refid='keyval'>keyval&#x2019;s</xref> <tt>\define@key</tt>, to
-    define keys for use by <xref refid='kvsetkeys'>kvsetkeys</xref>.
-    <p/>
-    The package is part of the <xref refid='oberdiek'>oberdiek</xref>
-    bundle.
-  </description>
-  <documentation details='Package documentation'
-      href='ctan:/macros/latex/contrib/oberdiek/kvdefinekeys.pdf'/>
-  <ctan file='true' path='/macros/latex/contrib/oberdiek/kvdefinekeys.dtx'/>
-  <miktex location='oberdiek'/>
-  <texlive location='oberdiek'/>
-  <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
-</entry>
-%</catalogue>
-%    \end{macrocode}
-%
 % \begin{thebibliography}{9}
 % \bibitem{keyval}
 %   David Carlisle:
diff --git a/macros/latex/contrib/oberdiek/kvdefinekeys.pdf b/macros/latex/contrib/oberdiek/kvdefinekeys.pdf
index 17f25ce18d..51e4ac2df5 100644
--- a/macros/latex/contrib/oberdiek/kvdefinekeys.pdf
+++ b/macros/latex/contrib/oberdiek/kvdefinekeys.pdf
diff --git a/macros/latex/contrib/oberdiek/kvoptions.dtx b/macros/latex/contrib/oberdiek/kvoptions.dtx
index 07a40c307a..54e188aed2 100644
--- a/macros/latex/contrib/oberdiek/kvoptions.dtx
+++ b/macros/latex/contrib/oberdiek/kvoptions.dtx
@@ -13,15 +13,17 @@
 % conditions of the LaTeX Project Public License, either
 % version 1.3c of this license or (at your option) any later
 % version. This version of this license is in
-%    http://www.latex-project.org/lppl/lppl-1-3c.txt
+%    https://www.latex-project.org/lppl/lppl-1-3c.txt
 % and the latest version of this license is in
-%    http://www.latex-project.org/lppl.txt
+%    https://www.latex-project.org/lppl.txt
 % and version 1.3 or later is part of all distributions of
 % LaTeX version 2005/12/01 or later.
 %
 % This work has the LPPL maintenance status "maintained".
 %
-% This Current Maintainer of this work is Heiko Oberdiek.
+% The Current Maintainers of this work are
+% Heiko Oberdiek and the Oberdiek Package Support Group
+% https://github.com/ho-tex/oberdiek/issues
 %
 % This work consists of the main source file kvoptions.dtx
 % and the derived files
@@ -109,15 +111,18 @@ This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either
 version 1.3c of this license or (at your option) any later
 version. This version of this license is in
-   http://www.latex-project.org/lppl/lppl-1-3c.txt
+   https://www.latex-project.org/lppl/lppl-1-3c.txt
 and the latest version of this license is in
-   http://www.latex-project.org/lppl.txt
+   https://www.latex-project.org/lppl.txt
 and version 1.3 or later is part of all distributions of
 LaTeX version 2005/12/01 or later.
 
 This work has the LPPL maintenance status "maintained".
 
-This Current Maintainer of this work is Heiko Oberdiek.
+The Current Maintainers of this work are
+Heiko Oberdiek and the Oberdiek Package Support Group
+https://github.com/ho-tex/oberdiek/issues
+
 
 This work consists of the main source file kvoptions.dtx
 and the derived files
@@ -205,8 +210,7 @@ and the derived files
 % \title{The \xpackage{kvoptions} package}
 % \date{2016/05/16 v3.12}
 % \author{Heiko Oberdiek\thanks
-% {Please report any issues at https://github.com/ho-tex/oberdiek/issues}\\
-% \xemail{heiko.oberdiek at googlemail.com}}
+% {Please report any issues at \url{https://github.com/ho-tex/oberdiek/issues}}}
 %
 % \maketitle
 %
@@ -3041,7 +3045,7 @@ and the derived files
 % \subsection{Download}
 %
 % \paragraph{Package.} This package is available on
-% CTAN\footnote{\url{http://ctan.org/pkg/kvoptions}}:
+% CTAN\footnote{\CTANpkg{kvoptions}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/kvoptions.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/kvoptions.pdf}] Documentation.
@@ -3053,7 +3057,7 @@ and the derived files
 % the packages are already unpacked and the documentation files
 % are generated. The files and directories obey the TDS standard.
 % \begin{description}
-% \item[\CTAN{install/macros/latex/contrib/oberdiek.tds.zip}]
+% \item[\CTANinstall{install/macros/latex/contrib/oberdiek.tds.zip}]
 % \end{description}
 % \emph{TDS} refers to the standard ``A Directory Structure
 % for \TeX\ Files'' (\CTAN{tds/tds.pdf}). Directories
@@ -3179,16 +3183,6 @@ and the derived files
 %
 % \subsection{Some details for the interested}
 %
-% \paragraph{Attached source.}
-%
-% The PDF documentation on CTAN also includes the
-% \xfile{.dtx} source file. It can be extracted by
-% AcrobatReader 6 or higher. Another option is \textsf{pdftk},
-% e.g. unpack the file into the current directory:
-% \begin{quote}
-%   \verb|pdftk kvoptions.pdf unpack_files output .|
-% \end{quote}
-%
 % \paragraph{Unpacking with \LaTeX.}
 % The \xfile{.dtx} chooses its action depending on the format:
 % \begin{description}
@@ -3224,71 +3218,31 @@ and the derived files
 %\end{verbatim}
 % \end{quote}
 %
-% \section{Catalogue}
-%
-% The following XML file can be used as source for the
-% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
-% The elements \texttt{caption} and \texttt{description} are imported
-% from the original XML file from the Catalogue.
-% The name of the XML file in the Catalogue is \xfile{kvoptions.xml}.
-%    \begin{macrocode}
-%<*catalogue>
-<?xml version='1.0' encoding='us-ascii'?>
-<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
-<entry datestamp='$Date$' modifier='$Author$' id='kvoptions'>
-  <name>kvoptions</name>
-  <caption>Key value format for package options.</caption>
-  <authorref id='auth:oberdiek'/>
-  <copyright owner='Heiko Oberdiek' year='2004,2006,2007,2009-2011'/>
-  <license type='lppl1.3'/>
-  <version number='3.12'/>
-  <description>
-    This package offers support for package authors who want to
-    use options in key-value format for their package options.
-    <p/>
-    The package is part of the <xref refid='oberdiek'>oberdiek</xref> bundle.
-  </description>
-  <documentation details='Package documentation'
-      href='ctan:/macros/latex/contrib/oberdiek/kvoptions.pdf'/>
-  <ctan file='true' path='/macros/latex/contrib/oberdiek/kvoptions.dtx'/>
-  <miktex location='oberdiek'/>
-  <texlive location='oberdiek'/>
-  <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
-</entry>
-%</catalogue>
-%    \end{macrocode}
-%
-% \newcommand*{\bibpackage}[4]{^^A
-%   \bibitem{#1}
-%   Package \xpackage{#1}, #2, #3.^^A
-%   \ifx\\#4\\\else\space#4\fi\par
-% }
-%
 % \begin{thebibliography}{99}
 % \bibitem{tb94wright}
 %   A guide to key-value methods, Joseph Wright, second draft for
-%   \href{http://www.tug.org/tugboat}{TUGBoat}, 2009-03-17.
-%   \url{http://www.texdev.net/wp-content/uploads/2009/03/keyval.pdf}
+%   \href{https://www.tug.org/tugboat}{TUGBoat}, 2009-03-17.
+%   \url{https://www.texdev.net/uploads/2009/03/keyval.pdf}
 % \bibpackage{ifthen}{David Carlisle}{2001/05/26}
-%   {\CTAN{macros/latex/base/ifthen.dtx}}
+%   {\CTANpkg{ifthen}}
 % \bibpackage{helvet}{Sebastian Rahtz, Walter Schmidt}{2004/01/26}
-%   {\CTAN{macros/latex/required/psnfss/psfonts.dtx}}
+%   {\CTANpkg{psfonts}}
 % \bibpackage{hyperref}{Sebastian Rahtz, Heiko Oberdiek}{2006/02/12}
-%   {\CTAN{macros/latex/contrib/hyperref/}}
+%   {\CTANpkg{hyperref}}
 % \bibpackage{keyval}{David Carlisle}{1999/03/16}
-%   {\CTAN{macros/latex/required/graphics/keyval.dtx}}
+%   {\CTANpkg{keyval}}
 % \bibpackage{multicol}{Frank Mittelbach}{2004/02/14}
-%   {\CTAN{macros/latex/required/tools/multicol.dtx}}
+%   {\CTANpkg{multicol}}
 % \bibpackage{tabularx}{David Carlisle}{1999/01/07}
-%   {\CTAN{macros/latex/required/tools/tabularx.dtx}}
+%   {\CTANpkg{tabularx}}
 % \bibpackage{tracefnt}{Frank Mittelbach, Rainer Sch\"opf}{1997/05/29}
-%   {\CTAN{macros/latex/base/ltfsstrc.dtx}}
+%   {\CTANpkg{latex-base}}
 % \bibpackage{xkeyval}{Hendri Adriaens}{2005/05/07}
-%   {\CTAN{macros/latex/contrib/xkeyval/}}
+%   {\CTANpkg{xkeyval}}
 % \bibitem{clsguide}
 %   The \LaTeX3 Project, \textit{\LaTeXe\ for class and package writers},
 %   2003/12/09.
-%   \CTAN{macros/latex/doc/clsguide.pdf}
+%   \CTANpkg{clsguide}
 %
 % \end{thebibliography}
 %
diff --git a/macros/latex/contrib/oberdiek/kvoptions.pdf b/macros/latex/contrib/oberdiek/kvoptions.pdf
index 6e390c523a..c4dea083e3 100644
--- a/macros/latex/contrib/oberdiek/kvoptions.pdf
+++ b/macros/latex/contrib/oberdiek/kvoptions.pdf
diff --git a/macros/latex/contrib/oberdiek/kvsetkeys.dtx b/macros/latex/contrib/oberdiek/kvsetkeys.dtx
index 9c07858dd8..a467e2e8fb 100644
--- a/macros/latex/contrib/oberdiek/kvsetkeys.dtx
+++ b/macros/latex/contrib/oberdiek/kvsetkeys.dtx
@@ -13,15 +13,17 @@
 % conditions of the LaTeX Project Public License, either
 % version 1.3c of this license or (at your option) any later
 % version. This version of this license is in
-%    http://www.latex-project.org/lppl/lppl-1-3c.txt
+%    https://www.latex-project.org/lppl/lppl-1-3c.txt
 % and the latest version of this license is in
-%    http://www.latex-project.org/lppl.txt
+%    https://www.latex-project.org/lppl.txt
 % and version 1.3 or later is part of all distributions of
 % LaTeX version 2005/12/01 or later.
 %
 % This work has the LPPL maintenance status "maintained".
 %
-% This Current Maintainer of this work is Heiko Oberdiek.
+% The Current Maintainers of this work are
+% Heiko Oberdiek and the Oberdiek Package Support Group
+% https://github.com/ho-tex/oberdiek/issues
 %
 % The Base Interpreter refers to any `TeX-Format',
 % because some files are installed in TDS:tex/generic//.
@@ -109,15 +111,18 @@ This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either
 version 1.3c of this license or (at your option) any later
 version. This version of this license is in
-   http://www.latex-project.org/lppl/lppl-1-3c.txt
+   https://www.latex-project.org/lppl/lppl-1-3c.txt
 and the latest version of this license is in
-   http://www.latex-project.org/lppl.txt
+   https://www.latex-project.org/lppl.txt
 and version 1.3 or later is part of all distributions of
 LaTeX version 2005/12/01 or later.
 
 This work has the LPPL maintenance status "maintained".
 
-This Current Maintainer of this work is Heiko Oberdiek.
+The Current Maintainers of this work are
+Heiko Oberdiek and the Oberdiek Package Support Group
+https://github.com/ho-tex/oberdiek/issues
+
 
 The Base Interpreter refers to any `TeX-Format',
 because some files are installed in TDS:tex/generic//.
@@ -205,8 +210,7 @@ and the derived files
 % \title{The \xpackage{kvsetkeys} package}
 % \date{2016/05/16 v1.17}
 % \author{Heiko Oberdiek\thanks
-% {Please report any issues at https://github.com/ho-tex/oberdiek/issues}\\
-% \xemail{heiko.oberdiek at googlemail.com}}
+% {Please report any issues at \url{https://github.com/ho-tex/oberdiek/issues}}}
 %
 % \maketitle
 %
@@ -1859,7 +1863,7 @@ $ \x
 % \subsection{Download}
 %
 % \paragraph{Package.} This package is available on
-% CTAN\footnote{\url{http://ctan.org/pkg/kvsetkeys}}:
+% CTAN\footnote{\CTANpkg{kvsetkeys}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/kvsetkeys.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/kvsetkeys.pdf}] Documentation.
@@ -1871,7 +1875,7 @@ $ \x
 % the packages are already unpacked and the documentation files
 % are generated. The files and directories obey the TDS standard.
 % \begin{description}
-% \item[\CTAN{install/macros/latex/contrib/oberdiek.tds.zip}]
+% \item[\CTANinstall{install/macros/latex/contrib/oberdiek.tds.zip}]
 % \end{description}
 % \emph{TDS} refers to the standard ``A Directory Structure
 % for \TeX\ Files'' (\CTAN{tds/tds.pdf}). Directories
@@ -1995,16 +1999,6 @@ $ \x
 %
 % \subsection{Some details for the interested}
 %
-% \paragraph{Attached source.}
-%
-% The PDF documentation on CTAN also includes the
-% \xfile{.dtx} source file. It can be extracted by
-% AcrobatReader 6 or higher. Another option is \textsf{pdftk},
-% e.g. unpack the file into the current directory:
-% \begin{quote}
-%   \verb|pdftk kvsetkeys.pdf unpack_files output .|
-% \end{quote}
-%
 % \paragraph{Unpacking with \LaTeX.}
 % The \xfile{.dtx} chooses its action depending on the format:
 % \begin{description}
@@ -2040,55 +2034,17 @@ $ \x
 %\end{verbatim}
 % \end{quote}
 %
-% \section{Catalogue}
-%
-% The following XML file can be used as source for the
-% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
-% The elements \texttt{caption} and \texttt{description} are imported
-% from the original XML file from the Catalogue.
-% The name of the XML file in the Catalogue is \xfile{kvsetkeys.xml}.
-%    \begin{macrocode}
-%<*catalogue>
-<?xml version='1.0' encoding='us-ascii'?>
-<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
-<entry datestamp='$Date$' modifier='$Author$' id='kvsetkeys'>
-  <name>kvsetkeys</name>
-  <caption>Key value parser with default handler support.</caption>
-  <authorref id='auth:oberdiek'/>
-  <copyright owner='Heiko Oberdiek' year='2006,2007,2009-2012'/>
-  <license type='lppl1.3'/>
-  <version number='1.17'/>
-  <description>
-    This package provides \kvsetkeys, a variant of package
-    <xref refid='keyval'>keyval</xref>'s <tt>\setkeys</tt>.  It allows
-    the user to specify a handler that deals with unknown options.
-    Active commas and equal signs may be used (e.g. see
-    <xref refid='babel'>babel</xref>'s shorthands) and only one level
-    of curly braces are removed from the values.
-    <p/>
-    The package is part of the <xref refid='oberdiek'>oberdiek</xref> bundle.
-  </description>
-  <documentation details='Package documentation'
-      href='ctan:/macros/latex/contrib/oberdiek/kvsetkeys.pdf'/>
-  <ctan file='true' path='/macros/latex/contrib/oberdiek/kvsetkeys.dtx'/>
-  <miktex location='oberdiek'/>
-  <texlive location='oberdiek'/>
-  <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
-</entry>
-%</catalogue>
-%    \end{macrocode}
-%
 % \begin{thebibliography}{9}
 % \bibitem{tb94wright}
 %   A guide to key-value methods, Joseph Wright, second draft for
-%   \href{http://www.tug.org/tugboat}{TUGBoat}, 2009-03-17.
-%   \url{http://www.texdev.net/wp-content/uploads/2009/03/keyval.pdf}
+%   \href{https://www.tug.org/tugboat}{TUGBoat}, 2009-03-17.
+%   \url{https://www.texdev.net/uploads/2009/03/keyval.pdf}
 %
 % \bibitem{keyval}
 %   David Carlisle:
 %   \textit{The \xpackage{keyval} package};
 %   1999/03/16 v1.13;
-%   \CTAN{macros/latex/required/graphics/keyval.dtx}.
+%   \CTANpkg{keyval}.
 %
 % \end{thebibliography}
 %
diff --git a/macros/latex/contrib/oberdiek/kvsetkeys.pdf b/macros/latex/contrib/oberdiek/kvsetkeys.pdf
index 41f5b67088..2a9dfc7751 100644
--- a/macros/latex/contrib/oberdiek/kvsetkeys.pdf
+++ b/macros/latex/contrib/oberdiek/kvsetkeys.pdf
diff --git a/macros/latex/contrib/oberdiek/letltxmacro.dtx b/macros/latex/contrib/oberdiek/letltxmacro.dtx
index 7e61c000f3..8b0440d361 100644
--- a/macros/latex/contrib/oberdiek/letltxmacro.dtx
+++ b/macros/latex/contrib/oberdiek/letltxmacro.dtx
@@ -13,15 +13,17 @@
 % conditions of the LaTeX Project Public License, either
 % version 1.3c of this license or (at your option) any later
 % version. This version of this license is in
-%    http://www.latex-project.org/lppl/lppl-1-3c.txt
+%    https://www.latex-project.org/lppl/lppl-1-3c.txt
 % and the latest version of this license is in
-%    http://www.latex-project.org/lppl.txt
+%    https://www.latex-project.org/lppl.txt
 % and version 1.3 or later is part of all distributions of
 % LaTeX version 2005/12/01 or later.
 %
 % This work has the LPPL maintenance status "maintained".
 %
-% This Current Maintainer of this work is Heiko Oberdiek.
+% The Current Maintainers of this work are
+% Heiko Oberdiek and the Oberdiek Package Support Group
+% https://github.com/ho-tex/oberdiek/issues
 %
 % This work consists of the main source file letltxmacro.dtx
 % and the derived files
@@ -103,15 +105,18 @@ This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either
 version 1.3c of this license or (at your option) any later
 version. This version of this license is in
-   http://www.latex-project.org/lppl/lppl-1-3c.txt
+   https://www.latex-project.org/lppl/lppl-1-3c.txt
 and the latest version of this license is in
-   http://www.latex-project.org/lppl.txt
+   https://www.latex-project.org/lppl.txt
 and version 1.3 or later is part of all distributions of
 LaTeX version 2005/12/01 or later.
 
 This work has the LPPL maintenance status "maintained".
 
-This Current Maintainer of this work is Heiko Oberdiek.
+The Current Maintainers of this work are
+Heiko Oberdiek and the Oberdiek Package Support Group
+https://github.com/ho-tex/oberdiek/issues
+
 
 This work consists of the main source file letltxmacro.dtx
 and the derived files
@@ -193,8 +198,7 @@ and the derived files
 % \title{The \xpackage{letltxmacro} package}
 % \date{2016/05/16 v1.5}
 % \author{Heiko Oberdiek\thanks
-% {Please report any issues at https://github.com/ho-tex/oberdiek/issues}\\
-% \xemail{heiko.oberdiek at googlemail.com}}
+% {Please report any issues at \url{https://github.com/ho-tex/oberdiek/issues}}}
 %
 % \maketitle
 %
@@ -958,7 +962,7 @@ and the derived files
 % \subsection{Download}
 %
 % \paragraph{Package.} This package is available on
-% CTAN\footnote{\url{http://ctan.org/pkg/letltxmacro}}:
+% CTAN\footnote{\CTANpkg{letltxmacro}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/letltxmacro.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/letltxmacro.pdf}] Documentation.
@@ -970,7 +974,7 @@ and the derived files
 % the packages are already unpacked and the documentation files
 % are generated. The files and directories obey the TDS standard.
 % \begin{description}
-% \item[\CTAN{install/macros/latex/contrib/oberdiek.tds.zip}]
+% \item[\CTANinstall{install/macros/latex/contrib/oberdiek.tds.zip}]
 % \end{description}
 % \emph{TDS} refers to the standard ``A Directory Structure
 % for \TeX\ Files'' (\CTAN{tds/tds.pdf}). Directories
@@ -1092,16 +1096,6 @@ and the derived files
 %
 % \subsection{Some details for the interested}
 %
-% \paragraph{Attached source.}
-%
-% The PDF documentation on CTAN also includes the
-% \xfile{.dtx} source file. It can be extracted by
-% AcrobatReader 6 or higher. Another option is \textsf{pdftk},
-% e.g. unpack the file into the current directory:
-% \begin{quote}
-%   \verb|pdftk letltxmacro.pdf unpack_files output .|
-% \end{quote}
-%
 % \paragraph{Unpacking with \LaTeX.}
 % The \xfile{.dtx} chooses its action depending on the format:
 % \begin{description}
@@ -1137,44 +1131,6 @@ and the derived files
 %\end{verbatim}
 % \end{quote}
 %
-% \section{Catalogue}
-%
-% The following XML file can be used as source for the
-% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
-% The elements \texttt{caption} and \texttt{description} are imported
-% from the original XML file from the Catalogue.
-% The name of the XML file in the Catalogue is \xfile{letltxmacro.xml}.
-%    \begin{macrocode}
-%<*catalogue>
-<?xml version='1.0' encoding='us-ascii'?>
-<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
-<entry datestamp='$Date$' modifier='$Author$' id='letltxmacro'>
-  <name>letltxmacro</name>
-  <caption>Let assignment for LaTeX macros.</caption>
-  <authorref id='auth:oberdiek'/>
-  <copyright owner='Heiko Oberdiek' year='2008,2010'/>
-  <license type='lppl1.3'/>
-  <version number='1.5'/>
-  <description>
-    TeX&#x2019;s <tt>\let</tt> assignment does not work for LaTeX macros
-    with optional arguments or for macros that are defined
-    as robust macros by <tt>\DeclareRobustCommand</tt>.  This package
-    defines <tt>\LetLtxMacro</tt> that also takes care of the involved
-    internal macros.
-    <p/>
-    The package is part of the <xref refid='oberdiek'>oberdiek</xref>
-    bundle.
-  </description>
-  <documentation details='Package documentation'
-      href='ctan:/macros/latex/contrib/oberdiek/letltxmacro.pdf'/>
-  <ctan file='true' path='/macros/latex/contrib/oberdiek/letltxmacro.dtx'/>
-  <miktex location='oberdiek'/>
-  <texlive location='oberdiek'/>
-  <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
-</entry>
-%</catalogue>
-%    \end{macrocode}
-%
 % \begin{History}
 %   \begin{Version}{2008/06/09 v1.0}
 %   \item
diff --git a/macros/latex/contrib/oberdiek/letltxmacro.pdf b/macros/latex/contrib/oberdiek/letltxmacro.pdf
index fbac567c5e..be2595a9a4 100644
--- a/macros/latex/contrib/oberdiek/letltxmacro.pdf
+++ b/macros/latex/contrib/oberdiek/letltxmacro.pdf
diff --git a/macros/latex/contrib/oberdiek/listingsutf8.dtx b/macros/latex/contrib/oberdiek/listingsutf8.dtx
index 1a07e24615..bc0389081d 100644
--- a/macros/latex/contrib/oberdiek/listingsutf8.dtx
+++ b/macros/latex/contrib/oberdiek/listingsutf8.dtx
@@ -13,15 +13,17 @@
 % conditions of the LaTeX Project Public License, either
 % version 1.3c of this license or (at your option) any later
 % version. This version of this license is in
-%    http://www.latex-project.org/lppl/lppl-1-3c.txt
+%    https://www.latex-project.org/lppl/lppl-1-3c.txt
 % and the latest version of this license is in
-%    http://www.latex-project.org/lppl.txt
+%    https://www.latex-project.org/lppl.txt
 % and version 1.3 or later is part of all distributions of
 % LaTeX version 2005/12/01 or later.
 %
 % This work has the LPPL maintenance status "maintained".
 %
-% This Current Maintainer of this work is Heiko Oberdiek.
+% The Current Maintainers of this work are
+% Heiko Oberdiek and the Oberdiek Package Support Group
+% https://github.com/ho-tex/oberdiek/issues
 %
 % This work consists of the main source file listingsutf8.dtx
 % and the derived files
@@ -106,15 +108,18 @@ This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either
 version 1.3c of this license or (at your option) any later
 version. This version of this license is in
-   http://www.latex-project.org/lppl/lppl-1-3c.txt
+   https://www.latex-project.org/lppl/lppl-1-3c.txt
 and the latest version of this license is in
-   http://www.latex-project.org/lppl.txt
+   https://www.latex-project.org/lppl.txt
 and version 1.3 or later is part of all distributions of
 LaTeX version 2005/12/01 or later.
 
 This work has the LPPL maintenance status "maintained".
 
-This Current Maintainer of this work is Heiko Oberdiek.
+The Current Maintainers of this work are
+Heiko Oberdiek and the Oberdiek Package Support Group
+https://github.com/ho-tex/oberdiek/issues
+
 
 This work consists of the main source file listingsutf8.dtx
 and the derived files
@@ -198,8 +203,7 @@ and the derived files
 % \title{The \xpackage{listingsutf8} package}
 % \date{2016/05/16 v1.3}
 % \author{Heiko Oberdiek\thanks
-% {Please report any issues at https://github.com/ho-tex/oberdiek/issues}\\
-% \xemail{heiko.oberdiek at googlemail.com}}
+% {Please report any issues at \url{https://github.com/ho-tex/oberdiek/issues}}}
 %
 % \maketitle
 %
@@ -591,7 +595,7 @@ public class ExampleUTF8 {
 % \subsection{Download}
 %
 % \paragraph{Package.} This package is available on
-% CTAN\footnote{\url{http://ctan.org/pkg/listingsutf8}}:
+% CTAN\footnote{\CTANpkg{listingsutf8}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/listingsutf8.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/listingsutf8.pdf}] Documentation.
@@ -603,7 +607,7 @@ public class ExampleUTF8 {
 % the packages are already unpacked and the documentation files
 % are generated. The files and directories obey the TDS standard.
 % \begin{description}
-% \item[\CTAN{install/macros/latex/contrib/oberdiek.tds.zip}]
+% \item[\CTANinstall{install/macros/latex/contrib/oberdiek.tds.zip}]
 % \end{description}
 % \emph{TDS} refers to the standard ``A Directory Structure
 % for \TeX\ Files'' (\CTAN{tds/tds.pdf}). Directories
@@ -727,16 +731,6 @@ public class ExampleUTF8 {
 %
 % \subsection{Some details for the interested}
 %
-% \paragraph{Attached source.}
-%
-% The PDF documentation on CTAN also includes the
-% \xfile{.dtx} source file. It can be extracted by
-% AcrobatReader 6 or higher. Another option is \textsf{pdftk},
-% e.g. unpack the file into the current directory:
-% \begin{quote}
-%   \verb|pdftk listingsutf8.pdf unpack_files output .|
-% \end{quote}
-%
 % \paragraph{Unpacking with \LaTeX.}
 % The \xfile{.dtx} chooses its action depending on the format:
 % \begin{description}
@@ -772,44 +766,6 @@ public class ExampleUTF8 {
 %\end{verbatim}
 % \end{quote}
 %
-% \section{Catalogue}
-%
-% The following XML file can be used as source for the
-% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
-% The elements \texttt{caption} and \texttt{description} are imported
-% from the original XML file from the Catalogue.
-% The name of the XML file in the Catalogue is \xfile{listingsutf8.xml}.
-%    \begin{macrocode}
-%<*catalogue>
-<?xml version='1.0' encoding='us-ascii'?>
-<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
-<entry datestamp='$Date$' modifier='$Author$' id='listingsutf8'>
-  <name>listingsutf8</name>
-  <caption>Allow UTF-8 in listings input.</caption>
-  <authorref id='auth:oberdiek'/>
-  <copyright owner='Heiko Oberdiek' year='2007,2011'/>
-  <license type='lppl1.3'/>
-  <version number='1.3'/>
-  <description>
-    Package <xref refid='listings'>listings</xref> does not support files
-    with multi-byte encodings such as UTF-8.  In the case of
-    <tt>\lstinputlisting</tt>, a simple workaround is possible if a
-    one-byte encoding exists that the file can be converted to.  The
-    package requires the e-TeX extensions under pdfTeX (in either PDF
-    or DVI output mode).
-    <p/>
-    The package is part of the <xref refid='oberdiek'>oberdiek</xref> bundle.
-  </description>
-  <documentation details='Package documentation'
-      href='ctan:/macros/latex/contrib/oberdiek/listingsutf8.pdf'/>
-  <ctan file='true' path='/macros/latex/contrib/oberdiek/listingsutf8.dtx'/>
-  <miktex location='oberdiek'/>
-  <texlive location='oberdiek'/>
-  <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
-</entry>
-%</catalogue>
-%    \end{macrocode}
-%
 % \begin{thebibliography}{9}
 %
 % \bibitem{inputenc}
@@ -821,7 +777,7 @@ public class ExampleUTF8 {
 %   Carsten Heinz, Brooks Moses:
 %  \textit{The \xpackage{listings} package};
 %   2007/02/22;\\
-%   \CTAN{macros/latex/contrib/listings/}.
+%   \CTANpkg{listings}.
 %
 % \bibitem{stringenc}
 %   Heiko Oberdiek:
diff --git a/macros/latex/contrib/oberdiek/listingsutf8.pdf b/macros/latex/contrib/oberdiek/listingsutf8.pdf
index 2563deba47..3da5802937 100644
--- a/macros/latex/contrib/oberdiek/listingsutf8.pdf
+++ b/macros/latex/contrib/oberdiek/listingsutf8.pdf
diff --git a/macros/latex/contrib/oberdiek/ltxcmds.dtx b/macros/latex/contrib/oberdiek/ltxcmds.dtx
index 77f96cb44d..9dfd932ed7 100644
--- a/macros/latex/contrib/oberdiek/ltxcmds.dtx
+++ b/macros/latex/contrib/oberdiek/ltxcmds.dtx
@@ -13,15 +13,17 @@
 % conditions of the LaTeX Project Public License, either
 % version 1.3c of this license or (at your option) any later
 % version. This version of this license is in
-%    http://www.latex-project.org/lppl/lppl-1-3c.txt
+%    https://www.latex-project.org/lppl/lppl-1-3c.txt
 % and the latest version of this license is in
-%    http://www.latex-project.org/lppl.txt
+%    https://www.latex-project.org/lppl.txt
 % and version 1.3 or later is part of all distributions of
 % LaTeX version 2005/12/01 or later.
 %
 % This work has the LPPL maintenance status "maintained".
 %
-% This Current Maintainer of this work is Heiko Oberdiek.
+% The Current Maintainers of this work are
+% Heiko Oberdiek and the Oberdiek Package Support Group
+% https://github.com/ho-tex/oberdiek/issues
 %
 % The Base Interpreter refers to any `TeX-Format',
 % because some files are installed in TDS:tex/generic//.
@@ -112,15 +114,18 @@ This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either
 version 1.3c of this license or (at your option) any later
 version. This version of this license is in
-   http://www.latex-project.org/lppl/lppl-1-3c.txt
+   https://www.latex-project.org/lppl/lppl-1-3c.txt
 and the latest version of this license is in
-   http://www.latex-project.org/lppl.txt
+   https://www.latex-project.org/lppl.txt
 and version 1.3 or later is part of all distributions of
 LaTeX version 2005/12/01 or later.
 
 This work has the LPPL maintenance status "maintained".
 
-This Current Maintainer of this work is Heiko Oberdiek.
+The Current Maintainers of this work are
+Heiko Oberdiek and the Oberdiek Package Support Group
+https://github.com/ho-tex/oberdiek/issues
+
 
 The Base Interpreter refers to any `TeX-Format',
 because some files are installed in TDS:tex/generic//.
@@ -213,8 +218,7 @@ and the derived files
 % \title{The \xpackage{ltxcmds} package}
 % \date{2016/05/16 v1.23}
 % \author{Heiko Oberdiek\thanks
-% {Please report any issues at https://github.com/ho-tex/oberdiek/issues}\\
-% \xemail{heiko.oberdiek at googlemail.com}}
+% {Please report any issues at \url{https://github.com/ho-tex/oberdiek/issues}}}
 %
 % \maketitle
 %
@@ -2906,7 +2910,7 @@ X=%
 % \subsection{Download}
 %
 % \paragraph{Package.} This package is available on
-% CTAN\footnote{\url{http://ctan.org/pkg/ltxcmds}}:
+% CTAN\footnote{\CTANpkg{ltxcmds}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/ltxcmds.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/ltxcmds.pdf}] Documentation.
@@ -2918,7 +2922,7 @@ X=%
 % the packages are already unpacked and the documentation files
 % are generated. The files and directories obey the TDS standard.
 % \begin{description}
-% \item[\CTAN{install/macros/latex/contrib/oberdiek.tds.zip}]
+% \item[\CTANinstall{install/macros/latex/contrib/oberdiek.tds.zip}]
 % \end{description}
 % \emph{TDS} refers to the standard ``A Directory Structure
 % for \TeX\ Files'' (\CTAN{tds/tds.pdf}). Directories
@@ -3044,16 +3048,6 @@ X=%
 %
 % \subsection{Some details for the interested}
 %
-% \paragraph{Attached source.}
-%
-% The PDF documentation on CTAN also includes the
-% \xfile{.dtx} source file. It can be extracted by
-% AcrobatReader 6 or higher. Another option is \textsf{pdftk},
-% e.g. unpack the file into the current directory:
-% \begin{quote}
-%   \verb|pdftk ltxcmds.pdf unpack_files output .|
-% \end{quote}
-%
 % \paragraph{Unpacking with \LaTeX.}
 % The \xfile{.dtx} chooses its action depending on the format:
 % \begin{description}
@@ -3089,42 +3083,6 @@ X=%
 %\end{verbatim}
 % \end{quote}
 %
-% \section{Catalogue}
-%
-% The following XML file can be used as source for the
-% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
-% The elements \texttt{caption} and \texttt{description} are imported
-% from the original XML file from the Catalogue.
-% The name of the XML file in the Catalogue is \xfile{ltxcmds.xml}.
-%    \begin{macrocode}
-%<*catalogue>
-<?xml version='1.0' encoding='us-ascii'?>
-<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
-<entry datestamp='$Date$' modifier='$Author$' id='ltxcmds'>
-  <name>ltxcmds</name>
-  <caption>Some LaTeX kernel commands for general use.</caption>
-  <authorref id='auth:oberdiek'/>
-  <copyright owner='Heiko Oberdiek' year='2009-2011'/>
-  <license type='lppl1.3'/>
-  <version number='1.23'/>
-  <description>
-    This package exports some utility macros
-    from the LaTeX kernel into a separate namespace and
-    also makes them available for other formats such as plain TeX.
-    <p/>
-    The package is part of the <xref refid='oberdiek'>oberdiek</xref>
-    bundle.
-  </description>
-  <documentation details='Package documentation'
-      href='ctan:/macros/latex/contrib/oberdiek/ltxcmds.pdf'/>
-  <ctan file='true' path='/macros/latex/contrib/oberdiek/ltxcmds.dtx'/>
-  <miktex location='oberdiek'/>
-  <texlive location='oberdiek'/>
-  <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
-</entry>
-%</catalogue>
-%    \end{macrocode}
-%
 % \begin{thebibliography}{9}
 % \raggedright
 %
@@ -3136,7 +3094,7 @@ X=%
 % \url{news:3eef1ada_6@corp.newsgroups.com},
 % 2003-06-17.\\
 % {\small
-% \url{http://groups.google.com/group/comp.text.tex/msg/be03a159ec374895}}
+% \url{https://groups.google.com/group/comp.text.tex/msg/be03a159ec374895}}
 %
 % \bibitem{ifnull:diez}
 % Ulrich Diez:
@@ -3145,7 +3103,7 @@ X=%
 % \url{news:ibk3t8$ee7$1@news.albasani.net},
 % 2010-11-12.\\
 % {\small
-% \url{http://groups.google.com/group/comp.text.tex/msg/803bd57221a04996}}
+% \url{https://groups.google.com/group/comp.text.tex/msg/803bd57221a04996}}
 %
 % \bibitem{ifstrempty:musa}
 % Ahmed Musa:
@@ -3154,7 +3112,7 @@ X=%
 % \url{news:f5496afe-40ed-42bd-b629-a2419ecf7c0d@o14g2000prn.googlegroups.com},
 % 2010-12-03.\\
 % {\small
-% \url{http://groups.google.com/group/comp.text.tex/msg/fbf7d61a0c3a807d}}
+% \url{https://groups.google.com/group/comp.text.tex/msg/fbf7d61a0c3a807d}}
 %
 % \bibitem{ifstrempty:diez1}
 % Ulrich Diez:
@@ -3163,7 +3121,7 @@ X=%
 % \url{news:idbo94$uka$1@four.albasani.net},
 % 2010-12-03.\\
 % {\small
-% \url{http://groups.google.com/group/comp.text.tex/msg/0c230ee479487962}}
+% \url{https://groups.google.com/group/comp.text.tex/msg/0c230ee479487962}}
 %
 % \bibitem{ifstrempty:diez2}
 % Ulrich Diez:
@@ -3172,7 +3130,7 @@ X=%
 % \url{news:idbpu4$cg1$1@news.albasani.net},
 % 2010-12-03.\\
 % {\small
-% \url{http://groups.google.com/group/comp.text.tex/msg/bbef4263390d647b}}
+% \url{https://groups.google.com/group/comp.text.tex/msg/bbef4263390d647b}}
 %
 % \bibitem{ifstrempty:diez3}
 % Ulrich Diez:
@@ -3181,7 +3139,7 @@ X=%
 % \url{news:idd4ga$r83$1@four.albasani.net},
 % 2010-12-04.\\
 % {\small
-% \url{http://groups.google.com/group/comp.text.tex/msg/00dfd1ec103cd272}}
+% \url{https://groups.google.com/group/comp.text.tex/msg/00dfd1ec103cd272}}
 %
 % \bibitem{ifstrempty:gl}
 % GL:
@@ -3190,7 +3148,7 @@ X=%
 % \url{news:4cfa2e27$0$7389$426a74cc@news.free.fr},
 % 2010-12-04.\\
 % {\small
-% \url{http://groups.google.com/group/comp.text.tex/msg/d3a75995c1cf267e}}
+% \url{https://groups.google.com/group/comp.text.tex/msg/d3a75995c1cf267e}}
 %
 % \bibitem{ifstrempty:ho}
 % Heiko Oberdiek:
@@ -3199,7 +3157,7 @@ X=%
 % \url{news:iddhq1$3kj$1@news.eternal-september.org},
 % 2010-12-04.\\
 % {\small
-% \url{http://groups.google.com/group/comp.text.tex/msg/5f7a23e3ab70e347}}
+% \url{https://groups.google.com/group/comp.text.tex/msg/5f7a23e3ab70e347}}
 %
 % \bibitem{ifboxempty:dak}
 % David Kastrup:
@@ -3207,7 +3165,7 @@ X=%
 % newsgroup \xnewsgroup{comp.text.tex},
 % 2011-02-04.\\
 % {\small
-% \url{http://groups.google.com/group/comp.text.tex/msg/8d3cb89496a4d86d}}
+% \url{https://groups.google.com/group/comp.text.tex/msg/8d3cb89496a4d86d}}
 %
 % \end{thebibliography}
 %
diff --git a/macros/latex/contrib/oberdiek/ltxcmds.pdf b/macros/latex/contrib/oberdiek/ltxcmds.pdf
index eacba25315..bc96f1bd42 100644
--- a/macros/latex/contrib/oberdiek/ltxcmds.pdf
+++ b/macros/latex/contrib/oberdiek/ltxcmds.pdf
diff --git a/macros/latex/contrib/oberdiek/luacolor.dtx b/macros/latex/contrib/oberdiek/luacolor.dtx
index 11bff2e38d..65959b4982 100644
--- a/macros/latex/contrib/oberdiek/luacolor.dtx
+++ b/macros/latex/contrib/oberdiek/luacolor.dtx
@@ -13,15 +13,17 @@
 % conditions of the LaTeX Project Public License, either
 % version 1.3c of this license or (at your option) any later
 % version. This version of this license is in
-%    http://www.latex-project.org/lppl/lppl-1-3c.txt
+%    https://www.latex-project.org/lppl/lppl-1-3c.txt
 % and the latest version of this license is in
-%    http://www.latex-project.org/lppl.txt
+%    https://www.latex-project.org/lppl.txt
 % and version 1.3 or later is part of all distributions of
 % LaTeX version 2005/12/01 or later.
 %
 % This work has the LPPL maintenance status "maintained".
 %
-% This Current Maintainer of this work is Heiko Oberdiek.
+% The Current Maintainers of this work are
+% Heiko Oberdiek and the Oberdiek Package Support Group
+% https://github.com/ho-tex/oberdiek/issues
 %
 % This work consists of the main source file luacolor.dtx
 % and the derived files
@@ -105,15 +107,18 @@ This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either
 version 1.3c of this license or (at your option) any later
 version. This version of this license is in
-   http://www.latex-project.org/lppl/lppl-1-3c.txt
+   https://www.latex-project.org/lppl/lppl-1-3c.txt
 and the latest version of this license is in
-   http://www.latex-project.org/lppl.txt
+   https://www.latex-project.org/lppl.txt
 and version 1.3 or later is part of all distributions of
 LaTeX version 2005/12/01 or later.
 
 This work has the LPPL maintenance status "maintained".
 
-This Current Maintainer of this work is Heiko Oberdiek.
+The Current Maintainers of this work are
+Heiko Oberdiek and the Oberdiek Package Support Group
+https://github.com/ho-tex/oberdiek/issues
+
 
 This work consists of the main source file luacolor.dtx
 and the derived files
@@ -215,8 +220,7 @@ and the derived files
 % \title{The \xpackage{luacolor} package}
 % \date{2019/07/25 v1.12}
 % \author{Heiko Oberdiek\thanks
-% {Please report any issues at https://github.com/ho-tex/oberdiek/issues}\\
-% \xemail{heiko.oberdiek at googlemail.com}}
+% {Please report any issues at \url{https://github.com/ho-tex/oberdiek/issues}}}
 %
 % \maketitle
 %
@@ -990,7 +994,7 @@ end
 % \subsection{Download}
 %
 % \paragraph{Package.} This package is available on
-% CTAN\footnote{\url{http://ctan.org/pkg/luacolor}}:
+% CTAN\footnote{\CTANpkg{luacolor}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/luacolor.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/luacolor.pdf}] Documentation.
@@ -1002,7 +1006,7 @@ end
 % the packages are already unpacked and the documentation files
 % are generated. The files and directories obey the TDS standard.
 % \begin{description}
-% \item[\CTAN{install/macros/latex/contrib/oberdiek.tds.zip}]
+% \item[\CTANinstall{install/macros/latex/contrib/oberdiek.tds.zip}]
 % \end{description}
 % \emph{TDS} refers to the standard ``A Directory Structure
 % for \TeX\ Files'' (\CTAN{tds/tds.pdf}). Directories
@@ -1122,16 +1126,6 @@ end
 %
 % \subsection{Some details for the interested}
 %
-% \paragraph{Attached source.}
-%
-% The PDF documentation on CTAN also includes the
-% \xfile{.dtx} source file. It can be extracted by
-% AcrobatReader 6 or higher. Another option is \textsf{pdftk},
-% e.g. unpack the file into the current directory:
-% \begin{quote}
-%   \verb|pdftk luacolor.pdf unpack_files output .|
-% \end{quote}
-%
 % \paragraph{Unpacking with \LaTeX.}
 % The \xfile{.dtx} chooses its action depending on the format:
 % \begin{description}
@@ -1167,40 +1161,6 @@ end
 %\end{verbatim}
 % \end{quote}
 %
-% \section{Catalogue}
-%
-% The following XML file can be used as source for the
-% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
-% The elements \texttt{caption} and \texttt{description} are imported
-% from the original XML file from the Catalogue.
-% The name of the XML file in the Catalogue is \xfile{luacolor.xml}.
-%    \begin{macrocode}
-%<*catalogue>
-<?xml version='1.0' encoding='us-ascii'?>
-<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
-<entry datestamp='$Date$' modifier='$Author$' id='luacolor'>
-  <name>luacolor</name>
-  <caption>Color support based on LuaTeX's node attributes.</caption>
-  <authorref id='auth:oberdiek'/>
-  <copyright owner='Heiko Oberdiek' year='2007,2009-2011'/>
-  <license type='lppl1.3'/>
-  <version number='1.11'/>
-  <description>
-      This package implements color support based on LuaTeX's node
-      attributes.
-    <p/>
-    The package is part of the <xref refid='oberdiek'>oberdiek</xref> bundle.
-  </description>
-  <documentation details='Package documentation'
-      href='ctan:/macros/latex/contrib/oberdiek/luacolor.pdf'/>
-  <ctan file='true' path='/macros/latex/contrib/oberdiek/luacolor.dtx'/>
-  <miktex location='oberdiek'/>
-  <texlive location='oberdiek'/>
-  <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
-</entry>
-%</catalogue>
-%    \end{macrocode}
-%
 % \begin{History}
 %   \begin{Version}{2007/12/12 v1.0}
 %   \item
diff --git a/macros/latex/contrib/oberdiek/luacolor.pdf b/macros/latex/contrib/oberdiek/luacolor.pdf
index 0c44fbf333..36d0822d66 100644
--- a/macros/latex/contrib/oberdiek/luacolor.pdf
+++ b/macros/latex/contrib/oberdiek/luacolor.pdf
diff --git a/macros/latex/contrib/oberdiek/luatex.dtx b/macros/latex/contrib/oberdiek/luatex.dtx
deleted file mode 100644
index ef111a4efa..0000000000
--- a/macros/latex/contrib/oberdiek/luatex.dtx
+++ /dev/null
@@ -1,1967 +0,0 @@
-% \iffalse meta-comment
-%
-% File: luatex.dtx
-% Version: 2019/07/25 v0.7
-% Info: LuaTeX basic definition package
-%
-% Copyright (C) 2007, 2009, 2010 by
-%    Heiko Oberdiek <heiko.oberdiek at googlemail.com>
-%    2016, 2019
-%    https://github.com/ho-tex/oberdiek/issues
-%
-% This work may be distributed and/or modified under the
-% conditions of the LaTeX Project Public License, either
-% version 1.3c of this license or (at your option) any later
-% version. This version of this license is in
-%    http://www.latex-project.org/lppl/lppl-1-3c.txt
-% and the latest version of this license is in
-%    http://www.latex-project.org/lppl.txt
-% and version 1.3 or later is part of all distributions of
-% LaTeX version 2005/12/01 or later.
-%
-% This work has the LPPL maintenance status "maintained".
-%
-% This Current Maintainer of this work is Heiko Oberdiek.
-%
-% The Base Interpreter refers to any `TeX-Format',
-% because some files are installed in TDS:tex/generic//.
-%
-% This work consists of the main source file luatex.dtx
-% and the derived files
-%    luatex.sty, luatex.pdf, luatex.ins, luatex.drv, luatex-loader.sty,
-%    luatex-test1.tex, luatex-test2.tex, luatex-test3.tex,
-%    luatex-test4.tex, luatex-test5.tex, oberdiek.luatex.lua.
-%
-% Distribution:
-%    CTAN:macros/latex/contrib/oberdiek/luatex.dtx
-%    CTAN:macros/latex/contrib/oberdiek/luatex.pdf
-%
-% Unpacking:
-%    (a) If luatex.ins is present:
-%           tex luatex.ins
-%    (b) Without luatex.ins:
-%           tex luatex.dtx
-%    (c) If you insist on using LaTeX
-%           latex \let\install=y\input{luatex.dtx}
-%        (quote the arguments according to the demands of your shell)
-%
-% Documentation:
-%    (a) If luatex.drv is present:
-%           latex luatex.drv
-%    (b) Without luatex.drv:
-%           latex luatex.dtx; ...
-%    The class ltxdoc loads the configuration file ltxdoc.cfg
-%    if available. Here you can specify further options, e.g.
-%    use A4 as paper format:
-%       \PassOptionsToClass{a4paper}{article}
-%
-%    Programm calls to get the documentation (example):
-%       pdflatex luatex.dtx
-%       makeindex -s gind.ist luatex.idx
-%       pdflatex luatex.dtx
-%       makeindex -s gind.ist luatex.idx
-%       pdflatex luatex.dtx
-%
-% Installation:
-%    TDS:tex/generic/oberdiek/luatex.sty
-%    TDS:tex/generic/oberdiek/luatex-loader.sty
-%    TDS:scripts/oberdiek/oberdiek.luatex.lua
-%    TDS:doc/latex/oberdiek/luatex.pdf
-%    TDS:doc/latex/oberdiek/test/luatex-test1.tex
-%    TDS:doc/latex/oberdiek/test/luatex-test2.tex
-%    TDS:doc/latex/oberdiek/test/luatex-test3.tex
-%    TDS:doc/latex/oberdiek/test/luatex-test4.tex
-%    TDS:doc/latex/oberdiek/test/luatex-test5.tex
-%    TDS:source/latex/oberdiek/luatex.dtx
-%
-%<*ignore>
-\begingroup
-  \catcode123=1 %
-  \catcode125=2 %
-  \def\x{LaTeX2e}%
-\expandafter\endgroup
-\ifcase 0\ifx\install y1\fi\expandafter
-         \ifx\csname processbatchFile\endcsname\relax\else1\fi
-         \ifx\fmtname\x\else 1\fi\relax
-\else\csname fi\endcsname
-%</ignore>
-%<*install>
-\input docstrip.tex
-\Msg{************************************************************************}
-\Msg{* Installation}
-\Msg{* Package: luatex 2019/07/25 v0.7 LuaTeX basic definition package (HO)}
-\Msg{************************************************************************}
-
-\keepsilent
-\askforoverwritefalse
-
-\let\MetaPrefix\relax
-\preamble
-
-This is a generated file.
-
-Project: luatex
-Version: 2019/07/25 v0.7
-
-Copyright (C) 2007, 2009, 2010 by
-   Heiko Oberdiek <heiko.oberdiek at googlemail.com>
-
-This work may be distributed and/or modified under the
-conditions of the LaTeX Project Public License, either
-version 1.3c of this license or (at your option) any later
-version. This version of this license is in
-   http://www.latex-project.org/lppl/lppl-1-3c.txt
-and the latest version of this license is in
-   http://www.latex-project.org/lppl.txt
-and version 1.3 or later is part of all distributions of
-LaTeX version 2005/12/01 or later.
-
-This work has the LPPL maintenance status "maintained".
-
-This Current Maintainer of this work is Heiko Oberdiek.
-
-The Base Interpreter refers to any `TeX-Format',
-because some files are installed in TDS:tex/generic//.
-
-This work consists of the main source file luatex.dtx
-and the derived files
-   luatex.sty, luatex.pdf, luatex.ins, luatex.drv, luatex-loader.sty,
-   luatex-test1.tex, luatex-test2.tex, luatex-test3.tex,
-   luatex-test4.tex, luatex-test5.tex, oberdiek.luatex.lua.
-
-\endpreamble
-\let\MetaPrefix\DoubleperCent
-
-\generate{%
-  \file{luatex.ins}{\from{luatex.dtx}{install}}%
-  \file{luatex.drv}{\from{luatex.dtx}{driver}}%
-  \usedir{tex/generic/oberdiek}%
-  \file{luatex.sty}{\from{luatex.dtx}{package}}%
-  \file{luatex-loader.sty}{\from{luatex.dtx}{loader}}%
-%  \usedir{doc/latex/oberdiek/test}%
-%  \file{luatex-test1.tex}{\from{luatex.dtx}{test1}}%
-%  \file{luatex-test2.tex}{\from{luatex.dtx}{test1,test2}}%
-%  \file{luatex-test3.tex}{\from{luatex.dtx}{test1,test3}}%
-%  \file{luatex-test4.tex}{\from{luatex.dtx}{test4}}%
-%  \file{luatex-test5.tex}{\from{luatex.dtx}{test5}}%
-  \nopreamble
-  \nopostamble
-%  \usedir{source/latex/oberdiek/catalogue}%
-%  \file{luatex.xml}{\from{luatex.dtx}{catalogue}}%
-}
-\def\MetaPrefix{-- }
-\def\defaultpostamble{%
-  \MetaPrefix^^J%
-  \MetaPrefix\space End of File `\outFileName'.%
-}
-\def\currentpostamble{\defaultpostamble}%
-\generate{%
-  \usedir{scripts/oberdiek}%
-  \file{oberdiek.luatex.lua}{\from{luatex.dtx}{lua}}%
-}
-
-\catcode32=13\relax% active space
-\let =\space%
-\Msg{************************************************************************}
-\Msg{*}
-\Msg{* To finish the installation you have to move the following}
-\Msg{* files into a directory searched by TeX:}
-\Msg{*}
-\Msg{*     luatex.sty, luatex-loader.sty}
-\Msg{*}
-\Msg{* And install the following script file:}
-\Msg{*}
-\Msg{*     oberdiek.luatex.lua}
-\Msg{*}
-\Msg{* To produce the documentation run the file `luatex.drv'}
-\Msg{* through LaTeX.}
-\Msg{*}
-\Msg{* Happy TeXing!}
-\Msg{*}
-\Msg{************************************************************************}
-
-\endbatchfile
-%</install>
-%<*ignore>
-\fi
-%</ignore>
-%<*driver>
-\NeedsTeXFormat{LaTeX2e}
-\ProvidesFile{luatex.drv}%
-  [2019/07/25 v0.7 LuaTeX basic definition package (HO)]%
-\documentclass{ltxdoc}
-\usepackage{holtxdoc}[2011/11/22]
-\usepackage{paralist}
-\begin{document}
-  \DocInput{luatex.dtx}%
-\end{document}
-%</driver>
-% \fi
-%
-%
-% \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
-%   Lower-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
-%   Digits        \0\1\2\3\4\5\6\7\8\9
-%   Exclamation   \!     Double quote  \"     Hash (number) \#
-%   Dollar        \$     Percent       \%     Ampersand     \&
-%   Acute accent  \'     Left paren    \(     Right paren   \)
-%   Asterisk      \*     Plus          \+     Comma         \,
-%   Minus         \-     Point         \.     Solidus       \/
-%   Colon         \:     Semicolon     \;     Less than     \<
-%   Equals        \=     Greater than  \>     Question mark \?
-%   Commercial at \@     Left bracket  \[     Backslash     \\
-%   Right bracket \]     Circumflex    \^     Underscore    \_
-%   Grave accent  \`     Left brace    \{     Vertical bar  \|
-%   Right brace   \}     Tilde         \~}
-%
-% \GetFileInfo{luatex.drv}
-%
-% \title{The \xpackage{luatex} package}
-% \date{2019/07/25 v0.7}
-% \author{Heiko Oberdiek\thanks
-% {Please report any issues at https://github.com/ho-tex/oberdiek/issues}\\
-% \xemail{heiko.oberdiek at googlemail.com}}
-%
-% \maketitle
-%
-% \begin{abstract}
-% This package manages the new and extended features and resources
-% that \LuaTeX\ provides. Examples are attributes and catcode
-% tables.
-% \end{abstract}
-%
-% \tableofcontents
-%
-% \section{Documentation}
-%
-% \subsection{Introduction}
-%
-% \TeX\ provides global resources such as registers.
-% But it does not provide an interface for managing these resources.
-% For example, two packages want to use a counter register.
-% If they take the same register
-% number, then the use of both packages will conflict and they cannot
-% be used together.
-% Therefore formats such as \plainTeX\ or \LaTeX\ implement
-% an allocation scheme for registers. A package reserves with
-% \cs{newcount} an unused register number for its own exclusive use.
-%
-% Nowadays \TeX\ is not alone anymore: \eTeX, \pdfTeX\ and other
-% compilers for \TeX\ are developed that extend and add new
-% features and resources.
-%
-% Now \LuaTeX\ has reached beta state. It inherits most of
-% \pdfTeX's features including \eTeX. Also it implements
-% new concepts such as attributes or catcode tables.
-%
-% \subsubsection{\LaTeX}
-%
-% Since 2015 Lua\LaTeX\ includes support for luatex by default and so
-% this package is essentially obsolete now, however it is kept for
-% backwards compatibility.
-%
-% \subsubsection{\plainTeX}
-%
-% \LaTeX\ has inherited its resource handling from \plainTeX.
-% The interface is basically the same: \cs{newcount}, \dots
-% Therefore this package tries to follow this tradition by
-% providing compatibility to \plainTeX. It can be loaded
-% with \plainTeX\ and defines at least some of the
-% features that this packages provides for \LaTeX.
-%
-% \subsection{Register allocation}
-%
-% \subsubsection{Register with 16 bit}
-%
-% Because \LuaTeX\ is a super set of \eTeX\ regarding registers,
-% the register allocation scheme should not conflict with
-% package \xpackage{etex}. Therefore this package is loaded
-% to inherit its allocation scheme. The only change is currently
-% that the limit is increased to 65536 registers for the following
-% register classes:
-% \begin{compactitem}
-% \item count
-% \item dimen
-% \item skip
-% \item muskip
-% \item marks
-% \item toks
-% \item box
-% \end{compactitem}
-% This affects the number of global and local registers.
-% Because it is done in a package and not in the kernel,
-% it is possible that someone loads package \xpackage{etex}
-% before uses the local allocation variants. This will prevent
-% the extension for this register class. If more registers are
-% needed, just load package \xpackage{luatex} earlier.
-%
-% \subsubsection{Insertions}
-%
-% Insertions need four registers \cs{count}, \cs{dimen}, \cs{skip},
-% and \cs{box} with the same number. Usually they are allocated
-% downwards from 254, 253, \dots Also \cs{newcount}, \cs{newdimen}, \dots
-% fill up these register numbers from below before switching to
-% higher register numbers by package \xpackage{etex}.
-% When this occurs, no insertions can be allocated anymore.
-%
-% Therefore \cs{newcount}, \cs{newdimen}, \cs{newskip}, and
-% \cs{newbox} are replaced by their global variants (\cs{globcount}, \dots)
-% that use the higher numbers immediately, leaving the room for insertions.
-% There should not be an efficiency penalty because \LuaTeX\ stores
-% the registers of a class in the same Lua table unlike \eTeX, where
-% registers below 256 are stored in an array and higher numbers
-% are put in a tree structure.
-%
-% \subsection{Attributes}
-%
-% Nodes can have custom attributes in \LuaTeX. These attributes
-% are organized by a new register class. As the other registers
-% up to $2^{16}$ attributes are supported. An attribute value
-% can be negative that means the attribute is not set. Otherwise
-% \TeX's range of non-negative integers up to $2^31$ are available.
-%
-% \begin{declcs}{newattribute} \M{cmd}
-% \end{declcs}
-% Macro \cs{newattribute} defines command \meta{cmd} using \cs{attributedef}
-% using an new attribute number. The new attribute is initially unset.
-%
-% \begin{declcs}{setattribute} \M{cmd} \M{value}
-% \end{declcs}
-% Macro \cs{setattribute} locally sets attribute command \meta{cmd}
-% to the number \meta{value}. Valid values range from $-1$ until $2^31$
-% (the upper limit is the same as for other \TeX\ integer numbers).
-%
-% \begin{declcs}{unsetattribute} \M{cmd}
-% \end{declcs}
-% Macro \cs{unsettattribute} clears the attribute command \meta{cmd}.
-%
-% \subsection{Catcode tables}
-%
-% \LuaTeX\ introduces catcode tables as new feature, see documentation.
-% There is need for discussion, how to deal best:
-% \begin{itemize}
-% \item \cs{initcatcodetable} and \cs{setcatcodetable} act globally.
-% \item \cs{catcodetable} causes an error if used with an uninitialized
-%   catcode table.
-% \item Large catcode table numbers should be avoided because of
-%   performance breakdown.
-% \item Use case \LaTeX\ package:
-%   The package must not be surprised by changed catcodes and
-%   must not surprise by changing catcodes accidently.
-%   Catcode tables could offer a solution. At the begin
-%   a catcode regime with standard catcodes is established
-%   and the old one is restored afterwards.
-% \item Use case: \LuaTeX's |tex.print| might be used with
-%   a catcode table number, for example a table where all
-%   entries have catcode ``other''.
-% \item Readonly catcode tables.
-% \item Is there is a need for local allocations?
-%   (Package \xpackage{etex}'s \cs{loc} variants are not used in
-%   \TeX\ Live 2007.)
-% \end{itemize}
-%
-% \subsubsection{Interface proposal}
-%
-% The idea: \cs{newcatcodetable} allocates odd numbered catcode
-% tables. Even numbered tables are managed as stack.
-% Also some catcode tables are defined. These must not be
-% changed.
-%
-% \begin{declcs}{newcatcodetable} \M{cmd}
-% \end{declcs}
-% Macro \cs{newcatcodetable} reserves a new catcode table and
-% remembers its number in \meta{cmd}. The catcode table is
-% initialized with \iniTeX's catcodes.
-%
-% \begin{declcs}{CatcodeTableIniTeX}\\
-%   \cs{CatcodeTableString}\\
-%   \cs{CatcodeTableOther}\\
-%   \cs{CatcodeTableLaTeX}\\
-% \end{declcs}
-% These are catcode tables and must not be changed.
-% \cs{CatcodeTableIniTeX} contains the catcode settings of \iniTeX.
-% \cs{CatcodeTableString} follows \TeX's convention of
-% \cs{string}, \cs{meaning} and friends. The space gets catcode
-% 10 (space), the other characters have catcode 12 (other).
-% In \cs{CatcodeTableOther} all entries have catcode 12 (other).
-% \cs{CatcodeTableLaTeX} contains the setting of a pure \LaTeX\ format
-% (`at' is other).
-%
-% \begin{declcs}{CatcodeTableStack}\\
-%   \cs{IncCatcodeTableStack}\\
-%   \cs{DecCatcodeTableStack}
-% \end{declcs}
-% \cs{CatcodeTableStack} is the stack pointer. Initially
-% it is catcode table zero. \cs{IncCatcodeTableStack} and
-% \cs{DecCatcodeTableStack} increments and decrements the
-% stack pointer. Currently \cs{IncCatcodeTableStack} does not
-% initialize a new catcode table. Both increment and decrement
-% operations do not set a catcode table.
-%
-% \begin{declcs}{PushCatcodeTableNumStack}\\
-%   \cs{PopCatcodeTableNumStack}
-% \end{declcs}
-% It can be handy to have a global stack for catcode table
-% numbers to deal with the global assignment property of
-% \cs{initcatcodetable} and \cs{savecatcodetable}.
-% \cs{PushCatcodeTableNumStack} pushes the current catcode table
-% on the stack.
-% \cs{PopCatcodeTableNumStack} pops the topmost number off the number
-% stack to set the current catcode table. Catcode table zero is
-% used in case of an empty stack.
-%
-% \begin{declcs}{BeginCatcodeRegime} \M{catcodetable}\\
-%   \cs{EndCatcodeRegime}
-% \end{declcs}
-% \cs{BeginCatcodeRegime} remembers the current catcode table number.
-% Then it creates and uses a fresh catcode table on the stack
-% that is initialized by \meta{catcodetable}:
-% \begin{quote}\ttfamily
-%   \cs{PushCatcodeTableNumStack}\\
-%   \cs{catcodetable}\meta{catcodetable}||
-%   \cs{IncCatcodeTableStack}\\
-%   \cs{savecatcodetable}\cs{CatcodeTableStack}\\
-%   \cs{catcodetable}\cs{CatcodeTableStack}
-% \end{quote}
-% \cs{EndCatcodeRegime} drops the catcode table, created by
-% \cs{BeginCatcodeRegime} and sets the catcode table that was
-% active before:
-% \begin{quote}
-%   \cs{DecCatcodeTableStack}\\
-%   \cs{PopCatcodeTableNumStack}
-% \end{quote}
-% These macros solve the use case, described earlier for a \LaTeX\ package:
-% \begin{quote}
-%   |% package foobar.sty|\\
-%   |\BeginCatcodeRegime\CatcodeTableLaTeX|\\
-%   |\makeatletter|\\
-%   |% ... package contents ...|\\
-%   |\EndCatcodeRegime|\\
-%   |% end of package|
-% \end{quote}
-% If the package wants to change catcodes after its loading,
-% \cs{AtBeginDocument} or \cs{AtEndOfPackage} can be used.
-%
-% \begin{declcs}{SetCatcodeRange} \M{from} \M{to} \M{catcode}
-% \end{declcs}
-% The catcodes of characters in range from \meta{from}
-% to inclusive \meta{to} are set to \meta{catcode}.
-%
-% \subsection{Lua module loading}
-%
-% Currently \LuaTeX\ (version 0.20) does not support Lua script
-% files inside \xfile{TDS:scripts//}, because Lua's mechanism
-% for module loading does not use the \textsf{kpathsea} library.
-% Therefore this packages appends a kpse loader to the list of
-% Lua's module loaders. It finds the module \meta{module} by
-% \begin{quote}
-%   \ttfamily |kpse.find_file("|\meta{module}|.lua", "texmfscripts")|
-% \end{quote}
-% Unhappily \textsf{kpathsea} does not support directory components
-% in a file name. Therefore the Lua convention is not followed to
-% replace dots in the module name by the directory separator.
-%
-% Example:
-% A Lua script of a package \xpackage{foobar} wants the following
-% modules:
-% \begin{quote}
-%   |require("foobar.hello.world")|\\
-%   |require("org.somewhere.xyz")|
-% \end{quote}
-% Then they can be find in:
-% \begin{quote}
-%   |TDS:scripts/foobar/foobar.hello.world.lua|\\
-%   |TDS:scripts/foobar/org.somewhere.xyz.lua|
-% \end{quote}
-% I would have preferred the following locations, following lua conventions,
-% e.\,g.:
-% \begin{quote}
-%   |TDS:scripts/foobar/hello/world.lua|\\
-%   |TDS:scripts/foobar/org/somewhere/xyz.lua|
-% \end{quote}
-% But I do not know, how to achieve this in a reliable way using
-% \textsf{kpathsea}.
-%
-% \subsubsection{Package \xpackage{luatex-loader}}
-%
-% If someone do not need or want package \xpackage{luatex} but
-% it's extension for module loading, then he can use
-% package \xpackage{luatex-loader}. Both \plainTeX\ and \LaTeX\ are
-% supported.
-%
-% \StopEventually{
-% }
-%
-% \section{Implementation}
-%
-%    \begin{macrocode}
-%<*package>
-%    \end{macrocode}
-%
-% \subsection{Reload check and package identification}
-%    Reload check, especially if the package is not used with \LaTeX.
-%    \begin{macrocode}
-\begingroup\catcode61\catcode48\catcode32=10\relax%
-  \catcode13=5 % ^^M
-  \endlinechar=13 %
-  \catcode35=6 % #
-  \catcode39=12 % '
-  \catcode44=12 % ,
-  \catcode45=12 % -
-  \catcode46=12 % .
-  \catcode58=12 % :
-  \catcode64=11 % @
-  \catcode123=1 % {
-  \catcode125=2 % }
-  \expandafter\let\expandafter\x\csname ver@luatex.sty\endcsname
-  \ifx\x\relax % plain-TeX, first loading
-  \else
-    \def\empty{}%
-    \ifx\x\empty % LaTeX, first loading,
-      % variable is initialized, but \ProvidesPackage not yet seen
-    \else
-      \expandafter\ifx\csname PackageInfo\endcsname\relax
-        \def\x#1#2{%
-          \immediate\write-1{Package #1 Info: #2.}%
-        }%
-      \else
-        \def\x#1#2{\PackageInfo{#1}{#2, stopped}}%
-      \fi
-      \x{luatex}{The package is already loaded}%
-      \aftergroup\endinput
-    \fi
-  \fi
-\endgroup%
-%    \end{macrocode}
-%    Package identification:
-%    \begin{macrocode}
-\begingroup\catcode61\catcode48\catcode32=10\relax%
-  \catcode13=5 % ^^M
-  \endlinechar=13 %
-  \catcode35=6 % #
-  \catcode39=12 % '
-  \catcode40=12 % (
-  \catcode41=12 % )
-  \catcode44=12 % ,
-  \catcode45=12 % -
-  \catcode46=12 % .
-  \catcode47=12 % /
-  \catcode58=12 % :
-  \catcode64=11 % @
-  \catcode91=12 % [
-  \catcode93=12 % ]
-  \catcode123=1 % {
-  \catcode125=2 % }
-  \expandafter\ifx\csname ProvidesPackage\endcsname\relax
-    \def\x#1#2#3[#4]{\endgroup
-      \immediate\write-1{Package: #3 #4}%
-      \xdef#1{#4}%
-    }%
-  \else
-    \def\x#1#2[#3]{\endgroup
-      #2[{#3}]%
-      \ifx#1\@undefined
-        \xdef#1{#3}%
-      \fi
-      \ifx#1\relax
-        \xdef#1{#3}%
-      \fi
-    }%
-  \fi
-\expandafter\x\csname ver@luatex.sty\endcsname
-\ProvidesPackage{luatex}%
-  [2019/07/25 v0.7 LuaTeX basic definition package (HO)]%
-%    \end{macrocode}
-%
-% \subsection{Catcodes}
-%
-%    \begin{macrocode}
-\begingroup\catcode61\catcode48\catcode32=10\relax%
-  \catcode13=5 % ^^M
-  \endlinechar=13 %
-  \catcode123=1 % {
-  \catcode125=2 % }
-  \catcode64=11 % @
-  \def\x{\endgroup
-    \expandafter\edef\csname LuT@AtEnd\endcsname{%
-      \endlinechar=\the\endlinechar\relax
-      \catcode13=\the\catcode13\relax
-      \catcode32=\the\catcode32\relax
-      \catcode35=\the\catcode35\relax
-      \catcode61=\the\catcode61\relax
-      \catcode64=\the\catcode64\relax
-      \catcode123=\the\catcode123\relax
-      \catcode125=\the\catcode125\relax
-    }%
-  }%
-\x\catcode61\catcode48\catcode32=10\relax%
-\catcode13=5 % ^^M
-\endlinechar=13 %
-\catcode35=6 % #
-\catcode64=11 % @
-\catcode123=1 % {
-\catcode125=2 % }
-\def\TMP@EnsureCode#1#2{%
-  \edef\LuT@AtEnd{%
-    \LuT@AtEnd
-    \catcode#1=\the\catcode#1\relax
-  }%
-  \catcode#1=#2\relax
-}
-\TMP@EnsureCode{10}{12}% ^^J
-\TMP@EnsureCode{34}{12}% "
-\TMP@EnsureCode{36}{3}% $
-\TMP@EnsureCode{39}{12}% '
-\TMP@EnsureCode{40}{12}% (
-\TMP@EnsureCode{41}{12}% )
-\TMP@EnsureCode{42}{12}% *
-\TMP@EnsureCode{43}{12}% +
-\TMP@EnsureCode{44}{12}% ,
-\TMP@EnsureCode{45}{12}% -
-\TMP@EnsureCode{46}{12}% .
-\TMP@EnsureCode{47}{12}% /
-\TMP@EnsureCode{60}{12}% <
-\TMP@EnsureCode{62}{12}% >
-\TMP@EnsureCode{91}{12}% [
-\TMP@EnsureCode{93}{12}% ]
-\TMP@EnsureCode{95}{12}% _ (other!)
-\TMP@EnsureCode{96}{12}% `
-\edef\LuT@AtEnd{\LuT@AtEnd\noexpand\endinput}
-%    \end{macrocode}
-%
-% \subsection{Check for \LuaTeX}
-%
-%    Without \LuaTeX\ there is no point in using this package.
-%    \begin{macrocode}
-\begingroup\expandafter\expandafter\expandafter\endgroup
-\expandafter\ifx\csname RequirePackage\endcsname\relax
-  \input infwarerr.sty\relax
-  \input ifluatex.sty\relax
-\else
-  \RequirePackage{infwarerr}[2007/09/09]%
-  \RequirePackage{ifluatex}[2009/04/10]%
-\fi
-%    \end{macrocode}
-%    \begin{macrocode}
-\ifluatex
-\else
-  \@PackageError{luatex}{%
-    This package may only be run using LuaTeX%
-  }\@ehc
-  \expandafter\LuT@AtEnd
-\fi%
-%    \end{macrocode}
-%
-% \subsection{Provide Lua\TeX\ primitives}
-%
-%    \begin{macrocode}
-\ifnum\luatexversion<36 %
-  \def\LuT@MakePrimitive#1{%
-    \expandafter\let\csname luatex#1\expandafter\endcsname
-    \csname #1\endcsname
-  }%
-\else
-  \def\LuT@MakeLuatexPrimitive#1{%
-    \begingroup\expandafter\expandafter\expandafter\endgroup
-    \expandafter\ifx\csname luatex#1\endcsname\relax
-      \begingroup\expandafter\expandafter\expandafter\endgroup
-      \expandafter\ifx\csname #1\endcsname\relax
-      \else
-        \expandafter\let
-        \csname luatex#1\expandafter\endcsname
-        \csname #1\endcsname
-      \fi
-    \fi
-    \begingroup\expandafter\expandafter\expandafter\endgroup
-    \expandafter\ifx\csname luatex#1\endcsname\relax
-      \begingroup
-        \expandafter\let\csname luatex#1\endcsname\@undefined
-        \ifnum0%
-          \directlua{%
-            if tex.enableprimitives then %
-              tex.enableprimitives('luatex',{'#1'})%
-              tex.print('1')%
-            end%
-          }%
-          \expandafter\ifx\csname luatex#1\endcsname\relax\else1\fi
-        =11 %
-          \global\expandafter\let
-          \csname luatex#1\expandafter\endcsname
-          \csname luatex#1\endcsname
-        \else
-          \@PackageError{luatex}{%
-            tex.enableprimitives failed for `#1'%
-          }\@ehc
-        \fi
-      \endgroup
-    \fi
-  }%
-  \def\LuT@MakePrimitive#1{%
-    \begingroup\expandafter\expandafter\expandafter\endgroup
-    \expandafter\ifx\csname#1\endcsname\relax
-      \begingroup
-        \expandafter\let\csname#1\endcsname\@undefined
-        \ifnum0%
-          \directlua{%
-            if tex.enableprimitives then %
-              tex.enableprimitives('',{'#1'})%
-              tex.print('1')%
-            end%
-          }%
-          \expandafter\ifx\csname#1\endcsname\relax\else1\fi
-        =11 %
-          \global\expandafter\let
-          \csname#1\expandafter\endcsname
-          \csname#1\endcsname
-        \else
-          \@PackageError{luatex}{%
-            tex.enableprimitives failed for `#1'%
-          }\@ehc
-        \fi
-      \endgroup
-    \fi
-  }%
-\fi
-\LuT@MakeLuatexPrimitive{attribute}
-\LuT@MakeLuatexPrimitive{attributedef}
-\LuT@MakeLuatexPrimitive{catcodetable}
-\LuT@MakeLuatexPrimitive{initcatcodetable}
-\LuT@MakeLuatexPrimitive{luaescapestring}
-\LuT@MakeLuatexPrimitive{savecatcodetable}
-\LuT@MakePrimitive{numexpr}
-%    \end{macrocode}
-%
-% \subsection{Inherit support for \eTeX}
-%
-%    Package \xpackage{etex} is not compatible for \plainTeX.
-%    But it could be present if a format is used that is based
-%    on \xfile{etex.src}. Therefore we only load the package
-%    in case of \LaTeX\ and tests its presence independently
-%    of the format by looking for \cs{et@xins}.
-%    \begin{macrocode}
-\begingroup\expandafter\expandafter\expandafter\endgroup
-\expandafter\ifx\csname RequirePackage\endcsname\relax
-\else
-  \RequirePackage{etex}[1998/03/26]%
-\fi
-%    \end{macrocode}
-%
-% \subsection{Adaption of \eTeX's register allocation}
-%
-%    \eTeX has increased the number of \TeX\ registers
-%    from $2^8$ (256) to $2^{15}$ (32768) for a register class.
-%    \LuaTeX\ extends the limit further to $2^16$ (65536).
-%    The allocation scheme of package \xpackage{etex} is not
-%    changed. But this can be subject for discussion.
-%
-%    If a register class hasn't registered any local registers
-%    yet, then the limit can safely be pushed to 65536.
-%    \begin{macrocode}
-\begingroup\expandafter\expandafter\expandafter\endgroup
-\expandafter\ifx\csname et@xins\endcsname\relax
-  \@PackageWarningNoLine{luatex}{%
-    Support for eTeX is not loaded (etex.src)%
-  }%
-\else
-  \def\LuT@temp#1{%
-    \ifnum\count27#1=32768 %
-      \count27#1=65536 %
-    \fi
-  }%
-  \LuT@temp0%
-  \LuT@temp1%
-  \LuT@temp2%
-  \LuT@temp3%
-  \LuT@temp4%
-  \LuT@temp5%
-  \LuT@temp6%
-%    \end{macrocode}
-%
-% \eTeX\ uses an array for the first 256 registers and then a tree
-% structure. \LuaTeX\ stores all registers of a class in one Lua table.
-% There shouldn't be large performance differences.
-% This allows starting immediately in the extended
-% area, leaving room for insertions.
-%    \begin{macrocode}
-  \let\newcount\globcount
-  \let\newdimen\globdimen
-  \let\newskip\globskip
-  \let\newbox\globbox
-\fi
-%    \end{macrocode}
-%
-% \subsection{\plainTeX\ compatibility}
-%
-%    \begin{macro}{\@empty}
-%    \begin{macrocode}
-\expandafter\ifx\csname @empty\endcsname\relax
-  \def\@empty{}%
-\fi
-%    \end{macrocode}
-%    \end{macro}
-%    \begin{macro}{\@gobble}
-%    \begin{macrocode}
-\expandafter\ifx\csname @gobble\endcsname\relax
-  \long\def\@gobble#1{}%
-\fi
-%    \end{macrocode}
-%    \end{macro}
-%    \begin{macro}{\@firstofone}
-%    \begin{macrocode}
-\expandafter\ifx\csname @firstofone\endcsname\relax
-  \long\def\@firstofone#1{#1}%
-\fi
-%    \end{macrocode}
-%    \end{macro}
-%    \begin{macro}{\@firstoftwo}
-%    \begin{macrocode}
-\expandafter\ifx\csname @firstoftwo\endcsname\relax
-  \long\def\@firstoftwo#1#2{#1}%
-\fi
-%    \end{macrocode}
-%    \end{macro}
-%    \begin{macro}{\@car}
-%    \begin{macrocode}
-\expandafter\ifx\csname @car\endcsname\relax
-  \def\@car#1#2\@nil{#1}%
-\fi
-%    \end{macrocode}
-%    \end{macro}
-%    \begin{macro}{\@cdr}
-%    \begin{macrocode}
-\expandafter\ifx\csname @cdr\endcsname\relax
-  \def\@cdr#1#2\@nil{#2}%
-\fi
-%    \end{macrocode}
-%    \end{macro}
-%    \begin{macro}{\@ifstar}
-%    \begin{macrocode}
-\expandafter\ifx\csname @ifstar\endcsname\relax
-  \def\@ifstar#1{%
-    \@ifnextchar*{\@firstoftwo{#1}}%
-  }%
-%    \end{macrocode}
-%    \end{macro}
-%    \begin{macro}{\@ifnextchar}
-%    \begin{macrocode}
-  \long\def\@ifnextchar#1#2#3{%
-    \let\reserved@d=#1%
-    \def\reserved@a{#2}%
-    \def\reserved@b{#3}%
-    \futurelet\@let@token\@ifnch
-  }%
-%    \end{macrocode}
-%    \end{macro}
-%    \begin{macro}{\@ifnch}
-%    \begin{macrocode}
-  \def\@ifnch{%
-    \ifx\@let@token\@sptoken
-      \let\reserved@c\@xifnch
-    \else
-      \ifx\@let@token\reserved@d
-        \let\reserved@c\reserved@a
-      \else
-        \let\reserved@c\reserved@b
-      \fi
-    \fi
-    \reserved@c
-  }%
-%    \end{macrocode}
-%    \end{macro}
-%    \begin{macro}{\@sptoken}
-%    \begin{macrocode}
-  \let\LuT@temp\:%
-  \def\:{\let\@sptoken= }%
-  \: % explicit space
-%    \end{macrocode}
-%    \end{macro}
-%    \begin{macro}{\@xifnch}
-%    \begin{macrocode}
-  \def\:{\@xifnch}%
-  \expandafter\def\: {%
-    \futurelet\@let@token\@ifnch
-  }%
-  \let\:\LuT@temp
-\fi
-%    \end{macrocode}
-%    \end{macro}
-%
-%    \begin{macro}{\@tempcnta}
-%    \begin{macrocode}
-\expandafter\ifx\csname @tempcnta\endcsname\relax
-  \csname newcount\endcsname\@tempcnta
-\fi
-%    \end{macrocode}
-%    \end{macro}
-%
-%    \begin{macro}{\@tempcntb}
-%    \begin{macrocode}
-\expandafter\ifx\csname @tempcntb\endcsname\relax
-  \csname newcount\endcsname\@tempcntb
-\fi
-%    \end{macrocode}
-%    \end{macro}
-%
-%    \begin{macro}{\LuT@newcommand}
-%    \begin{macrocode}
-\begingroup\expandafter\expandafter\expandafter\endgroup
-\expandafter\ifx\csname newcommand\endcsname\relax
-  \def\LuT@newcommand#1[#2]#3{%
-    \ifx#1\@undefined
-      \let#1\relax
-    \else
-      \ifx#1\relax
-      \else
-        \@PackageError{luatex}{%
-          \string#1 is already defined.\MessageBreak
-          Redefinition is skipped%
-        }\@ehc
-      \fi
-    \fi
-    \ifx#1\relax
-      \ifcase#2 %
-        \def#1{#3}%
-      \or
-        \def#1##1{#3}%
-      \or
-        \def#1##1##2{#3}%
-      \or
-        \def#1##1##2##3{#3}%
-      \or
-        \@INTERNAL@ERROR
-      \fi
-    \fi
-  }%
-\else
-  \def\LuT@newcommand{\newcommand*}%
-\fi
-%    \end{macrocode}
-%    \end{macro}
-%
-% \subsection{Attributes}
-%
-% \subsubsection{Allocation}
-%
-%    \begin{macro}{\LuT@AllocAttribute}
-%    \begin{macrocode}
-\newcount\LuT@AllocAttribute
-\LuT@AllocAttribute=\m@ne
-%    \end{macrocode}
-%    \end{macro}
-%    \begin{macro}{\newattribute}
-%    \begin{macrocode}
-\ifx\newattribute\@undefined
-\LuT@newcommand\newattribute[1]{%
-  \ifnum\LuT@AllocAttribute<65535 %
-    \global\advance\LuT@AllocAttribute\@ne
-    \allocationnumber\LuT@AllocAttribute
-    \global\luatexattributedef#1=\allocationnumber
-    \unsetattribute{#1}%
-    \wlog{\string#1=\string\attribute\the\allocationnumber}%
-  \else
-    \errmessage{No room for a new \string\attribute}%
-  \fi
-}
-\fi
-%    \end{macrocode}
-%    \end{macro}
-%
-% \subsubsection{Interface}
-%
-%    \begin{macro}{\setattribute}
-%    \begin{macrocode}
-\ifx\setattribute\@undefined
-\LuT@newcommand\setattribute[2]{%
-  #1=\numexpr#2\relax
-}
-\fi
-%    \end{macrocode}
-%    \end{macro}
-%    \begin{macro}{\unsetattribute}
-%    \begin{macrocode}
-\ifx\unsetattribute\@undefined
-\ifnum\luatexversion<37
-  \LuT@newcommand\LuT@UnsetAttributeValue[0]{}%
-  \let\LuT@UnsetAttributeValue\m@ne
-\else
-  \LuT@newcommand\LuT@UnsetAttributeValue[0]{-2147483647 }%
-\fi
-\LuT@newcommand\unsetattribute[1]{%
-  #1=\LuT@UnsetAttributeValue
-}
-\fi
-%    \end{macrocode}
-%    \end{macro}
-%
-% \subsection{Catcode tables}
-%
-% \subsubsection{Allocation}
-%
-%    \begin{macro}{\LuT@AllocCatcodeTable}
-%    \begin{macrocode}
-\newcount\LuT@AllocCatcodeTable
-\LuT@AllocCatcodeTable=\m@ne
-\newcount\CatcodeTableStack
-\CatcodeTableStack=\z@
-%    \end{macrocode}
-%    \end{macro}
-%    \begin{macro}{\newcatcodetable}
-%    \begin{macrocode}
-\ifx\newcatcodetable\@undefined
-\LuT@newcommand\newcatcodetable[1]{%
-  \ifnum\LuT@AllocCatcodeTable<1114110 % 0x10FFFF is maximal \chardef
-    % or < 268435455 % 2^28 - 1
-    \global\advance\LuT@AllocCatcodeTable by\tw@
-    \allocationnumber=\LuT@AllocCatcodeTable
-    \global\chardef#1=\allocationnumber
-    \wlog{%
-      \string#1=\string\catcodetable\the\allocationnumber
-    }%
-  \else
-    \errmessage{No room for a new \string\catcodetable}%
-  \fi
-}%
-\fi
-%    \end{macrocode}
-%    \end{macro}
-%
-%    \begin{macro}{\IncCatcodeTableStack}
-%    \begin{macrocode}
-\LuT@newcommand\IncCatcodeTableStack[0]{%
-  \ifnum\CatcodeTableStack<268435454 %
-    \global\advance\CatcodeTableStack by\tw@
-  \else
-    \@PackageError{luatex}{%
-      Catcode table stack overflow%
-    }\@ehd
-  \fi
-}
-%    \end{macrocode}
-%    \end{macro}
-%
-%    \begin{macro}{\DecCatcodeTableStack}
-%    \begin{macrocode}
-\LuT@newcommand\DecCatcodeTableStack[0]{%
-  \ifnum\CatcodeTableStack>\z@
-    \global\advance\CatcodeTableStack by-2 %
-  \else
-    \@PackageError{luatex}{%
-      Catcode table stack is empty%
-    }\@ehd
-  \fi
-}
-%    \end{macrocode}
-%    \end{macro}
-%
-% \subsubsection{\cs{SetCatcodeRange}}
-%
-%    \begin{macro}{\SetCatcodeRange}
-%    \begin{macrocode}
-\LuT@newcommand\SetCatcodeRange[3]{%
-  \edef\LuT@temp{%
-    \noexpand\@tempcnta=\the\@tempcnta
-    \noexpand\@tempcntb=\the\@tempcntb
-    \noexpand\count@=\the\count@
-    \relax
-  }%
-  \@tempcnta=\numexpr#1\relax
-  \@tempcntb=\numexpr#2\relax
-  \count@=\numexpr#3\relax
-  \loop
-    \unless\ifnum\@tempcnta>\@tempcntb
-    \catcode\@tempcnta=\count@
-    \advance\@tempcnta by \@ne
-  \repeat
-  \LuT@temp
-}
-%    \end{macrocode}
-%    \end{macro}
-%
-% \subsubsection{Predefined catcode tables}
-%
-%    \begin{macrocode}
-\newcatcodetable\CatcodeTableIniTeX
-\newcatcodetable\CatcodeTableString
-\newcatcodetable\CatcodeTableOther
-\newcatcodetable\CatcodeTableLaTeX
-%    \end{macrocode}
-%
-%    \begin{macrocode}
-\luatexinitcatcodetable\CatcodeTableIniTeX
-\begingroup
-  \def\@makeother#1{\catcode#1=12\relax}%
-  \@firstofone{%
-    \luatexcatcodetable\CatcodeTableIniTeX
-    \begingroup
-      \SetCatcodeRange{0}{8}{15}%
-      \catcode9=10 % tab
-      \catcode11=15 %
-      \catcode12=13 % form feed
-      \SetCatcodeRange{14}{31}{15}%
-      \catcode35=6 % hash
-      \catcode36=3 % dollar
-      \catcode38=4 % ampersand
-      \catcode94=7 % circumflex
-      \catcode95=8 % underscore
-      \catcode123=1 % brace left
-      \catcode125=2 % brace right
-      \catcode126=13 % tilde
-      \catcode127=15 %
-      \luatexsavecatcodetable\CatcodeTableLaTeX
-    \endgroup
-    \@makeother{0}% nul
-    \@makeother{13}% carriage return
-    \@makeother{37}% percent
-    \@makeother{92}% backslash
-    \@makeother{127}%
-    \SetCatcodeRange{65}{90}{12}% A-Z
-    \SetCatcodeRange{97}{122}{12}% a-z
-    \luatexsavecatcodetable\CatcodeTableString
-    \@makeother{32}% space
-    \luatexsavecatcodetable\CatcodeTableOther
-  \endgroup
-}%
-%    \end{macrocode}
-%
-% \subsubsection{Number stack}
-%
-%    \begin{macro}{\LuT@NumStackEmpty}
-%    A special empty stack value because of \cs{@cdr}'s brace removal.
-%    \begin{macrocode}
-\def\LuT@NumStackEmpty{0}
-%    \end{macrocode}
-%    \end{macro}
-%    \begin{macro}{\LuT@NumStack}
-%    \begin{macrocode}
-\let\LuT@NumStack\LuT@NumStackEmpty
-%    \end{macrocode}
-%    \end{macro}
-%    \begin{macro}{\PushCatcodeTableNumStack}
-%    \begin{macrocode}
-\LuT@newcommand\PushCatcodeTableNumStack[0]{%
-  \xdef\LuT@NumStack{%
-    {\the\luatexcatcodetable}\LuT@NumStack
-  }%
-}
-%    \end{macrocode}
-%    \end{macro}
-%    \begin{macro}{\PopCatcodeTableNumStack}
-%    \begin{macrocode}
-\LuT@newcommand\PopCatcodeTableNumStack[0]{%
-  \ifx\LuT@NumStack\LuT@NumStackEmpty
-    \@PackageWarning{luatex}{Empty catcode table number stack}%
-    \luatexcatcodetable\z@
-  \else
-    \luatexcatcodetable=\expandafter\@car\LuT@NumStack\@nil\relax
-    \xdef\LuT@NumStack{%
-      \expandafter\@cdr\LuT@NumStack\@nil
-    }%
-  \fi
-}
-%    \end{macrocode}
-%    \end{macro}
-%
-% \subsubsection{Catcode regime macros}
-%
-%    \begin{macro}{\BeginCatcodeRegime}
-%    \begin{macrocode}
-\LuT@newcommand\BeginCatcodeRegime[1]{%
-  \PushCatcodeTableNumStack
-  \luatexcatcodetable=\numexpr#1\relax
-  \IncCatcodeTableStack
-  \luatexsavecatcodetable\CatcodeTableStack
-  \luatexcatcodetable\CatcodeTableStack
-}
-%    \end{macrocode}
-%    \end{macro}
-%
-%    \begin{macro}{\EndCatcodeRegime}
-%    \begin{macrocode}
-\LuT@newcommand\EndCatcodeRegime[0]{%
-  \DecCatcodeTableStack
-  \PopCatcodeTableNumStack
-}
-%    \end{macrocode}
-%    \end{macro}
-%
-% \subsection{Lua module loader}
-%
-%    \begin{macrocode}
-\begingroup\expandafter\expandafter\expandafter\endgroup
-\expandafter\ifx\csname RequirePackage\endcsname\relax
-  \input luatex-loader.sty\relax
-\else
-  \RequirePackage{luatex-loader}[2010/03/09]%
-\fi
-%    \end{macrocode}
-%    \begin{macrocode}
-\LuT@AtEnd%
-%</package>
-%    \end{macrocode}
-%
-%    \begin{macrocode}
-%<*loader>
-%    \end{macrocode}
-%
-%    Reload check, especially if the package is not used with \LaTeX.
-%    \begin{macrocode}
-\begingroup\catcode61\catcode48\catcode32=10\relax%
-  \catcode13=5 % ^^M
-  \endlinechar=13 %
-  \catcode35=6 % #
-  \catcode39=12 % '
-  \catcode44=12 % ,
-  \catcode45=12 % -
-  \catcode46=12 % .
-  \catcode58=12 % :
-  \catcode64=11 % @
-  \catcode123=1 % {
-  \catcode125=2 % }
-  \expandafter\let\expandafter\x\csname ver@luatex-loader.sty\endcsname
-  \ifx\x\relax % plain-TeX, first loading
-  \else
-    \def\empty{}%
-    \ifx\x\empty % LaTeX, first loading,
-      % variable is initialized, but \ProvidesPackage not yet seen
-    \else
-      \expandafter\ifx\csname PackageInfo\endcsname\relax
-        \def\x#1#2{%
-          \immediate\write-1{Package #1 Info: #2.}%
-        }%
-      \else
-        \def\x#1#2{\PackageInfo{#1}{#2, stopped}}%
-      \fi
-      \x{luatex-loader}{The package is already loaded}%
-      \aftergroup\endinput
-    \fi
-  \fi
-\endgroup%
-%    \end{macrocode}
-%    Package identification:
-%    \begin{macrocode}
-\begingroup\catcode61\catcode48\catcode32=10\relax%
-  \catcode13=5 % ^^M
-  \endlinechar=13 %
-  \catcode35=6 % #
-  \catcode39=12 % '
-  \catcode40=12 % (
-  \catcode41=12 % )
-  \catcode44=12 % ,
-  \catcode45=12 % -
-  \catcode46=12 % .
-  \catcode47=12 % /
-  \catcode58=12 % :
-  \catcode64=11 % @
-  \catcode91=12 % [
-  \catcode93=12 % ]
-  \catcode123=1 % {
-  \catcode125=2 % }
-  \expandafter\ifx\csname ProvidesPackage\endcsname\relax
-    \def\x#1#2#3[#4]{\endgroup
-      \immediate\write-1{Package: #3 #4}%
-      \xdef#1{#4}%
-    }%
-  \else
-    \def\x#1#2[#3]{\endgroup
-      #2[{#3}]%
-      \ifx#1\@undefined
-        \xdef#1{#3}%
-      \fi
-      \ifx#1\relax
-        \xdef#1{#3}%
-      \fi
-    }%
-  \fi
-\expandafter\x\csname ver@luatex-loader.sty\endcsname
-\ProvidesPackage{luatex-loader}%
-  [2019/07/25 v0.7 Lua module loader (HO)]%
-%    \end{macrocode}
-%    \begin{macrocode}
-\begingroup\catcode61\catcode48\catcode32=10\relax%
-  \catcode13=5\endlinechar=13\relax%
-  \catcode10=12 % ^^J
-  \catcode34=12 % "
-  \catcode39=12 % '
-  \catcode40=12 % (
-  \catcode41=12 % )
-  \catcode44=12 % ,
-  \catcode46=12 % .
-  \catcode60=12 % <
-  \catcode61=12 % =
-  \catcode95=12 % _ (other!)
-  \catcode96=12 % `
-  \catcode123=1 % {
-  \catcode125=2 % }
-  \endlinechar=10 %
-  \ifnum\luatexversion<36 %
-    \directlua0%
-  \else %
-    \expandafter\directlua %
-  \fi %
-  {%
-     do
-      local script = "oberdiek.luatex.lua"
-      local file = kpse.find_file(script, "texmfscripts")
-      if file then
-        texio.write_nl("(" .. file .. ")")
-        dofile(file)
-      else
-        error("File `" .. script .. "' not found")
-      end
-    end
-  }%
-\endgroup\endinput%
-%    \end{macrocode}
-%
-%    \begin{macrocode}
-%</loader>
-%    \end{macrocode}
-%
-% \subsection{Lua script}
-%
-%    Currently \LuaTeX\ does not use KPSE when searching for module
-%    files. The following Lua script implements a workaround.
-%    It extends |package.loader| by another search method.
-%    Modules are found by the module name with extension \xext{lua}
-%    similar to
-%    \begin{quote}
-%      \ttfamily |kpsewhich --format=texmfscripts| \meta{module}|.lua|
-%    \end{quote}
-%    Unhappily \textsf{kpsewhich} does not support directory components
-%    in the file name. Therefore a module |a.b.c| cannot be installed
-%    as \xfile{a/b/c.lua}. The script must be named \xfile{a.b.c.lua}.
-%    \begin{macrocode}
-%<*lua>
-%    \end{macrocode}
-%    \begin{macrocode}
-local function kpse_module_loader(module)
-  local script = module .. ".lua"
-  local file = kpse.find_file(script, "texmfscripts")
-  if file then
-    local loader, error = loadfile(file)
-    if loader then
-      texio.write_nl("(" .. file .. ")")
-      return loader
-    end
-    return "\n\t[oberdiek.luatex.kpse_module_loader] Loading error:\n\t"
-           .. error
-  end
-  return "\n\t[oberdiek.luatex.kpse_module_loader] Search failed"
-end
-%    \end{macrocode}
-% following line changed to use package.searchers instead of
-% package.loaders for current luatex; this is the only change in the
-% code.  eroux, 28apr13, (or package.loaders), 29mar14.
-%    \begin{macrocode}
-table.insert(package.searchers or package.loaders, kpse_module_loader)
-%    \end{macrocode}
-%    \begin{macrocode}
-%</lua>
-%    \end{macrocode}
-%
-% \section{Test}
-%
-%    \begin{macrocode}
-%<*test2>
-\documentclass{article}
-\def\LoadCommand{%
-  \RequirePackage{luatex}[2010/03/09]%
-}
-%</test2>
-%    \end{macrocode}
-%    \begin{macrocode}
-%<*test3>
-\documentclass{article}
-\def\LoadCommand{%
-  \RequirePackage{luatex-loader}[2010/03/09]%
-}
-%</test3>
-%    \end{macrocode}
-% \subsection{Catcode checks for loading}
-%
-%    \begin{macrocode}
-%<*test1>
-%    \end{macrocode}
-%    \begin{macrocode}
-\catcode`\{=1 %
-\catcode`\}=2 %
-\catcode`\#=6 %
-\catcode`\@=11 %
-\expandafter\ifx\csname count@\endcsname\relax
-  \countdef\count@=255 %
-\fi
-\expandafter\ifx\csname @gobble\endcsname\relax
-  \long\def\@gobble#1{}%
-\fi
-\expandafter\ifx\csname @firstofone\endcsname\relax
-  \long\def\@firstofone#1{#1}%
-\fi
-\expandafter\ifx\csname loop\endcsname\relax
-  \expandafter\@firstofone
-\else
-  \expandafter\@gobble
-\fi
-{%
-  \def\loop#1\repeat{%
-    \def\body{#1}%
-    \iterate
-  }%
-  \def\iterate{%
-    \body
-      \let\next\iterate
-    \else
-      \let\next\relax
-    \fi
-    \next
-  }%
-  \let\repeat=\fi
-}%
-\def\RestoreCatcodes{}
-\count@=0 %
-\loop
-  \edef\RestoreCatcodes{%
-    \RestoreCatcodes
-    \catcode\the\count@=\the\catcode\count@\relax
-  }%
-\ifnum\count@<255 %
-  \advance\count@ 1 %
-\repeat
-
-\def\RangeCatcodeInvalid#1#2{%
-  \count@=#1\relax
-  \loop
-    \catcode\count@=15 %
-  \ifnum\count@<#2\relax
-    \advance\count@ 1 %
-  \repeat
-}
-\def\RangeCatcodeCheck#1#2#3{%
-  \count@=#1\relax
-  \loop
-    \ifnum#3=\catcode\count@
-    \else
-      \errmessage{%
-        Character \the\count@\space
-        with wrong catcode \the\catcode\count@\space
-        instead of \number#3%
-      }%
-    \fi
-  \ifnum\count@<#2\relax
-    \advance\count@ 1 %
-  \repeat
-}
-\def\space{ }
-\expandafter\ifx\csname LoadCommand\endcsname\relax
-  \def\LoadCommand{\input luatex.sty\relax}%
-\fi
-\def\Test{%
-  \RangeCatcodeInvalid{0}{47}%
-  \RangeCatcodeInvalid{58}{64}%
-  \RangeCatcodeInvalid{91}{96}%
-  \RangeCatcodeInvalid{123}{255}%
-  \catcode`\@=12 %
-  \catcode`\\=0 %
-  \catcode`\%=14 %
-  \LoadCommand
-  \RangeCatcodeCheck{0}{36}{15}%
-  \RangeCatcodeCheck{37}{37}{14}%
-  \RangeCatcodeCheck{38}{47}{15}%
-  \RangeCatcodeCheck{48}{57}{12}%
-  \RangeCatcodeCheck{58}{63}{15}%
-  \RangeCatcodeCheck{64}{64}{12}%
-  \RangeCatcodeCheck{65}{90}{11}%
-  \RangeCatcodeCheck{91}{91}{15}%
-  \RangeCatcodeCheck{92}{92}{0}%
-  \RangeCatcodeCheck{93}{96}{15}%
-  \RangeCatcodeCheck{97}{122}{11}%
-  \RangeCatcodeCheck{123}{255}{15}%
-  \RestoreCatcodes
-}
-\Test
-\csname @@end\endcsname
-\end
-%    \end{macrocode}
-%    \begin{macrocode}
-%</test1>
-%    \end{macrocode}
-%
-% \subsection{Catcode tables}
-%
-% \subsubsection{Predefined catcode tables}
-%
-%    \begin{macrocode}
-%<*test4>
-\NeedsTeXFormat{LaTeX2e}
-%    \end{macrocode}
-%    Remember \LaTeX's initial catcodes in count registers
-%    starting at \cs{TestLaTeX}.
-%    \begin{macrocode}
-\count0=0 %
-\chardef\TestLaTeX=1000 %
-\chardef\TestMax=300 %
-\loop
-  \count\numexpr\TestLaTeX+\count0\relax=\catcode\count0 %
-\ifnum\count0<\TestMax
-  \advance\count0 by 1 %
-\repeat
-\documentclass{minimal}
-\usepackage{luatex}[2010/03/09]
-\usepackage{qstest}
-\IncludeTests{*}
-\LogTests{log}{*}{*}
-\makeatletter
-\def\Check#1{%
-  \Expect*{\the\count@=\the\catcode\count@}%
-         *{\the\count@=#1}%
-}
-\newcount\scratch
-\def\Test#1#2{%
-  \begin{qstest}{CatcodeTable#1}{CatcodeTable#1}%
-    \luatexcatcodetable\csname CatcodeTable#1\endcsname
-    \count@=\z@
-    \loop
-      \scratch=#2\relax
-      \Expect*{\the\count@=\the\catcode\count@}%
-             *{\the\count@=\the\scratch}%
-    \ifnum\count@<\TestMax
-      \advance\count@\@ne
-    \repeat
-  \end{qstest}%
-}
-\begingroup
-  % luatex-unicode-letters.tex makes some slots to letters
-  \def\TestMax{169}%
-  \Test{LaTeX}{\the\count\numexpr\TestLaTeX+\count@}%
-\endgroup
-\Test{String}{\ifnum\count@=32 10\else 12\fi}
-\Test{Other}{12}
-\luatexinitcatcodetable99 %
-\Test{IniTeX}{%
-  0\relax
-  \begingroup
-    \luatexcatcodetable99 %
-    \global\scratch=\the\catcode\count@
-  \endgroup
-}
-%    \end{macrocode}
-%
-% \subsubsection{Catcode table number stack}
-%
-%    \begin{macrocode}
-\begin{qstest}{CatcodeTableNumStack}{CatcodeTableNumStack}
-  \def\TestStack#1{%
-    \Expect*{\LuT@NumStack}{#1}%
-  }%
-  \TestStack{0}%
-  \PushCatcodeTableNumStack
-  \TestStack{{0}0}%
-  \@firstofone{%
-    \begingroup
-      \luatexinitcatcodetable12 %
-      \luatexcatcodetable12 %
-      \PushCatcodeTableNumStack
-      \TestStack{{12}{0}0}%
-      \PopCatcodeTableNumStack
-      \TestStack{{0}0}%
-      \PopCatcodeTableNumStack
-      \TestStack{0}%
-      \def\TestWarning{Missing empty stack warning}%
-      \def\@PackageWarning#1#2{\def\TestWarning{empty stack}}%
-      \PopCatcodeTableNumStack
-      \TestStack{0}%
-      \Expect*{\TestWarning}{empty stack}%
-    \endgroup
-  }%
-\end{qstest}
-%    \end{macrocode}
-%
-% \subsubsection{Catcode table stack}
-%
-%    \begin{macrocode}
-\begin{qstest}{CatcodeTableStack}{CatcodeTableStack}
-  \def\TestStack#1{%
-    \Expect*{\the\CatcodeTableStack}{#1}%
-  }%
-  \TestStack{0}%
-  \IncCatcodeTableStack
-  \TestStack{2}%
-  \IncCatcodeTableStack
-  \TestStack{4}%
-  \begingroup
-    \IncCatcodeTableStack
-    \TestStack{6}%
-  \endgroup
-  \TestStack{6}%
-  \begingroup
-    \DecCatcodeTableStack
-    \TestStack{4}%
-  \endgroup
-  \TestStack{4}%
-  \DecCatcodeTableStack
-  \TestStack{2}%
-  \DecCatcodeTableStack
-  \TestStack{0}%
-  \begingroup
-    \def\TestError{Missing error}%
-    \def\@PackageError#1#2#3{%
-      \def\TestError{Empty stack}%
-    }%
-    \DecCatcodeTableStack
-    \TestStack{0}%
-    \Expect*{\TestError}{Empty stack}%
-  \endgroup
-\end{qstest}
-%    \end{macrocode}
-%
-% \subsubsection{Catcode regime macros}
-%
-%    \begin{macrocode}
-\begin{qstest}{CatcodeRegime}{CatcodeRegime}
-  \def\TestStacks#1#2#3{%
-    \Expect*{\the\luatexcatcodetable}{#1}%
-    \Expect*{\the\CatcodeTableStack}{#2}%
-    \Expect*{\LuT@NumStack}{#3}%
-  }%
-  \TestStacks{0}{0}{0}%
-  \catcode`\|=7 %
-  \BeginCatcodeRegime\CatcodeTableLaTeX
-    \TestStacks{2}{2}{{0}0}%
-    \Expect*{\the\catcode`\|}{12}%
-  \EndCatcodeRegime
-  \TestStacks{0}{0}{0}%
-  \Expect*{\the\catcode`\|}{7}%
-\end{qstest}
-%    \end{macrocode}
-%
-% \subsection{Attribute allocation}
-%
-%    \begin{macrocode}
-\begin{qstest}{Attributes}{Attributes}
-  \newattribute\TestAttr
-  \Expect*{\meaning\TestAttr}%
-         *{\string\attribute\number\allocationnumber}%
-  \Expect*{\the\allocationnumber}{0}%
-  \begingroup
-    \newattribute\TestAttr
-    \Expect*{\the\allocationnumber}{1}%
-  \endgroup
-  \Expect*{\the\allocationnumber}{0}%
-  \Expect*{\meaning\TestAttr}*{\string\attribute1}%
-  \Expect*{\the\TestAttr}*{\number\LuT@UnsetAttributeValue}%
-  \def\Test#1{%
-    \setattribute\TestAttr{#1}%
-    \Expect*{\the\TestAttr}{#1}%
-  }%
-  \Test{0}%
-  \Test{1}%
-  \Test{-1}%
-  \Test{123}%
-  \unsetattribute\TestAttr
-  \Expect*{\the\TestAttr}*{\number\LuT@UnsetAttributeValue}%
-  \begingroup
-    \Expect*{\the\TestAttr}*{\number\LuT@UnsetAttributeValue}%
-    \Test{1234}%
-  \endgroup
-  \Expect*{\the\TestAttr}*{\number\LuT@UnsetAttributeValue}%
-\end{qstest}
-%    \end{macrocode}
-%
-%    \begin{macrocode}
-\@@end
-%</test4>
-%    \end{macrocode}
-%
-% \subsection{Short test for \plainTeX}
-%
-%    \begin{macrocode}
-%<*test5>
-\input luatex.sty\relax
-\newattribute\TestAttr
-\setattribute\TestAttr{10}
-\unsetattribute\TestAttr
-\newcatcodetable\TestCTa
-\begingroup
-  \SetCatcodeRange{`A}{`Z}{12}%
-\endgroup
-\BeginCatcodeRegime\CatcodeTableLaTeX
-\EndCatcodeRegime
-\end
-%</test5>
-%    \end{macrocode}
-%
-% \section{Installation}
-%
-% \subsection{Download}
-%
-% \paragraph{Package.} This package is available on
-% CTAN\footnote{\url{http://ctan.org/pkg/luatex}}:
-% \begin{description}
-% \item[\CTAN{macros/latex/contrib/oberdiek/luatex.dtx}] The source file.
-% \item[\CTAN{macros/latex/contrib/oberdiek/luatex.pdf}] Documentation.
-% \end{description}
-%
-%
-% \paragraph{Bundle.} All the packages of the bundle `oberdiek'
-% are also available in a TDS compliant ZIP archive. There
-% the packages are already unpacked and the documentation files
-% are generated. The files and directories obey the TDS standard.
-% \begin{description}
-% \item[\CTAN{install/macros/latex/contrib/oberdiek.tds.zip}]
-% \end{description}
-% \emph{TDS} refers to the standard ``A Directory Structure
-% for \TeX\ Files'' (\CTAN{tds/tds.pdf}). Directories
-% with \xfile{texmf} in their name are usually organized this way.
-%
-% \subsection{Bundle installation}
-%
-% \paragraph{Unpacking.} Unpack the \xfile{oberdiek.tds.zip} in the
-% TDS tree (also known as \xfile{texmf} tree) of your choice.
-% Example (linux):
-% \begin{quote}
-%   |unzip oberdiek.tds.zip -d ~/texmf|
-% \end{quote}
-%
-% \paragraph{Script installation.}
-% Check the directory \xfile{TDS:scripts/oberdiek/} for
-% scripts that need further installation steps.
-% Package \xpackage{attachfile2} comes with the Perl script
-% \xfile{pdfatfi.pl} that should be installed in such a way
-% that it can be called as \texttt{pdfatfi}.
-% Example (linux):
-% \begin{quote}
-%   |chmod +x scripts/oberdiek/pdfatfi.pl|\\
-%   |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
-% \end{quote}
-%
-% \subsection{Package installation}
-%
-% \paragraph{Unpacking.} The \xfile{.dtx} file is a self-extracting
-% \docstrip\ archive. The files are extracted by running the
-% \xfile{.dtx} through \plainTeX:
-% \begin{quote}
-%   \verb|tex luatex.dtx|
-% \end{quote}
-%
-% \paragraph{TDS.} Now the different files must be moved into
-% the different directories in your installation TDS tree
-% (also known as \xfile{texmf} tree):
-% \begin{quote}
-% \def\t{^^A
-% \begin{tabular}{@{}>{\ttfamily}l@{ $\rightarrow$ }>{\ttfamily}l@{}}
-%   luatex.sty & tex/generic/oberdiek/luatex.sty\\
-%   luatex-loader.sty & tex/generic/oberdiek/luatex-loader.sty\\
-%   oberdiek.luatex.lua & scripts/oberdiek/oberdiek.luatex.lua\\
-%   luatex.pdf & doc/latex/oberdiek/luatex.pdf\\
-%   test/luatex-test1.tex & doc/latex/oberdiek/test/luatex-test1.tex\\
-%   test/luatex-test2.tex & doc/latex/oberdiek/test/luatex-test2.tex\\
-%   test/luatex-test3.tex & doc/latex/oberdiek/test/luatex-test3.tex\\
-%   test/luatex-test4.tex & doc/latex/oberdiek/test/luatex-test4.tex\\
-%   test/luatex-test5.tex & doc/latex/oberdiek/test/luatex-test5.tex\\
-%   luatex.dtx & source/latex/oberdiek/luatex.dtx\\
-% \end{tabular}^^A
-% }^^A
-% \sbox0{\t}^^A
-% \ifdim\wd0>\linewidth
-%   \begingroup
-%     \advance\linewidth by\leftmargin
-%     \advance\linewidth by\rightmargin
-%   \edef\x{\endgroup
-%     \def\noexpand\lw{\the\linewidth}^^A
-%   }\x
-%   \def\lwbox{^^A
-%     \leavevmode
-%     \hbox to \linewidth{^^A
-%       \kern-\leftmargin\relax
-%       \hss
-%       \usebox0
-%       \hss
-%       \kern-\rightmargin\relax
-%     }^^A
-%   }^^A
-%   \ifdim\wd0>\lw
-%     \sbox0{\small\t}^^A
-%     \ifdim\wd0>\linewidth
-%       \ifdim\wd0>\lw
-%         \sbox0{\footnotesize\t}^^A
-%         \ifdim\wd0>\linewidth
-%           \ifdim\wd0>\lw
-%             \sbox0{\scriptsize\t}^^A
-%             \ifdim\wd0>\linewidth
-%               \ifdim\wd0>\lw
-%                 \sbox0{\tiny\t}^^A
-%                 \ifdim\wd0>\linewidth
-%                   \lwbox
-%                 \else
-%                   \usebox0
-%                 \fi
-%               \else
-%                 \lwbox
-%               \fi
-%             \else
-%               \usebox0
-%             \fi
-%           \else
-%             \lwbox
-%           \fi
-%         \else
-%           \usebox0
-%         \fi
-%       \else
-%         \lwbox
-%       \fi
-%     \else
-%       \usebox0
-%     \fi
-%   \else
-%     \lwbox
-%   \fi
-% \else
-%   \usebox0
-% \fi
-% \end{quote}
-% If you have a \xfile{docstrip.cfg} that configures and enables \docstrip's
-% TDS installing feature, then some files can already be in the right
-% place, see the documentation of \docstrip.
-%
-% \subsection{Refresh file name databases}
-%
-% If your \TeX~distribution
-% (\teTeX, \mikTeX, \dots) relies on file name databases, you must refresh
-% these. For example, \teTeX\ users run \verb|texhash| or
-% \verb|mktexlsr|.
-%
-% \subsection{Some details for the interested}
-%
-% \paragraph{Attached source.}
-%
-% The PDF documentation on CTAN also includes the
-% \xfile{.dtx} source file. It can be extracted by
-% AcrobatReader 6 or higher. Another option is \textsf{pdftk},
-% e.g. unpack the file into the current directory:
-% \begin{quote}
-%   \verb|pdftk luatex.pdf unpack_files output .|
-% \end{quote}
-%
-% \paragraph{Unpacking with \LaTeX.}
-% The \xfile{.dtx} chooses its action depending on the format:
-% \begin{description}
-% \item[\plainTeX:] Run \docstrip\ and extract the files.
-% \item[\LaTeX:] Generate the documentation.
-% \end{description}
-% If you insist on using \LaTeX\ for \docstrip\ (really,
-% \docstrip\ does not need \LaTeX), then inform the autodetect routine
-% about your intention:
-% \begin{quote}
-%   \verb|latex \let\install=y\input{luatex.dtx}|
-% \end{quote}
-% Do not forget to quote the argument according to the demands
-% of your shell.
-%
-% \paragraph{Generating the documentation.}
-% You can use both the \xfile{.dtx} or the \xfile{.drv} to generate
-% the documentation. The process can be configured by the
-% configuration file \xfile{ltxdoc.cfg}. For instance, put this
-% line into this file, if you want to have A4 as paper format:
-% \begin{quote}
-%   \verb|\PassOptionsToClass{a4paper}{article}|
-% \end{quote}
-% An example follows how to generate the
-% documentation with pdf\LaTeX:
-% \begin{quote}
-%\begin{verbatim}
-%pdflatex luatex.dtx
-%makeindex -s gind.ist luatex.idx
-%pdflatex luatex.dtx
-%makeindex -s gind.ist luatex.idx
-%pdflatex luatex.dtx
-%\end{verbatim}
-% \end{quote}
-%
-% \section{Catalogue}
-%
-% The following XML file can be used as source for the
-% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
-% The elements \texttt{caption} and \texttt{description} are imported
-% from the original XML file from the Catalogue.
-% The name of the XML file in the Catalogue is \xfile{luatex.xml}.
-%    \begin{macrocode}
-%<*catalogue>
-<?xml version='1.0' encoding='us-ascii'?>
-<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
-<entry datestamp='$Date$' modifier='$Author$' id='luatex'>
-  <name>luatex</name>
-  <caption>The LuaTeX engine.</caption>
-  <authorref id='auth:oberdiek'/>
-  <copyright owner='Heiko Oberdiek' year='2007,2009,2010'/>
-  <license type='lppl1.3'/>
-  <version number='0.6'/>
-  <description>
-    LuaTeX is an extended version of pdfTeX using Lua as an embedded
-    scripting language.  The LuaTeX project&#x2019;s main objective
-    is to provide an open and configurable variant of TeX while at the
-    same time offering downward compatibility.
-    <p/>
-    LuaTeX uses Unicode (as UTF-8) as its default input encoding, and
-    is able to use modern (OpenType) fonts (for both text and mathematics).
-    <p/>
-    It should be noted that LuaTeX is still under development; its
-    specification has been declared stable, but absolute stability
-    may not in practice be assumed.
-    <p/>
-    The package is part of the <xref refid='oberdiek'>oberdiek</xref> bundle.
-  </description>
-  <documentation details='Package documentation'
-      href='ctan:/macros/latex/contrib/oberdiek/luatex.pdf'/>
-  <ctan file='true' path='/macros/latex/contrib/oberdiek/luatex.dtx'/>
-  <miktex location='oberdiek'/>
-  <texlive location='oberdiek'/>
-  <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
-</entry>
-%</catalogue>
-%    \end{macrocode}
-%
-% \begin{History}
-%   \begin{Version}{2007/12/12 v0.1}
-%   \item
-%     First public version.
-%   \end{Version}
-%   \begin{Version}{2009/04/10 v0.2}
-%   \item
-%     Requires package \xpackage{ifluatex} in version 2.0 to ensure
-%     \cs{luatexversion}.
-%   \item
-%     Updates the call of \cs{directlua}, the syntax has changed
-%     in \LuaTeX\ 0.36.
-%   \end{Version}
-%   \begin{Version}{2009/12/02 v0.3}
-%   \item
-%     Unsetting of attributes updated for \LuaTeX\ 0.37.
-%   \end{Version}
-%   \begin{Version}{2010/03/09 v0.4}
-%   \item
-%     Support for lua states removed.
-%   \item
-%     Calling tex.enableprimitives for used primitives.
-%   \end{Version}
-%   \begin{Version}{2016/05/10 v0.5}
-%   \item
-%    Use package.searchers
-%   \item only conditionally define commands such as
-%   \verb|\newcatcodetable|
-%   that are now defined in the Lua\LaTeX\ format.
-%   \end{Version}
-%   \begin{Version}{2016/05/16 v0.6}
-%   \item
-%     Documentation updates.
-%   \end{Version}
-%   \begin{Version}{2019/07/25 v0.7}
-%   \item
-%     remove uses of module function, see PR70
-%   \end{Version}
-% \end{History}
-%
-% \PrintIndex
-%
-% \Finale
-\endinput
diff --git a/macros/latex/contrib/oberdiek/luatex.pdf b/macros/latex/contrib/oberdiek/luatex.pdf
deleted file mode 100644
index 77175cd011..0000000000
--- a/macros/latex/contrib/oberdiek/luatex.pdf
+++ /dev/null
diff --git a/macros/latex/contrib/oberdiek/magicnum.dtx b/macros/latex/contrib/oberdiek/magicnum.dtx
index 7c24944fed..0147bf1f05 100644
--- a/macros/latex/contrib/oberdiek/magicnum.dtx
+++ b/macros/latex/contrib/oberdiek/magicnum.dtx
@@ -13,15 +13,17 @@
 % conditions of the LaTeX Project Public License, either
 % version 1.3c of this license or (at your option) any later
 % version. This version of this license is in
-%    http://www.latex-project.org/lppl/lppl-1-3c.txt
+%    https://www.latex-project.org/lppl/lppl-1-3c.txt
 % and the latest version of this license is in
-%    http://www.latex-project.org/lppl.txt
+%    https://www.latex-project.org/lppl.txt
 % and version 1.3 or later is part of all distributions of
 % LaTeX version 2005/12/01 or later.
 %
 % This work has the LPPL maintenance status "maintained".
 %
-% This Current Maintainer of this work is Heiko Oberdiek.
+% The Current Maintainers of this work are
+% Heiko Oberdiek and the Oberdiek Package Support Group
+% https://github.com/ho-tex/oberdiek/issues
 %
 % The Base Interpreter refers to any `TeX-Format',
 % because some files are installed in TDS:tex/generic//.
@@ -110,15 +112,18 @@ This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either
 version 1.3c of this license or (at your option) any later
 version. This version of this license is in
-   http://www.latex-project.org/lppl/lppl-1-3c.txt
+   https://www.latex-project.org/lppl/lppl-1-3c.txt
 and the latest version of this license is in
-   http://www.latex-project.org/lppl.txt
+   https://www.latex-project.org/lppl.txt
 and version 1.3 or later is part of all distributions of
 LaTeX version 2005/12/01 or later.
 
 This work has the LPPL maintenance status "maintained".
 
-This Current Maintainer of this work is Heiko Oberdiek.
+The Current Maintainers of this work are
+Heiko Oberdiek and the Oberdiek Package Support Group
+https://github.com/ho-tex/oberdiek/issues
+
 
 The Base Interpreter refers to any `TeX-Format',
 because some files are installed in TDS:tex/generic//.
@@ -221,8 +226,7 @@ and the derived files
 % \title{The \xpackage{magicnum} package}
 % \date{2019/07/25 v1.6}
 % \author{Heiko Oberdiek\thanks
-% {Please report any issues at https://github.com/ho-tex/oberdiek/issues}\\
-% \xemail{heiko.oberdiek at googlemail.com}}
+% {Please report any issues at \url{https://github.com/ho-tex/oberdiek/issues}}}
 %
 % \maketitle
 %
@@ -1343,7 +1347,7 @@ end
 % \subsection{Download}
 %
 % \paragraph{Package.} This package is available on
-% CTAN\footnote{\url{http://ctan.org/pkg/magicnum}}:
+% CTAN\footnote{\CTANpkg{magicnum}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/magicnum.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/magicnum.pdf}] Documentation.
@@ -1355,7 +1359,7 @@ end
 % the packages are already unpacked and the documentation files
 % are generated. The files and directories obey the TDS standard.
 % \begin{description}
-% \item[\CTAN{install/macros/latex/contrib/oberdiek.tds.zip}]
+% \item[\CTANinstall{install/macros/latex/contrib/oberdiek.tds.zip}]
 % \end{description}
 % \emph{TDS} refers to the standard ``A Directory Structure
 % for \TeX\ Files'' (\CTAN{tds/tds.pdf}). Directories
@@ -1481,16 +1485,6 @@ end
 %
 % \subsection{Some details for the interested}
 %
-% \paragraph{Attached source.}
-%
-% The PDF documentation on CTAN also includes the
-% \xfile{.dtx} source file. It can be extracted by
-% AcrobatReader 6 or higher. Another option is \textsf{pdftk},
-% e.g. unpack the file into the current directory:
-% \begin{quote}
-%   \verb|pdftk magicnum.pdf unpack_files output .|
-% \end{quote}
-%
 % \paragraph{Unpacking with \LaTeX.}
 % The \xfile{.dtx} chooses its action depending on the format:
 % \begin{description}
@@ -1526,42 +1520,6 @@ end
 %\end{verbatim}
 % \end{quote}
 %
-% \section{Catalogue}
-%
-% The following XML file can be used as source for the
-% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
-% The elements \texttt{caption} and \texttt{description} are imported
-% from the original XML file from the Catalogue.
-% The name of the XML file in the Catalogue is \xfile{magicnum.xml}.
-%    \begin{macrocode}
-%<*catalogue>
-<?xml version='1.0' encoding='us-ascii'?>
-<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
-<entry datestamp='$Date$' modifier='$Author$' id='magicnum'>
-  <name>magicnum</name>
-  <caption>Access TeX systems' "magic numbers".</caption>
-  <authorref id='auth:oberdiek'/>
-  <copyright owner='Heiko Oberdiek' year='2007,2009-2011'/>
-  <license type='lppl1.3'/>
-  <version number='1.6'/>
-  <description>
-    This package allows access to the various parameter values in
-    TeX (catcode values), e-TeX (group, if and node types, and
-    interaction mode), and LuaTeX (pdfliteral mode) by a hierarchical
-    name system.
-    <p/>
-    The package is part of the <xref refid='oberdiek'>oberdiek</xref> bundle.
-  </description>
-  <documentation details='Package documentation'
-      href='ctan:/macros/latex/contrib/oberdiek/magicnum.pdf'/>
-  <ctan file='true' path='/macros/latex/contrib/oberdiek/magicnum.dtx'/>
-  <miktex location='oberdiek'/>
-  <texlive location='oberdiek'/>
-  <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
-</entry>
-%</catalogue>
-%    \end{macrocode}
-%
 % \begin{History}
 %   \begin{Version}{2007/12/12 v1.0}
 %   \item
diff --git a/macros/latex/contrib/oberdiek/magicnum.pdf b/macros/latex/contrib/oberdiek/magicnum.pdf
index 19fd13f23b..d529d45b95 100644
--- a/macros/latex/contrib/oberdiek/magicnum.pdf
+++ b/macros/latex/contrib/oberdiek/magicnum.pdf
diff --git a/macros/latex/contrib/oberdiek/makerobust.dtx b/macros/latex/contrib/oberdiek/makerobust.dtx
deleted file mode 100644
index e63b5e5c53..0000000000
--- a/macros/latex/contrib/oberdiek/makerobust.dtx
+++ /dev/null
@@ -1,553 +0,0 @@
-% \iffalse meta-comment
-%
-% File: makerobust.dtx
-% Version: 2016/05/16 v1.1
-% Info: Make existing macro robust
-%
-% Copyright (C) 2006 by
-%    Heiko Oberdiek <heiko.oberdiek at googlemail.com>
-%    2016
-%    https://github.com/ho-tex/oberdiek/issues
-%
-% This work may be distributed and/or modified under the
-% conditions of the LaTeX Project Public License, either
-% version 1.3c of this license or (at your option) any later
-% version. This version of this license is in
-%    http://www.latex-project.org/lppl/lppl-1-3c.txt
-% and the latest version of this license is in
-%    http://www.latex-project.org/lppl.txt
-% and version 1.3 or later is part of all distributions of
-% LaTeX version 2005/12/01 or later.
-%
-% This work has the LPPL maintenance status "maintained".
-%
-% This Current Maintainer of this work is Heiko Oberdiek.
-%
-% This work consists of the main source file makerobust.dtx
-% and the derived files
-%    makerobust.sty, makerobust.pdf, makerobust.ins, makerobust.drv,
-%    makerobust-example.tex.
-%
-% Distribution:
-%    CTAN:macros/latex/contrib/oberdiek/makerobust.dtx
-%    CTAN:macros/latex/contrib/oberdiek/makerobust.pdf
-%
-% Unpacking:
-%    (a) If makerobust.ins is present:
-%           tex makerobust.ins
-%    (b) Without makerobust.ins:
-%           tex makerobust.dtx
-%    (c) If you insist on using LaTeX
-%           latex \let\install=y\input{makerobust.dtx}
-%        (quote the arguments according to the demands of your shell)
-%
-% Documentation:
-%    (a) If makerobust.drv is present:
-%           latex makerobust.drv
-%    (b) Without makerobust.drv:
-%           latex makerobust.dtx; ...
-%    The class ltxdoc loads the configuration file ltxdoc.cfg
-%    if available. Here you can specify further options, e.g.
-%    use A4 as paper format:
-%       \PassOptionsToClass{a4paper}{article}
-%
-%    Programm calls to get the documentation (example):
-%       pdflatex makerobust.dtx
-%       makeindex -s gind.ist makerobust.idx
-%       pdflatex makerobust.dtx
-%       makeindex -s gind.ist makerobust.idx
-%       pdflatex makerobust.dtx
-%
-% Installation:
-%    TDS:tex/latex/oberdiek/makerobust.sty
-%    TDS:doc/latex/oberdiek/makerobust.pdf
-%    TDS:doc/latex/oberdiek/makerobust-example.tex
-%    TDS:source/latex/oberdiek/makerobust.dtx
-%
-%<*ignore>
-\begingroup
-  \catcode123=1 %
-  \catcode125=2 %
-  \def\x{LaTeX2e}%
-\expandafter\endgroup
-\ifcase 0\ifx\install y1\fi\expandafter
-         \ifx\csname processbatchFile\endcsname\relax\else1\fi
-         \ifx\fmtname\x\else 1\fi\relax
-\else\csname fi\endcsname
-%</ignore>
-%<*install>
-\input docstrip.tex
-\Msg{************************************************************************}
-\Msg{* Installation}
-\Msg{* Package: makerobust 2016/05/16 v1.1 Make existing macro robust (HO)}
-\Msg{************************************************************************}
-
-\keepsilent
-\askforoverwritefalse
-
-\let\MetaPrefix\relax
-\preamble
-
-This is a generated file.
-
-Project: makerobust
-Version: 2016/05/16 v1.1
-
-Copyright (C) 2006 by
-   Heiko Oberdiek <heiko.oberdiek at googlemail.com>
-
-This work may be distributed and/or modified under the
-conditions of the LaTeX Project Public License, either
-version 1.3c of this license or (at your option) any later
-version. This version of this license is in
-   http://www.latex-project.org/lppl/lppl-1-3c.txt
-and the latest version of this license is in
-   http://www.latex-project.org/lppl.txt
-and version 1.3 or later is part of all distributions of
-LaTeX version 2005/12/01 or later.
-
-This work has the LPPL maintenance status "maintained".
-
-This Current Maintainer of this work is Heiko Oberdiek.
-
-This work consists of the main source file makerobust.dtx
-and the derived files
-   makerobust.sty, makerobust.pdf, makerobust.ins, makerobust.drv,
-   makerobust-example.tex.
-
-\endpreamble
-\let\MetaPrefix\DoubleperCent
-
-\generate{%
-  \file{makerobust.ins}{\from{makerobust.dtx}{install}}%
-  \file{makerobust.drv}{\from{makerobust.dtx}{driver}}%
-  \usedir{tex/latex/oberdiek}%
-  \file{makerobust.sty}{\from{makerobust.dtx}{package}}%
-  \usedir{doc/latex/oberdiek}%
-  \file{makerobust-example.tex}{\from{makerobust.dtx}{example}}%
-  \nopreamble
-  \nopostamble
-%  \usedir{source/latex/oberdiek/catalogue}%
-%  \file{makerobust.xml}{\from{makerobust.dtx}{catalogue}}%
-}
-
-\catcode32=13\relax% active space
-\let =\space%
-\Msg{************************************************************************}
-\Msg{*}
-\Msg{* To finish the installation you have to move the following}
-\Msg{* file into a directory searched by TeX:}
-\Msg{*}
-\Msg{*     makerobust.sty}
-\Msg{*}
-\Msg{* To produce the documentation run the file `makerobust.drv'}
-\Msg{* through LaTeX.}
-\Msg{*}
-\Msg{* Happy TeXing!}
-\Msg{*}
-\Msg{************************************************************************}
-
-\endbatchfile
-%</install>
-%<*ignore>
-\fi
-%</ignore>
-%<*driver>
-\NeedsTeXFormat{LaTeX2e}
-\ProvidesFile{makerobust.drv}%
-  [2016/05/16 v1.1 Make existing macro robust (HO)]%
-\documentclass{ltxdoc}
-\usepackage{holtxdoc}[2011/11/22]
-\begin{document}
-  \DocInput{makerobust.dtx}%
-\end{document}
-%</driver>
-% \fi
-%
-%
-% \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
-%   Lower-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
-%   Digits        \0\1\2\3\4\5\6\7\8\9
-%   Exclamation   \!     Double quote  \"     Hash (number) \#
-%   Dollar        \$     Percent       \%     Ampersand     \&
-%   Acute accent  \'     Left paren    \(     Right paren   \)
-%   Asterisk      \*     Plus          \+     Comma         \,
-%   Minus         \-     Point         \.     Solidus       \/
-%   Colon         \:     Semicolon     \;     Less than     \<
-%   Equals        \=     Greater than  \>     Question mark \?
-%   Commercial at \@     Left bracket  \[     Backslash     \\
-%   Right bracket \]     Circumflex    \^     Underscore    \_
-%   Grave accent  \`     Left brace    \{     Vertical bar  \|
-%   Right brace   \}     Tilde         \~}
-%
-% \GetFileInfo{makerobust.drv}
-%
-% \title{The \xpackage{makerobust} package}
-% \date{2016/05/16 v1.1}
-% \author{Heiko Oberdiek\thanks
-% {Please report any issues at https://github.com/ho-tex/oberdiek/issues}\\
-% \xemail{heiko.oberdiek at googlemail.com}}
-%
-% \maketitle
-%
-% \begin{abstract}
-% Package \xpackage{makerobust} provides \cs{MakeRobustCommand}
-% that converts an existing macro to a robust one.
-% \end{abstract}
-%
-% \tableofcontents
-%
-% \section{User interface}
-%
-% \LaTeX\ offers \cs{DeclareRobustCommand} to define a robust macro
-% that does not break if it is used in moving arguments.
-% Sometimes a macro is already defined, but not robust. For
-% example, \cs{(} and \cs{)} are not robust, inside \cs{section}
-% the user must use \cs{protect} explicitly. This could be
-% avoided by making \cs{(} and \cs{)} robust.
-%
-% \begin{declcs}{MakeRobustCommand}\M{cmd}
-% \end{declcs}
-% \cs{MakeRobustCommand} redefines the macro \meta{cmd}
-% by using \cs{DeclareRobustCommand} and the existing definition
-% of the macro \meta{cmd}.
-% \begin{itemize}
-% \item It is an error if \meta{cmd} is undefined. If you want to
-%   define a robust command, then you can use \cs{DeclareRobustCommand}
-%   directly.
-% \item If the macro has previously been
-%   defined by \cs{DeclareRobustCommand} then the redefinition of
-%   \cs{MakeRobustCommand} is omitted, because the macro is already robust.
-%   Only an information entry is written to the \xfile{.log} file.
-%   Thus you do not get a warning or an error if the macro is already
-%   robust because of an updated LaTeX or package that defines the macro.
-% \item Two macros are defined for a macro, defined
-%   by \cs{DeclareRobustCommand}. Example:
-%   \begin{quote}
-%   |\DeclareRobustCommand{\foobar}{definition text}|
-%   \end{quote}
-%   Then the macro ``\cs{foobar}'' contains the protection code
-%   and, depending on the protection mode,
-%   calls the internal macro ``\cs{foobar }''. Notice the space
-%   at the end of the macro name.
-%   This internal macro ``\cs{foobar }'' now contains the definition
-%   ``|definition text|'', given in \cs{DeclareRobustCommand}.
-%
-%   Sometimes it can happen, that the internal macro already exists.
-%   This can be caused by a previous \cs{DeclareRobustCommand} followed
-%   by \cs{renewcommand}. Then the redefinition by \cs{MakeRobustCommand}
-%   would be safe.
-%
-%   However, it can also be possible that the macro is already robust,
-%   using the internal macro, but with a different protection code.
-%   The redefinition by \cs{MakeRobustCommand} would then generate
-%   an infinite loop.
-%
-%   Therefore \cs{MakeRobustCommand} raises an error message,
-%   if the internal macro (with space at the end) already exists.
-% \end{itemize}
-%
-% \subsection{Example}
-%
-%    \begin{macrocode}
-%<*example>
-\documentclass{article}
-\usepackage{makerobust}
-\MakeRobustCommand\(
-\MakeRobustCommand\)
-\pagestyle{headings}
-\begin{document}
-\tableofcontents
-\section{Einstein: \(E=mc^2\)}
-\newpage
-Second page.
-\end{document}
-%</example>
-%    \end{macrocode}
-%
-%
-% \StopEventually{
-% }
-%
-% \section{Implementation}
-%
-%    \begin{macrocode}
-%<*package>
-\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{makerobust}%
-  [2016/05/16 v1.1 Make existing macro robust (HO)]%
-%    \end{macrocode}
-%
-%    \begin{macrocode}
-\def\MakeRobustCommand#1{%
-  \begingroup
-  \@ifundefined{\expandafter\@gobble\string#1}{%
-    \endgroup
-    \PackageError{makerobust}{%
-      Macro \string`\string#1\string' is not defined%
-    }\@ehc
-  }{%
-    \global\let\MR@gtemp#1%
-    \let#1\@undefined
-    \expandafter\let\expandafter\MR@temp
-        \csname\expandafter\@gobble\string#1 \endcsname
-    \DeclareRobustCommand#1{}%
-    \ifx#1\MR@gtemp
-      \endgroup
-      \PackageInfo{makerobust}{%
-        \string`\string#1\string' is already robust%
-      }%
-    \else
-      \@ifundefined{MR@temp}{%
-        \global\let\MR@gtemp#1%
-        \endgroup
-        \expandafter\let\csname\expandafter\@gobble\string#1 \endcsname#1%
-        \let#1\MR@gtemp
-      }{%
-        \endgroup
-        \PackageError{makerobust}{%
-          Internal macro \string`\string#1 \string' already exists%
-        }\@ehc
-      }%
-    \fi
-  }%
-}
-%    \end{macrocode}
-%
-%    \begin{macrocode}
-%</package>
-%    \end{macrocode}
-%
-% \section{Installation}
-%
-% \subsection{Download}
-%
-% \paragraph{Package.} This package is available on
-% CTAN\footnote{\url{http://ctan.org/pkg/makerobust}}:
-% \begin{description}
-% \item[\CTAN{macros/latex/contrib/oberdiek/makerobust.dtx}] The source file.
-% \item[\CTAN{macros/latex/contrib/oberdiek/makerobust.pdf}] Documentation.
-% \end{description}
-%
-%
-% \paragraph{Bundle.} All the packages of the bundle `oberdiek'
-% are also available in a TDS compliant ZIP archive. There
-% the packages are already unpacked and the documentation files
-% are generated. The files and directories obey the TDS standard.
-% \begin{description}
-% \item[\CTAN{install/macros/latex/contrib/oberdiek.tds.zip}]
-% \end{description}
-% \emph{TDS} refers to the standard ``A Directory Structure
-% for \TeX\ Files'' (\CTAN{tds/tds.pdf}). Directories
-% with \xfile{texmf} in their name are usually organized this way.
-%
-% \subsection{Bundle installation}
-%
-% \paragraph{Unpacking.} Unpack the \xfile{oberdiek.tds.zip} in the
-% TDS tree (also known as \xfile{texmf} tree) of your choice.
-% Example (linux):
-% \begin{quote}
-%   |unzip oberdiek.tds.zip -d ~/texmf|
-% \end{quote}
-%
-% \paragraph{Script installation.}
-% Check the directory \xfile{TDS:scripts/oberdiek/} for
-% scripts that need further installation steps.
-% Package \xpackage{attachfile2} comes with the Perl script
-% \xfile{pdfatfi.pl} that should be installed in such a way
-% that it can be called as \texttt{pdfatfi}.
-% Example (linux):
-% \begin{quote}
-%   |chmod +x scripts/oberdiek/pdfatfi.pl|\\
-%   |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
-% \end{quote}
-%
-% \subsection{Package installation}
-%
-% \paragraph{Unpacking.} The \xfile{.dtx} file is a self-extracting
-% \docstrip\ archive. The files are extracted by running the
-% \xfile{.dtx} through \plainTeX:
-% \begin{quote}
-%   \verb|tex makerobust.dtx|
-% \end{quote}
-%
-% \paragraph{TDS.} Now the different files must be moved into
-% the different directories in your installation TDS tree
-% (also known as \xfile{texmf} tree):
-% \begin{quote}
-% \def\t{^^A
-% \begin{tabular}{@{}>{\ttfamily}l@{ $\rightarrow$ }>{\ttfamily}l@{}}
-%   makerobust.sty & tex/latex/oberdiek/makerobust.sty\\
-%   makerobust.pdf & doc/latex/oberdiek/makerobust.pdf\\
-%   makerobust-example.tex & doc/latex/oberdiek/makerobust-example.tex\\
-%   makerobust.dtx & source/latex/oberdiek/makerobust.dtx\\
-% \end{tabular}^^A
-% }^^A
-% \sbox0{\t}^^A
-% \ifdim\wd0>\linewidth
-%   \begingroup
-%     \advance\linewidth by\leftmargin
-%     \advance\linewidth by\rightmargin
-%   \edef\x{\endgroup
-%     \def\noexpand\lw{\the\linewidth}^^A
-%   }\x
-%   \def\lwbox{^^A
-%     \leavevmode
-%     \hbox to \linewidth{^^A
-%       \kern-\leftmargin\relax
-%       \hss
-%       \usebox0
-%       \hss
-%       \kern-\rightmargin\relax
-%     }^^A
-%   }^^A
-%   \ifdim\wd0>\lw
-%     \sbox0{\small\t}^^A
-%     \ifdim\wd0>\linewidth
-%       \ifdim\wd0>\lw
-%         \sbox0{\footnotesize\t}^^A
-%         \ifdim\wd0>\linewidth
-%           \ifdim\wd0>\lw
-%             \sbox0{\scriptsize\t}^^A
-%             \ifdim\wd0>\linewidth
-%               \ifdim\wd0>\lw
-%                 \sbox0{\tiny\t}^^A
-%                 \ifdim\wd0>\linewidth
-%                   \lwbox
-%                 \else
-%                   \usebox0
-%                 \fi
-%               \else
-%                 \lwbox
-%               \fi
-%             \else
-%               \usebox0
-%             \fi
-%           \else
-%             \lwbox
-%           \fi
-%         \else
-%           \usebox0
-%         \fi
-%       \else
-%         \lwbox
-%       \fi
-%     \else
-%       \usebox0
-%     \fi
-%   \else
-%     \lwbox
-%   \fi
-% \else
-%   \usebox0
-% \fi
-% \end{quote}
-% If you have a \xfile{docstrip.cfg} that configures and enables \docstrip's
-% TDS installing feature, then some files can already be in the right
-% place, see the documentation of \docstrip.
-%
-% \subsection{Refresh file name databases}
-%
-% If your \TeX~distribution
-% (\teTeX, \mikTeX, \dots) relies on file name databases, you must refresh
-% these. For example, \teTeX\ users run \verb|texhash| or
-% \verb|mktexlsr|.
-%
-% \subsection{Some details for the interested}
-%
-% \paragraph{Attached source.}
-%
-% The PDF documentation on CTAN also includes the
-% \xfile{.dtx} source file. It can be extracted by
-% AcrobatReader 6 or higher. Another option is \textsf{pdftk},
-% e.g. unpack the file into the current directory:
-% \begin{quote}
-%   \verb|pdftk makerobust.pdf unpack_files output .|
-% \end{quote}
-%
-% \paragraph{Unpacking with \LaTeX.}
-% The \xfile{.dtx} chooses its action depending on the format:
-% \begin{description}
-% \item[\plainTeX:] Run \docstrip\ and extract the files.
-% \item[\LaTeX:] Generate the documentation.
-% \end{description}
-% If you insist on using \LaTeX\ for \docstrip\ (really,
-% \docstrip\ does not need \LaTeX), then inform the autodetect routine
-% about your intention:
-% \begin{quote}
-%   \verb|latex \let\install=y\input{makerobust.dtx}|
-% \end{quote}
-% Do not forget to quote the argument according to the demands
-% of your shell.
-%
-% \paragraph{Generating the documentation.}
-% You can use both the \xfile{.dtx} or the \xfile{.drv} to generate
-% the documentation. The process can be configured by the
-% configuration file \xfile{ltxdoc.cfg}. For instance, put this
-% line into this file, if you want to have A4 as paper format:
-% \begin{quote}
-%   \verb|\PassOptionsToClass{a4paper}{article}|
-% \end{quote}
-% An example follows how to generate the
-% documentation with pdf\LaTeX:
-% \begin{quote}
-%\begin{verbatim}
-%pdflatex makerobust.dtx
-%makeindex -s gind.ist makerobust.idx
-%pdflatex makerobust.dtx
-%makeindex -s gind.ist makerobust.idx
-%pdflatex makerobust.dtx
-%\end{verbatim}
-% \end{quote}
-%
-% \section{Catalogue}
-%
-% The following XML file can be used as source for the
-% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
-% The elements \texttt{caption} and \texttt{description} are imported
-% from the original XML file from the Catalogue.
-% The name of the XML file in the Catalogue is \xfile{makerobust.xml}.
-%    \begin{macrocode}
-%<*catalogue>
-<?xml version='1.0' encoding='us-ascii'?>
-<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
-<entry datestamp='$Date$' modifier='$Author$' id='makerobust'>
-  <name>makerobust</name>
-  <caption>Making a macro robust.</caption>
-  <authorref id='auth:oberdiek'/>
-  <copyright owner='Heiko Oberdiek' year='2006'/>
-  <license type='lppl1.3'/>
-  <version number='1.1'/>
-  <description>
-    This package provides the command MakeRobustCommand
-    that converts an existing macro to a robust one.
-    <p/>
-    The package is part of the <xref refid='oberdiek'>oberdiek</xref>
-    bundle.
-  </description>
-  <documentation details='Package documentation'
-      href='ctan:/macros/latex/contrib/oberdiek/makerobust.pdf'/>
-  <ctan file='true' path='/macros/latex/contrib/oberdiek/makerobust.dtx'/>
-  <miktex location='oberdiek'/>
-  <texlive location='oberdiek'/>
-  <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
-</entry>
-%</catalogue>
-%    \end{macrocode}
-%
-% \begin{History}
-%   \begin{Version}{2006/03/18 v1.0}
-%   \item
-%     First version.
-%   \end{Version}
-%   \begin{Version}{2016/05/16 v1.1}
-%   \item
-%     Documentation updates.
-%   \end{Version}
-% \end{History}
-%
-% \PrintIndex
-%
-% \Finale
-\endinput
diff --git a/macros/latex/contrib/oberdiek/makerobust.pdf b/macros/latex/contrib/oberdiek/makerobust.pdf
deleted file mode 100644
index 2496be82b1..0000000000
--- a/macros/latex/contrib/oberdiek/makerobust.pdf
+++ /dev/null
diff --git a/macros/latex/contrib/oberdiek/mleftright.dtx b/macros/latex/contrib/oberdiek/mleftright.dtx
index 46880ecb0e..cc83370e41 100644
--- a/macros/latex/contrib/oberdiek/mleftright.dtx
+++ b/macros/latex/contrib/oberdiek/mleftright.dtx
@@ -13,15 +13,17 @@
 % conditions of the LaTeX Project Public License, either
 % version 1.3c of this license or (at your option) any later
 % version. This version of this license is in
-%    http://www.latex-project.org/lppl/lppl-1-3c.txt
+%    https://www.latex-project.org/lppl/lppl-1-3c.txt
 % and the latest version of this license is in
-%    http://www.latex-project.org/lppl.txt
+%    https://www.latex-project.org/lppl.txt
 % and version 1.3 or later is part of all distributions of
 % LaTeX version 2005/12/01 or later.
 %
 % This work has the LPPL maintenance status "maintained".
 %
-% This Current Maintainer of this work is Heiko Oberdiek.
+% The Current Maintainers of this work are
+% Heiko Oberdiek and the Oberdiek Package Support Group
+% https://github.com/ho-tex/oberdiek/issues
 %
 % The Base Interpreter refers to any `TeX-Format',
 % because some files are installed in TDS:tex/generic//.
@@ -103,15 +105,18 @@ This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either
 version 1.3c of this license or (at your option) any later
 version. This version of this license is in
-   http://www.latex-project.org/lppl/lppl-1-3c.txt
+   https://www.latex-project.org/lppl/lppl-1-3c.txt
 and the latest version of this license is in
-   http://www.latex-project.org/lppl.txt
+   https://www.latex-project.org/lppl.txt
 and version 1.3 or later is part of all distributions of
 LaTeX version 2005/12/01 or later.
 
 This work has the LPPL maintenance status "maintained".
 
-This Current Maintainer of this work is Heiko Oberdiek.
+The Current Maintainers of this work are
+Heiko Oberdiek and the Oberdiek Package Support Group
+https://github.com/ho-tex/oberdiek/issues
+
 
 The Base Interpreter refers to any `TeX-Format',
 because some files are installed in TDS:tex/generic//.
@@ -193,8 +198,7 @@ and the derived files
 % \title{The \xpackage{mleftright} package}
 % \date{2016/05/16 v1.1}
 % \author{Heiko Oberdiek\thanks
-% {Please report any issues at https://github.com/ho-tex/oberdiek/issues}\\
-% \xemail{heiko.oberdiek at googlemail.com}}
+% {Please report any issues at \url{https://github.com/ho-tex/oberdiek/issues}}}
 %
 % \maketitle
 %
@@ -717,7 +721,7 @@ and the derived files
 % \subsection{Download}
 %
 % \paragraph{Package.} This package is available on
-% CTAN\footnote{\url{http://ctan.org/pkg/mleftright}}:
+% CTAN\footnote{\CTANpkg{mleftright}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/mleftright.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/mleftright.pdf}] Documentation.
@@ -729,7 +733,7 @@ and the derived files
 % the packages are already unpacked and the documentation files
 % are generated. The files and directories obey the TDS standard.
 % \begin{description}
-% \item[\CTAN{install/macros/latex/contrib/oberdiek.tds.zip}]
+% \item[\CTANinstall{install/macros/latex/contrib/oberdiek.tds.zip}]
 % \end{description}
 % \emph{TDS} refers to the standard ``A Directory Structure
 % for \TeX\ Files'' (\CTAN{tds/tds.pdf}). Directories
@@ -849,16 +853,6 @@ and the derived files
 %
 % \subsection{Some details for the interested}
 %
-% \paragraph{Attached source.}
-%
-% The PDF documentation on CTAN also includes the
-% \xfile{.dtx} source file. It can be extracted by
-% AcrobatReader 6 or higher. Another option is \textsf{pdftk},
-% e.g. unpack the file into the current directory:
-% \begin{quote}
-%   \verb|pdftk mleftright.pdf unpack_files output .|
-% \end{quote}
-%
 % \paragraph{Unpacking with \LaTeX.}
 % The \xfile{.dtx} chooses its action depending on the format:
 % \begin{description}
@@ -894,42 +888,6 @@ and the derived files
 %\end{verbatim}
 % \end{quote}
 %
-% \section{Catalogue}
-%
-% The following XML file can be used as source for the
-% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
-% The elements \texttt{caption} and \texttt{description} are imported
-% from the original XML file from the Catalogue.
-% The name of the XML file in the Catalogue is \xfile{mleftright.xml}.
-%    \begin{macrocode}
-%<*catalogue>
-<?xml version='1.0' encoding='us-ascii'?>
-<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
-<entry datestamp='$Date$' modifier='$Author$' id='mleftright'>
-  <name>mleftright</name>
-  <caption>Variants of delimiters that act as maths open/close.</caption>
-  <authorref id='auth:oberdiek'/>
-  <copyright owner='Heiko Oberdiek' year='2010'/>
-  <license type='lppl1.3'/>
-  <version number='1.1'/>
-  <description>
-    The package defines variants <tt>\mleft</tt> and <tt>\mright</tt>
-    of <tt>\left</tt> and <tt>\right</tt>, that make the delimiters
-    act as <tt>\mathopen</tt> and <tt>\mathclose</tt>.  These commands
-    address spacing difficulties in subformulas.
-    <p/>
-    The package is part of the <xref refid='oberdiek'>oberdiek</xref> bundle.
-  </description>
-  <documentation details='Package documentation'
-      href='ctan:/macros/latex/contrib/oberdiek/mleftright.pdf'/>
-  <ctan file='true' path='/macros/latex/contrib/oberdiek/mleftright.dtx'/>
-  <miktex location='oberdiek'/>
-  <texlive location='oberdiek'/>
-  <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
-</entry>
-%</catalogue>
-%    \end{macrocode}
-%
 % \section{Acknowledgement}
 %
 % \begin{description}
@@ -948,7 +906,7 @@ and the derived files
 %   Message-ID: \texttt{\small 5d264909-7c3d-4c9d-9b22-434178b2bf90@g21g2000prn.googlegroups.com},
 %   2010-08-12.
 %   \newblock
-%   {\small\url{http://groups.google.com/group/comp.text.tex/msg/e5b6833da7dc29bf}}
+%   {\small\url{https://groups.google.com/group/comp.text.tex/msg/e5b6833da7dc29bf}}
 %
 % \bibitem{arseneau}
 %   Donald Arseneau,
@@ -957,7 +915,7 @@ and the derived files
 %   Message-ID: \texttt{\small yfivd6svl8y.fsf@mutant.triumf.ca},
 %   2010-08-30.
 %   \newblock
-%   {\small\url{http://groups.google.com/group/comp.text.tex/msg/e0b2e4386e5d04e4}}
+%   {\small\url{https://groups.google.com/group/comp.text.tex/msg/e0b2e4386e5d04e4}}
 %
 % \bibitem{stephani}
 %   Philipp Stephani,
@@ -966,7 +924,7 @@ and the derived files
 %   Message-ID: \texttt{\small 4c8c8c1e\$0\$6981\$9b4e6d93@newsspool4.arcor-online.net},
 %   2010-09-12.
 %   \newblock
-%   {\small\url{http://groups.google.com/group/comp.text.tex/msg/87ac1f61321de3ef}}
+%   {\small\url{https://groups.google.com/group/comp.text.tex/msg/87ac1f61321de3ef}}
 %
 % \bibitem{oberdiek}
 %   Heiko Oberdiek,
@@ -975,7 +933,7 @@ and the derived files
 %   Message-ID: \texttt{\small i6jcc2\$8of\$1@news.eternal-september.org},
 %   2010-09-12.
 %   \newblock
-%   {\small\url{http://groups.google.com/group/comp.text.tex/msg/257aa6119bef878b}}
+%   {\small\url{https://groups.google.com/group/comp.text.tex/msg/257aa6119bef878b}}
 %
 % \end{thebibliography}
 %
diff --git a/macros/latex/contrib/oberdiek/mleftright.pdf b/macros/latex/contrib/oberdiek/mleftright.pdf
index eda6d119d0..9e541703d2 100644
--- a/macros/latex/contrib/oberdiek/mleftright.pdf
+++ b/macros/latex/contrib/oberdiek/mleftright.pdf
diff --git a/macros/latex/contrib/oberdiek/oberdiek.pdf b/macros/latex/contrib/oberdiek/oberdiek.pdf
index 9165707794..3fc83d1dc4 100644
--- a/macros/latex/contrib/oberdiek/oberdiek.pdf
+++ b/macros/latex/contrib/oberdiek/oberdiek.pdf
diff --git a/macros/latex/contrib/oberdiek/oberdiek.tex b/macros/latex/contrib/oberdiek/oberdiek.tex
index d7b311276d..0b5cb9e742 100644
--- a/macros/latex/contrib/oberdiek/oberdiek.tex
+++ b/macros/latex/contrib/oberdiek/oberdiek.tex
@@ -5,8 +5,9 @@
 \newcommand*{\CTANroot}{http://mirror.ctan.org/}
 \newcommand*{\Subject}{CTAN:\CTANdir}
 \newcommand*{\Author}{Heiko Oberdiek}
+
 \newcommand*{\Email}{ho-tex at tug.org}
-\newcommand*{\Date}{2019/11/07}
+\newcommand*{\Date}{2019/11/12}
 
 % Copyright (C) 2006-2016 by
 %    Heiko Oberdiek
@@ -31,7 +32,7 @@
 %
 \documentclass[a4paper,12pt]{article}
 
-\usepackage{ifluatex}
+\usepackage{iftex}
 \ifluatex
   \usepackage{fontspec}[2011/09/18]%
   \usepackage{unicode-math}[2011/09/19]%
@@ -80,7 +81,8 @@
   \href{\CTANroot\CTANdir}{CTAN:\CTANdir}%
 }
 \author{%
-  \Author\\
+  \Author\thanks
+ {Please report any issues at \url{https://github.com/ho-tex/oberdiek/issues}}\\
   \textless
   \href{mailto:\Email}{\texttt{\Email}}%
   \textgreater
@@ -233,8 +235,6 @@
 [\entrysep]
 \entry{grfext}{2010/08/19}{1.1}{Manage graphics extensions}%
 [\entrysep]
-\entry{hobsub}{2012/04/25}{1.12}{Construct package bundles}%
-[\entrysep]
 \entry{hologo}{2012/04/26}{1.10}{A logo collection with bookmark support}%
 [\entrysep]
 \entry{holtxdoc}{2012/03/21}{0.24}{Private additional ltxdoc support}%
@@ -285,12 +285,8 @@
 [\entrysep]
 \entry{luacolor}{2019/07/25}{1.12}{Color support via \hologo{LuaTeX}'s attributes}%
 [\entrysep]
-\entry{luatex}{2019/07/25}{0.7}{\hologo{LuaTeX} basic definition package}%
-[\entrysep]
 \entry{magicnum}{2019/07/25}{1.6}{Magic numbers}%
 [\entrysep]
-\entry{makerobust}{2006/03/18}{1.0}{Make existing macro robust}%
-[\entrysep]
 \entry{mleftright}{2010/09/25}{1.0}{Math left/right delim.\@ as open/close}%
 [\entrysep]
 \entry{pagegrid}{2009/12/04}{1.4}{Print page grid in background}%
@@ -668,15 +664,6 @@ graphics extensions of package \xpackage{graphics}.
 
 
 \newpage
-\subsection{\pkgsectformat{hobsub}}
-\label{hobsub}
-\begin{abstract}
-Package \xpackage{hobsub} implements the idea of loading
-several packages in one big collection package.
-\end{abstract}
-%\tocinclude{hobsub}
-
-\newpage
 \subsection{\pkgsectformat{hologo}}
 \label{hologo}
 \begin{abstract}
@@ -903,16 +890,6 @@ on \LuaTeX's node attributes.
 \tocinclude{luacolor}
 
 \newpage
-\subsection{\pkgsectformat{luatex}}
-\label{luatex}
-\begin{abstract}
-This package manages the new and extended features and resources
-that \LuaTeX\ provides. Examples are attributes and catcode
-tables.
-\end{abstract}
-\tocinclude{luatex}
-
-\newpage
 \subsection{\pkgsectformat{magicnum}}
 \label{magicnum}
 \begin{abstract}
@@ -922,15 +899,6 @@ name system.
 \tocinclude{magicnum}
 
 \newpage
-\subsection{\pkgsectformat{makerobust}}
-\label{makerobust}
-\begin{abstract}
-Package \xpackage{makerobust} provides \cs{MakeRobustCommand}
-that converts an existing macro to a robust one.
-\end{abstract}
-\tocinclude{makerobust}
-
-\newpage
 \subsection{\pkgsectformat{mleftright}}
 \label{mleftright}
 \begin{abstract}
diff --git a/macros/latex/contrib/oberdiek/pagegrid.dtx b/macros/latex/contrib/oberdiek/pagegrid.dtx
index adfda784a3..1efb0cde26 100644
--- a/macros/latex/contrib/oberdiek/pagegrid.dtx
+++ b/macros/latex/contrib/oberdiek/pagegrid.dtx
@@ -13,15 +13,17 @@
 % conditions of the LaTeX Project Public License, either
 % version 1.3c of this license or (at your option) any later
 % version. This version of this license is in
-%    http://www.latex-project.org/lppl/lppl-1-3c.txt
+%    https://www.latex-project.org/lppl/lppl-1-3c.txt
 % and the latest version of this license is in
-%    http://www.latex-project.org/lppl.txt
+%    https://www.latex-project.org/lppl.txt
 % and version 1.3 or later is part of all distributions of
 % LaTeX version 2005/12/01 or later.
 %
 % This work has the LPPL maintenance status "maintained".
 %
-% This Current Maintainer of this work is Heiko Oberdiek.
+% The Current Maintainers of this work are
+% Heiko Oberdiek and the Oberdiek Package Support Group
+% https://github.com/ho-tex/oberdiek/issues
 %
 % This work consists of the main source file pagegrid.dtx
 % and the derived files
@@ -100,15 +102,18 @@ This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either
 version 1.3c of this license or (at your option) any later
 version. This version of this license is in
-   http://www.latex-project.org/lppl/lppl-1-3c.txt
+   https://www.latex-project.org/lppl/lppl-1-3c.txt
 and the latest version of this license is in
-   http://www.latex-project.org/lppl.txt
+   https://www.latex-project.org/lppl.txt
 and version 1.3 or later is part of all distributions of
 LaTeX version 2005/12/01 or later.
 
 This work has the LPPL maintenance status "maintained".
 
-This Current Maintainer of this work is Heiko Oberdiek.
+The Current Maintainers of this work are
+Heiko Oberdiek and the Oberdiek Package Support Group
+https://github.com/ho-tex/oberdiek/issues
+
 
 This work consists of the main source file pagegrid.dtx
 and the derived files
@@ -186,8 +191,7 @@ and the derived files
 % \title{The \xpackage{pagegrid} package}
 % \date{2016/05/16 v1.5}
 % \author{Heiko Oberdiek\thanks
-% {Please report any issues at https://github.com/ho-tex/oberdiek/issues}\\
-% \xemail{heiko.oberdiek at googlemail.com}}
+% {Please report any issues at \url{https://github.com/ho-tex/oberdiek/issues}}}
 %
 % \maketitle
 %
@@ -883,7 +887,7 @@ and the derived files
 % \subsection{Download}
 %
 % \paragraph{Package.} This package is available on
-% CTAN\footnote{\url{http://ctan.org/pkg/pagegrid}}:
+% CTAN\footnote{\CTANpkg{pagegrid}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/pagegrid.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/pagegrid.pdf}] Documentation.
@@ -895,7 +899,7 @@ and the derived files
 % the packages are already unpacked and the documentation files
 % are generated. The files and directories obey the TDS standard.
 % \begin{description}
-% \item[\CTAN{install/macros/latex/contrib/oberdiek.tds.zip}]
+% \item[\CTANinstall{install/macros/latex/contrib/oberdiek.tds.zip}]
 % \end{description}
 % \emph{TDS} refers to the standard ``A Directory Structure
 % for \TeX\ Files'' (\CTAN{tds/tds.pdf}). Directories
@@ -1015,16 +1019,6 @@ and the derived files
 %
 % \subsection{Some details for the interested}
 %
-% \paragraph{Attached source.}
-%
-% The PDF documentation on CTAN also includes the
-% \xfile{.dtx} source file. It can be extracted by
-% AcrobatReader 6 or higher. Another option is \textsf{pdftk},
-% e.g. unpack the file into the current directory:
-% \begin{quote}
-%   \verb|pdftk pagegrid.pdf unpack_files output .|
-% \end{quote}
-%
 % \paragraph{Unpacking with \LaTeX.}
 % The \xfile{.dtx} chooses its action depending on the format:
 % \begin{description}
@@ -1060,46 +1054,6 @@ and the derived files
 %\end{verbatim}
 % \end{quote}
 %
-% \section{Catalogue}
-%
-% The following XML file can be used as source for the
-% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
-% The elements \texttt{caption} and \texttt{description} are imported
-% from the original XML file from the Catalogue.
-% The name of the XML file in the Catalogue is \xfile{pagegrid.xml}.
-%    \begin{macrocode}
-%<*catalogue>
-<?xml version='1.0' encoding='us-ascii'?>
-<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
-<entry datestamp='$Date$' modifier='$Author$' id='pagegrid'>
-  <name>pagegrid</name>
-  <caption>Print page grid in background.</caption>
-  <authorref id='auth:oberdiek'/>
-  <copyright owner='Heiko Oberdiek' year='2009'/>
-  <license type='lppl1.3'/>
-  <version number='1.5'/>
-  <description>
-    This package puts a grid on the paper. It was written for
-    developers of a class or package
-    who have to put elements on definite locations on a page
-    (e.g. letter class). The grid allows a faster optical check,
-    whether the positions are correct. If the previewer already
-    offers features for measuring, the package might be unnecessary.
-    Otherwise it saves the developer from printing the page and
-    measuring by hand.
-    <p/>
-    The package is part of the <xref refid='oberdiek'>oberdiek</xref> bundle.
-  </description>
-  <documentation details='Package documentation'
-      href='ctan:/macros/latex/contrib/oberdiek/pagegrid.pdf'/>
-  <ctan file='true' path='/macros/latex/contrib/oberdiek/pagegrid.dtx'/>
-  <miktex location='oberdiek'/>
-  <texlive location='oberdiek'/>
-  <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
-</entry>
-%</catalogue>
-%    \end{macrocode}
-%
 % \section{Acknowledgement}
 %
 % \begin{description}
diff --git a/macros/latex/contrib/oberdiek/pagegrid.pdf b/macros/latex/contrib/oberdiek/pagegrid.pdf
index 69db255cb7..3d63d631d0 100644
--- a/macros/latex/contrib/oberdiek/pagegrid.pdf
+++ b/macros/latex/contrib/oberdiek/pagegrid.pdf
diff --git a/macros/latex/contrib/oberdiek/pagesel.dtx b/macros/latex/contrib/oberdiek/pagesel.dtx
index 54b650226e..acde4c62b9 100644
--- a/macros/latex/contrib/oberdiek/pagesel.dtx
+++ b/macros/latex/contrib/oberdiek/pagesel.dtx
@@ -13,15 +13,17 @@
 % conditions of the LaTeX Project Public License, either
 % version 1.3c of this license or (at your option) any later
 % version. This version of this license is in
-%    http://www.latex-project.org/lppl/lppl-1-3c.txt
+%    https://www.latex-project.org/lppl/lppl-1-3c.txt
 % and the latest version of this license is in
-%    http://www.latex-project.org/lppl.txt
+%    https://www.latex-project.org/lppl.txt
 % and version 1.3 or later is part of all distributions of
 % LaTeX version 2005/12/01 or later.
 %
 % This work has the LPPL maintenance status "maintained".
 %
-% This Current Maintainer of this work is Heiko Oberdiek.
+% The Current Maintainers of this work are
+% Heiko Oberdiek and the Oberdiek Package Support Group
+% https://github.com/ho-tex/oberdiek/issues
 %
 % This work consists of the main source file pagesel.dtx
 % and the derived files
@@ -98,15 +100,18 @@ This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either
 version 1.3c of this license or (at your option) any later
 version. This version of this license is in
-   http://www.latex-project.org/lppl/lppl-1-3c.txt
+   https://www.latex-project.org/lppl/lppl-1-3c.txt
 and the latest version of this license is in
-   http://www.latex-project.org/lppl.txt
+   https://www.latex-project.org/lppl.txt
 and version 1.3 or later is part of all distributions of
 LaTeX version 2005/12/01 or later.
 
 This work has the LPPL maintenance status "maintained".
 
-This Current Maintainer of this work is Heiko Oberdiek.
+The Current Maintainers of this work are
+Heiko Oberdiek and the Oberdiek Package Support Group
+https://github.com/ho-tex/oberdiek/issues
+
 
 This work consists of the main source file pagesel.dtx
 and the derived files
@@ -181,8 +186,7 @@ and the derived files
 % \title{The \xpackage{pagesel} package}
 % \date{2016/05/16 v1.9}
 % \author{Heiko Oberdiek\thanks
-% {Please report any issues at https://github.com/ho-tex/oberdiek/issues}\\
-% \xemail{heiko.oberdiek at googlemail.com}}
+% {Please report any issues at \url{https://github.com/ho-tex/oberdiek/issues}}}
 %
 % \maketitle
 %
@@ -208,7 +212,7 @@ and the derived files
 %    \end{quote}
 %    (For plain\TeX\ and \LaTeX\,2.09 the similar package
 %    \URL{\Package{selectp}}^^A
-%    {http://ctan.org/pkg/selectp}
+%    {https://ctan.org/pkg/selectp}
 %    from \NameEmail{Donald Arsenau}{asnd@triumf.ca} can be used.)
 %
 %    Depending on the options the package works in two modes:
@@ -636,7 +640,7 @@ and the derived files
 % \subsection{Download}
 %
 % \paragraph{Package.} This package is available on
-% CTAN\footnote{\url{http://ctan.org/pkg/pagesel}}:
+% CTAN\footnote{\CTANpkg{pagesel}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/pagesel.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/pagesel.pdf}] Documentation.
@@ -648,7 +652,7 @@ and the derived files
 % the packages are already unpacked and the documentation files
 % are generated. The files and directories obey the TDS standard.
 % \begin{description}
-% \item[\CTAN{install/macros/latex/contrib/oberdiek.tds.zip}]
+% \item[\CTANinstall{install/macros/latex/contrib/oberdiek.tds.zip}]
 % \end{description}
 % \emph{TDS} refers to the standard ``A Directory Structure
 % for \TeX\ Files'' (\CTAN{tds/tds.pdf}). Directories
@@ -767,16 +771,6 @@ and the derived files
 %
 % \subsection{Some details for the interested}
 %
-% \paragraph{Attached source.}
-%
-% The PDF documentation on CTAN also includes the
-% \xfile{.dtx} source file. It can be extracted by
-% AcrobatReader 6 or higher. Another option is \textsf{pdftk},
-% e.g. unpack the file into the current directory:
-% \begin{quote}
-%   \verb|pdftk pagesel.pdf unpack_files output .|
-% \end{quote}
-%
 % \paragraph{Unpacking with \LaTeX.}
 % The \xfile{.dtx} chooses its action depending on the format:
 % \begin{description}
@@ -812,41 +806,6 @@ and the derived files
 %\end{verbatim}
 % \end{quote}
 %
-% \section{Catalogue}
-%
-% The following XML file can be used as source for the
-% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
-% The elements \texttt{caption} and \texttt{description} are imported
-% from the original XML file from the Catalogue.
-% The name of the XML file in the Catalogue is \xfile{pagesel.xml}.
-%    \begin{macrocode}
-%<*catalogue>
-<?xml version='1.0' encoding='us-ascii'?>
-<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
-<entry datestamp='$Date$' modifier='$Author$' id='pagesel'>
-  <name>pagesel</name>
-  <caption>Select pages of a document for output.</caption>
-  <authorref id='auth:oberdiek'/>
-  <copyright owner='Heiko Oberdiek' year='1999,2003,2006-2008'/>
-  <license type='lppl1.3'/>
-  <version number='1.9'/>
-  <description>
-    Selects single pages, ranges of pages, odd pages or even pages
-    for output.
-    <p/>
-    The package is part of the <xref refid='oberdiek'>oberdiek</xref>
-    bundle.
-  </description>
-  <documentation details='Package documentation'
-      href='ctan:/macros/latex/contrib/oberdiek/pagesel.pdf'/>
-  <ctan file='true' path='/macros/latex/contrib/oberdiek/pagesel.dtx'/>
-  <miktex location='oberdiek'/>
-  <texlive location='oberdiek'/>
-  <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
-</entry>
-%</catalogue>
-%    \end{macrocode}
-%
 % \begin{History}
 %   \begin{Version}{1999/03/01 v0.9}
 %   \item
@@ -855,7 +814,7 @@ and the derived files
 %     published in the newsgroup
 %     \href{news:de.comp.text.tex}{de.comp.text.tex}:\\
 %     \URL{``\link{Re: pdflatex nur fuer bestimmte Seiten?!?}''}^^A
-%     {http://groups.google.com/group/de.comp.text.tex/msg/6b68c7b3439fb658}
+%     {https://groups.google.com/group/de.comp.text.tex/msg/6b68c7b3439fb658}
 %   \end{Version}
 %   \begin{Version}{1999/04/05 v1.0}
 %   \item
diff --git a/macros/latex/contrib/oberdiek/pagesel.pdf b/macros/latex/contrib/oberdiek/pagesel.pdf
index 7232967b95..9b0f8db976 100644
--- a/macros/latex/contrib/oberdiek/pagesel.pdf
+++ b/macros/latex/contrib/oberdiek/pagesel.pdf
diff --git a/macros/latex/contrib/oberdiek/pdfcol.dtx b/macros/latex/contrib/oberdiek/pdfcol.dtx
index b48498342e..d99d11fa25 100644
--- a/macros/latex/contrib/oberdiek/pdfcol.dtx
+++ b/macros/latex/contrib/oberdiek/pdfcol.dtx
@@ -13,15 +13,17 @@
 % conditions of the LaTeX Project Public License, either
 % version 1.3c of this license or (at your option) any later
 % version. This version of this license is in
-%    http://www.latex-project.org/lppl/lppl-1-3c.txt
+%    https://www.latex-project.org/lppl/lppl-1-3c.txt
 % and the latest version of this license is in
-%    http://www.latex-project.org/lppl.txt
+%    https://www.latex-project.org/lppl.txt
 % and version 1.3 or later is part of all distributions of
 % LaTeX version 2005/12/01 or later.
 %
 % This work has the LPPL maintenance status "maintained".
 %
-% This Current Maintainer of this work is Heiko Oberdiek.
+% The Current Maintainers of this work are
+% Heiko Oberdiek and the Oberdiek Package Support Group
+% https://github.com/ho-tex/oberdiek/issues
 %
 % The Base Interpreter refers to any `TeX-Format',
 % because some files are installed in TDS:tex/generic//.
@@ -106,15 +108,18 @@ This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either
 version 1.3c of this license or (at your option) any later
 version. This version of this license is in
-   http://www.latex-project.org/lppl/lppl-1-3c.txt
+   https://www.latex-project.org/lppl/lppl-1-3c.txt
 and the latest version of this license is in
-   http://www.latex-project.org/lppl.txt
+   https://www.latex-project.org/lppl.txt
 and version 1.3 or later is part of all distributions of
 LaTeX version 2005/12/01 or later.
 
 This work has the LPPL maintenance status "maintained".
 
-This Current Maintainer of this work is Heiko Oberdiek.
+The Current Maintainers of this work are
+Heiko Oberdiek and the Oberdiek Package Support Group
+https://github.com/ho-tex/oberdiek/issues
+
 
 The Base Interpreter refers to any `TeX-Format',
 because some files are installed in TDS:tex/generic//.
@@ -198,8 +203,7 @@ and the derived files
 % \title{The \xpackage{pdfcol} package}
 % \date{2018/11/01 v1.5}
 % \author{Heiko Oberdiek\thanks
-% {Please report any issues at https://github.com/ho-tex/oberdiek/issues}\\
-% \xemail{heiko.oberdiek at googlemail.com}}
+% {Please report any issues at \url{https://github.com/ho-tex/oberdiek/issues}}}
 %
 % \maketitle
 %
@@ -939,7 +943,7 @@ and the derived files
 % \subsection{Download}
 %
 % \paragraph{Package.} This package is available on
-% CTAN\footnote{\url{http://ctan.org/pkg/pdfcol}}:
+% CTAN\footnote{\CTANpkg{pdfcol}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/pdfcol.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/pdfcol.pdf}] Documentation.
@@ -951,7 +955,7 @@ and the derived files
 % the packages are already unpacked and the documentation files
 % are generated. The files and directories obey the TDS standard.
 % \begin{description}
-% \item[\CTAN{install/macros/latex/contrib/oberdiek.tds.zip}]
+% \item[\CTANinstall{install/macros/latex/contrib/oberdiek.tds.zip}]
 % \end{description}
 % \emph{TDS} refers to the standard ``A Directory Structure
 % for \TeX\ Files'' (\CTAN{tds/tds.pdf}). Directories
@@ -1074,16 +1078,6 @@ and the derived files
 %
 % \subsection{Some details for the interested}
 %
-% \paragraph{Attached source.}
-%
-% The PDF documentation on CTAN also includes the
-% \xfile{.dtx} source file. It can be extracted by
-% AcrobatReader 6 or higher. Another option is \textsf{pdftk},
-% e.g. unpack the file into the current directory:
-% \begin{quote}
-%   \verb|pdftk pdfcol.pdf unpack_files output .|
-% \end{quote}
-%
 % \paragraph{Unpacking with \LaTeX.}
 % The \xfile{.dtx} chooses its action depending on the format:
 % \begin{description}
@@ -1119,46 +1113,6 @@ and the derived files
 %\end{verbatim}
 % \end{quote}
 %
-% \section{Catalogue}
-%
-% The following XML file can be used as source for the
-% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
-% The elements \texttt{caption} and \texttt{description} are imported
-% from the original XML file from the Catalogue.
-% The name of the XML file in the Catalogue is \xfile{pdfcol.xml}.
-%    \begin{macrocode}
-%<*catalogue>
-<?xml version='1.0' encoding='us-ascii'?>
-<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
-<entry datestamp='$Date$' modifier='$Author$' id='pdfcol'>
-  <name>pdfcol</name>
-  <caption>Defines macros fpr maintaining color stacks under pdfTeX.</caption>
-  <authorref id='auth:oberdiek'/>
-  <copyright owner='Heiko Oberdiek' year='2007'/>
-  <license type='lppl1.3'/>
-  <version number='1.5'/>
-  <description>
-    Since version 1.40 pdfTeX supports color stacks.
-    The driver file <tt>pdftex.def</tt> for package
-    <xref refid='color'>color</xref> defines and uses a main color
-    stack since version v0.04b.
-    <p/>
-    This package is intended for package writers.
-    It defines macros for setting and maintaining new color stacks.
-    <p/>
-    The package is part of the <xref refid='oberdiek'>oberdiek</xref>
-    bundle.
-  </description>
-  <documentation details='Package documentation'
-      href='ctan:/macros/latex/contrib/oberdiek/pdfcol.pdf'/>
-  <ctan file='true' path='/macros/latex/contrib/oberdiek/pdfcol.dtx'/>
-  <miktex location='oberdiek'/>
-  <texlive location='oberdiek'/>
-  <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
-</entry>
-%</catalogue>
-%    \end{macrocode}
-%
 % \begin{History}
 %   \begin{Version}{2007/09/09 v1.0}
 %   \item
diff --git a/macros/latex/contrib/oberdiek/pdfcol.pdf b/macros/latex/contrib/oberdiek/pdfcol.pdf
index 46c92811c1..e1aa8be514 100644
--- a/macros/latex/contrib/oberdiek/pdfcol.pdf
+++ b/macros/latex/contrib/oberdiek/pdfcol.pdf
diff --git a/macros/latex/contrib/oberdiek/pdfcolfoot.dtx b/macros/latex/contrib/oberdiek/pdfcolfoot.dtx
index 20e489bc71..be01c4650e 100644
--- a/macros/latex/contrib/oberdiek/pdfcolfoot.dtx
+++ b/macros/latex/contrib/oberdiek/pdfcolfoot.dtx
@@ -13,15 +13,17 @@
 % conditions of the LaTeX Project Public License, either
 % version 1.3c of this license or (at your option) any later
 % version. This version of this license is in
-%    http://www.latex-project.org/lppl/lppl-1-3c.txt
+%    https://www.latex-project.org/lppl/lppl-1-3c.txt
 % and the latest version of this license is in
-%    http://www.latex-project.org/lppl.txt
+%    https://www.latex-project.org/lppl.txt
 % and version 1.3 or later is part of all distributions of
 % LaTeX version 2005/12/01 or later.
 %
 % This work has the LPPL maintenance status "maintained".
 %
-% This Current Maintainer of this work is Heiko Oberdiek.
+% The Current Maintainers of this work are
+% Heiko Oberdiek and the Oberdiek Package Support Group
+% https://github.com/ho-tex/oberdiek/issues
 %
 % This work consists of the main source file pdfcolfoot.dtx
 % and the derived files
@@ -100,15 +102,18 @@ This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either
 version 1.3c of this license or (at your option) any later
 version. This version of this license is in
-   http://www.latex-project.org/lppl/lppl-1-3c.txt
+   https://www.latex-project.org/lppl/lppl-1-3c.txt
 and the latest version of this license is in
-   http://www.latex-project.org/lppl.txt
+   https://www.latex-project.org/lppl.txt
 and version 1.3 or later is part of all distributions of
 LaTeX version 2005/12/01 or later.
 
 This work has the LPPL maintenance status "maintained".
 
-This Current Maintainer of this work is Heiko Oberdiek.
+The Current Maintainers of this work are
+Heiko Oberdiek and the Oberdiek Package Support Group
+https://github.com/ho-tex/oberdiek/issues
+
 
 This work consists of the main source file pdfcolfoot.dtx
 and the derived files
@@ -186,8 +191,7 @@ and the derived files
 % \title{The \xpackage{pdfcolfoot} package}
 % \date{2016/05/16 v1.3}
 % \author{Heiko Oberdiek\thanks
-% {Please report any issues at https://github.com/ho-tex/oberdiek/issues}\\
-% \xemail{heiko.oberdiek at googlemail.com}}
+% {Please report any issues at \url{https://github.com/ho-tex/oberdiek/issues}}}
 %
 % \maketitle
 %
@@ -530,7 +534,7 @@ and the derived files
 % \subsection{Download}
 %
 % \paragraph{Package.} This package is available on
-% CTAN\footnote{\url{http://ctan.org/pkg/pdfcolfoot}}:
+% CTAN\footnote{\CTANpkg{pdfcolfoot}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/pdfcolfoot.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/pdfcolfoot.pdf}] Documentation.
@@ -542,7 +546,7 @@ and the derived files
 % the packages are already unpacked and the documentation files
 % are generated. The files and directories obey the TDS standard.
 % \begin{description}
-% \item[\CTAN{install/macros/latex/contrib/oberdiek.tds.zip}]
+% \item[\CTANinstall{install/macros/latex/contrib/oberdiek.tds.zip}]
 % \end{description}
 % \emph{TDS} refers to the standard ``A Directory Structure
 % for \TeX\ Files'' (\CTAN{tds/tds.pdf}). Directories
@@ -662,16 +666,6 @@ and the derived files
 %
 % \subsection{Some details for the interested}
 %
-% \paragraph{Attached source.}
-%
-% The PDF documentation on CTAN also includes the
-% \xfile{.dtx} source file. It can be extracted by
-% AcrobatReader 6 or higher. Another option is \textsf{pdftk},
-% e.g. unpack the file into the current directory:
-% \begin{quote}
-%   \verb|pdftk pdfcolfoot.pdf unpack_files output .|
-% \end{quote}
-%
 % \paragraph{Unpacking with \LaTeX.}
 % The \xfile{.dtx} chooses its action depending on the format:
 % \begin{description}
@@ -707,42 +701,6 @@ and the derived files
 %\end{verbatim}
 % \end{quote}
 %
-% \section{Catalogue}
-%
-% The following XML file can be used as source for the
-% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
-% The elements \texttt{caption} and \texttt{description} are imported
-% from the original XML file from the Catalogue.
-% The name of the XML file in the Catalogue is \xfile{pdfcolfoot.xml}.
-%    \begin{macrocode}
-%<*catalogue>
-<?xml version='1.0' encoding='us-ascii'?>
-<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
-<entry datestamp='$Date$' modifier='$Author$' id='pdfcolfoot'>
-  <name>pdfcolfoot</name>
-  <caption>Separate color stack for footnotes with pdfTeX.</caption>
-  <authorref id='auth:oberdiek'/>
-  <copyright owner='Heiko Oberdiek' year='2007,2012'/>
-  <license type='lppl1.3'/>
-  <version number='1.3'/>
-  <description>
-    Since version 1.40 <xref refid='pdftex'>pdfTeX</xref> supports
-    several colour stacks. This package uses a separate colour stack
-    for footnotes that can break across pages.
-    <p/>
-    The package is part of the <xref refid='oberdiek'>oberdiek</xref>
-    bundle.
-  </description>
-  <documentation details='Package documentation'
-      href='ctan:/macros/latex/contrib/oberdiek/pdfcolfoot.pdf'/>
-  <ctan file='true' path='/macros/latex/contrib/oberdiek/pdfcolfoot.dtx'/>
-  <miktex location='oberdiek'/>
-  <texlive location='oberdiek'/>
-  <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
-</entry>
-%</catalogue>
-%    \end{macrocode}
-%
 % \begin{thebibliography}{9}
 %
 % \bibitem{pdfcol}
diff --git a/macros/latex/contrib/oberdiek/pdfcolfoot.pdf b/macros/latex/contrib/oberdiek/pdfcolfoot.pdf
index c1e369f602..da4a567e70 100644
--- a/macros/latex/contrib/oberdiek/pdfcolfoot.pdf
+++ b/macros/latex/contrib/oberdiek/pdfcolfoot.pdf
diff --git a/macros/latex/contrib/oberdiek/pdfcolmk.dtx b/macros/latex/contrib/oberdiek/pdfcolmk.dtx
index baa6f193a4..fc74f05fb3 100644
--- a/macros/latex/contrib/oberdiek/pdfcolmk.dtx
+++ b/macros/latex/contrib/oberdiek/pdfcolmk.dtx
@@ -13,15 +13,17 @@
 % conditions of the LaTeX Project Public License, either
 % version 1.3c of this license or (at your option) any later
 % version. This version of this license is in
-%    http://www.latex-project.org/lppl/lppl-1-3c.txt
+%    https://www.latex-project.org/lppl/lppl-1-3c.txt
 % and the latest version of this license is in
-%    http://www.latex-project.org/lppl.txt
+%    https://www.latex-project.org/lppl.txt
 % and version 1.3 or later is part of all distributions of
 % LaTeX version 2005/12/01 or later.
 %
 % This work has the LPPL maintenance status "maintained".
 %
-% This Current Maintainer of this work is Heiko Oberdiek.
+% The Current Maintainers of this work are
+% Heiko Oberdiek and the Oberdiek Package Support Group
+% https://github.com/ho-tex/oberdiek/issues
 %
 % This work consists of the main source file pdfcolmk.dtx
 % and the derived files
@@ -98,15 +100,18 @@ This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either
 version 1.3c of this license or (at your option) any later
 version. This version of this license is in
-   http://www.latex-project.org/lppl/lppl-1-3c.txt
+   https://www.latex-project.org/lppl/lppl-1-3c.txt
 and the latest version of this license is in
-   http://www.latex-project.org/lppl.txt
+   https://www.latex-project.org/lppl.txt
 and version 1.3 or later is part of all distributions of
 LaTeX version 2005/12/01 or later.
 
 This work has the LPPL maintenance status "maintained".
 
-This Current Maintainer of this work is Heiko Oberdiek.
+The Current Maintainers of this work are
+Heiko Oberdiek and the Oberdiek Package Support Group
+https://github.com/ho-tex/oberdiek/issues
+
 
 This work consists of the main source file pdfcolmk.dtx
 and the derived files
@@ -181,8 +186,7 @@ and the derived files
 % \title{The \xpackage{pdfcolmk} package}
 % \date{2016/05/16 v1.3}
 % \author{Heiko Oberdiek\thanks
-% {Please report any issues at https://github.com/ho-tex/oberdiek/issues}\\
-% \xemail{heiko.oberdiek at googlemail.com}}
+% {Please report any issues at \url{https://github.com/ho-tex/oberdiek/issues}}}
 %
 % \maketitle
 %
@@ -771,7 +775,7 @@ and the derived files
 % \subsection{Download}
 %
 % \paragraph{Package.} This package is available on
-% CTAN\footnote{\url{http://ctan.org/pkg/pdfcolmk}}:
+% CTAN\footnote{\CTANpkg{pdfcolmk}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/pdfcolmk.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/pdfcolmk.pdf}] Documentation.
@@ -783,7 +787,7 @@ and the derived files
 % the packages are already unpacked and the documentation files
 % are generated. The files and directories obey the TDS standard.
 % \begin{description}
-% \item[\CTAN{install/macros/latex/contrib/oberdiek.tds.zip}]
+% \item[\CTANinstall{install/macros/latex/contrib/oberdiek.tds.zip}]
 % \end{description}
 % \emph{TDS} refers to the standard ``A Directory Structure
 % for \TeX\ Files'' (\CTAN{tds/tds.pdf}). Directories
@@ -902,16 +906,6 @@ and the derived files
 %
 % \subsection{Some details for the interested}
 %
-% \paragraph{Attached source.}
-%
-% The PDF documentation on CTAN also includes the
-% \xfile{.dtx} source file. It can be extracted by
-% AcrobatReader 6 or higher. Another option is \textsf{pdftk},
-% e.g. unpack the file into the current directory:
-% \begin{quote}
-%   \verb|pdftk pdfcolmk.pdf unpack_files output .|
-% \end{quote}
-%
 % \paragraph{Unpacking with \LaTeX.}
 % The \xfile{.dtx} chooses its action depending on the format:
 % \begin{description}
@@ -947,53 +941,12 @@ and the derived files
 %\end{verbatim}
 % \end{quote}
 %
-% \section{Catalogue}
-%
-% The following XML file can be used as source for the
-% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
-% The elements \texttt{caption} and \texttt{description} are imported
-% from the original XML file from the Catalogue.
-% The name of the XML file in the Catalogue is \xfile{pdfcolmk.xml}.
-%    \begin{macrocode}
-%<*catalogue>
-<?xml version='1.0' encoding='us-ascii'?>
-<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
-<entry datestamp='$Date$' modifier='$Author$' id='pdfcolmk'>
-  <name>pdfcolmk</name>
-  <caption>Improving colour support under pdftex.</caption>
-  <authorref id='auth:oberdiek'/>
-  <copyright owner='Heiko Oberdiek' year='2000,2005-2008'/>
-  <license type='lppl1.3'/>
-  <version number='1.3'/>
-  <description>
-    The package provides macros that emulate the &#x2018;colour stack&#x2019;
-    functionality of dvips.  The colour stack deals with colour
-    manipulations when asynchronous events (like page-breaking) occur;
-    pdftex does not (yet) have such a stack, but dvips does, and the
-    <xref refid='color'>color</xref> package makes extensive use of
-    it.
-    <p/>
-    This package is an experimental solution to the problem, and works
-    best with pdf-e-tex.
-    <p/>
-    The package is part of the <xref refid='oberdiek'>oberdiek</xref> bundle.
-  </description>
-  <documentation details='Package documentation'
-      href='ctan:/macros/latex/contrib/oberdiek/pdfcolmk.pdf'/>
-  <ctan file='true' path='/macros/latex/contrib/oberdiek/pdfcolmk.dtx'/>
-  <miktex location='oberdiek'/>
-  <texlive location='oberdiek'/>
-  <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
-</entry>
-%</catalogue>
-%    \end{macrocode}
-%
 % \begin{History}
 %   \begin{Version}{2000/08/27 v0.1}
 %   \item
 %     First published version in newsgroup \xnewsgroup{comp.text.tex}:\\
 %     \URL{``\link{pdftex: bug with colors?}''}^^A
-%     {http://groups.google.com/group/comp.text.tex/msg/6f088e69e4085d2c}
+%     {https://groups.google.com/group/comp.text.tex/msg/6f088e69e4085d2c}
 %   \end{Version}
 %   \begin{Version}{2000/09/02 v0.2}
 %   \item
@@ -1018,7 +971,7 @@ and the derived files
 %     Support for \cs{marginpar} added.
 %     See thread in \xnewsgroup{comp.text.tex}:\\
 %     \URL{``\link{Using \cs{textcolor} and \cs{marginpar} together}''}^^A
-%     {http://groups.google.com/group/comp.text.tex/msg/38ed58f8845a2a4f}
+%     {https://groups.google.com/group/comp.text.tex/msg/38ed58f8845a2a4f}
 %   \end{Version}
 %   \begin{Version}{2005/07/09 v0.7}
 %   \item
diff --git a/macros/latex/contrib/oberdiek/pdfcolmk.pdf b/macros/latex/contrib/oberdiek/pdfcolmk.pdf
index 9d2732cb38..202eeb6933 100644
--- a/macros/latex/contrib/oberdiek/pdfcolmk.pdf
+++ b/macros/latex/contrib/oberdiek/pdfcolmk.pdf
diff --git a/macros/latex/contrib/oberdiek/pdfcolparallel.dtx b/macros/latex/contrib/oberdiek/pdfcolparallel.dtx
index 2c5ccfae3d..755000fb16 100644
--- a/macros/latex/contrib/oberdiek/pdfcolparallel.dtx
+++ b/macros/latex/contrib/oberdiek/pdfcolparallel.dtx
@@ -13,15 +13,17 @@
 % conditions of the LaTeX Project Public License, either
 % version 1.3c of this license or (at your option) any later
 % version. This version of this license is in
-%    http://www.latex-project.org/lppl/lppl-1-3c.txt
+%    https://www.latex-project.org/lppl/lppl-1-3c.txt
 % and the latest version of this license is in
-%    http://www.latex-project.org/lppl.txt
+%    https://www.latex-project.org/lppl.txt
 % and version 1.3 or later is part of all distributions of
 % LaTeX version 2005/12/01 or later.
 %
 % This work has the LPPL maintenance status "maintained".
 %
-% This Current Maintainer of this work is Heiko Oberdiek.
+% The Current Maintainers of this work are
+% Heiko Oberdiek and the Oberdiek Package Support Group
+% https://github.com/ho-tex/oberdiek/issues
 %
 % This work consists of the main source file pdfcolparallel.dtx
 % and the derived files
@@ -100,15 +102,18 @@ This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either
 version 1.3c of this license or (at your option) any later
 version. This version of this license is in
-   http://www.latex-project.org/lppl/lppl-1-3c.txt
+   https://www.latex-project.org/lppl/lppl-1-3c.txt
 and the latest version of this license is in
-   http://www.latex-project.org/lppl.txt
+   https://www.latex-project.org/lppl.txt
 and version 1.3 or later is part of all distributions of
 LaTeX version 2005/12/01 or later.
 
 This work has the LPPL maintenance status "maintained".
 
-This Current Maintainer of this work is Heiko Oberdiek.
+The Current Maintainers of this work are
+Heiko Oberdiek and the Oberdiek Package Support Group
+https://github.com/ho-tex/oberdiek/issues
+
 
 This work consists of the main source file pdfcolparallel.dtx
 and the derived files
@@ -186,8 +191,7 @@ and the derived files
 % \title{The \xpackage{pdfcolparallel} package}
 % \date{2016/05/16 v1.4}
 % \author{Heiko Oberdiek\thanks
-% {Please report any issues at https://github.com/ho-tex/oberdiek/issues}\\
-% \xemail{heiko.oberdiek at googlemail.com}}
+% {Please report any issues at \url{https://github.com/ho-tex/oberdiek/issues}}}
 %
 % \maketitle
 %
@@ -798,7 +802,7 @@ and the derived files
 %    The test file is a modified version of the file that
 %    Alexander Hirsch has posted in \xnewsgroup{de.comp.text.tex}:
 %    \URL{``\link{\texttt{parallel.sty} und farbiger Text}''}^^A
-%    {http://groups.google.com/group/de.comp.text.tex/msg/6a759cf33bb071a5}
+%    {https://groups.google.com/group/de.comp.text.tex/msg/6a759cf33bb071a5}
 %    \begin{macrocode}
 %<*test1>
 \AtEndDocument{%
@@ -895,7 +899,7 @@ and the derived files
 % \subsection{Download}
 %
 % \paragraph{Package.} This package is available on
-% CTAN\footnote{\url{http://ctan.org/pkg/pdfcolparallel}}:
+% CTAN\footnote{\CTANpkg{pdfcolparallel}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/pdfcolparallel.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/pdfcolparallel.pdf}] Documentation.
@@ -907,7 +911,7 @@ and the derived files
 % the packages are already unpacked and the documentation files
 % are generated. The files and directories obey the TDS standard.
 % \begin{description}
-% \item[\CTAN{install/macros/latex/contrib/oberdiek.tds.zip}]
+% \item[\CTANinstall{install/macros/latex/contrib/oberdiek.tds.zip}]
 % \end{description}
 % \emph{TDS} refers to the standard ``A Directory Structure
 % for \TeX\ Files'' (\CTAN{tds/tds.pdf}). Directories
@@ -1027,16 +1031,6 @@ and the derived files
 %
 % \subsection{Some details for the interested}
 %
-% \paragraph{Attached source.}
-%
-% The PDF documentation on CTAN also includes the
-% \xfile{.dtx} source file. It can be extracted by
-% AcrobatReader 6 or higher. Another option is \textsf{pdftk},
-% e.g. unpack the file into the current directory:
-% \begin{quote}
-%   \verb|pdftk pdfcolparallel.pdf unpack_files output .|
-% \end{quote}
-%
 % \paragraph{Unpacking with \LaTeX.}
 % The \xfile{.dtx} chooses its action depending on the format:
 % \begin{description}
@@ -1072,48 +1066,12 @@ and the derived files
 %\end{verbatim}
 % \end{quote}
 %
-% \section{Catalogue}
-%
-% The following XML file can be used as source for the
-% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
-% The elements \texttt{caption} and \texttt{description} are imported
-% from the original XML file from the Catalogue.
-% The name of the XML file in the Catalogue is \xfile{pdfcolparallel.xml}.
-%    \begin{macrocode}
-%<*catalogue>
-<?xml version='1.0' encoding='us-ascii'?>
-<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
-<entry datestamp='$Date$' modifier='$Author$' id='pdfcolparallel'>
-  <name>pdfcolparallel</name>
-  <caption>Fix colour problems in package 'parallel'.</caption>
-  <authorref id='auth:oberdiek'/>
-  <copyright owner='Heiko Oberdiek' year='2007,2008,2010'/>
-  <license type='lppl1.3'/>
-  <version number='1.4'/>
-  <description>
-    Since version 1.40 pdfTeX supports colour stacks.
-    This package uses them to fix colour problems in
-    package <xref refid='parallel'>parallel</xref>.
-    <p/>
-    The package is part of the <xref refid='oberdiek'>oberdiek</xref>
-    bundle.
-  </description>
-  <documentation details='Package documentation'
-      href='ctan:/macros/latex/contrib/oberdiek/pdfcolparallel.pdf'/>
-  <ctan file='true' path='/macros/latex/contrib/oberdiek/pdfcolparallel.dtx'/>
-  <miktex location='oberdiek'/>
-  <texlive location='oberdiek'/>
-  <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
-</entry>
-%</catalogue>
-%    \end{macrocode}
-%
 % \begin{thebibliography}{9}
 %
 % \bibitem{parallel}
 %   Matthias Eckermann: \textit{The \xpackage{parallel}-package};
 %   2003/04/13;\\
-%   \CTAN{macros/latex/contrib/parallel/}.
+%   \CTANpkg{parallel}.
 %
 % \bibitem{pdfcol}
 %   Heiko Oberdiek: \textit{The \xpackage{pdfcol} package};
diff --git a/macros/latex/contrib/oberdiek/pdfcolparallel.pdf b/macros/latex/contrib/oberdiek/pdfcolparallel.pdf
index 204254e209..cd06a4a9ed 100644
--- a/macros/latex/contrib/oberdiek/pdfcolparallel.pdf
+++ b/macros/latex/contrib/oberdiek/pdfcolparallel.pdf
diff --git a/macros/latex/contrib/oberdiek/pdfcolparcolumns.dtx b/macros/latex/contrib/oberdiek/pdfcolparcolumns.dtx
index 5a5c818310..ce340c0379 100644
--- a/macros/latex/contrib/oberdiek/pdfcolparcolumns.dtx
+++ b/macros/latex/contrib/oberdiek/pdfcolparcolumns.dtx
@@ -13,15 +13,17 @@
 % conditions of the LaTeX Project Public License, either
 % version 1.3c of this license or (at your option) any later
 % version. This version of this license is in
-%    http://www.latex-project.org/lppl/lppl-1-3c.txt
+%    https://www.latex-project.org/lppl/lppl-1-3c.txt
 % and the latest version of this license is in
-%    http://www.latex-project.org/lppl.txt
+%    https://www.latex-project.org/lppl.txt
 % and version 1.3 or later is part of all distributions of
 % LaTeX version 2005/12/01 or later.
 %
 % This work has the LPPL maintenance status "maintained".
 %
-% This Current Maintainer of this work is Heiko Oberdiek.
+% The Current Maintainers of this work are
+% Heiko Oberdiek and the Oberdiek Package Support Group
+% https://github.com/ho-tex/oberdiek/issues
 %
 % This work consists of the main source file pdfcolparcolumns.dtx
 % and the derived files
@@ -100,15 +102,18 @@ This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either
 version 1.3c of this license or (at your option) any later
 version. This version of this license is in
-   http://www.latex-project.org/lppl/lppl-1-3c.txt
+   https://www.latex-project.org/lppl/lppl-1-3c.txt
 and the latest version of this license is in
-   http://www.latex-project.org/lppl.txt
+   https://www.latex-project.org/lppl.txt
 and version 1.3 or later is part of all distributions of
 LaTeX version 2005/12/01 or later.
 
 This work has the LPPL maintenance status "maintained".
 
-This Current Maintainer of this work is Heiko Oberdiek.
+The Current Maintainers of this work are
+Heiko Oberdiek and the Oberdiek Package Support Group
+https://github.com/ho-tex/oberdiek/issues
+
 
 This work consists of the main source file pdfcolparcolumns.dtx
 and the derived files
@@ -186,8 +191,7 @@ and the derived files
 % \title{The \xpackage{pdfcolparcolumns} package}
 % \date{2016/05/16 v1.4}
 % \author{Heiko Oberdiek\thanks
-% {Please report any issues at https://github.com/ho-tex/oberdiek/issues}\\
-% \xemail{heiko.oberdiek at googlemail.com}}
+% {Please report any issues at \url{https://github.com/ho-tex/oberdiek/issues}}}
 %
 % \maketitle
 %
@@ -526,7 +530,7 @@ and the derived files
 %    The test file is a modified version of the file that
 %    Donald Goodman has posted in \xnewsgroup{comp.text.tex}: ^^A
 %    \URL{``\link{Re: \xpackage{xcolor} glitches}''}^^A
-%    {http://groups.google.com/group/comp.text.tex/msg/8eda74ed292012bb}
+%    {https://groups.google.com/group/comp.text.tex/msg/8eda74ed292012bb}
 %    \begin{macrocode}
 %<*test1>
 \NeedsTeXFormat{LaTeX2e}
@@ -578,7 +582,7 @@ and the derived files
 % \subsection{Download}
 %
 % \paragraph{Package.} This package is available on
-% CTAN\footnote{\url{http://ctan.org/pkg/pdfcolparcolumns}}:
+% CTAN\footnote{\CTANpkg{pdfcolparcolumns}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/pdfcolparcolumns.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/pdfcolparcolumns.pdf}] Documentation.
@@ -590,7 +594,7 @@ and the derived files
 % the packages are already unpacked and the documentation files
 % are generated. The files and directories obey the TDS standard.
 % \begin{description}
-% \item[\CTAN{install/macros/latex/contrib/oberdiek.tds.zip}]
+% \item[\CTANinstall{install/macros/latex/contrib/oberdiek.tds.zip}]
 % \end{description}
 % \emph{TDS} refers to the standard ``A Directory Structure
 % for \TeX\ Files'' (\CTAN{tds/tds.pdf}). Directories
@@ -710,16 +714,6 @@ and the derived files
 %
 % \subsection{Some details for the interested}
 %
-% \paragraph{Attached source.}
-%
-% The PDF documentation on CTAN also includes the
-% \xfile{.dtx} source file. It can be extracted by
-% AcrobatReader 6 or higher. Another option is \textsf{pdftk},
-% e.g. unpack the file into the current directory:
-% \begin{quote}
-%   \verb|pdftk pdfcolparcolumns.pdf unpack_files output .|
-% \end{quote}
-%
 % \paragraph{Unpacking with \LaTeX.}
 % The \xfile{.dtx} chooses its action depending on the format:
 % \begin{description}
@@ -755,42 +749,6 @@ and the derived files
 %\end{verbatim}
 % \end{quote}
 %
-% \section{Catalogue}
-%
-% The following XML file can be used as source for the
-% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
-% The elements \texttt{caption} and \texttt{description} are imported
-% from the original XML file from the Catalogue.
-% The name of the XML file in the Catalogue is \xfile{pdfcolparcolumns.xml}.
-%    \begin{macrocode}
-%<*catalogue>
-<?xml version='1.0' encoding='us-ascii'?>
-<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
-<entry datestamp='$Date$' modifier='$Author$' id='pdfcolparcolumns'>
-  <name>pdfcolparcolumns</name>
-  <caption>Fix colour problems in package 'parcolumns'.</caption>
-  <authorref id='auth:oberdiek'/>
-  <copyright owner='Heiko Oberdiek' year='2007,2008,2010'/>
-  <license type='lppl1.3'/>
-  <version number='1.4'/>
-  <description>
-    Since version 1.40 pdfTeX supports colour stacks.
-    This package uses them to fix colour problems in
-    package <xref refid='parcolumns'>parcolumns</xref>.
-    <p/>
-    The package is part of the <xref refid='oberdiek'>oberdiek</xref>
-    bundle.
-  </description>
-  <documentation details='Package documentation'
-      href='ctan:/macros/latex/contrib/oberdiek/pdfcolparcolumns.pdf'/>
-  <ctan file='true' path='/macros/latex/contrib/oberdiek/pdfcolparcolumns.dtx'/>
-  <miktex location='oberdiek'/>
-  <texlive location='oberdiek'/>
-  <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
-</entry>
-%</catalogue>
-%    \end{macrocode}
-%
 % \begin{thebibliography}{9}
 %
 % \bibitem{parcolumns}
@@ -811,7 +769,7 @@ and the derived files
 %     First version, published in the newsgroup \xnewsgroup{comp.text.tex}
 %     with the name \xpackage{parcolumns-colorstacks}: ^^A no line break
 %     \URL{``\link{Re: \xpackage{xcolor} glitches}''}^^A
-%     {http://groups.google.com/group/comp.text.tex/msg/56bd897b11bca414}
+%     {https://groups.google.com/group/comp.text.tex/msg/56bd897b11bca414}
 %   \end{Version}
 %   \begin{Version}{2007/09/09 v1.1}
 %   \item
diff --git a/macros/latex/contrib/oberdiek/pdfcolparcolumns.pdf b/macros/latex/contrib/oberdiek/pdfcolparcolumns.pdf
index 6e42a8f689..1f1ebd1ccf 100644
--- a/macros/latex/contrib/oberdiek/pdfcolparcolumns.pdf
+++ b/macros/latex/contrib/oberdiek/pdfcolparcolumns.pdf
diff --git a/macros/latex/contrib/oberdiek/pdfcrypt.dtx b/macros/latex/contrib/oberdiek/pdfcrypt.dtx
index 2f036e1514..39ed3c78e9 100644
--- a/macros/latex/contrib/oberdiek/pdfcrypt.dtx
+++ b/macros/latex/contrib/oberdiek/pdfcrypt.dtx
@@ -13,15 +13,17 @@
 % conditions of the LaTeX Project Public License, either
 % version 1.3c of this license or (at your option) any later
 % version. This version of this license is in
-%    http://www.latex-project.org/lppl/lppl-1-3c.txt
+%    https://www.latex-project.org/lppl/lppl-1-3c.txt
 % and the latest version of this license is in
-%    http://www.latex-project.org/lppl.txt
+%    https://www.latex-project.org/lppl.txt
 % and version 1.3 or later is part of all distributions of
 % LaTeX version 2005/12/01 or later.
 %
 % This work has the LPPL maintenance status "maintained".
 %
-% This Current Maintainer of this work is Heiko Oberdiek.
+% The Current Maintainers of this work are
+% Heiko Oberdiek and the Oberdiek Package Support Group
+% https://github.com/ho-tex/oberdiek/issues
 %
 % The Base Interpreter refers to any `TeX-Format',
 % because some files are installed in TDS:tex/generic//.
@@ -101,15 +103,18 @@ This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either
 version 1.3c of this license or (at your option) any later
 version. This version of this license is in
-   http://www.latex-project.org/lppl/lppl-1-3c.txt
+   https://www.latex-project.org/lppl/lppl-1-3c.txt
 and the latest version of this license is in
-   http://www.latex-project.org/lppl.txt
+   https://www.latex-project.org/lppl.txt
 and version 1.3 or later is part of all distributions of
 LaTeX version 2005/12/01 or later.
 
 This work has the LPPL maintenance status "maintained".
 
-This Current Maintainer of this work is Heiko Oberdiek.
+The Current Maintainers of this work are
+Heiko Oberdiek and the Oberdiek Package Support Group
+https://github.com/ho-tex/oberdiek/issues
+
 
 The Base Interpreter refers to any `TeX-Format',
 because some files are installed in TDS:tex/generic//.
@@ -187,8 +192,7 @@ and the derived files
 % \title{The \xpackage{pdfcrypt} package}
 % \date{2016/05/16 v1.1}
 % \author{Heiko Oberdiek\thanks
-% {Please report any issues at https://github.com/ho-tex/oberdiek/issues}\\
-% \xemail{heiko.oberdiek at googlemail.com}}
+% {Please report any issues at \url{https://github.com/ho-tex/oberdiek/issues}}}
 %
 % \maketitle
 %
@@ -872,7 +876,7 @@ and the derived files
 % \subsection{Download}
 %
 % \paragraph{Package.} This package is available on
-% CTAN\footnote{\url{http://ctan.org/pkg/pdfcrypt}}:
+% CTAN\footnote{\CTANpkg{pdfcrypt}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/pdfcrypt.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/pdfcrypt.pdf}] Documentation.
@@ -884,7 +888,7 @@ and the derived files
 % the packages are already unpacked and the documentation files
 % are generated. The files and directories obey the TDS standard.
 % \begin{description}
-% \item[\CTAN{install/macros/latex/contrib/oberdiek.tds.zip}]
+% \item[\CTANinstall{install/macros/latex/contrib/oberdiek.tds.zip}]
 % \end{description}
 % \emph{TDS} refers to the standard ``A Directory Structure
 % for \TeX\ Files'' (\CTAN{tds/tds.pdf}). Directories
@@ -1003,16 +1007,6 @@ and the derived files
 %
 % \subsection{Some details for the interested}
 %
-% \paragraph{Attached source.}
-%
-% The PDF documentation on CTAN also includes the
-% \xfile{.dtx} source file. It can be extracted by
-% AcrobatReader 6 or higher. Another option is \textsf{pdftk},
-% e.g. unpack the file into the current directory:
-% \begin{quote}
-%   \verb|pdftk pdfcrypt.pdf unpack_files output .|
-% \end{quote}
-%
 % \paragraph{Unpacking with \LaTeX.}
 % The \xfile{.dtx} chooses its action depending on the format:
 % \begin{description}
@@ -1048,49 +1042,6 @@ and the derived files
 %\end{verbatim}
 % \end{quote}
 %
-% \section{Catalogue}
-%
-% The following XML file can be used as source for the
-% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
-% The elements \texttt{caption} and \texttt{description} are imported
-% from the original XML file from the Catalogue.
-% The name of the XML file in the Catalogue is \xfile{pdfcrypt.xml}.
-%    \begin{macrocode}
-%<*catalogue>
-<?xml version='1.0' encoding='us-ascii'?>
-<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
-<entry datestamp='$Date$' modifier='$Author$' id='pdfcrypt'>
-  <name>pdfcrypt</name>
-  <caption>Allows the setting of pdf encryption.</caption>
-  <authorref id='auth:oberdiek'/>
-  <copyright owner='Heiko Oberdiek' year='2001,2006,2007'/>
-  <license type='lppl1.3'/>
-  <version number='1.1'/>
-  <description>
-    Allows the setting of pdf encryption options for VTeX and some
-    older versions of pdfTeX.  The options can be set as package
-    options or in the command <tt>\pdfcryptsetup</tt>. Options
-    include <tt>owner=OwnerPassword</tt>, <tt>user=UserPassword,
-    print</tt>, <tt>copy</tt>, <tt>edit</tt>, <tt>annotate=true,
-    false all, none</tt>. The encryption is set at
-    <tt>\begin{document}</tt> by default, but this can be forced for
-    an earlier time by option &#x2018;set&#x2019;.
-    <p/>
-    Example:
-    <tt>\usepackage[owner=Donald,user=Knuth,print=false]{pdfcrypt}</tt>
-    <p/>
-    The package is part of the <xref refid='oberdiek'>oberdiek</xref> bundle.
-  </description>
-  <documentation details='Package documentation'
-      href='ctan:/macros/latex/contrib/oberdiek/pdfcrypt.pdf'/>
-  <ctan file='true' path='/macros/latex/contrib/oberdiek/pdfcrypt.dtx'/>
-  <miktex location='oberdiek'/>
-  <texlive location='oberdiek'/>
-  <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
-</entry>
-%</catalogue>
-%    \end{macrocode}
-%
 % \begin{History}
 %   \begin{Version}{2001/04/02 v0.1}
 %   \item
diff --git a/macros/latex/contrib/oberdiek/pdfcrypt.pdf b/macros/latex/contrib/oberdiek/pdfcrypt.pdf
index 9818002eb2..d206cacf36 100644
--- a/macros/latex/contrib/oberdiek/pdfcrypt.pdf
+++ b/macros/latex/contrib/oberdiek/pdfcrypt.pdf
diff --git a/macros/latex/contrib/oberdiek/pdfescape.dtx b/macros/latex/contrib/oberdiek/pdfescape.dtx
index 534d95c71b..3a77f65261 100644
--- a/macros/latex/contrib/oberdiek/pdfescape.dtx
+++ b/macros/latex/contrib/oberdiek/pdfescape.dtx
@@ -13,15 +13,17 @@
 % conditions of the LaTeX Project Public License, either
 % version 1.3c of this license or (at your option) any later
 % version. This version of this license is in
-%    http://www.latex-project.org/lppl/lppl-1-3c.txt
+%    https://www.latex-project.org/lppl/lppl-1-3c.txt
 % and the latest version of this license is in
-%    http://www.latex-project.org/lppl.txt
+%    https://www.latex-project.org/lppl.txt
 % and version 1.3 or later is part of all distributions of
 % LaTeX version 2005/12/01 or later.
 %
 % This work has the LPPL maintenance status "maintained".
 %
-% This Current Maintainer of this work is Heiko Oberdiek.
+% The Current Maintainers of this work are
+% Heiko Oberdiek and the Oberdiek Package Support Group
+% https://github.com/ho-tex/oberdiek/issues
 %
 % The Base Interpreter refers to any `TeX-Format',
 % because some files are installed in TDS:tex/generic//.
@@ -110,15 +112,18 @@ This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either
 version 1.3c of this license or (at your option) any later
 version. This version of this license is in
-   http://www.latex-project.org/lppl/lppl-1-3c.txt
+   https://www.latex-project.org/lppl/lppl-1-3c.txt
 and the latest version of this license is in
-   http://www.latex-project.org/lppl.txt
+   https://www.latex-project.org/lppl.txt
 and version 1.3 or later is part of all distributions of
 LaTeX version 2005/12/01 or later.
 
 This work has the LPPL maintenance status "maintained".
 
-This Current Maintainer of this work is Heiko Oberdiek.
+The Current Maintainers of this work are
+Heiko Oberdiek and the Oberdiek Package Support Group
+https://github.com/ho-tex/oberdiek/issues
+
 
 The Base Interpreter refers to any `TeX-Format',
 because some files are installed in TDS:tex/generic//.
@@ -206,8 +211,7 @@ and the derived files
 % \title{The \xpackage{pdfescape} package}
 % \date{2016/05/16 v1.14}
 % \author{Heiko Oberdiek\thanks
-% {Please report any issues at https://github.com/ho-tex/oberdiek/issues}\\
-% \xemail{heiko.oberdiek at googlemail.com}}
+% {Please report any issues at \url{https://github.com/ho-tex/oberdiek/issues}}}
 %
 % \maketitle
 %
@@ -2038,7 +2042,7 @@ $       \the\count\ltx@cclv
 % \subsection{Download}
 %
 % \paragraph{Package.} This package is available on
-% CTAN\footnote{\url{http://ctan.org/pkg/pdfescape}}:
+% CTAN\footnote{\CTANpkg{pdfescape}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/pdfescape.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/pdfescape.pdf}] Documentation.
@@ -2050,7 +2054,7 @@ $       \the\count\ltx@cclv
 % the packages are already unpacked and the documentation files
 % are generated. The files and directories obey the TDS standard.
 % \begin{description}
-% \item[\CTAN{install/macros/latex/contrib/oberdiek.tds.zip}]
+% \item[\CTANinstall{install/macros/latex/contrib/oberdiek.tds.zip}]
 % \end{description}
 % \emph{TDS} refers to the standard ``A Directory Structure
 % for \TeX\ Files'' (\CTAN{tds/tds.pdf}). Directories
@@ -2175,16 +2179,6 @@ $       \the\count\ltx@cclv
 %
 % \subsection{Some details for the interested}
 %
-% \paragraph{Attached source.}
-%
-% The PDF documentation on CTAN also includes the
-% \xfile{.dtx} source file. It can be extracted by
-% AcrobatReader 6 or higher. Another option is \textsf{pdftk},
-% e.g. unpack the file into the current directory:
-% \begin{quote}
-%   \verb|pdftk pdfescape.pdf unpack_files output .|
-% \end{quote}
-%
 % \paragraph{Unpacking with \LaTeX.}
 % The \xfile{.dtx} chooses its action depending on the format:
 % \begin{description}
@@ -2220,43 +2214,6 @@ $       \the\count\ltx@cclv
 %\end{verbatim}
 % \end{quote}
 %
-% \section{Catalogue}
-%
-% The following XML file can be used as source for the
-% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
-% The elements \texttt{caption} and \texttt{description} are imported
-% from the original XML file from the Catalogue.
-% The name of the XML file in the Catalogue is \xfile{pdfescape.xml}.
-%    \begin{macrocode}
-%<*catalogue>
-<?xml version='1.0' encoding='us-ascii'?>
-<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
-<entry datestamp='$Date$' modifier='$Author$' id='pdfescape'>
-  <name>pdfescape</name>
-  <caption>Implements pdfTeX's escape features using TeX or e-TeX.</caption>
-  <authorref id='auth:oberdiek'/>
-  <copyright owner='Heiko Oberdiek' year='2007,2010,2011'/>
-  <license type='lppl1.3'/>
-  <version number='1.14'/>
-  <description>
-    This package implements <xref refid='pdftex'>pdfTeX</xref>'s
-    escape features (<tt>\pdfescapehex</tt>, <tt>\pdfunescapehex</tt>,
-    <tt>\pdfescapename</tt>, <tt>\pdfescapestring</tt>) using TeX or
-    e-TeX.
-    <p/>
-    The package is part of the <xref refid='oberdiek'>oberdiek</xref>
-    bundle.
-  </description>
-  <documentation details='Package documentation'
-      href='ctan:/macros/latex/contrib/oberdiek/pdfescape.pdf'/>
-  <ctan file='true' path='/macros/latex/contrib/oberdiek/pdfescape.dtx'/>
-  <miktex location='oberdiek'/>
-  <texlive location='oberdiek'/>
-  <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
-</entry>
-%</catalogue>
-%    \end{macrocode}
-%
 % \begin{History}
 %   \begin{Version}{2007/02/21 v1.0}
 %   \item
diff --git a/macros/latex/contrib/oberdiek/pdfescape.pdf b/macros/latex/contrib/oberdiek/pdfescape.pdf
index fe82325e9f..d733ba1bf1 100644
--- a/macros/latex/contrib/oberdiek/pdfescape.pdf
+++ b/macros/latex/contrib/oberdiek/pdfescape.pdf
diff --git a/macros/latex/contrib/oberdiek/pdflscape.dtx b/macros/latex/contrib/oberdiek/pdflscape.dtx
index dfaaddbb4d..547a06e1d3 100644
--- a/macros/latex/contrib/oberdiek/pdflscape.dtx
+++ b/macros/latex/contrib/oberdiek/pdflscape.dtx
@@ -13,15 +13,17 @@
 % conditions of the LaTeX Project Public License, either
 % version 1.3c of this license or (at your option) any later
 % version. This version of this license is in
-%    http://www.latex-project.org/lppl/lppl-1-3c.txt
+%    https://www.latex-project.org/lppl/lppl-1-3c.txt
 % and the latest version of this license is in
-%    http://www.latex-project.org/lppl.txt
+%    https://www.latex-project.org/lppl.txt
 % and version 1.3 or later is part of all distributions of
 % LaTeX version 2005/12/01 or later.
 %
 % This work has the LPPL maintenance status "maintained".
 %
-% This Current Maintainer of this work is Heiko Oberdiek.
+% The Current Maintainers of this work are
+% Heiko Oberdiek and the Oberdiek Package Support Group
+% https://github.com/ho-tex/oberdiek/issues
 %
 % This work consists of the main source file pdflscape.dtx
 % and the derived files
@@ -110,15 +112,18 @@ This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either
 version 1.3c of this license or (at your option) any later
 version. This version of this license is in
-   http://www.latex-project.org/lppl/lppl-1-3c.txt
+   https://www.latex-project.org/lppl/lppl-1-3c.txt
 and the latest version of this license is in
-   http://www.latex-project.org/lppl.txt
+   https://www.latex-project.org/lppl.txt
 and version 1.3 or later is part of all distributions of
 LaTeX version 2005/12/01 or later.
 
 This work has the LPPL maintenance status "maintained".
 
-This Current Maintainer of this work is Heiko Oberdiek.
+The Current Maintainers of this work are
+Heiko Oberdiek and the Oberdiek Package Support Group
+https://github.com/ho-tex/oberdiek/issues
+
 
 This work consists of the main source file pdflscape.dtx
 and the derived files
@@ -207,8 +212,7 @@ and the derived files
 % \title{The \xpackage{pdflscape} package}
 % \date{2016/05/14 v0.11}
 % \author{Heiko Oberdiek\thanks
-% {Please report any issues at https://github.com/ho-tex/oberdiek/issues}\\
-% \xemail{heiko.oberdiek at googlemail.com}}
+% {Please report any issues at \url{https://github.com/ho-tex/oberdiek/issues}}}
 %
 % \maketitle
 %
@@ -827,7 +831,7 @@ public class ExtractRotate {
 % \subsection{Download}
 %
 % \paragraph{Package.} This package is available on
-% CTAN\footnote{\url{http://ctan.org/pkg/pdflscape}}:
+% CTAN\footnote{\CTANpkg{pdflscape}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/pdflscape.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/pdflscape.pdf}] Documentation.
@@ -839,7 +843,7 @@ public class ExtractRotate {
 % the packages are already unpacked and the documentation files
 % are generated. The files and directories obey the TDS standard.
 % \begin{description}
-% \item[\CTAN{install/macros/latex/contrib/oberdiek.tds.zip}]
+% \item[\CTANinstall{install/macros/latex/contrib/oberdiek.tds.zip}]
 % \end{description}
 % \emph{TDS} refers to the standard ``A Directory Structure
 % for \TeX\ Files'' (\CTAN{tds/tds.pdf}). Directories
@@ -966,16 +970,6 @@ public class ExtractRotate {
 %
 % \subsection{Some details for the interested}
 %
-% \paragraph{Attached source.}
-%
-% The PDF documentation on CTAN also includes the
-% \xfile{.dtx} source file. It can be extracted by
-% AcrobatReader 6 or higher. Another option is \textsf{pdftk},
-% e.g. unpack the file into the current directory:
-% \begin{quote}
-%   \verb|pdftk pdflscape.pdf unpack_files output .|
-% \end{quote}
-%
 % \paragraph{Unpacking with \LaTeX.}
 % The \xfile{.dtx} chooses its action depending on the format:
 % \begin{description}
@@ -1011,49 +1005,13 @@ public class ExtractRotate {
 %\end{verbatim}
 % \end{quote}
 %
-% \section{Catalogue}
-%
-% The following XML file can be used as source for the
-% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
-% The elements \texttt{caption} and \texttt{description} are imported
-% from the original XML file from the Catalogue.
-% The name of the XML file in the Catalogue is \xfile{pdflscape.xml}.
-%    \begin{macrocode}
-%<*catalogue>
-<?xml version='1.0' encoding='us-ascii'?>
-<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
-<entry datestamp='$Date$' modifier='$Author$' id='pdflscape'>
-  <name>pdflscape</name>
-  <caption>Make landscape pages display as landscape.</caption>
-  <authorref id='auth:oberdiek'/>
-  <copyright owner='Heiko Oberdiek' year='2001,2004,2006-2008'/>
-  <license type='lppl1.3'/>
-  <version number='0.11'/>
-  <description>
-    The package adds PDF support to the landscape environment of
-    package <xref refid='lscape'>lscape</xref>, by setting the PDF
-    <tt>/Rotate</tt> page attribute.  Pages with this attribute will be
-    displayed in landscape orientation by conforming PDF viewers.
-    <p/>
-    The package is part of the <xref refid='oberdiek'>oberdiek</xref> bundle.
-  </description>
-  <documentation details='Package documentation'
-      href='ctan:/macros/latex/contrib/oberdiek/pdflscape.pdf'/>
-  <ctan file='true' path='/macros/latex/contrib/oberdiek/pdflscape.dtx'/>
-  <miktex location='oberdiek'/>
-  <texlive location='oberdiek'/>
-  <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
-</entry>
-%</catalogue>
-%    \end{macrocode}
-%
 % \begin{History}
 %   \begin{Version}{2001/01/15 v0.1}
 %   \item
 %     First public version,
 %     published in \xnewsgroup{de.comp.text.tex}:\\
 %     \URL{``\link{Re: Querformat, pdfLaTex und thumbpdf}''}^^A
-%     {http://groups.google.com/group/de.comp.text.tex/msg/e054c5795e52d2b8}
+%     {https://groups.google.com/group/de.comp.text.tex/msg/e054c5795e52d2b8}
 %   \end{Version}
 %   \begin{Version}{2001/02/04 v0.2}
 %   \item
diff --git a/macros/latex/contrib/oberdiek/pdflscape.pdf b/macros/latex/contrib/oberdiek/pdflscape.pdf
index 500ed26d84..15750dc4d7 100644
--- a/macros/latex/contrib/oberdiek/pdflscape.pdf
+++ b/macros/latex/contrib/oberdiek/pdflscape.pdf
diff --git a/macros/latex/contrib/oberdiek/pdfrender.dtx b/macros/latex/contrib/oberdiek/pdfrender.dtx
index 6859ea88f7..4bbcec9a2a 100644
--- a/macros/latex/contrib/oberdiek/pdfrender.dtx
+++ b/macros/latex/contrib/oberdiek/pdfrender.dtx
@@ -13,15 +13,17 @@
 % conditions of the LaTeX Project Public License, either
 % version 1.3c of this license or (at your option) any later
 % version. This version of this license is in
-%    http://www.latex-project.org/lppl/lppl-1-3c.txt
+%    https://www.latex-project.org/lppl/lppl-1-3c.txt
 % and the latest version of this license is in
-%    http://www.latex-project.org/lppl.txt
+%    https://www.latex-project.org/lppl.txt
 % and version 1.3 or later is part of all distributions of
 % LaTeX version 2005/12/01 or later.
 %
 % This work has the LPPL maintenance status "maintained".
 %
-% This Current Maintainer of this work is Heiko Oberdiek.
+% The Current Maintainers of this work are
+% Heiko Oberdiek and the Oberdiek Package Support Group
+% https://github.com/ho-tex/oberdiek/issues
 %
 % The Base Interpreter refers to any `TeX-Format',
 % because some files are installed in TDS:tex/generic//.
@@ -109,15 +111,18 @@ This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either
 version 1.3c of this license or (at your option) any later
 version. This version of this license is in
-   http://www.latex-project.org/lppl/lppl-1-3c.txt
+   https://www.latex-project.org/lppl/lppl-1-3c.txt
 and the latest version of this license is in
-   http://www.latex-project.org/lppl.txt
+   https://www.latex-project.org/lppl.txt
 and version 1.3 or later is part of all distributions of
 LaTeX version 2005/12/01 or later.
 
 This work has the LPPL maintenance status "maintained".
 
-This Current Maintainer of this work is Heiko Oberdiek.
+The Current Maintainers of this work are
+Heiko Oberdiek and the Oberdiek Package Support Group
+https://github.com/ho-tex/oberdiek/issues
+
 
 The Base Interpreter refers to any `TeX-Format',
 because some files are installed in TDS:tex/generic//.
@@ -206,8 +211,7 @@ and the derived files
 % \title{The \xpackage{pdfrender} package}
 % \date{2018/11/01 v1.5}
 % \author{Heiko Oberdiek\thanks
-% {Please report any issues at https://github.com/ho-tex/oberdiek/issues}\\
-% \xemail{heiko.oberdiek at googlemail.com}}
+% {Please report any issues at \url{https://github.com/ho-tex/oberdiek/issues}}}
 %
 % \maketitle
 %
@@ -1662,7 +1666,7 @@ After %
 % \subsection{Download}
 %
 % \paragraph{Package.} This package is available on
-% CTAN\footnote{\url{http://ctan.org/pkg/pdfrender}}:
+% CTAN\footnote{\CTANpkg{pdfrender}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/pdfrender.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/pdfrender.pdf}] Documentation.
@@ -1674,7 +1678,7 @@ After %
 % the packages are already unpacked and the documentation files
 % are generated. The files and directories obey the TDS standard.
 % \begin{description}
-% \item[\CTAN{install/macros/latex/contrib/oberdiek.tds.zip}]
+% \item[\CTANinstall{install/macros/latex/contrib/oberdiek.tds.zip}]
 % \end{description}
 % \emph{TDS} refers to the standard ``A Directory Structure
 % for \TeX\ Files'' (\CTAN{tds/tds.pdf}). Directories
@@ -1798,16 +1802,6 @@ After %
 %
 % \subsection{Some details for the interested}
 %
-% \paragraph{Attached source.}
-%
-% The PDF documentation on CTAN also includes the
-% \xfile{.dtx} source file. It can be extracted by
-% AcrobatReader 6 or higher. Another option is \textsf{pdftk},
-% e.g. unpack the file into the current directory:
-% \begin{quote}
-%   \verb|pdftk pdfrender.pdf unpack_files output .|
-% \end{quote}
-%
 % \paragraph{Unpacking with \LaTeX.}
 % The \xfile{.dtx} chooses its action depending on the format:
 % \begin{description}
@@ -1843,42 +1837,6 @@ After %
 %\end{verbatim}
 % \end{quote}
 %
-% \section{Catalogue}
-%
-% The following XML file can be used as source for the
-% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
-% The elements \texttt{caption} and \texttt{description} are imported
-% from the original XML file from the Catalogue.
-% The name of the XML file in the Catalogue is \xfile{pdfrender.xml}.
-%    \begin{macrocode}
-%<*catalogue>
-<?xml version='1.0' encoding='us-ascii'?>
-<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
-<entry datestamp='$Date$' modifier='$Author$' id='pdfrender'>
-  <name>pdfrender</name>
-  <caption>Control rendering parameters.</caption>
-  <authorref id='auth:oberdiek'/>
-  <copyright owner='Heiko Oberdiek' year='2010'/>
-  <license type='lppl1.3'/>
-  <version number='1.5'/>
-  <description>
-    The package provides interfaces for the user to control PDF
-    parameters, such as line width or text rendering mode.  The
-    control operations work in a manner very similar to that of the
-     <xref refid='color'>color</xref> package.
-    <p/>
-    The package is part of the <xref refid='oberdiek'>oberdiek</xref> bundle.
-  </description>
-  <documentation details='Package documentation'
-      href='ctan:/macros/latex/contrib/oberdiek/pdfrender.pdf'/>
-  <ctan file='true' path='/macros/latex/contrib/oberdiek/pdfrender.dtx'/>
-  <miktex location='oberdiek'/>
-  <texlive location='oberdiek'/>
-  <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
-</entry>
-%</catalogue>
-%    \end{macrocode}
-%
 % \section{Acknowledgement}
 %
 % \begin{description}
@@ -1902,17 +1860,17 @@ After %
 % \bibitem{news-Vosberg}
 %   Friedrich Vosberg, \textit{Text in Buchstabenumrissen},
 %   de.comp.text.tex, 2010-01-22.
-%   \textsc{URL:}\,\url{http://groups.google.com/group/de.comp.text.tex/msg/f442310ac8b2d506}.
+%   \textsc{URL:}\,\url{https://groups.google.com/group/de.comp.text.tex/msg/f442310ac8b2d506}.
 %
 % \bibitem{news-Pupus}
 %   Gaius Pupus, \textit{Re: Text in Buchstabenumrissen},
 %   de.comp.text.tex, 2010-01-23.
-%   \textsc{URL:}\,\url{http://groups.google.com/group/de.comp.text.tex/msg/95d890d77ac47eb1}.
+%   \textsc{URL:}\,\url{https://groups.google.com/group/de.comp.text.tex/msg/95d890d77ac47eb1}.
 %
 % \bibitem{news-Niepraschk}
 %   Rolf Niepraschk, \textit{Re: Text in Buchstabenumrissen},
 %   de.comp.text.tex, 2010-01-24.
-%   \textsc{URL:}\,\url{http://groups.google.com/group/de.comp.text.tex/msg/4eb61a5879db54db}.
+%   \textsc{URL:}\,\url{https://groups.google.com/group/de.comp.text.tex/msg/4eb61a5879db54db}.
 %
 % \end{thebibliography}
 %
diff --git a/macros/latex/contrib/oberdiek/pdfrender.pdf b/macros/latex/contrib/oberdiek/pdfrender.pdf
index 33d1b9a51a..c2002436aa 100644
--- a/macros/latex/contrib/oberdiek/pdfrender.pdf
+++ b/macros/latex/contrib/oberdiek/pdfrender.pdf
diff --git a/macros/latex/contrib/oberdiek/pdftexcmds.dtx b/macros/latex/contrib/oberdiek/pdftexcmds.dtx
index 9a948c3c2d..a7ce8e7c2a 100644
--- a/macros/latex/contrib/oberdiek/pdftexcmds.dtx
+++ b/macros/latex/contrib/oberdiek/pdftexcmds.dtx
@@ -11,15 +11,17 @@
 % conditions of the LaTeX Project Public License, either
 % version 1.3c of this license or (at your option) any later
 % version. This version of this license is in
-%    http://www.latex-project.org/lppl/lppl-1-3c.txt
+%    https://www.latex-project.org/lppl/lppl-1-3c.txt
 % and the latest version of this license is in
-%    http://www.latex-project.org/lppl.txt
+%    https://www.latex-project.org/lppl.txt
 % and version 1.3 or later is part of all distributions of
 % LaTeX version 2005/12/01 or later.
 %
 % This work has the LPPL maintenance status "maintained".
 %
-% This Current Maintainer of this work is Heiko Oberdiek.
+% The Current Maintainers of this work are
+% Heiko Oberdiek and the Oberdiek Package Support Group
+% https://github.com/ho-tex/oberdiek/issues
 %
 % The Base Interpreter refers to any `TeX-Format',
 % because some files are installed in TDS:tex/generic//.
@@ -109,15 +111,18 @@ This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either
 version 1.3c of this license or (at your option) any later
 version. This version of this license is in
-   http://www.latex-project.org/lppl/lppl-1-3c.txt
+   https://www.latex-project.org/lppl/lppl-1-3c.txt
 and the latest version of this license is in
-   http://www.latex-project.org/lppl.txt
+   https://www.latex-project.org/lppl.txt
 and version 1.3 or later is part of all distributions of
 LaTeX version 2005/12/01 or later.
 
 This work has the LPPL maintenance status "maintained".
 
-This Current Maintainer of this work is Heiko Oberdiek.
+The Current Maintainers of this work are
+Heiko Oberdiek and the Oberdiek Package Support Group
+https://github.com/ho-tex/oberdiek/issues
+
 
 The Base Interpreter refers to any `TeX-Format',
 because some files are installed in TDS:tex/generic//.
@@ -241,8 +246,7 @@ and the derived files
 % \title{The \xpackage{pdftexcmds} package}
 % \date{2019/07/25 v0.30}
 % \author{Heiko Oberdiek\thanks
-% {Please report any issues at https://github.com/ho-tex/oberdiek/issues}\\
-% \xemail{heiko.oberdiek at googlemail.com}}
+% {Please report any issues at \url{https://github.com/ho-tex/oberdiek/issues}}}
 %
 % \maketitle
 %
@@ -2357,7 +2361,7 @@ end
 % \subsection{Download}
 %
 % \paragraph{Package.} This package is available on
-% CTAN\footnote{\url{http://ctan.org/pkg/pdftexcmds}}:
+% CTAN\footnote{\CTANpkg{pdftexcmds}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/pdftexcmds.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/pdftexcmds.pdf}] Documentation.
@@ -2369,7 +2373,7 @@ end
 % the packages are already unpacked and the documentation files
 % are generated. The files and directories obey the TDS standard.
 % \begin{description}
-% \item[\CTAN{install/macros/latex/contrib/oberdiek.tds.zip}]
+% \item[\CTANinstall{install/macros/latex/contrib/oberdiek.tds.zip}]
 % \end{description}
 % \emph{TDS} refers to the standard ``A Directory Structure
 % for \TeX\ Files'' (\CTAN{tds/tds.pdf}). Directories
@@ -2494,16 +2498,6 @@ end
 %
 % \subsection{Some details for the interested}
 %
-% \paragraph{Attached source.}
-%
-% The PDF documentation on CTAN also includes the
-% \xfile{.dtx} source file. It can be extracted by
-% AcrobatReader 6 or higher. Another option is \textsf{pdftk},
-% e.g. unpack the file into the current directory:
-% \begin{quote}
-%   \verb|pdftk pdftexcmds.pdf unpack_files output .|
-% \end{quote}
-%
 % \paragraph{Unpacking with \LaTeX.}
 % The \xfile{.dtx} chooses its action depending on the format:
 % \begin{description}
@@ -2540,43 +2534,6 @@ end
 %\end{verbatim}
 % \end{quote}
 %
-% \section{Catalogue}
-%
-% The following XML file can be used as source for the
-% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
-% The elements \texttt{caption} and \texttt{description} are imported
-% from the original XML file from the Catalogue.
-% The name of the XML file in the Catalogue is \xfile{pdftexcmds.xml}.
-%    \begin{macrocode}
-%<*catalogue>
-<?xml version='1.0' encoding='us-ascii'?>
-<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
-<entry datestamp='$Date$' modifier='$Author$' id='pdftexcmds'>
-  <name>pdftexcmds</name>
-  <caption>LuaTeX support for pdfTeX utility functions.</caption>
-  <authorref id='auth:oberdiek'/>
-  <copyright owner='Heiko Oberdiek' year='2007,2009-2011'/>
-  <license type='lppl1.3'/>
-  <version number='0.20'/>
-  <description>
-    LuaTeX provides most of the commands of
-    <xref refid='pdftex'>pdfTeX</xref> 1.40. However, a number of
-    utility functions are not available.  This package tries to fill
-    the gap and implements some of the missing primitives using Lua.
-    <p/>
-    The package is part of the <xref refid='oberdiek'>oberdiek</xref>
-    bundle.
-  </description>
-  <documentation details='Package documentation'
-      href='ctan:/macros/latex/contrib/oberdiek/pdftexcmds.pdf'/>
-  <ctan file='true' path='/macros/latex/contrib/oberdiek/pdftexcmds.dtx'/>
-  <miktex location='oberdiek'/>
-  <texlive location='oberdiek'/>
-  <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
-</entry>
-%</catalogue>
-%    \end{macrocode}
-%
 % \printbibliography[
 %   heading=bibnumbered,
 % ]
diff --git a/macros/latex/contrib/oberdiek/pdftexcmds.pdf b/macros/latex/contrib/oberdiek/pdftexcmds.pdf
index 75f242c1a0..9968622cb8 100644
--- a/macros/latex/contrib/oberdiek/pdftexcmds.pdf
+++ b/macros/latex/contrib/oberdiek/pdftexcmds.pdf
diff --git a/macros/latex/contrib/oberdiek/picture.dtx b/macros/latex/contrib/oberdiek/picture.dtx
index ba41078a32..139ce8c2d6 100644
--- a/macros/latex/contrib/oberdiek/picture.dtx
+++ b/macros/latex/contrib/oberdiek/picture.dtx
@@ -13,15 +13,17 @@
 % conditions of the LaTeX Project Public License, either
 % version 1.3c of this license or (at your option) any later
 % version. This version of this license is in
-%    http://www.latex-project.org/lppl/lppl-1-3c.txt
+%    https://www.latex-project.org/lppl/lppl-1-3c.txt
 % and the latest version of this license is in
-%    http://www.latex-project.org/lppl.txt
+%    https://www.latex-project.org/lppl.txt
 % and version 1.3 or later is part of all distributions of
 % LaTeX version 2005/12/01 or later.
 %
 % This work has the LPPL maintenance status "maintained".
 %
-% This Current Maintainer of this work is Heiko Oberdiek.
+% The Current Maintainers of this work are
+% Heiko Oberdiek and the Oberdiek Package Support Group
+% https://github.com/ho-tex/oberdiek/issues
 %
 % This work consists of the main source file picture.dtx
 % and the derived files
@@ -100,15 +102,18 @@ This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either
 version 1.3c of this license or (at your option) any later
 version. This version of this license is in
-   http://www.latex-project.org/lppl/lppl-1-3c.txt
+   https://www.latex-project.org/lppl/lppl-1-3c.txt
 and the latest version of this license is in
-   http://www.latex-project.org/lppl.txt
+   https://www.latex-project.org/lppl.txt
 and version 1.3 or later is part of all distributions of
 LaTeX version 2005/12/01 or later.
 
 This work has the LPPL maintenance status "maintained".
 
-This Current Maintainer of this work is Heiko Oberdiek.
+The Current Maintainers of this work are
+Heiko Oberdiek and the Oberdiek Package Support Group
+https://github.com/ho-tex/oberdiek/issues
+
 
 This work consists of the main source file picture.dtx
 and the derived files
@@ -186,8 +191,7 @@ and the derived files
 % \title{The \xpackage{picture} package}
 % \date{2016/05/16 v1.4}
 % \author{Heiko Oberdiek\thanks
-% {Please report any issues at https://github.com/ho-tex/oberdiek/issues}\\
-% \xemail{heiko.oberdiek at googlemail.com}}
+% {Please report any issues at \url{https://github.com/ho-tex/oberdiek/issues}}}
 %
 % \maketitle
 %
@@ -595,7 +599,7 @@ and the derived files
 % \subsection{Download}
 %
 % \paragraph{Package.} This package is available on
-% CTAN\footnote{\url{http://ctan.org/pkg/picture}}:
+% CTAN\footnote{\CTANpkg{picture}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/picture.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/picture.pdf}] Documentation.
@@ -607,7 +611,7 @@ and the derived files
 % the packages are already unpacked and the documentation files
 % are generated. The files and directories obey the TDS standard.
 % \begin{description}
-% \item[\CTAN{install/macros/latex/contrib/oberdiek.tds.zip}]
+% \item[\CTANinstall{install/macros/latex/contrib/oberdiek.tds.zip}]
 % \end{description}
 % \emph{TDS} refers to the standard ``A Directory Structure
 % for \TeX\ Files'' (\CTAN{tds/tds.pdf}). Directories
@@ -727,16 +731,6 @@ and the derived files
 %
 % \subsection{Some details for the interested}
 %
-% \paragraph{Attached source.}
-%
-% The PDF documentation on CTAN also includes the
-% \xfile{.dtx} source file. It can be extracted by
-% AcrobatReader 6 or higher. Another option is \textsf{pdftk},
-% e.g. unpack the file into the current directory:
-% \begin{quote}
-%   \verb|pdftk picture.pdf unpack_files output .|
-% \end{quote}
-%
 % \paragraph{Unpacking with \LaTeX.}
 % The \xfile{.dtx} chooses its action depending on the format:
 % \begin{description}
@@ -772,42 +766,6 @@ and the derived files
 %\end{verbatim}
 % \end{quote}
 %
-% \section{Catalogue}
-%
-% The following XML file can be used as source for the
-% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
-% The elements \texttt{caption} and \texttt{description} are imported
-% from the original XML file from the Catalogue.
-% The name of the XML file in the Catalogue is \xfile{picture.xml}.
-%    \begin{macrocode}
-%<*catalogue>
-<?xml version='1.0' encoding='us-ascii'?>
-<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
-<entry datestamp='$Date$' modifier='$Author$' id='picture'>
-  <name>picture</name>
-  <caption>Dimens for picture macros.</caption>
-  <authorref id='auth:oberdiek'/>
-  <copyright owner='Heiko Oberdiek' year='2006-2009'/>
-  <license type='lppl1.3'/>
-  <version number='1.4'/>
-  <description>
-    There are macro and environment arguments that expect numbers
-    that will internally be multiplied by <tt>\unitlength</tt>.
-    This package extends the syntax of these arguments, so that
-    dimensions with calculation support may be used for these arguments.
-    <p/>
-    The package is part of the <xref refid='oberdiek'>oberdiek</xref> bundle.
-  </description>
-  <documentation details='Package documentation'
-      href='ctan:/macros/latex/contrib/oberdiek/picture.pdf'/>
-  <ctan file='true' path='/macros/latex/contrib/oberdiek/picture.dtx'/>
-  <miktex location='oberdiek'/>
-  <texlive location='oberdiek'/>
-  <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
-</entry>
-%</catalogue>
-%    \end{macrocode}
-%
 % \begin{History}
 %   \begin{Version}{2006/08/26 v1.0}
 %   \item
diff --git a/macros/latex/contrib/oberdiek/picture.pdf b/macros/latex/contrib/oberdiek/picture.pdf
index 52bca63a52..a874afcaaf 100644
--- a/macros/latex/contrib/oberdiek/picture.pdf
+++ b/macros/latex/contrib/oberdiek/picture.pdf
diff --git a/macros/latex/contrib/oberdiek/pmboxdraw.dtx b/macros/latex/contrib/oberdiek/pmboxdraw.dtx
index d2c96ad89c..113fe799bf 100644
--- a/macros/latex/contrib/oberdiek/pmboxdraw.dtx
+++ b/macros/latex/contrib/oberdiek/pmboxdraw.dtx
@@ -13,15 +13,17 @@
 % conditions of the LaTeX Project Public License, either
 % version 1.3c of this license or (at your option) any later
 % version. This version of this license is in
-%    http://www.latex-project.org/lppl/lppl-1-3c.txt
+%    https://www.latex-project.org/lppl/lppl-1-3c.txt
 % and the latest version of this license is in
-%    http://www.latex-project.org/lppl.txt
+%    https://www.latex-project.org/lppl.txt
 % and version 1.3 or later is part of all distributions of
 % LaTeX version 2005/12/01 or later.
 %
 % This work has the LPPL maintenance status "maintained".
 %
-% This Current Maintainer of this work is Heiko Oberdiek.
+% The Current Maintainers of this work are
+% Heiko Oberdiek and the Oberdiek Package Support Group
+% https://github.com/ho-tex/oberdiek/issues
 %
 % This work consists of the main source file pmboxdraw.dtx
 % and the derived files
@@ -101,15 +103,18 @@ This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either
 version 1.3c of this license or (at your option) any later
 version. This version of this license is in
-   http://www.latex-project.org/lppl/lppl-1-3c.txt
+   https://www.latex-project.org/lppl/lppl-1-3c.txt
 and the latest version of this license is in
-   http://www.latex-project.org/lppl.txt
+   https://www.latex-project.org/lppl.txt
 and version 1.3 or later is part of all distributions of
 LaTeX version 2005/12/01 or later.
 
 This work has the LPPL maintenance status "maintained".
 
-This Current Maintainer of this work is Heiko Oberdiek.
+The Current Maintainers of this work are
+Heiko Oberdiek and the Oberdiek Package Support Group
+https://github.com/ho-tex/oberdiek/issues
+
 
 This work consists of the main source file pmboxdraw.dtx
 and the derived files
@@ -196,8 +201,7 @@ and the derived files
 % \title{The \xpackage{pmboxdraw} package}
 % \date{2019/02/28 v1.3}
 % \author{Heiko Oberdiek\thanks
-% {Please report any issues at https://github.com/ho-tex/oberdiek/issues}\\
-% \xemail{heiko.oberdiek at googlemail.com}}
+% {Please report any issues at \url{https://github.com/ho-tex/oberdiek/issues}}}
 %
 % \maketitle
 %
@@ -5382,7 +5386,7 @@ $ \kern.5\pmbd@C
 % \subsection{Download}
 %
 % \paragraph{Package.} This package is available on
-% CTAN\footnote{\url{http://ctan.org/pkg/pmboxdraw}}:
+% CTAN\footnote{\CTANpkg{pmboxdraw}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/pmboxdraw.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/pmboxdraw.pdf}] Documentation.
@@ -5394,7 +5398,7 @@ $ \kern.5\pmbd@C
 % the packages are already unpacked and the documentation files
 % are generated. The files and directories obey the TDS standard.
 % \begin{description}
-% \item[\CTAN{install/macros/latex/contrib/oberdiek.tds.zip}]
+% \item[\CTANinstall{install/macros/latex/contrib/oberdiek.tds.zip}]
 % \end{description}
 % \emph{TDS} refers to the standard ``A Directory Structure
 % for \TeX\ Files'' (\CTAN{tds/tds.pdf}). Directories
@@ -5515,16 +5519,6 @@ $ \kern.5\pmbd@C
 %
 % \subsection{Some details for the interested}
 %
-% \paragraph{Attached source.}
-%
-% The PDF documentation on CTAN also includes the
-% \xfile{.dtx} source file. It can be extracted by
-% AcrobatReader 6 or higher. Another option is \textsf{pdftk},
-% e.g. unpack the file into the current directory:
-% \begin{quote}
-%   \verb|pdftk pmboxdraw.pdf unpack_files output .|
-% \end{quote}
-%
 % \paragraph{Unpacking with \LaTeX.}
 % The \xfile{.dtx} chooses its action depending on the format:
 % \begin{description}
@@ -5560,51 +5554,17 @@ $ \kern.5\pmbd@C
 %\end{verbatim}
 % \end{quote}
 %
-% \section{Catalogue}
-%
-% The following XML file can be used as source for the
-% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
-% The elements \texttt{caption} and \texttt{description} are imported
-% from the original XML file from the Catalogue.
-% The name of the XML file in the Catalogue is \xfile{pmboxdraw.xml}.
-%    \begin{macrocode}
-%<*catalogue>
-<?xml version='1.0' encoding='us-ascii'?>
-<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
-<entry datestamp='$Date$' modifier='$Author$' id='pmboxdraw'>
-  <name>pmboxdraw</name>
-  <caption>Poor man's box drawing characters.</caption>
-  <authorref id='auth:oberdiek'/>
-  <copyright owner='Heiko Oberdiek' year='2006,2011'/>
-  <license type='lppl1.3'/>
-  <version number='1.3'/>
-  <description>
-    This package declares box drawing characters of
-    old code pages, e.g. cp437. It uses rules instead of using a font.
-    <p/>
-    The package is part of the <xref refid='oberdiek'>oberdiek</xref> bundle.
-  </description>
-  <documentation details='Package documentation'
-      href='ctan:/macros/latex/contrib/oberdiek/pmboxdraw.pdf'/>
-  <ctan file='true' path='/macros/latex/contrib/oberdiek/pmboxdraw.dtx'/>
-  <miktex location='oberdiek'/>
-  <texlive location='oberdiek'/>
-  <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
-</entry>
-%</catalogue>
-%    \end{macrocode}
-%
 % \begin{thebibliography}{9}
 %
 % \bibitem{inputenx}
 %   Heiko Oberdiek, The \xpackage{inputenx} Package (Enhanced input encoding
 %   handling), 2006/03/05 v1.0,
-%   \url{http://ctan.org/pkg/inputenx}.
+%   \CTANpkg{inputenx}.
 %
 % \bibitem{aglfn}
 %   Adobe Systems Incorporated,
 %   Adobe Glyph List for New Fonts (AGLFN), version 1.5, 2005/09/18,
-%   \url{http://partners.adobe.com/public/developer/en/opentype/aglfn13.txt}.
+%   \url{https://github.com/adobe-type-tools/agl-aglfn/blob/master/aglfn.txt}.
 %
 % \bibitem{2500}
 %   Unicode Inc.,
diff --git a/macros/latex/contrib/oberdiek/pmboxdraw.pdf b/macros/latex/contrib/oberdiek/pmboxdraw.pdf
index 5b555d0e65..12bf903e46 100644
--- a/macros/latex/contrib/oberdiek/pmboxdraw.pdf
+++ b/macros/latex/contrib/oberdiek/pmboxdraw.pdf
diff --git a/macros/latex/contrib/oberdiek/protecteddef.dtx b/macros/latex/contrib/oberdiek/protecteddef.dtx
index 528bd62d35..7c9dca3a37 100644
--- a/macros/latex/contrib/oberdiek/protecteddef.dtx
+++ b/macros/latex/contrib/oberdiek/protecteddef.dtx
@@ -13,15 +13,17 @@
 % conditions of the LaTeX Project Public License, either
 % version 1.3c of this license or (at your option) any later
 % version. This version of this license is in
-%    http://www.latex-project.org/lppl/lppl-1-3c.txt
+%    https://www.latex-project.org/lppl/lppl-1-3c.txt
 % and the latest version of this license is in
-%    http://www.latex-project.org/lppl.txt
+%    https://www.latex-project.org/lppl.txt
 % and version 1.3 or later is part of all distributions of
 % LaTeX version 2005/12/01 or later.
 %
 % This work has the LPPL maintenance status "maintained".
 %
-% This Current Maintainer of this work is Heiko Oberdiek.
+% The Current Maintainers of this work are
+% Heiko Oberdiek and the Oberdiek Package Support Group
+% https://github.com/ho-tex/oberdiek/issues
 %
 % The Base Interpreter refers to any `TeX-Format',
 % because some files are installed in TDS:tex/generic//.
@@ -104,15 +106,18 @@ This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either
 version 1.3c of this license or (at your option) any later
 version. This version of this license is in
-   http://www.latex-project.org/lppl/lppl-1-3c.txt
+   https://www.latex-project.org/lppl/lppl-1-3c.txt
 and the latest version of this license is in
-   http://www.latex-project.org/lppl.txt
+   https://www.latex-project.org/lppl.txt
 and version 1.3 or later is part of all distributions of
 LaTeX version 2005/12/01 or later.
 
 This work has the LPPL maintenance status "maintained".
 
-This Current Maintainer of this work is Heiko Oberdiek.
+The Current Maintainers of this work are
+Heiko Oberdiek and the Oberdiek Package Support Group
+https://github.com/ho-tex/oberdiek/issues
+
 
 The Base Interpreter refers to any `TeX-Format',
 because some files are installed in TDS:tex/generic//.
@@ -194,8 +199,7 @@ and the derived files
 % \title{The \xpackage{protecteddef} package}
 % \date{2016/05/16 v1.1}
 % \author{Heiko Oberdiek\thanks
-% {Please report any issues at https://github.com/ho-tex/oberdiek/issues}\\
-% \xemail{heiko.oberdiek at googlemail.com}}
+% {Please report any issues at \url{https://github.com/ho-tex/oberdiek/issues}}}
 %
 % \maketitle
 %
@@ -821,7 +825,7 @@ and the derived files
 % \subsection{Download}
 %
 % \paragraph{Package.} This package is available on
-% CTAN\footnote{\url{http://ctan.org/pkg/protecteddef}}:
+% CTAN\footnote{\CTANpkg{protecteddef}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/protecteddef.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/protecteddef.pdf}] Documentation.
@@ -833,7 +837,7 @@ and the derived files
 % the packages are already unpacked and the documentation files
 % are generated. The files and directories obey the TDS standard.
 % \begin{description}
-% \item[\CTAN{install/macros/latex/contrib/oberdiek.tds.zip}]
+% \item[\CTANinstall{install/macros/latex/contrib/oberdiek.tds.zip}]
 % \end{description}
 % \emph{TDS} refers to the standard ``A Directory Structure
 % for \TeX\ Files'' (\CTAN{tds/tds.pdf}). Directories
@@ -954,16 +958,6 @@ and the derived files
 %
 % \subsection{Some details for the interested}
 %
-% \paragraph{Attached source.}
-%
-% The PDF documentation on CTAN also includes the
-% \xfile{.dtx} source file. It can be extracted by
-% AcrobatReader 6 or higher. Another option is \textsf{pdftk},
-% e.g. unpack the file into the current directory:
-% \begin{quote}
-%   \verb|pdftk protecteddef.pdf unpack_files output .|
-% \end{quote}
-%
 % \paragraph{Unpacking with \LaTeX.}
 % The \xfile{.dtx} chooses its action depending on the format:
 % \begin{description}
@@ -999,42 +993,6 @@ and the derived files
 %\end{verbatim}
 % \end{quote}
 %
-% \section{Catalogue}
-%
-% The following XML file can be used as source for the
-% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
-% The elements \texttt{caption} and \texttt{description} are imported
-% from the original XML file from the Catalogue.
-% The name of the XML file in the Catalogue is \xfile{protecteddef.xml}.
-%    \begin{macrocode}
-%<*catalogue>
-<?xml version='1.0' encoding='us-ascii'?>
-<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
-<entry datestamp='$Date$' modifier='$Author$' id='protecteddef'>
-  <name>protecteddef</name>
-  <caption>Define protected commands.</caption>
-  <authorref id='auth:oberdiek'/>
-  <copyright owner='Heiko Oberdiek' year='2011'/>
-  <license type='lppl1.3'/>
-  <version number='1.1'/>
-  <description>
-    The package defines a command <tt>\ProtectedDef</tt> that will
-    create LaTeX &#x2018;robust&#x2019; command or an e-TeX
-    &#x2018;protected&#x2019; command as appropriate
-    to its environment.
-    <p/>
-    The package is part of the <xref refid='oberdiek'>oberdiek</xref> bundle.
-  </description>
-  <documentation details='Package documentation'
-      href='ctan:/macros/latex/contrib/oberdiek/protecteddef.pdf'/>
-  <ctan file='true' path='/macros/latex/contrib/oberdiek/protecteddef.dtx'/>
-  <miktex location='oberdiek'/>
-  <texlive location='oberdiek'/>
-  <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
-</entry>
-%</catalogue>
-%    \end{macrocode}
-%
 % \begin{History}
 %   \begin{Version}{2011/01/31 v1.0}
 %   \item
diff --git a/macros/latex/contrib/oberdiek/protecteddef.pdf b/macros/latex/contrib/oberdiek/protecteddef.pdf
index 00c9d0ade2..fb6bd80338 100644
--- a/macros/latex/contrib/oberdiek/protecteddef.pdf
+++ b/macros/latex/contrib/oberdiek/protecteddef.pdf
diff --git a/macros/latex/contrib/oberdiek/refcount.dtx b/macros/latex/contrib/oberdiek/refcount.dtx
index d8b6b8e4ea..dc6df6b5c7 100644
--- a/macros/latex/contrib/oberdiek/refcount.dtx
+++ b/macros/latex/contrib/oberdiek/refcount.dtx
@@ -13,15 +13,17 @@
 % conditions of the LaTeX Project Public License, either
 % version 1.3c of this license or (at your option) any later
 % version. This version of this license is in
-%    http://www.latex-project.org/lppl/lppl-1-3c.txt
+%    https://www.latex-project.org/lppl/lppl-1-3c.txt
 % and the latest version of this license is in
-%    http://www.latex-project.org/lppl.txt
+%    https://www.latex-project.org/lppl.txt
 % and version 1.3 or later is part of all distributions of
 % LaTeX version 2005/12/01 or later.
 %
 % This work has the LPPL maintenance status "maintained".
 %
-% This Current Maintainer of this work is Heiko Oberdiek.
+% The Current Maintainers of this work are
+% Heiko Oberdiek and the Oberdiek Package Support Group
+% https://github.com/ho-tex/oberdiek/issues
 %
 % This work consists of the main source file refcount.dtx
 % and the derived files
@@ -105,15 +107,18 @@ This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either
 version 1.3c of this license or (at your option) any later
 version. This version of this license is in
-   http://www.latex-project.org/lppl/lppl-1-3c.txt
+   https://www.latex-project.org/lppl/lppl-1-3c.txt
 and the latest version of this license is in
-   http://www.latex-project.org/lppl.txt
+   https://www.latex-project.org/lppl.txt
 and version 1.3 or later is part of all distributions of
 LaTeX version 2005/12/01 or later.
 
 This work has the LPPL maintenance status "maintained".
 
-This Current Maintainer of this work is Heiko Oberdiek.
+The Current Maintainers of this work are
+Heiko Oberdiek and the Oberdiek Package Support Group
+https://github.com/ho-tex/oberdiek/issues
+
 
 This work consists of the main source file refcount.dtx
 and the derived files
@@ -196,8 +201,7 @@ and the derived files
 % \title{The \xpackage{refcount} package}
 % \date{2016/05/16 v3.5}
 % \author{Heiko Oberdiek\thanks
-% {Please report any issues at https://github.com/ho-tex/oberdiek/issues}\\
-% \xemail{heiko.oberdiek at googlemail.com}}
+% {Please report any issues at \url{https://github.com/ho-tex/oberdiek/issues}}}
 %
 % \maketitle
 %
@@ -1308,7 +1312,7 @@ and the derived files
 % \subsection{Download}
 %
 % \paragraph{Package.} This package is available on
-% CTAN\footnote{\url{http://ctan.org/pkg/refcount}}:
+% CTAN\footnote{\CTANpkg{refcount}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/refcount.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/refcount.pdf}] Documentation.
@@ -1320,7 +1324,7 @@ and the derived files
 % the packages are already unpacked and the documentation files
 % are generated. The files and directories obey the TDS standard.
 % \begin{description}
-% \item[\CTAN{install/macros/latex/contrib/oberdiek.tds.zip}]
+% \item[\CTANinstall{install/macros/latex/contrib/oberdiek.tds.zip}]
 % \end{description}
 % \emph{TDS} refers to the standard ``A Directory Structure
 % for \TeX\ Files'' (\CTAN{tds/tds.pdf}). Directories
@@ -1444,16 +1448,6 @@ and the derived files
 %
 % \subsection{Some details for the interested}
 %
-% \paragraph{Attached source.}
-%
-% The PDF documentation on CTAN also includes the
-% \xfile{.dtx} source file. It can be extracted by
-% AcrobatReader 6 or higher. Another option is \textsf{pdftk},
-% e.g. unpack the file into the current directory:
-% \begin{quote}
-%   \verb|pdftk refcount.pdf unpack_files output .|
-% \end{quote}
-%
 % \paragraph{Unpacking with \LaTeX.}
 % The \xfile{.dtx} chooses its action depending on the format:
 % \begin{description}
@@ -1489,62 +1483,13 @@ and the derived files
 %\end{verbatim}
 % \end{quote}
 %
-% \section{Catalogue}
-%
-% The following XML file can be used as source for the
-% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
-% The elements \texttt{caption} and \texttt{description} are imported
-% from the original XML file from the Catalogue.
-% The name of the XML file in the Catalogue is \xfile{refcount.xml}.
-%    \begin{macrocode}
-%<*catalogue>
-<?xml version='1.0' encoding='us-ascii'?>
-<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
-<entry datestamp='$Date$' modifier='$Author$' id='refcount'>
-  <name>refcount</name>
-  <caption>Counter operations with label references.</caption>
-  <authorref id='auth:oberdiek'/>
-  <copyright owner='Heiko Oberdiek' year='1998,2000,2006,2008,2010,2011'/>
-  <license type='lppl1.3'/>
-  <version number='3.5'/>
-  <description>
-    Provides commands <tt>\setcounterref</tt> and
-    <tt>\addtocounterref</tt> which use the section (or whatever)
-    number from the reference as the value to put into the counter, as
-    in:
-
-    <pre>
-    ...\label{sec:foo}
-    ...
-    \setcounterref{foonum}{sec:foo}
-    </pre>
-    Commands <tt>\setcounterpageref</tt> and
-    <tt>\addtocounterpageref</tt> do the corresponding thing with the
-    page reference of the label.
-    <p/>
-    No <tt>.ins</tt> file is distributed; process the
-    <tt>.dtx</tt> with plain TeX to create one.
-    <p/>
-    The package is part of the <xref refid='oberdiek'>oberdiek</xref>
-    bundle.
-  </description>
-  <documentation details='Package documentation'
-      href='ctan:/macros/latex/contrib/oberdiek/refcount.pdf'/>
-  <ctan file='true' path='/macros/latex/contrib/oberdiek/refcount.dtx'/>
-  <miktex location='oberdiek'/>
-  <texlive location='oberdiek'/>
-  <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
-</entry>
-%</catalogue>
-%    \end{macrocode}
-%
 % \begin{History}
 %   \begin{Version}{1998/04/08 v1.0}
 %   \item
 %     First public release, written as answer in the
 %     newsgroup \xnewsgroup{comp.text.tex}:
 %     \URL{``\link{Re: Adding a \cs{ref} to a counter?}''}^^A
-%     {http://groups.google.com/group/comp.text.tex/msg/c3f2a135ef5ee528}
+%     {https://groups.google.com/group/comp.text.tex/msg/c3f2a135ef5ee528}
 %   \end{Version}
 %   \begin{Version}{2000/09/07 v2.0}
 %   \item
diff --git a/macros/latex/contrib/oberdiek/refcount.pdf b/macros/latex/contrib/oberdiek/refcount.pdf
index bdd7d921ca..7086e41cdf 100644
--- a/macros/latex/contrib/oberdiek/refcount.pdf
+++ b/macros/latex/contrib/oberdiek/refcount.pdf
diff --git a/macros/latex/contrib/oberdiek/rerunfilecheck.dtx b/macros/latex/contrib/oberdiek/rerunfilecheck.dtx
index d8f37a1da8..94732005d4 100644
--- a/macros/latex/contrib/oberdiek/rerunfilecheck.dtx
+++ b/macros/latex/contrib/oberdiek/rerunfilecheck.dtx
@@ -13,15 +13,17 @@
 % conditions of the LaTeX Project Public License, either
 % version 1.3c of this license or (at your option) any later
 % version. This version of this license is in
-%    http://www.latex-project.org/lppl/lppl-1-3c.txt
+%    https://www.latex-project.org/lppl/lppl-1-3c.txt
 % and the latest version of this license is in
-%    http://www.latex-project.org/lppl.txt
+%    https://www.latex-project.org/lppl.txt
 % and version 1.3 or later is part of all distributions of
 % LaTeX version 2005/12/01 or later.
 %
 % This work has the LPPL maintenance status "maintained".
 %
-% This Current Maintainer of this work is Heiko Oberdiek.
+% The Current Maintainers of this work are
+% Heiko Oberdiek and the Oberdiek Package Support Group
+% https://github.com/ho-tex/oberdiek/issues
 %
 % This work consists of the main source file rerunfilecheck.dtx
 % and the derived files
@@ -102,15 +104,18 @@ This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either
 version 1.3c of this license or (at your option) any later
 version. This version of this license is in
-   http://www.latex-project.org/lppl/lppl-1-3c.txt
+   https://www.latex-project.org/lppl/lppl-1-3c.txt
 and the latest version of this license is in
-   http://www.latex-project.org/lppl.txt
+   https://www.latex-project.org/lppl.txt
 and version 1.3 or later is part of all distributions of
 LaTeX version 2005/12/01 or later.
 
 This work has the LPPL maintenance status "maintained".
 
-This Current Maintainer of this work is Heiko Oberdiek.
+The Current Maintainers of this work are
+Heiko Oberdiek and the Oberdiek Package Support Group
+https://github.com/ho-tex/oberdiek/issues
+
 
 This work consists of the main source file rerunfilecheck.dtx
 and the derived files
@@ -191,8 +196,7 @@ and the derived files
 % \title{The \xpackage{rerunfilecheck} package}
 % \date{2016/05/16 v1.8}
 % \author{Heiko Oberdiek\thanks
-% {Please report any issues at https://github.com/ho-tex/oberdiek/issues}\\
-% \xemail{heiko.oberdiek at googlemail.com}}
+% {Please report any issues at \url{https://github.com/ho-tex/oberdiek/issues}}}
 %
 % \maketitle
 %
@@ -840,7 +844,7 @@ and the derived files
 % \subsection{Download}
 %
 % \paragraph{Package.} This package is available on
-% CTAN\footnote{\url{http://ctan.org/pkg/rerunfilecheck}}:
+% CTAN\footnote{\CTANpkg{rerunfilecheck}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/rerunfilecheck.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/rerunfilecheck.pdf}] Documentation.
@@ -852,7 +856,7 @@ and the derived files
 % the packages are already unpacked and the documentation files
 % are generated. The files and directories obey the TDS standard.
 % \begin{description}
-% \item[\CTAN{install/macros/latex/contrib/oberdiek.tds.zip}]
+% \item[\CTANinstall{install/macros/latex/contrib/oberdiek.tds.zip}]
 % \end{description}
 % \emph{TDS} refers to the standard ``A Directory Structure
 % for \TeX\ Files'' (\CTAN{tds/tds.pdf}). Directories
@@ -973,16 +977,6 @@ and the derived files
 %
 % \subsection{Some details for the interested}
 %
-% \paragraph{Attached source.}
-%
-% The PDF documentation on CTAN also includes the
-% \xfile{.dtx} source file. It can be extracted by
-% AcrobatReader 6 or higher. Another option is \textsf{pdftk},
-% e.g. unpack the file into the current directory:
-% \begin{quote}
-%   \verb|pdftk rerunfilecheck.pdf unpack_files output .|
-% \end{quote}
-%
 % \paragraph{Unpacking with \LaTeX.}
 % The \xfile{.dtx} chooses its action depending on the format:
 % \begin{description}
@@ -1018,41 +1012,6 @@ and the derived files
 %\end{verbatim}
 % \end{quote}
 %
-% \section{Catalogue}
-%
-% The following XML file can be used as source for the
-% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
-% The elements \texttt{caption} and \texttt{description} are imported
-% from the original XML file from the Catalogue.
-% The name of the XML file in the Catalogue is \xfile{rerunfilecheck.xml}.
-%    \begin{macrocode}
-%<*catalogue>
-<?xml version='1.0' encoding='us-ascii'?>
-<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
-<entry datestamp='$Date$' modifier='$Author$' id='rerunfilecheck'>
-  <name>rerunfilecheck</name>
-  <caption>Checksum based rerun checks on auxiliary files.</caption>
-  <authorref id='auth:oberdiek'/>
-  <copyright owner='Heiko Oberdiek' year='2009-2011'/>
-  <license type='lppl1.3'/>
-  <version number='1.8'/>
-  <description>
-    The package provides additional rerun warnings if some
-    auxiliary files have changed. It is based on MD5 checksum,
-    provided by pdfTeX.
-    <p/>
-    The package is part of the <xref refid='oberdiek'>oberdiek</xref> bundle.
-  </description>
-  <documentation details='Package documentation'
-      href='ctan:/macros/latex/contrib/oberdiek/rerunfilecheck.pdf'/>
-  <ctan file='true' path='/macros/latex/contrib/oberdiek/rerunfilecheck.dtx'/>
-  <miktex location='oberdiek'/>
-  <texlive location='oberdiek'/>
-  <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
-</entry>
-%</catalogue>
-%    \end{macrocode}
-%
 % \begin{History}
 %   \begin{Version}{2009/12/10 v1.0}
 %   \item
diff --git a/macros/latex/contrib/oberdiek/rerunfilecheck.pdf b/macros/latex/contrib/oberdiek/rerunfilecheck.pdf
index e5e054e5a6..8996fe806e 100644
--- a/macros/latex/contrib/oberdiek/rerunfilecheck.pdf
+++ b/macros/latex/contrib/oberdiek/rerunfilecheck.pdf
diff --git a/macros/latex/contrib/oberdiek/resizegather.dtx b/macros/latex/contrib/oberdiek/resizegather.dtx
index 07bbe0f133..b335070f08 100644
--- a/macros/latex/contrib/oberdiek/resizegather.dtx
+++ b/macros/latex/contrib/oberdiek/resizegather.dtx
@@ -13,15 +13,17 @@
 % conditions of the LaTeX Project Public License, either
 % version 1.3c of this license or (at your option) any later
 % version. This version of this license is in
-%    http://www.latex-project.org/lppl/lppl-1-3c.txt
+%    https://www.latex-project.org/lppl/lppl-1-3c.txt
 % and the latest version of this license is in
-%    http://www.latex-project.org/lppl.txt
+%    https://www.latex-project.org/lppl.txt
 % and version 1.3 or later is part of all distributions of
 % LaTeX version 2005/12/01 or later.
 %
 % This work has the LPPL maintenance status "maintained".
 %
-% This Current Maintainer of this work is Heiko Oberdiek.
+% The Current Maintainers of this work are
+% Heiko Oberdiek and the Oberdiek Package Support Group
+% https://github.com/ho-tex/oberdiek/issues
 %
 % This work consists of the main source file resizegather.dtx
 % and the derived files
@@ -100,15 +102,18 @@ This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either
 version 1.3c of this license or (at your option) any later
 version. This version of this license is in
-   http://www.latex-project.org/lppl/lppl-1-3c.txt
+   https://www.latex-project.org/lppl/lppl-1-3c.txt
 and the latest version of this license is in
-   http://www.latex-project.org/lppl.txt
+   https://www.latex-project.org/lppl.txt
 and version 1.3 or later is part of all distributions of
 LaTeX version 2005/12/01 or later.
 
 This work has the LPPL maintenance status "maintained".
 
-This Current Maintainer of this work is Heiko Oberdiek.
+The Current Maintainers of this work are
+Heiko Oberdiek and the Oberdiek Package Support Group
+https://github.com/ho-tex/oberdiek/issues
+
 
 This work consists of the main source file resizegather.dtx
 and the derived files
@@ -193,8 +198,7 @@ and the derived files
 % \title{The \xpackage{resizegather} package}
 % \date{2016/05/16 v1.3}
 % \author{Heiko Oberdiek\thanks
-% {Please report any issues at https://github.com/ho-tex/oberdiek/issues}\\
-% \xemail{heiko.oberdiek at googlemail.com}}
+% {Please report any issues at \url{https://github.com/ho-tex/oberdiek/issues}}}
 %
 % \maketitle
 %
@@ -792,7 +796,7 @@ and the derived files
 % \subsection{Download}
 %
 % \paragraph{Package.} This package is available on
-% CTAN\footnote{\url{http://ctan.org/pkg/resizegather}}:
+% CTAN\footnote{\CTANpkg{resizegather}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/resizegather.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/resizegather.pdf}] Documentation.
@@ -804,7 +808,7 @@ and the derived files
 % the packages are already unpacked and the documentation files
 % are generated. The files and directories obey the TDS standard.
 % \begin{description}
-% \item[\CTAN{install/macros/latex/contrib/oberdiek.tds.zip}]
+% \item[\CTANinstall{install/macros/latex/contrib/oberdiek.tds.zip}]
 % \end{description}
 % \emph{TDS} refers to the standard ``A Directory Structure
 % for \TeX\ Files'' (\CTAN{tds/tds.pdf}). Directories
@@ -924,16 +928,6 @@ and the derived files
 %
 % \subsection{Some details for the interested}
 %
-% \paragraph{Attached source.}
-%
-% The PDF documentation on CTAN also includes the
-% \xfile{.dtx} source file. It can be extracted by
-% AcrobatReader 6 or higher. Another option is \textsf{pdftk},
-% e.g. unpack the file into the current directory:
-% \begin{quote}
-%   \verb|pdftk resizegather.pdf unpack_files output .|
-% \end{quote}
-%
 % \paragraph{Unpacking with \LaTeX.}
 % The \xfile{.dtx} chooses its action depending on the format:
 % \begin{description}
@@ -969,44 +963,6 @@ and the derived files
 %\end{verbatim}
 % \end{quote}
 %
-% \section{Catalogue}
-%
-% The following XML file can be used as source for the
-% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
-% The elements \texttt{caption} and \texttt{description} are imported
-% from the original XML file from the Catalogue.
-% The name of the XML file in the Catalogue is \xfile{resizegather.xml}.
-%    \begin{macrocode}
-%<*catalogue>
-<?xml version='1.0' encoding='us-ascii'?>
-<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
-<entry datestamp='$Date$' modifier='$Author$' id='resizegather'>
-  <name>resizegather</name>
-  <caption>Automatically resize overly large equations.</caption>
-  <authorref id='auth:oberdiek'/>
-  <copyright owner='Heiko Oberdiek' year='2009,2010'/>
-  <license type='lppl1.3'/>
-  <version number='1.3'/>
-  <description>
-    Equations that are too large are resized to fit the available
-    space. The environment &#x2018;gather&#x2019; of package
-    <xref refid='amsmath'>amsmath</xref> is supported.  Also the
-    environments &#x2018;equation&#x2019; and
-    &#x2018;displaymath&#x2019; are redefined using
-    &#x2018;gather&#x2019; and its starred version.
-    <p/>
-    The package is part of the <xref refid='oberdiek'>oberdiek</xref> bundle.
-  </description>
-  <documentation details='Package documentation'
-      href='ctan:/macros/latex/contrib/oberdiek/resizegather.pdf'/>
-  <ctan file='true' path='/macros/latex/contrib/oberdiek/resizegather.dtx'/>
-  <miktex location='oberdiek'/>
-  <texlive location='oberdiek'/>
-  <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
-</entry>
-%</catalogue>
-%    \end{macrocode}
-%
 % \section{Acknowledgement}
 %
 % \begin{description}
diff --git a/macros/latex/contrib/oberdiek/resizegather.pdf b/macros/latex/contrib/oberdiek/resizegather.pdf
index 1692b84298..b88ef36c22 100644
--- a/macros/latex/contrib/oberdiek/resizegather.pdf
+++ b/macros/latex/contrib/oberdiek/resizegather.pdf
diff --git a/macros/latex/contrib/oberdiek/rotchiffre.dtx b/macros/latex/contrib/oberdiek/rotchiffre.dtx
index 004dd3245b..eab273787f 100644
--- a/macros/latex/contrib/oberdiek/rotchiffre.dtx
+++ b/macros/latex/contrib/oberdiek/rotchiffre.dtx
@@ -13,15 +13,17 @@
 % conditions of the LaTeX Project Public License, either
 % version 1.3c of this license or (at your option) any later
 % version. This version of this license is in
-%    http://www.latex-project.org/lppl/lppl-1-3c.txt
+%    https://www.latex-project.org/lppl/lppl-1-3c.txt
 % and the latest version of this license is in
-%    http://www.latex-project.org/lppl.txt
+%    https://www.latex-project.org/lppl.txt
 % and version 1.3 or later is part of all distributions of
 % LaTeX version 2005/12/01 or later.
 %
 % This work has the LPPL maintenance status "maintained".
 %
-% This Current Maintainer of this work is Heiko Oberdiek.
+% The Current Maintainers of this work are
+% Heiko Oberdiek and the Oberdiek Package Support Group
+% https://github.com/ho-tex/oberdiek/issues
 %
 % The Base Interpreter refers to any `TeX-Format',
 % because some files are installed in TDS:tex/generic//.
@@ -104,15 +106,18 @@ This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either
 version 1.3c of this license or (at your option) any later
 version. This version of this license is in
-   http://www.latex-project.org/lppl/lppl-1-3c.txt
+   https://www.latex-project.org/lppl/lppl-1-3c.txt
 and the latest version of this license is in
-   http://www.latex-project.org/lppl.txt
+   https://www.latex-project.org/lppl.txt
 and version 1.3 or later is part of all distributions of
 LaTeX version 2005/12/01 or later.
 
 This work has the LPPL maintenance status "maintained".
 
-This Current Maintainer of this work is Heiko Oberdiek.
+The Current Maintainers of this work are
+Heiko Oberdiek and the Oberdiek Package Support Group
+https://github.com/ho-tex/oberdiek/issues
+
 
 The Base Interpreter refers to any `TeX-Format',
 because some files are installed in TDS:tex/generic//.
@@ -196,8 +201,7 @@ and the derived files
 % \title{The \xpackage{rotchiffre} package}
 % \date{2016/05/16 v1.1}
 % \author{Heiko Oberdiek\thanks
-% {Please report any issues at https://github.com/ho-tex/oberdiek/issues}\\
-% \xemail{heiko.oberdiek at googlemail.com}}
+% {Please report any issues at \url{https://github.com/ho-tex/oberdiek/issues}}}
 %
 % \maketitle
 %
@@ -1124,7 +1128,7 @@ and the derived files
 % \subsection{Download}
 %
 % \paragraph{Package.} This package is available on
-% CTAN\footnote{\url{http://ctan.org/pkg/rotchiffre}}:
+% CTAN\footnote{\CTANpkg{rotchiffre}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/rotchiffre.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/rotchiffre.pdf}] Documentation.
@@ -1136,7 +1140,7 @@ and the derived files
 % the packages are already unpacked and the documentation files
 % are generated. The files and directories obey the TDS standard.
 % \begin{description}
-% \item[\CTAN{install/macros/latex/contrib/oberdiek.tds.zip}]
+% \item[\CTANinstall{install/macros/latex/contrib/oberdiek.tds.zip}]
 % \end{description}
 % \emph{TDS} refers to the standard ``A Directory Structure
 % for \TeX\ Files'' (\CTAN{tds/tds.pdf}). Directories
@@ -1257,16 +1261,6 @@ and the derived files
 %
 % \subsection{Some details for the interested}
 %
-% \paragraph{Attached source.}
-%
-% The PDF documentation on CTAN also includes the
-% \xfile{.dtx} source file. It can be extracted by
-% AcrobatReader 6 or higher. Another option is \textsf{pdftk},
-% e.g. unpack the file into the current directory:
-% \begin{quote}
-%   \verb|pdftk rotchiffre.pdf unpack_files output .|
-% \end{quote}
-%
 % \paragraph{Unpacking with \LaTeX.}
 % The \xfile{.dtx} chooses its action depending on the format:
 % \begin{description}
@@ -1302,45 +1296,6 @@ and the derived files
 %\end{verbatim}
 % \end{quote}
 %
-% \section{Catalogue}
-%
-% The following XML file can be used as source for the
-% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
-% The elements \texttt{caption} and \texttt{description} are imported
-% from the original XML file from the Catalogue.
-% The name of the XML file in the Catalogue is \xfile{rotchiffre.xml}.
-%    \begin{macrocode}
-%<*catalogue>
-<?xml version='1.0' encoding='us-ascii'?>
-<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
-<entry datestamp='$Date$' modifier='$Author$' id='rotchiffre'>
-  <name>rotchiffre</name>
-  <caption>Perform simple rotation cyphers.</caption>
-  <authorref id='auth:oberdiek'/>
-  <copyright owner='Heiko Oberdiek' year='2010'/>
-  <license type='lppl1.3'/>
-  <version number='1.1'/>
-  <description>
-    The package defines a command <tt>\EdefRot</tt> that defines a
-    macro (whose name is given as an argument) to the rotation of the
-    given string.  Available rotations are <tt>ROT13</tt> (for
-    letters), <tt>ROT5</tt> (for digits), <tt>ROT18</tt> (for digits
-    and letters together) and <tt>ROT47</tt> (for all ASCII
-    characters).
-    <p/>
-    The package is part of the
-    <xref refid='oberdiek'>oberdiek</xref> bundle.
-  </description>
-  <documentation details='Package documentation'
-      href='ctan:/macros/latex/contrib/oberdiek/rotchiffre.pdf'/>
-  <ctan file='true' path='/macros/latex/contrib/oberdiek/rotchiffre.dtx'/>
-  <miktex location='oberdiek'/>
-  <texlive location='oberdiek'/>
-  <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
-</entry>
-%</catalogue>
-%    \end{macrocode}
-%
 % \begin{thebibliography}{9}
 % \raggedright
 %
@@ -1351,7 +1306,7 @@ and the derived files
 % \url{news:4cdbed27$0$6765$9b4e6d93@newsspool3.arcor-online.net},
 % 2010-11-11.\\
 % {\small
-% \url{http://groups.google.com/group/comp.text.tex/browse_thread/thread/6266f98e998ce333/d7b32e9dcc610c87}}
+% \url{https://groups.google.com/group/comp.text.tex/browse_thread/thread/6266f98e998ce333/d7b32e9dcc610c87}}
 %
 % \bibitem{rot13modern}
 % Stephan Hennig:
@@ -1360,7 +1315,7 @@ and the derived files
 % \url{news:4cdc2abe$0$6762$9b4e6d93@newsspool3.arcor-online.net},
 % 2010-11-11.\\
 % {\small
-% \url{http://groups.google.com/group/comp.text.tex/msg/d7b32e9dcc610c87}}
+% \url{https://groups.google.com/group/comp.text.tex/msg/d7b32e9dcc610c87}}
 %
 % \bibitem{rot13robin}
 % Robin Fairbairns:
@@ -1369,21 +1324,21 @@ and the derived files
 % \url{news:qf4obmua0v.fsf@sxp10.cl.cam.ac.uk},
 % 2010-11-12.\\
 % {\small
-% \url{http://groups.google.com/group/comp.text.tex/msg/7c03e91407144704}}
+% \url{https://groups.google.com/group/comp.text.tex/msg/7c03e91407144704}}
 %
 % \bibitem{wiki:rot13:de}
 % Wikipedia/German:
 % \textit{ROT13};
 % 2010-10-26.
 % {\small
-% \url{http://de.wikipedia.org/wiki/ROT13}}
+% \url{https://de.wikipedia.org/wiki/ROT13}}
 %
 % \bibitem{wiki:rot13:en}
 % Wikipedia/English:
 % \textit{ROT13};
 % 2010-11-11.
 % {\small
-% \url{http://en.wikipedia.org/wiki/ROT13}}
+% \url{https://en.wikipedia.org/wiki/ROT13}}
 %
 % \bibitem{cf:rot18}
 % Computerfreak/German: \textit{ROT-18};
@@ -1395,7 +1350,7 @@ and the derived files
 % Wikipedia/English: \textit{The quick brown fox jumps over the lazy dog};
 % 2010-11-09.\\
 % {\small
-% \url{http://en.wikipedia.org/wiki/The_quick_brown_fox_jumps_over_the_lazy_dog}}
+% \url{https://en.wikipedia.org/wiki/The_quick_brown_fox_jumps_over_the_lazy_dog}}
 %
 % \end{thebibliography}
 %
diff --git a/macros/latex/contrib/oberdiek/rotchiffre.pdf b/macros/latex/contrib/oberdiek/rotchiffre.pdf
index b6544f94d6..40783bb896 100644
--- a/macros/latex/contrib/oberdiek/rotchiffre.pdf
+++ b/macros/latex/contrib/oberdiek/rotchiffre.pdf
diff --git a/macros/latex/contrib/oberdiek/scrindex.dtx b/macros/latex/contrib/oberdiek/scrindex.dtx
index 07578c4285..8b754c2297 100644
--- a/macros/latex/contrib/oberdiek/scrindex.dtx
+++ b/macros/latex/contrib/oberdiek/scrindex.dtx
@@ -13,15 +13,17 @@
 % conditions of the LaTeX Project Public License, either
 % version 1.3c of this license or (at your option) any later
 % version. This version of this license is in
-%    http://www.latex-project.org/lppl/lppl-1-3c.txt
+%    https://www.latex-project.org/lppl/lppl-1-3c.txt
 % and the latest version of this license is in
-%    http://www.latex-project.org/lppl.txt
+%    https://www.latex-project.org/lppl.txt
 % and version 1.3 or later is part of all distributions of
 % LaTeX version 2005/12/01 or later.
 %
 % This work has the LPPL maintenance status "maintained".
 %
-% This Current Maintainer of this work is Heiko Oberdiek.
+% The Current Maintainers of this work are
+% Heiko Oberdiek and the Oberdiek Package Support Group
+% https://github.com/ho-tex/oberdiek/issues
 %
 % This work consists of the main source file scrindex.dtx
 % and the derived files
@@ -101,15 +103,18 @@ This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either
 version 1.3c of this license or (at your option) any later
 version. This version of this license is in
-   http://www.latex-project.org/lppl/lppl-1-3c.txt
+   https://www.latex-project.org/lppl/lppl-1-3c.txt
 and the latest version of this license is in
-   http://www.latex-project.org/lppl.txt
+   https://www.latex-project.org/lppl.txt
 and version 1.3 or later is part of all distributions of
 LaTeX version 2005/12/01 or later.
 
 This work has the LPPL maintenance status "maintained".
 
-This Current Maintainer of this work is Heiko Oberdiek.
+The Current Maintainers of this work are
+Heiko Oberdiek and the Oberdiek Package Support Group
+https://github.com/ho-tex/oberdiek/issues
+
 
 This work consists of the main source file scrindex.dtx
 and the derived files
@@ -189,8 +194,7 @@ and the derived files
 % \title{The \xpackage{scrindex} package}
 % \date{2016/05/16 v1.2}
 % \author{Heiko Oberdiek\thanks
-% {Please report any issues at https://github.com/ho-tex/oberdiek/issues}\\
-% \xemail{heiko.oberdiek at googlemail.com}}
+% {Please report any issues at \url{https://github.com/ho-tex/oberdiek/issues}}}
 %
 % \maketitle
 %
@@ -536,7 +540,7 @@ and the derived files
 % \subsection{Download}
 %
 % \paragraph{Package.} This package is available on
-% CTAN\footnote{\url{http://ctan.org/pkg/scrindex}}:
+% CTAN\footnote{\CTANpkg{scrindex}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/scrindex.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/scrindex.pdf}] Documentation.
@@ -548,7 +552,7 @@ and the derived files
 % the packages are already unpacked and the documentation files
 % are generated. The files and directories obey the TDS standard.
 % \begin{description}
-% \item[\CTAN{install/macros/latex/contrib/oberdiek.tds.zip}]
+% \item[\CTANinstall{install/macros/latex/contrib/oberdiek.tds.zip}]
 % \end{description}
 % \emph{TDS} refers to the standard ``A Directory Structure
 % for \TeX\ Files'' (\CTAN{tds/tds.pdf}). Directories
@@ -669,16 +673,6 @@ and the derived files
 %
 % \subsection{Some details for the interested}
 %
-% \paragraph{Attached source.}
-%
-% The PDF documentation on CTAN also includes the
-% \xfile{.dtx} source file. It can be extracted by
-% AcrobatReader 6 or higher. Another option is \textsf{pdftk},
-% e.g. unpack the file into the current directory:
-% \begin{quote}
-%   \verb|pdftk scrindex.pdf unpack_files output .|
-% \end{quote}
-%
 % \paragraph{Unpacking with \LaTeX.}
 % The \xfile{.dtx} chooses its action depending on the format:
 % \begin{description}
@@ -714,50 +708,12 @@ and the derived files
 %\end{verbatim}
 % \end{quote}
 %
-% \section{Catalogue}
-%
-% The following XML file can be used as source for the
-% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
-% The elements \texttt{caption} and \texttt{description} are imported
-% from the original XML file from the Catalogue.
-% The name of the XML file in the Catalogue is \xfile{scrindex.xml}.
-%    \begin{macrocode}
-%<*catalogue>
-<?xml version='1.0' encoding='us-ascii'?>
-<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
-<entry datestamp='$Date$' modifier='$Author$' id='scrindex'>
-  <name>scrindex</name>
-  <caption>Make index package work with Koma-script classes.</caption>
-  <authorref id='auth:oberdiek'/>
-  <copyright owner='Heiko Oberdiek' year='2008'/>
-  <license type='lppl1.3'/>
-  <version number='1.2'/>
-  <description>
-    This package redefines environment `theindex' of package `index',
-    if a class from <xref refid='koma-script'>KOMA-Script</xref> is loaded.
-    Also option `idxtotoc' is supported. Index preambles can be given
-    either by means of package `index' or via the interface provided
-    by <xref refid='koma-script'>KOMA-Script</xref>.
-    <p/>
-    The package is part of the <xref refid='oberdiek'>oberdiek</xref>
-    bundle.
-  </description>
-  <documentation details='Package documentation'
-      href='ctan:/macros/latex/contrib/oberdiek/scrindex.pdf'/>
-  <ctan file='true' path='/macros/latex/contrib/oberdiek/scrindex.dtx'/>
-  <miktex location='oberdiek'/>
-  <texlive location='oberdiek'/>
-  <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
-</entry>
-%</catalogue>
-%    \end{macrocode}
-%
 % \begin{History}
 %   \begin{Version}{2008/07/07 v1.0}
 %   \item
 %     First version, also published in newsgroup \xnewsgroup{de.comp.text.tex}:\\
 %     \URL{``\link{Re: Z\"ahler bei \cs{index}}''}^^A
-%     {http://groups.google.com/group/de.comp.text.tex/msg/39575b5e2f29be1e}
+%     {https://groups.google.com/group/de.comp.text.tex/msg/39575b5e2f29be1e}
 %   \end{Version}
 %   \begin{Version}{2008/08/11 v1.1}
 %   \item
diff --git a/macros/latex/contrib/oberdiek/scrindex.pdf b/macros/latex/contrib/oberdiek/scrindex.pdf
index 20215ab77c..961528a70b 100644
--- a/macros/latex/contrib/oberdiek/scrindex.pdf
+++ b/macros/latex/contrib/oberdiek/scrindex.pdf
diff --git a/macros/latex/contrib/oberdiek/selinput.dtx b/macros/latex/contrib/oberdiek/selinput.dtx
index a46b866e5c..36cbd1b5de 100644
--- a/macros/latex/contrib/oberdiek/selinput.dtx
+++ b/macros/latex/contrib/oberdiek/selinput.dtx
@@ -13,15 +13,17 @@
 % conditions of the LaTeX Project Public License, either
 % version 1.3c of this license or (at your option) any later
 % version. This version of this license is in
-%    http://www.latex-project.org/lppl/lppl-1-3c.txt
+%    https://www.latex-project.org/lppl/lppl-1-3c.txt
 % and the latest version of this license is in
-%    http://www.latex-project.org/lppl.txt
+%    https://www.latex-project.org/lppl.txt
 % and version 1.3 or later is part of all distributions of
 % LaTeX version 2005/12/01 or later.
 %
 % This work has the LPPL maintenance status "maintained".
 %
-% This Current Maintainer of this work is Heiko Oberdiek.
+% The Current Maintainers of this work are
+% Heiko Oberdiek and the Oberdiek Package Support Group
+% https://github.com/ho-tex/oberdiek/issues
 %
 % This work consists of the main source file selinput.dtx
 % and the derived files
@@ -105,15 +107,18 @@ This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either
 version 1.3c of this license or (at your option) any later
 version. This version of this license is in
-   http://www.latex-project.org/lppl/lppl-1-3c.txt
+   https://www.latex-project.org/lppl/lppl-1-3c.txt
 and the latest version of this license is in
-   http://www.latex-project.org/lppl.txt
+   https://www.latex-project.org/lppl.txt
 and version 1.3 or later is part of all distributions of
 LaTeX version 2005/12/01 or later.
 
 This work has the LPPL maintenance status "maintained".
 
-This Current Maintainer of this work is Heiko Oberdiek.
+The Current Maintainers of this work are
+Heiko Oberdiek and the Oberdiek Package Support Group
+https://github.com/ho-tex/oberdiek/issues
+
 
 This work consists of the main source file selinput.dtx
 and the derived files
@@ -202,8 +207,7 @@ and the derived files
 % \title{The \xpackage{selinput} package}
 % \date{2016/05/17 v1.4}
 % \author{Heiko Oberdiek\thanks
-% {Please report any issues at https://github.com/ho-tex/oberdiek/issues}\\
-% \xemail{heiko.oberdiek at googlemail.com}}
+% {Please report any issues at \url{https://github.com/ho-tex/oberdiek/issues}}}
 %
 % \maketitle
 %
@@ -782,7 +786,7 @@ and the derived files
 % \subsection{Download}
 %
 % \paragraph{Package.} This package is available on
-% CTAN\footnote{\url{http://ctan.org/pkg/selinput}}:
+% CTAN\footnote{\CTANpkg{selinput}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/selinput.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/selinput.pdf}] Documentation.
@@ -794,7 +798,7 @@ and the derived files
 % the packages are already unpacked and the documentation files
 % are generated. The files and directories obey the TDS standard.
 % \begin{description}
-% \item[\CTAN{install/macros/latex/contrib/oberdiek.tds.zip}]
+% \item[\CTANinstall{install/macros/latex/contrib/oberdiek.tds.zip}]
 % \end{description}
 % \emph{TDS} refers to the standard ``A Directory Structure
 % for \TeX\ Files'' (\CTAN{tds/tds.pdf}). Directories
@@ -918,16 +922,6 @@ and the derived files
 %
 % \subsection{Some details for the interested}
 %
-% \paragraph{Attached source.}
-%
-% The PDF documentation on CTAN also includes the
-% \xfile{.dtx} source file. It can be extracted by
-% AcrobatReader 6 or higher. Another option is \textsf{pdftk},
-% e.g. unpack the file into the current directory:
-% \begin{quote}
-%   \verb|pdftk selinput.pdf unpack_files output .|
-% \end{quote}
-%
 % \paragraph{Unpacking with \LaTeX.}
 % The \xfile{.dtx} chooses its action depending on the format:
 % \begin{description}
@@ -963,41 +957,6 @@ and the derived files
 %\end{verbatim}
 % \end{quote}
 %
-% \section{Catalogue}
-%
-% The following XML file can be used as source for the
-% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
-% The elements \texttt{caption} and \texttt{description} are imported
-% from the original XML file from the Catalogue.
-% The name of the XML file in the Catalogue is \xfile{selinput.xml}.
-%    \begin{macrocode}
-%<*catalogue>
-<?xml version='1.0' encoding='us-ascii'?>
-<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
-<entry datestamp='$Date$' modifier='$Author$' id='selinput'>
-  <name>selinput</name>
-  <caption>Semi-automatic detection of input encoding.</caption>
-  <authorref id='auth:oberdiek'/>
-  <copyright owner='Heiko Oberdiek' year='2007'/>
-  <license type='lppl1.3'/>
-  <version number='1.4'/>
-  <description>
-    This package selects the input encoding by specifying pairs
-    of input characters and their glyph names.
-    <p/>
-    The package is part of the <xref refid='oberdiek'>oberdiek</xref>
-    bundle.
-  </description>
-  <documentation details='Package documentation'
-      href='ctan:/macros/latex/contrib/oberdiek/selinput.pdf'/>
-  <ctan file='true' path='/macros/latex/contrib/oberdiek/selinput.dtx'/>
-  <miktex location='oberdiek'/>
-  <texlive location='oberdiek'/>
-  <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
-</entry>
-%</catalogue>
-%    \end{macrocode}
-%
 % \begin{thebibliography}{9}
 % \bibitem{inputenx}
 %   Heiko Oberdiek: \textit{The \xpackage{inputenx} package};
@@ -1007,12 +966,12 @@ and the derived files
 % \bibitem{adobe:glyphlist}
 %   Adobe: \textit{Adobe Glyph List};
 %   2002-09-20 v2.0;
-%   \url{http://partners.adobe.com/public/developer/en/opentype/glyphlist.txt}.
+%   \url{https://github.com/adobe-type-tools/agl-aglfn/blob/master/glyphlist.txt}.
 %
 % \bibitem{adobe:aglfn}
 %   Adobe: \textit{Adobe Glyph List For New Fonts};
 %   2005-11-18 v1.5;
-%   \url{http://partners.adobe.com/public/developer/en/opentype/aglfn13.txt}.
+%   \url{https://github.com/adobe-type-tools/agl-aglfn/blob/master/aglfn.txt}.
 %
 % \bibitem{stringenc}
 %   Heiko Oberdiek: \textit{The \xpackage{stringenc} package};
diff --git a/macros/latex/contrib/oberdiek/selinput.pdf b/macros/latex/contrib/oberdiek/selinput.pdf
index 215997f3ae..0f78dc3a93 100644
--- a/macros/latex/contrib/oberdiek/selinput.pdf
+++ b/macros/latex/contrib/oberdiek/selinput.pdf
diff --git a/macros/latex/contrib/oberdiek/setouterhbox.dtx b/macros/latex/contrib/oberdiek/setouterhbox.dtx
index ff801efd85..6d85677a0a 100644
--- a/macros/latex/contrib/oberdiek/setouterhbox.dtx
+++ b/macros/latex/contrib/oberdiek/setouterhbox.dtx
@@ -13,15 +13,17 @@
 % conditions of the LaTeX Project Public License, either
 % version 1.3c of this license or (at your option) any later
 % version. This version of this license is in
-%    http://www.latex-project.org/lppl/lppl-1-3c.txt
+%    https://www.latex-project.org/lppl/lppl-1-3c.txt
 % and the latest version of this license is in
-%    http://www.latex-project.org/lppl.txt
+%    https://www.latex-project.org/lppl.txt
 % and version 1.3 or later is part of all distributions of
 % LaTeX version 2005/12/01 or later.
 %
 % This work has the LPPL maintenance status "maintained".
 %
-% This Current Maintainer of this work is Heiko Oberdiek.
+% The Current Maintainers of this work are
+% Heiko Oberdiek and the Oberdiek Package Support Group
+% https://github.com/ho-tex/oberdiek/issues
 %
 % The Base Interpreter refers to any `TeX-Format',
 % because some files are installed in TDS:tex/generic//.
@@ -106,15 +108,18 @@ This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either
 version 1.3c of this license or (at your option) any later
 version. This version of this license is in
-   http://www.latex-project.org/lppl/lppl-1-3c.txt
+   https://www.latex-project.org/lppl/lppl-1-3c.txt
 and the latest version of this license is in
-   http://www.latex-project.org/lppl.txt
+   https://www.latex-project.org/lppl.txt
 and version 1.3 or later is part of all distributions of
 LaTeX version 2005/12/01 or later.
 
 This work has the LPPL maintenance status "maintained".
 
-This Current Maintainer of this work is Heiko Oberdiek.
+The Current Maintainers of this work are
+Heiko Oberdiek and the Oberdiek Package Support Group
+https://github.com/ho-tex/oberdiek/issues
+
 
 The Base Interpreter refers to any `TeX-Format',
 because some files are installed in TDS:tex/generic//.
@@ -199,8 +204,7 @@ and the derived files
 % \title{The \xpackage{setouterhbox} package}
 % \date{2016/05/16 v1.8}
 % \author{Heiko Oberdiek\thanks
-% {Please report any issues at https://github.com/ho-tex/oberdiek/issues}\\
-% \xemail{heiko.oberdiek at googlemail.com}}
+% {Please report any issues at \url{https://github.com/ho-tex/oberdiek/issues}}}
 %
 % \maketitle
 %
@@ -934,7 +938,7 @@ by/a/very_long_long_long_path.html}%
 % \subsection{Download}
 %
 % \paragraph{Package.} This package is available on
-% CTAN\footnote{\url{http://ctan.org/pkg/setouterhbox}}:
+% CTAN\footnote{\CTANpkg{setouterhbox}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/setouterhbox.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/setouterhbox.pdf}] Documentation.
@@ -946,7 +950,7 @@ by/a/very_long_long_long_path.html}%
 % the packages are already unpacked and the documentation files
 % are generated. The files and directories obey the TDS standard.
 % \begin{description}
-% \item[\CTAN{install/macros/latex/contrib/oberdiek.tds.zip}]
+% \item[\CTANinstall{install/macros/latex/contrib/oberdiek.tds.zip}]
 % \end{description}
 % \emph{TDS} refers to the standard ``A Directory Structure
 % for \TeX\ Files'' (\CTAN{tds/tds.pdf}). Directories
@@ -1068,16 +1072,6 @@ by/a/very_long_long_long_path.html}%
 %
 % \subsection{Some details for the interested}
 %
-% \paragraph{Attached source.}
-%
-% The PDF documentation on CTAN also includes the
-% \xfile{.dtx} source file. It can be extracted by
-% AcrobatReader 6 or higher. Another option is \textsf{pdftk},
-% e.g. unpack the file into the current directory:
-% \begin{quote}
-%   \verb|pdftk setouterhbox.pdf unpack_files output .|
-% \end{quote}
-%
 % \paragraph{Unpacking with \LaTeX.}
 % The \xfile{.dtx} chooses its action depending on the format:
 % \begin{description}
@@ -1113,43 +1107,6 @@ by/a/very_long_long_long_path.html}%
 %\end{verbatim}
 % \end{quote}
 %
-% \section{Catalogue}
-%
-% The following XML file can be used as source for the
-% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
-% The elements \texttt{caption} and \texttt{description} are imported
-% from the original XML file from the Catalogue.
-% The name of the XML file in the Catalogue is \xfile{setouterhbox.xml}.
-%    \begin{macrocode}
-%<*catalogue>
-<?xml version='1.0' encoding='us-ascii'?>
-<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
-<entry datestamp='$Date$' modifier='$Author$' id='setouterhbox'>
-  <name>setouterhbox</name>
-  <caption>Set hbox in outer horizontal mode.</caption>
-  <authorref id='auth:oberdiek'/>
-  <copyright owner='Heiko Oberdiek' year='2005-2007'/>
-  <license type='lppl1.3'/>
-  <version number='1.8'/>
-  <description>
-    If math stuff is set in an <tt>\hbox</tt>, then TeX
-    performs some optimization and omits the implicit
-    penalties <tt>\binoppenalty</tt> and <tt>\relpenalty</tt>.
-    This packages tries to put stuff into an <tt>\hbox</tt>
-    without losing those penalties.
-    <p/>
-    The package is part of the <xref refid='oberdiek'>oberdiek</xref> bundle.
-  </description>
-  <documentation details='Package documentation'
-      href='ctan:/macros/latex/contrib/oberdiek/setouterhbox.pdf'/>
-  <ctan file='true' path='/macros/latex/contrib/oberdiek/setouterhbox.dtx'/>
-  <miktex location='oberdiek'/>
-  <texlive location='oberdiek'/>
-  <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
-</entry>
-%</catalogue>
-%    \end{macrocode}
-%
 % \begin{thebibliography}{9}
 %
 % \bibitem{newsstart}
@@ -1157,7 +1114,7 @@ by/a/very_long_long_long_path.html}%
 %   \textit{overlong lines in List of Figures},
 %   \nolinkurl{<dh058t$qbd$1@news.ks.uiuc.edu>},
 %   23rd September 2005.
-%   \url{http://groups.google.com/group/comp.text.tex/msg/79648d4cf1f8bc13}
+%   \url{https://groups.google.com/group/comp.text.tex/msg/79648d4cf1f8bc13}
 %
 % \bibitem{kastrup}
 %   David Kastrup, \Newsgroup{comp.text.tex},
@@ -1165,7 +1122,7 @@ by/a/very_long_long_long_path.html}%
 %   for unboxing into a paragraph},
 %   \nolinkurl{<85y855lrx3.fsf@lola.goethe.zz>},
 %   7th October 2005.
-%   \url{http://groups.google.com/group/comp.text.tex/msg/7cf0a345ef932e52}
+%   \url{https://groups.google.com/group/comp.text.tex/msg/7cf0a345ef932e52}
 %
 % \bibitem{downes}
 %   Michael Downes, \textit{Line breaking in \cs{unhbox}ed Text},
@@ -1175,7 +1132,7 @@ by/a/very_long_long_long_path.html}%
 %   Sebastian Rahtz, Heiko Oberdiek:
 %   \textit{The \xpackage{hyperref} package};
 %   2006/08/16 v6.75c;
-%   \CTAN{macros/latex/contrib/hyperref/}.
+%   \CTANpkg{hyperref}.
 %
 % \end{thebibliography}
 %
diff --git a/macros/latex/contrib/oberdiek/setouterhbox.pdf b/macros/latex/contrib/oberdiek/setouterhbox.pdf
index 6915285701..a015980ca7 100644
--- a/macros/latex/contrib/oberdiek/setouterhbox.pdf
+++ b/macros/latex/contrib/oberdiek/setouterhbox.pdf
diff --git a/macros/latex/contrib/oberdiek/settobox.dtx b/macros/latex/contrib/oberdiek/settobox.dtx
index 1e88492ce9..59f07638ac 100644
--- a/macros/latex/contrib/oberdiek/settobox.dtx
+++ b/macros/latex/contrib/oberdiek/settobox.dtx
@@ -13,15 +13,17 @@
 % conditions of the LaTeX Project Public License, either
 % version 1.3c of this license or (at your option) any later
 % version. This version of this license is in
-%    http://www.latex-project.org/lppl/lppl-1-3c.txt
+%    https://www.latex-project.org/lppl/lppl-1-3c.txt
 % and the latest version of this license is in
-%    http://www.latex-project.org/lppl.txt
+%    https://www.latex-project.org/lppl.txt
 % and version 1.3 or later is part of all distributions of
 % LaTeX version 2005/12/01 or later.
 %
 % This work has the LPPL maintenance status "maintained".
 %
-% This Current Maintainer of this work is Heiko Oberdiek.
+% The Current Maintainers of this work are
+% Heiko Oberdiek and the Oberdiek Package Support Group
+% https://github.com/ho-tex/oberdiek/issues
 %
 % This work consists of the main source file settobox.dtx
 % and the derived files
@@ -100,15 +102,18 @@ This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either
 version 1.3c of this license or (at your option) any later
 version. This version of this license is in
-   http://www.latex-project.org/lppl/lppl-1-3c.txt
+   https://www.latex-project.org/lppl/lppl-1-3c.txt
 and the latest version of this license is in
-   http://www.latex-project.org/lppl.txt
+   https://www.latex-project.org/lppl.txt
 and version 1.3 or later is part of all distributions of
 LaTeX version 2005/12/01 or later.
 
 This work has the LPPL maintenance status "maintained".
 
-This Current Maintainer of this work is Heiko Oberdiek.
+The Current Maintainers of this work are
+Heiko Oberdiek and the Oberdiek Package Support Group
+https://github.com/ho-tex/oberdiek/issues
+
 
 This work consists of the main source file settobox.dtx
 and the derived files
@@ -188,8 +193,7 @@ and the derived files
 % \title{The \xpackage{settobox} package}
 % \date{2016/05/16 v1.5}
 % \author{Heiko Oberdiek\thanks
-% {Please report any issues at https://github.com/ho-tex/oberdiek/issues}\\
-% \xemail{heiko.oberdiek at googlemail.com}}
+% {Please report any issues at \url{https://github.com/ho-tex/oberdiek/issues}}}
 %
 % \maketitle
 %
@@ -546,7 +550,7 @@ and the derived files
 % \subsection{Download}
 %
 % \paragraph{Package.} This package is available on
-% CTAN\footnote{\url{http://ctan.org/pkg/settobox}}:
+% CTAN\footnote{\CTANpkg{settobox}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/settobox.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/settobox.pdf}] Documentation.
@@ -558,7 +562,7 @@ and the derived files
 % the packages are already unpacked and the documentation files
 % are generated. The files and directories obey the TDS standard.
 % \begin{description}
-% \item[\CTAN{install/macros/latex/contrib/oberdiek.tds.zip}]
+% \item[\CTANinstall{install/macros/latex/contrib/oberdiek.tds.zip}]
 % \end{description}
 % \emph{TDS} refers to the standard ``A Directory Structure
 % for \TeX\ Files'' (\CTAN{tds/tds.pdf}). Directories
@@ -678,16 +682,6 @@ and the derived files
 %
 % \subsection{Some details for the interested}
 %
-% \paragraph{Attached source.}
-%
-% The PDF documentation on CTAN also includes the
-% \xfile{.dtx} source file. It can be extracted by
-% AcrobatReader 6 or higher. Another option is \textsf{pdftk},
-% e.g. unpack the file into the current directory:
-% \begin{quote}
-%   \verb|pdftk settobox.pdf unpack_files output .|
-% \end{quote}
-%
 % \paragraph{Unpacking with \LaTeX.}
 % The \xfile{.dtx} chooses its action depending on the format:
 % \begin{description}
@@ -723,55 +717,13 @@ and the derived files
 %\end{verbatim}
 % \end{quote}
 %
-% \section{Catalogue}
-%
-% The following XML file can be used as source for the
-% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
-% The elements \texttt{caption} and \texttt{description} are imported
-% from the original XML file from the Catalogue.
-% The name of the XML file in the Catalogue is \xfile{settobox.xml}.
-%    \begin{macrocode}
-%<*catalogue>
-<?xml version='1.0' encoding='us-ascii'?>
-<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
-<entry datestamp='$Date$' modifier='$Author$' id='settobox'>
-  <name>settobox</name>
-  <caption>Assigning dimensions of a box to a length register.</caption>
-  <authorref id='auth:oberdiek'/>
-  <copyright owner='Heiko Oberdiek' year='2000,2006-2008'/>
-  <license type='lppl1.3'/>
-  <version number='1.5'/>
-  <description>
-    Commands to assist the reuse of boxes (set up by <tt>\sbox</tt> or
-    by the <tt>lrbox</tt> environment); the <tt>\settobox...</tt>
-    commands behave similarly to the <tt>\settowidth</tt> (etc.)
-    commands.  For example:
-    <pre>
-      \newsavebox{\mybox}
-      \newlength{\mylength}
-      \sbox{\mybox}{Hello World}
-      \settoboxwidth{\mylength}{\mybox}
-    </pre>
-    <p/>
-    The package is part of the <xref refid='oberdiek'>oberdiek</xref> bundle.
-  </description>
-  <documentation details='Package documentation'
-      href='ctan:/macros/latex/contrib/oberdiek/settobox.pdf'/>
-  <ctan file='true' path='/macros/latex/contrib/oberdiek/settobox.dtx'/>
-  <miktex location='oberdiek'/>
-  <texlive location='oberdiek'/>
-  <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
-</entry>
-%</catalogue>
-%    \end{macrocode}
-%
 % \begin{History}
 %   \begin{Version}{2000/02/11 v1.0}
 %   \item
 %     First public release, written as answer in the
 %     newsgroup \xnewsgroup{de.comp.text.tex}:
 %     \URL{``\link{Die Hoehe von Minipages und Bild}''}^^A
-%     {http://groups.google.com/group/de.comp.text.tex/msg/c3f6446f54f66c02}
+%     {https://groups.google.com/group/de.comp.text.tex/msg/c3f6446f54f66c02}
 %   \end{Version}
 %   \begin{Version}{2000/09/07 v1.1}
 %   \item
diff --git a/macros/latex/contrib/oberdiek/settobox.pdf b/macros/latex/contrib/oberdiek/settobox.pdf
index 85f36ad818..be824220ee 100644
--- a/macros/latex/contrib/oberdiek/settobox.pdf
+++ b/macros/latex/contrib/oberdiek/settobox.pdf
diff --git a/macros/latex/contrib/oberdiek/soulutf8.dtx b/macros/latex/contrib/oberdiek/soulutf8.dtx
index 11e355236e..a239f608a1 100644
--- a/macros/latex/contrib/oberdiek/soulutf8.dtx
+++ b/macros/latex/contrib/oberdiek/soulutf8.dtx
@@ -13,15 +13,17 @@
 % conditions of the LaTeX Project Public License, either
 % version 1.3c of this license or (at your option) any later
 % version. This version of this license is in
-%    http://www.latex-project.org/lppl/lppl-1-3c.txt
+%    https://www.latex-project.org/lppl/lppl-1-3c.txt
 % and the latest version of this license is in
-%    http://www.latex-project.org/lppl.txt
+%    https://www.latex-project.org/lppl.txt
 % and version 1.3 or later is part of all distributions of
 % LaTeX version 2005/12/01 or later.
 %
 % This work has the LPPL maintenance status "maintained".
 %
-% This Current Maintainer of this work is Heiko Oberdiek.
+% The Current Maintainers of this work are
+% Heiko Oberdiek and the Oberdiek Package Support Group
+% https://github.com/ho-tex/oberdiek/issues
 %
 % The Base Interpreter refers to any `TeX-Format',
 % because some files are installed in TDS:tex/generic//.
@@ -108,15 +110,18 @@ This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either
 version 1.3c of this license or (at your option) any later
 version. This version of this license is in
-   http://www.latex-project.org/lppl/lppl-1-3c.txt
+   https://www.latex-project.org/lppl/lppl-1-3c.txt
 and the latest version of this license is in
-   http://www.latex-project.org/lppl.txt
+   https://www.latex-project.org/lppl.txt
 and version 1.3 or later is part of all distributions of
 LaTeX version 2005/12/01 or later.
 
 This work has the LPPL maintenance status "maintained".
 
-This Current Maintainer of this work is Heiko Oberdiek.
+The Current Maintainers of this work are
+Heiko Oberdiek and the Oberdiek Package Support Group
+https://github.com/ho-tex/oberdiek/issues
+
 
 The Base Interpreter refers to any `TeX-Format',
 because some files are installed in TDS:tex/generic//.
@@ -202,8 +207,7 @@ and the derived files
 % \title{The \xpackage{soulutf8} package}
 % \date{2016/05/16 v1.1}
 % \author{Heiko Oberdiek\thanks
-% {Please report any issues at https://github.com/ho-tex/oberdiek/issues}\\
-% \xemail{heiko.oberdiek at googlemail.com}}
+% {Please report any issues at \url{https://github.com/ho-tex/oberdiek/issues}}}
 %
 % \maketitle
 %
@@ -1674,7 +1678,7 @@ and the derived files
 % \subsection{Download}
 %
 % \paragraph{Package.} This package is available on
-% CTAN\footnote{\url{http://ctan.org/pkg/soulutf8}}:
+% CTAN\footnote{\CTANpkg{soulutf8}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/soulutf8.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/soulutf8.pdf}] Documentation.
@@ -1686,7 +1690,7 @@ and the derived files
 % the packages are already unpacked and the documentation files
 % are generated. The files and directories obey the TDS standard.
 % \begin{description}
-% \item[\CTAN{install/macros/latex/contrib/oberdiek.tds.zip}]
+% \item[\CTANinstall{install/macros/latex/contrib/oberdiek.tds.zip}]
 % \end{description}
 % \emph{TDS} refers to the standard ``A Directory Structure
 % for \TeX\ Files'' (\CTAN{tds/tds.pdf}). Directories
@@ -1810,16 +1814,6 @@ and the derived files
 %
 % \subsection{Some details for the interested}
 %
-% \paragraph{Attached source.}
-%
-% The PDF documentation on CTAN also includes the
-% \xfile{.dtx} source file. It can be extracted by
-% AcrobatReader 6 or higher. Another option is \textsf{pdftk},
-% e.g. unpack the file into the current directory:
-% \begin{quote}
-%   \verb|pdftk soulutf8.pdf unpack_files output .|
-% \end{quote}
-%
 % \paragraph{Unpacking with \LaTeX.}
 % The \xfile{.dtx} chooses its action depending on the format:
 % \begin{description}
@@ -1855,56 +1849,17 @@ and the derived files
 %\end{verbatim}
 % \end{quote}
 %
-% \section{Catalogue}
-%
-% The following XML file can be used as source for the
-% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
-% The elements \texttt{caption} and \texttt{description} are imported
-% from the original XML file from the Catalogue.
-% The name of the XML file in the Catalogue is \xfile{soulutf8.xml}.
-%    \begin{macrocode}
-%<*catalogue>
-<?xml version='1.0' encoding='us-ascii'?>
-<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
-<entry datestamp='$Date$' modifier='$Author$' id='soulutf8'>
-  <name>soulutf8</name>
-  <caption>Permit use of UTF-8 characters in soul.</caption>
-  <authorref id='auth:oberdiek'/>
-  <copyright owner='Heiko Oberdiek' year='2007'/>
-  <license type='lppl1.3'/>
-  <version number='1.1'/>
-  <description>
-    This package extends package <xref refid='soul'>soul</xref> and adds
-    some support for UTF-8. Namely the input encodings in
-    &#x2018;<tt>utf8.def</tt>&#x2019; from package
-    <xref refid='inputenc'>inputenc</xref> and
-    &#x2018;<tt>utf8x.def</tt>&#x2019; from package
-    <xref refid='unicode'>ucs</xref> are supported.
-    <p/>
-    The package is part of the <xref refid='oberdiek'>oberdiek</xref>
-    bundle.
-  </description>
-  <documentation details='Package documentation'
-      href='ctan:/macros/latex/contrib/oberdiek/soulutf8.pdf'/>
-  <ctan file='true' path='/macros/latex/contrib/oberdiek/soulutf8.dtx'/>
-  <miktex location='oberdiek'/>
-  <texlive location='oberdiek'/>
-  <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
-</entry>
-%</catalogue>
-%    \end{macrocode}
-%
 % \begin{thebibliography}{9}
 %
 % \bibitem{soul}
 %   Melchior Franz: \textit{The \xpackage{soul} package};
 %   2003/11/17;\\
-%   \CTAN{macros/latex/contrib/soul/}.
+%   \CTANpkg{soul}.
 %
 % \bibitem{ucs}
 %   Dominique P. G. Unruh: \textit{\xpackage{ucs.sty} -- Unicode Support};
 %   2004/10/17;\\
-%   \CTAN{macros/latex/contrib/unicode/}.
+%   \CTANpkg{unicode}.
 %
 % \bibitem{utf8}
 %   Frank Mittelbach, Chris Rowley:
diff --git a/macros/latex/contrib/oberdiek/soulutf8.pdf b/macros/latex/contrib/oberdiek/soulutf8.pdf
index 42ea5f6c1e..291441c643 100644
--- a/macros/latex/contrib/oberdiek/soulutf8.pdf
+++ b/macros/latex/contrib/oberdiek/soulutf8.pdf
diff --git a/macros/latex/contrib/oberdiek/stackrel.dtx b/macros/latex/contrib/oberdiek/stackrel.dtx
index 880d2ed92b..c04ba1f2e5 100644
--- a/macros/latex/contrib/oberdiek/stackrel.dtx
+++ b/macros/latex/contrib/oberdiek/stackrel.dtx
@@ -13,15 +13,17 @@
 % conditions of the LaTeX Project Public License, either
 % version 1.3c of this license or (at your option) any later
 % version. This version of this license is in
-%    http://www.latex-project.org/lppl/lppl-1-3c.txt
+%    https://www.latex-project.org/lppl/lppl-1-3c.txt
 % and the latest version of this license is in
-%    http://www.latex-project.org/lppl.txt
+%    https://www.latex-project.org/lppl.txt
 % and version 1.3 or later is part of all distributions of
 % LaTeX version 2005/12/01 or later.
 %
 % This work has the LPPL maintenance status "maintained".
 %
-% This Current Maintainer of this work is Heiko Oberdiek.
+% The Current Maintainers of this work are
+% Heiko Oberdiek and the Oberdiek Package Support Group
+% https://github.com/ho-tex/oberdiek/issues
 %
 % This work consists of the main source file stackrel.dtx
 % and the derived files
@@ -98,15 +100,18 @@ This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either
 version 1.3c of this license or (at your option) any later
 version. This version of this license is in
-   http://www.latex-project.org/lppl/lppl-1-3c.txt
+   https://www.latex-project.org/lppl/lppl-1-3c.txt
 and the latest version of this license is in
-   http://www.latex-project.org/lppl.txt
+   https://www.latex-project.org/lppl.txt
 and version 1.3 or later is part of all distributions of
 LaTeX version 2005/12/01 or later.
 
 This work has the LPPL maintenance status "maintained".
 
-This Current Maintainer of this work is Heiko Oberdiek.
+The Current Maintainers of this work are
+Heiko Oberdiek and the Oberdiek Package Support Group
+https://github.com/ho-tex/oberdiek/issues
+
 
 This work consists of the main source file stackrel.dtx
 and the derived files
@@ -183,8 +188,7 @@ and the derived files
 % \title{The \xpackage{stackrel} package}
 % \date{2016/05/16 v1.3}
 % \author{Heiko Oberdiek\thanks
-% {Please report any issues at https://github.com/ho-tex/oberdiek/issues}\\
-% \xemail{heiko.oberdiek at googlemail.com}}
+% {Please report any issues at \url{https://github.com/ho-tex/oberdiek/issues}}}
 %
 % \maketitle
 %
@@ -304,7 +308,7 @@ and the derived files
 % \subsection{Download}
 %
 % \paragraph{Package.} This package is available on
-% CTAN\footnote{\url{http://ctan.org/pkg/stackrel}}:
+% CTAN\footnote{\CTANpkg{stackrel}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/stackrel.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/stackrel.pdf}] Documentation.
@@ -316,7 +320,7 @@ and the derived files
 % the packages are already unpacked and the documentation files
 % are generated. The files and directories obey the TDS standard.
 % \begin{description}
-% \item[\CTAN{install/macros/latex/contrib/oberdiek.tds.zip}]
+% \item[\CTANinstall{install/macros/latex/contrib/oberdiek.tds.zip}]
 % \end{description}
 % \emph{TDS} refers to the standard ``A Directory Structure
 % for \TeX\ Files'' (\CTAN{tds/tds.pdf}). Directories
@@ -435,16 +439,6 @@ and the derived files
 %
 % \subsection{Some details for the interested}
 %
-% \paragraph{Attached source.}
-%
-% The PDF documentation on CTAN also includes the
-% \xfile{.dtx} source file. It can be extracted by
-% AcrobatReader 6 or higher. Another option is \textsf{pdftk},
-% e.g. unpack the file into the current directory:
-% \begin{quote}
-%   \verb|pdftk stackrel.pdf unpack_files output .|
-% \end{quote}
-%
 % \paragraph{Unpacking with \LaTeX.}
 % The \xfile{.dtx} chooses its action depending on the format:
 % \begin{description}
@@ -480,42 +474,6 @@ and the derived files
 %\end{verbatim}
 % \end{quote}
 %
-% \section{Catalogue}
-%
-% The following XML file can be used as source for the
-% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
-% The elements \texttt{caption} and \texttt{description} are imported
-% from the original XML file from the Catalogue.
-% The name of the XML file in the Catalogue is \xfile{stackrel.xml}.
-%    \begin{macrocode}
-%<*catalogue>
-<?xml version='1.0' encoding='us-ascii'?>
-<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
-<entry datestamp='$Date$' modifier='$Author$' id='stackrel'>
-  <name>stackrel</name>
-  <caption>Enhancement to the \stackrel command.</caption>
-  <authorref id='auth:oberdiek'/>
-  <copyright owner='Heiko Oberdiek' year='2006,2007'/>
-  <license type='lppl1.3'/>
-  <version number='1.3'/>
-  <description>
-    This package adds an optional argument to <tt>\stackrel</tt> for
-    putting something below the relational symbol and defines
-    <tt>\stackbin</tt> for binary symbols.
-    <p/>
-    The package is part of the <xref refid='oberdiek'>oberdiek</xref>
-    bundle.
-  </description>
-  <documentation details='Package documentation'
-      href='ctan:/macros/latex/contrib/oberdiek/stackrel.pdf'/>
-  <ctan file='true' path='/macros/latex/contrib/oberdiek/stackrel.dtx'/>
-  <miktex location='oberdiek'/>
-  <texlive location='oberdiek'/>
-  <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
-</entry>
-%</catalogue>
-%    \end{macrocode}
-%
 % \begin{History}
 %   \begin{Version}{2006/12/02 v1.0}
 %   \item
diff --git a/macros/latex/contrib/oberdiek/stackrel.pdf b/macros/latex/contrib/oberdiek/stackrel.pdf
index 2e64fcd815..f9a76ae18e 100644
--- a/macros/latex/contrib/oberdiek/stackrel.pdf
+++ b/macros/latex/contrib/oberdiek/stackrel.pdf
diff --git a/macros/latex/contrib/oberdiek/stampinclude.dtx b/macros/latex/contrib/oberdiek/stampinclude.dtx
index e7b087e078..62b3d2cf4f 100644
--- a/macros/latex/contrib/oberdiek/stampinclude.dtx
+++ b/macros/latex/contrib/oberdiek/stampinclude.dtx
@@ -13,15 +13,17 @@
 % conditions of the LaTeX Project Public License, either
 % version 1.3c of this license or (at your option) any later
 % version. This version of this license is in
-%    http://www.latex-project.org/lppl/lppl-1-3c.txt
+%    https://www.latex-project.org/lppl/lppl-1-3c.txt
 % and the latest version of this license is in
-%    http://www.latex-project.org/lppl.txt
+%    https://www.latex-project.org/lppl.txt
 % and version 1.3 or later is part of all distributions of
 % LaTeX version 2005/12/01 or later.
 %
 % This work has the LPPL maintenance status "maintained".
 %
-% This Current Maintainer of this work is Heiko Oberdiek.
+% The Current Maintainers of this work are
+% Heiko Oberdiek and the Oberdiek Package Support Group
+% https://github.com/ho-tex/oberdiek/issues
 %
 % This work consists of the main source file stampinclude.dtx
 % and the derived files
@@ -98,15 +100,18 @@ This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either
 version 1.3c of this license or (at your option) any later
 version. This version of this license is in
-   http://www.latex-project.org/lppl/lppl-1-3c.txt
+   https://www.latex-project.org/lppl/lppl-1-3c.txt
 and the latest version of this license is in
-   http://www.latex-project.org/lppl.txt
+   https://www.latex-project.org/lppl.txt
 and version 1.3 or later is part of all distributions of
 LaTeX version 2005/12/01 or later.
 
 This work has the LPPL maintenance status "maintained".
 
-This Current Maintainer of this work is Heiko Oberdiek.
+The Current Maintainers of this work are
+Heiko Oberdiek and the Oberdiek Package Support Group
+https://github.com/ho-tex/oberdiek/issues
+
 
 This work consists of the main source file stampinclude.dtx
 and the derived files
@@ -181,8 +186,7 @@ and the derived files
 % \title{The \xpackage{stampinclude} package}
 % \date{2016/05/16 v1.1}
 % \author{Heiko Oberdiek\thanks
-% {Please report any issues at https://github.com/ho-tex/oberdiek/issues}\\
-% \xemail{heiko.oberdiek at googlemail.com}}
+% {Please report any issues at \url{https://github.com/ho-tex/oberdiek/issues}}}
 %
 % \maketitle
 %
@@ -446,7 +450,7 @@ and the derived files
 % \subsection{Download}
 %
 % \paragraph{Package.} This package is available on
-% CTAN\footnote{\url{http://ctan.org/pkg/stampinclude}}:
+% CTAN\footnote{\CTANpkg{stampinclude}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/stampinclude.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/stampinclude.pdf}] Documentation.
@@ -458,7 +462,7 @@ and the derived files
 % the packages are already unpacked and the documentation files
 % are generated. The files and directories obey the TDS standard.
 % \begin{description}
-% \item[\CTAN{install/macros/latex/contrib/oberdiek.tds.zip}]
+% \item[\CTANinstall{install/macros/latex/contrib/oberdiek.tds.zip}]
 % \end{description}
 % \emph{TDS} refers to the standard ``A Directory Structure
 % for \TeX\ Files'' (\CTAN{tds/tds.pdf}). Directories
@@ -577,16 +581,6 @@ and the derived files
 %
 % \subsection{Some details for the interested}
 %
-% \paragraph{Attached source.}
-%
-% The PDF documentation on CTAN also includes the
-% \xfile{.dtx} source file. It can be extracted by
-% AcrobatReader 6 or higher. Another option is \textsf{pdftk},
-% e.g. unpack the file into the current directory:
-% \begin{quote}
-%   \verb|pdftk stampinclude.pdf unpack_files output .|
-% \end{quote}
-%
 % \paragraph{Unpacking with \LaTeX.}
 % The \xfile{.dtx} chooses its action depending on the format:
 % \begin{description}
@@ -622,43 +616,6 @@ and the derived files
 %\end{verbatim}
 % \end{quote}
 %
-% \section{Catalogue}
-%
-% The following XML file can be used as source for the
-% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
-% The elements \texttt{caption} and \texttt{description} are imported
-% from the original XML file from the Catalogue.
-% The name of the XML file in the Catalogue is \xfile{stampinclude.xml}.
-%    \begin{macrocode}
-%<*catalogue>
-<?xml version='1.0' encoding='us-ascii'?>
-<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
-<entry datestamp='$Date$' modifier='$Author$' id='stampinclude'>
-  <name>stampinclude</name>
-  <caption>Inclusion based on .aux file date stamps.</caption>
-  <authorref id='auth:oberdiek'/>
-  <copyright owner='Heiko Oberdiek' year='2008'/>
-  <license type='lppl1.3'/>
-  <version number='1.1'/>
-  <description>
-    This package replaces <tt>\includeonly</tt> and selects the files for
-    <tt>\include</tt> by inspecting the timestamp of the <tt>.aux</tt> file.
-    The file is selected for inclusion if the <tt>.aux</tt> file does
-    not yet exist or is older than the corresponding <tt>.tex</tt> file.
-    <p/>
-    The package is part of the <xref refid='oberdiek'>oberdiek</xref>
-    bundle.
-  </description>
-  <documentation details='Package documentation'
-      href='ctan:/macros/latex/contrib/oberdiek/stampinclude.pdf'/>
-  <ctan file='true' path='/macros/latex/contrib/oberdiek/stampinclude.dtx'/>
-  <miktex location='oberdiek'/>
-  <texlive location='oberdiek'/>
-  <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
-</entry>
-%</catalogue>
-%    \end{macrocode}
-%
 % \begin{thebibliography}{9}
 % \bibitem{askinclude}
 %   Pablo A. Straub, Heiko Oberdiek:
diff --git a/macros/latex/contrib/oberdiek/stampinclude.pdf b/macros/latex/contrib/oberdiek/stampinclude.pdf
index 22ca8c8256..0d98223617 100644
--- a/macros/latex/contrib/oberdiek/stampinclude.pdf
+++ b/macros/latex/contrib/oberdiek/stampinclude.pdf
diff --git a/macros/latex/contrib/oberdiek/stringenc.dtx b/macros/latex/contrib/oberdiek/stringenc.dtx
index 31c9813636..7236faf756 100644
--- a/macros/latex/contrib/oberdiek/stringenc.dtx
+++ b/macros/latex/contrib/oberdiek/stringenc.dtx
@@ -13,15 +13,17 @@
 % conditions of the LaTeX Project Public License, either
 % version 1.3c of this license or (at your option) any later
 % version. This version of this license is in
-%    http://www.latex-project.org/lppl/lppl-1-3c.txt
+%    https://www.latex-project.org/lppl/lppl-1-3c.txt
 % and the latest version of this license is in
-%    http://www.latex-project.org/lppl.txt
+%    https://www.latex-project.org/lppl.txt
 % and version 1.3 or later is part of all distributions of
 % LaTeX version 2005/12/01 or later.
 %
 % This work has the LPPL maintenance status "maintained".
 %
-% This Current Maintainer of this work is Heiko Oberdiek.
+% The Current Maintainers of this work are
+% Heiko Oberdiek and the Oberdiek Package Support Group
+% https://github.com/ho-tex/oberdiek/issues
 %
 % The Base Interpreter refers to any `TeX-Format',
 % because some files are installed in TDS:tex/generic//.
@@ -156,15 +158,18 @@ This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either
 version 1.3c of this license or (at your option) any later
 version. This version of this license is in
-   http://www.latex-project.org/lppl/lppl-1-3c.txt
+   https://www.latex-project.org/lppl/lppl-1-3c.txt
 and the latest version of this license is in
-   http://www.latex-project.org/lppl.txt
+   https://www.latex-project.org/lppl.txt
 and version 1.3 or later is part of all distributions of
 LaTeX version 2005/12/01 or later.
 
 This work has the LPPL maintenance status "maintained".
 
-This Current Maintainer of this work is Heiko Oberdiek.
+The Current Maintainers of this work are
+Heiko Oberdiek and the Oberdiek Package Support Group
+https://github.com/ho-tex/oberdiek/issues
+
 
 The Base Interpreter refers to any `TeX-Format',
 because some files are installed in TDS:tex/generic//.
@@ -311,8 +316,7 @@ and the derived files
 % \title{The \xpackage{stringenc} package}
 % \date{2016/05/16 v1.11}
 % \author{Heiko Oberdiek\thanks
-% {Please report any issues at https://github.com/ho-tex/oberdiek/issues}\\
-% \xemail{heiko.oberdiek at googlemail.com}}
+% {Please report any issues at \url{https://github.com/ho-tex/oberdiek/issues}}}
 %
 % \maketitle
 %
@@ -6570,7 +6574,7 @@ $ \fi
 % \subsection{Download}
 %
 % \paragraph{Package.} This package is available on
-% CTAN\footnote{\url{http://ctan.org/pkg/stringenc}}:
+% CTAN\footnote{\CTANpkg{stringenc}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/stringenc.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/stringenc.pdf}] Documentation.
@@ -6582,7 +6586,7 @@ $ \fi
 % the packages are already unpacked and the documentation files
 % are generated. The files and directories obey the TDS standard.
 % \begin{description}
-% \item[\CTAN{install/macros/latex/contrib/oberdiek.tds.zip}]
+% \item[\CTANinstall{install/macros/latex/contrib/oberdiek.tds.zip}]
 % \end{description}
 % \emph{TDS} refers to the standard ``A Directory Structure
 % for \TeX\ Files'' (\CTAN{tds/tds.pdf}). Directories
@@ -6743,16 +6747,6 @@ $ \fi
 %
 % \subsection{Some details for the interested}
 %
-% \paragraph{Attached source.}
-%
-% The PDF documentation on CTAN also includes the
-% \xfile{.dtx} source file. It can be extracted by
-% AcrobatReader 6 or higher. Another option is \textsf{pdftk},
-% e.g. unpack the file into the current directory:
-% \begin{quote}
-%   \verb|pdftk stringenc.pdf unpack_files output .|
-% \end{quote}
-%
 % \paragraph{Unpacking with \LaTeX.}
 % The \xfile{.dtx} chooses its action depending on the format:
 % \begin{description}
@@ -6788,43 +6782,6 @@ $ \fi
 %\end{verbatim}
 % \end{quote}
 %
-% \section{Catalogue}
-%
-% The following XML file can be used as source for the
-% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
-% The elements \texttt{caption} and \texttt{description} are imported
-% from the original XML file from the Catalogue.
-% The name of the XML file in the Catalogue is \xfile{stringenc.xml}.
-%    \begin{macrocode}
-%<*catalogue>
-<?xml version='1.0' encoding='us-ascii'?>
-<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
-<entry datestamp='$Date$' modifier='$Author$' id='stringenc'>
-  <name>stringenc</name>
-  <caption>Converting a string between different encodings.</caption>
-  <authorref id='auth:oberdiek'/>
-  <copyright owner='Heiko Oberdiek' year='2007-2011'/>
-  <license type='lppl1.3'/>
-  <version number='1.11'/>
-  <description>
-    This package provides <tt>\StringEncodingConvert</tt> for converting
-    a string between different encodings.
-    Both <xref refid='latex'>LaTeX</xref> and
-    <xref refid='plain'>plain-TeX</xref> are supported.
-    <p/>
-    The package is part of the <xref refid='oberdiek'>oberdiek</xref>
-    bundle.
-  </description>
-  <documentation details='Package documentation'
-      href='ctan:/macros/latex/contrib/oberdiek/stringenc.pdf'/>
-  <ctan file='true' path='/macros/latex/contrib/oberdiek/stringenc.dtx'/>
-  <miktex location='oberdiek'/>
-  <texlive location='oberdiek'/>
-  <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
-</entry>
-%</catalogue>
-%    \end{macrocode}
-%
 % \begin{History}
 %   \begin{Version}{2007/06/14 v1.0}
 %   \item
diff --git a/macros/latex/contrib/oberdiek/stringenc.pdf b/macros/latex/contrib/oberdiek/stringenc.pdf
index 2606e49060..c288e4c9e2 100644
--- a/macros/latex/contrib/oberdiek/stringenc.pdf
+++ b/macros/latex/contrib/oberdiek/stringenc.pdf
diff --git a/macros/latex/contrib/oberdiek/tabularht.dtx b/macros/latex/contrib/oberdiek/tabularht.dtx
index 3ea8cc4933..559084a35f 100644
--- a/macros/latex/contrib/oberdiek/tabularht.dtx
+++ b/macros/latex/contrib/oberdiek/tabularht.dtx
@@ -13,15 +13,17 @@
 % conditions of the LaTeX Project Public License, either
 % version 1.3c of this license or (at your option) any later
 % version. This version of this license is in
-%    http://www.latex-project.org/lppl/lppl-1-3c.txt
+%    https://www.latex-project.org/lppl/lppl-1-3c.txt
 % and the latest version of this license is in
-%    http://www.latex-project.org/lppl.txt
+%    https://www.latex-project.org/lppl.txt
 % and version 1.3 or later is part of all distributions of
 % LaTeX version 2005/12/01 or later.
 %
 % This work has the LPPL maintenance status "maintained".
 %
-% This Current Maintainer of this work is Heiko Oberdiek.
+% The Current Maintainers of this work are
+% Heiko Oberdiek and the Oberdiek Package Support Group
+% https://github.com/ho-tex/oberdiek/issues
 %
 % This work consists of the main source file tabularht.dtx
 % and the derived files
@@ -101,15 +103,18 @@ This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either
 version 1.3c of this license or (at your option) any later
 version. This version of this license is in
-   http://www.latex-project.org/lppl/lppl-1-3c.txt
+   https://www.latex-project.org/lppl/lppl-1-3c.txt
 and the latest version of this license is in
-   http://www.latex-project.org/lppl.txt
+   https://www.latex-project.org/lppl.txt
 and version 1.3 or later is part of all distributions of
 LaTeX version 2005/12/01 or later.
 
 This work has the LPPL maintenance status "maintained".
 
-This Current Maintainer of this work is Heiko Oberdiek.
+The Current Maintainers of this work are
+Heiko Oberdiek and the Oberdiek Package Support Group
+https://github.com/ho-tex/oberdiek/issues
+
 
 This work consists of the main source file tabularht.dtx
 and the derived files
@@ -188,8 +193,7 @@ and the derived files
 % \title{The \xpackage{tabularht} package}
 % \date{2016/05/16 v2.6}
 % \author{Heiko Oberdiek\thanks
-% {Please report any issues at https://github.com/ho-tex/oberdiek/issues}\\
-% \xemail{heiko.oberdiek at googlemail.com}}
+% {Please report any issues at \url{https://github.com/ho-tex/oberdiek/issues}}}
 %
 % \maketitle
 %
@@ -991,7 +995,7 @@ and the derived files
 % \subsection{Download}
 %
 % \paragraph{Package.} This package is available on
-% CTAN\footnote{\url{http://ctan.org/pkg/tabularht}}:
+% CTAN\footnote{\CTANpkg{tabularht}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/tabularht.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/tabularht.pdf}] Documentation.
@@ -1003,7 +1007,7 @@ and the derived files
 % the packages are already unpacked and the documentation files
 % are generated. The files and directories obey the TDS standard.
 % \begin{description}
-% \item[\CTAN{install/macros/latex/contrib/oberdiek.tds.zip}]
+% \item[\CTANinstall{install/macros/latex/contrib/oberdiek.tds.zip}]
 % \end{description}
 % \emph{TDS} refers to the standard ``A Directory Structure
 % for \TeX\ Files'' (\CTAN{tds/tds.pdf}). Directories
@@ -1124,16 +1128,6 @@ and the derived files
 %
 % \subsection{Some details for the interested}
 %
-% \paragraph{Attached source.}
-%
-% The PDF documentation on CTAN also includes the
-% \xfile{.dtx} source file. It can be extracted by
-% AcrobatReader 6 or higher. Another option is \textsf{pdftk},
-% e.g. unpack the file into the current directory:
-% \begin{quote}
-%   \verb|pdftk tabularht.pdf unpack_files output .|
-% \end{quote}
-%
 % \paragraph{Unpacking with \LaTeX.}
 % The \xfile{.dtx} chooses its action depending on the format:
 % \begin{description}
@@ -1169,51 +1163,6 @@ and the derived files
 %\end{verbatim}
 % \end{quote}
 %
-% \section{Catalogue}
-%
-% The following XML file can be used as source for the
-% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
-% The elements \texttt{caption} and \texttt{description} are imported
-% from the original XML file from the Catalogue.
-% The name of the XML file in the Catalogue is \xfile{tabularht.xml}.
-%    \begin{macrocode}
-%<*catalogue>
-<?xml version='1.0' encoding='us-ascii'?>
-<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
-<entry datestamp='$Date$' modifier='$Author$' id='tabularht'>
-  <name>tabularht</name>
-  <caption>Tabular environments with height specified.</caption>
-  <authorref id='auth:oberdiek'/>
-  <copyright owner='Heiko Oberdiek' year='2005-2007'/>
-  <license type='lppl1.3'/>
-  <version number='2.6'/>
-  <description>
-    The tabularht package defines some environments that add a height
-    specification to tabular and array environments.  The default set
-    of new environments take a value for their height in the first
-    argument: defined environments are: <tt>tabularht</tt>,
-    <tt>tabularht*</tt> and <tt>arrayht</tt>.  If package
-    <xref refid='tabularx'>tabularx</xref> is also loaded,
-    the package also defines environments <tt>tabularxht</tt> and
-    <tt>tabularxht*</tt>.
-    <p/>
-    The places where stretching is to happen are signalled by<br/>
-    <tt>\noalign{\vfill}</tt><br/>
-    immediately after the <tt>\\</tt> that ends a row of the table or
-    array.
-    <p/>
-    The package is part of the <xref refid='oberdiek'>oberdiek</xref> bundle.
-  </description>
-  <documentation details='Package documentation'
-      href='ctan:/macros/latex/contrib/oberdiek/tabularht.pdf'/>
-  <ctan file='true' path='/macros/latex/contrib/oberdiek/tabularht.dtx'/>
-  <miktex location='oberdiek'/>
-  <texlive location='oberdiek'/>
-  <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
-</entry>
-%</catalogue>
-%    \end{macrocode}
-%
 % \begin{History}
 %   \begin{Version}{2005/09/22 v1.0}
 %   \item
diff --git a/macros/latex/contrib/oberdiek/tabularht.pdf b/macros/latex/contrib/oberdiek/tabularht.pdf
index bf6064e711..ab24beeb09 100644
--- a/macros/latex/contrib/oberdiek/tabularht.pdf
+++ b/macros/latex/contrib/oberdiek/tabularht.pdf
diff --git a/macros/latex/contrib/oberdiek/tabularkv.dtx b/macros/latex/contrib/oberdiek/tabularkv.dtx
index 6cb6f979a1..3c3fc3f48c 100644
--- a/macros/latex/contrib/oberdiek/tabularkv.dtx
+++ b/macros/latex/contrib/oberdiek/tabularkv.dtx
@@ -13,15 +13,17 @@
 % conditions of the LaTeX Project Public License, either
 % version 1.3c of this license or (at your option) any later
 % version. This version of this license is in
-%    http://www.latex-project.org/lppl/lppl-1-3c.txt
+%    https://www.latex-project.org/lppl/lppl-1-3c.txt
 % and the latest version of this license is in
-%    http://www.latex-project.org/lppl.txt
+%    https://www.latex-project.org/lppl.txt
 % and version 1.3 or later is part of all distributions of
 % LaTeX version 2005/12/01 or later.
 %
 % This work has the LPPL maintenance status "maintained".
 %
-% This Current Maintainer of this work is Heiko Oberdiek.
+% The Current Maintainers of this work are
+% Heiko Oberdiek and the Oberdiek Package Support Group
+% https://github.com/ho-tex/oberdiek/issues
 %
 % This work consists of the main source file tabularkv.dtx
 % and the derived files
@@ -100,15 +102,18 @@ This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either
 version 1.3c of this license or (at your option) any later
 version. This version of this license is in
-   http://www.latex-project.org/lppl/lppl-1-3c.txt
+   https://www.latex-project.org/lppl/lppl-1-3c.txt
 and the latest version of this license is in
-   http://www.latex-project.org/lppl.txt
+   https://www.latex-project.org/lppl.txt
 and version 1.3 or later is part of all distributions of
 LaTeX version 2005/12/01 or later.
 
 This work has the LPPL maintenance status "maintained".
 
-This Current Maintainer of this work is Heiko Oberdiek.
+The Current Maintainers of this work are
+Heiko Oberdiek and the Oberdiek Package Support Group
+https://github.com/ho-tex/oberdiek/issues
+
 
 This work consists of the main source file tabularkv.dtx
 and the derived files
@@ -186,8 +191,7 @@ and the derived files
 % \title{The \xpackage{tabularkv} package}
 % \date{2016/05/16 v1.2}
 % \author{Heiko Oberdiek\thanks
-% {Please report any issues at https://github.com/ho-tex/oberdiek/issues}\\
-% \xemail{heiko.oberdiek at googlemail.com}}
+% {Please report any issues at \url{https://github.com/ho-tex/oberdiek/issues}}}
 %
 % \maketitle
 %
@@ -309,7 +313,7 @@ and the derived files
 % \subsection{Download}
 %
 % \paragraph{Package.} This package is available on
-% CTAN\footnote{\url{http://ctan.org/pkg/tabularkv}}:
+% CTAN\footnote{\CTANpkg{tabularkv}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/tabularkv.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/tabularkv.pdf}] Documentation.
@@ -321,7 +325,7 @@ and the derived files
 % the packages are already unpacked and the documentation files
 % are generated. The files and directories obey the TDS standard.
 % \begin{description}
-% \item[\CTAN{install/macros/latex/contrib/oberdiek.tds.zip}]
+% \item[\CTANinstall{install/macros/latex/contrib/oberdiek.tds.zip}]
 % \end{description}
 % \emph{TDS} refers to the standard ``A Directory Structure
 % for \TeX\ Files'' (\CTAN{tds/tds.pdf}). Directories
@@ -441,16 +445,6 @@ and the derived files
 %
 % \subsection{Some details for the interested}
 %
-% \paragraph{Attached source.}
-%
-% The PDF documentation on CTAN also includes the
-% \xfile{.dtx} source file. It can be extracted by
-% AcrobatReader 6 or higher. Another option is \textsf{pdftk},
-% e.g. unpack the file into the current directory:
-% \begin{quote}
-%   \verb|pdftk tabularkv.pdf unpack_files output .|
-% \end{quote}
-%
 % \paragraph{Unpacking with \LaTeX.}
 % The \xfile{.dtx} chooses its action depending on the format:
 % \begin{description}
@@ -486,44 +480,6 @@ and the derived files
 %\end{verbatim}
 % \end{quote}
 %
-% \section{Catalogue}
-%
-% The following XML file can be used as source for the
-% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
-% The elements \texttt{caption} and \texttt{description} are imported
-% from the original XML file from the Catalogue.
-% The name of the XML file in the Catalogue is \xfile{tabularkv.xml}.
-%    \begin{macrocode}
-%<*catalogue>
-<?xml version='1.0' encoding='us-ascii'?>
-<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
-<entry datestamp='$Date$' modifier='$Author$' id='tabularkv'>
-  <name>tabularkv</name>
-  <caption>Tabular environments with key-value interface.</caption>
-  <authorref id='auth:oberdiek'/>
-  <copyright owner='Heiko Oberdiek' year='2005,2006'/>
-  <license type='lppl1.3'/>
-  <version number='1.2'/>
-  <description>
-    The tabularkv package creates an environment <tt>tabularkv</tt>, whose
-    arguments are specified in key-value form.  The arguments chosen
-    determine which other type of tabular is to be used (whether
-    standard LaTeX ones, or environments from the
-    <xref refid='tabularx'>tabularx</xref> or the
-    <xref refid='tabularht'>tabularx</xref> package).
-    <p/>
-    The package is part of the <xref refid='oberdiek'>oberdiek</xref> bundle.
-  </description>
-  <documentation details='Package documentation'
-      href='ctan:/macros/latex/contrib/oberdiek/tabularkv.pdf'/>
-  <ctan file='true' path='/macros/latex/contrib/oberdiek/tabularkv.dtx'/>
-  <miktex location='oberdiek'/>
-  <texlive location='oberdiek'/>
-  <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
-</entry>
-%</catalogue>
-%    \end{macrocode}
-%
 % \begin{History}
 %   \begin{Version}{2005/09/22 v1.0}
 %   \item
diff --git a/macros/latex/contrib/oberdiek/tabularkv.pdf b/macros/latex/contrib/oberdiek/tabularkv.pdf
index 95caa9f50d..57324c76a2 100644
--- a/macros/latex/contrib/oberdiek/tabularkv.pdf
+++ b/macros/latex/contrib/oberdiek/tabularkv.pdf
diff --git a/macros/latex/contrib/oberdiek/telprint.dtx b/macros/latex/contrib/oberdiek/telprint.dtx
index eafd86c48a..8d81cf81f1 100644
--- a/macros/latex/contrib/oberdiek/telprint.dtx
+++ b/macros/latex/contrib/oberdiek/telprint.dtx
@@ -13,15 +13,17 @@
 % conditions of the LaTeX Project Public License, either
 % version 1.3c of this license or (at your option) any later
 % version. This version of this license is in
-%    http://www.latex-project.org/lppl/lppl-1-3c.txt
+%    https://www.latex-project.org/lppl/lppl-1-3c.txt
 % and the latest version of this license is in
-%    http://www.latex-project.org/lppl.txt
+%    https://www.latex-project.org/lppl.txt
 % and version 1.3 or later is part of all distributions of
 % LaTeX version 2005/12/01 or later.
 %
 % This work has the LPPL maintenance status "maintained".
 %
-% This Current Maintainer of this work is Heiko Oberdiek.
+% The Current Maintainers of this work are
+% Heiko Oberdiek and the Oberdiek Package Support Group
+% https://github.com/ho-tex/oberdiek/issues
 %
 % The Base Interpreter refers to any `TeX-Format',
 % because some files are installed in TDS:tex/generic//.
@@ -103,15 +105,18 @@ This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either
 version 1.3c of this license or (at your option) any later
 version. This version of this license is in
-   http://www.latex-project.org/lppl/lppl-1-3c.txt
+   https://www.latex-project.org/lppl/lppl-1-3c.txt
 and the latest version of this license is in
-   http://www.latex-project.org/lppl.txt
+   https://www.latex-project.org/lppl.txt
 and version 1.3 or later is part of all distributions of
 LaTeX version 2005/12/01 or later.
 
 This work has the LPPL maintenance status "maintained".
 
-This Current Maintainer of this work is Heiko Oberdiek.
+The Current Maintainers of this work are
+Heiko Oberdiek and the Oberdiek Package Support Group
+https://github.com/ho-tex/oberdiek/issues
+
 
 The Base Interpreter refers to any `TeX-Format',
 because some files are installed in TDS:tex/generic//.
@@ -193,8 +198,7 @@ and the derived files
 % \title{The \xpackage{telprint} package}
 % \date{2016/05/16 v1.11}
 % \author{Heiko Oberdiek\thanks
-% {Please report any issues at https://github.com/ho-tex/oberdiek/issues}\\
-% \xemail{heiko.oberdiek at googlemail.com}}
+% {Please report any issues at \url{https://github.com/ho-tex/oberdiek/issues}}}
 %
 % \maketitle
 %
@@ -739,7 +743,7 @@ and the derived files
 % \subsection{Download}
 %
 % \paragraph{Package.} This package is available on
-% CTAN\footnote{\url{http://ctan.org/pkg/telprint}}:
+% CTAN\footnote{\CTANpkg{telprint}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/telprint.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/telprint.pdf}] Documentation.
@@ -751,7 +755,7 @@ and the derived files
 % the packages are already unpacked and the documentation files
 % are generated. The files and directories obey the TDS standard.
 % \begin{description}
-% \item[\CTAN{install/macros/latex/contrib/oberdiek.tds.zip}]
+% \item[\CTANinstall{install/macros/latex/contrib/oberdiek.tds.zip}]
 % \end{description}
 % \emph{TDS} refers to the standard ``A Directory Structure
 % for \TeX\ Files'' (\CTAN{tds/tds.pdf}). Directories
@@ -871,16 +875,6 @@ and the derived files
 %
 % \subsection{Some details for the interested}
 %
-% \paragraph{Attached source.}
-%
-% The PDF documentation on CTAN also includes the
-% \xfile{.dtx} source file. It can be extracted by
-% AcrobatReader 6 or higher. Another option is \textsf{pdftk},
-% e.g. unpack the file into the current directory:
-% \begin{quote}
-%   \verb|pdftk telprint.pdf unpack_files output .|
-% \end{quote}
-%
 % \paragraph{Unpacking with \LaTeX.}
 % The \xfile{.dtx} chooses its action depending on the format:
 % \begin{description}
@@ -916,41 +910,6 @@ and the derived files
 %\end{verbatim}
 % \end{quote}
 %
-% \section{Catalogue}
-%
-% The following XML file can be used as source for the
-% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
-% The elements \texttt{caption} and \texttt{description} are imported
-% from the original XML file from the Catalogue.
-% The name of the XML file in the Catalogue is \xfile{telprint.xml}.
-%    \begin{macrocode}
-%<*catalogue>
-<?xml version='1.0' encoding='us-ascii'?>
-<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
-<entry datestamp='$Date$' modifier='$Author$' id='telprint'>
-  <name>telprint</name>
-  <caption>Format German phone numbers.</caption>
-  <authorref id='auth:oberdiek'/>
-  <copyright owner='Heiko Oberdiek' year='1996,1997,2004-2008'/>
-  <license type='lppl1.3'/>
-  <version number='1.11'/>
-  <description>
-    The package provides a command <tt>\telprint</tt> for formatting
-    German telephone numbers.
-    <p/>
-    The package is part of the <xref refid='oberdiek'>oberdiek</xref>
-    bundle.
-  </description>
-  <documentation details='Package documentation'
-      href='ctan:/macros/latex/contrib/oberdiek/telprint.pdf'/>
-  <ctan file='true' path='/macros/latex/contrib/oberdiek/telprint.dtx'/>
-  <miktex location='oberdiek'/>
-  <texlive location='oberdiek'/>
-  <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
-</entry>
-%</catalogue>
-%    \end{macrocode}
-%
 % \begin{History}
 %   \begin{Version}{1996/11/28 v1.0}
 %   \item
@@ -978,7 +937,7 @@ and the derived files
 %   \item
 %     Posted in newsgroup \xnewsgroup{de.comp.text.tex}:\\
 %     \URL{``\link{Re: Generisches Markup f\"ur Telefonnummern?}''}^^A
-%     {http://groups.google.com/group/de.comp.text.tex/msg/86b3a86140007309}
+%     {https://groups.google.com/group/de.comp.text.tex/msg/86b3a86140007309}
 %   \end{Version}
 %   \begin{Version}{2004/11/02 v1.4}
 %   \item
diff --git a/macros/latex/contrib/oberdiek/telprint.pdf b/macros/latex/contrib/oberdiek/telprint.pdf
index 1a5e5bb5bb..9f3e2d984f 100644
--- a/macros/latex/contrib/oberdiek/telprint.pdf
+++ b/macros/latex/contrib/oberdiek/telprint.pdf
diff --git a/macros/latex/contrib/oberdiek/thepdfnumber.dtx b/macros/latex/contrib/oberdiek/thepdfnumber.dtx
index 5567c51711..98b65bbccf 100644
--- a/macros/latex/contrib/oberdiek/thepdfnumber.dtx
+++ b/macros/latex/contrib/oberdiek/thepdfnumber.dtx
@@ -13,15 +13,17 @@
 % conditions of the LaTeX Project Public License, either
 % version 1.3c of this license or (at your option) any later
 % version. This version of this license is in
-%    http://www.latex-project.org/lppl/lppl-1-3c.txt
+%    https://www.latex-project.org/lppl/lppl-1-3c.txt
 % and the latest version of this license is in
-%    http://www.latex-project.org/lppl.txt
+%    https://www.latex-project.org/lppl.txt
 % and version 1.3 or later is part of all distributions of
 % LaTeX version 2005/12/01 or later.
 %
 % This work has the LPPL maintenance status "maintained".
 %
-% This Current Maintainer of this work is Heiko Oberdiek.
+% The Current Maintainers of this work are
+% Heiko Oberdiek and the Oberdiek Package Support Group
+% https://github.com/ho-tex/oberdiek/issues
 %
 % The Base Interpreter refers to any `TeX-Format',
 % because some files are installed in TDS:tex/generic//.
@@ -106,15 +108,18 @@ This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either
 version 1.3c of this license or (at your option) any later
 version. This version of this license is in
-   http://www.latex-project.org/lppl/lppl-1-3c.txt
+   https://www.latex-project.org/lppl/lppl-1-3c.txt
 and the latest version of this license is in
-   http://www.latex-project.org/lppl.txt
+   https://www.latex-project.org/lppl.txt
 and version 1.3 or later is part of all distributions of
 LaTeX version 2005/12/01 or later.
 
 This work has the LPPL maintenance status "maintained".
 
-This Current Maintainer of this work is Heiko Oberdiek.
+The Current Maintainers of this work are
+Heiko Oberdiek and the Oberdiek Package Support Group
+https://github.com/ho-tex/oberdiek/issues
+
 
 The Base Interpreter refers to any `TeX-Format',
 because some files are installed in TDS:tex/generic//.
@@ -201,8 +206,7 @@ and the derived files
 % \title{The \xpackage{thepdfnumber} package}
 % \date{2016/05/16 v1.1}
 % \author{Heiko Oberdiek\thanks
-% {Please report any issues at https://github.com/ho-tex/oberdiek/issues}\\
-% \xemail{heiko.oberdiek at googlemail.com}}
+% {Please report any issues at \url{https://github.com/ho-tex/oberdiek/issues}}}
 %
 % \maketitle
 %
@@ -1398,7 +1402,7 @@ $        \else\ifnum`#2=46 % .
 % \subsection{Download}
 %
 % \paragraph{Package.} This package is available on
-% CTAN\footnote{\url{http://ctan.org/pkg/thepdfnumber}}:
+% CTAN\footnote{\CTANpkg{thepdfnumber}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/thepdfnumber.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/thepdfnumber.pdf}] Documentation.
@@ -1410,7 +1414,7 @@ $        \else\ifnum`#2=46 % .
 % the packages are already unpacked and the documentation files
 % are generated. The files and directories obey the TDS standard.
 % \begin{description}
-% \item[\CTAN{install/macros/latex/contrib/oberdiek.tds.zip}]
+% \item[\CTANinstall{install/macros/latex/contrib/oberdiek.tds.zip}]
 % \end{description}
 % \emph{TDS} refers to the standard ``A Directory Structure
 % for \TeX\ Files'' (\CTAN{tds/tds.pdf}). Directories
@@ -1532,16 +1536,6 @@ $        \else\ifnum`#2=46 % .
 %
 % \subsection{Some details for the interested}
 %
-% \paragraph{Attached source.}
-%
-% The PDF documentation on CTAN also includes the
-% \xfile{.dtx} source file. It can be extracted by
-% AcrobatReader 6 or higher. Another option is \textsf{pdftk},
-% e.g. unpack the file into the current directory:
-% \begin{quote}
-%   \verb|pdftk thepdfnumber.pdf unpack_files output .|
-% \end{quote}
-%
 % \paragraph{Unpacking with \LaTeX.}
 % The \xfile{.dtx} chooses its action depending on the format:
 % \begin{description}
diff --git a/macros/latex/contrib/oberdiek/thepdfnumber.pdf b/macros/latex/contrib/oberdiek/thepdfnumber.pdf
index 9314ec4141..8244592592 100644
--- a/macros/latex/contrib/oberdiek/thepdfnumber.pdf
+++ b/macros/latex/contrib/oberdiek/thepdfnumber.pdf
diff --git a/macros/latex/contrib/oberdiek/transparent.dtx b/macros/latex/contrib/oberdiek/transparent.dtx
index 4b964788cc..c9a4ca231f 100644
--- a/macros/latex/contrib/oberdiek/transparent.dtx
+++ b/macros/latex/contrib/oberdiek/transparent.dtx
@@ -13,15 +13,17 @@
 % conditions of the LaTeX Project Public License, either
 % version 1.3c of this license or (at your option) any later
 % version. This version of this license is in
-%    http://www.latex-project.org/lppl/lppl-1-3c.txt
+%    https://www.latex-project.org/lppl/lppl-1-3c.txt
 % and the latest version of this license is in
-%    http://www.latex-project.org/lppl.txt
+%    https://www.latex-project.org/lppl.txt
 % and version 1.3 or later is part of all distributions of
 % LaTeX version 2005/12/01 or later.
 %
 % This work has the LPPL maintenance status "maintained".
 %
-% This Current Maintainer of this work is Heiko Oberdiek.
+% The Current Maintainers of this work are
+% Heiko Oberdiek and the Oberdiek Package Support Group
+% https://github.com/ho-tex/oberdiek/issues
 %
 % This work consists of the main source file transparent.dtx
 % and the derived files
@@ -100,15 +102,18 @@ This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either
 version 1.3c of this license or (at your option) any later
 version. This version of this license is in
-   http://www.latex-project.org/lppl/lppl-1-3c.txt
+   https://www.latex-project.org/lppl/lppl-1-3c.txt
 and the latest version of this license is in
-   http://www.latex-project.org/lppl.txt
+   https://www.latex-project.org/lppl.txt
 and version 1.3 or later is part of all distributions of
 LaTeX version 2005/12/01 or later.
 
 This work has the LPPL maintenance status "maintained".
 
-This Current Maintainer of this work is Heiko Oberdiek.
+The Current Maintainers of this work are
+Heiko Oberdiek and the Oberdiek Package Support Group
+https://github.com/ho-tex/oberdiek/issues
+
 
 This work consists of the main source file transparent.dtx
 and the derived files
@@ -186,8 +191,7 @@ and the derived files
 % \title{The \xpackage{transparent} package}
 % \date{2018/11/18 v1.3}
 % \author{Heiko Oberdiek\thanks
-% {Please report any issues at https://github.com/ho-tex/oberdiek/issues}\\
-% \xemail{heiko.oberdiek at googlemail.com}}
+% {Please report any issues at \url{https://github.com/ho-tex/oberdiek/issues}}}
 %
 % \maketitle
 %
@@ -421,7 +425,7 @@ Hello World
 % \subsection{Download}
 %
 % \paragraph{Package.} This package is available on
-% CTAN\footnote{\url{http://ctan.org/pkg/transparent}}:
+% CTAN\footnote{\CTANpkg{transparent}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/transparent.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/transparent.pdf}] Documentation.
@@ -433,7 +437,7 @@ Hello World
 % the packages are already unpacked and the documentation files
 % are generated. The files and directories obey the TDS standard.
 % \begin{description}
-% \item[\CTAN{install/macros/latex/contrib/oberdiek.tds.zip}]
+% \item[\CTANinstall{install/macros/latex/contrib/oberdiek.tds.zip}]
 % \end{description}
 % \emph{TDS} refers to the standard ``A Directory Structure
 % for \TeX\ Files'' (\CTAN{tds/tds.pdf}). Directories
@@ -553,16 +557,6 @@ Hello World
 %
 % \subsection{Some details for the interested}
 %
-% \paragraph{Attached source.}
-%
-% The PDF documentation on CTAN also includes the
-% \xfile{.dtx} source file. It can be extracted by
-% AcrobatReader 6 or higher. Another option is \textsf{pdftk},
-% e.g. unpack the file into the current directory:
-% \begin{quote}
-%   \verb|pdftk transparent.pdf unpack_files output .|
-% \end{quote}
-%
 % \paragraph{Unpacking with \LaTeX.}
 % The \xfile{.dtx} chooses its action depending on the format:
 % \begin{description}
@@ -598,42 +592,6 @@ Hello World
 %\end{verbatim}
 % \end{quote}
 %
-% \section{Catalogue}
-%
-% The following XML file can be used as source for the
-% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
-% The elements \texttt{caption} and \texttt{description} are imported
-% from the original XML file from the Catalogue.
-% The name of the XML file in the Catalogue is \xfile{transparent.xml}.
-%    \begin{macrocode}
-%<*catalogue>
-<?xml version='1.0' encoding='us-ascii'?>
-<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
-<entry datestamp='$Date$' modifier='$Author$' id='transparent'>
-  <name>transparent</name>
-  <caption>Using a color stack for transparency with pdfTeX.</caption>
-  <authorref id='auth:oberdiek'/>
-  <copyright owner='Heiko Oberdiek' year='2007'/>
-  <license type='lppl1.3'/>
-  <version number='1.2'/>
-  <description>
-    Since version 1.40 <xref refid='pdftex'>pdfTeX</xref> supports
-    several color stacks. This package shows how a separate colour stack
-    can be used for transparency, a property other than colour.
-    <p/>
-    The package is part of the <xref refid='oberdiek'>oberdiek</xref>
-    bundle.
-  </description>
-  <documentation details='Package documentation'
-      href='ctan:/macros/latex/contrib/oberdiek/transparent.pdf'/>
-  <ctan file='true' path='/macros/latex/contrib/oberdiek/transparent.dtx'/>
-  <miktex location='oberdiek'/>
-  <texlive location='oberdiek'/>
-  <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
-</entry>
-%</catalogue>
-%    \end{macrocode}
-%
 % \begin{History}
 %   \begin{Version}{2007/01/08 v1.0}
 %   \item
diff --git a/macros/latex/contrib/oberdiek/transparent.pdf b/macros/latex/contrib/oberdiek/transparent.pdf
index 7c33a277bd..5d1581280e 100644
--- a/macros/latex/contrib/oberdiek/transparent.pdf
+++ b/macros/latex/contrib/oberdiek/transparent.pdf
diff --git a/macros/latex/contrib/oberdiek/twoopt.dtx b/macros/latex/contrib/oberdiek/twoopt.dtx
index 9d3d94e2e0..f63139d4a6 100644
--- a/macros/latex/contrib/oberdiek/twoopt.dtx
+++ b/macros/latex/contrib/oberdiek/twoopt.dtx
@@ -13,15 +13,17 @@
 % conditions of the LaTeX Project Public License, either
 % version 1.3c of this license or (at your option) any later
 % version. This version of this license is in
-%    http://www.latex-project.org/lppl/lppl-1-3c.txt
+%    https://www.latex-project.org/lppl/lppl-1-3c.txt
 % and the latest version of this license is in
-%    http://www.latex-project.org/lppl.txt
+%    https://www.latex-project.org/lppl.txt
 % and version 1.3 or later is part of all distributions of
 % LaTeX version 2005/12/01 or later.
 %
 % This work has the LPPL maintenance status "maintained".
 %
-% This Current Maintainer of this work is Heiko Oberdiek.
+% The Current Maintainers of this work are
+% Heiko Oberdiek and the Oberdiek Package Support Group
+% https://github.com/ho-tex/oberdiek/issues
 %
 % This work consists of the main source file twoopt.dtx
 % and the derived files
@@ -98,15 +100,18 @@ This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either
 version 1.3c of this license or (at your option) any later
 version. This version of this license is in
-   http://www.latex-project.org/lppl/lppl-1-3c.txt
+   https://www.latex-project.org/lppl/lppl-1-3c.txt
 and the latest version of this license is in
-   http://www.latex-project.org/lppl.txt
+   https://www.latex-project.org/lppl.txt
 and version 1.3 or later is part of all distributions of
 LaTeX version 2005/12/01 or later.
 
 This work has the LPPL maintenance status "maintained".
 
-This Current Maintainer of this work is Heiko Oberdiek.
+The Current Maintainers of this work are
+Heiko Oberdiek and the Oberdiek Package Support Group
+https://github.com/ho-tex/oberdiek/issues
+
 
 This work consists of the main source file twoopt.dtx
 and the derived files
@@ -181,8 +186,7 @@ and the derived files
 % \title{The \xpackage{twoopt} package}
 % \date{2016/05/16 v1.6}
 % \author{Heiko Oberdiek\thanks
-% {Please report any issues at https://github.com/ho-tex/oberdiek/issues}\\
-% \xemail{heiko.oberdiek at googlemail.com}}
+% {Please report any issues at \url{https://github.com/ho-tex/oberdiek/issues}}}
 %
 % \maketitle
 %
@@ -388,7 +392,7 @@ and the derived files
 % \subsection{Download}
 %
 % \paragraph{Package.} This package is available on
-% CTAN\footnote{\url{http://ctan.org/pkg/twoopt}}:
+% CTAN\footnote{\CTANpkg{twoopt}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/twoopt.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/twoopt.pdf}] Documentation.
@@ -400,7 +404,7 @@ and the derived files
 % the packages are already unpacked and the documentation files
 % are generated. The files and directories obey the TDS standard.
 % \begin{description}
-% \item[\CTAN{install/macros/latex/contrib/oberdiek.tds.zip}]
+% \item[\CTANinstall{install/macros/latex/contrib/oberdiek.tds.zip}]
 % \end{description}
 % \emph{TDS} refers to the standard ``A Directory Structure
 % for \TeX\ Files'' (\CTAN{tds/tds.pdf}). Directories
@@ -519,16 +523,6 @@ and the derived files
 %
 % \subsection{Some details for the interested}
 %
-% \paragraph{Attached source.}
-%
-% The PDF documentation on CTAN also includes the
-% \xfile{.dtx} source file. It can be extracted by
-% AcrobatReader 6 or higher. Another option is \textsf{pdftk},
-% e.g. unpack the file into the current directory:
-% \begin{quote}
-%   \verb|pdftk twoopt.pdf unpack_files output .|
-% \end{quote}
-%
 % \paragraph{Unpacking with \LaTeX.}
 % The \xfile{.dtx} chooses its action depending on the format:
 % \begin{description}
@@ -564,41 +558,6 @@ and the derived files
 %\end{verbatim}
 % \end{quote}
 %
-% \section{Catalogue}
-%
-% The following XML file can be used as source for the
-% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
-% The elements \texttt{caption} and \texttt{description} are imported
-% from the original XML file from the Catalogue.
-% The name of the XML file in the Catalogue is \xfile{twoopt.xml}.
-%    \begin{macrocode}
-%<*catalogue>
-<?xml version='1.0' encoding='us-ascii'?>
-<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
-<entry datestamp='$Date$' modifier='$Author$' id='twoopt'>
-  <name>twoopt</name>
-  <caption>Definitions with two optional arguments.</caption>
-  <authorref id='auth:oberdiek'/>
-  <copyright owner='Heiko Oberdiek' year='1999,2006,2008'/>
-  <license type='lppl1.3'/>
-  <version number='1.6'/>
-  <description>
-    Variants of <tt>\newcommand</tt>, <tt>\renewcommand</tt> and
-    <tt>\providecommand</tt> are provided.
-    <p/>
-    The package is part of the <xref refid='oberdiek'>oberdiek</xref>
-    bundle.
-  </description>
-  <documentation details='Package documentation'
-      href='ctan:/macros/latex/contrib/oberdiek/twoopt.pdf'/>
-  <ctan file='true' path='/macros/latex/contrib/oberdiek/twoopt.dtx'/>
-  <miktex location='oberdiek'/>
-  <texlive location='oberdiek'/>
-  <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
-</entry>
-%</catalogue>
-%    \end{macrocode}
-%
 % \begin{History}
 %   \begin{Version}{1998/10/30 v1.0}
 %   \item
@@ -607,7 +566,7 @@ and the derived files
 %     published in the newsgroup
 %     \href{news:comp.text.tex}{comp.text.tex}:\\
 %     \URL{``Re: [Q] LaTeX command with two optional arguments?''}^^A
-%     {http://groups.google.com/group/comp.text.tex/msg/0ab1afde7b172d37}
+%     {https://groups.google.com/group/comp.text.tex/msg/0ab1afde7b172d37}
 %   \end{Version}
 %   \begin{Version}{1998/10/30 v1.1}
 %   \item
@@ -615,7 +574,7 @@ and the derived files
 %     \NameEmail{Stefan Ulrich}{ulrich@cis.uni-muenchen.de}
 %     in the same thread:\\
 %     \URL{``Re: [Q] LaTeX command with two optional arguments?''}^^A
-%     {http://groups.google.com/group/comp.text.tex/msg/b8d84d4336f302c4}
+%     {https://groups.google.com/group/comp.text.tex/msg/b8d84d4336f302c4}
 %   \end{Version}
 %   \begin{Version}{1998/11/04 v1.2}
 %   \item
diff --git a/macros/latex/contrib/oberdiek/twoopt.pdf b/macros/latex/contrib/oberdiek/twoopt.pdf
index a22a63e660..fb3a3d0e53 100644
--- a/macros/latex/contrib/oberdiek/twoopt.pdf
+++ b/macros/latex/contrib/oberdiek/twoopt.pdf
diff --git a/macros/latex/contrib/oberdiek/uniquecounter.dtx b/macros/latex/contrib/oberdiek/uniquecounter.dtx
index 7ff2950d25..1fd992554e 100644
--- a/macros/latex/contrib/oberdiek/uniquecounter.dtx
+++ b/macros/latex/contrib/oberdiek/uniquecounter.dtx
@@ -13,15 +13,17 @@
 % conditions of the LaTeX Project Public License, either
 % version 1.3c of this license or (at your option) any later
 % version. This version of this license is in
-%    http://www.latex-project.org/lppl/lppl-1-3c.txt
+%    https://www.latex-project.org/lppl/lppl-1-3c.txt
 % and the latest version of this license is in
-%    http://www.latex-project.org/lppl.txt
+%    https://www.latex-project.org/lppl.txt
 % and version 1.3 or later is part of all distributions of
 % LaTeX version 2005/12/01 or later.
 %
 % This work has the LPPL maintenance status "maintained".
 %
-% This Current Maintainer of this work is Heiko Oberdiek.
+% The Current Maintainers of this work are
+% Heiko Oberdiek and the Oberdiek Package Support Group
+% https://github.com/ho-tex/oberdiek/issues
 %
 % The Base Interpreter refers to any `TeX-Format',
 % because some files are installed in TDS:tex/generic//.
@@ -108,15 +110,18 @@ This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either
 version 1.3c of this license or (at your option) any later
 version. This version of this license is in
-   http://www.latex-project.org/lppl/lppl-1-3c.txt
+   https://www.latex-project.org/lppl/lppl-1-3c.txt
 and the latest version of this license is in
-   http://www.latex-project.org/lppl.txt
+   https://www.latex-project.org/lppl.txt
 and version 1.3 or later is part of all distributions of
 LaTeX version 2005/12/01 or later.
 
 This work has the LPPL maintenance status "maintained".
 
-This Current Maintainer of this work is Heiko Oberdiek.
+The Current Maintainers of this work are
+Heiko Oberdiek and the Oberdiek Package Support Group
+https://github.com/ho-tex/oberdiek/issues
+
 
 The Base Interpreter refers to any `TeX-Format',
 because some files are installed in TDS:tex/generic//.
@@ -203,8 +208,7 @@ and the derived files
 % \title{The \xpackage{uniquecounter} package}
 % \date{2016/05/16 v1.3}
 % \author{Heiko Oberdiek\thanks
-% {Please report any issues at https://github.com/ho-tex/oberdiek/issues}\\
-% \xemail{heiko.oberdiek at googlemail.com}}
+% {Please report any issues at \url{https://github.com/ho-tex/oberdiek/issues}}}
 %
 % \maketitle
 %
@@ -814,7 +818,7 @@ and the derived files
 % \subsection{Download}
 %
 % \paragraph{Package.} This package is available on
-% CTAN\footnote{\url{http://ctan.org/pkg/uniquecounter}}:
+% CTAN\footnote{\CTANpkg{uniquecounter}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/uniquecounter.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/uniquecounter.pdf}] Documentation.
@@ -826,7 +830,7 @@ and the derived files
 % the packages are already unpacked and the documentation files
 % are generated. The files and directories obey the TDS standard.
 % \begin{description}
-% \item[\CTAN{install/macros/latex/contrib/oberdiek.tds.zip}]
+% \item[\CTANinstall{install/macros/latex/contrib/oberdiek.tds.zip}]
 % \end{description}
 % \emph{TDS} refers to the standard ``A Directory Structure
 % for \TeX\ Files'' (\CTAN{tds/tds.pdf}). Directories
@@ -949,16 +953,6 @@ and the derived files
 %
 % \subsection{Some details for the interested}
 %
-% \paragraph{Attached source.}
-%
-% The PDF documentation on CTAN also includes the
-% \xfile{.dtx} source file. It can be extracted by
-% AcrobatReader 6 or higher. Another option is \textsf{pdftk},
-% e.g. unpack the file into the current directory:
-% \begin{quote}
-%   \verb|pdftk uniquecounter.pdf unpack_files output .|
-% \end{quote}
-%
 % \paragraph{Unpacking with \LaTeX.}
 % The \xfile{.dtx} chooses its action depending on the format:
 % \begin{description}
@@ -994,42 +988,6 @@ and the derived files
 %\end{verbatim}
 % \end{quote}
 %
-% \section{Catalogue}
-%
-% The following XML file can be used as source for the
-% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
-% The elements \texttt{caption} and \texttt{description} are imported
-% from the original XML file from the Catalogue.
-% The name of the XML file in the Catalogue is \xfile{uniquecounter.xml}.
-%    \begin{macrocode}
-%<*catalogue>
-<?xml version='1.0' encoding='us-ascii'?>
-<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
-<entry datestamp='$Date$' modifier='$Author$' id='uniquecounter'>
-  <name>uniquecounter</name>
-  <caption>Provides unlimited unique counter.</caption>
-  <authorref id='auth:oberdiek'/>
-  <copyright owner='Heiko Oberdiek' year='2009,2011'/>
-  <license type='lppl1.3'/>
-  <version number='1.3'/>
-  <description>
-    This package provides a kind of counter that provides unique
-    number values. Several counters can be created with different names.
-    The numeric values are not limited.
-    <p/>
-    The package is part of the <xref refid='oberdiek'>oberdiek</xref>
-    bundle.
-  </description>
-  <documentation details='Package documentation'
-      href='ctan:/macros/latex/contrib/oberdiek/uniquecounter.pdf'/>
-  <ctan file='true' path='/macros/latex/contrib/oberdiek/uniquecounter.dtx'/>
-  <miktex location='oberdiek'/>
-  <texlive location='oberdiek'/>
-  <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
-</entry>
-%</catalogue>
-%    \end{macrocode}
-%
 % \begin{History}
 %   \begin{Version}{2009/09/11 v1.0}
 %   \item
diff --git a/macros/latex/contrib/oberdiek/uniquecounter.pdf b/macros/latex/contrib/oberdiek/uniquecounter.pdf
index cc9469787a..e89d429082 100644
--- a/macros/latex/contrib/oberdiek/uniquecounter.pdf
+++ b/macros/latex/contrib/oberdiek/uniquecounter.pdf
diff --git a/macros/latex/contrib/oberdiek/zref.dtx b/macros/latex/contrib/oberdiek/zref.dtx
index 890b09c285..d8e7070cd2 100644
--- a/macros/latex/contrib/oberdiek/zref.dtx
+++ b/macros/latex/contrib/oberdiek/zref.dtx
@@ -7,21 +7,23 @@
 % Copyright (C) 2006-2012 by
 %    Heiko Oberdiek <heiko.oberdiek at googlemail.com>
 %    2016
-%    https://github.com/ho-tex/oberdiek/issues
+%    https://github.com/ho-tex/oberdiek/issueso
 %
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either
 % version 1.3c of this license or (at your option) any later
 % version. This version of this license is in
-%    http://www.latex-project.org/lppl/lppl-1-3c.txt
+%    https://www.latex-project.org/lppl/lppl-1-3c.txt
 % and the latest version of this license is in
-%    http://www.latex-project.org/lppl.txt
+%    https://www.latex-project.org/lppl.txt
 % and version 1.3 or later is part of all distributions of
 % LaTeX version 2005/12/01 or later.
 %
 % This work has the LPPL maintenance status "maintained".
 %
-% This Current Maintainer of this work is Heiko Oberdiek.
+% The Current Maintainers of this work are
+% Heiko Oberdiek and the Oberdiek Package Support Group
+% https://github.com/ho-tex/oberdiek/issues
 %
 % This work consists of the main source file zref.dtx
 % and the derived files
@@ -135,15 +137,18 @@ This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either
 version 1.3c of this license or (at your option) any later
 version. This version of this license is in
-   http://www.latex-project.org/lppl/lppl-1-3c.txt
+   https://www.latex-project.org/lppl/lppl-1-3c.txt
 and the latest version of this license is in
-   http://www.latex-project.org/lppl.txt
+   https://www.latex-project.org/lppl.txt
 and version 1.3 or later is part of all distributions of
 LaTeX version 2005/12/01 or later.
 
 This work has the LPPL maintenance status "maintained".
 
-This Current Maintainer of this work is Heiko Oberdiek.
+The Current Maintainers of this work are
+Heiko Oberdiek and the Oberdiek Package Support Group
+https://github.com/ho-tex/oberdiek/issues
+
 
 This work consists of the main source file zref.dtx
 and the derived files
@@ -264,8 +269,7 @@ and the derived files
 % \title{The \xpackage{zref} package}
 % \date{2018/11/21 v2.27}
 % \author{Heiko Oberdiek\thanks
-% {Please report any issues at https://github.com/ho-tex/oberdiek/issues}\\
-% \xemail{heiko.oberdiek at googlemail.com}}
+% {Please report any issues at \url{https://github.com/ho-tex/oberdiek/issues}}}
 %
 % \maketitle
 %
@@ -6389,7 +6393,7 @@ the height difference of the two baselines is
 % \subsection{Download}
 %
 % \paragraph{Package.} This package is available on
-% CTAN\footnote{\url{http://ctan.org/pkg/zref}}:
+% CTAN\footnote{\CTANpkg{zref}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/zref.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/zref.pdf}] Documentation.
@@ -6401,7 +6405,7 @@ the height difference of the two baselines is
 % the packages are already unpacked and the documentation files
 % are generated. The files and directories obey the TDS standard.
 % \begin{description}
-% \item[\CTAN{install/macros/latex/contrib/oberdiek.tds.zip}]
+% \item[\CTANinstall{install/macros/latex/contrib/oberdiek.tds.zip}]
 % \end{description}
 % \emph{TDS} refers to the standard ``A Directory Structure
 % for \TeX\ Files'' (\CTAN{tds/tds.pdf}). Directories
@@ -6547,16 +6551,6 @@ the height difference of the two baselines is
 %
 % \subsection{Some details for the interested}
 %
-% \paragraph{Attached source.}
-%
-% The PDF documentation on CTAN also includes the
-% \xfile{.dtx} source file. It can be extracted by
-% AcrobatReader 6 or higher. Another option is \textsf{pdftk},
-% e.g. unpack the file into the current directory:
-% \begin{quote}
-%   \verb|pdftk zref.pdf unpack_files output .|
-% \end{quote}
-%
 % \paragraph{Unpacking with \LaTeX.}
 % The \xfile{.dtx} chooses its action depending on the format:
 % \begin{description}
@@ -6592,70 +6586,25 @@ the height difference of the two baselines is
 %\end{verbatim}
 % \end{quote}
 %
-% \section{Catalogue}
-%
-% The following XML file can be used as source for the
-% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
-% The elements \texttt{caption} and \texttt{description} are imported
-% from the original XML file from the Catalogue.
-% The name of the XML file in the Catalogue is \xfile{zref.xml}.
-%    \begin{macrocode}
-%<*catalogue>
-<?xml version='1.0' encoding='us-ascii'?>
-<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
-<entry datestamp='$Date$' modifier='$Author$' id='zref'>
-  <name>zref</name>
-  <caption>A new reference scheme for LaTeX.</caption>
-  <authorref id='auth:oberdiek'/>
-  <copyright owner='Heiko Oberdiek' year='2006-2012'/>
-  <license type='lppl1.3'/>
-  <version number='2.26'/>
-  <description>
-    This package offers a means to remove the limitation, of only two
-    properties, that is inherent in the way LaTeX&#x2019;s reference system
-    works.  The package implements an extensible referencing system,
-    where properties are handled in a more flexible way.  It provides
-    an interface for macro programmers to access the new reference
-    scheme and some applications that use it.
-    <p/>
-    The package is part of the <xref refid='oberdiek'>oberdiek</xref>
-    bundle.
-  </description>
-  <documentation details='Package documentation'
-      href='ctan:/macros/latex/contrib/oberdiek/zref.pdf'/>
-  <ctan file='true' path='/macros/latex/contrib/oberdiek/zref.dtx'/>
-  <miktex location='oberdiek'/>
-  <texlive location='oberdiek'/>
-  <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
-</entry>
-%</catalogue>
-%    \end{macrocode}
-%
-% \newcommand*{\bibpackage}[4]{^^A
-%   \bibitem{#1}
-%   Package \xpackage{#1}, #2, #3.^^A
-%   \ifx\\#4\\\else#4\fi\par
-% }
-%
 % \begin{thebibliography}{99}
 % \bibpackage{footmisc}{Robin Fairbairns}{2004/01/23 v5.3a}
-%   {\CTAN{macros/latex/contrib/footmisc/footmisc.dtx}}
+%   {\CTANpkg{footmisc}}
 % \bibpackage{hyperref}{Sebastian Rahtz, Heiko Oberdiek}{2006/08/16 v6.75c}
-%   {\CTAN{macros/latex/contrib/hyperref/}}
+%   {\CTANpkg{hyperref}}
 % \bibpackage{lastpage}{Jeff Goldberg}{1994/06/25 v0.1b}
-%   {\CTAN{macros/latex/contrib/lastpage/}}
+%   {\CTANpkg{lastpage}}
 % \bibpackage{nameref}{Sebastian Rahtz, Heiko Oberdiek}{2006/02/12 v2.24}
-%   {\CTAN{macros/latex/contrib/hyperref/nameref.dtx}}
+%   {\CTANpkg{nameref}}
 % \bibpackage{perpage}{David Kastrup}{2002/12/20 v1.0}
-%   {\CTAN{macros/latex/contrib/bigfoot/perpage.dtx}}
+%   {\CTANpkg{perpage}}
 % \bibpackage{titleref}{Donald Arsenau}{2001/04/05 v3.1}
-%   {\CTAN{macros/latex/contrib/misc/titleref.sty}}
+%   {\CTANpkg{titleref}}
 % \bibpackage{totpages}{Wilhelm M\"uller}{1999/07/14 v1.00}
-%   {\CTAN{macros/latex/contrib/totpages/}}
+%   {\CTANpkg{totpages}}
 % \bibpackage{xr}{David Carlisle}{1994/05/28 v5.02}
-%   {\CTAN{macros/latex/required/tools/xr.pdf}}
+%   {\CTANpkg{xr}}
 % \bibpackage{xr-hyper}{David Carlisle}{2000/03/22 v6.00beta4}
-%   {\CTAN{macros/latex/contrib/hyperref/xr-hyper.sty}}
+%   {\CTANpkg{xr-hyper}}
 % \end{thebibliography}
 %
 % \begin{History}
diff --git a/macros/latex/contrib/oberdiek/zref.pdf b/macros/latex/contrib/oberdiek/zref.pdf
index 3966f39d00..e5d5de9d07 100644
--- a/macros/latex/contrib/oberdiek/zref.pdf
+++ b/macros/latex/contrib/oberdiek/zref.pdf
diff --git a/macros/latex/contrib/pkuthss/README b/macros/latex/contrib/pkuthss/README
index a023ed09c8..4f7e832a45 100644
--- a/macros/latex/contrib/pkuthss/README
+++ b/macros/latex/contrib/pkuthss/README
@@ -2,11 +2,11 @@ pkuthss: LaTeX template for dissertations in Peking University
 --------------------------------------------------------------
 
 Maintainer: Casper Ti. Vector <CasperVector@gmail.com>
-Homepage: <https://gitlab.com/CasperVector/pkuthss>
+Homepage: <https://gitea.com/CasperVector/pkuthss>
 
-License:
-* New BSD License for `copyright.tex' and `originauth.tex'.
-* LaTeX Project Public License 1.3 or later for files in `tex/' and
+Licence:
+* New BSD Licence for `copy.tex' and `origin.tex'.
+* LaTeX Project Public Licence 1.3 or later for files in `tex/' and
   `doc/readme/', except for those mentioned above.
 * Public domain for all other files.
 
@@ -14,5 +14,5 @@ This package provides a simple, clear and flexible LaTeX template for
 dissertations in Peking University.
 
 This file (README) is *NOT* intended as the documentation for this
-package; please see the file `readme.pdf' instead.
+package; please see the file `pkuthss.pdf' instead.
 
diff --git a/macros/latex/contrib/pkuthss/doc/example.pdf b/macros/latex/contrib/pkuthss/doc/example.pdf
index 2dd693f222..f4e66e5d31 100644
--- a/macros/latex/contrib/pkuthss/doc/example.pdf
+++ b/macros/latex/contrib/pkuthss/doc/example.pdf
diff --git a/macros/latex/contrib/pkuthss/doc/example/Make.bat b/macros/latex/contrib/pkuthss/doc/example/Make.bat
index e57cca77a4..efbd3dfa4a 100644
--- a/macros/latex/contrib/pkuthss/doc/example/Make.bat
+++ b/macros/latex/contrib/pkuthss/doc/example/Make.bat
@@ -1,32 +1,19 @@
 @echo off

 

 @rem Copyright (c) 2008-2009 solvethis

-@rem Copyright (c) 2010-2012 Casper Ti. Vector

+@rem Copyright (c) 2010-2012,2019 Casper Ti. Vector

 @rem Public domain.

 

-set JOB=thesis

-@rem ���������ֵ����Ϊ latex��pdflatex �� xelatex��

-set LATEX=latex

-set BIBTEX=biber -l zh__pinyin --output-safechars

-set DVIPDF=dvipdfmx

-

-if "%LATEX%"=="latex" (set DODVIPDF=%DVIPDF% %JOB%

-) else (set DODVIPDF=echo No need to run %DVIPDF%.)

 if "%1"=="" goto doc

 if "%1"=="doc" goto doc

 if "%1"=="clean" (goto clean) else (goto usage)

 

 :doc

-%LATEX% %JOB%

-%BIBTEX% %JOB%

-%LATEX% %JOB%

-%LATEX% %JOB%

-%DODVIPDF%

+latexmk

 goto end

 

 :clean

-del *.aux *.bbl *.bcf *.blg *.dvi *.lof *.log *.lot *.run.xml *.toc *.out

-del missfont.log chap\*.aux

+latexmk -c

 goto end

 

 :usage

diff --git a/macros/latex/contrib/pkuthss/doc/example/ctex-fontset-pkuthss.def b/macros/latex/contrib/pkuthss/doc/example/ctex-fontset-pkuthss.def
index 2febb6122d..b503fc729a 100644
--- a/macros/latex/contrib/pkuthss/doc/example/ctex-fontset-pkuthss.def
+++ b/macros/latex/contrib/pkuthss/doc/example/ctex-fontset-pkuthss.def
@@ -36,13 +36,13 @@
   }
   {
     \setCJKmainfont
-      [ BoldFont = SimHei , ItalicFont = [ simkai.ttf ] ] { SimSun }
+      [ BoldFont = SimHei , ItalicFont = KaiTi ] { SimSun }
     \setCJKsansfont { SimHei }
-    \setCJKmonofont { [ simfang.ttf ] }
+    \setCJKmonofont { FangSong }
     \setCJKfamilyfont { zhsong }  { SimSun }
     \setCJKfamilyfont { zhhei }   { SimHei }
-    \setCJKfamilyfont { zhkai }   { [ simkai.ttf ] }
-    \setCJKfamilyfont { zhfs }    { [ simfang.ttf ] }
+    \setCJKfamilyfont { zhkai }   { KaiTi }
+    \setCJKfamilyfont { zhfs }    { FangSong }
     %\setCJKfamilyfont { zhli }    { LiSu }
     %\setCJKfamilyfont { zhyou }   { YouYuan }
   }
diff --git a/macros/latex/contrib/pkuthss/doc/example/latexmkrc b/macros/latex/contrib/pkuthss/doc/example/latexmkrc
new file mode 100644
index 0000000000..8df2c242c2
--- /dev/null
+++ b/macros/latex/contrib/pkuthss/doc/example/latexmkrc
@@ -0,0 +1,14 @@
+# Copyright (c) 2019 Casper Ti. Vector
+# Public domain.
+
+@default_files = ('thesis');
+# 5：xelatex；3：latex（+ dvipdfmx）；1：pdflatex。
+$pdf_mode = 5;
+# 用 latex 模式编译时，使用 dvipdfmx 而非默认的 dvipdf。
+$dvipdf = "dvipdfmx %O -o %D %S";
+# 此选项相关说明见 texdoc latexmk。
+$bibtex_use = 1.5;
+$biber = "biber -l zh__pinyin --output-safechars %O %S";
+# latexmk -c 时自动删除 .run.xml 文件。
+$clean_ext = "run.xml";
+
diff --git a/macros/latex/contrib/pkuthss/doc/example/spine.tex b/macros/latex/contrib/pkuthss/doc/example/spine.tex
index 27b28feac3..005e4c3950 100644
--- a/macros/latex/contrib/pkuthss/doc/example/spine.tex
+++ b/macros/latex/contrib/pkuthss/doc/example/spine.tex
@@ -1,13 +1,13 @@
-% Copyright (c) 2018 Casper Ti. Vector
+% Copyright (c) 2018-2019 Casper Ti. Vector
 % Public domain.
 
-\documentclass[zihao = -4]{ctexart}
+\documentclass[UTF8, zihao = -4]{ctexart}
 \usepackage{calc, geometry, graphicx}
 \usepackage[defaultsups]{newtxtext}
 \usepackage[cmintegrals, varg]{newtxmath}
 \pagestyle{empty}
 \newlength{\colpad}
-\newcommand{\colwidth}{\ccwd}
+\newcommand{\colwidth}{0.99\ccwd}
 
 % 设定论文纸尺寸。
 \geometry{paperwidth = 460mm, paperheight = 297mm, margin = 0cm}
diff --git a/macros/latex/contrib/pkuthss/doc/example/thesis.tex b/macros/latex/contrib/pkuthss/doc/example/thesis.tex
index 30e05dec55..9c5f042cb4 100644
--- a/macros/latex/contrib/pkuthss/doc/example/thesis.tex
+++ b/macros/latex/contrib/pkuthss/doc/example/thesis.tex
@@ -1,5 +1,5 @@
 % Copyright (c) 2008-2009 solvethis
-% Copyright (c) 2010-2016,2018 Casper Ti. Vector
+% Copyright (c) 2010-2016,2018-2019 Casper Ti. Vector
 % Public domain.
 %
 % 使用前请先仔细阅读 pkuthss 和 biblatex-caspervector 的文档，
@@ -9,12 +9,8 @@
 %   texdoc biblatex-caspervector
 % 调出。
 
-% 采用了自定义的（包括大小写不同于原文件的）字体文件名，
-% 并改动 ctex.cfg 等配置文件的用户请自行加入 nofonts 选项；
-% 其它用户不用加入 nofonts 选项，加入之后反而会产生错误。
 \documentclass[UTF8]{pkuthss}
 % 如果的确须要使脚注按页编号的话，可以去掉后面 footmisc 包的注释。
-% 注意：在启用此设定的情况下，可能要多编译一次以产生正确的脚注编号。
 %\usepackage[perpage]{footmisc}
 
 % 使用 biblatex 排版参考文献，并规定其格式（详见 biblatex-caspervector 的文档）。
diff --git a/macros/latex/contrib/pkuthss/doc/pkuthss.pdf b/macros/latex/contrib/pkuthss/doc/pkuthss.pdf
new file mode 100644
index 0000000000..e862048119
--- /dev/null
+++ b/macros/latex/contrib/pkuthss/doc/pkuthss.pdf
diff --git a/macros/latex/contrib/pkuthss/doc/readme.pdf b/macros/latex/contrib/pkuthss/doc/readme.pdf
deleted file mode 100644
index 54815bdc7e..0000000000
--- a/macros/latex/contrib/pkuthss/doc/readme.pdf
+++ /dev/null
diff --git a/macros/latex/contrib/pkuthss/doc/readme/ChangeLog.txt b/macros/latex/contrib/pkuthss/doc/readme/ChangeLog.txt
index f1f002704c..57eac504ca 100644
--- a/macros/latex/contrib/pkuthss/doc/readme/ChangeLog.txt
+++ b/macros/latex/contrib/pkuthss/doc/readme/ChangeLog.txt
@@ -1,3 +1,25 @@
+2019-11-15, v1.8.1
+
+	* Changes to example template:
+	- Migrate to latexmk (also for packaging).
+	- ctex-fontset-pkuthss.def: `[ simkai.ttf ]' etc is no longer supported.
+	- spine.tex: fix garbled characters and hbox warnings with pdflatex.
+
+	* Changes to package code:
+	- pkuthss.cls: work around the `\lvert already defined' error.
+	- pkuthss.cls: fix section title spacing below the page header.
+	- pkuthss.cls: adjust titlepage spacing.
+
+	* Changes to documentation:
+	- Synchronise with the current code.
+	- Use \mbox around \supercite by default.
+	- Improve verbatims.
+
+	* Misc:
+	- Completion of some previous commits.
+	- Migrate to Gitea, "for obvious reasons".
+	- Minor fixes and cosmetics.
+
 2018-07-02, v1.8.0
 
 	* Changes to example template:
diff --git a/macros/latex/contrib/pkuthss/doc/readme/Makefile b/macros/latex/contrib/pkuthss/doc/readme/Makefile
deleted file mode 100644
index 8835cd28e6..0000000000
--- a/macros/latex/contrib/pkuthss/doc/readme/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright (c) 2008-2009 solvethis
-# Copyright (c) 2010-2012,2014-2015,2018 Casper Ti. Vector
-# Public domain.
-
-JOB = pkuthss
-BIBTEX = biber -l zh__pinyin --output-safechars
-DVIPDF = dvipdfmx
-MAKE = make
-RM = rm -f
-
-ifndef LATEX
-	LATEX1 = latex
-	LATEX2 = xelatex
-else
-	LATEX1 = $(LATEX)
-	LATEX2 = $(LATEX)
-endif
-
-ifeq ($(LATEX), latex)
-	DODVIPDF = $(DVIPDF) $(JOB)
-endif
-
-doc:
-	$(LATEX1) $(JOB)
-	$(BIBTEX) $(JOB)
-	$(LATEX2) $(JOB)
-	$(LATEX2) $(JOB)
-	$(DODVIPDF)
-
-clean:
-	$(RM) $(JOB).aux $(JOB).bbl $(JOB).bcf $(JOB).blg $(JOB).dvi \
-		$(JOB).lof $(JOB).log $(JOB).lot $(JOB).run.xml $(JOB).toc \
-		$(JOB).out $(JOB).out.bak missfont.log texput.log chap/*.aux
-
-distclean: clean
-	$(RM) $(JOB).pdf
-
-# vim:ts=4:sw=4
diff --git a/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-chap1.tex b/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-chap1.tex
index 3eaa29114b..2e5152ece5 100644
--- a/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-chap1.tex
+++ b/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-chap1.tex
@@ -1,7 +1,7 @@
 % Documentation for pkuthss.
 %
 % Copyright (c) 2008-2009 solvethis
-% Copyright (c) 2010-2018 Casper Ti. Vector
+% Copyright (c) 2010-2019 Casper Ti. Vector
 %
 % This work may be distributed and/or modified under the conditions of the
 % LaTeX Project Public License, either version 1.3 of this license or (at
@@ -33,24 +33,23 @@
 \begin{itemize}
 	\item 一个基本的 \hologo{TeX} 发行版。
 	\item CJK 或 XeCJK（供 \hologo{XeLaTeX} 使用）宏包。
-	\item ctex\supercite{ctex} 宏包（提供了 ctexbook 文档类）。
+	\item ctex\cupercite{ctex} 宏包（提供了 ctexbook 文档类）。
 	\item 中文字体。
 	\item 如果要使用 biblatex 进行文献列表和引用的排版的话，
-		还需要 biblatex\supercite{biblatex} 宏包；
+		还需要 biblatex\cupercite{biblatex} 宏包；
 	\item 如果要对中文文献进行按汉语拼音的排序的话，
-		还需要 biber\supercite{biber} 程序。
+		还需要 biber\cupercite{biber} 程序。
 	\item 如果使用默认的文献列表和引用样式的话，还需要作者编写的 biblatex 样式
-		（biblatex-caspervector\supercite{biblatex-caspervector}），
+		（biblatex-caspervector\cupercite{biblatex-caspervector}），
 		此样式要求使用 biber 程序。
-	\item 如果须要使用 Makefile 来实现自动编译，还需要 Make 工具；
-		但如果使用由批处理实现的伪“Makefile”就不用了。
+	\item 如果须要使用 latexmk 来实现自动编译，还需要 latexmk 工具。
 \end{itemize}
 
 \myemph{最新}的\myemph{完全版} \hologo{TeX} Live 系统（\myemph{%
 	注：某些 Linux 发行版软件仓库中的 \hologo{TeX} Live 有问题，
 	建议使用独立安装版的 \hologo{TeX} Live%
 	\unemph{\footnote{\url{https://www.tug.org/texlive/}.}}。%
-}）都已经包含除中文字体和 Make 之外所有要求的项目。%
+}）都已经包含除中文字体之外所有要求的项目。%
 \myemph{%
 	为了获得最好的支持，
 	我们建议用户使用最新、完全版的 \hologo{TeX} 系统和各宏包。%
@@ -66,22 +65,16 @@
 	这些字体是 GB18030 字符集的，不存在上述问题。%
 }
 
-Linux 用户可以从软件源获得 GNU 的 make；
-其它类 UNIX 系统应该也会提供 make 工具，请参阅相应的文档以获得帮助。%
-Windows 用户可以从以下地址下载 Windows 下的 GNU make 工具：\\
-\hspace*{\parindent}%
-\url{http://gnuwin32.sourceforge.net/packages/make.htm}
-
 \section{模版文件}\label{sec:doc-dir}
 
 在正确安装 pkuthss 文档模版之后，在终端/命令提示符中执行
-\begin{Verbatim}[frame = single]
+\begin{Verbatim}
 texdoc pkuthss
 \end{Verbatim}
 所打开的 pdf 文件所在的同一目录中包含两个子目录和相应的两个 pdf 文件，
 其中 \verb|readme/| 为说明文档（即本文档）的源代码，%
 \verb|example/| 为文档模版的源代码，%
-\verb|readme.pdf| 和 \verb|example.pdf|
+\verb|pkuthss.pdf| 和 \verb|example.pdf|
 分别为说明文档和文档模版的 pdf 文件。
 
 \verb|example/| 目录下的源代码使用的是 UTF-8 编码，
@@ -98,44 +91,32 @@ texdoc pkuthss
 	因此 pkuthss 文档模版的作者建议用户使用支持 LF 换行的文本编辑器编辑文件。%
 }
 
-模版中的重要文件有：
+模版中的关键文件有：
 \begin{itemize}
-	\item \verb|Makefile|：
-		被 Make 工具调用的 Makefile，用于使编译工作自动化。
+	\item \verb|ctexopts.cfg|、\verb|ctex-fontset-pkuthss.def|：
+		比较常用的字体配置，适用于 2.0 及以后版本的
+		ctex\cupercite{ctex} 宏包。
+	\item \verb|latexmkrc|：
+		被 latexmk 工具读取的配置文件，用于使编译工作自动化。
 	\item \verb|Make.bat|：%
-		Windows 下的伪“Makefile”，用 Windows 批处理实现。
+		方便 Windows 用户使用的批处理文件，会调用 latexmk。
+	\item \verb|spine.tex|：书脊的源文件，具体用法请参考其中代码。
+	\item \verb|thesis.tex|：示例模版的主文件。
 
 	\item \verb|chap/|：目录，包含各章节内容：
 	\begin{itemize}
-		\item \verb|copyright.tex|：版权声明部分。
-		\item \verb|originauth.tex|：
-			原创性声明和使用授权说明部分\supercite{pku-originauth}。
+		\item \verb|copy.tex|：版权声明部分。
+		\item \verb|origin.tex|：
+			原创性声明和使用授权说明部分\cupercite{pku-originauth}。
 	\end{itemize}
 	\myemph{%
-		注：pkuthss 文档模版支持排版学校要求的二维码，
-		请参考 \texttt{copyright.tex} 和
-		\texttt{originauth.tex} 中的相关注释。%
+		注：pkuthss 文档模版可排版学校要求的二维码，
+		请参考 \texttt{copy.tex} 和 \texttt{origin.tex} 中的相关注释。%
 	}
-
-	\item \verb|misc/|：
-		目录，目前包含比较常用的字体配置：
-	\begin{itemize}
-		\item \verb|ctexopts.cfg|、\verb|ctex-fontset-pkuthss.def|：
-			适用于 2.0 及以后版本的 ctex\supercite{ctex} 宏包。
-		\item \verb|ctex-xecjk-windows.def|：
-			适用于 2.0 以前版本的 ctex 宏包。
-	\end{itemize}
-	使用时，
-	请将和用户系统中 ctex 宏包版本相匹配的\myemph{所有}配置文件
-	复制到模版的主目录中。
 \end{itemize}
 
 \section{编译方式}\label{sec:compile}
 
-首次编译前，请将 \verb|misc/| 目录中和用户系统中
-ctex 宏包版本相匹配的配置文件复制到模版的主目录中，
-详见第 \ref{sec:doc-dir} 节。
-
 pkuthss 文档模版支持三种编译方式，即
 \begin{itemize}
 	\item \hologo{LaTeX} -- dvipdfmx 方式：\\
@@ -149,42 +130,36 @@ pkuthss 文档模版支持三种编译方式，即
 		\verb|xelatex| 和 \verb|xelatex|。
 \end{itemize}
 \myemph{%
-	注意：\hologo{XeLaTeX} 对非 UTF-8 编码的支持不好，
+	注意：在特定情形下，\texttt{latex}/\texttt{pdflatex}/\texttt{xelatex}
+	步骤可能须要执行多于 2 次，而下文推荐的 latexmk 工具会自动处理这类情形。
+	此外，\hologo{XeLaTeX} 对非 UTF-8 编码的支持不好，
 	因此 \hologo{XeLaTeX} 方式的编译不支持 GBK 编码。%
 }
 
-pkuthss 文档模版附带的 Makefile 中已经对这三种编译方式进行了完整的配置。
-用户只须要在 Makefile 中通过设定变量 \verb|JOB| 的值指定被编译的主文件名，
-并通过设定变量 \verb|LATEX| 的值指定采用哪种编译方式，
-即可通过在主文件所在目录调用 Make 工具来实现自动编译：
-如果是在类 UNIX 环境下，则用户应该调用的命令名为 \verb|make|：
-\begin{Verbatim}[frame = single]
+pkuthss 文档模版附带的 \verb|latexmkrc| 中已经对这三种编译方式进行了完整的
+配置。用户只须要在 \verb|latexmkrc| 中通过设定变量 \verb|default_files|
+的值指定被编译的主文件名，并通过设定变量 \verb|pdf_mode| 的值指定采用
+哪种编译方式，即可通过在主文件所在目录调用 latexmk 工具来实现自动编译：
+类 UNIX 环境下大致如下
+\begin{Verbatim}
 cd /path/to/directory/with/thesis.tex
-make
+latexmk
 \end{Verbatim}
-而如果是在 Windows 环境下，则用户应该调用的命令名可能为 \verb|mingw32-make|：
-\begin{Verbatim}[frame = single]
+而在 Windows 环境下大致如下
+\begin{Verbatim}
 cd \path\to\directory\with\thesis.tex
-mingw32-make
+latexmk
 \end{Verbatim}
 
-用户如果不想配置 Windows 下的 GNU Make，
-则也可以使用由 Windows 批处理实现的伪“Makefile”，
-通过在主文件所在目录调用 \verb|make|\footnote{%
-	Windows 将批处理文件作为可执行文件，调用时可以不显式地指出扩展名。%
-}：
-\begin{Verbatim}[frame = single]
-cd \path\to\directory\with\thesis.tex
-make
-\end{Verbatim}
-\myemph{%
+Windows 用户也可以使用批处理文件 \verb|Make.bat|：
+在主文件所在目录双击此文件，它便会调用 latexmk 进行编译。\myemph{%
 	注意：%
 	Windows 批处理对于 LF（\texttt{\string\n}）换行的批处理文件支持有问题。
 	在命令提示符（cmd）下执行这些批处理文件时没有问题，
 	但双击文件图标执行时可能就会出错。
 	\hologo{TeX} Live 中安装的 \texttt{Make.bat} 和
 	CTAN 上提供的压缩包里的 \texttt{Make.bat}
-	有可能是 LF（\texttt{\string\n}）换行的。%
+	在正常情况下应该是 CRLF（\texttt{\string\r\string\n}）换行的。%
 }
 
 % vim:ts=4:sw=4
diff --git a/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-chap2.tex b/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-chap2.tex
index 1ab1b3e9cd..4455b376b7 100644
--- a/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-chap2.tex
+++ b/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-chap2.tex
@@ -1,7 +1,7 @@
 % Documentation for pkuthss.
 %
 % Copyright (c) 2008-2009 solvethis
-% Copyright (c) 2010-2018 Casper Ti. Vector
+% Copyright (c) 2010-2019 Casper Ti. Vector
 %
 % This work may be distributed and/or modified under the conditions of the
 % LaTeX Project Public License, either version 1.3 of this license or (at
@@ -46,7 +46,7 @@
 		}。
 
 	\item \textbf{\texttt{[no]pkufont}}：
-		是否根据学校对论文格式的要求\mbox{\supercite{pku-thesisstyle}}%
+		是否根据学校对论文格式的要求\cupercite{pku-thesisstyle}%
 		将西文字体改为类似于 Times New Roman / Arial 的字体。
 
 	\item \textbf{\texttt{[no]pkufoot}}\footnote{%
@@ -54,7 +54,7 @@
 			\texttt{[no]footfmt} 选项；
 			更改名称是为了使文档类选项名更加规则。%
 		}：
-		是否根据学校对论文格式的要求\mbox{\supercite{pku-thesisstyle}}%
+		是否根据学校对论文格式的要求\cupercite{pku-thesisstyle}%
 		修改和脚注相关的一些格式。
 		具体地说，启用 \verb|pkufoot| 选项后会进行以下几项设置：
 	\begin{itemize}
@@ -64,7 +64,7 @@
 	\end{itemize}
 
 	\item \textbf{\texttt{[no]pkuspace}}：
-		是否根据学校对论文格式的要求\mbox{\supercite{pku-thesisstyle}}%
+		是否根据学校对论文格式的要求\cupercite{pku-thesisstyle}%
 		修改排版中的一些间距及相关设置。
 		具体地说，启用 \verb|pkuspace| 选项后会按
 		\parencite{pku-thesisstyle} 中的要求修改以下几项设置：
@@ -89,8 +89,6 @@
 		是否采用一些常用的调整间距的额外版式设定。
 		具体地说，启用 \verb|spacing| 选项后会进行以下几项设置：
 	\begin{itemize}
-		\item 自动忽略 CJK 文字之间的空白而
-			保留（CJK 文字与西文之间等的）其它空白。
 		\item 调用 setspace 宏包以使某些细节处的空间安排更美观。
 		\item 采用比 \hologo{LaTeX} 默认设定更加紧密的枚举环境%
 			\footnote{%
@@ -100,6 +98,7 @@
 				启用 \texttt{spacing} 选项后，
 				将去掉这些环境中额外增加的（垂直）间隔。%
 			}。
+		\item 调整枚举环境的缩进，以适应中文排版中的习惯。
 	\end{itemize}
 
 	\item \textbf{\texttt{[no]spechap}}\footnote{%
@@ -139,13 +138,13 @@
 
 例如，如果须要使用 UTF-8 编码撰写论文，
 则应在载入 pkuthss 文档类时加上 \verb|UTF8| 选项：
-\begin{Verbatim}[frame = single]
+\begin{Verbatim}
 \documentclass[UTF8, ...]{pkuthss} % “...”代表其它的选项。
 \end{Verbatim}
 
 又例如，文档默认情况下是双面模式，每章都从右页（奇数页）开始。
 如果希望改成一章可以从任意页开始，可以这样设置：
-\begin{Verbatim}[frame = single]
+\begin{Verbatim}
 \documentclass[openany, ...]{pkuthss} % 每章从任意页开始。
 \end{Verbatim}
 
@@ -153,7 +152,7 @@
 \subsection{设定文档信息的命令}
 
 这一类命令的语法为
-\begin{Verbatim}[frame = single]
+\begin{Verbatim}
 \commandname{具体信息} % commandname 为具体命令的名称。
 \end{Verbatim}
 
@@ -176,7 +175,7 @@
 \end{itemize}
 
 例如，如果要设定专业为“化学”（“Chemistry”），则可以使用以下命令：
-\begin{Verbatim}[frame = single]
+\begin{Verbatim}
 \cmajor{化学}
 \emajor{Chemistry}
 \end{Verbatim}
@@ -184,7 +183,7 @@
 \subsection{自身存储文档信息的命令}
 
 这一类命令的语法为
-\begin{Verbatim}[frame = single]
+\begin{Verbatim}
 % commandname 为具体的命令名。
 \renewcommand{\commandname}{具体信息}
 \end{Verbatim}
@@ -202,7 +201,7 @@
 例如，
 如果要设定论文的类别为“本科生毕业论文”（“Undergraduate Thesis”），
 则可以使用以下命令：
-\begin{Verbatim}[frame = single]
+\begin{Verbatim}
 \renewcommand{\cthesisname}{本科生毕业论文}
 \renewcommand{\ethesisname}{Undergraduate Thesis}
 \end{Verbatim}
@@ -210,7 +209,7 @@
 \subsection{以“key = value”格式设置文档信息}
 
 用户可以通过 \verb|\pkuthssinfo| 命令集中设定文档信息，其语法为：
-\begin{Verbatim}[frame = single]
+\begin{Verbatim}
 % key1、key2、value1、value2 等为具体文档信息的项目名和内容。
 \pkuthssinfo{key1 = value1, key2 = value2, ...}
 \end{Verbatim}
@@ -224,7 +223,7 @@
 }
 
 例如，前面提到的文档信息的设置可以集中地写成：
-\begin{Verbatim}[frame = single, tabsize = 4]
+\begin{Verbatim}
 \pkuthssinfo{
 	..., % “...”代表其它的设定。
 	cthesisname = {本科生毕业论文},
@@ -260,46 +259,46 @@
 
 \section{从其它文档类和宏包继承的功能}\label{sec:thirdparty}
 
-pkuthss 文档类建立在 ctexbook\supercite{ctex} 文档类之上，
-并调用了 geometry\supercite{geometry}、fancyhdr\supercite{fancyhdr}、%
-hyperref\supercite{hyperref}、graphicx\supercite{graphicx}
-和 ulem\supercite{ulem} 等几个宏包。
+pkuthss 文档类建立在 ctexbook\cupercite{ctex} 文档类之上，
+并调用了 geometry\cupercite{geometry}、fancyhdr\cupercite{fancyhdr}、%
+hyperref\cupercite{hyperref}、graphicx\cupercite{graphicx}
+和 ulem\cupercite{ulem} 等几个宏包。
 因此，ctexbook 文档类和这些宏包所提供的功能均可以使用。
 
 例如，用户如果想将目录的标题改为“目{\quad\quad}录”，
 则可以使用 ctexbook 文档类提供的 \verb|\ctexset| 命令：
-\begin{Verbatim}[frame = single]
+\begin{Verbatim}
 \ctexset[contentsname = {目{\quad\quad}录}]
 \end{Verbatim}
 
 在默认的配置下，%
-pkuthss 文档模版使用作者编写的 biblatex\supercite{biblatex} 样式%
-\mbox{\supercite{biblatex-caspervector}}进行参考文献和引用的排版，
+pkuthss 文档模版使用作者编写的 biblatex\cupercite{biblatex} 样式%
+\cupercite{biblatex-caspervector}进行参考文献和引用的排版，
 用户可以使用它以及 biblatex 本身所提供的功能。
 例如，用户可以分别使用 \verb|\cite|、\verb|\parencite| 和 \verb|\supercite|
 生成未格式化的、带方括号的和上标且带方括号的引用标记：
-\begin{Verbatim}[frame = single]
+\begin{Verbatim}
 \cite{ctex}，\parencite{ctex}，\supercite{ctex}
 \end{Verbatim}
 在本文中将产生“\cite{ctex}，\parencite{ctex}，\supercite{ctex}”。
 
-就目前而言，在\myemph{除 3.0--3.3 之外版本的} biblatex 中，
-通过更复杂的设置，还可以满足例如被引用的文献按照引用顺序排序，
+就目前而言，在 biblatex 中，通过更复杂的设置，
+还可以满足例如被引用的文献按照引用顺序排序，
 而未引用的文献按照西文文献在前、中文文献在后排序这样的需求，
-详见 biblatex-caspervector 的文档\supercite{biblatex-caspervector}。
+详见 biblatex-caspervector 的文档\cupercite{biblatex-caspervector}。
 
 除此之外，pkuthss 文档类还可能调用以下这些宏包：
 \begin{itemize}
 	\item 启用 \verb|pkufont| 选项时会调用
-		newtxtext 和 newtxmath\supercite{newtx} 宏包，
-		否则会调用 latexsym\supercite{latexsym} 宏包。
+		newtxtext 和 newtxmath\cupercite{newtx} 宏包，
+		否则会调用 latexsym\cupercite{latexsym} 宏包。
 	\item 启用 \verb|pkufoot| 选项时会调用
-		tikz\supercite{tikz} 和 scrextend\supercite{scrextend} 宏包。
+		tikz\cupercite{tikz} 和 scrextend\cupercite{scrextend} 宏包。
 	\item 启用 \verb|pkuspace| 选项时会调用
-		tocloft\supercite{tocloft}、caption\supercite{caption} 和
-		subcaption\supercite{subcaption} 宏包。
+		tocloft\cupercite{tocloft}、caption\cupercite{caption} 和
+		subcaption\cupercite{subcaption} 宏包。
 	\item 启用 \verb|spacing| 选项时会调用 setspace 和
-		enumitem\supercite{enumitem} 宏包。
+		enumitem\cupercite{enumitem} 宏包。
 \end{itemize}
 因此在启用相应选项时，用户可以使用对应宏包所提供的功能。
 
@@ -311,7 +310,7 @@ pkuthss 文档模版的实现是简洁、清晰、灵活的。
 通过修改 pkuthss 文档类的源文件进行自定义。
 在目前常用的 \hologo{TeX} 系统中，
 假设 pkuthss 的说明文档所在目录具有下述形式的路径：
-\begin{Verbatim}[frame = single]
+\begin{Verbatim}
 # 说明文档所在目录（$TEXMFDIST 的形式见下面几行）：
 $TEXMFDIST/doc/latex/pkuthss/
 # 若用户使用 Windows 下的 TeX Live 系统，则 $TEXMFDIST 一般类似于：
@@ -320,7 +319,7 @@ C:\texlive\2015\texmf-dist
 /usr/local/texlive/2015/texmf-dist
 \end{Verbatim}
 则其源文件所在目录应该位于以下目录：
-\begin{Verbatim}[frame = single]
+\begin{Verbatim}
 $TEXMFDIST/tex/latex/pkuthss/
 \end{Verbatim}
 
@@ -340,16 +339,16 @@ $TEXMFDIST/tex/latex/pkuthss/
 此时，用户可以修改 \verb|pkuthss.cls| 里 \verb|\maketitle| 定义中
 \verb|\thss@int@fillinblank| 宏的参数来改变
 带下划线的空白的行数和行宽，其语法为：
-\begin{Verbatim}[frame = single]
+\begin{Verbatim}
 \thss@int@fillinblank{行数}{行宽}{内容}
 \end{Verbatim}
 例如，如果“研究方向”一栏需要两行的空白，
 可以将 \verb|pkuthss.cls| 里的
-\begin{Verbatim}[frame = single]
+\begin{Verbatim}
 \thss@int@fillinblank{1}{\thss@tmp@len}{\kaishu\@direction}
 \end{Verbatim}
 改为
-\begin{Verbatim}[frame = single]
+\begin{Verbatim}
 \thss@int@fillinblank{2}{\thss@tmp@len}{\kaishu\@direction}
 \end{Verbatim}
 当然，为了美观，可以将多于一行的部分移到封面中作者信息部分的最下方。
diff --git a/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-chap3.tex b/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-chap3.tex
index bde028dd98..77de4b0461 100644
--- a/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-chap3.tex
+++ b/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-chap3.tex
@@ -1,7 +1,7 @@
 % Documentation for pkuthss.
 %
 % Copyright (c) 2008-2009 solvethis
-% Copyright (c) 2010-2018 Casper Ti. Vector
+% Copyright (c) 2010-2019 Casper Ti. Vector
 %
 % This work may be distributed and/or modified under the conditions of the
 % LaTeX Project Public License, either version 1.3 of this license or (at
@@ -46,7 +46,7 @@
 可能引起一些问题，详见第 \ref{sec:req} 节。
 
 Windows 批处理对于 LF（\texttt{\string\n}）换行的批处理文件支持有问题，
-解决方式见第 \ref{sec:compile} 节。
+诊断方式见第 \ref{sec:compile} 节。
 Windows 的“记事本”程序在查看 LF（\texttt{\string\n}）
 换行的文本文件时存在着一些问题，
 因此建议用户使用支持 LF 换行的文本编辑器编辑文件，
@@ -54,41 +54,22 @@ Windows 的“记事本”程序在查看 LF（\texttt{\string\n}）
 
 \section{上游宏包可能引起的问题}
 
-biblatex\supercite{biblatex} 宏包会自行设定 \verb|\bibname|，
+biblatex\cupercite{biblatex} 宏包会自行设定 \verb|\bibname|，
 故会覆盖通过 \verb|\ctexset| 设定的参考文献列表标题。
 使用 biblatex 的用户可以使用 \verb|\printbibliography| 的
 \verb|title| 选项来手动设定参考文献列表的标题，例如：
-\begin{Verbatim}[frame = single]
+\begin{Verbatim}
 \printbibliography[title = {文献}, ...] % “...”为其它选项。
 \end{Verbatim}
 
-hyperref\supercite{hyperref} 宏包和一些宏包可能发生冲突。
+hyperref\cupercite{hyperref} 宏包和一些宏包可能发生冲突。
 关于如何避免这些冲突，
 可以参考 hyperref 宏包 README 文件中的“Package Compatibility”一节。
 此文件通常和执行 \verb|texdoc hyperref|
 时打开的 pdf 文件位于同一目录中。
 
-使用 \hologo{XeLaTeX} 的用户可能在已经安装字体的情况下遇到形如（其中
-\verb|xxxxxxxx| 为具体字体名）
-\begin{Verbatim}[frame = single, fontsize = {\small}]
-! fontspec error: "font-not-found"
-! The font "xxxxxxxx" cannot be found.
-! See the fontspec documentation for further information.
-! For immediate help type H <return>.
-\end{Verbatim}
-的错误。
-这种错误一般是（主要是非 Windows 平台的）用户采用了自定义的
-（包括大小写不同于原文件的）字体文件名，
-并改动 \verb|ctex.cfg| 等配置文件之后没有在调用
-pkuthss 文档类时加入 \verb|nofonts| 选项，
-又使用 \verb|xelatex| 编译造成的，使用
-\begin{Verbatim}[frame = single]
-\documentclass[nofonts, ...]{pkuthss} % “...”代表其它的选项。
-\end{Verbatim}
-即可解决此问题。
-
 biber 运行时有一定概率出现形如（目录名可能稍有不同）
-\begin{Verbatim}[frame = single, fontsize = {\small}]
+\begin{Verbatim}
 data source .../par-xxxxxxxx/cache-xxxxxxxx/
 	inc/lib/Biber/LaTeX/recode_data.xml not found in .
 \end{Verbatim}
@@ -98,25 +79,29 @@ data source .../par-xxxxxxxx/cache-xxxxxxxx/
 遇到这种情况时，删除掉上述临时目录及其所有内容，
 再重新运行 biber 通常便可解决问题。
 
-caption\supercite{caption} 宏包对于其不认识的宏包均会提示
-\begin{Verbatim}[frame = single, fontsize = {\small}]
-Package caption Warning: Unsupported document class (or package) detected,
-(caption)                usage of the caption package is not recommended.
-See the caption package documentation for explanation.
+就目前而言，amsthm\cupercite{amsthm} 宏包在后于 newtxmath\cupercite{newtx}
+宏包被调用时会导致以下的错误：
+\begin{Verbatim}
+! LaTeX Error: Command \openbox already defined.
+               Or name \end... illegal, see p.192 of the manual.
+\end{Verbatim}
+解决此问题的最简单方法是在通过
+\begin{Verbatim}
+\usepackage{amsthm}
+\end{Verbatim}
+调用 amsthm 宏包之前加入以下命令：
+\begin{Verbatim}
+\let\openbox\relax
 \end{Verbatim}
-pkuthss 文档模版基于 ctexbook 文档类，而后者基于标准的 book 文档类，
-因此这个警告并不影响用户正常使用\footnote{%
-	\url{http://bbs.ctex.org/forum.php?mod=redirect&goto=findpost&ptid=63117&pid=402145}.%
-}。
 
 \section{文档格式可能存在的问题}
 
-学校对学位论文格式的规定\mbox{\supercite{pku-thesisstyle}}%
+学校对学位论文格式的规定\cupercite{pku-thesisstyle}%
 显然没有考虑到非 MS Word 类排版工具的工作方式，
 因此 pkuthss 文档模版只是对其要求的格式进行模仿，
 而在一些小的细节上可能有所出入。
 
-biblatex-caspervector\supercite{biblatex-caspervector} 所实现的格式和
+biblatex-caspervector\cupercite{biblatex-caspervector} 所实现的格式和
 \parencite{pku-thesisstyle} 的规定并不一致，
 但其作者暂时没有精力也不愿意去实现后者所规定的比原格式更丑陋得多的格式。
 
@@ -124,7 +109,7 @@ biblatex-caspervector\supercite{biblatex-caspervector} 所实现的格式和
 
 关于 pkuthss 文档模版的意见和建议，
 请在北大未名 BBS 的 MathTools 版或 pkuthss 项目主页的 issue tracker%
-\footnote{\url{https://gitlab.com/CasperVector/pkuthss/issues}.}%
+\footnote{\url{https://gitea.com/CasperVector/pkuthss/issues}.}%
 上提出，
 或通过电子邮件\footnote%
 {\href{mailto:CasperVector@gmail.com}{\texttt{CasperVector@gmail.com}}.}%
diff --git a/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-copy.tex b/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-copy.tex
index 74b2cc186a..736ee4c298 100644
--- a/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-copy.tex
+++ b/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-copy.tex
@@ -31,14 +31,14 @@
 
 版权所有 \copyright\ 2008--2009 solvethis
 \par
-版权所有 \copyright\ 2010--2017 Casper Ti. Vector
+版权所有 \copyright\ 2010--2019 Casper Ti. Vector
 \vskip 1em
 
 pkuthss 文档类及其说明文档均以 \hologo{LaTeX} Project Public License 发布。
 随 pkuthss 提供的模版源代码中，除以下文件
 \begin{itemize}
-	\item \verb|chap/copyright.tex|
-	\item \verb|chap/originauth.tex|
+	\item \verb|chap/copy.tex|
+	\item \verb|chap/origin.tex|
 \end{itemize}
 以 New BSD License 发布，
 以及参考文献和引用列表使用的样式文件版权声明见相应文件中说明以外，
diff --git a/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-encl1.tex b/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-encl1.tex
index 30c397b6e1..f87f67472f 100644
--- a/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-encl1.tex
+++ b/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-encl1.tex
@@ -30,14 +30,10 @@
 \raggedbottom
 
 \section{1.3 版以后的更新记录}
-\VerbatimInput[
-	tabsize = 4, fontsize = {\small}, baselinestretch = 1
-]{ChangeLog.txt}
+\VerbatimInput{ChangeLog.txt}
 
 \section{1.3 及其以前版本的更新记录}
-\VerbatimInput[
-	tabsize = 4, fontsize = {\small}, baselinestretch = 1.1
-]{ChangeLog-upto-1.3.txt}
+\VerbatimInput[baselinestretch = 1.1]{ChangeLog-upto-1.3.txt}
 
 \flushbottom
 
diff --git a/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-intro.tex b/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-intro.tex
index db16f7776b..c5485c2a3f 100644
--- a/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-intro.tex
+++ b/macros/latex/contrib/pkuthss/doc/readme/chap/pkuthss-intro.tex
@@ -1,7 +1,7 @@
 % Documentation for pkuthss.
 %
 % Copyright (c) 2008-2009 solvethis
-% Copyright (c) 2010-2012,2014-2015,2018 Casper Ti. Vector
+% Copyright (c) 2010-2012,2014-2015,2018-2019 Casper Ti. Vector
 %
 % This work may be distributed and/or modified under the conditions of the
 % LaTeX Project Public License, either version 1.3 of this license or (at
@@ -33,7 +33,7 @@
 pkuthss 文档模版由三部分构成：
 \begin{itemize}
 	\item \textbf{pkuthss 文档类}：
-		其中根据学校的格式规范\mbox{\supercite{pku-thesisstyle}}%
+		其中根据学校的格式规范\cupercite{pku-thesisstyle}%
 		实现了学位论文所需的基本格式要求，
 		主要包括对排版格式的设定和提供设置论文信息的命令；
 		此外也实现了学位论文中用户可能较多用到的一些额外功能，
@@ -43,7 +43,7 @@ pkuthss 文档模版由三部分构成：
 		说明文档即本文档，
 		在安装（见第 \ref{sec:req} 节）之后应该可以用 \hologo{TeX} 系统提供的
 		\verb|texdoc| 命令调出：
-\begin{Verbatim}[frame = single]
+\begin{Verbatim}
 texdoc pkuthss
 \end{Verbatim}
 	\item \textbf{论文模版}：
@@ -52,16 +52,16 @@ texdoc pkuthss
 		用户只须按照模版中的框架修改代码，即可写出自己的论文。
 \end{itemize}
 
-在此之前，包括 dypang\supercite{dypang}、FerretL\supercite{FerretL}、%
-lwolf\supercite{lwolf}、Langpku\supercite{Langpku}、%
-solvethis\supercite{solvethis} 等的数位网友均做过学位论文模版的工作。
+在此之前，包括 dypang\cupercite{dypang}、FerretL\cupercite{FerretL}、%
+lwolf\cupercite{lwolf}、Langpku\cupercite{Langpku}、%
+solvethis\cupercite{solvethis} 等的数位网友均做过学位论文模版的工作。
 本论文模版是 solvethis 的 pkuthss 模版的更新版本，
 更新的重点是重构和对新文档类、宏包的支持。
 
 pkuthss 文档模版现在的维护者是 Casper Ti. Vector\footnote%
 {\href{mailto:CasperVector@gmail.com}{\texttt{CasperVector@gmail.com}}.}。%
-pkuthss 文档模版目前托管在 GitLab 上，
+pkuthss 文档模版目前托管在 Gitea 上，
 其项目主页是：\\
-\hspace*{\parindent}\url{https://gitlab.com/CasperVector/pkuthss}
+\hspace*{\parindent}\url{https://gitea.com/CasperVector/pkuthss}
 
 % vim:ts=4:sw=4
diff --git a/macros/latex/contrib/pkuthss/doc/readme/latexmkrc b/macros/latex/contrib/pkuthss/doc/readme/latexmkrc
new file mode 100644
index 0000000000..0f25b84f67
--- /dev/null
+++ b/macros/latex/contrib/pkuthss/doc/readme/latexmkrc
@@ -0,0 +1,10 @@
+# Copyright (c) 2019 Casper Ti. Vector
+# Public domain.
+
+@default_files = ('pkuthss');
+$pdf_mode = 5;
+$dvipdf = "dvipdfmx %O -o %D %S";
+$bibtex_use = 1.5;
+$biber = "biber -l zh__pinyin --output-safechars %O %S";
+$clean_ext = "run.xml";
+
diff --git a/macros/latex/contrib/pkuthss/doc/readme/pkuthss-english.patch b/macros/latex/contrib/pkuthss/doc/readme/pkuthss-english.patch
index a4c13c0357..67174bdfbc 100644
--- a/macros/latex/contrib/pkuthss/doc/readme/pkuthss-english.patch
+++ b/macros/latex/contrib/pkuthss/doc/readme/pkuthss-english.patch
@@ -1,12 +1,12 @@
 diff --git a/doc/example/chap/abs.tex b/doc/example/chap/abs.tex
-index b930654..cfa6cd3 100644
+index 305792f..cfa6cd3 100644
 --- a/doc/example/chap/abs.tex
 +++ b/doc/example/chap/abs.tex
 @@ -2,7 +2,7 @@
  % Public domain.
  
  \begin{cabstract}
--	\pkuthssffaq % 中文测试文字
+-	\pkuthssffaq % 中文测试文字。
 +	中文摘要。
  \end{cabstract}
  
@@ -100,13 +100,14 @@ index ac5b0c9..9d2ad60 100644
 -
  % vim:ts=4:sw=4
 diff --git a/doc/example/thesis.tex b/doc/example/thesis.tex
-index d7a575f..baed091 100644
+index 30e05de..4d6ee53 100644
 --- a/doc/example/thesis.tex
 +++ b/doc/example/thesis.tex
-@@ -14,53 +14,44 @@
- % 其它用户不用加入 nofonts 选项，加入之后反而会产生错误。
- \documentclass[UTF8]{pkuthss}
- 
+@@ -16,54 +16,44 @@
+ % 如果的确须要使脚注按页编号的话，可以去掉后面 footmisc 包的注释。
+ % 注意：在启用此设定的情况下，可能要多编译一次以产生正确的脚注编号。
+ %\usepackage[perpage]{footmisc}
+-
 -% 使用 biblatex 排版参考文献，并规定其格式（详见 biblatex-caspervector 的文档）。
 -% 这里按照西文文献在前，中文文献在后排序（“sorting = ecnyt”）；
 -% 若须按照中文文献在前，西文文献在后排序，请设置“sorting = cenyt”；
@@ -116,10 +117,10 @@ index d7a575f..baed091 100644
 +% 使用 biblatex 排版参考文献，并规定其格式（详见 biblatex 的文档）。
 +\usepackage[backend = biber]{biblatex}
  
- % 按学校要求设定参考文献列表中的条目之内及之间的距离。
- \setlength{\bibitemsep}{3bp}
  % 对于 linespread 值的计算过程有兴趣的同学可以参考 pkuthss.cls。
  \renewcommand*{\bibfont}{\zihao{5}\linespread{1.27}\selectfont}
+ % 按学校要求设定参考文献列表的段间距。
+ \setlength{\bibitemsep}{3bp}
  
 +\ctexset{
 +	contentsname = {Contents},
@@ -180,21 +181,12 @@ index d7a575f..baed091 100644
  \begin{document}
  	% 以下为正文之前的部分，默认不进行章节编号。
  	\frontmatter
-@@ -94,7 +85,7 @@
- 	\appendix
- 	% 排版参考文献列表。bibintoc 选项使“参考文献”出现在目录中；
- 	% 如果同时要使参考文献列表参与章节编号，可将“bibintoc”改为“bibnumbered”。
--	\printbibliography[heading = bibintoc]
-+	\printbibliography[heading = bibintoc, title = Reference]
- 	% 各附录。
- 	\include{chap/encl1}
- 
 diff --git a/tex/pkuthss-utf8.def b/tex/pkuthss-utf8.def
-index c2c951b..d453918 100644
+index b699685..e4e58b6 100644
 --- a/tex/pkuthss-utf8.def
 +++ b/tex/pkuthss-utf8.def
 @@ -25,13 +25,13 @@
- 	[2017/03/01 v1.7.4 Labels and captions in UTF-8 encoding
+ 	[2018/07/02 v1.8.0 Labels and captions in UTF-8 encoding
  		for the pkuthss document class]
  
 -\def\label@ctitle{题目：}
@@ -215,10 +207,10 @@ index c2c951b..d453918 100644
  \def\label@ckeywords{关键词：}
  \def\label@ekeywords{KEYWORDS:\ }
 diff --git a/tex/pkuthss.cls b/tex/pkuthss.cls
-index 6208799..a785d69 100644
+index 9e68dc3..4b8cb00 100644
 --- a/tex/pkuthss.cls
 +++ b/tex/pkuthss.cls
-@@ -300,7 +300,7 @@
+@@ -301,7 +301,7 @@
  	\fancyhf{}\renewcommand*{\headrulewidth}{0.75bp}
  	\fancyfoot[C]{\zihao{5}\normalfont{\thepage}}
  	\if@twoside
@@ -227,49 +219,49 @@ index 6208799..a785d69 100644
  		\fancyhead[CO]{\zihao{5}\normalfont\thss@int@setcase{\leftmark}}
  	\else
  		\fancyhead[C]{\zihao{5}\normalfont\thss@int@setcase{\leftmark}}
-@@ -349,13 +349,13 @@
- 				\zihao{1}%
- 				\includegraphics[height = 2.4em]{pkulogo}\hspace{0.4em}%
- 				\raisebox{0.4em}{\includegraphics[height = 1.6em]{pkuword}}\\[0.8em]
--				{\bfseries{\cthesisname}}%
-+				{\bfseries{\ethesisname}}%
- 			}
- 			\vfill
- 			% Title of the thesis.
- 			{%
- 				\zihao{2}{\label@ctitle}%
--				\thss@int@fillinblank{2}{0.64\textwidth}{\textbf{\@ctitle}}%
-+				\thss@int@fillinblank{2}{0.64\textwidth}{\textbf{\@etitle}}%
- 			}
- 			\vfill
- 			% Information about the author.
-@@ -363,19 +363,19 @@
- 				% Slightly adjust the line skip when using new font size.
- 				\zihao{3}\linespread{1.75}\selectfont
- 				\def\thss@tmp@len{0.56\textwidth}
--				\begin{tabular}{l@{\extracolsep{0.2em}}c}
--					{\bfseries\label@cauthor}		&
--					\thss@int@fillinblank{1}{\thss@tmp@len}{\fangsong\@cauthor}		\\
--					{\bfseries\label@studentid}	&
-+				\begin{tabular}{c@{\extracolsep{0.2em}}c@{\extracolsep{0.2em}}c}
-+					{\bfseries\label@cauthor}		&	: &
-+					\thss@int@fillinblank{1}{\thss@tmp@len}{\fangsong\@eauthor}		\\
-+					{\bfseries\label@studentid}	&	:	&
- 					\thss@int@fillinblank{1}{\thss@tmp@len}{\fangsong\@studentid}	\\
--					{\bfseries\label@school}		&
-+					{\bfseries\label@school}		&	:	&
- 					\thss@int@fillinblank{1}{\thss@tmp@len}{\fangsong\@school}		\\
--					{\bfseries\label@cmajor}		&
--					\thss@int@fillinblank{1}{\thss@tmp@len}{\fangsong\@cmajor}		\\
--					{\bfseries\label@direction}	&
-+					{\bfseries\label@cmajor}		&	:	&
-+					\thss@int@fillinblank{1}{\thss@tmp@len}{\fangsong\@emajor}		\\
-+					{\bfseries\label@direction}	&	:	&
- 					\thss@int@fillinblank{1}{\thss@tmp@len}{\fangsong\@direction}	\\
--					{\bfseries\label@cmentor}		&
--					\thss@int@fillinblank{1}{\thss@tmp@len}{\fangsong\@cmentor}		\\
-+					{\bfseries\label@cmentor}		&	:	&
-+					\thss@int@fillinblank{1}{\thss@tmp@len}{\fangsong\@ementor}		\\
- 				\end{tabular}%
- 			}
- 			\vfill
+@@ -347,13 +347,13 @@
+ 			\zihao{1}%
+ 			\includegraphics[height = 2.4em]{pkulogo}\hspace{0.4em}%
+ 			\raisebox{0.4em}{\includegraphics[height = 1.6em]{pkuword}}\\[0.8em]
+-			{\bfseries{\cthesisname}}%
++			{\bfseries{\ethesisname}}%
+ 		}
+ 		\vfill
+ 		% Title of the thesis.
+ 		{%
+ 			\zihao{2}{\label@ctitle}\linespread{1.6}\selectfont%
+-			\thss@int@fillinblank{2}{0.64\textwidth}{\textbf{\@ctitle}}%
++			\thss@int@fillinblank{2}{0.64\textwidth}{\textbf{\@etitle}}%
+ 		}
+ 		\vfill
+ 		% Information about the author.
+@@ -361,19 +361,19 @@
+ 			% Slightly adjust the line skip when using new font size.
+ 			\zihao{3}\linespread{1.75}\selectfont
+ 			\def\thss@tmp@len{0.56\textwidth}
+-			\begin{tabular}{l@{\extracolsep{0.2em}}c}
+-				{\bfseries\label@cauthor}		&
+-				\thss@int@fillinblank{1}{\thss@tmp@len}{\fangsong\@cauthor}		\\
+-				{\bfseries\label@studentid}	&
++			\begin{tabular}{c@{\extracolsep{0.2em}}c@{\extracolsep{0.2em}}c}
++				{\bfseries\label@cauthor}		&	: &
++				\thss@int@fillinblank{1}{\thss@tmp@len}{\fangsong\@eauthor}		\\
++				{\bfseries\label@studentid}	&	:	&
+ 				\thss@int@fillinblank{1}{\thss@tmp@len}{\fangsong\@studentid}	\\
+-				{\bfseries\label@school}		&
++				{\bfseries\label@school}		&	:	&
+ 				\thss@int@fillinblank{1}{\thss@tmp@len}{\fangsong\@school}		\\
+-				{\bfseries\label@cmajor}		&
+-				\thss@int@fillinblank{1}{\thss@tmp@len}{\fangsong\@cmajor}		\\
+-				{\bfseries\label@direction}	&
++				{\bfseries\label@cmajor}		&	:	&
++				\thss@int@fillinblank{1}{\thss@tmp@len}{\fangsong\@emajor}		\\
++				{\bfseries\label@direction}	&	:	&
+ 				\thss@int@fillinblank{1}{\thss@tmp@len}{\fangsong\@direction}	\\
+-				{\bfseries\label@cmentor}		&
+-				\thss@int@fillinblank{1}{\thss@tmp@len}{\fangsong\@cmentor}		\\
++				{\bfseries\label@cmentor}		&	:	&
++				\thss@int@fillinblank{1}{\thss@tmp@len}{\fangsong\@ementor}		\\
+ 			\end{tabular}%
+ 		}
+ 		\vfill
diff --git a/macros/latex/contrib/pkuthss/doc/readme/pkuthss.bib b/macros/latex/contrib/pkuthss/doc/readme/pkuthss.bib
index ea9e83124a..a85359a66e 100644
--- a/macros/latex/contrib/pkuthss/doc/readme/pkuthss.bib
+++ b/macros/latex/contrib/pkuthss/doc/readme/pkuthss.bib
@@ -1,3 +1,14 @@
+@online{amsthm,
+	author = {{Publications Technical Group, American Mathematical Society}},
+	title = {Using the amsthm Package},
+	edition = {Ver.\ 2.20.3},
+	type = {M/OL},
+	date = {2017-09},
+	url = {https://ctan.org/pkg/amsthm},
+	urldate = {2019-11-15},
+	language = {english},
+}
+
 @online{biber,
 	author = {Kime, Philip and Charette, Fran\c{c}ois},
 	title = {Biber: A backend bibliography processor for biblatex},
diff --git a/macros/latex/contrib/pkuthss/doc/readme/pkuthss.tex b/macros/latex/contrib/pkuthss/doc/readme/pkuthss.tex
index bf0cd252a0..70989bac57 100644
--- a/macros/latex/contrib/pkuthss/doc/readme/pkuthss.tex
+++ b/macros/latex/contrib/pkuthss/doc/readme/pkuthss.tex
@@ -1,7 +1,7 @@
 % Documentation for pkuthss.
 %
 % Copyright (c) 2008-2009 solvethis
-% Copyright (c) 2010-2016,2018 Casper Ti. Vector
+% Copyright (c) 2010-2016,2018-2019 Casper Ti. Vector
 %
 % This work may be distributed and/or modified under the conditions of the
 % LaTeX Project Public License, either version 1.3 of this license or (at
@@ -31,18 +31,25 @@
 	backend = biber, style = caspervector, utf8,
 	sorting = ecnyt, giveninits = true, sortgiveninits = true
 ]{biblatex}
-\usepackage{fancyvrb, hologo}
+\usepackage{iftex, fancyvrb, hologo}
 
-\setlength{\hfuzz}{3pt}
+\hypersetup{colorlinks = true, allcolors = blue}
 \ctexset{linestretch = 2\ccwd}
-\renewcommand*{\bibfont}{\zihao{5}\linespread{1.27}\selectfont}
+\setlength{\hfuzz}{3pt}
 \setlength{\bibitemsep}{3bp}
+\renewcommand*{\bibfont}{\zihao{5}\linespread{1.27}\selectfont}
 
-\hypersetup{colorlinks = true, allcolors = blue}
+\newcommand*{\cupercite}[1]{\supercite{#1}\mbox{}}
 \newcommand{\myemph}[1]{\emph{\textcolor{red}{#1}}}
 \newcommand{\unemph}[1]{\textup{\textcolor{black}{#1}}}
-\newcommand{\docversion}{v1.8.0}
+\RecustomVerbatimEnvironment{Verbatim}{Verbatim}%
+	{frame = single, tabsize = 4, formatcom = {\ifXeTeX\xeCJKVerbAddon\fi}}
+\RecustomVerbatimCommand{\VerbatimInput}{VerbatimInput}{
+	fontsize = {\small}, baselinestretch = 1,
+	tabsize = 4, formatcom = {\ifXeTeX\xeCJKVerbAddon\fi}
+}
 
+\newcommand*{\docversion}{v1.8.0}
 \pkuthssinfo{
 	cthesisname = {本科生毕业论文}, ethesisname = {Undergraduate Thesis},
 	ctitle = {北京大学学位论文模版\\pkuthss \docversion},
@@ -53,7 +60,7 @@
 	cauthor = {盖茨波·钛·维克托},
 	eauthor = {Casper Ti.\ Vector},
 	studentid = {00910???},
-	date = {\zhdigits{2018}年\zhnumber{7}月},
+	date = {\zhdigits{2019} 年 \zhnumber{11} 月},
 	school = {化学与分子工程学院},
 	cmajor = {化学（？）}, emajor = {Chemistry ... ?},
 	direction = {据说 Casper 自己也不知道},
diff --git a/macros/latex/contrib/pkuthss/tex/pkulogo.pdf b/macros/latex/contrib/pkuthss/tex/pkulogo.pdf
index 4d4fd3a58a..629fab21e0 100644
--- a/macros/latex/contrib/pkuthss/tex/pkulogo.pdf
+++ b/macros/latex/contrib/pkuthss/tex/pkulogo.pdf
diff --git a/macros/latex/contrib/pkuthss/tex/pkuthss-gbk.def b/macros/latex/contrib/pkuthss/tex/pkuthss-gbk.def
index 8c39301e69..8ebb0f6ea2 100644
--- a/macros/latex/contrib/pkuthss/tex/pkuthss-gbk.def
+++ b/macros/latex/contrib/pkuthss/tex/pkuthss-gbk.def
@@ -22,7 +22,7 @@
 %   pkuword.eps
 
 \ProvidesFile{pkuthss-gbk.def}
-	[2018/07/02 v1.8.0 Labels and captions in GBK encoding
+	[2019/11/15 v1.8.1 Labels and captions in GBK encoding
 		for the pkuthss document class]
 
 \def\label@ctitle{��Ŀ��}
diff --git a/macros/latex/contrib/pkuthss/tex/pkuthss-utf8.def b/macros/latex/contrib/pkuthss/tex/pkuthss-utf8.def
index b6996850e4..64cbcf129b 100644
--- a/macros/latex/contrib/pkuthss/tex/pkuthss-utf8.def
+++ b/macros/latex/contrib/pkuthss/tex/pkuthss-utf8.def
@@ -22,7 +22,7 @@
 %   pkuword.eps
 
 \ProvidesFile{pkuthss-utf8.def}
-	[2018/07/02 v1.8.0 Labels and captions in UTF-8 encoding
+	[2019/11/15 v1.8.1 Labels and captions in UTF-8 encoding
 		for the pkuthss document class]
 
 \def\label@ctitle{题目：}
diff --git a/macros/latex/contrib/pkuthss/tex/pkuthss.cls b/macros/latex/contrib/pkuthss/tex/pkuthss.cls
index 9e68dc3585..0e0c766eec 100644
--- a/macros/latex/contrib/pkuthss/tex/pkuthss.cls
+++ b/macros/latex/contrib/pkuthss/tex/pkuthss.cls
@@ -1,7 +1,7 @@
 % Peking University dissertation document class
 %
 % Copyright (c) 2008-2009 solvethis
-% Copyright (c) 2010-2018 Casper Ti. Vector
+% Copyright (c) 2010-2019 Casper Ti. Vector
 %
 % This work may be distributed and/or modified under the conditions of the
 % LaTeX Project Public License, either version 1.3 of this license or (at
@@ -23,7 +23,7 @@
 
 \NeedsTeXFormat{LaTeX2e}[1995/12/01]
 \ProvidesClass{pkuthss}
-	[2018/07/02 v1.8.0 Peking University dissertation document class]
+	[2019/11/15 v1.8.1 Peking University dissertation document class]
 
 % eg. `\thss@int@boolopt{spacing}{true}' will expand to:
 %   \newif\ifthss@opt@spacing \thss@opt@spacingtrue
@@ -65,6 +65,9 @@
 
 % Prevent fontspec (loaded by xeCJK) from interfering with newtxmath.
 \ifthss@opt@pkufont\PassOptionsToPackage{no-math}{fontspec}\fi
+% Work around the `\lvert already defined' error.
+% cf. <https://github.com/CTeX-org/ctex-kit/issues/454>.
+\ifthss@opt@pkufont\RequirePackage{amsmath}\fi
 % pkuthss is based on ctexbook; we use `xiao 4' as default font size.
 \LoadClass[zihao = -4]{ctexbook}[2014/03/06]
 % ctex 2.x no longer loads ifpdf and ifxetex by itself.
@@ -123,7 +126,7 @@
 	}
 	% Use circled numbers as footnote symbols. Does not affect title page, but
 	% footnote is rarely used in dissertation covers ;)
-	\renewcommand\thefootnote%
+	\renewcommand*{\thefootnote}%
 		{\protect\thss@int@circled{\arabic{footnote}}}
 	% Provides utility to modify footnote spacing.
 	% Option used to make sure it does not render interleaf pages totally blank.
@@ -167,7 +170,7 @@
 \ifthss@opt@spechap
 	% This command is used to start a chapter without numbering, and correctly set
 	% up the headers and footers in the chapter.
-	\newcommand\specialchap[1]{%
+	\newcommand{\specialchap}[1]{%
 		\chapter*{#1}\addcontentsline{toc}{chapter}{#1}
 		\markboth{#1}{}\phantomsection%
 	}
@@ -201,7 +204,7 @@
 		\let\thss@tmp@maketitle\maketitle
 		% NOTE: `\hypersetup' must appear before `\maketitle', otherwise it might
 		% not act as expected.
-		\renewcommand\maketitle{\setpdfproperties\thss@tmp@maketitle}
+		\renewcommand{\maketitle}{\setpdfproperties\thss@tmp@maketitle}
 	\fi
 }
 
@@ -244,7 +247,7 @@
 % Set up page layout.
 \geometry{
 	a4paper, hmargin = 2.6cm, top = 2.92cm, bottom = 3.03cm,
-	headheight = 0.45cm, headsep = 0.55cm, footskip = 1.05cm
+	headheight = 0.45cm, headsep = 0.59cm, footskip = 1.05cm
 }
 
 % Set up chapter/section/... captions.
@@ -259,11 +262,11 @@
 		beforeskip = {0bp}, afterskip = {18bp plus 0.2ex},
 		nameformat = {}, titleformat = {}
 	}, section =
-		{beforeskip = {20bp plus 1ex minus 0.2ex}, afterskip = {6bp plus 0.2ex}},
+		{beforeskip = {20bp plus 1ex minus 0.2ex}, afterskip = {5bp plus 0.2ex}},
 	subsection =
-		{beforeskip = {12bp plus 1ex minus 0.2ex}, afterskip = {6bp plus 0.2ex}},
+		{beforeskip = {12bp plus 1ex minus 0.2ex}, afterskip = {5bp plus 0.2ex}},
 	subsubsection =
-		{beforeskip = {12bp plus 1ex minus 0.2ex}, afterskip = {6bp plus 0.2ex}}
+		{beforeskip = {12bp plus 1ex minus 0.2ex}, afterskip = {5bp plus 0.2ex}}
 }
 \ifthss@opt@ugly
 	\ctexset{
@@ -341,7 +344,7 @@
 \renewcommand{\maketitle}{%
 	\thss@int@pdfmark{\titlepagename}{titlepage}
 	% Make the title page centered.
-	\begin{titlepage}\begin{center}
+	\begin{titlepage}\begingroup\centering
 		% Emblem and inscription of the university, and type of thesis.
 		{%
 			\zihao{1}%
@@ -379,7 +382,7 @@
 		\vfill
 		% Date.
 		{\zihao{-2}\@date}
-	\end{center}\end{titlepage}%
+	\par\endgroup\end{titlepage}%
 }
 
 % Typeset the Chinese abstract.
diff --git a/macros/latex/contrib/pkuthss/tex/pkuword.pdf b/macros/latex/contrib/pkuthss/tex/pkuword.pdf
index d8bfa5fd17..e38fdcef3e 100644
--- a/macros/latex/contrib/pkuthss/tex/pkuword.pdf
+++ b/macros/latex/contrib/pkuthss/tex/pkuword.pdf
diff --git a/macros/latex/contrib/polyglossia/README b/macros/latex/contrib/polyglossia/README
index 531780f8cb..18b2c4746a 100644
--- a/macros/latex/contrib/polyglossia/README
+++ b/macros/latex/contrib/polyglossia/README
@@ -1,7 +1,7 @@
 
    ¦----------------------------------------------¦
    ¦                                              ¦
-   ¦       THE POLYGLOSSIA PACKAGE v1.45          ¦
+   ¦       THE POLYGLOSSIA PACKAGE v1.46          ¦
    ¦                                              ¦
    ¦     Modern multilingual typesetting          ¦
    ¦        with XeLaTeX and LuaLaTeX             ¦
@@ -10,8 +10,8 @@
 
 This package provides an alternative to Babel for users of XeLaTeX and LuaLaTeX
 (with a few languages incompletely supported for the latter). This version
-includes support for 75 different languages, some of which in different regional,
-national or scriptal varieties.
+includes support for 79 different languages, some of which in different
+regional or national varieties, or using a different writing system.
 
 Polyglossia makes it possible to automate the following tasks:
 
@@ -34,20 +34,16 @@ Polyglossia makes it possible to automate the following tasks:
 
 LICENSE
 
-Copyright (c) 2008-2010 François Charette, 2013 Élie Roux, 2011-2019 Arthur Reutenauer
+Copyright (c) 2008-2010 François Charette, 2013 Élie Roux, 2011-2019 Arthur Reutenauer,
+Copyright (c) 2019 Bastien Roucariès, 2019 Jürgen Spitzmüller
 
-Polyglossia is placed under the terms of the LaTeX Project Public Licence
-(LPPL), either version 1.3, or, at your option, any later version.  See
-LICENCE.txt for the text of the LPPL v1.3c, or
-http://www.latex-project.org/lppl.txt for the latest version.
-
-This work has the LPPL maintenance status ‘maintained’.  The current maintainer is
-Arthur Reutenauer.
+Except where otherwise noted, Polyglossia is placed under the terms of the MIT licence
+(https://opensource.org/licenses/MIT).
 
 BUGS
 
 If you run into a bug, or suspect you do, or you have a request or comment, please
 use the GitHub issue tracker: http://github.com/reutenauer/polyglossia/issues
 
-This is more efficient than contacting me by email as it allows me to track the
-issues and follow progress.
+This is more efficient than contacting the maintainer by email as it allows me
+to track the issues and follow progress.
diff --git a/macros/latex/contrib/polyglossia/polyglossia.dtx b/macros/latex/contrib/polyglossia/polyglossia.dtx
index d9a4151831..6c669bbd57 100644
--- a/macros/latex/contrib/polyglossia/polyglossia.dtx
+++ b/macros/latex/contrib/polyglossia/polyglossia.dtx
@@ -11,7 +11,7 @@
 
    ¦----------------------------------------------¦
    ¦                                              ¦
-   ¦       THE POLYGLOSSIA PACKAGE v1.45          ¦
+   ¦       THE POLYGLOSSIA PACKAGE v1.46          ¦
    ¦                                              ¦
    ¦     Modern multilingual typesetting          ¦
    ¦        with XeLaTeX and LuaLaTeX             ¦
@@ -20,8 +20,8 @@
 
 This package provides an alternative to Babel for users of XeLaTeX and LuaLaTeX
 (with a few languages incompletely supported for the latter). This version
-includes support for 75 different languages, some of which in different regional,
-national or scriptal varieties.
+includes support for 79 different languages, some of which in different
+regional or national varieties, or using a different writing system.
 
 Polyglossia makes it possible to automate the following tasks:
 
@@ -44,23 +44,19 @@ Polyglossia makes it possible to automate the following tasks:
 
 LICENSE
 
-Copyright (c) 2008-2010 François Charette, 2013 Élie Roux, 2011-2019 Arthur Reutenauer
+Copyright (c) 2008-2010 François Charette, 2013 Élie Roux, 2011-2019 Arthur Reutenauer,
+Copyright (c) 2019 Bastien Roucariès, 2019 Jürgen Spitzmüller
 
-Polyglossia is placed under the terms of the LaTeX Project Public Licence
-(LPPL), either version 1.3, or, at your option, any later version.  See
-LICENCE.txt for the text of the LPPL v1.3c, or
-http://www.latex-project.org/lppl.txt for the latest version.
-
-This work has the LPPL maintenance status ‘maintained’.  The current maintainer is
-Arthur Reutenauer.
+Except where otherwise noted, Polyglossia is placed under the terms of the MIT licence
+(https://opensource.org/licenses/MIT).
 
 BUGS
 
 If you run into a bug, or suspect you do, or you have a request or comment, please
 use the GitHub issue tracker: http://github.com/reutenauer/polyglossia/issues
 
-This is more efficient than contacting me by email as it allows me to track the
-issues and follow progress.
+This is more efficient than contacting the maintainer by email as it allows me
+to track the issues and follow progress.
 %</README>
 %<*internal>
 \fi
@@ -104,18 +100,29 @@ issues and follow progress.
 \endpostamble
 \let\MetaPrefix\DoubleperCent
 \askforoverwritefalse
+\generate{\file{gloss-acadien.ldf}{\from{polyglossia.dtx}{gloss-acadien.ldf}}}
+\generate{\file{gloss-afrikaans.ldf}{\from{polyglossia.dtx}{gloss-afrikaans.ldf}}}
 \generate{\file{gloss-albanian.ldf}{\from{polyglossia.dtx}{gloss-albanian.ldf}}}
+\generate{\file{gloss-american.ldf}{\from{polyglossia.dtx}{gloss-american.ldf}}}
 \generate{\file{gloss-amharic.ldf}{\from{polyglossia.dtx}{gloss-amharic.ldf}}}
 \generate{\file{gloss-arabic.ldf}{\from{polyglossia.dtx}{gloss-arabic.ldf}}}
 \generate{\file{gloss-armenian.ldf}{\from{polyglossia.dtx}{gloss-armenian.ldf}}}
 \generate{\file{gloss-asturian.ldf}{\from{polyglossia.dtx}{gloss-asturian.ldf}}}
+\generate{\file{gloss-australian.ldf}{\from{polyglossia.dtx}{gloss-australian.ldf}}}
+\generate{\file{gloss-austrian.ldf}{\from{polyglossia.dtx}{gloss-austrian.ldf}}}
+\generate{\file{gloss-bahasa.ldf}{\from{polyglossia.dtx}{gloss-bahasa.ldf}}}
 \generate{\file{gloss-bahasai.ldf}{\from{polyglossia.dtx}{gloss-bahasai.ldf}}}
 \generate{\file{gloss-bahasam.ldf}{\from{polyglossia.dtx}{gloss-bahasam.ldf}}}
 \generate{\file{gloss-basque.ldf}{\from{polyglossia.dtx}{gloss-basque.ldf}}}
+\generate{\file{gloss-belarusian.ldf}{\from{polyglossia.dtx}{gloss-belarusian.ldf}}}
 \generate{\file{gloss-bengali.ldf}{\from{polyglossia.dtx}{gloss-bengali.ldf}}}
+\generate{\file{gloss-bosnian.ldf}{\from{polyglossia.dtx}{gloss-bosnian.ldf}}}
 \generate{\file{gloss-brazil.ldf}{\from{polyglossia.dtx}{gloss-brazil.ldf}}}
 \generate{\file{gloss-breton.ldf}{\from{polyglossia.dtx}{gloss-breton.ldf}}}
+\generate{\file{gloss-british.ldf}{\from{polyglossia.dtx}{gloss-british.ldf}}}
 \generate{\file{gloss-bulgarian.ldf}{\from{polyglossia.dtx}{gloss-bulgarian.ldf}}}
+\generate{\file{gloss-canadian.ldf}{\from{polyglossia.dtx}{gloss-canadian.ldf}}}
+\generate{\file{gloss-canadien.ldf}{\from{polyglossia.dtx}{gloss-canadien.ldf}}}
 \generate{\file{gloss-catalan.ldf}{\from{polyglossia.dtx}{gloss-catalan.ldf}}}
 \generate{\file{gloss-coptic.ldf}{\from{polyglossia.dtx}{gloss-coptic.ldf}}}
 \generate{\file{gloss-croatian.ldf}{\from{polyglossia.dtx}{gloss-croatian.ldf}}}
@@ -133,7 +140,9 @@ issues and follow progress.
 \generate{\file{gloss-friulian.ldf}{\from{polyglossia.dtx}{gloss-friulian.ldf}}}
 \generate{\file{gloss-gaelic.ldf}{\from{polyglossia.dtx}{gloss-gaelic.ldf}}}
 \generate{\file{gloss-galician.ldf}{\from{polyglossia.dtx}{gloss-galician.ldf}}}
+\generate{\file{gloss-georgian.ldf}{\from{polyglossia.dtx}{gloss-georgian.ldf}}}
 \generate{\file{gloss-german.ldf}{\from{polyglossia.dtx}{gloss-german.ldf}}}
+\generate{\file{gloss-germanb.ldf}{\from{polyglossia.dtx}{gloss-germanb.ldf}}}
 \generate{\file{gloss-greek.ldf}{\from{polyglossia.dtx}{gloss-greek.ldf}}}
 \generate{\file{gloss-hebrew.ldf}{\from{polyglossia.dtx}{gloss-hebrew.ldf}}}
 \generate{\file{gloss-hindi.ldf}{\from{polyglossia.dtx}{gloss-hindi.ldf}}}
@@ -150,8 +159,12 @@ issues and follow progress.
 \generate{\file{gloss-lao.ldf}{\from{polyglossia.dtx}{gloss-lao.ldf}}}
 \generate{\file{gloss-latex.ldf}{\from{polyglossia.dtx}{gloss-latex.ldf}}}
 \generate{\file{gloss-latin.ldf}{\from{polyglossia.dtx}{gloss-latin.ldf}}}
+\generate{\file{gloss-latinclassic.ldf}{\from{polyglossia.dtx}{gloss-latinclassic.ldf}}}
+\generate{\file{gloss-latinecclesiastic.ldf}{\from{polyglossia.dtx}{gloss-latinecclesiastic.ldf}}}
+\generate{\file{gloss-latinmedieval.ldf}{\from{polyglossia.dtx}{gloss-latinmedieval.ldf}}}
 \generate{\file{gloss-latvian.ldf}{\from{polyglossia.dtx}{gloss-latvian.ldf}}}
 \generate{\file{gloss-lithuanian.ldf}{\from{polyglossia.dtx}{gloss-lithuanian.ldf}}}
+\generate{\file{gloss-lowersorbian.ldf}{\from{polyglossia.dtx}{gloss-lowersorbian.ldf}}}
 \generate{\file{gloss-lsorbian.ldf}{\from{polyglossia.dtx}{gloss-lsorbian.ldf}}}
 \generate{\file{gloss-macedonian.ldf}{\from{polyglossia.dtx}{gloss-macedonian.ldf}}}
 \generate{\file{gloss-magyar.ldf}{\from{polyglossia.dtx}{gloss-magyar.ldf}}}
@@ -159,14 +172,19 @@ issues and follow progress.
 \generate{\file{gloss-malayalam.ldf}{\from{polyglossia.dtx}{gloss-malayalam.ldf}}}
 \generate{\file{gloss-marathi.ldf}{\from{polyglossia.dtx}{gloss-marathi.ldf}}}
 \generate{\file{gloss-mongolian.ldf}{\from{polyglossia.dtx}{gloss-mongolian.ldf}}}
+\generate{\file{gloss-naustrian.ldf}{\from{polyglossia.dtx}{gloss-naustrian.ldf}}}
+\generate{\file{gloss-newzealand.ldf}{\from{polyglossia.dtx}{gloss-newzealand.ldf}}}
+\generate{\file{gloss-ngerman.ldf}{\from{polyglossia.dtx}{gloss-ngerman.ldf}}}
 \generate{\file{gloss-nko.ldf}{\from{polyglossia.dtx}{gloss-nko.ldf}}}
 \generate{\file{gloss-norsk.ldf}{\from{polyglossia.dtx}{gloss-norsk.ldf}}}
 \generate{\file{gloss-norwegian.ldf}{\from{polyglossia.dtx}{gloss-norwegian.ldf}}}
+\generate{\file{gloss-nswissgerman.ldf}{\from{polyglossia.dtx}{gloss-nswissgerman.ldf}}}
 \generate{\file{gloss-nynorsk.ldf}{\from{polyglossia.dtx}{gloss-nynorsk.ldf}}}
 \generate{\file{gloss-occitan.ldf}{\from{polyglossia.dtx}{gloss-occitan.ldf}}}
 \generate{\file{gloss-persian.ldf}{\from{polyglossia.dtx}{gloss-persian.ldf}}}
 \generate{\file{gloss-piedmontese.ldf}{\from{polyglossia.dtx}{gloss-piedmontese.ldf}}}
 \generate{\file{gloss-polish.ldf}{\from{polyglossia.dtx}{gloss-polish.ldf}}}
+\generate{\file{gloss-polutonikogreek.ldf}{\from{polyglossia.dtx}{gloss-polutonikogreek.ldf}}}
 \generate{\file{gloss-portuges.ldf}{\from{polyglossia.dtx}{gloss-portuges.ldf}}}
 \generate{\file{gloss-portuguese.ldf}{\from{polyglossia.dtx}{gloss-portuguese.ldf}}}
 \generate{\file{gloss-romanian.ldf}{\from{polyglossia.dtx}{gloss-romanian.ldf}}}
@@ -177,11 +195,15 @@ issues and follow progress.
 \generate{\file{gloss-sanskrit.ldf}{\from{polyglossia.dtx}{gloss-sanskrit.ldf}}}
 \generate{\file{gloss-scottish.ldf}{\from{polyglossia.dtx}{gloss-scottish.ldf}}}
 \generate{\file{gloss-serbian.ldf}{\from{polyglossia.dtx}{gloss-serbian.ldf}}}
+\generate{\file{gloss-serbianc.ldf}{\from{polyglossia.dtx}{gloss-serbianc.ldf}}}
 \generate{\file{gloss-slovak.ldf}{\from{polyglossia.dtx}{gloss-slovak.ldf}}}
+\generate{\file{gloss-slovene.ldf}{\from{polyglossia.dtx}{gloss-slovene.ldf}}}
 \generate{\file{gloss-slovenian.ldf}{\from{polyglossia.dtx}{gloss-slovenian.ldf}}}
 \generate{\file{gloss-sorbian.ldf}{\from{polyglossia.dtx}{gloss-sorbian.ldf}}}
 \generate{\file{gloss-spanish.ldf}{\from{polyglossia.dtx}{gloss-spanish.ldf}}}
+\generate{\file{gloss-spanishmx.ldf}{\from{polyglossia.dtx}{gloss-spanishmx.ldf}}}
 \generate{\file{gloss-swedish.ldf}{\from{polyglossia.dtx}{gloss-swedish.ldf}}}
+\generate{\file{gloss-swissgerman.ldf}{\from{polyglossia.dtx}{gloss-swissgerman.ldf}}}
 \generate{\file{gloss-syriac.ldf}{\from{polyglossia.dtx}{gloss-syriac.ldf}}}
 \generate{\file{gloss-tamil.ldf}{\from{polyglossia.dtx}{gloss-tamil.ldf}}}
 \generate{\file{gloss-telugu.ldf}{\from{polyglossia.dtx}{gloss-telugu.ldf}}}
@@ -190,6 +212,7 @@ issues and follow progress.
 \generate{\file{gloss-turkish.ldf}{\from{polyglossia.dtx}{gloss-turkish.ldf}}}
 \generate{\file{gloss-turkmen.ldf}{\from{polyglossia.dtx}{gloss-turkmen.ldf}}}
 \generate{\file{gloss-ukrainian.ldf}{\from{polyglossia.dtx}{gloss-ukrainian.ldf}}}
+\generate{\file{gloss-uppersorbian.ldf}{\from{polyglossia.dtx}{gloss-uppersorbian.ldf}}}
 \generate{\file{gloss-urdu.ldf}{\from{polyglossia.dtx}{gloss-urdu.ldf}}}
 \generate{\file{gloss-usorbian.ldf}{\from{polyglossia.dtx}{gloss-usorbian.ldf}}}
 \generate{\file{gloss-vietnamese.ldf}{\from{polyglossia.dtx}{gloss-vietnamese.ldf}}}
@@ -200,8 +223,11 @@ issues and follow progress.
 \generate{\file{farsidigits.map}{\from{polyglossia.dtx}{farsidigits.map}}}
 \generate{\file{thaidigits.map}{\from{polyglossia.dtx}{thaidigits.map}}}
 \def\MetaPrefix{-- }
-\generate{\file{polyglossia-frpt.lua}{\from{polyglossia.dtx}{polyglossia-frpt.lua}}}
+\generate{\file{polyglossia-french.lua}{\from{polyglossia.dtx}{polyglossia-french.lua}}}
 \generate{\file{polyglossia-korean.lua}{\from{polyglossia.dtx}{polyglossia-korean.lua}}}
+\generate{\file{polyglossia-latin.lua}{\from{polyglossia.dtx}{polyglossia-latin.lua}}}
+\generate{\file{polyglossia-punct.lua}{\from{polyglossia.dtx}{polyglossia-punct.lua}}}
+\generate{\file{polyglossia-sanskrit.lua}{\from{polyglossia.dtx}{polyglossia-sanskrit.lua}}}
 \generate{\file{polyglossia-tibt.lua}{\from{polyglossia.dtx}{polyglossia-tibt.lua}}}
 \generate{\file{polyglossia.lua}{\from{polyglossia.dtx}{polyglossia.lua}}}
 \let\MetaPrefix\DoubleperCent
@@ -225,6 +251,7 @@ issues and follow progress.
 \usepackage{color}
 \usepackage{xspace,fancyvrb,booktabs}
 \usepackage[neverdecrease]{paralist}
+\usepackage[format=hang,labelfont=bf,labelsep=period]{caption}
 \definecolor{myblue}{rgb}{0.02,0.04,0.48}
 \definecolor{lightblue}{rgb}{0.61,.8,.8}
 \definecolor{myred}{rgb}{0.65,0.04,0.07}
@@ -247,7 +274,7 @@ issues and follow progress.
 \usepackage[babelshorthands]{polyglossia}
 \usepackage{farsical}
 \setmainlanguage[variant=british,ordinalmonthday=false]{english}
-\setotherlanguages{arabic,armenian,hebrew,syriac,greek,russian,serbian,catalan}
+\setotherlanguages{arabic,armenian,hebrew,syriac,greek,russian,serbian,catalan,georgian}
 \usepackage[protrusion]{microtype}
 \newcommand*\Cmd[1]{\cmd{#1}\DescribeMacro{#1}\xspace}
 \newcommand*\pkg[1]{\textsf{\color{myblue}#1}}
@@ -298,6 +325,7 @@ issues and follow progress.
 \newfontfamily\armenianfont[Script=Armenian]{DejaVu Sans}
 \newfontfamily\syriacfont[Script=Syriac]{Serto Jerusalem}
 \newfontfamily\hebrewfont[Script=Hebrew]{Ezra SIL}
+\newfontfamily\georgianfont{DejaVu Serif}
 
 \linespread{1.05}
 \frenchspacing
@@ -334,6 +362,8 @@ issues and follow progress.
 % \maketitle
 % \tableofcontents
 % 
+% \condbreak{4\baselineskip}
+% 
 % 
 % \DeleteShortVerb{\|}
 % \MakeShortVerb{\¦}
@@ -364,8 +394,8 @@ issues and follow progress.
 %       calendars are supported).
 % \item For languages that have their own numbering system, modifying the formatting
 %       of numbers appropriately (this also includes redefining the alphabetic sequence
-%       for non-Latin alphabets).\footnote{ %
-%         For the Arabic script this is now done by the bundled package \pkg{arabicnumbers}.}
+%       for non-Latin alphabets).\footnote{%
+%         This is done by bundled sub-packages such as \pkg{arabicnumbers}.}
 % \item Ensuring proper directionality if the document contains languages
 %       that are written from right to left (via the package \pkg{bidi},
 %       available separately).
@@ -414,48 +444,47 @@ issues and follow progress.
 % \subsection{Supported languages}
 % 
 % Table~\ref{tab:lang} lists all languages currently supported.
-% Those in red have specific options and/or commands
+% Those in \TR{red} have specific options and/or commands
 % that are explained in section \ref{specific} below.
 % 
 % \begin{table}[ht]\centering
-% \label{tab:lang}
-% ^^A Produced with tools/insert-language-list.rb -- JS, 2019-10-18
-% ^^A Edited by hand -- JS, 2019-10-18
+% \caption{\label{tab:lang}Languages currently supported in \pkg{polyglossia}}
+% ^^A Produced with tools/insert-language-list.rb -- JS, 2019-11-01
+% ^^A Edited by hand -- JS, 2019-11-01
 % \begin{tabular}{lllll}
 % \toprule
-% albanian     & \TX{dutch}     & interlingua  & \TX{mongolian}  & \TX{slovenian}\\
-% amharic      & \TX{english}   & \TX{italian} & nko             & \TX{sorbian}\\
-% \TX{arabic}  & \TX{esperanto} & japanese     & \TX{norwegian}  & spanish\\
-% \TX{armenian}& estonian       & kannada      & occitan         & swedish\\
-% asturian     & \TX{finnish}   & khmer        & \TX{persian}    & \TX{syriac}\\
-% basque       & \TX{french}    & \TX{korean}  & piedmontese     & tamil\\
-% \TX{bengali} & friulian       & \TX{kurdish} & polish          & telugu\\
-% breton       & \TX{gaelic}    & \TX{lao}     & \TX{portuguese} & \TX{thai}\\
-% bulgarian    & galician       & \TX{latin}   & romanian        & \TX{tibetan}\\
-% \TX{catalan} & \TX{german}    & latvian      & romansh         & turkish\\
-% coptic       & \TX{greek}     & lithuanian   & \TX{russian}    & turkmen\\
-% croatian     & \TX{hebrew}    & macedonian   & \TX{sami}       & \TX{ukrainian}\\
-% \TX{czech}   & \TX{hindi}     & \TX{malay}   & \TX{sanskrit}   & urdu\\
-% danish       & \TX{hungarian} & malayalam    & \TX{serbian}    & vietnamese\\
-% divehi       & icelandic      & marathi      & slovak          & \TX{welsh}\\
+% \TX{afrikaans}  & danish         & \TX{hungarian} & marathi         & \TX{slovenian} \\
+% albanian        & divehi         & icelandic      & \TX{mongolian}  & \TX{sorbian}   \\
+% amharic         & \TX{dutch}     & interlingua    & nko             & \TX{spanish}   \\
+% \TX{arabic}     & \TX{english}   & \TX{italian}   & \TX{norwegian}  & swedish        \\
+% \TX{armenian}   & \TX{esperanto} & japanese       & occitan         & \TX{syriac}    \\
+% asturian        & estonian       & kannada        & \TX{persian}    & tamil          \\
+% basque          & \TX{finnish}   & khmer          & piedmontese     & telugu         \\
+% \TX{belarusian} & \TX{french}    & \TX{korean}    & polish          & \TX{thai}      \\
+% \TX{bengali}    & friulian       & \TX{kurdish}   & \TX{portuguese} & \TX{tibetan}   \\
+% bosnian         & \TX{gaelic}    & \TX{lao}       & romanian        & turkish        \\
+% breton          & galician       & \TX{latin}     & romansh         & turkmen        \\
+% bulgarian       & \TX{georgian}  & latvian        & \TX{russian}    & \TX{ukrainian} \\
+% \TX{catalan}    & \TX{german}    & lithuanian     & \TX{sami}       & urdu           \\
+% coptic          & \TX{greek}     & macedonian     & \TX{sanskrit}   & vietnamese     \\
+% croatian        & \TX{hebrew}    & \TX{malay}     & \TX{serbian}    & \TX{welsh}     \\
+% \TX{czech}      & \TX{hindi}     & malayalam      & \TX{slovak}     &                \\
 % \bottomrule
 % \end{tabular}
 % 
-% 
-% \caption{Languages currently supported in \pkg{polyglossia}}
 % \end{table}
 % 
 % \paragraph{Version Notes} The support for Amharic\new{v1.0.1} should be considered an experimental attempt to
-% port the package \pkg{ethiop}.\footnote{Feedback is welcome.}
+% port the package \pkg{ethiop}; feedback is welcome.
 % Version 1.1.1\new{v1.1.1} added support for Asturian, %\footnote{ Provided by Kevin Godby and Xuacu Saturio.}, 
 % Lithuanian, %\footnote{ Provided by Kevin Godby and Paulius Sladkevičius.},
 % and Urdu. %\footnote{ Provided by Kamal Abdali.}
 % ^^A
-% Version 1.2\new{v1.2.0} adds support for Armenian, Occitan, Bengali,
+% Version 1.2\new{v1.2.0} introduced Armenian, Occitan, Bengali,
 % Lao, Malayalam, Marathi, Tamil, Telugu, and Turkmen.\footnote{%
 %   See acknowledgements at the end for due credit to the various contributors.}
-% Version 1.43\new{v1.43} silently introduced basic support for Japanese. This
-% is considered experimental, and feedback is appreciated.
+% Version 1.43\new{v1.43} brought basic support for Japanese (this
+% is considered experimental, feedback is appreciated).
 % In version 1.45\new{v1.45}, support for Kurdish and Mongolian as well as some new
 % variants (Canadian French and English) have been added. Furthermore,  for consistency reasons, some language have
 % been renamed (\emph{farsi}\textrightarrow\emph{persian}, \emph{friulan}\textrightarrow\emph{friulian},
@@ -465,67 +494,83 @@ issues and follow progress.
 % \emph{lsorbian}\slash\emph{usorbian}\textrightarrow\emph{sorbian},
 % \emph{irish}\slash\emph{scottish}\textrightarrow\emph{gaelic},
 % \emph{norsk}\slash\emph{nynorsk}\textrightarrow\emph{norwegian}). The old names are still supported for backwards
-% compatibility reasons, but they might not give access to newer language features.
+% compatibility reasons.
+% Version 1.46\new{v1.46} introduces support for Afrikaans, Belarusian, Bosnian and Georgian.
 % 
 % 
-% \subsection{Relation to Babel languages}
+% \subsection{Relation to and use of Babel language names}
 % 
 % If you are familiar with the \pkg{babel} package, you will note that \pkg{polyglossia}'s language naming
 % slightly differs. Whereas \pkg{babel} has a unique name for each language variety (\eg\emph{american} and \emph{british}),
-% \pkg{polyglossia} differentiates language varieties via language options.
+% \pkg{polyglossia} differentiates language varieties via language options (\eg \emph{english}, ¦variant=american¦).
 % 
-% Furthermore, \pkg{babel} uses sometimes abbreviations for language names (\eg\emph{bahasam} for Bahasa Malayu) as well
+% Furthermore, \pkg{babel} sometimes uses abbreviated language names (\eg\emph{bahasam} for Bahasa Malayu) as well
 % as endonyms, \ie language names coming from the designated languages (such as \emph{bahasa}, \emph{canadien} or \emph{magyar}).
 % As opposed to this, \pkg{polyglossia} always uses spelled-out (lower-cased) English language names.
-% 
-% Table~\ref{tab:bbllang} lists the language names that differ in both packages. \pkg{Babel} names marked in red can also be used
-% in \pkg{polyglossia} as an alias.\footnote{This is for historical reasons, since earlier versions of \pkg{polyglossia} used
-% 	those names as well. Note, however, that you need to use the matching language switching commands, then, as
-%     well, \eg \cmd\textportuges\ with \emph{portuges} (rather than \cmd\textportuguese).}
+% Please refer to table~\ref{tab:bbllang} for the differing language names in both packages. 
 % 
 % \begin{table}
-% \label{tab:bbllang}
+% \caption{\label{tab:bbllang}Babel-polyglossia language name matching}
+% 
+% \begin{minipage}[t]{1\columnwidth}
+% \small\centering
 % \begin{tabular}{lll}
 % \toprule 
 % \textbf{Babel name} & \textbf{Polyglossia name} & \textbf{Polyglossia options}\tabularnewline
 % \midrule
-% acadien         & french     & variant=acadian                \\
-% american        & english    & \emph{(default)}               \\
-% australian      & english    & variant=australian             \\
-% austrian        & german     & variant=austrian, spelling=old \\
-% bahasa          & malay      & \emph{(default)}               \\
-% \TR{bahasam}    & malay      & variant=malaysian              \\
-% \TR{brazil}     & portuguese & variant=brazilian              \\
-% british         & english    & variant=british                \\
-% canadian        & english    & variant=canadian               \\
-% canadien        & french     & variant=canadian               \\
-% \TR{farsi}      & persian    &                                \\
-% \TR{friulan}    & friulian   &                                \\
-% german          & german     & spelling=old                   \\
-% \TR{irish}      & gaelic     & variant=irish                  \\
-% kurmanji        & kurdish    & variant=kurmanji               \\
-% lowersorbian    & sorbian    & variant=lower                  \\
-% \TR{magyar}     & hungarian  &                                \\
-% naustrian       & german     & variant=austrian               \\
-% newzealand      & english    & variant=newzealand             \\
-% ngerman         & german     & \emph{(default)}               \\
-% \TR{norsk}      & norwegian  & variant=bokmal                 \\
-% nswissgerman    & german     & variant=swiss                  \\
-% \TR{nynorsk}    & norwegian  & \emph{(default)}               \\
-% polutonikogreek & greek      & variant=polytonic              \\
-% \TR{portuges}   & portuguese & \emph{(default)}               \\
-% \TR{samin}      & sami       &                                \\
-% \TR{scottish}   & gaelic     & variant=scottish               \\
-% serbianc        & serbian    & script=Cyrillic                \\
-% slovene         & slovenian  &                                \\
-% swissgerman     & german     & variant=swiss, spelling=old    \\
-% uppersorbian    & sorbian    & variant=upper                  \\
+% acadien            & french     & variant=acadian                     \\
+% american           & english    & variant=american [\emph{default}]   \\
+% australian         & english    & variant=australian                  \\
+% austrian           & german     & variant=austrian, spelling=old      \\
+% bahasa             & malay      & variant=indonesian [\emph{default}] \\
+% bahasam            & malay      & variant=malaysian                   \\
+% brazil             & portuguese & variant=brazilian                   \\
+% british            & english    & variant=british                     \\
+% canadian           & english    & variant=canadian                    \\
+% canadien           & french     & variant=canadian                    \\
+% farsi              & persian    &                                     \\
+% friulan            & friulian   &                                     \\
+% german\footnote{Due to the name conflict only available in \pkg{polyglossia} as \emph{germanb} (which is a \pkg{babel} synonym).}
+%                    & german     & spelling=old                        \\
+% irish              & gaelic     & variant=irish [\emph{default}]      \\
+% kurmanji           & kurdish    & variant=kurmanji                    \\
+% latin.classic\footnote{Available in \pkg{polyglossia} as \emph{latinclassic} (as dots are invalid in command names).}
+%                    & latin      & variant=classic                     \\
+% latin.ecclesiastic\footnote{Available in \pkg{polyglossia} as \emph{latinecclesiastic} (as dots are invalid in command names).}
+%                    & latin      & variant=ecclesiastic                \\
+% latin.medieval\footnote{Available in \pkg{polyglossia} as \emph{latinmedieval} (as dots are invalid in command names).}
+%                    & latin      & variant=medieval                    \\
+% lowersorbian       & sorbian    & variant=lower                       \\
+% magyar             & hungarian  &                                     \\
+% naustrian          & german     & variant=austrian                    \\
+% newzealand         & english    & variant=newzealand                  \\
+% ngerman            & german     & variant=german [\emph{default}]     \\
+% norsk              & norwegian  & variant=bokmal                      \\
+% nswissgerman       & german     & variant=swiss                       \\
+% nynorsk            & norwegian  & variant=nynorsk [\emph{default}]    \\
+% polutonikogreek    & greek      & variant=polytonic                   \\
+% portuges           & portuguese & variant=portuguese [\emph{default}] \\
+% samin              & sami       &                                     \\
+% scottish           & gaelic     & variant=scottish                    \\
+% serbianc           & serbian    & script=Cyrillic                     \\
+% slovene            & slovenian  &                                     \\
+% spanishmx          & spanish    & variant=mexican                     \\
+% swissgerman        & german     & variant=swiss, spelling=old         \\
+% uppersorbian       & sorbian    & variant=upper                       \\
 % \bottomrule
 % \end{tabular}
+% \end{minipage}
 % 	
-% \caption{Babel-polyglossia language name matching}
 % \end{table}
 % 
+% For convenience reasons, \pkg{polyglossia} also supports the use of babel names\new{v1.46} (for the few justified
+% exceptions, please refer to the notes in table~\ref{tab:bbllang}).
+% The babel names listed in table~\ref{tab:bbllang} can be used instead of the corresponding polyglossia
+% name\slash options in \cmd\setdefaultlanguage\ and \cmd\setotherlanguage\ as well as in the \pkg{polyglossia} and
+% \pkg{babel} language switching commands\slash environments documented in section~\ref{sec:langcmds} and
+% \ref{sec:babelcmds} (\eg \cmd\textaustrian\ is synonymous to \cmd{\textgerman[variant=austrian,spelling=old]}).
+% However, unless you have special reasons, we strongly encourage you to use the \pkg{polyglossia} names.
+% 
 % 
 % \subsection{Global options}
 % 
@@ -533,65 +578,75 @@ issues and follow progress.
 % 
 % \begin{itemize}
 % 	\item \TB{babelshorthands}\new{v1.1.1} globally activates \pkg{babel}
-%           shorthands whenever available. Currently shorthands are implemented for
-%           Catalan, Czech, Dutch, Finnish, German, Italian, Mongolian, and Russian.
-%           Please refer to the respective language descriptions (sec.~\ref{specific}) for details.
-% 
-%     \item \TB{localmarks} redefines the internal \LaTeX\ macros \cmd\markboth\ and \cmd\markright.
-%           In earlier versions of \pkg{polyglossia},\new{v1.2.0} this option was set by default, but we
-%           now realize that it causes more problems than it helps, so it is now off by default.
-%           For backwards-compatibility, the option \TB{nolocalmarks} which used to switch off the previous
-%           default, and now does nothing, is still available.
-% 
-%     \item \TB{quiet} turns off most info messages and some of the warnings issued by \LaTeX,
-%           \pkg{fontspec} and \pkg{polyglossia}.
+% 		shorthands whenever available. Currently shorthands are implemented for
+% 		Afrikaans, Belarusian, Catalan, Czech, Dutch, Finnish, Georgian, German,
+% 		Italian, Latin, Mongolian, Russian, and Slovak. Please refer to the respective
+% 		language descriptions (sec.~\ref{specific}) for details.
+% 
+% 	\item \TB{localmarks} redefines the internal \LaTeX\ macros \cmd\markboth\ and
+% 		\cmd\markright. In earlier versions of \pkg{polyglossia},\new{v1.2.0} this
+% 		option was set by default, but we now realize that it causes more problems
+% 		than it helps, so it is now off by default.  For backwards-compatibility, the
+% 		option \TB{nolocalmarks} which used to switch off the previous default, and
+% 		now does nothing, is still available.
+% 
+% 	\item \TB{quiet} turns off most info messages and some of the warnings issued
+% 		by \LaTeX, \pkg{fontspec} and \pkg{polyglossia}.
 % \end{itemize}
 % 
 % \section{Language-switching commands}\label{languageswitching}
 % 
-% \subsection{Recommended commands}
+% \subsection{Recommended commands}\label{sec:langcmds}
 % For each activated language the command
 % \cmd{\text⟨lang⟩[⟨options⟩]\{…\}} \DescribeMacro{\text⟨lang⟩}
+% (as well as the synonymous \DescribeMacro{\textlang}%
+% \cmd{\textlang[⟨options⟩]\{⟨lang⟩\}\{…\}}\new{1.46})
 % becomes available for short insertions of text in that language.
-% For example ¦\textrussian{\today}¦ yields \textrussian{\today}
-% This command switches to the correct hyphenation patterns, it activates
+% For example ¦\textrussian{\today}¦ and ¦\textlang{russian}{\today}¦ yield \textrussian{\today}
+% The commands switch to the correct hyphenation patterns, they activate
 % some extra features for the selected language (such as extra spacing before
-% punctuation in French), and it translates the date when using ¦\today¦.
-% It does not, however, translate so-called \textit{caption strings}, i.\,e.
+% punctuation in French), and they translate the date when using ¦\today¦.
+% They do not, however, translate so-called \textit{caption strings},\ie
 % ``chapter'', ``figure'' etc., to the local language (these remain in the main
 % language).
 % 
 % The\DescribeEnv{⟨lang⟩}\ environment ¦⟨lang⟩¦, which is also available for any activated language,
-% is meant for longer passages of text. It behaves slightly different than the \cmd{\text⟨lang⟩\{…\}}
-% command: It does everything the latter does, but additionally, the caption strings are translated
-% as well, and the language is also passed to auxiliary files, the table of contents and the lists of
-% figures/tables.
-% Like the command, the environment provides the possibility of setting language options locally.
+% is meant for longer passages of text. It behaves slightly different than the \cmd{\text⟨lang⟩} and
+% \cmd\textlang\ commands: It does everything the latter do, but additionally, the caption strings
+% are translated as well, and the language is also passed to auxiliary files, the table of contents
+% and the lists of figures/tables.
+% Like the commands, the environment provides the possibility of setting language options locally.
 % For instance the following allows us to quote the beginning
 % of Homer’s \textit{Iliad}:
 % 
 % \begin{Verbatim}[formatcom=\color{myblue}]
-% \begin{greek}[variant=ancient]
-% μῆνιν ἄειδε θεὰ Πηληϊάδεω Ἀχιλῆος οὐλομένην, ἣ μυρί' Ἀχαιοῖς ἄλγε'
-% ἔθηκε, πολλὰς δ' ἰφθίμους ψυχὰς Ἄϊδι προί̈αψεν ἡρώων, αὐτοὺς δὲ ἑλώρια
-% τεῦχε κύνεσσιν οἰωνοῖσί τε πᾶσι, Διὸς δ' ἐτελείετο βουλή, ἐξ οὗ δὴ τὰ
-% πρῶτα διαστήτην ἐρίσαντε Ἀτρεί̈δης τε ἄναξ ἀνδρῶν καὶ δῖος Ἀχιλλεύς.
-% \end{greek}
+%   \begin{quote}
+%    \begin{greek}[variant=ancient]
+%      μῆνιν ἄειδε θεὰ Πηληϊάδεω Ἀχιλῆος οὐλομένην, ἣ μυρί' Ἀχαιοῖς
+%      ἄλγε' ἔθηκε, πολλὰς δ' ἰφθίμους ψυχὰς Ἄϊδι προί̈αψεν ἡρώων,
+%      αὐτοὺς δὲ ἑλώρια τεῦχε κύνεσσιν οἰωνοῖσί τε πᾶσι, Διὸς δ'
+%      ἐτελείετο βουλή, ἐξ οὗ δὴ τὰ πρῶτα διαστήτην ἐρίσαντε Ἀτρεί̈δης
+%      τε ἄναξ ἀνδρῶν καὶ δῖος Ἀχιλλεύς.
+%    \end{greek}
+%   \end{quote}
 % \end{Verbatim}
 % 
+% \vspace{-.5\baselineskip}
+% 
+% \begin{quote}
 % \begin{greek}[variant=ancient]
 % μῆνιν ἄειδε θεὰ Πηληϊάδεω Ἀχιλῆος οὐλομένην, ἣ μυρί' Ἀχαιοῖς ἄλγε' ἔθηκε,
 % πολλὰς δ' ἰφθίμους ψυχὰς Ἄϊδι προί̈αψεν ἡρώων, αὐτοὺς δὲ ἑλώρια τεῦχε κύνεσσιν
 % οἰωνοῖσί τε πᾶσι, Διὸς δ' ἐτελείετο βουλή, ἐξ οὗ δὴ τὰ πρῶτα διαστήτην ἐρίσαντε
 % Ἀτρεί̈δης τε ἄναξ ἀνδρῶν καὶ δῖος Ἀχιλλεύς.
 % \end{greek}
-% \bigskip
+% \end{quote}
 % 
 % \noindent\DescribeEnv{Arabic} Note that for Arabic one cannot use the environment ¦arabic¦,
 % as \cmd\arabic\ is defined internally by \LaTeX. In this case
 % we need to use the environment ¦Arabic¦ instead.
 % 
-% \subsection{Babel commands}
+% \subsection{Babel commands}\label{sec:babelcmds}
 % Some macros defined in \pkg{babel}’s \file{hyphen.cfg} (and thus usually
 % compiled into the \XeLaTeX\ and \LuaLaTeX\ format) are redefined, but keep a
 % similar behaviour.
@@ -605,7 +660,7 @@ issues and follow progress.
 % ¦\selectlanguage{⟨lang⟩}¦ and the ¦otherlanguage¦ environment are identical to the
 % the ¦⟨lang⟩¦ environment, except that ¦\selectlanguage{⟨lang⟩}¦
 % does not need to be explicitly closed. The command ¦\foreinlanguage{⟨lang⟩}{…}¦ and the ¦otherlanguage*¦
-% environment are identical with the use of the ¦\text⟨lang⟩¦ command, with the one
+% environment are identical with the use of the ¦\text⟨lang⟩¦ or ¦\textlang¦ command, with the one
 % notable exception that they do not translate the date with ¦\today¦.
 % 
 % Since the \XeLaTeX\ and \LuaLaTeX\ format incorporate \pkg{babel}’s \file{hyphen.cfg},
@@ -614,12 +669,13 @@ issues and follow progress.
 % 
 % \subsection{Other commands}
 % The following commands are probably of lesser interest to the end user, but
-% ought to be mentioned here.
+% ought to be mentioned here.\footnote{Note that these commands require polyglossia
+% language names; they do not support language\slash babel aliases.}
 % \begin{itemize}
-% \item \Cmd\selectbackgroundlanguage: this selects the global font setup and
-% 	the numbering definitions for the default language.
+% \item \DescribeMacro{\selectbackgroundlanguage}\cmd{\selectbackgroundlanguage\{⟨lang⟩\}}:
+%     this selects the global font setup and the numbering definitions for the default language.
 % 
-% \item \Cmd\resetdefaultlanguage\ (experimental):
+% \item \DescribeMacro{\resetdefaultlanguage}\cmd{\resetdefaultlanguage[⟨options⟩]\{⟨lang⟩\}} (experimental):
 % 	completely switches the default language
 % 	to another one in the middle of a document: \textit{this may have adverse effects}!
 % 
@@ -630,9 +686,34 @@ issues and follow progress.
 % 
 % \item \Cmd\latinalph: Representation of counter as a lower-case letter:  1 = a, 2 = b, etc.
 % 
-% \item \Cmd\latinAlph: Representation of counter as a uper-case letter:  1 = A, 2 = B, etc.
+% \item \Cmd\latinAlph: Representation of counter as a upper-case letter:  1 = A, 2 = B, etc.
 % \end{itemize}
 % 
+% 
+% \subsection{Setting up alias commands}
+% 
+% By means of the macro
+% \displaycmd{\setlanguagealias[⟨options⟩]\{⟨language⟩\}\{⟨alias⟩\}}{\setlanguagealias}\new{v1.46}
+% you can define alias commands for specific language (variants). \Eg
+% 
+% \begin{quote}
+% \begin{verbatim}
+% \setlanguagealias[variant=austrian]{german}{deAT}
+% \end{verbatim}
+% \end{quote}
+% ^^A
+% will define a command \cmd{\textdeAT} as well as an environment ¦{deAT}¦ which will link towards
+% the command \cmd{\textgerman[variant=austrian]} and the environment ¦{german}[variant=austrian]¦,
+% respectively. The aliases can also be used in the language switching commands described in
+% section~\ref{sec:langcmds} and \ref{sec:babelcmds}.
+% Note, though, that the usual restrictions for command names apply, so something such as
+% ¦de-AT¦ or ¦de_AT¦ will not work since ¦-¦ and ¦_¦ are not allowed in command names.
+% 
+% For the latter case, and for the case where an alias would clash with an existing \cmd{\text⟨...⟩}
+% command (\eg ¦\textit¦), a starred version \Cmd{\setlanguagealias*} is provided which does not define
+% a \cmd{\text⟨alias⟩} command (but which will set up the alias for everything else, including
+% \cmd{\textlang\{⟨alias⟩\}}).
+% 
 % \section{Font setup}
 % 
 % With polyglossia it is possible to associate a specific font with any script or language
@@ -641,11 +722,12 @@ issues and follow progress.
 % For instance, if the default font defined by \cmd\setmainfont\
 % does not support Greek, then one can define the font used to display Greek with:\\
 % \centerline{ \cmd\newfontfamily\cmd{\greekfont[Script=Greek,⟨…⟩]\{⟨font⟩\}}. }
-% Note that polyglossia will use the font thus defined as is.
-% for instance if ¦\arabicfont¦ is explicitly defined, then one should take care of
-% including the option ¦Script=Arabic¦ in that definition.
-% See the \pkg{fontspec} documentation for more information.
-% If a specific sans or monospace font is needed for a particular script or language,
+% Note that polyglossia will use the font defined as is, so assure to do all necessary settings
+% (please refer to the \pkg{fontspec} documentation for details).
+% For instance, if ¦\arabicfont¦ is explicitly defined, then the option ¦Script=Arabic¦ should
+% be included in that definition.
+% 
+% If a specific sans serif or monospace (`teletype') font is needed for a particular script or language,
 % it can be defined by means of \new{v1.2.0}
 % ¦\⟨script⟩fontsf¦\ or ¦\⟨language⟩fontsf¦ and ¦\⟨script⟩fonttt¦\ or ¦\⟨language⟩fonttt¦, respectively.
 % 
@@ -674,7 +756,7 @@ issues and follow progress.
 % \end{Verbatim}
 % ^^A
 % These exceptions, however, apply to all languages. In addition to this, \pkg{polyglossia} provides
-% the command\new{v.1.45}
+% the command\new{v1.45}
 % \displaycmd{\pghyphenation[⟨options⟩]\{⟨lang⟩\}\{⟨exceptions⟩\}}{\pghyphenation}
 % which can be used to define exceptions that only apply to a specific language or language variant,
 % respectively.
@@ -695,6 +777,24 @@ issues and follow progress.
 % 
 % ^^A\subsection{amharic}\label{amharic}
 % 
+% \subsection{afrikaans}\label{afikaans}
+% \paragraph*{Options:}
+% \begin{itemize}
+% 	\item \TB{babelshorthands} = \textit{false} or true. \new{v1.1.1}
+% 	if this is turned on, the following shorthands defined for fine-tuning hyphenation and
+% 	micro-typography of Afrikaans words are activated:
+% 	\begin{shorthands}
+% 		\item[¦"-¦] adds a hyphenation point that does still allow for hyphenation at the points preset
+% 		in the hyphenation patterns (as opposed to ¦\-¦ in default \TeX).
+% 		\item[\texttt{"\textasciitilde}] for a hyphen sign without a breakpoint. Useful for
+% 		cases where the hyphen should stick at the following syllable.
+% 		\item[¦"|¦] disables a ligature at this position.
+% 		\item[¦""¦] allows for a line break at this position (without hyphenation sign).
+% 		\item[¦"/¦] a slash that allows for a subsequent line break. As opposed to ¦\slash¦,
+% 		hyphenation at the breakpoints preset in the hyphenation patterns is still allowed.
+% 	\end{shorthands}
+% \end{itemize}
+% 
 % \subsection{arabic}\label{arabic}
 % \paragraph*{Options:}
 % 	\begin{itemize}
@@ -726,6 +826,42 @@ issues and follow progress.
 % 	\item \TB{numerals}\new{v1.45} = armenian or \textit{arabic}
 % \end{itemize}
 % 
+% \subsection[belarusian]{belarusian\new{v1.46}}\label{belarusian}
+% 
+% \paragraph*{Options:}
+% \begin{itemize}
+% 	\item \TB{babelshorthands} = \textit{false} or true.
+% 	If this is turned on, the following shorthands are activated:
+% 	\begin{shorthands}
+% 		\item[¦"-¦] adds a hyphenation point that does still allow for hyphenation at the points preset
+% 		in the hyphenation patterns (as opposed to ¦\-¦).
+% 		\item[\texttt{"\textasciitilde}] for a hyphen sign without a breakpoint. Useful for
+% 		cases where the hyphen should stick at the following syllable.
+% 		\item[¦"|¦] disables a ligature at this position.
+% 		\item[¦""¦] allows for a line break at this position (without hyphenation sign).
+% 		\item[¦"---¦] Cyrillic emdash in plain text.
+% 		\item[¦"--~¦] Cyrillic emdash in compound names (surnames).
+% 		\item[¦"--*¦] Cyrillic emdash for denoting direct speech.
+% 		\item[¦",¦] thinspace for initials with a breakpoint in following surname.
+% 		\item[¦"‘¦] for German left double quotes (looks like ,,).
+% 		\item[¦"’¦] for German right double quotes (looks like “).
+% 		\item[¦"<¦] for French left double quotes (looks like <<).
+% 		\item[¦">¦] for French right double quotes (looks like >>).
+% 	\end{shorthands}
+% 	\item \TB{numerals} = \textit{arabic} or cyrillic. Uses either Arabic numerals or Cyrillic
+% 	alphanumerical numbering.
+% 	\item \TB{spelling} = \textit{modern} or classic (=~tarask). With ¦spelling=classic¦, captions and dates
+% 	     adhere to the Taraškievica (or Belarusian classical) orthography rather than the standard orthography.
+% \end{itemize}
+% ^^A
+% \paragraph*{Commands:}
+% \begin{itemize}
+% 	\item \Cmd\Asbuk: produces uppercased Cyrillic alphanumerals, for
+% 	environments such as ¦enumerate¦. The command takes a counter as argument,
+% 	\eg ¦\textbelarusian{\Asbuk{page}}¦ produces \textrussian{\Asbuk{page}}.
+% 	\item \Cmd\asbuk: same in lowercase
+% \end{itemize}
+% 
 % \subsection[bengali]{bengali\new{v1.2.0}}\label{bengali}
 % \paragraph*{Options:}
 % 	\begin{itemize}
@@ -756,25 +892,25 @@ issues and follow progress.
 % 	\begin{shorthands}
 % 		\item[¦"=¦] for an explicit hyphen sign which is repeated at the beginning
 % 		            of the next line when hyphenated, as common in Czech typesetting
-% 		            (also see option ¦splithyphens¦).
+% 		            (only needed with ¦splithyphens=false¦).
 % 		\item[¦"‘¦] for Czech left double quotes (looks like ,,).
 % 		\item[¦"’¦] for Czech right double quotes (looks like “).
 % 		\item[¦">¦] for Czech left double guillemets (looks like >>).
 % 		\item[¦"<¦] for Czech right double guillemets (looks like <<).
 % 	\end{shorthands}
-% 	\item \TB{splithyphens} = \textit{false} or true. \new{v1.45}
+% 	\item \TB{splithyphens} = false or \textit{true}.\new{v1.45}
 % 	      According to Czech typesetting conventions, if a word with a hard hyphen (such as \emph{je-li})
 % 	      is hyphenated at this hyphen, a second hyphenation character is to be inserted at the beginning
-% 	      of the line that follows the hyphenation (\emph{je-/-li}).\\
-%           If this option is true, this is done automatically (so the shorthand ¦"=¦ is not needed).
-%           Note, however, that the option is only available for \XeTeX. If you are using \LuaTeX,
-%           load the \pkg{luavlna} package to the same effect.
-%     \item \TB{vlna} = \textit{false} or true. \new{v1.45}
+% 	      of the line that follows the hyphenation (\emph{je-/-li}).
+%           By default, this is done automatically\new{v1.46} (if you are using \LuaTeX, the \pkg{luavlna} package is
+%           loaded to achieve this).
+%           Set this option to ¦false¦ to disable the feature.
+%     \item \TB{vlna} = false or \textit{true}. \new{v1.45}
 %          According to Czech typesetting conventions, single-letter words (non-syllable prepositions)
-%          must not occur at line ends.\\
-%          If this option is true, this is taken care of. Note, however, that the option
-%          is only available for \XeTeX. If you are using \LuaTeX, load the \pkg{luavlna} package
-%          to the same effect.
+%          must not occur at line ends.
+%          \pkg{Polyglossia} takes care of this automatically by default\new{v1.46} (if you are using \LuaTeX, the
+%          \pkg{luavlna} package is loaded to achieve this).
+%          Set this option to ¦false¦ to disable the feature.
 % \end{itemize}
 % 
 % \subsection{dutch}\label{dutch}
@@ -835,14 +971,31 @@ issues and follow progress.
 % 	\begin{itemize}
 % 		\item\TB{variant} = \textit{french} or canadian (=~acadian).\new{v1.45}
 % 		Currently, the three variants do not differ; they are supported for compatibility with \pkg{babel} (where they do not differ either).
-% 		\item \TB{autospacing} = true or \textit{false} (default value = true). One of the most distinct features of French typography is the addition
+% 		\item \TB{autospacing} = \textit{true} or false. One of the most distinct features of French typography is the addition
 % 		of extra spacing around punctuation and quotation marks (guillemets). By default, polyglossia adds these spaces automatically, so you don't need
 % 		to enter them. This options allows you to switch this feature off globally.
-% 		\item \TB{autospaceguillemets}\footnote{Up to version 1.44, the option was called \textit{automaticspacesaroundguillemets}. For backards compatibility reasons, the more verbose old option is still supported.} = true or \textit{false} (default value = true). If you only want to disable the automatic addition of spacing after opening and before closing guillemets (and not at punctuation), set this to \textit{false}. Note
-% 		that the more general option \textit{autospacing} overrides this.
+% 		\item \TB{thincolonspace}\new{v1.46} = true or \textit{false}. Normally, a
+% 		full (non-breaking) interword space is inserted before a colon. Use this
+% 		option if you prefer a thinner space as used before \texttt{;}, \texttt{!},
+% 		and \texttt{?}.
+% 		\item \TB{autospaceguillemets}\footnote{Up to version 1.44, the option was
+% 		called \textit{automaticspacesaroundguillemets}. For backards compatibility
+% 		reasons, the more verbose old option is still supported.} = \textit{true}
+% 		or false. If you only want to disable the automatic addition of spacing
+% 		after opening and before closing guillemets (and not at punctuation), set
+% 		this to \textit{false}. Note that the more general option
+% 		\textit{autospacing} overrides this.
 % 		\item \TB{autospacetypewriter}\footnote{Babel's syntax \textit{OriginalTypewriter} is also supported.}\new{1.45} = true or \textit{false} (default value = true). By default, automatic spacing is disabled in typewriter font. If this is enabled, spacing in typewriter context is the same as with roman and sans serif font, depending on the \textit{autospacing} and \textit{autospaceguillemets} settings (note that this was the default up to v.~1.44).	
 % 		\item \TB{frenchfootnote} = true or \textit{false} (default value = true). If \textit{true}, footnotes start with a non-superscripted number followed by a dot, as common in French typography. Note that this might interfere with the specific footnote handling of classes or packages.
 % 		Also note that this option is only functional (by design) if French is the main language.
+% 		\item \TB{frenchitemlabels}\new{v.1.46} = true or \textit{false} (default value = true). If \textit{true}, itemize item labels use em-dashes throughout,
+% 		as common in French typography.
+% 		Note that this option is only functional (by design) if French is the main language. Also, it might interfere with list packages such as \pkg{enumitem}.
+% 		\item \TB{itemlabels}\new{v.1.46} = ¦⟨cmd⟩¦ (default value = ¦\textemdash¦). If \emph{frenchitemlabels} is true, you can customize here the used item label of all levels.
+% 		\item \TB{itemlabeli}\new{v.1.46} = ¦⟨cmd⟩¦ (default value = ¦\textemdash¦). If \emph{frenchitemlabels} is true, you can customize here the used item label of the first level.
+% 		\item \TB{itemlabelii}\new{v.1.46} = ¦⟨cmd⟩¦ (default value = ¦\textemdash¦). If \emph{frenchitemlabels} is true, you can customize here the used item label of the second level.
+% 		\item \TB{itemlabeliii}\new{v.1.46} = ¦⟨cmd⟩¦ (default value = ¦\textemdash¦). If \emph{frenchitemlabels} is true, you can customize here the used item label of the third level.
+% 		\item \TB{itemlabeliv}\new{v.1.46} = ¦⟨cmd⟩¦ (default value = ¦\textemdash¦). If \emph{frenchitemlabels} is true, you can customize here the used item label of the fourth level.
 % 	\end{itemize}
 % \paragraph*{Commands:}
 % \begin{itemize}
@@ -856,6 +1009,34 @@ issues and follow progress.
 % 	\item \TB{variant} = \textit{irish} or scottish
 % \end{itemize}
 % 
+% \subsection[georgian]{georgian\new{v1.46}}\label{georgian}
+% 
+% \paragraph*{Options:}
+% \begin{itemize}
+% 	\item \TB{babelshorthands} = \textit{false} or true.
+% 	If this is turned on, the following shorthands are activated:
+% 	\begin{shorthands}
+% 		\item[¦"-¦] adds a hyphenation point that does still allow for hyphenation at the points preset
+% 		in the hyphenation patterns (as opposed to ¦\-¦).
+% 		\item[\texttt{"\textasciitilde}] for a hyphen sign without a breakpoint. Useful for
+% 		cases where the hyphen should stick at the following syllable.
+% 		\item[¦"|¦] disables a ligature at this position.
+% 		\item[¦""¦] allows for a line break at this position (without hyphenation sign).
+% 		\item[¦"---¦] Cyrillic emdash in plain text.
+% 		\item[¦"--~¦] Cyrillic emdash in compound names (surnames).
+% 		\item[¦"--*¦] Cyrillic emdash for denoting direct speech.
+% 		\item[¦",¦] thinspace for initials with a breakpoint in following surname.
+% 		\item[¦"‘¦] for German left double quotes (looks like ,,).
+% 		\item[¦"’¦] for German right double quotes (looks like “).
+% 		\item[¦"<¦] for French left double quotes (looks like <<).
+% 		\item[¦">¦] for French right double quotes (looks like >>).
+% 	\end{shorthands}
+% 	\item \TB{numerals} = \textit{arabic} or georgian. Uses either Arabic numerals or Georgian
+% 	      alphanumerical numbering.
+%     \item \TB{oldmonthnames} = \textit{true} or false (default: false). Uses traditional Georgian
+%           month names.
+% \end{itemize}
+% 
 % \subsection{german}\label{german}
 % \paragraph*{Options:}
 % 	\begin{itemize}
@@ -897,8 +1078,9 @@ issues and follow progress.
 % 		\item[¦"<¦] for French left double quotes («)
 % 		\item[¦">¦] for French right double quotes (»).
 % 		\end{shorthands}
-% 	\item\TB{script} = \textit{latin} or fraktur.\new{v1.2.0}
-% 		Setting script=fraktur modifies the captions for typesetting German in Fraktur.
+% 	\item\TB{script} = \textit{latin} or blackletter\new{v1.46} (=~fraktur\new{v1.2.0}).
+% 		Setting ¦script=blackletter¦ adapts the captions for typesetting German in blackletter type (using the long s (ſ)
+% 		where appropriate).
 % 	\end{itemize}
 % 
 % \subsection{greek}\label{greek}
@@ -939,6 +1121,27 @@ issues and follow progress.
 % 	\end{itemize}
 % 
 % \subsection{hungarian}\label{hungarian}
+% \paragraph*{Options:}
+% \begin{itemize}
+% 	\item \TB{swapstrings} = \textit{all}, captions, headings, headers, hheaders or none\new{v1.46}
+% 	      
+% 	       In Hungarian, some caption strings need to be in a different order than in other languages
+% 	       (\eg \emph{1. fejezet} instead of \emph{Chapter 1}). By default, \pkg{polyglossia} tries hard to
+% 	       provide the correct order for different classes and packages (standard classes, \pkg{KOMA-script},
+% 	       \pkg{memoir}, and \pkg{titlesec} package should work, as well as \pkg{fancyhdr} and \pkg{caption}).
+% 	       However, since the definition of these strings is not standardized, the redefinitions might not work
+% 	       and even interfere badly if you use specific classes or packages that redefine the respective strings
+% 	       themselves. In this case, you can disable some or all changes.
+% 	       The possibilities are:
+% 	       \begin{itemize}
+% 	       	\item ¦all¦: Redefine figure and table captions, part and chapter headings, and running headers (=~default setting)
+% 	       	\item ¦captions¦: Redefine figure and table captions only
+% 	       	\item ¦headings¦: Redefine part and chapter headings only
+% 	       	\item ¦headers¦: Redefine running headers only
+% 	       	\item ¦hheaders¦: Redefine part and chapter headings as well as running headers
+% 	       	\item ¦none¦: Do not redefine anything
+% 	       \end{itemize}
+% \end{itemize}
 % \paragraph*{Commands:}
 % \begin{itemize}
 % 	\item \Cmd\ontoday\ (= \Cmd\ondatehungarian): special form of \cmd\today\ which produces a slightly different
@@ -973,7 +1176,6 @@ issues and follow progress.
 %   \end{itemize}
 % 
 % \subsection[kurdish]{kurdish\new{v1.45}}\label{kurdish}
-% Kurdish support includes Sorani Kurdish and Kurmanji Kurdish, both in either Arabic or Latin script.
 % 
 % \paragraph*{Options:}
 % \begin{itemize}
@@ -982,9 +1184,10 @@ issues and follow progress.
 % 	\item \TB{numerals} = western or eastern. Defaults are ¦western¦ for Latin and ¦eastern¦ for Arabic script, depending on the selection above.
 % 	\item \TB{abjadjimnotail} = \textit{false} or true.
 % 	Set this to true if you want the \textit{abjad} form of the number three to be \textarabic{ج‍} – as in the manuscript tradition – instead of the modern usage \textarabic{ج}.
-% 	\item \TB{locale} (not yet implemented)
-% 	\item \TB{calendar} (not yet implemented)
+% ^^A	\item \TB{locale} (not yet implemented)
+% ^^A	\item \TB{calendar} (not yet implemented)
 % \end{itemize}
+% \condbreak{2\baselineskip}
 % \paragraph*{Commands:}
 % \begin{itemize}
 % 	\item \Cmd\ontoday: special form of \cmd\today\ which produces a slightly different
@@ -1001,9 +1204,152 @@ issues and follow progress.
 % 
 % \subsection{latin}\label{latin}
 % \paragraph*{Options:}
-% 	\begin{itemize}
-% 	\item \TB{variant} = classic, medieval or \textit{modern}
-% 	\end{itemize}
+% \begin{itemize}
+% 	\item \TB{variant} = classic, medieval, \emph{modern}, or ecclesiastic\new{v.1.46}
+% 
+% 			These variants refer to different spelling conventions. The ¦classic¦
+% 			and the ¦medieval¦ variant do not use the letters \emph{U} and
+% 			\emph{v}, but only \emph{V} and \emph{u}. This concerns predefined terms like
+% 			month names as well as the behaviour of the \cmd\MakeUppercase\ and the
+% 			\cmd\MakeLowercase\ command. The ¦medieval¦ and the
+% 			¦ecclesiastic¦ variant use the ligatures \emph{\ae} and \emph{\oe}.
+% 			See table \ref{tab:latin-spelling} for examples.
+% 
+% 			Furthermore, the \texttt{ecclesiastic} variant takes care for a punctuation
+% 			spacing similar to French, but with smaller spaces, as provided for
+% 			PDF\TeX\ by the \pkg{ecclesiastic} package.
+% 			\begin{table}
+% 			\centering
+% 			\caption{\label{tab:latin-spelling}Spelling differences between the Latin
+% 				language variants.\newline The capitalization of month names and the use of
+% 				\emph{i/j} may be affected by the \texttt{capitalizemonth} and the
+% 				\texttt{usej} option.}
+% 			\begin{tabular}{llll}
+% 			\toprule
+% 			\textbf{classic} & \textbf{medieval} & \textbf{modern} & \textbf{ecclesiastic} \\
+% 			\midrule
+% 			Ianuarii & Ianuarii & Ianuarii & ianuarii \\
+% 			Nouembris & Nouembris & Novembris & novembris \\
+% 			Praefatio & Præfatio & Praefatio & Præfatio \\
+% 			\addlinespace\multicolumn{4}{@{}l}{\cmd{\MakeUppercase\{Iulius\}} yields:} \\
+% 			IVLIVS & IVLIVS & IULIUS & IULIUS \\
+% 			\bottomrule
+% 			\end{tabular}
+% 			\end{table}
+% 	\item \TB{hyphenation}\new{v.1.46} = classic, modern, or liturgical
+% 
+% 			There are three different sets of hyphenation patterns for Latin. Separate
+% 			documention for them is available on the
+% 			Internet.\footnote{\url{https://github.com/gregorio-project/hyphen-la/blob/master/doc/README.md\#hyphenation-styles}}
+% 			Each of the four variants mentioned above has its default set of hyphenation
+% 			patterns as indicated by table \ref{tab:latin-hyphenation}. Use the
+% 			¦hyphenation¦ option if the default style does not fit your needs.
+% 			Note that the liturgical hyphenation patterns are the default of none of the
+% 			language variants. To use them, you have to say
+% 			¦hyphenation=liturgical¦ in any case.
+% 			\begin{table}
+% 			\caption{\label{tab:latin-hyphenation}Latin default hyphenation styles}
+% 			\centering
+% 			\begin{tabular}{ll}
+% 			\toprule
+% 			\textbf{Language variant} & \textbf{Default hyphenation style} \\
+% 			\midrule
+% 			classic & classic \\
+% 			medieval & modern \\
+% 			modern & modern \\
+% 			ecclesiastic & modern \\
+% 			\bottomrule
+% 			\end{tabular}
+% 			\end{table}
+% 	\item \TB{ecclesiasticfootnotes}\new{v.1.46} = true or \emph{false}
+% 
+% 			Use footnotes as provided by the \pkg{ecclesiastic} package, which typesets
+% 			footnotes with ordinary instead of superior numbers and without indentation.
+% 			As many ecclesiastic documents and liturgical books use footnotes that are
+% 			very similar to the ordinary \LaTeX\ ones, we do not use this footnote style
+% 			as default even for the ¦ecclesiastic¦ variant.
+% 		
+% 			Note that this option is only possible if Latin is the main language of your
+% 			document.
+% 	\item \TB{usej}\new{v.1.46} = true or \emph{false}
+% 
+% 			Use \emph{J/j} in predefined terms. The letter \emph{j} is not of ancient
+% 			origin. In early modern times, it was used to distinguish the consonantic
+% 			\emph{i} from the vocalic~\emph{i}. Nowadays, the use of \emph{j} has
+% 			disappeared from most Latin publications. So ¦false¦ is the default
+% 			value for all four language variants. Use this option if you prefer
+% 			\emph{Januarii} and \emph{Maji} to \emph{Ianuarii} and \emph{Maii}.
+% 			\item \TB{capitalizemonth}\new{v.1.46} = true or false
+% 		
+% 			Capitalize the month name when printing dates (using the \cmd\today\
+% 			command).  Traditionally, month names are capitalized. However, in recent
+% 			liturgical books they are lowercase. So ¦true¦ is the default value for
+% 			the variants ¦classic¦, ¦medieval¦, and ¦modern¦,
+% 			whereas ¦false¦ is the default value for the ¦ecclesiastic¦
+% 			variant.
+% 	\item \TB{babelshorthands} = true or \emph{false}
+% 
+% 			Enable the following shorthands inherited from \pkg{babel-latin} and the
+% 			\pkg{ecclesiastic} package.
+% 			\begin{shorthands}
+% 				\item[¦"<¦] for « (left guillemet)
+% 				\item[¦">¦] for » (right guillemet)
+% 				\item[¦"¦] If no other shorthand applies, ¦"¦ before any letter
+% 					character defines an optional break point allowing further break points
+% 					within the same word (as opposed to the \cmd\- command).
+% 				\item[¦"|¦] the same as ¦"¦, but also possible before non-letter
+% 					characters
+% 				\item[¦'a¦] for á (a with acute), also available for é, í, ó, ú, ý, ǽ, and
+% 					\'œ
+% 				\item[¦'A¦] for Á (A with acute), also available for É, Í, Ó, Ú, \'V, Ý, Ǽ,
+% 					and \'Œ
+% 			\end{shorthands}
+% 			The following shorthands are only available for the ¦medieval¦ and the
+% 			¦ecclesiastic¦ variant.
+% 			\begin{shorthands}
+% 				\item[¦"ae¦] for æ (ae ligature), also available for œ
+% 				\item[¦"Ae¦] for Æ (AE ligature), also available for Œ
+% 				\item[¦"AE¦] for Æ (AE ligature), also available for Œ
+% 				\item[¦'ae¦] for ǽ (ae ligature with acute), also available for \'œ
+% 				\item[¦'Ae¦] for Ǽ (AE ligature with acute), also available for \'Œ
+% 				\item[¦'AE¦] for Ǽ (AE ligature with acute), also available for \'Œ
+% 			\end{shorthands}
+% 	\item \TB{prosodicshorthands}\new{v.1.46} = true or \emph{false}
+% 
+% 			Enable shorthands for prosodic marks (macrons and breves) very similiar to
+% 			those provided by \pkg{babel-latin} using the ¦withprosodicmarks¦
+% 			modifier.
+% 		
+% 			Note that the active ¦=¦ character used for macrons will cause problems with
+% 			commands using \texttt{key=value} interfaces, \eg
+% 			¦\includegraphics[scale=2]{...}¦. Use \cmd{\shorthandoff\{=\}} before
+% 			such commands (and \cmd{\shorthandon\{=\}} thereafter) within every
+% 			environment with prosodic shorthands enabled.
+% 		
+% 			The following shorthands are available.
+% 			\begin{shorthands}
+% 				\item[¦=a¦] for ā (a with macron), also available for ē, ī, ō, ū, and ȳ
+% 				\item[¦=A¦] for Ā (A with macron), also available for Ē, Ī, Ō, Ū, V̄, and Ȳ.
+% 					Note that a macron above the letter V is only displayed if your font
+% 					supports the Unicode character ¦0304¦ (\emph{combining macron}).
+% 				\item[¦=ae¦] for a͞e (ae diphthong with macron), also available for a͞u, e͞u,
+% 					and o͞e. Note that macrons above diphthongs are only displayed if your font
+% 					supports the Unicode character ¦035E¦ (\emph{combining double
+% 					macron}).
+% 				\item[¦=Ae¦] for A͞e (Ae diphthong with macron), also available for A͞u, E͞u,
+% 					and O͞e.
+% 				\item[¦=AE¦] for A͞E (AE diphthong with macron), also available for A͞U, E͞U,
+% 					and O͞E.
+% 				\item[¦\textasciicircum a¦] for ă (a with breve), also available for ĕ, ĭ,
+% 					ŏ, ŭ, and y̆.  Note that a breve above the letter y is only displayed if
+% 					your font supports the Unicode character ¦0306¦ (\emph{combining
+% 					breve}).
+% 				\item[¦\textasciicircum A¦] Ă (A with breve), also available for Ĕ, Ĭ, Ŏ,
+% 					Ŭ, V̆, and Y̆. Note that breves above the letters V and Y are only displayed
+% 					if your font supports the Unicode character ¦0306¦ (\emph{combining
+% 					breve}).
+% 			\end{shorthands}
+% \end{itemize}
 % 
 % \subsection{malay}\label{malay}
 % \paragraph*{Options:}
@@ -1043,7 +1389,7 @@ issues and follow progress.
 % \begin{itemize}
 % 	\item \Cmd\Asbuk: produces uppercased Cyrillic alphanumerals, for
 % 	environments such as ¦enumerate¦. The command takes a counter as argument,
-% 	\eg ¦\textrussian{\Asbuk{page}}¦ produces \textrussian{\Asbuk{page}}.
+% 	\eg ¦\textmongolian{\Asbuk{page}}¦ produces \textrussian{\Asbuk{page}}.
 % 	\item \Cmd\asbuk: same in lowercase
 % \end{itemize}
 % 
@@ -1059,8 +1405,8 @@ issues and follow progress.
 % 	\item \TB{numerals} = western or \textit{eastern}
 % 	\item \TB{abjadjimnotail} = \textit{false} or true. \new{v1.0.3}
 % 	Set this to true if you want the \textit{abjad} form of the number three to be \textarabic{ج‍} – as in the manuscript tradition – instead of the modern usage \textarabic{ج}.
-% 	\item \TB{locale} (not yet implemented)
-% 	\item \TB{calendar} (not yet implemented)
+% ^^A	\item \TB{locale} (not yet implemented)
+% ^^A	\item \TB{calendar} (not yet implemented)
 % \end{itemize}
 % \paragraph*{Commands:}
 % \begin{itemize}
@@ -1096,6 +1442,9 @@ issues and follow progress.
 % ^^A		\item[¦"<¦] for French left double quotes (looks like <<).
 % ^^A		\item[¦">¦] for French right double quotes (looks like >>).
 % 	\end{shorthands}
+%     \item \TB{indentfirst}\new{v1.46} = \textit{true} or false. By default, all paragraphs are indented in Russian,
+%           also those after a chapter or section heading. If this option is false, the latter paragraphs
+%           are not indented, as normal in \LaTeX. 
 % 	\item \TB{spelling} = \textit{modern} or old (for captions and date only, not for hyphenation)
 % 	\item \TB{numerals} = \textit{arabic} or cyrillic. Uses either Arabic numerals or Cyrillic
 % 	alphanumerical numbering.
@@ -1115,17 +1464,17 @@ issues and follow progress.
 % \subsection{sanskrit}\label{sanskrit}
 % \paragraph*{Options:}
 % 	\begin{itemize}
-% 	\item \TB{Script} = \textit{Devanagari}\new{v1.0.2}, Gujarati, Malayalam, Bengali, Kannada,
+% 	\item \TB{script} = \textit{Devanagari}\new{v1.0.2}, Gujarati, Malayalam, Bengali, Kannada,
 % 	Telugu or Latin.
-% 	The value is passed to \pkg{fontspec} in cases where the respective ¦\<script>font¦ is not defined.
+% 	The value is passed to \pkg{fontspec} in cases where the respective ¦\⟨script⟩font¦ is not defined.
 % 	This can be useful if you typeset Sanskrit texts in scripts other than Devanagari.
-% 	\item \TB{Numerals} = \textit{Devanagari}\new{v1.45} or Western
+% 	\item \TB{numerals} = \textit{Devanagari}\new{v1.45} or Western
 % 	\end{itemize}
 %  
 % \subsection{serbian}\label{serbian}
 % \paragraph*{Options:}
 % 	\begin{itemize}
-% 	\item \TB{Script} = \textit{Cyrillic} or Latin. Will likely go to a variant.
+% 	\item \TB{script} = \textit{Cyrillic} or Latin.
 % 	\item \TB{numerals} = \textit{arabic} or cyrillic. Uses either Arabic numerals or Cyrillic
 % 	      alphanumerical numbering.
 % 	\end{itemize}
@@ -1138,6 +1487,44 @@ issues and follow progress.
 % \end{itemize}
 % 
 % 
+% \subsection{slovak}\label{slovak}
+% 
+% \paragraph*{Options:}
+% \begin{itemize}
+% 	\item \TB{babelshorthands} = \textit{false} or true. \new{v1.46}
+% 	if this is turned on, the following shorthands for Slovak are activated:
+% 	\begin{shorthands}
+%         \item[¦"=¦] for an explicit hyphen sign which is repeated at the beginning
+%                     of the next line when hyphenated, as common in Slovak typesetting
+% 		            (only needed with ¦splithyphens=false¦).
+%         \item[¦"|¦] disables a ligature at this position.
+%         \item[\texttt{"\textasciitilde}] for a hyphen sign without a breakpoint. Useful for
+%                     cases where the hyphen should stick at the following syllable.
+%         \item[¦"-¦] adds a hyphenation point that does still allow for hyphenation at the points preset
+%                     in the hyphenation patterns (as opposed to ¦\-¦).
+%         \item[¦""¦] allows for a line break at this position (without hyphenation sign).
+%         \item[¦"/¦] a slash that allows for a subsequent line break. As opposed to ¦\slash¦, hyphenation at the breakpoints
+%                     preset in the hyphenation patterns is still allowed.
+%         \item[¦"‘¦] for Slovak left double quotes (looks like ,,).
+%         \item[¦"’¦] for Slovak right double quotes (looks like “).
+%         \item[¦">¦] for Slovak left double guillemets (looks like >>).
+%         \item[¦"<¦] for Slovak right double guillemets (looks like <<).
+% 	\end{shorthands}
+% 	\item \TB{splithyphens} = \textit{false} or true. \new{v1.46}
+% 	      According to Slovak typesetting conventions, if a word with a hard hyphen (such as \emph{je-li})
+% 	      is hyphenated at this hyphen, a second hyphenation character is to be inserted at the beginning
+%           of the line that follows the hyphenation (\emph{je-/-li}).
+% 	      By default, this is done automatically (if you are using \LuaTeX, the \pkg{luavlna} package is
+% 	      loaded to achieve this).
+% 	      Set this option to ¦false¦ to disable the feature.
+% 	\item \TB{vlna} = \textit{false} or true. \new{v1.46}
+% 	      According to Slovak typesetting conventions, single-letter words (non-syllable prepositions)
+% 	      must not occur at line ends.
+% 	      \pkg{Polyglossia} takes care of this automatically by default (if you are using \LuaTeX, the
+% 	      \pkg{luavlna} package is loaded to achieve this).
+% 	      Set this option to ¦false¦ to disable the feature.
+% \end{itemize}
+% 
 % \subsection{slovenian}\label{slovenian}
 % \paragraph*{Options:}
 % 	\begin{itemize}
@@ -1156,6 +1543,35 @@ issues and follow progress.
 % 	\item \Cmd\oldtoday: outputs the current date using traditional Sorbian month names, even if \TB{olddate} is false.
 % \end{itemize}
 % 
+% \subsection{spanish}\label{spanish}
+% \paragraph*{Options:}
+% \begin{itemize}
+% 	\item \TB{variant} = \textit{spanish} or mexican.\new{v1.46}
+% 	\item \TB{spanishoperators} = all, accented, spaced or none or \textit{false} (default value = all).\new{v1.46}
+% 	      Determines of and how math operators are localized to Spanish.
+% 	      \begin{itemize}
+% 	      	\item ¦accented¦ causes some math operators to use accents where usual in Spanish (\emph{lím},
+% 	      	      \emph{lím\,sup}, \emph{lím\,inf}, \emph{máx}, \emph{mín}, \emph{ínf}, \emph{mód}).
+% 	      	\item ¦spaced¦ causes some math operators to use spaces where usual in Spanish (\emph{arc\,cos},
+% 	      	      \emph{arc\,sen}, \emph{arc\,tg}).
+% 	      	\item ¦all¦ activates ¦accented¦ and ¦spaced¦ and furthermore provides Spanish localizations of
+% 	      	      ¦\sin¦ (\emph{sen}), ¦\tan¦ (\emph{tg}), ¦\sinh¦ (\emph{senh}), and ¦\tanh¦ (\emph{tgh}).
+% 	      	\item ¦none¦ does no localization at all (default setting). 
+% 	      \end{itemize}
+% \end{itemize}
+% \paragraph*{\color{black}Commands:}\new{v1.46}
+% \begin{itemize}
+% 	\item \Cmd\arcsen: alias to ¦\arcsin¦ (\pkg{babel} compatibility)
+% 	\item \Cmd\arctg: alias to ¦\arctan¦ (\pkg{babel} compatibility)
+% 	\item \Cmd\sen: alias to ¦\sin¦ (\pkg{babel} compatibility)
+% 	\item \Cmd\senh: alias to ¦\sinh¦ (\pkg{babel} compatibility)
+% 	\item \Cmd\tg: alias to ¦\tan¦ (\pkg{babel} compatibility)
+% 	\item \Cmd\tgh: alias to ¦\tanh¦ (\pkg{babel} compatibility)
+% 	\item \Cmd\spanishoperator: allows you to define further localized operators. For instance, ¦\spanishoperator{cotg}¦
+% 	      defines a command ¦\cotg¦ that outputs \emph{cotg} in math. The optional argument of the command lets you specify the
+% 	      spelling, if needed, \eg ¦\spanishoperator[arc\,ctg]{arcctg}¦.
+% \end{itemize}
+% 
 % \subsection{syriac}\label{syriac}
 % \paragraph*{Options:}
 % 	\begin{itemize}
@@ -1352,6 +1768,9 @@ issues and follow progress.
 % 	\item \Cmd\armeniannumeral produces Armenian alphabetic numbering.
 % 	          Example: ¦\armeniannumeral{1863}¦ yields \textarmenian{\armeniannumeral{1863}}.
 % 
+% 	\item \Cmd\georgiannumeral produces Georgian alphabetic numbering.\\
+%               Example: ¦\georgiannumeral{1863}¦ yields \textgeorgian{\georgiannumeral{1863}}.
+% 
 % 	\item \Cmd\greeknumeral produces Greek alphabetic numbering, \Cmd\Greeknumeral outputs uppercased variants.
 % 			Example: ¦\greeknumeral{1863}¦ yields \textgreek{\greeknumeral{1863}},
 % 			¦\Greeknumeral{1863}¦ results in \textgreek{\Greeknumeral{1863}}.
@@ -1505,7 +1924,7 @@ issues and follow progress.
 % by other people. I take this opportunity to thank the following individuals,
 % whose splendid work has made my task almost trivial in comparision: \TA{Johannes
 % Braams} and the numerous contributors to the \pkg{babel} package (in particular
-% \TA{Boris Lavva} and others for its Hebrew support), \TA{Alexej Kryuko}v (\pkg{antomega}),
+% \TA{Boris Lavva} and others for its Hebrew support), \TA{Alexej Kryukov} (\pkg{antomega}),
 % \TA{Will Robertson} (\pkg{fontspec}), \TA{Apostolos Syropoulos} (\pkg{xgreek}), \TA{Youssef Jabri}
 % (\pkg{arabi}), and \TA{Vafa Khalighi} (\pkg{xepersian} and \pkg{bidi}).
 % The work of \TA{Mojca Miklavec} and \TA{Arthur Reutenauer} on hyphenation patterns with their package
@@ -1525,12 +1944,26 @@ issues and follow progress.
 % I also thank \TA{Alan Munn} for kindly proof-reading the penultimate version of this documentation.
 % And of course my gratitude also goes to \TA{Jonathan Kew}, the formidable author of \XeTeX!
 % 
-% \section{More acknowledgements (by Arthur Reutenauer)}
-% Many thanks to all the people who have contributed bugfixes and new features to
-% Polyglossia since I took over.  Most of them can be identified from the contributor statistics on \href{https://github.com/reutenauer/polyglossia/graphs/contributors}{GitHub} and I won’t try to name them
-% all (maybe, one day ...); among the ones who sent contributions directly to me
-% I would like to especially thank \TA{Claudio Beccari}, the indefatigable champion of
-% Romance languages, and beyond!
+% \section{More acknowledgements (by the current development team)}
+% Many thanks to all the people who have contributed bugfixes and new features to \pkg{polyglossia}
+% since we took over.
+% In alphabetical order: \TA{Ignas Anikevicius}, \TA{Sina Ahmadi}, \TA{Wouter Bolsterlee}, \TA{Christian Buhtz},
+% \TA{Zgarbul Andrey}, \TA{Oleg Domanov}, \TA{Philipp Gesang}, \TA{Kevin Godby}, \TA{Enrico Gregorio},
+% \TA{Khaled Hosny}, \TA{Najib Idrissi}, user \TA{julroy67}, \TA{Dohyun Kim}, \TA{Phil Kime}, \TA{Mike Kroutikov},
+% \TA{Ivan Kokan}, \TA{Caleb Maclennan}, \TA{José Mancera}, \TA{Yevgen Pogribnyi}, \TA{Maïeul Rouquette},
+% \TA{Elie Roux}, \TA{Hugo Roy},  \TA{Guy Rutenberg}, \TA{Philipp Stephani}, \TA{Keno Wehr}, \TA{Dominik Wujastyk},
+% \TA{Sertaç Ö. Yıldız}, \TA{Maksim Zholudev}, \TA{Yan Zhou}, and \TA{Stefan Zlatinov}.
+% Their respective contributions can be identified from the contributor statistics on
+% \href{https://github.com/reutenauer/polyglossia/graphs/contributors}{GitHub}.
+% 
+% Among the ones who sent contributions directly to us we would like to especially thank
+% \TA{Claudio Beccari}, the indefatigable champion of Romance languages, and beyond! Furthermore,
+% kudos go to \TA{Moritz Wemheuer} (of \pkg{biblatex}) who has helped a lot to improve \pkg{polyglossia} interaction
+% with \pkg{biblatex} and \pkg{csquotes}.
+% 
+% Not at least, we are very grateful for all bug reports and feature enhancement requests we received from
+% the numerous users we cannot list all here (but again, you can find all names on \href{https://github.com/reutenauer/polyglossia/issues?utf8=%E2%9C%93&q=is%3Aissue}{GitHub}).
+% Please go on with that, you are keeping \pkg{polyglossia} running!
 % 
 % 
 % 
@@ -1538,6 +1971,115 @@ issues and follow progress.
 % \StopEventually{}
 % \section{Implementation}
 % \iffalse
+%<*gloss-acadien.ldf>
+% \fi
+% \clearpage
+% 
+% \subsection{gloss-acadien.ldf}
+%    \begin{macrocode}
+\ProvidesFile{gloss-acadien.ldf}[polyglossia: module for canadian (acadian) french]
+
+% We provide this as a babel alias
+
+\xpg@load@master@language{french}
+
+%    \end{macrocode}
+% \iffalse
+%</gloss-acadien.ldf>
+%<*gloss-afrikaans.ldf>
+% \fi
+% \clearpage
+% 
+% \subsection{gloss-afrikaans.ldf}
+%    \begin{macrocode}
+\ProvidesFile{gloss-afrikaans.ldf}[polyglossia: module for afrikaans]
+
+\PolyglossiaSetup{afrikaans}{
+  hyphennames={afrikaans,dutch},
+  hyphenmins={2,2},
+  langtag=AFK,
+  frenchspacing=true,
+  fontsetup=true,
+}
+
+\define@boolkey{afrikaans}[afrikaans@]{babelshorthands}[true]{}
+
+\ifsystem@babelshorthands
+  \setkeys{afrikaans}{babelshorthands=true}
+\else
+  \setkeys{afrikaans}{babelshorthands=false}
+\fi
+
+\ifcsundef{initiate@active@char}{%
+  \input{babelsh.def}%
+  \initiate@active@char{"}%
+  \shorthandoff{"}%
+}{}
+
+\def\afrikaans@shorthands{%
+  \bbl@activate{"}%
+  \def\language@group{afrikaans}%
+  \declare@shorthand{afrikaans}{"-}{\nobreak-\bbl@allowhyphens}
+  \declare@shorthand{afrikaans}{"~}{\textormath{\leavevmode\hbox{-}}{-}}
+  \declare@shorthand{afrikaans}{"|}{%
+    \textormath{\discretionary{-}{}{\kern.03em}}{}}
+  \declare@shorthand{afrikaans}{""}{\hskip\z@skip}
+  \declare@shorthand{afrikaans}{"/}{\textormath
+    {\bbl@allowhyphens\discretionary{/}{}{/}\bbl@allowhyphens}{}}%
+  \def\-{\bbl@allowhyphens\discretionary{-}{}{}\bbl@allowhyphens}%
+}
+
+\def\noafrikaans@shorthands{%
+  \@ifundefined{initiate@active@char}{}{\bbl@deactivate{"}}%
+}
+
+\def\captionsafrikaans{%
+    \def\prefacename{Voorwoord}%
+    \def\refname{Verwysings}%
+    \def\abstractname{Samevatting}%
+    \def\bibname{Bibliografie}%
+    \def\chaptername{Hoofstuk}%
+    \def\appendixname{Bylae}%
+    \def\contentsname{Inhoudsopgawe}%
+    \def\listfigurename{Lys van figure}%
+    \def\listtablename{Lys van tabelle}%
+    \def\indexname{Inhoud}%
+    \def\figurename{Figuur}%
+    \def\tablename{Tabel}%
+    \def\partname{Deel}%
+    \def\enclname{Bylae(n)}%
+    \def\ccname{a.\,a.}%
+    \def\headtoname{Aan}%
+    \def\pagename{Bladsy}%
+    \def\seename{sien}%
+    \def\alsoname{sien ook}%
+    \def\proofname{Bewys}%
+%   \def\glossaryname{}%
+}
+
+\def\dateafrikaans{%
+    \def\today{\number\day~\ifcase\month\or
+      Januarie\or Februarie\or Maart\or April\or Mei\or Junie\or
+      Julie\or  Augustus\or September\or Oktober\or November\or
+      Desember\fi
+      \space \number\year}%
+}
+
+\def\noextras@afrikaans{%
+  \noafrikaans@shorthands%
+}
+
+\def\blockextras@afrikaans{%
+  \ifafrikaans@babelshorthands\afrikaans@shorthands\fi%
+}
+
+\def\inlineextras@afrikaans{%
+  \ifafrikaans@babelshorthands\afrikaans@shorthands\fi%
+}
+
+%    \end{macrocode}
+% \iffalse
+%</gloss-afrikaans.ldf>
 %<*gloss-albanian.ldf>
 % \fi
 % \clearpage
@@ -1587,6 +2129,21 @@ issues and follow progress.
 %    \end{macrocode}
 % \iffalse
 %</gloss-albanian.ldf>
+%<*gloss-american.ldf>
+% \fi
+% \clearpage
+% 
+% \subsection{gloss-american.ldf}
+%    \begin{macrocode}
+\ProvidesFile{gloss-american.ldf}[polyglossia: module for american english]
+
+% We provide this as a babel alias
+
+\xpg@load@master@language{english}
+
+%    \end{macrocode}
+% \iffalse
+%</gloss-american.ldf>
 %<*gloss-amharic.ldf>
 % \fi
 % \clearpage
@@ -1950,9 +2507,8 @@ and may look very wrong.}
 
 \def\arabicnumber#1{%
   \ifeastern@numerals
-    \arabicdigits{\number#1}%
+    \@ensure@dir{\arabicdigits{\number#1}}%
   \else
-    %%\RL{\protect\reset@font\number#1}%
     \number#1%
   \fi}
 
@@ -2261,6 +2817,51 @@ and may look very wrong.}
 %    \end{macrocode}
 % \iffalse
 %</gloss-asturian.ldf>
+%<*gloss-australian.ldf>
+% \fi
+% \clearpage
+% 
+% \subsection{gloss-australian.ldf}
+%    \begin{macrocode}
+\ProvidesFile{gloss-australian.ldf}[polyglossia: module for australian english]
+
+% We provide this as a babel alias
+
+\xpg@load@master@language{english}
+
+%    \end{macrocode}
+% \iffalse
+%</gloss-australian.ldf>
+%<*gloss-austrian.ldf>
+% \fi
+% \clearpage
+% 
+% \subsection{gloss-austrian.ldf}
+%    \begin{macrocode}
+\ProvidesFile{gloss-acadien.ldf}[polyglossia: module for austrian german (old spelling)]
+
+% We provide this as a babel alias
+
+\xpg@load@master@language{german}
+
+%    \end{macrocode}
+% \iffalse
+%</gloss-austrian.ldf>
+%<*gloss-bahasa.ldf>
+% \fi
+% \clearpage
+% 
+% \subsection{gloss-bahasa.ldf}
+%    \begin{macrocode}
+\ProvidesFile{gloss-kurmanji.ldf}[polyglossia: module for kurmanji kurdish]
+
+% We provide this as a babel alias
+
+\xpg@load@master@language{kurdish}
+
+%    \end{macrocode}
+% \iffalse
+%</gloss-bahasa.ldf>
 %<*gloss-bahasai.ldf>
 % \fi
 % \clearpage
@@ -2272,20 +2873,7 @@ and may look very wrong.}
 % We only provide this gloss for babel compatibility. Since bahasai is 
 % a malay variety, we use 'malay' with variant 'indonesian' now.
 
-\input{gloss-malay.ldf}
-
-\PolyglossiaSetup{bahasai}{%
-  language=Indonesian,
-  langtag=IND,
-  hyphennames={indonesian,indon,bahasai,bahasa,bahasam,malay,melayu},
-  hyphenmins={2,2},
-  fontsetup=true}
-
-\let\captionsbahasai\captionsmalay@indonesian
-\let\datebahasai\datemalay@indonesian
-
-\DefineFormatHijriDate{bahasai}{%
-  \number\value{Hijriday}\space\hijrimonthmalay@indonesian{\value{Hijrimonth}}\space\number\value{Hijriyear}}
+\xpg@load@master@language{malay}
 
 %    \end{macrocode}
 % \iffalse
@@ -2298,23 +2886,10 @@ and may look very wrong.}
 %    \begin{macrocode}
 \ProvidesFile{gloss-bahasam.ldf}[polyglossia: module for bahasa melayu]
 
-% We only provide this gloss for babel compatibility. Since bahasai is 
-% a malay variety, we use 'malay' with variant 'indonesian' now.
-
-\input{gloss-malay.ldf}
-
-\PolyglossiaSetup{bahasam}{%
-  language=Malay,
-  langtag=MLY,
-  hyphennames={malay,melayu,bahasam,bahasa,bahasai,indonesian,indon},
-  hyphenmins={2,2},
-  fontsetup=true}
-
-\let\captionsbahasam\captionsmalay@malay
-\let\datebahasam\datemalay@malay
+% We only provide this gloss for babel compatibility. Since bahasam is 
+% a malay variety, we use 'malay' with variant 'malaysian' now.
 
-\DefineFormatHijriDate{bahasam}{%
-  \number\value{Hijriday}\space\hijrimonthmalay@malay{\value{Hijrimonth}}\space\number\value{Hijriyear}}
+\xpg@load@master@language{malay}
 
 %    \end{macrocode}
 % \iffalse
@@ -2368,6 +2943,285 @@ and may look very wrong.}
 %    \end{macrocode}
 % \iffalse
 %</gloss-basque.ldf>
+%<*gloss-belarusian.ldf>
+% \fi
+% \clearpage
+% 
+% \subsection{gloss-belarusian.ldf}
+%    \begin{macrocode}
+\ProvidesFile{gloss-belarusian.ldf}[polyglossia: module for belarusian]
+
+\RequirePackage{xpg-cyrillicnumbers}
+
+\PolyglossiaSetup{belarusian}{
+  script=Cyrillic,
+  scripttag=cyrl,
+  langtag=BEL,
+  hyphennames={belarusian},
+  hyphenmins={2,2},
+  frenchspacing=true,
+  fontsetup,
+  localnumeral=belarusiannumerals,
+  Localnumeral=Belarusiannumerals
+}
+
+\def\belarusian@spelling{modern}
+\define@choicekey*+{belarusian}{spelling}[\val\nr]{modern,classic,tarask}[modern]{%
+   \ifcase\nr\relax
+      % modern:
+      \def\belarusian@spelling{modern}
+   \or
+      % classic:
+      \def\belarusian@spelling{tarask}
+   \or
+      % tarask:
+      \def\belarusian@spelling{tarask}
+   \fi
+}{\xpg@warning{Unknown Belarusian spelling `#1'}}
+
+\newif\ifcyrillic@numerals
+\define@key{belarusian}{numerals}[arabic]{%
+   \ifstrequal{#1}{cyrillic}%
+      {\cyrillic@numeralstrue}%
+      {\cyrillic@numeralsfalse}%
+}
+
+\define@boolkey{belarusian}[belarusian@]{babelshorthands}[false]{}
+
+\setkeys{belarusian}{numerals}
+
+\ifsystem@babelshorthands
+  \setkeys{belarusian}{babelshorthands=true}
+\else
+  \setkeys{belarusian}{babelshorthands=false}
+\fi
+
+\ifcsundef{initiate@active@char}{%
+  \input{babelsh.def}%
+  \initiate@active@char{"}%
+  \shorthandoff{"}%
+}{}
+
+\def\belarusian@shorthands{%
+  \bbl@activate{"}%
+  \def\language@group{belarusian}%
+  \declare@shorthand{belarusian}{"`}{„}%
+  \declare@shorthand{belarusian}{"'}{“}%
+  \declare@shorthand{belarusian}{"<}{«}%
+  \declare@shorthand{belarusian}{">}{»}%
+  \declare@shorthand{belarusian}{""}{\hskip\z@skip}%
+  \declare@shorthand{belarusian}{"~}{\textormath{\leavevmode\hbox{-}}{-}}%
+  \declare@shorthand{belarusian}{"=}{\nobreak-\hskip\z@skip}%
+  \declare@shorthand{belarusian}{"|}{\textormath{\nobreak\discretionary{-}{}{\kern.03em}\allowhyphens}{}}%
+  \declare@shorthand{belarusian}{"-}{%
+     \def\belarusian@sh@tmp{%
+       \if\belarusian@sh@next-\expandafter\belarusian@sh@emdash%
+       \else\expandafter\belarusian@sh@hyphen\fi%
+     }%
+     \futurelet\belarusian@sh@next\belarusian@sh@tmp%
+  }%
+  \def\belarusian@sh@hyphen{%
+    \nobreak\-\bbl@allowhyphens}%
+  \def\belarusian@sh@emdash##1##2{\cdash-##1##2}%
+  \def\cdash##1##2##3{\def\tempx@{##3}%
+  \def\tempa@{-}\def\tempb@{~}\def\tempc@{*}%
+   \ifx\tempx@\tempa@\@Acdash\else
+    \ifx\tempx@\tempb@\@Bcdash\else
+     \ifx\tempx@\tempc@\@Ccdash\else
+      \errmessage{Wrong usage of cdash}\fi\fi\fi}%
+  \def\@Acdash{\ifdim\lastskip>\z@\unskip\nobreak\hskip.2em\fi
+    \cyrdash\hskip.2em\ignorespaces}%
+  \def\@Bcdash{\leavevmode\ifdim\lastskip>\z@\unskip\fi
+   \nobreak\cyrdash\penalty\exhyphenpenalty\hskip\z@skip\ignorespaces}%
+  \def\@Ccdash{\leavevmode
+   \nobreak\cyrdash\nobreak\hskip.35em\ignorespaces}%
+  \ifx\cyrdash\undefined
+    \def\cyrdash{\hbox to.8em{--\hss--}}%
+  \fi
+  \declare@shorthand{belarusian}{",}{\nobreak\hskip.2em\ignorespaces}%
+}
+
+\def\nobelarusian@shorthands{%
+  \@ifundefined{initiate@active@char}{}{\bbl@deactivate{"}}%
+}
+
+% Taken from babel-belarusian
+\def\captionsbelarusian@modern{%
+    \def\prefacename{Прадмова}%
+    \def\refname{Спіс літаратуры}%
+    \def\abstractname{Анатацыя}%
+    \def\bibname{Літаратура}%
+    \def\chaptername{Глава}%
+    \def\appendixname{Дадатак}%
+    \def\contentsname{Змест}%
+    \def\listfigurename{Спіс ілюстрацый}%
+    \def\listtablename{Спіс табліц}%
+    \def\indexname{Прадметны паказальнік}%
+    \def\authorname{Паказальнік імён}%
+    \def\figurename{Рыс.}%
+    \def\tablename{Табліца}%
+    \def\partname{Частка}%
+    \def\enclname{укл.}%
+    \def\ccname{зых.}%
+    \def\headtoname{вх.}%
+    \def\pagename{с.}%
+    \def\seename{гл.}%
+    \def\alsoname{гл.\ таксама}%
+    \def\proofname{Доказ}%
+    \def\glossaryname{Слоўнік тэрмінаў}%
+    \def\acronymname{Абрэвіятуры}%
+    \def\lstlistingname{Лістынг}%
+    \def\lstlistlistingname{Лістынгі}%
+    \def\notesname{Нататкі}%
+}
+
+\def\captionsbelarusian@tarask{%
+    \def\prefacename{Прадмова}%
+    \def\refname{Сьпіс літаратуры}%
+    \def\abstractname{Анатацыя}%
+    \def\bibname{Літаратура}%
+    \def\chaptername{Глава}%
+    \def\appendixname{Дадатак}%
+    \def\contentsname{Зьмест}%
+    \let\tocname=\contentsname
+    \def\listfigurename{Сьпіс ілюстрацый}%
+    \def\listtablename{Сьпіс табліц}%
+    \def\indexname{Прадметны паказальнік}%
+    \def\authorname{Паказальнік імён}%
+    \def\figurename{Рыс.}%
+    \def\tablename{Табліца}%
+    \def\partname{Частка}%
+    \def\enclname{укл.}%
+    \def\ccname{зых.}%
+    \def\headtoname{вх.}%
+    \def\pagename{с.}%
+    \def\seename{гл.}%
+    \def\alsoname{гл.\ таксама}%
+    \def\proofname{Доказ}%
+    \def\glossaryname{Слоўнік тэрмінаў}%
+    \def\acronymname{Абрэвіятуры}%
+    \def\lstlistingname{Лістынг}%
+    \def\lstlistlistingname{Лістынгі}%
+    \def\nomname{Азначэньні}%
+    \def\notesname{Нататкі}%
+}
+
+\def\captionsbelarusian{%
+  \csuse{captionsbelarusian@\belarusian@spelling}%
+}
+
+\def\datebelarusian@modern{%
+   \def\today{\number\day~\ifcase\month\or
+    студзеня\or
+    лютага\or
+    сакавіка\or
+    красавіка\or
+    мая\or
+    чэрвеня\or
+    ліпеня\or
+    жніўня\or
+    верасня\or
+    кастрычніка\or
+    лістапада\or
+    снежня\fi
+    \space \number\year~г.}%
+}
+
+\def\datebelarusian@tarask{%
+   \def\today{\number\day~\ifcase\month\or%
+    студзеня\or
+    лютага\or
+    сакавіка\or
+    красавіка\or
+    траўня\or
+    чэрвеня\or
+    ліпеня\or
+    жніўня\or
+    верасьня\or
+    кастрычніка\or
+    лістапада\or
+    сьнежня\fi%
+    \space \number\year~г.}%
+}
+
+\def\datebelarusian{%
+  \csuse{datebelarusian@\belarusian@spelling}%
+}
+
+\newcommand{\belarusiannumerals}[2]{\belarusiannumber{#2}}
+\newcommand{\Belarusiannumerals}[2]{\Belarusiannumber{#2}}
+
+\def\belarusiannumber#1{%
+  \ifcyrillic@numerals
+    \cyr@alph{#1}%
+  \else
+    \number#1%
+  \fi%
+}
+
+\def\Belarusiannumber#1{%
+  \ifcyrillic@numerals
+    \cyr@Alph{#1}%
+  \else
+    \number#1%
+  \fi%
+}
+
+\let\belarusiannumeral=\belarusiannumber
+\let\Belarusiannumeral=\Belarusiannumber
+
+\def\Asbuk#1{\expandafter\cyr@Alph\csname c@#1\endcsname}
+
+\def\asbuk#1{\expandafter\cyr@alph\csname c@#1\endcsname}
+
+% This is a poor man's cyrillic alphanumeric. It just uses the alphabet and
+% thus ends at 30. We now use proper cyrillic numbering.
+
+%\def\belarusian@Alph#1{\ifcase#1\or
+%   А\or Б\or В\or Г\or Д\or Е\or Ж\or
+%   З\or И\or К\or Л\or М\or Н\or О\or
+%   П\or Р\or С\or Т\or У\or Ф\or Х\or
+%   Ц\or Ч\or Ш\or Щ\or Э\or Ю\or Я\else\xpg@ill@value{#1}{belarusian@Alph}\fi}
+
+%\def\belarusian@alph#1{\ifcase#1\or
+%   а\or б\or в\or г\or д\or е\or ж\or
+%   з\or и\or к\or л\or м\or н\or о\or
+%   п\or р\or с\or т\or у\or ф\or х\or
+%   ц\or ч\or ш\or щ\or э\or ю\or я\else\xpg@ill@value{#1}{belarusian@alph}\fi}
+
+\def\belarusian@numbers{%
+   \let\latin@alph\@alph
+   \let\latin@Alph\@Alph
+   \ifcyrillic@numerals%
+     \def\belarusian@alph##1{\expandafter\belarusiannumeral\expandafter{\the##1}}%
+     \def\belarusian@Alph##1{\expandafter\belarusiannumeral\expandafter{\the##1}}%
+      \let\@alph\belarusian@alph%
+      \let\@Alph\belarusian@Alph%
+   \fi
+}
+
+\def\nobelarusian@numbers{%
+   \let\@alph\latin@alph%
+   \let\@Alph\latin@Alph%
+}
+
+\def\noextras@belarusian{%
+   \ifcyrillic@numerals\nobelarusian@numbers\fi%
+   \nobelarusian@shorthands%
+}
+
+\def\blockextras@belarusian{%
+   \ifcyrillic@numerals\belarusian@numbers\fi%
+   \ifbelarusian@babelshorthands\belarusian@shorthands\fi%
+}
+
+\def\inlineextras@belarusian{%
+   \ifbelarusian@babelshorthands\belarusian@shorthands\fi%
+}
+
+%    \end{macrocode}
+% \iffalse
+%</gloss-belarusian.ldf>
 %<*gloss-bengali.ldf>
 % \fi
 % \clearpage
@@ -2523,6 +3377,60 @@ and may look very wrong.}
 %    \end{macrocode}
 % \iffalse
 %</gloss-bengali.ldf>
+%<*gloss-bosnian.ldf>
+% \fi
+% \clearpage
+% 
+% \subsection{gloss-bosnian.ldf}
+%    \begin{macrocode}
+\ProvidesFile{gloss-bosnian.ldf}[polyglossia: module for bosnian]
+
+\PolyglossiaSetup{bosnian}{
+  langtag=BOS,
+  hyphennames={bosnian,croatian},
+  hyphenmins={2,2}, % adapted from gloss-croatian
+  frenchspacing=true, % adapted from gloss-croatian
+  indentfirst=false, % adapted from gloss-croatian
+  fontsetup=true
+}
+
+% TODO: Add script=Cyrillic
+
+% from babel-bosnian
+\def\captionsbosnian{%
+  \def\prefacename{Predgovor}%
+  \def\refname{Literatura}%
+  \def\abstractname{Sažetak}%
+  \def\bibname{Bibliografija}%
+  \def\chaptername{Poglavlje}%
+  \def\appendixname{Dodatak}%
+  \def\contentsname{Sadržaj}%
+  \def\listfigurename{Popis slika}%
+  \def\listtablename{Popis tablica}%
+  \def\indexname{Indeks}%
+  \def\figurename{Slika}%
+  \def\tablename{Tablica}%
+  \def\partname{Dio}%
+  \def\enclname{Prilozi}%
+  \def\ccname{Kopija}%
+  \def\headtoname{Prima}%
+  \def\pagename{Stranica}%
+  \def\seename{Vidjeti}%
+  \def\alsoname{Također vidjeti}%
+  \def\proofname{Dokaz}%
+  \def\glossaryname{Rječnik}%
+}
+
+\def\datebosnian{%
+  \def\today{\number\day.~\ifcase\month\or
+    januar\or februar\or mart\or april\or maj\or
+    juni\or juli\or august\or septembar\or oktobar\or novembar\or
+    decembar\fi \space \number\year.~}%
+}
+
+%    \end{macrocode}
+% \iffalse
+%</gloss-bosnian.ldf>
 %<*gloss-brazil.ldf>
 % \fi
 % \clearpage
@@ -2535,24 +3443,8 @@ and may look very wrong.}
 % 'brazil' was selected in accordance with babel.
 % Since brazil is a variety of portuguese, we use 'portuguese' now.
 
-% FIXME: Once we support babel aliases (#112) this gloss can go.
-
-\xpg@warning{The language name 'brazil' is deprectated.\MessageBreak
-             Please use 'portuguese' with variant 'brazilian' instead.}
-
-\input{gloss-portuguese.ldf}
+\xpg@load@master@language{portuguese}
 
-\PolyglossiaSetup{brazil}{
-  language=Brazilian Portuguese,
-  langtag=PTG,
-  hyphennames={brazil,portuguese,portuges},
-  hyphenmins={2,3},
-  fontsetup=true,
-}
-
-\let\captionsportuges\captionsportuguese@brazil
-\let\dateportuges\dateportuguese@brazil
-     
 %    \end{macrocode}
 % \iffalse
 %</gloss-brazil.ldf>
@@ -2655,6 +3547,21 @@ and may look very wrong.}
 %    \end{macrocode}
 % \iffalse
 %</gloss-breton.ldf>
+%<*gloss-british.ldf>
+% \fi
+% \clearpage
+% 
+% \subsection{gloss-british.ldf}
+%    \begin{macrocode}
+\ProvidesFile{gloss-acadien.ldf}[polyglossia: module for british english]
+
+% We provide this as a babel alias
+
+\xpg@load@master@language{english}
+
+%    \end{macrocode}
+% \iffalse
+%</gloss-british.ldf>
 %<*gloss-bulgarian.ldf>
 % \fi
 % \clearpage
@@ -2747,6 +3654,36 @@ and may look very wrong.}
 %    \end{macrocode}
 % \iffalse
 %</gloss-bulgarian.ldf>
+%<*gloss-canadian.ldf>
+% \fi
+% \clearpage
+% 
+% \subsection{gloss-canadian.ldf}
+%    \begin{macrocode}
+\ProvidesFile{gloss-canadian.ldf}[polyglossia: module for canadian english]
+
+% We provide this as a babel alias
+
+\xpg@load@master@language{english}
+
+%    \end{macrocode}
+% \iffalse
+%</gloss-canadian.ldf>
+%<*gloss-canadien.ldf>
+% \fi
+% \clearpage
+% 
+% \subsection{gloss-canadien.ldf}
+%    \begin{macrocode}
+\ProvidesFile{gloss-acadien.ldf}[polyglossia: module for canadian french]
+
+% We provide this as a babel alias
+
+\xpg@load@master@language{french}
+
+%    \end{macrocode}
+% \iffalse
+%</gloss-canadien.ldf>
 %<*gloss-catalan.ldf>
 % \fi
 % \clearpage
@@ -3022,12 +3959,18 @@ and may look very wrong.}
   fontsetup=true,
 }
 
+\ifluatex
+  \RequirePackage{luavlna}
+\fi
+
 \define@boolkey{czech}[czech@]{babelshorthands}[true]{}
 
 \define@boolkey{czech}[czech@]{splithyphens}[true]{}
 
 \define@boolkey{czech}[czech@]{vlna}[true]{}
 
+\setkeys{czech}{splithyphens,vlna}
+
 \ifsystem@babelshorthands
   \setkeys{czech}{babelshorthands=true}
 \else
@@ -3085,8 +4028,7 @@ and may look very wrong.}
 
 \def\czech@hyphens{%
     \ifluatex
-      \xpg@warning{The 'splithyphens' option only works for XeLaTeX.\MessageBreak
-                   Please use the luavlna package to enable the feature for LuaLaTeX}
+      \AfterPreamble{\enablesplithyphens{czech}}%
     \else
       \XeTeXinterchartokenstate=1
       \XeTeXcharclass `\- \czech@hyphen
@@ -3097,7 +4039,9 @@ and may look very wrong.}
 }
 
 \def\noczech@hyphens{%
-    \ifxetex
+    \ifluatex
+      \AfterPreamble{\disablesplithyphens{czech}}%
+    \else
       \XeTeXcharclass `\- \z@
     \fi%
 }
@@ -3106,8 +4050,7 @@ and may look very wrong.}
 % prevent them to land at the end of a line
 \def\czech@vlna{%
     \ifluatex
-       \xpg@warning{The 'vlna' option only works for XeLaTeX.\MessageBreak
-                    Please use the luavlna package to enable the feature for LuaLaTeX}
+       \preventsingleon
     \else
         % Code taken and adapted from xevlna.sty
         \XeTeXinterchartokenstate=1
@@ -3151,6 +4094,7 @@ and may look very wrong.}
 
 \def\noczech@vlna{%
     \ifluatex
+        \preventsingleoff
     \else
         \XeTeXcharclass`\(\z@
         \XeTeXcharclass`\[\z@
@@ -3218,14 +4162,14 @@ and may look very wrong.}
 
 \def\blockextras@czech{%
   \ifczech@babelshorthands\czech@shorthands\fi%
-  \ifczech@vlna\czech@vlna\fi%
-  \ifczech@splithyphens\czech@hyphens\fi%
+  \ifczech@vlna\czech@vlna\else\noczech@vlna\fi%
+  \ifczech@splithyphens\czech@hyphens\else\noczech@hyhens\fi%
 }
 
 \def\inlineextras@czech{%
   \ifczech@babelshorthands\czech@shorthands\fi%
-  \ifczech@vlna\czech@vlna\fi%
-  \ifczech@splithyphens\czech@hyphens\fi%
+  \ifczech@vlna\czech@vlna\else\noczech@vlna\fi%
+  \ifczech@splithyphens\czech@hyphens\else\noczech@hyhens\fi%
 }
 
 %    \end{macrocode}
@@ -3412,11 +4356,15 @@ and may look very wrong.}
     \def\alsoname{zie ook}%
     \def\proofname{Bewijs}%
     \def\glossaryname{Verklarende woordenlijst}%
+}
+
+\def\datedutch{%
     \def\today{\number\day~\ifcase\month%
       \or januari\or februari\or maart\or april\or mei\or juni\or
       juli\or augustus\or september\or oktober\or november\or
       december\fi
-      \space \number\year}}
+      \space \number\year}%
+}
 
 \def\noextras@dutch{%
   \nodutch@shorthands%
@@ -3440,6 +4388,7 @@ and may look very wrong.}
 % \subsection{gloss-english.ldf}
 %    \begin{macrocode}
 \ProvidesFile{gloss-english.ldf}[polyglossia: module for english]
+
 \PolyglossiaSetup{english}{
   hyphennames={english,american,usenglish,USenglish},
   hyphenmins={2,3},
@@ -3447,6 +4396,13 @@ and may look very wrong.}
   fontsetup=true,
 }
 
+% Babel aliases
+\setlanguagealias[variant=us]{english}{american}
+\setlanguagealias[variant=australian]{english}{australian}
+\setlanguagealias[variant=british]{english}{british}
+\setlanguagealias[variant=canadian]{english}{canadian}
+\setlanguagealias[variant=newzealand]{english}{newzealand}
+
 \providebool{british@hyphen}
 \providebool{english@ordinalmonthday}
 \providebool{british@dateformat}
@@ -3741,41 +4697,7 @@ and may look very wrong.}
 % We only provide this gloss for babel compatibility.
 % The proper English language name is Persian.
 
-\input{gloss-persian.ldf}
-
-\PolyglossiaSetup{farsi}{
-  script=Arabic,
-  direction=RL,
-  scripttag=arab,
-  langtag=FAR,
-  hyphennames={nohyphenation},
-  fontsetup=true,
-  localnumeral=farsinumerals
-}
-
-\define@key{farsi}{numerals}[eastern]{%
-  \setkeys{persian}{numerals=#1}}
-
-\define@key{farsi}{abjadjimnotail}[true]{%
-  \setkeys{persian}{abjadjimnotail=#1}}
-
-\define@key{farsi}{locale}[default]{%
-  \setkeys{persian}{locale=#1}}
-
-\setkeys{farsi}{locale,numerals}
-
-%\Hijritoday is now locale-aware and will format the date with this macro:
-\DefineFormatHijriDate{farsi}{\@ensure@RTL{%
-   \farsinumber{\value{Hijriday}}\space\HijriMonthArabic{\value{Hijrimonth}}\space\farsinumber{\value{Hijriyear}}}}
-
-\let\captionsfarsi\captionspersian
-\let\datefarsi\datepersian
-\let\farsi@numbers\persian@numbers
-\let\nofarsi@numbers\nopersian@numbers
-\let\farsi@globalnumbers\persian@globalnumbers
-\let\nofarsi@globalnumbers\nopersian@globalnumbers
-\let\blockextras@farsi\blockextras@persian
-\let\noextras@farsi\noextras@persian
+\xpg@load@master@language{persian}
 
 %    \end{macrocode}
 % \iffalse
@@ -3889,6 +4811,10 @@ and may look very wrong.}
   hyphenmins={2,2},
   fontsetup=true}
 
+% Babel aliases
+\setlanguagealias[variant=acadian]{french}{acadien}
+\setlanguagealias[variant=canadian]{french}{canadien}
+
 \def\french@variant{french}
 \define@choicekey*+{french}{variant}[\val\nr]{french,canadian,acadian}[french]{%
    \ifcase\nr\relax
@@ -3899,17 +4825,17 @@ and may look very wrong.}
       \def\french@variant{canadien}%
       \SetLanguageKeys{french}{babelname=canadien}%
       \xpg@ifdefined{canadien}{}%
-	    {\xpg@warning{No hyphenation patterns were loaded for "French (Canada)"\MessageBreak
-	      I will use the standard patterns for French instead}%
-	    \adddialect\l@canadien\l@french\relax}%
+      {\xpg@warning{No hyphenation patterns were loaded for "French (Canada)"\MessageBreak
+        I will use the standard patterns for French instead}%
+      \adddialect\l@canadien\l@french\relax}%
    \or
       % acadian:
       \def\french@variant{acadian}%
       \SetLanguageKeys{french}{babelname=canadien}%
       \xpg@ifdefined{acadian}{}%
-	    {\xpg@warning{No hyphenation patterns were loaded for "French (Canada)"\MessageBreak
-	      I will use the standard patterns for French instead}%
-	    \adddialect\l@acadian\l@french\relax}%
+      {\xpg@warning{No hyphenation patterns were loaded for "French (Canada)"\MessageBreak
+        I will use the standard patterns for French instead}%
+      \adddialect\l@acadian\l@french\relax}%
    \fi
    \xpg@info{Option: French, variant=\val}%
 }{\xpg@warning{Unknown French variant `#1'}}
@@ -3920,8 +4846,7 @@ and may look very wrong.}
 }%
 
 \ifluatex
-  \newluatexattribute\xpg@frpt %
-  \directlua{polyglossia.load_frpt()}%
+  \directlua{require('polyglossia-french')}%
 \else
   \newXeTeXintercharclass\french@openbrackets % ( ] {
   \newXeTeXintercharclass\french@closebrackets % ( ] {
@@ -3962,6 +4887,10 @@ and may look very wrong.}
 \define@boolkey{french}[french@]{autospaceguillemets}[true]{}
 \french@autospaceguillemetstrue
 
+\newif\iffrench@thincolonspace
+\define@boolkey{french}[french@]{thincolonspace}[true]{}
+\french@thincolonspacefalse
+
 % Backwards compatibility
 \define@boolkey{french}[french@]{automaticspacesaroundguillemets}[true]{%
    \iffrench@automaticspacesaroundguillemets
@@ -3988,6 +4917,51 @@ and may look very wrong.}
    \fi
 }
 
+% Configuration of item labels
+\def\french@itemi{\textemdash}
+\def\french@itemii{\textemdash}
+\def\french@itemiii{\textemdash}
+\def\french@itemiv{\textemdash}
+
+\define@key{french}{itemlabels}[\textemdash]{%
+  \def\french@itemi{#1}
+  \def\french@itemii{#1}
+  \def\french@itemiii{#1}
+  \def\french@itemiv{#1}
+}
+
+\define@key{french}{itemlabeli}[\textemdash]{%
+  \def\french@itemi{#1}
+}
+
+\define@key{french}{itemlabelii}[\textemdash]{%
+  \def\french@itemii{#1}
+}
+
+\define@key{french}{itemlabeliii}[\textemdash]{%
+  \def\french@itemiii{#1}
+}
+
+\define@key{french}{itemlabeliv}[\textemdash]{%
+  \def\french@itemiv{#1}
+}
+
+\define@boolkey{french}[french@]{frenchitemlabels}[true]{%
+  \AfterPreamble{%
+    \ifdefstring{\xpg@main@language}{french}{%
+      \iffrench@frenchitemlabels
+         \renewcommand{\labelitemi}{\french@itemi}%
+         \renewcommand{\labelitemii}{\french@itemii}%
+         \renewcommand{\labelitemiii}{\french@itemiii}%
+         \renewcommand{\labelitemiv}{\french@itemiv}%
+      \else
+         \let\@makefntext\xpg@orig@makefntext
+      \fi
+    }{\xpg@warning{Option 'frenchitemlabels' only supported if French is main language!}}%
+  }%
+}
+
+
 \def\french@fontsetup{%
   \unless\iffrench@autospacetypewriter
     \let\ttfamily\french@ttfamilyFB
@@ -3999,11 +4973,24 @@ and may look very wrong.}
   \let\ttfamily\french@ttfamilyORI
 }
 
+\def\xpg@french@thinsp{\kern 0.5\fontdimen2\font}
+
 \def\french@punctuation{%
     \lccode"2019="2019
     \ifluatex
-      \xpg@frpt=1\relax %
-      \directlua{polyglossia.activate_frpt()}%
+      \iffrench@thincolonspace
+        \iffrench@autospaceguillemets
+          \directlua{polyglossia.activate_french_punct(true, true)}%
+        \else
+          \directlua{polyglossia.activate_french_punct(true, false)}%
+        \fi
+      \else
+        \iffrench@autospaceguillemets
+          \directlua{polyglossia.activate_french_punct(false, true)}%
+        \else
+          \directlua{polyglossia.activate_french_punct(false, false)}%
+        \fi
+      \fi
     \else
       \XeTeXinterchartokenstate=1
       \XeTeXcharclass `\! \french@punctthin
@@ -4013,50 +5000,53 @@ and may look very wrong.}
       \XeTeXcharclass `\⁈ \french@punctthin
       \XeTeXcharclass `\⁉ \french@punctthin
       \XeTeXcharclass `\; \french@punctthin
-      \XeTeXcharclass `\: \french@punctthick
+      \iffrench@thincolonspace
+        \XeTeXcharclass `\: \french@punctthin
+      \else
+        \XeTeXcharclass `\: \french@punctthick
+      \fi
       \XeTeXcharclass `\« \french@punctguillstart
       \XeTeXcharclass `\» \french@punctguillend
       \XeTeXcharclass `\‹ \french@punctguillstart
       \XeTeXcharclass `\› \french@punctguillend
       \XeTeXcharclass `\( \french@openbrackets
       \XeTeXcharclass `\) \french@closebrackets
-      \XeTeXcharclass `\] \french@openbrackets
-      \XeTeXcharclass `\[ \french@closebrackets
+      \XeTeXcharclass `\[ \french@openbrackets
+      \XeTeXcharclass `\] \french@closebrackets
       \XeTeXcharclass `\{ \french@openbrackets
       \XeTeXcharclass `\} \french@closebrackets
-      \XeTeXinterchartoks \z@ \french@punctthin = {\thinspace}%
+      \XeTeXcharclass `\⟨ \french@openbrackets
+      \XeTeXcharclass `\⟩ \french@closebrackets
+      \XeTeXinterchartoks \z@ \french@punctthin = {\xpg@french@thinsp}%
       \XeTeXinterchartoks \z@ \french@punctthick = {\nobreakspace}%
-      \XeTeXinterchartoks \xpg@boundaryclass \french@punctthin = {\xpg@unskip\thinspace}%
+      \XeTeXinterchartoks \xpg@boundaryclass \french@punctthin = {\xpg@unskip\xpg@french@thinsp}%
       \XeTeXinterchartoks \xpg@boundaryclass \french@punctthick = {\xpg@unskip\nobreakspace}%
       \iffrench@autospaceguillemets
-        \XeTeXinterchartoks \french@punctguillstart \z@ = {\thinspace}% "«a" -> "«\,a"
-  %     \XeTeXinterchartoks \z@ \french@punctguillstart = {\nobreakspace}% "a«" unchanged?
-  %     \XeTeXinterchartoks \french@punctguillend \z@ = {\nobreakspace}% "»a" unchanged?
-        \XeTeXinterchartoks \z@ \french@punctguillend = {\thinspace}% "a»" -> "a\,»"
-        \XeTeXinterchartoks \french@punctguillstart \xpg@boundaryclass = {\thinspace\ignorespaces}% "«  " -> "«\,"
-        \XeTeXinterchartoks \xpg@boundaryclass \french@punctguillend = {\xpg@unskip\thinspace}% "  »" -> "\,»"
+        \let\xpg@french@guillspace\xpg@french@thinsp%
+        \XeTeXinterchartoks \french@punctguillstart \z@ = {\xpg@french@guillspace}% "«a" -> "«\,a"
+ %      \XeTeXinterchartoks \z@ \french@punctguillstart = {\nobreakspace}% "a«" unchanged?
+ %      \XeTeXinterchartoks \french@punctguillend \z@ = {\nobreakspace}% "»a" unchanged?
+        \XeTeXinterchartoks \z@ \french@punctguillend = {\xpg@french@guillspace}% "a»" -> "a\,»"
+        \XeTeXinterchartoks \french@punctguillstart \xpg@boundaryclass = {\xpg@french@guillspace\ignorespaces}% "«  " -> "«\,"
+        \XeTeXinterchartoks \xpg@boundaryclass \french@punctguillend = {\xpg@unskip\xpg@french@guillspace}% "  »" -> "\,»"
+        \XeTeXinterchartoks \french@closebrackets \french@punctguillend = {\xpg@french@guillspace}% ")»" -> ")\,»"
+     \else
+       \def\xpg@french@guillspace{}%
      \fi
-     \XeTeXinterchartoks \french@punctguillend \french@punctthin = {\thinspace}% "»;" -> "»\,;"
+     \XeTeXinterchartoks \french@punctguillend \french@punctthin = {\xpg@french@thinsp}% "»;" -> "»\,;"
      \XeTeXinterchartoks \french@punctguillend \french@punctthick = {\nobreakspace}% "»:" -> "» :"
-     \XeTeXinterchartoks \french@punctthin \french@punctguillend  = {\thinspace}% "?»" -> "?\,»"
+     \XeTeXinterchartoks \french@punctthin \french@punctguillend  = {\xpg@french@thinsp}% "?»" -> "?\,»"
      \XeTeXinterchartoks \french@openbrackets \french@punctthin = {\xpg@unskip}% "(?" -> "(?" and not "( ?"      
      \XeTeXinterchartoks \french@punctthin \french@closebrackets = {\xpg@unskip}% "?)" -> "?)" (code not need, just for symetry with previous one)
-     \XeTeXinterchartoks \french@closebrackets \french@punctthin = {\thinspace}% ")?" -> ")\,?"
+     \XeTeXinterchartoks \french@closebrackets \french@punctthin = {\xpg@french@thinsp}% ")?" -> ")\,?"
      \XeTeXinterchartoks \french@closebrackets \french@punctthick = {\nobreakspace}% "):" -> ") :"
     \fi
-    }
+}
 
 \def\nofrench@punctuation{%
     \lccode"2019=\z@
     \ifluatex
-      \xpg@frpt=0\relax %
-      % Though it would make compilation slightly faster, it is not possible to
-      % safely uncomment the following line. Imagine the following case: you start
-      % a paragraph by some french text, then, in the same paragraph, you change
-      % the language to something else, and thus call the following line. This means
-      % that, at then end of the paragraph, the function won't be in the callback,
-      % so the beginning of the paragraph won't be processed by it.
-      %\directlua{polyglossia.desactivate_frpt()}
+      \directlua{polyglossia.deactivate_french_punct()}%
     \else
       \XeTeXcharclass `\! \z@
       \XeTeXcharclass `\? \z@
@@ -4070,9 +5060,17 @@ and may look very wrong.}
       \XeTeXcharclass `\» \z@
       \XeTeXcharclass `\‹ \z@
       \XeTeXcharclass `\› \z@
+      \XeTeXcharclass `\( \z@
+      \XeTeXcharclass `\) \z@
+      \XeTeXcharclass `\[ \z@
+      \XeTeXcharclass `\] \z@
+      \XeTeXcharclass `\{ \z@
+      \XeTeXcharclass `\} \z@
+      \XeTeXcharclass `\⟨ \z@
+      \XeTeXcharclass `\⟩ \z@
       \XeTeXinterchartokenstate=0
     \fi
-    }
+}
 
 \def\captionsfrench{%
    \def\refname{Références}%
@@ -4102,7 +5100,7 @@ and may look very wrong.}
    \def\ccname{Copie à }%
    \def\headtoname{}%
    \def\proofname{Démonstration}%
-   }
+}
 
 \def\datefrench{%
    \def\today{\ifx\ier\undefined\def\ier{er}\fi
@@ -4172,23 +5170,7 @@ and may look very wrong.}
 
 % We only provide this gloss for babel compatibility.
 
-\input{gloss-friulian.ldf}
-
-\PolyglossiaSetup{friulan}{%
-  language=Friulian,
-  hyphennames={friulan,furlan},
-  hyphenmins={2,2},
-  langtag=FRL,
-  indentfirst=false,
-  fontsetup=true,
-  frenchspacing=true,
-}
-
-\let\captionsfriulan\captionsfriulian
-\let\datefriulan\datefriulian
-\let\noextras@friulan\noextras@friulian
-\let\blockextras@friulan\blockextras@friulian
-\let\inlineextras@friulan\inlineextras@friulian
+\xpg@load@master@language{friulian}
 
 %    \end{macrocode}
 % \iffalse
@@ -4212,6 +5194,9 @@ and may look very wrong.}
   frenchspacing=true,
 }
 
+% Babel and backwards compat. alias
+\setlanguagealias{friulian}{friulan}
+
 \def\captionsfriulian{%
     \def\prefacename{Prefazion}%
     \def\refname{Riferiments}%
@@ -4285,6 +5270,10 @@ and may look very wrong.}
   fontsetup=true,
 }
 
+% Babel aliases
+\setlanguagealias[variant=irish]{gaelic}{irish}
+\setlanguagealias[variant=scottish]{gaelic}{scottish}
+
 \def\gaelic@variant{irish}
 \define@choicekey*+{gaelic}{variant}[\val\nr]{irish,scottish}[irish]{%
    \ifcase\nr\relax
@@ -4431,6 +5420,239 @@ and may look very wrong.}
 %    \end{macrocode}
 % \iffalse
 %</gloss-galician.ldf>
+%<*gloss-georgian.ldf>
+% \fi
+% \clearpage
+% 
+% \subsection{gloss-georgian.ldf}
+%    \begin{macrocode}
+\ProvidesFile{gloss-georgian.ldf}[polyglossia: module for georgian]
+
+\PolyglossiaSetup{georgian}{
+  script=Georgian,
+  scripttag=geor,
+  langtag=KAT,
+  hyphennames={georgian},
+  fontsetup=true,
+  localnumeral=georgiannumerals
+}
+
+\newif\ifgeorgian@numerals
+\define@key{georgian}{numerals}[arabic]{%
+   \ifstrequal{#1}{georgian}%
+      {\georgian@numeralstrue}%
+      {\georgian@numeralsfalse}%
+}
+
+\define@boolkey{georgian}[georgian@]{babelshorthands}[true]{}
+
+\define@boolkey{georgian}[georgian@]{oldmonthnames}[true]{}
+
+\ifsystem@babelshorthands
+  \setkeys{georgian}{babelshorthands=true}
+\else
+  \setkeys{georgian}{babelshorthands=false}
+\fi
+
+\ifcsundef{initiate@active@char}{%
+  \input{babelsh.def}%
+  \initiate@active@char{"}%
+  \shorthandoff{"}%
+}{}
+
+\def\georgian@shorthands{%
+  \bbl@activate{"}%
+  \def\language@group{georgian}%
+  \declare@shorthand{georgian}{"`}{„}%
+  \declare@shorthand{georgian}{"'}{“}%
+  \declare@shorthand{georgian}{"<}{«}%
+  \declare@shorthand{georgian}{">}{»}%
+  \declare@shorthand{georgian}{""}{\hskip\z@skip}%
+  \declare@shorthand{georgian}{"~}{\textormath{\leavevmode\hbox{-}}{-}}%
+  \declare@shorthand{georgian}{"=}{\nobreak-\hskip\z@skip}%
+  \declare@shorthand{georgian}{"|}{\textormath{\nobreak\discretionary{-}{}{\kern.03em}\allowhyphens}{}}%
+  \declare@shorthand{georgian}{"-}{%
+    \def\georgian@sh@tmp{%
+      \if\georgian@sh@next-\expandafter\georgian@sh@emdash%
+      \else\expandafter\georgian@sh@hyphen\fi%
+    }%
+    \futurelet\georgian@sh@next\georgian@sh@tmp}%
+  \def\georgian@sh@hyphen{%
+    \nobreak\-\bbl@allowhyphens}%
+  \def\georgian@sh@emdash##1##2{\cdash-##1##2}%
+  \def\cdash##1##2##3{\def\tempx@{##3}%
+  \def\tempa@{-}\def\tempb@{~}\def\tempc@{*}%
+   \ifx\tempx@\tempa@\@Acdash\else
+    \ifx\tempx@\tempb@\@Bcdash\else
+     \ifx\tempx@\tempc@\@Ccdash\else
+      \errmessage{Wrong usage of cdash}\fi\fi\fi}%
+  \def\@Acdash{\ifdim\lastskip>\z@\unskip\nobreak\hskip.2em\fi
+    \cyrdash\hskip.2em\ignorespaces}%
+  \def\@Bcdash{\leavevmode\ifdim\lastskip>\z@\unskip\fi
+   \nobreak\cyrdash\penalty\exhyphenpenalty\hskip\z@skip\ignorespaces}%
+  \def\@Ccdash{\leavevmode
+   \nobreak\cyrdash\nobreak\hskip.35em\ignorespaces}%
+  \ifx\cyrdash\undefined
+    \def\cyrdash{\hbox to.8em{--\hss--}}%
+  \fi
+  \declare@shorthand{georgian}{",}{\nobreak\hskip.2em\ignorespaces}%
+}
+
+\def\nogeorgian@shorthands{%
+  \@ifundefined{initiate@active@char}{}{\bbl@deactivate{"}}%
+}
+
+\def\captionsgeorgian{%
+    \def\prefacename{წინასიტყვაობა}%
+    \def\refname{ლიტერატურა}%
+    \def\abstractname{ანოტაცია}%
+    \def\bibname{ლიტერატურა}%
+    \def\chaptername{თავი}%
+    \def\appendixname{დანართი}%
+    \@ifundefined{thechapter}
+      {\def\contentsname{შინაარსი}}%
+      {\def\contentsname{შინაარსი}}%
+    \let\tocname=\contentsname
+    \def\listfigurename{სურათი}%
+    \def\listtablename{ცხრილი}%
+    \def\indexname{საძიებელი}%
+    \def\authorname{სახელთა საძიებელი}%
+    \def\figurename{სურ.}%
+    \def\tablename{ცხრ.}%
+    \def\partname{ნაწილი}%
+    \def\enclname{ჩათვ.}%
+    \def\ccname{წყარ.}%
+    \def\headtoname{შ.}%
+    \def\pagename{გვ.}%
+    \def\seename{იხ.}%
+    \def\alsoname{იხ.\ ასევე}%
+    \def\proofname{დამტკიცება}%
+    \def\glossaryname{ტერმინები}%
+}%
+
+\def\dategeorgian{%
+   \def\today{\number\day~\ifcase\month\or
+    იანვარი\or
+    თებერვალი\or
+    მარტი\or
+    აპრილი\or
+    მაისი\or
+    ივნისი\or
+    ივლისი\or
+    აგვისტო\or
+    სექტემბერი\or
+    ოქტომბერი\or
+    ნოემბერი\or
+    დეკემბერი\fi
+    \space \number\year~წ.}%
+    \ifgeorgian@oldmonthnames
+       \dategeorgian@old%
+    \fi
+}
+
+\def\dategeorgian@old{%
+   \def\today{\number\day~\ifcase\month\or
+    აპნისი\or
+    სურწყუნისი\or
+    მირკანი\or
+    იგრიკა\or
+    ვარდობისთვე\or
+    თიბათვე\or
+    მკათათვე\or
+    მარიამობისთვე\or
+    ახალწლისა ენკენისთვე\or
+    ღვინობისთვე\or
+    გიორგობისთვე\or
+    ქრისტეშობისთვე\fi
+    \space \number\year~წ.}%
+}
+
+\def\georgian@numbers{%
+   \ifgeorgian@numerals%
+     \def\georgian@alph##1{\expandafter\georgiannumeral\expandafter{\the##1}}%
+     \let\@alph\georgian@@alph%
+   \fi
+}
+
+\def\nogeorgian@numbers{%
+   \let\@alph\latin@alph%
+   \let\georgian@alph\@undefined%
+}
+
+\def\georgian@globalnumbers{%
+  \ifgeorgian@numerals
+    \let\@arabic\georgiannumber%
+    \renewcommand\thefootnote{\localnumeral*{footnote}}%
+    \renewcommand\theequation{\localnumeral*{equation}}%
+  \fi
+}
+
+% Store original definition
+\let\xpg@save@arabic\@arabic
+
+\def\nogeorgian@globalnumbers{
+   \let\@arabic\xpg@save@arabic%
+}
+
+\newcommand{\georgiannumerals}[2]{%
+  \ifgeorgian@numerals
+     \georgiannumber{#2}%
+  \else
+     #2%
+  \fi%
+}
+
+\protected\def\georgiannumber#1{\expandafter\@georgiannumber\expandafter{\number#1}}
+\def\@georgiannumber#1{%
+  \ifnum#1<\@ne\space\geor@ill@value{#1}%
+  \else
+    \ifnum#1<10\expandafter\geor@num@i\number#1%
+    \else
+      \ifnum#1<100\expandafter\geor@num@ii\number#1%
+      \else
+        \ifnum#1<\@m\expandafter\geor@num@iii\number#1%
+        \else
+          \ifnum#1<\@M\expandafter\geor@num@iv\number#1%
+          \else
+             \space\geor@ill@value{#1}%
+          \fi
+        \fi
+      \fi
+    \fi
+  \fi
+}
+
+\let\georgiannumeral=\georgiannumber
+\def\geor@num@i#1{% 1--9
+  \ifcase#1\or ა\or ბ\or გ\or დ\or ე\or ვ\or ზ\or ჱ\or თ\fi}
+\def\geor@num@ii#1{% 10--90
+  \ifcase#1\or ი\or კ\or ლ\or მ\or ნ\or ჲ\or ო\or პ\or ჟ\fi
+  \geor@num@i}
+\def\geor@num@iii#1{% 100--900
+  \ifcase#1\or რ\or ს\or ტ\or ჳ\or ფ\or ქ\or ღ\or ყ\or შ\fi
+  \geor@num@ii}
+\def\geor@num@iv#1{% 1000--9000
+  \ifcase#1\or ჩ\or ც\or ძ\or წ\or ჭ\or ხ\or ჴ\or ჯ\or ჰ\fi
+  \geor@num@iii}
+\def\geor@ill@value#1{\xpg@warning{Illegal value (#1) for Georgian numeral}[$#1$]}
+
+\def\noextras@georgian{%
+   \ifgeorgian@numerals\nogeorgian@numbers\fi%
+   \nogeorgian@shorthands%
+}
+
+\def\blockextras@georgian{%
+   \ifgeorgian@numerals\georgian@numbers\fi%
+   \ifgeorgian@babelshorthands\georgian@shorthands\fi%
+}
+
+\def\inlineextras@georgian{%
+   \ifgeorgian@babelshorthands\georgian@shorthands\fi%
+}
+
+%    \end{macrocode}
+% \iffalse
+%</gloss-georgian.ldf>
 %<*gloss-german.ldf>
 % \fi
 % \clearpage
@@ -4438,6 +5660,7 @@ and may look very wrong.}
 % \subsection{gloss-german.ldf}
 %    \begin{macrocode}
 \ProvidesFile{gloss-german.ldf}[polyglossia: module for german]
+
 \PolyglossiaSetup{german}{
   hyphenmins={2,2},
   frenchspacing=true,
@@ -4446,6 +5669,14 @@ and may look very wrong.}
   babelname=ngerman
 }
 
+% Babel aliases
+\setlanguagealias[variant=austrian,spelling=old]{german}{austrian}
+\setlanguagealias[variant=austrian,spelling=new]{german}{naustrian}
+\setlanguagealias[variant=german,spelling=old]{german}{germanb}
+\setlanguagealias[variant=german,spelling=new]{german}{ngerman}
+\setlanguagealias[variant=swiss,spelling=old]{german}{swissgerman}
+\setlanguagealias[variant=swiss,spelling=new]{german}{nswissgerman}
+
 \newif\if@german@oldspelling
 \@german@oldspellingfalse
 \define@choicekey*+{german}{spelling}[\val\nr]{new,old,1901}[new]{%
@@ -4504,21 +5735,26 @@ and may look very wrong.}
   \else
      \if@swiss@locale
          \SetLanguageKeys{german}{babelname=nswissgerman}%
-     \fi
+     \else
      \if@austrian@locale
          \SetLanguageKeys{german}{babelname=naustrian}%
-     \fi
+     \else
+         \SetLanguageKeys{german}{babelname=ngerman}%
+     \fi\fi
   \fi
 }
 
-\newif\if@german@fraktur
-\define@choicekey*+{german}{script}[\val\nr]{latin,fraktur}[latin]{%
+\newif\if@german@blackletter
+\define@choicekey*+{german}{script}[\val\nr]{latin,blackletter,fraktur}[latin]{%
    \ifcase\nr\relax
       % latin:
-      \@german@frakturfalse%
+      \@german@blackletterfalse%
+   \or
+      % blackletter:
+      \@german@blacklettertrue%
    \or
       % fraktur:
-      \@german@frakturtrue%
+      \@german@blacklettertrue%
    \fi
    \xpg@info{Option: German, script=\val}%
 }{\xpg@warning{Unknown German script `#1'}}
@@ -4626,7 +5862,7 @@ and may look very wrong.}
 }
 
 %%Strings for Fraktur contributed by Gerrit <z0idberg . gmx . de>
-\def\captions@german@fraktur{%
+\def\captions@german@blackletter{%
   \captions@german%
   \def\abstractname{Zuſammenfaſſung}%
   \def\seename{ſiehe}%
@@ -4634,7 +5870,7 @@ and may look very wrong.}
   \def\glossaryname{Gloſſar}%
 }
 
-\def\date@german@fraktur{%
+\def\date@german@blackletter{%
   \def\today{\number\day.%
     \space \ifcase\month%
     \or\if@austrian@locale Jänner\else Januar\fi\or Februar\or März\or%
@@ -4644,13 +5880,13 @@ and may look very wrong.}
 }
 
 \def\captionsgerman{%
-  \if@german@fraktur\captions@german@fraktur\else\captions@german\fi
+  \if@german@blackletter\captions@german@blackletter\else\captions@german\fi
   \if@austrian@locale\captions@german@austrian\fi
   \if@swiss@locale\captions@german@swiss\fi
 }
 
 \def\dategerman{%
-  \if@german@fraktur\date@german@fraktur\else\date@german\fi
+  \if@german@blackletter\date@german@blackletter\else\date@german\fi
 }
 
 \def\german@language{%
@@ -4692,6 +5928,21 @@ and may look very wrong.}
 %    \end{macrocode}
 % \iffalse
 %</gloss-german.ldf>
+%<*gloss-germanb.ldf>
+% \fi
+% \clearpage
+% 
+% \subsection{gloss-germanb.ldf}
+%    \begin{macrocode}
+\ProvidesFile{gloss-germanb.ldf}[polyglossia: module for german (old spelling)]
+
+% We provide this as a babel alias
+
+\xpg@load@master@language{german}
+
+%    \end{macrocode}
+% \iffalse
+%</gloss-germanb.ldf>
 %<*gloss-greek.ldf>
 % \fi
 % \clearpage
@@ -4699,6 +5950,7 @@ and may look very wrong.}
 % \subsection{gloss-greek.ldf}
 %    \begin{macrocode}
 \ProvidesFile{gloss-greek.ldf}[polyglossia: module for greek]
+
 \PolyglossiaSetup{greek}{
   script=Greek,
   scripttag=grek,
@@ -4711,6 +5963,9 @@ and may look very wrong.}
   %TODO localalph={greek@alph,greek@Alph}
 }
 
+% Babel aliases
+\setlanguagealias[variant=polytonic]{greek}{polutonikogreek}
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% The code in this file was initially adapted from the antomega
 %% module for greek. Currently large parts of it derive from the 
@@ -5366,7 +6621,7 @@ and may look very wrong.}
 
 \PolyglossiaSetup{hungarian}{
   babelname=magyar,
-  hyphennames={magyar,hungarian},
+  hyphennames={hungarian,magyar},
   langtag=HUN,
   hyphenmins={2,2},
   fontsetup=true,
@@ -5374,6 +6629,49 @@ and may look very wrong.}
 
 \frenchspacing
 
+% Babel and backwards compat. alias
+\setlanguagealias{hungarian}{magyar}
+
+\newif\if@hungarian@swapcaptions
+\newif\if@hungarian@swapheadings
+\newif\if@hungarian@swapheaders
+\define@choicekey*+{hungarian}{swapstrings}[\val\nr]{all,captions,headings,headers,hheaders,none}[all]{%
+   \ifcase\nr\relax
+      % all:
+      \@hungarian@swapcaptionstrue%
+      \@hungarian@swapheadingstrue%
+      \@hungarian@swapheaderstrue%
+   \or
+      % captions:
+      \@hungarian@swapcaptionstrue%
+      \@hungarian@swapheadingsfalse%
+      \@hungarian@swapheadersfalse%
+   \or
+      % headings:
+      \@hungarian@swapcaptionsfalse%
+      \@hungarian@swapheadingstrue%
+      \@hungarian@swapheadersfalse%
+   \or
+      % headers:
+      \@hungarian@swapcaptionsfalse%
+      \@hungarian@swapheadingsfalse%
+      \@hungarian@swapheaderstrue%
+   \or
+      % hheaders:
+      \@hungarian@swapcaptionsfalse%
+      \@hungarian@swapheadingstrue%
+      \@hungarian@swapheaderstrue%
+   \or
+      % none:
+      \@hungarian@swapcaptionsfalse%
+      \@hungarian@swapheadingsfalse%
+      \@hungarian@swapheadersfalse%
+   \fi
+   \xpg@info{Option: Hungarian, swapstrings=\val}%
+}{\xpg@warning{Unknown Hungarian swapstrings value `#1'}}
+
+\setkeys{hungarian}{swapstrings}
+
 \def\captionshungarian{%
    \def\refname{Hivatkozások}%
    \def\abstractname{Kivonat}%
@@ -5421,25 +6719,188 @@ and may look very wrong.}
      21-én\or 22-én\or 23-án\or 24-én\or 25-én\or
      26-án\or 27-én\or 28-án\or 29-én\or 30-án\or
      31-én\fi}%
-   \let\ontoday\ondatehungarian}
+   \let\ontoday\ondatehungarian%
+   \let\ondatemagyar\ondatehungarian%
+}
 
-% change 'táblázat x.x' to 'x.x. táblázat'
-\def\xpg@hungarian@fnum@table{\thetable.~\tablename}
+% Save original capsformats
 \let\xpg@save@fnum@table\fnum@table
-
-% change 'ábra x.x' to 'x.x. ábra'
-\def\xpg@hungarian@fnum@figure{\thefigure.~\figurename}
 \let\xpg@save@fnum@figure\fnum@figure
 
+\def\hungarian@capsformat{%
+  %
+  % Change captions
+  \if@hungarian@swapcaptions
+     % change 'ábra x.x' to 'x.x. ábra'
+     \def\fnum@figure{\thefigure.~\figurename}
+     %
+     % change 'táblázat x.x' to 'x.x. táblázat'
+     \def\fnum@table{\thetable.~\tablename}
+  \fi
+  %
+  % change chapter and part headings
+  \if@hungarian@swapheadings
+     % With titlesec
+     \ifdefined\titleformat%
+       \ifdefined\@part%
+          \let\xpg@save@part@format\@part%
+          \patchcmd{\@part}%
+                    {\partname\nobreakspace\thepart}%
+                    {\thepart.\nobreakspace\partname}%
+                    {}%
+                    {\xpg@warning{Failed to patch part for Hungarian}}%
+       \fi%
+       \ifdefined\chapter%
+          \titleformat\chapter[display]%
+             {\@ifundefined{ttl@fil}{\raggedright}{\ttl@fil}\ttl@fonts\ttl@sizes6}
+             {\thechapter.\space\@chapapp}{.8\baselineskip}{\ttl@sizes\z@\ttl@passexplicit}
+       \fi%
+     \else% (not \ifdefined\titleformat)
+       % With KOMA
+       \ifdefined\sectionformat%
+          \ifdefined\partformat%
+            \let\xpg@save@part@format\partformat%
+            \renewcommand{\partformat}{\thepart.~\partname}%
+          \fi%
+          \ifdefined\chapterformat%
+            \let\xpg@save@chap@format\chapterformat%
+            \renewcommand{\chapterformat}{\mbox{\thechapter\autodot%
+                                          \IfUsePrefixLine{\nobreakspace\chapapp}{\enskip}}}%
+          \fi%
+       \else%  (not \ifdefined\sectionformat)
+         % With memoir
+         \ifdefined\@memptsize%
+           \ifdefined\@makechapterhead%
+              \let\xpg@save@chap@format\@makechapterhead%
+              \patchcmd{\@makechapterhead}{\printchaptername \chapternamenum \printchapternum}%
+                       {\printchapternum.\chapternamenum\printchaptername}%
+                       {}%
+                       {\xpg@warning{Failed to patch chapter for Hungarian}}%
+           \fi%
+           \ifdefined\@part%
+              \let\xpg@save@part@format\@part%
+              \patchcmd{\@part}{\printpartname \partnamenum \printpartnum}%
+                               {\printpartnum.\partnamenum\printpartname}%
+                               {}%
+                               {\xpg@warning{Failed to patch part for Hungarian}}%
+           \fi%
+         \else%  (not \ifdefined\@memptsize)
+           % With standard classes
+            \ifdefined\@makechapterhead%
+              \let\xpg@save@chap@format\@makechapterhead%
+              \patchcmd{\@makechapterhead}%
+                       {\@chapapp\space \thechapter}%
+                       {\thechapter.\space \@chapapp}%
+                       {}%
+                       {\xpg@warning{Failed to patch chapter for Hungarian}}%
+            \fi%
+            \ifdefined\@part%
+              \let\xpg@save@part@format\@part%
+              \patchcmd{\@part}%
+                       {\partname\nobreakspace\thepart}%
+                       {\thepart.\nobreakspace\partname}%
+                       {}%
+                       {\xpg@warning{Failed to patch part for Hungarian}}%
+            \fi%  (end \ifdefined\@part)
+          \fi% (end \ifdefined\@memptsize)
+        \fi% (end \ifdefined\sectionformat)
+     \fi% (end \ifdefined\titleformat)
+  \fi% (end \if@hungarian@swapheadings)
+  %
+  % Change running headers
+  \if@hungarian@swapheaders
+    \ifdefined\chapterformat%
+      % With KOMA
+      \let\xpg@save@chaptermark@format\chaptermarkformat%
+      \renewcommand*\chaptermarkformat{%
+         \thechapter\autodot\ \IfChapterUsesPrefixLine{\chapapp\enskip}{}}
+    \else% (not \ifdefined\chapterformat)
+      \ifdefined\@memptsize%
+        % With memoir
+        \let\xpg@save@chaptermark@format\chaptermark%
+        \renewcommand*\chaptermark[1]{%
+          \markboth{\memUChead{%
+            \ifnum \c@secnumdepth >\m@ne
+              \if@mainmatter
+                \thechapter.\ \@chapapp\ %
+              \fi
+            \fi
+            ##1}}{}}%
+      \else% (not \ifdefined\@memptsize)
+        % With standard classes
+        \ifdefined\chaptermark%
+           \let\xpg@save@chaptermark@format\chaptermark%
+           \patchcmd{\chaptermark}%
+                    {\@chapapp\ \thechapter.}%
+                    {\thechapter.\ \@chapapp}%
+                    {}%
+                    {\xpg@warning{Failed to patch chaptermark for Hungarian}}%
+        \fi% (end \ifdefined\chaptermark)
+      \fi% (end \ifdefined\@memptsize)
+    \fi% (end \ifdefined\chapterformat)
+  \fi% (end \if@hungarian@swapheaders)
+}
+
+\def\nohungarian@capsformat{%
+   %
+   % Reset changes of \hungarian@capsformat
+   \let\fnum@table\xpg@save@fnum@table%
+   \let\fnum@figure\xpg@save@fnum@figure%
+   %
+   % Reset chapter and part heading
+   \ifdefined\titleformat%
+      % With titlesec
+     \ifdefined\xpg@save@part@format
+        \let\@part\xpg@save@part@format
+     \fi%
+     \ifdefined\chapter
+        \titleformat\chapter[display]%
+          {\@ifundefined{ttl@fil}{\raggedright}{\ttl@fil}\ttl@fonts\ttl@sizes6}
+          {\@chapapp\space\thechapter}{.8\baselineskip}{\ttl@sizes\z@\ttl@passexplicit}
+     \fi%
+   \else% (not \ifdefined\titleformat)
+     \ifdefined\sectionformat%
+        % With KOMA
+        \ifdefined\xpg@save@part@format
+           \let\partformat\xpg@save@part@format
+        \fi%
+        \ifdefined\xpg@save@chap@format
+           \let\chapterformat\xpg@save@chap@format
+        \fi%
+     \else%
+        % With memoir and standard classes
+        \ifdefined\xpg@save@part@format
+           \let\@part\xpg@save@part@format
+        \fi%
+        \ifdefined\xpg@save@chap@format
+          \let\@makechapterhead\xpg@save@chap@format
+        \fi%
+     \fi% (end \ifdefined\sectionformat)
+   \fi% (end \ifdefined\titleformat)
+  %
+  % Reset headers
+  \ifdefined\chaptermarkformat%
+     % With KOMA
+     \ifdefined\xpg@save@chaptermark@format
+       \let\chaptermarkformat\xpg@save@chaptermark@format%
+     \fi
+  \else%
+     \ifdefined\chaptermark%
+       % With memoir and standard classes
+       \ifdefined\xpg@save@chaptermark@format
+         \let\chaptermark\xpg@save@chaptermark@format%
+       \fi
+     \fi% (end \ifdefined\chaptermark)
+  \fi% (end \ifdefined\chapterformat)
+}
+
 \def\blockextras@hungarian{%
-   \let\fnum@table\xpg@hungarian@fnum@table
-   \let\fnum@figure\xpg@hungarian@fnum@figure
+   \hungarian@capsformat%
 }
 
 \def\noextras@hungarian{%
-   \let\fnum@table\xpg@save@fnum@table
-   \let\fnum@figure\xpg@save@fnum@figure
-   \let\ontoday\@undefined
+   \nohungarian@capsformat%
+   \let\ontoday\@undefined%
 }
 
 %    \end{macrocode}
@@ -5556,17 +7017,7 @@ and may look very wrong.}
 % We only provide this gloss for babel compatibility. Since irish is 
 % a gaelic variety, we use 'gaelic' with variant 'irish' now.
 
-\input{gloss-gaelic.ldf}
-
-\PolyglossiaSetup{irish}{
-  hyphennames={irish},
-  hyphenmins={2,2},
-  langtag=IRI,
-  fontsetup=true,
-}
-
-\let\captionsirish\captionsgaelic@irish
-\let\dateirish\dategaelic@irish
+\xpg@load@master@language{gaelic}
 
 %    \end{macrocode}
 % \iffalse
@@ -6445,6 +7896,9 @@ and may look very wrong.}
   localnumeral=kurdishnumerals
 }
 
+% Babel aliases
+\setlanguagealias[variant=kurmanji]{kurdish}{kurmanji}
+
 \newif\if@kurdish@kurmanji
 \def\kurdish@variant{sorani}
 \define@choicekey*+{kurdish}{variant}[\val\nr]{sorani,kurmanji}[sorani]{%
@@ -6966,301 +8420,910 @@ and may look very wrong.}
 % 
 % \subsection{gloss-latin.ldf}
 %    \begin{macrocode}
-%%
-%% This is file `gloss-latin.ldf',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% gloss-latin.dtx  (with options: `lamodern')
-%%   ------------------------------------------------------------------
-%%   Latin module for polyglossia
-%%   Copyright (C) Claudio Beccari 2013-2016
-%%   Copyright (C) Élie Roux 2016
-%%   This work is distributed under the MIT License.
-%% 
-%%   See the postamble.
-%%   ------------------------------------------------------------------
-\ProvidesFile{gloss-latin.ldf}
-        [2016/09/10 v.1.03 Latin support from polyglossia]
-%%
+\ProvidesFile{gloss-latin.ldf}[polyglossia: module for Latin v.2.0 2019-10-28]
 
+\ExplSyntaxOn
 
-\PolyglossiaSetup{latin}{%
-      hyphennames={latin},
-      hyphenmins={2,2},
-      langtag=LAT,
-      frenchspacing=true,
-      fontsetup=true,
-}
-\def\classicuclccodes{\lccode`\V=`\u \uccode`\u=`\V}
-\def\noclassicuclccodes{\lccode`\V=`\v \uccode`\u=`\U}
-\def\tmp@modern{modern}
-\def\tmp@medieval{medieval}
-\unless\ifluatex
-  \def\tmp@classic{classic}
-  \def\tmp@liturgical{liturgical}
-\fi
-\newif\ifmedieval\medievalfalse
-\newif\ifclassic\classicfalse
-\define@boolkey{latin}[latin@]{ecclesiastic}[true]{}
+\PolyglossiaSetup {latin}
+  {
+    hyphennames = {latin},
+    hyphenmins = {2,2},
+    frenchspacing = true,
+    fontsetup = true,
+    langtag = LAT
+  }
 
-\let\latin@variant\l@latin
-\ifluatex
-  \ifcsname l@latin\endcsname\xpg@set@language@luatex@ii{latin}\fi
-\fi
-\def\captionslatin{\latincaptions}%
-\def\datelatin{\latindate}%
-\define@key{latin}{variant}[modern]{%
-\def\@tempa{#1}%
-\ifx\@tempa\tmp@medieval
-  \ifluatex
-    \ifcsname l@latin\endcsname\xpg@set@language@luatex@ii{latin}\fi
-  \fi
-  \let\latin@variant\l@latin
-  \xpg@set@language@luatex@ii{latin}
-  \medievaltrue \classictrue
-  \xpg@info{Option: Medieval Latin}%
-\else
-  \ifx\@tempa\tmp@classic
-    \unless\ifluatex
-      \unless\ifcsname l@classiclatin\endcsname
-         \xpg@nopatterns{Classic Latin}%
-         \adddialect\l@classiclatin\l@latin
-         \let\latin@variant\l@latin
-      \else
-         \let\latin@variant\l@classiclatin
-      \fi
-    \fi
-    \medievalfalse\classictrue
-    \xpg@info{Option: Classic Latin}%
-  \else
-   \ifx\@tempa\tmp@liturgical\unless\ifluatex
-      \unless\ifcsname l@liturgicallatin\endcsname
-         \xpg@nopatterns{Liturgical Latin}%
-         \adddialect\l@liturgicallatin\l@latin
-         \def\latin@variant{\l@latin}%
-      \else
-         \let\latin@variant\l@liturgicallatin
-      \fi
-        \medievaltrue\classicfalse
-        \xpg@info{Option: Liturgical Latin}\fi
-   \else
-      \ifx\@tempa\tmp@modern
-        \let\latin@variant\l@latin
-        \ifluatex\xpg@set@language@luatex@ii{latin}\fi
-        \xpg@info{Option: Modern Latin}%
-      \else
-        \def\latin@variant{\l@nohyphenation}%
-        \PackageWarning{polyglossia}{%
-          *******************\MessageBreak
-          No hyphenation set for \@tempa
-          *******************\MessageBreak
-        }{}%
-      \fi
-    \fi
-  \fi
-\fi
-}
+% Babel aliases
+\setlanguagealias[variant=classic]{latin}{latinclassic}
+\setlanguagealias[variant=ecclesiastic]{latin}{latinecclesiastic}
+\setlanguagealias[variant=medieval]{latin}{latinmedieval}
 
-\def\latin@language{\language=\latin@variant}%
-\ifluatex
-       \PackageWarning{polyglossia}{\MessageBreak\MessageBreak
-       *****************\MessageBreak
-       The ecclesiastic option is not active\MessageBreak
-       when typesetting with LuaLaTeX\MessageBreak
-       *****************\MessageBreak
-       \MessageBreak}{}
-  \else
-   \def\ecclesiasticlatin@punctuation{%
-      \def\xpg@unskip{\ifhmode\ifdim\lastskip>\z@\unskip\fi\fi}
-      \lccode\string"2019=\string"2019
-      \newXeTeXintercharclass\ecclesiasticlatin@punctthin
-      \newXeTeXintercharclass\ecclesiasticlatin@punctguillstart
-      \newXeTeXintercharclass\ecclesiasticlatin@punctguillend
-      \XeTeXinterchartokenstate=1
-      \XeTeXcharclass `\! \ecclesiasticlatin@punctthin
-      \XeTeXcharclass `\? \ecclesiasticlatin@punctthin
-      \XeTeXcharclass `\; \ecclesiasticlatin@punctthin
-      \XeTeXcharclass `\: \ecclesiasticlatin@punctthin
-      \XeTeXcharclass `\« \ecclesiasticlatin@punctguillstart
-      \XeTeXcharclass `\» \ecclesiasticlatin@punctguillend
-      \XeTeXinterchartoks \z@ \ecclesiasticlatin@punctthin = {\penalty\@M
-      \hskip.2\fontdimen2\font \@plus\z@\@minus\z@}%
-      \XeTeXinterchartoks 255 \ecclesiasticlatin@punctthin = {\xpg@unskip}
-      \XeTeXinterchartoks \ecclesiasticlatin@punctguillstart \z@ = {\penalty\@M
-      \hskip.2\fontdimen2\font \@plus\z@\@minus\z@\ignorespaces}
-      \XeTeXinterchartoks \z@ \ecclesiasticlatin@punctguillend = {\xpg@unskip
-      \penalty\@M\hskip.2\fontdimen2\font \@plus\z@\@minus\z@}
-    }
 
-   \def\noecclesiasticlatin@punctuation{%
-      \lccode\string"2019=\z@
+%%%%% Variables and commands concerning spelling
+
+\bool_new:N \l_polyglossia_latin_use_j_bool
+\bool_new:N \l_polyglossia_latin_use_v_bool
+\bool_new:N \l_polyglossia_latin_use_digraphs_bool
+\bool_new:N \l_polyglossia_latin_capitalize_month_bool
+
+\cs_new:Npn \polyglossia_latin_classical_character_codes:
+  {
+    \char_set_lccode:nn {`\V} {`\u}
+    \char_set_uccode:nn {`\u} {`\V}
+    \char_set_uccode:nn {`\ú} {`\V}
+    \char_set_uccode:nn {`\ū} {`\V}
+    \char_set_uccode:nn {`\ŭ} {`\V}
+  }
+
+\cs_new:Npn \polyglossia_latin_modern_character_codes:
+  {
+    \char_set_lccode:nn {`\V} {`\v}
+    \char_set_uccode:nn {`\u} {`\U}
+    \char_set_uccode:nn {`\ú} {`\Ú}
+    \char_set_uccode:nn {`\ū} {`\Ū}
+    \char_set_uccode:nn {`\ŭ} {`\Ŭ}
+  }
+
+
+%%%%% Messages and commands concerning hyphenation
+
+\msg_new:nnn {polyglossia} {latin / missing modern patterns}
+  {
+    No~hyphenation~patterns~were~found~for~Latin~\msg_line_context:.~
+    I~will~not~hyphenate~Latin~words.
+  }
+
+\msg_new:nnn {polyglossia} {latin / missing patterns}
+  {
+    The~"#1"~hyphenation~patterns~were~not~found~\msg_line_context:.~
+    I~will~use~the~patterns~for~modern~Latin~instead.
+  }
+
+\cs_new:Npn \polyglossia_latin_use_modern_patterns:
+  {
+    \xpg@ifdefined {latin}
+      {
+        \def \latin@language
+          {
+            \polyglossia@setup@language@patterns {latin}
+          }
+      }
+      {
+        \msg_warning:nn {polyglossia} {latin / missing modern patterns}
+        \adddialect \l@latin \l@nohyphenation
+      }
+  }
+
+\cs_new:Npn \polyglossia_latin_set_patterns:n #1
+% #1 may be "classiclatin" or "liturgicallatin"
+  {
+    \xpg@ifdefined {#1}
+      {
+        \def \latin@language
+          {
+            \polyglossia@setup@language@patterns {#1}
+          }
+      }
+      {
+        \xpg@ifdefined {latin}
+          {
+            \msg_warning:nnn {polyglossia} {latin / missing patterns} {#1}
+            \adddialect \l@ #1 \l@latin
+            \polyglossia_latin_use_modern_patterns:
+          }
+          {
+            \msg_warning:nn {polyglossia} {latin / missing modern patterns}
+            \adddialect \l@ #1 \l@nohyphenation
+          }
+      }
+  }
+
+
+%%%%% Settings for the spacing of the punctuation for ecclesiastical Latin
+
+\bool_new:N \g_polyglossia_latin_punctuation_spacing_bool
+
+\sys_if_engine_luatex:TF
+  {
+    \directlua { require('polyglossia-latin') }
+  }
+  {
+    \newXeTeXintercharclass \g_polyglossia_latin_punctuation_class
+    \newXeTeXintercharclass \g_polyglossia_latin_opening_guillemet_class
+    \newXeTeXintercharclass \g_polyglossia_latin_closing_guillemet_class
+    \newXeTeXintercharclass \g_polyglossia_latin_opening_bracket_class
+    \newXeTeXintercharclass \g_polyglossia_latin_closing_bracket_class
+
+    \cs_new:Npn \polyglossia_latin_insert_punctuation_space:
+      {
+        \nobreak
+        \skip_horizontal:n { 0.08333 \fontdimen6 \font } % 1/12 quad
+      }
+    \cs_new:Npn \polyglossia_latin_replace_preceding_space:
+      {
+        \dim_compare:nNnT {\lastskip} > {\c_zero_dim} {\unskip}
+        \polyglossia_latin_insert_punctuation_space:
+      }
+    \cs_new:Npn \polyglossia_latin_replace_following_space:
+      {
+        \polyglossia_latin_insert_punctuation_space:
+        \ignorespaces
+      }
+  }
+
+\cs_new:Npn \polyglossia_latin_punctuation_spacing:
+  {
+    \sys_if_engine_luatex:TF
+      {
+        \directlua { polyglossia.activate_latin_punct() }
+      }
+      {
+        \XeTeXinterchartokenstate = 1
+        \XeTeXcharclass `\! \g_polyglossia_latin_punctuation_class
+        \XeTeXcharclass `\? \g_polyglossia_latin_punctuation_class
+        \XeTeXcharclass `\‼ \g_polyglossia_latin_punctuation_class
+        \XeTeXcharclass `\⁇ \g_polyglossia_latin_punctuation_class
+        \XeTeXcharclass `\⁈ \g_polyglossia_latin_punctuation_class
+        \XeTeXcharclass `\⁉ \g_polyglossia_latin_punctuation_class
+        \XeTeXcharclass `\; \g_polyglossia_latin_punctuation_class
+        \XeTeXcharclass `\: \g_polyglossia_latin_punctuation_class
+        \XeTeXcharclass `\« \g_polyglossia_latin_opening_guillemet_class
+        \XeTeXcharclass `\» \g_polyglossia_latin_closing_guillemet_class
+        \XeTeXcharclass `\‹ \g_polyglossia_latin_opening_guillemet_class
+        \XeTeXcharclass `\› \g_polyglossia_latin_closing_guillemet_class
+        \XeTeXcharclass `\( \g_polyglossia_latin_opening_bracket_class
+        \XeTeXcharclass `\) \g_polyglossia_latin_closing_bracket_class
+        \XeTeXcharclass `\[ \g_polyglossia_latin_opening_bracket_class
+        \XeTeXcharclass `\] \g_polyglossia_latin_closing_bracket_class
+        \XeTeXcharclass `\{ \g_polyglossia_latin_opening_bracket_class
+        \XeTeXcharclass `\} \g_polyglossia_latin_closing_bracket_class
+        \XeTeXcharclass `\⟨ \g_polyglossia_latin_opening_bracket_class
+        \XeTeXcharclass `\⟩ \g_polyglossia_latin_closing_bracket_class
+
+        % punctuation followed by a closing guillemet
+        \XeTeXinterchartoks \g_polyglossia_latin_punctuation_class \g_polyglossia_latin_closing_guillemet_class =
+          {
+            \polyglossia_latin_insert_punctuation_space:
+          }
+        % closing bracket followed by punctuation
+        \XeTeXinterchartoks \g_polyglossia_latin_closing_bracket_class \g_polyglossia_latin_punctuation_class =
+          {
+            \polyglossia_latin_insert_punctuation_space:
+          }
+        % closing bracket followed by a closing guillemet
+        \XeTeXinterchartoks \g_polyglossia_latin_closing_bracket_class \g_polyglossia_latin_closing_guillemet_class =
+          {
+            \polyglossia_latin_insert_punctuation_space:
+          }
+        % opening guillemet followed by a space
+        \XeTeXinterchartoks \g_polyglossia_latin_opening_guillemet_class \xpg@boundaryclass =
+          {
+            \polyglossia_latin_replace_following_space:
+          }
+        % opening guillemet followed by an ordinary character
+        \XeTeXinterchartoks \g_polyglossia_latin_opening_guillemet_class \z@ =
+          {
+            \polyglossia_latin_insert_punctuation_space:
+          }
+        % closing guillemet followed by punctuation
+        \XeTeXinterchartoks \g_polyglossia_latin_closing_guillemet_class \g_polyglossia_latin_punctuation_class =
+          {
+            \polyglossia_latin_insert_punctuation_space:
+          }
+        % space followed by punctuation
+        \XeTeXinterchartoks \xpg@boundaryclass \g_polyglossia_latin_punctuation_class =
+          {
+            \polyglossia_latin_replace_preceding_space:
+          }
+        % space followed by closing guillemet
+        \XeTeXinterchartoks \xpg@boundaryclass \g_polyglossia_latin_closing_guillemet_class =
+          {
+            \polyglossia_latin_replace_preceding_space:
+          }
+        % ordinary character followed by punctuation
+        \XeTeXinterchartoks \z@ \g_polyglossia_latin_punctuation_class =
+          {
+            \polyglossia_latin_insert_punctuation_space:
+          }
+        % ordinary character followed by closing guillemet
+        \XeTeXinterchartoks \z@ \g_polyglossia_latin_closing_guillemet_class =
+          {
+            \polyglossia_latin_insert_punctuation_space:
+          }
+      }
+  }
+
+\cs_new:Npn \polyglossia_latin_no_punctuation_spacing:
+  {
+    \sys_if_engine_luatex:TF
+      {
+        \directlua { polyglossia.deactivate_latin_punct() }
+      }
+      {
         \XeTeXcharclass `\! \z@
         \XeTeXcharclass `\? \z@
+        \XeTeXcharclass `\‼ \z@
+        \XeTeXcharclass `\⁇ \z@
+        \XeTeXcharclass `\⁈ \z@
+        \XeTeXcharclass `\⁉ \z@
         \XeTeXcharclass `\; \z@
         \XeTeXcharclass `\: \z@
         \XeTeXcharclass `\« \z@
         \XeTeXcharclass `\» \z@
-        \XeTeXinterchartokenstate=0
+        \XeTeXcharclass `\‹ \z@
+        \XeTeXcharclass `\› \z@
+        \XeTeXcharclass `\( \z@
+        \XeTeXcharclass `\) \z@
+        \XeTeXcharclass `\[ \z@
+        \XeTeXcharclass `\] \z@
+        \XeTeXcharclass `\{ \z@
+        \XeTeXcharclass `\} \z@
+        \XeTeXcharclass `\⟨ \z@
+        \XeTeXcharclass `\⟩ \z@
+        \XeTeXinterchartokenstate = 0
       }
-    \let\latin@original@makefntext\@makefntext
-    \newcommand\latin@ecclesiastic@makefntext[1]{%
-        \parindent 1em \noindent
-        \latin@Makefnmark{\enspace #1}}
-    \newcommand\latin@Makefnmark{\hbox{\normalfont\@thefnmark.}}
-\fi
-\setkeys{latin}{variant,ecclesiastic=false}
-\def\latincaptions{%
-   \def\prefacename{\ifmedieval Præfatio\else Praefatio\fi}%
-   \def\refname{Conspectus librorum}%
-   \def\abstractname{Summarium}%
-   \def\bibname{Conspectus librorum}%
-   \def\chaptername{Caput}%
-   \def\appendixname{Additamentum}%
-   \def\contentsname{Index}%
-   \def\listfigurename{Conspectus descriptionum}%
-   \def\listtablename{Conspectus tabularum}%
-   \def\indexname{Index rerum notabilium}%
-   \def\figurename{Descriptio}%
-   \def\tablename{Tabula}%
-   \def\partname{Pars}%
-   \def\enclname{Additur}%
-   \def\ccname{Exemplar}%
-   \def\headtoname{\ignorespaces}%
-   \def\pagename{charta}%
-   \def\seename{cfr.}%
-   \def\alsoname{cfr.}%
-   \def\proofname{Demonstratio}%
-   \def\glossaryname{Glossarium}%
-   }
+  }
 
-\def\latindate{%
-   \def\today{\uppercase\expandafter{\romannumeral\day}%
-      \space \ifcase\month%
-      \or Januarii\or Februarii\or Martii\or Aprilis\or Maji\or
-      Junii\or Julii\or Augusti\or Septembris\or Octobris\or
-        \ifclassic Nouembris\else Novembris\fi
-      \or Decembris\fi%
-      \space \uppercase\expandafter{\romannumeral\year}}}
-%%%%%%%%% Latin shorthands
 
-\define@boolkey{latin}[latin@]{babelshorthands}[true]{}
+%%%%% Messages and commands concerning footnotes
+
+\cs_if_exist:NT \@makefntext
+  {
+    \cs_set_eq:NN \polyglossia_latin_original_footnote:n \@makefntext
+  }
+
+% This is the footnote style as defined by the "ecclesiastic" package.
+\cs_new:Npn \polyglossia_latin_variant_footnote:n #1
+  {
+    \parindent 1em
+    \noindent
+    \hbox { \normalfont \@thefnmark . }
+    \enspace #1
+  }
+
+\msg_new:nnn {polyglossia} {latin / ineffective footnote option}
+  {
+    The~option~"ecclesiasticfootnotes"~is~ineffective~\msg_line_context:
+    \c_space_tl as~Latin~is~not~the~main~language.
+  }
+
+\cs_new:Npn \polyglossia_latin_apply_footnote_option:
+  {
+    \str_if_eq:VnTF \xpg@main@language {latin}
+      {
+        \cs_if_exist:NT \@makefntext
+          {
+            \iflatin@ecclesiasticfootnotes
+              \let \@makefntext \polyglossia_latin_variant_footnote:n
+            \else
+              \let \@makefntext \polyglossia_latin_original_footnote:n
+            \fi
+          }
+      }
+      {
+        \msg_warning:nn {polyglossia} {latin / ineffective footnote option}
+      }
+  }
+
+\define@boolkey {latin} [latin@] {ecclesiasticfootnotes} [true]
+  {
+    \token_if_eq_meaning:NNTF \@onlypreamble \@notprerr
+      {
+        % within the document
+        \polyglossia_latin_apply_footnote_option:
+      }
+      {
+        % within the preamble
+        % The application of the option has to be postponed as the main
+        % language may be undefined when the option is called.
+        \AtBeginDocument { \polyglossia_latin_apply_footnote_option: }
+      }
+  }
+
+
+%%%%% Language variants: classic, medieval, modern, and ecclesiastic
+
+\msg_new:nnn {polyglossia} {latin / language variant}
+  {
+    Activating~Latin~language~variant~"#1"~\msg_line_context:.
+  }
+
+\msg_new:nnn {polyglossia} {latin / illegal language variant}
+  {
+    The~Latin~language~variant~"#1"~is~undefined~\msg_line_context:.
+  }
+
+\cs_new:Npn \polyglossia_latin_classic_settings:
+  {
+    \bool_set_false:N \l_polyglossia_latin_use_j_bool
+    \bool_set_false:N \l_polyglossia_latin_use_v_bool
+    \bool_set_false:N \l_polyglossia_latin_use_digraphs_bool
+    \bool_set_true:N \l_polyglossia_latin_capitalize_month_bool
+    \bool_set_false:N \l_polyglossia_latin_punctuation_spacing_bool
+    \SetLanguageKeys {latin} { babelname = latin.classic }
+    \polyglossia_latin_set_patterns:n {classiclatin}
+  }
+
+\cs_new:Npn \polyglossia_latin_medieval_settings:
+  {
+    \bool_set_false:N \l_polyglossia_latin_use_j_bool
+    \bool_set_false:N \l_polyglossia_latin_use_v_bool
+    \bool_set_true:N \l_polyglossia_latin_use_digraphs_bool
+    \bool_set_true:N \l_polyglossia_latin_capitalize_month_bool
+    \bool_set_false:N \l_polyglossia_latin_punctuation_spacing_bool
+    \SetLanguageKeys {latin} { babelname = latin.medieval }
+    \polyglossia_latin_use_modern_patterns:
+  }
+
+\cs_new:Npn \polyglossia_latin_modern_settings:
+  {
+    \bool_set_false:N \l_polyglossia_latin_use_j_bool
+    \bool_set_true:N \l_polyglossia_latin_use_v_bool
+    \bool_set_false:N \l_polyglossia_latin_use_digraphs_bool
+    \bool_set_true:N \l_polyglossia_latin_capitalize_month_bool
+    \bool_set_false:N \l_polyglossia_latin_punctuation_spacing_bool
+    \SetLanguageKeys {latin} { babelname = latin }
+    \polyglossia_latin_use_modern_patterns:
+  }
+
+\cs_new:Npn \polyglossia_latin_ecclesiastic_settings:
+  {
+    \bool_set_false:N \l_polyglossia_latin_use_j_bool
+    \bool_set_true:N \l_polyglossia_latin_use_v_bool
+    \bool_set_true:N \l_polyglossia_latin_use_digraphs_bool
+    \bool_set_false:N \l_polyglossia_latin_capitalize_month_bool
+    \bool_set_true:N \l_polyglossia_latin_punctuation_spacing_bool
+    \SetLanguageKeys {latin} { babelname = latin.ecclesiastic }
+    \polyglossia_latin_use_modern_patterns:
+  }
+
+\define@key{latin}{variant}
+  {
+    \str_case:nnF {#1}
+      {
+        {classic}
+        {
+          \msg_info:nnn {polyglossia} {latin / language variant} {classic}
+          \polyglossia_latin_classic_settings:
+        }
+        {medieval}
+        {
+          \msg_info:nnn {polyglossia} {latin / language variant} {medieval}
+          \polyglossia_latin_medieval_settings:
+        }
+        {modern}
+        {
+          \msg_info:nnn {polyglossia} {latin / language variant} {modern}
+          \polyglossia_latin_modern_settings:
+        }
+        {ecclesiastic}
+        {
+          \msg_info:nnn {polyglossia} {latin / language variant} {ecclesiastic}
+          \polyglossia_latin_ecclesiastic_settings:
+        }
+      }
+      {
+        \msg_warning:nnn {polyglossia} {latin / illegal language variant} {#1}
+      }
+  }
+
+
+%%%%% Boolean options concerning spelling
+
+\define@boolkey{latin}[latin@]{usej}[true]
+  {
+    \iflatin@usej
+      \bool_set_true:N \l_polyglossia_latin_use_j_bool
+    \else
+      \bool_set_false:N \l_polyglossia_latin_use_j_bool
+    \fi
+  }
+
+\define@boolkey{latin}[latin@]{capitalizemonth}[true]
+  {
+    \iflatin@capitalizemonth
+      \bool_set_true:N \l_polyglossia_latin_capitalize_month_bool
+    \else
+      \bool_set_false:N \l_polyglossia_latin_capitalize_month_bool
+    \fi
+  }
+
+
+%%%%% Hyphenation variants: classic, liturgical, and modern
+
+\msg_new:nnn {polyglossia} {latin / hyphenation variant}
+  {
+    Activating~hyphenation~patterns~for~#1~Latin~\msg_line_context:.
+  }
+
+\msg_new:nnn {polyglossia} {latin / illegal hyphenation variant}
+  {
+    The~Latin~hyphenation~variant~"#1"~is~undefined~\msg_line_context:.
+  }
+
+\define@key{latin}{hyphenation}
+  {
+    \str_case:nnTF {#1}
+      {
+        {classic}    { \polyglossia_latin_set_patterns:n {classiclatin} }
+        {liturgical} { \polyglossia_latin_set_patterns:n {liturgicallatin} }
+        {modern}     { \polyglossia_latin_use_modern_patterns: }
+      }
+      {
+        \msg_info:nnn {polyglossia} {latin / hyphenation variant} {#1}
+      }
+      {
+        \msg_warning:nnn {polyglossia} {latin / illegal hyphenation variant} {#1}
+      }
+  }
+
+
+%%%%% Latin captions and date
+
+\def \captionslatin
+  {
+    \def \prefacename
+      {
+        \bool_if:NTF \l_polyglossia_latin_use_digraphs_bool {Præfatio} {Praefatio}
+      }
+    \def \refname {Conspectus~librorum}
+    \def \abstractname {Summarium}
+    \def \bibname {Conspectus~librorum}
+    \def \chaptername {Caput}
+    \def \appendixname {Additamentum}
+    \def \contentsname {Index}
+    \def \listfigurename {Conspectus~descriptionum}
+    \def \listtablename {Conspectus~tabularum}
+    \def \indexname {Index~rerum~notabilium}
+    \def \figurename {Descriptio}
+    \def \tablename {Tabula}
+    \def \partname {Pars}
+    \def \enclname {Additur}
+    \def \ccname {Exemplar}
+    \def \headtoname {\ignorespaces}
+    \def \pagename {charta}
+    \def \seename {cfr.}
+    \def \alsoname {cfr.}
+    \def \proofname {Demonstratio}
+    \def \glossaryname {Glossarium}
+  }
+
+\cs_new:Npn \polyglossia_latin_month_name:
+  {
+    \str_set:Nx \l_tmpa_str
+      {
+        \int_case:nn { \month }
+          {
+            {1} { \bool_if:NTF \l_polyglossia_latin_use_j_bool {januarii} {ianuarii} }
+            {2} {februarii}
+            {3} {martii}
+            {4} {aprilis}
+            {5} { \bool_if:NTF \l_polyglossia_latin_use_j_bool {maji} {maii} }
+            {6} { \bool_if:NTF \l_polyglossia_latin_use_j_bool {junii} {iunii} }
+            {7} { \bool_if:NTF \l_polyglossia_latin_use_j_bool {julii} {iulii} }
+            {8} {augusti}
+            {9} {septembris}
+            {10} {octobris}
+            {11} { \bool_if:NTF \l_polyglossia_latin_use_v_bool {novembris} {nouembris} }
+            {12} {decembris}
+          }
+      }
+    \bool_if:NTF \l_polyglossia_latin_capitalize_month_bool
+      {
+        \tl_mixed_case:n { \l_tmpa_str }
+      }
+      {
+        \str_use:N \l_tmpa_str
+      }
+  }
+
+\def \datelatin
+  {
+    \def \today
+      {
+        \int_to_Roman:n { \day }
+        \c_space_tl
+        \polyglossia_latin_month_name:
+        \c_space_tl
+        \int_to_Roman:n { \year }
+      }
+  }
+
+
+%%%%% Latin shorthands
+
+\define@boolkey{latin}[latin@]{babelshorthands}[true]
+  {
+  }
+
+\define@boolkey{latin}[latin@]{prosodicshorthands}[true]
+  {
+  }
 
 \ifsystem@babelshorthands
   \setkeys{latin}{babelshorthands=true}
 \else
   \setkeys{latin}{babelshorthands=false}
 \fi
-\ifcsundef{initiate@active@char}{%
-\input{babelsh.def}%
-\initiate@active@char{"}%
-\initiate@active@char{'}%
-}{}
-\def\latin@shorthands{%
-  \def\language@group{latin}%
-  \bbl@activate{"}%
-  \declare@shorthand{latin}{"}{\relax
-    \ifmmode
-      \def\xpgla@nextdq{''}%
-    \else
-      \def\xpgla@nextdq{\futurelet\xpgla@temp\xpgla@cwm}%
-    \fi
-  \xpgla@nextdq}%
-  \bbl@activate{'}%
-  \declare@shorthand{latin}{'}{\relax
-    \ifmmode
-      \def\xpgla@nextsq{'}%
-    \else
-      \def\xpgla@nextsq{\futurelet\xpgla@temp@A\xpgla@putacute}%
-    \fi
-  \xpgla@nextsq}%
-}
-\def\xpgla@allowhyphens{\bbl@allowhyphens
-        \discretionary{-}{}{}\bbl@allowhyphens}
-\newcommand*{\xpgla@cwm}{\let\xpgla@@nextdq\relax
-  \ifcat\noexpand\xpgla@temp a%
-    \let\xpgla@@nextdq\xpgla@allowhyphens
-  \else
-    \ifx\xpgla@temp\ae
-        \let\xpgla@@nextdq\xpgla@allowhyphens
-    \else
-        \ifx\xpgla@temp\oe
-           \let\xpgla@@nextdq\xpgla@allowhyphens
+
+\ExplSyntaxOff % babelsh.def does not support expl3 syntax
+\ifcsundef{initiate@active@char}{\input{babelsh.def}}{}
+\ExplSyntaxOn
+
+\initiate@active@char {"}
+\initiate@active@char {'}
+\initiate@active@char {^}
+\initiate@active@char {=}
+
+\shorthandoff {"}
+\shorthandoff {'}
+\shorthandoff {^}
+\shorthandoff {=}
+
+% The active '=' character may cause problems with key=value interfaces.
+% We have to make sure here that no problems can occur outside a Latin
+% prosodic shorthand environment.
+
+\protected@write \@auxout { } { \shorthandoff {=} } % for the aux file
+
+\AtBeginDocument
+  {
+    \str_if_eq:VnTF \xpg@main@language {latin}
+      {
+        \iflatin@prosodicshorthands
         \else
-           \if\noexpand\xpgla@temp\string|%
-              \def\xpgla@@nextdq{\xpgla@allowhyphens\@gobble}%
-           \fi
+          \shorthandoff {=}
         \fi
+      }
+      {
+        % The following command should not be called if the main language
+        % defines a '=' shorthand. However, there are no languages besides
+        % Latin defining such a shorthand in polyglossia.
+        \shorthandoff {=}
+      }
+  }
+
+\cs_new:Npn \polyglossia_latin_shorthands:
+  {
+    \def \language@group {latin}
+    \bbl@activate {"}
+    \declare@shorthand {latin} {"}
+      {
+        \mode_if_math:TF
+          {
+            \token_to_str:N "
+          }
+          {
+            \polyglossia_latin_apply_quotemark:N
+          }
+      }
+    \bbl@activate {'}
+    \declare@shorthand {latin} {'}
+      {
+        \mode_if_math:TF
+          {
+            \active@math@prime % defined in "latex.ltx"
+          }
+          {
+            \polyglossia_latin_put_acute:N
+          }
+      }
+  }
+
+\cs_new:Npn \polyglossia_latin_prosodic_shorthands:
+  {
+    \def \language@group {latin}
+    % The '=' shorthand is normally turned off to avoid problems with key=value
+    % interfaces. We turn it on here to enable prosodic shorthands.
+    \shorthandon {=}
+    \bbl@activate {=}
+    \declare@shorthand {latin} {=}
+      {
+        \mode_if_math:TF
+          {
+            \token_to_str:N =
+          }
+          {
+            \polyglossia_latin_put_macron:N
+          }
+      }
+    \bbl@activate {^}
+    \declare@shorthand {latin} {^}
+      {
+        \mode_if_math:TF
+          {
+            \token_to_str:N ^
+          }
+          {
+            \polyglossia_latin_put_breve:N
+          }
+      }
+  }
+
+\cs_new:Npn \polyglossia_latin_apply_quotemark:N #1
+  {
+    \str_case:nnF {#1}
+      {
+        {A} { \polyglossia_latin_digraph_shorthand:Nnn E { Æ }
+                {
+                  \polyglossia_latin_digraph_shorthand:Nnn e { Æ }
+                    {
+                      \polyglossia_latin_allow_hyphens: A
+                    }
+                }
+            }
+        {a} { \polyglossia_latin_digraph_shorthand:Nnn e { æ }
+                {
+                  \polyglossia_latin_allow_hyphens: a
+                }
+            }
+        {O} { \polyglossia_latin_digraph_shorthand:Nnn E { Π}
+                {
+                  \polyglossia_latin_digraph_shorthand:Nnn e { Π}
+                    {
+                      \polyglossia_latin_allow_hyphens: O
+                    }
+                }
+            }
+        {o} { \polyglossia_latin_digraph_shorthand:Nnn e { œ }
+                {
+                  \polyglossia_latin_allow_hyphens: o
+                }
+            }
+        {|} { \polyglossia_latin_allow_hyphens: }
+        {<} { « }
+        {>} { » }
+      }
+      {
+        \token_if_letter:NTF #1 { \polyglossia_latin_allow_hyphens: #1 }
+          {
+            \token_if_eq_meaning:NNTF #1 \AE { \polyglossia_latin_allow_hyphens: #1 }
+              {
+                \token_if_eq_meaning:NNTF #1 \ae { \polyglossia_latin_allow_hyphens: #1 }
+                  {
+                    \token_if_eq_meaning:NNTF #1 \OE { \polyglossia_latin_allow_hyphens: #1 }
+                      {
+                        \token_if_eq_meaning:NNTF #1 \oe { \polyglossia_latin_allow_hyphens: #1 }
+                          {
+                            \token_to_str:N "
+                            #1
+                          }
+                      }
+                  }
+              }
+          }
+      }
+  }
+
+\cs_new:Npn \polyglossia_latin_put_acute:N #1
+  {
+    \str_case:nnF {#1}
+      {
+        {A} { \polyglossia_latin_digraph_shorthand:Nnn E { Ǽ }
+                {
+                  \polyglossia_latin_digraph_shorthand:Nnn e { Ǽ } { Á }
+                }
+            }
+        {a} { \polyglossia_latin_digraph_shorthand:Nnn e { ǽ } { á } }
+        {E} { É }
+        {e} { é }
+        {I} { Í }
+        {i} { í }
+        {O} { \polyglossia_latin_digraph_shorthand:Nnn E { \'Π}
+                {
+                  \polyglossia_latin_digraph_shorthand:Nnn e { \'Œ } { Ó }
+                }
+            }
+        {o} { \polyglossia_latin_digraph_shorthand:Nnn e { \'œ } { ó } }
+        {U} { Ú }
+        {u} { ú }
+        {V} { \' V } % V may be a vowel, but lowercase v is never used as a vowel.
+        {Y} { Ý }
+        {y} { ý }
+        {Æ} { Ǽ }
+        {æ} { ǽ }
+        {Œ} { \'Œ }
+        {œ} { \'œ }
+      }
+      {
+        \token_if_eq_meaning:NNTF #1 \AE { Ǽ }
+          {
+            \token_if_eq_meaning:NNTF #1 \ae { ǽ }
+              {
+                \token_if_eq_meaning:NNTF #1 \OE { \'Π}
+                  {
+                    \token_if_eq_meaning:NNTF #1 \oe { \'œ }
+                      {
+                        \token_to_str:N '
+                        #1
+                      }
+                  }
+              }
+          }
+      }
+  }
+
+\cs_new:Npn \polyglossia_latin_put_macron:N #1
+  {
+    \str_case:nnF {#1}
+      {
+        {A} { \polyglossia_latin_diphthong_macron:NNn AE
+                {
+                  \polyglossia_latin_diphthong_macron:NNn Ae
+                    {
+                      \polyglossia_latin_diphthong_macron:NNn AU
+                        {
+                          \polyglossia_latin_diphthong_macron:NNn Au { Ā }
+                        }
+                    }
+                }
+            }
+        {a} { \polyglossia_latin_diphthong_macron:NNn ae
+                {
+                  \polyglossia_latin_diphthong_macron:NNn au { ā }
+                }
+            }
+        {E} { \polyglossia_latin_diphthong_macron:NNn EU
+                {
+                  \polyglossia_latin_diphthong_macron:NNn Eu { Ē }
+                }
+            }
+        {e} { \polyglossia_latin_diphthong_macron:NNn eu { ē } }
+        {I} { Ī }
+        {i} { ī }
+        {O} { \polyglossia_latin_diphthong_macron:NNn OE
+                {
+                  \polyglossia_latin_diphthong_macron:NNn Oe { Ō }
+                }
+            }
+        {o} { \polyglossia_latin_diphthong_macron:NNn oe { ō } }
+        {U} { Ū }
+        {u} { ū }
+        {V} { \= V } % V may be a vowel, but lowercase v is never used as a vowel.
+        {Y} { Ȳ }
+        {y} { ȳ }
+      }
+      {
+        \token_to_str:N =
+        #1
+      }
+  }
+
+\cs_new:Npn \polyglossia_latin_put_breve:N #1
+  {
+    \str_case:nnF {#1}
+      {
+        {A} { Ă }
+        {a} { ă }
+        {E} { Ĕ }
+        {e} { ĕ }
+        {I} { Ĭ }
+        {i} { ĭ }
+        {O} { Ŏ }
+        {o} { ŏ }
+        {U} { Ŭ }
+        {u} { ŭ }
+        {V} { \u{V} } % V may be a vowel, but lowercase v is never used as a vowel.
+        {Y} { \u{Y} }
+        {y} { \u{y} }
+      }
+      {
+        \token_to_str:N ^
+        #1
+      }
+  }
+
+
+\cs_new:Npn \polyglossia_latin_allow_hyphens:
+  {
+    \bbl@allowhyphens
+    \discretionary {-} {} {}
+    \bbl@allowhyphens
+  }
+
+\cs_new:Npn \polyglossia_latin_digraph_shorthand:Nnn #1#2#3
+% #1: second letter of digraph (E or e)
+% #2: digraph character
+% #3: non-digraph code
+  {
+    \bool_if:NTF \l_polyglossia_latin_use_digraphs_bool
+      {
+        \peek_meaning_remove:NTF #1 {#2} {#3}
+      }
+      {
+        #3
+      }
+  }
+
+\cs_new:Npn \polyglossia_latin_diphthong_macron:NNn #1#2#3
+% #1: first character of diphthong
+% #2: second character of diphthong
+% #3: non-diphthong code
+  {
+    \peek_meaning:NTF #2 { #1 \char "35E \relax } {#3} % U+35E: combining double macron
+  }
+
+\cs_new:Npn \polyglossia_latin_no_shorthands:
+  {
+    \bbl@deactivate {"}
+    \bbl@deactivate {'}
+    \bbl@deactivate {=}
+    \bbl@deactivate {^}
+    % The active '=' character may cause problems with key=value interfaces.
+    % We have to make sure here that no problems can occur outside a Latin
+    % prosodic shorthand environment.
+    \shorthandoff {=}
+  }
+
+
+%%%%% Further settings
+
+\let \xpgla@savedvalues \empty
+
+\AtEndPreamble
+  {
+    \edef \xpgla@savedvalues
+      {
+        \clubpenalty = \the \clubpenalty \space
+        \@clubpenalty = \the \@clubpenalty \space
+        \widowpenalty = \the \widowpenalty \space
+        \finalhyphendemerits = \the \finalhyphendemerits
+      }
+  }
+
+\def \noextras@latin
+  {
+    \polyglossia_latin_no_shorthands:
+    \xpgla@savedvalues
+    \polyglossia_latin_no_punctuation_spacing:
+    \polyglossia_latin_modern_character_codes:
+  }
+
+\cs_new:Npn \polyglossia_latin_inline_extras:
+  {
+    \bool_if:NF \l_polyglossia_latin_use_v_bool
+      {
+        \polyglossia_latin_classical_character_codes:
+      }
+    \bool_if:NT \l_polyglossia_latin_punctuation_spacing_bool
+      {
+        \polyglossia_latin_punctuation_spacing:
+      }
+    \iflatin@babelshorthands
+      \polyglossia_latin_shorthands:
     \fi
-  \fi
-  \xpgla@@nextdq}%
-\def\xpgla@putacute#1{\let\xpgla@nextsq\relax%
-\if a\xpgla@temp@A
-  æ\kern-0.175em^^^^0301\kern0.175em\xpgla@allowhyphens
-\else
-\if o\xpgla@temp@A
-  œ\kern-0.175em^^^^0301\kern0.175em\xpgla@allowhyphens
-\else
-  \if æ\xpgla@temp@A
-    æ^^^^0301%
-  \else
-    \if œ\xpgla@temp@A
-      œ^^^^0301%
-    \else
-      \string'%
+    \iflatin@prosodicshorthands
+      \polyglossia_latin_prosodic_shorthands:
     \fi
-  \fi
-\fi
-\fi}%
+  }
 
-\def\nolatin@shorthands{%
-  \@ifundefined{initiate@active@char}{}{\bbl@deactivate{"}}%
-  \@ifundefined{initiate@active@char}{}{\bbl@deactivate{'}}%
-}
+\def \blockextras@latin
+  {
+    % The following four values were overtaken from the Italian language module.
+    % It is unclear why they were chosen.
+    \clubpenalty = 3000
+    \@clubpenalty = 3000
+    \widowpenalty = 3000
+    \finalhyphendemerits = 50000000
+    \polyglossia_latin_inline_extras:
+  }
 
-\let\xpgla@savedvalues\empty
-\AtEndPreamble{%
-  \edef\xpgla@savedvalues{%
-    \clubpenalty=\the\clubpenalty\space
-    \@clubpenalty=\the\@clubpenalty\space
-    \widowpenalty=\the\widowpenalty\space
-    \finalhyphendemerits=\the\finalhyphendemerits}
-}
-\def\noextras@latin{%
-   \lccode\string"2019=\z@
-   \nolatin@shorthands
-   \xpgla@savedvalues
-   \noclassicuclccodes
-  \iflatin@ecclesiastic
-    \unless\ifluatex\noecclesiasticlatin@punctuation
-    \let\@makefntext\latin@original@makefntext\fi
-  \fi
-}
+\def \inlineextras@latin
+  {
+    \polyglossia_latin_inline_extras:
+  }
 
-\def\blockextras@latin{%
-   \lccode\string"2019=\string"2019
-   \clubpenalty=3000 \@clubpenalty=3000 \widowpenalty=3000
-   \finalhyphendemerits=50000000
-   \ifclassic\classicuclccodes\fi
-   \iflatin@babelshorthands\latin@shorthands\fi
-   \iflatin@ecclesiastic\unless\ifluatex\ecclesiasticlatin@punctuation
-   \let\@makefntext\latin@ecclesiastic@makefntext\fi
-   \fi
-}
 
-\def\inlineextras@latin{%
-   \lccode\string"2019=\string"2019
-   \ifclassic\classicuclccodes\fi
-   \iflatin@babelshorthands\latin@shorthands\fi
-   \iflatin@ecclesiastic
-      \unless\ifluatex\ecclesiasticlatin@punctuation
-      \let\@makefntext\latin@ecclesiastic@makefntext\fi
-   \fi
-}
+%% Default settings
+
+\polyglossia_latin_modern_settings:
+
+\ExplSyntaxOff
+
 %%   Copyright (C) Claudio Beccari 2013-2016
-%%   Copyright (C) Élie Roux 2016
-%% 
+%%   Copyright (C) Élie Roux 2016-2019
+%%   Copyright (C) Keno Wehr 2019
+%%
 %%   Permission is hereby granted, free of charge, to any person obtaining
 %%   a copy of this software and associated documentation files
 %%   (the "Software"), to deal in the Software without restriction, including
@@ -7268,10 +9331,10 @@ and may look very wrong.}
 %%   distribute, sublicense, and/or sell copies of the Software, and to permit
 %%   persons to whom the Software is furnished to do so, subject to the following
 %%   conditions:
-%% 
+%%
 %%   The above copyright notice and this permission notice shall be included in
 %%   all copies or substantial portions of the Software.
-%% 
+%%
 %%   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 %%   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 %%   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@@ -7284,6 +9347,51 @@ and may look very wrong.}
 %    \end{macrocode}
 % \iffalse
 %</gloss-latin.ldf>
+%<*gloss-latinclassic.ldf>
+% \fi
+% \clearpage
+% 
+% \subsection{gloss-latinclassic.ldf}
+%    \begin{macrocode}
+\ProvidesFile{gloss-latinclassic.ldf}[polyglossia: module for classic latin]
+
+% We provide this as a babel alias
+
+\xpg@load@master@language{latin}
+
+%    \end{macrocode}
+% \iffalse
+%</gloss-latinclassic.ldf>
+%<*gloss-latinecclesiastic.ldf>
+% \fi
+% \clearpage
+% 
+% \subsection{gloss-latinecclesiastic.ldf}
+%    \begin{macrocode}
+\ProvidesFile{gloss-latinecclesiastic.ldf}[polyglossia: module for ecclesiastic latin]
+
+% We provide this as a babel alias
+
+\xpg@load@master@language{latin}
+
+%    \end{macrocode}
+% \iffalse
+%</gloss-latinecclesiastic.ldf>
+%<*gloss-latinmedieval.ldf>
+% \fi
+% \clearpage
+% 
+% \subsection{gloss-latinmedieval.ldf}
+%    \begin{macrocode}
+\ProvidesFile{gloss-latinmedieval.ldf}[polyglossia: module for medieval latin]
+
+% We provide this as a babel alias
+
+\xpg@load@master@language{latin}
+
+%    \end{macrocode}
+% \iffalse
+%</gloss-latinmedieval.ldf>
 %<*gloss-latvian.ldf>
 % \fi
 % \clearpage
@@ -7406,6 +9514,21 @@ and may look very wrong.}
 %    \end{macrocode}
 % \iffalse
 %</gloss-lithuanian.ldf>
+%<*gloss-lowersorbian.ldf>
+% \fi
+% \clearpage
+% 
+% \subsection{gloss-lowersorbian.ldf}
+%    \begin{macrocode}
+\ProvidesFile{gloss-lowersorbian.ldf}[polyglossia: module for lower sorbian]
+
+% We provide this as a babel alias
+
+\xpg@load@master@language{sorbian}
+
+%    \end{macrocode}
+% \iffalse
+%</gloss-lowersorbian.ldf>
 %<*gloss-lsorbian.ldf>
 % \fi
 % \clearpage
@@ -7417,19 +9540,7 @@ and may look very wrong.}
 % We only provide this gloss for babel compatibility. Since lsorbian is 
 % a sorbian variety, we use 'sorbian' with variant 'lower' now.
 
-\input{gloss-sorbian.ldf}
-
-\PolyglossiaSetup{lsorbian}{
-  language=Lower Sorbian,
-  babelname=lowersorbian,
-  hyphennames={lsorbian,lowersorbian,Lsorbian},
-  langtag=LSB,
-  hyphenmins={2,2},
-  fontsetup=true,
-}
-
-\let\captionslsorbian\captionssorbian@lsorbian
-\let\datelsorbian\datesorbian@lsorbian
+\xpg@load@master@language{sorbian}
 
 %    \end{macrocode}
 % \iffalse
@@ -7535,20 +9646,7 @@ and may look very wrong.}
 
 % We only provide this gloss for babel compatibility.
 
-\input{gloss-hungarian.ldf}
-
-\PolyglossiaSetup{magyar}{
-  hyphennames={magyar,hungarian},
-  langtag=HUN,
-  hyphenmins={2,2},
-  fontsetup=true,
-}
-
-\let\captionsmagyar\captionshungarian
-\let\datemagyar\datehungarian
-\let\ondatemagyar\ondatehungarian
-\let\blockextras@magyar\blockextras@hungarian
-\let\noextras@magyar\noextras@hungarian
+\xpg@load@master@language{hungarian}
 
 %    \end{macrocode}
 % \iffalse
@@ -7570,6 +9668,13 @@ and may look very wrong.}
   hyphenmins={2,2},
   fontsetup=true}
 
+% Babel aliases
+\setlanguagealias[variant=indonesian]{malay}{bahasai}
+\setlanguagealias[variant=malaysian]{malay}{bahasa}
+
+% Backwards compat. alias
+\setlanguagealias[variant=malaysian]{malay}{bahasam}
+
 \providebool{malay@melayu}
 \malay@melayufalse
 \def\malay@variant{malay}
@@ -7902,7 +10007,7 @@ and may look very wrong.}
 %    \begin{macrocode}
 \ProvidesFile{gloss-mongolian.ldf}[polyglossia: module for mongolian]
 
-\RequirePackage{cyrillicnumbers}
+\RequirePackage{xpg-cyrillicnumbers}
 
 \PolyglossiaSetup{mongolian}{
   script=Cyrillic,
@@ -8095,6 +10200,51 @@ and may look very wrong.}
 %    \end{macrocode}
 % \iffalse
 %</gloss-mongolian.ldf>
+%<*gloss-naustrian.ldf>
+% \fi
+% \clearpage
+% 
+% \subsection{gloss-naustrian.ldf}
+%    \begin{macrocode}
+\ProvidesFile{gloss-naustrian.ldf}[polyglossia: module for austrian german (current spelling)]
+
+% We provide this as a babel alias
+
+\xpg@load@master@language{german}
+
+%    \end{macrocode}
+% \iffalse
+%</gloss-naustrian.ldf>
+%<*gloss-newzealand.ldf>
+% \fi
+% \clearpage
+% 
+% \subsection{gloss-newzealand.ldf}
+%    \begin{macrocode}
+\ProvidesFile{gloss-newzealand.ldf}[polyglossia: module for newzealand english]
+
+% We provide this as a babel alias
+
+\xpg@load@master@language{english}
+
+%    \end{macrocode}
+% \iffalse
+%</gloss-newzealand.ldf>
+%<*gloss-ngerman.ldf>
+% \fi
+% \clearpage
+% 
+% \subsection{gloss-ngerman.ldf}
+%    \begin{macrocode}
+\ProvidesFile{gloss-ngerman.ldf}[polyglossia: module for german (current spelling)]
+
+% We provide this as a babel alias
+
+\xpg@load@master@language{german}
+
+%    \end{macrocode}
+% \iffalse
+%</gloss-ngerman.ldf>
 %<*gloss-nko.ldf>
 % \fi
 % \clearpage
@@ -8198,18 +10348,7 @@ and may look very wrong.}
 % We only provide this gloss for babel compatibility. Since norsk is 
 % actually norwegian bokmal, we use 'norwegian' with variant 'bokmal' now.
 
-\input{gloss-norwegian.ldf}
-
-\PolyglossiaSetup{norsk}{
-  hyphennames={norsk},
-  hyphenmins={2,2},
-  langtag=NOR,
-  frenchspacing=true,
-  fontsetup=true,
-}
-
-\let\captionsnorsk\captionsnorwegian@norsk
-\let\datenorsk\datenorwegian@norsk
+\xpg@load@master@language{norwegian}
 
 %    \end{macrocode}
 % \iffalse
@@ -8229,6 +10368,10 @@ and may look very wrong.}
   fontsetup=false,
 }
 
+% Babel and backwards compat. aliases
+\setlanguagealias[variant=bokmal]{norwegian}{norsk}
+\setlanguagealias[variant=nynorsk]{norwegian}{nynorsk}
+
 \def\norwegian@variant{nynorsk}
 \define@choicekey*+{norwegian}{variant}[\val\nr]{nynorsk,bokmal}[nynorsk]{%
    \ifcase\nr\relax
@@ -8325,6 +10468,21 @@ and may look very wrong.}
 %    \end{macrocode}
 % \iffalse
 %</gloss-norwegian.ldf>
+%<*gloss-nswissgerman.ldf>
+% \fi
+% \clearpage
+% 
+% \subsection{gloss-nswissgerman.ldf}
+%    \begin{macrocode}
+\ProvidesFile{gloss-nswissgerman.ldf}[polyglossia: module for swiss german (current spelling)]
+
+% We provide this as a babel alias
+
+\xpg@load@master@language{german}
+
+%    \end{macrocode}
+% \iffalse
+%</gloss-nswissgerman.ldf>
 %<*gloss-nynorsk.ldf>
 % \fi
 % \clearpage
@@ -8336,18 +10494,7 @@ and may look very wrong.}
 % We only provide this gloss for babel compatibility. Since nynorsk is 
 % a norwegian variety, we use 'norwegian' with variant 'nynorsk' now.
 
-\input{gloss-norwegian.ldf}
-
-\PolyglossiaSetup{nynorsk}{
-  hyphennames={nynorsk},
-  langtag=NYN,
-  hyphenmins={2,2},
-  frenchspacing=true,
-  fontsetup=true,
-}
-
-\let\captionsnorsk\captionsnorwegian@nynorsk
-\let\datenorsk\datenorwegian@nynorsk
+\xpg@load@master@language{norwegian}
 
 %    \end{macrocode}
 % \iffalse
@@ -8550,6 +10697,9 @@ and may look very wrong.}
   localnumeral=farsinumerals
 }
 
+% Babel and backwards compat. alias
+\setlanguagealias{persian}{farsi}
+
 \newif\if@western@numerals
 \def\tmp@western{western}
 \define@key{persian}{numerals}[eastern]{%
@@ -8855,35 +11005,35 @@ and may look very wrong.}
 %    \end{macrocode}
 % \iffalse
 %</gloss-polish.ldf>
+%<*gloss-polutonikogreek.ldf>
+% \fi
+% \clearpage
+% 
+% \subsection{gloss-polutonikogreek.ldf}
+%    \begin{macrocode}
+\ProvidesFile{gloss-polutonikogreek.ldf}[polyglossia: module for polytonic greek]
+
+% We provide this as a babel alias
+
+\xpg@load@master@language{greek}
+
+%    \end{macrocode}
+% \iffalse
+%</gloss-polutonikogreek.ldf>
 %<*gloss-portuges.ldf>
 % \fi
 % \clearpage
 % 
 % \subsection{gloss-portuges.ldf}
 %    \begin{macrocode}
-\ProvidesFile{gloss-portuges.ldf}[polyglossia: module for portuguese (DEPRECATED!)]
+\ProvidesFile{gloss-portuges.ldf}[polyglossia: module for portuguese]
 
 % We only provide this gloss for backwards compatibility. The name
 % 'portuges' was selected in accordance with babel (which probably
 % introduced it in 8.3 filename times). Since polyglossia uses full
 % English language names, we use 'portuguese' now.
 
-% FIXME: Once we support babel aliases (#112) this gloss can go.
-
-\xpg@warning{The language name 'portuges' is deprectated.\MessageBreak
-             Please use 'portuguese' instead.}
-
-\input{gloss-portuguese.ldf}
-
-\PolyglossiaSetup{portuges}{
-  hyphennames={portuges,portuguese},
-  hyphenmins={2,3},
-  langtag=PTG,
-  fontsetup=true,
-}
-
-\let\captionsportuges\captionsportuguese@portuges
-\let\dateportuges\dateportuguese@portuges
+\xpg@load@master@language{portuguese}
      
 %    \end{macrocode}
 % \iffalse
@@ -8895,6 +11045,7 @@ and may look very wrong.}
 % \subsection{gloss-portuguese.ldf}
 %    \begin{macrocode}
 \ProvidesFile{gloss-portuguese.ldf}[polyglossia: module for portuguese]
+
 \PolyglossiaSetup{portuguese}{
   babelname=portuges,
   hyphennames={portuges,portuguese},
@@ -8903,11 +11054,16 @@ and may look very wrong.}
   fontsetup=true,
 }
 
+% Babel aliases
+\setlanguagealias[variant=portuguese]{portuguese}{portuges}
+\setlanguagealias[variant=brazilian]{portuguese}{brazil}
+
 \def\portuguese@variant{portuges}
 \define@choicekey*+{portuguese}{variant}[\val\nr]{portuguese,brazilian}[portuguese]{%
    \ifcase\nr\relax
       % portuguese:
       \def\portuguese@variant{portuges}%
+      \SetLanguageKeys{portuguese}{babelname=portuges}%
    \or
       % brazilian:
       \def\portuguese@variant{brazil}%
@@ -9109,7 +11265,7 @@ and may look very wrong.}
 %    \begin{macrocode}
 \ProvidesFile{gloss-russian.ldf}[polyglossia: module for russian]
 
-\RequirePackage{cyrillicnumbers}
+\RequirePackage{xpg-cyrillicnumbers}
 
 \PolyglossiaSetup{russian}{
   script=Cyrillic,
@@ -9118,6 +11274,7 @@ and may look very wrong.}
   hyphennames={russian},
   hyphenmins={2,2},
   frenchspacing=true,
+  indentfirst=true,
   fontsetup,
   localnumeral=russiannumerals,
   Localnumeral=Russiannumerals
@@ -9145,6 +11302,14 @@ and may look very wrong.}
       {\cyrillic@numeralsfalse}%
 }
 
+\define@boolkey{russian}[russian@]{indentfirst}{
+   \ifrussian@indentfirst
+      \SetLanguageKeys{russian}{indentfirst=true}
+   \else
+      \SetLanguageKeys{russian}{indentfirst=false}
+  \fi
+}
+
 \define@boolkey{russian}[russian@]{babelshorthands}[false]{}
 
 \setkeys{russian}{spelling,numerals}
@@ -9454,6 +11619,10 @@ and may look very wrong.}
   fontsetup=true,
 }
 
+% Babel and backwards compat. alias
+\setlanguagealias{sami}{samin}
+%\setlanguagealias[variant=northern]{sami}{samin}
+
 % TODO: Add other Sami varieties
 \def\sami@variant{northern}
 %\define@choicekey*+{sami}{variant}[\val\nr]{northern}[nothern]{%
@@ -9540,18 +11709,7 @@ and may look very wrong.}
 % We only provide this gloss for babel compatibility. Since samin is 
 % a sami variety, we use 'sami' with variant 'northern' now.
 
-\input{gloss-sami.ldf}
-
-\PolyglossiaSetup{samin}{
-  hyphennames={samin},
-  hyphenmins={2,2},
-  language={Northern Sami},
-  langtag=NSM,
-  fontsetup=true,
-}
-
-\let\captionssamin\captionssami@nothern
-\let\datesamin\datesami@nothern
+\xpg@load@master@language{sami}
 
 %    \end{macrocode}
 % \iffalse
@@ -9588,6 +11746,8 @@ and may look very wrong.}
   }%
 }
 
+\define@key{sanskrit}{script}[Devanagari]{\setkeys{sanskrit}{Script=#1}}
+
 \def\fontsetup@sanskrit@Devanagari{%
   \SetLanguageKeys{sanskrit}{scripttag=deva,script=Devanagari}
   \xpg@fontsetup@nonlatin{sanskrit}}
@@ -9612,16 +11772,20 @@ and may look very wrong.}
 
 \setkeys{sanskrit}{Script} %sets the default for Devanagari
 
-\def\tmp@western{Western}
+
 \newif\ifsanskrit@devanagari@numerals
 \sanskrit@devanagari@numeralstrue
+\define@choicekey*+{sanskrit}{numerals}[\val\nr]{Devanagari,Western}[Devanagari]{%
+   \ifcase\nr\relax
+      % Devanagari:
+      \sanskrit@devanagari@numeralstrue%
+   \or
+      % Western:
+      \sanskrit@devanagari@numeralsfalse%
+   \fi
+   \xpg@info{Option: Sanskrit, numerals=\val}%
+}{\xpg@warning{Unknown Sanskrit numeral `#1'}}
 
-\define@key{sanskrit}{numerals}[Devanagari]{%
-  \def\@tmpa{#1}%
-  \ifx\@tmpa\tmp@western
-    \sanskrit@devanagari@numeralsfalse
-  \fi%
-}
 
 \newcommand{\sanskritnumerals}[2]{\sanskritnumber{#2}}
 
@@ -9633,34 +11797,45 @@ and may look very wrong.}
   \fi%
 }
 
-% FIXME: Support LuaTeX
-\ifxetex
-  \newXeTeXintercharclass\sanskrit@punctthin % ! ? ; : danda double_danda
+\ifluatex
+  \directlua{require('polyglossia-sanskrit')}%
+\else
+  \newXeTeXintercharclass\sanskrit@punctthin % ! ? ‼ ⁇ ⁈ ⁉ : ; danda double_danda
 \fi
 
 \def\sanskrit@punctthinspace{{\unskip\thinspace}}
 
 \def\sanskrit@punctuation{%
-  % FIXME: Support LuaTeX
-  \ifxetex
+  \ifluatex
+    \directlua{polyglossia.activate_sanskrit_punct()}%
+  \else
     \XeTeXinterchartokenstate=1%
     \XeTeXcharclass `\! \sanskrit@punctthin
     \XeTeXcharclass `\? \sanskrit@punctthin
-    \XeTeXcharclass `\; \sanskrit@punctthin
+    \XeTeXcharclass `\‼ \sanskrit@punctthin
+    \XeTeXcharclass `\⁇ \sanskrit@punctthin
+    \XeTeXcharclass `\⁈ \sanskrit@punctthin
+    \XeTeXcharclass `\⁉ \sanskrit@punctthin
     \XeTeXcharclass `\: \sanskrit@punctthin
-    \XeTeXcharclass `\। \sanskrit@punctthin
-    \XeTeXcharclass `\॥ \sanskrit@punctthin
+    \XeTeXcharclass `\; \sanskrit@punctthin
+    \XeTeXcharclass `\। \sanskrit@punctthin % danda, U+0964
+    \XeTeXcharclass `\॥ \sanskrit@punctthin % double danda, U+0965
     \XeTeXinterchartoks \z@ \sanskrit@punctthin = \sanskrit@punctthinspace
   \fi
 }
 
 \def\nosanskrit@punctuation{%
-  % FIXME: Support LuaTeX
-  \ifxetex
+  \ifluatex
+    \directlua{polyglossia.deactivate_sanskrit_punct()}%
+  \else
     \XeTeXcharclass `\! \z@
     \XeTeXcharclass `\? \z@
-    \XeTeXcharclass `\; \z@
+    \XeTeXcharclass `\‼ \z@
+    \XeTeXcharclass `\⁇ \z@
+    \XeTeXcharclass `\⁈ \z@
+    \XeTeXcharclass `\⁉ \z@
     \XeTeXcharclass `\: \z@
+    \XeTeXcharclass `\; \z@
     \XeTeXcharclass `\। \z@
     \XeTeXcharclass `\॥ \z@
     \XeTeXinterchartokenstate=0%
@@ -9689,17 +11864,7 @@ and may look very wrong.}
 % We only provide this gloss for babel compatibility. Since scottish is 
 % a gaelic variety, we use 'gaelic' with variant 'scottish' now.
 
-\input{gloss-gaelic.ldf}
-
-\PolyglossiaSetup{scottish}{
-  hyphennames={scottish},
-  hyphenmins={2,2},
-  langtag=GAE,
-  fontsetup=true,
-}
-
-\let\captionsscottish\captionsgaelic@scottish
-\let\datescottish\dategaelic@scottish
+\xpg@load@master@language{gaelic}
 
 %    \end{macrocode}
 % \iffalse
@@ -9716,7 +11881,7 @@ and may look very wrong.}
 %% same thing for all languages that have a "script" key !
 %% BETTER APPROACH: see gloss-sanskrit!
 
-\RequirePackage{cyrillicnumbers}
+\RequirePackage{xpg-cyrillicnumbers}
 
 \PolyglossiaSetup{serbian}{
   langtag=SRB,
@@ -9729,25 +11894,27 @@ and may look very wrong.}
   %TODO localalph
 }
 
+% Babel aliases
+\setlanguagealias[script=Cyrillic]{serbian}{serbianc}
+
 \newif\if@serbian@cyr
+\define@choicekey*+{serbian}{Script}[\val\nr]{cyrillic,latin}[cyrillic]{%
+   \ifcase\nr\relax
+      % cyrillic:
+      \@serbian@cyrtrue
+      \SetLanguageKeys{serbian}{scripttag=cyrl,script=Cyrillic,babelname=serbianc}
+      \xpg@fontsetup@nonlatin{serbian}%
+   \or
+      % latin:
+      \@serbian@cyrfalse
+      \SetLanguageKeys{serbian}{scripttag=latn,script=Latin}
+      \xpg@fontsetup@latin{serbian}%
+      %TODO \def\serbian@language{\language=\l@serbianlat}%
+      % or should we use Croatian patterns as a fallback for the time being???
+   \fi
+   \xpg@info{Option: Serbian, script=\val}%
+}{\xpg@warning{Unknown Serbian script `#1'}}
 
-\define@key{serbian}{Script}[Cyrillic]{%
-  \ifstrequal{#1}{Cyrillic}%
-    {\@serbian@cyrtrue
-     \SetLanguageKeys{serbian}{scripttag=cyrl,script=Cyrillic,babelname=serbianc}
-     \xpg@fontsetup@nonlatin{serbian}%
-    }%
-    {\ifstrequal{#1}{Latin}%
-      {\@serbian@cyrfalse
-       \SetLanguageKeys{serbian}{scripttag=latn,script=Latin}
-       \xpg@fontsetup@latin{serbian}%
-       %TODO \def\serbian@language{\language=\l@serbianlat}%
-       % or should we use Croatian patterns as a fallback for the time being???
-      }%
-      {\xpg@error{Unknown script `#1' for Serbian language\MessageBreak
-      Valid values are "Cyrillic" and "Latin"}}%
-    }%
-}
 \define@key{serbian}{script}[Cyrillic]{\setkeys{serbian}{Script=#1}}
 
 \newif\ifserbian@numerals
@@ -9910,6 +12077,21 @@ and may look very wrong.}
 %    \end{macrocode}
 % \iffalse
 %</gloss-serbian.ldf>
+%<*gloss-serbianc.ldf>
+% \fi
+% \clearpage
+% 
+% \subsection{gloss-serbianc.ldf}
+%    \begin{macrocode}
+\ProvidesFile{gloss-serbianc.ldf}[polyglossia: module for serbian (cyrillic)]
+
+% We provide this as a babel alias
+
+\xpg@load@master@language{serbian}
+
+%    \end{macrocode}
+% \iffalse
+%</gloss-serbianc.ldf>
 %<*gloss-slovak.ldf>
 % \fi
 % \clearpage
@@ -9925,6 +12107,176 @@ and may look very wrong.}
   fontsetup=true,
 }
 
+\ifluatex
+  \RequirePackage{luavlna}
+\fi
+
+\define@boolkey{slovak}[slovak@]{babelshorthands}[true]{}
+
+\define@boolkey{slovak}[slovak@]{splithyphens}[true]{}
+
+\define@boolkey{slovak}[slovak@]{vlna}[true]{}
+
+\setkeys{slovak}{splithyphens,vlna}
+
+\ifsystem@babelshorthands
+  \setkeys{slovak}{babelshorthands=true}
+\else
+  \setkeys{slovak}{babelshorthands=false}
+\fi
+
+\ifcsundef{initiate@active@char}{%
+  \input{babelsh.def}%
+  \initiate@active@char{"}%
+  \shorthandoff{"}%
+}{}
+
+\def\slovak@@splhyphen#1{%
+  \kern\z@\discretionary{-}{\char\hyphenchar\the\font}{#1}%
+  \nobreak\hskip\z@%
+}
+
+\def\slovak@splhyphen{%
+  \slovak@@splhyphen{-}%
+}
+
+\def\slovak@shorthands{%
+  \bbl@activate{"}%
+  \def\language@group{slovak}%
+  \declare@shorthand{slovak}{"=}{\slovak@splhyphen}%
+  \declare@shorthand{slovak}{""}{\hskip\z@skip}%
+  \declare@shorthand{slovak}{"~}{\textormath{\leavevmode\hbox{-}}{-}}%
+  \declare@shorthand{slovak}{"-}{\nobreak\-\bbl@allowhyphens}%
+  \declare@shorthand{slovak}{"|}{%
+      \textormath{\penalty\@M\discretionary{-}{}{\kern.03em}%
+      \bbl@allowhyphens}{}%
+  }%
+  \declare@shorthand{slovak}{"/}{\textormath
+    {\bbl@allowhyphens\discretionary{/}{}{/}\bbl@allowhyphens}{}}%
+  \declare@shorthand{slovak}{"`}{„}%
+  \declare@shorthand{slovak}{"'}{“}%
+  \declare@shorthand{slovak}{"<}{«}%
+  \declare@shorthand{slovak}{">}{»}%
+}
+
+\def\noslovak@shorthands{%
+  \@ifundefined{initiate@active@char}{}{\bbl@deactivate{"}}%
+}
+
+\ifxetex
+  % splithyphens
+  \newXeTeXintercharclass\slovak@hyphen % -
+  % vlna
+  \newXeTeXintercharclass\slovak@openpunctuation
+  \newXeTeXintercharclass\slovak@nonsyllabicpreposition
+  \ifdefined\e@alloc@intercharclass@top
+    \chardef\slovak@boundary=\e@alloc@intercharclass@top
+  \else
+    \ifdefined\XeTeXinterwordspaceshaping
+      \chardef\slovak@boundary=4095 %
+      \def\newXeTeXintercharclass{%
+        \e@alloc\XeTeXcharclass\chardef
+              \xe@alloc@intercharclass\m@ne\@ucharclass@boundary}
+    \else
+      \chardef\slovak@boundary=255
+    \fi
+  \fi
+\fi
+
+\def\slovak@hyphens{%
+    \ifluatex
+      \AfterPreamble{\enablesplithyphens{slovak}}%
+    \else
+      \XeTeXinterchartokenstate=1
+      \XeTeXcharclass `\- \slovak@hyphen
+      \XeTeXinterchartoks \z@ \slovak@hyphen = {\slovak@@splhyphen}% "-" -> "\slovak@@splhyphen-"
+      % necessary if used together with vlna:
+      \XeTeXinterchartoks \slovak@nonsyllabicpreposition \slovak@hyphen = {\slovak@@splhyphen}% "-" -> "\slovak@@splhyphen-"
+    \fi%
+}
+
+\def\noslovak@hyphens{%
+    \ifluatex
+      \AfterPreamble{\disablesplithyphens{slovak}}%
+    \else
+      \XeTeXcharclass `\- \z@
+    \fi%
+}
+
+% Add nonbreakable space after single-letter word to
+% prevent them to land at the end of a line
+\def\slovak@vlna{%
+    \ifluatex
+       \preventsingleon
+    \else
+        % Code taken and adapted from xevlna.sty
+        \XeTeXinterchartokenstate=1
+        \XeTeXcharclass `\( \slovak@openpunctuation
+        \XeTeXcharclass `\[ \slovak@openpunctuation
+        \XeTeXcharclass `\„ \slovak@openpunctuation
+        \XeTeXcharclass `\» \slovak@openpunctuation
+        \XeTeXcharclass `\K \slovak@nonsyllabicpreposition
+        \XeTeXcharclass `\k \slovak@nonsyllabicpreposition
+        \XeTeXcharclass `\S \slovak@nonsyllabicpreposition
+        \XeTeXcharclass `\s \slovak@nonsyllabicpreposition
+        \XeTeXcharclass `\V \slovak@nonsyllabicpreposition
+        \XeTeXcharclass `\v \slovak@nonsyllabicpreposition
+        \XeTeXcharclass `\Z \slovak@nonsyllabicpreposition
+        \XeTeXcharclass `\z \slovak@nonsyllabicpreposition
+        \XeTeXcharclass `\O \slovak@nonsyllabicpreposition
+        \XeTeXcharclass `\o \slovak@nonsyllabicpreposition
+        \XeTeXcharclass `\U \slovak@nonsyllabicpreposition
+        \XeTeXcharclass `\u \slovak@nonsyllabicpreposition
+        \XeTeXcharclass `\A \slovak@nonsyllabicpreposition
+        \XeTeXcharclass `\a \slovak@nonsyllabicpreposition
+        \XeTeXcharclass `\I \slovak@nonsyllabicpreposition
+        \XeTeXcharclass `\i \slovak@nonsyllabicpreposition
+        \XeTeXinterchartoks \slovak@boundary \slovak@nonsyllabicpreposition {\slovak@interchartoks}
+        \XeTeXinterchartoks \slovak@openpunctuation \slovak@nonsyllabicpreposition {\slovak@interchartoks}
+        \def\slovak@nointerchartoks{\let\slovak@interchartoks\slovak@PreCSpreposition}
+        \def\slovak@PreCSpreposition{\def\next{}%
+           \ifnum\catcode`\ =10 % nothing will be done in verbatim
+           \ifmmode % nothing in math
+           \else
+              \let\slovak@interchartoks\slovak@nointerchartoks
+              \let\next\slovak@ExamineCSpreposition
+           \fi \fi
+          \next%
+        }
+        \def\slovak@ExamineCSpreposition ##1{##1\futurelet\next\slovak@ProcessCSpreposition}
+        \def\slovak@ProcessCSpreposition{\ifx\next\slovak@XeTeXspace\nobreak\fi}
+        \futurelet\slovak@XeTeXspace{ }\slovak@nointerchartoks
+    \fi
+}
+
+\def\noslovak@vlna{%
+    \ifluatex
+        \preventsingleoff
+    \else
+        \XeTeXcharclass`\(\z@
+        \XeTeXcharclass`\[\z@
+        \XeTeXcharclass`\„\z@
+        \XeTeXcharclass`\»\z@
+        \XeTeXcharclass`\K\z@
+        \XeTeXcharclass`\k\z@
+        \XeTeXcharclass`\S\z@
+        \XeTeXcharclass`\s\z@
+        \XeTeXcharclass`\V\z@
+        \XeTeXcharclass`\v\z@
+        \XeTeXcharclass`\Z\z@
+        \XeTeXcharclass`\z\z@
+        \XeTeXcharclass`\O\z@
+        \XeTeXcharclass`\o\z@
+        \XeTeXcharclass`\U\z@
+        \XeTeXcharclass`\u\z@
+        \XeTeXcharclass`\A\z@
+        \XeTeXcharclass`\a\z@
+        \XeTeXcharclass`\I\z@
+        \XeTeXcharclass`\i\z@
+    \fi
+}
+
+
 \def\captionsslovak{%
    \def\refname{Referencie}%
    \def\abstractname{Abstrakt}%
@@ -9948,7 +12300,7 @@ and may look very wrong.}
    \def\headtoname{Pre}% was komu
    \def\proofname{Dôkaz}%
    \def\glossaryname{Slovník}%
-   }
+}
 
 \def\dateslovak{%   
   \def\today{\number\day.~\ifcase\month\or
@@ -9956,11 +12308,45 @@ and may look very wrong.}
     júna\or júla\or augusta\or septembra\or októbra\or
     novembra\or decembra\fi
     \space \number\year}%
-  }
+}
+
+\def\noextras@slovak{%
+  \noslovak@shorthands%
+  \noslovak@hyphens%
+  \noslovak@vlna%
+  \ifxetex\XeTeXinterchartokenstate=0\fi%
+}
+
+\def\blockextras@slovak{%
+  \ifslovak@babelshorthands\slovak@shorthands\fi%
+  \ifslovak@vlna\slovak@vlna\else\noslovak@vlna\fi%
+  \ifslovak@splithyphens\slovak@hyphens\else\noslovak@hyhens\fi%
+}
+
+\def\inlineextras@slovak{%
+  \ifslovak@babelshorthands\slovak@shorthands\fi%
+  \ifslovak@vlna\slovak@vlna\else\noslovak@vlna\fi%
+  \ifslovak@splithyphens\slovak@hyphens\else\noslovak@hyhens\fi%
+}
 
 %    \end{macrocode}
 % \iffalse
 %</gloss-slovak.ldf>
+%<*gloss-slovene.ldf>
+% \fi
+% \clearpage
+% 
+% \subsection{gloss-slovene.ldf}
+%    \begin{macrocode}
+\ProvidesFile{gloss-slovene.ldf}[polyglossia: module for slovenian]
+
+% We provide this as a babel alias
+
+\xpg@load@master@language{slovenian}
+
+%    \end{macrocode}
+% \iffalse
+%</gloss-slovene.ldf>
 %<*gloss-slovenian.ldf>
 % \fi
 % \clearpage
@@ -9977,6 +12363,9 @@ and may look very wrong.}
   fontsetup=true,
 }
 
+% Babel aliases
+\setlanguagealias{slovenian}{slovene}
+
 \providebool{slovenian@localalph}
 \define@boolkey{slovenian}[slovenian@]{localalph}[false]{%
   \def\@tmpa{#1}%
@@ -10057,6 +12446,14 @@ and may look very wrong.}
   fontsetup=true,
 }
 
+% Backwards compat. aliases
+\setlanguagealias[variant=lower]{sorbian}{lsorbian}
+\setlanguagealias[variant=upper]{sorbian}{usorbian}
+
+% Babel aliases
+\setlanguagealias[variant=lower]{sorbian}{lowersorbian}
+\setlanguagealias[variant=upper]{sorbian}{uppersorbian}
+
 \def\sorbian@variant{usorbian}
 \define@choicekey*+{sorbian}{variant}[\val\nr]{upper,lower}[upper]{%
    \ifcase\nr\relax
@@ -10221,6 +12618,7 @@ and may look very wrong.}
 % \subsection{gloss-spanish.ldf}
 %    \begin{macrocode}
 \ProvidesFile{gloss-spanish.ldf}[polyglossia: module for spanish]
+
 \PolyglossiaSetup{spanish}{
   hyphennames={spanish},
   hyphenmins={2,2},
@@ -10228,6 +12626,152 @@ and may look very wrong.}
   frenchspacing=true,
   indentfirst=true,
   fontsetup=true,
+  babelname=spanish
+}
+
+% Babel aliases
+\setlanguagealias[variant=mexican]{spanish}{spanishmx}
+
+\newif\if@spanish@mexico
+\@spanish@mexicofalse
+\define@choicekey*+{spanish}{variant}[\val\nr]{spanish,mexican}[spanish]{%
+   \ifcase\nr\relax
+      % spanish:
+      \@spanish@mexicofalse%
+      \SetLanguageKeys{spanish}{babelname=spanish}%
+   \or
+      % mexican:
+      \@spanish@mexicotrue%
+      \SetLanguageKeys{spanish}{babelname=spanishmx}%
+   \fi
+   \xpg@info{Option: spanish, variant=\val}%
+}{\xpg@warning{Unknown spanish variant `#1'}}
+
+% Localized math operators à la babel
+\newif\ifspanish@accentedoperators
+\newif\ifspanish@spacedoperators
+\newif\ifspanish@locoperators
+
+\define@choicekey*+{spanish}{spanishoperators}[\val\nr]{all,accented,spaced,none}[all]{%
+   \ifcase\nr\relax
+      % all:
+      \spanish@locoperatorstrue%
+      \spanish@accentedoperatorstrue%
+      \spanish@spacedoperatorstrue%
+   \or
+      % accented:
+      \spanish@locoperatorsfalse%
+      \spanish@accentedoperatorstrue%
+      \spanish@spacedoperatorsfalse%
+   \or
+      % spaced:
+      \spanish@locoperatorsfalse%
+      \spanish@accentedoperatorsfalse%
+      \spanish@spacedoperatorstrue%
+   \or
+      % none:
+      \spanish@locoperatorsfalse%
+      \spanish@accentedoperatorsfalse%
+      \spanish@spacedoperatorsfalse%
+   \fi
+   \xpg@info{Option: Spanish, spanishoperators=\val}%
+}{\xpg@warning{Unknown spanishoperators value `#1'}}
+
+\let\xpg@save@lim\lim
+\let\xpg@save@limsup\limsup
+\let\xpg@save@liminf\liminf
+\let\xpg@save@max\max
+\let\xpg@save@min\min
+\let\xpg@save@inf\inf
+\let\xpg@save@bmod\bmod
+\let\xpg@save@pmod\pmod
+
+\def\spanish@accentedoperators{%
+  \DeclareRobustCommand\lim{\mathop{\operator@font lím}}%
+  \DeclareRobustCommand\limsup{\mathop{\operator@font lím\,sup}}%
+  \DeclareRobustCommand\liminf{\mathop{\operator@font lím\,inf}}%
+  \DeclareRobustCommand\max{\mathop{\operator@font máx}}%
+  \DeclareRobustCommand\min{\mathop{\operator@font mín}}%
+  \DeclareRobustCommand\inf{\mathop{\operator@font ínf}}%
+  \DeclareRobustCommand\bmod{%
+    \nonscript\mskip-\medmuskip\mkern5mu%
+    \mathbin{\operator@font mód}\penalty900\mkern5mu%
+    \nonscript\mskip-\medmuskip}%
+  \@ifundefined{@amsmath@err}%
+    {\DeclareRobustCommand\pmod[1]{%
+       \allowbreak\mkern18mu({\operator@font mód}\,\,##1)}}%
+    {\let\xpg@save@mod\mod
+     \DeclareRobustCommand\mod[1]{\allowbreak\if@display\mkern18mu
+        \else\mkern12mu\fi{\operator@font mód}\,\,##1}%
+     \DeclareRobustCommand\pmod[1]{\pod{{\operator@font mód}%
+        \mkern6mu##1}}}%
+}
+
+\def\nospanish@accentedoperators{%
+  \let\lim\xpg@save@lim%
+  \let\limsup\xpg@save@limsup%
+  \let\liminf\xpg@save@liminf%
+  \let\max\xpg@save@max%
+  \let\min\xpg@save@min%
+  \let\inf\xpg@save@inf%
+  \let\bmod\xpg@save@bmod%
+  \let\pmod\xpg@save@pmod%
+  \@ifundefined{@amsmath@err}{}{\let\mod\xpg@save@mod}%
+}
+
+\let\xpg@save@arccos\arccos
+\let\xpg@save@arcsin\arcsin
+\let\xpg@save@arctan\arctan
+\let\arcsen\arcsin
+\let\arctg\arctan
+
+
+\def\spanish@spacedoperators{%
+  \DeclareRobustCommand\arccos{\mathop{\operator@font arc\,cos}\nolimits}%
+  \DeclareRobustCommand\arcsin{\mathop{\operator@font arc\,sen}\nolimits}%
+  \DeclareRobustCommand\arctan{\mathop{\operator@font arc\,tg}\nolimits}%
+}
+
+\def\nospanish@spacedoperators{%
+  \let\arccos\xpg@save@arccos%
+  \let\arcsen\arcsin%
+  \let\arctg\arctan%
+}
+
+
+\let\xpg@save@sin\sin
+\let\xpg@save@tan\tan
+\let\xpg@save@sinh\sinh
+\let\xpg@save@tanh\tanh
+\let\sen\sin
+\let\tg\tan
+\let\senh\sinh
+\let\tgh\tanh
+
+\def\spanish@locoperators{%
+  \DeclareRobustCommand\sin{\mathop{\operator@font sen}\nolimits}%
+  \DeclareRobustCommand\tan{\mathop{\operator@font tg}\nolimits}%
+  \DeclareRobustCommand\sinh{\mathop{\operator@font senh}\nolimits}%
+  \DeclareRobustCommand\tanh{\mathop{\operator@font tgh}\nolimits}%
+}
+
+\def\nospanish@locoperators{%
+  \let\sen\xpg@save@sin%
+  \let\tg\xpg@save@tan%
+  \let\sinh\xpg@save@sinh%
+  \let\tanh\xpg@save@tanh%
+  \let\sen\relax%
+  \let\tg\relax%
+  \let\senh\relax%
+  \let\tgh\relax%
+}
+
+\newcommand*\spanishoperator[2][]{%
+  \ifx#1\\\\
+    \protected@csxdef{#2}{\mathop{\operator@font #2}\nolimits}%
+  \else
+    \protected@csxdef{#2}{\mathop{\operator@font #1}\nolimits}%
+  \fi
 }
 
 \def\captionsspanish{%
@@ -10252,18 +12796,58 @@ and may look very wrong.}
   \def\alsoname{véase también}%
   \def\proofname{Prueba}%
   \def\glossaryname{Glosario}%
-  }
+  \if@spanish@mexico
+    \captionsspanish@mexico%
+  \fi%
+}
+
+\def\captionsspanish@mexico{%
+  \def\tablename{Tabla}%
+}
 
 \def\datespanish{%
   \def\today{\number\day~de~\ifcase\month\or
     enero\or febrero\or marzo\or abril\or mayo\or junio\or
     julio\or agosto\or septiembre\or octubre\or noviembre\or
     diciembre\fi\space de~\number\year}%
-  }
+}
+
+\def\noextras@spanish{%
+  \nospanish@accentedoperators%
+  \nospanish@spacedoperators%
+  \nospanish@locoperators%
+}
+
+\def\blockextras@spanish{%
+  \ifspanish@accentedoperators\spanish@accentedoperators\fi%
+  \ifspanish@spacedoperators\spanish@spacedoperators\fi%
+  \ifspanish@locoperators\spanish@locoperators\fi%
+}
+
+\def\inlineextras@spanish{%
+  \ifspanish@accentedoperators\spanish@accentedoperators\fi%
+  \ifspanish@spacedoperators\spanish@spacedoperators\fi%
+  \ifspanish@locoperators\spanish@locoperators\fi%
+}
 
 %    \end{macrocode}
 % \iffalse
 %</gloss-spanish.ldf>
+%<*gloss-spanishmx.ldf>
+% \fi
+% \clearpage
+% 
+% \subsection{gloss-spanishmx.ldf}
+%    \begin{macrocode}
+\ProvidesFile{gloss-spanishmx.ldf}[polyglossia: module for mexican spanish]
+
+% We provide this as a babel alias
+
+\xpg@load@master@language{spanish}
+
+%    \end{macrocode}
+% \iffalse
+%</gloss-spanishmx.ldf>
 %<*gloss-swedish.ldf>
 % \fi
 % \clearpage
@@ -10321,6 +12905,21 @@ and may look very wrong.}
 %    \end{macrocode}
 % \iffalse
 %</gloss-swedish.ldf>
+%<*gloss-swissgerman.ldf>
+% \fi
+% \clearpage
+% 
+% \subsection{gloss-swissgerman.ldf}
+%    \begin{macrocode}
+\ProvidesFile{gloss-swissgerman.ldf}[polyglossia: module for swiss german (old spelling)]
+
+% We provide this as a babel alias
+
+\xpg@load@master@language{german}
+
+%    \end{macrocode}
+% \iffalse
+%</gloss-swissgerman.ldf>
 %<*gloss-syriac.ldf>
 % \fi
 % \clearpage
@@ -11352,6 +13951,21 @@ and may look very wrong.}
 %    \end{macrocode}
 % \iffalse
 %</gloss-ukrainian.ldf>
+%<*gloss-uppersorbian.ldf>
+% \fi
+% \clearpage
+% 
+% \subsection{gloss-uppersorbian.ldf}
+%    \begin{macrocode}
+\ProvidesFile{gloss-uppersorbian.ldf}[polyglossia: module for upper sorbian]
+
+% We provide this as a babel alias
+
+\xpg@load@master@language{sorbian}
+
+%    \end{macrocode}
+% \iffalse
+%</gloss-uppersorbian.ldf>
 %<*gloss-urdu.ldf>
 % \fi
 % \clearpage
@@ -11518,19 +14132,7 @@ and may look very wrong.}
 % We only provide this gloss for babel compatibility. Since usorbian is 
 % a sorbian variety, we use 'sorbian' with variant 'upper' now.
 
-\input{gloss-sorbian.ldf}
-
-\PolyglossiaSetup{usorbian}{
-  language=Upper Sorbian,
-  babelname=uppersorbian,
-  hyphennames={usorbian,uppersorbian},
-  hyphenmins={2,2},
-  langtag=USB,
-  fontsetup=true,
-}
-
-\let\captionsusorbian\captionssorbian@usorbian
-\let\dateusorbian\datesorbian@usorbian
+\xpg@load@master@language{sorbian}
 
 %    \end{macrocode}
 % \iffalse
@@ -11796,239 +14398,67 @@ U+0039 <> U+0E59 ;
 %    \end{macrocode}
 % \iffalse
 %</thaidigits.map>
-%<*polyglossia-frpt.lua>
+%<*polyglossia-french.lua>
 % \fi
 % \clearpage
 % 
-% \subsection{polyglossia-frpt.lua}
+% \subsection{polyglossia-french.lua}
 %    \begin{macrocode}
-require('polyglossia') -- just in case...
-
-local add_to_callback = luatexbase.add_to_callback
-local remove_from_callback = luatexbase.remove_from_callback
-local priority_in_callback = luatexbase.priority_in_callback
-
-local get_quad = luaotfload.aux.get_quad -- needs luaotfload > 20130516
-
-local next, type = next, type
-
-local nodes, fonts, node = nodes, fonts, node
-
-local nodecodes          = nodes.nodecodes
-
-local insert_node_before = node.insert_before
-local insert_node_after  = node.insert_after
-local remove_node        = node.remove
-local has_attribute      = node.has_attribute
-local node_copy          = node.copy
-local new_node           = node.new
-
-local math_code          = nodecodes.math
-local end_of_math        = node.end_of_math
-if not end_of_math then -- luatex < .76
-  local traverse_nodes = node.traverse_id
-  local end_of_math = function (n)
-    for n in traverse_nodes(math_code, n.next) do
-      return n
-    end
-  end
-end
-
--- node types according to node.types()
-local glue_code         = nodecodes.glue
-local glue_spec_code    = nodecodes.glue_spec
-local glyph_code        = nodecodes.glyph
-local penalty_code      = nodecodes.penalty
-local kern_code         = nodecodes.kern
+require('polyglossia-punct')
 
--- we make a new node, so that we can copy it later on
-local penalty_node   = new_node(penalty_code)
-penalty_node.penalty = 10000
-
-local function get_penalty_node()
-  return node_copy(penalty_node)
+local function set_left_space(lang, char, kern, rubber)
+    polyglossia.add_left_spaced_character(lang, char, kern, "space", rubber)
 end
 
--- same for glue node
-local kern_node       = new_node(kern_code)
-
-local function get_kern_node(dim)
-  local n = node_copy(kern_node)
-  n.kern = dim
-  return n
+local function set_right_space(lang, char, kern, rubber)
+    polyglossia.add_right_spaced_character(lang, char, kern, "space", rubber)
 end
 
--- we have here all possible space characters, referenced by their
--- unicode slot number, taken from char-def.lua
-local space_chars = {[32]=1, [160]=1, [5760]=1, [6158]=1, [8192]=1, [8193]=1, [8194]=1, [8195]=1, 
-  [8196]=1, [8197]=1, [8198]=1, [8199]=1, [8200]=1, [8201]=1, [8202]=1, [8239]=1, [8287]=1, [12288]=1}
-
--- from nodes-tst.lua, adapted
-local function somespace(n,all)
-    if n then
-        local id = n.id
-        if id == glue_code then
-            return (all or (n.spec.width ~= 0)) and glue_code
-        elseif id == kern_code then
-            return (all or (n.kern ~= 0)) and kern_code
-        elseif id == glyph_code then
-            if space_chars[n.char] then
-                return true
-            else
-                return false
-            end
-        end
+local function activate_french_punct(thincolonspace, autospaceguillemets)
+    -- We need different language tags here to make switching of options possible
+    -- within a paragraph.
+    local lang = "french"
+    if thincolonspace then
+        lang = lang.."-thincolon"
     end
-    return false
-end
-
--- idem
-local function somepenalty(n,value)
-    if n then
-        local id = n.id
-        if id == penalty_code then
-            if value then
-                return n.penalty == value
-            else
-                return true
-            end
-        end
+    if autospaceguillemets then
+        lang = lang.."-autospace"
     end
-    return false
-end
 
-local xpgfrptattr = luatexbase.attributes['xpg@frpt']
-
-local left=1
-local right=2
-local byte = unicode.utf8.byte
-
--- Now there is a good question: how do we now, in lua, what a \thinspace is?
--- In the LaTeX source (ltspace.dtx) it is defined as:
--- \def\thinspace{\kern .16667em }. I see no way of seeing if it has been
--- overriden or not... So we stick to this value.
-local thinspace  = 0.16667 
--- thickspace is defined in amsmath.sty as:
--- \renewcommand{\;}{\mspace+\thickmuskip{.2777em}}. Same problem as above, we
--- stick to this fixed value.
-local thickspace = 0.2777 -- 5/18
-
-local mappings =  {
- [byte(':')] = {left,  thickspace}, --really?
- [byte('!')] = {left,  thinspace},
- [byte('?')] = {left,  thinspace},
- [byte(';')] = {left,  thinspace},
- [byte('‼')] = {left,  thinspace},
- [byte('⁇')] = {left,  thinspace},
- [byte('⁈')] = {left,  thinspace},
- [byte('⁉')] = {left,  thinspace},
- [byte('»')] = {left,  thinspace},
- [byte('›')] = {left,  thinspace},
- [byte('«')] = {right, thinspace}, 
- [byte('‹')] = {right, thinspace}, 
- }
+    polyglossia.activate_punct(lang)
+    polyglossia.clear_spaced_characters(lang)
 
-local function set_spacings(thinsp, thicksp)
-  for _, m in pairs(mappings) do
-    if m[2] == thinspace then
-      m[2] = thinsp
-    elseif m[2] == thickspace then
-      m[2] = thicksp
+    if thincolonspace then
+        set_left_space(lang, ':', 0.5)
+    else
+        set_left_space(lang, ':', 1, true) -- stretchable and shrinkable space
     end
-  end
-  thickspace = thicksp
-  thinspace = thinsp
-end
 
--- from typo-spa.lua
-local function process(head)
-    local done = false
-    local start = head
-    -- head is always begin of par (whatsit), so we have at least two prev nodes
-    -- penalty followed by glue
-    while start do
-        local id = start.id
-        if id == glyph_code then
-            local attr = has_attribute(start, xpgfrptattr)
-            if attr and attr > 0 then
-                local char = start.char
-                local map = mappings[char]
-                --node.unset_attribute(start, xpgfrptattr) -- needed?
-                if map then
-                    local quad = get_quad(start.font) -- might be optimized
-                    local prev = start.prev
-                    if map[1] == left and prev then
-                        local prevprev = prev.prev
-                        local somespace = somespace(prev,true)
-                        -- TODO: there is a question here: do we override a preceding space or not?...
-                        if somespace then
-                            local somepenalty = somepenalty(prevprev,10000)
-                            if somepenalty then
-                                head = remove_node(head,prev)
-                                head = remove_node(head,prevprev)
-                            else
-                                head = remove_node(head,prev)
-                            end
-                        end
-                        insert_node_before(head,start,get_penalty_node())
-                        insert_node_before(head,start,get_kern_node(map[2]*quad))
-                        done = true
-                    end
-                    local next = start.next
-                    if map[1] == right and next then
-                        local nextnext = next.next
-                        local somepenalty = somepenalty(next,10000)
-                        if somepenalty then
-                            local somespace = somespace(nextnext,true)
-                            if somespace then
-                                head = remove_node(head,next)
-                                head = remove_node(head,nextnext)
-                            end
-                        else
-                            local somespace = somespace(next,true)
-                            if somespace then
-                                head = remove_node(head,next)
-                            end
-                        end
-                        insert_node_after(head,start,get_kern_node(map[2]*quad))
-                        insert_node_after(head,start,get_penalty_node())
-                        done = true
-                    end
-                end
-            end
-        elseif id == math_code then
-            -- warning: this is a feature of luatex > 0.76
-            start = end_of_math(start) -- weird, can return nil .. no math end?
-        end
-        if start then
-            start = start.next
-        end
+    set_left_space(lang, '!', 0.5)
+    set_left_space(lang, '?', 0.5)
+    set_left_space(lang, ';', 0.5)
+    set_left_space(lang, '‼', 0.5)
+    set_left_space(lang, '⁇', 0.5)
+    set_left_space(lang, '⁈', 0.5)
+    set_left_space(lang, '⁉', 0.5)
+
+    if autospaceguillemets then
+        set_left_space(lang, '»', 0.5)
+        set_left_space(lang, '›', 0.5)
+        set_right_space(lang, '«', 0.5)
+        set_right_space(lang, '‹', 0.5)
     end
-    return head, done
-end
-
-local callback_name = "pre_linebreak_filter"
-
-local function activate()
-  if not priority_in_callback (callback_name, "polyglossia-frpt.process") then
-    add_to_callback(callback_name, process, "polyglossia-frpt.process", 1)
-  end
 end
 
-local function desactivate()
-  if priority_in_callback (callback_name, "polyglossia-frpt.process") then
-    remove_from_callback(callback_name, "polyglossia-frpt.process")
-  end
+local function deactivate_french_punct()
+    polyglossia.deactivate_punct()
 end
 
-polyglossia.activate_frpt    = activate
-polyglossia.desactivate_frpt = desactivate
-polyglossia.set_spacings     = set_spacings
-polyglossia.thinspace        = thinspace
-polyglossia.thickspace       = thickpace
+polyglossia.activate_french_punct   = activate_french_punct
+polyglossia.deactivate_french_punct = deactivate_french_punct
 %    \end{macrocode}
 % \iffalse
-%</polyglossia-frpt.lua>
+%</polyglossia-french.lua>
 %<*polyglossia-korean.lua>
 % \fi
 % \clearpage
@@ -12641,6 +15071,399 @@ prepend_to_callback ("hpack_filter",
 %    \end{macrocode}
 % \iffalse
 %</polyglossia-korean.lua>
+%<*polyglossia-latin.lua>
+% \fi
+% \clearpage
+% 
+% \subsection{polyglossia-latin.lua}
+%    \begin{macrocode}
+require('polyglossia-punct')
+
+-- For ecclesiastic Latin (and sometimes for Italian) a very small space is
+-- used for the punctuation. The ecclesiastic package uses a space of
+-- 0.3\fontdimen2, where \fontdimen2 is a interword space, which is typically
+-- between 1/4 and 1/3 of a quad. We choose a half of a \thinspace here.
+local hairspace = 0.08333 -- 1/12
+
+local function activate_latin_punct()
+    polyglossia.activate_punct('latin')
+    polyglossia.clear_spaced_characters('latin')
+    polyglossia.add_left_spaced_character('latin',':',hairspace,'quad')
+    polyglossia.add_left_spaced_character('latin','!',hairspace,'quad')
+    polyglossia.add_left_spaced_character('latin','?',hairspace,'quad')
+    polyglossia.add_left_spaced_character('latin',';',hairspace,'quad')
+    polyglossia.add_left_spaced_character('latin','‼',hairspace,'quad')
+    polyglossia.add_left_spaced_character('latin','⁇',hairspace,'quad')
+    polyglossia.add_left_spaced_character('latin','⁈',hairspace,'quad')
+    polyglossia.add_left_spaced_character('latin','⁉',hairspace,'quad')
+    polyglossia.add_left_spaced_character('latin','»',hairspace,'quad')
+    polyglossia.add_left_spaced_character('latin','›',hairspace,'quad')
+    polyglossia.add_right_spaced_character('latin','«',hairspace,'quad')
+    polyglossia.add_right_spaced_character('latin','‹',hairspace,'quad')
+end
+
+local function deactivate_latin_punct()
+    polyglossia.deactivate_punct()
+end
+
+polyglossia.activate_latin_punct   = activate_latin_punct
+polyglossia.deactivate_latin_punct = deactivate_latin_punct
+%    \end{macrocode}
+% \iffalse
+%</polyglossia-latin.lua>
+%<*polyglossia-punct.lua>
+% \fi
+% \clearpage
+% 
+% \subsection{polyglossia-punct.lua}
+%    \begin{macrocode}
+require('polyglossia') -- just in case...
+
+local add_to_callback      = luatexbase.add_to_callback
+local remove_from_callback = luatexbase.remove_from_callback
+local priority_in_callback = luatexbase.priority_in_callback
+local new_attribute        = luatexbase.new_attribute
+
+local node = node
+
+local insert_node_before = node.insert_before
+local insert_node_after  = node.insert_after
+local remove_node        = node.remove
+local has_attribute      = node.has_attribute
+local node_copy          = node.copy
+local new_node           = node.new
+local end_of_math        = node.end_of_math
+local getnext            = node.getnext
+local getprev            = node.getprev
+
+-- node types according to node.types()
+local glue_code    = node.id"glue"
+local glyph_code   = node.id"glyph"
+local penalty_code = node.id"penalty"
+local kern_code    = node.id"kern"
+local math_code    = node.id"math"
+
+-- we need some node subtypes
+local userkern = 1
+local userskip = 0
+local removable_skip = {
+    [0]  = true, -- userskip
+    [13] = true, -- spaceskip
+    [14] = true, -- xspaceskip
+}
+
+-- we make a new node, so that we can copy it later on
+local kern_node = new_node(kern_code)
+kern_node.subtype = userkern -- this kern can be removed later on
+
+local function get_kern_node(dim)
+    local n = node_copy(kern_node)
+    n.kern = dim
+    return n
+end
+
+local glue_node = new_node(glue_code)
+glue_node.subtype = userskip
+
+local function get_glue_node(dim, stretch, shrink)
+    local n   = node_copy(glue_node)
+    n.width   = dim
+    n.stretch = stretch
+    n.shrink  = shrink
+    return n
+end
+
+local penalty_node   = new_node(penalty_code)
+penalty_node.penalty = 10000
+
+local function get_penalty_node()
+    return node_copy(penalty_node)
+end
+
+-- we have here all possible space characters, referenced by their unicode slot
+-- number, taken from char-def.lua
+local space_chars = {[32] = true, [160] = true, [5760] = true, [6158] = true,
+    [8192] = true, [8193] = true, [8194] = true, [8195] = true, [8196] = true,
+    [8197] = true, [8198] = true, [8199] = true, [8200] = true, [8201] = true,
+    [8202] = true, [8239] = true, [8287] = true, [12288] = true}
+
+-- from nodes-tst.lua, adapted
+local function somespace(n)
+    if n then
+        local id, subtype = n.id, n.subtype
+        if id == glue_code then
+            -- it is dangerous to remove all the type of glue
+            return removable_skip[subtype]
+        elseif id == kern_code then
+            -- remove only user's kern
+            return subtype == userkern
+        elseif id == glyph_code then
+            return space_chars[n.char]
+        end
+    end
+end
+
+-- we have here all left bracket characters, referenced by their unicode slot
+local left_bracket_chars = {[40] = true, [123] = true, [91] = true, [10216] = true}
+
+local function someleftbracket(n)
+    if n then
+        local id = n.id
+        if id == glyph_code then
+            return left_bracket_chars[n.char]
+        end
+    end
+end
+
+-- we have here all right bracket characters, referenced by their unicode slot
+local right_bracket_chars = {[41] = true, [125] = true, [93] = true, [10217] = true}
+
+local function somerightbracket(n)
+    if n then
+        local id = n.id
+        if id == glyph_code then
+            return right_bracket_chars[n.char]
+        end
+    end
+end
+
+-- idem
+local function somepenalty(n, value)
+    if n then
+        local id = n.id
+        if id == penalty_code then
+            if value then
+                return n.penalty == value
+            else
+                return true
+            end
+        end
+    end
+end
+
+local punct_attr = new_attribute("polyglossia_punct")
+
+local lang_id      = {}
+local lang_counter = 0
+local left_space   = {}
+local right_space  = {}
+
+local function ensure_lang_id(lang)
+    if not lang_id[lang] then
+        lang_counter = lang_counter + 1
+        lang_id[lang] = lang_counter
+    end
+    return lang_id[lang]
+end
+
+local function clear_spaced_characters(lang)
+    local id = ensure_lang_id(lang)
+    left_space[id]  = {}
+    right_space[id] = {}
+end
+
+local function illegal_unit(unit)
+    if unit then
+        texio.write_nl('Illegal spacing unit "'..unit..'".')
+    else
+        texio.write_nl('Spacing unit is a nil value.')
+    end
+end
+
+local function add_left_spaced_character(lang, char, kern, unit, rubber)
+-- The parameter kern is a number meant as a fraction of the unit.
+-- The unit can be "quad" (1em) or "space" (interword space).
+-- The parameter rubber is a Boolean value indicating if the inserted space is
+-- stretchable and shrinkable (only relevant if the unit is "space").
+    local id = ensure_lang_id(lang)
+    if unit == "quad" or unit == "space" then
+        left_space[id][char] = {}
+        left_space[id][char]["kern"] = kern
+        left_space[id][char]["unit"] = unit
+        left_space[id][char]["rubber"] = rubber
+    else
+        illegal_unit(unit)
+    end
+end
+
+local function add_right_spaced_character(lang, char, kern, unit, rubber)
+    local id = ensure_lang_id(lang)
+    if unit == "quad" or unit == "space" then
+        right_space[id][char] = {}
+        right_space[id][char]["kern"] = kern
+        right_space[id][char]["unit"] = unit
+        right_space[id][char]["rubber"] = rubber
+    else
+        illegal_unit(unit)
+    end
+end
+
+-- from typo-spa.lua, adapted
+local function process(head)
+    local current = head
+    while current do
+        local id = current.id
+        if id == glyph_code then
+            local attr = has_attribute(current, punct_attr)
+            if attr then
+                local char = utf8.char(current.char) -- requires Lua 5.3
+                local leftspace  = left_space[attr][char]
+                local rightspace = right_space[attr][char]
+                if leftspace or rightspace then
+                    local fontparameters = fonts.hashes.parameters[current.font]
+                    local unit, stretch, shrink, spacing_node
+                    if leftspace then
+                        local prev = getprev(current)
+                        local space_exception = false
+                        if prev then
+                            local prevprev = getprev(prev)
+                            -- do not add space after left (opening) bracket
+                            space_exception = someleftbracket(prev)
+                            if somespace(prev) then
+                            -- TODO: there is a question here: do we override a preceding space or not?...
+                                if somepenalty(prevprev, 10000) then
+                                    head = remove_node(head, prevprev)
+                                end
+                                head = remove_node(head, prev)
+                            end
+                        end
+                        if leftspace.unit == "quad" then
+                            unit = fontparameters.quad
+                            spacing_node = get_kern_node(leftspace.kern*unit)
+                        elseif leftspace.unit == "space" then
+                            unit = fontparameters.space
+                            if leftspace.rubber then
+                                stretch = leftspace.kern*fontparameters.space_stretch
+                                shrink  = leftspace.kern*fontparameters.space_shrink
+                                spacing_node = get_glue_node(leftspace.kern*unit, stretch, shrink)
+                                head = insert_node_before(head, current, get_penalty_node())
+                            else
+                                spacing_node = get_kern_node(leftspace.kern*unit)
+                            end
+                        end
+                        if not space_exception then
+                            head = insert_node_before(head, current, spacing_node)
+                        end
+                    end
+                    if rightspace then
+                        local next = getnext(current)
+                        local space_exception = false
+                        if next then
+                            -- do not add space before right (closing) bracket
+                            space_exception = somerightbracket(next)
+                            local nextnext = getnext(next)
+                            if somepenalty(next, 10000) and somespace(nextnext) then
+                                head = remove_node(head, next)
+                                head = remove_node(head, nextnext)
+                            elseif somespace(next) then
+                                head = remove_node(head, next)
+                            end
+                        end
+                        if rightspace.unit == "quad" then
+                            unit = fontparameters.quad
+                            spacing_node = get_kern_node(rightspace.kern*unit)
+                        elseif rightspace.unit == "space" then
+                            unit = fontparameters.space
+                            if rightspace.rubber then
+                                stretch = rightspace.kern*fontparameters.space_stretch
+                                shrink  = rightspace.kern*fontparameters.space_shrink
+                                spacing_node = get_glue_node(rightspace.kern*unit, stretch, shrink)
+                                if not space_exception then
+                                    head, current = insert_node_after(head, current, get_penalty_node())
+                                end
+                            else
+                                spacing_node = get_kern_node(rightspace.kern*unit)
+                            end
+                        end
+                        if not space_exception then
+                            head, current = insert_node_after(head, current, spacing_node)
+                        end
+                    end
+                end
+            end
+        elseif id == math_code then
+            -- warning: this is a feature of luatex > 0.76
+            current = end_of_math(current) -- weird, can return nil .. no math end?
+        end
+        current = getnext(current) -- no error even if current is nil
+    end
+    return head
+end
+
+local function activate(lang)
+    local id = ensure_lang_id(lang)
+    -- We set the punctuation attribute to a language id here. This is
+    -- important to be able to intermix languages with different spacings
+    -- in one paragraph.
+    tex.setattribute(punct_attr, id)
+    for _, callback_name in ipairs{ "pre_linebreak_filter", "hpack_filter" } do
+        if not priority_in_callback(callback_name, "polyglossia-punct.process") then
+            add_to_callback(callback_name, process, "polyglossia-punct.process", 1)
+        end
+    end
+end
+
+local function deactivate()
+    tex.setattribute(punct_attr, -0x7FFFFFFF) -- this value means "unset"
+    -- Though it would make compilation slightly faster, it is not possible to
+    -- safely uncomment the following lines. Imagine the following case: you
+    -- start a paragraph by some spaced punctuation text, then, in the same
+    -- paragraph, you change the language to something else, and thus call the
+    -- following lines. This means that, at the end of the paragraph, the
+    -- function won't be in the callback, so the beginning of the paragraph
+    -- won't be processed by it.
+    -- if priority_in_callback(callback_name, "polyglossia-punct.process") then
+    --     remove_from_callback(callback_name, "polyglossia-punct.process")
+    -- end
+end
+
+polyglossia.activate_punct             = activate
+polyglossia.deactivate_punct           = deactivate
+polyglossia.add_left_spaced_character  = add_left_spaced_character
+polyglossia.add_right_spaced_character = add_right_spaced_character
+polyglossia.clear_spaced_characters    = clear_spaced_characters
+%    \end{macrocode}
+% \iffalse
+%</polyglossia-punct.lua>
+%<*polyglossia-sanskrit.lua>
+% \fi
+% \clearpage
+% 
+% \subsection{polyglossia-sanskrit.lua}
+%    \begin{macrocode}
+require('polyglossia-punct')
+
+-- How do we now, in Lua, what a \thinspace is? In the LaTeX source (latex.ltx)
+-- it is defined as:
+-- \def\thinspace{\leavevmode@ifvmode\kern .16667em }
+-- I see no way of seeing if it has been overriden or not. So we stick to this
+-- value.
+local thinspace = 0.16667 -- 1/6
+
+local function activate_sanskrit_punct()
+    polyglossia.activate_punct('sanskrit')
+    polyglossia.clear_spaced_characters('sanskrit')
+    polyglossia.add_left_spaced_character('sanskrit','!',thinspace,'quad')
+    polyglossia.add_left_spaced_character('sanskrit','?',thinspace,'quad')
+    polyglossia.add_left_spaced_character('sanskrit','‼',thinspace,'quad')
+    polyglossia.add_left_spaced_character('sanskrit','⁇',thinspace,'quad')
+    polyglossia.add_left_spaced_character('sanskrit','⁈',thinspace,'quad')
+    polyglossia.add_left_spaced_character('sanskrit','⁉',thinspace,'quad')
+    polyglossia.add_left_spaced_character('sanskrit',':',thinspace,'quad')
+    polyglossia.add_left_spaced_character('sanskrit',';',thinspace,'quad')
+    polyglossia.add_left_spaced_character('sanskrit','।',thinspace,'quad') -- danda, U+0964
+    polyglossia.add_left_spaced_character('sanskrit','॥',thinspace,'quad') -- double danda, U+0965
+end
+
+local function deactivate_sanskrit_punct()
+    polyglossia.deactivate_punct()
+end
+
+polyglossia.activate_sanskrit_punct   = activate_sanskrit_punct
+polyglossia.deactivate_sanskrit_punct = deactivate_sanskrit_punct
+%    \end{macrocode}
+% \iffalse
+%</polyglossia-sanskrit.lua>
 %<*polyglossia-tibt.lua>
 % \fi
 % \clearpage
@@ -12745,10 +15568,6 @@ polyglossia.desactivate_tibt_eol = desactivate
 % 
 % \subsection{polyglossia.lua}
 %    \begin{macrocode}
-require('luatex-hyphen')
-
-local luatexhyphen = luatexhyphen
-local byte = unicode.utf8.byte
 
 local module_name = "polyglossia"
 local polyglossia_module = {
@@ -12763,82 +15582,73 @@ local polyglossia_module = {
 
 luatexbase.provides_module(polyglossia_module)
 
-local log_info = function(message)
-	luatexbase.module_info(module_name, message)
+local log_info = function(message, ...)
+    luatexbase.module_info(module_name, message:format(...))
 end
-local log_warning = function(message)
-	luatexbase.module_warning(module_name, message)
+local log_warn = function(message, ...)
+    luatexbase.module_warning(module_name, message:format(...))
 end
 
 polyglossia = polyglossia or {}
 local polyglossia = polyglossia
 
--- predefined l@nohyphenation or dummy new language
-local nohyphid = luatexbase.registernumber'l@nohyphenation' or lang.id(lang.new())
--- key `nohyphenation` is for .sty file when possibly undefined l@nohyphenation
-local newloader_loaded_languages = { nohyphenation = nohyphid }
-
-local newloader_available_languages = dofile(kpse.find_file('language.dat.lua'))
--- Suggestion by Dohyun Kim on #129
-local t = { }
-for k, v in pairs(newloader_available_languages) do
-    t[k] = v
-    for _, vv in pairs(v.synonyms) do
-        t[vv] = v
-    end
-end
-newloader_available_languages = t
-
-local function loadlang(lang, id)
-  if luatexhyphen.lookupname(lang) then
-    luatexhyphen.loadlanguage(lang, id) 
-  end
-end
-
 local function select_language(lang, id)
-  loadlang(lang, id)
-  polyglossia.current_language = lang
+    polyglossia.current_language = lang
 end
 
 local function set_default_language(lang, id)
-  polyglossia.default_language = lang
+    polyglossia.default_language = lang
 end
 
+local byte = utf8.codepoint -- use standard module of lua 5.3
+
 local check_char
 
 if luaotfload and luaotfload.aux and luaotfload.aux.font_has_glyph then
-  local font_has_glyph = luaotfload.aux.font_has_glyph
-  function check_char(chr)
-    local codepoint = tonumber(chr)
-    if not codepoint then codepoint = byte(chr) end
-    if font_has_glyph(font.current(), codepoint) then
-      tex.sprint('1')
-    else
-      tex.sprint('0')
+    local font_has_glyph = luaotfload.aux.font_has_glyph
+    function check_char(chr)
+        local codepoint = tonumber(chr) or byte(chr)
+        if font_has_glyph(font.current(), codepoint) then
+            tex.sprint('1')
+        else
+            tex.sprint('0')
+        end
     end
-  end
 else
-  local ids = fonts.identifiers or fonts.ids or fonts.hashes.identifiers
-  function check_char(chr) -- always in current font
-      local otfdata = ids[font.current()].characters
-      local codepoint = tonumber(chr)
-      if not codepoint then codepoint = byte(chr) end
-      if otfdata and otfdata[codepoint] then
-          tex.print('1')
-      else
-          tex.print('0')
-      end
-  end
-end
-
-local function load_frpt()
-    require('polyglossia-frpt')
+    function check_char(chr) -- always in current font
+        local fontid    = font.current()
+        local fontdata  = font.getfont(fontid) or font.fonts[fontid]
+        local chardata  = fontdata.characters
+        local codepoint = tonumber(chr) or byte(chr)
+        if chardata and chardata[codepoint] then
+            tex.sprint('1')
+        else
+            tex.sprint('0')
+        end
+    end
 end
 
 local function load_tibt_eol()
     require('polyglossia-tibt')
 end
 
+-- predefined l@nohyphenation or LuaTeX's maximum value for \language
+local nohyphid = luatexbase.registernumber'l@nohyphenation' or 16383
+
+-- key `nohyphenation` is for .sty file when possibly undefined l@nohyphenation
+local newloader_loaded_languages = { nohyphenation = nohyphid }
+
+local newloader_available_languages = require'language.dat.lua'
+-- Suggestion by Dohyun Kim on #129
+local t = { }
+for k, v in pairs(newloader_available_languages) do
+    t[k] = v
+    for _, vv in pairs(v.synonyms) do
+        t[vv] = v
+    end
+end
+newloader_available_languages = t
+
 -- LaTeX's language register is \count19
 local lang_register = 19
 
@@ -12846,19 +15656,36 @@ local lang_register = 19
 local function newloader(langentry)
     local loaded_language = newloader_loaded_languages[langentry]
     if loaded_language then
-        log_info('Language ' .. langentry .. ' already loaded; id is ' .. lang.id(loaded_language))
-        -- texio.write_nl('term and log', 'Language ' .. langentry .. ' already loaded with patterns ' .. tostring(loaded_language) .. '; id is ' .. lang.id(loaded_language))
-        -- texio.write_nl('term and log', 'Language ' .. langentry .. ' already loaded with patterns ' .. loaded_language['patterns'] .. '; id is ' .. lang.id(loaded_language))
-        return lang.id(loaded_language)
+        local langid = lang.id(loaded_language)
+        log_info('Language %s already loaded; id is %i', langentry, langid)
+        return langid
     else
         local langdata = newloader_available_languages[langentry]
-        if langdata and langdata['special'] == 'language0' then return 0 end
-
         if langdata then
-            local s = "Language data for " .. langentry
+
+            local special = langdata.special
+            if special then
+                -- language0 (USenglish) is already included in the format
+                if special == 'language0' then
+                    return 0
+
+                -- disabled language should not be used for utf-8 text
+                elseif special:find'^disabled:' then
+                    log_warn('Hyphenation of language %s %s', langentry, special)
+                    return nohyphid
+                end
+            end
+
+            -- language info will be written into the .log file
+            local s = { "Language data for " .. langentry }
             for k, v in pairs(langdata) do
-				s = s .. "\n" .. k .. "\t" .. tostring(v)
+                if type(v) == 'table' then -- for 'synonyms'
+                    s[#s+1] = k .. "\t" .. table.concat(v,',')
+                else
+                    s[#s+1] = k .. "\t" .. tostring(v)
+                end
             end
+            log_info(table.concat(s,"\n"))
 
             --
             -- LaTeX's \newlanguage increases language register (count19),
@@ -12880,47 +15707,47 @@ local function newloader(langentry)
             local langobject = lang.new()
             local langid = lang.id(langobject)
             -- get bigger one between \newlanguage and new lang obj id
-            local maxlangid = math.max(langcnt, langid)
+            local newlangid = math.max(langcnt, langid)
             -- set language register for possible \newlanguage
-            tex.setcount('global', lang_register, maxlangid)
+            tex.setcount('global', lang_register, newlangid)
             -- get new lang object if needeed
-            if langid ~= maxlangid then
-              langobject = lang.new(maxlangid)
-            end
-			s = s .. "\npatterns: " .. langdata.patterns
-			log_info(s)
-            if langdata.patterns and langdata.patterns ~= '' then
-                local pattfilepath = kpse.find_file(langdata.patterns)
-                if pattfilepath then
-                    local pattfile = io.open(pattfilepath)
-                    lang.patterns(langobject, pattfile:read('*all'))
-                    pattfile:close()
-                end
+            if langid ~= newlangid then
+                langobject = lang.new(newlangid)
             end
-            if langdata.hyphenation and langdata.hyphenation ~= '' then
-                local hyphfilepath = kpse.find_file(langdata.hyphenation)
-                if hyphfilepath then
-                    local hyphfile = io.open(hyphfilepath)
-                    lang.hyphenation(langobject, hyphfile:read('*all'))
-                    hyphfile:close()
+
+            -- load hyphenation patterns and exceptions
+            for _,v in ipairs{ 'patterns', 'hyphenation' } do
+                local data = langdata[v]
+                if data and data ~= '' then
+                    -- cope with comma separated list, such as serbian
+                    for _,vv in ipairs(data:explode',+') do
+                        local filepath = kpse.find_file(vv)
+                        if filepath then
+                            local fh = io.open(filepath)
+                            lang[v](langobject, fh:read'a')
+                            fh:close()
+                        else
+                            log_warn('Hyphenation file %s not found', vv)
+                        end
+                    end
                 end
             end
+
             newloader_loaded_languages[langentry] = langobject
 
-            log_info('Language ' .. langentry .. ' was not yet loaded; created with id ' .. lang.id(langobject))
-            return lang.id(langobject)
+            log_info('Language %s was not yet loaded; created with id %i',
+                     langentry, newlangid)
+            return newlangid
         else
-            log_warning('Language ' .. langentry .. ' not found in language.dat.lua')
+            log_warn('Language %s not found in language.dat.lua', langentry)
             return nohyphid
         end
     end
 end
 
-polyglossia.loadlang = loadlang
 polyglossia.select_language = select_language
 polyglossia.set_default_language = set_default_language
 polyglossia.check_char = check_char
-polyglossia.load_frpt = load_frpt
 polyglossia.load_tibt_eol = load_tibt_eol
 polyglossia.newloader = newloader
 polyglossia.newloader_loaded_languages = newloader_loaded_languages
@@ -12940,7 +15767,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
 
    ¦----------------------------------------------¦
    ¦                                              ¦
-   ¦       THE POLYGLOSSIA PACKAGE v1.45          ¦
+   ¦       THE POLYGLOSSIA PACKAGE v1.46          ¦
    ¦                                              ¦
    ¦     Modern multilingual typesetting          ¦
    ¦        with XeLaTeX and LuaLaTeX             ¦
@@ -12949,8 +15776,8 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
 
 This package provides an alternative to Babel for users of XeLaTeX and LuaLaTeX
 (with a few languages incompletely supported for the latter). This version
-includes support for 75 different languages, some of which in different regional,
-national or scriptal varieties.
+includes support for 79 different languages, some of which in different
+regional or national varieties, or using a different writing system.
 
 Polyglossia makes it possible to automate the following tasks:
 
@@ -12973,25 +15800,69 @@ Polyglossia makes it possible to automate the following tasks:
 
 LICENSE
 
-Copyright (c) 2008-2010 François Charette, 2013 Élie Roux, 2011-2019 Arthur Reutenauer
+Copyright (c) 2008-2010 François Charette, 2013 Élie Roux, 2011-2019 Arthur Reutenauer,
+Copyright (c) 2019 Bastien Roucariès, 2019 Jürgen Spitzmüller
 
-Polyglossia is placed under the terms of the LaTeX Project Public Licence
-(LPPL), either version 1.3, or, at your option, any later version.  See
-LICENCE.txt for the text of the LPPL v1.3c, or
-http://www.latex-project.org/lppl.txt for the latest version.
-
-This work has the LPPL maintenance status ‘maintained’.  The current maintainer is
-Arthur Reutenauer.
+Except where otherwise noted, Polyglossia is placed under the terms of the MIT licence
+(https://opensource.org/licenses/MIT).
 
 BUGS
 
 If you run into a bug, or suspect you do, or you have a request or comment, please
 use the GitHub issue tracker: http://github.com/reutenauer/polyglossia/issues
 
-This is more efficient than contacting me by email as it allows me to track the
-issues and follow progress.
+This is more efficient than contacting the maintainer by email as it allows me
+to track the issues and follow progress.
 %</../README>
 %<*Changelog>
+1.46 (15-11-2019)
+
+New features:
+  * Add option "indentfirst" to Russian (#78).
+  * Add options to set and customize French-style itemize item labels to French (#89).
+  * Polyglossia now understands all babel language names in \setdefaultlanguage,
+    \setotherlanguage and the language switching commands (#112, #132).
+  * Add optional localized math operators to Spanish (#123).
+  * Swap section headings in Hungarian (#344). New option "swapstrings" provides control
+    over this.
+  * Introduce macro \setlanguagealias and \setlanguagealias*.
+  * Introduce language switching command \textlang{lang}{...} (equivalent to \text<lang>,
+    but also available with \setlanguagealias* which does not define \text<alias>).
+  * Add support for Afrikaans.
+  * Add support for Belarusian.
+  * Add support for Bosnian.
+  * Add support for Georgian.
+  * Add Spanish variant "mexican".
+  * Add babelshorthands as well as options "splithyphens" and "vlna" to Slovak.
+  * Add Latin language variant "ecclesiastic".
+  * Add Latin language options "capitalizemonth", "ecclesiasticfootnotes", "hyphenation",
+    "prosodicshorthands", and "usej".
+  * Add Latin shorthands for "«", "»", "æ", "Æ", "œ", and "Œ".
+  * Add French language option "thincolonspace".
+
+Bug fixes:
+  * Fix problems with fragile font settings (#24).
+  * Fix clash of French punctuation spacing with the soul package (#52).
+  * Re-enable the possibility to pass a macro as main argumente to \setmainlanguage and
+    \setotherlanguage (#331).
+  * Fix detection of default \languagevariant (#332).
+  * Fix LaTeX error with undefined hyphenation pattern (#346).
+  * Fix some babel shorthand issues by updating the shorthand code from recent babel.
+  * Fix some problems with French and Latin auto-spacing (#345, #352).
+  * Fix an expl3 declaration (#348).
+
+Interface and defaults changes:
+  * Per TeXLive request, the sub-package cyrillicnumbers.sty has been renamed to
+    xpg-cyrillicnumbers.sty.
+  * In Russian, all paragraphs are now indented by default, as common in Russian typography.
+    The behavior can be opted out by indentfirst=false.
+  * In Czech, splithyphens and lvna are enabled by default. Also, the option does now work
+    as well with LuaTeX.
+  * Changed option name "fraktur" to "blackletter" in German (the former is still available
+    as an alias).
+  * In French, high punctuation characters and guillemets are spaced by half an interword
+    space now instead of a \thinspace (cf. #345).
+
 1.45 (27-10-2019)
 
 New features:
@@ -13581,7 +16452,7 @@ Quamquam sermone nativo fungi desinit, cumque nostris diebus perpauci Latine loq
 مباشرا أو غير مباشر على كثير من اللغات الأخرى في العالم الإسلامي، كالتركية
 والفارسية والأردية مثلا.
 
-\textfarsi{\bfseries فارسی}\footnote{%
+\textlang{farsi}{\bfseries فارسی}\footnote{%
 از «\LR{\textenglish{\url{http://fa.wikipedia.org/wiki/}}\RL{\ttfamily فارسي}}»}
 \begin{farsi}
 یا پارسی، (که دری، فارسی دری، و پارسی دری نیز نامیده می‌شود) زبانی است که
diff --git a/macros/latex/contrib/polyglossia/polyglossia.ins b/macros/latex/contrib/polyglossia/polyglossia.ins
index 18037987e8..56050f53cb 100644
--- a/macros/latex/contrib/polyglossia/polyglossia.ins
+++ b/macros/latex/contrib/polyglossia/polyglossia.ins
@@ -30,18 +30,29 @@
 \endpostamble
 \let\MetaPrefix\DoubleperCent
 \askforoverwritefalse
+\generate{\file{gloss-acadien.ldf}{\from{polyglossia.dtx}{gloss-acadien.ldf}}}
+\generate{\file{gloss-afrikaans.ldf}{\from{polyglossia.dtx}{gloss-afrikaans.ldf}}}
 \generate{\file{gloss-albanian.ldf}{\from{polyglossia.dtx}{gloss-albanian.ldf}}}
+\generate{\file{gloss-american.ldf}{\from{polyglossia.dtx}{gloss-american.ldf}}}
 \generate{\file{gloss-amharic.ldf}{\from{polyglossia.dtx}{gloss-amharic.ldf}}}
 \generate{\file{gloss-arabic.ldf}{\from{polyglossia.dtx}{gloss-arabic.ldf}}}
 \generate{\file{gloss-armenian.ldf}{\from{polyglossia.dtx}{gloss-armenian.ldf}}}
 \generate{\file{gloss-asturian.ldf}{\from{polyglossia.dtx}{gloss-asturian.ldf}}}
+\generate{\file{gloss-australian.ldf}{\from{polyglossia.dtx}{gloss-australian.ldf}}}
+\generate{\file{gloss-austrian.ldf}{\from{polyglossia.dtx}{gloss-austrian.ldf}}}
+\generate{\file{gloss-bahasa.ldf}{\from{polyglossia.dtx}{gloss-bahasa.ldf}}}
 \generate{\file{gloss-bahasai.ldf}{\from{polyglossia.dtx}{gloss-bahasai.ldf}}}
 \generate{\file{gloss-bahasam.ldf}{\from{polyglossia.dtx}{gloss-bahasam.ldf}}}
 \generate{\file{gloss-basque.ldf}{\from{polyglossia.dtx}{gloss-basque.ldf}}}
+\generate{\file{gloss-belarusian.ldf}{\from{polyglossia.dtx}{gloss-belarusian.ldf}}}
 \generate{\file{gloss-bengali.ldf}{\from{polyglossia.dtx}{gloss-bengali.ldf}}}
+\generate{\file{gloss-bosnian.ldf}{\from{polyglossia.dtx}{gloss-bosnian.ldf}}}
 \generate{\file{gloss-brazil.ldf}{\from{polyglossia.dtx}{gloss-brazil.ldf}}}
 \generate{\file{gloss-breton.ldf}{\from{polyglossia.dtx}{gloss-breton.ldf}}}
+\generate{\file{gloss-british.ldf}{\from{polyglossia.dtx}{gloss-british.ldf}}}
 \generate{\file{gloss-bulgarian.ldf}{\from{polyglossia.dtx}{gloss-bulgarian.ldf}}}
+\generate{\file{gloss-canadian.ldf}{\from{polyglossia.dtx}{gloss-canadian.ldf}}}
+\generate{\file{gloss-canadien.ldf}{\from{polyglossia.dtx}{gloss-canadien.ldf}}}
 \generate{\file{gloss-catalan.ldf}{\from{polyglossia.dtx}{gloss-catalan.ldf}}}
 \generate{\file{gloss-coptic.ldf}{\from{polyglossia.dtx}{gloss-coptic.ldf}}}
 \generate{\file{gloss-croatian.ldf}{\from{polyglossia.dtx}{gloss-croatian.ldf}}}
@@ -59,7 +70,9 @@
 \generate{\file{gloss-friulian.ldf}{\from{polyglossia.dtx}{gloss-friulian.ldf}}}
 \generate{\file{gloss-gaelic.ldf}{\from{polyglossia.dtx}{gloss-gaelic.ldf}}}
 \generate{\file{gloss-galician.ldf}{\from{polyglossia.dtx}{gloss-galician.ldf}}}
+\generate{\file{gloss-georgian.ldf}{\from{polyglossia.dtx}{gloss-georgian.ldf}}}
 \generate{\file{gloss-german.ldf}{\from{polyglossia.dtx}{gloss-german.ldf}}}
+\generate{\file{gloss-germanb.ldf}{\from{polyglossia.dtx}{gloss-germanb.ldf}}}
 \generate{\file{gloss-greek.ldf}{\from{polyglossia.dtx}{gloss-greek.ldf}}}
 \generate{\file{gloss-hebrew.ldf}{\from{polyglossia.dtx}{gloss-hebrew.ldf}}}
 \generate{\file{gloss-hindi.ldf}{\from{polyglossia.dtx}{gloss-hindi.ldf}}}
@@ -76,8 +89,12 @@
 \generate{\file{gloss-lao.ldf}{\from{polyglossia.dtx}{gloss-lao.ldf}}}
 \generate{\file{gloss-latex.ldf}{\from{polyglossia.dtx}{gloss-latex.ldf}}}
 \generate{\file{gloss-latin.ldf}{\from{polyglossia.dtx}{gloss-latin.ldf}}}
+\generate{\file{gloss-latinclassic.ldf}{\from{polyglossia.dtx}{gloss-latinclassic.ldf}}}
+\generate{\file{gloss-latinecclesiastic.ldf}{\from{polyglossia.dtx}{gloss-latinecclesiastic.ldf}}}
+\generate{\file{gloss-latinmedieval.ldf}{\from{polyglossia.dtx}{gloss-latinmedieval.ldf}}}
 \generate{\file{gloss-latvian.ldf}{\from{polyglossia.dtx}{gloss-latvian.ldf}}}
 \generate{\file{gloss-lithuanian.ldf}{\from{polyglossia.dtx}{gloss-lithuanian.ldf}}}
+\generate{\file{gloss-lowersorbian.ldf}{\from{polyglossia.dtx}{gloss-lowersorbian.ldf}}}
 \generate{\file{gloss-lsorbian.ldf}{\from{polyglossia.dtx}{gloss-lsorbian.ldf}}}
 \generate{\file{gloss-macedonian.ldf}{\from{polyglossia.dtx}{gloss-macedonian.ldf}}}
 \generate{\file{gloss-magyar.ldf}{\from{polyglossia.dtx}{gloss-magyar.ldf}}}
@@ -85,14 +102,19 @@
 \generate{\file{gloss-malayalam.ldf}{\from{polyglossia.dtx}{gloss-malayalam.ldf}}}
 \generate{\file{gloss-marathi.ldf}{\from{polyglossia.dtx}{gloss-marathi.ldf}}}
 \generate{\file{gloss-mongolian.ldf}{\from{polyglossia.dtx}{gloss-mongolian.ldf}}}
+\generate{\file{gloss-naustrian.ldf}{\from{polyglossia.dtx}{gloss-naustrian.ldf}}}
+\generate{\file{gloss-newzealand.ldf}{\from{polyglossia.dtx}{gloss-newzealand.ldf}}}
+\generate{\file{gloss-ngerman.ldf}{\from{polyglossia.dtx}{gloss-ngerman.ldf}}}
 \generate{\file{gloss-nko.ldf}{\from{polyglossia.dtx}{gloss-nko.ldf}}}
 \generate{\file{gloss-norsk.ldf}{\from{polyglossia.dtx}{gloss-norsk.ldf}}}
 \generate{\file{gloss-norwegian.ldf}{\from{polyglossia.dtx}{gloss-norwegian.ldf}}}
+\generate{\file{gloss-nswissgerman.ldf}{\from{polyglossia.dtx}{gloss-nswissgerman.ldf}}}
 \generate{\file{gloss-nynorsk.ldf}{\from{polyglossia.dtx}{gloss-nynorsk.ldf}}}
 \generate{\file{gloss-occitan.ldf}{\from{polyglossia.dtx}{gloss-occitan.ldf}}}
 \generate{\file{gloss-persian.ldf}{\from{polyglossia.dtx}{gloss-persian.ldf}}}
 \generate{\file{gloss-piedmontese.ldf}{\from{polyglossia.dtx}{gloss-piedmontese.ldf}}}
 \generate{\file{gloss-polish.ldf}{\from{polyglossia.dtx}{gloss-polish.ldf}}}
+\generate{\file{gloss-polutonikogreek.ldf}{\from{polyglossia.dtx}{gloss-polutonikogreek.ldf}}}
 \generate{\file{gloss-portuges.ldf}{\from{polyglossia.dtx}{gloss-portuges.ldf}}}
 \generate{\file{gloss-portuguese.ldf}{\from{polyglossia.dtx}{gloss-portuguese.ldf}}}
 \generate{\file{gloss-romanian.ldf}{\from{polyglossia.dtx}{gloss-romanian.ldf}}}
@@ -103,11 +125,15 @@
 \generate{\file{gloss-sanskrit.ldf}{\from{polyglossia.dtx}{gloss-sanskrit.ldf}}}
 \generate{\file{gloss-scottish.ldf}{\from{polyglossia.dtx}{gloss-scottish.ldf}}}
 \generate{\file{gloss-serbian.ldf}{\from{polyglossia.dtx}{gloss-serbian.ldf}}}
+\generate{\file{gloss-serbianc.ldf}{\from{polyglossia.dtx}{gloss-serbianc.ldf}}}
 \generate{\file{gloss-slovak.ldf}{\from{polyglossia.dtx}{gloss-slovak.ldf}}}
+\generate{\file{gloss-slovene.ldf}{\from{polyglossia.dtx}{gloss-slovene.ldf}}}
 \generate{\file{gloss-slovenian.ldf}{\from{polyglossia.dtx}{gloss-slovenian.ldf}}}
 \generate{\file{gloss-sorbian.ldf}{\from{polyglossia.dtx}{gloss-sorbian.ldf}}}
 \generate{\file{gloss-spanish.ldf}{\from{polyglossia.dtx}{gloss-spanish.ldf}}}
+\generate{\file{gloss-spanishmx.ldf}{\from{polyglossia.dtx}{gloss-spanishmx.ldf}}}
 \generate{\file{gloss-swedish.ldf}{\from{polyglossia.dtx}{gloss-swedish.ldf}}}
+\generate{\file{gloss-swissgerman.ldf}{\from{polyglossia.dtx}{gloss-swissgerman.ldf}}}
 \generate{\file{gloss-syriac.ldf}{\from{polyglossia.dtx}{gloss-syriac.ldf}}}
 \generate{\file{gloss-tamil.ldf}{\from{polyglossia.dtx}{gloss-tamil.ldf}}}
 \generate{\file{gloss-telugu.ldf}{\from{polyglossia.dtx}{gloss-telugu.ldf}}}
@@ -116,6 +142,7 @@
 \generate{\file{gloss-turkish.ldf}{\from{polyglossia.dtx}{gloss-turkish.ldf}}}
 \generate{\file{gloss-turkmen.ldf}{\from{polyglossia.dtx}{gloss-turkmen.ldf}}}
 \generate{\file{gloss-ukrainian.ldf}{\from{polyglossia.dtx}{gloss-ukrainian.ldf}}}
+\generate{\file{gloss-uppersorbian.ldf}{\from{polyglossia.dtx}{gloss-uppersorbian.ldf}}}
 \generate{\file{gloss-urdu.ldf}{\from{polyglossia.dtx}{gloss-urdu.ldf}}}
 \generate{\file{gloss-usorbian.ldf}{\from{polyglossia.dtx}{gloss-usorbian.ldf}}}
 \generate{\file{gloss-vietnamese.ldf}{\from{polyglossia.dtx}{gloss-vietnamese.ldf}}}
@@ -126,8 +153,11 @@
 \generate{\file{farsidigits.map}{\from{polyglossia.dtx}{farsidigits.map}}}
 \generate{\file{thaidigits.map}{\from{polyglossia.dtx}{thaidigits.map}}}
 \def\MetaPrefix{-- }
-\generate{\file{polyglossia-frpt.lua}{\from{polyglossia.dtx}{polyglossia-frpt.lua}}}
+\generate{\file{polyglossia-french.lua}{\from{polyglossia.dtx}{polyglossia-french.lua}}}
 \generate{\file{polyglossia-korean.lua}{\from{polyglossia.dtx}{polyglossia-korean.lua}}}
+\generate{\file{polyglossia-latin.lua}{\from{polyglossia.dtx}{polyglossia-latin.lua}}}
+\generate{\file{polyglossia-punct.lua}{\from{polyglossia.dtx}{polyglossia-punct.lua}}}
+\generate{\file{polyglossia-sanskrit.lua}{\from{polyglossia.dtx}{polyglossia-sanskrit.lua}}}
 \generate{\file{polyglossia-tibt.lua}{\from{polyglossia.dtx}{polyglossia-tibt.lua}}}
 \generate{\file{polyglossia.lua}{\from{polyglossia.dtx}{polyglossia.lua}}}
 \let\MetaPrefix\DoubleperCent
diff --git a/macros/latex/contrib/polyglossia/polyglossia.pdf b/macros/latex/contrib/polyglossia/polyglossia.pdf
index 0da109cf9d..0698550579 100644
--- a/macros/latex/contrib/polyglossia/polyglossia.pdf
+++ b/macros/latex/contrib/polyglossia/polyglossia.pdf
diff --git a/macros/latex/contrib/tcolorbox/CHANGES b/macros/latex/contrib/tcolorbox/CHANGES
index 4775a12354..2a1b6dfb15 100644
--- a/macros/latex/contrib/tcolorbox/CHANGES
+++ b/macros/latex/contrib/tcolorbox/CHANGES
@@ -1,4 +1,4 @@
-%% The LaTeX package tcolorbox - version 4.21 (2019/09/19)
+%% The LaTeX package tcolorbox - version 4.22 (2019/11/15)
 %%
 %% -------------------------------------------------------------------------------------------
 %% Copyright (c) 2006-2019 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
@@ -1106,3 +1106,11 @@ version 4.21 (2019/09/19)
       'before doc body path', 'after doc body path'
   * new language string: 'path', 'paths'
 - documentation: checkerbox for opacity examples was too dark
+
+version 4.22 (2019/11/15)
+- bug fix (#79) in library 'xparse':
+  'sidebyside adapt' did not respect color, font, and other options.
+- bug fix (#85) in library 'raster':
+  'raster before skip' and 'raster after skip' did not accept glue anymore.
+- new initialization option (#80): 'reset counter on overlays'
+
diff --git a/macros/latex/contrib/tcolorbox/README b/macros/latex/contrib/tcolorbox/README
index ad3735e664..a16ef87400 100644
--- a/macros/latex/contrib/tcolorbox/README
+++ b/macros/latex/contrib/tcolorbox/README
@@ -1,4 +1,4 @@
-%% The LaTeX package tcolorbox - version 4.21 (2019/09/19)
+%% The LaTeX package tcolorbox - version 4.22 (2019/11/15)
 %%
 %% -------------------------------------------------------------------------------------------
 %% Copyright (c) 2006-2019 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 224eed6ed6..f32bef367e 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.21 (2019/09/19)
+%% The LaTeX package tcolorbox - version 4.22 (2019/11/15)
 %% 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.21}
+\tcb@set@library@version{4.22}
 
 \let\tcb@parboxrestore@true=\tcb@parboxrestore
 \let\tcb@parboxrestore@false\tcb@parbox@false@settings
diff --git a/macros/latex/contrib/tcolorbox/tcbdocumentation.code.tex b/macros/latex/contrib/tcolorbox/tcbdocumentation.code.tex
index a9475d0f86..79f32da93e 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.21 (2019/09/19)
+%% The LaTeX package tcolorbox - version 4.22 (2019/11/15)
 %% 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.21}
+\tcb@set@library@version{4.22}
 
 \tcbuselibrary{listings,skins,xparse,external}
 
diff --git a/macros/latex/contrib/tcolorbox/tcbexternal.code.tex b/macros/latex/contrib/tcolorbox/tcbexternal.code.tex
index f16893e3c2..2697820f39 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.21 (2019/09/19)
+%% The LaTeX package tcolorbox - version 4.22 (2019/11/15)
 %% tcbexternal.code.tex: Code for externalization
 %%
 %% -------------------------------------------------------------------------------------------
@@ -17,7 +17,7 @@
 %%
 %% This work consists of all files listed in README
 %%
-\tcb@set@library@version{4.21}
+\tcb@set@library@version{4.22}
 
 \tcbuselibrary{pro@cessing}
 
diff --git a/macros/latex/contrib/tcolorbox/tcbfitting.code.tex b/macros/latex/contrib/tcolorbox/tcbfitting.code.tex
index be49d57bab..5604168b28 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.21 (2019/09/19)
+%% The LaTeX package tcolorbox - version 4.22 (2019/11/15)
 %% 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.21}
+\tcb@set@library@version{4.22}
 
 \newdimen\tcbfitdim
 \newdimen\tcb@lowerfitdim
diff --git a/macros/latex/contrib/tcolorbox/tcbhooks.code.tex b/macros/latex/contrib/tcolorbox/tcbhooks.code.tex
index db0a3b5b2a..b549b68292 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.21 (2019/09/19)
+%% The LaTeX package tcolorbox - version 4.22 (2019/11/15)
 %% 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.21}
+\tcb@set@library@version{4.22}
 
 \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 11de76ad0d..348cf2fe35 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.21 (2019/09/19)
+%% The LaTeX package tcolorbox - version 4.22 (2019/11/15)
 %% 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.21}
+\tcb@set@library@version{4.22}
 
 \RequirePackage{listings}[2007/02/22]
 
diff --git a/macros/latex/contrib/tcolorbox/tcblistingscore.code.tex b/macros/latex/contrib/tcolorbox/tcblistingscore.code.tex
index c70ac254ad..5d58c94dd1 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.21 (2019/09/19)
+%% The LaTeX package tcolorbox - version 4.22 (2019/11/15)
 %% 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.21}
+\tcb@set@library@version{4.22}
 
 \tcbuselibrary{pro@cessing}
 
diff --git a/macros/latex/contrib/tcolorbox/tcblistingsutf8.code.tex b/macros/latex/contrib/tcolorbox/tcblistingsutf8.code.tex
index d65e96e069..984b402a46 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.21 (2019/09/19)
+%% The LaTeX package tcolorbox - version 4.22 (2019/11/15)
 %% 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.21}
+\tcb@set@library@version{4.22}
 
 \RequirePackage{listingsutf8}[2011/11/10]
 \tcbuselibrary{listings}
diff --git a/macros/latex/contrib/tcolorbox/tcbmagazine.code.tex b/macros/latex/contrib/tcolorbox/tcbmagazine.code.tex
index 16a92a7431..de09b64411 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.21 (2019/09/19)
+%% The LaTeX package tcolorbox - version 4.22 (2019/11/15)
 %% 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.21}
+\tcb@set@library@version{4.22}
 
 \tcbuselibrary{breakable}
 
diff --git a/macros/latex/contrib/tcolorbox/tcbminted.code.tex b/macros/latex/contrib/tcolorbox/tcbminted.code.tex
index a7de5a9990..7b04019180 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.21 (2019/09/19)
+%% The LaTeX package tcolorbox - version 4.22 (2019/11/15)
 %% tcbminted.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.21}
+\tcb@set@library@version{4.22}
 
 \RequirePackage{minted}[2011/09/17]
 
diff --git a/macros/latex/contrib/tcolorbox/tcbposter.code.tex b/macros/latex/contrib/tcolorbox/tcbposter.code.tex
index de26989fae..afab882a04 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.21 (2019/09/19)
+%% The LaTeX package tcolorbox - version 4.22 (2019/11/15)
 %% tcbposter.code.tex: Code for posters
 %%
 %% -------------------------------------------------------------------------------------------
@@ -17,7 +17,7 @@
 %%
 %% This work consists of all files listed in README
 %%
-\tcb@set@library@version{4.21}
+\tcb@set@library@version{4.22}
 
 \tcbuselibrary{breakable,magazine,skins,fitting}
 
diff --git a/macros/latex/contrib/tcolorbox/tcbprocessing.code.tex b/macros/latex/contrib/tcolorbox/tcbprocessing.code.tex
index 953c708d36..c1d54c06ad 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.21 (2019/09/19)
+%% The LaTeX package tcolorbox - version 4.22 (2019/11/15)
 %% 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.21}
+\tcb@set@library@version{4.22}
 
 \RequirePackage{pdftexcmds}
 \RequirePackage{shellesc}
diff --git a/macros/latex/contrib/tcolorbox/tcbraster.code.tex b/macros/latex/contrib/tcolorbox/tcbraster.code.tex
index 2ea8a91eb5..628afd55ae 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.21 (2019/09/19)
+%% The LaTeX package tcolorbox - version 4.22 (2019/11/15)
 %% 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.21}
+\tcb@set@library@version{4.22}
 
 \newcounter{tcbrastercolumn}
 \newcounter{tcbrasterrow}
@@ -160,8 +160,8 @@
   % sanitize
   \tcbdimto\tcb@raster@width{\kvtcb@raster@width}%
   \tcbdimto\tcb@raster@height{\kvtcb@raster@height}%
-  \tcbdimto\tcb@raster@skip@before{\kvtcb@raster@skip@before}%
-  \tcbdimto\tcb@raster@skip@after{\kvtcb@raster@skip@after}%
+  \tcbglueto\tcb@raster@skip@before{\kvtcb@raster@skip@before}%
+  \tcbglueto\tcb@raster@skip@after{\kvtcb@raster@skip@after}%
   \tcbdimto\tcb@raster@skip@left{\kvtcb@raster@skip@left}%
   \tcbdimto\tcb@raster@skip@right{\kvtcb@raster@skip@right}%
   \tcbdimto\tcb@raster@xskip{\kvtcb@raster@xskip}%
diff --git a/macros/latex/contrib/tcolorbox/tcbskins.code.tex b/macros/latex/contrib/tcolorbox/tcbskins.code.tex
index e530a07efd..6b820a7e7b 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.21 (2019/09/19)
+%% The LaTeX package tcolorbox - version 4.22 (2019/11/15)
 %% 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.21}
+\tcb@set@library@version{4.22}
 
 \RequirePackage{tikz}[2010/10/13]
 
diff --git a/macros/latex/contrib/tcolorbox/tcbskinsjigsaw.code.tex b/macros/latex/contrib/tcolorbox/tcbskinsjigsaw.code.tex
index 4fa98841d9..fa78d3e006 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.21 (2019/09/19)
+%% The LaTeX package tcolorbox - version 4.22 (2019/11/15)
 %% 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.21}
+\tcb@set@library@version{4.22}
 
 \tcbuselibrary{skins}
 
diff --git a/macros/latex/contrib/tcolorbox/tcbtheorems.code.tex b/macros/latex/contrib/tcolorbox/tcbtheorems.code.tex
index 50a16801aa..9bfcc7252c 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.21 (2019/09/19)
+%% The LaTeX package tcolorbox - version 4.22 (2019/11/15)
 %% 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.21}
+\tcb@set@library@version{4.22}
 
 \RequirePackage{amsmath}
 
diff --git a/macros/latex/contrib/tcolorbox/tcbvignette.code.tex b/macros/latex/contrib/tcolorbox/tcbvignette.code.tex
index 05f7b2685b..127a24d400 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.21 (2019/09/19)
+%% The LaTeX package tcolorbox - version 4.22 (2019/11/15)
 %% 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.21}
+\tcb@set@library@version{4.22}
 
 \tcbuselibrary{skins}
 
diff --git a/macros/latex/contrib/tcolorbox/tcbxparse.code.tex b/macros/latex/contrib/tcolorbox/tcbxparse.code.tex
index 6126157d26..632c7a5cad 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.21 (2019/09/19)
+%% The LaTeX package tcolorbox - version 4.22 (2019/11/15)
 %% 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.21}
+\tcb@set@library@version{4.22}
 
 \RequirePackage{xparse}[2013/12/31]
 
@@ -232,6 +232,19 @@
 \def\tcb@sbs@content@right{\tcb@sbs@text@left\tcblower\box\tcb@lowerbox}
 \def\tcb@sbs@content@both{\box\tcb@upperbox\tcblower\box\tcb@lowerbox}
 
+\def\tcb@sbs@save@upper{%
+  \colorlet{tcbcol@origin}{.}%
+  \tcb@set@color{tcbcolupper}%
+  \sbox{\tcb@upperbox}{\kvtcb@fontupper\kvtcb@halignupper\tcb@insert@before@upper\tcb@sbs@text@left\tcb@insert@after@upper}%
+  \tcb@reset@color%
+}
+\def\tcb@sbs@save@lower{%
+  \colorlet{tcbcol@origin}{.}%
+  \tcb@set@color{tcbcollower}%
+  \sbox{\tcb@lowerbox}{\kvtcb@fontlower\kvtcb@halignlower\tcb@insert@before@lower\tcb@sbs@text@right\tcb@insert@after@lower}%
+  \tcb@reset@color%
+}
+
 \tcbset{%
   sidebyside adapt/.is choice,
   sidebyside adapt/none/.style={%
@@ -241,19 +254,19 @@
   },
   sidebyside adapt/left/.style={%
     sidebyside@adapt@process/.style={%
-      code={\sbox{\tcb@upperbox}{\tcb@sbs@text@left}\let\tcb@sbs@content\tcb@sbs@content@left},
+      code={\tcb@sbs@save@upper\let\tcb@sbs@content\tcb@sbs@content@left},
       lefthand width=\wd\tcb@upperbox,
     }%
   },
   sidebyside adapt/right/.style={%
     sidebyside@adapt@process/.style={%
-      code={\sbox{\tcb@lowerbox}{\tcb@sbs@text@right}\let\tcb@sbs@content\tcb@sbs@content@right},
+      code={\tcb@sbs@save@lower\let\tcb@sbs@content\tcb@sbs@content@right},
       righthand width=\wd\tcb@lowerbox,
     }%
   },
   sidebyside adapt/both/.style={%
     sidebyside@adapt@process/.style={%
-      code={\sbox{\tcb@upperbox}{\tcb@sbs@text@left}\sbox{\tcb@lowerbox}{\tcb@sbs@text@right}\let\tcb@sbs@content\tcb@sbs@content@both},
+      code={\tcb@sbs@save@upper\tcb@sbs@save@lower\let\tcb@sbs@content\tcb@sbs@content@both},
       text width=\wd\tcb@upperbox+\kvtcb@sbs@gap+\wd\tcb@lowerbox,
       lefthand width=\wd\tcb@upperbox,
     }%
diff --git a/macros/latex/contrib/tcolorbox/tcolorbox-example-poster.pdf b/macros/latex/contrib/tcolorbox/tcolorbox-example-poster.pdf
index 3e10c42360..19b53e887f 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 1f67a3c87b..633a3fee86 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.21 (2019/09/19)
+%% The LaTeX package tcolorbox - version 4.22 (2019/11/15)
 %% 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 0e99b2a539..8164207f0c 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 5ed9ba9a67..7cf8a140ec 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.21 (2019/09/19)
+%% The LaTeX package tcolorbox - version 4.22 (2019/11/15)
 %% 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 b50b13514b..062efe05a1 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 9c52b6c68c..fd1f0c51f3 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.21 (2019/09/19)
+%% The LaTeX package tcolorbox - version 4.22 (2019/11/15)
 %% tcolorbox-tutorial-poster.tex: a tutorial for poster creation with tcolorbox
 %%
 %% -------------------------------------------------------------------------------------------
diff --git a/macros/latex/contrib/tcolorbox/tcolorbox.doc.initoptions.tex b/macros/latex/contrib/tcolorbox/tcolorbox.doc.initoptions.tex
index b2b742409c..4a41654264 100644
--- a/macros/latex/contrib/tcolorbox/tcolorbox.doc.initoptions.tex
+++ b/macros/latex/contrib/tcolorbox/tcolorbox.doc.initoptions.tex
@@ -106,6 +106,15 @@ The created boxes are not numbered. This is the default. The option may
 be used to overrule a previous option.
 \end{newTcbKey}
 
+
+\begin{newTcbKey}[][doc new=2019-10-18]{reset counter on overlays}{\colOpt{=true\textbar false}}{default |true|, initially |false|}
+For |beamer| slides, this invokes the |\resetcounteronoverlays| command
+for the box counter. The counter is automatically reset on subsequent
+overlay slides of a frame.
+Thereby, the counter will be the same on all slides of every frame.
+\end{newTcbKey}
+
+
 \clearpage
 \begin{newTcbKey}{number within}{=\meta{counter}}{no default, initially unset}
 The automatic counter is set to zero, if \meta{counter} is increased.
diff --git a/macros/latex/contrib/tcolorbox/tcolorbox.pdf b/macros/latex/contrib/tcolorbox/tcolorbox.pdf
index 4c995dd99f..4b4189edeb 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 e70df1e68b..9c34ae6be0 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.21 (2019/09/19)
+%% The LaTeX package tcolorbox - version 4.22 (2019/11/15)
 %% tcolorbox.sty: Text color boxes
 %%
 %% -------------------------------------------------------------------------------------------
@@ -18,8 +18,8 @@
 %% This work consists of all files listed in README
 %%
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{tcolorbox}[2019/09/19 version 4.21 text color boxes]
-\def\tcb@version{4.21}
+\ProvidesPackage{tcolorbox}[2019/11/15 version 4.22 text color boxes]
+\def\tcb@version{4.22}
 
 \RequirePackage{pgf}[2008/01/15]
 \RequirePackage{verbatim}[2003/08/22]
@@ -41,6 +41,7 @@
 \newif\iftcb@fixedheight
 \newif\iftcb@ignorenobreak
 \newif\iftcb@checkpage
+\newif\iftcb@resetcounteronoverlays
 
 \newbox\tcb@titlebox
 \newbox\tcb@upperbox
@@ -62,6 +63,7 @@
 
 \def\tcb@dim@to#1#2{\def#1{\the\dimexpr#2\relax}}
 \def\tcbdimto#1#2{\edef#1{\the\dimexpr#2\relax}}
+\def\tcbglueto#1#2{\edef#1{\the\glueexpr#2\relax}}
 
 \def\tcb@defToTotalHeightStandard#1#2{\tcbdimto#1{\ht#2+\dp#2}}
 \let\tcb@defToTotalHeight\tcb@defToTotalHeightStandard
@@ -1844,6 +1846,7 @@
   auto counter/.code={\let\tcb@proc@counter=\tcb@proc@counter@auto},
   use counter from/.code={\edef\kvtcb@new@counter{\csname tcb@cnt@#1\endcsname}\let\tcb@proc@counter=\tcb@proc@counter@from},
   no counter/.code={\let\tcb@proc@counter=\tcb@proc@counter@no},
+  reset counter on overlays/.is if=tcb@resetcounteronoverlays,
   %
   number within/.store in=\kvtcb@new@numberwithin,
   number format/.store in=\kvtcb@new@format,
@@ -1861,7 +1864,8 @@
   blend into/tables/.style={use counter*=table,list inside=lot,/tcb/code={\appto\tcb@new@colopt{,before title={\tcb@blend@beforetitle{\fnum@table}}}}},%
   blend into/listings/.style={use counter*=lstlisting,list inside=lol,/tcb/code={\appto\tcb@new@colopt{,before title={\tcb@blend@beforetitle{\lstlistingname~\thetcbcounter}}}}},%
   %
-  reset@new/.style={no counter,number within=,number format=\arabic,number freestyle=,list inside=,list type=tcolorbox,init@hook@clear},
+  reset@new/.style={no counter,number within=,number format=\arabic,number freestyle=,
+    list inside=,list type=tcolorbox,init@hook@clear,reset counter on overlays=false},
 }
 
 \def\tcb@proc@counter@autoanduse#1{%
@@ -1904,6 +1908,13 @@
 \long\def\tcb@proc@options@init#1#2{%
   \tcbset{new/.cd,reset@new,#1}%
   \tcb@proc@counter{#2}%
+  \iftcb@resetcounteronoverlays%
+    \ifcsname resetcounteronoverlays\endcsname%
+      \ifcsname tcb@cnt@#2\endcsname%
+        \resetcounteronoverlays{\csname tcb@cnt@#2\endcsname}%
+      \fi%
+    \fi%
+  \fi%
   \ifx\kvtcb@new@listof\@empty%
   \else%
     \csedef{tcb@lstof@#2}{\kvtcb@new@listof}%
diff --git a/macros/latex/contrib/tcolorbox/tcolorbox.tex b/macros/latex/contrib/tcolorbox/tcolorbox.tex
index 8399ca7681..db8286bbb8 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.21 (2019/09/19)
+%% The LaTeX package tcolorbox - version 4.22 (2019/11/15)
 %% tcolorbox.tex: Manual
 %%
 %% -------------------------------------------------------------------------------------------
@@ -43,8 +43,8 @@
 \setlength{\bibitemsep}{\smallskipamount}
 \addbibresource{tcolorbox.doc.bib}
 
-\def\version{4.21}%
-\def\datum{2019/09/19}%
+\def\version{4.22}%
+\def\datum{2019/11/15}%
 \makeindex
 
 \hypersetup{
@@ -58,7 +58,7 @@
 
 %\tcbset{draftmode}
 \tcbset{/tcb/external/-}% for final run
-%\includeonly{tcolorbox.doc.coreoptions}
+%\includeonly{tcolorbox.doc.initoptions}
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \begin{document}