release: 1.3.28

[lilypond.git] / lily / include / item.hh

diff --git a/lily/include/item.hh b/lily/include/item.hh
index 75f1bbf8d09062dbd4b12fa35c219af374775a61..c4b3dfbad3d6ca56efe42be084b1de3def0a7e2b 100644 (file)
--- a/lily/include/item.hh
+++ b/lily/include/item.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 #ifndef ITEM_HH
 #define ITEM_HH
@@ -24,41 +24,38 @@
   NB. This doesn't mean an Item has to initialize the output field before
   spacing calculation. 
   
-*/
+
+  
+  @signature
+  visibility_lambda :: int -> (bool . bool)
+     
+  @in
+  break direction
+     
+  @out
+  (transparent, empty) cons
+     
+   */
 class Item : public virtual Score_element {
   void do_break ();
   void try_visibility_lambda ();
-
 public:
-  Link_array<Spanner> attached_span_l_arr_;
+  /*
+    ugh.
+   */
   Drul_array<Item*> broken_to_drul_;
-  Item *unbroken_original_l_;
 
-  /**
-     
-     visibility_lambda :: int -> (bool . bool)
-     
-     @in
-     break direction
-     
-     @out
-     (transparent, empty) cons
-     
-   */
-  Protected_scm visibility_lambda_;
-  /// should be put in a breakable col.
-  bool breakable_b_;
 
-  /// I am really  to  be broken?
-  virtual bool breakable_b () const;
+public:
+
+  /// I am really to be broken?
+  bool breakable_b () const;
+  bool broken_b () const;
   
-  Direction break_status_dir_;
-  int break_priority_i_;
+  Direction break_status_dir () const;
   
-  /// nobreak = 0, pre = -1, post = 1
-  Direction break_status_dir() const;
-  Item * find_prebroken_piece (Direction) const;
-  Item * find_prebroken_piece (Line_of_score*) const;    
+  Item * find_broken_piece (Direction) const;
+  Score_element * find_broken_piece (Line_of_score*) const;    
 
   Item();
   Real hpos_f() const;
@@ -70,14 +67,7 @@ public:
   
   Item (Item const &);
 protected:
-  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;
-
-  virtual void handle_prebroken_dependents ();
+  virtual void do_breakable_col_processing();
 
   void copy_breakable_items();
 };