X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fgrob.hh;h=66cc0530b73a0221f8f74cb93489bea5c80e0737;hb=36b9825a04fd050c1de107b5d68db3c13916fe33;hp=d134068568b6810e271203eb1d7b7fac1749a572;hpb=d2300573cae3c1920400d040faddd33f17b43c2d;p=lilypond.git diff --git a/lily/include/grob.hh b/lily/include/grob.hh index d134068568..66cc0530b7 100644 --- a/lily/include/grob.hh +++ b/lily/include/grob.hh @@ -3,7 +3,7 @@ source file of the LilyPond music typesetter - (c) 1996--2007 Han-Wen Nienhuys + (c) 1996--2009 Han-Wen Nienhuys */ #ifndef GROB_HH @@ -84,6 +84,7 @@ public: SCM internal_get_object (SCM symbol) const; void internal_set_object (SCM sym, SCM val); void internal_del_property (SCM symbol); + void instrumented_set_property (SCM, SCM, char const*, int, char const*); void internal_set_property (SCM sym, SCM val); /* messages */ @@ -117,7 +118,7 @@ public: /* extents */ Interval extent (Grob *refpoint, Axis) const; void flush_extent_cache (Axis); - Interval pure_height (Grob *refpoint, int start_col, int end_col); + virtual Interval pure_height (Grob *refpoint, int start_col, int end_col); Interval maybe_pure_extent (Grob *refpoint, Axis, bool pure, int start, int end); /* refpoints */ @@ -126,7 +127,7 @@ public: Grob *get_parent (Axis a) const; void fixup_refpoint (); - virtual Interval_t spanned_rank_iv () const; + virtual Interval_t spanned_rank_interval () const; }; /* smob utilities */ @@ -145,6 +146,7 @@ Interval robust_relative_extent (Grob *, Grob *, Axis); /* offset/extent callbacks. */ void add_offset_callback (Grob *g, SCM proc, Axis a); void chain_offset_callback (Grob *g, SCM proc, Axis a); +void chain_callback (Grob *g, SCM proc, SCM sym); SCM axis_offset_symbol (Axis a); SCM axis_parent_positioning (Axis a); @@ -152,5 +154,4 @@ SCM call_pure_function (SCM unpure, SCM args, int start, int end); void set_nested_property (Grob *, SCM property_path, SCM value); - #endif /* GROB_HH */