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

diff --git a/lily/include/item.hh b/lily/include/item.hh
index 7d327628ed..1895910fb6 100644
--- a/lily/include/item.hh
+++ b/lily/include/item.hh
@@ -3,62 +3,55 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2000 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 "protected-scm.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
-
-  NB. This doesn't mean an Item has to initialize the output field before
-  spacing calculation. 
-  
-  
-  Element properties
-  
-  visibility-lambda -- a function that takes the break
-  direction and returns a (transparent, empty) cons
+   A horizontally fixed size element of the score.
 
-  breakable -- boolean indicating if this is a breakable item (clef,
-  barline, key sig, etc.)
-
-   */
-class Item : public Score_element
+   Item is the datastructure for printables whose width is known
+   before the spacing is calculated
+*/
+class Item : public Grob
 {
-  Drul_array<Item*> broken_to_drul_;
+  Drul_array<Item *> broken_to_drul_;
 
+  DECLARE_CLASSNAME(Item);
 public:
-  VIRTUAL_COPY_CONS(Score_element);
-  Item();
+  Item (SCM);
   Item (Item const &);
 
-  bool breakable_b () const;
-  bool broken_b () const;
-  
+  virtual Grob *clone () 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;
-  Score_element * find_broken_piece (Line_of_score*) const;    
 
-  virtual Line_of_score * line_l() const;
-  virtual Paper_column * column_l () 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 discretionary_processing ();
-  void copy_breakable_items();
-};
+  void copy_breakable_items ();
+  virtual void derived_mark () const;
 
+  bool cached_pure_height_valid_;
+  Interval cached_pure_height_;
+};
 
+Interval_t<Moment> spanned_time_interval (Item *l, Item *r);
 
 #endif