2003 -> 2004

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

diff --git a/lily/include/item.hh b/lily/include/item.hh
index ce597312c7d6b3a0b2c5416815562c63f3e66630..e64fa4f3fa42d3956cbea68dc0951ba5a77c1c09 100644 (file)
--- a/lily/include/item.hh
+++ b/lily/include/item.hh
@@ -3,16 +3,16 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 #ifndef ITEM_HH
 #define ITEM_HH
 
 
 #include "box.hh"
-#include "score-element.hh"
+#include "grob.hh"
 #include "drul-array.hh"
-#include "protected-scm.hh"
+
 
 /**
   A horizontally fixed size element of the score.
@@ -21,30 +21,30 @@
   before the spacing is calculated
 
 */
-class Item : public Score_element
+class Item : public Grob
 {
   Drul_array<Item*> broken_to_drul_;
 
 public:
-  VIRTUAL_COPY_CONS(Score_element);
+  VIRTUAL_COPY_CONS (Grob);
   Item (SCM);
   Item (Item const &);
 
-  static bool breakable_b (Score_element*me);
+  static bool breakable_b (Grob *);
   bool broken_b () 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 ();
+  static  bool has_interface (Grob *);
 protected:
   virtual void discretionary_processing ();
-  void copy_breakable_items();
-  virtual SCM do_derived_mark ();
+  void copy_breakable_items ();
+  virtual SCM do_derived_mark () const;
 };