release: 1.3.70

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

diff --git a/lily/include/item.hh b/lily/include/item.hh
index 75f1bbf8d09062dbd4b12fa35c219af374775a61..16f298f7f2361983d612975fcd699d3e6dfff2d2 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,61 +24,38 @@
   NB. This doesn't mean an Item has to initialize the output field before
   spacing calculation. 
   
-*/
-class Item : public virtual Score_element {
-  void do_break ();
-  void try_visibility_lambda ();
+  
+  Element properties
+  
+  visibility-lambda -- a function that takes the break
+  direction and returns a (transparent, empty) cons
 
-public:
-  Link_array<Spanner> attached_span_l_arr_;
-  Drul_array<Item*> broken_to_drul_;
-  Item *unbroken_original_l_;
+  breakable -- boolean indicating if this is a breakable item (clef,
+  barline, key sig, etc.)
 
-  /**
-     
-     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_;
+class Item : public Score_element
+{
+  Drul_array<Item*> broken_to_drul_;
+
+public:
+  VIRTUAL_COPY_CONS(Score_element);
+  Item (SCM);
+  Item (Item const &);
 
-  /// I am really  to  be broken?
-  virtual bool breakable_b () const;
+  static bool breakable_b (Score_element*me);
+  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;    
+  Score_element * find_broken_piece (Line_of_score*) const;    
 
-  Item();
-  Real hpos_f() const;
-  
   virtual Line_of_score * line_l() const;
   virtual Paper_column * column_l () const;
-    
-  static int left_right_compare (Item const *, Item const*);
-  
-  Item (Item const &);
+  virtual void handle_prebroken_dependencies ();
 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 discretionary_processing ();
   void copy_breakable_items();
 };