mcf2graph (15sep17)

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

10 files changed, 97 insertions, 90 deletions

diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/CHANGELOG b/Master/texmf-dist/doc/metapost/mcf2graph/CHANGELOG
index 7119b0a188f..eb05929ae89 100644
--- a/Master/texmf-dist/doc/metapost/mcf2graph/CHANGELOG
+++ b/Master/texmf-dist/doc/metapost/mcf2graph/CHANGELOG
@@ -1,6 +1,11 @@
 *******************************************************************************
- Changelog of mcf2graph software package          by Akira Yamaji 2017-09-03
+ Changelog of mcf2graph software package          by Akira Yamaji 2017-09-15
 *******************************************************************************
+[ver. 4.28  / 2017-09-15]
+  -change syntax #n
+    #n => $n
+  -update MCF syntax manual
+
 [ver. 4.27  / 2017-09-03]
   -improve function ext(),EXT()
   -update MCF syntax manual
diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/README b/Master/texmf-dist/doc/metapost/mcf2graph/README
index f629134d8f5..67d47183c34 100644
--- a/Master/texmf-dist/doc/metapost/mcf2graph/README
+++ b/Master/texmf-dist/doc/metapost/mcf2graph/README
@@ -1,7 +1,7 @@
 ********************************************************************************
  mcf2graph  : Convert Molecular Coding Format to graphics with METAFONT/METAPOST
  Author     : Akira Yamaji
- version    : 4.27 2017-09-03
+ version    : 4.28 2017-09-15
  E-mail     : mcf2graph@gmail.com
  Located at : http://www.ctan.org/pkg/mcf2graph
 ********************************************************************************
diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_exa_soc.mf b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_exa_soc.mf
index 5e257c33944..19b9a32ebfb 100644
--- a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_exa_soc.mf
+++ b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_exa_soc.mf
@@ -1,7 +1,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Molecular Coding Format for mcf_example.tex   by Akira Yamaji  2017.08.13
+% Molecular Coding Format for mcf_example.tex   by Akira Yamaji  2017.09.15
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-input mcf2graph.mf;   %%% it must be version 4.27 or later
+input mcf2graph.mf;   %%% it must be version 4.28 or later
 %-------------------------------------------------------------------------
 font_wd:=33mm;
 font_ht:=24mm;
@@ -114,7 +114,7 @@ beginfont("EN:Asulam","MW:230.238")
 endfont
 %***************************************************************************
 beginfont("EN:Oxadiargyl","MW:341.19")
