X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Fmusic-functions-init.ly;h=a7818e7e453a5d5cc2bc83205acf9363af992513;hb=ec6440458dcf6f119af6b71f0a54b43b5e97ebf3;hp=07802d74b20f186c3055452a383c3233f183498e;hpb=0886f6a00f3bfba9f42106119662d77e600e5c1b;p=lilypond.git

diff --git a/ly/music-functions-init.ly b/ly/music-functions-init.ly
index 07802d74b2..a7818e7e45 100644
--- a/ly/music-functions-init.ly
+++ b/ly/music-functions-init.ly
@@ -1,88 +1,467 @@
-\version "2.3.16"
+% -*-Scheme-*-
 
+\version "2.7.39"
 
-applymusic = #(def-music-function (location func music) (procedure? ly:music?)
+%% need SRFI-1 filter 
+
+#(use-modules (srfi srfi-1))  
+
+
+tweak = #(define-music-function (parser location sym val arg)
+	   (symbol? scheme? ly:music?)
+
+	   "Add @code{sym . val} to the @code{tweaks} property of @var{arg}."
+
+	   
+	   (set!
+	    (ly:music-property arg 'tweaks)
+	    (acons sym val
+		   (ly:music-property arg 'tweaks)))
+	   arg)
+
+tag = #(define-music-function (parser location tag arg)
+   (symbol? ly:music?)
+
+   "Add @var{tag} to the @code{tags} property of @var{arg}."
+
+   (set!
+    (ly:music-property arg 'tags)
+    (cons tag
+	  (ly:music-property arg 'tags)))
+   arg)
+
+clef =
+#(define-music-function (parser location type)
+   (string?)
+   
+   "Set the current clef."
+
+   (make-clef-set type))
+
+bar =
+#(define-music-function (parser location type)
+   (string?)
+   (context-spec-music
+    (make-property-set 'whichBar type)
+    'Timing))
+
+applyMusic =
+#(define-music-function (parser location func music) (procedure? ly:music?)
                (func music))
 
-oldaddlyrics = #(def-music-function (location music lyrics) (ly:music? ly:music?)
+oldaddlyrics =
+#(define-music-function (parser location music lyrics) (ly:music? ly:music?)
 
-              (make-music 'LyricCombineMusic 
+              (make-music 'OldLyricCombineMusic 
                           'origin location
                           'elements (list music lyrics)))
 
-grace = #(def-grace-function startGraceMusic stopGraceMusic)
-acciaccatura = #(def-grace-function startAcciaccaturaMusic stopAcciaccaturaMusic)
-appoggiatura = #(def-grace-function startAppoggiaturaMusic stopAppoggiaturaMusic)
+grace =
+#(def-grace-function startGraceMusic stopGraceMusic)
 
-partcombine = #(def-music-function (location part1 part2) (ly:music? ly:music?)
+acciaccatura =
+#(def-grace-function startAcciaccaturaMusic stopAcciaccaturaMusic)
+appoggiatura =
+#(def-grace-function startAppoggiaturaMusic stopAppoggiaturaMusic)
+
+partcombine =
+#(define-music-function (parser location part1 part2) (ly:music? ly:music?)
                 (make-part-combine-music (list part1 part2)))
 
-autochange = #(def-music-function (location music) (ly:music?)
+autochange =
+#(define-music-function (parser location music) (ly:music?)
                (make-autochange-music music))
 
-applycontext = #(def-music-function (location proc) (procedure?)
+applyContext =
+#(define-music-function (parser location proc) (procedure?)
                  (make-music 'ApplyContext 
                    'origin location
                    'procedure proc))
 
-displayMusic = #(def-music-function (location music) (ly:music?)
-		 (display-music music)
+shiftDurations =
+#(define-music-function (parser location dur dots arg) (integer? integer? ly:music?)
+   ""
+
+   
+   (music-map
+    (lambda (x)
+      (shift-one-duration-log x dur dots)) arg))
+
+musicMap =
+#(define-music-function (parser location proc mus) (procedure? ly:music?)
+	     (music-map proc mus))
+
+displayMusic =
+#(define-music-function (parser location music) (ly:music?)
+		 (display-scheme-music music)
 		 music)
-applyoutput = #(def-music-function (location proc) (procedure?)
+
+%% FIXME: guile-1.7 required?
+%#(use-modules (scm display-lily))invalid module name for use-syntax ((srfi srfi-39))
+
+#(use-modules (scm display-lily))
+#(display-lily-init parser)
+displayLilyMusic =
+#(define-music-function (parser location music) (ly:music?)
+   (display-lily-music music)
+   music)
+
+applyOutput =
+#(define-music-function (parser location proc) (procedure?)
                 (make-music 'ApplyOutputEvent 
                   'origin location
                   'procedure proc))
 
-breathe = #(def-music-function (location) ()
+overrideProperty =
+#(define-music-function (parser location name property value)
+   (string? symbol? scheme?)
+
+
+   "Set @var{property} to @var{value} in all grobs named @var{name}.
+The @var{name} argument is a string of the form @code{\"Context.GrobName\"}
+or @code{\"GrobName\"}"
+
+   (let*
+       ((name-components (string-split name #\.))
+	(context-name 'Bottom)
+	(grob-name #f))
+
+     (if (> 2 (length name-components))
+	 (set! grob-name (string->symbol (car name-components)))
+	 (begin
+	   (set! grob-name (string->symbol (list-ref name-components 1)))
+	   (set! context-name (string->symbol (list-ref name-components 0)))))
+
+     (context-spec-music
+      (make-music 'ApplyOutputEvent
+		  'origin location
+		  'procedure
+		  (lambda (grob orig-context context)
+		    (if (equal?
+			 (cdr (assoc 'name (ly:grob-property grob 'meta)))
+			 grob-name)
+			(set! (ly:grob-property grob property) value)
+			)))
+
+      context-name)))
+
+breathe =
+#(define-music-function (parser location) ()
             (make-music 'EventChord 
               'origin location
               'elements (list (make-music 'BreathingSignEvent))))
 
 
-unfoldrepeats = #(def-music-function (location music) (ly:music?)
+unfoldRepeats =
+#(define-music-function (parser location music) (ly:music?)
 		  (unfold-repeats music))
 
-compressmusic = #(def-music-function
-		  (location fraction music) (number-pair? ly:music?)
+compressMusic =
+#(define-music-function
+		  (parser location fraction music) (number-pair? ly:music?)
 		  (ly:music-compress music (ly:make-moment (car fraction) (cdr fraction))))
 
-makeClusters = #(def-music-function
-		(location arg) (ly:music?)
+makeClusters =
+#(define-music-function
+		(parser location arg) (ly:music?)
 		(music-map note-to-cluster arg))
 
 
 removeWithTag = 
-#(def-music-function
-  (location tag music) (symbol? ly:music?)
+#(define-music-function
+  (parser location tag music) (symbol? ly:music?)
   (music-filter
    (lambda (m)
     (let* ((tags (ly:music-property m 'tags))
-	    (res (memq tag tags)))
-       (not res)))))
+           (res (memq tag tags)))
+     (not res)))
+ music))
 	      
 keepWithTag =
