Fix ending the dynamic extent in Text_interface::interpret_markup

[lilypond.git] / lily / grace-engraver.cc

diff --git a/lily/grace-engraver.cc b/lily/grace-engraver.cc
index 42b6742dbc7274d0c33c6581fdab38ebfc856561..57ccb1e0fa4d18202fff38f18cc002a38b0f77f8 100644 (file)
--- a/lily/grace-engraver.cc
+++ b/lily/grace-engraver.cc
@@ -100,7 +100,7 @@ Grace_engraver::consider_change_grace_settings ()
           SCM grob = scm_cadr (elt);
           SCM cell = scm_cddr (elt);
 
-          Grob_property_info (Context::unsmob (context), grob).matched_pop (cell);
+          Grob_property_info (unsmob<Context> (context), grob).matched_pop (cell);
         }
       grace_settings_ = SCM_EOL;
     }
@@ -120,10 +120,7 @@ Grace_engraver::consider_change_grace_settings ()
           if (!scm_is_pair (sym))
             sym = scm_list_1 (sym);
 
-          Context *c = context ();
-          while (c && !c->is_alias (context_name))
-            c = c->get_parent_context ();
-
+          Context *c = find_context_above (context (), context_name);
           if (c)
             {
               SCM cell = Grob_property_info (c, grob).push (sym, val);
@@ -160,6 +157,12 @@ Grace_engraver::derived_mark () const
   Engraver::derived_mark ();
 }
 
+void
+Grace_engraver::boot ()
+{
+
+}
+
 ADD_TRANSLATOR (Grace_engraver,
                 /* doc */
                 "Set font size and other properties for grace notes.",