X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=scm%2Fdefine-music-types.scm;h=2205c43e5a1526cadd47fbc42b7b2e727c153200;hb=7b3a9b122d7ef1eb70fdabaac466b7b0c23a1df2;hp=a0762025de6455f6345082dd0af0d035045c352d;hpb=5cf3f24eb042684b985ab4b3c5f14e46dfac0082;p=lilypond.git

diff --git a/scm/define-music-types.scm b/scm/define-music-types.scm
index a0762025de..2205c43e5a 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
@@ -336,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.
 
@@ -356,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.")
@@ -598,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)