From b3d7001582db55244fbe01f7a1f48639abadc2d4 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 5 Sep 2021 20:37:35 +0000 Subject: mcf2graph (5sep21) git-svn-id: svn://tug.org/texlive/trunk@60428 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/metapost/mcf2graph/CHANGELOG | 7 ++- Master/texmf-dist/doc/metapost/mcf2graph/README | 4 +- .../doc/metapost/mcf2graph/mcf_data_base.mcf | 57 +++++++++++-------- .../doc/metapost/mcf2graph/mcf_exa_soc.mf | 38 ++++--------- .../doc/metapost/mcf2graph/mcf_example.pdf | Bin 309948 -> 314296 bytes .../doc/metapost/mcf2graph/mcf_example.tex | 6 +- .../doc/metapost/mcf2graph/mcf_man_soc.mf | 6 +- .../doc/metapost/mcf2graph/mcf_manual.pdf | Bin 381018 -> 383098 bytes .../doc/metapost/mcf2graph/mcf_manual.tex | 62 ++++++++++++++++++++- .../doc/metapost/mcf2graph/mcf_mplib_exa.pdf | Bin 183875 -> 184493 bytes .../doc/metapost/mcf2graph/mcf_mplib_exa.tex | 10 +--- 11 files changed, 121 insertions(+), 69 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 ebd3e9395da..bb647d91458 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-08-01 + Changelog of mcf2graph software package by Akira Yamaji 2021-09-05 ******************************************************************************* +[ver. 4.71 / 2021-09-05] + -add function query() for data base file + -update mcf_data_base.mcf + -update MCF manual,example + [ver. 4.70 / 2021-08-01] -change syntax of @(x,y) @(x,y) : Move (x,y) from current position diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/README b/Master/texmf-dist/doc/metapost/mcf2graph/README index 80a6d640ac8..1fe6d2a6321 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.70 2021-08-01 + version : 4.71 2021-09-05 E-mail : mcf2graph@gmail.com Located at : http://www.ctan.org/pkg/mcf2graph ******************************************************************************** @@ -41,7 +41,7 @@ (13) mcf_mplib_exa.pdf PDF of (11) typeset with LuaTeX(LaTeX) 3. How to use mcf2graph with Metapost - Minimum requirement to run mcf2graph : mpost.exe,mpost.dll,mpost.mp,plain.mp + Minimum requirement to use mcf2graph : mpost.exe,mpost.dll,mpost.mp,plain.mp ( 1) >mpost FILENAME => output eps(.mps) file ( 2) >mpost -s bboxmargin=1 FILENAME => output first font only (for test) ( 3) >mpost -s ahangle=1 FILENAME => output png file (600dpi) 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 848ad6470d7..cb535a710fd 100644 --- a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_data_base.mcf +++ b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_data_base.mcf @@ -1,15 +1,16 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% molecular data base file mcf_data_base.mcf by Akira Yamaji 2021.08.01 +% molecular data base file mcf_data_base.mcf by Akira Yamaji 2021.09.05 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % tag1:var1;tag2:var2;tag3:var3 ..... % first character of line "%" comment out % first character of line "+" begin MCF % first string of line "+-" end MCF +% first string of line "%-" end header % Cat = Category %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %============================================================================== % molecular data for mcf_example.tex EXA=1(155) -%============================================================================== +%-============================================================================= Cat:biological;EN:Adenine;MW:135.13;EXA:1 + <30,?6,3=?5,{1,3,5,9}=dl,{2,6,9}:N,5:/NH2,7:NH @@ -214,7 +215,7 @@ Cat:biological;EN:D-Glucosamine;MW:179.17;EXA:1 + hexose_hp,{1^$-90,2^$90,4^$-90}:/OH`-.5,3^$-90:/NH2,6^$90:/!OH`-.5 +------------------------------------------------------------------------------ -Cat:biological;EN:N-acetyl-glucosamine;MW:221.21;EXA:- +Cat:biological;EN:N-acetyl-Glucosamine;MW:221.21;EXA:1 + hexose_hp,{1^$-90,2^$90,4^$-90}:/OH`-.5,3^$-90>lr:/NHCO!,6^$90:/!OH`-.5 +------------------------------------------------------------------------------ @@ -258,7 +259,7 @@ Cat:biological;EN:Geraniol;MW:154.25;EXA:1 + <30,!8,OH,{2,6}=dr,{2,6}:/_ +------------------------------------------------------------------------------ -Cat:biological;EN:Limonene;MW:136.24;EXA:1 +Cat:biological;EN:Limonene;MW:136.24;EXA:- + <30,?6,2=dl,2:/_,@5,*\,/_,!! +------------------------------------------------------------------------------ @@ -652,7 +653,7 @@ Cat:antibiotics;EN:Ampicillin;MW:349.405;EXA:1 <45,?4,-3=?5,2:N,7:S,3^45:/*H,1://O^15,5:/*COOH^-18,6:??, @4,*\^15,NH,!,//O,!,/*NH2,!,Ph +------------------------------------------------------------------------------ -Cat:antibiotics;EN:Benzyl-Penicillin;MW:334.4;EXA:1 +Cat:antibiotics;EN:benzyl-Penicillin;MW:334.4;EXA:1 + <45,?4,-3=?5,2:N,7:S,3^45:/*H,1://O^15,5:/*COOH^-18,6:??, @4,*\^15,NH,!,//O,!,!,Ph @@ -733,13 +734,7 @@ Cat:antibiotics;EN:Kanamycin;MW:484.499;EXA:1 <-30,?6,@1,\*,O,0~zb,?6,-5:O,@5,\,O,0,?6,-5:O, {2,4,12}:*/NH2,{6,19}:*/OH,{11,13,18,20}:/*OH,10:*/!OH,17:*/!NH2 +------------------------------------------------------------------------------ -Cat:antibiotics;EN:DihydroStreptmycin;MW:583.574;EXA:- -+ -<54,?5,3:O,4:/*_,5:/!OH^-48,5:/*OH^35,@1,\*,O,-24~wb,?6,-5:O,@2,*\,O,24~zb,?6, - {10,15}:*/OH,{11,16,18}:/*OH,9:/*!OH,12:*/NH!, - @17,*\^-18,NH,!,//NH,!,NH2,@19,*\,NH,!,//NH,!,NH2 -+------------------------------------------------------------------------------ -Cat:antibiotics;EN:Fradiomycin;MW:614.644;EXA:1 +Cat:antibiotics;EN:Neomycin;MW:614.644;EXA:1 + <30,?6,3:O,2:/*!NH2,1:*/OH,6:/*OH,5:*/NH2, @4,*\,O,!~wb,?6,{-3,-5^15}:/*NH2,-2:*/OH^-15, @@ -752,6 +747,22 @@ Cat:antibiotics;EN:Streptmycin;MW:581.574;EXA:1 @5,\^-48,!!,O,{10,15}:*/OH,{11,16,18}:/*OH,9:/*!OH,12:*/NH!, @17,*\^-18,NH,!,//NH,!,NH2,@19,*\,NH,!,//NH,!,NH2 +------------------------------------------------------------------------------ +Cat:antibiotics;EN:dihydro-Streptmycin;MW:583.574;EXA:1 ++ +<54,?5,3:O,4:/*_,5:/!OH^-48,5:/*OH^35,@1,\*,O,-24~wb,?6,-5:O,@2,*\,O,24~zb,?6, + {10,15}:*/OH,{11,16,18}:/*OH,9:/*!OH,12:*/NH!, + @17,*\^-18,NH,!,//NH,!,NH2,@19,*\,NH,!,//NH,!,NH2 ++------------------------------------------------------------------------------ +Cat:antibiotics;EN:Spectinomycin;MW:332.35;EXA:1 ++ +<30,?6,{3,9}=?6,7=zf,11=wb,{7,10,14}:O,,9^60:*/H,11://O,{1,8^-60}:*/OH,5:/*OH, + 13:/*_,{2,6}:*/NH! ++------------------------------------------------------------------------------ +Cat:antibiotics;EN:Tobramycin;MW:467.51;EXA:1 ++ +<-30,?6,@1,\*,O,0~zb,?6,-5:O,@5,\,O,0,?6,-5:O, + {2,4,12}:*/NH2,20:/*NH2,6:*/OH,{11,13,18}:/*OH,10:*/!OH,17:*/!NH2 ++------------------------------------------------------------------------------ Cat:antibiotics;EN:Neospiramycin;MW:698.9;EXA:1 + <-90,#1,60,60,-60,60,60,-60,60,60,-60,60,60,60,-60,60,-60,&1,##, @@ -848,7 +859,7 @@ Cat:antibiotics;EN:Rifampicin;MW:822.94;EXA:1 %============================================================================== Cat:pesticide;EN:BHC;MW:290.83;EXA:1 + -<30,?6`1.2,{1,3,4,6}:*/Cl,{2,5}:/*Cl +<30,?6,{1,3,4,6}:*/Cl,{2,5}:/*Cl +------------------------------------------------------------------------------ Cat:pesticide;EN:pp-DDT;MW:354.49;EXA:1 + @@ -866,11 +877,11 @@ Cat:pesticide;EN:pp-DDE;MW:318;EXA:- + <30,Ph,6:/Cl,@3,\,/CCl2~dm,!,Ph,-3:/Cl +------------------------------------------------------------------------------ -Cat:pesticide;EN:EPN;MW:323.303;EXA:1 +Cat:pesticide;EN:EPN;MW:323.303;EXA:- + <30,!2,O,!,P,//S,/Ph^170,!,O,!,|,Ph,4:/NO2 +------------------------------------------------------------------------------ -Cat:pesticide;EN:XMC;MW:179.2;EXA:1 +Cat:pesticide;EN:XMC;MW:179.2;EXA:- + <30,Ph,{1,5}:/_,@3,\,O,!,//O,!,NH,! +------------------------------------------------------------------------------ @@ -883,7 +894,7 @@ Cat:pesticide;EN:Azaconazole;MW:300.139;EXA:1 + <30,Ph,{4,6}:/Cl,@3,\,!2,?5,{-2,-4}=dl,{-2,-4,-5}:N,@7,?5,{-1,-4}:O +------------------------------------------------------------------------------ -Cat:pesticide;EN:Acetochlor;MW:269.769;EXA:1 +Cat:pesticide;EN:Acetochlor;MW:269.769;EXA:- + <30,Ph,2:/_,4:/!,@3,\,N,!2,O,!2,@7,\,//O,!2,Cl +------------------------------------------------------------------------------ @@ -947,7 +958,7 @@ Cat:pesticide;EN:Ethrimfos;MW:292.29;EXA:- + <-30,!,O,!,P,//S,/O!^160,!,O,!,|,Ph,{2,4}:N,5:/!,3:/O!2 +------------------------------------------------------------------------------ -Cat:pesticide;EN:Endrin;MW:380.91;EXA:- +Cat:pesticide;EN:Endrin;MW:380.91;EXA:1 + <30,?6`1.3,3=?6,6=dl,9=?3,-1:O, @2,210~wf`1.5,&5~wb,@7,210~zf`1.5,&10~zb,{1,2,5,6,12^-210,12^-150}:/Cl @@ -1945,7 +1956,7 @@ Cat:antibacterial;EN:Levamisole;MW:204.29;EXA:1 + ?5,3=?5,6=dl,2:S,{4,6}:N,@7,\,Ph +------------------------------------------------------------------------------ -Cat:antibacterial;EN:5-(Propylsulphonyl)-1-H-Benzimidazole-2-Amine;MW:0;EXA:- +Cat:antibacterial;EN:5-(Propylsulphonyl)-1-H-Benzimidazole-2-Amine;MW:239.29;EXA:- + <30,Ph,3=?6,8=dl,7:N,9:NH,6:/S!3,8:/NH2 +------------------------------------------------------------------------------ @@ -2009,11 +2020,11 @@ Cat:antibacterial;EN:Difloxacin;MW:399.398;EXA:1 <30,Ph,-4=?6,9=dl,7:N,6:/F,9:/COOH,10://O,@1,\,|,?6,{1,4}:N,4:/_, ||,@7,\,Ph,-3:/F +------------------------------------------------------------------------------ -Cat:antibacterial;EN:Sulfamonomethoxine;MW:280.302;EXA:- +Cat:antibacterial;EN:Sulfamonomethoxine;MW:280.302;EXA:1 + <30,Ph,1:/NH2,@4,\,SOO,!,NH,!,|,Ph,{2,4}:N,3:/O! +------------------------------------------------------------------------------ -Cat:antibacterial;EN:Sulfachlorpyridazine;MW:284.723;EXA:- +Cat:antibacterial;EN:Sulfachlorpyridazine;MW:284.723;EXA:1 + <30,Ph,1:/NH2,@4,\,SOO,!,NH,!,|,Ph,{5,6}:N,4:/Cl +------------------------------------------------------------------------------ @@ -2029,11 +2040,11 @@ Cat:antibacterial;EN:Pirimethamin;MW:248.714;EXA:1 + <30,?6,{1,4}=dl,{1,5}:N,4:/!,6://NH,@3,\,Ph,-3:/Cl +------------------------------------------------------------------------------ -Cat:antibacterial;EN:Oxibendazole;MW:249.27;EXA:1 +Cat:antibacterial;EN:Oxibendazole;MW:249.27;EXA:- + <30,Ph,-4=?5,9=dl,7:NH,9:N,1:/O!3,@8,\,NH,!,COOH +------------------------------------------------------------------------------ -Cat:antibacterial;EN:Oxolinic acid;MW:261.233;EXA:1 +Cat:antibacterial;EN:Oxolinic acid;MW:261.233;EXA:- + <30,Ph,3=?6,6=?5,9=dl,7:N,{11,13}:O,10://O,7:/!,9:/COOH +------------------------------------------------------------------------------ @@ -2077,7 +2088,7 @@ Cat:antibacterial;EN:Famphur;MW:325.3;EXA:- + <-30,!,O,!,P,//S,/O!^160,!,O,!,Ph,@-3,\,SOO,!,N!,! +------------------------------------------------------------------------------ -Cat:antibacterial;EN:Lincomycin;MW:406.54;EXA:1 +Cat:antibacterial;EN:Lincomycin;MW:406.54;EXA:- + <6,?5,5:N,5:*/_,2:*/!2, @3,\*,//O,!,NH,!,!~wb,?6,-1:O,-3:/*OH,{-4,-5}:*/OH,-2:/*S!, 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 64563827f0c..5f0d263bbb6 100644 --- a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_exa_soc.mf +++ b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_exa_soc.mf @@ -1,15 +1,15 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% Molecular Coding Format for mcf_example.tex by Akira Yamaji 2021.08.01 +% Molecular Coding Format for mcf_example.tex by Akira Yamaji 2021.09.05 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -input mcf2graph.mf; %%% it must be version 4.70 -message "* mcf_exa_soc 2021.08.01"; +input mcf2graph.mf; %%% it must be version 4.71 +message "* mcf_exa_soc 2021.09.05"; message ""; %------------------------------------------------------------------------------ fsize:=(35mm,24mm); -max_blength:=4.5mm; +max_blength:=4mm; +%%%%sw_frame:=Outside; tag1:="J"; tag2:="C"; tag3:="fm"; tag4:="mw"; tag5:="EN"; tag6:="MW"; %------------------------------------------------------------------------------ -%%%%sw_fframe:=1; %%%% outputformat:="png"; hppp:=vppp:=0.1; outputtemplate:="%j-%3c.png"; %ext(defaultfont:="uhvr8r"; defaultscale:=.6; label.lrt(inf_EN,(-2bp,1.5bp));) %sw_output:=Font; @@ -21,30 +21,14 @@ tag1:="J"; tag2:="C"; tag3:="fm"; tag4:="mw"; tag5:="EN"; tag6:="MW"; if f_MP=0: input mcf_exa_soc-mf.aux; % (metafont) make aux file before typeset else: % mpost -s ahlength=7 mcf_exa_soc.mf %------------------------------------------------------------------------------ -%%message "counr unit= "&decimal(count_data_unit("mcf_data_base")); -%****************************************************************************** -beginfont("f:mcf_data_base","t:EN","v:Adenine") % select EN=Adenine - if check(mc)=0: MC(scantokens(mc)) fi -endfont -%****************************************************************************** -beginfont("f:mcf_data_base","t:EN","v:Guanine") % select EN=Guanine - if check(mc)=0: MC(scantokens(mc)) fi -endfont -%****************************************************************************** -beginfont("f:mcf_data_base","t:EN","v:Cytosine") % select EN=Cytosine - if check(mc)=0: MC(scantokens(mc)) fi -endfont -%****************************************************************************** -beginfont("f:mcf_data_base","t:EN","v:Thymine") % select EN=Thymine - if check(mc)=0: MC(scantokens(mc)) fi -endfont -%****************************************************************************** -beginfont("f+:mcf_data_base","t:n","v:5") % 'f+'=keep file open - if check(mc)=0: MC(scantokens(mc)) fi % 'v:5' select No.5 -endfont +%%%%%query("Cat=biological","MW<150","s:MW"); +%%%%%query("Cat=biological","MW<150.0","s:EN"); +%%%%%query("MW>=150","MW<=300","s:MW"); +%%%%%query("i:mcf_data_base","o:temp","s:MW","s:EN"); %****************************************************************************** forever: -%%%%%%%%%% beginfont("f+:mcf_data_base","v:*") % select all +%%%%%%% beginfont("f+:temp","v:*") % use query output +%%%%%%% 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 % diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_example.pdf b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_example.pdf index ea5fc8c2c80..7ed3fd35fae 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 c9fe31929a4..46401394dd3 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} @@ -50,9 +50,9 @@ \ifeof\@auxf\CONT@false\else% \infotovar{\info}% \begin{picture}(3750,3350)% - \put(20,3000){\footnotesize\bf \the\f@num:\EN}% + \put(20,3000){\footnotesize\bf \EN}% \put(20,2750){\labelM MW:\mw { / }FM:\fm}% - \put(20,2530){\labelM MW:\MW(data)}% + \put(20,2530){\labelM MW:\MW(data){ / }[\the\f@num]}% \put( 0,0){% \makebox(3750,2530){% \ifx\f@ext\@pk{\font\@font=\jobname\@font\char\f@num}% 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 179f38de432..c9339f4fad7 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.08.01 +% Molecular Coding Format file for mcf_manual.tex by Akira.Yamaji 2021.09.05 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -input mcf2graph.mf; %% it must be version 4.70 +input mcf2graph.mf; %% it must be version 4.71 % ** use data base file 'mcf_data_base.mcf' -message "mcf_man_soc 2021.08.01"; message ""; +message "mcf_man_soc 2021.09.05"; 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 0cb30245add..58e5597e797 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 077d105ae3b..dceb5999f31 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.08.01 +% Molecular Coding Format manual by Akira Yamaji 2021.09.05 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \documentclass[a4paper]{article} \usepackage[pdftex]{graphicx} @@ -1629,7 +1629,65 @@ Cat:biological;EN:Linoleic acid;MW:280.45 <30,!5,-30,-30,!,-30,-30,!7,COOH,{6,9}=dr +------------------------------------------------------------------------------ \end{verbatim} -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%------------------------------------------------------------------------------ +\noindent% +\newpage +\subsection{Function query()} +\index{query()}% +\paragraph{(Example)} +\begin{verbatim} +%-------------------------------------------------------------- +% query() +% +% "i:filename" : input file name (default "mcf_data_base.mcf") +% "o:filename" : output file name (default "temp.mcf") +% "s:sort-key" : sort by sort-key +% +% = , <> , <= , >= , < , > +% +% filter 1 : Cat=biological +% filter 2 : MW>=285 +% filter 3 : MW<=295 +%-------------------------------------------------------------- +query("s:EN", +%%%%% "i:mcf_data_base.mcf","o:temp.mcf","s:EN", + "Cat=biological","MW>=285","MW<=295"); +%-------------------------------------------------------------- +forever: + beginfont("f+:temp","v:*") % use file temp.mcf / select all + if f_EOF=0: if check(mc)=0: MC(scantokens(mc)) fi fi + endfont + exitif (f_EOF=1)or(f_close=1); +endfor +%--------------------------------------------------------------- +\end{verbatim} +%--------------------------------------------------------------- +\paragraph{(output)} +\begin{verbatim} +Cat:biological;EN:Atoropin;MW:289.375;EXA:1 ++ +<30,O,!,//O,!,!,Ph,@$1,\~zb^-60,|,?7`1.1,@6,*\^190`1.25,N!,&3~wb,$3:/!OH~wv ++------------------------------------------------------------------------------ +Cat:biological;EN:Cianidanol;MW:290.27;EXA:1 ++ +<30,Ph,3=?6,@8,*\,Ph,7:O,{1,5,13,14}:/OH,9:/*OH ++------------------------------------------------------------------------------ +Cat:biological;EN:Lycorine;MW:287.315;EXA:1 ++ +<30,Ph,-4=?6,-2=?6,6=?5,(9,12)=?5[3],13=dl,8:N,{15,17}:O, + 9:/*H^180,10:*/H^60,13:*/OH,14:/*OH ++------------------------------------------------------------------------------ +Cat:biological;EN:Morphine;MW:285.343;EXA:1 ++ +<30,Ph,2=?6,-4=?6,(1,12)=?5[2],-1:O,-1=zb, + @7,60~wf`0.75,70~si_`1.3,45,N!,&9~wb,15=dl,6:/OH,8^180:*/H,12:/*OH ++------------------------------------------------------------------------------ +Cat:biological;EN:Piperine;MW:285.343;EXA:1 ++ +<30,Ph,|,-1=?5,{1,3}:O,@$4,\,!!,!,!!,!,//O,!,|,?6,1:N ++------------------------------------------------------------------------------ +\end{verbatim} +%------------------------------------------------------------------------------ \noindent% \newpage \subsection{Information aux file output} 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 6cfa746a5cc..0e527592ebf 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 e7e7614c289..825152629b1 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.08.01 +% Example of MCF typest with LuaLaTeX(luamplib) by A.Yamaji 2021.09.05 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% ** mcf2graph.mf must be version 4.70 +% ** mcf2graph.mf must be version 4.71 % ** use mcf_data_base.mcf \documentclass{article} %------------------------------------------------------------------------------ @@ -355,9 +355,3 @@ endfont \end{verbatim} %---------------------------------------------------------------------------- \end{document} -le",(0.5w,0.5h)); -) -endfont -\end{verbatim} -%---------------------------------------------------------------------------- -\end{document} -- cgit v1.2.3