summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHan-Wen Nienhuys <hanwen@xs4all.nl>2006-12-08 18:51:35 +0100
committerHan-Wen Nienhuys <hanwen@xs4all.nl>2006-12-08 18:51:35 +0100
commitdffe9705366ffb44b30af7a7d3d314c752ac93d5 (patch)
treefd62e158bc7a1e8fb1fe22d47edaab8886ffbcab
parent44ab7695ff27e0d2c8ff1108fe1ec23df6d7fe32 (diff)
really fix #171
-rw-r--r--input/regression/tie-broken-minimum-length.ly20
-rw-r--r--lily/spanner.cc8
2 files changed, 24 insertions, 4 deletions
diff --git a/input/regression/tie-broken-minimum-length.ly b/input/regression/tie-broken-minimum-length.ly
new file mode 100644
index 0000000000..51f9708a3c
--- /dev/null
+++ b/input/regression/tie-broken-minimum-length.ly
@@ -0,0 +1,20 @@
+
+\version "2.11.0"
+
+\header {
+
+ texidoc = " Broken ties honor @code{minimum-length} also. This tie
+has a @code{minimum-length} of 5."
+
+}
+
+\relative {
+ \override Tie #'minimum-length = #5
+ f2. f16 f f f ~ | \break
+ f1
+}
+
+\paper {
+ indent = 0.0\mm
+ line-width = 40.0\mm
+}
diff --git a/lily/spanner.cc b/lily/spanner.cc
index 61051bb9dd..c0ac823b02 100644
--- a/lily/spanner.cc
+++ b/lily/spanner.cc
@@ -343,17 +343,17 @@ Spanner::set_spacing_rods (SCM smob)
System *root = get_root_system (me);
vector<Item*> cols (root->broken_col_range (sp->get_bound (LEFT)->get_column (),
- sp->get_bound (LEFT)->get_column ()));
+ sp->get_bound (RIGHT)->get_column ()));
- if (cols.size () )
+ if (cols.size ())
{
Rod r ;
r.item_drul_[LEFT] = sp->get_bound (LEFT);
- r.item_drul_[RIGHT] =cols[0];
+ r.item_drul_[RIGHT] = cols[0]->find_prebroken_piece (LEFT);
r.distance_ = robust_scm2double (num_length, 0);
r.add_to_cols ();
- r.item_drul_[LEFT] = cols.back ();
+ r.item_drul_[LEFT] = cols.back ()->find_prebroken_piece (RIGHT);
r.item_drul_[RIGHT] = sp->get_bound (RIGHT);
r.add_to_cols ();
}