mcf2graph (8dec19)

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

9 files changed, 16 insertions, 12 deletions

diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/CHANGELOG b/Master/texmf-dist/doc/metapost/mcf2graph/CHANGELOG
index 36a80e4aede..cc25dbbb819 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 2019-10-05
+ Changelog of mcf2graph software package          by Akira Yamaji 2019-12-08
 *******************************************************************************
+[ver. 4.46  / 2019-12-08]
+  -miner update mcf2graph.mf
+  -update MCF manual
+
 [ver. 4.45  / 2019-10-05]
   -improve function ext()
   -delete option parameter sw_auxfix
diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/README b/Master/texmf-dist/doc/metapost/mcf2graph/README
index d9538548e2b..77d1a0633a3 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.45 2019-10-05
+ version    : 4.46 2019-12-08
  E-mail     : mcf2graph@gmail.com
  Located at : http://www.ctan.org/pkg/mcf2graph
 ********************************************************************************
@@ -23,7 +23,7 @@
  ( 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
+                               >mpost -s ahlength=1 mcf_exa_soc.mf
  ( 9) mcf_exa_soc.mf         Molecular difinition file for mcf_example.tex
  (10) mcf_example.pdf        PDF of (8) (used pdftex(LaTeX))
  (11) mcf_mplib_exa.tex      luamplib(LuaLaTeX) 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 99101f031f6..367fa30c048 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  2019.10.05
+% Molecular Coding Format for mcf_example.tex   by Akira Yamaji  2019.12.08
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-input mcf2graph.mf;   %%% it must be version 4.45 or later
+input mcf2graph.mf;   %%% it must be version 4.46 or later
 %-------------------------------------------------------------------------
 fsize:=(33mm,24mm);
 max_blength:=4.5mm;
diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_example.pdf b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_example.pdf
index 6963eb33fa9..1962c106cc7 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 a64742bb3be..38fdf95c447 100644
--- a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_man_soc.mf
+++ b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_man_soc.mf
@@ -505,7 +505,7 @@ beginfont("EN:Make brock")
   fsize:=(60mm,8mm);
   sw_trimming:=1;
   sw_numberB:=1;
-  MC(<30,!2,|<,``1.2,!2,>|,!2)
+  MC(<30,!2,|=1.2,!2,=|,!2)
 endfont
 %***********************************************************************
 beginfont("EN:Chain start multi characters")
@@ -1109,7 +1109,7 @@ endfont
 %***************************************************************************
 beginfont("EN:Paclitaxel","CAS:33069-62-4","FM:C47H51NO14","MW:853.91")
   MC(
-     ?6,5=dl,3:@,|<,``1,36,45,45,45,45,>|,
+     ?6,5=dl,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_manual.pdf b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.pdf
index 26d32a85475..5acaf5607ad 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 272451b4dc6..6c16180ac59 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.10.05
+%  Molecular Coding Format manual                by  Akira Yamaji 2019.12.08
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \documentclass[a4paper]{article}
 %%%%\documentclass[a4paper,twoside]{article}
@@ -1310,7 +1310,7 @@ endfont
 %-----------------------------------------------------------------------------
 \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,
@@ -1444,7 +1444,7 @@ cFM : molecular formula calculated
 \end{verbatim}
 \paragraph{(Command line)}
 \begin{verbatim}
-  >mpost -s ahlength=2 FILENAME
+  >mpost -s ahlength=3 FILENAME
 \end{verbatim}
 \paragraph{(Output)}
 \begin{verbatim}
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 0ad6c716f0f..8d54cc5cbf3 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 ac29ba5441d..24b5a19e484 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.10.05
+% Example of  MCF typest with LuaLaTeX(luamplib)     by A.Yamaji    2019.12.08
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%% mcf2graph.mf it must be version 4.45 or later
+%%% mcf2graph.mf it must be version 4.46 or later
 \documentclass{article}
 %------------------------------------------------------------------------------
 \usepackage{luamplib}%