X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fpart-combiner.scm;h=21cfa99326ac9f1083da409d166333bc27ce5058;hb=3ce31881e22216ea7b6b2c7f1cadaa9de6c5d0dd;hp=8c779a91ee19944affc53ee95d8848e5f1582724;hpb=5edacf4c1908d0fe988d0ef9b3d6a9820a1e8734;p=lilypond.git

diff --git a/scm/part-combiner.scm b/scm/part-combiner.scm
index 8c779a91ee..21cfa99326 100644
--- a/scm/part-combiner.scm
+++ b/scm/part-combiner.scm
@@ -1,6 +1,6 @@
 ;;;; This file is part of LilyPond, the GNU music typesetter.
 ;;;;
-;;;; Copyright (C) 2004--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+;;;; Copyright (C) 2004--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
 ;;;;
 ;;;; LilyPond is free software: you can redistribute it and/or modify
 ;;;; it under the terms of the GNU General Public License as published by
@@ -243,7 +243,7 @@ LilyPond version 2.8 and earlier."
     (ly:interpret-music-expression (make-non-relative-music music) global)
     context-list))
 
-(define-public (make-part-combine-music parser music-list)
+(define-public (make-part-combine-music parser music-list direction)
   (let* ((m (make-music 'PartCombineMusic))
 	 (m1 (make-non-relative-music (context-spec-music (first music-list) 'Voice "one")))
 	 (m2  (make-non-relative-music  (context-spec-music (second music-list) 'Voice "two")))
@@ -252,6 +252,7 @@ LilyPond version 2.8 and earlier."
 	 (evs1 (recording-group-emulate m1 listener)))
 
     (set! (ly:music-property m 'elements) (list m1 m2))
+    (set! (ly:music-property m 'direction) direction)
     (set! (ly:music-property m 'split-list)
 	  (if (and (assoc "one" evs1) (assoc "two" evs2))
 	      (determine-split-list (reverse! (assoc-get "one" evs1) '())
@@ -594,4 +595,4 @@ the mark when there are no spanners active.
 
     (if (not (null? quote-contents))
         (hash-set! tab name (list->vector (reverse! quote-contents '())))
-        (ly:music-message mus (ly:format (_ "quoted music `~a' is empty") name)))))
+        (ly:music-warning mus (ly:format (_ "quoted music `~a' is empty") name)))))