Let \afterGrace start a Bottom context

scm/define-music-display-methods.scm

 ;;; define-music-display-methods.scm -- data for displaying music
 ;;; expressions using LilyPond notation.
 ;;;
 ;;; Copyright (C) 2005--2015 Nicolas Sceaux  <nicolas.sceaux@free.fr>
 ;;;
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;;
 ;;; Display method implementation
 ;;;
@@ skipping 367 matching lines @@
             (if force-line-break 1 0)
             (if force-line-break (*indent*) 1))))
 
 (define-display-method SimultaneousMusic (sim)
   (parameterize ((*indent* (+ 3 (*indent*))))
                 (format #f "<< ~{~a ~}>>"
                         (map-in-order (lambda (music)
                                         (music->lily-string music))
                                       (ly:music-property sim 'elements)))))
 
-(define-extra-display-method SimultaneousMusic (expr)
-  "If `sim' is an \afterGrace expression, return \"\\afterGrace ...\".
-Otherwise, return #f."
-  ;; TODO: do something with afterGraceFraction?
-  (with-music-match (expr (music 'SimultaneousMusic
-                                 elements (?before-grace
-                                           (music 'SequentialMusic
-                                                  elements ((music 'SkipMusic)
-                                                            (music 'GraceMusic
-                                                                   element ?grace))))))
-                    (format #f "\\afterGrace ~a ~a"
-                            (music->lily-string ?before-grace)
-                            (music->lily-string ?grace))))
-
 ;;;
 ;;; Chords
 ;;;
 
 (define-display-method EventChord (chord)
   ;; event_chord : command_element
   ;;               | note_chord_element
 
   ;; TODO : tagged post_events
   ;; post_events : ( post_event | tagged_post_event )*
@@ skipping 320 matching lines @@
                                       (map (lambda (op)
                                              (format #f "~%~v_\\~a ~s"
                                                      (*indent*)
                                                      (first op)
                                                      (second op)))
                                            operations))
                         (*indent*)))
             (parameterize ((*current-context* ctype))
                           (music->lily-string music)))))
 
+;; \afterGrace
+(define-extra-display-method ContextSpeccedMusic (expr)
+  "If `sim' is an \afterGrace expression, return \"\\afterGrace ...\".
+Otherwise, return #f."
+  ;; TODO: do something with afterGraceFraction?
+  (with-music-match
+   (expr (music 'ContextSpeccedMusic
+                context-type 'Bottom
+                element
+                (music 'SimultaneousMusic
+                       elements (?before-grace
+                                 (music 'SequentialMusic
+                                        elements ((music 'SkipMusic)
+                                                  (music 'GraceMusic
+                                                         element ?grace)))))))
+   (format #f "\\afterGrace ~a ~a"
+           (music->lily-string ?before-grace)
+            (music->lily-string ?grace))))
+
+
 ;; special cases: \figures \lyrics \drums
 (define-extra-display-method ContextSpeccedMusic (expr)
   (with-music-match (expr (music 'ContextSpeccedMusic
                                  create-new #t
                                  property-operations ?op
                                  context-type ?context-type
                                  element ?sequence))
                     (if (null? ?op)
                         (parameterize ((*explicit-mode* #f))
                                       (case ?context-type
@@ skipping 288 matching lines @@
                                                 context-type 'Voice)
                                          (music 'ContextSpeccedMusic
                                                 context-id "shared"
                                                 context-type 'Voice)
                                          (music 'ContextSpeccedMusic
                                                 context-id "solo"
                                                 context-type 'Voice)
                                          (music 'ContextSpeccedMusic
                                                 context-id "null"
                                                 context-type 'NullVoice)
-                                         ?pc-music))))
+                                         ?pc-music
+                                         ?pc-marks))))
    (with-music-match
     (?pc-music (music 'PartCombineMusic))
     (format #f "~a" (music->lily-string ?pc-music)))))
 
 (define-display-method UnrelativableMusic (expr)
   (music->lily-string (ly:music-property expr 'element)))
 
 ;;; Cue notes
 (define-display-method QuoteMusic (expr)
   (or (with-music-match (expr (music
@@ skipping 94 matching lines @@
                                 (music->lily-string ?note-sequence)
                                 (new-line->lily-string)
                                 (parameterize ((*explicit-mode* #f)
                                                (*omit-duration* #t))
                                               (music->lily-string ?lyric-sequence)))
                         #f)))
 
 ;; Silence internal event sent at end of each lyrics block
 (define-display-method CompletizeExtenderEvent (expr)
   "")