source file of the GNU LilyPond music typesetter
- (c) 1996, 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1996--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
Jan Nieuwenhuizen <janneke@gnu.org>
*/
/*
[TODO]
+ * fix broken interstaff slurs
+ * should avoid stafflines with horizontal part.
* begin and end should be treated as a/acknowledge Scripts.
- * broken slur should have uniform trend
+ * smart changing of endings
+ * smart changing of (Y-?)offsets to avoid ugly beziers
+ (along-side-stem)
*/
#include "directional-element-interface.hh"
#include "paper-column.hh"
#include "molecule.hh"
#include "debug.hh"
-#include "box.hh"
-#include "bezier.hh"
-#include "bezier-bow.hh"
+#include "slur-bezier-bow.hh"
#include "main.hh"
-#include "cross-staff.hh"
#include "group-interface.hh"
+#include "staff-symbol-referencer.hh"
+#include "spanner.hh"
-Slur::Slur ()
+
+void
+Slur::set_interface (Score_element*me)
{
- dy_f_drul_[LEFT] = dy_f_drul_[RIGHT] = 0.0;
- dx_f_drul_[LEFT] = dx_f_drul_[RIGHT] = 0.0;
- set_elt_property ("note-columns", SCM_EOL);
+ me->set_elt_property ("attachment", gh_cons (SCM_BOOL_F, SCM_BOOL_F));
+ me->set_interface (ly_symbol2scm ("slur-interface"));
}
void
-Slur::add_column (Note_column*n)
+Slur::add_column (Score_element*me, Score_element*n)
{
if (!gh_pair_p (n->get_elt_property ("note-heads")))
warning (_ ("Putting slur over rest. Ignoring."));
else
{
- Group_interface gi (this, "note-columns");
- gi.add_element (n);
- add_dependency (n);
+ Pointer_group_interface::add_element (me, "note-columns",n);
+ me->add_dependency (n);
}
+
+ add_bound_item (dynamic_cast<Spanner*> (me), dynamic_cast<Item*>(n));
+}
+
+void
+Slur::de_uglyfy (Score_element*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++)
+ {
+ 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_elt_property ("de-uglify-parameters");
+
+ Real c1 = gh_scm2double (gh_car (up));
+ Real c2 = gh_scm2double (gh_cadr (up));
+ Real c3 = gh_scm2double (gh_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 ();
}
Direction
-Slur::get_default_dir () const
+Slur::get_default_dir (Score_element*me)
{
- Link_array<Note_column> encompass_arr =
- Group_interface__extract_elements (this, (Note_column*)0, "note-columns");
+ Link_array<Score_element> encompass_arr =
+ Pointer_group_interface__extract_elements (me, (Score_element*)0, "note-columns");
Direction d = DOWN;
for (int i=0; i < encompass_arr.size (); i ++)
{
- if (encompass_arr[i]->dir () < 0)
+ if (Note_column::dir (encompass_arr[i]) < 0)
{
d = UP;
break;
return d;
}
-void
-Slur::do_add_processing ()
-{
- Link_array<Note_column> encompass_arr =
- Group_interface__extract_elements (this, (Note_column*)0, "note-columns");
- if (encompass_arr.size ())
+MAKE_SCHEME_CALLBACK (Slur, after_line_breaking,1);
+SCM
+Slur::after_line_breaking (SCM smob)
+{
+ Score_element *me = unsmob_element (smob);
+ if (!scm_ilength (me->get_elt_property ("note-columns")))
{
- set_bounds (LEFT, encompass_arr[0]);
- if (encompass_arr.size () > 1)
- set_bounds (RIGHT, encompass_arr.top ());
+ me->suicide ();
+ return SCM_UNSPECIFIED;
}
-}
+ set_extremities (me);
+ set_control_points (me);
+ return SCM_UNSPECIFIED;
+}
-
-Offset
-Slur::encompass_offset (Note_column const* col) const
+void
+Slur::check_slope (Score_element *me)
{
- Offset o;
- Stem* stem_l = col->stem_l ();
- Direction dir = directional_element (this).get ();
-
- if (!stem_l)
- {
- warning (_ ("Slur over rest?"));
- o[X_AXIS] = col->hpos_f ();
- o[Y_AXIS] = col->extent (Y_AXIS)[dir];
- return o;
- }
- Direction stem_dir = directional_element (stem_l).get ();
- o[X_AXIS] = stem_l->hpos_f ();
-
/*
- Simply set x to middle of notehead
+ Avoid too steep slurs.
*/
+ SCM s = me->get_elt_property ("slope-limit");
+ if (gh_number_p (s))
+ {
+ Array<Offset> encompass = get_encompass_offset_arr (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);
- o[X_AXIS] -= 0.5 * stem_dir * col->extent (X_AXIS).length ();
+ Real limit = gh_scm2double (s);
- if ((stem_dir == dir)
- && !stem_l->extent (Y_AXIS).empty_b ())
- {
- o[Y_AXIS] = stem_l->extent (Y_AXIS)[dir];
- }
- else
- {
- o[Y_AXIS] = col->extent (Y_AXIS)[dir];
+ if (slope > limit)
+ {
+ Real staff_space = Staff_symbol_referencer::staff_space ((Score_element*)me);
+ Direction dir = (Direction)gh_scm2int (me->get_elt_property ("direction"));
+ Direction d = (Direction)(- dir * (sign (dy)));
+ SCM a = me->get_elt_property ("attachment-offset");
+ Drul_array<Offset> o;
+ o[LEFT] = ly_scm2offset (index_cell (a, LEFT));
+ o[RIGHT] = ly_scm2offset (index_cell (a, RIGHT));
+ o[d][Y_AXIS] -= (limit - slope) * dx * dir / staff_space;
+ //o[d][Y_AXIS] = attachment[-d][Y_AXIS] + (dx * limit * dir / staff_space);
+ me->set_elt_property ("attachment-offset",
+ gh_cons (ly_offset2scm (o[LEFT]),
+ ly_offset2scm (o[RIGHT])));
+ }
}
-
- /*
- leave a gap: slur mustn't touch head/stem
- */
- o[Y_AXIS] += dir * paper_l ()->get_var ("slur_y_free");
- o[Y_AXIS] -= calc_interstaff_dist (stem_l, this);
- return o;
}
-/*
- ARGRARGRARGRARGAR!
-
- Fixme
- */
void
-Slur::do_post_processing ()
+Slur::set_extremities (Score_element *me)
{
- Link_array<Note_column> encompass_arr =
- Group_interface__extract_elements (this, (Note_column*)0, "note-columns");
-
- if (!encompass_arr.size ())
- {
- set_elt_property ("transparent", SCM_BOOL_T);
- set_empty (X_AXIS);
- set_empty (Y_AXIS);
- return;
- }
-
- if (!directional_element (this).get ())
- directional_element (this).set (get_default_dir ());
-
-
- /*
- Slur and tie placement [OSU]
-
- Slurs:
- * x = centre of head - d * x_gap_f
-
- TODO:
- * y = length < 5ss : horizontal tangent + d * 0.25 ss
- y = length >= 5ss : y next interline - d * 0.25 ss
- */
-
- Real staff_space = paper_l ()->get_var ("interline");
- Real half_staff_space = staff_space / 2;
-
- Real x_gap_f = paper_l ()->get_var ("slur_x_gap");
- Real y_gap_f = paper_l ()->get_var ("slur_y_gap");
+ if (!Directional_element_interface::get (me))
+ Directional_element_interface::set (me, get_default_dir (me));
- Drul_array<Note_column*> note_column_drul;
- note_column_drul[LEFT] = encompass_arr[0];
- note_column_drul[RIGHT] = encompass_arr.top ();
-
- bool fix_broken_b = false;
-
- Direction my_dir = directional_element (this).get ();
-
- Direction d = LEFT;
+ Direction dir = LEFT;
do
{
- dx_f_drul_[d] = 0;
- dy_f_drul_[d] = 0;
-
- if ((note_column_drul[d] == spanned_drul_[d])
- && note_column_drul[d]->first_head ()
- && (note_column_drul[d]->stem_l ()))
+ if (!gh_symbol_p (index_cell (me->get_elt_property ("attachment"), dir)))
{
- Stem* stem_l = note_column_drul[d]->stem_l ();
- /*
- side directly attached to note head;
- no beam getting in the way
- */
- if ((stem_l->extent (Y_AXIS).empty_b ()
- || !((stem_l->get_direction () == my_dir) && (my_dir != d)))
- && !((my_dir == stem_l->get_direction ())
- && stem_l->beam_l () && (stem_l->beam_count (-d) >= 1)))
- {
- dx_f_drul_[d] = spanned_drul_[d]->extent (X_AXIS).length () / 2;
- dx_f_drul_[d] -= d * x_gap_f;
-
- if (stem_l->get_direction () != my_dir)
- {
- dy_f_drul_[d] = note_column_drul[d]->extent (Y_AXIS)[my_dir];
- }
- else
- {
- dy_f_drul_[d] = stem_l->chord_start_f ()
- + my_dir * half_staff_space;
- }
- dy_f_drul_[d] += my_dir * y_gap_f;
- }
- /*
- side attached to (visible) stem
- */
- else
+ for (SCM s = me->get_elt_property ("extremity-rules");
+ s != SCM_EOL; s = gh_cdr (s))
{
- dx_f_drul_[d] = stem_l->hpos_f ()
- - spanned_drul_[d]->relative_coordinate (0, X_AXIS);
- /*
- side attached to beamed stem
- */
- if (stem_l->beam_l () && (stem_l->beam_count (-d) >= 1))
- {
- dy_f_drul_[d] = stem_l->extent (Y_AXIS)[my_dir];
- dy_f_drul_[d] += my_dir * 2 * y_gap_f;
- }
- /*
- side attached to notehead, with stem getting in the way
- */
- else
+ SCM r = gh_call2 (gh_caar (s), me->self_scm (),
+ gh_int2scm ((int)dir));
+ if (r != SCM_BOOL_F)
{
- dx_f_drul_[d] -= d * x_gap_f;
-
- dy_f_drul_[d] = stem_l->chord_start_f ()
- + my_dir * half_staff_space;
- dy_f_drul_[d] += my_dir * y_gap_f;
+ index_set_cell (me->get_elt_property ("attachment"), dir,
+ gh_cdar (s));
+ break;
}
}
}
- /*
- loose end
- */
- else
- {
- dx_f_drul_[d] = get_broken_left_end_align ();
-
- /*
- broken: should get y from other piece, so that slur
- continues up/down trend
-
- for now: be horizontal..
- */
- fix_broken_b = true;
- }
}
- while (flip (&d) != LEFT);
+ while (flip (&dir) != LEFT);
- int cross_count = cross_staff_count ();
- bool interstaff_b = (0 < cross_count) && (cross_count < encompass_arr.size ());
+ check_slope (me);
+}
- Drul_array<Offset> info_drul;
- Drul_array<Real> interstaff_interval;
- do
+Real
+Slur::get_first_notecolumn_y (Score_element *me, Direction dir)
+{
+ Score_element *col = dir == LEFT
+ ? unsmob_element (gh_car (scm_reverse (me->get_elt_property
+ ("note-columns"))))
+ : unsmob_element
+ (gh_car (me->get_elt_property ("note-columns")));
+
+ Score_element *common[] =
+ {
+ 0,
+ me->common_refpoint (col, Y_AXIS)
+ };
+ Real y;
+ if (col == ((Spanner*)me)->get_bound (dir))
{
- info_drul[d] = encompass_offset (encompass_arr.boundary (d, 0));
- interstaff_interval[d] = - calc_interstaff_dist (encompass_arr.boundary (d,0),
- this);
+ y = get_attachment (me, dir, common)[Y_AXIS];
}
- while (flip (&d) != LEFT);
-
- Real interstaff_f = interstaff_interval[RIGHT] - interstaff_interval[LEFT];
+ else
+ {
+ y = encompass_offset (me, col, common)[Y_AXIS]
+ - me->relative_coordinate (common[Y_AXIS], Y_AXIS);
+ }
+ return y;
+}
- if (fix_broken_b)
+Offset
+Slur::broken_trend_offset (Score_element *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_l_))
{
- Direction d = (encompass_arr.top () != spanned_drul_[RIGHT]) ?
- RIGHT : LEFT;
- dy_f_drul_[d] = info_drul[d][Y_AXIS];
- if (!interstaff_b)
+ for (int i = dir == LEFT ? 0 : mother->broken_into_l_arr_.size () - 1;
+ dir == LEFT ? i < mother->broken_into_l_arr_.size () : i > 0;
+ dir == LEFT ? i++ : i--)
{
- dy_f_drul_[d] -= interstaff_interval[d];
- if (cross_count) // interstaff_i ?
+ if (mother->broken_into_l_arr_[i - dir] == me)
{
- dy_f_drul_[LEFT] += interstaff_interval[d];
- dy_f_drul_[RIGHT] += interstaff_interval[d];
+ Score_element *neighbour = mother->broken_into_l_arr_[i];
+ if (dir == RIGHT)
+ neighbour->set_elt_property ("direction",
+ me->get_elt_property ("direction"));
+ Real neighbour_y = get_first_notecolumn_y (neighbour, dir);
+ Real y = get_first_notecolumn_y (me, -dir);
+ int neighbour_cols = scm_ilength (neighbour->get_elt_property ("note-columns"));
+ int cols = scm_ilength (me->get_elt_property ("note-columns"));
+ o = Offset (0, (y*neighbour_cols + neighbour_y*cols) /
+ (cols + neighbour_cols));
+ break;
}
}
}
-
- if (!fix_broken_b)
- dy_f_drul_[RIGHT] += interstaff_f;
-
-
-
- return;
-
- /*
- Now we've got a fine slur
- Catch and correct some ugly cases
- */
- String infix = interstaff_b ? "interstaff_" : "";
- Real height_damp_f = paper_l ()->get_var ("slur_"+infix +"height_damping");
- Real slope_damp_f = paper_l ()->get_var ("slur_"+infix +"slope_damping");
- Real snap_f = paper_l ()->get_var ("slur_"+infix +"snap_to_stem");
- Real snap_max_dy_f = paper_l ()->get_var ("slur_"+infix +"snap_max_slope_change");
-
- Real dx_f = spanner_length ()+ dx_f_drul_[RIGHT] - dx_f_drul_[LEFT];
- Real dy_f = dy_f_drul_[RIGHT] - dy_f_drul_[LEFT];
- if (!fix_broken_b)
- dy_f -= interstaff_f;
+ return o;
+}
- /*
- Avoid too steep slurs.
- */
- Real slope_ratio_f = abs (dy_f / dx_f);
- if (slope_ratio_f > slope_damp_f)
+Offset
+Slur::get_attachment (Score_element *me, Direction dir,
+ Score_element **common)
+{
+ SCM s = me->get_elt_property ("attachment");
+ if (!gh_symbol_p (index_cell (s, dir)))
{
- Direction d = (Direction)(- my_dir * (sign (dy_f)));
- if (!d)
- d = LEFT;
- Real damp_f = (slope_ratio_f - slope_damp_f) * dx_f;
- /*
- must never change sign of dy
- */
- damp_f = damp_f <? abs (dy_f);
- dy_f_drul_[d] += my_dir * damp_f;
+ set_extremities (me);
+ s = me->get_elt_property ("attachment");
}
-
- /*
- Avoid too high slurs
-
- Wierd slurs may look a lot better after they have been
- adjusted a bit.
- So, we'll do this in 3 steps
- */
- for (int i = 0; i < 3; i++)
+ SCM a = dir == LEFT ? gh_car (s) : gh_cdr (s);
+ Spanner*sp = dynamic_cast<Spanner*>(me);
+ String str = ly_symbol2string (a);
+ Real staff_space = Staff_symbol_referencer::staff_space ((Score_element*)me);
+ Real hs = staff_space / 2.0;
+ Offset o;
+
+ Score_element *stem = 0;
+ if (Note_column::has_interface (sp->get_bound (dir)))
{
- Bezier c (get_curve ());
-
- Offset size (c.extent (X_AXIS).length (),
- c.extent (Y_AXIS).length ());
-
- dy_f = dy_f_drul_[RIGHT] - dy_f_drul_[LEFT];
- if (!fix_broken_b)
- dy_f -= interstaff_f;
-
- Real height_ratio_f = abs (size[Y_AXIS] / size[X_AXIS]);
- if (height_ratio_f > height_damp_f)
+ Score_element * n =sp->get_bound (dir);
+ if ((stem = Note_column::stem_l (n)))
{
- Direction d = (Direction)(- my_dir * (sign (dy_f)));
- if (!d)
- d = LEFT;
- /* take third step */
- Real damp_f = (height_ratio_f - height_damp_f) * size[X_AXIS] / 3;
- /*
- if y positions at about the same height, correct both ends
- */
- if (abs (dy_f / dx_f ) < slope_damp_f)
+
+ if (str == "head")
+ {
+ o = Offset (0, Stem::head_positions (stem)
+ [Directional_element_interface::get (me)] * hs);
+ /*
+ Default position is centered in X, on outer side of head Y
+ */
+ o += Offset (0.5 * n->extent (n,X_AXIS).length (),
+ 0.5 * staff_space
+ * Directional_element_interface::get (me));
+ }
+ else if (str == "alongside-stem")
{
- dy_f_drul_[-d] += my_dir * damp_f;
- dy_f_drul_[d] += my_dir * damp_f;
+ o = Offset (0, Stem::chord_start_f (stem));
+ /*
+ Default position is on stem X, on outer side of head Y
+ */
+ o += Offset (n->extent (n,X_AXIS).length ()
+ * (1 + Stem::get_direction (stem)),
+ 0.5 * staff_space
+ * Directional_element_interface::get (me));
}
- /*
- don't change slope too much, would have been catched by slope damping
- */
- else
+ else if (str == "stem")
{
- damp_f = damp_f <? abs (dy_f/2);
- dy_f_drul_[d] += my_dir * damp_f;
+ o = Offset (0, Stem::stem_end_position (stem) * hs);
+ /*
+ Default position is on stem X, at stem end Y
+ */
+ o += Offset (0.5 *
+ (n->extent (n,X_AXIS).length ()
+ - stem->extent (stem,X_AXIS).length ())
+ * (1 + Stem::get_direction (stem)),
+ 0);
}
}
}
-
- /*
- If, after correcting, we're close to stem-end...
- */
- Drul_array<Real> snapy_f_drul;
- snapy_f_drul[LEFT] = snapy_f_drul[RIGHT] = 0;
- Drul_array<Real> snapx_f_drul;
- snapx_f_drul[LEFT] = snapx_f_drul[RIGHT] = 0;
- Drul_array<bool> snapped_b_drul;
- snapped_b_drul[LEFT] = snapped_b_drul[RIGHT] = false;
- do
+ else if (str == "loose-end")
{
- Note_column * nc = note_column_drul[d];
- if (nc == spanned_drul_[d]
- && nc->stem_l ()
- && nc->stem_l ()->get_direction () == my_dir
- && abs (nc->stem_l ()->extent (Y_AXIS)[my_dir]
- - dy_f_drul_[d] + (d == LEFT ? 0 : interstaff_f))
- <= snap_f)
+ SCM other_a = dir == LEFT ? gh_cdr (s) : gh_car (s);
+ if (ly_symbol2string (other_a) != "loose-end")
{
+#if 0
/*
- prepare to attach to stem-end
+ The braindead way: horizontal
*/
- snapx_f_drul[d] = nc->stem_l ()->hpos_f ()
- - spanned_drul_[d]->relative_coordinate (0, X_AXIS);
+ o = Offset (0, get_attachment (me, -dir, common)[Y_AXIS]);
+#else
+ o = broken_trend_offset (me, dir);
+#endif
- snapy_f_drul[d] = nc->stem_l ()->extent (Y_AXIS)[my_dir]
- + interstaff_interval[d]
- + my_dir * 2 * y_gap_f;
- snapped_b_drul[d] = true;
}
+
}
- while (flip (&d) != LEFT);
- /*
- only use snapped positions if sign (dy) will not change
- and dy doesn't change too much
- */
- if (!fix_broken_b)
- dy_f += interstaff_f;
+ SCM alist = me->get_elt_property ("extremity-offset-alist");
+int stemdir = stem ? Stem::get_direction (stem) : 1;
+ int slurdir = gh_scm2int (me->get_elt_property ("direction"));
+ SCM l = scm_assoc
+ (scm_listify (a,
+ gh_int2scm (stemdir * dir),
+ gh_int2scm (slurdir * dir),
+ SCM_UNDEFINED), alist);
+ if (l != SCM_BOOL_F)
+ {
+ o += ly_scm2offset (gh_cdr (l)) * staff_space * dir;
+ }
/*
- (sigh)
-
- More refactoring could be done.
+ What if get_bound () is not a note-column?
*/
- Real maxsnap = abs (dy_f * snap_max_dy_f);
- if (snapped_b_drul[LEFT] && snapped_b_drul[RIGHT]
- && ((sign (snapy_f_drul[RIGHT] - snapy_f_drul[LEFT]) == sign (dy_f)))
- && (!dy_f || (abs (snapy_f_drul[RIGHT] - snapy_f_drul[LEFT] - dy_f)
- < maxsnap)))
- {
- dy_f_drul_ = snapy_f_drul;
- dx_f_drul_ = snapx_f_drul;
+ 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);
}
- else
- do
- {
- Direction od = (Direction)-d;
- if (snapped_b_drul[d]
- && d * sign (snapy_f_drul[d] - dy_f_drul_[od]) == sign (dy_f)
- && (!dy_f || (abs (snapy_f_drul[d] - dy_f_drul_[od] - d * dy_f)
- < maxsnap)))
- {
- dy_f_drul_[d] = snapy_f_drul[d];
- dx_f_drul_[d] = snapx_f_drul[d];
- }
- }
- while (flip (&d) != LEFT);
-}
+ o += ly_scm2offset (index_cell (me->get_elt_property ("attachment-offset"),
+ dir)) * staff_space;
+ return o;
+}
-int
-Slur::cross_staff_count ()const
+Offset
+Slur::encompass_offset (Score_element*me,
+ Score_element* col,
+ Score_element **common)
{
- Link_array<Note_column> encompass_arr =
- Group_interface__extract_elements (this, (Note_column*)0, "note-columns");
+ Offset o;
+ Score_element* stem_l = unsmob_element (col->get_elt_property ("stem"));
+
+ Direction dir = Directional_element_interface::get (me);
+
+ if (!stem_l)
+ {
+ warning (_ ("Slur over rest?"));
+ 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 = Directional_element_interface::get (stem_l);
+ o[X_AXIS] = stem_l->relative_coordinate (0, X_AXIS);
- int k=0;
+ /*
+ Simply set x to middle of notehead
+ */
+
+ o[X_AXIS] -= 0.5 * stem_dir * col->extent (col,X_AXIS).length ();
- for (int i = 0; i < encompass_arr.size (); i++)
+ if ((stem_dir == dir)
+ && !stem_l->extent (stem_l, Y_AXIS).empty_b ())
{
- if (calc_interstaff_dist (encompass_arr[i], this))
- k++;
+ o[Y_AXIS] = stem_l->extent (common[Y_AXIS], Y_AXIS)[dir];
+ }
+ else
+ {
+ o[Y_AXIS] = col->extent (common[Y_AXIS], Y_AXIS)[dir];
}
- return k;
-}
+ /*
+ leave a gap: slur mustn't touch head/stem
+ */
+ o[Y_AXIS] += dir * gh_scm2double (me->get_elt_property ("y-free")) *
+ 1.0;
+ return o;
+}
Array<Offset>
-Slur::get_encompass_offset_arr () const
+Slur::get_encompass_offset_arr (Score_element *me)
{
- Link_array<Note_column> encompass_arr =
- Group_interface__extract_elements (this, (Note_column*)0, "note-columns");
+ Spanner*sp = dynamic_cast<Spanner*>(me);
+ SCM eltlist = me->get_elt_property ("note-columns");
+ Score_element *common[] = {me->common_refpoint (eltlist, X_AXIS),
+ me->common_refpoint (eltlist, 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);
- Array<Offset> offset_arr;
-#if 0
- /*
- check non-disturbed slur
- FIXME: x of ends off by a tiny bit!!
- */
- offset_arr.push (Offset (0, dy_f_drul_[LEFT]));
- offset_arr.push (Offset (0, dy_f_drul_[RIGHT]));
- return offset_arr;
-#endif
+ Link_array<Score_element> encompass_arr;
+ while (gh_pair_p (eltlist))
+ {
+ encompass_arr.push (unsmob_element (gh_car (eltlist)));
+ eltlist =gh_cdr (eltlist);
+ }
+ encompass_arr.reverse ();
+
- Offset origin (relative_coordinate (0, X_AXIS), 0);
+ Array<Offset> offset_arr;
+
+ Offset origin (me->relative_coordinate (common[X_AXIS], X_AXIS),
+ me->relative_coordinate (common[Y_AXIS], Y_AXIS));
int first = 1;
int last = encompass_arr.size () - 2;
- offset_arr.push (Offset (dx_f_drul_[LEFT], dy_f_drul_[LEFT]));
+ offset_arr.push (get_attachment (me, LEFT, common));
/*
left is broken edge
*/
- int cross_count = cross_staff_count ();
- bool cross_b = cross_count && cross_count < encompass_arr.size ();
- if (encompass_arr[0] != spanned_drul_[LEFT])
+ if (encompass_arr[0] != sp->get_bound (LEFT))
{
first--;
- Real is = calc_interstaff_dist (encompass_arr[0], this);
- if (cross_b)
- offset_arr[0][Y_AXIS] += is;
+
+ // ?
+ offset_arr[0][Y_AXIS] -=
+ encompass_arr[0]->relative_coordinate (common[Y_AXIS], Y_AXIS)
+ - me->relative_coordinate (common[Y_AXIS], Y_AXIS);
}
/*
right is broken edge
*/
- if (encompass_arr.top () != spanned_drul_[RIGHT])
+ if (encompass_arr.top () != sp->get_bound (RIGHT))
{
last++;
}
for (int i = first; i <= last; i++)
{
- Offset o (encompass_offset (encompass_arr[i]));
+ Offset o (encompass_offset (me, encompass_arr[i], common));
offset_arr.push (o - origin);
}
- offset_arr.push (Offset (spanner_length ()+ dx_f_drul_[RIGHT],
- dy_f_drul_[RIGHT]));
+ offset_arr.push (Offset (sp->spanner_length (), 0) + get_attachment (me, RIGHT,common));
+
+ if (encompass_arr[0] != sp->get_bound (LEFT))
+ {
+ offset_arr.top ()[Y_AXIS] -= encompass_arr.top ()->relative_coordinate (common[Y_AXIS], Y_AXIS)
+ - me->relative_coordinate (common[Y_AXIS], Y_AXIS);
+ }
return offset_arr;
}
-Array<Rod>
-Slur::get_rods () const
+MAKE_SCHEME_CALLBACK(Slur,set_spacing_rods,1);
+SCM
+Slur::set_spacing_rods (SCM smob)
{
- Array<Rod> a;
- Rod r;
- r.item_l_drul_ = spanned_drul_;
- r.distance_f_ = paper_l ()->get_var ("slur_x_minimum");
+ Score_element*me = unsmob_element (smob);
- a.push (r);
- return a;
+ Rod r;
+ Spanner*sp = dynamic_cast<Spanner*>(me);
+ r.item_l_drul_[LEFT] = sp->get_bound (LEFT);
+ r.item_l_drul_[RIGHT] = sp->get_bound (RIGHT);
+ r.distance_f_ =
+ gh_scm2double (me->get_elt_property ("minimum-length"))
+ * 1.0;
+
+ r.add_to_cols ();
+ return SCM_UNSPECIFIED;
}
-
-#if 0
+/*
+ Ugh should have dash-length + dash-period
+ */
+MAKE_SCHEME_CALLBACK (Slur, brew_molecule,1);
SCM
-ugly_scm (Bezier b)
+Slur::brew_molecule (SCM smob)
{
- b.translate (-b.control_[0]);
- Real alpha = b.control_[3].arg ();
-
- b.rotate ( -alpha);
- if (b.control_[1][Y_AXIS] < 0)
+ Score_element * me = unsmob_element (smob);
+ if (!scm_ilength (me->get_elt_property ("note-columns")))
{
- b.control_[1][Y_AXIS] *= -1;
- b.control_[2][Y_AXIS] *= -1;
+ me->suicide ();
+ return SCM_EOL;
}
- Real len = b.control_[3][X_AXIS];
- Real indent = 10 *b.control_[1][X_AXIS] / len ;
- Real ht = 10 *b.control_[1][Y_AXIS] / len ;
-
- SCM res = scm_eval (scm_listify (ly_symbol2scm ("slur-ugly"), gh_double2scm (indent), gh_double2scm (ht), SCM_UNDEFINED ));
-
- return res;
-}
-#endif
-
+ Real thick = me->paper_l ()->get_var ("stafflinethickness") *
+ gh_scm2double (me->get_elt_property ("thickness"));
+ Bezier one = get_curve (me);
-/*
- Ugh should have dash-length + dash-period
- */
-Molecule*
-Slur::do_brew_molecule_p () const
-{
- Real thick = paper_l ()->get_var ("slur_thickness");
- Bezier one = get_curve ();
+ // get_curve may suicide
+ if (!scm_ilength (me->get_elt_property ("note-columns")))
+ return SCM_EOL;
Molecule a;
- SCM d = get_elt_property ("dashed");
+ SCM d = me->get_elt_property ("dashed");
if (gh_number_p (d))
- a = lookup_l ()->dashed_slur (one, thick, thick * gh_scm2double (d));
+ a = Lookup::dashed_slur (one, thick, thick * gh_scm2double (d));
else
- a = lookup_l ()->slur (one, directional_element (this).get () * thick, thick);
+ a = Lookup::slur (one, Directional_element_interface::get (me) * thick, thick);
+
+ return a.create_scheme();
+}
+
+void
+Slur::set_control_points (Score_element*me)
+{
+ Real staff_space = Staff_symbol_referencer::staff_space ((Score_element*)me);
+
+ SCM details = me->get_elt_property ("details");
+ SCM h_inf_scm = scm_assq (ly_symbol2scm ("height-limit"), details);
+ SCM r_0_scm = scm_assq (ly_symbol2scm ("ratio"), details);
-#if 0
- SCM u = ugly_scm (one);
- if (gh_pair_p (u))
+ Real r_0 = gh_scm2double (gh_cdr (r_0_scm));
+ Real h_inf = staff_space * gh_scm2double (gh_cdr (h_inf_scm));
+
+ Slur_bezier_bow bb (get_encompass_offset_arr (me),
+ Directional_element_interface::get (me),
+ h_inf, r_0);
+
+ if (bb.fit_factor () > 1.0)
{
- Molecule mark = lookup_l ()-> text ( "roman",
- to_str (gh_scm2double (gh_car (u)), "%0.2f") + "," +
- to_str(gh_scm2double (gh_cdr (u)), "%0.2f"),
- paper_l ());
+ Real length = bb.curve_.control_[3][X_AXIS];
+ Real default_height = slur_height (length, h_inf, r_0);
+
+ SCM ssb = me->get_elt_property ("beautiful");
+ Real sb = 0;
+ if (gh_number_p (ssb))
+ sb = gh_scm2double (ssb);
+
+ bb.minimise_enclosed_area ( sb, details);
+ SCM sbf = scm_assq (ly_symbol2scm ("force-blowfit"), details);
+ Real bff = 1.0;
+ if (gh_pair_p (sbf) && gh_number_p (gh_cdr (sbf)))
+ bff = gh_scm2double (gh_cdr (sbf));
- mark.translate_axis (20 , Y_AXIS);
- a.add_molecule (mark);
+ bb.curve_.control_[1][Y_AXIS] *= bff;
+ bb.curve_.control_[2][Y_AXIS] *= bff;
+ bb.blow_fit ();
+
+
+ Real beautiful = length * default_height * sb;
+ Real area = bb.enclosed_area_f ();
+
+ /*
+ Slurs that fit beautifully are not ugly
+ */
+ if (area > beautiful)
+ de_uglyfy (me, &bb, default_height);
}
-#endif
- return new Molecule (a);
-}
+ Bezier b = bb.get_bezier ();
+ SCM controls = SCM_EOL;
+ for (int i= 4; i--;)
+ {
+ controls = gh_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)
+ {
+ me->suicide ();
+ return;
+ }
+ }
+
+ me->set_elt_property ("control-points", controls);
+}
+
Bezier
-Slur::get_curve () const
+Slur::get_curve (Score_element*me)
{
- Array<Offset> enc (get_encompass_offset_arr ());
- Direction dir = directional_element (this).get ();
- Bezier_bow b (enc,dir);
+ Bezier b;
+ int i = 0;
- b.ratio_ = paper_l ()->get_var ("slur_ratio");
- b.height_limit_ = paper_l ()->get_var ("slur_height_limit");
- b.rc_factor_ = paper_l ()->get_var ("slur_rc_factor");
+ if (!Directional_element_interface::get (me)
+ || ! gh_symbol_p (index_cell (me->get_elt_property ("attachment"), LEFT))
+ || ! gh_symbol_p (index_cell (me->get_elt_property ("attachment"), RIGHT)))
+ set_extremities (me);
+
+ if (!gh_pair_p (me->get_elt_property ("control-points")))
+ set_control_points (me);
- b.calculate ();
+ // set_control_points may suicide
+ if (!scm_ilength (me->get_elt_property ("note-columns")))
+ return b;
- Bezier curve = b.get_curve ();
+ for (SCM s= me->get_elt_property ("control-points"); s != SCM_EOL; s = gh_cdr (s))
+ {
+ b.control_[i] = ly_scm2offset (gh_car (s));
+ i++;
+ }
+ Array<Offset> enc (get_encompass_offset_arr (me));
+ Direction dir = Directional_element_interface::get (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++)
{
Real x = enc[i][X_AXIS];
if (x > x1 && x <x2)
{
- Real y = curve.get_other_coordinate (X_AXIS, x);
+ Real y = b.get_other_coordinate (X_AXIS, x);
off = off >? dir * (enc[i][Y_AXIS] - y);
}
}
- curve.translate (Offset (0, dir * off));
- return curve;
+ b.translate (Offset (0, dir * off));
+ return b;
}
+
+bool
+Slur::has_interface (Score_element*me)
+{
+ return me->has_interface (ly_symbol2scm ("slur-interface"));
+}
+
+
projects / lilypond.git / blobdiff