X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Finclude%2Fgrob.hh;h=9f46a06e1d87d2903bdc15696017ddbaa675a32b;hb=1cd3b2484a4095d4e3fb6422dbc695a1a1219eea;hp=b09e6e9ac049cba09638cfd5c69ed51c19e11e28;hpb=5d09d767066abb2f2d53cd18cf0c0a0b1188d1a7;p=lilypond.git

diff --git a/lily/include/grob.hh b/lily/include/grob.hh
index b09e6e9ac0..9f46a06e1d 100644
--- a/lily/include/grob.hh
+++ b/lily/include/grob.hh
@@ -2,18 +2,14 @@
   grob.hh -- declare Grob
 
   source file of the LilyPond music typesetter
-  
-  (c) 1996--2004 Han-Wen Nienhuys
+
+  (c) 1996--2005 Han-Wen Nienhuys
 */
 
 #ifndef GROB_HH
 #define GROB_HH
 
-#include "parray.hh"
 #include "virtual-methods.hh"
-#include "lily-guile.hh"
-#include "lily-proto.hh"
-#include "smobs.hh"
 #include "dimension-cache.hh"
 #include "grob-interface.hh"
 #include "object-key.hh"
@@ -21,15 +17,16 @@
 /**
    for administration of what was done already
 */
-enum Grob_status {
-  ORPHAN=0,			// not yet added to Paper_score
-  PRECALCING,
-  PRECALCED,		// calcs before spacing done
-  POSTCALCING,		// busy calculating. This is used to trap cyclic deps.
-  POSTCALCED,		// after spacing calcs done
-};
+enum Grob_status
+  {
+    ORPHAN = 0, // not yet added to Paper_score
+    PRECALCING,
+    PRECALCED, // calcs before spacing done
+    POSTCALCING, // busy calculating. This is used to trap cyclic deps.
+    POSTCALCED, // after spacing calcs done
+  };
 
-typedef void (Grob::*Grob_method_pointer) (void);
+typedef void (Grob:: *Grob_method_pointer) (void);
 
 // looking at gtk+/pango docstrings .. WIP
 
@@ -41,25 +38,25 @@ typedef void (Grob::*Grob_method_pointer) (void);
  **/
 class Grob
 {
-private:  
+private:
   DECLARE_SMOBS (Grob, foo);
   void init ();
 protected:
-  Object_key const * key_;
+  Object_key const *key_;
   SCM immutable_property_alist_;
   SCM mutable_property_alist_;
-  
+
   /* BARF */
   friend class Spanner;
   friend SCM ly_grob_properties (SCM);
   friend SCM ly_grob_basic_properties (SCM);
-  
+
   void substitute_mutable_properties (SCM, SCM);
   char status_;
-  
+
 public:
   Object_key const *get_key () const;
-  
+
   Grob *original_;
 
   /* TODO: junk this member. */
@@ -68,35 +65,34 @@ public:
   Dimension_cache dim_cache_[NO_AXES];
 
   Grob (SCM basic_props, Object_key const *);
-  Grob (Grob const&, int copy_count);
+  Grob (Grob const &, int copy_count);
 
   virtual Grob *clone (int count) const;
   DECLARE_SCHEME_CALLBACK (stencil_extent, (SCM smob, SCM axis));
- 
+
   String name () const;
   /*
     Properties
-   */
+  */
   SCM internal_get_property (SCM) const;
   void internal_set_property (SCM, SCM val);
   void add_to_list_property (SCM, SCM);
 
   SCM get_property_alist_chain (SCM) const;
-  static SCM ly_grob_set_property (SCM, SCM,SCM);
-  static SCM ly_grob_property (SCM, SCM);  
+  static SCM ly_grob_set_property (SCM, SCM, SCM);
+  static SCM ly_grob_property (SCM, SCM);
 
   void warning (String) const;
   void programming_error (String) const;
-  
+
   Output_def *get_layout () const;
-  void add_dependency (Grob*);    
+  void add_dependency (Grob *);
   virtual System *get_system () const;
 
   void calculate_dependencies (int final, int busy, SCM funcname);
 
-
   virtual void do_break_processing ();
-  virtual Grob *find_broken_piece (System*) const;
+  virtual Grob *find_broken_piece (System *) const;
   virtual void discretionary_processing ();
   virtual SCM do_derived_mark () const;
 
@@ -106,15 +102,15 @@ public:
   void suicide ();
   bool is_live () const;
   bool is_empty (Axis a) const;
-  
+
   bool internal_has_interface (SCM intf);
   static bool has_interface (Grob *me);
 
   virtual void handle_broken_dependencies ();
   virtual void handle_prebroken_dependencies ();
 
-  Interval extent (Grob * refpoint, Axis) const;
- 
+  Interval extent (Grob *refpoint, Axis) const;
+
   void translate_axis (Real, Axis);
   Real relative_coordinate (Grob const *refp, Axis) const;
   Grob *common_refpoint (Grob const *s, Axis a) const;
@@ -123,17 +119,15 @@ public:
   bool has_offset_callback (SCM callback, Axis) const;
   void add_offset_callback (SCM callback, Axis);
   bool has_extent_callback (SCM, Axis) const;
+  void flush_extent_cache (Axis);
   void set_extent (SCM, Axis);
+  void set_extent_callback (SCM, Axis);
   Real get_offset (Axis a) const;
-  
-  void set_parent (Grob* e, Axis);
 
-  // URG
-  Grob *get_parent (Axis a) const
-  {
-    return  dim_cache_[a].parent_;
-  }
+  void set_parent (Grob *e, Axis);
 
+  // URG
+  Grob *get_parent (Axis a) const;
   DECLARE_SCHEME_CALLBACK (fixup_refpoint, (SCM));
 };
 
@@ -142,7 +136,7 @@ Spanner *unsmob_spanner (SCM);
 Item *unsmob_item (SCM);
 
 Grob *common_refpoint_of_list (SCM elt_list, Grob *, Axis a);
-Grob *common_refpoint_of_array (Link_array<Grob> const&, Grob *, Axis a);
+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);
@@ -150,6 +144,6 @@ SCM substitute_mutable_property_alist (SCM alist);
 Link_array<Grob> ly_scm2grobs (SCM ell);
 SCM ly_grobs2scm (Link_array<Grob> a);
 
-Interval robust_relative_extent (Grob*, Grob*, Axis); 
+Interval robust_relative_extent (Grob *, Grob *, Axis);
 
 #endif /* GROB_HH */