mcf2graph (7feb16)

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

9 files changed, 98 insertions, 52 deletions

diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/CHANGELOG b/Master/texmf-dist/doc/metapost/mcf2graph/CHANGELOG
new file mode 100644
index 00000000000..1c83bd84c19
--- /dev/null
+++ b/Master/texmf-dist/doc/metapost/mcf2graph/CHANGELOG
@@ -0,0 +1,63 @@
+*******************************************************************************
+ Changelog of mcf2graph
+*******************************************************************************
+[ver. 3.80  / 2016-02-06]
+  add new command || , divide CHANGELOG from README and change e-mail address
+
+[ver. 3.78  / 2016-01-16]
+  update MCF syntax manual and MCF luamplib example
+
+[ver. 3.76  / 2015-11-28]
+  update MCF syntax manual and MCF example
+
+[ver. 3.75  / 2015-10-17]
+  fix bug in command **
+
+[ver. 3.74  / 2015-10-03]
+  improve bond infomation of checklist
+
+[ver. 3.72  / 2015-09-22]
+  change command ^^ to <  and delete ^^
+
+[ver. 3.71  / 2015-09-18]
+  delete command !!,??
+
+[ver. 3.70  / 2015-09-16]
+  add new command | ,change syntax of !,!!,?,??
+
+[ver. 3.63  / 2015-09-14]
+  add command option of numbering address,update MCF syntax manual
+
+[ver. 3.62  / 2015-09-07]
+  improve numbering bond, numbering atom, update MCF syntax manual
+
+[ver. 3.61  / 2015-09-01]
+  fix bug in local setting of font_wd# and font_ht#
+
+[ver. 3.59  / 2015-08-23]
+  update MCF syntax manual
+
+[ver. 3.58  / 2015-08-18]
+  improve calculation of molecular formula and weight
+
+[ver. 3.57  / 2015-08-14]
+  improve AUX file format
+
+[ver. 3.55  / 2015-08-04]
+  support luamplib(v2.11), renew mcf_mplib_exa.tex
+
+[ver. 3.54  / 2015-08-03]
+  maximum item number of MOLinfo can be changed
+
+[ver. 3.53  / 2015-07-29]
+  support luamplib(LuaLaTeX)
+
+[ver. 3.52  / 2015-07-20]
+  '!!4`2' can use as '{,``2,!4,}'
+
+[ver. 3.51  / 2015-07-19]
+  '?6`2' can use as '{,``2,?6,}'
+
+[ver. 3.50  / 2015-07-11]
+  first version uploaded to ctan.
+******************************************************************************
diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/README b/Master/texmf-dist/doc/metapost/mcf2graph/README
index 25c92a2d031..3755cb4e70c 100644
--- a/Master/texmf-dist/doc/metapost/mcf2graph/README
+++ b/Master/texmf-dist/doc/metapost/mcf2graph/README
@@ -1,8 +1,8 @@
 ********************************************************************************
  mcf2graph  : Convert Molecular Coding Format to graphics with Metafont/Metapost
  Author     : Akira Yamaji
- version    : 3.78   2016-01-16
- E-mail     : akira.yamaji5@gmail.com
+ version    : 3.80   2016-02-06
+ E-mail     : mcf2graph@gmail.com
  Located at : http://www.ctan.org/pkg/mcf2graph
 ********************************************************************************
 
@@ -16,18 +16,19 @@
 
 2. The distribution of software
  ( 1) README                 This file
