mcf2graph (3jan19)

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

11 files changed, 196 insertions, 156 deletions

diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/CHANGELOG b/Master/texmf-dist/doc/metapost/mcf2graph/CHANGELOG
index 55ceeec4f0a..83ac09327b8 100644
--- a/Master/texmf-dist/doc/metapost/mcf2graph/CHANGELOG
+++ b/Master/texmf-dist/doc/metapost/mcf2graph/CHANGELOG
@@ -1,6 +1,10 @@
 *******************************************************************************
- Changelog of mcf2graph software package          by Akira Yamaji 2018-11-11
+ Changelog of mcf2graph software package          by Akira Yamaji 2019-01-03
 *******************************************************************************
+[ver. 4.35  / 2019-01-03]
+  -fix bug in numbering bond
+  -update MCF manual
+
 [ver. 4.34  / 2018-11-11]
   -change default driver(graphicx,hyperref)
    dvipdfmx => pdftex
diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/README b/Master/texmf-dist/doc/metapost/mcf2graph/README
index 7ddecdd5322..80b998f129f 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.34 2018-11-11
+ version    : 4.35 2019-01-03
  E-mail     : mcf2graph@gmail.com
  Located at : http://www.ctan.org/pkg/mcf2graph
 ********************************************************************************
@@ -19,13 +19,13 @@
  ( 3) mcf2graph.mf           Macro of Metafont / Metapost
  ( 4) mcf_manual.tex         MCF syntax manual(LaTeX file)
  ( 5) mcf_man_soc.mf         Molecular difinition file for mcf_manual.tex
- ( 6) mcf_man_soc-064.mps    No.64 EPS(with color) file of (4)
- ( 7) mcf_manual.pdf         PDF of (4) (used LaTeX,dvipdfmx)
+ ( 6) mcf_man_soc-064.mps    No.64 eps(with color) file of (4)
+ ( 7) mcf_manual.pdf         PDF of (4) (used pdftex(LaTeX))
  ( 8) mcf_example.tex        LaTeX example,
                                Make file 'mcf_exa_soc-info.aux' before typeset
                                >mpost -s ahlength=1 -s bboxmargin=0 mcf_exa_soc.mf
  ( 9) mcf_exa_soc.mf         Molecular difinition file for mcf_example.tex
- (10) mcf_example.pdf        PDF of (8) (used LaTeX,dvipdfmx)
+ (10) mcf_example.pdf        PDF of (8) (used pdftex(LaTeX))
  (11) mcf_mplib_exa.tex      luamplib(LuaLaTeX) example
  (12) mcf_example.pdf        PDF of (11) typeset with LuaTeX(LuaLaTeX)
 
@@ -33,15 +33,16 @@
  Minimum requirement to run mcf2graph : mpost.exe,mpost.dll,mpost.mp,plain.mp
  ( 1) >mpost -s bboxmargin=0  FILENAME  => output no graphic file
  ( 2) >mpost -s bboxmargin=1  FILENAME  => output first font only (for test)
- ( 3) >mpost -s ahangle=1     FILENAME  => output PNG file (default:eps)
- ( 4) >mpost -s ahangle=2     FILENAME  => output SVG file 
- ( 5) >mpost -s ahangle=3     FILENAME  => output EPS file 
- ( 6) >mpost -s ahlength=1    FILENAME  => output aux file
- ( 7) >mpost -s ahlength=2    FILENAME  => output report file
- ( 8) >mpost -s ahlength=5    FILENAME  => output MDL Molfile(V2000)
- ( 9) >mpost -s ahlength=6    FILENAME  => output MDL Molfile(V3000)
- (10) >mpost -s labeloffset=1 FILENAME  => use plain.mp 'label','drawarrow'
- (11) >mpost -s labeloffset=2 FILENAME  => atomfont="uhvr8r"
+ ( 3) >mpost -s ahangle=0     FILENAME  => output eps file (.mps default)
+ ( 4) >mpost -s ahangle=1     FILENAME  => output png file 
+ ( 5) >mpost -s ahangle=2     FILENAME  => output svg file 
+ ( 6) >mpost -s ahangle=3     FILENAME  => output eps file (.eps)
+ ( 7) >mpost -s ahlength=1    FILENAME  => output aux file
+ ( 8) >mpost -s ahlength=2    FILENAME  => output report file
+ ( 9) >mpost -s ahlength=5    FILENAME  => output mol file(V2000)
+ (10) >mpost -s ahlength=6    FILENAME  => output mol file(V3000)
+ (11) >mpost -s labeloffset=1 FILENAME  => use plain.mp 'label','drawarrow'
+ (12) >mpost -s labeloffset=2 FILENAME  => atomfont="uhvr8r"
 
 4. License
  Permission is hereby granted, free of charge, to any person obtaining a copy
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 b346a94eb53..c2ca372e6f8 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  2018.11.11
+% Molecular Coding Format for mcf_example.tex   by Akira Yamaji  2019.01.03
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-input mcf2graph.mf;   %%% it must be version 4.34 or later
+input mcf2graph.mf;   %%% it must be version 4.35 or later
 %-------------------------------------------------------------------------
 font_wd:=33mm;
 font_ht:=24mm;
diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_example.pdf b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_example.pdf
index 42370c3c64c..d47baef2a55 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_example.tex b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_example.tex
index 14a9321470f..19d1ba9929e 100644
--- a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_example.tex
+++ b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_example.tex
@@ -1,5 +1,5 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Example of MCF typeset by LaTeX   mcf_examples.tex   by A.Yamaji  2018.11.11
+% Example of MCF typeset by LaTeX   mcf_examples.tex   by A.Yamaji  2019.01.03
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \documentclass[a4paper]{article}
 \usepackage{graphicx}
diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_man_soc-064.mps b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_man_soc-064.mps
index 614deac5da2..98745d8ccad 100644
--- a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_man_soc-064.mps
+++ b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_man_soc-064.mps
@@ -2,7 +2,7 @@
 %%BoundingBox: -1 -1 212 60 
 %%HiResBoundingBox: -0.09962 -0.09962 211.90288 59.64348 
 %%Creator: MetaPost 2.00
-%%CreationDate: 2018.11.10:1325
+%%CreationDate: 2018.12.31:0844
 %%Pages: 1
 %%DocumentResources: procset mpost-minimal
 %%+ font NJFVSO-NimbusSanL-Regu ICXWUR-CMR8
