X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=dev%2Fgraphviz%2Fgraphviz-support.lisp;h=1ea586a6f170b13fe09249605a91adeb232395af;hb=3165cba36e6f8c3a7f3f1051f1c4880aaa14466d;hp=f9fa2610bbdedfd44a9bfa1834812b71f8f2fbef;hpb=234cdb04a311bab3cb6f75569f6ef3e146839e6e;p=cl-graph.git

diff --git a/dev/graphviz/graphviz-support.lisp b/dev/graphviz/graphviz-support.lisp
index f9fa261..1ea586a 100644
--- a/dev/graphviz/graphviz-support.lisp
+++ b/dev/graphviz/graphviz-support.lisp
@@ -341,24 +341,26 @@ B--D []
   (:export-p t))
 
 
-(defmethod (setf dot-attribute-value) :before (value (attr symbol) (thing dot-attributes-mixin))
+(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))
+(defmethod (setf dot-attribute-value) 
+    (value (attr symbol) (thing dot-attributes-mixin))
   (setf (getf (dot-attributes thing) attr) value))
 
 (defmethod dot-attribute-value ((attr symbol) (thing dot-attributes-mixin))
   (getf (dot-attributes thing) attr))
 
 (defmacro defpixel-inch-accessors (name attr type)
-  (bind ((actual-name (form-symbol name "-IN-PIXELS")))
+  (let ((actual-name (form-symbol name (symbol-name '-in-pixels))))
     `(progn
        (eval-always (export ',actual-name))
       (defmethod ,actual-name ((thing ,type))
         "Return the attribute in pixels assuming 72 dpi"
-        (awhen (dot-attribute-value ,attr thing)
-          (* 72 it)))
+        (when (dot-attribute-value ,attr thing)
+          (* 72 (dot-attribute-value ,attr thing))))
       (defmethod (setf ,actual-name) (value (thing ,type))
         "Set the attribute in pixels assuming 72 dpi"
         (setf (dot-attribute-value ,attr thing)
@@ -515,10 +517,10 @@ the program in *dot-path*."
     #-(or sbcl lispworks)
     (error "Don't know how to execute a program on this platform")))
 
-;;; ---------------------------------------------------------------------------
-;
+;;;
 ; Test dot external
-;
+
+#+test
 (defun test-dot-external ()
   (let* ((g (make-graph 'dot-graph))
          (v1 (add-vertex g 'a :dot-attributes '(:shape :box