From: David Kastrup <dak@gnu.org>
Date: Sun, 20 May 2012 18:20:13 +0000 (+0200)
Subject: Add regression tests and display routines for tweaking of named grobs.
X-Git-Tag: release/2.15.39-1~11
X-Git-Url: https://git.donarmstrong.com/lilypond.git?a=commitdiff_plain;h=73d3a7eacc32f58d4c0215709652bd4470243321;p=lilypond.git

Add regression tests and display routines for tweaking of named grobs.
---

diff --git a/input/regression/display-lily-tests.ly b/input/regression/display-lily-tests.ly
index 6e7a3ab24c..61b5e7995e 100644
--- a/input/regression/display-lily-tests.ly
+++ b/input/regression/display-lily-tests.ly
@@ -242,6 +242,7 @@ stderr of this run."
 \test ##[ < c \tweak #'transparent ##t e > #]
 \test ##[ < \tweak #'color #'(1.0 0.0 0.0) \tweak #'duration-log #2 c > #]
 \test ##[ c-\tweak #'font-size #3 -> #]
+\test ##[ < \tweak Accidental #'color #'(1.0 0.0 0.0) cis eis g > #]
 
 %% end test.
 
diff --git a/input/regression/grob-indirect-tweak.ly b/input/regression/grob-indirect-tweak.ly
new file mode 100644
index 0000000000..f3541c5a10
--- /dev/null
+++ b/input/regression/grob-indirect-tweak.ly
@@ -0,0 +1,21 @@
+\header
+{
+
+  texidoc = "With the full form of the @code{\\tweak} function,
+individual grobs that are indirectly caused by events may be tuned."
+
+}
+
+\version "2.15.39"
+\paper {
+  ragged-right = ##t
+}
+
+\relative c''
+{
+  <
+    \tweak Accidental #'color #red   cis4
+    \tweak Accidental #'color #green es
+    g
+  >4
+}
diff --git a/scm/display-lily.scm b/scm/display-lily.scm
index 9536c3dd42..058534acfe 100644
--- a/scm/display-lily.scm
+++ b/scm/display-lily.scm
@@ -82,9 +82,12 @@ display method will be called."
 (define* (tweaks->lily-string expr #:optional (post-event? #f))
   (format #f "~{~a ~}"
           (map (lambda (tweak)
-                 (format #f "~a\\tweak #'~a #~a"
+                 (format #f "~a\\tweak ~a #~a"
                          (if post-event? "-" "")
-                         (car tweak)
+			 (if (pair? (car tweak))
+			     (format #f "~a #'~a"
+				     (caar tweak) (cdar tweak))
+			     (format #f "#'~a" (car tweak)))
                          (scheme-expr->lily-string (cdr tweak))))
                (ly:music-property expr 'tweaks))))