summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2012-04-10 22:49:39 +0000
committerKarl Berry <karl@freefriends.org>2012-04-10 22:49:39 +0000
commit9d8396ff9628e9480be84309c695c70270ed350c (patch)
treecb116d186e1ebc3515941fa3d7f2fdfe599aeedc /Master
parent66451865bece02ff6cc98dd7394af011b6f66f7f (diff)
dtk (10apr12)
git-svn-id: svn://tug.org/texlive/trunk@25909 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/latex/dtk/Changes1
-rw-r--r--Master/texmf-dist/tex/latex/dtk/dtk-pdf.sty9
-rw-r--r--Master/texmf-dist/tex/latex/dtk/dtk.clo43
-rw-r--r--Master/texmf-dist/tex/latex/dtk/dtk.cls23
-rw-r--r--Master/texmf-dist/tex/latex/dtk/dtk12.clo10
-rw-r--r--Master/texmf-dist/tex/latex/dtk/dtklogos.sty7
6 files changed, 64 insertions, 29 deletions
diff --git a/Master/texmf-dist/doc/latex/dtk/Changes b/Master/texmf-dist/doc/latex/dtk/Changes
index 05c4adc9a6f..1a72c6fc666 100644
--- a/Master/texmf-dist/doc/latex/dtk/Changes
+++ b/Master/texmf-dist/doc/latex/dtk/Changes
@@ -1,4 +1,5 @@
dtk.cls -----
+1.28 2012-02-20 - fix some more bugs with LuaTeX
1.27 2011-11-23 - fix some bugs with LuaTeX
1.26 2011-07-24 - redefine listings for use with luatex/xetex
1.25 2011-04-28 - recode the XeTeX and luateX part
diff --git a/Master/texmf-dist/tex/latex/dtk/dtk-pdf.sty b/Master/texmf-dist/tex/latex/dtk/dtk-pdf.sty
index 4d1727e852a..da40ed50538 100644
--- a/Master/texmf-dist/tex/latex/dtk/dtk-pdf.sty
+++ b/Master/texmf-dist/tex/latex/dtk/dtk-pdf.sty
@@ -2,7 +2,7 @@
%% This is file `dtk-pdf.sty',
%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% $Id: dtk-pdf.sty 24 2011-07-24 13:05:39Z herbert $
+%% $Id: dtk-pdf.sty 32 2012-04-10 13:33:57Z herbert $
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% Purpose: LaTeX Class and Styles for ``Die TeXnische Komoedie''.
%%
@@ -21,15 +21,16 @@
%% This package is still under development and may be replaced with
%% a new version which provides enhanced functionality.
%%
-\def\fileversion{1.21}
-\def\filedate{2011/06/22}
+\def\fileversion{1.22}
+\def\filedate{2012/02/20}
\let\docversion=\fileversion
\let\docdate=\filedate
\ProvidesPackage{dtk-pdf}[\filedate\space\fileversion\space (gn,hv)]
\RequirePackage{multicol,graphicx,color}
\RequirePackage[bookmarks=false]{hyperref}
\definecolor{navy}{rgb}{0,0,.5}
-\hypersetup{a5paper,colorlinks,urlcolor=navy}
+\hypersetup{%paper=a5,
+colorlinks,urlcolor=navy}
\oddsidemargin=-10mm
\evensidemargin=-10mm
\topmargin=-15mm
diff --git a/Master/texmf-dist/tex/latex/dtk/dtk.clo b/Master/texmf-dist/tex/latex/dtk/dtk.clo
index b862b468eeb..f6b9ba5dbc5 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 26 2011-10-27 13:02:03Z herbert $
+%% $Id: dtk.clo 32 2012-04-10 13:33:57Z herbert $
\ProvidesFile{dtk.clo}[2011/04/23 v0.4 dtk class option (RN,hv)]
@@ -14,7 +14,8 @@
\fi
\newsavebox\dtk@titlebox
\sbox\dtk@titlebox{\parbox{\textheight}{%
- \null\hfill\CoverTitleFont\fontsize{41.26}{42}\selectfont\journalname\hfill\null}}
+ \null\hfill\CoverTitleFont\fontsize{41.26}{42}\selectfont\color{black!60}%\journalname
+ Die \color{black}\TeX\color{black!60}nische Komödie\hfill\null}}
% \hspace*{5pt}
\rotatebox{90}{\usebox\dtk@titlebox}\
\rule{\CoverArt@barwidth}{\textheight}
@@ -89,13 +90,42 @@
\settowidth\@ovxx{#2}\settoheight\@ovyy{#2}%
\makebox[\@ovxx][c]{\colorbox{#1}{\raisebox{0pt}[\@ovyy][0pt]{#2}}}%
}
+
\newcommand\Small{\fontsize{9}{9.2}\selectfont}
-%\ifluatex
-%\newcommand*\DTKlstfont{\Small\ttfamily}%\lsstyle}
-%\else
+\ifluatex
+\newcommand*\DTKlstfont{\Small\ttfamily}%\lsstyle}
+\lstdefinestyle{DTKlstBase}{%
+ basicstyle=\DTKlstfont,
+ basewidth=0.55em,
+ keepspaces,
+ identifierstyle=\color{DTKlstIdentifiers},
+ keywordstyle=\color{DTKlstKeys},
+ stringstyle=\itshape\color{DTKlstStrings},
+ commentstyle=\itshape\color{DTKlstComments},
+ columns=fullflexible,
+ tabsize=2,
+ frame=single,
+ extendedchars=true,
+ showspaces=false,
+ showstringspaces=false,
+ breaklines=true,
+ breakindent=0.5em,
+ backgroundcolor=\color{DTKlstBackground},
+ breakautoindent=true,
+ captionpos=t,
+ aboveskip=\medskipamount,
+ belowskip=\medskipamount,
+ xrightmargin=\fboxsep,
+ emphstyle=\DTK@lst@colorbox{lightgray},
+ prebreak=,
+ postbreak=\mbox{$\hookrightarrow$},
+% literate={ä}{{\"a}}1 {ö}{{\"o}}1 {ü}{{\"u}}1
+% {Ä}{{\"A}}1 {Ö}{{\"O}}1 {Ü}{{\"U}}1 {ß}{\ss}1
+}
+
+\else
\newcommand*\DTKlstfont{\Small\ttfamily\SetTracking{encoding=*}{-60}\lsstyle}
-%\fi
\lstdefinestyle{DTKlstBase}{%
basicstyle=\DTKlstfont,
basewidth=0.55em,
@@ -124,6 +154,7 @@
literate={ä}{{\"a}}1 {ö}{{\"o}}1 {ü}{{\"u}}1
{Ä}{{\"A}}1 {Ö}{{\"O}}1 {Ü}{{\"U}}1 {ß}{\ss}1
}
+\fi
\lstdefinestyle{DTKlstNumber}{%
style=DTKlstBase,
diff --git a/Master/texmf-dist/tex/latex/dtk/dtk.cls b/Master/texmf-dist/tex/latex/dtk/dtk.cls
index 615d801b79f..da63f9b1f24 100644
--- a/Master/texmf-dist/tex/latex/dtk/dtk.cls
+++ b/Master/texmf-dist/tex/latex/dtk/dtk.cls
@@ -1,11 +1,11 @@
-%% $Id: dtk.cls 28 2011-11-28 07:11:14Z herbert $
+%% $Id: dtk.cls 32 2012-04-10 13:33:57Z herbert $
%%
%% This is file `dtk.cls',
%%
%% LaTeX Class for ``Die TeXnische Komoedie''.
%%
%% Copyright (C) 1995-1996 Gerd Neugebauer
-%% Copyright (C) 1997-2011 DANTE, Deutschsprachige
+%% Copyright (C) 1997-2012 DANTE, Deutschsprachige
%% Anwendervereinigung TeX e.V.
%%
%% It may be distributed and/or modified under the
@@ -17,8 +17,8 @@
%% version 2005/12/01 or later.
%
\def\filename{dtk.cls}
-\def\fileversion{1.27}
-\def\filedate{2011/11/23}
+\def\fileversion{1.28}
+\def\filedate{2012/04/10}
%
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesClass{dtk}[\filedate~\fileversion~ dtk document class (gn,rn,hv)]
@@ -166,7 +166,7 @@
\else\ifluatex
% \RequirePackage{kpfonts}
\RequirePackage{eurosym}
-% \RequirePackage{amsmath}
+ \RequirePackage{amsmath}
% \RequirePackage{libertineotf}
\PassOptionsToPackage{no-math}{fontspec}
\RequirePackage{fontspec}
@@ -368,11 +368,11 @@
^gdef^@Path#1{^texttt{#1}^endgroup}
^endgroup
\DeclareUrlCommand\File{\urlstyle{tt}}
-\providecommand\Package[1]{\texttt{#1}}
-\providecommand\Program[1]{\texttt{#1}}
-\providecommand\Command[1]{\texttt{#1}}
-\providecommand\Macro[1]{\texttt{\textbackslash#1}}
-\providecommand\Environment[1]{\texttt{#1}}
+\providecommand\Package[1]{\mbox{\texttt{#1}}}
+\providecommand\Program[1]{\mbox{\texttt{#1}}}
+\providecommand\Command[1]{\mbox{\texttt{#1}}}
+\providecommand\Macro[1]{\mbox{\texttt{\textbackslash#1}}}
+\providecommand\Environment[1]{\mbox{\texttt{#1}}}
\let\Env\Environment
\let\Email\url
\providecommand\Acronym[1]{\textsc{#1}}
@@ -841,7 +841,8 @@
\newcommand\ContentsArt{%
\vspace*{-\headheight}\vspace*{-\headsep}\vspace*{-2pt}
\begin{minipage}{\textwidth}
- \Huge \journalname\\[2pt]%
+ \Huge\color{black!60}Die \color{black}\TeX\color{black!60}nische Komödie% \journalname
+ \\[2pt]%
\rule{\textwidth}{2pt}\\[2pt]%
\null\hfill
\CoverArt@small
diff --git a/Master/texmf-dist/tex/latex/dtk/dtk12.clo b/Master/texmf-dist/tex/latex/dtk/dtk12.clo
index 9e5e3119e57..a1ebac794e4 100644
--- a/Master/texmf-dist/tex/latex/dtk/dtk12.clo
+++ b/Master/texmf-dist/tex/latex/dtk/dtk12.clo
@@ -1,5 +1,5 @@
-%% $Id: dtk11.clo -1 $
-\ProvidesFile{dtk12.clo}[2011/12/27 v0.01 dtk class option (RN,hv)]
+%% $Id: dtk12.clo 33 2012-04-10 13:35:01Z herbert $
+\ProvidesFile{dtk12.clo}[2012/04/10 v0.02 dtk class option (RN,hv)]
\input{dtk.clo}% Standardeinstellungen
@@ -53,14 +53,14 @@
\def\endFigure{%
\end{lrbox}\begin{figure}[!htb]%
\abovecaptionskip=0pt\belowcaptionskip=0pt
- \ifthenelse{\isodd{\pageref{\thetable:WideTable}}}%
+ \ifthenelse{\isodd{\pageref{\thefigure:WideFigure}}}%
{\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}%
+ \minipage[t]{\de@Width-\wd\tempbox}\vspace{0pt}\label{\thefigure:WideFigure}%
\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}%
+ \minipage[t]{\de@Width-\wd\tempbox}\vspace{0pt}\label{\thefigure:WideFigure}%
\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}%
diff --git a/Master/texmf-dist/tex/latex/dtk/dtklogos.sty b/Master/texmf-dist/tex/latex/dtk/dtklogos.sty
index c38387510d1..0eb4026dc0f 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 27 2011-11-28 07:10:33Z herbert $
+%% $Id: dtklogos.sty 32 2012-04-10 13:33:57Z herbert $
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% Purpose:
%% LaTeX Class and Styles for ``Die TeXnische Komoedie''.
@@ -32,11 +32,11 @@
\RequirePackage{graphicx}
\RequirePackage{metalogo}
\RequirePackage{ifpdf}
-\providecommand\AmS{\(\cal A\)\kern-.1667em\lower.5ex\hbox{\(\cal M\)}\kern-.125em{\(\cal S\)}}
+\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{%
+\providecommand\AmSTeX{\normalfont%
$\cal A$\kern-.1667em\lower.5ex\hbox{$\cal M$}%
\kern-.125em$\cal S$-\TeX}
\providecommand\AMSTEX{\AmSTeX}
@@ -72,6 +72,7 @@
}\kern-.2em)%
\kern-.15em%
\TeX}
+\providecommand\TeXLive{\TeX{}Live}
\DeclareFontFamily{U}{logo}{}
\DeclareFontShape{U}{logo}{m}{n}{
<8> <9> gen * logo