gitara 0.8.0 → 1.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (66) hide show
  1. data/CHANGELOG.markdown +8 -1
  2. data/README.markdown +15 -21
  3. data/examples/{aimee-man-wise-up/aimee-man-wise-up.ly → aimee-man-wise-up.ly} +94 -80
  4. data/examples/aimee-man-wise-up.midi +0 -0
  5. data/examples/aimee-man-wise-up.pdf +0 -0
  6. data/examples/{aimee-man-wise-up/aimee-man-wise-up.rb → aimee-man-wise-up.rb} +7 -7
  7. data/examples/{eraserheads-huling-el-bimbo/tab.ly → eraserheads-huling-el-bimbo.ly} +27 -57
  8. data/examples/eraserheads-huling-el-bimbo.midi +0 -0
  9. data/examples/eraserheads-huling-el-bimbo.pdf +0 -0
  10. data/examples/{eraserheads-huling-el-bimbo/tab.rb → eraserheads-huling-el-bimbo.rb} +7 -7
  11. data/examples/{foo-fighters-walking-after-you/foo-fighters-walking-after-you.ly → foo-fighters-walking-after-you.ly} +19 -90
  12. data/examples/{foo-fighters-walking-after-you/foo-fighters-walking-after-you.midi → foo-fighters-walking-after-you.midi} +0 -0
  13. data/examples/foo-fighters-walking-after-you.pdf +0 -0
  14. data/examples/{foo-fighters-walking-after-you/foo-fighters-walking-after-you.rb → foo-fighters-walking-after-you.rb} +1 -1
  15. data/examples/tab-with-alternate-tuning.ly +11 -7
  16. data/examples/tab-with-alternate-tuning.midi +0 -0
  17. data/examples/tab-with-alternate-tuning.pdf +0 -0
  18. data/examples/tab-with-alternate-tuning.rb +1 -1
  19. data/examples/tab-with-chords.ly +134 -0
  20. data/examples/tab-with-chords.midi +0 -0
  21. data/examples/tab-with-chords.pdf +0 -0
  22. data/examples/tab-with-chords.rb +16 -0
  23. data/examples/tab-with-key-signature.ly +21 -7
  24. data/examples/tab-with-key-signature.midi +0 -0
  25. data/examples/tab-with-key-signature.pdf +0 -0
  26. data/examples/tab-with-key-signature.rb +2 -2
  27. data/examples/tab-with-line-with-no-break.ly +7 -12
  28. data/examples/tab-with-line-with-no-break.midi +0 -0
  29. data/examples/tab-with-line-with-no-break.pdf +0 -0
  30. data/examples/tab-with-partial.ly +25 -15
  31. data/examples/tab-with-partial.midi +0 -0
  32. data/examples/tab-with-partial.pdf +0 -0
  33. data/examples/tab-with-partial.rb +7 -7
  34. data/examples/tab-with-repeats.ly +25 -9
  35. data/examples/tab-with-repeats.midi +0 -0
  36. data/examples/tab-with-repeats.pdf +0 -0
  37. data/examples/tab-with-reused-bar-in-stanza.ly +154 -0
  38. data/examples/tab-with-reused-bar-in-stanza.midi +0 -0
  39. data/examples/tab-with-reused-bar-in-stanza.pdf +0 -0
  40. data/examples/tab-with-reused-bar-in-stanza.rb +14 -0
  41. data/examples/tab-with-time-signature.ly +27 -8
  42. data/examples/tab-with-time-signature.midi +0 -0
  43. data/examples/tab-with-time-signature.pdf +0 -0
  44. data/lib/gitara/node/bar.rb +0 -25
  45. data/lib/gitara/node/stanza.rb +22 -2
  46. data/lib/gitara/template/bar.erb +0 -1
  47. data/lib/gitara/template/chord_set.erb +1 -1
  48. data/lib/gitara/template/line.erb +0 -1
  49. data/lib/gitara/template/score.erb +2 -0
  50. data/lib/gitara/template/stanza.erb +1 -1
  51. data/lib/gitara/template/tab.erb +10 -5
  52. data/lib/gitara/version.rb +1 -1
  53. data/spec/lib/gitara/app_spec.rb +14 -39
  54. data/spec/lib/gitara/node/bar/stanza_version_spec.rb +1 -1
  55. data/spec/lib/gitara/node/bar_spec.rb +2 -58
  56. data/spec/lib/gitara/node/stanza_spec.rb +21 -1
  57. data/spec/spec_helper.rb +5 -1
  58. data/spec/support/app_tester.rb +12 -1
  59. metadata +34 -16
  60. data/examples/aimee-man-wise-up/aimee-man-wise-up.midi +0 -0
  61. data/examples/aimee-man-wise-up/aimee-man-wise-up.pdf +0 -0
  62. data/examples/eraserheads-huling-el-bimbo/tab.midi +0 -0
  63. data/examples/eraserheads-huling-el-bimbo/tab.pdf +0 -0
  64. data/examples/foo-fighters-walking-after-you/foo-fighters-walking-after-you.pdf +0 -0
  65. data/examples/tab.ly +0 -193
  66. data/examples/tab.rb +0 -67
@@ -7,12 +7,12 @@ Gitara.define do
7
7
  transposition "cs"
8
8
  tempo "4 = 90"
9
9
 
10
- chords :G, 'r1-"G"'
11
- chords :G8, 'r8-"G"'
12
- chords :C, 'r1-"C"'
13
- chords :A7, 'r1-"A7"'
14
- chords :Em, 'r1-"Em"'
15
- chords :D, 'r1-"D"'
10
+ chords :G, 'g1'
11
+ chords :G8, 'g8'
12
+ chords :C, 'c1'
13
+ chords :A7, 'a1:7'
14
+ chords :Em, 'e1:m'
15
+ chords :D, 'd1'
16
16
 
17
17
  score do
18
18
  stanza "Verse" do
@@ -248,4 +248,4 @@ Gitara.define do
248
248
  end
249
249
  end
250
250
  end
251
- end
251
+ end
@@ -1,4 +1,4 @@
1
- \version "2.12.3"
1
+ \version "2.14.2"
2
2
  \include "english.ly"
3
3
 
