From 8b416c2cdf41c47ecd53a64cf7c2fefab6c8f73f Mon Sep 17 00:00:00 2001
From: hanwen <hanwen>
Date: Sat, 11 Sep 2004 16:23:15 +0000
Subject: [PATCH] * lily/slur-scoring.cc (broken_trend_y): always take
use vdir extent index of other system. Fixes slurs across line breaks.
---
ChangeLog | 7 +++++++
VERSION | 2 +-
input/regression/page-layout.ly | 6 +++---
input/regression/slur-broken-trend.ly | 4 +++-
lily/slur-scoring.cc | 4 ++--
lily/tuplet-engraver.cc | 2 +-
6 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 467fb79d03..ebb9fa93f6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,13 @@
2004-09-11 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ * lily/slur-scoring.cc (broken_trend_y): always take use vdir
+ extent index of other system. Fixes slurs across line breaks.
+
+ * lily/tuplet-engraver.cc (start_translation_timestep): use
+ Tuplet_description::stop_ for determining when to stop producing
+ tuplet brackets. This fixes: tuplet-overwrite.ly
+
* lily/*-engraver.cc: remove all Protected_scm objects to fix GC
errors with GUILE 1.7 CVS.
diff --git a/VERSION b/VERSION
index 5df6ca8835..92f66445f3 100644
--- a/VERSION
+++ b/VERSION
@@ -1,6 +1,6 @@
PACKAGE_NAME=LilyPond
MAJOR_VERSION=2
MINOR_VERSION=3
-PATCH_LEVEL=15
+PATCH_LEVEL=16
MY_PATCH_LEVEL=
diff --git a/input/regression/page-layout.ly b/input/regression/page-layout.ly
index de332bcd07..3190076d43 100644
--- a/input/regression/page-layout.ly
+++ b/input/regression/page-layout.ly
@@ -35,7 +35,7 @@ values for the whole paper while \paper for each \score block." }
\book {
\score {
- \notes {
+ \relative c'' {
\repeat unfold 10 {
\repeat unfold 4 {c4}
}
@@ -44,7 +44,7 @@ values for the whole paper while \paper for each \score block." }
\paper {linewidth = 13\cm}
}
\score {
- \notes {
+ \relative c'' {
\repeat unfold 10 {
\repeat unfold 4 {c4}
}
@@ -52,4 +52,4 @@ values for the whole paper while \paper for each \score block." }
\header {piece = "Piece II"}
\paper {linewidth = 9\cm}
}
-}
\ No newline at end of file
+}
diff --git a/input/regression/slur-broken-trend.ly b/input/regression/slur-broken-trend.ly
index 89903b62fa..5c5ac839a6 100644
--- a/input/regression/slur-broken-trend.ly
+++ b/input/regression/slur-broken-trend.ly
@@ -27,6 +27,8 @@ in unbroken state.
} }
>>
\break
- c4)
+ c4) f='2.(\break
+ a4)
+
}
diff --git a/lily/slur-scoring.cc b/lily/slur-scoring.cc
index 1d6dccb0bd..0eb5259b5c 100644
--- a/lily/slur-scoring.cc
+++ b/lily/slur-scoring.cc
@@ -241,7 +241,7 @@ Slur_score_parameters::Slur_score_parameters(Grob *me)
init_score_param (me, this);
}
-/* HDIR indicates the direction for the slur. */
+/* HDIR indicates which side (left or right) we are processing here. */
Real
broken_trend_y (Grob *me, Grob **common, Direction hdir)
{
@@ -282,7 +282,7 @@ broken_trend_y (Grob *me, Grob **common, Direction hdir)
Direction vdir = get_grob_direction (me);
Real neighbor_y
= neighbor_col->extent (neighbor_common, Y_AXIS)
- .linear_combination (int(neighbor_cols.size()==1 ? CENTER : vdir))
+ .linear_combination (int(vdir))
- common_next_system->relative_coordinate (neighbor_common, Y_AXIS);
Link_array<Grob> my_cols
diff --git a/lily/tuplet-engraver.cc b/lily/tuplet-engraver.cc
index 54c3eb1863..f2838a32c4 100644
--- a/lily/tuplet-engraver.cc
+++ b/lily/tuplet-engraver.cc
@@ -125,7 +125,7 @@ Tuplet_engraver::start_translation_timestep ()
tuplets_[i].span_stop_ += tsd.main_part_;
}
- if (now.main_part_ >= tuplets_[i].span_stop_)
+ if (now.main_part_ >= tuplets_[i].stop_)
{
tuplets_.del (i);
}
--
2.39.5