Doc-de: updating includes, learning, notation

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

diff --git a/scm/define-music-types.scm b/scm/define-music-types.scm
index d57cba811816f44214c150b8e781ae403eac8f95..8dbc6decc04276d15e18220d396aafecc6e00408 100644 (file)
--- a/scm/define-music-types.scm
+++ b/scm/define-music-types.scm
@@ -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
@@ -403,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))
        ))
 
@@ -534,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))
        ))
 
@@ -607,7 +617,7 @@ octavation.")
     (TieEvent
      . ((description . "A tie.
 
-Syntax: @var{note}@code{-~}")
+Syntax: @w{@var{note}@code{-~}}")
        (types . (general-music tie-event event))
        ))
 
@@ -707,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))