dtk (29nov11)

git-svn-id: svn://tug.org/texlive/trunk@24698 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 18 insertions, 58 deletions

diff --git a/Master/texmf-dist/tex/latex/dtk/dtklogos.sty b/Master/texmf-dist/tex/latex/dtk/dtklogos.sty
index e0a786d0c71..c38387510d1 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 22 2011-05-12 11:48:09Z herbert $
+%% $Id: dtklogos.sty 27 2011-11-28 07:10:33Z herbert $
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% Purpose:
 %%      LaTeX Class and Styles for ``Die TeXnische Komoedie''.
@@ -23,61 +23,15 @@
 %%  a new version which provides enhanced functionality.
 %%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\def\fileversion{2.11}
-\def\filedate{2011/04/25}
+\def\fileversion{2.13}
+\def\filedate{2011/11/23}
 \let\docversion=\fileversion
 \let\docdate=\filedate
 \ProvidesPackage{dtklogos}[\filedate\space\fileversion\space  (hv)]
 %
-\newcommand{\logo@sm@ller}{%
-    \relax\@nomath\logo@smaller
-    \ifx\f@size\@vpt \else
-      \ifx\f@size\@vipt  \fontsize\@vpt{6pt}\fi
-      \ifx\f@size\@viipt \fontsize\@vpt{6pt}\fi
-      \ifx\f@size\@viiipt \fontsize\@vipt{7pt}\fi
-      \ifx\f@size\@ixpt \fontsize\@vipt{7pt}\fi
-      \ifx\f@size\@xpt \fontsize\@viipt{8pt}\fi
-      \ifx\f@size\@xipt \fontsize\@viiipt{9.5pt}\fi
-      \ifx\f@size\@xiipt \fontsize\@viiipt{9.5pt}\fi
-      \ifx\f@size\@xivpt \fontsize\@xpt{12pt}\fi
-      \ifx\f@size\@xviipt \fontsize\@xiipt{14pt}\fi
-      \ifx\f@size\@xxpt \fontsize\@xivpt{18pt}\fi
-      \ifx\f@size\@xxvpt \fontsize\@xxpt{25pt}\fi
-      \selectfont
-    \fi}
-  \@ifundefined{fontsize}{\let\fontsize=\size}{}
-\newcommand{\logo@smaller}{\protect\logo@sm@ller}
-
 \RequirePackage{graphicx}
-% Tip aus OS X TeX von Peter Dyballa vom 25.9.08 fuer die
-% Befehle \XeTeX und \XeLaTeX; das Paket xltxtra fuehrt
-% bei mir irgendwie zu Fehlermeldungen...
-\providecommand*\TeX@logo@spacing[6]{%
-  \def\xxt@kern@Te{#1}%
-  \def\xxt@kern@eX{#2}%
-  \def\xxt@lower@e{#3}%
-  \def\xxt@kern@La{#4}%
-  \def\xxt@kern@aT{#5}%
-  \def\xxt@kern@eL{#6}%
-}
-\DeclareRobustCommand\XeTeX{%
-  \leavevmode
-  \smash{%
-    X\lower\xxt@lower@e
-    \hbox{\kern\xxt@kern@eX
-      \setbox0=\hbox{E}\dimen0=\ht0\advance\dimen0by\dp0%
-      \reflectbox{E}%
-    }\kern\xxt@kern@Te\TeX}}%
-\DeclareRobustCommand\XeLaTeX{%
-  \leavevmode
-  \smash{%
-    X\lower\xxt@lower@e
-    \hbox{\kern\xxt@kern@eX
-      \setbox0=\hbox{E}\dimen0=\ht0\advance\dimen0by\dp0\relax
-      \reflectbox{E}%
-    }\kern\xxt@kern@eL\LaTeX}}
-%
-\TeX@logo@spacing{-0.15em}{-0.125em}{0.5ex}{-0.36em}{-0.12em}{-0.13em}
+\RequirePackage{metalogo}
+\RequirePackage{ifpdf}
 \providecommand\AmS{\(\cal A\)\kern-.1667em\lower.5ex\hbox{\(\cal M\)}\kern-.125em{\(\cal S\)}}
 \providecommand\AMS{\AmS}
 \providecommand\AmSLaTeX{\AmS-\LaTeX}
@@ -151,7 +105,8 @@
 \providecommand\METAFONT{\MF}
 \providecommand\METAFUN{\MFun}
 \providecommand\METAPOST{\MP}
-\providecommand\LuaTeX{Lua\kern-0.125em\TeX}
+\def\LuaTeX{Lua\kern-0.15em\TeX}
+\let\luatex\LuaTeX
 \providecommand\LuaLaTeX{Lua\LaTeX}
 
 \providecommand\SLITEX{%
@@ -216,12 +171,17 @@
 \providecommand*\MiKTeX{MiK\TeX}
 \providecommand*\MikTeX\MiKTeX
 %
-\providecommand\ThanhVN{H\`an Th\^e\protect\llap{\raise 0.5ex\hbox{\'{}}}}
-\providecommand\ThanhNN{Th\`anh}
-\providecommand\Thanh{H\`an Th\^e\protect\llap{\raise 0.5ex\hbox{\'{\relax}}} Th\`anh}
-
-\TeX@logo@spacing{-0.15em}{-0.15em}{0.5ex}{-0.36em}{-0.15em}{-0.1em}
-
+\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}
+\else
+  \def\ThanhVN{H\`an Th\textcircumacute{e}\protect\llap{\raise 0.5ex\hbox{\'{}}}}
+  \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}}
+\def\pgf/tikz{\textsf{pgf/Ti\textit{k}Z}}
 %
 %
 \endinput