mpostinl (24jun17)

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

5 files changed, 52 insertions, 20 deletions

diff --git a/Master/texmf-dist/doc/latex/mpostinl/README b/Master/texmf-dist/doc/latex/mpostinl/README
index 84f31cf56ce..0d548145383 100644
--- a/Master/texmf-dist/doc/latex/mpostinl/README
+++ b/Master/texmf-dist/doc/latex/mpostinl/README
@@ -1,17 +1,17 @@
-mpostinl v1.11
+mpostinl v1.12
 Copyright 2010-2017 Niklas Beisert
 
-mpostinl is a LaTeX2e package  
-which enables the embedding of metapost figures 
+mpostinl is a LaTeX2e package
+which enables the embedding of metapost figures
 within a LaTeX document.
-The package automatically collects the embedded 
-definitions and figures in a .mp file, 
+The package automatically collects the embedded
+definitions and figures in a .mp file,
 adds an appropriate LaTeX document structure,
 and compiles it to .mps files.
 It also allows for various configuration options
 to manage the generation of files and compilation.
 
-The package consists of the files 
+The package consists of the files
 
     README        readme file
     mpostinl.ins  installation file
@@ -20,12 +20,12 @@ The package consists of the files
     mpinlsmp.tex  sample latex file
     mpostinl.pdf  manual
 
-The distribution consists of the files 
+The distribution consists of the files
 README, mpostinl.ins and mpostinl.dtx.
 
 Run "(pdf)latex mpostinl.dtx" to compile the manual mpostinl.pdf.
 
-Run "latex mpostinl.ins" to create the package mpostinl.sty 
+Run "latex mpostinl.ins" to create the package mpostinl.sty
 and the sample mpinlsamp.tex.
 Copy the file mpostinl.sty to an appropriate directory of your LaTeX
 distribution, e.g. texmf-root/tex/latex/mpostinl.
diff --git a/Master/texmf-dist/doc/latex/mpostinl/mpinlsmp.tex b/Master/texmf-dist/doc/latex/mpostinl/mpinlsmp.tex
index fd997ea04ee..2bc8cfff6cf 100644
--- a/Master/texmf-dist/doc/latex/mpostinl/mpinlsmp.tex
+++ b/Master/texmf-dist/doc/latex/mpostinl/mpinlsmp.tex
@@ -17,7 +17,7 @@
 %% version 2005/12/01 or later.
 %% 
 \NeedsTeXFormat{LaTeX2e}[1996/12/01]
-\ProvidesFile{mpinlsmp.tex}[2017/04/01 v1.11 sample for mpostinl]
+\ProvidesFile{mpinlsmp.tex}[2017/06/24 v1.12 sample for mpostinl]
 \documentclass[12pt,a4paper]{article}
 
 \parindent0pt
diff --git a/Master/texmf-dist/doc/latex/mpostinl/mpostinl.pdf b/Master/texmf-dist/doc/latex/mpostinl/mpostinl.pdf
index f0738a186aa..6ab53b6ce24 100644
--- a/Master/texmf-dist/doc/latex/mpostinl/mpostinl.pdf
+++ b/Master/texmf-dist/doc/latex/mpostinl/mpostinl.pdf
diff --git a/Master/texmf-dist/source/latex/mpostinl/mpostinl.dtx b/Master/texmf-dist/source/latex/mpostinl/mpostinl.dtx
index 2aa5152f351..4ebbe69f511 100644
--- a/Master/texmf-dist/source/latex/mpostinl/mpostinl.dtx
+++ b/Master/texmf-dist/source/latex/mpostinl/mpostinl.dtx
@@ -18,10 +18,10 @@
 % and the derived files mpostinl.sty and mpinlsmp.tex
 %
 %<package|sample>\NeedsTeXFormat{LaTeX2e}[1996/12/01]
-%<package>\ProvidesPackage{mpostinl}[2017/04/01 v1.11 metapost inline figures]
-%<sample>\ProvidesFile{mpinlsmp.tex}[2017/04/01 v1.11 sample for mpostinl]
+%<package>\ProvidesPackage{mpostinl}[2017/06/24 v1.12 metapost inline figures]
+%<sample>\ProvidesFile{mpinlsmp.tex}[2017/06/24 v1.12 sample for mpostinl]
 %<*driver>
-%\ProvidesFile{mpostinl.drv}[2017/04/01 v1.11 mpostinl reference manual file]
+%\ProvidesFile{mpostinl.drv}[2017/06/24 v1.12 mpostinl reference manual file]
 \PassOptionsToClass{10pt,a4paper}{article}
 \documentclass{ltxdoc}
 
@@ -48,7 +48,7 @@
   {\texttt{nbeisert@itp.phys.ethz.ch}}}
 \hypersetup{pdfauthor={Niklas Beisert}}
 \hypersetup{pdfsubject={Manual for the LaTeX2e Package mpostinl}}
-\date{1 April 2017, \textsf{v1.11}}
+\date{24 June 2017, \textsf{v1.12}}
 \maketitle
 
 \begin{abstract}\noindent
@@ -1023,7 +1023,7 @@ The required options are:
 \end{center}
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\paragraph{Script \text{mplatex}.}
+\paragraph{Script \textsf{mplatex}.}
 
 The \MP{} processing script \textsf{mplatex} expects the default metapost
 file naming convention (\textit{filename}|.|\textit{nn})
