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 aa8bcb4b664dd7b2d36581a3c5411070467d42bb..9d1f2e73f66aeb5d29347667d8f62e942e83516c 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--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 #ifndef ITEM_HH
 #define ITEM_HH
@@ -21,13 +21,14 @@ class Item : public Grob
 {
   Drul_array<Item *> broken_to_drul_;
 
+  DECLARE_CLASSNAME(Item);
 public:
   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;
@@ -41,7 +42,7 @@ public:
 protected:
   virtual void discretionary_processing ();
   void copy_breakable_items ();
-  virtual SCM do_derived_mark () const;
+  virtual void derived_mark () const;
 };
 
 #endif