mcf2graph

git-svn-id: svn://tug.org/texlive/trunk@47634 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 29 insertions, 27 deletions

diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.tex b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.tex
index c551c31b267..d5e694c8ca4 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.01.03
+%  Molecular Coding Format manual           by  Akira Yamaji 2018.04.16
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \documentclass[a4paper]{article}
 %%%%\documentclass[a4paper,twoside]{article}
@@ -102,7 +102,7 @@ pk font,PNG,SVG,EPS or MDL MOL file(V2000).\\
   real number plus (+): Counterclockwize 
   real number minus(-): Clockwize
 
-  <15,-30,45,-45,30,-30,60
+  <10,-30,45,-45,30,-30,60
 \end{verbatim}
 \MCFstructure
 %-----------------------------------------------------------------------------
@@ -134,24 +134,22 @@ pk font,PNG,SVG,EPS or MDL MOL file(V2000).\\
 %-----------------------------------------------------------------------------
 \subsubsection{Branch bond}
 \begin{verbatim}
-  2:\  : 2:@,0
-  4:*\ : 4:@,0~wf
-  6:\* : 6:@,0~zf
-  8:\\ : 8:@,0~dm
+   2:\   :  2:@,0
+   4:*\  :  4:@,0~wf
+   6:\*  :  6:@,0~zf
+   8:\\  :  8:@,0~dm
+  10:*\* : 10:@,0~wv
 
-  <30,!8,2:\,!,4:*\,!,6:\*,!,8:\\,!
+  <30,!8,
+  2:\,!,4:*\,!,6:\*,!,8:\\,!,10:*\*,!
 \end{verbatim}
 \MCFstructure
 %-----------------------------------------------------------------------------
 \begin{verbatim}
-  2:\~dr  : 2:@,0~dr
-  4:\`1.5 : 4:@,0`1.5
-  6:\^15  : 6:@,0^15
-
   <-30,!6,
-  2:\~dr,!,
-  4:\`1.5,-90,
-  6:\^15,-60
+  2:\~dr,!,      : 2:@,0~dr,!
+  4:\`1.5,-90,   : 4:@,0`1.5,-90
+  6:\^15,-60     : 6:@,0^15,-60
 \end{verbatim}
 \MCFstructure
 %-----------------------------------------------------------------------------
@@ -448,17 +446,18 @@ pk font,PNG,SVG,EPS or MDL MOL file(V2000).\\
 %-----------------------------------------------------------------------------
 \subsubsection{Insert modified substituent}
 \begin{verbatim}
-  // : double (double middle)
-  */ : wedge forward
-  /* : wedge dotted forward
-  ** : direct
+  //  : double (double middle)
+  */  : wedge forward
+  /*  : wedge dotted forward
+  */* : wave
+  **  : direct
 
-  <30,!,//O,!,/*H,!,*/H,!,/?3,!,**?3,!
+  <30,!,//O,!2,/*H,!2,*/H,!2,*/*H,!2,**?3,!
 \end{verbatim}
 \MCFstructure
 \vspace{-3mm}%
 \begin{verbatim}
-      //      /*      */      **
+      //      /*     */     */*     **
 \end{verbatim}
 %-----------------------------------------------------------------------------
 \begin{verbatim}
@@ -467,8 +466,8 @@ pk font,PNG,SVG,EPS or MDL MOL file(V2000).\\
   ` : change length
   > : change enviroment
 
-  <30,``1,!,/_~zf`2^30,
-   !2,*/!2>lr,!2,*/!2>rl,!)
+  <30,``1,!,
+   /_`2^30,!2,/!2>lr,!2,/!2>rl,!)
 \end{verbatim}
 \MCFstructure
 %-----------------------------------------------------------------------------
@@ -493,7 +492,7 @@ pk font,PNG,SVG,EPS or MDL MOL file(V2000).\\
   ^,`,> : change angle,length,environment
 
   <30,!7`1,
-  3:/*_`2^30,5:*/!2>lr,7:*/!2>rl
+  3:/_`2^30,5:/!2>lr,7:/!2>rl
 \end{verbatim}
 \MCFstructure
 %-----------------------------------------------------------------------------
@@ -566,8 +565,10 @@ pk font,PNG,SVG,EPS or MDL MOL file(V2000).\\
 \begin{verbatim}
   |< : start brock
   >| : end brock
+  |<=n : |<,``n
 
   <30,!2,|<,``1.2,!2,>|,!2
+  <30,!2,|<=1.2,!2,>|,!2
 \end{verbatim}
 \MCFstructure
 %-----------------------------------------------------------------------------
@@ -983,8 +984,9 @@ pk font,PNG,SVG,EPS or MDL MOL file(V2000).\\
     b: ratio molecular hight/font hight
 
   beginfont()
-    MCc(1,1)(<30,?6)
-    MCc(0.5,0.5)(<30,?6)
+    MCc(1   ,1   )(?6)
+    MCc(0.75,0.75)(?6)
+    MCc(0.5 ,0.5 )(?6)
   endfont
 \end{verbatim}
 \MCFstructure
@@ -1262,7 +1264,7 @@ drawarrow & drawdblarrow:
   <-30,O,!,//O,!,!,Ph,
   $1:@,-120~zb,
   |,?7,6:*\^190`1.02,N,/_,3~wb:&,
-  $3:\~wv,!,OH
+  $3:*\*,!,OH
 \end{verbatim}
 \MCFstructure
 %-----------------------------------------------------------------------------
@@ -1293,7 +1295,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,