X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fgraphviz.scm;h=8ad3600ffa70801ce7c9284743e0de30d165251b;hb=e0caac883553c23c92d4b51070b721fe2207ddcb;hp=d3a858fcef4fb6437578cf2f7f32bfcd6ed8a9b2;hpb=87eedcd59f4082cb0841528ad5bc82cb1d1191e3;p=lilypond.git

diff --git a/scm/graphviz.scm b/scm/graphviz.scm
index d3a858fcef..8ad3600ffa 100644
--- a/scm/graphviz.scm
+++ b/scm/graphviz.scm
@@ -1,6 +1,13 @@
+;;;; graphviz.scm -- utilities for creating graphviz output
+;;;;
+;;;;  source file of the GNU LilyPond music typesetter
+;;;;
+;;;; (c) 2007 Joe Neeman <joeneeman@gmail.com>
+
+
 (define-module (scm graphviz)
   #:use-module (lily)
-  #:export (make-graph add-node add-edge))
+  #:export (make-graph add-node add-edge add-cluster))
 
 (define (make-graph filename)
   (let ((empty-graph (list->vector (list filename '() '() '()))))
@@ -12,10 +19,24 @@
 (define (edges g) (vector-ref g 2))
 (define (clusters g) (vector-ref g 3))
 
-(define (add-node graph label)
-  (let ((ns (nodes graph)))
-    (vector-set! graph 1 (cons `(,(length ns) . ,label) ns))
-    (length ns)))
+(define (add-cluster graph node-id cluster-name)
+  (let* ((cs (clusters graph))
+	 (cluster (assq cluster-name cs))
+	 (already-in-cluster (if cluster
+				 (cdr cluster)
+				 '())))
+    (vector-set! graph 3 (assq-set! cs
+				    cluster-name
+				    (cons node-id already-in-cluster)))))
+
+(define (add-node graph label . cluster-name)
+  (let* ((ns (nodes graph))
+         (id (length ns)))
+    (vector-set! graph 1 (cons `(,id . ,label) ns))
+    (if (and (not (null? cluster-name))
+	     (string? (car cluster-name)))
+	(add-cluster graph id (car cluster-name)))
+    id))
 
 (define (add-edge graph node1 node2)
   (vector-set! graph 2 (cons `(,node1 . ,node2) (edges graph))))
@@ -24,12 +45,19 @@
   (let ((out (open-file (filename graph) "w"))
 	(ns (nodes graph))
 	(es (edges graph))
-	(cc (clusters graph)))
+	(cs (clusters graph)))
     (ly:message (format "writing graph ~s..." (filename graph)))
     (display "digraph G {\nrankdir=\"LR\"\nnode [shape=rectangle]\n" out)
     (map (lambda (n) (display (format "~a [label=\"~a\"]\n" (car n) (cdr n)) out))
 	 ns)
     (map (lambda (e) (display (format "~a -> ~a\n" (car e) (cdr e)) out))
 	 es)
+    (map (lambda (c)
+	  (display (format "subgraph cluster_~a {\nlabel= \"~a\"\ncolor=blue\n"
+			   (string-filter (car c) char-alphabetic?)
+			   (car c))
+		   out)
+	  (map (lambda (n) (display (format "~a\n" n) out)) (cdr c))
+	  (display "}\n" out))
+	 cs)
     (display "}" out)))
-  
\ No newline at end of file