Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code | Sign in
(1890)

Delta Between Two Patch Sets: input/regression/repeat-slur.ly

Issue 7424049: Allows slurs to break at barlines.
Left Patch Set: Breaks slurs at repeats by default. Created 12 years, 1 month ago
Right Patch Set: Changes name, harmonizes slur direction Created 12 years ago
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments. Please Sign in to add in-line comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « no previous file | lily/include/slur-proto-engraver.hh » ('j') | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
1 \version "2.17.14" 1 \version "2.17.14"
2 2
3 \header { 3 \header {
4 texidoc = "Slurs are automatically broken at repeats. 4 texidoc = "Slurs are automatically broken at repeats.
5 This behavior can be changed by setting @code{slurOverRepeat} 5 This behavior can be changed by setting @code{\\slurOverRepeat}
6 to @code{#t}. To manually break a slur at a bar line, use 6 to @code{#t}. To manually break a slur at a bar line, use
7 @code{breakSlur}. To break the slur and junk either the left or 7 @code{\\breakSlur}. To manually start a free slur at a bar, use
8 right part, use @code{breakSlurJunkLeft} and @code{breakSlurJunkRight}. 8 @code{\\free} with an opening parenthesis. To manually stop a
9 When using @code{breakSlurJunkRight}, do not use a slur end. 9 free slur at a bar, use @code{\\free} with a closing parenthesis.
10 " 10 "
11 }
12
13 \new Staff {
14 a'4 ( b' c' d'
15 \repeat volta 3
16 { a' ) b' ( c' d' }
17 \alternative { { a' ) b' c' ( d' }
18 { a' b' ) b'2 ( }
19 { a'4 b' ) b'2 ( } }
20
21 a'1 ) \bar "|."
22 }
23
24 \new Staff {
25 a'4 ( b' c' d'
26 \repeat volta 2
27 { a' ) b' ( c' d' }
28 \alternative { { a' ) b' c' d' ( }
29 { a' b' ) b'2 ( } }
30
31 a'1 ) \bar "|."
11 } 32 }
12 33
13 \new Staff { 34 \new Staff {
14 a'4 ( b' c' d' 35 a'4 ( b' c' d'
15 \repeat volta 2 36 \repeat volta 2
16 { a' ) b' ( c' d' } 37 { a' ) b' ( c' d' }
17 \alternative { { a' ) b' c' ( d' } 38 \alternative { { a' ) b' c' ( d' }
18 { a' b' ) r2 } } 39 { a' ) b' b'2 ( } }
19 40
20 a'1 \bar "|." 41 a'1 ) \bar "|."
21 } 42 }
22 43
23 \new Staff { 44 \new Staff {
24 a'4 ( b' c' d' 45 a'4 ( b' c' d'
25 \repeat volta 2 46 \repeat volta 2
26 { a' ) b' ( c' d' } 47 { a' ) b' ( c' d' }
27 \alternative { { a' ) b' c' d' ( } 48 \alternative { { a' ) b' c' d' ( }
28 { a' b' ) r2 } } 49 { a' ) b' b'2 ( } }
29 ·· 50
30 a'1 \bar "|." 51 a'1 ) \bar "|."
52 }
53
54 \new Staff {
55 \set slurOverRepeat = ##t
56 a'4 ( b' c' d'
57 \repeat volta 2
58 { a' ) b' ( c' d' }
59 \alternative { { a' ) b' c' ( d' }
60 { a' b' ) b'2 ( } }
61
62 a'1 ) \bar "|."
63 }
64
65 \new Staff {
66 \repeat volta 2
67 { \free ( a'4 ) b' ( c' d' }
68 \alternative { { a' ) b' c' ( d' }
69 { a' b' ) b'2 ( } }
70
71 a'1 ) \bar "|."
31 } 72 }
32 73
33 \new Staff { 74 \new Staff {
34 a'4 ( b' c' d' 75 a'4 ( b' c' d'
35 \repeat volta 2 76 \repeat volta 2
36 { a' ) b' ( c' d' } 77 { a' ) b' ( c' d' }
37 \alternative { { a' ) b' c' ( d' } 78 \alternative { { a' ) b' c' ( d' \free ) }
38 { a' ) b' r2 } } 79 { a' b' b'2 ( } }
39 80
40 a'1 \bar "|." 81 a'1 ) \bar "|."
41 } 82 }
42 83
43 \new Staff { 84 \new Staff {
44 a'4 ( b' c' d' 85 a'4 ( b' c' d' \breakSlur | a' b' c' d' ) |
45 \repeat volta 2
46 { a' ) b' ( c' d' }
47 \alternative { { a' ) b' c' d' ( }
48 { a' ) b' r2 } }
49 ··
50 a'1 \bar "|."
51 } 86 }
52 87
53 %% phrasing slurs 88 %% phrasing slurs
54 89
55 \new Staff { 90 \new Staff {
56 a'4 \( b' c' d' 91 a'4 \( b' c' d'
57 \repeat volta 2 92 \repeat volta 2
58 { a' \) b' \( c' d' } 93 { a' \) b' \( c' d' }
59 \alternative { { a' \) b' c' \( d' } 94 \alternative { { a' \) b' c' \( d' }
60 { a' b' \) r2 } } 95 { a' b' \) b'2 \( } }
61 96
62 a'1 \bar "|." 97 a'1 \) \bar "|."
63 } 98 }
64 99
65 \new Staff { 100 \new Staff {
66 a'4 \( b' c' d' 101 a'4 \( b' c' d'
67 \repeat volta 2 102 \repeat volta 2
68 { a' \) b' \( c' d' } 103 { a' \) b' \( c' d' }
69 \alternative { { a' \) b' c' d' \( } 104 \alternative { { a' \) b' c' d' \( }
70 { a' b' \) r2 } } 105 { a' b' \) b'2 \( } }
71 106
72 a'1 \bar "|." 107 a'1 \) \bar "|."
73 } 108 }
74 109
75 \new Staff { 110 \new Staff {
76 a'4 \( b' c' d' 111 a'4 \( b' c' d'
77 \repeat volta 2 112 \repeat volta 2
78 { a' \) b' \( c' d' } 113 { a' \) b' \( c' d' }
79 \alternative { { a' \) b' c' \( d' } 114 \alternative { { a' \) b' c' \( d' }
80 { a' \) b' r2 } } 115 { a' \) b' b'2 \( } }
81 116
82 a'1 \bar "|." 117 a'1 \) \bar "|."
83 } 118 }
84 119
85 \new Staff { 120 \new Staff {
86 a'4 \( b' c' d' 121 a'4 \( b' c' d'
87 \repeat volta 2 122 \repeat volta 2
88 { a' \) b' \( c' d' } 123 { a' \) b' \( c' d' }
89 \alternative { { a' \) b' c' d' \( } 124 \alternative { { a' \) b' c' d' \( }
90 { a' \) b' r2 } } 125 { a' \) b' b'2 \( } }
91 ··
92 a'1 \bar "|."
93 }
94 126
95 \new Staff { 127 a'1 \) \bar "|."
96 a'4 ( b' c' d' \breakSlurJunkLeft
97 \repeat volta 2
98 { a' ) b' ( c' d' }
99 \alternative { { a' ) b' c' ( d' }
100 { a' b' ) r2 } }
101 ··
102 a'1 \bar "|."
103 } 128 }
104 129
105 \new Staff { 130 \new Staff {
106 \set slurOverRepeat = ##t 131 \set slurOverRepeat = ##t
107 a'4 ( b' c' d' 132 a'4 \( b' c' d'
108 \repeat volta 2 133 \repeat volta 2
109 { a' ) b' ( c' d' } 134 { a' \) b' \( c' d' }
110 \alternative { { a' ) b' c' ( d' \breakSlurJunkRight } 135 \alternative { { a' \) b' c' \( d' }
111 { a' b' r2 } } 136 { a' b' \) b'2 \( } }
112 137
113 a'1 \bar "|." 138 a'1 \) \bar "|."
114 } 139 }
115 140
116 \new Staff { 141 \new Staff {
117 \set slurOverRepeat = ##t
118 a'4 ( b' c' d'
119 \repeat volta 2 142 \repeat volta 2
120 { a' ) b' ( c' d' } 143 { \free \( a'4 \) b' \( c' d' }
121 \alternative { { a' ) b' c' ( d' } 144 \alternative { { a' \) b' c' \( d' }
122 { a' b' ) r2 } } 145 { a' b' \) b'2 \( } }
123 146
124 a'1 \bar "|." 147 a'1 \) \bar "|."
125 } 148 }
126 149
150 \new Staff {
151 a'4 \( b' c' d'
152 \repeat volta 2
153 { a' \) b' \( c' d' }
154 \alternative { { a' \) b' c' \( d' \free \) }
155 { a' b' b'2 \( } }
156
157 a'1 \) \bar "|."
158 }
159
160 \new Staff {
161 a'4 \( b' c' d' \breakPhrasingSlur | a' b' c' d' \) |
162 }
LEFTRIGHT

Powered by Google App Engine
RSS Feeds Recent Issues | This issue
This is Rietveld f62528b