summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/luatex/minim-mp/minim-mp.sty
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/luatex/minim-mp/minim-mp.sty')
-rw-r--r--Master/texmf-dist/tex/luatex/minim-mp/minim-mp.sty19
1 files changed, 6 insertions, 13 deletions
diff --git a/Master/texmf-dist/tex/luatex/minim-mp/minim-mp.sty b/Master/texmf-dist/tex/luatex/minim-mp/minim-mp.sty
index ae0312b5609..250e86668e0 100644
--- a/Master/texmf-dist/tex/luatex/minim-mp/minim-mp.sty
+++ b/Master/texmf-dist/tex/luatex/minim-mp/minim-mp.sty
@@ -3,10 +3,6 @@
\input minim-mp
-\makeatletter
-
-\RequirePackage{environ}
-
% work around latex’s \protect mechanism
\let\mnm@protect=\protect
\everymaketext{\let\protect=\mnm@protect}
@@ -21,12 +17,12 @@
\let\mpcolor = \minimpcolor
\csname:metapost:\endcsname[#1]}
{\csname end:metapost:\endcsname \endgroup}
-\NewEnviron{:metapost:}[1][]{%
+\NewDocumentEnvironment{:metapost:}{O{}+b}{%
\mnm@setnormalfont
\let\protect=\noexpand
\directmetapost[#1]{%
- defaultfont:="\mnm@normalfont"; \BODY; }%
- \let\protect=\mnm@protect}
+ defaultfont:="\mnm@normalfont"; #2; }%
+ \let\protect=\mnm@protect}{}
% separate metapost instances
\newcommand\newmetapostenvironment[2][]{%
@@ -37,13 +33,13 @@
\let\mpcolor = \minimpcolor
\csname:#2:\endcsname}
{\csname end:#2:\endcsname \endgroup}%
- \NewEnviron{:#2:}{%
+ \NewDocumentEnvironment{:#2:}{+b}{%
\mnm@setnormalfont
\let\protect=\noexpand
\runmetapostimage
\csname #2@instance\endcsname
- {defaultfont:="\mnm@normalfont";\BODY;}%
- \let\protect=\mnm@protect}}
+ {defaultfont:="\mnm@normalfont";##1;}%
+ \let\protect=\mnm@protect}{}}
% \mpcolor support
\def\minimpcolor#1#{\dominimpcolor{#1}}
@@ -54,6 +50,3 @@
\newtoks\mpcolorspectoks \newtoks\mpcolorruntoks \newtoks\mpcolorvaltoks
\mpcolorruntoks{\expandafter\extractcolorspec\the\mpcolorspectoks\mptmpcolor
\expandafter\mpcolorvaltoks\expandafter\@gobble\mptmpcolor}
-
-\makeatother
-