Merge branch 'master' of /home/jcharles/GIT/Lily/. into translation

[lilypond.git] / ly / property-init.ly

diff --git a/ly/property-init.ly b/ly/property-init.ly
index 7a06995ffebee55775de6c26f6295110fb4b3aac..85adb52bb08b5b3314cecfed4d249097a2de86f2 100644 (file)
--- a/ly/property-init.ly
+++ b/ly/property-init.ly
@@ -26,7 +26,7 @@ piano styles, which use @samp{GrandStaff} as a context." )
     ((1) (set-accidental-style (car style)))
     ((2) (set-accidental-style (cadr style) (car style)))
     (else
-     (ly:parser-error (*parser*) (_ "not an accidental style")
+     (ly:parser-error (_ "not an accidental style")
       (*location*))
      (make-music 'Music))))
 
@@ -405,6 +405,21 @@ palmMute =
    (_i "Print @var{note} with a triangle-shaped note head.")
    (style-note-heads 'NoteHead 'do note))
 
+%% part combiner
+
+partcombineForce =
+#(define-music-function (type) ((symbol?))
+   (_i "Override the part-combiner.")
+   (if type (propertySet 'partCombineForced type)
+       (propertyUnset 'partCombineForced)))
+
+partcombineApart = \partcombineForce #'apart
+partcombineChords = \partcombineForce #'chords
+partcombineUnisono = \partcombineForce #'unisono
+partcombineSoloI = \partcombineForce #'solo1
+partcombineSoloII = \partcombineForce #'solo2
+partcombineAutomatic = \partcombineForce \default
+
 
 %% phrasing slurs