* lily/tie-formatting-problem.cc (from_lv_ties): add heads for

common refpoint.

* flower/include/std-vector.hh (iterof): add iterof macro.

diff --git a/ChangeLog b/ChangeLog
index 384436cc5e805f40ee067767f5c698a58b0c507c..9399aabdffed46f9a01e977806e42a8c7b498df0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2006-02-19  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * lily/tie-formatting-problem.cc (from_lv_ties): add heads for
+       common refpoint.
+
+       * flower/include/std-vector.hh (iterof): add iterof macro.
+
        * lily/enclosing-bracket.cc (width): new function.
 
        * lily/align-interface.cc (align_elements_to_extents): reinstate

diff --git a/flower/include/std-vector.hh b/flower/include/std-vector.hh
index 34bd866c354ae4d0e4f24ad89fa6d694b8605724..fd7f963dbac268171a164ef1c2869d77a9b025d9 100644 (file)
--- a/flower/include/std-vector.hh
+++ b/flower/include/std-vector.hh
@@ -329,4 +329,6 @@ junk_pointers (vector<T> &v)
 
 vector<string> string_split (string str, char c);
 
+#define iterof(i,s) typeof((s).begin()) i((s).begin())
+
 #endif /* STD_VECTOR_HH */

diff --git a/lily/beam.cc b/lily/beam.cc
index 0fd41be22c15d1b506a59f0f544323aefa8ace14..1919d383126892ac80053f02fe03b2b13f36460c 100644 (file)
--- a/lily/beam.cc
+++ b/lily/beam.cc
@@ -516,8 +516,6 @@ Beam::print (SCM grob)
   return the_beam.smobbed_copy ();
 }
 
-#define iterof(i,s) typeof((s).begin()) i((s).begin())
-
 Direction
 Beam::get_default_dir (Grob *me)
 {

diff --git a/lily/tie-formatting-problem.cc b/lily/tie-formatting-problem.cc
index 4e5a910b211f67330c563246e3c82f7fcdbb4a47..916cb04adf5db439ada99c7dcf9878e2420de9a4 100644 (file)
--- a/lily/tie-formatting-problem.cc
+++ b/lily/tie-formatting-problem.cc
@@ -259,9 +259,9 @@ Tie_formatting_problem::from_lv_ties (vector<Grob*> const &lv_ties)
 
   x_refpoint_ = lv_ties [0];
   for (vsize i = 0; i < lv_ties.size (); i++)
-    {
-      x_refpoint_ = lv_ties[i]->common_refpoint (x_refpoint_, X_AXIS); 
-    }
+    x_refpoint_ = lv_ties[i]->common_refpoint (x_refpoint_, X_AXIS); 
+  for (vsize i = 0; i < heads.size (); i++)
+    x_refpoint_ = heads[i]->common_refpoint (x_refpoint_, X_AXIS); 
 
   set_chord_outline (heads, LEFT);