9 files changed, 26 insertions, 20 deletions
diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/CHANGELOG b/Master/texmf-dist/doc/metapost/mcf2graph/CHANGELOG
index a162e00951a..4dcbe73f9ad 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 2020-11-03
+ Changelog of mcf2graph software package          by Akira Yamaji 2020-12-12
 *******************************************************************************
+[ver. 4.54  / 2022-12-12]
+  -fix bug in report output
+  -update MCF manual,example
+
 [ver. 4.53  / 2020-11-03]
   -improve inline definition
   -update MCF manual(add index),example
diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/README b/Master/texmf-dist/doc/metapost/mcf2graph/README
index 1946281e8df..2b8ac639e08 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.53 2020-11-03
+ version    : 4.54 2020-12-12
  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 dae7e38efab..cc0dba4b77b 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,9 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Molecular Coding Format for mcf_example.tex   by Akira Yamaji  2020.11.03
+% Molecular Coding Format for mcf_example.tex   by Akira Yamaji  2020.12.12
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-input mcf2graph.mf;   %%% it must be version 4.53 or later
+input mcf2graph.mf;   %%% it must be version 4.54 or later
+message "mcf_exa_soc 2020.12.12";
+message "";
 %-------------------------------------------------------------------------
 fsize:=(33mm,24mm);
 max_blength:=4.5mm;
@@ -50,14 +52,14 @@ beginfont("EN:Isoprothiolane","MW:290.392")
 endfont
 %***************************************************************************
 beginfont("EN:Oxine-Copper","MW:351.852")
-  MC(Ph,4:N,5=Ph,-4:\,O,-60,<90,Cu,-90,O,60,|,Ph,5=Ph,10:N,||,
+  MC(Ph,4:N,5=Ph,-4:\,O,-60,<90,Cu,-90,O,60,
+       |,Ph,5=Ph,10:N,||,
      4:@,12~vf:#,23:@,12~vf:#)
 endfont
 %***************************************************************************
 beginfont("EN:Tetraconazole","MW:372.145")
   MC(<-6,
-    ?5,{2,5}=dl,{1,2,4}:N,4:\,!3,O,!,/F^35,/F^-35,!,CF2,
-      7:\,|,Ph,{4,6}:/Cl)
+    ?5,{2,5}=dl,{1,2,4}:N,4:\,!3,O,!,/F^35,/F^-35,!,CF2,7:\,|,Ph,{4,6}:/Cl)
 endfont
 %***************************************************************************
 beginfont("EN:Endosulfan","MW:406.904");
@@ -130,7 +132,7 @@ beginfont("EN:Cefalexin","MW:347.3889")
     4:*\^15,NH,!,//O,!,*/NH2,!,Ph)
 endfont
 %***************************************************************************
-beginfont("EN:Cefalonium","MW:458.5107")
+beginfont("EN:Cefalonium","MW:459.5107")
   MC(<45,?4,-3=?6,-4=dl,2:N,8:S,
     3^45:/*H,1://O^15,5:/*COOH,
     4:*\^15,NH,!,//O,!2,?5,{-1,-3}=dl,-4:S,
@@ -144,7 +146,7 @@ beginfont("EN:Cefazorin","MW:454.51")
     6:\,!,S,!,?5,{-3,-5}=dl,-1:S,-2:/_,{-3,-4}:N)
 endfont
 %***************************************************************************
-beginfont("EN:Cefquinome","MW:627.6903")
+beginfont("EN:Cefquinome","MW:529.6")
   MC(<45,?4,-3=?6,-4=dl,2:N,8:S,
     3^45:/*H,1://O^15,5:/*COOH,
     4:*\^15,NH,!,//O,!,//'(N,!,O,!),!,?5,{-2,-5}=dl,-3:S,-1:N,-2:/NH2,
@@ -222,8 +224,8 @@ endfont
 %***************************************************************************
 beginfont("EN:Spiramycin","MW:843.1")
   MC(<-90,|=1,60,60,-60,60,60,-60,60,60,-60,60,60,60,-60,60,-60,1:#,=|,
-    {12,14}=dl,2:O,1:/*_,5:/*OH,3://O,10:/*_,6:/*O!>vt,
-    -6:\*,O,!~wb,?6`.7,-5:O,-3:/*N!_,-4:*/_,
+    {12,14}=dl,2:O,{1,10^-30}:/*_,5:/*OH,3://O,6:/*O!>vt,
+    -6:\*^-30,O,!~wb,?6`.7,-5:O,-3:/*N!_,-4:*/_,
     7:\*,O,0~wb,?6`.7,-5:O,-2:*/N!_,-1:/*OH,-4:*/_,
       -3:\*`1,O,60~wb`1.5,?6`.7,-5:O,{-2^35,-3}:*/OH,{-2^-35,-4}:/*_,
     8:\*,!,!!,O)
diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_example.pdf b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_example.pdf
index 423db59f667..80a8a5343d8 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 cd570b7e8a3..3379b252225 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,8 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Molecular Coding Format file for mcf_manual.tex  by Akira.Yamaji 2020.11.03
+% Molecular Coding Format file for mcf_manual.tex  by Akira.Yamaji 2020.12.12
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-input mcf2graph.mf;   %% it must be version 4.53 or later
+input mcf2graph.mf;   %% it must be version 4.54 or later
+message "mcf_man_soc 2020.12.12"; message "";
 %------------------------------------------------------------------------
 sw_mframe:=0;
 sw_expand:=0;
diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.pdf b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.pdf
index a3582e5ba83..297af90c25d 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 165b0c721f5..f879fd6ab7e 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 2020.11.03
+%  Molecular Coding Format manual                by  Akira Yamaji 2020.12.12
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \documentclass[a4paper]{article}
 %%%%\documentclass[a4paper,twoside]{article}
@@ -593,10 +593,9 @@ exact mass, molecular formula.
 %-----------------------------------------------------------------------------
 \subsubsection{Multi rotate angle}
 \begin{verbatim}
-  >'(90,-90,...) :rotate 90,-90,...
+  >'(90,-90,...) : rotate 90,-90,...
 
-  <30,!6,
-  6>'(90,-90,90,-90,90):/!5
+  <30,!6,6>'(90,-90,90,-90,90):/!5
 \end{verbatim}
 \MCFgraph
 %-----------------------------------------------------------------------------
@@ -1549,7 +1548,7 @@ h   : font height
 \begin{verbatim}
 ------------------------------------------------------------------
  Molecular name = Nicotine
- Warnings =   0 / Expanded command = 40
+ Warnings =   0 / Command count= 40
  Width * Height =   49.57332 *   41.37605
  Shift width * height  =          0 *   -9.07253
  Bond length = 12.75589   Atom size   = 5.38914
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 ed6e3e605b8..ff808a4acea 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 17d23cd4cb0..1dd167811ed 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    2020.11.03
+% Example of  MCF typest with LuaLaTeX(luamplib)     by A.Yamaji    2020.12.12
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%% mcf2graph.mf it must be version 4.53 or later
+%%% mcf2graph.mf it must be version 4.54 or later
 \documentclass{article}
 %------------------------------------------------------------------------------
 \usepackage{luamplib}%