diff options
author | Karl Berry <karl@freefriends.org> | 2015-02-24 23:11:19 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2015-02-24 23:11:19 +0000 |
commit | 1c213966cd11f3051008400dd35517dc22c1e600 (patch) | |
tree | 3526dfd139da242f739ebe6c8898f8b319025d0c /Master/texmf-dist/tex/latex/dtk | |
parent | bb90ccbe99f68557999a05d43c8e6d70ec790399 (diff) |
dtk (24feb15)
git-svn-id: svn://tug.org/texlive/trunk@36372 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/dtk')
-rw-r--r-- | Master/texmf-dist/tex/latex/dtk/dtk.clo | 352 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/dtk/dtk.cls | 44 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/dtk/dtk12.clo | 348 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/dtk/dtklogos.sty | 124 |
4 files changed, 378 insertions, 490 deletions
diff --git a/Master/texmf-dist/tex/latex/dtk/dtk.clo b/Master/texmf-dist/tex/latex/dtk/dtk.clo index b3d35d25b7b..5efab642371 100644 --- a/Master/texmf-dist/tex/latex/dtk/dtk.clo +++ b/Master/texmf-dist/tex/latex/dtk/dtk.clo @@ -78,7 +78,8 @@ \newcommand\Small{\fontsize{9}{9.2}\selectfont} \ifluatex -\newcommand*\DTKlstfont{\Small\ttfamily\addfontfeature{FakeStretch=0.9}}%\lsstyle} +\newcommand*\DTKlstfont{\Small\ttfamily%\addfontfeature{FakeStretch=0.9} +}%\lsstyle} \lstdefinestyle{DTKlstBase}{% basicstyle=\DTKlstfont, basewidth=0.55em, @@ -90,7 +91,7 @@ columns=fullflexible, tabsize=2, frame=single, - extendedchars=true, +% extendedchars=true, showspaces=false, showstringspaces=false, breaklines=true, @@ -205,6 +206,353 @@ }% \expandafter\endgroup\x +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +\newsavebox\tempbox + +\RequirePackage{ifthen} + +\newlength\fullwidth +\newlength\marginwidth +\setlength\fullwidth{\dimexpr\textwidth +\marginparwidth}% -4mm}% wegen Anschnitt +%\marginparsep ist schon 7pt +%\setlength\fullwidth{\dimexpr\textwidth +\marginparsep +\marginparwidth } +%\setlength\marginwidth{\dimexpr\fullwidth -\textwidth} +\setlength\marginwidth{\dimexpr\fullwidth +\marginparsep -\textwidth} + + +\newlength\de@Width +\newlength\de@sepWidth\de@sepWidth=3mm +\newlength\de@Indent\de@Indent=\fullwidth + +\def\Table{\@ifnextchar[\Table@i{\Table@i[]}} +\def\Table@i[#1]{\@ifnextchar[{\Table@ii[#1]}{\Table@ii[#1][\fullwidth]}} +\def\Table@ii[#1][#2]#3{% #1:TOC #2:width #3:caption + \def\de@OptCaption{#1}% + \setlength\de@Width{#2}\addtolength\de@Width{-\de@sepWidth}% + \setlength\de@Indent{#2}\addtolength\de@Indent{-\textwidth}% + \def\de@Caption{#3}% + \begin{lrbox}{\tempbox}} +\def\endTable{% + \end{lrbox}\begin{table}[!htb]% + \Label{\thetable:WideTable}% + \abovecaptionskip=0pt\belowcaptionskip=0pt + \ifthenelse{\isodd{\Pageref{\thetable:WideTable}}}% + {\minipage{\de@Width}\vspace{0pt}\minipage[t]{\wd\tempbox}\vspace{0pt} + \usebox\tempbox\endminipage\kern\de@sepWidth% + \minipage[t]{\dimexpr\de@Width-\wd\tempbox\relax}\vspace{0pt}5 + \ifx\de@OptCaption\@empty\caption{\de@Caption}\else\caption[\de@OptCaption]{\de@Caption}\fi% + \endminipage\endminipage}% + {\ifdim\de@Width>\textwidth\hspace*{-\de@Indent}\fi\vspace{0pt}\minipage{\de@Width}\vspace{0pt}% + \minipage[t]{\dimexpr\de@Width-\wd\tempbox\relax}\vspace{0pt}% + \ifx\de@OptCaption\@empty\caption{\de@Caption}\else\caption[\de@OptCaption]{\de@Caption}\fi% + \endminipage\kern\de@sepWidth% + \minipage[t]{\wd\tempbox}\vspace{0pt}\usebox\tempbox\endminipage\endminipage}% + \end{table}} +% +\def\Figure{\@ifnextchar[\Figure@i{\Figure@i[]}} +\def\Figure@i[#1]{\@ifnextchar[{\Figure@ii[#1]}{\Figure@ii[#1][\fullwidth]}} +\def\Figure@ii[#1][#2]#3{% + \def\OptCaption{#1}% + \setlength\de@Width{#2}\addtolength\de@Width{-\de@sepWidth}% + \setlength\de@Indent{#2}\addtolength\de@Indent{-\textwidth}% + \def\DefaultCaption{#3}% + \begin{lrbox}{\tempbox}} +\def\endFigure{% + \end{lrbox}\begin{figure}[!htb]% + \Label{\thefigure:WideFigure}% + \abovecaptionskip=0pt\belowcaptionskip=0pt + \ifthenelse{\isodd{\Pageref{\thefigure:WideFigure}}}% + {\minipage{\de@Width}\minipage[b]{\wd\tempbox} + \usebox\tempbox\endminipage\kern\de@sepWidth% + \minipage[b]{\dimexpr\de@Width-\wd\tempbox\relax}% + \ifx\OptCaption\@empty\caption{\DefaultCaption}\else\caption[\OptCaption]{\DefaultCaption}\fi% + \endminipage\endminipage}% + {\ifdim\de@Width>\textwidth \hspace*{-\de@Indent}\fi\minipage{\de@Width}% + \minipage[b]{\dimexpr\de@Width-\wd\tempbox\relax}% + \ifx\OptCaption\@empty\caption{\DefaultCaption}\else\caption[\OptCaption]{\DefaultCaption}\fi% + \endminipage\kern\de@sepWidth% + \minipage[b]{\wd\tempbox}\usebox\tempbox\endminipage\endminipage}% + \Label{\thefigure:WideFigure}% + \end{figure}} + +% +\IfFileExists{paralist.sty}{% +\RequirePackage[neverdecrease]{paralist} + \let\itemize\compactitem + \let\enditemize\endcompactitem + \let\enumerate\compactenum + \let\endenumerate\endcompactenum + \let\description\compactdesc + \let\enddescription\endcompactdesc + \pltopsep=\medskipamount +% \plitemsep=\smallskipamount + \plitemsep=1pt +% \plparsep=\smallskipamount + \plparsep=1pt +}{} + +\RequirePackage{hyphsubst}% +\HyphSubstIfExists{ngerman-x-latest}{% + \HyphSubstLet{ngerman}{ngerman-x-latest}}{} +\HyphSubstIfExists{german-x-latest}{% + \HyphSubstLet{german}{german-x-latest}}{} + +\RequirePackage{accsupp}% Heiko +\providecommand\isbn[1]{} +\renewcommand*\isbn[1]{% + ISBN:~% + \BeginAccSupp{method=plain,ActualText=\RemoveHyphen{#1}}% + #1% + \EndAccSupp{}% +} +\newcommand*{\RemoveHyphen}[1]{\@RemoveHyphen#1-\@nil} +\def\@RemoveHyphen#1-#2\@nil{% + #1% + \ifx\\#2\\% + \expandafter\@gobble + \else + \expandafter\@firstofone + \fi + {% + \@RemoveHyphen#2\@nil + }% +} +\def\CoverArt@strip@no#1/#2;{#1/\kern-4pt#2} +% +% 2011-04-10 -- RN (von KOMA-Script: scrkfont.dtx) + +\providecommand*{\changefontsizes}[2][1.2\@tempdima]{% + \@defaultunits\@tempdima#2pt\relax\@nnil + \setlength{\@tempdimc}{\@tempdima}% + \addtolength{\@tempdimc}{-10\p@}% + \edef\@ptsize{\strip@pt\@tempdimc}% + \@defaultunits\@tempdimb#1pt\relax\@nnil + \setlength{\@tempdimc}{\dimexpr (100\@tempdimb / \@tempdima * \p@)}% + \edef\@tempb{\the\@tempdimc}% + \setlength{\@tempdimc}{\@tempdima}% + \def\@tempa##1##2##3##4##5\@nnil{\def##1{##2.##3##4}}% + \expandafter\@tempa\expandafter\@tempb\@tempb\@nnil% + \setlength{\abovedisplayskip}{% + \@tempdima \@plus .25\@tempdima \@minus .58\@tempdima}% + \setlength{\abovedisplayshortskip}{\z@ \@plus .25\@tempdima}% + \setlength{\belowdisplayskip}{\abovedisplayskip}% + \setlength{\belowdisplayshortskip}{% + .55\@tempdima \@plus .3\@tempdima \@minus .25\@tempdima}% + \edef\normalsize{% + \noexpand\@setfontsize\noexpand\normalsize + {\the\@tempdima}{\the\@tempdimb}% + \abovedisplayskip \the\abovedisplayskip + \abovedisplayshortskip \the\abovedisplayshortskip + \belowdisplayskip \the\belowdisplayskip + \belowdisplayshortskip \the\belowdisplayshortskip + \let\noexpand\@listi\noexpand\@listI + }% + \setlength{\@tempdima}{0.9125\@tempdimc}% + \setlength{\@tempdimb}{\@tempb\@tempdima}% + \setlength{\abovedisplayskip}{% + \@tempdima \@plus .25\@tempdima \@minus .58\@tempdima}% + \setlength{\abovedisplayshortskip}{\z@ \@plus .25\@tempdima}% + \setlength{\belowdisplayskip}{\abovedisplayskip}% + \setlength{\belowdisplayshortskip}{% + .55\@tempdima \@plus .3\@tempdima \@minus .25\@tempdima}% + \edef\small{% + \noexpand\@setfontsize\noexpand\small + {\the\@tempdima}{\the\@tempdimb}% + \abovedisplayskip \the\abovedisplayskip + \abovedisplayshortskip \the\abovedisplayshortskip + \belowdisplayskip \the\belowdisplayskip + \belowdisplayshortskip \the\belowdisplayshortskip + \let\noexpand\@listi\noexpand\@listi@small + }% + \setlength{\@tempdima}{.83334\@tempdimc}% + \setlength{\@tempdimb}{\@tempb\@tempdima}% + \setlength{\abovedisplayskip}{% + \@tempdima \@plus .25\@tempdima \@minus .58\@tempdima}% + \setlength{\abovedisplayshortskip}{\z@ \@plus .25\@tempdima}% + \setlength{\belowdisplayskip}{\abovedisplayskip}% + \setlength{\belowdisplayshortskip}{% + .55\@tempdima \@plus .3\@tempdima \@minus .25\@tempdima}% + \edef\footnotesize{% + \noexpand\@setfontsize\noexpand\footnotesize + {\the\@tempdima}{\the\@tempdimb}% + \abovedisplayskip \the\abovedisplayskip + \abovedisplayshortskip \the\abovedisplayshortskip + \belowdisplayskip \the\belowdisplayskip + \belowdisplayshortskip \the\belowdisplayshortskip + \let\noexpand\@listi\noexpand\@listi@footnotesize + }% + \setlength{\@tempdima}{.66667\@tempdimc}% + \setlength{\@tempdimb}{\@tempb\@tempdima}% + \edef\scriptsize{% + \noexpand\@setfontsize\noexpand\scriptsize + {\the\@tempdima}{\the\@tempdimb}% + }% + \setlength{\@tempdima}{.5\@tempdimc}% + \setlength{\@tempdimb}{\@tempb\@tempdima}% + \edef\tiny{% + \noexpand\@setfontsize\noexpand\tiny + {\the\@tempdima}{\the\@tempdimb}% + }% + \setlength{\@tempdima}{1.2\@tempdimc}% + \setlength{\@tempdimb}{\@tempb\@tempdima}% + \edef\large{% + \noexpand\@setfontsize\noexpand\large + {\the\@tempdima}{\the\@tempdimb}% + }% + \setlength{\@tempdima}{1.44\@tempdimc}% + \setlength{\@tempdimb}{\@tempb\@tempdima}% + \edef\Large{% + \noexpand\@setfontsize\noexpand\Large + {\the\@tempdima}{\the\@tempdimb}% + }% + \setlength{\@tempdima}{1.728\@tempdimc}% + \setlength{\@tempdimb}{\@tempb\@tempdima}% + \edef\LARGE{% + \noexpand\@setfontsize\noexpand\LARGE + {\the\@tempdima}{\the\@tempdimb}% + }% + \setlength{\@tempdima}{2.074\@tempdimc}% + \setlength{\@tempdimb}{\@tempb\@tempdima}% + \edef\huge{% + \noexpand\@setfontsize\noexpand\huge + {\the\@tempdima}{\the\@tempdimb}% + }% + \setlength{\@tempdima}{2.488\@tempdimc}% + \setlength{\@tempdimb}{\@tempb\@tempdima}% + \edef\Huge{% + \noexpand\@setfontsize\noexpand\Huge + {\the\@tempdima}{\the\@tempdimb}% + }% + \normalsize + \setlength{\footnotesep}{.7\@tempdimc}% + \setlength{\skip\footins}{.9\@tempdimc \@plus .3333\@tempdimc \@minus + .6\@tempdimc}% + \setlength{\floatsep}{\@tempdimc \@plus .1667\@tempdimc \@minus + .3333\@tempdimc}% + \setlength{\textfloatsep}{1.6667\@tempdimc \@plus .1667\@tempdimc \@minus + .3333\@tempdimc}% + \setlength{\intextsep}{\@tempb\@tempdimc \@plus .3333\@tempdimc \@minus + .3333\@tempdimc}% + \setlength{\dblfloatsep}{\@tempb\@tempdimc \@plus .1667\@tempdimc \@minus + .3333\@tempdimc}% + \setlength{\dbltextfloatsep}{\textfloatsep}% + \setlength{\@fptop}{0\p@ \@plus 1fil}% + \setlength{\@fpsep}{.8333\@tempdimc \@plus 2fil}% + \setlength{\@fpbot}{\@fptop}% + \setlength{\@dblfptop}{0\p@ \@plus 1fil}% + \setlength{\@dblfpsep}{.8333\@tempdimc \@plus 2fil}% + \setlength{\@dblfpbot}{\@fptop}% + \setlength{\partopsep}{.25\@tempdimc \@plus .16667\@tempdimc \@minus + .16667\@tempdimc}% + \setlength{\topsep}{.8333\@tempdimc \@plus .3333\@tempdimc \@minus + .5\@tempdimc}% + \setlength{\parsep}{.4167\@tempdimc \@plus .2083\@tempdimc \@minus \p@}% + \@tempswafalse + \begingroup + \def\@list@extra{\aftergroup\@tempswatrue}% + \csname @listi\endcsname + \endgroup + \edef\@listi{\leftmargin\leftmargini + \topsep \the\topsep + \parsep \the\parsep + \itemsep \parsep + \if@tempswa\noexpand\@list@extra\fi + }% + \let\@listI\@listi + \setlength{\topsep}{.75\@tempdimc \@plus .25\@tempdimc \@minus + .41667\@tempdimc}% + \setlength{\parsep}{.375\@tempdimc \@plus .16667\@tempdimc \@minus \p@}% + \@tempswafalse + \begingroup + \def\@list@extra{\aftergroup\@tempswatrue}% + \csname @listi\endcsname + \endgroup + \edef\@listi@small{\leftmargin\leftmargini + \topsep \the\topsep + \parsep \the\parsep + \itemsep \parsep + \if@tempswa\noexpand\@list@extra\fi + }% + \setlength{\topsep}{.5\@tempdimc \@plus .16667\@tempdimc \@minus + .16667\@tempdimc}% + \setlength{\parsep}{.25\@tempdimc \@plus .16667\@tempdimc \@minus \p@}% + \@tempswafalse + \begingroup + \def\@list@extra{\aftergroup\@tempswatrue}% + \csname @listi\endcsname + \endgroup + \edef\@listi@footnotesize{\leftmargin\leftmargini + \topsep \the\topsep + \parsep \the\parsep + \itemsep \parsep + \if@tempswa\noexpand\@list@extra\fi + }% + \setlength{\topsep}{.4167\@tempdimc \@plus .2083\@tempdimc \@minus \p@}% + \setlength{\parsep}{.2083\@tempdimc \@plus \p@ \@minus \p@}% + \@tempswafalse + \begingroup + \def\@list@extra{\aftergroup\@tempswatrue}% + \csname @listii\endcsname + \endgroup + \edef\@listii{\leftmargin\leftmarginii + \labelwidth=\dimexpr \leftmargin-\labelsep + \topsep \the\topsep + \parsep \the\parsep + \itemsep \parsep + \if@tempswa\noexpand\@list@extra\fi + }% + \setlength{\topsep}{.2083\@tempdimc \@plus \p@ \@minus \p@}% + \setlength{\parsep}{\p@ \@plus\z@ \@minus\p@}% + \@tempswafalse + \begingroup + \def\@list@extra{\aftergroup\@tempswatrue}% + \csname @listiii\endcsname + \endgroup + \edef\@listiii{\leftmargin\leftmarginiii + \labelwidth=\dimexpr \leftmargin-\labelsep + \topsep \the\topsep + \parsep \z@ + \partopsep \the\parsep + \itemsep \topsep + \if@tempswa\noexpand\@list@extra\fi + }% + \@tempswafalse + \begingroup + \def\@list@extra{\aftergroup\@tempswatrue}% + \csname @listiv\endcsname + \endgroup + \edef\@listiv{\leftmargin\leftmarginiv + \labelwidth=\dimexpr \leftmargin-\labelsep + \if@tempswa\noexpand\@list@extra\fi + }% + \@tempswafalse + \begingroup + \def\@list@extra{\aftergroup\@tempswatrue}% + \csname @listv\endcsname + \endgroup + \edef\@listv{\leftmargin\leftmarginv + \labelwidth=\dimexpr \leftmargin-\labelsep + \if@tempswa\noexpand\@list@extra\fi + }% + \@tempswafalse + \begingroup + \def\@list@extra{\aftergroup\@tempswatrue}% + \csname @listvi\endcsname + \endgroup + \edef\@listvi{\leftmargin\leftmarginvi + \labelwidth=\dimexpr \leftmargin-\labelsep + \if@tempswa\noexpand\@list@extra\fi + }% + \@listi + \setlength{\@tempdimb}{\@tempb\@tempdima}% + \setlength{\@tempdima}{\dimexpr \@tempdimb-\@tempdimc}% + \setlength\intextsep{\@tempdimb \@plus.2\@tempdima \@minus.2\@tempdima}% + \setlength\dblfloatsep\intextsep + \setlength\partopsep{.2\@tempdimc \@plus.1\@tempdimc \@minus.1\@tempdimc}% +} + + \endinput diff --git a/Master/texmf-dist/tex/latex/dtk/dtk.cls b/Master/texmf-dist/tex/latex/dtk/dtk.cls index 5c84e392513..661f99f5975 100644 --- a/Master/texmf-dist/tex/latex/dtk/dtk.cls +++ b/Master/texmf-dist/tex/latex/dtk/dtk.cls @@ -16,8 +16,8 @@ %% version 2005/12/01 or later. % \def\filename{dtk.cls} -\def\fileversion{1.30a} -\def\filedate{2014/09/24} +\def\fileversion{1.32} +\def\filedate{2015/02/23} % \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesClass{dtk}[\filedate~\fileversion~ dtk document class (gn,rn,hv)] @@ -119,29 +119,15 @@ \thepage-\arabic{linenumber}}} \DeclareOption{ln-short}{\def\DTK@@thelinenumber{% \arabic{linenumber}}} -\iffalse% RN 2005-01-15 -\DeclareOption{95}{\def\DTK@layout{95}} -\DeclareOption{96}{\def\DTK@layout{96}} -\DeclareOption{97}{\def\DTK@layout{97}} -\DeclareOption{98}{\def\DTK@layout{98}} -\DeclareOption{99}{\def\DTK@layout{99}} -\DeclareOption{00}{\def\DTK@layout{00}} -\DeclareOption{01}{\def\DTK@layout{01}} -\DeclareOption{02}{\def\DTK@layout{02}} -\DeclareOption{08}{\def\DTK@layout{08}} -\DeclareOption{10}{\def\DTK@layout{10}} -\DeclareOption{11}{\def\DTK@layout{11}} -\DeclareOption{12}{\def\DTK@layout{12}} -\DeclareOption*{\PassOptionsToClass{\CurrentOption}{book}} -\else -\DeclareOption*{% - \DTK@isnum{\CurrentOption}% - {\edef\DTK@layout{\CurrentOption}}% - {\PassOptionsToClass{\CurrentOption}{book}}% -} -\fi +\DeclareOption*{\PassOptionsToClass{\CurrentOption}{book}}% +% \ProcessOptions \LoadClass{book} + +\let\Ref=\ref +\let\Label=\label +\let\Pageref=\pageref + \RequirePackage{fixltx2e} \RequirePackage{xcolor}% \ifDTK@lineno@ @@ -176,12 +162,13 @@ % \setmathfont[range=8728]{Neo Euler}%%% "2218 \let\degrees\vysmwhtcircle % \setmonofont[Scale=0.81]{Luxi Mono} - \setmonofont[Scale=0.81]{Bitstream Vera Sans Mono} + \setmonofont[Scale=0.81,FakeStretch=0.9]{Bitstream Vera Sans Mono} +% \setmonofont[Scale=0.81]{SourceCodePro-Regular} % \setmonofont[Scale=0.81]{Lucida Sans Typewriter} \usepackage{luacode} % \usepackage{polyglossia} \usepackage{babel} - \usepackage[autostyle,german=guillemets]{csquotes} +% \usepackage[autostyle,german=guillemets]{csquotes} \usepackage[ngerman]{selnolig} \nolig{Herbstt[aruöe]}{Herbst|t} \nolig{Mitt[iruä]}{Mit|t} @@ -376,7 +363,9 @@ \providecommand\Macro[1]{\mbox{\texttt{\textbackslash#1}}} \providecommand\Environment[1]{\mbox{\texttt{#1}}} \let\Env\Environment +\let\ENV\Environment \let\Email\Url +\let\Class\Environment \providecommand\Acronym[1]{\textsc{#1}} \def\@listI{% \leftmargin = \leftmargini @@ -560,9 +549,6 @@ \advance\DTL@label 1 \xdef\Label@Prefix{module \the\DTL@label:}} \Advance@Label@Prefix -\let\Ref=\ref -\let\Label=\label -\let\Pageref=\pageref \renewcommand\ref[1]{\Ref{\Label@Prefix:#1}} \renewcommand\label[1]{\Label{\Label@Prefix:#1}} \renewcommand\pageref[1]{\Pageref{\Label@Prefix:#1}} @@ -858,7 +844,7 @@ #1\par \endgroup} -\@ifundefined{DTK@layout}{}{\input{dtk\DTK@layout.clo}} +\input{dtk.clo}% hv 20141110 \begingroup \chardef\x=0 % diff --git a/Master/texmf-dist/tex/latex/dtk/dtk12.clo b/Master/texmf-dist/tex/latex/dtk/dtk12.clo deleted file mode 100644 index a2344f19b8f..00000000000 --- a/Master/texmf-dist/tex/latex/dtk/dtk12.clo +++ /dev/null @@ -1,348 +0,0 @@ -%% $Id: dtk12.clo 42 2014-07-08 17:34:44Z herbert $ -\ProvidesFile{dtk12.clo}[2012/04/10 v0.03 dtk class option (RN,hv)] - -\input{dtk.clo}% Standardeinstellungen - -\newsavebox\tempbox - -\RequirePackage{ifthen} - -\newlength\fullwidth -\newlength\marginwidth -\setlength\fullwidth{\dimexpr\textwidth +\marginparwidth}% -4mm}% wegen Anschnitt -%\marginparsep ist schon 7pt -%\setlength\fullwidth{\dimexpr\textwidth +\marginparsep +\marginparwidth } -%\setlength\marginwidth{\dimexpr\fullwidth -\textwidth} -\setlength\marginwidth{\dimexpr\fullwidth +\marginparsep -\textwidth} - - -\newlength\de@Width -\newlength\de@sepWidth\de@sepWidth=3mm -\newlength\de@Indent\de@Indent=\fullwidth - -\def\Table{\@ifnextchar[\Table@i{\Table@i[]}} -\def\Table@i[#1]{\@ifnextchar[{\Table@ii[#1]}{\Table@ii[#1][\fullwidth]}} -\def\Table@ii[#1][#2]#3{% #1:TOC #2:width #3:caption - \def\de@OptCaption{#1}% - \setlength\de@Width{#2}\addtolength\de@Width{-\de@sepWidth}% - \setlength\de@Indent{#2}\addtolength\de@Indent{-\textwidth}% - \def\de@Caption{#3}% - \begin{lrbox}{\tempbox}} -\def\endTable{% - \end{lrbox}\begin{table}[!htb]% - \abovecaptionskip=0pt\belowcaptionskip=0pt - \ifthenelse{\isodd{\pageref{\thetable:WideTable}}}% - {\minipage{\de@Width}\vspace{0pt}\minipage[t]{\wd\tempbox}\vspace{0pt} - \usebox\tempbox\endminipage\kern\de@sepWidth% - \minipage[t]{\dimexpr\de@Width-\wd\tempbox\relax}\vspace{0pt}\label{\thetable:WideTable}% - \ifx\de@OptCaption\@empty\caption{\de@Caption}\else\caption[\de@OptCaption]{\de@Caption}\fi% - \endminipage\endminipage}% - {\ifdim\de@Width>\textwidth\hspace*{-\de@Indent}\fi\vspace{0pt}\minipage{\de@Width}\vspace{0pt}% - \minipage[t]{\dimexpr\de@Width-\wd\tempbox\relax}\vspace{0pt}\label{\thetable:WideTable}% - \ifx\de@OptCaption\@empty\caption{\de@Caption}\else\caption[\de@OptCaption]{\de@Caption}\fi% - \endminipage\kern\de@sepWidth% - \minipage[t]{\wd\tempbox}\vspace{0pt}\usebox\tempbox\endminipage\endminipage}% - \end{table}} -% -\def\Figure{\@ifnextchar[\Figure@i{\Figure@i[]}} -\def\Figure@i[#1]{\@ifnextchar[{\Figure@ii[#1]}{\Figure@ii[#1][\fullwidth]}} -\def\Figure@ii[#1][#2]#3{% - \def\OptCaption{#1}% - \setlength\de@Width{#2}\addtolength\de@Width{-\de@sepWidth}% - \setlength\de@Indent{#2}\addtolength\de@Indent{-\textwidth}% - \def\DefaultCaption{#3}% - \begin{lrbox}{\tempbox}} -\def\endFigure{% - \end{lrbox}\begin{figure}[!htb]% - \abovecaptionskip=0pt\belowcaptionskip=0pt - \ifthenelse{\isodd{\pageref{\thefigure:WideFigure}}}% - {\minipage{\de@Width}\minipage[b]{\wd\tempbox} - \usebox\tempbox\endminipage\kern\de@sepWidth% - \minipage[b]{\dimexpr\de@Width-\wd\tempbox\relax}\label{\thefigure:WideFigure}% - \ifx\OptCaption\@empty\caption{\DefaultCaption}\else\caption[\OptCaption]{\DefaultCaption}\fi% - \endminipage\endminipage}% - {\ifdim\de@Width>\textwidth \hspace*{-\de@Indent}\fi\minipage{\de@Width}% - \minipage[b]{\dimexpr\de@Width-\wd\tempbox\relax}\label{\thefigure:WideFigure}% - \ifx\OptCaption\@empty\caption{\DefaultCaption}\else\caption[\OptCaption]{\DefaultCaption}\fi% - \endminipage\kern\de@sepWidth% - \minipage[b]{\wd\tempbox}\usebox\tempbox\endminipage\endminipage}% - \end{figure}} - -% -\IfFileExists{paralist.sty}{% -\RequirePackage[neverdecrease]{paralist} - \let\itemize\compactitem - \let\enditemize\endcompactitem - \let\enumerate\compactenum - \let\endenumerate\endcompactenum - \let\description\compactdesc - \let\enddescription\endcompactdesc - \pltopsep=\medskipamount -% \plitemsep=\smallskipamount - \plitemsep=1pt -% \plparsep=\smallskipamount - \plparsep=1pt -}{} - -\RequirePackage{hyphsubst}% -\HyphSubstIfExists{ngerman-x-latest}{% - \HyphSubstLet{ngerman}{ngerman-x-latest}}{} -\HyphSubstIfExists{german-x-latest}{% - \HyphSubstLet{german}{german-x-latest}}{} - -\RequirePackage{accsupp}% Heiko -\providecommand\isbn[1]{} -\renewcommand*\isbn[1]{% - ISBN:~% - \BeginAccSupp{method=plain,ActualText=\RemoveHyphen{#1}}% - #1% - \EndAccSupp{}% -} -\newcommand*{\RemoveHyphen}[1]{\@RemoveHyphen#1-\@nil} -\def\@RemoveHyphen#1-#2\@nil{% - #1% - \ifx\\#2\\% - \expandafter\@gobble - \else - \expandafter\@firstofone - \fi - {% - \@RemoveHyphen#2\@nil - }% -} -\def\CoverArt@strip@no#1/#2;{#1/\kern-4pt#2} -% -% 2011-04-10 -- RN (von KOMA-Script: scrkfont.dtx) - -\providecommand*{\changefontsizes}[2][1.2\@tempdima]{% - \@defaultunits\@tempdima#2pt\relax\@nnil - \setlength{\@tempdimc}{\@tempdima}% - \addtolength{\@tempdimc}{-10\p@}% - \edef\@ptsize{\strip@pt\@tempdimc}% - \@defaultunits\@tempdimb#1pt\relax\@nnil - \setlength{\@tempdimc}{\dimexpr (100\@tempdimb / \@tempdima * \p@)}% - \edef\@tempb{\the\@tempdimc}% - \setlength{\@tempdimc}{\@tempdima}% - \def\@tempa##1##2##3##4##5\@nnil{\def##1{##2.##3##4}}% - \expandafter\@tempa\expandafter\@tempb\@tempb\@nnil% - \setlength{\abovedisplayskip}{% - \@tempdima \@plus .25\@tempdima \@minus .58\@tempdima}% - \setlength{\abovedisplayshortskip}{\z@ \@plus .25\@tempdima}% - \setlength{\belowdisplayskip}{\abovedisplayskip}% - \setlength{\belowdisplayshortskip}{% - .55\@tempdima \@plus .3\@tempdima \@minus .25\@tempdima}% - \edef\normalsize{% - \noexpand\@setfontsize\noexpand\normalsize - {\the\@tempdima}{\the\@tempdimb}% - \abovedisplayskip \the\abovedisplayskip - \abovedisplayshortskip \the\abovedisplayshortskip - \belowdisplayskip \the\belowdisplayskip - \belowdisplayshortskip \the\belowdisplayshortskip - \let\noexpand\@listi\noexpand\@listI - }% - \setlength{\@tempdima}{0.9125\@tempdimc}% - \setlength{\@tempdimb}{\@tempb\@tempdima}% - \setlength{\abovedisplayskip}{% - \@tempdima \@plus .25\@tempdima \@minus .58\@tempdima}% - \setlength{\abovedisplayshortskip}{\z@ \@plus .25\@tempdima}% - \setlength{\belowdisplayskip}{\abovedisplayskip}% - \setlength{\belowdisplayshortskip}{% - .55\@tempdima \@plus .3\@tempdima \@minus .25\@tempdima}% - \edef\small{% - \noexpand\@setfontsize\noexpand\small - {\the\@tempdima}{\the\@tempdimb}% - \abovedisplayskip \the\abovedisplayskip - \abovedisplayshortskip \the\abovedisplayshortskip - \belowdisplayskip \the\belowdisplayskip - \belowdisplayshortskip \the\belowdisplayshortskip - \let\noexpand\@listi\noexpand\@listi@small - }% - \setlength{\@tempdima}{.83334\@tempdimc}% - \setlength{\@tempdimb}{\@tempb\@tempdima}% - \setlength{\abovedisplayskip}{% - \@tempdima \@plus .25\@tempdima \@minus .58\@tempdima}% - \setlength{\abovedisplayshortskip}{\z@ \@plus .25\@tempdima}% - \setlength{\belowdisplayskip}{\abovedisplayskip}% - \setlength{\belowdisplayshortskip}{% - .55\@tempdima \@plus .3\@tempdima \@minus .25\@tempdima}% - \edef\footnotesize{% - \noexpand\@setfontsize\noexpand\footnotesize - {\the\@tempdima}{\the\@tempdimb}% - \abovedisplayskip \the\abovedisplayskip - \abovedisplayshortskip \the\abovedisplayshortskip - \belowdisplayskip \the\belowdisplayskip - \belowdisplayshortskip \the\belowdisplayshortskip - \let\noexpand\@listi\noexpand\@listi@footnotesize - }% - \setlength{\@tempdima}{.66667\@tempdimc}% - \setlength{\@tempdimb}{\@tempb\@tempdima}% - \edef\scriptsize{% - \noexpand\@setfontsize\noexpand\scriptsize - {\the\@tempdima}{\the\@tempdimb}% - }% - \setlength{\@tempdima}{.5\@tempdimc}% - \setlength{\@tempdimb}{\@tempb\@tempdima}% - \edef\tiny{% - \noexpand\@setfontsize\noexpand\tiny - {\the\@tempdima}{\the\@tempdimb}% - }% - \setlength{\@tempdima}{1.2\@tempdimc}% - \setlength{\@tempdimb}{\@tempb\@tempdima}% - \edef\large{% - \noexpand\@setfontsize\noexpand\large - {\the\@tempdima}{\the\@tempdimb}% - }% - \setlength{\@tempdima}{1.44\@tempdimc}% - \setlength{\@tempdimb}{\@tempb\@tempdima}% - \edef\Large{% - \noexpand\@setfontsize\noexpand\Large - {\the\@tempdima}{\the\@tempdimb}% - }% - \setlength{\@tempdima}{1.728\@tempdimc}% - \setlength{\@tempdimb}{\@tempb\@tempdima}% - \edef\LARGE{% - \noexpand\@setfontsize\noexpand\LARGE - {\the\@tempdima}{\the\@tempdimb}% - }% - \setlength{\@tempdima}{2.074\@tempdimc}% - \setlength{\@tempdimb}{\@tempb\@tempdima}% - \edef\huge{% - \noexpand\@setfontsize\noexpand\huge - {\the\@tempdima}{\the\@tempdimb}% - }% - \setlength{\@tempdima}{2.488\@tempdimc}% - \setlength{\@tempdimb}{\@tempb\@tempdima}% - \edef\Huge{% - \noexpand\@setfontsize\noexpand\Huge - {\the\@tempdima}{\the\@tempdimb}% - }% - \normalsize - \setlength{\footnotesep}{.7\@tempdimc}% - \setlength{\skip\footins}{.9\@tempdimc \@plus .3333\@tempdimc \@minus - .6\@tempdimc}% - \setlength{\floatsep}{\@tempdimc \@plus .1667\@tempdimc \@minus - .3333\@tempdimc}% - \setlength{\textfloatsep}{1.6667\@tempdimc \@plus .1667\@tempdimc \@minus - .3333\@tempdimc}% - \setlength{\intextsep}{\@tempb\@tempdimc \@plus .3333\@tempdimc \@minus - .3333\@tempdimc}% - \setlength{\dblfloatsep}{\@tempb\@tempdimc \@plus .1667\@tempdimc \@minus - .3333\@tempdimc}% - \setlength{\dbltextfloatsep}{\textfloatsep}% - \setlength{\@fptop}{0\p@ \@plus 1fil}% - \setlength{\@fpsep}{.8333\@tempdimc \@plus 2fil}% - \setlength{\@fpbot}{\@fptop}% - \setlength{\@dblfptop}{0\p@ \@plus 1fil}% - \setlength{\@dblfpsep}{.8333\@tempdimc \@plus 2fil}% - \setlength{\@dblfpbot}{\@fptop}% - \setlength{\partopsep}{.25\@tempdimc \@plus .16667\@tempdimc \@minus - .16667\@tempdimc}% - \setlength{\topsep}{.8333\@tempdimc \@plus .3333\@tempdimc \@minus - .5\@tempdimc}% - \setlength{\parsep}{.4167\@tempdimc \@plus .2083\@tempdimc \@minus \p@}% - \@tempswafalse - \begingroup - \def\@list@extra{\aftergroup\@tempswatrue}% - \csname @listi\endcsname - \endgroup - \edef\@listi{\leftmargin\leftmargini - \topsep \the\topsep - \parsep \the\parsep - \itemsep \parsep - \if@tempswa\noexpand\@list@extra\fi - }% - \let\@listI\@listi - \setlength{\topsep}{.75\@tempdimc \@plus .25\@tempdimc \@minus - .41667\@tempdimc}% - \setlength{\parsep}{.375\@tempdimc \@plus .16667\@tempdimc \@minus \p@}% - \@tempswafalse - \begingroup - \def\@list@extra{\aftergroup\@tempswatrue}% - \csname @listi\endcsname - \endgroup - \edef\@listi@small{\leftmargin\leftmargini - \topsep \the\topsep - \parsep \the\parsep - \itemsep \parsep - \if@tempswa\noexpand\@list@extra\fi - }% - \setlength{\topsep}{.5\@tempdimc \@plus .16667\@tempdimc \@minus - .16667\@tempdimc}% - \setlength{\parsep}{.25\@tempdimc \@plus .16667\@tempdimc \@minus \p@}% - \@tempswafalse - \begingroup - \def\@list@extra{\aftergroup\@tempswatrue}% - \csname @listi\endcsname - \endgroup - \edef\@listi@footnotesize{\leftmargin\leftmargini - \topsep \the\topsep - \parsep \the\parsep - \itemsep \parsep - \if@tempswa\noexpand\@list@extra\fi - }% - \setlength{\topsep}{.4167\@tempdimc \@plus .2083\@tempdimc \@minus \p@}% - \setlength{\parsep}{.2083\@tempdimc \@plus \p@ \@minus \p@}% - \@tempswafalse - \begingroup - \def\@list@extra{\aftergroup\@tempswatrue}% - \csname @listii\endcsname - \endgroup - \edef\@listii{\leftmargin\leftmarginii - \labelwidth=\dimexpr \leftmargin-\labelsep - \topsep \the\topsep - \parsep \the\parsep - \itemsep \parsep - \if@tempswa\noexpand\@list@extra\fi - }% - \setlength{\topsep}{.2083\@tempdimc \@plus \p@ \@minus \p@}% - \setlength{\parsep}{\p@ \@plus\z@ \@minus\p@}% - \@tempswafalse - \begingroup - \def\@list@extra{\aftergroup\@tempswatrue}% - \csname @listiii\endcsname - \endgroup - \edef\@listiii{\leftmargin\leftmarginiii - \labelwidth=\dimexpr \leftmargin-\labelsep - \topsep \the\topsep - \parsep \z@ - \partopsep \the\parsep - \itemsep \topsep - \if@tempswa\noexpand\@list@extra\fi - }% - \@tempswafalse - \begingroup - \def\@list@extra{\aftergroup\@tempswatrue}% - \csname @listiv\endcsname - \endgroup - \edef\@listiv{\leftmargin\leftmarginiv - \labelwidth=\dimexpr \leftmargin-\labelsep - \if@tempswa\noexpand\@list@extra\fi - }% - \@tempswafalse - \begingroup - \def\@list@extra{\aftergroup\@tempswatrue}% - \csname @listv\endcsname - \endgroup - \edef\@listv{\leftmargin\leftmarginv - \labelwidth=\dimexpr \leftmargin-\labelsep - \if@tempswa\noexpand\@list@extra\fi - }% - \@tempswafalse - \begingroup - \def\@list@extra{\aftergroup\@tempswatrue}% - \csname @listvi\endcsname - \endgroup - \edef\@listvi{\leftmargin\leftmarginvi - \labelwidth=\dimexpr \leftmargin-\labelsep - \if@tempswa\noexpand\@list@extra\fi - }% - \@listi - \setlength{\@tempdimb}{\@tempb\@tempdima}% - \setlength{\@tempdima}{\dimexpr \@tempdimb-\@tempdimc}% - \setlength\intextsep{\@tempdimb \@plus.2\@tempdima \@minus.2\@tempdima}% - \setlength\dblfloatsep\intextsep - \setlength\partopsep{.2\@tempdimc \@plus.1\@tempdimc \@minus.1\@tempdimc}% -} - -\endinput - diff --git a/Master/texmf-dist/tex/latex/dtk/dtklogos.sty b/Master/texmf-dist/tex/latex/dtk/dtklogos.sty index a897cc83549..d6b06ce9d4a 100644 --- a/Master/texmf-dist/tex/latex/dtk/dtklogos.sty +++ b/Master/texmf-dist/tex/latex/dtk/dtklogos.sty @@ -2,7 +2,7 @@ %% This is file `dtklogos.sty', %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%% $Id: dtklogos.sty 124 2014-09-24 20:01:38Z herbert $ +%% $Id: dtklogos.sty 138 2014-12-11 17:48:48Z herbert $ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% Purpose: %% LaTeX Class and Styles for ``Die TeXnische Komoedie''. @@ -24,94 +24,22 @@ %% a new version which provides enhanced functionality. %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\def\fileversion{2.19} -\def\filedate{2014/09/24} -\let\docversion=\fileversion -\let\docdate=\filedate -\ProvidesPackage{dtklogos}[\filedate\space\fileversion\space (hv)] -% -\RequirePackage{graphicx} -\RequirePackage{mflogo,hologo,dantelogo} + +\NeedsTeXFormat{LaTeX2e} +\ProvidesPackage{dtklogos}[2014/11/15 v2.2 LaTeX wrapper for `hologo' (RN,HV)] + +\DeclareOption*{\PassOptionsToPackage\CurrentOption{color}} +\ProcessOptions\relax + \RequirePackage{ifpdf} -\providecommand\AmS{{\normalfont\(\cal A\)\kern-.1667em\lower.5ex\hbox{\(\cal M\)}\kern-.125em{\(\cal S\)}}} -\providecommand\AMS{\AmS} -\providecommand\AmSLaTeX{\AmS-\LaTeX} -\providecommand\AMSLaTeX{\AmSLaTeX} -\providecommand\AmSTeX{\normalfont% - $\cal A$\kern-.1667em\lower.5ex\hbox{$\cal M$}% - \kern-.125em$\cal S$-\TeX} -\providecommand\AMSTEX{\AmSTeX} -\providecommand\AMSTeX{\AmSTeX} -\DeclareRobustCommand{\BibTeX}{B\kern-.05em% - \hbox{$\m@th$% %% force math size calculations - \csname S@\f@size\endcsname - \fontsize\sf@size\z@ - \math@fontsfalse\selectfont - I\kern-.025emB}% - \kern-.08em% - \-\TeX} -\providecommand\BIBTeX{\BibTeX} -\providecommand\BibLaTeX{Bib\LaTeX} -\providecommand\BIBTEX{\BibTeX} -\providecommand\LAMSTeX{% - L\raise.42ex\hbox{\kern-.3em\the\scriptfont2 A}% - \kern-.2em\lower.376ex\hbox{\the\textfont2 M}% - \kern-.125em {\the\textfont2 S}-\TeX} -\providecommand\LamSTeX{\LAMSTeX} -\providecommand\LAmSTeX{\LAMSTeX} -\providecommand\La{} -\renewcommand\La{L\kern-.28em\raise.3ex\hbox{\textsc{a}}} -\renewcommand\LaTeX{\La\kern-.15em\TeX} -\let\LATEX\LaTeX -\DeclareRobustCommand{\LaTeXTeX}{(\kern-.15emL\kern-.36em% - {\sbox\z@ T% - \vbox to\ht0{\hbox{$\m@th$% - \csname S@\f@size\endcsname - \fontsize\sf@size\z@ - \math@fontsfalse\selectfont - A}% - \vss}% - }\kern-.2em)% - \kern-.15em% - \TeX} -\providecommand\XeTeX{X\kern-.125em\lower.5ex\hbox{E}\kern-.1667em\TeX} -\providecommand\XeLaTeX{X\kern-.125em\lower.5ex\hbox{E}\kern-.1667em\LaTeX} -\providecommand\TeXLive{\TeX{}Live} -%\DeclareTextFontCommand{\textlogo}{\logofamily} -%\providecommand\MF{\mbox{\textlogo{META}}\-\mbox{\textlogo{FONT}}\@} -\providecommand\MFun{\mbox{\textlogo{META}\textsc{Fun}}\@} -%\providecommand\MP{\mbox{\textlogo{META}}\-\mbox{\textlogo{POST}}\@} -\providecommand\METAFONT{\MF} -\providecommand\METAFUN{\MFun} -\providecommand\METAPOST{\MP} -\def\LuaTeX{Lua\kern-0.15em\TeX} -\let\luatex\LuaTeX -\providecommand\LuaLaTeX{Lua\LaTeX} -\providecommand\SLITEX{% - S\kern-.065em L\kern-.18em\raise.32ex\hbox{i}% - \kern-.03em\TeX} -\providecommand\SLiTeX{\SLITEX} -\providecommand\SliTeX{\SLITEX} -\providecommand\SLITeX{\SLITEX} -\def\NTS{\mbox{\mathsurround=0pt - \(\mathcal{N\mkern -4mu\lower .5ex\hbox{$\cal T$}\mkern -2mu S}\)}} -\providecommand\MakeIndex{\textit{Make\-Index}} -\providecommand\emTeX{{em\TeX}} -\providecommand\PubliCTeX{PubliC\TeX} -\providecommand\TeXXeT{% - \TeX--X\kern-.125em\lower.5ex\hbox{E}\kern-.1667emT} -\providecommand\TeXeT{% - \TeX-X\kern-.125em\lower.5ex\hbox{E}\kern-.1667emT} -\providecommand\WinEdt{\mbox{\textsf{WinEdt}}}% -\providecommand\WinEdtKK{\mbox{\textsf{WinEdt2k}}}% -\providecommand{\LyX}{L\kern-.1667em\lower.25em\hbox{Y}\kern-.125emX\@} \providecommand*{\exTeX}{% \textrm{% das Logo grunds^^e4tzlich serifenbehaftet \ensuremath{\textstyle\varepsilon_{\kern-0.15em\mathcal{X}}}% \kern-.15em\TeX }% } + \providecommand\eV{e.V\kern-0.18em\@ifnextchar.{}{.}\kern0.18em} \providecommand\dante{\mbox{DANTE~\eV}} \providecommand\Dante{DANTE, @@ -120,30 +48,9 @@ \providecommand\LaTeXe{% \LaTeX{}\kern.05em2$_{\textstyle\varepsilon}$} \providecommand\PS{Post\-Script} -\providecommand\PiC{P\kern-.12em\lower.5ex\hbox{I}\kern-.075emC} -\providecommand\PiCTeX{\PiC\kern-.11em\TeX} \providecommand\TUG{\TeX{} Users Group} \providecommand\TUGboat{\textsl{TUGboat}} -\let\TUB\TUGboat -\providecommand\TTN{\textsl{\TeX{} and TUG NEWS}} -\providecommand\NFSS{\textsf{NFSS}} -\providecommand\NTS{\leavevmode - \hbox{$\cal N\kern-0.35em\lower0.5ex\hbox{$\cal T$}\kern-0.2emS$}} -\providecommand\eTeX{{\leavevmode\hbox{$\varepsilon$}-\TeX}}%$ -\providecommand*{\ExTeX}{% RN 2005-01-15 - \textrm{% das Logo grunds^^e4tzlich serifenbehaftet - \ensuremath{\textstyle\varepsilon_{\kern-0.15em\mathcal{X}}}% - \kern-.15em\TeX - }% -} -% \let\DANTE\dantelogo -% -\providecommand*\ConTeXt{Con\kern-1pt\TeX{}t} -\providecommand*\conTeXt{con\TeX t} -\providecommand*\MiKTeX{MiK\TeX} -\providecommand*\MikTeX\MiKTeX -% \ifpdf \providecommand\ThanhVN{H\`an Th\^e\protect\llap{\raise 0.5ex\hbox{\'{}}}} \providecommand\Thanh{H\`an Th\^e\protect\llap{\raise 0.5ex\hbox{\'{\relax}}} Th\`anh} @@ -152,15 +59,10 @@ \def\Thanh{H\`an~Th\textcircumacute{e}\llap{\raise 0.5ex\hbox{\'{}}}~Th\`anh} \fi \def\ThanhNN{Th\`anh} -% -\providecommand\tikZ{\textsf{Ti\textit{k}Z}} -\let\tikz\tikZ -\providecommand\MacTeX{Mac\TeX} -\let\TikZ\tikZ \def\pgf/tikz{\textsf{pgf/Ti\textit{k}Z}} -\def\ALEPH{\ensuremath{\aleph}} -% -% +\def\TeXLive{\TeX{}Live} + +\RequirePackage{hologo} + \endinput -%% %% End of file `dtklogos.sty'. |