lni (2mar21)

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

2 files changed, 91 insertions, 61 deletions

diff --git a/Master/texmf-dist/source/latex/lni/lni.dtx b/Master/texmf-dist/source/latex/lni/lni.dtx
index 8301090e404..4ad46abd8df 100644
--- a/Master/texmf-dist/source/latex/lni/lni.dtx
+++ b/Master/texmf-dist/source/latex/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/Master/texmf-dist/source/latex/lni/lni.ins b/Master/texmf-dist/source/latex/lni/lni.ins
index fc495f759da..5536ab57b97 100644
--- a/Master/texmf-dist/source/latex/lni/lni.ins
+++ b/Master/texmf-dist/source/latex/lni/lni.ins
@@ -1,10 +1,5 @@
 %%
 %% This is file `lni.ins',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% lni.dtx  (with options: `install')
 %% --------| -----------------------------------------------------------------
 %%     lni:| A class for submissions to the ``Lecture Notes in Informatics''
 %%  Author:| Martin Sievers
@@ -62,7 +57,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
@@ -102,7 +97,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-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