lni (14oct19)

git-svn-id: svn://tug.org/texlive/trunk@52384 c570f23f-e606-0410-a88d-b1316a301751

12 files changed, 667 insertions, 284 deletions

diff --git a/Master/texmf-dist/bibtex/bst/lni/lni.bst b/Master/texmf-dist/bibtex/bst/lni/lni.bst
index 3cfde1c298f..9cacce58d9c 100644
--- a/Master/texmf-dist/bibtex/bst/lni/lni.bst
+++ b/Master/texmf-dist/bibtex/bst/lni/lni.bst
@@ -553,7 +553,7 @@ FUNCTION {format.incoll.inproc.crossref}
 
 FUNCTION {article}
 { output.bibitem
-  format.authors %"author" output.check %% No dot after authors
+  format.authors write$ %"author" output.check %% No dot after authors
   new.block
   format.title "title" output.check
   new.block
@@ -576,7 +576,7 @@ FUNCTION {book}
 { output.bibitem
   author empty$
     { format.editors "author and editor" output.check }
-    { format.authors %output.nonnull %%no dot after authors:
+    { format.authors write$ %output.nonnull %%no dot after authors:
       crossref missing$
 { "author and editor" editor either.or.check }
 'skip$
@@ -622,7 +622,7 @@ FUNCTION {inbook}
 { output.bibitem
   author empty$
     { format.editors "author and editor" output.check }
-    { format.authors %*output.nonnull %%no dot after authors:
+    { format.authors write$ %*output.nonnull %%no dot after authors:
       crossref missing$
 { "author and editor" editor either.or.check }
 'skip$
@@ -657,7 +657,7 @@ FUNCTION {inbook}
 
 FUNCTION {incollection}
 { output.bibitem
-  format.authors %"author" output.check %%no dot after authors:
+  format.authors write$ %"author" output.check %%no dot after authors:
   new.block
   format.title "title" output.check
   new.block
@@ -683,7 +683,7 @@ FUNCTION {incollection}
 
 FUNCTION {inproceedings}
 { output.bibitem
-  format.authors %"author" output.check %%no dot after authors:
+  format.authors write$ %"author" output.check %%no dot after authors:
   new.block
   format.title "title" output.check
   new.block
@@ -752,7 +752,7 @@ FUNCTION {manual}
 
 FUNCTION {mastersthesis}
 { output.bibitem
-  format.authors %"author" output.check
+  format.authors write$ %"author" output.check
   new.block
   format.title "title" output.check
   new.block
@@ -795,7 +795,7 @@ FUNCTION {online}
 
 FUNCTION {phdthesis}
 { output.bibitem
-  format.authors %"author" output.check
+  format.authors write$ %"author" output.check
   new.block
   format.btitle "title" output.check
   new.block
@@ -845,7 +845,7 @@ FUNCTION {proceedings}
 
 FUNCTION {techreport}
 { output.bibitem
-  format.authors %"author" output.check
+  format.authors write$ %"author" output.check
   new.block
   format.title "title" output.check
   new.block
@@ -860,7 +860,7 @@ FUNCTION {techreport}
 
 FUNCTION {unpublished}
 { output.bibitem
-  format.authors %"author" output.check
+  format.authors write$ %"author" output.check
   new.block
   format.title "title" output.check
   new.block
@@ -1285,7 +1285,7 @@ FUNCTION {end.bib}
 
 EXECUTE {end.bib}
 %% 
-%% Copyright (C) 2016-2019 by Gesellschaft für Informatik e.V. (GI)
+%% Copyright (C) 2016-2019 by Gesellschaft f^^c3^^bcr Informatik e.V. (GI)
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License (LPPL), either
diff --git a/Master/texmf-dist/bibtex/bst/lni/lnig.bst b/Master/texmf-dist/bibtex/bst/lni/lnig.bst
index bbc095f7e6e..c0c1cc6d14b 100644
--- a/Master/texmf-dist/bibtex/bst/lni/lnig.bst
+++ b/Master/texmf-dist/bibtex/bst/lni/lnig.bst
@@ -553,7 +553,7 @@ FUNCTION {format.incoll.inproc.crossref}
 
 FUNCTION {article}
 { output.bibitem
-  format.authors %"author" output.check %% No dot after authors
+  format.authors write$ %"author" output.check %% No dot after authors
   new.block
   format.title "title" output.check
   new.block
@@ -576,7 +576,7 @@ FUNCTION {book}
 { output.bibitem
   author empty$
     { format.editors "author and editor" output.check }
-    { format.authors %output.nonnull %%no dot after authors:
+    { format.authors write$ %output.nonnull %%no dot after authors:
       crossref missing$
 { "author and editor" editor either.or.check }
 'skip$
@@ -622,7 +622,7 @@ FUNCTION {inbook}
 { output.bibitem
   author empty$
     { format.editors "author and editor" output.check }
-    { format.authors %*output.nonnull %%no dot after authors:
+    { format.authors write$ %*output.nonnull %%no dot after authors:
       crossref missing$
 { "author and editor" editor either.or.check }
 'skip$
@@ -657,7 +657,7 @@ FUNCTION {inbook}
 
 FUNCTION {incollection}
 { output.bibitem
-  format.authors %"author" output.check %%no dot after authors:
+  format.authors write$ %"author" output.check %%no dot after authors:
   new.block
   format.title "title" output.check
   new.block
@@ -683,7 +683,7 @@ FUNCTION {incollection}
 
 FUNCTION {inproceedings}
 { output.bibitem
-  format.authors %"author" output.check %%no dot after authors:
+  format.authors write$ %"author" output.check %%no dot after authors:
   new.block
   format.title "title" output.check
   new.block
@@ -752,7 +752,7 @@ FUNCTION {manual}
 
 FUNCTION {mastersthesis}
 { output.bibitem
-  format.authors %"author" output.check
+  format.authors write$ %"author" output.check
   new.block
   format.title "title" output.check
   new.block
@@ -795,7 +795,7 @@ FUNCTION {online}
 
 FUNCTION {phdthesis}
 { output.bibitem
-  format.authors %"author" output.check
+  format.authors write$ %"author" output.check
   new.block
   format.btitle "title" output.check
   new.block
@@ -845,7 +845,7 @@ FUNCTION {proceedings}
 
 FUNCTION {techreport}
 { output.bibitem
-  format.authors %"author" output.check
+  format.authors write$ %"author" output.check
   new.block
   format.title "title" output.check
   new.block
@@ -860,7 +860,7 @@ FUNCTION {techreport}
 
 FUNCTION {unpublished}
 { output.bibitem
-  format.authors %"author" output.check
+  format.authors write$ %"author" output.check
   new.block
   format.title "title" output.check
   new.block
@@ -875,7 +875,7 @@ MACRO {jan} {"Januar"}
 
 MACRO {feb} {"Februar"}
 
-MACRO {mar} {"März"}
+MACRO {mar} {"M^^c3^^a4rz"}
 
 MACRO {apr} {"April"}
 
@@ -1285,7 +1285,7 @@ FUNCTION {end.bib}
 
 EXECUTE {end.bib}
 %% 
-%% Copyright (C) 2016-2019 by Gesellschaft für Informatik e.V. (GI)
+%% Copyright (C) 2016-2019 by Gesellschaft f^^c3^^bcr Informatik e.V. (GI)
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License (LPPL), either
diff --git a/Master/texmf-dist/doc/latex/lni/CHANGELOG.md b/Master/texmf-dist/doc/latex/lni/CHANGELOG.md
index 0a07eb75c59..ffe1091622e 100644
--- a/Master/texmf-dist/doc/latex/lni/CHANGELOG.md
+++ b/Master/texmf-dist/doc/latex/lni/CHANGELOG.md
@@ -6,7 +6,24 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
-## [1.5.0] -2019-04-04
+## [1.6.0] - 2019-10-14
+
+### Added
+- Optional argument for `\booktitle` to support a short book title for running headers
+- New macro `\booksubtitle`
+- Add support for `selnolig` (LuaTeX-only)
+
+### Changed
+- `\email` now generates a `mailto:` hyperlink
+- Example file: `align` instead of `eqnarray`
+- Add `driver=none` option to `geometry` for better crop results (independent from engine)
+
+### Fixed
+- Global options are passed to `article` class ([#78](https://github.com/gi-ev/LNI/issues/78))
+- Finally fix BiBTeX issue thanks to @ytzemih ([#6](https://github.com/gi-ev/LNI/issues/6))
+- `hyperref` is loaded without options to make it more compatible with other packages like `authorarchive`
+
+## [1.5.0] - 2019-04-04
 
 ### Added
 - Load package `textcomp` by default and add option `upquote` to `listings` package ([#69](https://github.com/gi-ev/LNI/issues/69))
@@ -79,11 +96,11 @@ 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.4...HEAD
-[1.4.0]: https://github.com/gi-ev/LNI/releases/tag/v1.5
+[Unreleased]: https://github.com/gi-ev/LNI/compare/v1.6...HEAD
+[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
 [1.3.0]: https://github.com/gi-ev/LNI/releases/tag/v1.3
 [1.2.0]: https://github.com/gi-ev/LNI/releases/tag/v1.2
 [1.1.0]: https://github.com/gi-ev/LNI/releases/tag/v1.1
 [1.0.0]: https://github.com/gi-ev/LNI/releases/tag/v1.0
-
diff --git a/Master/texmf-dist/doc/latex/lni/README.md b/Master/texmf-dist/doc/latex/lni/README.md
index b850e17f658..14ba1363773 100644
--- a/Master/texmf-dist/doc/latex/lni/README.md
+++ b/Master/texmf-dist/doc/latex/lni/README.md
@@ -4,7 +4,7 @@
 ----------------------------------------------------------------------------
 lni      -- A class for submissions to the ``Lecture Notes in Informatics''
 (c) 2016-2019 Gesellschaft für Informatik (GI)
-Version:    1.5
+Version:    1.6
 Maintainer: Martin Sievers
 Email:      martin.sievers@schoenerpublizieren.de
 License:    Released under the LaTeX Project Public License v1.3c or later
@@ -19,10 +19,10 @@ This is the official version of the class “lni” for submissions to the
 It is based on previous templates created on behalf of the GI.
 
 Quick start:
-Download [lni-author-template.tex](lni-author-template.tex) and edit it in 
+Download [lni-author-template.tex](lni-author-template.tex) and edit it in
 your favorite LaTeX editor.
 You will have to use [BibTeX](https://www.ctan.org/pkg/bibtex) as bibliography tool.
-In case you want to use [biblatex](https://www.ctan.org/pkg/biblatex) and 
+In case you want to use [biblatex](https://www.ctan.org/pkg/biblatex) and
 [Biber](https://www.ctan.org/pkg/biber), read on in the documentation of this class.
 You should use `pdflatex` as `xelatex` and `lualatex` lack some features of the class file.
 
diff --git a/Master/texmf-dist/doc/latex/lni/lni-author-template.tex b/Master/texmf-dist/doc/latex/lni/lni-author-template.tex
new file mode 100644
index 00000000000..766e65213da
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/lni/lni-author-template.tex
@@ -0,0 +1,43 @@
+% !TeX encoding = UTF-8
+% !TeX program = pdflatex
+% !BIB program = bibtex
+
+%%% Um einen Artikel auf deutsch zu schreiben, gen^^c3^^bcgt es die Klasse ohne
+%%% Parameter zu laden.
+\documentclass[]{lni}
+%%% To write an article in English, please use the option ``english'' in order
+%%% to get the correct hyphenation patterns and terms.
+%%% \documentclass[english]{class}
+%%
+\begin{document}
+%%% Mehrere Autoren werden durch \and voneinander getrennt.
+%%% Die Fu^^c3^^9fnote enth^^c3^^a4lt die Adresse sowie eine E-Mail-Adresse.
+%%% Das optionale Argument (sofern angegeben) wird f^^c3^^bcr die Kopfzeile verwendet.
+\title[Ein Kurztitel]{Ein sehr langer Titel ^^c3^^bcber mehrere Zeilen mit sehr vielen
+Worten und noch mehr Buchstaben}
+%%%\subtitle{Untertitel / Subtitle} % if needed
+\author[Vorname1 Nachname1 \and Firstname2 Lastname2]
+{Vorname1 Nachname1\footnote{Universit^^c3^^a4t, Abteilung, Stra^^c3^^9fe, Postleitzahl Ort,
+Land \email{emailaddress@author1}} \and
+Firstname2 Lastname2\footnote{University, Department, Address, Country
+\email{emailaddress@author2}}}
+\startpage{11} % Beginn der Seitenz^^c3^^a4hlung f^^c3^^bcr diesen Beitrag / Start page
+\editor{Herausgeber et al.} % Names of Editors
+\booktitle{Name-der-Konferenz} % Name of book title
+\year{2017}
+%%%\lnidoi{18.18420/provided-by-editor-02} % if known
+\maketitle
+
+\begin{abstract}
+This is a brief overview of the paper, which should be 70 to 150 words long and
+include the most relevant points. This has to be a single paragraph.
+\end{abstract}
+\begin{keywords}
+Schlagwort1 \and Schlagwort2 %Keyword1 \and Keyword2
+\end{keywords}
+%%% Beginn des Artikeltexts
+\section{^^c3^^9cberschrift/Heading}
+
+%%% Angabe der .bib-Datei (ohne Endung) / State .bib file (for BibTeX usage)
+\bibliography{mybibfile} %\printbibliography if you use biblatex/Biber
+\end{document}
diff --git a/Master/texmf-dist/doc/latex/lni/lni-paper-example-de.bib b/Master/texmf-dist/doc/latex/lni/lni-paper-example-de.bib
new file mode 100644
index 00000000000..e1e5b5b12c0
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/lni/lni-paper-example-de.bib
@@ -0,0 +1,90 @@
+
+@InProceedings{ABC01,
+  author   = {N. Abraham and U. Bibel and P. Corleone},
+  title    = {Formatting Contributions for Proceedings},
+  pages    = {46-53},
+  crossref = {Gl01},
+}
+
+@InBook{Az09,
+  pages    = {135-162},
+  title    = {Die Fu^^c3^^9fnote in LNI-B^^c3^^a4nden},
+  author   = {Azubi, L. and others},
+  crossref = {Gl09},
+}
+
+@Book{AB00,
+  title     = {Formatierungsrichtlinien f^^c3^^bcr Tagungsb^^c3^^a4nde},
+  publisher = {Format-Verlag},
+  year      = {2000},
+  author    = {K. Abel and U. Bibel},
+  address   = {Bonn},
+}
+
+@Book{Ez10,
+  title     = {The Magic Format -- Your Way to Pretty Books},
+  publisher = {Noah \& Sons},
+  year      = {2010},
+  author    = {O. Ezgarani},
+}
+
+@Article{Gl06,
+  author  = {H. I. Gl^^c3^^bcck},
+  title   = {Formatierung leicht gemacht},
+  journal = {Formatierungsjournal},
+  volume  = {11},
+  number  = {09},
+  year    = {2009},
+  pages   = {23-27},
+}
+
+@Book{Wa14,
+  title     = {Essenzen der Informatik},
+  publisher = {Verlag Formvoll},
+  year      = {2014},
+  author    = {K. Wasser and H. Feuer and R. Erde and H. Licht},
+}
+
+@Book{Wa14b,
+  title     = {Ganz neue Essenzen der Informatik im selben Jahr},
+  publisher = {Format-Verlag},
+  year      = {2014},
+  author    = {K. Wasser and H. Feuer and R. Erde and H. Licht},
+}
+
+@Proceedings{Gl01,
+  title     = {Proc. 7th Int. Conf. on Formatting of Workshop-Proceedings},
+  year      = {2001},
+  editor    = {Gl^^c3^^bcck, H. I.},
+  address   = {San Francisco},
+  publisher = {Noah \& Sons},
+  booktitle = {Proc. 7th Int. Conf. on Formatting of Workshop-Proceedings},
+}
+
+@Book{Gl09,
+  title     = {Formatierung 2009},
+  publisher = {Format-Verlag},
+  year      = {2009},
+  editor    = {H. I. Gl^^c3^^bcck},
+  number    = {999},
+  series    = {LNI},
+  address   = {Bonn},
+  booktitle = {Formatierung 2009},
+}
+
+@Misc{XX14,
+  title        = {Anteil an Frauen in der Informatik},
+  label        = {An},
+  howpublished = {Statistics Worldwide},
+  year         = {2014},
+}
+
+@Online{GI19,
+  author = {{Gesellschaft f^^c3^^bcr Informatik e.\,V.}},
+  label  = {GI},
+  year  = {2019},
+  url  =  {http://www.gi.de},
+  urldate = {2019-03-21}
+}
+
+@Comment{jabref-meta: databaseType:biblatex;}
diff --git a/Master/texmf-dist/doc/latex/lni/lni-paper-example-de.tex b/Master/texmf-dist/doc/latex/lni/lni-paper-example-de.tex
new file mode 100644
index 00000000000..f4dfb688633
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/lni/lni-paper-example-de.tex
@@ -0,0 +1,173 @@
+% !TeX encoding = UTF-8
+% !TeX spellcheck = de_DE
+
+%% Dies gibt Warnungen aus, sollten veraltete LaTeX-Befehle verwendet werden
+\RequirePackage[l2tabu, orthodox]{nag}
+
+\documentclass[utf8,biblatex]{lni}
+\bibliography{lni-paper-example-de}
+
+%% Sch^^c3^^b6ne Tabellen mittels \toprule, \midrule, \bottomrule
+\usepackage{booktabs}
+
+%% Zu Demonstrationszwecken
+\usepackage[math]{blindtext}
+\usepackage{mwe}
+
+%% BibLaTeX-Sonderkonfiguration,
+%% falls man schnell eine existierende Bibliographie wiederverwenden will, aber nicht die .bib-Datei h^^c3^^a4ndisch anpassen m^^c3^^b6chte.
+%% Bitte \iffalse und \fi entfernen, dann ist diese Konfiguration aktiviert.
+
+\iffalse
+\AtEveryBibitem{%
+  \ifentrytype{article}{%
+  }{%
+    \clearfield{doi}%
+    \clearfield{issn}%
+    \clearfield{url}%
+    \clearfield{urldate}%
+  }%
+  \ifentrytype{inproceedings}{%
+  }{%
+    \clearfield{doi}%
+    \clearfield{issn}%
+    \clearfield{url}%
+    \clearfield{urldate}%
+  }%
+}
+\fi
+
+\begin{document}
+%%% Mehrere Autoren werden durch \and voneinander getrennt.
+%%% Die Fu^^c3^^9fnote enth^^c3^^a4lt die Adresse sowie eine E-Mail-Adresse.
+%%% Das optionale Argument (sofern angegeben) wird f^^c3^^bcr die Kopfzeile verwendet.
+\title[Ein Kurztitel]{Ein sehr langer Titel ^^c3^^bcber mehrere Zeilen mit sehr vielen Worten und noch mehr Buchstaben}
+%%%\subtitle{Untertitel / Subtitle} % falls ben^^c3^^b6tigt
+\author[Vorname1 Nachname1 \and Vorname2 Nachname2]
+{Vorname1 Nachname1\footnote{Universit^^c3^^a4t, Abteilung, Stra^^c3^^9fe, Postleitzahl Ort, Land \email{emailaddress@author1}} \and
+ Vorname2 Nachname2\footnote{University, Department, Address, Country \email{emailaddress@author2}}}
+\startpage{11} % Beginn der Seitenz^^c3^^a4hlung f^^c3^^bcr diesen Beitrag
+\editor{Herausgeber et al.}    % Namen der Herausgeber
+\booktitle{Name-der-Konferenz} % Name des Tagungsband; optional Kurztitel
+\year{2017}
+%%%\lnidoi{18.18420/provided-by-editor-02} % Falls bekannt
+\maketitle
+
+\begin{abstract}
+Die \LaTeX-Klasse \texttt{lni} setzt die Layout-Vorgaben f^^c3^^bcr Beitr^^c3^^a4ge in LNI Konferenzb^^c3^^a4nden um.
+Dieses Dokument beschreibt ihre Verwendung und ist ein Beispiel f^^c3^^bcr die entsprechende Darstellung.
+Der Abstract ist ein kurzer ^^c3^^9cberblick ^^c3^^bcber die Arbeit der zwischen 70 und 150 W^^c3^^b6rtern lang sein und das Wichtigste enthalten sollte.
+Die Formatierung erfolgt automatisch innerhalb des abstract-Bereichs.
+\end{abstract}
+
+\begin{keywords}
+LNI Guidelines \and \LaTeX Vorlage
+\end{keywords}
+
+\section{Verwendung}
+Die GI gibt unter \url{http://www.gi-ev.de/LNI} Vorgaben f^^c3^^bcr die Formatierung von Dokumenten in der LNI Reihe.
+F^^c3^^bcr \LaTeX-Dokumente werden diese durch die Dokumentenklasse \texttt{lni} realisiert.
+
+Dieses Dokument basiert auf der offiziellen Dokumentation, simplifiziert und setzt grundlegendes LaTeX-Wissen voraus.
+Es werden generische Platzhalter an die entsprechenden Stellen (wie beispielsweise die Authoren-Angaben) gesetzt und nicht weiter an anderer Stelle dokumentiert.
+
+Dieses Template ist wie folgt gegliedert:
+\Cref{sec:demos} zeigt Demonstrationen der LNI-Verlage.
+\Cref{sec:lniconformance} zeigt die Einhaltung der Richtlinien durch einfachen Text.
+
+\section{Demonstrationen}
+\label{sec:demos}
+Das Symbol f^^c3^^bcr Potenzmengen ($\powerset$) wird korrekt angezeigt.
+Es ist kein Weierstra^^c3^^9f-p ($\wp$) mehr.
+
+Spitze Klammen k^^c3^^b6nnen direkt eingegeben werden: <test />
+
+Hier eine kleine Demonstration von \href{https://www.ctan.org/pkg/microtype}{microtype}:
+\blindtext
+
+\section{Demonstration der Einhaltung der Richtlinien}
+\label{sec:lniconformance}
+
+\subsection{Literaturverzeichnis}
+Der letzte Abschnitt zeigt ein beispielhaftes Literaturverzeichnis f^^c3^^bcr B^^c3^^bccher mit einem Autor \cite{Ez10} und zwei AutorInnen \cite{AB00}, einem Beitrag in Proceedings mit drei AutorInnen \cite{ABC01}, einem Beitrag in einem LNI Band mit mehr als drei AutorInnen \cite{Az09}, zwei B^^c3^^bccher mit den jeweils selben vier AutorInnen im selben Erscheinungsjahr \cite{Wa14} und \cite{Wa14b}, ein Journal \cite{Gl06}, eine Website \cite{GI19} bzw.\ anderweitige Literatur ohne konkrete AutorInnenschaft \cite{XX14}.
+Es wird biblatex verwendet, da es UTF8 sauber unterst^^c3^^bctzt und \href{https://github.com/gi-ev/LNI/issues/5}{im Gegensatz zu lni.bst} keine Fehler beim bibtexen auftreten.
+
+Referenzen sollten nicht direkt als Subjekt eingebunden werden, sondern immer nur durch Authorenanganben:
+Beispiel: \Citet{AB00} geben ein Beispiel, aber auch \citet{Az09}.
+Hinweis: Gro^^c3^^9fes C bei \texttt{Citet}, wenn es am Satzanfang steht. Dies ist analog zu \texttt{Cref}.
+
+Formatierung und Abk^^c3^^bcrzungen werden f^^c3^^bcr die Referenzen \texttt{book}, \texttt{inbook}, \texttt{proceedings}, \texttt{inproceedings}, \texttt{article}, \texttt{online} und \texttt{misc} automatisch vorgenommen.
+M^^c3^^b6gliche Felder f^^c3^^bcr Referenzen k^^c3^^b6nnen der Beispieldatei \texttt{lni-paper-example-de.bib} entnommen werden.
+Andere Referenzen sowie Felder m^^c3^^bcssen allenfalls nachtr^^c3^^a4glich angepasst werden.
+
+\subsection{Abbildungen}
+\Cref{fig:demo} zeigt eine Abbildung.
+
+\begin{figure}
+  \centering
+  \includegraphics[width=.8\textwidth]{example-image}
+  \caption{Demographik}
+  \label{fig:demo}
+\end{figure}
+
+\subsection{Tabellen}
+\Cref{tab:demo} zeigt eine Tabelle.
+
+\begin{table}
+\centering
+\begin{tabular}{lll}
+\toprule
+^^c3^^9cberschriftsebenen & Beispiel & Schriftgr^^c3^^b6^^c3^^9fe und -art \\
+\midrule
+Titel (linksb^^c3^^bcndig) & Der Titel \ldots & 14 pt, Fett\\
+^^c3^^9cberschrift 1 & 1 Einleitung & 12 pt, Fett\\
+^^c3^^9cberschrift 2 & 2.1 Titel & 10 pt, Fett\\
+\bottomrule
+\end{tabular}
+\caption{Die ^^c3^^9cberschriftsarten}
+\label{tab:demo}
+\end{table}
+
+\subsection{Programmcode}
+Die LNI-Formatvorlage verlangt die Einr^^c3^^bcckung von Listings vom linken Rand.
+In der \texttt{lni}-Dokumentenklasse ist dies f^^c3^^bcr die \texttt{verbatim}-Umgebung realisiert.
+
+\begin{verbatim}
+public class Hello {
+    public static void main (String[] args) {
+        System.out.println("Hello World!");
+    }
+}
+\end{verbatim}
+
+Alternativ kann auch die \texttt{lstlisting}-Umgebung verwendet werden.
+
+\Cref{L1} zeigt uns ein Beispiel, das mit Hilfe der \texttt{lstlisting}-Umgebung realisiert ist.
+
+\begin{lstlisting}[caption={Beschreibung}, label=L1, language=Java]
+public class Hello {
+    public static void main (String[] args) {
+        System.out.println("Hello World!");
+    }
+}
+\end{lstlisting}
+
+\subsection{Formeln und Gleichungen}
+
+Die korrekte Einr^^c3^^bcckung und Nummerierung f^^c3^^bcr Formeln ist bei den Umgebungen
+\texttt{equation} und \texttt{align} gew^^c3^^a4hrleistet.
+
+\begin{equation}
+  1=4-3
+\end{equation}
+und
+\begin{align}
+  2&=7-5\\
+  3&=2-1
+\end{align}
+
+%% \bibliography{lni-paper-example-de.tex} ist hier nicht erlaubt: biblatex erwartet dies bei der Preambel
+%% Starten Sie "biber paper", um eine Biliographie zu erzeugen.
+\printbibliography
+
+\end{document}
diff --git a/Master/texmf-dist/doc/latex/lni/lni.pdf b/Master/texmf-dist/doc/latex/lni/lni.pdf
index e4be74932cd..f0a4fff3c45 100644
--- a/Master/texmf-dist/doc/latex/lni/lni.pdf
+++ b/Master/texmf-dist/doc/latex/lni/lni.pdf
diff --git a/Master/texmf-dist/source/latex/lni/lni.dtx b/Master/texmf-dist/source/latex/lni/lni.dtx
index 218a603e94d..8301090e404 100644
--- a/Master/texmf-dist/source/latex/lni/lni.dtx
+++ b/Master/texmf-dist/source/latex/lni/lni.dtx
@@ -116,7 +116,7 @@ This work consists of the file  lni.dtx
   \file{lni-paper-example-de.bib}{\from{\jobname.dtx}{exampledebib}}
 }
 \generate{
-  \usepreamble\templatepreger  
+  \usepreamble\templatepreger
   \file{lni-paper-example-de.tex}{\from{\jobname.dtx}{exampledetex}}
 }
 \ifx\fmtname\nameofplainTeX
@@ -134,7 +134,7 @@ This work consists of the file  lni.dtx
 %<class>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
 %<class>\ProvidesClass{lni}
 %<*class>
-    [2019/04/04 v1.5 Official class for submissions to the ``Lecture Notes 
+    [2019/10/14 v1.6BETA Official class for submissions to the ``Lecture Notes
     in Informatics'']
 %</class>
 %<*driver>
@@ -158,7 +158,7 @@ This work consists of the file  lni.dtx
 \usepackage{hologo}
 \newcommand*{\MiKTeX}{\hologo{MiKTeX}}
 \usepackage[%
-	pdftitle={lni: Official LaTeX class for submissions to the ``Lecture Notes in 
+	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,%
@@ -179,7 +179,7 @@ This work consists of the file  lni.dtx
 }{}
 \DeclareMathSymbol{\powerset}{\mathord}{MnSyC}{180}
 
-\newcommand{\lni}{\texttt{lni}}	
+\newcommand{\lni}{\texttt{lni}}
 \newcommand{\LNI}{\emph{Lecture Notes in Informatics}}
 \makeatletter
 \newcommand*\DescribeOption{%
@@ -224,7 +224,7 @@ This work consists of the file  lni.dtx
  frame        = single,
  backgroundcolor = \color{yellow!60},
  framesep     = 5pt,
- literate={Ö}{{\"O}}1 {Ä}{{\"A}}1 {Ü}{{\"U}}1 {ß}{{\ss}}1 {ü}{{\"u}}1 {ä}{{\"a}}1 {ö}{{\"o}}1 
+ literate={Ö}{{\"O}}1 {Ä}{{\"A}}1 {Ü}{{\"U}}1 {ß}{{\ss}}1 {ü}{{\"u}}1 {ä}{{\"a}}1 {ö}{{\"o}}1
 }%
 \lstnewenvironment{examplecode}[1][]
 {\lstset{#1}}
@@ -260,37 +260,51 @@ This work consists of the file  lni.dtx
 %   Right brace   \}     Tilde         \~}
 %
 % \changes{v1.0}{2017/04/07}{Official release of revised version}
-% \changes{v1.1}{2017/04/08}{Added macros \cs{subtitle} and keyword delimiter 
+% \changes{v1.1}{2017/04/08}{Added macros \cs{subtitle} and keyword delimiter
 % \cs{add}}
 % \changes{v1.1}{2017/04/08}{Fixed bug with \cs{Crefname}}
-% \changes{v1.1}{2017/04/08}{Updated documentation and bundle structure}  
-% \changes{v1.1}{2017/04/12}{Changed spacing for \cs{subtitle}}  
+% \changes{v1.1}{2017/04/08}{Updated documentation and bundle structure}
+% \changes{v1.1}{2017/04/12}{Changed spacing for \cs{subtitle}}
 % \changes{v1.1}{2017/04/18}{Added check for ngerman-x-latest patterns}
 % \changes{v1.1}{2017/04/19}{Added option \opt{crop}}
-% \changes{v1.2}{2017/04/26}{Set option \opt{straighquotes} for \pkg{newtxtt} 
+% \changes{v1.2}{2017/04/26}{Set option \opt{straighquotes} for \pkg{newtxtt}
 % manually to gain compatibility with version prior to v1.05}
-% \changes{v1.2}{2017/04/27}{Added \pkg{iftex} to check for pdflatex} 
-% \changes{v1.2}{2017/05/04}{Added (partial) support for XeTeX and LuaTeX} 
-% \changes{v1.3}{2017/05/04}{Added option \opt{nofonts} to suppress font 
-% loading completely} 
-% \changes{v1.3}{2017/05/08}{Changed syntax for \pkg{fontspec}} 
+% \changes{v1.2}{2017/04/27}{Added \pkg{iftex} to check for pdflatex}
+% \changes{v1.2}{2017/05/04}{Added (partial) support for XeTeX and LuaTeX}
+% \changes{v1.3}{2017/05/04}{Added option \opt{nofonts} to suppress font
+% loading completely}
+% \changes{v1.3}{2017/05/08}{Changed syntax for \pkg{fontspec}}
 % \changes{v1.4}{2017/05/27}{Added new macros taken from the EMISA class file}
 % \changes{v1.4}{2017/05/27}{Added option \opt{oldfonts} to use a font package
 % available}
-% \changes{v1.4}{2017/07/26}{Added package \pkg{caption} and changed all 
+% \changes{v1.4}{2017/07/26}{Added package \pkg{caption} and changed all
 % \cs{fontsize} calls to nativ \LaTeX{} macros}
 % \changes{v1.4}{2017/09/11}{Fixed basewidth for \env{lstlistings}}
 % \changes{v1.4}{2017/09/29}{Fixed font size for \cs{Large}}
 % \changes{v1.4}{2017/11/08}{Added full example for an article in German}
 % \changes{v1.4}{2017/11/08}{Adapting captions of \env{lstlistings}}
-% \changes{v1.4}{2017/11/08}{Fix font size bug regarding the running header 
+% \changes{v1.4}{2017/11/08}{Fix font size bug regarding the running header
 % and the captions: \cs{small} was redefined, so we need an \cs{oldsmall} here}
 % \changes{v1.5}{2018/09/11}{Postpone loading of \pkg{cleveref}}
-% \changes{v1.5}{2018/09/11}{Load \pkg{textcomp} by default and add option 
+% \changes{v1.5}{2018/09/11}{Load \pkg{textcomp} by default and add option
 % \opt{upquote} to \pkg{listings}}
 % \changes{v1.5}{2019/02/13}{Fix layout for English texts}
 % \changes{v1.5}{2019/02/13}{Changed \cs{refname} for English texts}
 % \changes{v1.5}{2019/02/20}{New option \opt{norunningheads}}
+% \changes{v1.6}{2019/04/18}{\cs{email} now generates a mailto: hyperlink}
+% \changes{v1.6}{2019/04/23}{Global options are passed to article class}
+% \changes{v1.6}{2019/09/14}{New macro \cs{booksubtitle}}
+% \changes{v1.6}{2019/09/14}{Add option `driver=none` to `geometry` for better
+% crop results}
+% \changes{v1.6}{2019/09/14}{\cs{booktitle} now uses an optional argument for
+% shorttitle}
+% \changes{v1.6}{2019/09/14}{New macro \cs{booksubtitle}}
+% \changes{v1.6}{2019/09/14}{\pkg{hypcap} is only loaded if \pkg{hyperref}
+% has been loaded before.}
+% \changes{v1.6}{2019/09/14}{\pkg{hyperref} is loaded without options to make
+% 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}}
 %
 % \GetFileInfo{\jobname.dtx}
 % \DoNotIndex{\newcommand,\newenvironment}
@@ -298,189 +312,193 @@ This work consists of the file  lni.dtx
 % \title{\textsf{lni} -- Official class for submissions to the\\%
 % ``Lecture Notes in Informatics''\thanks{This file describes version
 % \fileversion, last revised \filedate.}}
-% \author{Martin Sievers\setcounter{footnote}{6}\thanks{Email: 
+% \author{Martin Sievers\setcounter{footnote}{6}\thanks{Email:
 % martin.sievers@schoenerpublizieren.de}}
 % \date{Released \filedate}
 %
 % \maketitle
 %
 % \begin{abstract}
-% \noindent After several years the \lni{} bundle has been updated. The 
+% \noindent After several years the \lni{} bundle has been updated. The
 % resulting new version fixes some long-standing bugs, solves problems and
-% supports modern packages like \pkg{biblatex} and \pkg{microtype}. It has been 
-% put into one DTX file to make maintaining and distributing via CTAN a bit 
+% supports modern packages like \pkg{biblatex} and \pkg{microtype}. It has been
+% put into one DTX file to make maintaining and distributing via CTAN a bit
 % easier.
 % \end{abstract}
 %
 % \section{Introduction}
-% \LaTeX{} templates are often long-lasting. Even if they use meanwhile 
-% deprecated packages they are often passed from one generation of authors to 
+% \LaTeX{} templates are often long-lasting. Even if they use meanwhile
+% deprecated packages they are often passed from one generation of authors to
 % the next.
 %
-% The Gesellschaft für Informatik~e.\,V. (GI) thankfully realized, that their 
-% bundle should be technologically 
+% The Gesellschaft für Informatik~e.\,V. (GI) thankfully realized, that their
+% bundle should be technologically
 % modernized while the general layout remains the same.
 %
-% Based on the existing class and bib files I set-up a DTX file and started 
-% reworking the source code. Editors and authors suggested different additions 
-% and changes, which I tried to incoporate without changing the existing 
+% Based on the existing class and bib files I set-up a DTX file and started
+% reworking the source code. Editors and authors suggested different additions
+% and changes, which I tried to incoporate without changing the existing
 % mechanisms too much.
 %
 % This is the first public release. I would to thank especially
 % \href{https://github.com/koppor/}{Oliver Kopp} and
-% \href{https://www.fernuni-hagen.de/evis/team/stefan.strecker.shtml}{Stefan 
+% \href{https://www.fernuni-hagen.de/evis/team/stefan.strecker.shtml}{Stefan
 % Strecker} and his team for their suggestions and tests.
-% 
+%
 % \section{Installation}
-% The \lni{} bundle is currently distributed via 
+% The \lni{} bundle is currently distributed via
 % \href{https://github.com/gi-ev/LNI}{GitHub}, the
 % \href{https://www.gi.de/service/publikationen/lni/autorenrichtlinien.html}
 % {GI website} and (preferably) \href{https://www.ctan.org/pkg/lni}{CTAN}.
 % The later is the basis for all updates of the two main \TeX{} distributions
-% \MiKTeX{} and \TeX{}~Live. Thus the easiest way to get all files needed to 
+% \MiKTeX{} and \TeX{}~Live. Thus the easiest way to get all files needed to
 % typeset an article for the \LNI{} is to use the package manager of your
 % distribution.
-% 
-% For a manual installation please call \texttt{pdflatex lni.dtx} at least 
-% twice and 
-% copy all resulting files (cls, tex, pdf and bst) to your local TEXMF tree. 
+%
+% For a manual installation please call \texttt{pdflatex lni.dtx} at least
+% twice and
+% copy all resulting files (cls, tex, pdf and bst) to your local TEXMF tree.
 % Don't forget to update your file name database.
 % \newpage
 % \section{Usage}
-% To use the predefined layout for a (German) submission to the \LNI{} just 
+% To use the predefined layout for a (German) submission to the \LNI{} just
 % load the class file as usual with \cs{documentclass\{lni\}}.
 %
-% The class file loads a bunch of packages which are all part of modern \TeX{} 
-% distributions. Therefore, if you are confronted 
-% with a missing package, please try to download and install it using your 
-% distribution's package manager. Alternatively go to 
+% The class file loads a bunch of packages which are all part of modern \TeX{}
+% distributions. Therefore, if you are confronted
+% with a missing package, please try to download and install it using your
+% distribution's package manager. Alternatively go to
 % \href{http://www.ctan.org}{CTAN} to download missing packages.
 %
-% Please note, that the support of \hologo{XeLaTeX} and \hologo{LuaLaTeX} is 
-% only partial. For example the mono font is not the same. Moreover 
-% \hologo{pdfLaTeX} is a \TeX{} engine used by the publishers. Therefore it is
-% strongly recommended to use \hologo{pdfLaTeX}. 
-% 
+% The \lni{} class can be used with \hologo{pdfLaTeX} as well as with
+% \hologo{XeLaTeX} and \hologo{LuaLaTeX}. To achieve same results, the
+% Type1-based packages \pkg{newtxtext}, \pkg{newtxmath} and \pkg{newtxtt}
+% are used even for the unicode engines.
+%
 % \subsection{Options}\label{sec:options}
-% Although the class file includes all layout information for a submission to 
+% Although the class file includes all layout information for a submission to
 % the \LNI{}, there are options to adapt the output one way or another.
 %
-% \DescribeOption{english}A document loading the \lni{} class file uses German 
-% language adoptions by default. To switch to English, just load the class with 
+% \DescribeOption{english}A document loading the \lni{} class file uses German
+% language adoptions by default. To switch to English, just load the class with
 % option \opt{english}.
 %
-% The language influences not only the hyphenation patterns and terms used in 
-% the text, but also the choice of a corresponding \BibTeX{} file 
+% The language influences not only the hyphenation patterns and terms used in
+% the text, but also the choice of a corresponding \BibTeX{} file
 % (cf.~\cref{sec:bibliography}).
 %
-% \DescribeOption{utf8}\DescribeOption{latin1}\DescribeOption{applemac}Although 
-% nowadays all major plattforms support and widely use UTF-8 encoding for 
+% \DescribeOption{utf8}\DescribeOption{latin1}\DescribeOption{applemac}Although
+% nowadays all major plattforms support and widely use UTF-8 encoding for
 % text files, there might be some need to change the input  encoding the
 % \LaTeX{} document uses.
 %
-% This can be achieved by giving one of the options \opt{utf8} (which is the 
+% This can be achieved by giving one of the options \opt{utf8} (which is the
 % default), \opt{latin1} or \opt{applemac} to the document class. Using UTF-8
 % is strongly recommended. Please note, that currently the bib file is supposed
 % to use the same encoding.
 %
-% \DescribeOption{biblatex}Nowadays bibliographies cannot only be produced with 
-% \BibTeX{}, but with a much more powerful approach consisting of the package 
+% \DescribeOption{biblatex}Nowadays bibliographies cannot only be produced with
+% \BibTeX{}, but with a much more powerful approach consisting of the package
 % \pkg{biblatex} and the tool \texttt{biber}.
 %
-% There is even a specialized package \pkg{biblatex-lni} which is automatically 
-% used when setting the class option \opt{biblatex}. For more information see 
+% There is even a specialized package \pkg{biblatex-lni} which is automatically
+% used when setting the class option \opt{biblatex}. For more information see
 % as well \cref{sec:bibliography}.
 %
 % \DescribeOption{crop\space(new in v1.1)}%
-% Option \opt{crop} gives you some crop marks (using the package \pkg{crop}) to 
-% better illustrate the final 
+% Option \opt{crop} gives you some crop marks (using the package \pkg{crop}) to
+% better illustrate the final
 % result of your article.
 %
 % \DescribeOption{nocleveref}When referencing figures, one has to type
 % \texttt{Figure\textasciitilde}\cs{ref\marg{label}}. The package \pkg{cleveref}
 % reduces the effort by offering the command \cs{cref\marg{label}}. This can be
-% used with all floating objects. The package is loaded as default. In case it 
+% used with all floating objects. The package is loaded as default. In case it
 % causes issues, one can disable it using with the \opt{nocleveref} option.
 %
-% \DescribeOption{nohyperref}\pkg{hyperref} is used for colored hyperlinks 
-% within the articles. If you consider problems or just do not want that 
+% \DescribeOption{nohyperref}\pkg{hyperref} is used for colored hyperlinks
+% within the articles. If you consider problems or just do not want that
 % feature, you can disable it by using the option \opt{nohyperref}.
 %
-% \DescribeOption{nofonts\space(new in v1.3, deprecated in v1.4)}On old systems 
-% you might not have installed the New TX fonts. If for whatever reason the 
-% \opt{oldfonts} option 
-% does not work for you, you can activate option \opt{nofonts}. This allows to 
+% \DescribeOption{nofonts\space(new in v1.3, deprecated in v1.4)}On old systems
+% you might not have installed the New TX fonts. If for whatever reason the
+% \opt{oldfonts} option
+% does not work for you, you can activate option \opt{nofonts}. This allows to
 % suppress font loading completely using the engines standard fonts instead.
-% Usually there should be no need to do so. Please note, that your output will 
+% Usually there should be no need to do so. Please note, that your output will
 % differ from the publishers'.
 %
 % \DescribeOption{oldfonts\space(new in v1.4)}On older systems you might not
 % have installed the New TX fonts. Therefore option \opt{oldfonts} allows to
-% to load the package \pkg{mathptmx} instead of the New TX fonts. The output 
+% to load the package \pkg{mathptmx} instead of the New TX fonts. The output
 % will be in accordance to (or at least near) the publisher's requirements.
 %
 % \DescribeOption{norunningheads\space(new in v1.5)}To easily remove all running
 % headers from your document, you can use the option \opt{norunningheads}.
 % \newpage
 % \section{Setting up a document}
-% You can use the file \file{lni-author-template.tex} as a starting point 
-% for setting up a document for submission. The \lni{} class uses the standard 
+% You can use the file \file{lni-author-template.tex} as a starting point
+% for setting up a document for submission. The \lni{} class uses the standard
 % ways to build an article.
 %
 % \subsection{Special meta data}\label{sec:metadata}
-% There is not just one \enquote{\TeX} and one \enquote{bibliography tool}, but 
+% There is not just one \enquote{\TeX} and one \enquote{bibliography tool}, but
 % many different ways to transform a .tex file into a PDF.
-% Some \TeX{} editors like \texttt{TeXstudio}, \texttt{TeXmaker} and 
-% \texttt{TeXshop} support a special set of meta data to tell the editor, how 
+% Some \TeX{} editors like \texttt{TeXstudio}, \texttt{TeXmaker} and
+% \texttt{TeXshop} support a special set of meta data to tell the editor, how
 % to deal with a concrete document.
-% 
+%
 % A typical example looks like:
 % \begin{examplecode}
 % % !TeX program = pdflatex
 % % !BIB program = bibtex8
 % % !TeX encoding = UTF-8
-% !TeX spellcheck = de_DE
+% % !TeX spellcheck = de_DE
 % \documentclass[english]{lni}
 % \end{examplecode}
 %
 % \subsection{Special macros for editors}
-% \DescribeMacro{\startpage}\DescribeMacro{\editor}\DescribeMacro{\booktitle}%
-% \DescribeMacro{\year}In addition to the macros stated in 
+% \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
 % \cref{sec:titlepage} for authors, there are special editor macros to
 % influence the layout of the article:
 % \begin{itemize}
-%   \item\cs{startpage} determines the starting page of the article. This 
+%   \item\cs{startpage} determines the starting page of the article. This
 % should always be an odd (right) page.
 %   \item\cs{editor} states the name of the editor(s)
-%   \item\cs{booktitle} holds the name of a conference
+%   \item\cs{booktitle} holds the name of a conference (optional argument for
+%   a short title used in the running headers)
+%   \item\cs{booksubtitle} holds an optional subtitle of a conference
 %   \item\cs{year} can be used to set the year
 % \end{itemize}
 %
 % \subsection{Title page}\label{sec:titlepage}
 % \DescribeMacro{\title}%
 % \DescribeMacro{\subtitle\space(new in v1.1)}%
-% The title of your work is given using the \cs{title} macro. In addition to 
-% the title itself, you can add a short title to be used 
+% The title of your work is given using the \cs{title} macro. In addition to
+% the title itself, you can add a short title to be used
 % in the header of a page:
 % \begin{examplecode}[label={lst:title}]
 % \title[Short title]{Title}
 % \end{examplecode}
-% 
-% You can also add a subtitle by \cs{substitle\marg{subtitle}}.
-% 
+%
+% You can also add a subtitle by \cs{subtitle\marg{subtitle}}.
+%
 % \DescribeMacro{\author}\DescribeMacro{\email}\DescribeMacro{\footnote}%
 % \DescribeMacro{\and}%
-% The authors of an article are 
-% given using the standard \cs{author} macro. Multiple authors are separated 
-% by \cs{and}; affiliations have to be added with 
-% \cs{footnote\marg{affiliations}} where you can use 
+% The authors of an article are
+% given using the standard \cs{author} macro. Multiple authors are separated
+% by \cs{and}; affiliations have to be added with
+% \cs{footnote\marg{affiliations}} where you can use
 % \cs{email\marg{email address}} for the email address of an author:
-% \begin{examplecode}[label={lst:author}] 
+% \begin{examplecode}[label={lst:author}]
 % \author[Author 1 \and Author 2]{%
 %    Author 1\footnote{Affiliations including \email{email@author1}} \and%
 %    Author 2\footnote{Affiliations including \email{email@author2}}}
 % \end{examplecode}
-% In case the authors are too long for the page header, see 
+% In case the authors are too long for the page header, see
 % \cref{sec:pageheader} of how to shorten the authors for the page header.
 %
 % \DescribeMacro{\lnidoi\space(new in v1.2)}%
@@ -495,13 +513,13 @@ This work consists of the file  lni.dtx
 % \subsection{Abstract and keywords}
 % \DescribeEnv{abstract}\DescribeEnv{keywords}%
 % \DescribeMacro{\and\space(new in v1.1)}%
-% Each article should start with a short (70 to 150 words) abstract and some 
-% keywords. Please use the environments \env{abstract} and \env{keywords} for 
+% Each article should start with a short (70 to 150 words) abstract and some
+% keywords. Please use the environments \env{abstract} and \env{keywords} for
 % that purpose:
 % \begin{examplecode}
 % \begin{abstract}
 % Tell the reader what your article is about
-% \end{abstract}   
+% \end{abstract}
 % \begin{keywords}
 % Give some keywords to categorize your article. You can use \and between two
 % keywords to get the correct delimiter (semicolon plus space) automatically.
@@ -510,8 +528,8 @@ This work consists of the file  lni.dtx
 %
 % \subsection{Page header}\label{sec:pageheader}
 % The template automatically sets the page headers according to the
-% requirements of \LNI. From page~2 onwards, the title and the authors are 
-% printed. These information has to stay in one line. In case the title is too 
+% requirements of \LNI. From page~2 onwards, the title and the authors are
+% printed. These information has to stay in one line. In case the title is too
 % long, use the optional argument for \cs{title}:
 % \begin{examplecode}
 % \title[Short title]{Title}
@@ -521,7 +539,7 @@ This work consists of the file  lni.dtx
 % In case there are many authors on a paper, they might not fit into the paper.
 % For that purpose, additionally use \cs{authorrunning}:
 % \begin{examplecode}
-% \author[Firstname1 Lastname1 \and Firstname2 Lastname2% 
+% \author[Firstname1 Lastname1 \and Firstname2 Lastname2%
 %    \and Firstname3 Lastname3]{Firstname1 Lastname1\footnote{...}%
 %    \and Firstname2 Lastname2\footnote{...}%
 %    \and Firstname3 Lastname3\footnote{...}}%
@@ -532,34 +550,34 @@ This work consists of the file  lni.dtx
 % \subsubsection{Headings}
 % \DescribeMacro{\section}\DescribeMacro{\subsection}%
 % \DescribeMacro{\subsubsection}
-% You can use the standard macros \cs{section}, \cs{subsection}, \dots{} for 
+% You can use the standard macros \cs{section}, \cs{subsection}, \dots{} for
 % sectioning your text.
-% 
+%
 % \subsubsection{Footnotes}
 % \DescribeMacro{\footnote}%
-% For adding a footnote, just use \cs{footnote\marg{footnote text}} where 
-% needed. Please note, that the footnote counter is automatically set to the 
-% correct value at the beginning of your text, i.\,e. it respects the number 
+% For adding a footnote, just use \cs{footnote\marg{footnote text}} where
+% needed. Please note, that the footnote counter is automatically set to the
+% correct value at the beginning of your text, i.\,e. it respects the number
 % of affiliations given on the title page.
 %
 % \subsubsection{Lists}
 % \DescribeEnv{itemize}\DescribeEnv{enumerate}%
-% The \lni{} class redefines the standard lists environments \env{itemize} and 
+% The \lni{} class redefines the standard lists environments \env{itemize} and
 % \env{enumerate} to meet the requirements of the \LNI{}.
-% 
+%
 % Lists can be filled as usual by adding \cs{item} macros.
 %
 % \subsubsection{Floating objects}
 % \DescribeEnv{figure}\DescribeEnv{table}%
-% The environments \env{figure} and \env{table} can be used the standard way to 
+% The environments \env{figure} and \env{table} can be used the standard way to
 % include graphics or tables resp.
 %
-% However, please note, that the default placement parameters are changed to 
-% \opt{htbp} by the class \lni{}. If you need some local adjustment, please use 
+% However, please note, that the default placement parameters are changed to
+% \opt{htbp} by the class \lni{}. If you need some local adjustment, please use
 % the optional argument of both environments (cf.~Listing~\ref{lst:figure}).
 %
 % \DescribeMacro{\caption}\DescribeMacro{\label}
-% A caption should be added by \cs{caption\marg{caption text}}, followed 
+% A caption should be added by \cs{caption\marg{caption text}}, followed
 % immediately by a \cs{label\marg{unique label}} entry.
 % \begin{examplecode}[label={lst:figure}]
 % \begin{figure}[tb]
@@ -569,8 +587,8 @@ This work consists of the file  lni.dtx
 % \end{figure}
 % \end{examplecode}
 %
-% If you want to center floats, please \emph{do not} use the \env{center} 
-% environment, but the macro \cs{centering}, which does not add extra white 
+% If you want to center floats, please \emph{do not} use the \env{center}
+% environment, but the macro \cs{centering}, which does not add extra white
 % space (cf.~Listing~\ref{lst:table}).
 % \begin{examplecode}[label={lst:table}]
 % \begin{table}
@@ -584,28 +602,28 @@ This work consists of the file  lni.dtx
 % \end{examplecode}
 %
 % \subsubsection{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 
+% 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.
 %
-% However, there are currently no config files shipped with the \lni{} bundle. 
-% Please consult the documentation for help on setting up \pkg{listings} for a 
+% However, there are currently no config files shipped with the \lni{} bundle.
+% Please consult the documentation for help on setting up \pkg{listings} for a
 % specific programming language.
 %
 % \subsubsection{Math}
-% If you need mathematics, you can load packages \pkg{amsmath} and 
-% \pkg{mathtools} for 
-% additional features. The \lni{} class offers by default the command 
-% \cs{powerset} to render the powerset symbol correctly as $\powerset$ and not 
+% If you need mathematics, you can load packages \pkg{amsmath} and
+% \pkg{mathtools} for
+% additional features. The \lni{} class offers by default the command
+% \cs{powerset} to render the powerset symbol correctly as $\powerset$ and not
 % as Weierstrass p ($\wp$).
 %
 % \subsubsection{Abbreviations and initialisms}
 % \DescribeMacro{\eg}\DescribeMacro{\ie}\DescribeMacro{\cf}%
 % \DescribeMacro{\etal}%
-% To achieve consistent typesetting of common abbreviations, macros are 
-% predefined by the class. These macros should \emph{consistently} being used 
-% instead of writing the plain version. For example use \verb|\eg| rather than 
-% {\verb|e.g.,|}. The macros take care of spacing within and after the 
+% To achieve consistent typesetting of common abbreviations, macros are
+% predefined by the class. These macros should \emph{consistently} being used
+% instead of writing the plain version. For example use \verb|\eg| rather than
+% {\verb|e.g.,|}. The macros take care of spacing within and after the
 % abbreviations.
 % \begin{itemize}
 % \item \cs{eg} for e.\,g.
@@ -615,9 +633,9 @@ This work consists of the file  lni.dtx
 % \end{itemize}
 %
 % \DescribeMacro{\OMG}\DescribeMacro{\BPM}\DescribeMacro{\BPMN}\DescribeMacro{\UML}%
-% In addition to common abbreviations, further initialisms are provided by the 
-% class for convenience and for a consistent visual appearance. Note that the 
-% class uses \textsc{smallcaps} for typesetting initialisms. The list of 
+% In addition to common abbreviations, further initialisms are provided by the
+% class for convenience and for a consistent visual appearance. Note that the
+% class uses \textsc{smallcaps} for typesetting initialisms. The list of
 % predefined initialisms comprises:
 %
 % \begin{itemize}
@@ -628,41 +646,41 @@ This work consists of the file  lni.dtx
 % \item \cs{UML} for \textsc{uml} (Unified Modelling Language).
 % \end{itemize}
 %
-% \DescribeMacro{\lniinitialism} You can add your own initialisms by stating 
+% \DescribeMacro{\lniinitialism} You can add your own initialisms by stating
 % \cs{lniinitialism\marg{\textbackslash initialism\_macro}\marg{text}} in the
 % preamble.
 %
 % \subsection{Bibliography}\label{sec:bibliography}
-% \enlargethispage{\baselineskip}The old \lni{} class file only supports 
-% \BibTeX{} with bst files for German 
+% \enlargethispage{\baselineskip}The old \lni{} class file only supports
+% \BibTeX{} with bst files for German
 % and English submissions resp. If you want to use this approach for your
 % article you have to add \cs{bibliography\marg{Bib file}} at an appropriate
 % position within your text. The correct bst file is loaded automatically.
-% 
-% With option 
+%
+% With option
 % \opt{biblatex} (cf.~\cref{sec:options}) you can easily switch to the modern
-% \pkg{biblatex} package. However, you have to add information on the bib 
-% file(s) in your preamble using \cs{addbibresource\marg{Bib file(s)}} and call 
+% \pkg{biblatex} package. However, you have to add information on the bib
+% file(s) in your preamble using \cs{addbibresource\marg{Bib file(s)}} and call
 % \cs{printbibliography} where you want the bibliography to appear.
 %
-% Please note, that the \lni{} class sets 
-% \texttt{biber} as the default bibliography tool. \texttt{biber} is part of 
-% both major \TeX{} distributions and can easily be used within most \TeX{} 
+% Please note, that the \lni{} class sets
+% \texttt{biber} as the default bibliography tool. \texttt{biber} is part of
+% both major \TeX{} distributions and can easily be used within most \TeX{}
 % editors, e.\,g. by using special meta data as described in
 % \cref{sec:metadata}.
 %
-% If you want to pass settings to \pkg{biblatex} you can use a config 
-% file \texttt{biblatex.cfg}, for additional options please use the macro 
+% If you want to pass settings to \pkg{biblatex} you can use a config
+% file \texttt{biblatex.cfg}, for additional options please use the macro
 % \cs{ExecuteBibliographyOptions}. Please consult the
 % \href{http://texdoc.net/pkg/biblatex}{package's documentation} for
 % more information.
 % \begin{examplecode}
 % % !TeX program = pdflatex
-% % !BIB program = biber   
+% % !BIB program = biber
 % \documentclass[biblatex]{lni}
 % ...
 % \ExecuteBibliographyOptions{...}
-% \addbibresource{FILENAME.bib}   
+% \addbibresource{FILENAME.bib}
 % ...
 % \begin{document}
 % ...
@@ -698,10 +716,10 @@ This work consists of the file  lni.dtx
 % \texttt{!Package xkeyval Error: 'family\_i'
 % undefined in families blx@opt@name}\\\texttt{part'.},\\
 % it is an indicator that you
-% switched from \BibTeX{} to \pkg{biblatex}. Clean up (remove 
+% switched from \BibTeX{} to \pkg{biblatex}. Clean up (remove
 % \texttt{paper.bbl}) and recompile.
-% \item Errors with \BibTeX: The bst files may still report errors, although 
-% the output is okay. This will be solved as soon as possible. However, you 
+% \item Errors with \BibTeX: The bst files may still report errors, although
+% the output is okay. This will be solved as soon as possible. However, you
 % might consider switching to \pkg{biblatex} (cf.~\cref{sec:bibliography}).
 % \end{itemize}
 %
@@ -763,7 +781,7 @@ This work consists of the file  lni.dtx
 \newif\ifnorunningheads
 \DeclareOption{norunningheads}{\norunningheadstrue}
 \ExecuteOptions{utf8}
-\DeclareOption*{\ClassWarning{Option `\CurrentOption` is not supported!}}
+\DeclareOption*{\PassOptionsToClass{\CurrentOption}{article}}
 \ProcessOptions\relax
 %
 \RequirePackage{iftex}
@@ -805,24 +823,24 @@ This work consists of the file  lni.dtx
          {%
             \RequirePackage{newtxtext}
             \RequirePackage{newtxmath}
-            \RequirePackage[zerostyle=b,scaled=.9]{newtxtt} 
+            \RequirePackage[zerostyle=b,scaled=.9]{newtxtt}
 %    \end{macrocode}
-% For compatibility with version of \pkg{newtxtt} prior to v1.05 we set the 
+% For compatibility with version of \pkg{newtxtt} prior to v1.05 we set the
 % option \opt{straightquotes} manually for recent versions
 %    \begin{macrocode}
             \@ifpackagelater{newtxtt}{2014/11/18}%
                {\txtt@upqtrue}%
-               {\ClassWarning{lni}{You are using an old version of 
-                `newtxtt'.\MessageBreak 
+               {\ClassWarning{lni}{You are using an old version of
+                `newtxtt'.\MessageBreak
                 Option `straightquotes' will not be used!}}%
-%    \end{macrocode}         
+%    \end{macrocode}
 %    \begin{macrocode}
          }%
          {\IfFileExists{mathptmx.sty}
             {\oldfontstrue}%
             {\nofontstrue}%
          }%
-%    \end{macrocode}         
+%    \end{macrocode}
 % for \hologo{XeTeX} or \hologo{LuaTeX} we use \pkg{fontspec}
 %    \begin{macrocode}
    \else%
@@ -845,8 +863,8 @@ This work consists of the file  lni.dtx
             {\oldfontstrue}%
             {\nofontstrue}%
          }%
-   \fi%         
-\fi%         
+   \fi%
+\fi%
 \ifoldfonts
    \RequirePackage{mathptmx}
 \else%
@@ -871,6 +889,16 @@ This work consists of the file  lni.dtx
    \RequirePackage[%
       final,%
       protrusion=alltext-nott]{microtype}%
+%    \end{macrocode}
+% When using \hologo{LuaLaTeX} we can activate \pkg{selnolig}
+%    \begin{macrocode}
+   \ifluatex
+      \iflnienglish
+         \RequirePackage[english]{selnolig}%
+      \else
+         \RequirePackage[ngerman]{selnolig}%
+      \fi%
+   \fi%
 \fi%
 \SetTracking{encoding=*,shape=sc}{50}%
 %    \end{macrocode}
@@ -889,11 +917,12 @@ This work consists of the file  lni.dtx
 }{}
 \DeclareMathSymbol{\powerset}{\mathord}{MnSyC}{180}
 %    \end{macrocode}
+%    \begin{macrocode}
 % Support for CC icons
 \RequirePackage{ccicons}
 % Support for \cs{ifdefempty}
 \RequirePackage{etoolbox}
-% Satzspiegel
+%    \end{macrocode}
 %    \begin{macrocode}
 \newlength{\doihoffset}
 \newlength{\doivoffset}
@@ -904,7 +933,8 @@ This work consists of the file  lni.dtx
      includehead,
      headheight=20.39pt,
      headsep=.31cm,
-     centering]
+     centering,
+     driver=none]
      {geometry}
    \RequirePackage[a4,center,cam,info]{crop}
    \renewcommand*\CROP@@info{{%
@@ -951,7 +981,7 @@ This work consists of the file  lni.dtx
    \setlength{\doivoffset}{4.3cm}
 \fi%
 %    \end{macrocode}
-% We change \cs{small} and \cs{Large} to get the correct baseline skips and add 
+% We change \cs{small} and \cs{Large} to get the correct baseline skips and add
 % an \cs{oldsmall}
 %    \begin{macrocode}
 \let\oldsmall\small%
@@ -1016,7 +1046,7 @@ This work consists of the file  lni.dtx
    captionpos=b,%
    upquote}%
 %    \end{macrocode}
-% Ragged bottom -- verhindert die Ausdehnung der Seite = Veränderung der 
+% Ragged bottom -- verhindert die Ausdehnung der Seite = Veränderung der
 % Abstände
 %    \begin{macrocode}
 \def\thisbottomragged{\def\@textbottom{\vskip\z@ plus.0001fil
@@ -1046,7 +1076,7 @@ This work consists of the file  lni.dtx
   \fi}
 %    \end{macrocode}
 % \begin{macro}{\title}
-%    \begin{macrocode}  
+%    \begin{macrocode}
 \renewcommand{\title}{\@dblarg\@@title}
 \def\@@title[#1]#2{\gdef\@shorttitle{#1}\gdef\@title{#2}}
 %    \end{macrocode}
@@ -1071,7 +1101,7 @@ This work consists of the file  lni.dtx
 % \end{macro}
 % \begin{macro}{\email}
 %    \begin{macrocode}
-\newcommand*{\email}[1]{{\urlstyle{same}\protect\url{#1}}}
+\newcommand*{\email}[1]{\href{mailto:#1}{\urlstyle{same}\protect\nolinkurl{#1}}}
 %    \end{macrocode}
 % \end{macro}
 % \begin{macro}{\lnidoi}
@@ -1110,7 +1140,7 @@ This work consists of the file  lni.dtx
     \else
       \thispagestyle{plain}
     \fi%
-    \@thanks   
+    \@thanks
   \endgroup
   \global\let\thanks\relax
   \global\let\maketitle\relax
@@ -1173,7 +1203,7 @@ This work consists of the file  lni.dtx
 \renewenvironment*{abstract}{%
    \renewcommand{\abstractname}{Abstract}%
    \small\noindent\ignorespaces{\bfseries\abstractname:\ }%
-}{\endquotation}  
+}{\endquotation}
 %    \end{macrocode}
 % \end{environment}
 % \begin{environment}{keywords}
@@ -1186,16 +1216,16 @@ This work consists of the file  lni.dtx
    {\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}{}{}   
+   {Please change \string\keywords\space to an environment}\keywordsfalse\fi}{}{}
 %    \end{macrocode}
 % \end{environment}
 % Section headings
 %    \begin{macrocode}
 \renewcommand{\section}{\@startsection{section}{1}{\z@}%
-  {-16\p@ \@plus -4\p@ \@minus -4\p@}{5\p@ \@plus 4\p@ \@minus 
+  {-16\p@ \@plus -4\p@ \@minus -4\p@}{5\p@ \@plus 4\p@ \@minus
   4\p@}{\large\bfseries}}
 \renewcommand{\subsection}{\@startsection{subsection}{2}{\z@}%
-  {-16\p@ \@plus -4\p@ \@minus -4\p@}{8\p@ \@plus 4\p@ \@minus 
+  {-16\p@ \@plus -4\p@ \@minus -4\p@}{8\p@ \@plus 4\p@ \@minus
   4\p@}{\normalsize\bfseries}}
 %    \end{macrocode}
 % Bildunterschriften
@@ -1262,9 +1292,9 @@ This work consists of the file  lni.dtx
   \ifnum \@itemdepth >\thr@@\@toodeep\else
   	\setlength{\labelsep}{0.70cm}%Abstand zum Aufzählungspunkt
     \advance\@itemdepth\@ne
-    \edef\@itemitem{labelitem\romannumeral\the\@itemdepth}%   
+    \edef\@itemitem{labelitem\romannumeral\the\@itemdepth}%
     \expandafter
-    \list  
+    \list
       \csname\@itemitem\endcsname
       {\def\makelabel##1{\hss\llap{##1}}%
        \setlength{\itemsep}{8pt}%
@@ -1272,13 +1302,13 @@ This work consists of the file  lni.dtx
   \fi}
 %    \end{macrocode}
 % and numbered lists
-%    \begin{macrocode}  
+%    \begin{macrocode}
   \renewcommand{\labelenumii}{\alph{enumii})}
-  \renewcommand*\enumerate{%    
+  \renewcommand*\enumerate{%
   \ifnum \@enumdepth >\thr@@
       \@toodeep
     \else
-		\setlength{\labelsep}{0.70cm}%Abstand zur Aufzählungsnummer      
+		\setlength{\labelsep}{0.70cm}%Abstand zur Aufzählungsnummer
       \advance\@enumdepth \@ne
       \edef\@enumctr{enum\romannumeral\the\@enumdepth}%
     \fi
@@ -1287,7 +1317,7 @@ This work consists of the file  lni.dtx
     \expandafter\list\csname label\@enumctr\endcsname{%
       \usecounter{\@enumctr}%
       \def\makelabel##1{\hss\llap{##1}}
-		\setlength{\labelsep}{0.6cm} %Einrückung des Aufzählungszeichens     
+		\setlength{\labelsep}{0.6cm} %Einrückung des Aufzählungszeichens
       \setlength{\itemsep}{8pt}%
       \setlength{\parsep}{-2pt}}
   }%
@@ -1322,10 +1352,13 @@ This work consists of the file  lni.dtx
 % \end{macro}
 % \begin{macro}{\booktitle}
 %    \begin{macrocode}
-\newcommand*{\@booktitle}{}
-\newcommand*{\booktitle}[1]{\renewcommand{\@booktitle}{#1}}
+\newcommand{\booktitle}{\@dblarg\@@booktitle}
+\def\@@booktitle[#1]#2{\gdef\@bookshorttitle{#1}\gdef\@booktitle{#2}}
 %    \end{macrocode}
 % \end{macro}
+% \begin{macro}{\booksubtitle}
+\newcommand{\booksubtitle}[1]{\gdef\@booksubtitle{#1}}
+% \end{macro}
 % \begin{macro}{\editor}
 %    \begin{macrocode}
 \newcommand*{\@editor}{}
@@ -1345,12 +1378,14 @@ This work consists of the file  lni.dtx
 %    \begin{macrocode}
 \fancypagestyle{plain}{%
    \fancyhead{} % Löscht alle Kopfzeileneinstellungen
-   \fancyhead[RO]{\small\@editor~(Hrsg.):\ \@booktitle,\hspace{1sp}\null\linebreak%
+   \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.):\ \@booktitle,\linebreak\hspace{0.05cm}\thepage\hspace{5pt} Lecture Notes in Informatics (LNI), Gesellschaft für Informatik, Bonn~\@year}
+   \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 
+   \renewcommand{\headrulewidth}{0.4pt} %Linie unter Kopfzeile
 }%
 \ifnorunningheads
    \pagestyle{empty}
@@ -1360,7 +1395,7 @@ This work consists of the file  lni.dtx
    \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
-   \renewcommand{\headrulewidth}{0.4pt} %Linie unter Kopfzeile 
+   \renewcommand{\headrulewidth}{0.4pt} %Linie unter Kopfzeile
 \fi%
 %    \end{macrocode}
 %    \begin{macrocode}
@@ -1376,12 +1411,14 @@ This work consists of the file  lni.dtx
 %    \begin{macrocode}
 \ifusehyperref
    \AtEndPreamble{%
-      \RequirePackage[pdfusetitle,bookmarks=false]{hyperref}
+      \RequirePackage[bookmarks=false]{hyperref}
       \hypersetup{%
          pdfdisplaydoctitle,%
          colorlinks=true,%
          allcolors=black,%
-         pdfstartview=Fit%
+         pdfstartview=Fit,%
+         pdfauthor={\@author},%
+         pdftitle={\@title}%
       }%
    }%
 \fi%
@@ -1407,7 +1444,11 @@ This work consists of the file  lni.dtx
 %    \end{macrocode}
 % enables correct jumping to figures when referencing
 %    \begin{macrocode}
-\AtEndPreamble{\RequirePackage[all]{hypcap}}
+\AtEndPreamble{%
+   \@ifpackageloaded{hyperref}
+   {\RequirePackage[all]{hypcap}}%
+   {}%
+}%
 %    \end{macrocode}
 %    \begin{macrocode}
 \def\and{\unskip\hspace{-0.42em},\hspace{.6em}}
@@ -1459,7 +1500,7 @@ This work consists of the file  lni.dtx
    \endlist\egroup}
 %    \end{macrocode}
 %    \begin{macrocode}
-\frenchspacing    
+\frenchspacing
 \tolerance 1414
 \hbadness 1414
 \emergencystretch 1.5em
@@ -1666,7 +1707,7 @@ FUNCTION {format.names} %formats the names of the authors
   s num.names$ 'numnames :=
   numnames 'namesleft :=
     { namesleft #0 > }
-    { s nameptr "{vv~}{ll}{, jj}{, ff}" format.name$ 't 
+    { s nameptr "{vv~}{ll}{, jj}{, ff}" format.name$ 't
 % last name, prename(s)
      :=
       nameptr #1 >
@@ -1688,7 +1729,7 @@ FUNCTION {format.names} %formats the names of the authors
               if$
               t "others" =
                 { " et~al." * }
-% ``and'' changed to ``;'' 
+% ``and'' changed to ``;''
                 { "; " * t * }
               if$
             }
@@ -1700,7 +1741,7 @@ FUNCTION {format.names} %formats the names of the authors
       namesleft #1 - 'namesleft :=
     }
   while$
-   
+
 }
 
 FUNCTION {format.authors}
@@ -1726,7 +1767,7 @@ FUNCTION {format.editors}
 	{ ", Hrsg." * }
 	{ ", Hrsg." * }
 %</ger>
-%<*eng|ger>	
+%<*eng|ger>
       if$
     }
   if$
@@ -1735,7 +1776,7 @@ FUNCTION {format.editors}
 FUNCTION {format.title}
 { title empty$
     { "" }
-% (RT) the title as typed in the database here 
+% (RT) the title as typed in the database here
 %    { title "t" change.case$ }
     'title
   if$
@@ -1809,20 +1850,20 @@ FUNCTION {format.bvolume}
 %<*eng>
     { "volume" volume tie.or.space.connect
 %</eng>
-%<*ger>    
+%<*ger>
     { "Jgg." volume tie.or.space.connect
 %</ger>
-%<*eng|ger>    
+%<*eng|ger>
       series empty$
 	'skip$
 %</eng|ger>
-%<*eng>	
-	{ " of " * series % no emphasize 
+%<*eng>
+	{ " of " * series % no emphasize
 %</eng>
 %<*ger>
-	{ " in " * series % no emphasize 
+	{ " in " * series % no emphasize
 %</ger>
-%<*eng|ger>	 	
+%<*eng|ger>
 	* }
       if$
       "volume and number" number either.or.check
@@ -1841,7 +1882,7 @@ FUNCTION {format.number.series}
 	  series empty$
         { "" }
         { series * }
-      if$          
+      if$
           number tie.or.space.connect % series and then the number, eg LNI 001
         }
     if$
@@ -1855,7 +1896,7 @@ FUNCTION {format.edition}
     { "" }
     { output.state mid.sentence =
 %</eng|ger>
-%<*eng>    
+%<*eng>
 	{ edition "l" change.case$ " edition" * }
 	{ edition "t" change.case$ " edition" * }
 %</eng>
@@ -1863,7 +1904,7 @@ FUNCTION {format.edition}
 	{ edition "l" change.case$ ".~Auflage" * }
 	{ edition "t" change.case$ ".~Auflage" * }
 %</ger>
-%<*eng|ger>	
+%<*eng|ger>
       if$
     }
   if$
@@ -1906,7 +1947,7 @@ FUNCTION {format.pages}
 	{ "S." pages n.dashify tie.or.space.connect }
 	{ "S." pages tie.or.space.connect }
 %</ger>
-%<*eng|ger>	
+%<*eng|ger>
       if$
     }
   if$
@@ -1938,13 +1979,13 @@ FUNCTION {format.chapter.pages}
     'format.pages
     { type empty$
 %</eng|ger>
-%<*eng>    
+%<*eng>
 	{ "chapter" }
 %</eng>
 %<*ger>
 	{ "Kapitel" }
 %</ger>
-%<*eng|ger>	
+%<*eng|ger>
 	{ type "l" change.case$ }
       if$
       chapter tie.or.space.connect
@@ -1960,7 +2001,7 @@ FUNCTION {format.in.ed.booktitle}
 { booktitle empty$
     { "" }
     { editor empty$
-% no emphasize    
+% no emphasize
 %       { "In: " booktitle emphasize * }
 %       { "In: " format.editors * ", " * booktitle emphasize * }
         { "In: " booktitle  * }
@@ -1998,7 +2039,7 @@ FUNCTION {format.tr.number}
 %<*ger>
     { "Bericht" }
 %</ger>
-%<*eng|ger>    
+%<*eng|ger>
     'type
   if$
   number empty$
@@ -2057,7 +2098,7 @@ FUNCTION {format.book.crossref}
       " in " *
     }
 %</ger>
-%<*eng|ger>    
+%<*eng|ger>
   if$
   editor empty$
   editor field.or.null author field.or.null =
@@ -2105,12 +2146,12 @@ FUNCTION {format.incoll.inproc.crossref}
 
 FUNCTION {article}
 { output.bibitem
-  format.authors %"author" output.check %% No dot after authors
+  format.authors write$ %"author" output.check %% No dot after authors
   new.block
   format.title "title" output.check
   new.block
   crossref missing$
-    { journal % no emphasize 
+    { journal % no emphasize
     "journal" output.check
       format.vol.num.pages output
       format.date "year" output.check
@@ -2128,7 +2169,7 @@ FUNCTION {book}
 { output.bibitem
   author empty$
     { format.editors "author and editor" output.check }
-    { format.authors %output.nonnull %%no dot after authors:
+    { format.authors write$ %output.nonnull %%no dot after authors:
       crossref missing$
 	{ "author and editor" editor either.or.check }
 	'skip$
@@ -2174,7 +2215,7 @@ FUNCTION {inbook}
 { output.bibitem
   author empty$
     { format.editors "author and editor" output.check }
-    { format.authors %*output.nonnull %%no dot after authors:
+    { format.authors write$ %*output.nonnull %%no dot after authors:
       crossref missing$
 	{ "author and editor" editor either.or.check }
 	'skip$
@@ -2185,7 +2226,7 @@ FUNCTION {inbook}
   format.btitle "title" output.check
   new.block
   crossref missing$ %changed whole order of next lines
-    { 
+    {
       format.in.ed.booktitle "booktitle" output.check %added: mention title of the related book and editors
       format.bvolume output
       new.block
@@ -2209,7 +2250,7 @@ FUNCTION {inbook}
 
 FUNCTION {incollection}
 { output.bibitem
-  format.authors %"author" output.check %%no dot after authors:
+  format.authors write$ %"author" output.check %%no dot after authors:
   new.block
   format.title "title" output.check
   new.block
@@ -2235,13 +2276,13 @@ FUNCTION {incollection}
 
 FUNCTION {inproceedings}
 { output.bibitem
-  format.authors %"author" output.check %%no dot after authors:
+  format.authors write$ %"author" output.check %%no dot after authors:
   new.block
   format.title "title" output.check
   new.block
   crossref missing$
     { format.in.ed.booktitle "booktitle" output.check
-      new.block      
+      new.block
       format.bvolume output
       format.number.series output
       address empty$
@@ -2304,7 +2345,7 @@ FUNCTION {manual}
 
 FUNCTION {mastersthesis}
 { output.bibitem
-  format.authors %"author" output.check
+  format.authors write$ %"author" output.check
   new.block
   format.title "title" output.check
   new.block
@@ -2315,7 +2356,7 @@ FUNCTION {mastersthesis}
 %<*ger>
   "Masterarbeit" format.thesis.type output.nonnull
 %</ger>
-%<*eng|ger>  
+%<*eng|ger>
   school "school" output.check
   address output
   format.date "year" output.check
@@ -2354,7 +2395,7 @@ FUNCTION {online}
 
 FUNCTION {phdthesis}
 { output.bibitem
-  format.authors %"author" output.check
+  format.authors write$ %"author" output.check
   new.block
   format.btitle "title" output.check
   new.block
@@ -2365,7 +2406,7 @@ FUNCTION {phdthesis}
 %<*ger>
   "Dissertation" format.thesis.type output.nonnull
 %</ger>
-%<*eng|ger>  
+%<*eng|ger>
   school "school" output.check
   address output
   format.date "year" output.check
@@ -2411,7 +2452,7 @@ FUNCTION {proceedings}
 
 FUNCTION {techreport}
 { output.bibitem
-  format.authors %"author" output.check
+  format.authors write$ %"author" output.check
   new.block
   format.title "title" output.check
   new.block
@@ -2426,7 +2467,7 @@ FUNCTION {techreport}
 
 FUNCTION {unpublished}
 { output.bibitem
-  format.authors %"author" output.check
+  format.authors write$ %"author" output.check
   new.block
   format.title "title" output.check
   new.block
@@ -2569,7 +2610,7 @@ FUNCTION {format.lab.names}
       ""
         { namesleft #0 > }
         { nameptr numnames =
-            { s nameptr "{ff }{vv }{ll}{ jj}" format.name$ 
+            { s nameptr "{ff }{vv }{ll}{ jj}" format.name$
             "others" =
                 { pop$ s #1 "{ll}" format.name$ #2 text.prefix$ %% second sign of first author if there are others
                 }
@@ -2582,7 +2623,7 @@ FUNCTION {format.lab.names}
           namesleft #1 - 'namesleft :=
         }
       while$
-      numnames #3 > 
+      numnames #3 >
         { pop$ s #1 "{ll}" format.name$ #2 text.prefix$ } % if more than 3 authors take second letter of first name
         'skip$
       if$
@@ -2859,7 +2900,7 @@ FUNCTION {begin.bib}
 { et.al.char.used
 % to make it compatible with singlepass, we use \def
 %    { "\newcommand{\etalchar}[1]{$^{#1}$}" write$ newline$ }
-    { "\gdef\etalchar#1{$^{#1}$}" write$ newline$ } 
+    { "\gdef\etalchar#1{$^{#1}$}" write$ newline$ }
     'skip$
   if$
   preamble$ empty$
@@ -2884,10 +2925,10 @@ EXECUTE {end.bib}
 %</eng|ger>
 %</bibtex>
 %<*template>
-%%% Um einen Artikel auf deutsch zu schreiben, genügt es die Klasse ohne 
+%%% Um einen Artikel auf deutsch zu schreiben, genügt es die Klasse ohne
 %%% Parameter zu laden.
 \documentclass[]{lni}
-%%% To write an article in English, please use the option ``english'' in order 
+%%% To write an article in English, please use the option ``english'' in order
 %%% to get the correct hyphenation patterns and terms.
 %%% \documentclass[english]{class}
 %%
@@ -2895,15 +2936,15 @@ EXECUTE {end.bib}
 %%% Mehrere Autoren werden durch \and voneinander getrennt.
 %%% Die Fußnote enthält die Adresse sowie eine E-Mail-Adresse.
 %%% Das optionale Argument (sofern angegeben) wird für die Kopfzeile verwendet.
-\title[Ein Kurztitel]{Ein sehr langer Titel über mehrere Zeilen mit sehr vielen 
+\title[Ein Kurztitel]{Ein sehr langer Titel über mehrere Zeilen mit sehr vielen
 Worten und noch mehr Buchstaben}
 %%%\subtitle{Untertitel / Subtitle} % if needed
 \author[Vorname1 Nachname1 \and Firstname2 Lastname2]
-{Vorname1 Nachname1\footnote{Universität, Abteilung, Straße, Postleitzahl Ort, 
+{Vorname1 Nachname1\footnote{Universität, Abteilung, Straße, Postleitzahl Ort,
 Land \email{emailaddress@author1}} \and
-Firstname2 Lastname2\footnote{University, Department, Address, Country 
+Firstname2 Lastname2\footnote{University, Department, Address, Country
 \email{emailaddress@author2}}}
-\startpage{11} % Beginn der Seitenzählung für diesen Beitrag / Start page 
+\startpage{11} % Beginn der Seitenzählung für diesen Beitrag / Start page
 %numbering at this number
 \editor{Herausgeber et al.} % Names of Editors
 \booktitle{Name-der-Konferenz} % Name of book title
@@ -2912,7 +2953,7 @@ Firstname2 Lastname2\footnote{University, Department, Address, Country
 \maketitle
 
 \begin{abstract}
-This is a brief overview of the paper, which should be 70 to 150 words long and 
+This is a brief overview of the paper, which should be 70 to 150 words long and
 include the most relevant points. This has to be a single paragraph.
 \end{abstract}
 \begin{keywords}
@@ -3066,7 +3107,7 @@ Schlagwort1 \and Schlagwort2 %Keyword1 \and Keyword2
  Vorname2 Nachname2\footnote{University, Department, Address, Country \email{emailaddress@author2}}}
 \startpage{11} % Beginn der Seitenzählung für diesen Beitrag
 \editor{Herausgeber et al.}    % Namen der Herausgeber
-\booktitle{Name-der-Konferenz} % Name des Tagungsband
+\booktitle{Name-der-Konferenz} % Name des Tagungsband; optional Kurztitel
 \year{2017}
 %%%\lnidoi{18.18420/provided-by-editor-02} % Falls bekannt
 \maketitle
@@ -3172,16 +3213,17 @@ public class Hello {
 
 \subsection{Formeln und Gleichungen}
 
-Die korrekte Einrückung und Nummerierung für Formeln ist bei den Umgebungen \texttt{equation} und \texttt{eqnarray} gewährleistet.
+Die korrekte Einrückung und Nummerierung für Formeln ist bei den Umgebungen
+\texttt{equation} und \texttt{align} gewährleistet.
 
 \begin{equation}
   1=4-3
 \end{equation}
 und
-\begin{eqnarray}
-  2=7-5\\
-  3=2-1
-\end{eqnarray}
+\begin{align}
+  2&=7-5\\
+  3&=2-1
+\end{align}
 
 %% \bibliography{lni-paper-example-de.tex} ist hier nicht erlaubt: biblatex erwartet dies bei der Preambel
 %% Starten Sie "biber paper", um eine Biliographie zu erzeugen.
@@ -3190,4 +3232,4 @@ und
 \end{document}
 %</exampledetex>
 %    \end{macrocode}
-%\fi 
+%\fi
diff --git a/Master/texmf-dist/source/latex/lni/lni.ins b/Master/texmf-dist/source/latex/lni/lni.ins
index fc495f759da..ea85fc5ac56 100644
--- a/Master/texmf-dist/source/latex/lni/lni.ins
+++ b/Master/texmf-dist/source/latex/lni/lni.ins
@@ -62,7 +62,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-2019 by Gesellschaft f^^c3^^bcr Informatik e.V. (GI)
 
 This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License (LPPL), either
@@ -102,7 +102,7 @@ This work consists of the file  lni.dtx
 }
 \endbatchfile
 %% 
-%% Copyright (C) 2016-2019 by Gesellschaft für Informatik e.V. (GI)
+%% Copyright (C) 2016-2019 by Gesellschaft f^^c3^^bcr Informatik e.V. (GI)
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License (LPPL), either
diff --git a/Master/texmf-dist/tex/latex/lni/lni.cls b/Master/texmf-dist/tex/latex/lni/lni.cls
index f7d398b6d4d..b1d4d6eb9a3 100644
--- a/Master/texmf-dist/tex/latex/lni/lni.cls
+++ b/Master/texmf-dist/tex/latex/lni/lni.cls
@@ -14,7 +14,7 @@
 %% --------| -----------------------------------------------------------------
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
 \ProvidesClass{lni}
-    [2019/04/04 v1.5 Official class for submissions to the ``Lecture Notes
+    [2019/10/14 v1.6BETA Official class for submissions to the ``Lecture Notes
     in Informatics'']
 \def\@clearglobaloption#1{%
   \def\@tempa{#1}%
@@ -58,7 +58,7 @@
 \newif\ifnorunningheads
 \DeclareOption{norunningheads}{\norunningheadstrue}
 \ExecuteOptions{utf8}
-\DeclareOption*{\ClassWarning{Option `\CurrentOption` is not supported!}}
+\DeclareOption*{\PassOptionsToClass{\CurrentOption}{article}}
 \ProcessOptions\relax
 \RequirePackage{iftex}
 \ifPDFTeX
@@ -150,6 +150,13 @@
    \RequirePackage[%
       final,%
       protrusion=alltext-nott]{microtype}%
+   \ifluatex
+      \iflnienglish
+         \RequirePackage[english]{selnolig}%
+      \else
+         \RequirePackage[ngerman]{selnolig}%
+      \fi%
+   \fi%
 \fi%
 \SetTracking{encoding=*,shape=sc}{50}%
 \DeclareFontFamily{U}{MnSymbolC}{}
@@ -175,7 +182,8 @@
      includehead,
      headheight=20.39pt,
      headsep=.31cm,
-     centering]
+     centering,
+     driver=none]
      {geometry}
    \RequirePackage[a4,center,cam,info]{crop}
    \renewcommand*\CROP@@info{{%
@@ -296,13 +304,13 @@
    \def\and{\unskip,\ }#1}}\gdef\@author{#2}}
 \newcommand{\authorrunning}[1]{%
    \fancyhead[LE]{\hspace{0.05cm}\oldsmall\thepage\hspace{5pt}#1}}
-\newcommand*{\email}[1]{{\urlstyle{same}\protect\url{#1}}}
+\newcommand*{\email}[1]{\href{mailto:#1}{\urlstyle{same}\protect\nolinkurl{#1}}}
 \newcommand{\@lnidoi}{}
 \newcommand{\lnidoi}[1]{\gdef\@lnidoi{#1}}
 \renewcommand\maketitle{\par%
 \begingroup
     \renewcommand\thefootnote{\@arabic\c@footnote}%
-    \def\@makefnmark% keine Einrückung der Fußnoten eingestellt
+    \def\@makefnmark% keine Einr^^c3^^bcckung der Fu^^c3^^9fnoten eingestellt
  {\@textsuperscript{\normalfont\@thefnmark}}%
  \long\def\@makefntext##1{%
  \@setpar{\@@par
@@ -346,7 +354,7 @@
   \null
   \begin{center}%
   \vskip -24pt% Abstand vor dem Titel
-  \raggedright% Linksbündig
+  \raggedright% Linksb^^c3^^bcndig
   \let\footnote\thanks
     {\Large\bfseries\@title\par}%
     \ifx\@subtitle\empty\else
@@ -416,8 +424,8 @@
 }%
 \setcounter{topnumber}{10}% maximale Anzahl gleitender Objekte am Seitenanfang
 \setcounter{bottomnumber}{10}% maximale Anzahl gleitender Objekte am Seitenende
-\renewcommand{\topfraction}{1.0}% Anteil den gleitende Objekte am Seitenanfang einnehmen dürfen
-\renewcommand{\bottomfraction}{1.0}% Anteil den gleitende Objekte am Seitenende einnehmen dürfen
+\renewcommand{\topfraction}{1.0}% Anteil den gleitende Objekte am Seitenanfang einnehmen d^^c3^^bcrfen
+\renewcommand{\bottomfraction}{1.0}% Anteil den gleitende Objekte am Seitenende einnehmen d^^c3^^bcrfen
 \def\fps@table{htbp}
 \def\fnum@table{\tablename~\thetable}
 \renewcommand{\arraystretch}{1.1}
@@ -432,7 +440,7 @@
 \fnindent0.18cm
 \long\def\@makefntext#1{%
     \parindent \fnindent%
-    \leftskip \fnindent% Einrückung vor der footnotemark
+    \leftskip \fnindent% Einr^^c3^^bcckung vor der footnotemark
     \noindent
     \llap{\hb@xt@0.10cm{\hss\@makefnmark\ }}\ignorespaces#1}
 \setlength{\parindent}{0pt}
@@ -440,7 +448,7 @@
 \renewcommand{\labelitemi}{$\bullet$}
 \renewcommand*\itemize{%
   \ifnum \@itemdepth >\thr@@\@toodeep\else
-   \setlength{\labelsep}{0.70cm}%Abstand zum Aufzählungspunkt
+   \setlength{\labelsep}{0.70cm}%Abstand zum Aufz^^c3^^a4hlungspunkt
     \advance\@itemdepth\@ne
     \edef\@itemitem{labelitem\romannumeral\the\@itemdepth}%
     \expandafter
@@ -455,7 +463,7 @@
   \ifnum \@enumdepth >\thr@@
       \@toodeep
     \else
-\setlength{\labelsep}{0.70cm}%Abstand zur Aufzählungsnummer
+\setlength{\labelsep}{0.70cm}%Abstand zur Aufz^^c3^^a4hlungsnummer
       \advance\@enumdepth \@ne
       \edef\@enumctr{enum\romannumeral\the\@enumdepth}%
     \fi
@@ -464,7 +472,7 @@
     \expandafter\list\csname label\@enumctr\endcsname{%
       \usecounter{\@enumctr}%
       \def\makelabel##1{\hss\llap{##1}}
-\setlength{\labelsep}{0.6cm} %Einrückung des Aufzählungszeichens
+\setlength{\labelsep}{0.6cm} %Einr^^c3^^bcckung des Aufz^^c3^^a4hlungszeichens
       \setlength{\itemsep}{8pt}%
       \setlength{\parsep}{-2pt}}
   }%
@@ -484,8 +492,9 @@
   \renewcommand{\refname}{Bibliography}%
 }%
 \newcommand*{\startpage}[1]{\setcounter{page}{#1}}
-\newcommand*{\@booktitle}{}
-\newcommand*{\booktitle}[1]{\renewcommand{\@booktitle}{#1}}
+\newcommand{\booktitle}{\@dblarg\@@booktitle}
+\def\@@booktitle[#1]#2{\gdef\@bookshorttitle{#1}\gdef\@booktitle{#2}}
+\newcommand{\booksubtitle}[1]{\gdef\@booksubtitle{#1}}
 \newcommand*{\@editor}{}
 \newcommand*{\editor}[1]{\renewcommand{\@editor}{#1}}
 \AtBeginDocument{%
@@ -496,22 +505,24 @@
    }%
 }%
 \fancypagestyle{plain}{%
-   \fancyhead{} % Löscht alle Kopfzeileneinstellungen
-   \fancyhead[RO]{\small\@editor~(Hrsg.):\ \@booktitle,\hspace{1sp}\null\linebreak%
-       Lecture Notes in Informatics (LNI), Gesellschaft für Informatik, Bonn~\@year%
+   \fancyhead{} % L^^c3^^b6scht alle Kopfzeileneinstellungen
+   \fancyhead[RO]{\small\@editor~(Hrsg.):\ \@bookshorttitle,\hspace{1sp}\null\linebreak%
+       Lecture Notes in Informatics (LNI), Gesellschaft f^^c3^^bcr Informatik, Bonn~\@year%
        \hspace{5pt}\thepage\hspace{0.05cm}}
-   \fancyhead[LE]{\small\@editor~(Hrsg.):\ \@booktitle,\linebreak\hspace{0.05cm}\thepage\hspace{5pt} Lecture Notes in Informatics (LNI), Gesellschaft für Informatik, Bonn~\@year}
-   \fancyfoot{} % Löscht alle Fußzeileneinstellungen
+   \fancyhead[LE]{\small\@editor~(Hrsg.):\
+   \@bookshorttitle,\linebreak\hspace{0.05cm}\thepage\hspace{5pt} Lecture Notes
+   in Informatics (LNI), Gesellschaft f^^c3^^bcr Informatik, Bonn~\@year}
+   \fancyfoot{} % L^^c3^^b6scht alle Fu^^c3^^9fzeileneinstellungen
    \renewcommand{\headrulewidth}{0.4pt} %Linie unter Kopfzeile
 }%
 \ifnorunningheads
    \pagestyle{empty}
 \else
    \pagestyle{fancy}
-   \fancyhead{} % Löscht alle Kopfzeileneinstellungen
+   \fancyhead{} % L^^c3^^b6scht 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^^c3^^b6scht alle Fu^^c3^^9fzeileneinstellungen
    \renewcommand{\headrulewidth}{0.4pt} %Linie unter Kopfzeile
 \fi%
 \RequirePackage{url}
@@ -519,12 +530,14 @@
 \RequirePackage{xspace}
 \ifusehyperref
    \AtEndPreamble{%
-      \RequirePackage[pdfusetitle,bookmarks=false]{hyperref}
+      \RequirePackage[bookmarks=false]{hyperref}
       \hypersetup{%
          pdfdisplaydoctitle,%
          colorlinks=true,%
          allcolors=black,%
-         pdfstartview=Fit%
+         pdfstartview=Fit,%
+         pdfauthor={\@author},%
+         pdftitle={\@title}%
       }%
    }%
 \fi%
@@ -545,7 +558,11 @@
       \Crefname{table}{\tablename}{\tablename}
    }%
 \fi%
-\AtEndPreamble{\RequirePackage[all]{hypcap}}
+\AtEndPreamble{%
+   \@ifpackageloaded{hyperref}
+   {\RequirePackage[all]{hypcap}}%
+   {}%
+}%
 \def\and{\unskip\hspace{-0.42em},\hspace{.6em}}
 \ifusebiblatex
 \else
@@ -601,7 +618,7 @@
 \vfuzz \hfuzz
 \raggedbottom
 %% 
-%% Copyright (C) 2016-2019 by Gesellschaft für Informatik e.V. (GI)
+%% Copyright (C) 2016-2019 by Gesellschaft f^^c3^^bcr Informatik e.V. (GI)
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License (LPPL), either
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 9b13c935671..cb84ade0757 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -2707,6 +2707,7 @@ my $core_latex = "$Master/texmf-dist/tex/latex";
  'lcd'          => 'latex -translate-file=empty.tcx',   # no 8-bit
  'listings'     => 'latex',  # requires interaction
  'lmake'        => 'latex',  # requires interaction
+ 'lni'		=> 'tex',
  'luaindex'     => 'lualatex --shell-escape',
  'luatexja'     => 'lualatex',
  'mandi'	=> 'pdflatex-preserve-pdf',