Admin: run yearly grand-replace.

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

diff --git a/lily/grace-engraver.cc b/lily/grace-engraver.cc
index 57bf0c476d8acf128f86e1644965c502aa1e5e57..5055b86807dbb445ea91417cbbc8b6ec14c783d0 100644 (file)
--- a/lily/grace-engraver.cc
+++ b/lily/grace-engraver.cc
@@ -1,9 +1,20 @@
 /*
-  grace-engraver.cc -- implement Grace_engraver
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2004--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2004--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "engraver.hh"
@@ -14,9 +25,9 @@ class Grace_engraver : public Engraver
 {
   void consider_change_grace_settings ();
 protected:
-  PRECOMPUTED_VIRTUAL void start_translation_timestep ();
+  void start_translation_timestep ();
   virtual void derived_mark () const;
-  virtual void initialize (); 
+  virtual void initialize ();
 
   TRANSLATOR_DECLARATIONS (Grace_engraver);
   Moment last_moment_;
@@ -27,7 +38,7 @@ public:
 Grace_engraver::Grace_engraver ()
 {
   grace_settings_ = SCM_EOL;
-  last_moment_ = Moment (Rational (-1,1));
+  last_moment_ = Moment (Rational (-1, 1));
 }
 
 void
@@ -70,9 +81,7 @@ Grace_engraver::consider_change_grace_settings ()
 
          Context *c = context ();
          while (c && !c->is_alias (context_name))
-           {
-             c = c->get_parent_context ();
-           }
+           c = c->get_parent_context ();
 
          if (c)
            {
@@ -82,14 +91,12 @@ Grace_engraver::consider_change_grace_settings ()
                = scm_cons (scm_cons (c->self_scm (), entry), grace_settings_);
            }
          else
-           {
-             programming_error ("can't find context");
-             scm_display (context_name, scm_current_error_port ());
-           }
+             programming_error ("cannot find context from graceSettings: "
+                                + ly_symbol2string (context_name));
        }
     }
 
-  last_moment_ = now_mom();
+  last_moment_ = now_mom ();
 }
 
 void
@@ -108,8 +115,15 @@ Grace_engraver::start_translation_timestep ()
 #include "translator.icc"
 
 ADD_TRANSLATOR (Grace_engraver,
-               /* descr */ "Set font size and other properties for grace notes.",
-               /* creats*/ "",
-               /* accepts */ "",
-               /* reads */ "graceSettings",
-               /* write */ "");
+               /* doc */
+               "Set font size and other properties for grace notes.",
+
+               /* create */
+               "",
+
+               /* read */
+               "graceSettings ",
+
+               /* write */
+               ""
+               );