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

diff --git a/lily/slur.cc b/lily/slur.cc
index 88b2c6cc33..0128e8cdfd 100644
--- a/lily/slur.cc
+++ b/lily/slur.cc
@@ -1,176 +1,347 @@
 /*
-  slur.cc -- implement  Slur
+  slur.cc -- implement external interface for Slur
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996, 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c) 1996--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
-/*
-  TODO:
-  
-  think about crossing stems.
-  Begin and end should be treated as a Script.
- */
 #include "slur.hh"
-#include "scalar.hh"
+
+
+#include "beam.hh"
+#include "bezier.hh"
+#include "directional-element-interface.hh"
+#include "font-interface.hh"
+#include "pointer-group-interface.hh"
 #include "lookup.hh"
-#include "paper-def.hh"
+#include "main.hh"		// DEBUG_SLUR_SCORING
 #include "note-column.hh"
+#include "output-def.hh"
+#include "spanner.hh"
+#include "staff-symbol-referencer.hh"
+#include "staff-symbol.hh"
 #include "stem.hh"
-#include "p-col.hh"
-#include "molecule.hh"
-#include "debug.hh"
-#include "boxes.hh"
+#include "text-interface.hh"
+#include "tie.hh"
+#include "warn.hh"
+#include "slur-scoring.hh"
 
-void
-Slur::add (Note_column*n)
-{
-  encompass_arr_.push (n);
-  add_dependency (n);
-}
+#include "script-interface.hh"
 
-void
-Slur::set_default_dir ()
+
+
+MAKE_SCHEME_CALLBACK(Slur, calc_direction, 1)
+SCM
+Slur::calc_direction (SCM smob)
 {
-  dir_ = DOWN;
-  for (int i=0; i < encompass_arr_.size (); i ++) 
+  Grob *me = unsmob_grob (smob);
+  extract_grob_set (me, "note-columns", encompasses);
+
+  if (encompasses.empty ())
     {
-      if (encompass_arr_[i]->dir_ < 0) 
+      me->suicide ();
+      return SCM_BOOL_F;
+    }
+
+  Direction d = DOWN;
+  for (vsize i = 0; i < encompasses.size (); i++)
+    {
+      if (Note_column::dir (encompasses[i]) < 0)
 	{
-	  dir_ = UP;
+	  d = UP;
 	  break;
 	}
     }
+  return scm_from_int (d);
 }
 
-void
-Slur::do_add_processing ()
+MAKE_SCHEME_CALLBACK (Slur, pure_height, 3);
+SCM
+Slur::pure_height (SCM smob, SCM start_scm, SCM end_scm)
 {
-  set_bounds (LEFT, encompass_arr_[0]);    
-  if (encompass_arr_.size () > 1)
-    set_bounds (RIGHT, encompass_arr_.top ());
+  Grob *me = unsmob_grob (smob);
+  int start = scm_to_int (start_scm);
+  int end = scm_to_int (end_scm);
+  Real height = robust_scm2double (me->get_property ("height-limit"), 2.0);
+
+  extract_grob_set (me, "note-columns", encompasses);
+  Interval ret;
+
+  Grob *parent = me->get_parent (Y_AXIS);
+  if (common_refpoint_of_array (encompasses, me, Y_AXIS) != parent)
+    /* this could happen if, for example, we are a cross-staff slur.
+       in this case, we want to be ignored */
+    return ly_interval2scm (Interval ());
+
+  for (vsize i = 0; i < encompasses.size (); i++)
+    {
+      Interval d = encompasses[i]->pure_height (parent, start, end);
+      if (!d.is_empty ())
+	ret.unite (d);
+    }
+
+  ret.widen (height * 0.5);
+  return ly_interval2scm (ret);
 }
 
-void
-Slur::do_pre_processing ()
+MAKE_SCHEME_CALLBACK (Slur, height, 1);
+SCM
+Slur::height (SCM smob)
 {
-  // don't set directions
+  Grob *me = unsmob_grob (smob);
+
+  // FIXME uncached
+  Stencil *m = me->get_stencil ();
+  return m ? ly_interval2scm (m->extent (Y_AXIS))
+    : ly_interval2scm (Interval ());
 }
 
