* flower

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

diff --git a/lily/grace-engraver.cc b/lily/grace-engraver.cc
index 352fc840fd57325acd08aed5f3a72e367ebae1b5..be09cb4fe5d3784a3ba2abc0e28e7ed378b3be12 100644 (file)
--- a/lily/grace-engraver.cc
+++ b/lily/grace-engraver.cc
@@ -1,10 +1,9 @@
-/* 
-  grace-engraver.cc --  implement Grace_engraver
-  
+/*
+  grace-engraver.cc -- implement Grace_engraver
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 2004 Han-Wen Nienhuys <hanwen@xs4all.nl>
-  
+
+  (c) 2004--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "engraver.hh"
@@ -16,15 +15,14 @@ class Grace_engraver : public Engraver
 protected:
   virtual void start_translation_timestep ();
   virtual void derived_mark ();
-  
+
   TRANSLATOR_DECLARATIONS (Grace_engraver);
   Moment last_moment_;
   SCM grace_settings_;
 public:
 };
 
-
-Grace_engraver::Grace_engraver()
+Grace_engraver::Grace_engraver ()
 {
   grace_settings_ = SCM_EOL;
 }
@@ -65,26 +63,26 @@ Grace_engraver::start_translation_timestep ()
          SCM context_name = scm_car (entry);
          SCM grob = scm_cadr (entry);
          SCM sym = scm_caddr (entry);
-         SCM val = scm_cadddr (entry);
+         SCM val = scm_cadr (scm_cddr (entry));
 
          Context *c = context ();
-         while (c  
+         while (c
                 && c->context_name_symbol () != context_name)
            {
-             c = c->get_parent_context ();           
+             c = c->get_parent_context ();
            }
 
-         if (c) 
+         if (c)
            {
              execute_pushpop_property (c,
                                        grob, sym, val);
              grace_settings_
-               = scm_cons (scm_cons (c->self_scm(), entry),  grace_settings_);
+               = scm_cons (scm_cons (c->self_scm (), entry), grace_settings_);
            }
          else
            {
              programming_error ("Cannot find context");
-             scm_display (context_name, scm_current_error_port());
+             scm_display (context_name, scm_current_error_port ());
            }
        }
     }
@@ -92,11 +90,10 @@ Grace_engraver::start_translation_timestep ()
   last_moment_ = now;
 }
 
-
-ENTER_DESCRIPTION (Grace_engraver,
-                  /* descr */       "Set font size and other properties for grace notes.",
-                  /* creats*/       "",
-                  /* accepts */     "",
-                  /* acks  */      "",
-                  /* reads */       "graceSettings",
-                  /* write */       "");
+ADD_TRANSLATOR (Grace_engraver,
+               /* descr */ "Set font size and other properties for grace notes.",
+               /* creats*/ "",
+               /* accepts */ "",
+               /* acks  */ "",
+               /* reads */ "graceSettings",
+               /* write */ "");