From 73ff4de87f2dfefc53e58ff3c7a7f330029fc9cf Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 30 Nov 2011 00:21:46 +0000 Subject: dtk (29nov11) git-svn-id: svn://tug.org/texlive/trunk@24698 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/dtk/Changes | 1 + Master/texmf-dist/doc/latex/dtk/doc/beispiel.tex | 4 +- Master/texmf-dist/tex/latex/dtk/dtk-url.sty | 169 +++++++++++++++++++++++ Master/texmf-dist/tex/latex/dtk/dtk.clo | 10 +- Master/texmf-dist/tex/latex/dtk/dtk.cls | 65 +++++---- Master/texmf-dist/tex/latex/dtk/dtklogos.sty | 76 +++------- 6 files changed, 227 insertions(+), 98 deletions(-) create mode 100644 Master/texmf-dist/tex/latex/dtk/dtk-url.sty (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex/dtk/Changes b/Master/texmf-dist/doc/latex/dtk/Changes index 3bdb3afe0e3..1f0d466fdfc 100644 --- a/Master/texmf-dist/doc/latex/dtk/Changes +++ b/Master/texmf-dist/doc/latex/dtk/Changes @@ -1,4 +1,5 @@ dtk.cls ----- +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 1.24 2011-04-25 -delete the part for laoding eurosans diff --git a/Master/texmf-dist/doc/latex/dtk/doc/beispiel.tex b/Master/texmf-dist/doc/latex/dtk/doc/beispiel.tex index 066e35cca8b..46bb04ef3c7 100644 --- a/Master/texmf-dist/doc/latex/dtk/doc/beispiel.tex +++ b/Master/texmf-dist/doc/latex/dtk/doc/beispiel.tex @@ -1,4 +1,4 @@ -%% $Id: beispiel.tex 16 2010-11-06 13:18:09Z herbert $ +%% $Id: beispiel.tex 26 2011-10-27 13:02:03Z herbert $ % \documentclass[11,ngerman]{dtk} \usepackage[utf8]{inputenc} @@ -20,7 +20,7 @@ \section{Makros} \begin{verbatim} -\providecommand\File[1]{\texttt{#1}} +\DeclareUrlCommand\File{\urlstyle{tt}} \providecommand\Package[1]{\texttt{#1}} \providecommand\Program[1]{\texttt{#1}} \providecommand\Command[1]{\texttt{#1}} diff --git a/Master/texmf-dist/tex/latex/dtk/dtk-url.sty b/Master/texmf-dist/tex/latex/dtk/dtk-url.sty new file mode 100644 index 00000000000..032bd233bad --- /dev/null +++ b/Master/texmf-dist/tex/latex/dtk/dtk-url.sty @@ -0,0 +1,169 @@ +\NeedsTeXFormat{LaTeX2e} +\ProvidesPackage{dtk-url}[2011/10/23 v1.0 Urls for DTK (HO)] + +\RequirePackage{url}[2006/04/12] + +% Konfiguration: +\newcommand*{\DTK@UrlSetup}{\urlstyle{tt}} +\newcommand*{\DTK@UrlCtanSetup}{} +\newcommand*{\DTK@UrlEmailSetup}{} +\newcommand*{\DTK@UrlCtanPrefix}{CTAN:} +\newcommand*{\DTK@UrlCtanServerPrefix}{http://mirror.ctan.org/} +\newcommand*{\DTK@UrlFile}{\jobname.urls} + +% Schalter \ifDTK@Url@ legt fest, wann die URLs aktiv sein sollen +\newif\ifDTK@Url@ +\ifDTK@Draft@ + \DTK@Url@true +\fi +\ifDTK@lineno@ + \DTK@Url@true +\fi + +% Markup-Befehle: +\DeclareRobustCommand*{\url}{\DTK@Url} +\DeclareRobustCommand*{\ctanurl}{\DTK@CtanUrl} +\DeclareRobustCommand*{\Email}{\DTK@Email} +\let\URL\url +\let\CTANurl\ctanurl + +\DeclareUrlCommand\DTK@Url{% + \DTK@UrlSetup + \def\UrlLeft{}% + \def\UrlRight{}% + \def\DTK@UrlType{url}% +} +\DeclareUrlCommand\DTK@CtanUrl{% + \DTK@UrlSetup + \DTK@UrlCtanSetup + \let\UrlLeft\DTK@UrlCtanPrefix + \def\UrlRight{}% + \let\DTK@UrlLinkPrefix\DTK@UrlCtanServerPrefix + \def\DTK@UrlType{ctanurl}% +} +\DeclareUrlCommand\DTK@Email{% + \DTK@UrlSetup + \DTK@UrlEmailSetup + \def\UrlLeft{}% + \def\UrlRight{}% + \def\DTK@UrlLinkPrefix{mailto:}% + \def\DTK@UrlType{email}% +} +\def\DTK@UrlType{unknown} + +% Implementierung + +\RequirePackage{pdfescape} + +% Currently only pdfTeX/LuaTeX in PDF mode are supported +\RequirePackage{ifpdf} +\ifpdf +\else + % Other engines then pdfTeX and LuaTeX in PDF mode + % are not supported + \DTK@Url@false +\fi + +% Ensure that the needed primitives are enabled in LuaTeX +\RequirePackage{ifluatex} +\ifluatex + \directlua{tex.enableprimitives('',{'pdfstartlink','pdfendlink'})}% +\fi + +\let\DTK@UrlLinkPrefix\@empty +\ifDTK@Url@ + \def\Url@HyperHook#1{% + \begingroup + \DTK@UrlPercent + \edef\#{\string##}% + \edef\DTK@Temp{\DTK@UrlLinkPrefix\Url@String\@empty}% + \@onelevel@sanitize\DTK@Temp + \edef\DTK@UrlRaw{\Url@String\@empty}% + \@onelevel@sanitize\DTK@UrlRaw + \edef\x{\endgroup + \noexpand\EdefEscapeString\noexpand\DTK@Temp{\DTK@Temp}% + \def\noexpand\DTK@Raw{\DTK@UrlRaw}% + }% + \x + \DTK@UrlWrite{\DTK@UrlType}{\DTK@Raw}% + \pdfstartlink attr{% + /H/I% + /C[1 0 0]% red + /Border[1 0 0]% + /BS<>% + }% + user{% + /Subtype/Link + /A<<% + /Type/Action% + /S/URI% + /URI(\DTK@Temp)% + >>% + }% + #1% + \pdfendlink + }% + + % Implement writing of file \DTK@UrlFile + \if@filesw + \RequirePackage{atveryend}% + \RequirePackage{embedfile}% + \newwrite\DTK@UrlHandle + \openout\DTK@UrlHandle=\DTK@UrlFile\relax + \begingroup + \count@\time + \divide\count@ by 60 % + \count2=-\count@ + \multiply\count2 by 60 % + \advance\count2 \time + \edef\x{\endgroup + \write\DTK@UrlHandle{% + \@percentchar\space + \the\year-\two@digits\month-\two@digits\day + \space\two@digits\count@:\two@digits{\count2 }, % + format: % + }% + }% + \x + \def\DTK@UrlWrite#1#2{% + \protected@write\DTK@UrlHandle{}{% + \thepage\space#1 #2% + }% + }% + \let\DTK@embedfilefinish\embedfilefinish + \let\embedfilefinish\relax + \AfterLastShipout{% + \immediate\closeout\DTK@UrlHandle + \embedfile[% + mimetype=text/plain,% + stringmethod=escape,% + desc={% + List of URLs found in % + \@backslashchar url and \@backslashchar ctanurl% + },% + ]{\DTK@UrlFile}% + \DTK@embedfilefinish + }% + \else + \let\DTK@UrlWrite\@gobbletwo + \fi +\fi + +\begingroup + \lccode`\~=`\% +\lowercase{\endgroup + \def\DTK@UrlPercent{\let~\DTK@UrlPercentCR}% +} +\begingroup + \lccode`\0=`\^^M +\lowercase{\endgroup + \def\DTK@UrlPercentCR#1{% + \ifx0#1\@empty + \expandafter\@gobble + \else + \expandafter\@firstofone + \fi + {\@percentchar#1}% + }% +} +\endinput diff --git a/Master/texmf-dist/tex/latex/dtk/dtk.clo b/Master/texmf-dist/tex/latex/dtk/dtk.clo index dbcfd91a2ef..b862b468eeb 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 24 2011-07-24 13:05:39Z herbert $ +%% $Id: dtk.clo 26 2011-10-27 13:02:03Z herbert $ \ProvidesFile{dtk.clo}[2011/04/23 v0.4 dtk class option (RN,hv)] @@ -91,11 +91,11 @@ } \newcommand\Small{\fontsize{9}{9.2}\selectfont} -\ifluatex -\newcommand*\DTKlstfont{\Small\ttfamily}%\lsstyle} -\else +%\ifluatex +%\newcommand*\DTKlstfont{\Small\ttfamily}%\lsstyle} +%\else \newcommand*\DTKlstfont{\Small\ttfamily\SetTracking{encoding=*}{-60}\lsstyle} -\fi +%\fi \lstdefinestyle{DTKlstBase}{% basicstyle=\DTKlstfont, basewidth=0.55em, diff --git a/Master/texmf-dist/tex/latex/dtk/dtk.cls b/Master/texmf-dist/tex/latex/dtk/dtk.cls index 9837c575544..615d801b79f 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 24 2011-07-24 13:05:39Z herbert $ +%% $Id: dtk.cls 28 2011-11-28 07:11:14Z herbert $ %% %% This is file `dtk.cls', %% @@ -17,8 +17,8 @@ %% version 2005/12/01 or later. % \def\filename{dtk.cls} -\def\fileversion{1.26} -\def\filedate{2011/07/24} +\def\fileversion{1.27} +\def\filedate{2011/11/23} % \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesClass{dtk}[\filedate~\fileversion~ dtk document class (gn,rn,hv)] @@ -29,6 +29,8 @@ \newif\ifDTK@Draft@ \newif\ifDTK@lineno@ \DTK@lineno@false +\newif\ifDTK@numeric@ +\DTK@numeric@true \newif\ifDTK@german@ \DTK@german@true \ifx\documentclass\@undefined @@ -80,6 +82,7 @@ \DeclareOption{oneside}{\OptionNotUsed} \DeclareOption{full}{\DTK@Author@false} \DeclareOption{omitgerman}{\DTK@german@false} +\DeclareOption{alpha}{\DTK@numeric@false} \DeclareOption{ancient}{\def\DTK@layout{95}} \DeclareOption{draft}{% \DTK@Draft@true @@ -127,6 +130,7 @@ \DeclareOption{02}{\def\DTK@layout{02}} \DeclareOption{08}{\def\DTK@layout{08}} \DeclareOption{10}{\def\DTK@layout{10}} +\DeclareOption{11}{\def\DTK@layout{11}} \DeclareOption*{\PassOptionsToClass{\CurrentOption}{book}} \else \DeclareOption*{% @@ -161,26 +165,21 @@ \setmonofont[Scale=0.83,Mapping=tex-text]{Bitstream Vera Sans Mono} \else\ifluatex % \RequirePackage{kpfonts} + \RequirePackage{eurosym} % \RequirePackage{amsmath} - \RequirePackage[no-math]{fontspec} - \usepackage{luaotfload} +% \RequirePackage{libertineotf} + \PassOptionsToPackage{no-math}{fontspec} + \RequirePackage{fontspec} +% \usepackage{luaotfload} \RequirePackage{unicode-math} -\setmathfont[range={"0000-"FFFF, - \mathup,\mathbfup, - \mathit,\mathbfit, - \mathsfup,\mathbfsfup, - \mathsfit,\mathbfsfit, - \mathbb,\mathit, - \mathbbit, - \mathscr,\mathbfscr, - \mathfrak,\mathbffrak}]{Latin Modern Math} -% \setmathfont[math-style=TeX, -% bold-style=TeX, -% range={\mathcal,\mathbfcal}, -% StylisticSet=1]{Latin Modern Math} - \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} + \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} +% \setmonofont[Scale=1.05,Ligatures=TeX]{LMMonoLtCond10-Regular} % \setmathrm[ItalicFont=LMRoman10-Italic, % BoldItalicFont=LMRoman10-BoldItalic]{Latin Modern Math} % \setmathsf{Latin Modern Math} @@ -199,19 +198,18 @@ \RequirePackage[full]{textcomp} \RequirePackage{cmap} \fi\fi -\RequirePackage%[factor=1500,verbose=true,final=true] -{microtype} +\RequirePackage[factor=1500,verbose=true,final=true]{microtype} % \usepackage{fixltx2e} \usepackage[hyphens]{url} -\def\URL#1{\protect\url{#1}} +\DeclareRobustCommand*{\URL}{\url} \usepackage[newcommands,newparameters]{ragged2e} \usepackage{filecontents} \RequirePackage{babel} \RequirePackage{tabularx} -\RequirePackage{eurosym} -\AtBeginDocument{\DeclareTextCommandDefault{\texteuro}{\euro}}% ??? +%\RequirePackage{eurosym} +%\AtBeginDocument{\DeclareTextCommandDefault{\texteuro}{\euro}}% ??? \RequirePackage{graphicx} \RequirePackage{xspace,shortvrb} \RequirePackage[bottom,marginal]{footmisc} @@ -268,7 +266,7 @@ \DTKgerman \fi \newcommand\addressname{Autoren/Organisatoren} -\newcommand\journalname{Die \TeX nische Komödie} +\newcommand\journalname{Die \TeX nische Kom\"odie} \newcommand\Volume{?/??} \newcommand\volume{\Volume\ --- Entwurf \today\ \begingroup @@ -369,12 +367,13 @@ ^@Path} ^gdef^@Path#1{^texttt{#1}^endgroup} ^endgroup -\providecommand\File[1]{\texttt{#1}} +\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}} +\let\Env\Environment \let\Email\url \providecommand\Acronym[1]{\textsc{#1}} \def\@listI{% @@ -500,10 +499,10 @@ \renewcommand\title[2][]{% \gdef\@title{#2}% - \def\@@temp{#1}% - \ifx\@@temp\@empty\gdef\@@title{#2}\else\gdef\@@title{#1}\fi} + \def\@titletemp{#1} + \ifx\@titletemp\@empty\gdef\@@title{#2}\else\gdef\@@title{#1}\fi} -\renewcommand\maketitle{% +\renewcommand\maketitle[1][]{% \ifDTK@Author@ \thispagestyle{part}\fi \ifdim\DTKtitle@skip>0pt\vspace{\DTKtitle@skip}\fi \begingroup @@ -538,7 +537,7 @@ \@thanks \let\thanks\@gobble \addcontentsline{toc}{chapter}{\@@title}% - \markboth{\@@title}{\@@title}% + \ifx\relax#1\relax\markboth{\@@title}{\@@title}\else\markboth{#1}{#1}\fi% \endgroup \let\@title=\@empty \let\@author=\@empty @@ -585,7 +584,7 @@ \newcommand\DTK@bibliography@rightskip{\rightskip=0pt plus 2em} \newcommand\DTK@bibliography[1]{ \InputIfFileExists{#1.bbl}{}{\typeout{--- File #1.bbl not found.}}} -\bibliographystyle{dtk} +\ifDTK@numeric@ \bibliographystyle{dtk} \else \bibliographystyle{alpha} \fi %%%%%% hv 20111024 \newcommand\DTK@fnrightmargin{0em} \newcommand\DTK@fnleftmargin{1em} \long\def\@makefntext#1{% diff --git a/Master/texmf-dist/tex/latex/dtk/dtklogos.sty b/Master/texmf-dist/tex/latex/dtk/dtklogos.sty index e0a786d0c71..c38387510d1 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 22 2011-05-12 11:48:09Z herbert $ +%% $Id: dtklogos.sty 27 2011-11-28 07:10:33Z herbert $ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% Purpose: %% LaTeX Class and Styles for ``Die TeXnische Komoedie''. @@ -23,61 +23,15 @@ %% a new version which provides enhanced functionality. %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\def\fileversion{2.11} -\def\filedate{2011/04/25} +\def\fileversion{2.13} +\def\filedate{2011/11/23} \let\docversion=\fileversion \let\docdate=\filedate \ProvidesPackage{dtklogos}[\filedate\space\fileversion\space (hv)] % -\newcommand{\logo@sm@ller}{% - \relax\@nomath\logo@smaller - \ifx\f@size\@vpt \else - \ifx\f@size\@vipt \fontsize\@vpt{6pt}\fi - \ifx\f@size\@viipt \fontsize\@vpt{6pt}\fi - \ifx\f@size\@viiipt \fontsize\@vipt{7pt}\fi - \ifx\f@size\@ixpt \fontsize\@vipt{7pt}\fi - \ifx\f@size\@xpt \fontsize\@viipt{8pt}\fi - \ifx\f@size\@xipt \fontsize\@viiipt{9.5pt}\fi - \ifx\f@size\@xiipt \fontsize\@viiipt{9.5pt}\fi - \ifx\f@size\@xivpt \fontsize\@xpt{12pt}\fi - \ifx\f@size\@xviipt \fontsize\@xiipt{14pt}\fi - \ifx\f@size\@xxpt \fontsize\@xivpt{18pt}\fi - \ifx\f@size\@xxvpt \fontsize\@xxpt{25pt}\fi - \selectfont - \fi} - \@ifundefined{fontsize}{\let\fontsize=\size}{} -\newcommand{\logo@smaller}{\protect\logo@sm@ller} - \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... -\providecommand*\TeX@logo@spacing[6]{% - \def\xxt@kern@Te{#1}% - \def\xxt@kern@eX{#2}% - \def\xxt@lower@e{#3}% - \def\xxt@kern@La{#4}% - \def\xxt@kern@aT{#5}% - \def\xxt@kern@eL{#6}% -} -\DeclareRobustCommand\XeTeX{% - \leavevmode - \smash{% - X\lower\xxt@lower@e - \hbox{\kern\xxt@kern@eX - \setbox0=\hbox{E}\dimen0=\ht0\advance\dimen0by\dp0% - \reflectbox{E}% - }\kern\xxt@kern@Te\TeX}}% -\DeclareRobustCommand\XeLaTeX{% - \leavevmode - \smash{% - X\lower\xxt@lower@e - \hbox{\kern\xxt@kern@eX - \setbox0=\hbox{E}\dimen0=\ht0\advance\dimen0by\dp0\relax - \reflectbox{E}% - }\kern\xxt@kern@eL\LaTeX}} -% -\TeX@logo@spacing{-0.15em}{-0.125em}{0.5ex}{-0.36em}{-0.12em}{-0.13em} +\RequirePackage{metalogo} +\RequirePackage{ifpdf} \providecommand\AmS{\(\cal A\)\kern-.1667em\lower.5ex\hbox{\(\cal M\)}\kern-.125em{\(\cal S\)}} \providecommand\AMS{\AmS} \providecommand\AmSLaTeX{\AmS-\LaTeX} @@ -151,7 +105,8 @@ \providecommand\METAFONT{\MF} \providecommand\METAFUN{\MFun} \providecommand\METAPOST{\MP} -\providecommand\LuaTeX{Lua\kern-0.125em\TeX} +\def\LuaTeX{Lua\kern-0.15em\TeX} +\let\luatex\LuaTeX \providecommand\LuaLaTeX{Lua\LaTeX} \providecommand\SLITEX{% @@ -216,12 +171,17 @@ \providecommand*\MiKTeX{MiK\TeX} \providecommand*\MikTeX\MiKTeX % -\providecommand\ThanhVN{H\`an Th\^e\protect\llap{\raise 0.5ex\hbox{\'{}}}} -\providecommand\ThanhNN{Th\`anh} -\providecommand\Thanh{H\`an Th\^e\protect\llap{\raise 0.5ex\hbox{\'{\relax}}} Th\`anh} - -\TeX@logo@spacing{-0.15em}{-0.15em}{0.5ex}{-0.36em}{-0.15em}{-0.1em} - +\ifpdf + \providecommand\ThanhVN{H\`an Th\^e\protect\llap{\raise 0.5ex\hbox{\'{}}}} + \providecommand\Thanh{H\`an Th\^e\protect\llap{\raise 0.5ex\hbox{\'{\relax}}} Th\`anh} +\else + \def\ThanhVN{H\`an Th\textcircumacute{e}\protect\llap{\raise 0.5ex\hbox{\'{}}}} + \def\Thanh{H\`an~Th\textcircumacute{e}\llap{\raise 0.5ex\hbox{\'{}}}~Th\`anh} +\fi +\def\ThanhNN{Th\`anh} +% +\providecommand\tikz{\textsf{Ti\textit{k}Z}} +\def\pgf/tikz{\textsf{pgf/Ti\textit{k}Z}} % % \endinput -- cgit v1.2.3