mcf2graph (23jun19)

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

10 files changed, 100 insertions, 174 deletions

diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/CHANGELOG b/Master/texmf-dist/doc/metapost/mcf2graph/CHANGELOG
index 51a235a68b6..57e699c7965 100644
--- a/Master/texmf-dist/doc/metapost/mcf2graph/CHANGELOG
+++ b/Master/texmf-dist/doc/metapost/mcf2graph/CHANGELOG
@@ -1,6 +1,12 @@
 *******************************************************************************
- Changelog of mcf2graph software package          by Akira Yamaji 2019-05-26
+ Changelog of mcf2graph software package          by Akira Yamaji 2019-06-23
 *******************************************************************************
+[ver. 4.43  / 2019-06-23]
+  -add binop for add()
+     a << b : a rotated b
+  -improve embedded font
+  -update MCF manual
+
 [ver. 4.42  / 2019-05-26]
   -add function for add()
      plus     : circled plus
diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/README b/Master/texmf-dist/doc/metapost/mcf2graph/README
index eb58b0df7a7..ccb4b68c70f 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.42 2019-05-26
+ version    : 4.43 2019-06-23
  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 67bb2b2aad6..e7602063f29 100644
--- a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_exa_soc.mf
+++ b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_exa_soc.mf
@@ -1,16 +1,15 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Molecular Coding Format for mcf_example.tex   by Akira Yamaji  2019.05.26
+% Molecular Coding Format for mcf_example.tex   by Akira Yamaji  2019.06.23
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-input mcf2graph.mf;   %%% it must be version 4.42 or later
+input mcf2graph.mf;   %%% it must be version 4.43 or later
 %-------------------------------------------------------------------------
 fsize:=(33mm,24mm);
 max_blength:=4.5mm;
 %-------------------------------------------------------------------------
-sw_select:=1;
-%%%sw_aux_out:=1;
-%%%%sw_font_frame:=1;
-%%%%sw_atom_frame:=1;
-%%%%sw_mol_frame:=1;
+%%%%sw_aux_out:=1;
+%%%%sw_fframe:=1;
+%%%%sw_aframe:=1;
+%%%%sw_mframe:=1;
 %%%% sw_expand:=1;
 var3:="cal_FM";  tag3:="cFM";
 var4:="cal_MW";  tag4:="cMW";
@@ -26,6 +25,9 @@ var4:="cal_MW";  tag4:="cMW";
 %%%% auxtag_out;
 %%%% sw_rep_out:=1;
 %%%% sw_mol_out:=1;
+%%%% atomfont:="uhvb8r";
+%%%% atomfont:="cmtt8";
+%%%% atomfont:="cmvtt10";
 %%%% outputformat:="png"; hppp:=vppp:=0.1; outputtemplate:="%j-%3c.png";
 %***************************************************************************
 beginfont("EN:Acetamiprid","MW:222.676","FM:C10H11ClN4")
@@ -393,21 +395,3 @@ beginfont("EN:Atoropin","MW:289.375")
 endfont
 %***************************************************************************
 bye
-wb:#,$3:/!OH~wv)
-endfont
-%***************************************************************************
-bye
-******************
-bye
-wb:#,$3:/!OH~wv)
-endfont
-%***************************************************************************
-bye
-e
-***********************************
-bye
-e
-e
-********************************
-bye
-e
diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_example.pdf b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_example.pdf
index 128d46905f3..574beea3a3d 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-064.mps b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_man_soc-064.mps
index 70e27e77c68..ff262231486 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 213 57 
 %%HiResBoundingBox: -0.1 -0.1 212.69804 56.79282 
 %%Creator: MetaPost 2.00
-%%CreationDate: 2019.05.11:0740
+%%CreationDate: 2019.06.19:0623
 %%Pages: 1
 %%DocumentResources: procset mpost-minimal
 %%+ font JIZCCV-NimbusSanL-Regu IXTKJB-CMR8
@@ -436,76 +436,77 @@ cleartomark
 %%EndSetup
 %%Page: 1 1
  1 0 0 setrgbcolor
-newpath 54.2302 6.07826 moveto
-54.98193 6.07826 lineto
-54.98193 13.30063 lineto
-54.2302 13.30063 lineto
+newpath 54.14986 5.99792 moveto
+54.9016 5.99792 lineto
+54.9016 13.38094 lineto
+54.14986 13.38094 lineto
  closepath fill
