CTAN sync 202103030301

35 files changed, 469 insertions, 156 deletions

diff --git a/macros/latex/contrib/fewerfloatpages/MANIFEST.md b/macros/latex/contrib/fewerfloatpages/MANIFEST.md
new file mode 100644
index 0000000000..6baecd081a
--- /dev/null
+++ b/macros/latex/contrib/fewerfloatpages/MANIFEST.md
@@ -0,0 +1,133 @@
+# Manifest for fewerfloatpages
+
+This file is a listing of all files considered to be part of this package.
+It is automatically generated with `texlua build.lua manifest`.
+
+
+## Repository manifest
+
+The following groups list the files included in the development repository of the package.
+Files listed with a ‘†’ marker are included in the TDS but not CTAN files, and files listed
+with ‘‡’ are included in both.
+
+### Source files
+
+These are source files for a number of purposes, including the `unpack` process which
+generates the installation files of the package. Additional files included here will also
+be installed for processing such as testing.
+
+* fewerfloatpages.dtx ‡
+* fewerfloatpages.ins ‡
+* l3doc-TUB.cls ‡
+
+### Typeset documentation source files
+
+These files are typeset using LaTeX to produce the PDF documentation for the package.
+
+* fewerfloatpages-code.tex ‡
+* fewerfloatpages-doc.tex ‡
+
+### Text files
+
+Plain text files included as documentation or metadata.
+
+* MANIFEST.md ‡
+* README.md ‡
+* changes.txt ‡
+
+### Derived files
+
+The files created by ‘unpacking’ the package sources. This typically includes
+`.sty` and `.cls` files created from DocStrip `.dtx` files.
+
+* fewerfloatpages.sty †
+
+### Typeset documents
+
+The output files (PDF, essentially) from typesetting the various source, demo,
+etc., package files.
+
+* fewerfloatpages-code.pdf ‡
+* fewerfloatpages-doc.pdf ‡
+
+### Test files
+
+These files form the test suite for the package. `.lvt` or `.lte` files are the individual
+unit tests, and `.tlg` are the stored output for ensuring changes to the package produce
+the same output. These output files are sometimes shared and sometime specific for
+different engines (pdfTeX, XeTeX, LuaTeX, etc.).
+
+* fewerfloatpages-000.lvt 
+* fewerfloatpages-001.lvt 
+* fewerfloatpages-002.lvt 
+* fewerfloatpages-003.lvt 
+* fewerfloatpages-004.lvt 
+* fewerfloatpages-005.lvt 
+* fewerfloatpages-006.lvt 
+* fewerfloatpages-007.lvt 
+* fewerfloatpages-008.lvt 
+* fewerfloatpages-009.lvt 
+* fewerfloatpages-000.tlg 
+* fewerfloatpages-001.tlg 
+* fewerfloatpages-002.tlg 
+* fewerfloatpages-003.tlg 
+* fewerfloatpages-004.luatex.tlg 
+* fewerfloatpages-004.tlg 
+* fewerfloatpages-004.xetex.tlg 
+* fewerfloatpages-005.luatex.tlg 
+* fewerfloatpages-005.tlg 
+* fewerfloatpages-005.xetex.tlg 
+* fewerfloatpages-006.tlg 
+* fewerfloatpages-007.tlg 
+* fewerfloatpages-008.tlg 
+* fewerfloatpages-009.tlg 
+
+
+## TDS manifest
+
+The following groups list the files included in the TeX Directory Structure used to install
+the package into a TeX distribution.
+
+### Source files (TDS)
+
+All files included in the `fewerfloatpages/source` directory.
+
+* fewerfloatpages.dtx 
+* fewerfloatpages.ins 
+
+### TeX files (TDS)
+
+All files included in the `fewerfloatpages/tex` directory.
+
+* fewerfloatpages.sty 
+* l3doc-TUB.cls 
+
+### Doc files (TDS)
+
+All files included in the `fewerfloatpages/doc` directory.
+
+* MANIFEST.md 
+* README.md 
+* changes.txt 
+* fewerfloatpages-code.pdf 
+* fewerfloatpages-code.tex 
+* fewerfloatpages-doc.pdf 
+* fewerfloatpages-doc.tex 
+
+
+## CTAN manifest
+
+The following group lists the files included in the CTAN package.
+
+### CTAN files
+
+* MANIFEST.md 
+* README.md 
+* changes.txt 
+* fewerfloatpages-code.pdf 
+* fewerfloatpages-code.tex 
+* fewerfloatpages-doc.pdf 
+* fewerfloatpages-doc.tex 
+* fewerfloatpages.dtx 
+* fewerfloatpages.ins 
+* l3doc-TUB.cls 
diff --git a/macros/latex/contrib/fewerfloatpages/README.md b/macros/latex/contrib/fewerfloatpages/README.md
index 25a2f6d771..0511ab415e 100644
--- a/macros/latex/contrib/fewerfloatpages/README.md
+++ b/macros/latex/contrib/fewerfloatpages/README.md
@@ -10,13 +10,13 @@ adjustable.
 
 Package source can be found below:
 
-https://github.com/FrankMittelbach/fmitex/
+https://github.com/FrankMittelbach/fmitex-fewerfloatpages/
 
 The license is LPPL 1.3c.
 
 -----
 
-Copyright (C) 2019-2020 Frank Mittelbach<br />
+Copyright (C) 2019-2021 Frank Mittelbach<br />
 <https://latex-project.org/> <br />
 All rights reserved.
 
diff --git a/macros/latex/contrib/fewerfloatpages/changes.txt b/macros/latex/contrib/fewerfloatpages/changes.txt
index 67a21fc352..a268651c32 100644
--- a/macros/latex/contrib/fewerfloatpages/changes.txt
+++ b/macros/latex/contrib/fewerfloatpages/changes.txt
@@ -1 +1,8 @@
-No changes yet
+2021-03-02  Frank Mittelbach  <Frank.Mittelbach@latex-project.org>
+
+	* l3doc-TUB.cls: change some deprecated commands to new names.
+
+	* fewerfloatpages.dtx:
+	Moved to a new home (no other changes)
+
+	https://github.com/FrankMittelbach/fmitex-fewerfloatpages
diff --git a/macros/latex/contrib/fewerfloatpages/fewerfloatpages-code.pdf b/macros/latex/contrib/fewerfloatpages/fewerfloatpages-code.pdf
index 305431fc07..b1bbac0b0f 100644
--- a/macros/latex/contrib/fewerfloatpages/fewerfloatpages-code.pdf
+++ b/macros/latex/contrib/fewerfloatpages/fewerfloatpages-code.pdf
diff --git a/macros/latex/contrib/fewerfloatpages/fewerfloatpages-doc.pdf b/macros/latex/contrib/fewerfloatpages/fewerfloatpages-doc.pdf
index df15415a7d..364798a3a8 100644
--- a/macros/latex/contrib/fewerfloatpages/fewerfloatpages-doc.pdf
+++ b/macros/latex/contrib/fewerfloatpages/fewerfloatpages-doc.pdf
diff --git a/macros/latex/contrib/fewerfloatpages/fewerfloatpages.dtx b/macros/latex/contrib/fewerfloatpages/fewerfloatpages.dtx
index 01903de287..4707f19643 100644
--- a/macros/latex/contrib/fewerfloatpages/fewerfloatpages.dtx
+++ b/macros/latex/contrib/fewerfloatpages/fewerfloatpages.dtx
@@ -1,6 +1,6 @@
 % \iffalse meta-comment
 %
