mcf2graph (26may19)

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

1 files changed, 50 insertions, 50 deletions

diff --git a/Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.tex b/Master/texmf-dist/doc/metapost/mcf2graph/mcf_manual.tex
index d4de4fc7810..a17dfb80d72 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 2019.05.11
+%  Molecular Coding Format manual                by  Akira Yamaji 2019.05.26
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \documentclass[a4paper]{article}
 %%%%\documentclass[a4paper,twoside]{article}
@@ -1040,8 +1040,7 @@ MCat(1, .5)(<30,Ph,4:/COOH,3:/NH2)
     for j=0 step 0.25 until 1:
       MCat(j,i)(Ph,4:N)
       add(
-        drawarrow((A1 shifted (aw,0))
-                   rotated A1dir..A1);
+        drawarrow((A1+A1up**aw)..A1);
         label(decimal(mangle),
               p0+(0.5w,0.5h));
       )
@@ -1066,51 +1065,56 @@ MCat(1, .5)(<30,Ph,4:/COOH,3:/NH2)
  l:       bond length
  An:      atom number
  A[m]:    atom position
- A[m]dir: branch direction of A[m]
+ A[m]ang: branch angle of A[m]
+ A[m]up:    dir A[m]ang
+ A[m]left:  dir A[m]ang+90
+ A[m]right: dir A[m]ang-90
+ A[m]down:  dir A[m]ang+180
  Bn:      bond number
+ B[m]:    bond(path)
  B[m]s:   bond start position
+ B[m]m:   bond middle position
  B[m]e:   bond end position
- B[m]:    bond position(0.5[B[m]s,B[m]e])
- B[m]dir: bond direction
-
+ B[m]ang: bond angle
+ B[m]up:    dir B[m]ang
+ B[m]left:  dir B[m]ang+90
+ B[m]right: dir B[m]ang-90
+ B[m]down:  dir B[m]ang+180
+ plus  : '+' circled
+ minus : '-' circled
+   circlediam = 0.6aw (default)
+   circlepen =  0.2bp (default)
+ lonepair r: ':' rotated r
+   lonepairdiam  = 0.3aw (default)
+   lonepairspace = 0.7aw (default)
+ a ** b : a scaled b
+ a /* b : point b of a
 %----------------------------------------
 beginfont()
-  fsize:=(50mm,20mm);
- %---------------------------------------
-  msize:=(1,0.7);
-  MCat(0,0.5)(<30,?6,3=dl,4:/CH3)
-  add(
-    label.top("+",A7);
-    drawarrow B3{dir(B3dir-90)}..
-              {dir(B7dir+90)}0.4[B7s,B7e];
-    )
- %---------------------------------------
-  MCat(1,0.5)(<30,?6,4://CH3)
-  add(
-    labeloffset:=0bp;
-    label.lrt("+",A3);
-  )
- %---------------------------------------
-  ext(
-    drawdblarrow (0.4w,0.5h)..(0.55w,0.5h);
-  )
- %---------------------------------------
+ fsize:=(60mm,20mm);
+ msize:=(1,0.85);
+ MCat(0,0)(<30,Ph,3=dl,4:/NH2)
+ add(
+  labeloffset:=.7aw;
+  label.top(lone_pair 90,A7);
+  drawarrow (A7+up**1.2aw){A7left}
+     ..{B7right}B7/*0.3;
+  drawarrow B3m{B3right}..
+     A3+(1.5aw,.5aw)..{A3down}A3;
+ )
+ MCat(1,0)(<30,?6,{1,5}=dl,4://NH2)
+ add(
+  labeloffset:=.7aw;
+  label.top(plus,A7);
+  label.urt(minus,A3);
+  label(lonepair A3ang,A3+A3up**.7aw);
+ )
+ ext(drawdblarrow (.4w,.4h)..(.55w,.4h);)
 endfont
 \end{verbatim}
 \MCFgraph
-\begin{verbatim}
-label:
- defaultfont: label font
- defaultfont="draw": draw font
- **default defaultfont="draw"
-
-drawarrow & drawdblarrow:
- sw_arrow=0: emulation mode
- sw_arrow=1: plain.mp mode
- **default sw_arrow=0
-\end{verbatim}
 %-----------------------------------------------------------------------------
-\newpage
+%%%\newpage
 \subsection{Function ext()}
 \begin{verbatim}
 (Extra graphic to font)
@@ -1134,28 +1138,24 @@ ext(label(inf_EN,(.5w,0));) => all font
 %========================================
 beginfont()
  fsize:=(70mm,30mm;);  blength:=0.065;
- %---------------------------------------
  MCat(0.1,0.5)
   (<-210,60`1,60`1,60`1,{1,3}=dl,
    1:/R1,4:/R2^-60)
    add(defaultscale:=0.6;
      label.bot("Diene",p0+(0.5w,0));)
- %---------------------------------------
  MCat(0.4,0.5)
   (<-30,-60`1,1=dl,1:/R3,2:/R4^60)
    add(defaultscale:=0.6;
-     label.bot("Dienophile",p0+(0.5w,0));)
- %---------------------------------------
+    label.bot("Dienophile",p0+(.5w,0));)
  MCat(0.9,0.5)
   (<30,?6,6=dl,2:/R2,3:/R4,4:/R3,5:/R1)
- %---------------------------------------
  ext(
-   drawarrow (0.52w,0.5h)..(0.6w,0.5h);
-   defaultscale:=0.7;
-   label("+",(0.25w,0.5h));
-   ratio_thickness_char:=0.125;
-   label.bot("Diels-Alder Reaction",
-            (0.5w,h));
+  drawarrow (.52w,.5h)..(.6w,.5h);
+  defaultscale:=0.7;
+  label("+",(0.25w,0.5h));
+  ratio_thickness_char:=0.125;
+  label.bot("Diels-Alder Reaction",
+            (.5w,h));
  )
  %---------------------------------------
 endfont