* VERSION (PATCH_LEVEL): bump version.

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

diff --git a/scm/define-music-types.scm b/scm/define-music-types.scm
index 3043c8aa52c4eb4be6dfc7ff2d865e5e26c68318..61f53d40a7a92555c9fdb932fcacf2b8e6ce9ecb 100644 (file)
--- 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
@@ -50,7 +49,7 @@ arguments to func are 1. the grob, 2. the originating context,
 3. context where FUNC is called.
 
 ")
-       (types . (general-music event layout-instruction))
+       (types . (general-music event apply-output-event))
        ))
     (ArpeggioEvent 
      . (
@@ -104,18 +103,11 @@ 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 fall-event event))))
+       (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))
-       ))
-    (BreathingSignEvent
+    (BreathingEvent
      . (
        (description .  "Creates a `breath mark' or `comma'.  
 
@@ -124,12 +116,6 @@ Syntax:
 
        (types . (general-music event breathing-event))
        )) 
-    (BusyPlayingEvent
-     . (
-       (description .  "Used internally to signal beginning and ending of notes.")
-
-       (types . (general-music event busy-playing-event))
-       ))
     (ContextChange
      . (
        (description .  "Change staffs in Piano staff. 
@@ -163,13 +149,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
@@ -195,7 +181,7 @@ Syntax: @var{note}\\cr
        ))
 
     
-    (FingerEvent
+    (FingeringEvent
      . (
        (description . "Specify what finger to use for this note.")
        (types . (general-music fingering-event event))
@@ -260,7 +246,7 @@ Syntax: @var{note}\\laissezVibrer.")
     (LineBreakEvent
      . (
        (description .  "Allow, forbid or force a line break.")
-       (types . (general-music break-event event))
+       (types . (general-music line-break-event break-event event))
        ))
     
     (LyricCombineMusic
@@ -289,11 +275,6 @@ e.g. @code{\\mark \"A\"}.")
 
        (types . (general-music mark-event event))
        ))
-    (MelismaPlayingEvent
-     . (
-       (description .  "Used internally to signal melismas.")
-       (types . (general-music melisma-playing-event event))
-       ))
     (ManualMelismaEvent
      . (
        (description .  "Start or stop a melisma.
@@ -348,18 +329,18 @@ SYNTAX
 
 @code{\\override [ @var{Ctxt} . ] @var{Obj} @var{prop} = @var{val}}
 ")
-       (types . (general-music layout-instruction))
+       (types . (general-music layout-instruction-event override-property-event))
        (iterator-ctor . ,ly:push-property-iterator::constructor)
        ))
     (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
      . (
@@ -383,7 +364,7 @@ Syntax NOTE \\(  and \\) NOTE")
        (description .  "Set a context property.
 
 Syntax: @code{\\property @var{context}.@var{prop} = @var{scheme-val}}.")
-       (types . (layout-instruction general-music))
+       (types . (layout-instruction-event general-music))
        (iterator-ctor . ,ly:property-iterator::constructor)
        ))
 
@@ -391,7 +372,7 @@ Syntax: @code{\\property @var{context}.@var{prop} = @var{scheme-val}}.")
      . (
        (description .  "Remove the definition of a context @code{\\property}.")
 
-       (types . (layout-instruction general-music))
+       (types . (layout-instruction-event general-music))
        (iterator-ctor . ,ly:property-unset-iterator::constructor)
        ))
 
@@ -449,7 +430,7 @@ Syntax @code{r4} for a quarter rest. ")
 previously added property from a graphical object definition
  ")
 
-       (types . (general-music layout-instruction))
+       (types . (general-music layout-instruction-event))
        (iterator-ctor . ,      ly:pop-property-iterator::constructor)
        ))
 
@@ -470,18 +451,18 @@ Syntax \\sequential @{..@} or simply @{..@} .")
      . (
        (description . "Print Solo.1")
        (part-combine-status . solo1)
-       (types . (general-music event part-combine-event))
+       (types . (general-music event part-combine-event solo-one-event))
        ))
     (SoloTwoEvent
      . (
        (description . "Print Solo.2")
        (part-combine-status . solo2)
-       (types . (general-music event part-combine-event))
+       (types . (general-music event part-combine-event solo-two-event))
        ))
     (UnisonoEvent
      . ((description . "Print a2")
        (part-combine-status . unisono)
-       (types . (general-music event part-combine-event))))
+       (types . (general-music event part-combine-event unisono-event))))
     
     (SimultaneousMusic
      . (
@@ -513,13 +494,6 @@ Syntax NOTE(        and NOTE) ")
        (types . (general-music event span-event staff-span-event))
      ))
     
-    (StartPlayingEvent
-     . (
-       (description .  "Used internally to signal beginning of notes.")
-
-       (types . (general-music event start-playing-event))
-       ))
-    
     (TextSpanEvent
      . (
        (description . "Start a text spanner like 8va.....|")
@@ -555,10 +529,10 @@ Syntax @code{\\times @var{fraction} @var{music}}, e.g.
        (types . (time-scaled-music music-wrapper-music general-music))
        ))
 
-    (TupletEvent
+    (TupletSpanEvent
      . (
        (description .  "Used internally to signal where tuplet brackets start and stop.")
-       (types . (tuplet-spanner-event span-event event general-music))
+       (types . (tuplet-span-event span-event event general-music))
        ))
 
     (UnrelativableMusic
@@ -625,19 +599,19 @@ Syntax: @code{s}@var{duration}")
     (SustainEvent
      . (
        (description . "Depress or release sustain pedal. ")
-       (types . (general-music event pedal-event sustain-pedal-event))
+       (types . (general-music event pedal-event sustain-event))
        ))
     
     (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
@@ -649,11 +623,14 @@ Syntax: @code{\\@var{number}}.")
        (types . (general-music string-number-event event))
        )) 
 
-    (MetronomeChangeEvent
+    (StringFingerEvent
      . (
-       (description .  "Change tempo setting (in beats per minute).")
-       (types . (general-music metronome-change-event tempo-event event))
-       ))
+       (description .  "Specify with which finger to pluck a string. 
+
+Syntax: @code{\\rightHandFinger @var{text}}.")
+
+       (types . (general-music string-finger-event event))
+       )) 
     
     (TextScriptEvent
      . (