diff options
Diffstat (limited to 'Master/texmf-dist/tex')
| -rw-r--r-- | Master/texmf-dist/tex/latex/dtk/dtk-full.clo | 91 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/dtk/dtk-logos.sty | 4 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/dtk/dtk-new-engines.clo | 33 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/dtk/dtk-old-engines.clo | 5 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/dtk/dtk-url.sty | 4 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/dtk/dtk.bbx | 6 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/dtk/dtk.cls | 59 |
7 files changed, 129 insertions, 73 deletions
diff --git a/Master/texmf-dist/tex/latex/dtk/dtk-full.clo b/Master/texmf-dist/tex/latex/dtk/dtk-full.clo index d9764fa1276..dbc5febb551 100644 --- a/Master/texmf-dist/tex/latex/dtk/dtk-full.clo +++ b/Master/texmf-dist/tex/latex/dtk/dtk-full.clo @@ -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@pdfcreationdate=\pdfcreationdate - \edef\pdfcreationdate{\pdfcreationdate} - % v1.4 ist inkompatibel mit LuaTeX 0.95/luatex85 - \usepackage[showzone=false]{datetime2} - \let\pdfcreationdate=\SAVE@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@fancyJournalname{% @@ -61,14 +55,6 @@ \edef\DTKcorrVersion{\noexpand\normalfont \noexpand\fcolorbox{black}{DTK@marker}{Korrekturversion: \DTMnow}}% \overfullrule=5pt % - \RequirePackage[pagewise]{lineno}% - \linenumbers - \linenumbersep=.8ex % - \def\linenumberfont{\normalfont\footnotesize\ttfamily}% - \def\thelinenumber{% - \fboxsep=.3ex % - \fcolorbox{black}{DTK@marker}{\@arabic{\c@page}-\@arabic{\c@linenumber}}% - }% \fi \@ifundefined{@LN}{\let\@LN=\@gobbletwo}{}% @@ -149,7 +135,7 @@ \newcommand*\DTK@addbibresource[2][]{}% \newcommand*\ORIG@printbibliography{} \let\ORIG@printbibliography=\printbibliography - \renewcommand*\printbibliography[1][]{\DTK@bib@true}% + \renewcommand*\printbibliography[1][]{\ORIG@printbibliography[heading=dtk]} \RequirePackage[split,protected]{splitidx} \makeindex \newindex[\AutorenListenName]{autoren}% \newcommand*\AutorenListe{% @@ -160,16 +146,22 @@ \printindex[autoren]% \endgroup }% + \RequirePackage{trimspaces} \newcommand\DTK@Author@list[3]{% TODO: Auch "!" und "|" maskieren? \begingroup + \setbox\DTK@tempbox\hbox{\trim@spaces{#3}}% \def\Email##1{\escape@atsign##1\relax}% herausziehen?! \def\escape@atsign##1@##2\relax{% \noexpand\Email\string{##1\string"@##2\string}% - } + }% \makeatletter - \scantokens{\protected@edef\x{% - \noexpand\sindex[autoren]{#2#1@#1 #2!#3}}}% - \x + \ifdim\wd\DTK@tempbox>\z@ + \scantokens{\protected@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@Author=\DTK@Author@list @@ -204,7 +196,6 @@ \let\documentclass=\DTK@documentclass \let\usepackage=\DTK@usepackage \let\addbibresource=\DTK@addbibresource - \DTK@bib@false \c@footnote=\z@ \c@lstlisting=\z@ \c@figure=\z@ @@ -214,7 +205,6 @@ \ifDTKrecord\endgroup\expandafter\endinput\fi \DTK@embedded@begindocumenthook\ignorespaces }{% - \ifDTK@bib@\ORIG@printbibliography[heading=dtk]\fi \DTK@embedded@enddocumenthook\endinput }% \refsection[DTK\the\c@refsection]% @@ -299,6 +289,38 @@ }]{dtk-title-content} \DeclareNewPageStyleByLayers{dtk-title}{dtk-title-content} +\ifDTK@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@tempdimc{\formatPosNumber{9}}% + \DTK@tempdimc=1.5\DTK@tempdimc + \DTK@tempdimd=0pt % + \DTK@tempdimb=#2 % + \@tempcnta=0 % + \@whiledim \dimexpr\DTK@tempdimd+.5\DTK@tempdimc < \textheight\do{% + \advance\@tempcnta 1 % + \DTK@tempdimb=\dimexpr\DTK@tempdimb-\DTK@tempdimc + \DTK@tempdimd=\dimexpr\DTK@tempdimd+\DTK@tempdimc + \put(#1,\DTK@tempdimb){\formatPosNumber{\@tempcnta}}% + }% + } + \DeclareNewLayer[textarea,background,mode=picture,contents={% + \begingroup + \ttfamily\scriptsize\itshape + \settowidth\DTK@tempdimc{\formatPosNumber{99}}% + \DTK@tempdima=\dimexpr-.5\textwidth-\DTK@tempdimc-.8em % + \putC{% + \makePosNumbers{\DTK@tempdima}{.5\textheight}% + }% + \endgroup + }]{dtk-line-positions} + \AddLayersToPageStyle{scrheadings}{dtk-line-positions} + \AddLayersToPageStyle{plain.scrheadings}{dtk-line-positions} +\fi + \deftriplepagestyle{dtk-toc}% {}{\DTK@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@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}}% -\def\endErstelleGrafik{% - \@nameuse{endfilecontents*}% - \ShellEscape{\DTK@compiler\space\DTK@dateiname}% - \expandafter\includegraphics\expandafter[\DTK@grafikOptionen]{\DTK@dateiname}% -} - \providecommand*\InfoTeX{???} \newcommand*\MitarbeiterListe{} diff --git a/Master/texmf-dist/tex/latex/dtk/dtk-logos.sty b/Master/texmf-dist/tex/latex/dtk/dtk-logos.sty index db843c30a3d..c5b989d0eb3 100644 --- a/Master/texmf-dist/tex/latex/dtk/dtk-logos.sty +++ b/Master/texmf-dist/tex/latex/dtk/dtk-logos.sty @@ -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}} diff --git a/Master/texmf-dist/tex/latex/dtk/dtk-new-engines.clo b/Master/texmf-dist/tex/latex/dtk/dtk-new-engines.clo index fc0dd472c7f..9a10f99ab1c 100644 --- a/Master/texmf-dist/tex/latex/dtk/dtk-new-engines.clo +++ b/Master/texmf-dist/tex/latex/dtk/dtk-new-engines.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,13 +14,28 @@ %% 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} \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@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 diff --git a/Master/texmf-dist/tex/latex/dtk/dtk-old-engines.clo b/Master/texmf-dist/tex/latex/dtk/dtk-old-engines.clo index 2b2db4bd9c7..83780fb7bd1 100644 --- a/Master/texmf-dist/tex/latex/dtk/dtk-old-engines.clo +++ b/Master/texmf-dist/tex/latex/dtk/dtk-old-engines.clo @@ -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,13 +15,14 @@ %% 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} \RequirePackage[utf8]{inputenc} \RequirePackage[T1]{fontenc} \RequirePackage{textcomp} +\DeclareUnicodeCharacter{20AC}{\DTK@euro} \InputIfFileExists{dtk-fonts.cfg}{% \typeout{*************************************^^J% diff --git a/Master/texmf-dist/tex/latex/dtk/dtk-url.sty b/Master/texmf-dist/tex/latex/dtk/dtk-url.sty index 9b6e1a44c3c..d14ceb4f147 100644 --- a/Master/texmf-dist/tex/latex/dtk/dtk-url.sty +++ b/Master/texmf-dist/tex/latex/dtk/dtk-url.sty @@ -98,7 +98,7 @@ }% \x \DTK@UrlWrite{\DTK@UrlType}{\DTK@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@UrlFile diff --git a/Master/texmf-dist/tex/latex/dtk/dtk.bbx b/Master/texmf-dist/tex/latex/dtk/dtk.bbx index d8c7f730d89..bff4c92c484 100644 --- a/Master/texmf-dist/tex/latex/dtk/dtk.bbx +++ b/Master/texmf-dist/tex/latex/dtk/dtk.bbx @@ -18,8 +18,8 @@ \DeclareBibliographyOption{dashed}[true]{% \ifstrequal{#1}{true} {\ExecuteBibliographyOptions{pagetracker}% - \renewbibmacro*{bbx:savehash}{\savefield{fullhash}{\bbx@lasthash}}} - {\renewbibmacro*{bbx:savehash}{}}} + \newbibmacro*{bbx:savehash}{\savefield{fullhash}{\bbx@lasthash}}} + {\newbibmacro*{bbx:savehash}{}}} \ExecuteBibliographyOptions { @@ -199,4 +199,4 @@ %% %% -\endinput
\ No newline at end of file +\endinput diff --git a/Master/texmf-dist/tex/latex/dtk/dtk.cls b/Master/texmf-dist/tex/latex/dtk/dtk.cls index 6d03cc94bc5..d9505b315ea 100644 --- a/Master/texmf-dist/tex/latex/dtk/dtk.cls +++ b/Master/texmf-dist/tex/latex/dtk/dtk.cls @@ -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@engine{} \ifluatex @@ -49,10 +49,14 @@ \RequirePackage{xkeyval} \newif\ifDTK@Author@ \DTK@Author@true -\newif\ifDTK@bib@ \DTK@bib@false \newif\ifDTKcolor \DTKcolorfalse % "@" ? \newif\ifDTK@korr@ \DTK@korr@false +\newlength\DTK@tempdima +\newlength\DTK@tempdimb +\newlength\DTK@tempdimc +\newlength\DTK@tempdimd + \newcommand*\journalname{Die \protect\TeX{}nische Kom\"odie} \newcommand*\DTKyear{} \edef\DTKyear{\the\year} @@ -86,6 +90,8 @@ \newcommand*\DTK@tempb{} \newcommand*\DTK@tempc{} +\newsavebox\DTK@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@update\default@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@scale@to@rm[2]{% + \begingroup + \fontsize{10}{0}\usefont{\encodingdefault}{\rmdefault}{m}{n}% + #1% + \xdef\eurosym@@Scale{% + \strip@pt + \dimexpr 1pt * \@tempdima / \dimexpr#2pt\relax }% + \ClassInfo{dtk}{The eurosym family is scaled by \eurosym@@Scale}% + \endgroup + } + \EURO@scale@to@rm{\setbox0\hbox{C}\@tempdima=\ht0}{6.92}% matchuppercase + % Extrakt aus "eurosym.sty" + \DeclareFontFamily{U}{DTK@eurosym}{} + \DeclareFontShape{U}{DTK@eurosym}{m}{n}{ <-> s*[\eurosym@@Scale] feymr10 }{} + \DeclareFontShape{U}{DTK@eurosym}{m}{sc}{ <-> s*[\eurosym@@Scale] ssub*DTK@eurosym/m/n }{} + \DeclareFontShape{U}{DTK@eurosym}{m}{sl}{ <-> s*[\eurosym@@Scale] feymo10 }{} + \DeclareFontShape{U}{DTK@eurosym}{m}{it}{ <-> s*[\eurosym@@Scale] ssub*DTK@eurosym/m/sl }{} + \DeclareFontShape{U}{DTK@eurosym}{m}{ol}{ <-> s*[\eurosym@@Scale] feyml10 }{} + \DeclareFontShape{U}{DTK@eurosym}{bx}{n}{ <-> s*[\eurosym@@Scale] feybr10 }{} + \DeclareFontShape{U}{DTK@eurosym}{bx}{sc}{ <-> s*[\eurosym@@Scale] ssub*DTK@eurosym/bx/n }{} + \DeclareFontShape{U}{DTK@eurosym}{bx}{sl}{ <-> s*[\eurosym@@Scale] feybo10 }{} + \DeclareFontShape{U}{DTK@eurosym}{bx}{it}{ <-> s*[\eurosym@@Scale] ssub*DTK@eurosym/bx/sl }{} + \DeclareFontShape{U}{DTK@eurosym}{bx}{ol}{ <-> s*[\eurosym@@Scale] feybl10 }{} + \DeclareFontShape{U}{DTK@eurosym}{b}{n}{ <-> s*[\eurosym@@Scale] ssub*DTK@eurosym/bx/n }{} + \DeclareFontShape{U}{DTK@eurosym}{b}{sl}{ <-> s*[\eurosym@@Scale] ssub*DTK@eurosym/bx/sl }{} + \DeclareFontShape{U}{DTK@eurosym}{b}{it}{ <-> s*[\eurosym@@Scale] ssub*DTK@eurosym/bx/sl }{} + \DeclareFontShape{U}{DTK@eurosym}{b}{sc}{ <-> s*[\eurosym@@Scale] ssub*DTK@eurosym/bx/n }{} + \DeclareFontShape{U}{DTK@eurosym}{b}{ol}{ <-> s*[\eurosym@@Scale] ssub*DTK@eurosym/bx/ol }{} + \DeclareRobustCommand\DTK@euro{{\fontencoding{U}\fontfamily{DTK@eurosym}\selectfont{}e}} +\else + % Sobald das Paket Skalierung unterstützt + \RequirePackage[right,scaled]{eurosym} +%%%\DeclareRobustCommand\DTK@euro{\scalebox{0.9}{\officialeuro}} +\fi + +\let\texteuro=\DTK@euro + \ifxetex\else \RequirePackage[% ,protrusion=true @@ -197,6 +243,7 @@ ,backend=biber ]{biblatex} +\let\ORIGprintbibliography\printbibliography \g@addto@macro\bibsetup{\RaggedRight} %\RequirePackage{etex} % ??? |