X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fslur.cc;h=7d2ca978c7afb1d46064136dcad85260eeb2e551;hb=9e781b7dc83b60a543ce218aa1a5f139f74c760f;hp=d82633da18b86b6838380e619bfffa9321ee503f;hpb=08560a1b8076630c4fc6cb9b902614d8b74fd6fc;p=lilypond.git diff --git a/lily/slur.cc b/lily/slur.cc index d82633da18..7d2ca978c7 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--2014 Han-Wen Nienhuys Jan Nieuwenhuizen LilyPond is free software: you can redistribute it and/or modify @@ -31,8 +31,8 @@ #include "main.hh" // DEBUG_SLUR_SCORING #include "note-column.hh" #include "output-def.hh" -#include "spanner.hh" #include "skyline-pair.hh" +#include "spanner.hh" #include "staff-symbol-referencer.hh" #include "stem.hh" #include "text-interface.hh" @@ -40,6 +40,7 @@ #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) @@ -101,10 +102,8 @@ Slur::pure_height (SCM smob, SCM start_scm, SCM end_scm) Interval d = encompasses[i]->pure_height (parent, start, end); if (!d.is_empty ()) { - Direction downup = DOWN; - do + for (DOWN_and_UP (downup)) ret.add_point (d[dir]); - while (flip (&downup) != DOWN); if (extremal_heights[LEFT] == infinity_f) extremal_heights[LEFT] = d[dir]; @@ -117,10 +116,8 @@ Slur::pure_height (SCM smob, SCM start_scm, SCM end_scm) Interval extremal_span; extremal_span.set_empty (); - Direction d = LEFT; - do + for (LEFT_and_RIGHT (d)) extremal_span.add_point (extremal_heights[d]); - while (flip (&d) != LEFT); ret[-dir] = minmax (dir, extremal_span[-dir], ret[-dir]); /* @@ -314,10 +311,8 @@ Slur::outside_slur_callback (SCM grob, SCM offset_scm) return offset_scm; bool contains = false; - Direction d = LEFT; - do + for (LEFT_and_RIGHT (d)) contains |= slur_wid.contains (xext[d]); - while (flip (&d) != LEFT); if (!contains) return offset_scm; @@ -335,8 +330,7 @@ Slur::outside_slur_callback (SCM grob, SCM offset_scm) Real EPS = 1.0e-5; if (avoid == ly_symbol2scm ("outside")) { - Direction d = LEFT; - do + for (LEFT_and_RIGHT (d)) { Real x = minmax (-d, xext[d], curve.control_[d == LEFT ? 0 : 3][X_AXIS] + -d * EPS); Real y = curve.get_other_coordinate (X_AXIS, x); @@ -344,14 +338,12 @@ Slur::outside_slur_callback (SCM grob, SCM offset_scm) if (do_shift) break; } - while (flip (&d) != LEFT); } else { for (int a = X_AXIS; a < NO_AXES; a++) { - Direction d = LEFT; - do + for (LEFT_and_RIGHT (d)) { vector coords = curve.get_other_coordinates (Axis (a), exts[a][d]); for (vsize i = 0; i < coords.size (); i++) @@ -363,7 +355,6 @@ Slur::outside_slur_callback (SCM grob, SCM offset_scm) if (do_shift) break; } - while (flip (&d) != LEFT); if (do_shift) break; } @@ -374,7 +365,7 @@ Slur::outside_slur_callback (SCM grob, SCM offset_scm) return scm_from_double (offset + avoidance_offset); } -MAKE_SCHEME_CALLBACK_WITH_OPTARGS (Slur, vertical_skylines, 1, 0, ""); +MAKE_SCHEME_CALLBACK (Slur, vertical_skylines, 1); SCM Slur::vertical_skylines (SCM smob) { @@ -382,7 +373,7 @@ Slur::vertical_skylines (SCM smob) vector boxes; if (!me) - return Skyline_pair (boxes, 0.0, X_AXIS).smobbed_copy (); + return Skyline_pair (boxes, X_AXIS).smobbed_copy (); Bezier curve = Slur::get_curve (me); vsize box_count = robust_scm2vsize (me->get_property ("skyline-quantizing"), 10); @@ -394,7 +385,7 @@ Slur::vertical_skylines (SCM smob) boxes.push_back (b); } - return Skyline_pair (boxes, 0.0, X_AXIS).smobbed_copy (); + return Skyline_pair (boxes, X_AXIS).smobbed_copy (); } /* @@ -410,6 +401,12 @@ Slur::auxiliary_acknowledge_extra_object (Grob_info const &info, Grob *e = info.grob (); SCM avoid = e->get_property ("avoid-slur"); + Grob *slur; + if (end_slurs.size () && !slurs.size ()) + slur = end_slurs[0]; + else + slur = slurs[0]; + if (Tie::has_interface (e) || avoid == ly_symbol2scm ("inside")) { @@ -417,25 +414,24 @@ Slur::auxiliary_acknowledge_extra_object (Grob_info const &info, 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")) { - Grob *slur; - if (end_slurs.size () && !slurs.size ()) - slur = end_slurs[0]; - else - slur = slurs[0]; - if (slur) { - chain_offset_callback (e, outside_slur_callback_proc, Y_AXIS); + chain_offset_callback (e, + ly_make_unpure_pure_container (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")) - e->warning (_f ("Ignoring grob for slur: %s. avoid-slur not set?", + e->warning (_f ("Ignoring grob for slur: %s. avoid-slur not set?", e->name ().c_str ())); } @@ -546,6 +542,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" @@ -570,10 +572,8 @@ ADD_INTERFACE (Slur, "inspect-index " "line-thickness " "note-columns " - "skyline-quantizing " "positions " "ratio " "thickness " - "vertical-skylines " );