* scm/part-combiner.scm (determine-split-list): bugfix: if no

solo-state (at end of solo), we can set the solo status
too. (backportme.)

* input/regression/part-combine-solo-end.ly: new file.

diff --git a/ChangeLog b/ChangeLog
index 4b7432eff20a9c4ea66baf44887e8737468b1375..d96c5a059cfb309a952db7c234a94ac867656330 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2004-04-08  Han-Wen Nienhuys   <hanwen@xs4all.nl>
+
+       * scm/part-combiner.scm (determine-split-list): bugfix: if no
+       solo-state (at end of solo), we can set the solo status
+       too. (backportme.)
+
+       * input/regression/part-combine-solo-end.ly: new file.
+
 2004-04-08  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * scripts/abc2ly.py (parse_file): Strip \r from lines.  Fixes DOS
@@ -183,9 +191,9 @@
 
 2004-04-04  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
-       * po/fr.po: update.
+       * po/fr.po: update. (backportme).
 
-       * po/nl.po: update
+       * po/nl.po: update. (backportme). 
 
        * mf/feta-beugel.mf: document why design size is not fixed.
 
@@ -201,7 +209,7 @@
 
 2004-04-03  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
-       * po/de.po: update.
+       * po/de.po: update. (backportme).
 
        * scm/output-tex.scm (font-command): use ly: functions to
        construct name.

diff --git a/input/regression/part-combine-solo-end.ly b/input/regression/part-combine-solo-end.ly
new file mode 100644 (file)
index 0000000..2d01f8a
--- /dev/null
+++ b/input/regression/part-combine-solo-end.ly
@@ -0,0 +1,17 @@
+\header {
+
+    texidoc = "SOLO is printed even if the solo voice ends before the
+    other one."
+
+}
+
+\version "2.3.0"
+
+\score {
+   <<
+     \new Staff
+       \partcombine
+         \notes { R1 * 2 }
+         \notes { c'8\> c'\! r2.  }
+   >>
+}

diff --git a/scm/part-combiner.scm b/scm/part-combiner.scm
index 0997a29b8afa2233d825c0f54f8a63904262527f..69180a978a5f6ca8dbcd4bb0eba79b6132d13ccd 100644 (file)
--- a/scm/part-combiner.scm
+++ b/scm/part-combiner.scm
@@ -374,7 +374,11 @@ the mark when there are no spanners active."
              (cond ((not (equal? (configuration now-state) 'apart))
                     current-idx)
                    ((> siln 0) start-idx)
-                   ((and (null? (span-state solo-state)))
+                   ((not solo-state)
+                    (put-range type start-idx current-idx)
+                    current-idx)
+                   ((and
+                     (null? (span-state solo-state)))
                     ;;
                     ;; This includes rests. This isn't a problem: long rests
                     ;; will be shared with the silent voice, and be marked