source file of the GNU LilyPond music typesetter
- (c) 1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>
- Jan Nieuwenhuizen <jan@digicash.com>
+ (c) 1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ Jan Nieuwenhuizen <janneke@gnu.org>
*/
#include "bow.hh"
#include "bezier.hh"
#include "main.hh"
-IMPLEMENT_IS_TYPE_B1(Bow,Directional_spanner);
-
Bow::Bow ()
{
dy_f_drul_[LEFT] = dy_f_drul_[RIGHT] = 0.0;
dx_f_drul_[LEFT] = dx_f_drul_[RIGHT] = 0.0;
- dash_i_ = 0;
}
Molecule*
-Bow::brew_molecule_p () const
+Bow::do_brew_molecule_p () const
{
- Real thick = paper ()->get_var ("slur_thickness");
+ Real thick = paper_l ()->get_var ("slur_thickness");
Array<Offset> c = get_controls ();
- Real dy = c[3].y () - c[0].y ();
- Atom a;
-
- if (!dash_i_)
- a = paper ()->lookup_l ()->slur (c);
- else
- a = paper ()->lookup_l ()->dashed_slur (c, thick, dash_i_);
- if (check_debug && !monitor->silent_b ("Bow"))
- {
- static int i = 1;
- cout << "******" << i++ << "******" << endl;
- // gcc 2.7.2: ices
-// cout << "c0.y: " << c[0].y << endl;
- cout << "c0.y: " << c[0].y () << endl;
- cout << "c3.y: " << c[3].y () << endl;
- cout << "dy: " << dy << endl;
- cout << "dy_f_l: " << dy_f_drul_[LEFT] << endl;
- cout << "dy_f_r: " << dy_f_drul_[RIGHT] << endl;
- cout << "dy_f: " << dy_f_drul_[RIGHT] - dy_f_drul_[LEFT] << endl;
- }
- a.translate (Offset (dx_f_drul_[LEFT], dy_f_drul_[LEFT]));
+ Molecule a;
- Molecule* mol_p = new Molecule;
- mol_p->add (a);
+ SCM d = get_elt_property (dashed_scm_sym);
+ if (d == SCM_BOOL_F)
+ a = lookup_l ()->slur (c, thick);
+ else
+ a = lookup_l ()->dashed_slur (c, thick, gh_scm2int (SCM_CDR(d)));
- return mol_p;
+ return new Molecule (a);
}
Offset
Bow::center () const
{
Real dy = dy_f_drul_[RIGHT] - dy_f_drul_[LEFT];
-
- Real dx = width ().length ();
+ Real dx = extent(X_AXIS).length ();
return Offset (dx / 2, dy);
}
+/*
+ Ugh. Control points are too crude measures.
+ */
Interval
-Bow::do_width () const
+Bow::do_height () const
{
- Interval i = Spanner::do_width ();
- Real dx = i.length();
- return Interval (0, dx);
+ Interval iv;
+ Array<Offset> c (get_controls());
+ for (int i=0; i < c.size (); i++)
+ {
+ Real y = c[i][Y_AXIS];
+ iv.unite (Interval (y,y));
+ }
+ return iv;
+}
+
+Drul_array<Interval>
+Bow::curve_extent_drul () const
+{
+ Bezier_bow b (paper_l ());
+ b.set (get_encompass_offset_arr (), dir_);
+ b.calc ();
+ return b.curve_extent_drul_;
}
Array<Offset>
Bow::get_controls () const
{
- Bezier_bow b (paper ());
+ Bezier_bow b (paper_l ());
b.set (get_encompass_offset_arr (), dir_);
b.calc ();
Array<Offset> controls;
Array<Offset>
Bow::get_encompass_offset_arr () const
{
- Offset d (dx_f_drul_[RIGHT] - dx_f_drul_[LEFT],
- dy_f_drul_[RIGHT] - dy_f_drul_[LEFT]);
- d.x() += width (). length ();
-
-#define RESIZE_ICE
-#ifndef RESIZE_ICE
- Array<Offset> notes;
- notes.push (Offset 0, 0));
- notes.push (d);
-#else
- Array<Offset> notes (2);
- notes[0] = Offset (0, 0);
- notes[1] = Offset (d);
-#endif
-
- return notes;
+ Array<Offset> offset_arr;
+ offset_arr.push (Offset (dx_f_drul_[LEFT], dy_f_drul_[LEFT]));
+ offset_arr.push (Offset (do_width ().length () + dx_f_drul_[RIGHT],
+ dy_f_drul_[RIGHT]));
+
+ return offset_arr;
}