Add new attributes for sfdp;

fix some typos

diff --git a/doc/infosrc/Makefile.old b/doc/infosrc/Makefile.old
index 3f3ac3e77e8967c5386dcc555a495629676eae1c..dfdf14b896a65d5115eaeb0ca19e60e6b5399998 100644 (file)
--- a/doc/infosrc/Makefile.old
+++ b/doc/infosrc/Makefile.old
@@ -17,6 +17,9 @@
 # The files listed after each give the main data files used to
 # generate the page.
 
+INSTALL = cp
+INSTALL_DIR = ../info
+
 XGIF = forward.gif back.gif both.gif nohead.gif
 
 MGIF = constraint.gif record.gif html1.gif html2.gif fill.gif round.gif \
@@ -52,7 +55,7 @@ GIF = $(SGIF) $(AGIF) $(MGIF) $(A2GIF)
 DOTS = html2.dot html3.dot html4.dot
 HTML = attrs.html colors.html command.html lang.html output.html shapes.html \
        arrows.html
-INSTALL_FILES = $(HTML) $(DOTS) $(SGIF) $(AGIF) $(A2GIF) $(MGIF) $(XGIF) $(MPNG)
+INSTALL_FILES = $(HTML) $(DOTS) $(SGIF) $(AGIF) $(A2GIF) $(MGIF) $(XGIF) $(MJPG)
 
 .SUFFIXES: .gif .dot
 
@@ -62,7 +65,7 @@ INSTALL_FILES = $(HTML) $(DOTS) $(SGIF) $(AGIF) $(A2GIF) $(MGIF) $(XGIF) $(MPNG)
 all : $(HTML) $(GIF)
 
 install : all
-       $(INSTALL) $(INSTALL_FILES)
+       $(INSTALL) $(INSTALL_FILES) $(INSTALL_DIR)
 
 record2.gif : record.dot
        dot -Tgif -Grankdir=LR -o $@ $<
@@ -102,7 +105,7 @@ shapes : shapelist mkshapes.sh
        mkshapes.sh
        touch shapes
  
-shapes.html : shapes shapes.1 mkshhtml.sh shapes.2 html.html shapes.3 record.gif sdlshapes.png record2.gif
+shapes.html : shapes shapes.1 mkshhtml.sh shapes.2 html.html shapes.3 record.gif record2.gif sdlshapes.jpg
        cat shapes.1 > shapes.html
        mkshhtml.sh >> shapes.html
        cat shapes.2 >> shapes.html
@@ -143,7 +146,7 @@ clean :
 
 distclean : clean
        rm -f attrs.html colors.html output.html shapes.html lang.html arrows.html
-       rm -f $(A2GIF) $(AGIF) $(SGIF) $(MPNG) $(MGIF) shapes
+       rm -f $(A2GIF) $(AGIF) $(SGIF) $(MJPG) $(MGIF) shapes
        (for s in $$(cat shapelist); do rm -f $$s.gif; done)
 
 EXTRA_DIST = $(XGIF) mklang.y mkarrows.sh mkattrs.sh mkshapes.sh \

diff --git a/doc/infosrc/attrs b/doc/infosrc/attrs
index b290b9eabd60043eeef9986f8ab32c0815cce7b5..1555b1cb294d5a72bc68966b16182c7234a9c501 100644 (file)
--- a/doc/infosrc/attrs
+++ b/doc/infosrc/attrs
@@ -26,7 +26,7 @@
 #  the notes field, if present, consists of a comma-separated list of:
 #    
 #   bitmap cmap map ps svg - attribute limited to specified output formats
-#   dot neato twopi circo fdp - attribute limited to specified layouts
+#   dot neato twopi circo fdp sfdp - attribute limited to specified layouts
 #   notdot - attribute use in all layouts but dot
 #   write - attribute is write-only
 #   obsolete - attribute is obsolete
@@ -184,10 +184,10 @@ Only applicable if <A HREF=#d:pack>pack</A>=false.
 :decorate:E:bool:false;
 If true, attach edge label to edge by a 2-segment
 polyline, underlining the label, then going to the closest point of spline.
-:dim:G:int:2:2; neato,fdp
+:dim:G:int:2:2; neato,fdp,sfdp
 Set the number of dimensions used for the layout. The maximum value
 allowed is 10.
-:dimen:G:int:2:2; neato,fdp
+:dimen:G:int:2:2; neato,fdp,sfdp
 Set the number of dimensions used for rendering. 
 The maximum value allowed is 10.
 If both <TT>dimen</TT> and <TT>dim</TT> are set, the latter specifies
@@ -392,7 +392,7 @@ corresponding dimension of the node, that dimension of the
 image is scaled down to fit the node. As with the case of
 expansion, if  <TT>imagescale=true</TT>, width and height are
 scaled uniformly.
