/*
[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)
warning (_ ("Putting slur over rest. Ignoring."));
else
{
- Pointer_group_interface (me, "note-columns").add_element (n);
+ Pointer_group_interface::add_element (me, "note-columns",n);
me->add_dependency (n);
}
Real h = bb->curve_.control_[i][Y_AXIS] * ff / length;
Real f = default_height / length;
- Real c1 = me->paper_l ()->get_var ("bezier_control1");
- Real c2 = me->paper_l ()->get_var ("bezier_control2");
- Real c3 = me->paper_l ()->get_var ("bezier_control3");
+ 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;
}
-
-
-
-Offset
-Slur::encompass_offset (Score_element*me,
- Score_element* col,
- Score_element **common)
-{
- Offset o;
- Score_element* stem_l = unsmob_element (col->get_elt_property ("stem"));
-
- Direction dir = Directional_element_interface (me).get ();
-
- 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 (stem_l).get ();
- o[X_AXIS] = stem_l->relative_coordinate (0, X_AXIS);
-
- /*
- Simply set x to middle of notehead
- */
-
- o[X_AXIS] -= 0.5 * stem_dir * col->extent (X_AXIS).length ();
-
- if ((stem_dir == dir)
- && !stem_l->extent (Y_AXIS).empty_b ())
- {
- o[Y_AXIS] = stem_l->relative_coordinate (common[Y_AXIS], Y_AXIS); // iuhg
- o[Y_AXIS] += stem_l->extent (Y_AXIS)[dir];
- }
- else
- {
- o[Y_AXIS] = col->relative_coordinate (common[Y_AXIS], Y_AXIS); // ugh
- o[Y_AXIS] += col->extent (Y_AXIS)[dir];
- }
-
- /*
- leave a gap: slur mustn't touch head/stem
- */
- o[Y_AXIS] += dir * me->paper_l ()->get_var ("slur_y_free");
- return o;
-}
-
-MAKE_SCHEME_CALLBACK (Slur, after_line_breaking);
+MAKE_SCHEME_CALLBACK (Slur, after_line_breaking,1);
SCM
Slur::after_line_breaking (SCM smob)
{
return SCM_UNSPECIFIED;
}
+
void
-Slur::set_extremities (Score_element*me)
+Slur::check_slope (Score_element *me)
{
- if (!Directional_element_interface (me).get ())
- Directional_element_interface (me).set (get_default_dir (me));
+ /*
+ 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);
+
+ Real limit = gh_scm2double (s);
+
+ 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])));
+ }
+ }
+}
+
+void
+Slur::set_extremities (Score_element *me)
+{
+ if (!Directional_element_interface::get (me))
+ Directional_element_interface::set (me, get_default_dir (me));
Direction dir = LEFT;
do
{
if (!gh_symbol_p (index_cell (me->get_elt_property ("attachment"), dir)))
{
-
- // for (SCM s = get_elt_property ("slur-extremity-rules"); s != SCM_EOL; s = gh_cdr (s))
- for (SCM s = scm_eval (ly_symbol2scm ("slur-extremity-rules"));
+ for (SCM s = me->get_elt_property ("extremity-rules");
s != SCM_EOL; s = gh_cdr (s))
{
SCM r = gh_call2 (gh_caar (s), me->self_scm (),
}
}
while (flip (&dir) != LEFT);
+
+ check_slope (me);
+}
+
+
+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))
+ {
+ 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;
}
Offset
-Slur::get_attachment (Score_element*me,Direction dir,
+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_))
+ {
+ 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--)
+ {
+ if (mother->broken_into_l_arr_[i - dir] == me)
+ {
+ 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;
+ }
+ }
+ }
+ return o;
+}
+
+Offset
+Slur::get_attachment (Score_element *me, Direction dir,
Score_element **common)
{
- Spanner*sp = dynamic_cast<Spanner*>(me);
SCM s = me->get_elt_property ("attachment");
+ if (!gh_symbol_p (index_cell (s, dir)))
+ {
+ set_extremities (me);
+ s = me->get_elt_property ("attachment");
+ }
SCM a = dir == LEFT ? gh_car (s) : gh_cdr (s);
+ Spanner*sp = dynamic_cast<Spanner*>(me);
String str = ly_symbol2string (a);
- Real ss = Staff_symbol_referencer::staff_space ((Score_element*)me);
- Real hs = ss / 2.0;
+ 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)))
{
Score_element * n =sp->get_bound (dir);
- if (Score_element *stem = Note_column::stem_l (n))
+ if ((stem = Note_column::stem_l (n)))
{
if (str == "head")
{
o = Offset (0, Stem::head_positions (stem)
- [Directional_element_interface (me).get ()] * hs);
+ [Directional_element_interface::get (me)] * hs);
/*
Default position is centered in X, on outer side of head Y
*/
- o += Offset (0.5 * n->extent (X_AXIS).length (),
- 0.5 * ss * Directional_element_interface (me).get ());
+ o += Offset (0.5 * n->extent (n,X_AXIS).length (),
+ 0.5 * staff_space
+ * Directional_element_interface::get (me));
}
else if (str == "alongside-stem")
{
/*
Default position is on stem X, on outer side of head Y
*/
- o += Offset (n->extent (X_AXIS).length ()
+ o += Offset (n->extent (n,X_AXIS).length ()
* (1 + Stem::get_direction (stem)),
- 0.5 * ss * Directional_element_interface (me).get ());
+ 0.5 * staff_space
+ * Directional_element_interface::get (me));
}
else if (str == "stem")
{
Default position is on stem X, at stem end Y
*/
o += Offset (0.5 *
- (n->extent (X_AXIS).length ()
- - stem->extent (X_AXIS).length ())
+ (n->extent (n,X_AXIS).length ()
+ - stem->extent (stem,X_AXIS).length ())
* (1 + Stem::get_direction (stem)),
0);
}
SCM other_a = dir == LEFT ? gh_cdr (s) : gh_car (s);
if (ly_symbol2string (other_a) != "loose-end")
{
+#if 0
+ /*
+ The braindead way: horizontal
+ */
o = Offset (0, get_attachment (me, -dir, common)[Y_AXIS]);
+#else
+ o = broken_trend_offset (me, dir);
+#endif
+
+
}
+
}
-
+
+ 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 (stem ? Stem::get_direction (stem) : 1 * dir),
- gh_int2scm (Directional_element_interface (me).get () * dir),
- SCM_UNDEFINED),
- scm_eval (ly_symbol2scm ("slur-extremity-offset-alist")));
-
+ (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)) * ss * dir;
+ o += ly_scm2offset (gh_cdr (l)) * staff_space * dir;
}
/*
- me->relative_coordinate (common[Y_AXIS], Y_AXIS);
}
+ o += ly_scm2offset (index_cell (me->get_elt_property ("attachment-offset"),
+ dir)) * staff_space;
+ return o;
+}
+
+Offset
+Slur::encompass_offset (Score_element*me,
+ Score_element* col,
+ Score_element **common)
+{
+ 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);
+
+ /*
+ Simply set x to middle of notehead
+ */
+
+ o[X_AXIS] -= 0.5 * stem_dir * col->extent (col,X_AXIS).length ();
+
+ if ((stem_dir == dir)
+ && !stem_l->extent (stem_l, Y_AXIS).empty_b ())
+ {
+ o[Y_AXIS] = stem_l->extent (common[Y_AXIS], Y_AXIS)[dir];
+ }
+ else
+ {
+ o[Y_AXIS] = col->extent (common[Y_AXIS], Y_AXIS)[dir];
+ }
+
+ /*
+ 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 (Score_element*me)
+Slur::get_encompass_offset_arr (Score_element *me)
{
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)};
+ 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);
}
-MAKE_SCHEME_CALLBACK(Slur,set_spacing_rods);
+MAKE_SCHEME_CALLBACK(Slur,set_spacing_rods,1);
SCM
Slur::set_spacing_rods (SCM smob)
{
r.item_l_drul_[RIGHT] = sp->get_bound (RIGHT);
r.distance_f_ =
gh_scm2double (me->get_elt_property ("minimum-length"))
- * me->paper_l ()->get_var ("staffspace");
+ * 1.0;
r.add_to_cols ();
return SCM_UNSPECIFIED;
/*
Ugh should have dash-length + dash-period
*/
-MAKE_SCHEME_CALLBACK (Slur, brew_molecule);
+MAKE_SCHEME_CALLBACK (Slur, brew_molecule,1);
SCM
Slur::brew_molecule (SCM smob)
{
gh_scm2double (me->get_elt_property ("thickness"));
Bezier one = get_curve (me);
+ // get_curve may suicide
+ if (!scm_ilength (me->get_elt_property ("note-columns")))
+ return SCM_EOL;
+
Molecule a;
SCM d = me->get_elt_property ("dashed");
if (gh_number_p (d))
- a = me->lookup_l ()->dashed_slur (one, thick, thick * gh_scm2double (d));
+ a = Lookup::dashed_slur (one, thick, thick * gh_scm2double (d));
else
- a = me->lookup_l ()->slur (one, Directional_element_interface (me).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);
- Real h_inf = me->paper_l ()->get_var ("slur_height_limit_factor") *
- staff_space;
- Real r_0 = me->paper_l ()->get_var ("slur_ratio");
+ 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);
+
+ 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 (me).get (),
+ Directional_element_interface::get (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);
- bb.minimise_enclosed_area (me->paper_l());
-
- Real bff = me->paper_l ()->get_var ("slur_force_blowfit");
+
+ 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));
+
bb.curve_.control_[1][Y_AXIS] *= bff;
bb.curve_.control_[2][Y_AXIS] *= bff;
bb.blow_fit ();
- Real sb = me->paper_l ()->get_var ("slur_beautiful");
+
Real beautiful = length * default_height * sb;
Real area = bb.enclosed_area_f ();
All these null control-points, where do they all come from?
*/
if (i && b.control_[i][X_AXIS] == 0)
- me->suicide ();
+ {
+ me->suicide ();
+ return;
+ }
}
me->set_elt_property ("control-points", controls);
Bezier b;
int i = 0;
- if (!Directional_element_interface (me).get ()
- || ! gh_symbol_p (index_cell (me->get_elt_property ("attachment"), LEFT)))
+ 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);
+ // set_control_points may suicide
+ if (!scm_ilength (me->get_elt_property ("note-columns")))
+ return b;
+
for (SCM s= me->get_elt_property ("control-points"); s != SCM_EOL; s = gh_cdr (s))
{
b.control_[i] = ly_scm2offset (gh_car (s));
}
Array<Offset> enc (get_encompass_offset_arr (me));
- Direction dir = Directional_element_interface (me).get ();
+ Direction dir = Directional_element_interface::get (me);
Real x1 = enc[0][X_AXIS];
Real x2 = enc.top ()[X_AXIS];
projects / lilypond.git / blobdiff