Merge branch 'jneeman' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond into jneeman

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

diff --git a/scm/music-functions.scm b/scm/music-functions.scm
index 6cc25eefbe6262a49ec6ed58351c025031c39510..7b0d5d0658aead0f69b1da9ad422f46647cce5a3 100644 (file)
--- a/scm/music-functions.scm
+++ b/scm/music-functions.scm
@@ -74,6 +74,7 @@ First it recurses over the children, then the function is applied to MUSIC.
 
 (define-public (display-music music)
   "Display music, not done with music-map for clarity of presentation."
+
   (display music)
   (display ": { ")  
   (let ((es (ly:music-property music 'elements))
@@ -421,8 +422,8 @@ OTTAVATION to `8va', or whatever appropriate."
                     (string (cdr (assoc octavation '((2 . "15ma")
                                                      (1 . "8va")
                                                      (0 . #f)
-                                                     (-1 . "8va bassa")
-                                                     (-2 . "15ma bassa"))))))
+                                                     (-1 . "8vb")
+                                                     (-2 . "15mb"))))))
                (ly:context-set-property! context 'middleCPosition new-c0)
                (ly:context-set-property! context 'originalCentralCPosition c0)
                (ly:context-set-property! context 'ottavation string)))))
@@ -528,7 +529,7 @@ of beat groupings "
   "Split the parts of a chord into different Voices using separator"
   (let ((es (ly:music-property ch 'elements)))
     (set! (ly:music-property  ch 'elements)
-         (voicify-list (split-list es music-separator?) 0))
+         (voicify-list (split-list-by-separator es music-separator?) 0))
     ch))
 
 (define-public (voicify-music m)
@@ -800,12 +801,15 @@ if appropriate.
           (list
            (make-sequential-music
             (list
-             (context-spec-music (make-property-set 'skipTypesetting #t) 'Score)
+             (context-spec-music (make-property-set 'skipTypesetting #t)
+                                 'Score)
              (make-music 'SkipMusic 'duration
-                         (ly:make-duration 0 0
-                                           (ly:moment-main-numerator skip-length)
-                                           (ly:moment-main-denominator skip-length)))
-             (context-spec-music (make-property-set 'skipTypesetting #f) 'Score)))
+                         (ly:make-duration
+                          0 0
+                          (ly:moment-main-numerator skip-length)
+                          (ly:moment-main-denominator skip-length)))
+             (context-spec-music (make-property-set 'skipTypesetting #f)
+                                 'Score)))
            music)))
        music)))
     
@@ -841,24 +845,6 @@ if appropriate.
   (music-map apply-duration lyric-music))
 
 
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-
-;; FIXME: update to the new balloon interface
-(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))
-        (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
-         (ly:grob-set-property! grob 'stencil  ly: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)))))))
-
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; accidentals