From 26c821272a604288fffaaaee4072954ca49985d9 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 10 Aug 2011 16:57:42 +0000 Subject: dtk (6aug11) git-svn-id: svn://tug.org/texlive/trunk@23484 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/dtk/dtk-pdf.sty | 8 ++-- Master/texmf-dist/tex/latex/dtk/dtk.clo | 11 +++-- Master/texmf-dist/tex/latex/dtk/dtk.cls | 66 ++++++++++++++++++++++------ Master/texmf-dist/tex/latex/dtk/dtklogos.sty | 12 ++--- 4 files changed, 68 insertions(+), 29 deletions(-) (limited to 'Master/texmf-dist/tex/latex/dtk') diff --git a/Master/texmf-dist/tex/latex/dtk/dtk-pdf.sty b/Master/texmf-dist/tex/latex/dtk/dtk-pdf.sty index ff18d513347..4d1727e852a 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 21 2011-04-26 14:40:41Z herbert $ +%% $Id: dtk-pdf.sty 24 2011-07-24 13:05:39Z herbert $ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% Purpose: LaTeX Class and Styles for ``Die TeXnische Komoedie''. %% @@ -21,8 +21,8 @@ %% This package is still under development and may be replaced with %% a new version which provides enhanced functionality. %% -\def\fileversion{1.20} -\def\filedate{2011/04/26} +\def\fileversion{1.21} +\def\filedate{2011/06/22} \let\docversion=\fileversion \let\docdate=\filedate \ProvidesPackage{dtk-pdf}[\filedate\space\fileversion\space (gn,hv)] @@ -75,7 +75,7 @@ \scriptsize Reproduktion oder Nutzung dieses Beitrags durch konventionelle, elektronische oder beliebige andere Verfahren ist - nur mit Zustimmung des/der Autoren zulässig. + nur mit Zustimmung des/der Autoren zul\"assig. \DTK\ ist die Mitgliedszeitschrift von \Dante. Einzelne Hefte k\"onnen von Mitgliedern bei der Gesch\"aftsstelle von \Dante\ diff --git a/Master/texmf-dist/tex/latex/dtk/dtk.clo b/Master/texmf-dist/tex/latex/dtk/dtk.clo index 94d418d935b..dbcfd91a2ef 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 19 2011-04-24 06:05:56Z herbert $ +%% $Id: dtk.clo 24 2011-07-24 13:05:39Z herbert $ \ProvidesFile{dtk.clo}[2011/04/23 v0.4 dtk class option (RN,hv)] @@ -89,10 +89,13 @@ \settowidth\@ovxx{#2}\settoheight\@ovyy{#2}% \makebox[\@ovxx][c]{\colorbox{#1}{\raisebox{0pt}[\@ovyy][0pt]{#2}}}% } -\newcommand\Small{\fontsize{8.5}{8.7}\selectfont} -\newcommand*\DTKlstfont{% - \Small\ttfamily\SetTracking{encoding=*}{-60}\lsstyle} +\newcommand\Small{\fontsize{9}{9.2}\selectfont} +\ifluatex +\newcommand*\DTKlstfont{\Small\ttfamily}%\lsstyle} +\else +\newcommand*\DTKlstfont{\Small\ttfamily\SetTracking{encoding=*}{-60}\lsstyle} +\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 e43f63f16b5..9837c575544 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 20 2011-04-25 16:29:04Z herbert $ +%% $Id: dtk.cls 24 2011-07-24 13:05:39Z herbert $ %% %% This is file `dtk.cls', %% @@ -17,8 +17,8 @@ %% version 2005/12/01 or later. % \def\filename{dtk.cls} -\def\fileversion{1.24} -\def\filedate{2011/04/25} +\def\fileversion{1.26} +\def\filedate{2011/07/24} % \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesClass{dtk}[\filedate~\fileversion~ dtk document class (gn,rn,hv)] @@ -150,17 +150,58 @@ \endgroup}% \fi %%%%%%%%%% -\RequirePackage[T1]{fontenc} -%\RequirePackage{lmodern} -\RequirePackage{mathpazo} -\RequirePackage[scale=0.95]{tgpagella} -\RequirePackage[scale=0.92]{tgheros} +\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} +% \RequirePackage{amsmath} + \RequirePackage[no-math]{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} +% \setmathrm[ItalicFont=LMRoman10-Italic, +% BoldItalicFont=LMRoman10-BoldItalic]{Latin Modern Math} +% \setmathsf{Latin Modern Math} +% \setmathtt{Latin Modern Math} +% \setboldmathrm{Latin Modern Math} + \usepackage{luacode} +% \usepackage[utf8]{luainputenc} +\else + \RequirePackage[T1]{fontenc} + \RequirePackage{mathpazo} + \RequirePackage[scale=0.95]{tgpagella} + \RequirePackage[scale=0.92]{tgheros} + \RequirePackage[scaled=0.83]{beramono} + + \ifDTK@Author@\else\RequirePackage[utf8]{inputenc}\fi + \RequirePackage[full]{textcomp} + \RequirePackage{cmap} +\fi\fi \RequirePackage%[factor=1500,verbose=true,final=true] {microtype} % -\RequirePackage[scaled=0.85]{beramono} -\RequirePackage[full]{textcomp} -\ifDTK@Author@\else\RequirePackage[utf8]{inputenc}\fi \usepackage{fixltx2e} \usepackage[hyphens]{url} \def\URL#1{\protect\url{#1}} @@ -169,7 +210,6 @@ \RequirePackage{babel} \RequirePackage{tabularx} -\RequirePackage{cmap} \RequirePackage{eurosym} \AtBeginDocument{\DeclareTextCommandDefault{\texteuro}{\euro}}% ??? \RequirePackage{graphicx} @@ -228,7 +268,7 @@ \DTKgerman \fi \newcommand\addressname{Autoren/Organisatoren} -\newcommand\journalname{Die \TeX nische Kom{\"o}die} +\newcommand\journalname{Die \TeX nische Komödie} \newcommand\Volume{?/??} \newcommand\volume{\Volume\ --- Entwurf \today\ \begingroup diff --git a/Master/texmf-dist/tex/latex/dtk/dtklogos.sty b/Master/texmf-dist/tex/latex/dtk/dtklogos.sty index 813f61a569c..e0a786d0c71 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 20 2011-04-25 16:29:04Z herbert $ +%% $Id: dtklogos.sty 22 2011-05-12 11:48:09Z herbert $ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% Purpose: %% LaTeX Class and Styles for ``Die TeXnische Komoedie''. @@ -78,11 +78,7 @@ }\kern\xxt@kern@eL\LaTeX}} % \TeX@logo@spacing{-0.15em}{-0.125em}{0.5ex}{-0.36em}{-0.12em}{-0.13em} -%\providecommand{\XeTeX}{X\kern-.1em\lower.5ex\hbox{\reflectbox{E}}\kern-.15em\TeX} -%\providecommand{\XeLaTeX}{X\kern-.1em\lower.5ex\hbox{\reflectbox{E}}\kern-.15em\LaTeX} -\providecommand\AmS{% - \(\cal A\)\kern-.1667em\lower.5ex\hbox - {\(\cal M\)}\kern-.125em{\(\cal S\)}} +\providecommand\AmS{\(\cal A\)\kern-.1667em\lower.5ex\hbox{\(\cal M\)}\kern-.125em{\(\cal S\)}} \providecommand\AMS{\AmS} \providecommand\AmSLaTeX{\AmS-\LaTeX} \providecommand\AMSLaTeX{\AmSLaTeX} @@ -150,12 +146,12 @@ \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\MFun{\mbox{\textlogo{META}}\-\textsc{Fun}\@} \newcommand\MP{\mbox{\textlogo{META}}\-\mbox{\textlogo{POST}}\@} \providecommand\METAFONT{\MF} \providecommand\METAFUN{\MFun} \providecommand\METAPOST{\MP} -\providecommand\LuaTeX{Lua\TeX} +\providecommand\LuaTeX{Lua\kern-0.125em\TeX} \providecommand\LuaLaTeX{Lua\LaTeX} \providecommand\SLITEX{% -- cgit v1.2.3