dtk (4aug21)

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

6 files changed, 40 insertions, 179 deletions

diff --git a/Master/texmf-dist/doc/latex/dtk/README.md b/Master/texmf-dist/doc/latex/dtk/README.md
index 61c46abddc5..1e536871e25 100644
--- a/Master/texmf-dist/doc/latex/dtk/README.md
+++ b/Master/texmf-dist/doc/latex/dtk/README.md
@@ -2,4 +2,4 @@
 
 LaTeX class for the journal »Die TeXnische Komödie« (new implementation).
 
-Rolf Niepraschk <Rolf.Niepraschk@gmx.de> and Herbert Voss <Herbert@dante.de>
+Rolf Niepraschk <Rolf.Niepraschk@gmx.de> and Herbert Voss <hvoss@tug.org>
diff --git a/Master/texmf-dist/doc/latex/dtk/doc/beispiel.pdf b/Master/texmf-dist/doc/latex/dtk/doc/beispiel.pdf
index 53c39e0eee3..716537e5834 100644
--- a/Master/texmf-dist/doc/latex/dtk/doc/beispiel.pdf
+++ b/Master/texmf-dist/doc/latex/dtk/doc/beispiel.pdf
diff --git a/Master/texmf-dist/tex/latex/dtk/dtk-full.clo b/Master/texmf-dist/tex/latex/dtk/dtk-full.clo
index 2408eaa6539..688d0c83629 100644
--- a/Master/texmf-dist/tex/latex/dtk/dtk-full.clo
+++ b/Master/texmf-dist/tex/latex/dtk/dtk-full.clo
@@ -336,10 +336,10 @@
 \DeclareNewLayer[page,background,mode=picture,contents={%
 %  \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}}}%
