Merge remote branch 'origin/master' into release/unstable

[lilypond.git] / scm / define-music-types.scm

diff --git a/scm/define-music-types.scm b/scm/define-music-types.scm
index 8d0464bf4c9009f2c86955ea5f9a7d4520ca3582..d1795246b28a478029fac8236b6042bcfb10a008 100644 (file)
--- 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--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
+;;;; Copyright (C) 1998--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 ;;;;                 Jan Nieuwenhuizen <janneke@gnu.org>
 ;;;;
 ;;;; LilyPond is free software: you can redistribute it and/or modify
@@ -128,7 +128,7 @@ Syntax for manual control: @code{c8-[ c c-] c8}")
 Syntax: @var{note}@code{\\breathe}")
 
         (types . (general-music event breathing-event))
-        ))
+        (midi-length . ,breathe::midi-length)))
 
     (ClusterNoteEvent
      . ((description . "A note that is part of a cluster.")
@@ -666,6 +666,11 @@ Syntax: @code{\\times @var{fraction} @var{music}}, e.g.,
         (types . (general-music time-signature-music))
         ))
 
+    (TimeSignatureEvent
+     . ((description . "An event created when setting a new time signature")
+        (types . (general-music event time-signature-event))
+        ))
+
     (TransposedMusic
      . ((description . "Music that has been transposed.")
         (iterator-ctor . ,ly:music-wrapper-iterator::constructor)
@@ -713,7 +718,8 @@ brackets start and stop.")
     (UnfoldedRepeatedMusic
      . ((description . "Repeated music which is fully written (and
 played) out.")
-        (iterator-ctor . ,ly:unfolded-repeat-iterator::constructor)
+        (iterator-ctor . ,ly:sequential-iterator::constructor)
+        (elements-callback . ,make-unfolded-set)
         (start-callback .  ,ly:repeated-music::first-start)
         (types . (general-music repeated-music unfolded-repeated-music))
         (length-callback . ,ly:repeated-music::unfolded-music-length)