-#(def-music-function
-  (location tag music) (symbol? ly:music?)
+#(define-music-function
+  (parser location tag music) (symbol? ly:music?)
   (music-filter
    (lambda (m)
     (let* ((tags (ly:music-property m 'tags))
-	   (res (memq tag tags)))
-       (or
-	(eq? tags '())
-	(memq tag tags))))
+           (res (memq tag tags)))
+     (or
+      (eq? tags '())
+      res)))
    music))
 
-%{
 
-TODO:
+%% Todo:
+%% doing
+%% define-music-function in a .scm causes crash.
+
+cueDuring = 
+#(define-music-function
+  (parser location what dir main-music)
+  (string? ly:dir? ly:music?)
+  (make-music 'QuoteMusic
+	      'element main-music 
+	      'quoted-context-type 'Voice
+	      'quoted-context-id "cue"
+	      'quoted-music-name what
+	      'quoted-voice-direction dir
+	      'origin location))
+
+
+quoteDuring = #
+(define-music-function
+  (parser location what main-music)
+  (string? ly:music?)
+  (make-music 'QuoteMusic
+	      'element main-music
+	      'quoted-music-name what
+	      'origin location))
+
+
+
+pitchedTrill =
+#(define-music-function
+   (parser location main-note secondary-note)
+   (ly:music? ly:music?)
+   (let*
+       ((get-notes (lambda (ev-chord)
+		     (filter
+		      (lambda (m) (eq? 'NoteEvent (ly:music-property m 'name)))
+		      (ly:music-property ev-chord 'elements))))
+	(sec-note-events (get-notes secondary-note))
+	(trill-events (filter (lambda (m) (memq 'trill-span-event (ly:music-property m 'types)))
+			      (ly:music-property main-note 'elements)))
+
+	(trill-pitch
+	 (if (pair? sec-note-events)
+	     (ly:music-property (car sec-note-events) 'pitch)
+	     )))
+     
+     (if (ly:pitch? trill-pitch)
+	 (for-each (lambda (m) (ly:music-set-property! m 'pitch trill-pitch))
+		   trill-events)
+	 (begin
+	   (ly:warning (_ "Second argument of \\pitchedTrill should be single note: "))
+	   (display sec-note-events)))
+
+     main-note))
+
+killCues =
+#(define-music-function
+   (parser location music)
+   (ly:music?)
+   (music-map
+    (lambda (mus)
+      (if (string? (ly:music-property mus 'quoted-music-name))
+	  (ly:music-property mus 'element)
+	  mus)) music))
+   
+
+afterGraceFraction =
+#(cons 6 8)
+
+afterGrace =
+#(define-music-function
+  (parser location main grace)
+  (ly:music? ly:music?)
+
+  (let*
+      ((main-length (ly:music-length main))
+       (fraction  (ly:parser-lookup parser 'afterGraceFraction)))
+    
+    (make-simultaneous-music
+     (list
+      main
+      (make-sequential-music
+       (list
+
+	(make-music 'SkipMusic
+		    'duration (ly:make-duration
+			       0 0
+			       (* (ly:moment-main-numerator main-length)
+				  (car fraction))
+			       (* (ly:moment-main-denominator main-length)
+				  (cdr fraction)) ))
+	(make-music 'GraceMusic
+		    'element grace)))))))
+
+
+barNumberCheck =
+#(define-music-function (parser location n) (integer?)
+   (make-music 'ApplyContext 
+	       'origin location
+	       'procedure 
+	       (lambda (c)
+		 (let*
+		     ((cbn (ly:context-property c 'currentBarNumber)))
+		   (if (not (= cbn n))
+		       (ly:input-message location "Barcheck failed got ~a expect ~a"
+					 cbn n))))))
+
+
+
+% for regression testing purposes.
+assertBeamQuant =
+#(define-music-function (parser location l r) (pair? pair?)
+  (make-grob-property-override 'Beam 'positions
+   (ly:make-simple-closure
+    (ly:make-simple-closure
+     (append
+      (list chain-grob-member-functions `(,cons 0 0))
+      (check-quant-callbacks l r))))))
+    
+% for regression testing purposes.
+assertBeamSlope =
+#(define-music-function (parser location comp) (procedure?)
+  (make-grob-property-override 'Beam 'positions
+   (ly:make-simple-closure
+    (ly:make-simple-closure
+     (append
+      (list chain-grob-member-functions `(,cons 0 0))
+      (check-slope-callbacks comp))))))
+
+
+parallelMusic =
+#(define-music-function (parser location voice-ids music) (list? ly:music?)
+  "Define parallel music sequences, separated by '|' (bar check signs),
+and assign them to the identifiers provided in @var{voice-ids}.
+
+@var{voice-ids}: a list of music identifiers (symbols containing only letters)
+
+@var{music}: a music sequence, containing BarChecks as limiting expressions.
+
+Example:
+  \\parallelMusic #'(A B C) {
+    c c | d d | e e |
+    d d | e e | f f |
+  }
+<==>
+  A = { c c | d d | }
+  B = { d d | e e | }
+  C = { e e | f f | }
+"
+  (let* ((voices (apply circular-list (make-list (length voice-ids) (list))))
+         (current-voices voices)
+         (current-sequence (list)))
+    ;;
+    ;; utilities
+    (define (push-music m)
+      "Push the music expression into the current sequence"
+      (set! current-sequence (cons m current-sequence)))
+    (define (change-voice)
+      "Stores the previously built sequence into the current voice and
+       change to the following voice."
+      (list-set! current-voices 0 (cons (make-music 'SequentialMusic 
+                                         'elements (reverse! current-sequence))
+                                        (car current-voices)))
+      (set! current-sequence (list))
+      (set! current-voices (cdr current-voices)))
+    (define (bar-check? m)
+      "Checks whether m is a bar check."
+      (eq? (ly:music-property m 'name) 'BarCheck))
+    (define (music-origin music)
+      "Recursively search an origin location stored in music."
+      (cond ((null? music) #f)
+            ((not (null? (ly:music-property music 'origin)))
+             (ly:music-property music 'origin))
+            (else (or (music-origin (ly:music-property music 'element))
+                      (let ((origins (remove not (map music-origin 
+                                                      (ly:music-property music 'elements)))))
+                        (and (not (null? origins)) (car origins)))))))
+    ;;
+    ;; first, split the music and fill in voices
+    (map-in-order (lambda (m)
+                    (push-music m)
+                    (if (bar-check? m) (change-voice)))
+                  (ly:music-property music 'elements))
+    (if (not (null? current-sequence)) (change-voice))
+    ;; un-circularize `voices' and reorder the voices
+    (set! voices (map-in-order (lambda (dummy seqs)
+                                 (reverse! seqs))
+                               voice-ids voices))
+    ;;
+    ;; set origin location of each sequence in each voice
+    ;; for better type error tracking
+    (for-each (lambda (voice)
+                (for-each (lambda (seq)
+                            (set! (ly:music-property seq 'origin)
+                                  (or (music-origin seq) location)))
+                          voice))
+              voices)
+    ;;
+    ;; check sequence length
+    (apply for-each (lambda (. seqs)
+                      (let ((moment-reference (ly:music-length (car seqs))))
+                        (for-each (lambda (seq moment)
+                                    (if (not (equal? moment moment-reference))
+                                        (ly:music-message seq 
+                                         "Bars in parallel music don't have the same length")))
+                          seqs (map-in-order ly:music-length seqs))))
+           voices)
+   ;;
+   ;; bind voice identifiers to the voices
+   (map (lambda (voice-id voice)
+          (ly:parser-define! parser voice-id 
+                             (make-music 'SequentialMusic 
+                               'origin location
+                               'elements voice)))
+        voice-ids voices))
+ ;; Return an empty sequence. this function is actually a "void" function.
+ (make-music 'SequentialMusic 'void #t))
+
+
+
+
+%% this is a stub. Write your own to suit the spacing tweak output.
+spacingTweaks =
+#(define-music-function (parser location parameters) (list?)
+   (make-music 'SequentialMusic 'void #t))
+
+octave =
+#(define-music-function (parser location pitch-note) (ly:music?)
+   "octave check"
+
+   (make-music 'RelativeOctaveCheck
+	       'origin location
+	       'pitch (pitch-of-note pitch-note) 
+	       ))
+
+addquote =
+#(define-music-function (parser location name music) (string? ly:music?)
+   "Add a piece of music to be quoted "
+   (add-quotable name music)
+   (make-music 'SequentialMusic 'void #t))
+
+   
+parenthesize =
+#(define-music-function (parser loc arg) (ly:music?)
+   "Tag @var{arg} to be parenthesized."
+
+   (set! (ly:music-property arg 'parenthesize) #t)
+   arg)
+
 
-remove these from the parser, and softcode here:
+featherDurations=
+#(define-music-function (parser location factor argument) (ly:moment? ly:music?)
+   (let*
+       ((orig-duration (ly:music-length argument))
+	(multiplier (ly:make-moment 1 1))
+	)
 
- * \tag
+     (music-map 
+      (lambda (mus)
+	(if (and (eq? (ly:music-property mus 'name) 'EventChord)
+		 (< 0 (ly:moment-main-denominator (ly:music-length mus))))
+	    (begin
+	      (ly:music-compress mus multiplier)
+	      (set! multiplier (ly:moment-mul factor multiplier)))
+	    )
+	mus)
+      argument)
 
-with small syntax changes, we could also do
+     (display (list (ly:music-length argument) orig-duration))
+     (ly:music-compress
+      argument
+      (ly:moment-div orig-duration (ly:music-length argument)))
 
- * \bar
- *  ?
+     argument))
 
-%}