dtk

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

6 files changed, 228 insertions, 11 deletions

diff --git a/Master/texmf-dist/doc/latex/dtk/doc/beispiel.pdf b/Master/texmf-dist/doc/latex/dtk/doc/beispiel.pdf
index 03e41561652..000fadb4d8f 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/doc/latex/dtk/doc/beispiel.tex b/Master/texmf-dist/doc/latex/dtk/doc/beispiel.tex
index dc79c10df02..8d45c42c752 100644
--- a/Master/texmf-dist/doc/latex/dtk/doc/beispiel.tex
+++ b/Master/texmf-dist/doc/latex/dtk/doc/beispiel.tex
@@ -11,14 +11,14 @@
 
 \begin{document}
 \title{Die \texttt{dtk}-Klasse, Version \DTKversion -- \DTKversiondate}
-\Author{Herbert}{Voß}
-    {Wasgenstraße~21\\
+\Author{Mustermann}{Max}%
+    {Dorfstraße~1\\
      14129 Berlin\\
-     \Email{herbert@dante.de}}
-\Author{Rolf}{Niepraschk}%
-    {Persiusstr.~12\\
+     \Email{Max.Mustermann@xyz.de}}
+\Author{Peter}{Silie}%
+    {Hauptstr.~2\\
      10245~Berlin\\
-     \Email{Rolf.Niepraschk@gmx.de}}
+     \Email{Peter.Silie@abc.de}}
 \maketitle
 
 \section{Makros}
