texlive[42678] Master/texmf-dist: dtk (11dec16)
commits+karl at tug.org
commits+karl at tug.org
Sun Dec 11 23:29:44 CET 2016
Revision: 42678
http://tug.org/svn/texlive?view=revision&revision=42678
Author: karl
Date: 2016-12-11 23:29:43 +0100 (Sun, 11 Dec 2016)
Log Message:
-----------
dtk (11dec16)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/dtk/doc/beispiel.pdf
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-new-engines.clo
trunk/Master/texmf-dist/tex/latex/dtk/dtk-old-engines.clo
trunk/Master/texmf-dist/tex/latex/dtk/dtk-url.sty
trunk/Master/texmf-dist/tex/latex/dtk/dtk.bbx
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/tex/latex/dtk/dtk-full.clo
===================================================================
--- trunk/Master/texmf-dist/tex/latex/dtk/dtk-full.clo 2016-12-11 22:29:27 UTC (rev 42677)
+++ trunk/Master/texmf-dist/tex/latex/dtk/dtk-full.clo 2016-12-11 22:29:43 UTC (rev 42678)
@@ -14,7 +14,7 @@
%% version 2005/12/01 or later.
\ProvidesFile{dtk-full.clo}%
- [2016/04/12 v0.1f dtk class options for full mode (RN)]
+ [2016/12/06 v0.1h dtk class options for full mode (RN)]
\@ifclasslater{scrbook}{2015/09/29}{}{%
\ClassError{dtk2}{%
@@ -25,16 +25,10 @@
}
\RequirePackage{xcolor,multicol,graphicx,tabularx}
-\ifx\pdfvariable\undefined % altes LuaTeX oder kein LuaTeX
- \usepackage[showzone=false]{datetime2}
-\else
- \RequirePackage{luatex85}
- \let\SAVE at pdfcreationdate=\pdfcreationdate
- \edef\pdfcreationdate{\pdfcreationdate}
- % v1.4 ist inkompatibel mit LuaTeX 0.95/luatex85
- \usepackage[showzone=false]{datetime2}
- \let\pdfcreationdate=\SAVE at pdfcreationdate
-\fi
+\edef\pdfcreationdate{\pdfcreationdate}
+% weil datetime2 inkompatible zu LuaTeX 0.95/luatex85,
+% standardmäßig ungünstige Defionition in luatex85
+\usepackage[showzone=false]{datetime2}
\newcommand*\AutorenListenName{Autoren/Organisatoren} % auch »Stichwortverzeichnis«?
\newcommand*\DTK at fancyJournalname{%
@@ -61,14 +55,6 @@
\edef\DTKcorrVersion{\noexpand\normalfont
\noexpand\fcolorbox{black}{DTK at marker}{Korrekturversion: \DTMnow}}%
\overfullrule=5pt %
- \RequirePackage[pagewise]{lineno}%
- \linenumbers
- \linenumbersep=.8ex %
- \def\linenumberfont{\normalfont\footnotesize\ttfamily}%
- \def\thelinenumber{%
- \fboxsep=.3ex %
- \fcolorbox{black}{DTK at marker}{\@arabic{\c at page}-\@arabic{\c at linenumber}}%
- }%
\fi
\@ifundefined{@LN}{\let\@LN=\@gobbletwo}{}%
@@ -149,7 +135,7 @@
\newcommand*\DTK at addbibresource[2][]{}%
\newcommand*\ORIG at printbibliography{}
\let\ORIG at printbibliography=\printbibliography
- \renewcommand*\printbibliography[1][]{\DTK at bib@true}%
+ \renewcommand*\printbibliography[1][]{\ORIG at printbibliography[heading=dtk]}
\RequirePackage[split,protected]{splitidx} \makeindex
\newindex[\AutorenListenName]{autoren}%
\newcommand*\AutorenListe{%
@@ -160,16 +146,22 @@
\printindex[autoren]%
\endgroup
}%
+ \RequirePackage{trimspaces}
\newcommand\DTK at Author@list[3]{% TODO: Auch "!" und "|" maskieren?
\begingroup
+ \setbox\DTK at tempbox\hbox{\trim at spaces{#3}}%
\def\Email##1{\escape at atsign##1\relax}% herausziehen?!
\def\escape at atsign##1@##2\relax{%
\noexpand\Email\string{##1\string"@##2\string}%
- }
+ }%
\makeatletter
- \scantokens{\protected at edef\x{%
- \noexpand\sindex[autoren]{#2#1@#1 #2!#3}}}%
- \x
+ \ifdim\wd\DTK at tempbox>\z@
+ \scantokens{\protected at edef\x{%
+ \noexpand\sindex[autoren]{#2#1@#1 #2!#3}}}%
+ \x
+ \else
+ \sindex[autoren]{#2#1@#1 #2!\textcolor{red}{\huge???}}%
+ \fi
\endgroup
}%
\let\DTK at Author=\DTK at Author@list
@@ -204,7 +196,6 @@
\let\documentclass=\DTK at documentclass
\let\usepackage=\DTK at usepackage
\let\addbibresource=\DTK at addbibresource
- \DTK at bib@false
\c at footnote=\z@
\c at lstlisting=\z@
\c at figure=\z@
@@ -214,7 +205,6 @@
\ifDTKrecord\endgroup\expandafter\endinput\fi
\DTK at embedded@begindocumenthook\ignorespaces
}{%
- \ifDTK at bib@\ORIG at printbibliography[heading=dtk]\fi
\DTK at embedded@enddocumenthook\endinput
}%
\refsection[DTK\the\c at refsection]%
@@ -299,6 +289,38 @@
}]{dtk-title-content}
\DeclareNewPageStyleByLayers{dtk-title}{dtk-title-content}
+\ifDTK at korr@% === Positionsnummern am linken Rand ===
+ \newcommand*\formatPosNumber[1]{%
+ \fboxsep=.2em %
+ \fbox{\ifnum\arabic{page}<10 0\fi\arabic{page}-\ifnum#1<10 0\fi\@arabic{#1}}%
+ }
+ \newcommand\makePosNumbers[2]{%
+ \settoheight\DTK at tempdimc{\formatPosNumber{9}}%
+ \DTK at tempdimc=1.5\DTK at tempdimc
+ \DTK at tempdimd=0pt %
+ \DTK at tempdimb=#2 %
+ \@tempcnta=0 %
+ \@whiledim \dimexpr\DTK at tempdimd+.5\DTK at tempdimc < \textheight\do{%
+ \advance\@tempcnta 1 %
+ \DTK at tempdimb=\dimexpr\DTK at tempdimb-\DTK at tempdimc
+ \DTK at tempdimd=\dimexpr\DTK at tempdimd+\DTK at tempdimc
+ \put(#1,\DTK at tempdimb){\formatPosNumber{\@tempcnta}}%
+ }%
+ }
+ \DeclareNewLayer[textarea,background,mode=picture,contents={%
+ \begingroup
+ \ttfamily\scriptsize\itshape
+ \settowidth\DTK at tempdimc{\formatPosNumber{99}}%
+ \DTK at tempdima=\dimexpr-.5\textwidth-\DTK at tempdimc-.8em %
+ \putC{%
+ \makePosNumbers{\DTK at tempdima}{.5\textheight}%
+ }%
+ \endgroup
+ }]{dtk-line-positions}
+ \AddLayersToPageStyle{scrheadings}{dtk-line-positions}
+ \AddLayersToPageStyle{plain.scrheadings}{dtk-line-positions}
+\fi
+
\deftriplepagestyle{dtk-toc}%
{}{\DTK at toc@head}{}%
{}{\hfill\normalsize\DTKcorrVersion\hfill\null}{}
@@ -400,23 +422,6 @@
}
\newcommand\rolllabel[1]{\hspace\labelsep \textbf{#1}\hfill}
-\RequirePackage{shellesc,filecontents}
-%% [#1]: Optionen für \includegraphics [#2]: Compiler #3: Dateiname
-%%
-\def\ErstelleGrafik{\@ifnextchar[{\ErstelleGrafik at i}{\ErstelleGrafik at i[]}}
-\def\ErstelleGrafik at i[#1]{\@ifnextchar[{\ErstelleGrafik at ii[#1]}{%
- \ErstelleGrafik at ii[#1][xelatex]}}%
-\def\ErstelleGrafik at ii[#1][#2]#3{%
- \gdef\DTK at dateiname{#3}%
- \gdef\DTK at grafikOptionen{#1}%
- \ifx\relax#2\relax\gdef\DTK at compiler{xelatex}\else\gdef\DTK at compiler{#2}\fi
- \@nameuse{filecontents*}{#3.tex}}%
-\def\endErstelleGrafik{%
- \@nameuse{endfilecontents*}%
- \ShellEscape{\DTK at compiler\space\DTK at dateiname}%
- \expandafter\includegraphics\expandafter[\DTK at grafikOptionen]{\DTK at dateiname}%
-}
-
\providecommand*\InfoTeX{???}
\newcommand*\MitarbeiterListe{}
Modified: trunk/Master/texmf-dist/tex/latex/dtk/dtk-logos.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/dtk/dtk-logos.sty 2016-12-11 22:29:27 UTC (rev 42677)
+++ trunk/Master/texmf-dist/tex/latex/dtk/dtk-logos.sty 2016-12-11 22:29:43 UTC (rev 42678)
@@ -4,7 +4,7 @@
%%
%% LaTeX Class for ``Die TeXnische Komoedie''.
%%
-%% Copyright (C) 2015-
+%% Copyright (C) 2015-
%% Herbert Voss
%%
%% It may be distributed and/or modified under the
@@ -85,6 +85,8 @@
\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}}
Modified: trunk/Master/texmf-dist/tex/latex/dtk/dtk-new-engines.clo
===================================================================
--- trunk/Master/texmf-dist/tex/latex/dtk/dtk-new-engines.clo 2016-12-11 22:29:27 UTC (rev 42677)
+++ trunk/Master/texmf-dist/tex/latex/dtk/dtk-new-engines.clo 2016-12-11 22:29:43 UTC (rev 42678)
@@ -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-new-engines.clo}%
- [2015/10/30 v0.1f dtk class options for LuaTeX and XeTeX (RN)]
+ [2016/05/17 v0.1f dtk class options for LuaTeX and XeTeX (RN)]
\typeout{NEW-ENGINE}
@@ -21,6 +21,21 @@
\RequirePackage{fontspec}
\RequirePackage{unicode-math}
+\ifluatex
+ \RequirePackage[ngerman,noftligs]{selnolig}
+ \InputIfFileExists{dtk.nolig}{%
+ \typeout{*************************************^^J%
+ * File `dtk.nolig' used.^^J%
+ *************************************}%
+ }{}
+\fi
+
+\RequirePackage{newunicodechar}
+\newunicodechar{^^^^202f}{\,}% 'NARROW NO-BREAK SPACE'
+\newunicodechar{^^^^2009}{\,\hspace{0pt}}% 'THIN SPACE'
+\newunicodechar{^^^^00ad}{\-}% 'SOFT HYPHEN'
+\newunicodechar{^^^^20ac}{\DTK at euro}% 'EURO SIGN'
+
\InputIfFileExists{dtk-fonts.cfg}{%
\typeout{*************************************^^J%
* File `dtk-fonts.cfg' used.^^J%
@@ -37,18 +52,4 @@
%\def\DTKttFontName{DejaVu Mono}%
}
-\ifluatex
- \RequirePackage[ngerman,noftligs]{selnolig}
- \InputIfFileExists{dtk.nolig}{%
- \typeout{*************************************^^J%
- * File `dtk.nolig' used.^^J%
- *************************************}%
- }{}
-\fi
-
-\RequirePackage{newunicodechar}
-\newunicodechar{^^^^202f}{\,}% 'NARROW NO-BREAK SPACE'
-\newunicodechar{^^^^2009}{\,\hspace{0pt}}% 'THIN SPACE'
-\newunicodechar{^^^^00ad}{\-}% 'SOFT HYPHEN'
-
\endinput
Modified: trunk/Master/texmf-dist/tex/latex/dtk/dtk-old-engines.clo
===================================================================
--- trunk/Master/texmf-dist/tex/latex/dtk/dtk-old-engines.clo 2016-12-11 22:29:27 UTC (rev 42677)
+++ trunk/Master/texmf-dist/tex/latex/dtk/dtk-old-engines.clo 2016-12-11 22:29:43 UTC (rev 42678)
@@ -3,7 +3,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
@@ -15,7 +15,7 @@
%% version 2005/12/01 or later.
\ProvidesFile{dtk-old-engines.clo}%
- [2015/10/30 v0.1d dtk class options for pdfTeX/TeX+dvips (RN)]
+ [2016/05/11 v0.1e dtk class options for pdfTeX/TeX+dvips (RN)]
\typeout{OLD-ENGINE}
@@ -22,6 +22,7 @@
\RequirePackage[utf8]{inputenc}
\RequirePackage[T1]{fontenc}
\RequirePackage{textcomp}
+\DeclareUnicodeCharacter{20AC}{\DTK at euro}
\InputIfFileExists{dtk-fonts.cfg}{%
\typeout{*************************************^^J%
Modified: trunk/Master/texmf-dist/tex/latex/dtk/dtk-url.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/dtk/dtk-url.sty 2016-12-11 22:29:27 UTC (rev 42677)
+++ trunk/Master/texmf-dist/tex/latex/dtk/dtk-url.sty 2016-12-11 22:29:43 UTC (rev 42678)
@@ -98,7 +98,7 @@
}%
\x
\DTK at UrlWrite{\DTK at UrlType}{\DTK at Raw}%
- \pdfextension startlink attr{%
+ \pdfstartlink attr{%
/H/I%
/C[1 0 0]% red
/Border[1 0 0]%
@@ -113,7 +113,7 @@
>>%
}%
#1%
- \pdfextension endlink
+ \pdfendlink
}%
% Implement writing of file \DTK at UrlFile
Modified: trunk/Master/texmf-dist/tex/latex/dtk/dtk.bbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/dtk/dtk.bbx 2016-12-11 22:29:27 UTC (rev 42677)
+++ trunk/Master/texmf-dist/tex/latex/dtk/dtk.bbx 2016-12-11 22:29:43 UTC (rev 42678)
@@ -18,8 +18,8 @@
\DeclareBibliographyOption{dashed}[true]{%
\ifstrequal{#1}{true}
{\ExecuteBibliographyOptions{pagetracker}%
- \renewbibmacro*{bbx:savehash}{\savefield{fullhash}{\bbx at lasthash}}}
- {\renewbibmacro*{bbx:savehash}{}}}
+ \newbibmacro*{bbx:savehash}{\savefield{fullhash}{\bbx at lasthash}}}
+ {\newbibmacro*{bbx:savehash}{}}}
\ExecuteBibliographyOptions
{
@@ -199,4 +199,4 @@
%%
%%
-\endinput
\ No newline at end of file
+\endinput
Modified: trunk/Master/texmf-dist/tex/latex/dtk/dtk.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/dtk/dtk.cls 2016-12-11 22:29:27 UTC (rev 42677)
+++ trunk/Master/texmf-dist/tex/latex/dtk/dtk.cls 2016-12-11 22:29:43 UTC (rev 42678)
@@ -21,11 +21,11 @@
\HyphSubstIfExists{german-x-latest}{%
\HyphSubstLet{german}{german-x-latest}}{}
-\def\DTKversion{2.04}
-\def\DTKversiondate{2016/05/08}
-\ProvidesClass{dtk}[\DTKversiondate\ v\DTKversion\ dtk documentclass (RN)]
+\def\DTKversion{2.06}
+\def\DTKversiondate{2016/12/06}
+\ProvidesClass{dtk}[\DTKversiondate v\DTKversion dtk documentclass (RN)]
-\RequirePackage{ifxetex,ifluatex,ifpdf,ifvtex}
+\RequirePackage{ifxetex,ifluatex,ifpdf,ifvtex,luatex85}
\newcommand*\DTK at engine{}
\ifluatex
@@ -49,10 +49,14 @@
\RequirePackage{xkeyval}
\newif\ifDTK at Author@ \DTK at Author@true
-\newif\ifDTK at bib@ \DTK at bib@false
\newif\ifDTKcolor \DTKcolorfalse % "@" ?
\newif\ifDTK at korr@ \DTK at korr@false
+\newlength\DTK at tempdima
+\newlength\DTK at tempdimb
+\newlength\DTK at tempdimc
+\newlength\DTK at tempdimd
+
\newcommand*\journalname{Die \protect\TeX{}nische Kom\"odie}
\newcommand*\DTKyear{} \edef\DTKyear{\the\year}
@@ -86,6 +90,8 @@
\newcommand*\DTK at tempb{}
\newcommand*\DTK at tempc{}
+\newsavebox\DTK at tempbox
+
\PassOptionsToPackage{hyphens}{url}
\RequirePackage{dtk-url}
@@ -101,6 +107,8 @@
\RequirePackage{scrhack}% Andere Pakete KOMA-Script-freundlich machen
+\RequirePackage{dtk-extern}
+
% http://www.komascript.de/release3.18
\ifstr{\KOMAScriptVersion}{2015/07/02 v3.18 KOMA-Script}{%
\ifx\par at update\default at par@update\else
@@ -172,11 +180,49 @@
\input{dtk-new-engines.clo}% LuaTeX oder XeTeX
\fi
-\RequirePackage[autostyle=true,babel=once,german=guillemets,maxlevel=3]{csquotes}%
+\RequirePackage[autostyle=true,german=guillemets,maxlevel=3]{csquotes}%
\MakeAutoQuote{»}{«}
\defineshorthand{"`}{\openautoquote}%
\defineshorthand{"'}{\closeautoquote}%
+\iftrue
+ \newcommand*\EURO at scale@to at rm[2]{%
+ \begingroup
+ \fontsize{10}{0}\usefont{\encodingdefault}{\rmdefault}{m}{n}%
+ #1%
+ \xdef\eurosym@@Scale{%
+ \strip at pt
+ \dimexpr 1pt * \@tempdima / \dimexpr#2pt\relax }%
+ \ClassInfo{dtk}{The eurosym family is scaled by \eurosym@@Scale}%
+ \endgroup
+ }
+ \EURO at scale@to at rm{\setbox0\hbox{C}\@tempdima=\ht0}{6.92}% matchuppercase
+ % Extrakt aus "eurosym.sty"
+ \DeclareFontFamily{U}{DTK at eurosym}{}
+ \DeclareFontShape{U}{DTK at eurosym}{m}{n}{ <-> s*[\eurosym@@Scale] feymr10 }{}
+ \DeclareFontShape{U}{DTK at eurosym}{m}{sc}{ <-> s*[\eurosym@@Scale] ssub*DTK at eurosym/m/n }{}
+ \DeclareFontShape{U}{DTK at eurosym}{m}{sl}{ <-> s*[\eurosym@@Scale] feymo10 }{}
+ \DeclareFontShape{U}{DTK at eurosym}{m}{it}{ <-> s*[\eurosym@@Scale] ssub*DTK at eurosym/m/sl }{}
+ \DeclareFontShape{U}{DTK at eurosym}{m}{ol}{ <-> s*[\eurosym@@Scale] feyml10 }{}
+ \DeclareFontShape{U}{DTK at eurosym}{bx}{n}{ <-> s*[\eurosym@@Scale] feybr10 }{}
+ \DeclareFontShape{U}{DTK at eurosym}{bx}{sc}{ <-> s*[\eurosym@@Scale] ssub*DTK at eurosym/bx/n }{}
+ \DeclareFontShape{U}{DTK at eurosym}{bx}{sl}{ <-> s*[\eurosym@@Scale] feybo10 }{}
+ \DeclareFontShape{U}{DTK at eurosym}{bx}{it}{ <-> s*[\eurosym@@Scale] ssub*DTK at eurosym/bx/sl }{}
+ \DeclareFontShape{U}{DTK at eurosym}{bx}{ol}{ <-> s*[\eurosym@@Scale] feybl10 }{}
+ \DeclareFontShape{U}{DTK at eurosym}{b}{n}{ <-> s*[\eurosym@@Scale] ssub*DTK at eurosym/bx/n }{}
+ \DeclareFontShape{U}{DTK at eurosym}{b}{sl}{ <-> s*[\eurosym@@Scale] ssub*DTK at eurosym/bx/sl }{}
+ \DeclareFontShape{U}{DTK at eurosym}{b}{it}{ <-> s*[\eurosym@@Scale] ssub*DTK at eurosym/bx/sl }{}
+ \DeclareFontShape{U}{DTK at eurosym}{b}{sc}{ <-> s*[\eurosym@@Scale] ssub*DTK at eurosym/bx/n }{}
+ \DeclareFontShape{U}{DTK at eurosym}{b}{ol}{ <-> s*[\eurosym@@Scale] ssub*DTK at eurosym/bx/ol }{}
+ \DeclareRobustCommand\DTK at euro{{\fontencoding{U}\fontfamily{DTK at eurosym}\selectfont{}e}}
+\else
+ % Sobald das Paket Skalierung unterstützt
+ \RequirePackage[right,scaled]{eurosym}
+%%%\DeclareRobustCommand\DTK at euro{\scalebox{0.9}{\officialeuro}}
+\fi
+
+\let\texteuro=\DTK at euro
+
\ifxetex\else
\RequirePackage[%
,protrusion=true
@@ -197,6 +243,7 @@
,backend=biber
]{biblatex}
+\let\ORIGprintbibliography\printbibliography
\g at addto@macro\bibsetup{\RaggedRight}
%\RequirePackage{etex} % ???
More information about the tex-live-commits
mailing list