X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Finclude%2Fitem.hh;h=0c001af69468b97bf3385b8cdaa62d964314f6f5;hb=75eebcb49e52d296b1da3e1074e0825d2c780db4;hp=0768c5885ebc2a49e6c64a6d754dd105151c1448;hpb=6a62932652940f4ac2931f75d48796887fbc5fdc;p=lilypond.git

diff --git a/lily/include/item.hh b/lily/include/item.hh
index 0768c5885e..0c001af694 100644
--- a/lily/include/item.hh
+++ b/lily/include/item.hh
@@ -3,55 +3,46 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 #ifndef ITEM_HH
 #define ITEM_HH
 
-
-#include "boxes.hh"
-#include "string.hh"
-#include "score-elem.hh"
+#include "box.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_elem {
+class Item : public Grob
+{
+  Drul_array<Item *> broken_to_drul_;
+
+  DECLARE_CLASSNAME(Item);
 public:
-    /// indirection to the column it is in
-    PCol * pcol_l_;
-    
-    Item * broken_to_a_[2];
-
-    /// should be put in a breakable col.
-    bool breakable_b_;
-    int break_status_i_;
-    /// nobreak = 0, pre = -1, post = 1
-    int break_status_i()const;
-    Item * find_prebroken_piece(PCol*)const;
-    Item * find_prebroken_piece(Line_of_score*)const;    
-
-    virtual Item *item() { return this; }
-    Item();
-    Real hpos_f() const;
-    DECLARE_MY_RUNTIME_TYPEINFO;
-    virtual Line_of_score * line_l() const;
-    
-protected:
-    virtual void  do_breakable_col_processing();
-    virtual void handle_prebroken_dependencies();
-    virtual void do_print()const;
+  Item (SCM, Object_key const *);
+  Item (Item const &, int count);
 
-    void copy_breakable_items();
-};
+  virtual Grob *clone (int count) const;
+
+  static bool is_breakable (Grob *);
+  bool is_broken () 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 ();
+  static bool has_interface (Grob *);
+protected:
+  virtual void discretionary_processing ();
+  void copy_breakable_items ();
+  virtual void derived_mark () const;
+};
 
 #endif