gitara 0.8.0 → 1.0.0

data/CHANGELOG.markdown

@@ -1,4 +1,11 @@
-0.8.0 - 2012-05-30
+1.0.0 - 2013-01-24
+------------------
+
+* [#26] Stanza labels do not display when reusing bars.
+* [#27]	Render chords using chord notation.
+* `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.
+
+0.8.0 - 2013-01-20
 ------------------
 
 * [#25] I should be able to disable manual breaking on some lines.

data/README.markdown

@@ -8,10 +8,9 @@ To install,
 
     gem install gitara
 
-You need [lilypond](http://lilypond.org) 2.12 or higher in order to generate pdfs and midis.
-
-Gitara is tested on Ruby 1.9.3 only. Patches are welcome.
+You need [lilypond](http://lilypond.org) in order to generate pdfs and midis.
 
+Gitara is tested on Ruby 1.9.3 and Lilypond 2.14. Patches are welcome.
 
 To run,
 
@@ -43,7 +42,7 @@ You can find examples at https://github.com/gsmendoza/gitara/tree/master/example
 Bars
 ----
 
-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).
+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).
 
     Gitara.define do
       bar do
@@ -51,7 +50,7 @@ Bars are the smallest expressions in Gitara. That is, a gitara file must have at
       end
     end
 
-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).
+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).
 
 
 ### Notes with single quotes and backslashes
@@ -77,7 +76,7 @@ Prettier and easier to search and replace.
 
 ### Multiple voices
 
-Each line of notes in a bar is a [voice](http://lilypond.org/doc/v2.12/Documentation/user/lilypond-learning/Voices-contain-music):
+Each line of notes in a bar is a [voice](http://lilypond.org/doc/v2.14/Documentation/learning/voices-contain-music):
 
     Gitara.define do
       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
 
 ### Partial bars
 
-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>`:
+To indicate that a bar is a [partial measure](http://lilypond.org/doc/v2.14/Documentation/notation/displaying-rhythms#upbeats), call `partial <duration>`:
 
     bar do
       partial 8
@@ -115,7 +114,7 @@ You can group bars in a line:
       bar :SaDibdibMoyBuhay
     end
 
-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:
+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:
 
     line :LineOne, :manual_break => false do
     end
@@ -222,7 +221,7 @@ Finally, you can call multiple expressions in a single line:
 
 ### Repeats and alternative endings
 
-You can also group expressions under [repeats](http://lilypond.org/doc/v2.12/Documentation/user/lilypond/Long-repeats) and provide alternative endings:
+You can also group expressions under [repeats](http://lilypond.org/doc/v2.14/Documentation/notation/long-repeats) and provide alternative endings:
 
     Gitara.define do
       line do
@@ -265,11 +264,11 @@ A gitara file can have the following properties:
 * arranger - tab's arranger
 * composer - song's composer
 * instrument - description of the instrument used on the tab
-* [key](http://lilypond.org/doc/v2.12/Documentation/user/lilypond/Displaying-pitches#Key-signature)
+* [key](http://lilypond.org/doc/v2.14/Documentation/notation/displaying-pitches#key-signature)
 * midi_instrument - the type of instrument played in the midi export of the tab. By default, "acoustic guitar (nylon)".
-* [string_tunings](http://lilypond.org/doc/v2.12/Documentation/user/lilypond/Common-notation-for-fretted-strings#Custom-tablatures)
-* [tempo](http://lilypond.org/doc/v2.12/Documentation/user/lilypond/Writing-parts#Metronome-marks)
-* [time](http://lilypond.org/doc/v2.12/Documentation/user/lilypond/Displaying-rhythms#Time-signature) - default is 4/4
+* [string_tunings](http://lilypond.org/doc/v2.14/Documentation/notation/common-notation-for-fretted-strings#custom-tablatures)
+* [tempo](http://lilypond.org/doc/v2.14/Documentation/notation/displaying-rhythms#metronome-marks)
+* [time](http://lilypond.org/doc/v2.14/Documentation/notation/displaying-rhythms#time-signature) - default is 4/4
 * title - title of the song
 * 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).
 
@@ -280,7 +279,7 @@ Chord labels
 You can add chord labels to bars:
 
     Gitara.define do
-      chords :FC,   'r4-"F" r r-"C" r'
+      chords :FC,   'f2 c2'
 
       bar :BeganIt do
         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:
       end
     end
 
-`r4-"F" r r-"C" r` is a [lilypond music expression](http://lilypond.org/doc/v2.12/Documentation/user/lilypond-learning/Music-expressions-explained).
-
-* `r` is a rest. `r4` is a rest that is a quarter note long. Succeeding rests have the same duration as the first one.
-* `-"F"` means 'place the text "F" below the rest note'. See http://lilypond.org/doc/v2.12/Documentation/user/lilypond/Writing-text.
-
-When these chord labels are added to the Gitara lilypond output, Gitara hides the rest notes so only the chord labels are visible.
+`f2` and `c2` are [lilypond chord names](http://lilypond.org/doc/v2.14/Documentation/notation/displaying-chords).
 
 If the bar is a partial measure, the duration of the chords within the bar must match the bar's duration:
 
-    chords :G8, 'r8-"G"'
+    chords :G8, 'g8'
 
     bar do
       partial 8

data/examples/{aimee-man-wise-up/aimee-man-wise-up.ly → aimee-man-wise-up.ly}

@@ -1,4 +1,4 @@
-\version "2.12.3"
+\version "2.14.2"
 \include "english.ly"
 
 \paper {
@@ -15,96 +15,103 @@
 %-----------------------------------------------------------------------
 % Chord Sets
 
-cChordSetAm = { r4-"Am" r r r }
-cChordSetAmC = { r4-"Am" r r-"C" r }
-cChordSetBbF = { r4-"Bb" r r-"F" r }
-cChordSetCCGE = { r4-"C" r r-"G" r-"E" }
-cChordSetD = { r4-"D" r r r }
-cChordSetFC = { r4-"F" r r-"C" r }
-cChordSetFD = { r4-"F" r r-"D" r }
+cChordSetAm = { \chordmode { a1:m } }
+
+cChordSetAmC = { \chordmode { a2:m c2 } }
+
+cChordSetBbF = { \chordmode { bf2 f2 } }
+
+cChordSetCCGE = { \chordmode { c2 g4 e4 } }
+
+cChordSetD = { \chordmode { d1 } }
+
+cChordSetFC = { \chordmode { f2 c2 } }
+
+cChordSetFD = { \chordmode { f2 d2 } }
+
 
 %-----------------------------------------------------------------------
 % Bars
 
-vOneBarBeforeYouSign = { r8 <d'\2>16( <c'\2>8.) <a\3>16 <c'\2>8. <d'\2>16 <e'\1>8. <g\3>8 }
-vTwoBarBeforeYouSign = { <d\4>4 <d\4>4 <d\4>4 <d\4>4 }
-cBarBeforeYouSign = { \cChordSetD }
+vOneBarBeforeYouSign = {  r8 <d'\2>16( <c'\2>8.) <a\3>16 <c'\2>8. <d'\2>16 <e'\1>8. <g\3>8 }
+vTwoBarBeforeYouSign = {  <d\4>4 <d\4>4 <d\4>4 <d\4>4 }
+cBarBeforeYouSign = {  \cChordSetD }
 
-vOneBarBeganIt = { \skip 4 <a\3 c'\2 >8 <g\3>8 \skip 4 <g\3 c'\2 >8 <g\3>8 }
-vTwoBarBeganIt = { <f\4>4 <f\4>4 <c\5>4 <e\4>4 }
-cBarBeganIt = { \cChordSetFC }
+vOneBarBeganIt = {  \skip 4 <a\3 c'\2 >8 <g\3>8 \skip 4 <g\3 c'\2 >8 <g\3>8 }
+vTwoBarBeganIt = {  <f\4>4 <f\4>4 <c\5>4 <e\4>4 }
+cBarBeganIt = {  \cChordSetFC }
 
-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 }
-vTwoBarItThough = { <f\4>4 <f\4>4 <d\4>4 <d\4>4 }
-cBarItThough = { \cChordSetFD }
+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 }
+vTwoBarItThough = {  <f\4>4 <f\4>4 <d\4>4 <d\4>4 }
+cBarItThough = {  \cChordSetFD }
 
-vOneBarFDm = { r8 <a\3>8 <c'\2>8 <a\3>8 r8 <d'\2>8 <a\3>8 <e'\1>8 }
-vTwoBarFDm = { <f\4>4 <f\4>4 <d\4>2 }
-cBarFDm = { \cChordSetFD }
+vOneBarFDm = {  r8 <a\3>8 <c'\2>8 <a\3>8 r8 <d'\2>8 <a\3>8 <e'\1>8 }
+vTwoBarFDm = {  <f\4>4 <f\4>4 <d\4>2 }
+cBarFDm = {  \cChordSetFD }
 
-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 }
-vTwoBarIntro = { <f\4>4 <f\4>4 <c\5>4  <e\4>4 }
-cBarIntro = { \cChordSetFC }
+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 }
+vTwoBarIntro = {  <f\4>4 <f\4>4 <c\5>4  <e\4>4 }
+cBarIntro = {  \cChordSetFC }
 
-vOneBarItsNot = { r8 <g'\1>4 <a\3>16 <g'\1>8 <g\3>16 <e'\1>4 <g\3>16( <a\3>16) }
-vTwoBarItsNot = { <f\4>4 <f\4>4 <c\5>4 <e\4>4 }
-cBarItsNot = { \cChordSetFC }
+vOneBarItsNot = {  r8 <g'\1>4 <a\3>16 <g'\1>8 <g\3>16 <e'\1>4 <g\3>16( <a\3>16) }
+vTwoBarItsNot = {  <f\4>4 <f\4>4 <c\5>4 <e\4>4 }
+cBarItsNot = {  \cChordSetFC }
 
-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) }
-vTwoBarItsNotGoingToStop = { <f\4>4 <f\4>4 <d\4>4 <d\4>4 }
-cBarItsNotGoingToStop = { \cChordSetFD }
+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) }
+vTwoBarItsNotGoingToStop = {  <f\4>4 <f\4>4 <d\4>4 <d\4>4 }
+cBarItsNotGoingToStop = {  \cChordSetFD }
 
-vOneBarItsNotGoingToStopCcge = { <g'\1>8 <g\3>8 <g'\1>16 <g'\1>16\glissando <a'\1>4 <d'\2>4 <c'\2>8 }
-vTwoBarItsNotGoingToStopCcge = { <c\5>4 <c\5>4 <g,\6>4 <e,\6>4 }
-cBarItsNotGoingToStopCcge = { \cChordSetCCGE }
+vOneBarItsNotGoingToStopCcge = {  <g'\1>8 <g\3>8 <g'\1>16 <g'\1>16\glissando <a'\1>4 <d'\2>4 <c'\2>8 }
+vTwoBarItsNotGoingToStopCcge = {  <c\5>4 <c\5>4 <g,\6>4 <e,\6>4 }
+cBarItsNotGoingToStopCcge = {  \cChordSetCCGE }
 
-vOneBarItsNotGoingToStopCcgeTwo = { r8 <g\3>8 <e'\1>8 <g'\1>8 r8 <d'\2>4 <c'\2>8 }
-vTwoBarItsNotGoingToStopCcgeTwo = { <c\5>4 <e\4>4 <g,\6>4 <e,\6>4 }
-cBarItsNotGoingToStopCcgeTwo = { \cChordSetCCGE }
+vOneBarItsNotGoingToStopCcgeTwo = {  r8 <g\3>8 <e'\1>8 <g'\1>8 r8 <d'\2>4 <c'\2>8 }
+vTwoBarItsNotGoingToStopCcgeTwo = {  <c\5>4 <e\4>4 <g,\6>4 <e,\6>4 }
+cBarItsNotGoingToStopCcgeTwo = {  \cChordSetCCGE }
 
-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 }
-vTwoBarOutro = { <a,\5>4 <a,\5>4 <c\5>4  <c\5>4 }
-cBarOutro = { \cChordSetAmC }
+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 }
+vTwoBarOutro = {  <a,\5>4 <a,\5>4 <c\5>4  <c\5>4 }
+cBarOutro = {  \cChordSetAmC }
 
-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 }
-vTwoBarPrepareAList = { <a,\5>4 <a,\5>4 <a,\5>4 <a,\5>4 }
-cBarPrepareAList = { \cChordSetAm }
+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 }
+vTwoBarPrepareAList = {  <a,\5>4 <a,\5>4 <a,\5>4 <a,\5>4 }
+cBarPrepareAList = {  \cChordSetAm }
 
-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 }
-vTwoBarSoJustGiveUp = { <as,\5>4 <d\4>4 \skip 2 }
-cBarSoJustGiveUp = { \cChordSetBbF }
+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 }
+vTwoBarSoJustGiveUp = {  <as,\5>4 <d\4>4 \skip 2 }
+cBarSoJustGiveUp = {  \cChordSetBbF }
 
-vOneBarTheresACure = { r8 <d'\2>16( <c'\2>8.) <a\3>16 <g'\1>8 <g\3>16 <e'\1>4 <g\3>8 }
-vTwoBarTheresACure = { <f\4>4 <f\4>4 <c\5>4 <c\5>4 }
-cBarTheresACure = { \cChordSetFC }
+vOneBarTheresACure = {  r8 <d'\2>16( <c'\2>8.) <a\3>16 <g'\1>8 <g\3>16 <e'\1>4 <g\3>8 }
+vTwoBarTheresACure = {  <f\4>4 <f\4>4 <c\5>4 <c\5>4 }
+cBarTheresACure = {  \cChordSetFC }
 
-vOneBarTilYouWiseUp = { r8 <g\3>8 <c'\2>8 <g\3>8 <d'\2>4 <a\3>4 }
-vTwoBarTilYouWiseUp = { <as,\5>4 <d\4>4 <f\4>4 <f\4>4 }
-cBarTilYouWiseUp = { \cChordSetBbF }
+vOneBarTilYouWiseUp = {  r8 <g\3>8 <c'\2>8 <g\3>8 <d'\2>4 <a\3>4 }
+vTwoBarTilYouWiseUp = {  <as,\5>4 <d\4>4 <f\4>4 <f\4>4 }
+cBarTilYouWiseUp = {  \cChordSetBbF }
 
-vOneBarTilYouWiseUpTwo = { r8 <g\3>8 <c'\2>8 <g\3>8 <d'\2>8 <a\3>8 r8 <c'\2>8 }
-vTwoBarTilYouWiseUpTwo = { <as,\5>4 <d\4>4 <f\4>4 <f\4>4 }
-cBarTilYouWiseUpTwo = { \cChordSetBbF }
+vOneBarTilYouWiseUpTwo = {  r8 <g\3>8 <c'\2>8 <g\3>8 <d'\2>8 <a\3>8 r8 <c'\2>8 }
+vTwoBarTilYouWiseUpTwo = {  <as,\5>4 <d\4>4 <f\4>4 <f\4>4 }
+cBarTilYouWiseUpTwo = {  \cChordSetBbF }
 
-vOneBarTilYouWiseUpThree = { r8 <g\3>8 <c'\2>8 <a\3>8 <d'\2>8 <e'\1>8 r8 <e'\1>8 }
-vTwoBarTilYouWiseUpThree = { <as,\5>4 <d\4>4 <f\4>4 <f\4>4 }
-cBarTilYouWiseUpThree = { \cChordSetBbF }
+vOneBarTilYouWiseUpThree = {  r8 <g\3>8 <c'\2>8 <a\3>8 <d'\2>8 <e'\1>8 r8 <e'\1>8 }
+vTwoBarTilYouWiseUpThree = {  <as,\5>4 <d\4>4 <f\4>4 <f\4>4 }
+cBarTilYouWiseUpThree = {  \cChordSetBbF }
 
-vOneBarWhatYouThought = { r8 <g'\1>4 <a\3>16 <g'\1>8 <g\3>16 <e'\1>4 <g\3>8 }
-vTwoBarWhatYouThought = { <f\4>4 <f\4>4 <c\5>4 <e\4>4 }
-cBarWhatYouThought = { \cChordSetFC }
+vOneBarWhatYouThought = {  r8 <g'\1>4 <a\3>16 <g'\1>8 <g\3>16 <e'\1>4 <g\3>8 }
+vTwoBarWhatYouThought = {  <f\4>4 <f\4>4 <c\5>4 <e\4>4 }
+cBarWhatYouThought = {  \cChordSetFC }
 
-vOneBarWhenYouFirst = { <e'\1>8 <d'\2>16( <c'\2>8) <a\3>8. <c'\2>4 <a\3>8 <c'\2>8 }
-vTwoBarWhenYouFirst = { <a,\5>4 <a,\5>8 <e\4>4 <a,\5>4 \skip 8 }
-cBarWhenYouFirst = { \cChordSetAm }
+vOneBarWhenYouFirst = {  <e'\1>8 <d'\2>16( <c'\2>8) <a\3>8. <c'\2>4 <a\3>8 <c'\2>8 }
+vTwoBarWhenYouFirst = {  <a,\5>4 <a,\5>8 <e\4>4 <a,\5>4 \skip 8 }
+cBarWhenYouFirst = {  \cChordSetAm }
 
-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) }
-vTwoBarYouGot = { <f\4>4 <f\4>4 <c\5>4 <e\4>4 }
-cBarYouGot = { \cChordSetFC }
+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) }
+vTwoBarYouGot = {  <f\4>4 <f\4>4 <c\5>4 <e\4>4 }
+cBarYouGot = {  \cChordSetFC }
 
-vOneBarYoureSure = { r8 <g'\1>4 <a\3>16 <g'\1>8 <g\3>16 <e'\1>4 <e'\1>8 }
-vTwoBarYoureSure = { <f\4>4 <f\4>4 <c\5>4 <e\4>4 }
-cBarYoureSure = { \cChordSetFC }
+vOneBarYoureSure = {  r8 <g'\1>4 <a\3>16 <g'\1>8 <g\3>16 <e'\1>4 <e'\1>8 }
+vTwoBarYoureSure = {  <f\4>4 <f\4>4 <c\5>4 <e\4>4 }
+cBarYoureSure = {  \cChordSetFC }
 
 
 %-----------------------------------------------------------------------
@@ -161,34 +168,42 @@ cLineOutroLineTwo = { \cBarOutro \cBarOutro \cBarOutro \cBarOutro }
 vOneStanzaIntro = { \vOneLineIntroLineOne }
 vTwoStanzaIntro = { \vTwoLineIntroLineOne }
 cStanzaIntro = { \cLineIntroLineOne }
+sStanzaIntro = { r1^"Intro" r1 r1 r1 }
 
 vOneStanzaVerseOne = { \vOneLineVerseOneLineOne \vOneLineVerseOneLineTwo }
 vTwoStanzaVerseOne = { \vTwoLineVerseOneLineOne \vTwoLineVerseOneLineTwo }
 cStanzaVerseOne = { \cLineVerseOneLineOne \cLineVerseOneLineTwo }
+sStanzaVerseOne = { r1^"Verse 1" r1 r1 r1 r1 r1 r1 r1 }
 
 vOneStanzaChorusOne = { \vOneLineChorusOneLineOne \vOneLineChorusOneLineTwo }
 vTwoStanzaChorusOne = { \vTwoLineChorusOneLineOne \vTwoLineChorusOneLineTwo }
 cStanzaChorusOne = { \cLineChorusOneLineOne \cLineChorusOneLineTwo }
+sStanzaChorusOne = { r1^"Chorus 1" r1 r1 r1 r1 r1 r1 r1 }
 
 vOneStanzaVerseTwo = { \vOneLineVerseTwoLineOne \vOneLineVerseOneLineTwo }
 vTwoStanzaVerseTwo = { \vTwoLineVerseTwoLineOne \vTwoLineVerseOneLineTwo }
 cStanzaVerseTwo = { \cLineVerseTwoLineOne \cLineVerseOneLineTwo }
+sStanzaVerseTwo = { r1^"Verse 2" r1 r1 r1 r1 r1 r1 r1 }
 
 vOneStanzaChorusTwo = { \vOneLineChorusOneLineOne \vOneLineChorusTwoLineTwo }
 vTwoStanzaChorusTwo = { \vTwoLineChorusOneLineOne \vTwoLineChorusTwoLineTwo }
 cStanzaChorusTwo = { \cLineChorusOneLineOne \cLineChorusTwoLineTwo }
+sStanzaChorusTwo = { r1^"Chorus 2" r1 r1 r1 r1 r1 r1 r1 }
 
 vOneStanzaBridge = { \vOneLineBridgeLineOne }
 vTwoStanzaBridge = { \vTwoLineBridgeLineOne }
 cStanzaBridge = { \cLineBridgeLineOne }
+sStanzaBridge = { r1^"Bridge" r1 }
 
 vOneStanzaChorusThree = { \vOneLineChorusOneLineOne \vOneLineChorusThreeLineTwo \vOneLineChorusThreeLineThree }
 vTwoStanzaChorusThree = { \vTwoLineChorusOneLineOne \vTwoLineChorusThreeLineTwo \vTwoLineChorusThreeLineThree }
 cStanzaChorusThree = { \cLineChorusOneLineOne \cLineChorusThreeLineTwo \cLineChorusThreeLineThree }
+sStanzaChorusThree = { r1^"Chorus 3" r1 r1 r1 r1 r1 r1 r1 r1 r1 r1 r1 }
 
 vOneStanzaOutro = { \vOneLineIntroLineOne \vOneLineOutroLineTwo }
 vTwoStanzaOutro = { \vTwoLineIntroLineOne \vTwoLineOutroLineTwo }
 cStanzaOutro = { \cLineIntroLineOne \cLineOutroLineTwo }
+sStanzaOutro = { r1^"Outro" r1 r1 r1 r1 r1 r1 r1 }
 
 
 %-----------------------------------------------------------------------
@@ -197,6 +212,7 @@ cStanzaOutro = { \cLineIntroLineOne \cLineOutroLineTwo }
 vOneScoreTabOneScoreOne = { \vOneStanzaIntro \vOneStanzaVerseOne \vOneStanzaChorusOne \vOneStanzaVerseTwo \vOneStanzaChorusTwo \vOneStanzaBridge \vOneStanzaChorusThree \vOneStanzaOutro }
 vTwoScoreTabOneScoreOne = { \vTwoStanzaIntro \vTwoStanzaVerseOne \vTwoStanzaChorusOne \vTwoStanzaVerseTwo \vTwoStanzaChorusTwo \vTwoStanzaBridge \vTwoStanzaChorusThree \vTwoStanzaOutro }
 cScoreTabOneScoreOne = { \cStanzaIntro \cStanzaVerseOne \cStanzaChorusOne \cStanzaVerseTwo \cStanzaChorusTwo \cStanzaBridge \cStanzaChorusThree \cStanzaOutro }
+sScoreTabOneScoreOne = { \sStanzaIntro \sStanzaVerseOne \sStanzaChorusOne \sStanzaVerseTwo \sStanzaChorusTwo \sStanzaBridge \sStanzaChorusThree \sStanzaOutro }
 
 
 %-----------------------------------------------------------------------
@@ -216,15 +232,8 @@ vTwo = {
 %-----------------------------------------------------------------------
 % Stanza Headings
 
-stanzaHeadings = {
-  r1^"Intro" r r r
-  r1^"Verse 1" r r r r r r r
-  r1^"Chorus 1" r r r r r r r
-  r1^"Verse 2" r r r r r r r
-  r1^"Chorus 2" r r r r r r r
-  r1^"Bridge" r
-  r1^"Chorus 3" r r r r r r r r r r r
-  r1^"Outro" r r r r r r r
+stanzaHeadings = { 
+\sScoreTabOneScoreOne 
 }
 
 %-----------------------------------------------------------------------
@@ -237,25 +246,33 @@ chordHeadings = { \cScoreTabOneScoreOne }
 \score {
   \new StaffGroup <<
     \new Staff <<
+      
       \tempo 4 = 75
 
       \clef "treble_8"
 
+      \new ChordNames {
+        \chordHeadings
+      }
+
       \new Voice \with { \remove Rest_engraver } {
         \stanzaHeadings
       }
 
       \new Voice {
+        
         \voiceOne
         \vOne
       }
       \new Voice {
+        
         \voiceTwo
         \vTwo
       }
     >>
 
     \new TabStaff <<
+      
       \new TabVoice {
         \slurUp
         \vOne
@@ -264,9 +281,6 @@ chordHeadings = { \cScoreTabOneScoreOne }
         \slurUp
         \vTwo
       }
-      \new TabVoice {
-        \chordHeadings
-      }
     >>
   >>
 

data/examples/{aimee-man-wise-up/aimee-man-wise-up.rb → aimee-man-wise-up.rb}

@@ -7,13 +7,13 @@ Gitara.define do
   tempo "4 = 75"
   transposition "d"
 
-  chords :Am,   'r4-"Am" r r r'
-  chords :AmC,  'r4-"Am" r r-"C" r'
-  chords :BbF,  'r4-"Bb" r r-"F" r'
-  chords :CCGE, 'r4-"C" r r-"G" r-"E"'
-  chords :D,    'r4-"D" r r r'
-  chords :FC,   'r4-"F" r r-"C" r'
-  chords :FD,   'r4-"F" r r-"D" r'
+  chords :Am,   'a1:m'
+  chords :AmC,  'a2:m c2'
+  chords :BbF,  'bf2 f2'
+  chords :CCGE, 'c2 g4 e4'
+  chords :D,    'd1'
+  chords :FC,   'f2 c2'
+  chords :FD,   'f2 d2'
 
   bar :BeforeYouSign do
     notes "r8 <d'/2>16( <c'/2>8.) <a/3>16 <c'/2>8. <d'/2>16 <e'/1>8. <g/3>8"

data/examples/{eraserheads-huling-el-bimbo/tab.ly → eraserheads-huling-el-bimbo.ly}

@@ -1,4 +1,4 @@
-\version "2.12.3"
+\version "2.14.2"
 \include "english.ly"
 
 \paper {
@@ -15,12 +15,18 @@
 %-----------------------------------------------------------------------
 % Chord Sets
 
-cChordSetG = { r1-"G" }
-cChordSetGEight = { r8-"G" }
-cChordSetC = { r1-"C" }
-cChordSetASeven = { r1-"A7" }
-cChordSetEm = { r1-"Em" }
-cChordSetD = { r1-"D" }
+cChordSetG = { \chordmode { g1 } }
+
+cChordSetGEight = { \chordmode { g8 } }
+
+cChordSetC = { \chordmode { c1 } }
+
+cChordSetASeven = { \chordmode { a1:7 } }
+
+cChordSetEm = { \chordmode { e1:m } }
+
+cChordSetD = { \chordmode { d1 } }
+
 
 %-----------------------------------------------------------------------
 % Bars
@@ -28,177 +34,142 @@ cChordSetD = { r1-"D" }
 vOneBarVerseLineOneBarOne = { \partial 8 <g\3>8 }
 vTwoBarVerseLineOneBarOne = { \partial 8 r8 }
 cBarVerseLineOneBarOne = { \partial 8 \cChordSetGEight }
-sBarVerseLineOneBarOne = { \partial 8 r8^"Verse" }
 
 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) }
 vTwoBarVerseLineOneBarTwo = {  r1 }
 cBarVerseLineOneBarTwo = {  \cChordSetG }
-sBarVerseLineOneBarTwo = {  r1 }
 
 vOneBarVerseLineOneBarThree = {  <a\3>8( <g\3>4) <cs'\2>4 <g\3>4. }
 vTwoBarVerseLineOneBarThree = {  \skip 8 r8 <e\4>4 <a,\5>4 <e\4>8 <b,\5>8 }
 cBarVerseLineOneBarThree = {  \cChordSetASeven }
-sBarVerseLineOneBarThree = {  r1 }
 
 vOneBarVerseLineOneBarFour = {  r4 <g\3>8 <g\3>8 <g\3>8 <a\3>8 <c'\2>8 <b~\2>8 }
 vTwoBarVerseLineOneBarFour = {  <c\5>4 <e\4>4 <c\5>4 <e\4>4 }
 cBarVerseLineOneBarFour = {  \cChordSetC }
-sBarVerseLineOneBarFour = {  r1 }
 
 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 }
 vTwoBarVerseLineOneBarFive = {  <g,\6>4 <d\4>4 <d\4>16 \skip 16 \skip 16 <d\4>16 \skip 16 \skip 16 <d\4>8 }
 cBarVerseLineOneBarFive = {  \cChordSetG }
-sBarVerseLineOneBarFive = {  r1 }
 
 vOneBarVerseLineTwoBarOne = {  r8 <g\3>8 <b\2>8 <b\2>16 <b\2>8 <b\2>16( <d'\2>8) <e'\1>4 }
 vTwoBarVerseLineTwoBarOne = {  <g,\6>4 <d\4>4 <g,\6>4 <d\4>4 }
 cBarVerseLineTwoBarOne = {  \cChordSetG }
-sBarVerseLineTwoBarOne = {  r1 }
 
 vOneBarVerseLineTwoBarTwo = {  <a\3>16( <g\3>16)( <a\3>4) <cs'\2>4 <a\3>4 <b\2>8 }
 vTwoBarVerseLineTwoBarTwo = {  <a,\5>4 <e\4>4 <a,\5>4 <e\4>4 }
 cBarVerseLineTwoBarTwo = {  \cChordSetASeven }
-sBarVerseLineTwoBarTwo = {  r1 }
 
 vOneBarVerseLineTwoBarThree = {  <c'\2>4. <d'\2>4 <c'\2>4 <b~\2>8 }
 vTwoBarVerseLineTwoBarThree = {  <c\5>4 <e\4>4 <c\5>4 <e\4>4 }
 cBarVerseLineTwoBarThree = {  \cChordSetC }
-sBarVerseLineTwoBarThree = {  r1 }
 
 vOneBarVerseLineTwoBarFour = {  <b\2>8 <g\3>4 <g\3>4 <b\2>8 <b\2>8 <c'\2>8 }
 vTwoBarVerseLineTwoBarFour = {  <g,\6>4 <d\4>4 <g,\6>4 <d\4>4 }
 cBarVerseLineTwoBarFour = {  \cChordSetG }
-sBarVerseLineTwoBarFour = {  r1 }
 
 vOneBarVerseLineThreeBarOne = {  <d'\2>4. <d'\2>4 <d'\2>4 <cs'~\2>8 }
 vTwoBarVerseLineThreeBarOne = {  <g,\6>4 <d\4>4 <g,\6>4 <d\4>4 }
 cBarVerseLineThreeBarOne = {  \cChordSetG }
-sBarVerseLineThreeBarOne = {  r1 }
 
 vOneBarVerseLineThreeBarTwo = {  <cs'\2>8 <a\3>4 <a\3>4 <a\3>4 <b\2>8 }
 vTwoBarVerseLineThreeBarTwo = {  <a,\5>4 <e\4>4 <a,\5>4 <e\4>4 }
 cBarVerseLineThreeBarTwo = {  \cChordSetASeven }
-sBarVerseLineThreeBarTwo = {  r1 }
 
 vOneBarVerseLineThreeBarThree = {  <c'\2>4 <c'\2>8 <d'\2>4 <e'\1>4 <b~\2>8 }
 vTwoBarVerseLineThreeBarThree = {  <c\5>4 <e\4>4 <c\5>4 <e\4>4 }
 cBarVerseLineThreeBarThree = {  \cChordSetC }
-sBarVerseLineThreeBarThree = {  r1 }
 
 vOneBarVerseLineThreeBarFour = {  <b\2>8 <d'\2>4 <d'\2>4 <b\2>16 <a\3>8 <g\3>16( <a\3>8) }
 vTwoBarVerseLineThreeBarFour = {  <g,\6>4 <d\4>4 <g,\6>4 <d\4>4 }
 cBarVerseLineThreeBarFour = {  \cChordSetG }
-sBarVerseLineThreeBarFour = {  r1 }
 
 vOneBarVerseLineFourBarOne = {  <b\2>4. <b\2>4 <b\2>16 <b\2>16 r16 <a\3>16 <b\2>8 }
 vTwoBarVerseLineFourBarOne = {  <g,\6>4 <d\4>4 <g,\6>4 <d\4>4 }
 cBarVerseLineFourBarOne = {  \cChordSetG }
-sBarVerseLineFourBarOne = {  r1 }
 
 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 }
 vTwoBarVerseLineFourBarTwo = {  <a,\5>4 <e\4>4 <a,\5>4 <e\4>4 }
 cBarVerseLineFourBarTwo = {  \cChordSetASeven }
-sBarVerseLineFourBarTwo = {  r1 }
 
 vOneBarVerseLineFourBarThree = {  <g\3>4. <g\3>4 <a\3>8 <c'\2>8 <b~\2>8 }
 vTwoBarVerseLineFourBarThree = {  <c\5>4 <e\4>4 <c\5>4 <e\4>4 }
 cBarVerseLineFourBarThree = {  \cChordSetC }
-sBarVerseLineFourBarThree = {  r1 }
 
 vOneBarVerseLineFourBarFour = {  <b\2>8 <g\3>4 <g\3>4 <g\3>4. }
 vTwoBarVerseLineFourBarFour = {  <g,\6>4 <d\4>4 <g,\6>4 <g,\6>8 <fs,\6>8 }
 cBarVerseLineFourBarFour = {  \cChordSetG }
-sBarVerseLineFourBarFour = {  r1 }
 
 vOneBarRefrainLineOneBarOne = {  r4 <g\3>8 <g\3>8 <g\3>8 <g\3>8 <e'\1>8 <d'~\2>8 }
 vTwoBarRefrainLineOneBarOne = {  <e,\6>4 <e\4>4 <e,\6>4 <e\4>4 }
 cBarRefrainLineOneBarOne = {  \cChordSetEm }
-sBarRefrainLineOneBarOne = {  r1^"Refrain" }
 
 vOneBarRefrainLineOneBarTwo = {  <d'\2>8 <b\2>4 <a\3>4 <a\3>4 <b\2>8 }
 vTwoBarRefrainLineOneBarTwo = {  <g,\6>4 <d\4>4 <g,\6>4 <d\4>4 }
 cBarRefrainLineOneBarTwo = {  \cChordSetG }
-sBarRefrainLineOneBarTwo = {  r1 }
 
 vOneBarRefrainLineOneBarThree = {  <c'\2>4 <c'\2>8 <d'\2>4 <g\3>8( <a\3>8) <b~\2>8 }
 vTwoBarRefrainLineOneBarThree = {  <c\5>4 <e\4>4 <c\5>4 <e\4>4 }
 cBarRefrainLineOneBarThree = {  \cChordSetC }
-sBarRefrainLineOneBarThree = {  r1 }
 
 vOneBarRefrainLineOneBarFour = {  <b\2>8 <a\3>4 <a\3>4 <a\3>4. }
 vTwoBarRefrainLineOneBarFour = {  <a,\5>4 <d\4>4 <a,\5>4 <g,\6>8 <fs,\6>8 }
 cBarRefrainLineOneBarFour = {  \cChordSetD }
-sBarRefrainLineOneBarFour = {  r1 }
 
 vOneBarRefrainLineTwoBarOne = {  r4 <g\3>8 <g\3>8 <g\3>8 <g\3>8 <e'\1>8 <d'~\2>8 }
 vTwoBarRefrainLineTwoBarOne = {  <e,\6>4 <e\4>4 <e,\6>4 <e\4>4 }
 cBarRefrainLineTwoBarOne = {  \cChordSetEm }
-sBarRefrainLineTwoBarOne = {  r1 }
 
 vOneBarRefrainLineTwoBarTwo = {  <d'\2>8 <b\2>4 <a\3>4 <a\3>4 <b\2>8 }
 vTwoBarRefrainLineTwoBarTwo = {  <g,\6>4 <d\4>4 <g,\6>4 <d\4>4 }
 cBarRefrainLineTwoBarTwo = {  \cChordSetG }
-sBarRefrainLineTwoBarTwo = {  r1 }
 
 vOneBarRefrainLineTwoBarThree = {  <c'\2>4 <c'\2>8 <d'\2>4 <e'\1>4 <e'~\1>8 }
 vTwoBarRefrainLineTwoBarThree = {  <c\5>4 <e\4>4 <c\5>4 <e\4>4 }
 cBarRefrainLineTwoBarThree = {  \cChordSetC }
-sBarRefrainLineTwoBarThree = {  r1 }
 
 vOneBarRefrainLineTwoBarFour = {  <e'\1>8 <d'\2>4 <d'\2>4 <d'\2>4 <d'\2>8 }
 vTwoBarRefrainLineTwoBarFour = {  <a,\5>4 <d\4>4 <a,\5>4 <d\4>4 }
 cBarRefrainLineTwoBarFour = {  \cChordSetD }
-sBarRefrainLineTwoBarFour = {  r1 }
 
 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 }
 vTwoBarRefrainLineTwoBarFive = {  <d\4>8 <d\4>8 <d\4>8 <d\4>8 <d\4>8 \skip 8 \skip 8 \skip 8 }
 cBarRefrainLineTwoBarFive = {  \cChordSetD }
-sBarRefrainLineTwoBarFive = {  r1 }
 
 vOneBarChorusLineOneBarOne = {  <d'\2>4. <g'\1>4 <d'\2>4 <cs'~\2>8 }
 vTwoBarChorusLineOneBarOne = {  <g,\6>4 <d\4>4 <g,\6>4 <d\4>4 }
 cBarChorusLineOneBarOne = {  \cChordSetG }
-sBarChorusLineOneBarOne = {  r1^"Chorus" }
 
 vOneBarChorusLineOneBarTwo = {  <cs'\2>4 <g'\1>8 <g'\1>4 <cs'\2>4 <c'~\2>8 }
 vTwoBarChorusLineOneBarTwo = {  <a,\5>4 <e\4>4 <a,\5>4 <e\4>4 }
 cBarChorusLineOneBarTwo = {  \cChordSetASeven }
-sBarChorusLineOneBarTwo = {  r1 }
 
 vOneBarChorusLineOneBarThree = {  <c'\2>4. <d'\2>4 <e'\1>4 <b~\2>8 }
 vTwoBarChorusLineOneBarThree = {  <c\5>4 <e\4>4 <c\5>4 <e\4>4 }
 cBarChorusLineOneBarThree = {  \cChordSetC }
-sBarChorusLineOneBarThree = {  r1 }
 
 vOneBarChorusLineOneBarFour = {  <b\2>8 <d'\2>4 <d'\2>4 <b\2>8 <b\2>8 <c'\2>8 }
 vTwoBarChorusLineOneBarFour = {  <g,\6>4 <d\4>4 <g,\6>4 <d\4>4 }
 cBarChorusLineOneBarFour = {  \cChordSetG }
-sBarChorusLineOneBarFour = {  r1 }
 
 vOneBarChorusLineTwoBarOne = {  <d'\2>4. <g'\1>4 <d'\2>4 <cs'~\2>8 }
 vTwoBarChorusLineTwoBarOne = {  <g,\6>4 <d\4>4 <g,\6>4 <d\4>4 }
 cBarChorusLineTwoBarOne = {  \cChordSetG }
-sBarChorusLineTwoBarOne = {  r1 }
 
 vOneBarChorusLineTwoBarTwo = {  <cs'\2>4 <g'\1>8 <g'\1>4 <cs'\2>4 <c'~\2>8 }
 vTwoBarChorusLineTwoBarTwo = {  <a,\5>4 <e\4>4 <a,\5>4 <e\4>4 }
 cBarChorusLineTwoBarTwo = {  \cChordSetASeven }
-sBarChorusLineTwoBarTwo = {  r1 }
 
 vOneBarChorusLineTwoBarThree = {  <c'\2>4. <d'\2>4 <c'\2>4 <b~\2>8 }
 vTwoBarChorusLineTwoBarThree = {  <c\5>4 <e\4>4 <c\5>4 <e\4>4 }
 cBarChorusLineTwoBarThree = {  \cChordSetC }
-sBarChorusLineTwoBarThree = {  r1 }
 
 vOneBarChorusLineTwoBarFour = {  <b\2>8 <g\3>4 <g\3>4 <g\3>4 <g\3>8 }
 vTwoBarChorusLineTwoBarFour = {  <g,\6>4 <d\4>4 <g,\6>4 <d\4>4 }
 cBarChorusLineTwoBarFour = {  \cChordSetG }
-sBarChorusLineTwoBarFour = {  r1 }
 
 vOneBarChorusLineTwoBarFive = {  <g\3 d'\2 g'\1 >1 }
 vTwoBarChorusLineTwoBarFive = {  <g,\6 b,\5 d\4 >1 }
 cBarChorusLineTwoBarFive = {  \cChordSetG }
-sBarChorusLineTwoBarFive = {  r1 }
 
 
 %-----------------------------------------------------------------------
@@ -207,42 +178,34 @@ sBarChorusLineTwoBarFive = {  r1 }
 vOneLineVerseLineOne = { \vOneBarVerseLineOneBarOne \vOneBarVerseLineOneBarTwo \vOneBarVerseLineOneBarThree \vOneBarVerseLineOneBarFour \vOneBarVerseLineOneBarFive \break }
 vTwoLineVerseLineOne = { \vTwoBarVerseLineOneBarOne \vTwoBarVerseLineOneBarTwo \vTwoBarVerseLineOneBarThree \vTwoBarVerseLineOneBarFour \vTwoBarVerseLineOneBarFive \break }
 cLineVerseLineOne = { \cBarVerseLineOneBarOne \cBarVerseLineOneBarTwo \cBarVerseLineOneBarThree \cBarVerseLineOneBarFour \cBarVerseLineOneBarFive }
-sLineVerseLineOne = { \sBarVerseLineOneBarOne \sBarVerseLineOneBarTwo \sBarVerseLineOneBarThree \sBarVerseLineOneBarFour \sBarVerseLineOneBarFive }
 
 vOneLineVerseLineTwo = { \vOneBarVerseLineTwoBarOne \vOneBarVerseLineTwoBarTwo \vOneBarVerseLineTwoBarThree \vOneBarVerseLineTwoBarFour \break }
 vTwoLineVerseLineTwo = { \vTwoBarVerseLineTwoBarOne \vTwoBarVerseLineTwoBarTwo \vTwoBarVerseLineTwoBarThree \vTwoBarVerseLineTwoBarFour \break }
 cLineVerseLineTwo = { \cBarVerseLineTwoBarOne \cBarVerseLineTwoBarTwo \cBarVerseLineTwoBarThree \cBarVerseLineTwoBarFour }
-sLineVerseLineTwo = { \sBarVerseLineTwoBarOne \sBarVerseLineTwoBarTwo \sBarVerseLineTwoBarThree \sBarVerseLineTwoBarFour }
 
 vOneLineVerseLineThree = { \vOneBarVerseLineThreeBarOne \vOneBarVerseLineThreeBarTwo \vOneBarVerseLineThreeBarThree \vOneBarVerseLineThreeBarFour \break }
 vTwoLineVerseLineThree = { \vTwoBarVerseLineThreeBarOne \vTwoBarVerseLineThreeBarTwo \vTwoBarVerseLineThreeBarThree \vTwoBarVerseLineThreeBarFour \break }
 cLineVerseLineThree = { \cBarVerseLineThreeBarOne \cBarVerseLineThreeBarTwo \cBarVerseLineThreeBarThree \cBarVerseLineThreeBarFour }
-sLineVerseLineThree = { \sBarVerseLineThreeBarOne \sBarVerseLineThreeBarTwo \sBarVerseLineThreeBarThree \sBarVerseLineThreeBarFour }
 
 vOneLineVerseLineFour = { \vOneBarVerseLineFourBarOne \vOneBarVerseLineFourBarTwo \vOneBarVerseLineFourBarThree \vOneBarVerseLineFourBarFour \break }
 vTwoLineVerseLineFour = { \vTwoBarVerseLineFourBarOne \vTwoBarVerseLineFourBarTwo \vTwoBarVerseLineFourBarThree \vTwoBarVerseLineFourBarFour \break }
 cLineVerseLineFour = { \cBarVerseLineFourBarOne \cBarVerseLineFourBarTwo \cBarVerseLineFourBarThree \cBarVerseLineFourBarFour }
-sLineVerseLineFour = { \sBarVerseLineFourBarOne \sBarVerseLineFourBarTwo \sBarVerseLineFourBarThree \sBarVerseLineFourBarFour }
 
 vOneLineRefrainLineOne = { \vOneBarRefrainLineOneBarOne \vOneBarRefrainLineOneBarTwo \vOneBarRefrainLineOneBarThree \vOneBarRefrainLineOneBarFour \break }
 vTwoLineRefrainLineOne = { \vTwoBarRefrainLineOneBarOne \vTwoBarRefrainLineOneBarTwo \vTwoBarRefrainLineOneBarThree \vTwoBarRefrainLineOneBarFour \break }
 cLineRefrainLineOne = { \cBarRefrainLineOneBarOne \cBarRefrainLineOneBarTwo \cBarRefrainLineOneBarThree \cBarRefrainLineOneBarFour }
-sLineRefrainLineOne = { \sBarRefrainLineOneBarOne \sBarRefrainLineOneBarTwo \sBarRefrainLineOneBarThree \sBarRefrainLineOneBarFour }
 
 vOneLineRefrainLineTwo = { \vOneBarRefrainLineTwoBarOne \vOneBarRefrainLineTwoBarTwo \vOneBarRefrainLineTwoBarThree \vOneBarRefrainLineTwoBarFour \vOneBarRefrainLineTwoBarFive \break }
 vTwoLineRefrainLineTwo = { \vTwoBarRefrainLineTwoBarOne \vTwoBarRefrainLineTwoBarTwo \vTwoBarRefrainLineTwoBarThree \vTwoBarRefrainLineTwoBarFour \vTwoBarRefrainLineTwoBarFive \break }
 cLineRefrainLineTwo = { \cBarRefrainLineTwoBarOne \cBarRefrainLineTwoBarTwo \cBarRefrainLineTwoBarThree \cBarRefrainLineTwoBarFour \cBarRefrainLineTwoBarFive }
-sLineRefrainLineTwo = { \sBarRefrainLineTwoBarOne \sBarRefrainLineTwoBarTwo \sBarRefrainLineTwoBarThree \sBarRefrainLineTwoBarFour \sBarRefrainLineTwoBarFive }
 
 vOneLineChorusLineOne = { \vOneBarChorusLineOneBarOne \vOneBarChorusLineOneBarTwo \vOneBarChorusLineOneBarThree \vOneBarChorusLineOneBarFour \break }
 vTwoLineChorusLineOne = { \vTwoBarChorusLineOneBarOne \vTwoBarChorusLineOneBarTwo \vTwoBarChorusLineOneBarThree \vTwoBarChorusLineOneBarFour \break }
 cLineChorusLineOne = { \cBarChorusLineOneBarOne \cBarChorusLineOneBarTwo \cBarChorusLineOneBarThree \cBarChorusLineOneBarFour }
-sLineChorusLineOne = { \sBarChorusLineOneBarOne \sBarChorusLineOneBarTwo \sBarChorusLineOneBarThree \sBarChorusLineOneBarFour }
 
 vOneLineChorusLineTwo = { \vOneBarChorusLineTwoBarOne \vOneBarChorusLineTwoBarTwo \vOneBarChorusLineTwoBarThree \vOneBarChorusLineTwoBarFour \vOneBarChorusLineTwoBarFive \break }
 vTwoLineChorusLineTwo = { \vTwoBarChorusLineTwoBarOne \vTwoBarChorusLineTwoBarTwo \vTwoBarChorusLineTwoBarThree \vTwoBarChorusLineTwoBarFour \vTwoBarChorusLineTwoBarFive \break }
 cLineChorusLineTwo = { \cBarChorusLineTwoBarOne \cBarChorusLineTwoBarTwo \cBarChorusLineTwoBarThree \cBarChorusLineTwoBarFour \cBarChorusLineTwoBarFive }
-sLineChorusLineTwo = { \sBarChorusLineTwoBarOne \sBarChorusLineTwoBarTwo \sBarChorusLineTwoBarThree \sBarChorusLineTwoBarFour \sBarChorusLineTwoBarFive }
 
 
 %-----------------------------------------------------------------------
@@ -251,17 +214,17 @@ sLineChorusLineTwo = { \sBarChorusLineTwoBarOne \sBarChorusLineTwoBarTwo \sBarCh
 vOneStanzaVerse = { \vOneLineVerseLineOne \vOneLineVerseLineTwo \vOneLineVerseLineThree \vOneLineVerseLineFour }
 vTwoStanzaVerse = { \vTwoLineVerseLineOne \vTwoLineVerseLineTwo \vTwoLineVerseLineThree \vTwoLineVerseLineFour }
 cStanzaVerse = { \cLineVerseLineOne \cLineVerseLineTwo \cLineVerseLineThree \cLineVerseLineFour }
-sStanzaVerse = { \sLineVerseLineOne \sLineVerseLineTwo \sLineVerseLineThree \sLineVerseLineFour }
+sStanzaVerse = { r8^"Verse" r1 r1 r1 r1 r1 r1 r1 r1 r1 r1 r1 r1 r1 r1 r1 r1 }
 
 vOneStanzaRefrain = { \vOneLineRefrainLineOne \vOneLineRefrainLineTwo }
 vTwoStanzaRefrain = { \vTwoLineRefrainLineOne \vTwoLineRefrainLineTwo }
 cStanzaRefrain = { \cLineRefrainLineOne \cLineRefrainLineTwo }
-sStanzaRefrain = { \sLineRefrainLineOne \sLineRefrainLineTwo }
+sStanzaRefrain = { r1^"Refrain" r1 r1 r1 r1 r1 r1 r1 r1 }
 
 vOneStanzaChorus = { \vOneLineChorusLineOne \vOneLineChorusLineTwo }
 vTwoStanzaChorus = { \vTwoLineChorusLineOne \vTwoLineChorusLineTwo }
 cStanzaChorus = { \cLineChorusLineOne \cLineChorusLineTwo }
-sStanzaChorus = { \sLineChorusLineOne \sLineChorusLineTwo }
+sStanzaChorus = { r1^"Chorus" r1 r1 r1 r1 r1 r1 r1 r1 }
 
 
 %-----------------------------------------------------------------------
@@ -290,7 +253,9 @@ vTwo = {
 %-----------------------------------------------------------------------
 % Stanza Headings
 
-stanzaHeadings = { \sScoreTabOneScoreOne }
+stanzaHeadings = { 
+\sScoreTabOneScoreOne 
+}
 
 %-----------------------------------------------------------------------
 % Chord Headings
@@ -302,25 +267,33 @@ chordHeadings = { \cScoreTabOneScoreOne }
 \score {
   \new StaffGroup <<
     \new Staff <<
+      
       \tempo 4 = 90
 
       \clef "treble_8"
 
+      \new ChordNames {
+        \chordHeadings
+      }
+
       \new Voice \with { \remove Rest_engraver } {
         \stanzaHeadings
       }
 
       \new Voice {
+        
         \voiceOne
         \vOne
       }
       \new Voice {
+        
         \voiceTwo
         \vTwo
       }
     >>
 
     \new TabStaff <<
+      
       \new TabVoice {
         \slurUp
         \vOne
@@ -329,9 +302,6 @@ chordHeadings = { \cScoreTabOneScoreOne }
         \slurUp
         \vTwo
       }
-      \new TabVoice {
-        \chordHeadings
-      }
     >>
   >>