X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fdefine-music-types.scm;h=e7e2bb88cf960b992881c1b851e73e50f34aad3e;hb=03ce3667568361ee7433032988a4089c64de2ec7;hp=41ded2f8719b61319ed51ded6c15b67a70494305;hpb=04246201be3c674f212817fafc0cd074e985929a;p=lilypond.git

diff --git a/scm/define-music-types.scm b/scm/define-music-types.scm
index 41ded2f871..e7e2bb88cf 100644
--- a/scm/define-music-types.scm
+++ b/scm/define-music-types.scm
@@ -2,14 +2,13 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;; 
-;;;; (c) 1998--2006 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+;;;; (c) 1998--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 ;;;;		     Jan Nieuwenhuizen <janneke@gnu.org>
 
 ;; TODO: should link back into user manual.
 
 (define (mm-rest-child-list music)
-  "Check if we have R1*4-\\markup { .. }, and if applicable convert to
-a property set for MultiMeasureRestNumber."
+  "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
@@ -31,12 +30,19 @@ Syntax: @var{note}@code{\\x},
 where x is one of \\ppp, \\pp, \\p, \\mp, \\mf, \\f, \\ff, \\fff.")
 	(types . (general-music event dynamic-event absolute-dynamic-event))
 	))
+
+    (AnnotateOutputEvent
+     . ((description . "Print an annotation of an output element.")
+	(types . (general-music event annotate-output-event))
+	))
+	
     (ApplyContext
      . (
 	(description . "Call the argument with the current context during interpreting phase")
 	(types . (general-music apply-context))
 	(iterator-ctor . ,ly:apply-context-iterator::constructor)
 	))
+    
     (ApplyOutputEvent
      . (
 	(description . "
@@ -96,6 +102,7 @@ is an articulation (such as @code{-.}, @code{->}, @code{\\tenuto},
 
 	(types . (general-music event rhythmic-event bass-figure-event))
 	))
+    
     (BeamEvent
      . (
 	(description .  "Starts or stops a beam.  
@@ -104,17 +111,10 @@ Syntax for manual control:
 c8-[ c c-] c8")
 	(types . (general-music event beam-event span-event))
 	))
-
     (BendAfterEvent
      . ((description . "A drop/fall/doit jazz articulation")
 	(types . (general-music bend-after-event event))))
 
-    (BreakEvent
-     . (
-	(description .  "Create a line break, Syntax: \\break or page break, Syntax: \\pagebreak.")
-	
-	(types . (general-music break-event event))
-	))
     (BreathingEvent
      . (
 	(description .	"Creates a `breath mark' or `comma'.  
@@ -157,13 +157,13 @@ Syntax: @var{note}\\cr
 ... @var{note}\\rc (you can also use \\<, \\!, \\cresc, and
 \\endcresc.  See the user manual for details.).")
 
-	(types . (general-music dynamic-event crescendo-event event))
+	(types . (general-music span-event span-dynamic-event crescendo-event event))
 	)) 
     (DecrescendoEvent
      . (
 	(description .	"See @ref{CrescendoEvent}.")
 
-	(types . (general-music dynamic-event decrescendo-event event))
+	(types . (general-music span-event span-dynamic-event decrescendo-event event))
 	))
     
     (ExtenderEvent
@@ -343,12 +343,12 @@ SYNTAX
     (PageBreakEvent
      . (
 	(description .  "Allow, forbid or force a page break.")
-	(types . (general-music break-event event))
+	(types . (general-music break-event page-break-event event))
 	))
     (PageTurnEvent
      . (
 	(description .  "Allow, forbid or force a page turn.")
-	(types . (general-music break-event event))
+	(types . (general-music break-event page-turn-event event))
 	))
     (PartCombineMusic
      . (
@@ -387,7 +387,7 @@ Syntax: @code{\\property @var{context}.@var{prop} = @var{scheme-val}}.")
     (PercentEvent
      . (
 	(description .	"Used internally to signal percent repeats.")
-	(types . (general-music event percent-event))
+	(types . (general-music event percent-event rhythmic-event))
 	))
 
     (PesOrFlexaEvent
@@ -613,13 +613,13 @@ Syntax: @code{s}@var{duration}")
     (SostenutoEvent
      . (
 	(description . "Depress or release sostenuto pedal. ")
-	(types . (general-music event pedal-event sostenuto-pedal-event))
+	(types . (general-music event pedal-event sostenuto-event))
 	))
     
     (UnaCordaEvent
      . (
 	(description . "Depress or release una-corda pedal.")
-	(types . (general-music event pedal-event una-corda-pedal-event))
+	(types . (general-music event pedal-event una-corda-event))
 	))
     
     (StringNumberEvent
@@ -631,6 +631,15 @@ Syntax: @code{\\@var{number}}.")
 	(types . (general-music string-number-event event))
 	)) 
 
+    (StrokeFingerEvent
+     . (
+	(description .	"Specify with which finger to pluck a string. 
+
+Syntax: @code{\\rightHandFinger @var{text}}.")
+
+	(types . (general-music stroke-finger-event event))
+	)) 
+    
     (TextScriptEvent
      . (
 	(description .	"")
@@ -742,7 +751,7 @@ and values. E.g:
       (ly:error (_ "symbol expected: ~S") name))
   (let ((props (hashq-ref music-name-to-property-table name '())))
     (if (not (pair? props))
-	(ly:error (_ "can't find music object: ~S") name))
+	(ly:error (_ "cannot find music object: ~S") name))
     (let ((m (ly:make-music props)))
       (define (set-props mus-props)
 	(if (and (not (null? mus-props))