* input/regression/beam-quant-standard.ly: reindent, set

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

diff --git a/lily/include/grob.hh b/lily/include/grob.hh
index 7a74d8baee991071ee093ab864e543134622c867..211bf08d394b2bb2550925a25dd9a029dfec5444 100644 (file)
--- a/lily/include/grob.hh
+++ b/lily/include/grob.hh
@@ -27,7 +27,6 @@ protected:
   SCM immutable_property_alist_;
   SCM mutable_property_alist_;
   SCM object_alist_;
-  SCM property_callbacks_;
   
   /*
     If this is a property, it accounts for 25% of the property
@@ -41,9 +40,9 @@ protected:
   friend SCM ly_grob_basic_properties (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));
@@ -61,7 +60,10 @@ 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;
   /*
@@ -71,15 +73,11 @@ public:
   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);
 
-  SCM try_callback (SCM);
-  /*
-    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);
@@ -89,11 +87,7 @@ 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 ();
@@ -104,11 +98,11 @@ 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);
-
+  SCM get_interfaces () const;
+  
   virtual void handle_broken_dependencies ();
   virtual void handle_prebroken_dependencies ();
 
@@ -119,14 +113,9 @@ public:
   Grob *common_refpoint (Grob const *s, Axis a) const;
 
   // duh. slim down interface here. (todo)
-  void set_callback (SCM sym, SCM proc);
   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);
 
@@ -150,4 +139,7 @@ SCM ly_grobs2scm (Link_array<Grob> a);
 
 Interval robust_relative_extent (Grob *, Grob *, Axis);
 
+bool is_callback_chain (SCM s);
+SCM callback_chain_extract_procedures (SCM chain_smob);
+
 #endif /* GROB_HH */