From 2884d8fdd76b2def1d759c76c03141710c219ad7 Mon Sep 17 00:00:00 2001
From: Norbert Preining <norbert@preining.info>
Date: Tue, 6 Oct 2020 03:01:44 +0000
Subject: CTAN sync 202010060301

---
 macros/latex/contrib/etoolbox/etoolbox.def         |   2 +-
 macros/latex/contrib/etoolbox/etoolbox.pdf         | Bin 227908 -> 227785 bytes
 macros/latex/contrib/etoolbox/etoolbox.sty         |   5 +-
 macros/latex/contrib/etoolbox/etoolbox.tex         |   8 +-
 macros/latex/contrib/graphics-def/README.md        |   2 +-
 macros/latex/contrib/graphics-def/luatex.def       |   5 +-
 macros/latex/contrib/graphics-def/pdftex.def       |   5 +-
 macros/latex/contrib/jsclasses/Makefile            |   5 +-
 macros/latex/contrib/jsclasses/README.md           |   2 +-
 macros/latex/contrib/jsclasses/jsclasses.dtx       | 103 ++++++++++++++++++---
 macros/latex/contrib/jsclasses/jsclasses.ins       |  20 +++-
 macros/latex/contrib/jsclasses/jsclasses.pdf       | Bin 482131 -> 412093 bytes
 macros/latex/contrib/jsclasses/jslogo.ins          |   9 ++
 macros/latex/contrib/jsclasses/jslogo.pdf          | Bin 91756 -> 76779 bytes
 macros/latex/contrib/jsclasses/jsverb.ins          |   9 ++
 macros/latex/contrib/jsclasses/jsverb.pdf          | Bin 86516 -> 75649 bytes
 macros/latex/contrib/jsclasses/minijs.sty          |  52 -----------
 macros/latex/contrib/jsclasses/okumacro.ins        |   9 ++
 macros/latex/contrib/jsclasses/okumacro.pdf        | Bin 213086 -> 173352 bytes
 macros/latex/contrib/jsclasses/okuverb.ins         |   9 ++
 macros/latex/contrib/jsclasses/okuverb.pdf         | Bin 67501 -> 59902 bytes
 macros/latex/contrib/l3kernel/CHANGELOG.md         |  12 ++-
 macros/latex/contrib/l3kernel/README.md            |   2 +-
 macros/latex/contrib/l3kernel/expl3.dtx            |   4 +-
 macros/latex/contrib/l3kernel/expl3.pdf            | Bin 585194 -> 585263 bytes
 macros/latex/contrib/l3kernel/interface3.pdf       | Bin 1558261 -> 1558337 bytes
 macros/latex/contrib/l3kernel/interface3.tex       |   2 +-
 macros/latex/contrib/l3kernel/l3basics.dtx         |   2 +-
 macros/latex/contrib/l3kernel/l3bootstrap.dtx      |   2 +-
 macros/latex/contrib/l3kernel/l3box.dtx            |   2 +-
 macros/latex/contrib/l3kernel/l3candidates.dtx     |   2 +-
 macros/latex/contrib/l3kernel/l3cctab.dtx          |   2 +-
 macros/latex/contrib/l3kernel/l3clist.dtx          |   2 +-
 macros/latex/contrib/l3kernel/l3coffins.dtx        |   2 +-
 macros/latex/contrib/l3kernel/l3color-base.dtx     |   2 +-
 macros/latex/contrib/l3kernel/l3debug.dtx          |   2 +-
 macros/latex/contrib/l3kernel/l3deprecation.dtx    |   2 +-
 macros/latex/contrib/l3kernel/l3doc.dtx            |   2 +-
 macros/latex/contrib/l3kernel/l3docstrip.dtx       |   2 +-
 macros/latex/contrib/l3kernel/l3docstrip.pdf       | Bin 263299 -> 263355 bytes
 macros/latex/contrib/l3kernel/l3expan.dtx          |   2 +-
 macros/latex/contrib/l3kernel/l3file.dtx           |   2 +-
 macros/latex/contrib/l3kernel/l3flag.dtx           |   2 +-
 macros/latex/contrib/l3kernel/l3fp-assign.dtx      |   2 +-
 macros/latex/contrib/l3kernel/l3fp-aux.dtx         |   2 +-
 macros/latex/contrib/l3kernel/l3fp-basics.dtx      |   2 +-
 macros/latex/contrib/l3kernel/l3fp-convert.dtx     |   2 +-
 macros/latex/contrib/l3kernel/l3fp-expo.dtx        |   2 +-
 macros/latex/contrib/l3kernel/l3fp-extended.dtx    |   2 +-
 macros/latex/contrib/l3kernel/l3fp-logic.dtx       |   2 +-
 macros/latex/contrib/l3kernel/l3fp-parse.dtx       |   2 +-
 macros/latex/contrib/l3kernel/l3fp-random.dtx      |   2 +-
 macros/latex/contrib/l3kernel/l3fp-round.dtx       |   2 +-
 macros/latex/contrib/l3kernel/l3fp-traps.dtx       |   2 +-
 macros/latex/contrib/l3kernel/l3fp-trig.dtx        |   2 +-
 macros/latex/contrib/l3kernel/l3fp.dtx             |   2 +-
 macros/latex/contrib/l3kernel/l3fparray.dtx        |   2 +-
 macros/latex/contrib/l3kernel/l3int.dtx            |   2 +-
 macros/latex/contrib/l3kernel/l3intarray.dtx       |   2 +-
 .../latex/contrib/l3kernel/l3kernel-functions.dtx  |   2 +-
 macros/latex/contrib/l3kernel/l3keys.dtx           |   2 +-
 macros/latex/contrib/l3kernel/l3legacy.dtx         |   2 +-
 macros/latex/contrib/l3kernel/l3luatex.dtx         |   2 +-
 macros/latex/contrib/l3kernel/l3msg.dtx            |   2 +-
 macros/latex/contrib/l3kernel/l3names.dtx          |  13 ++-
 macros/latex/contrib/l3kernel/l3news.pdf           | Bin 379235 -> 379235 bytes
 macros/latex/contrib/l3kernel/l3news01.pdf         | Bin 113527 -> 113527 bytes
 macros/latex/contrib/l3kernel/l3news02.pdf         | Bin 140776 -> 140776 bytes
 macros/latex/contrib/l3kernel/l3news03.pdf         | Bin 144785 -> 144785 bytes
 macros/latex/contrib/l3kernel/l3news04.pdf         | Bin 107115 -> 107115 bytes
 macros/latex/contrib/l3kernel/l3news05.pdf         | Bin 105090 -> 105090 bytes
 macros/latex/contrib/l3kernel/l3news06.pdf         | Bin 140795 -> 140795 bytes
 macros/latex/contrib/l3kernel/l3news07.pdf         | Bin 119094 -> 119094 bytes
 macros/latex/contrib/l3kernel/l3news08.pdf         | Bin 152413 -> 152413 bytes
 macros/latex/contrib/l3kernel/l3news09.pdf         | Bin 235322 -> 235322 bytes
 macros/latex/contrib/l3kernel/l3news10.pdf         | Bin 147097 -> 147097 bytes
 macros/latex/contrib/l3kernel/l3news11.pdf         | Bin 165946 -> 165946 bytes
 macros/latex/contrib/l3kernel/l3news12.pdf         | Bin 199139 -> 199139 bytes
 macros/latex/contrib/l3kernel/l3prefixes.csv       |   1 +
 macros/latex/contrib/l3kernel/l3prefixes.pdf       | Bin 75889 -> 75933 bytes
 macros/latex/contrib/l3kernel/l3prg.dtx            |   2 +-
 macros/latex/contrib/l3kernel/l3prop.dtx           |   2 +-
 macros/latex/contrib/l3kernel/l3quark.dtx          |   2 +-
 macros/latex/contrib/l3kernel/l3regex.dtx          |   2 +-
 macros/latex/contrib/l3kernel/l3seq.dtx            |   2 +-
 macros/latex/contrib/l3kernel/l3skip.dtx           |   2 +-
 macros/latex/contrib/l3kernel/l3sort.dtx           |   2 +-
 macros/latex/contrib/l3kernel/l3str-convert.dtx    |   2 +-
 macros/latex/contrib/l3kernel/l3str.dtx            |   2 +-
 macros/latex/contrib/l3kernel/l3styleguide.pdf     | Bin 280036 -> 280099 bytes
 macros/latex/contrib/l3kernel/l3styleguide.tex     |   2 +-
 macros/latex/contrib/l3kernel/l3syntax-changes.pdf | Bin 228324 -> 228396 bytes
 macros/latex/contrib/l3kernel/l3syntax-changes.tex |   2 +-
 macros/latex/contrib/l3kernel/l3sys.dtx            |   2 +-
 macros/latex/contrib/l3kernel/l3term-glossary.pdf  | Bin 217704 -> 217769 bytes
 macros/latex/contrib/l3kernel/l3term-glossary.tex  |   2 +-
 macros/latex/contrib/l3kernel/l3text-case.dtx      |   2 +-
 macros/latex/contrib/l3kernel/l3text-purify.dtx    |   2 +-
 macros/latex/contrib/l3kernel/l3text.dtx           |  20 ++--
 macros/latex/contrib/l3kernel/l3tl-analysis.dtx    |   2 +-
 macros/latex/contrib/l3kernel/l3tl.dtx             |   2 +-
 macros/latex/contrib/l3kernel/l3token.dtx          |   2 +-
 macros/latex/contrib/l3kernel/l3unicode.dtx        |   2 +-
 macros/latex/contrib/l3kernel/source3.pdf          | Bin 5873517 -> 5871958 bytes
 macros/latex/contrib/l3kernel/source3.tex          |   2 +-
 macros/latex/contrib/l3packages/CHANGELOG.md       |  12 ++-
 macros/latex/contrib/l3packages/README.md          |   2 +-
 macros/latex/contrib/l3packages/l3keys2e.dtx       |   4 +-
 macros/latex/contrib/l3packages/l3keys2e.pdf       | Bin 347627 -> 347610 bytes
 macros/latex/contrib/l3packages/xfp.dtx            |   4 +-
 macros/latex/contrib/l3packages/xfp.pdf            | Bin 309995 -> 309970 bytes
 macros/latex/contrib/l3packages/xfrac.dtx          |   4 +-
 macros/latex/contrib/l3packages/xfrac.pdf          | Bin 481419 -> 454380 bytes
 macros/latex/contrib/l3packages/xparse.dtx         | 101 +++++++-------------
 macros/latex/contrib/l3packages/xparse.pdf         | Bin 505994 -> 505943 bytes
 macros/latex/contrib/l3packages/xtemplate.dtx      |   6 +-
 macros/latex/contrib/l3packages/xtemplate.pdf      | Bin 416503 -> 416501 bytes
 macros/latex/contrib/tuda-ci/README.md             |   6 +-
 .../contrib/tuda-ci/doc/DEMO-TUDaAnnouncement.pdf  | Bin 574097 -> 574097 bytes
 .../latex/contrib/tuda-ci/doc/DEMO-TUDaBeamer.pdf  | Bin 622105 -> 622105 bytes
 .../contrib/tuda-ci/doc/DEMO-TUDaExercise.pdf      | Bin 576999 -> 578291 bytes
 .../latex/contrib/tuda-ci/doc/DEMO-TUDaLeaflet.pdf | Bin 583236 -> 583236 bytes
 .../latex/contrib/tuda-ci/doc/DEMO-TUDaLetter.pdf  | Bin 589031 -> 589226 bytes
 macros/latex/contrib/tuda-ci/doc/DEMO-TUDaPhD.pdf  | Bin 640488 -> 643229 bytes
 .../latex/contrib/tuda-ci/doc/DEMO-TUDaPoster.pdf  | Bin 558962 -> 558962 bytes
 macros/latex/contrib/tuda-ci/doc/DEMO-TUDaPub.pdf  | Bin 663122 -> 675634 bytes
 .../latex/contrib/tuda-ci/doc/DEMO-TUDaReport.pdf  | Bin 550818 -> 550788 bytes
 .../contrib/tuda-ci/doc/DEMO-TUDaSciPoster.pdf     | Bin 586726 -> 586682 bytes
 .../latex/contrib/tuda-ci/doc/DEMO-TUDaThesis.pdf  | Bin 632489 -> 635436 bytes
 .../tuda-ci/example/DEMO-TUDaAnnouncement.tex      |   4 +-
 .../contrib/tuda-ci/example/DEMO-TUDaBeamer.tex    |   2 +-
 .../tuda-ci/example/DEMO-TUDaBibliography.bib      |  10 +-
 .../contrib/tuda-ci/example/DEMO-TUDaExercise.tex  |  22 ++++-
 .../tuda-ci/example/DEMO-TUDaFromaddress.lco       |   2 +-
 .../contrib/tuda-ci/example/DEMO-TUDaLeaflet.tex   |   3 +-
 .../contrib/tuda-ci/example/DEMO-TUDaLetter.tex    |   4 +-
 .../latex/contrib/tuda-ci/example/DEMO-TUDaPhD.tex |   8 +-
 .../contrib/tuda-ci/example/DEMO-TUDaPoster.tex    |   4 +-
 .../latex/contrib/tuda-ci/example/DEMO-TUDaPub.tex |  74 +++++++++++++--
 .../contrib/tuda-ci/example/DEMO-TUDaReport.tex    |   4 +-
 .../contrib/tuda-ci/example/DEMO-TUDaSciPoster.tex |   3 +-
 .../contrib/tuda-ci/example/DEMO-TUDaThesis.tex    |   9 +-
 .../contrib/tuda-ci/tex/beamercolorthemeTUDa.sty   |   6 +-
 .../contrib/tuda-ci/tex/beamerfontthemeTUDa.sty    |   6 +-
 .../contrib/tuda-ci/tex/beamerinnerthemeTUDa.sty   |   6 +-
 .../contrib/tuda-ci/tex/beamerouterthemeTUDa.sty   |   6 +-
 .../tuda-ci/tex/beamerthemeTUDa-mecheng.sty        |   6 +-
 .../latex/contrib/tuda-ci/tex/beamerthemeTUDa.sty  |   6 +-
 macros/latex/contrib/tuda-ci/tex/tuda-a0paper.clo  |   6 +-
 macros/latex/contrib/tuda-ci/tex/tuda-a1paper.clo  |   6 +-
 macros/latex/contrib/tuda-ci/tex/tuda-a2paper.clo  |   6 +-
 macros/latex/contrib/tuda-ci/tex/tuda-a3paper.clo  |   6 +-
 macros/latex/contrib/tuda-ci/tex/tuda-a4paper.clo  |   6 +-
 macros/latex/contrib/tuda-ci/tex/tuda-a5paper.clo  |   6 +-
 macros/latex/contrib/tuda-ci/tex/tuda-pgfplots.sty |   6 +-
 macros/latex/contrib/tuda-ci/tex/tudabeamer.cls    |   6 +-
 macros/latex/contrib/tuda-ci/tex/tudacolors.def    |   6 +-
 macros/latex/contrib/tuda-ci/tex/tudacolors.sty    |   9 +-
 macros/latex/contrib/tuda-ci/tex/tudaexercise.cls  |  57 ++++++++----
 macros/latex/contrib/tuda-ci/tex/tudafonts.sty     |   6 +-
 macros/latex/contrib/tuda-ci/tex/tudaleaflet.cls   |   8 +-
 macros/latex/contrib/tuda-ci/tex/tudaletter.cls    |   6 +-
 .../contrib/tuda-ci/tex/tudalettersize10pt.clo     |   2 +-
 macros/latex/contrib/tuda-ci/tex/tudamecheng.cfg   |   6 +-
 macros/latex/contrib/tuda-ci/tex/tudaposter.cls    |   6 +-
 macros/latex/contrib/tuda-ci/tex/tudapub.cls       |   9 +-
 macros/latex/contrib/tuda-ci/tex/tudarules.sty     |  10 +-
 macros/latex/contrib/tuda-ci/tex/tudasciposter.cls |   6 +-
 macros/latex/contrib/tuda-ci/tex/tudasize9pt.clo   |   2 +-
 macros/latex/contrib/tuda-ci/tex/tudathesis.cfg    |   6 +-
 macros/luatex/generic/luatexja/README              |   8 +-
 macros/luatex/generic/luatexja/doc/luatexja-en.pdf | Bin 702575 -> 702554 bytes
 macros/luatex/generic/luatexja/doc/luatexja-ja.pdf | Bin 1137276 -> 1137264 bytes
 .../luatex/generic/luatexja/doc/luatexja-ruby.pdf  | Bin 485933 -> 353336 bytes
 .../luatex/generic/luatexja/doc/luatexja-ruby.tex  |  91 ++++++++++++++----
 .../generic/luatexja/src/addons/luatexja-ruby.sty  |  52 +++++++----
 macros/luatex/generic/luatexja/src/ltj-jfmglue.lua |  17 +++-
 macros/luatex/generic/luatexja/src/ltj-jfont.lua   |   2 +-
 macros/luatex/generic/luatexja/src/ltj-ruby.lua    |  78 +++++++++++-----
 macros/luatex/generic/luatexja/src/luatexja.sty    |   4 +-
 .../generic/luatexja/src/patches/lltjdefs.sty      |   4 +-
 .../generic/luatexja/src/patches/lltjfont.sty      |  28 +++---
 182 files changed, 759 insertions(+), 447 deletions(-)
 delete mode 100644 macros/latex/contrib/jsclasses/minijs.sty

(limited to 'macros')

diff --git a/macros/latex/contrib/etoolbox/etoolbox.def b/macros/latex/contrib/etoolbox/etoolbox.def
index ad4ac6df7e..cfbafd62d4 100644
--- a/macros/latex/contrib/etoolbox/etoolbox.def
+++ b/macros/latex/contrib/etoolbox/etoolbox.def
@@ -1,5 +1,5 @@
 \ProvidesFile{etoolbox.def}
-  [2020/08/24 v2.5j etoolbox debug messages (JAW)]
+  [2020/10/05 v2.5k etoolbox debug messages (JAW)]
 
 \begingroup
 \makeatletter
diff --git a/macros/latex/contrib/etoolbox/etoolbox.pdf b/macros/latex/contrib/etoolbox/etoolbox.pdf
index 2117815e0c..e219fa2b7b 100644
Binary files a/macros/latex/contrib/etoolbox/etoolbox.pdf and b/macros/latex/contrib/etoolbox/etoolbox.pdf differ
diff --git a/macros/latex/contrib/etoolbox/etoolbox.sty b/macros/latex/contrib/etoolbox/etoolbox.sty
index 39b4a791b0..4c07ceae9c 100644
--- a/macros/latex/contrib/etoolbox/etoolbox.sty
+++ b/macros/latex/contrib/etoolbox/etoolbox.sty
@@ -12,7 +12,7 @@
 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{etoolbox}
-  [2020/08/24 v2.5j e-TeX tools for LaTeX (JAW)]
+  [2020/10/05 v2.5k e-TeX tools for LaTeX (JAW)]
 
 \begingroup
 \@ifundefined{eTeXversion}
@@ -1736,7 +1736,8 @@
 
 \newcommand*{\dolistcsloop}{\forlistcsloop\do}
 
