source file of the GNU LilyPond music typesetter
- (c) 1996, 1997 Han-Wen Nienhuys <hanwen@stack.nl>
- Jan Nieuwenhuizen <jan@digicash.com>
+ (c) 1996, 1997--1998, 1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ Jan Nieuwenhuizen <janneke@gnu.org>
*/
/*
[TODO]
+ * URG: share code with tie
* begin and end should be treated as a Script.
* damping
* slur from notehead to stemend: c''()b''
#include "p-col.hh"
#include "molecule.hh"
#include "debug.hh"
-#include "boxes.hh"
+#include "box.hh"
#include "bezier.hh"
+#include "encompass-info.hh"
+#include "main.hh"
+
-//IMPLEMENT_IS_TYPE_B1(Slur,Spanner);
-IMPLEMENT_IS_TYPE_B1(Slur,Bow);
Slur::Slur ()
{
}
void
-Slur::add (Note_column*n)
+Slur::add_column (Note_column*n)
{
+ if (!n->head_l_arr_.size ())
+ warning (_ ("Putting slur over rest."));
encompass_arr_.push (n);
add_dependency (n);
}
}
void
-Slur::do_substitute_dependency (Score_elem*o, Score_elem*n)
+Slur::do_substitute_dependency (Score_element*o, Score_element*n)
{
int i;
- while ((i = encompass_arr_.find_i ((Note_column*)o->item ())) >=0)
+ while ((i = encompass_arr_.find_i (dynamic_cast<Note_column *> (o))) >=0)
{
if (n)
- encompass_arr_[i] = (Note_column*)n->item ();
+ encompass_arr_[i] = dynamic_cast<Note_column *> (n);
else
encompass_arr_.del (i);
}
encompass_arr_.sort (Note_column_compare);
if (!dir_)
set_default_dir ();
+
Real interline_f = paper ()->interline_f ();
- Real inter_f = interline_f / 2;
+ Real internote_f = interline_f / 2;
+ // URG
+ Real notewidth_f = paper ()->note_width () * 0.8;
+ Real slur_min = paper ()->get_var ("slur_x_minimum");
/*
[OSU]: slur and tie placement
* y = length < 5ss : horizontal raakpunt + d * 0.25 ss
y = length >= 5ss : y next interline - d * 0.25 ss
--> height <= 5 length ?? we use <= 3 length, now...
-
- * suggested gap = ss / 5;
*/
- // jcn: 1/5 seems so small?
- Real gap_f = interline_f / 2; // 5;
+ Real gap_f = paper ()->get_var ("slur_x_gap");
+
Drul_array<Note_column*> extrema;
extrema[LEFT] = encompass_arr_[0];
extrema[RIGHT] = encompass_arr_.top ();
Direction d=LEFT;
- Real nw_f = paper ()->note_width ();
do
{
+ /*
+ broken slur
+ */
if (extrema[d] != spanned_drul_[d])
{
+ // ugh -- check if needed
dx_f_drul_[d] = -d
- *(spanned_drul_[d]->width ().length () -0.5*nw_f);
- Direction u = d;
- flip(&u);
- if ((extrema[u] == spanned_drul_[u]) && extrema[u]->stem_l_)
+ *(spanned_drul_[d]->extent (X_AXIS).length () - 0.5 * notewidth_f);
+
+ // prebreak
+ if (d == RIGHT)
{
- dy_f_drul_[d] = extrema[u]->stem_l_->height ()[dir_];
- dy_f_drul_[u] = extrema[u]->stem_l_->height ()[dir_];
+ 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;
}
}
- else if (extrema[d]->stem_l_ && !extrema[d]->stem_l_->transparent_b_)
+ /*
+ normal slur
+ */
+ else if (extrema[d]->stem_l_ && !extrema[d]->stem_l_->transparent_b_
+ && extrema[d]->head_l_arr_.size ())
{
- dy_f_drul_[d] = (int)rint (extrema[d]->stem_l_->height ()[dir_]);
- dx_f_drul_[d] += 0.5 * nw_f - d * gap_f;
+ 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_ == d)
- dx_f_drul_[d] += 0.5 * (dir_ * d) * d * nw_f;
+ dx_f_drul_[d] += 0.5 * (dir_ * d) * d * notewidth_f;
else
- dx_f_drul_[d] += 0.25 * (dir_ * d) * d * nw_f;
+ dx_f_drul_[d] += 0.25 * (dir_ * d) * d * notewidth_f;
}
}
- else
+ else
+ {
+ 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_))
+ dy_f_drul_[d] -= dir_ * internote_f;
+ }
+ while (flip(&d) != LEFT);
+
+ // now that both are set, do dependent
+ do
+ {
+ /*
+ broken slur
+ */
+ if (extrema[d] != spanned_drul_[d])
{
- dy_f_drul_[d] = (int)rint (extrema[d]->head_positions_interval ()
- [dir_])* inter_f;
+ Direction u = d;
+ flip(&u);
+
+ // postbreak
+ if (d == LEFT)
+ dy_f_drul_[u] += dir_ * internote_f;
+
+ dy_f_drul_[d] = dy_f_drul_[(Direction)-d];
+
+ // pre and post
+ if (dx_f_drul_[RIGHT] - dx_f_drul_[LEFT] < slur_min)
+ {
+ dx_f_drul_[d] -= d * slur_min
+ - (dx_f_drul_[RIGHT] - dx_f_drul_[LEFT]);
+ dx_f_drul_[d] = dx_f_drul_[(Direction)-d] + d * slur_min;
+ }
}
- dy_f_drul_[d] += dir_ * interline_f;
- }
+ }
while (flip(&d) != LEFT);
+
+ /*
+ Avoid too steep slurs.
+ * slur from notehead to stemend: c''()b''
+ */
+ Real damp_f = paper ()->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 () += extent (X_AXIS).length ();
+
+ Real ratio_f = abs (d_off.y () / d_off.x ());
+ if (ratio_f > damp_f)
+ dy_f_drul_[(Direction)(- dir_ * sign (d_off.y ()))] -=
+ dir_ * (damp_f - ratio_f) * d_off.x ();
}
Array<Offset>
Slur::get_encompass_offset_arr () const
{
- Real interline = paper ()->interline_f ();
- Real notewidth = paper ()->note_width ();
- Real internote = interline / 2;
+ Real notewidth = paper ()->note_width () * 0.8;
+ Real gap = paper ()->get_var ("slur_x_gap");
+ Real internote = paper ()->internote_f ();
- Stem* left_stem = encompass_arr_[0]->stem_l_;
- Real left_x = left_stem->hpos_f ();
- left_x += dx_f_drul_[LEFT];
+ Offset left = Offset (dx_f_drul_[LEFT], dy_f_drul_[LEFT]);
+ left.x () += encompass_arr_[0]->stem_l_->hpos_f ();
- Real left_y = dy_f_drul_[LEFT];
+ /*
+ <URG>
+ i don't understand these two, but *must* for symmetry
+ look at encompass array:
+ lilypond -D input/test/slur-symmetry*.ly
+ lilypond -D input/test/sleur.ly
+
+ do_post_processing should have calculated these into
+ dx_f_drul_[], no??
+
+ */
- Real dx = width ().length ();
- dx += (dx_f_drul_[RIGHT] - dx_f_drul_[LEFT]);
- dx = dx <? 1000;
- dx = dx >? 2 * interline;
+ if (dir_ != encompass_arr_[0]->stem_l_->dir_)
+ left.x () += - 0.5 * notewidth * encompass_arr_[0]->stem_l_->dir_
+ + gap;
+ else if (encompass_arr_[0]->stem_l_->dir_ == UP)
+ left.x () -= notewidth;
- Real dy = (dy_f_drul_[RIGHT] - dy_f_drul_[LEFT]);
- if (abs (dy) > 1000)
- dy = sign (dy) * 1000;
+ if ((dir_ == encompass_arr_[0]->stem_l_->dir_)
+ && (encompass_arr_[0]->stem_l_->dir_ == DOWN))
+ left.y () -= internote * encompass_arr_[0]->stem_l_->dir_;
+ /* </URG> */
+
+ Offset d = Offset (dx_f_drul_[RIGHT] - dx_f_drul_[LEFT],
+ dy_f_drul_[RIGHT] - dy_f_drul_[LEFT]);
+ d.x () += extent (X_AXIS).length ();
int first = 1;
int last = encompass_arr_.size () - 1;
+
+ // prebreak
if (encompass_arr_[0] != spanned_drul_[LEFT])
- {
- first = 0;
- left_x = spanned_drul_[LEFT]->width ().length ();
- left_x -= 2 * notewidth;
- left_y = encompass_arr_[last]->stem_l_->height ()[dir_];
- dy = 0;
- }
+ first--;
+
+ // postbreak
if (encompass_arr_.top () != spanned_drul_[RIGHT])
- {
- last += 1;
- dy = 0;
- }
+ last++;
-#define RESIZE_ICE
-#ifndef RESIZE_ICE
Array<Offset> notes;
notes.push (Offset (0,0));
-#else
- int n = last - first + 2;
- Array<Offset> notes (n);
- notes[0] = Offset (0,0);
-#endif
+
for (int i = first; i < last; i++)
{
- Stem* stem = encompass_arr_[i]->stem_l_;
- /*
- set x to middle of notehead or on exact x position of stem,
- according to slur direction
- */
- Real x = stem->hpos_f ();
-
- if (stem->dir_ != dir_)
- x += 0.5 * notewidth;
- else if (stem->dir_ == UP)
- x += 1.0 * notewidth;
-
- x -= left_x;
-
- Real y = stem->height ()[dir_];
-
- /*
- leave a gap: slur mustn't touch head/stem
- */
- y += 2.5 * internote * dir_;
-
- if (dir_ == DOWN)
- y += 1.5 * internote * dir_;
-
- y -= left_y;
-
-#ifndef RESIZE_ICE
- notes.push (Offset (x, y));
- }
- notes.push (Offset (dx, dy));
-#else
- notes[i - first + 1] = Offset (x, y);
+ Encompass_info info (encompass_arr_[i], dir_);
+ notes.push (info.o_ - left);
}
- notes[n - 1] = Offset (dx, dy);
-#endif
+ notes.push (d);
return notes;
}
projects / lilypond.git / blobdiff