Issue 5167/6: Changes: show \markup xxx = ... \etc assignments

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

diff --git a/ly/event-listener.ly b/ly/event-listener.ly
index 6c0f75970e708e370195b8934801074c507f77a3..4627aaa23c2760d87e096a2227aa85426f741f9d 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.
 %%%%
 %%%% 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
 %%%%
 %%%% LilyPond is free software: you can redistribute it and/or modify
 %%%% it under the terms of the GNU General Public License as published by


@@ -40,7 +40,7 @@
    "Constructs a filename in the form
 @file{@var{original_filename}-@var{staff_instrument_name}.notes} if the
 staff has an instrument name.  If the staff has no instrument
    "Constructs a filename in the form
 @file{@var{original_filename}-@var{staff_instrument_name}.notes} if the
 staff has an instrument name.  If the staff has no instrument

-name, it uses "unnamed-staff" for that part of the filename."
+name, it uses \"unnamed-staff\" for that part of the filename."

    (let* ((inst-name (ly:context-property context 'instrumentName)))
      (string-concatenate (list
                           (substring (object->string (command-line))
    (let* ((inst-name (ly:context-property context 'instrumentName)))
      (string-concatenate (list
                           (substring (object->string (command-line))


@@ -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
 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
        (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))
 #(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
           (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
   \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)))

   }
 }
   }
 }