-%% File: fewerfloatpages.dtx (C) Copyright 2019-2020 Frank Mittelbach
+%% File: fewerfloatpages.dtx (C) Copyright 2019-2021 Frank Mittelbach
 %
 % It may be distributed and/or modified under the conditions of the
 % LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -16,8 +16,8 @@
 % for those people who are interested or want to report an issue.
 %
 
-\def\fewerfloatpagesdate   {2020/02/14}
-\def\fewerfloatpagesversion{v1.0a}
+\def\fewerfloatpagesdate   {2021/03/02}
+\def\fewerfloatpagesversion{v1.0b}
 
 
 %<*driver>
diff --git a/macros/latex/contrib/fewerfloatpages/fewerfloatpages.ins b/macros/latex/contrib/fewerfloatpages/fewerfloatpages.ins
index d3e1ef0563..024d261b70 100644
--- a/macros/latex/contrib/fewerfloatpages/fewerfloatpages.ins
+++ b/macros/latex/contrib/fewerfloatpages/fewerfloatpages.ins
@@ -3,7 +3,7 @@
 %% driver files from the dtx file(s) in this package when run through
 %% LaTeX or TeX.
 %%
-%% Copyright 2019-2020 Frank Mittelbach
+%% Copyright 2019-2021 Frank Mittelbach
 %% 
 %% 
 %% This file is part of the fewerfloatpages Bundle for LaTeX.
@@ -35,7 +35,7 @@
 
 This is a generated file.
 
