Issue 4476: autochange: group multiple rests with the next note

Before this change, only the first rest before a note was kept with
the note.

diff --git a/input/regression/auto-change.ly b/input/regression/auto-change.ly
index c89034362ca242c49a39a54896db9f2d5296b67a..493e97c12fdea31d57af5e49d87a2325e70f7c7b 100644 (file)
--- a/input/regression/auto-change.ly
+++ b/input/regression/auto-change.ly
@@ -13,7 +13,7 @@ note. When central C is reached, staff is not yet switched (by default).
 
 \context PianoStaff <<
   \context Staff = "up" {
-    \autochange  \new Voice << \relative { g4 c e d c r4 a g } >>
+    \autochange  \new Voice << \relative { g4 c e d c8 r r4 a g } >>
   }
   \context Staff = "down" {
     \clef bass 

diff --git a/scm/autochange.scm b/scm/autochange.scm
index 17358aebe038b17986e76b455f0d10f4c1b9bacb..efc91edde179a87c47442d87708aa63dda24e241 100644 (file)
--- a/scm/autochange.scm
+++ b/scm/autochange.scm
@@ -30,7 +30,7 @@
                                               now)
                                           (if (< dir 0) "down" "up")) acc))
               (generate-split-list
-               (if pitch #f now)
+               (if pitch #f (if change-moment change-moment now))
                dir
                (cdr event-list) acc)))))