From f42bd0266d2cd702d061573e540e8965f966328b Mon Sep 17 00:00:00 2001 From: Joe Neeman Date: Sat, 26 Apr 2008 09:48:18 +1000 Subject: [PATCH] Fix 605. Add a cross-staff property to Fingering. --- lily/side-position-interface.cc | 5 +++++ scm/define-grobs.scm | 1 + 2 files changed, 6 insertions(+) diff --git a/lily/side-position-interface.cc b/lily/side-position-interface.cc index c1b848bfce..73da30e9e3 100644 --- a/lily/side-position-interface.cc +++ b/lily/side-position-interface.cc @@ -218,6 +218,10 @@ Side_position_interface::calc_cross_staff (SCM smob) Grob *me = unsmob_grob (smob); extract_grob_set (me, "side-support-elements", elts); + for (vsize i = 0; i < elts.size (); i++) + if (to_boolean (elts[i]->get_property ("cross-staff"))) + return SCM_BOOL_T; + Grob *common = common_refpoint_of_array (elts, me->get_parent (Y_AXIS), Y_AXIS); return scm_from_bool (common != me->get_parent (Y_AXIS)); } @@ -290,6 +294,7 @@ Side_position_interface::set_axis (Grob *me, Axis a) a); } } + Axis Side_position_interface::get_axis (Grob *me) { diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm index d81c37d3c9..f75e454de0 100644 --- a/scm/define-grobs.scm +++ b/scm/define-grobs.scm @@ -702,6 +702,7 @@ (stencil . ,ly:text-interface::print) (direction . ,ly:script-interface::calc-direction) (positioning-done . ,ly:script-interface::calc-positioning-done) + (cross-staff . ,ly:side-position-interface::calc-cross-staff) (text . ,fingering::calc-text) (font-encoding . fetaNumber) -- 2.39.2