gitara 0.8.0 → 1.0.0

Sign up to get free protection for your applications and to get access to all the features.
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
@@ -1,4 +1,11 @@
1
- 0.8.0 - 2012-05-30
1
+ 1.0.0 - 2013-01-24
2
+ ------------------
3
+
4
+ * [#26] Stanza labels do not display when reusing bars.
5
+ * [#27] Render chords using chord notation.
6
+ * `app_spec.rb` now runs all the Gitara files in the examples directory. You can also set the `RUN_LILYPOND` environment variable to true to run lilypond on the generated lilypond files.
7
+
8
+ 0.8.0 - 2013-01-20
2
9
  ------------------
3
10
 
4
11
  * [#25] I should be able to disable manual breaking on some lines.
@@ -8,10 +8,9 @@ To install,
8
8
 
9
9
  gem install gitara
10
10
 
11
- You need [lilypond](http://lilypond.org) 2.12 or higher in order to generate pdfs and midis.
12
-
13
- Gitara is tested on Ruby 1.9.3 only. Patches are welcome.
11
+ You need [lilypond](http://lilypond.org) in order to generate pdfs and midis.
14
12
 
13
+ Gitara is tested on Ruby 1.9.3 and Lilypond 2.14. Patches are welcome.
15
14
 
16
15
  To run,
17
16
 
@@ -43,7 +42,7 @@ You can find examples at https://github.com/gsmendoza/gitara/tree/master/example
43
42
  Bars
44
43
  ----
45
44
 
46
- Bars are the smallest expressions in Gitara. That is, a gitara file must have at least one bar. The notes inside a bar follow [Lilypond syntax](http://lilypond.org/doc/v2.12/Documentation/user/lilypond-learning/Simple-notation).
45
+ Bars are the smallest expressions in Gitara. That is, a gitara file must have at least one bar. The notes inside a bar follow [Lilypond syntax](http://lilypond.org/doc/v2.14/Documentation/notation/musical-notation).
47
46
 
48
47
  Gitara.define do
49
48
  bar do
@@ -51,7 +50,7 @@ Bars are the smallest expressions in Gitara. That is, a gitara file must have at
51
50
  end
52
51
  end
53
52
 
54
- With Gitara, it's easier to write notes using [absolute note names](http://lilypond.org/doc/v2.12/Documentation/user/lilypond/Writing-pitches#Absolute-octave-entry) instead of relative note names. This is because we'll be reusing bars and other Gitara expressions (see Reusing expressions below).
53
+ With Gitara, it's easier to write notes using [absolute note names](http://lilypond.org/doc/v2.14/Documentation/notation/writing-pitches#absolute-octave-entry) instead of relative note names. This is because we'll be reusing bars and other Gitara expressions (see Reusing expressions below).
55
54
 
56
55
 
57
56
  ### Notes with single quotes and backslashes
@@ -77,7 +76,7 @@ Prettier and easier to search and replace.
77
76
 
78
77
  ### Multiple voices
79
78
 
80
- Each line of notes in a bar is a [voice](http://lilypond.org/doc/v2.12/Documentation/user/lilypond-learning/Voices-contain-music):
79
+ Each line of notes in a bar is a [voice](http://lilypond.org/doc/v2.14/Documentation/learning/voices-contain-music):
81
80
 
82
81
  Gitara.define do
83
82
  bar do
@@ -91,7 +90,7 @@ The tab above will play "c d e f g a b c" and "c' d' e' f' g' a' b' c'" simultan
91
90
 
92
91
  ### Partial bars
93
92
 
94
- To indicate that a bar is a [partial measure](http://lilypond.org/doc/v2.12/Documentation/user/lilypond-learning/Advanced-rhythmic-commands#Partial-measure), call `partial <duration>`:
93
+ To indicate that a bar is a [partial measure](http://lilypond.org/doc/v2.14/Documentation/notation/displaying-rhythms#upbeats), call `partial <duration>`:
95
94
 
96
95
  bar do
97
96
  partial 8
@@ -115,7 +114,7 @@ You can group bars in a line:
115
114
  bar :SaDibdibMoyBuhay
116
115
  end
117
116
 
118
- Lines are [manually breaked](http://lilypond.org/doc/v2.12/Documentation/user/lilypond/Line-breaking) in Gitara. You can disable a line break by setting `manual_break` to false:
117
+ Lines are [manually breaked](http://lilypond.org/doc/v2.14/Documentation/notation/line-breaking) in Gitara. You can disable a line break by setting `manual_break` to false:
119
118
 
120
119
  line :LineOne, :manual_break => false do
121
120
  end
@@ -222,7 +221,7 @@ Finally, you can call multiple expressions in a single line:
222
221
 
223
222
  ### Repeats and alternative endings
224
223
 
225
- You can also group expressions under [repeats](http://lilypond.org/doc/v2.12/Documentation/user/lilypond/Long-repeats) and provide alternative endings:
224
+ You can also group expressions under [repeats](http://lilypond.org/doc/v2.14/Documentation/notation/long-repeats) and provide alternative endings:
226
225
 
227
226
  Gitara.define do
228
227
  line do
@@ -265,11 +264,11 @@ A gitara file can have the following properties:
265
264
  * arranger - tab's arranger
266
265
  * composer - song's composer
267
266
  * instrument - description of the instrument used on the tab
268
- * [key](http://lilypond.org/doc/v2.12/Documentation/user/lilypond/Displaying-pitches#Key-signature)
267
+ * [key](http://lilypond.org/doc/v2.14/Documentation/notation/displaying-pitches#key-signature)
269
268
  * midi_instrument - the type of instrument played in the midi export of the tab. By default, "acoustic guitar (nylon)".
270
- * [string_tunings](http://lilypond.org/doc/v2.12/Documentation/user/lilypond/Common-notation-for-fretted-strings#Custom-tablatures)
271
- * [tempo](http://lilypond.org/doc/v2.12/Documentation/user/lilypond/Writing-parts#Metronome-marks)
272
- * [time](http://lilypond.org/doc/v2.12/Documentation/user/lilypond/Displaying-rhythms#Time-signature) - default is 4/4
269
+ * [string_tunings](http://lilypond.org/doc/v2.14/Documentation/notation/common-notation-for-fretted-strings#custom-tablatures)
270
+ * [tempo](http://lilypond.org/doc/v2.14/Documentation/notation/displaying-rhythms#metronome-marks)
271
+ * [time](http://lilypond.org/doc/v2.14/Documentation/notation/displaying-rhythms#time-signature) - default is 4/4
273
272
  * title - title of the song
274
273
  * transposition - adjusts the pitch of the instrument. The default transposition is "c". If you set it to "d", then you have to play the tab two frets higher on the guitar (capo on second fret).
275
274
 
@@ -280,7 +279,7 @@ Chord labels
280
279
  You can add chord labels to bars:
281
280
 
282
281
  Gitara.define do
283
- chords :FC, 'r4-"F" r r-"C" r'
282
+ chords :FC, 'f2 c2'
284
283
 
285
284
  bar :BeganIt do
286
285
  notes "/skip 4 <a/3 c'/2 >8 <g/3>8 /skip 4 <g/3 c'/2 >8 <g/3>8"
@@ -289,16 +288,11 @@ You can add chord labels to bars:
289
288
  end
290
289
  end
291
290
 
292
- `r4-"F" r r-"C" r` is a [lilypond music expression](http://lilypond.org/doc/v2.12/Documentation/user/lilypond-learning/Music-expressions-explained).
293
-
294
- * `r` is a rest. `r4` is a rest that is a quarter note long. Succeeding rests have the same duration as the first one.
295
- * `-"F"` means 'place the text "F" below the rest note'. See http://lilypond.org/doc/v2.12/Documentation/user/lilypond/Writing-text.
296
-
297
- When these chord labels are added to the Gitara lilypond output, Gitara hides the rest notes so only the chord labels are visible.
291
+ `f2` and `c2` are [lilypond chord names](http://lilypond.org/doc/v2.14/Documentation/notation/displaying-chords).
298
292
 
299
293
  If the bar is a partial measure, the duration of the chords within the bar must match the bar's duration:
300
294
 
301
- chords :G8, 'r8-"G"'
295
+ chords :G8, 'g8'
302
296
 
303
297
  bar do
304
298
  partial 8
@@ -1,4 +1,4 @@
1
- \version "2.12.3"
1
+ \version "2.14.2"
2
2
  \include "english.ly"
3
3
 
4
4
  \paper {
@@ -15,96 +15,103 @@
15
15
  %-----------------------------------------------------------------------
16
16
  % Chord Sets
17
17
 
18
- cChordSetAm = { r4-"Am" r r r }
19
- cChordSetAmC = { r4-"Am" r r-"C" r }
20
- cChordSetBbF = { r4-"Bb" r r-"F" r }
21
- cChordSetCCGE = { r4-"C" r r-"G" r-"E" }
22
- cChordSetD = { r4-"D" r r r }
23
- cChordSetFC = { r4-"F" r r-"C" r }
24
- cChordSetFD = { r4-"F" r r-"D" r }
18
+ cChordSetAm = { \chordmode { a1:m } }
19
+
20
+ cChordSetAmC = { \chordmode { a2:m c2 } }
21
+
22
+ cChordSetBbF = { \chordmode { bf2 f2 } }
23
+
24
+ cChordSetCCGE = { \chordmode { c2 g4 e4 } }
25
+
26
+ cChordSetD = { \chordmode { d1 } }
27
+
28
+ cChordSetFC = { \chordmode { f2 c2 } }
29
+
30
+ cChordSetFD = { \chordmode { f2 d2 } }
31
+
25
32
 
26
33
  %-----------------------------------------------------------------------
27
34
  % Bars
28
35
 
29
- vOneBarBeforeYouSign = { r8 <d'\2>16( <c'\2>8.) <a\3>16 <c'\2>8. <d'\2>16 <e'\1>8. <g\3>8 }
30
- vTwoBarBeforeYouSign = { <d\4>4 <d\4>4 <d\4>4 <d\4>4 }
31
- cBarBeforeYouSign = { \cChordSetD }
36
+ vOneBarBeforeYouSign = { r8 <d'\2>16( <c'\2>8.) <a\3>16 <c'\2>8. <d'\2>16 <e'\1>8. <g\3>8 }
37
+ vTwoBarBeforeYouSign = { <d\4>4 <d\4>4 <d\4>4 <d\4>4 }
38
+ cBarBeforeYouSign = { \cChordSetD }
32
39
 
33
- vOneBarBeganIt = { \skip 4 <a\3 c'\2 >8 <g\3>8 \skip 4 <g\3 c'\2 >8 <g\3>8 }
34
- vTwoBarBeganIt = { <f\4>4 <f\4>4 <c\5>4 <e\4>4 }
35
- cBarBeganIt = { \cChordSetFC }
40
+ vOneBarBeganIt = { \skip 4 <a\3 c'\2 >8 <g\3>8 \skip 4 <g\3 c'\2 >8 <g\3>8 }
41
+ vTwoBarBeganIt = { <f\4>4 <f\4>4 <c\5>4 <e\4>4 }
42
+ cBarBeganIt = { \cChordSetFC }
36
43
 
37
- vOneBarItThough = { r8 <d'\2>16( <c'\2>16) r8 <a\3>16 <c'\2>16 r8 <d'\2>16( <c'\2>16) r8 <a\3>8 }
38
- vTwoBarItThough = { <f\4>4 <f\4>4 <d\4>4 <d\4>4 }
39
- cBarItThough = { \cChordSetFD }
44
+ vOneBarItThough = { r8 <d'\2>16( <c'\2>16) r8 <a\3>16 <c'\2>16 r8 <d'\2>16( <c'\2>16) r8 <a\3>8 }
45
+ vTwoBarItThough = { <f\4>4 <f\4>4 <d\4>4 <d\4>4 }
46
+ cBarItThough = { \cChordSetFD }
40
47
 
41
- vOneBarFDm = { r8 <a\3>8 <c'\2>8 <a\3>8 r8 <d'\2>8 <a\3>8 <e'\1>8 }
42
- vTwoBarFDm = { <f\4>4 <f\4>4 <d\4>2 }
43
- cBarFDm = { \cChordSetFD }
48
+ vOneBarFDm = { r8 <a\3>8 <c'\2>8 <a\3>8 r8 <d'\2>8 <a\3>8 <e'\1>8 }
49
+ vTwoBarFDm = { <f\4>4 <f\4>4 <d\4>2 }
50
+ cBarFDm = { \cChordSetFD }
44
51
 
45
- vOneBarIntro = { <g'\1>8 <a\3>8 <g'\1>8 <a\3>16 <g'\1>8 <g\3>16 <e'\1>4 <g\3>8 }
46
- vTwoBarIntro = { <f\4>4 <f\4>4 <c\5>4 <e\4>4 }
47
- cBarIntro = { \cChordSetFC }
52
+ vOneBarIntro = { <g'\1>8 <a\3>8 <g'\1>8 <a\3>16 <g'\1>8 <g\3>16 <e'\1>4 <g\3>8 }
53
+ vTwoBarIntro = { <f\4>4 <f\4>4 <c\5>4 <e\4>4 }
54
+ cBarIntro = { \cChordSetFC }
48
55
 
49
- vOneBarItsNot = { r8 <g'\1>4 <a\3>16 <g'\1>8 <g\3>16 <e'\1>4 <g\3>16( <a\3>16) }
50
- vTwoBarItsNot = { <f\4>4 <f\4>4 <c\5>4 <e\4>4 }
51
- cBarItsNot = { \cChordSetFC }
56
+ vOneBarItsNot = { r8 <g'\1>4 <a\3>16 <g'\1>8 <g\3>16 <e'\1>4 <g\3>16( <a\3>16) }
57
+ vTwoBarItsNot = { <f\4>4 <f\4>4 <c\5>4 <e\4>4 }
58
+ cBarItsNot = { \cChordSetFC }
52
59
 
53
- vOneBarItsNotGoingToStop = { <g'\1>8 <a\3>8 <g'\1>16 <g'\1>16\glissando <a'\1>4 <e'\2>4 <d'\2>16( <c'\2>16) }
54
- vTwoBarItsNotGoingToStop = { <f\4>4 <f\4>4 <d\4>4 <d\4>4 }
55
- cBarItsNotGoingToStop = { \cChordSetFD }
60
+ vOneBarItsNotGoingToStop = { <g'\1>8 <a\3>8 <g'\1>16 <g'\1>16\glissando <a'\1>4 <e'\2>4 <d'\2>16( <c'\2>16) }
61
+ vTwoBarItsNotGoingToStop = { <f\4>4 <f\4>4 <d\4>4 <d\4>4 }
62
+ cBarItsNotGoingToStop = { \cChordSetFD }
56
63
 
57
- vOneBarItsNotGoingToStopCcge = { <g'\1>8 <g\3>8 <g'\1>16 <g'\1>16\glissando <a'\1>4 <d'\2>4 <c'\2>8 }
58
- vTwoBarItsNotGoingToStopCcge = { <c\5>4 <c\5>4 <g,\6>4 <e,\6>4 }
59
- cBarItsNotGoingToStopCcge = { \cChordSetCCGE }
64
+ vOneBarItsNotGoingToStopCcge = { <g'\1>8 <g\3>8 <g'\1>16 <g'\1>16\glissando <a'\1>4 <d'\2>4 <c'\2>8 }
65
+ vTwoBarItsNotGoingToStopCcge = { <c\5>4 <c\5>4 <g,\6>4 <e,\6>4 }
66
+ cBarItsNotGoingToStopCcge = { \cChordSetCCGE }
60
67
 
61
- vOneBarItsNotGoingToStopCcgeTwo = { r8 <g\3>8 <e'\1>8 <g'\1>8 r8 <d'\2>4 <c'\2>8 }
62
- vTwoBarItsNotGoingToStopCcgeTwo = { <c\5>4 <e\4>4 <g,\6>4 <e,\6>4 }
63
- cBarItsNotGoingToStopCcgeTwo = { \cChordSetCCGE }
68
+ vOneBarItsNotGoingToStopCcgeTwo = { r8 <g\3>8 <e'\1>8 <g'\1>8 r8 <d'\2>4 <c'\2>8 }
69
+ vTwoBarItsNotGoingToStopCcgeTwo = { <c\5>4 <e\4>4 <g,\6>4 <e,\6>4 }
70
+ cBarItsNotGoingToStopCcgeTwo = { \cChordSetCCGE }
64
71
 
65
- vOneBarOutro = { <g'\1>8 <a\3>8 <g'\1>8 <a\3>16 <g'\1>8 <g\3>16 <e'\1>4 <g\3>8 }
66
- vTwoBarOutro = { <a,\5>4 <a,\5>4 <c\5>4 <c\5>4 }
67
- cBarOutro = { \cChordSetAmC }
72
+ vOneBarOutro = { <g'\1>8 <a\3>8 <g'\1>8 <a\3>16 <g'\1>8 <g\3>16 <e'\1>4 <g\3>8 }
73
+ vTwoBarOutro = { <a,\5>4 <a,\5>4 <c\5>4 <c\5>4 }
74
+ cBarOutro = { \cChordSetAmC }
68
75
 
69
- vOneBarPrepareAList = { <e'\1>8 <d'\2>16( <c'\2>8.) <a\3>16 <c'\2>8. <d'\2>16 <e'\1>8. <a\3>16 <e'\1>16 }
70
- vTwoBarPrepareAList = { <a,\5>4 <a,\5>4 <a,\5>4 <a,\5>4 }
71
- cBarPrepareAList = { \cChordSetAm }
76
+ vOneBarPrepareAList = { <e'\1>8 <d'\2>16( <c'\2>8.) <a\3>16 <c'\2>8. <d'\2>16 <e'\1>8. <a\3>16 <e'\1>16 }
77
+ vTwoBarPrepareAList = { <a,\5>4 <a,\5>4 <a,\5>4 <a,\5>4 }
78
+ cBarPrepareAList = { \cChordSetAm }
72
79
 
73
- vOneBarSoJustGiveUp = { r8 <g\3>8 <c'\2>8 <a\3>8 <a\3 c'\2 g'\1 f\4 >4 <c'\3 e'\2 a'\1 >4 }
74
- vTwoBarSoJustGiveUp = { <as,\5>4 <d\4>4 \skip 2 }
75
- cBarSoJustGiveUp = { \cChordSetBbF }
80
+ vOneBarSoJustGiveUp = { r8 <g\3>8 <c'\2>8 <a\3>8 <a\3 c'\2 g'\1 f\4 >4 <c'\3 e'\2 a'\1 >4 }
81
+ vTwoBarSoJustGiveUp = { <as,\5>4 <d\4>4 \skip 2 }
82
+ cBarSoJustGiveUp = { \cChordSetBbF }
76
83
 
77
- vOneBarTheresACure = { r8 <d'\2>16( <c'\2>8.) <a\3>16 <g'\1>8 <g\3>16 <e'\1>4 <g\3>8 }
78
- vTwoBarTheresACure = { <f\4>4 <f\4>4 <c\5>4 <c\5>4 }
79
- cBarTheresACure = { \cChordSetFC }
84
+ vOneBarTheresACure = { r8 <d'\2>16( <c'\2>8.) <a\3>16 <g'\1>8 <g\3>16 <e'\1>4 <g\3>8 }
85
+ vTwoBarTheresACure = { <f\4>4 <f\4>4 <c\5>4 <c\5>4 }
86
+ cBarTheresACure = { \cChordSetFC }
80
87
 
81
- vOneBarTilYouWiseUp = { r8 <g\3>8 <c'\2>8 <g\3>8 <d'\2>4 <a\3>4 }
82
- vTwoBarTilYouWiseUp = { <as,\5>4 <d\4>4 <f\4>4 <f\4>4 }
83
- cBarTilYouWiseUp = { \cChordSetBbF }
88
+ vOneBarTilYouWiseUp = { r8 <g\3>8 <c'\2>8 <g\3>8 <d'\2>4 <a\3>4 }
89
+ vTwoBarTilYouWiseUp = { <as,\5>4 <d\4>4 <f\4>4 <f\4>4 }
90
+ cBarTilYouWiseUp = { \cChordSetBbF }
84
91
 
85
- vOneBarTilYouWiseUpTwo = { r8 <g\3>8 <c'\2>8 <g\3>8 <d'\2>8 <a\3>8 r8 <c'\2>8 }
86
- vTwoBarTilYouWiseUpTwo = { <as,\5>4 <d\4>4 <f\4>4 <f\4>4 }
87
- cBarTilYouWiseUpTwo = { \cChordSetBbF }
92
+ vOneBarTilYouWiseUpTwo = { r8 <g\3>8 <c'\2>8 <g\3>8 <d'\2>8 <a\3>8 r8 <c'\2>8 }
93
+ vTwoBarTilYouWiseUpTwo = { <as,\5>4 <d\4>4 <f\4>4 <f\4>4 }
94
+ cBarTilYouWiseUpTwo = { \cChordSetBbF }
88
95
 
89
- vOneBarTilYouWiseUpThree = { r8 <g\3>8 <c'\2>8 <a\3>8 <d'\2>8 <e'\1>8 r8 <e'\1>8 }
90
- vTwoBarTilYouWiseUpThree = { <as,\5>4 <d\4>4 <f\4>4 <f\4>4 }
91
- cBarTilYouWiseUpThree = { \cChordSetBbF }
96
+ vOneBarTilYouWiseUpThree = { r8 <g\3>8 <c'\2>8 <a\3>8 <d'\2>8 <e'\1>8 r8 <e'\1>8 }
97
+ vTwoBarTilYouWiseUpThree = { <as,\5>4 <d\4>4 <f\4>4 <f\4>4 }
98
+ cBarTilYouWiseUpThree = { \cChordSetBbF }
92
99
 
93
- vOneBarWhatYouThought = { r8 <g'\1>4 <a\3>16 <g'\1>8 <g\3>16 <e'\1>4 <g\3>8 }
94
- vTwoBarWhatYouThought = { <f\4>4 <f\4>4 <c\5>4 <e\4>4 }
95
- cBarWhatYouThought = { \cChordSetFC }
100
+ vOneBarWhatYouThought = { r8 <g'\1>4 <a\3>16 <g'\1>8 <g\3>16 <e'\1>4 <g\3>8 }
101
+ vTwoBarWhatYouThought = { <f\4>4 <f\4>4 <c\5>4 <e\4>4 }
102
+ cBarWhatYouThought = { \cChordSetFC }
96
103
 
97
- vOneBarWhenYouFirst = { <e'\1>8 <d'\2>16( <c'\2>8) <a\3>8. <c'\2>4 <a\3>8 <c'\2>8 }
98
- vTwoBarWhenYouFirst = { <a,\5>4 <a,\5>8 <e\4>4 <a,\5>4 \skip 8 }
99
- cBarWhenYouFirst = { \cChordSetAm }
104
+ vOneBarWhenYouFirst = { <e'\1>8 <d'\2>16( <c'\2>8) <a\3>8. <c'\2>4 <a\3>8 <c'\2>8 }
105
+ vTwoBarWhenYouFirst = { <a,\5>4 <a,\5>8 <e\4>4 <a,\5>4 \skip 8 }
106
+ cBarWhenYouFirst = { \cChordSetAm }
100
107
 
101
- vOneBarYouGot = { <g'\1>8 <a\3>8 <g'\1>8 <a\3>16 <g'\1>8 <g\3>16 <e'\1>4 <g\3>16( <a\3>16) }
102
- vTwoBarYouGot = { <f\4>4 <f\4>4 <c\5>4 <e\4>4 }
103
- cBarYouGot = { \cChordSetFC }
108
+ vOneBarYouGot = { <g'\1>8 <a\3>8 <g'\1>8 <a\3>16 <g'\1>8 <g\3>16 <e'\1>4 <g\3>16( <a\3>16) }
109
+ vTwoBarYouGot = { <f\4>4 <f\4>4 <c\5>4 <e\4>4 }
110
+ cBarYouGot = { \cChordSetFC }
104
111
 
105
- vOneBarYoureSure = { r8 <g'\1>4 <a\3>16 <g'\1>8 <g\3>16 <e'\1>4 <e'\1>8 }
106
- vTwoBarYoureSure = { <f\4>4 <f\4>4 <c\5>4 <e\4>4 }
107
- cBarYoureSure = { \cChordSetFC }
112
+ vOneBarYoureSure = { r8 <g'\1>4 <a\3>16 <g'\1>8 <g\3>16 <e'\1>4 <e'\1>8 }
113
+ vTwoBarYoureSure = { <f\4>4 <f\4>4 <c\5>4 <e\4>4 }
114
+ cBarYoureSure = { \cChordSetFC }
108
115
 
109
116
 
110
117
  %-----------------------------------------------------------------------
@@ -161,34 +168,42 @@ cLineOutroLineTwo = { \cBarOutro \cBarOutro \cBarOutro \cBarOutro }
161
168
  vOneStanzaIntro = { \vOneLineIntroLineOne }
162
169
  vTwoStanzaIntro = { \vTwoLineIntroLineOne }
163
170
  cStanzaIntro = { \cLineIntroLineOne }
171
+ sStanzaIntro = { r1^"Intro" r1 r1 r1 }
164
172
 
165
173
  vOneStanzaVerseOne = { \vOneLineVerseOneLineOne \vOneLineVerseOneLineTwo }
166
174
  vTwoStanzaVerseOne = { \vTwoLineVerseOneLineOne \vTwoLineVerseOneLineTwo }
167
175
  cStanzaVerseOne = { \cLineVerseOneLineOne \cLineVerseOneLineTwo }
176
+ sStanzaVerseOne = { r1^"Verse 1" r1 r1 r1 r1 r1 r1 r1 }
168
177
 
169
178
  vOneStanzaChorusOne = { \vOneLineChorusOneLineOne \vOneLineChorusOneLineTwo }
170
179
  vTwoStanzaChorusOne = { \vTwoLineChorusOneLineOne \vTwoLineChorusOneLineTwo }
171
180
  cStanzaChorusOne = { \cLineChorusOneLineOne \cLineChorusOneLineTwo }
181
+ sStanzaChorusOne = { r1^"Chorus 1" r1 r1 r1 r1 r1 r1 r1 }
172
182
 
173
183
  vOneStanzaVerseTwo = { \vOneLineVerseTwoLineOne \vOneLineVerseOneLineTwo }
174
184
  vTwoStanzaVerseTwo = { \vTwoLineVerseTwoLineOne \vTwoLineVerseOneLineTwo }
175
185
  cStanzaVerseTwo = { \cLineVerseTwoLineOne \cLineVerseOneLineTwo }
186
+ sStanzaVerseTwo = { r1^"Verse 2" r1 r1 r1 r1 r1 r1 r1 }
176
187
 
177
188
  vOneStanzaChorusTwo = { \vOneLineChorusOneLineOne \vOneLineChorusTwoLineTwo }
178
189
  vTwoStanzaChorusTwo = { \vTwoLineChorusOneLineOne \vTwoLineChorusTwoLineTwo }
179
190
  cStanzaChorusTwo = { \cLineChorusOneLineOne \cLineChorusTwoLineTwo }
191
+ sStanzaChorusTwo = { r1^"Chorus 2" r1 r1 r1 r1 r1 r1 r1 }
180
192
 
181
193
  vOneStanzaBridge = { \vOneLineBridgeLineOne }
182
194
  vTwoStanzaBridge = { \vTwoLineBridgeLineOne }
183
195
  cStanzaBridge = { \cLineBridgeLineOne }
196
+ sStanzaBridge = { r1^"Bridge" r1 }
184
197
 
185
198
  vOneStanzaChorusThree = { \vOneLineChorusOneLineOne \vOneLineChorusThreeLineTwo \vOneLineChorusThreeLineThree }
186
199
  vTwoStanzaChorusThree = { \vTwoLineChorusOneLineOne \vTwoLineChorusThreeLineTwo \vTwoLineChorusThreeLineThree }
187
200
  cStanzaChorusThree = { \cLineChorusOneLineOne \cLineChorusThreeLineTwo \cLineChorusThreeLineThree }
201
+ sStanzaChorusThree = { r1^"Chorus 3" r1 r1 r1 r1 r1 r1 r1 r1 r1 r1 r1 }
188
202
 
189
203
  vOneStanzaOutro = { \vOneLineIntroLineOne \vOneLineOutroLineTwo }
190
204
  vTwoStanzaOutro = { \vTwoLineIntroLineOne \vTwoLineOutroLineTwo }
191
205
  cStanzaOutro = { \cLineIntroLineOne \cLineOutroLineTwo }
206
+ sStanzaOutro = { r1^"Outro" r1 r1 r1 r1 r1 r1 r1 }
192
207
 
193
208
 
194
209
  %-----------------------------------------------------------------------
@@ -197,6 +212,7 @@ cStanzaOutro = { \cLineIntroLineOne \cLineOutroLineTwo }
197
212
  vOneScoreTabOneScoreOne = { \vOneStanzaIntro \vOneStanzaVerseOne \vOneStanzaChorusOne \vOneStanzaVerseTwo \vOneStanzaChorusTwo \vOneStanzaBridge \vOneStanzaChorusThree \vOneStanzaOutro }
198
213
  vTwoScoreTabOneScoreOne = { \vTwoStanzaIntro \vTwoStanzaVerseOne \vTwoStanzaChorusOne \vTwoStanzaVerseTwo \vTwoStanzaChorusTwo \vTwoStanzaBridge \vTwoStanzaChorusThree \vTwoStanzaOutro }
199
214
  cScoreTabOneScoreOne = { \cStanzaIntro \cStanzaVerseOne \cStanzaChorusOne \cStanzaVerseTwo \cStanzaChorusTwo \cStanzaBridge \cStanzaChorusThree \cStanzaOutro }
215
+ sScoreTabOneScoreOne = { \sStanzaIntro \sStanzaVerseOne \sStanzaChorusOne \sStanzaVerseTwo \sStanzaChorusTwo \sStanzaBridge \sStanzaChorusThree \sStanzaOutro }
200
216
 
201
217
 
202
218
  %-----------------------------------------------------------------------
@@ -216,15 +232,8 @@ vTwo = {
216
232
  %-----------------------------------------------------------------------
217
233
  % Stanza Headings
218
234
 
219
- stanzaHeadings = {
220
- r1^"Intro" r r r
221
- r1^"Verse 1" r r r r r r r
222
- r1^"Chorus 1" r r r r r r r
223
- r1^"Verse 2" r r r r r r r
224
- r1^"Chorus 2" r r r r r r r
225
- r1^"Bridge" r
226
- r1^"Chorus 3" r r r r r r r r r r r
227
- r1^"Outro" r r r r r r r
235
+ stanzaHeadings = {
236
+ \sScoreTabOneScoreOne
228
237
  }
229
238
 
230
239
  %-----------------------------------------------------------------------
@@ -237,25 +246,33 @@ chordHeadings = { \cScoreTabOneScoreOne }
237
246
  \score {
238
247
  \new StaffGroup <<
239
248
  \new Staff <<
249
+
240
250
  \tempo 4 = 75
241
251
 
242
252
  \clef "treble_8"
243
253
 
254
+ \new ChordNames {
255
+ \chordHeadings
256
+ }
257
+
244
258
  \new Voice \with { \remove Rest_engraver } {
245
259
  \stanzaHeadings
246
260
  }
247
261
 
248
262
  \new Voice {
263
+
249
264
  \voiceOne
250
265
  \vOne
251
266
  }
252
267
  \new Voice {
268
+
253
269
  \voiceTwo
254
270
  \vTwo
255
271
  }
256
272
  >>
257
273
 
258
274
  \new TabStaff <<
275
+
259
276
  \new TabVoice {
260
277
  \slurUp
261
278
  \vOne
@@ -264,9 +281,6 @@ chordHeadings = { \cScoreTabOneScoreOne }
264
281
  \slurUp
265
282
  \vTwo
266
283
  }
267
- \new TabVoice {
268
- \chordHeadings
269
- }
270
284
  >>
271
285
  >>
272
286
 
@@ -7,13 +7,13 @@ Gitara.define do
7
7
  tempo "4 = 75"
8
8
  transposition "d"
9
9
 
10
- chords :Am, 'r4-"Am" r r r'
11
- chords :AmC, 'r4-"Am" r r-"C" r'
12
- chords :BbF, 'r4-"Bb" r r-"F" r'
13
- chords :CCGE, 'r4-"C" r r-"G" r-"E"'
14
- chords :D, 'r4-"D" r r r'
15
- chords :FC, 'r4-"F" r r-"C" r'
16
- chords :FD, 'r4-"F" r r-"D" r'
10
+ chords :Am, 'a1:m'
11
+ chords :AmC, 'a2:m c2'
12
+ chords :BbF, 'bf2 f2'
13
+ chords :CCGE, 'c2 g4 e4'
14
+ chords :D, 'd1'
15
+ chords :FC, 'f2 c2'
16
+ chords :FD, 'f2 d2'
17
17
 
18
18
  bar :BeforeYouSign do
19
19
  notes "r8 <d'/2>16( <c'/2>8.) <a/3>16 <c'/2>8. <d'/2>16 <e'/1>8. <g/3>8"
@@ -1,4 +1,4 @@
1
- \version "2.12.3"
1
+ \version "2.14.2"
2
2
  \include "english.ly"
3
3
 
4
4
  \paper {
@@ -15,12 +15,18 @@
15
15
  %-----------------------------------------------------------------------
16
16
  % Chord Sets
17
17
 
18
- cChordSetG = { r1-"G" }
19
- cChordSetGEight = { r8-"G" }
20
- cChordSetC = { r1-"C" }
21
- cChordSetASeven = { r1-"A7" }
22
- cChordSetEm = { r1-"Em" }
23
- cChordSetD = { r1-"D" }
18
+ cChordSetG = { \chordmode { g1 } }
19
+
20
+ cChordSetGEight = { \chordmode { g8 } }
21
+
22
+ cChordSetC = { \chordmode { c1 } }
23
+
24
+ cChordSetASeven = { \chordmode { a1:7 } }
25
+
26
+ cChordSetEm = { \chordmode { e1:m } }
27
+
28
+ cChordSetD = { \chordmode { d1 } }
29
+
24
30
 
25
31
  %-----------------------------------------------------------------------
26
32
  % Bars
@@ -28,177 +34,142 @@ cChordSetD = { r1-"D" }
28
34
  vOneBarVerseLineOneBarOne = { \partial 8 <g\3>8 }
29
35
  vTwoBarVerseLineOneBarOne = { \partial 8 r8 }
30
36
  cBarVerseLineOneBarOne = { \partial 8 \cChordSetGEight }
31
- sBarVerseLineOneBarOne = { \partial 8 r8^"Verse" }
32
37
 
33
38
  vOneBarVerseLineOneBarTwo = { <a\3>16\glissando <b\3>16 <b\3>4 r16 <a\3>16\glissando <b\3>4. <a\3>16( <g\3>16) }
34
39
  vTwoBarVerseLineOneBarTwo = { r1 }
35
40
  cBarVerseLineOneBarTwo = { \cChordSetG }
36
- sBarVerseLineOneBarTwo = { r1 }
37
41
 
38
42
  vOneBarVerseLineOneBarThree = { <a\3>8( <g\3>4) <cs'\2>4 <g\3>4. }
39
43
  vTwoBarVerseLineOneBarThree = { \skip 8 r8 <e\4>4 <a,\5>4 <e\4>8 <b,\5>8 }
40
44
  cBarVerseLineOneBarThree = { \cChordSetASeven }
41
- sBarVerseLineOneBarThree = { r1 }
42
45
 
43
46
  vOneBarVerseLineOneBarFour = { r4 <g\3>8 <g\3>8 <g\3>8 <a\3>8 <c'\2>8 <b~\2>8 }
44
47
  vTwoBarVerseLineOneBarFour = { <c\5>4 <e\4>4 <c\5>4 <e\4>4 }
45
48
  cBarVerseLineOneBarFour = { \cChordSetC }
46
- sBarVerseLineOneBarFour = { r1 }
47
49
 
48
50
  vOneBarVerseLineOneBarFive = { <b\2>8 <g\3>8 <b\2>8 <b\2>16 <g\3>16 \skip 16 <b\2>16 <g\3>16 \skip 16 <b\2>16 <g\3>16 \skip 8 }
49
51
  vTwoBarVerseLineOneBarFive = { <g,\6>4 <d\4>4 <d\4>16 \skip 16 \skip 16 <d\4>16 \skip 16 \skip 16 <d\4>8 }
50
52
  cBarVerseLineOneBarFive = { \cChordSetG }
51
- sBarVerseLineOneBarFive = { r1 }
52
53
 
53
54
  vOneBarVerseLineTwoBarOne = { r8 <g\3>8 <b\2>8 <b\2>16 <b\2>8 <b\2>16( <d'\2>8) <e'\1>4 }
54
55
  vTwoBarVerseLineTwoBarOne = { <g,\6>4 <d\4>4 <g,\6>4 <d\4>4 }
55
56
  cBarVerseLineTwoBarOne = { \cChordSetG }
56
- sBarVerseLineTwoBarOne = { r1 }
57
57
 
58
58
  vOneBarVerseLineTwoBarTwo = { <a\3>16( <g\3>16)( <a\3>4) <cs'\2>4 <a\3>4 <b\2>8 }
59
59
  vTwoBarVerseLineTwoBarTwo = { <a,\5>4 <e\4>4 <a,\5>4 <e\4>4 }
60
60
  cBarVerseLineTwoBarTwo = { \cChordSetASeven }
61
- sBarVerseLineTwoBarTwo = { r1 }
62
61
 
63
62
  vOneBarVerseLineTwoBarThree = { <c'\2>4. <d'\2>4 <c'\2>4 <b~\2>8 }
64
63
  vTwoBarVerseLineTwoBarThree = { <c\5>4 <e\4>4 <c\5>4 <e\4>4 }
65
64
  cBarVerseLineTwoBarThree = { \cChordSetC }
66
- sBarVerseLineTwoBarThree = { r1 }
67
65
 
68
66
  vOneBarVerseLineTwoBarFour = { <b\2>8 <g\3>4 <g\3>4 <b\2>8 <b\2>8 <c'\2>8 }
69
67
  vTwoBarVerseLineTwoBarFour = { <g,\6>4 <d\4>4 <g,\6>4 <d\4>4 }
70
68
  cBarVerseLineTwoBarFour = { \cChordSetG }
71
- sBarVerseLineTwoBarFour = { r1 }
72
69
 
73
70
  vOneBarVerseLineThreeBarOne = { <d'\2>4. <d'\2>4 <d'\2>4 <cs'~\2>8 }
74
71
  vTwoBarVerseLineThreeBarOne = { <g,\6>4 <d\4>4 <g,\6>4 <d\4>4 }
75
72
  cBarVerseLineThreeBarOne = { \cChordSetG }
76
- sBarVerseLineThreeBarOne = { r1 }
77
73
 
78
74
  vOneBarVerseLineThreeBarTwo = { <cs'\2>8 <a\3>4 <a\3>4 <a\3>4 <b\2>8 }
79
75
  vTwoBarVerseLineThreeBarTwo = { <a,\5>4 <e\4>4 <a,\5>4 <e\4>4 }
80
76
  cBarVerseLineThreeBarTwo = { \cChordSetASeven }
81
- sBarVerseLineThreeBarTwo = { r1 }
82
77
 
83
78
  vOneBarVerseLineThreeBarThree = { <c'\2>4 <c'\2>8 <d'\2>4 <e'\1>4 <b~\2>8 }
84
79
  vTwoBarVerseLineThreeBarThree = { <c\5>4 <e\4>4 <c\5>4 <e\4>4 }
85
80
  cBarVerseLineThreeBarThree = { \cChordSetC }
86
- sBarVerseLineThreeBarThree = { r1 }
87
81
 
88
82
  vOneBarVerseLineThreeBarFour = { <b\2>8 <d'\2>4 <d'\2>4 <b\2>16 <a\3>8 <g\3>16( <a\3>8) }
89
83
  vTwoBarVerseLineThreeBarFour = { <g,\6>4 <d\4>4 <g,\6>4 <d\4>4 }
90
84
  cBarVerseLineThreeBarFour = { \cChordSetG }
91
- sBarVerseLineThreeBarFour = { r1 }
92
85
 
93
86
  vOneBarVerseLineFourBarOne = { <b\2>4. <b\2>4 <b\2>16 <b\2>16 r16 <a\3>16 <b\2>8 }
94
87
  vTwoBarVerseLineFourBarOne = { <g,\6>4 <d\4>4 <g,\6>4 <d\4>4 }
95
88
  cBarVerseLineFourBarOne = { \cChordSetG }
96
- sBarVerseLineFourBarOne = { r1 }
97
89
 
98
90
  vOneBarVerseLineFourBarTwo = { <a\3>16( <g\3>16) <e\4>4 <cs'\2>4 <g\3>16 <g\3>16 r16 <g\3>16 <g\3>8 }
99
91
  vTwoBarVerseLineFourBarTwo = { <a,\5>4 <e\4>4 <a,\5>4 <e\4>4 }
100
92
  cBarVerseLineFourBarTwo = { \cChordSetASeven }
101
- sBarVerseLineFourBarTwo = { r1 }
102
93
 
103
94
  vOneBarVerseLineFourBarThree = { <g\3>4. <g\3>4 <a\3>8 <c'\2>8 <b~\2>8 }
104
95
  vTwoBarVerseLineFourBarThree = { <c\5>4 <e\4>4 <c\5>4 <e\4>4 }
105
96
  cBarVerseLineFourBarThree = { \cChordSetC }
106
- sBarVerseLineFourBarThree = { r1 }
107
97
 
108
98
  vOneBarVerseLineFourBarFour = { <b\2>8 <g\3>4 <g\3>4 <g\3>4. }
109
99
  vTwoBarVerseLineFourBarFour = { <g,\6>4 <d\4>4 <g,\6>4 <g,\6>8 <fs,\6>8 }
110
100
  cBarVerseLineFourBarFour = { \cChordSetG }
111
- sBarVerseLineFourBarFour = { r1 }
112
101
 
113
102
  vOneBarRefrainLineOneBarOne = { r4 <g\3>8 <g\3>8 <g\3>8 <g\3>8 <e'\1>8 <d'~\2>8 }
114
103
  vTwoBarRefrainLineOneBarOne = { <e,\6>4 <e\4>4 <e,\6>4 <e\4>4 }
115
104
  cBarRefrainLineOneBarOne = { \cChordSetEm }
116
- sBarRefrainLineOneBarOne = { r1^"Refrain" }
117
105
 
118
106
  vOneBarRefrainLineOneBarTwo = { <d'\2>8 <b\2>4 <a\3>4 <a\3>4 <b\2>8 }
119
107
  vTwoBarRefrainLineOneBarTwo = { <g,\6>4 <d\4>4 <g,\6>4 <d\4>4 }
120
108
  cBarRefrainLineOneBarTwo = { \cChordSetG }
121
- sBarRefrainLineOneBarTwo = { r1 }
122
109
 
123
110
  vOneBarRefrainLineOneBarThree = { <c'\2>4 <c'\2>8 <d'\2>4 <g\3>8( <a\3>8) <b~\2>8 }
124
111
  vTwoBarRefrainLineOneBarThree = { <c\5>4 <e\4>4 <c\5>4 <e\4>4 }
125
112
  cBarRefrainLineOneBarThree = { \cChordSetC }
126
- sBarRefrainLineOneBarThree = { r1 }
127
113
 
128
114
  vOneBarRefrainLineOneBarFour = { <b\2>8 <a\3>4 <a\3>4 <a\3>4. }
129
115
  vTwoBarRefrainLineOneBarFour = { <a,\5>4 <d\4>4 <a,\5>4 <g,\6>8 <fs,\6>8 }
130
116
  cBarRefrainLineOneBarFour = { \cChordSetD }
131
- sBarRefrainLineOneBarFour = { r1 }
132
117
 
133
118
  vOneBarRefrainLineTwoBarOne = { r4 <g\3>8 <g\3>8 <g\3>8 <g\3>8 <e'\1>8 <d'~\2>8 }
134
119
  vTwoBarRefrainLineTwoBarOne = { <e,\6>4 <e\4>4 <e,\6>4 <e\4>4 }
135
120
  cBarRefrainLineTwoBarOne = { \cChordSetEm }
136
- sBarRefrainLineTwoBarOne = { r1 }
137
121
 
138
122
  vOneBarRefrainLineTwoBarTwo = { <d'\2>8 <b\2>4 <a\3>4 <a\3>4 <b\2>8 }
139
123
  vTwoBarRefrainLineTwoBarTwo = { <g,\6>4 <d\4>4 <g,\6>4 <d\4>4 }
140
124
  cBarRefrainLineTwoBarTwo = { \cChordSetG }
141
- sBarRefrainLineTwoBarTwo = { r1 }
142
125
 
143
126
  vOneBarRefrainLineTwoBarThree = { <c'\2>4 <c'\2>8 <d'\2>4 <e'\1>4 <e'~\1>8 }
144
127
  vTwoBarRefrainLineTwoBarThree = { <c\5>4 <e\4>4 <c\5>4 <e\4>4 }
145
128
  cBarRefrainLineTwoBarThree = { \cChordSetC }
146
- sBarRefrainLineTwoBarThree = { r1 }
147
129
 
148
130
  vOneBarRefrainLineTwoBarFour = { <e'\1>8 <d'\2>4 <d'\2>4 <d'\2>4 <d'\2>8 }
149
131
  vTwoBarRefrainLineTwoBarFour = { <a,\5>4 <d\4>4 <a,\5>4 <d\4>4 }
150
132
  cBarRefrainLineTwoBarFour = { \cChordSetD }
151
- sBarRefrainLineTwoBarFour = { r1 }
152
133
 
153
134
  vOneBarRefrainLineTwoBarFive = { <a\3 d'\2 >8 <a\3 d'\2 >8 <a\3 d'\2 >8 <a\3 d'\2 >8 <a\3 d'\2 >8 <b\2>8 <b\2>8 <c'\2>8 }
154
135
  vTwoBarRefrainLineTwoBarFive = { <d\4>8 <d\4>8 <d\4>8 <d\4>8 <d\4>8 \skip 8 \skip 8 \skip 8 }
155
136
  cBarRefrainLineTwoBarFive = { \cChordSetD }
156
- sBarRefrainLineTwoBarFive = { r1 }
157
137
 
158
138
  vOneBarChorusLineOneBarOne = { <d'\2>4. <g'\1>4 <d'\2>4 <cs'~\2>8 }
159
139
  vTwoBarChorusLineOneBarOne = { <g,\6>4 <d\4>4 <g,\6>4 <d\4>4 }
160
140
  cBarChorusLineOneBarOne = { \cChordSetG }
161
- sBarChorusLineOneBarOne = { r1^"Chorus" }
162
141
 
163
142
  vOneBarChorusLineOneBarTwo = { <cs'\2>4 <g'\1>8 <g'\1>4 <cs'\2>4 <c'~\2>8 }
164
143
  vTwoBarChorusLineOneBarTwo = { <a,\5>4 <e\4>4 <a,\5>4 <e\4>4 }
165
144
  cBarChorusLineOneBarTwo = { \cChordSetASeven }
166
- sBarChorusLineOneBarTwo = { r1 }
167
145
 
168
146
  vOneBarChorusLineOneBarThree = { <c'\2>4. <d'\2>4 <e'\1>4 <b~\2>8 }
169
147
  vTwoBarChorusLineOneBarThree = { <c\5>4 <e\4>4 <c\5>4 <e\4>4 }
170
148
  cBarChorusLineOneBarThree = { \cChordSetC }
171
- sBarChorusLineOneBarThree = { r1 }
172
149
 
173
150
  vOneBarChorusLineOneBarFour = { <b\2>8 <d'\2>4 <d'\2>4 <b\2>8 <b\2>8 <c'\2>8 }
174
151
  vTwoBarChorusLineOneBarFour = { <g,\6>4 <d\4>4 <g,\6>4 <d\4>4 }
175
152
  cBarChorusLineOneBarFour = { \cChordSetG }
176
- sBarChorusLineOneBarFour = { r1 }
177
153
 
178
154
  vOneBarChorusLineTwoBarOne = { <d'\2>4. <g'\1>4 <d'\2>4 <cs'~\2>8 }
179
155
  vTwoBarChorusLineTwoBarOne = { <g,\6>4 <d\4>4 <g,\6>4 <d\4>4 }
180
156
  cBarChorusLineTwoBarOne = { \cChordSetG }
181
- sBarChorusLineTwoBarOne = { r1 }
182
157
 
183
158
  vOneBarChorusLineTwoBarTwo = { <cs'\2>4 <g'\1>8 <g'\1>4 <cs'\2>4 <c'~\2>8 }
184
159
  vTwoBarChorusLineTwoBarTwo = { <a,\5>4 <e\4>4 <a,\5>4 <e\4>4 }
185
160
  cBarChorusLineTwoBarTwo = { \cChordSetASeven }
186
- sBarChorusLineTwoBarTwo = { r1 }
187
161
 
188
162
  vOneBarChorusLineTwoBarThree = { <c'\2>4. <d'\2>4 <c'\2>4 <b~\2>8 }
189
163
  vTwoBarChorusLineTwoBarThree = { <c\5>4 <e\4>4 <c\5>4 <e\4>4 }
190
164
  cBarChorusLineTwoBarThree = { \cChordSetC }
191
- sBarChorusLineTwoBarThree = { r1 }
192
165
 
193
166
  vOneBarChorusLineTwoBarFour = { <b\2>8 <g\3>4 <g\3>4 <g\3>4 <g\3>8 }
194
167
  vTwoBarChorusLineTwoBarFour = { <g,\6>4 <d\4>4 <g,\6>4 <d\4>4 }
195
168
  cBarChorusLineTwoBarFour = { \cChordSetG }
196
- sBarChorusLineTwoBarFour = { r1 }
197
169
 
198
170
  vOneBarChorusLineTwoBarFive = { <g\3 d'\2 g'\1 >1 }
199
171
  vTwoBarChorusLineTwoBarFive = { <g,\6 b,\5 d\4 >1 }
200
172
  cBarChorusLineTwoBarFive = { \cChordSetG }
201
- sBarChorusLineTwoBarFive = { r1 }
202
173
 
203
174
 
204
175
  %-----------------------------------------------------------------------
@@ -207,42 +178,34 @@ sBarChorusLineTwoBarFive = { r1 }
207
178
  vOneLineVerseLineOne = { \vOneBarVerseLineOneBarOne \vOneBarVerseLineOneBarTwo \vOneBarVerseLineOneBarThree \vOneBarVerseLineOneBarFour \vOneBarVerseLineOneBarFive \break }
208
179
  vTwoLineVerseLineOne = { \vTwoBarVerseLineOneBarOne \vTwoBarVerseLineOneBarTwo \vTwoBarVerseLineOneBarThree \vTwoBarVerseLineOneBarFour \vTwoBarVerseLineOneBarFive \break }
209
180
  cLineVerseLineOne = { \cBarVerseLineOneBarOne \cBarVerseLineOneBarTwo \cBarVerseLineOneBarThree \cBarVerseLineOneBarFour \cBarVerseLineOneBarFive }
210
- sLineVerseLineOne = { \sBarVerseLineOneBarOne \sBarVerseLineOneBarTwo \sBarVerseLineOneBarThree \sBarVerseLineOneBarFour \sBarVerseLineOneBarFive }
211
181
 
212
182
  vOneLineVerseLineTwo = { \vOneBarVerseLineTwoBarOne \vOneBarVerseLineTwoBarTwo \vOneBarVerseLineTwoBarThree \vOneBarVerseLineTwoBarFour \break }
213
183
  vTwoLineVerseLineTwo = { \vTwoBarVerseLineTwoBarOne \vTwoBarVerseLineTwoBarTwo \vTwoBarVerseLineTwoBarThree \vTwoBarVerseLineTwoBarFour \break }
214
184
  cLineVerseLineTwo = { \cBarVerseLineTwoBarOne \cBarVerseLineTwoBarTwo \cBarVerseLineTwoBarThree \cBarVerseLineTwoBarFour }
215
- sLineVerseLineTwo = { \sBarVerseLineTwoBarOne \sBarVerseLineTwoBarTwo \sBarVerseLineTwoBarThree \sBarVerseLineTwoBarFour }
216
185
 
217
186
  vOneLineVerseLineThree = { \vOneBarVerseLineThreeBarOne \vOneBarVerseLineThreeBarTwo \vOneBarVerseLineThreeBarThree \vOneBarVerseLineThreeBarFour \break }
218
187
  vTwoLineVerseLineThree = { \vTwoBarVerseLineThreeBarOne \vTwoBarVerseLineThreeBarTwo \vTwoBarVerseLineThreeBarThree \vTwoBarVerseLineThreeBarFour \break }
219
188
  cLineVerseLineThree = { \cBarVerseLineThreeBarOne \cBarVerseLineThreeBarTwo \cBarVerseLineThreeBarThree \cBarVerseLineThreeBarFour }
220
- sLineVerseLineThree = { \sBarVerseLineThreeBarOne \sBarVerseLineThreeBarTwo \sBarVerseLineThreeBarThree \sBarVerseLineThreeBarFour }
221
189
 
222
190
  vOneLineVerseLineFour = { \vOneBarVerseLineFourBarOne \vOneBarVerseLineFourBarTwo \vOneBarVerseLineFourBarThree \vOneBarVerseLineFourBarFour \break }
223
191
  vTwoLineVerseLineFour = { \vTwoBarVerseLineFourBarOne \vTwoBarVerseLineFourBarTwo \vTwoBarVerseLineFourBarThree \vTwoBarVerseLineFourBarFour \break }
224
192
  cLineVerseLineFour = { \cBarVerseLineFourBarOne \cBarVerseLineFourBarTwo \cBarVerseLineFourBarThree \cBarVerseLineFourBarFour }
225
- sLineVerseLineFour = { \sBarVerseLineFourBarOne \sBarVerseLineFourBarTwo \sBarVerseLineFourBarThree \sBarVerseLineFourBarFour }
226
193
 
227
194
  vOneLineRefrainLineOne = { \vOneBarRefrainLineOneBarOne \vOneBarRefrainLineOneBarTwo \vOneBarRefrainLineOneBarThree \vOneBarRefrainLineOneBarFour \break }
228
195
  vTwoLineRefrainLineOne = { \vTwoBarRefrainLineOneBarOne \vTwoBarRefrainLineOneBarTwo \vTwoBarRefrainLineOneBarThree \vTwoBarRefrainLineOneBarFour \break }
229
196
  cLineRefrainLineOne = { \cBarRefrainLineOneBarOne \cBarRefrainLineOneBarTwo \cBarRefrainLineOneBarThree \cBarRefrainLineOneBarFour }
230
- sLineRefrainLineOne = { \sBarRefrainLineOneBarOne \sBarRefrainLineOneBarTwo \sBarRefrainLineOneBarThree \sBarRefrainLineOneBarFour }
231
197
 
232
198
  vOneLineRefrainLineTwo = { \vOneBarRefrainLineTwoBarOne \vOneBarRefrainLineTwoBarTwo \vOneBarRefrainLineTwoBarThree \vOneBarRefrainLineTwoBarFour \vOneBarRefrainLineTwoBarFive \break }
233
199
  vTwoLineRefrainLineTwo = { \vTwoBarRefrainLineTwoBarOne \vTwoBarRefrainLineTwoBarTwo \vTwoBarRefrainLineTwoBarThree \vTwoBarRefrainLineTwoBarFour \vTwoBarRefrainLineTwoBarFive \break }
234
200
  cLineRefrainLineTwo = { \cBarRefrainLineTwoBarOne \cBarRefrainLineTwoBarTwo \cBarRefrainLineTwoBarThree \cBarRefrainLineTwoBarFour \cBarRefrainLineTwoBarFive }
235
- sLineRefrainLineTwo = { \sBarRefrainLineTwoBarOne \sBarRefrainLineTwoBarTwo \sBarRefrainLineTwoBarThree \sBarRefrainLineTwoBarFour \sBarRefrainLineTwoBarFive }
236
201
 
237
202
  vOneLineChorusLineOne = { \vOneBarChorusLineOneBarOne \vOneBarChorusLineOneBarTwo \vOneBarChorusLineOneBarThree \vOneBarChorusLineOneBarFour \break }
238
203
  vTwoLineChorusLineOne = { \vTwoBarChorusLineOneBarOne \vTwoBarChorusLineOneBarTwo \vTwoBarChorusLineOneBarThree \vTwoBarChorusLineOneBarFour \break }
239
204
  cLineChorusLineOne = { \cBarChorusLineOneBarOne \cBarChorusLineOneBarTwo \cBarChorusLineOneBarThree \cBarChorusLineOneBarFour }
240
- sLineChorusLineOne = { \sBarChorusLineOneBarOne \sBarChorusLineOneBarTwo \sBarChorusLineOneBarThree \sBarChorusLineOneBarFour }
241
205
 
242
206
  vOneLineChorusLineTwo = { \vOneBarChorusLineTwoBarOne \vOneBarChorusLineTwoBarTwo \vOneBarChorusLineTwoBarThree \vOneBarChorusLineTwoBarFour \vOneBarChorusLineTwoBarFive \break }
243
207
  vTwoLineChorusLineTwo = { \vTwoBarChorusLineTwoBarOne \vTwoBarChorusLineTwoBarTwo \vTwoBarChorusLineTwoBarThree \vTwoBarChorusLineTwoBarFour \vTwoBarChorusLineTwoBarFive \break }
244
208
  cLineChorusLineTwo = { \cBarChorusLineTwoBarOne \cBarChorusLineTwoBarTwo \cBarChorusLineTwoBarThree \cBarChorusLineTwoBarFour \cBarChorusLineTwoBarFive }
245
- sLineChorusLineTwo = { \sBarChorusLineTwoBarOne \sBarChorusLineTwoBarTwo \sBarChorusLineTwoBarThree \sBarChorusLineTwoBarFour \sBarChorusLineTwoBarFive }
246
209
 
247
210
 
248
211
  %-----------------------------------------------------------------------
@@ -251,17 +214,17 @@ sLineChorusLineTwo = { \sBarChorusLineTwoBarOne \sBarChorusLineTwoBarTwo \sBarCh
251
214
  vOneStanzaVerse = { \vOneLineVerseLineOne \vOneLineVerseLineTwo \vOneLineVerseLineThree \vOneLineVerseLineFour }
252
215
  vTwoStanzaVerse = { \vTwoLineVerseLineOne \vTwoLineVerseLineTwo \vTwoLineVerseLineThree \vTwoLineVerseLineFour }
253
216
  cStanzaVerse = { \cLineVerseLineOne \cLineVerseLineTwo \cLineVerseLineThree \cLineVerseLineFour }
254
- sStanzaVerse = { \sLineVerseLineOne \sLineVerseLineTwo \sLineVerseLineThree \sLineVerseLineFour }
217
+ sStanzaVerse = { r8^"Verse" r1 r1 r1 r1 r1 r1 r1 r1 r1 r1 r1 r1 r1 r1 r1 r1 }
255
218
 
256
219
  vOneStanzaRefrain = { \vOneLineRefrainLineOne \vOneLineRefrainLineTwo }
257
220
  vTwoStanzaRefrain = { \vTwoLineRefrainLineOne \vTwoLineRefrainLineTwo }
258
221
  cStanzaRefrain = { \cLineRefrainLineOne \cLineRefrainLineTwo }
259
- sStanzaRefrain = { \sLineRefrainLineOne \sLineRefrainLineTwo }
222
+ sStanzaRefrain = { r1^"Refrain" r1 r1 r1 r1 r1 r1 r1 r1 }
260
223
 
261
224
  vOneStanzaChorus = { \vOneLineChorusLineOne \vOneLineChorusLineTwo }
262
225
  vTwoStanzaChorus = { \vTwoLineChorusLineOne \vTwoLineChorusLineTwo }
263
226
  cStanzaChorus = { \cLineChorusLineOne \cLineChorusLineTwo }
264
- sStanzaChorus = { \sLineChorusLineOne \sLineChorusLineTwo }
227
+ sStanzaChorus = { r1^"Chorus" r1 r1 r1 r1 r1 r1 r1 r1 }
265
228
 
266
229
 
267
230
  %-----------------------------------------------------------------------
@@ -290,7 +253,9 @@ vTwo = {
290
253
  %-----------------------------------------------------------------------
291
254
  % Stanza Headings
292
255
 
293
- stanzaHeadings = { \sScoreTabOneScoreOne }
256
+ stanzaHeadings = {
257
+ \sScoreTabOneScoreOne
258
+ }
294
259
 
295
260
  %-----------------------------------------------------------------------
296
261
  % Chord Headings
@@ -302,25 +267,33 @@ chordHeadings = { \cScoreTabOneScoreOne }
302
267
  \score {
303
268
  \new StaffGroup <<
304
269
  \new Staff <<
270
+
305
271
  \tempo 4 = 90
306
272
 
307
273
  \clef "treble_8"
308
274
 
275
+ \new ChordNames {
276
+ \chordHeadings
277
+ }
278
+
309
279
  \new Voice \with { \remove Rest_engraver } {
310
280
  \stanzaHeadings
311
281
  }
312
282
 
313
283
  \new Voice {
284
+
314
285
  \voiceOne
315
286
  \vOne
316
287
  }
317
288
  \new Voice {
289
+
318
290
  \voiceTwo
319
291
  \vTwo
320
292
  }
321
293
  >>
322
294
 
323
295
  \new TabStaff <<
296
+
324
297
  \new TabVoice {
325
298
  \slurUp
326
299
  \vOne
@@ -329,9 +302,6 @@ chordHeadings = { \cScoreTabOneScoreOne }
329
302
  \slurUp
330
303
  \vTwo
331
304
  }
332
- \new TabVoice {
333
- \chordHeadings
334
- }
335
305
  >>
336
306
  >>
337
307