-newpath 60.70082 6.07826 moveto
-61.45256 6.07826 lineto
-61.45256 13.30063 lineto
-60.70082 13.30063 lineto
+newpath 60.78113 5.99792 moveto
+61.53287 5.99792 lineto
+61.53287 13.38094 lineto
+60.78113 13.38094 lineto
  closepath fill
-newpath 55.28262 13.30063 moveto
-54.2302 13.30063 lineto
-60.40013 6.07826 lineto
-61.45256 6.07826 lineto
+newpath 55.20229 13.38094 moveto
+54.14986 13.38094 lineto
+60.48044 5.99792 lineto
+61.53287 5.99792 lineto
  closepath fill
  0 0 1 setrgbcolor
-newpath 54.2302 46.23317 moveto
-54.98193 46.23317 lineto
-54.98193 53.45554 lineto
-54.2302 53.45554 lineto
+newpath 54.14986 46.15283 moveto
+54.9016 46.15283 lineto
+54.9016 53.53584 lineto
+54.14986 53.53584 lineto
  closepath fill
-newpath 60.70082 46.23317 moveto
-61.45256 46.23317 lineto
-61.45256 53.45554 lineto
-60.70082 53.45554 lineto
+newpath 60.78113 46.15283 moveto
+61.53287 46.15283 lineto
+61.53287 53.53584 lineto
+60.78113 53.53584 lineto
  closepath fill
-newpath 55.28262 53.45554 moveto
-54.2302 53.45554 lineto
-60.40013 46.23317 lineto
-61.45256 46.23317 lineto
+newpath 55.20229 53.53584 moveto
+54.14986 53.53584 lineto
+60.48044 46.15283 lineto
+61.53287 46.15283 lineto
  closepath fill
  0 0 0 setrgbcolor
-newpath 86.97878 7.24837 moveto
-87.73051 7.24837 lineto
-87.73051 14.47073 lineto
-86.97878 14.47073 lineto
+newpath 86.89844 7.16803 moveto
+87.65018 7.16803 lineto
+87.65018 14.55104 lineto
+86.89844 14.55104 lineto
  closepath fill
-newpath 93.4494 7.24837 moveto
-94.20114 7.24837 lineto
-94.20114 14.47073 lineto
-93.4494 14.47073 lineto
+newpath 93.52971 7.16803 moveto
+94.28145 7.16803 lineto
+94.28145 14.55104 lineto
+93.52971 14.55104 lineto
  closepath fill
-newpath 88.0312 14.47073 moveto
-86.97878 14.47073 lineto
-93.14871 7.24837 lineto
-94.20114 7.24837 lineto
+newpath 87.95087 14.55104 moveto
+86.89844 14.55104 lineto
+93.22902 7.16803 lineto
+94.28145 7.16803 lineto
  closepath fill
-newpath 95.00368 7.24837 moveto
-95.75542 7.24837 lineto
-95.75542 14.47073 lineto
-95.00368 14.47073 lineto
+newpath 94.92334 7.16803 moveto
+95.67508 7.16803 lineto
+95.67508 14.55104 lineto
+94.92334 14.55104 lineto
  closepath fill
  0 0.75172 dtransform truncate idtransform setlinewidth pop [] 0 setdash
  1 setlinecap 1 setlinejoin 10 setmiterlimit
-newpath 95.37955 10.85956 moveto
-101.85017 10.85956 lineto stroke
-newpath 101.4743 7.24837 moveto
-102.22604 7.24837 lineto
-102.22604 14.47073 lineto
-101.4743 14.47073 lineto
+newpath 95.29921 10.85954 moveto
+101.93048 10.85954 lineto stroke
+newpath 101.55461 7.16803 moveto
+102.30635 7.16803 lineto
+102.30635 14.55104 lineto
+101.55461 14.55104 lineto
  closepath fill
  0 setlinecap
-newpath 103.40445 3.72455 moveto
-107.70834 7.20824 lineto
-108.16013 8.64967 107.06673 10.11005 105.5564 10.08241 curveto
-104.21153 10.0578 103.24103 8.89792 103.27287 7.59808 curveto stroke
-newpath 108.08421 3.23592 moveto
-108.08421 3.98766 lineto
-103.02858 3.98766 lineto
-103.02858 3.23592 lineto
+newpath 103.32411 3.64421 moveto
+103.60684 4.45103 104.14868 5.14159 104.8651 5.60812 curveto
+105.96042 6.32141 107.49776 6.64987 107.74046 7.95448 curveto
+107.96924 9.18422 106.85799 10.2441 105.53229 10.16272 curveto
+104.34424 10.0898 103.397 9.14253 103.32411 7.95448 curveto stroke
+newpath 108.11633 3.15558 moveto
+108.11633 3.90732 lineto
+102.94824 3.90732 lineto
+102.94824 3.15558 lineto
  closepath fill
  0 0.50114 dtransform truncate idtransform setlinewidth pop 1 setlinecap
 newpath 40.45374 19.72816 moveto
