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

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

diff --git a/scm/music-functions.scm b/scm/music-functions.scm
index ff0e768c0a0e4a9f74a6e2635661b3179e19e1bc..54b363bdd9ed5c5ff76e88bf06f3e337dd572fe0 100644 (file)
--- a/scm/music-functions.scm
+++ b/scm/music-functions.scm
@@ -3,7 +3,7 @@
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;; 
 ;;;; (c) 1998--2006 Jan Nieuwenhuizen <janneke@gnu.org>
-;;;;                 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+;;;;                 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 ;; (use-modules (ice-9 optargs)) 
 
@@ -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))
@@ -112,9 +113,11 @@ For instance,
          (else                                  ;; scheme arg
           arg)))
   (define (inner-markup->make-markup mrkup)
-    (let ((cmd (proc->command-keyword (car mrkup)))
-         (args (map transform-arg (cdr mrkup))))
-      `(,cmd ,@args)))
+    (if (string? mrkup)
+       `(#:simple ,mrkup)
+       (let ((cmd (proc->command-keyword (car mrkup)))
+             (args (map transform-arg (cdr mrkup))))
+         `(,cmd ,@args))))
   ;; body:
   (if (string? markup-expression)
       markup-expression
@@ -207,7 +210,7 @@ Returns `obj'.
   "create a repeat music expression, with all properties initialized properly"
   (let ((talts (if (< times (length alts))
                   (begin
-                    (ly:warning (_ "More alternatives than repeats. Junking excess alternatives"))
+                    (ly:warning (_ "More alternatives than repeats.  Junking excess alternatives"))
                     (take alts times))
                   alts))
        (r (make-repeated-music name)))
@@ -225,10 +228,15 @@ Returns `obj'.
          (if (memq 'sequential-music (ly:music-property main 'types))
              ;; \repeat "tremolo" { c4 d4 }
              (let ((children (length (ly:music-property main 'elements))))
-               (if (not (= children 2))
+
+               ;; fixme: should be more generic.
+               (if (and (not (= children 2))
+                        (not (= children 1)))
                    (ly:warning (_ "expecting 2 elements for chord tremolo, found ~a") children))
                (ly:music-compress r (ly:make-moment 1 children))
-               (shift-duration-log r (1- shift) dots))
+               (shift-duration-log r
+                                   (if (= children 2)  (1- shift) shift)
+                                   dots))
              ;; \repeat "tremolo" c4
              (shift-duration-log r shift dots)))
        r)))
@@ -419,8 +427,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)))))
@@ -526,7 +534,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)
@@ -742,7 +750,7 @@ Syntax:
              (set! (ly:music-property music 'quoted-events) quoted-vector)
              (set! (ly:music-property music 'iterator-ctor)
                    ly:quote-iterator::constructor))
-           (ly:warning (_ "can't find quoted music `~S'" quoted-name))))
+           (ly:warning (_ "cannot find quoted music: `~S'") quoted-name)))
     music))
 
 
@@ -798,12 +806,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)))
     
@@ -839,23 +850,6 @@ if appropriate.
   (music-map apply-duration lyric-music))
 
 
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-
-(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