* input/template/piano-dynamics.ly (pedal): Updated definition of

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

diff --git a/scm/define-music-types.scm b/scm/define-music-types.scm
index 2bc5bc9a6de1c1aa24692e74cd008392e831d42d..acdceff21164c5add15a40c9478969e02984dc19 100644 (file)
--- a/scm/define-music-types.scm
+++ b/scm/define-music-types.scm
@@ -11,7 +11,7 @@
     (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))
        ))
@@ -88,7 +88,7 @@ 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 new-beam-event span-event))
+       (types . (general-music event beam-event span-event))
        ))
     (BreakEvent
      . (
@@ -112,6 +112,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
      . (
@@ -215,6 +222,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
      . (
@@ -226,7 +243,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")
@@ -294,6 +311,15 @@ as separate voices.")
        (types . (general-music part-combine-music))
        (iterator-ctor . ,Part_combine_music_iterator::constructor)
        ))
+    (NewPartCombineMusic
+     . (
+       (description .  "Combine two parts on a staff, either merged or
+as separate voices.")
+
+       (internal-class-name . "Simultaneous_music")
+       (types . (general-music part-combine-music))
+       (iterator-ctor . ,New_pc_iterator::constructor)
+       ))
     
     (PhrasingSlurEvent
      . (
@@ -306,7 +332,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)
@@ -315,7 +341,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))
@@ -567,7 +593,7 @@ For example, transposed music.")
      . (
        (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
      . (