diff options
Diffstat (limited to 'Master/texmf-dist/doc/metapost')
| -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_exa_soc.mf | 3 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/metapost/mcf2graph/mcf_example.pdf | bin | 246546 -> 246561 bytes | |||
| -rw-r--r-- | Master/texmf-dist/doc/metapost/mcf2graph/mcf_man_soc.mf | 118 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.pdf | bin | 425268 -> 433700 bytes | |||
| -rw-r--r-- | Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.tex | 197 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/metapost/mcf2graph/mcf_mplib_exa.pdf | bin | 122137 -> 122138 bytes |
8 files changed, 245 insertions, 82 deletions
diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/CHANGELOG b/Master/texmf-dist/doc/metapost/mcf2graph/CHANGELOG index 446920fa3c9..b4cbb0de331 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-10-23 + Changelog of mcf2graph software package by Akira Yamaji 2016-10-30 ******************************************************************************* +[ver. 4.02 / 2016-10-30] + -add finction EXT(),ext() + -delete option parameter sw_start_vector + -update MCF syntax manual + [ver. 4.01 / 2016-10-23] -many fixes for robustness -update MCF syntax manual diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/README b/Master/texmf-dist/doc/metapost/mcf2graph/README index 7c064a1881c..b144de7a905 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.01 2016-10-23 + version : 4.02 2016-10-30 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 a226e61c5d9..bbf4929b2e4 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.10.19 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -input mcf2graph.mf; %%% it must be version 4.00 or later +input mcf2graph.mf; %%% it must be version 4.02 or later %------------------------------------------------------------------------- font_wd#:=33mm#; font_ht#:=24mm#; @@ -9,7 +9,6 @@ font_ht#:=24mm#; sw_auxout:=1; sw_font_frame:=0; sw_atom_frame:=0; -sw_start_vector:=0; %%%% sw_expand:=1; var3:="cal_FM"; tag3:="cFM"; var4:="cal_MW"; tag4:="cMW"; 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 e1842b93b60..6dcbe03b339 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_man_soc.mf b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_man_soc.mf index 70380700644..8e32a79bc39 100644 --- a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_man_soc.mf +++ b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_man_soc.mf @@ -1,12 +1,11 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% Molecular Coding Format file for mcf_manual.tex by Akira.Yamaji 2016.10.19 +% Molecular Coding Format file for mcf_manual.tex by Akira.Yamaji 2016.10.30 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -input mcf2graph.mf; %% it must be version 4.00 or later +input mcf2graph.mf; %% it must be version 4.02 or later %------------------------------------------------------------------------ sw_auxout:=0; sw_mol_frame:=0; sw_expand:=0; -sw_start_vector:=0; sw_solid:=2; %%%%%sw_checklist:=1; %*********************************************************************** @@ -690,17 +689,25 @@ beginfont("EN:Switwch numberingB") sw_numberB:=3; MCd(1,1)(.5,.1)(<30,!9) endfont %*********************************************************************** -beginfont("EN:Switwch Solid ratio") - font_wd#:=70mm#; - font_ht#:=20mm#; +beginfont("EN:Switwch Solid ratio=0") + font_ht#:=18mm#; + bond_len#:=8mm#; + MCf(<30,Ph) +endfont +%----------------------------------------------------------------------- +beginfont("EN:Switwch Solid ratio=1") + font_ht#:=18mm#; bond_len#:=8mm#; - MCd(1,1)(0,.5)(Ph) sw_solid:=1; ratio_bond_width:=0.1; - MCd(1,1)(.55,.5)(Ph) + MCf(<30,Ph) +endfont +%----------------------------------------------------------------------- +beginfont("EN:Switwch Solid ratio=2") + font_ht#:=18mm#; + bond_len#:=10mm#; sw_solid:=2; - bond_len#:=6mm#; - MCd(1,1)(1,.5)(Ph) + MCf(<30,Ph) endfont %*********************************************************************** beginfont("EN:Switwch Expand") @@ -724,14 +731,28 @@ beginfont("EN:Switwch bondtype off") MCd(1,1)(.85, .5)(<30,Ph,4:/Cl,3:/F) endfont %*********************************************************************** -beginfont("EN:Switwch start vector") +beginfont("EN:Switwch font frame 0") + font_ht#:=15mm#; + margin_left_right:=5mm; + margin_top_bottom:=2mm; + sw_font_frame:=0; + MCf(<30,Ph,4:/Cl,3:/F) +endfont +beginfont("EN:Switwch font frame 1") font_ht#:=15mm#; - MCd(1,1)(.1, .5)(<30,Ph,4:/Cl,3:/F) - sw_start_vector:=1; - MCd(1,1)(.9, .5)(<30,Ph,4:/Cl,3:/F) + margin_left_right:=5mm; + margin_top_bottom:=2mm; + sw_font_frame:=1; + MCf(<30,Ph,4:/Cl,3:/F) endfont -%*********************************************************************** -beginfont("EN:Switwch font frame") +beginfont("EN:Switwch font frame 2") + font_ht#:=15mm#; + margin_left_right:=5mm; + margin_top_bottom:=2mm; + sw_font_frame:=2; + MCf(<30,Ph,4:/Cl,3:/F) +endfont +beginfont("EN:Switwch font frame 3") font_ht#:=15mm#; margin_left_right:=5mm; margin_top_bottom:=2mm; @@ -756,6 +777,7 @@ beginfont("EN:Switwch clipping") sw_mol_frame:=1; MCf(<30,Ph,4:/Cl,3:/F) endfont +%----------------------------------------------------------------------- beginfont("EN:Switwch clipping") font_ht#:=15mm#; sw_mol_frame:=1; @@ -779,22 +801,62 @@ beginfont("EN:MCf()") MCf(<30,Ph,4:/Cl,3:/F) endfont %*********************************************************************** -beginfont("EN:Local setting") - font_ht#:=15mm#; - MCd(1,1)(0.0,0.5)(Ph) - ratio_thickness_bond:=0.05; - MCd(1,1)(0.5,0.5)(Ph) - ratio_thickness_bond:=0.015; - MCd(1,1)(1.0,0.5)(Ph) +beginfont("EN:EXT()") + sw_solid:=1; + font_ht#:=26mm#; + bond_len#:=8mm#; + sw_mol_frame:=1; + MCd(1,1)(0,0.5)(<30,Ph,2:/OH,5:/OH) + MCd(1,1)(1,0.5)(<30,?6,$(3,6)dl,@(2,5)//O) + EXT(draw ((0,0)--(26mm,0)--(22mm,2mm)) shifted (0.3w,0.5h); + drawdot p1 withpen pencircle scaled 2mm; + drawdot p2 withpen pensquare scaled 2mm;) endfont %*********************************************************************** -beginfont("EN:Global setting") - font_ht#:=15mm#; +beginfont("EN:ext()") + font_wd#:=60mm#; + font_ht#:=20mm#; + bond_len#:=10mm#; + MCf(<30,Ph,4:/Cl,3:/F) + ext(draw p0--(p0+(wd,0))--(p0+(wd,ht)); + draw_vector(p6,a6-180,8mm);) +endfont +%*********************************************************************** +beginfont("EN:Local setting 1") + font_wd#:=15mm#; + font_ht#:=12mm#; + MCf(Ph) +endfont +beginfont("EN:Local setting 2") + font_wd#:=15mm#; + font_ht#:=12mm#; ratio_thickness_bond:=0.05; - MCd(1,1)(0.0,0.5)(Ph) - MCd(1,1)(0.5,0.5)(Ph) - MCd(1,1)(1.0,0.5)(Ph) + MCf(Ph) +endfont +beginfont("EN:Local setting 3") + font_wd#:=15mm#; + font_ht#:=12mm#; + MCf(Ph) +endfont +%*********************************************************************** +save_ratio:=ratio_thickness_bond; +ratio_thickness_bond:=0.05; +beginfont("EN:Local setting 1") + font_wd#:=15mm#; + font_ht#:=12mm#; + MCf(Ph) +endfont +beginfont("EN:Local setting 2") + font_wd#:=15mm#; + font_ht#:=12mm#; + MCf(Ph) +endfont +beginfont("EN:Local setting 3") + font_wd#:=15mm#; + font_ht#:=12mm#; + MCf(Ph) endfont +ratio_thickness_bond:=save_ratio; %*********************************************************************** sw_clip:=1; %% Output molecular infomation 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 7f52968e2da..2275403c8c1 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 f3fc19b2fee..ee720dc7eca 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.10.23 +% Molecular Coding Format manual by Akira Yamaji 2016.10.30 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \documentclass[a4paper]{article} %%%%\usepackage{graphicx} @@ -711,21 +711,26 @@ pk font,PNG,SVG,EPS or MDL MOL file(V2000).\\ %----------------------------------------------------------------------------- \subsubsection{Solid mode} \begin{verbatim} - sw_solid=1 : + (sw_solid=0 : fit to font size) + ** default +\end{verbatim} +\MCFstructure +%----------------------------------------- +\begin{verbatim} + (sw_solid=1 : solid ratio bond/font width) ratio_bond_width=0.1 - font_width=70mm - (bond_len#=70mm*0.1=7mm) + font_width=60mm + (bond_len#=60mm#*0.1=6mm#) ** ignore bond_len# - - sw_solid=2 : - bond_len#=6mm# +\end{verbatim} +\MCFstructure +%----------------------------------------- +\begin{verbatim} + (sw_solid=2 : solid bond length) + bond_len#=10mm# ** ignore ratio_bond_width \end{verbatim} -\MCFstructure\\ -\makebox[5mm]{}% -\makebox[25mm]{\tt 0 :default}% -\makebox[25mm]{\tt 1}% -\makebox[20mm]{\tt 2}% +\MCFstructure %----------------------------------------------------------------------------- \subsubsection{Expand mode} \begin{verbatim} @@ -754,27 +759,33 @@ pk font,PNG,SVG,EPS or MDL MOL file(V2000).\\ \makebox[30mm]{\tt 0 :default}% \makebox[30mm]{\tt 1}% %----------------------------------------------------------------------------- -\subsection{Frame,vector} -%----------------------------------------------------------------------------- -\subsubsection{Start vector} -\begin{verbatim} - default: sw_start_vector=0 -\end{verbatim} -\MCFstructure\\ -\makebox[5mm]{}% -\makebox[30mm]{\tt 0 :default}% -\makebox[30mm]{\tt 1}% +\newpage +\subsection{Frame} %----------------------------------------------------------------------------- \subsubsection{Font frame} \begin{verbatim} - sw_font_frame=0 : no frame **default - sw_font_frame=1 : draw frame of font - sw_font_frame=2 : draw frame inside margin - sw_font_frame=3 : draw both - - sw_font_frame:=3; + (No font frame) margin_left_right:=5mm; margin_top_bottom:=2mm; + sw_font_frame:=0; ** default + MCf(<30,Ph,4:/Cl,3:/F) +\end{verbatim} +\MCFstructure +\begin{verbatim} + (Draw font frame) + sw_font_frame:=1; + MCf(<30,Ph,4:/Cl,3:/F) +\end{verbatim} +\MCFstructure +\begin{verbatim} + (Draw frame inside margin) + sw_font_frame:=2; + MCf(<30,Ph,4:/Cl,3:/F) +\end{verbatim} +\MCFstructure +\begin{verbatim} + (Draw both frame) + sw_font_frame:=3; MCf(<30,Ph,4:/Cl,3:/F) \end{verbatim} \MCFstructure @@ -798,44 +809,105 @@ pk font,PNG,SVG,EPS or MDL MOL file(V2000).\\ \subsection{Clipping font} \begin{verbatim} beginfont() - sw_clip:=0; - MCf(<30,Ph,4:/Cl,3:/F) endfont + sw_clip:=0; + MCf(<30,Ph,4:/Cl,3:/F) + endfont ** default: sw_clip=0 \end{verbatim} \MCFstructure \begin{verbatim} beginfont() - sw_clip:=1; - MCf(<30,Ph,4:/Cl,3:/F) endfont + sw_clip:=1; + MCf(<30,Ph,4:/Cl,3:/F) + endfont \end{verbatim} \MCFstructure %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\newpage -\section{MCF draw function} -\subsection{Function MCd (draw)} +\section{Function} +\subsection{Function MCd()} \begin{verbatim} + (Draw molecular structure) + MCd(a,b)(c,d)(...) a: ratio molecular width/font width b: ratio molecular hight/font hight c: x axis position d: y axis position - MCd(1,0.8)(0.2,0.9)(<30,Ph,3:/F,4:/Cl) - MCd(1,0.8)(0.8,0.1)(<30,Ph,3:/F,4:/Cl) + beginfont() + MCd(1,0.8)(0.2,0.9)(<30,Ph,3:/F,4:/Cl) + MCd(1,0.8)(0.8,0.1)(<30,Ph,3:/F,4:/Cl) + endfont \end{verbatim} \MCFstructure %----------------------------------------------------------------------------- -\subsection{Function MCf (fit draw)} +\subsection{Function MCf()} \begin{verbatim} + (Draw fit to font size) + MCf(...) : MCd(1,1)(0.5,0.5)(...) - sw_font_frame:=1; + beginfont() + MCf(<30,Ph,3:/F,4:/Cl) + endfont +\end{verbatim} +\MCFstructure +%----------------------------------------------------------------------------- +\newpage +\subsection{Function EXT()} +\begin{verbatim} + (Extra graphic to font) + + w: font width + h: font height + wd: font width-margin_left_right*2 + ht: font height-margin_top_bottom*2 + p0: x=margin_left_right + y=margin_top_bottom + n: molecular number + p[m]: molecular origin position + (1<=m<=molecular count) + + beginfont() sw_mol_frame:=1; - MCf(<30,Ph,3:/F,4:/Cl) + MCd(1,1)(0,0.5)(<30,Ph,2:/OH,5:/OH) + MCd(1,1)(1,0.5) + (<30,?6,$(3,6)dl,@(2,5)//O) + EXT( + draw ((0,0)--(26mm,0)--(22mm,2mm)) + shifted (0.3w,0.5h); + drawdot p1 withpen pencircle scaled 2mm; + drawdot p2 withpen pensquare scaled 2mm; + ) + endfont +\end{verbatim} +\MCFstructure +%----------------------------------------------------------------------------- +\subsection{Function ext()} +\begin{verbatim} + (Extra graphic to molecule) + + wd: molecular width + ht: molecular height + p0: origin of molecular structure + n: atom number + p[m]: atom position of A[m] + a[m]: branch angle of A[m] + (1<=m<=atom count) + draw_vector(pos,ang,len) : + pos:position ang:angle len:length + + beginfont() + MCf(<30,Ph,3:/F,4:/Cl) + ext(draw p0--(p0+(wd,0)) + --(p0+(wd,ht); + draw_vector(p6,a6-180,8mm); + ) + endfont \end{verbatim} \MCFstructure %----------------------------------------------------------------------------- -\subsection{Local setting} +\subsection{Local parameter setting} \begin{verbatim} beginfont() MCf(Ph) endfont beginfont() @@ -844,16 +916,18 @@ pk font,PNG,SVG,EPS or MDL MOL file(V2000).\\ endfont beginfont() MCf(Ph) endfont \end{verbatim} -\MCFstructure +\MCFstructure\MCFstructure\MCFstructure %----------------------------------------------------------------------------- -\subsection{Global setting} +\subsection{Global parameter setting} \begin{verbatim} ratio_thickness_bond:=0.05; beginfont() MCf(Ph) endfont beginfont() MCf(Ph) endfont beginfont() MCf(Ph) endfont \end{verbatim} -\MCFstructure +\MCFstructure\MCFstructure\MCFstructure +%----------------------------------------------------------------------------- +\section{Output infomation} %----------------------------------------------------------------------------- \subsection{Output molecular information} \begin{verbatim} @@ -870,10 +944,14 @@ cFM:calculated molecular formula \subsection{Output additional information} \begin{verbatim} beginfont("EN:Tocopherol","CAS:59-02-9") - MCf(...) endfont + MCf(<30,Ph,3=?6, + 7:O,@(1,2,5)/Me,8:/*Me^60,6:/OH, + 8\,|,!12,@(4,8)/*Me,12:/Me) +endfont %% Output to mcf_man_soc-info.aux %% F:mcf_man_soc;C:86;EN:Tocopherol;CAS:59-02-9 +............................................ *F:filename *C:char number EN:molecular name CAS:CAS number *:default output @@ -884,10 +962,19 @@ CAS:CAS number *:default output \begin{verbatim} aux_delimiter:="/"; beginfont("EN:Ampicillin","CAS:69-53-4") - MCf(...) endfont + MCf(<45,?4,2:N,2=?5,-1:S, + @(3^45,4^-45)/*H,1://O^15, + 5:/*COOH^-18,@(6^35,6^-35)/Me, + 4*\^75,NH,!,//O,!,/*NH2,!,Ph) +endfont +beginfont(......) + ........... +endfont +.............. %% Output to mcf_man_soc-info.aux %% F:mcf_man_soc/C:90/EN:Ampicillin/CAS:69-53-4 +............................................ **default aux_delimiter=";" \end{verbatim} @@ -899,11 +986,21 @@ F:mcf_man_soc/C:90/EN:Ampicillin/CAS:69-53-4 tag4:="EN"; var4:="inf_EN"; sw_auxfix:=1; auxtag_out; beginfont("EN:Cholesterol","NO:1") - ..... endfont + MCf(<30,?6,$(-4,-2)?6,-4=?5,7=dl, + 1:*/OH,@(4,12)*/Me^60,9:*/H^60, + 10:/*H^180,11:/*H^-60,17:/*H^-54, + -1\^18,/*Me,-60,!3,/Me,!) + endfont + beginfont(......) + ........... + endfont + .............. %% Output to mcf_man_soc-info.aux %% F;C;NO;EN mcf_man_soc;91;1;Ampicillin + ........................... + \end{verbatim} \MCFstructure %----------------------------------------------------------------------------- @@ -1203,7 +1300,7 @@ M END \end{verbatim}% \newpage %---------------------------------------------------------------------------- -\subsection{\LaTeX file example} +\subsection{LaTeX file example} %############################################################################ \begin{verbatim} %-------------------------------------------------------------------- @@ -1243,7 +1340,7 @@ M END \end{verbatim}% %############################################################################ %------------------------------------------------------------------------ -\INFO{F:mcf_man_soc,C:103,NO:1,cMW:349.40462,cFM:C16H19N3O4S,EN:Ampicillin}% -\INFO{F:mcf_man_soc,C:104,NO:2,cMW:386.6532,cFM:C27H46O,EN:Cholesterol}% +\INFO{F:mcf_man_soc,C:113,NO:1,cMW:349.40462,cFM:C16H19N3O4S,EN:Ampicillin}% +\INFO{F:mcf_man_soc,C:114,NO:2,cMW:386.6532,cFM:C27H46O,EN:Cholesterol}% %------------------------------------------------------------------------ \end{document} 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 c7ab56140a7..8d127fc8104 100644 --- a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_mplib_exa.pdf +++ b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_mplib_exa.pdf |