From aa8c7a60ad274050c3bc8cc797d6af6eed47bd86 Mon Sep 17 00:00:00 2001 From: Joe Neeman Date: Sun, 27 Jun 2010 21:53:32 +0300 Subject: [PATCH] Use object callbacks for pure-height caching. --- lily/axis-group-interface.cc | 119 ++++++++++++++++++--------- lily/include/axis-group-interface.hh | 5 +- lily/span-bar.cc | 4 + lily/system.cc | 1 + scm/define-grob-properties.scm | 2 + scm/define-grobs.scm | 75 ++++++++++++++++- 6 files changed, 166 insertions(+), 40 deletions(-) diff --git a/lily/axis-group-interface.cc b/lily/axis-group-interface.cc index 262f387ada..578549a3d4 100644 --- a/lily/axis-group-interface.cc +++ b/lily/axis-group-interface.cc @@ -153,7 +153,7 @@ Axis_group_interface::adjacent_pure_heights (SCM smob) { Grob *me = unsmob_grob (smob); - Grob *common = calc_pure_elts_and_common (me); + Grob *common = unsmob_grob (me->get_object ("pure-Y-common")); extract_grob_set (me, "pure-relevant-items", items); extract_grob_set (me, "pure-relevant-spanners", spanners); @@ -169,6 +169,7 @@ Axis_group_interface::adjacent_pure_heights (SCM smob) { int start = Paper_column::get_rank (cols[breaks[i]]); int end = Paper_column::get_rank (cols[breaks[i+1]]); + Interval begin_line_iv; Interval mid_line_iv; @@ -228,7 +229,7 @@ Axis_group_interface::relative_pure_height (Grob *me, int start, int end) if (p && Align_interface::has_interface (p)) return Axis_group_interface::cached_pure_height (me, start, end); - Grob *common = calc_pure_elts_and_common (me); + Grob *common = unsmob_grob (me->get_object ("pure-Y-common")); extract_grob_set (me, "pure-relevant-items", items); extract_grob_set (me, "pure-relevant-spanners", spanners); @@ -380,56 +381,94 @@ Axis_group_interface::staff_extent (Grob *me, Grob *refp, Axis ext_a, Grob *staf } -Grob * -Axis_group_interface::calc_pure_elts_and_common (Grob *me) +MAKE_SCHEME_CALLBACK (Axis_group_interface, calc_pure_relevant_grobs, 1); +SCM +Axis_group_interface::calc_pure_relevant_grobs (SCM smob) { - if (Grob *c = unsmob_grob (me->get_object ("pure-Y-common"))) - return c; + Grob *me = unsmob_grob (smob); extract_grob_set (me, "elements", elts); - vector relevant_items; - vector relevant_spanners; + vector relevant_grobs; SCM pure_relevant_p = ly_lily_module_constant ("pure-relevant?"); for (vsize i = 0; i < elts.size (); i++) { if (to_boolean (scm_apply_1 (pure_relevant_p, elts[i]->self_scm (), SCM_EOL))) + relevant_grobs.push_back (elts[i]); + + if (Item *it = dynamic_cast (elts[i])) { - if (dynamic_cast (elts[i])) - relevant_items.push_back (elts[i]); - else if (dynamic_cast (elts[i])) - relevant_spanners.push_back (elts[i]); + Direction d = LEFT; + do + { + Item *piece = it->find_prebroken_piece (d); + if (piece && to_boolean (scm_apply_1 (pure_relevant_p, piece->self_scm (), SCM_EOL))) + relevant_grobs.push_back (piece); + } + while (flip (&d) != LEFT); } - - - Item *it = dynamic_cast (elts[i]); - Direction d = LEFT; - if (it) - do - { - Item *piece = it->find_prebroken_piece (d); - if (piece && to_boolean (scm_apply_1 (pure_relevant_p, piece->self_scm (), SCM_EOL))) - relevant_items.push_back (piece); - } - while (flip (&d) != LEFT); } - vector_sort (relevant_items, Item::less); - Grob *common = common_refpoint_of_array (relevant_items, me, Y_AXIS); - common = common_refpoint_of_array (relevant_spanners, common, Y_AXIS); + SCM grobs_scm = Grob_array::make_array (); + unsmob_grob_array (grobs_scm)->set_array (relevant_grobs); - me->set_object ("pure-Y-common", common->self_scm ()); - - SCM items_scm = Grob_array::make_array (); - SCM spanners_scm = Grob_array::make_array (); + return grobs_scm; +} +MAKE_SCHEME_CALLBACK (Axis_group_interface, calc_pure_relevant_items, 1); +SCM +Axis_group_interface::calc_pure_relevant_items (SCM smob) +{ + Grob *me = unsmob_grob (smob); + + extract_grob_set (me, "pure-relevant-grobs", elts); + + vector relevant_items; + for (vsize i = 0; i < elts.size (); i++) + if (Item *it = dynamic_cast (elts[i])) + relevant_items.push_back (it); + + vector_sort (relevant_items, Item::less); + + SCM items_scm = Grob_array::make_array (); unsmob_grob_array (items_scm)->set_array (relevant_items); + return items_scm; +} + +MAKE_SCHEME_CALLBACK (Axis_group_interface, calc_pure_relevant_spanners, 1); +SCM +Axis_group_interface::calc_pure_relevant_spanners (SCM smob) +{ + Grob *me = unsmob_grob (smob); + + extract_grob_set (me, "pure-relevant-grobs", elts); + + vector relevant_spanners; + for (vsize i = 0; i < elts.size (); i++) + if (dynamic_cast (elts[i])) + relevant_spanners.push_back (elts[i]); + + SCM spanners_scm = Grob_array::make_array (); unsmob_grob_array (spanners_scm)->set_array (relevant_spanners); - me->set_object ("pure-relevant-items", items_scm); - me->set_object ("pure-relevant-spanners", spanners_scm); + return spanners_scm; +} + +MAKE_SCHEME_CALLBACK (Axis_group_interface, calc_pure_y_common, 1); +SCM +Axis_group_interface::calc_pure_y_common (SCM smob) +{ + Grob *me = unsmob_grob (smob); - return common; + extract_grob_set (me, "pure-relevant-grobs", elts); + Grob *common = common_refpoint_of_array (elts, me, Y_AXIS); + if (!common) + { + me->programming_error ("No common parent found in calc_pure_y_common."); + return SCM_EOL; + } + + return common->self_scm (); } SCM @@ -442,7 +481,7 @@ Axis_group_interface::calc_common (Grob *me, Axis axis) me->programming_error ("No common parent found in calc_common axis."); return SCM_EOL; } - + return common->self_scm (); } @@ -464,8 +503,13 @@ Axis_group_interface::calc_y_common (SCM grob) Interval Axis_group_interface::pure_group_height (Grob *me, int start, int end) { - Grob *common = calc_pure_elts_and_common (me); - + Grob *common = unsmob_grob (me->get_object ("pure-Y-common")); + + if (!common) + { + programming_error ("no pure Y common refpoint"); + return Interval (); + } Real my_coord = me->relative_coordinate (common, Y_AXIS); Interval r (relative_pure_height (me, start, end)); @@ -762,6 +806,7 @@ ADD_INTERFACE (Axis_group_interface, "next-staff-spacing " "no-alignment " "pure-Y-common " + "pure-relevant-grobs " "pure-relevant-items " "pure-relevant-spanners " "staff-affinity " diff --git a/lily/include/axis-group-interface.hh b/lily/include/axis-group-interface.hh index bfe7b8100d..bd038c7d10 100644 --- a/lily/include/axis-group-interface.hh +++ b/lily/include/axis-group-interface.hh @@ -40,6 +40,10 @@ struct Axis_group_interface DECLARE_SCHEME_CALLBACK (adjacent_pure_heights, (SCM)); DECLARE_SCHEME_CALLBACK (calc_next_staff_spacing, (SCM)); DECLARE_SCHEME_CALLBACK (calc_pure_next_staff_spacing, (SCM, SCM, SCM)); + DECLARE_SCHEME_CALLBACK (calc_pure_relevant_grobs, (SCM)); + DECLARE_SCHEME_CALLBACK (calc_pure_relevant_items, (SCM)); + DECLARE_SCHEME_CALLBACK (calc_pure_relevant_spanners, (SCM)); + DECLARE_SCHEME_CALLBACK (calc_pure_y_common, (SCM)); static Interval relative_group_extent (vector const &list, Grob *common, Axis); static Interval relative_pure_height (Grob *me, int start, int end); @@ -48,7 +52,6 @@ struct Axis_group_interface static Interval begin_of_line_pure_height (Grob *me, int); static Interval rest_of_line_pure_height (Grob *me, int, int); - static Grob *calc_pure_elts_and_common (Grob*); static Skyline_pair skyline_spacing (Grob *me, vector elements); static void add_element (Grob *me, Grob *); static void set_axes (Grob *, Axis, Axis); diff --git a/lily/span-bar.cc b/lily/span-bar.cc index 36590c30a5..897acf0b31 100644 --- a/lily/span-bar.cc +++ b/lily/span-bar.cc @@ -244,5 +244,9 @@ ADD_INTERFACE (Span_bar, /* properties */ "glyph-name " "elements " + "pure-Y-common " + "pure-relevant-grobs " + "pure-relevant-items " + "pure-relevant-spanners " ); diff --git a/lily/system.cc b/lily/system.cc index f938b8322e..e440bed35e 100644 --- a/lily/system.cc +++ b/lily/system.cc @@ -592,6 +592,7 @@ System::part_of_line_pure_height (vsize start, vsize end, bool begin) iv.translate (offsets[i]); ret.unite (iv); } + return ret; } diff --git a/scm/define-grob-properties.scm b/scm/define-grob-properties.scm index 1ab45629ff..f66884edd0 100644 --- a/scm/define-grob-properties.scm +++ b/scm/define-grob-properties.scm @@ -951,6 +951,8 @@ for this column.") (note-heads ,ly:grob-array? "An array of note head grobs.") (pedal-text ,ly:grob? "A pointer to the text of a mixed-style piano pedal.") + (pure-relevant-grobs ,ly:grob-array? "All the grobs (items and spanners) +that are relevant for finding the @code{pure-Y-extent}") (pure-relevant-items ,ly:grob-array? "A subset of elements that are relevant for finding the @code{pure-Y-extent}.") (pure-relevant-spanners ,ly:grob-array? "A subset of elements that are diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm index a76dd31655..8ae81d7f65 100644 --- a/scm/define-grobs.scm +++ b/scm/define-grobs.scm @@ -111,6 +111,10 @@ (X-extent . ,ly:axis-group-interface::width) (Y-extent . ,ly:axis-group-interface::height) (meta . ((class . Item) + (object-callbacks . ((pure-Y-common . ,ly:axis-group-interface::calc-pure-y-common) + (pure-relevant-grobs . ,ly:axis-group-interface::calc-pure-relevant-grobs) + (pure-relevant-items . ,ly:axis-group-interface::calc-pure-relevant-items) + (pure-relevant-spanners . ,ly:axis-group-interface::calc-pure-relevant-spanners))) (interfaces . (ambitus-interface axis-group-interface break-aligned-interface)))))) @@ -270,6 +274,10 @@ (stacking-dir . ,DOWN) (Y-extent . ,ly:axis-group-interface::height) (meta . ((class . Spanner) + (object-callbacks . ((pure-Y-common . ,ly:axis-group-interface::calc-pure-y-common) + (pure-relevant-grobs . ,ly:axis-group-interface::calc-pure-relevant-grobs) + (pure-relevant-items . ,ly:axis-group-interface::calc-pure-relevant-items) + (pure-relevant-spanners . ,ly:axis-group-interface::calc-pure-relevant-spanners))) (interfaces . (align-interface axis-group-interface bass-figure-alignment-interface)))))) @@ -284,6 +292,10 @@ (Y-extent . ,ly:axis-group-interface::height) (Y-offset . ,ly:side-position-interface::y-aligned-side) (meta . ((class . Spanner) + (object-callbacks . ((pure-Y-common . ,ly:axis-group-interface::calc-pure-y-common) + (pure-relevant-grobs . ,ly:axis-group-interface::calc-pure-relevant-grobs) + (pure-relevant-items . ,ly:axis-group-interface::calc-pure-relevant-items) + (pure-relevant-spanners . ,ly:axis-group-interface::calc-pure-relevant-spanners))) (interfaces . (axis-group-interface side-position-interface)))))) @@ -309,6 +321,10 @@ (vertical-skylines . ,ly:axis-group-interface::calc-skylines) (Y-extent . ,ly:axis-group-interface::height) (meta . ((class . Spanner) + (object-callbacks . ((pure-Y-common . ,ly:axis-group-interface::calc-pure-y-common) + (pure-relevant-grobs . ,ly:axis-group-interface::calc-pure-relevant-grobs) + (pure-relevant-items . ,ly:axis-group-interface::calc-pure-relevant-items) + (pure-relevant-spanners . ,ly:axis-group-interface::calc-pure-relevant-spanners))) (interfaces . (axis-group-interface)))))) @@ -646,6 +662,10 @@ (Y-extent . ,ly:axis-group-interface::height) (Y-offset . ,ly:side-position-interface::y-aligned-side) (meta . ((class . Spanner) + (object-callbacks . ((pure-Y-common . ,ly:axis-group-interface::calc-pure-y-common) + (pure-relevant-grobs . ,ly:axis-group-interface::calc-pure-relevant-grobs) + (pure-relevant-items . ,ly:axis-group-interface::calc-pure-relevant-items) + (pure-relevant-spanners . ,ly:axis-group-interface::calc-pure-relevant-spanners))) (interfaces . (axis-group-interface dynamic-interface dynamic-line-spanner-interface @@ -1232,6 +1252,10 @@ (X-extent . ,ly:axis-group-interface::width) (meta . ((class . Paper_column) + (object-callbacks . ((pure-Y-common . ,ly:axis-group-interface::calc-pure-y-common) + (pure-relevant-grobs . ,ly:axis-group-interface::calc-pure-relevant-grobs) + (pure-relevant-items . ,ly:axis-group-interface::calc-pure-relevant-items) + (pure-relevant-spanners . ,ly:axis-group-interface::calc-pure-relevant-spanners))) (interfaces . (axis-group-interface font-interface paper-column-interface @@ -1246,6 +1270,10 @@ (X-extent . ,ly:axis-group-interface::width) (Y-extent . ,ly:axis-group-interface::height) (meta . ((class . Item) + (object-callbacks . ((pure-Y-common . ,ly:axis-group-interface::calc-pure-y-common) + (pure-relevant-grobs . ,ly:axis-group-interface::calc-pure-relevant-grobs) + (pure-relevant-items . ,ly:axis-group-interface::calc-pure-relevant-items) + (pure-relevant-spanners . ,ly:axis-group-interface::calc-pure-relevant-spanners))) (interfaces . (axis-group-interface note-collision-interface)))))) @@ -1256,6 +1284,10 @@ (X-extent . ,ly:axis-group-interface::width) (Y-extent . ,ly:axis-group-interface::height) (meta . ((class . Item) + (object-callbacks . ((pure-Y-common . ,ly:axis-group-interface::calc-pure-y-common) + (pure-relevant-grobs . ,ly:axis-group-interface::calc-pure-relevant-grobs) + (pure-relevant-items . ,ly:axis-group-interface::calc-pure-relevant-items) + (pure-relevant-spanners . ,ly:axis-group-interface::calc-pure-relevant-spanners))) (interfaces . (axis-group-interface note-column-interface separation-item-interface)))))) @@ -1356,6 +1388,10 @@ ;; debugging ;; (font-size . -6) (font-name . "sans") (Y-extent . #f) (meta . ((class . Paper_column) + (object-callbacks . ((pure-Y-common . ,ly:axis-group-interface::calc-pure-y-common) + (pure-relevant-grobs . ,ly:axis-group-interface::calc-pure-relevant-grobs) + (pure-relevant-items . ,ly:axis-group-interface::calc-pure-relevant-items) + (pure-relevant-spanners . ,ly:axis-group-interface::calc-pure-relevant-spanners))) (interfaces . (axis-group-interface font-interface paper-column-interface @@ -1604,6 +1640,10 @@ (Y-extent . ,ly:axis-group-interface::height) (Y-offset . ,ly:side-position-interface::y-aligned-side) (meta . ((class . Spanner) + (object-callbacks . ((pure-Y-common . ,ly:axis-group-interface::calc-pure-y-common) + (pure-relevant-grobs . ,ly:axis-group-interface::calc-pure-relevant-grobs) + (pure-relevant-items . ,ly:axis-group-interface::calc-pure-relevant-items) + (pure-relevant-spanners . ,ly:axis-group-interface::calc-pure-relevant-spanners))) (interfaces . (axis-group-interface piano-pedal-interface side-position-interface)))))) @@ -1645,6 +1685,10 @@ (X-extent . ,ly:span-bar::width) (Y-extent . ,ly:axis-group-interface::height) (meta . ((class . Item) + (object-callbacks . ((pure-Y-common . ,ly:axis-group-interface::calc-pure-y-common) + (pure-relevant-grobs . ,ly:axis-group-interface::calc-pure-relevant-grobs) + (pure-relevant-items . ,ly:axis-group-interface::calc-pure-relevant-items) + (pure-relevant-spanners . ,ly:axis-group-interface::calc-pure-relevant-spanners))) (interfaces . (bar-line-interface font-interface span-bar-interface)))))) @@ -1827,17 +1871,26 @@ (Y-extent . ,ly:axis-group-interface::height) (Y-offset . ,ly:side-position-interface::y-aligned-side) (meta . ((class . Spanner) + (object-callbacks . ((pure-Y-common . ,ly:axis-group-interface::calc-pure-y-common) + (pure-relevant-grobs . ,ly:axis-group-interface::calc-pure-relevant-grobs) + (pure-relevant-items . ,ly:axis-group-interface::calc-pure-relevant-items) + (pure-relevant-spanners . ,ly:axis-group-interface::calc-pure-relevant-spanners))) (interfaces . (axis-group-interface piano-pedal-interface side-position-interface)))))) (System . ( + (adjacent-pure-heights . ,ly:axis-group-interface::adjacent-pure-heights) (axes . (,X ,Y)) (vertical-skylines . ,ly:axis-group-interface::calc-skylines) (X-extent . ,ly:axis-group-interface::width) (Y-extent . ,ly:axis-group-interface::height) (meta . ((class . System) + (object-callbacks . ((pure-relevant-grobs . ,ly:axis-group-interface::calc-pure-relevant-grobs) + (pure-relevant-items . ,ly:axis-group-interface::calc-pure-relevant-items) + (pure-relevant-spanners . ,ly:axis-group-interface::calc-pure-relevant-spanners) + (pure-Y-common . ,ly:axis-group-interface::calc-pure-y-common))) (interfaces . (axis-group-interface system-interface)))))) @@ -2185,6 +2238,10 @@ (Y-extent . ,ly:axis-group-interface::height) (Y-offset . ,ly:side-position-interface::y-aligned-side) (meta . ((class . Spanner) + (object-callbacks . ((pure-Y-common . ,ly:axis-group-interface::calc-pure-y-common) + (pure-relevant-grobs . ,ly:axis-group-interface::calc-pure-relevant-grobs) + (pure-relevant-items . ,ly:axis-group-interface::calc-pure-relevant-items) + (pure-relevant-spanners . ,ly:axis-group-interface::calc-pure-relevant-spanners))) (interfaces . (axis-group-interface piano-pedal-interface side-position-interface)))))) @@ -2208,7 +2265,11 @@ (X-extent . ,ly:axis-group-interface::width) (Y-extent . ,ly:axis-group-interface::height) (meta . ((class . Spanner) - (object-callbacks . ((Y-common . ,ly:axis-group-interface::calc-y-common))) + (object-callbacks . ((Y-common . ,ly:axis-group-interface::calc-y-common) + (pure-relevant-grobs . ,ly:axis-group-interface::calc-pure-relevant-grobs) + (pure-relevant-items . ,ly:axis-group-interface::calc-pure-relevant-items) + (pure-relevant-spanners . ,ly:axis-group-interface::calc-pure-relevant-spanners) + (pure-Y-common . ,ly:axis-group-interface::calc-pure-y-common))) (interfaces . (align-interface axis-group-interface)))))) @@ -2227,7 +2288,13 @@ (Y-extent . ,ly:hara-kiri-group-spanner::y-extent) (Y-offset . ,ly:hara-kiri-group-spanner::force-hara-kiri-callback) (meta . ((class . Spanner) - (object-callbacks . ((X-common . ,ly:axis-group-interface::calc-x-common))) + (object-callbacks . ( + (X-common . ,ly:axis-group-interface::calc-x-common) + (pure-Y-common . ,ly:axis-group-interface::calc-pure-y-common) + (pure-relevant-grobs . ,ly:axis-group-interface::calc-pure-relevant-grobs) + (pure-relevant-items . ,ly:axis-group-interface::calc-pure-relevant-items) + (pure-relevant-spanners . ,ly:axis-group-interface::calc-pure-relevant-spanners))) + (interfaces . (axis-group-interface hara-kiri-group-spanner-interface vertically-spaceable-interface)))))) @@ -2285,6 +2352,10 @@ (Y-extent . ,ly:axis-group-interface::height) (Y-offset . ,ly:side-position-interface::y-aligned-side) (meta . ((class . Spanner) + (object-callbacks . ((pure-Y-common . ,ly:axis-group-interface::calc-pure-y-common) + (pure-relevant-grobs . ,ly:axis-group-interface::calc-pure-relevant-grobs) + (pure-relevant-items . ,ly:axis-group-interface::calc-pure-relevant-items) + (pure-relevant-spanners . ,ly:axis-group-interface::calc-pure-relevant-spanners))) (interfaces . (axis-group-interface side-position-interface volta-interface)))))) -- 2.39.2