Jan Nieuwenhuizen <janneke@gnu.org>
*/
-#include <math.h>
#include "slur-scoring.hh"
#include "libc-extension.hh"
#include "slur-configuration.hh"
#include "beam.hh"
#include "directional-element-interface.hh"
-#include "group-interface.hh"
+#include "pointer-group-interface.hh"
#include "slur.hh"
#include "note-column.hh"
#include "output-def.hh"
Encompass_info
Slur_score_state::get_encompass_info (Grob *col) const
{
- Grob *stem = unsmob_grob (col->get_property ("stem"));
+ Grob *stem = unsmob_grob (col->get_object ("stem"));
Encompass_info ei;
if (!stem)
do not issue warning. This happens for rests and
whole notes.
*/
- s = Interval (0,0)
+ s = Interval (0, 0)
+ extremes[d].stem_->relative_coordinate (common_[ax], ax);
}
- extremes[d].stem_extent_[ax] = s;
+ extremes[d].stem_extent_[ax] = s;
}
-
+
extremes[d].slur_head_
= Stem::extremal_heads (extremes[d].stem_)[dir];
if (!extremes[d].slur_head_
&& Note_column::has_rests (extremes[d].bound_))
- {
- extremes[d].slur_head_ = Note_column::get_rest (extremes[d].bound_);
- }
+ extremes[d].slur_head_ = Note_column::get_rest (extremes[d].bound_);
if (extremes[d].slur_head_)
extremes[d].slur_head_extent_
{
slur_ = dynamic_cast<Spanner *> (me);
columns_
- = extract_grob_array (me, ly_symbol2scm ("note-columns"));
+ = internal_extract_grob_array (me, ly_symbol2scm ("note-columns"));
if (columns_.is_empty ())
{
dir_ = get_grob_direction (me);
parameters_.fill (me);
- SCM eltlist = me->get_property ("note-columns");
- SCM extra_list = me->get_property ("encompass-objects");
+ extract_grob_set (me, "note-columns", columns);
+ extract_grob_set (me, "encompass-objects", extra_objects);
+
Spanner *sp = dynamic_cast<Spanner *> (me);
for (int i = X_AXIS; i < NO_AXES; i++)
{
Axis a = (Axis)i;
- common_[a] = common_refpoint_of_list (eltlist, me, a);
- common_[a] = common_refpoint_of_list (extra_list, common_[a], a);
+ common_[a] = common_refpoint_of_array (columns, me, a);
+ common_[a] = common_refpoint_of_array (extra_objects, common_[a], a);
Direction d = LEFT;
do
musical_dy_ = 0.0;
}
-void
-set_slur_control_points (Grob *me)
+
+MAKE_SCHEME_CALLBACK(Slur, calc_control_points, 1)
+SCM
+Slur::calc_control_points (SCM smob)
{
+ Spanner *me = unsmob_spanner (smob);
+
Slur_score_state state;
state.fill (me);
if (!state.valid_)
- return;
+ return SCM_EOL;
state.generate_curves ();
Bezier best;
if (is_number_pair (end_ys))
- {
- best = state.configurations_[state.get_closest_index (end_ys)]->curve_;
- }
+ best = state.configurations_[state.get_closest_index (end_ys)]->curve_;
else
- {
- best = state.get_best_curve ();
- }
+ best = state.get_best_curve ();
SCM controls = SCM_EOL;
for (int i = 4; i--;)
me->relative_coordinate (state.common_[Y_AXIS], Y_AXIS));
controls = scm_cons (ly_offset2scm (o), controls);
}
- me->set_property ("control-points", controls);
+
+ return controls;
}
Bezier
#endif
{
for (int i = 0; i < configurations_.size (); i++)
- {
- configurations_[i]->score (*this);
- }
+ configurations_[i]->score (*this);
for (int i = 0; i < configurations_.size (); i++)
{
if (configurations_[i]->score_ < opt)
if (extremes_[d].note_column_)
{
end_ys[d] = dir_
- * max (max (dir_ * (base_attachments_[d][Y_AXIS] + parameters_.region_size_ * dir_),
+ * max (max (dir_ * (base_attachments_[d][Y_AXIS]
+ + parameters_.region_size_ * dir_),
dir_ * (dir_ + extremes_[d].note_column_->extent (common_[Y_AXIS], Y_AXIS)[dir_])),
dir_ * base_attachments_[-d][Y_AXIS]);
}
Direction d = LEFT;
do
{
- b1[d] = s1->get_bound (d)->get_column ()->rank_;
- b2[d] = s2->get_bound (d)->get_column ()->rank_;
+ b1[d] = s1->get_bound (d)->get_column ()->get_rank ();
+ b2[d] = s2->get_bound (d)->get_column ()->get_rank ();
}
while (flip (&d) != LEFT);
{
Real x, y;
if (d == RIGHT)
- {
- x = extremes_[d].bound_->extent (common_[X_AXIS], X_AXIS)[d];
- }
+ x = extremes_[d].bound_->extent (common_[X_AXIS], X_AXIS)[d];
else
- {
- x = slur_->get_broken_left_end_align ();
- }
+ x = slur_->get_broken_left_end_align ();
Grob *col = (d == LEFT) ? columns_[0] : columns_.top ();
if (extremes_[-d].bound_ != col)
}
while (flip (&d) != LEFT);
-
do
{
for (int a = X_AXIS; a < NO_AXES; a++)
programming_error ("slur attachment is inf/nan");
b = 0.0;
}
-
}
}
while (flip (&d) != LEFT);
-
-
+
return base_attachment;
}
Slur_score_state::move_away_from_staffline (Real y,
Grob *on_staff) const
{
- Grob * staff_symbol = Staff_symbol_referencer::get_staff_symbol (on_staff);
+ Grob *staff_symbol = Staff_symbol_referencer::get_staff_symbol (on_staff);
if (!staff_symbol)
return y;
-
+
Real pos
= (y - staff_symbol->relative_coordinate (common_[Y_AXIS],
- Y_AXIS))
+ Y_AXIS))
* 2.0 / staff_space_;
if (fabs (pos - my_round (pos)) < 0.2
return y;
}
-
-
Array<Offset>
Slur_score_state::generate_avoid_offsets () const
{
avoid.push (Offset (inf.x_, y + dir_ * parameters_.free_head_distance_));
}
-
- Link_array<Grob> extra_encompasses
- = extract_grob_array (slur_, ly_symbol2scm ("encompass-objects"));
+
+ extract_grob_set (slur_, "encompass-objects", extra_encompasses);
for (int i = 0; i < extra_encompasses.size (); i++)
if (Slur::has_interface (extra_encompasses[i]))
{
Real r_0 = robust_scm2double (slur_->get_property ("ratio"), 0.33);
Real h_inf = staff_space_ * scm_to_double (slur_->get_property ("height-limit"));
- Array<Offset> avoid = generate_avoid_offsets ();
+ Array<Offset> avoid = generate_avoid_offsets ();
for (int i = 0; i < configurations_.size (); i++)
configurations_[i]->generate_curve (*this, r_0, h_inf, avoid);
}
{
do
{
- if (extremes_[d].slur_head_)
+ if (extremes_[d].slur_head_
+ && !extremes_[d].slur_head_extent_.is_empty ())
{
os[d][X_AXIS] = extremes_[d].slur_head_extent_.center ();
attach_to_stem[d] = false;
Array<Extra_collision_info>
Slur_score_state::get_extra_encompass_infos () const
{
- Link_array<Grob> encompasses
- = extract_grob_array (slur_, ly_symbol2scm ("encompass-objects"));
+ extract_grob_set (slur_, "encompass-objects", encompasses);
Array<Extra_collision_info> collision_infos;
for (int i = encompasses.size (); i--;)
{
if (to_boolean (g->get_property ("cautionary")))
{
SCM cstyle = g->get_property ("cautionary-style");
- parens = ly_c_equal_p (cstyle, ly_symbol2scm ("parentheses"));
+ parens = ly_is_equal (cstyle, ly_symbol2scm ("parentheses"));
}
SCM accs = g->get_property ("accidentals");
projects / lilypond.git / blobdiff