diff options
| -rw-r--r-- | Master/texmf-dist/bibtex/bst/dtk/dtk.bst | 4 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/latex/dtk/doc/beispiel.tex | 2 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/latex/dtk/historical/dtk10.clo (renamed from Master/texmf-dist/tex/latex/dtk/dtk10.clo) | 0 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/dtk/dtk-pdf.sty | 2 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/dtk/dtk.clo | 11 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/dtk/dtk.cls | 42 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/dtk/dtk11.clo | 348 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/dtk/dtklogos.sty | 110 |
8 files changed, 389 insertions, 130 deletions
diff --git a/Master/texmf-dist/bibtex/bst/dtk/dtk.bst b/Master/texmf-dist/bibtex/bst/dtk/dtk.bst index 437fd03b9c0..1d3a520ea1b 100644 --- a/Master/texmf-dist/bibtex/bst/dtk/dtk.bst +++ b/Master/texmf-dist/bibtex/bst/dtk/dtk.bst @@ -1,4 +1,4 @@ -%% $Id: dtk.bst 2 2009-11-15 08:42:51Z herbert $ +%% $Id: dtk.bst 17 2011-04-23 10:42:34Z herbert $ %% %% This is file `dtk.bst', generated %% on <1995/11/5> with the docstrip utility (2.2i). @@ -334,7 +334,7 @@ MACRO {dec} {"Dez."} % End of language definition file -MACRO{DTK}{"Die \TeX\-nische Ko\-m\^^b{o}\-die"} +MACRO{DTK}{"Die \TeX\-nische Ko\-m\"o\-die"} MACRO{TUGboat}{"TUGboat"} MACRO{TTN}{"\TeX{} and TUG News"} MACRO {acmcs} {"ACM Computing Surveys"} diff --git a/Master/texmf-dist/doc/latex/dtk/doc/beispiel.tex b/Master/texmf-dist/doc/latex/dtk/doc/beispiel.tex index aa199372105..bce4df41372 100644 --- a/Master/texmf-dist/doc/latex/dtk/doc/beispiel.tex +++ b/Master/texmf-dist/doc/latex/dtk/doc/beispiel.tex @@ -1,4 +1,4 @@ -%% $Id: beispiel.tex 4 2009-11-15 09:28:15Z herbert $ +%% $Id: beispiel.tex 16 2010-11-06 13:18:09Z herbert $ % \documentclass[10,ngerman]{dtk} \usepackage[utf8]{inputenc} diff --git a/Master/texmf-dist/tex/latex/dtk/dtk10.clo b/Master/texmf-dist/doc/latex/dtk/historical/dtk10.clo index 1a97dc85aa4..1a97dc85aa4 100644 --- a/Master/texmf-dist/tex/latex/dtk/dtk10.clo +++ b/Master/texmf-dist/doc/latex/dtk/historical/dtk10.clo diff --git a/Master/texmf-dist/tex/latex/dtk/dtk-pdf.sty b/Master/texmf-dist/tex/latex/dtk/dtk-pdf.sty index 69c4506b826..a2b6fbb102b 100644 --- a/Master/texmf-dist/tex/latex/dtk/dtk-pdf.sty +++ b/Master/texmf-dist/tex/latex/dtk/dtk-pdf.sty @@ -113,6 +113,7 @@ \m@ketitle } \def\textcentigrade{\textcelsius} +\iffalse \AtBeginDocument{% \DeclareFontEncoding{OT4}{}{}% \DeclareFontEncoding{TS1}{}{}% @@ -128,6 +129,7 @@ \DeclareTextCommand{\textperthousand}{\encodingdefault}{% {\fontencoding{TS1}\fontfamily{cmr}\selectfont\char135}}% } +\fi \newif\ifmaintitle \newlength\footheight \endinput diff --git a/Master/texmf-dist/tex/latex/dtk/dtk.clo b/Master/texmf-dist/tex/latex/dtk/dtk.clo index 86c88c0801e..18c6e20b729 100644 --- a/Master/texmf-dist/tex/latex/dtk/dtk.clo +++ b/Master/texmf-dist/tex/latex/dtk/dtk.clo @@ -1,4 +1,4 @@ -%% $Id: dtk.clo 15 2010-11-03 19:15:55Z herbert $ +%% $Id: dtk.clo 17 2011-04-23 10:42:34Z herbert $ \ProvidesFile{dtk.clo}[2010/10/17 v0.3 dtk class option (RN,hv)] @@ -89,14 +89,19 @@ \settowidth\@ovxx{#2}\settoheight\@ovyy{#2}% \makebox[\@ovxx][c]{\colorbox{#1}{\raisebox{0pt}[\@ovyy][0pt]{#2}}}% } +\newcommand\Small{\fontsize{8.5}{8.7}\selectfont} +\newcommand*\DTKlstfont{% + \Small\ttfamily\SetTracking{encoding=*}{-60}\lsstyle} \lstdefinestyle{DTKlstBase}{% - basicstyle=\footnotesize\ttfamily, + basicstyle=\DTKlstfont, + basewidth=0.55em, + keepspaces, identifierstyle=\color{DTKlstIdentifiers}, keywordstyle=\color{DTKlstKeys}, stringstyle=\itshape\color{DTKlstStrings}, commentstyle=\itshape\color{DTKlstComments}, - columns=fixed, + columns=fullflexible, tabsize=2, frame=single, extendedchars=true, diff --git a/Master/texmf-dist/tex/latex/dtk/dtk.cls b/Master/texmf-dist/tex/latex/dtk/dtk.cls index 5ed9fd68f54..ae63f91556b 100644 --- a/Master/texmf-dist/tex/latex/dtk/dtk.cls +++ b/Master/texmf-dist/tex/latex/dtk/dtk.cls @@ -1,4 +1,4 @@ -%% $Id: dtk.cls 15 2010-11-03 19:15:55Z herbert $ +%% $Id: dtk.cls 17 2011-04-23 10:42:34Z herbert $ %% %% This is file `dtk.cls', %% @@ -17,8 +17,8 @@ %% version 2005/12/01 or later. % \def\filename{dtk.cls} -\def\fileversion{1.22} -\def\filedate{2010/11/06} +\def\fileversion{1.23} +\def\filedate{2011/04/12} % \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesClass{dtk}[\filedate~\fileversion~ dtk document class (gn,rn,hv)] @@ -27,10 +27,6 @@ \newif\ifDTK@Author@ \DTK@Author@true \newif\ifDTK@Draft@ -\newif\ifDTK@tgpagella@ -\newif\ifDTK@tgschola@ -\DTK@tgpagella@false -\DTK@tgschola@false \newif\ifDTK@lineno@ \DTK@lineno@false \newif\ifDTK@german@ @@ -85,8 +81,6 @@ \DeclareOption{full}{\DTK@Author@false} \DeclareOption{omitgerman}{\DTK@german@false} \DeclareOption{ancient}{\def\DTK@layout{95}} -\DeclareOption{tgpagella}{\DTK@tgpagella@true} -\DeclareOption{tgschola}{\DTK@tgschola@true} \DeclareOption{draft}{% \DTK@Draft@true \DTK@lineno@true @@ -157,18 +151,14 @@ \fi %%%%%%%%%% \RequirePackage[T1]{fontenc} -% \RequirePackage{pamath} -% \RequirePackage{mathpazo} -% \RequirePackage[scale=0.95]{tgcursor} -% \RequirePackage[scale=0.95]{tgpagella} -% \RequirePackage[scale=0.85]{tgheros} - \RequirePackage{lmodern} +%\RequirePackage{lmodern} +\RequirePackage{mathpazo} +\RequirePackage[scale=0.95]{tgpagella} +\RequirePackage[scale=0.92]{tgheros} \RequirePackage%[factor=1500,verbose=true,final=true] {microtype} % -\IfFileExists{luximono.sty} - {\RequirePackage[scaled=0.85]{luximono}} - {\RequirePackage[scaled=0.85]{beramono}} +\RequirePackage[scaled=0.82]{beramono} \RequirePackage[full]{textcomp} \ifDTK@Author@\else\RequirePackage[utf8]{inputenc}\fi \usepackage{fixltx2e} @@ -196,16 +186,6 @@ \errorcontextlines=100\relax \fi \RequirePackage{dtklogos} -\newcommand\NeedPackage[1]{% - \expandafter\ifx\csname ver@#1.sty\endcsname\relax - \typeout{***}% - \typeout{***}% - \typeout{*** The required package `#1' seems not to be loaded.}% - \typeout{*** I try to stumble along as good as I can.}% - \typeout{*** Expect some undefined macros or other errors.}% - \typeout{***}% - \typeout{***}% - \fi} \paperwidth = 148.5mm \paperheight = 210mm \textheight = 485pt %%%%471pt @@ -987,9 +967,9 @@ \edef\@tempa{##1}% \ifx\@tempa\@empty\else\inputencoding{##1}\fi \else - \ifx\@tempa\@empty\else\NeedPackage{\@tempa}% - \RecordPackage{##1}\@tempa{##3}\DTK@local@inputname - \fi +% \ifx\@tempa\@empty\else\usepackage{\@tempa}% +% \RecordPackage{##1}\@tempa{##3}\DTK@local@inputname +% \fi \fi}}% \let\pagestyle\@gobble \let\thispagestyle\@gobble diff --git a/Master/texmf-dist/tex/latex/dtk/dtk11.clo b/Master/texmf-dist/tex/latex/dtk/dtk11.clo new file mode 100644 index 00000000000..ce39315999a --- /dev/null +++ b/Master/texmf-dist/tex/latex/dtk/dtk11.clo @@ -0,0 +1,348 @@ +%% $Id: dtk11.clo 18 2011-04-23 10:43:52Z herbert $ +\ProvidesFile{dtk10.clo}[2010/04/19 v0.02 dtk class option (RN,hv)] + +\input{dtk.clo}% Standardeinstellungen + + +\newsavebox\tempbox + +\RequirePackage{ifthen} + +\newlength\fullwidth +\newlength\marginwidth +\setlength\fullwidth{\textwidth + \marginparwidth -4mm}% wegen Anschnitt +%\setlength\fullwidth{\textwidth + \marginparsep + \marginparwidth } +%\setlength\marginwidth{\fullwidth - \textwidth} +\setlength\marginwidth{\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]{\de@Width-\wd\tempbox}\vspace{0pt}\label{\thetable:WideTable}% + \ifx\relax\de@OptCaption\relax\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]{\de@Width-\wd\tempbox}\vspace{0pt}\label{\thetable:WideTable}% + \ifx\relax\de@OptCaption\relax\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\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\endFigure{% + \end{lrbox}\begin{figure}[!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]{\de@Width-\wd\tempbox}\vspace{0pt}\label{\thefigure:WideTable}% + \ifx\relax\de@OptCaption\relax\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]{\de@Width-\wd\tempbox}\vspace{0pt}\label{\thetable:WideTable}% + \ifx\relax\de@OptCaption\relax\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{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 c70889132b6..2850c73e76b 100644 --- a/Master/texmf-dist/tex/latex/dtk/dtklogos.sty +++ b/Master/texmf-dist/tex/latex/dtk/dtklogos.sty @@ -2,22 +2,11 @@ %% This is file `dtklogos.sty', %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%% $Id: dtklogos.sty 14 2010-10-16 17:27:23Z herbert $ +%% $Id: dtklogos.sty 17 2011-04-23 10:42:34Z herbert $ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% Purpose: %% LaTeX Class and Styles for ``Die TeXnische Komoedie''. %% -%% Documentation: -%% The documentation can be generated from the original file -%% dtk.dtx with the doc style/package. LaTeX the file dtk.tex to -%% get the full documentation in DVI format. -%% -%% -%% Author: Gerd Neugebauer -%% Mainzer Str. 8 -%% 56321 Rhens (Germany) -%% Mail: gene@gerd-neugebauer.de -%% %% Copyright (C) 1995-1996 Gerd Neugebauer %% Copyright (C) 1997-2011 DANTE, Deutschsprachige %% Anwendervereinigung TeX e.V. @@ -34,32 +23,13 @@ %% a new version which provides enhanced functionality. %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\def\fileversion{1.9b} -\def\filedate{2010/06/19} +\def\fileversion{2.1} +\def\filedate{2011/04/10} \let\docversion=\fileversion \let\docdate=\filedate -\ProvidesPackage{dtklogos}[\filedate\space\fileversion\space gene] -\newif\ifOldLaTeX -\@ifundefined{documentclass}{\OldLaTeXtrue}{\OldLaTeXfalse} -\ifOldLaTeX -\expandafter\ifx\csname selectfont\endcsname\relax - \newcommand{\logo@sm@ller}{\relax - \expandafter\logo@sm@ll@r\expandafter{\the\fam}} - \newcommand{\logo@sm@ll@r}[1]{% - % \ifx\@currsize\tiny \tiny\fi - \ifx\@currsize\scriptsize \tiny\fi - \ifx\@currsize\footnotesize \tiny\fi - \ifx\@currsize\small \scriptsize\fi - \ifx\@currsize\normalsize \scriptsize\fi - \ifx\@currsize\large \footnotesize\fi - \ifx\@currsize\Large \normalsize\fi - \ifx\@currsize\LARGE \large\fi - \ifx\@currsize\huge \Large\fi - \ifx\@currsize\Huge \huge\fi - \ifcase#1\relax\rm\or\mit\or\cal\or\tenex % not sure about the tenex - \or\it\or\sl\or\bf\or\tt\or\sf\or\sc\or\ly\fi} -\else - \newcommand{\logo@sm@ller}{% +\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 @@ -76,9 +46,7 @@ \selectfont \fi} \@ifundefined{fontsize}{\let\fontsize=\size}{} -\fi \newcommand{\logo@smaller}{\protect\logo@sm@ller} -\fi \RequirePackage{graphicx} % Tip aus OS X TeX von Peter Dyballa vom 25.9.08 fuer die @@ -108,6 +76,7 @@ \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} %\providecommand{\XeTeX}{X\kern-.1em\lower.5ex\hbox{\reflectbox{E}}\kern-.15em\TeX} %\providecommand{\XeLaTeX}{X\kern-.1em\lower.5ex\hbox{\reflectbox{E}}\kern-.15em\LaTeX} @@ -122,13 +91,7 @@ \kern-.125em$\cal S$-\TeX} \providecommand\AMSTEX{\AmSTeX} \providecommand\AMSTeX{\AmSTeX} -\ifOldLaTeX - \newcommand{\BibTeX}{\protect\pBibTeX} - \newcommand{\pBibTeX}{B\kern-.05em% - \hbox{\logo@smaller I\kern-.025emB}\kern-.08em% - \-\TeX} -\else - \DeclareRobustCommand{\BibTeX}{B\kern-.05em% +\DeclareRobustCommand{\BibTeX}{B\kern-.05em% \hbox{$\m@th$% %% force math size calculations \csname S@\f@size\endcsname \fontsize\sf@size\z@ @@ -136,7 +99,6 @@ I\kern-.025emB}% \kern-.08em% \-\TeX} -\fi \providecommand\BIBTeX{\BibTeX} \providecommand\BIBTEX{\BibTeX} \providecommand\LAMSTeX{% @@ -149,10 +111,6 @@ \providecommand\LaTeX{% L\kern-.36em\raise.3ex\hbox{\sc a}\kern-.15em\TeX} \providecommand\LATEX{\LaTeX} -\ifOldLaTeX - \newcommand\LaTeXTeX{(\kern-.15emL\kern-.36em\raise.3ex\hbox{\sc - a}\kern-.3em)\kern-.15em\TeX}% -\else \DeclareRobustCommand{\LaTeXTeX}{(\kern-.15emL\kern-.36em% {\sbox\z@ T% \vbox to\ht0{\hbox{$\m@th$% @@ -164,26 +122,8 @@ }\kern-.2em)% \kern-.15em% \TeX} -\fi -\ifOldLaTeX - \ifx\manfnt\@undefined - \font\manfnt=logo10 - \fi - \ifx\manfntsl\@undefined - \font\manfntsl=logosl10 - \fi - \newcommand\MF{\begingroup - \ifdim\fontdimen1\font>0pt \let\manfnt=\manfntsl \fi - {\manfnt META}\-{\manfnt FONT}\endgroup\spacefactor1000 }% - \newcommand\MFun{\begingroup - \ifdim\fontdimen1\font>0pt \let\manfnt=\manfntsl \fi - {\manfnt META}\-{\manfnt FUN}\endgroup\spacefactor1000 }% - \newcommand\MP{\begingroup - \ifdim\fontdimen1\font>0pt \let\manfnt=\manfntsl \fi - {\manfnt META}\-{\manfnt POST}\endgroup\spacefactor1000 }% -\else - \DeclareFontFamily{U}{logo}{} - \DeclareFontShape{U}{logo}{m}{n}{ +\DeclareFontFamily{U}{logo}{} +\DeclareFontShape{U}{logo}{m}{n}{ <8> <9> gen * logo <10> <10.95> <12> <14.4> <17.28> <20.74> <24.88> logo10 }{} @@ -205,17 +145,18 @@ \DeclareFontShape{U}{logo}{bx}{n}{ <-> ssub * logo/b/n }{} - \DeclareRobustCommand\logofamily{% +\DeclareRobustCommand\logofamily{% \not@math@alphabet\logofamily\relax \fontencoding{U}\fontfamily{logo}\selectfont} - \DeclareTextFontCommand{\textlogo}{\logofamily} - \newcommand\MF{\mbox{\textlogo{META}}\-\mbox{\textlogo{FONT}}\@} - \newcommand\MFun{\mbox{\textlogo{META}}\-\mbox{\textlogo{FUN}}\@} - \newcommand\MP{\mbox{\textlogo{META}}\-\mbox{\textlogo{POST}}\@} -\fi +\DeclareTextFontCommand{\textlogo}{\logofamily} +\newcommand\MF{\mbox{\textlogo{META}}\-\mbox{\textlogo{FONT}}\@} +\newcommand\MFun{\mbox{\textlogo{META}}\-\mbox{\textlogo{FUN}}\@} +\newcommand\MP{\mbox{\textlogo{META}}\-\mbox{\textlogo{POST}}\@} \providecommand\METAFONT{\MF} \providecommand\METAFUN{\MFun} \providecommand\METAPOST{\MP} +\providecommand\LuaTeX{Lua\TeX} + \providecommand\SLITEX{% S\kern-.065em L\kern-.18em\raise.32ex\hbox{i}% \kern-.03em\TeX} @@ -284,23 +225,6 @@ \TeX@logo@spacing{-0.15em}{-0.15em}{0.5ex}{-0.36em}{-0.15em}{-0.1em} -\DeclareRobustCommand\XeTeX{% - \leavevmode - \smash{% - X\lower\xxt@lower@e - \hbox{\kern\xxt@kern@eX - \setbox0=\hbox{E}\dimen0=\ht0\advance\dimen0by\dp0% - \raise\dimen0\hbox{\rotatebox{180}{\box0}}% - }\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 - \raise\dimen0\hbox{\rotatebox{180}{\box0}}% - }\kern\xxt@kern@eL\LaTeX}} % % \endinput |