+%     \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
deleted file mode 100644
index 30a1a97be80..00000000000
--- a/Master/texmf-dist/tex/latex/dtk/dtk-logos.sty
+++ /dev/null
@@ -1,169 +0,0 @@
-%% Paket fuer Logos
-%%
-%% This is file `dtk-logos.sty',
-%%
-%% LaTeX Class for ``Die TeXnische Komoedie''.
-%%
-%% Copyright (C) 2019
-%% Herbert Voss
-%%
-%% It may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3c
-%% of this license or (at your option) any later version.
-%% The latest version of this license is in
-%%    http://www.latex-project.org/lppl.txt
-%% and version 1.3c or later is part of all distributions of LaTeX
-%% version 2005/12/01 or later.
-%
-%
-% -------------------------------------
-\ProvidesPackage{dtk-logos}[2020/02/02 v. 1.10 Dante Edition: Logos (hv)]
-%
-\newif\if@dtk@newengine \@dtk@newenginetrue 
-\RequirePackage{iftex}
-%
-\ifluatex\else\ifxetex\else\@dtk@newenginefalse\fi\fi
-%
-\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
-  \begingroup
-    \setbox\ltx@zero\hbox{T}%
-    \vbox to\ht\ltx@zero{%
-      \hbox{%
-        \ltx@ifundefined{check@mathfonts}{%
-          \csname sevenrm\endcsname
-        }{%
-          \check@mathfonts
-          \fontsize\sf@size{0pt}%
-          \math@fontsfalse\selectfont
-        }%
-        A%
-      }%
-      \vss
-    }%
-  \endgroup
-}
-
-
-\def\LaTeXTeX{\hologo{(La)TeX}}
-
-\def\AmS{\textsf{AMS}}
-\let\AMS\AmS
-%{\ifluatex\mathversion{XITS}\fi%
-%     $\mathcal{A}$\kern-.1667em\lower.5ex\hbox{$\mathcal{M}$}\kern-.125em$\mathcal{S}$}}%  $ 
-\def\amsmath{\AMS\textsf{math}}
-\def\AmSLaTeX{\mbox{\textsf{AMS}-\hologo{LaTeX}}}
-\def\AmSTeX{\mbox{\textsf{AMS}-\hologo{TeX}}}
-\def\biber{\hologo{biber}}
-\def\Biber{\Hologo{biber}}
-\def\BibTeX{\@ifnextchar8\@@BibTeX\@BibTeX}
-\def\@BibTeX{{\hologoLogoSetup{BibTeX}{variant=sc}\hologo{BibTeX}}}
-\def\BibTeXacht{{\hologoLogoSetup{BibTeX8}{variant=sc}\hologo{BibTeX8}}}
-\def\@@BibTeX8{{\hologoLogoSetup{BibTeX8}{variant=sc}\hologo{BibTeX8}}}
-\def\ConTeXt{\hologo{ConTeXt}}
-\let\context\ConTeXt
-\def\emTeX{\hologo{emTeX}}
-\def\eTeX{\hologo{eTeX}}
-\def\ExTeX{\hologo{ExTeX}}
-\def\HanTheThanh{\hologo{HanTheThanh}}
-\def\iniTeX{\hologo{iniTeX}}
-\def\KOMAScript{\hologo{KOMAScript}}
-\def\LaTeX{\hologo{LaTeX}}
-\def\LaTeXe{\hologo{LaTeX2e}}
-\def\LaTeXIII{\hologo{LaTeX3}}
-\def\LaTeXML{\hologo{LaTeXML}}
-\def\LuaLaTeX{\hologo{LuaLaTeX}}
-\let\lualatex\LuaLaTeX
-\def\LuaTeX{\hologo{LuaTeX}}
-\let\luatex\LuaTeX
-\def\LyX{\hologo{LyX}}
-\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
-\def\MiKTeX{\hologo{MiKTeX}}
-\def\NTS{\hologo{NTS}}
-\def\OzMF{\hologo{OzMF}}
-\def\OzMP{\hologo{OzMP}}
-\def\OzTeX{\hologo{OzTeX}}
-\def\OzTtH{\hologo{OzTtH}}
-\def\PCTeX{\hologo{PCTeX}}
-\def\pdfTeX{\hologo{pdfTeX}}
-\let\pdftex\pdfTeX
-\def\pdfLaTeX{\hologo{pdfLaTeX}}
-\let\pdflatex\pdfLaTeX
-\def\PiC{\hologo{PiC}}
-\def\PiCTeX{\hologo{PiCTeX}}
-\def\plainTeX{\hologo{plainTeX}}
-\def\PostScript{PostScript}
-\let\PS\PostScript
-\def\SageTeX{\hologo{SageTeX}}
-\def\SLiTeX{\hologo{SLiTeX}}
-\def\teTeX{\hologo{teTeX}}
-\def\TeXivht{\hologo{TeX4ht}}
-\def\TTH{\hologo{TTH}}
-\def\virTeX{\hologo{virTeX}}
-\def\VTeX{\hologo{VTeX}}
-\def\XeLaTeX{\hologo{XeLaTeX}}
-\def\XeTeX{\hologo{XeTeX}}
-%%
-%
-\newcommand\BibTool{\textsc{Bib\hskip-.1em
-        T\hskip-.15emo\hskip-.05emo\hskip-.05eml}\xspace}
-\def\tikz{\textsf{Ti\textit{k}Z}}
-\def\ALEPH{\ensuremath{\aleph}}
-\let\TikZ\tikz
-
-\providecommand\eV{e.V\kern-0.18em\@ifnextchar.{}{.}\kern0.18em}
-\providecommand\dante{\mbox{DANTE~\eV}}
-\providecommand\Dante{DANTE,
-  Deutschsprachige Anwendervereinigung \TeX~\eV}
-\providecommand\DTK{Die \TeX\-ni\-sche Ko\-m{\"o}\-die}
-\providecommand\PS{Post\-Script}
-\providecommand\TUG{\TeX{} Users Group}
-\providecommand\TUGboat{\textsl{TUGboat}}
-\let\DANTE\dantelogo
-\def\pgf/tikz{\textsf{pgf/Ti\textit{k}Z}}
-\def\pgftikz{\textsf{pgf/Ti\textit{k}Z}}
-\def\TeXLive{\TeX{}Live\xspace}
-
-\def\BibLaTeX{Bib\hologo{LaTeX}}
-\let\biblatex\BibLaTeX
-\def\CTAN{\texttt{CTAN}\xspace}
-
-\def\PSTricks{\textsf{PSTricks}\xspace}
-\let\pstricks\PSTricks
-
-\if@dtk@newengine
-  \newfontfamily\dtk@LinWikipedia{Linux Libertine O}%
-  \def\WikipediA{{\dtk@LinWikipedia\char"E02F\textsc{ikipediA}}} % hexadezimal
-\else
-  \def\WikipediA{WikipediA}%
-\fi
-\let\wikipedia\WikipediA
-%
-\def\macOS{\textsf{macOS}\xspace}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/dtk/dtk.cls b/Master/texmf-dist/tex/latex/dtk/dtk.cls
index ee4b788cefc..714e1ee2cbe 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-2020
+%% Copyright (C) 2015-2021
 %% Rolf Niepraschk, Herbert Voss
 %%
 %% It may be distributed and/or modified under the
@@ -28,8 +28,8 @@
 \HyphSubstIfExists{german-x-latest}{%
   \HyphSubstLet{german}{german-x-latest}}{}
 
-\def\DTKversion{2.08h}
-\def\DTKversiondate{2019/12/04}
+\def\DTKversion{2.08j}
+\def\DTKversiondate{2021/07/04}
 \ProvidesClass{dtk}[\DTKversiondate v\DTKversion dtk documentclass (RN)]
 
 \@ifpackagelater{iftex}{2019/10/24}{% 
@@ -165,7 +165,7 @@
 \setlength\intextsep{6.0pt plus .5pt minus .5pt} 
 
 \setcounter{secnumdepth}{\numexpr\partnumdepth-1\relax}
-\setcounter{tocdepth}{\chapternumdepth}
+\ifDTK@Author@\else\setcounter{tocdepth}{\chapternumdepth}\fi
 
 \@fptop=\z@
 \renewcommand\topfraction{.9}
@@ -270,7 +270,8 @@
 \g@addto@macro\bibsetup{\RaggedRight}
 
 %\RequirePackage{etex} % ???
-\RequirePackage{ragged2e,dtk-logos}
+\RequirePackage{ragged2e}
+\RequirePackage{hvlogos}
 
 \renewcommand\title[2][]{%
   \gdef\@title{#2}%
diff --git a/Master/texmf-dist/tex/latex/dtk/dtk.dbx b/Master/texmf-dist/tex/latex/dtk/dtk.dbx
new file mode 100644
index 00000000000..48d9ecf2b39
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/dtk/dtk.dbx
@@ -0,0 +1,29 @@
+%% Copyright 2020 Herbert Voß
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%%   http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%% 
+%%
+
+\ProvidesFile{dtk.dbx}[2020/01/12 0.01 dtk bibliography style data model]
+\RequireBiber[3]
+
+\DeclareDatamodelEntrytypes{ctan}
+
+\DeclareDatamodelEntryfields[ctan]{
+  title,
+  author,
+  version,
+  url,
+  urldate,
+  note,
+}
+
+%\DeclareDatamodelConstant[type=list]{nameparts}{prefix,family,suffix,given,trueprefix,truefamily,truesuffix,truegiven} 
\ No newline at end of file