X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fgrace-engraver.cc;h=197d618c00dad21d8dc6b85bbd808c01b76c557d;hb=2c22efe5a46a37065b10c3f51c5d7db00d07d318;hp=6df1ca46f17bdec8a1609662ffc0c5c065e87564;hpb=712d3632a2e5398ddfdcfc803f49930c3aad48c5;p=lilypond.git

diff --git a/lily/grace-engraver.cc b/lily/grace-engraver.cc
index 6df1ca46f1..197d618c00 100644
--- a/lily/grace-engraver.cc
+++ b/lily/grace-engraver.cc
@@ -12,9 +12,11 @@
 
 class Grace_engraver : public Engraver
 {
+  void consider_change_grace_settings ();
 protected:
-  virtual void start_translation_timestep ();
+  void start_translation_timestep ();
   virtual void derived_mark () const;
+  virtual void initialize ();
 
   TRANSLATOR_DECLARATIONS (Grace_engraver);
   Moment last_moment_;
@@ -25,17 +27,17 @@ public:
 Grace_engraver::Grace_engraver ()
 {
   grace_settings_ = SCM_EOL;
+  last_moment_ = Moment (Rational (-1, 1));
 }
 
 void
-Grace_engraver::derived_mark () const
+Grace_engraver::initialize ()
 {
-  scm_gc_mark (grace_settings_);
-  Engraver::derived_mark ();
+  consider_change_grace_settings ();
 }
 
 void
-Grace_engraver::start_translation_timestep ()
+Grace_engraver::consider_change_grace_settings ()
 {
   Moment now = now_mom ();
   if (last_moment_.grace_part_ && !now.grace_part_)
@@ -67,11 +69,8 @@ Grace_engraver::start_translation_timestep ()
 	  SCM val = scm_cadr (scm_cddr (entry));
 
 	  Context *c = context ();
-	  while (c
-		 && c->context_name_symbol () != context_name)
-	    {
-	      c = c->get_parent_context ();
-	    }
+	  while (c && !c->is_alias (context_name))
+	    c = c->get_parent_context ();
 
 	  if (c)
 	    {
@@ -82,19 +81,33 @@ Grace_engraver::start_translation_timestep ()
 	    }
 	  else
 	    {
-	      programming_error ("Cannot find context");
+	      programming_error ("can't find context");
 	      scm_display (context_name, scm_current_error_port ());
 	    }
 	}
     }
 
-  last_moment_ = now;
+  last_moment_ = now_mom ();
 }
 
+void
+Grace_engraver::derived_mark () const
+{
+  scm_gc_mark (grace_settings_);
+  Engraver::derived_mark ();
+}
+
+void
+Grace_engraver::start_translation_timestep ()
+{
+  consider_change_grace_settings ();
+}
+
+#include "translator.icc"
+
 ADD_TRANSLATOR (Grace_engraver,
-		/* descr */ "Set font size and other properties for grace notes.",
-		/* creats*/ "",
-		/* accepts */ "",
-		/* acks  */ "",
-		/* reads */ "graceSettings",
+		/* doc */ "Set font size and other properties for grace notes.",
+		/* create */ "",
+		/* accept */ "",
+		/* read */ "graceSettings",
 		/* write */ "");