diff options
author | Thomas Morley <thomasmorley65@gmail.com> | 2016-03-13 12:05:00 +0100 |
---|---|---|
committer | Thomas Morley <thomasmorley65@gmail.com> | 2016-03-19 12:03:02 +0100 |
commit | 915348828137a10d92ceeafd971be3f62ae4d089 (patch) | |
tree | d20b4170054b953cea2b274b3fa1c5fbf0ded3a2 /ly | |
parent | 4621a6c37211cd0fea136e5dd270f8efc3f846b6 (diff) |
Let graphiz-init.ly use grob::name, delete grob-name
Diffstat (limited to 'ly')
-rw-r--r-- | ly/graphviz-init.ly | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/ly/graphviz-init.ly b/ly/graphviz-init.ly index c8d0dfe2c3..470faffa6a 100644 --- a/ly/graphviz-init.ly +++ b/ly/graphviz-init.ly @@ -24,13 +24,6 @@ #(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))) - (if (pair? name-pair) - (cdr name-pair) - #f))) - % an event is relevant if % (it is on some whitelist or all whitelists are empty) % and @@ -42,11 +35,11 @@ (or (= 0 (length file-line-whitelist) (length sym-whitelist) (length grob-whitelist)) (memq prop sym-whitelist) - (memq (grob-name grob) grob-whitelist) + (memq (grob::name grob) grob-whitelist) (member file-line file-line-whitelist)) (and (not (memq prop sym-blacklist)) - (not (memq (grob-name grob) grob-blacklist)) + (not (memq (grob::name grob) grob-blacklist)) (not (member file-line file-line-blacklist)))))) #(define (grob-event-node grob label cluster) @@ -62,18 +55,18 @@ #(define (grob-mod grob file line func prop val) (let* ((val-str (truncate-value val)) - (label (format #f "~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 #f "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 #f "~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) |