lni (20apr17)

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

1 files changed, 114 insertions, 42 deletions

diff --git a/Master/texmf-dist/tex/latex/lni/lni.cls b/Master/texmf-dist/tex/latex/lni/lni.cls
index ee32a6ec214..2e0f17a20e0 100644
--- a/Master/texmf-dist/tex/latex/lni/lni.cls
+++ b/Master/texmf-dist/tex/latex/lni/lni.cls
@@ -14,7 +14,8 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
 \ProvidesClass{lni}
-    [2017/04/07 v1.0 Official class for submissions to the ``Lecture Notes in Informatics'']
+    [2017/04/19 v1.1 Official class for submissions to the ``Lecture Notes
+    in Informatics'']
 \def\@clearglobaloption#1{%
   \def\@tempa{#1}%
   \def\@tempb{\@gobble}%
@@ -44,16 +45,24 @@
 \newif\ifusebiblatex
 \usebiblatexfalse
 \DeclareOption{biblatex}{\usebiblatextrue}
+\newif\ifcrop
+\cropfalse
+\DeclareOption{crop}{\croptrue}
 \ExecuteOptions{utf8}
 \DeclareOption*{\ClassWarning{Option `\CurrentOption` is not supported!}}
 \ProcessOptions\relax
 
-\RequirePackage[ngerman=ngerman-x-latest]{hyphsubst}
+\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}}%
 \LoadClass[10pt,twoside,a4paper,fleqn]{article}
 \RequirePackage{cmap}
 \RequirePackage{inputenc}
 \RequirePackage[T1]{fontenc}
-
 \iflnienglish
    \RequirePackage[ngerman,english]{babel}
 \else
@@ -82,21 +91,62 @@
   <12->   MnSymbolC12%
 }{}
 \DeclareMathSymbol{\powerset}{\mathord}{MnSyC}{180}
-\RequirePackage[
-  a4paper,
-  total={12.6cm,19.2cm},
-  includehead,
-  headheight=20.39pt,
-  headsep=.31cm,
-  centering]
-  {geometry}
+\ifcrop
+   \RequirePackage[
+     paperheight=23.5cm,paperwidth=15.5cm,
+     total={12.6cm,19.2cm},
+     includehead,
+     headheight=20.39pt,
+     headsep=.31cm,
+     centering]
+     {geometry}
+   \RequirePackage[a4,center,cam,info]{crop}
+   \renewcommand*\CROP@@info{{%
+      \global\advance\CROP@index\@ne
+      \def\x{\discretionary{}{}{\hbox{\kern.5em---\kern.5em}}}%
+      \advance\paperwidth-20\p@
+      \dimen@4pt
+      \ifx\CROP@pagecolor\@empty
+      \else
+      \advance\dimen@\CROP@overlap
+      \fi
+      \hb@xt@\z@{%
+         \hss
+         \vbox to\z@{%
+            \centering
+            \hsize\paperwidth
+            \vss
+            \normalfont
+            \normalsize
+            \expandafter\csname\CROP@font\endcsname{%
+               ``\jobname''\x
+               \the\@rigyear/\the\month/\the\day\x
+               \CROP@time\x
+               page\kern.5em\thepage\x
+               \#\the\CROP@index
+               \strut
+            }%
+            \vskip\dimen@
+         }%
+         \hss
+      }%
+   }}%
+\else
+   \RequirePackage[
+     total={12.6cm,19.2cm},
+     includehead,
+     headheight=20.39pt,
+     headsep=.31cm,
+     centering]
+     {geometry}
+\fi%
 \RequirePackage[autostyle]{csquotes}
 \ifusebiblatex
-  \RequirePackage[
-    backend=biber, % UTF-8 support
-    style=LNI,     % The GI style - see https://www.ctan.org/pkg/biblatex-lni
-    natbib=true    % Required for \Citet
-  ]{biblatex}[2016-09-15] %at least version 3.6 of biblatex is required.
+  \RequirePackage[%
+    backend=biber,% UTF-8 support
+    style=LNI,    % The GI style - see https://www.ctan.org/pkg/biblatex-lni
+    natbib=true   % Required for \Citet
+  ]{biblatex}[2016-09-15]% at least version 3.6 of biblatex is required.
   % Enable hyperlinked authors when using \citeauthor
   % Source: http://tex.stackexchange.com/a/75916/9075
   \DeclareCiteCommand{\citeauthor}%
