2003 -> 2004

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

diff --git a/lily/include/grob.hh b/lily/include/grob.hh
index 7a963940500635116f7ffd90994c1971682a9f70..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,13 +39,14 @@ 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_l_;
+  Grob *original_;
 
   /**
     Administration: Where are we?. This is mainly used by Super_element and
@@ -51,7 +54,7 @@ public:
 
     0 means ORPHAN,
    */
-  char status_c_;
+  char status_;
 
 
   /*
@@ -59,7 +62,7 @@ public:
     elements, I think it is safe to assume that we will not have
     scores being formatted multithreadedly.
    */
-  Paper_score *pscore_l_;
+  Paper_score *pscore_;
   Dimension_cache dim_cache_[NO_AXES];
 
   Grob (SCM basic_props);
@@ -77,12 +80,10 @@ public:
   
   void set_elt_pointer (const char*, SCM val);
   friend class Property_engraver; //  UGHUGHUGH.
-  SCM remove_grob_property (const char* nm);
-
   /*
     related classes.
    */
-  Paper_def *paper_l () const;
+  Paper_def *get_paper () const;
 
   /**
     add a dependency. It may be the 0 pointer, in which case, it is ignored.
@@ -96,7 +97,7 @@ public:
  
   /**
      Recursively track all dependencies of this Grob.  The
-     status_c_ field is used as a mark-field.  It is marked with
+     status_ field is used as a mark-field.  It is marked with
      #busy# during execution of this function, and marked with #final#
      when finished.
 
@@ -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;
  
@@ -152,7 +153,7 @@ public:
   
   void set_parent (Grob* e, Axis);
   
-  Grob *get_parent (Axis a) const {   return  dim_cache_[a].parent_l_; }
+  Grob *get_parent (Axis a) const {   return  dim_cache_[a].parent_; }
   DECLARE_SCHEME_CALLBACK (fixup_refpoint, (SCM));
 };
 
@@ -166,8 +167,8 @@ Grob*common_refpoint_of_array (Link_array<Grob> const&, Grob * , Axis a);
 void set_break_subsititution (SCM criterion);
 SCM substitute_mutable_property_alist (SCM alist);
 
-Link_array<Grob> ly_scm2grob_array (SCM l);
-SCM ly_grob_array2scm (Link_array<Grob> a);
+Link_array<Grob> ly_scm2grobs (SCM l);
+SCM ly_grobs2scm (Link_array<Grob> a);
 
-#endif // STAFFELEM_HH
+#endif /* GROB_HH */