X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fdefine-music-types.scm;h=8dbc6decc04276d15e18220d396aafecc6e00408;hb=8d8982cc88ba1d0b20df5aff22b9555f76976a26;hp=ac2e5f9723cbd0b47ac477c4aafd08d8127ea172;hpb=3a8ec248ca3bd6bd04490f386949a95a4140338d;p=lilypond.git

diff --git a/scm/define-music-types.scm b/scm/define-music-types.scm
index ac2e5f9723..8dbc6decc0 100644
--- a/scm/define-music-types.scm
+++ b/scm/define-music-types.scm
@@ -1,6 +1,6 @@
 ;;;; This file is part of LilyPond, the GNU music typesetter.
 ;;;;
-;;;; Copyright (C) 1998--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+;;;; Copyright (C) 1998--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 ;;;;		     Jan Nieuwenhuizen <janneke@gnu.org>
 ;;;;
 ;;;; LilyPond is free software: you can redistribute it and/or modify
@@ -16,6 +16,9 @@
 ;;;; You should have received a copy of the GNU General Public License
 ;;;; along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 
+; for define-safe-public when byte-compiling using Guile V2
+(use-modules (scm safe-utility-defs))
+
 ;; TODO: should link back into user manual.
 
 (define-public music-descriptions
@@ -29,6 +32,11 @@ Syntax: @var{note}@code{\\x}, where @code{\\x} is a dynamic mark like
 	(types . (general-music event dynamic-event absolute-dynamic-event))
 	))
 
+    (AlternativeEvent
+     . ((description . "Create a alternative event.")
+        (types . (general-music event alternative-event))
+	))
+
     (AnnotateOutputEvent
      . ((description . "Print an annotation of an output element.")
 	(types . (general-music event annotate-output-event))
@@ -55,7 +63,7 @@ context, and 3.@tie{}the context where @var{func} is called.")
     (ArpeggioEvent
      . ((description . "Make an arpeggio on this note.
 
-Syntax: @var{note}@code{-\\arpeggio}")
+Syntax: @w{@var{note}@code{-\\arpeggio}}")
 	(types . (general-music arpeggio-event event))
 	))
 
@@ -67,7 +75,7 @@ Syntax: @var{note}@code{-\\arpeggio}")
 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}).
+(such as @w{@code{-.}}, @w{@code{->}}, @code{\\tenuto}, @code{\\downbow}).
 See the Notation Reference for details.")
 	(types . (general-music event articulation-event script-event))
 	))
@@ -111,7 +119,7 @@ Syntax for manual control: @code{c8-[ c c-] c8}")
 	))
 
     (BendAfterEvent
-     . ((description . "A drop/fall/doit jazz articulation.")
+     . ((description . "A drop/@/fall/@/doit jazz articulation.")
 	(types . (general-music bend-after-event event))))
 
     (BreathingEvent
@@ -175,6 +183,11 @@ An alternative syntax is @var{note}@code{\\decr} @dots{}
 		  event))
 	))
 
+    (DoublePercentEvent
+     . ((description . "Used internally to signal double percent repeats.")
+	(types . (general-music event double-percent-event rhythmic-event))
+	))
+
     (EpisemaEvent
      . ((description . "Begin or end an episema.")
 	(types . (general-music span-event event episema-event))
@@ -204,6 +217,11 @@ An alternative syntax is @var{note}@code{\\decr} @dots{}
 	(types . (general-music fingering-event event))
 	))
 
+    (FootnoteEvent
+     . ((description . "Footnote a grob.")
+	(types . (general-music event footnote-event))
+	))
+
     (GlissandoEvent
      . ((description . "Start a glissando on this note.")
 	(types . (general-music glissando-event event))
@@ -375,7 +393,7 @@ as separate voices.")
 	))
 
     (PercentRepeatedMusic
-     . ((description . "Repeats encoded by percents.")
+     . ((description . "Repeats encoded by percents and slashes.")
 	(iterator-ctor . ,ly:percent-repeat-iterator::constructor)
 	(start-callback .  ,ly:repeated-music::first-start)
 	(length-callback . ,ly:repeated-music::unfolded-music-length)
@@ -393,6 +411,7 @@ goes down).")
      . ((description . "Start or end phrasing slur.
 
 Syntax: @var{note}@code{\\(} and @var{note}@code{\\)}")
+        (spanner-id . "")
 	(types . (general-music span-event event phrasing-slur-event))
 	))
 
@@ -450,6 +469,11 @@ Syntax: @code{\\unset @var{context}.@var{prop}}")
 	(types . (general-music repeated-music))
 	))
 
+    (RepeatSlashEvent
+     . ((description . "Used internally to signal beat repeats.")
+	(types . (general-music event repeat-slash-event rhythmic-event))
+	))
+
     (RepeatTieEvent
      . ((description . "Ties for starting a second volta bracket.")
 	(types . (general-music event repeat-tie-event))
@@ -519,6 +543,7 @@ Syntax: @code{\\skip} @var{duration}")
      . ((description . "Start or end slur.
 
 Syntax: @var{note}@code{(} and @var{note}@code{)}")
+        (spanner-id . "")
 	(types . (general-music span-event event slur-event))
 	))
 
@@ -573,6 +598,11 @@ Syntax: @code{\\rightHandFinger @var{text}}")
 	(types . (general-music event pedal-event sustain-event))
 	))
 
+    (TempoChangeEvent
+     . ((description . "A metronome mark or tempo indication.")
+	(types . (general-music event tempo-change-event))
+	))
+
     (TextScriptEvent
      . ((description . "Print text.")
 	(types . (general-music script-event text-script-event event))
@@ -587,7 +617,7 @@ octavation.")
     (TieEvent
      . ((description . "A tie.
 
-Syntax: @var{note}@code{-~}")
+Syntax: @w{@var{note}@code{-~}}")
 	(types . (general-music tie-event event))
 	))
 
@@ -687,6 +717,7 @@ Syntax: @code{\\\\}")
     (VoltaRepeatedMusic
      . ((description . "Repeats with alternatives placed sequentially.")
 	(iterator-ctor . ,ly:volta-repeat-iterator::constructor)
+	(elements-callback . ,make-volta-set)
 	(start-callback .  ,ly:repeated-music::first-start)
 	(length-callback . ,ly:repeated-music::volta-music-length)
 	(types . (general-music repeated-music volta-repeated-music))
@@ -696,7 +727,7 @@ Syntax: @code{\\\\}")
 (set! music-descriptions
       (sort music-descriptions alist<?))
 
-(define-public music-name-to-property-table (make-vector 59 '()))
+(define-public music-name-to-property-table (make-hash-table 59))
 
 ;; init hash table,
 ;; transport description to an object property.