texlive[52556] Master/texmf-dist: dtk (28oct19)
commits+karl at tug.org
commits+karl at tug.org
Mon Oct 28 21:59:15 CET 2019
Revision: 52556
http://tug.org/svn/texlive?view=revision&revision=52556
Author: karl
Date: 2019-10-28 21:59:14 +0100 (Mon, 28 Oct 2019)
Log Message:
-----------
dtk (28oct19)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/dtk/doc/beispiel.pdf
trunk/Master/texmf-dist/doc/latex/dtk/doc/beispiel.tex
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-url.sty
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/beispiel.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/dtk/doc/beispiel.tex 2019-10-28 20:58:49 UTC (rev 52555)
+++ trunk/Master/texmf-dist/doc/latex/dtk/doc/beispiel.tex 2019-10-28 20:59:14 UTC (rev 52556)
@@ -55,9 +55,20 @@
\textsf{Ubuntu} wird in serifenloser Schrift gesetzt.
Weitere Informationen für Autoren findet man im DTK-Wiki:
-\url{http://projekte.dante.de/DanteFAQ/WebHome}.
+\qrurl{http://projekte.dante.de/DanteFAQ/WebHome}.
+Fehlen Informationen, so schreibe man eine kurze Zeile
+an die Redaktion, die jederzeit behilflich ist.
+\begin{verbatim}
+\textsf{Ubuntu} wird in serifenloser Schrift gesetzt.
+Weitere Informationen für Autoren findet man im DTK-Wiki:
+\qrurl{http://projekte.dante.de/DanteFAQ/WebHome}.
+Fehlen Informationen, so schreibe man eine kurze Zeile
+an die Redaktion, die jederzeit behilflich ist.
+\end{verbatim}
+
+
\section{Listen}
\begin{itemize}
\item Bei \Environment{itemize} werden
Modified: trunk/Master/texmf-dist/tex/latex/dtk/dtk-full.clo
===================================================================
--- trunk/Master/texmf-dist/tex/latex/dtk/dtk-full.clo 2019-10-28 20:58:49 UTC (rev 52555)
+++ trunk/Master/texmf-dist/tex/latex/dtk/dtk-full.clo 2019-10-28 20:59:14 UTC (rev 52556)
@@ -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 at 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 at parse{#1}%
\edef\jobname{\filename at base}%
\@ifundefined{filename at ext}%
- {\IfFileExists{\jobname.tex}%
- {\edef\DTK at local@inputname{\jobname.tex}}{}}%
+ {\edef\DTK at local@inputname{\filename at base.tex}}%
{\edef\DTK at local@inputname{#1}}%
\let\AtBeginDocument=\AtEmbeddedBeginDocument
\let\AtEndDocument=\AtEmbeddedEndDocument
Modified: trunk/Master/texmf-dist/tex/latex/dtk/dtk-logos.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/dtk/dtk-logos.sty 2019-10-28 20:58:49 UTC (rev 52555)
+++ trunk/Master/texmf-dist/tex/latex/dtk/dtk-logos.sty 2019-10-28 20:59:14 UTC (rev 52556)
@@ -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 at dtk@newengine \@dtk at 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}}
Modified: trunk/Master/texmf-dist/tex/latex/dtk/dtk-url.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/dtk/dtk-url.sty 2019-10-28 20:58:49 UTC (rev 52555)
+++ trunk/Master/texmf-dist/tex/latex/dtk/dtk-url.sty 2019-10-28 20:59:14 UTC (rev 52556)
@@ -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,11 +14,23 @@
%% 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 at url@qrheight
+\newlength\dtk at url@qradjust
+\providecommand*\dtk at url@qrlevel{}
+\define at key{dtk}{qrheight}[1cm]{\setlength\dtk at url@qrheight{#1}}
+\define at key{dtk}{qradjust}[-1.5\normalbaselineskip]{\setlength\dtk at url@qradjust{#1}}
+\define at key{dtk}{qrcolor}[black]{\colorlet{dtk at url@qrcolor}{#1}}
+\define at key{dtk}{qrlevel}[M]{\renewcommand*\dtk at url@qrlevel{#1}}
+
+\setkeys{dtk}{qrheight,qrcolor,qradjust,qrlevel}% the default setting
+
+
% Konfiguration:
\newcommand*{\DTK at UrlSetup}{\urlstyle{tt}}
\newcommand*{\DTK at UrlCtanSetup}{}
@@ -180,4 +192,23 @@
{\@percentchar#1}%
}%
}
+
+\RequirePackage{qrcode}
+
+\newcommand*\qrurl{%
+ \providecommand*\qr at blank{0}
+ \@ifstar{\@tempswafalse}{\@tempswatrue}%
+ \qr at url
+}
+\newcommand*\qr at url[2][]{%
+ \begingroup
+ \if$#1$\else\setkeys{dtk}{#1}\fi
+ \qrset{height=\dtk at url@qrheight,level=\dtk at url@qrlevel}%
+ \if at tempswa\url{#2}\fi
+ \edef\reserved at a{\noexpand\marginnote{\noexpand\color{dtk at url@qrcolor}\noexpand\qrcode{%
+ \detokenize\expandafter{#2}}}[\dtk at url@qradjust]}%
+ \reserved at a
+ \endgroup
+}
+
\endinput
Modified: trunk/Master/texmf-dist/tex/latex/dtk/dtk.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/dtk/dtk.cls 2019-10-28 20:58:49 UTC (rev 52555)
+++ trunk/Master/texmf-dist/tex/latex/dtk/dtk.cls 2019-10-28 20:59:14 UTC (rev 52556)
@@ -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 at 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
More information about the tex-live-commits
mailing list