diff options
author | Karl Berry <karl@freefriends.org> | 2022-11-12 20:52:50 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2022-11-12 20:52:50 +0000 |
commit | f5594b23d4f5bd12b365ce678feb79f25034fe95 (patch) | |
tree | 56b61a97b278ef0d657139dc27c72de4a0145adc /Master | |
parent | 8d0c9f6ae8da0c82851c6dc9c10ac16992a2e75a (diff) |
mcf2graph (12nov22)
git-svn-id: svn://tug.org/texlive/trunk@64999 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
14 files changed, 71 insertions, 51 deletions
diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/CHANGELOG b/Master/texmf-dist/doc/metapost/mcf2graph/CHANGELOG index d8a9090da37..a166130976b 100644 --- a/Master/texmf-dist/doc/metapost/mcf2graph/CHANGELOG +++ b/Master/texmf-dist/doc/metapost/mcf2graph/CHANGELOG @@ -1,6 +1,14 @@ ******************************************************************************* - Changelog of mcf2graph software package by Akira Yamaji 2022-11-06 + Changelog of mcf2graph software package by Akira Yamaji 2022-11-12 ******************************************************************************* +[ver. 4.90 / 2022-11-12] + -change syntax of fused ring + {a--b}=?n => a--b=?n (n:4,5,6) + {a---b}=?n => a---b=?n (n:5,6) + {a----b}=?6 => a----b=?6 + -update MCF manual + -update mcf_library.mcf + [ver. 4.89 / 2022-11-06] -change syntax of fused ring (a,b)=?n => {a--b}=?n diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/README b/Master/texmf-dist/doc/metapost/mcf2graph/README index 76578d6375d..617ece4e822 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 MetaPost Author : Akira Yamaji - version : 4.89 2022-11-06 + version : 4.90 2022-11-12 E-mail : mcf2graph@gmail.com Located at : http://www.ctan.org/pkg/mcf2graph ******************************************************************************** diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/mcf2graph.mp b/Master/texmf-dist/doc/metapost/mcf2graph/mcf2graph.mp index 1961a2ee890..53db36ab098 100644 --- a/Master/texmf-dist/doc/metapost/mcf2graph/mcf2graph.mp +++ b/Master/texmf-dist/doc/metapost/mcf2graph/mcf2graph.mp @@ -1,5 +1,5 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% mcf2graph ver 4.89 Copyright (c) 2013-2022 Akira Yamaji +% mcf2graph ver 4.90 Copyright (c) 2013-2022 Akira Yamaji % % Permission is hereby granted, free of charge, to any person obtaining a copy of this software % and associated documentation files (the "Software"), to deal in the Software without restriction, @@ -33,7 +33,7 @@ % Set output MOL file (V3000) : mpost -s ahlength=6 FILENAME % Set output report : mpost -s ahlength=7 FILENAME %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -message "* This is mcf2graph ver 4.89 2022.11.06"; +message "* This is mcf2graph ver 4.90 2022.11.12"; tracingstats:=1; prologues:=3; warningcheck:=0; %------------------------------------------------------------------------------------------------- newinternal string EN_; @@ -364,10 +364,11 @@ def read_mcf(expr n)(text t)= save nCP; if unknown inside_MC:: save /,//,/*,*/,**,*/*,~,^,',`,<,>,:,=,\,\\,*\,\*,*\*,@,@$,$,&,&$,#,##,{,},|,||,_,CP,CA, - inside_MC; + --,---,----,inside_MC; | :=mark_adress; || :=reset_adress; ##:=reset_length; _:=Me; \:=0; \\:=zero_dm; *\:=zero_wf; \*:=zero_zf; *\*:=zero_wv; let = ==op_equ; let : ==op_col; let ^==op_hat; let ~==op_til; let > ==op_lth; let `==op_bqu; + let -- == bond__bond; let --- == bond___bond; let ---- == bond____bond; def $==abs_adress enddef; def &$==&.$ enddef; def '==read_id enddef; def {==read_number( enddef; def CP == com_par enddef; def CA == com_par_adr enddef; let }==); let @$==jump_atom_abs; let < ==rot_angle; let @==jump_atom; let &==cyc_atom; @@ -396,9 +397,8 @@ def read_mcf(expr n)(text t)= enddef; %------------------------------------------------------------------------------------------------- vardef read_number(text t)= - save --,---,----,:,','`; - let : == from_until; let -- == bond__bond; let --- == bond___bond; let ---- == bond____bond; - def ' == +0.5 enddef; def '` == +0.5` enddef; parts_int:=parts_int+1; + save :,','`; + let : == from_until; def ' == +0.5 enddef; def '` == +0.5` enddef; parts_int:=parts_int+1; nA:=0; for list==t:: if known list:: @@ -426,13 +426,13 @@ def fuse_ring(expr a,b) = for i==1 upto b-2:: CP(_mk_bond,360 DIV b) endfor CP(_com,_len_e) if a<=0:: CP(_cyc_eB,a-b+2) else:: CP(_cyc_eB,a) fi enddef; %------------------------------------------------------------------------------------------------- -def fuse_ring_bonds(expr a,b,c) = - CP(_jp_bond,xpart(a)) CP(_rot_ang,180) CP(_com,_len_s) +def fuse_ring_bonds(expr s,e,b,c) = + CP(_jp_bond,s) CP(_rot_ang,180) CP(_com,_len_s) if b==6:: CP(_chg_len,1) for i==1 upto c-1:: CP(_mk_bond,60) endfor ef b==5:: if c==2:: CP(_chg_len,1.25) CP(_mk_bond,80) ef c==3:: CP(_chg_len,1.1) CP(_mk_bond,78) CP(_mk_bond,72) fi ef b==4:: CP(_chg_len,1.225) CP(_mk_bond,105) fi - CP(_com,_len_e) if ypart(a)<=0:: CP(_cyc_eB,ypart(a)-c+1) else:: CP(_cyc_eB,ypart(a)) fi + CP(_com,_len_e) if e<=0:: CP(_cyc_eB,e-c+1) else:: CP(_cyc_eB,e) fi enddef; %------------------------------------------------------------------------------------------------- def fuse_ring_size(expr a,b,c) = @@ -473,17 +473,17 @@ vardef change_bond(expr a,b) = else:: if b==?6:: if (frac parts_com[a][i]==0)and(frac parts_par[a][i]==0):: - fuse_ring_bonds((parts_com[a][i],parts_par[a][i]),6,4) + fuse_ring_bonds(parts_com[a][i],parts_par[a][i],6,4) ef frac parts_par[a][i]==0:: - fuse_ring_bonds((floor parts_com[a][i],parts_par[a][i]),6,3) - else:: fuse_ring_bonds((floor parts_com[a][i],floor parts_par[a][i]),6,2) fi + fuse_ring_bonds(floor parts_com[a][i],parts_par[a][i],6,3) + else:: fuse_ring_bonds(floor parts_com[a][i],floor parts_par[a][i],6,2) fi ef b==?5:: if (frac parts_com[a][i]==0)and(frac parts_par[a][i]==0):: - fuse_ring_bonds((parts_com[a][i],parts_par[a][i]),5,3) + fuse_ring_bonds(parts_com[a][i],parts_par[a][i],5,3) ef frac parts_par[a][i]==0:: - fuse_ring_bonds((floor parts_com[a][i],floor parts_par[a][i]),5,2) fi - ef b==?4:: fuse_ring_bonds((parts_com[a][i],parts_par[a][i]),4,2) - ef b==Ph1:: fuse_ring_bonds((parts_com[a][i],parts_par[a][i]),6,4) + fuse_ring_bonds(floor parts_com[a][i],parts_par[a][i],5,2) fi + ef b==?4:: fuse_ring_bonds(parts_com[a][i],parts_par[a][i],4,2) + ef b==Ph1:: fuse_ring_bonds(parts_com[a][i],parts_par[a][i],6,4) CA(_set_line,dl,-1) CA(_set_line,dl,-3) ef b==Ph2:: fuse_ring_bonds((parts_com[a][i],parts_par[a][i]),6,4) CA(_set_line,dl,-2) CA(_set_line,dl,-4) fi fi endfor @@ -494,9 +494,21 @@ vardef change_bond(expr a,b) = ef (b>=?6[11])and(b<=?6[15]):: fuse_ring_size(a,6,b-?6[11]+11) ef (b>=?7[11])and(b<=?7[15]):: fuse_ring_size(a,7,b-?7[11]+11) ef (b>=?8[11])and(b<=?8[15]):: fuse_ring_size(a,8,b-?8[11]+11) - else:: fuse_ring(a,b-?3+3) fi fi + else:: fuse_ring(a,b-?3+3) fi fi + ef pair a:: + if b==?6:: + if (frac xpart a==0)and(frac ypart a==0):: fuse_ring_bonds(xpart a,ypart a,6,4) + ef frac ypart a==0:: fuse_ring_bonds(floor xpart a,ypart a,6,3) + else:: fuse_ring_bonds(floor xpart a,floor ypart a,6,2) fi + ef b==?5:: + if (frac xpart a==0)and(frac ypart a==0):: fuse_ring_bonds(xpart a,ypart a,5,3) + ef frac ypart a==0:: fuse_ring_bonds(floor xpart a,ypart a,5,2) fi + ef b==?4:: fuse_ring_bonds(xpart a,ypart a,4,2) + fi + fi + fi elseif color b:: color_list[incr cntC]:=b; CA(_set_colorB,cntC,a) fi parts_cnt[parts_int]:=nC; parts_int fi enddef; diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_exa_code.pdf b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_exa_code.pdf Binary files differindex 4e0f118ce43..585eb015d12 100644 --- a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_exa_code.pdf +++ b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_exa_code.pdf diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_exa_code.tex b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_exa_code.tex index a27bb71714c..31b8ac14c88 100644 --- a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_exa_code.tex +++ b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_exa_code.tex @@ -1,7 +1,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% Print out mcf data list by A.Yamaji 2022.11.06 +% Print out mcf data list by A.Yamaji 2022.11.12 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% ** mcf2graph.mf must be version 4.89 +% ** mcf2graph.mf must be version 4.90 % ** use mcf_library.mcf % ** typeset by LuaLaTeX(luamplib) \documentclass{article} diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_exa_soc.mp b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_exa_soc.mp index d3d54052dbe..bb049b6b6f7 100644 --- a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_exa_soc.mp +++ b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_exa_soc.mp @@ -1,8 +1,8 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% Molecular Coding Format by Akira Yamaji 2022.11.06 +% Molecular Coding Format by Akira Yamaji 2022.11.12 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -input mcf2graph; %%% it must be version 4.89 -message "* mcf_exa_soc 2022.11.06"; +input mcf2graph; %%% it must be version 4.90 +message "* mcf_exa_soc 2022.11.12"; message ""; %------------------------------------------------------------------------------ %%%%sw_frame:=Outside; 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 8fbbc5affef..f510fc9ec25 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 8ae368ba5fa..e2c8fcae1e5 100644 --- a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_example.tex +++ b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_example.tex @@ -1,7 +1,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% Example of MCF Typeset with LuaLaTeX(luamplib) by A.Yamaji 2022.11.06 +% Example of MCF Typeset with LuaLaTeX(luamplib) by A.Yamaji 2022.11.12 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% ** mcf2graph.mf must be version 4.89 +% ** mcf2graph.mf must be version 4.90 % ** use mcf_library.mcf % ** typeset by LuaLaTeX(luamplib) \documentclass{article} diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_library.mcf b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_library.mcf index 3235ad12928..bf01583d621 100644 --- a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_library.mcf +++ b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_library.mcf @@ -1,5 +1,5 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% molecular library file mcf_library.mcf by Akira Yamaji 2022.11.06 +% molecular library file mcf_library.mcf by Akira Yamaji 2022.11.12 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % tag1:var1;tag2:var2;tag3:var3 ..... % first character of line "%" comment out @@ -706,7 +706,7 @@ Cat:biological;EN:Sesamine;MW:354.35;EXA:1 %------------------------------------------------------------------------------ Cat:biological;EN:Morphine;MW:285.343;EXA:1 : -<30,Ph,{2,-4}=?6,{1---12}=?5,-1:O,-1=zb, +<30,Ph,{2,-4}=?6,1---12=?5,-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 ; %------------------------------------------------------------------------------ @@ -881,7 +881,7 @@ Cat:synthetic;EN:Chrysene;MW:228.3;EXA:- %------------------------------------------------------------------------------ Cat:synthetic;EN:Pyrene;MW:202.25;EXA:- : -<30,Ph2,{6,4}=Ph,{16---7}=?6,-2=dl +<30,Ph2,{6,4}=Ph,16---7=?6,-2=dl ; %------------------------------------------------------------------------------ Cat:synthetic;EN:Coronene;MW:300.35;EXA:1 @@ -1180,7 +1180,7 @@ Cat:antibiotics;EN:Emamectine;MW:886.133;EXA:1 : <24,?6,6=?5,3=dl,9:O,2:*/OH,3:/_,6:/*OH^-60, @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,@-2,?6,-6=wf,-1=zb,-5=dl, + {-1,-3,-7}=dl,-11--(-10)=?6,@-2,?6,-6=wf,-1=zb,-5=dl, {-1,-6}:O,-3:*/_,@-2,\,*/_,!2, 17:/_,19:/*_,@18,\,O,!,?6`.7,-1:O,#.5,-2:*/_,-4:*/O!,##, @-3,\,O,60,?6`.7,-5:O,#.5,-4:*/_,-3:/*NH!,-2:*/O! @@ -1198,7 +1198,7 @@ Cat:antibiotics;EN:Spinosad;MW:731.968;EXA:2 Cat:antibiotics;EN:Natamycin;MW:665.733;EXA:1 : <-90,#1,60,60,-60,60,-60,60,-60,60,-60,60,60,60,O,-60, - 60,60,-60,60,-60,60,-60,60,60,-60,&1,##,{12--13}=?6, + 60,60,-60,60,-60,60,-60,60,60,-60,&1,##,12--13=?6, {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,*\^15,O,90,?6`.7,-1:O,#.5,{-3,-5'}:*/OH,-4:/*NH2,-2:/*_ @@ -1880,7 +1880,7 @@ Cat:pesticide;EN:Pyrimethanil;MW:199.257;EXA:- %------------------------------------------------------------------------------ Cat:pesticide;EN:Pyroquilon;MW:173.2;EXA:- : -<30,Ph,3=?6,10:N,9://O,{11_4}=?5 +<30,Ph,3=?6,10:N,9://O,11--4=?5 ; %------------------------------------------------------------------------------ Cat:pesticide;EN:Vinclozolin;MW:286.108;EXA:- diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_man_soc.mp b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_man_soc.mp index a2cc417f869..edb7d19b9f0 100644 --- a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_man_soc.mp +++ b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_man_soc.mp @@ -1,9 +1,9 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% MCF file for mcf_manual.tex by Akira.Yamaji 2022.11.06 +% MCF file for mcf_manual.tex by Akira.Yamaji 2022.11.12 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -input mcf2graph; %% it must be version 4.89 +input mcf2graph; %% it must be version 4.90 % ** use library file 'mcf_library.mcf' -message "mcf_man_soc 2022.11.06"; message ""; +message "mcf_man_soc 2022.11.12"; message ""; %------------------------------------------------------------------------ sw_mframe:=0; sw_expand:=0; @@ -461,9 +461,9 @@ beginfigm("EN:fused ring 3") fsize:=(60mm,20mm); fmargin:=(2mm,2mm); sw_numbering:=Bond; - MCat(0,1)(?6,{3,10}=?6,{16---4}=?6,{16,4}=dt,{17:19}=bd_r) + MCat(0,1)(?6,{3,10}=?6,16---4=?6,{16,4}=dt,{17:19}=bd_r) add(defaultscale:=0.4; label("(1)",p0);) - MCat(1,0)(?6,{3,10}=?6,{16---4}=?5,{16,4}=dt,{17,18}=bd_r) + MCat(1,0)(?6,{3,10}=?6,16---4=?5,{16,4}=dt,{17,18}=bd_r) add(defaultscale:=0.4; label("(2)",p0);) endfigm %*********************************************************************** @@ -471,7 +471,7 @@ beginfigm("EN:fused ring 4") fsize:=(60mm,20mm); fmargin:=(2mm,2mm); sw_numbering:=Bond; - MC(<-30,?6,{3,10,15}=?6,{21----4}=?6,{21,4}=dt,{22,23}=bd_r) + MC(<-30,?6,{3,10,15}=?6,21----4=?6,{21,4}=dt,{22,23}=bd_r) endfigm %*********************************************************************** beginfigm("EN:Spiro ring ") 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 c407c4fd541..7d27863ba07 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 6588d356a0e..514236f5b27 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 2022.11.06 +% Molecular Coding Format manual by Akira Yamaji 2022.11.12 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \documentclass[a4paper]{article} %%%\usepackage{graphicx} @@ -433,13 +433,13 @@ attached bond length \begin{verbatim} (Attached 2 bond) -{4--11}=?6 : fuse 4/6 ring to B11..B4 -{4--11}=?5 : fuse 3/5 ring to B11..B4 -{4--11}=?4 : fuse 2/4 ring to B11..B4 +4--11=?6 : fuse 4/6 ring to B11..B4 +4--11=?5 : fuse 3/5 ring to B11..B4 +4--11=?4 : fuse 2/4 ring to B11..B4 -1:<30,?6,3=?6,{11--4}=?6 -2:<30,?6,3=?6,{11--4}=?5 -3:<30,?6,3=?6,{11--4}=?4 +1:<30,?6,3=?6,11--4=?6 +2:<30,?6,3=?6,11--4=?5 +3:<30,?6,3=?6,11--4=?4 \end{verbatim} \MCFgraph \vspace{-3mm}% @@ -451,11 +451,11 @@ attached bond length \begin{verbatim} (Attached 3 bond) -{16---4}=?6 : fuse 3/6 ring to B16..B4 -{16---4}=?5 : fuse 2/5 ring to B16..B4 +16---4=?6 : fuse 3/6 ring to B16..B4 +16---4=?5 : fuse 2/5 ring to B16..B4 1:?6,{3,10,16---4}=?6 -2:?6,{3,10}=?6,{16---4}=?5 +2:?6,{3,10}=?6,16---4=?5 \end{verbatim} \MCFgraph @@ -468,7 +468,7 @@ attached bond length \begin{verbatim} (Attached 4 bond) -{21----4}=?6 : fuse 2/6 ring to B21..B4 +21----4=?6 : fuse 2/6 ring to B21..B4 <-30,?6,{3,10,15,21----4}=?6 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 f3677cd8334..806e6b55ed4 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 e7cc265369b..ed512ddabb8 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 2022.11.06 +% Example of MCF typest with LuaLaTeX(luamplib) by A.Yamaji 2022.11.12 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% ** mcf2graph.mp must be version 4.89 +% ** mcf2graph.mp must be version 4.90 % ** use mcf_library.mcf \documentclass{article} %------------------------------------------------------------------------------ |