-:K:GC:double:0.3:0;  fdp
+:K:GC:double:0.3:0;  fdp,sfdp
 Spring constant used in virtual physical model. It roughly corresponds
 to an ideal edge length (in inches), in that increasing K tends to
 increase the distance between nodes.
@@ -487,6 +487,8 @@ Specifies the separator characters used to split the
 <A HREF=#d:layers>layers </A>attribute into a list of layer names.
 :len:E:double:1.0(neato)/0.3(fdp); neato,fdp
 Preferred edge length, in inches.
+:levels:G:int:MAXINT:0.0;  sfdp
+Number of levels allowed in the multilevel scheme.
 :levelsgap:G:double:0.0;  neato
 Specifies strictness of level constraints in neato
 when <TT><A HREF=#d:mode>mode</A>="ipsep" or "hier"</TT>.
@@ -739,8 +741,8 @@ Position of node, or spline control points.
 For nodes, the position indicates the center of the node.
 On output, the coordinates are in <A HREF=#points>points</A>.
 <P>
-In neato and fdp, pos can be used to set the initial position of a node.
-By default, the coordinates are assumed to be in inches. However, the
+In neato, fdp and sfdp, pos can be used to set the initial position of a node.
+By default, the coordinates are assumed to be in points. However, the
 <A HREF=command.html#d:s>-s</A> command line flag can be used to specify
 different units.
 <P>
@@ -749,6 +751,13 @@ neato, it is assumed the positions have been set by one of the layout
 programs, and are therefore in points. Thus, <TT>neato -n</TT> can accept
 input correctly without requiring a <TT>-s</TT> flag and, in fact,
 ignores any such flag.
+:quadtree:G:quadType/bool:"normal";  sfdp
+Quadtree scheme to use.
+<P>
+A TRUE bool value corresponds to "normal";
+a FALSE bool value corresponds to "none".
+As a slight exception to the normal interpretation of bool,
+a value of "2" corresponds to "fast".
 :quantum:G:double:0.0:0.0;
 If <B>quantum</B> > 0.0, node label dimensions
 will be rounded to integral multiples of the quantum.
@@ -821,6 +830,10 @@ If true, force polygon to be regular.
 :remincross:G:bool:false;  dot
 If true and there are multiple clusters, run cross
 minimization a second time.
+:repulsiveforce:G:double:1.0:0.0;  sfdp
+The power of the repulsive force used in an extended Fruchterman-Reingold 
+force directed model. Values larger than 1 tend to reduce 
+the warping effect at the expense of less clustering.
 :resolution:G:double:96.0/0.0;  bitmap,svg
 This is a synonym for the <A HREF=#d:dpi>dpi</A> attribute.
 :root:GN:string/bool:""(graphs)/false(nodes);  twopi,circo
@@ -907,6 +920,9 @@ Note that there is some interaction between the <B>size</B> and
 :skew:N:double:0.0:-100.0;
 Skew factor for <A HREF=#d:shape><B>shape</B></A>=polygon. Positive values
 skew top of polygon to right; negative to left.
+:smoothing:G:smoothType:"none";  sfdp
+Specifies a post-processing step used to smooth out an uneven distribution 
+of nodes.
 :splines:G:bool/string;
 Controls how, and if, edges are represented. If true, edges are drawn as
 splines routed around nodes; if false, edges are drawn as line segments.
@@ -1009,11 +1025,9 @@ Voronoi technique. dim' = (1+2*margin)*dim.
 #  Obsolete, replaced by sep
 #w:E:double:1.0; neato
 #  Redundant definition of weight in neato, cf. bug 9.
-:weight:E:double:1.0:0(dot)/1(neato);
+:weight:E:double:1.0:0(dot)/1(neato,fdp,sfdp);
 Weight of edge. In dot, the heavier the weight, the shorter,
-straighter and more vertical the edge is. In neato, the heavier the
-weight, the more neato will try to place the end points so that the
-length of the edge is <A HREF=#d:len>len</A>.
+straighter and more vertical the edge is.
 :width:N:double:0.75:0.01;
 Width of node, in inches. This is taken as the initial, minimum width
 of the node. If <A HREF=#d:fixedsize><B>fixedsize</B></A> is true, this

