source file of the GNU LilyPond music typesetter
- (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
*/
#include "tie.hh"
-
-#include <cmath>
-using namespace std;
-
#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"
+#include "tie-formatting-problem.hh"
+
int
Tie::compare (Grob *const &s1,
Tie::set_head (Grob *me, Direction d, Grob *h)
{
dynamic_cast<Spanner *> (me)->set_bound (d, h);
- me->add_dependency (h);
}
Grob *
int
Tie::get_position (Grob *me)
{
- Direction d = head (me, LEFT) ? LEFT : RIGHT;
- return (int) 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
+ bool *in_between,
+ Tie_details const &details
)
{
Real staff_space = Staff_symbol_referencer::staff_space (me);
}
while (flip (&d) != LEFT);
- if (attachments.length () < 0.6 * staff_space)
+ if (attachments.length () < details.between_length_limit_ * staff_space)
{
/*
Let short ties start over note heads, instead of between.
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::get_configuration (Grob *me_grob,
Tie_configuration *conf,
- Drul_array< Array < Skyline_entry > > const *skylines,
- Tie_details const &details
- )
+ Tie_formatting_problem const &problem)
{
Spanner *me = dynamic_cast<Spanner*> (me_grob);
if (!head (me, LEFT) && !head (me, RIGHT))
conf->dir_ = get_grob_direction (me);
if (!conf->dir_)
conf->dir_ = get_default_dir (me);
-
- Real staff_space = details.staff_space_;
+ Real staff_space = problem.details_.staff_space_;
bool in_between = true;
Real gap = robust_scm2double (me->get_property ("x-gap"), 0.2);
if (conf->attachment_x_.is_empty())
{
+#if 0
if (!skylines)
conf->attachment_x_ = get_default_attachments (me, common, gap,
- &conf->position_,
- &in_between);
- else
- {
- Real y = staff_space * 0.5 * conf->position_;
- conf->attachment_x_ = get_skyline_attachment (*skylines, y);
- conf->attachment_x_.widen (-gap);
- }
+ &conf->position_,
+ &in_between, problem.details_);
+#endif
+ Real y = staff_space * 0.5 * conf->position_;
+ conf->attachment_x_ = problem.get_attachment (y);
+ conf->attachment_x_.widen (-gap);
}
Bezier b = slur_shape (conf->attachment_x_.length(),
- details.height_limit_,
- details.ratio_);
+ problem.details_.height_limit_,
+ problem.details_.ratio_);
b.scale (1, conf->dir_);
Offset middle = b.curve_point (0.5);
conf->position_ += conf->dir_;
in_space = !in_space;
- if (skylines)
+ if (conf->position_ == dot_pos)
{
- 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);
+ conf->position_ += conf->dir_;
+ in_space = !in_space;
}
+
+ Real y = staff_space * 0.5 * conf->position_;
+ conf->attachment_x_ = problem.get_attachment (y);
+ conf->attachment_x_.widen (-gap);
+ Bezier b = slur_shape (conf->attachment_x_.length(),
+ problem.details_.height_limit_,
+ problem.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);
}
/*
/*
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);
+ */
+ Real y = staff_space * 0.5 * conf->position_;
+ conf->attachment_x_ = problem.get_attachment (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);
- }
+ Bezier b = slur_shape (conf->attachment_x_.length(),
+ problem.details_.height_limit_,
+ problem.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);
}
*/
if (conf->position_ == conf->head_position_
&& in_space
- && Staff_symbol_referencer::staff_radius (me) > fabs (conf->position_) / 2
- && dy > 0.3 * staff_space)
+ && Staff_symbol_referencer::staff_radius (me) > abs (conf->position_) / 2
+ && dy > 0.3 * staff_space
+ )
{
conf->position_ += 2 * conf->dir_;
}
if (!in_between
&& in_space
- && fabs (conf->position_ - conf->head_position_) <= 1)
- conf->position_ += 2*conf->dir_;
-
+ && abs (conf->position_ - conf->head_position_) <= 1)
+ {
+ int amount = conf->dir_;
+ if (sign (conf->position_) != conf->dir_
+ || conf->position_ < Staff_symbol_referencer::staff_radius (me) * 2)
+ amount *= 2;
+
+ conf->position_ += amount;
+ }
if (in_space)
{
- if ((fabs (conf->position_ - conf->head_position_) <= 1
- && fabs (dy) < 0.45 * staff_space)
- || fabs (dy) < 0.6 * staff_space)
+ if ((sign (conf->position_) != conf->dir_
+ || conf->position_ < Staff_symbol_referencer::staff_radius (me) * 2)
+ &&
+ ((abs (conf->position_ - conf->head_position_) <= 1
+ && fabs (dy) < 0.45 * staff_space)
+ || fabs (dy) < 0.6 * staff_space))
{
/*
vertically center in space.
*/
- conf->center_tie_vertically (details);
+ conf->center_tie_vertically (problem.details_);
}
else
{
+ conf->delta_y_) <
conf->dir_ * conf->head_position_ * 0.5 * staff_space)
{
- if (Staff_symbol_referencer::staff_radius (me) > fabs (conf->head_position_) / 2)
+ if (Staff_symbol_referencer::staff_radius (me) > abs (conf->head_position_) / 2)
conf->position_ += 2 * conf->dir_;
else
conf->position_ += conf->dir_;
}
- if (skylines)
- {
- Real half_space = 0.5 * staff_space;
- Real y = conf->position_ * half_space;
+ 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);
- }
+ conf->attachment_x_ = problem.get_attachment (y);
+ conf->attachment_x_.widen (-gap);
}
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_formatting_problem problem;
+ problem.from_tie (me);
- Tie_details details;
- details.init (me);
- get_configuration (me, common, &conf, 0, details);
- set_control_points (me, common, conf, details);
+ // get_configuration (me, &conf, problem);
+ int tie_position = (int) Tie::get_position (me);
+ Tie_configuration conf
+ = problem.find_optimal_tie_configuration (tie_position, get_grob_direction (me));
+ set_control_points (me, problem.common_x_refpoint (),
+ conf, problem.details_);
}
void
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_
- ));
-
+ Bezier b = conf.get_transformed_bezier (details);
+ b.translate (Offset (- me->relative_coordinate (common, X_AXIS), 0));
+
SCM controls = SCM_EOL;
for (int i = 4; i--;)
{
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);
+ // trigger Tie-column
+ (void) get_grob_direction (me);
- if (!get_grob_direction (me))
- me->programming_error ("Tie direction not set.");
-
- SCM cp = me->get_property ("control-points");
- if (!scm_is_pair (cp))
+ 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)
{
- /*
- UGH. dependency tracking!
- */
- if (Tie_column::has_interface (me->get_parent (Y_AXIS)))
- {
- Tie_column::set_directions (me->get_parent (Y_AXIS));
- }
-
- cp = me->get_property ("control-points");
+ /* trigger positioning. */
+ (void) yparent->get_property ("positioning-done");
}
-
- if (!scm_is_pair (cp))
+
+ 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 "
"direction "
"thickness "
"x-gap ");
+
+
+
projects / lilypond.git / blobdiff