diff options
| author | Carl Sorensen <c_sorensen@byu.edu> | 2011-04-30 15:51:43 -0600 |
|---|---|---|
| committer | Carl Sorensen <c_sorensen@byu.edu> | 2011-04-30 18:10:43 -0600 |
| commit | 12388a94a73db3e002aaa91475d5a8a5dc4c9d72 (patch) | |
| tree | 5adab00c2b5771c2bd7c03790d7a13d8283efe60 | |
| parent | fa5f3e51c87a5bf90f0bfac5b957ae26403e5c83 (diff) | |
Fix issue 1641 -- Make \noBeam terminate the current autobeam
add regression test file
| -rw-r--r-- | input/regression/autobeam-nobeam.ly | 16 | ||||
| -rw-r--r-- | lily/auto-beam-engraver.cc | 6 |
2 files changed, 20 insertions, 2 deletions
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 (); } } |