X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fdefine-music-types.scm;h=8a3676b2a1ff13a497abe3959238d888bffc1fd6;hb=32776795a1be5c0ec472f59694510705607673b0;hp=d9a5f09ac872f35ada7bd598e54115864cf53d73;hpb=6019a1e8f0301c1c3bf86ccc92178d820f9c3784;p=lilypond.git

diff --git a/scm/define-music-types.scm b/scm/define-music-types.scm
index d9a5f09ac8..8a3676b2a1 100644
--- a/scm/define-music-types.scm
+++ b/scm/define-music-types.scm
@@ -1,6 +1,6 @@
 ;;;; This file is part of LilyPond, the GNU music typesetter.
 ;;;;
-;;;; Copyright (C) 1998--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+;;;; Copyright (C) 1998--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 ;;;;		     Jan Nieuwenhuizen <janneke@gnu.org>
 ;;;;
 ;;;; LilyPond is free software: you can redistribute it and/or modify
@@ -18,38 +18,6 @@
 
 ;; TODO: should link back into user manual.
 
-(define (mm-rest-child-list music)
-  "Generate events for multimeasure rests,
-to be used by the sequential-iterator"
-  (let ((location (ly:music-property music 'origin))
-	(duration (ly:music-property music 'duration)))
-    (list (make-music 'BarCheck
-		      'origin location)
-	  (make-event-chord (cons (make-music 'MultiMeasureRestEvent
-					      'origin location
-					      'duration duration)
-				  (ly:music-property music 'articulations)))
-	  (make-music 'BarCheck
-		      'origin location))))
-
-(define (make-ottava-set music)
-  "Set context properties for an ottava bracket."
-  (let ((octavation (ly:music-property music 'ottava-number)))
-
-    (list (context-spec-music
-	   (make-apply-context
-	    (lambda (context)
-	      (let ((offset (* -7 octavation))
-		    (string (assoc-get octavation '((2 . "15ma")
-						    (1 . "8va")
-						    (0 . #f)
-						    (-1 . "8vb")
-						    (-2 . "15mb")))))
-		(set! (ly:context-property context 'middleCOffset) offset)
-		(set! (ly:context-property context 'ottavation) string)
-		(ly:set-middle-C! context))))
-	   'Staff))))
-
 (define-public music-descriptions
   `(
     (AbsoluteDynamicEvent
@@ -207,6 +175,11 @@ An alternative syntax is @var{note}@code{\\decr} @dots{}
 		  event))
 	))
 
+    (DoublePercentEvent
+     . ((description . "Used internally to signal double percent repeats.")
+	(types . (general-music event double-percent-event rhythmic-event))
+	))
+
     (EpisemaEvent
      . ((description . "Begin or end an episema.")
 	(types . (general-music span-event event episema-event))
@@ -236,6 +209,11 @@ An alternative syntax is @var{note}@code{\\decr} @dots{}
 	(types . (general-music fingering-event event))
 	))
 
+    (FootnoteEvent
+     . ((description . "Footnote a grob.")
+	(types . (general-music event footnote-event))
+	))
+
     (GlissandoEvent
      . ((description . "Start a glissando on this note.")
 	(types . (general-music glissando-event event))
@@ -381,6 +359,17 @@ Syntax: @code{\\override} [ @var{context} @code{.} ]
 	(types . (general-music break-event page-turn-event event))
 	))
 
+    (PartCombineForceEvent
+     . ((description . "Override the part-combiner's strategy.")
+	(types . (general-music part-combine-force-event event))
+	))
+
+    (PartialSet
+     . ((description . "Create an anacrusis or upbeat (partial measure).")
+	(iterator-ctor . ,ly:partial-iterator::constructor)
+	(types . (general-music partial-set))
+        ))
+
     (PartCombineMusic
      . ((description . "Combine two parts on a staff, either merged or
 as separate voices.")
@@ -396,7 +385,7 @@ as separate voices.")
 	))
 
     (PercentRepeatedMusic
-     . ((description . "Repeats encoded by percents.")
+     . ((description . "Repeats encoded by percents and slashes.")
 	(iterator-ctor . ,ly:percent-repeat-iterator::constructor)
 	(start-callback .  ,ly:repeated-music::first-start)
 	(length-callback . ,ly:repeated-music::unfolded-music-length)
@@ -414,6 +403,7 @@ goes down).")
      . ((description . "Start or end phrasing slur.
 
 Syntax: @var{note}@code{\\(} and @var{note}@code{\\)}")
+        (spanner-id . "")
 	(types . (general-music span-event event phrasing-slur-event))
 	))
 
@@ -471,6 +461,11 @@ Syntax: @code{\\unset @var{context}.@var{prop}}")
 	(types . (general-music repeated-music))
 	))
 
+    (RepeatSlashEvent
+     . ((description . "Used internally to signal beat repeats.")
+	(types . (general-music event repeat-slash-event rhythmic-event))
+	))
+
     (RepeatTieEvent
      . ((description . "Ties for starting a second volta bracket.")
 	(types . (general-music event repeat-tie-event))
@@ -540,6 +535,7 @@ Syntax: @code{\\skip} @var{duration}")
      . ((description . "Start or end slur.
 
 Syntax: @var{note}@code{(} and @var{note}@code{)}")
+        (spanner-id . "")
 	(types . (general-music span-event event slur-event))
 	))
 
@@ -594,6 +590,11 @@ Syntax: @code{\\rightHandFinger @var{text}}")
 	(types . (general-music event pedal-event sustain-event))
 	))
 
+    (TempoChangeEvent
+     . ((description . "A metronome mark or tempo indication.")
+	(types . (general-music event tempo-change-event))
+	))
+
     (TextScriptEvent
      . ((description . "Print text.")
 	(types . (general-music script-event text-script-event event))
@@ -623,6 +624,13 @@ Syntax: @code{\\times @var{fraction} @var{music}}, e.g.,
 	(types . (time-scaled-music music-wrapper-music general-music))
 	))
 
+    (TimeSignatureMusic
+     . ((description . "Set a new time signature")
+        (iterator-ctor . ,ly:sequential-iterator::constructor)
+        (elements-callback . ,make-time-signature-set)
+        (types . (general-music time-signature-music))
+        ))
+
     (TransposedMusic
      . ((description . "Music that has been transposed.")
 	(iterator-ctor . ,ly:music-wrapper-iterator::constructor)
@@ -710,7 +718,7 @@ Syntax: @code{\\\\}")
 (set! music-descriptions
       (sort music-descriptions alist<?))
 
-(define-public music-name-to-property-table (make-vector 59 '()))
+(define-public music-name-to-property-table (make-hash-table 59))
 
 ;; init hash table,
 ;; transport description to an object property.