- ( 2) mcf2graph.mf           Macro of Metafont / Metapost
- ( 3) mcf_manual.tex         MCF syntax manual(LaTeX file)
- ( 4) mcf_man_soc.mf         Molecular difinition file for mcf_manual.tex
- ( 5) mcf_man_soc-031.eps    No.31 EPS(with color) file of (4)
- ( 6) mcf_manual.pdf         PDF of (3) (used LaTeX,dvipdfmx)
- ( 7) mcf_example.tex        LaTeX example,
+ ( 2) CHANGELOG              Changelog file of mcf2graph
+ ( 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-031.eps    No.31 EPS(with color) file of (4)
+ ( 7) mcf_manual.pdf         PDF of (4) (used LaTeX,dvipdfmx)
+ ( 8) mcf_example.tex        LaTeX example,
                                Make 'mcf_exa_soc-info.aux' before typeset
                                mpost -s ahangle=0 mcf_exa_soc.mf
- ( 8) mcf_exa_soc.mf         Molecular difinition file for mcf_example.tex
- ( 9) mcf_example.pdf        PDF of (7) (used LaTeX,dvipdfmx)
- (10) mcf_mplib_exa.tex      luamplib v2.11(LuaLaTeX) example
- (11) mcf_example.pdf        PDF of (10) typeset with LuaTeX(LuaLaTeX)
+ ( 9) mcf_exa_soc.mf         Molecular difinition file for mcf_example.tex
+ (10) mcf_example.pdf        PDF of (8) (used LaTeX,dvipdfmx)
+ (11) mcf_mplib_exa.tex      luamplib v2.11(LuaLaTeX) example
+ (12) mcf_example.pdf        PDF of (11) typeset with LuaTeX(LuaLaTeX)
 
 3. How to use mcf2graph with Metapost
  ( 1) mpost -s ahangle=0  FILENAME  output no graphic file.
@@ -101,26 +102,4 @@
  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  THE SOFTWARE.
 
-8. Changelog
- ver. 3.50  / 2015-07-11   first version uploaded to ctan.
- ver. 3.51  / 2015-07-19   '?6`2' can use as '{,``2,?6,}'
- ver. 3.52  / 2015-07-20   '!!4`2' can use as '{,``2,!4,}'
- ver. 3.53  / 2015-07-29   support luamplib(LuaLaTeX)
- ver. 3.54  / 2015-08-03   maximum item number of MOLinfo can be changed
- ver. 3.55  / 2015-08-04   support luamplib(v2.11), renew mcf_mplib_exa.tex
- ver. 3.57  / 2015-08-14   improve AUX file format
- ver. 3.58  / 2015-08-18   improve calculation of molecular formula and weight
- ver. 3.59  / 2015-08-23   update MCF syntax manual
- ver. 3.61  / 2015-09-01   fix bug in local setting of font_wd# and font_ht#
- ver. 3.62  / 2015-09-07   improve numbering bond, numbering atom,
-                           update MCF syntax manual
- ver. 3.63  / 2015-09-14   add command option of numbering address,
-                           update MCF syntax manual
- ver. 3.70  / 2015-09-16   add new command | ,change syntax of !,!!,?,??
- ver. 3.71  / 2015-09-18   delete command !!,??
- ver. 3.72  / 2015-09-22   change command ^^ to <  and delete ^^
- ver. 3.73  / 2015-09-25   '&#n' can use as '&(#n)'
- ver. 3.74  / 2015-10-03   improve bond infomation of checklist
- ver. 3.75  / 2015-10-17   fix bug in command **
- ver. 3.76  / 2015-11-28   update MCF syntax manual and MCF example
- ver. 3.78  / 2016-01-16   update MCF syntax manual and MCF luamplib example
+%----------------------------------------------------------------------------
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 d1f3a7d7e14..d0e05dea883 100644
--- a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_exa_soc.mf
+++ b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_exa_soc.mf
@@ -17,7 +17,7 @@ sw_start_vector:=0;
 %%%%sw_info_weight:=1;
 %%%%sw_checklist:=1;
 %%%%sw_MOLfile:=1;
-%****************************************************************************
+%***************************************************************************
 beginfont("EN:Acetamiprid")
   MCf(<30,Ph,4\,!,NH,!,!~dr,N,!,CN)
 endfont
@@ -65,7 +65,7 @@ endfont
 %***************************************************************************
 beginfont("EN:Oxine-Copper")
   MCf(Ph,4:N,5=Ph,-4\,O,-60,<90,Cu,-90,O,60,|,Ph,5=Ph,10:N,
-     #4*,&#12~vf,#23*,&#12~vf)
+     ||,4*,&12~vf,23*,&12~vf)
 endfont
 %***************************************************************************
 beginfont("EN:Captan")
@@ -165,7 +165,7 @@ endfont
 %***************************************************************************
 beginfont("EN:Rifampicin")
   MCf(<30,
-     Ph,6:/Me^30,5:/OH,|,-6=?5,1:O,3://O,2:/*Me^60,|,#3=?6,@(2,4)d,@(1,4)/OH,
+     Ph,6:/Me^30,5:/OH,|,-6=?5,1:O,3://O,2:/*Me^60,|,-8=?6,@(2,4)d,@(1,4)/OH,
      {,``1,-2\,NH,60,//O,-60,/Me,60~dl,60,60~dl,-60,
       */Me,60,/*OH,-60,/*Me,60,/*OH,60,*/Me^30,-60,
       60,/*Me^30,-53,/*OMe,66,-53~dl,66`1.2,O,},&#8,
@@ -343,7 +343,7 @@ MCf(<30,{,``1,<-120,60,60,60,-60,60,60,-60,60,60,60,-60,60,60,},&1,
 endfont;
 %**************************************************************************
 beginfont("EN:Paclitaxel")
-  MCf({,?6,5=d,3*,{,``1,36,45,45,45,45,},&#5,#9=?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)/Me,@(3^-60,15)*/OH,8:/*H^-60,9:*/Me^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)
@@ -360,9 +360,9 @@ beginfont("EN:Sesamine")
 endfont
 %**************************************************************************
 beginfont("EN:Morphine")
-  MCf(<30,Ph,2=?6,-4=?6,(#1,#12)=?5[2],-1:O,-1=zb,
+  MCf(<30,Ph,2=?6,-4=?6,(1,12)=?5[2],-1:O,-1=zb,
     7*,60~wf`0.75,70~ov`1.3,45,N,/Me,&9~wb,
-    15=d,6:/OH,8^180:*/H,12:/*OH)
+    15=dl,6:/OH,8^180:*/H,12:/*OH)
 endfont
 %**************************************************************************
 beginfont("EN:Capsaicin")
diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_example.pdf b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_example.pdf
index e301759a3b7..686e34edde9 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 c5d8f9413d5..74100ffce45 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  2016.1.16
+% Example of MCF typeset by LaTeX   mcf_examples.tex   by A.Yamaji  2016.2.06
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \documentclass[a4paper]{article}
 \usepackage{graphicx}
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 b7de1e5b2e6..67f9a314c70 100644
--- a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_man_soc.mf
+++ b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_man_soc.mf
@@ -56,7 +56,7 @@ endfont
 %***********************************************************************
 beginfont("EN:change bond length3")
   sw_start_vector:=1;
-  MCf(<30,?6,3\,|,?6`1.2,4=?6)
+  MCf(<30,?6,3\,?6`1.2,11=?6)
 endfont
 %***********************************************************************
 beginfont("EN:change atom 1")
@@ -77,9 +77,8 @@ beginfont("EN:change atom 3")
 endfont
 %***********************************************************************
 beginfont("EN:change atom 4")
-  MCd(.5,.5)(.5,.9)(?6,4\,|,?6,2:N)
-  sw_numberA:=2;
-  numberA_start:=7;
+  MCd(.5,.5)(.5,.9)(?6,4\,|,?6,2:N,||,@(2,6)O)
+  sw_numberA:=1;
   MCd(.5,.5)(.5,.1)(?6,4\,?6)
 endfont
 %***********************************************************************
diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.pdf b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.pdf
index b1c0f3ff828..7035e8d2219 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 514395af805..d48fed43a5b 100644
--- a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.tex
+++ b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.tex
@@ -1,5 +1,5 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%  Molecular Coding Format manual      by  Akira Yamaji 2016.01.16
+%  Molecular Coding Format manual      by  Akira Yamaji 2016.02.06
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \documentclass[a4paper]{article}
 \usepackage[dvipdfmx]{graphicx}
@@ -144,7 +144,7 @@ Bn`length : change bond length at Bn
 \begin{verbatim}
 ?n`length : change ring length
 
-  <30,?6,3\,|,?6`1.2,4=?6
+  <30,?6,3\,?6`1.2,11=?6
 \end{verbatim}
 \end{minipage}
 \MCFstructure
@@ -169,7 +169,7 @@ Insert hetero atom
 
   <30,!6,2:O,@(3,5)N
 
-An(n:numeric): atom number
+An(-999<=n<=4095): atom number
 \end{verbatim}
 \end{minipage}
 \MCFstructure
@@ -191,9 +191,10 @@ An(n:numeric): atom number
 \begin{verbatim}
 2:N : change A2(brock address) C to N
 
-?6,4\,|,?6,2:N
+?6,4\,|,?6,2:N,||,@(2,6)O
 
-| : divide brock
+|  : divide brock
+|| : reset brock adress
 \end{verbatim}
 \end{minipage}
 \MCFstructure
@@ -205,6 +206,8 @@ An(n:numeric): atom number
 #2:N : change A#2 C to N
 
   ?6,4\,|,?6,#2:N
+
+#n : (1<=n<=3095)
 \end{verbatim}
 \end{minipage}
 \MCFstructure
@@ -216,6 +219,8 @@ An(n:numeric): atom number
 -2:N : change A(-2) C to N
 
   ?6,4\,?6,-2:N
+
+-n : (1<=n<=999)
 \end{verbatim}
 \end{minipage}
 \MCFstructure
@@ -228,7 +233,7 @@ An(n:numeric): atom number
 
   ?6,3=?5
 
-Bn(n:numeric): bond number
+Bn(n:-999<=n<=4095): bond number
 \end{verbatim}
 \end{minipage}
 \MCFstructure
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 0d885003288..cd25913dea7 100644
--- a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_mplib_exa.pdf
+++ b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_mplib_exa.pdf