#include "debug.hh"
#include "boxes.hh"
#include "bezier.hh"
+#include "main.hh"
+
+IMPLEMENT_IS_TYPE_B1(Slur,Spanner);
void
Slur::add (Note_column*n)
do
{
- if (extrema[d] != spanned_drul_[d])
+ if (extrema[d] != spanned_drul_[d])
{
dx_f_drul_[d] = -d
*(spanned_drul_[d]->width ().length () -0.5*nw_f);
{
dy_f_drul_[d] = (int)rint (extrema[d]->stem_l_->height ()[dir_]);
/* normal slur from notehead centre to notehead centre, minus gap */
- dx_f_drul_[d] += -d * gap_f;
+ // ugh: diff between old and new slurs
+ if (!experimental_features_global_b)
+ dx_f_drul_[d] += -d * gap_f;
+ else
+ dx_f_drul_[d] += 0.5 * nw_f - d * gap_f;
}
else
{
while (flip(&d) != LEFT);
}
-static Real
-pos_correct (Real x, Real dx, Real dy)
+Real
+Slur::height_f () const
{
+ Bezier_bow bow (paper ());
+ Array<Offset> notes = get_notes ();
+ bow.set (notes, dir_);
+
+ Real height = 0;
+ Real dy1 = bow.calc_f (height);
+ if (!dy1)
+ return height;
+
+ height = dy1;
+ bow.set (notes, dir_);
+ Real dy2 = bow.calc_f (height);
+ if (!dy2)
+ return height;
+
+ if (abs (dy2 - dy1) < paper ()->rule_thickness ())
+ return height;
+
/*
- guess how much we can safely increase 'h'
- parameter of bow without taking too large
- or too many steps.
- empiric computer science
+ Assume
+ dy = B (h)
+ with
+ B (h) = a * h + b;
+
+ Then we get for height = h{dy=0}
*/
-// return (1.0 + 2.0 * x / dx) / 4.0;
- return 1.0;
+ Real a = (dy2 - dy1) / dy1;
+ Real b = dy1;
+ height = -b / a;
+
+ if (check_debug && !monitor->silent_b ("Slur"))
+ {
+ cout << "************" << endl;
+ cout << "dy1: " << dy1 << endl;
+ cout << "dy2: " << dy2 << endl;
+ cout << "a: " << a << endl;
+ cout << "b: " << b << endl;
+ cout << "h: " << height << endl;
+ }
+
+ return height;
}
-Real
-Slur::height_f () const
+Molecule*
+Slur::brew_molecule_p () const
+{
+ if (!experimental_features_global_b)
+ return Bow::brew_molecule_p ();
+
+ Molecule* mol_p = new Molecule;
+
+ Real dy_f = dy_f_drul_[RIGHT] - dy_f_drul_[LEFT];
+
+ Real dx_f = width ().length ();
+ dx_f += (dx_f_drul_[RIGHT] - dx_f_drul_[LEFT]);
+
+ Atom a = paper ()->lookup_l ()->control_slur (get_controls (), dx_f, dy_f);
+
+ Real interline_f = paper ()->interline_f ();
+ Real gap_f = interline_f / 2; // 5;
+ Real nw_f = paper ()->note_width ();
+ a.translate (Offset (dx_f + 0.5 * nw_f + gap_f, dy_f + dy_f_drul_[LEFT]));
+ mol_p->add (a);
+ return mol_p;
+}
+
+Array<Offset>
+Slur::get_notes () const
{
Real interline = paper ()->interline_f ();
Real notewidth = paper ()->note_width ();
Real internote = interline / 2;
- /*
- having the correct (i.e. exactly the same as the ps stuff)
- x,y coordinates is essential.
- getting them is quite a mess, currently.
- */
-
- Stem* left_stem =encompass_arr_[0]->stem_l_;
+ Stem* left_stem = encompass_arr_[0]->stem_l_;
Real left_x = left_stem->hpos_f ();
// ugh, do bow corrections (see brew_mol)
left_x += dx_f_drul_[LEFT] + 0.5 * notewidth;
-// Real left_y = left_stem->dir_ == dir_ ? left_stem->stem_end_f () + dir_
-// : left_stem->stem_begin_f () + 0.5 * dir_;
-// left_y *= internote;
- // ugh, do bow corrections (see brew_mol)
-// left_y = dy_f_drul_[LEFT];
-
// ugh, do bow corrections (see brew_mol)
Real left_y = dy_f_drul_[LEFT];
-
// ugh, where does this asymmetry come from?
if (dir_ == DOWN)
left_y -= dir_ * internote;
- Real dx = width ().length ();
- Real dy = (dy_f_drul_[RIGHT] - dy_f_drul_[LEFT]);
- Real centre_x = dx / 2;
-
-
- // ugh, need staffheight for bow damping
- Bezier_bow b (paper ());
-
- if (check_debug && !monitor->silent_b ("Slur"))
+ /*
+ urg, corrections for broken slurs: extra begin or end position
+ */
+ int first = 0;
+ int n = encompass_arr_.size ();
+ if (encompass_arr_[0] != spanned_drul_[LEFT])
{
- cout << "*****************" << endl;
- cout << "dir: " << (int)dir_ << endl;
- cout << "dx: " << dx << endl;
- cout << "dy: " << dy << endl;
- cout << "centre: " << centre_x << endl;
- for (int i = 0; i < encompass_arr_.size (); i++)
- cout << "i: " << i << " x: "
- << encompass_arr_[i]->stem_l_->hpos_f () - left_x << endl;
+ n += 1;
+ first = 1;
+ left_x = spanned_drul_[LEFT]->width ().length ();
+ left_y = 0;
}
- Real height = 0;
- Real dh = 0;
- do
- {
- height += dh;
- dh = 0;
- b.calc (dx, dy, height, dir_);
-
- if (check_debug && !monitor->silent_b ("Slur"))
- cout << "----" << endl;
- for (int i = 1; i < encompass_arr_.size () - 1; 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 () - left_x + notewidth / 2;
- if (stem->dir_ != dir_)
- x += notewidth / 2;
- else if (stem->dir_ == UP)
- x += notewidth;
- Real y = stem->dir_ == dir_ ? stem->stem_end_f ()
- : stem->stem_begin_f () + 1.5 * dir_;
-
- /*
- leave a gap: slur mustn't touch head/stem
- */
- y += 2.5 * dir_;
- y *= internote;
- y -= left_y;
-
- Real shift = dir_ * (y - b.y (x));
+ if (encompass_arr_.top () != spanned_drul_[RIGHT])
+ n += 1;
- if (check_debug && !monitor->silent_b ("Slur"))
- {
- cout << "x: " << x << " (" << abs (centre_x - x) << ")" << endl;
- cout << "y: " << y << ", curve: " << b.y (x) << endl;
- cout << "shift: " << shift << endl;
- }
+ Array<Offset> notes;
+ notes.set_size (n);
- if (shift > 0.1 * internote)
- dh = dh >? shift * pos_correct (abs (centre_x - x), dx, dy);
- }
- } while (dh);
+ Real dx = width ().length ();
+ dx += (dx_f_drul_[RIGHT] - dx_f_drul_[LEFT]);
+ dx = dx <? 1000;
+ dx = dx >? 2 * interline;
+
+ Real dy = (dy_f_drul_[RIGHT] - dy_f_drul_[LEFT]);
+ if (abs (dy) > 1000)
+ dy = sign (dy) * 1000;
+
+ notes[0].x () = 0;
+ notes[0].y () = 0;
+ notes[n - 1].x () = dx;
+ notes[n - 1].y () = dy;
+ for (int i = 1; i < n - 1; i++)
+ {
+ Stem* stem = encompass_arr_[i - first]->stem_l_;
+ /*
+ set x to middle of notehead or on exact x position of stem,
+ according to slur direction
+ */
+ Real x = stem->hpos_f () - left_x + notewidth / 2;
+ if (stem->dir_ != dir_)
+ x += notewidth / 2;
+ else if (stem->dir_ == UP)
+ x += notewidth;
+ Real y = stem->dir_ == dir_ ? stem->stem_end_f ()
+ : stem->stem_begin_f () + 2.5 * dir_;
+
+ /*
+ leave a gap: slur mustn't touch head/stem
+ */
+ y += 2.5 * dir_;
+ y *= internote;
+ y -= left_y;
+
+ notes[i].x () = x;
+ notes[i].y () = y;
+ }
+ return notes;
+}
- return height;
+Array<Offset>
+Slur::get_controls () const
+{
+ Bezier_bow b (paper ());
+ b.set (get_notes (), dir_);
+ b.calc ();
+ Array<Offset> controls;
+ controls.set_size (8);
+ for (int i = 0; i < 4; i++)
+ controls[i] = b.control_[i];
+ for (int i = 0; i < 4; i++)
+ controls[i + 4] = b.return_[i];
+ return controls;
}
-IMPLEMENT_IS_TYPE_B1(Slur,Spanner);
projects / lilypond.git / blobdiff