summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-05-08 22:29:51 +0000
committerKarl Berry <karl@freefriends.org>2016-05-08 22:29:51 +0000
commit8ef99cf53c6d05b5d88a4e8fe8a00222d358659e (patch)
tree2af75c64ce8d512629dad81f57f73bfad1a15082
parente746dae5fade789c4be1073331a088f8ed9fe05d (diff)
dtk (8may16)
git-svn-id: svn://tug.org/texlive/trunk@40958 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/dtk/doc/beispiel.pdfbin88955 -> 90223 bytes
-rw-r--r--Master/texmf-dist/tex/latex/dtk/dtk-full.clo31
-rw-r--r--Master/texmf-dist/tex/latex/dtk/dtk-url.sty15
-rw-r--r--Master/texmf-dist/tex/latex/dtk/dtk.bbx8
-rw-r--r--Master/texmf-dist/tex/latex/dtk/dtk.cls4
5 files changed, 34 insertions, 24 deletions
diff --git a/Master/texmf-dist/doc/latex/dtk/doc/beispiel.pdf b/Master/texmf-dist/doc/latex/dtk/doc/beispiel.pdf
index 1ba5b8ca9fb..0d042bddce6 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-full.clo b/Master/texmf-dist/tex/latex/dtk/dtk-full.clo
index 27079527d6d..d9764fa1276 100644
--- a/Master/texmf-dist/tex/latex/dtk/dtk-full.clo
+++ b/Master/texmf-dist/tex/latex/dtk/dtk-full.clo
@@ -2,7 +2,7 @@
%%
%% LaTeX Class for ``Die TeXnische Komoedie''.
%%
-%% Copyright (C) 2015-
+%% Copyright (C) 2015-
%% Rolf Niepraschk, Herbert Voss
%%
%% It may be distributed and/or modified under the
@@ -14,7 +14,7 @@
%% version 2005/12/01 or later.
\ProvidesFile{dtk-full.clo}%
- [2015/10/14 v0.1e dtk class options for full mode (RN)]
+ [2016/04/12 v0.1f dtk class options for full mode (RN)]
\@ifclasslater{scrbook}{2015/09/29}{}{%
\ClassError{dtk2}{%
@@ -25,7 +25,16 @@
}
\RequirePackage{xcolor,multicol,graphicx,tabularx}
-\RequirePackage[showzone=false]{datetime2}
+\ifx\pdfvariable\undefined % altes LuaTeX oder kein LuaTeX
+ \usepackage[showzone=false]{datetime2}
+\else
+ \RequirePackage{luatex85}
+ \let\SAVE@pdfcreationdate=\pdfcreationdate
+ \edef\pdfcreationdate{\pdfcreationdate}
+ % v1.4 ist inkompatibel mit LuaTeX 0.95/luatex85
+ \usepackage[showzone=false]{datetime2}
+ \let\pdfcreationdate=\SAVE@pdfcreationdate
+\fi
\newcommand*\AutorenListenName{Autoren/Organisatoren} % auch »Stichwortverzeichnis«?
\newcommand*\DTK@fancyJournalname{%
@@ -391,21 +400,21 @@
}
\newcommand\rolllabel[1]{\hspace\labelsep \textbf{#1}\hfill}
-\RequirePackage{filecontents}
+\RequirePackage{shellesc,filecontents}
%% [#1]: Optionen für \includegraphics [#2]: Compiler #3: Dateiname
%%
\def\ErstelleGrafik{\@ifnextchar[{\ErstelleGrafik@i}{\ErstelleGrafik@i[]}}
\def\ErstelleGrafik@i[#1]{\@ifnextchar[{\ErstelleGrafik@ii[#1]}{%
\ErstelleGrafik@ii[#1][xelatex]}}%
\def\ErstelleGrafik@ii[#1][#2]#3{%
- \gdef\dtk@dateiname{#3}%
- \gdef\dtk@grafikOptionen{#1}%
- \ifx\relax#2\relax\gdef\dtk@compiler{xelatex}\else\gdef\dtk@compiler{#2}\fi
- \@nameuse{filecontents*}{#3.tex}}
+ \gdef\DTK@dateiname{#3}%
+ \gdef\DTK@grafikOptionen{#1}%
+ \ifx\relax#2\relax\gdef\DTK@compiler{xelatex}\else\gdef\DTK@compiler{#2}\fi
+ \@nameuse{filecontents*}{#3.tex}}%
\def\endErstelleGrafik{%
- \@nameuse{endfilecontents*}
- \immediate\write18{\dtk@compiler\space\dtk@dateiname}%
- \expandafter\includegraphics\expandafter[\dtk@grafikOptionen]{\dtk@dateiname}%
+ \@nameuse{endfilecontents*}%
+ \ShellEscape{\DTK@compiler\space\DTK@dateiname}%
+ \expandafter\includegraphics\expandafter[\DTK@grafikOptionen]{\DTK@dateiname}%
}
\providecommand*\InfoTeX{???}
diff --git a/Master/texmf-dist/tex/latex/dtk/dtk-url.sty b/Master/texmf-dist/tex/latex/dtk/dtk-url.sty
index 69e5b05717a..9b6e1a44c3c 100644
--- a/Master/texmf-dist/tex/latex/dtk/dtk-url.sty
+++ b/Master/texmf-dist/tex/latex/dtk/dtk-url.sty
@@ -14,7 +14,7 @@
%% version 2005/12/01 or later.
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{dtk-url}[2015/09/25 v1.1 Urls for DTK (HO)]
+\ProvidesPackage{dtk-url}[2016/04/23 v1.2 Urls for DTK (HO,hv)]
%% 1.1 hv
\RequirePackage{url}[2006/04/12]
@@ -76,10 +76,11 @@
\fi
% Ensure that the needed primitives are enabled in LuaTeX
-\RequirePackage{ifluatex}
-\ifluatex
- \directlua{tex.enableprimitives('',{'pdfstartlink','pdfendlink'})}%
-\fi
+%% No more needed, we use the new macros hv 2016-04-23
+%\RequirePackage{ifluatex}
+%\ifluatex
+% \directlua{tex.enableprimitives('',{'pdfstartlink','pdfendlink'})}%
+%\fi
\let\DTK@UrlLinkPrefix\@empty
\ifDTK@Url@
@@ -97,7 +98,7 @@
}%
\x
\DTK@UrlWrite{\DTK@UrlType}{\DTK@Raw}%
- \pdfstartlink attr{%
+ \pdfextension startlink attr{%
/H/I%
/C[1 0 0]% red
/Border[1 0 0]%
@@ -112,7 +113,7 @@
>>%
}%
#1%
- \pdfendlink
+ \pdfextension endlink
}%
% Implement writing of file \DTK@UrlFile
diff --git a/Master/texmf-dist/tex/latex/dtk/dtk.bbx b/Master/texmf-dist/tex/latex/dtk/dtk.bbx
index 970fe5eff9b..d8c7f730d89 100644
--- a/Master/texmf-dist/tex/latex/dtk/dtk.bbx
+++ b/Master/texmf-dist/tex/latex/dtk/dtk.bbx
@@ -8,7 +8,7 @@
%% See http://www.latex-project.org/lppl.txt
%% ---------------------------------------------------------------
%%
-\ProvidesFile{dtk.bbx}[2016/04/02 v0.10 biblatex bibliography style for DTK]
+\ProvidesFile{dtk.bbx}[2016/04/04 v0.11 biblatex bibliography style for DTK]
% Load the standard style to avoid copy-pasting unnecessary material
\RequireBibliographyStyle{chem-angew}
@@ -25,7 +25,7 @@
{
doi = true ,
eprint = true ,
- firstinits = false,
+ giveninits = false,
isbn = true ,
maxnames = 3 ,
minnames = 1 ,
@@ -92,8 +92,8 @@
\DeclareNameFormat{default}{%
\nameparts{#1}%
- \usebibmacro{name:first-last}{\namepartfamily}{\namepartgiven}{\namepartprefix}{\namepartsuffix}%
-% \usebibmacro{name:first-last}\namepartfamily}{\namepartgiveni}{\namepartprefix}{\namepartsuffix}
+ \usebibmacro{name:given-family}{\namepartfamily}{\namepartgiven}{\namepartprefix}{\namepartsuffix}%
+% \usebibmacro{name:given-family}\namepartfamily}{\namepartgiveni}{\namepartprefix}{\namepartsuffix}
\usebibmacro{name:andothers}}
\newbibmacro*{bbx:dashcheck}[2]{%
diff --git a/Master/texmf-dist/tex/latex/dtk/dtk.cls b/Master/texmf-dist/tex/latex/dtk/dtk.cls
index 9522f4a24e2..6d03cc94bc5 100644
--- a/Master/texmf-dist/tex/latex/dtk/dtk.cls
+++ b/Master/texmf-dist/tex/latex/dtk/dtk.cls
@@ -21,8 +21,8 @@
\HyphSubstIfExists{german-x-latest}{%
\HyphSubstLet{german}{german-x-latest}}{}
-\def\DTKversion{2.02}
-\def\DTKversiondate{2016/02/15}
+\def\DTKversion{2.04}
+\def\DTKversiondate{2016/05/08}
\ProvidesClass{dtk}[\DTKversiondate\ v\DTKversion\ dtk documentclass (RN)]
\RequirePackage{ifxetex,ifluatex,ifpdf,ifvtex}