VCG no longer supports long_straight_phase.

* src/vcg.c, src/vcg.h: Remove the handling of long_straight_phase.
* src/print_graph.c (print_graph): Adjust.

diff --git a/ChangeLog b/ChangeLog
index 616fe3fee46dd2f346b29047d913385aa154817e..26b43003c97d6861428430ea7759533ecbc21f4a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2003-10-01  Akim Demaille  <akim@epita.fr>
+
+       VCG no longer supports long_straight_phase.
+
+       * src/vcg.c, src/vcg.h: Remove the handling of long_straight_phase.
+       * src/print_graph.c (print_graph): Adjust.
+
 2003-09-30  Frank Heckenbach  <frank@g-n-u.de>
        and Paul Eggert  <eggert@twinsun.com>
 
@@ -11,7 +18,7 @@
        (packgram): Handle it.
        * tests/conflicts.at (%default-prec without %prec,
        %default-prec with %prec, %default-prec 1): New tests.
-       
+
 2003-09-30  Paul Eggert  <eggert@twinsun.com>
 
        * tests/testsuite.at: Include local.at, not input.at, fixing

diff --git a/src/print_graph.c b/src/print_graph.c
index f70c1435eea8cd4d5a8cfcee5132d57766da0141..80b0d3b1c6e250528e178955b091aaad857e031b 100644 (file)
--- a/src/print_graph.c
+++ b/src/print_graph.c
@@ -212,7 +212,6 @@ print_graph (void)
 
   static_graph.port_sharing = no;
   static_graph.finetuning = yes;
-  static_graph.long_straight_phase = yes;
   static_graph.priority_phase = yes;
   static_graph.splines = yes;
 

diff --git a/src/vcg.c b/src/vcg.c
index c68233de15ca63eec9cda1ad88ef9e7623a0bf01..d6ae21f8b8d0a9d4cc33d7728548594b2cc2b270 100644 (file)
--- a/src/vcg.c
+++ b/src/vcg.c
@@ -96,7 +96,6 @@ new_graph (graph *g)
   g->dirty_edge_labels = G_DIRTY_EDGE_LABELS;
   g->finetuning = G_FINETUNING;
   g->ignore_singles = G_IGNORE_SINGLES;
-  g->long_straight_phase = G_LONG_STRAIGHT_PHASE;
   g->priority_phase = G_PRIORITY_PHASE;
   g->manhattan_edges = G_MANHATTAN_EDGES;
   g->smanhattan_edges = G_SMANHATTAN_EDGES;
@@ -797,9 +796,6 @@ output_graph (graph *g, FILE *fout)
   if (g->ignore_singles != G_IGNORE_SINGLES)
     fprintf (fout, "\tignore_singles:\t%s\n",
             get_decision_str (g->ignore_singles));
-  if (g->long_straight_phase != G_LONG_STRAIGHT_PHASE)
-    fprintf (fout, "\tlong_straight_phase:\t%s\n",
-            get_decision_str (g->long_straight_phase));
   if (g->priority_phase != G_PRIORITY_PHASE)
     fprintf (fout, "\tpriority_phase:\t%s\n",
             get_decision_str (g->priority_phase));

diff --git a/src/vcg.h b/src/vcg.h
index e7b0e936b54ed25dc5180d901513f5271feacb47..44d700cb6b5b1fb6719c9b7592454b4d2b57e365 100644 (file)
--- a/src/vcg.h
+++ b/src/vcg.h
@@ -578,20 +578,20 @@ struct graph
      Default is box, other: rhomb, ellipse, triangle. */
   enum shape shape;
 
-  /* Vertical order is the level position (rank) of the summary node of an 
-     inner subgraph, if this subgraph is folded. We can also specify 
-     level: int. The level is only recognized, if an automatical layout is 
+  /* Vertical order is the level position (rank) of the summary node of an
+     inner subgraph, if this subgraph is folded. We can also specify
+     level: int. The level is only recognized, if an automatical layout is
      calculated.  */
   int vertical_order;
 
-  /* Horizontal order is the horizontal position of the summary node within 
-     a level. The nodes which are specified with horizontal positions are 
-     ordered according to these positions within the levels. The nodes which 
-     do not have this attribute are inserted into this ordering by the 
-     crossing reduction mechanism. Note that connected components are 
-     handled separately, thus it is not possible to intermix such components 
-     by specifying a horizontal order. If the algorithm for downward laid 
-     out trees is used, the horizontal order influences only the order of 
+  /* Horizontal order is the horizontal position of the summary node within
+     a level. The nodes which are specified with horizontal positions are
+     ordered according to these positions within the levels. The nodes which
+     do not have this attribute are inserted into this ordering by the
+     crossing reduction mechanism. Note that connected components are
+     handled separately, thus it is not possible to intermix such components
+     by specifying a horizontal order. If the algorithm for downward laid
+     out trees is used, the horizontal order influences only the order of
      the child nodes at a node, but not the order of the whole level.  */
   int horizontal_order;
 
@@ -664,16 +664,16 @@ struct graph
      By default, no class names. */
   struct classname *classname;
 
-  /* Infoname allows to introduce names for the additional text labels. 
-     The names are used in the menus.  
-     Infoname is given by an integer and a string.  
+  /* Infoname allows to introduce names for the additional text labels.
+     The names are used in the menus.
+     Infoname is given by an integer and a string.
      The default value is NULL.  */
   struct infoname *infoname;
-  
-  /* Colorentry allows to fill the color map. A color is a triplet of integer 
-     values for the red/green/blue-part. Each integer is between 0 (off) and 
-     255 (on), e.g., 0 0 0 is black and 255 255 255 is white. For instance 
-     colorentry 75 : 70 130 180 sets the map entry 75 to steel blue. This 
+
+  /* Colorentry allows to fill the color map. A color is a triplet of integer
+     values for the red/green/blue-part. Each integer is between 0 (off) and
+     255 (on), e.g., 0 0 0 is black and 255 255 255 is white. For instance
+     colorentry 75 : 70 130 180 sets the map entry 75 to steel blue. This
      color can be used by specifying just the number 75.
      Default id NULL.  */
   struct colorentry *colorentry;
@@ -758,15 +758,6 @@ struct graph
      Default is no. */
   enum decision ignore_singles;
 
-  /* Long straight phase yes initiates an additional phase that tries to avoid
-     bendings in long edges.
-     Long edges are laid out by long straight vertical lines with
-     gradient 90 degree. Thus, this phase is not very appropriate for
-     normal layout, but it is recommended, if an orthogonal layout is
-     selected (see manhattan.edges).
-     Default is no. */
-  enum decision long_straight_phase;
-
   /* priority phase yes replaces the normal pendulum method by a
      specialized method: It forces straight long edges with 90 degree,
      just as the straight phase. In fact, the straight phase is a fine
@@ -1000,7 +991,7 @@ void new_edge (edge *e);
 void add_node (graph *g, node *n);
 void add_edge (graph *g, edge *e);
 
-void add_colorentry (graph *g, int color_idx, int red_cp, 
+void add_colorentry (graph *g, int color_idx, int red_cp,
                     int green_cp, int blue_cp);
 void add_classname (graph *g, int val, const char *name);
 void add_infoname (graph *g, int val, const char *name);