mcf2graph (28apr16)

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

1 files changed, 19 insertions, 16 deletions

diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_mplib_exa.tex b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_mplib_exa.tex
index 69487d81d77..0c47c8960c1 100644
--- a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_mplib_exa.tex
+++ b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_mplib_exa.tex
@@ -1,5 +1,5 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Example of  MCF typest with LuaLaTeX(luamplib)       by A.Yamaji   2016.4.10
+% Example of  MCF typest with LuaLaTeX(luamplib)       by A.Yamaji   2016.4.27
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \documentclass{article}
 %------------------------------------------------------------------------------
@@ -10,9 +10,9 @@
               input mcf2graph.mf;
               mp_log_name:="temp-info.aux";
               sw_auxout:=1; 
-              var3:="len_x";        tag3:="Lx";
-              var4:="calc_weight";  tag4:="MWc";
-              var5:="calc_formula"; tag5:="FMc";
+              var3:="len_x";  tag3:="Lx";
+              var4:="cal_MW"; tag4:="cMW";
+              var5:="cal_FM"; tag5:="cFM";
             fi}%
 \everyendmplib{write EOF to mp_log_name;}%
 %------------------------------------------------------------------------------
@@ -21,22 +21,23 @@
 \newif\ifCONT@%
 \newread\@auxf%
 %------------------------------------------------------------------------------
-\def\@fst@param#1:#2;{#1}\def\@sec@param#1:#2;{#2}%
+\def\@fst@param#1:#2;{#1}%
+\def\@sec@param#1:#2;{#2}%
 \def\mol@sel#1{%
 \if#1\empty\relax\else%
-  \edef\@fst{\expandafter\@fst@param#1;}%
-  \edef\@sec{\expandafter\@sec@param#1;}%
-  \ifx\@fst\@F\edef\MOLfile{\@sec}\fi    \ifx\@fst\@C\edef\MOLchar{\@sec}\fi%
-  \ifx\@fst\@Lx\edef\MOLlenx{\@sec}\fi   \ifx\@fst\@Ly\edef\MOLleny{\@sec}\fi%
-  \ifx\@fst\@EN\edef\MOLnameE{\@sec}\fi  \ifx\@fst\@JN\edef\MOLnameJ{\@sec}\fi%
-  \ifx\@fst\@CAS\edef\MOLcas{\@sec}\fi   \ifx\@fst\@USE\edef\MOLuse{\@sec}\fi%
-  \ifx\@fst\@FM\edef\MOLfm{\@sec}\fi     \ifx\@fst\@FMc\edef\CALfm{\@sec}\fi%
-  \ifx\@fst\@MW\edef\MOLmw{\@sec}\fi     \ifx\@fst\@MWc\edef\CALmw{\@sec}\fi%
-  \ifx\@fst\@logP\edef\MOLlogP{\@sec}\fi \ifx\@fst\@EXA\edef\MOLextA{\@sec}\fi%
-  \ifx\@fst\@EXB\edef\MOLextB{\@sec}\fi  \ifx\@fst\@NO\edef\MOLnum{\@sec}\fi\fi}%
+  \edef\@tag{\expandafter\@fst@param#1;}%
+  \edef\@var{\expandafter\@sec@param#1;}%
+  \ifx\@tag\@F\edef\MOLfile{\@var}\fi    \ifx\@tag\@C\edef\MOLchar{\@var}\fi%
+  \ifx\@tag\@Lx\edef\MOLlenx{\@var}\fi   \ifx\@tag\@Ly\edef\MOLleny{\@var}\fi%
+  \ifx\@tag\@EN\edef\MOLnameE{\@var}\fi  \ifx\@tag\@JN\edef\MOLnameJ{\@var}\fi%
+  \ifx\@tag\@CAS\edef\MOLcas{\@var}\fi   \ifx\@tag\@USE\edef\MOLuse{\@var}\fi%
+  \ifx\@tag\@FM\edef\MOLfm{\@var}\fi     \ifx\@tag\@cFM\edef\CALfm{\@var}\fi%
+  \ifx\@tag\@MW\edef\MOLmw{\@var}\fi     \ifx\@tag\@cMW\edef\CALmw{\@var}\fi%
+  \ifx\@tag\@logP\edef\MOLlogP{\@var}\fi \ifx\@tag\@EXA\edef\MOLextA{\@var}\fi%
+  \ifx\@tag\@EXB\edef\MOLextB{\@var}\fi  \ifx\@tag\@NO\edef\MOLnum{\@var}\fi\fi}%
 %-------------------------------------------------------------------------------
 \def\@F{F}\def\@C{C}\def\@EN{EN}\def\@JN{JN}\def\@CAS{CAS}%
-\def\@MW{MW}\def\@MWc{MWc}\def\@FM{FM}\def\@FMc{FMc}\def\@Lx{Lx}\def\@Ly{Ly}%
+\def\@MW{MW}\def\@cMW{cMW}\def\@FM{FM}\def\@cFM{cFM}\def\@Lx{Lx}\def\@Ly{Ly}%
 \def\@NO{NO}\def\@USE@{USE}\def\@logP@{logP}\def\@EXA@{EXA}\def\@EXB@{EXB}%
 %-------------------------------------------------------------------------------
 %  modified latex2e kernel program control (@for delimiter ','=>';')
@@ -205,3 +206,5 @@ endfont;
 \MOLcaption{110mm}{70mm}\\%
 %----------------------------------------------------------------------------
 \end{document}
+ment}
+ment}