-  MCf(<30,Ph,{1,3}:/Cl,4:\,|,?5,2=d,{1,2}:N,4:O,5://O,-3:/tBu,#6:\,O,!2,!!!)
+  MCf(<30,Ph,{1,3}:/Cl,4:\,|,?5,2=d,{1,2}:N,4:O,5://O,-3:/tBu,$6:\,O,!2,!!!)
 endfont
 %***************************************************************************
 beginfont("EN:Oxaziclomefone","MW:376.277")
@@ -179,15 +179,15 @@ beginfont("EN:Rifampicin","MW:822.94")
       |,-8=?6,{2,4}=dl,{1,4}:/OH,
       |<,``1,-2:\,NH,60,//O,-60,/_,60~dl,60,60~dl,-60,
       */_,60,/*OH,-60,/*_,60,/*OH,60,*/_^30,-60,
-      60,/*_^30,-53,66,-53~dl,66`1.2,O,>|,&#8,
-      -4:/*O!,-6:@,-30,O,!,//O,!,#11:\,!!,N,!,|,?6,{1,4}:N,4:/_)
+      60,/*_^30,-53,66,-53~dl,66`1.2,O,>|,&$8,
+      -4:/*O!,-6:@,-30,O,!,//O,!,$11:\,!!,N,!,|,?6,{1,4}:N,4:/_)
 endfont
 %***************************************************************************
 beginfont("EN:Wortmannin","MW:428.43")
   MCf(<30,?6,{-4,-2}=?6,-4=?5,(2,7)=?5[3],
      6:O,1://O,{7,10}=dl,8://O,17://O,-3=d,-1:O,
      {4,12}:*/_^60,11:/*H^-60,
-     #5:\*,60,O,!,#14:\*^-25,//O,!,O,!)
+     $5:\*,60,O,!,$14:\*^-25,//O,!,O,!)
 endfont
 %***************************************************************************
 beginfont("EN:Ampicillin","MW:349.405")
@@ -198,8 +198,8 @@ endfont
 %***************************************************************************
 beginfont("EN:Validamycin","MW:497.494")
   MCf(<30,?6,{5,6}:/OH,3:\,-60,OH,
-    #4:\,O,-60,|,?6,2:O,{3,4,5}:/OH,6:/!OH,
-    #1:\,NH,!,|,?6,2=dl,{4,5,6}:/OH,3:/!OH)
+    $4:\,O,-60,|,?6,2:O,{3,4,5}:/OH,6:/!OH,
+    $1:\,NH,!,|,?6,2=dl,{4,5,6}:/OH,3:/!OH)
 endfont
 %**************************************************************************
 beginfont("EN:Oceltamivir","MW:312.41")
@@ -212,11 +212,11 @@ endfont
 %***************************************************************************
 beginfont("EN:Chlorophyll a","MW:893.509")
 MCf(<54,|<,``1,?5,{2,5}=dl,4:N,3:\,54~dl,|,?5,{2,4}=dl,5:N,
-   -2:\,54~dl,|,?5,2=d,5:N,-2:\~dl,54,|,?5,5=d,5:N,-2:\~dl,&#5,
-   -1:@,24,/*COO!^15,72,//O,&#1,>|,
+   -2:\,54~dl,|,?5,2=d,5:N,-2:\~dl,54,|,?5,5=d,5:N,-2:\~dl,&$5,
+   -1:@,24,/*COO!^15,72,//O,&$1,>|,
    {2,9,15,20~zf}:/_,8:/!,14:\,!!,
-   #4:\`1.45,Mg,&17,-1:@,&11~vb,-1:@,&23~vb,
-   #21:@,-6~wf,!2,//O,!,O,!2,!!,|,!13,{1,5,9,13}:/_)
+   $4:\`1.45,Mg,&17,-1:@,&11~vb,-1:@,&23~vb,
+   $21:@,-6~wf,!2,//O,!,O,!2,!!,|,!13,{1,5,9,13}:/_)
 endfont
 %**************************************************************************
 beginfont("EN:Gibberellin A3","MW:346.379");
@@ -237,9 +237,9 @@ beginfont("EN:Lycorine","MW:287.315")
 endfont
 %**************************************************************************
 beginfont("EN:Tetrodotoxine","MW:319.27")
-  MCf(|<,``1,<60,-90,60,-30`1.15,150,60,&#1,#3:@,-135,60,-30`1.15,150,&#4,
-     #10:\,O,60`1.33,60,&#3~si_,#8:@,-15~si_,O,&#12,>|,
-     #9:@,45,-60,OH,1^120://NH,
+  MCf(|<,``1,<60,-90,60,-30`1.15,150,60,&$1,$3:@,-135,60,-30`1.15,150,&$4,
+     $10:\,O,60`1.33,60,&$3~si_,$8:@,-15~si_,O,&$12,>|,
+     $9:@,45,-60,OH,1^120://NH,
      {5~zf^-15,7,9^-75,12,13~zf}:/OH,{2,6^180}:NH)
 endfont
 %***************************************************************************
@@ -266,7 +266,7 @@ endfont
 %**************************************************************************
 beginfont("EN:Cromolyn","MW:468.37")
   MCf(<30,Ph,|,-1=?6,3=dl,1:O,4://O,2:/COOH,
-    #2:\,O,!2,/OH,!2,O,60,Ph,|,-5=?6,3=dl,4:O,1://O,3:/COOH)
+    $2:\,O,!2,/OH,!2,O,60,Ph,|,-5=?6,3=dl,4:O,1://O,3:/COOH)
 endfont
 %**************************************************************************
 beginfont("EN:Emetine","MW:480.649")
@@ -294,22 +294,22 @@ beginfont("EN:Ibotenic acid","MW:158.113")
 endfont
 %**************************************************************************
 beginfont("EN:Piperine","MW:285.343")
-  MCf(<30,Ph,|,-1=?5,{1,3}:O,#4:\,!!,!,!!,!,//O,!,|,?6,1:N)
+  MCf(<30,Ph,|,-1=?5,{1,3}:O,$4:\,!!,!,!!,!,//O,!,|,?6,1:N)
 endfont
 %***************************************************************************
 beginfont("EN:Febrifugine","MW:301.346")
-  MCf(<30,Ph,|,-4=?6,2=d,{1,3}:N,4://O,#9:\,!,//O,!,!~zf,|,?6,2:NH,-1:*/OH)
+  MCf(<30,Ph,|,-4=?6,2=d,{1,3}:N,4://O,$9:\,!,//O,!,!~zf,|,?6,2:NH,-1:*/OH)
 endfont
 %***************************************************************************
 beginfont("EN:Mitomycine C","MW:334.332")
   MCf(<30,?6,{3,6}=dl,{2,5}://O,1:/_,|,-4=?5,1:N,
-     #6:/NH2,|,-3=?5,|,-2=?3,-1=wb,-2=wf,-1:NH,
-     #8:/*O!^35,#9:@,17.9`1,!,O,!,//O,!,NH2)
+     $6:/NH2,|,-3=?5,|,-2=?3,-1=wb,-2=wf,-1:NH,
+     $8:/*O!^35,$9:@,17.9`1,!,O,!,//O,!,NH2)
 endfont
 %***************************************************************************
 beginfont("EN:Podophyllotoxin","MW:414.41");
   MCf(<0,?5,{2,5}:O,-3=Ph2,-3=?6,-3=?5,-2:O,-1=wb,-3://O,
-    10:\*,Ph,{-2,-3,-4}:/O!,#13:/*OH,{#11~wf^-60,#12~zf^60}:/H)
+    10:\*,Ph,{-2,-3,-4}:/O!,$13:/*OH,{$11~wf^-60,$12~zf^60}:/H)
 endfont;
 %***************************************************************************
 beginfont("EN:Warfarin","MW:308.333");
@@ -327,8 +327,8 @@ endfont;
 beginfont("EN:Reserpine","MW:608.688");
   MCf(<54,Ph,-4=?5,-2=?6,-4=?6,-3=?6,9=dl,11:N,7:NH,10:*/H^-60,
     {15^-60,16^60}:/*H,
-    #20:*\,O,!,//O,!,|,Ph,{-2,-3,-4}:/O!,{#1,#19~zf>rl}:/O!,
-    #18:*\,//O,!,O,!)
+    $20:*\,O,!,//O,!,|,Ph,{-2,-3,-4}:/O!,{$1,$19~zf>rl}:/O!,
+    $18:*\,//O,!,O,!)
 endfont;
 %***************************************************************************
 beginfont("EN:Nicotine","MW:162.23");
@@ -349,25 +349,25 @@ beginfont("EN:Erythromycin","MW:733.937");
 MCf(<30,|<,``1,<-120,60,60,60,-60,60,60,-60,60,60,60,-60,60,60,>|,&1,
     14:O,13:/*!,{1,9}://O,{2,10}:*/_,{4,6^-35,8,12^35}:/*_,
     {6^35,11,12^-35}:*/OH,
-    #3:\*,O,30,|,?6`.7,2:O,{3,5^35}:/_,4:/OH,5^-35:/O!,
-    #5:\*^30`1.7,O,!,|,?6`.7,6:O,5:/_,2:/OH,3:/NMe!)
+    $3:\*,O,30,|,?6`.7,2:O,{3,5^35}:/_,4:/OH,5^-35:/O!,
+    $5:\*^30`1.7,O,!,|,?6`.7,6:O,5:/_,2:/OH,3:/NMe!)
 endfont;
 %**************************************************************************
 beginfont("EN:Paclitaxel","MW:853.918")
-  MCf(?6,5=d,3:@,|<,``1,36,45,45,45,45,>|,&#5,-4=?6,-4=?4,||,-1=wb,-3=wf,-1:O,
+  MCf(?6,5=d,3:@,|<,``1,36,45,45,45,45,>|,&$5,-4=?6,-4=?4,||,-1=wb,-3=wf,-1:O,
     {4^35,4^-35,6}:/_,{3^-60,15}:*/OH,8:/*H^-60,9:*/_^60,10://O,
-    #1:\,O,!,//O,!,*/OH,!,/Ph,60~wf,NH,-60,//O,60,Ph,
-    #7:\*,O,-45,//O,60,Ph,#11:*\,O,-60,//O,60,#12:\*^-15,O,60,//O,-60)
+    $1:\,O,!,//O,!,*/OH,!,/Ph,60~wf,NH,-60,//O,60,Ph,
+    $7:\*,O,-45,//O,60,Ph,$11:*\,O,-60,//O,60,$12:\*^-15,O,60,//O,-60)
 endfont
 %**************************************************************************
 beginfont("EN:Mevastatin","MW:390.52")
   MCf(<30,?6,2=d,4:*/H^60,|,-4=?6,2=d,9:*/_,
-     #10:*\,!,60~wb,|,?6,6:O,-2://O,-4:/*OH,#5:\*,O,60,//O,!,*/_,!2)
+     $10:*\,!,60~wb,|,?6,6:O,-2://O,-4:/*OH,$5:\*,O,60,//O,!,*/_,!2)
 endfont
 %***************************************************************************
 beginfont("EN:Sesamine","MW:354.35")
   MCf(<54,?5,1=?5,{4,7}:O,{1^-54,2^54}:*/H,
-   #5:*\^-12,Ph,|,-3=?5,{-1,-3}:O,#8:*\^-12,Ph,|,-3=?5,{-1,-3}:O)
+   $5:*\^-12,Ph,|,-3=?5,{-1,-3}:O,$8:*\^-12,Ph,|,-3=?5,{-1,-3}:O)
 endfont
 %**************************************************************************
 beginfont("EN:Morphine","MW:285.343")
@@ -387,7 +387,7 @@ endfont
 %***************************************************************************
 beginfont("EN:Atoropin","MW:289.375")
   MCf(<-30,O,!,//O,!,!,Ph,
-     #1:\~zb^-120,|,?7`1.1,6:*\^190`1.25,N,/_,&3~wb,#3:/!OH~wv)
+     $1:\~zb^-120,|,?7`1.1,6:*\^190`1.25,N,/_,&3~wb,$3:/!OH~wv)
 endfont
 %***************************************************************************
 bye
diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_example.pdf b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_example.pdf
index 28f02965196..e8c8b0b06ce 100644
--- a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_example.pdf
+++ b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_example.pdf
diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_man_soc.mf b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_man_soc.mf
index fe9b4b3eebd..ccd6d985bad 100644
--- a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_man_soc.mf
+++ b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_man_soc.mf
@@ -1,7 +1,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Molecular Coding Format file for mcf_manual.tex  by Akira.Yamaji 2017.09.03
+% Molecular Coding Format file for mcf_manual.tex  by Akira.Yamaji 2017.09.15
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-input mcf2graph.mf;   %% it must be version 4.27 or later
+input mcf2graph.mf;   %% it must be version 4.28 or later
 %------------------------------------------------------------------------
 sw_auxout:=0;
 sw_mol_frame:=0;
@@ -353,7 +353,7 @@ endfont
 beginfont("EN:change atom absolute address")
   font_wd:=70mm;
   font_ht:=15mm;
-  MCa(0,.5)(?6,4:\,?6,#2:N)
+  MCa(0,.5)(?6,4:\,?6,$2:N)
   sw_numberA:=1;
   MCd(1,.88)(1,.5)(?6,4:\,?6)
 endfont
@@ -1033,14 +1033,14 @@ endfont
 beginfont("EN:Sesamine")
   font_ht:=25mm;
   MCf(<54,?5,1=?5,{4,7}:O,{1^-54,2^54}:*/H,
-   #5:*\^-12,Ph,-3=?5,{-1,-3}:O,8:*\^-12,Ph,-3=?5,{-1,-3}:O)
+   $5:*\^-12,Ph,-3=?5,{-1,-3}:O,8:*\^-12,Ph,-3=?5,{-1,-3}:O)
 endfont
 %***************************************************************************
 beginfont("EN:Colchicine","CAS:477-27-0","FM:C21H23NO6","MW:385.41")
   font_ht:=25mm;
   MCf(<30,Ph,{1,2,6}:/O!,|,-4=?7,
      |,-5=?7,{-1,-4,-6}=dl,-2://O,-3:/O!,
-     #9:\,NH,!,//O,!)
+     $9:\,NH,!,//O,!)
 endfont
 %***************************************************************************
 beginfont("EN:Lycorine","CAS:476-28-8","FM:C16H17NO4","MW:287.31")
@@ -1067,7 +1067,7 @@ endfont
 beginfont("EN:Atoropin","CAS:51-55-8","FM:C17H23NO3","MW:289.37")
   font_ht:=25mm;
   MCf(<-30,O,!,//O,!,!,Ph,
-     #1:@,-120~zb,|,?7,6:*\^190`1.12,N,/_,&3~wb,#3:\~wv,!,OH)
+     $1:@,-120~zb,|,?7,6:*\^190`1.12,N,/_,&3~wb,$3:\~wv,!,OH)
 endfont
 %***************************************************************************
 beginfont("EN:Rotenone");
@@ -1084,13 +1084,13 @@ endfont;
 beginfont("EN:Validamycin")
   font_ht:=20mm;
   MCf(<30,?6,{5,6}:/OH,3:/!OH>rl,
-    #4:\,O,-60,|,?6,2:O,{3,4,5}:/OH,6:/!OH,
-    #1:\,NH,!,|,?6,2=dl,{4,5,6}:/OH,3:/!OH)
+    $4:\,O,-60,|,?6,2:O,{3,4,5}:/OH,6:/!OH,
+    $1:\,NH,!,|,?6,2=dl,{4,5,6}:/OH,3:/!OH)
 endfont
 %***************************************************************************
 beginfont("EN:Paclitaxel","CAS:33069-62-4","FM:C47H51NO14","MW:853.91")
   MCf(?6,5=dl,3:@,|<,``1,36,45,45,45,45,>|,
-    &#5,-4=?6,-4=?4,-1=wb,-3=wf,-1:O,||,
+    &$5,-4=?6,-4=?4,-1=wb,-3=wf,-1:O,||,
     {4^35,4^-35,6}:/_,{3^-60,15}:*/OH,8:/*H^-60,9:*/_^60,10://O,
     1:\,O,!,//O,!,*/OH,!,/Ph,60~wf,NH,-60,//O,60,Ph,
     7:\*,O,-45,//O,60,Ph,11:*\,O,-60,//O,60,12:\*^-15,O,60,//O,-60)
diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.pdf b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.pdf
index 7b878350834..0bbf471b569 100644
--- a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.pdf
+++ b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.pdf
diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.tex b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.tex
index 0c509f089e7..59c0dae4a53 100644
--- a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.tex
+++ b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.tex
@@ -1,10 +1,10 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%  Molecular Coding Format manual           by  Akira Yamaji 2017.09.03
+%  Molecular Coding Format manual           by  Akira Yamaji 2017.09.15
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \documentclass[a4paper]{article}
 %%%%\documentclass[a4paper,twoside]{article}
 %%%%\usepackage{graphicx}
-\usepackage[dvipdfm]{graphicx}
+\usepackage[dvipdfmx]{graphicx}
 %%%%\usepackage[pdftex]{graphicx}
 %%%%\usepackage{epstopdf}
 \usepackage[dvipdfmx]{hyperref}
@@ -88,7 +88,7 @@ represent chemical structure diagrams.
 This 'Coding' is named from coding(programing) technique
 like adressing,grouping,macro,etc. 
 There are no Meta language commands in MCF.
-mcf2graph.m convert MCF file to graphics file
+mcf2graph convert MCF file to graphics file
 pk font,PNG,SVG,EPS or MDL MOL file(V2000).\\
 %-----------------------------------------------------------------------------
 \section{MCF syntax}
@@ -328,10 +328,10 @@ pk font,PNG,SVG,EPS or MDL MOL file(V2000).\\
 %-----------------------------------------------------------------------------
 \subsubsection{Absolute address}
 \begin{verbatim}
-  #2:N : change A#2 C to N
-  ** #n : (1<=n<=3095)
+  $2:N : change A$2 C to N
+  ** $n : (1<=n<=3095)
 
-  ?6,4:\,|,?6,#2:N
+  ?6,4:\,|,?6,$2:N
 \end{verbatim}
 \MCFstructure
 %-----------------------------------------------------------------------------
@@ -554,6 +554,7 @@ pk font,PNG,SVG,EPS or MDL MOL file(V2000).\\
   ext(label.urt("(cmr8)",p0+(0,h));)
 \end{verbatim}
 \hspace{5mm}\includegraphics{mcf_man_soc-064.eps}%  for dvipdfmx
+%%%%\hspace{5mm}\includegraphics[width=7cm]{mcf_man_soc-064.png}%  for dvipdfmx
 %%%%\MCFstructure   % for Metafont
 \advance\fontnum\@ne\relax\advance\tempnum\@ne\relax%
 %-----------------------------------------------------------------------------
@@ -1255,9 +1256,9 @@ drawarrow & drawdblarrow:
 \subsection{Atoropin}
 \begin{verbatim}
   <-30,O,!,//O,!,!,Ph,
-  #1:@,-120~zb,
+  $1:@,-120~zb,
   |,?7,6:*\^190`1.02,N,/_,&3~wb,
-  #3:\~wv,!,OH
+  $3:\~wv,!,OH
 \end{verbatim}
 \MCFstructure
 %-----------------------------------------------------------------------------
@@ -1281,14 +1282,14 @@ drawarrow & drawdblarrow:
 \subsection{Validamycin}
 \begin{verbatim}
   <30,?6,{5,6}:/OH,3:/!OH>rl,
-  #4:\,O,-60,|,?6,2:O,{3,4,5}:/OH,6:/!OH,
-  #1:\,NH,!,|,?6,2=dl,{4,5,6}:/OH,3:/!OH
+  $4:\,O,-60,|,?6,2:O,{3,4,5}:/OH,6:/!OH,
+  $1:\,NH,!,|,?6,2=dl,{4,5,6}:/OH,3:/!OH
 \end{verbatim}
 \MCFstructure
 %-----------------------------------------------------------------------------
 \subsection{Paclitaxel}
 \begin{verbatim}
-  ?6,5=d,3:@,|<,``1,36,45,45,45,45,>|,&#5,
+  ?6,5=d,3:@,|<,``1,36,45,45,45,45,>|,&$5,
   -4=?6,-4=?4,-1=wb,-3=wf,-1:O,||,
   {4^35,4^-35,6}:/_,{3^-60,15}:*/OH,
   8:/*H^-60,9:*/_^60,10://O,
diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_mplib_exa.pdf b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_mplib_exa.pdf
index 3739288f0be..392f78a02f6 100644
--- a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_mplib_exa.pdf
+++ b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_mplib_exa.pdf
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 fb0af3f7b5f..08b93629ce3 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    2017.09.03
+% Example of  MCF typest with LuaLaTeX(luamplib)     by A.Yamaji    2017.09.15
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%% mcf2graph.mf it must be version 4.27 or later
+%%% mcf2graph.mf it must be version 4.28 or later
 \documentclass{article}
 %------------------------------------------------------------------------------
 \usepackage{luamplib}%
@@ -43,8 +43,8 @@
   beginfont("NO:1","EN:Chlorophyll a","MW:893.49")
     MCd(.9,.9)(0,0.5)(<54,
      |<,``1,?5,{2,5}=dl,4:N,3:\,54~dl,|,?5,{2,4}=dl,5:N,
-     -2:\,54~dl,|,?5,2=dl,5:N,-2:\~dl,54,|,?5,5=dl,5:N,-2:\~dl,&#5,
-     -1:@,24,/*COO!^15,72,//O,&#1,>|,
+     -2:\,54~dl,|,?5,2=dl,5:N,-2:\~dl,54,|,?5,5=dl,5:N,-2:\~dl,&$5,
+     -1:@,24,/*COO!^15,72,//O,&$1,>|,
      4:\`1.45,Mg,&17,-1:@,&11~vb,-1:@,&23~vb,
      {2,9,15,20~zf}:/_,8:/!,14:\,!!,
      21:@,-6~wf,!2,//O,!,O,!2,!!,|,!13,{1,5,9,13}:/_,
@@ -62,8 +62,8 @@
 |<,``1,?5,{2,5}=dl,4:N,3:\,54~dl,
 |,?5,{2,4}=dl,5:N,
 -2:\,54~dl,|,?5,2=dl,5:N,
--2:\~dl,54,|,?5,5=dl,5:N,-2:\~dl,&#5,
--1:@,24,/*COO!^15,72,//O,&#1,>|,
+-2:\~dl,54,|,?5,5=dl,5:N,-2:\~dl,&$5,
+-1:@,24,/*COO!^15,72,//O,&$1,>|,
 4:\`1.45,Mg,&17,-1:@,&11~vb,-1:@,&23~vb,
 {2,9,15,20~zf}:/_,8:/!,14:\,!!,
 21:@,-6~wf,!2,//O,!,O,!2,!!,
@@ -191,8 +191,8 @@ beginfont("NO:5","EN:Erythromycin","MW:733.93");
     <30,|<,``1,<-120,60,60,60,-60,60,60,-60,60,60,60,-60,60,60,>|,&1,
      14:O,13:/*Et,{1,9}://O,{2,10}:*/_,{4,6^-35,8,12^35}:/*_,
      {6^35,11,12^-35}:*/OH,
-     #3:\*,O,30,|,?6`.7,2:O,{3,5^35}:/_,4:/OH,5^-35:/O!,
-     #5:\*^30`1.7,O,!,|,?6`.7,6:O,5:/_,2:/OH,3:/NMeMe
+     $3:\*,O,30,|,?6`.7,2:O,{3,5^35}:/_,4:/OH,5^-35:/O!,
+     $5:\*^30`1.7,O,!,|,?6`.7,6:O,5:/_,2:/OH,3:/NMeMe
      )
     EXT(
       label.lrt("("&inf_EN&")",(0,h));
@@ -209,9 +209,9 @@ beginfont("NO:5","EN:Erythromycin","MW:733.93");
 14:O,13:/*Et,{1,9}://O,{2,10}:*/_,
 {4,6^-35,8,12^35}:/*_,
 {6^35,11,12^-35}:*/OH,
-#3:\*,O,30,|,?6`.7,2:O,
+$3:\*,O,30,|,?6`.7,2:O,
 {3,5^35}:/_,4:/OH,5^-35:/O!,
-#5:\*^30`1.7,O,!,|,?6`.7,6:O,
+$5:\*^30`1.7,O,!,|,?6`.7,6:O,
 5:/_,2:/OH,3:/NMeMe
 \end{verbatim}
 \end{minipage}
@@ -220,10 +220,10 @@ beginfont("NO:5","EN:Erythromycin","MW:733.93");
 \begin{mplibcode}
 font_wd:=80mm; font_ht:=35mm;
 beginfont("EN:Paclitaxel","MW:853.918")
-  MCf(?6,5=d,3:@,|<,``1,36,45,45,45,45,>|,&#5,-4=?6,-4=?4,||,-1=wb,-3=wf,-1:O,
+  MCf(?6,5=d,3:@,|<,``1,36,45,45,45,45,>|,&$5,-4=?6,-4=?4,||,-1=wb,-3=wf,-1:O,
     {4^35,4^-35,6}:/_,{3^-60,15}:*/OH,8:/*H^-60,9:*/_^60,10://O,
-    #1:\,O,!,//O,!,*/OH,!,/Ph,60~wf,NH,-60,//O,60,Ph,
-    #7:\*,O,-45,//O,60,Ph,#11:*\,O,-60,//O,60,#12:\*^-15,O,60,//O,-60
+    $1:\,O,!,//O,!,*/OH,!,/Ph,60~wf,NH,-60,//O,60,Ph,
+    $7:\*,O,-45,//O,60,Ph,$11:*\,O,-60,//O,60,$12:\*^-15,O,60,//O,-60
   )
   EXT(
     label.lrt("("&inf_EN&")",(0,h));
@@ -235,13 +235,13 @@ endfont
 \end{mplibcode}
 \begin{minipage}[b]{85mm}
 \begin{verbatim}
-?6,5=d,3:@,|<,``1,36,45,45,45,45,>|,&#5,
+?6,5=d,3:@,|<,``1,36,45,45,45,45,>|,&$5,
 -4=?6,-4=?4,||,-1=wb,-3=wf,-1:O,
 {4^35,4^-35,6}:/_,{3^-60,15}:*/OH,
 8:/*H^-60,9:*/_^60,10://O,
-#1:\,O,!,//O,!,*/OH,!,/Ph,60~wf,NH,-60,//O,60,Ph,
-#7:\*,O,-45,//O,60,Ph,#11:*\,O,-60,//O,60,
-#12:\*^-15,O,60,//O,-60)
+$1:\,O,!,//O,!,*/OH,!,/Ph,60~wf,NH,-60,//O,60,Ph,
+$7:\*,O,-45,//O,60,Ph,$11:*\,O,-60,//O,60,
+$12:\*^-15,O,60,//O,-60)
 \end{verbatim}
 \end{minipage}
 \vspace{7mm}\\
@@ -253,14 +253,14 @@ beginfont("NO:6","EN:Vancomycin","MW:1449.25");
   MCa(0.5,0)(
     <30,
     |<,``1,!12,{1,3,12}=zf,7=wf,/H^-60,60,*/OH,60,
-    Ph,-4:/Cl,-3:\,O,!,Ph,-4:\,O,!,Ph,-1^15:/Cl,-3:\,/*OH,*/H^-60,&#1,
-    #7:@,&#26,#1:@,120,//O,60,NH,60,/*H,*/COOH^180,-60,
-    Ph,{-2,-4}:/OH,-1:\,Ph,-5:/OH,-2:@,&#4,>|,
+    Ph,-4:/Cl,-3:\,O,!,Ph,-4:\,O,!,Ph,-1^15:/Cl,-3:\,/*OH,*/H^-60,&$1,
+    $7:@,&$26,$1:@,120,//O,60,NH,60,/*H,*/COOH^180,-60,
+    Ph,{-2,-4}:/OH,-1:\,Ph,-5:/OH,-2:@,&$4,>|,
     {3^40,6,9,12}://O,{2,5,8,11}:NH,
     {1^180,4^180}:*/H,{7^-60,10^60,14^60}:/*H,
-    #10:*\^-60,60,//O,!,NH2,
-    #13:*\,NH,!,//O,!,/!iPr^-35>60,*/H^60,!~zf,NH,!,
-    #23:\,O,!,|,?6`.7,2:O,3^10:/!OH,{4,5}:/OH,
+    $10:*\^-60,60,//O,!,NH2,
+    $13:*\,NH,!,//O,!,/!iPr^-35>60,*/H^60,!~zf,NH,!,
+    $23:\,O,!,|,?6`.7,2:O,3^10:/!OH,{4,5}:/OH,
     -1:\,O,!,|,?6`.7,6:O,{3^35,5}:/_,3^-35:/NH2,4:/OH
     )
     EXT(
@@ -276,16 +276,16 @@ endfont;
 <30,|<,``1,!12,{1,3,12}=zf,7=wf,
 /H^-60,60,*/OH,60,Ph,-4:/Cl,
 -3:\,O,!,Ph,-4:\,O,!,Ph,-1^15:/Cl,
--3:\,/*OH,*/H^-60,&#1,
-#7:@,&#26,#1:@,120,//O,60,NH,60,
+-3:\,/*OH,*/H^-60,&$1,
+$7:@,&$26,$1:@,120,//O,60,NH,60,
  /*H,*/COOH^180,-60,
-Ph,{-2,-4}:/OH,-1:\,Ph,-5:/OH,-2:@,&#4,>|,
+Ph,{-2,-4}:/OH,-1:\,Ph,-5:/OH,-2:@,&$4,>|,
 {3^40,6,9,12}://O,{2,5,8,11}:NH,
 {1^180,4^180}:*/H,
 {7^-60,10^60,14^60}:/*H,
-#10:*\^-60,60,//O,!,NH2,#13:*\,NH,!,//O,!,
+$10:*\^-60,60,//O,!,NH2,$13:*\,NH,!,//O,!,
  /!iPr^-35>60,*/H^60 ,!~zf,NH,!,
-#23:\,O,!,|,?6`.7,2:O,3^10:/!OH,{4,5}:/OH,
+$23:\,O,!,|,?6`.7,2:O,3^10:/!OH,{4,5}:/OH,
 -1:\,O,!,|,?6`.7,6:O,
 {3^35,5}:/_,3^-35:/NH2,4:/OH
 \end{verbatim}
@@ -308,10 +308,10 @@ Ph,{-2,-4}:/OH,-1:\,Ph,-5:/OH,-2:@,&#4,>|,
     {6,46,50,53,60,67,74}:*/H^-60,
     {9,18,85,93,112,139,143,147}:*/_`1^60,
     {80,88,97,115,120,124}:/*_`1^-60,108:*/_`1^-60,
-    #6:\,|,!11,60~dr,-60,60,OH,2:/*OH,{7,10}:*/OH,{1,3}:*/_,{8~zf,11~dm,12}:/_,
+    $6:\,|,!11,60~dr,-60,60,OH,2:/*OH,{7,10}:*/OH,{1,3}:*/_,{8~zf,11~dm,12}:/_,
               6:\,O,30,SOO,30,"O{Na}",
-    #36:@,-45~zf,O,30,SOO,30,"O{Na}",
-    #150:\,|,!7,{1,2}:/*OH,4:*/_,5:/*_,7=dl
+    $36:@,-45~zf,O,30,SOO,30,"O{Na}",
+    $150:\,|,!7,{1,2}:/*OH,4:*/_,5:/*_,7=dl
     )
     EXT(
       label.lrt("("&inf_EN&")",(0,.8h));
@@ -334,9 +334,9 @@ Ph,{-2,-4}:/OH,-1:\,Ph,-5:/OH,-2:@,&#4,>|,
    {4,14,22,34,39,43,81,89,98,102,116,121,125,129,133}:*/H^60,
    {6,46,50,53,60,67,74}:*/H^-60,{9,18,85,93,112,139,143,147}:*/_`1^60,
    {80,88,97,115,120,124}:/*_`1^-60,108:*/_`1^-60,
-   #6:\,|,!11,60~dr,-60,60,OH,2:/*OH,{7,10}:*/OH,{1,3}:*/_,{8~zf,11~dm,12}:/_,
+   $6:\,|,!11,60~dr,-60,60,OH,2:/*OH,{7,10}:*/OH,{1,3}:*/_,{8~zf,11~dm,12}:/_,
      6:\,O,30,SOO,30,"O{Na}",
-   #36:@,-45~zf,O,30,SOO,30,"O{Na}",#150:\,|,!7,{1,2}:/*OH,4:*/_,5:/*_,7=dl
+   $36:@,-45~zf,O,30,SOO,30,"O{Na}",$150:\,|,!7,{1,2}:/*OH,4:*/_,5:/*_,7=dl
 \end{verbatim}
 \vspace{8mm}%
 %----------------------------------------------------------------------------
diff --git a/Master/texmf-dist/metapost/mcf2graph/mcf2graph.mf b/Master/texmf-dist/metapost/mcf2graph/mcf2graph.mf
index 7f8b1d6cfc7..4fd26918274 100644
--- a/Master/texmf-dist/metapost/mcf2graph/mcf2graph.mf
+++ b/Master/texmf-dist/metapost/mcf2graph/mcf2graph.mf
@@ -1,5 +1,5 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% mcf2graph ver 4.27     Copyright (c) 2013-2017   Akira Yamaji
+% mcf2graph ver 4.28     Copyright (c) 2013-2017   Akira Yamaji
 %
 % Permission is hereby granted, free of charge, to any person obtaining a copy of this software
 % and associated documentation files (the "Software"), to deal in the Software without restriction,
@@ -196,15 +196,16 @@ def endfont=
 enddef;
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 def set_def_MC=
-  save /,//,/*,*/,**,~,~~,^,^^,`,'`,<,>,>>,:>,&,&#,:,=,\,\\,*\,\*,@,#,{,},
+  save /,//,/*,*/,**,~,~~,^,^^,`,'`,<,>,>>,:>,&,&$,:,=,\,\\,*\,\*,@,$,{,},
        |,||,|<,>|,|:,:|,_,d,w,z,inside_def_MC;
   inside_def_MC:=1;
   _:=Me; d:=db; w:=wf; z:=zf;
   tertiarydef a=b == change_bond(a)(b) enddef; 
   tertiarydef a:b == change_atom(a)(b) enddef;
   def { == '''( enddef;  let } == );
-  vardef #primary a == a-4095 enddef;
-  def &primary n ==(_cyc,n) enddef; def &# == & # enddef;
+  vardef $primary a == a-4095 enddef;
+  def &primary n ==(_cyc,n) enddef;
+  def &$ == & $ enddef;
   def ^^primary n == (_tmp_rot,n) enddef; def ~~primary n == (_tmp_line,n) enddef;
   def '`primary n == (_tmp_len,n) enddef; def :>primary n == (_tmp_env,n) enddef;
   def >>primary n == (_chg_env,n) enddef; def ``primary n == (_chg_len,n) enddef;