X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fitem.hh;h=7c28a35240f5f212b6ee0c654b9acde45e8bbbe6;hb=060b9ebe2fc8c253768e36978542668fc3d050e0;hp=82f5e7c51643defa89bb285cbedd84c7cc7c4db8;hpb=0824dba176ac4991cc7671f18cf920f365100313;p=lilypond.git

diff --git a/lily/include/item.hh b/lily/include/item.hh
index 82f5e7c516..7c28a35240 100644
--- a/lily/include/item.hh
+++ b/lily/include/item.hh
@@ -3,51 +3,48 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 #ifndef ITEM_HH
 #define ITEM_HH
 
-
 #include "box.hh"
 #include "grob.hh"
-#include "drul-array.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.
 
+   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 (Grob);
-  Item (SCM);
-  Item (Item const &);
+  Item (SCM, Object_key const *);
+  Item (Item const &, int count);
+
+  virtual Grob *clone (int count) const;
+
+  static bool is_non_musical (Grob *);
+  bool is_broken () const;
+  bool pure_is_visible (int start, int end) const;
 
-  static bool breakable_b (Grob *);
-  bool broken_b () const;
-  
   Direction break_status_dir () const;
-  
-  Item *find_prebroken_piece (Direction) const;
-  Grob *find_broken_piece (System *) const;    
 
+  Item *find_prebroken_piece (Direction) const;
+  Grob *find_broken_piece (System *) const;
   virtual System *get_system () const;
-  virtual Paper_column *column_l () const;
+  virtual Paper_column *get_column () const;
   virtual void handle_prebroken_dependencies ();
-  static  bool has_interface (Grob *);
+  virtual Interval_t<int> spanned_rank_iv ();
+  static bool has_interface (Grob *);
 protected:
   virtual void discretionary_processing ();
   void copy_breakable_items ();
-  virtual SCM do_derived_mark ();
+  virtual void derived_mark () const;
 };
 
-
-
 #endif