-Copyright 2019-2020 Frank Mittelbach
+Copyright 2019-2021 Frank Mittelbach
 
 This file was generated from file(s) of the LaTeX `fewerfloatpages Bundle'.
 --------------------------------------------------------------------------
diff --git a/macros/latex/contrib/fewerfloatpages/l3doc-TUB.cls b/macros/latex/contrib/fewerfloatpages/l3doc-TUB.cls
index f18911e685..50a8a9a9d9 100644
--- a/macros/latex/contrib/fewerfloatpages/l3doc-TUB.cls
+++ b/macros/latex/contrib/fewerfloatpages/l3doc-TUB.cls
@@ -32,7 +32,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \RequirePackage{expl3,xparse,calc}
-\ProvidesExplClass{l3doc-TUB}{2020/02/14}{}
+\ProvidesExplClass{l3doc-TUB}{2021/03/02}{}
   {L3 Experimental documentation class (special version for TUGboat with fixes)}
 \clist_new:N \g_docinput_clist
 \seq_new:N \g_doc_functions_seq
@@ -1400,10 +1400,10 @@
       {
         \llap
           {
-            \hbox_unpack_clear:N \l__codedoc_macro_index_box
+            \hbox_unpack_drop:N \l__codedoc_macro_index_box
             \vtop to \baselineskip
               {
-                \vbox_unpack_clear:N \l__codedoc_macro_box
+                \vbox_unpack_drop:N \l__codedoc_macro_box
                 \vss
               }
           }
@@ -1443,7 +1443,7 @@
         \__codedoc_if_macro_internal:nF {#1}
           { \seq_gput_right:Nn \g_doc_macros_seq {#1} }
         \hbox_set:Nw \l__codedoc_macro_index_box
-          \hbox_unpack_clear:N \l__codedoc_macro_index_box
+          \hbox_unpack_drop:N \l__codedoc_macro_index_box
           \int_gincr:N \c@CodelineNo
           \__codedoc_special_index:nn {#1} { main }
           \int_gdecr:N \c@CodelineNo
@@ -1455,7 +1455,7 @@
   {
     \vbox_set:Nn \l__codedoc_macro_box
       {
-        \vbox_unpack_clear:N \l__codedoc_macro_box
+        \vbox_unpack_drop:N \l__codedoc_macro_box
         \hbox { \llap { \__codedoc_print_macroname:nN {#1} #2 \ } }
       }
     \int_incr:N \l__codedoc_macro_int
diff --git a/macros/latex/contrib/graphics-def/dvipdfmx.def b/macros/latex/contrib/graphics-def/dvipdfmx.def
index 3059916797..a8ebdad500 100644
--- a/macros/latex/contrib/graphics-def/dvipdfmx.def
+++ b/macros/latex/contrib/graphics-def/dvipdfmx.def
@@ -1,5 +1,5 @@
 %% dvipdfmx.def
-%% Copyright (C) 2005-2020 LaTeX3 Project, Jin-Hwan Cho, Shunsaku Hirata
+%% Copyright (C) 2005-2021 LaTeX3 Project, Jin-Hwan Cho, Shunsaku Hirata
 %%                         (with contributions from many others)
 %%
 %% This work may be distributed and/or modified under the
@@ -17,7 +17,7 @@
 %% https://github.com/latex3/graphics-def/issues
 %%
 \ProvidesFile{dvipdfmx.def}
-  [2020/08/26 v5.0h Graphics/color driver for dvipdfmx]
+  [2021/03/02 v5.0i Graphics/color driver for dvipdfmx]
 \def\GPT@space{ }
 \def\c@lor@arg#1{%
   \dimen@#1\p@
@@ -384,15 +384,23 @@
 \def\convert@color@cmyk#1{#1 k #1 K}
 \def\convert@color@gray#1{#1 g #1 G}
 \def\convert@color@rgb#1{#1 rg #1 RG}
+\def\convert@color@#1{%
+  \expandafter\expandafter\expandafter\convert@@color
+    \expandafter\expandafter\expandafter{\csname col@#1\endcsname}%
+}
+% Deal with named colors
+\def\define@color@named#1#2{\expandafter\edef\csname col@#1\endcsname{#2}}
 % Change the specials to use the stack
-\chardef\main@pdfcolorstack=1 %
-\ifx\AtBeginDvi\undefined
-  \long\def\@firstofone#1{#1}%
-  \expandafter\@firstofone
-\else
-  \expandafter\AtBeginDvi
+\ifdefined\main@pdfcolorstack\else
+  \chardef\main@pdfcolorstack=1 %
+  \ifx\AtBeginDvi\undefined
+    \long\def\@firstofone#1{#1}%
+    \expandafter\@firstofone
+  \else
+    \expandafter\AtBeginDvi
+  \fi
+    {\special{pdfcolorstackinit \the\main@pdfcolorstack\space page direct (0 g 0 G)}}
 \fi
-  {\special{pdfcolorstackinit \the\main@pdfcolorstack\space page direct (0 g 0 G)}}
 \def\@pdfcolorstack{\the\main@pdfcolorstack\space}
 \def\set@color{%
   \special{pdfcolorstack \@pdfcolorstack push (\convert@color\current@color)}%
diff --git a/macros/latex/contrib/graphics-def/xetex.def b/macros/latex/contrib/graphics-def/xetex.def
index 6f37ccc3d4..25dd2cefa0 100644
--- a/macros/latex/contrib/graphics-def/xetex.def
+++ b/macros/latex/contrib/graphics-def/xetex.def
@@ -1,5 +1,5 @@
 %% xetex.def
-%% Copyright (C) 2005-2020 LaTeX3 Project, Jin-Hwan Cho, Shunsaku Hirata
+%% Copyright (C) 2005-2021 LaTeX3 Project, Jin-Hwan Cho, Shunsaku Hirata
 %%                         (with contributions from many others)
 %%
 %% This work may be distributed and/or modified under the
@@ -17,7 +17,7 @@
 %% https://github.com/latex3/graphics-def/issues
 %%
 \ProvidesFile{xetex.def}
-  [2020/08/26 v5.0i Graphics/color driver for xetex]
+  [2021/03/02 v5.0j Graphics/color driver for xetex]
 \def\GPT@space{ }
 \def\c@lor@arg#1{%
   \dimen@#1\p@
@@ -483,15 +483,23 @@
 \def\convert@color@cmyk#1{#1 k #1 K}
 \def\convert@color@gray#1{#1 g #1 G}
 \def\convert@color@rgb#1{#1 rg #1 RG}
+\def\convert@color@#1{%
+  \expandafter\expandafter\expandafter\convert@@color
+    \expandafter\expandafter\expandafter{\csname col@#1\endcsname}%
+}
+% Deal with named colors
+\def\define@color@named#1#2{\expandafter\edef\csname col@#1\endcsname{#2}}
 % Change the specials to use the stack
-\chardef\main@pdfcolorstack=1 %
-\ifx\AtBeginDvi\undefined
-  \long\def\@firstofone#1{#1}%
-  \expandafter\@firstofone
-\else
-  \expandafter\AtBeginDvi
+\ifdefined\main@pdfcolorstack\else
+  \chardef\main@pdfcolorstack=1 %
+  \ifx\AtBeginDvi\undefined
+    \long\def\@firstofone#1{#1}%
+    \expandafter\@firstofone
+  \else
+    \expandafter\AtBeginDvi
+  \fi
+    {\special{pdfcolorstackinit \the\main@pdfcolorstack\space page direct (0 g 0 G)}}
 \fi
-  {\special{pdfcolorstackinit \the\main@pdfcolorstack\space page direct (0 g 0 G)}}
 \def\@pdfcolorstack{\the\main@pdfcolorstack\space}
 \def\set@color{%
   \special{pdfcolorstack \@pdfcolorstack push (\convert@color\current@color)}%
diff --git a/macros/latex/contrib/l3backend/CHANGELOG.md b/macros/latex/contrib/l3backend/CHANGELOG.md
index f787acd709..ed6da43a39 100644
--- a/macros/latex/contrib/l3backend/CHANGELOG.md
+++ b/macros/latex/contrib/l3backend/CHANGELOG.md
@@ -6,6 +6,15 @@ this project uses date-based 'snapshot' version identifiers.
 
 ## [Unreleased]
 
+## [2021-03-02]
+
+### Changed
+- Drop 'correction' for link placement in `(x)dvidpfmx`: no longer required
+- Define `\main@pdfcolorstack` for `(x)dvipdfmx` if it does not exist
+
+### Fixed
+- Initialisation of color stacks for `(x)dvipdfmx`
+
 ## [2021-02-18]
 
 ### Changed
@@ -159,7 +168,8 @@ this project uses date-based 'snapshot' version identifiers.
 - Include `l3backend` in file names
 - Moved backend code to internal for each 'parent' module
 
-[Unreleased]: https://github.com/latex3/latex3/compare/2021-02-18...HEAD
+[Unreleased]: https://github.com/latex3/latex3/compare/2021-03-02...HEAD
+[2021-03-02]: https://github.com/latex3/latex3/compare/2021-02-18...2021-03-02
 [2021-02-18]: https://github.com/latex3/latex3/compare/2021-02-06...2021-02-18
 [2021-02-06]: https://github.com/latex3/latex3/compare/2021-01-29...2021-02-06
 [2021-01-29]: https://github.com/latex3/latex3/compare/2021-01-09...2021-01-29
diff --git a/macros/latex/contrib/l3backend/README.md b/macros/latex/contrib/l3backend/README.md
index 02118d1218..564a2e8cd6 100644
--- a/macros/latex/contrib/l3backend/README.md
+++ b/macros/latex/contrib/l3backend/README.md
@@ -1,7 +1,7 @@
 LaTeX3 Backend Drivers
 ======================
 
-Release 2021-02-18
+Release 2021-03-02
 
 This package forms parts of `expl3`, and contains the code used to interface
 with backends (drivers) across the `expl3` codebase. The functions here are
diff --git a/macros/latex/contrib/l3backend/l3backend-basics.dtx b/macros/latex/contrib/l3backend/l3backend-basics.dtx
index b7f09e7dbd..c5b5dd73e1 100644
--- a/macros/latex/contrib/l3backend/l3backend-basics.dtx
+++ b/macros/latex/contrib/l3backend/l3backend-basics.dtx
@@ -43,7 +43,7 @@
 %    }^^A
 % }
 %
-% \date{Released 2021-02-18}
+% \date{Released 2021-03-02}
 %
 % \maketitle
 %
@@ -70,27 +70,27 @@
 %    \begin{macrocode}
 \ProvidesExplFile
 %<*dvipdfmx>
-  {l3backend-dvipdfmx.def}{2021-02-18}{}
+  {l3backend-dvipdfmx.def}{2021-03-02}{}
   {L3 backend support: dvipdfmx}
 %</dvipdfmx>
 %<*dvips>
-  {l3backend-dvips.def}{2021-02-18}{}
+  {l3backend-dvips.def}{2021-03-02}{}
   {L3 backend support: dvips}
 %</dvips>
 %<*dvisvgm>
-  {l3backend-dvisvgm.def}{2021-02-18}{}
+  {l3backend-dvisvgm.def}{2021-03-02}{}
   {L3 backend support: dvisvgm}
 %</dvisvgm>
 %<*luatex>
-  {l3backend-luatex.def}{2021-02-18}{}
+  {l3backend-luatex.def}{2021-03-02}{}
   {L3 backend support: PDF output (LuaTeX)}
 %</luatex>
 %<*pdftex>
-  {l3backend-pdftex.def}{2021-02-18}{}
+  {l3backend-pdftex.def}{2021-03-02}{}
   {L3 backend support: PDF output (pdfTeX)}
 %</pdftex>
 %<*xetex>
-  {l3backend-xetex.def}{2021-02-18}{}
+  {l3backend-xetex.def}{2021-03-02}{}
   {L3 backend support: XeTeX}
 %</xetex>
 %    \end{macrocode}
diff --git a/macros/latex/contrib/l3backend/l3backend-box.dtx b/macros/latex/contrib/l3backend/l3backend-box.dtx
index bc0a3ffdd5..84e5dad2cb 100644
--- a/macros/latex/contrib/l3backend/l3backend-box.dtx
+++ b/macros/latex/contrib/l3backend/l3backend-box.dtx
@@ -43,7 +43,7 @@
 %    }^^A
 % }
 %
-% \date{Released 2021-02-18}
+% \date{Released 2021-03-02}
 %
 % \maketitle
 %
diff --git a/macros/latex/contrib/l3backend/l3backend-code.pdf b/macros/latex/contrib/l3backend/l3backend-code.pdf
index a70f304b62..3a2b841607 100644
--- a/macros/latex/contrib/l3backend/l3backend-code.pdf
+++ b/macros/latex/contrib/l3backend/l3backend-code.pdf
diff --git a/macros/latex/contrib/l3backend/l3backend-color.dtx b/macros/latex/contrib/l3backend/l3backend-color.dtx
index 451a0039a5..50271f57b3 100644
--- a/macros/latex/contrib/l3backend/l3backend-color.dtx
+++ b/macros/latex/contrib/l3backend/l3backend-color.dtx
@@ -43,7 +43,7 @@
 %    }^^A
 % }
 %
-% \date{Released 2021-02-18}
+% \date{Released 2021-03-02}
 %
 % \maketitle
 %
@@ -211,17 +211,20 @@
       {
         \int_gincr:N \exp_not:N \g_@@_backend_stack_int
         \int_const:Nn #1 { \exp_not:N \g_@@_backend_stack_int }
-        \cs_if_exist:NTF \AtBeginDvi
-          { \exp_not:N \AtBeginDvi }
-          { \exp_not:N \use:n }
+        \use:x
           {
-            \__kernel_backend_literal:x
+            \cs_if_exist:NTF \AtBeginDvi
+              { \exp_not:N \AtBeginDvi }
+              { \exp_not:N \use:n }
               {
-                pdfcolorstackinit ~
-                \exp_not:N \int_use:N \exp_not:N \g_@@_backend_stack_int
-                \c_space_tl
-                \exp_not:N \tl_if_blank:nF {#2} { #2 ~ }
-                (#3)
+                \__kernel_backend_literal:n
+                  {
+                    pdfcolorstackinit ~
+                    \exp_not:N \int_use:N \exp_not:N \g_@@_backend_stack_int
+                    \c_space_tl
+                    \exp_not:N \tl_if_blank:nF {#2} { #2 ~ }
+                    (#3)
+                  }
               }
           }
       }
@@ -235,6 +238,7 @@
           { page ~ direct } { 0 ~ g ~ 0 ~ G }
         \int_set_eq:NN \l_@@_backend_stack_int
           \c_@@_backend_main_stack_int
+        \int_const:cn { main@pdfcolorstack } { \c_@@_backend_main_stack_int }
       }
   }
 %    \end{macrocode}
@@ -768,7 +772,6 @@
 %    \end{macrocode}
 %
 % \begin{macro}{\@@_backend_select_separation:nn, \@@_backend_select_devicen:nn}
-% \begin{macro}{\@@_backend_select:n}
 %   Although \texttt{(x)dvipdfmx} has a built-in approach to color spaces, that
 %   can't be used with the generic color stacks. So we take an approach in which
 %   we share the same code as for \pdfTeX{}.
@@ -778,7 +781,6 @@
 \cs_new_eq:NN \@@_backend_select_devicen:nn \@@_backend_select_separation:nn
 %    \end{macrocode}
 % \end{macro}
-% \end{macro}
 %
 % \begin{macro}{\@@_backend_separation_init:nnnnn}
 % \begin{macro}{\@@_backend_separation_init:n}
diff --git a/macros/latex/contrib/l3backend/l3backend-draw.dtx b/macros/latex/contrib/l3backend/l3backend-draw.dtx
index 5536391276..492a899ee6 100644
--- a/macros/latex/contrib/l3backend/l3backend-draw.dtx
+++ b/macros/latex/contrib/l3backend/l3backend-draw.dtx
@@ -43,7 +43,7 @@
 %    }^^A
 % }
 %
-% \date{Released 2021-02-18}
+% \date{Released 2021-03-02}
 %
 % \maketitle
 %
diff --git a/macros/latex/contrib/l3backend/l3backend-graphics.dtx b/macros/latex/contrib/l3backend/l3backend-graphics.dtx
index c3ec121c07..fc8ae066a0 100644
--- a/macros/latex/contrib/l3backend/l3backend-graphics.dtx
+++ b/macros/latex/contrib/l3backend/l3backend-graphics.dtx
@@ -43,7 +43,7 @@
 %    }^^A
 % }
 %
-% \date{Released 2021-02-18}
+% \date{Released 2021-03-02}
 %
 % \maketitle
 %
diff --git a/macros/latex/contrib/l3backend/l3backend-header.dtx b/macros/latex/contrib/l3backend/l3backend-header.dtx
index eafd36f50d..41e15d39d9 100644
--- a/macros/latex/contrib/l3backend/l3backend-header.dtx
+++ b/macros/latex/contrib/l3backend/l3backend-header.dtx
@@ -43,7 +43,7 @@
 %    }^^A
 % }
 %
-% \date{Released 2021-02-18}
+% \date{Released 2021-03-02}
 %
 % \maketitle
 %
diff --git a/macros/latex/contrib/l3backend/l3backend-opacity.dtx b/macros/latex/contrib/l3backend/l3backend-opacity.dtx
index ee4702a3cd..d4725d6bfe 100644
--- a/macros/latex/contrib/l3backend/l3backend-opacity.dtx
+++ b/macros/latex/contrib/l3backend/l3backend-opacity.dtx
@@ -43,7 +43,7 @@
 %    }^^A
 % }
 %
-% \date{Released 2021-02-18}
+% \date{Released 2021-03-02}
 %
 % \maketitle
 %
diff --git a/macros/latex/contrib/l3backend/l3backend-pdf.dtx b/macros/latex/contrib/l3backend/l3backend-pdf.dtx
index ad2b0d5170..b6e7e39837 100644
--- a/macros/latex/contrib/l3backend/l3backend-pdf.dtx
+++ b/macros/latex/contrib/l3backend/l3backend-pdf.dtx
@@ -43,7 +43,7 @@
 %    }^^A
 % }
 %
-% \date{Released 2021-02-18}
+% \date{Released 2021-03-02}
 %
 % \maketitle
 %
@@ -1352,21 +1352,6 @@
 %
 % \subsubsection{Annotations}
 %
-% \begin{variable}{\g_@@_landscape_bool}
-%   There is a bug in \texttt{dvipdfmx}/\XeTeX{} which means annotations do
-%   not rotate. As such, we need to know if landscape is active.
-%    \begin{macrocode}
-\bool_new:N \g_@@_landscape_bool
-\cs_if_exist:NT \landscape
-  {
-    \tl_put_right:Nn \landscape
-      { \bool_gset_true:N \g_@@_landscape_bool }
-    \tl_put_left:Nn \endlandscape
-      { \bool_gset_false:N \g_@@_landscape_bool }
-  }
-%    \end{macrocode}
-% \end{variable}
-%
 % \begin{variable}{\g_@@_backend_annotation_int}
 %   Needed as objects which are not annotations could be created.
 %    \begin{macrocode}
@@ -1374,27 +1359,11 @@
 %    \end{macrocode}
 % \end{variable}
 %
-% \begin{macro}{\@@_backend_annotation:nnnn, \@@_backend_annotation_aux:nnnn}
+% \begin{macro}{\@@_backend_annotation:nnnn}
 %   Simply pass the raw data through, just dealing with evaluation of dimensions.
-%   The only wrinkle is landscape: we have to adjust by hand.
 %    \begin{macrocode}
 \cs_new_protected:Npn \@@_backend_annotation:nnnn #1#2#3#4
   {
-    \bool_if:NTF \g_@@_landscape_bool
-      {
-         \box_move_up:nn {#2}
-           {
-             \vbox:n
-               {
-                 \@@_backend_annotation_aux:nnnn
-                   { #2 + #3 } {#1} { 0pt } {#4}
-               }
-           }
-      }
-      { \@@_backend_annotation_aux:nnnn {#1} {#2} {#3} {#4} }
-  }
-\cs_new_protected:Npn \@@_backend_annotation_aux:nnnn #1#2#3#4
-  {
     \int_gincr:N \g_@@_backend_object_int
     \int_gset_eq:NN \g_@@_backend_annotation_int \g_@@_backend_object_int
     \@@_backend:x
diff --git a/macros/latex/contrib/l3backend/l3backend.ins b/macros/latex/contrib/l3backend/l3backend.ins
index 7fced393bd..5bba632ffb 100644
--- a/macros/latex/contrib/l3backend/l3backend.ins
+++ b/macros/latex/contrib/l3backend/l3backend.ins
@@ -30,7 +30,7 @@ license information is placed in the derived files.
 \fi
 
 \let\jobname\relax
-\input l3docstrip.dtx
+\input docstrip %
 \askforoverwritefalse
 
 \preamble
diff --git a/macros/latex/contrib/lni/CHANGELOG.md b/macros/latex/contrib/lni/CHANGELOG.md
index ffe1091622..0620ff73a0 100644
--- a/macros/latex/contrib/lni/CHANGELOG.md
+++ b/macros/latex/contrib/lni/CHANGELOG.md
@@ -6,6 +6,16 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+## [1.7.0] - 2021-03-02
+
+### Changed
+
+- Change loading of latest ngerman hyphenation patterns (#47)
+- Change `\year` to `\yearofpublication` to avoid problems (#85)
+
+### Fixed
+- Fix setting of pdf metadata (#87)
+  
 ## [1.6.0] - 2019-10-14
 
 ### Added
@@ -96,7 +106,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ## [1.0.0] - 2017-04-07
 First release of the revised files
 
-[Unreleased]: https://github.com/gi-ev/LNI/compare/v1.6...HEAD
+[Unreleased]: https://github.com/gi-ev/LNI/compare/v1.7...HEAD
+[1.7.0]: https://github.com/gi-ev/LNI/releases/tag/v1.7
 [1.6.0]: https://github.com/gi-ev/LNI/releases/tag/v1.6
 [1.5.0]: https://github.com/gi-ev/LNI/releases/tag/v1.5
 [1.4.0]: https://github.com/gi-ev/LNI/releases/tag/v1.4
diff --git a/macros/latex/contrib/lni/README.md b/macros/latex/contrib/lni/README.md
index 14ba136377..f986ef46f5 100644
--- a/macros/latex/contrib/lni/README.md
+++ b/macros/latex/contrib/lni/README.md
@@ -3,8 +3,8 @@
 ```
 ----------------------------------------------------------------------------
 lni      -- A class for submissions to the ``Lecture Notes in Informatics''
