From 7924f6a2b95b3bd50788d9a98cc4fd39ac51ffff Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 29 Jul 2012 16:59:07 +0000 Subject: dtk (21jun12) git-svn-id: svn://tug.org/texlive/trunk@27226 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/bibtex/bst/dtk/dtk.bst | 62 ++++++++++++---------- Master/texmf-dist/doc/latex/dtk/Changes | 11 +++- .../texmf-dist/doc/latex/dtk/historical/dtk11.clo | 2 +- Master/texmf-dist/tex/latex/dtk/dtk.clo | 2 +- Master/texmf-dist/tex/latex/dtk/dtk.cls | 7 +-- Master/texmf-dist/tex/latex/dtk/dtk12.clo | 10 ++-- 6 files changed, 54 insertions(+), 40 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/bibtex/bst/dtk/dtk.bst b/Master/texmf-dist/bibtex/bst/dtk/dtk.bst index 1d3a520ea1b..013718dee90 100644 --- a/Master/texmf-dist/bibtex/bst/dtk/dtk.bst +++ b/Master/texmf-dist/bibtex/bst/dtk/dtk.bst @@ -1,31 +1,9 @@ -%% $Id: dtk.bst 17 2011-04-23 10:42:34Z herbert $ %% -%% This is file `dtk.bst', generated -%% on <1995/11/5> with the docstrip utility (2.2i). +%% This is file `dtk.bst' %% -%% The original source files were: -%% -%% merlin.mbs (with options: `head,exlang,vonx,nmlm,x3,m2,tit-it,atit-u,volp-com,edpar,edby-par,edbyx,blk-com,au-col,german,pp,ed,abr,ord,and-xcom,{}') -%% german.mbs (with options: `exlang,vonx,nmlm,x3,m2,tit-it,atit-u,volp-com,edpar,edby-par,edbyx,blk-com,au-col,german,pp,ed,abr,ord,and-xcom,{}') -%% dtk.mbs (with options: `exlang,vonx,nmlm,x3,m2,tit-it,atit-u,volp-com,edpar,edby-par,edbyx,blk-com,au-col,german,pp,ed,abr,ord,and-xcom,{}') -%% merlin.mbs (with options: `tail,exlang,vonx,nmlm,x3,m2,tit-it,atit-u,volp-com,edpar,edby-par,edbyx,blk-com,au-col,german,pp,ed,abr,ord,and-xcom,{}') -%% ---------------------------------------- -%% *** This BibTeX style is made for use in -%% *** `Die TeXnische Komoedie' --- the -%% *** communications of Dante e.V. -%% - %------------------------------------------------------------------- - % The original source file contains the following version information: - % \ProvidesFile{merlin.mbs}[1995/11/01 3.5 (PWD)] - % - % NOTICE: - % This file may be used for non-profit purposes. - % It may not be distributed in exchange for money, - % other than distribution costs. - % - % The author provides it `as is' and does not guarantee it in any way. - % - % Copyright (C) 1994, 1995 Patrick W. Daly +%% version 1.1, 2012-06-18 +%% copyright 2012 by DANTE e.V. +%% %------------------------------------------------------------------- % For use with BibTeX version 0.99a or later %------------------------------------------------------------------- @@ -63,6 +41,8 @@ ENTRY series title type + url + urldate volume year } @@ -334,7 +314,7 @@ MACRO {dec} {"Dez."} % End of language definition file -MACRO{DTK}{"Die \TeX\-nische Ko\-m\"o\-die"} +MACRO{DTK}{"Die \TeX\-nische Ko\-m{^^b{o}}\-die"} MACRO{TUGboat}{"TUGboat"} MACRO{TTN}{"\TeX{} and TUG News"} MACRO {acmcs} {"ACM Computing Surveys"} @@ -351,8 +331,7 @@ MACRO {ieeese} {"IEEE Transactions on Software Engineering"} MACRO {ieeetc} {"IEEE Transactions on Computers"} -MACRO {ieeetcad} - {"IEEE Transactions on Computer-Aided Design of Integrated Circuits"} +MACRO {ieeetcad} {"IEEE Transactions on Computer-Aided Design of Integrated Circuits"} MACRO {ipl} {"Information Processing Letters"} @@ -538,6 +517,20 @@ FUNCTION {format.date} if$ } +FUNCTION {format.url} +{ url empty$ + {'skip$} + {"\url{" url * "}" * } + if$ +} + +FUNCTION {format.urldate} +{ urldate empty$ + {'skip$} + {"Zuletzt besucht: " urldate *} + if$ +} + FUNCTION {format.btitle} { title emphasize } @@ -1067,6 +1060,17 @@ FUNCTION {misc} fin.entry } +FUNCTION {online} +{ output.bibitem + format.authors output + author add.colon + format.title output + format.url output + format.urldate output + note output + fin.entry +} + FUNCTION {phdthesis} { output.bibitem format.authors "author" output.check diff --git a/Master/texmf-dist/doc/latex/dtk/Changes b/Master/texmf-dist/doc/latex/dtk/Changes index 4f8e65dd810..181eb64f499 100644 --- a/Master/texmf-dist/doc/latex/dtk/Changes +++ b/Master/texmf-dist/doc/latex/dtk/Changes @@ -8,6 +8,14 @@ dtk.cls ----- 1.24 2011-04-25 -delete the part for laoding eurosans we now use \euro from eurosym by default. (hv) +dtk12.clo -------- +0.03 2012-06-22 - use \dimexpr instead of package calc + + +dtk.bst -------- +1.10 2012-06-18 - fixed bug with dtk string + + dtklogos.cls ----- 2.15 2012-05-02 - revert e.\,V. (hv) 2.14 2012-04-12 - e.\,V., missing thinn space (hv) @@ -20,4 +28,5 @@ dtk-pdf.sty -------- dtk-url.sty -------- -1.00 2011-10-23 - first version \ No newline at end of file +1.00 2011-10-23 - first version + diff --git a/Master/texmf-dist/doc/latex/dtk/historical/dtk11.clo b/Master/texmf-dist/doc/latex/dtk/historical/dtk11.clo index 5d378bdfd2f..b8f6bdee993 100644 --- a/Master/texmf-dist/doc/latex/dtk/historical/dtk11.clo +++ b/Master/texmf-dist/doc/latex/dtk/historical/dtk11.clo @@ -1,4 +1,4 @@ -%% $Id: dtk11.clo 18 2011-04-23 10:43:52Z herbert $ +%% $Id: dtk11.clo 37 2012-05-30 12:01:13Z herbert $ \ProvidesFile{dtk11.clo}[2010/04/19 v0.02 dtk class option (RN,hv)] \input{dtk.clo}% Standardeinstellungen diff --git a/Master/texmf-dist/tex/latex/dtk/dtk.clo b/Master/texmf-dist/tex/latex/dtk/dtk.clo index cd6b4997c1b..a88f842068b 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 36 2012-05-02 19:43:14Z herbert $ +%% $Id: dtk.clo 37 2012-05-30 12:01:13Z herbert $ \ProvidesFile{dtk.clo}[2011/04/23 v0.4 dtk class option (RN,hv)] diff --git a/Master/texmf-dist/tex/latex/dtk/dtk.cls b/Master/texmf-dist/tex/latex/dtk/dtk.cls index f585c216d80..259e33278fe 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 36 2012-05-02 19:43:14Z herbert $ +%% $Id: dtk.cls 37 2012-05-30 12:01:13Z herbert $ %% %% This is file `dtk.cls', %% @@ -455,11 +455,11 @@ \newcommand\part@star[1]{% \@ifnextchar[{\part@optional{#1}}{\part@normal{#1}}} \def\part@optional#1[#2]#3{% - \markboth{#2}{#2}% +% \markboth{#2}{#2}% \addcontentsline{toc}{#1}{#2}% \@ifnextchar[{\part@subtitle{#3}}{\part@nosubtitle{#3}}} \newcommand\part@normal[2]{% - \markboth{#2}{#2}% +% \markboth{#2}{#2}% \addcontentsline{toc}{#1}{#2}% \@ifnextchar[{\part@subtitle{#2}}{\part@nosubtitle{#2}}} \def\part@subtitle#1[#2]{\TopArt{#1}{\\#2}\bigskip\par} @@ -537,6 +537,7 @@ \@thanks \let\thanks\@gobble \addcontentsline{toc}{chapter}{\@@title}% + \markboth{\@@title}{\@@title} \endgroup \let\@title=\@empty \let\@author=\@empty diff --git a/Master/texmf-dist/tex/latex/dtk/dtk12.clo b/Master/texmf-dist/tex/latex/dtk/dtk12.clo index ff9f9e647db..aa5c895043a 100644 --- a/Master/texmf-dist/tex/latex/dtk/dtk12.clo +++ b/Master/texmf-dist/tex/latex/dtk/dtk12.clo @@ -1,5 +1,5 @@ %% $Id: dtk12.clo 37 2012-05-30 12:01:13Z herbert $ -\ProvidesFile{dtk12.clo}[2012/04/10 v0.02 dtk class option (RN,hv)] +\ProvidesFile{dtk12.clo}[2012/04/10 v0.03 dtk class option (RN,hv)] \input{dtk.clo}% Standardeinstellungen @@ -32,11 +32,11 @@ \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}% + \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% \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]{\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% \endminipage\kern\de@sepWidth% \minipage[t]{\wd\tempbox}\vspace{0pt}\usebox\tempbox\endminipage\endminipage}% @@ -56,11 +56,11 @@ \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:WideFigure}% + \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% \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{\thefigure:WideFigure}% + \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% \endminipage\kern\de@sepWidth% \minipage[t]{\wd\tempbox}\vspace{0pt}\usebox\tempbox\endminipage\endminipage}% -- cgit v1.2.3