texlive[50789] Master/texmf-dist: dtk (5apr19)
commits+karl at tug.org
commits+karl at tug.org
Fri Apr 5 23:13:18 CEST 2019
Revision: 50789
http://tug.org/svn/texlive?view=revision&revision=50789
Author: karl
Date: 2019-04-05 23:13:17 +0200 (Fri, 05 Apr 2019)
Log Message:
-----------
dtk (5apr19)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/dtk/doc/beispiel.pdf
trunk/Master/texmf-dist/doc/latex/dtk/doc/dtk-extern-test.tex
trunk/Master/texmf-dist/doc/latex/dtk/dtk.nolig
trunk/Master/texmf-dist/tex/latex/dtk/dtk-author.clo
trunk/Master/texmf-dist/tex/latex/dtk/dtk-extern.sty
trunk/Master/texmf-dist/tex/latex/dtk/dtk-full.clo
trunk/Master/texmf-dist/tex/latex/dtk/dtk-logos.sty
trunk/Master/texmf-dist/tex/latex/dtk/dtk-new-engines.clo
trunk/Master/texmf-dist/tex/latex/dtk/dtk-url.sty
trunk/Master/texmf-dist/tex/latex/dtk/dtk.bbx
trunk/Master/texmf-dist/tex/latex/dtk/dtk.cls
Modified: trunk/Master/texmf-dist/doc/latex/dtk/doc/beispiel.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/dtk/doc/dtk-extern-test.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/dtk/doc/dtk-extern-test.tex 2019-04-05 21:13:04 UTC (rev 50788)
+++ trunk/Master/texmf-dist/doc/latex/dtk/doc/dtk-extern-test.tex 2019-04-05 21:13:17 UTC (rev 50789)
@@ -134,6 +134,7 @@
\begin{verbatim}
+ showFilename=false,% show filename in the margin
code=false,% show Source Code
crop=false,% erzeugte PDF "croppen"
compiler=pdflatex,% zu verwendener Compiler
@@ -156,6 +157,7 @@
grfOptions={width=0.48\linewidth},
pages={1,3},
frame,compiler=pdflatex,
+ showFilename,
% crop,
force,runs=2,code,docType=latex,
frame,
Modified: trunk/Master/texmf-dist/doc/latex/dtk/dtk.nolig
===================================================================
--- trunk/Master/texmf-dist/doc/latex/dtk/dtk.nolig 2019-04-05 21:13:04 UTC (rev 50788)
+++ trunk/Master/texmf-dist/doc/latex/dtk/dtk.nolig 2019-04-05 21:13:17 UTC (rev 50789)
@@ -14,6 +14,7 @@
\nolig{Herbstt[aruöe]}{Herbst|t}
\nolig{Mitt[iruä]}{Mit|t}
-\nolig{Text[eiru]}{Text|t}
+\nolig{Textt[eiru]}{Text|t}
+\nolig{Hauptt[eiru]}{Haupt|t}
\endinput
Modified: trunk/Master/texmf-dist/tex/latex/dtk/dtk-author.clo
===================================================================
--- trunk/Master/texmf-dist/tex/latex/dtk/dtk-author.clo 2019-04-05 21:13:04 UTC (rev 50788)
+++ trunk/Master/texmf-dist/tex/latex/dtk/dtk-author.clo 2019-04-05 21:13:17 UTC (rev 50789)
@@ -14,12 +14,12 @@
%% version 2005/12/01 or later.
\ProvidesFile{dtk-author.clo}%
- [2016/02/15 v0.1b dtk class options for author mode (RN)]
+ [2017/12/16 v0.1c dtk class options for author mode (RN)]
\newcommand*\keywords[1]{}
\newcommand*\AutorenListe{}
\let\maketitle=\DTK at maketitle
-\let\tableofcontents=\relax
+%\let\tableofcontents=\relax
\let\DTK@@Author=\DTK at Author@article
Modified: trunk/Master/texmf-dist/tex/latex/dtk/dtk-extern.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/dtk/dtk-extern.sty 2019-04-05 21:13:04 UTC (rev 50788)
+++ trunk/Master/texmf-dist/tex/latex/dtk/dtk-extern.sty 2019-04-05 21:13:17 UTC (rev 50789)
@@ -2,7 +2,7 @@
%%
%% LaTeX package for ``Die TeXnische Komoedie''.
%%
-%% Copyright (C) 2016-
+%% Copyright (C) 2016-19
%% Rolf Niepraschk, Herbert Voss
%%
%% It may be distributed and/or modified under the
@@ -14,11 +14,13 @@
%% version 2005/12/01 or later.
\ProvidesFile{dtk-extern}%
- [2017/06/04 v0.06: dtk package for running external documents (HV)]
+ [2018/12/01 v0.12: dtk package for running external documents (HV)]
-\RequirePackage{shellesc,filecontents,xkeyval,graphicx}
+\RequirePackage{shellesc,filecontents,xkeyval,graphicx,marginnote,fancyvrb}
\newcounter{dtk at extern@runs}
+\newlength\dtk at extern@mpwidth \setlength\dtk at extern@mpwidth{\z@}
+
\define at key{dtk}{compiler}[pdflatex]{\def\dtk at extern@compiler{#1}}
\define at key{dtk}{runsequence}[]{\def\dtk at extern@runsequence{#1}}
\define at key{dtk}{runs}[1]{\setcounter{dtk at extern@runs}{#1}}
@@ -28,17 +30,26 @@
\define at key{dtk}{caption}[]{\def\dtk at extern@caption{#1}}
\define at key{dtk}{label}[]{\def\dtk at extern@label{#1}}
\define at key{dtk}{pages}[1]{\def\dtk at extern@pages{#1}}
+\define at key{dtk}{mpwidth}[0pt]{\setlength\dtk at extern@mpwidth{#1}}
+\define at boolkey{dtk}[dtk at extern@]{usefancyvrb}[true]{}
+\define at boolkey{dtk}[dtk at extern@]{showFilename}[true]{}
\define at boolkey{dtk}[dtk at extern@]{code}[true]{}
\define at boolkey{dtk}[dtk at extern@]{force}[true]{}
\define at boolkey{dtk}[dtk at extern@]{crop}[true]{}
\define at boolkey{dtk}[dtk at extern@]{biber}[true]{}
+\define at boolkey{dtk}[dtk at extern@]{xindex}[true]{}
+\define at key{dtk}{xindexOptions}[]{\def\dtk at extern@xindexOptions{#1}}
\define at boolkey{dtk}[dtk at extern@]{includegraphic}[true]{}
\define at boolkey{dtk}[dtk at extern@]{frame}[true]{}
\define at boolkey{dtk}[dtk at extern@]{float}[true]{}
\define at boolkey{dtk}[dtk at extern@]{cleanup}[true]{}
+\define at boolkey{dtk}[dtk at extern@]{copyToExampleDir}[true]{}
+\define at key{dtk}{align}[\centering]{\def\dtk at extern@align{#1}}
+\define at key{dtk}{ExamplesDir}[Examples]{\def\dtk at extern@ExamplesDir{#1}}
\def\ResetKeys{%
\setkeys{dtk}{
+ showFilename=false,% Dateinamen im Rand angeben
code=false,% show Code
crop=false,% erzeugte PDF "croppen"
compiler=pdflatex,% zu verwendener Compiler
@@ -48,6 +59,8 @@
runs=1,% Anzahl Compiler-Durchläufe
runsequence={},% Im Moment nicht aktiv
biber=false,% Biber laufen lassen?
+ xindex=false,% xindex laufen lassen?
+ xindexOptions={},% options for xindex
force=false,% Compiler, auch wenn PDF existiert?
frame=false,% keinen Rahmen um Abbildung
float=false,% nicht als Gleitumgebung
@@ -56,6 +69,11 @@
pages=1,% welche Seiten auszugeben sind
docType=latex,% LaTeX example Code
cleanup=false,% Hilfsdateien nicht löschen
+ copyToExampleDir,% Kopie nach ExamplesDir
+ ExamplesDir=Examples,% Unterverzeichnis für Beispiele
+ align=\centering,% Ausgabe zentrieren
+ mpwidth=0pt,% no minipage
+ usefancyvrb=false,% use VerbatimInput instead of listings
}
}
\ResetKeys
@@ -65,14 +83,21 @@
\gdef\DoubleperCent{%%}
}
+\newcounter{dtk at example@counter}
+
\newcommand\ExampleType[5]{%
- \@namedef{#1 at initText}{linerange=#2-#3,includerangemarker=false}% text
- \@namedef{#1 at initPreamble}{linerange=#4-#5,includerangemarker=false}% code
+ \ifdtk at extern@usefancyvrb
+ \@namedef{#1 at initText}{\gdef\FancyVerbStartString{#2}\gdef\FancyVerbStopString{#3}}% text
+ \@namedef{#1 at initPreamble}{\gdef\FancyVerbStartString{#4}\gdef\FancyVerbStopString{#5}}% code
+ \else
+ \@namedef{#1 at initText}{linerange=#2-#3,includerangemarker=false}% text
+ \@namedef{#1 at initPreamble}{linerange=#4-#5,includerangemarker=false}% code
+ \fi
}
\ExampleType{latex}% #1
- {begin\string{document\string}}% #2
- {end\string{document\string}}% #3
+ {\string\begin\string{document\string}}% #2
+ {\string\end\string{document\string}}% #3
{\perCent StartVisiblePreamble}% #4
{\perCent StopVisiblePreamble}% #5
@@ -85,69 +110,118 @@
%%
%% [#1]: Optionen #2: Dateiname
%%
-\newenvironment{ErstelleGrafik}[2][]
- {\global\setkeys{dtk}{#1}% \begin
- \gdef\dtk at extern@dateiname{#2}%
+\newenvironment{ErstelleGrafik}[2][]{%
+ \xdef\dtkExternDateiname{#2-\arabic{dtk at example@counter}}%
+ \typeout{Externer Dateiname: \dtkExternDateiname}%
+ \global\setkeys{dtk}{#1}% \begin
+ \expandafter\IfFileExists\expandafter{\dtkExternDateiname.pdf}{}{\setkeys{dtk}{force}}%
\begingroup
- \@nameuse{filecontents*}{#2.tex}
+ \@nameuse{filecontents*}{\dtkExternDateiname.tex}
}
{\@nameuse{endfilecontents*}% \end
+ \ifdtk at extern@copyToExampleDir
+ \ShellEscape{cp\space\dtkExternDateiname.tex \dtk at extern@ExamplesDir/}%
+ \fi
+ \global\stepcounter{dtk at example@counter}%
\endgroup
- \loop\ifnum\thedtk at extern@runs>0
- \typeout{Run: \thedtk at extern@runs\space \dtk at extern@compiler\space\dtk at extern@dateiname}%
- \ShellEscape{\dtk at extern@compiler\space\dtk at extern@dateiname}%
- \addtocounter{dtk at extern@runs}{-1}%
- \repeat
+ \ifdtk at extern@force
+ \loop\ifnum\thedtk at extern@runs>0
+ \typeout{Run: \thedtk at extern@runs\space \dtk at extern@compiler\space\dtkExternDateiname}%
+ \ShellEscape{\dtk at extern@compiler\space\dtkExternDateiname}%
+ \addtocounter{dtk at extern@runs}{-1}%
+ \repeat
+ \fi
\ifdtk at extern@code
- \expandafter\edef\expandafter\dtk at lst@options at preamble\expandafter{%
- \@nameuse{\dtk at extern@docType @initPreamble},
- \dtk at extern@lstOptions,
- backgroundcolor=\noexpand\color{black!12}}%
- \expandafter\lstinputlisting\expandafter[\dtk at lst@options at preamble]{\dtk at extern@dateiname}
+ \ifdim\dtk at extern@mpwidth>\z@ \minipage[t]{\dtk at extern@mpwidth}\vspace{0pt}\fi
+ \expandafter\edef\expandafter\dtk at lst@options at preamble\expandafter{%
+ \@nameuse{\dtk at extern@docType @initPreamble},
+ \dtk at extern@lstOptions,
+ backgroundcolor=\noexpand\color{black!12}}%
+ \ifdtk at extern@usefancyvrb
+ \expandafter\VerbatimInput\expandafter[\dtk at lst@options at preamble]{\dtkExternDateiname}%
+ \else
+ \expandafter\lstinputlisting\expandafter[\dtk at lst@options at preamble]{\dtkExternDateiname}%
+ \fi
+ \ifdtk at extern@showFilename
+ \marginnote{\rotatebox{90}{\dtkExternDateiname}}%[-15mm]%
+ \fi
%
\expandafter\edef\expandafter\dtk at lst@options at text\expandafter{%
\@nameuse{\dtk at extern@docType @initText},
\dtk at extern@lstOptions,
backgroundcolor=\noexpand\color{black!8}}%
- \typeout{\dtk at lst@options at text}
- \expandafter\lstinputlisting\expandafter[\dtk at lst@options at text]{\dtk at extern@dateiname}
+% \typeout{\dtk at lst@options at text}
+ \ifdtk at extern@usefancyvrb
+ \expandafter\VerbatimInput\expandafter[\dtk at lst@options at text]{\dtkExternDateiname}%
+ \else
+ \expandafter\lstinputlisting\expandafter[\dtk at lst@options at text]{\dtkExternDateiname}%
+ \fi
+ \ifdim\dtk at extern@mpwidth > \z@\relax \endminipage\fi
\fi
- \expandafter\IfFileExists\expandafter{\dtk at extern@dateiname.pdf}%
+ \expandafter\IfFileExists\expandafter{\dtkExternDateiname.pdf}%
{\ifdtk at extern@force
\ifdtk at extern@biber
- \ShellEscape{biber \dtk at extern@dateiname}% NAch biber nochmal latex
- \ShellEscape{\dtk at extern@compiler\space\dtk at extern@dateiname}%
+ \ShellEscape{biber \dtkExternDateiname}% NAch biber nochmal latex
+ \ShellEscape{\dtk at extern@compiler\space\dtkExternDateiname}%
\fi
+ \ifdtk at extern@xindex
+ \ShellEscape{xindex \dtk at extern@xindexOptions\space \dtkExternDateiname.idx}% NAch xindex nochmal latex
+ \ShellEscape{\dtk at extern@compiler\space\dtkExternDateiname}%
+ \fi
\ifdtk at extern@crop
- \ShellEscape{pdfcrop \dtk at extern@dateiname}%
- \ShellEscape{mv \dtk at extern@dateiname-crop.pdf \dtk at extern@dateiname.pdf}%
+ \ShellEscape{pdfcrop \dtkExternDateiname}%
+ \ShellEscape{mv \dtkExternDateiname-crop.pdf \dtkExternDateiname.pdf}%
\fi
\fi
}{}
+ \ifdtk at extern@code\else
+ \ifdtk at extern@showFilename
+ \marginnote{\rotatebox{90}{\dtkExternDateiname}}%
+ \fi
+ \fi
+%
\ifdtk at extern@includegraphic
- \ifdtk at extern@float\begin{figure}[!htb]\centering\fi
+ \ifdtk at extern@float
+ \begin{figure}[!htb]
+ \else
+ \ifdim\dtk at extern@mpwidth>\z@
+ \hfill\minipage[t]{\dimexpr\linewidth-\dtk at extern@mpwidth-1em\relax}\vspace{0pt}
+ \else
+ \par\begingroup
+ \fi
+ \fi
+ \dtk at extern@align
\ifdtk at extern@frame
\expandafter\@for\expandafter\next\expandafter:\expandafter=\dtk at extern@pages\do{%
- \fbox{\expandafter\includegraphics\expandafter[\dtk at extern@grfOptions,page=\next]{\dtk at extern@dateiname}}%
+ \fbox{\expandafter\includegraphics\expandafter[\dtk at extern@grfOptions,page=\next]{\dtkExternDateiname}}%
\hspace{5pt}}\hspace*{-5pt}
-% \fbox{\expandafter\includegraphics\expandafter[\dtk at extern@grfOptions]{\dtk at extern@dateiname}}%
+% \fbox{\expandafter\includegraphics\expandafter[\dtk at extern@grfOptions]{\dtkExternDateiname}}%
\else
\expandafter\@for\expandafter\next\expandafter:\expandafter=\dtk at extern@pages\do{%
- \expandafter\includegraphics\expandafter[\dtk at extern@grfOptions,page=\next]{\dtk at extern@dateiname}%
+ \expandafter\includegraphics\expandafter[\dtk at extern@grfOptions,page=\next]{\dtkExternDateiname}%
\hspace{5pt}}\hspace*{-5pt}
-% \expandafter\includegraphics\expandafter[\dtk at extern@grfOptions]{\dtk at extern@dateiname}%
+% \expandafter\includegraphics\expandafter[\dtk at extern@grfOptions]{\dtkExternDateiname}%
\fi
\ifx\dtk at extern@caption\@empty\else\caption{\dtk at extern@caption}\fi
\ifx\dtk at extern@label\@empty\else\label{\dtk at extern@label}\fi
- \ifdtk at extern@float\end{figure}\fi
+ \ifdtk at extern@float
+ \end{figure}
+ \else
+ \ifdim\dtk at extern@mpwidth>\z@
+ \endminipage
+ \else
+ \par\endgroup
+ \fi
+ \fi
\fi
\ifdtk at extern@cleanup
- \ShellEscape{rm \dtk at extern@dateiname.log}%
- \ShellEscape{rm \dtk at extern@dateiname.aux}%
- \ShellEscape{rm \dtk at extern@dateiname.toc}%
-% \ShellEscape{rm \dtk at extern@dateiname.log}%
+ \ShellEscape{rm \dtkExternDateiname.log}%
+ \ShellEscape{rm \dtkExternDateiname.aux}%
+ \ShellEscape{rm \dtkExternDateiname.toc}%
+% \ShellEscape{rm \dtkExternDateiname.log}%
\fi
\global\ResetKeys}
+\stepcounter{dtk at example@counter}%
%
\let\externalDocument\ErstelleGrafik
\let\endexternalDocument\endErstelleGrafik
Modified: trunk/Master/texmf-dist/tex/latex/dtk/dtk-full.clo
===================================================================
--- trunk/Master/texmf-dist/tex/latex/dtk/dtk-full.clo 2019-04-05 21:13:04 UTC (rev 50788)
+++ trunk/Master/texmf-dist/tex/latex/dtk/dtk-full.clo 2019-04-05 21:13:17 UTC (rev 50789)
@@ -14,7 +14,7 @@
%% version 2005/12/01 or later.
\ProvidesFile{dtk-full.clo}%
- [2017/05/30 v0.1i dtk class options for full mode (RN)]
+ [2019/01/31 v0.1l dtk class options for full mode (RN)]
\@ifclasslater{scrbook}{2015/09/29}{}{%
\ClassError{dtk2}{%
@@ -28,7 +28,7 @@
\edef\pdfcreationdate{\pdfcreationdate}
% weil datetime2 inkompatible zu LuaTeX 0.95/luatex85,
% standardmäßig ungünstige Defionition in luatex85
-\usepackage[showzone=false]{datetime2}
+\RequirePackage[showzone=false]{datetime2}
\newcommand*\AutorenListenName{Autoren/Organisatoren} % auch »Stichwortverzeichnis«?
\newcommand*\DTK at fancyJournalname{%
@@ -79,28 +79,58 @@
\g at addto@macro\DTK at embedded@enddocumenthook}
\newcommand*\DTK at local@inputname{}
\newcommand*\DTK at eat@version[1][]{\ignorespaces}
-\newcommand*\DTK at usepackage[2][]{% TODO: Besser \DTK at eat@version
+\newcommand*\DTK at usepackage[2][]{%
\@ifnextchar[%]
{\DTK@@usepackage{#1}{#2}}%
{\DTK@@usepackage{#1}{#2}[]}%
}%
+\newcommand*\DTK at RequirePackage[2][]{%
+ \@ifnextchar[%]
+ {\DTK@@RequirePackage{#1}{#2}}%
+ {\DTK@@RequirePackage{#1}{#2}[]}%
+}%
\newcommand*\DTK@@usepackage{}
+\newcommand*\DTK@@RequirePackage{}
\newcommand*\DTK at documentclass[2][]{%
\DTK at eat@version
}
+\newcounter{artcounter}
+
\ifDTKrecord
% Testlauf zum Aufsammeln von Paket- und bib-Dateinamen
- \@ifdefinable\user at packages{%
- \newwrite\user at packages
- \immediate\openout\user at packages dtk-userpackages.tex\relax
- \immediate\write\user at packages{\@percentchar\space *** \DTMnow\space ***}%
- \AtEndDocument{\immediate\closeout\user at packages\relax}%
+ \@ifdefinable\user at usepackages{%
+ \newwrite\user at usepackages
+ \immediate\openout\user at usepackages dtk-userpackages.tex\relax
+ \immediate\write\user at usepackages{%
+ \@percentchar\space *** \DTMnow\space ***}%
+ \AtEndDocument{\immediate\closeout\user at usepackages\relax}%
}
+ \@ifdefinable\user at requirepackages{%
+ \newwrite\user at requirepackages
+ \immediate\openout\user at requirepackages dtk-requirepackages.tex\relax
+ \immediate\write\user at requirepackages{%
+ \@percentchar\space *** \DTMnow\space ***}%
+ \AtEndDocument{\immediate\closeout\user at requirepackages\relax}%
+ }
+ \@ifdefinable\user at bibs{%
+ \newwrite\user at bibs
+ \immediate\openout\user at bibs dtk-userbibs.tex\relax
+ \immediate\write\user at bibs{%
+ \@percentchar\space *** \DTMnow\space ***}%
+ \AtEndDocument{\immediate\closeout\user at bibs\relax}%
+ }
\renewcommand*\printbibliography[1][]{}%
\newcommand*\DTK at addbibresource[2][]{%
- \immediate\write\user at packages{%
- \string\addbibresource[datatype=bibtex,label=DTK\the\c at refsection]{#2}%
+ \@ifundefined{BIBS:\the\c at artcounter}{%
+ \def\DTK at tempa{}%
+ \expandafter\let\csname BIBS:\the\c at artcounter\endcsname\@empty
+ }{\def\DTK at tempa{,}}%
+ % Collect all bib filenames as comma list for \newrefsection
+ \expandafter\g at addto@macro\csname BIBS:\the\c at artcounter
+ \expandafter\endcsname\expandafter{\DTK at tempa #2}%
+ \immediate\write\user at bibs{%
+ \string\addbibresource\ifx\relax#1\relax\else[#1]\fi{#2}%
\@percentchar\space \DTK at local@inputname
}%
}%
@@ -110,7 +140,7 @@
\let\DTK at tempa=\@empty
\ifstr{\@tempa}{inputenc}{\let\DTK at tempa=\@percentchar}{%
\ifstr{\@tempa}{fontenc}{\let\DTK at tempa=\@percentchar}{}}%
- \immediate\write\user at packages{%
+ \immediate\write\user at usepackages{%
\DTK at tempa\string\usepackage\ifx\relax#1\relax\else[#1]\fi{\@tempa}%
\ifx\relax#3\relax\else[#3]\fi\@percentchar\space \DTK at local@inputname
}%
@@ -117,6 +147,16 @@
}%
\ignorespaces
}%
+ \def\DTK@@RequirePackage#1#2[#3]{%
+ \edef\@tempb{\zap at space#2 \@empty}%
+ \@for\@tempa:=\@tempb\do{%
+ \immediate\write\user at requirepackages{%
+ \string\RequirePackage\ifx\relax#1\relax\else[#1]\fi{\@tempa}%
+ \ifx\relax#3\relax\else[#3]\fi\@percentchar\space \DTK at local@inputname
+ }%
+ }%
+ \ignorespaces
+ }%
\let\DTK@@Author=\DTK at Author
\newcommand*\AutorenListe{}%
\let\tableofcontents=\relax
@@ -128,10 +168,16 @@
* File `dtk-userpackages.tex' used.^^J%
*************************************}%
}{}%
+ \InputIfFileExists{dtk-userbibs.tex}{%
+ \typeout{*************************************^^J%
+ * File `dtk-userbibs.tex' used.^^J%
+ *************************************}%
+ }{}%
\shorthandon{"}%
}%
\AtBeginDocument{\DTK at backside}%
\def\DTK@@usepackage#1#2[#3]{}%
+ \def\DTK@@RequirePackage#1#2[#3]{}%
\newcommand*\DTK at addbibresource[2][]{}%
\newcommand*\ORIG at printbibliography{}
\let\ORIG at printbibliography=\printbibliography
@@ -162,14 +208,26 @@
\noexpand\sindex[autoren]{#2#1@#1 #2!#3}}}%
\x
\else
- \sindex[autoren]{#2#1@#1 #2!\textcolor{red}{\huge???}}%
+ \ifDTK at korr@
+ \sindex[autoren]{#2#1@#1 #2!\textcolor{red}{\huge???}}%
+ \else
+ \sindex[autoren]{#2#1@#1 #2!\relax}%
+ \fi
\fi
\endgroup
}%
- \let\DTK at Author=\DTK at Author@list
+ \newcommand*\DTK at Update@Author at index[3]{%
+ % Paket "everyhook"?
+ % Erst zu Beginn des nächsten Absatzes (hmode) Index-Befehle ausführen
+ \g at addto@macro\DTK at Author@list at content{\DTK at Author@list{#1}{#2}{#3}}%
+ \everypar=\expandafter{\the\everypar\DTK at Author@list at exec}%
+ }
+ % Sternversion: keine Ausgabe der Autoren, nur Index ergänzen
+ \let\DTK at Author=\DTK at Update@Author at index
+ % Normale Version
\newcommand\DTK@@Author[3]{%
- \DTK at Author@article{#1}{#2}{#3}%
- \DTK at Author@list{#1}{#2}{#3}%
+ \DTK at Author@article{#1}{#2}{#3}% Ausgabe der Autoren wie im Autor-Modus
+ \DTK at Update@Author at index{#1}{#2}{#3}%
}
\renewcommand\maketitle[1][]{%
\thispagestyle{dtk-title}%
@@ -180,6 +238,8 @@
%%% Laden eines Einzeldokuments
\newcommand*\DTKinput[1]{%
+ \setcounter{dtk at example@counter}{1}%
+ \stepcounter{artcounter}%
\begingroup
\filename at parse{#1}%
\edef\jobname{\filename at base}%
@@ -197,6 +257,7 @@
\let\nofiles=\relax
\let\documentclass=\DTK at documentclass
\let\usepackage=\DTK at usepackage
+ \let\RequirePackage=\DTK at RequirePackage
\let\addbibresource=\DTK at addbibresource
\c at footnote=\z@
\c at lstlisting=\z@
@@ -204,14 +265,29 @@
\c at table=\z@
\c at equation=\z@
\renewenvironment{document}{%
- \ifDTKrecord\endgroup\expandafter\endinput\fi
+ \ifDTKrecord
+ % Write the definition of the complete bib filename list
+ \@ifundefined{BIBS:\the\c at artcounter}{}{%
+ \immediate\write\user at bibs{%
+ \string\@namedef{BIBS:\the\c at artcounter}%
+ {\csname BIBS:\the\c at artcounter\endcsname}%
+ \@percentchar\space \DTK at local@inputname
+ }%
+ }%
+ \endgroup\expandafter\endinput
+ \fi
\DTK at embedded@begindocumenthook\ignorespaces
}{%
\DTK at embedded@enddocumenthook\endinput
}%
- \refsection[DTK\the\c at refsection]%
+ \@ifundefined{BIBS:\the\c at artcounter}{%
\input{\DTK at local@inputname}%
- \endrefsection
+ }{%
+ \expandafter\newrefsection\expandafter
+ [\csname BIBS:\the\c at artcounter\endcsname]%
+ \input{\DTK at local@inputname}%
+ \endrefsection
+ }%
\endgroup
}
@@ -293,20 +369,23 @@
\ifDTK at korr@% === Positionsnummern am linken Rand ===
\newcommand*\formatPosNumber[1]{%
- \fboxsep=.2em %
\fbox{\ifnum\arabic{page}<10 0\fi\arabic{page}-\ifnum#1<10 0\fi\@arabic{#1}}%
}
\newcommand\makePosNumbers[2]{%
+ \fboxsep=.2em %
\settoheight\DTK at tempdimc{\formatPosNumber{9}}%
+ \settowidth\DTK at tempdime{\formatPosNumber{9}}%
\DTK at tempdimc=1.5\DTK at tempdimc
\DTK at tempdimd=0pt %
\DTK at tempdimb=#2 %
+ %%%\settowidth\DTK at tempdima{\formatPosNumber{9}}%
\@tempcnta=0 %
\@whiledim \dimexpr\DTK at tempdimd+.5\DTK at tempdimc < \textheight\do{%
\advance\@tempcnta 1 %
\DTK at tempdimb=\dimexpr\DTK at tempdimb-\DTK at tempdimc
\DTK at tempdimd=\dimexpr\DTK at tempdimd+\DTK at tempdimc
- \put(#1,\DTK at tempdimb){\formatPosNumber{\@tempcnta}}%
+ \put(\ifodd\c at page #1\else\dimexpr#1+\textwidth+1.5\DTK at tempdime\fi,%
+ \DTK at tempdimb){\formatPosNumber{\@tempcnta}}%
}%
}
\DeclareNewLayer[textarea,background,mode=picture,contents={%
@@ -313,7 +392,7 @@
\begingroup
\ttfamily\scriptsize\itshape
\settowidth\DTK at tempdimc{\formatPosNumber{99}}%
- \DTK at tempdima=\dimexpr-.5\textwidth-\DTK at tempdimc-.8em %
+ \DTK at tempdima=\dimexpr-.5\textwidth-\DTK at tempdimc-.1em %
\putC{%
\makePosNumbers{\DTK at tempdima}{.5\textheight}%
}%
@@ -373,6 +452,8 @@
\newcommand*\Part{%
% [#1]=toc, {#2}=Überschrift, [#3]=Präambel, *=nur Strich
+ \clearpage
+ %\DTK at thispagestyle{plain.scrheadings}%
\@ifstar{\global\@tempswatrue\DTK at Part}{\global\@tempswafalse\DTK at Part}%
}
@@ -384,23 +465,31 @@
\newcommand\DTK@@Part[1][]{%
\let\DTK at tempb=\partheadendvskip
- \if at tempswa
+ \DTK at tempdime=10pt %
+ \if at tempswa% Strich
\setpartpreamble{%
\noindent\raisebox{\height}[\height]{\rule{\textwidth}{2pt}}%
}%
- \def\partheadendvskip{%
- \medskip\par
- }
+ \advance\DTK at tempdime 3mm %
\fi
- \ifx\relax#1\relax\else
+ \ifx\relax#1\relax
+ \else% Präambel
+ \setbox0=\vbox{%
+ \noindent\raisebox{\height}[\height]{\rule{\textwidth}{2pt}}\par
+ \usekomafont{section} #1\par}%
+ \settoheight{\DTK at tempdima}{\usebox0}%
+ \settodepth{\DTK at tempdimb}{\usebox0}%
+ \advance\DTK at tempdima\DTK at tempdimb
\setpartpreamble{%
- \noindent\raisebox{\height}[\height]{\rule{\textwidth}{2pt}}\par
- \usekomafont{section} #1\par
+ \box0
}%
+ \advance\DTK at tempdime \DTK at tempdima %
\fi
+ \def\partheadendvskip{\vskip \DTK at tempdime\par}%
\DTK at tempa
\let\partheadendvskip=\DTK at tempb
- \bigskip\par
+ \vskip -5mm %
+ \leavevmode
}
\def\partheadstartvskip{% 12.0pt plus 1.0fil
Modified: trunk/Master/texmf-dist/tex/latex/dtk/dtk-logos.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/dtk/dtk-logos.sty 2019-04-05 21:13:04 UTC (rev 50788)
+++ trunk/Master/texmf-dist/tex/latex/dtk/dtk-logos.sty 2019-04-05 21:13:17 UTC (rev 50789)
@@ -4,7 +4,7 @@
%%
%% LaTeX Class for ``Die TeXnische Komoedie''.
%%
-%% Copyright (C) 2017
+%% Copyright (C) 2018
%% Herbert Voss
%%
%% It may be distributed and/or modified under the
@@ -15,13 +15,23 @@
%% and version 1.3c or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
%
-% $Id: deLogos.sty 188 2015-10-08 20:06:29Z herbert $
%
% -------------------------------------
-\ProvidesPackage{dtk-logos}[2017/06/07 v. 1.01 Dante Edition: Logos (hv)]
+\ProvidesPackage{dtk-logos}[2018/10/19 v. 1.06 Dante Edition: Logos (hv)]
%
-\RequirePackage{hologo,dantelogo}
+\newif\if at dtk@newengine \@dtk at newenginetrue
+\RequirePackage{ifluatex,ifxetex}
%
+\ifluatex\else\ifxetex\else\@dtk at newenginefalse\fi\fi
+%
+\RequirePackage{fetamont}
+\RequirePackage{hologo,dantelogo,xspace}
+\if at dtk@newengine
+ \RequirePackage{unicode-math}
+ \setmathfont{LatinModernMath-Regular}
+ \setmathfont[version=XITS]{XITSMath-Regular.otf}
+\fi
+%
\def\HoLogo at La#1{%
L%
\ifx\f at family\sfdefault\kern-.15em\else\kern-.23em\fi
@@ -43,9 +53,10 @@
\endgroup
}
\def\LaTeXTeX{\hologo{(La)TeX}}
-\def\AmSLaTeX{\hologo{AmSLaTeX}}
-\def\AmSTeX{\hologo{AmSTeX}}
+\def\AmSLaTeX{\mbox{\textsf{AMS}-\hologo{LaTeX}}}
+\def\AmSTeX{\mbox{\textsf{AMS}-\hologo{TeX}}}
\def\biber{\hologo{biber}}
+\def\Biber{\Hologo{biber}}
\def\BibTeX{\hologo{BibTeX}}
\def\BibTeXacht{\hologo{BibTeX8}}
\def\ConTeXt{\hologo{ConTeXt}}
@@ -67,7 +78,7 @@
\def\LyX{\hologo{LyX}}
\def\METAFONT{\hologo{METAFONT}}
\let\MF\METAFONT
-\def\MetaFun{\hologo{MetaFun}}
+\def\MetaFun{\textffm{METAFUN}}
\def\METAPOST{\hologo{METAPOST}}
\def\MetaPost{\hologo{MetaPost}}
\let\MP\METAPOST
@@ -76,7 +87,7 @@
\def\OzMF{\hologo{OzMF}}
\def\OzMP{\hologo{OzMP}}
\def\OzTeX{\hologo{OzTeX}}
-\def\OzTtH{\hologo{OzTth}}
+\def\OzTtH{\hologo{OzTtH}}
\def\PCTeX{\hologo{PCTeX}}
\def\pdfTeX{\hologo{pdfTeX}}
\let\pdftex\pdfTeX
@@ -97,10 +108,12 @@
\def\XeLaTeX{\hologo{XeLaTeX}}
\def\XeTeX{\hologo{XeTeX}}
%%
+\def\AmS{{\ifluatex\mathversion{XITS}\fi%
+ $\mathcal{A}$\kern-.1667em\lower.5ex\hbox{$\mathcal{M}$}\kern-.125em$\mathcal{S}$}}% $
+%
\newcommand\BibTool{\textsc{Bib\hskip-.1em
T\hskip-.15emo\hskip-.05emo\hskip-.05eml}\xspace}
\providecommand\tikz{\textsf{Ti\textit{k}Z}}
-\def\pgf/tikz{\textsf{pgf/Ti\textit{k}Z}}
\def\ALEPH{\ensuremath{\aleph}}
\let\TikZ\tikz
@@ -114,17 +127,23 @@
\providecommand\TUGboat{\textsl{TUGboat}}
\let\DANTE\dantelogo
\def\pgf/tikz{\textsf{pgf/Ti\textit{k}Z}}
-\def\TeXLive{\TeX{}Live}
+\def\TeXLive{\TeX{}Live\xspace}
\def\BibLaTeX{Bib\hologo{LaTeX}}
\let\biblatex\BibLaTeX
\def\CTAN{\texttt{CTAN}\xspace}
-\iffalse
-\newfontfamily\LinWikipedia{LinLibertine_R_G}[Extension=.ttf,
- Path=/usr/local/texlive/texmf-local/fonts/opentype/libertine/]
-\def\WikipediA{{\LinWikipedia\char"E02F\textsc{ikipediA}}} % dezimal
+\def\PSTricks{\textsf{PSTricks}\xspace}
+\let\pstricks\PSTricks
+
+\if at dtk@newengine
+ \newfontfamily\dtk at LinWikipedia{Linux Libertine O}%
+ \def\WikipediA{{\dtk at LinWikipedia\char"E02F\textsc{ikipediA}}} % hexadezimal
+\else
+ \def\WikipediA{WikipediA}%
+\fi
\let\wikipedia\WikipediA
-\fi
+%
+\def\macOS{\textsf{macOS}\xspace}
\endinput
Modified: trunk/Master/texmf-dist/tex/latex/dtk/dtk-new-engines.clo
===================================================================
--- trunk/Master/texmf-dist/tex/latex/dtk/dtk-new-engines.clo 2019-04-05 21:13:04 UTC (rev 50788)
+++ trunk/Master/texmf-dist/tex/latex/dtk/dtk-new-engines.clo 2019-04-05 21:13:17 UTC (rev 50789)
@@ -41,15 +41,14 @@
* File `dtk-fonts.cfg' used.^^J%
*************************************}%
}{%
- \RequirePackage[lining=true]{libertine}%
- \def\DTKrmFontName{Linux Libertine}%
- \def\DTKsfFontName{Linux Biolinum}%
- \setmathfont{XITSMath}[Scale=0.9,math-style=TeX,bold-style=TeX]%
- \def\DTKmathFontName{XITS Math}%
- \setmonofont{AnonymousPro}[Scale=0.955,FakeStretch=0.87]%
- \def\DTKttFontName{Anonymous Pro}%
- %\setmonofont{DejaVuSansMono}[Scale=0.81,FakeStretch=0.9]%
- %\def\DTKttFontName{DejaVu Mono}%
+ \RequirePackage{libertinus-otf}%
+ \def\DTKrmFontName{Libertinus Serif}%
+ \def\DTKsfFontName{Libertinus Sans Serif}%
+% \setmathfont{XITSMath}[Scale=0.9,math-style=TeX,bold-style=TeX]%
+ \def\DTKmathFontName{Libertinus Math}%
+ \setmonofont{AnonymousPro}[Scale=MatchLowercase,FakeStretch=0.87,
+ RawFeature=-tlig]%
+ \def\DTKttFontName{Anonymous Pro}%
}
\endinput
Modified: trunk/Master/texmf-dist/tex/latex/dtk/dtk-url.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/dtk/dtk-url.sty 2019-04-05 21:13:04 UTC (rev 50788)
+++ trunk/Master/texmf-dist/tex/latex/dtk/dtk-url.sty 2019-04-05 21:13:17 UTC (rev 50789)
@@ -146,15 +146,17 @@
\let\embedfilefinish\relax
\AfterLastShipout{%
\immediate\closeout\DTK at UrlHandle
- \embedfile[%
- mimetype=text/plain,%
- stringmethod=escape,%
- desc={%
- List of URLs found in %
- \@backslashchar url and \@backslashchar ctanurl%
- },%
- ]{\DTK at UrlFile}%
- \DTK at embedfilefinish
+ \IfFileExists{\DTK at UrlFile}{%
+ \embedfile[%
+ mimetype=text/plain,%
+ stringmethod=escape,%
+ desc={%
+ List of URLs found in %
+ \@backslashchar url and \@backslashchar ctanurl%
+ },%
+ ]{\DTK at UrlFile}%
+ \DTK at embedfilefinish
+ }{}
}%
\else
\let\DTK at UrlWrite\@gobbletwo
Modified: trunk/Master/texmf-dist/tex/latex/dtk/dtk.bbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/dtk/dtk.bbx 2019-04-05 21:13:04 UTC (rev 50788)
+++ trunk/Master/texmf-dist/tex/latex/dtk/dtk.bbx 2019-04-05 21:13:17 UTC (rev 50789)
@@ -8,7 +8,7 @@
%% See http://www.latex-project.org/lppl.txt
%% ---------------------------------------------------------------
%%
-\ProvidesFile{dtk.bbx}[2016/04/04 v0.11 biblatex bibliography style for DTK]
+\ProvidesFile{dtk.bbx}[2018/07/11 v0.12 biblatex bibliography style for DTK]
% Load the standard style to avoid copy-pasting unnecessary material
\RequireBibliographyStyle{chem-angew}
@@ -37,6 +37,7 @@
% biblabel = parens,
sorting = nyvt,
dashed = true,
+ datezeros = false,
}
Modified: trunk/Master/texmf-dist/tex/latex/dtk/dtk.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/dtk/dtk.cls 2019-04-05 21:13:04 UTC (rev 50788)
+++ trunk/Master/texmf-dist/tex/latex/dtk/dtk.cls 2019-04-05 21:13:17 UTC (rev 50789)
@@ -14,6 +14,13 @@
%% version 2005/12/01 or later.
\listfiles
+
+\InputIfFileExists{dtk-requirepackages.tex}{%
+ \typeout{*************************************^^J%
+ * File `dtk-requirepackages.tex' used.^^J%
+ *************************************}%
+}{}%
+
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\RequirePackage{hyphsubst}% Trennregeln austauschen
\HyphSubstIfExists{ngerman-x-latest}{%
@@ -21,8 +28,8 @@
\HyphSubstIfExists{german-x-latest}{%
\HyphSubstLet{german}{german-x-latest}}{}
-\def\DTKversion{2.07a}
-\def\DTKversiondate{2017/06/07}
+\def\DTKversion{2.08a}
+\def\DTKversiondate{2019/01/31}
\ProvidesClass{dtk}[\DTKversiondate v\DTKversion dtk documentclass (RN)]
\RequirePackage{ifxetex,ifluatex,ifpdf,ifvtex,luatex85}
@@ -56,7 +63,11 @@
\newlength\DTK at tempdimb
\newlength\DTK at tempdimc
\newlength\DTK at tempdimd
+\newlength\DTK at tempdime
+\newlength\Linewidth
+\AtBeginDocument{\Linewidth=\dimexpr\linewidth-2\fboxsep-2\fboxrule}
+
\newcommand*\journalname{Die \protect\TeX{}nische Kom\"odie}
\newcommand*\DTKyear{} \edef\DTKyear{\the\year}
@@ -164,7 +175,7 @@
\ClassError{dtk2}{%
Eines der Makros `\string\DTKrmFontName', `\string\DTKsfFontName',
\MessageBreak
- `\string\DTKttFontName`' oder `\string\DTKmathFontName'
+ `\string\DTKttFontName' oder `\string\DTKmathFontName'
\MessageBreak
ist nicht korrekt definiert%
}{}%
@@ -180,6 +191,9 @@
\input{dtk-new-engines.clo}% LuaTeX oder XeTeX
\fi
+\@ifpackagelater{csquotes}{2018/02/11}{}{%
+ \def\@inpenc at undefined{}
+}
\RequirePackage[autostyle=true,german=guillemets,maxlevel=3]{csquotes}%
\MakeAutoQuote{»}{«}
\defineshorthand{"`}{\openautoquote}%
@@ -256,6 +270,11 @@
\let\DTK at thispagestyle=\thispagestyle
+\newcommand*\DTK at Author@list at content{}
+\newcommand\DTK at Author@list at exec{%
+ \DTK at Author@list at content
+ \global\let\DTK at Author@list at content=\@empty
+}
\newcommand\DTK at maketitle[1][]{%
\begingroup
\dimen0=\textheight
@@ -265,13 +284,13 @@
\fi
\endgroup
\def\and{\end{tabular}, \begin{tabular}[t]{@{}c@{}}}%
- \chapter[\@@title]{\@title}%
- %%%\ifx\@author\@empty\else\addsec*{\@author}\fi
+ \leavevmode% erzwingt \everypar (speziell: \DTK at Author@list at exec)
+ \vspace*{-8mm}%
+ \addchap[\@@title]{\@title}%
\begingroup
\usekomafont{author}\lineskip 0.75em %
- \begin{tabular}[t]{@{}c@{}}\@author\end{tabular}\par
+ \begin{tabular}[t]{@{}c@{}}\@author\end{tabular}\par\medskip
\endgroup
- \DTK at thispagestyle{plain.scrheadings}%
\@thanks
\global\let\@thanks=\@empty
\global\let\@title=\@empty
@@ -278,6 +297,7 @@
\global\let\@author=\@empty
\global\let\@thanks=\@empty
\global\let\and\relax
+ \global\let\DTK at license=\@empty
}
\renewcaptionname{ngerman}{\bibname}{Literatur und Software}
@@ -286,12 +306,44 @@
\RequirePackage[automark,draft=false]{scrlayer-scrpage}
\pagestyle{scrheadings}
\clearpairofpagestyles
-\ihead{\headmark}
-\ohead{\pagemark}
+% https://komascript.de/node/2177
+\ihead{\ifstr{\righttopmark}{\rightbotmark}{\leftmark}{}}
+\ohead{\ifstr{\righttopmark}{\rightbotmark}{\pagemark}{}}
\ofoot*{\normalsize\DTKcorrVersion}
\ifoot*{\journalname~~\DTKdate}
\automark[chapter]{chapter}
+\newcommand*\DTK at license{}
+\newcommand*\license[1]{%
+ \gdef\DTK at license{#1}%
+}
+\iffalse
+\RedeclareSectionCommand[%
+ ,style=part
+ %,indent=\z@
+ ,beforeskip=40mm
+ ,afterskip=60mm %
+ ,pagestyle=plain.scrheadings
+ %,innerskip=\z@
+]{part}
+\fi
+
+\RedeclareSectionCommand[%
+ ,style=section
+ ,indent=\z@
+ ,beforeskip=-2\baselineskip \@plus -.2\baselineskip \@minus -.2\baselineskip
+ ,afterskip=.4\baselineskip \@plus .04\baselineskip \@minus .04\baselineskip
+]{chapter}
+
+\RedeclareSectionCommand[%
+ ,beforeskip=-2.4ex \@plus -1ex \@minus -.2ex % Betrag ist von Bedeutung!
+ ,afterskip=0.8ex \@plus .1ex \@minus .1ex %
+]{section}
+
+\RedeclareSectionCommand[%
+ ,afterskip=0.8ex \@plus .1ex %
+]{subsection}
+
\RequirePackage{xcolor}
\ifDTKcolor
@@ -354,7 +406,8 @@
\def\bibliography#1{%
\ClassError{dtk2}{%
Das Makro `\string\bibliography' wird nicht unterstützt!\MessageBreak
- Verwende stattdessen `\string\addbibresource\string{#1.bib\string}'\MessageBreak
+ Verwende stattdessen `\string\addbibresource\string{#1.bib\string}'
+ \MessageBreak
und `\string\printbibliography' (siehe biblatex-Dokumentation)
}{}%
}%
@@ -362,10 +415,11 @@
%%%\ifDTKrecord \expandafter \endinput \fi % lohnt es?
-\addtokomafont{caption}{\RaggedRight\small}
+\addtokomafont{caption}{%\RaggedRight
+ \small}
\setkomafont{captionlabel}{\sffamily}
\setcapindent{0pt}
-\setcapwidth[c]{\textwidth}
+%\setcapwidth[c]{\textwidth}
\renewcaptionname{ngerman}{\figurename}{Abb.}
\renewcaptionname{ngerman}{\tablename}{Tab.}
\def\thefigure{\@arabic\c at figure}
@@ -373,22 +427,6 @@
\def\theequation{\@arabic\c at equation}
\def\thelstlisting{\@arabic\c at lstlisting}
-\RedeclareSectionCommand[%
- ,beforeskip=-2.4ex \@plus -1ex \@minus -.2ex % Betrag ist von Bedeutung!
- ,afterskip=0.8ex \@plus .1ex \@minus .1ex %
-]{section}
-
-\RedeclareSectionCommand[%
- ,afterskip=0.8ex \@plus .1ex %
-]{subsection}
-
-\RedeclareSectionCommand[%
- ,style=section
- ,indent=\z@
- ,beforeskip=-2\baselineskip \@plus -.2\baselineskip \@minus -.2\baselineskip
- ,afterskip=1\baselineskip \@plus .1\baselineskip \@minus .1\baselineskip
-]{chapter}
-
\setkomafont{disposition}{\normalfont\sffamily}
\setkomafont{part}{\usekomafont{disposition}\huge}
\setkomafont{chapter}{\usekomafont{disposition}\Large}
@@ -398,6 +436,20 @@
\setkomafont{pagefoot}{\footnotesize\sffamily\slshape}% \itshape?
\setkomafont{author}{\usekomafont{section}}
+\RequirePackage{marginnote}
+\renewcommand*{\marginfont}{\normalfont\itshape\small}
+\renewcommand*{\sectionlinesformat}[4]{%
+ % reagiert auf \addchap in \maketitle (wegen "style=section")
+ \@hangfrom{%
+ \ifx\DTK at license\@empty\else
+ \marginnote{\rotatebox{90}{\makebox[.5em][r]{%
+ Lizenz:~\DTK at license
+ }}}%
+ \fi
+ \hskip #2#3%
+ }{#4}%
+}
+
%\addtokomafont{footnote}{\RaggedRight}
\deffootnote[1.2em]{1.2em}{1.2em}{\textsuperscript{\thefootnotemark}\,}
\newcommand*\DTK at footnote{}
@@ -409,6 +461,7 @@
\def\footnote{%
\@ifstar\DTK@@footnote\DTK at footnote
}
+%\setfootnoterule{.15\textwidth}
\RequirePackage{enumitem}
\setlist{leftmargin=*,nosep}
@@ -423,6 +476,16 @@
% Listings
\newcommand*\DTKlstfont{\small\ttfamily}
+\let\lstlisting=\relax
+\let\lstlisting@=\relax
+% Correct wrong vertical spaces
+\lstnewenvironment{lstlisting}[2][]{%
+ %%%%\leavevmode%
+ \lst at TestEOLChar{#2}%
+ \lstset{#1}%
+ \csname\@lst @SetFirstNumber\endcsname
+}{\csname\@lst @SaveFirstNumber\endcsname}
+
% siehe ggf.: https://github.com/jez/latex-solarized
\lstdefinestyle{DTKlstSimple0}{%
More information about the tex-live-commits
mailing list