Imported Upstream version 2.19.45

[lilypond.git] / ly / event-listener.ly

diff --git a/ly/event-listener.ly b/ly/event-listener.ly
index 9e5282de89d7ca33704a58fb592a62ec17c848e0..a2a39bc47ef742e8142bd86c2db447308ecee1d9 100644 (file)
--- 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
@@ -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)))
   }
 }