X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fdefine-music-types.scm;h=e9dcee38cf2bc0a02893e109c437af936888a1c1;hb=f17f930c0106a871dd8f4c9a69af4457e05fbff7;hp=ad1073d1b36c57715e558c3408dcb69e1ff7cbeb;hpb=dde989437f822ff637a191cfd76b1a9e943dbac5;p=lilypond.git

diff --git a/scm/define-music-types.scm b/scm/define-music-types.scm
index ad1073d1b3..e9dcee38cf 100644
--- a/scm/define-music-types.scm
+++ b/scm/define-music-types.scm
@@ -1,9 +1,20 @@
-;;;; define-music-types.scm --
+;;;; This file is part of LilyPond, the GNU music typesetter.
 ;;;;
-;;;;  source file of the GNU LilyPond music typesetter
-;;;;
-;;;; (c) 1998--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
+;;;; Copyright (C) 1998--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
 ;;;;		     Jan Nieuwenhuizen <janneke@gnu.org>
+;;;;
+;;;; LilyPond is free software: you can redistribute it and/or modify
+;;;; it under the terms of the GNU General Public License as published by
+;;;; the Free Software Foundation, either version 3 of the License, or
+;;;; (at your option) any later version.
+;;;;
+;;;; LilyPond is distributed in the hope that it will be useful,
+;;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;;; GNU General Public License for more details.
+;;;;
+;;;; You should have received a copy of the GNU General Public License
+;;;; along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 
 ;; TODO: should link back into user manual.
 
@@ -127,6 +138,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.
 
@@ -166,6 +184,11 @@ An alternative syntax is @var{note}@code{\\decr} @dots{}
 		  event))
 	))
 
+    (EpisemaEvent
+     . ((description . "Begin or end an episema.")
+	(types . (general-music span-event event episema-event))
+	))
+
     (Event
      . ((description . "Atomic music event.")
 	(types . (general-music event))
@@ -235,7 +258,6 @@ Syntax: @var{note}@code{\\laissezVibrer}")
 
     (LigatureEvent
      . ((description . "Start or end a ligature.")
-	(span-type . ligature)
 	(types . (general-music span-event ligature-event event))
 	))
 
@@ -405,6 +427,15 @@ Syntax: @code{\\unset @var{context}.@var{prop}}")
 	(types . (music-wrapper-music general-music relative-octave-music))
 	))
 
+    (RepeatedChord
+     . ((description . "A chord repetition")
+	(to-relative-callback . ,ly:music-sequence::repeated-chord-relative-callback)
+	(iterator-ctor . ,ly:music-wrapper-iterator::constructor)
+	(start-callback . ,ly:music-wrapper::start-callback)
+	(length-callback . ,ly:music-wrapper::length-callback)
+	(types . (general-music music-wrapper-music))
+	))
+
     (RepeatedMusic
      . ((description . "Repeat music in different ways.")
 	(types . (general-music repeated-music))
@@ -558,7 +589,7 @@ Syntax: @code{\\times @var{fraction} @var{music}}, e.g.,
 @code{\\times 2/3 @{ @dots{} @}} for triplets.")
 	(length-callback . ,ly:music-wrapper::length-callback)
 	(start-callback . ,ly:music-wrapper::start-callback)
-	(iterator-ctor . ,ly:time-scaled-music-iterator::constructor)
+	(iterator-ctor . ,ly:tuplet-iterator::constructor)
 	(types . (time-scaled-music music-wrapper-music general-music))
 	))
 
@@ -691,13 +722,13 @@ and values. E.g:
 
 (define-public (make-repeated-music name)
   (let* ((repeated-music (assoc-get name '(("volta" . VoltaRepeatedMusic)
-			           ("unfold" . UnfoldedRepeatedMusic)
-			           ("percent" . PercentRepeatedMusic)
-			           ("tremolo" . TremoloRepeatedMusic))))
+					   ("unfold" . UnfoldedRepeatedMusic)
+					   ("percent" . PercentRepeatedMusic)
+					   ("tremolo" . TremoloRepeatedMusic))))
 	 (repeated-music-name (if repeated-music
-			          repeated-music
+				  repeated-music
         			  (begin
-			            (ly:warning (_ "unknown repeat type `~S'") name)
-			            (ly:warning (_ "See define-music-types.scm for supported repeats"))
-			            'VoltaRepeatedMusic))))
+				    (ly:warning (_ "unknown repeat type `~S'") name)
+				    (ly:warning (_ "See define-music-types.scm for supported repeats"))
+				    'VoltaRepeatedMusic))))
     (make-music repeated-music-name)))