From 970e8c7877fd9cb3197a04a611943e2b96a0d303 Mon Sep 17 00:00:00 2001 From: Joe Neeman Date: Fri, 29 Sep 2006 23:28:04 +0000 Subject: [PATCH] * lily/page-turn-engraver.cc (breakable_column): remove an always-true conditional (breakable_column): typo * lily/source-file.cc (get_line): fix off-by-one error and clean up some of the logic --- ChangeLog | 4 ++++ lily/page-turn-engraver.cc | 11 ++++------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index d12ce34778..839b0a5f63 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2006-09-30 Joe Neeman + * lily/page-turn-engraver.cc (breakable_column): remove an always-true + conditional + (breakable_column): typo + * lily/source-file.cc (get_line): fix off-by-one error and clean up some of the logic diff --git a/lily/page-turn-engraver.cc b/lily/page-turn-engraver.cc index 56abfb256c..a00c5922ad 100644 --- a/lily/page-turn-engraver.cc +++ b/lily/page-turn-engraver.cc @@ -59,7 +59,7 @@ public: ret.push_back (Page_turn_event (intersect[LEFT], intersect[RIGHT], permission_, new_pen)); if (penalty.duration_[RIGHT] < duration_[RIGHT]) - ret.push_back (Page_turn_event (penalty.duration_[RIGHT], duration_[LEFT], permission_, penalty_)); + ret.push_back (Page_turn_event (penalty.duration_[RIGHT], duration_[RIGHT], permission_, penalty_)); return ret; } @@ -112,12 +112,9 @@ Page_turn_engraver::breakable_column (Page_turn_event const &brk) if (start == breakable_moments_.size ()) return NULL; - if (end == breakable_moments_.size () || breakable_moments_[end] > brk.duration_[RIGHT]) - { - if (end == 0) - return NULL; - end--; - } + if (end == 0) + return NULL; + end--; for (vsize i = end + 1; i-- > start;) if (special_barlines_[i]) -- 2.39.5