cleanup

darcs-hash:20100410130019-ff731-a3b66807227a54a2a3876200d1548c6a44de7882.gz

diff --git a/cl-graph.asd b/cl-graph.asd
index d217807..ebffcf2 100644 (file)
--- a/cl-graph.asd
+++ b/cl-graph.asd
@@ -35,7 +35,8 @@ instructions."))
                        :depends-on ("graph"))
                 (:file "graph-algorithms"
                        :depends-on ("graph"))
-                                     
+                (:file "dynamic-classes"
+                       :depends-on ("graph"))
                 (:static-file "notes.text")
 
                 (:module "graphviz" :depends-on ("graph")
@@ -51,7 +52,7 @@ instructions."))
                      (intern (symbol-name '#:run-tests) :lift)
                      :config :generic))
   :depends-on ((:version :metatilities-base "0.6.0")
-              (:version :cl-containers "0.11.0")
+              (:version :cl-containers "0.12.0")
               ))
 
 (defmethod operation-done-p 
@@ -101,14 +102,6 @@ instructions."))
                :components
                ((:file "subgraph-containing")))))
 
-#+asdf-system-connections
-(asdf:defsystem-connection cl-graph-and-dynamic-classes
-  :requires (cl-graph dynamic-classes)
-  :components ((:module 
-               "dev"
-               :components
-               ((:file "dynamic-classes")))))
-
 
 
 

diff --git a/dev/api.lisp b/dev/api.lisp
index 9ac634c..4518de8 100644 (file)
--- a/dev/api.lisp
+++ b/dev/api.lisp
@@ -291,7 +291,7 @@ or the URL 'http://arxiv.org/abs/cond-mat/0209450'."))
 The output can be a stream or pathname or one of the values `nil` or
 `t`. If output is `nil`, then graph->dot returns a string containing
 the DOT description. If it is `t`, then the DOT description is written
-to *standard-output*.
+to \\*standard-output\\*.
 
 Here is an example;
 

diff --git a/dev/graphviz/graphviz-support.lisp b/dev/graphviz/graphviz-support.lisp
index a88bce3..1ea586a 100644 (file)
--- a/dev/graphviz/graphviz-support.lisp
+++ b/dev/graphviz/graphviz-support.lisp
@@ -354,7 +354,7 @@ B--D []
   (getf (dot-attributes thing) attr))
 
 (defmacro defpixel-inch-accessors (name attr type)
-  (let ((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))