X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fside-position-interface.hh;h=c0330e795d1497bf5c4ecbb1b24bdcf25a7751c6;hb=a2db8f6cfb8bcb2438796450e16c39c47c92dbc1;hp=b8179eec7fbc6341f082e64465de02644bdc169c;hpb=bb8aa1aed52c49e6e3de8c6c70a876598b11b4a8;p=lilypond.git diff --git a/lily/include/side-position-interface.hh b/lily/include/side-position-interface.hh index b8179eec7f..c0330e795d 100644 --- a/lily/include/side-position-interface.hh +++ b/lily/include/side-position-interface.hh @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 1999--2011 Han-Wen Nienhuys + Copyright (C) 1999--2015 Han-Wen Nienhuys LilyPond is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -32,8 +32,6 @@ struct Side_position_interface { public: - DECLARE_SCHEME_CALLBACK (y_aligned_on_support_refpoints, (SCM element)); - DECLARE_SCHEME_CALLBACK (pure_y_aligned_on_support_refpoints, (SCM element, SCM start, SCM end)); DECLARE_SCHEME_CALLBACK (x_aligned_side, (SCM element, SCM current)); DECLARE_SCHEME_CALLBACK (y_aligned_side, (SCM element, SCM current)); DECLARE_SCHEME_CALLBACK (pure_y_aligned_side, (SCM element, SCM start, SCM end, SCM current)); @@ -42,14 +40,10 @@ public: static SCM aligned_side (Grob *me, Axis a, bool pure, int start, int end, Real *current_off_ptr); - static SCM general_side_position (Grob *, Axis, bool, bool my_extents, - bool pure, int start, int end, Real *current_off); - static SCM skyline_side_position (Grob *me, Axis a, bool pure, int start, int end, Real *current_offset); - static Axis get_axis (Grob *); static void set_axis (Grob *, Axis); - DECLARE_GROB_INTERFACE (); static void add_support (Grob *, Grob *); + static void recursive_add_support (Grob *, Grob *); static void add_staff_support (Grob *); };