release: 1.2.9

[lilypond.git] / lily / line-of-score.cc

diff --git a/lily/line-of-score.cc b/lily/line-of-score.cc
index 8b91f8e9e0bb78f6746a4a98aa020c4fe2c036f7..b648ea10c5822d970c494206671ddf54b9ff2e00 100644 (file)
--- a/lily/line-of-score.cc
+++ b/lily/line-of-score.cc
@@ -15,7 +15,7 @@
 
 Line_of_score::Line_of_score()
 {
-  set_axes (Y_AXIS,Y_AXIS);
+  set_axes (Y_AXIS,X_AXIS);
 }
 
 bool
@@ -33,7 +33,8 @@ Line_of_score::set_breaking (Array<Column_x_positions> const &breaking, int j)
   Line_of_score *line_l=0;
 
   line_l = dynamic_cast <Line_of_score*> (clone());
-
+  line_l->rank_i_ = j;
+  
   line_l->cols_ = curline;
   line_l->set_bounds(LEFT,curline[0]);
   line_l->set_bounds(RIGHT,curline.top());
@@ -41,16 +42,10 @@ Line_of_score::set_breaking (Array<Column_x_positions> const &breaking, int j)
   for (int i=0; i < curline.size(); i++)
     {
       curline[i]->translate_axis (config[i],X_AXIS);
-      curline[i]->line_l_ = dynamic_cast<Line_of_score*>(line_l);
+      curline[i]->line_l_ = dynamic_cast<Line_of_score*> (line_l);
     }
 
-  Breaking_information b;
-  b.bounds_ = line_l->spanned_drul_;
-  b.broken_spanner_l_ = line_l;
-  b.line_l_ = line_l;
-  
   broken_into_l_arr_.push (line_l);
-
   return line_l;
 }
 
@@ -58,6 +53,7 @@ void
 Line_of_score::add_column (Paper_column*p)
 {
   cols_.push (p);
+  add_element (p);
 }
 
 void
@@ -99,3 +95,9 @@ Line_of_score::output_all (bool last_line)
   else
     pscore_l_->outputter_l_->stop_line ();
 }
+
+int
+Line_of_score::compare (Line_of_score* const &p1,Line_of_score* const &p2)
+{
+  return p1->rank_i_ - p2->rank_i_;
+}