if (!n->head_l_arr_.size ())
warning (_ ("Putting slur over rest."));
encompass_arr_.push (n);
- n->stem_l_->slur_l_ = this;
+ // n->stem_l_->slur_l_ = this;
add_dependency (n);
}
-void
-Slur::set_default_dir ()
+Direction
+Slur::get_default_dir () const
{
- dir_ = DOWN;
+ Direction d = DOWN;
for (int i=0; i < encompass_arr_.size (); i ++)
{
- if (encompass_arr_[i]->dir_ < 0)
+ if (encompass_arr_[i]->dir () < 0)
{
- dir_ = UP;
+ d = UP;
break;
}
}
+ return d;
}
void
}
void
-Slur::do_substitute_dependency (Score_element*o, Score_element*n)
+Slur::do_substitute_element_pointer (Score_element*o, Score_element*n)
{
int i;
while ((i = encompass_arr_.find_i (dynamic_cast<Note_column *> (o))) >=0)
return Item::left_right_compare (n1, n2);
}
-static bool
-broken_edge_b (Slur*s, Drul_array<Note_column*>& extrema, Direction dir)
+bool
+Slur::broken_edge_b ( Direction dir) const
+{
+ return extrema ()[dir] != spanned_drul_[dir];
+}
+
+bool
+Slur::normal_edge_b ( Direction dir) const
{
- return extrema[dir] != s->spanned_drul_[dir];
+ Note_column *n = extrema ()[dir];
+ return !broken_edge_b ( dir)
+ && n->stem_l_
+ && n->stem_l_->get_elt_property (transparent_scm_sym) == SCM_BOOL_F
+ && n->head_l_arr_.size ();
}
-static bool
-normal_edge_b (Slur*s, Drul_array<Note_column*>& extrema, Direction dir)
+Drul_array<Note_column*>
+Slur::extrema ()const
{
- return !broken_edge_b (s, extrema, dir)
- && extrema[dir]->stem_l_
- && !extrema[dir]->stem_l_->transparent_b_
- && extrema[dir]->head_l_arr_.size ();
+ Drul_array<Note_column*> extrema;
+ extrema[LEFT] = encompass_arr_[0];
+ extrema[RIGHT] = encompass_arr_.top ();
+ return extrema;
}
+/*
+ TODO.
+
+ Unhair this.
+ */
void
Slur::do_post_processing ()
{
encompass_arr_.sort (Note_column_compare);
if (!dir_)
- set_default_dir ();
+ dir_ = get_default_dir ();
- Real interline_f = paper ()->interline_f ();
+ Real interline_f = paper_l ()->get_realvar (interline_scm_sym);
Real internote_f = interline_f / 2;
// URG
- Real notewidth_f = paper ()->note_width () * 0.8;
+ Real notewidth_f = paper_l ()->note_width () * 0.8;
/*
[OSU]: slur and tie placement
--> height <= 5 length ?? we use <= 3 length, now...
*/
- Real gap_f = paper ()->get_var ("slur_x_gap");
+ Real gap_f = paper_l ()->get_var ("slur_x_gap");
- Drul_array<Note_column*> extrema;
- extrema[LEFT] = encompass_arr_[0];
- extrema[RIGHT] = encompass_arr_.top ();
Direction d=LEFT;
do
{
- if (broken_edge_b (this, extrema, d))
+ if (broken_edge_b (d))
{
// ugh -- check if needed
dx_f_drul_[d] = -d
if (d == RIGHT)
{
dx_f_drul_[LEFT] = spanned_drul_[LEFT]->extent (X_AXIS).length ();
-
+
// urg -- check if needed
if (encompass_arr_.size () > 1)
dx_f_drul_[RIGHT] += notewidth_f;
/*
normal slur
*/
- else if (normal_edge_b (this, extrema, d))
+ else if (normal_edge_b (d))
{
- Real notewidth_f = extrema[d]->extent (X_AXIS).length ();
- dy_f_drul_[d] = (int)rint (extrema[d]->stem_l_-> extent (Y_AXIS)[dir_]);
+ Real notewidth_f = extrema ()[d]->extent (X_AXIS).length ();
+ dy_f_drul_[d] = (int)rint (extrema ()[d]->stem_l_-> extent (Y_AXIS)[dir_]);
dx_f_drul_[d] += 0.5 * notewidth_f - d * gap_f;
- if (dir_ == extrema[d]->stem_l_->dir_)
+ if (dir_ == extrema ()[d]->stem_l_->dir_)
{
if (dir_ == d)
- dx_f_drul_[d] += 0.5 * (dir_ * d) * d * notewidth_f;
+ dx_f_drul_[d] += 0.5 * dir_ * notewidth_f;
else
- dx_f_drul_[d] += 0.25 * (dir_ * d) * d * notewidth_f;
+ dx_f_drul_[d] += 0.25 * dir_ * notewidth_f;
}
}
else
{
- Real notewidth_f = extrema[d]->extent (X_AXIS).length ();
- dy_f_drul_[d] = (int)rint (extrema[d]->head_positions_interval ()
+ Real notewidth_f = extrema ()[d]->extent (X_AXIS).length ();
+ dy_f_drul_[d] = (int)rint (extrema ()[d]->head_positions_interval ()
[dir_]) * internote_f;
dx_f_drul_[d] += 0.5 * notewidth_f - d * gap_f;
}
dy_f_drul_[d] += dir_ * interline_f;
- if (extrema[d]->stem_l_ && (dir_ == extrema[d]->stem_l_->dir_))
+ if (extrema ()[d]->stem_l_ && (dir_ == extrema ()[d]->stem_l_->dir_))
dy_f_drul_[d] -= dir_ * internote_f;
}
while (flip(&d) != LEFT);
// now that both are set, do dependent
do
{
- if (broken_edge_b (this, extrema, d))
+ if (broken_edge_b (d))
{
Direction u = d;
flip(&u);
/*
Slur should follow line of music
*/
- if (normal_edge_b (this, extrema, LEFT)
- && normal_edge_b (this, extrema, RIGHT)
- && (extrema[LEFT]->stem_l_ != extrema[RIGHT]->stem_l_))
+ if (normal_edge_b (LEFT)
+ && normal_edge_b (RIGHT)
+ && (extrema ()[LEFT]->stem_l_ != extrema ()[RIGHT]->stem_l_))
{
- Real note_dy = extrema[RIGHT]->stem_l_->head_positions ()[dir_]
- - extrema[LEFT]->stem_l_->head_positions ()[dir_];
+ Real note_dy = extrema ()[RIGHT]->stem_l_->head_positions ()[dir_]
+ - extrema ()[LEFT]->stem_l_->head_positions ()[dir_];
Real dy = dy_f_drul_[RIGHT] - dy_f_drul_[LEFT];
/*
Should we always follow note-heads, (like a tie)?
*/
if (sign (dy) != sign (note_dy))
{
- Real damp_f = paper ()->get_var ("slur_slope_follow_music_factor");
+ Real damp_f = paper_l ()->get_var ("slur_slope_follow_music_factor");
Real realdy = note_dy * damp_f;
Direction adjust_dir = (Direction)(- dir_ * sign (realdy));
if (!adjust_dir)
/*
adjust only if no beam gets in the way
*/
- if (!extrema[adjust_dir]->stem_l_->beam_l_
- || (adjust_dir == extrema[adjust_dir]->stem_l_->dir_)
- || (extrema[adjust_dir]->stem_l_->beams_i_drul_[-adjust_dir] < 1))
+ if (!extrema ()[adjust_dir]->stem_l_->beam_l_
+ || (adjust_dir == extrema ()[adjust_dir]->stem_l_->dir_)
+ || (extrema ()[adjust_dir]->stem_l_->beams_i_drul_[-adjust_dir] < 1))
{
dy_f_drul_[adjust_dir] = dy_f_drul_[-adjust_dir]
+ 2 * adjust_dir * realdy;
Real dx = notewidth_f / 2;
- if (adjust_dir != extrema[adjust_dir]->stem_l_->dir_)
+ if (adjust_dir != extrema ()[adjust_dir]->stem_l_->dir_)
dx /= 2;
dx_f_drul_[adjust_dir] -= adjust_dir * dx;
}
/*
Avoid too steep slurs.
*/
- Real damp_f = paper ()->get_var ("slur_slope_damping");
+ Real damp_f = paper_l ()->get_var ("slur_slope_damping");
Offset d_off = Offset (dx_f_drul_[RIGHT] - dx_f_drul_[LEFT],
dy_f_drul_[RIGHT] - dy_f_drul_[LEFT]);
d_off[X_AXIS] += extent (X_AXIS).length ();
Array<Offset>
Slur::get_encompass_offset_arr () const
{
- Real notewidth = paper ()->note_width () * 0.8;
- Real gap = paper ()->get_var ("slur_x_gap");
- Real internote = paper ()->internote_f ();
+ Real notewidth = paper_l ()->note_width () * 0.8;
+ Real gap = paper_l ()->get_var ("slur_x_gap");
+
+ /*
+ urg. Calcs done wrt the leftmost note. Fixme.
+
+ Calcs ignore possibility of pre/postbreak.
+
+
+ */
Offset left = Offset (dx_f_drul_[LEFT], dy_f_drul_[LEFT]);
left[X_AXIS] += encompass_arr_[0]->stem_l_->hpos_f ();
+ Real internote = encompass_arr_[0]->stem_l_->staff_line_leading_f ()/2.0;
+
/*
<URG>
i don't understand these two, but *must* for symmetry
int last = encompass_arr_.size () - 1;
// prebreak
- if (encompass_arr_.top () != spanned_drul_[RIGHT])
+ if (broken_edge_b (RIGHT))
last++;
// postbreak
- if (encompass_arr_[0] != spanned_drul_[LEFT])
+ if (broken_edge_b (LEFT))
first--;
Array<Offset> notes;
notes.push (Offset (0,0));
- for (int i = first; i < last; i++)
- {
- Encompass_info info (encompass_arr_[i], dir_);
- notes.push (info.o_ - left);
- }
- Encompass_info info (encompass_arr_.top (), dir_);
- // [encompass_arr_.size () - 1]
-
- // urg:
- Slur* urg = (Slur*)this;
- urg->interstaff_f_ = info.interstaff_f_;
-
- d[Y_AXIS] += interstaff_f_;
-
- // prebreak
- if (interstaff_f_ && (encompass_arr_.top () != spanned_drul_[RIGHT]))
+ Real dy =0.0;
+ for (int i = 0; i < last; i++)
{
- Encompass_info info (encompass_arr_[encompass_arr_.size () - 1], dir_);
- d[Y_AXIS] -= info.o_[Y_AXIS] - interstaff_f_;
+ Encompass_info info (encompass_arr_[i], dir_, this);
+ if (i >= first)
+ notes.push (info.o_ - left);
+ else
+ dy = info.interstaff_f_;
}
+ notes[0][Y_AXIS] += dy;
notes.push (d);
-
+
return notes;
}
Array<Rod> a;
Rod r;
r.item_l_drul_ = spanned_drul_;
- r.distance_f_ = paper ()->get_var ("slur_x_minimum");
+ r.distance_f_ = paper_l ()->get_var ("slur_x_minimum");
a.push (r);
return a;
projects / lilypond.git / blobdiff