From 58ff15e68c0d00ee54ca9f5565d6bc3c8304c076 Mon Sep 17 00:00:00 2001 From: Joe Neeman Date: Sun, 24 Oct 2010 19:30:29 -0700 Subject: [PATCH] Clean up the Align_interface API. --- lily/align-interface.cc | 38 +++++++++++++++++++++++++++------ lily/include/align-interface.hh | 17 ++++++++++----- lily/page-layout-problem.cc | 3 +-- lily/system.cc | 4 ++-- 4 files changed, 46 insertions(+), 16 deletions(-) diff --git a/lily/align-interface.cc b/lily/align-interface.cc index d985a869c5..44b3fc7085 100644 --- a/lily/align-interface.cc +++ b/lily/align-interface.cc @@ -143,6 +143,30 @@ get_skylines (Grob *me, reverse (*ret); } +vector +Align_interface::get_minimum_translations (Grob *me, + vector const &all_grobs, + Axis a) +{ + return internal_get_minimum_translations (me, all_grobs, a, true, false, 0, 0); +} + +vector +Align_interface::get_pure_minimum_translations (Grob *me, + vector const &all_grobs, + Axis a, int start, int end) +{ + return internal_get_minimum_translations (me, all_grobs, a, true, true, start, end); +} + +vector +Align_interface::get_minimum_translations_without_min_dist (Grob *me, + vector const &all_grobs, + Axis a) +{ + return internal_get_minimum_translations (me, all_grobs, a, false, false, 0, 0); +} + // If include_fixed_spacing is true, the manually fixed spacings // induced by stretchable=0 or alignment-distances are included // in the minimum translations here. If you want to find the minimum @@ -150,11 +174,11 @@ get_skylines (Grob *me, // want to actually lay out the page, then it should be false (or // else centered dynamics will break when there is a fixed alignment). vector -Align_interface::get_minimum_translations (Grob *me, - vector const &all_grobs, - Axis a, - bool include_fixed_spacing, - bool pure, int start, int end) +Align_interface::internal_get_minimum_translations (Grob *me, + vector const &all_grobs, + Axis a, + bool include_fixed_spacing, + bool pure, int start, int end) { if (!pure && a == Y_AXIS && dynamic_cast (me) && !me->get_system ()) me->programming_error ("vertical alignment called before line-breaking"); @@ -270,7 +294,7 @@ Align_interface::align_elements_to_minimum_distances (Grob *me, Axis a) { extract_grob_set (me, "elements", all_grobs); - vector translates = get_minimum_translations (me, all_grobs, a, true, false, 0, 0); + vector translates = get_minimum_translations (me, all_grobs, a); if (translates.size ()) for (vsize j = 0; j < all_grobs.size (); j++) all_grobs[j]->translate_axis (translates[j], a); @@ -280,7 +304,7 @@ Real Align_interface::get_pure_child_y_translation (Grob *me, Grob *ch, int start, int end) { extract_grob_set (me, "elements", all_grobs); - vector translates = get_minimum_translations (me, all_grobs, Y_AXIS, true, true, start, end); + vector translates = get_pure_minimum_translations (me, all_grobs, Y_AXIS, start, end); if (translates.size ()) { diff --git a/lily/include/align-interface.hh b/lily/include/align-interface.hh index 3cc04272a8..45963a7a00 100644 --- a/lily/include/align-interface.hh +++ b/lily/include/align-interface.hh @@ -24,16 +24,17 @@ #include "std-vector.hh" #include "grob-interface.hh" -struct Align_interface +class Align_interface { +public: DECLARE_SCHEME_CALLBACK (align_to_minimum_distances, (SCM)); DECLARE_SCHEME_CALLBACK (align_to_ideal_distances, (SCM)); static void align_elements_to_minimum_distances(Grob *, Axis a); static void align_elements_to_ideal_distances(Grob *); - static vector get_minimum_translations (Grob *, vector const&, - Axis a, - bool include_fixed_spacing, - bool pure, int start, int end); + static vector get_minimum_translations (Grob *, vector const&, Axis a); + static vector get_minimum_translations_without_min_dist (Grob *, vector const&, Axis a); + static vector get_pure_minimum_translations (Grob *, vector const&, + Axis a, int start, int end); static void set_ordered (Grob *); static Axis axis (Grob *); static void add_element (Grob *, Grob *); @@ -42,6 +43,12 @@ struct Align_interface DECLARE_GROB_INTERFACE(); static Real get_pure_child_y_translation (Grob *, Grob *child, int start, int end); + +protected: + static vector internal_get_minimum_translations (Grob *, vector const&, + Axis a, + bool include_fixed_spacing, + bool pure, int start, int end); }; #endif /* ALIGN_INTERFACE_HH */ diff --git a/lily/page-layout-problem.cc b/lily/page-layout-problem.cc index 7292126ddc..d285999672 100644 --- a/lily/page-layout-problem.cc +++ b/lily/page-layout-problem.cc @@ -190,8 +190,7 @@ Page_layout_problem::append_system (System *sys, Spring const& spring, Real padd extract_grob_set (align, "elements", all_elts); vector elts = filter_dead_elements (all_elts); - vector minimum_offsets = Align_interface::get_minimum_translations (align, elts, Y_AXIS, false, - false, 0, 0); + vector minimum_offsets = Align_interface::get_minimum_translations_without_min_dist (align, elts, Y_AXIS); Skyline up_skyline (UP); Skyline down_skyline (DOWN); diff --git a/lily/system.cc b/lily/system.cc index dd3a46011f..9e33cc52b8 100644 --- a/lily/system.cc +++ b/lily/system.cc @@ -581,7 +581,7 @@ System::pure_refpoint_extent (vsize start, vsize end) return Interval (); extract_grob_set (alignment, "elements", staves); - vector offsets = Align_interface::get_minimum_translations (alignment, staves, Y_AXIS, true, true, start, end); + vector offsets = Align_interface::get_pure_minimum_translations (alignment, staves, Y_AXIS, start, end); for (vsize i = 0; i < offsets.size (); ++i) if (Page_layout_problem::is_spaceable (staves[i])) @@ -608,7 +608,7 @@ System::part_of_line_pure_height (vsize start, vsize end, bool begin) return Interval (); extract_grob_set (alignment, "elements", staves); - vector offsets = Align_interface::get_minimum_translations (alignment, staves, Y_AXIS, true, true, start, end); + vector offsets = Align_interface::get_pure_minimum_translations (alignment, staves, Y_AXIS, start, end); Interval ret; for (vsize i = 0; i < staves.size (); ++i) -- 2.39.2