(determine-split-list): analysis has

global effect: a difference halfway a phrase makes the entire
phrase be typeset as apart.
(make-multi-measure-rest): make mmrest as a single rhythmic event.

diff --git a/lily/spacing-engraver.cc b/lily/spacing-engraver.cc
index ae331b60d6299caefd7ee9360dbfebd18b8f1b11..1589ab9d3bed6966628709c64b676fe462451327 100644 (file)
--- a/lily/spacing-engraver.cc
+++ b/lily/spacing-engraver.cc
@@ -125,10 +125,13 @@ Spacing_engraver::stop_translation_timestep ()
   shortest_playing.set_infinite (1);
   for (int i=0; i < playing_durations_.size (); i++)
     {
-      Moment m = (playing_durations_[i].info_.music_cause ())->get_length ();
-      shortest_playing = shortest_playing <? m;
+      Music * mus = playing_durations_[i].info_.music_cause ();
+      if (mus)
+       {
+         Moment m = mus->get_length ();
+         shortest_playing = shortest_playing <? m;
+       }
     }
-  
   Moment starter;
   starter.set_infinite (1);
 

diff --git a/scm/music-functions.scm b/scm/music-functions.scm
index c933f8592e3f143b65a23bb96c44b986f0cc9a42..ce99ba7585434b597fd594a61bf9b1e181f762c3 100644 (file)
--- a/scm/music-functions.scm
+++ b/scm/music-functions.scm
@@ -971,13 +971,13 @@ Rest can contain a list of beat groupings
                              (map (lambda (x) (ly:get-mus-property x 'pitch)) notes2) ly:pitch<?))
                   )
                (cond
-                ((= (length notes1) 0) (put 'solo2))
-                ((= (length notes2) 0) (put 'solo1))
                 ((> (length notes1) 1) (put 'apart))
                 ((> (length notes2) 1) (put 'apart))
                 (else
-                 (if (< chord-threshold (ly:pitch-steps
-                         (ly:pitch-diff (car pitches1) (car pitches2))))
+                 (if
+                  (and (= (length pitches1) (length pitches2))
+                   (< chord-threshold (ly:pitch-steps
+                                       (ly:pitch-diff (car pitches1) (car pitches2)))))
                        (put 'apart)