Update to reflect square shape, model=mds, and a list of rankseps for twopi

diff --git a/doc/info/attrs.html b/doc/info/attrs.html
index 8e233eb71b5431b5249da15753e281056fd082df..49a46c34a0c2082f248d575dc8a452cdee502781 100644 (file)
--- a/doc/info/attrs.html
+++ b/doc/info/attrs.html
@@ -358,7 +358,8 @@ This field indicates which graph component uses the attribute.
 </TD><TD>G</TD><TD><A HREF=#k:rankdir>rankdir</A>
 </TD><TD ALIGN="CENTER">TB</TD><TD></TD><TD>dot only</TD> </TR>
  <TR><TD><A NAME=a:ranksep HREF=#d:ranksep>ranksep</A>
-</TD><TD>G</TD><TD>double</TD><TD ALIGN="CENTER">0.5(dot)<BR>1.0(twopi)</TD><TD>0.02</TD><TD>twopi, dot only</TD> </TR>
+</TD><TD>G</TD><TD>double<BR><A HREF=#k:doubleList>doubleList</A>
+</TD><TD ALIGN="CENTER">0.5(dot)<BR>1.0(twopi)</TD><TD>0.02</TD><TD>twopi, dot only</TD> </TR>
  <TR><TD><A NAME=a:ratio HREF=#d:ratio>ratio</A>
 </TD><TD>G</TD><TD>double<BR>string</TD><TD ALIGN="CENTER"></TD><TD></TD><TD></TD> </TR>
  <TR><TD><A NAME=a:rects HREF=#d:rects>rects</A>
@@ -1105,6 +1106,12 @@ This field indicates which graph component uses the attribute.
   edge length to be the number of nodes that are neighbors of exactly one
   of the end points, and then calculates the shortest paths. This helps
   to separate nodes with high degree.
+  <P>
+  For more control of distances, one can use <TT>model=mds</TT>. In this
+  case, the <A HREF=#d:len>len</A> of an edge is used as the ideal distance
+  between its vertices. A shortest path calculation is only used for
+  pairs of nodes not connected by an edge. Thus, by supplying a complete
+  graph, the input can specify all of the relevant distances.
 
 <DT><A NAME=d:mosek HREF=#a:mosek><STRONG>mosek</STRONG></A>
 <DD>  If Graphviz is built with MOSEK defined, mode=ipsep and mosek=true,
@@ -1393,7 +1400,12 @@ This field indicates which graph component uses the attribute.
   contains "equally", the centers of all ranks are spaced equally apart.
   Note that both
   settings are possible, e.g., ranksep = "1.2 equally".
-  In twopi, specifies radial separation of concentric circles.
+  <P>
+  In twopi, this attribute specifies the radial separation of concentric circles.
+  For twopi, <TT>ranksep</TT> can also be a list of doubles. The first double specifies
+  the radius of the inner circle; the second double specifies the increase in
+  radius from the first circle to the second; etc. If there are more circles than
+  numbers, the last number is used as the increment for the remainder.
 
 <DT><A NAME=d:ratio HREF=#a:ratio><STRONG>ratio</STRONG></A>
 <DD>  Sets the aspect ratio (drawing height/drawing width) for the drawing.
@@ -1825,6 +1837,10 @@ the given types.
   the righthand one, is treated as the head for the purpose of
   interpreting "forward" and "back".
 
+<DT><A NAME=k:doubleList><STRONG>doubleList</STRONG></A>
+<DD>A colon-separated list of doubles: <I>d</I>(:<I>d</I>)*
+   where each <I>d</I> is a double.
+
 <DT><A NAME=k:escString><STRONG>escString</STRONG></A>
 <DD>string allowing escape sequences which are replaced according
   to the context.

diff --git a/doc/info/sdlshapes.png b/doc/info/sdlshapes.png
index dc0bba64d7fd038c4561a6fcbe9d18e84d51c327..adac084b77f5ba87923190fd3251a16f724db67d 100644 (file)
Binary files a/doc/info/sdlshapes.png and b/doc/info/sdlshapes.png differ

diff --git a/doc/info/shapes.html b/doc/info/shapes.html
index 6e91e97b6a00c3fb38a48f6fab30bd6777040b1f..b1c7be479db10a8b34dd0ee3f4d013ffc2cb2d70 100644 (file)
--- a/doc/info/shapes.html
+++ b/doc/info/shapes.html
@@ -99,30 +99,32 @@ The possible polygon-based shapes are displayed below.
     <TD><IMG SRC=Mcircle.gif>
     <TD><IMG SRC=rect.gif>
     <TD><IMG SRC=rectangle.gif>