-\ifdef\AddToHook
+\providecommand\IfFormatAtLeastTF{\@ifl@t@r\fmtversion}
+\IfFormatAtLeastTF{2020-10-01}
   {%
     \newrobustcmd*{\AtEndPreamble}{\AddToHook{begindocument/before}}%
     \let\AfterPreamble\AtBeginDocument
diff --git a/macros/latex/contrib/etoolbox/etoolbox.tex b/macros/latex/contrib/etoolbox/etoolbox.tex
index 415a88b797..1049a502cf 100644
--- a/macros/latex/contrib/etoolbox/etoolbox.tex
+++ b/macros/latex/contrib/etoolbox/etoolbox.tex
@@ -12,8 +12,8 @@
   url={http://www.ctan.org/pkg/etoolbox/},
   author={Philipp Lehman, Joseph Wright},
   email={joseph.wright@morningstar2.co.uk},
-  revision={v2.5j},
-  date={2020/08/24}}
+  revision={v2.5k},
+  date={2020/10/05}}
 
 \hypersetup{%
   pdftitle={The etoolbox Package},
@@ -1297,6 +1297,10 @@ This revision history is a list of changes relevant to users of this package. Ch
 
 \begin{changelog}
 
+\begin{release}{2.5k}{2020-10-05}
+\item Internal updates
+\end{release}
+
 \begin{release}{2.5j}{2020-08-24}
 \item Track \LaTeXe{} kernel changes
 \end{release}
diff --git a/macros/latex/contrib/graphics-def/README.md b/macros/latex/contrib/graphics-def/README.md
index ad57349d94..4abc4f9279 100644
--- a/macros/latex/contrib/graphics-def/README.md
+++ b/macros/latex/contrib/graphics-def/README.md
@@ -1,7 +1,7 @@
 LaTeX support for color and graphics
 ====================================
 
-Release 2020-08-26
+Release 2020-10-05
 
 This bundle contains the 'engine-dependent' part of support for
 color and graphics in LaTeX2e (the code here will also function
diff --git a/macros/latex/contrib/graphics-def/luatex.def b/macros/latex/contrib/graphics-def/luatex.def
index 04d3621361..a35138a985 100644
--- a/macros/latex/contrib/graphics-def/luatex.def
+++ b/macros/latex/contrib/graphics-def/luatex.def
@@ -20,7 +20,7 @@
 %% https://github.com/latex3/graphics-def/issues
 %%
 \ProvidesFile{luatex.def}
-  [2020/08/26 v1.2 Graphics/color driver for luatex]
+  [2020/10/05 v1.2a Graphics/color driver for luatex]
 \def\GPT@space{ }
 \def\c@lor@arg#1{%
   \dimen@#1\p@
@@ -139,6 +139,7 @@
     \def\set@page@color{%
      \global\GPT@pagecolortrue
      \global\let\current@page@color\current@color
+     \IfHookEmptyTF{shipout/background}{\AddToHook{shipout/background}{\relax}}{}%
     }%
     \g@addto@macro\@kernel@before@shipout@background
      {%
@@ -151,7 +152,7 @@
           }%
       \fi
      }%
-  }%
+  }{}%
  }
 \AtBeginDocument{%
   \def\KV@Gin@bbllx{%
diff --git a/macros/latex/contrib/graphics-def/pdftex.def b/macros/latex/contrib/graphics-def/pdftex.def
index ac6ca6fe48..e9fd01833b 100644
--- a/macros/latex/contrib/graphics-def/pdftex.def
+++ b/macros/latex/contrib/graphics-def/pdftex.def
@@ -20,7 +20,7 @@
 %% https://github.com/latex3/graphics-def/issues
 %%
 \ProvidesFile{pdftex.def}
-  [2020/08/26 v1.2 Graphics/color driver for pdftex]
+  [2020/10/05 v1.2a Graphics/color driver for pdftex]
 \def\GPT@space{ }
 \def\c@lor@arg#1{%
   \dimen@#1\p@
@@ -154,6 +154,7 @@ E     \else
     \def\set@page@color{%
      \global\GPT@pagecolortrue
      \global\let\current@page@color\current@color
+     \IfHookEmptyTF{shipout/background}{\AddToHook{shipout/background}{\relax}}{}%
     }%
     \g@addto@macro\@kernel@before@shipout@background
      {%
@@ -166,7 +167,7 @@ E     \else
           }%
       \fi
      }%
-  }%
+  }{}%
  }
 \AtBeginDocument{%
   \def\KV@Gin@bbllx{%
diff --git a/macros/latex/contrib/jsclasses/Makefile b/macros/latex/contrib/jsclasses/Makefile
index b7af18707d..3e91b82d58 100644
--- a/macros/latex/contrib/jsclasses/Makefile
+++ b/macros/latex/contrib/jsclasses/Makefile
@@ -3,14 +3,15 @@ DOCTARGET = jsclasses jslogo okumacro jsverb okuverb
 PDFTARGET = $(addsuffix .pdf,$(DOCTARGET))
 DVITARGET = $(addsuffix .dvi,$(DOCTARGET))
 KANJI = -kanji=utf8
-FONTMAP = -f ipaex.map -f ptex-ipaex.map
+FONTMAP = -f haranoaji.map -f ptex-haranoaji.map
 TEXMF = $(shell kpsewhich -var-value=TEXMFHOME)
 
 default: $(STRIPTARGET) $(DVITARGET)
 strip: $(STRIPTARGET)
 all: $(STRIPTARGET) $(PDFTARGET)
 
-JSCLASSES = jsarticle.cls jsbook.cls jsreport.cls jspf.cls kiyou.cls
+JSCLASSES = jsarticle.cls jsbook.cls jsreport.cls jspf.cls kiyou.cls \
+	minijs.sty
 
 # for generating files, we use pdflatex incidentally.
 # otherwise, ptexenc might convert U+2212 -> U+FF0D in okumacro.sty
diff --git a/macros/latex/contrib/jsclasses/README.md b/macros/latex/contrib/jsclasses/README.md
index e051a09a40..f860393a45 100644
--- a/macros/latex/contrib/jsclasses/README.md
+++ b/macros/latex/contrib/jsclasses/README.md
@@ -37,7 +37,7 @@ distributed separately.
 
 ## Release Date
 
-2020-02-02
+2020-10-05
 
 Haruhiko Okumura,
 Japanese TeX Development Community
diff --git a/macros/latex/contrib/jsclasses/jsclasses.dtx b/macros/latex/contrib/jsclasses/jsclasses.dtx
index 8e6642b329..941b08c4f3 100644
--- a/macros/latex/contrib/jsclasses/jsclasses.dtx
+++ b/macros/latex/contrib/jsclasses/jsclasses.dtx
@@ -9,7 +9,7 @@
 %  pLaTeX2ε新ドキュメントクラス（日本語 TeX 開発コミュニティ版）
 %  原作者：奥村晴彦 <okumura@okumuralab.org>
 %
-%  Copyright 1993-2019
+%  Copyright 1993-2020
 %  The LaTeX3 Project and any individual authors listed elsewhere
 %  in this file.
 %
@@ -28,10 +28,11 @@
 %<report>\ProvidesClass{jsreport}
 %<jspf>\ProvidesClass{jspf}
 %<kiyou>\ProvidesClass{kiyou}
+%<minijs>\ProvidesPackage{minijs}
 %<*driver>
 \ProvidesFile{jsclasses.dtx}
 %</driver>
-  [2020/02/02 jsclasses (okumura, texjporg)]
+  [2020/10/05 jsclasses (okumura, texjporg)]
 %<*driver>
 \documentclass{jsarticle}
 \usepackage{doc}
@@ -124,11 +125,26 @@
 %
 % 以下では実際のコードに即して説明します。
 %
+% \texttt{minijs}は，\texttt{jsclasses}に似た設定を行うパッケージです。
+%
+%    \begin{macrocode}
+%<*minijs>
+%% if jsclasses loaded, abort loading this package
+\ifx\@jsc@uplatextrue\@undefined\else
+  \PackageInfo{minijs}{jsclasses does not need minijs, exiting}
+  \expandafter\endinput
+\fi
+%% "fake" jsarticle
+\expandafter\def\csname ver@jsarticle.cls\endcsname{}
+%</minijs>
+%    \end{macrocode}
+%
 % \begin{macro}{\jsc@clsname}
 %
 % 文書クラスの名前です。エラーメッセージ表示などで使われます。
 %
 %    \begin{macrocode}
+%<*class>
 %<article>\def\jsc@clsname{jsarticle}
 %<book>\def\jsc@clsname{jsbook}
 %<report>\def\jsc@clsname{jsreport}
@@ -746,6 +762,11 @@
 % [2017-01-11] トンボオプションが指定されているとき「だけ」|\stockwidth|，
 % |\stockheight|を定義するようにしました。
 %
+% [2020-10-04] \LaTeXe~2020-10-01でカーネルの |\shipout| コードが拡張され
+% |\AtBeginDvi| の実行タイミングが変化したので，この時点で
+% 発行する |\special| の中身を展開しておくようにしました。
+% こうしないと，用紙サイズ設定を間違ってしまいます(Issue \#72)。
+%
 %    \begin{macrocode}
 \iftombow
   \newdimen\stockwidth \newdimen\stockheight
@@ -756,10 +777,11 @@
 \fi
 \ifpapersize
   \iftombow
-    \AtBeginDvi{\special{papersize=\the\stockwidth,\the\stockheight}}
+    \edef\jsc@papersize@special{papersize=\the\stockwidth,\the\stockheight}
   \else
-    \AtBeginDvi{\special{papersize=\the\paperwidth,\the\paperheight}}
+    \edef\jsc@papersize@special{papersize=\the\paperwidth,\the\paperheight}
   \fi
+  \AtBeginDvi{\special{\jsc@papersize@special}}
 \fi
 %    \end{macrocode}
 %
@@ -1059,6 +1081,24 @@
 % $9.62216\,\mathrm{pt} * 0.961 / 10\,\mathrm{pt} = 0.924690$ です。
 %
 %    \begin{macrocode}
+%</class>
+%<*minijs>
+%% min/goth -> jis/jisg (for pLaTeX only)
+\ifx\ucs\@undefined
+\@for\@tempa:=5,6,7,8,9,10,10.95,12,14.4,17.28,20.74,24.88\do{%
+  \expandafter\let\csname JY1/mc/m/n/\@tempa\endcsname\relax
+  \expandafter\let\csname JY1/gt/m/n/\@tempa\endcsname\relax
+  \expandafter\let\csname JT1/mc/m/n/\@tempa\endcsname\relax
+  \expandafter\let\csname JT1/gt/m/n/\@tempa\endcsname\relax
+}
+\def\Cjascale{0.924690}
+\DeclareFontShape{JY1}{mc}{m}{n}{<-> s * [0.961] jis}{}
+\DeclareFontShape{JY1}{gt}{m}{n}{<-> s * [0.961] jisg}{}
+\DeclareFontShape{JT1}{mc}{m}{n}{<-> s * [0.961] tmin10}{}
+\DeclareFontShape{JT1}{gt}{m}{n}{<-> s * [0.961] tgoth10}{}
+\fi
+%</minijs>
+%<*class>
 %<*!jspf>
 \def\Cjascale{0.924690}
 \ifmingoth
@@ -1170,7 +1210,22 @@
 % 従来のコードも\LaTeXe~2019-10-01以前のために残してありますが，
 % \texttt{mweights}パッケージ対策も施しました(forum:2763)。
 %
+% [2020-10-04] \LaTeXe~2020-10-01では |\AddToHook| を利用します。
+%
+% ^^A Note that |\AddToHook| is defined as follows:
+% ^^A \begin{itemize}
+% ^^A   \item Format date 2020-02-02 or older: undefined
+% ^^A   \item Format date 2020-10-01 or newer: available
+% ^^A   \item ... under \texttt{latexrelease} rollback: defined but no-op
+% ^^A \end{itemize}
+%
 %    \begin{macrocode}
+%</class>
+%<*class|minijs>
+%% ad-hoc "relation font"
+\@ifl@t@r\fmtversion{2020/10/01}
+    {\jsc@needsp@tchfalse}{\jsc@needsp@tchtrue}
+\ifjsc@needsp@tch          % --- for 2020-02-02 or older BEGIN
 \ifx\@rmfamilyhook\@undefined  % old
 \DeclareRobustCommand\rmfamily
         {\not@math@alphabet\rmfamily\mathrm
@@ -1200,6 +1255,16 @@
 \g@addto@macro\@ttfamilyhook
   {\prepare@family@series@update@kanji{gt}\gtdefault}
 \fi
+\else % --- for 2020-02-02 or older END & for 2020-10-01 BEGIN
+\AddToHook{rmfamily}%
+  {\prepare@family@series@update@kanji{mc}\mcdefault}
+\AddToHook{sffamily}%
+  {\prepare@family@series@update@kanji{gt}\gtdefault}
+\AddToHook{ttfamily}%
+  {\prepare@family@series@update@kanji{gt}\gtdefault}
+\fi   % --- for 2020-10-01 END
+%</class|minijs>
+%<*class>
 %    \end{macrocode}
 %
 % \begin{macro}{\textmc}
@@ -1567,25 +1632,31 @@
 % [2008-02-18] |english| オプションで |\parindent| を 1em にしました。
 %
 %    \begin{macrocode}
+%</class>
+%<*class|minijs>
+%% \@setfontsize with \parindent and \(x)kanjiskip settings
 \def\@setfontsize#1#2#3{%
-% \@nomath#1%
+%<minijs>  \@nomath#1%
   \ifx\protect\@typeset@protect
     \let\@currsize#1%
   \fi
   \fontsize{#2}{#3}\selectfont
   \ifdim\parindent>\z@
-    \if@english
-      \parindent=1em
-    \else
+%<class>    \if@english
+%<class>      \parindent=1em
+%<class>    \else
       \parindent=1zw
-    \fi
+%<class>    \fi
   \fi
   \kanjiskip=0zw plus .1zw minus .01zw
-  \ifdim\xkanjiskip>\z@
-    \if@slide \xkanjiskip=0.1em \else
+%<class>  \ifdim\xkanjiskip>\z@
+%<class>    \if@slide \xkanjiskip=0.1em \else
       \xkanjiskip=0.25em plus 0.15em minus 0.06em
-    \fi
-  \fi}
+%<class>    \fi
+%<class>  \fi
+}
+%</class|minijs>
+%<*class>
 %    \end{macrocode}
 % \end{macro}
 %
@@ -1694,7 +1765,12 @@
 % ここで実際に標準フォントサイズで初期化します。
 %
 %    \begin{macrocode}
+%</class>
+%<*class|minijs>
+%% initialize
 \normalsize
+%</class|minijs>
+%<*class>
 %    \end{macrocode}
 %
 % \end{macro}
@@ -6015,6 +6091,7 @@
     \ignorespaces
   \fi}
 %</article|book|report>
+%</class>
 %    \end{macrocode}
 % \end{macro}
 %
diff --git a/macros/latex/contrib/jsclasses/jsclasses.ins b/macros/latex/contrib/jsclasses/jsclasses.ins
index 738af8a8fb..b7e4ca24ab 100644
--- a/macros/latex/contrib/jsclasses/jsclasses.ins
+++ b/macros/latex/contrib/jsclasses/jsclasses.ins
@@ -1,8 +1,18 @@
+\input docstrip
+\preamble
+
+Maintained on GitHub: https://github.com/texjporg/jsclasses
+
+\endpreamble
+
 \def\batchfile{jsclasses.ins}
 \input docstrip.tex
 \keepsilent
-\generateFile{jsarticle.cls}{f}{\from{jsclasses.dtx}{article}}
-\generateFile{jsbook.cls}{f}{\from{jsclasses.dtx}{book}}
-\generateFile{jsreport.cls}{f}{\from{jsclasses.dtx}{report}}
-\generateFile{jspf.cls}{f}{\from{jsclasses.dtx}{jspf}}
-\generateFile{kiyou.cls}{f}{\from{jsclasses.dtx}{kiyou}}
+\generateFile{jsarticle.cls}{f}{\from{jsclasses.dtx}{class,article}}
+\generateFile{jsbook.cls}{f}{\from{jsclasses.dtx}{class,book}}
+\generateFile{jsreport.cls}{f}{\from{jsclasses.dtx}{class,report}}
+\generateFile{jspf.cls}{f}{\from{jsclasses.dtx}{class,jspf}}
+\generateFile{kiyou.cls}{f}{\from{jsclasses.dtx}{class,kiyou}}
+\generateFile{minijs.sty}{f}{\from{jsclasses.dtx}{minijs}}
+
+\endbatchfile
diff --git a/macros/latex/contrib/jsclasses/jsclasses.pdf b/macros/latex/contrib/jsclasses/jsclasses.pdf
index 63ff3c6e69..6288f723c2 100644
Binary files a/macros/latex/contrib/jsclasses/jsclasses.pdf and b/macros/latex/contrib/jsclasses/jsclasses.pdf differ
diff --git a/macros/latex/contrib/jsclasses/jslogo.ins b/macros/latex/contrib/jsclasses/jslogo.ins
index 26e1a43b1f..0f8f287a42 100644
--- a/macros/latex/contrib/jsclasses/jslogo.ins
+++ b/macros/latex/contrib/jsclasses/jslogo.ins
@@ -1,4 +1,13 @@
+\input docstrip
+\preamble
+
+Maintained on GitHub: https://github.com/texjporg/jsclasses
+
+\endpreamble
+
 \def\batchfile{jslogo.ins}
 \input docstrip.tex
 \keepsilent
 \generateFile{jslogo.sty}{f}{\from{jslogo.dtx}{package}}
+
+\endbatchfile
diff --git a/macros/latex/contrib/jsclasses/jslogo.pdf b/macros/latex/contrib/jsclasses/jslogo.pdf
index edb8926c78..6975d75515 100644
Binary files a/macros/latex/contrib/jsclasses/jslogo.pdf and b/macros/latex/contrib/jsclasses/jslogo.pdf differ
diff --git a/macros/latex/contrib/jsclasses/jsverb.ins b/macros/latex/contrib/jsclasses/jsverb.ins
index 34dbbcf54f..20279cfb8d 100644
--- a/macros/latex/contrib/jsclasses/jsverb.ins
+++ b/macros/latex/contrib/jsclasses/jsverb.ins
@@ -1,4 +1,13 @@
+\input docstrip
+\preamble
+
+Maintained on GitHub: https://github.com/texjporg/jsclasses
+
+\endpreamble
+
 \def\batchfile{jsverb.ins}
 \input docstrip.tex
 \keepsilent
 \generateFile{jsverb.sty}{f}{\from{jsverb.dtx}{jsverb}}
+
+\endbatchfile
diff --git a/macros/latex/contrib/jsclasses/jsverb.pdf b/macros/latex/contrib/jsclasses/jsverb.pdf
index cf1162f27e..a2273084a5 100644
Binary files a/macros/latex/contrib/jsclasses/jsverb.pdf and b/macros/latex/contrib/jsclasses/jsverb.pdf differ
diff --git a/macros/latex/contrib/jsclasses/minijs.sty b/macros/latex/contrib/jsclasses/minijs.sty
deleted file mode 100644
index da464a3a31..0000000000
--- a/macros/latex/contrib/jsclasses/minijs.sty
+++ /dev/null
@@ -1,52 +0,0 @@
-% minimal jsarticle-like fonts
-%
-\NeedsTeXFormat{pLaTeX2e}
-\ProvidesPackage{minijs}[2018/02/04 okumura, texjporg]
-%
-% if jsclasses loaded, abort loading this package
-\ifx\@jsc@uplatextrue\@undefined\else
-  \PackageInfo{minijs}{jsclasses does not need minijs, exiting}
-  \expandafter\endinput
-\fi
-%
-% "fake" jsarticle
-\expandafter\def\csname ver@jsarticle.cls\endcsname{}
-%
-% min/goth -> jis/jisg (for pLaTeX only)
-\ifx\ucs\@undefined
-\@for\@tempa:=5,6,7,8,9,10,10.95,12,14.4,17.28,20.74,24.88\do{%
-  \expandafter\let\csname JY1/mc/m/n/\@tempa\endcsname\relax
-  \expandafter\let\csname JY1/gt/m/n/\@tempa\endcsname\relax
-  \expandafter\let\csname JT1/mc/m/n/\@tempa\endcsname\relax
-  \expandafter\let\csname JT1/gt/m/n/\@tempa\endcsname\relax
-}
-\def\Cjascale{0.924690}
-\DeclareFontShape{JY1}{mc}{m}{n}{<-> s * [0.961] jis}{}
-\DeclareFontShape{JY1}{gt}{m}{n}{<-> s * [0.961] jisg}{}
-\DeclareFontShape{JT1}{mc}{m}{n}{<-> s * [0.961] tmin10}{}
-\DeclareFontShape{JT1}{gt}{m}{n}{<-> s * [0.961] tgoth10}{}
-\fi
-%
-% \@setfontsize with \parindent and \(x)kanjiskip settings
-\def\@setfontsize#1#2#3{\@nomath#1%
-  \ifx\protect\@typeset@protect
-    \let\@currsize#1%
-  \fi
-  \fontsize{#2}{#3}\selectfont
-  \ifdim\parindent>\z@ \parindent=1zw \fi
-  \kanjiskip=0zw plus .1zw minus .01zw
-  \xkanjiskip=0.25em plus 0.15em minus 0.06em}
-%
-% ad-hoc "relation font"
-\DeclareRobustCommand\rmfamily
-        {\not@math@alphabet\rmfamily\mathrm
-         \romanfamily\rmdefault\kanjifamily\mcdefault\selectfont}
-\DeclareRobustCommand\sffamily
-        {\not@math@alphabet\sffamily\mathsf
-         \romanfamily\sfdefault\kanjifamily\gtdefault\selectfont}
-\DeclareRobustCommand\ttfamily
-        {\not@math@alphabet\ttfamily\mathtt
-         \romanfamily\ttdefault\kanjifamily\gtdefault\selectfont}
-\normalsize
-%
-\endinput
diff --git a/macros/latex/contrib/jsclasses/okumacro.ins b/macros/latex/contrib/jsclasses/okumacro.ins
index 4e1c392dc2..57a45c97a0 100644
--- a/macros/latex/contrib/jsclasses/okumacro.ins
+++ b/macros/latex/contrib/jsclasses/okumacro.ins
@@ -1,4 +1,13 @@
+\input docstrip
+\preamble
+
+Maintained on GitHub: https://github.com/texjporg/jsclasses
+
+\endpreamble
+
 \def\batchfile{okumacro.ins}
 \input docstrip.tex
 \keepsilent
 \generateFile{okumacro.sty}{f}{\from{okumacro.dtx}{okumacro}}
+
+\endbatchfile
diff --git a/macros/latex/contrib/jsclasses/okumacro.pdf b/macros/latex/contrib/jsclasses/okumacro.pdf
index 1f7e21ce5c..78b40bb433 100644
Binary files a/macros/latex/contrib/jsclasses/okumacro.pdf and b/macros/latex/contrib/jsclasses/okumacro.pdf differ
diff --git a/macros/latex/contrib/jsclasses/okuverb.ins b/macros/latex/contrib/jsclasses/okuverb.ins
index aa4e33f8a3..a9076d54d1 100644
--- a/macros/latex/contrib/jsclasses/okuverb.ins
+++ b/macros/latex/contrib/jsclasses/okuverb.ins
@@ -1,4 +1,13 @@
+\input docstrip
+\preamble
+
+Maintained on GitHub: https://github.com/texjporg/jsclasses
+
+\endpreamble
+
 \def\batchfile{okuverb.ins}
 \input docstrip.tex
 \keepsilent
 \generateFile{okuverb.sty}{f}{\from{okuverb.dtx}{okuverb}}
+
+\endbatchfile
diff --git a/macros/latex/contrib/jsclasses/okuverb.pdf b/macros/latex/contrib/jsclasses/okuverb.pdf
index b5da6698d5..b8014b3c66 100644
Binary files a/macros/latex/contrib/jsclasses/okuverb.pdf and b/macros/latex/contrib/jsclasses/okuverb.pdf differ
diff --git a/macros/latex/contrib/l3kernel/CHANGELOG.md b/macros/latex/contrib/l3kernel/CHANGELOG.md
index b3ccf0b773..3e416742d9 100644
--- a/macros/latex/contrib/l3kernel/CHANGELOG.md
+++ b/macros/latex/contrib/l3kernel/CHANGELOG.md
@@ -7,6 +7,15 @@ this project uses date-based 'snapshot' version identifiers.
 
 ## [Unreleased]
 
+### Fixed
+- Correctly detect LaTeX when pre-loading expl3 and setting up
+  case changer
+
+## [2020-10-05]
+
+### Fixed
+- Lua emulation of \strcmp (issue #813)
+
 ## [2020-09-24]
 
 ### Changed
@@ -771,7 +780,8 @@ this project uses date-based 'snapshot' version identifiers.
 - Step func­tions have been added for dim vari­ables,
   e.g. `\dim_step_in­line:nnnn`
 
-[Unreleased]: https://github.com/latex3/latex3/compare/2020-09-24...HEAD
+[Unreleased]: https://github.com/latex3/latex3/compare/2020-10-05...HEAD
+[2020-10-05]: https://github.com/latex3/latex3/compare/2020-09-24...2020-10-05
 [2020-09-24]: https://github.com/latex3/latex3/compare/2020-09-06...2020-09-24
 [2020-09-06]: https://github.com/latex3/latex3/compare/2020-09-03...2020-09-06
 [2020-09-03]: https://github.com/latex3/latex3/compare/2020-09-01...2020-09-03
diff --git a/macros/latex/contrib/l3kernel/README.md b/macros/latex/contrib/l3kernel/README.md
index 9f52369eb7..8fabd3e167 100644
--- a/macros/latex/contrib/l3kernel/README.md
+++ b/macros/latex/contrib/l3kernel/README.md
@@ -1,7 +1,7 @@
 LaTeX3 Programming Conventions
 ==============================
 
-Release 2020-09-24
+Release 2020-10-05
 
 Overview
 --------
diff --git a/macros/latex/contrib/l3kernel/expl3.dtx b/macros/latex/contrib/l3kernel/expl3.dtx
index 003502090e..c42fffb6b2 100644
--- a/macros/latex/contrib/l3kernel/expl3.dtx
+++ b/macros/latex/contrib/l3kernel/expl3.dtx
@@ -24,7 +24,7 @@
 %
 %<*driver|generic|package|2ekernel>
 %</driver|generic|package|2ekernel>
-\def\ExplFileDate{2020-09-24}%
+\def\ExplFileDate{2020-10-05}%
 %<*driver>
 \documentclass[full]{l3doc}
 \usepackage{graphicx}
@@ -51,7 +51,7 @@
 %    }^^A
 % }
 %
-% \date{Released 2020-09-24}
+% \date{Released 2020-10-05}
 %
 % \maketitle
 %
diff --git a/macros/latex/contrib/l3kernel/expl3.pdf b/macros/latex/contrib/l3kernel/expl3.pdf
index dbe8f29701..9291487c4b 100644
Binary files a/macros/latex/contrib/l3kernel/expl3.pdf and b/macros/latex/contrib/l3kernel/expl3.pdf differ
diff --git a/macros/latex/contrib/l3kernel/interface3.pdf b/macros/latex/contrib/l3kernel/interface3.pdf
index a19a9a94ad..36f3ab7387 100644
Binary files a/macros/latex/contrib/l3kernel/interface3.pdf and b/macros/latex/contrib/l3kernel/interface3.pdf differ
diff --git a/macros/latex/contrib/l3kernel/interface3.tex b/macros/latex/contrib/l3kernel/interface3.tex
index 020a23120a..87fea02ba4 100644
--- a/macros/latex/contrib/l3kernel/interface3.tex
+++ b/macros/latex/contrib/l3kernel/interface3.tex
@@ -54,7 +54,7 @@ for those people who are interested.
          {latex-team@latex-project.org}%
    }%
 }
-\date{Released 2020-09-24}
+\date{Released 2020-10-05}
 
 \pagenumbering{roman}
 \maketitle
diff --git a/macros/latex/contrib/l3kernel/l3basics.dtx b/macros/latex/contrib/l3kernel/l3basics.dtx
index 0d2594ca74..7f06398f70 100644
--- a/macros/latex/contrib/l3kernel/l3basics.dtx
+++ b/macros/latex/contrib/l3kernel/l3basics.dtx
@@ -43,7 +43,7 @@
 %    }^^A
 % }
 %
-% \date{Released 2020-09-24}
+% \date{Released 2020-10-05}
 %
 % \maketitle
 %
diff --git a/macros/latex/contrib/l3kernel/l3bootstrap.dtx b/macros/latex/contrib/l3kernel/l3bootstrap.dtx
index c3b597031a..fd354ab438 100644
--- a/macros/latex/contrib/l3kernel/l3bootstrap.dtx
+++ b/macros/latex/contrib/l3kernel/l3bootstrap.dtx
@@ -43,7 +43,7 @@
 %    }^^A
 % }
 %
-% \date{Released 2020-09-24}
+% \date{Released 2020-10-05}
 %
 % \maketitle
 %
diff --git a/macros/latex/contrib/l3kernel/l3box.dtx b/macros/latex/contrib/l3kernel/l3box.dtx
index dbf1619275..5412fab14c 100644
--- a/macros/latex/contrib/l3kernel/l3box.dtx
+++ b/macros/latex/contrib/l3kernel/l3box.dtx
@@ -43,7 +43,7 @@
 %    }^^A
 % }
 %
-% \date{Released 2020-09-24}
+% \date{Released 2020-10-05}
 %
 % \maketitle
 %
diff --git a/macros/latex/contrib/l3kernel/l3candidates.dtx b/macros/latex/contrib/l3kernel/l3candidates.dtx
index 3014f8a118..dc33f6abca 100644
--- a/macros/latex/contrib/l3kernel/l3candidates.dtx
+++ b/macros/latex/contrib/l3kernel/l3candidates.dtx
@@ -44,7 +44,7 @@
 %    }^^A
 % }
 %
-% \date{Released 2020-09-24}
+% \date{Released 2020-10-05}
 %
 % \maketitle
 %
diff --git a/macros/latex/contrib/l3kernel/l3cctab.dtx b/macros/latex/contrib/l3kernel/l3cctab.dtx
index f07f1a1b6d..6807760193 100644
--- a/macros/latex/contrib/l3kernel/l3cctab.dtx
+++ b/macros/latex/contrib/l3kernel/l3cctab.dtx
@@ -43,7 +43,7 @@
 %    }^^A
 % }
 %
-% \date{Released 2020-09-24}
+% \date{Released 2020-10-05}
 %
 % \maketitle
 %
diff --git a/macros/latex/contrib/l3kernel/l3clist.dtx b/macros/latex/contrib/l3kernel/l3clist.dtx
index e2931f26de..622966bffb 100644
--- a/macros/latex/contrib/l3kernel/l3clist.dtx
+++ b/macros/latex/contrib/l3kernel/l3clist.dtx
@@ -44,7 +44,7 @@
 %    }^^A
 % }
 %
-% \date{Released 2020-09-24}
+% \date{Released 2020-10-05}
 %
 % \maketitle
 %
diff --git a/macros/latex/contrib/l3kernel/l3coffins.dtx b/macros/latex/contrib/l3kernel/l3coffins.dtx
index 3ec8d95ff9..a69d7b25e3 100644
--- a/macros/latex/contrib/l3kernel/l3coffins.dtx
+++ b/macros/latex/contrib/l3kernel/l3coffins.dtx
@@ -43,7 +43,7 @@
 %    }^^A
 % }
 %
-% \date{Released 2020-09-24}
+% \date{Released 2020-10-05}
 %
 % \maketitle
 %
diff --git a/macros/latex/contrib/l3kernel/l3color-base.dtx b/macros/latex/contrib/l3kernel/l3color-base.dtx
index 47515cd30e..fd517b1e2e 100644
--- a/macros/latex/contrib/l3kernel/l3color-base.dtx
+++ b/macros/latex/contrib/l3kernel/l3color-base.dtx
@@ -43,7 +43,7 @@
 %    }^^A
 % }
 %
-% \date{Released 2020-09-24}
+% \date{Released 2020-10-05}
 %
 % \maketitle
 %
diff --git a/macros/latex/contrib/l3kernel/l3debug.dtx b/macros/latex/contrib/l3kernel/l3debug.dtx
index 72cd83ed35..1b98b61667 100644
--- a/macros/latex/contrib/l3kernel/l3debug.dtx
+++ b/macros/latex/contrib/l3kernel/l3debug.dtx
@@ -43,7 +43,7 @@
 %    }^^A
 % }
 %
-% \date{Released 2020-09-24}
+% \date{Released 2020-10-05}
 %
 % \maketitle
 %
diff --git a/macros/latex/contrib/l3kernel/l3deprecation.dtx b/macros/latex/contrib/l3kernel/l3deprecation.dtx
index fff81d47ad..c7c4d91c44 100644
--- a/macros/latex/contrib/l3kernel/l3deprecation.dtx
+++ b/macros/latex/contrib/l3kernel/l3deprecation.dtx
@@ -43,7 +43,7 @@
 %    }^^A
 % }
 %
-% \date{Released 2020-09-24}
+% \date{Released 2020-10-05}
 %
 % \maketitle
 %
diff --git a/macros/latex/contrib/l3kernel/l3doc.dtx b/macros/latex/contrib/l3kernel/l3doc.dtx
index db015fd372..0a4b2c4550 100644
--- a/macros/latex/contrib/l3kernel/l3doc.dtx
+++ b/macros/latex/contrib/l3kernel/l3doc.dtx
@@ -79,7 +79,7 @@ and all files in that bundle must be distributed together.
 %
 % \title{The \cls{l3doc} class}
 % \author{\Team}
-% \date{Released 2020-09-24}
+% \date{Released 2020-10-05}
 % \maketitle
 % \tableofcontents
 %
diff --git a/macros/latex/contrib/l3kernel/l3docstrip.dtx b/macros/latex/contrib/l3kernel/l3docstrip.dtx
index 171d20f694..c68ad1c17b 100644
--- a/macros/latex/contrib/l3kernel/l3docstrip.dtx
+++ b/macros/latex/contrib/l3kernel/l3docstrip.dtx
@@ -63,7 +63,7 @@
 %    }^^A
 % }
 %
-% \date{Released 2020-09-24}
+% \date{Released 2020-10-05}
 %
 % \maketitle
 %
diff --git a/macros/latex/contrib/l3kernel/l3docstrip.pdf b/macros/latex/contrib/l3kernel/l3docstrip.pdf
index 057b880d3f..55a73b9176 100644
Binary files a/macros/latex/contrib/l3kernel/l3docstrip.pdf and b/macros/latex/contrib/l3kernel/l3docstrip.pdf differ
diff --git a/macros/latex/contrib/l3kernel/l3expan.dtx b/macros/latex/contrib/l3kernel/l3expan.dtx
index 4c2039f911..2d950678a8 100644
--- a/macros/latex/contrib/l3kernel/l3expan.dtx
+++ b/macros/latex/contrib/l3kernel/l3expan.dtx
@@ -43,7 +43,7 @@
 %    }^^A
 % }
 %
-% \date{Released 2020-09-24}
+% \date{Released 2020-10-05}
 %
 % \maketitle
 %
diff --git a/macros/latex/contrib/l3kernel/l3file.dtx b/macros/latex/contrib/l3kernel/l3file.dtx
index d96d9c7e31..844e4c8fca 100644
--- a/macros/latex/contrib/l3kernel/l3file.dtx
+++ b/macros/latex/contrib/l3kernel/l3file.dtx
@@ -44,7 +44,7 @@
 %    }^^A
 % }
 %
-% \date{Released 2020-09-24}
+% \date{Released 2020-10-05}
 %
 % \maketitle
 %
