| OLD | NEW |
|---|
| 1 /* | 1 /* |
| 2 This file is part of LilyPond, the GNU music typesetter. | 2 This file is part of LilyPond, the GNU music typesetter. |
| 3 | 3 |
| 4 Copyright (C) 2000--2012 Han-Wen Nienhuys <hanwen@xs4all.nl> | 4 Copyright (C) 2000--2012 Han-Wen Nienhuys <hanwen@xs4all.nl> |
| 5 | 5 |
| 6 LilyPond is free software: you can redistribute it and/or modify | 6 LilyPond is free software: you can redistribute it and/or modify |
| 7 it under the terms of the GNU General Public License as published by | 7 it under the terms of the GNU General Public License as published by |
| 8 the Free Software Foundation, either version 3 of the License, or | 8 the Free Software Foundation, either version 3 of the License, or |
| 9 (at your option) any later version. | 9 (at your option) any later version. |
| 10 | 10 |
| (...skipping 26 matching lines...) Expand all Loading... |
| 37 DECLARE_SCHEME_CALLBACK (cross_staff, (SCM smob)); | 37 DECLARE_SCHEME_CALLBACK (cross_staff, (SCM smob)); |
| 38 DECLARE_SCHEME_CALLBACK (width, (SCM smob)); | 38 DECLARE_SCHEME_CALLBACK (width, (SCM smob)); |
| 39 DECLARE_SCHEME_CALLBACK (calc_x_common, (SCM smob)); | 39 DECLARE_SCHEME_CALLBACK (calc_x_common, (SCM smob)); |
| 40 DECLARE_SCHEME_CALLBACK (calc_y_common, (SCM smob)); | 40 DECLARE_SCHEME_CALLBACK (calc_y_common, (SCM smob)); |
| 41 DECLARE_SCHEME_CALLBACK (height, (SCM smob)); | 41 DECLARE_SCHEME_CALLBACK (height, (SCM smob)); |
| 42 DECLARE_SCHEME_CALLBACK (pure_height, (SCM smob, SCM start, SCM end)); | 42 DECLARE_SCHEME_CALLBACK (pure_height, (SCM smob, SCM start, SCM end)); |
| 43 DECLARE_SCHEME_CALLBACK (calc_skylines, (SCM smob)); | 43 DECLARE_SCHEME_CALLBACK (calc_skylines, (SCM smob)); |
| 44 DECLARE_SCHEME_CALLBACK (combine_skylines, (SCM smob)); | 44 DECLARE_SCHEME_CALLBACK (combine_skylines, (SCM smob)); |
| 45 DECLARE_SCHEME_CALLBACK (print, (SCM smob)); | 45 DECLARE_SCHEME_CALLBACK (print, (SCM smob)); |
| 46 DECLARE_SCHEME_CALLBACK (adjacent_pure_heights, (SCM)); | 46 DECLARE_SCHEME_CALLBACK (adjacent_pure_heights, (SCM)); |
| 47 DECLARE_SCHEME_CALLBACK (vertical_skyline_elements, (SCM)); |
| 48 DECLARE_SCHEME_CALLBACK (calc_inside_staff_skylines, (SCM)); |
| 47 DECLARE_SCHEME_CALLBACK (calc_staff_staff_spacing, (SCM)); | 49 DECLARE_SCHEME_CALLBACK (calc_staff_staff_spacing, (SCM)); |
| 48 DECLARE_SCHEME_CALLBACK (calc_pure_staff_staff_spacing, (SCM, SCM, SCM)); | 50 DECLARE_SCHEME_CALLBACK (calc_pure_staff_staff_spacing, (SCM, SCM, SCM)); |
| 49 DECLARE_SCHEME_CALLBACK (calc_pure_relevant_grobs, (SCM)); | 51 DECLARE_SCHEME_CALLBACK (calc_pure_relevant_grobs, (SCM)); |
| 50 DECLARE_SCHEME_CALLBACK (calc_pure_relevant_items, (SCM)); | 52 DECLARE_SCHEME_CALLBACK (calc_pure_relevant_items, (SCM)); |
| 51 DECLARE_SCHEME_CALLBACK (calc_pure_relevant_spanners, (SCM)); | 53 DECLARE_SCHEME_CALLBACK (calc_pure_relevant_spanners, (SCM)); |
| 52 DECLARE_SCHEME_CALLBACK (calc_pure_y_common, (SCM)); | 54 DECLARE_SCHEME_CALLBACK (calc_pure_y_common, (SCM)); |
| 53 static SCM internal_calc_pure_relevant_grobs (Grob *, string); | 55 static SCM internal_calc_pure_relevant_grobs (Grob *, string); |
| 54 static Interval relative_group_extent (vector<Grob *> const &list, | 56 static Interval relative_group_extent (vector<Grob *> const &list, |
| 55 Grob *common, Axis); | 57 Grob *common, Axis); |
| 56 static Interval relative_maybe_bound_group_extent (vector<Grob *> const &list, | 58 static Interval relative_maybe_bound_group_extent (vector<Grob *> const &list, |
| 57 Grob *common, Axis, bool); | 59 Grob *common, Axis, bool); |
| 58 static Interval relative_pure_height (Grob *me, int start, int end); | 60 static Interval relative_pure_height (Grob *me, int start, int end); |
| 59 static Interval combine_pure_heights (Grob *me, SCM, int, int); | 61 static Interval combine_pure_heights (Grob *me, SCM, int, int); |
| 60 static Interval sum_partial_pure_heights (Grob *me, int, int); | 62 static Interval sum_partial_pure_heights (Grob *me, int, int); |
| 61 static Interval begin_of_line_pure_height (Grob *me, int); | 63 static Interval begin_of_line_pure_height (Grob *me, int); |
| 62 static Interval rest_of_line_pure_height (Grob *me, int, int); | 64 static Interval rest_of_line_pure_height (Grob *me, int, int); |
| 63 static Interval part_of_line_pure_height (Grob *me, bool begin, int, int); | 65 static Interval part_of_line_pure_height (Grob *me, bool begin, int, int); |
| 64 | 66 |
| 67 static bool pure_staff_priority_less (Grob *const &g1, Grob *const &g2); |
| 68 static bool staff_priority_less (Grob *const &g1, Grob *const &g2); |
| 65 static Grob *outside_staff_ancestor (Grob *me); | 69 static Grob *outside_staff_ancestor (Grob *me); |
| 66 static Skyline_pair skyline_spacing (Grob *me); | 70 static Skyline_pair skyline_spacing (Grob *me); |
| 67 static void add_element (Grob *me, Grob *); | 71 static void add_element (Grob *me, Grob *); |
| 68 static void set_axes (Grob *, Axis, Axis); | 72 static void set_axes (Grob *, Axis, Axis); |
| 69 static bool has_axis (Grob *, Axis); | 73 static bool has_axis (Grob *, Axis); |
| 70 static void get_children (Grob *, vector<Grob *> *); | 74 static void get_children (Grob *, vector<Grob *> *); |
| 75 static void prepare_for_outside_staff_calculations (Grob *me); |
| 71 static Interval staff_extent (Grob *me, Grob *ref, Axis, Grob *staff, Axis); | 76 static Interval staff_extent (Grob *me, Grob *ref, Axis, Grob *staff, Axis); |
| 72 static SCM calc_common (Grob *, Axis); | 77 static SCM calc_common (Grob *, Axis); |
| 73 static Real minimum_distance (Grob *, Grob *, Axis); | 78 static Real minimum_distance (Grob *, Grob *, Axis); |
| 74 static SCM calc_maybe_pure_staff_staff_spacing (Grob *, bool, int, int); | 79 static SCM calc_maybe_pure_staff_staff_spacing (Grob *, bool, int, int); |
| 75 DECLARE_GROB_INTERFACE (); | 80 DECLARE_GROB_INTERFACE (); |
| 76 }; | 81 }; |
| 77 | 82 |
| 78 #endif /* AXIS_GROUP_INTERFACE_HH */ | 83 #endif /* AXIS_GROUP_INTERFACE_HH */ |
| 79 | 84 |
| OLD | NEW |
|---|
