[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Let graphiz-init.ly use grob::name, delete grob-name (issue 289480043 by
From: |
thomasmorley65 |
Subject: |
Let graphiz-init.ly use grob::name, delete grob-name (issue 289480043 by address@hidden) |
Date: |
Sun, 13 Mar 2016 11:18:18 +0000 |
Reviewers: ,
Message:
please review.
Though, this does not tackle my bug-report here:
http://lilypond.1069038.n5.nabble.com/error-while-using-graphviz-td187830.html
Description:
Let graphiz-init.ly use grob::name, delete grob-name
Please review this at https://codereview.appspot.com/289480043/
Affected files (+5, -12 lines):
M ly/graphviz-init.ly
Index: ly/graphviz-init.ly
diff --git a/ly/graphviz-init.ly b/ly/graphviz-init.ly
index
c8d0dfe2c34f000fb156f5e53cc6d8d0585315de..470faffa6ac36228222bb077a250e1fdb2e240cb
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)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- Let graphiz-init.ly use grob::name, delete grob-name (issue 289480043 by address@hidden),
thomasmorley65 <=