From 343d5bc3636e4b86037c8acc6b24210504855623 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 6 Nov 2010 23:22:10 +0000 Subject: dtk 1.22 (6nov10) git-svn-id: svn://tug.org/texlive/trunk@20347 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/dtk/dtk.clo | 36 ++++----- Master/texmf-dist/tex/latex/dtk/dtk.cls | 109 +++++++++------------------ Master/texmf-dist/tex/latex/dtk/dtk10.clo | 90 +++++++++++++++++++++- Master/texmf-dist/tex/latex/dtk/dtklogos.sty | 7 +- 4 files changed, 146 insertions(+), 96 deletions(-) (limited to 'Master/texmf-dist/tex/latex/dtk') diff --git a/Master/texmf-dist/tex/latex/dtk/dtk.clo b/Master/texmf-dist/tex/latex/dtk/dtk.clo index c5114046cc9..86c88c0801e 100644 --- a/Master/texmf-dist/tex/latex/dtk/dtk.clo +++ b/Master/texmf-dist/tex/latex/dtk/dtk.clo @@ -1,8 +1,8 @@ -%% $Id: dtk.clo 13 2010-06-19 06:53:35Z herbert $ +%% $Id: dtk.clo 15 2010-11-03 19:15:55Z herbert $ -\ProvidesFile{dtk.clo}[2009/11/07 v0.2 dtk class option (RN,hv)] +\ProvidesFile{dtk.clo}[2010/10/17 v0.3 dtk class option (RN,hv)] -\renewcommand\CoverArt[3]{% +\newcommand\CoverArt[3]{% \ifx\CoverTitleFont\@undefined %\newfont\CoverTitleFont{ecrm1700 scaled \magstep 5} %\newfont\CoverTitleFont{lmr12 scaled 2938} @@ -12,18 +12,6 @@ %\newfont\CoverNumberFont{ecrm1700 scaled 2986} \DeclareFixedFont\CoverNumberFont{\encodingdefault}{\rmdefault}{m}{n}{51.66}% \fi -\iffalse - \vspace*{-34pt}\hfill - \setbox\@tempboxa=\hbox to \textheight{\null\hfill\CoverTitleFont - \fontsize{41.26}{42}\selectfont\journalname\hfill\null}% - \@tempdimb=\ht\@tempboxa - \advance\@tempdimb by\dp\@tempboxa - \hbox to\@tempdimb{\kern-20pt% - \vbox to\wd\@tempboxa{% - \vskip\wd\@tempboxa - \vss\rotatebox{90}{\box\@tempboxa}}\hss} \ - \rule{\CoverArt@barwidth}{\textheight} -\fi \newsavebox\dtk@titlebox \sbox\dtk@titlebox{\parbox{\textheight}{% \null\hfill\CoverTitleFont\fontsize{41.26}{42}\selectfont\journalname\hfill\null}} @@ -41,10 +29,10 @@ Anwendervereinigung \TeX\ \eV}\\[1ex] \dimen3=\textwidth\advance\dimen3-\CoverArt@gap - \hfill\rule{\dimen3}{\CoverArt@linewidth}% - \\[-\baselineskip]\null\hspace{1em}% - {\CoverArt@small\cover@sub{#1}{#2}{#3}}% - \\[-\baselineskip]\rule{0pt}{.617647\textheight}% + \hfill\rule{\dimen3}{\CoverArt@linewidth}\\[-\baselineskip] + \null\hspace{1em}% + {\CoverArt@small\cover@sub{#1}{#2}{#3}}\\[-\baselineskip] + \rule{0pt}{.617647\textheight}% \CoverNumberFont \null\hfill \makebox(0,0)[br]{% @@ -78,7 +66,7 @@ \RequirePackage{xcolor} \RequirePackage{longtable} -\RequirePackage[font=sf]{caption} +\RequirePackage{caption} \ifDTKcolor \definecolor{DTKlstBackground}{rgb}{1,1,0.95} @@ -115,7 +103,7 @@ showspaces=false, showstringspaces=false, breaklines=true, - breakindent=10pt, + breakindent=0.5em, backgroundcolor=\color{DTKlstBackground}, breakautoindent=true, captionpos=t, @@ -123,7 +111,8 @@ belowskip=\medskipamount, xrightmargin=\fboxsep, emphstyle=\DTK@lst@colorbox{lightgray}, - prebreak=\mbox{$\hookleftarrow$}, + prebreak=, + postbreak=\mbox{$\hookrightarrow$}, literate={ä}{{\"a}}1 {ö}{{\"o}}1 {ü}{{\"u}}1 {Ä}{{\"A}}1 {Ö}{{\"O}}1 {Ü}{{\"U}}1 {ß}{\ss}1 } @@ -158,5 +147,8 @@ \lstset{style=DTKlstNoNumber} +\def\ctanurl#1{\url{CTAN:#1}}% +\let\CTANurl\ctanurl + \endinput diff --git a/Master/texmf-dist/tex/latex/dtk/dtk.cls b/Master/texmf-dist/tex/latex/dtk/dtk.cls index 30c97c17359..5ed9fd68f54 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 12 2010-06-19 06:45:56Z herbert $ +%% $Id: dtk.cls 15 2010-11-03 19:15:55Z herbert $ %% %% This is file `dtk.cls', %% @@ -17,8 +17,8 @@ %% version 2005/12/01 or later. % \def\filename{dtk.cls} -\def\fileversion{1.21} -\def\filedate{2009/12/02} +\def\fileversion{1.22} +\def\filedate{2010/11/06} % \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesClass{dtk}[\filedate~\fileversion~ dtk document class (gn,rn,hv)] @@ -157,21 +157,18 @@ \fi %%%%%%%%%% \RequirePackage[T1]{fontenc} -\ifDTK@tgpagella@ - \RequirePackage{mathpazo,tgpagella} -\else - \ifDTK@tgschola@ - \usepackage{libertine} -% \usepackage[charter,expert]{mathdesign} -% \def\rmdefault{bch} % not scaled - \else -% \RequirePackage%[lucidascale] -% {lucidabr} -% \RequirePackage[scaled=1.0]{libertine} - \RequirePackage{lmodern} - \fi -\fi -\RequirePackage[scaled=0.83]{luximono} +% \RequirePackage{pamath} +% \RequirePackage{mathpazo} +% \RequirePackage[scale=0.95]{tgcursor} +% \RequirePackage[scale=0.95]{tgpagella} +% \RequirePackage[scale=0.85]{tgheros} + \RequirePackage{lmodern} +\RequirePackage%[factor=1500,verbose=true,final=true] +{microtype} +% +\IfFileExists{luximono.sty} + {\RequirePackage[scaled=0.85]{luximono}} + {\RequirePackage[scaled=0.85]{beramono}} \RequirePackage[full]{textcomp} \ifDTK@Author@\else\RequirePackage[utf8]{inputenc}\fi \usepackage{fixltx2e} @@ -182,17 +179,16 @@ \RequirePackage{babel} \RequirePackage{tabularx} -\iffalse -\ifDTK@german@ -\RequirePackage{ngerman} -\selectlanguage{ngerman} -\else -\typeout{*** Warning: Loading of (n)german has been omitted. You have to - load it manually.} -\typeout{*** Don't forget to use the macro \string\DTKgerman\space - afterwards.} -\fi -\fi +\RequirePackage{cmap} +\RequirePackage{eurosym} +\RequirePackage{graphicx} +\RequirePackage{xspace,shortvrb} +\RequirePackage[bottom,marginal]{footmisc} +\RequirePackage{array,calc} +\RequirePackage{enumerate} +\RequirePackage{booktabs} +\RequirePackage{subfig} +\RequirePackage{setspace} \RequirePackage{multicol} \ifDTK@Author@\else @@ -480,6 +476,12 @@ % \newcommand\keywords[1]{\def\DTK@keywords{#1}} \def\DTK@keywords{} + +\renewcommand\title[2][]{% + \gdef\@title{#2}% + \def\@@temp{#1}% + \ifx\@@temp\@empty\gdef\@@title{#2}\else\gdef\@@title{#1}\fi} + \renewcommand\maketitle{% \ifDTK@Author@ \thispagestyle{part}\fi \ifdim\DTKtitle@skip>0pt\vspace{\DTKtitle@skip}\fi @@ -514,8 +516,8 @@ \end{minipage}% \@thanks \let\thanks\@gobble - \addcontentsline{toc}{chapter}{\@title}% - \markboth{\@title}{\@title}% + \addcontentsline{toc}{chapter}{\@@title}% + \markboth{\@@title}{\@@title}% \endgroup \let\@title=\@empty \let\@author=\@empty @@ -666,47 +668,6 @@ \CoverArt{#1}{#2}{#3}% \newpage} \fi -\newcommand\CoverArt[3]{% - \ifx\CoverTitleFont\@undefined - \newfont\CoverTitleFont{ -% ecrm1700 - lmr10 scaled \magstep 5} - \fi - \ifx\CoverNumberFont\@undefined - \newfont\CoverNumberFont{%ecrm1700 - lmr10 scaled 2986} - \fi - \vspace*{-34pt}%\hfill - \setbox\@tempboxa=\hbox to \textheight{\null\hfill\CoverTitleFont - \journalname\hfill\null}% - \@tempdimb=\ht\@tempboxa - \advance\@tempdimb by\dp\@tempboxa - \hbox to\@tempdimb{% - \vbox to\wd\@tempboxa{% - \vskip\wd\@tempboxa - \vss\rotatebox{90}{\box\@tempboxa}}\hss} \ % - \rule{\CoverArt@barwidth}{\textheight} - \begin{minipage}[b]{.7\textwidth}\raggedright - \rule{1em}{0pt}% - \dimen2=\textwidth\advance\dimen2-1em - \parbox{\dimen2}{\CoverArt@font - DANTE\\ - Deutschsprachige\\ - Anwendervereinigung - \TeX\ \eV}\\[1ex] - \dimen3=\textwidth\advance\dimen3-\CoverArt@gap - \hfill\rule{\dimen3}{\CoverArt@linewidth}% - \\[-\baselineskip]\null\hspace{1em}% - {\CoverArt@small\cover@sub{#1}{#2}{#3}}% - \\[-\baselineskip]\rule{0pt}{.617647\textheight}% - \CoverNumberFont - \null\hfill - \makebox(0,0)[br]{% - \textcolor{CoverArt@grey}{% - \CoverArt@strip@no #1;\hspace{1pt}% - }}% - \end{minipage}% -} \newcommand\cover@sub[3]{% #2. Jahrgang\quad Heft #1\quad #3% } @@ -867,6 +828,7 @@ \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 @@ -875,6 +837,7 @@ {<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}% @@ -945,6 +908,7 @@ \mediawidth\paperwidth\mediaheight\paperheight \fi +\iffalse \AtBeginDocument{% \begingroup% vielleicht noch intelligenter... \ttfamily @@ -957,6 +921,7 @@ \fi \endgroup } +\fi \RequirePackage{makeidx} \renewenvironment{theindex} {\begin{multicols}{2}[\section{\indexname}\vspace{-.5\baselineskip}]% diff --git a/Master/texmf-dist/tex/latex/dtk/dtk10.clo b/Master/texmf-dist/tex/latex/dtk/dtk10.clo index 3cf38c8b315..1a97dc85aa4 100644 --- a/Master/texmf-dist/tex/latex/dtk/dtk10.clo +++ b/Master/texmf-dist/tex/latex/dtk/dtk10.clo @@ -1,8 +1,72 @@ -%% $Id: dtk10.clo 13 2010-06-19 06:53:35Z herbert $ +%% $Id: dtk10.clo 14 2010-10-16 17:27:23Z 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 @@ -24,5 +88,29 @@ \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} +% \endinput diff --git a/Master/texmf-dist/tex/latex/dtk/dtklogos.sty b/Master/texmf-dist/tex/latex/dtk/dtklogos.sty index 322b3a680c2..c70889132b6 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 13 2010-06-19 06:53:35Z herbert $ +%% $Id: dtklogos.sty 14 2010-10-16 17:27:23Z herbert $ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% Purpose: %% LaTeX Class and Styles for ``Die TeXnische Komoedie''. @@ -175,6 +175,9 @@ \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 }% @@ -207,9 +210,11 @@ \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 \providecommand\METAFONT{\MF} +\providecommand\METAFUN{\MFun} \providecommand\METAPOST{\MP} \providecommand\SLITEX{% S\kern-.065em L\kern-.18em\raise.32ex\hbox{i}% -- cgit v1.2.3