@@ -471,9 +471,9 @@ newpath -0.09962 0.09962 moveto
  closepath fill
  0 0.48956 dtransform truncate idtransform setlinewidth pop [] 0 setdash
  1 setlinecap 1 setlinejoin 10 setmiterlimit
-newpath 16.65692 12.80867 moveto
+newpath 16.65692 12.80875 moveto
 29.14793 5.59703 lineto stroke
-newpath 18.2579 15.58165 moveto
+newpath 18.2579 15.58173 moveto
 29.07265 9.3378 lineto stroke
 newpath 29.14793 5.59703 moveto
 45.9096 15.27437 lineto stroke
@@ -497,7 +497,7 @@ newpath 12.38626 34.62903 moveto
 newpath 45.9096 15.27437 moveto
 56.46082 9.18266 lineto stroke
 newpath 45.9096 34.62903 moveto
-56.46082 40.7208 lineto stroke
+56.46082 40.72072 lineto stroke
  1 0 0 setrgbcolor
 newpath 8.89218 11.78027 moveto
 9.62653 11.78027 lineto
@@ -601,9 +601,9 @@ newpath 77.65843 35.80995 moveto
 10.60391 52.25127 moveto
 (\(draw\)) uhvr8r 9.96265 fshow
  0 0.48956 dtransform truncate idtransform setlinewidth pop 1 setlinecap
-newpath 132.84317 12.80867 moveto
+newpath 132.84317 12.80875 moveto
 145.33418 5.59703 lineto stroke
-newpath 134.44415 15.58165 moveto
+newpath 134.44415 15.58173 moveto
 145.2589 9.3378 lineto stroke
 newpath 145.33418 5.59703 moveto
 162.09586 15.27437 lineto stroke
@@ -626,7 +626,7 @@ newpath 128.57251 34.62903 moveto
 newpath 162.09586 15.27437 moveto
 172.64706 9.18266 lineto stroke
 newpath 162.09586 34.62903 moveto
-172.64706 40.7208 lineto stroke
+172.64706 40.72072 lineto stroke
 126.2985 11.39201 moveto
 (N) cmr8 7.73563 fshow
 141.45183 40.42401 moveto
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 99b0756f6ab..a95e7e0c65d 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 2018.11.11
+% Molecular Coding Format file for mcf_manual.tex  by Akira.Yamaji 2019.01.03
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-input mcf2graph.mf;   %% it must be version 4.34 or later
+input mcf2graph.mf;   %% it must be version 4.35 or later
 %------------------------------------------------------------------------
 sw_aux_out:=0;
 sw_mol_frame:=0;
diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.pdf b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.pdf
index 04ed3615aed..7eee7089af7 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 03aae71f77b..5e6364ed649 100644
--- a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.tex
+++ b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.tex
@@ -1,11 +1,11 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%  Molecular Coding Format manual           by  Akira Yamaji 2018.11.11
+%  Molecular Coding Format manual           by  Akira Yamaji 2019.01.03
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \documentclass[a4paper]{article}
 %%%%\documentclass[a4paper,twoside]{article}
 %%%%\usepackage{graphicx}
 \usepackage[pdftex]{graphicx}
-\usepackage{epstopdf}
+%%%%\usepackage{epstopdf}
 %%%%\usepackage[dvipdfmx]{graphicx}
 \usepackage[pdftex]{hyperref}
 %%%%\usepackage[dvipdfmx]{hyperref}
@@ -24,16 +24,53 @@
 \newdimen \htman%
 \newdimen \wdman%
 \newdimen \htmans%
+%----------------------------------------------------------------------------
+\newcount \MCFformat%
+\newbox \box@strufont%
 \htman=45mm%
 \wdman=94mm%
 \htmans=42mm%
 \fontnum=21%
 \tempnum=1%
 %----------------------------------------------------------------------------
-\font\@strufont=mcf_man_soc\relax%
+\edef\MCFjobname{mcf_man_soc}%
 %----------------------------------------------------------------------------
-\def\MCFstructure{\hspace{5mm}{\@strufont\char\fontnum}\advance\fontnum\@ne\relax}%
-%--------------------------------------------------------------------
+\MCFformat=-1%   use pkfont
+%%\MCFformat=0%    \includegraphics{jobname-nnn.mps}
+%%\MCFformat=1%    \includegraphics[width= ]{jobname-nnn.png}
+%%\MCFformat=2%    \includegraphics{jobname-nnn.svg}
+%%\MCFformat=3%    \includegraphics{jobname-nnn.eps}
+%----------------------------------------------------------------------------
+\font\@strufont=\MCFjobname\relax%
+%----------------------------------------------------------------------------
+\def\MCFgraph{%
+\ifnum\MCFformat<0{\hspace{5mm}\@strufont\char\fontnum}%
+\else%
+\ifnum\MCFformat=0\edef\stru@ext{mps}\fi
+\ifnum\MCFformat=1\edef\stru@ext{png}\fi
+\ifnum\MCFformat=2\edef\stru@ext{svg}\fi
+\ifnum\MCFformat=3\edef\stru@ext{eps}\fi
+%
+\ifnum\fontnum<100%
+\ifnum\fontnum<10\edef\zero@cnt{00}% jobname-00n.ext
+\else\edef\zero@cnt{0}\fi%           jobname-0nn.ext
+\else\edef\zero@cnt{}%               jobname-nnn.ext
+\fi%
+%
+\edef\file@name{\MCFjobname-\zero@cnt\the\fontnum.\stru@ext}%
+%
+\ifnum\MCFformat=1%
+\setbox\box@strufont=\hbox{\@strufont\char\fontnum}%
+\hspace{5mm}\includegraphics[width=\wd\box@strufont]{\file@name}%
+\else%
+\hspace{5mm}\includegraphics\file@name%
+\fi%
+%
+\fi%
+%
+\global\advance\fontnum\@ne\relax%
+}%
+%---------------------------------------------------------------------------
 \def\@F{F}\def\@C{C}\def\@EN{EN}\def\@NO{NO}\def\@cMW{cMW}\def\@cFM{cFM}%
 \def\@fst#1:#2;{#1}\def\@sec#1:#2;{#2}%
 \def\mol@sel#1{%
@@ -92,7 +129,7 @@ This 'Coding' is named from coding(programing) technique
 like adressing,grouping,macro,etc. 
 There are no Meta language commands in MCF.
 mcf2graph convert MCF file to graphics file
-pk font,PNG,SVG,EPS or MDL MOL file.\\
+pk font,PNG,SVG,EPS or MDL MOL file.
 %-----------------------------------------------------------------------------
 \section{MCF syntax}
 \subsection{Make bond}
