X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscript-column.cc;h=b19952774093a413232b863bfb52df03214c7080;hb=f4abbfff5f0d985a457e15586dbcc3ae473b0dee;hp=166eb348bb7db6f2b5a070f8da17387e8fa252f5;hpb=48bdd9154a32245a075494b403639181615864e2;p=lilypond.git diff --git a/lily/script-column.cc b/lily/script-column.cc index 166eb348bb..4735af862f 100644 --- a/lily/script-column.cc +++ b/lily/script-column.cc @@ -1,103 +1,183 @@ /* - script-column.cc -- implement Script_column + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter + Copyright (C) 1999--2014 Han-Wen Nienhuys - (c) 1997 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 "debug.hh" -#include "script.hh" -#include "note-head.hh" -#include "stem.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" -IMPLEMENT_IS_TYPE_B1(Script_column,Horizontal_vertical_group_item); +#include +typedef map > Grob_scripts_map; void -Script_column::add(Script*s_l) +Script_column::add_side_positioned (Grob *me, Grob *script) { - script_l_arr_.push(s_l); - add_element(s_l); -} + SCM p = script->get_property ("script-priority"); + if (!scm_is_number (p)) + return; - -void -Script_column::do_print()const -{ -#ifndef NPRINT - mtor << "scripts: " << script_l_arr_.size() << '\n'; -#endif + Pointer_group_interface::add_grob (me, ly_symbol2scm ("scripts"), script); } -static int -idx(bool inside, int dir) +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.") { - int j = (dir+1); - if ( !inside ) - j ++; - return j; + Grob *i1 = Grob::unsmob (a); + Grob *i2 = Grob::unsmob (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; } -void -Script_column::do_pre_processing() +MAKE_SCHEME_CALLBACK (Script_column, row_before_line_breaking, 1); +SCM +Script_column::row_before_line_breaking (SCM smob) { - if (!script_l_arr_.size()) - return; - - /* up+inside, up+outside, down+inside, down+outside */ - Array placed_l_arr_a[4]; - for (int i=0; i < script_l_arr_.size(); i++) { - Script*s_l = script_l_arr_[i]; - placed_l_arr_a[idx( s_l->inside_staff_b_ , s_l->dir_i_) ].push(s_l); - } - - for (int j =0; j <4; j++) { - placed_l_arr_a[j].sort( Script::compare); + Grob *me = Grob::unsmob (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::y_aligned_side_proc) + { + head_scripts_map[sc->get_parent (Y_AXIS)].push_back (sc); + } } + for (Grob_scripts_map::const_iterator i (head_scripts_map.begin ()); + i != head_scripts_map.end (); + i++) + { + vector grobs = (*i).second; - for (int j =0; j < 4; j++) { - if (placed_l_arr_a[j].size()) - for (int i=0; i < support_l_arr_.size(); i++) - placed_l_arr_a[j][0]->add_support( support_l_arr_[i]); - } - - Item * support_l=0; - int j = 0; - for (; j < 2; j++ ) { - for (int i=0; i < placed_l_arr_a[j].size(); i++) { - if (support_l) - placed_l_arr_a[j][i]->add_support(support_l); - support_l = placed_l_arr_a[j][i]; - } + // this isn't right in all cases, but in general a safe assumption. + concat (grobs, affect_all_grobs); + order_grobs (grobs); } - support_l = 0; - for (; j < 4; j++ ) { - for (int i=0; i < placed_l_arr_a[j].size(); i++) { - if (support_l) - placed_l_arr_a[j][i]->add_support(support_l); - support_l = placed_l_arr_a[j][i]; - } - } -} + return SCM_UNSPECIFIED; +} -void -Script_column::add_support(Item*i_l) +MAKE_SCHEME_CALLBACK (Script_column, before_line_breaking, 1); +SCM +Script_column::before_line_breaking (SCM smob) { - support_l_arr_.push(i_l); - add_element(i_l); + Grob *me = Grob::unsmob (smob); + vector staff_sided; + + 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::do_substitute_dependency(Score_elem*o,Score_elem*n) +Script_column::order_grobs (vector grobs) { - Horizontal_vertical_group::do_substitute_dependency(o,n); - if (o->item()) { - script_l_arr_.substitute((Script*)o->item(),(Script*) (n?n->item():0)); - support_l_arr_.substitute(o->item(), (n?n->item():0)); + 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]); + } + + 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 = Grob::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, Grob::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 */ + "" + );