From 77061c35b4d54a630fe1ab1381cffb09611b8f5e Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 27 May 2022 20:41:15 +0000 Subject: hvextern (27may22) git-svn-id: svn://tug.org/texlive/trunk@63412 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/hvextern/Changes | 4 + Master/texmf-dist/doc/latex/hvextern/README | 6 +- Master/texmf-dist/doc/latex/hvextern/hvextern.pdf | Bin 1204768 -> 1220677 bytes Master/texmf-dist/doc/latex/hvextern/hvextern.tex | 39 ++++++-- Master/texmf-dist/tex/latex/hvextern/hvextern.sty | 111 +++++++++++----------- 5 files changed, 96 insertions(+), 64 deletions(-) (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/doc/latex/hvextern/Changes b/Master/texmf-dist/doc/latex/hvextern/Changes index b3003961062..a3df3662af9 100644 --- a/Master/texmf-dist/doc/latex/hvextern/Changes +++ b/Master/texmf-dist/doc/latex/hvextern/Changes @@ -1,5 +1,9 @@ hvextern.sty ---------------- +v 0.27 2022-05-27 - suppress overfull warnings for filename output + - fix for tcolorbox with minipage and breakable + - write filename in tt + - added verbose message for force=false v 0.26 2022-05-23 - set filenames for twocolumn mode outer/inner - added keywords outerFN and shiftFN v 0.25 2022-05-19 - added framesep keyword diff --git a/Master/texmf-dist/doc/latex/hvextern/README b/Master/texmf-dist/doc/latex/hvextern/README index 1c6052c9fd6..adbd87ba717 100644 --- a/Master/texmf-dist/doc/latex/hvextern/README +++ b/Master/texmf-dist/doc/latex/hvextern/README @@ -1,6 +1,6 @@ -This package allows to write code in tex, latex, Perl, Lua, Python, -and MetaPost into external files, run that code and insert the -output as pdf/png image or text. Parts of the external code +This package allows to write code in TeX, LaTeX, ConTeXt, Java, Perl, +Lua, Python, Shell, and MetaPost into external files, run that code and +insert the output as pdf/png image or text. Parts of the external code can be listed in the document. The main LaTeX document must be run with the option --shell-escape diff --git a/Master/texmf-dist/doc/latex/hvextern/hvextern.pdf b/Master/texmf-dist/doc/latex/hvextern/hvextern.pdf index 473cd8972b3..d70254252ca 100644 Binary files a/Master/texmf-dist/doc/latex/hvextern/hvextern.pdf and b/Master/texmf-dist/doc/latex/hvextern/hvextern.pdf differ diff --git a/Master/texmf-dist/doc/latex/hvextern/hvextern.tex b/Master/texmf-dist/doc/latex/hvextern/hvextern.tex index d691aa3bed0..ac218c986d3 100644 --- a/Master/texmf-dist/doc/latex/hvextern/hvextern.tex +++ b/Master/texmf-dist/doc/latex/hvextern/hvextern.tex @@ -1,11 +1,14 @@ +%% $Id: hvextern.tex 559 2022-05-27 06:59:29Z herbert $ \RequirePackage{pdfmanagement-testphase} \DeclareDocumentMetadata{} -\documentclass[ngerman,a4paper]{article} +\documentclass[ngerman,a4paper,twoside]{article} \usepackage{babel} \usepackage{libertinus} \setmonofont[Scale=MatchLowercase,FakeStretch=0.88]{AnonymousPro} \usepackage{iftex} +\usepackage{fancyhdr} +\pagestyle{fancy} \usepackage{hvlogos} \usepackage{hvextern} \usepackage{hvindex} @@ -41,7 +44,8 @@ from within a main\newline \LaTeX\ document~--v. \hvexternFileversion} \begin{sloppypar} -This package allows to write external \MP, \TeX, \ConTeXt, \LaTeX, \LuaTeX, \LuaLaTeX, \XeTeX, \XeLaTeX, Lua, Perl, Java and/or Python +This package allows to write external \MP, \TeX, \ConTeXt, \LaTeX, \LuaTeX, \LuaLaTeX, \XeTeX, \XeLaTeX, +\Index{Lua}, \Index{Perl}, \Index{Java} and/or \Index{Python} source code, which will then be run via \texttt{shell escape} to create a PDF oder text output to include it into the main \LaTeX\ document. \end{sloppypar} @@ -56,7 +60,9 @@ source code ... \end{externalDocument} -\runExtCmd[]{}{} +\runExtCmd[] + {} + {} \end{verbatim} The main document \emph{must} be run with the \Loption{-shell-escape} option, otherwise it won't work, e.g.: @@ -85,10 +91,21 @@ with \texttt{lualatex} with the \texttt{-\kern1pt-shell-escape} option. \subsection{Without showing the code} This document was run with \LuaLaTeX. Suppose you want to insert the output of a document -which needs for several reasons a \pdfLaTeX\ run. Instead of created and running a document +which needs for several reasons a \XeLaTeX\ run. Instead of created and running a document outside of the main document and then to insert the output we can do this from within this \LuaLaTeX\ document itself. The external document is compiled -with \pdfLaTeX\ and the output is insert as pdf image. The \Index{source} code itself is not +with \XeLaTeX\ and the output is insert as pdf image: +\begin{externalDocument}[% + compiler=xelatex, inline, force, runs=2, grfOptions={height=8pt},% + crop, cropmargin=0, cleanup, docType=latex]{voss} +\documentclass{ctexart} +\pagestyle{empty} +\begin{document} +美好的一天. +\end{document} +\end{externalDocument} + +Another example which needs a \pdfLaTeX\ run. The \Index{source} code itself is also not shown by the environment \Lenv{externalDocument}. @@ -119,7 +136,7 @@ shown by the environment \Lenv{externalDocument}. \end{minipage} \begin{minipage}{.39\linewidth} \begin{externalDocument}[ - compiler=pdflatex,force=false,cleanup={log,aux},verbose]{voss} + compiler=pdflatex,force=false,cleanup={log,aux},showFilename=false]{voss} \documentclass{standalone} %StartVisiblePreamble \usepackage{fontenc} @@ -1583,10 +1600,11 @@ This is the start of the introduction. \begin{externalDocument}[ - grfOptions={width=0.3\linewidth}, - pages={1,2,3}, + grfOptions={width=0.31\linewidth}, + pages={1,2,3,4,5,6}, pagesep=2pt, frame, + framesep=0pt, verbose=false, compiler=context, showFilename, @@ -1616,16 +1634,20 @@ This is the start of the introduction. \chapter{Introduction} \input knuth \input knuth \chapter[rensselaer]{The Rensselaer family} +\input knuth \section{The first born} \input knuth \section{The early years} ... in those days Hasselt was ... +\input knuth \section{Living and workin in America} \input knuth \chapter[lansing]{The Lansing family} ... the Lansing family was also ... +\input knuth \chapter[cuyler]{The Cuyler family} ... much later Tydeman Cuyler ... +\input knuth \myhead[headlines]{And the end} foo \stoptext @@ -1665,6 +1687,7 @@ already exists, there is no need to create it with the next run again and again. \item[\Lkeyword{framesep}] Value for \Lcs{fbox} if keyword \texttt{frame} is used. \item[\Lkeyword{mpsep}] Distance between code and output (default 1\,em). \item[\Lkeyword{pagesep}] Distance between pages for multipage output (default 1\,em). +\item[\Lkeyword{verbose}] Print control messages into the terminal and logfile. \item[\Lkeyword{eps}] create an eps from the pdf (historical). \end{description} diff --git a/Master/texmf-dist/tex/latex/hvextern/hvextern.sty b/Master/texmf-dist/tex/latex/hvextern/hvextern.sty index 8b0fa75f1f4..19f14ec67fe 100644 --- a/Master/texmf-dist/tex/latex/hvextern/hvextern.sty +++ b/Master/texmf-dist/tex/latex/hvextern/hvextern.sty @@ -1,3 +1,4 @@ +%% $Id: hvextern.sty 559 2022-05-27 06:59:29Z herbert $ %% This is file `hvextern.sty', %% %% Copyright (C) 2016-22 @@ -11,8 +12,8 @@ %% and version 1.3c or later is part of all distributions of LaTeX %% version 2005/12/01 or later. -\def\hvexternFileversion{0.26} -\ProvidesFile{hvextern}[2022/05/23 v\hvexternFileversion: package for running external documents (HV)] +\def\hvexternFileversion{0.27} +\ProvidesFile{hvextern}[2022/05/27 v\hvexternFileversion: package for running external documents (HV)] \RequirePackage{shellesc,xkeyval,graphicx} \RequirePackage{fancyvrb,tikz,listings,ifplatform} @@ -30,6 +31,7 @@ \newcounter{hv@extern@runs} \newcounter{@@@runs} +\newcounter{hv@extern@pageCNT} \newsavebox\hv@extern@box \newlength\hv@LineWidth \newlength\hv@TextWidth @@ -42,7 +44,7 @@ \newlength\hv@extern@belowskip \newlength\hv@extern@shiftFN -\AtBeginDocument{\setlength\hv@LineWidth{\dimexpr\linewidth-2\fboxsep-2\fboxrule}} +\AtBeginDocument{\setlength\hv@LineWidth{\the\dimexpr\linewidth-2\fboxsep-2\fboxrule\relax}} \newlength\hv@extern@mpwidth \setlength\hv@extern@mpwidth{\z@} \define@key{hv}{progpath}{\def\hv@extern@progpath{#1}} @@ -57,7 +59,7 @@ \define@key{hv}{BObody}[black!8]{\def\hv@extern@BObody{#1}} \define@key{hv}{docType}[latex]{\def\hv@extern@docType{#1}} %\define@choicekey*+{hv}{docType}[\val\nr]{latex,mp,tex,py,pl,lua,java,context,sh}[latex]{% -% \hv@typeout{>>>> ´doc type \nr}% +% \hv@typeout{doc type \nr}% % \def\hv@extern@docType{\val}% %}{\PackageWarning{hvextern}{erroneous input (#1) for docType ignored. Using latex.}% % \def\hv@extern@docType{latex}% @@ -101,10 +103,11 @@ } \define@boolkey{hv}[hv@extern@]{eps}[true]{} \define@boolkey{hv}[hv@extern@]{verbose}[true]{} -\def\hv@typeout#1{\ifhv@extern@verbose\typeout{#1}\fi} +\def\hv@ex@typeout#1{\ifhv@extern@verbose\typeout{>>(hvextern) #1}\fi} + \define@choicekey*+{hv}{compiler}[\val\nr]{mpost,tex,latex,luatex,python3,perl,lua,java,% xetex,pdflatex,lualatex,xelatex,context,sh,texlua}[pdflatex]{% - \hv@typeout{>>>> Compiler type \nr}% + \hv@ex@typeout{Compiler type \nr}% \def\hv@extern@compiler{\val}% \edef\hv@extern@compilerNo{\nr}% }{\PackageWarning{hvextern}{erroneous input (#1) for compiler ignored. Using pdflatex.}% @@ -194,7 +197,7 @@ { \clist_map_inline:nn {#1}{% \ShellEscape{\hv@extern@progpath##1\space\hvExternDateiname} - %\hv@typeout{>>>> sequencerun: ##1} + %\hv@ex@typeout{sequencerun: ##1} } } \ExplSyntaxOff @@ -203,10 +206,10 @@ \tcbset{breakable,left=2pt,right=2pt,top=2pt,bottom=2pt,boxsep=0pt} \def\hv@marginpar#1{% - \leavevmode\checkoddpage - \sbox\hv@extern@box{\rotatebox[origin=C]{90}{\rule{2\hv@extern@shiftFN}{0pt}#1}}% + \sbox\hv@extern@box{\rotatebox[origin=C]{90}{\rule{2\hv@extern@shiftFN}{0pt}\texttt{#1}}}% \ht\hv@extern@box=\z@ \wd\hv@extern@box=\z@ \dp\hv@extern@box=\z@ \noindent + \checkoddpage \ifoddpage% we have a right page \if@twocolumn \ifhv@extern@outerFN @@ -239,23 +242,23 @@ } \newcommand\PreambleVerbatim[2][]{% - \hv@typeout{Running PreambleVerbatim with #1, #2}% + \hv@ex@typeout{Running PreambleVerbatim with #1, #2}% \ifhv@extern@tcbox \begin{tcolorbox}[before skip=0pt,after skip=0pt]\VerbatimInput[#1]{#2}\end{tcolorbox}% \else - \VerbatimInput[#1]{#2} + \VerbatimInput[#1]{#2}% \fi} \newcommand\BodyVerbatim[2][]{% - \hv@typeout{Running BodyVerbatim with #1, #2}% + \hv@ex@typeout{Running BodyVerbatim with #1, #2}% \ifhv@extern@tcbox \begin{tcolorbox}[before skip=0pt,after skip=0pt]\VerbatimInput[#1]{#2}\end{tcolorbox}% \else - \VerbatimInput[#1]{#2} + \VerbatimInput[#1]{#2}% \fi} \newcommand\PreambleListing[2][]{% - \hv@typeout{Running PreambleListing with #1, #2}% + \hv@ex@typeout{Running PreambleListing with #1, #2}% \ifhv@extern@tcbox \begin{tcolorbox}[before skip=0pt,after skip=0pt%,top=-2pt ]\expandafter\lstinputlisting\expandafter[#1,aboveskip=0pt,belowskip=0pt]{#2}\end{tcolorbox}% @@ -264,7 +267,7 @@ \fi} \newcommand\BodyListing[2][]{% - \hv@typeout{Running BodyListing with #1, #2}% + \hv@ex@typeout{Running BodyListing with #1, #2}% \ifhv@extern@tcbox \begin{tcolorbox}[before skip=0pt,after skip=0pt,%top=-2pt ]\expandafter\lstinputlisting\expandafter[#1,aboveskip=0pt,belowskip=0pt]{#2}\end{tcolorbox}% @@ -291,13 +294,13 @@ {\perCent StopVisiblePreamble} \def\hv@extern@runMP#1#2#3#4{% path compiler file extension - \hv@typeout{>>>> running #1#2 #3#4}% + \hv@ex@typeout{running #1#2 #3#4}% \ShellEscape{#1#2\space -tex=tex\space #3#4}% - \hv@typeout{>>>> running #1tex #3}% + \hv@ex@typeout{running #1tex #3}% \ShellEscape{#1tex\space "\string\input\space epsf\string\relax\string\nopagenumbers\string\epsfbox{#3.1}\string\bye"}% - \hv@typeout{>>>> running #1dvips #3}% + \hv@ex@typeout{running #1dvips #3}% \ShellEscape{#1dvips\space -j\space -E\space -o\space #3.eps\space epsf.dvi}% - \hv@typeout{>>>> running #1epstopdf #3}% + \hv@ex@typeout{running #1epstopdf #3}% \ShellEscape{#1epstopdf\space #3.eps}% } @@ -310,11 +313,11 @@ {\perCent StopVisiblePreamble} \def\hv@extern@runTEX#1#2#3#4{% path compiler file extension - \hv@typeout{>>>> running #1#2 #3#4}% + \hv@ex@typeout{running #1#2 #3#4}% \ShellEscape{#1tex\space #3#4}% - \hv@typeout{>>>> running #1dvips #3}% + \hv@ex@typeout{running #1dvips #3}% \ShellEscape{#1dvips\space #3.dvi}% - \hv@typeout{>>>> running ps2pdf #3.ps}% + \hv@ex@typeout{running ps2pdf #3.ps}% \ShellEscape{#1ps2pdf\space -dAutoRotatePages=/None\space -dALLOWPSTRANSPARENCY\space #3.ps}% } @@ -328,11 +331,11 @@ % only for the sequence latex->dvips->ps2pdf \def\hv@extern@runLATEX#1#2#3#4{% path-compiler-file-extension - \hv@typeout{>>>> running #1#2 #3#4}% + \hv@ex@typeout{running #1#2 #3#4}% \ShellEscape{#1#2\space #3#4}% - \hv@typeout{>>>> running #1dvips #3}% + \hv@ex@typeout{running #1dvips #3}% \ShellEscape{#1dvips\space #3.dvi}% - \hv@typeout{>>>> running ps2pdf #3.ps}% + \hv@ex@typeout{running ps2pdf #3.ps}% \ShellEscape{#1ps2pdf\space -dAutoRotatePages=/None\space -dALLOWPSTRANSPARENCY\space #3.ps}% } @@ -398,47 +401,47 @@ \xdef\hvExternDateiname{#2-\arabic{hv@example@counter}}% \gdef\hv@extern@savePara{#1}% \setkeys{hv}{#1}% \begin - \hv@typeout{External filename: \hvExternDateiname}% + \hv@ex@typeout{External filename: \hvExternDateiname}% \expandafter\IfFileExists\expandafter{\hv@extern@ExamplesDir\hvExternDateiname.pdf}{}{% \expandafter\IfFileExists\expandafter{\hv@extern@ExamplesDir\hvExternDateiname.png}{}{% \expandafter\IfFileExists\expandafter{\hv@extern@ExamplesDir\hvExternDateiname.txt}{}{% \global\hv@extern@forcetrue}}}% set force, if no pdf or png exists \begingroup - \hv@typeout{>>> writing file \hvExternDateiname\hv@extern@ext ...}% + \hv@ex@typeout{writing file \hvExternDateiname\hv@extern@ext ...}% \filecontents[force,noheader]{\hvExternDateiname\hv@extern@ext}% } {\endfilecontents% \end% - \hv@typeout{>>> ... done}% + \hv@ex@typeout{... done}% \global\stepcounter{hv@example@counter}% \endgroup \expandafter\hvExternSetKeys\expandafter{\hv@extern@savePara}% \xdef\hv@extern@fullPath{\hv@extern@ExamplesDir\hvExternDateiname}% \ifhv@extern@force \ifx\hv@extern@runsequence\@empty - \hv@typeout{>>>> force=true: running \hv@extern@progpath\hv@extern@compiler~ \hvExternDateiname\hv@extern@ext ...}% + \hv@ex@typeout{force=true: running \hv@extern@progpath\hv@extern@compiler~ \hvExternDateiname\hv@extern@ext ...}% \setcounter{@@@runs}{\value{hv@extern@runs}}% \loop\ifnum\the@@@runs > 0\relax \ifcase\hv@extern@compilerNo \relax % we have metapost - \hv@typeout{>>>> running mpost \hvExternDateiname\hv@extern@ext}% + \hv@ex@typeout{running mpost \hvExternDateiname\hv@extern@ext}% \hv@extern@runMP{\hv@extern@progpath}{\hv@extern@compiler}{\hvExternDateiname}{\hv@extern@ext}% \or %1 - \hv@typeout{>>>> running tex \hvExternDateiname\hv@extern@ext}% + \hv@ex@typeout{running tex \hvExternDateiname\hv@extern@ext}% \hv@extern@runTEX{\hv@extern@progpath}{\hv@extern@compiler}{\hvExternDateiname}{\hv@extern@ext}% \or %2 - \hv@typeout{>>>> running \hv@extern@compiler~ \hvExternDateiname\hv@extern@ext}% + \hv@ex@typeout{running \hv@extern@compiler~ \hvExternDateiname\hv@extern@ext}% \hv@extern@runLATEX{\hv@extern@progpath}{\hv@extern@compiler}{\hvExternDateiname}{\hv@extern@ext}% \else \ifhv@extern@redirect - \hv@typeout{>>>> running \hv@extern@compiler~ \hvExternDateiname\hv@extern@ext > \hvExternDateiname.txt}% + \hv@ex@typeout{running \hv@extern@compiler~ \hvExternDateiname\hv@extern@ext > \hvExternDateiname.txt}% \ShellEscape{\hv@extern@progpath\hv@extern@compiler\space\hvExternDateiname\hv@extern@ext\space > \hvExternDateiname.txt}% \else - \hv@typeout{>>>> running \hv@extern@compiler~ \hvExternDateiname\hv@extern@ext}% + \hv@ex@typeout{running \hv@extern@compiler~ \hvExternDateiname\hv@extern@ext}% \ShellEscape{\hv@extern@progpath\hv@extern@compiler\space\hvExternDateiname\hv@extern@ext}% \fi \fi \addtocounter{@@@runs}{-1}% \repeat - \hv@typeout{>>> ... done}% + \hv@ex@typeout{... done}% \ifhv@extern@biber \ShellEscape{biber \hvExternDateiname}% NAch biber nochmal latex \ShellEscape{\hv@extern@progpath\hv@extern@compiler\space\hvExternDateiname}% @@ -457,9 +460,11 @@ \ifhv@extern@eps \ShellEscape{pdftops -eps -f 1 -l 1 \hvExternDateiname.pdf}% \fi + \else + \hv@ex@typeout{force=false: NOT running \hvExternDateiname\hv@extern@ext ...}% \fi% end force \ifhv@extern@code%-------------- Code Part - \hv@typeout{>>>>Starting Code part with preamble ...}% + \hv@ex@typeout{Starting Code part with preamble ...}% \begingroup \if@twocolumn \ifhv@extern@outerFN @@ -472,6 +477,7 @@ \fi \ifdim\hv@extern@mpwidth>\z@ \noindent + \tcbset{breakable=false}% \minipage[\hv@extern@mpvalign]{\hv@extern@mpwidth} \vspace{0pt}% \else @@ -499,12 +505,12 @@ \fi \fi \ifhv@extern@showFilename - \hv@typeout{>>>> Set filename in the margin!}% + \hv@ex@typeout{Set filename in the margin!}% \noindent \hv@marginpar{\hvExternDateiname\hv@extern@ext}% \fi % - \hv@typeout{>>>>Starting Code body ...}%} + \hv@ex@typeout{Starting Code body ...}%} \ifhv@extern@usefancyvrb \@nameuse{\hv@extern@docType @initTextFancy}% \expandafter\fvset\expandafter{\hv@extern@lstOptions}% @@ -521,15 +527,15 @@ \fi % end code part \ifhv@extern@code\else % only if no code \ifhv@extern@showFilename - \hv@typeout{>>>> Set filename in the margin!}% + \hv@ex@typeout{Set filename in the margin!}% \noindent \hv@marginpar{\hvExternDateiname\hv@extern@ext}% \fi \fi \ifhv@extern@moveToExampleDir % \ShellEscape{mkdir\space\hv@extern@ExamplesDir/}% - \hv@typeout{>>>> Move file into example dir}% - \hv@typeout{>>>>>>\hvExternDateiname ----> \hv@extern@ExamplesDir}% + \hv@ex@typeout{Move file into example dir}% + \hv@ex@typeout{\hvExternDateiname ----> \hv@extern@ExamplesDir}% \ShellEscape{\hv@move \hvExternDateiname.*\space \hv@extern@ExamplesDir}% \fi \ifhv@extern@includegraphic @@ -537,10 +543,10 @@ \expandafter\includegraphics\expandafter[\hv@extern@grfOptions]{\hv@extern@fullPath}% \else \ifhv@extern@float - \hv@typeout{>>>> Floating environment}% + \hv@ex@typeout{Floating environment}% \expandafter\figure\expandafter[\hv@extern@floatsetting] \else - \hv@typeout{>>>> No floating environment}% + \hv@ex@typeout{No floating environment}% \vspace{\hv@extern@belowbodyskip} \ifdim\hv@extern@mpwidth>\z@ \hfill\minipage[\hv@extern@mpvalign]{\dimexpr\linewidth-\hv@extern@mpwidth-1em\relax}\vspace{0pt}% @@ -550,29 +556,28 @@ \fi \fi \hv@extern@align - \hv@typeout{>>>> Input image \hv@extern@fullPath}% + \hv@ex@typeout{Input image \hv@extern@fullPath}% \ifhv@extern@frame \begingroup \fboxsep=\hv@extern@framesep \expandafter\@for\expandafter\next\expandafter:\expandafter=\hv@extern@pages\do{% - \hv@typeout{>>>> Image loop: next=\next\space \hv@extern@fullPath}% \fbox{\expandafter\includegraphics\expandafter[\hv@extern@grfOptions,page=\next]% {\hv@extern@fullPath}}\hspace{\hv@extern@pagesep}}% \hspace*{-\hv@extern@pagesep}% \endgroup \else \expandafter\@for\expandafter\next\expandafter:\expandafter=\hv@extern@pages\do{% - \hv@typeout{>>>> Image loop: next=\next\space \hv@extern@fullPath}% \expandafter\includegraphics\expandafter[\hv@extern@grfOptions,page=\next]% {\hv@extern@fullPath}\hspace{\hv@extern@pagesep}}% \hspace*{-\hv@extern@pagesep}% \fi + \par% for \hv@extern@align \ifx\hv@extern@caption\@empty\else\caption{\hv@extern@caption}\fi \ifx\hv@extern@label\@empty\else\label{\hv@extern@label}\fi \ifhv@extern@float \endfigure \else - \ifdim\hv@extern@mpwidth>\z@ \endminipage\else\unskip\strut\par\endgroup\fi + \ifdim\hv@extern@mpwidth>\z@ \endminipage\else\endgroup\fi \fi \fi \else% no graphic, only text @@ -585,7 +590,7 @@ \fi \endminipage \else - \vspace{\hv@extern@belowbodyskip} + \vspace{\hv@extern@belowbodyskip}% \noindent \ifhv@extern@usefancyvrb \expandafter\VerbatimInput\expandafter[\hv@extern@textOptions]{\hv@extern@fullPath.txt}% @@ -603,7 +608,7 @@ \setkeys{hv}{code=false,includegraphic=false,#1}% \xdef\hvExternDateiname{#3-\arabic{hv@example@counter}}% \xdef\hv@extern@fullPath{\hv@extern@ExamplesDir\hvExternDateiname}% - \hv@typeout{>>>> running #2}% + \hv@ex@typeout{running #2}% \ifhv@extern@redirect \ShellEscape{\hv@extern@progpath#2 > \hv@extern@ExamplesDir\hvExternDateiname.txt}% \else @@ -616,14 +621,14 @@ \expandafter\includegraphics\expandafter[\hv@extern@grfOptions]{\hv@extern@ExamplesDir\hvExternDateiname}% \else \ifhv@extern@float - \hv@typeout{>>>> Floating environment}% + \hv@ex@typeout{Floating environment}% \expandafter\figure\expandafter[\hv@extern@floatsetting] \else - \hv@typeout{>>>> No floating environment}% + \hv@ex@typeout{No floating environment}% \par\noindent\begingroup \fi \hv@extern@align - \hv@typeout{>>>> Input image \hv@extern@ExamplesDir\hvExternDateiname}% + \hv@ex@typeout{Input image \hv@extern@ExamplesDir\hvExternDateiname}% \ifhv@extern@frame \begingroup \fboxsep=\hv@extern@framesep @@ -646,7 +651,7 @@ \fi \else% no graphic, only text \ifhv@extern@float - \hv@typeout{>>>> Floating environment}% + \hv@ex@typeout{Floating environment}% \expandafter\figure\expandafter[!htb] \ifhv@extern@usefancyvrb \expandafter\BodyVerbatim\expandafter[\hv@extern@lstOptions]{\hv@extern@fullPath.txt} -- cgit v1.2.3