X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftweak-engraver.cc;h=d6fb7855224349f018e762cc23aea1c13ed6cc14;hb=2628c3c9950b6abbb7bd74747726f8c01340e032;hp=e65b56a7e91014645e0b74e04623760e16d081d0;hpb=4a401ca1c60f428daa242dbdd102fdb3f327ebfb;p=lilypond.git

diff --git a/lily/tweak-engraver.cc b/lily/tweak-engraver.cc
index e65b56a7e9..d6fb785522 100644
--- a/lily/tweak-engraver.cc
+++ b/lily/tweak-engraver.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2005--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 2005--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 
   LilyPond is free software: you can redistribute it and/or modify
@@ -39,12 +39,25 @@ 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));
         }
     }
 }