X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fslur.cc;h=88b2c6cc3378661071b2dd6b018bdaac21e8e447;hb=283141cb7571b32a55a560265898920e03506b31;hp=aadb9d44b9f393fe25944df636ad854be537e7bd;hpb=2181534bd94587fcac8f1769f2dda7bece693649;p=lilypond.git

diff --git a/lily/slur.cc b/lily/slur.cc
index aadb9d44b9..88b2c6cc33 100644
--- a/lily/slur.cc
+++ b/lily/slur.cc
@@ -23,8 +23,6 @@
 #include "debug.hh"
 #include "boxes.hh"
 
-
-
 void
 Slur::add (Note_column*n)
 {
@@ -33,76 +31,146 @@ Slur::add (Note_column*n)
 }
 
 void
-Slur::set_default_dir()
+Slur::set_default_dir ()
 {
   dir_ = 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) 
 	{
-	  dir_ =UP;
+	  dir_ = UP;
 	  break;
 	}
     }
 }
 
 void
-Slur::do_pre_processing()
+Slur::do_add_processing ()
 {
-  set_bounds(LEFT, encompass_arr_[0]);    
-  set_bounds(RIGHT, encompass_arr_.top());
+  set_bounds (LEFT, encompass_arr_[0]);    
+  if (encompass_arr_.size () > 1)
+    set_bounds (RIGHT, encompass_arr_.top ());
 }
 
+void
+Slur::do_pre_processing ()
+{
+  // don't set directions
+}
 
 void
 Slur::do_substitute_dependency (Score_elem*o, Score_elem*n)
 {
   int i;
-  while ((i = encompass_arr_.find_i ((Note_column*)o->item())) >=0) 
+  while ((i = encompass_arr_.find_i ((Note_column*)o->item ())) >=0) 
     {
       if (n)
-	encompass_arr_[i] = (Note_column*)n->item();
+	encompass_arr_[i] = (Note_column*)n->item ();
       else
 	encompass_arr_.del (i);
     }
 }
 
-
 static int 
 Note_column_compare (Note_column *const&n1 , Note_column* const&n2)
 {
-  return Item::left_right_compare(n1, n2);
+  return Item::left_right_compare (n1, n2);
 }
 
 void
-Slur::do_post_processing()
+Slur::do_post_processing ()
 {
   encompass_arr_.sort (Note_column_compare);
   if (!dir_)
-    set_default_dir();
-  Real inter_f = paper()->internote_f ();
+    set_default_dir ();
+  Real interline_f = paper ()->interline_f ();
+  Real inter_f = interline_f / 2;
+
+  /* 
+   [OSU]: slur and tie placement
+
+   slurs:
+   * x = centre of head (upside-down: inner raakpunt stem) - d * gap
+
+   * 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;
   
   Drul_array<Note_column*> extrema;
   extrema[LEFT] = encompass_arr_[0];
-  extrema[RIGHT] = encompass_arr_.top();
+  extrema[RIGHT] = encompass_arr_.top ();
 
   Direction d=LEFT;
-  Real nw_f = paper()->note_width ();
+  Real nw_f = paper ()->note_width ();
  
   do 
     {
       if  (extrema[d] != spanned_drul_[d]) 
 	{
 	  dx_f_drul_[d] = -d 
-	    *(spanned_drul_[d]->width ().length ()/nw_f -0.5);
+	    *(spanned_drul_[d]->width ().length () -0.5*nw_f);
 	}
       else if (extrema[d]->stem_l_ && !extrema[d]->stem_l_->transparent_b_) 
-	pos_i_drul_[d] = (int)rint (extrema[d]->stem_l_->height()[dir_]/inter_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;
+	}
       else 
-	pos_i_drul_[d] = (int)rint (extrema[d]->head_positions_interval()[dir_]);
-      pos_i_drul_[d] += dir_;
+        {
+	  dy_f_drul_[d] = (int)rint (extrema[d]->head_positions_interval ()[dir_])* inter_f;
+	}
+      dy_f_drul_[d] += dir_ * interline_f;
     }
   while ((d *= -1) != LEFT);
 }
 
+Real
+Slur::height_f () const
+{
+  /*
+   rather braindead way that of adjusting slur height 
+   for heads/stems that extend beyond default slur
+   works quite good
+   */
+
+  Real interline_f = paper ()->interline_f ();
+  Real nh_f = interline_f / 2;
+  Real h = 0;
+  Real dx = width ().length ();
+  Real dy = dy_f_drul_[RIGHT] - dy_f_drul_[LEFT];
+  Stem* stem = encompass_arr_[0]->stem_l_;
+  Real lx = stem->hpos_f ();
+  Real centre = (width ().min () + width ().max ()) / 2;
+  Real ly = stem->dir_ == dir_ ? stem->stem_end_f () : stem->stem_begin_f () 
+    + dir_ * nh_f / 2;
+  for (int i = 0; i < encompass_arr_.size (); i++) 
+    {
+      Stem* stem = encompass_arr_[i]->stem_l_;
+      Real sx = abs (centre - stem->hpos_f ());
+      Real sy = stem->dir_ == dir_ ? stem->stem_end_f () 
+        : stem->stem_begin_f () + dir_ * nh_f / 2;
+      sy = dir_ * (sy - (ly + ((stem->hpos_f () - lx) / dx) * dy));
+      /*
+        uhm, correct for guess bezier curve (more if further from centre)
+        forget the cos alpha...
+       */
+      if (sy > 0)
+	h = h >? sy * (1 + 2 * sx / dx);
+    }
+  Real ratio = 1.0/3; // duh
+  /* 
+    correct h for slur ratio
+   */
+  Real staffheight = paper ()->get_var ("barsize");
+  if (h)
+    h *= ((h * interline_f) / dx ) / ratio;
+  return h;
+}
+
 IMPLEMENT_IS_TYPE_B1(Slur,Spanner);