From d291f73c830f767b003eabd72656e171ef0e4597 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 20 Sep 2021 20:04:12 +0000 Subject: mcf2graph (20sep21) git-svn-id: svn://tug.org/texlive/trunk@60565 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/metapost/mcf2graph/CHANGELOG | 14 +++- Master/texmf-dist/doc/metapost/mcf2graph/README | 19 ++--- .../doc/metapost/mcf2graph/mcf_data_base.mcf | 10 ++- .../doc/metapost/mcf2graph/mcf_exa_soc.mf | 27 +++---- .../doc/metapost/mcf2graph/mcf_example.pdf | Bin 314296 -> 314077 bytes .../doc/metapost/mcf2graph/mcf_example.tex | 4 +- .../doc/metapost/mcf2graph/mcf_man_soc.mf | 8 +- .../doc/metapost/mcf2graph/mcf_manual.pdf | Bin 383098 -> 344886 bytes .../doc/metapost/mcf2graph/mcf_manual.tex | 85 ++++++++++++--------- .../doc/metapost/mcf2graph/mcf_mplib_exa.pdf | Bin 184493 -> 184158 bytes .../doc/metapost/mcf2graph/mcf_mplib_exa.tex | 22 +++--- 11 files changed, 108 insertions(+), 81 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 bb647d91458..4ed3c84848c 100644 --- a/Master/texmf-dist/doc/metapost/mcf2graph/CHANGELOG +++ b/Master/texmf-dist/doc/metapost/mcf2graph/CHANGELOG @@ -1,6 +1,18 @@ ******************************************************************************* - Changelog of mcf2graph software package by Akira Yamaji 2021-09-05 + Changelog of mcf2graph software package by Akira Yamaji 2021-09-20 ******************************************************************************* +[ver. 4.72 / 2021-09-20] + -change syntax of beginfont() + keep file open 'f+' => 'v+' + enable to use default input file name + -change syntax of query() + input file name 'i:' => 'f:' + -fix bug in beginfont(),endfont + -fix bug in query() + -fix bug in expand mode + -update mcf_data_base.mcf + -update MCF manual,example + [ver. 4.71 / 2021-09-05] -add function query() for data base file -update mcf_data_base.mcf diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/README b/Master/texmf-dist/doc/metapost/mcf2graph/README index 1fe6d2a6321..aa2aee88f55 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.71 2021-09-05 + version : 4.72 2021-09-20 E-mail : mcf2graph@gmail.com Located at : http://www.ctan.org/pkg/mcf2graph ******************************************************************************** @@ -26,7 +26,7 @@ make file 'mcf_man_soc-***.mps' before typeset >mpost mcf_man_soc.mf ( 7) mcf_man_soc.mf Molecular definition file for mcf_manual.tex - ( 8) mcf_manual.pdf PDF of (4) (used pdftex(LaTeX),makeindex) + ( 8) mcf_manual.pdf PDF of (6) (used pdftex(LaTeX),makeindex) ( 9) mcf_example.tex LaTeX example make file 'mcf_exa_soc-info.aux' before typeset >mpost -s ahlength=1 mcf_exa_soc.mf @@ -36,9 +36,9 @@ make file 'mcf_exa_soc-mf.aux' before typeset >mpost -s ahlength=7 mcf_exa_soc.mf (10) mcf_exa_soc.mf Metafont/Metapost souce file for mcf_example.tex - (11) mcf_example.pdf PDF of (8) typeset with pdftex(LaTeX) + (11) mcf_example.pdf PDF of (9) typeset with pdftex(LaTeX) (12) mcf_mplib_exa.tex luamplib(LuaLaTeX) example - (13) mcf_mplib_exa.pdf PDF of (11) typeset with LuaTeX(LaTeX) + (13) mcf_mplib_exa.pdf PDF of (12) typeset with LuaTeX(LaTeX) 3. How to use mcf2graph with Metapost Minimum requirement to use mcf2graph : mpost.exe,mpost.dll,mpost.mp,plain.mp @@ -48,17 +48,18 @@ ( 4) >mpost -s ahangle=11 FILENAME => output png file (1200dpi) ( 5) >mpost -s ahangle=2 FILENAME => output svg file ( 6) >mpost -s ahangle=3 FILENAME => output eps(.eps) file - ( 7) >mpost -s ahlength=1 FILENAME => output info-aux file + ( 7) >mpost -s ahlength=1 FILENAME => output information-aux file tag1:var1;tag2:var2; - ( 8) >mpost -s ahlength=2 FILENAME => output aux file + ( 8) >mpost -s ahlength=2 FILENAME => output information-aux file tag1;tag2; var1;var2; ( 9) >mpost -s ahlength=3 FILENAME => output report file (10) >mpost -s ahlength=5 FILENAME => output mol file(V2000) (11) >mpost -s ahlength=6 FILENAME => output mol file(V3000) - (12) >mpost -s ahlength=7 FILENAME => output mf-aux file - (13) >mpost -s labeloffset=1 FILENAME => use plain.mp 'label','drawarrow' - (14) >mpost -s labeloffset=2 FILENAME => atomfont="uhvr8r" + (12) >mpost -s ahlength=7 FILENAME => output metafont-aux file + (13) >mpost -s ahlength=8 FILENAME => output data-base-aux file + (14) >mpost -s labeloffset=1 FILENAME => use plain.mp 'label','drawarrow' + (15) >mpost -s labeloffset=2 FILENAME => atomfont="uhvr8r" 4. License Permission is hereby granted, free of charge, to any person obtaining a copy 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 cb535a710fd..8d415675701 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.05 +% molecular data base file mcf_data_base.mcf by Akira Yamaji 2021.09.20 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % tag1:var1;tag2:var2;tag3:var3 ..... % first character of line "%" comment out @@ -36,6 +36,10 @@ Cat:biological;EN:Glycine;MW:75.07;EXA:- + <30,NH2,!2,COOH +------------------------------------------------------------------------------ +Cat:biological;EN:Glycine;MW:75.07;EXA:- ++ +<30,NH2,!2,COOH ++------------------------------------------------------------------------------ Cat:biological;EN:L-Alanine;MW:89.10;EXA:- + <30,NH2,!~wb,/_,!,COOH @@ -46,9 +50,9 @@ Cat:biological;EN:L-Valine;MW:117.15;EXA:- +------------------------------------------------------------------------------ Cat:biological;EN:L-Leucine;MW:131.16;EXA:1 + -<30,NH2,!~wb,/'(!,?!),!,COOH +<30,NH2,!~wb,/!?!,!,COOH +------------------------------------------------------------------------------ -Cat:biological;EN:L-Isoleucine;MW:131.16;EXA:- +Cat:biological;EN:L-Isoleucine;MW:131.16;EXA:9 + <30,NH2,!~wb,/'(/*_,!2),!,COOH +------------------------------------------------------------------------------ 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 5f0d263bbb6..b5513ffbf03 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.05 +% Molecular Coding Format for mcf_example.tex by Akira Yamaji 2021.09.20 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -input mcf2graph.mf; %%% it must be version 4.71 -message "* mcf_exa_soc 2021.09.05"; +input mcf2graph.mf; %%% it must be version 4.72 +message "* mcf_exa_soc 2021.09.20"; message ""; %------------------------------------------------------------------------------ fsize:=(35mm,24mm); @@ -21,18 +21,19 @@ 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 %------------------------------------------------------------------------------ -%%%%%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"); +%%%%query("Cat=biological","MW<200","s:MW"); +%%%%query("Cat=biological","MW<150.0","s:EN"); +%%%%query("MW>=150","MW<=200","s:MW"); %****************************************************************************** +%%%% beginfont("t:EN","v:Caffeine") % select EN=Caffeine forever: -%%%%%%% 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 % - exitif (f_EOF=1)or(f_close=1); % exit if file end +%%%% beginfont("f:mcf_data_base","v+:*") % 'mcf_data_base.mcf'(default) +%%%% beginfont("f:temp","v+:*") % use query output +%%%% beginfont("v+:*") % select all + beginfont("t:EXA","v+:1") % 'v+:1': select EXA=1 + if f_EOF=0: if check(mc)=0: MC(scantokens(mc)) fi fi + endfont + exitif f_EOF=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 7ed3fd35fae..6d2b88c7e0f 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 46401394dd3..a61439d39b5 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.08.01 +% Example of MCF typeset by LaTeX mcf_examples.tex by A.Yamaji 2021.09.20 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \documentclass[a4paper]{article} \usepackage{graphicx} @@ -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 c9339f4fad7..3b5e2ce3073 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.05 +% Molecular Coding Format file for mcf_manual.tex by Akira.Yamaji 2021.09.20 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -input mcf2graph.mf; %% it must be version 4.71 +input mcf2graph.mf; %% it must be version 4.72 % ** use data base file 'mcf_data_base.mcf' -message "mcf_man_soc 2021.09.05"; message ""; +message "mcf_man_soc 2021.09.20"; message ""; %------------------------------------------------------------------------ sw_mframe:=0; sw_expand:=0; @@ -1240,7 +1240,7 @@ beginfont("EN:?6") endfont defaultsize:=save_defaultsize; %*************************************************************************** -beginfont("f:mcf_data_base","t:EN","v:Luciferin") +beginfont("t:EN","v:Luciferin") fsize:=(50mm,15mm); if check(mc)=0: MC(scantokens(mc)) fi endfont diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.pdf b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.pdf index 58e5597e797..070738c2345 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 dceb5999f31..59745ac19ad 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.05 +% Molecular Coding Format manual by Akira Yamaji 2021.09.20 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \documentclass[a4paper]{article} \usepackage[pdftex]{graphicx} @@ -7,8 +7,8 @@ \usepackage{makeidx} \makeindex \hypersetup{colorlinks=true,linkcolor=blue} -\makeatletter \usepackage{mcf_setup} +\edef\MCFjobname{mcf_man_soc}% %---------------------------------------------------------------------------- %%%%\pdfpkresolution=1200 %---------------------------------------------------------------------------- @@ -38,7 +38,7 @@ \htmans=42mm% \fnum=1% %---------------------------------------------------------------------------- -\edef\MCFjobname{mcf_man_soc}% +\makeatletter %---------------------------------------------------------------------------- \font\@strufont=\MCFjobname\relax% %---------------------------------------------------------------------------- @@ -52,7 +52,7 @@ \fi% \global\advance\fnum\@ne\relax% }% -%--------------------------------------------------------------------------- +%---------------------------------------------------------------------------- \def\put@char{% \begin{picture}(75,100)% \put(0,95){\bf [\NO]\EN}% @@ -1542,27 +1542,27 @@ beginfont("EN:Cholesterol","MW:386.65", >information if check(mc)=0: MC(scantokens(mc)) fi > mc=mc1 - mc4 endfont > %------------------------------------------------------------------------------ -beginfont("f:mcf_data_base","t:EN","v:Adenine") > from mcf_data_base.mcf +beginfont("f:mcf_data_base.mcf","t:EN","v:Adenine") > from mcf_data_base.mcf if check(mc)=0: MC(scantokens(mc)) fi > select EN="Adenine" endfont > %------------------------------------------------------------------------------ -beginfont("f:mcf_data_base","t:EN","v:Guanine") > from mcf_data_base.mcf - if check(mc)=0: MC(scantokens(mc)) fi > select EN="Guanine" +beginfont("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") > from mcf_data_base.mcf - if check(mc)=0: MC(scantokens(mc)) fi > select EN="Cytosine" +beginfont("t:EN","v:Cytosine") > select EN="Cytosine" + if check(mc)=0: MC(scantokens(mc)) fi > endfont > %------------------------------------------------------------------------------ -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 +beginfont("t:n","v+:4") > v+:4 = select No.4 + if check(mc)=0: MC(scantokens(mc)) fi > keep file open +endfont > %------------------------------------------------------------------------------ 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 > +%%%%%%%%%% beginfont("f:mcf_data_base","v+:*") > select all + 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 endfor %------------------------------------------------------------------------------ @@ -1639,25 +1639,25 @@ Cat:biological;EN:Linoleic acid;MW:280.45 %-------------------------------------------------------------- % query() % -% "i:filename" : input file name (default "mcf_data_base.mcf") +% "f:filename" : input file name (default "mcf_data_base.mcf") % "o:filename" : output file name (default "temp.mcf") % "s:sort-key" : sort by sort-key % -% = , <> , <= , >= , < , > +% operator : = , <> , <= , >= , < , > % -% filter 1 : Cat=biological -% filter 2 : MW>=285 -% filter 3 : MW<=295 +% 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", +%%%%% "f: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 + 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); + exitif f_EOF=1; endfor %--------------------------------------------------------------- \end{verbatim} @@ -1713,6 +1713,7 @@ Cat:biological;EN:Piperine;MW:285.343;EXA:1 sw_output:=Info; %% tag1:var1;tag2:var2 sw_output:=Info+Table; %% tag1;tag2 var1;var2 sw_output:=Info+Temp; %% tag1:var1;tag2:var2 / output 'temp-info.aux' + sw_output:=Info+Mcode; %% output jobname&'.aux' sw_output:=Info+Mcode+Temp; %% output 'temp-info.aux','temp-mc.aux' sw_output:=Font+Info+Temp; %% output font,'temp-info.aux','temp-mc.aux' \end{verbatim} @@ -1843,29 +1844,42 @@ endfont \index{Mcode}% \index{Temp}% \begin{verbatim} -sw_output:=Mcode; +sw_output:=Mcode; %% output 'jobname-nnn-EN-mc.aux' sw_output:=Mcode+Temp; %% output 'temp-mc.aux' +sw_output:=Info+Mcode; %% output 'jobname-data.aux' sw_output:=Info+Mcode+Temp; %% output 'temp-info.aux','temp-mc.aux' sw_output:=Font+Mcode+Temp; %% output font,'temp-mc.aux' sw_output:=Font+Info+Mcode+Temp; %% output font,'temp-info.aux','temp-mc.aux' \end{verbatim} \paragraph{(Command line)} \begin{verbatim} - >mpost -s ahlength=8 FILENAME (sw_output=Mcode) + >mpost -s ahlength=8 FILENAME (sw_output=Info+Mcode) \end{verbatim} -\paragraph{(file name)} +\paragraph{(Output temporary file)} \begin{verbatim} sw_output=Mcode ** file name = 'jobname-nnn-EN-mc.aux' sw_output=Mcode+Temp ** file name = 'temp-mc.aux' (result) <30,?6,3=?5,{1,3,5,9}=dl,{2,6,9}:N,5:/NH2,7:NH + +\end{verbatim} +\paragraph{(Output data-base file)} +\begin{verbatim} +sw_output=Mcode+Info ** file name = 'jobname-data.aux' + +(result) +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 ++-------------------------------------------------- + \end{verbatim} %------------------------------------------------------------------------ \paragraph{(Lualatex example)} %----------------------------------------------------------------------- \begin{verbatim} -beginfont("f:mcf_data_base","t:EN","v:Adenine") +beginfont("t:EN","v:Adenine") sw_output:=Mcode+Temp; endfont \end{verbatim} @@ -1873,7 +1887,7 @@ endfont \begin{verbatim} %----------------------------------------------------------------------- \begin{mplibcode} - beginfont("f:mcf_data_base","t:EN","v:Vancomycin") + beginfont("t:EN","v:Vancomycin") sw_output:=Mcode+Temp; %%%% output temp-mc.aux %%%% endfont; \end{mplibcode} @@ -1884,17 +1898,12 @@ endfont %----------------------------------------------------------------------- \begin{verbatim} (result) - file name = 'temp-mc.aux' -<-30,#1,!12,{1,3,12}=zf,7=wf,/H^-60,60,*/OH,60, - Ph,-4:/Cl,@-3,\,O,!,Ph,@-4,\,O,!,Ph,-1^15:/Cl,@-3,\,/*OH,*/H^-60,&1, - @7,&26,@$1,60,//O,60,NH,60,/*H,*/COOH^180,-60, - Ph,{-2,-4}:/OH,@-1,\,Ph,-5:/OH,@-2,&4,##, - {3^40,6,9,12}://O,{2,5,8,11}:NH,{1,4^180}:*/H,{7^-60,10^60,14^60}:/*H, - @10,*\^-60,60,//O,!,NH2,@13,*\,NH,!,//O,!,/??!,*/H^60,!~zf,NH,!, - @23,\,O,!,|,?6`.7,2:O,3^10:/!OH,{4,5}:/OH, - @-1,\,O,!,|,?6`.7,6:O,{3^35,5}:/_,3^-35:/NH2,4:/OH +<30,?6,@4,?6,@-4,\,!3,<-12,?5,@-3,<-12,?6,-3=?6,@-3,*\,!3, + ?6,@-4,?6,@6,\,!,/*Me^-40,*/OH^20,!,//O,!1,OH, + 3=wb,11=dl,15=dr,17=wf,19=wf,38=wb,{5,7,16,24,25,33,42}:O, + 32:*/H^60,10:/Me,{12,31}:*/_,27://_,37:/*_,28:/OH,{3,29}:/*OH \end{verbatim} %------------------------------------------------------------------------ \newpage 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 0e527592ebf..cb28688db61 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 825152629b1..b204383651a 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.05 +% Example of MCF typest with LuaLaTeX(luamplib) by A.Yamaji 2021.09.20 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% ** mcf2graph.mf must be version 4.71 +% ** mcf2graph.mf must be version 4.72 % ** use mcf_data_base.mcf \documentclass{article} %------------------------------------------------------------------------------ @@ -14,7 +14,7 @@ \everymplib{% if unknown Ph1: input mcf2graph.mf; fi outputformat:="eps"; - sw_output:=Font; + sw_output:=Font+Info+Temp; tag1:="J"; tag2:="C"; tag3:="fm"; tag4:="mw"; tag5:="EN"; tag6:="MW"; max_blength:=4.5mm; defaultfont:="uhvr8r"; @@ -47,7 +47,7 @@ \subsection{Chlorophyll a} \noindent% \begin{verbatim} -beginfont("f:mcf_data_base","t:EN","v:Chlorophyll a","NO:-", +beginfont("f:mcf_data_base.mcf","t:EN","v:Chlorophyll a","NO:-", ":,||,{4,11,17,23}:red,27:green") %%%% change color of atoms %%%% fsize:=(100mm,45mm); if check(mc)=0: MC(scantokens(mc)) fi @@ -59,7 +59,7 @@ endfont \end{verbatim} %------------------------------------------------------------------------------------ \begin{mplibcode} -beginfont("f:mcf_data_base","t:EN","v:Chlorophyll a","NO:-", +beginfont("f:mcf_data_base.mcf","t:EN","v:Chlorophyll a","NO:-", ":,||,{4,11,17,23}:red,27:green") %%%% change color of atoms %%%% fsize:=(100mm,45mm); if check(mc)=0: MC(scantokens(mc)) fi @@ -73,7 +73,7 @@ endfont \subsection{Dinophysistoxin-1} \noindent% \begin{verbatim} -beginfont("f:mcf_data_base","t:EN","v:Okadaic acid","EN:Dinophysistoxin-1", +beginfont("t:EN","v:Okadaic acid","EN:Dinophysistoxin-1", "MW:819",":,38:*/_,65=red") %%%% add methyl group (color red) %%%% fsize:=(150mm,35mm); if check(mc)=0: MC(scantokens(mc)) fi @@ -85,7 +85,7 @@ endfont; \end{verbatim} %---------------------------------------------------------------------------- \begin{mplibcode} -beginfont("f:mcf_data_base","t:EN","v:Okadaic acid","EN:Dinophysistoxin-1", +beginfont("t:EN","v:Okadaic acid","EN:Dinophysistoxin-1", "MW:819",":,38:*/_,65=red") %%%% add methyl group (color red) %%%% fsize:=(150mm,35mm); if check(mc)=0: MC(scantokens(mc)) fi @@ -198,13 +198,13 @@ endfont \begin{verbatim} %-------------------------------------------------------------------------------- \begin{mplibcode} - beginfont("f:mcf_data_base","t:EN","v:Maitotoxin") + beginfont("t:EN","v:Maitotoxin") sw_output:=Info+Mcode+Temp; %%%% output temp-info,temp-mc.aux %%%% endfont; \end{mplibcode} \verbatiminput{temp-mc.aux} %%%% input temp-mc.aux %%%% \begin{mplibcode} - beginfont("f:mcf_data_base","t:EN","v:Maitotoxin") + beginfont("t:EN","v:Maitotoxin") fsize:=(120mm,60mm); fmargin:=(0,3mm); sw_frame:=Outside; if check(mc)=0: MC(scantokens(mc)) fi %%%% output font %%%% endfont @@ -220,13 +220,13 @@ endfont \end{verbatim} %-------------------------------------------------------------------------------- \begin{mplibcode} - beginfont("f:mcf_data_base","t:EN","v:Maitotoxin") + beginfont("t:EN","v:Maitotoxin") sw_output:=Info+Mcode+Temp; %%%% output temp-info.aux %%%% if check(mc)=0: MC(scantokens(mc)) fi endfont \end{mplibcode} \begin{mplibcode} - beginfont("f:mcf_data_base","t:EN","v:Maitotoxin") + beginfont("t:EN","v:Maitotoxin") fsize:=(120mm,60mm); fmargin:=(0,3mm); sw_frame:=Outside; if check(mc)=0: MC(scantokens(mc)) fi %%%% output font %%%% endfont -- cgit v1.2.3