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 (file)
index 0000000..6273ec3
--- /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 dbff4e95a2f8803bfe87fa2b7afd18fe307422e9..66b79fe008c59b0c2612c03425c2871af991c9cd 100644 (file)
--- 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 ();
     }
 }