gitara 0.3.1 → 0.4.0

data/.gitignore

@@ -1,7 +1,8 @@
 *.gem
 *.ps
-.bundle
+git.bundle
 .geanyprj
+.rvmrc
 Gemfile.lock
 files/*
 pkg/*

data/CHANGELOG.markdown

@@ -1,3 +1,8 @@
+0.4.0 - 2012-02-26
+------------------
+
+* [#16] Add chord labels.
+
 0.3.1 - 2012-02-24
 ------------------
 

data/README.markdown

@@ -8,6 +8,8 @@ Installation
 
 You need to have [lilypond](http://lilypond.org) 2.12 or higher to generate pdfs and midis.
 
+Gitara is tested on 1.9.3 only. Patches are welcome.
+
 
 Usage
 ------
@@ -178,6 +180,27 @@ Stanzas
 
 The names of a stanza will be displayed at the top of the stanza's first bar.
 
+Chord labels (optional)
+-----------------------
+
+You can add chord labels to bars:
+
+    Gitara.define do
+      chords :FC,   'r4-"F" r r-"C" r'
+
+      bar :BeganIt do
+        notes "/skip 4 <a/3 c'/2 >8 <g/3>8 /skip 4 <g/3 c'/2 >8 <g/3>8"
+        notes "<f/4>4 <f/4>4 <c/5>4 <e/4>4"
+        chords :FC
+      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.
 
 Properties
 ----------
@@ -198,7 +221,7 @@ A gitara file can have the following optional properties:
 * composer - song's composer
 * instrument - description of the instrument used on the tab
 * midi_instrument - the type of instrument played in the midi export of the tab. By default, "acoustic guitar (nylon)".
-* tempo - see (lilypond)[http://lilypond.org/doc/v2.12/Documentation/user/lilypond/Writing-parts#Metronome-marks] for the format.
+* tempo - see [lilypond](http://lilypond.org/doc/v2.12/Documentation/user/lilypond/Writing-parts#Metronome-marks) for the format.
 * 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).
 
@@ -230,15 +253,3 @@ Workflow
 
 I'm no Lilypond expert (heh). When writing a tab, I use [TuxGuitar](http://tuxguitar.herac.com.ar) to transcribe a set of notes (usually just one bar). I then export the TuxGuitar tab to lilypond so that I can get the lilypond notes. I then place these lilypond notes inside my Gitara tab. This workflow allows me to use TuxGuitar's GUI for transcribing notes while allowing me to use Gitara's features for naming expressions and reusing them.
 
-
-To do
------
-
-For version 1, I want to convert this lilypond file to Gitara format:
-
-* [https://github.com/gsmendoza/tabs/tree/master/aimee-mann-wise-up](https://github.com/gsmendoza/tabs/tree/master/aimee-mann-wise-up)
-
-The remaining features are:
-
-1. Properties like the title and authors
-2. Chord labels

data/examples/aimee-man-wise-up/aimee-man-wise-up.ly

@@ -12,68 +12,99 @@
   instrument = "Guitar (capo on second fret)"
 }
 
+%-----------------------------------------------------------------------
+% 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 }
+
 %-----------------------------------------------------------------------
 % 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 }
 
 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 }
 
 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 }
 
 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 }
 
 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 }
 
 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 }
 
 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 }
 
 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 }
 
 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 }
 
 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 }
 
 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 }
 
 
 %-----------------------------------------------------------------------
@@ -81,36 +112,47 @@ vTwoBarYoureSure = { <f\4>4 <f\4>4 <c\5>4 <e\4>4 }
 
 vOneLineChorusOneLineOne = { \vOneBarItsNotGoingToStop \vOneBarFDm \vOneBarItsNotGoingToStop \vOneBarFDm \break }
 vTwoLineChorusOneLineOne = { \vTwoBarItsNotGoingToStop \vTwoBarFDm \vTwoBarItsNotGoingToStop \vTwoBarFDm \break }
+cLineChorusOneLineOne = { \cBarItsNotGoingToStop \cBarFDm \cBarItsNotGoingToStop \cBarFDm }
 
 vOneLineIntroLineOne = { \vOneBarIntro \vOneBarIntro \vOneBarIntro \vOneBarIntro \break }
 vTwoLineIntroLineOne = { \vTwoBarIntro \vTwoBarIntro \vTwoBarIntro \vTwoBarIntro \break }
+cLineIntroLineOne = { \cBarIntro \cBarIntro \cBarIntro \cBarIntro }
 
 vOneLineVerseOneLineTwo = { \vOneBarYouGot \vOneBarWhatYouThought \vOneBarWhenYouFirst \vOneBarItThough \break }
 vTwoLineVerseOneLineTwo = { \vTwoBarYouGot \vTwoBarWhatYouThought \vTwoBarWhenYouFirst \vTwoBarItThough \break }
+cLineVerseOneLineTwo = { \cBarYouGot \cBarWhatYouThought \cBarWhenYouFirst \cBarItThough }
 
 vOneLineVerseOneLineOne = { \vOneBarItsNot \vOneBarWhatYouThought \vOneBarWhenYouFirst \vOneBarBeganIt \break }
 vTwoLineVerseOneLineOne = { \vTwoBarItsNot \vTwoBarWhatYouThought \vTwoBarWhenYouFirst \vTwoBarBeganIt \break }
+cLineVerseOneLineOne = { \cBarItsNot \cBarWhatYouThought \cBarWhenYouFirst \cBarBeganIt }
 
 vOneLineChorusOneLineTwo = { \vOneBarItsNotGoingToStopCcge \vOneBarTilYouWiseUp \vOneBarIntro \vOneBarIntro \break }
 vTwoLineChorusOneLineTwo = { \vTwoBarItsNotGoingToStopCcge \vTwoBarTilYouWiseUp \vTwoBarIntro \vTwoBarIntro \break }
+cLineChorusOneLineTwo = { \cBarItsNotGoingToStopCcge \cBarTilYouWiseUp \cBarIntro \cBarIntro }
 
 vOneLineVerseTwoLineOne = { \vOneBarYoureSure \vOneBarTheresACure \vOneBarWhenYouFirst \vOneBarBeganIt \break }
 vTwoLineVerseTwoLineOne = { \vTwoBarYoureSure \vTwoBarTheresACure \vTwoBarWhenYouFirst \vTwoBarBeganIt \break }
+cLineVerseTwoLineOne = { \cBarYoureSure \cBarTheresACure \cBarWhenYouFirst \cBarBeganIt }
 
 vOneLineChorusTwoLineTwo = { \vOneBarItsNotGoingToStopCcge \vOneBarTilYouWiseUpTwo \vOneBarIntro \vOneBarIntro \break }
 vTwoLineChorusTwoLineTwo = { \vTwoBarItsNotGoingToStopCcge \vTwoBarTilYouWiseUpTwo \vTwoBarIntro \vTwoBarIntro \break }
+cLineChorusTwoLineTwo = { \cBarItsNotGoingToStopCcge \cBarTilYouWiseUpTwo \cBarIntro \cBarIntro }
 
 vOneLineBridgeLineOne = { \vOneBarPrepareAList \vOneBarBeforeYouSign \break }
 vTwoLineBridgeLineOne = { \vTwoBarPrepareAList \vTwoBarBeforeYouSign \break }
+cLineBridgeLineOne = { \cBarPrepareAList \cBarBeforeYouSign }
 
 vOneLineChorusThreeLineTwo = { \vOneBarItsNotGoingToStopCcge \vOneBarTilYouWiseUpThree \vOneBarItsNotGoingToStopCcgeTwo \vOneBarTilYouWiseUpThree \break }
 vTwoLineChorusThreeLineTwo = { \vTwoBarItsNotGoingToStopCcge \vTwoBarTilYouWiseUpThree \vTwoBarItsNotGoingToStopCcgeTwo \vTwoBarTilYouWiseUpThree \break }
+cLineChorusThreeLineTwo = { \cBarItsNotGoingToStopCcge \cBarTilYouWiseUpThree \cBarItsNotGoingToStopCcgeTwo \cBarTilYouWiseUpThree }
 
 vOneLineChorusThreeLineThree = { \vOneBarItsNotGoingToStopCcgeTwo \vOneBarTilYouWiseUpThree \vOneBarItsNotGoingToStopCcgeTwo \vOneBarSoJustGiveUp \break }
 vTwoLineChorusThreeLineThree = { \vTwoBarItsNotGoingToStopCcgeTwo \vTwoBarTilYouWiseUpThree \vTwoBarItsNotGoingToStopCcgeTwo \vTwoBarSoJustGiveUp \break }
+cLineChorusThreeLineThree = { \cBarItsNotGoingToStopCcgeTwo \cBarTilYouWiseUpThree \cBarItsNotGoingToStopCcgeTwo \cBarSoJustGiveUp }
 
 vOneLineOutroLineTwo = { \vOneBarOutro \vOneBarOutro \vOneBarOutro \vOneBarOutro \break }
 vTwoLineOutroLineTwo = { \vTwoBarOutro \vTwoBarOutro \vTwoBarOutro \vTwoBarOutro \break }
+cLineOutroLineTwo = { \cBarOutro \cBarOutro \cBarOutro \cBarOutro }
 
 
 %-----------------------------------------------------------------------
@@ -118,27 +160,35 @@ vTwoLineOutroLineTwo = { \vTwoBarOutro \vTwoBarOutro \vTwoBarOutro \vTwoBarOutro
 
 vOneStanzaIntro = { \vOneLineIntroLineOne }
 vTwoStanzaIntro = { \vTwoLineIntroLineOne }
+cStanzaIntro = { \cLineIntroLineOne }
 
 vOneStanzaVerseOne = { \vOneLineVerseOneLineOne \vOneLineVerseOneLineTwo }
 vTwoStanzaVerseOne = { \vTwoLineVerseOneLineOne \vTwoLineVerseOneLineTwo }
+cStanzaVerseOne = { \cLineVerseOneLineOne \cLineVerseOneLineTwo }
 
 vOneStanzaChorusOne = { \vOneLineChorusOneLineOne \vOneLineChorusOneLineTwo }
 vTwoStanzaChorusOne = { \vTwoLineChorusOneLineOne \vTwoLineChorusOneLineTwo }
+cStanzaChorusOne = { \cLineChorusOneLineOne \cLineChorusOneLineTwo }
 
 vOneStanzaVerseTwo = { \vOneLineVerseTwoLineOne \vOneLineVerseOneLineTwo }
 vTwoStanzaVerseTwo = { \vTwoLineVerseTwoLineOne \vTwoLineVerseOneLineTwo }
+cStanzaVerseTwo = { \cLineVerseTwoLineOne \cLineVerseOneLineTwo }
 
 vOneStanzaChorusTwo = { \vOneLineChorusOneLineOne \vOneLineChorusTwoLineTwo }
 vTwoStanzaChorusTwo = { \vTwoLineChorusOneLineOne \vTwoLineChorusTwoLineTwo }
+cStanzaChorusTwo = { \cLineChorusOneLineOne \cLineChorusTwoLineTwo }
 
 vOneStanzaBridge = { \vOneLineBridgeLineOne }
 vTwoStanzaBridge = { \vTwoLineBridgeLineOne }
+cStanzaBridge = { \cLineBridgeLineOne }
 
 vOneStanzaChorusThree = { \vOneLineChorusOneLineOne \vOneLineChorusThreeLineTwo \vOneLineChorusThreeLineThree }
 vTwoStanzaChorusThree = { \vTwoLineChorusOneLineOne \vTwoLineChorusThreeLineTwo \vTwoLineChorusThreeLineThree }
+cStanzaChorusThree = { \cLineChorusOneLineOne \cLineChorusThreeLineTwo \cLineChorusThreeLineThree }
 
 vOneStanzaOutro = { \vOneLineIntroLineOne \vOneLineOutroLineTwo }
 vTwoStanzaOutro = { \vTwoLineIntroLineOne \vTwoLineOutroLineTwo }
+cStanzaOutro = { \cLineIntroLineOne \cLineOutroLineTwo }
 
 
 %-----------------------------------------------------------------------
@@ -146,6 +196,7 @@ vTwoStanzaOutro = { \vTwoLineIntroLineOne \vTwoLineOutroLineTwo }
 
 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 }
 
 
 %-----------------------------------------------------------------------
@@ -176,6 +227,11 @@ stanzaHeadings = {
   r1^"Outro" r r r r r r r
 }
 
+%-----------------------------------------------------------------------
+% Chord Headings
+
+chordHeadings = { \cScoreTabOneScoreOne }
+
 %-----------------------------------------------------------------------
 
 \score {
@@ -208,6 +264,9 @@ stanzaHeadings = {
         \slurUp
         \vTwo
       }
+      \new TabVoice {
+        \chordHeadings
+      }
     >>
   >>
 

data/examples/aimee-man-wise-up/aimee-man-wise-up.rb

@@ -7,104 +7,132 @@ 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'
+
   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"
     notes "<d/4>4 <d/4>4 <d/4>4 <d/4>4"
+    chords :D
   end
 
   bar :BeganIt do
     notes "/skip 4 <a/3 c'/2 >8 <g/3>8 /skip 4 <g/3 c'/2 >8 <g/3>8"
     notes "<f/4>4 <f/4>4 <c/5>4 <e/4>4"
+    chords :FC
   end
 
   bar :ItThough do
     notes "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"
     notes "<f/4>4 <f/4>4 <d/4>4 <d/4>4"
+    chords :FD
   end
 
   bar :FDm do
     notes "r8 <a/3>8 <c'/2>8 <a/3>8 r8 <d'/2>8 <a/3>8 <e'/1>8"
     notes "<f/4>4 <f/4>4 <d/4>2"
+    chords :FD
   end
 
   bar :Intro do
     notes "<g'/1>8 <a/3>8 <g'/1>8 <a/3>16 <g'/1>8 <g/3>16 <e'/1>4 <g/3>8"
     notes "<f/4>4 <f/4>4 <c/5>4  <e/4>4"
+    chords :FC
   end
 
   bar :ItsNot do
     notes "r8 <g'/1>4 <a/3>16 <g'/1>8 <g/3>16 <e'/1>4 <g/3>16( <a/3>16)"
     notes "<f/4>4 <f/4>4 <c/5>4 <e/4>4"
+    chords :FC
   end
 
   bar :ItsNotGoingToStop do
     notes "<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)"
     notes "<f/4>4 <f/4>4 <d/4>4 <d/4>4"
+    chords :FD
   end
 
   bar :ItsNotGoingToStopCcge do
     notes "<g'/1>8 <g/3>8 <g'/1>16 <g'/1>16/glissando <a'/1>4 <d'/2>4 <c'/2>8"
     notes "<c/5>4 <c/5>4 <g,/6>4 <e,/6>4"
+    chords :CCGE
   end
 
   bar :ItsNotGoingToStopCcgeTwo do
     notes "r8 <g/3>8 <e'/1>8 <g'/1>8 r8 <d'/2>4 <c'/2>8"
     notes "<c/5>4 <e/4>4 <g,/6>4 <e,/6>4"
+    chords :CCGE
   end
 
   bar :Outro do
     notes "<g'/1>8 <a/3>8 <g'/1>8 <a/3>16 <g'/1>8 <g/3>16 <e'/1>4 <g/3>8"
     notes "<a,/5>4 <a,/5>4 <c/5>4  <c/5>4"
+    chords :AmC
   end
 
   bar :PrepareAList do
     notes "<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"
     notes "<a,/5>4 <a,/5>4 <a,/5>4 <a,/5>4"
+    chords :Am
   end
 
   bar :SoJustGiveUp do
     notes "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"
     notes "<as,/5>4 <d/4>4 /skip 2"
+    chords :BbF
   end
 
   bar :TheresACure do
     notes "r8 <d'/2>16( <c'/2>8.) <a/3>16 <g'/1>8 <g/3>16 <e'/1>4 <g/3>8"
     notes "<f/4>4 <f/4>4 <c/5>4 <c/5>4"
+    chords :FC
   end
 
   bar :TilYouWiseUp do
     notes "r8 <g/3>8 <c'/2>8 <g/3>8 <d'/2>4 <a/3>4"
     notes "<as,/5>4 <d/4>4 <f/4>4 <f/4>4"
+    chords :BbF
   end
 
   bar :TilYouWiseUpTwo do
     notes "r8 <g/3>8 <c'/2>8 <g/3>8 <d'/2>8 <a/3>8 r8 <c'/2>8"
     notes "<as,/5>4 <d/4>4 <f/4>4 <f/4>4"
+    chords :BbF
   end
 
   bar :TilYouWiseUpThree do
     notes "r8 <g/3>8 <c'/2>8 <a/3>8 <d'/2>8 <e'/1>8 r8 <e'/1>8"
     notes "<as,/5>4 <d/4>4 <f/4>4 <f/4>4"
+    chords :BbF
   end
 
   bar :WhatYouThought do
     notes "r8 <g'/1>4 <a/3>16 <g'/1>8 <g/3>16 <e'/1>4 <g/3>8"
     notes "<f/4>4 <f/4>4 <c/5>4 <e/4>4"
+    chords :FC
   end
 
   bar :WhenYouFirst do
     notes "<e'/1>8 <d'/2>16( <c'/2>8) <a/3>8. <c'/2>4 <a/3>8 <c'/2>8"
     notes "<a,/5>4 <a,/5>8 <e/4>4 <a,/5>4 /skip 8"
+    chords :Am
   end
 
   bar :YouGot do
     notes "<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)"
     notes "<f/4>4 <f/4>4 <c/5>4 <e/4>4"
+    chords :FC
   end
 
   bar :YoureSure do
     notes "r8 <g'/1>4 <a/3>16 <g'/1>8 <g/3>16 <e'/1>4 <e'/1>8"
     notes "<f/4>4 <f/4>4 <c/5>4 <e/4>4"
+    chords :FC
   end
 
   #-----------------------------------------------------------------------

data/examples/tab.ly

@@ -12,26 +12,43 @@
   instrument = "Guitar (capo on second fret)"
 }
 
+%-----------------------------------------------------------------------
+% 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 }
+
 %-----------------------------------------------------------------------
 % Bars
 
 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 }
 
 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 }
 
 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 }
 
 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 }
 
 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 }
 
 
 %-----------------------------------------------------------------------
@@ -39,9 +56,11 @@ vTwoBarYouGot = { <f\4>4 <f\4>4 <c\5>4 <e\4>4 }
 
 vOneLineVerseOneLineTwo = { \vOneBarYouGot \vOneBarWhatYouThought \vOneBarWhenYouFirst \vOneBarItThough \break }
 vTwoLineVerseOneLineTwo = { \vTwoBarYouGot \vTwoBarWhatYouThought \vTwoBarWhenYouFirst \vTwoBarItThough \break }
+cLineVerseOneLineTwo = { \cBarYouGot \cBarWhatYouThought \cBarWhenYouFirst \cBarItThough }
 
 vOneLineVerseOneLineOne = { \vOneBarItsNot \vOneBarWhatYouThought \vOneBarWhenYouFirst \vOneBarBeganIt \break }
 vTwoLineVerseOneLineOne = { \vTwoBarItsNot \vTwoBarWhatYouThought \vTwoBarWhenYouFirst \vTwoBarBeganIt \break }
+cLineVerseOneLineOne = { \cBarItsNot \cBarWhatYouThought \cBarWhenYouFirst \cBarBeganIt }
 
 
 %-----------------------------------------------------------------------
@@ -49,6 +68,7 @@ vTwoLineVerseOneLineOne = { \vTwoBarItsNot \vTwoBarWhatYouThought \vTwoBarWhenYo
 
 vOneStanzaVerseOne = { \vOneLineVerseOneLineOne \vOneLineVerseOneLineTwo }
 vTwoStanzaVerseOne = { \vTwoLineVerseOneLineOne \vTwoLineVerseOneLineTwo }
+cStanzaVerseOne = { \cLineVerseOneLineOne \cLineVerseOneLineTwo }
 
 
 %-----------------------------------------------------------------------
@@ -56,6 +76,7 @@ vTwoStanzaVerseOne = { \vTwoLineVerseOneLineOne \vTwoLineVerseOneLineTwo }
 
 vOneScoreTabOneScoreOne = { \vOneStanzaVerseOne }
 vTwoScoreTabOneScoreOne = { \vTwoStanzaVerseOne }
+cScoreTabOneScoreOne = { \cStanzaVerseOne }
 
 
 %-----------------------------------------------------------------------
@@ -79,6 +100,11 @@ stanzaHeadings = {
   r1^"Verse 1" r r r r r r r
 }
 
+%-----------------------------------------------------------------------
+% Chord Headings
+
+chordHeadings = { \cScoreTabOneScoreOne }
+
 %-----------------------------------------------------------------------
 
 \score {
@@ -111,6 +137,9 @@ stanzaHeadings = {
         \slurUp
         \vTwo
       }
+      \new TabVoice {
+        \chordHeadings
+      }
     >>
   >>
 

data/examples/tab.rb

@@ -7,34 +7,48 @@ Gitara.define do
   transposition "d"
   tempo "4 = 75"
 
+  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'
+
   bar :BeganIt do
     notes "/skip 4 <a/3 c'/2 >8 <g/3>8 /skip 4 <g/3 c'/2 >8 <g/3>8"
     notes "<f/4>4 <f/4>4 <c/5>4 <e/4>4"
+    chords :FC
   end
 
   bar :ItsNot do
     notes "r8 <g'/1>4 <a/3>16 <g'/1>8 <g/3>16 <e'/1>4 <g/3>16( <a/3>16)"
     notes "<f/4>4 <f/4>4 <c/5>4 <e/4>4"
+    chords :FC
   end
 
   bar :ItThough do
     notes "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"
     notes "<f/4>4 <f/4>4 <d/4>4 <d/4>4"
+    chords :FD
   end
 
   bar :WhatYouThought do
     notes "r8 <g'/1>4 <a/3>16 <g'/1>8 <g/3>16 <e'/1>4 <g/3>8"
     notes "<f/4>4 <f/4>4 <c/5>4 <e/4>4"
+    chords :FC
   end
 
   bar :WhenYouFirst do
     notes "<e'/1>8 <d'/2>16( <c'/2>8) <a/3>8. <c'/2>4 <a/3>8 <c'/2>8"
     notes "<a,/5>4 <a,/5>8 <e/4>4 <a,/5>4 /skip 8"
+    chords :Am
   end
 
   bar :YouGot do
     notes "<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)"
     notes "<f/4>4 <f/4>4 <c/5>4 <e/4>4"
+    chords :FC
   end
 
   line :VerseOneLineTwo do

data/lib/gitara/dsl.rb

@@ -32,6 +32,10 @@ module Gitara
       add_names :names => names, :node_class => Node::Bar, &block
     end
 
+    def chords(name, value=nil)
+      add Node::ChordSet.new(:name => name, :value => value)
+    end
+
     def line(*names, &block)
       add_names :names => names, :node_class => Node::Line, &block
     end

data/lib/gitara/node/bar/chorded_node.rb

@@ -0,0 +1,11 @@
+module Gitara
+  module Node
+    class Bar
+      class ChordedNode < Base::ChordedNode
+        def value
+          node.descendants(Node::ChordSet).map(&:chorded).map(&:call_name).join(' ')
+        end
+      end
+    end
+  end
+end

data/lib/gitara/node/base/chorded_node.rb

@@ -0,0 +1,21 @@
+module Gitara
+  module Node
+    class Base
+      class ChordedNode < Valuable
+        has_value :node
+
+        def call_name
+          "\\#{definition_name}"
+        end
+
+        def definition_name
+          "c#{node.class.to_s.split('::').last}#{node.definition_name}"
+        end
+
+        def value
+          node.children.map(&:chorded).map(&:call_name).join(' ')
+        end
+      end
+    end
+  end
+end

data/lib/gitara/node/base.rb

@@ -26,6 +26,10 @@ module Gitara
         end
       end
 
+      def chorded
+        self.class::ChordedNode.new(:node => self)
+      end
+
       def definition(target = self)
         if self.definition_of?(target)
           self
@@ -36,7 +40,7 @@ module Gitara
       end
 
       def definition?
-        ! own_children.empty?
+        ! own_children.empty? || ! value.nil?
       end
 
       def definition_name
@@ -79,7 +83,7 @@ module Gitara
       end
 
       def value
-        attributes[:value].gsub('/', "\\")
+        attributes[:value] ? attributes[:value].gsub('/', "\\") : nil
       end
 
       def voiced_as(arg)

data/lib/gitara/node/chord_set/chorded_node.rb

@@ -0,0 +1,11 @@
+module Gitara
+  module Node
+    class ChordSet
+      class ChordedNode < Base::ChordedNode
+        def value
+          node.value
+        end
+      end
+    end
+  end
+end

data/lib/gitara/node/chord_set.rb

@@ -0,0 +1,6 @@
+module Gitara
+  module Node
+    class ChordSet < Base
+    end
+  end
+end

data/lib/gitara/template/bar.erb

@@ -1,3 +1,4 @@
 <% self.voiced_as(self.root.voices).each do |voiced_bar| %>
 <%= voiced_bar.definition_name %> = { <%= voiced_bar.matching_note_set.value %> }
 <% end %>
+<%= self.chorded.definition_name %> = { <%= self.chorded.value %> }

data/lib/gitara/template/chord_set.erb

@@ -0,0 +1 @@
+<%= self.chorded.definition_name %> = { <%= self.chorded.value %> }

data/lib/gitara/template/line.erb

@@ -1,3 +1,4 @@
 <% self.voiced_as(self.root.voices).each do |voiced_line| %>
 <%= voiced_line.definition_name %> = { <%= voiced_line.children.map(&:call_name).join(' ') %> \break }
 <% end %>
+<%= self.chorded.definition_name %> = { <%= self.chorded.value %> }

data/lib/gitara/template/score.erb

@@ -1,3 +1,4 @@
 <% self.voiced_as(self.root.voices).each do |voiced_score| %>
 <%= voiced_score.definition_name %> = { <%= voiced_score.children.map(&:call_name).join(' ') %> }
 <% end %>
+<%= self.chorded.definition_name %> = { <%= self.chorded.value %> }

data/lib/gitara/template/stanza.erb

@@ -1,3 +1,4 @@
 <% self.voiced_as(self.root.voices).each do |voiced_stanza| %>
 <%= voiced_stanza.definition_name %> = { <%= voiced_stanza.children.map(&:call_name).join(' ') %> }
 <% end %>
+<%= self.chorded.definition_name %> = { <%= self.chorded.value %> }

data/lib/gitara/template/tab.erb

@@ -12,6 +12,13 @@
   instrument = "<%= self.instrument %>"
 }
 
+%-----------------------------------------------------------------------
+% Chord Sets
+
+<% definitions(Gitara::Node::ChordSet).each do |chord_set| %>
+<%= Gitara.render('chord_set', chord_set) %>
+<% end %>
+
 %-----------------------------------------------------------------------
 % Bars
 
@@ -56,6 +63,11 @@ stanzaHeadings = {
   <% end %>
 }
 
+%-----------------------------------------------------------------------
+% Chord Headings
+
+chordHeadings = { <%= playable_child.chorded.call_name %> }
+
 %-----------------------------------------------------------------------
 
 \score {
@@ -83,6 +95,9 @@ stanzaHeadings = {
         <%= voice.call_name %>
       }
       <% end %>
+      \new TabVoice {
+        \chordHeadings
+      }
     >>
   >>
 

data/lib/gitara/version.rb

@@ -1,3 +1,3 @@
 module Gitara
-  VERSION = "0.3.1"
+  VERSION = "0.4.0"
 end

data/lib/gitara.rb

@@ -8,9 +8,13 @@ require "valuable"
 require "gitara/app"
 require "gitara/dsl"
 require "gitara/node/base"
+require "gitara/node/base/chorded_node"
 require "gitara/node/base/voiced_node"
 require "gitara/node/bar"
+require "gitara/node/bar/chorded_node"
 require "gitara/node/bar/voiced_node"
+require "gitara/node/chord_set"
+require "gitara/node/chord_set/chorded_node"
 require "gitara/node/line"
 require "gitara/node/note_set"
 require "gitara/node/score"

data/spec/lib/gitara/dsl_spec.rb

@@ -215,5 +215,34 @@ describe Gitara do
         end
       end
     end
+
+    describe "chords(name, value)" do
+      it "should add a chord set with the name" do
+        dsl = Dsl.new(:node => Node::Tab.new)
+        dsl.node.own_children.should be_empty
+
+        dsl.chords :Am, 'r4-"Am" r r r'
+
+        dsl.node.own_children.should have(1).chord_set
+
+        chord_set = dsl.node.own_children[0]
+        chord_set.name.should == :Am
+        chord_set.value.should == 'r4-"Am" r r r'
+      end
+    end
+
+    describe "chords(name)" do
+      it "should add a bar with the name" do
+        dsl = Dsl.new(:node => Node::Tab.new)
+        dsl.node.own_children.should be_empty
+
+        dsl.chords :Am
+
+        dsl.node.own_children.should have(1).chord_set
+
+        chord_set = dsl.node.own_children[0]
+        chord_set.name.should == :Am
+      end
+    end
   end
 end

data/spec/lib/gitara/node/bar/chorded_node_spec.rb

@@ -0,0 +1,20 @@
+require 'spec_helper'
+
+describe 'ChordedNode' do
+  describe "value" do
+    it "should be the call names of the chord sets in the bar, if available" do
+      bar = Node::Bar.new(:children => [Node::ChordSet.new(:name => :Am, :value => 'r-"Am"')])
+
+      chorded_bar = Node::Bar::ChordedNode.new(:node => bar)
+      chorded_bar.value.should == '\cChordSetAm'
+    end
+
+    it "should be blank, if the bar does not have any chord sets" do
+      bar = Node::Bar.new(:children => [Node::NoteSet.new(:value => 'c')])
+
+      chorded_bar = Node::Bar::ChordedNode.new(:node => bar)
+      chorded_bar.value.should == ""
+    end
+  end
+end
+

data/spec/lib/gitara/node/base/chorded_node_spec.rb

@@ -0,0 +1,29 @@
+require 'spec_helper'
+
+describe 'ChordedNode' do
+  describe "definition_name" do
+    it "should include the node's class and the node's name" do
+      chorded_node = Node::Base::ChordedNode.new(:node => Node::Base.new(:name => :Am))
+      chorded_node.definition_name.should == 'cBaseAm'
+    end
+  end
+
+  describe "value" do
+    it "should be the call names of its children" do
+      node = Node::Base.new(:children => [
+        Node::Base.new(:name => :First),
+        Node::Base.new(:name => :Second)
+      ])
+      chorded_node = Node::Base::ChordedNode.new(:node => node)
+      chorded_node.value.should == '\cBaseFirst \cBaseSecond'
+    end
+  end
+
+  describe "call_name" do
+    it "should be the call name of the voiced node's definition name" do
+      chorded_node = Node::Base::ChordedNode.new(:node => Node::Base.new(:name => :Am))
+      chorded_node.call_name.should == '\cBaseAm'
+    end
+  end
+end
+

data/spec/lib/gitara/node/base_spec.rb

@@ -93,8 +93,16 @@ describe Node::Base do
       definition_bar.should be_definition
     end
 
-    it "should be false if this node does not have children" do
+    it "should be true if the node has a value" do
+      chord_set = Node::ChordSet.new(:name => :Am, :value =>'r4-"Am" r r r')
+      chord_set.own_children.should be_empty
+      chord_set.should be_definition
+    end
+
+    it "should be false if this node does not have children and it does not have a value" do
       call_bar = Node::Bar.new(:name => 'Intro')
+      call_bar.own_children.should be_empty
+      call_bar.value.should be_nil
       call_bar.should_not be_definition
     end
   end
@@ -259,4 +267,12 @@ describe Node::Base do
       stanza.descendants(Node::Bar).should == [bar]
     end
   end
+
+  describe "chorded" do
+    it "should return the chorded version of the node" do
+      node = Node::ChordSet.new
+      chorded_node = node.chorded
+      chorded_node.node.should == node
+    end
+  end
 end

data/spec/lib/gitara/node/chord_set/chorded_node_spec.rb

@@ -0,0 +1,11 @@
+require 'spec_helper'
+
+describe 'ChordSet::ChordedNode' do
+  describe "value" do
+    it "should be the chord set's value" do
+      chorded_node = Node::ChordSet::ChordedNode.new(:node => Node::ChordSet.new(:name => :Am, :value => '4r-"Am" r r r'))
+      chorded_node.value.should == '4r-"Am" r r r'
+    end
+  end
+end
+

data/spec/lib/gitara/node/chord_set_spec.rb

@@ -0,0 +1,4 @@
+require 'spec_helper'
+
+describe Node::ChordSet do
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gitara
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 15
   prerelease: 
   segments: 
   - 0
-  - 3
-  - 1
-  version: 0.3.1
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - George Mendoza
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-24 00:00:00 Z
+date: 2012-02-26 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: active_support
@@ -202,9 +202,13 @@ files:
 - lib/gitara/dsl.rb
 - lib/gitara/dsl_macros.rb
 - lib/gitara/node/bar.rb
+- lib/gitara/node/bar/chorded_node.rb
 - lib/gitara/node/bar/voiced_node.rb
 - lib/gitara/node/base.rb
+- lib/gitara/node/base/chorded_node.rb
 - lib/gitara/node/base/voiced_node.rb
+- lib/gitara/node/chord_set.rb
+- lib/gitara/node/chord_set/chorded_node.rb
 - lib/gitara/node/line.rb
 - lib/gitara/node/note_set.rb
 - lib/gitara/node/score.rb
@@ -212,6 +216,7 @@ files:
 - lib/gitara/node/tab.rb
 - lib/gitara/pow/base.rb
 - lib/gitara/template/bar.erb
+- lib/gitara/template/chord_set.erb
 - lib/gitara/template/line.erb
 - lib/gitara/template/score.erb
 - lib/gitara/template/stanza.erb
@@ -223,10 +228,14 @@ files:
 - lib/gitara/voice.rb
 - spec/lib/gitara/app_spec.rb
 - spec/lib/gitara/dsl_spec.rb
+- spec/lib/gitara/node/bar/chorded_node_spec.rb
 - spec/lib/gitara/node/bar/voiced_node_spec.rb
 - spec/lib/gitara/node/bar_spec.rb
+- spec/lib/gitara/node/base/chorded_node_spec.rb
 - spec/lib/gitara/node/base/voiced_node_spec.rb
 - spec/lib/gitara/node/base_spec.rb
+- spec/lib/gitara/node/chord_set/chorded_node_spec.rb
+- spec/lib/gitara/node/chord_set_spec.rb
 - spec/lib/gitara/node/note_set_spec.rb
 - spec/lib/gitara/node/stanza_spec.rb
 - spec/lib/gitara/node/tab_spec.rb