From 63f12e8d5820bf3f437f76859fb3515d365e59ef Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Wed, 18 Feb 2004 00:52:31 +0000 Subject: [PATCH] (determine-split-list): robustification. --- ChangeLog | 8 +++++++- lily/melisma-translator.cc | 3 ++- scm/lily.scm | 1 + scm/part-combiner.scm | 2 +- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 67d42fb4f1..1582689bd3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,13 @@ +2004-02-18 Han-Wen Nienhuys + + * scm/part-combiner.scm (determine-split-list): robustification. + 2004-02-17 Han-Wen Nienhuys * lily/beam-quanting.cc (score_forbidden_quants): check all staff - lines for falling into beam-gap. + lines for falling into beam-gap. + (score_forbidden_quants): check all staff lines for falling in + beam gaps. * lily/note-spacing.cc (get_spacing): less space at EOL in case of key/clef/time signatures. diff --git a/lily/melisma-translator.cc b/lily/melisma-translator.cc index 6bcdd216d8..f8090b134f 100644 --- a/lily/melisma-translator.cc +++ b/lily/melisma-translator.cc @@ -65,11 +65,12 @@ Melisma_translator::process_music () void Melisma_translator::start_translation_timestep () { - event_ =0; + event_ = 0; } Melisma_translator::Melisma_translator() { + event_ = 0; } ENTER_DESCRIPTION(Melisma_translator, diff --git a/scm/lily.scm b/scm/lily.scm index ab4066cd91..d451954498 100644 --- a/scm/lily.scm +++ b/scm/lily.scm @@ -503,3 +503,4 @@ L1 is copied, L2 not. ".scm" ) "w"))) +(set-debug-cell-accesses! 1000) diff --git a/scm/part-combiner.scm b/scm/part-combiner.scm index 10efcedce0..590cb1fceb 100644 --- a/scm/part-combiner.scm +++ b/scm/part-combiner.scm @@ -465,7 +465,7 @@ Only set if not set previously. (define (current-voice-state now-state voice-num) (define vs ((if (= 1 voice-num) car cdr) (voice-states now-state) ) ) - (if (equal? (when now-state) (when vs)) + (if (or (not vs) (equal? (when now-state) (when vs))) vs (previous-voice-state vs) )) -- 2.39.2