lilypond-0.1.11

diff --git a/lily/include/axis-group-item.hh b/lily/include/axis-group-item.hh
index a461f52c25480ca6d54fcce71f1c8ce5064256e9..526d3ccd26ab4f8aeecbbcd97d2e26b262f94f8b 100644 (file)
--- a/lily/include/axis-group-item.hh
+++ b/lily/include/axis-group-item.hh
@@ -19,12 +19,19 @@
 
 class Axis_group_item : public virtual Axis_group_element, public Item {
 protected:
-    virtual void do_breakable_col_processing();
-    void OK()const;
-    virtual void do_print() const;
+  virtual void do_breakable_col_processing();
+  void OK() const;
+  virtual void do_print() const;
+  virtual void do_junk_links() { 
+    Item::do_junk_links();
+    Axis_group_element::do_junk_links();
+  }
+  virtual void do_unlink() {
+    Item::do_unlink();
+    Axis_group_element::do_unlink();
+  }
 public:
-    DECLARE_MY_RUNTIME_TYPEINFO;
-
+  DECLARE_MY_RUNTIME_TYPEINFO;
 };
 
 #endif // AXIS_ITEM_HH

diff --git a/lily/include/item.hh b/lily/include/item.hh
index e465931074c1f035117ef801161023e504e3cb07..524c6772e1bf248d1ffb9f9f25b723289c477430 100644 (file)
--- a/lily/include/item.hh
+++ b/lily/include/item.hh
@@ -12,6 +12,7 @@
 #include "boxes.hh"
 #include "string.hh"
 #include "score-elem.hh"
+#include "drul-array.hh"
 
 /**
   A horizontally fixed size element of the score.
@@ -25,31 +26,33 @@
 */
 class Item : public virtual Score_elem {
 public:
-    /// indirection to the column it is in
-    PCol * pcol_l_;
-    
-    Item * broken_to_a_[2];
-
-    /// should be put in a breakable col.
-    bool breakable_b_;
-    int break_status_i_;
-    /// nobreak = 0, pre = -1, post = 1
-    int break_status_i()const;
-    Item * find_prebroken_piece (PCol*)const;
-    Item * find_prebroken_piece (Line_of_score*)const;    
-
-    virtual Item *item() { return this; }
-    Item();
-    Real hpos_f() const;
-    DECLARE_MY_RUNTIME_TYPEINFO;
-    virtual Line_of_score * line_l() const;
+  Link_array<Spanner> attached_span_l_arr_;
+  Drul_array<Item*> broken_to_drul_;
+
+  /// should be put in a breakable col.
+  bool breakable_b_;
+  int break_status_i_;
+  /// nobreak = 0, pre = -1, post = 1
+  int break_status_i() const;
+  Item * find_prebroken_piece (int) const;
+  Item * find_prebroken_piece (Line_of_score*) const;    
+
+  virtual Item *item() { return this; }
+  Item();
+  Real hpos_f() const;
+  DECLARE_MY_RUNTIME_TYPEINFO;
+  virtual Line_of_score * line_l() const;
     
+  static int left_right_compare (Item const *, Item const*);
 protected:
-    virtual void  do_breakable_col_processing();
-    virtual void handle_prebroken_dependencies();
-    virtual void do_print()const;
-
-    void copy_breakable_items();
+  virtual void do_unlink ();
+  virtual void do_junk_links();
+  virtual void  do_breakable_col_processing();
+  virtual void handle_prebroken_dependencies();
+  virtual void do_print() const;
+  virtual bool linked_b() const;
+
+  void copy_breakable_items();
 };