From 6bc176a293a67b04543386c43f34aa8986ca8873 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 4 Apr 2019 20:53:02 +0000 Subject: lni (4apr19) git-svn-id: svn://tug.org/texlive/trunk@50754 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/source/latex/lni/lni.dtx | 165 ++++++++++++++++++----------- Master/texmf-dist/source/latex/lni/lni.ins | 4 +- 2 files changed, 103 insertions(+), 66 deletions(-) (limited to 'Master/texmf-dist/source/latex/lni') diff --git a/Master/texmf-dist/source/latex/lni/lni.dtx b/Master/texmf-dist/source/latex/lni/lni.dtx index 03fb51ba2c3..218a603e94d 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-2018 by Gesellschaft für Informatik e.V. (GI) +Copyright (C) 2016-2019 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 @@ -134,7 +134,7 @@ This work consists of the file lni.dtx %\NeedsTeXFormat{LaTeX2e}[1999/12/01] %\ProvidesClass{lni} %<*class> - [2018/01/15 v1.4 Official class for submissions to the ``Lecture Notes + [2019/04/04 v1.5 Official class for submissions to the ``Lecture Notes in Informatics''] % %<*driver> @@ -285,6 +285,12 @@ This work consists of the file lni.dtx % \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 % 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 +% \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}} % % \GetFileInfo{\jobname.dtx} % \DoNotIndex{\newcommand,\newenvironment} @@ -351,9 +357,9 @@ This work consists of the file lni.dtx % \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}. +% 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}. % % \subsection{Options}\label{sec:options} % Although the class file includes all layout information for a submission to @@ -382,8 +388,8 @@ This work consists of the file lni.dtx % \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 as well -% \cref{sec:bibliography}. +% 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 @@ -400,18 +406,21 @@ This work consists of the file lni.dtx % 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 +% \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 differ -% from the publishers'. +% 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 will -% be in accordance to (or at least near) the publisher's requirements. +% 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 @@ -584,14 +593,20 @@ This work consists of the file lni.dtx % specific programming language. % % \subsubsection{Math} -% If you need mathematics, you can load packages \pkg{amsmath} and \pkg{mathtools} for +% 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 abbreviations. +% \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 +% abbreviations. % \begin{itemize} % \item \cs{eg} for e.\,g. % \item \cs{ie} for i.\,e. @@ -600,7 +615,10 @@ 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 predefined initialisms comprises: +% 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} % \item \cs{OMG} for \textsc{omg} (Object Management Group). @@ -610,10 +628,13 @@ 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 \cs{lniinitialism\marg{\textbackslash initialism\_macro}\marg{text}} in the preamble. +% \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. @@ -739,6 +760,8 @@ This work consists of the file lni.dtx \DeclareOption{oldfonts}{\oldfontstrue\autofontsfalse} \newif\ifautofonts \autofontstrue +\newif\ifnorunningheads +\DeclareOption{norunningheads}{\norunningheadstrue} \ExecuteOptions{utf8} \DeclareOption*{\ClassWarning{Option `\CurrentOption` is not supported!}} \ProcessOptions\relax @@ -758,6 +781,7 @@ This work consists of the file lni.dtx \RequirePackage{cmap} \RequirePackage{inputenc} \RequirePackage[T1]{fontenc} + \RequirePackage[full]{textcomp} \fi% % \iflnienglish @@ -989,7 +1013,8 @@ This work consists of the file lni.dtx columns=fixed,% basewidth=.5em,% xleftmargin=0.5cm,% - captionpos=b}% + captionpos=b,% + upquote}% % \end{macrocode} % Ragged bottom -- verhindert die Ausdehnung der Seite = Veränderung der % Abstände @@ -1028,7 +1053,6 @@ This work consists of the file lni.dtx % \end{macro} % \begin{macro}{\subtitle} % \begin{macrocode} -\newcommand{\@subtitle}{} \newcommand{\subtitle}[1]{\gdef\@subtitle{#1}} % \end{macrocode} % \end{macro} @@ -1075,13 +1099,17 @@ This work consists of the file lni.dtx \@maketitle \else \twocolumn[\@maketitle]% - \fi + \fi% \else \newpage \global\@topnum\z@ % Prevents figures from going at top of page. \@maketitle - \fi - \thispagestyle{plain} + \fi% + \ifnorunningheads + \thispagestyle{empty} + \else + \thispagestyle{plain} + \fi% \@thanks \endgroup \global\let\thanks\relax @@ -1103,12 +1131,14 @@ This work consists of the file lni.dtx \null \begin{center}% \vskip -24pt% Abstand vor dem Titel - \raggedright % Linksbündig + \raggedright% Linksbündig \let\footnote\thanks {\Large\bfseries\@title\par}% \ifx\@subtitle\empty\else - \vskip 16pt - {\normalsize\bfseries\@subtitle} + \ifx\@subtitle\undefined\else + \vskip 16pt + {\normalsize\bfseries\@subtitle}% + \fi% \fi% \vskip 19pt% Abstand nach dem Titel {\normalsize% @@ -1272,8 +1302,8 @@ This work consists of the file lni.dtx \renewcommand{\andname}{und}% \renewcommand{\figurename}{Abb.}% \renewcommand{\tablename}{Tab.}% - \renewcommand{\lstlistingname}{List.} - \renewcommand{\refname}{Literaturverzeichnis} + \renewcommand{\lstlistingname}{List.}% + \renewcommand{\refname}{Literaturverzeichnis}% }% % \end{macrocode} % \begin{macrocode} @@ -1281,7 +1311,8 @@ This work consists of the file lni.dtx \renewcommand{\andname}{and}% \renewcommand{\figurename}{Fig.}% \renewcommand{\tablename}{Tab.}% - \renewcommand{\lstlistingname}{List.} + \renewcommand{\lstlistingname}{List.}% + \renewcommand{\refname}{Bibliography}% }% % \end{macrocode} % \begin{macro}{\startpage} @@ -1321,12 +1352,16 @@ This work consists of the file lni.dtx \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}} -\fancyhead[LE]{\hspace{0.05cm}\small\thepage\hspace{5pt}\@shortauthor} -\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[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 +\fi% % \end{macrocode} % \begin{macrocode} \RequirePackage{url} @@ -1340,37 +1375,39 @@ This work consists of the file lni.dtx % \end{macrocode} % \begin{macrocode} \ifusehyperref - \RequirePackage[pdfusetitle]{hyperref} - \hypersetup{% - pdfdisplaydoctitle, - bookmarks=false,% - colorlinks=true,% - allcolors=black,% - %%%pdfpagelayout=TwoPageRight,% - pdfstartview=Fit% + \AtEndPreamble{% + \RequirePackage[pdfusetitle,bookmarks=false]{hyperref} + \hypersetup{% + pdfdisplaydoctitle,% + colorlinks=true,% + allcolors=black,% + pdfstartview=Fit% + }% }% \fi% % \end{macrocode} % \begin{macrocode} \ifusecleveref% - \iflnienglish - \usepackage[capitalise,nameinlink]{cleveref} - \crefname{section}{Sect.}{Sect.} - \Crefname{section}{Sect.}{Sect.} - \else - \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} + \AtEndPreamble{% + \iflnienglish + \RequirePackage[capitalise,nameinlink]{cleveref} + \crefname{section}{Sect.}{Sect.} + \Crefname{section}{Sect.}{Sect.} + \else + \RequirePackage[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% % \end{macrocode} % enables correct jumping to figures when referencing % \begin{macrocode} -\RequirePackage[all]{hypcap} +\AtEndPreamble{\RequirePackage[all]{hypcap}} % \end{macrocode} % \begin{macrocode} \def\and{\unskip\hspace{-0.42em},\hspace{.6em}} @@ -2971,12 +3008,12 @@ Schlagwort1 \and Schlagwort2 %Keyword1 \and Keyword2 year = {2014}, } -@Online{GI14, +@Online{GI19, author = {{Gesellschaft für Informatik e.\,V.}}, label = {GI}, - year = {2014}, - url = {http://www.gi-ev.de}, - urldate = {2014-12-24} + year = {2019}, + url = {http://www.gi.de}, + urldate = {2019-03-21} } @Comment{jabref-meta: databaseType:biblatex;} @@ -3070,7 +3107,7 @@ Hier eine kleine Demonstration von \href{https://www.ctan.org/pkg/microtype}{mic \label{sec:lniconformance} \subsection{Literaturverzeichnis} -Der letzte Abschnitt zeigt ein beispielhaftes Literaturverzeichnis für Bücher 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ücher mit den jeweils selben vier AutorInnen im selben Erscheinungsjahr \cite{Wa14} und \cite{Wa14b}, ein Journal \cite{Gl06}, eine Website \cite{GI14} bzw.\ anderweitige Literatur ohne konkrete AutorInnenschaft \cite{XX14}. +Der letzte Abschnitt zeigt ein beispielhaftes Literaturverzeichnis für Bücher 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ücher 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ützt 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: @@ -3125,7 +3162,7 @@ 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] +\begin{lstlisting}[caption={Beschreibung}, label=L1, language=Java] public class Hello { public static void main (String[] args) { System.out.println("Hello World!"); diff --git a/Master/texmf-dist/source/latex/lni/lni.ins b/Master/texmf-dist/source/latex/lni/lni.ins index b4a2c80bf16..fc495f759da 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-2018 by Gesellschaft für Informatik e.V. (GI) +Copyright (C) 2016-2019 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 +102,7 @@ This work consists of the file lni.dtx } \endbatchfile %% -%% Copyright (C) 2016-2018 by Gesellschaft für Informatik e.V. (GI) +%% Copyright (C) 2016-2019 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 -- cgit v1.2.3