@@ -535,16 +536,16 @@ newpath 75.229 19.72816 moveto
 86.09601 13.45413 lineto stroke
 9.22984 46.03944 moveto
 (\(draw\)) uhvr8r 9.96265 fshow
-150.14568 6.07826 moveto
-(N) cmr8 10.56937 fshow
-150.14568 46.23317 moveto
-(N) cmr8 10.56937 fshow
-182.89426 7.24837 moveto
-(N) cmr8 10.56937 fshow
-192.2405 7.24837 moveto
-(H) cmr8 10.56937 fshow
-201.43135 3.21307 moveto
-(2) cmr8 10.56937 fshow
+150.05211 5.99792 moveto
+(N) cmr8 10.80444 fshow
+150.05211 46.15283 moveto
+(N) cmr8 10.80444 fshow
+182.80069 7.16803 moveto
+(N) cmr8 10.80444 fshow
+192.14693 7.16803 moveto
+(H) cmr8 10.80444 fshow
+201.3689 3.13731 moveto
+(2) cmr8 10.80444 fshow
 newpath 136.30315 19.72816 moveto
 149.19687 12.28403 lineto stroke
 newpath 139.89285 21.47943 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 65e65761a6d..31afd36f966 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 2019.05.26
+% Molecular Coding Format file for mcf_manual.tex  by Akira.Yamaji 2019.06.23
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-input mcf2graph.mf;   %% it must be version 4.42 or later
+input mcf2graph.mf;   %% it must be version 4.43 or later
 %------------------------------------------------------------------------
 sw_mframe:=0;
 sw_expand:=0;
