X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Fevent-listener.ly;h=a2a39bc47ef742e8142bd86c2db447308ecee1d9;hb=2b0c08ab8c66bc639a05563866d735a2ea42d809;hp=899d0825a3c9531a188a2079c355b24587edf253;hpb=5c0b029a7aba0dbed2c46d77bcc32c0dca54df49;p=lilypond.git

diff --git a/ly/event-listener.ly b/ly/event-listener.ly
index 899d0825a3..a2a39bc47e 100644
--- a/ly/event-listener.ly
+++ b/ly/event-listener.ly
@@ -1,6 +1,6 @@
 %%%% This file is part of LilyPond, the GNU music typesetter.
 %%%%
-%%%% Copyright (C) 2011--2012 Graham Percival <graham@percival-music.ca>
+%%%% Copyright (C) 2011--2015 Graham Percival <graham@percival-music.ca>
 %%%%
 %%%% LilyPond is free software: you can redistribute it and/or modify
 %%%% it under the terms of the GNU General Public License as published by
@@ -32,7 +32,7 @@
 
 
 
-\version "2.15.31"
+\version "2.16.0"
 
 %%%% Helper functions
 
@@ -66,7 +66,7 @@ program using the output of this function to interpret grace notes
 however they want (half duration, quarter duration?  before beat,
 after beat?  etc.)."
    (if
-       (eq? 0 (ly:moment-grace-numerator moment))
+       (zero? (ly:moment-grace-numerator moment))
        (ly:format "~a" (format-moment moment))
        ;; grace notes have a negative numerator, so no "-" necessary
        (ly:format
@@ -192,8 +192,8 @@ as an engraver for convenience."
 #(define (format-textspan engraver event)
    (let* ((context (ly:translator-context engraver))
           (moment (ly:context-current-moment context))
-          (spanner-props (ly:context-property context 'TextSpanner))
-          (details (chain-assoc-get 'bound-details spanner-props))
+          (spanner-props (ly:context-grob-definition context 'TextSpanner))
+          (details (assoc-get 'bound-details spanner-props))
           (left-props (assoc-get 'left details '()))
           (left-text (assoc-get 'text left-props '())))
      (print-line engraver
@@ -211,18 +211,18 @@ as an engraver for convenience."
   \Voice
   \consists #(make-engraver
               (listeners
-	       (tempo-change-event . format-tempo)
-	       (rest-event . format-rest)
-	       (note-event . format-note)
-	       (articulation-event . format-articulation)
-	       (text-script-event . format-text)
-	       (slur-event . format-slur)
-	       (breathing-event . format-breathe)
-	       (dynamic-event . format-dynamic)
-	       (crescendo-event . format-cresc)
-	       (decrescendo-event . format-decresc)
-	       (text-span-event . format-textspan)
-	       (glissando-event . format-glissando)
-	       (tie-event . format-tie)))
+               (tempo-change-event . format-tempo)
+               (rest-event . format-rest)
+               (note-event . format-note)
+               (articulation-event . format-articulation)
+               (text-script-event . format-text)
+               (slur-event . format-slur)
+               (breathing-event . format-breathe)
+               (dynamic-event . format-dynamic)
+               (crescendo-event . format-cresc)
+               (decrescendo-event . format-decresc)
+               (text-span-event . format-textspan)
+               (glissando-event . format-glissando)
+               (tie-event . format-tie)))
   }
 }