Fixed a bug in graph->dot: edge-labeler argument was not being used properly

[cl-graph.git] / dev / graphviz / graphviz-support.lisp

diff --git a/dev/graphviz/graphviz-support.lisp b/dev/graphviz/graphviz-support.lisp
index fe614aa..a974d64 100644 (file)
--- a/dev/graphviz/graphviz-support.lisp
+++ b/dev/graphviz/graphviz-support.lisp
@@ -4,10 +4,6 @@
 
 $Id: graphviz-support.lisp,v 1.7 2005/06/21 20:51:51 moody Exp $
 
-Copyright 1992 - 2005 Experimental Knowledge Systems Lab, 
-University of Massachusetts Amherst MA, 01003-4610
-Professor Paul Cohen, Director
-
 Author: Gary King, Levente Mészáros, Attila Lendvai
 
 DISCUSSION
@@ -15,14 +11,7 @@ DISCUSSION
 This file contains the stuff that does not depend on cl-graphviz.
 
 |#
-(in-package metabang.graph)
-
-(export '(
-         print-dot-key-value
-         dot-attribute-value
-         dot-attributes-mixin
-         *dot-graph-attributes*
-         ))
+(in-package #:metabang.graph)
 
 ;;; ---------------------------------------------------------------------------
 ;
@@ -72,7 +61,7 @@ This file contains the stuff that does not depend on cl-graphviz.
              (princ " [" stream)
              (when (and directed? directed-edge-tag)
                (princ directed-edge-tag stream))
-             (when edge-key
+             (when edge-labeler
                (princ "label=\"" stream)
                (funcall edge-labeler e stream)
                (princ "\"," stream))
@@ -94,9 +83,11 @@ This file contains the stuff that does not depend on cl-graphviz.
         (iterate-vertexes 
          g
          (lambda (v)
+          ;(spy v)
            (iterate-edges
             v
             (lambda (e)
+             ;(spy e (undirected-edge-p e) (item-at-1 edges e))
               (when (and (undirected-edge-p e)
                          (not (item-at-1 edges e)))
                 (setf (item-at-1 edges e) t)
@@ -347,6 +338,7 @@ B--D []
 
 
 (defmethod (setf dot-attribute-value) :before (value (attr symbol) (thing dot-attributes-mixin))
+  (declare (ignore value))
   (ensure-valid-dot-attribute attr thing))
 
 (defmethod (setf dot-attribute-value) (value (attr symbol) (thing dot-attributes-mixin))