X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=dev%2Fgraphviz%2Fgraphviz-support.lisp;h=aec3b994ab5297c1d27fc97637c3e29a0be80cda;hb=b3ce2ed9442e84ed2c5e634aeef473892cca0a04;hp=a27a34b72c66d84e50431c7bbf407da14866fee3;hpb=60a6a5dc8344e67aef8c8903c3cacc58a1f2315d;p=cl-graph.git

diff --git a/dev/graphviz/graphviz-support.lisp b/dev/graphviz/graphviz-support.lisp
index a27a34b..aec3b99 100644
--- a/dev/graphviz/graphviz-support.lisp
+++ b/dev/graphviz/graphviz-support.lisp
@@ -2,9 +2,7 @@
 
 #| simple-header
 
-$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,15 +18,16 @@ 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))
-  (format stream "~A G {~%graph " (if (contains-undirected-edge-p g) "graph" "digraph"))
+                       (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)
   (format stream "];")
@@ -250,7 +249,7 @@ B--D []
     (:nodesep float)
     (:ranksep float)
     (:ordering (:out))
-    (:overlap :text)
+    (:overlap text)
     (:rankdir ("LR" "RL" "BT"))
     (:pagedir text)
     (:rank (:same :min :max))
@@ -362,7 +361,8 @@ B--D []
           (* 72 it)))
       (defmethod (setf ,actual-name) (value (thing ,type))
         "Set the attribute in pixels assuming 72 dpi"
-        (setf (dot-attribute-value ,attr thing) (coerce (/ value 72) 'double-float))))))
+        (setf (dot-attribute-value ,attr thing)
+	      (coerce (/ value 72) 'double-float))))))
 
 (defpixel-inch-accessors width :width dot-vertex-mixin)
 (defpixel-inch-accessors height :height dot-vertex-mixin)
@@ -499,6 +499,7 @@ B--D []
 the program in *dot-path*."
   (let ((dot-string (graph->dot g nil))
         (dot-type (concatenate 'string "-T" (string-downcase (symbol-name type)))))
+    (declare (ignorable dot-string dot-type file-name))
     #+lispworks (with-open-stream
                     (s (sys:open-pipe (concatenate 'string *dot-path* " -Tpng -o" file-name)
                                       :direction :input))