X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fslur.cc;h=61aaba38e3756aadcbcfcf1c0cc599b0959c64d9;hb=c77189ccaa4e645850ad61779de7a4c8f3fdbc6f;hp=8c2e36106f8a410e8bfd414c058ed477d7177283;hpb=18b1e6e9649bddeaccdd4b4daa74cda0324b8fb3;p=lilypond.git diff --git a/lily/slur.cc b/lily/slur.cc index 8c2e36106f..61aaba38e3 100644 --- a/lily/slur.cc +++ b/lily/slur.cc @@ -1,10 +1,21 @@ /* - slur.cc -- implement external interface for Slur + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter - - (c) 1996--2007 Han-Wen Nienhuys + Copyright (C) 1996--2010 Han-Wen Nienhuys Jan Nieuwenhuizen + + 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 "slur.hh" @@ -14,6 +25,7 @@ #include "bezier.hh" #include "directional-element-interface.hh" #include "font-interface.hh" +#include "item.hh" #include "pointer-group-interface.hh" #include "lookup.hh" #include "main.hh" // DEBUG_SLUR_SCORING @@ -97,9 +109,6 @@ Slur::height (SCM smob) : ly_interval2scm (Interval ()); } -/* - Ugh should have dash-length + dash-period -*/ MAKE_SCHEME_CALLBACK (Slur, print, 1); SCM Slur::print (SCM smob) @@ -121,37 +130,33 @@ Slur::print (SCM smob) Bezier one = get_curve (me); Stencil a; - /* - TODO: replace dashed with generic property. - */ - SCM p = me->get_property ("dash-period"); - SCM f = me->get_property ("dash-fraction"); - if (scm_is_number (p) && scm_is_number (f)) - a = Lookup::dashed_slur (one, line_thick, robust_scm2double (p, 1.0), - robust_scm2double (f, 0)); - else - a = Lookup::slur (one, - get_grob_direction (me) * base_thick, - line_thick); + SCM dash_definition = me->get_property ("dash-definition"); + a = Lookup::slur (one, + get_grob_direction (me) * base_thick, + line_thick, + dash_definition); #if DEBUG_SLUR_SCORING - SCM quant_score = me->get_property ("quant-score"); - - if (to_boolean (me->layout () - ->lookup_variable (ly_symbol2scm ("debug-slur-scoring"))) - && scm_is_string (quant_score)) + SCM annotation = me->get_property ("annotation"); + if (!scm_is_string (annotation)) + { + SCM debug = me->layout ()->lookup_variable (ly_symbol2scm ("debug-slur-scoring")); + if (to_boolean (debug)) + annotation = me->get_property ("quant-score"); + } + + if (scm_is_string (annotation)) { string str; SCM properties = Font_interface::text_font_alist_chain (me); - if (!scm_is_number (me->get_property ("font-size"))) properties = scm_cons (scm_acons (ly_symbol2scm ("font-size"), scm_from_int (-6), SCM_EOL), properties); Stencil tm = *unsmob_stencil (Text_interface::interpret_markup (me->layout ()->self_scm (), properties, - quant_score)); + annotation)); a.add_at_edge (Y_AXIS, get_grob_direction (me), tm, 1.0); } #endif @@ -162,7 +167,7 @@ Slur::print (SCM smob) /* it would be better to do this at engraver level, but that is - fragile, as the breakabl items are generated on staff level, at + fragile, as the breakable items are generated on staff level, at which point slur starts and ends have to be tracked */ void @@ -179,7 +184,10 @@ Slur::replace_breakable_encompass_objects (Grob *me) { extract_grob_set (g, "elements", breakables); for (vsize j = 0; j < breakables.size (); j++) - if (breakables[j]->get_property ("avoid-slur") == ly_symbol2scm ("inside")) + /* if we encompass a separation-item that spans multiple staves, + we filter out the grobs that don't belong to our staff */ + if (me->common_refpoint (breakables[j], Y_AXIS) == me->get_parent (Y_AXIS) + && breakables[j]->get_property ("avoid-slur") == ly_symbol2scm ("inside")) new_encompasses.push_back (breakables[j]); } else @@ -278,9 +286,9 @@ Slur::outside_slur_callback (SCM grob, SCM offset_scm) 0.0); yext.widen (slur_padding); - Real EPS = 1e-3; + const Real EPS = 1e-3; Interval bezext (curve.control_[0][X_AXIS], curve.control_[3][X_AXIS]); - bool consider[] = { false, false, false }; + bool consider[] = {false, false, false}; Real ys[] = {0, 0, 0}; bool do_shift = false; @@ -307,11 +315,13 @@ Slur::outside_slur_callback (SCM grob, SCM offset_scm) } Real avoidance_offset = 0.0; - for (int d = LEFT, k = 0; d <= RIGHT; d++, k++) - if (consider[k]) - avoidance_offset = dir * (max (dir * avoidance_offset, - dir * (ys[k] - yext[-dir] + dir * slur_padding))); - + if (do_shift) + { + for (int d = LEFT, k = 0; d <= RIGHT; d++, k++) + if (consider[k]) + avoidance_offset = dir * (max (dir * avoidance_offset, + dir * (ys[k] - yext[-dir] + dir * slur_padding))); + } return scm_from_double (offset + avoidance_offset); } @@ -348,38 +358,73 @@ Slur::auxiliary_acknowledge_extra_object (Grob_info const &info, if (slur) { chain_offset_callback (e, outside_slur_callback_proc, Y_AXIS); + chain_callback (e, outside_slur_cross_staff_proc, ly_symbol2scm("cross-staff")); e->set_object ("slur", slur->self_scm ()); } } - else + else if (avoid != ly_symbol2scm ("ignore")) e->warning (_f ("Ignoring grob for slur: %s. avoid-slur not set?", e->name().c_str ())); } +/* + A callback that will be chained together with the original cross-staff + value of a grob that is placed 'outside or 'around a slur. This just says + that any grob becomes cross-staff if it is placed 'outside or 'around a + cross-staff slur. +*/ +MAKE_SCHEME_CALLBACK (Slur, outside_slur_cross_staff, 2) +SCM +Slur::outside_slur_cross_staff (SCM smob, SCM previous) +{ + if (previous == SCM_BOOL_T) + return previous; + + Grob *me = unsmob_grob (smob); + Grob *slur = unsmob_grob (me->get_object ("slur")); + + if (!slur) + return SCM_BOOL_F; + return slur->get_property ("cross-staff"); +} + MAKE_SCHEME_CALLBACK (Slur, calc_cross_staff, 1) SCM Slur::calc_cross_staff (SCM smob) { Grob *me = unsmob_grob (smob); - Grob *staff = Staff_symbol_referencer::get_staff_symbol (me); - assert (staff); // delete me + extract_grob_set (me, "note-columns", cols); + extract_grob_set (me, "encompass-objects", extras); for (vsize i = 0; i < cols.size (); i++) - if (Staff_symbol_referencer::get_staff_symbol (cols[i]) != staff) - return SCM_BOOL_T; - return SCM_BOOL_F; + { + if (Grob *s = Note_column::get_stem (cols[i])) + if (to_boolean (s->get_property ("cross-staff"))) + return SCM_BOOL_T; + } + + /* the separation items are dealt with in replace_breakable_encompass_objects + so we can ignore them here */ + vector non_sep_extras; + for (vsize i = 0; i < extras.size (); i++) + if (!Separation_item::has_interface (extras[i])) + non_sep_extras.push_back (extras[i]); + + Grob *common = common_refpoint_of_array (cols, me, Y_AXIS); + common = common_refpoint_of_array (non_sep_extras, common, Y_AXIS); + + return scm_from_bool (common != me->get_parent (Y_AXIS)); } ADD_INTERFACE (Slur, - - "A slur", + "A slur.", /* properties */ + "annotation " "avoid-slur " /* UGH. */ "control-points " - "dash-fraction " - "dash-period " + "dash-definition " "details " "direction " "eccentricity "