dtk update (19jun10)

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

5 files changed, 62 insertions, 136 deletions

diff --git a/Master/texmf-dist/tex/latex/dtk/dtk-pdf.sty b/Master/texmf-dist/tex/latex/dtk/dtk-pdf.sty
index 45f5eb48f3f..69c4506b826 100644
--- a/Master/texmf-dist/tex/latex/dtk/dtk-pdf.sty
+++ b/Master/texmf-dist/tex/latex/dtk/dtk-pdf.sty
@@ -1,30 +1,9 @@
 %%
 %% This is file `dtk-pdf.sty',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% dtk.dtx  (with options: `pdf')
-%% 
-%% IMPORTANT NOTICE:
-%% 
-%% For the copyright see the source file.
-%% 
-%% Any modified versions of this file must be renamed
-%% with new filenames distinct from dtk-pdf.sty.
 %% 
-%% For distribution of the original source see the terms
-%% for copying and modification in the file dtk.dtx.
-%% 
-%% This generated file may be distributed as long as the
-%% original source files, as listed above, are part of the
-%% same distribution. (The sources need not necessarily be
-%% in the same archive or directory.)
-%%  Time-stamp: "dtk.dtx        2006-08-11 18:18:53 CET Mittwoch  RN/HjG/hv"
-%%
-%%^^A%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%^^A $Id: dtk.dtx,v 2.0 2009/07/26 21:03:42 hv Exp hv $
-%%^^A%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% $Id: dtk-pdf.sty 13 2010-06-19 06:53:35Z herbert $
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% Purpose:
 %%      LaTeX Class and Styles for ``Die TeXnische Komoedie''.
 %%
@@ -40,48 +19,25 @@
 %% Mail:   gene@gerd-neugebauer.de
 %%
 %% Copyright (C) 1995-1996 Gerd Neugebauer
-%% Copyright (C) 1997-2006 DANTE, Deutschsprachige
-%%                           Anwendervereinigung TeX e.V.
-%%
-%%  dtk.dtx is distributed in the hope that it  will  be useful, but
-%%  WITHOUT  ANY  WARRANTY.    No   author  or  distributor  accepts
-%%  responsibility to anyone for the consequences of using it or for
-%%  whether it serves any particular purpose or works at all, unless
-%%  he says so in writing.
-%%
-%%  Everyone is granted permission to  copy, modify and redistribute
-%%  dtk.dtx,  provided  this copyright notice is preserved  and  any
-%%  modifications are indicated.
+%% Copyright (C) 1997-2011 DANTE, Deutschsprachige
+%%                                Anwendervereinigung TeX e.V.
 %%
+%% It may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3c
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%%    http://www.latex-project.org/lppl.txt
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
 %%
 %%  This package is still under development and may be replaced with
 %%  a new version which provides enhanced functionality.
 %%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%  \CharacterTable
