* mf/merge.pe: new file.

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

diff --git a/lily/tie-column.cc b/lily/tie-column.cc
index 44208c234f7896e1509b5e6f77e4d289fac2a7fa..16279f4f60036609e640f89451896fa24615edda 100644 (file)
--- a/lily/tie-column.cc
+++ b/lily/tie-column.cc
@@ -7,18 +7,14 @@
   
  */
 
-#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);
@@ -154,7 +150,7 @@ Tie_column::werner_directions (Grob *me)
   if (ties.size () == 1)
     {
       Grob *  t = ties[0];
-      if (t->live ()
+      if (t->is_live ()
          && !get_grob_direction (t))
        set_grob_direction (t,Tie::get_default_dir (t));
       return ;
@@ -203,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");