X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftweak-engraver.cc;h=ed66637abeec3357fe7d6c9eaec4d2f13917bbea;hb=750b714488c5af6eae22d07163bba8b554734ac6;hp=d1c3c240a4a83fb7ae7fd28ff58cac68ecbca158;hpb=0b716515bfd610a04bbe4289f171f3cd80a0fc14;p=lilypond.git

diff --git a/lily/tweak-engraver.cc b/lily/tweak-engraver.cc
index d1c3c240a4..ed66637abe 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--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 
   LilyPond is free software: you can redistribute it and/or modify
@@ -29,10 +29,11 @@ class Tweak_engraver : public Engraver
   TRANSLATOR_DECLARATIONS (Tweak_engraver);
 
 protected:
-  DECLARE_ACKNOWLEDGER (grob);
+  void acknowledge_grob (Grob_info);
 };
 
-Tweak_engraver::Tweak_engraver ()
+Tweak_engraver::Tweak_engraver (Context *c)
+  : Engraver (c)
 {
 }
 
@@ -46,21 +47,47 @@ 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));
-	  } else if (direct)
-	    info.grob ()->set_property (scm_caar (s), scm_cdar (s));
+          if (scm_is_pair (scm_caar (s)))
+            {
+              if (scm_is_symbol (scm_caaar (s)))
+                {
+                  if (SCM_UNBNDP (grobname))
+                    grobname = scm_from_utf8_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));
         }
     }
 }
 
-ADD_ACKNOWLEDGER (Tweak_engraver, grob);
+void
+Tweak_engraver::boot ()
+{
+  ADD_ACKNOWLEDGER (Tweak_engraver, grob);
+}
+
 ADD_TRANSLATOR (Tweak_engraver,
                 /* doc */
                 "Read the @code{tweaks} property from the originating event,"