*** empty log message ***

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

diff --git a/scm/define-music-types.scm b/scm/define-music-types.scm
index 546dcca2836232ee5fb4be40a326c5a07fe1d24b..a85ea9bc1152b0dad3cd02bb2cc23f93586c1811 100644 (file)
--- a/scm/define-music-types.scm
+++ b/scm/define-music-types.scm
@@ -1,17 +1,10 @@
 
 (define-public music-descriptions
   `(
-    (AbortEvent
-     . (
-   (description .  "End the currently running spanners.")
-       (internal-class-name . "Event")
-       (span-type . "abort")
-       (types . (general-music event abort-event))
-       ))
     (AbsoluteDynamicEvent
      . (
    (description . "Creates a dynamic mark.  Syntax: @var{note}@code{\\x},
-where x is one of \@\{\\ppp, \\pp, \\p, \\mp, \\mf, \\f, \\ff, \\fff.\@\}")
+where x is one of \\ppp, \\pp, \\p, \\mp, \\mf, \\f, \\ff, \\fff.")
        (internal-class-name . "Event")
        (types . (general-music event dynamic-event absolute-dynamic-event))
        ))
@@ -53,7 +46,7 @@ arguments to func are 1. the grob, 2. the originating context,
      . (
    (description .  "Adds an articulation marking to a note.  Syntax:
 @var{note}@code{X}@code{Y}, where X is a direction (up @code{^}, down
-@code{_}, or Lilypond's choice (no direction specified)), and where Y
+@code{_}, or LilyPond's choice (no direction specified)), and where Y
 is an articulation (such as @code{-.}, @code{->}, @code{\\tenuto},
 @code{\\downbow}).  See the user manual for details.")
 
@@ -87,17 +80,9 @@ is an articulation (such as @code{-.}, @code{->}, @code{\\tenuto},
      . (
    (description .  "Starts or stops a beam.  Syntax for manual control:
 c8-[ c c-] c8")
-
        (internal-class-name . "Event")
        (types . (general-music event beam-event span-event))
        ))
-    (NewBeamEvent
-     . (
-   (description .  "Starts or stops a beam.  Syntax for manual control:
-c8-[ c c-] c8")
-       (internal-class-name . "Event")
-       (types . (general-music event new-beam-event span-event))
-       ))
     (BreakEvent
      . (
    (description .  "Creates a line break.  Syntax: \\break.")
@@ -120,6 +105,13 @@ c8-[ c c-] c8")
        (internal-class-name . "Event")
        (types . (general-music event busy-playing-event))
        ))
+    (StartPlayingEvent
+     . (
+       (description .  "Used internally to signal beginning of notes.")
+
+       (internal-class-name . "Event")
+       (types . (general-music event start-playing-event))
+       ))
     
     (ClusterNoteEvent
      . (
@@ -140,7 +132,7 @@ c8-[ c c-] c8")
     
     (CrescendoEvent
      . (
-   (description .  "Begins or ends a crescendo.  Syntax: @var{note}\\cr
+       (description .  "Begins or ends a crescendo.  Syntax: @var{note}\\cr
 ... @var{note}\\rc (you can also use \\<, \\!, \\cresc, and
 \\endcresc.  See the user manual for details.).")
 
@@ -189,6 +181,12 @@ c8-[ c c-] c8")
        (internal-class-name . "Event")
        (types . (general-music event note-grouping-event))
        ))
+    (HarmonicEvent
+     . (
+       (description . "Mark a note as harmonic")
+       (internal-class-name . "Event")
+       (types . (general-music event harmonic-event))
+       ))
     (HyphenEvent
      . (
        (description .  "A hyphen between lyric syllables.")
@@ -223,6 +221,16 @@ Syntax @var{\\addlyrics }@var{music} @var{lyrics}.")
        (types . (general-music lyric-combine-music))
        (iterator-ctor . ,Lyric_combine_music_iterator::constructor)
        ))
+    
+    (NewLyricCombineMusic
+     . (
+       (description .  "Align lyrics to the start of notes.
+Syntax @var{\\addlyrics }@var{music} @var{lyrics}.")
+       (internal-class-name . "Music")
+       (length . ,(ly:make-moment 0 1))
+       (types . (general-music lyric-combine-music))
+       (iterator-ctor . ,New_lyric_combine_music_iterator::constructor)
+       ))
 
     (LyricEvent
      . (
@@ -234,7 +242,7 @@ Syntax @var{\\addlyrics }@var{music} @var{lyrics}.")
        ))
     (MarkEvent
      . (
-       (description .  "Insert a rehearsal mark. Syntax: @code{\mark} @var{marker},
+       (description .  "Insert a rehearsal mark. Syntax: @code{\\mark} @var{marker},
 e.g. @code{\\mark \"A\"}.")
 
        (internal-class-name . "Event")
@@ -252,7 +260,7 @@ e.g. @code{\\mark \"A\"}.")
        (description . "Rests that may be compressed into Multi rests. Syntax
 @code{R2.*4} for 4 measures in 3/4 time. Note the capital R.")
        (internal-class-name . "Event")
-       (types . (general-music event span-event multi-measure-rest-event))
+       (types . (general-music event rhythmic-event multi-measure-rest-event))
        ))
     
     (MultiMeasureTextEvent
@@ -292,7 +300,6 @@ SYNTAX
        (types . (general-music layout-instruction))
        (iterator-ctor . ,      Push_property_iterator::constructor)
        ))
-
     (PartCombineMusic
      . (
        (description .  "Combine two parts on a staff, either merged or
@@ -300,7 +307,7 @@ as separate voices.")
 
        (internal-class-name . "Simultaneous_music")
        (types . (general-music part-combine-music))
-       (iterator-ctor . ,Part_combine_music_iterator::constructor)
+       (iterator-ctor . ,New_pc_iterator::constructor)
        ))
     
     (PhrasingSlurEvent
@@ -314,7 +321,7 @@ as separate voices.")
      . (
        (description .  "Set a context property.
 
-Syntax: @code{\property @var{context}.@var{prop} = @var{scheme-val}}.")
+Syntax: @code{\\property @var{context}.@var{prop} = @var{scheme-val}}.")
        (internal-class-name . "Music")
        (types . (layout-instruction general-music))
        (iterator-ctor . ,Property_iterator::constructor)
@@ -323,7 +330,7 @@ Syntax: @code{\property @var{context}.@var{prop} = @var{scheme-val}}.")
     
     (PropertyUnset
      . (
-       (description .  "Remove the definition of a context @code{\property}.")
+       (description .  "Remove the definition of a context @code{\\property}.")
 
        (internal-class-name . "Music")
        (types . (layout-instruction general-music))
@@ -341,6 +348,12 @@ goes down).")
        (types . (general-music pes-or-flexa-event event))
        ))
 
+    (RelativeOctaveCheck
+     . ((description . "Check if a pitch is in the correct octave.")
+       (internal-class-name . "Relative_octave_check")
+       (types . (general-music relative-octave-check))
+       ))
+    
     (RepeatedMusic
      . (
        (description .  "Repeat music in different ways")
@@ -381,6 +394,26 @@ to group start-mmrest, skip, stop-mmrest sequence. Syntax @code{R2.*5} for 5 mea
        (iterator-ctor . ,Sequential_music_iterator::constructor)
        (types . (general-music sequential-music))
        ))
+
+    (SoloOneEvent
+     . (
+       (description . "Print Solo.1")
+       (internal-class-name . "Event")
+       (part-combine-status . solo1)
+       (types . (general-music event part-combine-event))
+       ))
+    (SoloTwoEvent
+     . (
+       (description . "Print Solo.2")
+       (internal-class-name . "Event")
+       (part-combine-status . solo2)
+       (types . (general-music event part-combine-event))
+       ))
+    (UnisonoEvent
+     . ((description . "Print a2")
+       (internal-class-name .  "Event")
+       (part-combine-status . unisono)
+       (types . (general-music event part-combine-event))))
     
     (SimultaneousMusic
      . (
@@ -484,8 +517,7 @@ For example, transposed music.")
     (EventChord
      . (
        (description .  "Internally used to group a set of events.")
-
-       (internal-class-name . "Simultaneous_music")
+       (internal-class-name . "Event_chord")
        (iterator-ctor . ,Event_chord_iterator::constructor)
        (types . (general-music event-chord simultaneous-music))
        )
@@ -499,9 +531,12 @@ For example, transposed music.")
        (types . (general-music event))
        ))
 
-    (NonEventSkip
+    (SkipMusic
      . (
-       (description .  "Filler that takes up duration, but does not print anything. This also does not create any event-accepting contexts. ")
+       (description .  "Filler that takes up duration, does not print anything, and also
+does not create staffs or voices implicitly.
+
+Syntax: @code{\\skip }@var{duration}.")
        (internal-class-name . "Music")
        (length . ,ly:music-duration-length)
        (iterator-ctor . ,Simple_music_iterator::constructor)
@@ -510,12 +545,13 @@ For example, transposed music.")
      
     (SkipEvent
      . (
-       (description .  "Filler that takes up duration, but does not print anything.")
+       (description .  "Filler that takes up duration, but does not print anything.
+
+Syntax: @code{s}@var{duration}")
 
        (internal-class-name . "Event")
        (types . (general-music event rhythmic-event skip-event))
        ))
-    
     (SpanEvent
      . (
        (description .  "Event for anything that is started at a different time than stopped.")
@@ -567,16 +603,10 @@ For example, transposed music.")
        (types . (general-music script-event text-script-event event))
        )) 
     (TieEvent
-     . (
-       (description .  "A tie.  Entered as @code{~}.")
-       (internal-class-name . "Event")
-       (types . (general-music tie-event event))
-       ))
-    (NewTieEvent
      . (
        (description .  "A tie.  Entered as @var{note}-~.")
        (internal-class-name . "Event")
-       (types . (general-music new-tie-event event))
+       (types . (general-music tie-event event))
        ))
     (TremoloEvent
      . (