summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Master/texmf-dist/doc/latex/dtk/doc/beispiel.pdfbin77326 -> 76051 bytes
-rw-r--r--Master/texmf-dist/tex/latex/dtk/dtk-extern.sty6
-rw-r--r--Master/texmf-dist/tex/latex/dtk/dtk-full.clo20
-rw-r--r--Master/texmf-dist/tex/latex/dtk/dtk-logos.sty21
-rw-r--r--Master/texmf-dist/tex/latex/dtk/dtk-new-engines.clo1
-rw-r--r--Master/texmf-dist/tex/latex/dtk/dtk.bbx5
-rw-r--r--Master/texmf-dist/tex/latex/dtk/dtk.cls10
7 files changed, 41 insertions, 22 deletions
diff --git a/Master/texmf-dist/doc/latex/dtk/doc/beispiel.pdf b/Master/texmf-dist/doc/latex/dtk/doc/beispiel.pdf
index 5534602dc28..53c39e0eee3 100644
--- a/Master/texmf-dist/doc/latex/dtk/doc/beispiel.pdf
+++ b/Master/texmf-dist/doc/latex/dtk/doc/beispiel.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/dtk/dtk-extern.sty b/Master/texmf-dist/tex/latex/dtk/dtk-extern.sty
index c54f4967e3b..55cef269336 100644
--- a/Master/texmf-dist/tex/latex/dtk/dtk-extern.sty
+++ b/Master/texmf-dist/tex/latex/dtk/dtk-extern.sty
@@ -2,7 +2,7 @@
%%
%% LaTeX package for ``Die TeXnische Komoedie''.
%%
-%% Copyright (C) 2016-19
+%% Copyright (C) 2016-20
%% 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}%
- [2019/10/11 v0.15: dtk package for running external documents (HV)]
+ [2020/02/07 v0.16: dtk package for running external documents (HV)]
\RequirePackage{shellesc,xkeyval,graphicx,marginnote,fancyvrb}
\newcounter{dtk@extern@runs}
+\newlength\LineWidth
+\AtBeginDocument{\setlength\LineWidth{\dimexpr\linewidth-2\fboxsep-2\fboxrule}}
\newlength\dtk@extern@mpwidth \setlength\dtk@extern@mpwidth{\z@}
\define@key{dtk}{compiler}[pdflatex]{\def\dtk@extern@compiler{#1}}
diff --git a/Master/texmf-dist/tex/latex/dtk/dtk-full.clo b/Master/texmf-dist/tex/latex/dtk/dtk-full.clo
index e6b95b8d4e0..2408eaa6539 100644
--- a/Master/texmf-dist/tex/latex/dtk/dtk-full.clo
+++ b/Master/texmf-dist/tex/latex/dtk/dtk-full.clo
@@ -138,8 +138,8 @@
\edef\@tempb{\zap@space#2 \@empty}%
\@for\@tempa:=\@tempb\do{%
\let\DTK@tempa=\@empty
- \ifstr{\@tempa}{inputenc}{\let\DTK@tempa=\@percentchar}{%
- \ifstr{\@tempa}{fontenc}{\let\DTK@tempa=\@percentchar}{}}%
+ \Ifstr{\@tempa}{inputenc}{\let\DTK@tempa=\@percentchar}{%
+ \Ifstr{\@tempa}{fontenc}{\let\DTK@tempa=\@percentchar}{}}%
\immediate\write\user@usepackages{%
\DTK@tempa\string\usepackage\ifx\relax#1\relax\else[#1]\fi{\@tempa}%
\ifx\relax#3\relax\else[#3]\fi\@percentchar\space \DTK@local@inputname
@@ -269,11 +269,11 @@
\@percentchar\space \DTK@local@inputname
}%
}%
- \endgroup\expandafter\endinput
+ \endgroup\expandafter
\fi
\DTK@embedded@begindocumenthook\ignorespaces
}{%
- \DTK@embedded@enddocumenthook\endinput
+ \DTK@embedded@enddocumenthook
}%
\@ifundefined{BIBS:\the\c@artcounter}{%
\input{\DTK@local@inputname}%
@@ -304,7 +304,7 @@
\setlength{\parfillskip}{\z@ \@plus 1fil}%
\raggedright
\def\item##1\@nil{\DTK@scan@item##1\@nil
- \par\parbox{\columnwidth}{%
+ \par\parbox{\columnwidth}{\raggedright%
\textbf{\DTK@tempa}\hfill[\DTK@tempc]\par\DTK@tempb
}%
\par\bigskip
@@ -334,10 +334,12 @@
\RequirePackage{picture}
\DeclareNewLayer[page,background,mode=picture,contents={%
- \put(24mm,0.5\dimexpr\layerheight\relax){%
- \makebox(0,0)[c]{\rotatebox[origin=c]{90}{%
- \resizebox{14cm}{!}{\Huge\DTK@fancyJournalname}}}%
- \put(8mm,0){\makebox(0,0)[c]{\rule{0.85mm}{\textheight}}}%
+% \put(24mm,0.5\dimexpr\layerheight\relax){%
+ \put(-10mm,-2pt){%
+ \includegraphics[angle=90]{dtk0}%
+% \makebox(0,0)[c]{\rotatebox[origin=c]{90}{%
+% \resizebox{14cm}{!}{\Huge\DTK@fancyJournalname}}}%
+% \put(8mm,0){\makebox(0,0)[c]{\rule{0.85mm}{\textheight}}}%
}%
\put(52mm,145mm){%
\parbox[t]{78mm}{%
diff --git a/Master/texmf-dist/tex/latex/dtk/dtk-logos.sty b/Master/texmf-dist/tex/latex/dtk/dtk-logos.sty
index 73c8f31be91..30a1a97be80 100644
--- a/Master/texmf-dist/tex/latex/dtk/dtk-logos.sty
+++ b/Master/texmf-dist/tex/latex/dtk/dtk-logos.sty
@@ -17,21 +17,31 @@
%
%
% -------------------------------------
-\ProvidesPackage{dtk-logos}[2019/10/15 v. 1.09 Dante Edition: Logos (hv)]
+\ProvidesPackage{dtk-logos}[2020/02/02 v. 1.10 Dante Edition: Logos (hv)]
%
\newif\if@dtk@newengine \@dtk@newenginetrue
-\RequirePackage{ifluatex,ifxetex}
+\RequirePackage{iftex}
%
\ifluatex\else\ifxetex\else\@dtk@newenginefalse\fi\fi
%
-\RequirePackage{fetamont}
-\RequirePackage{hologo,dantelogo,xspace}
+\RequirePackage{fetamont,hologo,dantelogo,xspace}
\if@dtk@newengine
\RequirePackage{unicode-math}
\setmathfont{LatinModernMath-Regular}
\setmathfont[version=XITS]{XITSMath-Regular.otf}
\fi
%
+\iffalse
+\DeclareRobustCommand\ffmfamily{\not@math@alphabet\ffmfamily\relax
+ \fontencoding{T1}\fontfamily{ffm}\selectfont}
+\DeclareTextFontCommand{\textffm}{\ffmfamily}
+\def\MF{\textffm{META}\@dischyph\textffm{FONT}\@}
+\def\MP{\textffm{META}\@dischyph\textffm{POST}\@}
+\def\MT{\textffm{META}\@dischyph\textffm{TYPE1}\@}
+\fi
+\def\mpShort{\textffm{MP}\@}
+\def\mfShort{\textffm{MF}\@}
+
\def\HoLogo@La#1{%
L%
\ifx\f@family\sfdefault\kern-.15em\else\kern-.23em\fi
@@ -89,6 +99,7 @@
\def\METAFONT{\hologo{METAFONT}}
\let\MF\METAFONT
\def\MetaFun{\textffm{METAFUN}}
+\let\MFun\MetaFun
\def\METAPOST{\hologo{METAPOST}}
\def\MetaPost{\hologo{MetaPost}}
\let\MP\METAPOST
@@ -121,7 +132,7 @@
%
\newcommand\BibTool{\textsc{Bib\hskip-.1em
T\hskip-.15emo\hskip-.05emo\hskip-.05eml}\xspace}
-\providecommand\tikz{\textsf{Ti\textit{k}Z}}
+\def\tikz{\textsf{Ti\textit{k}Z}}
\def\ALEPH{\ensuremath{\aleph}}
\let\TikZ\tikz
diff --git a/Master/texmf-dist/tex/latex/dtk/dtk-new-engines.clo b/Master/texmf-dist/tex/latex/dtk/dtk-new-engines.clo
index 0d1fdb96a27..be315410da8 100644
--- a/Master/texmf-dist/tex/latex/dtk/dtk-new-engines.clo
+++ b/Master/texmf-dist/tex/latex/dtk/dtk-new-engines.clo
@@ -56,6 +56,7 @@
BoldFont = *-Bold,
BoldItalicFont = *-BoldItalic,
ItalicFont = *-Italic,
+ Ligatures = ResetAll,
Extension = .ttf]%
\def\DTKttFontName{Anonymous Pro}%
}
diff --git a/Master/texmf-dist/tex/latex/dtk/dtk.bbx b/Master/texmf-dist/tex/latex/dtk/dtk.bbx
index 381b7ab1236..867ad309fab 100644
--- a/Master/texmf-dist/tex/latex/dtk/dtk.bbx
+++ b/Master/texmf-dist/tex/latex/dtk/dtk.bbx
@@ -40,7 +40,6 @@
datezeros = false,
}
-
\newbool{bbx@inset}
\providebibmacro*{date+extrayear}{}
@@ -52,6 +51,10 @@
\DeclareFieldFormat{title}{#1\isdot}
\DeclareFieldFormat[ctan]{url}{\url{CTAN: #1}}
+\DeclareFieldFormat{isbn}{ISBN\addcolon\space #1}
+\DeclareFieldFormat{isrn}{ISRN\addcolon\space #1}
+\DeclareFieldFormat{issn}{ISSN\addcolon\space #1}
+
\newbibmacro*{ctanurl+urldate}{%
\printfield{url}
\iffieldundef{urlyear}
diff --git a/Master/texmf-dist/tex/latex/dtk/dtk.cls b/Master/texmf-dist/tex/latex/dtk/dtk.cls
index 474f2ef9f60..ee4b788cefc 100644
--- a/Master/texmf-dist/tex/latex/dtk/dtk.cls
+++ b/Master/texmf-dist/tex/latex/dtk/dtk.cls
@@ -2,7 +2,7 @@
%%
%% LaTeX Class for ``Die TeXnische Komoedie''.
%%
-%% Copyright (C) 2015-2019
+%% Copyright (C) 2015-2020
%% Rolf Niepraschk, Herbert Voss
%%
%% It may be distributed and/or modified under the
@@ -28,7 +28,7 @@
\HyphSubstIfExists{german-x-latest}{%
\HyphSubstLet{german}{german-x-latest}}{}
-\def\DTKversion{2.08g}
+\def\DTKversion{2.08h}
\def\DTKversiondate{2019/12/04}
\ProvidesClass{dtk}[\DTKversiondate v\DTKversion dtk documentclass (RN)]
@@ -127,7 +127,7 @@
\RequirePackage{dtk-extern}
% http://www.komascript.de/release3.18
-\ifstr{\KOMAScriptVersion}{2015/07/02 v3.18 KOMA-Script}{%
+\Ifstr{\KOMAScriptVersion}{2015/07/02 v3.18 KOMA-Script}{%
\ifx\par@update\default@par@update\else
\AtBeginDocument{\par@updaterelative}%
\fi
@@ -316,8 +316,8 @@
\pagestyle{scrheadings}
\clearpairofpagestyles
% https://komascript.de/node/2177
-\ihead{\ifstr{\righttopmark}{\rightbotmark}{\leftmark}{}}
-\ohead{\ifstr{\righttopmark}{\rightbotmark}{\pagemark}{}}
+\ihead{\Ifstr{\righttopmark}{\rightbotmark}{\leftmark}{}}
+\ohead{\Ifstr{\righttopmark}{\rightbotmark}{\pagemark}{}}
\ofoot*{\normalsize\DTKcorrVersion}
\ifoot*{\journalname~~\DTKdate}
\automark[chapter]{chapter}