Follow cl-graphviz changes

darcs-hash:20070505004455-6b9e8-ad7a40a5fb676534c7f57b982e7a3871fcbdf9e7.gz

diff --git a/dev/graphviz/graphviz-support-optional.lisp b/dev/graphviz/graphviz-support-optional.lisp
index 9b4c2f1..2d65b62 100644 (file)
--- a/dev/graphviz/graphviz-support-optional.lisp
+++ b/dev/graphviz/graphviz-support-optional.lisp
@@ -58,7 +58,7 @@ loaded when cl-graphviz is available.
                                 (to-vertex (find-vertex-by-id g (graphviz:node-name to)))
                                 (real-edge (find-edge-between-vertexes g from-vertex to-vertex))
                                 (bezier-points '()))
-                           (graphviz:edge-iterate-beziers
+                           (graphviz:iterate-edge-beziers
                             edge
                             (lambda (bezier)
                               ;;(format t "  Bezier: ~a~%"

diff --git a/dev/graphviz/graphviz-support.lisp b/dev/graphviz/graphviz-support.lisp
index 16f4261..836bce0 100644 (file)
--- a/dev/graphviz/graphviz-support.lisp
+++ b/dev/graphviz/graphviz-support.lisp
@@ -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)