Merge branch 'master' of ssh+git://hanwen@git.sv.gnu.org/srv/git/lilypond

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

diff --git a/scm/define-music-types.scm b/scm/define-music-types.scm
index 99036e4ed49f9c0fea41f5e0878a51bad20a3187..03ac6f83e3dd3317bfec84ba56447d617dadd8ea 100644 (file)
--- a/scm/define-music-types.scm
+++ b/scm/define-music-types.scm
@@ -126,7 +126,7 @@ Syntax:
        )) 
     (ContextChange
      . (
-       (description .  "Change staffs in Piano staff. 
+       (description .  "Change staves in Piano staff. 
 
 Syntax @code{\\translator Staff = @var{new-id}}.")
        (iterator-ctor . , ly:change-iterator::constructor)
@@ -283,14 +283,6 @@ e.g. @code{\\mark \"A\"}.")
 
        (types . (general-music mark-event event))
        ))
-    (ManualMelismaEvent
-     . (
-       (description .  "Start or stop a melisma.
-
-Syntax: @code{c4\\melisma d\\melismaEnd}.")
-       (types . (general-music melisma-span-event event))
-       ))
-
     (MultiMeasureRestMusic
      . (
        (description . "Rests that may be compressed into Multi rests. 
@@ -387,7 +379,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
@@ -572,7 +564,7 @@ For example, transposed music.")
     (SkipMusic
      . (
        (description .  "Filler that takes up duration, does not print anything, and also
-does not create staffs or voices implicitly.
+does not create staves or voices implicitly.
 
 
 
@@ -751,7 +743,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))