From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Sat, 24 Jan 2004 01:31:55 +0000 (+0000)
Subject: (determine-split-list): analysis has
X-Git-Tag: release/2.1.23~179
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=556015912c6926e3573334fb092827ace4b18778;p=lilypond.git

(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 ae331b60d6..1589ab9d3b 100644
--- 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 c933f8592e..ce99ba7585 100644
--- 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)