mcf2graph (12dec21)

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

1 files changed, 33 insertions, 34 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 872571ec989..b2bdbe8ff17 100644
--- a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_mplib_exa.tex
+++ b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_mplib_exa.tex
@@ -1,7 +1,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Example of  MCF typest with LuaLaTeX(luamplib)    by A.Yamaji    2021.11.23
+% Example of  MCF typest with LuaLaTeX(luamplib)    by A.Yamaji    2021.12.12
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% ** mcf2graph.mf must be version 4.74
+% ** mcf2graph.mf must be version 4.75
 % ** use mcf_data_base.mcf
 \documentclass{article}
 %------------------------------------------------------------------------------
@@ -40,9 +40,8 @@
 \noindent%
 %------------------------------------------------------------------------------------
  use molecular data base file 'mcf\_exa\_data.mcf'\\
-{{\tt FM(C) :} molecular formula calculated by mcf2graph\\
-{{\tt MW(C) :} molecular weight calculated by mcf2graph\\
-{{\tt MW(D) :} molecular weight from literature data
+{{\tt FM(fm) :} molecular formula (calculated)\\
+{{\tt MW(mw) :} molecular weight (calculated)\\
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \subsection{Chlorophyll a}
 \noindent%
@@ -52,9 +51,9 @@ beginfont("f:mcf_data_base.mcf","t:EN","v:Chlorophyll a","NO:-",
   fsize:=(100mm,45mm);
   if check(mc)=0: MC(scantokens(mc)) fi
   ext(defaultscale:=0.8;
-      label.lrt("FM(C): "&cal_FM,(0,h-5mm));
-      label.lrt("MW(C): "&cal_MW,(0,h-9mm));
-      label.lrt("MW(D): "&inf_MW,(0,h-13mm));)
+      label.lrt("fm: "&cal_FM,(0,h-5mm));
+      label.lrt("mw: "&cal_MW,(0,h-9mm));
+      label.lrt("MW: "&inf_MW,(0,h-13mm));)
 endfont
 \end{verbatim}
 %------------------------------------------------------------------------------------
@@ -64,9 +63,9 @@ beginfont("f:mcf_data_base.mcf","t:EN","v:Chlorophyll a","NO:-",
   fsize:=(100mm,45mm);
   if check(mc)=0: MC(scantokens(mc)) fi
   ext(defaultscale:=0.8;
-      label.lrt("FM(C): "&cal_FM,(0,h-5mm));
-      label.lrt("MW(C): "&cal_MW,(0,h-9mm));
-      label.lrt("MW(D): "&inf_MW,(0,h-13mm));)
+      label.lrt("fm: "&cal_FM,(0,h-5mm));
+      label.lrt("mw: "&cal_MW,(0,h-9mm));
+      label.lrt("MW: "&inf_MW,(0,h-13mm));)
 endfont
 \end{mplibcode}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -78,9 +77,9 @@ beginfont("t:EN","v:Okadaic acid","EN:Dinophysistoxin-1",
   fsize:=(150mm,35mm);
   if check(mc)=0: MC(scantokens(mc)) fi
   ext(defaultscale:=0.8;
-      label.lrt("FM(C): "&cal_FM,(0,h-5mm));
-      label.lrt("MW(C): "&cal_MW,(0,h-9mm));
-      label.lrt("MW(D): "&inf_MW,(0,h-13mm));)
+      label.lrt("fm: "&cal_FM,(0,h-5mm));
+      label.lrt("mw: "&cal_MW,(0,h-9mm));
+      label.lrt("MW: "&inf_MW,(0,h-13mm));)
 endfont;
 \end{verbatim}
 %----------------------------------------------------------------------------
@@ -90,9 +89,9 @@ beginfont("t:EN","v:Okadaic acid","EN:Dinophysistoxin-1",
   fsize:=(150mm,35mm);
   if check(mc)=0: MC(scantokens(mc)) fi
   ext(defaultscale:=0.8;
-      label.lrt("FM(C): "&cal_FM,(0,h-5mm));
-      label.lrt("MW(C): "&cal_MW,(0,h-9mm));
-      label.lrt("MW(D): "&inf_MW,(0,h-13mm));)
+      label.lrt("fm: "&cal_FM,(0,h-5mm));
+      label.lrt("mw: "&cal_MW,(0,h-9mm));
+      label.lrt("MW: "&inf_MW,(0,h-13mm));)
 endfont;
 \end{mplibcode}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -126,9 +125,9 @@ beginfont("EN:Erythromycin","MW:733.93",
   fsize:=(120mm,30mm);
   if check(mc)=0: MC(scantokens(mc)) fi
   ext(defaultscale:=0.8;
-      label.lrt("FM(C): "&cal_FM,(0,h-5mm));
-      label.lrt("MW(C): "&cal_MW,(0,h-9mm));
-      label.lrt("MW(D): "&inf_MW,(0,h-13mm));)
+      label.lrt("fm: "&cal_FM,(0,h-5mm));
+      label.lrt("mw: "&cal_MW,(0,h-9mm));
+      label.lrt("MW: "&inf_MW,(0,h-13mm));)
 endfont;
 \end{mplibcode}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -158,9 +157,9 @@ beginfont("EN:Paclitaxel","MW:853.918",
   fsize:=(120mm,30mm);
   if check(mc)=0: MC(scantokens(mc)) fi
   ext(defaultscale:=0.8;
-      label.lrt("FM(C): "&cal_FM,(0,h-5mm));
-      label.lrt("MW(C): "&cal_MW,(0,h-9mm));
-      label.lrt("MW(D): "&inf_MW,(0,h-13mm));)
+      label.lrt("fm: "&cal_FM,(0,h-5mm));
+      label.lrt("mw: "&cal_MW,(0,h-9mm));
+      label.lrt("MW: "&inf_MW,(0,h-13mm));)
 endfont
 \end{mplibcode}
 %----------------------------------------------------------------------------
@@ -168,10 +167,10 @@ endfont
 \noindent%
 \begin{verbatim}
 beginfont("EN:Kekulene","MW:600.7",
-  %-----------------------------------------------------------------------
-  ": <30,Ph,{3,-2,-3,-2,-3,-2,-3,-2,-3,-2}=?6,(-3,6)=?6[3],@-4,&6,      ",
-  ": {8,12,14,16,18,22,24,26,28,32,34,36,38,42,44,46,48,52,54,56,58}=dl ")
-  %-----------------------------------------------------------------------
+  %------------------------------------------------------------------------------
+  ": <30,?6,{3,-3,-2,-3,-2,-3,-2,-3,-2,-3,(-2<,5<),(5<,-4<)}=?6,               ",
+  ": {1,5<,7,9,11,13,17,19,21,23,27,29,31,33,37,39,41,43,47,49,51,53,57,60}=dl ")
+  %------------------------------------------------------------------------------
   fsize:=(120mm,25mm);
   if check(mc)=0: MC(scantokens(mc)) fi
 endfont
@@ -179,14 +178,14 @@ endfont
 %----------------------------------------------------------------------------
 \begin{mplibcode}
 beginfont("EN:Kekulene","MW:600.7",
-  ": <30,Ph,{3,-2,-3,-2,-3,-2,-3,-2,-3,-2}=?6,(-3,6)=?6[3],@-4,&6,      ",
-  ": {8,12,14,16,18,22,24,26,28,32,34,36,38,42,44,46,48,52,54,56,58}=dl ")
+  ": <30,?6,{3,-3,-2,-3,-2,-3,-2,-3,-2,-3,(-2<,5<),(5<,-4<)}=?6,               ",
+  ": {1,5<,7,9,11,13,17,19,21,23,27,29,31,33,37,39,41,43,47,49,51,53,57,60}=dl ")
   fsize:=(120mm,25mm);
   if check(mc)=0: MC(scantokens(mc)) fi
   ext(defaultscale:=0.8;
-      label.lrt("FM(C): "&cal_FM,(0,h-5mm));
-      label.lrt("MW(C): "&cal_MW,(0,h-9mm));
-      label.lrt("MW(D): "&inf_MW,(0,h-13mm));)
+      label.lrt("fm: "&cal_FM,(0,h-5mm));
+      label.lrt("mw: "&cal_MW,(0,h-9mm));
+      label.lrt("MW: "&inf_MW,(0,h-13mm));)
 endfont
 \end{mplibcode}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -215,7 +214,7 @@ endfont
 \read\auxfile to \info%
 \infotovar{\info}                            %%%% info to variables %%%%
 \closein\auxfile%
-{\tt ** EN:\EN \quad MW(C):\MW \quad MW(D):\mw \quad FM(C):\fm}%
+{\tt ** EN:\EN \quad mw:\MW \quad MW:\mw \quad fm:\fm}%
 %--------------------------------------------------------------------------------
 \end{verbatim}
 %--------------------------------------------------------------------------------
@@ -238,7 +237,7 @@ endfont
 \infotovar{\info}                            %%%% info to variables %%%%
 \closein\auxfile%
 \verbatiminput{temp-mc.aux}                  %%%% input temp-mc.aux %%%%
-{\tt ** EN:\EN \quad MW(C):\MW \quad MW(D):\mw \quad FM(C):\fm}%
+{\tt ** EN:\EN \quad mw:\MW \quad MW:\mw \quad fm:\fm}%
 %--------------------------------------------------------------------------------
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \newpage