dtk (30may12)

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

4 files changed, 41 insertions, 48 deletions

diff --git a/Master/texmf-dist/tex/latex/dtk/dtk.clo b/Master/texmf-dist/tex/latex/dtk/dtk.clo
index f6b9ba5dbc5..cd6b4997c1b 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 32 2012-04-10 13:33:57Z herbert $
+%%   $Id: dtk.clo 36 2012-05-02 19:43:14Z herbert $
 
 \ProvidesFile{dtk.clo}[2011/04/23 v0.4 dtk class option (RN,hv)]
 
@@ -123,7 +123,6 @@
 %     literate={ä}{{\"a}}1 {ö}{{\"o}}1 {ü}{{\"u}}1
 %       {Ä}{{\"A}}1 {Ö}{{\"O}}1 {Ü}{{\"U}}1 {ß}{\ss}1
 }
-
 \else
 \newcommand*\DTKlstfont{\Small\ttfamily\SetTracking{encoding=*}{-60}\lsstyle}
 \lstdefinestyle{DTKlstBase}{%
@@ -180,9 +179,7 @@
 {\lstset{language={},style=DTKlstNoNumber}}
 {}
 
-\AtBeginDocument{%
-  \belowcaptionskip=\abovecaptionskip
-}
+\AtBeginDocument{\belowcaptionskip=\abovecaptionskip}
 
 \lstset{style=DTKlstNoNumber}
 
diff --git a/Master/texmf-dist/tex/latex/dtk/dtk.cls b/Master/texmf-dist/tex/latex/dtk/dtk.cls
index da63f9b1f24..f585c216d80 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 32 2012-04-10 13:33:57Z herbert $
+%%   $Id: dtk.cls 36 2012-05-02 19:43:14Z herbert $
 %%
 %% This is file `dtk.cls',
 %%
@@ -17,8 +17,8 @@
 %% version 2005/12/01 or later.
 %
 \def\filename{dtk.cls}
-\def\fileversion{1.28}
-\def\filedate{2012/04/10}
+\def\fileversion{1.29}
+\def\filedate{2012/05/30}
 %
 \NeedsTeXFormat{LaTeX2e}[1995/12/01]
 \ProvidesClass{dtk}[\filedate~\fileversion~ dtk document class (gn,rn,hv)]
@@ -131,6 +131,7 @@
 \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*{%
@@ -156,29 +157,27 @@
 %%%%%%%%%%
 \RequirePackage{ifxetex}
 \RequirePackage{ifluatex}
-\ifxetex
-  \RequirePackage{mathspec}
-  \setmathsfont(Digits,Latin,Greek)[Numbers={Lining,Proportional},Scale=0.95]{lmmath-regular.otf}
-%  \RequirePackage{mathpazo}
-  \setmainfont[Scale=0.95,Mapping=tex-text]{TeX Gyre Pagella}
-  \setsansfont[Scale=0.92,Mapping=tex-text]{TeX Gyre Heros}
-  \setmonofont[Scale=0.83,Mapping=tex-text]{Bitstream Vera Sans Mono}
-\else\ifluatex
-%  \RequirePackage{kpfonts}
+\ifluatex
+  \RequirePackage{textcomp}
   \RequirePackage{eurosym}
+  \let\EURO\euro
   \RequirePackage{amsmath}
-%  \RequirePackage{libertineotf}
-  \PassOptionsToPackage{no-math}{fontspec}
-  \RequirePackage{fontspec}
-%  \usepackage{luaotfload}
+%  \PassOptionsToPackage{no-math}{fontspec}
+  \RequirePackage%[mono={Scale=0.82}]
+  {libertineotf}
   \RequirePackage{unicode-math}  
   \setmathfont%[math-style=TeX,
 %                  bold-style=TeX]
 {Latin Modern Math} 
   \setmathfont[range={\mathcal,\mathbfcal}]{XITS Math} 
-  \setmainfont[Scale=0.95,Ligatures=TeX]{TeX Gyre Pagella}
-  \setsansfont[Scale=0.90,Ligatures=TeX]{TeX Gyre Heros}
-  \setmonofont[Scale=0.81,Ligatures=TeX]{Bitstream Vera Sans Mono}
+%  \setmainfont[Ligatures=TeX]{Linux Libertine O}
+%  \setsansfont[Ligatures=TeX]{Linux Biolinum O}
+  \g@addto@macro{\sffamily}{\fontdimen5\font=\fontcharht\font`\x}
+
+%  \setmainfont[Scale=0.95,Ligatures=TeX]{TeX Gyre Pagella}
+%  \setsansfont[Scale=0.90,Ligatures=TeX]{TeX Gyre Heros}
+%  \setmonofont[Scale=0.81,Ligatures=TeX]{Bitstream Vera Sans Mono}
+  \setmonofont[Scale=0.81,Ligatures=TeX]{Luxi Mono}
 %  \setmonofont[Scale=1.05,Ligatures=TeX]{LMMonoLtCond10-Regular}
 %  \setmathrm[ItalicFont=LMRoman10-Italic,
 %             BoldItalicFont=LMRoman10-BoldItalic]{Latin Modern Math}
@@ -197,10 +196,11 @@
   \ifDTK@Author@\else\RequirePackage[utf8]{inputenc}\fi
   \RequirePackage[full]{textcomp}
   \RequirePackage{cmap}
-\fi\fi
+\fi
 \RequirePackage[factor=1500,verbose=true,final=true]{microtype}
 %
 \usepackage{fixltx2e}
+\RequirePackage{afterpage}
 \usepackage[hyphens]{url}
 \DeclareRobustCommand*{\URL}{\url}
 \usepackage[newcommands,newparameters]{ragged2e}
@@ -213,7 +213,7 @@
 \RequirePackage{graphicx}
 \RequirePackage{xspace,shortvrb}
 \RequirePackage[bottom,marginal]{footmisc}
-\RequirePackage{array,calc}
+\RequirePackage{array}
 \RequirePackage{enumerate}
 \RequirePackage{booktabs}
 \RequirePackage{subfig}
@@ -256,8 +256,8 @@
   \let\captionsgerman=\DTK@captionsgerman
   \@ifundefined{l@ngerman}{}{\selectlanguage{ngerman}}%
 }
-\newcommand\DTK@captionsgerman{
-  \DTK@captionsgerman
+\newcommand\DTK@captionsgerman{%
+  \DTK@captionsgerman%
   \gdef\refname{Literatur}%
   \gdef\bibname{Literatur}%
   \gdef\contentsname{Inhalt Heft \Volume}%
@@ -304,7 +304,7 @@
     \let\@LN@col\@gobble
   \fi
 \fi
-\newcommand\footmark{\journalname\ \volume}
+\newcommand\footmark{{\sffamily\journalname} \volume}
 \newcommand\ChapterFont{\Large\sf}
 \newcommand\SectionFont{\large\sf}
 \newcommand\SubsectionFont{\normalsize\sf}
@@ -499,8 +499,8 @@
 
 \renewcommand\title[2][]{%
   \gdef\@title{#2}%
-  \def\@titletemp{#1}
-  \ifx\@titletemp\@empty\gdef\@@title{#2}\else\gdef\@@title{#1}\fi}
+  \ifx\relax#1\relax\gdef\@@title{#2}\else\gdef\@@title{#1}\fi%
+}
 
 \renewcommand\maketitle[1][]{%
   \ifDTK@Author@ \thispagestyle{part}\fi
@@ -537,7 +537,6 @@
     \@thanks
     \let\thanks\@gobble
     \addcontentsline{toc}{chapter}{\@@title}%
-    \ifx\relax#1\relax\markboth{\@@title}{\@@title}\else\markboth{#1}{#1}\fi%
   \endgroup
   \let\@title=\@empty
   \let\@author=\@empty
@@ -546,16 +545,17 @@
   \setcounter{table}0
   \setcounter{equation}0
   \medskip\par}
+
 \newcommand\DTKtitle@skip{12pt}
 \newcommand\DTKtitle@sep{\vspace{32pt plus 8pt minus 16pt}}
+%
 \renewcommand\and{, }
 \let\@title=\@empty
 \let\@author=\@empty
 \let\@thanks=\@empty
-\newenvironment{abstract}{%
-  \begin{quote}\small
-    }{%
-  \end{quote}\medskip\par}
+\newenvironment{abstract}
+  {\begin{quote}\small}
+  {\end{quote}\medskip\par}
 \renewcommand\thefigure{\arabic{figure}}
 \renewcommand\thetable{\arabic{table}}
 \renewcommand\theequation{\arabic{equation}}
@@ -887,11 +887,7 @@
      #1\par
   \endgroup}
 
-\iffalse% RN 2005-01-15
-\@ifundefined{DTK@layout}{}{\input dtk\DTK@layout.clo}
-\else
 \@ifundefined{DTK@layout}{}{\input{dtk\DTK@layout.clo}}
-\fi
 
 \begingroup
   \chardef\x=0 %
diff --git a/Master/texmf-dist/tex/latex/dtk/dtk12.clo b/Master/texmf-dist/tex/latex/dtk/dtk12.clo
index a1ebac794e4..ff9f9e647db 100644
--- a/Master/texmf-dist/tex/latex/dtk/dtk12.clo
+++ b/Master/texmf-dist/tex/latex/dtk/dtk12.clo
@@ -1,4 +1,4 @@
-%%   $Id: dtk12.clo 33 2012-04-10 13:35:01Z herbert $
+%%   $Id: dtk12.clo 37 2012-05-30 12:01:13Z herbert $
 \ProvidesFile{dtk12.clo}[2012/04/10 v0.02 dtk class option (RN,hv)]
   
 \input{dtk.clo}%  Standardeinstellungen
@@ -9,10 +9,10 @@
 
 \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}
+\setlength\fullwidth{\dimexpr\textwidth +\marginparwidth -4mm}% wegen Anschnitt
+%\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
diff --git a/Master/texmf-dist/tex/latex/dtk/dtklogos.sty b/Master/texmf-dist/tex/latex/dtk/dtklogos.sty
index 0eb4026dc0f..733c6446a30 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 32 2012-04-10 13:33:57Z herbert $
+%% $Id: dtklogos.sty 36 2012-05-02 19:43:14Z herbert $
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% Purpose:
 %%      LaTeX Class and Styles for ``Die TeXnische Komoedie''.
@@ -23,8 +23,8 @@
 %%  a new version which provides enhanced functionality.
 %%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\def\fileversion{2.13}
-\def\filedate{2011/11/23}
+\def\fileversion{2.15}
+\def\filedate{2012/05/02}
 \let\docversion=\fileversion
 \let\docdate=\filedate
 \ProvidesPackage{dtklogos}[\filedate\space\fileversion\space  (hv)]