diff --git a/macros/latex/contrib/l3kernel/l3flag.dtx b/macros/latex/contrib/l3kernel/l3flag.dtx
index 66c065a0e7..5e4e998873 100644
--- a/macros/latex/contrib/l3kernel/l3flag.dtx
+++ b/macros/latex/contrib/l3kernel/l3flag.dtx
@@ -43,7 +43,7 @@
 %    }^^A
 % }
 %
-% \date{Released 2020-09-24}
+% \date{Released 2020-10-05}
 %
 % \maketitle
 %
diff --git a/macros/latex/contrib/l3kernel/l3fp-assign.dtx b/macros/latex/contrib/l3kernel/l3fp-assign.dtx
index cddaff1eba..e6360615a8 100644
--- a/macros/latex/contrib/l3kernel/l3fp-assign.dtx
+++ b/macros/latex/contrib/l3kernel/l3fp-assign.dtx
@@ -40,7 +40,7 @@
 %          {latex-team@latex-project.org}^^A
 %    }^^A
 % }
-% \date{Released 2020-09-24}
+% \date{Released 2020-10-05}
 % \maketitle
 %
 % \begin{documentation}
diff --git a/macros/latex/contrib/l3kernel/l3fp-aux.dtx b/macros/latex/contrib/l3kernel/l3fp-aux.dtx
index 9e917ddb9d..103b75417c 100644
--- a/macros/latex/contrib/l3kernel/l3fp-aux.dtx
+++ b/macros/latex/contrib/l3kernel/l3fp-aux.dtx
@@ -43,7 +43,7 @@
 %    }^^A
 % }
 %
-% \date{Released 2020-09-24}
+% \date{Released 2020-10-05}
 %
 % \maketitle
 %
diff --git a/macros/latex/contrib/l3kernel/l3fp-basics.dtx b/macros/latex/contrib/l3kernel/l3fp-basics.dtx
index 29e30ecc1f..1dbebe5909 100644
--- a/macros/latex/contrib/l3kernel/l3fp-basics.dtx
+++ b/macros/latex/contrib/l3kernel/l3fp-basics.dtx
@@ -40,7 +40,7 @@
 %          {latex-team@latex-project.org}^^A
 %    }^^A
 % }
-% \date{Released 2020-09-24}
+% \date{Released 2020-10-05}
 %
 % \maketitle
 %
diff --git a/macros/latex/contrib/l3kernel/l3fp-convert.dtx b/macros/latex/contrib/l3kernel/l3fp-convert.dtx
index 3b0dd3360e..5532e1e857 100644
--- a/macros/latex/contrib/l3kernel/l3fp-convert.dtx
+++ b/macros/latex/contrib/l3kernel/l3fp-convert.dtx
@@ -43,7 +43,7 @@
 %    }^^A
 % }
 %
-% \date{Released 2020-09-24}
+% \date{Released 2020-10-05}
 %
 % \maketitle
 %
diff --git a/macros/latex/contrib/l3kernel/l3fp-expo.dtx b/macros/latex/contrib/l3kernel/l3fp-expo.dtx
index c86808203c..8581913752 100644
--- a/macros/latex/contrib/l3kernel/l3fp-expo.dtx
+++ b/macros/latex/contrib/l3kernel/l3fp-expo.dtx
@@ -40,7 +40,7 @@
 %          {latex-team@latex-project.org}^^A
 %    }^^A
 % }
-% \date{Released 2020-09-24}
+% \date{Released 2020-10-05}
 %
 % \maketitle
 %
diff --git a/macros/latex/contrib/l3kernel/l3fp-extended.dtx b/macros/latex/contrib/l3kernel/l3fp-extended.dtx
index 7ed1e42736..571d9b8d9c 100644
--- a/macros/latex/contrib/l3kernel/l3fp-extended.dtx
+++ b/macros/latex/contrib/l3kernel/l3fp-extended.dtx
@@ -40,7 +40,7 @@
 %          {latex-team@latex-project.org}^^A
 %    }^^A
 % }
-% \date{Released 2020-09-24}
+% \date{Released 2020-10-05}
 %
 % \maketitle
 %
diff --git a/macros/latex/contrib/l3kernel/l3fp-logic.dtx b/macros/latex/contrib/l3kernel/l3fp-logic.dtx
index 8c0a215652..d879f37c4c 100644
--- a/macros/latex/contrib/l3kernel/l3fp-logic.dtx
+++ b/macros/latex/contrib/l3kernel/l3fp-logic.dtx
@@ -40,7 +40,7 @@
 %          {latex-team@latex-project.org}^^A
 %    }^^A
 % }
-% \date{Released 2020-09-24}
+% \date{Released 2020-10-05}
 %
 % \maketitle
 %
diff --git a/macros/latex/contrib/l3kernel/l3fp-parse.dtx b/macros/latex/contrib/l3kernel/l3fp-parse.dtx
index 7d43b526ea..eec6d0e6fc 100644
--- a/macros/latex/contrib/l3kernel/l3fp-parse.dtx
+++ b/macros/latex/contrib/l3kernel/l3fp-parse.dtx
@@ -40,7 +40,7 @@
 %          {latex-team@latex-project.org}^^A
 %    }^^A
 % }
-% \date{Released 2020-09-24}
+% \date{Released 2020-10-05}
 %
 % \maketitle
 %
diff --git a/macros/latex/contrib/l3kernel/l3fp-random.dtx b/macros/latex/contrib/l3kernel/l3fp-random.dtx
index 7a125bc22f..0fd6de01af 100644
--- a/macros/latex/contrib/l3kernel/l3fp-random.dtx
+++ b/macros/latex/contrib/l3kernel/l3fp-random.dtx
@@ -40,7 +40,7 @@
 %          {latex-team@latex-project.org}^^A
 %    }^^A
 % }
-% \date{Released 2020-09-24}
+% \date{Released 2020-10-05}
 %
 % \maketitle
 %
diff --git a/macros/latex/contrib/l3kernel/l3fp-round.dtx b/macros/latex/contrib/l3kernel/l3fp-round.dtx
index 551902b58b..d2bb632e59 100644
--- a/macros/latex/contrib/l3kernel/l3fp-round.dtx
+++ b/macros/latex/contrib/l3kernel/l3fp-round.dtx
@@ -43,7 +43,7 @@
 %    }^^A
 % }
 %
-% \date{Released 2020-09-24}
+% \date{Released 2020-10-05}
 %
 % \maketitle
 %
diff --git a/macros/latex/contrib/l3kernel/l3fp-traps.dtx b/macros/latex/contrib/l3kernel/l3fp-traps.dtx
index 89f47bfafc..1f297f069a 100644
--- a/macros/latex/contrib/l3kernel/l3fp-traps.dtx
+++ b/macros/latex/contrib/l3kernel/l3fp-traps.dtx
@@ -40,7 +40,7 @@
 %          {latex-team@latex-project.org}^^A
 %    }^^A
 % }
-% \date{Released 2020-09-24}
+% \date{Released 2020-10-05}
 % \maketitle
 %
 % \begin{documentation}
diff --git a/macros/latex/contrib/l3kernel/l3fp-trig.dtx b/macros/latex/contrib/l3kernel/l3fp-trig.dtx
index 319e825bd0..3cea7ebdb6 100644
--- a/macros/latex/contrib/l3kernel/l3fp-trig.dtx
+++ b/macros/latex/contrib/l3kernel/l3fp-trig.dtx
@@ -40,7 +40,7 @@
 %          {latex-team@latex-project.org}^^A
 %    }^^A
 % }
-% \date{Released 2020-09-24}
+% \date{Released 2020-10-05}
 %
 % \maketitle
 %
diff --git a/macros/latex/contrib/l3kernel/l3fp.dtx b/macros/latex/contrib/l3kernel/l3fp.dtx
index 144a59bb7e..34d87040f0 100644
--- a/macros/latex/contrib/l3kernel/l3fp.dtx
+++ b/macros/latex/contrib/l3kernel/l3fp.dtx
@@ -49,7 +49,7 @@
 %    }^^A
 % }
 %
-% \date{Released 2020-09-24}
+% \date{Released 2020-10-05}
 %
 % \maketitle
 %
diff --git a/macros/latex/contrib/l3kernel/l3fparray.dtx b/macros/latex/contrib/l3kernel/l3fparray.dtx
index 41824d7478..4a521269bb 100644
--- a/macros/latex/contrib/l3kernel/l3fparray.dtx
+++ b/macros/latex/contrib/l3kernel/l3fparray.dtx
@@ -44,7 +44,7 @@
 %    }^^A
 % }
 %
-% \date{Released 2020-09-24}
+% \date{Released 2020-10-05}
 %
 % \maketitle
 %
diff --git a/macros/latex/contrib/l3kernel/l3int.dtx b/macros/latex/contrib/l3kernel/l3int.dtx
index 175a9e07dd..b4624576be 100644
--- a/macros/latex/contrib/l3kernel/l3int.dtx
+++ b/macros/latex/contrib/l3kernel/l3int.dtx
@@ -43,7 +43,7 @@
 %    }^^A
 % }
 %
-% \date{Released 2020-09-24}
+% \date{Released 2020-10-05}
 %
 % \maketitle
 %
diff --git a/macros/latex/contrib/l3kernel/l3intarray.dtx b/macros/latex/contrib/l3kernel/l3intarray.dtx
index dbeddb1ca1..022e084f53 100644
--- a/macros/latex/contrib/l3kernel/l3intarray.dtx
+++ b/macros/latex/contrib/l3kernel/l3intarray.dtx
@@ -44,7 +44,7 @@
 %    }^^A
 % }
 %
-% \date{Released 2020-09-24}
+% \date{Released 2020-10-05}
 %
 % \maketitle
 %
diff --git a/macros/latex/contrib/l3kernel/l3kernel-functions.dtx b/macros/latex/contrib/l3kernel/l3kernel-functions.dtx
index c7a577d8ba..81c9ca1e05 100644
--- a/macros/latex/contrib/l3kernel/l3kernel-functions.dtx
+++ b/macros/latex/contrib/l3kernel/l3kernel-functions.dtx
@@ -43,7 +43,7 @@
 %    }^^A
 % }
 %
-% \date{Released 2020-09-24}
+% \date{Released 2020-10-05}
 %
 % \maketitle
 %
diff --git a/macros/latex/contrib/l3kernel/l3keys.dtx b/macros/latex/contrib/l3kernel/l3keys.dtx
index 3e79e8c464..f512bd2517 100644
--- a/macros/latex/contrib/l3kernel/l3keys.dtx
+++ b/macros/latex/contrib/l3kernel/l3keys.dtx
@@ -43,7 +43,7 @@
 %    }^^A
 % }
 %
-% \date{Released 2020-09-24}
+% \date{Released 2020-10-05}
 %
 % \maketitle
 %
diff --git a/macros/latex/contrib/l3kernel/l3legacy.dtx b/macros/latex/contrib/l3kernel/l3legacy.dtx
index f5453f5fe1..872d9b5aa4 100644
--- a/macros/latex/contrib/l3kernel/l3legacy.dtx
+++ b/macros/latex/contrib/l3kernel/l3legacy.dtx
@@ -43,7 +43,7 @@
 %    }^^A
 % }
 %
-% \date{Released 2020-09-24}
+% \date{Released 2020-10-05}
 %
 % \maketitle
 %
diff --git a/macros/latex/contrib/l3kernel/l3luatex.dtx b/macros/latex/contrib/l3kernel/l3luatex.dtx
index ca26662658..60fd7e22fb 100644
--- a/macros/latex/contrib/l3kernel/l3luatex.dtx
+++ b/macros/latex/contrib/l3kernel/l3luatex.dtx
@@ -43,7 +43,7 @@
 %    }^^A
 % }
 %
-% \date{Released 2020-09-24}
+% \date{Released 2020-10-05}
 %
 % \maketitle
 %
diff --git a/macros/latex/contrib/l3kernel/l3msg.dtx b/macros/latex/contrib/l3kernel/l3msg.dtx
index 56040ef207..7e2c59a712 100644
--- a/macros/latex/contrib/l3kernel/l3msg.dtx
+++ b/macros/latex/contrib/l3kernel/l3msg.dtx
@@ -43,7 +43,7 @@
 %    }^^A
 % }
 %
-% \date{Released 2020-09-24}
+% \date{Released 2020-10-05}
 %
 % \maketitle
 %
diff --git a/macros/latex/contrib/l3kernel/l3names.dtx b/macros/latex/contrib/l3kernel/l3names.dtx
index e7b7a0e50a..0a4fe07d50 100644
--- a/macros/latex/contrib/l3kernel/l3names.dtx
+++ b/macros/latex/contrib/l3kernel/l3names.dtx
@@ -43,7 +43,7 @@
 %    }^^A
 % }
 %
-% \date{Released 2020-09-24}
+% \date{Released 2020-10-05}
 %
 % \maketitle
 %
@@ -1464,12 +1464,17 @@
 %   Here \enquote{smaller} refers to codepoint order which does not correspond to
 %   the user expected order for most non-ASCII strings.
 %    \begin{macrocode}
+local minus_tok = token.new(string.byte'-', 12)
+local zero_tok = token.new(string.byte'0', 12)
+local one_tok = token.new(string.byte'1', 12)
 luacmd('tex_strcmp:D', function()
   local first = scan_string()
   local second = scan_string()
-  write(first == second and '0'
-     or first < second and '-1'
-     or '1')
+  if first < second then
+    put_next(minus_tok, one_tok)
+  else
+    put_next(first == second and zero_tok or one_tok)
+  end
 end, 'global')
 %    \end{macrocode}
 % \end{macro}
diff --git a/macros/latex/contrib/l3kernel/l3news.pdf b/macros/latex/contrib/l3kernel/l3news.pdf
index 85d68ca396..f9308d56e2 100644
Binary files a/macros/latex/contrib/l3kernel/l3news.pdf and b/macros/latex/contrib/l3kernel/l3news.pdf differ
diff --git a/macros/latex/contrib/l3kernel/l3news01.pdf b/macros/latex/contrib/l3kernel/l3news01.pdf
index 24fabf8f76..b03a1bb305 100644
Binary files a/macros/latex/contrib/l3kernel/l3news01.pdf and b/macros/latex/contrib/l3kernel/l3news01.pdf differ
diff --git a/macros/latex/contrib/l3kernel/l3news02.pdf b/macros/latex/contrib/l3kernel/l3news02.pdf
index 291ac8d6e2..dfa67fdf1f 100644
Binary files a/macros/latex/contrib/l3kernel/l3news02.pdf and b/macros/latex/contrib/l3kernel/l3news02.pdf differ
diff --git a/macros/latex/contrib/l3kernel/l3news03.pdf b/macros/latex/contrib/l3kernel/l3news03.pdf
index 9e7dd26e24..bdb7487e3e 100644
Binary files a/macros/latex/contrib/l3kernel/l3news03.pdf and b/macros/latex/contrib/l3kernel/l3news03.pdf differ
diff --git a/macros/latex/contrib/l3kernel/l3news04.pdf b/macros/latex/contrib/l3kernel/l3news04.pdf
index bfb74bced2..7c1df5cdbf 100644
Binary files a/macros/latex/contrib/l3kernel/l3news04.pdf and b/macros/latex/contrib/l3kernel/l3news04.pdf differ
diff --git a/macros/latex/contrib/l3kernel/l3news05.pdf b/macros/latex/contrib/l3kernel/l3news05.pdf
index afcd4e9d36..9987dcd1eb 100644
Binary files a/macros/latex/contrib/l3kernel/l3news05.pdf and b/macros/latex/contrib/l3kernel/l3news05.pdf differ
diff --git a/macros/latex/contrib/l3kernel/l3news06.pdf b/macros/latex/contrib/l3kernel/l3news06.pdf
index 20cba420c3..82f432de52 100644
Binary files a/macros/latex/contrib/l3kernel/l3news06.pdf and b/macros/latex/contrib/l3kernel/l3news06.pdf differ
diff --git a/macros/latex/contrib/l3kernel/l3news07.pdf b/macros/latex/contrib/l3kernel/l3news07.pdf
index 09b667c8f3..fde7e247a0 100644
Binary files a/macros/latex/contrib/l3kernel/l3news07.pdf and b/macros/latex/contrib/l3kernel/l3news07.pdf differ
diff --git a/macros/latex/contrib/l3kernel/l3news08.pdf b/macros/latex/contrib/l3kernel/l3news08.pdf
index 90598b9c33..aba29f06bf 100644
Binary files a/macros/latex/contrib/l3kernel/l3news08.pdf and b/macros/latex/contrib/l3kernel/l3news08.pdf differ
diff --git a/macros/latex/contrib/l3kernel/l3news09.pdf b/macros/latex/contrib/l3kernel/l3news09.pdf
index f49ebc28ba..9ab6e1c83a 100644
Binary files a/macros/latex/contrib/l3kernel/l3news09.pdf and b/macros/latex/contrib/l3kernel/l3news09.pdf differ
diff --git a/macros/latex/contrib/l3kernel/l3news10.pdf b/macros/latex/contrib/l3kernel/l3news10.pdf
index 636cf07342..31d2e513d8 100644
Binary files a/macros/latex/contrib/l3kernel/l3news10.pdf and b/macros/latex/contrib/l3kernel/l3news10.pdf differ
diff --git a/macros/latex/contrib/l3kernel/l3news11.pdf b/macros/latex/contrib/l3kernel/l3news11.pdf
index 62c41629d9..a5ba6e366b 100644
Binary files a/macros/latex/contrib/l3kernel/l3news11.pdf and b/macros/latex/contrib/l3kernel/l3news11.pdf differ
diff --git a/macros/latex/contrib/l3kernel/l3news12.pdf b/macros/latex/contrib/l3kernel/l3news12.pdf
index fe33650fcf..043c436177 100644
Binary files a/macros/latex/contrib/l3kernel/l3news12.pdf and b/macros/latex/contrib/l3kernel/l3news12.pdf differ
diff --git a/macros/latex/contrib/l3kernel/l3prefixes.csv b/macros/latex/contrib/l3kernel/l3prefixes.csv
index 1ec250856c..b51851ffec 100644
--- a/macros/latex/contrib/l3kernel/l3prefixes.csv
+++ b/macros/latex/contrib/l3kernel/l3prefixes.csv
@@ -147,6 +147,7 @@ percent,l3kernel,The LaTeX3 Project,https://www.latex-project.org/latex3.html,ht
 pgf,pgf,The PGF/TikZ Team,https://pgf-tikz.github.io,https://github.com/pgf-tikz/pgf,https://github.com/pgf-tikz/pgf/issues,2020-07-03,2020-07-03,
 pi,l3kernel,The LaTeX3 Project,https://www.latex-project.org/latex3.html,https://github.com/latex3/latex3.git,https://github.com/latex3/latex3/issues,2018-05-12,2018-05-12,
 pkgploader,pkgploader,Michiel Helvensteijn,,,,2014-02-05,2014-02-05,
+platex,platex,Japanese TeX Development Community,https://github.com/texjporg/platex,https://github.com/texjporg/platex.git,https://github.com/texjporg/platex/issues,2020-09-30,2020-09-30,
 polyglossia,polyglossia,Arthur Reutenauer,https://www.polyglossia.org/,https://github.com/reutenauer/polyglossia,https://github.com/reutenauer/polyglossia/issues,2019-09-03,,
 prg,l3kernel,The LaTeX3 Project,https://www.latex-project.org/latex3.html,https://github.com/latex3/latex3.git,https://github.com/latex3/latex3/issues,2012-09-27,2012-09-27,
 primargs,morewrites,Bruno Le Floch,https://github.com/blefloch/latex-morewrites,https://github.com/blefloch/latex-morewrites.git,https://github.com/blefloch/latex-morewrites/issues,2013-03-16,2015-09-22,
diff --git a/macros/latex/contrib/l3kernel/l3prefixes.pdf b/macros/latex/contrib/l3kernel/l3prefixes.pdf
index 5a97242228..820a86d56f 100644
Binary files a/macros/latex/contrib/l3kernel/l3prefixes.pdf and b/macros/latex/contrib/l3kernel/l3prefixes.pdf differ
diff --git a/macros/latex/contrib/l3kernel/l3prg.dtx b/macros/latex/contrib/l3kernel/l3prg.dtx
index 882e0367af..704612a0f9 100644
--- a/macros/latex/contrib/l3kernel/l3prg.dtx
+++ b/macros/latex/contrib/l3kernel/l3prg.dtx
@@ -43,7 +43,7 @@
 %    }^^A
 % }
 %
-% \date{Released 2020-09-24}
+% \date{Released 2020-10-05}
 %
 % \maketitle
 %
diff --git a/macros/latex/contrib/l3kernel/l3prop.dtx b/macros/latex/contrib/l3kernel/l3prop.dtx
index 0f10a77def..4d2c6cbe05 100644
--- a/macros/latex/contrib/l3kernel/l3prop.dtx
+++ b/macros/latex/contrib/l3kernel/l3prop.dtx
@@ -43,7 +43,7 @@
 %    }^^A
 % }
 %
-% \date{Released 2020-09-24}
+% \date{Released 2020-10-05}
 %
 % \maketitle
 %
diff --git a/macros/latex/contrib/l3kernel/l3quark.dtx b/macros/latex/contrib/l3kernel/l3quark.dtx
index 0251fc2e82..6827debe15 100644
--- a/macros/latex/contrib/l3kernel/l3quark.dtx
+++ b/macros/latex/contrib/l3kernel/l3quark.dtx
@@ -43,7 +43,7 @@
 %    }^^A
 % }
 %
-% \date{Released 2020-09-24}
+% \date{Released 2020-10-05}
 %
 % \maketitle
 %
diff --git a/macros/latex/contrib/l3kernel/l3regex.dtx b/macros/latex/contrib/l3kernel/l3regex.dtx
index 4d63d5bd80..62fd8c4e94 100644
--- a/macros/latex/contrib/l3kernel/l3regex.dtx
+++ b/macros/latex/contrib/l3kernel/l3regex.dtx
@@ -43,7 +43,7 @@
 %    }^^A
 % }
 %
-% \date{Released 2020-09-24}
+% \date{Released 2020-10-05}
 %
 % \maketitle
 %
diff --git a/macros/latex/contrib/l3kernel/l3seq.dtx b/macros/latex/contrib/l3kernel/l3seq.dtx
index 63156f66da..51c9ec07a1 100644
--- a/macros/latex/contrib/l3kernel/l3seq.dtx
+++ b/macros/latex/contrib/l3kernel/l3seq.dtx
@@ -43,7 +43,7 @@
 %    }^^A
 % }
 %
-% \date{Released 2020-09-24}
+% \date{Released 2020-10-05}
 %
 % \maketitle
 %
diff --git a/macros/latex/contrib/l3kernel/l3skip.dtx b/macros/latex/contrib/l3kernel/l3skip.dtx
index d9ea8d1e20..41ee426e40 100644
--- a/macros/latex/contrib/l3kernel/l3skip.dtx
+++ b/macros/latex/contrib/l3kernel/l3skip.dtx
@@ -44,7 +44,7 @@
 %    }^^A
 % }
 %
-% \date{Released 2020-09-24}
+% \date{Released 2020-10-05}
 %
 % \maketitle
 %
diff --git a/macros/latex/contrib/l3kernel/l3sort.dtx b/macros/latex/contrib/l3kernel/l3sort.dtx
index 55471855e0..58fa850b36 100644
--- a/macros/latex/contrib/l3kernel/l3sort.dtx
+++ b/macros/latex/contrib/l3kernel/l3sort.dtx
@@ -43,7 +43,7 @@
 %    }^^A
 % }
 %
-% \date{Released 2020-09-24}
+% \date{Released 2020-10-05}
 %
 % \maketitle
 %
diff --git a/macros/latex/contrib/l3kernel/l3str-convert.dtx b/macros/latex/contrib/l3kernel/l3str-convert.dtx
index 805a3ebeb3..ee01d9e5b0 100644
--- a/macros/latex/contrib/l3kernel/l3str-convert.dtx
+++ b/macros/latex/contrib/l3kernel/l3str-convert.dtx
@@ -44,7 +44,7 @@
 %    }^^A
 % }
 %
-% \date{Released 2020-09-24}
+% \date{Released 2020-10-05}
 %
 % \maketitle
 %
diff --git a/macros/latex/contrib/l3kernel/l3str.dtx b/macros/latex/contrib/l3kernel/l3str.dtx
index a7731373d2..7a992f4cff 100644
--- a/macros/latex/contrib/l3kernel/l3str.dtx
+++ b/macros/latex/contrib/l3kernel/l3str.dtx
@@ -43,7 +43,7 @@
 %    }^^A
 % }
 %
-% \date{Released 2020-09-24}
+% \date{Released 2020-10-05}
 %
 % \maketitle
 %
diff --git a/macros/latex/contrib/l3kernel/l3styleguide.pdf b/macros/latex/contrib/l3kernel/l3styleguide.pdf
index b8ac3f7d17..500dc3de31 100644
Binary files a/macros/latex/contrib/l3kernel/l3styleguide.pdf and b/macros/latex/contrib/l3kernel/l3styleguide.pdf differ
diff --git a/macros/latex/contrib/l3kernel/l3styleguide.tex b/macros/latex/contrib/l3kernel/l3styleguide.tex
index 1a16ec70a3..05b109dd10 100644
--- a/macros/latex/contrib/l3kernel/l3styleguide.tex
+++ b/macros/latex/contrib/l3kernel/l3styleguide.tex
@@ -32,7 +32,7 @@ The released version of this bundle is available from CTAN.
         {latex-team@latex-project.org}%
     }%
 }
-\date{Released 2020-09-24}
+\date{Released 2020-10-05}
 
 \begin{document}
 
diff --git a/macros/latex/contrib/l3kernel/l3syntax-changes.pdf b/macros/latex/contrib/l3kernel/l3syntax-changes.pdf
index 6ebb091dee..5198452397 100644
Binary files a/macros/latex/contrib/l3kernel/l3syntax-changes.pdf and b/macros/latex/contrib/l3kernel/l3syntax-changes.pdf differ
diff --git a/macros/latex/contrib/l3kernel/l3syntax-changes.tex b/macros/latex/contrib/l3kernel/l3syntax-changes.tex
index f9a7680bf8..da8657d584 100644
--- a/macros/latex/contrib/l3kernel/l3syntax-changes.tex
+++ b/macros/latex/contrib/l3kernel/l3syntax-changes.tex
@@ -32,7 +32,7 @@ The released version of this bundle is available from CTAN.
         {latex-team@latex-project.org}%
     }%
 }
-\date{Released 2020-09-24}
+\date{Released 2020-10-05}
 
 \newcommand{\TF}{\textit{(TF)}}
 
diff --git a/macros/latex/contrib/l3kernel/l3sys.dtx b/macros/latex/contrib/l3kernel/l3sys.dtx
index 6ca5313c50..ff694adb60 100644
--- a/macros/latex/contrib/l3kernel/l3sys.dtx
+++ b/macros/latex/contrib/l3kernel/l3sys.dtx
@@ -43,7 +43,7 @@
 %    }^^A
 % }
 %
-% \date{Released 2020-09-24}
+% \date{Released 2020-10-05}
 %
 % \maketitle
 %
diff --git a/macros/latex/contrib/l3kernel/l3term-glossary.pdf b/macros/latex/contrib/l3kernel/l3term-glossary.pdf
index 85f5bc67fd..44bdf57b85 100644
Binary files a/macros/latex/contrib/l3kernel/l3term-glossary.pdf and b/macros/latex/contrib/l3kernel/l3term-glossary.pdf differ
diff --git a/macros/latex/contrib/l3kernel/l3term-glossary.tex b/macros/latex/contrib/l3kernel/l3term-glossary.tex
index 140525f76e..42efb4ad30 100644
--- a/macros/latex/contrib/l3kernel/l3term-glossary.tex
+++ b/macros/latex/contrib/l3kernel/l3term-glossary.tex
@@ -32,7 +32,7 @@ The released version of this bundle is available from CTAN.
         {latex-team@latex-project.org}%
     }%
 }
