X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftweak-engraver.cc;h=a2a3b6592213dc773afe9ea686c76d85057ce2dc;hb=9e781b7dc83b60a543ce218aa1a5f139f74c760f;hp=d6fb7855224349f018e762cc23aea1c13ed6cc14;hpb=9cba6d0b05bd28e2fc73f091b09ace570c976182;p=lilypond.git

diff --git a/lily/tweak-engraver.cc b/lily/tweak-engraver.cc
index d6fb785522..a2a3b65922 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--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 2005--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 
   LilyPond is free software: you can redistribute it and/or modify
@@ -46,15 +46,34 @@ Tweak_engraver::acknowledge_grob (Grob_info info)
     ev = info.ultimate_event_cause ();
   if (ev)
     {
+      // Each tweak conses an address and a value.
+      // The address has one of the following forms:
+      // symbol -> direct tweak
+      // (grob . symbol) -> targeted tweak
+      // (#t . symbol-path) -> direct nested tweak
+      // (grob . symbol-path) -> targeted nested tweak
       for (SCM s = ev->get_property ("tweaks");
            scm_is_pair (s); s = scm_cdr (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));
+              if (scm_is_symbol (scm_caaar (s)))
+                {
+                  if (SCM_UNBNDP (grobname))
+                    grobname = scm_from_locale_symbol
+                      (info.grob ()->name ().c_str ());
+                  if (scm_is_eq (scm_caaar (s), grobname))
+                    {
+                      if (scm_is_symbol (scm_cdaar (s)))
+                        info.grob ()->set_property (scm_cdaar (s), scm_cdar (s));
+                      else
+                        set_nested_property (info.grob (), scm_cdaar (s),
+                                             scm_cdar (s));
+                    }
+                }
+              else if (direct)
+                set_nested_property (info.grob (), scm_cdaar (s),
+                                     scm_cdar (s));
             }
           else if (direct)
             info.grob ()->set_property (scm_caar (s), scm_cdar (s));