Merge with master

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

diff --git a/scm/music-functions.scm b/scm/music-functions.scm
index 69dd59e68ea7fdaae20708ffe7efec98fc4e945d..21617676ad71f64fef61530ba42116bb9c63e3d0 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))
@@ -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)))
@@ -407,23 +415,26 @@ i.e.  this is not an override"
 old middleCPosition, add OCTAVATION to middleCPosition, and set
 OTTAVATION to `8va', or whatever appropriate."     
       (if (number? (ly:context-property         context 'middleCPosition))
-         (if (= octavation 0)
-             (let ((where (ly:context-property-where-defined context 'middleCPosition))
-                   (oc0 (ly:context-property context 'originalCentralCPosition)))
-               (ly:context-set-property! context 'middleCPosition oc0)
-               (ly:context-unset-property where 'originalCentralCPosition)
-               (ly:context-unset-property where 'ottavation))
-             (let* ((where (ly:context-property-where-defined context 'middleCPosition))
-                    (c0 (ly:context-property context 'middleCPosition))
-                    (new-c0 (+ c0 (* -7 octavation)))
-                    (string (cdr (assoc octavation '((2 . "15ma")
-                                                     (1 . "8va")
-                                                     (0 . #f)
-                                                     (-1 . "8va bassa")
-                                                     (-2 . "15ma bassa"))))))
-               (ly:context-set-property! context 'middleCPosition new-c0)
-               (ly:context-set-property! context 'originalCentralCPosition c0)
-               (ly:context-set-property! context 'ottavation string)))))
+         (begin
+           (if (number? (ly:context-property context 'originalMiddleCPosition))
+               (let ((where (ly:context-property-where-defined context 'middleCPosition)))
+                 
+                 (ly:context-set-property! context 'middleCPosition
+                                           (ly:context-property context 'originalMiddleCPosition))
+                 (ly:context-unset-property where 'originalMiddleCPosition)
+                 (ly:context-unset-property where 'ottavation)))
+ot         
+           (let* ((where (ly:context-property-where-defined context 'middleCPosition))
+                  (c0 (ly:context-property context 'middleCPosition))
+                  (new-c0 (+ c0 (* -7 octavation)))
+                  (string (cdr (assoc octavation '((2 . "15ma")
+                                                   (1 . "8va")
+                                                   (0 . #f)
+                                                   (-1 . "8vb")
+                                                   (-2 . "15mb"))))))
+             (ly:context-set-property! context 'middleCPosition new-c0)
+             (ly:context-set-property! context 'originalMiddleCPosition c0)
+             (ly:context-set-property! context 'ottavation string)))))
     (set! (ly:music-property m 'procedure) ottava-modify)
     (context-spec-music m 'Staff)))
 
@@ -488,9 +499,9 @@ of beat groupings "
              'duration duration
              'text string))
 
-(define-safe-public (make-span-event type spandir)
+(define-safe-public (make-span-event type span-dir)
   (make-music type
-             'span-direction spandir))
+             'span-direction span-dir))
 
 (define-public (set-mus-properties! m alist)
   "Set all of ALIST as properties of M." 
@@ -526,7 +537,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 +753,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 +809,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)))