-%%  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
-%%   Lower-case    \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
-%%   Digits        \0\1\2\3\4\5\6\7\8\9
-%%   Exclamation   \!     Double quote  \"     Hash (number) \#
-%%   Dollar        \$     Percent       \%     Ampersand     \&
-%%   Acute accent  \'     Left paren    \(     Right paren   \)
-%%   Asterisk      \*     Plus          \+     Comma         \,
-%%   Minus         \-     Point         \.     Solidus       \/
-%%   Colon         \:     Semicolon     \;     Less than     \<
-%%   Equals        \=     Greater than  \>     Question mark \?
-%%   Commercial at \@     Left bracket  \[     Backslash     \\
-%%   Right bracket \]     Circumflex    \^     Underscore    \_
-%%   Grave accent  \`     Left brace    \{     Vertical bar  \|
-%%   Right brace   \}     Tilde         \~}
-%%
-%%^^A%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\def\DTKrcs$#1: #2 #3${#2}
-\def\filename{dtk.dtx}
-\xdef\fileversion{\DTKrcs$Revision: 1.9a $}
-\xdef\filedate{\DTKrcs$Date: 2005/10/29 18:17:42 $}
+\def\fileversion{1.9b}
+\def\filedate{2010/06/19}
 \let\docversion=\fileversion
 \let\docdate=\filedate
-\ProvidesPackage{dtk-pdf}[\filedate\space\fileversion\space  gene]
+\ProvidesPackage{dtk-pdf}[\filedate\space\fileversion\space  (gn,hv)]
 \RequirePackage{multicol,graphicx,color}
 \RequirePackage[bookmarks=false]{hyperref}
 \definecolor{navy}{rgb}{0,0,.5}
diff --git a/Master/texmf-dist/tex/latex/dtk/dtk.clo b/Master/texmf-dist/tex/latex/dtk/dtk.clo
index f34fc7d9759..c5114046cc9 100644
--- a/Master/texmf-dist/tex/latex/dtk/dtk.clo
+++ b/Master/texmf-dist/tex/latex/dtk/dtk.clo
@@ -1,6 +1,6 @@
+%%   $Id: dtk.clo 13 2010-06-19 06:53:35Z herbert $
 
-\ProvidesFile{dtk.clo}
-  [2009/11/07 v0.2 dtk class option (RN,hv)]
+\ProvidesFile{dtk.clo}[2009/11/07 v0.2 dtk class option (RN,hv)]
 
 \renewcommand\CoverArt[3]{%
   \ifx\CoverTitleFont\@undefined
@@ -81,13 +81,13 @@
 \RequirePackage[font=sf]{caption}
 
 \ifDTKcolor
-  \definecolor{DTKlstBackground}{rgb}{1,1,0.85}
+  \definecolor{DTKlstBackground}{rgb}{1,1,0.95}
   \definecolor{DTKlstKeys}{rgb}{0,0,1}
   \definecolor{DTKlstIdentifiers}{rgb}{0,0,0}
   \definecolor{DTKlstComments}{rgb}{1,0,0}
   \definecolor{DTKlstStrings}{rgb}{0,0.5,0}
 \else
-  \colorlet{DTKlstBackground}{black!10}
+  \colorlet{DTKlstBackground}{black!5}
   \colorlet{DTKlstKeys}{black}
   \colorlet{DTKlstIdentifiers}{black}
   \colorlet{DTKlstComments}{black}
diff --git a/Master/texmf-dist/tex/latex/dtk/dtk.cls b/Master/texmf-dist/tex/latex/dtk/dtk.cls
index 7034349d0f2..30c97c17359 100644
--- a/Master/texmf-dist/tex/latex/dtk/dtk.cls
+++ b/Master/texmf-dist/tex/latex/dtk/dtk.cls
@@ -1,11 +1,12 @@
+%%   $Id: dtk.cls 12 2010-06-19 06:45:56Z herbert $
 %%
 %% This is file `dtk.cls',
 %%
 %% LaTeX Class for ``Die TeXnische Komoedie''.
 %%
 %% Copyright (C) 1995-1996 Gerd Neugebauer
-%% Copyright (C) 1997-2010 DANTE, Deutschsprachige
-%%                           Anwendervereinigung TeX e.V.
+%% Copyright (C) 1997-2011 DANTE, Deutschsprachige
+%%                                Anwendervereinigung TeX e.V.
 %%
 %% It may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3c
@@ -16,12 +17,11 @@
 %% version 2005/12/01 or later.
 %
 \def\filename{dtk.cls}
-\def\fileversion{1.20}
-\def\filedate{2009/11/07}
+\def\fileversion{1.21}
+\def\filedate{2009/12/02}
 %
 \NeedsTeXFormat{LaTeX2e}[1995/12/01]
-\ProvidesClass{dtk}[\filedate~\fileversion 
-    dtk document class (gn,rn,hv)]
+\ProvidesClass{dtk}[\filedate~\fileversion~ dtk document class (gn,rn,hv)]
 \let\DTKversion=\fileversion
 \let\DTKdate=\filedate
 \newif\ifDTK@Author@
