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

diff --git a/lily/include/item.hh b/lily/include/item.hh
index d4b6444232..1895910fb6 100644
--- a/lily/include/item.hh
+++ b/lily/include/item.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 #ifndef ITEM_HH
 #define ITEM_HH
@@ -22,12 +22,14 @@ class Item : public Grob
 
   DECLARE_CLASSNAME(Item);
 public:
-  Item (SCM, Object_key const *);
-  Item (Item const &, int count);
+  Item (SCM);
+  Item (Item const &);
 
-  virtual Grob *clone (int count) 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;
 
@@ -38,12 +40,18 @@ public:
   virtual System *get_system () const;
   virtual Paper_column *get_column () const;
   virtual void handle_prebroken_dependencies ();
-  virtual Interval_t<int> spanned_rank_iv ();
+  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 ();
   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