From dac16eaec11183f68aa34bc0e2e499cf49fc6a38 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Thu, 8 Apr 2004 20:51:41 +0000 Subject: [PATCH] * 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. --- ChangeLog | 14 +++++++++++--- input/regression/part-combine-solo-end.ly | 17 +++++++++++++++++ scm/part-combiner.scm | 6 +++++- 3 files changed, 33 insertions(+), 4 deletions(-) create mode 100644 input/regression/part-combine-solo-end.ly diff --git a/ChangeLog b/ChangeLog index 4b7432eff2..d96c5a059c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2004-04-08 Han-Wen Nienhuys + + * 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 * scripts/abc2ly.py (parse_file): Strip \r from lines. Fixes DOS @@ -183,9 +191,9 @@ 2004-04-04 Han-Wen Nienhuys - * 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 - * 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 index 0000000000..2d01f8a40f --- /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 0997a29b8a..69180a978a 100644 --- 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 -- 2.39.5