@@ -132,6 +132,7 @@
 \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*{\PassOptionsToClass{\CurrentOption}{book}}
 \else
 \DeclareOption*{%
@@ -160,8 +161,9 @@
   \RequirePackage{mathpazo,tgpagella}
 \else
   \ifDTK@tgschola@
-    \usepackage[charter,expert]{mathdesign}
-    \def\rmdefault{bch} % not scaled
+    \usepackage{libertine}
+%    \usepackage[charter,expert]{mathdesign}
+%    \def\rmdefault{bch} % not scaled
   \else
 %    \RequirePackage%[lucidascale]
 %	{lucidabr}
@@ -354,9 +356,9 @@
 \providecommand\Package[1]{\texttt{#1}}
 \providecommand\Program[1]{\texttt{#1}}
 \providecommand\Command[1]{\texttt{#1}}
-\providecommand\Macro[1]{\texttt{#1}}
+\providecommand\Macro[1]{\texttt{\textbackslash#1}}
 \providecommand\Environment[1]{\texttt{#1}}
-\providecommand\Email[1]{\texttt{#1}}
+\let\Email\url
 \providecommand\Acronym[1]{\textsc{#1}}
 \def\@listI{%
   \leftmargin = \leftmargini
diff --git a/Master/texmf-dist/tex/latex/dtk/dtk10.clo b/Master/texmf-dist/tex/latex/dtk/dtk10.clo
index 67d18dd570e..3cf38c8b315 100644
--- a/Master/texmf-dist/tex/latex/dtk/dtk10.clo
+++ b/Master/texmf-dist/tex/latex/dtk/dtk10.clo
@@ -1,8 +1,7 @@
-
-\ProvidesFile{dtk10.clo}
-  [2009/11/01 v0.1a dtk class option (RN)]
+%%   $Id: dtk10.clo 13 2010-06-19 06:53:35Z herbert $
+\ProvidesFile{dtk10.clo}[2010/04/19 v0.02 dtk class option (RN,hv)]
   
-\input{dtk.clo}
+\input{dtk.clo}%  Standardeinstellungen
 
 \IfFileExists{paralist.sty}{%
 \RequirePackage[neverdecrease]{paralist}
@@ -12,7 +11,18 @@
   \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}}{}
+
 \endinput
 
diff --git a/Master/texmf-dist/tex/latex/dtk/dtklogos.sty b/Master/texmf-dist/tex/latex/dtk/dtklogos.sty
index 8b36218254f..322b3a680c2 100644
--- a/Master/texmf-dist/tex/latex/dtk/dtklogos.sty
+++ b/Master/texmf-dist/tex/latex/dtk/dtklogos.sty
@@ -1,30 +1,9 @@
 %%
 %% This is file `dtklogos.sty',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% dtk.dtx  (with options: `logos')
-%% 
-%% IMPORTANT NOTICE:
-%% 
-%% For the copyright see the source file.
-%% 
-%% Any modified versions of this file must be renamed
-%% with new filenames distinct from dtklogos.sty.
 %% 
-%% For distribution of the original source see the terms
-%% for copying and modification in the file dtk.dtx.
-%% 
-%% This generated file may be distributed as long as the
-%% original source files, as listed above, are part of the
-%% same distribution. (The sources need not necessarily be
-%% in the same archive or directory.)
-%%  Time-stamp: "dtk.dtx        2006-08-11 18:18:53 CET Mittwoch  RN/HjG/hv"
-%%
-%%^^A%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%^^A $Id: dtk.dtx,v 1.9b 2006/08/11 21:03:42 hv Exp hv $
-%%^^A%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% $Id: dtklogos.sty 13 2010-06-19 06:53:35Z herbert $
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% Purpose:
 %%      LaTeX Class and Styles for ``Die TeXnische Komoedie''.
 %%
@@ -40,45 +19,23 @@
 %% Mail:   gene@gerd-neugebauer.de
 %%
 %% Copyright (C) 1995-1996 Gerd Neugebauer
-%% Copyright (C) 1997-2006 DANTE, Deutschsprachige
-%%                           Anwendervereinigung TeX e.V.
-%%
-%%  dtk.dtx is distributed in the hope that it  will  be useful, but
-%%  WITHOUT  ANY  WARRANTY.    No   author  or  distributor  accepts
-%%  responsibility to anyone for the consequences of using it or for
-%%  whether it serves any particular purpose or works at all, unless
-%%  he says so in writing.
-%%
-%%  Everyone is granted permission to  copy, modify and redistribute
-%%  dtk.dtx,  provided  this copyright notice is preserved  and  any
-%%  modifications are indicated.
+%% Copyright (C) 1997-2011 DANTE, Deutschsprachige
+%%                                Anwendervereinigung TeX e.V.
 %%
+%% This file may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3c
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%%    http://www.latex-project.org/lppl.txt
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
 %%
 %%  This package is still under development and may be replaced with
 %%  a new version which provides enhanced functionality.
 %%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%  \CharacterTable
-%%  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
-%%   Lower-case    \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
-%%   Digits        \0\1\2\3\4\5\6\7\8\9
-%%   Exclamation   \!     Double quote  \"     Hash (number) \#
-%%   Dollar        \$     Percent       \%     Ampersand     \&
-%%   Acute accent  \'     Left paren    \(     Right paren   \)
-%%   Asterisk      \*     Plus          \+     Comma         \,
-%%   Minus         \-     Point         \.     Solidus       \/
-%%   Colon         \:     Semicolon     \;     Less than     \<
-%%   Equals        \=     Greater than  \>     Question mark \?
-%%   Commercial at \@     Left bracket  \[     Backslash     \\
-%%   Right bracket \]     Circumflex    \^     Underscore    \_
-%%   Grave accent  \`     Left brace    \{     Vertical bar  \|
-%%   Right brace   \}     Tilde         \~}
-%%
-%%^^A%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\def\DTKrcs$#1: #2 #3${#2}
-\def\filename{dtk.dtx}
-\xdef\fileversion{\DTKrcs$Revision: 1.9a $}
-\xdef\filedate{\DTKrcs$Date: 2005/10/29 18:17:42 $}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\def\fileversion{1.9b}
+\def\filedate{2010/06/19}
 \let\docversion=\fileversion
 \let\docdate=\filedate
 \ProvidesPackage{dtklogos}[\filedate\space\fileversion\space  gene]
@@ -123,6 +80,7 @@
 \newcommand{\logo@smaller}{\protect\logo@sm@ller}
 \fi
 
+\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...
@@ -294,7 +252,7 @@
 \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\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}}}%