* VERSION (MY_PATCH_LEVEL): make 1.7.0

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

diff --git a/lily/include/item.hh b/lily/include/item.hh
index 0591a8078138a57148314903295219c26b2c59c9..8a0fd0b4b7b9ef4e2ec69a4b5643e22cc85a6c2d 100644 (file)
--- a/lily/include/item.hh
+++ b/lily/include/item.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 #ifndef ITEM_HH
 #define ITEM_HH
@@ -12,7 +12,7 @@
 #include "box.hh"
 #include "grob.hh"
 #include "drul-array.hh"
-#include "protected-scm.hh"
+
 
 /**
   A horizontally fixed size element of the score.
@@ -26,25 +26,25 @@ class Item : public Grob
   Drul_array<Item*> broken_to_drul_;
 
 public:
-  VIRTUAL_COPY_CONS(Grob);
+  VIRTUAL_COPY_CONS (Grob);
   Item (SCM);
   Item (Item const &);
 
-  static bool breakable_b (Grob*me);
+  static bool breakable_b (Grob *);
   bool broken_b () const;
   
   Direction break_status_dir () const;
   
-  Item * find_prebroken_piece (Direction) const;
-  Grob * 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;
 };