* VERSION (MY_PATCH_LEVEL): make 1.7.0

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

diff --git a/lily/include/item.hh b/lily/include/item.hh
index b0771939289f11f923d5681f4fc44077ac2ef67a..8a0fd0b4b7b9ef4e2ec69a4b5643e22cc85a6c2d 100644 (file)
--- a/lily/include/item.hh
+++ b/lily/include/item.hh
@@ -3,17 +3,16 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 #ifndef ITEM_HH
 #define ITEM_HH
 
 
 #include "box.hh"
-#include "string.hh"
-#include "score-element.hh"
+#include "grob.hh"
 #include "drul-array.hh"
-#include "protected-scm.hh"
+
 
 /**
   A horizontally fixed size element of the score.
@@ -21,61 +20,31 @@
   Item is the datastructure for printables whose width is known
   before the spacing is calculated
 
-  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 ();
-
-public:
-  Link_array<Spanner> attached_span_l_arr_;
+class Item : public Grob
+{
   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_;
-  Direction break_status_dir_;
-  int break_priority_i_;
-  
-  /// 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;    
+public:
+  VIRTUAL_COPY_CONS (Grob);
+  Item (SCM);
+  Item (Item const &);
 
-  Item();
-  Real hpos_f() const;
+  static bool breakable_b (Grob *);
+  bool broken_b () const;
   
-  virtual Line_of_score * line_l() const;
-  virtual Paper_column * column_l () const;
-    
-  static int left_right_compare (Item const *, Item const*);
+  Direction break_status_dir () const;
   
-  Item (Item const &);
+  Item *find_prebroken_piece (Direction) const;
+  Grob *find_broken_piece (System *) const;    
+  virtual System *get_system () const;
+  virtual Paper_column *get_column () const;
+  virtual void handle_prebroken_dependencies ();
+  static  bool has_interface (Grob *);
 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 ();
-
-  void copy_breakable_items();
+  virtual void discretionary_processing ();
+  void copy_breakable_items ();
+  virtual SCM do_derived_mark () const;
 };