X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fitem.hh;h=1895910fb6c95ea21a45fbfa06cbbc6c79e0c80e;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=80b39df71cdc79d1ddb3d6764a2b20e84bf792ad;hpb=615a9212789c2cb2994748c023d0e19f3a83a0fd;p=lilypond.git

diff --git a/lily/include/item.hh b/lily/include/item.hh
index 80b39df71c..1895910fb6 100644
--- a/lily/include/item.hh
+++ b/lily/include/item.hh
@@ -3,63 +3,55 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 #ifndef ITEM_HH
 #define ITEM_HH
 
-
-#include "box.hh"
-#include "string.hh"
-#include "score-element.hh"
-#include "drul-array.hh"
+#include "grob.hh"
 
 /**
-  A horizontally fixed size element of the score.
-
-  Item is the datastructure for printables whose width is known
-  before the spacing is calculated
+   A horizontally fixed size element of the score.
 
-  NB. This doesn't mean an Item has to initialize the output field before
-  spacing calculation. 
-  
+   Item is the datastructure for printables whose width is known
+   before the spacing is calculated
 */
-class Item : public virtual Score_element {
+class Item : public Grob
+{
+  Drul_array<Item *> broken_to_drul_;
+
+  DECLARE_CLASSNAME(Item);
 public:
-  Link_array<Spanner> attached_span_l_arr_;
-  Drul_array<Item*> broken_to_drul_;
-  Item *unbroken_original_l_;
+  Item (SCM);
+  Item (Item const &);
 
-  /// 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;    
+  virtual Grob *clone () 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 &);
+  static bool is_non_musical (Grob *);
+  static bool break_visible(Grob *);
+  static bool less (Grob * const&, Grob * const&);
+  bool is_broken () const;
+  bool pure_is_visible (int start, int end) const;
+
+  Direction break_status_dir () 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 ();
+  virtual Interval_t<int> spanned_rank_interval () const;
+  virtual Interval pure_height (Grob *ref, int start, int end);
+  DECLARE_GROB_INTERFACE();
 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 discretionary_processing ();
+  void copy_breakable_items ();
+  virtual void derived_mark () const;
 
-  void copy_breakable_items();
+  bool cached_pure_height_valid_;
+  Interval cached_pure_height_;
 };
 
-
+Interval_t<Moment> spanned_time_interval (Item *l, Item *r);
 
 #endif