2003 -> 2004

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

diff --git a/lily/include/grob.hh b/lily/include/grob.hh
index 0b3c277d221e11a9554456d5508bf4a3c2b86d32..4acfcc45d1d1a0309833e06ac77b94545b973ba4 100644 (file)
--- a/lily/include/grob.hh
+++ b/lily/include/grob.hh
@@ -1,11 +1,13 @@
 /*
   grob.hh -- declare Grob
 
-  (c) 1996-1999--2002 Han-Wen Nienhuys
+  source file of the LilyPond music typesetter
+  
+  (c) 1996--2004 Han-Wen Nienhuys
 */
 
-#ifndef STAFFELEM_HH
-#define STAFFELEM_HH
+#ifndef GROB_HH
+#define GROB_HH
 
 #include "parray.hh"
 #include "virtual-methods.hh"
@@ -37,10 +39,11 @@ typedef void (Grob::*Grob_method_pointer) (void);
    Basic output object.
 */
 class Grob  {
-private:
+protected:
   SCM immutable_property_alist_;
   SCM mutable_property_alist_;
-
+  friend class Spanner;
+  
   void substitute_mutable_properties(SCM,SCM);
 public:
   Grob *original_;
@@ -77,8 +80,6 @@ public:
   
   void set_elt_pointer (const char*, SCM val);
   friend class Property_engraver; //  UGHUGHUGH.
-  SCM remove_grob_property (const char* nm);
-
   /*
     related classes.
    */
@@ -108,7 +109,7 @@ public:
   virtual void do_break_processing ();
   virtual Grob *find_broken_piece (System*) const;
   virtual void discretionary_processing ();
-  virtual SCM do_derived_mark ();
+  virtual SCM do_derived_mark () const;
 
   Molecule * get_molecule () const;
   SCM get_uncached_molecule () const;
@@ -134,7 +135,7 @@ public:
 
   void init ();
 public:
-  bool empty_b (Axis a) const;
+  bool is_empty (Axis a) const;
 
   Interval extent (Grob * refpoint, Axis) const;
  
@@ -169,5 +170,5 @@ SCM substitute_mutable_property_alist (SCM alist);
 Link_array<Grob> ly_scm2grobs (SCM l);
 SCM ly_grobs2scm (Link_array<Grob> a);
 
-#endif // STAFFELEM_HH
+#endif /* GROB_HH */