(determine-split-list): robustification.

diff --git a/ChangeLog b/ChangeLog
index 67d42fb4f1d04fb57a41d8d8757f7291c5d58570..1582689bd309d3156b31b79ca30b30e8dcb0dc42 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,13 @@
+2004-02-18  Han-Wen Nienhuys   <hanwen@xs4all.nl>
+
+       * scm/part-combiner.scm (determine-split-list): robustification.
+
 2004-02-17  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
        * 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 6bcdd216d81af49a1f9ac046f2c77f3ea7327395..f8090b134fe34bef0f05213628b74092886f9a2e 100644 (file)
--- 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 ab4066cd91cac409548f92bbd3639ff2a57bf2d5..d45195449892243b380220c6eed1850d54d6427b 100644 (file)
--- 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 10efcedce08941440e5c8276ed9e641b0b28318b..590cb1fceb6266b7cb4797eca521f8a2d5f9da00 100644 (file)
--- 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)
        ))