*/
#include "tie.hh"
-
-#include <math.h>
-
#include "spanner.hh"
#include "lookup.hh"
#include "output-def.hh"
#include "stem.hh"
#include "note-head.hh"
#include "tie-column.hh"
+#include "grob-array.hh"
-/*
- tie: Connect two noteheads.
-
- What if we have
-
- c4 ~ \clef bass ; c4 or
-
- c4 \staffchange c4
-
- do we have non-horizontal ties then?
-*/
+int
+Tie::compare (Grob *const &s1,
+ Grob *const &s2)
+{
+ return sign (Tie::get_position (s1) - Tie::get_position (s2));
+}
void
Tie::set_head (Grob *me, Direction d, Grob *h)
{
dynamic_cast<Spanner *> (me)->set_bound (d, h);
- me->add_dependency (h);
}
Grob *
return Paper_column::get_rank (col);
}
-Real
+int
Tie::get_position (Grob *me)
{
- Direction d = head (me, LEFT) ? LEFT : RIGHT;
- return Staff_symbol_referencer::get_position (head (me, d));
+ Direction d = LEFT;
+ do
+ {
+ Grob *h = head (me, d);
+ if (h)
+ return (int) Staff_symbol_referencer::get_position (h);
+ }
+ while (flip (&d) != LEFT);
+
+ /*
+
+ TODO: this is theoretically possible for ties across more than 2
+ systems.. We should look at the first broken copy.
+
+ */
+ programming_error ("Tie without heads. Suicide");
+ me->suicide ();
+ return 0;
}
/*
return UP;
}
-void
-Tie::set_direction (Grob *me)
+
+MAKE_SCHEME_CALLBACK(Tie, calc_direction, 1);
+SCM
+Tie::calc_direction (SCM smob)
{
- if (!get_grob_direction (me))
+ Grob *me = unsmob_grob (smob);
+ Grob *yparent = me->get_parent (Y_AXIS);
+ if (Tie_column::has_interface (yparent)
+ && unsmob_grob_array (yparent->get_object ("ties"))
+ && unsmob_grob_array (yparent->get_object ("ties"))->size () > 1)
{
- if (Tie_column::has_interface (me->get_parent (Y_AXIS)))
- Tie_column::set_directions (me->get_parent (Y_AXIS));
- else
- set_grob_direction (me, Tie::get_default_dir (me));
+ /* trigger positioning. */
+ (void) yparent->get_property ("positioning-done");
}
+ else
+ set_grob_direction (me, Tie::get_default_dir (me));
+
+ return SCM_UNSPECIFIED;
}
+Interval
+Tie::get_default_attachments (Spanner *me, Grob *common, Real gap,
+ int *staff_position,
+ bool *in_between,
+ Tie_details const &details
+ )
+{
+ Real staff_space = Staff_symbol_referencer::staff_space (me);
+ Direction dir = get_grob_direction (me);
+ Interval attachments;
+ Direction d = LEFT;
+ do
+ {
+ attachments[d]
+ = robust_relative_extent (me->get_bound (d),
+ common,
+ X_AXIS)[-d]
+ - gap * d;
+ }
+ while (flip (&d) != LEFT);
+ if (attachments.length () < details.between_length_limit_ * 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);
+ }
+ }
+
+ return attachments;
+}
+
+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);
+
+ return attachments;
+}
+
void
-Tie::get_configuration (Grob *me_grob, Grob **common,
- Tie_configuration *conf)
+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))
return ;
}
- Direction dir = CENTER;
-
- int tie_position = (int) Tie::get_position (me);
- int staff_position = conf->position_;
-
- if (conf->dir_)
- {
- dir = conf->dir_;
- }
- else
- {
- dir = get_grob_direction (me);
- if (!dir)
- dir = get_default_dir (me);
- }
-
- Real staff_space = Staff_symbol_referencer::staff_space (me);
+ /*
+ UGH. Don't mirror Tie_configuration.
+ */
+ conf->head_position_ = (int) Tie::get_position (me);
+ if (!conf->dir_)
+ conf->dir_ = get_grob_direction (me);
+ if (!conf->dir_)
+ conf->dir_ = get_default_dir (me);
+ Real staff_space = details.staff_space_;
bool in_between = true;
- Interval attachments = conf->attachment_x_;
- if (attachments.is_empty())
+ Real gap = robust_scm2double (me->get_property ("x-gap"), 0.2);
+
+ if (conf->attachment_x_.is_empty())
{
- Direction d = LEFT;
- Real gap = robust_scm2double (me->get_property ("x-gap"), 0.2);
- do
+ if (!skylines)
+ conf->attachment_x_ = get_default_attachments (me, common, gap,
+ &conf->position_,
+ &in_between, details);
+ else
{
- attachments[d]
- = robust_relative_extent (me->get_bound (d),
- common[X_AXIS],
- X_AXIS)[-d]
- - gap * d;
- }
- while (flip (&d) != LEFT);
-
- 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], X_AXIS);
-
- attachments[d] = extent.linear_combination (- 0.5 * d);
- in_between = false;
- }
- }
- while (flip (&d) != LEFT);
- }
+ Real y = staff_space * 0.5 * conf->position_;
+ conf->attachment_x_ = get_skyline_attachment (*skylines, y);
+ conf->attachment_x_.widen (-gap);
}
}
- SCM details = me->get_property ("details");
-
- SCM limit
- = scm_assq (ly_symbol2scm ("height-limit"), details);
-
- Real h_inf = robust_scm2double (scm_cdr (limit), 0.75) * staff_space;
- Real r_0 = robust_scm2double (scm_cdr (scm_assq (ly_symbol2scm ("ratio"), details)),
- .333);
- Bezier b = slur_shape (attachments.length(),
- h_inf, r_0);
- b.scale (1, dir);
+ Bezier b = slur_shape (conf->attachment_x_.length(),
+ details.height_limit_,
+ details.ratio_);
+ b.scale (1, conf->dir_);
Offset middle = b.curve_point (0.5);
Offset edge = b.curve_point (0.0);
- staff_position = int (rint (staff_position));
+ conf->position_ = int (rint (conf->position_));
Real dy = fabs (middle[Y_AXIS] - edge[Y_AXIS]);
- bool in_space = !(Staff_symbol_referencer::on_staffline (me, (int) staff_position));
+ bool in_space = !(Staff_symbol_referencer::on_staffline (me, (int) conf->position_));
bool fits_in_space =
(dy < 0.6 * staff_space);
Avoid dot
*/
Grob *left_dot = unsmob_grob (me->get_bound (LEFT)->get_object ("dot"));
- if (left_dot && in_space)
+ int dot_pos = left_dot
+ ? int (Staff_symbol_referencer::get_position (left_dot))
+ : 0;
+ if (left_dot
+ && (conf->position_ == dot_pos
+ || conf->position_ + conf->dir_ == dot_pos))
{
- if (staff_position == Staff_symbol_referencer::get_position (left_dot))
+ conf->position_ += conf->dir_;
+ in_space = !in_space;
+
+ if (skylines)
{
- staff_position += dir;
- in_space = false;
+ Real y = staff_space * 0.5 * conf->position_;
+ conf->attachment_x_ = get_skyline_attachment (*skylines, y);
+ conf->attachment_x_.widen (-gap);
+ Bezier b = slur_shape (conf->attachment_x_.length(),
+ details.height_limit_,
+ details.ratio_);
+ Offset middle = b.curve_point (0.5);
+ Offset edge = b.curve_point (0.0);
+ dy = fabs (middle[Y_AXIS] - edge[Y_AXIS]);
+ fits_in_space =
+ (dy < 0.6 * staff_space);
}
}
-
+
/*
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;
+ Real y = conf->position_ * staff_space * 0.5;
if (flag.extent (Y_AXIS).contains (y))
{
- staff_position += dir;
+ conf->position_ += conf->dir_;
in_space = !in_space;
}
}
{
if (in_space)
{
- staff_position += dir;
+ conf->position_ += conf->dir_;
}
else
{
in_space = true;
- staff_position += dir;
+ conf->position_ += conf->dir_;
+ }
+
+ /*
+ ugh: code dup.
+ */
+ if (skylines)
+ {
+ Real y = staff_space * 0.5 * conf->position_;
+ conf->attachment_x_ = get_skyline_attachment (*skylines, y);
+ conf->attachment_x_.widen (-gap);
+
+ Bezier b = slur_shape (conf->attachment_x_.length(),
+ details.height_limit_,
+ details.ratio_);
+ Offset middle = b.curve_point (0.5);
+ Offset edge = b.curve_point (0.0);
+ dy = fabs (middle[Y_AXIS] - edge[Y_AXIS]);
+ fits_in_space =
+ (dy < 0.6 * staff_space);
}
}
Putting larger in-space ties next to the notes forces
the edges to be opposite (Y-wise) to the tie direction.
*/
- if (staff_position == tie_position
+ if (conf->position_ == conf->head_position_
&& in_space
- && dy > 0.3 * staff_space)
+ && Staff_symbol_referencer::staff_radius (me) > abs (conf->position_) / 2
+ && dy > 0.3 * staff_space
+ )
{
- staff_position += 2 * dir;
+ conf->position_ += 2 * conf->dir_;
}
if (!in_between
&& in_space
- && fabs (staff_position - tie_position) <= 1)
- staff_position += 2*dir;
+ && abs (conf->position_ - conf->head_position_) <= 1)
+ conf->position_ += 2*conf->dir_;
if (in_space)
{
- if (fabs (dy) < 0.4 * staff_space)
+ if ((abs (conf->position_ - conf->head_position_) <= 1
+ && fabs (dy) < 0.45 * staff_space)
+ || fabs (dy) < 0.6 * staff_space)
{
/*
vertically center in space.
*/
- Offset middle = b.curve_point (0.5);
- Offset edge = b.curve_point (0.0);
-
- Real center = (edge[Y_AXIS] + middle[Y_AXIS])/2.0;
-
- conf->delta_y_ = - center;
+ conf->center_tie_vertically (details);
}
else
{
conf->delta_y_ =
- dir * staff_space * (- 0.3);
+ conf->dir_ * staff_space * (- 0.3);
}
}
else
{
- Real where = 0.5 * dir;
+ Real where = 0.5 * conf->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;
+ if (conf->dir_ * (b.curve_point (0.0)[Y_AXIS]
+ + conf->position_ * staff_space * 0.5
+ + conf->delta_y_) <
+ conf->dir_ * conf->head_position_ * 0.5 * staff_space)
+ {
+ if (Staff_symbol_referencer::staff_radius (me) > abs (conf->head_position_) / 2)
+ conf->position_ += 2 * conf->dir_;
+ else
+ conf->position_ += conf->dir_;
+ }
}
- conf->dir_ = dir;
- conf->position_ = staff_position;
- conf->attachment_x_ = attachments;
+
+ if (skylines)
+ {
+ Real half_space = 0.5 * staff_space;
+ Real y = conf->position_ * half_space;
+
+ conf->attachment_x_ = get_skyline_attachment (*skylines, y);
+ conf->attachment_x_.widen (-gap);
+ }
}
Tie::set_default_control_points (Grob *me_grob)
{
Spanner *me = dynamic_cast<Spanner*> (me_grob);
- Grob *common[NO_AXES] = {
- 0, 0
- };
- for (int a = X_AXIS; a < NO_AXES; a++)
- {
- Axis ax ((Axis) a);
- common[ax] = me->get_bound (LEFT)->common_refpoint (me, ax);
- common[ax] = me->get_bound (RIGHT)->common_refpoint (common[a], ax);
- }
+ 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;
-
- get_configuration (me, common, &conf);
- set_control_points (me, common, conf);
+ 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)
+ Grob *common,
+ Tie_configuration const &conf,
+ Tie_details const &details
+ )
{
- SCM details = me->get_property ("details");
- SCM limit
- = scm_assq (ly_symbol2scm ("height-limit"), details);
-
- Real staff_space = Staff_symbol_referencer::staff_space (me);
- Real h_inf = robust_scm2double (scm_cdr (limit), 0.75) * staff_space;
- Real r_0 = robust_scm2double (scm_cdr (scm_assq (ly_symbol2scm ("ratio"),
- details)),
- .333);
-
- Bezier b = slur_shape (conf.attachment_x_.length(),
- h_inf, r_0);
+ Bezier b = conf.get_bezier (details);
b.scale (1, conf.dir_);
b.translate (Offset (conf.attachment_x_[LEFT]
- - me->relative_coordinate (common[X_AXIS], X_AXIS),
- 0.5 * conf.position_ * staff_space
+ - 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 = scm_cons (ly_offset2scm (b.control_[i]), controls);
-
+ {
+ if (!b.control_[i].is_sane ())
+ programming_error ("Insane offset");
+ controls = scm_cons (ly_offset2scm (b.control_[i]), controls);
+ }
me->set_property ("control-points", controls);
}
-
-
-MAKE_SCHEME_CALLBACK (Tie, print, 1);
+MAKE_SCHEME_CALLBACK(Tie, calc_control_points, 1);
SCM
-Tie::print (SCM smob)
+Tie::calc_control_points (SCM smob)
{
Grob *me = unsmob_grob (smob);
- if (CENTER == get_grob_direction (me))
- set_direction (me);
-
- SCM cp = me->get_property ("control-points");
- if (!scm_is_pair (cp))
+ // trigger Tie-column
+ (void) get_grob_direction (me);
+
+ if (!scm_is_pair (me->get_property ("control-points")))
{
set_default_control_points (me);
- cp = me->get_property ("control-points");
}
- if (!scm_is_pair (cp))
- return Stencil ().smobbed_copy ();
+ return SCM_UNSPECIFIED;
+}
+
+
+MAKE_SCHEME_CALLBACK (Tie, print, 1);
+SCM
+Tie::print (SCM smob)
+{
+ Grob *me = unsmob_grob (smob);
+
+ SCM cp = me->get_property ("control-points");
Real staff_thick = Staff_symbol_referencer::line_thickness (me);
Real base_thick = robust_scm2double (me->get_property ("thickness"), 1);
ADD_INTERFACE (Tie,
"tie-interface",
- "A tie connecting two noteheads.\n",
+ "A tie connecting two noteheads. \n\n"
+ ,
+
+ /* properties */
"control-points "
"dash-fraction "
"dash-period "
"direction "
"thickness "
"x-gap ");
-
-int
-Tie_configuration::compare (Tie_configuration const &a,
- Tie_configuration const &b)
-{
- if (a.position_ - b.position_)
- return sign (a.position_ - b.position_);
- return sign (a.dir_ - b.dir_);
-}
-
-
-Tie_configuration::Tie_configuration ()
-{
- dir_ = CENTER;
- position_ = 0;
- delta_y_ = 0.0;
-}
projects / lilypond.git / blobdiff