X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscript-column.cc;h=ac4e9c72f01764195fb85fd9088351a1ea39541c;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=1bddead7707182d515783dab3eba12d3ab7fbb36;hpb=5d5fbb2641fda6605cde61ebcd99b9bef2e94b4a;p=lilypond.git diff --git a/lily/script-column.cc b/lily/script-column.cc index 1bddead770..ac4e9c72f0 100644 --- a/lily/script-column.cc +++ b/lily/script-column.cc @@ -1,74 +1,162 @@ -/* - script-column.cc -- implement Script_column - +/* + script-column.cc -- implement Script_column + source file of the GNU LilyPond music typesetter - - (c) 1999--2001 Han-Wen Nienhuys - - */ + + (c) 1999--2008 Han-Wen Nienhuys +*/ + #include "script-column.hh" + +#include "accidental-placement.hh" +#include "arpeggio.hh" +#include "directional-element-interface.hh" #include "side-position-interface.hh" +#include "warn.hh" +#include "grob.hh" +#include "pointer-group-interface.hh" + +#include -#include "group-interface.hh" +typedef map > Grob_scripts_map; void -Script_column::add_staff_sided (Grob *me, Item *i) +Script_column::add_side_positioned (Grob *me, Grob *script) { - SCM p = i->get_grob_property ("script-priority"); - if (!gh_number_p (p)) + SCM p = script->get_property ("script-priority"); + if (!scm_is_number (p)) return; - Pointer_group_interface::add_element (me, "scripts",i); - - me->add_dependency (i); + Pointer_group_interface::add_grob (me, ly_symbol2scm ("scripts"), script); } -static int -staff_side_compare (Grob * const &i1, - Grob * const &i2) +LY_DEFINE (ly_grob_script_priority_less, "ly:grob-script-priority-less", + 2, 0, 0, (SCM a, SCM b), + "Compare two grobs by script priority. For internal use.") { - SCM p1 = i1->get_grob_property ("script-priority"); - SCM p2 = i2->get_grob_property ("script-priority"); + Grob *i1 = unsmob_grob (a); + Grob *i2 = unsmob_grob (b); + + SCM p1 = i1->get_property ("script-priority"); + SCM p2 = i2->get_property ("script-priority"); + + return scm_to_int (p1) < scm_to_int (p2) ? SCM_BOOL_T : SCM_BOOL_F; +} + +MAKE_SCHEME_CALLBACK (Script_column, row_before_line_breaking, 1); +SCM +Script_column::row_before_line_breaking (SCM smob) +{ + Grob *me = unsmob_grob (smob); + vector horizontal_grobs; + extract_grob_set (me, "scripts", scripts); + + Grob_scripts_map head_scripts_map; + vector affect_all_grobs; + for (vsize i = 0; i < scripts.size (); i++) + { + Grob *sc = scripts[i]; + + /* + Don't want to consider scripts horizontally next to notes. + */ + if (Accidental_placement::has_interface (sc) + || Arpeggio::has_interface (sc)) + { + affect_all_grobs.push_back (sc); + } + else if (sc->get_property_data ("Y-offset") != + Side_position_interface::x_aligned_side_proc) + { + head_scripts_map[sc->get_parent (Y_AXIS)].push_back (sc); + } + } - return gh_scm2int (p1) - gh_scm2int (p2); + for (Grob_scripts_map::const_iterator i (head_scripts_map.begin ()); + i != head_scripts_map.end (); + i++) + { + vector grobs = (*i).second; + + // this isn't right in all cases, but in general a safe assumption. + concat (grobs, affect_all_grobs); + order_grobs (grobs); + } + + return SCM_UNSPECIFIED; } -MAKE_SCHEME_CALLBACK(Script_column,before_line_breaking,1); +MAKE_SCHEME_CALLBACK (Script_column, before_line_breaking, 1); SCM Script_column::before_line_breaking (SCM smob) { - Grob* me = unsmob_grob (smob); - Drul_array > arrs; - Link_array staff_sided - = Pointer_group_interface__extract_elements (me, (Grob*)0, "scripts"); - - - for (int i=0; i < staff_sided.size (); i++) + Grob *me = unsmob_grob (smob); + vector staff_sided; + + extract_grob_set (me, "scripts", scripts); + for (vsize i = 0; i < scripts.size (); i++) { - arrs[Side_position_interface::get_direction (staff_sided[i])] - .push (staff_sided[i]); + Grob *sc = scripts[i]; + /* + Don't want to consider scripts horizontally next to notes. + */ + if (sc->get_property_data ("X-offset") != + Side_position_interface::x_aligned_side_proc) + staff_sided.push_back (sc); + } + + order_grobs (staff_sided); + return SCM_UNSPECIFIED; +} + +void +Script_column::order_grobs (vector grobs) +{ + Drul_array scripts_drul (SCM_EOL, SCM_EOL); + for (vsize i = 0; i < grobs.size (); i++) + { + Grob *g = grobs[i]; + Direction d = get_grob_direction (g); + + scripts_drul[d] = scm_cons (g->self_scm (), scripts_drul[d]); } Direction d = DOWN; - do { - Link_array &arr(arrs[d]); - - arr.sort (staff_side_compare); - - Grob * last = 0; - for (int i=0; i < arr.size (); i++) - { - - if (last) - Side_position_interface::add_support( arr[i],last); - - arr[i]->remove_grob_property ("script-priority"); - last = arr[i]; - } - - } while (flip (&d) != DOWN); + do + { + SCM ss = scm_reverse_x (scripts_drul[d], SCM_EOL); + ss = scm_stable_sort_x (ss, ly_grob_script_priority_less_proc); - return SCM_UNSPECIFIED; + Grob *last = 0; + for (SCM s = ss; scm_is_pair (s); s = scm_cdr (s)) + { + Grob *g = unsmob_grob (scm_car (s)); + if (last) + { + SCM outside_staff = last->get_property ("outside-staff-priority"); + if (scm_is_number (outside_staff)) + { + /* we allow the outside-staff-priority ordering to override the + script-priority ordering */ + if (!scm_is_number (g->get_property ("outside-staff-priority"))) + g->set_property ("outside-staff-priority", + scm_from_double (scm_to_double (outside_staff) + 0.1)); + } + else + Side_position_interface::add_support (g, last); + } + + last = g; + } + } + while (flip (&d) != DOWN); } +ADD_INTERFACE (Script_column, + "An interface that sorts scripts according to their" + " @code{script-priority}.", + + /* properties */ + "" + );