@@ -116,7 +166,6 @@
 \RequirePackage{listings}
 \def\thisbottomragged{\def\@textbottom{\vskip\z@ plus.0001fil
 \global\let\@textbottom\relax}}
-
 \renewcommand\@pnumwidth{3em}
 \renewcommand\@tocrmarg{3.5em}
 \def\@dottedtocline#1#2#3#4#5{%
@@ -139,10 +188,13 @@
   \fi}
 \renewcommand{\title}{\@dblarg\@@title}
 \def\@@title[#1]#2{\gdef\@shorttitle{#1}\gdef\@title{#2}}
+\newcommand{\@subtitle}{}
+\newcommand{\subtitle}[1]{\gdef\@subtitle{#1}}
 \renewcommand{\author}{\@dblarg\@@author}
 \def\@@author[#1]#2{\gdef\@shortauthor{{\let\footnote\@gobble%
    \def\and{\unskip,\ }#1}}\gdef\@author{#2}}
-\newcommand{\authorrunning}[1]{\fancyhead[LE]{\hspace{0.05cm}\small\thepage\hspace{5pt}#1}}
+\newcommand{\authorrunning}[1]{%
+   \fancyhead[LE]{\hspace{0.05cm}\small\thepage\hspace{5pt}#1}}
 \newcommand*{\email}[1]{{\urlstyle{same}\protect\url{#1}}}
 \renewcommand\maketitle{\par%
 \begingroup
@@ -189,7 +241,11 @@
   \vskip -24pt% Abstand vor dem Titel
   \raggedright % Linksbündig
   \let\footnote\thanks
-    {\fontsize{14}{17}\fontseries{b}\selectfont \@title \par}%
+    {\fontsize{14}{17}\fontseries{b}\selectfont\@title\par}%
+    \ifx\@subtitle\empty\else
+      \vskip 16pt
+      {\fontsize{10}{12}\fontseries{b}\selectfont\@subtitle}
+    \fi%
     \vskip 19pt% Abstand nach dem Titel
     {\fontsize{10}{12}\selectfont
       \lineskip .5em%
@@ -198,17 +254,21 @@
     \vskip 28pt% Abstand vor dem Abstract
   \end{center}%
   \par
-}
+}%
 \renewenvironment*{abstract}{%
  \renewcommand{\abstractname}{Abstract}
  \fontsize{9}{10}\selectfont
-    \noindent\ignorespaces{\bfseries \abstractname:\ }%
+    \noindent\ignorespaces{\bfseries\abstractname:\ }%
 }{\endquotation}
 \newif\ifkeywords
-\newenvironment{keywords}{\global\keywordstrue\fontsize{9}{10}\selectfont
-    \noindent\ignorespaces{\bfseries Keywords:\ }}{\global\keywordsfalse}
+\newenvironment{keywords}%
+   {\global\keywordstrue\fontsize{9}{10}\selectfont%
+    \def\and{\unskip;\space}%
+    \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 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}{}{}
 \renewcommand{\section}{\@startsection{section}{1}{\z@}%
   {-16\p@ \@plus -4\p@ \@minus -4\p@}{5\p@ \@plus 4\p@ \@minus 4\p@}{\fontsize{12}{14}\fontseries{b}\selectfont}}
 \renewcommand{\subsection}{\@startsection{subsection}{2}{\z@}%
@@ -234,7 +294,7 @@
         \small
         \@setnobreak
         \@setminipage
-}
+}%
 \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
@@ -243,15 +303,15 @@
 \def\fnum@table{\tablename~\thetable}
 \renewcommand{\arraystretch}{1.1}%Abstand zu Linien in Tabelle
 \renewenvironment{table}
-               {\setlength\abovecaptionskip{6\p@}%
-                \setlength\belowcaptionskip{0\p@}%
-                \@float{table}}
-               {\end@float}
+   {\setlength\abovecaptionskip{6\p@}%
+    \setlength\belowcaptionskip{0\p@}%
+    \@float{table}}%
+   {\end@float}%
 \renewenvironment{table*}
-               {\setlength\abovecaptionskip{6\p@}%
-                \setlength\belowcaptionskip{0\p@}%
-                \@dblfloat{table}}
-               {\end@dblfloat}
+   {\setlength\abovecaptionskip{6\p@}%
+    \setlength\belowcaptionskip{0\p@}%
+    \@dblfloat{table}}%
+   {\end@dblfloat}%
 \setlength{\mathindent}{0.5cm}
 \RequirePackage{verbatim}
 \def\verbatim@processline{\hskip0.5cm\the\verbatim@line\par}
@@ -259,8 +319,8 @@
   \kern-3\p@
   \hrule\@width 5cm
   \kern2.6\p@}
-  \newdimen\fnindent
-  \fnindent0.18cm
+\newdimen\fnindent
+\fnindent0.18cm
 \long\def\@makefntext#1{%
     \parindent \fnindent%
     \leftskip \fnindent% Einrückung vor der footnotemark
@@ -298,7 +358,7 @@
 \setlength{\labelsep}{0.6cm} %Einrückung des Aufzählungszeichens
       \setlength{\itemsep}{8pt}%
       \setlength{\parsep}{-2pt}}
-  }
+  }%
 \newcommand{\andname}{}
 \addto\captionsngerman{%
   \renewcommand{\andname}{und}%
@@ -306,13 +366,13 @@
   \renewcommand{\tablename}{Tab.}%
   \renewcommand{\lstlistingname}{List.}
   \renewcommand{\refname}{Literaturverzeichnis}
-}
+}%
 \addto\captionsenglish{%
   \renewcommand{\andname}{and}%
   \renewcommand{\figurename}{Fig.}%
   \renewcommand{\tablename}{Tab.}%
   \renewcommand{\lstlistingname}{List.}
-}
+}%
 \newcommand*{\startpage}[1]{\setcounter{page}{#1}}
 \newcommand*{\@booktitle}{}
 \newcommand*{\booktitle}[1]{\renewcommand{\@booktitle}{#1}}
@@ -333,7 +393,7 @@
    \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
    \renewcommand{\headrulewidth}{0.4pt} %Linie unter Kopfzeile
-}
+}%
 \pagestyle{fancy}
 \fancyhead{} % Löscht alle Kopfzeileneinstellungen
 \fancyhead[RO]{\small\@shorttitle\hspace{5pt}\thepage\hspace{0.05cm}}
@@ -362,8 +422,11 @@
      \usepackage[ngerman,nameinlink]{cleveref}
    \fi%
    \crefname{figure}{\figurename}{\figurename}
+   \Crefname{figure}{\figurename}{\figurename}
    \crefname{listing}{\lstlistingname}{\lstlistingname}
+   \Crefname{listing}{\lstlistingname}{\lstlistingname}
    \crefname{table}{\tablename}{\tablename}
+   \Crefname{table}{\tablename}{\tablename}
 \fi%
 \RequirePackage[all]{hypcap}
 \def\and{\unskip\hspace{-0.42em},\hspace{.6em}}
@@ -395,9 +458,18 @@
 {\def\@noitemerr
    {\@latex@warning{Empty `thebibliography' environment}}%
    \endlist\egroup}
-\frenchspacing    % Abstand nach Satzende
-\widowpenalty=10000   % Vermeidet "widows & orphans"
-\clubpenalty=10000
+\frenchspacing
+\tolerance 1414
+\hbadness 1414
+\emergencystretch 1.5em
+\hfuzz 0.3pt
+\widowpenalty=10000
+\displaywidowpenalty=10000
+\clubpenalty=9999
+\interfootnotelinepenalty=9999
+\brokenpenalty=2000
+\vfuzz \hfuzz
+\raggedbottom
 %% 
 %% Copyright (C) 2016-2017 by Gesellschaft für Informatik e.V. (GI)
 %%