;;; define-music-display-methods.scm -- data for displaying music
;;; expressions using LilyPond notation.
;;;
-;;; Copyright (C) 2005--2012 Nicolas Sceaux <nicolas.sceaux@free.fr>
+;;; Copyright (C) 2005--2014 Nicolas Sceaux <nicolas.sceaux@free.fr>
;;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
((marcato) "^")
((stopped) "+")
((tenuto) "-")
- ((staccatissimo) "|")
+ ((staccatissimo) "!")
((accent) ">")
((staccato) ".")
((portato) "_")
(map-in-order (lambda (event)
(music->lily-string event parser))
(ly:music-property note 'articulations))))
- (else ;; unknown?
- "")))
+ (else
+ ;; pure duration
+ ;; FIXME: { c4 c4 4 4 } must not be output as { c4 c 4 4 }
+ ;; quite tricky to do. Do it when outputting sequences?
+ (format #f "~a~{~a~}"
+ (duration->lily-string (ly:music-property note 'duration)
+ #:force-duration #t
+ #:remember #t)
+ (map-in-order (lambda (event)
+ (music->lily-string event parser))
+ (ly:music-property note 'articulations))))))
(define-display-method ClusterNoteEvent (note parser)
(simple-note->lily-string note parser))
'())
(duration->lily-string ?unit #:force-duration #t)
(if (pair? ?count)
- (format #f "~a ~~ ~a" (car ?count) (cdr ?count))
+ (format #f "~a - ~a" (car ?count) (cdr ?count))
?count)
(new-line->lily-string))))
quoted-voice-direction ?quoted-voice-direction
quoted-music-name ?quoted-music-name
quoted-context-id "cue"
- quoted-context-type 'Voice
+ quoted-context-type 'CueVoice
element ?music))
(format #f "\\cueDuring #~s #~a ~a"
?quoted-music-name