* scm/output-lib.scm (note-head-style->attachment-coordinates):

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

diff --git a/scm/define-music-types.scm b/scm/define-music-types.scm
index e44981c1764d7f49995c4ac6d4ddcc955bf5b977..130bce3e0eacafcc5d9c21fd1fd244c5a2947268 100644 (file)
--- a/scm/define-music-types.scm
+++ b/scm/define-music-types.scm
@@ -53,7 +53,7 @@ arguments to func are 1. the grob, 2. the originating context,
      . (
    (description .  "Adds an articulation marking to a note.  Syntax:
 @var{note}@code{X}@code{Y}, where X is a direction (up @code{^}, down
-@code{_}, or Lilypond's choice (no direction specified)), and where Y
+@code{_}, or LilyPond's choice (no direction specified)), and where Y
 is an articulation (such as @code{-.}, @code{->}, @code{\\tenuto},
 @code{\\downbow}).  See the user manual for details.")
 
@@ -87,17 +87,9 @@ 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 beam-event span-event))
        ))
-    (NewBeamEvent
-     . (
-   (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))
-       ))
     (BreakEvent
      . (
    (description .  "Creates a line break.  Syntax: \\break.")
@@ -119,13 +111,17 @@ c8-[ c c-] c8")
 
        (internal-class-name . "Event")
        (types . (general-music event busy-playing-event))
-       )) 
-    (ClusterEvent
+       ))
+    
+    (ClusterNoteEvent
      . (
-       (description .  "Begins or ends a cluster.")
+       (description .  "A note that is part of a cluster.")
        (internal-class-name . "Event")
-       (types . (general-music cluster-event span-event event))
-       )) 
+
+       ; not a note-event, to ensure that Note_engraver doesn't eat it. 
+       (types . (general-music cluster-note-event melodic-event rhythmic-event event))
+       ))
+    
     (ContextSpeccedMusic
      . (
        (description .  "Interpret the argument music within a specific context.")
@@ -133,6 +129,7 @@ c8-[ c c-] c8")
        (internal-class-name . "Music_wrapper")
        (types . (context-specification general-music music-wrapper-music))
        ))
+    
     (CrescendoEvent
      . (
    (description .  "Begins or ends a crescendo.  Syntax: @var{note}\\cr
@@ -336,6 +333,12 @@ goes down).")
        (types . (general-music pes-or-flexa-event event))
        ))
 
+    (RelativeOctaveCheck
+     . ((description . "Check if a pitch is in the correct octave.")
+       (internal-class-name . "Relative_octave_check")
+       (types . (general-music relative-octave-check))
+       ))
+    
     (RepeatedMusic
      . (
        (description .  "Repeat music in different ways")
@@ -390,6 +393,7 @@ SYNTAX
        
        (types . (general-music simultaneous-music))
        ))
+    
     (SlurEvent
      . (
        (description . "Start or end slur. Syntax NOTE(  and )NOTE")
@@ -478,8 +482,7 @@ For example, transposed music.")
     (EventChord
      . (
        (description .  "Internally used to group a set of events.")
-
-       (internal-class-name . "Simultaneous_music")
+       (internal-class-name . "Event_chord")
        (iterator-ctor . ,Event_chord_iterator::constructor)
        (types . (general-music event-chord simultaneous-music))
        )
@@ -492,7 +495,16 @@ For example, transposed music.")
        (internal-class-name . "Event")
        (types . (general-music event))
        ))
-    
+
+    (NonEventSkip
+     . (
+       (description .  "Filler that takes up duration, but does not print anything. This also does not create any event-accepting contexts. ")
+       (internal-class-name . "Music")
+       (length . ,ly:music-duration-length)
+       (iterator-ctor . ,Simple_music_iterator::constructor)
+       (types . (general-music event rhythmic-event skip-event))
+       ))
+     
     (SkipEvent
      . (
        (description .  "Filler that takes up duration, but does not print anything.")
@@ -552,16 +564,10 @@ For example, transposed music.")
        (types . (general-music script-event text-script-event event))
        )) 
     (TieEvent
-     . (
-       (description .  "A tie.  Entered as @code{~}.")
-       (internal-class-name . "Event")
-       (types . (general-music tie-event event))
-       ))
-    (NewTieEvent
      . (
        (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
      . (
@@ -607,7 +613,7 @@ For example, transposed music.")
        (types . (general-music repeated-music percent-repeated-music))
        ))
     
-    (TremoloRepeteadMusic
+    (TremoloRepeatedMusic
      . (
        (iterator-ctor . ,Chord_tremolo_iterator::constructor)
        (description .  "Repeated notes denoted by tremolo beams.")
@@ -682,7 +688,7 @@ For example, transposed music.")
                '(("volta" . VoltaRepeatedMusic)
                  ("unfold" . UnfoldedRepeatedMusic)
                  ("percent" . PercentRepeatedMusic)
-                 ("tremolo" . TremoloRepeteadMusic)
+                 ("tremolo" . TremoloRepeatedMusic)
                  ("fold" . FoldedRepeatedMusic)
                  )))
        (music-name