release: 1.1.38

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

diff --git a/lily/rest-collision.cc b/lily/rest-collision.cc
index 1e479f196bbf66833015245727da6916a870d71a..77eecea668677c904a23e72808f45897fd77295a 100644 (file)
--- a/lily/rest-collision.cc
+++ b/lily/rest-collision.cc
@@ -14,9 +14,6 @@
 #include "collision.hh"
 #include "paper-def.hh"
 
-
-
-
 void
 Rest_collision::add_column (Note_column *nc_l)
 {
@@ -60,15 +57,15 @@ Rest_collision::do_pre_processing()
     {
       int dy = rest_l_arr_.size() > 2 ? 6 : 4;
        
-      rest_l_arr_[0]->translate_rests (rest_l_arr_[0]->dir_ *dy);      
+      rest_l_arr_[0]->translate_rests (rest_l_arr_[0]->dir () *dy);    
       // top is last element...
-      rest_l_arr_.top()->translate_rests (rest_l_arr_.top ()->dir_* dy);       
+      rest_l_arr_.top()->translate_rests (rest_l_arr_.top ()->dir ()* dy);     
     }
   // meisjes met jongetjes
   else 
     {
       // int dir_i = - ncol_l_arr_[0]->dir_;
-      int dir_i = rest_l_arr_[0]->dir_;
+      Direction dir = rest_l_arr_[0]->dir ();
        
       // minimum move
       int minpos = 4;
@@ -77,7 +74,9 @@ Rest_collision::do_pre_processing()
       // UGH Should get dims from table!
       int size_i = 6;
        
-      Real internote_f = paper ()->internote_f ();
+
+      // staff ref'd?
+      Real internote_f = paper_l ()->get_realvar (interline_scm_sym)/2.0;
       int sep_i = 3 + size_i / 2;
       for (int i = 0; i < ncol_l_arr_.size(); i++) 
        {
@@ -86,11 +85,11 @@ Rest_collision::do_pre_processing()
          for (int j = 0; j < ncol_l_arr_[i]->head_l_arr_.size(); j++)
            {
              int stem = (int)((ncol_l_arr_[i]->stem_l_->extent
-                              (Y_AXIS)[dir_i]) / internote_f);
-             minpos = minpos >? (dir_i * stem + sep_i);
+                              (Y_AXIS)[dir]) / internote_f);
+             minpos = minpos >? (dir * stem + sep_i);
            }
        }
-      rest_l_arr_[0]->translate_rests (dir_i * minpos);        
+      rest_l_arr_[0]->translate_rests (dir * minpos);  
     }
 }
 
@@ -104,7 +103,7 @@ Rest_collision::do_print() const
 }
 
 void
-Rest_collision::do_substitute_dependency (Score_element*o,Score_element*n)
+Rest_collision::do_substitute_element_pointer (Score_element*o,Score_element*n)
 {
   if (Note_column *onl = dynamic_cast<Note_column *> (o))
     {
@@ -116,6 +115,6 @@ Rest_collision::do_substitute_dependency (Score_element*o,Score_element*n)
 
 Rest_collision::Rest_collision()
 {
-  transparent_b_ = true;
+  set_elt_property (transparent_scm_sym, SCM_BOOL_T);
   set_empty (true);
 }