X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftie.cc;h=73041c6a837f6fdb7482f14b02a7c65f57ae9a08;hb=e3fa24f095381f36fdc5fa17494ec16b5cd18fe8;hp=2c418b13c7dad37d9b6f0526d15be359601ed780;hpb=df7d31f879f9b39c2b89390b6e1b1b23d4987e74;p=lilypond.git

diff --git a/lily/tie.cc b/lily/tie.cc
index 2c418b13c7..73041c6a83 100644
--- a/lily/tie.cc
+++ b/lily/tie.cc
@@ -3,169 +3,310 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-#include "paper-def.hh"
 #include "tie.hh"
-#include "note-head.hh"
-#include "p-col.hh"
-#include "debug.hh"
 
+#include "main.hh"
+#include "bezier.hh"
+#include "directional-element-interface.hh"
+#include "font-interface.hh"
+#include "grob-array.hh"
+#include "lookup.hh"
+#include "note-head.hh"
+#include "output-def.hh"
+#include "paper-column.hh"
+#include "rhythmic-head.hh"
+#include "spanner.hh"
+#include "staff-symbol-referencer.hh"
+#include "stem.hh"
+#include "text-interface.hh"
+#include "tie-column.hh"
+#include "tie-configuration.hh"
+#include "tie-formatting-problem.hh"
+#include "warn.hh"
+#include "semi-tie-column.hh"
 
 
-void
-Tie::set_head (Direction d, Note_head * head_l)
+bool
+Tie::less (Grob *const &s1,
+	   Grob *const &s2)
 {
-  assert (!head_l_drul_[d]);
-  head_l_drul_[d] = head_l;
-  set_bounds (d, head_l);
-
-  add_dependency (head_l);
+  return Tie::get_position (s1) < Tie::get_position (s2);
 }
 
-Tie::Tie()
+void
+Tie::set_head (Grob *me, Direction d, Grob *h)
 {
-  head_l_drul_[RIGHT] =0;
-  head_l_drul_[LEFT] =0;
-  same_pitch_b_ =false;
+  dynamic_cast<Spanner *> (me)->set_bound (d, h);
 }
 
-
-/*
-  ugh: direction of the Tie is more complicated.  See [Ross] p136 and further
- */
-void
-Tie::set_default_dir()
+Grob *
+Tie::head (Grob *me, Direction d)
 {
-  int m= (head_l_drul_[LEFT]->position_i_ 
-	  + head_l_drul_[RIGHT]->position_i_) /2;
-  dir_ =  (m < 0)? DOWN : UP;
+  if (is_direction (me->get_property ("head-direction")))
+     {
+       Direction hd = to_dir (me->get_property ("head-direction"));
+ 
+       return (hd == d)
+	 ? unsmob_grob (me->get_object ("note-head"))
+	 : 0;
+     }
+  
+  Item *it = dynamic_cast<Spanner*> (me)->get_bound (d);
+  if (Note_head::has_interface (it))
+    return it;
+  else
+    return 0;
 }
 
-void
-Tie::do_add_processing()
+int
+Tie::get_column_rank (Grob *me, Direction d)
 {
-  if (!(head_l_drul_[LEFT] && head_l_drul_[RIGHT]))
-    warning (_ ("lonely tie"));
+  Spanner *span = dynamic_cast<Spanner *> (me);
+  Grob *h = head (me, d);
+  if (!h)
+    h = span->get_bound (d);
 
-  Direction d = LEFT;
-  Drul_array<Note_head *> new_head_drul = head_l_drul_;
-  do {
-    if (!head_l_drul_[d])
-      new_head_drul[d] = head_l_drul_[(Direction)-d];
-  } while (flip(&d) != LEFT);
-  head_l_drul_ = new_head_drul;
+  Grob *col = dynamic_cast<Item *> (h)->get_column ();
+  return Paper_column::get_rank (col);
 }
 
-void
-Tie::do_post_processing()
+int
+Tie::get_position (Grob *me)
 {
-  // URG: share code with slur!
-  assert (head_l_drul_[LEFT] || head_l_drul_[RIGHT]);
+  Direction d = LEFT;
+  do
+    {
+      Grob *h = head (me, d);
+      if (h)
+	return (int) rint (Staff_symbol_referencer::get_position (h));
+    }
+  while (flip (&d) != LEFT);
 
-  // URG
-  Real notewidth = paper ()->note_width () * 0.8;
-  Real interline_f = paper ()->interline_f ();
+  /*
 
-  /* 
-   [OSU]: slur and tie placement
+  TODO: this is theoretically possible for ties across more than 2
+  systems.. We should look at the first broken copy.
+  
+  */
+  programming_error ("Tie without heads. Suicide");
+  me->suicide ();
+  return 0;
+}
 
