From f167632e77743ca0800df913dbe56c6f032ffbaf Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 21 Aug 2016 21:41:46 +0000 Subject: mcf2graph (21aug16) git-svn-id: svn://tug.org/texlive/trunk@41900 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/metapost/mcf2graph/CHANGELOG | 7 +++- Master/texmf-dist/doc/metapost/mcf2graph/README | 2 +- .../doc/metapost/mcf2graph/mcf_exa_soc.mf | 8 ++-- .../doc/metapost/mcf2graph/mcf_example.pdf | Bin 241812 -> 242077 bytes .../doc/metapost/mcf2graph/mcf_man_soc.mf | 22 ++++++----- .../doc/metapost/mcf2graph/mcf_manual.pdf | Bin 476539 -> 475962 bytes .../doc/metapost/mcf2graph/mcf_manual.tex | 43 ++++++++++++--------- .../doc/metapost/mcf2graph/mcf_mplib_exa.pdf | Bin 123162 -> 123160 bytes .../doc/metapost/mcf2graph/mcf_mplib_exa.tex | 3 +- 9 files changed, 50 insertions(+), 35 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 611d4ab2851..0191b91b22c 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 2016-08-06 + Changelog of mcf2graph software package by Akira Yamaji 2016-08-21 ******************************************************************************* +[ver. 3.97 / 2016-08-21] + -change bond type name 'ov' to 'si_' + -add bond type 'wf_','wb_','bd_' + -update MCF syntax manual + [ver. 3.96 / 2016-08-06] -large scaled rings can fuse 5,6,7,8 membered ring scaled 11/10,12/10,13/10,14/10,15/10 diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/README b/Master/texmf-dist/doc/metapost/mcf2graph/README index 9a1a8a58a9a..1711f2d0217 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.96 2016-08-06 + version : 3.97 2016-08-21 E-mail : mcf2graph@gmail.com Located at : http://www.ctan.org/pkg/mcf2graph ******************************************************************************** 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 e0833ba7e6e..fbe8c08ee82 100644 --- a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_exa_soc.mf +++ b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_exa_soc.mf @@ -1,7 +1,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% Molecular Coding Format for mcf_example.tex by Akira Yamaji 2016.08.06 +% Molecular Coding Format for mcf_example.tex by Akira Yamaji 2016.08.21 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -input mcf2graph.mf; +input mcf2graph.mf; %%% it must be version 3.97 or later %------------------------------------------------------------------------- font_wd#:=33mm#; font_ht#:=24mm#; @@ -238,7 +238,7 @@ endfont %************************************************************************** beginfont("EN:Tetrodotoxine") MCf({,``1,<60,-90,60,-30`1.15,150,60,,#3*,-135,60,-30`1.15,150,, - #10\,O,60`1.33,60,~ov,#8*,-15~ov,O, ,},#9*,45,-60,OH,1^120://NH, + #10\,O,60`1.33,60,~si_,#8*,-15~si_,O, ,},#9*,45,-60,OH,1^120://NH, @(5~zf^-15,7,9^-75,12,13~zf)/OH,@(2,6^180)NH) endfont %*************************************************************************** @@ -370,7 +370,7 @@ endfont %************************************************************************** beginfont("EN:Morphine") MCf(<30,Ph,2=?6,-4=?6,(1,12)=?5[2],-1:O,-1=zb, - 7*,60~wf`0.75,70~ov`1.3,45,N,/Me,&9~wb, + 7*,60~wf`0.75,70~si_`1.3,45,N,/Me,&9~wb, 15=dl,6:/OH,8^180:*/H,12:/*OH) endfont %************************************************************************** diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_example.pdf b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_example.pdf index be83fbebaf0..9cdc045a25a 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 8dcf33c778e..07a530f60c8 100644 --- a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_man_soc.mf +++ b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_man_soc.mf @@ -1,7 +1,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% Molecular Coding Format file for mcf_manual.tex by Akira.Yamaji 2016.08.06 +% Molecular Coding Format file for mcf_manual.tex by Akira.Yamaji 2016.08.21 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -input mcf2graph.mf; +input mcf2graph.mf; %% it must be version 3.97 or later %------------------------------------------------------------------------ font_wd#:=60mm#;% font width font_ht#:=40mm#;% font height @@ -55,14 +55,17 @@ beginfont("EN:Connect atom") endfont %*********************************************************************** beginfont("EN:ring") + max_bond_width:=0.25; sw_numberB:=1; sw_start_vector:=1; MCf(?6) endfont %*********************************************************************** beginfont("EN:rotate 1") + max_bond_width:=0.25; + sw_numberB:=1; sw_start_vector:=1; - MCf(<30,!4,<30,?6) + MCf(``1,0~vf,0~vf,<90,0~vf,<-90,0~vf) endfont %*********************************************************************** beginfont("EN:change bond 1") @@ -72,22 +75,23 @@ endfont %*********************************************************************** beginfont("EN:change bond 2") ratio_chain_ring:=1; - MCf(<30,!~wf,!~wb,!~zf,!~zb) + MCf(<30,!~wf,!~wb,!~zf,!~zb,!~vf) endfont %*********************************************************************** beginfont("EN:change bond 3") ratio_chain_ring:=1; - MCf(<30,!4,1=vf,2=vb,3=dt,4=wv) + MCf(<30,!5,1=vb,2=dt,3=wv,4=bd,5=bz) endfont %*********************************************************************** beginfont("EN:change bond 4") ratio_chain_ring:=1; - MCf(<30,!3,!`2,!,@(3~bd`2^-30,5~ov^85`3,3~bz`3^-70)/Me) + MCf(<30,!7,$(2,4,6)dr) endfont %*********************************************************************** -beginfont("EN:change bond 4") +beginfont("EN:over line") ratio_chain_ring:=1; - MCf(<30,!7,$(2,4,6)dr) + max_bond_width:=0.25; + MCf(<-30,!8`.4,!`.2,60`.6,90`3,@(2~si_,4~wf_,6~wb_,8~bd_)/Me`1) endfont %*********************************************************************** beginfont("EN:change bond length1") @@ -597,7 +601,7 @@ endfont %*************************************************************************** beginfont("EN:Atoropin","CAS:51-55-8","FM:C17H23NO3","MW:289.37") MCf(<-30,O,!,//O,!,!,Ph, - #1\~zb^-120,|,?7`1.1,6*\^190`1.25,N,/Me,&3~wb,#3\~wv,!,OH) + #1\~zb^-120,|,?7,6*\^190`1.12,N,/Me,&3~wb,#3\~wv,!,OH) endfont %*************************************************************************** beginfont("EN:Validamycin") diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.pdf b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.pdf index 9eb75f91201..e6e758e1d5d 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 fbcf34b1d9e..7a2bf1d9fc7 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 2016.08.06 +% Molecular Coding Format manual by Akira Yamaji 2016.08.21 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \documentclass[a4paper]{article} \usepackage{graphicx} @@ -96,7 +96,7 @@ beginfont("NO:1","EN:Ampicillin") > begin font(information) MCf(<45,?4,2:N,2=?5,-1:S, > begin MCF (1) @(3^45,4^-45)/*H,1://O^15,5:/*COOH^-18, > @(6^35,6^-35)/Me, > - 4\^75,NH,!,//O,!,/*NH,!,Ph) > end MCF + 4\^75,NH,!,//O,!,/*NH,!,Ph) > end MCF endfont > end font %------------------------------------------------------------------------ beginfont("NO:2","EN:Cholesterol") > begin font(information) @@ -267,7 +267,8 @@ n* : Jump to An \begin{verbatim}