From dcfc73e3b6cc2d2a20f9e5805adad749a125e950 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 17 Jan 2018 23:46:21 +0000 Subject: mpostinl (17jan18) git-svn-id: svn://tug.org/texlive/trunk@46361 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/mpostinl/README | 39 ------ Master/texmf-dist/doc/latex/mpostinl/README.txt | 39 ++++++ Master/texmf-dist/doc/latex/mpostinl/mpinlsmp.tex | 2 +- Master/texmf-dist/doc/latex/mpostinl/mpostinl.pdf | Bin 317262 -> 329122 bytes .../texmf-dist/source/latex/mpostinl/mpostinl.dtx | 135 +++++++++++++-------- Master/texmf-dist/tex/latex/mpostinl/mpostinl.sty | 2 +- 6 files changed, 125 insertions(+), 92 deletions(-) delete mode 100644 Master/texmf-dist/doc/latex/mpostinl/README create mode 100644 Master/texmf-dist/doc/latex/mpostinl/README.txt diff --git a/Master/texmf-dist/doc/latex/mpostinl/README b/Master/texmf-dist/doc/latex/mpostinl/README deleted file mode 100644 index 3b16370a511..00000000000 --- a/Master/texmf-dist/doc/latex/mpostinl/README +++ /dev/null @@ -1,39 +0,0 @@ -mpostinl v1.2 -Copyright 2010-2018 Niklas Beisert - -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, -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 - - README readme file - mpostinl.ins installation file - mpostinl.dtx source file - mpostinl.sty package file - mpinlsmp.tex sample latex file - mpostinl.pdf manual - -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 -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. - -This work may be distributed and/or modified under the -conditions of the LaTeX Project Public License, either version 1.3 -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.3 or later is part of all distributions of LaTeX -version 2005/12/01 or later. diff --git a/Master/texmf-dist/doc/latex/mpostinl/README.txt b/Master/texmf-dist/doc/latex/mpostinl/README.txt new file mode 100644 index 00000000000..fbe4d635f60 --- /dev/null +++ b/Master/texmf-dist/doc/latex/mpostinl/README.txt @@ -0,0 +1,39 @@ +mpostinl v1.21 +Copyright 2010-2018 Niklas Beisert + +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, +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 + + README.txt readme file + mpostinl.ins installation file + mpostinl.dtx source file + mpostinl.sty package file + mpinlsmp.tex sample latex file + mpostinl.pdf manual + +The distribution consists of the files +README.txt, 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 +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. + +This work may be distributed and/or modified under the +conditions of the LaTeX Project Public License, either version 1.3 +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.3 or later is part of all distributions of LaTeX +version 2005/12/01 or later. diff --git a/Master/texmf-dist/doc/latex/mpostinl/mpinlsmp.tex b/Master/texmf-dist/doc/latex/mpostinl/mpinlsmp.tex index 17168d9a9cb..cec96fc5438 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}[2018/01/05 v1.2 sample for mpostinl] +\ProvidesFile{mpinlsmp.tex}[2018/01/17 v1.21 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 fd77061b24f..d16bdbd05a4 100644 Binary files a/Master/texmf-dist/doc/latex/mpostinl/mpostinl.pdf and b/Master/texmf-dist/doc/latex/mpostinl/mpostinl.pdf differ diff --git a/Master/texmf-dist/source/latex/mpostinl/mpostinl.dtx b/Master/texmf-dist/source/latex/mpostinl/mpostinl.dtx index d39c7fba2a3..8d3db2a20dc 100644 --- a/Master/texmf-dist/source/latex/mpostinl/mpostinl.dtx +++ b/Master/texmf-dist/source/latex/mpostinl/mpostinl.dtx @@ -18,15 +18,16 @@ % and the derived files mpostinl.sty and mpinlsmp.tex % %\NeedsTeXFormat{LaTeX2e}[1996/12/01] -%\ProvidesPackage{mpostinl}[2018/01/05 v1.2 metapost inline figures] -%\ProvidesFile{mpinlsmp.tex}[2018/01/05 v1.2 sample for mpostinl] +%\ProvidesPackage{mpostinl}[2018/01/17 v1.21 metapost inline figures] +%\ProvidesFile{mpinlsmp.tex}[2018/01/17 v1.21 sample for mpostinl] %<*driver> -%\ProvidesFile{mpostinl.drv}[2018/01/05 v1.2 mpostinl reference manual file] +%\ProvidesFile{mpostinl.drv}[2018/01/17 v1.21 mpostinl reference manual file] \PassOptionsToClass{10pt,a4paper}{article} \documentclass{ltxdoc} \usepackage[margin=35mm]{geometry} \usepackage{hyperref} +\usepackage{hyperxmp} \usepackage[usenames]{color} \usepackage{amsmath,amsfonts} \usepackage{mflogo} @@ -35,6 +36,19 @@ \hypersetup{colorlinks=true} \hypersetup{pdfstartview=FitH} \hypersetup{pdfpagemode=UseNone} +\hypersetup{pdfsource={}} +\hypersetup{pdflang={en-UK}} +\hypersetup{pdfcopyright={Copyright 2010-2018 Niklas Beisert. + This work may be distributed and/or modified under the + conditions of the LaTeX Project Public License, either version 1.3 + of this license or (at your option) any later version.}} +\hypersetup{pdflicenseurl={http://www.latex-project.org/lppl.txt}} +\hypersetup{pdfcontactaddress={ETH Zurich, ITP, HIT K, Wolfgang-Pauli-Strasse 27}} +\hypersetup{pdfcontactpostcode={8093}} +\hypersetup{pdfcontactcity={Zurich}} +\hypersetup{pdfcontactcountry={Switzerland}} +\hypersetup{pdfcontactemail={nbeisert@itp.phys.ethz.ch}} +\hypersetup{pdfcontacturl={http://people.phys.ethz.ch/\xmptilde nbeisert/}} \begin{document} @@ -48,7 +62,7 @@ {\texttt{nbeisert@itp.phys.ethz.ch}}} \hypersetup{pdfauthor={Niklas Beisert}} \hypersetup{pdfsubject={Manual for the LaTeX2e Package mpostinl}} -\date{5 January 2018, \textsf{v1.2}} +\date{17 January 2018, \textsf{v1.21}} \maketitle \begin{abstract}\noindent @@ -153,7 +167,7 @@ and generated filenames can be customised. %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\subsection{Related CTAN Packages and Software} +\subsection{Related CTAN Packages} There are at least four other \LaTeX{} packages which offer a similar functionality: @@ -194,44 +208,6 @@ The package offers most of the functionality of the above packages, but (presently) misses out on some more advanced features, see section \ref{sec:suggestions}. -\medskip -\noindent -The package relies on other packages and software: -\begin{itemize} -\item -This package relies on some functionality of the package \textsf{verbatim} -to read verbatim code from the \LaTeX{} source without expansion of macros. -Compatibility with the \textsf{verbatim} package -has been tested with v1.5q (2014/10/28). -\item -This package uses the package \textsf{graphicx} -from the \textsf{graphics} bundle to include graphics files. -Compatibility with the \textsf{graphicx} package -has been tested with v1.0g (2014/10/28). -\item -This package uses the package \textsf{keyval} -from the \textsf{graphics} bundle -to process the options for the package, environments and macros. -Compatibility with the \textsf{keyval} package -has been tested with v1.15 (2014/10/28). -\item -This package uses the command |\currfilename| -provided by the package \textsf{currfile} (if available and loaded) -to indicate the \LaTeX{} source file in the generated metapost file. -Compatibility with the \textsf{currfile} package -has been tested with v0.7c (2015/04/23). -\item -The package assumes a \TeX{} installation with \MP{} -configured appropriately. -Recent \textsf{texlive} and MiK\TeX{} distributions should work well. -Compatibility with the \textsf{texlive} distribution -has been tested with the 2016 issue containing -pdf\TeX{} version 3.14159265-2.6-1.40.17 -and \MP{} version 1.9991. -\end{itemize} -% - - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -355,12 +331,26 @@ Compile this figure twice. % Please note the following restrictions due to the implementation via the package \textsf{verbatim}: +% \begin{itemize} \item The closing statement |\end{mpostfig}| must be on a line on its own. Any amount of leading whitespace is allowed, and trailing characters are ignored. +\item +The opening statement |\begin{mpostfig}| \emph{without} optional arguments +must not be followed immediately by empty lines +or by the closing statement |\end{mpostfig}|. +Note that commented lines do not help. +Either avoid leading empty lines and empty bodies +or use empty optional arguments: |\begin{mpostfig}[]|. + +\item +Lines starting with a single `|%|' are ignored and +do not appear in the metapost file. +Double `|%%|' or leading spaces preserve comments in the metapost file. + \item The environment |mpostfig| cannot be used within macro arguments or particular other environments. @@ -1078,8 +1068,8 @@ 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|. +This work consists of the files |README.txt|, |mpostinl.ins| and |mpostinl.dtx| +as well as the derived files |mpostinl.sty|, |mpinlsmp.tex| and |mpostinl.pdf|. \endgroup @@ -1090,7 +1080,7 @@ The package consists of the files: % \begin{center} \begin{tabular}{ll} - |README| & readme file \\ + |README.txt| & readme file \\ |mpostinl.ins| & installation file \\ |mpostinl.dtx| & source file \\ |mpostinl.sty| & package file \\ @@ -1100,7 +1090,7 @@ The package consists of the files: \end{center} % The distribution consists of the files -|README|, |mpostinl.ins| and |mpostinl.dtx|. +|README.txt|, |mpostinl.ins| and |mpostinl.dtx|. % \begin{itemize} \item @@ -1113,6 +1103,43 @@ Copy the file |mpostinl.sty| to an appropriate directory of your \LaTeX{} distribution, e.g.\ \textit{texmf-root}|/tex/latex/mpostinl|. \end{itemize} +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\subsection{Interaction with Other Packages and Software} + +The package relies on other packages and software: +\begin{itemize} +\item +This package relies on some functionality of the package \textsf{verbatim} +to read verbatim code from the \LaTeX{} source without expansion of macros. +Compatibility with the \textsf{verbatim} package +has been tested with v1.5q (2014/10/28). +\item +This package uses the package \textsf{graphicx} +from the \textsf{graphics} bundle to include graphics files. +Compatibility with the \textsf{graphicx} package +has been tested with v1.0g (2014/10/28). +\item +This package uses the package \textsf{keyval} +from the \textsf{graphics} bundle +to process the options for the package, environments and macros. +Compatibility with the \textsf{keyval} package +has been tested with v1.15 (2014/10/28). +\item +This package uses the command |\currfilename| +provided by the package \textsf{currfile} (if available and loaded) +to indicate the \LaTeX{} source file in the generated metapost file. +Compatibility with the \textsf{currfile} package +has been tested with v0.7c (2015/04/23). +\item +The package assumes a \TeX{} installation with \MP{} +configured appropriately. +Recent \textsf{texlive} and MiK\TeX{} distributions should work well. +Compatibility with the \textsf{texlive} distribution +has been tested with the 2016 issue containing +pdf\TeX{} version 3.14159265-2.6-1.40.17 +and \MP{} version 1.9991. +\end{itemize} + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \subsection{Feature Suggestions} \label{sec:suggestions} @@ -1148,13 +1175,21 @@ to the usual \TeX{} philosophy. %\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.21:} 2018/01/17 + +\begin{itemize} +\item +remark on leading empty lines added +\item +manual rearranged +\end{itemize} + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \paragraph{v1.2:} 2018/01/05 @@ -2694,5 +2729,3 @@ filename: \mpostgetname{sec8} %\fi % \endinput -% -%% \CheckSum{3381} diff --git a/Master/texmf-dist/tex/latex/mpostinl/mpostinl.sty b/Master/texmf-dist/tex/latex/mpostinl/mpostinl.sty index 7c3224eff26..7eec411d180 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}[2018/01/05 v1.2 metapost inline figures] +\ProvidesPackage{mpostinl}[2018/01/17 v1.21 metapost inline figures] \RequirePackage{verbatim} \RequirePackage{graphicx} -- cgit v1.2.3