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

diff --git a/scm/graphviz.scm b/scm/graphviz.scm
index bc17f6185e..657fdb23b3 100644
--- a/scm/graphviz.scm
+++ b/scm/graphviz.scm
@@ -1,16 +1,27 @@
-;;;; graphviz.scm -- utilities for creating graphviz output
+;;;; This file is part of LilyPond, the GNU music typesetter.
 ;;;;
-;;;;  source file of the GNU LilyPond music typesetter
+;;;; Copyright (C) 2007--2015 Joe Neeman <joeneeman@gmail.com>
 ;;;;
-;;;; (c) 2007--2008 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-empty-graph add-node add-edge add-cluster
-		    graph-write
-		    ))
+                    graph-write
+                    ))
 
 (define graph-type (make-record-type "graph" '(nodes edges clusters name)))
 
@@ -26,21 +37,21 @@
 
 (define (add-cluster graph node-id cluster-name)
   (let* ((cs (clusters graph))
-	 (cluster (assq cluster-name cs))
-	 (already-in-cluster (if cluster
-				 (cdr cluster)
-				 '())))
-    (set-clusters! graph (assq-set! cs
-				    cluster-name
-				    (cons node-id already-in-cluster)))))
+         (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 (assq-set! ns id label))
+    (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)))
+             (string? (car cluster-name)))
+        (add-cluster graph id (car cluster-name)))
     id))
 
 (define (add-edge graph node1 node2)
@@ -48,20 +59,21 @@
 
 (define (graph-write graph out)
   (let ((ns (nodes graph))
-	(es (edges graph))
-	(cs (clusters graph)))
-    (ly:message (format (_ "Writing graph `~a'...") (port-filename out)))
+        (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)
-    (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)
+    (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)))