X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Fmusic-functions-init.ly;h=05ed471320d93d629567448e51ef7afe8a035df8;hb=d5c4d98d29e9bd22f3474700186219d38d5000f6;hp=fe8453536e4fd7b01ac7d68a936592060c63640b;hpb=2134d51fa820c56ac7d5b84038b5a071cbf17a53;p=lilypond.git

diff --git a/ly/music-functions-init.ly b/ly/music-functions-init.ly
index fe8453536e..05ed471320 100644
--- a/ly/music-functions-init.ly
+++ b/ly/music-functions-init.ly
@@ -1,16 +1,15 @@
 % -*-Scheme-*-
 
-\version "2.9.12"
+\version "2.10.0"
 
-%% need SRFI-1 filter 
 
-#(use-modules (srfi srfi-1))  
-%% FIXME: guile-1.7 required?
-%#(use-modules (scm display-lily))invalid module name for use-syntax ((srfi srfi-39))
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% this file is alphabetically sorted.
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-#(use-modules (scm display-lily))
-#(display-lily-init parser)
+%% need SRFI-1 filter 
 
+#(use-modules (srfi srfi-1))
 
 acciaccatura =
 #(def-grace-function startAcciaccaturaMusic stopAcciaccaturaMusic)
@@ -18,7 +17,7 @@ acciaccatura =
 addquote =
 #(define-music-function (parser location name music) (string? ly:music?)
    "Add a piece of music to be quoted "
-   (add-quotable name music)
+   (add-quotable parser name music)
    (make-music 'SequentialMusic 'void #t))
 
 
@@ -91,7 +90,7 @@ assertBeamSlope =
 
 autochange =
 #(define-music-function (parser location music) (ly:music?)
-               (make-autochange-music music))
+               (make-autochange-music parser music))
 
 applyContext =
 #(define-music-function (parser location proc) (procedure?)
@@ -99,6 +98,24 @@ applyContext =
                    'origin location
                    'procedure proc))
 
+
+balloonText =
+#(define-music-function (parser location offset text) (number-pair? markup?)
+   
+    (make-music 'AnnotateOutputEvent
+		'X-offset (car offset)
+		'Y-offset (cdr offset)
+		'text text))
+
+balloonGrobText =
+#(define-music-function (parser location grob-name offset text) (symbol? number-pair? markup?)
+   
+    (make-music 'AnnotateOutputEvent
+		'symbol grob-name
+		'X-offset (car offset)
+		'Y-offset (cdr offset)
+		'text text))
+
 bar =
 #(define-music-function (parser location type)
    (string?)
@@ -115,7 +132,7 @@ barNumberCheck =
 	       (lambda (c)
 		 (let*
 		     ((cbn (ly:context-property c 'currentBarNumber)))
-		   (if (not (= cbn n))
+		   (if (and  (number? cbn) (not (= cbn n)))
 		       (ly:input-message location "Barcheck failed got ~a expect ~a"
 					 cbn n))))))
 
@@ -160,16 +177,20 @@ cueDuring =
 	      'quoted-voice-direction dir
 	      'origin location))
 
+%% The following causes an error with guile 1.6.8 (guile 1.6.7 and 1.8.x are fine)
+#(use-modules (scm display-lily))
 
 displayLilyMusic =
 #(define-music-function (parser location music) (ly:music?)
-   (display-lily-music music)
+   (newline)
+   (display-lily-music music parser)
    music)
 
 displayMusic =
 #(define-music-function (parser location music) (ly:music?)
-		 (display-scheme-music music)
-		 music)
+   (newline)
+   (display-scheme-music music)
+   music)
 
 featherDurations=
 #(define-music-function (parser location factor argument) (ly:moment? ly:music?)
@@ -333,7 +354,8 @@ octave =
 	       ))
 partcombine =
 #(define-music-function (parser location part1 part2) (ly:music? ly:music?)
-                (make-part-combine-music (list part1 part2)))
+                (make-part-combine-music parser
+					 (list part1 part2)))
 
 	      
 pitchedTrill =
@@ -362,11 +384,6 @@ pitchedTrill =
 	   (display sec-note-events)))
 
      main-note))
-
-
-
-
-
    
 parenthesize =
 #(define-music-function (parser loc arg) (ly:music?)
