Run `make grand-replace'.

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

diff --git a/scm/define-music-types.scm b/scm/define-music-types.scm
index bdc845c54fb8b3b76e539877b25d05e3c1e92ea2..ba4459b8a32a671404fd62ce0c446f3cb4606954 100644 (file)
--- a/scm/define-music-types.scm
+++ b/scm/define-music-types.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;;
-;;;; (c) 1998--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+;;;; (c) 1998--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 ;;;;                Jan Nieuwenhuizen <janneke@gnu.org>
 
 ;; TODO: should link back into user manual.
@@ -65,13 +65,13 @@ Syntax: @var{note}@code{-\\arpeggio}")
     ;; todo: use articulation-event for slur as well.
     ;; separate non articulation scripts
     (ArticulationEvent
-     . ((description .  "Add an articulation marking to a note.
+     . ((description . "Add an articulation marking to a note.
 
 Syntax: @var{note}@code{x}@code{y}, where @code{x} is a direction
 (@code{^} for up or @code{_} for down), or LilyPond's choice
 (no direction specified)), and where @code{y} is an articulation
 (such as @code{-.}, @code{->}, @code{\\tenuto}, @code{\\downbow}).
-See the user manual for details.")
+See the Notation Reference for details.")
        (types . (general-music event articulation-event script-event))
        ))
 
@@ -150,7 +150,7 @@ specific context.")
 Syntax: @var{note}@code{\\cr} @dots{} @var{note}@code{\\rc}
 
 You can also use @code{\\<}, @code{\\!}, @code{\\cresc}, and
-@code{\\endcresc}.  See the user manual for details.")
+@code{\\endcresc}.  See the Notation Reference for details.")
        (types . (general-music span-event span-dynamic-event crescendo-event
                  event))
        ))
@@ -185,14 +185,6 @@ You can also use @code{\\<}, @code{\\!}, @code{\\cresc}, and
        (types . (general-music fingering-event event))
        ))
 
-    (FoldedRepeatedMusic
-     . ((description . "Repeats with alternatives placed in parallel.")
-       (iterator-ctor . ,ly:folded-repeat-iterator::constructor)
-       (start-callback .  ,ly:repeated-music::minimum-start)
-       (length-callback . ,ly:repeated-music::folded-music-length)
-       (types . (general-music repeated-music folded-repeated-music))
-       ))
-
     (GlissandoEvent
      . ((description . "Start a glissando on this note.")
        (types . (general-music glissando-event event))
@@ -578,8 +570,8 @@ Syntax: @code{\\times @var{fraction} @var{music}}, e.g.
        ))
 
     (TremoloRepeatedMusic
-     . ((iterator-ctor . ,ly:chord-tremolo-iterator::constructor)
-       (description . "Repeated notes denoted by tremolo beams.")
+     . ((description . "Repeated notes denoted by tremolo beams.")
+       (iterator-ctor . ,ly:chord-tremolo-iterator::constructor)
        (start-callback .  ,ly:repeated-music::first-start)
        ;; the length of the repeat is handled by shifting the note logs
        (length-callback . ,ly:repeated-music::folded-music-length)
@@ -587,8 +579,7 @@ Syntax: @code{\\times @var{fraction} @var{music}}, e.g.
        ))
 
     (TremoloSpanEvent
-     . (
-       (description . "Tremolo over two stems")
+     . ((description . "Tremolo over two stems")
        (types . (general-music event span-event tremolo-span-event))
        ))
 
@@ -598,7 +589,7 @@ Syntax: @code{\\times @var{fraction} @var{music}}, e.g.
        ))
 
     (TupletSpanEvent
-     . ((description .  "Used internally to signal where tuplet
+     . ((description . "Used internally to signal where tuplet
 brackets start and stop.")
        (types . (tuplet-span-event span-event event general-music))
        ))
@@ -609,7 +600,8 @@ brackets start and stop.")
        ))
 
     (UnfoldedRepeatedMusic
-     . ((description . "DOCME")
+     . ((description . "Repeated music which is fully written
+(and played) out.")
        (iterator-ctor . ,ly:unfolded-repeat-iterator::constructor)
        (start-callback .  ,ly:repeated-music::first-start)
        (types . (general-music repeated-music unfolded-repeated-music))
@@ -638,7 +630,7 @@ Syntax: @code{\\\\}")
        ))
 
     (VoltaRepeatedMusic
-     . ((description . "DOCME")
+     . ((description . "Repeats with alternatives placed sequentially.")
        (iterator-ctor . ,ly:volta-repeat-iterator::constructor)
        (start-callback .  ,ly:repeated-music::first-start)
        (length-callback . ,ly:repeated-music::volta-music-length)
@@ -668,7 +660,7 @@ Syntax: @code{\\\\}")
 
 (define-safe-public (make-music name . music-properties)
   "Create a music object of given name, and set its properties
-according to @code{music-properties}, a list of alterning property symbols
+according to @code{music-properties}, a list of alternating property symbols
 and values. E.g:
   (make-music 'OverrideProperty
              'symbol 'Stem
@@ -693,12 +685,11 @@ and values. E.g:
   (let* ((handle (assoc name '(("volta" . VoltaRepeatedMusic)
                               ("unfold" . UnfoldedRepeatedMusic)
                               ("percent" . PercentRepeatedMusic)
-                              ("tremolo" . TremoloRepeatedMusic)
-                              ("fold" . FoldedRepeatedMusic))))
+                              ("tremolo" . TremoloRepeatedMusic))))
         (music-name (if (pair? handle)
                         (cdr handle)
                         (begin
                           (ly:warning (_ "unknown repeat type `~S'") name)
-                          (ly:warning (_ "See music-types.scm for supported repeats"))
+                          (ly:warning (_ "See define-music-types.scm for supported repeats"))
                           'VoltaRepeatedMusic))))
     (make-music music-name)))