summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/doc/metapost
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-09-14 21:53:39 +0000
committerKarl Berry <karl@freefriends.org>2015-09-14 21:53:39 +0000
commitac4c34e7f36adcd9f1b3ecd0179ddbd29daafcce (patch)
tree1160e584640d0d521f4c2fa649c27a94c60f2f39 /Master/texmf-dist/doc/metapost
parentcff80758b2cb544e0baf284598f9dcb1df8de2ab (diff)
mcf2graph (14sep15)
git-svn-id: svn://tug.org/texlive/trunk@38374 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/doc/metapost')
-rw-r--r--Master/texmf-dist/doc/metapost/mcf2graph/README8
-rw-r--r--Master/texmf-dist/doc/metapost/mcf2graph/mcf_exa_soc.mf42
-rw-r--r--Master/texmf-dist/doc/metapost/mcf2graph/mcf_example.pdfbin259704 -> 260019 bytes
-rw-r--r--Master/texmf-dist/doc/metapost/mcf2graph/mcf_example.tex4
-rw-r--r--Master/texmf-dist/doc/metapost/mcf2graph/mcf_man_soc.mf159
-rw-r--r--Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.pdfbin307967 -> 317789 bytes
-rw-r--r--Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.tex219
-rw-r--r--Master/texmf-dist/doc/metapost/mcf2graph/mcf_mplib_exa.pdfbin120942 -> 120736 bytes
-rw-r--r--Master/texmf-dist/doc/metapost/mcf2graph/mcf_mplib_exa.tex8
9 files changed, 248 insertions, 192 deletions
diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/README b/Master/texmf-dist/doc/metapost/mcf2graph/README
index 1c4a5d08512..f5d109556a6 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.61 / 2015-09-01
+ version : 3.63 / 2015-09-14
E-mail : akira.yamaji5@gmail.com
Located at : http://mirror.ctan.org/pkg/graphics/mcf2graph
Home page : http://molecoding.cocolog-nifty.com/blog/
@@ -56,7 +56,7 @@
\documentclass{article}
\usepackage[dvipdfmx]{graphicx}% Change option depend on your tex system
- **********************************************************
+ **********************************************************
% insert part of info.aux file
%-------------------------------------------------------------------------
\INFO{{F:MCF_SOC2}{C:0}{EN:Acetamiprid}}%
@@ -114,3 +114,7 @@
ver. 3.58 / 2015-08-18 improve calculation of molecular formula and weight
ver. 3.59 / 2015-08-23 update MCF syntax manual
ver. 3.61 / 2015-09-01 fix bug in local setting of font_wd# and font_ht#
+ ver. 3.62 / 2015-09-07 improve numbering bond, numbering atom,
+ update MCF syntax manual
+ ver. 3.63 / 2015-09-14 add command option of numbering address,
+ update MCF syntax manual
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 b08865cd267..9db6bd3f491 100644
--- a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_exa_soc.mf
+++ b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_exa_soc.mf
@@ -1,5 +1,5 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Molecular Coding Format for mcf_example.tex by Akira Yamaji 2015.8.30
+% Molecular Coding Format for mcf_example.tex by Akira Yamaji 2015.9.05
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
input mcf2graph.mf;
%-------------------------------------------------------------------------
@@ -26,13 +26,13 @@ endfont
%***********************************************************************
beginfont("EN:Imidacloprid")
MCf(^^30,
- Ph1,1:N,6:/Cl,3\,!,?5,1:N,3:NH,-4\\,!,NO2
+ Ph1,1:N,6:/Cl,3\,!,?5,1:N,3:NH,2\\,!,NO2
)
endfont
%***********************************************************************
beginfont("EN:Ethofenprox")
MCf(^^30,
- Ph,5\,!,Ph,-4\,O,!3,/Me^35,/Me^-35,!,Ph,-3:/OEt
+ Ph,5\,!,Ph,3\,O,!3,/Me^35,/Me^-35,!,Ph,4:/OEt
)
endfont
%***********************************************************************
@@ -64,7 +64,7 @@ beginfont("EN:Permethrin")
MCf(
^^-30,
?3,2^-35:*/Me,2^35:/*Me,1\,!~dl,/Cl,!,Cl,
- 3\,//O,!,O,!2,Ph,-4\>rl,O,!,Ph
+ 3\,//O,!,O,!2,Ph,3\,O,-60,Ph
)
endfont
%***********************************************************************
@@ -76,19 +76,19 @@ endfont
%***********************************************************************
beginfont("EN:Azoxystorbin")
MCf(^^30,
- Ph,2:/OH,3\,O,!,Ph,@(4,6)N,-4\,O,!,Ph,-5\,/OMe,!,//O,!,O,!
+ Ph,2:/OH,3\,O,!,Ph,@(4,6)N,3\,O,!,Ph,2\,/OMe,!,//O,!,O,!
)
endfont
%***********************************************************************
beginfont("EN:Isoprothiolane")
MCf(^^30,
- !,/Me,!,O,!,//O,!2,//O,!,O,!,/Me,!,-5\\,?5,@(2,5)S
+ !,/Me,!,O,!,//O,!2,//O,!,O,!,/Me,!,2\\,?5,@(2,5)S
)
endfont
%***********************************************************************
beginfont("EN:Iprodion")
MCf(^^18,
- ?5,@(3,5)N,2://O,3\,Ph,@(3,5)/Cl,#5\,!,NHiPr
+ ?5,@(3,5)N,2://O,5\,!,NHiPr,3\,Ph,@(3,5)/Cl
)
endfont
%***********************************************************************
@@ -100,14 +100,14 @@ endfont
%***********************************************************************
beginfont("EN:Oxine-Copper")
MCf(
- Ph,4:N,-2=Ph,-4\,O,-60,^^90,Cu,-90,O,60,Ph,-2=Ph,4:N,
+ Ph,4:N,5=Ph,-4\,O,-60,^^90,Cu,-90,O,60,Ph,5=Ph,4:N,
#4*,&(#12)~vf,#23*,&(#12)~vf
)
endfont
%***********************************************************************
beginfont("EN:Captan")
- MCf(^^0,
- ?6,6=d,-4=?5,2:N,@(1,3)//O,#8\,S,!,CCl3
+ MCf(^^12,
+ ?6,6=dl,3=??5,2:N,@(7,9)//O,8\,S,!,CCl3
)
endfont
%***********************************************************************
@@ -132,13 +132,13 @@ endfont;
%***********************************************************************
beginfont("EN:Flutolanil")
MCf(^^30,
- Ph,2:/CF3,3\,//O,!,NH,!,Ph,-1:/OiPr
+ Ph,2:/CF3,3\,//O,!,NH,!,Ph,6:/OiPr
)
endfont
%***********************************************************************
beginfont("EN:Propiconazole")
MCf(^^-6,
- ?5,$(2,5)d,@(1,3,4)N,4\,!2,Ph,@(4,6)/Cl,#7\,?5,@(2,5)O,-3^24:/Bu
+ ?5,$(2,5)d,@(1,3,4)N,4\,!2,Ph,@(4,6)/Cl,#7\,?5,@(2,5)O,3:/Bu^24
)
endfont
%***********************************************************************
@@ -156,7 +156,7 @@ endfont
%***********************************************************************
beginfont("EN:Oxadixyl")
MCf(^^30,
- Ph,@(1,3)/Cl,4\,?5,2=d,@(1,2)N,4:O,5://O,-3:/tBu,#6\,O,!2,!~tm
+ Ph,@(1,3)/Cl,4\,?5,2=dl,@(1,2)N,4:O,5://O,-3:/tBu,#6\,O,!2,!~tm
)
endfont
%***********************************************************************
@@ -168,19 +168,19 @@ endfont
%***********************************************************************
beginfont("EN:Cafenstrole")
MCf(^^30,
- Ph,@(2,4,6)/Me,3\,SOO,!,?5,$(2,5)d,@(2,4,5)N,-2\,!,N,/Me,!2
+ Ph,@(2,4,6)/Me,3\,SOO,!,?5,$(2,5)d,@(2,4,5)N,4\,!,N,/Me,!2
)
endfont
%***********************************************************************
beginfont("EN:Cyclosulfamuron")
MCf(^^30,
- Ph,5\,//O,!,?3,#4\,NH,!,SOO,!,NH,!,//O,!,NH,!,Ph,@(2,6)N,@(3,5)/OMe
+ Ph,5\,//O,!,??3,4\,NH,!,SOO,!,NH,!,//O,!,NH,!,Ph,@(2,6)N,@(3,5)/OMe
)
endfont
%***********************************************************************
beginfont("EN:Napropamide")
MCf(^^-30,
- Ph,-4=Ph,#10\,O,!,/Me^35,/Me^-35,!,//O,!,N,/Et,!
+ Ph,3=ph,10\,O,!,/Me^35,/Me^-35,!,//O,!,N,/Et,!
)
endfont
%***********************************************************************
@@ -222,19 +222,19 @@ endfont
%***********************************************************************
beginfont("EN:Tricyclazole")
MCf(^^30,
- Ph,2:/Me,-4=?5,1:N,3:S,-3=?5,$(2,4)d,@(2,3)N
+ Ph,2:/Me,3=?5,1:N,3:S,2=?5,$(2,4)dl,@(2,3)N
)
endfont
%***********************************************************************
beginfont("EN:Phthalide")
MCf(^^30,
- Ph,@(1,2,5,6)/Cl,-4=?5,2:O,3://O
+ Ph,@(1,2,5,6)/Cl,3=?5,2:O,3://O
)
endfont
%***********************************************************************
beginfont("EN:Probenazole")
MCf(^^12,
- Ph,3:d,-4=?5,1:SOO,2:N,3\,O,!2,!~dr
+ Ph,3:dl,3=?5,1:SOO,2:N,3\,O,!2,!~dr
)
endfont
%***********************************************************************
@@ -324,7 +324,7 @@ endfont
beginfont("EN:Gibberellin A3");
MCf(^^12,
?6`1.3,3=??5,9=??7,12\^160`1.6,&8,
- 4\^155~zf`-1.2,O,55,//O^180`1,&2~zb,
+ 4\^155~zf`1.2,O,55,//O^180`1,&2~zb,
5=dl,11=wf,13=wb,7:/COOH,11://Me,1:*/OH,12:/*OH,2:*/Me,
@(3^-60,9^60)*/H
)
@@ -560,7 +560,7 @@ endfont
beginfont("EN:Atoropin")
MCf(^^-30,
O,!,//O,!,!,Ph,
- #1\~zb^-120,?7,-2*\^-170`1.2,N,/Me,&-5~wb,
+ #1\~zb^-120,?7`1.1,6*\^190`1.25,N,/Me,&3~wb,
#3\~wv,!,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 c2943bbf6fe..6d28876c3c3 100644
--- a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_example.pdf
+++ b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_example.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_example.tex b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_example.tex
index 7a00b00389f..0d25e6c5e7f 100644
--- a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_example.tex
+++ b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_example.tex
@@ -1,5 +1,5 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Example of MCF typeset by LaTeX mcf_examples.tex by A.Yamaji 2015.8.31
+% Example of MCF typeset by LaTeX mcf_examples.tex by A.Yamaji 2015.9.05
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\documentclass[a4paper]{article}
\usepackage{graphicx}
@@ -57,7 +57,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\begin{document}
{\hspace{20mm} \LARGE\bf Molecular Coding Format examples \hspace{10mm} }%
-{\footnotesize\bf by Akira Yamaji 2015.8.28} \vspace{5mm}\\
+{\footnotesize\bf by Akira Yamaji 2015.9.05} \vspace{5mm}\\
\fontnum=1%
\noindent%
%------------------------------------------------------------------------
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 2c0ab56fa5e..2b6f04c698a 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 2015.8.28
+% Molecular Coding Format file for mcf_manual.tex by Akira.Yamaji 2015.9.12
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
input mcf2graph.mf;
%-----------------------------------------------------------------------
@@ -14,15 +14,17 @@ sw_start_vector:=0;
%%%%%sw_checklist:=1;
%***********************************************************************
beginfont("EN:Chain")
-sw_numberB:=1;
- ratio_cr:=1;
+ sw_numberB:=1;
+ max_bond_width:=0.20;
+ ratio_chain_ring:=1;
sw_start_vector:=1;
MCf(^^30,-60,60,-60,60,-60,60)
endfont
%***********************************************************************
beginfont("EN:Chain")
sw_numberB:=1;
- ratio_cr:=1;
+ max_bond_width:=0.20;
+ ratio_chain_ring:=1;
sw_start_vector:=1;
MCf(^^30,!,!,!,!,!,!)
endfont
@@ -39,12 +41,12 @@ beginfont("EN:rotate 1")
endfont
%***********************************************************************
beginfont("EN:change bond 1")
- ratio_cr:=1;
+ ratio_chain_ring:=1;
MCf(^^30,!~dm,!~dl,!~dr,!~wf,!~wb,!~zf,!~zb)
endfont
%***********************************************************************
beginfont("EN:change bond 2")
- ratio_cr:=1;
+ ratio_chain_ring:=1;
MCf(^^30,!9,1=vf,2=vb,3=tm,4=dt,5=wv,@(7~bd^-45`2,9~ov^45`2)/Me)
endfont
%***********************************************************************
@@ -62,7 +64,6 @@ endfont
%***********************************************************************
beginfont("EN:change bond length3")
sw_start_vector:=1;
- sw_numberB:=1;
MCf(^^30,?6,3\,?6`1.2,4=??6)
endfont
%***********************************************************************
@@ -72,110 +73,119 @@ beginfont("EN:change atom 1")
endfont
%***********************************************************************
beginfont("EN:change atom 2")
- sw_start_vector:=1;
- MCf(^^30,!6,2:O,@(3,5)N)
+ MCd(1,1)(.5,.8)(^^30,!6,2:O,@(3,5)N)
+ sw_numberA:=1;
+ MCd(1,1)(.5,.2)(^^30,!6,2:O,@(3,5)N)
endfont
%***********************************************************************
beginfont("EN:change atom 3")
- sw_start_vector:=1;
- MCf(?6,4\,?6,2:N)
+ MCd(.5,.5)(.5,.9)(?6,4\,??6,2:N)
+ sw_numberA:=1;
+ MCd(.5,.5)(.5,.1)(?6,4\,??6)
endfont
%***********************************************************************
beginfont("EN:change atom 4")
- sw_start_vector:=1;
- MCf(?6,4\,??6,2:N)
+ MCd(.5,.5)(.5,.9)(?6,4\,?6,2:N)
+ sw_numberA:=2;
+ numberA_start:=7;
+ MCd(.5,.5)(.5,.1)(?6,4\,?6)
endfont
%***********************************************************************
beginfont("EN:change atom 5")
- sw_start_vector:=1;
- MCf(?6,4\,?6,#2:N)
+ MCd(.5,.5)(.5,.9)(?6,4\,??6,#2:N)
+ sw_numberA:=1;
+ MCd(.5,.5)(.5,.1)(?6,4\,??6)
endfont
%***********************************************************************
beginfont("EN:change atom 6")
- sw_start_vector:=1;
- MCf(?6,4\,?6,-2:N)
+ MCd(.5,.5)(.5,.9)(?6,4\,?6,-2:N)
+ sw_numberA:=3;
+ MCd(.5,.5)(.5,.1)(?6,4\,?6)
endfont
%***********************************************************************
beginfont("EN:fused ring 1")
sw_start_vector:=1;
sw_numberB:=1;
+ numberB_end:=6;
MCf(^^30,?6,3=?5)
endfont
%***********************************************************************
beginfont("EN:fused ring 1")
sw_start_vector:=1;
sw_numberB:=1;
- MCf(^^30,?6,$(3,3,3)?6)
+ MCf(^^30,?6,$(3,3)?6)
endfont
%***********************************************************************
beginfont("EN:fused ring 2")
- sw_start_vector:=1;
- sw_numberB:=1;
- MCf(^^30,?6,$(3,9,14)??6)
+ sw_numberB:=1;
+ numberB_end:=11;
+ MCd(1,.7)(0,0)(^^30,?6,$(3)??6,(11,4)=??6[4])
+ MCd(1,.6)(.5,1)(^^30,?6,$(3)??6,(11,4)=??5[3])
+ MCd(1,.6)(1,0)(^^30,?6,$(3)??6,(11,4)=??4[2])
endfont
%***********************************************************************
beginfont("EN:fused ring 3")
- sw_start_vector:=1;
- sw_numberB:=1;
- MCf(^^30,?6,$(3,9)??6,(11,4)=??6[4],(16,17)=??6[3],(20,5)=??4[2])
-endfont
-%***********************************************************************
-beginfont("EN:fused ring 4")
- sw_start_vector:=1;
sw_numberB:=1;
- MCf(^^30,?6,$(3,9)??6,(11,4)=??6[4],(20,5)=??5[3],(16,17)=??5[2])
+ 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])
endfont
%***********************************************************************
beginfont("EN:Spiro ring ")
- sw_start_vector:=1;
- ratio_cr:=1;
+ sw_numberA:=1;
+ numberA_end:=7;
+ ratio_chain_ring:=1;
MCf(^^30,!6,4*,?5)
endfont
%***********************************************************************
beginfont("EN:branch")
- sw_numberB:=1;
- sw_start_vector:=1;
- MCf(^^30,!3,/!2,!3)
+ sw_numberA:=1;
+ max_bond_width:=0.30;
+ ratio_chain_ring:=1;
+ MCf(^^-30,!8,2\,!,4*\,!,6\*,!,8\\,!)
endfont
%***********************************************************************
-beginfont("EN:branch")
- sw_numberB:=1;
- sw_start_vector:=1;
- MCf(^^30,!6,4\,!2)
+beginfont("EN:branch3")
+ sw_numberA:=1;
+ max_bond_width:=0.30;
+ ratio_chain_ring:=1;
+ MCf(^^-30,!6,2\~dr,!,4\`1.5,!,6\^15,-60)
endfont
%***********************************************************************
beginfont("EN:substituent 1")
- sw_start_vector:=1;
- MCf(^^30,!,//O,!,/*H,!,*/H,!,/?3,!,**?3,!)
+ MCf(^^30,!,/Me,!,/Et,!3,/Pr,!,/iPr,!3,/tBu,!,/Ph^-30,!)
endfont
%***********************************************************************
beginfont("EN:substituent 2")
sw_start_vector:=1;
- MCf(^^30,!,/Me,!,/Et,!3,/Pr,!,/iPr,!3,/tBu,!)
+ MCf(^^30,!,//O,!,/*H,!,*/H,!,/?3,!,**?3,!)
endfont
%***********************************************************************
beginfont("EN:substituent 3")
sw_start_vector:=1;
- MCf(^^30,!10,2:/Me,3:/Et,6:/Pr,7:/iPr,10:/tBu)
+ MCf(^^30,!`1,/Me~zf`2^30,!`1,/Me~zf`2^30,!2`1,*/Pr>lr,!2`1,*/Pr>rl,!`1)
+endfont
+%***********************************************************************
+beginfont("EN:substituent 3")
+ sw_numberA:=1;
+ numberA_end:=_skeletonA_end;
+ MCf(^^30,!11,2:/Me,3:/Et,6:/Pr,7:/iPr,10:/tBu,11:/Ph^-30)
endfont
%***********************************************************************
beginfont("EN:substituent 4")
- sw_start_vector:=1;
+ sw_numberA:=1; numberA_end:=_skeletonA_end;
MCf(^^30,?6,@(3`2^30,3~wf,4~zf,6~wf^-30,6~zf^30)/H)
endfont
%***********************************************************************
beginfont("EN:substituent 5")
- sw_start_vector:=1;
- MCf(^^30,!7`1,@(2,3)/*Me`2^30,5:*/Pr>lr,7:*/Pr>rl
-)
-endfont
-%***********************************************************************
-beginfont("EN:change atom and substituent")
- sw_start_vector:=1;
- MCf(^^30,!3,NH,!,SOO,!3)
+ sw_numberA:=1; numberA_end:=_skeletonA_end;
+ MCf(^^30,!7`1,@(2,3)/*Me`2^30,5:*/Pr>lr,7:*/Pr>rl)
endfont
%***********************************************************************
beginfont("EN:chain strech direction mode 1")
+ ratio_chain_ring:=1;
MCf(
?4,@(3^-90,3^-30,3^90)/'(!3,"{>hz}")>hz,
@(1^-60,1`1.5,1^60)/'(!2,"{>vt}")>vt
@@ -183,6 +193,7 @@ beginfont("EN:chain strech direction mode 1")
endfont
%***********************************************************************
beginfont("EN:chain strech direction mode 2")
+ ratio_chain_ring:=1;
MCf(
^^30,!6,@(3^-30,3,3^30)/'(!,!,!,"{>lr}")>lr,
@(5^-30,5,5^30)/'(!,!,!,"{>rl}")>rl
@@ -190,12 +201,18 @@ beginfont("EN:chain strech direction mode 2")
endfont
%***********************************************************************
beginfont("EN:chain strech direction mode 3")
+ ratio_chain_ring:=1;
sw_start_vector:=1;
MCf(^^-30,!6,@(6>45)/'(!3,"{>45}"),
@(3>'(90,-90,90))/'(!,!,!,"{>'(90,-90,90)}")
)
endfont
%***********************************************************************
+beginfont("EN:change atom and substituent")
+ sw_start_vector:=1;
+ MCf(^^30,!3,NH,!,SOO,!3)
+endfont
+%***********************************************************************
beginfont("EN:Change color")
sw_start_vector:=1;
MCf(^^30,Ph,@(2,5)N,2:red,5:blue,3=green)
@@ -258,7 +275,7 @@ endfont
beginfont("EN:Gibberellin A3");
MCf(
^^12,?6`1.3,3=??5,9=??7,12\^160`1.6,&8,
- 4\^155~zf`-1.2,O,55,//O^180`1,&2~zb,
+ 4\^155~zf`1.2,O,55,//O^180`1,&2~zb,
5=dl,11=wf,13=wb,7:/COOH,11://Me,1:*/OH,12:/*OH,2:*/Me,
@(3^-60,9^60)*/H
)
@@ -388,7 +405,7 @@ beginfont("EN:margin_left_right")
MCd(1,1)(0.5, .9)(^^30,CH3,!0,!17,CH3)
margin_left_right:=0.4mm;
MCd(1,1)(0.5, .5)(^^30,CH3,!0,!17,CH3)
- margin_left_right:=2mm;
+ margin_left_right:=5mm;
MCd(1,1)(0.5, .1)(^^30,CH3,!0,!17,CH3)
endfont
%***********************************************************************
@@ -398,27 +415,37 @@ beginfont("EN:margin_top_bottom")
MCd(1,1)(0.1, .5)(^^30,Ph,2:/OH,5:/NH2)
margin_top_bottom:=0.4mm;
MCd(1,1)(0.5, .5)(^^30,Ph,2:/OH,5:/NH2)
- margin_top_bottom:=2mm;
+ margin_top_bottom:=5mm;
MCd(1,1)(0.9, .5)(^^30,Ph,2:/OH,5:/NH2)
endfont
%***********************************************************************
beginfont("EN:Switwch start vector")
sw_start_vector:=0;
- MCd(1,.7)( 0, 0)(^^30,Ph,4:/Cl,3:/F)
+ MCd(1,.7)( 0, .5)(^^30,Ph,4:/Cl,3:/F)
sw_start_vector:=1;
- MCd(1,.7)( 1, 1)(^^30,Ph,4:/Cl,3:/F)
+ MCd(1,.7)( 1, .5)(^^30,Ph,4:/Cl,3:/F)
endfont
%***********************************************************************
beginfont("EN:Switwch numberingA")
+ ratio_chain_ring:=1;
+ numberA_start:=3; numberA_end:=8;
sw_numberA:=1;
- sw_start_vector:=1;
- MCf(^^30,?6,-4=?6,-3\,!,?6,#10:/Et)
+ MCd(1,1)(.5,.9)(^^30,!9)
+ sw_numberA:=2;
+ MCd(1,1)(.5,.5)(^^30,!9)
+ sw_numberA:=3;
+ MCd(1,1)(.5,.1)(^^30,!9)
endfont
%***********************************************************************
beginfont("EN:Switwch numberingB")
+ ratio_chain_ring:=1;
+ numberB_start:=3; numberB_end:=8;
sw_numberB:=1;
- sw_start_vector:=1;
- MCf(^^30,?6,-4=?6,-3\,!,?6,#10:/Et)
+ MCd(1,1)(.5,.9)(^^30,!9)
+ sw_numberB:=2;
+ MCd(1,1)(.5,.5)(^^30,!9)
+ sw_numberB:=3;
+ MCd(1,1)(.5,.1)(^^30,!9)
endfont
%***********************************************************************
beginfont("EN:Switwch font frame")
@@ -427,9 +454,9 @@ beginfont("EN:Switwch font frame")
endfont
%***********************************************************************
beginfont("EN:Switwch molecular frame")
- MCd(1,.7)( 0, 0)(^^30,Ph,4:/Cl,3:/F)
+ MCd(1,.7)( 0, .5)(^^30,Ph,4:/Cl,3:/F)
sw_mol_frame:=1;
- MCd(1,.7)( 1, 1)(^^30,Ph,4:/Cl,3:/F)
+ MCd(1,.7)( 1, .5)(^^30,Ph,4:/Cl,3:/F)
endfont
%***********************************************************************
beginfont("EN:Switwch atom frame")
@@ -438,15 +465,15 @@ beginfont("EN:Switwch atom frame")
endfont
%***********************************************************************
beginfont("EN:Switwch Solid ratio")
- MCd(1,.7)( 0, 0)(^^30,Ph,4:/Cl,3:/F)
+ MCd(1,.7)( 0, .5)(^^30,Ph,4:/Cl,3:/F)
sw_solid:=1; ratio_bond_width:=0.08;
- MCd(1,.7)( 1, 1)(^^30,Ph,4:/Cl,3:/F)
+ MCd(1,.7)( 1, .5)(^^30,Ph,4:/Cl,3:/F)
endfont
%***********************************************************************
beginfont("EN:Switwch Expand")
- MCd(1,.6)(0, 0)(^^30,Ph,4:/COOH,3:/NH2)
+ MCd(1,.6)(0, .5)(^^30,Ph,4:/COOH,3:/NH2)
sw_expand:=1;
- MCd(1,.6)(1, 1)(^^30,Ph,4:/COOH,3:/NH2)
+ MCd(1,.6)(1, .5)(^^30,Ph,4:/COOH,3:/NH2)
endfont
%***********************************************************************
beginfont("EN:MCd()")
diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.pdf b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.pdf
index 1c7c00b00a9..f2d07399fbe 100644
--- a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.pdf
+++ b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.tex b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.tex
index 6fff0e21405..45be0f4ad43 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 2015.9.1
+% Molecular Coding Format manual by Akira Yamaji 2015.9.14
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\documentclass[a4paper]{article}
\usepackage[dvipdfmx]{graphicx}
@@ -33,8 +33,8 @@
\begin{document}
\noindent%
\begin{picture}(180,0)
- \put(25,12){{\LARGE Molecular Coding Format manual}\hspace{10mm}
- by Akira Yamaji 2015.9.1}
+ \put(20,9){{\LARGE\bf Molecular Coding Format manual}\hspace{10mm}
+ by Akira Yamaji 2015.9.14}
\end{picture}\vspace{-4.2mm}\\
%----------------------------------------------------------------------------
\begin{minipage}[t][38mm]{100mm}
@@ -80,7 +80,7 @@ six membered ring
\vspace{6mm}\\
%-----------------------------------------------------------------------------
\begin{minipage}[t][38mm]{100mm}
-\MCFtitle{Rotate}
+\MCFtitle{Rotate current angle}
\begin{verbatim}
^^angle:rotate current angle
@@ -91,7 +91,7 @@ six membered ring
\vspace{6mm}\\
%-----------------------------------------------------------------------------
\begin{minipage}[t][38mm]{100mm}
-\MCFtitle{Change bond (1)}
+\MCFtitle{Change bond type (1)}
\begin{verbatim}
~bond change bond
dm:double,dl:double(left),dr:double(right),
@@ -105,9 +105,9 @@ six membered ring
\vspace{6mm}\\
%-----------------------------------------------------------------------------
\begin{minipage}[t][38mm]{100mm}
-\MCFtitle{Change bond (2)}
+\MCFtitle{Change bond type (2)}
\begin{verbatim}
- Bn=bond : change bond
+ Bn=bond type : $(Bn)bond type (change bond type at Bn)
vf:vector forward, vb:vector backward,
tm:triple, wv:waved, bd:broad single,
ov:over line
@@ -122,7 +122,7 @@ six membered ring
\begin{minipage}[t][38mm]{100mm}
\MCFtitle{Change bond length (1)}
\begin{verbatim}
-B`length : change bond length of B
+Bn`length : change bond length at Bn
^^30,!2,!2`1.2,!
\end{verbatim}
@@ -170,6 +170,8 @@ Insert hetero atom
@(3,5)N : change A3,A5 C to N
^^30,!6,2:O,@(3,5)N
+
+An(n:numeric): atom number
\end{verbatim}
\end{minipage}
\MCFstructure
@@ -178,20 +180,21 @@ Insert hetero atom
\begin{minipage}[t][38mm]{100mm}
\MCFtitle{Change atom (3)}
\begin{verbatim}
-2:N : change A2(brock ahead) C to N
+2:N : change A2 C to N
+??6 do not make brock
- ?6,4\,?6,2:N
+ ?6,4\,??6,2:N
\end{verbatim}
\end{minipage}
\MCFstructure
\vspace{6mm}\\
%-----------------------------------------------------------------------------
\begin{minipage}[t][38mm]{100mm}
-\MCFtitle{Change atom (4)}
+\MCFtitle{Change atom (brock address)}
\begin{verbatim}
-2:N : change A2(brock ahead) C to N
-??6 is not brock
- ?6,4\,??6,2:N
+2:N : change A2(brock address) C to N
+
+?6,4\,?6,2:N
\end{verbatim}
\end{minipage}
@@ -199,7 +202,7 @@ Insert hetero atom
\vspace{6mm}\\
%-----------------------------------------------------------------------------
\begin{minipage}[t][38mm]{100mm}
-\MCFtitle{Change atom (5)}
+\MCFtitle{Change atoma (absolute address)}
\begin{verbatim}
#2:N : change A#2 C to N
@@ -210,7 +213,7 @@ Insert hetero atom
\vspace{6mm}\\
%-----------------------------------------------------------------------------
\begin{minipage}[t][38mm]{100mm}
-\MCFtitle{Change atom (6)}
+\MCFtitle{Change atom (relative address)}
\begin{verbatim}
-2:N : change A(-2) C to N
@@ -221,25 +224,26 @@ Insert hetero atom
\vspace{6mm}\\
%-----------------------------------------------------------------------------
\begin{minipage}[t][38mm]{100mm}
-\MCFtitle{Fused ring (1)}
+\MCFtitle{Fuse ring (attached 1 bond)}
\begin{verbatim}
?6,3=?5 : fuse ?5 at B3
?6,3=?5
+Bn(n:numeric): bond number
\end{verbatim}
\end{minipage}
\MCFstructure
\vspace{6mm}\\
%-----------------------------------------------------------------------------
\begin{minipage}[t][38mm]{100mm}
-\MCFtitle{Fused ring (2)}
+\MCFtitle{Fuse multi ring (attached 1 bond)}
\begin{verbatim}
- ?6,$(3,3,3)??6 NG
- ?6,$(3,9,14)??6 OK
- ?6,$(-4,-3,-3)??6 OK
- ?6,$(#3,#9,#14)??6 OK
+?6,$(3,3)?6 => OK ?6,$(3,3)??6 => NG
+?6,$(3,9)?6 => NG ?6,$(3,9)??6 => OK
+?6,$(-4,-3)?6 => OK ?6,$(-4,-3)??6 => OK
+?6,$(#3,#9)?6 => OK ?6,$(#3,#9)??6 => OK
\end{verbatim}
\end{minipage}
@@ -247,82 +251,89 @@ Insert hetero atom
\vspace{6mm}\\
%-----------------------------------------------------------------------------
\begin{minipage}[t][38mm]{100mm}
-\MCFtitle{Fused ring (3)}
+\MCFtitle{Fuse ring (attached 2 bond)}
\begin{verbatim}
+(4,11)=??6[4] : fuse 4/6 ring to B11..B4
+(4,11)=??5[3] : fuse 3/5 ring to B11..B4
+(4,11)=??4[2] : fuse 2/4 ring to B11..B4
- ?6,$(3,3,3)?6 OK
- ?6,$(3,9,14)?6 NG
- ?6,$(-4,-3,-3)?6 OK
- ?6,$(#3,#9,#14)?6 OK
-
+ MCd(1,.7)( 0,0)(^^30,?6,$(3)??6,(11,4)=??6[4])
+ MCd(1,.6)(.5,1)(^^30,?6,$(3)??6,(11,4)=??5[3])
+ MCd(1,.6)( 1,0)(^^30,?6,$(3)??6,(11,4)=??4[2])
\end{verbatim}
\end{minipage}
\MCFstructure
\vspace{6mm}\\
%-----------------------------------------------------------------------------
\begin{minipage}[t][38mm]{100mm}
-\MCFtitle{Fused ring (4)}
+\MCFtitle{Fuse ring (attached 3,4 bond)}
\begin{verbatim}
-(4,11)=??6[4] : fuse 4/6 ring to B4 ..B11
-(16,17)=??6[3] : fuse 3/6 ring to B16..B17
-(20,5)=??4[2] : fuse 2/4 ring to B20.. B5
-
- ^^30,?6,$(3,9)??6,(4,11)=??6[4],
- (16,17)=??6[3],(20,5)=??4[2]
+(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
+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])
+MCd(1,.53)(1,0)(^^30,?6,$(2,10,15)??6,(21,3)=??6[2])
\end{verbatim}
\end{minipage}
\MCFstructure
\vspace{6mm}\\
%-----------------------------------------------------------------------------
\begin{minipage}[t][38mm]{100mm}
-\MCFtitle{Fused ring (5)}
+\MCFtitle{Spiro ring}
\begin{verbatim}
-(20,5)=??5[3] : fuse 3/5 ring to B20..B5
-(16,17)=??5[2] : fuse 2/5 ring to B16..B17
+4*,?5 : add ?5(5 membered ring) at A4
+
+^^30,!6,4*,?5
- ^^30,?6,$(3,9)??6,(4,11)=??6[4],
- (20,5)=??5[3],(16,17)=??5[2]
+An* : jump to An
\end{verbatim}
\end{minipage}
\MCFstructure
\vspace{6mm}\\
%-----------------------------------------------------------------------------
\begin{minipage}[t][38mm]{100mm}
-\MCFtitle{Spiro ring}
+\MCFtitle{Branch bond (1)}
\begin{verbatim}
-4*,?5 : add ?5(5 membered ring) to A4
+2\ : 2*,0 4*\ : 4*,0~wf
+6\* : 6*,0~zf 8\\ : 8*,0~dm
- ^^30,!6,4*,?5
+MCf(^^30,!8,2\,!,4*\,!,6\*,!,8\\,!)
\end{verbatim}
\end{minipage}
\MCFstructure
\vspace{6mm}\\
%-----------------------------------------------------------------------------
\begin{minipage}[t][38mm]{100mm}
-\MCFtitle{Branch (1)}
+\MCFtitle{Branch bond (2)}
\begin{verbatim}
-/ : branch bond(make at last)
-
- ^^30,!3,/!2,!3
+2\~dr : 2*,0~dr
+4\`1.5 : 4*,0`1.5
+6\^15 : 6*,0^15
+
+MCf(^^-30,!6,2\~dr,!,4\`1.5,!,6\^15,-60)
+
\end{verbatim}
\end{minipage}
\MCFstructure
\vspace{6mm}\\
%-----------------------------------------------------------------------------
\begin{minipage}[t][38mm]{100mm}
-\MCFtitle{Branch (2)}
+\MCFtitle{Insert substituent(1)}
\begin{verbatim}
-4\ : branch bond at A4
+^^30,
+!,/Me,!,/Et,!3,/Pr,!,/iPr,!3,/tBu,!,/Ph^-30,!
- ^^30,!6,4\,!2
+** Me:methyl Et:ethyl Pr:propyl iPr:isopropyl
+ tBu:tertial buthyl Ph:phenyl
\end{verbatim}
\end{minipage}
\MCFstructure
\vspace{6mm}\\
%-----------------------------------------------------------------------------
\begin{minipage}[t][38mm]{100mm}
-\MCFtitle{Substituent (1)}
+\MCFtitle{Insert substituent(2)}
\begin{verbatim}
/ : single // : double
*/ : wedge forward /* : wedge backward
@@ -335,63 +346,56 @@ Insert hetero atom
\vspace{6mm}\\
%-----------------------------------------------------------------------------
\begin{minipage}[t][38mm]{100mm}
-\MCFtitle{Substituent (2)}
+\MCFtitle{Insert substituent(3)}
\begin{verbatim}
-Insert substituent
+~,^,`,> : change type,angle,length,enviroment
+ of substituent
+
+MCf(^^30,!`1,/Me~zf`2^30,!`1,/Me~zf`2^30,
+ !2`1,*/Pr>lr,!2`1,*/Pr>rl,!`1)
- ^^30,!,/Me,!,/Et,!3,/Pr,!,/iPr,!3,/tBu,!
\end{verbatim}
\end{minipage}
\MCFstructure
\vspace{6mm}\\
%-----------------------------------------------------------------------------
\begin{minipage}[t][38mm]{100mm}
-\MCFtitle{Substituent (3)}
+\MCFtitle{Add substituent(1)}
\begin{verbatim}
-Add substituent
-
- ^^30,!10,2:/Me,3:/Et,6:/Pr,7:/iPr,10:/tBu
+sw_numberA:=1; numberA_end:=_skeletonA_end;
+mcf(^^30,!11,
+ 2:/Me,3:/Et,6:/Pr,7:/iPr,10:/tBu,11:/Ph^-30)
+** _skeletonA_end :
+ end number of molecular skeleton atom
\end{verbatim}
\end{minipage}
\MCFstructure
\vspace{6mm}\\
%-----------------------------------------------------------------------------
\begin{minipage}[t][38mm]{100mm}
-\MCFtitle{Substituent (4)}
+\MCFtitle{Add substituent(2)}
\begin{verbatim}
~,^,`,> : change type,angle,length,enviroment
of substituent
- ^^30,?6,
- @(3`2^30,3~wf,4~zf,6~wf^-30,6~zf^30)/H
+sw_numberA:=1; numberA_end:=_skeletonA_end;
+MCf(^^30,?6,
+ @(3`2^30,3~wf,4~zf,6~wf^-30,6~zf^30)/H)
\end{verbatim}
\end{minipage}
\MCFstructure
\vspace{6mm}\\
%-----------------------------------------------------------------------------
\begin{minipage}[t][38mm]{100mm}
-\MCFtitle{Substituent (5)}
+\MCFtitle{Add substituent(3)}
\begin{verbatim}
~,^,`,> : change type,angle,length,enviroment
of substituent
- ^^30,!7`1,
- @(2,3)/*Me`2^30,5:*/Pr>lr,7:*/Pr>rl
-
-\end{verbatim}
-\end{minipage}
-\MCFstructure
-\vspace{6mm}\\
-%-----------------------------------------------------------------------------
-\begin{minipage}[t][38mm]{100mm}
-\MCFtitle{Change atom and Substituent}
-\begin{verbatim}
-NH,SOO : inset hetero atom and substituent
- simultaneously
-
- ^^30,!3,NH,!,SOO,!3
-
+sw_numberA:=1; numberA_end:=_skeletonA_end;
+MCF(^^30,!7`1,
+@(2,3)/*Me`2^30,5:*/Pr>lr,7:*/Pr>rl)
\end{verbatim}
\end{minipage}
\MCFstructure
@@ -441,6 +445,19 @@ NH,SOO : inset hetero atom and substituent
\vspace{6mm}\\
%-----------------------------------------------------------------------------
\begin{minipage}[t][38mm]{100mm}
+\MCFtitle{Change atom and Substituent}
+\begin{verbatim}
+NH,SOO : inset hetero atom and substituent
+ simultaneously
+
+ ^^30,!3,NH,!,SOO,!3
+
+\end{verbatim}
+\end{minipage}
+\MCFstructure
+\vspace{6mm}\\
+%-----------------------------------------------------------------------------
+\begin{minipage}[t][38mm]{100mm}
\MCFtitle{Change color}
\begin{verbatim}
@(5)green : change color of A5 green
@@ -569,7 +586,7 @@ Insert user defined substructure
^^12,
?6`1.3,3=??5,9=??7,12\^160`1.6,&8,
- 4\^155~zf`-1.2,O,55,//O^180`1,&2~zb,
+ 4\^155~zf`1.2,O,55,//O^180`1,&2~zb,
5=dl,11=wf,13=wb,7:/COOH,11://Me,1:*/OH,
12:/*OH,2:*/Me,@(3^-60,9^60)*/H
\end{verbatim}
@@ -782,7 +799,7 @@ margin_left_right:=0mm;
MCd(1,1)(0.5,0.9)(^^30,CH3,!0,!17,CH3)
margin_left_right:=0.4mm; %<<== default
MCd(1,1)(0.5,0.5)(^^30,CH3,!0,!17,CH3)
-margin_left_right:=2mm;
+margin_left_right:=5mm;
MCd(1,1)(0.5,0.1)(^^30,CH3,!0,!17,CH3)
\end{verbatim}
\end{minipage}
@@ -796,7 +813,7 @@ margin_top_bottom:=0mm;
MCd(1,1)(0.1,0.5)(^^30,Ph,2:/OH,5:/NH2)
margin_top_bottom:=0.4mm; %<<== default
MCd(1,1)(0.5,0.5)(^^30,Ph,2:/OH,5:/NH2)
-margin_top_bottom:=2mm;
+margin_top_bottom:=5mm;
MCd(1,1)(0.9,0.5)(^^30,Ph,2:/OH,5:/NH2)
\end{verbatim}
\end{minipage}
@@ -807,31 +824,39 @@ MCd(1,1)(0.9,0.5)(^^30,Ph,2:/OH,5:/NH2)
\MCFtitle{Switch Start Vector}
\begin{verbatim}
- MCd(1,.8)( 0, 0)(^^30,Ph,4:/Cl,3:/F)
+ MCd(1,.8)( 0,0.5)(^^30,Ph,4:/Cl,3:/F)
sw_start_vector:=1;
- MCd(1,.8)( 1, 1)(^^30,Ph,4:/Cl,3:/F)
+ MCd(1,.8)( 1,0.5)(^^30,Ph,4:/Cl,3:/F)
\end{verbatim}
\end{minipage}
\MCFstructure
\vspace{6mm}\\
%-----------------------------------------------------------------------------
\begin{minipage}[t][38mm]{100mm}
-\MCFtitle{Switch NumberingA}
+\MCFtitle{Switch Numbering atom}
\begin{verbatim}
- sw_numberA:=1;
+ numberA_start:=3; numberA_end:=8;
- MCf(^^30,Ph,-4=Ph1,-3\,!,Ph,10:/Et)
+ sw_numberA:=1; MCd(1,1)(.5,.9)(^^30,!9)
+ sw_numberA:=2; MCd(1,1)(.5,.5)(^^30,!9)
+ sw_numberA:=3; MCd(1,1)(.5,.1)(^^30,!9)
+
+ ** default: numberA_start=1 numberA_end=4095
\end{verbatim}
\end{minipage}
\MCFstructure
\vspace{6mm}\\
%-----------------------------------------------------------------------------
\begin{minipage}[t][38mm]{100mm}
-\MCFtitle{Switch NumberingB}
+\MCFtitle{Switch Numbering bond}
\begin{verbatim}
- sw_numberB:=1;
+ numberB_start:=3; numberB_end:=8;
+
+ sw_numberB:=1; MCd(1,1)(.5,.9)(^^30,!9)
+ sw_numberB:=2; MCd(1,1)(.5,.5)(^^30,!9)
+ sw_numberB:=3; MCd(1,1)(.5,.1)(^^30,!9)
- MCf(^^30,Ph,-4=Ph1,-3\,!,Ph,10:/Et)
+ ** default: numberB_start=1 numberB_end=4095
\end{verbatim}
\end{minipage}
\MCFstructure
@@ -852,9 +877,9 @@ MCd(1,1)(0.9,0.5)(^^30,Ph,2:/OH,5:/NH2)
\MCFtitle{Switch molecular frame}
\begin{verbatim}
- MCd(1,.8)(0,0)(^^30,Ph,4:/Cl,3:/F)
+ MCd(1,.8)(0,0.5)(^^30,Ph,4:/Cl,3:/F)
sw_mol_frame:=1;
- MCd(1,.8)(1,1)(^^30,Ph,4:/Cl,3:/F)
+ MCd(1,.8)(1,0.5)(^^30,Ph,4:/Cl,3:/F)
\end{verbatim}
\end{minipage}
\MCFstructure
@@ -876,9 +901,9 @@ MCd(1,1)(0.9,0.5)(^^30,Ph,2:/OH,5:/NH2)
\MCFtitle{Switch solid mode}
\begin{verbatim}
- MCd(1,.8)( 0, 0)(^^30,Ph,4:/Cl,3:/F)
+ MCd(1,.8)( 0,0.5)(^^30,Ph,4:/Cl,3:/F)
sw_solid:=1; ratio_bond_width:=0.08;
- MCd(1,.8)( 1, 1)(^^30,Ph,4:/Cl,3:/F)
+ MCd(1,.8)( 1,0.5)(^^30,Ph,4:/Cl,3:/F)
\end{verbatim}
\end{minipage}
\MCFstructure
@@ -888,16 +913,16 @@ MCd(1,1)(0.9,0.5)(^^30,Ph,2:/OH,5:/NH2)
\MCFtitle{Switch Expand}
\begin{verbatim}
- MCd(1,.6)(0,0)(^^30,Ph,4:/COOH,3:/NH2)
+ MCd(1,.6)(0,0.5)(^^30,Ph,4:/COOH,3:/NH2)
sw_expand:=1;
- MCd(1,.6)(1,1)(^^30,Ph,4:/COOH,3:/NH2)
+ MCd(1,.6)(1,0.5)(^^30,Ph,4:/COOH,3:/NH2)
\end{verbatim}
\end{minipage}
\MCFstructure
\vspace{6mm}\\
%-----------------------------------------------------------------------------
\begin{minipage}[t][38mm]{100mm}
-\MCFtitle{Function MCd}
+\MCFtitle{Function MCd (draw)}
\begin{verbatim}
MCd(a,b)(c,d)(...)
a: ratio molecular width/font width
@@ -912,7 +937,7 @@ MCd(1,1)(0.9,0.5)(^^30,Ph,2:/OH,5:/NH2)
\vspace{6mm}\\
%-----------------------------------------------------------------------------
\begin{minipage}[t][38mm]{100mm}
-\MCFtitle{Function MCf}
+\MCFtitle{Function MCf (fit draw)}
\begin{verbatim}
MCf(...) : MCd(1,1)(0.5,0.5)(...)
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 16298f169c3..8d911ba9f26 100644
--- a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_mplib_exa.pdf
+++ b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_mplib_exa.pdf
Binary files differ
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 63286aa6549..a1cebda9941 100644
--- a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_mplib_exa.tex
+++ b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_mplib_exa.tex
@@ -1,5 +1,5 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Example of MCF typest with LuaLaTeX(luamplib) by A.Yamaji 2015.8.18
+% Example of MCF typest with LuaLaTeX(luamplib) by A.Yamaji 2015.9.06
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\documentclass{article}
%-------------------------------------------------------------------------------
@@ -60,8 +60,8 @@
\unitlength=1mm
%------------------------------------------------------------------------------------
\begin{document}
-{\LARGE MCF example for luamplib(LuaLaTeX) }%
- \hspace{20mm}by Akira Yamaji 2015.8.18\vspace{6mm}\\
+{\Large\bf MCF example for luamplib(LuaLaTeX) }%
+ \hspace{10mm} by Akira Yamaji 2015.9.06\vspace{6mm}\\
%------------------------------------------------------------------------------------
{{\small {\tt FM(C) :} molecular formula calculated by mcf2graph}\\
{{\small {\tt MW(C) :} molecular weight calculated by mcf2graph}\\
@@ -114,7 +114,7 @@ font_wd:=50mm; font_ht:=40mm;
beginfont("NO:4","EN:Gibberellin A3","MW:346.37");
MCf(^^12,
?6`1.3,3=??5,9=??7,12\^160`1.6,&8,
- 4\^155~zf`-1.2,O,55,//O^180`1,&2~zb,
+ 4\^155~zf`1.2,O,55,//O^180`1,&2~zb,
5=dl,11=wf,13=wb,7:/COOH,11://Me,1:*/OH,12:/*OH,2:*/Me,
@(3^-60,9^60)*/H
)