diff --git a/Master/texmf-dist/doc/latex/dtk/doc/dtk-extern-test.tex b/Master/texmf-dist/doc/latex/dtk/doc/dtk-extern-test.tex
new file mode 100644
index 00000000000..765c99ab05e
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/dtk/doc/dtk-extern-test.tex
@@ -0,0 +1,106 @@
+\documentclass[ngerman]{dtk}
+\ifluatex\else
+  \usepackage[utf8]{inputenc}
+\fi
+
+% lualatex --shell-escape dtk-extern-test.tex
+
+\usepackage{dtk-extern}
+
+\begin{document}
+
+
+\begin{minipage}{.3\linewidth}
+\begin{ErstelleGrafik}[grfOptions={width=0.5\linewidth},compiler=pdflatex]{Roemer1}
+\documentclass{standalone}
+\usepackage[T1]{fontenc}
+\usepackage[utf8]{inputenc}
+\usepackage{libertine}
+\usepackage[linguistics]{forest}
+\forestapplylibrarydefaults{linguistics, edges}
+\begin{document}
+\begin{forest}
+[VP
+  [DP]
+  [V’
+   [V]
+  [DP]
+  ]
+]
+\end{forest}
+\end{document}
+\end{ErstelleGrafik}
+\end{minipage} 
+\begin{minipage}{.3\linewidth}
+\begin{lstlisting}
+\begin{forest}
+[VP
+  [DP]
+  [V’
+   [V]
+  [DP]
+  ]
+]
+\end{forest}
+\end{lstlisting}
+\end{minipage} \quad oder \quad
+\begin{minipage}{.2\linewidth}
+\begin{lstlisting}
+\Forest*{
+[VP
+  [DP]
+  [V’
+   [V]
+  [DP]
+  ]
+]
+}
+\end{lstlisting}
+\end{minipage}
+
+
+\begin{minipage}{0.35\textwidth}
+\begin{ErstelleGrafik}[grfOptions={width=\linewidth},compiler=xelatex,crop]{Senger3}
+\documentclass{article}
+\usepackage{tikz}
+\usepackage[hks,pantone,xcolor]{xespotcolor}
+\pagestyle{empty}
+\begin{document}
+\SetPageColorSpace{HKS}
+\definecolor{HYellow}{spotcolor}{HKS05N,0.5}
+\definecolor{HRed}{spotcolor}{HKS14N,0.5}
+\definecolor{HBlue}{spotcolor}{HKS38N,0.5}
+\begin{tikzpicture}[scale=0.7,fill opacity=0.7]
+    \fill[HYellow]   ( 90:1.2) circle (2);
+    \fill[HRed] (210:1.2) circle (2);
+    \fill[HBlue]  (330:1.2) circle (2);
+ \node at ( 90:2) {Typography};
+\node at ( 210:2) {Design};
+\node at ( 330:2) {Coding};
+\node {\LaTeX};
+\end{tikzpicture}
+\end{document}
+\end{ErstelleGrafik}
+\end{minipage}
+\hfill
+\begin{minipage}{0.64\textwidth}
+\begin{lstlisting}
+\SetPageColorSpace{HKS}
+\definecolor{HYellow}{spotcolor}{HKS05N,0.5}
+\definecolor{HRed}{spotcolor}{HKS14N,0.5}
+\definecolor{HBlue}{spotcolor}{HKS38N,0.5}
+\begin{tikzpicture}[scale=0.7,fill opacity=0.7]
+\fill[HYellow]( 90:1.2) circle (2);
+\fill[HRed]   (210:1.2) circle (2);
+\fill[HBlue]  (330:1.2) circle (2);
+\node at ( 90:2)  {Typography};
+\node at ( 210:2) {Design};
+\node at ( 330:2) {Coding};
+\node {\LaTeX};
+\end{tikzpicture}
+\end{lstlisting}
+\end{minipage}
+
+\end{document}
+
+
diff --git a/Master/texmf-dist/tex/latex/dtk/dtk-extern.sty b/Master/texmf-dist/tex/latex/dtk/dtk-extern.sty
new file mode 100644
index 00000000000..54d05cf50c5
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/dtk/dtk-extern.sty
@@ -0,0 +1,102 @@
+%% This is file `dtk-extern.sty',
+%%
+%% LaTeX package for ``Die TeXnische Komoedie''.
+%%
+%% Copyright (C) 2016-
+%% Rolf Niepraschk, Herbert Voss
+%%
+%% It may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3c
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%%    http://www.latex-project.org/lppl.txt
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
+
+\ProvidesFile{dtk-extern}%
+  [2016/08/04 v0.03 dtk package for running external documents (HV)]
+
+\RequirePackage{shellesc,filecontents,xkeyval,graphicx}
+
+\newcounter{dtk@extern@runs}
+\define@key{dtk}{compiler}[pdflatex]{\gdef\dtk@extern@compiler{#1}}
+\define@key{dtk}{runsequence}[]{\gdef\dtk@extern@runsequence{#1}}
+\define@key{dtk}{runs}[1]{\setcounter{dtk@extern@runs}{#1}}
+\define@key{dtk}{grfOptions}[]{\gdef\dtk@extern@grfOptions{#1}}
+\define@key{dtk}{lstOptions}[]{\gdef\dtk@extern@lstOptions{#1}}
+\define@boolkey{dtk}[dtk@extern@]{code}[true]{}
+\define@boolkey{dtk}[dtk@extern@]{force}[true]{}
+\define@boolkey{dtk}[dtk@extern@]{crop}[true]{}
+\define@boolkey{dtk}[dtk@extern@]{biber}[true]{}
+\define@boolkey{dtk}[dtk@extern@]{includegraphic}[true]{}
+\define@boolkey{dtk}[dtk@extern@]{frame}[true]{}
+\define@boolkey{dtk}[dtk@extern@]{float}[true]{}
+\setkeys{dtk}{
+  code=false,%          show Code
+  crop=false,%		erzeugte PDF "croppen"
+  compiler=pdflatex,%	zu verwendener Compiler
+  grfOptions={},%	Optionen der einzubindenden Grafik
+  lstOptions={},%	Optionen für das Listing
+  includegraphic=true,% Grafik einbinden oder User überlassen
+  runs=1,%		Anzahl Compiler-Durchläufe
+  runsequence={},%	Im Moment nicht aktiv
+  biber=false,%		Biber laufen lassen?
+  force=false,%		Compiler, auch wenn PDF existiert?
+  frame=false,%		keinen Rahmen um Abbildung
+  float=false,%		nicht als Gleitumgebung
+  }
+\def\ResetKeys{%
+ \setkeys{dtk}{
+  code=false,%          show Code
+  crop=false,%		erzeugte PDF "croppen"
+  compiler=pdflatex,%	zu verwendener Compiler
+  grfOptions={},%	Optionen der einzubindenden Grafik
+  lstOptions={},%	Optionen für das Listing
+  includegraphic=true,% Grafik einbinden oder User überlassen
+  runs=1,%		Anzahl Compiler-Durchläufe
+  runsequence={},%	Im Moment nicht aktiv
+  biber=false,%		Biber laufen lassen?
+  force=false,%		Compiler, auch wenn PDF existiert?
+  frame=false,%		keinen Rahmen um Abbildung
+  float=false,%		nicht als Gleitumgebung
+  }
+}
+%%
+%% [#1]: Optionen  #2: Dateiname
+%%
+\newenvironment{ErstelleGrafik}[2][]
+  {\global\setkeys{dtk}{#1}%                   \begin
+     \gdef\dtk@extern@dateiname{#2}%
+     \typeout{Externer Dateiname: \dtk@extern@dateiname}% 
+     \@nameuse{filecontents*}{#2.tex}}
+  {\@nameuse{endfilecontents*}%         \end
+   \loop\ifnum\thedtk@extern@runs>0
+     \typeout{Run: \thedtk@extern@runs\space \dtk@extern@compiler\space\dtk@extern@dateiname}%
+     \ShellEscape{\dtk@extern@compiler\space\dtk@extern@dateiname}%
+     \addtocounter{dtk@extern@runs}{-1}%
+   \repeat
+   \ifdtk@extern@code\expandafter\lstinputlisting\expandafter[\dtk@extern@lstOptions]{\dtk@extern@dateiname}\fi
+   \expandafter\IfFileExists\expandafter{\dtk@extern@dateiname.pdf}%
+     {\ifdtk@extern@force
+        \ifdtk@extern@biber
+          \ShellEscape{biber  \dtk@extern@dateiname}%  NAch biber nochmal latex
+          \ShellEscape{\dtk@extern@compiler\space\dtk@extern@dateiname}%
+        \fi
+        \ifdtk@extern@crop
+          \ShellEscape{pdfcrop \dtk@extern@dateiname}%
+          \ShellEscape{mv \dtk@extern@dateiname-crop.pdf \dtk@extern@dateiname.pdf}%
+        \fi
+      \fi
+     }{}
+   \ifdtk@extern@includegraphic
+     \ifdtk@extern@float\begin{figure}[!htb]\fi
+     \ifdtk@extern@frame
+       \fbox{\expandafter\includegraphics\expandafter[\dtk@extern@grfOptions]{\dtk@extern@dateiname}}%
+     \else
+       \expandafter\includegraphics\expandafter[\dtk@extern@grfOptions]{\dtk@extern@dateiname}%
+     \fi
+     \ifdtk@extern@float\end{figure}\fi
+   \fi
+   \global\ResetKeys}
+%
+\endinput
diff --git a/Master/texmf-dist/tex/latex/dtk/dtk-logos.sty b/Master/texmf-dist/tex/latex/dtk/dtk-logos.sty
index c5b989d0eb3..96fd3c83af0 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) 2015-
+%% Copyright (C) 2017
 %% Herbert Voss
 %%
 %% It may be distributed and/or modified under the
@@ -18,9 +18,9 @@
 % $Id: deLogos.sty 188 2015-10-08 20:06:29Z herbert $
 %
 % -------------------------------------
-\ProvidesPackage{dtk-logos}[2015/10/21 Dante Edition: Logos (hv)]
+\ProvidesPackage{dtk-logos}[2017/03/20 v. 1.00 Dante Edition: Logos (hv)]
 %
-\RequirePackage{hologo,dantelogo}
+\RequirePackage{hologo,dantelogo,fontspec}
 %
 \def\HoLogo@La#1{%
   L%
@@ -120,5 +120,11 @@
 \let\biblatex\BibLaTeX
 \def\CTAN{\texttt{CTAN}\xspace}
 
+\iffalse
+\newfontfamily\LinWikipedia{LinLibertine_R_G}[Extension=.ttf,
+  Path=/usr/local/texlive/texmf-local/fonts/opentype/libertine/]
+\def\WikipediA{{\LinWikipedia\char"E02F\textsc{ikipediA}}} % dezimal
+\let\wikipedia\WikipediA
+\fi
 
 \endinput
diff --git a/Master/texmf-dist/tex/latex/dtk/dtk.cls b/Master/texmf-dist/tex/latex/dtk/dtk.cls
index d9505b315ea..0e8c51df339 100644
--- a/Master/texmf-dist/tex/latex/dtk/dtk.cls
+++ b/Master/texmf-dist/tex/latex/dtk/dtk.cls
@@ -21,8 +21,8 @@
 \HyphSubstIfExists{german-x-latest}{%
   \HyphSubstLet{german}{german-x-latest}}{}
 
-\def\DTKversion{2.06}
-\def\DTKversiondate{2016/12/06}
+\def\DTKversion{2.07}
+\def\DTKversiondate{2017/04/02}
 \ProvidesClass{dtk}[\DTKversiondate v\DTKversion dtk documentclass (RN)]
 
 \RequirePackage{ifxetex,ifluatex,ifpdf,ifvtex,luatex85}
@@ -254,6 +254,8 @@
   \ifx\relax#1\relax\gdef\@@title{#2}\else\gdef\@@title{#1}\fi%
 }
 
+\let\DTK@thispagestyle=\thispagestyle
+
 \newcommand\DTK@maketitle[1][]{%
   \begingroup
     \dimen0=\textheight
@@ -269,6 +271,7 @@
     \usekomafont{author}\lineskip 0.75em %
     \begin{tabular}[t]{@{}c@{}}\@author\end{tabular}\par
   \endgroup
+  \DTK@thispagestyle{plain.scrheadings}%
   \@thanks
   \global\let\@thanks=\@empty
   \global\let\@title=\@empty