diff options
author | Karl Berry <karl@freefriends.org> | 2016-11-05 21:34:03 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2016-11-05 21:34:03 +0000 |
commit | 23cd3d2a1aef72188cdf81d605085fd1b9554594 (patch) | |
tree | 597f800990046a5f2197bdfbec5e30199cbe163e /Master/texmf-dist/doc/metapost | |
parent | 7d093de2b0b0e71f14058e72670e0686d8d12e93 (diff) |
mcf2graph (5nov16)
git-svn-id: svn://tug.org/texlive/trunk@42442 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/doc/metapost')
-rw-r--r-- | Master/texmf-dist/doc/metapost/mcf2graph/CHANGELOG | 6 | ||||
-rw-r--r-- | Master/texmf-dist/doc/metapost/mcf2graph/README | 2 | ||||
-rw-r--r-- | Master/texmf-dist/doc/metapost/mcf2graph/mcf_example.pdf | bin | 246691 -> 246692 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/metapost/mcf2graph/mcf_man_soc.mf | 24 | ||||
-rw-r--r-- | Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.pdf | bin | 434503 -> 436188 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.tex | 28 | ||||
-rw-r--r-- | Master/texmf-dist/doc/metapost/mcf2graph/mcf_mplib_exa.pdf | bin | 122460 -> 122594 bytes |
7 files changed, 35 insertions, 25 deletions
diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/CHANGELOG b/Master/texmf-dist/doc/metapost/mcf2graph/CHANGELOG index 3e8ed27e034..3826f7ec8c4 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-11-03 + Changelog of mcf2graph software package by Akira Yamaji 2016-11-05 ******************************************************************************* +[ver. 4.04 / 2016-11-05] + -improve clipping mode + -update MCF syntax manual + [ver. 4.03 / 2016-11-03] -miner update -update MCF syntax manual diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/README b/Master/texmf-dist/doc/metapost/mcf2graph/README index 6ff2a8d950d..2a152fe77da 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.03 2016-11-03 + version : 4.04 2016-11-05 E-mail : mcf2graph@gmail.com Located at : http://www.ctan.org/pkg/mcf2graph ******************************************************************************** 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 6ddc85e06cd..5efadc6d550 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 183e980b6bb..e334100deec 100644 --- a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_man_soc.mf +++ b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_man_soc.mf @@ -1,5 +1,5 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% Molecular Coding Format file for mcf_manual.tex by Akira.Yamaji 2016.11.03 +% Molecular Coding Format file for mcf_manual.tex by Akira.Yamaji 2016.11.05 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% input mcf2graph.mf; %% it must be version 4.03 or later %------------------------------------------------------------------------ @@ -691,15 +691,19 @@ endfont %*********************************************************************** beginfont("EN:Switwch clipping") font_ht#:=15mm#; + sw_font_frame:=3; sw_mol_frame:=1; - MCf(<30,Ph,4:/Cl,3:/F) + MCd(1,.7)(.2,.3)(Ph) + MCd(1,.7)(.8,.7)(Ph) endfont %----------------------------------------------------------------------- beginfont("EN:Switwch clipping") font_ht#:=15mm#; + sw_font_frame:=3; sw_mol_frame:=1; sw_clip:=1; - MCf(<30,Ph,4:/Cl,3:/F) + MCd(1,.7)(.2,.3)(Ph) + MCd(1,.7)(.8,.7)(Ph) endfont %*********************************************************************** beginfont("EN:Switwch Solid ratio=0") @@ -803,14 +807,15 @@ beginfont("EN:MCf()") endfont %*********************************************************************** beginfont("EN:EXT()") - sw_solid:=1; font_ht#:=26mm#; bond_len#:=8mm#; + sw_font_frame:=3; 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; + MCd(1,0.8)(0.1,0.5)(<30,Ph,2:/OH,5:/OH) + MCd(1,0.8)(0.9,0.5)(<30,?6,$(3,6)dl,@(2,5)//O) + EXT(draw ((0,0)--(25mm,0)--(21mm,2mm)) shifted (0.3w,0.5h); + drawdot p0 withpen pencircle scaled 2mm; + drawdot p1 withpen pensquare scaled 2mm; drawdot p2 withpen pensquare scaled 2mm;) endfont %*********************************************************************** @@ -820,7 +825,8 @@ beginfont("EN:ext()") bond_len#:=10mm#; MCf(<30,Ph,4:/Cl,3:/F) ext(draw p0--(p0+(wd,0))--(p0+(wd,ht)); - draw_vector(p6,a6-180,l);) + draw_vector(p6,a6-180,l); + ) endfont %*********************************************************************** beginfont("EN:Local setting 1") 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 6716e87e87c..25b0d186306 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 9629c6e4744..04ee963c93e 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.11.03 +% Molecular Coding Format manual by Akira Yamaji 2016.11.05 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \documentclass[a4paper]{article} %%%%\usepackage{graphicx} @@ -712,13 +712,15 @@ pk font,PNG,SVG,EPS or MDL MOL file(V2000).\\ \subsubsection{Clipping mode} \begin{verbatim} sw_clip:=0; - MCf(<30,Ph,4:/Cl,3:/F) + MCd(1,0.7)(0.2,0.3)(Ph) + MCd(1,0.7)(0.8,0.7)(Ph) ** default: sw_clip=0 \end{verbatim} \MCFstructure \begin{verbatim} sw_clip:=1; - MCf(<30,Ph,4:/Cl,3:/F) + MCd(1,0.7)(0.2,0.3)(Ph) + MCd(1,0.7)(0.8,0.7)(Ph) \end{verbatim} \MCFstructure %----------------------------------------------------------------------------- @@ -748,7 +750,7 @@ pk font,PNG,SVG,EPS or MDL MOL file(V2000).\\ \MCFstructure %----------------------------------------- \begin{verbatim} - (solid bond length,clipping) + (solid bond length and clip) sw_solid:=2; sw_clip:=1; bond_len#=10mm# @@ -853,8 +855,7 @@ pk font,PNG,SVG,EPS or MDL MOL file(V2000).\\ \newpage \subsection{Function EXT()} \begin{verbatim} - (Extra graphic to font) - +(Extra graphic to font) w: font width h: font height wd: font width-margin_left_right*2 @@ -867,13 +868,14 @@ pk font,PNG,SVG,EPS or MDL MOL file(V2000).\\ beginfont() sw_mol_frame:=1; - MCd(1,1)(0,0.5)(<30,Ph,2:/OH,5:/OH) - MCd(1,1)(1,0.5) + MCd(1,0.8)(0.1,0.5)(<30,Ph,2:/OH,5:/OH) + MCd(1,0.8)(0.9,0.5) (<30,?6,$(3,6)dl,@(2,5)//O) EXT( - draw ((0,0)--(26mm,0)--(22mm,2mm)) + draw ((0,0)--(25mm,0)--(21mm,2mm)) shifted (0.3w,0.5h); - drawdot p1 withpen pencircle scaled 2mm; + drawdot p0 withpen pencircle scaled 2mm; + drawdot p1 withpen pensquare scaled 2mm; drawdot p2 withpen pensquare scaled 2mm; ) endfont @@ -882,8 +884,7 @@ pk font,PNG,SVG,EPS or MDL MOL file(V2000).\\ %----------------------------------------------------------------------------- \subsection{Function ext()} \begin{verbatim} - (Extra graphic to molecule) - +(Extra graphic to molecule) wd: molecular width ht: molecular height p0: origin of molecular structure @@ -892,8 +893,7 @@ pk font,PNG,SVG,EPS or MDL MOL file(V2000).\\ 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 + draw_vector(position,angle,length) beginfont() MCf(<30,Ph,3:/F,4:/Cl) 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 29a70504ea3..90998d55bdf 100644 --- a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_mplib_exa.pdf +++ b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_mplib_exa.pdf |