/*
- slur.cc -- implement Old_slur
+ slur.cc -- implement external interface for Slur
source file of the GNU LilyPond music typesetter
- (c) 1996--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
- Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 1996--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ Jan Nieuwenhuizen <janneke@gnu.org>
*/
-/*
- [TODO]
-
- * should avoid stafflines with horizontal part.
-
- * begin and end should be treated as a/acknowledge Scripts.
-
- * smart changing of endings
-
- * smart changing of (Y-?)offsets to avoid ugly beziers
- (along-side-stem)
-
- */
-
-#include "directional-element-interface.hh"
-#include "group-interface.hh"
#include "slur.hh"
+#include "grob-info.hh"
+#include "grob-array.hh"
+#include "beam.hh"
+#include "bezier.hh"
+#include "directional-element-interface.hh"
+#include "font-interface.hh"
+#include "pointer-group-interface.hh"
#include "lookup.hh"
-#include "output-def.hh"
+#include "main.hh" // DEBUG_SLUR_SCORING
#include "note-column.hh"
+#include "output-def.hh"
+#include "spanner.hh"
+#include "staff-symbol-referencer.hh"
+#include "staff-symbol.hh"
#include "stem.hh"
-#include "paper-column.hh"
-#include "stencil.hh"
+#include "text-interface.hh"
+#include "tie.hh"
#include "warn.hh"
-#include "slur-bezier-bow.hh"
-#include "main.hh"
-#include "group-interface.hh"
-#include "staff-symbol-referencer.hh"
-#include "spanner.hh"
+#include "slur-scoring.hh"
+#include "separation-item.hh"
+#include "script-interface.hh"
-void
-Old_slur::set_interface (Grob*me)
-{
- /* Copy to mutable list. */
- me->set_property ("attachment",
- ly_deep_copy (me->get_property ("attachment")));
-}
-void
-Old_slur::add_column (Grob*me, Grob*n)
+MAKE_SCHEME_CALLBACK(Slur, calc_direction, 1)
+SCM
+Slur::calc_direction (SCM smob)
{
- Pointer_group_interface::add_grob (me, ly_symbol2scm ("note-columns"), n);
- me->add_dependency (n);
-
- add_bound_item (dynamic_cast<Spanner*> (me), dynamic_cast<Item*> (n));
-}
+ Grob *me = unsmob_grob (smob);
+ extract_grob_set (me, "note-columns", encompasses);
-void
-Old_slur::de_uglify (Grob*me, Slur_bezier_bow* bb, Real default_height)
-{
- Real length = bb->curve_.control_[3][X_AXIS] ;
- Real ff = bb->fit_factor ();
- for (int i = 1; i < 3; i++)
+ if (encompasses.empty ())
{
- Real ind = abs (bb->curve_.control_[ (i-1)*3][X_AXIS]
- - bb->curve_.control_[i][X_AXIS]) / length;
- Real h = bb->curve_.control_[i][Y_AXIS] * ff / length;
-
- Real f = default_height / length;
- SCM up = me->get_property ("de-uglify-parameters");
-
- Real c1 = ly_scm2double (ly_car (up));
- Real c2 = ly_scm2double (ly_cadr (up));
- Real c3 = ly_scm2double (ly_caddr (up));
-
- if (h > c1 * f)
- {
- h = c1 * f;
- }
- else if (h > c2 + c3 * ind)
- {
- h = c2 + c3 * ind;
- }
-
- bb->curve_.control_[i][Y_AXIS] = h * length;
- }
-
- bb->curve_.assert_sanity ();
-}
-
-
+ me->suicide ();
+ return SCM_BOOL_F;
+ }
-Direction
-Old_slur::get_default_dir (Grob*me)
-{
- Link_array<Grob> encompasses =
- Pointer_group_interface__extract_grobs (me, (Grob*)0, "note-columns");
-
Direction d = DOWN;
- for (int i=0; i < encompasses.size (); i ++)
+ for (vsize i = 0; i < encompasses.size (); i++)
{
- if (Note_column::dir (encompasses[i]) < 0)
+ if (Note_column::dir (encompasses[i]) < 0)
{
d = UP;
break;
}
}
- return d;
+ return scm_from_int (d);
}
-
-MAKE_SCHEME_CALLBACK (Old_slur, after_line_breaking,1);
+MAKE_SCHEME_CALLBACK (Slur, pure_height, 3);
SCM
-Old_slur::after_line_breaking (SCM smob)
+Slur::pure_height (SCM smob, SCM start_scm, SCM end_scm)
{
Grob *me = unsmob_grob (smob);
- if (!scm_ilength (me->get_property ("note-columns")))
- {
- me->suicide ();
- return SCM_UNSPECIFIED;
- }
- set_extremities (me);
- if (!ly_c_pair_p (me->get_property ("control-points")))
- set_control_points (me);
- return SCM_UNSPECIFIED;
-}
+ int start = scm_to_int (start_scm);
+ int end = scm_to_int (end_scm);
+ Real height = robust_scm2double (me->get_property ("height-limit"), 2.0);
+ extract_grob_set (me, "note-columns", encompasses);
+ Interval ret;
-void
-Old_slur::check_slope (Grob *me)
-{
- /*
- Avoid too steep slurs.
- */
- SCM s = me->get_property ("slope-limit");
- if (ly_c_number_p (s))
+ Grob *parent = me->get_parent (Y_AXIS);
+ if (common_refpoint_of_array (encompasses, me, Y_AXIS) != parent)
+ /* this could happen if, for example, we are a cross-staff slur.
+ in this case, we want to be ignored */
+ return ly_interval2scm (Interval ());
+
+ for (vsize i = 0; i < encompasses.size (); i++)
{
- Array<Offset> encompass = get_encompass_offsets (me);
- Drul_array<Offset> attachment;
- attachment[LEFT] = encompass[0];
- attachment[RIGHT] = encompass.top ();
-
- Real dx = attachment[RIGHT][X_AXIS] - attachment[LEFT][X_AXIS];
- Real dy = attachment[RIGHT][Y_AXIS] - attachment[LEFT][Y_AXIS];
- if (!dx)
- return;
-
- Real slope = slope = abs (dy / dx);
+ Interval d = encompasses[i]->pure_height (parent, start, end);
+ if (!d.is_empty ())
+ ret.unite (d);
+ }
- Real limit = ly_scm2double (s);
+ ret.widen (height * 0.5);
+ return ly_interval2scm (ret);
+}
- if (slope > limit)
- {
- Real staff_space = Staff_symbol_referencer::staff_space ((Grob*)me);
- Direction dir = (Direction)ly_scm2int (me->get_property ("direction"));
- Direction d = (Direction) (- dir * (sign (dy)));
- SCM a = me->get_property ("attachment-offset");
- Drul_array<Offset> o;
- o[LEFT] = ly_scm2offset (index_get_cell (a, LEFT));
- o[RIGHT] = ly_scm2offset (index_get_cell (a, RIGHT));
- o[d][Y_AXIS] -= (limit - slope) * dx * dir / staff_space;
-
- o[d][Y_AXIS] *= get_grob_direction (me);
-
- me->set_property ("attachment-offset",
- scm_cons (ly_offset2scm (o[LEFT]),
- ly_offset2scm (o[RIGHT])));
- }
- }
+MAKE_SCHEME_CALLBACK (Slur, height, 1);
+SCM
+Slur::height (SCM smob)
+{
+ Grob *me = unsmob_grob (smob);
+ // FIXME uncached
+ Stencil *m = me->get_stencil ();
+ return m ? ly_interval2scm (m->extent (Y_AXIS))
+ : ly_interval2scm (Interval ());
}
/*
- Set 'attachment grob property, and return it.
+ Ugh should have dash-length + dash-period
*/
+MAKE_SCHEME_CALLBACK (Slur, print, 1);
SCM
-Old_slur::set_extremities (Grob *me)
+Slur::print (SCM smob)
{
- if (!get_grob_direction (me))
- set_grob_direction (me, get_default_dir (me));
-
- SCM att = me->get_property ("attachment");
- /*
- */
- if (!ly_c_pair_p (att))
- {
- programming_error ("attachment is not a cons?!");
- att = scm_cons (SCM_EOL, SCM_EOL);
- me->set_property ("attachment", att);
- }
-
- Direction dir = LEFT;
- do
+ Grob *me = unsmob_grob (smob);
+ extract_grob_set (me, "note-columns", encompasses);
+ if (encompasses.empty ())
{
-
- if (!ly_c_symbol_p (index_get_cell (att, dir)))
- {
- SCM p = me->get_property ("extremity-function");
- SCM res = ly_symbol2scm ("head");
-
- if (ly_c_procedure_p (p))
- res = scm_call_2 (p, me->self_scm (), scm_int2num (dir));
-
- if (ly_c_symbol_p (res))
- index_set_cell (att, dir, res);
- }
+ me->suicide ();
+ return SCM_EOL;
}
- while (flip (&dir) != LEFT);
- check_slope (me);
+ Real staff_thick = Staff_symbol_referencer::line_thickness (me);
+ Real base_thick = staff_thick
+ * robust_scm2double (me->get_property ("thickness"), 1);
+ Real line_thick = staff_thick
+ * robust_scm2double (me->get_property ("line-thickness"), 1);
- return att;
-}
+ 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);
-Real
-Old_slur::get_boundary_notecolumn_y (Grob *me, Direction dir)
-{
- SCM cols = me->get_property ("note-columns");
+#if DEBUG_SLUR_SCORING
+ SCM quant_score = me->get_property ("quant-score");
- if (!ly_c_pair_p (cols))
- {
- programming_error ("No note-columns in slur?");
- me->suicide ();
- return 0.0;
- }
-
- if (dir == LEFT)
- cols = scm_reverse (cols);
-
- Grob *col = unsmob_grob (ly_car (cols));
- Grob *common[] =
- {
- 0,
- me->common_refpoint (col, Y_AXIS)
- };
- Real y;
- if (col == ((Spanner*)me)->get_bound (dir))
+ if (to_boolean (me->layout ()
+ ->lookup_variable (ly_symbol2scm ("debug-slur-scoring")))
+ && scm_is_string (quant_score))
{
- y = get_attachment (me, dir, common)[Y_AXIS];
- }
- else
- {
- y = encompass_offset (me, col, common)[Y_AXIS]
- - me->relative_coordinate (common[Y_AXIS], Y_AXIS);
- }
- return y;
-}
+ string str;
+ SCM properties = Font_interface::text_font_alist_chain (me);
-Offset
-Old_slur::broken_trend_offset (Grob *me, Direction dir)
-{
- /*
- A broken slur should maintain the same vertical trend
- the unbroken slur would have had.
- */
- Offset o;
- if (Spanner *mother = dynamic_cast<Spanner*> (me->original_))
- {
- int k = broken_spanner_index (dynamic_cast<Spanner*> (me));
- int j = k + dir;
- if (j < 0 || j >= mother->broken_intos_.size ())
- return o;
+
+ 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);
- Grob *neighbour = mother->broken_intos_[j];
- if (dir == RIGHT)
- neighbour->set_property ("direction",
- me->get_property ("direction"));
- Real neighbour_y = get_boundary_notecolumn_y (neighbour, dir);
- Real y = get_boundary_notecolumn_y (me, -dir);
- int neighbour_cols = scm_ilength (neighbour->get_property ("note-columns"));
- int cols = scm_ilength (me->get_property ("note-columns"));
- o = Offset (0, (y*neighbour_cols + neighbour_y*cols) /
- (cols + neighbour_cols));
+ Stencil tm = *unsmob_stencil (Text_interface::interpret_markup
+ (me->layout ()->self_scm (), properties,
+ quant_score));
+ a.add_at_edge (Y_AXIS, get_grob_direction (me), tm, 1.0);
}
- return o;
-}
+#endif
-/*
- COMMON is size-2 array with common refpoints.
+ return a.smobbed_copy ();
+}
-UGH: this routine delivers offsets which are *not* relative to COMMON.
-UGH, we should take COMMON-Y as argument.
-*/
-Offset
-Old_slur::get_attachment (Grob *me, Direction dir,
- Grob **common)
+/*
+ it would be better to do this at engraver level, but that is
+ fragile, as the breakabl items are generated on staff level, at
+ which point slur starts and ends have to be tracked
+*/
+void
+Slur::replace_breakable_encompass_objects (Grob *me)
{
- SCM s = me->get_property ("attachment");
- if (!ly_c_pair_p (s) || !ly_c_symbol_p (index_get_cell (s, dir)))
- {
- s = set_extremities (me);
- }
-
- SCM a = (dir == LEFT) ? ly_car (s) : ly_cdr (s);
- Spanner*sp = dynamic_cast<Spanner*> (me);
- String str = ly_symbol2string (a);
-
- Real staff_space = Staff_symbol_referencer::staff_space ((Grob*)me);
- Real hs = staff_space / 2.0;
- Offset o;
-
- Direction slurdir = to_dir (me->get_property ("direction"));
-
- Grob *stem = 0;
- if (Note_column::has_interface (sp->get_bound (dir)))
+ extract_grob_set (me, "encompass-objects", extra_objects);
+ vector<Grob *> new_encompasses;
+
+ for (vsize i = 0; i < extra_objects.size (); i++)
{
- Grob * n =sp->get_bound (dir);
- stem = Note_column::get_stem (n);
- if (stem)
+ Grob *g = extra_objects[i];
+
+ if (Separation_item::has_interface (g))
{
- Real x_extent;
- Grob *head = Note_column::first_head (n);
- if (head)
- x_extent = head->extent (head, X_AXIS).length ();
- else
- x_extent = n->extent (n, X_AXIS).length ();
-
- if (!head)
- {
- o = Offset (0, n->extent (n, Y_AXIS)[slurdir]);
- }
- else if (str == "head")
- {
- o = Offset (0, Stem::head_positions (stem)
- [slurdir] * hs);
- /*
- Default position is centered in X, on outer side of head Y
- */
- o += Offset (0.5 * x_extent,
- 0.5 * staff_space
- * slurdir);
- }
- else if (str == "alongside-stem")
- {
- o = Offset (0, Stem::chord_start_y (stem));
- /*
- Default position is on stem X, on outer side of head Y
- */
- o += Offset (x_extent * (1 + Stem::get_direction (stem)),
- 0.5 * staff_space
- * slurdir);
- }
- else if (str == "stem")
- {
- o = Offset (0, Stem::stem_end_position (stem) * hs);
- /*
- Default position is on stem X, at stem end Y
- */
- Real stem_thickness = Stem::thickness (stem);
- o += Offset (0.5 *
- x_extent * (1 + Stem::get_direction (stem))
- - ((dir + 1)/2) * stem_thickness
- + ((1 - slurdir)/2) * stem_thickness,
- 0);
- }
+ extract_grob_set (g, "elements", breakables);
+ for (vsize j = 0; j < breakables.size (); j++)
+ if (breakables[j]->get_property ("avoid-slur") == ly_symbol2scm ("inside"))
+ new_encompasses.push_back (breakables[j]);
}
+ else
+ new_encompasses.push_back (g);
}
- /*
- If we're not a note_column, we can't be anything but a loose-end.
- But if user has set (attachment . (stem . stem)), our string is
- stem, not loose-end.
- Hmm, maybe after-line-breaking should set this to loose-end? */
- else // if (str == "loose-end")
+ SCM encompass_scm = me->get_object ("encompass-objects");
+ if (Grob_array::unsmob (encompass_scm))
{
- SCM other_a = dir == LEFT ? ly_cdr (s) : ly_car (s);
- if (ly_symbol2string (other_a) != "loose-end")
- o = broken_trend_offset (me, dir);
+ vector<Grob *> &arr =
+ unsmob_grob_array (encompass_scm)->array_reference ();
+ arr = new_encompasses;
}
-
- SCM alist = me->get_property ("extremity-offset-alist");
- int stemdir = stem ? Stem::get_direction (stem) : 1;
- SCM l = scm_assoc
- (scm_list_n (a,
- scm_int2num (stemdir * dir),
- scm_int2num (slurdir * dir),
- SCM_UNDEFINED), alist);
-
- if (l != SCM_BOOL_F)
- {
- Offset off = ly_scm2offset (ly_cdr (l)) * staff_space;
- off[X_AXIS] *= dir;
- off[Y_AXIS] *= slurdir;
- o += off;
- }
-
- /*
- What if get_bound () is not a note-column?
- */
- if (str != "loose-end"
- && sp->get_bound (dir)->common_refpoint (common[Y_AXIS], Y_AXIS) == common[Y_AXIS])
- {
- o[Y_AXIS] += sp->get_bound (dir)->relative_coordinate (common[Y_AXIS], Y_AXIS)
- - me->relative_coordinate (common[Y_AXIS], Y_AXIS);
- }
-
- Offset off = ly_scm2offset (index_get_cell (me->get_property
- ("attachment-offset"),
- dir)) * staff_space;
-
- off[Y_AXIS] *= slurdir;
- o += off;
- return o;
}
-Offset
-Old_slur::encompass_offset (Grob*me,
- Grob* col,
- Grob **common)
+Bezier
+Slur::get_curve (Grob *me)
{
- Offset o;
- Grob* stem = unsmob_grob (col->get_property ("stem"));
-
- Direction dir = get_grob_direction (me);
-
- if (!stem)
- {
- programming_error ("No stem for note column?");
- o[X_AXIS] = col->relative_coordinate (common[X_AXIS], X_AXIS);
- o[Y_AXIS] = col->relative_coordinate (common[Y_AXIS], Y_AXIS);
- return o;
- }
- Direction stem_dir = get_grob_direction (stem);
- o[X_AXIS] = stem->relative_coordinate (0, X_AXIS);
-
- /*
- Simply set x to middle of notehead
- */
- Real x_extent;
- if (Grob *head = Note_column::first_head (col))
- x_extent = head->extent (head, X_AXIS).length ();
- else
- x_extent = col->extent (col, X_AXIS).length ();
- o[X_AXIS] -= 0.5 * stem_dir * x_extent;
-
- if ((stem_dir == dir)
- && !stem->extent (stem, Y_AXIS).is_empty ())
- {
- o[Y_AXIS] = stem->extent (common[Y_AXIS], Y_AXIS)[dir];
- }
- else
- {
- o[Y_AXIS] = col->extent (common[Y_AXIS], Y_AXIS)[dir];
- }
+ Bezier b;
+ int i = 0;
+ for (SCM s = me->get_property ("control-points"); scm_is_pair (s);
+ s = scm_cdr (s))
+ b.control_[i++] = ly_scm2offset (scm_car (s));
- /*
- leave a gap: slur mustn't touch head/stem
- */
- o[Y_AXIS] += dir * robust_scm2double (me->get_property ("y-free"), 0) *
- 1.0;
- return o;
+ return b;
}
-Array<Offset>
-Old_slur::get_encompass_offsets (Grob *me)
+void
+Slur::add_column (Grob *me, Grob *n)
{
- Spanner*sp = dynamic_cast<Spanner*> (me);
- SCM eltlist = me->get_property ("note-columns");
- Grob *common[] = {common_refpoint_of_list (eltlist, me, X_AXIS),
- common_refpoint_of_list (eltlist, me, Y_AXIS)};
-
-
- common[X_AXIS] = common[X_AXIS]->common_refpoint (sp->get_bound (RIGHT), X_AXIS);
- common[X_AXIS] = common[X_AXIS]->common_refpoint (sp->get_bound (LEFT), X_AXIS);
-
- Link_array<Grob> encompasses = ly_scm2grobs (eltlist);
- Array<Offset> offsets;
-
- Offset origin (me->relative_coordinate (common[X_AXIS], X_AXIS),
- me->relative_coordinate (common[Y_AXIS], Y_AXIS));
-
- int first = 1;
- int last = encompasses.size () - 2;
-
- offsets.push (get_attachment (me, LEFT, common));
-
- /*
- left is broken edge
- */
- if (encompasses[0] != sp->get_bound (LEFT))
- {
- first--;
-
- // ?
- offsets[0][Y_AXIS] -=
- encompasses[0]->relative_coordinate (common[Y_AXIS], Y_AXIS)
- - me->relative_coordinate (common[Y_AXIS], Y_AXIS);
- }
-
- /*
- right is broken edge
- */
- if (encompasses.top () != sp->get_bound (RIGHT))
- {
- last++;
- }
-
- for (int i = first; i <= last; i++)
- {
- Offset o (encompass_offset (me, encompasses[i], common));
- offsets.push (o - origin);
- }
-
- offsets.push (Offset (sp->spanner_length (), 0) + get_attachment (me, RIGHT,common));
-
- if (encompasses[0] != sp->get_bound (LEFT))
- {
- offsets.top ()[Y_AXIS] -= encompasses.top ()->relative_coordinate (common[Y_AXIS], Y_AXIS)
- - me->relative_coordinate (common[Y_AXIS], Y_AXIS);
- }
-
- return offsets;
+ Pointer_group_interface::add_grob (me, ly_symbol2scm ("note-columns"), n);
+ add_bound_item (dynamic_cast<Spanner *> (me), n);
}
-
-
-
-/*
- ugh ?
- */
-MAKE_SCHEME_CALLBACK (Old_slur, height, 2);
-SCM
-Old_slur::height (SCM smob, SCM ax)
+void
+Slur::add_extra_encompass (Grob *me, Grob *n)
{
- Axis a = (Axis)ly_scm2int (ax);
- Grob * me = unsmob_grob (smob);
- assert (a == Y_AXIS);
-
- SCM mol = me->get_uncached_stencil ();
- Interval ext;
- if (Stencil * m = unsmob_stencil (mol))
- ext = m->extent (a);
- return ly_interval2scm (ext);
+ Pointer_group_interface::add_grob (me, ly_symbol2scm ("encompass-objects"), n);
}
-/*
- Ugh should have dash-length + dash-period
- */
-MAKE_SCHEME_CALLBACK (Old_slur, print,1);
+MAKE_SCHEME_CALLBACK_WITH_OPTARGS (Slur, pure_outside_slur_callback, 4, 1, "");
SCM
-Old_slur::print (SCM smob)
+Slur::pure_outside_slur_callback (SCM grob, SCM start_scm, SCM end_scm, SCM offset_scm)
{
- Grob * me = unsmob_grob (smob);
- if (!scm_ilength (me->get_property ("note-columns")))
- {
- me->suicide ();
- return SCM_EOL;
- }
-
- Real base_thick = robust_scm2double (me->get_property ("thickness"), 1);
- Real thick = base_thick * Staff_symbol_referencer::line_thickness (me);
-
- Real ss = Staff_symbol_referencer::staff_space (me);
- Bezier one = get_curve (me);
-
- // get_curve may suicide
- if (!scm_ilength (me->get_property ("note-columns")))
- return SCM_EOL;
-
- Stencil a;
-
- /*
- TODO: replace dashed with generic property.
- */
- SCM d = me->get_property ("dashed");
- if (ly_c_number_p (d))
- a = Lookup::dashed_slur (one, thick, thick * robust_scm2double (d, 0));
- else
- a = Lookup::slur (one, get_grob_direction (me) * base_thick * ss / 10.0,
- thick);
-
- return a.smobbed_copy ();
+ 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"));
+ if (!slur)
+ return offset_scm;
+
+ SCM avoid = script->get_property ("avoid-slur");
+ if (avoid != ly_symbol2scm ("outside") && 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);
}
-void
-Old_slur::set_control_points (Grob*me)
+MAKE_SCHEME_CALLBACK_WITH_OPTARGS (Slur, outside_slur_callback, 2, 1, "");
+SCM
+Slur::outside_slur_callback (SCM grob, SCM offset_scm)
{
- Real staff_space = Staff_symbol_referencer::staff_space ((Grob*)me);
+ Grob *script = unsmob_grob (grob);
+ Grob *slur = unsmob_grob (script->get_object ("slur"));
- SCM details = me->get_property ("details");
- SCM h_inf_scm = me->get_property ("height-limit");
- SCM r_0_scm = me->get_property ("ratio");
+ if (!slur)
+ return offset_scm;
- Real r_0 = robust_scm2double (r_0_scm, 1);
- Real h_inf = staff_space * ly_scm2double (h_inf_scm);
+ SCM avoid = script->get_property ("avoid-slur");
+ if (avoid != ly_symbol2scm ("outside")
+ && avoid != ly_symbol2scm ("around"))
+ return offset_scm;
- Slur_bezier_bow bb (get_encompass_offsets (me),
- get_grob_direction (me),
- h_inf, r_0);
-
-
- if (bb.fit_factor () > 1.0)
- {
- Real length = bb.curve_.control_[3][X_AXIS];
- Real default_height = slur_height (length, h_inf, r_0);
+ Direction dir = get_grob_direction (script);
+ if (dir == CENTER)
+ return offset_scm;
- SCM ssb = me->get_property ("beautiful");
- Real sb = 0;
- if (ly_c_number_p (ssb))
- sb = ly_scm2double (ssb);
+ Grob *cx = script->common_refpoint (slur, X_AXIS);
+ Grob *cy = script->common_refpoint (slur, Y_AXIS);
- bb.minimise_enclosed_area (sb, details);
- SCM sbf = scm_assq (ly_symbol2scm ("force-blowfit"), details);
- Real bff = 1.0;
- if (ly_c_pair_p (sbf) && ly_c_number_p (ly_cdr (sbf)))
- bff = ly_scm2double (ly_cdr (sbf));
+ Bezier curve = Slur::get_curve (slur);
- bb.curve_.control_[1][Y_AXIS] *= bff;
- bb.curve_.control_[2][Y_AXIS] *= bff;
- bb.blow_fit ();
+ curve.translate (Offset (slur->relative_coordinate (cx, X_AXIS),
+ slur->relative_coordinate (cy, Y_AXIS)));
-
- Real beautiful = length * default_height * sb;
- Real area = bb.get_enclosed_area ();
-
- /*
- Slurs that fit beautifully are not ugly
- */
- if (area > beautiful)
- de_uglify (me, &bb, default_height);
- }
+ Interval yext = robust_relative_extent (script, cy, Y_AXIS);
+ Interval xext = robust_relative_extent (script, cx, X_AXIS);
- Bezier b = bb.get_bezier ();
-
-
- SCM controls = SCM_EOL;
- for (int i= 4; i--;)
+ Real offset = robust_scm2double (offset_scm, 0);
+ yext.translate (offset);
+
+ /* FIXME: slur property, script property? */
+ Real slur_padding = robust_scm2double (script->get_property ("slur-padding"),
+ 0.0);
+ yext.widen (slur_padding);
+
+ Real EPS = 1e-3;
+ Interval bezext (curve.control_[0][X_AXIS], curve.control_[3][X_AXIS]);
+ bool consider[] = { false, false, false };
+ Real ys[] = {0, 0, 0};
+ bool do_shift = false;
+
+ for (int d = LEFT, k = 0; d <= RIGHT; d++, k++)
{
- controls = scm_cons (ly_offset2scm (b.control_[i]), controls);
- /*
- BRRR WHURG.
- All these null control-points, where do they all come from?
- */
- if (i && b.control_[i][X_AXIS] == 0)
+ Real x = xext.linear_combination ((Direction) d);
+ consider[k] = bezext.contains (x);
+
+ if (consider[k])
{
- me->suicide ();
- return;
+ ys[k]
+ = (fabs (bezext[LEFT] - x) < EPS)
+ ? curve.control_[0][Y_AXIS]
+ : ((fabs (bezext[RIGHT] - x) < EPS)
+ ? curve.control_[3][Y_AXIS]
+ : curve.get_other_coordinate (X_AXIS, x));
+
+ /* Request shift if slur is contained script's Y, or if
+ script is inside slur and avoid == outside. */
+ if (yext.contains (ys[k])
+ || (dir * ys[k] > dir * yext[-dir] && avoid == ly_symbol2scm ("outside")))
+ do_shift = true;
}
}
- me->set_property ("control-points", controls);
-}
+ 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)));
-Bezier
-Old_slur::get_curve (Grob*me)
-{
- Bezier b;
- int i = 0;
-
- SCM attach = me->get_property ("attachment");
- if (!ly_c_pair_p (attach))
- attach = set_extremities (me);
+ return scm_from_double (offset + avoidance_offset);
+}
+/*
+ * Used by Slur_engraver:: and Phrasing_slur_engraver::
+ */
+void
+Slur::auxiliary_acknowledge_extra_object (Grob_info const &info,
+ vector<Grob*> &slurs,
+ vector<Grob*> &end_slurs)
+{
+ if (slurs.empty () && end_slurs.empty ())
+ return;
- if (!get_grob_direction (me)
- || ! ly_c_symbol_p (index_get_cell (attach, LEFT))
- || ! ly_c_symbol_p (index_get_cell (attach, RIGHT)))
- set_extremities (me);
-
- if (!ly_c_pair_p (me->get_property ("control-points")))
- set_control_points (me);
-
- // set_control_points may suicide
- if (!scm_ilength (me->get_property ("note-columns")))
- return b;
-
- for (SCM s= me->get_property ("control-points"); s != SCM_EOL; s = ly_cdr (s))
+ Grob *e = info.grob ();
+ SCM avoid = e->get_property ("avoid-slur");
+ if (Tie::has_interface (e)
+ || avoid == ly_symbol2scm ("inside"))
{
- b.control_[i] = ly_scm2offset (ly_car (s));
- i++;
+ 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);
}
-
- Array<Offset> enc (get_encompass_offsets (me));
- Direction dir = get_grob_direction (me);
-
- Real x1 = enc[0][X_AXIS];
- Real x2 = enc.top ()[X_AXIS];
-
- Real off = 0.0;
- for (int i=1; i < enc.size ()-1; i++)
+ else if (avoid == ly_symbol2scm ("outside")
+ || avoid == ly_symbol2scm ("around"))
{
- Real x = enc[i][X_AXIS];
- if (x > x1 && x <x2)
+ Grob *slur;
+ if (end_slurs.size () && !slurs.size ())
+ slur = end_slurs[0];
+ else
+ slur = slurs[0];
+
+ if (slur)
{
- Real y = b.get_other_coordinate (X_AXIS, x);
- off = off >? dir * (enc[i][Y_AXIS] - y);
+ chain_offset_callback (e, outside_slur_callback_proc, Y_AXIS);
+ e->set_object ("slur", slur->self_scm ());
}
}
- b.translate (Offset (0, dir * off));
- return b;
+ else
+ e->warning ("Ignoring grob for slur. avoid-slur not set?");
}
+MAKE_SCHEME_CALLBACK (Slur, cross_staff, 1)
+SCM
+Slur::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);
+
+ 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;
+}
-
-
-ADD_INTERFACE (Old_slur,"slur-interface",
- "A slur",
- "attachment attachment-offset beautiful control-points dashed details de-uglify-parameters direction extremity-function extremity-offset-alist height-limit note-columns ratio slope-limit thickness y-free quant-score");
+ADD_INTERFACE (Slur,
+
+ "A slur",
+
+ /* properties */
+ "avoid-slur " /* UGH. */
+ "control-points "
+ "dash-fraction "
+ "dash-period "
+ "details "
+ "direction "
+ "eccentricity "
+ "encompass-objects "
+ "height-limit "
+ "inspect-quants "
+ "inspect-index "
+ "line-thickness "
+ "note-columns "
+ "positions "
+ "quant-score "
+ "ratio "
+ "thickness "
+ );
projects / lilypond.git / blobdiff