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/bibtex/bst/lni/lni.bst | 2 +- Master/texmf-dist/bibtex/bst/lni/lnig.bst | 2 +- Master/texmf-dist/doc/latex/lni/CHANGELOG.md | 25 ++- Master/texmf-dist/doc/latex/lni/CONTRIBUTING.md | 40 ++--- Master/texmf-dist/doc/latex/lni/README.md | 4 +- .../doc/latex/lni/lni-author-template.tex | 43 ------ .../doc/latex/lni/lni-paper-example-de.bib | 90 ----------- .../doc/latex/lni/lni-paper-example-de.tex | 172 --------------------- Master/texmf-dist/doc/latex/lni/lni.pdf | Bin 358611 -> 358862 bytes Master/texmf-dist/source/latex/lni/lni.dtx | 165 ++++++++++++-------- Master/texmf-dist/source/latex/lni/lni.ins | 4 +- Master/texmf-dist/tex/latex/lni/lni.cls | 98 +++++++----- 12 files changed, 207 insertions(+), 438 deletions(-) delete mode 100644 Master/texmf-dist/doc/latex/lni/lni-author-template.tex delete mode 100644 Master/texmf-dist/doc/latex/lni/lni-paper-example-de.bib delete mode 100644 Master/texmf-dist/doc/latex/lni/lni-paper-example-de.tex diff --git a/Master/texmf-dist/bibtex/bst/lni/lni.bst b/Master/texmf-dist/bibtex/bst/lni/lni.bst index ba5a056052f..3cfde1c298f 100644 --- a/Master/texmf-dist/bibtex/bst/lni/lni.bst +++ b/Master/texmf-dist/bibtex/bst/lni/lni.bst @@ -1285,7 +1285,7 @@ FUNCTION {end.bib} EXECUTE {end.bib} %% -%% 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 diff --git a/Master/texmf-dist/bibtex/bst/lni/lnig.bst b/Master/texmf-dist/bibtex/bst/lni/lnig.bst index 2f95dff36e3..bbc095f7e6e 100644 --- a/Master/texmf-dist/bibtex/bst/lni/lnig.bst +++ b/Master/texmf-dist/bibtex/bst/lni/lnig.bst @@ -1285,7 +1285,7 @@ FUNCTION {end.bib} EXECUTE {end.bib} %% -%% 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 diff --git a/Master/texmf-dist/doc/latex/lni/CHANGELOG.md b/Master/texmf-dist/doc/latex/lni/CHANGELOG.md index 71c7614a4b8..0a07eb75c59 100644 --- a/Master/texmf-dist/doc/latex/lni/CHANGELOG.md +++ b/Master/texmf-dist/doc/latex/lni/CHANGELOG.md @@ -1,10 +1,29 @@ -# Change Log +# Changelog All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/). -## [1.4.0 - 2018-01-15] +## [Unreleased] + +## [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)) +- New option `norunningheads` to remove all running headers from the document +([#77](https://github.com/gi-ev/LNI/issues/77)) + +### Changed +- `\refname` changed to `Bibliography` for English texts + +### Fixed +- German paper example: Correct language `Java` at example listing +- Packages `hyperef`, `cleveref` and `hypcap` are always at the end of the preamble ([#71](https://github.com/gi-ev/LNI/issues/71)) +- Option `bookmarks` of `hyperref` now set at load-time. Had no effect before. +- Layout for English texts (subtitle) +- URL for GI in example file + +## [1.4.0] - 2018-01-15 ### Added - New option `oldfonts` to use the class file on older systems by loading the `mathptmx` font package ([#56](https://github.com/gi-ev/LNI/issues/56)) @@ -60,6 +79,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/). ## [1.0.0] - 2017-04-07 First release of the revised files +[Unreleased]: https://github.com/gi-ev/LNI/compare/v1.4...HEAD +[1.4.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 diff --git a/Master/texmf-dist/doc/latex/lni/CONTRIBUTING.md b/Master/texmf-dist/doc/latex/lni/CONTRIBUTING.md index 949efa6f696..ff718c5bd63 100644 --- a/Master/texmf-dist/doc/latex/lni/CONTRIBUTING.md +++ b/Master/texmf-dist/doc/latex/lni/CONTRIBUTING.md @@ -1,30 +1,30 @@ # Contributing -We love pull requests from everyone. Contributing is easy: +You can report bugs and request features using the [issues page](https://github.com/gi-ev/lni/issues). -* You can report bugs and request features using the [issues page][issues]. +We love code contributions. +You can easily work on the code if you have a GitHub account ([get one](https://github.com/join)). +For that, please [fork the repository](https://help.github.com/articles/fork-a-repo/), work on the code, and submit a [pull request](https://help.github.com/articles/about-pull-requests/). -[issues]: https://github.com/gi-ev/lni/issues +Take a look at GitHub's excellent overview on the [GitHub flow](https://guides.github.com/introduction/flow/index.html). +The [Feature Branch Workflow](https://de.atlassian.com/git/tutorials/comparing-workflows#feature-branch-workflow) forms the basis of this kind of development. -* You can easily work on the code if you have a GitHub account ([get one][github]): +In other words: -[github]: https://github.com/join +1. Fork the project +2. Clone the repo: -Fork the project, then clone the repo: + git clone git@github.com:your-username/LNI.git - git clone git@github.com:your-username/LNI.git +3. Create a new branch `patch` (or another speaking name) -Make your change(s). + git checkout -b patch -Push to your fork and [submit a pull request][pr]. - -[pr]: https://github.com/gi-ev/lni/compare/ - -At this point you're waiting on us. We like to at least comment on pull requests -as soon as possible. We may suggest some changes or improvements or alternatives. - -Some things that will increase the chance that your pull request is accepted: - -* Write a [good commit message][commit]. - -[commit]: http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html \ No newline at end of file +3. Make your changes. +4. Commit your changes. + Thereby, try to write a [good commit message](https://github.com/joelparkerhenderson/git_commit_message). +5. Push your chaneges (to your repository) +6. [submit a pull request](https://github.com/gi-ev/lni/compare/) +7. At this point you're waiting on us. + We like to at least comment on pull requests as soon as possible. + We may suggest some changes or improvements or alternatives. diff --git a/Master/texmf-dist/doc/latex/lni/README.md b/Master/texmf-dist/doc/latex/lni/README.md index 7a156347158..b850e17f658 100644 --- a/Master/texmf-dist/doc/latex/lni/README.md +++ b/Master/texmf-dist/doc/latex/lni/README.md @@ -3,8 +3,8 @@ ``` ---------------------------------------------------------------------------- lni -- A class for submissions to the ``Lecture Notes in Informatics'' -(c) 2016-2018 Gesellschaft für Informatik (GI) -Version: 1.4 +(c) 2016-2019 Gesellschaft für Informatik (GI) +Version: 1.5 Maintainer: Martin Sievers Email: martin.sievers@schoenerpublizieren.de License: Released under the LaTeX Project Public License v1.3c or later diff --git a/Master/texmf-dist/doc/latex/lni/lni-author-template.tex b/Master/texmf-dist/doc/latex/lni/lni-author-template.tex deleted file mode 100644 index 6dffc4195c1..00000000000 --- a/Master/texmf-dist/doc/latex/lni/lni-author-template.tex +++ /dev/null @@ -1,43 +0,0 @@ -% !TeX encoding = UTF-8 -% !TeX program = pdflatex -% !BIB program = bibtex - -%%% 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 get the correct hyphenation patterns and terms. -%%% \documentclass[english]{class} -%% -\begin{document} -%%% 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 -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, -Land \email{emailaddress@author1}} \and -Firstname2 Lastname2\footnote{University, Department, Address, Country -\email{emailaddress@author2}}} -\startpage{11} % Beginn der Seitenzählung für diesen Beitrag / Start page -\editor{Herausgeber et al.} % Names of Editors -\booktitle{Name-der-Konferenz} % Name of book title -\year{2017} -%%%\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{Überschrift/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 deleted file mode 100644 index 152d6b5cab9..00000000000 --- a/Master/texmf-dist/doc/latex/lni/lni-paper-example-de.bib +++ /dev/null @@ -1,90 +0,0 @@ - -@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ßnote in LNI-Bänden}, - author = {Azubi, L. and others}, - crossref = {Gl09}, -} - -@Book{AB00, - title = {Formatierungsrichtlinien für Tagungsbände}, - 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ück}, - 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ück, 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ück}, - 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{GI14, - author = {{Gesellschaft für Informatik e.\,V.}}, - label = {GI}, - year = {2014}, - url = {http://www.gi-ev.de}, - urldate = {2014-12-24} -} - -@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 deleted file mode 100644 index 2e47106836f..00000000000 --- a/Master/texmf-dist/doc/latex/lni/lni-paper-example-de.tex +++ /dev/null @@ -1,172 +0,0 @@ -% !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öne 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ändisch anpassen möchte. -%% 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ß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 Worten und noch mehr Buchstaben} -%%%\subtitle{Untertitel / Subtitle} % falls benötigt -\author[Vorname1 Nachname1 \and Vorname2 Nachname2] -{Vorname1 Nachname1\footnote{Universität, Abteilung, Straße, Postleitzahl Ort, Land \email{emailaddress@author1}} \and - 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 -\year{2017} -%%%\lnidoi{18.18420/provided-by-editor-02} % Falls bekannt -\maketitle - -\begin{abstract} -Die \LaTeX-Klasse \texttt{lni} setzt die Layout-Vorgaben für Beiträge in LNI Konferenzbänden um. -Dieses Dokument beschreibt ihre Verwendung und ist ein Beispiel für die entsprechende Darstellung. -Der Abstract ist ein kurzer Überblick über die Arbeit der zwischen 70 und 150 Wörtern 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ür die Formatierung von Dokumenten in der LNI Reihe. -Für \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ür Potenzmengen ($\powerset$) wird korrekt angezeigt. -Es ist kein Weierstraß-p ($\wp$) mehr. - -Spitze Klammen können direkt eingegeben werden: - -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ü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}. -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: -Beispiel: \Citet{AB00} geben ein Beispiel, aber auch \citet{Az09}. -Hinweis: Großes C bei \texttt{Citet}, wenn es am Satzanfang steht. Dies ist analog zu \texttt{Cref}. - -Formatierung und Abkürzungen werden für die Referenzen \texttt{book}, \texttt{inbook}, \texttt{proceedings}, \texttt{inproceedings}, \texttt{article}, \texttt{online} und \texttt{misc} automatisch vorgenommen. -Mögliche Felder für Referenzen können der Beispieldatei \texttt{lni-paper-example-de.bib} entnommen werden. -Andere Referenzen sowie Felder müssen allenfalls nachträglich 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 -Überschriftsebenen & Beispiel & Schriftgröße und -art \\ -\midrule -Titel (linksbündig) & Der Titel \ldots & 14 pt, Fett\\ -Überschrift 1 & 1 Einleitung & 12 pt, Fett\\ -Überschrift 2 & 2.1 Titel & 10 pt, Fett\\ -\bottomrule -\end{tabular} -\caption{Die Überschriftsarten} -\label{tab:demo} -\end{table} - -\subsection{Programmcode} -Die LNI-Formatvorlage verlangt die Einrückung von Listings vom linken Rand. -In der \texttt{lni}-Dokumentenklasse ist dies für 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] -public class Hello { - public static void main (String[] args) { - System.out.println("Hello World!"); - } -} -\end{lstlisting} - -\subsection{Formeln und Gleichungen} - -Die korrekte Einrückung und Nummerierung für Formeln ist bei den Umgebungen \texttt{equation} und \texttt{eqnarray} gewährleistet. - -\begin{equation} - 1=4-3 -\end{equation} -und -\begin{eqnarray} - 2=7-5\\ - 3=2-1 -\end{eqnarray} - -%% \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 425847b2714..e4be74932cd 100644 Binary files a/Master/texmf-dist/doc/latex/lni/lni.pdf and b/Master/texmf-dist/doc/latex/lni/lni.pdf differ 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 diff --git a/Master/texmf-dist/tex/latex/lni/lni.cls b/Master/texmf-dist/tex/latex/lni/lni.cls index 4ad94e8ddb1..f7d398b6d4d 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} - [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''] \def\@clearglobaloption#1{% \def\@tempa{#1}% @@ -55,6 +55,8 @@ \DeclareOption{oldfonts}{\oldfontstrue\autofontsfalse} \newif\ifautofonts \autofontstrue +\newif\ifnorunningheads +\DeclareOption{norunningheads}{\norunningheadstrue} \ExecuteOptions{utf8} \DeclareOption*{\ClassWarning{Option `\CurrentOption` is not supported!}} \ProcessOptions\relax @@ -73,6 +75,7 @@ \RequirePackage{cmap} \RequirePackage{inputenc} \RequirePackage[T1]{fontenc} + \RequirePackage[full]{textcomp} \fi% \iflnienglish \RequirePackage[ngerman,english]{babel} @@ -261,7 +264,8 @@ columns=fixed,% basewidth=.5em,% xleftmargin=0.5cm,% - captionpos=b}% + captionpos=b,% + upquote}% \def\thisbottomragged{\def\@textbottom{\vskip\z@ plus.0001fil \global\let\@textbottom\relax}} \renewcommand\@pnumwidth{3em} @@ -286,7 +290,6 @@ \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% @@ -313,13 +316,17 @@ \@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 @@ -339,12 +346,14 @@ \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% @@ -464,14 +473,15 @@ \renewcommand{\andname}{und}% \renewcommand{\figurename}{Abb.}% \renewcommand{\tablename}{Tab.}% - \renewcommand{\lstlistingname}{List.} - \renewcommand{\refname}{Literaturverzeichnis} + \renewcommand{\lstlistingname}{List.}% + \renewcommand{\refname}{Literaturverzeichnis}% }% \addto\captionsenglish{% \renewcommand{\andname}{and}% \renewcommand{\figurename}{Fig.}% \renewcommand{\tablename}{Tab.}% - \renewcommand{\lstlistingname}{List.} + \renewcommand{\lstlistingname}{List.}% + \renewcommand{\refname}{Bibliography}% }% \newcommand*{\startpage}[1]{\setcounter{page}{#1}} \newcommand*{\@booktitle}{} @@ -494,42 +504,48 @@ \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% \RequirePackage{url} \g@addto@macro{\UrlBreaks}{\UrlOrds} \RequirePackage{xspace} \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% \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% -\RequirePackage[all]{hypcap} +\AtEndPreamble{\RequirePackage[all]{hypcap}} \def\and{\unskip\hspace{-0.42em},\hspace{.6em}} \ifusebiblatex \else @@ -585,7 +601,7 @@ \vfuzz \hfuzz \raggedbottom %% -%% 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