X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fdefine-music-types.scm;h=348bcd0e87228669e281cf379f5fc10332ac6396;hb=b872748c6aa8bb721ced458691b38ac2fac5dfc8;hp=30903edb7b0fe867b6f6319e39c6aa8dc62d659c;hpb=e8d5061834a5a658c5ffd078237e9cd660069a7d;p=lilypond.git

diff --git a/scm/define-music-types.scm b/scm/define-music-types.scm
index 30903edb7b..348bcd0e87 100644
--- a/scm/define-music-types.scm
+++ b/scm/define-music-types.scm
@@ -386,11 +386,6 @@ Syntax: @code{\\override} [ @var{context} @code{.} ]
         (types . (break-event page-turn-event event))
         ))
 
-    (PartCombineForceEvent
-     . ((description . "Override the part-combiner's strategy.")
-        (types . (part-combine-force-event event))
-        ))
-
     (PartialSet
      . ((description . "Create an anacrusis or upbeat (partial measure).")
         (iterator-ctor . ,ly:partial-iterator::constructor)
@@ -411,6 +406,14 @@ as separate voices.")
         (iterator-ctor . ,ly:part-combine-iterator::constructor)
         ))
 
+    (PartCombinePartMusic
+     . ((description . "A part to be combined with other parts on a staff.")
+        (length-callback . ,ly:music-wrapper::length-callback)
+        (start-callback . ,ly:music-wrapper::start-callback)
+        (iterator-ctor . ,ly:part-combine-part-iterator::constructor)
+        (types . (part-combine-part-music music-wrapper-music))
+        ))
+
     (PercentEvent
      . ((description . "Used internally to signal percent repeats.")
         (types . (event percent-event rhythmic-event))
@@ -435,7 +438,6 @@ goes down).")
      . ((description . "Start or end phrasing slur.
 
 Syntax: @var{note}@code{\\(} and @var{note}@code{\\)}")
-        (spanner-id . "")
         (types . (post-event span-event event phrasing-slur-event))
         ))
 
@@ -478,7 +480,7 @@ Syntax: @code{\\unset @var{context}.@var{prop}}")
         ))
 
     (RelativeOctaveMusic
-     . ((description . "Music that was entered in relative octave notation.")
+     . ((description . "Music in which the assignment of octaves is complete.")
         (to-relative-callback . ,ly:relative-octave-music::relative-callback)
         (iterator-ctor . ,ly:music-wrapper-iterator::constructor)
         (length-callback . ,ly:music-wrapper::length-callback)
@@ -567,7 +569,6 @@ Syntax: @code{\\skip} @var{duration}")
      . ((description . "Start or end slur.
 
 Syntax: @var{note}@code{(} and @var{note}@code{)}")
-        (spanner-id . "")
         (types . (post-event span-event event slur-event))
         ))
 
@@ -733,6 +734,7 @@ to absolute notation.  For example, transposed music.")
         (to-relative-callback . ,ly:relative-octave-music::no-relative-callback)
         (iterator-ctor . ,ly:music-wrapper-iterator::constructor)
         (length-callback . ,ly:music-wrapper::length-callback)
+        (start-callback . ,ly:music-wrapper::start-callback)
         (types . (music-wrapper-music unrelativable-music))
         ))