unsmob_pitch -> Pitch::unsmob and related

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

diff --git a/lily/rest-engraver.cc b/lily/rest-engraver.cc
index 68ec862843dd52cf23e91084aea7e7b2fb01862f..b64dfe4a4d903a78b613d9efed9916df1eed5bc8 100644 (file)
--- 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--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1997--2006 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"
@@ -55,17 +66,17 @@ 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 = Pitch::unsmob (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));
+        }
     }
 }
 
@@ -77,8 +88,15 @@ Rest_engraver::listen_rest (Stream_event *ev)
 }
 
 ADD_TRANSLATOR (Rest_engraver,
-               /* doc */ "",
-               /* create */ "Rest ",
-               /* accept */ "rest-event",
-               /* read */ "middleCPosition",
-               /* write */ "");
+                /* doc */
+                "Engrave rests.",
+
+                /* create */
+                "Rest ",
+
+                /* read */
+                "middleCPosition ",
+
+                /* write */
+                ""
+               );