* mf/merge.pe: new file.

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

diff --git a/lily/tie-column.cc b/lily/tie-column.cc
index a9eddaebe9c0e25631bd62c1283648669034dbd0..16279f4f60036609e640f89451896fa24615edda 100644 (file)
--- a/lily/tie-column.cc
+++ b/lily/tie-column.cc
@@ -3,22 +3,18 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2000--2003 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 "spanner.hh"
 #include "group-interface.hh"
 #include "tie.hh"
 #include "directional-element-interface.hh"
 #include "rhythmic-head.hh"
 
-
-
-
-
-
 /*
   tie dir depends on what Tie_column does.
 */
@@ -101,7 +97,7 @@ Tie_column::old_directions (Grob*me)
   ties.del (0);
   
   set_grob_direction (ties.pop (), UP);
-  for (int i=ties.size (); i--;)
+  for (int i = ties.size (); i--;)
     {
       Grob *  t = ties[i];
       Real p = Tie::get_position (t);
@@ -153,8 +149,10 @@ Tie_column::werner_directions (Grob *me)
   
   if (ties.size () == 1)
     {
-      Grob *  t = ties[0];      
-      set_grob_direction (t,Tie::get_default_dir (t));
+      Grob *  t = ties[0];
+      if (t->is_live ()
+         && !get_grob_direction (t))
+       set_grob_direction (t,Tie::get_default_dir (t));
       return ;
     }
 
@@ -201,6 +199,6 @@ Tie_column::after_line_breaking (SCM smob)
 
 
 ADD_INTERFACE (Tie_column,"tie-column-interface",
-  "that sets tie directions in a tied chord",
+  "Object that sets directions of multiple ties in a tied chord",
   "direction");