@@ -375,6 +392,9 @@ parenthesize =
    (set! (ly:music-property arg 'parenthesize) #t)
    arg)
 
+%% for lambda*
+#(use-modules (ice-9 optargs))
+
 parallelMusic =
 #(define-music-function (parser location voice-ids music) (list? ly:music?)
   "Define parallel music sequences, separated by '|' (bar check signs),
@@ -385,6 +405,8 @@ and assign them to the identifiers provided in @var{voice-ids}.
 @var{music}: a music sequence, containing BarChecks as limiting expressions.
 
 Example:
+
+@verbatim
   \\parallelMusic #'(A B C) {
     c c | d d | e e |
     d d | e e | f f |
@@ -393,6 +415,7 @@ Example:
   A = { c c | d d | }
   B = { d d | e e | }
   C = { e e | f f | }
+@end verbatim
 "
   (let* ((voices (apply circular-list (make-list (length voice-ids) (list))))
          (current-voices voices)
@@ -444,7 +467,7 @@ Example:
               voices)
     ;;
     ;; check sequence length
-    (apply for-each (lambda (. seqs)
+    (apply for-each (lambda* (#:rest seqs)
                       (let ((moment-reference (ly:music-length (car seqs))))
                         (for-each (lambda (seq moment)
                                     (if (not (equal? moment moment-reference))
@@ -505,13 +528,60 @@ shiftDurations =
     (lambda (x)
       (shift-one-duration-log x dur dots)) arg))
 
-
-%% this is a stub. Write your own to suit the spacing tweak output.
 spacingTweaks =
 #(define-music-function (parser location parameters) (list?)
+   "Set the system stretch, by reading the 'system-stretch property of
+   the `parameters' assoc list."
+   #{
+      \overrideProperty #"Score.NonMusicalPaperColumn"
+        #'line-break-system-details
+        #$(list (cons 'alignment-extra-space (cdr (assoc 'system-stretch parameters))))
+   #})
+
+%% Parser used to read page-layout file, and then retreive score tweaks.
+#(define page-layout-parser #f)
+
+includePageLayoutFile = 
+#(define-music-function (parser location) ()
+   "If page breaks and tweak dump is not asked, and the file
+   <basename>-page-layout.ly exists, include it."
+   (if (not (ly:get-option 'dump-tweaks))
+       (let ((tweak-filename (format #f "~a-page-layout.ly"
+				     (ly:parser-output-name parser))))
+	 (if (access? tweak-filename R_OK)
+	     (begin
+	       (ly:message "Including tweak file ~a" tweak-filename)
+               (set! page-layout-parser (ly:parser-clone parser))
+	       (ly:parser-parse-string page-layout-parser
+                                       (format #f "\\include \"~a\""
+                                               tweak-filename))))))
    (make-music 'SequentialMusic 'void #t))
 
 
+rightHandFinger =
+#(define-music-function (parser location finger) (number-or-string?)
+   "Define a StrokeFingerEvent"
+   
+   (apply make-music
+	  (append
+	   (list 
+	    'StrokeFingerEvent
+	    'origin location)
+	   (if  (string? finger)
+		(list 'text finger)
+		(list 'digit finger)))))
+
+scoreTweak =
+#(define-music-function (parser location name) (string?)
+   "Include the score tweak, if exists."
+   (if (and page-layout-parser (not (ly:get-option 'dump-tweaks)))
+       (let ((tweak-music (ly:parser-lookup page-layout-parser
+                                            (string->symbol name))))
+         (if (ly:music? tweak-music)
+             tweak-music
+             (make-music 'SequentialMusic)))
+       (make-music 'SequentialMusic)))
+
 transposedCueDuring =
 #(define-music-function
   (parser location what dir pitch-note main-music)
@@ -540,9 +610,8 @@ transposition =
 
    (context-spec-music
     (make-property-set 'instrumentTransposition
-		       (ly:pitch-diff (ly:make-pitch 0 0 0) (pitch-of-note pitch-note)))
-        'Staff
-))
+		       (ly:pitch-negate (pitch-of-note pitch-note)))
+        'Staff))
 
 tweak = #(define-music-function (parser location sym val arg)
 	   (symbol? scheme? ly:music?)
@@ -571,3 +640,14 @@ tag = #(define-music-function (parser location tag arg)
 unfoldRepeats =
 #(define-music-function (parser location music) (ly:music?)
 		  (unfold-repeats music))
+
+
+
+withMusicProperty =
+#(define-music-function (parser location sym val music) (symbol? scheme? ly:music?)
+   "Set @var{sym} to @var{val} in @var{music}."
+
+   (set! (ly:music-property music sym) val)
+   music)
+
+