dtk (9aug19)

git-svn-id: svn://tug.org/texlive/trunk@51851 c570f23f-e606-0410-a88d-b1316a301751

8 files changed, 65 insertions, 17 deletions

diff --git a/Master/texmf-dist/doc/latex/dtk/doc/beispiel.pdf b/Master/texmf-dist/doc/latex/dtk/doc/beispiel.pdf
index d780206a9dc..af7a74e821f 100644
--- a/Master/texmf-dist/doc/latex/dtk/doc/beispiel.pdf
+++ b/Master/texmf-dist/doc/latex/dtk/doc/beispiel.pdf
diff --git a/Master/texmf-dist/tex/latex/dtk/dtk-author.clo b/Master/texmf-dist/tex/latex/dtk/dtk-author.clo
index 5a9142af742..f2c896d216c 100644
--- a/Master/texmf-dist/tex/latex/dtk/dtk-author.clo
+++ b/Master/texmf-dist/tex/latex/dtk/dtk-author.clo
@@ -14,7 +14,7 @@
 %% version 2005/12/01 or later.
 
 \ProvidesFile{dtk-author.clo}%
-  [2017/12/16 v0.1c dtk class options for author mode (RN)]
+  [2016/02/15 v0.1b dtk class options for author mode (RN)]
 
 \newcommand*\keywords[1]{}
 \newcommand*\AutorenListe{}
diff --git a/Master/texmf-dist/tex/latex/dtk/dtk-extern.sty b/Master/texmf-dist/tex/latex/dtk/dtk-extern.sty
index cd3396a5cb0..f9f63c0df72 100644
--- a/Master/texmf-dist/tex/latex/dtk/dtk-extern.sty
+++ b/Master/texmf-dist/tex/latex/dtk/dtk-extern.sty
@@ -14,7 +14,7 @@
 %% version 2005/12/01 or later.
 
 \ProvidesFile{dtk-extern}%
-  [2018/12/01 v0.12: dtk package for running external documents (HV)]
+  [2019/08/09 v0.13: dtk package for running external documents (HV)]
 
 \RequirePackage{shellesc,filecontents,xkeyval,graphicx,marginnote,fancyvrb}
 