-void
-Slur::do_substitute_dependency (Score_elem*o, Score_elem*n)
+/*
+  Ugh should have dash-length + dash-period
+*/
+MAKE_SCHEME_CALLBACK (Slur, print, 1);
+SCM
+Slur::print (SCM smob)
 {
-  int i;
-  while ((i = encompass_arr_.find_i ((Note_column*)o->item ())) >=0) 
+  Grob *me = unsmob_grob (smob);
+  extract_grob_set (me, "note-columns", encompasses);
+  if (encompasses.empty ())
     {
-      if (n)
-	encompass_arr_[i] = (Note_column*)n->item ();
-      else
-	encompass_arr_.del (i);
+      me->suicide ();
+      return SCM_EOL;
+    }
+
+  Real staff_thick = Staff_symbol_referencer::line_thickness (me);
+  Real base_thick = staff_thick
+    * robust_scm2double (me->get_property ("thickness"), 1);
+  Real line_thick = staff_thick
+    * robust_scm2double (me->get_property ("line-thickness"), 1);
+
+  Bezier one = get_curve (me);
+  Stencil a;
+
+  /*
+    TODO: replace dashed with generic property.
+  */
+  SCM p = me->get_property ("dash-period");
+  SCM f = me->get_property ("dash-fraction");
+  if (scm_is_number (p) && scm_is_number (f))
+    a = Lookup::dashed_slur (one, line_thick, robust_scm2double (p, 1.0),
+			     robust_scm2double (f, 0));
+  else
+    a = Lookup::slur (one,
+		      get_grob_direction (me) * base_thick,
+		      line_thick);
+
+#if DEBUG_SLUR_SCORING
+  SCM quant_score = me->get_property ("quant-score");
+
+  if (to_boolean (me->layout ()
+		  ->lookup_variable (ly_symbol2scm ("debug-slur-scoring")))
+      && scm_is_string (quant_score))
+    {
+      string str;
+      SCM properties = Font_interface::text_font_alist_chain (me);
+
+
+      if (!scm_is_number (me->get_property ("font-size")))
+	properties = scm_cons (scm_acons (ly_symbol2scm ("font-size"), scm_from_int (-6), SCM_EOL),
+			     properties);
+      
+      Stencil tm = *unsmob_stencil (Text_interface::interpret_markup
+				    (me->layout ()->self_scm (), properties,
+				     quant_score));
+      a.add_at_edge (Y_AXIS, get_grob_direction (me), tm, 1.0, 0);
     }
+#endif
+
+  return a.smobbed_copy ();
 }
 
-static int 
-Note_column_compare (Note_column *const&n1 , Note_column* const&n2)
+Bezier
+Slur::get_curve (Grob *me)
 {
-  return Item::left_right_compare (n1, n2);
+  Bezier b;
+  int i = 0;
+  for (SCM s = me->get_property ("control-points"); scm_is_pair (s);
+       s = scm_cdr (s))
+    b.control_[i++] = ly_scm2offset (scm_car (s));
+
+  return b;
 }
 
 void