@@ -103,7 +140,7 @@ pk font,PNG,SVG,EPS or MDL MOL file.\\
 
   <10,-30,45,-45,30,-30,60
 \end{verbatim}
-\MCFstructure
+\MCFgraph
 %-----------------------------------------------------------------------------
 \begin{verbatim}
   ! : take value 60 or -60 depend on
@@ -113,7 +150,7 @@ pk font,PNG,SVG,EPS or MDL MOL file.\\
   <30,!,!,!,!,!,!
   <30,!6
 \end{verbatim}
-\MCFstructure
+\MCFgraph
 %-----------------------------------------------------------------------------
 \subsubsection{Jump and branch bond}
 \begin{verbatim}
@@ -122,14 +159,14 @@ pk font,PNG,SVG,EPS or MDL MOL file.\\
        
   <30,!6,3:@,0,!,5:@,-30
 \end{verbatim}
-\MCFstructure
+\MCFgraph
 %------------------------------------
 \begin{verbatim}
   3:\ : 3:@,0
 
   <30,!6,3:\,!
 \end{verbatim}
-\MCFstructure
+\MCFgraph
 %-----------------------------------------------------------------------------
 \subsubsection{Branch bond}
 \begin{verbatim}
@@ -142,7 +179,7 @@ pk font,PNG,SVG,EPS or MDL MOL file.\\
   <30,!8,
   2:\,!,4:*\,!,6:\*,!,8:\\,!,10:*\*,!
 \end{verbatim}
-\MCFstructure
+\MCFgraph
 %-----------------------------------------------------------------------------
 \begin{verbatim}
   <-30,!6,
@@ -150,7 +187,7 @@ pk font,PNG,SVG,EPS or MDL MOL file.\\
   4:\`1.5,-90,   : 4:@,0`1.5,-90
   6:\^15,-60     : 6:@,0^15,-60
 \end{verbatim}
-\MCFstructure
+\MCFgraph
 %-----------------------------------------------------------------------------
 \subsubsection{Connect atom}
 \begin{verbatim}
@@ -158,7 +195,7 @@ pk font,PNG,SVG,EPS or MDL MOL file.\\
 
   <30,!6,3:\,!,5~bd:#
 \end{verbatim}
-\MCFstructure
+\MCFgraph
 %-----------------------------------------------------------------------------
 \subsubsection{Ring}
 \begin{verbatim}
@@ -166,7 +203,7 @@ pk font,PNG,SVG,EPS or MDL MOL file.\\
   ?6 : <-120,60,60,60,60,60,1:#
    ?6
 \end{verbatim}
-\MCFstructure
+\MCFgraph
 %-----------------------------------------------------------------------------
 \subsubsection{Rotate current angle}
 \begin{verbatim}
@@ -174,7 +211,7 @@ pk font,PNG,SVG,EPS or MDL MOL file.\\
 
   0,0,<90,0,<-90,0,0,{1,2,3,4,5}=vf 
 \end{verbatim}
-\MCFstructure
+\MCFgraph
 %-----------------------------------------------------------------------------
 \subsection{Change bond type}
 \subsubsection{Double,triple}
@@ -190,7 +227,7 @@ pk font,PNG,SVG,EPS or MDL MOL file.\\
   <30,!~dm,!,!~dl,!,!~dr,!~db,!~db,!,!~tm
   <30,!~dm,!,!~dl,!,!~dr,!!  ,!!  ,!,!!!
 \end{verbatim}
-\MCFstructure
+\MCFgraph
 \vspace{-3mm}%
 \begin{verbatim}
     dm      dl     dr   db  db      tm
@@ -204,7 +241,7 @@ pk font,PNG,SVG,EPS or MDL MOL file.\\
 
   <30,!~wf,!,!~wb,!,!~zf,!,!~zb
 \end{verbatim}
-\MCFstructure
+\MCFgraph
 \vspace{-3mm}%
 \begin{verbatim}
     wf       wb       zf       zb
@@ -216,7 +253,7 @@ pk font,PNG,SVG,EPS or MDL MOL file.\\
 
   <30,!~vf,!,!~vb
 \end{verbatim}
-\MCFstructure
+\MCFgraph
 \vspace{-3mm}%
 \begin{verbatim}
     vf        vb
@@ -230,7 +267,7 @@ pk font,PNG,SVG,EPS or MDL MOL file.\\
 
   <30,!7,1=dt,3=wv,5=bd,7=bz
 \end{verbatim}
-\MCFstructure
+\MCFgraph
 \vspace{-3mm}%
 \begin{verbatim}
     dt      wv       bd       bz
@@ -242,7 +279,7 @@ pk font,PNG,SVG,EPS or MDL MOL file.\\
 
   <30,!7,{2,4,6}=dr
 \end{verbatim}
-\MCFstructure
+\MCFgraph
 %-----------------------------------------------------------------------------
 \subsubsection{Over line}
 \begin{verbatim}
@@ -254,7 +291,7 @@ pk font,PNG,SVG,EPS or MDL MOL file.\\
   <-30,!8,!,60,90`8,
   {2~si_,4~wf_,6~wb_,8~bd_}:/_`2
 \end{verbatim}
-\MCFstructure
+\MCFgraph
 %-----------------------------------------------------------------------------
 \subsection{Change bond length}
 \subsubsection{Chain length}
@@ -265,14 +302,14 @@ pk font,PNG,SVG,EPS or MDL MOL file.\\
 
   ** !2`1.2 : '`1.2,!2
 \end{verbatim}
-\MCFstructure
+\MCFgraph
 %-----------------------------------------------------------------------------
 \begin{verbatim}
 ``length : change all bond length after
 
   <30,!2,``1.2,!4
 \end{verbatim}
-\MCFstructure
+\MCFgraph
 %-----------------------------------------------------------------------------
 \subsubsection{Ring length}
 \begin{verbatim}
