(class Score): remove texts_ member.

[lilypond.git] / scm / music-functions.scm

diff --git a/scm/music-functions.scm b/scm/music-functions.scm
index 2fe0bc373a8bee6feac641d30e68aa369c9c9315..88c02025e2ada547e01a579d05981289eebc5ba7 100644 (file)
--- a/scm/music-functions.scm
+++ b/scm/music-functions.scm
@@ -16,10 +16,16 @@
   (make-procedure-with-setter ly:music-property
                              ly:music-set-property!))
 
+
+;; TODO move this
 (define-public ly:grob-property
   (make-procedure-with-setter ly:grob-property
                              ly:grob-set-property!))
 
+(define-public ly:paper-system-property
+  (make-procedure-with-setter ly:paper-system-property
+                             ly:paper-system-set-property!))
+
 (define-public (music-map function music)
   "Apply @var{function} to @var{music} and all of the music it contains.
 
@@ -274,7 +280,7 @@ i.e.  this is not an override"
 
 (define-public (make-grob-property-revert grob gprop)
   "Revert the grob property GPROP for GROB."
-  (make-music 'OverrideProperty
+  (make-music 'RevertProperty
              'symbol grob
              'grob-property gprop))
 
@@ -802,12 +808,13 @@ if appropriate.
 (define-public ((add-balloon-text object-name text off) grob orig-context cur-context)
   "Usage: see input/regression/balloon.ly "
   (let* ((meta (ly:grob-property grob 'meta))
-        (nm (if (pair? meta) (cdr (assoc 'name meta)) "nonexistant"))
-        (cb (ly:grob-property grob 'print-function)))
-    (if (equal? nm object-name)
+        (cb (ly:grob-property-data grob 'stencil))
+        (nm (if (pair? meta) (cdr (assoc 'name meta)) "nonexistant")))
+    (if (and (equal? nm object-name)
+            (procedure? cb))
        (begin
-         (set! (ly:grob-property grob 'print-function) Balloon_interface::print)
-         (set! (ly:grob-property grob 'balloon-original-callback) cb)
+         (ly:grob-set-property! grob 'stencil  Balloon_interface::print)
+         (set! (ly:grob-property grob 'original-stencil) cb)
          (set! (ly:grob-property grob 'balloon-text) text)
          (set! (ly:grob-property grob 'balloon-text-offset) off)
          (set! (ly:grob-property grob 'balloon-text-props) '((font-family . roman)))))))