X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fdefine-music-types.scm;h=a349934c238e0896bab665206db71919fd5a7e65;hb=05514c83a49dd3dfabd1fa7774c69c3038ecde6b;hp=60d66e03c6a52c7efeb2fa2b2226429392f59318;hpb=0e4883e95834d2692a0568e42d2fe697ae771c3a;p=lilypond.git

diff --git a/scm/define-music-types.scm b/scm/define-music-types.scm
index 60d66e03c6..a349934c23 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,20 +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-public music-descriptions
   `(
     (AbsoluteDynamicEvent
@@ -80,7 +66,7 @@ Syntax: @var{note}@code{-\\arpeggio}")
 
 Syntax: @var{note}@code{x}@code{y}, where @code{x} is a direction
 (@code{^} for up or @code{_} for down), or LilyPond's choice
-(no direction specified)), and where @code{y} is an articulation
+(no direction specified), and where @code{y} is an articulation
 (such as @code{-.}, @code{->}, @code{\\tenuto}, @code{\\downbow}).
 See the Notation Reference for details.")
 	(types . (general-music event articulation-event script-event))
@@ -119,6 +105,11 @@ Syntax for manual control: @code{c8-[ c c-] c8}")
 	(types . (general-music event beam-forbid-event))
 	))
 
+    (BreakDynamicSpanEvent
+     . ((description . "End an alignment spanner for dynamics here.")
+	(types . (general-music break-span-event break-dynamic-span-event event))
+	))
+
     (BendAfterEvent
      . ((description . "A drop/fall/doit jazz articulation.")
 	(types . (general-music bend-after-event event))))
@@ -138,6 +129,13 @@ Syntax: @var{note}@code{\\breathe}")
 		  rhythmic-event event))
 	))
 
+    (CompletizeExtenderEvent
+     . ((description . "Used internally to signal the end of a lyrics block to
+ensure extenders are completed correctly when a @code{Lyrics} context ends
+before its associated @code{Voice} context.")
+	(types . (general-music completize-extender-event event))
+	))
+
     (ContextChange
      . ((description . "Change staves in Piano staff.
 
@@ -324,6 +322,13 @@ Note the explicit font switch.")
 	(types . (general-music event note-grouping-event))
 	))
 
+    (OttavaMusic
+     . ((description . "Start or stop an ottava bracket.")
+	(iterator-ctor . ,ly:sequential-iterator::constructor)
+	(elements-callback . ,make-ottava-set)
+	(types . (general-music ottava-music))
+	))
+
     (OverrideProperty
      . ((description . "Extend the definition of a graphical object.
 
@@ -344,6 +349,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.")
@@ -586,6 +602,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)
@@ -673,7 +696,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.