Fix some bugs in the dynamic engraver and PostScript backend

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

diff --git a/lily/include/item.hh b/lily/include/item.hh
index 3b728beb032c30d0ca9647f13678fa5824baeea0..9d1f2e73f66aeb5d29347667d8f62e942e83516c 100644 (file)
--- a/lily/include/item.hh
+++ b/lily/include/item.hh
@@ -3,50 +3,46 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2004 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:
-  Item (SCM);
-  Item (Item const &);
-  VIRTUAL_COPY_CONSTRUCTOR (Grob, Item);
+  Item (SCM, Object_key const *);
+  Item (Item const &, int count);
+
+  virtual Grob *clone (int count) const;
 
-  static bool is_breakable (Grob *);
+  static bool is_non_musical (Grob *);
   bool is_broken () const;
-  
+
   Direction break_status_dir () const;
-  
+
   Item *find_prebroken_piece (Direction) const;
-  Grob *find_broken_piece (System *) 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 *);
+  static bool has_interface (Grob *);
 protected:
   virtual void discretionary_processing ();
   void copy_breakable_items ();
-  virtual SCM do_derived_mark () const;
+  virtual void derived_mark () const;
 };
 
-
-
 #endif