release: 1.1.44

[lilypond.git] / lily / bow.cc

diff --git a/lily/bow.cc b/lily/bow.cc
index 2de418ebdf8b2f3672d7e43749a9116befa283c6..046a95ee98812ddf1e971a61e1fd4842c02879de 100644 (file)
--- a/lily/bow.cc
+++ b/lily/bow.cc
@@ -3,55 +3,112 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+      Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "bow.hh"
+#include "debug.hh"
 #include "paper-def.hh"
+#include "molecule.hh"
 #include "lookup.hh"
+#include "bezier.hh"
+#include "main.hh"
 
-Bow::Bow()
+Bow::Bow ()
 {
-    left_pos_i_ = right_pos_i_ = 0;
-    left_dx_f_ = right_dx_f_ = 0.0;
+  dy_f_drul_[LEFT] = dy_f_drul_[RIGHT] = 0.0;
+  dx_f_drul_[LEFT] = dx_f_drul_[RIGHT] = 0.0;
 }
 
+Molecule*
+Bow::do_brew_molecule_p () const
+{
+  Real thick = paper_l ()->get_var ("slur_thickness");
+  Array<Offset> c = get_controls ();
+  Real dy = c[3].y () - c[0].y ();
+  Molecule a;
+
+  SCM d =  get_elt_property (dashed_scm_sym);
+  if (d == SCM_BOOL_F)
+    a = lookup_l ()->slur (c);
+  else
+    a = lookup_l ()->dashed_slur (c, thick, gh_scm2int (SCM_CDR(d)));
+
+  if (check_debug && !monitor->silent_b ("Bow"))
+    {
+      static int i = 1;
+      cout << "******" << i++ << "******" << 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* mol_p = new Molecule;
+  mol_p->add_molecule (a);
+
+  return mol_p;
+}
 
 Offset
-Bow::center() const
+Bow::center () const
 {
-    int dy =  right_pos_i_-left_pos_i_;
+  Real dy = dy_f_drul_[RIGHT] - dy_f_drul_[LEFT];
 
-    Real w = width().length();
+  Real dx =  extent(X_AXIS).length ();
 
-    return Offset(w/2,dy * paper()->internote_f());
+  return Offset (dx / 2, dy);
 }
 
 
-Molecule*
-Bow::brew_molecule_p() const
+
+/*
+   Ugh.  Control points are too crude measures.
+ */
+Interval
+Bow::do_height () const
 {
-    Molecule*output = new Molecule;
-    Real w = width().length();
-    
-    int dy = right_pos_i_ - left_pos_i_;
-    
-    Real nw_f = paper()->note_width();
-    Real nh_f = paper()->internote_f();
-
-    
-    w+= (right_dx_f_ - left_dx_f_) * nw_f ;
-    Real round_w = w;          // slur lookup rounds the slurwidth .
-    
-    Symbol sl = paper()->lookup_l()->slur(dy , round_w, dir_i_);
-
-    Real error = w-round_w;
-    
-    Atom a(sl);
-    a.translate(Offset((left_dx_f_ + 0.5 )*nw_f + error/2,
-                      left_pos_i_ * nh_f));
-    output->add(a);
-    return output;
+  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;
+}
+
+
+Array<Offset>
+Bow::get_controls () const
+{
+  Bezier_bow b (paper_l ());
+  b.set (get_encompass_offset_arr (), 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;
+}
+
+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() += extent (X_AXIS). length ();
+
+  Array<Offset> notes;
+  notes.push (Offset (0, 0));
+  notes.push (d);
+
+  return notes;
 }
 
-IMPLEMENT_STATIC_NAME(Bow);