mcf2graph (28jun21)

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

11 files changed, 89 insertions, 30 deletions

diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/CHANGELOG b/Master/texmf-dist/doc/metapost/mcf2graph/CHANGELOG
index cb9a0d3779e..684fdf8016d 100644
--- a/Master/texmf-dist/doc/metapost/mcf2graph/CHANGELOG
+++ b/Master/texmf-dist/doc/metapost/mcf2graph/CHANGELOG
@@ -1,6 +1,11 @@
 *******************************************************************************
- Changelog of mcf2graph software package          by Akira Yamaji 2021-06-13
+ Changelog of mcf2graph software package          by Akira Yamaji 2021-06-28
 *******************************************************************************
+[ver. 4.68  / 2021-06-28
+  -fix bug in data base file handling
+  -update mcf_data_base.mcf
+  -update MCF manual,example
+
 [ver. 4.67  / 2021-06-13]
   -fix bug in bond color
   -update mcf_data_base.mcf
diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/README b/Master/texmf-dist/doc/metapost/mcf2graph/README
index a2477d4372a..3f1624af40f 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.67 2021-06-13
+ version    : 4.68 2021-06-28
  E-mail     : mcf2graph@gmail.com
  Located at : http://www.ctan.org/pkg/mcf2graph
 ********************************************************************************
diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_data_base.mcf b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_data_base.mcf
index 87fabda340c..10944442eab 100644
--- a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_data_base.mcf
+++ b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_data_base.mcf
@@ -1,5 +1,5 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% molecular data base file    mcf_data_base.mcf   by Akira Yamaji   2021.06.13
+% molecular data base file    mcf_data_base.mcf   by Akira Yamaji   2021.06.28
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %  tag1:var1;tag2:var2;tag3:var3 .....
 %  first character of line '%' comment out
@@ -7,7 +7,7 @@
 %  Cat = Category
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %==============================================================================
-% molecular data for mcf_example.tex  No.1-155
+% molecular data for mcf_example.tex   EXA=1(155)
 %==============================================================================
 Cat:biological;EN:Adenine;MW:135.13;EXA:1
 +
@@ -74,7 +74,7 @@ Cat:biological;EN:L-Tyrosine;MW:181.19;EXA:-
 +
 <30,NH2,!~wb,/'(!Ph,-3:/OH),!,COOH
 +------------------------------------------------------------------------------
-Cat:biological;EN:L-Triptophan;MW:204.21;EXA:-
+Cat:biological;EN:L-Triptophan;MW:204.21;EXA:1
 +
 <30,NH2,!~wb,!,COOH,@2,\,!,<24,|,?5,-4=Ph,2=dr,5=dl,4:NH
 +------------------------------------------------------------------------------
@@ -463,10 +463,6 @@ Cat:pesticide;EN:Flumequine;MW:261.225;EXA:1
 +
 <30,Ph,3=?6,(2,7)=?6[4],9=dl,7:N,6:/F,9:/COOH,10://O,13:/_
 +------------------------------------------------------------------------------
-Cat:pesticide;EN:Imazalil;MW:297.2;EXA:1
-+
-<-30,!2,O,!2,!~dr,@1,60,|,?5,{2,4}=dl,{1,3}:N,@$2,\,|,Ph,{4,6}:/Cl
-+------------------------------------------------------------------------------
 Cat:pesticide;EN:Imidacloprid;MW:255.662;EXA:1
 +
 <30,Ph,1:N,6:/Cl,@3,\,!,|,?5,2=dl,1:N,3:N,2:/'(NH,!,NO2)
@@ -1156,6 +1152,58 @@ Cat:pesticide;EN:Chlorobenzilate;MW:325.2;EXA:-
 +
 <30,Ph,@3,\,/OH^-35,/COO!2^30>lr,!,Ph,{6,11}:/Cl
 +------------------------------------------------------------------------------
+Cat:pesticide;EN:Chlorantraniliprole;MW:483.15;EXA:-
++
+<30,Ph,@5,\,//O,60,NH,!,@4,\,NH,!,//O,!,<24,?5,{-1,-3}=db,{-3,-4}:N,-2:/Br,
+ @-4,24,Ph,-5:N,-1:/Cl
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Azoxystrobin;MW:403.4;EXA:-
++
+<30,Ph,2:/OH,@3,\,O,!,Ph,{-1,-3}:N,@-4,\,O,!,Ph,@-5,\,/O!,!,//O,!,O!
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Thiuram;MW:240.43;EXA:-
++
+<30,!,N!,!,//S,!,S,!,S,!,//S,!,N!,!
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Probenazole;MW:223.25;EXA:-
++
+<12,Ph,3=?5,9=dl,7:S,8:N,{7^35,7^-35}://O,@9,\,O,!2,!!
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Penflufen;MW:317.41;EXA:-
++
+<30,Ph,@3,\,NH,!,//O,!,?5,{-1,-4}=db,{-2,-3}:N,{-2,-4}:/_,-1:/F,
+ @4,\,/_,60,!,/_,!
++------------------------------------------------------------------------------
+Cat:pesticide;EN:MCPA;MW:200.62;EXA:-
++
+<30,Ph,1:/Cl,5:/_,@4,\,O,!2,COOH
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Asulam;MW:230.2;EXA:-
++
+<30,Ph,@3,\,SOO,!,NH,!,//O,!,O!
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Imazasulfuron;MW:412.81;EXA:-
++
+<-11.8,?6,3=?5,{1,5,7,9}=db,-3:N,8:/Cl,
+ @-1,\,SOO,!,NH,!,//O,!,NH,!,Ph,{-1,-5}:N,{-3,-5}:/O!
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Triaziflam;MW:333.4;EXA:-
++,
+<30,Ph,{2,6}:/_,@4,\,O,!2,/_,!,NH,!,Ph,{-1,-3,-5}:N,-2:/NH2,@-4,\,??,!,F
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Trichlopyr;MW:256.47;EXA:-
++,
+<30,Ph,2:N,{1,4,6}:/Cl,@3,\,O,!2,COOH
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Halosulfuron-methyl;MW:434.82;EXA:-
++,
+<6,?5,{3,5}=db,{1,2}:N,5:/Cl,@3,\,SOO,!,NH,!,//O,!,NH,!,Ph,@4,\,//O,!,O,!
++------------------------------------------------------------------------------
+Cat:pesticide;EN:Flupoxam;MW:460.8;EXA:-
++
+<30,Ph,4:/Cl,@1,\,?5,{-2,-4}=db,{-2,-4,-5}:N,-1:/Ph,@-3,\,//O,!,NH2,
+ @3,\,!,O,!,/F^35,/F^-35,!,CF3
++------------------------------------------------------------------------------
 Cat:pesticide;EN:Cyanazine;MW:240.7;EXA:-
 +
 <30,Ph,{2,4,6}:N,5:/Cl,1:/NH!2,@3,\,NH,!,??,!,CN
@@ -1343,10 +1391,6 @@ Cat:pesticide;EN:Paclobutrazole;MW:293.795;EXA:-
 +
 <30,Ph,6:/Cl,@3,\,!2,/OH,!,??!,@8,\,|,?5,{2,4}=dl,{1,2,4}:N
 +------------------------------------------------------------------------------
-Cat:pesticide;EN:Halfenprox;MW:477.4;EXA:-
-+
-<30,Ph,@6,\,O,!,/F^35,/F^-35,!,Br,@3,\,!,??,!,O,!,!,Ph,@-2,\,O,!,Ph
-+------------------------------------------------------------------------------
 Cat:pesticide;EN:Picolinafen;MW:376.331;EXA:-
 +
 <30,Ph,5:/CF3,@3,\,O,!,|,|,Ph,2:N,@3,\,//O,!,NH,!,|,Ph,4:/F
@@ -1624,6 +1668,10 @@ Cat:pesticide;EN:Benfuresate;MW:256.3;EXA:-
 +
 <30,Ph,3=?5,7:O,9:??,@6,\,O,!,SOO,!2
 +------------------------------------------------------------------------------
+Cat:pesticide;EN:Bensulide;MW:397.5;EXA:-
++
+<30,!,?!,O,!,P,//S,/O!?!^160>rl,!,S,!3,NH,!,SOO,!,Ph
++------------------------------------------------------------------------------
 Cat:pesticide;EN:Phosalone;MW:367.80;EXA:-
 +
 <30,!2,O,!,P,//S,/O!2^160>rl,!,S,!2,|,?5,4=Ph,4=dr,1:N,2://O,3:O,8:/Cl
@@ -1672,6 +1720,10 @@ Cat:pesticide;EN:Mepronil;MW:269.3;EXA:-
 +
 <30,Ph,2:/_,@3,\,//O,!,NH,!,|,Ph,5:/O!?!
 +------------------------------------------------------------------------------
+Cat:pesticide;EN:Molinate;MW:187.3;EXA:-
++
+<47,?7,3:N,@3,\,//O,!,S,!2
++------------------------------------------------------------------------------
 Cat:pesticide;EN:Resmethrin;MW:338.4;EXA:-
 +
 <-30,?3,{2^-35~wf,2^35~zf}:/_,@1,\,!!,/_,!,@3,\,//O,!,O,!2,
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 5ec224241a5..516424a5497 100644
--- a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_exa_soc.mf
+++ b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_exa_soc.mf
@@ -1,8 +1,8 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Molecular Coding Format for mcf_example.tex   by Akira Yamaji  2021.06.13
+% Molecular Coding Format for mcf_example.tex   by Akira Yamaji  2021.06.28
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-input mcf2graph.mf;   %%% it must be version 4.67
-message "* mcf_exa_soc 2021.06.13";
+input mcf2graph.mf;   %%% it must be version 4.68
+message "* mcf_exa_soc 2021.06.28";
 message "";
 %------------------------------------------------------------------------------
 fsize:=(35mm,24mm);
@@ -37,11 +37,11 @@ beginfont("f+:mcf_data_base","t:n","v:5")                % 'f+'=keep file open
 endfont
 %******************************************************************************
 forever:
-  beginfont("f+:mcf_data_base","t:EXA","v:1")            % 'f+'=keep file open
 %%%%%%%%%%  beginfont("f+:mcf_data_base","v:*")          % select all
+  beginfont("f+:mcf_data_base","t:EXA","v:1")            % 'f+'=keep file open
     if f_EOF=0: if check(mc)=0: MC(scantokens(mc)) fi fi % 'v:1' select EXA=1
   endfont                                                %
-  exitif f_EOF=1;                                        % exit if file end
+  exitif (f_EOF=1)or(f_close=1);                         % exit if file end
 endfor
 %******************************************************************************
 fi
diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_example.pdf b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_example.pdf
index 098316c278d..3e206972ac5 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 75d105d7ccf..8d44f7522ba 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  2021.06.13
+% Example of MCF typeset by LaTeX   mcf_examples.tex   by A.Yamaji  2021.06.28
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \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 fc46f3053b4..75591a8fe33 100644
--- a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_man_soc.mf
+++ b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_man_soc.mf
@@ -1,9 +1,9 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Molecular Coding Format file for mcf_manual.tex  by Akira.Yamaji 2021.06.13
+% Molecular Coding Format file for mcf_manual.tex  by Akira.Yamaji 2021.06.28
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-input mcf2graph.mf;   %% it must be version 4.67
+input mcf2graph.mf;   %% it must be version 4.68
 % ** use data base file 'mcf_data_base.mcf'
-message "mcf_man_soc 2021.06.13"; message "";
+message "mcf_man_soc 2021.06.28"; 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 c851eb3d2d2..02bb3fa0e25 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 85bf13d5931..a40f0331f2d 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 2021.06.13
+%  Molecular Coding Format manual                by  Akira Yamaji 2021.06.28
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \documentclass[a4paper]{article}
 \usepackage[pdftex]{graphicx}
@@ -1530,11 +1530,13 @@ beginfont("f+:mcf_data_base","t:n","v:4")               > from mcf_data_base.mcf
   if check(mc)=0: MC(scantokens(mc)) fi                 > v:4 select No.4
 endfont                                                 > 'f+' keep file open
 %------------------------------------------------------------------------------
-for i=5 upto 155:                                       > from mcf_data_base.mcf
-  beginfont("f+:mcf_data_base","v:*")                   > v:* no selection
-    if check(mc)=0: MC(scantokens(mc)) fi               > No.5 - No.155
-  endfont                                               > 'f+' keep file open
-endfor                                                  >
+forever:
+%%%%%%%%%%  beginfont("f+:mcf_data_base","v:*")          > select all
+  beginfont("f+:mcf_data_base","t:EXA","v:1")            > 'f+'=keep file open
+    if f_EOF=0: if check(mc)=0: MC(scantokens(mc)) fi fi > 'v:1' select EXA=1
+  endfont                                                >
+  exitif (f_EOF=1)or(f_close=1);                         > exit if file end
+endfor
 %------------------------------------------------------------------------------
 bye
 \end{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 8d688f80528..b488e6cb46d 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 5f4255aee61..d8496b1212c 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    2021.06.13
+% Example of  MCF typest with LuaLaTeX(luamplib)     by A.Yamaji    2021.06.28
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% ** mcf2graph.mf must be version 4.67
+% ** mcf2graph.mf must be version 4.68
 % ** use mcf_data_base.mcf
 \documentclass{article}
 %------------------------------------------------------------------------------