source file of the GNU LilyPond music typesetter
- (c) 1996--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1996--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
Jan Nieuwenhuizen <janneke@gnu.org>
*/
/*
[TODO]
+ * 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-bow.hh"
+#include "slur-bezier-bow.hh"
#include "main.hh"
-#include "cross-staff.hh"
#include "group-interface.hh"
#include "staff-symbol-referencer.hh"
-#include "lily-guile.icc"
+#include "spanner.hh"
-class Slur_bezier_bow : public Bezier_bow
-{
-public:
- Slur_bezier_bow (Array<Offset> encompass, Direction dir);
- Array<Real> area_x_gradients_array (Real area);
- void blow_fit ();
- Real enclosed_area_f () const;
- Real fit_factor () const;
- void minimise_enclosed_area (Paper_def* paper_l, Real default_height);
-};
-
-Slur_bezier_bow::Slur_bezier_bow (Array<Offset> encompass, Direction dir)
- : Bezier_bow (encompass, dir)
-{
-}
-
-void
-Slur_bezier_bow::blow_fit ()
-{
- Real len = curve_.control_[3][X_AXIS];
- Real h = curve_.control_[1][Y_AXIS] * fit_factor () / len;
- curve_.control_[1][Y_AXIS] = h * len;
- curve_.control_[2][Y_AXIS] = h * len;
- curve_.assert_sanity ();
-}
-
-
-Real
-Slur_bezier_bow::enclosed_area_f () const
-{
- Real a = 0;
- for (int i=0; i < encompass_.size (); i++)
- {
- Interval x;
- Interval y;
- if (i == 0)
- {
- x = Interval (0, encompass_[1][X_AXIS] / 2);
- y = Interval (0,
- curve_.get_other_coordinate (X_AXIS,
- encompass_[1][X_AXIS]
- / 2));
- }
- else if (i == encompass_.size () - 1)
- {
- x = Interval ((encompass_[i-1][X_AXIS] + encompass_[i][X_AXIS])/2,
- encompass_[i][X_AXIS]);
- y = Interval (0,
- (curve_.get_other_coordinate (X_AXIS,
- (x[MIN] + x[MAX]) / 2)));
- }
- else
- {
- x = Interval ((encompass_[i-1][X_AXIS] + encompass_[i][X_AXIS]) / 2,
- (encompass_[i][X_AXIS] + encompass_[i+1][X_AXIS]) / 2);
- y = Interval (encompass_[i][Y_AXIS],
- (curve_.get_other_coordinate (X_AXIS, x[MIN])
- + curve_.get_other_coordinate (X_AXIS,
- (x[MIN] + x[MAX]) / 2)
- + curve_.get_other_coordinate (X_AXIS, x[MAX])) / 3);
- }
-
- Real da = x.length () * y.length ();
- a += da;
- }
- return a;
-}
-
-Array<Real>
-Slur_bezier_bow::area_x_gradients_array (Real area)
-{
- Real len = curve_.control_[3][X_AXIS];
- Real grow = len / 10.0;
- Array<Real> da (2);
- for (int i=0; i < 2; i++)
- {
- Real r = curve_.control_[i+1][X_AXIS];
- curve_.control_[i+1][X_AXIS] += grow;
- da[i] = (enclosed_area_f () - area) / grow;
- curve_.control_[i+1][X_AXIS] = r;
- }
- return da;
-}
-
void
-Slur_bezier_bow::minimise_enclosed_area (Paper_def* paper_l,
- Real default_height)
-{
- Real length = curve_.control_[3][X_AXIS];
- Real sb = paper_l->get_var ("slur_beautiful");
- Real beautiful = length * default_height * sb;
-
- DEBUG_OUT << to_str ("Beautiful: %f\n", beautiful);
- DEBUG_OUT << to_str ("Length: %f\n", length);
- DEBUG_OUT << to_str ("D-height: %f\n", default_height);
- DEBUG_OUT << to_str ("FitFac: %f\n", fit_factor ());
-
- if (fit_factor () > 1.0)
- blow_fit ();
-
- Real pct_c0 = paper_l->get_var ("bezier_pct_c0");
- Real pct_c3 = paper_l->get_var ("bezier_pct_c3");
- Real pct_in_max = paper_l->get_var ("bezier_pct_in_max");
- Real pct_out_max = paper_l->get_var ("bezier_pct_out_max");
- Real steps = paper_l->get_var ("bezier_area_steps");
-
- for (int i=0; i < steps; i++)
- {
- Real area = enclosed_area_f ();
- if (!i)
- DEBUG_OUT << to_str ("Init area: %f\n", area);
-
- if (area <= beautiful)
- break;
-
- Array<Real> da = area_x_gradients_array (area);
-
- // urg
- Real pct = pct_c0 + pct_c3 * length * length * length;
- pct *= (steps - i) / steps;
- if (da[0] > 0 || da[1] < 0)
- pct = pct <? pct_out_max;
- else
- pct = pct <? pct_in_max;
-
- Real u = (abs (curve_.control_[1][X_AXIS] / da[0])
- <? abs ((curve_.control_[3][X_AXIS]
- - curve_.control_[2][X_AXIS]) / da[1]));
-
- DEBUG_OUT << to_str ("pct: %f\n", pct);
- DEBUG_OUT << to_str ("u: %f\n", u);
-
- DEBUG_OUT << to_str ("da: (%f, %f)\n", da[0], da[1]);
- DEBUG_OUT << to_str ("da*u: (%f, %f)\n", da[0]*u*pct, da[1]*u*pct);
- DEBUG_OUT << to_str ("cx: (%f, %f)\n", curve_.control_[1][X_AXIS],
- curve_.control_[2][X_AXIS]);
-
- curve_.control_[1][X_AXIS] -= da[0] * u * pct;
- curve_.control_[2][X_AXIS] -= da[1] * u * pct;
- }
-
- Real area = enclosed_area_f ();
- DEBUG_OUT << to_str ("Exarea: %f\n", area);
-}
-
-
-
-/*
- max ( encompass.y / curve.y )
-
- */
-Real
-Slur_bezier_bow::fit_factor () const
-{
- Real x1 = encompass_[0][X_AXIS];
- Real x2 = encompass_.top ()[X_AXIS];
-
- Real factor = 0.0;
- for (int i=1; i < encompass_.size ()-1; i++)
- {
- if (encompass_[i][X_AXIS] > x1 && encompass_[i][X_AXIS] < x2)
- {
- Real y = curve_.get_other_coordinate (X_AXIS, encompass_[i][X_AXIS]);
- if (y>0)
- {
- Real f = encompass_[i][Y_AXIS] / y;
- factor = factor >? f;
- }
- }
- }
-
-
- return factor;
-}
-
-
-
-
-
-/*
- Slur
-*/
-
-Slur::Slur ()
+Slur::set_interface (Grob*me)
{
- // URG
- 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);
- set_elt_property ("control-points", SCM_EOL);
-
-#if 0
- /*
- I still don't understand the merits of this Group_interface.
- */
- Group_interface c (this, "control-points");
- c.set_interface ();
-#endif
+ /* Copy to mutable list. */
+ me->set_grob_property ("attachment",
+ ly_deep_copy (me->get_grob_property ("attachment")));
}
void
-Slur::add_column (Note_column*n)
+Slur::add_column (Grob*me, Grob*n)
{
- if (!gh_pair_p (n->get_elt_property ("note-heads")))
+ if (!gh_pair_p (n->get_grob_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_grob (me, ly_symbol2scm ("note-columns"), n);
+ me->add_dependency (n);
}
+
+ add_bound_item (dynamic_cast<Spanner*> (me), dynamic_cast<Item*> (n));
}
void
-Slur::de_uglyfy (Slur_bezier_bow* bb, Real default_height)
+Slur::de_uglyfy (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++)
{
- Real ind = abs (bb->curve_.control_[(i-1)*3][X_AXIS]
+ 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;
- Real c1 = paper_l ()->get_var ("bezier_control1");
- Real c2 = paper_l ()->get_var ("bezier_control2");
- Real c3 = paper_l ()->get_var ("bezier_control3");
+ SCM up = me->get_grob_property ("de-uglify-parameters");
+
+ Real c1 = gh_scm2double (ly_car (up));
+ Real c2 = gh_scm2double (ly_cadr (up));
+ Real c3 = gh_scm2double (ly_caddr (up));
+
if (h > c1 * f)
{
h = c1 * f;
}
Direction
-Slur::get_default_dir () const
+Slur::get_default_dir (Grob*me)
{
- Link_array<Note_column> encompass_arr =
- Group_interface__extract_elements (this, (Note_column*)0, "note-columns");
+ Link_array<Grob> encompass_arr =
+ Pointer_group_interface__extract_grobs (me, (Grob*)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)
+{
+ Grob *me = unsmob_grob (smob);
+ if (!scm_ilength (me->get_grob_property ("note-columns")))
{
- set_bound (LEFT, encompass_arr[0]);
- if (encompass_arr.size () > 1)
- set_bound (RIGHT, encompass_arr.top ());
+ me->suicide ();
+ return SCM_UNSPECIFIED;
}
-}
+ set_extremities (me);
+ set_control_points (me);
+ return SCM_UNSPECIFIED;
+}
+
+
+void
+Slur::check_slope (Grob *me)
+{
+ /*
+ Avoid too steep slurs.
+ */
+ SCM s = me->get_grob_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 ((Grob*)me);
+ Direction dir = (Direction)gh_scm2int (me->get_grob_property ("direction"));
+ Direction d = (Direction) (- dir * (sign (dy)));
+ SCM a = me->get_grob_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] *= Directional_element_interface::get (me);
+
+ me->set_grob_property ("attachment-offset",
+ gh_cons (ly_offset2scm (o[LEFT]),
+ ly_offset2scm (o[RIGHT])));
+ }
+ }
+}
-Offset
-Slur::encompass_offset (Note_column const* col) const
+void
+Slur::set_extremities (Grob *me)
{
- Offset o;
- Stem* stem_l = col->stem_l ();
- Direction dir = directional_element (this).get ();
-
- if (!stem_l)
+ if (!Directional_element_interface::get (me))
+ Directional_element_interface::set (me, get_default_dir (me));
+
+ Direction dir = LEFT;
+ do
{
- warning (_ ("Slur over rest?"));
- o[X_AXIS] = col->hpos_f ();
- o[Y_AXIS] = col->extent (Y_AXIS)[dir];
- return o;
+ SCM att = me->get_grob_property ("attachment");
+ /*
+ */
+ if (!gh_pair_p (att))
+ {
+ programming_error ("attachment is not a cons?!");
+ att = gh_cons (SCM_EOL, SCM_EOL);
+ me->set_grob_property ("attachment", att);
+ }
+
+ if (!gh_symbol_p (index_cell (att, dir)))
+ {
+ for (SCM s = me->get_grob_property ("extremity-rules");
+ s != SCM_EOL; s = ly_cdr (s))
+ {
+ SCM r = gh_call2 (ly_caar (s), me->self_scm (),
+ gh_int2scm ((int)dir));
+ if (r != SCM_BOOL_F)
+ {
+ index_set_cell (att, dir,
+ ly_cdar (s));
+ break;
+ }
+ }
+ }
}
- Direction stem_dir = directional_element (stem_l).get ();
- o[X_AXIS] = stem_l->hpos_f ();
+ while (flip (&dir) != LEFT);
- /*
- Simply set x to middle of notehead
- */
+ check_slope (me);
+}
- o[X_AXIS] -= 0.5 * stem_dir * col->extent (X_AXIS).length ();
- if ((stem_dir == dir)
- && !stem_l->extent (Y_AXIS).empty_b ())
+Real
+Slur::get_first_notecolumn_y (Grob *me, Direction dir)
+{
+ Grob *col = dir == LEFT
+ ? unsmob_grob (ly_car (scm_reverse (me->get_grob_property
+ ("note-columns"))))
+ : unsmob_grob
+ (ly_car (me->get_grob_property ("note-columns")));
+
+ Grob *common[] =
+ {
+ 0,
+ me->common_refpoint (col, Y_AXIS)
+ };
+ Real y;
+ if (col == ((Spanner*)me)->get_bound (dir))
{
- o[Y_AXIS] = stem_l->extent (Y_AXIS)[dir];
+ y = get_attachment (me, dir, common)[Y_AXIS];
}
else
{
- o[Y_AXIS] = col->extent (Y_AXIS)[dir];
+ y = encompass_offset (me, col, common)[Y_AXIS]
+ - me->relative_coordinate (common[Y_AXIS], Y_AXIS);
}
+ return y;
+}
+Offset
+Slur::broken_trend_offset (Grob *me, Direction dir)
+{
/*
- 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);
+ 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)
+ {
+ Grob *neighbour = mother->broken_into_l_arr_[i];
+ if (dir == RIGHT)
+ neighbour->set_grob_property ("direction",
+ me->get_grob_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_grob_property ("note-columns"));
+ int cols = scm_ilength (me->get_grob_property ("note-columns"));
+ o = Offset (0, (y*neighbour_cols + neighbour_y*cols) /
+ (cols + neighbour_cols));
+ break;
+ }
+ }
+ }
return o;
}
-void
-Slur::after_line_breaking ()
-{
- set_extremities ();
- set_control_points ();
-}
-
-/*
- urg
- FIXME
- */
-void
-Slur::set_extremities ()
+Offset
+Slur::get_attachment (Grob *me, Direction dir,
+ Grob **common)
{
- Link_array<Note_column> encompass_arr =
- Group_interface__extract_elements (this, (Note_column*)0, "note-columns");
-
- if (!encompass_arr.size ())
+ SCM s = me->get_grob_property ("attachment");
+ if (!gh_symbol_p (index_cell (s, dir)))
{
- set_elt_property ("transparent", SCM_BOOL_T);
- set_empty (X_AXIS);
- set_empty (Y_AXIS);
- return;
+ set_extremities (me);
+ s = me->get_grob_property ("attachment");
}
-
- 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");
-
- 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 ();
+ 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 d = LEFT;
- do
+ Grob *stem = 0;
+ if (Note_column::has_interface (sp->get_bound (dir)))
{
- dx_f_drul_[d] = 0;
- dy_f_drul_[d] = 0;
-
- if ((note_column_drul[d] == get_bound (d))
- && note_column_drul[d]->first_head ()
- && (note_column_drul[d]->stem_l ()))
+ Grob * n =sp->get_bound (dir);
+ if ((stem = Note_column::stem_l (n)))
{
- 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] = get_bound (d)->extent (X_AXIS).length () / 2;
- dx_f_drul_[d] -= d * x_gap_f;
+ Real x_extent;
+ if (Grob *head = Note_column::first_head (n))
+ x_extent = head->extent (head, X_AXIS).length ();
+ else
+ x_extent = n->extent (n, X_AXIS).length ();
- 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;
+ 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 * x_extent,
+ 0.5 * staff_space
+ * Directional_element_interface::get (me));
}
- /*
- side attached to (visible) stem
- */
- else
+ else if (str == "alongside-stem")
{
- dx_f_drul_[d] = stem_l->hpos_f ()
- - get_bound (d)->relative_coordinate (0, X_AXIS);
+ o = Offset (0, Stem::chord_start_f (stem));
/*
- side attached to beamed stem
+ Default position is on stem X, on outer side of head Y
*/
- 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;
- }
+ o += Offset (x_extent * (1 + Stem::get_direction (stem)),
+ 0.5 * staff_space
+ * Directional_element_interface::get (me));
+ }
+ else if (str == "stem")
+ {
+ o = Offset (0, Stem::stem_end_position (stem) * hs);
/*
- side attached to notehead, with stem getting in the way
+ Default position is on stem X, at stem end Y
*/
- else
- {
- 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;
- }
+ o += Offset (0.5 *
+ x_extent * (1 + Stem::get_direction (stem)),
+ 0);
}
}
- /*
- 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);
+ /*
+ 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.
- int cross_count = cross_staff_count ();
- bool interstaff_b = (0 < cross_count) && (cross_count < encompass_arr.size ());
+ Hmm, maybe after-line-breaking should set this to loose-end? */
+ else // if (str == "loose-end")
+ {
+ SCM other_a = dir == LEFT ? ly_cdr (s) : ly_car (s);
+ if (ly_symbol2string (other_a) != "loose-end")
+ o = broken_trend_offset (me, dir);
+ }
- Drul_array<Offset> info_drul;
- Drul_array<Real> interstaff_interval;
+ SCM alist = me->get_grob_property ("extremity-offset-alist");
+ int stemdir = stem ? Stem::get_direction (stem) : 1;
+ int slurdir = gh_scm2int (me->get_grob_property ("direction"));
+ SCM l = scm_assoc
+ (scm_list_n (a,
+ gh_int2scm (stemdir * dir),
+ gh_int2scm (slurdir * dir),
+ SCM_UNDEFINED), alist);
- do
+ if (l != SCM_BOOL_F)
{
- info_drul[d] = encompass_offset (encompass_arr.boundary (d, 0));
- interstaff_interval[d] = - calc_interstaff_dist (encompass_arr.boundary (d,0),
- this);
+ Offset off = ly_scm2offset (ly_cdr (l)) * staff_space;
+ off[X_AXIS] *= dir;
+ off[Y_AXIS] *= Directional_element_interface::get (me);
+ o += off;
}
- while (flip (&d) != LEFT);
-
- Real interstaff_f = interstaff_interval[RIGHT] - interstaff_interval[LEFT];
- if (fix_broken_b)
- {
- Direction d = (encompass_arr.top () != get_bound (RIGHT)) ?
- RIGHT : LEFT;
- dy_f_drul_[d] = info_drul[d][Y_AXIS];
- if (!interstaff_b)
- {
- dy_f_drul_[d] -= interstaff_interval[d];
- if (cross_count) // interstaff_i ?
- {
- dy_f_drul_[LEFT] += interstaff_interval[d];
- dy_f_drul_[RIGHT] += interstaff_interval[d];
- }
- }
+ /*
+ 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);
}
-
- if (!fix_broken_b)
- dy_f_drul_[RIGHT] += interstaff_f;
-}
+ Offset off = ly_scm2offset (index_cell (me->get_grob_property
+ ("attachment-offset"),
+ dir)) * staff_space;
+
+ off[Y_AXIS] *= Directional_element_interface::get (me);
+ o += off;
+ return o;
+}
-int
-Slur::cross_staff_count ()const
+Offset
+Slur::encompass_offset (Grob*me,
+ Grob* col,
+ Grob **common)
{
- Link_array<Note_column> encompass_arr =
- Group_interface__extract_elements (this, (Note_column*)0, "note-columns");
+ Offset o;
+ Grob* stem_l = unsmob_grob (col->get_grob_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
+ */
+ 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;
- 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_grob_property ("y-free")) *
+ 1.0;
+ return o;
+}
Array<Offset>
-Slur::get_encompass_offset_arr () const
+Slur::get_encompass_offset_arr (Grob *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_grob_property ("note-columns");
+ Grob *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<Grob> encompass_arr;
+ while (gh_pair_p (eltlist))
+ {
+ encompass_arr.push (unsmob_grob (ly_car (eltlist)));
+ eltlist =ly_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] != get_bound (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 () != get_bound (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
-{
- Array<Rod> a;
- Rod r;
- r.item_l_drul_[LEFT] = get_bound (LEFT);
- r.item_l_drul_[RIGHT] = get_bound (RIGHT);
-
- r.distance_f_ = paper_l ()->get_var ("slur_x_minimum");
- a.push (r);
- return a;
-}
+/*
+ ugh ?
+ */
+MAKE_SCHEME_CALLBACK (Slur, height, 2);
+SCM
+Slur::height (SCM smob, SCM ax)
+{
+ Axis a = (Axis)gh_scm2int (ax);
+ Grob * me = unsmob_grob (smob);
+ assert (a == Y_AXIS);
+ SCM mol = me->get_uncached_molecule ();
+ return ly_interval2scm (unsmob_molecule (mol)->extent (a));
+}
/*
Ugh should have dash-length + dash-period
*/
-Molecule
-Slur::do_brew_molecule () const
+MAKE_SCHEME_CALLBACK (Slur, brew_molecule,1);
+SCM
+Slur::brew_molecule (SCM smob)
{
- Real thick = paper_l ()->get_var ("slur_thickness");
- Bezier one = get_curve ();
+ Grob * me = unsmob_grob (smob);
+ if (!scm_ilength (me->get_grob_property ("note-columns")))
+ {
+ me->suicide ();
+ return SCM_EOL;
+ }
+
+ Real thick = me->paper_l ()->get_var ("stafflinethickness") *
+ gh_scm2double (me->get_grob_property ("thickness"));
+ Bezier one = get_curve (me);
+
+ // get_curve may suicide
+ if (!scm_ilength (me->get_grob_property ("note-columns")))
+ return SCM_EOL;
Molecule a;
- SCM d = get_elt_property ("dashed");
+ SCM d = me->get_grob_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;
+ return a.smobbed_copy ();
}
void
-Slur::set_control_points ()
+Slur::set_control_points (Grob*me)
{
- Slur_bezier_bow bb (get_encompass_offset_arr (),
- directional_element (this).get ());
+ Real staff_space = Staff_symbol_referencer::staff_space ((Grob*)me);
- Real staff_space = Staff_symbol_referencer_interface (this).staff_space ();
- Real h_inf = paper_l ()->get_var ("slur_height_limit_factor") * staff_space;
- Real r_0 = paper_l ()->get_var ("slur_ratio");
+ SCM details = me->get_grob_property ("details");
+ SCM h_inf_scm = scm_assq (ly_symbol2scm ("height-limit"), details);
+ SCM r_0_scm = scm_assq (ly_symbol2scm ("ratio"), details);
- bb.set_default_bezier (h_inf, r_0);
+ Real r_0 = gh_scm2double (ly_cdr (r_0_scm));
+ Real h_inf = staff_space * gh_scm2double (ly_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)
{
Real length = bb.curve_.control_[3][X_AXIS];
- Real default_height = bb.get_default_height (h_inf, r_0, length);
- bb.minimise_enclosed_area (paper_l(), default_height);
-
- Real bff = paper_l ()->get_var ("slur_force_blowfit");
+ Real default_height = slur_height (length, h_inf, r_0);
+
+ SCM ssb = me->get_grob_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 (ly_cdr (sbf)))
+ bff = gh_scm2double (ly_cdr (sbf));
+
bb.curve_.control_[1][Y_AXIS] *= bff;
bb.curve_.control_[2][Y_AXIS] *= bff;
bb.blow_fit ();
- Real sb = paper_l ()->get_var ("slur_beautiful");
+
Real beautiful = length * default_height * sb;
Real area = bb.enclosed_area_f ();
Slurs that fit beautifully are not ugly
*/
if (area > beautiful)
- de_uglyfy (&bb, default_height);
+ de_uglyfy (me, &bb, default_height);
}
Bezier b = bb.get_bezier ();
- SCM controls = array_to_scm (b.control_);
- set_elt_property ("control-points", controls);
+
+
+ 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_grob_property ("control-points", controls);
}
-
Bezier
-Slur::get_curve () const
+Slur::get_curve (Grob*me)
{
Bezier b;
- Array<Offset> controls (4);
- scm_to_array (get_elt_property ("control-points"), &controls);
- b.control_ = controls;
+ int i = 0;
+
+ if (!Directional_element_interface::get (me)
+ || ! gh_symbol_p (index_cell (me->get_grob_property ("attachment"), LEFT))
+ || ! gh_symbol_p (index_cell (me->get_grob_property ("attachment"), RIGHT)))
+ set_extremities (me);
- Array<Offset> enc (get_encompass_offset_arr ());
- Direction dir = directional_element (this).get ();
+ if (!gh_pair_p (me->get_grob_property ("control-points")))
+ set_control_points (me);
+
+ // set_control_points may suicide
+ if (!scm_ilength (me->get_grob_property ("note-columns")))
+ return b;
+
+ for (SCM s= me->get_grob_property ("control-points"); s != SCM_EOL; s = ly_cdr (s))
+ {
+ b.control_[i] = ly_scm2offset (ly_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++)
{
if (x > x1 && x <x2)
{
Real y = b.get_other_coordinate (X_AXIS, x);
- off = off >? dir * (enc[i][Y_AXIS] - y);
+ off = off >? dir * (enc[i][Y_AXIS] - y);
}
}
b.translate (Offset (0, dir * off));
return b;
}
+
+bool
+Slur::has_interface (Grob*me)
+{
+ return me->has_interface (ly_symbol2scm ("slur-interface"));
+}
+
+
projects / lilypond.git / blobdiff