X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=scm%2Fmusic-functions.scm;h=189f960ff696a9cc81babab737149e59af3c76be;hb=fe8aacbb90f6b230f5712396c205d097338f5def;hp=ff0e768c0a0e4a9f74a6e2635661b3179e19e1bc;hpb=c4c0ba811cd526f047de3f4d3c77abcc32a3e076;p=lilypond.git

diff --git a/scm/music-functions.scm b/scm/music-functions.scm
index ff0e768c0a..189f960ff6 100644
--- 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)))
@@ -419,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)))))
@@ -526,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)
@@ -742,7 +745,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 +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)))
     
@@ -839,23 +845,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