summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/dtk
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-10-28 20:59:14 +0000
committerKarl Berry <karl@freefriends.org>2019-10-28 20:59:14 +0000
commit6407c2f82ff5b36788f38da683cb9195e75508ab (patch)
tree8ca5af6c88203c01e222474cdd874b3ac8d3f0a2 /Master/texmf-dist/tex/latex/dtk
parentffd652038baef26fb84de26fce9991a02e875485 (diff)
dtk (28oct19)
git-svn-id: svn://tug.org/texlive/trunk@52556 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/dtk')
-rw-r--r--Master/texmf-dist/tex/latex/dtk/dtk-full.clo13
-rw-r--r--Master/texmf-dist/tex/latex/dtk/dtk-logos.sty11
-rw-r--r--Master/texmf-dist/tex/latex/dtk/dtk-url.sty37
-rw-r--r--Master/texmf-dist/tex/latex/dtk/dtk.cls17
4 files changed, 56 insertions, 22 deletions
diff --git a/Master/texmf-dist/tex/latex/dtk/dtk-full.clo b/Master/texmf-dist/tex/latex/dtk/dtk-full.clo
index 86e74bf3f17..e6b95b8d4e0 100644
--- a/Master/texmf-dist/tex/latex/dtk/dtk-full.clo
+++ b/Master/texmf-dist/tex/latex/dtk/dtk-full.clo
@@ -14,10 +14,10 @@
%% version 2005/12/01 or later.
\ProvidesFile{dtk-full.clo}%
- [2019/04/22 v0.1m dtk class options for full mode (RN)]
+ [2019/10/25 v0.1n dtk class options for full mode (RN)]
\@ifclasslater{scrbook}{2015/09/29}{}{%
- \ClassError{dtk2}{%
+ \ClassError{dtk}{%
Die geladene Version der Dokumentenklasse `scrbook' \MessageBreak
(\KOMAScriptVersion) ist zu alt. \MessageBreak
Gefordert ist die Version 2015/09/29 oder jünger. \MessageBreak
@@ -208,11 +208,7 @@
\noexpand\sindex[autoren]{#2#1@#1 #2!#3}}\@empty}%
\x
\else
- \ifDTK@korr@
- \sindex[autoren]{#2#1@#1 #2!\textcolor{red}{\huge???}}%
- \else
- \sindex[autoren]{#2#1@#1 #2!\relax}%
- \fi
+ \sindex[autoren]{#2#1@#1 #2!\relax}%
\fi
\endgroup
}%
@@ -244,8 +240,7 @@
\filename@parse{#1}%
\edef\jobname{\filename@base}%
\@ifundefined{filename@ext}%
- {\IfFileExists{\jobname.tex}%
- {\edef\DTK@local@inputname{\jobname.tex}}{}}%
+ {\edef\DTK@local@inputname{\filename@base.tex}}%
{\edef\DTK@local@inputname{#1}}%
\let\AtBeginDocument=\AtEmbeddedBeginDocument
\let\AtEndDocument=\AtEmbeddedEndDocument
diff --git a/Master/texmf-dist/tex/latex/dtk/dtk-logos.sty b/Master/texmf-dist/tex/latex/dtk/dtk-logos.sty
index c341cfdf6bd..73c8f31be91 100644
--- a/Master/texmf-dist/tex/latex/dtk/dtk-logos.sty
+++ b/Master/texmf-dist/tex/latex/dtk/dtk-logos.sty
@@ -17,7 +17,7 @@
%
%
% -------------------------------------
-\ProvidesPackage{dtk-logos}[2019/09/14 v. 1.08 Dante Edition: Logos (hv)]
+\ProvidesPackage{dtk-logos}[2019/10/15 v. 1.09 Dante Edition: Logos (hv)]
%
\newif\if@dtk@newengine \@dtk@newenginetrue
\RequirePackage{ifluatex,ifxetex}
@@ -55,6 +55,12 @@
\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}}
@@ -112,8 +118,6 @@
\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}
@@ -131,6 +135,7 @@
\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}}
diff --git a/Master/texmf-dist/tex/latex/dtk/dtk-url.sty b/Master/texmf-dist/tex/latex/dtk/dtk-url.sty
index 9ccccaee3bb..b4d37a4ffc8 100644
--- a/Master/texmf-dist/tex/latex/dtk/dtk-url.sty
+++ b/Master/texmf-dist/tex/latex/dtk/dtk-url.sty
@@ -2,7 +2,7 @@
%%
%% LaTeX Class for ``Die TeXnische Komoedie''.
%%
-%% Copyright (C) 2015-
+%% Copyright (C) 2015-2019
%% Rolf Niepraschk, Herbert Voss
%%
%% It may be distributed and/or modified under the
@@ -14,10 +14,22 @@
%% version 2005/12/01 or later.
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{dtk-url}[2019/07/29 v1.3 Urls for DTK (HO,hv)]
-%% 1.1, 1.2, 1.3 hv
+\ProvidesPackage{dtk-url}[2019/10/28 v1.4 Urls (qrcode) for DTK (HO,hv,rn)]
\RequirePackage{url}[2006/04/12]
+\RequirePackage{xcolor}
+\RequirePackage{xkeyval}
+
+\newlength\dtk@url@qrheight
+\newlength\dtk@url@qradjust
+\providecommand*\dtk@url@qrlevel{}
+\define@key{dtk}{qrheight}[1cm]{\setlength\dtk@url@qrheight{#1}}
+\define@key{dtk}{qradjust}[-1.5\normalbaselineskip]{\setlength\dtk@url@qradjust{#1}}
+\define@key{dtk}{qrcolor}[black]{\colorlet{dtk@url@qrcolor}{#1}}
+\define@key{dtk}{qrlevel}[M]{\renewcommand*\dtk@url@qrlevel{#1}}
+
+\setkeys{dtk}{qrheight,qrcolor,qradjust,qrlevel}% the default setting
+
% Konfiguration:
\newcommand*{\DTK@UrlSetup}{\urlstyle{tt}}
@@ -180,4 +192,23 @@
{\@percentchar#1}%
}%
}
+
+\RequirePackage{qrcode}
+
+\newcommand*\qrurl{%
+ \providecommand*\qr@blank{0}
+ \@ifstar{\@tempswafalse}{\@tempswatrue}%
+ \qr@url
+}
+\newcommand*\qr@url[2][]{%
+ \begingroup
+ \if$#1$\else\setkeys{dtk}{#1}\fi
+ \qrset{height=\dtk@url@qrheight,level=\dtk@url@qrlevel}%
+ \if@tempswa\url{#2}\fi
+ \edef\reserved@a{\noexpand\marginnote{\noexpand\color{dtk@url@qrcolor}\noexpand\qrcode{%
+ \detokenize\expandafter{#2}}}[\dtk@url@qradjust]}%
+ \reserved@a
+ \endgroup
+}
+
\endinput
diff --git a/Master/texmf-dist/tex/latex/dtk/dtk.cls b/Master/texmf-dist/tex/latex/dtk/dtk.cls
index e140cb5e37b..09990a71e11 100644
--- a/Master/texmf-dist/tex/latex/dtk/dtk.cls
+++ b/Master/texmf-dist/tex/latex/dtk/dtk.cls
@@ -28,8 +28,8 @@
\HyphSubstIfExists{german-x-latest}{%
\HyphSubstLet{german}{german-x-latest}}{}
-\def\DTKversion{2.08d}
-\def\DTKversiondate{2019/10/15}
+\def\DTKversion{2.08e}
+\def\DTKversiondate{2019/10/28}
\ProvidesClass{dtk}[\DTKversiondate v\DTKversion dtk documentclass (RN)]
\RequirePackage{ifxetex,ifluatex,ifpdf,ifvtex,luatex85}
@@ -155,6 +155,9 @@
\widowpenalty = 10000 %
\raggedbottom
+\setlength\textfloatsep{10.0pt plus 1pt minus 1pt}
+\setlength\intextsep{6.0pt plus .5pt minus .5pt}
+
\setcounter{secnumdepth}{\numexpr\partnumdepth-1\relax}
\setcounter{tocdepth}{\chapternumdepth}
@@ -166,13 +169,13 @@
\RequirePackage[english,main=ngerman]{babel}
\defineshorthand{"|}{%
- \ClassError{dtk2}{%
+ \ClassError{dtk}{%
Shorthand `\string"|' wird nicht unterstützt! Entferne `\string"|'%
}{}%
}
\newcommand*\DTK@FontNameMissing{%
- \ClassError{dtk2}{%
+ \ClassError{dtk}{%
Eines der Makros `\string\DTKrmFontName', `\string\DTKsfFontName',
\MessageBreak
`\string\DTKttFontName' oder `\string\DTKmathFontName'
@@ -368,13 +371,13 @@
\@ifundefined{ifDTKrecord}{\newif\ifDTKrecord \DTKrecordfalse}{}
\newcommand*\address[3]{%
- \ClassError{dtk2}{%
+ \ClassError{dtk}{%
Das Makro \string\address\space existiert nicht mehr!\MessageBreak
Nimm stattdessen \string\Author%
\string{Vorn.\string}\string{Nachn.\string}\string{Adr.\string}}{}%
}%
\def\author#1{%
- \ClassError{dtk2}{%
+ \ClassError{dtk}{%
Das Makro \string\author\space existiert nicht mehr!\MessageBreak
Nimm stattdessen \string\Author%
\string{Vorn.\string}\string{Nachn.\string}\string{Adr.\string}}{}%
@@ -404,7 +407,7 @@
\AfterEndPreamble{% "etoolbox"
\def\bibliography#1{%
- \ClassError{dtk2}{%
+ \ClassError{dtk}{%
Das Makro `\string\bibliography' wird nicht unterstützt!\MessageBreak
Verwende stattdessen `\string\addbibresource\string{#1.bib\string}'
\MessageBreak