Run `make grand-replace'.

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

diff --git a/lily/include/item.hh b/lily/include/item.hh
index aa8bcb4b664dd7b2d36581a3c5411070467d42bb..1895910fb6c95ea21a45fbfa06cbbc6c79e0c80e 100644 (file)
--- a/lily/include/item.hh
+++ b/lily/include/item.hh
@@ -3,12 +3,11 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 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 "grob.hh"
 
 /**
@@ -21,14 +20,18 @@ class Item : public Grob
 {
   Drul_array<Item *> broken_to_drul_;
 
+  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_breakable (Grob *);
+  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;
 
@@ -37,11 +40,18 @@ public:
   virtual System *get_system () const;
   virtual Paper_column *get_column () const;
   virtual void handle_prebroken_dependencies ();
-  static bool has_interface (Grob *);
+  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 SCM do_derived_mark () const;
+  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