-\date{Released 2020-09-24}
+\date{Released 2020-10-05}
 
 \newcommand{\TF}{\textit{(TF)}}
 
diff --git a/macros/latex/contrib/l3kernel/l3text-case.dtx b/macros/latex/contrib/l3kernel/l3text-case.dtx
index b89de90efd..3f8f381063 100644
--- a/macros/latex/contrib/l3kernel/l3text-case.dtx
+++ b/macros/latex/contrib/l3kernel/l3text-case.dtx
@@ -43,7 +43,7 @@
 %    }^^A
 % }
 %
-% \date{Released 2020-09-24}
+% \date{Released 2020-10-05}
 %
 % \maketitle
 %
diff --git a/macros/latex/contrib/l3kernel/l3text-purify.dtx b/macros/latex/contrib/l3kernel/l3text-purify.dtx
index 4833e91f41..b2f0b59fab 100644
--- a/macros/latex/contrib/l3kernel/l3text-purify.dtx
+++ b/macros/latex/contrib/l3kernel/l3text-purify.dtx
@@ -43,7 +43,7 @@
 %    }^^A
 % }
 %
-% \date{Released 2020-09-24}
+% \date{Released 2020-10-05}
 %
 % \maketitle
 %
diff --git a/macros/latex/contrib/l3kernel/l3text.dtx b/macros/latex/contrib/l3kernel/l3text.dtx
index 325b7f2763..3672f46177 100644
--- a/macros/latex/contrib/l3kernel/l3text.dtx
+++ b/macros/latex/contrib/l3kernel/l3text.dtx
@@ -43,7 +43,7 @@
 %    }^^A
 % }
 %
-% \date{Released 2020-09-24}
+% \date{Released 2020-10-05}
 %
 % \maketitle
 %
@@ -852,6 +852,7 @@
         \@@_expand_loop:w 
       }
   }
+%    \end{macrocode}
 %   Next we exclude math commands: this is mainly as there \emph{might} be an
 %   \cs{ensuremath}. We also handle accents, which are basically the same issue
 %   but are kept separate for semantic reasons.
@@ -922,7 +923,9 @@
     \exp_not:N \str_if_eq:nnTF {#1} { \exp_not:N \protect }
       { \exp_not:N \@@_expand_protect:N }
       {
-        \cs_if_exist:cTF { @current@cmd }
+        \bool_lazy_and:nnTF
+          { \cs_if_exist_p:N \fmtname }
+          { \str_if_eq_p:Vn \fmtname { LaTeX2e } }
           { \exp_not:N \@@_expand_encoding:N #1 }
           { \exp_not:N \@@_expand_replace:N #1 }
       }
@@ -950,16 +953,11 @@
 %    \begin{macrocode}
 \cs_new:Npn \@@_expand_encoding:N #1
   {
-    \cs_if_eq:NNTF #1 \@current@cmd
+    \bool_lazy_or:nnTF
+      { \cs_if_eq_p:NN  #1 \@current@cmd }
+      { \cs_if_eq_p:NN  #1 \@changed@cmd }
       { \exp_after:wN \@@_expand_loop:w \@@_expand_encoding_escape:NN }
-      {
-        \cs_if_eq:NNTF #1 \@changed@cmd
-          {
-            \exp_after:wN \@@_expand_loop:w
-              \@@_expand_encoding_escape:NN
-          }
-          { \@@_expand_replace:N #1 }
-      }
+      { \@@_expand_replace:N #1 }
   }
 \cs_new:Npn \@@_expand_encoding_escape:NN #1#2 { \exp_not:n {#1} }
 %    \end{macrocode}
diff --git a/macros/latex/contrib/l3kernel/l3tl-analysis.dtx b/macros/latex/contrib/l3kernel/l3tl-analysis.dtx
index 55559abdbb..3f87c17abb 100644
--- a/macros/latex/contrib/l3kernel/l3tl-analysis.dtx
+++ b/macros/latex/contrib/l3kernel/l3tl-analysis.dtx
@@ -44,7 +44,7 @@
 %    }^^A
 % }
 %
-% \date{Released 2020-09-24}
+% \date{Released 2020-10-05}
 %
 % \maketitle
 %
diff --git a/macros/latex/contrib/l3kernel/l3tl.dtx b/macros/latex/contrib/l3kernel/l3tl.dtx
index 7ac12bb127..2ef110b383 100644
--- a/macros/latex/contrib/l3kernel/l3tl.dtx
+++ b/macros/latex/contrib/l3kernel/l3tl.dtx
@@ -43,7 +43,7 @@
 %    }^^A
 % }
 %
-% \date{Released 2020-09-24}
+% \date{Released 2020-10-05}
 %
 % \maketitle
 %
diff --git a/macros/latex/contrib/l3kernel/l3token.dtx b/macros/latex/contrib/l3kernel/l3token.dtx
index 6d3f13581f..dabd6ea6ac 100644
--- a/macros/latex/contrib/l3kernel/l3token.dtx
+++ b/macros/latex/contrib/l3kernel/l3token.dtx
@@ -43,7 +43,7 @@
 %    }^^A
 % }
 %
-% \date{Released 2020-09-24}
+% \date{Released 2020-10-05}
 %
 % \maketitle
 %
diff --git a/macros/latex/contrib/l3kernel/l3unicode.dtx b/macros/latex/contrib/l3kernel/l3unicode.dtx
index 3cc420f68f..644d30f90f 100644
--- a/macros/latex/contrib/l3kernel/l3unicode.dtx
+++ b/macros/latex/contrib/l3kernel/l3unicode.dtx
@@ -43,7 +43,7 @@
 %    }^^A
 % }
 %
-% \date{Released 2020-09-24}
+% \date{Released 2020-10-05}
 %
 % \maketitle
 %
diff --git a/macros/latex/contrib/l3kernel/source3.pdf b/macros/latex/contrib/l3kernel/source3.pdf
index 7994f7f8cf..43709c4c56 100644
Binary files a/macros/latex/contrib/l3kernel/source3.pdf and b/macros/latex/contrib/l3kernel/source3.pdf differ
diff --git a/macros/latex/contrib/l3kernel/source3.tex b/macros/latex/contrib/l3kernel/source3.tex
index 9ae358c63f..2d31c20423 100644
--- a/macros/latex/contrib/l3kernel/source3.tex
+++ b/macros/latex/contrib/l3kernel/source3.tex
@@ -53,7 +53,7 @@ for those people who are interested.
          {latex-team@latex-project.org}%
    }%
 }
-\date{Released 2020-09-24}
+\date{Released 2020-10-05}
 
 \pagenumbering{roman}
 \maketitle
diff --git a/macros/latex/contrib/l3packages/CHANGELOG.md b/macros/latex/contrib/l3packages/CHANGELOG.md
index d68f55467b..4ea7d2c4bc 100644
--- a/macros/latex/contrib/l3packages/CHANGELOG.md
+++ b/macros/latex/contrib/l3packages/CHANGELOG.md
@@ -7,8 +7,17 @@ this project uses date-based 'snapshot' version identifiers.
 
 ## [Unreleased]
 
+## [2020-10-05]
+
+### Changed
+- Load generic code using `\input` not `\file_input:n` to avoid an issue
+  when `openin_any = p` is set
+
 ## [2020-05-15]
 
+### Changed
+- Internal packaging of `xparse` in advance of changes to the LaTeX2e kernel
+
 ## [2020-05-14]
 
 ### Changed
@@ -99,7 +108,8 @@ this project uses date-based 'snapshot' version identifiers.
 - Switch to ISO date format
 - Improve cross-module use of internal functions
 
-[Unreleased]: https://github.com/latex3/latex3/compare/2020-05-15...HEAD
+[Unreleased]: https://github.com/latex3/latex3/compare/2020-10-05...HEAD
+[2020-10-05]: https://github.com/latex3/latex3/compare/2020-05-15...2020-10-05
 [2020-05-15]: https://github.com/latex3/latex3/compare/2020-05-14...2020-05-15
 [2020-05-14]: https://github.com/latex3/latex3/compare/2020-03-06...2020-05-14
 [2020-03-06]: https://github.com/latex3/latex3/compare/2020-03-03...2020-03-06
diff --git a/macros/latex/contrib/l3packages/README.md b/macros/latex/contrib/l3packages/README.md
index 3861dad168..0e62682ca9 100644
--- a/macros/latex/contrib/l3packages/README.md
+++ b/macros/latex/contrib/l3packages/README.md
@@ -1,7 +1,7 @@
 LaTeX3 High-Level Concepts
 ==========================
 
-Release 2020-05-15
+Release 2020-10-05
 
 Overview
 --------
diff --git a/macros/latex/contrib/l3packages/l3keys2e.dtx b/macros/latex/contrib/l3packages/l3keys2e.dtx
index 16aefcf57c..0e9a03e2f0 100644
--- a/macros/latex/contrib/l3packages/l3keys2e.dtx
+++ b/macros/latex/contrib/l3packages/l3keys2e.dtx
@@ -62,7 +62,7 @@
 %    }^^A
 % }
 %
-% \date{Released 2020-05-15}
+% \date{Released 2020-10-05}
 %
 % \maketitle
 %
@@ -139,7 +139,7 @@
 %    \end{macrocode}
 %
 %    \begin{macrocode}
-\ProvidesExplPackage{l3keys2e}{2020-05-15}{}
+\ProvidesExplPackage{l3keys2e}{2020-10-05}{}
   {LaTeX2e option processing using LaTeX3 keys}
 %    \end{macrocode}
 %
diff --git a/macros/latex/contrib/l3packages/l3keys2e.pdf b/macros/latex/contrib/l3packages/l3keys2e.pdf
index 6d04dfcbc5..5e1361961d 100644
Binary files a/macros/latex/contrib/l3packages/l3keys2e.pdf and b/macros/latex/contrib/l3packages/l3keys2e.pdf differ
diff --git a/macros/latex/contrib/l3packages/xfp.dtx b/macros/latex/contrib/l3packages/xfp.dtx
index 05ab4415dd..1169bf7689 100644
--- a/macros/latex/contrib/l3packages/xfp.dtx
+++ b/macros/latex/contrib/l3packages/xfp.dtx
@@ -64,7 +64,7 @@
 %    }^^A
 % }
 %
-% \date{Released 2020-05-15}
+% \date{Released 2020-10-05}
 %
 % \maketitle
 %
@@ -167,7 +167,7 @@
 %    \end{macrocode}
 %
 %    \begin{macrocode}
-\ProvidesExplPackage{xfp}{2020-05-15}{}
+\ProvidesExplPackage{xfp}{2020-10-05}{}
   {L3 Floating point unit}
 %    \end{macrocode}
 %
diff --git a/macros/latex/contrib/l3packages/xfp.pdf b/macros/latex/contrib/l3packages/xfp.pdf
index dea76ec62c..7aa7032aed 100644
Binary files a/macros/latex/contrib/l3packages/xfp.pdf and b/macros/latex/contrib/l3packages/xfp.pdf differ
diff --git a/macros/latex/contrib/l3packages/xfrac.dtx b/macros/latex/contrib/l3packages/xfrac.dtx
index 5ff7e2b98f..5c6fcbbb99 100644
--- a/macros/latex/contrib/l3packages/xfrac.dtx
+++ b/macros/latex/contrib/l3packages/xfrac.dtx
@@ -65,7 +65,7 @@
 %    }^^A
 % }
 %
-% \date{Released 2020-05-15}
+% \date{Released 2020-10-05}
 %
 % \maketitle
 %
@@ -535,7 +535,7 @@
 %    \end{macrocode}
 %
 %    \begin{macrocode}
-\ProvidesExplPackage{xfrac}{2020-05-15}{}
+\ProvidesExplPackage{xfrac}{2020-10-05}{}
   {L3 Experimental split-level fractions}
 %    \end{macrocode}
 %
diff --git a/macros/latex/contrib/l3packages/xfrac.pdf b/macros/latex/contrib/l3packages/xfrac.pdf
index 17dbaeaee1..696c5f1ca4 100644
Binary files a/macros/latex/contrib/l3packages/xfrac.pdf and b/macros/latex/contrib/l3packages/xfrac.pdf differ
diff --git a/macros/latex/contrib/l3packages/xparse.dtx b/macros/latex/contrib/l3packages/xparse.dtx
index fe2df64f5f..dd40f2c2ad 100644
--- a/macros/latex/contrib/l3packages/xparse.dtx
+++ b/macros/latex/contrib/l3packages/xparse.dtx
@@ -67,7 +67,7 @@
 %    }^^A
 % }
 %
-% \date{Released 2020-05-15}
+% \date{Released 2020-10-05}
 %
 % \maketitle
 %
@@ -984,7 +984,7 @@
 %
 %    \begin{macrocode}
 %<*package>
-\ProvidesExplPackage{xparse}{2020-05-15}{}
+\ProvidesExplPackage{xparse}{2020-10-05}{}
   {L3 Experimental document command parser}
 %    \end{macrocode}
 %
@@ -1034,30 +1034,19 @@
 %</core>
 %    \end{macrocode}
 %
-%  Load the core code.
+%  Load the core code. We use \tn{input} here as there can be
+%  an issue if the user has |openin_any = p| with older binaries.
 %    \begin{macrocode}
 %<*2ekernel|package>
-\file_input:n { xparse-generic.tex }
+\input { xparse-generic.tex }
 %</2ekernel|package>
 %    \end{macrocode}
 %
 % \subsection{Variables and constants}
 %
 %    \begin{macrocode}
