run cvs up before patching.

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

diff --git a/lily/dot-column.cc b/lily/dot-column.cc
index 3ebddc69a015267561adb67a24a35a3f5a9a474e..4683c51cb53faa05d0a0edef971ef1a2f81b9c61 100644 (file)
--- a/lily/dot-column.cc
+++ b/lily/dot-column.cc
@@ -14,6 +14,7 @@
 using namespace std;
 
 #include "dots.hh"
+#include "dot-column.hh"
 #include "rhythmic-head.hh"
 #include "staff-symbol-referencer.hh"
 #include "directional-element-interface.hh"
@@ -51,7 +52,7 @@ Dot_column::side_position (SCM smob)
        }
     }
 
-  return Side_position_interface::x_aligned_side (smob);
+  return Side_position_interface::x_aligned_side (smob, SCM_EOL);
 }
 
 struct Dot_position
@@ -66,6 +67,7 @@ struct Dot_position
     dot_ = 0;
     pos_ = 0;
     dir_ = CENTER;
+    extremal_head_ = false;
   }
 };
 
@@ -233,7 +235,7 @@ Dot_column::calc_positioning_done (SCM smob)
       }
   }
 
-  vector_sort (dots, &compare_position);
+  vector_sort (dots, position_less);
   for (vsize i = dots.size (); i--;)
     if (!dots[i]->is_live ())
       dots.erase (dots.begin () + i);