mcf2graph (16jan16)

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

11 files changed, 42 insertions, 46 deletions

diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/README b/Master/texmf-dist/doc/metapost/mcf2graph/README
index 78aaceffbd9..25c92a2d031 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    : 3.77   2015-12-26
+ version    : 3.78   2016-01-16
  E-mail     : akira.yamaji5@gmail.com
  Located at : http://www.ctan.org/pkg/mcf2graph
 ********************************************************************************
@@ -123,3 +123,4 @@
  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 6a08818791a..d1f3a7d7e14 100644
--- a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_exa_soc.mf
+++ b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_exa_soc.mf
@@ -1,5 +1,5 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Molecular Coding Format for mcf_example.tex  by Akira Yamaji    2015.9.25
+% Molecular Coding Format for mcf_example.tex  by Akira Yamaji    2016.01.16
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 input mcf2graph.mf;
 %-------------------------------------------------------------------------
@@ -221,12 +221,12 @@ beginfont("EN:Cholesterol")
      1:*/OH,@(4,12)*/Me^60,
      10:/*H^180,@(11,-1)/*H^-60,9:*/H^60,-1\^17,/*Me,!4,/Me,!)
 endfont
-%*******************************************************************************
+%***************************************************************************
 beginfont("EN:Lycorine")
   MCf(<30,Ph,-4=?6,-2=?6,6=?5,(9,12)=?5[3],13=dl,8:N,@(15,17)O,
     9:/*H^180,10:*/H^60,13:*/OH,14:/*OH)
 endfont
-%*******************************************************************************
+%**************************************************************************
 beginfont("EN:Tetrodotoxine")
   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~ov,#8*,-15~ov,O,&#12,},#9*,45,-60,OH,1^120://NH,
@@ -326,14 +326,12 @@ endfont;
 %***************************************************************************
 beginfont("EN:Rotenone");
   MCf(<-60,?5,$(-3,-2,-3,-4)?6,$(7,9,-2,-4)dl,$(3,17)dr,
-   @(2,13,16)O,10://O,@(11^-60,12^60)*/H,
-   @(-2,-3)/OMe,1*\,/Me,!~dl)
+   @(2,13,16)O,10://O,@(11^-60,12^60)*/H,@(-2,-3)/OMe,1*\,/Me,!~dl)
 endfont;
 %***************************************************************************
 beginfont("EN:Pyrethrin I");
   MCf(<30,?3,@(3^35~wf,3^-35~zf)/Me,1*\,!~dl,iPr,
-     2\*,//O,!,O,-36~zb,|,?5,-2=d,-1:/Me,-3://O,
-     -2\,!4,$(-1,-3)dl)
+     2\*,//O,!,O,-36~zb,|,?5,-2=d,-1:/Me,-3://O,-2\,!4,$(-1,-3)dl)
 endfont;
 %***************************************************************************
 beginfont("EN:Erythromycin");
@@ -348,21 +346,17 @@ 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,
     @(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)