-Slur::do_post_processing ()
+Slur::add_column (Grob *me, Grob *n)
 {
-  encompass_arr_.sort (Note_column_compare);
-  if (!dir_)
-    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;
+  Pointer_group_interface::add_grob (me, ly_symbol2scm ("note-columns"), n);
+  add_bound_item (dynamic_cast<Spanner *> (me), dynamic_cast<Item *> (n));
+}
+
+void
+Slur::add_extra_encompass (Grob *me, Grob *n)
+{
+  Pointer_group_interface::add_grob (me, ly_symbol2scm ("encompass-objects"), n);
+}
+
+MAKE_SCHEME_CALLBACK_WITH_OPTARGS (Slur, pure_outside_slur_callback, 4, 1);
+SCM
+Slur::pure_outside_slur_callback (SCM grob, SCM start_scm, SCM end_scm, SCM offset_scm)
+{
+  int start = robust_scm2int (start_scm, 0);
+  int end = robust_scm2int (end_scm, 0);
+  Grob *script = unsmob_grob (grob);
+  Grob *slur = unsmob_grob (script->get_object ("slur"));
+  if (!slur)
+    return offset_scm;
+
+  SCM avoid = script->get_property ("avoid-slur");
+  if (avoid != ly_symbol2scm ("outside") && avoid != ly_symbol2scm ("around"))
+    return offset_scm;
+
+  Real offset = robust_scm2double (offset_scm, 0.0);
+  Direction dir = get_grob_direction (script);
+  return scm_from_double (offset + dir * slur->pure_height (slur, start, end).length () / 4);
+}
+
+MAKE_SCHEME_CALLBACK_WITH_OPTARGS (Slur, outside_slur_callback, 2, 1);
+SCM
+Slur::outside_slur_callback (SCM grob, SCM offset_scm)
+{
+  Grob *script = unsmob_grob (grob);
+  Grob *slur = unsmob_grob (script->get_object ("slur")); 
+
+  if (!slur)
+    return offset_scm;
+
+  SCM avoid = script->get_property ("avoid-slur");
+  if (avoid != ly_symbol2scm ("outside")
+      && avoid != ly_symbol2scm ("around"))
+    return offset_scm;
+  
+  Direction dir = get_grob_direction (script);
+  if (dir == CENTER)
+    return offset_scm;
+
+  Grob *cx = script->common_refpoint (slur, X_AXIS);
+  Grob *cy = script->common_refpoint (slur, Y_AXIS);
+
+  Bezier curve = Slur::get_curve (slur);
+
+  curve.translate (Offset (slur->relative_coordinate (cx, X_AXIS),
+			   slur->relative_coordinate (cy, Y_AXIS)));
+
+  Interval yext = robust_relative_extent (script, cy, Y_AXIS);
+  Interval xext = robust_relative_extent (script, cx, X_AXIS);
+
+  Real offset = robust_scm2double (offset_scm, 0);
+  yext.translate (offset);
+  
+  /* FIXME: slur property, script property?  */
+  Real slur_padding = robust_scm2double (script->get_property ("slur-padding"),
+					 0.0);
+  yext.widen (slur_padding);
+
+  Real EPS = 1e-3;
+  Interval bezext (curve.control_[0][X_AXIS], curve.control_[3][X_AXIS]);
+  bool consider[] = { false, false, false };
+  Real ys[] = {0, 0, 0};
+  bool do_shift = false;
   
-  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 
+  for (int d = LEFT, k = 0; d <= RIGHT; d++, k++)
     {
-      if  (extrema[d] != spanned_drul_[d]) 
+      Real x = xext.linear_combination ((Direction) d);
+      consider[k] = bezext.contains (x);
+
+      if (consider[k])
 	{
-	  dx_f_drul_[d] = -d 
-	    *(spanned_drul_[d]->width ().length () -0.5*nw_f);
-	}
-      else if (extrema[d]->stem_l_ && !extrema[d]->stem_l_->transparent_b_) 
-        {
-	  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 
-        {
-	  dy_f_drul_[d] = (int)rint (extrema[d]->head_positions_interval ()[dir_])* inter_f;
+	  ys[k]
+	    = (fabs (bezext[LEFT] - x) < EPS)
+	    ? curve.control_[0][Y_AXIS]
+	    : ((fabs (bezext[RIGHT] - x) < EPS)
+	       ? curve.control_[3][Y_AXIS]
+	       : curve.get_other_coordinate (X_AXIS, x));
+
+	  /* Request shift if slur is contained script's Y, or if
+	     script is inside slur and avoid == outside.  */
+	  if (yext.contains (ys[k])
+	      || (dir * ys[k] > dir * yext[-dir] && avoid == ly_symbol2scm ("outside")))
+	    do_shift = true;
 	}
-      dy_f_drul_[d] += dir_ * interline_f;
     }
-  while ((d *= -1) != LEFT);
+
+  Real avoidance_offset = 0.0;
+  for (int d = LEFT, k = 0; d <= RIGHT; d++, k++)
+    if (consider[k]) 
+      avoidance_offset = dir * (max (dir * avoidance_offset,
+				     dir * (ys[k] - yext[-dir] + dir * slur_padding)));
+  
+  return scm_from_double (offset + avoidance_offset);
 }
 
-Real
-Slur::height_f () const
+/*
+ * Used by Slur_engraver:: and Phrasing_slur_engraver::
+ */
+void
+Slur::auxiliary_acknowledge_extra_object (Grob_info info,
+					  vector<Grob*> &slurs,
+					  vector<Grob*> &end_slurs)
 {
-  /*
-   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++) 
+  if (slurs.empty () && end_slurs.empty ())
+    return;
+  
+  Grob *e = info.grob ();
+  SCM avoid = e->get_property ("avoid-slur");
+  if (Tie::has_interface (e)
+      || avoid == ly_symbol2scm ("inside"))
     {
-      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);
+      for (vsize i = slurs.size (); i--;)
+	add_extra_encompass (slurs[i], e);
+      for (vsize i = end_slurs.size (); i--;)
+	add_extra_encompass (end_slurs[i], e);
+    }
+  else if (avoid == ly_symbol2scm ("outside")
+	   || avoid == ly_symbol2scm ("around"))
+    {
+      Grob *slur;
+      if (end_slurs.size () && !slurs.size ())
+	slur = end_slurs[0];
+      else
+	slur = slurs[0];
+
+      if (slur)
+	{
+	  chain_offset_callback (e, outside_slur_callback_proc, Y_AXIS);
+	  e->set_object ("slur", slur->self_scm ());
+	}
     }
-  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;
+  else
+    e->warning ("Ignoring grob for slur. avoid-slur not set?");
 }
 
-IMPLEMENT_IS_TYPE_B1(Slur,Spanner);
+
+ADD_INTERFACE (Slur, "slur-interface",
+	       
+	       "A slur",
+	       
+	       /* properties */
+	       "avoid-slur " 	/* UGH. */
+	       "control-points "
+	       "dash-fraction "
+	       "dash-period "
+	       "details "
+	       "direction "
+	       "eccentricity "
+	       "encompass-objects "
+	       "height-limit "
+	       "inspect-quants "
+	       "inspect-index "
+	       "line-thickness "
+	       "note-columns "
+	       "positions "
+	       "quant-score "
+	       "ratio "
+	       "thickness "
+	       );
+