From dea17ef02f40ca475ce4741b0bdb6ae45e769b38 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Wed, 26 Jan 2005 23:21:44 +0000 Subject: [PATCH] (acknowledge_grob): stop beam if encountering barline. Fixes: auto-beam-repeat.ly --- ChangeLog | 11 +++++++++++ lily/auto-beam-engraver.cc | 11 +++++++++++ lily/instrument-name-engraver.cc | 2 +- 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index de28a88c54..7453eeff8d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2005-01-27 Han-Wen Nienhuys + + * + + * lily/auto-beam-engraver.cc (acknowledge_grob): stop beam + if encountering barline. Fixes: auto-beam-repeat.ly + 2005-01-26 Werner Lemberg * mf/feta-slag.mf (draw_trillelement): Fix shape to get clean @@ -102,6 +109,10 @@ * Documentation/user/changing-defaults: added info on creating a copyright symbol. +2005-01-18 Han-Wen Nienhuys + + * VERSION: release 2.5.9 + 2005-01-18 Erlend Aasland * scm/auto-beam.scm: Simplify score-override-auto-beam-setting diff --git a/lily/auto-beam-engraver.cc b/lily/auto-beam-engraver.cc index 569ed01480..ddd848d376 100644 --- a/lily/auto-beam-engraver.cc +++ b/lily/auto-beam-engraver.cc @@ -407,6 +407,17 @@ Auto_beam_engraver::finalize () void Auto_beam_engraver::acknowledge_grob (Grob_info info) { + /* + Duplicated from process_music(), since + Repeat_acknowledge_engraver::process_music() may also set whichBar + */ + if (scm_is_string (get_property ("whichBar")) + && beam_start_moment_ < now_mom()) + { + consider_end (shortest_mom_); + junk_beam (); + } + if (stems_) { if (Beam::has_interface (info.grob_)) diff --git a/lily/instrument-name-engraver.cc b/lily/instrument-name-engraver.cc index 1debf00a12..c28fb90260 100644 --- a/lily/instrument-name-engraver.cc +++ b/lily/instrument-name-engraver.cc @@ -78,7 +78,7 @@ Instrument_name_engraver::create_text () if (text_->get_property ("text") != txt) text_->set_property ("text", txt); - } +} void Instrument_name_engraver::acknowledge_grob (Grob_info i) -- 2.39.2