X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftweak-engraver.cc;h=d1c3c240a4a83fb7ae7fd28ff58cac68ecbca158;hb=e8fc7813b17822c138150807484197ef8d4e7c21;hp=b145f3dd4b3113d8d92eda0d75da0d2247a2902e;hpb=d61cf3bbdb1c6670a127ba3baddf2f04d3e34fd3;p=lilypond.git

diff --git a/lily/tweak-engraver.cc b/lily/tweak-engraver.cc
index b145f3dd4b..d1c3c240a4 100644
--- a/lily/tweak-engraver.cc
+++ b/lily/tweak-engraver.cc
@@ -39,12 +39,23 @@ Tweak_engraver::Tweak_engraver ()
 void
 Tweak_engraver::acknowledge_grob (Grob_info info)
 {
-  if (Stream_event *ev = info.event_cause ())
+  Stream_event *ev = info.event_cause ();
+  bool direct = ev;
+  SCM grobname = SCM_UNDEFINED;
+  if (!direct)
+    ev = info.ultimate_event_cause ();
+  if (ev)
     {
       for (SCM s = ev->get_property ("tweaks");
            scm_is_pair (s); s = scm_cdr (s))
         {
-          info.grob ()->set_property (scm_caar (s), scm_cdar (s));
+	  if (scm_is_pair (scm_caar (s))) {
+	    if (SCM_UNBNDP (grobname))
+	      grobname = scm_from_locale_symbol (info.grob ()->name ().c_str ());
+	    if (scm_is_eq (scm_caaar (s), grobname))
+	      info.grob ()->set_property (scm_cdaar (s), scm_cdar (s));
+	  } else if (direct)
+	    info.grob ()->set_property (scm_caar (s), scm_cdar (s));
         }
     }
 }