-%<*core|initex>
-%    \end{macrocode}
-%
-% \begin{variable}{\c_@@_special_chars_seq}
-%   In \IniTeX{} mode, we store special characters in a sequence.
-%   Maybe |$| or |&| will have to be added later.
-%    \begin{macrocode}
-%<*initex>
-\seq_new:N \c_@@_special_chars_seq
-\seq_set_split:Nnn \c_@@_special_chars_seq { }
-  { \  \\ \{ \} \# \^ \_ \% \~ }
-%</initex>
+%<*core>
 %    \end{macrocode}
-% \end{variable}
 %
 % \begin{variable}{\l_@@_arg_spec_tl}
 %   Holds the argument specification after normalization of shorthands.
@@ -1484,12 +1473,7 @@
     \str_set:Nx \l_@@_environment_str {#1}
     \str_set:Nx \l_@@_environment_str
       { \tl_trim_spaces:o { \l_@@_environment_str } }
-%<*initex>
-    \cs_if_exist:cTF { environment~ \l_@@_environment_str }
-%</initex>
-%<*core>
     \cs_if_exist:cTF { \l_@@_environment_str }
-%</core>
       {
         \__kernel_msg_info:nnxx { xparse } { redefine-environment }
           { \l_@@_environment_str } { \tl_to_str:n {#2} }
@@ -1535,10 +1519,8 @@
         \cs_generate_from_arg_count:cNnn
           { environment~ #1 ~end~aux~ } \cs_set:Npn
           \l_@@_current_arg_int {#4}
-%<*core>
         \cs_set_eq:cc {#1}       { environment~ #1 }
         \cs_set_eq:cc { end #1 } { environment~ #1 ~end }
-%</core>
       }
   }
 %    \end{macrocode}
@@ -1558,9 +1540,7 @@
 %    \begin{macrocode}
 \cs_new_protected:Npn \@@_start_env:nnnnn #1#2
   {
-%<*core>
     \cs_if_exist_use:N \conditionally@traceoff
-%</core>
     \str_set:Nn \l_@@_environment_str {#2}
     \bool_set_true:N \l_@@_environment_bool
     \@@_start_aux:ccnnnn
@@ -1570,9 +1550,7 @@
   }
 \cs_new_protected:Npx \@@_start:nNNnnn #1#2#3
   {
-%<*core>
     \exp_not:n { \cs_if_exist_use:N \conditionally@traceoff }
-%</core>
     \exp_not:c { xparse~function~is~not~expandable }
     \exp_not:n { \bool_set_false:N \l_@@_environment_bool }
     \exp_not:N \@@_start_aux:NNnnnn
@@ -1609,9 +1587,7 @@
   {
     \tl_if_empty:NF \l_@@_defaults_tl { \@@_defaults: }
     \tl_if_empty:NF \l_@@_process_all_tl { \@@_args_process: }
-%<*core>
     \cs_if_exist_use:N \conditionally@traceon
-%</core>
     \exp_after:wN \l_@@_fn_code_tl \l_@@_args_tl
   }
 %    \end{macrocode}
@@ -1913,7 +1889,7 @@
         \@@_bad_def:wn
       }
   }
-%</core|initex>
+%</core>
 %<*package>
 \cs_gset_protected:Npn \@@_normalize_arg_spec_loop:n #1
   {
@@ -1927,7 +1903,7 @@
       }
   }
 %</package>
-%<*core|initex>
+%<*core>
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
@@ -1974,12 +1950,12 @@
       { \@@_normalize_type_t:w * }
   }
 \exp_args:No \@@_tmp:w { \c_novalue_tl }
-%</core|initex>
+%</core>
 %<*package>
 \cs_new_protected:Npx \@@_normalize_type_g:w
   { \exp_not:N \@@_normalize_type_G:w { \exp_not:V \c_novalue_tl } }
 %</package>
-%<*core|initex>
+%<*core>
 %    \end{macrocode}
 % \end{macro}
 %
@@ -2093,7 +2069,7 @@
         \@@_normalize_E_unique_check:w #2 \q_stop
       }
   }
-%</core|initex>
+%</core>
 %<*package>
 \cs_new_protected:Npn \@@_normalize_type_G:w #1
   {
@@ -2104,7 +2080,7 @@
     \@@_normalize_arg_spec_loop:n
   }
 %</package>
-%<*core|initex>
+%<*core>
 \cs_new_protected:Npn \@@_normalize_type_t:w #1
   {
     \quark_if_recursion_tail_stop_do:Nn #1 { \@@_bad_arg_spec:wn }
@@ -2141,7 +2117,7 @@
 %   \cs{l_@@_arg_spec_tl}, count the mandatory argument, and empty the
 %   list of last delimiters.
 %    \begin{macrocode}
-%</core|initex>
+%</core>
 %<*package>
 \cs_new_protected:Npn \@@_normalize_type_l:w
   {
@@ -2150,7 +2126,7 @@
     \@@_normalize_arg_spec_loop:n
   }
 %</package>
-%<*core|initex>
+%<*core>
 \cs_new_protected:Npn \@@_normalize_type_m:w
   {
     \@@_delimiter_check:nnn { } { m } { \iow_char:N \{ }
@@ -2167,7 +2143,7 @@
     \@@_add_arg_spec_mandatory:n { R #1 #2 {#3} }
     \@@_normalize_arg_spec_loop:n
   }
-%</core|initex>
+%</core>
 %<*package>
 \cs_new_protected:Npn \@@_normalize_type_u:w #1
   {
@@ -2177,7 +2153,7 @@
     \@@_normalize_arg_spec_loop:n
   }
 %</package>
-%<*core|initex>
+%<*core>
 \cs_new_protected:Npn \@@_normalize_type_v:w
   {
     \@@_normalize_check_gv:N v
@@ -2240,7 +2216,7 @@
 %   that is not possible without the risk of mistakenly grabbing the
 %   entire brace group (potentially leading to a~\texttt{!~Runaway argument}
 %   error) or trying to grab a |}|$_2$, leading to a~\texttt{!~Argument
-%   of~\dots~has an extra~|}|}.
+%   of~\dots~has an extra~\}}.
 %    \begin{macrocode}
 \cs_new_protected:Npn \@@_allowed_token_check:N #1
   {
@@ -2536,7 +2512,7 @@
 %   For the \texttt{G} type, the grabber and the default are added to the
 %   signature.
 %    \begin{macrocode}
-%</core|initex>
+%</core>
 %<*package>
 \cs_new_protected:Npn \@@_add_type_G:w #1
   {
@@ -2560,7 +2536,7 @@
     \@@_prepare_signature:N
   }
 %</package>
-%<*core|initex>
+%<*core>
 %    \end{macrocode}
 % \end{macro}
 %
@@ -2616,7 +2592,7 @@
 %   At the set up stage, the \texttt{u} type argument is identical to the
 %   \texttt{G} type except for the name of the grabber function.
 %    \begin{macrocode}
-%</core|initex>
+%</core>
 %<*package>
 \cs_new_protected:Npn \@@_add_type_u:w #1
   {
@@ -2627,7 +2603,7 @@
     \@@_prepare_signature:N
   }
 %</package>
-%<*core|initex>
+%<*core>
 %    \end{macrocode}
 % \end{macro}
 %
@@ -2846,12 +2822,12 @@
 %   parameter text ends with |#| in fact end up being delimited by an
 %   open brace.
 %    \begin{macrocode}
-%</core|initex>
+%</core>
 %<*package>
 \cs_new_protected:Npn \@@_add_expandable_type_l:w
   { \@@_add_expandable_type_u:w ## }
 %</package>
-%<*core|initex>
+%<*core>
 %    \end{macrocode}
 % \end{macro}
 %
@@ -2900,7 +2876,7 @@
 %   Define an auxiliary that will be used directly in the signature.  It
 %   grabs one argument delimited by |#1| and places it before \cs{q_@@}.
 %    \begin{macrocode}
-%</core|initex>
+%</core>
 %<*package>
 \cs_new_protected:Npn \@@_add_expandable_type_u:w #1
   {
@@ -2915,7 +2891,7 @@
     \@@_prepare_signature:N
   }
 %</package>
-%<*core|initex>
+%<*core>
 %    \end{macrocode}
 % \end{macro}
 %
@@ -3319,7 +3295,7 @@
 %   Optional groups are checked by meaning, so that the same code will
 %   work with, for example, \ConTeXt{}-like input.
 %    \begin{macrocode}
-%</core|initex>
+%</core>
 %<*package>
 \cs_new_protected:Npn \@@_grab_G:w #1 \@@_run_code:
   {
@@ -3350,8 +3326,6 @@
       { \l_@@_fn_tl }
       { \@@_add_arg:o \c_novalue_tl }
   }
-%</package>
-%<*core|initex>
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
@@ -3364,8 +3338,6 @@
 % \begin{macro}{\@@_grab_l_aux:nN}
 %   Argument grabbers for mandatory \TeX{} arguments are pretty simple.
 %    \begin{macrocode}
-%</core|initex>
-%<*package>
 \cs_new_protected:Npn \@@_grab_l:w #1 \@@_run_code:
   { \@@_grab_l_aux:nN {#1} \cs_set_protected_nopar:Npn }
 \cs_new_protected:Npn \@@_grab_l_long:w #1 \@@_run_code:
@@ -3378,7 +3350,7 @@
     \l_@@_fn_tl
   }
 %</package>
-%<*core|initex>
+%<*core>
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
@@ -3550,7 +3522,7 @@
 %   Grabbing up to a list of tokens is quite easy: define the grabber,
 %   and then collect.
 %    \begin{macrocode}
-%</core|initex>
+%</core>
 %<*package>
 \cs_new_protected:Npn \@@_grab_u:w #1#2 \@@_run_code:
   { \@@_grab_u_aux:nnN {#1} {#2} \cs_set_protected_nopar:Npn }
@@ -3564,7 +3536,7 @@
     \l_@@_fn_tl
   }
 %</package>
-%<*core|initex>
+%<*core>
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
@@ -3761,9 +3733,6 @@
 %
 % \begin{macro}{\@@_grab_v_aux_catcodes:}
 % \begin{macro}{\@@_grab_v_aux_abort:n}
-%   In a standalone format, the list of special characters is kept
-%   as a sequence, \cs{c_@@_special_chars_seq}, and we use
-%   \tn{dospecials} in package mode.
 %   The approach for short verbatim arguments is to make the end-line
 %   character a macro parameter character: this is forbidden by the
 %   rest of the code. Then the error branch can check what caused the
@@ -3771,15 +3740,8 @@
 %    \begin{macrocode}
 \cs_new_protected:Npn \@@_grab_v_aux_catcodes:
   {
-%<*initex>
-    \seq_map_function:NN
-      \c_@@_special_chars_seq
-      \char_set_catcode_other:N
-%</initex>
-%<*core>
     \cs_set_eq:NN \do \char_set_catcode_other:N
     \dospecials
-%</core>
     \tex_endlinechar:D = `\^^M \scan_stop:
     \bool_if:NTF \l_@@_long_bool
       { \char_set_catcode_other:n { \tex_endlinechar:D } }
@@ -5200,10 +5162,11 @@
 % \end{macro}
 %
 %    \begin{macrocode}
-%<*core>
 \@@_file_end_hook:
+%    \end{macrocode}
+%
+%    \begin{macrocode}
 %</core>
-%</core|initex>
 %    \end{macrocode}
 %
 %    \begin{macrocode}
diff --git a/macros/latex/contrib/l3packages/xparse.pdf b/macros/latex/contrib/l3packages/xparse.pdf
index caae1c8ac6..e7eb1fd4a4 100644
Binary files a/macros/latex/contrib/l3packages/xparse.pdf and b/macros/latex/contrib/l3packages/xparse.pdf differ
diff --git a/macros/latex/contrib/l3packages/xtemplate.dtx b/macros/latex/contrib/l3packages/xtemplate.dtx
index 194b9dbba7..e4b23c0eb7 100644
--- a/macros/latex/contrib/l3packages/xtemplate.dtx
+++ b/macros/latex/contrib/l3packages/xtemplate.dtx
@@ -63,7 +63,7 @@
 %    }^^A
 % }
 %
-% \date{Released 2020-05-15}
+% \date{Released 2020-10-05}
 %
 % \maketitle
 %
@@ -365,7 +365,7 @@
 %
 % \begin{function}{\EvaluateNow}
 %   \begin{syntax}
-%     \cs{EvaluteNow} \Arg{expression}
+%     \cs{EvaluateNow} \Arg{expression}
 %   \end{syntax}
 %   The standard method when creating an instance from a template is to
 %   evaluate the \meta{expression} when the instance is used. However, it may
@@ -682,7 +682,7 @@
 %    \end{macrocode}
 %
 %    \begin{macrocode}
-\ProvidesExplPackage{xtemplate}{2020-05-15}{}
+\ProvidesExplPackage{xtemplate}{2020-10-05}{}
   {L3 Experimental prototype document functions}
 %    \end{macrocode}
 %
diff --git a/macros/latex/contrib/l3packages/xtemplate.pdf b/macros/latex/contrib/l3packages/xtemplate.pdf
index f5241e3fff..36331ecb24 100644
Binary files a/macros/latex/contrib/l3packages/xtemplate.pdf and b/macros/latex/contrib/l3packages/xtemplate.pdf differ
diff --git a/macros/latex/contrib/tuda-ci/README.md b/macros/latex/contrib/tuda-ci/README.md
index a9cd5b3d0a..36ad81b21a 100644
--- a/macros/latex/contrib/tuda-ci/README.md
+++ b/macros/latex/contrib/tuda-ci/README.md
@@ -2,7 +2,7 @@
 
  Copyright (C) Marei Peischl <marei@peitex.de>, 2018–2020
 
- tuda-ci 2020/09/19 v3.03
+ tuda-ci 2020/10/05 v3.04
 
 ***************************************************************************
 
@@ -204,3 +204,7 @@ leaflets 				| DEMO-TUDaLeaflet.tex							| tudaleaflet.cls
  * v3.01 (2020-09-11) small bugfixes caused by the internal restructuring
  * v3.02 (2020-09-12) fix bug in tudaexercise caused by 3.01
  * v3.03 (2020-09-19) remove obsolete Type1 enforcement for pdfa mode
+ * v3.04 (2020-10-05) feature enhancements of tudaexercise
+   - enable pdfusetitle for tudaexercise
+   - add solution* and IfSolution mechanism for tudaexercise
+   - extend documentation on further configuration
\ No newline at end of file
diff --git a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaAnnouncement.pdf b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaAnnouncement.pdf
index 3abb9650de..6f9a359f9e 100644
Binary files a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaAnnouncement.pdf and b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaAnnouncement.pdf differ
diff --git a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaBeamer.pdf b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaBeamer.pdf
index 1b06eca8eb..7c29e9106c 100644
Binary files a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaBeamer.pdf and b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaBeamer.pdf differ
diff --git a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaExercise.pdf b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaExercise.pdf
index 852dabab3a..5353442c4e 100644
Binary files a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaExercise.pdf and b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaExercise.pdf differ
diff --git a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaLeaflet.pdf b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaLeaflet.pdf
index fd5aba3191..c5853a3361 100644
Binary files a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaLeaflet.pdf and b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaLeaflet.pdf differ
diff --git a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaLetter.pdf b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaLetter.pdf
index 832b10fb4d..9a3b4c35d3 100644
Binary files a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaLetter.pdf and b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaLetter.pdf differ
diff --git a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaPhD.pdf b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaPhD.pdf
index 4e0562607c..80a511b1cd 100644
Binary files a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaPhD.pdf and b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaPhD.pdf differ
diff --git a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaPoster.pdf b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaPoster.pdf
index 64da66fdd9..90485ca3da 100644
Binary files a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaPoster.pdf and b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaPoster.pdf differ
diff --git a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaPub.pdf b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaPub.pdf
index 288af7f06f..92b89ae9dd 100644
Binary files a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaPub.pdf and b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaPub.pdf differ
diff --git a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaReport.pdf b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaReport.pdf
index 3c8df9c29c..95d9f1dc42 100644
Binary files a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaReport.pdf and b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaReport.pdf differ
diff --git a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaSciPoster.pdf b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaSciPoster.pdf
index fcf3682d0a..6cc15e695f 100644
Binary files a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaSciPoster.pdf and b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaSciPoster.pdf differ
diff --git a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaThesis.pdf b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaThesis.pdf
index 76a4c23554..f2317b7a1f 100644
Binary files a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaThesis.pdf and b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaThesis.pdf differ
diff --git a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaAnnouncement.tex b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaAnnouncement.tex
index 37108a1a58..aaa1ba1987 100644
--- a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaAnnouncement.tex
+++ b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaAnnouncement.tex
@@ -1,4 +1,4 @@
-%% This is file `DEMO-TUDaAnnouncement.tex' version 3.03 (2020/09/19),
+%% This is file `DEMO-TUDaAnnouncement.tex' version 3.04 (2020/10/05),
 %% it is part of
 %% TUDa-CI -- Corporate Design for TU Darmstadt
 %% ----------------------------------------------------------------------------
@@ -43,7 +43,7 @@
 	]{tudaposter}
 
 \usepackage[english, main=ngerman]{babel}
-\usepackage[babel]{csquotes}
+\usepackage[autostyle]{csquotes}
 
 
 %Formatierungen für Beispiele in diesem Dokument. Im Allgemeinen nicht notwendig!
diff --git a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaBeamer.tex b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaBeamer.tex
index 849665f604..875ad67f4a 100644
--- a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaBeamer.tex
+++ b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaBeamer.tex
@@ -1,4 +1,4 @@
-%% This is file `DEMO-TUDaBeamer.tex' version 3.03 (2020/09/19),
+%% This is file `DEMO-TUDaBeamer.tex' version 3.04 (2020/10/05),
 %% it is part of
 %% TUDa-CI -- Corporate Design for TU Darmstadt
 %% ----------------------------------------------------------------------------
diff --git a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaBibliography.bib b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaBibliography.bib
index 6c17084774..6e63df68fb 100644
--- a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaBibliography.bib
+++ b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaBibliography.bib
@@ -1,4 +1,4 @@
-%% This is file `DEMO-TUDaBibliography.bib' version 3.03 (2020/09/19),
+%% This is file `DEMO-TUDaBibliography.bib' version 3.04 (2020/10/05),
 %% it is part of
 %% TUDa-CI -- Corporate Design for TU Darmstadt
 %% ----------------------------------------------------------------------------
@@ -67,4 +67,12 @@
 	year={2011},
 	url={https://www.intern.tu-darmstadt.de/media/medien_stabsstelle_km/services/medien_cd/das_bild_der_tu_darmstadt.pdf},
 	urldate={2020-05-01}
+}
+
+@online{tudapub,
+	title={TUDaPub – \LaTeX-Paper im Corporate Design der TU Darmstadt},
+	author={Marei Peischl},
+	date={2020-10-05},
+	url={http://mirrors.ctan.org/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaPub.pdf},
+	urldate={2020-10-05}
 }
\ No newline at end of file
diff --git a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaExercise.tex b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaExercise.tex
index d08ea2d2d4..3f9be1540f 100644
--- a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaExercise.tex
+++ b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaExercise.tex
@@ -1,4 +1,4 @@
-%% This is file `DEMO-TUDaExercise.tex' version 3.03 (2020/09/19),
+%% This is file `DEMO-TUDaExercise.tex' version 3.04 (2020/10/05),
 %% it is part of
 %% TUDa-CI -- Corporate Design for TU Darmstadt
 %% ----------------------------------------------------------------------------
@@ -38,7 +38,7 @@
 	]{tudaexercise}
 
 \usepackage[english, main=ngerman]{babel}
-\usepackage[babel]{csquotes}
+\usepackage[autostyle]{csquotes}
 
 \usepackage{biblatex}
 \bibliography{DEMO-TUDaBibliography}
@@ -169,6 +169,24 @@ Die Voreinstellung ist \code{solution=false}.
 \begin{solution}
 Beispiel für einen Lösungsvorschlag
 \end{solution}
+\end{task}
+
+\begin{task}{Abfrage der Einstellung \enquote{solution}}
+Ab Version 3.04 existiert zusätzlich die Möglichkeit die Einstellung \code{solution} abzufragen.
+
+Die Umgebung \code{solution*} verhält sich wie \code{solution} ohne die Beschriftung. Darüber Hinaus wurden die Makros \code{\IfSolutionTF} ergänzt.
+
+\begin{verbatim}
+\IfSolutionT{<falls solution=true>}
+\IfSolutionF{<falls solution=false>}
+\IfSolutionTF{<falls solution=true>}{<falls solution=false>}
+\end{verbatim}
+
+In der aktuellen Einstellung (\code{solution=false}) erzeugt der obige Block die folgende Ausgabe:
+
+\IfSolutionT{<falls solution=true>}
+\IfSolutionF{<falls solution=false>}
+\IfSolutionTF{<falls solution=true>}{<falls solution=false>}
 
 \end{task}
 
diff --git a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaFromaddress.lco b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaFromaddress.lco
index fc8c99aab4..d88dc010c2 100644
--- a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaFromaddress.lco
+++ b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaFromaddress.lco
@@ -1,4 +1,4 @@
-%% This is file `DEMO-TUDaFromaddress.lco' version 3.03 (2020/09/19),
+%% This is file `DEMO-TUDaFromaddress.lco' version 3.04 (2020/10/05),
 %% it is part of
 %% TUDa-CI -- Corporate Design for TU Darmstadt
 %% ----------------------------------------------------------------------------
diff --git a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaLeaflet.tex b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaLeaflet.tex
index 44dec03450..7843cf64f0 100644
--- a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaLeaflet.tex
+++ b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaLeaflet.tex
@@ -1,4 +1,4 @@
-%% This is file `DEMO-TUDaLeaflet.tex' version 3.03 (2020/09/19),
+%% This is file `DEMO-TUDaLeaflet.tex' version 3.04 (2020/10/05),
 %% it is part of
 %% TUDa-CI -- Corporate Design for TU Darmstadt
 %% ----------------------------------------------------------------------------
@@ -41,6 +41,7 @@
 \usepackage[ngerman]{babel}
 
 \usepackage{blindtext}
+\usepackage[autostyle]{csquotes}
 
 %Literaturverweise
 \usepackage{biblatex}
diff --git a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaLetter.tex b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaLetter.tex
index 6c15ad6565..2f668617cf 100644
--- a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaLetter.tex
+++ b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaLetter.tex
@@ -1,4 +1,4 @@
-%% This is file `DEMO-TUDaLetter.tex' version 3.03 (2020/09/19),
+%% This is file `DEMO-TUDaLetter.tex' version 3.04 (2020/10/05),
 %% it is part of
 %% TUDa-CI -- Corporate Design for TU Darmstadt
 %% ----------------------------------------------------------------------------
@@ -50,7 +50,7 @@
 \fi
 
 \usepackage{babel}%Paket für Sprachanpassung
-\usepackage[babel]{csquotes}%Vereinfachte Handhabung von Anführungszeichen
+\usepackage[autostyle]{csquotes}%Vereinfachte Handhabung von Anführungszeichen
 
 \LoadLetterOption{DEMO-TUDaFromaddress}%Laden der Datei DEMO-TUDaFromaddress.lco mit hinterlegten Adressdaten
 
diff --git a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaPhD.tex b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaPhD.tex
index 8c66bd7f18..17a181baf5 100644
--- a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaPhD.tex
+++ b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaPhD.tex
@@ -1,4 +1,4 @@
-%% This is file `DEMO-TUDaPhD.tex' version 3.03 (2020/09/19),
+%% This is file `DEMO-TUDaPhD.tex' version 3.04 (2020/10/05),
 %% it is part of
 %% TUDa-CI -- Corporate Design for TU Darmstadt
 %% ----------------------------------------------------------------------------
@@ -63,6 +63,10 @@
 %%%%%%%%%%%%%%%%%%%
 \usepackage[english, main=ngerman]{babel}
 \usepackage[autostyle]{csquotes}% Anführungszeichen vereinfacht
+
+% Falls mit pdflatex kompiliert wird, wird microtype automatisch geladen, in diesem Fall muss diese Zeile entfernt werden, und falls weiter Optionen hinzugefügt werden sollen, muss dies über
+% \PassOptionsToPackage{Optionen}{microtype}
+% vor \documentclass hinzugefügt werden.
 \usepackage{microtype}
 
 
@@ -139,7 +143,7 @@
 Die Datei \file{DEMO-TUDaPhD.tex} beziehungsweise ihre Ausgabe \file{DEMO-TUDaPhD.pdf} ist ein Template für Abschlussarbeiten im Stil des Corporate Designs der TU Darmstadt.
 Sie ist Teil des TUDa-CI-Bundles und basiert in Teilen auf dem tuddesign-Paket von C.~v.~Loewenich und J.~Werner.
 
-Sie verwendet die Dokumentenklasse \file{tudapub.cls}, allerdings mit erweiterten Einstellungen. In diesem Dokument werden überwiegend die speziell auf Abschlussarbeiten ausgelegten Möglichkeiten beschrieben.
+Sie verwendet die Dokumentenklasse \file{tudapub.cls}, allerdings mit erweiterten Einstellungen. In diesem Dokument werden überwiegend die speziell auf Abschlussarbeiten ausgelegten Möglichkeiten beschrieben. Weitere Konfigurationsmöglichkeiten finden sich in der Datei \file{DEMO-TUDaPub.pdf} \cite{tudapub}.
 
 Es ist voreingestellt, dass eine PDF/A-Datei erzeugt wird. Die beste Kompatibilität hierfür bietet Lua\LaTeX. Bei anderen Compilern kann dies entsprechend der Informationen in DEMO-TUDaPub zu Problemen führen. In diesem Fall sollte entweder der Compiler gewechselt oder \code{pdfa=false} aktiviert werden.
 
diff --git a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaPoster.tex b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaPoster.tex
index 0fae8410f2..f5a52cf4df 100644
--- a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaPoster.tex
+++ b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaPoster.tex
@@ -1,4 +1,4 @@
-%% This is file `DEMO-TUDaPoster.tex' version 3.03 (2020/09/19),
+%% This is file `DEMO-TUDaPoster.tex' version 3.04 (2020/10/05),
 %% it is part of
 %% TUDa-CI -- Corporate Design for TU Darmstadt
 %% ----------------------------------------------------------------------------
@@ -43,7 +43,7 @@
 	]{tudaposter}
 
 \usepackage[english, main=ngerman]{babel}
-\usepackage[babel]{csquotes}
+\usepackage[autostyle]{csquotes}
 
 
 %Formatierungen für Beispiele in diesem Dokument. Im Allgemeinen nicht notwendig!
diff --git a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaPub.tex b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaPub.tex
index 9243152a37..5d82cec48b 100644
--- a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaPub.tex
+++ b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaPub.tex
@@ -1,4 +1,4 @@
-%% This is file `DEMO-TUDaPub.tex' version 3.03 (2020/09/19),
+%% This is file `DEMO-TUDaPub.tex' version 3.04 (2020/10/05),
 %% it is part of
 %% TUDa-CI -- Corporate Design for TU Darmstadt
 %% ----------------------------------------------------------------------------
@@ -40,7 +40,7 @@
 	]{tudapub}
 
 \usepackage[english, main=ngerman]{babel}
-\usepackage[babel]{csquotes}
+\usepackage[autostyle]{csquotes}
 
 \usepackage{biblatex}
 \bibliography{DEMO-TUDaBibliography}
@@ -278,10 +278,47 @@ Der Prüfmechanismus ist auf Wunsch der Bibliothek standardmäßig aktiviert, ka
 
 
 \subsection{Anpassungen, die von den Corporate Design Richtlinien abweichen}
+
+\subsubsection{Schriftgröße}
 \cls{tudapub} kann entgegen der Corporate Design Richtlinien auch andere Schriftgrößen verarbeiten. Hierfür wird die \code{fontsize}-Option aus \KOMAScript{} genutzt (z.\,B. \code{fontsize=11pt}). Sofern keine spezielle Schriftgrößendatei für TUDa-CI vorliegt, wird die mit \KOMAScript{} ausgelieferte Datei gewählt.
 
 Beispiele für Abweichungen aus typografischen Gründen sind Beispielsweise auch in den Demo-Dateien für Abschlussarbeiten gezeigt.
 
+\subsubsection{Seitenränder}
+Die Zeilenlängen sind laut Corporate Design aus typografischer Sicht zu lang.
+Daher existiert die Klassenoption \code{custommargins}, die für dieses Dokument aktiviert wurde.
+
+Bei Verwendung einer Bindekorrektur wird diese nicht automatisch auch auf der Titelseite eingefügt. Für diesen Fall wurde mit Version 3.0 zusätzlich die Option \code{BCORtitlepage} hinzugefügt. Falls diese aktiviert wird, nimmt die Titelseite den Wert der Typearea Option \code{BCOR} auf der ersten Seite als Zusatz zum linken Rand hinzu.
+
+Die Option \code{custommargins} verfügt ab Version 1.10 auch über den Wert \code{geometry}. Damit können die Ränder auch durch einen Aufruf von \code{\textbackslash{}geometry} vor Beginn des Dokuments manuell angepasst werden.
+
+Hierbei ist zu beachten, dass die Einstellungen als Ausgangspunkt den Voreingestellten Satzspiegel nutzen (je nach Option mit Randnotizspalte oder ohne). Es ist möglich diese Optionen vor den eigenen mit zurückzusetzen:
+\begin{verbatim}
+	\geometry{
+		reset,
+		<Eigene Anpassungen>
+	}
+\end{verbatim}
+Die gilt insbesondere für die Optionen \code{includehead}, \code{includefoot} und \code{includemp}.
+
+Diese Variante wird auf Wunsch zur Verfügung gestellt, allerdings wird darauf hingewiesen, dass manuelle Randeinstellungen oft nicht zu einem harmonischen Satzspiegel führen.
+
+Auch ist das Standard-Layout der Kolumnentitel wenig vorteilhaft, da die Kolumnentitel damit local größer sein können als die eigentliche Überschrift.
+
+
+Dadurch werden die Ränder nicht fest definiert, sondern auf Basis des typearea-Paketes optimiert.
+
+Wenn die option \code{marginpar=true} gesetzt bleibt, ragen die Kopf- und Fußzeile über die Marginalspalte hinaus. Aus ästhetischen Gründen wird daher empfohlen in diesem Fall die Kopf- und Fußzeile  mit \code{marginpar=false}  auf den Textbereich zu beschränken.
+
+
+Darüber hinaus kann über
+\begin{verbatim}
+	\pagestyle{TUDa.headings}
+\end{verbatim}
+ein einfacherer Seitenstil ausgewählt werden, der die Nutzung mit lebenden Kolumnentitel erheblich vereinfacht.
+
+
+
 \subsection{Frontmatter/Mainmatter/Backmatter}
 Üblicherweise existieren die Makros \verb+\frontmatter+, \verb+\mainmatter+ und \verb+\backmatter+ lediglich bei der Basisklasse \cls{scrbook}.
 Auf Wunsch wurden diese Makros auch bei \cls{scrartcl} und \cls{scrreprt} als Basis bereitgestellt.
@@ -347,25 +384,44 @@ Der Fachbereich untergliedert die im Corporate Design Handbuch beschriebenen Far
 \minisec{Zeitstrahl}
 Des Design-Element des Zeitstrahls kann über das Makro \verb+\MechEngArrow{<Länge>}+ erzeugt werden. Die Farbe entspricht dabei der Farbe \code{TUDaArrow}, die mit der zweiten Primärfarbe (blau) vorbelegt ist.
 
-\section{Standard-KOMA-Script}
+\section{Weitere Konfigurationsmöglichkeiten: Standard-KOMA-Script}
 \label{sec:KOMA}
 Da die Klasse bis auf ein paar erzwungene Einstellungen, die das Layout betreffen, vollständig \KOMAScript"=kompatibel ist, ist für sämtliche Modifikationen ein Blick in die \KOMAScript-Dokumentation hilfreich. Für einen Großteil bietet \KOMAScript{} eine eigene Lösung, wodurch Ergänzungspakete oft hinfällig sind.
 
 Beispiele für typische Modifikationen, die auch im Rahmen des Corporate Design zulässig sind:
 \begin{itemize}
-	\item Umstellung der Absatzkennzeichnungsmethode von Einzug auf Abstand (Klassenoption parskip)
-	\item Elementnummerierung mit oder ohne Endpunkt
-	\item Positionierung, Ausrichtung und Abstände bei captions.
+	\item Umstellung der Absatzkennzeichnungsmethode von Einzug auf Abstand (Klassenoption \verb+parskip+)
+	\item Elementnummerierung mit oder ohne Endpunkt (Klassenoption \verb+numbers=enddot/noenddot+)
+	\item Positionierung, Ausrichtung und Abstände bei captions (Die Makros \verb+\captionsabove+, \verb+\captionbelow+, \verb+\captionof+ und die Option \verb+captions+)
 \end{itemize}
 
-\printbibliography
 
 
-\section{Bekannte Inkompatibilitäten}
+\section{Bekannte Probleme}
 
 \subsection{\texorpdfstring{\hologo{XeLaTeX}}{XeLaTeX} und PDF/A}
 Das Paket \pck{pdfx}, über welches die PDF/A Kompatibilität erzeugt wird, hat nur einen begrenzten Support für \hologo{XeLaTeX}.
-Es wird eine entsprechende Warnung erzeugt, allerdings kann es bei älteren \hologo{XeLaTeX}-Versionen passieren, dass \pck{pdfx} bereits Fehlermeldungen erzeugt. Diese werden vor der Überprüfung auf das Paketalter ausgegeben. Das Paket muss geladen worden sein, bevor die Überprüfung auf Alter möglich ist.
+Es wird eine entsprechende Warnung erzeugt, allerdings kann es bei älteren \hologo{XeLaTeX}-Versionen passieren, dass \pck{pdfx} bereits Fehlermeldungen erzeugt. Abhilfe wird in diesem Fall durch eine Compiler-Wechsel auf \hologo{LuaLaTeX} (welcher ohnehin empfohlen wird) oder durch Sbschalten des PDF/A-Modus (\code{pdfa=false})  geschaffen.
+
 
+\subsection{Geschachtelte Akzente (Inkompatibilität zwischen pdfx und amsmath)}
+Es ist nach aktuellem Paketstatus (v3.04) nicht möglich beide Pakete in Kombination ohne weitere Anpassungen so zu verwenden, dass eine Schachtelung von Akzenten möglich ist. Das folgende Beispiel wirft Fehler, sobald \pck{amsmath} direkt oder indirekt geladen wird.
+\begin{verbatim}
+$\dot{\hat{x}}$
+\end{verbatim}
+
+\noindent Die zugehörige Diskussion findet sich im tuda-ci Repository (\url{https://github.com/tudace/tuda_latex_templates/issues/78}). Da sich diese Problematik nicht direkt aus tuda-ci sondern aus der Konstruktion der beiden Pakete untereinander ergibt, ist es leider nicht möglich pauschal eine Anpassung in tuda-ci zu implementieren. Unter dem angegebenen Link findet sich jedoch ein möglicher Workaround, sobald beide Varianten benötigt werden.
+
+\subsection{Möglicher Option Clash mit microtype}
+Das Paket microtype wird im Falle der Nutzung von \hologo{pdfLaTeX} oder einer erzwungenden Nutzung von Type1 Schriftarten automatisch geladen, da in der verwendeten Schriftart die Ligaturen für Kapitälchen deaktiviert werden müssen, um Probleme zu vermeiden (vgl. \url{https://github.com/tudace/tuda_latex_templates/issues/144}).
+
+Falls es zwingend Notwendig ist die Type 1 Schriftart zu verwenden, ist es möglich weitere Optionen vor dem Laden der Dokumentenklasse an \pck{microtype} zu übergeben.
+
+\begin{verbatim}
+	\PassOptionsToPackage{<microtype Optionen>}{microtype}
+	\documentclass{…}
+\end{verbatim}
+\appendix
+\printbibliography
 
 \end{document}
diff --git a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaReport.tex b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaReport.tex
index 6ed0f0cccf..1fc29eb321 100644
--- a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaReport.tex
+++ b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaReport.tex
@@ -1,4 +1,4 @@
-%% This is file `DEMO-TUDaReport.tex' version 3.03 (2020/09/19),
+%% This is file `DEMO-TUDaReport.tex' version 3.04 (2020/10/05),
 %% it is part of
 %% TUDa-CI -- Corporate Design for TU Darmstadt
 %% ----------------------------------------------------------------------------
@@ -41,7 +41,7 @@
 	]{tudapub}
 
 \usepackage[english, main=ngerman]{babel}
-\usepackage[babel]{csquotes}
+\usepackage[autostyle]{csquotes}
 
 %Formatierungen für Beispiele in diesem Dokument. Im Allgemeinen nicht notwendig!
 \let\file\texttt
diff --git a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaSciPoster.tex b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaSciPoster.tex
index d04f07b1db..b4dc8bd83b 100644
--- a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaSciPoster.tex
+++ b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaSciPoster.tex
@@ -1,4 +1,4 @@
-%% This is file `DEMO-TUDaSciPoster.tex' version 3.03 (2020/09/19),
+%% This is file `DEMO-TUDaSciPoster.tex' version 3.04 (2020/10/05),
 %% it is part of
 %% TUDa-CI -- Corporate Design for TU Darmstadt
 %% ----------------------------------------------------------------------------
@@ -43,7 +43,6 @@
 
 %Sprache
 \usepackage[ngerman]{babel}
-\usepackage{microtype}
 \usepackage[autostyle]{csquotes}
 
 
diff --git a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaThesis.tex b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaThesis.tex
index 64d48dbe73..91df8cb3ba 100644
--- a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaThesis.tex
+++ b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaThesis.tex
@@ -1,4 +1,4 @@
-%% This is file `DEMO-TUDaThesis.tex' version 3.03 (2020/09/19),
+%% This is file `DEMO-TUDaThesis.tex' version 3.04 (2020/10/05),
 %% it is part of
 %% TUDa-CI -- Corporate Design for TU Darmstadt
 %% ----------------------------------------------------------------------------
@@ -59,8 +59,11 @@
 %%%%%%%%%%%%%%%%%%%
 \usepackage[english, main=ngerman]{babel}
 \usepackage[autostyle]{csquotes}% Anführungszeichen vereinfacht
-\usepackage{microtype}
 
+% Falls mit pdflatex kompiliert wird, wird microtype automatisch geladen, in diesem Fall muss diese Zeile entfernt werden, und falls weiter Optionen hinzugefügt werden sollen, muss dies über
+% \PassOptionsToPackage{Optionen}{microtype}
+% vor \documentclass hinzugefügt werden.
+\usepackage{microtype}
 
 %%%%%%%%%%%%%%%%%%%
 %Literaturverzeichnis
@@ -130,7 +133,7 @@
 Die Datei \file{DEMO-TUDaThesis.tex} ist ein Template für Abschlussarbeiten im Stil des Corporate Designs der TU Darmstadt.
 Sie ist Teil des TUDa-CI-Bundles wurde vom in Teilen tuddesign-Paket von C.~v.~Loewenich und J.~Werner inspiriert.
 
-Sie verwendet die Dokumentenklasse \file{tudapub.cls}, allerdings mit erweiterten Einstellungen. In diesem Dokument werden überwiegend die speziell auf Abschlussarbeiten ausgelegten Möglichkeiten beschrieben.
+Sie verwendet die Dokumentenklasse \file{tudapub.cls}, allerdings mit erweiterten Einstellungen. In diesem Dokument werden überwiegend die speziell auf Abschlussarbeiten ausgelegten Möglichkeiten beschrieben. Weitere Konfigurationsmöglichkeiten finden sich in der Datei \file{DEMO-TUDaPub.pdf} \cite{tudapub}.
 
 Es ist voreingestellt, dass eine PDF/A-Datei erzeugt wird. Die beste Kompatibilität hierfür bietet Lua\LaTeX. Bei anderen Compilern kann dies entsprechend der Informationen in DEMO-TUDaPub zu Problemen führen. In diesem Fall sollte entweder der Compiler gewechselt oder \code{pdfa=false} aktiviert werden.
 
diff --git a/macros/latex/contrib/tuda-ci/tex/beamercolorthemeTUDa.sty b/macros/latex/contrib/tuda-ci/tex/beamercolorthemeTUDa.sty
index a28cb1d718..8961f725b9 100644
--- a/macros/latex/contrib/tuda-ci/tex/beamercolorthemeTUDa.sty
+++ b/macros/latex/contrib/tuda-ci/tex/beamercolorthemeTUDa.sty
@@ -1,4 +1,4 @@
-%% This is file `beamercolorthemeTUDa.sty' version 3.03 (2020/09/19),
+%% This is file `beamercolorthemeTUDa.sty' version 3.04 (2020/10/05),
 %% it is part of
 %% TUDa-CI -- Corporate Design for TU Darmstadt
 %% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
 %%
 %% ============================================================================
 %%
-\def\fileversion{3.03}
-\def\filedate{2020/09/19}
+\def\fileversion{3.04}
+\def\filedate{2020/10/05}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{beamercolorthemeTUDa}
 [\filedate\space\fileversion]
diff --git a/macros/latex/contrib/tuda-ci/tex/beamerfontthemeTUDa.sty b/macros/latex/contrib/tuda-ci/tex/beamerfontthemeTUDa.sty
index fbb3da4f19..3309d19e4f 100644
--- a/macros/latex/contrib/tuda-ci/tex/beamerfontthemeTUDa.sty
+++ b/macros/latex/contrib/tuda-ci/tex/beamerfontthemeTUDa.sty
@@ -1,4 +1,4 @@
-%% This is file `beamerfontthemeTUDa.sty' version 3.03 (2020/09/19),
+%% This is file `beamerfontthemeTUDa.sty' version 3.04 (2020/10/05),
 %% it is part of
 %% TUDa-CI -- Corporate Design for TU Darmstadt
 %% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
 %%
 %% ============================================================================
 %%
-\def\fileversion{3.03}
-\def\filedate{2020/09/19}
+\def\fileversion{3.04}
+\def\filedate{2020/10/05}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{beamerfontthemeTUDa}
  [\filedate\space\fileversion]
diff --git a/macros/latex/contrib/tuda-ci/tex/beamerinnerthemeTUDa.sty b/macros/latex/contrib/tuda-ci/tex/beamerinnerthemeTUDa.sty
index 9d7e9a89d3..5507501a6a 100644
--- a/macros/latex/contrib/tuda-ci/tex/beamerinnerthemeTUDa.sty
+++ b/macros/latex/contrib/tuda-ci/tex/beamerinnerthemeTUDa.sty
@@ -1,4 +1,4 @@
-%% This is file `beamerinnerthemeTUDa.sty' version 3.03 (2020/09/19),
+%% This is file `beamerinnerthemeTUDa.sty' version 3.04 (2020/10/05),
 %% it is part of
 %% TUDa-CI -- Corporate Design for TU Darmstadt
 %% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
 %%
 %% ============================================================================
 %%
-\def\fileversion{3.03}
-\def\filedate{2020/09/19}
+\def\fileversion{3.04}
+\def\filedate{2020/10/05}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesExplPackage{beamerinnerthemeTUDa}{\filedate}{\fileversion}{Inner~beamer~theme~of~tuda-ci}
 
diff --git a/macros/latex/contrib/tuda-ci/tex/beamerouterthemeTUDa.sty b/macros/latex/contrib/tuda-ci/tex/beamerouterthemeTUDa.sty
index 97a431a062..35542cabdc 100644
--- a/macros/latex/contrib/tuda-ci/tex/beamerouterthemeTUDa.sty
+++ b/macros/latex/contrib/tuda-ci/tex/beamerouterthemeTUDa.sty
@@ -1,4 +1,4 @@
-%% This is file `beamerouterthemeTUDa.sty' version 3.03 (2020/09/19),
+%% This is file `beamerouterthemeTUDa.sty' version 3.04 (2020/10/05),
 %% it is part of
 %% TUDa-CI -- Corporate Design for TU Darmstadt
 %% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
 %%
 %% ============================================================================
 %%
-\def\fileversion{3.03}
-\def\filedate{2020/09/19}
+\def\fileversion{3.04}
+\def\filedate{2020/10/05}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesExplPackage{beamerouterthemeTUDa}{\filedate}{\fileversion}{Outer~beamer~theme~of~tuda-ci}
 
diff --git a/macros/latex/contrib/tuda-ci/tex/beamerthemeTUDa-mecheng.sty b/macros/latex/contrib/tuda-ci/tex/beamerthemeTUDa-mecheng.sty
index cc8e1efc22..81318da9ce 100644
--- a/macros/latex/contrib/tuda-ci/tex/beamerthemeTUDa-mecheng.sty
+++ b/macros/latex/contrib/tuda-ci/tex/beamerthemeTUDa-mecheng.sty
@@ -1,4 +1,4 @@
-%% This is file `beamerthemeTUDa-mecheng.sty' version 3.03 (2020/09/19),
+%% This is file `beamerthemeTUDa-mecheng.sty' version 3.04 (2020/10/05),
 %% it is part of
 %% TUDa-CI -- Corporate Design for TU Darmstadt
 %% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
 %%
 %% ============================================================================
 %%
-\def\fileversion{3.03}
-\def\filedate{2020/09/19}
+\def\fileversion{3.04}
+\def\filedate{2020/10/05}
 \RequirePackage{expl3}
 \ProvidesExplPackage{beamerthemeTUDa-mecheng}{\filedate}{\fileversion}{specific tudabeamer configuration for the department of mechanical engineering}
 
diff --git a/macros/latex/contrib/tuda-ci/tex/beamerthemeTUDa.sty b/macros/latex/contrib/tuda-ci/tex/beamerthemeTUDa.sty
index a8e651d4fc..6cb9adb6cd 100644
--- a/macros/latex/contrib/tuda-ci/tex/beamerthemeTUDa.sty
+++ b/macros/latex/contrib/tuda-ci/tex/beamerthemeTUDa.sty
@@ -1,4 +1,4 @@
-%% This is file `beamerthemeTUDa.sty' version 3.03 (2020/09/19),
+%% This is file `beamerthemeTUDa.sty' version 3.04 (2020/10/05),
 %% it is part of
 %% TUDa-CI -- Corporate Design for TU Darmstadt
 %% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
 %%
 %% ============================================================================
 %%
-\def\fileversion{3.03}
-\def\filedate{2020/09/19}
+\def\fileversion{3.04}
+\def\filedate{2020/10/05}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{beamerthemeTUDa}
  [\filedate\space\fileversion\space beamer theme using the Corporate Design of TU Darmstadt]
diff --git a/macros/latex/contrib/tuda-ci/tex/tuda-a0paper.clo b/macros/latex/contrib/tuda-ci/tex/tuda-a0paper.clo
index dddb70642c..2a1ef7b2ae 100644
--- a/macros/latex/contrib/tuda-ci/tex/tuda-a0paper.clo
+++ b/macros/latex/contrib/tuda-ci/tex/tuda-a0paper.clo
@@ -1,4 +1,4 @@
-%% This is file `tuda-a0paper.clo' version 3.03 (2020/09/19),
+%% This is file `tuda-a0paper.clo' version 3.04 (2020/10/05),
 %% it is part of
 %% TUDa-CI -- Corporate Design for TU Darmstadt
 %% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
 %%
 %% ============================================================================
 %%
-\def\fileversion{3.03}
-\def\filedate{2020/09/19}
+\def\fileversion{3.04}
+\def\filedate{2020/10/05}
 \ProvidesExplFile{tuda-a0paper.clo}{\filedate}{\fileversion}{tuda-ci~size~adjustments~for~a0paper}
 \cs_set:Nn \ptxcd_setup_title_sizes: {
 	\cs_set:Nn \ptxcd_title_fontsize: {{125pt}{165pt}}
diff --git a/macros/latex/contrib/tuda-ci/tex/tuda-a1paper.clo b/macros/latex/contrib/tuda-ci/tex/tuda-a1paper.clo
index a777ebf945..cdcded351f 100644
--- a/macros/latex/contrib/tuda-ci/tex/tuda-a1paper.clo
+++ b/macros/latex/contrib/tuda-ci/tex/tuda-a1paper.clo
@@ -1,4 +1,4 @@
-%% This is file `tuda-a1paper.clo' version 3.03 (2020/09/19),
+%% This is file `tuda-a1paper.clo' version 3.04 (2020/10/05),
 %% it is part of
 %% TUDa-CI -- Corporate Design for TU Darmstadt
 %% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
 %%
 %% ============================================================================
 %%
-\def\fileversion{3.03}
-\def\filedate{2020/09/19}
+\def\fileversion{3.04}
+\def\filedate{2020/10/05}
 \ProvidesExplFile{tuda-a1paper.clo}{\filedate}{\fileversion}{tuda-ci~size~adjustments~for~a0paper}
 \cs_set:Nn \ptxcd_setup_title_sizes: {
 		\cs_set:Nn \ptxcd_title_fontsize: {{86pt}{120pt}}
diff --git a/macros/latex/contrib/tuda-ci/tex/tuda-a2paper.clo b/macros/latex/contrib/tuda-ci/tex/tuda-a2paper.clo
index c5569d0183..572c55aafc 100644
--- a/macros/latex/contrib/tuda-ci/tex/tuda-a2paper.clo
+++ b/macros/latex/contrib/tuda-ci/tex/tuda-a2paper.clo
@@ -1,4 +1,4 @@
-%% This is file `tuda-a2paper.clo' version 3.03 (2020/09/19),
+%% This is file `tuda-a2paper.clo' version 3.04 (2020/10/05),
 %% it is part of
 %% TUDa-CI -- Corporate Design for TU Darmstadt
 %% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
 %%
 %% ============================================================================
 %%
-\def\fileversion{3.03}
-\def\filedate{2020/09/19}
+\def\fileversion{3.04}
+\def\filedate{2020/10/05}
 \ProvidesExplFile{tuda-a2paper.clo}{\filedate}{\fileversion}{tuda-ci~size~adjustments~for~a0paper}
 \cs_set:Nn \ptxcd_setup_title_sizes: {
 		\cs_set:Nn \ptxcd_title_fontsize: {{65pt}{82pt}}
diff --git a/macros/latex/contrib/tuda-ci/tex/tuda-a3paper.clo b/macros/latex/contrib/tuda-ci/tex/tuda-a3paper.clo
index a56d7bad3b..aadfa565cc 100644
--- a/macros/latex/contrib/tuda-ci/tex/tuda-a3paper.clo
+++ b/macros/latex/contrib/tuda-ci/tex/tuda-a3paper.clo
@@ -1,4 +1,4 @@
-%% This is file `tuda-a3paper.clo' version 3.03 (2020/09/19),
+%% This is file `tuda-a3paper.clo' version 3.04 (2020/10/05),
 %% it is part of
 %% TUDa-CI -- Corporate Design for TU Darmstadt
 %% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
 %%
 %% ============================================================================
 %%
-\def\fileversion{3.03}
-\def\filedate{2020/09/19}
+\def\fileversion{3.04}
+\def\filedate{2020/10/05}
 \ProvidesExplFile{tuda-a3paper.clo}{\filedate}{\fileversion}{tuda-ci~size~adjustments~for~a3paper}
 \cs_set:Nn \ptxcd_setup_title_sizes: {
   \cs_set:Nn \ptxcd_title_fontsize: {{47pt}{61pt}}
diff --git a/macros/latex/contrib/tuda-ci/tex/tuda-a4paper.clo b/macros/latex/contrib/tuda-ci/tex/tuda-a4paper.clo
index 2f5cd89747..f3c4dfa3c9 100644
--- a/macros/latex/contrib/tuda-ci/tex/tuda-a4paper.clo
+++ b/macros/latex/contrib/tuda-ci/tex/tuda-a4paper.clo
@@ -1,4 +1,4 @@
-%% This is file `tuda-a4paper.clo' version 3.03 (2020/09/19),
+%% This is file `tuda-a4paper.clo' version 3.04 (2020/10/05),
 %% it is part of
 %% TUDa-CI -- Corporate Design for TU Darmstadt
 %% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
 %%
 %% ============================================================================
 %%
-\def\fileversion{3.03}
-\def\filedate{2020/09/19}
+\def\fileversion{3.04}
+\def\filedate{2020/10/05}
 \ProvidesExplFile{tuda-a4paper.clo}{\filedate}{\fileversion}{tuda-ci~size~adjustments~for~a4paper}
 \cs_set:Nn \ptxcd_setup_title_sizes: {
   \cs_set:Nn \ptxcd_title_fontsize: {{36pt}{47pt}}
diff --git a/macros/latex/contrib/tuda-ci/tex/tuda-a5paper.clo b/macros/latex/contrib/tuda-ci/tex/tuda-a5paper.clo
index a67c978da2..043b0492bb 100644
--- a/macros/latex/contrib/tuda-ci/tex/tuda-a5paper.clo
+++ b/macros/latex/contrib/tuda-ci/tex/tuda-a5paper.clo
@@ -1,4 +1,4 @@
-%% This is file `tuda-a5paper.clo' version 3.03 (2020/09/19),
+%% This is file `tuda-a5paper.clo' version 3.04 (2020/10/05),
 %% it is part of
 %% TUDa-CI -- Corporate Design for TU Darmstadt
 %% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
 %%
 %% ============================================================================
 %%
-\def\fileversion{3.03}
-\def\filedate{2020/09/19}
+\def\fileversion{3.04}
+\def\filedate{2020/10/05}
 \ProvidesExplFile{tuda-a5paper.clo}{\filedate}{\fileversion}{tuda-ci~size~adjustments~for~a5paper}
 \cs_set:Nn \ptxcd_setup_title_sizes: {
   \cs_set:Nn \ptxcd_title_fontsize: {{22pt}{28pt}}
diff --git a/macros/latex/contrib/tuda-ci/tex/tuda-pgfplots.sty b/macros/latex/contrib/tuda-ci/tex/tuda-pgfplots.sty
index 1976c135b7..5c57dbcf78 100644
--- a/macros/latex/contrib/tuda-ci/tex/tuda-pgfplots.sty
+++ b/macros/latex/contrib/tuda-ci/tex/tuda-pgfplots.sty
@@ -1,4 +1,4 @@
-%% This is file `tuda-pgfplots.sty' version 3.03 (2020/09/19),
+%% This is file `tuda-pgfplots.sty' version 3.04 (2020/10/05),
 %% it is part of
 %% TUDa-CI -- Corporate Design for TU Darmstadt
 %% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
 %%
 %% ============================================================================
 %%
-\def\fileversion{3.03}
-\def\filedate{2020/09/19}
+\def\fileversion{3.04}
+\def\filedate{2020/10/05}
 % Special thanks to: Sebastian Schöps Institut Theorie Elektromagnetischer Felder (TEMF), TU Darmstadt
 % The original version of this file has been inspired by the colorscheme in the Metropolis beamer theme by Matthias Vogelgesang https://github.com/matze/mtheme
 \ProvidesPackage{tuda-pgfplots}[\filedate\space\fileversion\space tuda-ci pgfplots color schemes]
diff --git a/macros/latex/contrib/tuda-ci/tex/tudabeamer.cls b/macros/latex/contrib/tuda-ci/tex/tudabeamer.cls
index 057552835e..f2411baf6d 100644
--- a/macros/latex/contrib/tuda-ci/tex/tudabeamer.cls
+++ b/macros/latex/contrib/tuda-ci/tex/tudabeamer.cls
@@ -1,4 +1,4 @@
-%% This is file `tudabeamer.cls' version 3.03 (2020/09/19),
+%% This is file `tudabeamer.cls' version 3.04 (2020/10/05),
 %% it is part of
 %% TUDa-CI -- Corporate Design for TU Darmstadt
 %% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
 %%
 %% ============================================================================
 %%
-\def\fileversion{3.03}
-\def\filedate{2020/09/19}
+\def\fileversion{3.04}
+\def\filedate{2020/10/05}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesClass{tudabeamer}
  [\filedate\space\fileversion\space]
diff --git a/macros/latex/contrib/tuda-ci/tex/tudacolors.def b/macros/latex/contrib/tuda-ci/tex/tudacolors.def
index a94144d2db..996dc7f756 100644
--- a/macros/latex/contrib/tuda-ci/tex/tudacolors.def
+++ b/macros/latex/contrib/tuda-ci/tex/tudacolors.def
@@ -1,4 +1,4 @@
-%% This is file `tudacolors.def' version 3.03 (2020/09/19),
+%% This is file `tudacolors.def' version 3.04 (2020/10/05),
 %% it is part of
 %% TUDa-CI -- Corporate Design for TU Darmstadt
 %% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
 %%
 %% ============================================================================
 %%
-\def\fileversion{3.03}
-\def\filedate{2020/09/19}
+\def\fileversion{3.04}
+\def\filedate{2020/10/05}
 \ProvidesFile{tudacolors.def}
 [\filedate\space\fileversion\space Color definitions for tuda-ci]
 
diff --git a/macros/latex/contrib/tuda-ci/tex/tudacolors.sty b/macros/latex/contrib/tuda-ci/tex/tudacolors.sty
index e0cb3a69cc..542d342dbc 100644
--- a/macros/latex/contrib/tuda-ci/tex/tudacolors.sty
+++ b/macros/latex/contrib/tuda-ci/tex/tudacolors.sty
@@ -1,4 +1,4 @@
-%% This is file `tudacolors.sty' version 3.03 (2020/09/19),
+%% This is file `tudacolors.sty' version 3.04 (2020/10/05),
 %% it is part of
 %% TUDa-CI -- Corporate Design for TU Darmstadt
 %% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
 %%
 %% ============================================================================
 %%
-\def\fileversion{3.03}
-\def\filedate{2020/09/19}
+\def\fileversion{3.04}
+\def\filedate{2020/10/05}
 \NeedsTeXFormat{LaTeX2e}
 \RequirePackage{expl3}
 \ProvidesExplPackage{tudacolors}{\filedate}{\fileversion}{Color definition for TU Darmstadt's tuda-ci bundle}
@@ -61,6 +61,9 @@
 	department .choice:,
 	department / default .code:n = \str_gset:Nn \g_ptxcd_department_str {default},
 	department / mecheng .code:n = \str_gset:Nn \g_ptxcd_department_str {mecheng}\keys_set:nn {ptxcd/colors}{accent=TUDa-2d,identbar=TUDa-6b},
+	department / unknown .code:n = {
+		\str_gset:Nx \g_ptxcd_department_str {\l_keys_value_tl}
+	},
 	department .initial:V = \g_ptxcd_department_str,
 	mecheng .meta:n = {department=mecheng},
 }
diff --git a/macros/latex/contrib/tuda-ci/tex/tudaexercise.cls b/macros/latex/contrib/tuda-ci/tex/tudaexercise.cls
index f5538a691b..af03d0092b 100644
--- a/macros/latex/contrib/tuda-ci/tex/tudaexercise.cls
+++ b/macros/latex/contrib/tuda-ci/tex/tudaexercise.cls
@@ -1,4 +1,4 @@
-%% This is file `tudaexercise.cls' version 3.03 (2020/09/19),
+%% This is file `tudaexercise.cls' version 3.04 (2020/10/05),
 %% it is part of
 %% TUDa-CI -- Corporate Design for TU Darmstadt
 %% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
 %%
 %% ============================================================================
 %%
-\def\fileversion{3.03}
-\def\filedate{2020/09/19}
+\def\fileversion{3.04}
+\def\filedate{2020/10/05}
 \NeedsTeXFormat{LaTeX2e}
 \RequirePackage{expl3}
 \ProvidesExplClass{tudaexercise}
@@ -53,22 +53,42 @@
 
 \RequirePackage{environ}
 
-\def\solution{\ptxcd_ex_solutionheader:}
-\def\endsolution{}
+\newenvironment{solution}{}{}
+\newenvironment{solution*}{}{}
 
 \cs_new:Nn \ptxcd_setup_solution: {
 	\bool_if:NTF \l_ptxcd_ex_solution_bool {
 		\def\solution{\ptxcd_ex_solutionheader:}
 		\def\endsolution{}
+		\expandafter\def\csname solution*\endcsname{\ignorespaces}
+		\expandafter\let\csname endsolution*\endcsname\endsolution
 	}{
 		\RenewEnviron{solution}{
 			\if_false:
 			\BODY
 			\fi:
 		}
+		\RenewEnviron{solution*}{
+			\if_false:
+			\BODY
+			\fi:
+		}
 	}
 }
 
+\ptxcd_setup_solution:
+
+\prg_new_conditional:Nnn \__ptxcd_if_solution: {T,F,TF} {
+	\bool_if:NTF \l_ptxcd_ex_solution_bool
+	{\prg_return_true:}
+	{\prg_return_false:}
+}
+
+\let\IfSolutionT \__ptxcd_if_solution:T
+\let\IfSolutionF \__ptxcd_if_solution:F
+\let\IfSolutionTF \__ptxcd_if_solution:TF
+
+
 %Message Declaration for option processing
 \msg_new:nnn{tudaexercise} {titlepage-option-disabled} {
 	You~set~the~titlepage~option~to~#1.\\
@@ -168,21 +188,21 @@
 \bool_new:N \l_ptxcd_ex_subtask_fallback_bool
 
 \keys_define:nn {ptxcd/task}{
-	points .int_set:N = \l_ptxcd_ex_points_int,
+	points .int_set:N = \l_ptxcd_ex_task_points_int,
 	points .initial:n = 0,
-	credit .tl_set:N = \l_ptxcd_ex_credit_tl,
+	credit .tl_set:N = \l_ptxcd_ex_task_credit_tl,
 	credit .initial:n =,
 	solution .meta:nn ={ptxcd/exercise}{solution=#1},
 }
 
 \keys_define:nn {ptxcd/subtask} {
-	credit .tl_set:N = \l_ptxcd_ex_credit_tl,
+	credit .tl_set:N = \l_ptxcd_ex_subtask_credit_tl,
 	credit .initial:n =,
-	points .int_set:N = \l_ptxcd_ex_points_int,
+	points .int_set:N = \l_ptxcd_ex_subtask_points_int,
 	points .initial:n = 0,
 	title .tl_set:N = \l_ptxcd_ex_title_tl,
 	title .initial:n =,
-	unknown .code:n = \bool_set_true:N \l_ptxcd_ex_subtask_fallback_bool \tl_clear:N \l_ptxcd_ex_credit_tl \int_zero:N \l_ptxcd_ex_points_int,
+	unknown .code:n = \bool_set_true:N \l_ptxcd_ex_subtask_fallback_bool \tl_clear:N \l_ptxcd_ex_subtask_credit_tl \int_zero:N \l_ptxcd_ex_subtask_points_int,
 }
 
 \keys_define:nn {ptxcd/exercise/headline} {
@@ -246,9 +266,9 @@
 		}
 		#4
 		\tl_if_in:nnT {#1} {task} {
-			\tl_if_empty:NTF \l_ptxcd_ex_credit_tl
-				{\pointformat{\l_ptxcd_ex_points_int}}
-				{\creditformat{\l_ptxcd_ex_credit_tl}}
+			\tl_if_empty:cTF{l_ptxcd_ex_#1_credit_tl}
+				{\pointformat{\tl_use:c {l_ptxcd_ex_#1_points_int}}}
+				{\creditformat{\tl_use:c {l_ptxcd_ex_#1_credit_tl}}}
 		}
 		\rule[-\dp\strutbox]{0pt}{\dp\strutbox}\par}\nointerlineskip
 		\skip_vertical:n {\ptxcd_titlerule_sep: -\dp\strutbox}
@@ -443,6 +463,12 @@
 	contents=\raisebox{\depth}{\box_use:N \ptxcd_headrule_box},
 		]{TUDa.exercise.head.above.line}
 	\ofoot[\pagemark]{\pagemark}
+	\ModifyLayer[addvoffset=\c_ptxcd_rulesep_dim]{TUDa.exercise.foot.even}
+	\ModifyLayer[addvoffset=\c_ptxcd_rulesep_dim]{TUDa.exercise.foot.odd}
+	\ModifyLayer[addvoffset=\c_ptxcd_rulesep_dim]{TUDa.exercise.foot.oneside}
+	\ModifyLayer[addvoffset=\c_ptxcd_rulesep_dim]{plain.TUDa.exercise.foot.even}
+	\ModifyLayer[addvoffset=\c_ptxcd_rulesep_dim]{plain.TUDa.exercise.foot.odd}
+	\ModifyLayer[addvoffset=\c_ptxcd_rulesep_dim]{plain.TUDa.exercise.foot.oneside}
 }
 
 \DeclarePageStyleAlias{TUDa}{TUDa.exercise}
@@ -621,7 +647,8 @@
 \RequirePackage{graphicx}
 
 %%hyperref
-\usepackage{hyperref}
+\PassOptionsToPackage{pdfusetitle}{hyperref}
+\RequirePackage{hyperref}
 \hypersetup{hidelinks, unicode}
 
 \providecaptionname{ngerman, german}{\sheetname}{Übungsblatt}
@@ -689,10 +716,8 @@
 \cs_undefine:N \task
 
 \NewDocumentEnvironment{task}{om}{
-	\begingroup
 	\IfNoValueF{#1}{\keys_set:nn {ptxcd/task}{#1}}
 	\@task{#2}
-	\endgroup
 }{}
 
 \cs_set_eq:cN {task*} \task
diff --git a/macros/latex/contrib/tuda-ci/tex/tudafonts.sty b/macros/latex/contrib/tuda-ci/tex/tudafonts.sty
index 3229555951..886832e189 100644
--- a/macros/latex/contrib/tuda-ci/tex/tudafonts.sty
+++ b/macros/latex/contrib/tuda-ci/tex/tudafonts.sty
@@ -1,4 +1,4 @@
-%% This is file `tudafonts.sty' version 3.03 (2020/09/19),
+%% This is file `tudafonts.sty' version 3.04 (2020/10/05),
 %% it is part of
 %% TUDa-CI -- Corporate Design for TU Darmstadt
 %% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
 %%
 %% ============================================================================
 %%
-\def\fileversion{3.03}
-\def\filedate{2020/09/19}
+\def\fileversion{3.04}
+\def\filedate{2020/10/05}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{tudafonts}
  [\filedate\space\fileversion\space
diff --git a/macros/latex/contrib/tuda-ci/tex/tudaleaflet.cls b/macros/latex/contrib/tuda-ci/tex/tudaleaflet.cls
index 7236a2ccec..0be48fc846 100644
--- a/macros/latex/contrib/tuda-ci/tex/tudaleaflet.cls
+++ b/macros/latex/contrib/tuda-ci/tex/tudaleaflet.cls
@@ -1,4 +1,4 @@
-%% This is file `tudaleaflet.cls' version 3.03 (2020/09/19),
+%% This is file `tudaleaflet.cls' version 3.04 (2020/10/05),
 %% it is part of
 %% TUDa-CI -- Corporate Design for TU Darmstadt
 %% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
 %%
 %% ============================================================================
 %%
-\def\fileversion{3.03}
-\def\filedate{2020/09/19}
+\def\fileversion{3.04}
+\def\filedate{2020/10/05}
 \NeedsTeXFormat{LaTeX2e}
 \RequirePackage{expl3}
 \ProvidesExplPackage{tudaleaflet}{\filedate}{\fileversion}{Leaflets using the Corporate Design of TU Darmstadt}
@@ -79,7 +79,7 @@
 	}
 }
 
-\LoadClass[notumble,9pt]{leaflet}
+\LoadClass[notumble]{leaflet}
 
 %to workaround incompatibilities between leaflet and scrextend
 \let\sectfont\relax
diff --git a/macros/latex/contrib/tuda-ci/tex/tudaletter.cls b/macros/latex/contrib/tuda-ci/tex/tudaletter.cls
index 88b2676b49..72b0a9cedc 100644
--- a/macros/latex/contrib/tuda-ci/tex/tudaletter.cls
+++ b/macros/latex/contrib/tuda-ci/tex/tudaletter.cls
@@ -1,4 +1,4 @@
-%% This is file `tudaletter.cls' version 3.03 (2020/09/19),
+%% This is file `tudaletter.cls' version 3.04 (2020/10/05),
 %% it is part of
 %% TUDa-CI -- Corporate Design for TU Darmstadt
 %% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
 %%
 %% ============================================================================
 %%
-\def\fileversion{3.03}
-\def\filedate{2020/09/19}
+\def\fileversion{3.04}
+\def\filedate{2020/10/05}
 \NeedsTeXFormat{LaTeX2e}
 \RequirePackage{expl3}
 \ProvidesExplClass{tudaletter}
diff --git a/macros/latex/contrib/tuda-ci/tex/tudalettersize10pt.clo b/macros/latex/contrib/tuda-ci/tex/tudalettersize10pt.clo
index a0c957f45d..8665a9f46e 100644
--- a/macros/latex/contrib/tuda-ci/tex/tudalettersize10pt.clo
+++ b/macros/latex/contrib/tuda-ci/tex/tudalettersize10pt.clo
@@ -1,4 +1,4 @@
-%% This is file `tudalettersize10pt.clo' version 3.03 (2020/09/19),
+%% This is file `tudalettersize10pt.clo' version 3.04 (2020/10/05),
 %% it is part of
 %% TUDa-CI -- Corporate Design for TU Darmstadt
 %% ----------------------------------------------------------------------------
diff --git a/macros/latex/contrib/tuda-ci/tex/tudamecheng.cfg b/macros/latex/contrib/tuda-ci/tex/tudamecheng.cfg
index 714f64a43b..8604ba99ad 100644
--- a/macros/latex/contrib/tuda-ci/tex/tudamecheng.cfg
+++ b/macros/latex/contrib/tuda-ci/tex/tudamecheng.cfg
@@ -1,4 +1,4 @@
-%% This is file `tudamecheng.cfg' version 3.03 (2020/09/19),
+%% This is file `tudamecheng.cfg' version 3.04 (2020/10/05),
 %% it is part of
 %% TUDa-CI -- Corporate Design for TU Darmstadt
 %% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
 %%
 %% ============================================================================
 %%
-\def\fileversion{3.03}
-\def\filedate{2020/09/19}
+\def\fileversion{3.04}
+\def\filedate{2020/10/05}
 \RequirePackage{expl3}
 \ProvidesExplFile{tudamecheng.cfg}
 {\filedate}{\fileversion}{Special Features the department of mechanical engineering of Darmstadt's Corporate Design (tuda-ci)}
diff --git a/macros/latex/contrib/tuda-ci/tex/tudaposter.cls b/macros/latex/contrib/tuda-ci/tex/tudaposter.cls
index 38592e263f..5870a949bf 100644
--- a/macros/latex/contrib/tuda-ci/tex/tudaposter.cls
+++ b/macros/latex/contrib/tuda-ci/tex/tudaposter.cls
@@ -1,4 +1,4 @@
-%% This is file `tudaposter.cls' version 3.03 (2020/09/19),
+%% This is file `tudaposter.cls' version 3.04 (2020/10/05),
 %% it is part of
 %% TUDa-CI -- Corporate Design for TU Darmstadt
 %% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
 %%
 %% ============================================================================
 %%
-\def\fileversion{3.03}
-\def\filedate{2020/09/19}
+\def\fileversion{3.04}
+\def\filedate{2020/10/05}
 \NeedsTeXFormat{LaTeX2e}
 \RequirePackage{expl3}
 \ProvidesExplPackage{tudaposter}{\filedate}{\fileversion}{Poster Layouts for the Corporate Design of TU Darmstadt}
diff --git a/macros/latex/contrib/tuda-ci/tex/tudapub.cls b/macros/latex/contrib/tuda-ci/tex/tudapub.cls
index 8b85899f27..8834fb74e4 100644
--- a/macros/latex/contrib/tuda-ci/tex/tudapub.cls
+++ b/macros/latex/contrib/tuda-ci/tex/tudapub.cls
@@ -1,4 +1,4 @@
-%% This is file `tudapub.cls' version 3.03 (2020/09/19),
+%% This is file `tudapub.cls' version 3.04 (2020/10/05),
 %% it is part of
 %% TUDa-CI -- Corporate Design for TU Darmstadt
 %% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
 %%
 %% ============================================================================
 %%
-\def\fileversion{3.03}
-\def\filedate{2020/09/19}
+\def\fileversion{3.04}
+\def\filedate{2020/10/05}
 \NeedsTeXFormat{LaTeX2e}
 \RequirePackage{expl3}
 \ProvidesExplClass{tudapub}
@@ -156,6 +156,9 @@
 		\keys_set:nn {ptxcd/pub}{colorback=false,ruledheaders=section,departmentlogofile=tuda_maschinenbau_logo}
 	},
 	department .initial:n = default,
+	department / unknown .code:n = {
+		\str_gset:Nx \g_ptxcd_department_str {\l_keys_value_tl}
+	},
 	mecheng .meta:n = {department=mecheng},
 	departmentlogofile .tl_gset:N = \g_ptxcd_departmentlogo_tl,
 	departmentlogofile .initial:n =,
diff --git a/macros/latex/contrib/tuda-ci/tex/tudarules.sty b/macros/latex/contrib/tuda-ci/tex/tudarules.sty
index c0c2fddce9..8842124d70 100644
--- a/macros/latex/contrib/tuda-ci/tex/tudarules.sty
+++ b/macros/latex/contrib/tuda-ci/tex/tudarules.sty
@@ -1,4 +1,4 @@
-%% This is file `tudarules.sty' version 3.03 (2020/09/19),
+%% This is file `tudarules.sty' version 3.04 (2020/10/05),
 %% it is part of
 %% TUDa-CI -- Corporate Design for TU Darmstadt
 %% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
 %%
 %% ============================================================================
 %%
-\def\fileversion{3.03}
-\def\filedate{2020/09/19}
+\def\fileversion{3.04}
+\def\filedate{2020/10/05}
 \NeedsTeXFormat{LaTeX2e}
 \RequirePackage{expl3}
 \ProvidesExplPackage{tudarules}{\filedate}{\fileversion}{Creation of colored bars for tuda-ci bundle}
@@ -81,6 +81,10 @@
 	department .choice:,
 	department / default .code:n = \str_gset:Nn \g_ptxcd_department_str {default},
 	department / mecheng .code:n = \str_gset:Nn \g_ptxcd_department_str {mecheng},
+	department / unknown .code:n = {
+		\str_gset:Nx \g_ptxcd_department_str {\l_keys_value_tl}
+	},
+	department .initial:V = \g_ptxcd_department_str,
 	mecheng .meta:n = {department=mecheng},
 }
 
diff --git a/macros/latex/contrib/tuda-ci/tex/tudasciposter.cls b/macros/latex/contrib/tuda-ci/tex/tudasciposter.cls
index f1f7812931..7cc02af8c5 100644
--- a/macros/latex/contrib/tuda-ci/tex/tudasciposter.cls
+++ b/macros/latex/contrib/tuda-ci/tex/tudasciposter.cls
@@ -1,4 +1,4 @@
-%% This is file `tudasciposter.cls' version 3.03 (2020/09/19),
+%% This is file `tudasciposter.cls' version 3.04 (2020/10/05),
 %% it is part of
 %% TUDa-CI -- Corporate Design for TU Darmstadt
 %% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
 %%
 %% ============================================================================
 %%
-\def\fileversion{3.03}
-\def\filedate{2020/09/19}
+\def\fileversion{3.04}
+\def\filedate{2020/10/05}
 \NeedsTeXFormat{LaTeX2e}
 \RequirePackage{expl3}
 \ProvidesExplPackage{tudasciposter}{\filedate}{\fileversion}{Scientific Poster Layout for TU Darmstadt}
diff --git a/macros/latex/contrib/tuda-ci/tex/tudasize9pt.clo b/macros/latex/contrib/tuda-ci/tex/tudasize9pt.clo
index 0ed882b489..4bd9156759 100644
--- a/macros/latex/contrib/tuda-ci/tex/tudasize9pt.clo
+++ b/macros/latex/contrib/tuda-ci/tex/tudasize9pt.clo
@@ -1,4 +1,4 @@
-%% This is file `tudasize9pt.clo' version 3.03 (2020/09/19),
+%% This is file `tudasize9pt.clo' version 3.04 (2020/10/05),
 %% it is part of
 %% TUDa-CI -- Corporate Design for TU Darmstadt
 %% ----------------------------------------------------------------------------
diff --git a/macros/latex/contrib/tuda-ci/tex/tudathesis.cfg b/macros/latex/contrib/tuda-ci/tex/tudathesis.cfg
index 3f25a027b4..3538f34954 100644
--- a/macros/latex/contrib/tuda-ci/tex/tudathesis.cfg
+++ b/macros/latex/contrib/tuda-ci/tex/tudathesis.cfg
@@ -1,4 +1,4 @@
-%% This is file `tudathesis.cfg' version 3.03 (2020/09/19),
+%% This is file `tudathesis.cfg' version 3.04 (2020/10/05),
 %% it is part of
 %% TUDa-CI -- Corporate Design for TU Darmstadt
 %% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
 %%
 %% ============================================================================
 %%
-\def\fileversion{3.03}
-\def\filedate{2020/09/19}
+\def\fileversion{3.04}
+\def\filedate{2020/10/05}
 \RequirePackage{expl3}
 \ProvidesExplFile{tudathesis.cfg}
 {\filedate}{\fileversion}{Special Features for publication type 'thesis' using TU Darmstadt's Corporate Design (tuda-ci)}
diff --git a/macros/luatex/generic/luatexja/README b/macros/luatex/generic/luatexja/README
index 3109243a2e..7488d2f5d1 100644
--- a/macros/luatex/generic/luatexja/README
+++ b/macros/luatex/generic/luatexja/README
@@ -1,4 +1,4 @@
-The LuaTeX-ja Package 20201001.0
+The LuaTeX-ja Package 20201005.0
 --------------------------------
 Copyright (c) 2011--2020 The LuaTeX-ja project
 License: modified BSD (see COPYING)
@@ -45,9 +45,9 @@ Installation
 2. If you must/want to install manually:
 
    a. Download the source archive from CTAN,
-      or tagged as 20201001.0 in the Git repository by
+      or tagged as 20201005.0 in the Git repository by
       <http://git.osdn.jp/view?p=luatex-ja/luatexja.git
-                              ;a=snapshot;h=refs/tags/20201001.0;sf=tgz>
+                              ;a=snapshot;h=refs/tags/20201005.0;sf=tgz>
 
    b. Extract the archive and process following three files by LuaLaTeX
       to generate classes for Japanese typesetting:
@@ -96,4 +96,4 @@ Notes
   This file and ltj-kinsoku.lua are not used anymore.
   (Do not remove ltj-kinsoku.tex.)
 
-Last commit date: Thu Oct 1 04:19:14 2020 +0900
+Last commit date: Mon Oct 5 15:47:16 2020 +0900
diff --git a/macros/luatex/generic/luatexja/doc/luatexja-en.pdf b/macros/luatex/generic/luatexja/doc/luatexja-en.pdf
index ee8235c846..6b2043d2af 100644
Binary files a/macros/luatex/generic/luatexja/doc/luatexja-en.pdf and b/macros/luatex/generic/luatexja/doc/luatexja-en.pdf differ
diff --git a/macros/luatex/generic/luatexja/doc/luatexja-ja.pdf b/macros/luatex/generic/luatexja/doc/luatexja-ja.pdf
index 34affff76a..8d19e491c8 100644
Binary files a/macros/luatex/generic/luatexja/doc/luatexja-ja.pdf and b/macros/luatex/generic/luatexja/doc/luatexja-ja.pdf differ
diff --git a/macros/luatex/generic/luatexja/doc/luatexja-ruby.pdf b/macros/luatex/generic/luatexja/doc/luatexja-ruby.pdf
index 2c11e1f774..ade61a681c 100644
Binary files a/macros/luatex/generic/luatexja/doc/luatexja-ruby.pdf and b/macros/luatex/generic/luatexja/doc/luatexja-ruby.pdf differ
diff --git a/macros/luatex/generic/luatexja/doc/luatexja-ruby.tex b/macros/luatex/generic/luatexja/doc/luatexja-ruby.tex
index 40657a363f..f4a3614447 100644
--- a/macros/luatex/generic/luatexja/doc/luatexja-ruby.tex
+++ b/macros/luatex/generic/luatexja/doc/luatexja-ruby.tex
@@ -1,6 +1,7 @@
 %#! lualatex
 %%% a test of ruby.
 \documentclass[a4paper,10pt]{ltjsarticle}
+\usepackage[rgb]{xcolor}
 \usepackage{luatexja-otf,amsmath,bxghost}
 \usepackage[no-math]{fontspec}
 \usepackage[match]{luatexja-fontspec}
@@ -17,9 +18,11 @@
 \protected\def\Param#1{\eghostguarded{\underline{\smash{\textsf{\mdseries #1}}}}}
 
 \usepackage{luatexja-ruby,showexpl,booktabs}
+\definecolor{mygreen}{rgb}{0,0.5,0}
 \lstset{
   preset=\normalsize, basicstyle=\small\ttfamily, basewidth=0.5em,
   explpreset={numberstyle=\tiny, numbers=left, numbersep=1em, columns=fixed},
+  morecomment=[l]{\%}, commentstyle=\color{mygreen}
 }
 \makeatletter\let\SX@Info=\relax\makeatother
 \fboxsep=0mm
@@ -42,6 +45,8 @@
   HaranoAjiMincho-Regular:extend=0.67;jfm=ujisc33}{}
 
 \title{\textsf{luatexja-ruby}パッケージ}
+\author{\LuaTeX-jaプロジェクトチーム}
+\date{\texttt{\csname ver@luatexja-ruby.sty\endcsname}（\today）}
 \begin{document}
 \catcode`\<=13
 \def<#1>{{\rmfamily\mdseries\itshape$\langle$#1\/$\rangle$}}
@@ -53,6 +58,9 @@
 \textsf{luatexja-ruby}パッケージは，\LuaTeX-jaの機能を利用してルビの組版処理を行う追加パッケージである．
 \LuaTeX, \LuaTeX-jaの内部処理に割り込むことにより，熟語ルビ中の行分割や，
 行頭形・行中形・行末形の自動検出，また進入許容量の自動設定などを可能とした．
+
+v0.3より前とは親文字の高さの扱いが変わっている（\texttt{baseheight}キーを参照せよ）ほか，
+\Param{rubypreintrusion}, \Param{rubypostintrusion}パラメータの初期値が変わっているので注意すること．
 \end{abstract}
 
 \tableofcontents
@@ -116,6 +124,7 @@ plain \LuaTeX でのロードはまだサポートしておらず，
 \]
 \end{description}
 
+  \typeout{AAAA}
 組み方の具体例を実際に示す．例示のため，平仮名にはルビが1字まで，「立」にはルビを
 0.5字分までかけてよいことにしている．
 \begin{description}
@@ -131,7 +140,10 @@ plain \LuaTeX でのロードはまだサポートしておらず，
   \quad は\ltjruby{聴衆}{ちようしゆう}と\quad
 は\ltjruby{暁}{あかつき}立\quad
 は\ltjruby{聴衆}{ちようしゆう}立\par}
-\item[10]{\setkeys[ltj]{ruby}{mode=9}%
+\item[10]{%
+  \typeout{MODE: \csname ltj@@rubyip@mode\endcsname.}%
+  \setkeys[ltj]{ruby}{mode=9}%
+  \typeout{MODE: \csname ltj@@rubyip@mode\endcsname.}%
 \ltjsetparameter{rubypreintrusion={`立,0.5}, rubypostintrusion={`立,0.5}}%
 は\ltjruby{美}{うつく}しい
   \quad は\ltjruby{聴衆}{ちようしゆう}と\quad
@@ -188,6 +200,25 @@ plain \LuaTeX でのロードはまだサポートしておらず，
 \frame{\ltjruby[rubysmash=false,intergap=-1.5]
   {本}{ほん}}
 \end{LTXexample}
+\item[ybaseheight=<real>] 非負の値が指定された場合，
+  \emph{縦組以外での}ルビの親文字の高さを全角高さの<real>倍と強制的に固定する．
+  負の値が指定された場合は「固定しない」（すなわち，v0.3より前の挙動と同じになる）．
+  既定値は0.88．
+\item[tbaseheight=<real>] \texttt{ybaselineshift}と同様だが，こちらは\emph{縦組での}ルビの親文字の高さを指定する．
+  既定値は0.5．
+\item[baseheight=<real>] \texttt{ybaselineshift}，\texttt{tbaselinesift}を同時に指定したことと同義．
+\begin{LTXexample}[width=0.3\textwidth, preset=\Large]
+\noindent
+\ltjruby[baseheight=0.88]{本}{ほん}\ 
+\ltjruby[baseheight=0.88]{dvi}{ディーヴィーアイ}\\
+\ltjruby[baseheight=0.5]{本}{ほん}\ 
+\ltjruby[baseheight=0.5]{dvi}{ディーヴィーアイ}\\
+\ltjruby[baseheight=0]{本}{ほん}\ 
+\ltjruby[baseheight=0]{dvi}{ディーヴィーアイ}\\
+\ltjruby[baseheight=-1]{本}{ほん}\ 
+\ltjruby[baseheight=-1]{dvi}{ディーヴィーアイ}
+\end{LTXexample}
+
 
 
 \item[kenten=<command>]各文字につく圏点の出力命令を指定する．既定値は「\verb+\ltjalchar`•+」
@@ -231,7 +262,7 @@ mode=9, stretch={1}{2}{1}, stretchruby={0}{0}{1}
   stretchruby={1}{2}{1}, stretch = {1}{2}{1},
   stretchbol={0}{1}{1}, stretcheol={1}{1}{0},
   maxmargin=0.5, size=0.5, intergap=0, rubysmash=false,
-  kenten=\ltjalchar`•, fontcmd=\relax
+  kenten=\ltjalchar`•, fontcmd=\relax, ybaseheight=0.88, tbaseheight=0.5
 \end{verbatim}
 
 \paragraph{\texttt{\textbackslash ltjsetparamater} に追加されるキー}
@@ -241,14 +272,32 @@ mode=9, stretch={1}{2}{1}, stretchruby={0}{0}{1}
 \item[\Param{rubypostintrusion}\ttfamily =\{<chr\_code>, <post\_int>\}]
 文字<chr\_code> に，その\textbf{直前}のルビによって掛けられるルビ文字列の最大長をルビ全角単位で指定．
 \end{description}
-既定値は，\Param{rubypreintrusion},~\Param{rubypostintrusion}とも
-以下の文字に対しては1，その他の文字については0である：
+以下の文字は\Param{rubypreintrusion},~\Param{rubypostintrusion}とも初期値は1である：
+\makeatletter
+\def\mybox#1{{\fboxrule=0.1mm\fboxsep=0mm\fcolorbox{cyan}{white}{\hbox{\null\ltjjachar#1\null}}}}
+\begin{quote}
+ ひらがな(\texttt{U+3040}--\texttt{U+309F})，カタカナ(\texttt{U+30A0}--\texttt{U+30FF})，
+ 仮名補助など(\texttt{U+1B000}--\texttt{U+1B16F})，\\
+ 中点類・分離禁止文字
+ \@for\@tmp:=`\・,`\：,`\；,`\―,`\‥,`\…,`〳,`\〴,`\〵,"2014 \do{\mybox{\@tmp}}
+\end{quote}
+次に，以下の文字は\Param{rubypreintrusion}のみ初期値は1である：
+\begin{quote}
+  始め括弧類
+  \@for\@tmp:=`\‘,`\“,`\〈,`\《,`\「,`\『,`\【,`\〔,`\〖,`\〘,`\〝,`\（,`\［,`\｛,`\｟ \do{\mybox{\@tmp}}，
+  「文字コード$-1$の文字
+  \footnote{段落開始の\ \texttt{\textbackslash parindent}\ を表す．
+    通常の\LuaTeX-jaにおける指定では「文字コード$-1$」は文中数式境界を表していることに注意．}」
+\end{quote}
+また，以下の文字は\Param{rubypostintrusion}のみ初期値は1である：
 \begin{quote}
- 平仮名(\texttt{U+3040}--\texttt{U+309F})，カギ括弧「」，読点「，」「、」，中黒「・」
+  閉じ括弧類
+  \@for\@tmp:=`\’,`\”,`\〉,`\》,`\」,`\』,`\】,`\〕,`\〗,`\〙,`\〟,`\）,`\］,`\｝,`\｠ \do{\mybox{\@tmp}}，
+  句読点類\@for\@tmp:=`\、,`\，,`\。,`\． \do{\mybox{\@tmp}}
 \end{quote}
-また，ここでは「文字コード$-1$の文字」は，「段落開始の \verb+\parindent+」を表す%
-\footnote{通常の\LuaTeX-jaにおける指定では文中数式境界を表していることに注意．}．
-この「文字」に対する\Param{rubypreintrusion}の値も1である．
+\makeatother
+
+以上で記述されていない\Param{rubypreintrusion},~\Param{rubypostintrusion}の初期値はすべて0である．
 
 \paragraph{\texttt{\textbackslash ltjkenten}}
 圏点を出力する命令で，\verb+\kenten+ という別名を定義している．
@@ -326,7 +375,6 @@ mode=9, stretch={1}{2}{1}, stretchruby={0}{0}{1}
 などの組み方は\emph{想定していない}．
 \end{itemize}
 
-\newpage
 
 \section{\ruby{注|意|点}{ちゆう|い|てん}}
 \begin{description}
@@ -349,15 +397,15 @@ mode=9, stretch={1}{2}{1}, stretchruby={0}{0}{1}
 -\underbrace{0.25\,\mathrm{zw}}_{\text{前のルビの後側進入量（行中形）}}=0.25\,\mathrm{zw}
 \]
 となる．行分割後，「\ltjruby{陵}{りよう}」の実際の後側進入量は
-auxファイルに記述される．
-\item 2回目以降の実行では，auxファイルに保存された「\ltjruby{陵}{りよう}」の後側進入量
+<jobname>\texttt{.ltjruby}ファイルに記述される．
+\item 2回目以降の実行では，<jobname>\texttt{.ltjruby}ファイルに保存された「\ltjruby{陵}{りよう}」の後側進入量
 を用いて，「\ltjruby{陵}{みささぎ}」前側進入許容量を次のように計算する：
 \[
  \underbrace{0.5\,\mathrm{zw}}_{\text{元々の許容量}}
--\underbrace{0.25\,\mathrm{zw}}_{\text{前のルビの後側進入量 (from aux)}}=0.25\,\mathrm{zw}.
+-\underbrace{0.25\,\mathrm{zw}}_{\text{前のルビの後側進入量 (from \texttt{.ltjruby})}}=0.25\,\mathrm{zw}.
 \]
 \end{enumerate}
-auxファイルに保存する際，各 \verb+\ltjruby+ 命令の呼び出しを識別するキーが必要になるが，
+<jobname>\texttt{.ltjruby}ファイルに保存する際，各 \verb+\ltjruby+ 命令の呼び出しを識別するキーが必要になるが，
 そのキーとしては単純に「何個目の \verb+\ltjruby+ 命令か」である．
 
 なお，以上の処理は，1行目と2行目を比較すれば分かるように，
@@ -387,8 +435,6 @@ auxファイルに保存する際，各 \verb+\ltjruby+ 命令の呼び出しを
 \ltjruby{承}{うけたまわ}り……\par
 \parindent0.25\zw\ltjruby{陵}{みささぎ}は……
 \end{LTXexample}
-
-
 \end{description}
 
 \newpage
@@ -561,6 +607,17 @@ $r_2$,~$g_2$を行Bから除去・メモリ解放し，代わりに$n_3$を行B
 %\directlua{ltj.ext_show_node_list(tex.box[0], '? ', print)}
 \fbox{\box0}
 
+\setbox0=\vbox{\hsize=30\zw\noindent
+\texttt{baseheight=0.88}での例\\
+  ふぁいる\ruby[baseheight=0.88]{dvi}{ディーヴィーアイ}ファイル
+  \ruby[baseheight=0.88]{oo}{ほーげーふーが}漢字\\
+  ファイル\ruby[baseheight=0.88]{dvi}{ディーヴィーアイ}ふぁいる
+  \ruby[baseheight=0.88]{oo}{ほーげーふーが}漢字\\
+  ああ（\ruby{ほげ}{ふがふがふがふが}）」\ruby{ほげ}{ふがふがふがふが}「
+  【\ruby{ほげ}{ふがふがふがふが}】\ruby{ほげ}{ふがふがふがふが}…
+}
+\fbox{\box0}
+
 \def\rubytest{\ruby{国府津}{こうづ}\relax}
 % グループルビ
 
@@ -711,7 +768,7 @@ $r_2$,~$g_2$を行Bから除去・メモリ解放し，代わりに$n_3$を行B
      \ruby{模型}{モデル}\quad \ruby{利用許諾}{ライセンス}}
 % ルビが極端に短い場合
 3.70 \ruby{なげきの聖母像}{ピエタ}\quad% ルビ全角まで許容
-     \ruby[maxmargin=0.75]{なげきの聖母像}{ピエタ}% ルビ全角1.5倍まで
+     \ruby[maxmargin=0.75]{なげきの聖母像}{ピエタ}\\% ルビ全角1.5倍まで
 % ルビが長い場合
 3.71 \ruby{顧客}{クライアント}\quad \ruby{境界面}{インターフエース}
 3.72 {\ltjsetruby{stretch=010, stretchbol=010, stretcheol=010}% はみ出さない流儀
@@ -763,7 +820,7 @@ $r_2$,~$g_2$を行Bから除去・メモリ解放し，代わりに$n_3$を行B
 3.80 漢字の部首には「\ruby{偏}{へん}」「\ruby{冠}{かんむり}」「\ruby{脚}{きやく}」%
 「\ruby{旁}{つくり}」がある
 3.80 この\ruby{\噂}{うわさ}好きな人は\ruby{懐}{ふところ}具合もよく、\ruby{檜}{ひのき}材を
-3.81× に\ruby{暁}{あかつき}の\kern-1\zw の\ruby{趣}{おもむき}を
+3.81× に\ruby{暁}{あかつき}の\kern-1\zw の\ruby{趣}{おもむき}を（良くない例）
 3.82 に\ruby{暁}{あかつき}の\ruby{趣}{おもむき}を
 
 % 漢字にルビを2分まで掛けても良い流儀
diff --git a/macros/luatex/generic/luatexja/src/addons/luatexja-ruby.sty b/macros/luatex/generic/luatexja/src/addons/luatexja-ruby.sty
index 518d6ec8bd..7c1a939e6d 100644
--- a/macros/luatex/generic/luatexja/src/addons/luatexja-ruby.sty
+++ b/macros/luatex/generic/luatexja/src/addons/luatexja-ruby.sty
@@ -4,7 +4,7 @@
 
 % LaTeX only!
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{luatexja-ruby}[2017/09/26 v0.23a]
+\ProvidesPackage{luatexja-ruby}[2020-10-05 v0.3]
 \RequirePackage{luatexja}
 
 %%------------------
@@ -67,6 +67,14 @@
 \ltj@@rkeydef{fontcmd}%% フォント
 \define@boolkey[ltj]{ruby}{rubysmash}[true]{}
 
+\ltj@@rkeydef{ybaseheight} % 縦組以外 (yoko, utod, dtou)
+\ltj@@rkeydef{tbaseheight} % 縦組
+\define@key[ltj]{ruby}{baseheight}{%
+  \expandafter\def\csname ltj@@rubyip@ybaseheight\endcsname{#1}%
+  \expandafter\def\csname ltj@@rubyip@tbaseheight\endcsname{#1}%
+}
+
+%% これらの値が正のとき，親文字の高さをこの値（\zh 単位）とみなす
 
 %%%%%%%% setkeys の別名
 \protected\def\ltjsetruby{\setkeys[ltj]{ruby}}
@@ -89,15 +97,17 @@
       maxmargin = \ltj@safe@dimen{\ltj@@rubyip@maxmargin\zw},
       pre = \ltj@safe@dimen{\ltj@@rubyip@pre#1},
       post = \ltj@safe@dimen{\ltj@@rubyip@post#1},
-      intergap =  \ltj@safe@dimen{\ltj@@rubyip@intergap\zw},
+      intergap =  \ltj@safe@dimen{\ltj@@rubyip@intergap\zh},
       stretch 
         = 262144 * \expandafter\ltj@@ruby@cts\ltj@@rubyip@stretchbol
 	  + 512 * \expandafter\ltj@@ruby@cts\ltj@@rubyip@stretcheol
 	  + \expandafter\ltj@@ruby@cts\ltj@@rubyip@stretch,
       mode 
-        = 2097152 * \expandafter\ltj@@ruby@cts\ltj@@rubyip@stretchruby
+        = (2097152 * \expandafter\ltj@@ruby@cts\ltj@@rubyip@stretchruby
           + \ltj@safe@num{\ltj@@rubyip@mode}
-          + 1048576 * \ifltj@ruby@rubysmash1\else0\fi
+          + 1048576 * \ifltj@ruby@rubysmash1\else0\fi),
+      baseheight = \ltj@safe@dimen{\ifnum\ltjgetparameter{direction}=3
+                     \ltj@@rubyip@tbaseheight\else\ltj@@rubyip@ybaseheight\fi\zh},
     \string}
 }
 %%%
@@ -186,17 +196,27 @@
   \ltjsetparameter{rubypreintrusion={\the\count@,1}, 
     rubypostintrusion={\the\count@,1}}
   \advance\count@1\repeat
-%% 「」
-\ltjsetparameter{rubypreintrusion={`「,1}, 
-  rubypostintrusion={`」,1}}
-%% ，、
-\ltjsetparameter{rubypreintrusion={`，,1}, 
-  rubypostintrusion={`，,1}}
-\ltjsetparameter{rubypreintrusion={`、,1}, 
-  rubypostintrusion={`、,1}}
-%% ・
-\ltjsetparameter{rubypreintrusion={`・,1}, 
-  rubypostintrusion={`・,1}}
+%% カタカナ
+\count@="30A0\loop\relax\ifnum \count@<"3100
+  \ltjsetparameter{rubypreintrusion={\the\count@,1}, 
+    rubypostintrusion={\the\count@,1}}
+  \advance\count@1\repeat
+%% Kana Supplement
+\count@="1B000\loop\relax\ifnum \count@<"1B170
+  \ltjsetparameter{rubypreintrusion={\the\count@,1}, 
+    rubypostintrusion={\the\count@,1}}
+  \advance\count@1\repeat
+%% 開き括弧・閉じ括弧
+\@for\@tmp:=`\‘,`\“,`\〈,`\《,`\「,`\『,`\【,`\〔,`\〖,`\〘,`\〝,`\（,`\［,`\｛,`\｟ \do
+  {\ltjsetparameter{rubypreintrusion={\@tmp,1}}}
+\@for\@tmp:=`\’,`\”,`\〉,`\》,`\」,`\』,`\】,`\〕,`\〗,`\〙,`\〟,`\）,`\］,`\｝,`\｠ \do
+  {\ltjsetparameter{rubypostintrusion={\@tmp,1}}}
+%% 中点類
+\@for\@tmp:=`\・,`\：,`\；,`\―,`\‥,`\…,`〳,`\〴,`\〵,"2014 \do
+  {\ltjsetparameter{rubypreintrusion={\@tmp,1},rubypostintrusion={\@tmp,1}}}
+%% 読点・句点
+\@for\@tmp:=`\、,`\，,`\。,`\． \do
+  {\ltjsetparameter{rubypostintrusion={\@tmp,1}}}
 %% 段落インデント部分
 \ltjsetparameter{rubypreintrusion={-1,1}}
 
@@ -205,7 +225,7 @@
   stretchruby={1}{2}{1}, stretch = {1}{2}{1},
   stretchbol={0}{1}{1}, stretcheol={1}{1}{0},
   maxmargin=0.5, size=0.5, intergap=0, rubysmash=false,
-  kenten=\ltjalchar`•, fontcmd=\relax
+  kenten=\ltjalchar`•, fontcmd=\relax, ybaseheight=0.88, tbaseheight=0.5
 }
 
 \endinput
diff --git a/macros/luatex/generic/luatexja/src/ltj-jfmglue.lua b/macros/luatex/generic/luatexja/src/ltj-jfmglue.lua
index 0bbf7249e5..e3cae86534 100644
--- a/macros/luatex/generic/luatexja/src/ltj-jfmglue.lua
+++ b/macros/luatex/generic/luatexja/src/ltj-jfmglue.lua
@@ -3,7 +3,7 @@
 --
 luatexbase.provides_module({
   name = 'luatexja.jfmglue',
-  date = '2020-07-30',
+  date = '2020-10-05',
   description = 'Insertion process of JFM glues, [x]kanjiskip and others',
 })
 luatexja.jfmglue = luatexja.jfmglue or {}
@@ -258,6 +258,8 @@ luatexbase.create_callback("luatexja.jfmglue.whatsit_getinfo", "data",
                            end)
 luatexbase.create_callback("luatexja.jfmglue.whatsit_after", "data",
                            function (stat, Nq, Np) return false end)
+luatexbase.create_callback("luatexja.jfmglue.whatsit_last_minute", "data",
+                           function (stat, Nq, Np) return false end)
 
 -- calc next Np
 local calc_np 
@@ -543,10 +545,13 @@ end
 function calc_np(last, lp)
    local k
    -- We assume lp = node_next(Np.last)
+   if Nq and Nq.id==id_pbox_w then
+      luatexbase.call_callback("luatexja.jfmglue.whatsit_last_minute", false, Nq, Np)
+   end
    Np, Nq, non_ihb_flag = Nq, Np, true
    -- We clear `predefined' entries of Np before pairs() loop,
    -- because using only pairs() loop is slower.
-   Np.post, Np.pre, Np.xspc = nil, nil, nil
+   Np.post, Np.pre, Np.xspc, Np.gk = nil, nil, nil, nil
    Np.first, Np.id, Np.last, Np.met, Np.class= nil, nil, nil, nil
    Np.auto_kspc, Np.auto_xspc, Np.char, Np.nuc = nil, nil, nil, nil
    -- auto_kspc, auto_xspc: normally true/false, 
@@ -751,6 +756,10 @@ local function real_insert(g)
    if g then
       head  = insert_before(head, Np.first, g)
       Np.first = g
+      local ngk = Np.gk
+      if not ngk then Np.gk = g
+      elseif type(ngk)=="table" then ngk[#ngk+1]=g
+      else  Np.gk = { ngk, g } end
    end
 end
 
@@ -1161,10 +1170,10 @@ do
       {}, {}, {first=nil},
       { auto_kspc=nil, auto_xspc=nil, char=nil, class=nil,
         first=nil, id=nil, last=nil, met=nil, nuc=nil,
-        post=nil, pre=nil, xspc=nil, }, 
+        post=nil, pre=nil, xspc=nil, gk=nil }, 
       { auto_kspc=nil, auto_xspc=nil, char=nil, class=nil,
         first=nil, id=nil, last=nil, met=nil, nuc=nil,
-        post=nil, pre=nil, xspc=nil, },
+        post=nil, pre=nil, xspc=nil, gk=nil },
    }
    init_var = function (mode,dir)
       -- 1073741823: max_dimen
diff --git a/macros/luatex/generic/luatexja/src/ltj-jfont.lua b/macros/luatex/generic/luatexja/src/ltj-jfont.lua
index 6b7667a0d1..ed40e86821 100644
--- a/macros/luatex/generic/luatexja/src/ltj-jfont.lua
+++ b/macros/luatex/generic/luatexja/src/ltj-jfont.lua
@@ -3,7 +3,7 @@
 --
 luatexbase.provides_module({
   name = 'luatexja.jfont',
-  date = '2020-09-16',
+  date = '2020-10-05',
   description = 'Loader for Japanese fonts',
 })
 
diff --git a/macros/luatex/generic/luatexja/src/ltj-ruby.lua b/macros/luatex/generic/luatexja/src/ltj-ruby.lua
index 865e301f30..e2cb40d925 100644
--- a/macros/luatex/generic/luatexja/src/ltj-ruby.lua
+++ b/macros/luatex/generic/luatexja/src/ltj-ruby.lua
@@ -3,7 +3,7 @@
 --
 luatexbase.provides_module({
   name = 'luatexja.ruby',
-  date = '2020-07-30',
+  date = '2020-10-05',
   description = 'Ruby annotation',
 })
 luatexja.ruby = {}
@@ -50,6 +50,7 @@ local attr_ruby_stretch = luatexbase.attributes['ltj@kcat2']
 local attr_ruby_mode = luatexbase.attributes['ltj@kcat3']
 local attr_ruby_id = luatexbase.attributes['ltj@kcat4'] -- uniq id
 local attr_ruby_intergap = luatexbase.attributes['ltj@kcat5']
+local attr_ruby_baseheight= luatexbase.attributes['ltj@kcat6']
 local attr_ruby = luatexbase.attributes['ltj@rubyattr']
 -- ルビ内部処理用，以下のようにノードによって使われ方が異なる
 -- * (whatsit) では JAglue 処理時に，
@@ -128,6 +129,9 @@ function luatexja.ruby.read_old_break_info()
       local real_file = kpse.find_file(fname)
       if real_file then dofile(real_file) end
       cache_handle = io.open(fname, 'w')
+      if cache_handle then 
+         cache_handle:write('local lrob=luatexja.ruby.old_break_info\n')
+      end
    end
 end
 local make_uniq_id
@@ -142,12 +146,12 @@ end
 -- concatenation of boxes: reusing nodes
 -- ルビ組版が行われている段落/hboxでの設定が使われる．
 -- ルビ文字を格納しているボックスでの設定ではない！
+local function get_attr_icflag(p)
+    return (has_attr(p, attr_icflag) or 0) % PROCESSED_BEGIN_FLAG
+end
 local concat
 do
    local node_prev = node.direct.getprev
-   local function get_attr_icflag(p)
-      return (has_attr(p, attr_icflag) or 0) % PROCESSED_BEGIN_FLAG
-   end
    function concat(f, b)
       if f then
          if b then
@@ -264,6 +268,7 @@ local function texiface_low(rst, rtlr, rtlp)
    set_attr(wv, attr_ruby_maxprep, rst.pre)
    set_attr(wv, attr_ruby_maxpostp, rst.post)
    set_attr(wv, attr_ruby_intergap, rst.intergap)
+   set_attr(wv, attr_ruby_baseheight, rst.baseheight)
    set_attr(wv, attr_ruby_stretch, rst.stretch)
    set_attr(wv, attr_ruby_mode, rst.mode)
    local n = wv
@@ -309,11 +314,13 @@ end
 ----------------------------------------------------------------
 
 -- r, p の中身のノードは再利用される
-local function enlarge_parent(r, p, ppre, pmid, ppost, mapre, mapost, intmode)
+local function enlarge_parent(r, p, tmp_tbl, intmode)
    -- r: ルビ部分の格納された box，p: 同，親文字
    local rwidth = getfield(r, 'width')
    local sumprot = rwidth - getfield(p, 'width') -- >0
    local pre_intrusion, post_intrusion
+   local ppre, pmid, ppost = tmp_tbl.ppre, tmp_tbl.pmid, tmp_tbl.ppost
+   local mapre, mapost = tmp_tbl.mapre, tmp_tbl.mapost
    if intmode == 0 then --  とりあえず組んでから決める
       p = enlarge(p, rwidth, ppre, pmid, ppost, 0, 0)
       pre_intrusion  = min(mapre, round(ppre*getfield(p, 'glue_set')*65536))
@@ -349,17 +356,19 @@ end
 -- ルビボックスの生成（単一グループ）
 -- returned value: <new box>, <ruby width>, <post_intrusion>
 local max_margin
-local function new_ruby_box(r, p, ppre, pmid, ppost,
-                            mapre, mapost, imode, rgap)
+local function new_ruby_box(r, p, tmp_tbl)
    local post_intrusion = 0
-   local intmode = imode%4
+   local imode
+   local ppre, pmid, ppost = tmp_tbl.ppre, tmp_tbl.pmid, tmp_tbl.ppost
+   local mapre, mapost = tmp_tbl.mapre, tmp_tbl.mapost
    local rpre, rmid, rpost, rsmash
-   imode = floor(imode/262144); rsmash = (imode%2 ==1)
+   imode = floor(tmp_tbl.imode/0x100000); rsmash = (imode%2 ==1)
    imode = floor(imode/2); rpost = imode%8;
    imode = (imode-rpost)/8;  rmid  = imode%8;
    imode = (imode-rmid)/8;   rpre  = imode%8
    if getfield(r, 'width') > getfield(p, 'width') then  -- change the width of p
-      r, p, post_intrusion  = enlarge_parent(r, p, ppre, pmid, ppost, mapre, mapost, intmode)
+      r, p, post_intrusion  = enlarge_parent(r, p, tmp_tbl, 
+        floor(tmp_tbl.imode/4)%4)
    elseif getfield(r, 'width') < getfield(p, 'width') then -- change the width of r
       r = enlarge(r, getfield(p, 'width'), rpre, rmid, rpost, 0, 0)
       post_intrusion = 0
@@ -383,9 +392,10 @@ local function new_ruby_box(r, p, ppre, pmid, ppost,
    end
    local a, k = node_new(id_rule), node_new(id_kern, 1)
    setfield(a, 'width', 0); setfield(a, 'height', 0)
-   setfield(a, 'depth', 0); setfield(k, 'kern', rgap)
+   setfield(a, 'depth', 0); setfield(k, 'kern', tmp_tbl.rgap)
    insert_after(r, r, a); insert_after(r, a, k);
    insert_after(r, k, p); setfield(p, 'next', nil)
+   if tmp_tbl.bheight >= 0 then setfield(p, 'height', tmp_tbl.bheight) end
    a = node.direct.vpack(r); setfield(a, 'shift', 0)
    set_attr(a, attr_ruby, post_intrusion)
    if rsmash or getfield(a, 'height')<getfield(p, 'height') then
@@ -406,7 +416,10 @@ local max_allow_pre, max_allow_post
 
 -- 中付き熟語ルビ，cmp containers
 -- 「文字の構成を考えた」やつはどうしよう
-local function pre_low_cal_box(w, cmp)
+local pre_low_cal_box
+do
+local tmp_tbl = {}
+pre_low_cal_box = function (w, cmp)
    local rb = {}
    local pb = {}
    local kf = {}
@@ -417,11 +430,14 @@ local function pre_low_cal_box(w, cmp)
    local mdt -- nt*: node temp
    local coef = {} -- 連立一次方程式の拡大係数行列
    local rtb = expand_3bits(has_attr(wv, attr_ruby_stretch))
-   local rgap = has_attr(wv, attr_ruby_intergap)
-   local intmode = floor(has_attr(wv, attr_ruby_mode)/4)
+   tmp_tbl.rgap = has_attr(wv, attr_ruby_intergap)
+   tmp_tbl.imode = has_attr(wv, attr_ruby_mode)
+   tmp_tbl.bheight = has_attr(wv, attr_ruby_baseheight)
 
    -- node list 展開・行末形の計算
    local nt, nta, ntb = wv, nil, nil -- nt*: node temp
+   tmp_tbl.ppre, tmp_tbl.pmid, tmp_tbl.ppost = rtb[6], rtb[5], rtb[4]
+   tmp_tbl.mapre, tmp_tbl.mapost = max_allow_pre, 0
    for i = 1, cmp do
       nt = node_next(nt); rb[i] = nt; nta = concat(nta, node_copy(nt))
       nt = node_next(nt); pb[i] = nt; ntb = concat(ntb, node_copy(nt))
@@ -429,30 +445,31 @@ local function pre_low_cal_box(w, cmp)
       for j = 1, 2*i do coef[i][j] = 1 end
       for j = 2*i+1, 2*cmp+1 do coef[i][j] = 0 end
       kf[i], coef[i][2*cmp+2]
-         = new_ruby_box(node_copy(nta), node_copy(ntb),
-                        rtb[6], rtb[5], rtb[4], max_allow_pre, 0, intmode, rgap)
+         = new_ruby_box(node_copy(nta), node_copy(ntb), tmp_tbl)
    end
    node_free(nta); node_free(ntb)
 
    -- 行頭形の計算
    local nta, ntb = nil, nil
+   tmp_tbl.ppre, tmp_tbl.pmid, tmp_tbl.ppost = rtb[9], rtb[8], rtb[7]
+   tmp_tbl.mapre, tmp_tbl.mapost = 0, max_allow_post
    for i = cmp,1,-1 do
       coef[cmp+i] = {}
       for j = 1, 2*i-1 do coef[cmp+i][j] = 0 end
       for j = 2*i, 2*cmp+1 do coef[cmp+i][j] = 1 end
       nta = concat(node_copy(rb[i]), nta); ntb = concat(node_copy(pb[i]), ntb)
       kf[cmp+i], coef[cmp+i][2*cmp+2]
-         = new_ruby_box(node_copy(nta), node_copy(ntb),
-                        rtb[9], rtb[8], rtb[7], 0, max_allow_post, intmode, rgap)
+         = new_ruby_box(node_copy(nta), node_copy(ntb), tmp_tbl)
    end
 
    -- ここで，nta, ntb には全 container を連結した box が入っているので
    -- それを使って行中形を計算する．
    coef[2*cmp+1] = {}
    for j = 1, 2*cmp+1 do coef[2*cmp+1][j] = 1 end
+   tmp_tbl.ppre, tmp_tbl.pmid, tmp_tbl.ppost = rtb[3], rtb[2], rtb[1]
+   tmp_tbl.mapre, tmp_tbl.mapost = max_allow_pre, max_allow_post
    kf[2*cmp+1], coef[2*cmp+1][2*cmp+2], post_intrusion_backup
-      = new_ruby_box(nta, ntb, rtb[3], rtb[2], rtb[1],
-                     max_allow_pre, max_allow_post, intmode, rgap)
+      = new_ruby_box(nta, ntb, tmp_tbl)
 
    -- w.value の node list 更新．
    local nt = wv
@@ -466,6 +483,7 @@ local function pre_low_cal_box(w, cmp)
    end
    return coef
 end
+end
 
 local first_whatsit
 do
@@ -558,9 +576,7 @@ do
       local id = has_attr(wv, attr_ruby_id)
       if id>0 and cache_handle then
          cache_handle:write(
-                    'luatexja.ruby.old_break_info['
-                       .. tostring(id) .. ']=' .. num
-                       .. '\n')
+            'lrob[' .. tostring(id) .. ']=' .. num .. '\n')
       end
    end
 
@@ -736,6 +752,11 @@ do
             insert_before(Nq.nuc, Np.first, last_glue)
             Np.first = last_glue
             next_cluster_array[Nq.nuc] = last_glue -- ルビ処理用のグルー
+--            if Nq.gk then 
+--               if type(Nq.gk)=="table" then
+--                  for _,v in ipairs(Nq.gk) do luatexja.ext_show_node(node.direct.tonode(v), 'BBt> ', print) end
+--               else luatexja.ext_show_node(node.direct.tonode(Nq.gk), 'BBB> ', print) end
+--            end
          end
          local nqnv = getfield(Nq.nuc, 'value')
          local x =  node_next(node_next(nqnv))
@@ -779,4 +800,15 @@ do
    luatexbase.add_to_callback("luatexja.jfmglue.whatsit_after", whatsit_after_callback,
                               "luatexja.ruby.np_info_after", 1)
 end
+if false then -- いまは off
+    local function w (s, Nq, Np)
+       if Np.gk then 
+           if type(Np.gk)=="table" then
+               for _,v in ipairs(Np.gk) do luatexja.ext_show_node(node.direct.tonode(v), 'AAt> ', print) end
+           else luatexja.ext_show_node(node.direct.tonode(Np.gk), 'AAA> ', print) end
+       end
+    end
+    luatexbase.add_to_callback("luatexja.jfmglue.whatsit_last_minute", w,
+                              "luatexja.ruby.np_info_last_minute", 1)
+end
 
diff --git a/macros/luatex/generic/luatexja/src/luatexja.sty b/macros/luatex/generic/luatexja/src/luatexja.sty
index cfee092e30..74df9c779c 100644
--- a/macros/luatex/generic/luatexja/src/luatexja.sty
+++ b/macros/luatex/generic/luatexja/src/luatexja.sty
@@ -35,13 +35,13 @@
   \expandafter\let\csname ifltj@in@latex\expandafter\endcsname
     \csname iftrue\endcsname
   \NeedsTeXFormat{LaTeX2e}
-  \ProvidesPackage{luatexja}[2020-09-19 Japanese Typesetting with Lua(La)TeX]
+  \ProvidesPackage{luatexja}[2020-10-05 Japanese Typesetting with Lua(La)TeX]
   \DeclareOption{disablejfam}{\ltj@disablejfamtrue}
   \DeclareOption*{}
   \ProcessOptions\relax
 \fi                             %</LaTeX>
 %%%% VERSION
-\def\LuaTeXjaversion{20201001.0}
+\def\LuaTeXjaversion{20201005.0}
 
 \directlua{require('ltj-unicode-ccfix.lua')}% catcode of ideographs
 
diff --git a/macros/luatex/generic/luatexja/src/patches/lltjdefs.sty b/macros/luatex/generic/luatexja/src/patches/lltjdefs.sty
index 03366c258f..754a9122f8 100644
--- a/macros/luatex/generic/luatexja/src/patches/lltjdefs.sty
+++ b/macros/luatex/generic/luatexja/src/patches/lltjdefs.sty
@@ -3,7 +3,7 @@
 %
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{lltjdefs}[2020-09-30 Default font settings of LuaTeX-ja]
+\ProvidesPackage{lltjdefs}[2020-10-05 Default font settings of LuaTeX-ja]
 
 \ifdefined\ltj@stdmcfont\else\def\ltj@stdmcfont{file:HaranoAjiMincho-Regular.otf}\fi
 \ifdefined\ltj@stdgtfont\else\def\ltj@stdgtfont{file:HaranoAjiGothic-Medium.otf}\fi
@@ -95,7 +95,7 @@
 \@ltj@match@familyfalse
 \def\verbatim@font{\normalfont\ttfamily\kanjifamily\jttdefault\selectfont}
 
-\def\@ltj@hook@family#1#2{ % #1: csname #2: contents
+\def\@ltj@hook@family#1#2{% #1: csname #2: contents
   \ifltj@ltfilehook@avail % LaTeX 2020-10-01
     \AddToHook{#1}{#2}%
   \else\ifcsname @#1hook\endcsname % LaTeX 2020-02-02
diff --git a/macros/luatex/generic/luatexja/src/patches/lltjfont.sty b/macros/luatex/generic/luatexja/src/patches/lltjfont.sty
index 564a1b6c15..bad7e6c7bc 100644
--- a/macros/luatex/generic/luatexja/src/patches/lltjfont.sty
+++ b/macros/luatex/generic/luatexja/src/patches/lltjfont.sty
@@ -3,7 +3,7 @@
 %
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{lltjfont}[2020-09-30 Patch to NFSS2 for LuaTeX-ja]
+\ProvidesPackage{lltjfont}[2020-10-05 Patch to NFSS2 for LuaTeX-ja]
 
 %% patching \DeclareTextComposite
 \def\ltj@chardef@text@cmd#1{%
@@ -639,7 +639,7 @@
   \ifx\@forced@seriestrue\@undefined % 2020-02-02 pl0--2
     \@latex@error
      {Please update LaTeX2e!^^J\space\space
-       At least LaTeX2e 2020-02-02 patch level 3 is required}
+       At least LaTeX2e 2020-02-02 patch level 3 is required}%
      {LaTeX2e 2020-02-02 patch level 2 (and 4) has a bug.}
   \else
     \ltj@@latex@plv=300
@@ -834,29 +834,29 @@
 \patchcmd\update@series@target@value@kanji{\f@series}{\k@series}{}{}
 \def\@meta@family@list@kanji{\@elt{mc}\@elt{gt}\@elt{jtt}}
 
-\def\@ltj@hook@series@default#1#2#3{
+\def\@ltj@hook@series@default#1#2#3{%
   \ifltj@ltfilehook@avail % 2020-10-01
     \AddToHook{#1/defaults}{#2}%
   \else\ifcsname @set#1defaultshook\endcsname %after 2020-04-07
     \expandafter\g@addto@macro\csname @set#1defaultshook\endcsname{#2}%
   \else % 2020-02-02
-    \expandafter\patchcmd\csname #1 \endcsname{#3}{#3#2}{}{}
+    \expandafter\patchcmd\csname #1 \endcsname{#3}{#3#2}{}{}%
   \fi\fi
 }
-\@ltj@hook@series@default{bfseries}{
+\@ltj@hook@series@default{bfseries}{%
   \let\bfseries@mc\bfdef@ult
   \let\bfseries@gt\bfdef@ult
   \let\bfseries@jtt\bfdef@ult
-}{
+}{%
   \let\bfseries@rm\bfdef@ult
   \let\bfseries@sf\bfdef@ult
   \let\bfseries@tt\bfdef@ult
 }
-\@ltj@hook@series@default{mdseries}{
+\@ltj@hook@series@default{mdseries}{%
   \let\mdseries@mc\mddef@ult
   \let\mdseries@gt\mddef@ult
   \let\mdseries@jtt\mddef@ult
-}{
+}{%
   \let\mdseries@rm\mddef@ult
   \let\mdseries@sf\mddef@ult
   \let\mdseries@tt\mddef@ult
@@ -890,11 +890,11 @@
   \fi\fi\fi
 }{}{}
 
-\def\@ltj@hook@series#1#2{
+\def\@ltj@hook@series#1#2{%
   \ifltj@ltfilehook@avail % 2020-10-01
     \AddToHook{#1}{#2}%
   \else % 2020-02-02
-    \expandafter\patchcmd\csname #1 \endcsname{\selectfont}{#2\selectfont}{}{}
+    \expandafter\patchcmd\csname #1 \endcsname{\selectfont}{#2\selectfont}{}{}%
   \fi
 }
 \@ltj@hook@series{bfseries}{%
@@ -913,7 +913,7 @@
 }
 \let\@ltj@hook@series\@undefined
 
-\def\@ltj@hook@efd#1#2{
+\def\@ltj@hook@efd#1#2{%
   \ifltj@ltfilehook@avail % 2020-10-01
     \AddToHook{expand@font@defaults}{#1}%
   \else\ifdefined\@expandfontdefaultshook %after 2020-04-07
@@ -930,7 +930,7 @@
 \let\@ltj@hook@efd\@undefined
 
 \ifltj@ltfilehook@avail % 2020-10-01
-  \appto\init@series@setup{
+  \appto\init@series@setup{%
     \ifx\kanjiseriesdefault\kanjiseriesdefault@kernel
       \mdseries
       \let\kanjiseriesdefault\k@series
@@ -945,13 +945,13 @@
   }
 \fi
 
-\def\@ltj@hook@dfh#1{
+\def\@ltj@hook@dfh#1{%
   \ifltj@ltfilehook@avail % 2020-10-01
     \AddToHook{normalfont}{#1}%
   \else\ifdefined\@defaultfamilyhook
     \g@addto@macro\@defaultfamilyhook{#1}%
   \else % 2020-02-02
-    \expandafter\patchcmd\csname normalfont \endcsname{\selectfont}{#1\selectfont}{}{}
+    \expandafter\patchcmd\csname normalfont \endcsname{\selectfont}{#1\selectfont}{}{}%
     \let\reset@font\normalfont
   \fi\fi
 }
-- 
cgit v1.2.3