From: Carl Sorensen <c_sorensen@byu.edu>
Date: Sat, 30 Apr 2011 21:51:43 +0000 (-0600)
Subject: Fix issue 1641 -- Make \noBeam terminate the current autobeam
X-Git-Tag: release/2.13.62-1~10
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=c98442e89d517eaf42ae7aa4f44d4475072bb0c4;p=lilypond.git

Fix issue 1641 -- Make \noBeam terminate the current autobeam

add regression test file
---

diff --git a/input/regression/autobeam-nobeam.ly b/input/regression/autobeam-nobeam.ly
new file mode 100644
index 0000000000..6273ec375e
--- /dev/null
+++ b/input/regression/autobeam-nobeam.ly
@@ -0,0 +1,16 @@
+\version "2.13.61"
+%%  Hack -- this should be 2.15.0, unless it is backported
+%%  Set to 2.13.61 in order to keep compile working
+
+\header {
+
+  texidoc = "
+  \noBeam should terminate an autobeam, even if it's not a
+  recommended place for stopping a beam.  In this example,
+  the first three eighth notes should be beamed.
+  "
+}
+
+\relative c'{
+  c8 d e f\noBeam  g a b c
+}
diff --git a/lily/auto-beam-engraver.cc b/lily/auto-beam-engraver.cc
index dbff4e95a2..66b79fe008 100644
--- a/lily/auto-beam-engraver.cc
+++ b/lily/auto-beam-engraver.cc
@@ -137,8 +137,10 @@ Auto_beam_engraver::process_music ()
 
   if (forbid_)
     {
-      consider_end (measure_position (context ()), shortest_mom_);
-      junk_beam ();
+      if (stems_)
+	end_beam ();
+      else
+	junk_beam ();
     }
 }