* lily/grob.cc: remove is_empty()

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

diff --git a/lily/include/grob.hh b/lily/include/grob.hh
index 6b8d86444974ecd5d9608e811b46f4c18ea2540c..6c08afeeec96e0399a337732f68798fd4570e651 100644 (file)
--- a/lily/include/grob.hh
+++ b/lily/include/grob.hh
@@ -14,15 +14,6 @@
 #include "grob-interface.hh"
 #include "object-key.hh"
 
-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);
 
 class Grob
@@ -30,29 +21,32 @@ class Grob
 private:
   DECLARE_SMOBS (Grob, foo);
   void init ();
+
 protected:
   Object_key const *key_;
   SCM immutable_property_alist_;
   SCM mutable_property_alist_;
   SCM object_alist_;
-
+  
   /*
     If this is a property, it accounts for 25% of the property
     lookups.
-   */
+  */
   SCM interfaces_;
 
-  
-  
   /* BARF */
   friend class Spanner;
   friend SCM ly_grob_properties (SCM);
   friend SCM ly_grob_basic_properties (SCM);
-  friend void check_interfaces_for_property  (Grob const*, SCM);
+  friend void check_interfaces_for_property (Grob const *, SCM);
   void substitute_object_links (SCM, SCM);
-  char status_;
 
+  DECLARE_CLASSNAME(Grob);
+  Real get_offset (Axis a) const;
 public:
+  DECLARE_SCHEME_CALLBACK(same_axis_parent_positioning, (SCM, SCM));
+  DECLARE_SCHEME_CALLBACK(other_axis_parent_positioning, (SCM, SCM));
+
   Object_key const *get_key () const;
 
   Grob *original_;
@@ -66,23 +60,24 @@ public:
   Grob (Grob const &, int copy_count);
 
   virtual Grob *clone (int count) const;
-  DECLARE_SCHEME_CALLBACK (stencil_extent, (SCM smob, SCM axis));
-
+  static SCM stencil_extent (Grob*, Axis);
+  DECLARE_SCHEME_CALLBACK (stencil_height, (SCM smob));
+  DECLARE_SCHEME_CALLBACK (stencil_width, (SCM smob));
+    
+  
   String name () const;
   /*
     Properties
   */
-  SCM internal_get_property (SCM) const;
-  SCM internal_get_object (SCM) const;
+  SCM internal_get_property (SCM symbol) const;
+  SCM get_property_data (SCM symbol) const;
+  SCM internal_get_object (SCM symbol) const;
 
+  void del_property (SCM symbol); 
   void internal_set_property (SCM sym, SCM val);
   void internal_set_object (SCM sym, SCM val);
 
-  /*
-    JUNKME.
-   */
-  void add_to_list_property (SCM, SCM);
-  void add_to_object_list (SCM sym, SCM thing);
+  SCM try_callback (SCM, SCM);
 
   SCM get_property_alist_chain (SCM) const;
   static SCM ly_grob_set_property (SCM, SCM, SCM);
@@ -92,26 +87,22 @@ public:
   void programming_error (String) const;
 
   Output_def *get_layout () const;
-  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 void discretionary_processing ();
-  virtual SCM do_derived_mark () const;
+  virtual void derived_mark () const;
 
   Stencil *get_stencil () const;
-  SCM get_uncached_stencil () const;
+  Stencil get_print_stencil () const;
 
   void suicide ();
   bool is_live () const;
-  bool is_empty (Axis a) const;
 
   bool internal_has_interface (SCM intf);
   static bool has_interface (Grob *me);
-
+  SCM get_interfaces () const;
+  
   virtual void handle_broken_dependencies ();
   virtual void handle_prebroken_dependencies ();
 
@@ -124,11 +115,7 @@ public:
   // duh. slim down interface here. (todo)
   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);