dtk

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

3 files changed, 19 insertions, 10 deletions

diff --git a/Master/texmf-dist/tex/latex/dtk/dtk-extern.sty b/Master/texmf-dist/tex/latex/dtk/dtk-extern.sty
index f9f63c0df72..c54f4967e3b 100644
--- a/Master/texmf-dist/tex/latex/dtk/dtk-extern.sty
+++ b/Master/texmf-dist/tex/latex/dtk/dtk-extern.sty
@@ -14,9 +14,9 @@
 %% version 2005/12/01 or later.
 
 \ProvidesFile{dtk-extern}%
-  [2019/08/09 v0.13: dtk package for running external documents (HV)]
+  [2019/10/11 v0.15: dtk package for running external documents (HV)]
 
-\RequirePackage{shellesc,filecontents,xkeyval,graphicx,marginnote,fancyvrb}
+\RequirePackage{shellesc,xkeyval,graphicx,marginnote,fancyvrb}
 
 \newcounter{dtk@extern@runs}
 \newlength\dtk@extern@mpwidth \setlength\dtk@extern@mpwidth{\z@}
@@ -118,9 +118,9 @@
    \global\setkeys{dtk}{#1}%                   \begin
    \expandafter\IfFileExists\expandafter{\dtkExternDateiname.pdf}{}{\setkeys{dtk}{force}}%
    \begingroup
-   \@nameuse{filecontents*}{\dtkExternDateiname.tex}
+   \filecontents[force,noheader]{\dtkExternDateiname.tex}
   }
-  {\@nameuse{endfilecontents*}%         \end
+  {\endfilecontents%         \end
    \ifdtk@extern@copyToExampleDir
      \ShellEscape{cp\space\dtkExternDateiname.tex \dtk@extern@ExamplesDir/}%
    \fi
@@ -212,7 +212,7 @@
        \ifdim\dtk@extern@mpwidth>\z@ 
          \endminipage
        \else
-         \par\endgroup
+         \ifdtk@extern@inline\else\par\fi\endgroup
        \fi
      \fi
    \fi
diff --git a/Master/texmf-dist/tex/latex/dtk/dtk-new-engines.clo b/Master/texmf-dist/tex/latex/dtk/dtk-new-engines.clo
index 97836a98d43..0d1fdb96a27 100644
--- a/Master/texmf-dist/tex/latex/dtk/dtk-new-engines.clo
+++ b/Master/texmf-dist/tex/latex/dtk/dtk-new-engines.clo
@@ -18,7 +18,7 @@
 
 \typeout{NEW-ENGINE}
 
-\RequirePackage{fontspec}
+\RequirePackage[no-math]{fontspec}
 \RequirePackage{unicode-math}
 
 \ifluatex
@@ -41,13 +41,22 @@
            * File `dtk-fonts.cfg' used.^^J%
            *************************************}%
 }{%
+  \typeout{*************************************^^J%
+           * Using libertinus-otf              *^^J%
+           *************************************}%
   \RequirePackage{libertinus-otf}%
   \def\DTKrmFontName{Libertinus Serif}%
   \def\DTKsfFontName{Libertinus Sans Serif}%
 %  \setmathfont{XITSMath}[Scale=0.9,math-style=TeX,bold-style=TeX]%
   \def\DTKmathFontName{Libertinus Math}%
-  \setmonofont{AnonymousPro}[Scale=MatchLowercase,FakeStretch=0.87,
-    RawFeature=-tlig]%
+  \setmonofont{AnonymousPro}[
+    Scale          = MatchLowercase,FakeStretch=0.87,
+    RawFeature     = -tlig,
+    UprightFont    =*-Regular,
+    BoldFont       = *-Bold,
+    BoldItalicFont = *-BoldItalic,
+    ItalicFont     = *-Italic,
+    Extension      = .ttf]%
   \def\DTKttFontName{Anonymous Pro}%
 }
 
diff --git a/Master/texmf-dist/tex/latex/dtk/dtk.cls b/Master/texmf-dist/tex/latex/dtk/dtk.cls
index 05e9c431218..e140cb5e37b 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.08c}
-\def\DTKversiondate{2019/09/13}
+\def\DTKversion{2.08d}
+\def\DTKversiondate{2019/10/15}
 \ProvidesClass{dtk}[\DTKversiondate v\DTKversion dtk documentclass (RN)]
 
 \RequirePackage{ifxetex,ifluatex,ifpdf,ifvtex,luatex85}