X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fgrob.hh;h=a98b19a9f6ea4098041e3468eeaf270f6762d758;hb=4256f121bdbb6310cbb7162f1d38632dfec11519;hp=09cd566ad335b39708990d05ab74894ff2099af1;hpb=e98a84d3adfccbce3792b1176c937cc23589e669;p=lilypond.git diff --git a/lily/include/grob.hh b/lily/include/grob.hh index 09cd566ad3..a98b19a9f6 100644 --- a/lily/include/grob.hh +++ b/lily/include/grob.hh @@ -71,10 +71,12 @@ public: DECLARE_SCHEME_CALLBACK (y_parent_positioning, (SCM)); DECLARE_SCHEME_CALLBACK (stencil_height, (SCM smob)); DECLARE_SCHEME_CALLBACK (stencil_width, (SCM smob)); - DECLARE_SCHEME_CALLBACK (simple_vertical_skylines_from_stencil, (SCM smob)); + DECLARE_SCHEME_CALLBACK (pure_simple_vertical_skylines_from_extents, (SCM smob, SCM, SCM)); + DECLARE_SCHEME_CALLBACK (simple_vertical_skylines_from_extents, (SCM smob)); DECLARE_SCHEME_CALLBACK (vertical_skylines_from_stencil, (SCM smob)); DECLARE_SCHEME_CALLBACK (vertical_skylines_from_element_stencils, (SCM smob)); - DECLARE_SCHEME_CALLBACK (simple_horizontal_skylines_from_stencil, (SCM smob)); + DECLARE_SCHEME_CALLBACK (pure_simple_horizontal_skylines_from_extents, (SCM smob, SCM, SCM)); + DECLARE_SCHEME_CALLBACK (simple_horizontal_skylines_from_extents, (SCM smob)); DECLARE_SCHEME_CALLBACK (horizontal_skylines_from_stencil, (SCM smob)); DECLARE_SCHEME_CALLBACK (horizontal_skylines_from_element_stencils, (SCM smob)); @@ -161,7 +163,7 @@ public: virtual bool pure_is_visible (int start, int end) const; bool check_cross_staff (Grob *common); static bool less (Grob *g1, Grob *g2); - static SCM internal_simple_skylines_from_stencil (SCM, Axis); + static SCM maybe_pure_internal_simple_skylines_from_extents (Grob *, Axis, bool, int, int, bool, bool); static SCM internal_skylines_from_element_stencils (SCM, Axis); };