X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscript-column.cc;h=94aa8908e70a1dfc3c2dfc791358491edb99e9d9;hb=3af0951f9a11677240efa6228683dd4fcea13eaf;hp=7d8ca6fcfe18534ee01eaf46f82495ec2051345b;hpb=7e72a1e50e94a7f9738d62599de79fe7745f600c;p=lilypond.git diff --git a/lily/script-column.cc b/lily/script-column.cc index 7d8ca6fcfe..94aa8908e7 100644 --- a/lily/script-column.cc +++ b/lily/script-column.cc @@ -1,97 +1,184 @@ -/* - script-column.cc -- implement Script_column - - source file of the GNU LilyPond music typesetter - - (c) 1999--2004 Han-Wen Nienhuys - - */ +/* + This file is part of LilyPond, the GNU music typesetter. + + Copyright (C) 1999--2015 Han-Wen Nienhuys + + LilyPond is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + LilyPond is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . +*/ + #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 "group-interface.hh" +#include "grob.hh" +#include "pointer-group-interface.hh" + +#include + +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_grob (me, ly_symbol2scm ("scripts"),i); - - me->add_dependency (i); + Pointer_group_interface::add_grob (me, ly_symbol2scm ("scripts"), script); + script->set_object ("script-column", me->self_scm ()); } -LY_DEFINE(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.") +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.") { - Grob * i1 = unsmob_grob (a); - Grob* i2 = unsmob_grob (b); + Grob *i1 = unsmob (a); + Grob *i2 = unsmob (b); - SCM p1 = i1->get_grob_property ("script-priority"); - SCM p2 = i2->get_grob_property ("script-priority"); + SCM p1 = i1->get_property ("script-priority"); + SCM p2 = i2->get_property ("script-priority"); - return gh_scm2int (p1) < gh_scm2int (p2) ? SCM_BOOL_T : SCM_BOOL_F; + return scm_to_int (p1) < scm_to_int (p2) ? SCM_BOOL_T : SCM_BOOL_F; } - - -MAKE_SCHEME_CALLBACK (Script_column,before_line_breaking,1); +MAKE_SCHEME_CALLBACK (Script_column, row_before_line_breaking, 1); SCM -Script_column::before_line_breaking (SCM smob) +Script_column::row_before_line_breaking (SCM smob) { - Grob* me = unsmob_grob (smob); - Drul_array scripts (SCM_EOL, SCM_EOL); - Link_array staff_sided; - - for (SCM s = me->get_grob_property( "scripts"); gh_pair_p (s); s = gh_cdr( s)) - { - Grob *sc = unsmob_grob (gh_car (s)); + Grob *me = unsmob (smob); + vector horizontal_grobs; + extract_grob_set (me, "scripts", scripts); - if (!sc->has_offset_callback_b (Side_position_interface::aligned_side_proc, X_AXIS)) - staff_sided.push (sc); + 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 (has_interface (sc) + || has_interface (sc)) + { + affect_all_grobs.push_back (sc); + } + else if (sc->get_property_data ("Y-offset") + != Side_position_interface::y_aligned_side_proc) + { + head_scripts_map[sc->get_parent (Y_AXIS)].push_back (sc); + } } - - for (int i=0; i < staff_sided.size (); i++) + + for (Grob_scripts_map::const_iterator i (head_scripts_map.begin ()); + i != head_scripts_map.end (); + i++) { - Grob* g = staff_sided[i]; - Direction d = Side_position_interface::get_direction (g); - if (!d) - { - programming_error ( "No direction for script?"); - d = DOWN; - g->set_grob_property ("direction", gh_int2scm (d)); - } - - scripts[d] = scm_cons (g->self_scm(), scripts[d]); + 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); } - Direction d = DOWN; - do { - SCM ss = scm_reverse_x (scripts[d], SCM_EOL); - ss = scm_stable_sort_x (ss, grob_script_priority_less_proc); + return SCM_UNSPECIFIED; +} - Grob * last = 0; - for (SCM s = ss; gh_pair_p (s); s = gh_cdr (s)) - { - Grob* g = unsmob_grob (gh_car (s)); - if (last) - Side_position_interface::add_support (g,last); +MAKE_SCHEME_CALLBACK (Script_column, before_line_breaking, 1); +SCM +Script_column::before_line_breaking (SCM smob) +{ + Grob *me = unsmob (smob); + vector staff_sided; - last = g; - } - - } while (flip (&d) != DOWN); + extract_grob_set (me, "scripts", scripts); + for (vsize i = 0; i < scripts.size (); 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]); + } -ADD_INTERFACE (Script_column,"script-column-interface", - "An interface that sorts scripts according to their @code{script-priority}", - ""); + for (DOWN_and_UP (d)) + { + SCM ss = scm_reverse_x (scripts_drul[d], SCM_EOL); + ss = scm_stable_sort_x (ss, ly_grob_script_priority_less_proc); + + 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) + { + g = unsmob (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 outside_staff_priority is missing for previous grob, + use all the scripts so far as support for the current grob + */ + if (!scm_is_number (last_outside_staff)) + for (SCM t = ss; !scm_is_eq (t, s); t = scm_cdr (t)) + Side_position_interface::add_support (g, unsmob (scm_car (t))); + /* + 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)); + } + } + } +} +ADD_INTERFACE (Script_column, + "An interface that sorts scripts according to their" + " @code{script-priority} and @code{outside-staff-priority}.", + /* properties */ + "scripts " + );