texlive[44524] Master/texmf-dist: dtk (7jun17)
commits+karl at tug.org
commits+karl at tug.org
Wed Jun 7 23:24:41 CEST 2017
Revision: 44524
http://tug.org/svn/texlive?view=revision&revision=44524
Author: karl
Date: 2017-06-07 23:24:40 +0200 (Wed, 07 Jun 2017)
Log Message:
-----------
dtk (7jun17)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/dtk/README.md
trunk/Master/texmf-dist/doc/latex/dtk/doc/beispiel.pdf
trunk/Master/texmf-dist/doc/latex/dtk/doc/dtk-extern-test.tex
trunk/Master/texmf-dist/tex/latex/dtk/dtk-extern.sty
trunk/Master/texmf-dist/tex/latex/dtk/dtk-full.clo
trunk/Master/texmf-dist/tex/latex/dtk/dtk-logos.sty
trunk/Master/texmf-dist/tex/latex/dtk/dtk.cls
Modified: trunk/Master/texmf-dist/doc/latex/dtk/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/dtk/README.md 2017-06-07 21:24:25 UTC (rev 44523)
+++ trunk/Master/texmf-dist/doc/latex/dtk/README.md 2017-06-07 21:24:40 UTC (rev 44524)
@@ -2,4 +2,4 @@
LaTeX class for the journal »Die TeXnische Komödie« (new implementation).
-Rolf Niepraschk, Rolf.Niepraschk at gmx.de
+Rolf Niepraschk <Rolf.Niepraschk at gmx.de> and Herbert Voss <Herbert at dante.de>
Modified: trunk/Master/texmf-dist/doc/latex/dtk/doc/beispiel.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/dtk/doc/dtk-extern-test.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/dtk/doc/dtk-extern-test.tex 2017-06-07 21:24:25 UTC (rev 44523)
+++ trunk/Master/texmf-dist/doc/latex/dtk/doc/dtk-extern-test.tex 2017-06-07 21:24:40 UTC (rev 44524)
@@ -3,15 +3,42 @@
\usepackage[utf8]{inputenc}
\fi
-% lualatex --shell-escape dtk-extern-test.tex
+\usepackage{dtk-extern}
+\makeatletter
+\edef\dtkFileversion{\@nameuse{ver at dtk-extern}}
+\makeatother
+\begin{document}
+\title[Externe Dokumente erzeugen]{\dtkFileversion~-- Externe Dokumente aus \LaTeX\ heraus definieren und das Ergebnis einbinden, }
+\Author{Herbert}{Voß}{\Email{herbert at dante.de}}
+\maketitle
+\section{Syntax}
+
+\begin{verbatim}
\usepackage{dtk-extern}
+\end{verbatim}
-\begin{document}
+Das Paket wird standardmäßig bei Verwendung der Klasse \texttt{dtk} geladen.
+Externe \LaTeX-, \ConTeXt-, \ldots\ Dokumente lassen sich mit der folgenden
+Umgebung erzeugen:
+
+\begin{verbatim}
+\begin{externalDocument}[<optionale Argumente>]{<externer Dateiname ohne .tex>}
+...
+Quellcode
+...
+\end{externalDocument}
+\end{verbatim}
+
+Das Hauptdocument \emph{muss} mit der Option \texttt{-shell-escape} aufgerufen werden.
+
+
+\section{Beispiele}
+
\begin{minipage}{.3\linewidth}
-\begin{ErstelleGrafik}[grfOptions={width=0.5\linewidth},compiler=pdflatex]{Roemer1}
+\begin{externalDocument}[grfOptions={width=0.5\linewidth},compiler=pdflatex,force,cleanup]{Roemer1}
\documentclass{standalone}
\usepackage[T1]{fontenc}
\usepackage[utf8]{inputenc}
@@ -29,7 +56,7 @@
]
\end{forest}
\end{document}
-\end{ErstelleGrafik}
+\end{externalDocument}
\end{minipage}
\begin{minipage}{.3\linewidth}
\begin{lstlisting}
@@ -60,7 +87,8 @@
\begin{minipage}{0.35\textwidth}
-\begin{ErstelleGrafik}[grfOptions={width=\linewidth},compiler=xelatex,crop]{Senger3}
+\begin{externalDocument}[grfOptions={width=\linewidth},compiler=xelatex,
+ crop,cleanup,force]{Senger3}
\documentclass{article}
\usepackage{tikz}
\usepackage[hks,pantone,xcolor]{xespotcolor}
@@ -80,7 +108,7 @@
\node {\LaTeX};
\end{tikzpicture}
\end{document}
-\end{ErstelleGrafik}
+\end{externalDocument}
\end{minipage}
\hfill
\begin{minipage}{0.64\textwidth}
@@ -101,6 +129,98 @@
\end{lstlisting}
\end{minipage}
+
+\section{Optionale Argumente}
+
+
+\begin{verbatim}
+ code=false,% show Source 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
+ caption=,% keine Caption
+ label=,% kein Label
+ pages=1,% welche Seiten auszugeben sind
+ docType=latex,% LaTeX example Code
+\end{verbatim}
+
+\begin{externalDocument}[
+ grfOptions={width=0.48\linewidth},
+ pages={1,3},
+ frame,compiler=pdflatex,
+% crop,
+ force,runs=2,code,docType=latex,
+ frame,
+ lstOptions={columns=fixed}]{Schubert-A}
+%StartVisiblePreamble
+\documentclass[chapterprefix=on,parskip=half-,DIV=12,fontsize=12pt]{scrbook}
+\DeclareNewSectionCommand[
+ style=section,
+ level=4,
+ beforeskip=-3.25ex plus -1ex minus -.2ex,
+ afterskip=1.5ex plus .2ex,
+ font=\normalsize,
+ indent=0pt,
+ counterwithin=subsubsection
+]{subsubsubsection}
+\RedeclareSectionCommand[
+ level=5,
+ toclevel=5,
+ tocindent=13em,
+ tocnumwidth=5.9em,
+ counterwithin=subsubsubsection
+]{paragraph}
+\RedeclareSectionCommand[
+ level=6,
+ toclevel=6,
+ tocindent=15em,
+ tocnumwidth=6.8em
+]{subparagraph}
+\setcounter{secnumdepth}{\subsubsubsectionnumdepth}
+\setcounter{tocdepth}{\subsubsubsectiontocdepth}
+%StopVisiblePreamble
+\usepackage[ngerman]{babel}
+\usepackage[utf8]{inputenc}
+\usepackage{libertine}
+\usepackage{blindtext}
+\begin{document}
+\tableofcontents
+\chapter{Einführung}
+\section{Ein Abschnitt}
+\subsection{Ein Unterabschnitt}
+\subsubsection{Ein Unter-Unterabschnitt}
+\subsubsubsection{Ein Unter-Unter-Unterabschnitt}
+\paragraph{Der normale Paragraph}
+\blindtext
+\subparagraph{Der normale Unterparagraph}
+\blindtext
+\blinddocument
\end{document}
+\end{externalDocument}
+\section{Ausgabe des Quellcodes}
+Die Ausgabe des Quellcodes erzeugt im Allgemeinen partiell. Die beiden Marker
+
+\begin{verbatim}
+[...]
+%StartVisiblePreamble
+[... auszugebene Präambelteil]
+%StopVisiblePreamble
+[...]
+\end{verbatim}
+
+begrenzen den Teil der ausgegeben werden soll. Aus dem Textkörper wird alles
+zwischen \verb|\begin{document}| und \verb|\end{document}| ausgegeben.
+
+\end{document}
+
+
Modified: trunk/Master/texmf-dist/tex/latex/dtk/dtk-extern.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/dtk/dtk-extern.sty 2017-06-07 21:24:25 UTC (rev 44523)
+++ trunk/Master/texmf-dist/tex/latex/dtk/dtk-extern.sty 2017-06-07 21:24:40 UTC (rev 44524)
@@ -14,16 +14,20 @@
%% version 2005/12/01 or later.
\ProvidesFile{dtk-extern}%
- [2016/08/04 v0.03 dtk package for running external documents (HV)]
+ [2017/06/04 v0.06: dtk package for running external documents (HV)]
\RequirePackage{shellesc,filecontents,xkeyval,graphicx}
\newcounter{dtk at extern@runs}
-\define at key{dtk}{compiler}[pdflatex]{\gdef\dtk at extern@compiler{#1}}
-\define at key{dtk}{runsequence}[]{\gdef\dtk at extern@runsequence{#1}}
+\define at key{dtk}{compiler}[pdflatex]{\def\dtk at extern@compiler{#1}}
+\define at key{dtk}{runsequence}[]{\def\dtk at extern@runsequence{#1}}
\define at key{dtk}{runs}[1]{\setcounter{dtk at extern@runs}{#1}}
-\define at key{dtk}{grfOptions}[]{\gdef\dtk at extern@grfOptions{#1}}
-\define at key{dtk}{lstOptions}[]{\gdef\dtk at extern@lstOptions{#1}}
+\define at key{dtk}{grfOptions}[]{\def\dtk at extern@grfOptions{#1}}
+\define at key{dtk}{lstOptions}[]{\def\dtk at extern@lstOptions{#1}}
+\define at key{dtk}{docType}[latex]{\def\dtk at extern@docType{#1}}
+\define at key{dtk}{caption}[]{\def\dtk at extern@caption{#1}}
+\define at key{dtk}{label}[]{\def\dtk at extern@label{#1}}
+\define at key{dtk}{pages}[1]{\def\dtk at extern@pages{#1}}
\define at boolkey{dtk}[dtk at extern@]{code}[true]{}
\define at boolkey{dtk}[dtk at extern@]{force}[true]{}
\define at boolkey{dtk}[dtk at extern@]{crop}[true]{}
@@ -31,20 +35,8 @@
\define at boolkey{dtk}[dtk at extern@]{includegraphic}[true]{}
\define at boolkey{dtk}[dtk at extern@]{frame}[true]{}
\define at boolkey{dtk}[dtk at 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
- }
+\define at boolkey{dtk}[dtk at extern@]{cleanup}[true]{}
+
\def\ResetKeys{%
\setkeys{dtk}{
code=false,% show Code
@@ -59,8 +51,37 @@
force=false,% Compiler, auch wenn PDF existiert?
frame=false,% keinen Rahmen um Abbildung
float=false,% nicht als Gleitumgebung
+ caption=,% keine Caption
+ label=,% kein Label
+ pages=1,% welche Seiten auszugeben sind
+ docType=latex,% LaTeX example Code
+ cleanup=false,% Hilfsdateien nicht löschen
}
}
+\ResetKeys
+
+{\catcode`\%=12
+ \gdef\perCent{%}
+ \gdef\DoubleperCent{%%}
+}
+
+\newcommand\ExampleType[5]{%
+ \@namedef{#1 at initText}{linerange=#2-#3,includerangemarker=false}% text
+ \@namedef{#1 at initPreamble}{linerange=#4-#5,includerangemarker=false}% code
+}
+
+\ExampleType{latex}% #1
+ {begin\string{document\string}}% #2
+ {end\string{document\string}}% #3
+ {\perCent StartVisiblePreamble}% #4
+ {\perCent StopVisiblePreamble}% #5
+
+\ExampleType{context}
+ {\string\starttext}
+ {\string\stoptext}
+ {\perCent StartVisiblePreamble}
+ {\perCent StopVisiblePreamble}
+
%%
%% [#1]: Optionen #2: Dateiname
%%
@@ -67,15 +88,30 @@
\newenvironment{ErstelleGrafik}[2][]
{\global\setkeys{dtk}{#1}% \begin
\gdef\dtk at extern@dateiname{#2}%
- \typeout{Externer Dateiname: \dtk at extern@dateiname}%
- \@nameuse{filecontents*}{#2.tex}}
+ \begingroup
+ \@nameuse{filecontents*}{#2.tex}
+ }
{\@nameuse{endfilecontents*}% \end
+ \endgroup
\loop\ifnum\thedtk at extern@runs>0
\typeout{Run: \thedtk at extern@runs\space \dtk at extern@compiler\space\dtk at extern@dateiname}%
\ShellEscape{\dtk at extern@compiler\space\dtk at extern@dateiname}%
\addtocounter{dtk at extern@runs}{-1}%
\repeat
- \ifdtk at extern@code\expandafter\lstinputlisting\expandafter[\dtk at extern@lstOptions]{\dtk at extern@dateiname}\fi
+ \ifdtk at extern@code
+ \expandafter\edef\expandafter\dtk at lst@options at preamble\expandafter{%
+ \@nameuse{\dtk at extern@docType @initPreamble},
+ \dtk at extern@lstOptions,
+ backgroundcolor=\noexpand\color{black!12}}%
+ \expandafter\lstinputlisting\expandafter[\dtk at lst@options at preamble]{\dtk at extern@dateiname}
+%
+ \expandafter\edef\expandafter\dtk at lst@options at text\expandafter{%
+ \@nameuse{\dtk at extern@docType @initText},
+ \dtk at extern@lstOptions,
+ backgroundcolor=\noexpand\color{black!8}}%
+ \typeout{\dtk at lst@options at text}
+ \expandafter\lstinputlisting\expandafter[\dtk at lst@options at text]{\dtk at extern@dateiname}
+ \fi
\expandafter\IfFileExists\expandafter{\dtk at extern@dateiname.pdf}%
{\ifdtk at extern@force
\ifdtk at extern@biber
@@ -89,14 +125,31 @@
\fi
}{}
\ifdtk at extern@includegraphic
- \ifdtk at extern@float\begin{figure}[!htb]\fi
+ \ifdtk at extern@float\begin{figure}[!htb]\centering\fi
\ifdtk at extern@frame
- \fbox{\expandafter\includegraphics\expandafter[\dtk at extern@grfOptions]{\dtk at extern@dateiname}}%
+ \expandafter\@for\expandafter\next\expandafter:\expandafter=\dtk at extern@pages\do{%
+ \fbox{\expandafter\includegraphics\expandafter[\dtk at extern@grfOptions,page=\next]{\dtk at extern@dateiname}}%
+ \hspace{5pt}}\hspace*{-5pt}
+% \fbox{\expandafter\includegraphics\expandafter[\dtk at extern@grfOptions]{\dtk at extern@dateiname}}%
\else
- \expandafter\includegraphics\expandafter[\dtk at extern@grfOptions]{\dtk at extern@dateiname}%
+ \expandafter\@for\expandafter\next\expandafter:\expandafter=\dtk at extern@pages\do{%
+ \expandafter\includegraphics\expandafter[\dtk at extern@grfOptions,page=\next]{\dtk at extern@dateiname}%
+ \hspace{5pt}}\hspace*{-5pt}
+% \expandafter\includegraphics\expandafter[\dtk at extern@grfOptions]{\dtk at extern@dateiname}%
\fi
+ \ifx\dtk at extern@caption\@empty\else\caption{\dtk at extern@caption}\fi
+ \ifx\dtk at extern@label\@empty\else\label{\dtk at extern@label}\fi
\ifdtk at extern@float\end{figure}\fi
\fi
+ \ifdtk at extern@cleanup
+ \ShellEscape{rm \dtk at extern@dateiname.log}%
+ \ShellEscape{rm \dtk at extern@dateiname.aux}%
+ \ShellEscape{rm \dtk at extern@dateiname.toc}%
+% \ShellEscape{rm \dtk at extern@dateiname.log}%
+ \fi
\global\ResetKeys}
%
+\let\externalDocument\ErstelleGrafik
+\let\endexternalDocument\endErstelleGrafik
+%%
\endinput
Modified: trunk/Master/texmf-dist/tex/latex/dtk/dtk-full.clo
===================================================================
--- trunk/Master/texmf-dist/tex/latex/dtk/dtk-full.clo 2017-06-07 21:24:25 UTC (rev 44523)
+++ trunk/Master/texmf-dist/tex/latex/dtk/dtk-full.clo 2017-06-07 21:24:40 UTC (rev 44524)
@@ -14,7 +14,7 @@
%% version 2005/12/01 or later.
\ProvidesFile{dtk-full.clo}%
- [2016/12/06 v0.1h dtk class options for full mode (RN)]
+ [2017/05/30 v0.1i dtk class options for full mode (RN)]
\@ifclasslater{scrbook}{2015/09/29}{}{%
\ClassError{dtk2}{%
@@ -135,7 +135,9 @@
\newcommand*\DTK at addbibresource[2][]{}%
\newcommand*\ORIG at printbibliography{}
\let\ORIG at printbibliography=\printbibliography
- \renewcommand*\printbibliography[1][]{\ORIG at printbibliography[heading=dtk]}
+ \renewcommand*\printbibliography[1][]{\ORIG at printbibliography[heading=dtk]%
+ \global\let\bbx at lasthash=\relax
+ }
\RequirePackage[split,protected]{splitidx} \makeindex
\newindex[\AutorenListenName]{autoren}%
\newcommand*\AutorenListe{%
Modified: trunk/Master/texmf-dist/tex/latex/dtk/dtk-logos.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/dtk/dtk-logos.sty 2017-06-07 21:24:25 UTC (rev 44523)
+++ trunk/Master/texmf-dist/tex/latex/dtk/dtk-logos.sty 2017-06-07 21:24:40 UTC (rev 44524)
@@ -18,9 +18,9 @@
% $Id: deLogos.sty 188 2015-10-08 20:06:29Z herbert $
%
% -------------------------------------
-\ProvidesPackage{dtk-logos}[2017/03/20 v. 1.00 Dante Edition: Logos (hv)]
+\ProvidesPackage{dtk-logos}[2017/06/07 v. 1.01 Dante Edition: Logos (hv)]
%
-\RequirePackage{hologo,dantelogo,fontspec}
+\RequirePackage{hologo,dantelogo}
%
\def\HoLogo at La#1{%
L%
Modified: trunk/Master/texmf-dist/tex/latex/dtk/dtk.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/dtk/dtk.cls 2017-06-07 21:24:25 UTC (rev 44523)
+++ trunk/Master/texmf-dist/tex/latex/dtk/dtk.cls 2017-06-07 21:24:40 UTC (rev 44524)
@@ -21,8 +21,8 @@
\HyphSubstIfExists{german-x-latest}{%
\HyphSubstLet{german}{german-x-latest}}{}
-\def\DTKversion{2.07}
-\def\DTKversiondate{2017/04/02}
+\def\DTKversion{2.07a}
+\def\DTKversiondate{2017/06/07}
\ProvidesClass{dtk}[\DTKversiondate v\DTKversion dtk documentclass (RN)]
\RequirePackage{ifxetex,ifluatex,ifpdf,ifvtex,luatex85}
More information about the tex-live-commits
mailing list