* broken slur should have uniform trend
*/
+#include "directional-element-interface.hh"
+#include "group-interface.hh"
#include "slur.hh"
-#include "scalar.hh"
#include "lookup.hh"
#include "paper-def.hh"
#include "note-column.hh"
#include "debug.hh"
#include "box.hh"
#include "bezier.hh"
-#include "encompass-info.hh"
#include "main.hh"
-
+#include "cross-staff.hh"
+#include "group-interface.hh"
Slur::Slur ()
{
+ set_elt_property ("note-columns", SCM_EOL);
}
void
Slur::add_column (Note_column*n)
{
- if (!n->head_l_arr_.size ())
- warning (_ ("Putting slur over rest. Ignoring"));
+ if (!gh_pair_p (n->get_elt_property ("note-heads")))
+ warning (_ ("Putting slur over rest. Ignoring."));
else
{
- encompass_arr_.push (n);
+ Group_interface gi (this, "note-columns");
+ gi.add_element (n);
add_dependency (n);
}
}
Direction
Slur::get_default_dir () const
{
+ Link_array<Note_column> encompass_arr =
+ Group_interface__extract_elements (this, (Note_column*)0, "note-columns");
+
Direction d = DOWN;
- for (int i=0; i < encompass_arr_.size (); i ++)
+ for (int i=0; i < encompass_arr.size (); i ++)
{
- if (encompass_arr_[i]->dir () < 0)
+ if (encompass_arr[i]->dir () < 0)
{
d = UP;
break;
void
Slur::do_add_processing ()
{
- set_bounds (LEFT, encompass_arr_[0]);
- if (encompass_arr_.size () > 1)
- set_bounds (RIGHT, encompass_arr_.top ());
+ Link_array<Note_column> encompass_arr =
+ Group_interface__extract_elements (this, (Note_column*)0, "note-columns");
+ set_bounds (LEFT, encompass_arr[0]);
+ if (encompass_arr.size () > 1)
+ set_bounds (RIGHT, encompass_arr.top ());
}
void
// don't set directions
}
-void
-Slur::do_substitute_element_pointer (Score_element*o, Score_element*n)
+
+Offset
+Slur::encompass_offset (Note_column const* col) const
{
- int i;
- while ((i = encompass_arr_.find_i (dynamic_cast<Note_column *> (o))) >=0)
+ Offset o;
+ Stem* stem_l = col->stem_l ();
+ Direction dir = directional_element (this).get ();
+
+ if (!stem_l)
{
- if (n)
- encompass_arr_[i] = dynamic_cast<Note_column *> (n);
- else
- encompass_arr_.del (i);
+ warning (_ ("Slur over rest?"));
+ o[X_AXIS] = col->hpos_f ();
+ o[Y_AXIS] = col->extent (Y_AXIS)[dir];
+ return o;
}
-}
+ Direction stem_dir = directional_element (stem_l).get ();
+ o[X_AXIS] = stem_l->hpos_f ();
-static int
-Note_column_compare (Note_column *const&n1 , Note_column* const&n2)
-{
- return Item::left_right_compare (n1, n2);
+ /*
+ Simply set x to middle of notehead
+ */
+
+ o[X_AXIS] -= 0.5 * stem_dir * col->extent (X_AXIS).length ();
+
+ if ((stem_dir == dir)
+ && !stem_l->extent (Y_AXIS).empty_b ())
+ {
+ o[Y_AXIS] = stem_l->extent (Y_AXIS)[dir];
+ }
+ else
+ {
+ o[Y_AXIS] = col->extent (Y_AXIS)[dir];
+ }
+
+ /*
+ leave a gap: slur mustn't touch head/stem
+ */
+ o[Y_AXIS] += dir * paper_l ()->get_var ("slur_y_free");
+ o[Y_AXIS] -= calc_interstaff_dist (stem_l, this);
+ return o;
}
+/*
+ ARGRARGRARGRARGAR!
+
+ Fixme
+ */
void
Slur::do_post_processing ()
{
- encompass_arr_.sort (Note_column_compare);
- if (!dir_)
- dir_ = get_default_dir ();
+ Link_array<Note_column> encompass_arr =
+ Group_interface__extract_elements (this, (Note_column*)0, "note-columns");
+
+ if (!encompass_arr.size ())
+ {
+ set_elt_property ("transparent", SCM_BOOL_T);
+ set_empty (X_AXIS);
+ set_empty (Y_AXIS);
+ return;
+ }
+
+ if (!directional_element (this).get ())
+ directional_element (this).set (get_default_dir ());
/*
Slur and tie placement [OSU]
y = length >= 5ss : y next interline - d * 0.25 ss
*/
- Real interline_f = paper_l ()->get_realvar (interline_scm_sym);
- Real internote_f = interline_f / 2;
+ Real staff_space = paper_l ()->get_var ("interline");
+ Real half_staff_space = staff_space / 2;
Real x_gap_f = paper_l ()->get_var ("slur_x_gap");
Real y_gap_f = paper_l ()->get_var ("slur_y_gap");
Drul_array<Note_column*> note_column_drul;
- note_column_drul[LEFT] = encompass_arr_[0];
- note_column_drul[RIGHT] = encompass_arr_.top ();
+ note_column_drul[LEFT] = encompass_arr[0];
+ note_column_drul[RIGHT] = encompass_arr.top ();
bool fix_broken_b = false;
+
+ Direction my_dir = directional_element (this).get ();
+
Direction d = LEFT;
do
{
- dx_f_drul_[d] = dy_f_drul_[d] = 0;
+ dx_f_drul_[d] = 0;
+ dy_f_drul_[d] = 0;
+
if ((note_column_drul[d] == spanned_drul_[d])
- && note_column_drul[d]->head_l_arr_.size ()
- && (note_column_drul[d]->stem_l_))
+ && note_column_drul[d]->first_head ()
+ && (note_column_drul[d]->stem_l ()))
{
- Stem* stem_l = note_column_drul[d]->stem_l_;
+ Stem* stem_l = note_column_drul[d]->stem_l ();
/*
side directly attached to note head;
no beam getting in the way
*/
if ((stem_l->extent (Y_AXIS).empty_b ()
- || !((stem_l->dir_ == dir_) && (dir_ != d)))
- && !((dir_ == stem_l->dir_)
- && stem_l->beam_l_ && (stem_l->beams_i_drul_[-d] >= 1)))
+ || !((stem_l->get_direction () == my_dir) && (my_dir != d)))
+ && !((my_dir == stem_l->get_direction ())
+ && stem_l->beam_l () && (stem_l->beam_count (-d) >= 1)))
{
dx_f_drul_[d] = spanned_drul_[d]->extent (X_AXIS).length () / 2;
dx_f_drul_[d] -= d * x_gap_f;
- if (stem_l->dir_ != dir_)
+ if (stem_l->get_direction () != my_dir)
{
- dy_f_drul_[d] = note_column_drul[d]->extent (Y_AXIS)[dir_];
+ dy_f_drul_[d] = note_column_drul[d]->extent (Y_AXIS)[my_dir];
}
else
{
dy_f_drul_[d] = stem_l->chord_start_f ()
- + dir_ * internote_f;
+ + my_dir * half_staff_space;
}
- dy_f_drul_[d] += dir_ * y_gap_f;
+ dy_f_drul_[d] += my_dir * y_gap_f;
}
/*
side attached to (visible) stem
else
{
dx_f_drul_[d] = stem_l->hpos_f ()
- - spanned_drul_[d]->absolute_coordinate (X_AXIS);
+ - spanned_drul_[d]->relative_coordinate (0, X_AXIS);
/*
side attached to beamed stem
*/
- if (stem_l->beam_l_ && (stem_l->beams_i_drul_[-d] >= 1))
+ if (stem_l->beam_l () && (stem_l->beam_count (-d) >= 1))
{
- dy_f_drul_[d] = stem_l->extent (Y_AXIS)[dir_];
- dy_f_drul_[d] += dir_ * 2 * y_gap_f;
+ dy_f_drul_[d] = stem_l->extent (Y_AXIS)[my_dir];
+ dy_f_drul_[d] += my_dir * 2 * y_gap_f;
}
/*
side attached to notehead, with stem getting in the way
dx_f_drul_[d] -= d * x_gap_f;
dy_f_drul_[d] = stem_l->chord_start_f ()
- + dir_ * internote_f;
- dy_f_drul_[d] += dir_ * y_gap_f;
+ + my_dir * half_staff_space;
+ dy_f_drul_[d] += my_dir * y_gap_f;
}
}
}
*/
else
{
- dx_f_drul_[d] -= d * x_gap_f;
+ dx_f_drul_[d] = get_broken_left_end_align ();
+
/*
broken: should get y from other piece, so that slur
continues up/down trend
}
while (flip (&d) != LEFT);
- int interstaff_i = 0;
- for (int i = 0; i < encompass_arr_.size (); i++)
+ int cross_count = cross_staff_count ();
+ bool interstaff_b = (0 < cross_count) && (cross_count < encompass_arr.size ());
+
+ Drul_array<Offset> info_drul;
+ Drul_array<Real> interstaff_interval;
+
+ do
{
- Encompass_info info (encompass_arr_[i], dir_, this);
- if (info.interstaff_f_)
- {
- interstaff_i++;
- }
+ info_drul[d] = encompass_offset (encompass_arr.boundary (d, 0));
+ interstaff_interval[d] = - calc_interstaff_dist (encompass_arr.boundary (d,0),
+ this);
}
- bool interstaff_b = interstaff_i && (interstaff_i < encompass_arr_.size ());
-
- Drul_array<Encompass_info> info_drul;
- info_drul[LEFT] = Encompass_info (encompass_arr_[0], dir_, this);
- info_drul[RIGHT] = Encompass_info (encompass_arr_.top (), dir_, this);
- Real interstaff_f = info_drul[RIGHT].interstaff_f_
- - info_drul[LEFT].interstaff_f_;
+ while (flip (&d) != LEFT);
+
+ Real interstaff_f = interstaff_interval[RIGHT] - interstaff_interval[LEFT];
if (fix_broken_b)
{
- Direction d = (encompass_arr_.top () != spanned_drul_[RIGHT]) ?
+ Direction d = (encompass_arr.top () != spanned_drul_[RIGHT]) ?
RIGHT : LEFT;
- dy_f_drul_[d] = info_drul[d].o_[Y_AXIS];
+ dy_f_drul_[d] = info_drul[d][Y_AXIS];
if (!interstaff_b)
{
- dy_f_drul_[d] -= info_drul[d].interstaff_f_;
-
- if (interstaff_i)
+ dy_f_drul_[d] -= interstaff_interval[d];
+ if (cross_count) // interstaff_i ?
{
- dy_f_drul_[LEFT] += info_drul[d].interstaff_f_;
- dy_f_drul_[RIGHT] += info_drul[d].interstaff_f_;
+ dy_f_drul_[LEFT] += interstaff_interval[d];
+ dy_f_drul_[RIGHT] += interstaff_interval[d];
}
}
}
Now we've got a fine slur
Catch and correct some ugly cases
*/
+ String infix = interstaff_b ? "interstaff_" : "";
+ Real height_damp_f = paper_l ()->get_var ("slur_"+infix +"height_damping");
+ Real slope_damp_f = paper_l ()->get_var ("slur_"+infix +"slope_damping");
+ Real snap_f = paper_l ()->get_var ("slur_"+infix +"snap_to_stem");
+ Real snap_max_dy_f = paper_l ()->get_var ("slur_"+infix +"snap_max_slope_change");
- Real height_damp_f;
- Real slope_damp_f;
- Real snap_f;
-
- if (!interstaff_b)
- {
- height_damp_f = paper_l ()->get_var ("slur_height_damping");
- slope_damp_f = paper_l ()->get_var ("slur_slope_damping");
- snap_f = paper_l ()->get_var ("slur_snap_to_stem");
- }
- else
- {
- height_damp_f = paper_l ()->get_var ("slur_interstaff_height_damping");
- slope_damp_f = paper_l ()->get_var ("slur_interstaff_slope_damping");
- snap_f = paper_l ()->get_var ("slur_interstaff_snap_to_stem");
- }
-
- Real ratio_f;
if (!fix_broken_b)
dy_f_drul_[RIGHT] += interstaff_f;
+
Real dy_f = dy_f_drul_[RIGHT] - dy_f_drul_[LEFT];
- Real dx_f = do_width ().length () + dx_f_drul_[RIGHT] - dx_f_drul_[LEFT];
+ if (!fix_broken_b)
+ dy_f -= interstaff_f;
+ Real dx_f = spanner_length ()+ dx_f_drul_[RIGHT] - dx_f_drul_[LEFT];
/*
Avoid too steep slurs.
*/
- ratio_f = abs (dy_f / dx_f);
- if (ratio_f > slope_damp_f)
+ Real slope_ratio_f = abs (dy_f / dx_f);
+ if (slope_ratio_f > slope_damp_f)
{
- Direction d = (Direction)(- dir_ * (sign (dy_f)));
+ Direction d = (Direction)(- my_dir * (sign (dy_f)));
if (!d)
d = LEFT;
- Real damp_f = (ratio_f - slope_damp_f) * dx_f;
+ Real damp_f = (slope_ratio_f - slope_damp_f) * dx_f;
/*
must never change sign of dy
*/
damp_f = damp_f <? abs (dy_f);
- dy_f_drul_[d] += dir_ * damp_f;
+ dy_f_drul_[d] += my_dir * damp_f;
}
/*
*/
for (int i = 0; i < 3; i++)
{
- Real height_f = do_height ().length ();
+ Real height_f = curve_extent (Y_AXIS).length ();
+ Real width_f = curve_extent (X_AXIS).length ();
+
dy_f = dy_f_drul_[RIGHT] - dy_f_drul_[LEFT];
+ if (!fix_broken_b)
+ dy_f -= interstaff_f;
- ratio_f = abs (height_f / dx_f);
- if (ratio_f > height_damp_f)
+ Real height_ratio_f = abs (height_f / width_f);
+ if (height_ratio_f > height_damp_f)
{
- Direction d = (Direction)(- dir_ * (sign (dy_f)));
+ Direction d = (Direction)(- my_dir * (sign (dy_f)));
if (!d)
d = LEFT;
/* take third step */
- Real damp_f = (ratio_f - height_damp_f) * dx_f / 3;
+ Real damp_f = (height_ratio_f - height_damp_f) * width_f / 3;
/*
if y positions at about the same height, correct both ends
*/
if (abs (dy_f / dx_f ) < slope_damp_f)
{
- dy_f_drul_[-d] += dir_ * damp_f;
- dy_f_drul_[d] += dir_ * damp_f;
+ dy_f_drul_[-d] += my_dir * damp_f;
+ dy_f_drul_[d] += my_dir * damp_f;
}
/*
don't change slope too much, would have been catched by slope damping
else
{
damp_f = damp_f <? abs (dy_f/2);
- dy_f_drul_[d] += dir_ * damp_f;
+ dy_f_drul_[d] += my_dir * damp_f;
}
}
}
/*
If, after correcting, we're close to stem-end...
*/
+ Drul_array<Real> snapy_f_drul;
+ snapy_f_drul[LEFT] = snapy_f_drul[RIGHT] = 0;
+ Drul_array<Real> snapx_f_drul;
+ snapx_f_drul[LEFT] = snapx_f_drul[RIGHT] = 0;
+ Drul_array<bool> snapped_b_drul;
+ snapped_b_drul[LEFT] = snapped_b_drul[RIGHT] = false;
do
{
- if ((note_column_drul[d] == spanned_drul_[d])
- && (note_column_drul[d]->stem_l_)
- && (note_column_drul[d]->stem_l_->dir_ == dir_)
- && (abs (note_column_drul[d]->stem_l_->extent (Y_AXIS)[dir_]
- - dy_f_drul_[d] + (d == LEFT ? 0 : interstaff_f))
- <= snap_f))
+ Note_column * nc = note_column_drul[d];
+ if (nc == spanned_drul_[d]
+ && nc->stem_l ()
+ && nc->stem_l ()->get_direction () == my_dir
+ && abs (nc->stem_l ()->extent (Y_AXIS)[my_dir]
+ - dy_f_drul_[d] + (d == LEFT ? 0 : interstaff_f))
+ <= snap_f)
{
/*
- attach to stem-end
+ prepare to attach to stem-end
*/
- Stem* stem_l = note_column_drul[d]->stem_l_;
- dx_f_drul_[d] = stem_l->hpos_f ()
- - spanned_drul_[d]->absolute_coordinate (X_AXIS);
- dy_f_drul_[d] = stem_l->extent (Y_AXIS)[dir_];
- dy_f_drul_[d] += info_drul[d].interstaff_f_;
- dy_f_drul_[d] += dir_ * 2 * y_gap_f;
+ snapx_f_drul[d] = nc->stem_l ()->hpos_f ()
+ - spanned_drul_[d]->relative_coordinate (0, X_AXIS);
+
+ snapy_f_drul[d] = nc->stem_l ()->extent (Y_AXIS)[my_dir]
+ + interstaff_interval[d]
+ + my_dir * 2 * y_gap_f;
+
+ snapped_b_drul[d] = true;
}
}
while (flip (&d) != LEFT);
+
+ /*
+ only use snapped positions if sign (dy) will not change
+ and dy doesn't change too much
+ */
+ if (!fix_broken_b)
+ dy_f += interstaff_f;
+
+
+ /*
+ (sigh)
+
+ More refactoring could be done.
+ */
+ Real maxsnap = abs (dy_f * snap_max_dy_f);
+ if (snapped_b_drul[LEFT] && snapped_b_drul[RIGHT]
+ && ((sign (snapy_f_drul[RIGHT] - snapy_f_drul[LEFT]) == sign (dy_f)))
+ && (!dy_f || (abs (snapy_f_drul[RIGHT] - snapy_f_drul[LEFT] - dy_f)
+ < maxsnap)))
+ {
+ dy_f_drul_ = snapy_f_drul;
+ dx_f_drul_ = snapx_f_drul;
+ }
+ else
+ do
+ {
+ Direction od = (Direction)-d;
+ if (snapped_b_drul[d]
+ && d * sign (snapy_f_drul[d] - dy_f_drul_[od]) == sign (dy_f)
+ && (!dy_f || (abs (snapy_f_drul[d] - dy_f_drul_[od] - d * dy_f)
+ < maxsnap)))
+ {
+ dy_f_drul_[d] = snapy_f_drul[d];
+ dx_f_drul_[d] = snapx_f_drul[d];
+ }
+ }
+ while (flip (&d) != LEFT);
+}
+
+
+int
+Slur::cross_staff_count ()const
+{
+ Link_array<Note_column> encompass_arr =
+ Group_interface__extract_elements (this, (Note_column*)0, "note-columns");
+
+ int k=0;
+
+ for (int i = 0; i < encompass_arr.size (); i++)
+ {
+ if (calc_interstaff_dist (encompass_arr[i], this))
+ k++;
+ }
+ return k;
}
+
Array<Offset>
Slur::get_encompass_offset_arr () const
{
+ Link_array<Note_column> encompass_arr =
+ Group_interface__extract_elements (this, (Note_column*)0, "note-columns");
+
Array<Offset> offset_arr;
#if 0
/*
offset_arr.push (Offset (0, dy_f_drul_[RIGHT]));
return offset_arr;
#endif
-
- int interstaff_i = 0;
- for (int i = 0; i < encompass_arr_.size (); i++)
- {
- Encompass_info info (encompass_arr_[i], dir_, this);
- if (info.interstaff_f_)
- {
- interstaff_i++;
- }
- }
- bool interstaff_b = interstaff_i && (interstaff_i < encompass_arr_.size ());
- Offset origin (absolute_coordinate (X_AXIS), 0);
+ Offset origin (relative_coordinate (0, X_AXIS), 0);
int first = 1;
- int last = encompass_arr_.size () - 2;
+ int last = encompass_arr.size () - 2;
offset_arr.push (Offset (dx_f_drul_[LEFT], dy_f_drul_[LEFT]));
+
/*
left is broken edge
*/
- if (encompass_arr_[0] != spanned_drul_[LEFT])
+
+ int cross_count = cross_staff_count ();
+ bool cross_b = cross_count && cross_count < encompass_arr.size ();
+ if (encompass_arr[0] != spanned_drul_[LEFT])
{
first--;
- Encompass_info left_info (encompass_arr_[0], dir_, this);
- if (interstaff_b)
- offset_arr[0][Y_AXIS] += left_info.interstaff_f_;
+ Real is = calc_interstaff_dist (encompass_arr[0], this);
+ if (cross_b)
+ offset_arr[0][Y_AXIS] += is;
}
/*
right is broken edge
*/
- if (encompass_arr_.top () != spanned_drul_[RIGHT])
+ if (encompass_arr.top () != spanned_drul_[RIGHT])
{
last++;
}
for (int i = first; i <= last; i++)
{
- Encompass_info info (encompass_arr_[i], dir_, this);
- offset_arr.push (info.o_ - origin);
+ Offset o (encompass_offset (encompass_arr[i]));
+ offset_arr.push (o - origin);
}
- offset_arr.push (Offset (do_width ().length () + dx_f_drul_[RIGHT],
+ offset_arr.push (Offset (spanner_length ()+ dx_f_drul_[RIGHT],
dy_f_drul_[RIGHT]));
return offset_arr;
return a;
}
+
projects / lilypond.git / blobdiff