From 7afc913ca0d6950248f0a3484cd47571b83ee166 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 3 Apr 2016 21:00:47 +0000 Subject: dtx (3apr16) git-svn-id: svn://tug.org/texlive/trunk@40226 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/dtk/doc/beispiel.pdf | Bin 90922 -> 88955 bytes Master/texmf-dist/tex/latex/dtk/dtk.bbx | 24 +++++++++++------------ Master/texmf-dist/tex/latex/dtk/dtk.cls | 6 +++--- Master/tlpkg/bin/tlpkginfo | 5 +++-- 4 files changed, 17 insertions(+), 18 deletions(-) diff --git a/Master/texmf-dist/doc/latex/dtk/doc/beispiel.pdf b/Master/texmf-dist/doc/latex/dtk/doc/beispiel.pdf index f4b653b7838..1ba5b8ca9fb 100644 Binary files a/Master/texmf-dist/doc/latex/dtk/doc/beispiel.pdf and b/Master/texmf-dist/doc/latex/dtk/doc/beispiel.pdf differ diff --git a/Master/texmf-dist/tex/latex/dtk/dtk.bbx b/Master/texmf-dist/tex/latex/dtk/dtk.bbx index 34f64b5e12f..970fe5eff9b 100644 --- a/Master/texmf-dist/tex/latex/dtk/dtk.bbx +++ b/Master/texmf-dist/tex/latex/dtk/dtk.bbx @@ -8,13 +8,11 @@ %% See http://www.latex-project.org/lppl.txt %% --------------------------------------------------------------- %% -\ProvidesFile{dtk.bbx}[\abx@bbxid] -% -%%[2015/11/03 v0.06 biblatex bibliography style] +\ProvidesFile{dtk.bbx}[2016/04/02 v0.10 biblatex bibliography style for DTK] % Load the standard style to avoid copy-pasting unnecessary material -%\RequireBibliographyStyle{chem-angew} -\RequireBibliographyStyle{numeric} +\RequireBibliographyStyle{chem-angew} +%\RequireBibliographyStyle{numeric} %\RequireBibliographyStyle{authoryear} \DeclareBibliographyOption{dashed}[true]{% @@ -27,15 +25,15 @@ { doi = true , eprint = true , - giveninits = false, + firstinits = false, isbn = true , maxnames = 3 , minnames = 1 , % maxcitenames= 2 , % pageranges = true , url = true, -% articletitle = true, -% chaptertitle = true, + articletitle = true, + chaptertitle = true, % biblabel = parens, sorting = nyvt, dashed = true, @@ -92,10 +90,11 @@ \renewcommand*\labelnamepunct{\addcolon\addspace} -%\DeclareNameFormat{default}{% -% \usebibmacro{name:first-last}{#1}{#3}{#5}{#7}% -%% \usebibmacro{name:first-last}{#1}{#4}{#5}{#7}% -% \usebibmacro{name:andothers}} +\DeclareNameFormat{default}{% + \nameparts{#1}% + \usebibmacro{name:first-last}{\namepartfamily}{\namepartgiven}{\namepartprefix}{\namepartsuffix}% +% \usebibmacro{name:first-last}\namepartfamily}{\namepartgiveni}{\namepartprefix}{\namepartsuffix} + \usebibmacro{name:andothers}} \newbibmacro*{bbx:dashcheck}[2]{% \ifboolexpr{% @@ -198,7 +197,6 @@ {\endlist} {\item} - %% %% \endinput \ No newline at end of file diff --git a/Master/texmf-dist/tex/latex/dtk/dtk.cls b/Master/texmf-dist/tex/latex/dtk/dtk.cls index 7a738096274..9522f4a24e2 100644 --- a/Master/texmf-dist/tex/latex/dtk/dtk.cls +++ b/Master/texmf-dist/tex/latex/dtk/dtk.cls @@ -2,7 +2,7 @@ %% %% LaTeX Class for ``Die TeXnische Komoedie''. %% -%% Copyright (C) 2015- +%% Copyright (C) 2015- %% Rolf Niepraschk, Herbert Voss %% %% It may be distributed and/or modified under the @@ -21,7 +21,7 @@ \HyphSubstIfExists{german-x-latest}{% \HyphSubstLet{german}{german-x-latest}}{} -\def\DTKversion{2.0b} +\def\DTKversion{2.02} \def\DTKversiondate{2016/02/15} \ProvidesClass{dtk}[\DTKversiondate\ v\DTKversion\ dtk documentclass (RN)] @@ -476,7 +476,7 @@ \let\Command\texttt \let\Environment\texttt \def\biblatex{\texttt{biblatex}\xspace} -\def\tex4ht{\hologo{TeX4ht}} +\def\tex4ht{\hologo{TeX4ht}} \let\Paket\texttt \let\Package\texttt \let\Programm\texttt diff --git a/Master/tlpkg/bin/tlpkginfo b/Master/tlpkg/bin/tlpkginfo index ca7037b536f..07554448d8f 100755 --- a/Master/tlpkg/bin/tlpkginfo +++ b/Master/tlpkg/bin/tlpkginfo @@ -138,14 +138,12 @@ sub find_ctan_dir { #warn "find_ctan_dir: got $ctan_dir\n"; if (! $ctan_dir) { # fall back on many special cases - (my $me_wo_babel = $me) =~ s,^babel-,,; # remove when Catalogue ready (my $me_wo_bin = $me) =~ s,^bin-,,; (my $me_wo_powerdot = $me) =~ s,^powerdot-,,; (my $me_wo_type1 = $me) =~ s,-type1$,,; for my $dir ( "macros/latex/contrib/$me", # most everything - "macros/latex/contrib/babel-contrib/$me_wo_babel", # babel-* "macros/latex/contrib/biblatex/$me", # authoryear-icomp-tt "macros/latex/contrib/biblatex-contrib/$me", # biblatex-* "macros/latex/contrib/gene/$me", # eqname @@ -384,6 +382,9 @@ sub prepare { } elsif ($pkg eq "latex") { $tds_path = "$CTAN/install/macros/latex/latex-base.tds.zip"; + } elsif ($pkg eq "babel") { + $tds_path = "$CTAN/install/macros/latex/required/babel-base.tds.zip"; + } elsif ($pkg =~ /^(amsmath|cyrillic|graphics|tools)$/) { $tds_path = "$CTAN/install/macros/latex/required/latex-$pkg.tds.zip"; -- cgit v1.2.3