summaryrefslogtreecommitdiff
path: root/usergrps
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2023-07-30 03:01:36 +0000
committerNorbert Preining <norbert@preining.info>2023-07-30 03:01:36 +0000
commit595d37aac232836c0519c45f2078c5272122eb32 (patch)
treecdcd8c0137be4d4cc892a7d8b2fffefe1b9f7382 /usergrps
parent68c7c6f998e30e40017dae0faded16f93773c786 (diff)
CTAN sync 202307300301
Diffstat (limited to 'usergrps')
-rw-r--r--usergrps/dante/dtk/doc/beispiel.pdfbin75511 -> 75603 bytes
-rw-r--r--usergrps/dante/dtk/doc/beispiel.tex2
-rw-r--r--usergrps/dante/dtk/dtk-fonts.clo (renamed from usergrps/dante/dtk/dtk-new-engines.clo)0
-rw-r--r--usergrps/dante/dtk/dtk-full.clo32
-rw-r--r--usergrps/dante/dtk/dtk-old-engines.clo45
-rw-r--r--usergrps/dante/dtk/dtk.cls50
6 files changed, 35 insertions, 94 deletions
diff --git a/usergrps/dante/dtk/doc/beispiel.pdf b/usergrps/dante/dtk/doc/beispiel.pdf
index 6f58f231cb..29a0bb33f0 100644
--- a/usergrps/dante/dtk/doc/beispiel.pdf
+++ b/usergrps/dante/dtk/doc/beispiel.pdf
Binary files differ
diff --git a/usergrps/dante/dtk/doc/beispiel.tex b/usergrps/dante/dtk/doc/beispiel.tex
index 20a6021875..e4d31a57a6 100644
--- a/usergrps/dante/dtk/doc/beispiel.tex
+++ b/usergrps/dante/dtk/doc/beispiel.tex
@@ -6,7 +6,7 @@
\let\Package\texttt
\begin{document}
-\title{Die \texttt{dtk}-Klasse, Version \DTKversion -- \DTKversiondate}
+\title{Die \texttt{dtk}-Klasse, Version \DTKversion\ -- \DTKversiondate}
\Author{Mustermann}{Max}%
{Dorfstraße~1\\
14129 Berlin\\
diff --git a/usergrps/dante/dtk/dtk-new-engines.clo b/usergrps/dante/dtk/dtk-fonts.clo
index be315410da..be315410da 100644
--- a/usergrps/dante/dtk/dtk-new-engines.clo
+++ b/usergrps/dante/dtk/dtk-fonts.clo
diff --git a/usergrps/dante/dtk/dtk-full.clo b/usergrps/dante/dtk/dtk-full.clo
index 914798bb03..df80821bd3 100644
--- a/usergrps/dante/dtk/dtk-full.clo
+++ b/usergrps/dante/dtk/dtk-full.clo
@@ -14,7 +14,7 @@
%% version 2005/12/01 or later.
\ProvidesFile{dtk-full.clo}%
- [2022/05/08 v0.1p dtk class options for full mode (RN)]
+ [2023/07/25 v0.1r dtk class options for full mode (RN)]
\@ifclasslater{scrbook}{2015/09/29}{}{%
\ClassError{dtk}{%
@@ -25,9 +25,6 @@
}
\RequirePackage{xcolor,multicol,graphicx,tabularx}
-\edef\pdfcreationdate{\pdfcreationdate}
-% weil datetime2 inkompatible zu LuaTeX 0.95/luatex85,
-% standardmäßig ungünstige Defionition in luatex85
\RequirePackage[showzone=false]{datetime2}
\newcounter{dtk@example@counter}
@@ -123,18 +120,19 @@
\AtEndDocument{\immediate\closeout\user@bibs\relax}%
}
\renewcommand*\printbibliography[1][]{}%
- \newcommand*\DTK@addbibresource[2][]{%
+ \newcommand*\DTK@addbibresource[2][]{% Variant for recording run
\@ifundefined{BIBS:\the\c@artcounter}{%
- \def\DTK@tempa{}%
+ \def\DTK@tempa{}% no comma
\expandafter\let\csname BIBS:\the\c@artcounter\endcsname\@empty
- }{\def\DTK@tempa{,}}%
- % Collect all bib filenames as comma list for \newrefsection
+ }{\def\DTK@tempa{,}}% comma
+ % Collect all bib filenames in macro \BIBS:? as comma list for \newrefsection
\expandafter\g@addto@macro\csname BIBS:\the\c@artcounter
\expandafter\endcsname\expandafter{\DTK@tempa #2}%
+ % Write current (local) \addbibresource command to file `dtk-userbibs.tex'
\immediate\write\user@bibs{%
\string\addbibresource\ifx\relax#1\relax\else[#1]\fi{#2}%
\@percentchar\space \DTK@local@inputname
- }%
+ }%
}%
\def\DTK@@usepackage#1#2[#3]{%
\edef\@tempb{\zap@space#2 \@empty}%
@@ -192,7 +190,7 @@
\AtBeginDocument{\DTK@backside}%
\def\DTK@@usepackage#1#2[#3]{}%
\def\DTK@@RequirePackage#1#2[#3]{}%
- \newcommand*\DTK@addbibresource[2][]{}%
+ \newcommand*\DTK@addbibresource[2][]{}% Variant for the document run
\newcommand*\ORIG@printbibliography{}
\let\ORIG@printbibliography=\printbibliography
\renewcommand*\printbibliography[1][]{\ORIG@printbibliography[heading=dtk]%
@@ -276,7 +274,18 @@
\c@table=\z@
\c@equation=\z@
\ifDTKrecord
- \gdef\document{\endgroup\endinput}%
+ \gdef\document{%
+ % Write current macro definition of \BIBS:? (complete bibfile list)
+ % to file `dtk-userbibs.tex'
+ \@ifundefined{BIBS:\the\c@artcounter}{}{%
+ \immediate\write\user@bibs{%
+ \string\@namedef{BIBS:\the\c@artcounter}%
+ {\@nameuse{BIBS:\the\c@artcounter}}%
+ \@percentchar\space\DTK@local@inputname
+ }%
+ }%
+ \endgroup\endinput
+ }%
\global\let\blx@warn@auxlist=\relax
\else
\renewenvironment{document}{%
@@ -285,6 +294,7 @@
\DTK@embedded@enddocumenthook\mbox{}\endinput
}%
\fi
+ % Macro \BIBS:? may have been defined by `dtk-userbibs.tex'
\@ifundefined{BIBS:\the\c@artcounter}{%
\input{\DTK@local@inputname}%
}{%
diff --git a/usergrps/dante/dtk/dtk-old-engines.clo b/usergrps/dante/dtk/dtk-old-engines.clo
deleted file mode 100644
index 6398c7b5a1..0000000000
--- a/usergrps/dante/dtk/dtk-old-engines.clo
+++ /dev/null
@@ -1,45 +0,0 @@
-
-%% This is file `dtk-old-engines.clo',
-%%
-%% LaTeX Class for ``Die TeXnische Komoedie''.
-%%
-%% Copyright (C) 2015-
-%% Rolf Niepraschk, 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.
-
-\ProvidesFile{dtk-old-engines.clo}%
- [2021/11/12 v0.1f dtk class options for pdfTeX/TeX+dvips (RN)]
-
-\typeout{OLD-ENGINE}
-
-\RequirePackage[utf8]{inputenc}
-\RequirePackage[T1]{fontenc}
-\RequirePackage{textcomp}
-\DeclareUnicodeCharacter{20AC}{\DTK@euro}
-
-\InputIfFileExists{dtk-fonts.cfg}{%
- \typeout{*************************************^^J%
- * File `dtk-fonts.cfg' used.^^J%
- *************************************}%
-}{%
- \RequirePackage[lining=true]{libertine}%
- \def\DTKrmFontName{Linux Libertine}%
- \def\DTKsfFontName{Linux Biolinum}%
- \RequirePackage[scale=0.833,ttdefault=true]{AnonymousPro}%
- \def\DTKttFontName{Anonymous Pro}%
- %\RequirePackage[scaled=0.83]{DejaVuSansMono}%
- %\def\DTKttFontName{DejaVu Mono}%
- %
- \def\DTKmathFontName{Computer Modern Math}% ???
-}
-
-\babelprovide[hyphenrules=ngerman-x-latest]{ngerman}
-
-\endinput
diff --git a/usergrps/dante/dtk/dtk.cls b/usergrps/dante/dtk/dtk.cls
index b2be0e2af8..032ed50ee1 100644
--- a/usergrps/dante/dtk/dtk.cls
+++ b/usergrps/dante/dtk/dtk.cls
@@ -23,35 +23,19 @@
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
-\def\DTKversion{2.08n}
-\def\DTKversiondate{2022/12/14}
+\def\DTKversion{2.10a}
+\def\DTKversiondate{2023/07/28}
\ProvidesClass{dtk}[\DTKversiondate v\DTKversion dtk documentclass (RN)]
-\@ifpackagelater{iftex}{2019/10/24}{%
- \RequirePackage{ifxetex,ifluatex,ifpdf,ifvtex}
-}{%
- \RequirePackage{iftex}
-}
-\RequirePackage{luatex85}
-
-\newcommand*\DTK@engine{}
+\RequirePackage{iftex}
-\ifluatex
- \def\DTK@engine{4}% LuaTeX
-\else
- \ifxetex
- \def\DTK@engine{3}% XeTeX
- \else
- \ifpdf
- \def\DTK@engine{2}% pdfTeX
- \else
- \ifvtex
- \def\DTK@engine{1}% VTeX
- \else
- \def\DTK@engine{0}% TeX+dvips
- \fi
- \fi
- \fi
+\ifluatex\else
+ \ClassError{dtk}{%
+ LuaLaTeX ist erforderlich.
+ }{%
+ Kompiliere mit LuaLaTeX.
+ }
+ \expandafter\stop
\fi
\RequirePackage{xkeyval}
@@ -119,6 +103,8 @@
\RequirePackage{scrhack}% Andere Pakete KOMA-Script-freundlich machen
+\RequirePackage[final]{listings}
+
\RequirePackage{hvextern}
% http://www.komascript.de/release3.18
@@ -189,11 +175,7 @@
\newcommand*\DTKttFontName{} \let\DTKttFontName=\DTK@FontNameMissing
\newcommand*\DTKmathFontName{} \let\DTKmathFontName=\DTK@FontNameMissing
-\ifnum\DTK@engine < 3 %
- \input{dtk-old-engines.clo}% pdfTeX oder TeX+dvips oder VTeX
-\else
- \input{dtk-new-engines.clo}% LuaTeX oder XeTeX
-\fi
+\input{dtk-fonts.clo}
\@ifpackagelater{csquotes}{2018/02/11}{}{%
\def\@inpenc@undefined{}
@@ -367,10 +349,6 @@
\colorlet{DTKlstNumbers}{black}
\newcommand*\DTKlstKeywordfont{\bfseries}
-%\RequirePackage[final]{listings}
-\PassOptionsToPackage{final}{listings}
-\RequirePackage{lstautogobble}
-
\@ifundefined{ifDTKrecord}{\newif\ifDTKrecord \DTKrecordfalse}{}
\newcommand*\address[3]{%
@@ -515,7 +493,6 @@
,commentstyle=\DTKlstfont
,basewidth=0.55em
,keepspaces
-,autogobble=false
,backgroundcolor=\color{DTKlstBackground}
,numbers=none
,frame=single
@@ -551,7 +528,6 @@
,emphstyle=\DTK@lst@colorbox{DTKlstBackground!70!-DTKlstBackground}%
%,prebreak=
,postbreak=\mbox{$\hookrightarrow$}
-,autogobble=true
}
\lstdefinestyle{number}{% TODO: Evtl. doch besser Zeilennummern ganz ausrücken?