From: David Kastrup <dak@gnu.org>
Date: Fri, 27 Jan 2012 18:18:03 +0000 (+0100)
Subject: Further EventChord stripping fixes
X-Git-Tag: release/2.15.28-1~13
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=2c5b82a7c0e500623e0e0cdcadd3b0a2703825a3;p=lilypond.git

Further EventChord stripping fixes
---

diff --git a/ly/declarations-init.ly b/ly/declarations-init.ly
index 6024d1dc03..2419940c0b 100644
--- a/ly/declarations-init.ly
+++ b/ly/declarations-init.ly
@@ -60,13 +60,13 @@ center = #0
 %% try \once \override Score.Beam #'breakable = ##t
 
 %% rather name \newline, \pageBreak ?
-break = #(make-event-chord (list (make-music 'LineBreakEvent 'break-permission 'force)))
-noBreak = #(make-event-chord (list (make-music 'LineBreakEvent 'break-permission '())))
+break = #(make-music 'LineBreakEvent 'break-permission 'force)
+noBreak = #(make-music 'LineBreakEvent 'break-permission '())
 %% \pageBreak, \noPageBreak, \pageTurn, \noPageTurn, \allowPageTurn are defined
 %% as music functions
 
-stopStaff = #(make-event-chord (list (make-span-event 'StaffSpanEvent STOP)))
-startStaff = #(make-event-chord (list (make-span-event 'StaffSpanEvent START)))
+stopStaff = #(make-span-event 'StaffSpanEvent STOP)
+startStaff = #(make-span-event 'StaffSpanEvent START)
 
 
 %
diff --git a/scm/define-music-display-methods.scm b/scm/define-music-display-methods.scm
index ac9930e138..db21afda90 100644
--- a/scm/define-music-display-methods.scm
+++ b/scm/define-music-display-methods.scm
@@ -432,28 +432,6 @@ Otherwise, return #f."
 				   'NoteEvent 'ClusterNoteEvent 'RestEvent
 				   'SkipEvent 'LyricEvent)
 				  elements)))
-    (if ((make-music-type-predicate 'StaffSpanEvent 'BreathingEvent) (car elements))
-	;; first, a special case: StaffSpanEvent (\startStaff, \stopStaff)
-	;; and BreathingEvent (\breathe)
-	(music->lily-string (car elements) parser)
-	(if (and (not (null? simple-elements))
-		 (null? (cdr simple-elements))
-		 ;; a non-empty articulation list is only possible with
-		 ;; chord entry.
-		 (null? (ly:music-property (car simple-elements) 'articulations))
-		 ;; same for simple_element with \tweak
-		 (null? (ly:music-property (car simple-elements) 'tweaks)))
-	    ;; simple_element : note | figure | rest | mmrest | lyric_element | skip
-	    (let* ((simple-element (car simple-elements))
-		   (duration (duration->lily-string
-			      (ly:music-property simple-element 'duration)
-			      #:remember #t)))
-	      (format #f "~a~a~{~a~^ ~}"
-		      (music->lily-string simple-element parser)
-		      duration
-		      (map-in-order (lambda (music)
-				      (music->lily-string music parser))
-				    (filter post-event? elements))))
 	    (let ((chord-elements (filter (make-music-type-predicate
 					   'NoteEvent 'ClusterNoteEvent 'BassFigureEvent)
 					  elements))
@@ -474,7 +452,7 @@ Otherwise, return #f."
 		  ;; command_element
 		  (format #f "~{~a~^ ~}" (map-in-order (lambda (music)
 						       (music->lily-string music parser))
-						     elements))))))))
+						     elements))))))
 
 (define-display-method MultiMeasureRestMusic (mmrest parser)
   (let* ((dur (ly:music-property mmrest 'duration))