Add overlap_scaling attribute for sfdp;

rename overlap=fdp to overlap=prism

diff --git a/lib/neatogen/adjust.c b/lib/neatogen/adjust.c
index df3b078d938d16631db2668db4a5381d564dfd0c..7730779c972174df5afc16f6e966bd976b0adfee 100644 (file)
--- a/lib/neatogen/adjust.c
+++ b/lib/neatogen/adjust.c
@@ -780,7 +780,7 @@ static adjust_data adjustMode[] = {
     {AM_COMPRESS, "compress", "compress"},
     {AM_VPSC, "vpsc", "vpsc"},
     {AM_IPSEP, "ipsep", "ipsep"},
-    {AM_FDP, "fdp", "fdp"},
+    {AM_PRISM, "prism", "prism"},
     {AM_NONE, 0, 0}
 };
 
@@ -863,7 +863,7 @@ removeOverlapAs(graph_t * G, char* flag)
            ret = scAdjust(G, -1);
            break;
 #if ((HAVE_GTS || HAVE_TRIANGLE) && SFDP)
-       case AM_FDP:
+       case AM_PRISM:
            ret = fdpAdjust(G);
            break;
 #endif

diff --git a/lib/neatogen/adjust.h b/lib/neatogen/adjust.h
index f356d5f8921193ee1ab0bd7000bcae2e97882b44..6559fb17c1775138f1d29f5f5a8ab2f50fb6659c 100644 (file)
--- a/lib/neatogen/adjust.h
+++ b/lib/neatogen/adjust.h
@@ -32,7 +32,7 @@ typedef enum {
     AM_SCALE, AM_NSCALE, AM_SCALEXY, AM_PUSH, AM_PUSHPULL,
     AM_ORTHO, AM_ORTHO_YX, AM_ORTHOXY, AM_ORTHOYX,
     AM_PORTHO, AM_PORTHO_YX, AM_PORTHOXY, AM_PORTHOYX, AM_COMPRESS,
-    AM_VPSC, AM_IPSEP, AM_FDP
+    AM_VPSC, AM_IPSEP, AM_PRISM
 } adjust_mode;
 
 typedef struct {