From: Dan Eble <nine.fierce.ballads@gmail.com>
Date: Tue, 28 Apr 2015 23:59:44 +0000 (-0400)
Subject: Issue 4358: Set DynamicLineSpanner direction for \partcombine.
X-Git-Tag: release/2.19.20-1~23
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=638ccfde1bf3069ab320beacbb734bed1494f3fa;p=lilypond.git

Issue 4358: Set DynamicLineSpanner direction for \partcombine.

This reverses a difference in the regression test
part-combine-force.ly shown in Issue 4348.
---

diff --git a/ly/music-functions-init.ly b/ly/music-functions-init.ly
index cbba26a652..20a9e49700 100644
--- a/ly/music-functions-init.ly
+++ b/ly/music-functions-init.ly
@@ -1132,8 +1132,14 @@ and @var{part2} are combined into one voice where appropriate.
 Optional @var{chord-range} sets the distance in steps between notes
 that may be combined into a chord or unison.")
    #{ \context Staff <<
-        \context Voice = "one" \with { \voiceOne } {}
-        \context Voice = "two" \with { \voiceTwo } {}
+        \context Voice = "one" \with {
+          \voiceOne
+          \override DynamicLineSpanner.direction = #UP
+        } {}
+        \context Voice = "two" \with {
+          \voiceTwo
+          \override DynamicLineSpanner.direction = #DOWN
+        } {}
         \context Voice = "shared" {}
         #(make-part-combine-music parser (list part1 part2) #f chord-range)
       >> #} )
@@ -1144,9 +1150,18 @@ partcombineUp =
    (_i "Take the music in @var{part1} and @var{part2} and typeset so
 that they share a staff with stems directed upward.")
    #{ \context Staff <<
-        \context Voice = "one" \with { \voiceOne } {}
-        \context Voice = "two" \with { \voiceThree } {}
-        \context Voice = "shared" \with { \voiceOne } {}
+        \context Voice = "one" \with {
+          \voiceOne
+          \override DynamicLineSpanner.direction = #UP
+        } {}
+        \context Voice = "two" \with {
+          \voiceThree
+          \override DynamicLineSpanner.direction = #UP
+        } {}
+        \context Voice = "shared" \with {
+          \voiceOne
+          \override DynamicLineSpanner.direction = #UP
+        } {}
         #(make-part-combine-music parser (list part1 part2) UP chord-range)
       >> #} )
 
@@ -1156,9 +1171,18 @@ partcombineDown =
    (_i "Take the music in @var{part1} and @var{part2} and typeset so
 that they share a staff with stems directed downward.")
    #{ \context Staff <<
-        \context Voice = "one" \with { \voiceFour } {}
-        \context Voice = "two" \with { \voiceTwo } {}
-        \context Voice = "shared" \with { \voiceTwo } {}
+        \context Voice = "one" \with {
+          \voiceFour
+          \override DynamicLineSpanner.direction = #DOWN
+        } {}
+        \context Voice = "two" \with {
+          \voiceTwo
+          \override DynamicLineSpanner.direction = #DOWN
+        } {}
+        \context Voice = "shared" \with {
+          \voiceTwo
+          \override DynamicLineSpanner.direction = #DOWN
+        } {}
         #(make-part-combine-music parser (list part1 part2) DOWN chord-range)
       >> #} )