Update arrows page with new calculations; make arrows.html depend on

gif files it contains

diff --git a/doc/info/arrows.html b/doc/info/arrows.html
index 80028d0c595ae0080691177187307580299d1c72..361d49afd5ff58b4b4b3af4cd91ab4fb4114dcff 100644 (file)
--- a/doc/info/arrows.html
+++ b/doc/info/arrows.html
@@ -149,6 +149,7 @@ The following table indicates which modifiers are allowed with which shapes.
  <TH>Modifier</TH>
  <TH>box
  <TH>crow
+ <TH>curve
  <TH>diamond
  <TH>dot
  <TH>inv
@@ -157,16 +158,18 @@ The following table indicates which modifiers are allowed with which shapes.
  <TH>tee
  <TH>vee
 </TR>
-<TR ALIGN=CENTER><TD>'l'/'r'<TD>X<TD>X<TD>X<TD>&nbsp;<TD>X<TD>&nbsp;<TD>X<TD>X<TD>X</TR>
-<TR ALIGN=CENTER><TD>'o'    <TD>X<TD>&nbsp;<TD>X<TD>X<TD>X<TD>&nbsp;<TD>X<TD>&nbsp;<TD>&nbsp;</TR>
+<TR ALIGN=CENTER><TD>'l'/'r'<TD>X<TD>X<TD>X<TD>X<TD>&nbsp;<TD>X<TD>&nbsp;<TD>X<TD>X<TD>X</TR>
+<TR ALIGN=CENTER><TD>'o'    <TD>X<TD>&nbsp;<TD>&nbsp;<TD>X<TD>X<TD>X<TD>&nbsp;<TD>X<TD>&nbsp;<TD>&nbsp;</TR>
 </TABLE>
 </CENTER>
 <P>
-This yields 36 different arrow shapes. The optional second, third, fourth shapes
-can independently be any of the 36, but since <TT>nonenone</TT> 
-is redundant, there are 35**4 + 35**3 + 35**2 + 35 + 1 = 1,544,761 different combinations.
+This yields 39 different arrow shapes. The optional second, third, fourth shapes
+can independently be any of the 39, except the last cannot be <TT>none</TT> as
+this would create a redundant shape.
+Thus, there are 38 &middot; 39<sup>3</sup> + 38 &middot; 39<sup>2</sup> + 38 &middot; 39 + 39 = 2,313,441 different combinations.
+
 <P>
-The following display contains the 36 combinations possible with a single
+The following display contains the 39 combinations possible with a single
 arrow shape. The node attached to the arrow is not drawn but would appear
 on the right side of the edge.
 <P>

diff --git a/doc/infosrc/Makefile.old b/doc/infosrc/Makefile.old
index d2b1b8dbc757610ca1de4daaa2069fe94defc824..8fda4f31e91fecd2c0aea183a839d6df2642c704 100644 (file)
--- a/doc/infosrc/Makefile.old
+++ b/doc/infosrc/Makefile.old
@@ -166,7 +166,7 @@ lang.html : grammar lang.1 lang.2 mklang
        cat lang.2 >> lang.html
        rm gramtmp
 
-arrows.html : arrow_grammar arrows.1 arrows.2 mkarrowtbl.sh mklang
+arrows.html : arrow_grammar arrows.1 arrows.2 mkarrowtbl.sh mklang $(AGIF) $(A2GIF)
        ./mklang arrow_grammar gramtmp
        cat arrows.1 > arrows.html
        cat gramtmp >> arrows.html

diff --git a/doc/infosrc/arrows.2 b/doc/infosrc/arrows.2
index a33317f8d4966d36aa0424946bcdf9313439188a..cd17351b51c34897ede1a88d92f8f15a93d5da08 100644 (file)
--- a/doc/infosrc/arrows.2
+++ b/doc/infosrc/arrows.2
@@ -55,6 +55,7 @@ The following table indicates which modifiers are allowed with which shapes.
  <TH>Modifier</TH>
  <TH>box
  <TH>crow
+ <TH>curve
  <TH>diamond
  <TH>dot
  <TH>inv
@@ -63,16 +64,18 @@ The following table indicates which modifiers are allowed with which shapes.
  <TH>tee
  <TH>vee
 </TR>
-<TR ALIGN=CENTER><TD>'l'/'r'<TD>X<TD>X<TD>X<TD>&nbsp;<TD>X<TD>&nbsp;<TD>X<TD>X<TD>X</TR>
-<TR ALIGN=CENTER><TD>'o'    <TD>X<TD>&nbsp;<TD>X<TD>X<TD>X<TD>&nbsp;<TD>X<TD>&nbsp;<TD>&nbsp;</TR>
+<TR ALIGN=CENTER><TD>'l'/'r'<TD>X<TD>X<TD>X<TD>X<TD>&nbsp;<TD>X<TD>&nbsp;<TD>X<TD>X<TD>X</TR>
+<TR ALIGN=CENTER><TD>'o'    <TD>X<TD>&nbsp;<TD>&nbsp;<TD>X<TD>X<TD>X<TD>&nbsp;<TD>X<TD>&nbsp;<TD>&nbsp;</TR>
 </TABLE>
 </CENTER>
 <P>
-This yields 36 different arrow shapes. The optional second, third, fourth shapes
-can independently be any of the 36, but since <TT>nonenone</TT> 
-is redundant, there are 35**4 + 35**3 + 35**2 + 35 + 1 = 1,544,761 different combinations.
+This yields 39 different arrow shapes. The optional second, third, fourth shapes
+can independently be any of the 39, except the last cannot be <TT>none</TT> as
+this would create a redundant shape.
+Thus, there are 38 &middot; 39<sup>3</sup> + 38 &middot; 39<sup>2</sup> + 38 &middot; 39 + 39 = 2,313,441 different combinations.
+
 <P>
-The following display contains the 36 combinations possible with a single
+The following display contains the 39 combinations possible with a single
 arrow shape. The node attached to the arrow is not drawn but would appear
 on the right side of the edge.
 <P>