@@ -280,7 +317,7 @@ pk font,PNG,SVG,EPS or MDL MOL file.\\
 
   ?6,4:\,?6`1.2
 \end{verbatim}
-\MCFstructure
+\MCFgraph
 %-----------------------------------------------------------------------------
 \subsection{Change atom}
 \subsubsection{Insert atom}
@@ -289,7 +326,7 @@ pk font,PNG,SVG,EPS or MDL MOL file.\\
 
   <30,!2,O,!2,N,!2
 \end{verbatim}
-\MCFstructure
+\MCFgraph
 %-----------------------------------------------------------------------------
 \subsubsection{Addressed atom}
 \begin{verbatim}
@@ -298,7 +335,7 @@ pk font,PNG,SVG,EPS or MDL MOL file.\\
 
   <30,!4,2:O,{3,4}:N
 \end{verbatim}
-\MCFstructure
+\MCFgraph
 %-----------------------------------------------------------------------------
 \subsubsection{Brock address}
 \begin{verbatim}
@@ -306,14 +343,14 @@ pk font,PNG,SVG,EPS or MDL MOL file.\\
 
   ?6,4:\,|,?6,2:O
 \end{verbatim}
-\MCFstructure
+\MCFgraph
 %-----------------------------------------------------------------------------
 \begin{verbatim}
   || : reset brock adress
 
   ?6,4:\,|,?6,||,2:N
 \end{verbatim}
-\MCFstructure
+\MCFgraph
 %-----------------------------------------------------------------------------
 \subsubsection{Absolute address}
 \begin{verbatim}
@@ -322,7 +359,7 @@ pk font,PNG,SVG,EPS or MDL MOL file.\\
 
   ?6,4:\,|,?6,$2:N
 \end{verbatim}
-\MCFstructure
+\MCFgraph
 %-----------------------------------------------------------------------------
 \subsubsection{Relative address}
 \begin{verbatim}
@@ -331,7 +368,7 @@ pk font,PNG,SVG,EPS or MDL MOL file.\\
 
   ?6,4:\,?6,-2:N
 \end{verbatim}
-\MCFstructure
+\MCFgraph
 %-----------------------------------------------------------------------------
 \subsubsection{Charged atom}
 \begin{verbatim}
@@ -340,7 +377,7 @@ pk font,PNG,SVG,EPS or MDL MOL file.\\
   <-30,!2,N[1],!2,O[-1],
        !2,&"-",!2,N,&"+"^180,!
 \end{verbatim}
-\MCFstructure
+\MCFgraph
 %-----------------------------------------------------------------------------
 \subsection{Fuse ring}
 \subsubsection{Attached 1 bond}
@@ -350,7 +387,7 @@ pk font,PNG,SVG,EPS or MDL MOL file.\\
 
   ?6,3=?6
 \end{verbatim}
-\MCFstructure
+\MCFgraph
 %-----------------------------------------------------------------------------
 \begin{verbatim}
   ** fused ring size depend on 
@@ -358,7 +395,7 @@ pk font,PNG,SVG,EPS or MDL MOL file.\\
 
   ?6,4:\,?6`1.2,5=?6,11=?6
 \end{verbatim}
-\MCFstructure
+\MCFgraph
 %-----------------------------------------------------------------------------
 \begin{verbatim}
   ?6,3=?6[13] : fuse ?6[13] at B3
@@ -367,13 +404,13 @@ pk font,PNG,SVG,EPS or MDL MOL file.\\
 
   ?6,3=?6[13]
 \end{verbatim}
-\MCFstructure
+\MCFgraph
 %-----------------------------------------------------------------------------
 \begin{verbatim}
   ?6,{-3,-4,-4,-2,-2,-4,-4}=?6
   ?6,{4,8,13,20,25,28,33}=?6
 \end{verbatim}
-\MCFstructure
+\MCFgraph
 %-----------------------------------------------------------------------------
 \subsubsection{Attached 2 bond}
 \begin{verbatim}
@@ -386,7 +423,7 @@ pk font,PNG,SVG,EPS or MDL MOL file.\\
 2:MCd(1,.6)(.54,1)(<30,?6,3=?6,(11,4)=?5[3])
 3:MCd(1,.6)(  1,0)(<30,?6,3=?6,(11,4)=?4[2])
 \end{verbatim}
-\MCFstructure
+\MCFgraph
 \vspace{-3mm}%
 \begin{verbatim}
         1             2             3
@@ -401,7 +438,7 @@ pk font,PNG,SVG,EPS or MDL MOL file.\\
 1:MCd(1,.55)(0,0)(?6,{3,10}=?6,(16,4)=?6[3])
 2:MCd(1,.55)(1,0)(?6,{3,10}=?6,(16,4)=?5[2])
 \end{verbatim}
-\MCFstructure
+\MCFgraph
 \vspace{-3mm}%
 \begin{verbatim}
          1                 2
@@ -415,7 +452,7 @@ pk font,PNG,SVG,EPS or MDL MOL file.\\
 
   ** ?m[n] (m=6,n=2)
 \end{verbatim}
-\MCFstructure
+\MCFgraph
 %-----------------------------------------------------------------------------
 \subsubsection{Spiro ring}
 \begin{verbatim}
@@ -425,7 +462,7 @@ pk font,PNG,SVG,EPS or MDL MOL file.\\
 
   An:@ : jump to An
 \end{verbatim}
-\MCFstructure
+\MCFgraph
 %-----------------------------------------------------------------------------
 \subsection{Substituent}
 \subsubsection{Insert substituent}
@@ -438,7 +475,7 @@ pk font,PNG,SVG,EPS or MDL MOL file.\\
      Pr:propyl(/!2) iPr:isopropyl
      tBu:tertial buthyl Ph:phenyl
 \end{verbatim}
-\MCFstructure
+\MCFgraph
 %-----------------------------------------------------------------------------
 \subsubsection{Insert modified substituent}
 \begin{verbatim}
@@ -450,7 +487,7 @@ pk font,PNG,SVG,EPS or MDL MOL file.\\
 
   <30,!,//O,!2,/*H,!2,*/H,!2,*/*H,!2,**?3,!
 \end{verbatim}
-\MCFstructure
+\MCFgraph
 \vspace{-3mm}%
 \begin{verbatim}
       //      /*     */     */*     **
@@ -465,14 +502,14 @@ pk font,PNG,SVG,EPS or MDL MOL file.\\
   <30,``1,!,
    /_`2^30,!2,/!2>lr,!2,/!2>rl,!)
 \end{verbatim}
-\MCFstructure
+\MCFgraph
 %-----------------------------------------------------------------------------
 \subsubsection{Add substituent}
 \begin{verbatim}
   <-30,!17,2:/_,4:/!,6:/!2,
    10:/iPr,14:/tBu,16:/Ph^-60
 \end{verbatim}
-\MCFstructure
+\MCFgraph
 %-----------------------------------------------------------------------------
 \subsubsection{Add modified substituent}
 \begin{verbatim}
@@ -481,7 +518,7 @@ pk font,PNG,SVG,EPS or MDL MOL file.\\
   <-30,!6,
   {2~wf,4~zf,6^-30}:/_
 \end{verbatim}
-\MCFstructure
+\MCFgraph
 %-----------------------------------------------------------------------------
 \begin{verbatim}
 
@@ -490,7 +527,7 @@ pk font,PNG,SVG,EPS or MDL MOL file.\\
   <30,!7`1,
   3:/_`2^30,5:/!2>lr,7:/!2>rl
 \end{verbatim}
-\MCFstructure
+\MCFgraph
 %-----------------------------------------------------------------------------
 \subsection{Chain environment}
 \subsubsection{Horizontal,vertical}
@@ -501,7 +538,7 @@ pk font,PNG,SVG,EPS or MDL MOL file.\\
   ?4,{3^-90,3^-30,3^90}:/'(!3,"{hz}")>hz,
      {1^-60,1`2,1^60}:/'(!2,"{vt}")>vt
 \end{verbatim}