-   ties:
-   * x = inner raakpunt - d * gap
+/*
+  Default:  Put the tie oppositie of the stem [Wanske p231]
 
-   * y = length < 5ss : horizontal raakpunt
-     y = length >= 5ss : y next interline - d * 0.25 ss
-     --> height <= 5 length ?? we use <= 3 length, now...
-   */
+  In case of chords: Tie_column takes over
 
-  Real gap_f = paper ()->get_var ("slur_x_gap");
+  The direction of the Tie is more complicated (See [Ross] p136 and
+  further).
 
+  (what about linebreaks? )
+*/
+Direction
+Tie::get_default_dir (Grob *me)
+{
+  Drul_array<Grob*> stems;
   Direction d = LEFT;
   do
     {
-      dy_f_drul_[d] = .5 * interline_f * (head_l_drul_[d] 
-		       ? head_l_drul_[d]->position_i_
-		       : head_l_drul_[(Direction)-d]->position_i_);
-    }
-  while (flip(&d) != LEFT);
+      Grob *stem = head (me, d) ? Rhythmic_head::get_stem (head (me, d)) : 0;
+      if (stem)
+	stem = Stem::is_invisible (stem) ? 0 : stem;
 
-  do
+      stems[d] = stem;
+    }
+  while (flip (&d)!= LEFT);
+  
+  if (stems[LEFT] && stems[RIGHT])
+    {
+      if (get_grob_direction (stems[LEFT]) == UP
+	  && get_grob_direction (stems[RIGHT]) == UP)
+	return DOWN;
+    }
+  else if (stems[LEFT] || stems[RIGHT])
     {
-      // tie attached to outer notehead
-      if (head_l_drul_[d] && head_l_drul_[d]->extremal_i_)
-	{
-	  if (d == LEFT)
-	    dx_f_drul_[d] += notewidth;
-	  dx_f_drul_[d] += -d * gap_f;
-	  /* attach to outer 3/4 end of head */
-	  dy_f_drul_[d] += dir_ * 0.25 * interline_f;
-	}
-      // tie attached to inner notehead
-      else if (head_l_drul_[d] && d == LEFT)
-	{
-	  dx_f_drul_[d] += -d * notewidth;
-	}
-      // uhm? loose end of tie // tie attached to stem
-      else
-	{
-	  dx_f_drul_[d] = -d * (spanned_drul_[d]->extent (X_AXIS).length () 
-			        -0.5 * notewidth);
-	}
+      Grob *s = stems[LEFT] ? stems[LEFT] : stems[RIGHT];
+      return -get_grob_direction (s);
     }
-  while (flip(&d) != LEFT);
+  else if (int p = get_position (me))
+    return Direction (sign (p));
+  
+  return UP;
+}
 
-  // now that both are set, do dependent
-  do
+
+MAKE_SCHEME_CALLBACK(Tie, calc_direction, 1);
+SCM
+Tie::calc_direction (SCM smob)
+{
+  Grob *me = unsmob_grob (smob);
+  Grob *yparent = me->get_parent (Y_AXIS);
+  if ((Tie_column::has_interface (yparent)
+       || Semi_tie_column::has_interface (yparent)) 
+      && unsmob_grob_array (yparent->get_object ("ties"))
+      && unsmob_grob_array (yparent->get_object ("ties"))->size () > 1)
     {
-      // tie attached to outer notehead
-      if (!head_l_drul_[d])
-	{
-	  dy_f_drul_[d] = dy_f_drul_[(Direction) -d];
-	}
+      /* trigger positioning. */
+      (void) yparent->get_property ("positioning-done");
     }
-  while (flip(&d) != LEFT);
+  else
+    set_grob_direction (me, Tie::get_default_dir (me));
 
-  /*
-    Avoid too steep ties
-      * slur from notehead to stemend: c''()b''
-   */
-  Real damp_f = paper ()->get_var ("tie_slope_damping");
-  Offset d_off = Offset (dx_f_drul_[RIGHT] - dx_f_drul_[LEFT],
-    dy_f_drul_[RIGHT] - dy_f_drul_[LEFT]);
-  d_off.x () += extent (X_AXIS).length ();
-
-  Real ratio_f = abs (d_off.y () / d_off.x ());
-  if (ratio_f > damp_f)
-    dy_f_drul_[(Direction)(- dir_ * sign (d_off.y ()))] -=
-      dir_ * (damp_f - ratio_f) * d_off.x ();
+  return SCM_UNSPECIFIED;
 }
 
+
 void
