(Paper_column): copy rank_. This fixes

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

diff --git a/lily/rest-engraver.cc b/lily/rest-engraver.cc
index 72e5020bbeab49d137e646ba3bf28f3629465aff..91e447613a65013a19534c3488c467a245f156de 100644 (file)
--- a/lily/rest-engraver.cc
+++ b/lily/rest-engraver.cc
@@ -5,14 +5,13 @@
 
   (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
+
 #include "item.hh"
 #include "staff-symbol-referencer.hh"
-#include "event.hh"
 #include "dots.hh"
 #include "rhythmic-head.hh"
 #include "engraver.hh"
 
-
 class Rest_engraver : public Engraver
 {
   Music *rest_req_;
@@ -34,22 +33,22 @@ public:
  */
 Rest_engraver::Rest_engraver ()
 {
-  rest_req_ =0;
-  rest_ =0;
-  dot_ =0;
+  rest_req_ = 0;
+  rest_ = 0;
+  dot_ = 0;
 }
 
 void
 Rest_engraver::start_translation_timestep ()
 {
-  rest_req_ =0;
+  rest_req_ = 0;
 }
 
 void
 Rest_engraver::stop_translation_timestep ()
 {
-  rest_ =0;
-  dot_ =0;
+  rest_ = 0;
+  dot_ = 0;
 }
 
 void
@@ -86,7 +85,7 @@ Rest_engraver::process_music ()
        {
          int pos= p->steps ();
          SCM c0 = get_property ("middleCPosition");
-         if (ly_c_number_p (c0))
+         if (scm_is_number (c0))
            pos += scm_to_int (c0);
          
          rest_->set_property ("staff-position", scm_int2num (pos));