diff --git a/doc/infosrc/dflts b/doc/infosrc/dflts
deleted file mode 100644 (file)
index 00b46c3..0000000
--- a/doc/infosrc/dflts
+++ /dev/null
@@ -1,140 +0,0 @@
-0.99
-<none>;   map,ps,svg
-normal;
-1.0
-normal;
-
-<none>;
-false;
-"UTF-8";
-local;  dot
-black;
-"";
-"";
-false;  dot
-false;  dot
-true;  dot
-1+(avg. len)*sqrt(|V|)
-false;
-2
-forward(directed)/none(undirected);
-false;   neato
-0.0
-96.0/0.0;  bitmap,svg
-"";  map,svg
-"";  map,svg
-<none>;   map,svg
-"";    cmap,svg
-.0001 * # nodes(mode == KK)/.0001(mode == major);  neato
-0.8*sep; notdot
-lightgrey(nodes)/black(clusters);
-false;
-black;
-"";    svg
-"Times-Roman";
-system-dependent;
-14.0
-"";  dot
-"";   map,svg
-true;
-"";  map,svg
-"";
-center;
-<none>;   map,svg
-"";    cmap,svg
-0.5
-"";  map,ps,svg
-"";
-false
-0.3
-"\\\\N" (nodes)/"" (otherwise);
-"";  map,svg
--25.0
-1.0
-false;
-black;
-"Times-Roman";
-14.0
-"";  map,svg
-"c";
-"t"(clusters)/"b"(root graphs);
-<none>;   map,svg
-"";    cmap,svg
-false;
-"";
-"";
-" 
-1.0(neato)/0.3(fdp); neato,fdp
-0.0;  neato
-""; dot
-
-""; dot
-<device-dependent>;
-100 \\* # nodes(mode == KK)/200(mode == major)/600(fdp);  neato,fdp
-1.0;  dot
-1.0
-1
-"major";  neato
-"shortpath";  neato
-false;    neato
-0.25
-false;
-false; notdot
-
-""; dot
-0.0
-"";
-breadthfirst;
-true;  notdot
-false; notdot
-node; notdot
-1/18;
-
-BL;
-black;
-1.0
-shape default(nodes)/1(clusters)
-false;   neato,fdp
-
-0.0
-; dot
-TB; dot
-0.5(dot)/1.0(twopi)
-
-
-false;
-false;  dot
-96.0/0.0;  bitmap,svg
-""(graphs)/false(nodes);  twopi,circo
-0;
-"";  dot
-"";  dot
-8(output)/20(overlap and image maps);
-30; dot
-0.1; notdot
-ellipse;
-"";
-0
-4
-
-0.0
-
-""; neato,fdp
-;
-"";  svg
-""; map,svg
-true;
-"";  map,svg
-"";
-center;
-<none>;   map,svg
-"";    cmap,svg
-<none>;   map,svg
-"";    cmap,svg
-;  bitmap
-
-""; ps,map,cmap,bitmap
-0.05
-1.0
-0.75
-0.0

diff --git a/doc/infosrc/outputs b/doc/infosrc/outputs
index bb45cefbeefb3177dd92fa471e35a1dadea63efe..853c027027f7dc43137066889a49c97754fa60b6 100644 (file)
--- a/doc/infosrc/outputs
+++ b/doc/infosrc/outputs
@@ -5,6 +5,11 @@
 # The long description is just text.
 # The items are alphabetized when the page is created.
 #
+:eps:Encapsulated PostScript
+Produces Encapsulated PostScript output.
+At present, this is only guaranteed to be correct for a single
+input graph since the Bounding Box information has to appear
+at the beginning of the output, and this will be based on the first graph.
 :ps:PostScript
 Produces PostScript output.
 <P>

diff --git a/doc/infosrc/sdlshapes.png b/doc/infosrc/sdlshapes.png
deleted file mode 100644 (file)
index 6240a82..0000000
Binary files a/doc/infosrc/sdlshapes.png and /dev/null differ

diff --git a/doc/infosrc/types b/doc/infosrc/types
index 8749ca51cd121c6af96fb3e701f48a5f9400f579..fc5513cadb6d83b332d11502a9b67f84929ab598 100644 (file)
--- a/doc/infosrc/types
+++ b/doc/infosrc/types
@@ -220,6 +220,11 @@ the port. Thus, if node <TT>A</TT> has a port <TT>w</TT>, then
 <TT>headport=w</TT> will refer to the port and not the compass point.
 At present, in this case, there is no way to specify that the compass
 point should be used.
+:quadType
+"normal", "fast", "none". 
+<P>
+Using "fast" gives about a 2-4 times overall speedup compared with "normal", 
+though layout quality can suffer a little. 
 :rankdir
 "TB", "LR", "BT", "RL", corresponding to directed graphs drawn
 from top to bottom, from left to right, from bottom to top, and from
@@ -243,6 +248,9 @@ If a spline has points p<SUB>1</SUB> p<SUB>2</SUB> p<SUB>3</SUB> ... p<SUB>n</SU
 "%d,%d,%d,%d"  The rect llx,lly,urx,ury gives the coordinates, in
  points, of the lower-left corner (llx,lly) and the upper-right corner
  (urx,ury).
+:smoothType
+Values are "none", "avg_dist", "graph_dist", "power_dist", "rng", 
+"spring" and "triangle".
 :style
 styleItem ( ',' styleItem )*<BR>
 <TABLE>