@@ -1073,7 +1073,7 @@ This work has the LPPL maintenance status `maintained'.
 The Current Maintainer of this work is Niklas Beisert.
 
 This work consists of the files |mpostinl.dtx| and |mpostinl.ins|
-and the derived files |mpostinl.sty| and |mpinlsmp.tex|
+and the derived files |mpostinl.sty| and |mpinlsmp.tex|.
 
 \endgroup
 
@@ -1144,12 +1144,27 @@ Compare the generated metapost file to the previous instance
 and compile only in case of changes.
 This could be implemented by a checksum or by some external tool
 such as diff. This feature is probably too difficult to implement.
+%\item
+%an environment to pass tex commands to mpost and also compile them locally
+%probably have to write to file and subsequently input the file
+%\item
+%leading / trailing empty lines may be a problem. explain!
 \end{itemize}
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \subsection{Revision History}
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\paragraph{v1.12:} 2017/06/24
+
+\begin{itemize}
+\item
+bugfix for blank |mpostfig| display
+due to changes in the basic
+\LaTeX{} or \textsf{graphicx} system
+\end{itemize}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \paragraph{v1.11:} 2017/04/01
 
 \begin{itemize}
@@ -2016,6 +2031,7 @@ filename: \mpostgetname{sec8}
 % add each line to the buffer:
 %    \begin{macrocode}
 \newcommand{\mpi@verbatim}{%
+  \begingroup%
   \@bsphack%
   \let\do\@makeother\dospecials%
   \catcode`\^^M\active%
@@ -2025,6 +2041,16 @@ filename: \mpostgetname{sec8}
 %    \end{macrocode}
 % \end{macro}
 
+% \begin{macro}{\mpi@endverbatim}
+% End reading the block from the source file:
+%    \begin{macrocode}
+\newcommand{\mpi@endverbatim}{%
+  \@esphack%
+  \endgroup%
+}
+%    \end{macrocode}
+% \end{macro}
+
 % \begin{macro}{\mpi@putlineno}
 % Write current position in source file to buffer;
 % write line number and source file name
@@ -2409,6 +2435,7 @@ filename: \mpostgetname{sec8}
 % add to appropriate buffer(s).
 %    \begin{macrocode}
 {%
+  \mpi@endverbatim%
   \ifmpi@deftex%
     \mpi@addbuf{etex}%
   \fi%
@@ -2422,7 +2449,6 @@ filename: \mpostgetname{sec8}
     \mpi@writebuf%
     \ifmpi@include\else\mpi@writenow\fi%
   \fi%
-  \@esphack%
 }
 %    \end{macrocode}
 % \end{macro}
@@ -2498,12 +2524,12 @@ filename: \mpostgetname{sec8}
 % process immediately if desired:
 %    \begin{macrocode}
 {%
+  \mpi@endverbatim%
   \mpi@endfig%
   \mpi@writebuf%
   \ifmpi@now%
     \mpi@processnow%
   \fi%
-  \@esphack%
 %    \end{macrocode}
 % Display figure:
 %    \begin{macrocode}
diff --git a/Master/texmf-dist/tex/latex/mpostinl/mpostinl.sty b/Master/texmf-dist/tex/latex/mpostinl/mpostinl.sty
index 5b6f547e6a1..9635770aa38 100644
--- a/Master/texmf-dist/tex/latex/mpostinl/mpostinl.sty
+++ b/Master/texmf-dist/tex/latex/mpostinl/mpostinl.sty
@@ -17,7 +17,7 @@
 %% version 2005/12/01 or later.
 %% 
 \NeedsTeXFormat{LaTeX2e}[1996/12/01]
-\ProvidesPackage{mpostinl}[2017/04/01 v1.11 metapost inline figures]
+\ProvidesPackage{mpostinl}[2017/06/24 v1.12 metapost inline figures]
 
 \RequirePackage{verbatim}
 \RequirePackage{graphicx}
@@ -151,6 +151,7 @@
 }
 
 \newcommand{\mpi@verbatim}{%
+  \begingroup%
   \@bsphack%
   \let\do\@makeother\dospecials%
   \catcode`\^^M\active%
@@ -158,6 +159,11 @@
   \verbatim@start%
 }
 
+\newcommand{\mpi@endverbatim}{%
+  \@esphack%
+  \endgroup%
+}
+
 \newcommand{\mpi@putlineno}{%
   \ifmpi@lineno%
     \mpi@addbuf{\@percentchar---------------------------------------}%
@@ -373,6 +379,7 @@
   \mpi@verbatim%
 }%
 {%
+  \mpi@endverbatim%
   \ifmpi@deftex%
     \mpi@addbuf{etex}%
   \fi%
@@ -386,7 +393,6 @@
     \mpi@writebuf%
     \ifmpi@include\else\mpi@writenow\fi%
   \fi%
-  \@esphack%
 }
 
 \newif\ifmpi@figshow
@@ -428,12 +434,12 @@
   \mpi@verbatim%
 }%
 {%
+  \mpi@endverbatim%
   \mpi@endfig%
   \mpi@writebuf%
   \ifmpi@now%
     \mpi@processnow%
   \fi%
-  \@esphack%
   \ifmpi@figshow%
     \expandafter\mpi@graphics\mpi@figopt{\mpi@figfile}%
   \fi%