X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fgraphviz.scm;h=657fdb23b3e00e5233c583ad8b31bd19ea4c4c84;hb=HEAD;hp=d3a858fcef4fb6437578cf2f7f32bfcd6ed8a9b2;hpb=75e70caa7f5bab06cd9a09e36fa1ff3447c5fb3f;p=lilypond.git

diff --git a/scm/graphviz.scm b/scm/graphviz.scm
index d3a858fcef..657fdb23b3 100644
--- a/scm/graphviz.scm
+++ b/scm/graphviz.scm
@@ -1,35 +1,79 @@
+;;;; This file is part of LilyPond, the GNU music typesetter.
+;;;;
+;;;; Copyright (C) 2007--2015 Joe Neeman <joeneeman@gmail.com>
+;;;;
+;;;; LilyPond is free software: you can redistribute it and/or modify
+;;;; it under the terms of the GNU General Public License as published by
+;;;; the Free Software Foundation, either version 3 of the License, or
+;;;; (at your option) any later version.
+;;;;
+;;;; LilyPond is distributed in the hope that it will be useful,
+;;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;;; GNU General Public License for more details.
+;;;;
+;;;; You should have received a copy of the GNU General Public License
+;;;; along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
+
+
 (define-module (scm graphviz)
   #:use-module (lily)
-  #:export (make-graph add-node add-edge))
+  #:export
+  (make-empty-graph add-node add-edge add-cluster
+                    graph-write
+                    ))
+
+(define graph-type (make-record-type "graph" '(nodes edges clusters name)))
 
-(define (make-graph filename)
-  (let ((empty-graph (list->vector (list filename '() '() '()))))
-    (ly:atexit write-graph (list empty-graph))
-    empty-graph))
+(define make-graph (record-constructor graph-type))
+(define (make-empty-graph name) (make-graph '() '() '() name))
 
-(define (filename g) (vector-ref g 0))
-(define (nodes g) (vector-ref g 1))
-(define (edges g) (vector-ref g 2))
-(define (clusters g) (vector-ref g 3))
+(define nodes (record-accessor graph-type 'nodes))
+(define edges (record-accessor graph-type 'edges))
+(define clusters (record-accessor graph-type 'clusters))
+(define set-nodes! (record-modifier graph-type 'nodes))
+(define set-edges! (record-modifier graph-type 'edges))
+(define set-clusters! (record-modifier graph-type 'clusters))
 
-(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 (assoc cluster-name cs))
+         (already-in-cluster (if cluster
+                                 (cdr cluster)
+                                 '())))
+    (set-clusters! graph (assoc-set! cs
+                                     cluster-name
+                                     (cons node-id already-in-cluster)))))
+
+(define (add-node graph label . cluster-name)
+  (let* ((ns (nodes graph))
+         (id (length ns)))
+    (set-nodes! graph (assv-set! ns id label))
+    (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))))
-
-(define (write-graph graph)
-  (let ((out (open-file (filename graph) "w"))
-	(ns (nodes graph))
-	(es (edges graph))
-	(cc (clusters graph)))
-    (ly:message (format "writing graph ~s..." (filename graph)))
+  (set-edges! graph (cons `(,node1 . ,node2) (edges graph))))
+
+(define (graph-write graph out)
+  (let ((ns (nodes graph))
+        (es (edges graph))
+        (cs (clusters graph)))
+    (ly:message (format #f (_ "Writing graph `~a'...") (port-filename out)))
     (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)
+    (for-each (lambda (n) (format out "~a [label=\"~a\"]\n" (car n) (cdr n)))
+              ns)
+    (for-each (lambda (e) (format out "~a -> ~a\n" (car e) (cdr e)))
+              es)
+    (for-each (lambda (c)
+                (format out "subgraph cluster_~a {\nlabel= \"~a\"\ncolor=blue\n"
+                        (if (guile-v2)
+                            (string-filter char-alphabetic? (car c))
+                            (string-filter (car c) char-alphabetic?))
+                        (car c))
+                (for-each (lambda (n) (format out "~a\n" n)) (cdr c))
+                (display "}\n" out))
+              cs)
     (display "}" out)))
-  
\ No newline at end of file