''

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

diff --git a/lily/include/grob.hh b/lily/include/grob.hh
index c01a5fe7a798edaa953bef0fbfd9e24d995e42b2..8e8cde5890d8b73d295224b45348b9524c57cd74 100644 (file)
--- a/lily/include/grob.hh
+++ b/lily/include/grob.hh
@@ -70,7 +70,8 @@ public:
   SCM internal_get_grob_property (SCM) const;
   void internal_set_grob_property (SCM, SCM val);
   
-  void warning (String);
+  void warning (String)const;
+  void programming_error (String)const;
   
   void set_elt_pointer (const char*, SCM val);
   friend class Property_engraver; //  UGHUGHUGH.
@@ -100,7 +101,7 @@ public:
      #funcptr# is the function to call to update this element.
    */
   void calculate_dependencies (int final, int busy, SCM funcname);
-  static SCM handle_broken_grobs(SCM, SCM criterion);
+
 
   virtual void do_break_processing ();
   virtual Grob *find_broken_piece (System*) const;
@@ -116,7 +117,6 @@ public:
   DECLARE_SCHEME_CALLBACK (point_dimension_callback, (SCM smob, SCM axis));
   DECLARE_SCHEME_CALLBACK (molecule_extent, (SCM smob, SCM axis));
 
-
   static SCM ly_set_grob_property (SCM, SCM,SCM);
   static SCM ly_get_grob_property (SCM, SCM);  
 
@@ -126,34 +126,16 @@ public:
   virtual void handle_broken_dependencies ();
   virtual void handle_prebroken_dependencies ();
 
-
   DECLARE_SMOBS (Grob,foo);
 
   void init ();
-
-
 public:
-  
   bool empty_b (Axis a) const;
 
   Interval extent (Grob * refpoint, Axis) const;
  
-  /**
-    translate in one direction
-    */
-    
   void translate_axis (Real, Axis);
-
-  /**
-     Find the offset relative to D.  If   D equals THIS, then it is 0.
-     Otherwise, it recursively defd as
-
-     OFFSET_ + PARENT_L_->relative_coordinate (D)
-   */
   Real relative_coordinate (Grob const* refp, Axis) const;
-  /**
-    Find the group-element which has both #this# and #s#
-   */
   Grob*common_refpoint (Grob const* s, Axis a) const;
 
 
@@ -162,15 +144,8 @@ public:
   void add_offset_callback (SCM callback, Axis);
   bool has_extent_callback_b (SCM, Axis)const;  
   void set_extent (SCM , Axis);
-
-  
-  /**
-    Invoke callbacks to get offset relative to parent.
-   */
   Real get_offset (Axis a) const;
-  /**
-     Set the  parent refpoint of THIS to E
-   */
+  
   void set_parent (Grob* e, Axis);
   
   Grob *get_parent (Axis a) const {   return  dim_cache_[a].parent_l_; }
@@ -184,5 +159,8 @@ 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);
 
+void set_break_subsititution (SCM criterion);
+SCM do_break_substitution (SCM);
+
 #endif // STAFFELEM_HH