(acknowledge_grob): stop beam

if encountering barline. Fixes: auto-beam-repeat.ly

diff --git a/ChangeLog b/ChangeLog
index de28a88c54a1000dd3c6a9e109ab78ecad3aa323..7453eeff8d01c587891372f59df559519c69fb15 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-01-27  Han-Wen Nienhuys  <hanwen@xs4all.nl>
+
+       * 
+
+       * lily/auto-beam-engraver.cc (acknowledge_grob): stop beam
+       if encountering barline. Fixes: auto-beam-repeat.ly
+
 2005-01-26  Werner Lemberg  <wl@gnu.org>
 
        * 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  <hanwen@xs4all.nl>
+
+       * VERSION: release 2.5.9
+       
 2005-01-18  Erlend Aasland  <erlenda@gmail.com>
 
        * 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 569ed01480fb12ca0d4a751c30db425db68c825b..ddd848d376002685e862c3e66ef21eb72eb00352 100644 (file)
--- 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 1debf00a12e07ca74a0a9ee3b5f53056eee7f140..c28fb9026034e257cf2c4bc356b268992bb01d1c 100644 (file)
--- 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)