-    <TD><IMG SRC=none.gif>
+    <TD><IMG SRC=square.gif>
   </TR>
   <TR ALIGN=CENTER>
     <TD><A NAME=d:Mcircle>Mcircle</A>
     <TD><A NAME=d:rect>rect</A>
     <TD><A NAME=d:rectangle>rectangle</A>
-    <TD><A NAME=d:none>none</A>
+    <TD><A NAME=d:square>square</A>
   </TR>
   <TR ALIGN=CENTER>
+    <TD><IMG SRC=none.gif>
     <TD><IMG SRC=note.gif>
     <TD><IMG SRC=tab.gif>
     <TD><IMG SRC=folder.gif>
-    <TD><IMG SRC=box3d.gif>
   </TR>
   <TR ALIGN=CENTER>
+    <TD><A NAME=d:none>none</A>
     <TD><A NAME=d:note>note</A>
     <TD><A NAME=d:tab>tab</A>
     <TD><A NAME=d:folder>folder</A>
-    <TD><A NAME=d:box3d>box3d</A>
   </TR>
   <TR ALIGN=CENTER>
+    <TD><IMG SRC=box3d.gif>
     <TD><IMG SRC=component.gif>
   </TR>
   <TR ALIGN=CENTER>
+    <TD><A NAME=d:box3d>box3d</A>
     <TD><A NAME=d:component>component</A>
   </TR>
 </TABLE>

diff --git a/doc/info/square.gif b/doc/info/square.gif
new file mode 100644 (file)
index 0000000..92a9d21
Binary files /dev/null and b/doc/info/square.gif differ

diff --git a/doc/infosrc/attrs b/doc/infosrc/attrs
index 9eb4f3d7946e584b7764b98f1fbee33fa20e105d..2f84fcdf73067f0fcd20aa34c600144b2478f49b 100644 (file)
--- a/doc/infosrc/attrs
+++ b/doc/infosrc/attrs
@@ -604,6 +604,12 @@ model to compute the distances. This tends to emphasize clusters. If
 edge length to be the number of nodes that are neighbors of exactly one
 of the end points, and then calculates the shortest paths. This helps
 to separate nodes with high degree.
+<P>
+For more control of distances, one can use <TT>model=mds</TT>. In this
+case, the <A HREF=#d:len>len</A> of an edge is used as the ideal distance
+between its vertices. A shortest path calculation is only used for
+pairs of nodes not connected by an edge. Thus, by supplying a complete
+graph, the input can specify all of the relevant distances.
 :mosek:G:bool:false;    neato
 If Graphviz is built with MOSEK defined, mode=ipsep and mosek=true,
 the Mosek software (www.mosek.com) is use to solve the ipsep constraints.
@@ -858,14 +864,19 @@ from left to right. By default, graphs are laid out from top to bottom.
 <P>
 This attribute also has a side-effect in determining how record nodes
 are interpreted. See <A HREF="shapes.html#record">record shapes</A>.
-:ranksep:G:double:0.5(dot)/1.0(twopi):0.02;   dot,twopi
+:ranksep:G:double/doubleList:0.5(dot)/1.0(twopi):0.02;   dot,twopi
 In dot, this gives the desired rank separation, in inches. This is
 the minimum vertical distance between the bottom of the nodes in one
 rank and the tops of nodes in the next. If the value
 contains "equally", the centers of all ranks are spaced equally apart.
 Note that both
 settings are possible, e.g., ranksep = "1.2 equally".
-In twopi, specifies radial separation of concentric circles.
+<P>
+In twopi, this attribute specifies the radial separation of concentric circles.
+For twopi, <TT>ranksep</TT> can also be a list of doubles. The first double specifies
+the radius of the inner circle; the second double specifies the increase in
+radius from the first circle to the second; etc. If there are more circles than
+numbers, the last number is used as the increment for the remainder.
 :ratio:G:double/string;
 Sets the aspect ratio (drawing height/drawing width) for the drawing.
 Note that this is adjusted before

diff --git a/doc/infosrc/square.gif b/doc/infosrc/square.gif
new file mode 100644 (file)
index 0000000..92a9d21
Binary files /dev/null and b/doc/infosrc/square.gif differ

diff --git a/doc/infosrc/types b/doc/infosrc/types
index 53dd211e8298644c98bd299b801bfbdc74d90c61..99cdc7a833d7f9bf585ab65ea0e450ce042188a7 100644 (file)
--- a/doc/infosrc/types
+++ b/doc/infosrc/types
@@ -112,6 +112,9 @@ if dirType is "back" or "both";
 For undirected edges <CODE>T -- H;</CODE>, one of the nodes, usually
 the righthand one, is treated as the head for the purpose of
 interpreting "forward" and "back".
+:doubleList
+A colon-separated list of doubles: <I>d</I>(:<I>d</I>)*
+ where each <I>d</I> is a double.
 :escString
 string allowing escape sequences which are replaced according
 to the context.