diff options
Diffstat (limited to 'Master/texmf-dist/doc/metapost')
| -rw-r--r-- | Master/texmf-dist/doc/metapost/mcf2graph/CHANGELOG | 8 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/metapost/mcf2graph/README | 2 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/metapost/mcf2graph/mcf_exa_soc.mf | 34 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/metapost/mcf2graph/mcf_example.pdf | bin | 235065 -> 235044 bytes | |||
| -rw-r--r-- | Master/texmf-dist/doc/metapost/mcf2graph/mcf_example.tex | 2 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/metapost/mcf2graph/mcf_man_soc-064.eps | 2 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/metapost/mcf2graph/mcf_man_soc.mf | 20 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.pdf | bin | 475648 -> 476093 bytes | |||
| -rw-r--r-- | Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.tex | 33 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/metapost/mcf2graph/mcf_mplib_exa.pdf | bin | 179634 -> 179526 bytes | |||
| -rw-r--r-- | Master/texmf-dist/doc/metapost/mcf2graph/mcf_mplib_exa.tex | 48 |
11 files changed, 78 insertions, 71 deletions
diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/CHANGELOG b/Master/texmf-dist/doc/metapost/mcf2graph/CHANGELOG index a103f960870..51a7cac05e6 100644 --- a/Master/texmf-dist/doc/metapost/mcf2graph/CHANGELOG +++ b/Master/texmf-dist/doc/metapost/mcf2graph/CHANGELOG @@ -1,6 +1,12 @@ ******************************************************************************* - Changelog of mcf2graph software package by Akira Yamaji 2018-06-03 + Changelog of mcf2graph software package by Akira Yamaji 2018-06-18 ******************************************************************************* +[ver. 4.33 / 2018-06-18] + -change syntax n:& + n:& => n:# + -add command &"c" + -update MCF manual and examples + [ver. 4.32 / 2018-06-03] -add commands C[],N[],O[],S[] X[1] : "{X^+^}" diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/README b/Master/texmf-dist/doc/metapost/mcf2graph/README index 53e803731d3..02d15fa1245 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.32 2018-06-03 + version : 4.33 2018-06-18 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 c510dcc2e47..b97f73ae3f4 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 2018.06.03 +% Molecular Coding Format for mcf_example.tex by Akira Yamaji 2018.06.18 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -input mcf2graph.mf; %%% it must be version 4.32 or later +input mcf2graph.mf; %%% it must be version 4.33 or later %------------------------------------------------------------------------- font_wd:=33mm; font_ht:=24mm; @@ -74,7 +74,7 @@ endfont %*************************************************************************** beginfont("EN:Oxine-Copper","MW:351.852") MCf(Ph,4:N,5=Ph,-4:\,O,-60,<90,Cu,-90,O,60,|,Ph,5=Ph,10:N, - ||,4:@,12~vf:&,23:@,12~vf:&) + ||,4:@,12~vf:#,23:@,12~vf:#) endfont %*************************************************************************** beginfont("EN:Captan","MW:300.578") @@ -92,7 +92,7 @@ beginfont("EN:Tetraconazole","MW:372.145") endfont %*************************************************************************** beginfont("EN:Endosulfan","MW:406.904"); - MCf(<26,?7,7=?6[13],11:@,208~wf`1.45,8~wb:&,10=d,{3,5}:O,4:S,4://O, + MCf(<26,?7,7=?6[13],11:@,208~wf`1.45,8~wb:#,10=d,{3,5}:O,4:S,4://O, {8,9,10,11,12^-210,12^-150}:/Cl) endfont; %*************************************************************************** @@ -179,7 +179,7 @@ beginfont("EN:Rifampicin","MW:822.94") |,-8=?6,{2,4}=dl,{1,4}:/OH, |<=1,-2:\,NH,60,//O,-60,/_,60~dl,60,60~dl,-60, */_,60,/*OH,-60,/*_,60,/*OH,60,*/_^30,-60, - 60,/*_^30,-53,66,-53~dl,66`1.2,O,>|,$8:&, + 60,/*_^30,-53,66,-53~dl,66`1.2,O,>|,$8:#, -4:/*O!,-6:@,-30,O,!,//O,!,$11:\,!!,N,!,|,?6,{1,4}:N,4:/_) endfont %*************************************************************************** @@ -212,16 +212,16 @@ endfont %*************************************************************************** beginfont("EN:Chlorophyll a","MW:893.509") MCf(<54,|<=1,?5,{2,5}=dl,4:N,3:\,54~dl,|,?5,{2,4}=dl,5:N, - -2:\,54~dl,|,?5,2=d,5:N,-2:\~dl,54,|,?5,5=d,5:N,-2:\~dl,$5:&, - -1:@,24,/*COO!^15,72,//O,$1:&,>|, + -2:\,54~dl,|,?5,2=d,5:N,-2:\~dl,54,|,?5,5=d,5:N,-2:\~dl,$5:#, + -1:@,24,/*COO!^15,72,//O,$1:#,>|, {2,9,15,20~zf}:/_,8:/!,14:\,!!, - $4:\`1.45,Mg,17:&,-1:@,11~vb:&,-1:@,23~vb:&, + $4:\`1.45,Mg,17:#,-1:@,11~vb:#,-1:@,23~vb:#, $21:@,-6~wf,!2,//O,!,O,!2,!!,|,!13,{1,5,9,13}:/_) endfont %************************************************************************** beginfont("EN:Gibberellin A3","MW:346.379"); - MCf(<18,?5,3=?7,5=?6[12],8:@,160`1.3,3:&,13=dl,6=wf,8=wb, - 5:@,40~zf`1,O,50,//O^180,14~zb:&, + MCf(<18,?5,3=?7,5=?6[12],8:@,160`1.3,3:#,13=dl,6=wf,8=wb, + 5:@,40~zf`1,O,50,//O^180,14~zb:#, 2:/COOH,7://_,13:*/OH,8:/*OH,14:*/_,{1,4}:*/H^60) endfont; %************************************************************************** @@ -237,8 +237,8 @@ beginfont("EN:Lycorine","MW:287.315") endfont %************************************************************************** beginfont("EN:Tetrodotoxine","MW:319.27") - MCf(|<=1,<60,-90,60,-30`1.15,150,60,$1:&,$3:@,-135,60,-30`1.15,150,$4:&, - $10:\,O,60`1.33,60,$3~si_:&,$8:@,-15~si_,O,$12:&,>|, + MCf(|<=1,<60,-90,60,-30`1.15,150,60,$1:#,$3:@,-135,60,-30`1.15,150,$4:#, + $10:\,O,60`1.33,60,$3~si_:#,$8:@,-15~si_,O,$12:#,>|, $9:@,45,-60,OH,1^120://NH, {5~zf^-15,7,9^-75,12,13~zf}:/OH,{2,6^180}:NH) endfont @@ -346,7 +346,7 @@ beginfont("EN:Pyrethrin I","MW:328.452"); endfont; %*************************************************************************** beginfont("EN:Erythromycin","MW:733.937"); -MCf(<30,|<=1,<-120,60,60,60,-60,60,60,-60,60,60,60,-60,60,60,>|,1:&, +MCf(<30,|<=1,<-120,60,60,60,-60,60,60,-60,60,60,60,-60,60,60,>|,1:#, 14:O,13:/*!,{1,9}://O,{2,10}:*/_,{4,6^-35,8,12^35}:/*_, {6^35,11,12^-35}:*/OH, $3:\*,O,30,|,?6`.7,2:O,{3,5^35}:/_,4:/OH,5^-35:/O!, @@ -354,7 +354,7 @@ MCf(<30,|<=1,<-120,60,60,60,-60,60,60,-60,60,60,60,-60,60,60,>|,1:&, endfont; %************************************************************************** beginfont("EN:Paclitaxel","MW:853.918") - MCf(?6,5=d,3:@,|<=1,36,45,45,45,45,>|,$5:&,-4=?6,-4=?4,||,-1=wb,-3=wf,-1:O, + MCf(?6,5=d,3:@,|<=1,36,45,45,45,45,>|,$5:#,-4=?6,-4=?4,||,-1=wb,-3=wf,-1:O, {4^35,4^-35,6}:/_,{3^-60,15}:*/OH,8:/*H^-60,9:*/_^60,10://O, $1:\,O,!,//O,!,*/OH,!,/Ph,60~wf,NH,-60,//O,60,Ph, $7:\*,O,-45,//O,60,Ph,$11:*\,O,-60,//O,60,$12:\*^-15,O,60,//O,-60) @@ -372,7 +372,7 @@ endfont %************************************************************************** beginfont("EN:Morphine","MW:285.343") MCf(<30,Ph,2=?6,-4=?6,(1,12)=?5[2],-1:O,-1=zb, - 7:@,60~wf`0.75,70~si_`1.3,45,N,/_,9~wb:&, + 7:@,60~wf`0.75,70~si_`1.3,45,N,/_,9~wb:#, 15=d,6:/OH,8^180:*/H,12:/*OH) endfont %************************************************************************** @@ -382,12 +382,12 @@ endfont %*************************************************************************** beginfont("EN:Quinine","MW:324.424") MCf(<30,Ph,3=Ph,7:N,6:/O!, - 10:\,*/OH,/H~zf^-60,!,|,?6,2:N,1:*/H^60,4:*\,!!,2:@,165~zf,60,5~zb:&) + 10:\,*/OH,/H~zf^-60,!,|,?6,2:N,1:*/H^60,4:*\,!!,2:@,165~zf,60,5~zb:#) endfont %*************************************************************************** beginfont("EN:Atoropin","MW:289.375") MCf(<-30,O,!,//O,!,!,Ph, - $1:\~zb^-120,|,?7`1.1,6:*\^190`1.25,N,/_,3~wb:&,$3:/!OH~wv) + $1:\~zb^-120,|,?7`1.1,6:*\^190`1.25,N,/_,3~wb:#,$3:/!OH~wv) endfont %*************************************************************************** bye 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 ea64258787c..c050d3b9fe7 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_example.tex b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_example.tex index 9c078593201..460e6b14c1a 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 2018.04.16 +% Example of MCF typeset by LaTeX mcf_examples.tex by A.Yamaji 2018.06.18 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \documentclass[a4paper]{article} \usepackage{graphicx} diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_man_soc-064.eps b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_man_soc-064.eps index 6e3f08e73da..38a5af157e0 100644 --- a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_man_soc-064.eps +++ b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_man_soc-064.eps @@ -2,7 +2,7 @@ %%BoundingBox: -1 -1 212 60 %%HiResBoundingBox: -0.09962 -0.09962 211.90288 59.64348 %%Creator: MetaPost 2.00 -%%CreationDate: 2018.06.03:2010 +%%CreationDate: 2018.06.18:0626 %%Pages: 1 %%DocumentResources: procset mpost-minimal %%+ font NJFVSO-NimbusSanL-Regu ICXWUR-CMR8 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 bae2cbb6d62..2c171b5cb80 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 2018.06.03 +% Molecular Coding Format file for mcf_manual.tex by Akira.Yamaji 2018.06.18 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -input mcf2graph.mf; %% it must be version 4.32 or later +input mcf2graph.mf; %% it must be version 4.33 or later %------------------------------------------------------------------------ sw_aux_out:=0; sw_mol_frame:=0; @@ -208,7 +208,7 @@ beginfont("EN:Connect atom") sw_numberA:=1; ratio_chain_ring:=1; %---------------------------------------------------------------------- - MCf(<30,!6,3:\,!,5~bd:&) + MCf(<30,!6,3:\,!,5~bd:#) endfont %*********************************************************************** beginfont("EN:ring") @@ -362,7 +362,7 @@ beginfont("EN:Charged atom") sw_clip:=1; font_wd:=60mm; font_ht:=15mm; - MCf(<-30,!2,N[1],!2,O[-1]) + MCf(<-30,!2,N[1],!2,O[-1],!2,&"-",!2,N,&"+"^180,!) endfont %*********************************************************************** beginfont("EN:fused ring") @@ -1010,7 +1010,7 @@ endfont %*************************************************************************** beginfont("EN:Endosulfan","MW:406.904"); font_ht:=25mm; - MCf(<26,?7,7=?6[13],11:@,208~wf`1.45,8~wb:&,10=d,{3,5}:O,4:S,4://O, + MCf(<26,?7,7=?6[13],11:@,208~wf`1.45,8~wb:#,10=d,{3,5}:O,4:S,4://O, {8,9,10,11,12^-210,12^-150}:/Cl) endfont; %*************************************************************************** @@ -1055,21 +1055,21 @@ endfont %*********************************************************************** beginfont("EN:Gibberellin A3","CAS:77-06-5","FM:C19H22O6","MW:346.37"); font_ht:=20mm; - MCf(<18,?5,3=?7,5=?6[12],8:@,160`1.3,3:&,13=dl,6=wf,8=wb, - 5:@,40~zf`1,O,50,//O^180,14~zb:&, + MCf(<18,?5,3=?7,5=?6[12],8:@,160`1.3,3:#,13=dl,6=wf,8=wb, + 5:@,40~zf`1,O,50,//O^180,14~zb:#, 2:/COOH,7://_,13:*/OH,8:/*OH,14:*/_,{1,4}:*/H^60) endfont %*************************************************************************** beginfont("EN:Quinine","CAS:130-95-0","FM:C20H24N2O2","MW:324.42") font_ht:=25mm; MCf(<30,Ph,3=Ph,7:N,6:/O!, - 10:\,*/OH,/H~zf^-60,!,|,?6,2:N,1:*/H^60,4:*\,!!,2:@,165~zf,60,5~zb:&) + 10:\,*/OH,/H~zf^-60,!,|,?6,2:N,1:*/H^60,4:*\,!!,2:@,165~zf,60,5~zb:#) endfont %*************************************************************************** beginfont("EN:Atoropin","CAS:51-55-8","FM:C17H23NO3","MW:289.37") font_ht:=25mm; MCf(<-30,O,!,//O,!,!,Ph, - $1:@,-120~zb,|,?7,6:*\^190`1.12,N,/_,3~wb:&,$3:*\*,!,OH) + $1:@,-120~zb,|,?7,6:*\^190`1.12,N,/_,3~wb:#,$3:*\*,!,OH) endfont %*************************************************************************** beginfont("EN:Rotenone"); @@ -1092,7 +1092,7 @@ endfont %*************************************************************************** beginfont("EN:Paclitaxel","CAS:33069-62-4","FM:C47H51NO14","MW:853.91") MCf(?6,5=dl,3:@,|<,``1,36,45,45,45,45,>|, - $5:&,-4=?6,-4=?4,-1=wb,-3=wf,-1:O,||, + $5:#,-4=?6,-4=?4,-1=wb,-3=wf,-1:O,||, {4^35,4^-35,6}:/_,{3^-60,15}:*/OH,8:/*H^-60,9:*/_^60,10://O, 1:\,O,!,//O,!,*/OH,!,/Ph,60~wf,NH,-60,//O,60,Ph, 7:\*,O,-45,//O,60,Ph,11:*\,O,-60,//O,60,12:\*^-15,O,60,//O,-60) 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 c976c47ff4a..638d03bcdd0 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 f39d7cbf80c..7697177abfc 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 2018.06.03 +% Molecular Coding Format manual by Akira Yamaji 2018.06.18 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \documentclass[a4paper]{article} %%%%\documentclass[a4paper,twoside]{article} @@ -154,16 +154,16 @@ pk font,PNG,SVG,EPS or MDL MOL file.\\ %----------------------------------------------------------------------------- \subsubsection{Connect atom} \begin{verbatim} - n:& : Connect to An + n:# : Connect to An - <30,!6,3:\,!,5~bd:& + <30,!6,3:\,!,5~bd:# \end{verbatim} \MCFstructure %----------------------------------------------------------------------------- \subsubsection{Ring} \begin{verbatim} ?n : n membered ring(3<=n<=20) - ?6 : <-120,60,60,60,60,60,1:& + ?6 : <-120,60,60,60,60,60,1:# ?6 \end{verbatim} \MCFstructure @@ -335,9 +335,10 @@ pk font,PNG,SVG,EPS or MDL MOL file.\\ %----------------------------------------------------------------------------- \subsubsection{Charged atom} \begin{verbatim} - N[1]:N+ / O[-1]:O- + N[1]:N+ / O[-1]:O- / A,&"c":A+c - <-30,!2,N[1],!2,O[-1] + <-30,!2,N[1],!2,O[-1], + !2,&"-",!2,N,&"+"^180,! \end{verbatim} \MCFstructure %----------------------------------------------------------------------------- @@ -1170,7 +1171,7 @@ drawarrow & drawdblarrow: %----------------------------------------------------------------------------- \subsection{Endosulfan} \begin{verbatim} - <26,?7,7=?6[13],11:@,208~wf`1.45,8~wb:&, + <26,?7,7=?6[13],11:@,208~wf`1.45,8~wb:#, 10=d,{3,5}:O,4:S,4://O, {8,9,10,11,12^-210,12^-150}:/Cl \end{verbatim} @@ -1235,9 +1236,9 @@ drawarrow & drawdblarrow: \subsection{Gibberellin} \begin{verbatim} <18,?5,3=?7,5=?6[12], - 8:@,160`1.3,3:&, + 8:@,160`1.3,3:#, 13=dl,6=wf,8=wb, - 5:@,40~zf`1,O,60,//O^180,14~zb:&, + 5:@,40~zf`1,O,60,//O^180,14~zb:#, 2:/COOH,7://_,13:*/OH,8:/*OH, 14:*/_,{1,4}:*/H^60 \end{verbatim} @@ -1249,7 +1250,7 @@ drawarrow & drawdblarrow: 10:\,*/OH,/H~zf^-60,!, |,?6,2:N,1:*/H^60, 4:*\,!!, - 2:@,165~zf,60,5~zb:& + 2:@,165~zf,60,5~zb:# \end{verbatim} \MCFstructure %----------------------------------------------------------------------------- @@ -1257,7 +1258,7 @@ drawarrow & drawdblarrow: \begin{verbatim} <-30,O,!,//O,!,!,Ph, $1:@,-120~zb, - |,?7,6:*\^190`1.02,N,/_,3~wb:&, + |,?7,6:*\^190`1.02,N,/_,3~wb:#, $3:*\*,!,OH \end{verbatim} \MCFstructure @@ -1289,7 +1290,7 @@ drawarrow & drawdblarrow: %----------------------------------------------------------------------------- \subsection{Paclitaxel} \begin{verbatim} - ?6,5=d,3:@,|<=1,36,45,45,45,45,>|,$5:&, + ?6,5=d,3:@,|<=1,36,45,45,45,45,>|,$5:#, -4=?6,-4=?4,-1=wb,-3=wf,-1:O,||, {4^35,4^-35,6}:/_,{3^-60,15}:*/OH, 8:/*H^-60,9:*/_^60,10://O, @@ -1349,8 +1350,8 @@ endfont > end font %------------------------------------------------------------------------ beginfont("NO:5","EN:Gibberellin A3"); > begin font(information) MCf(<18,?5,3=?7,5=?6[12], > begin MCF (5) - 8:@,160`1.3,3:&,13=dl,6=wf,8=wb, > - 5:@,40~zf`1,O,60,//O^180,14~zb:&, > + 8:@,160`1.3,3:#,13=dl,6=wf,8=wb, > + 5:@,40~zf`1,O,60,//O^180,14~zb:#, > 2:/COOH,7://_,13:*/OH,8:/*OH, > 14:*/_,{1^60,4^60}:*/H) > end MCF endfont; > end font @@ -1587,8 +1588,8 @@ M END font_wd:=50mm; font_ht:=50mm; beginfont("NO:4","EN:Gibberellin A3","MW:346.37"); MCf(<18,?5,3=?7,5=?6[12], - 8:@,160`1.3,3:&,13=dl,6=wf,8=wb, - 5:@,40~zf`1,O,60,//O^180,14~zb:&, + 8:@,160`1.3,3:#,13=dl,6=wf,8=wb, + 5:@,40~zf`1,O,60,//O^180,14~zb:#, 2:/COOH,7://_,13:*/OH,8:/*OH, 14:*/_,{1^60,4^60}:*/H ) 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 e7c1fd164ab..ede67444775 100644 --- a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_mplib_exa.pdf +++ b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_mplib_exa.pdf 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 98a89ef5d1b..9d8b2e2c4f4 100644 --- a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_mplib_exa.tex +++ b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_mplib_exa.tex @@ -1,7 +1,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% Example of MCF typest with LuaLaTeX(luamplib) by A.Yamaji 2018.06.03 +% Example of MCF typest with LuaLaTeX(luamplib) by A.Yamaji 2018.06.18 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%%% mcf2graph.mf it must be version 4.32 or later +%%% mcf2graph.mf it must be version 4.33 or later \documentclass{article} %------------------------------------------------------------------------------ \usepackage{luamplib}% @@ -42,9 +42,9 @@ beginfont("NO:1","EN:Chlorophyll a","MW:893.49") MCd(.9,.9)(0,0.5)(<54, |<=1,?5,{2,5}=dl,4:N,3:\,54~dl,|,?5,{2,4}=dl,5:N, - -2:\,54~dl,|,?5,2=dl,5:N,-2:\~dl,54,|,?5,5=dl,5:N,-2:\~dl,$5:&, - -1:@,24,/*COO!^15,72,//O,$1:&,>|, - 4:\`1.45,Mg,17:&,-1:@,11~vb:&,-1:@,23~vb:&, + -2:\,54~dl,|,?5,2=dl,5:N,-2:\~dl,54,|,?5,5=dl,5:N,-2:\~dl,$5:#, + -1:@,24,/*COO!^15,72,//O,$1:#,>|, + 4:\`1.45,Mg,17:#,-1:@,11~vb:#,-1:@,23~vb:#, {2,9,15,20~zf}:/_,8:/!,14:\,!!, 21:@,-6~wf,!2,//O,!,O,!2,!!,|,!13,{1,5,9,13}:/_, ) @@ -62,9 +62,9 @@ |<=1,?5,{2,5}=dl,4:N,3:\,54~dl, |,?5,{2,4}=dl,5:N, -2:\,54~dl,|,?5,2=dl,5:N, --2:\~dl,54,|,?5,5=dl,5:N,-2:\~dl,$5:&, --1:@,24,/*COO!^15,72,//O,$1:&,>|, -4:\`1.45,Mg,17:&,-1:@,11~vb:&,-1:@,23~vb:&, +-2:\~dl,54,|,?5,5=dl,5:N,-2:\~dl,$5:#, +-1:@,24,/*COO!^15,72,//O,$1:#,>|, +4:\`1.45,Mg,17:#,-1:@,11~vb:#,-1:@,23~vb:#, {2,9,15,20~zf}:/_,8:/!,14:\,!!, 21:@,-6~wf,!2,//O,!,O,!2,!!, |,!13,{1,5,9,13}:/_, @@ -136,8 +136,8 @@ endfont font_wd:=80mm; font_ht:=20mm; beginfont("NO:4","EN:Gibberellin A3","MW:346.37"); MCa(0.8,0.5)( - <18,?5,3=?7,5=?6[12],8:@,160`1.3,3:&,13=dl,6=wf,8=wb, - 5:@,40~zf`1,O,60,//O^180,14~zb:&, + <18,?5,3=?7,5=?6[12],8:@,160`1.3,3:#,13=dl,6=wf,8=wb, + 5:@,40~zf`1,O,60,//O^180,14~zb:#, 2:/COOH,7://_,13:*/OH,8:/*OH,14:*/_,{1,4}:*/H^60) EXT( label.lrt("("&inf_EN&")",(0,h)); @@ -150,9 +150,9 @@ endfont; \end{mplibcode} \begin{minipage}[b]{85mm} \begin{verbatim} -<18,?5,3=?7,5=?6[12],8:@,160`1.3,3:&, +<18,?5,3=?7,5=?6[12],8:@,160`1.3,3:#, 13=dl,6=wf,8=wb, -5:@,40~zf`1,O,60,//O^180,14~zb:&, +5:@,40~zf`1,O,60,//O^180,14~zb:#, 2:/COOH,7://_,13:*/OH,8:/*OH, 14:*/_,{1,4}:*/H^60) \end{verbatim} @@ -164,7 +164,7 @@ font_wd:=80mm; font_ht:=25mm; beginfont("EN:Morphine","MW:285.343") MCa(0.7,0.5)( <30,Ph,2=?6,-4=?6,(1,12)=?5[2],-1:O,-1=zb, - 7:@,60~wf`0.75,70~si_`1.3,45,N,/_,9~wb:&, + 7:@,60~wf`0.75,70~si_`1.3,45,N,/_,9~wb:#, 15=d,6:/OH,8^180:*/H,12:/*OH ) EXT( @@ -181,7 +181,7 @@ endfont <30,Ph,2=?6,-4=?6,(1,12)=?5[2], -1:O,-1=zb, 7:@,60~wf`0.75,70~si_`1.3, -45,N,/_,9~wb:&, +45,N,/_,9~wb:#, 15=dl, 6:/OH,8^180:*/H,12:/*OH \end{verbatim} @@ -192,7 +192,7 @@ endfont font_wd:=80mm; font_ht:=35mm; beginfont("NO:5","EN:Erythromycin","MW:733.93"); MCa(0.8,0.5)( - <30,|<=1,<-120,60,60,60,-60,60,60,-60,60,60,60,-60,60,60,>|,1:&, + <30,|<=1,<-120,60,60,60,-60,60,60,-60,60,60,60,-60,60,60,>|,1:#, 14:O,13:/*Et,{1,9}://O,{2,10}:*/_,{4,6^-35,8,12^35}:/*_, {6^35,11,12^-35}:*/OH, $3:\*,O,30,|,?6`.7,2:O,{3,5^35}:/_,4:/OH,5^-35:/O!, @@ -210,7 +210,7 @@ beginfont("NO:5","EN:Erythromycin","MW:733.93"); \begin{minipage}[b]{85mm} \begin{verbatim} <30,|<=1,<-120,60,60,60,-60,60, -60,-60,60,60,60,-60,60,60,>|,1:&, +60,-60,60,60,60,-60,60,60,>|,1:#, 14:O,13:/*Et,{1,9}://O,{2,10}:*/_, {4,6^-35,8,12^35}:/*_, {6^35,11,12^-35}:*/OH, @@ -226,7 +226,7 @@ $5:\*^30`1.7,O,!,|,?6`.7,6:O, font_wd:=80mm; font_ht:=35mm; beginfont("EN:Paclitaxel","MW:853.918") MCa(0.8,0.5)( - ?6,5=d,3:@,|<=1,36,45,45,45,45,>|,$5:&,-4=?6,-4=?4,||,-1=wb,-3=wf,-1:O, + ?6,5=d,3:@,|<=1,36,45,45,45,45,>|,$5:#,-4=?6,-4=?4,||,-1=wb,-3=wf,-1:O, {4^35,4^-35,6}:/_,{3^-60,15}:*/OH,8:/*H^-60,9:*/_^60,10://O, $1:\,O,!,//O,!,*/OH,!,/Ph,60~wf,NH,-60,//O,60,Ph, $7:\*,O,-45,//O,60,Ph,$11:*\,O,-60,//O,60,$12:\*^-15,O,60,//O,-60 @@ -242,7 +242,7 @@ endfont \end{mplibcode} \begin{minipage}[b]{85mm} \begin{verbatim} -?6,5=d,3:@,|<=1,36,45,45,45,45,>|,$5:&, +?6,5=d,3:@,|<=1,36,45,45,45,45,>|,$5:#, -4=?6,-4=?4,||,-1=wb,-3=wf,-1:O, {4^35,4^-35,6}:/_,{3^-60,15}:*/OH, 8:/*H^-60,9:*/_^60,10://O, @@ -261,9 +261,9 @@ beginfont("NO:6","EN:Vancomycin","MW:1449.25"); MCa(0.9,0)( <30, |<=1,!12,{1,3,12}=zf,7=wf,/H^-60,60,*/OH,60, - Ph,-4:/Cl,-3:\,O,!,Ph,-4:\,O,!,Ph,-1^15:/Cl,-3:\,/*OH,*/H^-60,$1:&, - $7:@,$26:&,$1:@,120,//O,60,NH,60,/*H,*/COOH^180,-60, - Ph,{-2,-4}:/OH,-1:\,Ph,-5:/OH,-2:@,$4:&,>|, + Ph,-4:/Cl,-3:\,O,!,Ph,-4:\,O,!,Ph,-1^15:/Cl,-3:\,/*OH,*/H^-60,$1:#, + $7:@,$26:#,$1:@,120,//O,60,NH,60,/*H,*/COOH^180,-60, + Ph,{-2,-4}:/OH,-1:\,Ph,-5:/OH,-2:@,$4:#,>|, {3^40,6,9,12}://O,{2,5,8,11}:NH, {1^180,4^180}:*/H,{7^-60,10^60,14^60}:/*H, $10:*\^-60,60,//O,!,NH2, @@ -285,10 +285,10 @@ endfont; <30,|<=1,!12,{1,3,12}=zf,7=wf, /H^-60,60,*/OH,60,Ph,-4:/Cl, -3:\,O,!,Ph,-4:\,O,!,Ph,-1^15:/Cl, --3:\,/*OH,*/H^-60,$1:&, -$7:@,$26:&,$1:@,120,//O,60,NH,60, +-3:\,/*OH,*/H^-60,$1:#, +$7:@,$26:#,$1:@,120,//O,60,NH,60, /*H,*/COOH^180,-60, -Ph,{-2,-4}:/OH,-1:\,Ph,-5:/OH,-2:@,$4:&,>|, +Ph,{-2,-4}:/OH,-1:\,Ph,-5:/OH,-2:@,$4:#,>|, {3^40,6,9,12}://O,{2,5,8,11}:NH, {1^180,4^180}:*/H, {7^-60,10^60,14^60}:/*H, |