release: 0.1.11

[lilypond.git] / lily / item.cc

diff --git a/lily/item.cc b/lily/item.cc
index 6c4a7699c814da15146eba6ce18e0a8f8c9a0a00..6d72b4c5b81d0c013435b14375333672386e4a34 100644 (file)
--- a/lily/item.cc
+++ b/lily/item.cc
@@ -11,13 +11,13 @@
 #include "item.hh"
 #include "p-col.hh"
 #include "elem-group.hh"
+#include "spanner.hh"
 
 Item::Item()
 {
   breakable_b_ = false;
   break_status_i_ = 0;
-  pcol_l_ = 0;
-  broken_to_a_[0] = broken_to_a_[1]=0;
+  broken_to_drul_[LEFT] = broken_to_drul_[RIGHT]=0;
 }
 
 IMPLEMENT_IS_TYPE_B1(Item, Score_elem);
@@ -26,21 +26,22 @@ void
 Item::do_print() const
 {
 #ifndef NPRINT
-  DOUT << "(unknown)";
+  DOUT << "breakable_b_: " << breakable_b_;
+  DOUT << "break_status_i_: " <<break_status_i_;
 #endif
 }
 
 
 Real 
-Item::hpos_f()const
+Item::hpos_f() const
 {
-  return pcol_l_->hpos_f_ + absolute_coordinate (X_AXIS);
+  return absolute_coordinate (X_AXIS);
 }
 
 Line_of_score *
-Item::line_l()const
+Item::line_l() const
 {
-  return pcol_l_->line_l_;
+  return  (axis_group_l_a_[X_AXIS])? axis_group_l_a_[X_AXIS]->line_l() : 0;
 }
 
 int
@@ -52,36 +53,37 @@ Item::break_status_i() const
 void
 Item::copy_breakable_items()
 {
-  if ( broken_to_a_[0] || broken_to_a_[1])
-       return;
-  Item *new_copies[2];
-  for (int i=0; i < 2; i++) 
+  if (broken_to_drul_[LEFT] || broken_to_drul_[RIGHT])
+    return;
+  Drul_array<Item *> new_copies;
+  Direction  i=LEFT;
+  do 
     {
-       Item * item_p = clone()->item ();
-       item_p->copy_dependencies (*this);
-       
-       item_p->break_status_i_ =  -1+ 2*i;
-       pscore_l_->typeset_item (item_p, pcol_l_);
-       item_p->handle_prebroken_dependencies();
-       new_copies[i] =item_p;
+      Item * item_p = clone()->item ();
+
+      item_p->break_status_i_ =  i;
+      pscore_l_->typeset_element (item_p);
+      item_p->handle_prebroken_dependencies();
+      new_copies[i] =item_p;
     }
-  broken_to_a_= new_copies;
+  while ((i *= -1) != LEFT);
+  broken_to_drul_= new_copies;
 }
 
 void
 Item::do_breakable_col_processing()
 {
-  if (!breakable_b_ || !pcol_l_->breakable_b())
-       return;
+  if (!breakable_b_)
+    return;
 
   copy_breakable_items();
   handle_prebroken_dependencies();
 
   /*
     Otherwise the broken items won't be pre_process()'ed.
-   */
-  add_dependency (broken_to_a_[0]);
-  add_dependency (broken_to_a_[1]);    
+    */
+  add_dependency (broken_to_drul_[LEFT]);
+  add_dependency (broken_to_drul_[RIGHT]);    
 
 }
 
@@ -89,32 +91,67 @@ Item*
 Item::find_prebroken_piece (Line_of_score*l) const
 {
   if (line_l() == l) 
-       return (Item*)this;
-  else if (broken_to_a_[0] && broken_to_a_[0]->line_l() == l)
-       return broken_to_a_[0];
-  else if (broken_to_a_[1] && broken_to_a_[1]->line_l() == l)
-       return broken_to_a_[1];
+    return (Item*)this;
+  else if (broken_to_drul_[LEFT] && broken_to_drul_[LEFT]->line_l() == l)
+    return broken_to_drul_[LEFT];
+  else if (broken_to_drul_[RIGHT] && broken_to_drul_[RIGHT]->line_l() == l)
+    return broken_to_drul_[RIGHT];
 
   return 0;
 }
 
 Item*
-Item::find_prebroken_piece (PCol*c)const
+Item::find_prebroken_piece (int breakstatus) const
 {
-  if (c == pcol_l_)
-       return (Item *) this;   // ugh
+  if (!breakstatus)
+    return (Item *) this;      // ugh
+  else
+    return (Item*) broken_to_drul_[(Direction)breakstatus];
+}
 
-  if (c == pcol_l_->prebreak_p_)
-       return (Item *) broken_to_a_[0];
-  else if (c==pcol_l_->postbreak_p_)
-       return  (Item *)broken_to_a_[1];
+void
+Item::handle_prebroken_dependencies()
+{
+  if (breakable_b_)
+    Score_elem::handle_prebroken_dependencies();
+}
 
-  assert (false);
+int
+Item::left_right_compare(Item const *l, Item const *r)
+{
+  while (!l->is_type_b (Paper_column::static_name ()))
+    l = l->axis_group_l_a_[X_AXIS]->item();
+  while (!r->is_type_b (Paper_column::static_name ()))
+    r = r->axis_group_l_a_[X_AXIS]->item();
+
+  Paper_column *p1 = (Paper_column*)l;
+  Paper_column* p2 = (Paper_column*)r;
+  return p1->rank_i () - p2->rank_i ();
+}
+
+
+bool
+Item::linked_b() const
+{
+  return Score_elem::linked_b() || attached_span_l_arr_.size();
 }
 
 void
-Item::handle_prebroken_dependencies()
+Item::do_junk_links()
+{
+  attached_span_l_arr_.set_size(0);
+}
+
+void
+Item::do_unlink()
 {
-  if ( breakable_b_)
-       Score_elem::handle_prebroken_dependencies();
+  for (int i=0; i < attached_span_l_arr_.size (); i++) {
+    Spanner *&s= attached_span_l_arr_[i];
+    if (s->spanned_drul_[LEFT] == this)
+      s->set_bounds (LEFT, 0);
+    if  (s->spanned_drul_[RIGHT] == this)
+      s->set_bounds (RIGHT,0);
+    s =0;
+  }
+  attached_span_l_arr_.set_size (0);
 }