diff options
Diffstat (limited to 'Master/texmf-dist/doc')
| -rw-r--r-- | Master/texmf-dist/doc/metapost/mcf2graph/CHANGELOG | 7 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/metapost/mcf2graph/README | 2 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/metapost/mcf2graph/mcf_data_base.mcf | 29 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/metapost/mcf2graph/mcf_exa_soc.mf | 6 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/metapost/mcf2graph/mcf_example.pdf | bin | 319961 -> 319308 bytes | |||
| -rw-r--r-- | Master/texmf-dist/doc/metapost/mcf2graph/mcf_example.tex | 2 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/metapost/mcf2graph/mcf_man_soc.mf | 6 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.pdf | bin | 381183 -> 381206 bytes | |||
| -rw-r--r-- | Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.tex | 2 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/metapost/mcf2graph/mcf_mplib_exa.pdf | bin | 184323 -> 184366 bytes | |||
| -rw-r--r-- | Master/texmf-dist/doc/metapost/mcf2graph/mcf_mplib_exa.tex | 47 |
11 files changed, 57 insertions, 44 deletions
diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/CHANGELOG b/Master/texmf-dist/doc/metapost/mcf2graph/CHANGELOG index 174d21ad00f..cb9a0d3779e 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-06 + Changelog of mcf2graph software package by Akira Yamaji 2021-06-13 ******************************************************************************* +[ver. 4.67 / 2021-06-13] + -fix bug in bond color + -update mcf_data_base.mcf + -update MCF manual,example + [ver. 4.66 / 2021-06-06] -add binary operator in {...} { a -- b , ...} : { a,a+1,...,b , ...} (a<b) diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/README b/Master/texmf-dist/doc/metapost/mcf2graph/README index 8a3a382c155..a2477d4372a 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.66 2021-06-06 + version : 4.67 2021-06-13 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 129239e46d0..87fabda340c 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.06 +% molecular data base file mcf_data_base.mcf by Akira Yamaji 2021.06.13 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % tag1:var1;tag2:var2;tag3:var3 ..... % first character of line '%' comment out @@ -699,8 +699,9 @@ 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,##, {12,14}=dl,2:O,1:/*_,5:/*OH,3://O,10:/*_,6:/*O!>vt, - @-6,\*,O,!~wb,?6`.7,-5:O,-3:/*N?!,-4:*/_, - @7,\*,O,0~wb,?6`.7,-5:O,-2:*/N?!,-1:/*OH,-4:*/_,-3:/*OH,@8,\*,!,!!,O + @-6,\*,O,!~wb,?6`.7,-5:O,-3:/*N?!`-.5,-4:*/_`-.5, + @7,\*,O,0~wb,?6`.7,-5:O,-2:*/N?!`-.5,-1:/*OH`-.5,-4:*/_`.5,-3:/*OH`-.5, + @8,\*,!,!!,O +------------------------------------------------------------------------------ Cat:antibiotics;EN:Emamectine;MW:886.133;EXA:1 + @@ -708,24 +709,24 @@ Cat:antibiotics;EN:Emamectine;MW:886.133;EXA:1 @5,#1.04,6,//O,-60,O,60~wb,60,-60,60~wf,60,-60,60,60,60,-60,60,##,&7, {-1,-3,-7}=dl,(-11,-10)=?6[4],@-2,?6,-6=wf,-1=zb,-5=dl, {-1,-6}:O,-3:*/_,@-2,\,*/_,!2, - 17:/_,19:/*_,@18,\,O,!,?6`.8,-1:O,-2:*/_,-4:*/O!, - @-3,\,O,60,?6`.8,-5:O,-4:*/_,-3:/*NH!,-2:*/O! + 17:/_,19:/*_,@18,\,O,!,?6`.7,-1:O,-2:*/_`.5,-4:*/O!`-.5, + @-3,\,O,60,?6`.7,-5:O,-4:*/_`.5,-3:/*NH!`-.5,-2:*/O!`-.5 +------------------------------------------------------------------------------ Cat:antibiotics;EN:Spinosad;MW:731.968;EXA:1 + <30,#1,<-120,60,60,-60,60,60,60,-60,60,60,60,-60,&1,##, 5=?5,-1=dl,{-2^60,-3^-35}:/*H,-3=?6,-4=dl, {-1^35}:*/H,{-2^-60}:/*H,-2=?5,2:O,{3^25,7^-25}://O,1:/!, - @-2,\~zf,O,66,?6`.8,-1:O,-2:/_,{-3,-4,-5}:/O!,8~wf:/Me,5^-65~wf:/H, - @9,\~zf,O,!,|,?6`.8,2:O,3:/_,-3:/N?! + @-2,\~zf,O,66,?6`.7,-1:O,-2:/_`.5,{-3,-4,-5}:/O!`-.5,8~wf:/Me`.5,5^-65~wf:/H, + @9,\~zf,O,!,|,?6`.7,2:O,3:/_`.5,-3:/N?!`-.5 +------------------------------------------------------------------------------ Cat:antibiotics;EN:Spiramycin;MW:843.1;EXA:1 + <-90,#1,60,60,-60,60,60,-60,60,60,-60,60,60,60,-60,60,-60,&1,##, {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}:/*_, + @-6,\*^-30,O,!~wb,?6`.7,-5:O,-3:/*N?!`-.5,-4:*/_`.5, + @7,\*,O,0~wb,?6`.7,-5:O,-2:*/N?!`-.5,-1:/*OH`-.5,-4:*/_`.5, + @-3,\*`1,O,60~wb`1.5,?6`.7,-5:O,{-2^35,-3}:*/OH`-.5,{-2^-35,-4}:/*_`.5, @8,\*,!,!!,O +------------------------------------------------------------------------------ Cat:antibiotics;EN:Natamycin;MW:665.733;EXA:1 @@ -734,15 +735,15 @@ Cat:antibiotics;EN:Natamycin;MW:665.733;EXA:1 60,60,-60,60,-60,60,-60,60,60,-60,&1,(12,13)=?6[4],##, {2,4,6,8,20}=dl,11=zb,23:O,-2:/*OH,-3:*/COOH, 18=?3,-1=wb,-2=wf,-1:O,22://O,24:*/_,{14^60,16}:*/OH, - @10,*\,O,90,?6`.8,-3:*/OH,-5:/*OH,-4:/*NH2,-1:O,-2:/*_ + @10,*\,O,90,?6`.7,-3:*/OH`-.5,-5:/*OH`-.5,-4:/*NH2`-.5,-1:O,-2:/*_`.5 +------------------------------------------------------------------------------ Cat:antibiotics;EN:Tylocin;MW:916.10;EXA:1 + <-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:/*_,-6://O,-3:/_, - @-1,*\,-60,O,0~wb,?6`.7,-5:O,-3:/*OH,-4:*/_,{-1,-2}:/*O!, - @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}:/*_, + @-1,*\,-60,O,0~wb,?6`.7,-5:O,-3:/*OH`-.5,-4:*/_`.5,{-1,-2}:/*O!`-.5, + @7,\*,O,0~wb,?6`.7,-5:O,-2:*/N?!`-.5,-1:/*OH`-.5,-4:*/_`.5, + @-3,\*`1,O,60~wb`1.5,?6`.7,-5:O,{-2^35,-3}:*/OH`-.5,{-2^-35,-4}:/*_`.5, @8,\*,!,!!,O +------------------------------------------------------------------------------ Cat:antibiotics;EN:Tilmicosin;MW:869.133;EXA:1 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 a6f4446129b..5ec224241a5 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.06 +% Molecular Coding Format for mcf_example.tex by Akira Yamaji 2021.06.13 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -input mcf2graph.mf; %%% it must be version 4.66 -message "* mcf_exa_soc 2021.06.06"; +input mcf2graph.mf; %%% it must be version 4.67 +message "* mcf_exa_soc 2021.06.13"; message ""; %------------------------------------------------------------------------------ fsize:=(35mm,24mm); diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_example.pdf b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_example.pdf Binary files differindex 2a1fe6b1ba5..098316c278d 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 c60790d138d..75d105d7ccf 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.06 +% Example of MCF typeset by LaTeX mcf_examples.tex by A.Yamaji 2021.06.13 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \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 16100feb75c..fc46f3053b4 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.06 +% Molecular Coding Format file for mcf_manual.tex by Akira.Yamaji 2021.06.13 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -input mcf2graph.mf; %% it must be version 4.66 +input mcf2graph.mf; %% it must be version 4.67 % ** use data base file 'mcf_data_base.mcf' -message "mcf_man_soc 2021.06.06"; message ""; +message "mcf_man_soc 2021.06.13"; 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 Binary files differindex 77141eb4dcf..c851eb3d2d2 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 005dbfe129e..85bf13d5931 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.06 +% Molecular Coding Format manual by Akira Yamaji 2021.06.13 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \documentclass[a4paper]{article} \usepackage[pdftex]{graphicx} diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_mplib_exa.pdf b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_mplib_exa.pdf Binary files differindex ace65bc7e62..8d688f80528 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 caf7e504923..5f4255aee61 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.06 +% Example of MCF typest with LuaLaTeX(luamplib) by A.Yamaji 2021.06.13 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% ** mcf2graph.mf must be version 4.66 +% ** mcf2graph.mf must be version 4.67 % ** use mcf_data_base.mcf \documentclass{article} %------------------------------------------------------------------------------ @@ -14,8 +14,8 @@ \everymplib{% if unknown Ph1: input mcf2graph.mf; fi outputformat:="eps"; - tag1:="J"; tag2:="C"; tag3:="fm"; tag4:="mw"; tag5:="EN"; tag6:="MW"; sw_output:=Font; + tag1:="J"; tag2:="C"; tag3:="fm"; tag4:="mw"; tag5:="EN"; tag6:="MW"; max_blength:=4.5mm; defaultfont:="uhvr8r"; defaultsize:=8bp; @@ -102,13 +102,13 @@ endfont; %---------------------------------------------------------------------------- \begin{verbatim} beginfont("EN:Erythromycin","MW:733.93", - %------------------------------------------------------------------ - ": <30,#1,<-120,60,60,60,-60,60,60,-60,60,60,60,-60,60,60,##,&1, ", - ": 14:O,13:/*Et,{1,9}://O,{2,10}:*/_,{4,6^-35,8,12^35}:/*_, ", - ": {6^35,11,12^-35}:*/OH, ", - ": @$3,\*,O,30,|,?6`.7,2:O,{3,5^35}:/_,4:/OH,5^-35:/O!, ", - ": @$5,\*^30`1.7,O,!,|,?6`.7,6:O,5:/_,2:/OH,3:/N?! ") - %------------------------------------------------------------------ + %-------------------------------------------------------------------- + ": <30,#1,<-120,60,60,60,-60,60,60,-60,60,60,60,-60,60,60,##,&1, ", + ": 14:O,13:/*Et,{1,9}://O,{2,10}:*/_,{4,6^-35,8,12^35}:/*_, ", + ": {6^35,11,12^-35}:*/OH, ", + ": @$3,\*,O,30,|,?6`.7,2:O,{3,5^35}:/_`.5,4:/OH`.-.5,5^-35`-.5:/O!, ", + ": @$5,\*^30`1.7,O,!,|,?6`.7,6:O,5:/_`.5,2:/OH`-.5,3:/N?!`-.5 ") + %-------------------------------------------------------------------- fsize:=(120mm,30mm); if check(mc)=0: MC(scantokens(mc)) fi endfont; @@ -116,13 +116,13 @@ endfont; %---------------------------------------------------------------------------- \begin{mplibcode} beginfont("EN:Erythromycin","MW:733.93", - %------------------------------------------------------------------ - ": <30,#1,<-120,60,60,60,-60,60,60,-60,60,60,60,-60,60,60,##,&1, ", - ": 14:O,13:/*Et,{1,9}://O,{2,10}:*/_,{4,6^-35,8,12^35}:/*_, ", - ": {6^35,11,12^-35}:*/OH, ", - ": @$3,\*,O,30,|,?6`.7,2:O,{3,5^35}:/_,4:/OH,5^-35:/O!, ", - ": @$5,\*^30`1.7,O,!,|,?6`.7,6:O,5:/_,2:/OH,3:/N?! ") - %------------------------------------------------------------------ + %-------------------------------------------------------------------- + ": <30,#1,<-120,60,60,60,-60,60,60,-60,60,60,60,-60,60,60,##,&1, ", + ": 14:O,13:/*Et,{1,9}://O,{2,10}:*/_,{4,6^-35,8,12^35}:/*_, ", + ": {6^35,11,12^-35}:*/OH, ", + ": @$3,\*,O,30,|,?6`.7,2:O,{3,5^35}:/_`.5,4:/OH`.-.5,5^-35`-.5:/O!, ", + ": @$5,\*^30`1.7,O,!,|,?6`.7,6:O,5:/_`.5,2:/OH`-.5,3:/N?!`-.5 ") + %-------------------------------------------------------------------- fsize:=(120mm,30mm); if check(mc)=0: MC(scantokens(mc)) fi ext(defaultscale:=0.8; @@ -221,10 +221,10 @@ endfont %-------------------------------------------------------------------------------- \begin{mplibcode} beginfont("f:mcf_data_base","t:EN","v:Maitotoxin") - sw_output:=Info+Mcode+Temp; %%%% output temp-info,temp-mc.aux %%%% - endfont; + sw_output:=Info+Mcode+Temp; %%%% output temp-info.aux %%%% + if check(mc)=0: MC(scantokens(mc)) fi + endfont \end{mplibcode} -\verbatiminput{temp-mc.aux} %%%% input temp-mc.aux %%%% \begin{mplibcode} beginfont("f:mcf_data_base","t:EN","v:Maitotoxin") fsize:=(120mm,60mm); fmargin:=(0,3mm); sw_frame:=Outside; @@ -237,6 +237,7 @@ endfont \read\auxfile to \info% \infotovar{\info} %%%% info to variables %%%% \closein\auxfile% +\verbatiminput{temp-mc.aux} %%%% input temp-mc.aux %%%% {\tt ** EN:\EN \quad MW(C):\MW \quad MW(D):\mw \quad FM(C):\fm}% %-------------------------------------------------------------------------------- %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -354,3 +355,9 @@ endfont \end{verbatim} %---------------------------------------------------------------------------- \end{document} +le",(0.5w,0.5h)); +) +endfont +\end{verbatim} +%---------------------------------------------------------------------------- +\end{document} |