* VERSION (MY_PATCH_LEVEL): make 1.7.0

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

diff --git a/lily/include/grob.hh b/lily/include/grob.hh
index bc62ac7e25e8b3daafb35de22a505a9982a10fe9..ebc46be195440b6c121cf60668dd789d96b68e12 100644 (file)
--- a/lily/include/grob.hh
+++ b/lily/include/grob.hh
@@ -37,13 +37,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 +52,7 @@ public:
 
     0 means ORPHAN,
    */
-  char status_c_;
+  char status_;
 
 
   /*
@@ -59,7 +60,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,18 +78,16 @@ 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.
     */
   void add_dependency (Grob*);    
-  virtual System * line_l () const;
+  virtual System * get_system () const;
   bool linked_b () const;
 
 
@@ -96,7 +95,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 +107,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;
@@ -152,10 +151,8 @@ 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));
-  DECLARE_SCHEME_CALLBACK (original_scm, (SCM smob));
-  DECLARE_SCHEME_CALLBACK (line_scm, (SCM smob));
 };
 
 DECLARE_UNSMOB(Grob,grob);
@@ -168,35 +165,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);
 
-
-/** Return Array of Grobs in SCM list L */
-inline Link_array<Grob>
-ly_scm2grob_array (SCM l)
-{
-  Link_array<Grob> arr;
-
-  for (SCM s = l; gh_pair_p (s); s = gh_cdr (s))
-    {
-      SCM e = gh_car (s);
-      arr.push (unsmob_grob (e));
-    }
-
-  arr.reverse ();
-  return arr;
-}
-
-#if 0
-/** Return SCM list of Grob array A */
-inline SCM
-ly_grob_array2scm (Link_array<Grob> a)
-{
-  SCM s = SCM_EOL;
-  for (int i = a.size (); i; i--)
-    s = gh_cons (a[i-1]->self_scm (), s);
-
-  return s;
-}
-#endif
+Link_array<Grob> ly_scm2grobs (SCM l);
+SCM ly_grobs2scm (Link_array<Grob> a);
 
 #endif // STAFFELEM_HH