From e59102924fa3a23511d297b123488dd810e7067c Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Sun, 19 Feb 2006 01:13:21 +0000 Subject: [PATCH] * lily/tie-formatting-problem.cc (from_lv_ties): add heads for common refpoint. * flower/include/std-vector.hh (iterof): add iterof macro. --- ChangeLog | 5 +++++ flower/include/std-vector.hh | 2 ++ lily/beam.cc | 2 -- lily/tie-formatting-problem.cc | 6 +++--- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 384436cc5e..9399aabdff 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2006-02-19 Han-Wen Nienhuys + * 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 34bd866c35..fd7f963dba 100644 --- a/flower/include/std-vector.hh +++ b/flower/include/std-vector.hh @@ -329,4 +329,6 @@ junk_pointers (vector &v) vector 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 0fd41be22c..1919d38312 100644 --- 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 4e5a910b21..916cb04adf 100644 --- a/lily/tie-formatting-problem.cc +++ b/lily/tie-formatting-problem.cc @@ -259,9 +259,9 @@ Tie_formatting_problem::from_lv_ties (vector 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); -- 2.39.5