2003 -> 2004

[lilypond.git] / lily / tie-column.cc

diff --git a/lily/tie-column.cc b/lily/tie-column.cc
index be2116eeeb0a4a8fbadab189d9add99703b30913..44208c234f7896e1509b5e6f77e4d289fac2a7fa 100644 (file)
--- a/lily/tie-column.cc
+++ b/lily/tie-column.cc
@@ -3,34 +3,206 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
+#include "spanner.hh"
 #include "tie-column.hh"
 #include "group-interface.hh"
+#include "tie.hh"
+#include "directional-element-interface.hh"
+#include "rhythmic-head.hh"
 
-Tie_column::Tie_column ()
+
+
+
+
+
+/*
+  tie dir depends on what Tie_column does.
+*/
+/*
+  TODO: this doesn't follow standard pattern. Regularize.
+ */
+void
+Tie_column::add_tie (Grob*me,Grob *s)
 {
-  set_elt_property ("ties", SCM_EOL);
+  if (s->get_parent (Y_AXIS)
+      && Tie_column::has_interface (s->get_parent (Y_AXIS)))
+    return ;
+  
+  if (!  Pointer_group_interface::count (me, "ties"))
+    {
+      dynamic_cast<Spanner*> (me)->set_bound (LEFT, Tie::head (s,LEFT));
+      dynamic_cast<Spanner*> (me)->set_bound (RIGHT, Tie::head (s,RIGHT));
+    }
+  s->set_parent (me, Y_AXIS);
+  Pointer_group_interface::add_grob (me, ly_symbol2scm ("ties"), s);
+  s->add_dependency (me);
 }
 
+
 void
-Tie_column::add_tie (Score_element *s)
+Tie_column::set_directions (Grob*me)
 {
-  group (s).add_element (s);
-  s->add_dependency (this);
+  werner_directions (me);
 }
 
+int
+tie_compare (Grob* const & s1,
+            Grob* const & s2)
+{
+  return sign (Tie::get_position (s1) - Tie::get_position (s2));
+}
+
+/*
+  See [Ross p. 138].
+
+
+  In normal chord cases, the outer ties point outwards, and the
+  direction of the rest is determined by their staff position.
+
+  Ross forgets about the tie that is *on* the middle staff line. We
+  assume it goes UP. (TODO: make me settable) */
 void
-Tie_column::set_directions ()
+Tie_column::old_directions (Grob*me)
 {
-  Link_array<Score_element> s =
-    Group_interface__extract_elements (this, (Score_element*)0, "ties");
+  Link_array<Grob> ties =
+    Pointer_group_interface__extract_grobs (me, (Grob*)0, "ties");
+
+  for (int i = ties.size (); i--;)
+    if (get_grob_direction (ties[i]))
+      ties.del (i);
+
+  if (!ties.size ())
+    return ;
+
+  Direction d = get_grob_direction (me);
+  if (d)
+    {
+      for (int i = ties.size (); i--;)
+       {
+         Grob *  t = ties[i];
+         set_grob_direction (t, d);
+       }
+      return;
+    }
+  
+  if (ties.size () == 1)
+    {
+      Grob *  t = ties[0];      
+      set_grob_direction (t,Tie::get_default_dir (t));
+      return;
+    }
+  
+  ties.sort (tie_compare);
+  set_grob_direction (ties[0], DOWN);
+  ties.del (0);
+  
+  set_grob_direction (ties.pop (), UP);
+  for (int i=ties.size (); i--;)
+    {
+      Grob *  t = ties[i];
+      Real p = Tie::get_position (t);
+      Direction d = (Direction) sign (p);
+      if (!d)
+       d = UP;
+      set_grob_direction (t, d);
+    }
+  
 }
 
+/*
+  
+% . The algorithm to choose the direction of the ties doesn't work
+%   properly.  I suggest the following for applying ties sequentially
+%   from top to bottom:
+%
+%     + The topmost tie is always `up'.
+%
+%     + If there is a vertical gap to the last note above larger than
+%       or equal to a fifth (or sixth?), the tie is `up', otherwise it
+%       is `down'.
+%
+%     + The bottommost tie is always `down'.
+
+ */
 void
-Tie_column::do_post_processing ()
+Tie_column::werner_directions (Grob *me)
 {
-  set_directions ();
+  Link_array<Grob> ties =
+    Pointer_group_interface__extract_grobs (me, (Grob*)0, "ties");
+
+  if (!ties.size ())
+    return ;
+  
+  ties.sort (tie_compare);
+
+  Direction d = get_grob_direction (me);
+  if (d)
+    {
+      for (int i = ties.size (); i--;)
+       {
+         Grob *  t = ties[i];
+         if (!get_grob_direction (t))
+           set_grob_direction (t, d);
+       }
+      return ;
+    }
+  
+  if (ties.size () == 1)
+    {
+      Grob *  t = ties[0];
+      if (t->live ()
+         && !get_grob_direction (t))
+       set_grob_direction (t,Tie::get_default_dir (t));
+      return ;
+    }
+
+  Real last_down_pos = 10000;
+  if (!get_grob_direction (ties[0]))
+    set_grob_direction (ties[0], DOWN);
+  
+  for (int i = ties.size (); i--;)
+    {
+      Grob *t = ties[i];
+      
+      Direction d = get_grob_direction (t);
+      Real p  = Tie::get_position (t);
+      if (!d)
+       {
+         if (last_down_pos - p  > 5)
+           {
+             d = UP;
+           }
+         else
+           {
+             d = DOWN;
+           }
+
+         set_grob_direction (t, d);
+       }
+
+      if (d == DOWN)
+       last_down_pos = p;
+    }
+
+  return ;
+}
+
+
+MAKE_SCHEME_CALLBACK (Tie_column,after_line_breaking,1);
+SCM
+Tie_column::after_line_breaking (SCM smob)
+{
+  werner_directions (unsmob_grob (smob));
+  return SCM_UNSPECIFIED;
 }
+
+
+
+ADD_INTERFACE (Tie_column,"tie-column-interface",
+  "that sets tie directions in a tied chord",
+  "direction");
+