-\MCFstructure
+\MCFgraph
 %-----------------------------------------------------------------------------
 \subsubsection{Left-right,right-left}
 \begin{verbatim}
@@ -512,7 +549,7 @@ pk font,PNG,SVG,EPS or MDL MOL file.\\
   {3^-30,3,3^30}:/'(!3,"{lr}")>lr,
   {5^-30,5,5^30}:/'(!3,"{rl}")>rl
 \end{verbatim}
-\MCFstructure
+\MCFgraph
 %-----------------------------------------------------------------------------
 \subsubsection{Fixed angle,multi angle}
 \begin{verbatim}
@@ -522,7 +559,7 @@ pk font,PNG,SVG,EPS or MDL MOL file.\\
   <-30,!6,2>45:/'(!3,"{45}"),
   {6>'(-90,90,-90)}:/'(!3,"{(-90,90,-90)}")
 \end{verbatim}
-\MCFstructure
+\MCFgraph
 %-----------------------------------------------------------------------------
 \subsection{Miscellaneous}
 %-----------------------------------------------------------------------------
@@ -534,7 +571,7 @@ pk font,PNG,SVG,EPS or MDL MOL file.\\
 
   <30,!2,NH,!,SO,!,SOO,!
 \end{verbatim}
-\MCFstructure
+\MCFgraph
 %-----------------------------------------------------------------------------
 \subsubsection{Change color, atom font}
 \begin{verbatim}
@@ -552,11 +589,7 @@ pk font,PNG,SVG,EPS or MDL MOL file.\\
   MCa(1,0.5)(<30,Ph,{1,5}:N,3:/COOH,4:/NO2)
   ext(label.urt("(cmr8)",p0+(0,h));)
 \end{verbatim}
-\hspace{5mm}\includegraphics{mcf_man_soc-064.mps}%  for pdftex
-%%%%\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%
+{\MCFformat=0 \MCFgraph}
 %-----------------------------------------------------------------------------
 \subsubsection{Make block}
 \begin{verbatim}
@@ -567,7 +600,7 @@ pk font,PNG,SVG,EPS or MDL MOL file.\\
   <30,!2,|<,``1.2,!2,>|,!2
   <30,!2,|<=1.2,!2,>|,!2
 \end{verbatim}
-\MCFstructure
+\MCFgraph
 %-----------------------------------------------------------------------------
 \subsubsection{Chain start multiple characters}
 \begin{verbatim}
@@ -576,11 +609,11 @@ pk font,PNG,SVG,EPS or MDL MOL file.\\
 
   MCf(<30,COOH,!0,!3,COOH)
 \end{verbatim}
-\MCFstructure
+\MCFgraph
 \begin{verbatim}
   MCf(<30,COOH,!4,COOH)
 \end{verbatim}
-\MCFstructure
+\MCFgraph
 %-----------------------------------------------------------------------------
 \subsubsection{User definition}
 \begin{verbatim}
@@ -588,13 +621,13 @@ pk font,PNG,SVG,EPS or MDL MOL file.\\
    iBuOH:='(!,/_,!,OH)
    <30,?6,{4,6}:/iBuOH
 \end{verbatim}
-\MCFstructure
+\MCFgraph
 %-----------------------------------------------------------------------------
 \begin{verbatim}
   Insert user defined substructure
    <30,!3,/'(!,/_,!,OH),!3
 \end{verbatim}
-\MCFstructure
+\MCFgraph
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \newpage
 \section{Option parameter}
@@ -608,13 +641,13 @@ pk font,PNG,SVG,EPS or MDL MOL file.\\
     MCf(<30,?6,-4=?5,{3,8}=dl,{2,6,7,9}:N,
        {2,6,9}:/_,{1,5}://O)  endfont
 \end{verbatim}
-\MCFstructure
+\MCFgraph
 %-----------------------------------------------------------------------------
 \subsubsection{Margin left and right}
 \begin{verbatim}
  default: margin_left_right=0.4mm
 \end{verbatim}
-\MCFstructure
+\MCFgraph
 \begin{picture}(12,20)
 \put(1,14){\makebox(10,6)[r]{\tt 0mm}}
 \put(1, 7){\makebox(10,6)[r]{\tt 0.4mm}}
@@ -625,7 +658,7 @@ pk font,PNG,SVG,EPS or MDL MOL file.\\
 \begin{verbatim}
  default: margin_top_bottom=0.4mm
 \end{verbatim}
-\MCFstructure
+\MCFgraph
 \vspace{-3mm}%
 \begin{verbatim}
       0mm       0.4mm       5mm
@@ -635,7 +668,7 @@ pk font,PNG,SVG,EPS or MDL MOL file.\\
 \begin{verbatim}
   default: offset_thickness=0.2pt
 \end{verbatim}
-\MCFstructure
+\MCFgraph
 \vspace{-3mm}%
 \begin{verbatim}
       0pt       0.2pt       0.5pt
@@ -645,7 +678,7 @@ pk font,PNG,SVG,EPS or MDL MOL file.\\
 \begin{verbatim}
   default: offset_bond_gap=0.3pt
 \end{verbatim}
-\MCFstructure
+\MCFgraph
 \vspace{-3mm}%
 \begin{verbatim}
       0.0pt      0.3pt      1.0pt
@@ -655,7 +688,7 @@ pk font,PNG,SVG,EPS or MDL MOL file.\\
 \begin{verbatim}
   default: offset_atom=0.8pt
 \end{verbatim}
-\MCFstructure
+\MCFgraph
 \vspace{-3mm}%
 \begin{verbatim}
       0.0pt      0.8pt      2.0pt
@@ -665,7 +698,7 @@ pk font,PNG,SVG,EPS or MDL MOL file.\\
 \begin{verbatim}
   default:  offset_wedge=0.4pt
 \end{verbatim}
-\MCFstructure
+\MCFgraph
 \vspace{-3mm}%
 \begin{verbatim}
       0.0pt      0.4pt      1.0pt
@@ -675,7 +708,7 @@ pk font,PNG,SVG,EPS or MDL MOL file.\\
 \begin{verbatim}
   default:  max_bond_length=10mm
 \end{verbatim}
-\MCFstructure
+\MCFgraph
 \vspace{-3mm}%
 \begin{verbatim}
      6mm       8mm         20mm
@@ -687,7 +720,7 @@ pk font,PNG,SVG,EPS or MDL MOL file.\\
 \begin{verbatim}
   default:  ratio_thickness_bond=0.015
 \end{verbatim}
-\MCFstructure
+\MCFgraph
 \vspace{-3mm}%
 \begin{verbatim}
       0.005      0.015      0.030
@@ -697,7 +730,7 @@ pk font,PNG,SVG,EPS or MDL MOL file.\\
 \begin{verbatim}
   default:  ratio_char_bond=1.5
 \end{verbatim}
-\MCFstructure
+\MCFgraph
 \vspace{-3mm}%
 \begin{verbatim}
       1.0        1.5        2.0
@@ -707,7 +740,7 @@ pk font,PNG,SVG,EPS or MDL MOL file.\\
 \begin{verbatim}
   default:  ratio_bondgap_bond= 0.15
 \end{verbatim}
-\MCFstructure
+\MCFgraph
 \vspace{-3mm}%
 \begin{verbatim}
       0.10       0.15       0.20
@@ -717,7 +750,7 @@ pk font,PNG,SVG,EPS or MDL MOL file.\\
 \begin{verbatim}
   default:  ratio_atom_bond= 0.36
 \end{verbatim}
-\MCFstructure
+\MCFgraph
 \vspace{-3mm}%
 \begin{verbatim}
        0.25      0.36      0.46
@@ -727,7 +760,7 @@ pk font,PNG,SVG,EPS or MDL MOL file.\\
 \begin{verbatim}
   default:  ratio_wedge_bond=0.12
 \end{verbatim}
-\MCFstructure
+\MCFgraph
 \vspace{-3mm}%
 \begin{verbatim}
       0.10       0.12       0.20
@@ -737,7 +770,7 @@ pk font,PNG,SVG,EPS or MDL MOL file.\\
 \begin{verbatim}
   default:  ratio_atomgap_atom= 0.050
 \end{verbatim}
-\MCFstructure
+\MCFgraph
 \vspace{-3mm}%
 \begin{verbatim}
       0.0       0.050       0.12
@@ -747,7 +780,7 @@ pk font,PNG,SVG,EPS or MDL MOL file.\\
 \begin{verbatim}
   default:  ratio_chain_ring= 0.66
 \end{verbatim}
-\MCFstructure
+\MCFgraph
 \vspace{-3mm}%
 \begin{verbatim}
        0.4         0.65        1.0
@@ -757,7 +790,7 @@ pk font,PNG,SVG,EPS or MDL MOL file.\\
 \begin{verbatim}
   default:  ratio_zebragap_bond=0.12
 \end{verbatim}
-\MCFstructure
+\MCFgraph
 \vspace{-3mm}%
 \begin{verbatim}
        0.06      0.12      0.20
@@ -771,7 +804,7 @@ pk font,PNG,SVG,EPS or MDL MOL file.\\
   default: sw_numberA=0 :
     numberA_start=1 numberA_end=4095
 \end{verbatim}
-\MCFstructure
+\MCFgraph
 \begin{picture}(5,20)
 \put(0,14){\makebox[5mm]{\tt 1}}
 \put(0, 8){\makebox[5mm]{\tt 2}}
@@ -784,7 +817,7 @@ pk font,PNG,SVG,EPS or MDL MOL file.\\
   default: sw_numberB=0 :
     numberB_start=1 numberB_end=4095
 \end{verbatim}
-\MCFstructure
+\MCFgraph
 \begin{picture}(5,20)
 \put(0,14){\makebox[5mm]{\tt 1}}
 \put(0, 8){\makebox[5mm]{\tt 2}}
@@ -798,20 +831,20 @@ pk font,PNG,SVG,EPS or MDL MOL file.\\
   MCd(1,0.7)(0.8,0.7)(Ph)
   ** default: sw_clip=0
 \end{verbatim}
-\MCFstructure
+\MCFgraph
 \begin{verbatim}
   sw_clip:=1;
   MCd(1,0.7)(0.2,0.3)(Ph)
   MCd(1,0.7)(0.8,0.7)(Ph)
 \end{verbatim}
-\MCFstructure
+\MCFgraph
 %-----------------------------------------------------------------------------
 \subsubsection{Solid mode}
 \begin{verbatim}
   (fit to font size)
   sw_solid=0   ** default
 \end{verbatim}
-\MCFstructure
+\MCFgraph
 %-----------------------------------------
 \begin{verbatim}
   (solid ratio bond/font width)
@@ -821,7 +854,7 @@ pk font,PNG,SVG,EPS or MDL MOL file.\\
   (bond_len=60mm*0.1=6mm)
   ** ignore bond_len
 \end{verbatim}
-\MCFstructure
+\MCFgraph
 %-----------------------------------------
 \begin{verbatim}
   (solid bond length)
@@ -829,7 +862,7 @@ pk font,PNG,SVG,EPS or MDL MOL file.\\
   bond_len=10mm
   ** ignore ratio_bond_width
 \end{verbatim}
-\MCFstructure
+\MCFgraph
 %-----------------------------------------
 \begin{verbatim}
   (solid bond length and clip)
@@ -837,13 +870,13 @@ pk font,PNG,SVG,EPS or MDL MOL file.\\
   sw_clip:=1;
   bond_len=10mm
 \end{verbatim}
-\MCFstructure
+\MCFgraph
 %-----------------------------------------------------------------------------
 \subsubsection{Expand mode}
 \begin{verbatim}
   default:  sw_expand=0
 \end{verbatim}
-\MCFstructure\\
+\MCFgraph\\
 \makebox[5mm]{}%
 \makebox[30mm]{\tt 0 :default}%
 \makebox[30mm]{\tt 1}%
@@ -852,7 +885,7 @@ pk font,PNG,SVG,EPS or MDL MOL file.\\
 \begin{verbatim}
   default:  sw_subst_off=0
 \end{verbatim}
-\MCFstructure\\
+\MCFgraph\\
 \makebox[5mm]{}%
 \makebox[30mm]{\tt 0 :default}%
 \makebox[30mm]{\tt 1}%
@@ -861,7 +894,7 @@ pk font,PNG,SVG,EPS or MDL MOL file.\\
 \begin{verbatim}
   default:  sw_bond_single=0
 \end{verbatim}
-\MCFstructure\\
+\MCFgraph\\
 \makebox[5mm]{}%
 \makebox[30mm]{\tt 0 :default}%
 \makebox[30mm]{\tt 1}%
@@ -876,17 +909,17 @@ pk font,PNG,SVG,EPS or MDL MOL file.\\
   sw_font_frame:=1;
   MCf(<30,Ph,4:/Cl,3:/F)
 \end{verbatim}
-\MCFstructure
+\MCFgraph
 \begin{verbatim}
   (Draw frame inside margin)
   sw_font_frame=2
 \end{verbatim}
-\MCFstructure
+\MCFgraph
 \begin{verbatim}
   (Draw both frame)
   sw_font_frame=3
 \end{verbatim}
-\MCFstructure
+\MCFgraph
 %-----------------------------------------------------------------------------
 \subsubsection{Molecular frame}
 \begin{verbatim}
@@ -894,7 +927,7 @@ pk font,PNG,SVG,EPS or MDL MOL file.\\
   MCd(1,.5)(1,0.5)(<30,Ph,4:/Cl,3:/F)
   ** default: sw_mol_frame=0
 \end{verbatim}
-\MCFstructure
+\MCFgraph
 %-----------------------------------------------------------------------------
 \subsubsection{Atom frame}
 \begin{verbatim}
@@ -902,7 +935,7 @@ pk font,PNG,SVG,EPS or MDL MOL file.\\
   MCf(<30,COOH,!0,COOH)
   ** default: sw_atom_frame=0
 \end{verbatim}
-\MCFstructure
+\MCFgraph
 %-----------------------------------------------------------------------------
 \subsection{Local parameter setting}
 \begin{verbatim}
@@ -919,7 +952,7 @@ pk font,PNG,SVG,EPS or MDL MOL file.\\
     MCf(Ph)
   endfont
 \end{verbatim}
-\MCFstructure\MCFstructure\MCFstructure
+\MCFgraph\MCFgraph\MCFgraph
 %-----------------------------------------------------------------------------
 \subsection{Global parameter setting}
 \begin{verbatim}
@@ -936,7 +969,7 @@ pk font,PNG,SVG,EPS or MDL MOL file.\\
     MCf(Ph)
   endfont
 \end{verbatim}
-\MCFstructure\MCFstructure\MCFstructure
+\MCFgraph\MCFgraph\MCFgraph
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \newpage
 \section{Function}
@@ -955,7 +988,7 @@ pk font,PNG,SVG,EPS or MDL MOL file.\\
     MCd(1,0.8)(0.8,0.1)(<30,Ph,3:/F,4:/Cl)
   endfont
 \end{verbatim}
-\MCFstructure
+\MCFgraph
 %-----------------------------------------------------------------------------
 \subsection{Function MCa()}
 \begin{verbatim}
@@ -970,7 +1003,7 @@ pk font,PNG,SVG,EPS or MDL MOL file.\\
     MCa(0.8,0.5)(<30,Ph,3:/F,4:/Cl)
   endfont
 \end{verbatim}
-\MCFstructure
+\MCFgraph
 %-----------------------------------------------------------------------------
 \subsection{Function MCc()}
 \begin{verbatim}
@@ -986,7 +1019,7 @@ pk font,PNG,SVG,EPS or MDL MOL file.\\
     MCc(0.5 ,0.5 )(?6)
   endfont
 \end{verbatim}
-\MCFstructure
+\MCFgraph
 %-----------------------------------------------------------------------------
 \subsection{Function MCf()}
 \begin{verbatim}
@@ -1002,7 +1035,7 @@ pk font,PNG,SVG,EPS or MDL MOL file.\\
     MCf(<30,Ph)
   endfont
 \end{verbatim}
-\MCFstructure
+\MCFgraph
 \begin{verbatim}
 
   beginfont()
@@ -1011,7 +1044,7 @@ pk font,PNG,SVG,EPS or MDL MOL file.\\
     MCf(<90,Ph,3:/F,4:/Cl)
   endfont
 \end{verbatim}
-\MCFstructure
+\MCFgraph
 \begin{verbatim}
 
   (Draw molecule fit to font width)
@@ -1022,7 +1055,7 @@ pk font,PNG,SVG,EPS or MDL MOL file.\\
     MCf(<30,Ph)
   endfont
 \end{verbatim}
-\MCFstructure
+\MCFgraph
 \begin{verbatim}
 
   beginfont()
@@ -1031,7 +1064,7 @@ pk font,PNG,SVG,EPS or MDL MOL file.\\
     MCf(<30,Ph,3:/F,4:/Cl)
   endfont
 \end{verbatim}
-\MCFstructure
+\MCFgraph
 %-----------------------------------------------------------------------------
 \newpage
 \subsection{Function EXT()}
@@ -1085,7 +1118,7 @@ beginfont()
  %---------------------------------------
 endfont
 \end{verbatim}
-\MCFstructure
+\MCFgraph
 %-----------------------------------------------------------------------------
 \newpage
 \subsection{Function ext()}
@@ -1131,7 +1164,7 @@ beginfont()
  %---------------------------------------
 endfont
 \end{verbatim}
-\MCFstructure
+\MCFgraph
 \begin{verbatim}
 label:
  defaultfont: label font
@@ -1152,14 +1185,14 @@ drawarrow & drawdblarrow:
   <30,Ph,2:N,1:/Cl,
      4:\,!,N,/_,!,/_,!!,N,!,CN
 \end{verbatim}
-\MCFstructure
+\MCFgraph
 %-----------------------------------------------------------------------------
 \subsection{Fenitrothion}
 \begin{verbatim}
   <30,!,O,!,P,//S,/O!^160,!,O,!,
       |,Ph,3:/_,4:/NO2
 \end{verbatim}
-\MCFstructure
+\MCFgraph
 %-----------------------------------------------------------------------------
 \subsection{Permethrin}
 \begin{verbatim}
@@ -1168,7 +1201,7 @@ drawarrow & drawdblarrow:
      3:\,//O,!,O,!2,Ph,
     -4:\,O,-60,Ph
 \end{verbatim}
-\MCFstructure
+\MCFgraph
 %-----------------------------------------------------------------------------
 \subsection{Endosulfan}
 \begin{verbatim}
@@ -1176,7 +1209,7 @@ drawarrow & drawdblarrow:
       10=d,{3,5}:O,4:S,4://O,
       {8,9,10,11,12^-210,12^-150}:/Cl
 \end{verbatim}
-\MCFstructure
+\MCFgraph
 %-----------------------------------------------------------------------------
 \subsection{Luciferin}
 \begin{verbatim}
@@ -1184,7 +1217,7 @@ drawarrow & drawdblarrow:
      {9,14}:N,{7,11}:S,
      1:/OH,-2:*/COOH
 \end{verbatim}
-\MCFstructure
+\MCFgraph
 %-----------------------------------------------------------------------------
 \subsection{Warfarin}
 \begin{verbatim}
@@ -1192,7 +1225,7 @@ drawarrow & drawdblarrow:
   10:O,7:/OH,9://O,
   8:\,/Ph`1,60,!,//O,!
 \end{verbatim}
-\MCFstructure
+\MCFgraph
 %-----------------------------------------------------------------------------
 \subsection{Limonin}
 \begin{verbatim}
@@ -1203,7 +1236,7 @@ drawarrow & drawdblarrow:
   {1^60,5^180,16^60}:/*H,
   14:\*,|,?5,{1,4}=dl,3:O
 \end{verbatim}
-\MCFstructure
+\MCFgraph
 %-----------------------------------------------------------------------------
 \subsection{Sesamine}
 \begin{verbatim}
@@ -1212,7 +1245,7 @@ drawarrow & drawdblarrow:
  5:*\^-12,Ph,-3=?5,{-1,-3}:O,
  8:*\^-12,Ph,-3=?5,{-1,-3}:O
 \end{verbatim}
-\MCFstructure
+\MCFgraph
 %-----------------------------------------------------------------------------
 \subsection{Colchicine}
 \begin{verbatim}
@@ -1221,7 +1254,7 @@ drawarrow & drawdblarrow:
   {-1,-4,-6}=dl,-2://O,-3:/O!,
   9:\,NH,!,//O,!
 \end{verbatim}
-\MCFstructure
+\MCFgraph
 %-----------------------------------------------------------------------------
 \subsection{Lycorine}
 \begin{verbatim}
@@ -1232,7 +1265,7 @@ drawarrow & drawdblarrow:
   9:/*H^180,10:*/H^60,
   13:*/OH,14:/*OMe
 \end{verbatim}
-\MCFstructure
+\MCFgraph
 %-----------------------------------------------------------------------------
 \subsection{Gibberellin}
 \begin{verbatim}
@@ -1243,7 +1276,7 @@ drawarrow & drawdblarrow:
   2:/COOH,7://_,13:*/OH,8:/*OH,
   14:*/_,{1,4}:*/H^60
 \end{verbatim}
-\MCFstructure
+\MCFgraph
 %-----------------------------------------------------------------------------
 \subsection{Quinine}
 \begin{verbatim}
@@ -1253,7 +1286,7 @@ drawarrow & drawdblarrow:
    4:*\,!!,
    2:@,165~zf,60,5~zb:#
 \end{verbatim}
-\MCFstructure
+\MCFgraph
 %-----------------------------------------------------------------------------
 \subsection{Atoropin}
 \begin{verbatim}
@@ -1262,7 +1295,7 @@ drawarrow & drawdblarrow:
   |,?7,6:*\^190`1.02,N,/_,3~wb:#,
   $3:*\*,!,OH
 \end{verbatim}
-\MCFstructure
+\MCFgraph
 %-----------------------------------------------------------------------------
 \subsection{Rotenone}
 \begin{verbatim}
@@ -1271,7 +1304,7 @@ drawarrow & drawdblarrow:
   {2,13,16}:O,10://O,{11^-60,12^60}:*/H,
   {-2,-3}:/O!,1:*\,/_,!!
 \end{verbatim}
-\MCFstructure
+\MCFgraph
 %-----------------------------------------------------------------------------
 \subsection{Pyrethrin I}
 \begin{verbatim}
@@ -1279,7 +1312,7 @@ drawarrow & drawdblarrow:
   1:*\,!!,iPr,2:\*,//O,!,O,-36~zb,|,
   ?5,-2=d,-1:/_,-3://O,-2\,!4,{-1,-3}=dl
 \end{verbatim}
-\MCFstructure
+\MCFgraph
 %-----------------------------------------------------------------------------
 \subsection{Validamycin}
 \begin{verbatim}
@@ -1287,7 +1320,7 @@ drawarrow & drawdblarrow:
   $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
+\MCFgraph
 %-----------------------------------------------------------------------------
 \subsection{Paclitaxel}
 \begin{verbatim}
@@ -1300,7 +1333,7 @@ drawarrow & drawdblarrow:
   7:\*,O,-45,//O,60,Ph,11:*\,O,-60,//O,60,
  12:\*^-15,O,60,//O,-60
 \end{verbatim}
-\MCFstructure
+\MCFgraph
 %-----------------------------------------------------------------------------
 \onecolumn
 \section{Example to use mcf2graph}
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 0920ba4f397..7de9f61cbf2 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 83777181665..b304448937c 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    2018.11.11
+% Example of  MCF typest with LuaLaTeX(luamplib)     by A.Yamaji    2019.01.03
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%% mcf2graph.mf it must be version 4.34 or later
+%%% mcf2graph.mf it must be version 4.35 or later
 \documentclass{article}
 %------------------------------------------------------------------------------
 \usepackage{luamplib}%
@@ -9,15 +9,17 @@
 \usepackage{textcomp}%
 \mplibcodeinherit{enable}%
 \mplibverbatim{enable}%
-\everymplib{if unknown Ph1: input mcf2graph.mf; fi
-            sw_aux_out:=1;
-            sw_label_emu:=1;
-            sw_font_frame:=4;
-            max_bond_length:=4.5mm;
-            defaultfont:="uhvr8r";
-            defaultsize:=8bp;
-            defaultscale:=1;
-           }%
+\mplibnumbersystem{double}%
+\everymplib{%
+  if unknown Ph1: input mcf2graph.mf; fi
+  sw_aux_out:=1;
+  sw_label_emu:=1;
+  sw_font_frame:=4;
+  max_bond_length:=4.5mm;
+  defaultfont:="uhvr8r";
+  defaultsize:=8bp;
+  defaultscale:=1;
+}%
 %------------------------------------------------------------------------------
 \pagestyle{empty}
 \topmargin=-20mm