source file of the GNU LilyPond music typesetter
- (c) 1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
-#include <math.h>
+#include "tie.hh"
+
+#include <math.h>
#include "spanner.hh"
#include "lookup.hh"
-#include "paper-def.hh"
-#include "tie.hh"
+#include "output-def.hh"
#include "rhythmic-head.hh"
#include "bezier.hh"
#include "paper-column.hh"
#include "warn.hh"
#include "staff-symbol-referencer.hh"
#include "directional-element-interface.hh"
-#include "molecule.hh"
-#include "bezier-bow.hh"
+#include "bezier.hh"
#include "stem.hh"
#include "note-head.hh"
#include "tie-column.hh"
c4 \staffchange c4
do we have non-horizontal ties then?
- */
-
+*/
void
-Tie::set_head (Grob*me,Direction d, Grob * h)
+Tie::set_head (Grob *me, Direction d, Grob *h)
{
- assert (!head (me,d));
- index_set_cell (me->get_grob_property ("head-pair"), d, h->self_scm ());
-
- dynamic_cast<Spanner*> (me)->set_bound (d, h);
+ dynamic_cast<Spanner *> (me)->set_bound (d, h);
me->add_dependency (h);
}
-void
-Tie::set_interface (Grob*me)
+Grob *
+Tie::head (Grob *me, Direction d)
{
- me->set_grob_property ("head-pair", gh_cons (SCM_EOL, SCM_EOL));
+ Item *it = dynamic_cast<Spanner*> (me)->get_bound (d);
+ if (Note_head::has_interface (it))
+ return it;
+ else
+ return 0;
}
-
-Grob*
-Tie::head (Grob*me, Direction d)
+int
+Tie::get_column_rank (Grob *me, Direction d)
{
- SCM c = me->get_grob_property ("head-pair");
+ Spanner *span = dynamic_cast<Spanner *> (me);
+ Grob *h = head (me, d);
+ if (!h)
+ h = span->get_bound (d);
- if (gh_pair_p)
- return unsmob_grob (index_get_cell (c, d));
- else
- return 0;
+ Grob *col = dynamic_cast<Item *> (h)->get_column ();
+ return Paper_column::get_rank (col);
}
-Real
-Tie::get_position (Grob*me)
+int
+Tie::get_position (Grob *me)
{
- Direction d = head (me,LEFT) ? LEFT:RIGHT;
- return Staff_symbol_referencer::get_position (head (me,d));
+ Direction d = head (me, LEFT) ? LEFT : RIGHT;
+ return (int) Staff_symbol_referencer::get_position (head (me, d));
}
-
/*
Default: Put the tie oppositie of the stem [Wanske p231]
In case of chords: Tie_column takes over
-
+
The direction of the Tie is more complicated (See [Ross] p136 and
further).
- (what about linebreaks? )
-
+ (what about linebreaks? )
*/
Direction
-Tie::get_default_dir (Grob*me)
+Tie::get_default_dir (Grob *me)
{
- Item * sl = head (me,LEFT) ? Rhythmic_head::get_stem (head (me,LEFT)) :0;
- Item * sr = head (me,RIGHT) ? Rhythmic_head::get_stem (head (me,RIGHT)) :0;
+ Item *sl = head (me, LEFT) ? Rhythmic_head::get_stem (head (me, LEFT)) : 0;
+ Item *sr = head (me, RIGHT) ? Rhythmic_head::get_stem (head (me, RIGHT)) : 0;
if (sl && sr)
{
if (get_grob_direction (sl) == UP
else if (sl || sr)
{
Item *s = sl ? sl : sr;
- return - get_grob_direction (s);
+ return -get_grob_direction (s);
}
-
return UP;
}
-
void
-Tie::set_direction (Grob*me)
+Tie::set_direction (Grob *me)
{
if (!get_grob_direction (me))
{
}
}
-/*
- TODO: we should also use thickness for computing the clearance
- between head and tie. Very thick ties will now touch the note head.
-
- */
-SCM
-Tie::get_control_points (SCM smob)
-{
- Spanner*me = unsmob_spanner (smob);
- Direction headdir = CENTER;
- if (head (me,LEFT))
- headdir = LEFT;
- else if (head (me,RIGHT))
- headdir = RIGHT;
- else
+Interval
+get_default_attachments (Spanner *me, Grob *common, Real gap,
+ int *staff_position,
+ bool *in_between
+ )
+{
+ Real staff_space = Staff_symbol_referencer::staff_space (me);
+ Direction dir = get_grob_direction (me);
+ Interval attachments;
+ Direction d = LEFT;
+ do
{
- programming_error ("Tie without heads.");
- me->suicide ();
- return SCM_EOL;
+ attachments[d]
+ = robust_relative_extent (me->get_bound (d),
+ common,
+ X_AXIS)[-d]
+ - gap * d;
}
+ while (flip (&d) != LEFT);
- set_direction (me);
-
- Direction dir = get_grob_direction (me);
-
- Real staff_space = Staff_symbol_referencer::staff_space (me);
-
- Real x_gap_f = robust_scm2double (me->get_grob_property ("x-gap"), 0);
-
- Grob* l = me->get_bound (LEFT);
- Grob* r = me->get_bound (RIGHT);
+ if (attachments.length () < 0.6 * staff_space)
+ {
+ /*
+ Let short ties start over note heads, instead of between.
+ */
+ Drul_array<bool> allow (true, true);
+
+ Direction d = LEFT;
+ do {
+ if (Note_head::has_interface (me->get_bound (d)))
+ {
+ Grob *stem = unsmob_grob (me->get_bound (d)->get_object ("stem"));
+ if (get_grob_direction (stem) == dir
+ && -d == dir)
+ allow[d] = false;
+ }
+ } while (flip (&d) != LEFT);
+
+ if (allow[LEFT] && allow[RIGHT])
+ {
+ *staff_position += dir;
+ do
+ {
+ if (Note_head::has_interface (me->get_bound (d)))
+ {
+ Interval extent
+ = robust_relative_extent (me->get_bound (d),
+ common, X_AXIS);
+
+ attachments[d] = extent.linear_combination (- 0.5 * d);
+ *in_between = false;
+ }
+ }
+ while (flip (&d) != LEFT);
+ }
+ }
- Grob* commonx = me->common_refpoint (l, X_AXIS);
- commonx = me->common_refpoint (r, X_AXIS);
-
- Real left_x;
+ return attachments;
+}
- /*
- the tie has to be long enough to be visible, but should not go
- through key sigs. In the 1.5 series the pref.matter - note
- distance is fixed , so this won't be a problem anymore.
- */
- Real lambda = 0.9;
+Interval
+get_skyline_attachment (Drul_array< Array < Skyline_entry > > const &skylines,
+ Real y)
+{
+ Interval attachments;
+ Direction d = LEFT;
+ do
+ {
+ attachments[d] = skyline_height (skylines[d], y, -d);
+ }
+ while (flip (&d) != LEFT);
- if (Note_head::has_interface (l))
+ return attachments;
+}
+
+void
+Tie::get_configuration (Grob *me_grob, Grob *common,
+ Tie_configuration *conf,
+ Drul_array< Array < Skyline_entry > > const *skylines,
+ Tie_details const &details
+ )
+{
+ Spanner *me = dynamic_cast<Spanner*> (me_grob);
+ if (!head (me, LEFT) && !head (me, RIGHT))
{
- Real where = RIGHT;
-
- /*
- This correction is due te the shape of the black note head.
- */
- if (Rhythmic_head::duration_log (l) == 2)
- where += dir* 0.2;
- left_x = l->extent (l, X_AXIS).linear_combination (where)
- + x_gap_f;
+ programming_error ("tie without heads");
+ me->suicide ();
+ return ;
}
- else
- left_x = l->extent (l, X_AXIS).linear_combination (lambda);
+
+ Direction dir = CENTER;
+ int tie_position = (int) Tie::get_position (me);
+ int staff_position = (int) conf->position_;
- Real width;
- if (Note_head::has_interface (l) && Note_head::has_interface (r))
+ if (conf->dir_)
{
- width =
- + r->extent (commonx,X_AXIS)[LEFT]
- - l->extent (commonx, X_AXIS)[RIGHT]
- -2 * x_gap_f;
+ dir = conf->dir_;
}
else
{
- if (Note_head::has_interface (l))
- width = r->relative_coordinate (commonx, X_AXIS)
- - l->extent (commonx, X_AXIS)[RIGHT]
- - 2 * x_gap_f;
- else
- width =
- - l->extent (commonx, X_AXIS).linear_combination (lambda)
- + r->extent (commonx, X_AXIS)[LEFT]
- - 2 * x_gap_f;
+ dir = get_grob_direction (me);
+ if (!dir)
+ dir = get_default_dir (me);
}
-
+ Real staff_space = details.staff_space_;
- SCM details = me->get_grob_property ("details");
+ bool in_between = true;
+ Interval attachments = conf->attachment_x_;
+ Real gap = robust_scm2double (me->get_property ("x-gap"), 0.2);
+ if (attachments.is_empty())
+ {
+ if (!skylines)
+ attachments = get_default_attachments (me, common, gap,
+ &staff_position,
+ &in_between);
+ else
+ {
+ Real y = staff_space * 0.5 * staff_position;
+ attachments = get_skyline_attachment (*skylines, y);
+ attachments.widen (-gap);
+ }
+ }
- SCM lim // groetjes aan de chirurgendochter.
- = scm_assq (ly_symbol2scm ("height-limit"),details);
+ Bezier b = slur_shape (attachments.length(),
+ details.height_limit_,
+ details.ratio_);
+ b.scale (1, dir);
- Real h_inf = gh_scm2double (ly_cdr (lim)) * staff_space;
- Real r_0 = gh_scm2double (ly_cdr (scm_assq (ly_symbol2scm ("ratio"),details)));
+ Offset middle = b.curve_point (0.5);
+ Offset edge = b.curve_point (0.0);
- Bezier b = slur_shape (width, h_inf, r_0);
+ staff_position = int (rint (staff_position));
+
+ Real dy = fabs (middle[Y_AXIS] - edge[Y_AXIS]);
+ bool in_space = !(Staff_symbol_referencer::on_staffline (me, (int) staff_position));
+ bool fits_in_space =
+ (dy < 0.6 * staff_space);
/*
- I think this better, particularly for small ties. It always allows the user to move ties if
- they seem in the wrong place
-
- TODO: what if 2 heads have different size.
-
- */
-
- Real ypos = Tie::get_position (me) * staff_space/2
- + dir * gh_scm2double (me->get_grob_property ("y-offset"));;
-
- /*
- Make sure we don't start on a dots
+ Avoid dot
*/
- if (Note_head::has_interface (l) && Rhythmic_head::get_dots (l))
+ Grob *left_dot = unsmob_grob (me->get_bound (LEFT)->get_object ("dot"));
+ if (left_dot && in_space)
{
- Grob* dots = Rhythmic_head::get_dots (l);
- if(fabs (staff_space * Staff_symbol_referencer::get_position (dots) /2
- - ypos) < 0.5)
+ if (staff_position == Staff_symbol_referencer::get_position (left_dot))
{
- ypos += 0.5 * dir ;
+ staff_position += dir;
+ in_space = false;
}
}
-
/*
- todo: prevent ending / staffline collision.
-
- todo: tie / stem collision
+ Avoid flag.
*/
+ Grob *left_stem = unsmob_grob (me->get_bound (LEFT)->get_object ("stem"));
+ if (left_stem)
+ {
+ Stencil flag = Stem::get_translated_flag (left_stem);
+ Real y = staff_position * staff_space * 0.5;
+ if (flag.extent (Y_AXIS).contains (y))
+ {
+ staff_position += dir;
+ in_space = !in_space;
+ }
+ }
- b = slur_shape (width,h_inf, r_0);
- b.scale (1, dir);
- b.translate (Offset (left_x, ypos));
-
-
- /*
- Avoid colliding of the horizontal part with stafflines.
+ if (in_space != fits_in_space)
+ {
+ if (in_space)
+ {
+ staff_position += dir;
+ }
+ else
+ {
+ in_space = true;
+ staff_position += dir;
+ }
+ }
-
- TODO: redo this, heuristic is half-baken, and ties often look ugly
- as a result.
- TODO: doesn't work when on staff with even number of lines.
+ /*
+ Putting larger in-space ties next to the notes forces
+ the edges to be opposite (Y-wise) to the tie direction.
*/
- Array<Real> horizontal (b.solve_derivative (Offset (1,0)));
- if (horizontal.size ())
+ if (staff_position == tie_position
+ && in_space
+ && dy > 0.3 * staff_space)
{
- /*
- ugh. Doesnt work for non-horizontal curves.
- */
- Real y = b.curve_point (horizontal[0])[Y_AXIS];
-
- Real ry = rint (y/staff_space) * staff_space;
- Real diff = ry - y;
- Real newy = y;
-
- Real clear = staff_space * gh_scm2double (me->get_grob_property ("staffline-clearance"));
+ staff_position += 2 * dir;
+ }
- if (fabs (y) <=
- Staff_symbol_referencer::staff_radius (me) * staff_space + clear
- && fabs (diff) < clear)
+ if (!in_between
+ && in_space
+ && fabs (staff_position - tie_position) <= 1)
+ staff_position += 2*dir;
+
+
+ if (in_space)
+ {
+ if (fabs (dy) < 0.45 * staff_space)
{
- Real y1 = ry + clear;
- Real y2 = ry - clear;
-
- /*
- ugh, we shove the 0.5 out of our sleeves.
-
- Any way. This test is to make sure that staffline
- collision avoidance does not result in completely flat
- ties.
- */
- if (fabs (y1 - ypos) < 0.5)
- y1 = y2;
- else if (fabs (y2 - ypos) < 0.5)
- y2 = y1;
-
- newy = (fabs (y1 - y) < fabs (y2 - y)) ? y1 : y2;
-
- // newy = ry - 0.5 * staff_space * sign (diff) ;
-
/*
- we don't want horizontal ties
- */
- if (fabs (newy - b.control_[0][Y_AXIS]) < 1e-2)
- {
- newy = newy + dir * staff_space;
- }
+ vertically center in space.
+ */
+ conf->attachment_x_ = attachments;
+ conf->center_tie_vertically(details);
+ }
+ else
+ {
+ conf->delta_y_ =
+ dir * staff_space * (- 0.3);
}
-
- Real y0 = b.control_ [0][Y_AXIS];
- b.control_[2][Y_AXIS] =
- b.control_[1][Y_AXIS] =
- (b.control_[1][Y_AXIS] - y0) * ((newy - y0) / (y - y0)) + y0;
}
else
- programming_error ("Tie is nowhere horizontal");
+ {
+ Real where = 0.5 * dir;
+
+ Real rounding_dy = (where - middle[Y_AXIS]);
+ conf->delta_y_ = rounding_dy;
+
+ if (dir * b.curve_point (0.0)[Y_AXIS] <
+ dir * tie_position * 0.5 * staff_space)
+ conf->delta_y_ += staff_space * dir;
+ }
+ conf->dir_ = dir;
+ conf->position_ = staff_position;
+
+ if (skylines)
+ {
+ Real y = staff_space * 0.5 * staff_position;
+ attachments = get_skyline_attachment (*skylines, y);
+ attachments.widen (-gap);
+ }
+ conf->attachment_x_ = attachments;
+}
+
+
+void
+Tie::set_default_control_points (Grob *me_grob)
+{
+ Spanner *me = dynamic_cast<Spanner*> (me_grob);
+ Grob *common = me;
+ common = me->get_bound (LEFT)->common_refpoint (common, X_AXIS);
+ common = me->get_bound (RIGHT)->common_refpoint (common, X_AXIS);
+
+ Tie_configuration conf;
+ if (!get_grob_direction (me))
+ set_grob_direction (me, get_default_dir (me));
+ int tie_position = (int) Tie::get_position (me);
+ conf.position_ = tie_position;
+
+ Tie_details details;
+ details.init (me);
+ get_configuration (me, common, &conf, 0, details);
+ set_control_points (me, common, conf, details);
+}
+void
+Tie::set_control_points (Grob *me,
+ Grob *common,
+ Tie_configuration const &conf,
+ Tie_details const &details
+ )
+{
+ Bezier b = conf.get_bezier (details);
+ b.scale (1, conf.dir_);
+ b.translate (Offset (conf.attachment_x_[LEFT]
+ - me->relative_coordinate (common, X_AXIS),
+ 0.5 * conf.position_ * details.staff_space_
+ + conf.delta_y_
+ ));
+
SCM controls = SCM_EOL;
- for (int i= 4; i--;)
- controls = gh_cons (ly_offset2scm (b.control_[i]), controls);
- return controls;
+ for (int i = 4; i--;)
+ controls = scm_cons (ly_offset2scm (b.control_[i]), controls);
+
+ me->set_property ("control-points", controls);
}
-MAKE_SCHEME_CALLBACK (Tie,brew_molecule,1);
+
+MAKE_SCHEME_CALLBACK (Tie, print, 1);
SCM
-Tie::brew_molecule (SCM smob)
+Tie::print (SCM smob)
{
- Grob*me = unsmob_grob (smob);
+ Grob *me = unsmob_grob (smob);
- SCM cp = me->get_grob_property ("control-points");
- if (!gh_pair_p (cp)) // list is more accurate
+ if (CENTER == get_grob_direction (me))
+ set_direction (me);
+
+ SCM cp = me->get_property ("control-points");
+ if (!scm_is_pair (cp))
{
- cp = get_control_points (smob);
- me->set_grob_property ("control-points", cp);
+ set_default_control_points (me);
+ cp = me->get_property ("control-points");
}
- if (!gh_pair_p (cp))
- return Molecule ().smobbed_copy ();
-
- Real thick
- = Staff_symbol_referencer::line_thickness (me)
- * robust_scm2double (me->get_grob_property ("thickness"), 1);
+ if (!scm_is_pair (cp))
+ return Stencil ().smobbed_copy ();
+
+ Real staff_thick = Staff_symbol_referencer::line_thickness (me);
+ Real base_thick = robust_scm2double (me->get_property ("thickness"), 1);
+ Real thick = base_thick * staff_thick;
Bezier b;
int i = 0;
- for (SCM s= cp; s != SCM_EOL; s = ly_cdr (s))
+ for (SCM s = cp; s != SCM_EOL; s = scm_cdr (s))
{
- b.control_[i] = ly_scm2offset (ly_car (s));
+ b.control_[i] = ly_scm2offset (scm_car (s));
i++;
}
-
- Molecule a = Lookup::slur (b, get_grob_direction (me) * thick, thick);
-
- return a.smobbed_copy ();
-}
+ Stencil a;
+
+ 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 (b,
+ thick,
+ robust_scm2double (p, 1.0),
+ robust_scm2double (f, 0));
+ else
+ a = Lookup::slur (b,
+ get_grob_direction (me) * staff_thick,
+ thick);
+ return a.smobbed_copy ();
+}
-ADD_INTERFACE (Tie,"tie-interface",
- "A tie connecting two noteheads.\n"
-"direction = Forced direction for all ties",
- "y-offset staffline-clearance control-points head-pair details thickness x-gap direction minimum-length");
+ADD_INTERFACE (Tie,
+ "tie-interface",
+
+ "A tie connecting two noteheads.\n",
+
+ "control-points "
+ "dash-fraction "
+ "dash-period "
+ "details "
+ "direction "
+ "thickness "
+ "x-gap ");
projects / lilypond.git / blobdiff