4
4
  \paper {
@@ -22,297 +22,238 @@
22
22
  vOneBarIntroLineOneBarOne = { \skip 4 r8 <d'\2 fs'\1 >4 <fs'\1 d'\2 >4 \skip 8 }
23
23
  vTwoBarIntroLineOneBarOne = { <fs'\1 d'\2 a\3 d\4 a,\5 d,\6 >4\arpeggio <d\4>4 r4 <d\4>8 <a,\5>8 }
24
24
  cBarIntroLineOneBarOne = { }
25
- sBarIntroLineOneBarOne = { r1^"Intro" }
26
25
 
27
26
  vOneBarIntroLineOneBarTwo = { r8 r8 r8 <d'\2 fs'\1 >4 <fs'\1 d'\2 >4 \skip 8 }
28
27
  vTwoBarIntroLineOneBarTwo = { <d,\6>4 <d\4>4 r4 <d\4>8 <a,\5>8 }
29
28
  cBarIntroLineOneBarTwo = { }
30
- sBarIntroLineOneBarTwo = { r1 }
31
29
 
32
30
  vOneBarIntroLineOneBarThree = { <d'\2>4 <e'\2>4 <fs'\2>4 <d'\2>4 }
33
31
  vTwoBarIntroLineOneBarThree = { <d,\6>4 <g\4>4 <a\4>4 <fs\4>4 }
34
32
  cBarIntroLineOneBarThree = { }
35
- sBarIntroLineOneBarThree = { r1 }
36
33
 
37
34
  vOneBarIntroLineOneBarFour = { <g'\2>4 <fs'\2>4 <e'\2>4 <d'\2>4 }
38
35
  vTwoBarIntroLineOneBarFour = { <d,\6>4 <a\4>4 <g\4>4 <fs\4>4 }
39
36
  cBarIntroLineOneBarFour = { }
40
- sBarIntroLineOneBarFour = { r1 }
41
37
 
42
38
  vOneBarVerseRepeatOneLineOneBarOne = { <d'\2 fs'\1 >4. <fs'\1 d'\2 >4 <fs'\1 d'\2 >8 \skip 8 \skip 8 }
43
39
  vTwoBarVerseRepeatOneLineOneBarOne = { <d,\6>4 <d\4>4 r4 <d\4>8 <a,\5>8 }
44
40
  cBarVerseRepeatOneLineOneBarOne = { }
45
- sBarVerseRepeatOneLineOneBarOne = { r1^"Verse" }
46
41
 
47
42
  vOneBarVerseRepeatOneLineOneBarTwo = { <fs'\1>4 <e'\1>8 <d'\2>4 <b~\2>8 <b\2>4 }
48
43
  vTwoBarVerseRepeatOneLineOneBarTwo = { <fs,\6>4 <d\4>4 <fs,\6>4 <d\4>4 }
49
44
  cBarVerseRepeatOneLineOneBarTwo = { }
50
- sBarVerseRepeatOneLineOneBarTwo = { r1 }
51
45
 
52
46
  vOneBarVerseRepeatOneLineOneBarThree = { <b\2>4 <d'\2>8 <b\2>4 <e'~\1>8 <e'\1>4 }
53
47
  vTwoBarVerseRepeatOneLineOneBarThree = { <g,\6>4 <d\4>4 <g,\6>4 <d\4>4 }
54
48
  cBarVerseRepeatOneLineOneBarThree = { }
55
- sBarVerseRepeatOneLineOneBarThree = { r1 }
56
49
 
57
50
  vOneBarVerseRepeatOneLineOneBarFour = { <b\2>4. <b\2>8 <e'\1>8 <fs'\2>8 <e'\1>8 <d'\2>8 }
58
51
  vTwoBarVerseRepeatOneLineOneBarFour = { <gs,\6>4 <d\4>4 <gs,\6>4 <d\4>4 }
59
52
  cBarVerseRepeatOneLineOneBarFour = { }
60
- sBarVerseRepeatOneLineOneBarFour = { r1 }
61
53
 
62
54
  vOneBarVerseRepeatOneLineOneBarFive = { <d'\2>4. <b\2>4 <b\2>4 <b\2>8 }
63
55
  vTwoBarVerseRepeatOneLineOneBarFive = { <g,\6>4 <d\4>4 <g,\6>4 <d\4>4 }
64
56
  cBarVerseRepeatOneLineOneBarFive = { }
65
- sBarVerseRepeatOneLineOneBarFive = { r1 }
66
57
 
67
58
  vOneBarVerseRepeatOneLineOneBarSix = { <cs'\2>4 <cs'\2>4 <cs'\2>8 <d'~\2>8 <d'\2>4 }
68
59
  vTwoBarVerseRepeatOneLineOneBarSix = { <a,\5>4 <e\4>4 <a,\5>4 <e\4>4 }
69
60
  cBarVerseRepeatOneLineOneBarSix = { }
70
- sBarVerseRepeatOneLineOneBarSix = { r1 }
71
61
 
72
62
  vOneBarVerseToChorusLineOneBarOne = { r4. <d'\2 e'\1 >4 <d'\2 e'\1 >4 \skip 8 }
73
63
  vTwoBarVerseToChorusLineOneBarOne = { <d,\6>4 <d\4>4 r4 <d\4>8 <a,\5>8 }
74
64
  cBarVerseToChorusLineOneBarOne = { }
75
- sBarVerseToChorusLineOneBarOne = { r1^"Verse to Chorus" }
76
65
 
77
66
  vOneBarVerseToChorusLineOneBarTwo = { <cs'\2>4 <cs'\2>4 <cs'\2>8 <d'\2>4 <e'~\1>8 }
78
67
  vTwoBarVerseToChorusLineOneBarTwo = { <fs,\6>4 <d\4>4 <fs,\6>4 <d\4>4 }
79
68
  cBarVerseToChorusLineOneBarTwo = { }
80
- sBarVerseToChorusLineOneBarTwo = { r1 }
81
69
 
82
70
  vOneBarVerseToChorusLineOneBarThree = { <e'\1>4. <b\2 e'\1 >4 <b\2 e'~\1 >8 <e'\1>4 }
83
71
  vTwoBarVerseToChorusLineOneBarThree = { <g,\6>4 <d\4>4 r4 <d\4>8 <g,\6>8 }
84
72
  cBarVerseToChorusLineOneBarThree = { }
85
- sBarVerseToChorusLineOneBarThree = { r1 }
86
73
 
87
74
  vOneBarVerseToChorusLineOneBarFour = { <b\2>4. <b\2>8 <e'\1>8 <fs'\2>8 <e'\1>8 <d'\2>8 }
88
75
  vTwoBarVerseToChorusLineOneBarFour = { <gs,\6>4 <d\4>4 <gs,\6>4 <d\4>4 }
89
76
  cBarVerseToChorusLineOneBarFour = { }
90
- sBarVerseToChorusLineOneBarFour = { r1 }
91
77
 
92
78
  vOneBarVerseToChorusLineTwoBarOne = { <d'\2>4. <b\2>4 <b\2>4 <b\2>8 }
93
79
  vTwoBarVerseToChorusLineTwoBarOne = { <g,\6>4 <d\4>4 <g,\6>4 <d\4>4 }
94
80
  cBarVerseToChorusLineTwoBarOne = { }
95
- sBarVerseToChorusLineTwoBarOne = { r1 }
96
81
 
97
82
  vOneBarVerseToChorusLineTwoBarTwo = { <cs'\2>4 <cs'\2>4 <cs'\2>8 <d'~\2>8 <d'\2>4 }
98
83
  vTwoBarVerseToChorusLineTwoBarTwo = { <a,\5>4 <e\4>4 <a,\5>4 <e\4>4 }
99
84
  cBarVerseToChorusLineTwoBarTwo = { }
100
- sBarVerseToChorusLineTwoBarTwo = { r1 }
101
85
 
102
86
  vOneBarVerseToChorusLineTwoBarThree = { <d'\2>4 <e'\2>4 <fs'\2>4 <d'\2>4 }
103
87
  vTwoBarVerseToChorusLineTwoBarThree = { <d,\6>4 <g\4>4 <a\4>4 <fs\4>4 }
104
88
  cBarVerseToChorusLineTwoBarThree = { }
105
- sBarVerseToChorusLineTwoBarThree = { r1 }
106
89
 
107
90
  vOneBarVerseToChorusLineTwoBarFour = { <g'\2>4 <fs'\2>4 <e'\2>4 <d'\2>4 }
108
91
  vTwoBarVerseToChorusLineTwoBarFour = { <d,\6>4 <a\4>4 <g\4>4 <fs\4>4 }
109
92
  cBarVerseToChorusLineTwoBarFour = { }
110
- sBarVerseToChorusLineTwoBarFour = { r1 }
111
93
 
112
94
  vOneBarChorusRepeatOneLineOneBarOne = { <b\2 gs\3 >2 <fs'\1>4 <fs'\1>4 }
113
95
  vTwoBarChorusRepeatOneLineOneBarOne = { <e,\6>4 <d\4>4 <e,\6>4 <d\4>4 }
114
96
  cBarChorusRepeatOneLineOneBarOne = { }
115
- sBarChorusRepeatOneLineOneBarOne = { r1^"Chorus" }
116
97
 
117
98
  vOneBarChorusRepeatOneLineOneBarTwo = { <fs'\1>4 <e'\1>8 <d'\2>4 <b\2>4 <g'~\1>8 }
118
99
  vTwoBarChorusRepeatOneLineOneBarTwo = { <e,\6>4 <d\4>4 <e,\6>4 <d\4>4 }
119
100
  cBarChorusRepeatOneLineOneBarTwo = { }
120
- sBarChorusRepeatOneLineOneBarTwo = { r1 }
121
101
 
122
102
  vOneBarChorusRepeatOneLineOneBarThree = { <g'\1>2. r8 <b\2>8 }
123
103
  vTwoBarChorusRepeatOneLineOneBarThree = { <g,\6>4 <d\4>4 <g,\6>4 <d\4>4 }
124
104
  cBarChorusRepeatOneLineOneBarThree = { }
125
- sBarChorusRepeatOneLineOneBarThree = { r1 }
126
105
 
127
106
  vOneBarChorusRepeatOneLineOneBarFour = { <d'\2>4 <d'\2>8 <e'\1>4 <fs'\1>4. }
128
107
  vTwoBarChorusRepeatOneLineOneBarFour = { <g,\6>4 <d\4>4 <g,\6>4 <d\4>4 }
129
108
  cBarChorusRepeatOneLineOneBarFour = { }
130
- sBarChorusRepeatOneLineOneBarFour = { r1 }
131
109
 
132
110
  vOneBarChorusAlternativeOneLineOneBarOne = { <fs'\1>4. <d'\2>4 <a\3>4 <d'~\2>8 }
133
111
  vTwoBarChorusAlternativeOneLineOneBarOne = { <d,\6>4 <d\4>4 <d,\6>4 <d\4>4 }
134
112
  cBarChorusAlternativeOneLineOneBarOne = { }
135
- sBarChorusAlternativeOneLineOneBarOne = { r1 }
136
113
 
137
114
  vOneBarChorusAlternativeOneLineOneBarTwo = { <d'\2>8 <a\3>4 <d'\2>4 <a\3>8 \skip 4 }
138
115
  vTwoBarChorusAlternativeOneLineOneBarTwo = { <d,\6>4 <d\4>4 <d,\6>4 <d\4>4 }
139
116
  cBarChorusAlternativeOneLineOneBarTwo = { }
140
- sBarChorusAlternativeOneLineOneBarTwo = { r1 }
141
117
 
142
118
  vOneBarChorusAlternativeOneLineTwoBarOne = { \skip 4 r8 <d'\2 fs'\1 >4 <d'\2 fs'\1 >4 <d'~\2 fs'~\1 >8 }
143
119
  vTwoBarChorusAlternativeOneLineTwoBarOne = { <d,\6>4 <d\4>4 r4 <d\4>4 }
144
120
  cBarChorusAlternativeOneLineTwoBarOne = { }
145
- sBarChorusAlternativeOneLineTwoBarOne = { r1 }
146
121
 
147
122
  vOneBarChorusAlternativeOneLineTwoBarTwo = { <d'\2 fs'\1 >8 <d'\2 fs'\1 >4 <d'\2>8 <d'\2>8 <e'\1>4. }
148
123
  vTwoBarChorusAlternativeOneLineTwoBarTwo = { r4 <d\4>4 r4 r4 }
149
124
  cBarChorusAlternativeOneLineTwoBarTwo = { }
150
- sBarChorusAlternativeOneLineTwoBarTwo = { r1 }
151
125
 
152
126
  vOneBarBridgeLineOneBarOne = { <fs'\1>4. <d'\2>4 <b\3>4. }
153
127
  vTwoBarBridgeLineOneBarOne = { <b,\5>4 <fs\4>4 <b,\5>4 <fs\4>4 }
154
128
  cBarBridgeLineOneBarOne = { }
155
- sBarBridgeLineOneBarOne = { r1^"Bridge" }
156
129
 
157
130
  vOneBarBridgeLineOneBarTwo = { <b\3>4. <b\3>4 <d'\2>4 <g'~\1>8 }
158
131
  vTwoBarBridgeLineOneBarTwo = { <b,\5>4 <fs\4>4 <b,\5>4 <fs\4>4 }
159
132
  cBarBridgeLineOneBarTwo = { }
160
- sBarBridgeLineOneBarTwo = { r1 }
161
133
 
162
134
  vOneBarBridgeLineOneBarThree = { <g'\1>4. <d'\2>4. \skip 4 }
163
135
  vTwoBarBridgeLineOneBarThree = { <g,\6>4 <d\4>4 <g,\6>4 <d\4>4 }
164
136
  cBarBridgeLineOneBarThree = { }
165
- sBarBridgeLineOneBarThree = { r1 }
166
137
 
167
138
  vOneBarBridgeLineOneBarFour = { <d'\2>4. <e'\1>8 <fs'\1>8 <g'\1>4 <gs'~\1>8 }
168
139
  vTwoBarBridgeLineOneBarFour = { <g,\6>4 <d\4>4 <g,\6>4 <d\4>4 }
169
140
  cBarBridgeLineOneBarFour = { }
170
- sBarBridgeLineOneBarFour = { r1 }
171
141
 
172
142
  vOneBarBridgeLineOneBarFive = { <gs'\1>4. <e'\1>2 <b~\2>8 }
173
143
  vTwoBarBridgeLineOneBarFive = { <e,\6>4 <d\4>4 <e,\6>4 <d\4>4 }
174
144
  cBarBridgeLineOneBarFive = { }
175
- sBarBridgeLineOneBarFive = { r1 }
176
145
 
177
146
  vOneBarBridgeLineOneBarSix = { <b\2>4. <gs\3>4. \skip 4 }
178
147
  vTwoBarBridgeLineOneBarSix = { <e,\6>4 <d\4>4 <e,\6>4 <d\4>4 }
179
148
  cBarBridgeLineOneBarSix = { }
180
- sBarBridgeLineOneBarSix = { r1 }
181
149
 
182
150
  vOneBarInterludeLineOneRepeatOneBarOne = { <d'\2>4 <e'\2>4 <fs'\2>4 <d'\2>4 }
183
151
  vTwoBarInterludeLineOneRepeatOneBarOne = { <d,\6>4 <g\4>4 <a\4>4 <fs\4>4 }
184
152
  cBarInterludeLineOneRepeatOneBarOne = { }
185
- sBarInterludeLineOneRepeatOneBarOne = { r1^"Interlude" }
186
153
 
187
154
  vOneBarInterludeLineOneRepeatOneBarTwo = { <g'\2>4 <fs'\2>4 <e'\2>4 <d'\2>4 }
188
155
  vTwoBarInterludeLineOneRepeatOneBarTwo = { <d,\6>4 <a\4>4 <g\4>4 <fs\4>4 }
189
156
  cBarInterludeLineOneRepeatOneBarTwo = { }
190
- sBarInterludeLineOneRepeatOneBarTwo = { r1 }
191
157
 
192
158
  vOneBarInterludeLineOneBarOne = { <gs\3>8 <b\2>8 <e'\1>8 <gs\3>8 <b\2>8 <e'\1>8 <gs\3>8 <b\2>8 }
193
159
  vTwoBarInterludeLineOneBarOne = { <e,\6>1 }
194
160
  cBarInterludeLineOneBarOne = { }
195
- sBarInterludeLineOneBarOne = { r1 }
196
161
 
197
162
  vOneBarInterludeLineOneBarTwo = { <e'\1>1 }
198
163
  vTwoBarInterludeLineOneBarTwo = { <e,\6>1 }
199
164
  cBarInterludeLineOneBarTwo = { }
200
- sBarInterludeLineOneBarTwo = { r1 }
201
165
 
202
166
  vOneBarVerseTwoLineOneBarOne = { <d'\2 fs'\1 >4. <fs'\1 d'\2 >4 <fs'\1 d'\2 >8 \skip 8 \skip 8 }
203
167
  vTwoBarVerseTwoLineOneBarOne = { <d,\6>4 <d\4>4 r4 <d\4>8 <a,\5>8 }
204
168
  cBarVerseTwoLineOneBarOne = { }
205
- sBarVerseTwoLineOneBarOne = { r1^"Verse 2" }
206
169
 
207
170
  vOneBarVerseTwoLineOneBarTwo = { <fs'\1>4 <e'\1>8 <d'\2>4 <b~\2>8 <b\2>4 }
208
171
  vTwoBarVerseTwoLineOneBarTwo = { <fs,\6>4 <d\4>4 <fs,\6>4 <d\4>4 }
209
172
  cBarVerseTwoLineOneBarTwo = { }
210
- sBarVerseTwoLineOneBarTwo = { r1 }
211
173
 
212
174
  vOneBarVerseTwoLineOneBarThree = { <b\2>4 <d'\2>8 <b\2>4 <e'~\1>8 <e'\1>4 }
213
175
  vTwoBarVerseTwoLineOneBarThree = { <g,\6>4 <d\4>4 <g,\6>4 <d\4>4 }
214
176
  cBarVerseTwoLineOneBarThree = { }
215
- sBarVerseTwoLineOneBarThree = { r1 }
216
177
 
217
178
  vOneBarVerseTwoLineOneBarFour = { <b\2>4. <b\2>8 <e'\1>8 <fs'\2>8 <e'\1>8 <d'\2>8 }
218
179
  vTwoBarVerseTwoLineOneBarFour = { <gs,\6>4 <d\4>4 <gs,\6>4 <d\4>4 }
219
180
  cBarVerseTwoLineOneBarFour = { }
220
- sBarVerseTwoLineOneBarFour = { r1 }
221
181
 
222
182
  vOneBarVerseTwoLineOneBarFive = { <d'\2>4. <b\2>4 <b\2>4 <b\2>8 }
223
183
  vTwoBarVerseTwoLineOneBarFive = { <g,\6>4 <d\4>4 <g,\6>4 <d\4>4 }
224
184
  cBarVerseTwoLineOneBarFive = { }
225
- sBarVerseTwoLineOneBarFive = { r1 }
226
185
 
227
186
  vOneBarVerseTwoLineOneBarSix = { <cs'\2>4 <cs'\2>4 <cs'\2>8 <d'~\2>8 <d'\2>4 }
228
187
  vTwoBarVerseTwoLineOneBarSix = { <a,\5>4 <e\4>4 <a,\5>4 <e\4>4 }
229
188
  cBarVerseTwoLineOneBarSix = { }
230
- sBarVerseTwoLineOneBarSix = { r1 }
231
189
 
232
190
  vOneBarVerseToChorusTwoLineOneBarOne = { r4. <d'\2 e'\1 >4 <d'\2 e'\1 >4 \skip 8 }
233
191
  vTwoBarVerseToChorusTwoLineOneBarOne = { <d,\6>4 <d\4>4 r4 <d\4>8 <a,\5>8 }
234
192
  cBarVerseToChorusTwoLineOneBarOne = { }
235
- sBarVerseToChorusTwoLineOneBarOne = { r1^"Verse to Chorus 2" }
236
193
 
237
194
  vOneBarVerseToChorusTwoLineOneBarTwo = { <cs'\2>4 <cs'\2>4 <cs'\2>8 <d'\2>4 <e'~\1>8 }
238
195
  vTwoBarVerseToChorusTwoLineOneBarTwo = { <fs,\6>4 <d\4>4 <fs,\6>4 <d\4>4 }
239
196
  cBarVerseToChorusTwoLineOneBarTwo = { }
240
- sBarVerseToChorusTwoLineOneBarTwo = { r1 }
241
197
 
242
198
  vOneBarVerseToChorusTwoLineOneBarThree = { <e'\1>4. <b\2 e'\1 >4 <b\2 e'~\1 >8 <e'\1>4 }
243
199
  vTwoBarVerseToChorusTwoLineOneBarThree = { <g,\6>4 <d\4>4 r4 <d\4>8 <g,\6>8 }
244
200
  cBarVerseToChorusTwoLineOneBarThree = { }
245
- sBarVerseToChorusTwoLineOneBarThree = { r1 }
246
201
 
247
202
  vOneBarVerseToChorusTwoLineOneBarFour = { <b\2>4. <b\2>8 <e'\1>8 <fs'\2>8 <e'\1>8 <d'\2>8 }
248
203
  vTwoBarVerseToChorusTwoLineOneBarFour = { <gs,\6>4 <d\4>4 <gs,\6>4 <d\4>4 }
249
204
  cBarVerseToChorusTwoLineOneBarFour = { }
250
- sBarVerseToChorusTwoLineOneBarFour = { r1 }
251
205
 
252
206
  vOneBarVerseToChorusTwoLineTwoBarOne = { <d'\2>4. <b\2>4 <b\2>4 <b\2>8 }
253
207
  vTwoBarVerseToChorusTwoLineTwoBarOne = { <g,\6>4 <d\4>4 <g,\6>4 <d\4>4 }
254
208
  cBarVerseToChorusTwoLineTwoBarOne = { }
255
- sBarVerseToChorusTwoLineTwoBarOne = { r1 }
256
209
 
257
210
  vOneBarVerseToChorusTwoLineTwoBarTwo = { <cs'\2>4 <cs'\2>4 <cs'\2>8 <d'~\2>8 <d'\2>4 }
258
211
  vTwoBarVerseToChorusTwoLineTwoBarTwo = { <a,\5>4 <e\4>4 <a,\5>4 <e\4>4 }
259
212
  cBarVerseToChorusTwoLineTwoBarTwo = { }
260
- sBarVerseToChorusTwoLineTwoBarTwo = { r1 }
261
213
 
262
214
  vOneBarVerseToChorusTwoLineTwoBarThree = { <d'\2>4 <e'\2>4 <fs'\2>4 <d'\2>4 }
263
215
  vTwoBarVerseToChorusTwoLineTwoBarThree = { <d,\6>4 <g\4>4 <a\4>4 <fs\4>4 }
264
216
  cBarVerseToChorusTwoLineTwoBarThree = { }
265
- sBarVerseToChorusTwoLineTwoBarThree = { r1 }
266
217
 
267
218
  vOneBarVerseToChorusTwoLineTwoBarFour = { <g'\2>4 <fs'\2>4 <e'\2>4 <d'\2>4 }
268
219
  vTwoBarVerseToChorusTwoLineTwoBarFour = { <d,\6>4 <a\4>4 <g\4>4 <fs\4>4 }
269
220
  cBarVerseToChorusTwoLineTwoBarFour = { }
270
- sBarVerseToChorusTwoLineTwoBarFour = { r1 }
271
221
 
272
222
  vOneBarChorusTwoRepeatOneLineOneBarOne = { <b\2 gs\3 >2 <fs'\1>4 <fs'\1>4 }
273
223
  vTwoBarChorusTwoRepeatOneLineOneBarOne = { <e,\6>4 <d\4>4 <e,\6>4 <d\4>4 }
274
224
  cBarChorusTwoRepeatOneLineOneBarOne = { }
275
- sBarChorusTwoRepeatOneLineOneBarOne = { r1^"Chorus 2" }
276
225
 
277
226
  vOneBarChorusTwoRepeatOneLineOneBarTwo = { <fs'\1>4 <e'\1>8 <d'\2>4 <b\2>4 <g'~\1>8 }
278
227
  vTwoBarChorusTwoRepeatOneLineOneBarTwo = { <e,\6>4 <d\4>4 <e,\6>4 <d\4>4 }
279
228
  cBarChorusTwoRepeatOneLineOneBarTwo = { }
280
- sBarChorusTwoRepeatOneLineOneBarTwo = { r1 }
281
229
 
282
230
  vOneBarChorusTwoRepeatOneLineOneBarThree = { <g'\1>2. r8 <b\2>8 }
283
231
  vTwoBarChorusTwoRepeatOneLineOneBarThree = { <g,\6>4 <d\4>4 <g,\6>4 <d\4>4 }
284
232
  cBarChorusTwoRepeatOneLineOneBarThree = { }
285
- sBarChorusTwoRepeatOneLineOneBarThree = { r1 }
286
233
 
287
234
  vOneBarChorusTwoRepeatOneLineOneBarFour = { <d'\2>4 <d'\2>8 <e'\1>4 <fs'\1>4. }
288
235
  vTwoBarChorusTwoRepeatOneLineOneBarFour = { <g,\6>4 <d\4>4 <g,\6>4 <d\4>4 }
289
236
  cBarChorusTwoRepeatOneLineOneBarFour = { }
290
- sBarChorusTwoRepeatOneLineOneBarFour = { r1 }
291
237
 
292
238
  vOneBarChorusTwoAlternativeOneLineOneBarOne = { <fs'\1>4. <d'\2>4 <a\3>4 <d'~\2>8 }
293
239
  vTwoBarChorusTwoAlternativeOneLineOneBarOne = { <d,\6>4 <d\4>4 <d,\6>4 <d\4>4 }
294
240
  cBarChorusTwoAlternativeOneLineOneBarOne = { }
295
- sBarChorusTwoAlternativeOneLineOneBarOne = { r1 }
296
241
 
297
242
  vOneBarChorusTwoAlternativeOneLineOneBarTwo = { <d'\2>8 <a\3>4 <d'\2>4 <a\3>8 \skip 4 }
298
243
  vTwoBarChorusTwoAlternativeOneLineOneBarTwo = { <d,\6>4 <d\4>4 <d,\6>4 <d\4>4 }
299
244
  cBarChorusTwoAlternativeOneLineOneBarTwo = { }
300
- sBarChorusTwoAlternativeOneLineOneBarTwo = { r1 }
301
245
 
302
246
  vOneBarChorusTwoAlternativeOneLineTwoBarOne = { <d'\2>4 <e'\2>4 <fs'\2>4 <d'\2>4 }
303
247
  vTwoBarChorusTwoAlternativeOneLineTwoBarOne = { <d,\6>4 <g\4>4 <a\4>4 <fs\4>4 }
304
248
  cBarChorusTwoAlternativeOneLineTwoBarOne = { }
305
- sBarChorusTwoAlternativeOneLineTwoBarOne = { r1 }
306
249
 
307
250
  vOneBarChorusTwoAlternativeOneLineTwoBarTwo = { <g'\2>4 <fs'\2>4 <e'\2>4 <d'\2>4 }
308
251
  vTwoBarChorusTwoAlternativeOneLineTwoBarTwo = { <d,\6>4 <a\4>4 <g\4>4 <fs\4>4 }
309
252
  cBarChorusTwoAlternativeOneLineTwoBarTwo = { }
310
- sBarChorusTwoAlternativeOneLineTwoBarTwo = { r1 }
311
253
 
312
254
  vOneBarChorusTwoAlternativeOneLineTwoBarThree = { r1 }
313
255
  vTwoBarChorusTwoAlternativeOneLineTwoBarThree = { <d,\6 a,\5 d\4 a\3 d'\2 fs'\1 >1\arpeggio }
314
256
  cBarChorusTwoAlternativeOneLineTwoBarThree = { }
315
- sBarChorusTwoAlternativeOneLineTwoBarThree = { r1 }
316
257
 
317
258
 
318
259
  %-----------------------------------------------------------------------
@@ -321,77 +262,62 @@ sBarChorusTwoAlternativeOneLineTwoBarThree = { r1 }
321
262
  vOneLineIntroLineOne = { \vOneBarIntroLineOneBarOne \vOneBarIntroLineOneBarTwo \vOneBarIntroLineOneBarThree \vOneBarIntroLineOneBarFour \break }
322
263
  vTwoLineIntroLineOne = { \vTwoBarIntroLineOneBarOne \vTwoBarIntroLineOneBarTwo \vTwoBarIntroLineOneBarThree \vTwoBarIntroLineOneBarFour \break }
323
264
  cLineIntroLineOne = { \cBarIntroLineOneBarOne \cBarIntroLineOneBarTwo \cBarIntroLineOneBarThree \cBarIntroLineOneBarFour }
324
- sLineIntroLineOne = { \sBarIntroLineOneBarOne \sBarIntroLineOneBarTwo \sBarIntroLineOneBarThree \sBarIntroLineOneBarFour }
325
265
 
326
266
  vOneLineVerseRepeatOneLineOne = { \vOneBarVerseRepeatOneLineOneBarOne \vOneBarVerseRepeatOneLineOneBarTwo \vOneBarVerseRepeatOneLineOneBarThree \vOneBarVerseRepeatOneLineOneBarFour \vOneBarVerseRepeatOneLineOneBarFive \vOneBarVerseRepeatOneLineOneBarSix \break }
327
267
  vTwoLineVerseRepeatOneLineOne = { \vTwoBarVerseRepeatOneLineOneBarOne \vTwoBarVerseRepeatOneLineOneBarTwo \vTwoBarVerseRepeatOneLineOneBarThree \vTwoBarVerseRepeatOneLineOneBarFour \vTwoBarVerseRepeatOneLineOneBarFive \vTwoBarVerseRepeatOneLineOneBarSix \break }
328
268
  cLineVerseRepeatOneLineOne = { \cBarVerseRepeatOneLineOneBarOne \cBarVerseRepeatOneLineOneBarTwo \cBarVerseRepeatOneLineOneBarThree \cBarVerseRepeatOneLineOneBarFour \cBarVerseRepeatOneLineOneBarFive \cBarVerseRepeatOneLineOneBarSix }
329
- sLineVerseRepeatOneLineOne = { \sBarVerseRepeatOneLineOneBarOne \sBarVerseRepeatOneLineOneBarTwo \sBarVerseRepeatOneLineOneBarThree \sBarVerseRepeatOneLineOneBarFour \sBarVerseRepeatOneLineOneBarFive \sBarVerseRepeatOneLineOneBarSix }
330
269
 
331
270
  vOneLineVerseToChorusLineOne = { \vOneBarVerseToChorusLineOneBarOne \vOneBarVerseToChorusLineOneBarTwo \vOneBarVerseToChorusLineOneBarThree \vOneBarVerseToChorusLineOneBarFour \break }
332
271
  vTwoLineVerseToChorusLineOne = { \vTwoBarVerseToChorusLineOneBarOne \vTwoBarVerseToChorusLineOneBarTwo \vTwoBarVerseToChorusLineOneBarThree \vTwoBarVerseToChorusLineOneBarFour \break }
333
272
  cLineVerseToChorusLineOne = { \cBarVerseToChorusLineOneBarOne \cBarVerseToChorusLineOneBarTwo \cBarVerseToChorusLineOneBarThree \cBarVerseToChorusLineOneBarFour }
334
- sLineVerseToChorusLineOne = { \sBarVerseToChorusLineOneBarOne \sBarVerseToChorusLineOneBarTwo \sBarVerseToChorusLineOneBarThree \sBarVerseToChorusLineOneBarFour }
335
273
 
336
274
  vOneLineVerseToChorusLineTwo = { \vOneBarVerseToChorusLineTwoBarOne \vOneBarVerseToChorusLineTwoBarTwo \vOneBarVerseToChorusLineTwoBarThree \vOneBarVerseToChorusLineTwoBarFour \break }
337
275
  vTwoLineVerseToChorusLineTwo = { \vTwoBarVerseToChorusLineTwoBarOne \vTwoBarVerseToChorusLineTwoBarTwo \vTwoBarVerseToChorusLineTwoBarThree \vTwoBarVerseToChorusLineTwoBarFour \break }
338
276
  cLineVerseToChorusLineTwo = { \cBarVerseToChorusLineTwoBarOne \cBarVerseToChorusLineTwoBarTwo \cBarVerseToChorusLineTwoBarThree \cBarVerseToChorusLineTwoBarFour }
339
- sLineVerseToChorusLineTwo = { \sBarVerseToChorusLineTwoBarOne \sBarVerseToChorusLineTwoBarTwo \sBarVerseToChorusLineTwoBarThree \sBarVerseToChorusLineTwoBarFour }
340
277
 
341
278
  vOneLineChorusRepeatOneLineOne = { \vOneBarChorusRepeatOneLineOneBarOne \vOneBarChorusRepeatOneLineOneBarTwo \vOneBarChorusRepeatOneLineOneBarThree \vOneBarChorusRepeatOneLineOneBarFour \break }
342
279
  vTwoLineChorusRepeatOneLineOne = { \vTwoBarChorusRepeatOneLineOneBarOne \vTwoBarChorusRepeatOneLineOneBarTwo \vTwoBarChorusRepeatOneLineOneBarThree \vTwoBarChorusRepeatOneLineOneBarFour \break }
343
280
  cLineChorusRepeatOneLineOne = { \cBarChorusRepeatOneLineOneBarOne \cBarChorusRepeatOneLineOneBarTwo \cBarChorusRepeatOneLineOneBarThree \cBarChorusRepeatOneLineOneBarFour }
344
- sLineChorusRepeatOneLineOne = { \sBarChorusRepeatOneLineOneBarOne \sBarChorusRepeatOneLineOneBarTwo \sBarChorusRepeatOneLineOneBarThree \sBarChorusRepeatOneLineOneBarFour }
345
281
 
346
282
  vOneLineChorusAlternativeOneLineOne = { \vOneBarChorusAlternativeOneLineOneBarOne \vOneBarChorusAlternativeOneLineOneBarTwo }
347
283
  vTwoLineChorusAlternativeOneLineOne = { \vTwoBarChorusAlternativeOneLineOneBarOne \vTwoBarChorusAlternativeOneLineOneBarTwo }
348
284
  cLineChorusAlternativeOneLineOne = { \cBarChorusAlternativeOneLineOneBarOne \cBarChorusAlternativeOneLineOneBarTwo }
349
- sLineChorusAlternativeOneLineOne = { \sBarChorusAlternativeOneLineOneBarOne \sBarChorusAlternativeOneLineOneBarTwo }
350
285
 
351
286
  vOneLineChorusAlternativeOneLineTwo = { \vOneBarChorusAlternativeOneLineTwoBarOne \vOneBarChorusAlternativeOneLineTwoBarTwo \break }
352
287
  vTwoLineChorusAlternativeOneLineTwo = { \vTwoBarChorusAlternativeOneLineTwoBarOne \vTwoBarChorusAlternativeOneLineTwoBarTwo \break }
353
288
  cLineChorusAlternativeOneLineTwo = { \cBarChorusAlternativeOneLineTwoBarOne \cBarChorusAlternativeOneLineTwoBarTwo }
354
- sLineChorusAlternativeOneLineTwo = { \sBarChorusAlternativeOneLineTwoBarOne \sBarChorusAlternativeOneLineTwoBarTwo }
355
289
 
356
290
  vOneLineBridgeLineOne = { \vOneBarBridgeLineOneBarOne \vOneBarBridgeLineOneBarTwo \vOneBarBridgeLineOneBarThree \vOneBarBridgeLineOneBarFour \vOneBarBridgeLineOneBarFive \vOneBarBridgeLineOneBarSix \break }
357
291
  vTwoLineBridgeLineOne = { \vTwoBarBridgeLineOneBarOne \vTwoBarBridgeLineOneBarTwo \vTwoBarBridgeLineOneBarThree \vTwoBarBridgeLineOneBarFour \vTwoBarBridgeLineOneBarFive \vTwoBarBridgeLineOneBarSix \break }
358
292
  cLineBridgeLineOne = { \cBarBridgeLineOneBarOne \cBarBridgeLineOneBarTwo \cBarBridgeLineOneBarThree \cBarBridgeLineOneBarFour \cBarBridgeLineOneBarFive \cBarBridgeLineOneBarSix }
359
- sLineBridgeLineOne = { \sBarBridgeLineOneBarOne \sBarBridgeLineOneBarTwo \sBarBridgeLineOneBarThree \sBarBridgeLineOneBarFour \sBarBridgeLineOneBarFive \sBarBridgeLineOneBarSix }
360
293
 
361
294
  vOneLineInterludeLineOne = { \repeat volta 3 { \vOneBarInterludeLineOneRepeatOneBarOne \vOneBarInterludeLineOneRepeatOneBarTwo } \vOneBarInterludeLineOneBarOne \vOneBarInterludeLineOneBarTwo \break }
362
295
  vTwoLineInterludeLineOne = { \repeat volta 3 { \vTwoBarInterludeLineOneRepeatOneBarOne \vTwoBarInterludeLineOneRepeatOneBarTwo } \vTwoBarInterludeLineOneBarOne \vTwoBarInterludeLineOneBarTwo \break }
363
296
  cLineInterludeLineOne = { \repeat volta 3 { \cBarInterludeLineOneRepeatOneBarOne \cBarInterludeLineOneRepeatOneBarTwo } \cBarInterludeLineOneBarOne \cBarInterludeLineOneBarTwo }
364
- sLineInterludeLineOne = { \repeat volta 3 { \sBarInterludeLineOneRepeatOneBarOne \sBarInterludeLineOneRepeatOneBarTwo } \sBarInterludeLineOneBarOne \sBarInterludeLineOneBarTwo }
365
297
 
366
298
  vOneLineVerseTwoLineOne = { \vOneBarVerseTwoLineOneBarOne \vOneBarVerseTwoLineOneBarTwo \vOneBarVerseTwoLineOneBarThree \vOneBarVerseTwoLineOneBarFour \vOneBarVerseTwoLineOneBarFive \vOneBarVerseTwoLineOneBarSix \break }
367
299
  vTwoLineVerseTwoLineOne = { \vTwoBarVerseTwoLineOneBarOne \vTwoBarVerseTwoLineOneBarTwo \vTwoBarVerseTwoLineOneBarThree \vTwoBarVerseTwoLineOneBarFour \vTwoBarVerseTwoLineOneBarFive \vTwoBarVerseTwoLineOneBarSix \break }
368
300
  cLineVerseTwoLineOne = { \cBarVerseTwoLineOneBarOne \cBarVerseTwoLineOneBarTwo \cBarVerseTwoLineOneBarThree \cBarVerseTwoLineOneBarFour \cBarVerseTwoLineOneBarFive \cBarVerseTwoLineOneBarSix }
369
- sLineVerseTwoLineOne = { \sBarVerseTwoLineOneBarOne \sBarVerseTwoLineOneBarTwo \sBarVerseTwoLineOneBarThree \sBarVerseTwoLineOneBarFour \sBarVerseTwoLineOneBarFive \sBarVerseTwoLineOneBarSix }
370
301
 
371
302
  vOneLineVerseToChorusTwoLineOne = { \vOneBarVerseToChorusTwoLineOneBarOne \vOneBarVerseToChorusTwoLineOneBarTwo \vOneBarVerseToChorusTwoLineOneBarThree \vOneBarVerseToChorusTwoLineOneBarFour \break }
372
303
  vTwoLineVerseToChorusTwoLineOne = { \vTwoBarVerseToChorusTwoLineOneBarOne \vTwoBarVerseToChorusTwoLineOneBarTwo \vTwoBarVerseToChorusTwoLineOneBarThree \vTwoBarVerseToChorusTwoLineOneBarFour \break }
373
304
  cLineVerseToChorusTwoLineOne = { \cBarVerseToChorusTwoLineOneBarOne \cBarVerseToChorusTwoLineOneBarTwo \cBarVerseToChorusTwoLineOneBarThree \cBarVerseToChorusTwoLineOneBarFour }
374
- sLineVerseToChorusTwoLineOne = { \sBarVerseToChorusTwoLineOneBarOne \sBarVerseToChorusTwoLineOneBarTwo \sBarVerseToChorusTwoLineOneBarThree \sBarVerseToChorusTwoLineOneBarFour }
375
305
 
376
306
  vOneLineVerseToChorusTwoLineTwo = { \vOneBarVerseToChorusTwoLineTwoBarOne \vOneBarVerseToChorusTwoLineTwoBarTwo \vOneBarVerseToChorusTwoLineTwoBarThree \vOneBarVerseToChorusTwoLineTwoBarFour \break }
377
307
  vTwoLineVerseToChorusTwoLineTwo = { \vTwoBarVerseToChorusTwoLineTwoBarOne \vTwoBarVerseToChorusTwoLineTwoBarTwo \vTwoBarVerseToChorusTwoLineTwoBarThree \vTwoBarVerseToChorusTwoLineTwoBarFour \break }
378
308
  cLineVerseToChorusTwoLineTwo = { \cBarVerseToChorusTwoLineTwoBarOne \cBarVerseToChorusTwoLineTwoBarTwo \cBarVerseToChorusTwoLineTwoBarThree \cBarVerseToChorusTwoLineTwoBarFour }
379
- sLineVerseToChorusTwoLineTwo = { \sBarVerseToChorusTwoLineTwoBarOne \sBarVerseToChorusTwoLineTwoBarTwo \sBarVerseToChorusTwoLineTwoBarThree \sBarVerseToChorusTwoLineTwoBarFour }
380
309
 
381
310
  vOneLineChorusTwoRepeatOneLineOne = { \vOneBarChorusTwoRepeatOneLineOneBarOne \vOneBarChorusTwoRepeatOneLineOneBarTwo \vOneBarChorusTwoRepeatOneLineOneBarThree \vOneBarChorusTwoRepeatOneLineOneBarFour \break }
382
311
  vTwoLineChorusTwoRepeatOneLineOne = { \vTwoBarChorusTwoRepeatOneLineOneBarOne \vTwoBarChorusTwoRepeatOneLineOneBarTwo \vTwoBarChorusTwoRepeatOneLineOneBarThree \vTwoBarChorusTwoRepeatOneLineOneBarFour \break }
383
312
  cLineChorusTwoRepeatOneLineOne = { \cBarChorusTwoRepeatOneLineOneBarOne \cBarChorusTwoRepeatOneLineOneBarTwo \cBarChorusTwoRepeatOneLineOneBarThree \cBarChorusTwoRepeatOneLineOneBarFour }
384
- sLineChorusTwoRepeatOneLineOne = { \sBarChorusTwoRepeatOneLineOneBarOne \sBarChorusTwoRepeatOneLineOneBarTwo \sBarChorusTwoRepeatOneLineOneBarThree \sBarChorusTwoRepeatOneLineOneBarFour }
385
313
 
386
314
  vOneLineChorusTwoAlternativeOneLineOne = { \vOneBarChorusTwoAlternativeOneLineOneBarOne \vOneBarChorusTwoAlternativeOneLineOneBarTwo }
387
315
  vTwoLineChorusTwoAlternativeOneLineOne = { \vTwoBarChorusTwoAlternativeOneLineOneBarOne \vTwoBarChorusTwoAlternativeOneLineOneBarTwo }
388
316
  cLineChorusTwoAlternativeOneLineOne = { \cBarChorusTwoAlternativeOneLineOneBarOne \cBarChorusTwoAlternativeOneLineOneBarTwo }
389
- sLineChorusTwoAlternativeOneLineOne = { \sBarChorusTwoAlternativeOneLineOneBarOne \sBarChorusTwoAlternativeOneLineOneBarTwo }
390
317
 
391
318
  vOneLineChorusTwoAlternativeOneLineTwo = { \vOneBarChorusTwoAlternativeOneLineTwoBarOne \vOneBarChorusTwoAlternativeOneLineTwoBarTwo \vOneBarChorusTwoAlternativeOneLineTwoBarThree \break }
392
319
  vTwoLineChorusTwoAlternativeOneLineTwo = { \vTwoBarChorusTwoAlternativeOneLineTwoBarOne \vTwoBarChorusTwoAlternativeOneLineTwoBarTwo \vTwoBarChorusTwoAlternativeOneLineTwoBarThree \break }
393
320
  cLineChorusTwoAlternativeOneLineTwo = { \cBarChorusTwoAlternativeOneLineTwoBarOne \cBarChorusTwoAlternativeOneLineTwoBarTwo \cBarChorusTwoAlternativeOneLineTwoBarThree }
394
- sLineChorusTwoAlternativeOneLineTwo = { \sBarChorusTwoAlternativeOneLineTwoBarOne \sBarChorusTwoAlternativeOneLineTwoBarTwo \sBarChorusTwoAlternativeOneLineTwoBarThree }
395
321
 
396
322
 
397
323
  %-----------------------------------------------------------------------
@@ -400,47 +326,47 @@ sLineChorusTwoAlternativeOneLineTwo = { \sBarChorusTwoAlternativeOneLineTwoBarOn
400
326
  vOneStanzaIntro = { \vOneLineIntroLineOne }
401
327
  vTwoStanzaIntro = { \vTwoLineIntroLineOne }
402
328
  cStanzaIntro = { \cLineIntroLineOne }
403
- sStanzaIntro = { \sLineIntroLineOne }
329
+ sStanzaIntro = { r1^"Intro" r1 r1 r1 }
404
330
 
405
331
  vOneStanzaVerse = { \repeat volta 2 { \vOneLineVerseRepeatOneLineOne } }
406
332
  vTwoStanzaVerse = { \repeat volta 2 { \vTwoLineVerseRepeatOneLineOne } }
407
333
  cStanzaVerse = { \repeat volta 2 { \cLineVerseRepeatOneLineOne } }
408
- sStanzaVerse = { \repeat volta 2 { \sLineVerseRepeatOneLineOne } }
334
+ sStanzaVerse = { r1^"Verse" r1 r1 r1 r1 r1 }
409
335
 
410
336
  vOneStanzaVerseToChorus = { \vOneLineVerseToChorusLineOne \vOneLineVerseToChorusLineTwo }
411
337
  vTwoStanzaVerseToChorus = { \vTwoLineVerseToChorusLineOne \vTwoLineVerseToChorusLineTwo }
412
338
  cStanzaVerseToChorus = { \cLineVerseToChorusLineOne \cLineVerseToChorusLineTwo }
413
- sStanzaVerseToChorus = { \sLineVerseToChorusLineOne \sLineVerseToChorusLineTwo }
339
+ sStanzaVerseToChorus = { r1^"Verse to Chorus" r1 r1 r1 r1 r1 r1 r1 }
414
340
 
415
341
  vOneStanzaChorus = { \repeat volta 2 { \vOneLineChorusRepeatOneLineOne } \alternative { { \vOneLineChorusAlternativeOneLineOne } { \vOneLineChorusAlternativeOneLineTwo } } }
416
342
  vTwoStanzaChorus = { \repeat volta 2 { \vTwoLineChorusRepeatOneLineOne } \alternative { { \vTwoLineChorusAlternativeOneLineOne } { \vTwoLineChorusAlternativeOneLineTwo } } }
417
343
  cStanzaChorus = { \repeat volta 2 { \cLineChorusRepeatOneLineOne } \alternative { { \cLineChorusAlternativeOneLineOne } { \cLineChorusAlternativeOneLineTwo } } }
418
- sStanzaChorus = { \repeat volta 2 { \sLineChorusRepeatOneLineOne } \alternative { { \sLineChorusAlternativeOneLineOne } { \sLineChorusAlternativeOneLineTwo } } }
344
+ sStanzaChorus = { r1^"Chorus" r1 r1 r1 r1 r1 r1 r1 }
419
345
 
420
346
  vOneStanzaBridge = { \vOneLineBridgeLineOne }
421
347
  vTwoStanzaBridge = { \vTwoLineBridgeLineOne }
422
348
  cStanzaBridge = { \cLineBridgeLineOne }
423
- sStanzaBridge = { \sLineBridgeLineOne }
349
+ sStanzaBridge = { r1^"Bridge" r1 r1 r1 r1 r1 }
424
350
 
425
351
  vOneStanzaInterlude = { \vOneLineInterludeLineOne }
426
352
  vTwoStanzaInterlude = { \vTwoLineInterludeLineOne }
427
353
  cStanzaInterlude = { \cLineInterludeLineOne }
428
- sStanzaInterlude = { \sLineInterludeLineOne }
354
+ sStanzaInterlude = { r1^"Interlude" r1 r1 r1 }
429
355
 
430
356
  vOneStanzaVerseTwo = { \vOneLineVerseTwoLineOne }
431
357
  vTwoStanzaVerseTwo = { \vTwoLineVerseTwoLineOne }
432
358
  cStanzaVerseTwo = { \cLineVerseTwoLineOne }
433
- sStanzaVerseTwo = { \sLineVerseTwoLineOne }
359
+ sStanzaVerseTwo = { r1^"Verse 2" r1 r1 r1 r1 r1 }
434
360
 
435
361
  vOneStanzaVerseToChorusTwo = { \vOneLineVerseToChorusTwoLineOne \vOneLineVerseToChorusTwoLineTwo }
436
362
  vTwoStanzaVerseToChorusTwo = { \vTwoLineVerseToChorusTwoLineOne \vTwoLineVerseToChorusTwoLineTwo }
437
363
  cStanzaVerseToChorusTwo = { \cLineVerseToChorusTwoLineOne \cLineVerseToChorusTwoLineTwo }
438
- sStanzaVerseToChorusTwo = { \sLineVerseToChorusTwoLineOne \sLineVerseToChorusTwoLineTwo }
364
+ sStanzaVerseToChorusTwo = { r1^"Verse to Chorus 2" r1 r1 r1 r1 r1 r1 r1 }
439
365
 
440
366
  vOneStanzaChorusTwo = { \repeat volta 3 { \vOneLineChorusTwoRepeatOneLineOne } \alternative { { \vOneLineChorusTwoAlternativeOneLineOne } { \vOneLineChorusTwoAlternativeOneLineTwo } } }
441
367
  vTwoStanzaChorusTwo = { \repeat volta 3 { \vTwoLineChorusTwoRepeatOneLineOne } \alternative { { \vTwoLineChorusTwoAlternativeOneLineOne } { \vTwoLineChorusTwoAlternativeOneLineTwo } } }
442
368
  cStanzaChorusTwo = { \repeat volta 3 { \cLineChorusTwoRepeatOneLineOne } \alternative { { \cLineChorusTwoAlternativeOneLineOne } { \cLineChorusTwoAlternativeOneLineTwo } } }
443
- sStanzaChorusTwo = { \repeat volta 3 { \sLineChorusTwoRepeatOneLineOne } \alternative { { \sLineChorusTwoAlternativeOneLineOne } { \sLineChorusTwoAlternativeOneLineTwo } } }
369
+ sStanzaChorusTwo = { r1^"Chorus 2" r1 r1 r1 r1 r1 r1 r1 r1 }
444
370
 
445
371
 
446
372
  %-----------------------------------------------------------------------
@@ -469,7 +395,9 @@ vTwo = {
469
395
  %-----------------------------------------------------------------------
470
396
  % Stanza Headings
471
397
 
472
- stanzaHeadings = { \sScoreTabOneScoreOne }
398
+ stanzaHeadings = {
399
+ \sScoreTabOneScoreOne
400
+ }
473
401
 
474
402
  %-----------------------------------------------------------------------
475
403
  % Chord Headings
@@ -486,17 +414,21 @@ chordHeadings = { \cScoreTabOneScoreOne }
486
414
 
487
415
  \clef "treble_8"
488
416
 
417
+ \new ChordNames {
418
+ \chordHeadings
419
+ }
420
+
489
421
  \new Voice \with { \remove Rest_engraver } {
490
422
  \stanzaHeadings
491
423
  }
492
424
 
493
425
  \new Voice {
494
-
426
+ \key g \major
495
427
  \voiceOne
496
428
  \vOne
497
429
  }
498
430
  \new Voice {
499
-
431
+ \key g \major
500
432
  \voiceTwo
501
433
  \vTwo
502
434
  }
@@ -512,9 +444,6 @@ chordHeadings = { \cScoreTabOneScoreOne }
512
444
  \slurUp
513
445
  \vTwo
514
446
  }
515
- \new TabVoice {
516
- \chordHeadings
517
- }
518
447
  >>
519
448
  >>
520
449