release: 1.3.18

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

diff --git a/lily/line-of-score.cc b/lily/line-of-score.cc
index c53a33a9e8cc4f7f6647015f2dffa7db0e95ec03..0f313f40e96f50c3e5669433fbb6ad9d8b9fbd0b 100644 (file)
--- a/lily/line-of-score.cc
+++ b/lily/line-of-score.cc
@@ -12,52 +12,60 @@
 #include "paper-column.hh"
 #include "paper-score.hh"
 #include "warn.hh"
+#include "main.hh"
+#include "debug.hh"
 
 Line_of_score::Line_of_score()
 {
-  set_axes (Y_AXIS,Y_AXIS);
+  set_elt_property ("columns", SCM_EOL);
+  set_axes (Y_AXIS,X_AXIS);
 }
 
-bool
-Line_of_score::contains_b (Paper_column const* c) const
+
+
+void
+Line_of_score::output_lines ()
 {
-  return cols_.find_l ((Paper_column*)(c));
+  for (int i=0; i < broken_into_l_arr_.size (); i++)
+    {
+      Line_of_score *line_l = dynamic_cast<Line_of_score*> (broken_into_l_arr_[i]);
+
+      progress_indication ("[");
+      line_l->post_processing ();
+      progress_indication (to_str (i));
+      line_l->output_line (i + 1 == broken_into_l_arr_.size ());
+      progress_indication ("]");
+    }
 }
 
 // const?
-Line_of_score*
-Line_of_score::set_breaking (Array<Column_x_positions> const &breaking, int j) const
+void
+Line_of_score::break_into_pieces (Array<Column_x_positions> const &breaking)
 {
-  const Link_array<Paper_column> &curline (breaking[j].cols_);
-  const Array<Real> &config (breaking[j].config_);
-  Line_of_score *line_l=0;
-
-  line_l = dynamic_cast <Line_of_score*> (clone());
-
-  line_l->cols_ = curline;
-  line_l->set_bounds(LEFT,curline[0]);
-  line_l->set_bounds(RIGHT,curline.top());
-       
-  for (int i=0; i < curline.size(); i++)
+  for (int i=0; i < breaking.size (); i++)
     {
-      curline[i]->translate_axis (config[i],X_AXIS);
-      curline[i]->line_l_ = dynamic_cast<Line_of_score*>(line_l);
+      Line_of_score *line_l = dynamic_cast <Line_of_score*> (clone());
+      line_l->rank_i_ = i;
+      Link_array<Paper_column> c (breaking[i].cols_);
+      pscore_l_->typeset_element (line_l);
+      line_l->set_bounds(LEFT,c[0]);
+      line_l->set_bounds(RIGHT,c.top ());
+      for (int j=0; j < c.size(); j++)
+       {
+         c[j]->translate_axis (breaking[i].config_[j],X_AXIS);
+         c[j]->line_l_ = line_l;
+       }
+      
+      broken_into_l_arr_.push (line_l);
     }
-
-  Breaking_information b;
-  b.bounds_ = line_l->spanned_drul_;
-  b.broken_spanner_l_ = line_l;
-  b.line_l_ = line_l;
-  
-  broken_info_.push (b);
-
-  return line_l;
 }
 
 void
 Line_of_score::add_column (Paper_column*p)
 {
-  cols_.push (p);
+  set_elt_property ("columns",
+                   gh_cons (p->self_scm_, get_elt_property ("columns")));
+  add_element (p);
 }
 
 void
@@ -67,28 +75,12 @@ Line_of_score::do_print() const
   Axis_group_spanner::do_print ();
 }
 
-Link_array<Score_element>
-Line_of_score::get_extra_dependencies () const
-{
-  Link_array<Score_element> r (Axis_group_spanner::get_extra_dependencies ());
-  for (int i=0; i < cols_.size (); i++)
-    r.push (cols_[i]);
-  return r;
-}
-
 void
-Line_of_score::do_substitute_element_pointer (Score_element*o, Score_element*n)
-{
-  if (Paper_column *p = dynamic_cast<Paper_column*>(o))
-    cols_.substitute (p, dynamic_cast<Paper_column*>(n));
-}
-
-void
-Line_of_score::output_all (bool last_line)
+Line_of_score::output_line (bool last_line)
 {
   Interval i(extent(Y_AXIS));
   if (i.empty_b())
-    warning ("Huh? Empty Line_of_score?");
+    programming_error ("Huh?  Empty Line_of_score?");
   else
     translate_axis (- i[MAX], Y_AXIS);
   
@@ -99,3 +91,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_;
+}