X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=dev%2Fgraphviz%2Fgraphviz-support.lisp;h=411b82dd30a59cd5bb03c4714b06ab1cc37d3c56;hb=9fb2488c515b9a579bf1d9f6769362d5d045d247;hp=99b8f7b1d2d6e3544e6b43cac0a70638cd568023;hpb=c9c290dd139941dfc72826b6854607c0c304f7ca;p=cl-graph.git

diff --git a/dev/graphviz/graphviz-support.lisp b/dev/graphviz/graphviz-support.lisp
index 99b8f7b..411b82d 100644
--- a/dev/graphviz/graphviz-support.lisp
+++ b/dev/graphviz/graphviz-support.lisp
@@ -4,7 +4,7 @@
 
 $Id: graphviz-support.lisp,v 1.7 2005/06/21 20:51:51 moody Exp $
 
-Author: Gary King, Levente Mészáros, Attila Lendvai
+Author: Gary King, Levente Mészáros, Attila Lendvai
 
 DISCUSSION
 
@@ -20,14 +20,14 @@ This file contains the stuff that does not depend on cl-graphviz.
 ; "GRAPHVIZ".
 ;
 (defmethod graph->dot ((g basic-graph) (stream stream)
-                       &key 
+                       &key
                        (graph-formatter 'graph->dot-properties)
                        (vertex-key 'vertex-id)
                        (vertex-labeler nil)
                        (vertex-formatter 'vertex->dot)
-                       (edge-key nil)
                        (edge-labeler 'princ) 
-                       (edge-formatter 'edge->dot))
+                       (edge-formatter 'edge->dot)
+                       &allow-other-keys)
   (format stream "~A G {~%graph " (if (contains-undirected-edge-p g) "graph" "digraph"))
   (format stream "[")
   (funcall graph-formatter g stream)
@@ -250,6 +250,7 @@ B--D []
     (:nodesep float)
     (:ranksep float)
     (:ordering (:out))
+    (:overlap text)
     (:rankdir ("LR" "RL" "BT"))
     (:pagedir text)
     (:rank (:same :min :max))
@@ -259,7 +260,8 @@ B--D []
     (:mclimit float)
     (:layers text)
     (:color text)
-    (:bgcolor text)))
+    (:bgcolor text)
+    (:fontname text)))
 
 (defparameter *dot-vertex-attributes*
   '((:pos coordinate)
@@ -278,7 +280,8 @@ B--D []
     (:fillcolor text)
     (:style (:filled :solid :dashed :dotted :bold :invis))
     (:layer text)
-    (:url text)))
+    (:url text)
+    (:peripheries integer)))
 
 (defparameter *dot-edge-attributes*
   '((:pos spline)