+    #7\*,O,-45,//O,60,Ph,#11*\,O,-60,//O,60,#12\*^-15,O,60,//O,-60)
 endfont
 %**************************************************************************
 beginfont("EN:Mevastatin")
   MCf(<30,?6,2=d,4:*/H^60,|,-4=?6,2=dl,9:*/Me,
-     #10*\,!,60~wb,|,?6,6:O,-2://O,-4:/*OH,
-     #5\*,O,60,//O,!,*/Me,!2)
+     #10*\,!,60~wb,|,?6,6:O,-2://O,-4:/*OH,#5\*,O,60,//O,!,*/Me,!2)
 endfont
 %***************************************************************************
 beginfont("EN:Sesamine")
   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")
@@ -377,14 +371,12 @@ endfont
 %***************************************************************************
 beginfont("EN:Quinine")
   MCf(<30,Ph,3=Ph,7:N,6:/OMe,
-    10\,*/OH,/H~zf^-60,!,
-    |,?6,2:N,1:*/H^60,4*\,!~dr,2*,165~zf,60,&5~zb)
+    10\,*/OH,/H~zf^-60,!,|,?6,2:N,1:*/H^60,4*\,!~dr,2*,165~zf,60,&5~zb)
 endfont
 %***************************************************************************
 beginfont("EN:Atoropin")
   MCf(<-30,O,!,//O,!,!,Ph,
-     #1\~zb^-120,|,?7`1.1,6*\^190`1.25,N,/Me,&3~wb,
-     #3\~wv,!,OH)
+     #1\~zb^-120,|,?7`1.1,6*\^190`1.25,N,/Me,&3~wb,#3\~wv,!,OH)
 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 a3ddf032288..e301759a3b7 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 09ff95cb23e..c5d8f9413d5 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  2015.12.26
+% Example of MCF typeset by LaTeX   mcf_examples.tex   by A.Yamaji  2016.1.16
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \documentclass[a4paper]{article}
 \usepackage{graphicx}
@@ -58,7 +58,7 @@
 \begin{document}
 \begin{center}
  {\LARGE\bf Molecular Coding Format examples}\vspace{5mm}\\
- Author : Akira Yamaji \quad Date : 2015.12.26\\
+ Author : Akira Yamaji \quad Date : \today\\
  Located at : http://www.ctan.org/pkg/mcf2graph\vspace{7mm}\\
 \end{center}
 \fontnum=1%
diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_man_soc-031.eps b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_man_soc-031.eps
index a0226f0b68d..eaab8f569eb 100644
--- a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_man_soc-031.eps
+++ b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_man_soc-031.eps
@@ -2,7 +2,7 @@
 %%BoundingBox: 47 13 112 86 
 %%HiResBoundingBox: 47.18906 13.67542 111.88002 85.53699 
 %%Creator: MetaPost 1.999
-%%CreationDate: 2015.11.14:0846
+%%CreationDate: 2016.01.16:0956
 %%Pages: 1
 %%BeginProlog
 %%EndProlog
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 479f8933924..b7de1e5b2e6 100644
--- a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_man_soc.mf
+++ b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_man_soc.mf
@@ -1,5 +1,5 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Molecular Coding Format file for mcf_manual.tex by Akira.Yamaji 2015.12.26
+% Molecular Coding Format file for mcf_manual.tex by Akira.Yamaji 2016.01.16
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 input mcf2graph.mf;
 %------------------------------------------------------------------------
diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.pdf b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.pdf
index 5fdae43c638..b1c0f3ff828 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 f2b970023e6..514395af805 100644
--- a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.tex
+++ b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.tex
@@ -1,12 +1,12 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%  Molecular Coding Format manual      by  Akira Yamaji 2015.12.26
+%  Molecular Coding Format manual      by  Akira Yamaji 2016.01.16
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \documentclass[a4paper]{article}
 \usepackage[dvipdfmx]{graphicx}
 %%%%\usepackage[pdftex]{graphicx}
 %%%%\usepackage{epstopdf}
 \topmargin=-20mm
-\textheight=27.5cm
+\textheight=25.5cm
 \textwidth=16.8cm
 \oddsidemargin=0mm
 \unitlength=1mm%
@@ -31,7 +31,7 @@
 \begin{document}
 \begin{center}
  {\LARGE\bf Molecular Coding Format manual}\vspace{3mm}\\
- Author : Akira Yamaji \quad Date : 2015.12.26\\
+ Author : Akira Yamaji \quad Date : \today\\
  Located at : http://www.ctan.org/pkg/mcf2graph\\
 \end{center}
 \hspace{8mm}%
@@ -44,12 +44,11 @@
 \end{minipage}\vspace{3mm}\\
 \linethickness{0.08mm}%
 %----------------------------------------------------------------------------
-\pagestyle{empty}%
 \noindent%
 \begin{minipage}[t][38mm]{90mm}
 \MCFtitle{Chain}
 \begin{verbatim}
-plus(+):anticlockwize,minus(-)clockwize
+plus(+):anticlockwize,minus(-):clockwize
 ! : take value depend on
         current angle and enviroment
 
@@ -78,7 +77,7 @@ six membered ring
 \begin{minipage}[t][38mm]{90mm}
 \MCFtitle{Rotate current angle}
 \begin{verbatim}
-<angle:rotate current angle
+<angle : rotate current angle
 
    <30,!4,<30,?6
 
@@ -92,8 +91,8 @@ six membered ring
 \begin{minipage}[t][38mm]{90mm}
 \MCFtitle{Change bond type (1)}
 \begin{verbatim}
-~bond change bond 
-  dm:double,dl:double(left),dr:double(right),
+~bond : change bond 
+  dm:double,dl:double left,dr:double right,
   wf:wedge forward,wb:wedge backward,
   zf:wedge dotted,zb:wedge dotted backward
 
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 0e439462c87..0d885003288 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 d64e2d550ff..e88784ae5a7 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   2015.9.25
+% Example of  MCF typest with LuaLaTeX(luamplib)       by A.Yamaji   2016.1.16
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \documentclass{article}
 %------------------------------------------------------------------------------
@@ -55,19 +55,23 @@
 \pagestyle{empty}
 \topmargin=-25mm
 \oddsidemargin=0mm
-\textwidth=180mm
+\textwidth=160mm
 \textheight=280mm
 \unitlength=1mm
 %------------------------------------------------------------------------------------
 \begin{document}
-{\Large\bf MCF example for luamplib(Lua\LaTeX) }%
-   \hspace{10mm} by Akira Yamaji  2015.9.25\vspace{6mm}\\
+\begin{center}
+ {\LARGE\bf MCF example for luamplib(Lua\LaTeX)}\vspace{5mm}\\
+ Author : Akira Yamaji \quad Date : \today\\
+ Located at : http://www.ctan.org/pkg/mcf2graph\vspace{2mm}\\
+\end{center}
+\noindent%
 %------------------------------------------------------------------------------------
 {{\small {\tt FM(C) :} molecular formula calculated by mcf2graph}\\
 {{\small {\tt MW(C) :} molecular weight calculated by mcf2graph}\\
 {{\small {\tt MW(D) :} molecular weight from literature data}\\
 \begin{mplibcode}
-  font_wd:=100mm; font_ht:=50mm;
+  font_wd:=90mm; font_ht:=45mm;
   beginfont("NO:1","EN:Chlorophyll a","MW:893.49")
     MCf(<54,
    {,``1,?5,$(2,5)d,4:N,3\,54~dl,|,?5,$(2,4)d,5:N,
@@ -80,10 +84,10 @@
   endfont
 \end{mplibcode}
 \input{temp-info.aux}%
-\MOLcaption{0mm}{40mm}\hspace{8mm}%
+\MOLcaption{0mm}{35mm}\hspace{8mm}%
 %----------------------------------------------------------------------------
 \begin{mplibcode}
-  font_wd:=60mm; font_ht:=35mm;
+  font_wd:=40mm; font_ht:=35mm;
   beginfont("NO:2","EN:Limonin","MW:470.51")
   MCf(<30,
     ?6,$(-3,-4)?6,-5=?3,-2=wf,-1=wb,6=?5,-4=?6,-5=wf,
@@ -94,7 +98,7 @@
   endfont
 \end{mplibcode}
 \input{temp-info.aux}%
-\MOLcaption{0mm}{48mm}\vspace{6mm}\\%
+\MOLcaption{0mm}{45mm}\vspace{6mm}\\%
 %----------------------------------------------------------------------------
 \begin{mplibcode}
   font_wd:=90mm; font_ht:=30mm;
@@ -124,7 +128,7 @@ endfont;
 \MOLcaption{0mm}{38mm}\vspace{5mm}\\%
 %----------------------------------------------------------------------------
 \begin{mplibcode}
-font_wd:=60mm; font_ht:=70mm;
+font_wd:=60mm; font_ht:=60mm;
 beginfont("NO:5","EN:Erythromycin","MW:733.93");
   MCf(<30,
     {,``1,<-120,60,60,60,-60,60,60,-60,60,60,60,-60,60,60,},&1,
@@ -136,7 +140,7 @@ beginfont("NO:5","EN:Erythromycin","MW:733.93");
   endfont;
 \end{mplibcode}
 \input{temp-info.aux}%
-\MOLcaption{20mm}{56mm}\hspace{8mm}%
+\MOLcaption{30mm}{52mm}\hspace{8mm}%
 %----------------------------------------------------------------------------
 \begin{mplibcode}
 font_wd:=90mm; font_ht:=55mm;
@@ -156,10 +160,10 @@ beginfont("NO:6","EN:Vancomycin","MW:1449.25");
 endfont;
 \end{mplibcode}
 \input{temp-info.aux}%
-\MOLcaption{52mm}{58mm}\vspace{6mm}\\%
+\MOLcaption{55mm}{50mm}\vspace{6mm}\\%
 %----------------------------------------------------------------------------
 \begin{mplibcode}
-  font_wd:=150mm; font_ht:=80mm;
+  font_wd:=150mm; font_ht:=70mm;
   beginfont("NO:7","EN:Maitotoxin","MW:3425.86")
   MCf(<55.8,?6,-4=?7 ,$(-4,-3,-3,-3)?6,-3\,!3,?6,$(-4,-3,-3,-3)?6,
     -3\,?6,-3=?6,-3\,!3,60,<-30,?6,-3=?6,
@@ -182,6 +186,6 @@ endfont;
   endfont
 \end{mplibcode}
 \input{temp-info.aux}%
-\MOLcaption{0mm}{53mm}\\%
+\MOLcaption{110mm}{70mm}\\%
 %----------------------------------------------------------------------------
 \end{document}
diff --git a/Master/texmf-dist/metapost/mcf2graph/mcf2graph.mf b/Master/texmf-dist/metapost/mcf2graph/mcf2graph.mf
index 66e0e677619..c8d36c276d7 100644
--- a/Master/texmf-dist/metapost/mcf2graph/mcf2graph.mf
+++ b/Master/texmf-dist/metapost/mcf2graph/mcf2graph.mf
@@ -1,5 +1,5 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% mcf2graph ver 3.77       Copyright (c) 2013-2015  Akira Yamaji
+% mcf2graph ver 3.78       Copyright (c) 2013-2016  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,
@@ -30,7 +30,7 @@
 % Set output checklist            : mpost -s ahlength=2 FILENAME
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 tracingstats:=1;
-message " This is mcf2graph ver 3.7  2015.12";
+message " This is mcf2graph ver 3.7  2016.1";
 %-------------------------------------------------------------------------------------------------
 pair    posB[],posA[],pairT,Ls,Le,pairA;
 numeric angB[],angA[],br_ang[],sB[],eB[],f_FON[],atom_w[],atom_h[],atom_d[],strA[],stkB[],stkA[],