summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/dtk
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2014-07-12 22:25:37 +0000
committerKarl Berry <karl@freefriends.org>2014-07-12 22:25:37 +0000
commit9d85507cc05a02dc5f4ad00257fdfb320484d2df (patch)
tree2788ad2c60bd5919fbc1f852ce5da8980ed58af2 /Master/texmf-dist/tex/latex/dtk
parenta6450e64fc64a66a23150faaf2f7a17d2e00eca0 (diff)
dtk (12jul14)
git-svn-id: svn://tug.org/texlive/trunk@34583 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/dtk')
-rw-r--r--Master/texmf-dist/tex/latex/dtk/dtk.clo57
-rw-r--r--Master/texmf-dist/tex/latex/dtk/dtk.cls194
-rw-r--r--Master/texmf-dist/tex/latex/dtk/dtk12.clo31
-rw-r--r--Master/texmf-dist/tex/latex/dtk/dtklogos.sty88
4 files changed, 164 insertions, 206 deletions
diff --git a/Master/texmf-dist/tex/latex/dtk/dtk.clo b/Master/texmf-dist/tex/latex/dtk/dtk.clo
index a88f842068b..b3d35d25b7b 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 37 2012-05-30 12:01:13Z herbert $
+%% $Id: dtk.clo 42 2014-07-08 17:34:44Z herbert $
-\ProvidesFile{dtk.clo}[2011/04/23 v0.4 dtk class option (RN,hv)]
+\ProvidesFile{dtk.clo}[2011/04/23 v0.5 dtk class option (RN,hv)]
\newcommand\CoverArt[3]{%
\ifx\CoverTitleFont\@undefined
@@ -46,28 +46,12 @@
%\PassOptionsToPackage{ngerman}{babel}
%\RequirePackage[ngerman]{babel}
-\iffalse
-\declare@shorthand{ngerman}{"`}{\frqq}%
-\declare@shorthand{ngerman}{"'}{\flqq}%
-%\def@dqmacro{`}{\frqq}{\frqq}
-%\def@dqmacro{'}{\flqq}{\flqq}
-\else
- \@ifpackageloaded{babel}{%
- \defineshorthand{"`}{\guillemotright}
- \defineshorthand{"'}{\guillemotleft}
- }{%
- \@ifpackageloaded{ngerman}{%
- \def@dqmacro{`}{\frqq}{\frqq}
- \def@dqmacro{'}{\flqq}{\flqq}
- }{}%
- }
-\fi
-
\newif\ifDTKcolor \DTKcolorfalse
\RequirePackage{xcolor}
\RequirePackage{longtable}
\RequirePackage{caption}
+\captionsetup{justification=RaggedRight}
\ifDTKcolor
\definecolor{DTKlstBackground}{rgb}{1,1,0.95}
@@ -94,7 +78,7 @@
\newcommand\Small{\fontsize{9}{9.2}\selectfont}
\ifluatex
-\newcommand*\DTKlstfont{\Small\ttfamily}%\lsstyle}
+\newcommand*\DTKlstfont{\Small\ttfamily\addfontfeature{FakeStretch=0.9}}%\lsstyle}
\lstdefinestyle{DTKlstBase}{%
basicstyle=\DTKlstfont,
basewidth=0.55em,
@@ -189,5 +173,38 @@
\newcommand\fboxlinewidth[1][\textwidth]{\dimexpr#1-2\fboxsep-2\fboxrule\relax}
\newcommand\tabcolwidth[2][\columnwidth]{\dimexpr#1-#2\tabcolsep\relax}
+\newcommand*{\dudenpt}{\@ifnextchar\bgroup\dudenpt@arg\dudenpt@}
+\newcommand*{\dudenpt@arg}[1]{\dudenpt@#1\relax}
+\newcommand*{\dudenpt@}{%
+ \begingroup
+ \afterassignment\@dudenpt
+ \dimen@=}
+\newcommand*{\@dudenpt}{%
+ \expandafter\endgroup
+ \expandafter\duden@pt\the\dimen@}
+\begingroup
+ \catcode`P=12
+ \catcode`T=12
+ \lowercase{%
+ \def\x{%
+ \def\duden@pt##1.##2PT{%
+ ##1\ifnum##2>\z@.##2\fi
+ \ifcase
+ \ifnum##2>\z@\@ne
+ \else\ifnum##1>9 \@ne
+ \else\ifnum##1<\z@ \@ne
+ \else \z@
+ \fi\fi\fi
+ \thinspace
+ \else
+ \nobreakspace
+ \fi
+ pt%
+ }%
+ }%
+ }%
+\expandafter\endgroup\x
+
+
\endinput
diff --git a/Master/texmf-dist/tex/latex/dtk/dtk.cls b/Master/texmf-dist/tex/latex/dtk/dtk.cls
index 32a51df1ffc..b511d1ed8c8 100644
--- a/Master/texmf-dist/tex/latex/dtk/dtk.cls
+++ b/Master/texmf-dist/tex/latex/dtk/dtk.cls
@@ -1,12 +1,11 @@
-%% $Id: dtk.cls 37 2012-05-30 12:01:13Z herbert $
+%% $Id: dtk.cls 42 2014-07-08 17:34:44Z herbert $
%%
%% This is file `dtk.cls',
%%
%% LaTeX Class for ``Die TeXnische Komoedie''.
%%
%% Copyright (C) 1995-1996 Gerd Neugebauer
-%% Copyright (C) 1997-2012 DANTE, Deutschsprachige
-%% Anwendervereinigung TeX e.V.
+%% Copyright (C) 1997-2014 Herbert Voß
%%
%% It may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3c
@@ -17,8 +16,8 @@
%% version 2005/12/01 or later.
%
\def\filename{dtk.cls}
-\def\fileversion{1.29}
-\def\filedate{2012/05/30}
+\def\fileversion{1.30}
+\def\filedate{2014/07/07}
%
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesClass{dtk}[\filedate~\fileversion~ dtk document class (gn,rn,hv)]
@@ -50,19 +49,20 @@
\let\ProcessOptions=\relax
\let\OptionNotUsed=\gobble
\def\ProvidesClass#1[#2]{\typeout{Document Style #1 #2}}
- \newcommand\emph[1]{{\em #1}\/}
- \newcommand\textbf[1]{{\bf #1}}
- \newcommand\textrm[1]{{\rm #1}}
- \newcommand\textsc[1]{{\sc #1}}
- \newcommand\textsf[1]{{\sf #1}}
- \newcommand\textsl[1]{{\sl #1\/}}
- \newcommand\textit[1]{{\it #1\/}}
- \newcommand\texttt[1]{{\tt #1}}
-
+\iffalse
+ \providecommand\emph[1]{{\em#1}}
+ \providecommand\textbf[1]{{\bf#1}}
+ \providecommand\textrm[1]{{\rm#1}}
+ \providecommand\textsc[1]{{\sc#1}}
+ \providecommand\textsf[1]{{\sf#1}}
+ \providecommand\textsl[1]{{\sl#1}}
+ \providecommand\textit[1]{{\it#1}}
+ \providecommand\texttt[1]{{\tt#1}}
+\fi
\@ifundefined{fontshape}{\let\fontshape=\@gobble}{}
\@ifundefined{selectfont}{\let\selectfont=\relax}{}
- \newcommand\providescommand[2]{\ifx#1\@undefined\newcommand#1{#2}\fi}
+ \newcommand\providecommand[2]{\ifx#1\@undefined\newcommand#1{#2}\fi}
\fi
\newread\DTK@file
\ProvidesClass{dtk}[\filedate\space\fileversion\space gene]
@@ -142,9 +142,10 @@
\fi
\ProcessOptions
\LoadClass{book}
+\RequirePackage{fixltx2e}
+\RequirePackage{xcolor}%
\ifDTK@lineno@
\RequirePackage{lineno}\linenumbers
- \RequirePackage{xcolor}%
\linenumbersep=.8ex
\def\linenumberfont{\normalfont\scriptsize\sffamily\bfseries}%
\definecolor{DTK@lineno@color}{cmyk}{0.26,0,0.76,0}% SpringGreen
@@ -155,6 +156,7 @@
\endgroup}%
\fi
%%%%%%%%%%
+\RequirePackage{etex}
\RequirePackage{ifxetex}
\RequirePackage{ifluatex}
\ifluatex
@@ -162,31 +164,29 @@
\RequirePackage{textcomp}
\RequirePackage{eurosym}
\let\EURO\euro
+% \usepackage{expl3}%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% \ExplSyntaxOn
+% \let\lua_now_x:n\directlua
+% \ExplSyntaxOff
\RequirePackage{amsmath}
-% \PassOptionsToPackage{no-math}{fontspec}
- \RequirePackage%[mono={Scale=0.82}]
- {libertineotf}
+ \RequirePackage{fontspec}
\RequirePackage{unicode-math}
- \setmathfont%[math-style=TeX,
-% bold-style=TeX]
-{Latin Modern Math}
- \setmathfont[range={\mathcal,\mathbfcal}]{XITS Math}
-% \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}
-% \setmathsf{Latin Modern Math}
-% \setmathtt{Latin Modern Math}
-% \setboldmathrm{Latin Modern Math}
+ \RequirePackage[lining=true]{libertine}
+ \setmathfont[Scale=0.9,math-style=TeX,bold-style=TeX]{XITS Math}
+% \setmathfont[range=8728]{Neo Euler}%%% "2218
+ \let\degrees\vysmwhtcircle
+% \setmonofont[Scale=0.81]{Luxi Mono}
+ \setmonofont[Scale=0.81]{Bitstream Vera Sans Mono}
+% \setmonofont[Scale=0.81]{Lucida Sans Typewriter}
\usepackage{luacode}
-% \usepackage[utf8]{luainputenc}
+% \usepackage{polyglossia}
+ \usepackage{babel}
+ \usepackage[autostyle,german=guillemets]{csquotes}
+ \usepackage[ngerman]{selnolig}
+ \nolig{Herbstt[aruöe]}{Herbst|t}
+ \nolig{Mitt[iruä]}{Mit|t}
+% \MakeAutoQuote{»}{«}
+% \setmainlanguage[spelling=new,latesthyphen=true,babelshorthands=true]{german}
\else
\RequirePackage[T1]{fontenc}
\RequirePackage{mathpazo}
@@ -194,23 +194,24 @@
\RequirePackage[scale=0.92]{tgheros}
\RequirePackage[scaled=0.83]{beramono}
- \ifDTK@Author@\else\RequirePackage[utf8]{inputenc}\fi
+ \RequirePackage[utf8]{inputenc}
\RequirePackage[full]{textcomp}
\RequirePackage{cmap}
+ \RequirePackage{babel}
+ \usepackage[autostyle,german=guillemets]{csquotes}
+% \MakeAutoQuote{»}{«}
\fi
-\RequirePackage[factor=1500,verbose=true,final=true]{microtype}
+\RequirePackage[%factor=1500,
+ verbose=true,final=true]{microtype}
%
-\usepackage{fixltx2e}
\RequirePackage{afterpage}
\usepackage[hyphens]{url}
\DeclareRobustCommand*{\URL}{\url}
+\def\UrlFont{\ttfamily\Small}
\usepackage[newcommands,newparameters]{ragged2e}
\usepackage{filecontents}
-\RequirePackage{babel}
\RequirePackage{tabularx}
-%\RequirePackage{eurosym}
-%\AtBeginDocument{\DeclareTextCommandDefault{\texteuro}{\euro}}% ???
\RequirePackage{graphicx}
\RequirePackage{xspace,shortvrb}
\RequirePackage[bottom,marginal]{footmisc}
@@ -221,23 +222,21 @@
\RequirePackage{setspace}
\RequirePackage{multicol}
-\ifDTK@Author@\else
- \RequirePackage{graphicx,xcolor}
- \errorcontextlines=100\relax
-\fi
\RequirePackage{dtklogos}
-\paperwidth = 148.5mm
+\paperwidth = 148mm
\paperheight = 210mm
\textheight = 485pt %%%%471pt
\textwidth = 333pt
\oddsidemargin = 0pt
-\evensidemargin = \oddsidemargin\oddsidemargin -35.89157pt
+\evensidemargin = \oddsidemargin
+\oddsidemargin -35.89157pt
\evensidemargin -17.70235pt
\topmargin -55.66684pt
\headheight = 17pt
\headsep = 17pt
\footskip = 24pt
-\parskip = 0.3\baselineskip \advance\parskip by 0pt plus 2pt
+\parskip = 0.3\baselineskip
+\advance\parskip by 0pt plus 2pt
\parindent = 0pt
\renewcommand\topfraction{.9}
\renewcommand\bottomfraction{.9}
@@ -267,7 +266,7 @@
\DTKgerman
\fi
\newcommand\addressname{Autoren/Organisatoren}
-\newcommand\journalname{Die \TeX nische Kom\"odie}
+\newcommand\journalname{Die \TeX{}nische Kom\"odie}
\newcommand\Volume{?/??}
\newcommand\volume{\Volume\ --- Entwurf \today\
\begingroup
@@ -311,7 +310,7 @@
\newcommand\SubsectionFont{\normalsize\sf}
\newcommand\SubsubsectionFont{\normalsize\sf}
\newcommand\AuthorFont{\large\sf}
-\newcommand\TitleFont{\Large\sf}
+\newcommand\TitleFont{\Large\sf\RaggedRight}
\newcommand\HeadFont{\sf\fontshape{sl}\selectfont}
\newcommand\FootFont{\footnotesize\sf\fontshape{sl}\selectfont}
\newcommand\PagenoFont{\sf}
@@ -368,14 +367,16 @@
^@Path}
^gdef^@Path#1{^texttt{#1}^endgroup}
^endgroup
-\DeclareUrlCommand\File{\urlstyle{tt}}
+%
+%\DeclareUrlCommand\File{\urlstyle{tt}}
+\providecommand\File[1]{\mbox{\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
+\let\Email\Url
\providecommand\Acronym[1]{\textsc{#1}}
\def\@listI{%
\leftmargin = \leftmargini
@@ -399,9 +400,9 @@
\topsep = 0pt plus 2pt
\itemsep = 0pt plus 2pt}
\@listi
-\renewcommand\labelitemi{$\m@th\circ$}
-\renewcommand\labelitemii{$\m@th\triangleright$}
-\renewcommand\labelitemiii{$\m@th\diamond$}
+%\renewcommand\labelitemi{$\m@th\mdwhtcircle$}
+%\renewcommand\labelitemii{$\m@th\whitepointerright%\triangleright$}
+%\renewcommand\labelitemiii{$\m@th\diamond$}
\setlength\leftmargini{1.5em}
\setlength\leftmarginii{1.4em}
\setlength\leftmarginiii{1.3em}
@@ -442,17 +443,12 @@
\setcounter{secnumdepth}{0}
\newif\ifFirstArticle
\FirstArticletrue
-\ifDTK@Author@
- \renewcommand\part{%
- \typeout{*** Parts can not be used in single articles.}}
-\else
- \renewcommand\part{%
+\renewcommand\part{%
\clearpage
\thispagestyle{part}%
\FirstArticletrue
\Advance@Label@Prefix
\@ifstar{\part@star{chapter}}{\part@star{part}}}
-\fi
\newcommand\part@star[1]{%
\@ifnextchar[{\part@optional{#1}}{\part@normal{#1}}}
\def\part@optional#1[#2]#3{%
@@ -472,14 +468,9 @@
{\huge\sf #1}\\[-.5ex]\rule{\textwidth}{\TopArtRule}%
\vspace{2pt} #2
\end{minipage}}
-\ifDTK@Author@
- \renewcommand\chapter{%
- \typeout{*** Chapters can not be used in single articles.}}
-\else
\renewcommand\chapter{%
\@ifnextchar*{\chapter@star}{%
\@ifnextchar[{\chapter@optional}{\chapter@normal}}}
-\fi
\def\chapter@star*{\chapter}
\def\chapter@normal#1{\chapter@optional[#1]{#1}}
\def\chapter@optional[#1]{%
@@ -515,6 +506,7 @@
\fi
\endgroup
\Advance@Label@Prefix
+ \markboth{}{}%
\begingroup
\begin{minipage}{\textwidth}
\ifFirstArticle
@@ -523,7 +515,8 @@
\else
\DTKtitle@sep
\fi
- \setcounter{footnote}0
+% \setcounter{footnote}0 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% hv 20130205
+ \setcounter{lstlisting}0 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% hv 20130205
\@flushglue=0pt plus .3\textwidth\relax
\raggedright
\TitleFont
@@ -614,11 +607,11 @@
\let\subsectionmark=\@gobble
\def\@oddhead{\vbox{\hbox to \textwidth{%
\let\\=\relax
- \HeadFont \rightmark \hfil\PagenoFont\thepage}\kern 3pt
+ \HeadFont \rightmark \hfil\PagenoFont\vphantom{g}\thepage}\kern 3pt
\ifdim\HeadRuleDepth>0pt \hrule depth\HeadRuleDepth\fi}}%
\def\@evenhead{\vbox{\hbox to \textwidth{%
\let\\=\relax
- \PagenoFont \thepage\hfil\HeadFont \leftmark}\kern 3pt
+ \PagenoFont \vphantom{g}\thepage\hfil\HeadFont \leftmark}\kern 3pt
\ifdim\HeadRuleDepth>0pt \hrule depth\HeadRuleDepth\fi}}%
\iffalse% RN 2005-01-17
\def\@oddfoot{\vbox{%
@@ -665,11 +658,6 @@
\fi
}
\pagestyle{plain}
-\ifDTK@Author@
- \AtEndOfClass{%\show\DTK@jobname
- \InputIfFileExists{\DTK@jobname.inf}{%
- \renewcommand\volume{\Volume}}{}}%
-\else
\newcommand\DieTeXnischeKomoedie[3]{%
\thispagestyle{empty}%
\gdef\Volume{#1}%
@@ -689,11 +677,9 @@
\fi
\CoverArt{#1}{#2}{#3}%
\newpage}
-\fi
-\newcommand\cover@sub[3]{%
- #2. Jahrgang\quad Heft #1\quad #3%
-}
-\ifDTK@Author@\else\definecolor{CoverArt@grey}{gray}{.8}\fi
+\newcommand\cover@sub[3]{#2. Jahrgang\quad Heft #1\quad #3}
+
+\definecolor{CoverArt@grey}{gray}{.8}
\def\CoverArt@strip@no#1/#2;{#1\raisebox{0.35ex}{\CoverTitleFont/}#2}
\newcommand\CoverArt@linewidth{0pt}%{1.2pt}
\newcommand\CoverArt@barwidth{2.41pt}
@@ -777,7 +763,6 @@
\def\detex@@O{Oe}
\def\detex@@U{Ue}
\def\detex@@s{ss}
-\ifDTK@Author@\else
\newenvironment{theaddresses}{%
\chapter{\addressname}\Label{addresses}
\begingroup
@@ -795,7 +780,6 @@
\end{multicols}%
\endgroup
}
-\fi
\newcommand\addresssize{\footnotesize\parskip=6pt plus 2pt minus 3pt}
\ifDTK@Author@
\newcommand\listofaddresses{%
@@ -821,10 +805,6 @@
\let\makeaddresses\makeglossary
\fi
\fi
-\ifDTK@Author@
- \renewcommand\tableofcontents{%
- \typeout{*** tabelofcontents not supported in articles.}}
-\else
\renewcommand\tableofcontents{%
\clearpage
\thispagestyle{empty}%
@@ -838,7 +818,6 @@
\@starttoc{toc}
\endgroup
}
-\fi
\let\TOC@configure\relax
\newcommand\ContentsArt{%
\vspace*{-\headheight}\vspace*{-\headsep}\vspace*{-2pt}
@@ -851,16 +830,6 @@
\cover@sub{\volume}{\DTKedition}{\DTKdate}
\end{minipage}\vspace{16pt minus 8pt}\par
}
-\iffalse
-\DeclareFontShape{T1}{cmr}{bdx}{n}
- {<5><6><7><8><9><10><10.95><12>
- <14.4><17.28><20.74><24.88> ecrb10
- }{}
-\DeclareFontShape{OT1}{cmr}{bdx}{n}
- {<5><6><7><8><9><10><10.95><12>
- <14.4><17.28><20.74><24.88> cmbdx10
- }{}
-\fi
\setcounter{tocdepth}{0}
\renewcommand\l@part[2]{%
\addpenalty{-\@highpenalty}%
@@ -916,20 +885,6 @@
\mediawidth\paperwidth\mediaheight\paperheight
\fi
-\iffalse
-\AtBeginDocument{%
- \begingroup% vielleicht noch intelligenter...
- \ttfamily
- \@tempdima\fontdimen3\font
- \advance\@tempdima\fontdimen4\font
- \ifdim\@tempdima>\z@
- \edef\@tempa{\ttdefault}\gdef\ttdefault{cmtt}%
- \ClassWarning{dtk}{%
- Font `\@tempa' is bad, changed to '\ttdefault'}%
- \fi
- \endgroup
-}
-\fi
\RequirePackage{makeidx}
\renewenvironment{theindex}
{\begin{multicols}{2}[\section{\indexname}\vspace{-.5\baselineskip}]%
@@ -1032,12 +987,12 @@
}%
{%
\immediate\openout\User@Packages userpackages.tex\relax
- \begingroup \catcode`\~=\active \let~=\space
- \immediate\write\User@Packages{%
- \@percentchar\space userpackages.tex^^J%
- \@percentchar\space generated by `\jobname'^^J%
- \@percentchar\space \DTK@today}%
- \endgroup
+% \begingroup \catcode`\~=\active \let~=\space
+% \immediate\write\User@Packages{%
+% \@percentchar\space userpackages.tex^^J%
+% \@percentchar\space generated by `\jobname'^^J%
+% \@percentchar\space \DTK@today}%
+% \endgroup
\AtEndDocument{%
\immediate\closeout\User@Packages\relax}%
\newcommand*\RecordPackage[4]{%
@@ -1063,6 +1018,7 @@
}
\@fptop\z@
+
\endinput
%%
%% End of file `dtk.cls'.
diff --git a/Master/texmf-dist/tex/latex/dtk/dtk12.clo b/Master/texmf-dist/tex/latex/dtk/dtk12.clo
index aa5c895043a..a2344f19b8f 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 37 2012-05-30 12:01:13Z herbert $
+%% $Id: dtk12.clo 42 2014-07-08 17:34:44Z herbert $
\ProvidesFile{dtk12.clo}[2012/04/10 v0.03 dtk class option (RN,hv)]
\input{dtk.clo}% Standardeinstellungen
@@ -9,11 +9,13 @@
\newlength\fullwidth
\newlength\marginwidth
-\setlength\fullwidth{\dimexpr\textwidth +\marginparwidth -4mm}% wegen Anschnitt
+\setlength\fullwidth{\dimexpr\textwidth +\marginparwidth}% -4mm}% wegen Anschnitt
+%\marginparsep ist schon 7pt
%\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
\newlength\de@Indent\de@Indent=\fullwidth
@@ -33,11 +35,11 @@
{\minipage{\de@Width}\vspace{0pt}\minipage[t]{\wd\tempbox}\vspace{0pt}
\usebox\tempbox\endminipage\kern\de@sepWidth%
\minipage[t]{\dimexpr\de@Width-\wd\tempbox\relax}\vspace{0pt}\label{\thetable:WideTable}%
- \ifx\relax\de@OptCaption\relax\caption{\de@Caption}\else\caption[\de@OptCaption]{\de@Caption}\fi%
+ \ifx\de@OptCaption\@empty\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]{\dimexpr\de@Width-\wd\tempbox\relax}\vspace{0pt}\label{\thetable:WideTable}%
- \ifx\relax\de@OptCaption\relax\caption{\de@Caption}\else\caption[\de@OptCaption]{\de@Caption}\fi%
+ \ifx\de@OptCaption\@empty\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}}
@@ -45,26 +47,27 @@
\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}%
+ \def\OptCaption{#1}%
\setlength\de@Width{#2}\addtolength\de@Width{-\de@sepWidth}%
\setlength\de@Indent{#2}\addtolength\de@Indent{-\textwidth}%
- \def\de@Caption{#3}%
+ \def\DefaultCaption{#3}%
\begin{lrbox}{\tempbox}}
\def\endFigure{%
- \end{lrbox}\begin{figure}[!htb]%
+ \end{lrbox}\begin{figure}[!htb]%
\abovecaptionskip=0pt\belowcaptionskip=0pt
\ifthenelse{\isodd{\pageref{\thefigure:WideFigure}}}%
- {\minipage{\de@Width}\vspace{0pt}\minipage[t]{\wd\tempbox}\vspace{0pt}
+ {\minipage{\de@Width}\minipage[b]{\wd\tempbox}
\usebox\tempbox\endminipage\kern\de@sepWidth%
- \minipage[t]{\dimexpr\de@Width-\wd\tempbox\relax}\vspace{0pt}\label{\thefigure:WideFigure}%
- \ifx\relax\de@OptCaption\relax\caption{\de@Caption}\else\caption[\de@OptCaption]{\de@Caption}\fi%
+ \minipage[b]{\dimexpr\de@Width-\wd\tempbox\relax}\label{\thefigure:WideFigure}%
+ \ifx\OptCaption\@empty\caption{\DefaultCaption}\else\caption[\OptCaption]{\DefaultCaption}\fi%
\endminipage\endminipage}%
- {\ifdim\de@Width>\textwidth\hspace*{-\de@Indent}\fi\vspace{0pt}\minipage{\de@Width}\vspace{0pt}%
- \minipage[t]{\dimexpr\de@Width-\wd\tempbox\relax}\vspace{0pt}\label{\thefigure:WideFigure}%
- \ifx\relax\de@OptCaption\relax\caption{\de@Caption}\else\caption[\de@OptCaption]{\de@Caption}\fi%
+ {\ifdim\de@Width>\textwidth \hspace*{-\de@Indent}\fi\minipage{\de@Width}%
+ \minipage[b]{\dimexpr\de@Width-\wd\tempbox\relax}\label{\thefigure:WideFigure}%
+ \ifx\OptCaption\@empty\caption{\DefaultCaption}\else\caption[\OptCaption]{\DefaultCaption}\fi%
\endminipage\kern\de@sepWidth%
- \minipage[t]{\wd\tempbox}\vspace{0pt}\usebox\tempbox\endminipage\endminipage}%
+ \minipage[b]{\wd\tempbox}\usebox\tempbox\endminipage\endminipage}%
\end{figure}}
+
%
\IfFileExists{paralist.sty}{%
\RequirePackage[neverdecrease]{paralist}
diff --git a/Master/texmf-dist/tex/latex/dtk/dtklogos.sty b/Master/texmf-dist/tex/latex/dtk/dtklogos.sty
index 733c6446a30..bf52aa0a7b8 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 36 2012-05-02 19:43:14Z herbert $
+%% $Id: dtklogos.sty 42 2014-07-08 17:34:44Z herbert $
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% Purpose:
%% LaTeX Class and Styles for ``Die TeXnische Komoedie''.
@@ -23,14 +23,14 @@
%% a new version which provides enhanced functionality.
%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\def\fileversion{2.15}
-\def\filedate{2012/05/02}
+\def\fileversion{2.18}
+\def\filedate{2014/50/12}
\let\docversion=\fileversion
\let\docdate=\filedate
\ProvidesPackage{dtklogos}[\filedate\space\fileversion\space (hv)]
%
\RequirePackage{graphicx}
-\RequirePackage{metalogo}
+\RequirePackage{mflogo,hologo}
\RequirePackage{ifpdf}
\providecommand\AmS{{\normalfont\(\cal A\)\kern-.1667em\lower.5ex\hbox{\(\cal M\)}\kern-.125em{\(\cal S\)}}}
\providecommand\AMS{\AmS}
@@ -50,6 +50,7 @@
\kern-.08em%
\-\TeX}
\providecommand\BIBTeX{\BibTeX}
+\providecommand\BibLaTeX{Bib\LaTeX}
\providecommand\BIBTEX{\BibTeX}
\providecommand\LAMSTeX{%
L\raise.42ex\hbox{\kern-.3em\the\scriptfont2 A}%
@@ -57,11 +58,11 @@
\kern-.125em {\the\textfont2 S}-\TeX}
\providecommand\LamSTeX{\LAMSTeX}
\providecommand\LAmSTeX{\LAMSTeX}
-\providecommand\La{L\kern-.36em\raise.3ex\hbox{\sc a}}
-\providecommand\LaTeX{%
- L\kern-.36em\raise.3ex\hbox{\sc a}\kern-.15em\TeX}
-\providecommand\LATEX{\LaTeX}
- \DeclareRobustCommand{\LaTeXTeX}{(\kern-.15emL\kern-.36em%
+\providecommand\La{}
+\renewcommand\La{L\kern-.28em\raise.3ex\hbox{\textsc{a}}}
+\renewcommand\LaTeX{\La\kern-.15em\TeX}
+\let\LATEX\LaTeX
+\DeclareRobustCommand{\LaTeXTeX}{(\kern-.15emL\kern-.36em%
{\sbox\z@ T%
\vbox to\ht0{\hbox{$\m@th$%
\csname S@\f@size\endcsname
@@ -72,37 +73,13 @@
}\kern-.2em)%
\kern-.15em%
\TeX}
+\providecommand\XeTeX{X\kern-.125em\lower.5ex\hbox{E}\kern-.1667em\TeX}
+\providecommand\XeLaTeX{X\kern-.125em\lower.5ex\hbox{E}\kern-.1667em\LaTeX}
\providecommand\TeXLive{\TeX{}Live}
-\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
- }{}
- \DeclareFontShape{U}{logo}{m}{it}{
- <8> <9> gen * logosl
- <10> <10.95> <12> <14.4> <17.28> <20.74> <24.88> logosl10
- }{}
- \DeclareFontShape{U}{logo}{m}{sl}{
- <-> ssub * logo/m/it
- }{}
- \DeclareFontShape{U}{logo}{sbc}{n}{
- <8> <9> sub * logo/m/n
- <10> <10.95> <12> <14.4> <17.28> <20.74> <24.88> logobf10
- }{}
- \DeclareFontShape{U}{logo}{b}{n}{
- <8> <9> sub * logo/m/n
- <10> <10.95> <12> <14.4> <17.28> <20.74> <24.88> logod10
- }{}
- \DeclareFontShape{U}{logo}{bx}{n}{
- <-> ssub * logo/b/n
- }{}
-\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}}\-\textsc{Fun}\@}
-\newcommand\MP{\mbox{\textlogo{META}}\-\mbox{\textlogo{POST}}\@}
+%\DeclareTextFontCommand{\textlogo}{\logofamily}
+%\providecommand\MF{\mbox{\textlogo{META}}\-\mbox{\textlogo{FONT}}\@}
+\providecommand\MFun{\mbox{\textlogo{META}\textsc{Fun}}\@}
+%\providecommand\MP{\mbox{\textlogo{META}}\-\mbox{\textlogo{POST}}\@}
\providecommand\METAFONT{\MF}
\providecommand\METAFUN{\MFun}
\providecommand\METAPOST{\MP}
@@ -116,8 +93,8 @@
\providecommand\SLiTeX{\SLITEX}
\providecommand\SliTeX{\SLITEX}
\providecommand\SLITeX{\SLITEX}
-\providecommand\NTS{\mbox{\mathsurround=0pt
- \(\cal N\mkern -4mu\lower .5ex\hbox{$\cal T$}\mkern -2mu S\)}}
+\def\NTS{\mbox{\mathsurround=0pt
+ \(\mathcal{N\mkern -4mu\lower .5ex\hbox{$\cal T$}\mkern -2mu S}\)}}
\providecommand\MakeIndex{\textit{Make\-Index}}
\providecommand\emTeX{{em\TeX}}
\providecommand\PubliCTeX{PubliC\TeX}
@@ -134,8 +111,8 @@
\kern-.15em\TeX
}%
}
-\providecommand\eV{e.V\kern-.18em\@ifnextchar.{}{.}}
-\providecommand\dante{DANTE \eV}
+\providecommand\eV{e.V\kern-0.18em\@ifnextchar.{}{.}\kern0.18em}
+\providecommand\dante{\mbox{DANTE~\eV}}
\providecommand\Dante{DANTE,
Deutschsprachige Anwendervereinigung \TeX~\eV}
\providecommand\DTK{Die \TeX\-ni\-sche Ko\-m{\"o}\-die}
@@ -158,16 +135,17 @@
\kern-.15em\TeX
}%
}
-\IfFileExists{ot1dante.fd}% RN 2005-01-15
-{%
+\ifluatex
+ \RequirePackage{fontspec}
+ \newfontface\DANTEFONT{DANTE}
+ \providecommand*\DANTE[1][]{\DANTEFONT DANTE}
+\else
\providecommand*\DANTE[1][]{%
- \begingroup
- \usefont{OT1}{dante}{m}{n}\selectfont DANTE%
- \endgroup
- }
-}
-{\providecommand*\DANTE[1][]{DANTE}}
-\providecommand*\ConTeXt{Con\TeX t}
+ \begingroup
+ \usefont{OT1}{dante}{m}{n}\selectfont DANTE%
+ \endgroup}
+\fi
+\providecommand*\ConTeXt{Con\kern-1pt\TeX{}t}
\providecommand*\conTeXt{con\TeX t}
\providecommand*\MiKTeX{MiK\TeX}
\providecommand*\MikTeX\MiKTeX
@@ -181,8 +159,12 @@
\fi
\def\ThanhNN{Th\`anh}
%
-\providecommand\tikz{\textsf{Ti\textit{k}Z}}
+\providecommand\tikZ{\textsf{Ti\textit{k}Z}}
+\let\tikz\tikZ
+\providecommand\MacTeX{Mac\TeX}
+\let\TikZ\tikZ
\def\pgf/tikz{\textsf{pgf/Ti\textit{k}Z}}
+\def\ALEPH{\ensuremath{\aleph}}
%
%
\endinput