X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fslur.cc;h=5f95e5d4d659203dbee12d58aa7d59c3aa69dd47;hb=f3d08b80817cd1b23a996ca5781b1fa0517ffbac;hp=aec1e04266a49421589f0cb331a65cc10f5f2321;hpb=89b7e75f6888d2020f7fe8b258e818c0c5e7a223;p=lilypond.git diff --git a/lily/slur.cc b/lily/slur.cc index aec1e04266..5f95e5d4d6 100644 --- a/lily/slur.cc +++ b/lily/slur.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 1996--2012 Han-Wen Nienhuys + Copyright (C) 1996--2015 Han-Wen Nienhuys Jan Nieuwenhuizen LilyPond is free software: you can redistribute it and/or modify @@ -40,13 +40,14 @@ #include "warn.hh" #include "slur-scoring.hh" #include "separation-item.hh" +#include "unpure-pure-container.hh" #include "international.hh" MAKE_SCHEME_CALLBACK (Slur, calc_direction, 1) SCM Slur::calc_direction (SCM smob) { - Grob *me = unsmob_grob (smob); + Grob *me = unsmob (smob); extract_grob_set (me, "note-columns", encompasses); if (encompasses.empty ()) @@ -80,7 +81,7 @@ Slur::pure_height (SCM smob, SCM start_scm, SCM end_scm) -- adding extra height for scripts that avoid slurs on the inside -- adding extra height for the "bulge" in a slur above a note head */ - Grob *me = unsmob_grob (smob); + Grob *me = unsmob (smob); int start = scm_to_int (start_scm); int end = scm_to_int (end_scm); Direction dir = get_grob_direction (me); @@ -98,7 +99,7 @@ Slur::pure_height (SCM smob, SCM start_scm, SCM end_scm) for (vsize i = 0; i < encompasses.size (); i++) { - Interval d = encompasses[i]->pure_height (parent, start, end); + Interval d = encompasses[i]->pure_y_extent (parent, start, end); if (!d.is_empty ()) { for (DOWN_and_UP (downup)) @@ -132,7 +133,7 @@ MAKE_SCHEME_CALLBACK (Slur, height, 1); SCM Slur::height (SCM smob) { - Grob *me = unsmob_grob (smob); + Grob *me = unsmob (smob); // FIXME uncached Stencil *m = me->get_stencil (); @@ -144,8 +145,7 @@ MAKE_SCHEME_CALLBACK (Slur, print, 1); SCM Slur::print (SCM smob) { - Grob *me = unsmob_grob (smob); - + Grob *me = unsmob (smob); extract_grob_set (me, "note-columns", encompasses); if (encompasses.empty ()) { @@ -179,7 +179,7 @@ Slur::print (SCM smob) properties = scm_cons (scm_acons (ly_symbol2scm ("font-size"), scm_from_int (-6), SCM_EOL), properties); - Stencil tm = *unsmob_stencil (Text_interface::interpret_markup + Stencil tm = *unsmob (Text_interface::interpret_markup (me->layout ()->self_scm (), properties, annotation)); a.add_at_edge (Y_AXIS, get_grob_direction (me), tm, 1.0); @@ -204,27 +204,23 @@ Slur::replace_breakable_encompass_objects (Grob *me) { Grob *g = extra_objects[i]; - if (Separation_item::has_interface (g)) + if (has_interface (g)) { extract_grob_set (g, "elements", breakables); for (vsize j = 0; j < breakables.size (); j++) /* 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")) + && scm_is_eq (breakables[j]->get_property ("avoid-slur"), + ly_symbol2scm ("inside"))) new_encompasses.push_back (breakables[j]); } else new_encompasses.push_back (g); } - SCM encompass_scm = me->get_object ("encompass-objects"); - if (Grob_array::unsmob (encompass_scm)) - { - vector &arr - = unsmob_grob_array (encompass_scm)->array_reference (); - arr = new_encompasses; - } + if (Grob_array *a = unsmob (me->get_object ("encompass-objects"))) + a->set_array (new_encompasses); } Bezier @@ -252,58 +248,40 @@ Slur::add_extra_encompass (Grob *me, Grob *n) Pointer_group_interface::add_grob (me, ly_symbol2scm ("encompass-objects"), n); } -void -Slur::main_to_stub (Grob *main, Grob *stub) -{ - extract_grob_set (main, "note-columns", nc); - for (vsize i = 0; i < nc.size (); i++) - add_column (stub, nc[i]); - - extract_grob_set (main, "encompass-objects", eo); - for (vsize i = 0; i < eo.size (); i++) - add_extra_encompass (stub, eo[i]); - - stub->set_object ("surrogate", main->self_scm ()); - - dynamic_cast (stub)->set_bound - (LEFT, dynamic_cast (main)->get_bound (LEFT)); - dynamic_cast (stub)->set_bound - (RIGHT, dynamic_cast (main)->get_bound (RIGHT)); -} - MAKE_SCHEME_CALLBACK_WITH_OPTARGS (Slur, pure_outside_slur_callback, 4, 1, ""); SCM Slur::pure_outside_slur_callback (SCM grob, SCM start_scm, SCM end_scm, SCM offset_scm) { int start = robust_scm2int (start_scm, 0); int end = robust_scm2int (end_scm, 0); - Grob *script = unsmob_grob (grob); - Grob *slur = unsmob_grob (script->get_object ("slur")); + Grob *script = unsmob (grob); + Grob *slur = unsmob (script->get_object ("slur")); if (!slur) return offset_scm; SCM avoid = script->get_property ("avoid-slur"); - if (avoid != ly_symbol2scm ("outside") && avoid != ly_symbol2scm ("around")) + if (!scm_is_eq (avoid, ly_symbol2scm ("outside")) + && !scm_is_eq (avoid, ly_symbol2scm ("around"))) return offset_scm; Real offset = robust_scm2double (offset_scm, 0.0); Direction dir = get_grob_direction (script); - return scm_from_double (offset + dir * slur->pure_height (slur, start, end).length () / 4); + return scm_from_double (offset + dir * slur->pure_y_extent (slur, start, end).length () / 4); } MAKE_SCHEME_CALLBACK_WITH_OPTARGS (Slur, outside_slur_callback, 2, 1, ""); SCM Slur::outside_slur_callback (SCM grob, SCM offset_scm) { - Grob *script = unsmob_grob (grob); - Grob *slur = unsmob_grob (script->get_object ("slur")); + Grob *script = unsmob (grob); + Grob *slur = unsmob (script->get_object ("slur")); if (!slur) return offset_scm; SCM avoid = script->get_property ("avoid-slur"); - if (avoid != ly_symbol2scm ("outside") - && avoid != ly_symbol2scm ("around")) + if (!scm_is_eq (avoid, ly_symbol2scm ("outside")) + && !scm_is_eq (avoid, ly_symbol2scm ("around"))) return offset_scm; Direction dir = get_grob_direction (script); @@ -347,7 +325,7 @@ Slur::outside_slur_callback (SCM grob, SCM offset_scm) Interval exts[] = {xext, yext}; bool do_shift = false; Real EPS = 1.0e-5; - if (avoid == ly_symbol2scm ("outside")) + if (scm_is_eq (avoid, ly_symbol2scm ("outside"))) { for (LEFT_and_RIGHT (d)) { @@ -388,7 +366,7 @@ MAKE_SCHEME_CALLBACK (Slur, vertical_skylines, 1); SCM Slur::vertical_skylines (SCM smob) { - Grob *me = unsmob_grob (smob); + Grob *me = unsmob (smob); vector boxes; if (!me) @@ -407,83 +385,49 @@ Slur::vertical_skylines (SCM smob) return Skyline_pair (boxes, X_AXIS).smobbed_copy (); } -/* - * USE ME ONLY FOR CROSS STAFF SLURS! - * We only want to keep the topmost skyline of the topmost axis group(s) - * and the bottommost skyline of the bottommost axis group(s). Otherwise, - * the VerticalAxisGroups will be spaced very far apart to accommodate the - * slur, which we don't want, as it is cross staff. - * - * TODO: Currently, the code below keeps the topmost and bottommost axis - * groups and gets rid of the rest. This should be more nuanced for - * cases like ossias where the topmost staff changes over the course of - * the slur. Ditto for the bottommost staff. - */ - -MAKE_SCHEME_CALLBACK (Slur, extremal_stub_vertical_skylines, 1); -SCM -Slur::extremal_stub_vertical_skylines (SCM smob) -{ - Grob *me = unsmob_grob (smob); - Grob *my_vag = Grob::get_vertical_axis_group (me); - extract_grob_set (me, "note-columns", ro_note_columns); - vector note_columns (ro_note_columns); - vector_sort (note_columns, Grob::vertical_less); - bool highest = my_vag == Grob::get_vertical_axis_group (note_columns[0]); - bool lowest = my_vag == Grob::get_vertical_axis_group (note_columns.back ()); - if (!highest && !lowest) - return Skyline_pair ().smobbed_copy (); - - Skyline_pair sky = *Skyline_pair::unsmob (vertical_skylines (smob)); - - if (highest) - sky[DOWN] = Skyline (DOWN); - else - sky[UP] = Skyline (UP); - - return sky.smobbed_copy (); -} - /* * Used by Slur_engraver:: and Phrasing_slur_engraver:: */ void Slur::auxiliary_acknowledge_extra_object (Grob_info const &info, - vector &slur_infos, - vector &end_slur_infos) + vector &slurs, + vector &end_slurs) { - if (slur_infos.empty () && end_slur_infos.empty ()) + if (slurs.empty () && end_slurs.empty ()) return; Grob *e = info.grob (); SCM avoid = e->get_property ("avoid-slur"); Grob *slur; - if (end_slur_infos.size () && !slur_infos.size ()) - slur = end_slur_infos[0].slur_; + if (end_slurs.size () && !slurs.size ()) + slur = end_slurs[0]; else - slur = slur_infos[0].slur_; + slur = slurs[0]; - if (Tie::has_interface (e) - || avoid == ly_symbol2scm ("inside")) + if (has_interface (e) + || scm_is_eq (avoid, ly_symbol2scm ("inside"))) { - for (vsize i = slur_infos.size (); i--;) - add_extra_encompass (slur_infos[i].slur_, e); - for (vsize i = end_slur_infos.size (); i--;) - add_extra_encompass (end_slur_infos[i].slur_, e); + for (vsize i = slurs.size (); i--;) + add_extra_encompass (slurs[i], e); + for (vsize i = end_slurs.size (); i--;) + add_extra_encompass (end_slurs[i], e); if (slur) e->set_object ("slur", slur->self_scm ()); } - else if (avoid == ly_symbol2scm ("outside") - || avoid == ly_symbol2scm ("around")) + else if (scm_is_eq (avoid, ly_symbol2scm ("outside")) + || scm_is_eq (avoid, ly_symbol2scm ("around"))) { if (slur) { - chain_offset_callback (e, outside_slur_callback_proc, Y_AXIS); + chain_offset_callback (e, + Unpure_pure_container::make_smob (outside_slur_callback_proc, + pure_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 if (avoid != ly_symbol2scm ("ignore")) + else if (!scm_is_eq (avoid, ly_symbol2scm ("ignore"))) e->warning (_f ("Ignoring grob for slur: %s. avoid-slur not set?", e->name ().c_str ())); } @@ -498,11 +442,11 @@ MAKE_SCHEME_CALLBACK (Slur, outside_slur_cross_staff, 2) SCM Slur::outside_slur_cross_staff (SCM smob, SCM previous) { - if (previous == SCM_BOOL_T) + if (to_boolean (previous)) return previous; - Grob *me = unsmob_grob (smob); - Grob *slur = unsmob_grob (me->get_object ("slur")); + Grob *me = unsmob (smob); + Grob *slur = unsmob (me->get_object ("slur")); if (!slur) return SCM_BOOL_F; @@ -513,7 +457,7 @@ MAKE_SCHEME_CALLBACK (Slur, calc_cross_staff, 1) SCM Slur::calc_cross_staff (SCM smob) { - Grob *me = unsmob_grob (smob); + Grob *me = unsmob (smob); extract_grob_set (me, "note-columns", cols); extract_grob_set (me, "encompass-objects", extras); @@ -529,7 +473,7 @@ Slur::calc_cross_staff (SCM smob) 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])) + if (!has_interface (extras[i])) non_sep_extras.push_back (extras[i]); Grob *common = common_refpoint_of_array (cols, me, Y_AXIS); @@ -595,6 +539,12 @@ ADD_INTERFACE (Slur, "@item head-slur-distance-max-ratio\n" "The maximum value for the ratio of distance between a" " note head and slur.\n" + "@item gap-to-staffline-inside\n" + "Minimum gap inside the curve of the slur" + " where the slur is parallel to a staffline.\n" + "@item gap-to-staffline-outside\n" + "Minimum gap outside the curve of the slur" + " where the slur is parallel to a staffline.\n" "@item free-slur-distance\n" "The amount of vertical free space that must exist" " between adjacent slurs. This subproperty only works"