/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 1996--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ Copyright (C) 1996--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
Jan Nieuwenhuizen <janneke@gnu.org>
LilyPond is free software: you can redistribute it and/or modify
#include "main.hh" // DEBUG_SLUR_SCORING
#include "note-column.hh"
#include "output-def.hh"
+#include "skyline-pair.hh"
#include "spanner.hh"
#include "staff-symbol-referencer.hh"
#include "stem.hh"
#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 = Grob::unsmob (smob);
extract_grob_set (me, "note-columns", encompasses);
if (encompasses.empty ())
-- 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 = Grob::unsmob (smob);
int start = scm_to_int (start_scm);
int end = scm_to_int (end_scm);
Direction dir = get_grob_direction (me);
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];
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]);
/*
SCM
Slur::height (SCM smob)
{
- Grob *me = unsmob_grob (smob);
+ Grob *me = Grob::unsmob (smob);
// FIXME uncached
Stencil *m = me->get_stencil ();
SCM
Slur::print (SCM smob)
{
- Grob *me = unsmob_grob (smob);
+ Grob *me = Grob::unsmob (smob);
extract_grob_set (me, "note-columns", encompasses);
if (encompasses.empty ())
{
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 = *Stencil::unsmob (Text_interface::interpret_markup
(me->layout ()->self_scm (), properties,
annotation));
a.add_at_edge (Y_AXIS, get_grob_direction (me), tm, 1.0);
}
SCM encompass_scm = me->get_object ("encompass-objects");
- if (Grob_array::unsmob (encompass_scm))
+ if (Grob_array::is_smob (encompass_scm))
{
vector<Grob *> &arr
- = unsmob_grob_array (encompass_scm)->array_reference ();
+ = Grob_array::unsmob (encompass_scm)->array_reference ();
arr = new_encompasses;
}
}
{
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 = Grob::unsmob (grob);
+ Grob *slur = Grob::unsmob (script->get_object ("slur"));
if (!slur)
return offset_scm;
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 = Grob::unsmob (grob);
+ Grob *slur = Grob::unsmob (script->get_object ("slur"));
if (!slur)
return 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;
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);
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<Real> coords = curve.get_other_coordinates (Axis (a), exts[a][d]);
for (vsize i = 0; i < coords.size (); i++)
if (do_shift)
break;
}
- while (flip (&d) != LEFT);
if (do_shift)
break;
}
return scm_from_double (offset + avoidance_offset);
}
+MAKE_SCHEME_CALLBACK (Slur, vertical_skylines, 1);
+SCM
+Slur::vertical_skylines (SCM smob)
+{
+ Grob *me = Grob::unsmob (smob);
+ vector<Box> boxes;
+
+ if (!me)
+ 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);
+ for (vsize i = 0; i < box_count; i++)
+ {
+ Box b;
+ b.add_point (curve.curve_point (i * 1.0 / box_count));
+ b.add_point (curve.curve_point ((i + 1) * 1.0 / box_count));
+ boxes.push_back (b);
+ }
+
+ return Skyline_pair (boxes, X_AXIS).smobbed_copy ();
+}
+
/*
* Used by Slur_engraver:: and Phrasing_slur_engraver::
*/
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"))
{
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,
+ 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"))
- 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 ()));
}
if (previous == SCM_BOOL_T)
return previous;
- Grob *me = unsmob_grob (smob);
- Grob *slur = unsmob_grob (me->get_object ("slur"));
+ Grob *me = Grob::unsmob (smob);
+ Grob *slur = Grob::unsmob (me->get_object ("slur"));
if (!slur)
return SCM_BOOL_F;
SCM
Slur::calc_cross_staff (SCM smob)
{
- Grob *me = unsmob_grob (smob);
+ Grob *me = Grob::unsmob (smob);
extract_grob_set (me, "note-columns", cols);
extract_grob_set (me, "encompass-objects", extras);
"@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"
projects / lilypond.git / blobdiff