Fix some bugs in the dynamic engraver and PostScript backend

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

diff --git a/lily/rest-engraver.cc b/lily/rest-engraver.cc
index 6d9c20a5bef45ca5df66d49330d56d389c0e462e..7dffbeb9dd3a9c8f12e4353642e208a5c3116306 100644 (file)
--- a/lily/rest-engraver.cc
+++ b/lily/rest-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "engraver.hh"
@@ -15,7 +15,6 @@
 #include "rhythmic-head.hh"
 #include "music.hh"
 
-
 class Rest_engraver : public Engraver
 {
   Music *rest_event_;
@@ -48,7 +47,6 @@ Rest_engraver::start_translation_timestep ()
   dot_ = 0;
 }
 
-
 void
 Rest_engraver::process_music ()
 {
@@ -59,7 +57,7 @@ Rest_engraver::process_music ()
       int durlog = unsmob_duration (rest_event_->get_property ("duration"))->duration_log ();
 
       rest_->set_property ("duration-log",
-                          scm_int2num (durlog));
+                          scm_from_int (durlog));
 
       int dots = unsmob_duration (rest_event_->get_property ("duration"))->dot_count ();
 
@@ -69,7 +67,7 @@ Rest_engraver::process_music ()
 
          Rhythmic_head::set_dots (rest_, dot_);
          dot_->set_parent (rest_, Y_AXIS);
-         dot_->set_property ("dot-count", scm_int2num (dots));
+         dot_->set_property ("dot-count", scm_from_int (dots));
        }
 
       Pitch *p = unsmob_pitch (rest_event_->get_property ("pitch"));
@@ -85,7 +83,7 @@ Rest_engraver::process_music ()
          if (scm_is_number (c0))
            pos += scm_to_int (c0);
 
-         rest_->set_property ("staff-position", scm_int2num (pos));
+         rest_->set_property ("staff-position", scm_from_int (pos));
        }
     }
 }
@@ -104,8 +102,8 @@ Rest_engraver::try_music (Music *m)
 #include "translator.icc"
 
 ADD_TRANSLATOR (Rest_engraver,
-               /* descr */ "",
-               /* creats*/ "Rest Dots",
-               /* accepts */ "rest-event",
-               /* reads */ "middleCPosition",
+               /* doc */ "",
+               /* create */ "Rest Dots",
+               /* accept */ "rest-event",
+               /* read */ "middleCPosition",
                /* write */ "");