Merge branch 'master' into translation

[lilypond.git] / input / regression / scheme-text-spanner.ly

diff --git a/input/regression/scheme-text-spanner.ly b/input/regression/scheme-text-spanner.ly
index 1e7598b25b5089c8cbeca1427d025b98c98f80ed..309fdd6926cbe9a0463f88b9646fa0528aa3a8fe 100644 (file)
--- a/input/regression/scheme-text-spanner.ly
+++ b/input/regression/scheme-text-spanner.ly
@@ -6,27 +6,7 @@ and grob creation methods to create a fully functional text spanner
 in scheme."
 }
 
-#(define my-grob-descriptions '())
-
-#(define my-event-classes (ly:make-context-mod))
-
-defineEventClass =
-#(define-void-function (parser location class parent)
-   (symbol? symbol?)
-   (ly:add-context-mod
-    my-event-classes
-    `(apply
-      ,(lambda (context class parent)
-        (ly:context-set-property!
-         context
-         'EventClasses
-         (event-class-cons
-          class
-          parent
-          (ly:context-property context 'EventClasses '()))))
-      ,class ,parent)))
-
-\defineEventClass #'scheme-text-span-event #'span-event
+#(define-event-class 'scheme-text-span-event 'span-event)
 
 #(define (add-grob-definition grob-name grob-entry)
    (let* ((meta-entry   (assoc-get 'meta grob-entry))
@@ -49,9 +29,9 @@ defineEventClass =
      (set! meta-entry (assoc-set! meta-entry 'interfaces
                                   ifaces-entry))
      (set! grob-entry (assoc-set! grob-entry 'meta meta-entry))
-     (set! my-grob-descriptions
+     (set! all-grob-descriptions
            (cons (cons grob-name grob-entry)
-                 my-grob-descriptions))))
+                 all-grob-descriptions))))
 
 #(add-grob-definition
   'SchemeTextSpanner
@@ -126,7 +106,7 @@ start and stop.")
          grob
          (if (eq? axis X)
              ly:side-position-interface::x-aligned-side
-             ly:side-position-interface::y-aligned-side)
+             side-position-interface::y-aligned-side)
          (axis-offset-symbol axis)))))
 
 schemeTextSpannerEngraver =
@@ -197,8 +177,7 @@ schemeTextSpannerEnd =
 \layout {
   \context {
     \Global
-    \grobdescriptions #my-grob-descriptions
-    #my-event-classes
+    \grobdescriptions #all-grob-descriptions
   }
   \context {
     \Voice