From c0f4bb063b9735cb76250048611b97c78302d35e Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 19 Mar 2016 22:12:07 +0000 Subject: mcf2graph (19mar16) git-svn-id: svn://tug.org/texlive/trunk@40075 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/metapost/mcf2graph/CHANGELOG | 6 ++- Master/texmf-dist/doc/metapost/mcf2graph/README | 14 +++--- .../doc/metapost/mcf2graph/mcf_exa_soc.mf | 9 ++-- .../doc/metapost/mcf2graph/mcf_example.pdf | Bin 248183 -> 248143 bytes .../doc/metapost/mcf2graph/mcf_man_soc.mf | 25 ++++----- .../doc/metapost/mcf2graph/mcf_manual.pdf | Bin 415542 -> 418909 bytes .../doc/metapost/mcf2graph/mcf_manual.tex | 56 +++++++++++---------- .../doc/metapost/mcf2graph/mcf_mplib_exa.pdf | Bin 123685 -> 123650 bytes 8 files changed, 55 insertions(+), 55 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 b8ecc306c02..3137460edb4 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 2016-03-05 + Changelog of mcf2graph software package by Akira Yamaji 2016-03-19 ******************************************************************************* +[ver. 3.84 / 2016-03-19] + -improve efficiency of command @,: + -update MCF syntax manual + [ver. 3.83 / 2016-03-05] -change option parameter name sw_logout => sw_auxout diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/README b/Master/texmf-dist/doc/metapost/mcf2graph/README index d9ff8db8463..773c46846b6 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 : 3.83 2016-03-05 + version : 3.84 2016-03-19 E-mail : mcf2graph@gmail.com Located at : http://www.ctan.org/pkg/mcf2graph ******************************************************************************** @@ -53,13 +53,13 @@ font_wd#:=60mm#; % font width > font_ht#:=40mm#; % font height > %-- molecular definition ----------------------------------------------- - beginfont("EN:Acetamiprid") % Molecular name 1 - sw_font_frame:=1; % > Local setting - MCf(<30,Ph,4\,!,NH,!,!~dr,N,!,CN) % Molecular Coding Format + beginfont("EN:Acetamiprid") % molecular 1 + sw_font_frame:=1; % > Local setting + MCf(<30,Ph,4\,!,NH,!,!~dr,N,!,CN) % MCF endfont % - beginfont("EN:Imidacloprid") % Molecular name 2 - sw_start_vector:=1; % > Gloval setting - MCf(<30,Ph,1:N,6:/Cl,3\,!, % Molecular Coding Format + beginfont("EN:Imidacloprid") % molecular 2 + sw_start_vector:=1; % > Local setting + MCf(<30,Ph,1:N,6:/Cl,3\,!, % MCF |,?5,1:N,3:NH,2\\,!,NO2) endfont %----------------------------------------------------------------------- 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 9593ce89724..3aa36766135 100644 --- a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_exa_soc.mf +++ b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_exa_soc.mf @@ -13,10 +13,11 @@ sw_atom_frame:=0; sw_numberB:=0; sw_expand:=0; sw_start_vector:=0; -%%%%sw_info_formula:=1; -%%%%sw_info_weight:=1; -%%%%sw_checklist:=1; -%%%%sw_MOLout:=1; +%%%% sw_info_formula:=1; +%%%% sw_info_weight:=1; +%%%% sw_checklist:=1; +%%%% sw_MOLout:=1; +%%%% outputformat:="png"; hppp:=vppp:=0.1; outputtemplate:="%j-%3c.png"; %*************************************************************************** beginfont("EN:Acetamiprid") MCf(<30,Ph,4\,!,NH,!,!~dr,N,!,CN) diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_example.pdf b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_example.pdf index c4075007512..e85094d8f01 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_man_soc.mf b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_man_soc.mf index bccfa6d0588..149370c2b6e 100644 --- a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_man_soc.mf +++ b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_man_soc.mf @@ -55,7 +55,6 @@ beginfont("EN:Jump") sw_numberA:=1; max_bond_width:=0.20; ratio_chain_ring:=1; - sw_start_vector:=1; MCf(<30,!6,3*,0,!) endfont %*********************************************************************** @@ -63,7 +62,6 @@ beginfont("EN:Branch") sw_numberA:=1; max_bond_width:=0.20; ratio_chain_ring:=1; - sw_start_vector:=1; MCf(<30,!6,3\,!) endfont %*********************************************************************** @@ -71,7 +69,6 @@ beginfont("EN:Connect bond") sw_numberA:=1; max_bond_width:=0.20; ratio_chain_ring:=1; - sw_start_vector:=1; MCf(<30,!6,3\,-60,&5) endfont %*********************************************************************** @@ -162,31 +159,27 @@ endfont beginfont("EN:fused ring 1") sw_start_vector:=1; sw_numberB:=1; - numberB_end:=6; - MCf(<30,?6,3=?5) + MCf(<30,?6,3=?5,$(3)dt,$(7,8,9,10)bd) endfont %*********************************************************************** beginfont("EN:fused ring 1") sw_start_vector:=1; sw_numberB:=1; - MCf(<30,?6,$(-3,-4,-4,-2,-2,-4,-4)?6) + MCf(<30,?6,$(-3,-4,-4,-2,-2,-4,-4)?6,$(4,8,13,20,25,28,33)dt) endfont %*********************************************************************** beginfont("EN:fused ring 2") sw_numberB:=1; - numberB_end:=11; - MCd(1,.7)( 0,0)(<30,?6,3=?6,(11,4)=?6[4]) - MCd(1,.6)(.54,1)(<30,?6,3=?6,(11,4)=?5[3]) - MCd(1,.6)(1, 0)(<30,?6,3=?6,(11,4)=?4[2]) + MCd(1,.7)( 0,0)(<30,?6,3=?6,(11,4)=?6[4],$(11,4)dt,$(12,13,14,15)bd) + MCd(1,.6)(.54,1)(<30,?6,3=?6,(11,4)=?5[3],$(11,4)dt,$(12,13,14)bd) + MCd(1,.6)(1, 0)(<30,?6,3=?6,(11,4)=?4[2],$(11,4)dt,$(12,13)bd) endfont %*********************************************************************** beginfont("EN:fused ring 3") sw_numberB:=1; - numberB_end:=16; - MCd(1,.55)(0,0)(?6,$(3,10)?6,(16,4)=?6[3]) - MCd(1,.55)(.43,1)(?6,$(3,10)?6,(16,4)=?5[2]) - numberB_end:=21; - MCd(1,.53)(1,0)(<30,?6,$(2,10,15)?6,(21,3)=?6[2]) + MCd(1,.55)(0,0)(?6,$(3,10)?6,(16,4)=?6[3],$(16,4)dt,$(17,18,19)bd) + MCd(1,.55)(.5,1)(?6,$(3,10)?6,(16,4)=?5[2],$(16,4)dt,$(17,18)bd) + MCd(1,.68)(1,0)(?6,$(3,10,15)?6,(21,4)=?6[2],$(21,4)dt,$(22,23)bd) endfont %*********************************************************************** beginfont("EN:Spiro ring ") @@ -268,7 +261,7 @@ endfont %*********************************************************************** beginfont("EN:change atom and substituent") sw_start_vector:=1; - MCf(<30,!3,NH,!,SOO,!3) + MCf(<30,!2,NH,!,SO,!,SOO,!3) endfont %*********************************************************************** beginfont("EN:Change color") diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.pdf b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.pdf index ea09ae88d63..9234c8801d1 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 047b10e3da7..81219e15e38 100644 --- a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.tex +++ b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.tex @@ -1,4 +1,4 @@ -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % Molecular Coding Format manual by Akira Yamaji 2016.03.05 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \documentclass[a4paper]{article} @@ -59,9 +59,9 @@ {\LARGE\bf Molecular Coding Format manual}\vspace{3mm}\\ Author : Akira Yamaji \quad Date : \today\\ Located at : http://www.ctan.org/pkg/mcf2graph\vspace{3mm}\\ -\begin{minipage}{145mm} -\quad Molecular Coding Format(MCF) is new linear notation represent chmical - structure diagram. This 'Coding' is named from coding(programing) technique +\begin{minipage}{148mm} +\quad Molecular Coding Format(MCF) is new linear notation represent chemical + structure diagrams. This 'Coding' is named from coding(programing) technique like adressing,grouping,macro,etc. There are no Meta language commands in MCF. mcf2graph.mf(metapost/metafont macro) convert MCF file to graphics file pk font,PNG,SVG,EPS or MDL MOL file(V2000). \\ @@ -79,15 +79,16 @@ sw_auxout:=1; % aux(information) file output on > sw_numberA:=0; % numbering atom off > sw_numberB:=0; % numbering bond off > sw_expand:=0; % substituent expand mode off > -sw_start_vector:=0; % start vector output off >Gloval setting +sw_start_vector:=0; % start vector output off > Gloval setting sw_info_formula:=1; % molecular formula output on > sw_info_weight:=1; % molecular weight output on > sw_font_frame:=0; % font frame off > font_wd#:=60mm#; % font width > font_ht#:=40mm#; % font height > +outputformat:="png"; hppp:=vppp:=0.1; > PNG output +outputtemplate:="%j-%3c.png"; > %------------------------------------------------------------------------- beginfont("NO:1","EN:Chlorophyll a","MW:893.49") % begin font(information) - %----------------------------------------------------------------------- sw_font_frame:=1; % font frame on > font_wd#:=120mm#; % font width set > Local setting font_ht#:=80mm#; % font height set > @@ -111,8 +112,6 @@ bye {\bf (Molecular structure diagram output)}\vspace{3mm}\\ \frame{\makebox(100,44){\@strufont\char0}}\vspace{6mm}\\ %---------------------------------------------------------------------------- -\newpage% -%---------------------------------------------------------------------------- \noindent% {\bf (Molecular information output)} \begin{verbatim} @@ -279,11 +278,11 @@ six membered ring \begin{minipage}[t][37mm]{90mm} \MCFtitle{Change bond type (1)} \begin{verbatim} -~bond : change bond - dm:double, - dl:double left side, dr:double right side, - wf:wedge forward, wb:wedge backward, - zf:wedge dotted, zb:wedge dotted backward +a~type : ~~type,a +dm:double, +dl:double left side, dr:double right side, +wf:wedge forward, wb:wedge backward, +zf:wedge dotted, zb:wedge dotted backward <30,!~dm,!~dl,!~dr,!~wf,!~wb,!~zf,!~zb \end{verbatim} @@ -294,9 +293,9 @@ six membered ring \begin{minipage}[t][37mm]{90mm} \MCFtitle{Change bond type (2)} \begin{verbatim} - Bn=bond type : change bond type at Bn - vf : vector forward, vb : vector backward - tm : triple, dt : dotted, wv : wave +Bn=bond type : change bond type at Bn +vf : vector forward, vb : vector backward +tm : triple, dt : dotted, wv : wave <30,!5,1=vf,2=vb,3=tm,4=dt,5=wv \end{verbatim} @@ -313,6 +312,7 @@ six membered ring <30,!5,$(2,4)dr, @(3~bd^-45`2,5~ov^45`2)/Me +** 3~bd^-45`2 : ~~bd,^^-45,'`2,3 \end{verbatim} \end{minipage} \MCFstructure @@ -321,9 +321,11 @@ six membered ring \begin{minipage}[t][37mm]{90mm} \MCFtitle{Change bond length (1)} \begin{verbatim} -Bn`length : change bond length at Bn +(!,!n,?n)`length : change length of !,!n,?n <30,!2,!2`1.2,!2 + +** !2`1.2 : '`1.2,!2 \end{verbatim} \end{minipage} \MCFstructure @@ -479,11 +481,11 @@ MCd(1,.6)( 1,0)(<30,?6,3=?6,(11,4)=?4[2]) \begin{verbatim} (16,4)=?6[3] : fuse 3/6 ring to B16..B4 (16,4)=?5[2] : fuse 2/5 ring to B16..B4 -(21,3)=?6[2] : fuse 2/6 ring to B21..B3 +(21,4)=?6[2] : fuse 2/6 ring to B21..B4 -MCd(1,.5)( 0, 0)(?6,$(3,10)?6,(16,4)=?6[3]) -MCd(1,.5)(.43,1)(?6,$(3,10)?6,(16,4)=?5[2]) -MCd(1,.5)(1,0)(<30,?6,$(2,10,15)?6,(21,3)=?6[2]) +MCd(1,.55)( 0,0)(?6,$(3,10)?6,(16,4)=?6[3]) +MCd(1,.55)(.5,1)(?6,$(3,10)?6,(16,4)=?5[2]) +MCd(1,.68)(1, 0)(?6,$(3,10,15)?6,(21,4)=?6[2]) \end{verbatim} \end{minipage} \MCFstructure @@ -545,7 +547,7 @@ MCf(<30, \MCFtitle{Insert substituent(2)} \begin{verbatim} / : single // : double -*/ : wedge forward /* : wedge backward +*/ : wedge forward /* : wedge dotted forward ** : direct MCf(<30,!,//O,!,/*H,!,*/H,!,/?3,!,**?3,!) @@ -598,8 +600,8 @@ MCf(<30,?6, \begin{minipage}[t][37mm]{90mm} \MCFtitle{Add substituent(3)} \begin{verbatim} -~,^,` : change type,angle,length - of substituent +~,^,`,> : change type,angle,length, + environment of substituent MCF(<30,!7`1, @(2,3)/*Me`2^30,5:*/Pr>lr,7:*/Pr>rl) @@ -654,10 +656,10 @@ MCF(<30,!7`1, \begin{minipage}[t][37mm]{90mm} \MCFtitle{Change atom and Substituent} \begin{verbatim} -NH,SOO : inset hetero atom and substituent - simultaneously +NH,SO,SOO : inset hetero atom and substituent + simultaneously - <30,!3,NH,!,SOO,!3 + <30,!2,NH,!,SO,!,SOO,!3 \end{verbatim} \end{minipage} 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 7ecb0c5f8c9..e7c934bb561 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 -- cgit v1.2.3