X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fmusic-functions.scm;h=4f4152a2750c4b31c6ae7940796d95e47af8deab;hb=2ceb589a4aa3060867116d8fc130fa994dc7e43a;hp=7bf9198c255166ad5a998b2cfb9efdf0c98989d2;hpb=05fabaaf86fd44f9bd903f282bb98d343a991e40;p=lilypond.git

diff --git a/scm/music-functions.scm b/scm/music-functions.scm
index 7bf9198c25..4f4152a275 100644
--- a/scm/music-functions.scm
+++ b/scm/music-functions.scm
@@ -1,90 +1,83 @@
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;;; music-functions.scm --
+;;;;
+;;;;  source file of the GNU LilyPond music typesetter
+;;;; 
+;;;; (c)  1998--2004 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;;                 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+
+;; (use-modules (ice-9 optargs)) 
+
+;;; ly:music-property with setter
+;;; (ly:music-property my-music 'elements)
+;;;   ==> the 'elements property
+;;; (set! (ly:music-property my-music 'elements) value)
+;;;   ==> set the 'elements property and return it
+(define-public ly:music-property
+  (make-procedure-with-setter ly:music-property
+			      ly:music-set-property!))
+
+(define-public ly:grob-property
+  (make-procedure-with-setter ly:grob-property
+			      ly:grob-set-property!))
 
 (define-public (music-map function music)
   "Apply @var{function} to @var{music} and all of the music it contains. "
-  (let* ((es (ly:get-mus-property music 'elements))
-         (e (ly:get-mus-property music 'element))
-	 )
-
-    (ly:set-mus-property! music 'elements 
-	(map (lambda (y) (music-map  function y)) es))
-	(if (ly:music? e)
-	    (ly:set-mus-property! music 'element (music-map function  e)))
-	(function music)
-	))
+  (let ((es (ly:music-property music 'elements))
+	(e (ly:music-property music 'element)))
+    (set! (ly:music-property music 'elements) 
+	  (map (lambda (y) (music-map function y)) es))
+    (if (ly:music? e)
+	(set! (ly:music-property music 'element)
+	      (music-map function  e)))
+    (function music)))
 
 (define-public (music-filter pred? music)
   "Filter out music expressions that do not satisfy PRED."
   
   (define (inner-music-filter pred? music)
     "Recursive function."
-    (let* ((es (ly:get-mus-property music 'elements))
-	   (e (ly:get-mus-property music 'element))
-	   (as (ly:get-mus-property music 'articulations))
+    (let* ((es (ly:music-property music 'elements))
+	   (e (ly:music-property music 'element))
+	   (as (ly:music-property music 'articulations))
 	   (filtered-as (filter ly:music? (map (lambda (y) (inner-music-filter pred? y)) as)))
 	   (filtered-e (if (ly:music? e)
 			   (inner-music-filter pred? e)
 			   e))
-	   (filtered-es (filter ly:music? (map (lambda (y) (inner-music-filter pred? y)) es)))
-	   )
-
-      (ly:set-mus-property! music 'element filtered-e)
-      (ly:set-mus-property! music 'elements filtered-es)
-      (ly:set-mus-property! music 'articulations filtered-as)
-
+	   (filtered-es (filter ly:music? (map (lambda (y) (inner-music-filter pred? y)) es))))
+      (set! (ly:music-property music 'element) filtered-e)
+      (set! (ly:music-property music 'elements) filtered-es)
+      (set! (ly:music-property music 'articulations) filtered-as)
       ;; if filtering emptied the expression, we remove it completely.
-      (if (or (pred? music)
+      (if (or (not (pred? music))
 	      (and (eq? filtered-es '()) (not (ly:music? e))
 		   (or (not (eq? es '()))
 		       (ly:music? e))))
 	  (set! music '()))
-      
       music))
 
   (set! music (inner-music-filter pred? music))
   (if (ly:music? music)
       music
-      (make-music-by-name 'Music)	;must return music.
-      ))
+      (make-music 'Music)))	  ;must return music.
 
-(define-public (remove-tag tag)
-  (lambda (mus)
-    (music-filter
-     (lambda (m)
-       (let* ((tags (ly:get-mus-property m 'tags))
-	      (res (memq tag tags)))
-       res)) mus)))
 
 (define-public (display-music music)
   "Display music, not done with music-map for clarity of presentation."
   (display music)
-  (display ": { ")
-  
-  (let* ((es (ly:get-mus-property music 'elements))
-         (e (ly:get-mus-property music 'element))
-	 )
-
-    (display (ly:get-mutable-properties music))
-
-    (if (pair?  es)
+  (display ": { ")  
+  (let ((es (ly:music-property music 'elements))
+	(e (ly:music-property music 'element)))
+    (display (ly:music-mutable-properties music))
+    (if (pair? es)
 	(begin (display "\nElements: {\n")
 	       (map display-music es)
-	       (display "}\n")
-	))
-    
-    
+	       (display "}\n")))
     (if (ly:music? e)
 	(begin
 	  (display "\nChild:")
-	  (display-music e)
-	  )
-	)
-    )
+	  (display-music e))))
   (display " }\n")
-  music
-  )
-
-
+  music)
 
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -93,22 +86,14 @@
   "  add SHIFT to ly:duration-log and optionally 
   a dot to any note encountered. This scales the music up by a factor 
   2^shift * (2 - (1/2)^dot)"
-
-  (let*
-      (
-       (d (ly:get-mus-property music 'duration))
-       )
+  (let ((d (ly:music-property music 'duration)))
     (if (ly:duration? d)
-	(let* (
-	       (cp (ly:duration-factor d))
+	(let* ((cp (ly:duration-factor d))
 	       (nd (ly:make-duration (+ shift (ly:duration-log d))
 				     (+ dot (ly:duration-dot-count d))
 				     (car cp)
-				     (cdr cp)))
-	       
-	       )
-	  (ly:set-mus-property! music 'duration nd)
-	  ))
+				     (cdr cp))))
+	  (set! (ly:music-property music 'duration) nd)))
     music))
 
 
@@ -123,12 +108,10 @@
 
 (define-public (note-to-cluster music)
   "Replace NoteEvents by ClusterNoteEvents."
-  (if (eq? (ly:get-mus-property music 'name) 'NoteEvent)
-      (let* ((cn (make-music-by-name 'ClusterNoteEvent)))
-
-	     (ly:set-mus-property! cn 'pitch (ly:get-mus-property music 'pitch))
-	     (ly:set-mus-property! cn 'duration (ly:get-mus-property music 'duration))
-	     cn)
+  (if (eq? (ly:music-property music 'name) 'NoteEvent)
+      (make-music 'ClusterNoteEvent
+		  'pitch (ly:music-property music 'pitch)
+		  'duration (ly:music-property music 'duration))
       music))
 
 (define-public (notes-to-clusters music)
@@ -138,37 +121,48 @@
 ;; repeats.
 
 (define-public (unfold-repeats music)
-"
-This function replaces all repeats  with unfold repeats. It was 
-written by Rune Zedeler. "
-  (let* ((es (ly:get-mus-property music 'elements))
-         (e (ly:get-mus-property music 'element))
-         (n  (ly:music-name music)))
- 
+  "
+This function replaces all repeats  with unfold repeats. "
+  
+  (let ((es (ly:music-property music 'elements))
+	(e  (ly:music-property music 'element))
+	(n  (ly:music-name music)))
     (if (equal? n "Repeated_music")
-        (begin
-	  (if (equal?
-	       (ly:get-mus-property music 'iterator-ctor)
-	       Chord_tremolo_iterator::constructor)
-	      (shift-duration-log music  (ly:intlog2 (ly:get-mus-property music 'repeat-count)) 0)
-	      )
-          (ly:set-mus-property!
-           music 'length Repeated_music::unfolded_music_length)
-	  (ly:set-mus-property!
-	   music 'start-moment-function Repeated_music::first_start)
-          (ly:set-mus-property!
-           music 'iterator-ctor Unfolded_repeat_iterator::constructor)))
-
+	(begin
+	  
+	  (if (equal? (ly:music-property music 'iterator-ctor)
+		      Chord_tremolo_iterator::constructor)
+	      (let*
+		  ((seq-arg? (memq 'sequential-music
+				   (ly:music-property e 'types)))
+		   (count  (ly:music-property music 'repeat-count))
+		   (dot-shift (if (= 0 (remainder count 3))
+				  -1 0))
+		   )
+
+		(if (= 0 -1)
+		    (set! count (* 2 (quotient count 3))))
+		
+		(shift-duration-log music (+ (if seq-arg? 1 0)
+					     (ly:intlog2 count)) dot-shift)
+		
+		(if seq-arg?
+		    (ly:music-compress e (ly:make-moment (length (ly:music-property e 'elements)) 1)))
+		))
+	  
+	  (set! (ly:music-property music 'length)
+		Repeated_music::unfolded_music_length)
+	  (set! (ly:music-property music 'start-moment-function)
+		Repeated_music::first_start)
+	  (set! (ly:music-property music 'iterator-ctor)
+		Unfolded_repeat_iterator::constructor)))
+    
     (if (pair? es)
-        (ly:set-mus-property!
-         music 'elements
-         (map unfold-repeats es)))
-
+	(set! (ly:music-property music 'elements)
+	      (map unfold-repeats es)))
     (if (ly:music? e)
-        (ly:set-mus-property!
-         music 'element
-         (unfold-repeats e)))
-
+	(set! (ly:music-property music 'element)
+	      (unfold-repeats e)))
     music))
 
 
@@ -176,328 +170,231 @@ written by Rune Zedeler. "
 ;; property setting music objs.
 
 (define-public (make-grob-property-set grob gprop val)
-
   "Make a Music expression that sets GPROP to VAL in GROB. Does a pop first,
 i.e.  this is not an override"
-  
-   (let* ((m (make-music-by-name  'OverrideProperty)))
-     (ly:set-mus-property! m 'symbol grob)
-     (ly:set-mus-property! m 'grob-property gprop)
-     (ly:set-mus-property! m 'grob-value val)
-     (ly:set-mus-property! m 'pop-first #t)
-		
-     m
-   
-   ))
-(define-public (make-grob-property-override grob gprop val)
+  (make-music 'OverrideProperty
+	      'symbol grob
+	      'grob-property gprop
+	      'grob-value val
+	      'pop-first #t))
 
+(define-public (make-grob-property-override grob gprop val)
   "Make a Music expression that sets GPROP to VAL in GROB. Does a pop first,
 i.e.  this is not an override"
-  
-   (let* ((m (make-music-by-name  'OverrideProperty)))
-     (ly:set-mus-property! m 'symbol grob)
-     (ly:set-mus-property! m 'grob-property gprop)
-     (ly:set-mus-property! m 'grob-value val)
-		
-     m
-   
-   ))
-
+  (make-music 'OverrideProperty
+	      'symbol grob
+	      'grob-property gprop
+	      'grob-value val))
 
 (define-public (make-grob-property-revert grob gprop)
   "Revert the grob property GPROP for GROB."
-   (let* ((m (make-music-by-name  'OverrideProperty)))
-     (ly:set-mus-property! m 'symbol grob)
-     (ly:set-mus-property! m 'grob-property gprop)
-		
-     m
-   
-   ))
+  (make-music 'OverrideProperty
+	      'symbol grob
+	      'grob-property gprop))
 
 (define direction-polyphonic-grobs
-   '(Tie Slur Script TextScript Stem Dots DotColumn))
+  '(Stem Tie Rest Slur Script TextScript Dots DotColumn Fingering
+	 ))
 
 (define-public (make-voice-props-set n)
   (make-sequential-music
    (append
-      (map (lambda (x) (make-grob-property-set x 'direction
-					       (if (odd? n) -1 1)))
-	   direction-polyphonic-grobs)
-      (list
-       (make-grob-property-set 'NoteColumn 'horizontal-shift (quotient n 2))
-       (make-grob-property-set 'MultiMeasureRest 'staff-position
-			       (if (odd? n) -4 4)
-			       )
-       
-       )
-   )
-  ))
+    (map (lambda (x) (make-grob-property-set x 'direction
+					     (if (odd? n) -1 1)))
+	 direction-polyphonic-grobs)
+    (list
+     (make-grob-property-set 'NoteColumn 'horizontal-shift (quotient n 2))
+     (make-grob-property-set 'MultiMeasureRest 'staff-position (if (odd? n) -4 4))
+     
+     )))) 
+
 
 (define-public (make-voice-props-revert)
   (make-sequential-music
    (append
     (map (lambda (x) (make-grob-property-revert x 'direction))
 	 direction-polyphonic-grobs)
-      
-      (list (make-grob-property-revert 'NoteColumn 'horizontal-shift))
-   ))
-  )
+    (list (make-grob-property-revert 'NoteColumn 'horizontal-shift))
+    (list (make-grob-property-revert 'MultiMeasureRest 'staff-position)))))
 
 
-(define-public (context-spec-music m context . rest)
-  "Add \\context CONTEXT = foo to M. "
-  
-  (let* ((cm (make-music-by-name 'ContextSpeccedMusic)))
-    (ly:set-mus-property! cm 'element m)
-    (ly:set-mus-property! cm 'context-type context)
-    (if (and  (pair? rest) (string? (car rest)))
-	(ly:set-mus-property! cm 'context-id (car rest))
-    )
-    cm
-  ))
+(define*-public (context-spec-music m context #:optional id)
+  "Add \\context CONTEXT = ID to M. "
+  (let ((cm (make-music 'ContextSpeccedMusic
+			'element m
+			'context-type context)))
+    (if (string? id)
+	(set! (ly:music-property cm 'context-id) id))
+    cm))
 
-(define-public (make-apply-context func)
-  (let*
-      ((m (make-music-by-name 'ApplyContext)))
 
-    (ly:set-mus-property! m 'procedure func)
-    m
+(define-public (descend-to-context m context)
+  "Like context-spec-music, but only descending. "
+  (let ((cm (context-spec-music m context)))
+    (ly:music-set-property! cm 'descend-only #t)
+    cm))
+
+(define-public (make-non-relative-music mus)
+  (make-music 'UnrelativableMusic
+	      'element mus
   ))
 
+(define-public (make-apply-context func)
+  (make-music 'ApplyContext
+	      'procedure func))
+
 (define-public (make-sequential-music elts)
-  (let*  ((m (make-music-by-name 'SequentialMusic)))
-    (ly:set-mus-property! m 'elements elts)
-    m
-  ))
+  (make-music 'SequentialMusic
+	      'elements elts))
 
 (define-public (make-simultaneous-music elts)
-  (let*  ((m (make-music-by-name 'SimultaneousMusic)))
-    (ly:set-mus-property! m 'elements elts)
-    m
-    ))
+  (make-music 'SimultaneousMusic
+	      'elements elts))
 
 (define-public (make-event-chord elts)
-  (let*  ((m (make-music-by-name 'EventChord)))
-    (ly:set-mus-property! m 'elements elts)
-    m
-    ))
-
+  (make-music 'EventChord
+	      'elements elts))
 
 (define-public (make-skip-music dur)
-  (let*  ((m (make-music-by-name 'SkipMusic)))
-    (ly:set-mus-property! m 'duration dur)
-    m
-  ))
+  (make-music 'SkipMusic
+	      'duration dur))
+
+(define-public (make-grace-music music)
+  (make-music 'GraceMusic
+	      'element music))
 
 ;;;;;;;;;;;;;;;;
 
 ;; mmrest
 (define-public (make-multi-measure-rest duration location)
-  (let*
-      (
-       (start (make-music-by-name 'MultiMeasureRestEvent))
-       (ch (make-music-by-name 'BarCheck))
-       (ch2  (make-music-by-name 'BarCheck))
-       (seq (make-music-by-name 'MultiMeasureRestMusicGroup))
-       )
-
-    (map (lambda (x) (ly:set-mus-property! x 'origin location))
-	 (list start ch ch2 seq))
-    (ly:set-mus-property! start 'duration duration)
-    (ly:set-mus-property! seq 'elements
-     (list
-      ch
-      (make-event-chord (list start))
-      ch2
-      ))
-
-    seq
-    ))
+  (make-music 'MultiMeasureRestMusicGroup
+	      'origin location
+	      'elements (list (make-music 'BarCheck
+					  'origin location)
+			      (make-event-chord (list (make-music 'MultiMeasureRestEvent
+								  'origin location
+								  'duration duration)))
+			      (make-music 'BarCheck
+					  'origin location))))
 
 (define-public (glue-mm-rest-texts music)
   "Check if we have R1*4-\\markup { .. }, and if applicable convert to
 a property set for MultiMeasureRestNumber."
-  
   (define (script-to-mmrest-text script-music)
-    "Extract 'direction and 'text   from SCRIPT-MUSIC, and transform into property sets."
-    
-    (let*
-	(
-	 (text (ly:get-mus-property script-music 'text))
-	 (dir (ly:get-mus-property script-music 'direction))
-	 (p (make-music-by-name 'MultiMeasureTextEvent))
-	 )
-
+    "Extract 'direction and 'text from SCRIPT-MUSIC, and transform into property sets."
+    (let ((dir (ly:music-property script-music 'direction))
+	  (p   (make-music 'MultiMeasureTextEvent
+			   'text (ly:music-property script-music 'text))))
       (if (ly:dir? dir)
-	  (ly:set-mus-property! p  'direction dir))
-      (ly:set-mus-property! p 'text text)
-      p
-    ))
-  
-  (if (eq? (ly:get-mus-property music 'name)  'MultiMeasureRestMusicGroup)
-      (let*
-	  (
-	   (text? (lambda (x) (memq 'script-event (ly:get-mus-property x 'types))))
-	   (es (ly:get-mus-property  music 'elements))
-	   (texts (map script-to-mmrest-text  (filter text? es)))
-	   (others (remove text? es))
-	   )
+	  (set! (ly:music-property p 'direction) dir))
+      p))
+  (if (eq? (ly:music-property music 'name) 'MultiMeasureRestMusicGroup)
+      (let* ((text? (lambda (x) (memq 'script-event (ly:music-property x 'types))))
+	     (es (ly:music-property  music 'elements))
+	     (texts (map script-to-mmrest-text	(filter text? es)))
+	     (others (remove text? es)))
 	(if (pair? texts)
-	    (ly:set-mus-property!
-	     music 'elements
-	     (cons (make-event-chord texts) others)
-	    ))
-      ))
-  music
-  )
+	    (set! (ly:music-property music 'elements)
+		  (cons (make-event-chord texts) others)))))
+  music)
 
 
 (define-public (make-property-set sym val)
-  (let*
-      (
-       (m (make-music-by-name 'PropertySet))
-       )
-    (ly:set-mus-property! m 'symbol sym)
-    (ly:set-mus-property! m 'value val)
-    m
-  ))
-
-
+  (make-music 'PropertySet
+	      'symbol sym
+	      'value val))
 
 (define-public (make-ottava-set octavation)
-  (let*
-      ((m (make-music-by-name 'ApplyContext)))
-    
-  
-  (define (ottava-modify context)
-    "Either reset centralCPosition to the stored original, or remember
-old centralCPosition, add OCTAVATION to centralCPosition, and set
-OTTAVATION to `8va', or whatever appropriate."
-    
-    (if (number? (ly:get-context-property  context 'centralCPosition))
-	
-	(if (= octavation 0)
-	    (let*
-		((where (ly:context-property-where-defined context 'centralCPosition))
-		 (oc0 (ly:get-context-property context 'originalCentralCPosition)))
-
-	      (ly:set-context-property! context 'centralCPosition oc0)
-	      (ly:unset-context-property where 'originalCentralCPosition)
-	      (ly:unset-context-property where 'ottavation))
-
-	    (let*
-		((where (ly:context-property-where-defined context 'centralCPosition))
-		 (c0 (ly:get-context-property context 'centralCPosition))
-		 (new-c0 (+ c0 (* -7 octavation)))
-		 (string (cdr
-			  (assoc octavation '((2 . "15ma")
-					      (1 . "8va")
-					      (0 . #f)
-					      (-1 . "8va bassa")
-					      (-2 . "15ma bassa"))))))
-
-	      (ly:set-context-property! context 'centralCPosition new-c0)
-	      (ly:set-context-property! context 'originalCentralCPosition c0)
-	      (ly:set-context-property! context 'ottavation string)
-	      
-	      ))))
-
-  (ly:set-mus-property! m 'procedure  ottava-modify)
-  (context-spec-music m 'Staff)
-  ))
+  (let ((m (make-music 'ApplyContext)))
+    (define (ottava-modify context)
+      "Either reset middleCPosition to the stored original, or remember
+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)))))
+    (set! (ly:music-property m 'procedure) ottava-modify)
+    (context-spec-music m 'Staff)))
 
 (define-public (set-octavation ottavation)
   (ly:export (make-ottava-set ottavation)))
 
 (define-public (make-time-signature-set num den . rest)
-  " Set properties for time signature NUM/DEN.
-Rest can contain a list of beat groupings 
-
-"
-  
-  (let*
-      (
-       (set1 (make-property-set 'timeSignatureFraction (cons num den) ))
-       (beat (ly:make-moment 1 den))
-       (len  (ly:make-moment num den))
-       (set2 (make-property-set 'beatLength beat))
-       (set3 (make-property-set 'measureLength len))
-       (set4 (make-property-set 'beatGrouping (if (pair? rest)
-						  (car rest)
-						  '())))
-       (basic  (list set1 set2 set3 set4)))
-
-    (context-spec-music
-     (make-sequential-music basic) 'Timing)))
+  "Set properties for time signature NUM/DEN.  Rest can contain a list
+of beat groupings "
+  (let* ((set1 (make-property-set 'timeSignatureFraction (cons num den)))
+	 (beat (ly:make-moment 1 den))
+	 (len  (ly:make-moment num den))
+	 (set2 (make-property-set 'beatLength beat))
+	 (set3 (make-property-set 'measureLength len))
+	 (set4 (make-property-set 'beatGrouping (if (pair? rest)
+						    (car rest)
+						    '())))
+	 (basic	 (list set1 set2 set3 set4)))
+    (descend-to-context
+     (context-spec-music (make-sequential-music basic) 'Timing) 'Score)))
 
 (define-public (make-mark-set label)
-  "make the music for the \\mark command."
-  
-  (let*
-      ((set (if (integer? label)
-		(context-spec-music (make-property-set 'rehearsalMark label)
-				    'Score)
-		#f))
-       (ev (make-music-by-name 'MarkEvent))
-       (ch (make-event-chord (list ev)))
-       )
-
-    
+  "Make the music for the \\mark command."  
+  (let* ((set (if (integer? label)
+		  (context-spec-music (make-property-set 'rehearsalMark label)
+				      'Score)
+		  #f))
+	 (ev (make-music 'MarkEvent))
+	 (ch (make-event-chord (list ev))))
     (if set
 	(make-sequential-music (list set ch))
 	(begin
-	  (ly:set-mus-property! ev 'label label)
+	  (set! (ly:music-property ev 'label) label)
 	  ch))))
-    
-
 
 (define-public (set-time-signature num den . rest)
   (ly:export (apply make-time-signature-set `(,num ,den . ,rest))))
 
-(define-public (make-penalty-music pen)
- (let
-     ((m (make-music-by-name 'BreakEvent)))
-   (ly:set-mus-property! m 'penalty pen)
-   m))
+(define-public (make-penalty-music pen page-pen)
+  (make-music 'BreakEvent
+	      'penalty pen
+	      'page-penalty page-pen))
 
 (define-public (make-articulation name)
-  (let* (
-	 (m (make-music-by-name 'ArticulationEvent))
-      )
-      (ly:set-mus-property! m 'articulation-type name)
-      m
-  ))
+  (make-music 'ArticulationEvent
+	      'articulation-type name))
 
 (define-public (make-lyric-event string duration)
-  (let* ((m (make-music-by-name 'LyricEvent)))
-
-    (ly:set-mus-property! m 'duration duration)
-    (ly:set-mus-property! m 'text string)
-    m))
+  (make-music 'LyricEvent
+	      'duration duration
+	      'text string))
 
 (define-public (make-span-event type spandir)
-  (let* (
-	 (m (make-music-by-name  type))
-	 )
-    (ly:set-mus-property! m 'span-direction spandir)
-    m
-    ))
+  (make-music type
+	      'span-direction spandir))
 
 (define-public (set-mus-properties! m alist)
   "Set all of ALIST as properties of M." 
   (if (pair? alist)
       (begin
-	(ly:set-mus-property! m (caar alist) (cdar alist))
-	(set-mus-properties! m (cdr alist)))
-  ))
-
-
+	(set! (ly:music-property m (caar alist)) (cdar alist))
+	(set-mus-properties! m (cdr alist)))))
 
 (define-public (music-separator? m)
   "Is M a separator?"
-  (let* ((ts (ly:get-mus-property m 'types )))
-    (memq 'separator ts)
-  ))
+  (let ((ts (ly:music-property m 'types)))
+    (memq 'separator ts)))
 
 
 ;;; splitting chords into voices.
@@ -506,68 +403,55 @@ Rest can contain a list of beat groupings
 
    voicify-list :: [ [Music ] ] -> number -> [Music]
    LST is a list music-lists.
-"
 
-   (if (null? lst) '()
+   NUMBER is 0-base, i.e. Voice=1 (upstems) has number 0.
+"
+   (if (null? lst)
+       '()
        (cons (context-spec-music
 	      (make-sequential-music
-	       (list
-		(make-voice-props-set number)
-		(make-simultaneous-music (car lst))))
-
-	      'Voice  (number->string number))
-	      (voicify-list (cdr lst) (1+ number))
-       ))
-   )
+	       (list (make-voice-props-set number)
+		     (make-simultaneous-music (car lst))))
+	      'Voice  (number->string (1+ number)))
+	     (voicify-list (cdr lst) (1+ number)))))
 
 (define (voicify-chord ch)
   "Split the parts of a chord into different Voices using separator"
-   (let* ((es (ly:get-mus-property ch 'elements)))
-     
-     (ly:set-mus-property!  ch 'elements
-       (voicify-list (split-list es music-separator?) 0))
-     ch
-   ))
-
-(define (voicify-music m)
-   "Recursively split chords that are separated with \\ "
-   
-   (if (not (ly:music? m))
-       (begin (display m)
-       (error "not music!"))
-       )
-   (let*
-       ((es (ly:get-mus-property m 'elements))
-	(e (ly:get-mus-property m 'element))
-	)
-     (if (pair? es)
-	 (ly:set-mus-property! m 'elements (map voicify-music es)))
-     (if (ly:music? e)
-	 (ly:set-mus-property! m 'element  (voicify-music e)))
-     (if
-      (and (equal? (ly:music-name m) "Simultaneous_music")
-	   (reduce (lambda (x y ) (or x y)) #f (map music-separator? es)))
-      (set! m  (context-spec-music (voicify-chord m)  'Staff))
-      )
-
-     m
-     ))
+  (let ((es (ly:music-property ch 'elements)))
+    (set! (ly:music-property  ch 'elements)
+	  (voicify-list (split-list es music-separator?) 0))
+    ch))
+
+(define-public (voicify-music m)
+  "Recursively split chords that are separated with \\ "
+  (if (not (ly:music? m))
+      (begin (display m)
+	     (error "not music!")))
+  (let ((es (ly:music-property m 'elements))
+	(e (ly:music-property m 'element)))
+    (if (pair? es)
+	(set! (ly:music-property m 'elements) (map voicify-music es)))
+    (if (ly:music? e)
+	(set! (ly:music-property m 'element)  (voicify-music e)))
+    (if (and (equal? (ly:music-name m) "Simultaneous_music")
+	     (reduce (lambda (x y ) (or x y)) #f (map music-separator? es)))
+	(set! m (context-spec-music (voicify-chord m) 'Staff)))
+    m))
 
 (define-public (empty-music)
-  (ly:export (make-music-by-name 'Music))
-  )
+  (ly:export (make-music 'Music)))
 ;;;
 
 ; Make a function that checks score element for being of a specific type. 
 (define-public (make-type-checker symbol)
   (lambda (elt)
-    ;;(display  symbol)
-    ;;(eq? #t (ly:get-grob-property elt symbol))
-    (not (eq? #f (memq symbol (ly:get-grob-property elt 'interfaces))))))
+    ;;(display	symbol)
+    ;;(eq? #t (ly:grob-property elt symbol))
+    (not (eq? #f (memq symbol (ly:grob-property elt 'interfaces))))))
 
 (define-public ((outputproperty-compatibility func sym val) grob g-context ao-context)
   (if (func grob)
-      (ly:set-grob-property! grob sym val)))
+      (set! (ly:grob-property grob sym) val)))
 
 
 (define-public ((set-output-property grob-name symbol val)  grob grob-c context)
@@ -576,81 +460,57 @@ Rest can contain a list of beat groupings
 \\applyoutput #(set-output-property 'Clef 'extra-offset '(0 . 1))
 
 "
-   
-   (let*
-       ((meta (ly:get-grob-property grob 'meta)))
-
+   (let ((meta (ly:grob-property grob 'meta)))
      (if (equal?  (cdr (assoc 'name meta)) grob-name)
-	 (ly:set-grob-property! grob symbol val)
-	 )))
+	 (set! (ly:grob-property grob symbol) val))))
 
 
 ;;
 (define-public (smart-bar-check n)
-  "Make  a bar check that checks for a specific bar number. 
+  "Make	 a bar check that checks for a specific bar number. 
 "
-  (let*
-      (
-       (m (make-music-by-name 'ApplyContext))
-       )
-    
+  (let ((m (make-music 'ApplyContext)))
     (define (checker tr)
-      (let* ((bn (ly:get-context-property tr 'currentBarNumber)))
-	(if (= bn  n)
+      (let* ((bn (ly:context-property tr 'currentBarNumber)))
+	(if (= bn n)
 	    #t
 	    (error
 	     (format "Bar check failed, we should have reached ~a, instead at ~a\n"
-		     n bn ))
-	    )))
-
-    (ly:set-mus-property! m 'procedure checker)
-    m
-    ))
+		     n bn)))))
+    (set! (ly:music-property m 'procedure) checker)
+    m))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; warn for bare chords at start.
 
 (define (has-request-chord elts)
-  (reduce (lambda (x y) (or x y)) #f (map (lambda (x) (equal? (ly:music-name x)
-							   "Request_chord")) elts)
-  ))
+  (reduce (lambda (x y) (or x y)) #f
+	  (map (lambda (x)
+		 (equal? (ly:music-name x) "Request_chord"))
+	       elts)))
 
 (define (ly:music-message music msg)
-  (let*
-      (
-      (ip (ly:get-mus-property music 'origin))
-      )
-
+  (let ((ip (ly:music-property music 'origin)))
     (if (ly:input-location? ip)
 	(ly:input-message ip msg)
-	(ly:warn msg))
-  ))
+	(ly:warn msg))))
   
 (define (check-start-chords music)
-  "Check music expression for a Simultaneous_music containing notes\n(ie. Request_chords), without context specification. Called  from parser."
-  
-     (let*
-       ((es (ly:get-mus-property music 'elements))
-	(e (ly:get-mus-property music 'element))
-	(name (ly:music-name music)) 
-	)
-
-       (cond 
-	 ((equal? name "Context_specced_music") #t)
-	 ((equal? name "Simultaneous_music")
-
-	  (if (has-request-chord es)
-	      (ly:music-message music "Starting score with a chord.\nPlease insert an explicit \\context before chord")
-	      (map check-start-chords es)))
-	 
-	 ((equal? name "Sequential_music")
+  "Check music expression for a Simultaneous_music containing notes\n(ie. Request_chords),
+without context specification. Called  from parser."
+  (let ((es (ly:music-property music 'elements))
+	(e (ly:music-property music 'element))
+	(name (ly:music-name music)))
+    (cond ((equal? name "Context_specced_music") #t)
+	  ((equal? name "Simultaneous_music")
+	   (if (has-request-chord es)
+	       (ly:music-message music "Starting score with a chord.\nPlease insert an explicit \\context before chord")
+	       (map check-start-chords es)))
+	  ((equal? name "Sequential_music")
 	   (if (pair? es)
 	       (check-start-chords (car es))))
-	  (else (if (ly:music? e) (check-start-chords e )))
-       
-       ))
-     music
-     )
+	  (else (if (ly:music? e) (check-start-chords e)))))
+  music)
 
 
 
@@ -664,90 +524,131 @@ Rest can contain a list of beat groupings
   (let*
       ((n (vector-length v))
        (nv (make-vector (+ n 1) '())))
-
-    
     (vector-move-left! v 0 n nv 0)
     (vector-set! nv n x)
     nv))
 
-
 (define (vector-map f v)
-  "Map  F over V. This function returns nothing."
-  (do
-      ((n (vector-length v))
+  "Map	F over V. This function returns nothing."
+  (do ((n (vector-length v))
        (i 0 (+ i 1)))
       ((>= i n))
-  
     (f (vector-ref v i))))
 
 (define (vector-reverse-map f v)
-  "Map  F over V, N to 0 order. This function returns nothing."
-  (do
-      ((i (- (vector-length v) 1) (- i 1)))
+  "Map	F over V, N to 0 order. This function returns nothing."
+  (do ((i (- (vector-length v) 1) (- i 1)))
       ((< i 0))
-  
     (f (vector-ref v i))))
 
 ;; TODO:  make a remove-grace-property too.
 (define-public (add-grace-property context-name grob sym val)
   "Set SYM=VAL for GROB in CONTEXT-NAME. "
   (define (set-prop context)
-    (let*
-	((where (ly:context-property-where-defined context 'graceSettings))
-	 (current (ly:get-context-property where 'graceSettings))
-	 (new-settings (vector-extend current (list context-name grob sym val)))
-	 )
-      (ly:set-context-property! where 'graceSettings new-settings)))
-    
-    (ly:export (context-spec-music (make-apply-context set-prop) 'Voice)))
+    (let* ((where (ly:context-property-where-defined context 'graceSettings))
+	   (current (ly:context-property where 'graceSettings))
+	   (new-settings (vector-extend current (list context-name grob sym val))))
+      (ly:context-set-property! where 'graceSettings new-settings)))
+  (ly:export (context-spec-music (make-apply-context set-prop) 'Voice)))
 
 
 (define-public (set-start-grace-properties context)
   (define (execute-1 x)
-    (let*
-	((tr (ly:translator-find context (car x))))
-
+    (let ((tr (ly:context-find context (car x))))
       (if (ly:context? tr)
-	  (ly:context-pushpop-property tr (cadr x) (caddr x) (cadddr x))
-	  )))
+	  (ly:context-pushpop-property tr (cadr x) (caddr x) (cadddr x)))))
   
-  (let*
-      ((props (ly:get-context-property context 'graceSettings)))
+  (let ((props (ly:context-property context 'graceSettings)))
     (if (vector? props)
 	(vector-map execute-1 props))))
 
 (define-public (set-stop-grace-properties context)
   (define (execute-1 x)
-    (let*
-	((tr (ly:translator-find context (car x))))
+    (let ((tr (ly:context-find context (car x))))
       (if (ly:context? tr)
-	  (ly:context-pushpop-property tr (cadr x) (caddr x))
-	  )))
+	  (ly:context-pushpop-property tr (cadr x) (caddr x)))))
   
-  (let*
-      ((props (ly:get-context-property context 'graceSettings)))
+  (let ((props (ly:context-property context 'graceSettings)))
     (if (vector? props)
 	(vector-reverse-map execute-1 props))))
 
+
+
+(defmacro-public def-grace-function (start stop)
+  `(def-music-function (location music) (ly:music?)
+     (make-music 'GraceMusic
+		 'origin location
+		 'element (make-music 'SequentialMusic
+				      'elements (list (ly:music-deep-copy ,start)
+						      music
+						      (ly:music-deep-copy ,stop))))))
+
+(defmacro-public def-music-function (args signature . body)
+  "Helper macro for `ly:make-music-function'.
+Syntax:
+  (def-music-function (location arg1 arg2 ...) (arg1-type? arg2-type? ...)
+    ...function body...)
+"
+  `(ly:make-music-function (list ,@signature)
+			   (lambda (,@args)
+			     ,@body)))
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(define-public ((quote-substitute quote-tab) music)
+  (let*
+      ((quoted-name (ly:music-property music 'quoted-music-name))
+       (quoted-vector (if (string? quoted-name)
+			  (hash-ref quote-tab quoted-name #f)
+			  #f
+			  ))
+
+       )
+
+    (if (string? quoted-name)
+	(if  (vector? quoted-vector)
+	     (set! (ly:music-property music 'quoted-events) quoted-vector)
+	     (ly:warn "Cannot find quoted music `~S'" quoted-name)))
+
+    music))
+    
+
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; switch it on here, so parsing and init isn't checked (too slow!)
 ;;
 ;; automatic music transformations.
 
 (define (switch-on-debugging m)
-  (set-debug-cell-accesses! 15000)
+  (if (defined? 'set-debug-cell-accesses!)
+      (set-debug-cell-accesses! 15000))
   m)
 
-(define-public toplevel-music-functions
-  (list
-;;   check-start-chords ; ; no longer needed with chord syntax. 
-	voicify-music
-	(lambda (x) (music-map glue-mm-rest-texts x))
-; switch-on-debugging
-	))
-
+(define (music-check-error music)
+  (define found #f)
+  (define (signal m)
+    (if (and (ly:music? m)
+	     (eq? (ly:music-property m 'error-found) #t))
+	(set! found #t)))
+  
+  (for-each signal (ly:music-property music 'elements))
+  (signal (ly:music-property music 'element))
 
+  (if found
+      (set! (ly:music-property music 'error-found) #t))
+  music)
 
+(define-public toplevel-music-functions
+  (list
+   ;; check-start-chords ; ; no longer needed with chord syntax. 
+   (lambda (music parser) (voicify-music music))
+   (lambda (x parser) (music-map glue-mm-rest-texts x))
+   (lambda (x parser) (music-map music-check-error x))
+   (lambda (music parser)
+
+     (music-map (quote-substitute (ly:parser-lookup parser 'musicQuotes))  music))
+   ;; switch-on-debugging
+   ))
 
 ;;;;;;;;;;;;;;;;;
 ;; lyrics
@@ -755,34 +656,149 @@ Rest can contain a list of beat groupings
 (define (apply-durations lyric-music durations) 
   (define (apply-duration music)
     (if (and (not (equal? (ly:music-length music) ZERO-MOMENT))
-	     (ly:duration?  (ly:get-mus-property music 'duration)))
+	     (ly:duration?  (ly:music-property music 'duration)))
 	(begin
-	  (ly:set-mus-property! music 'duration (car durations))
-	  (set! durations (cdr durations))
-	  )))
-
+	  (set! (ly:music-property music 'duration) (car durations))
+	  (set! durations (cdr durations)))))
+  
   (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))
+	 (nm (if (pair? meta) (cdr (assoc 'name meta)) "nonexistant"))
+	 (cb (ly:grob-property grob 'print-function)))
+    (if (equal? nm object-name)
+	(begin
+	  (set! (ly:grob-property grob 'print-function) Balloon_interface::print)
+	  (set! (ly:grob-property grob 'balloon-original-callback) 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
+
+(define-public (set-accidentals-properties extra-natural
+					   auto-accs auto-cauts
+					   context)
+  (context-spec-music
+   (make-sequential-music
+    (append (if (boolean? extra-natural)
+		(list (make-property-set 'extraNatural extra-natural))
+		'())
+	    (list (make-property-set 'autoAccidentals auto-accs)
+		  (make-property-set 'autoCautionaries auto-cauts))))
+   context))
+
+(define-public (set-accidental-style style . rest)
+  "Set accidental style to STYLE. Optionally takes a context argument,
+e.g. 'Staff or 'Voice. The context defaults to Voice, except for piano styles, which
+use GrandStaff as a context. "
+  (let ((context (if (pair? rest)
+		     (car rest) 'Staff))
+	(pcontext (if (pair? rest)
+		      (car rest) 'GrandStaff)))
+    (ly:export
+     (cond
+      ;; accidentals as they were common in the 18th century.
+      ((equal? style 'default)
+       (set-accidentals-properties #t '(Staff (same-octave . 0))
+				   '() context))
+      ;; accidentals from one voice do NOT get cancelled in other voices
+      ((equal? style 'voice)
+       (set-accidentals-properties #t '(Voice (same-octave . 0))
+				   '() context))
+      ;; accidentals as suggested by Kurt Stone, Music Notation in the 20th century.
+      ;; This includes all the default accidentals, but accidentals also needs cancelling
+      ;; in other octaves and in the next measure.
+      ((equal? style 'modern)
+       (set-accidentals-properties #f '(Staff (same-octave . 0) (any-octave . 0) (same-octave . 1))
+				   '()	context))
+      ;; the accidentals that Stone adds to the old standard as cautionaries
+      ((equal? style 'modern-cautionary)
+       (set-accidentals-properties #f '(Staff (same-octave . 0))
+				   '(Staff (any-octave . 0) (same-octave . 1))
+				   context))
+      ;; Multivoice accidentals to be read both by musicians playing one voice
+      ;; and musicians playing all voices.
+      ;; Accidentals are typeset for each voice, but they ARE cancelled across voices.
+      ((equal? style 'modern-voice)
+       (set-accidentals-properties  #f
+				    '(Voice (same-octave . 0) (any-octave . 0) (same-octave . 1)
+					    Staff (same-octave . 0) (any-octave . 0) (same-octave . 1))
+				    '()
+				    context))
+      ;; same as modernVoiceAccidental eccept that all special accidentals are typeset
+      ;; as cautionaries
+      ((equal? style 'modern-voice-cautionary)
+       (set-accidentals-properties #f
+				   '(Voice (same-octave . 0) )
+				   '(Voice (any-octave . 0) (same-octave . 1)
+					   Staff (same-octave . 0) (any-octave . 0) (same-octave . 1))
+				   context))
+      ;; stone's suggestions for accidentals on grand staff.
+      ;; Accidentals are cancelled across the staves in the same grand staff as well
+      ((equal? style 'piano)
+       (set-accidentals-properties #f
+				   '(Staff (same-octave . 0)
+					   (any-octave . 0) (same-octave . 1)
+					   GrandStaff (any-octave . 0) (same-octave . 1))
+				   '()
+				   pcontext))
+      ((equal? style 'piano-cautionary)
+       (set-accidentals-properties #f
+				   '(Staff (same-octave . 0))
+				   '(Staff (any-octave . 0) (same-octave . 1)
+					   GrandStaff (any-octave . 0) (same-octave . 1))
+				   pcontext))
+      ;; do not set localKeySignature when a note alterated differently from
+      ;; localKeySignature is found.
+      ;; Causes accidentals to be printed at every note instead of
+      ;; remembered for the duration of a measure.
+      ;; accidentals not being remembered, causing accidentals always to be typeset relative to the time signature
+      ((equal? style 'forget)
+       (set-accidentals-properties '()
+				   '(Staff (same-octave . -1))
+				   '() context))
+      ;; Do not reset the key at the start of a measure.  Accidentals will be
+      ;; printed only once and are in effect until overridden, possibly many
+      ;; measures later.
+      ((equal? style 'no-reset)
+       (set-accidentals-properties '()
+				   '(Staff (same-octave . #t))
+				   '()
+				   context))
+      (else
+       (ly:warn "Unknown accidental style: ~S" (symbol->string style))
+       (make-sequential-music '()))))))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(define-public (skip-of-length mus)
+  "Create a skip of exactly the same length as MUS."
   (let*
-   ((meta (ly:get-grob-property grob 'meta))
-    (nm (if (pair? meta) (cdr (assoc 'name meta)) "nonexistant"))
-    (cb (ly:get-grob-property grob 'print-function)))
-    
-   (if (equal? nm object-name)
-    (begin
-     (ly:set-grob-property! grob 'print-function Balloon_interface::brew_molecule)
-     (ly:set-grob-property! grob 'balloon-original-callback cb)
-     (ly:set-grob-property! grob 'balloon-text text)
-     (ly:set-grob-property! grob 'balloon-text-offset off)
-     (ly:set-grob-property! grob 'balloon-text-props '((font-family . roman)))
+   ((skip
+     (make-music
+      'SkipEvent
+      'duration (ly:make-duration 0 0))))
+
+   (make-event-chord (list (ly:music-compress skip (ly:music-length mus))))
+))
 
-     ))))
 
+(define-public (mmrest-of-length mus)
+  "Create a mmrest of exactly the same length as MUS."
+  
+  (let*
+   ((skip
+     (make-multi-measure-rest
+      (ly:make-duration 0 0) '() )))
+   (ly:music-compress skip (ly:music-length mus))
+   skip
+))