X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frest-engraver.cc;h=8902e3591121c0adfc98a969c7af5da6e6eae4b1;hb=a6a51abfd0195a3cf7d6ea095cf69808852f21ce;hp=e6e7ecb7dea588df79f98712c2d07f4bff58a3fc;hpb=f9214bac21e9926dc3248416f58190c98c4167a9;p=lilypond.git

diff --git a/lily/rest-engraver.cc b/lily/rest-engraver.cc
index e6e7ecb7de..8902e35911 100644
--- a/lily/rest-engraver.cc
+++ b/lily/rest-engraver.cc
@@ -1,9 +1,20 @@
 /*
-  rest-engraver.cc -- implement Rest_engraver
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1997--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1997--2007 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"
@@ -26,7 +37,7 @@ class Rest_engraver : public Engraver
 protected:
   void start_translation_timestep ();
   void process_music ();
-  DECLARE_TRANSLATOR_LISTENER (rest);
+  void listen_rest (Stream_event *);
 public:
   TRANSLATOR_DECLARATIONS (Rest_engraver);
 };
@@ -34,7 +45,8 @@ public:
 /*
   Should merge with Note_head_engraver
 */
-Rest_engraver::Rest_engraver ()
+Rest_engraver::Rest_engraver (Context *c)
+  : Engraver (c)
 {
   rest_event_ = 0;
   rest_ = 0;
@@ -55,29 +67,42 @@ Rest_engraver::process_music ()
   if (rest_event_ && !rest_)
     {
       rest_ = make_item ("Rest", rest_event_->self_scm ());
-      Pitch *p = unsmob_pitch (rest_event_->get_property ("pitch"));
+      Pitch *p = unsmob<Pitch> (rest_event_->get_property ("pitch"));
 
       if (p)
-	{
-	  int pos = p->steps ();
-	  SCM c0 = get_property ("middleCPosition");
-	  if (scm_is_number (c0))
-	    pos += scm_to_int (c0);
-
-	  rest_->set_property ("staff-position", scm_from_int (pos));
-	}
+        {
+          int pos = p->steps ();
+          SCM c0 = get_property ("middleCPosition");
+          if (scm_is_number (c0))
+            pos += scm_to_int (c0);
+
+          rest_->set_property ("staff-position", scm_from_int (pos));
+        }
     }
 }
 
-IMPLEMENT_TRANSLATOR_LISTENER (Rest_engraver, rest);
 void
 Rest_engraver::listen_rest (Stream_event *ev)
 {
   ASSIGN_EVENT_ONCE (rest_event_, ev);
 }
 
+void
+Rest_engraver::boot ()
+{
+  ADD_LISTENER (Rest_engraver, rest);
+}
+
 ADD_TRANSLATOR (Rest_engraver,
-		/* doc */ "",
-		/* create */ "Rest ",
-		/* read */ "middleCPosition",
-		/* write */ "");
+                /* doc */
+                "Engrave rests.",
+
+                /* create */
+                "Rest ",
+
+                /* read */
+                "middleCPosition ",
+
+                /* write */
+                ""
+               );