-(c) 2016-2019 Gesellschaft für Informatik (GI)
-Version:    1.6
+(c) 2016-2021 Gesellschaft für Informatik (GI)
+Version:    1.7
 Maintainer: Martin Sievers
 Email:      martin.sievers@schoenerpublizieren.de
 License:    Released under the LaTeX Project Public License v1.3c or later
diff --git a/macros/latex/contrib/lni/lni-author-template.tex b/macros/latex/contrib/lni/lni-author-template.tex
index 6dffc4195c..abdbd74ce6 100644
--- a/macros/latex/contrib/lni/lni-author-template.tex
+++ b/macros/latex/contrib/lni/lni-author-template.tex
@@ -24,7 +24,7 @@ Firstname2 Lastname2\footnote{University, Department, Address, Country
 \startpage{11} % Beginn der Seitenzählung für diesen Beitrag / Start page
 \editor{Herausgeber et al.} % Names of Editors
 \booktitle{Name-der-Konferenz} % Name of book title
-\year{2017}
+\yearofpublication{2017}
 %%%\lnidoi{18.18420/provided-by-editor-02} % if known
 \maketitle
 
diff --git a/macros/latex/contrib/lni/lni-paper-example-de.tex b/macros/latex/contrib/lni/lni-paper-example-de.tex
index 236664d160..40f52c0b1f 100644
--- a/macros/latex/contrib/lni/lni-paper-example-de.tex
+++ b/macros/latex/contrib/lni/lni-paper-example-de.tex
@@ -49,7 +49,7 @@
 \startpage{11} % Beginn der Seitenzählung für diesen Beitrag
 \editor{Herausgeber et al.}    % Namen der Herausgeber
 \booktitle{Name-der-Konferenz} % Name des Tagungsband; optional Kurztitel
-\year{2017}
+\yearofpublication{2017}
 %%%\lnidoi{18.18420/provided-by-editor-02} % Falls bekannt
 \maketitle
 
diff --git a/macros/latex/contrib/lni/lni.dtx b/macros/latex/contrib/lni/lni.dtx
index 8301090e40..4ad46abd8d 100644
--- a/macros/latex/contrib/lni/lni.dtx
+++ b/macros/latex/contrib/lni/lni.dtx
@@ -60,7 +60,7 @@ License:| Released under the LaTeX Project Public License v1.3c or later
 
 \postamble
 
-Copyright (C) 2016-2019 by Gesellschaft für Informatik e.V. (GI)
+Copyright (C) 2016-2021 by Gesellschaft für Informatik e.V. (GI)
 
 This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License (LPPL), either
@@ -101,11 +101,11 @@ This work consists of the file  lni.dtx
 %</install>
 %<install>\endbatchfile
 %<*internal>
-\usedir{source/latex/lni}
-\generate{
-  \usepreamble\classpre
-  \file{\jobname.ins}{\from{\jobname.dtx}{install}}
-}
+%%%\usedir{source/latex/lni}
+%%%\generate{
+%%%%  \usepreamble\classpre
+%%%  \file{\jobname.ins}{\from{\jobname.dtx}{install}}
+%%%}
 \nopreamble\nopostamble
 \usedir{doc/latex/lni}
 \generate{
@@ -134,7 +134,7 @@ This work consists of the file  lni.dtx
 %<class>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
 %<class>\ProvidesClass{lni}
 %<*class>
-    [2019/10/14 v1.6BETA Official class for submissions to the ``Lecture Notes
+    [2021/03/02 v1.7 Official class for submissions to the ``Lecture Notes
     in Informatics'']
 %</class>
 %<*driver>
@@ -160,8 +160,8 @@ This work consists of the file  lni.dtx
 \usepackage[%
 	pdftitle={lni: Official LaTeX class for submissions to the ``Lecture Notes in
    	Informatics'', published by the ``Gesellschaft für Informatik e.\,V.'' (GI)},
-    pdfauthor={Martin Sievers},
-    urlcolor=blue,%
+   pdfauthor={Martin Sievers},
+   urlcolor=blue,%
 	linktoc=both,%
 	colorlinks=true]{hyperref}
 \usepackage[nameinlink,capitalise]{cleveref}
@@ -305,6 +305,13 @@ This work consists of the file  lni.dtx
 % it more compatible with other packages like \pkg{authorarchive}}
 % \changes{v1.6}{2019/10/14}{Fix for BibTeX style}
 % \changes{v1.6}{2019/10/14}{Add support for \pkg{selnolig}}
+% \changes{v1.7}{2020/12/03}{Revert redefinition of \cs{year} after 
+% \cs{maketitle}}
+% \changes{v1.7}{2021/03/02}{Fix setting of pdf metadata (#87)}
+% \changes{v1.7}{2021/03/02}{Change loading of latest ngerman hyphenation
+% patterns (#47)}
+% \changes{v1.7}{2021/03/02}{Change \cs{year} to \cs{yearofpublication} to 
+% avoid problems (#85)}
 %
 % \GetFileInfo{\jobname.dtx}
 % \DoNotIndex{\newcommand,\newenvironment}
@@ -453,7 +460,7 @@ This work consists of the file  lni.dtx
 % % !TeX program = pdflatex
 % % !BIB program = bibtex8
 % % !TeX encoding = UTF-8
-% % !TeX spellcheck = de_DE
+% % !TeX spellcheck = en_US
 % \documentclass[english]{lni}
 % \end{examplecode}
 %
@@ -461,7 +468,7 @@ This work consists of the file  lni.dtx
 % \DescribeMacro{\startpage}\DescribeMacro{\editor}%
 % \DescribeMacro{\booktitle\space(changed in v1.6)}%
 % \DescribeMacro{\booksubtitle\space(new in v1.6)}%
-% \DescribeMacro{\year}In addition to the macros stated in
+% \DescribeMacro{\yearofpublication}In addition to the macros stated in
 % \cref{sec:titlepage} for authors, there are special editor macros to
 % influence the layout of the article:
 % \begin{itemize}
@@ -601,7 +608,8 @@ This work consists of the file  lni.dtx
 % \end{table}
 % \end{examplecode}
 %
-% \subsubsection{Listings\,/\,Source code}
+% \subsubsection{\texorpdfstring{Listings\,/\,Source code}%
+%   {Listings/Source code}}
 % The \lni{} bundle loads the \pkg{verbatim} and \pkg{listings} package. While
 % the former is there for compatability, the later is the standard way of
 % integrating source code listings into a \LaTeX{} document.
@@ -785,15 +793,6 @@ This work consists of the file  lni.dtx
 \ProcessOptions\relax
 %
 \RequirePackage{iftex}
-\ifPDFTeX
-   \RequirePackage{hyphsubst}
-   \HyphSubstIfExists{ngerman-x-latest}%
-      {\HyphSubstLet{ngerman}{ngerman-x-latest}%
-       \ClassInfo{lni}{Using latest German hyphenation patterns}}%
-      {\ClassWarning{lni}{Latest German hyphenation patterns could not be found!%
-         \MessageBreak If you write a German article you should check your%
-         installation}}%
-\fi%
 \LoadClass[10pt,twoside,a4paper,fleqn]{article}
 \ifPDFTeX
    \RequirePackage{cmap}
@@ -806,6 +805,8 @@ This work consists of the file  lni.dtx
    \RequirePackage[ngerman,english]{babel}
 \else
    \RequirePackage[english,ngerman]{babel}
+   \babelprovide[hyphenrules=ngerman-x-latest]{ngerman}
+   \ClassInfo{lni}{Using latest German hyphenation patterns}%
 \fi%
 % Hint by http://tex.stackexchange.com/a/321067/9075 -> enable "= as dashes
 \useshorthands*{"}
@@ -848,7 +849,7 @@ This work consists of the file  lni.dtx
          {\RequirePackage{newtxmath}}%
          {}%
       \RequirePackage[no-math]{fontspec}
-      \IfFontExistsTF{texgyretrmes-regular.otf}
+      \IfFontExistsTF{texgyretermes-regular.otf}
          {%
           \setmainfont{texgyretermes}[
              Extension = .otf,
@@ -956,7 +957,7 @@ This work consists of the file  lni.dtx
             \normalsize
             \expandafter\csname\CROP@font\endcsname{%
                ``\jobname''\x
-               \the\@rigyear/\the\month/\the\day\x
+               \the\year/\the\month/\the\day\x
                \CROP@time\x
                page\kern.5em\thepage\x
                \#\the\CROP@index
@@ -1089,8 +1090,16 @@ This work consists of the file  lni.dtx
 % \begin{macro}{\author}
 %    \begin{macrocode}
 \renewcommand{\author}{\@dblarg\@@author}
-\def\@@author[#1]#2{\gdef\@shortauthor{{\let\footnote\@gobble%
-   \def\and{\unskip,\ }#1}}\gdef\@author{#2}}
+\newcommand{\@@author}[2][]{%
+   \DeclareRobustCommand{\@shortauthor}{%
+         {%
+            %\let\footnote\@gobble%
+            \def\and{\texorpdfstring{\unskip,\ }{}}%
+            #1%
+         }%
+      }%
+      \DeclareRobustCommand{\@author}{#2}%
+   }
 %    \end{macrocode}
 % \end{macro}
 % \begin{macro}{\authorrunning}
@@ -1113,7 +1122,7 @@ This work consists of the file  lni.dtx
 % Title: Kopie aus article.cls mit anderem \thispagestyle
 %    \begin{macrocode}
 \renewcommand\maketitle{\par%
-\begingroup
+   \begingroup
     \renewcommand\thefootnote{\@arabic\c@footnote}%
     \def\@makefnmark% keine Einrückung der Fußnoten eingestellt
 		 {\@textsuperscript{\normalfont\@thefnmark}}%
@@ -1132,7 +1141,7 @@ This work consists of the file  lni.dtx
       \fi%
     \else
       \newpage
-      \global\@topnum\z@   % Prevents figures from going at top of page.
+      \global\@topnum\z@% Prevents figures from going at top of page.
       \@maketitle
     \fi%
     \ifnorunningheads
@@ -1142,6 +1151,14 @@ This work consists of the file  lni.dtx
     \fi%
     \@thanks
   \endgroup
+  \ifusehyperref
+      \HyXeTeX@CheckUnicode
+      \HyPsd@PrerenderUnicode{\@shortauthor}%
+      \pdfstringdef\@pdfauthor{\@shortauthor}%
+      \HyXeTeX@CheckUnicode
+      \HyPsd@PrerenderUnicode{\@title}%
+      \pdfstringdef\@pdftitle{\@title}%
+  \fi%
   \global\let\thanks\relax
   \global\let\maketitle\relax
   \global\let\@maketitle\relax
@@ -1215,8 +1232,13 @@ This work consists of the file  lni.dtx
     \noindent\ignorespaces{\bfseries Keywords:\ }}%
    {\global\keywordsfalse}
 \let\@RIGsection\section
-\pretocmd\@startsection{\ifkeywords\ClassError{lni}{keywords is an environment, not a macro}%
-   {Please change \string\keywords\space to an environment}\keywordsfalse\fi}{}{}
+\pretocmd\@startsection{%
+   \ifkeywords\ClassError{lni}%
+      {keywords is an environment, not a macro}%
+      {Please change \string\keywords\space to an environment}%
+      \keywordsfalse%
+   \fi%
+}{}{}
 %    \end{macrocode}
 % \end{environment}
 % Section headings
@@ -1290,7 +1312,7 @@ This work consists of the file  lni.dtx
 \renewcommand{\labelitemi}{$\bullet$}
 \renewcommand*\itemize{%
   \ifnum \@itemdepth >\thr@@\@toodeep\else
-  	\setlength{\labelsep}{0.70cm}%Abstand zum Aufzählungspunkt
+  	\setlength{\labelsep}{0.70cm}%
     \advance\@itemdepth\@ne
     \edef\@itemitem{labelitem\romannumeral\the\@itemdepth}%
     \expandafter
@@ -1352,6 +1374,7 @@ This work consists of the file  lni.dtx
 % \end{macro}
 % \begin{macro}{\booktitle}
 %    \begin{macrocode}
+\def\@bookshorttitle{}
 \newcommand{\booktitle}{\@dblarg\@@booktitle}
 \def\@@booktitle[#1]#2{\gdef\@bookshorttitle{#1}\gdef\@booktitle{#2}}
 %    \end{macrocode}
@@ -1366,35 +1389,43 @@ This work consists of the file  lni.dtx
 %    \end{macrocode}
 % \end{macro}
 %    \begin{macrocode}
-\AtBeginDocument{%
-   \let\@rigyear\year
-   \newcommand*{\@year}{\the\@rigyear}
-   \renewcommand*{\year}[1]{%
-      \renewcommand{\@year}{#1}%
-   }%
-}%
+\newcommand*{\@yearofpublication}{\the\year}
+\newcommand*{\yearofpublication}[1]{\renewcommand*{\@yearofpublication}{#1}}
 %    \end{macrocode}
 % set-up for header and footer
 %    \begin{macrocode}
 \fancypagestyle{plain}{%
    \fancyhead{} % Löscht alle Kopfzeileneinstellungen
-   \fancyhead[RO]{\small\@editor~(Hrsg.):\ \@bookshorttitle,\hspace{1sp}\null\linebreak%
-       Lecture Notes in Informatics (LNI), Gesellschaft für Informatik, Bonn~\@year%
-       \hspace{5pt}\thepage\hspace{0.05cm}}
-   \fancyhead[LE]{\small\@editor~(Hrsg.):\
-   \@bookshorttitle,\linebreak\hspace{0.05cm}\thepage\hspace{5pt} Lecture Notes
-   in Informatics (LNI), Gesellschaft für Informatik, Bonn~\@year}
-   \fancyfoot{} % Löscht alle Fußzeileneinstellungen
-   \renewcommand{\headrulewidth}{0.4pt} %Linie unter Kopfzeile
+   \fancyhead[RO]{%
+      \small\@editor~(Hrsg.):\ 
+      \ifdefempty{\@bookshorttitle}%
+         {}%
+         {\@bookshorttitle,\hspace{1sp}}%
+      \null\linebreak%
+      Lecture Notes in Informatics (LNI), Gesellschaft für Informatik, 
+      Bonn~\@yearofpublication%
+      \hspace{5pt}\thepage\hspace{0.05cm}%
+   }%
+   \fancyhead[LE]{%
+      \small\@editor~(Hrsg.):\
+      \ifdefempty{\@bookshorttitle}%
+      {}%
+      {\@bookshorttitle,\hspace{1sp}}%
+      \linebreak\hspace{0.05cm}\thepage\hspace{5pt} Lecture Notes
+      in Informatics (LNI), Gesellschaft für Informatik, 
+      Bonn~\@yearofpublication%
+   }%
+   \fancyfoot{}% Löscht alle Fußzeileneinstellungen
+   \renewcommand{\headrulewidth}{0.4pt}% Linie unter Kopfzeile
 }%
 \ifnorunningheads
    \pagestyle{empty}
 \else
    \pagestyle{fancy}
-   \fancyhead{} % Löscht alle Kopfzeileneinstellungen
+   \fancyhead{}% Löscht alle Kopfzeileneinstellungen
    \fancyhead[RO]{\small\@shorttitle\hspace{5pt}\thepage\hspace{0.05cm}}
    \fancyhead[LE]{\hspace{0.05cm}\small\thepage\hspace{5pt}\@shortauthor}
-   \fancyfoot{} % Löscht alle Fußzeileneinstellungen
+   \fancyfoot{}% Löscht alle Fußzeileneinstellungen
    \renewcommand{\headrulewidth}{0.4pt} %Linie unter Kopfzeile
 \fi%
 %    \end{macrocode}
@@ -1417,10 +1448,14 @@ This work consists of the file  lni.dtx
          colorlinks=true,%
          allcolors=black,%
          pdfstartview=Fit,%
-         pdfauthor={\@author},%
-         pdftitle={\@title}%
       }%
+%%%      \pdfstringdefDisableCommands{%
+%%%         \def\unskip{}%
+%%%         \renewcommand{\footnote}[1]{}%
+%%%      }%
    }%
+\else
+   \providecommand{\texorpdfstring}[2]{#2}%
 \fi%
 %    \end{macrocode}
 %    \begin{macrocode}
@@ -1446,12 +1481,12 @@ This work consists of the file  lni.dtx
 %    \begin{macrocode}
 \AtEndPreamble{%
    \@ifpackageloaded{hyperref}
-   {\RequirePackage[all]{hypcap}}%
-   {}%
+      {\RequirePackage[all]{hypcap}}%
+      {}%
 }%
 %    \end{macrocode}
 %    \begin{macrocode}
-\def\and{\unskip\hspace{-0.42em},\hspace{.6em}}
+\def\and{\texorpdfstring{\unskip\hspace{-0.42em},\hspace{.6em}}{, }}%
 %    \end{macrocode}
 %    \begin{macrocode}
 \ifusebiblatex
@@ -2948,7 +2983,7 @@ Firstname2 Lastname2\footnote{University, Department, Address, Country
 %numbering at this number
 \editor{Herausgeber et al.} % Names of Editors
 \booktitle{Name-der-Konferenz} % Name of book title
-\year{2017}
+\yearofpublication{2017}
 %%%\lnidoi{18.18420/provided-by-editor-02} % if known
 \maketitle
 
@@ -3108,7 +3143,7 @@ Schlagwort1 \and Schlagwort2 %Keyword1 \and Keyword2
 \startpage{11} % Beginn der Seitenzählung für diesen Beitrag
 \editor{Herausgeber et al.}    % Namen der Herausgeber
 \booktitle{Name-der-Konferenz} % Name des Tagungsband; optional Kurztitel
-\year{2017}
+\yearofpublication{2017}
 %%%\lnidoi{18.18420/provided-by-editor-02} % Falls bekannt
 \maketitle
 
diff --git a/macros/latex/contrib/lni/lni.ins b/macros/latex/contrib/lni/lni.ins
new file mode 100644
index 0000000000..5536ab57b9
--- /dev/null
+++ b/macros/latex/contrib/lni/lni.ins
@@ -0,0 +1,124 @@
+%%
+%% This is file `lni.ins',
+%% --------| -----------------------------------------------------------------
+%%     lni:| A class for submissions to the ``Lecture Notes in Informatics''
+%%  Author:| Martin Sievers
+%%   Email:| martin.sievers@schoenerpublizieren.de
+%% License:| Released under the LaTeX Project Public License v1.3c or later
+%%     See:| http://www.latex-project.org/lppl.txt
+%% --------| -----------------------------------------------------------------
+\input docstrip.tex
+\keepsilent
+\askforoverwritefalse
+\declarepreamble\bibtexengpre
+lnig.bst
+Lecture Notes in Informatics Style File (english)
+Version 1.0 (2017/04/07)
+
+The Style File is based on alpha.bst
+
+This work may be freely used,
+distributed and modified.
+Modified files should be clearly indicated as such and renamed.
+\endpreamble
+
+\declarepreamble\bibtexgerpre
+lnig.bst
+Lecture Notes in Informatics Style File (german)
+Version 1.0 (2017/04/07)
+
+The Style File is based on alpha.bst
+
+This work may be freely used,
+distributed and modified.
+Modified files should be clearly indicated as such and renamed.
+\endpreamble
+
+\declarepreamble\classpre
+--------| -----------------------------------------------------------------
+    lni:| A class for submissions to the ``Lecture Notes in Informatics''
+ Author:| Martin Sievers
+  Email:| martin.sievers@schoenerpublizieren.de
+License:| Released under the LaTeX Project Public License v1.3c or later
+    See:| http://www.latex-project.org/lppl.txt
+--------| -----------------------------------------------------------------
+\endpreamble
+
+\def\templatepre{%
+\perCent\space !TeX encoding = UTF-8^^J%
+\perCent\space !TeX program = pdflatex^^J%
+\perCent\space !BIB program = bibtex^^J%
+}
+
+\def\templatepreger{%
+\perCent\space !TeX encoding = UTF-8^^J%
+\perCent\space !TeX spellcheck = de_DE^^J%
+}
+
+\postamble
+
+Copyright (C) 2016-2021 by Gesellschaft für Informatik e.V. (GI)
+
+This work may be distributed and/or modified under the
+conditions of the LaTeX Project Public License (LPPL), either
+version 1.3c of this license or (at your option) any later
+version.  The latest version of this license is in the file:
+
+http://www.latex-project.org/lppl.txt
+
+This work is "maintained" (as per LPPL maintenance status) by
+Martin Sievers.
+
+This work consists of the file  lni.dtx
+                                lni.ins
+                                README.md
+                                CHANGELOG.md
+          and the derived files lni.pdf
+                                lni.cls
+                                lni-author-template.tex
+                                lni-paper-example-de.bib
+                                lni-paper-example-de.tex
+                                lni.bst
+                                lnig.bst
+\endpostamble
+
+\usedir{tex/latex/lni}
+\AddGenerationDate
+\generate{
+  \usepreamble\classpre
+  \file{\jobname.cls}{\from{\jobname.dtx}{class}}
+}
+\usedir{bibtex/bst/lni}
+\generate{
+  \usepreamble\bibtexengpre
+  \file{\jobname.bst}{\from{\jobname.dtx}{bibtex,eng}}
+  \usepreamble\bibtexgerpre
+  \file{lnig.bst}{\from{\jobname.dtx}{bibtex,ger}}
+}
+\endbatchfile
+%% 
+%% Copyright (C) 2016-2021 by Gesellschaft für Informatik e.V. (GI)
+%% 
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License (LPPL), either
+%% version 1.3c of this license or (at your option) any later
+%% version.  The latest version of this license is in the file:
+%% 
+%% http://www.latex-project.org/lppl.txt
+%% 
+%% This work is "maintained" (as per LPPL maintenance status) by
+%% Martin Sievers.
+%% 
+%% This work consists of the file  lni.dtx
+%%                                 lni.ins
+%%                                 README.md
+%%                                 CHANGELOG.md
+%%           and the derived files lni.pdf
+%%                                 lni.cls
+%%                                 lni-author-template.tex
+%%                                 lni-paper-example-de.bib
+%%                                 lni-paper-example-de.tex
+%%                                 lni.bst
+%%                                 lnig.bst
+%%
+%% End of file `lni.ins'.
diff --git a/macros/latex/contrib/lni/lni.pdf b/macros/latex/contrib/lni/lni.pdf
index f0a4fff3c4..e4aa3474b2 100644
--- a/macros/latex/contrib/lni/lni.pdf
+++ b/macros/latex/contrib/lni/lni.pdf
diff --git a/macros/latex/contrib/parskip/README.md b/macros/latex/contrib/parskip/README.md
index 19394adfa2..1b9968014c 100644
--- a/macros/latex/contrib/parskip/README.md
+++ b/macros/latex/contrib/parskip/README.md
@@ -8,13 +8,13 @@ Robin Fairbairns.
 
 Package source can be found below:
 
-https://github.com/FrankMittelbach/fmitex/  (development branch parskip)
+https://github.com/FrankMittelbach/fmitex-parskip
 
 The license is LPPL.
 
 -----
 
-Copyright (C) 2018 Frank Mittelbach<br />
+Copyright (C) 2018-2021 Frank Mittelbach<br />
 <https://latex-project.org/> <br />
 All rights reserved.
 
diff --git a/macros/latex/contrib/parskip/changes.txt b/macros/latex/contrib/parskip/changes.txt
index 6cdccbc1d5..f8f1141e68 100644
--- a/macros/latex/contrib/parskip/changes.txt
+++ b/macros/latex/contrib/parskip/changes.txt
@@ -1,3 +1,9 @@
+#### placed on CTAN as 2.0g ####
+
+2021-03-02  Frank Mittelbach  <Frank.Mittelbach@latex-project.org>
+
+	* parskip.dtx: home repository changed no other modifications
+
 #### placed on CTAN as 2.0f ####
 
 2020-06-15  Frank Mittelbach  <Frank.Mittelbach@latex-project.org>
diff --git a/macros/latex/contrib/parskip/parskip-code.pdf b/macros/latex/contrib/parskip/parskip-code.pdf
index 0aebb0a149..35f6d63c41 100644
--- a/macros/latex/contrib/parskip/parskip-code.pdf
+++ b/macros/latex/contrib/parskip/parskip-code.pdf
diff --git a/macros/latex/contrib/parskip/parskip.dtx b/macros/latex/contrib/parskip/parskip.dtx
index 6b4f87b48b..09638ae207 100644
--- a/macros/latex/contrib/parskip/parskip.dtx
+++ b/macros/latex/contrib/parskip/parskip.dtx
@@ -3,7 +3,7 @@
 %% File: parskip.dtx
 %%   (C) Copyright 1989 H.Partl, TU Wien
 %%   (C) Copyright 2001 Robin Fairbairns
-%%   (C) Copyright 2018-2020 Frank Mittelbach
+%%   (C) Copyright 2018-2021 Frank Mittelbach
 %
 % It may be distributed and/or modified under the conditions of the
 % LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -15,7 +15,7 @@
 %
 % The development version of the bundle can be found below
 %
-%    https://github.com/FrankMittelbach/fmitex/
+%    https://github.com/FrankMittelbach/fmitex-parskip/
 %
 % for those people who are interested or want to report an issue.
 %
@@ -183,7 +183,7 @@
 %    \end{macrocode}
 %
 %    \begin{macrocode}
-\ProvidesPackage{parskip}[2020-06-15 v2.0f non-zero parskip adjustments]
+\ProvidesPackage{parskip}[2021-03-02 v2.0g non-zero parskip adjustments]
 %    \end{macrocode}
 %
 %
diff --git a/macros/latex/contrib/parskip/parskip.ins b/macros/latex/contrib/parskip/parskip.ins
index 306d69304e..50dd0c5783 100644
--- a/macros/latex/contrib/parskip/parskip.ins
+++ b/macros/latex/contrib/parskip/parskip.ins
@@ -35,7 +35,7 @@
 
 This is a generated file.
 
-Copyright 2018-2020 Frank Mittelbach
+Copyright 2018-2021 Frank Mittelbach
 
 This file was generated from file(s) of the LaTeX `parskip Bundle'.
 -------------------------------------------------------------------
diff --git a/macros/latex/contrib/parskip/parskip.pdf b/macros/latex/contrib/parskip/parskip.pdf
index 37bac82767..49f937d927 100644
--- a/macros/latex/contrib/parskip/parskip.pdf
+++ b/macros/latex/contrib/parskip/parskip.pdf