@@ -40,6 +40,7 @@
 \define@boolkey{dtk}[dtk@extern@]{xindex}[true]{}
 \define@key{dtk}{xindexOptions}[]{\def\dtk@extern@xindexOptions{#1}}
 \define@boolkey{dtk}[dtk@extern@]{includegraphic}[true]{}
+\define@boolkey{dtk}[dtk@extern@]{inline}[true]{}
 \define@boolkey{dtk}[dtk@extern@]{frame}[true]{}
 \define@boolkey{dtk}[dtk@extern@]{float}[true]{}
 \define@boolkey{dtk}[dtk@extern@]{cleanup}[true]{}
@@ -56,6 +57,7 @@
   grfOptions={},%	Optionen der einzubindenden Grafik
   lstOptions={},%	Optionen für das Listing
   includegraphic=true,% Grafik einbinden oder User überlassen
+  inline=false,%        Grafik nicht in derselben Zeile
   runs=1,%		Anzahl Compiler-Durchläufe
   runsequence={},%	Im Moment nicht aktiv
   biber=false,%		Biber laufen lassen?
@@ -85,7 +87,7 @@
 
 \newcounter{dtk@example@counter}
 
-\newcommand\ExampleType[5]{%
+\newcommand\extern@ExampleType[5]{%
    \ifdtk@extern@usefancyvrb
      \@namedef{#1@initText}{\gdef\FancyVerbStartString{#2}\gdef\FancyVerbStopString{#3}}% text
      \@namedef{#1@initPreamble}{\gdef\FancyVerbStartString{#4}\gdef\FancyVerbStopString{#5}}% code
@@ -95,13 +97,13 @@
    \fi
 }
 
-\ExampleType{latex}%               #1
+\extern@ExampleType{latex}%               #1
   {\string\begin\string{document\string}}%       #2
   {\string\end\string{document\string}}%         #3
   {\perCent StartVisiblePreamble}% #4
   {\perCent StopVisiblePreamble}%  #5
 
-\ExampleType{context}
+\extern@ExampleType{context}
   {\string\starttext}
   {\string\stoptext}
   {\perCent StartVisiblePreamble}
@@ -187,7 +189,7 @@
        \ifdim\dtk@extern@mpwidth>\z@ 
          \hfill\minipage[t]{\dimexpr\linewidth-\dtk@extern@mpwidth-1em\relax}\vspace{0pt}
        \else
-         \par\begingroup
+         \ifdtk@extern@inline\else\par\fi\begingroup
        \fi
      \fi
      \dtk@extern@align
diff --git a/Master/texmf-dist/tex/latex/dtk/dtk-full.clo b/Master/texmf-dist/tex/latex/dtk/dtk-full.clo
index 2ca4a19f800..86e74bf3f17 100644
--- a/Master/texmf-dist/tex/latex/dtk/dtk-full.clo
+++ b/Master/texmf-dist/tex/latex/dtk/dtk-full.clo
@@ -14,7 +14,7 @@
 %% version 2005/12/01 or later.
 
 \ProvidesFile{dtk-full.clo}%
-  [2019/01/31 v0.1l dtk class options for full mode (RN)]
+  [2019/04/22 v0.1m dtk class options for full mode (RN)]
 
 \@ifclasslater{scrbook}{2015/09/29}{}{%
   \ClassError{dtk2}{%
@@ -205,7 +205,7 @@
       \makeatletter
       \ifdim\wd\DTK@tempbox>\z@
         \scantokens{\protected@edef\x{%
-          \noexpand\sindex[autoren]{#2#1@#1 #2!#3}}}%
+          \noexpand\sindex[autoren]{#2#1@#1 #2!#3}}\@empty}%
         \x
       \else
         \ifDTK@korr@
diff --git a/Master/texmf-dist/tex/latex/dtk/dtk-logos.sty b/Master/texmf-dist/tex/latex/dtk/dtk-logos.sty
index 3672dd2f0c7..dd22a06822a 100644
--- a/Master/texmf-dist/tex/latex/dtk/dtk-logos.sty
+++ b/Master/texmf-dist/tex/latex/dtk/dtk-logos.sty
@@ -4,7 +4,7 @@
 %%
 %% LaTeX Class for ``Die TeXnische Komoedie''.
 %%
-%% Copyright (C) 2018
+%% Copyright (C) 2019
 %% Herbert Voss
 %%
 %% It may be distributed and/or modified under the
@@ -17,7 +17,7 @@
 %
 %
 % -------------------------------------
-\ProvidesPackage{dtk-logos}[2018/10/19 v. 1.06 Dante Edition: Logos (hv)]
+\ProvidesPackage{dtk-logos}[2019/06/05 v. 1.07 Dante Edition: Logos (hv)]
 %
 \newif\if@dtk@newengine \@dtk@newenginetrue 
 \RequirePackage{ifluatex,ifxetex}
@@ -57,8 +57,9 @@
 \def\AmSTeX{\mbox{\textsf{AMS}-\hologo{TeX}}}
 \def\biber{\hologo{biber}}
 \def\Biber{\Hologo{biber}}
-\def\BibTeX{\hologo{BibTeX}}
-\def\BibTeXacht{\hologo{BibTeX8}}
+\def\BibTeX{{\hologoLogoSetup{BibTeX}{variant=sc}\hologo{BibTeX}}}
+\def\BibTeXacht{{\hologoLogoSetup{BibTeX8}{variant=sc}\hologo{BibTeX8}}}
+\def\BibTeX8{{\hologoLogoSetup{BibTeX8}{variant=sc}\hologo{BibTeX8}}}
 \def\ConTeXt{\hologo{ConTeXt}}
 \let\context\ConTeXt
 \def\emTeX{\hologo{emTeX}}
diff --git a/Master/texmf-dist/tex/latex/dtk/dtk-url.sty b/Master/texmf-dist/tex/latex/dtk/dtk-url.sty
index 2f30ef0bbea..9ccccaee3bb 100644
--- a/Master/texmf-dist/tex/latex/dtk/dtk-url.sty
+++ b/Master/texmf-dist/tex/latex/dtk/dtk-url.sty
@@ -14,8 +14,8 @@
 %% version 2005/12/01 or later.
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{dtk-url}[2016/04/23 v1.2 Urls for DTK (HO,hv)]
-%% 1.1 hv
+\ProvidesPackage{dtk-url}[2019/07/29 v1.3 Urls for DTK (HO,hv)]
+%% 1.1, 1.2, 1.3 hv
 
 \RequirePackage{url}[2006/04/12]
 
@@ -24,7 +24,7 @@
 \newcommand*{\DTK@UrlCtanSetup}{}
 \newcommand*{\DTK@UrlEmailSetup}{}
 \newcommand*{\DTK@UrlCtanPrefix}{CTAN:}
-\newcommand*{\DTK@UrlCtanServerPrefix}{http://mirror.ctan.org/}
+\newcommand*{\DTK@UrlCtanServerPrefix}{https://mirror.ctan.org/}
 \newcommand*{\DTK@UrlFile}{\jobname.urls}
 
 % Schalter \ifDTK@Url@ legt fest, wann die URLs aktiv sein sollen
diff --git a/Master/texmf-dist/tex/latex/dtk/dtk.bbx b/Master/texmf-dist/tex/latex/dtk/dtk.bbx
index a77f0e84d16..381b7ab1236 100644
--- a/Master/texmf-dist/tex/latex/dtk/dtk.bbx
+++ b/Master/texmf-dist/tex/latex/dtk/dtk.bbx
@@ -180,6 +180,51 @@
   \usebibmacro{finentry}}
 %
 
+\DeclareBibliographyDriver{book}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{author/translator+others}%
+  \setunit{\labelnamepunct}\newblock
+  \usebibmacro{maintitle+title}%
+  \newunit
+  \usebibmacro{byauthor}%
+  \newunit\newblock
+  \usebibmacro{byeditor+others}%
+  \newunit\newblock
+  \newunit
+  \printfield{volumes}%
+  \newunit\newblock
+  \usebibmacro{series+number}%
+  \newunit\newblock
+  \printfield{note}%
+  \newunit\newblock
+  \usebibmacro{publisher+location+date}%
+  \newunit\newblock
+  \usebibmacro{chapter+pages}%
+  \newunit
+  \printfield{pagetotal}%
+  \newunit\newblock
+  \iftoggle{bbx:isbn}
+    {\printfield{isbn}}
+    {}%
+  \newunit\newblock
+  \usebibmacro{doi+eprint+url}%
+  \newunit\newblock
+  \usebibmacro{addendum+pubstate}%
+  \setunit{\bibpagerefpunct}\newblock
+  \usebibmacro{pageref}%
+  \newunit\newblock
+  \iftoggle{bbx:related}
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}
+    {}%
+  \usebibmacro{finentry}%
+}
+
+
+
+
+
 %\setlength\labelnumberwidth{1.5em}
 %\setlength\biblabelsep{1em}
 \defbibenvironment{dtk@bib}
diff --git a/Master/texmf-dist/tex/latex/dtk/dtk.cls b/Master/texmf-dist/tex/latex/dtk/dtk.cls
index 816af176367..899bef376b9 100644
--- a/Master/texmf-dist/tex/latex/dtk/dtk.cls
+++ b/Master/texmf-dist/tex/latex/dtk/dtk.cls
@@ -28,8 +28,8 @@
 \HyphSubstIfExists{german-x-latest}{%
   \HyphSubstLet{german}{german-x-latest}}{}
 
-\def\DTKversion{2.08a}
-\def\DTKversiondate{2019/01/31}
+\def\DTKversion{2.08b}
+\def\DTKversiondate{2019/08/09}
 \ProvidesClass{dtk}[\DTKversiondate v\DTKversion dtk documentclass (RN)]
 
 \RequirePackage{ifxetex,ifluatex,ifpdf,ifvtex,luatex85}