From e78599ee6ee6d049fc69952f036872fe0366a584 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 11 Oct 2021 20:21:40 +0000 Subject: mcf2graph (11oct21) git-svn-id: svn://tug.org/texlive/trunk@60729 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/metapost/mcf2graph/CHANGELOG | 6 +++++- Master/texmf-dist/doc/metapost/mcf2graph/README | 2 +- .../doc/metapost/mcf2graph/mcf_data_base.mcf | 11 ++++++----- .../doc/metapost/mcf2graph/mcf_exa_soc.mf | 8 ++++---- .../doc/metapost/mcf2graph/mcf_example.pdf | Bin 314077 -> 312868 bytes .../doc/metapost/mcf2graph/mcf_example.tex | 2 +- .../doc/metapost/mcf2graph/mcf_man_soc.mf | 6 +++--- .../doc/metapost/mcf2graph/mcf_manual.pdf | Bin 344886 -> 382758 bytes .../doc/metapost/mcf2graph/mcf_manual.tex | 8 ++++---- .../doc/metapost/mcf2graph/mcf_mplib_exa.pdf | Bin 184158 -> 184025 bytes .../doc/metapost/mcf2graph/mcf_mplib_exa.tex | 4 ++-- 11 files changed, 26 insertions(+), 21 deletions(-) (limited to 'Master/texmf-dist/doc/metapost') diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/CHANGELOG b/Master/texmf-dist/doc/metapost/mcf2graph/CHANGELOG index 4ed3c84848c..79b7e2d68c1 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 2021-09-20 + Changelog of mcf2graph software package by Akira Yamaji 2021-10-10 ******************************************************************************* +[ver. 4.73 / 2021-10-10] + -update mcf_data_base.mcf + -update MCF manual,example + [ver. 4.72 / 2021-09-20] -change syntax of beginfont() keep file open 'f+' => 'v+' diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/README b/Master/texmf-dist/doc/metapost/mcf2graph/README index aa2aee88f55..bf39e909478 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.72 2021-09-20 + version : 4.73 2021-10-10 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 8d415675701..7e088381abe 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.09.20 +% molecular data base file mcf_data_base.mcf by Akira Yamaji 2021.10.10 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % tag1:var1;tag2:var2;tag3:var3 ..... % first character of line "%" comment out @@ -1977,13 +1977,14 @@ Cat:antibacterial;EN:Sulfamerazine;MW:264.303;EXA:1 + <30,Ph,1:/NH2,@4,\,SOO,!,NH,!,|,Ph,{2,6}:N,3:/_ +------------------------------------------------------------------------------ -Cat:antibacterial;EN:Trimetoprim;MW:290.323;EXA:1 +Cat:antibacterial;EN:Trimethoprim;MW:290.323;EXA:1 + -<30,Ph,{1,5}:N,6:/NH2,@3,\,!,|,Ph,{3,4,5}:/O! +<30,Ph,{1,5}:N,{2,6}:/NH2,@3,\,!,|,Ph,{3,4,5}:/O! +------------------------------------------------------------------------------ Cat:antibacterial;EN:Ofloxacin;MW:361.373;EXA:1 + -<30,Ph,3=?6,(2,7)=?6[4],7:N,11:O,9:/COOH,10://O,13:/_,@1,\,|,?6,{1,4}:N,4:/! +<30,Ph,3=?6,(2,7)=?6[4],9=dl,7:N,11:O, + 6:/F,9:/COOH,10://O,13:/_,@1,\,|,?6,{1,4}:N,4:/_ +------------------------------------------------------------------------------ Cat:antibacterial;EN:Ciprofloxacin;MW:331.347;EXA:1 + @@ -2042,7 +2043,7 @@ Cat:antibacterial;EN:Sulfamethoxazole;MW:253.276;EXA:1 +------------------------------------------------------------------------------ Cat:antibacterial;EN:Pirimethamin;MW:248.714;EXA:1 + -<30,?6,{1,4}=dl,{1,5}:N,4:/!,6://NH,@3,\,Ph,-3:/Cl +<30,Ph,6:/Cl,@3,\,Ph,{-2,-4}:N,-1:/!,{-3,-5}:/NH2 +------------------------------------------------------------------------------ Cat:antibacterial;EN:Oxibendazole;MW:249.27;EXA:- + 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 b5513ffbf03..65fc98818c6 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.09.20 +% Molecular Coding Format for mcf_example.tex by Akira Yamaji 2021.10.10 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -input mcf2graph.mf; %%% it must be version 4.72 -message "* mcf_exa_soc 2021.09.20"; +input mcf2graph.mf; %%% it must be version 4.73 +message "* mcf_exa_soc 2021.10.10"; message ""; %------------------------------------------------------------------------------ fsize:=(35mm,24mm); @@ -23,7 +23,7 @@ else: % mpost -s ahlength=7 mcf_exa_soc.mf %------------------------------------------------------------------------------ %%%%query("Cat=biological","MW<200","s:MW"); %%%%query("Cat=biological","MW<150.0","s:EN"); -%%%%query("MW>=150","MW<=200","s:MW"); +%%%%query("MW>=150","MW<=250","s:MW"); %****************************************************************************** %%%% beginfont("t:EN","v:Caffeine") % select EN=Caffeine forever: diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_example.pdf b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_example.pdf index 6d2b88c7e0f..1cadd2296b1 100644 Binary files a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_example.pdf and b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_example.pdf differ diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_example.tex b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_example.tex index a61439d39b5..bf10feb5b35 100644 --- a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_example.tex +++ b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_example.tex @@ -10,7 +10,7 @@ %-------------------------------- %%%%\pdfpkresolution=1200 %-------------------------------- -%%%%%\edef\f@ext{pk}% +%%%%\edef\f@ext{pk}% \edef\f@ext{mps}% %-------------------------------- \pagestyle{empty} 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 3b5e2ce3073..e585c608534 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.09.20 +% Molecular Coding Format file for mcf_manual.tex by Akira.Yamaji 2021.10.10 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -input mcf2graph.mf; %% it must be version 4.72 +input mcf2graph.mf; %% it must be version 4.73 % ** use data base file 'mcf_data_base.mcf' -message "mcf_man_soc 2021.09.20"; message ""; +message "mcf_man_soc 2021.10.10"; 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 070738c2345..d5b5234c710 100644 Binary files a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.pdf and b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.pdf differ diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.tex b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.tex index 59745ac19ad..c83840b2a35 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.09.20 +% Molecular Coding Format manual by Akira Yamaji 2021.10.10 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \documentclass[a4paper]{article} \usepackage[pdftex]{graphicx} @@ -667,8 +667,8 @@ MC(<30,?6,{4,6}:/iBuOH) \subsubsection{Move position} \index{"@()}% \begin{verbatim} -@(x,y) : Move (l*x,l*y) from current position -@$(x,y): Move (l*x,l*y) from origin(@1) +@(x,y) : Move l*(x,y) from current position +@$(x,y): Move l*(x,y) from origin(@1) ** l=bond length of ring <30,?6,@3,!4,//O,!,O,n_^60,@$(6,1),H,p_^15 @@ -1563,7 +1563,7 @@ forever: beginfont("f:mcf_data_base","t:EXA","v+:1") > 'v+:1'= select EXA=1 if f_EOF=0: if check(mc)=0: MC(scantokens(mc)) fi fi > keep file open endfont > - exitif (f_EOF=1)or(f_close=1); > exit if file end + exitif f_EOF=1; > exit if file end endfor %------------------------------------------------------------------------------ bye 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 cb28688db61..2b4318347e6 100644 Binary files a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_mplib_exa.pdf and b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_mplib_exa.pdf differ 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 b204383651a..b19328888bc 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.09.20 +% Example of MCF typest with LuaLaTeX(luamplib) by A.Yamaji 2021.10.10 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% ** mcf2graph.mf must be version 4.72 +% ** mcf2graph.mf must be version 4.73 % ** use mcf_data_base.mcf \documentclass{article} %------------------------------------------------------------------------------ -- cgit v1.2.3