-Tie::do_substitute_dependency (Score_element*o, Score_element*n)
+Tie::set_default_control_points (Grob *me_grob)
 {
-  Note_head *new_l =n?dynamic_cast<Note_head *> (n):0;
-  if (dynamic_cast <Item *> (o) == head_l_drul_[LEFT])
-    head_l_drul_[LEFT] = new_l;
-  else if (dynamic_cast <Item *> (o) == head_l_drul_[RIGHT])
-    head_l_drul_[RIGHT] = new_l;
+  Spanner *me = dynamic_cast<Spanner*> (me_grob);
+  Grob *common  = me;
+  common = me->get_bound (LEFT)->common_refpoint (common, X_AXIS); 
+  common = me->get_bound (RIGHT)->common_refpoint (common, X_AXIS); 
+  
+  Tie_formatting_problem problem;
+  problem.from_tie (me);
+  Tie_specification spec = problem.get_tie_specification (0);
+  spec.has_manual_dir_ = true;
+  spec.manual_dir_ = get_grob_direction (me);
+
+  if (me->is_live ())
+    {
+      Tie_configuration conf
+	= problem.find_optimal_tie_configuration (spec);
+  
+      set_control_points (me, problem.common_x_refpoint (),
+			  conf, problem.details_);
+    }
 }
+void
+Tie::set_control_points (Grob *me,
+			 Grob *common,
+			 Tie_configuration const &conf,
+			 Tie_details const &details
+			 )
+{
+  Bezier b = conf.get_transformed_bezier (details);
+  b.translate (Offset (- me->relative_coordinate (common, X_AXIS), 0));
 
-Interval
-Tie::do_width () const
+  SCM controls = SCM_EOL;
+  for (int i = 4; i--;)
+    {
+      if (!b.control_[i].is_sane ())
+	programming_error ("Insane offset");
+      controls = scm_cons (ly_offset2scm (b.control_[i]), controls);
+    }
+  me->set_property ("control-points", controls);
+}
+
+MAKE_SCHEME_CALLBACK(Tie, calc_control_points, 1);
+SCM
+Tie::calc_control_points (SCM smob)
 {
-  Real min_f = paper ()->get_var ("tie_x_minimum");
-  Interval width_int = Bow::do_width ();
-  return width_int.length () < min_f ? Interval (0, min_f) : width_int;
+  Grob *me = unsmob_grob (smob);
+
+  // trigger Tie-column
+  (void)  get_grob_direction (me);
+
+  Grob *yparent = me->get_parent (Y_AXIS);
+  if ((Tie_column::has_interface (yparent)
+       || Semi_tie_column::has_interface (yparent)) 
+      && unsmob_grob_array (yparent->get_object ("ties"))
+      && unsmob_grob_array (yparent->get_object ("ties"))->size () > 1)
+    {
+      /* trigger positioning. */
+      (void) yparent->get_property ("positioning-done");
+    }
+
+  if (!scm_is_pair (me->get_property_data ("control-points")))
+    {
+      set_default_control_points (me);
+    }
+
+  return SCM_UNSPECIFIED;
 }
 
-Array<Rod>
-Tie::get_rods () const
+/*
+  TODO: merge witnh Slur::print.
+ */
+MAKE_SCHEME_CALLBACK (Tie, print, 1);
+SCM
+Tie::print (SCM smob)
 {
-  Array<Rod> a;
-  Rod r ((Single_malt_grouping_item*)head_l_drul_[LEFT],
-	 (Single_malt_grouping_item*)head_l_drul_[RIGHT]);
-  r.distance_f_ += do_width ().length ();
-  a.push (r);
-  return a;
+  Grob *me = unsmob_grob (smob);
+  
+  SCM cp = me->get_property ("control-points");
+
+  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 b;
+  int i = 0;
+  for (SCM s = cp; scm_is_pair (s); s = scm_cdr (s))
+    {
+      b.control_[i] = ly_scm2offset (scm_car (s));
+      i++;
+    }
+
+  Stencil a;
+
+  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 (b,
+			     line_thick,
+			     robust_scm2double (p, 1.0),
+			     robust_scm2double (f, 0));
+  else
+    a = Lookup::slur (b,
+		      get_grob_direction (me) * base_thick,
+		      line_thick);
+
+#if DEBUG_TIE_SCORING
+  SCM quant_score = me->get_property ("quant-score");
+
+  if (to_boolean (me->layout ()
+		  ->lookup_variable (ly_symbol2scm ("debug-tie-scoring")))
+      && scm_is_string (quant_score))
+    {
+      string str;
+      SCM properties = Font_interface::text_font_alist_chain (me);
+
+      Stencil tm = *unsmob_stencil (Text_interface::interpret_markup
+				    (me->layout ()->self_scm (), properties,
+				     quant_score));
+      tm.translate_axis (b.control_[0][Y_AXIS]*2, Y_AXIS);
+      a.add_at_edge (X_AXIS, RIGHT, tm, 1.0, 0);
+    }
+#endif
+
+  return a.smobbed_copy ();
 }
+
+ADD_INTERFACE (Tie,
+	       "A horizontal curve connecting two noteheads. \n\n"
+	       ,
+	       
+
+	       /* properties */
+	       "avoid-slur " 	//  UGH.
+	       "control-points "
+	       "dash-fraction "
+	       "dash-period "
+	       "details "
+	       "direction "
+	       "head-direction "
+	       "line-thickness " 
+	       "quant-score "
+	       "staff-position "
+	       "thickness "
+	       );
+
+
+
+