From e8b7d01a24772a60b20e300209eb5be96ea0a895 Mon Sep 17 00:00:00 2001 From: Carl Sorensen Date: Fri, 4 Dec 2009 08:04:43 -0700 Subject: [PATCH] 787 -- refactor script-column.cc for more transparency --- input/regression/script-stack-order.ly | 5 +- lily/script-column.cc | 72 +++++++++++--------------- 2 files changed, 34 insertions(+), 43 deletions(-) diff --git a/input/regression/script-stack-order.ly b/input/regression/script-stack-order.ly index 8e400557b3..be242eb8d2 100644 --- a/input/regression/script-stack-order.ly +++ b/input/regression/script-stack-order.ly @@ -9,4 +9,7 @@ order determines the order. Objects specified first are closest to the note. \layout { ragged-right = ##t} -\relative c'' { c4^"up 1"^"up 2"^"up 3"_"down 1"_"down 2"_"down 3" c c c} +\relative c'' { + c4^"up 1"^"up 2"^"up 3"_"down 1"_"down 2"_"down 3" c c c + c4^"1"^"2"\turn c\turn ^"1"^"2" c c +} diff --git a/lily/script-column.cc b/lily/script-column.cc index 25287a79e8..460d8fdf2f 100644 --- a/lily/script-column.cc +++ b/lily/script-column.cc @@ -139,51 +139,39 @@ Script_column::order_grobs (vector grobs) SCM ss = scm_reverse_x (scripts_drul[d], SCM_EOL); ss = scm_stable_sort_x (ss, ly_grob_script_priority_less_proc); - Grob *last = 0; - Grob *first = 0; - SCM default_outside_staff = scm_from_double (0); - // script_column may have no entries - if (scm_is_pair (ss)) - { - first = unsmob_grob (scm_car (ss)); - default_outside_staff = first->get_property ("outside-staff-priority"); - } - for (SCM s = ss; scm_is_pair (s); s = scm_cdr (s)) + Grob *g = 0; // current grob in list + Grob *last = 0; // previous grob in list + SCM initial_outside_staff = SCM_EOL; // initial outside_staff_priority of current grob + SCM last_initial_outside_staff = SCM_EOL; // initial outside_staff_priority of previous grob + + // loop over all grobs in script column (already sorted by script_priority) + for (SCM s = ss; scm_is_pair (s); + s = scm_cdr (s), last = g, last_initial_outside_staff = initial_outside_staff) { - Grob *g = unsmob_grob (scm_car (s)); - if (last) - { + g = unsmob_grob (scm_car (s)); + initial_outside_staff = g->get_property ("outside-staff-priority"); + if (last) //not the first grob in the list + { SCM last_outside_staff = last->get_property ("outside-staff-priority"); - if (scm_is_number (last_outside_staff)) - { - /* - we allow the outside-staff-priority ordering to override the - script-priority ordering; we must set new - outside-staff-priority if outside-staff-priority is - missing or equal to last - */ - SCM g_outside_staff = g->get_property ("outside-staff-priority"); - if (!scm_is_number (g_outside_staff)) - g->set_property ("outside-staff-priority", - scm_from_double ( - scm_to_double (last_outside_staff) + 0.1)); - else if (fabs (scm_to_double (g_outside_staff) - - robust_scm2double (default_outside_staff, 0)) < 0.001) - { - SCM last_script = last->get_property ("script-priority"); - SCM g_script = g->get_property ("script-priority"); - g->set_property ( - "outside-staff-priority", - scm_from_double (scm_to_double (last_outside_staff) + - scm_to_double (g_script) - - scm_to_double (last_script))); - } - default_outside_staff = g_outside_staff; - } - else + /* + if outside_staff_priority is missing for previous grob, just + use it as a support for the current grob + */ + if (!scm_is_number (last_outside_staff)) Side_position_interface::add_support (g, last); + /* + if outside_staff_priority is missing or is equal to original + outside_staff_priority of previous grob, set new + outside_staff_priority to just higher than outside_staff_priority + of previous grob in order to preserve ordering. + */ + else if ((!scm_is_number (initial_outside_staff)) || + (fabs (scm_to_double (initial_outside_staff) - + robust_scm2double (last_initial_outside_staff, 0)) < 0.001)) + g->set_property ("outside-staff-priority", + scm_from_double ( + scm_to_double (last_outside_staff) + 0.1)); } - last = g; } } while (flip (&d) != DOWN); @@ -191,7 +179,7 @@ Script_column::order_grobs (vector grobs) ADD_INTERFACE (Script_column, "An interface that sorts scripts according to their" - " @code{script-priority}.", + " @code{script-priority} and @code{outside-staff-priority}.", /* properties */ "" -- 2.39.5