source file of the GNU LilyPond music typesetter
- (c) 1996--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1996--2004 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.
+
* smart changing of endings
+
* smart changing of (Y-?)offsets to avoid ugly beziers
(along-side-stem)
+
*/
#include "directional-element-interface.hh"
#include "note-column.hh"
#include "stem.hh"
#include "paper-column.hh"
-#include "molecule.hh"
-#include "debug.hh"
+#include "stencil.hh"
+#include "warn.hh"
#include "slur-bezier-bow.hh"
#include "main.hh"
#include "group-interface.hh"
void
Slur::add_column (Grob*me, Grob*n)
{
- if (!gh_pair_p (n->get_grob_property ("note-heads")))
- warning (_ ("Putting slur over rest. Ignoring."));
- else
- {
- Pointer_group_interface::add_element (me, "note-columns",n);
- me->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));
}
Real f = default_height / length;
SCM up = me->get_grob_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));
+ 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)
{
bb->curve_.assert_sanity ();
}
+
+
Direction
Slur::get_default_dir (Grob*me)
{
- Link_array<Grob> encompass_arr =
- Pointer_group_interface__extract_elements (me, (Grob*)0, "note-columns");
+ Link_array<Grob> encompasses =
+ Pointer_group_interface__extract_grobs (me, (Grob*)0, "note-columns");
Direction d = DOWN;
- for (int i=0; i < encompass_arr.size (); i ++)
+ for (int i=0; i < encompasses.size (); i ++)
{
- if (Note_column::dir (encompass_arr[i]) < 0)
+ if (Note_column::dir (encompasses[i]) < 0)
{
d = UP;
break;
return SCM_UNSPECIFIED;
}
set_extremities (me);
- set_control_points (me);
+ if (!gh_pair_p (me->get_grob_property ("control-points")))
+ set_control_points (me);
return SCM_UNSPECIFIED;
}
SCM s = me->get_grob_property ("slope-limit");
if (gh_number_p (s))
{
- Array<Offset> encompass = get_encompass_offset_arr (me);
+ Array<Offset> encompass = get_encompass_offsets (me);
Drul_array<Offset> attachment;
attachment[LEFT] = encompass[0];
attachment[RIGHT] = encompass.top ();
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[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] = attachment[-d][Y_AXIS] + (dx * limit * dir / staff_space);
+
+ o[d][Y_AXIS] *= get_grob_direction (me);
+
me->set_grob_property ("attachment-offset",
gh_cons (ly_offset2scm (o[LEFT]),
ly_offset2scm (o[RIGHT])));
}
}
+
}
-void
+/*
+ Set 'attachment grob property, and return it.
+*/
+SCM
Slur::set_extremities (Grob *me)
{
- if (!Directional_element_interface::get (me))
- Directional_element_interface::set (me, get_default_dir (me));
+ if (!get_grob_direction (me))
+ set_grob_direction (me, get_default_dir (me));
+ 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);
+ }
+
Direction dir = LEFT;
do
{
- if (!gh_symbol_p (index_cell (me->get_grob_property ("attachment"), dir)))
+
+ if (!gh_symbol_p (index_get_cell (att, dir)))
{
for (SCM s = me->get_grob_property ("extremity-rules");
- s != SCM_EOL; s = gh_cdr (s))
+ s != SCM_EOL; s = ly_cdr (s))
{
- SCM r = gh_call2 (gh_caar (s), me->self_scm (),
+ SCM r = gh_call2 (ly_caar (s), me->self_scm (),
gh_int2scm ((int)dir));
if (r != SCM_BOOL_F)
{
- index_set_cell (me->get_grob_property ("attachment"), dir,
- gh_cdar (s));
+ index_set_cell (att, dir,
+ ly_cdar (s));
break;
}
}
while (flip (&dir) != LEFT);
check_slope (me);
+
+ return att;
}
Real
-Slur::get_first_notecolumn_y (Grob *me, Direction dir)
+Slur::get_boundary_notecolumn_y (Grob *me, Direction dir)
{
- Grob *col = dir == LEFT
- ? unsmob_grob (gh_car (scm_reverse (me->get_grob_property
- ("note-columns"))))
- : unsmob_grob
- (gh_car (me->get_grob_property ("note-columns")));
+ SCM cols = me->get_grob_property ("note-columns");
+
+ if(!gh_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,
the unbroken slur would have had.
*/
Offset o;
- if (Spanner *mother = dynamic_cast<Spanner*> (me->original_l_))
+ if (Spanner *mother = dynamic_cast<Spanner*> (me->original_))
{
- 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;
- }
- }
+ int k = broken_spanner_index (dynamic_cast<Spanner*> (me));
+ Grob *neighbour = mother->broken_intos_[k + dir];
+ if (dir == RIGHT)
+ neighbour->set_grob_property ("direction",
+ me->get_grob_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_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));
}
return o;
}
+/*
+ COMMON is size-2 array with common refpoints.
+
+UGH: this routine delivers offsets which are *not* relative to COMMON.
+
+UGH, we should take COMMON-Y as argument.
+*/
Offset
Slur::get_attachment (Grob *me, Direction dir,
Grob **common)
{
SCM s = me->get_grob_property ("attachment");
- if (!gh_symbol_p (index_cell (s, dir)))
+ if (!gh_pair_p (s) || !gh_symbol_p (index_get_cell (s, dir)))
{
- set_extremities (me);
- s = me->get_grob_property ("attachment");
+ s = set_extremities (me);
}
- SCM a = dir == LEFT ? gh_car (s) : gh_cdr (s);
+
+ 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_grob_property ("direction"));
+
Grob *stem = 0;
if (Note_column::has_interface (sp->get_bound (dir)))
{
Grob * n =sp->get_bound (dir);
- if ((stem = Note_column::stem_l (n)))
+ stem = Note_column::get_stem (n);
+ if (stem)
{
-
- if (str == "head")
+ 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)
- [Directional_element_interface::get (me)] * hs);
+ [slurdir] * hs);
/*
Default position is centered in X, on outer side of head Y
*/
- o += Offset (0.5 * n->extent (n,X_AXIS).length (),
+ o += Offset (0.5 * x_extent,
0.5 * staff_space
- * Directional_element_interface::get (me));
+ * slurdir);
}
else if (str == "alongside-stem")
{
- o = Offset (0, Stem::chord_start_f (stem));
+ o = Offset (0, Stem::chord_start_y (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)),
+ o += Offset (x_extent * (1 + Stem::get_direction (stem)),
0.5 * staff_space
- * Directional_element_interface::get (me));
+ * slurdir);
}
else if (str == "stem")
{
/*
Default position is on stem X, at stem end Y
*/
+ Real stem_thickness = Stem::thickness (stem);
o += Offset (0.5 *
- (n->extent (n,X_AXIS).length ()
- - stem->extent (stem,X_AXIS).length ())
- * (1 + Stem::get_direction (stem)),
- 0);
+ x_extent * (1 + Stem::get_direction (stem))
+ - ((dir + 1)/2) * stem_thickness
+ + ((1 - slurdir)/2) * stem_thickness,
+ 0);
}
}
}
- else if (str == "loose-end")
+ /*
+ 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 other_a = dir == LEFT ? gh_cdr (s) : gh_car (s);
+ SCM other_a = dir == LEFT ? ly_cdr (s) : ly_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
-
-
- }
-
+ o = broken_trend_offset (me, dir);
}
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"));
+ int stemdir = stem ? Stem::get_direction (stem) : 1;
SCM l = scm_assoc
- (scm_listify (a,
- gh_int2scm (stemdir * dir),
- gh_int2scm (slurdir * dir),
+ (scm_list_n (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;
+ Offset off = ly_scm2offset (ly_cdr (l)) * staff_space;
+ off[X_AXIS] *= dir;
+ off[Y_AXIS] *= slurdir;
+ o += off;
}
/*
- me->relative_coordinate (common[Y_AXIS], Y_AXIS);
}
- o += ly_scm2offset (index_cell (me->get_grob_property ("attachment-offset"),
- dir)) * staff_space;
+ Offset off = ly_scm2offset (index_get_cell (me->get_grob_property
+ ("attachment-offset"),
+ dir)) * staff_space;
+
+ off[Y_AXIS] *= slurdir;
+ o += off;
return o;
}
Grob **common)
{
Offset o;
- Grob* stem_l = unsmob_grob (col->get_grob_property ("stem"));
+ Grob* stem = unsmob_grob (col->get_grob_property ("stem"));
- Direction dir = Directional_element_interface::get (me);
+ Direction dir = get_grob_direction (me);
- if (!stem_l)
+ if (!stem)
{
- warning (_ ("Slur over rest?"));
+ 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 = Directional_element_interface::get (stem_l);
- o[X_AXIS] = stem_l->relative_coordinate (0, X_AXIS);
+ Direction stem_dir = get_grob_direction (stem);
+ o[X_AXIS] = stem->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 ();
+ 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_l->extent (stem_l, Y_AXIS).empty_b ())
+ && !stem->extent (stem, Y_AXIS).is_empty ())
{
- o[Y_AXIS] = stem_l->extent (common[Y_AXIS], Y_AXIS)[dir];
+ o[Y_AXIS] = stem->extent (common[Y_AXIS], Y_AXIS)[dir];
}
else
{
/*
leave a gap: slur mustn't touch head/stem
*/
- o[Y_AXIS] += dir * gh_scm2double (me->get_grob_property ("y-free")) *
+ o[Y_AXIS] += dir * robust_scm2double (me->get_grob_property ("y-free"), 0) *
1.0;
return o;
}
Array<Offset>
-Slur::get_encompass_offset_arr (Grob *me)
+Slur::get_encompass_offsets (Grob *me)
{
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)};
+ 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> encompass_arr;
- while (gh_pair_p (eltlist))
- {
- encompass_arr.push (unsmob_grob (gh_car (eltlist)));
- eltlist =gh_cdr (eltlist);
- }
- encompass_arr.reverse ();
-
-
- Array<Offset> offset_arr;
+ 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 = encompass_arr.size () - 2;
+ int last = encompasses.size () - 2;
- offset_arr.push (get_attachment (me, LEFT, common));
+ offsets.push (get_attachment (me, LEFT, common));
/*
left is broken edge
*/
-
- if (encompass_arr[0] != sp->get_bound (LEFT))
+ if (encompasses[0] != sp->get_bound (LEFT))
{
first--;
// ?
- offset_arr[0][Y_AXIS] -=
- encompass_arr[0]->relative_coordinate (common[Y_AXIS], Y_AXIS)
+ 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 (encompass_arr.top () != sp->get_bound (RIGHT))
+ if (encompasses.top () != sp->get_bound (RIGHT))
{
last++;
}
for (int i = first; i <= last; i++)
{
- Offset o (encompass_offset (me, encompass_arr[i], common));
- offset_arr.push (o - origin);
+ Offset o (encompass_offset (me, encompasses[i], common));
+ offsets.push (o - origin);
}
- offset_arr.push (Offset (sp->spanner_length (), 0) + get_attachment (me, RIGHT,common));
+ offsets.push (Offset (sp->spanner_length (), 0) + get_attachment (me, RIGHT,common));
- if (encompass_arr[0] != sp->get_bound (LEFT))
+ if (encompasses[0] != sp->get_bound (LEFT))
{
- offset_arr.top ()[Y_AXIS] -= encompass_arr.top ()->relative_coordinate (common[Y_AXIS], Y_AXIS)
+ offsets.top ()[Y_AXIS] -= encompasses.top ()->relative_coordinate (common[Y_AXIS], Y_AXIS)
- me->relative_coordinate (common[Y_AXIS], Y_AXIS);
}
- return offset_arr;
+ return offsets;
}
Grob * me = unsmob_grob (smob);
assert (a == Y_AXIS);
- SCM mol = me->get_uncached_molecule ();
- return ly_interval2scm (unsmob_molecule (mol)->extent (a));
+ SCM mol = me->get_uncached_stencil ();
+ Interval ext;
+ if (Stencil * m = unsmob_stencil (mol))
+ ext = m->extent (a);
+ return ly_interval2scm (ext);
}
/*
Ugh should have dash-length + dash-period
*/
-MAKE_SCHEME_CALLBACK (Slur, brew_molecule,1);
+MAKE_SCHEME_CALLBACK (Slur, print,1);
SCM
-Slur::brew_molecule (SCM smob)
+Slur::print (SCM smob)
{
Grob * me = unsmob_grob (smob);
if (!scm_ilength (me->get_grob_property ("note-columns")))
return SCM_EOL;
}
- Real thick = me->paper_l ()->get_var ("stafflinethickness") *
- gh_scm2double (me->get_grob_property ("thickness"));
+ Real base_thick = robust_scm2double (me->get_grob_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_grob_property ("note-columns")))
return SCM_EOL;
- Molecule a;
+ Stencil a;
SCM d = me->get_grob_property ("dashed");
if (gh_number_p (d))
- a = Lookup::dashed_slur (one, thick, thick * gh_scm2double (d));
+ a = Lookup::dashed_slur (one, thick, thick * robust_scm2double (d, 0));
else
- a = Lookup::slur (one, Directional_element_interface::get (me) * thick, thick);
+ a = Lookup::slur (one, get_grob_direction (me) * base_thick * ss / 10.0,
+ thick);
return a.smobbed_copy ();
}
Real staff_space = Staff_symbol_referencer::staff_space ((Grob*)me);
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);
+ SCM h_inf_scm = me->get_grob_property ("height-limit");
+ SCM r_0_scm = me->get_grob_property ("ratio");
- Real r_0 = gh_scm2double (gh_cdr (r_0_scm));
- Real h_inf = staff_space * gh_scm2double (gh_cdr (h_inf_scm));
+ Real r_0 = robust_scm2double (r_0_scm, 1);
+ Real h_inf = staff_space * gh_scm2double (h_inf_scm);
- Slur_bezier_bow bb (get_encompass_offset_arr (me),
- Directional_element_interface::get (me),
+ 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];
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));
+ 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;
Real beautiful = length * default_height * sb;
- Real area = bb.enclosed_area_f ();
+ Real area = bb.get_enclosed_area ();
/*
Slurs that fit beautifully are not ugly
Bezier b;
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)))
+ SCM attach = me->get_grob_property ("attachment");
+ if (!gh_pair_p (attach))
+ attach = set_extremities(me);
+
+
+ if (!get_grob_direction (me)
+ || ! gh_symbol_p (index_get_cell (attach, LEFT))
+ || ! gh_symbol_p (index_get_cell (attach, RIGHT)))
set_extremities (me);
if (!gh_pair_p (me->get_grob_property ("control-points")))
if (!scm_ilength (me->get_grob_property ("note-columns")))
return b;
- for (SCM s= me->get_grob_property ("control-points"); s != SCM_EOL; s = gh_cdr (s))
+ for (SCM s= me->get_grob_property ("control-points"); s != SCM_EOL; s = ly_cdr (s))
{
- b.control_[i] = ly_scm2offset (gh_car (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);
+ 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];
}
-bool
-Slur::has_interface (Grob*me)
-{
- return me->has_interface (ly_symbol2scm ("slur-interface"));
-}
+ADD_INTERFACE (Slur,"slur-interface",
+ "A slur",
+ "attachment attachment-offset beautiful control-points dashed details de-uglify-parameters direction extremity-rules extremity-offset-alist height-limit ratio slope-limit thickness y-free");
+
projects / lilypond.git / blobdiff