@@ -114,10 +114,10 @@ beginfont("EN:Chain 1")
   add(
     defaultscale:=0.5;
     labeloffset:=2bp;
-    drawarrow B7/*.7{B7right}..{B1right}B1/*.7; label.ulft("-30",B7/*.7);
-    drawarrow B8/*.7{B8left}..{B2left}B2/*.7;   label.llft("45",B8/*.7);
-    drawarrow B9/*.7{B9right}..{B3right}B3/*.7; label.ulft("-45",B9/*.7);
-    drawarrow B10/*.7{B10left}..{B4left}B4/*.7; label.llft("30",B10/*.7);
+    drawarrow B7/*.7{B7right}..{B1right}B1/*.7;   label.ulft("-30",B7/*.7);
+    drawarrow B8/*.7{B8left}..{B2left}B2/*.7;     label.llft("45",B8/*.7);
+    drawarrow B9/*.7{B9right}..{B3right}B3/*.7;   label.ulft("-45",B9/*.7);
+    drawarrow B10/*.7{B10left}..{B4left}B4/*.7;   label.llft("30",B10/*.7);
     drawarrow B11/*.7{B11right}..{B5right}B5/*.7; label.ulft("-30",B11/*.7);
     drawarrow B12/*.7{B12left}..{B6left}B6/*.7;   label.llft("60",B12/*.7);
   )
@@ -967,7 +967,7 @@ beginfont("EN:add()")
   add(labeloffset:=.7aw;
       label.top(lonepair 90,A7);
       drawarrow (A7+up**1.2aw){A7left}..{B7right}B7/*0.3;
-      drawarrow B3m{B3right}..A3+(1.5aw,.5aw)..{A3down}A3;
+      drawarrow B3m..A3+B2up**1.5aw..{A3down}A3;
   )
   MCat(1,0)(<30,?6,{1,5}=dl,4://NH2)
   add(labeloffset:=.7aw;
@@ -1129,69 +1129,3 @@ beginfont("EN:Cholesterol","CAS:57-88-5","FM:C27H46O","MW:386.65")
 endfont
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 bye
-%%%%%%%%%%%%%%%%%%%
-bye
-bye
-5}:/_,
-     4:*\^75,NH,!,//O,!,/*NH2,!,Ph)
-endfont
-%***************************************************************************
-beginfont("EN:Cholesterol","CAS:57-88-5","FM:C27H46O","MW:386.65")
-  fsize:=(60mm,15mm);
-  MC(
-    <30,?6,{-4,-2}=?6,-4=?5,7=dl,
-      1:*/OH,{4,12}:*/_^60,9:*/H^60,
-      10:/*H^180,11:/*H^-60,17:/*H^-54,
-      -1:@,18,/*_,-60,!3,/_,!,
-     )
-endfont
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-bye
-%%%%%%%%%%%%%%%%%%%
-bye
-bye
-12:\*^-15,O,60,//O,-60)
-endfont
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-beginfont("EN:Ampicillin","MW:349.405")
-  fsize:=(60mm,15mm);
-  MC(<45,?4,-3=?5,2:N,7:S,
-    {3^45,4^-45}:/*H,1://O^15,5:/*COOH^-18,{6^35,6^-35}:/_,
-     4:*\^75,NH,!,//O,!,/*NH2,!,Ph)
-endfont
-%***************************************************************************
-beginfont("EN:Cholesterol","CAS:57-88-5","FM:C27H46O","MW:386.65")
-  fsize:=(60mm,15mm);
-  MC(
-    <30,?6,{-4,-2}=?6,-4=?5,7=dl,
-      1:*/OH,{4,12}:*/_^60,9:*/H^60,
-      10:/*H^180,11:/*H^-60,17:/*H^-54,
-      -1:@,18,/*_,-60,!3,/_,!,
-     )
-endfont
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-bye
-%%%%%%%%%%%%%%%%%%%
-bye
-bye
-
-bye
-bye
-bye
-%%%
-bye
-bye
-%%%%%%%%%%%%%%%
-bye
-bye
-:@,18,/*_,-60,!3,/_,!,
-     )
-endfont
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-bye
-%%%%%%%%%%%%%%%%%%%
-bye
-bye
-%%%%%%%
-bye
-bye
diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.pdf b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.pdf
index 1b6a29efdef..55094d64389 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 a17dfb80d72..7dea8b88f28 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 2019.05.26
+%  Molecular Coding Format manual                by  Akira Yamaji 2019.06.23
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \documentclass[a4paper]{article}
 %%%%\documentclass[a4paper,twoside]{article}
@@ -37,7 +37,7 @@
 %----------------------------------------------------------------------------
 \MCFformat=-1%   use pkfont
 %%\MCFformat=0%    \includegraphics{jobname-nnn.mps}
-%%\MCFformat=1%    \includegraphics[width=wd{jobname-nnn.png}
+%%\MCFformat=1%    \includegraphics[width=wd{jobname-nnn.png}}
 %%\MCFformat=2%    \includegraphics{jobname-nnn.svg}
 %%\MCFformat=3%    \includegraphics{jobname-nnn.eps}
 %----------------------------------------------------------------------------
@@ -599,10 +599,10 @@ pk font,PNG,SVG,EPS or MDL MOL file.
 \begin{verbatim}
   |< : start brock
   >| : end brock
-  |<=n : |<,``n
+  |=n, bond length=n ,=|
 
   <30,!2,|<,``1.2,!2,>|,!2
-  <30,!2,|<=1.2,!2,>|,!2
+  <30,!2,|=1.2,!2,=|,!2
 \end{verbatim}
 \MCFgraph
 %-----------------------------------------------------------------------------
@@ -1087,7 +1087,8 @@ MCat(1, .5)(<30,Ph,4:/COOH,3:/NH2)
  lonepair r: ':' rotated r
    lonepairdiam  = 0.3aw (default)
    lonepairspace = 0.7aw (default)
- a ** b : a scaled b
+ ** : scaled
+ << : rotated
  a /* b : point b of a
 %----------------------------------------
 beginfont()
@@ -1099,8 +1100,8 @@ beginfont()
   label.top(lone_pair 90,A7);
   drawarrow (A7+up**1.2aw){A7left}
      ..{B7right}B7/*0.3;
-  drawarrow B3m{B3right}..
-     A3+(1.5aw,.5aw)..{A3down}A3;
+  drawarrow B3m..A3+B2up**1.5aw
+     ..{A3down}A3;
  )
  MCat(1,0)(<30,?6,{1,5}=dl,4://NH2)
  add(
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 46bae635603..01beb82d74d 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 cbc52714123..1c5d30bf9f4 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    2019.05.26
+% Example of  MCF typest with LuaLaTeX(luamplib)     by A.Yamaji    2019.06.23
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%% mcf2graph.mf it must be version 4.42 or later
+%%% mcf2graph.mf it must be version 4.43 or later
 \documentclass{article}
 %------------------------------------------------------------------------------
 \usepackage{luamplib}%