X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Fgraphviz-init.ly;h=c8d0dfe2c34f000fb156f5e53cc6d8d0585315de;hb=4e3c28666d3a052f7ee36dce577d02774ef62a5c;hp=2670858ffb03b8426a869d4efe2e978488913551;hpb=2940cdd12c135ef94e4c95ac815e76014eef9c79;p=lilypond.git diff --git a/ly/graphviz-init.ly b/ly/graphviz-init.ly index 2670858ffb..c8d0dfe2c3 100644 --- a/ly/graphviz-init.ly +++ b/ly/graphviz-init.ly @@ -1,4 +1,4 @@ -\version "2.14.0" +\version "2.19.22" #(use-modules (scm graphviz)) @@ -19,14 +19,14 @@ #(define (whitelist-symbol sym) (set! sym-whitelist (cons sym sym-whitelist))) -#(define (whitelist-grob str) - (set! grob-whitelist (cons str grob-whitelist))) +#(define (whitelist-grob sym) + (set! grob-whitelist (cons sym grob-whitelist))) -#(define graph (make-empty-graph (ly:parser-output-name parser))) +#(define graph (make-empty-graph (ly:parser-output-name))) #(define (grob-name g) (let* ((meta (ly:grob-property g 'meta)) - (name-pair (assq 'name meta))) + (name-pair (assq 'name meta))) (if (pair? name-pair) (cdr name-pair) #f))) @@ -51,29 +51,29 @@ #(define (grob-event-node grob label cluster) (let ((node-id (add-node graph label cluster)) - (prev (assv grob last-grob-action))) + (prev (assv grob last-grob-action))) (if (pair? prev) (add-edge graph (cdr prev) node-id)) (set! last-grob-action (assv-set! last-grob-action grob node-id)))) #(define (truncate-value val) - (let ((val-str (format "~a" val))) + (let ((val-str (format #f "~a" val))) (string-take val-str (min 50 (string-length val-str))))) #(define (grob-mod grob file line func prop val) (let* ((val-str (truncate-value val)) - (label (format "~a\\n~a:~a\\n~a <- ~a" (grob-name grob) file line prop val-str))) + (label (format #f "~a\\n~a:~a\\n~a <- ~a" (grob-name grob) file line prop val-str))) (if (relevant? grob file line prop) (grob-event-node grob label file)))) #(define (grob-cache grob prop callback value) (let* ((val-str (truncate-value value)) - (label (format "caching ~a.~a\\n~a -> ~a" (grob-name grob) prop callback value))) + (label (format #f "caching ~a.~a\\n~a -> ~a" (grob-name grob) prop callback value))) (if (relevant? grob #f #f prop) (grob-event-node grob label #f)))) #(define (grob-create grob file line func) - (let ((label (format "~a\\n~a:~a" (grob-name grob) file line))) + (let ((label (format #f "~a\\n~a:~a" (grob-name grob) file line))) (grob-event-node grob label file))) #(ly:set-grob-modification-callback grob-mod)