X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fgrace-engraver.cc;h=c377166d63198ba5fbb905f3e5ba2a032df55616;hb=81abebcfecdb22d2e7b6b8e2a6d9f758aa45a13a;hp=be09cb4fe5d3784a3ba2abc0e28e7ed378b3be12;hpb=58bcc84c9480dae1b21bc24d8396b91fe19e0131;p=lilypond.git

diff --git a/lily/grace-engraver.cc b/lily/grace-engraver.cc
index be09cb4fe5..c377166d63 100644
--- a/lily/grace-engraver.cc
+++ b/lily/grace-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2004--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2004--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "engraver.hh"
@@ -12,9 +12,11 @@
 
 class Grace_engraver : public Engraver
 {
+  void consider_change_grace_settings ();
 protected:
-  virtual void start_translation_timestep ();
-  virtual void derived_mark ();
+  void start_translation_timestep ();
+  virtual void derived_mark () const;
+  virtual void initialize ();
 
   TRANSLATOR_DECLARATIONS (Grace_engraver);
   Moment last_moment_;
@@ -25,16 +27,17 @@ public:
 Grace_engraver::Grace_engraver ()
 {
   grace_settings_ = SCM_EOL;
+  last_moment_ = Moment (Rational (-1, 1));
 }
 
 void
-Grace_engraver::derived_mark ()
+Grace_engraver::initialize ()
 {
-  scm_gc_mark (grace_settings_);
+  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_)
@@ -66,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)
 	    {
@@ -81,19 +81,40 @@ Grace_engraver::start_translation_timestep ()
 	    }
 	  else
 	    {
-	      programming_error ("Cannot find context");
+	      programming_error ("cannot 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",
-		/* write */ "");
+		/* doc */
+		"Set font size and other properties for grace notes.",
+
+		/* create */
+		"",
+
+		/* read */
+		"graceSettings ",
+
+		/* write */
+		""
+		);