gitara 0.1.1 → 0.2.0

data/CHANGELOG.markdown

@@ -1,10 +1,16 @@
-0.1.0 - 2012-02-17
+0.2.0 - 2012-02-19
 ------------------
 
-* Added notes, bars, lines and scores to API.
+* [#13] Add stanzas.
 
 0.1.1 - 2012-02-18
 ------------------
 
 * [#12] Expressions should be id'd based on class.
 
+0.1.0 - 2012-02-17
+------------------
+
+* Added notes, bars, lines and scores to API.
+
+

data/README.markdown

@@ -24,14 +24,18 @@ Gitara is a Ruby DSL. A typical Gitara file will have the following structure:
 
     Gitara.define do
       score do
-        line do
-          bar do
-            notes "c d e f g a b c"
+        stanza "Verse 1" do
+          line do
+            bar do
+              notes "c d e f g a b c"
+            end
           end
         end
       end
     end
 
+You can find examples in the examples directory.
+
 
 Bars
 ----
@@ -169,6 +173,12 @@ Lines are manually breaked with [\\break](http://lilypond.org/doc/v2.12/Document
 Like bars, lines can be named, reused, etc.
 
 
+Stanzas
+-------
+
+The names of a stanza will be displayed at the top of the stanza's first bar.
+
+
 Notes with single quotes and backslashes
 ----------------------------------------
 
@@ -200,12 +210,11 @@ I'm no Lilypond expert (heh). When writing a tab, I use [TuxGuitar](http://tuxgu
 To do
 -----
 
-For version 1, I want to convert this lilypond file I wrote to Gitara format:
+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. Stanza labels
-3. Chord labels
+2. Chord labels

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

@@ -1,6 +1,10 @@
 \version "2.12.3"
 \include "english.ly"
 
+\paper {
+ indent = #0
+}
+
 %-----------------------------------------------------------------------
 % Bars
 
@@ -77,45 +81,89 @@ vTwoLineIntroLineOne = { \vTwoBarIntro \vTwoBarIntro \vTwoBarIntro \vTwoBarIntro
 vOneLineVerseOneLineTwo = { \vOneBarYouGot \vOneBarWhatYouThought \vOneBarWhenYouFirst \vOneBarItThough \break }
 vTwoLineVerseOneLineTwo = { \vTwoBarYouGot \vTwoBarWhatYouThought \vTwoBarWhenYouFirst \vTwoBarItThough \break }
 
-vOneLineTabOneScoreTwentyFourLineTwo = { \vOneBarItsNot \vOneBarWhatYouThought \vOneBarWhenYouFirst \vOneBarBeganIt \break }
-vTwoLineTabOneScoreTwentyFourLineTwo = { \vTwoBarItsNot \vTwoBarWhatYouThought \vTwoBarWhenYouFirst \vTwoBarBeganIt \break }
+vOneLineVerseOneLineOne = { \vOneBarItsNot \vOneBarWhatYouThought \vOneBarWhenYouFirst \vOneBarBeganIt \break }
+vTwoLineVerseOneLineOne = { \vTwoBarItsNot \vTwoBarWhatYouThought \vTwoBarWhenYouFirst \vTwoBarBeganIt \break }
+
+vOneLineChorusOneLineTwo = { \vOneBarItsNotGoingToStopCcge \vOneBarTilYouWiseUp \vOneBarIntro \vOneBarIntro \break }
+vTwoLineChorusOneLineTwo = { \vTwoBarItsNotGoingToStopCcge \vTwoBarTilYouWiseUp \vTwoBarIntro \vTwoBarIntro \break }
+
+vOneLineVerseTwoLineOne = { \vOneBarYoureSure \vOneBarTheresACure \vOneBarWhenYouFirst \vOneBarBeganIt \break }
+vTwoLineVerseTwoLineOne = { \vTwoBarYoureSure \vTwoBarTheresACure \vTwoBarWhenYouFirst \vTwoBarBeganIt \break }
+
+vOneLineChorusTwoLineTwo = { \vOneBarItsNotGoingToStopCcge \vOneBarTilYouWiseUpTwo \vOneBarIntro \vOneBarIntro \break }
+vTwoLineChorusTwoLineTwo = { \vTwoBarItsNotGoingToStopCcge \vTwoBarTilYouWiseUpTwo \vTwoBarIntro \vTwoBarIntro \break }
+
+vOneLineBridgeLineOne = { \vOneBarPrepareAList \vOneBarBeforeYouSign \break }
+vTwoLineBridgeLineOne = { \vTwoBarPrepareAList \vTwoBarBeforeYouSign \break }
+
+vOneLineChorusThreeLineTwo = { \vOneBarItsNotGoingToStopCcge \vOneBarTilYouWiseUpThree \vOneBarItsNotGoingToStopCcgeTwo \vOneBarTilYouWiseUpThree \break }
+vTwoLineChorusThreeLineTwo = { \vTwoBarItsNotGoingToStopCcge \vTwoBarTilYouWiseUpThree \vTwoBarItsNotGoingToStopCcgeTwo \vTwoBarTilYouWiseUpThree \break }
+
+vOneLineChorusThreeLineThree = { \vOneBarItsNotGoingToStopCcgeTwo \vOneBarTilYouWiseUpThree \vOneBarItsNotGoingToStopCcgeTwo \vOneBarSoJustGiveUp \break }
+vTwoLineChorusThreeLineThree = { \vTwoBarItsNotGoingToStopCcgeTwo \vTwoBarTilYouWiseUpThree \vTwoBarItsNotGoingToStopCcgeTwo \vTwoBarSoJustGiveUp \break }
+
+vOneLineOutroLineTwo = { \vOneBarOutro \vOneBarOutro \vOneBarOutro \vOneBarOutro \break }
+vTwoLineOutroLineTwo = { \vTwoBarOutro \vTwoBarOutro \vTwoBarOutro \vTwoBarOutro \break }
+
 
-vOneLineTabOneScoreTwentyFourLineFive = { \vOneBarItsNotGoingToStopCcge \vOneBarTilYouWiseUp \vOneBarIntro \vOneBarIntro \break }
-vTwoLineTabOneScoreTwentyFourLineFive = { \vTwoBarItsNotGoingToStopCcge \vTwoBarTilYouWiseUp \vTwoBarIntro \vTwoBarIntro \break }
+%-----------------------------------------------------------------------
+% Stanzas
+
+vOneStanzaIntro = { \vOneLineIntroLineOne }
+vTwoStanzaIntro = { \vTwoLineIntroLineOne }
+
+vOneStanzaVerseOne = { \vOneLineVerseOneLineOne \vOneLineVerseOneLineTwo }
+vTwoStanzaVerseOne = { \vTwoLineVerseOneLineOne \vTwoLineVerseOneLineTwo }
 
-vOneLineTabOneScoreTwentyFourLineSix = { \vOneBarYoureSure \vOneBarTheresACure \vOneBarWhenYouFirst \vOneBarBeganIt \break }
-vTwoLineTabOneScoreTwentyFourLineSix = { \vTwoBarYoureSure \vTwoBarTheresACure \vTwoBarWhenYouFirst \vTwoBarBeganIt \break }
+vOneStanzaChorusOne = { \vOneLineChorusOneLineOne \vOneLineChorusOneLineTwo }
+vTwoStanzaChorusOne = { \vTwoLineChorusOneLineOne \vTwoLineChorusOneLineTwo }
 
-vOneLineTabOneScoreTwentyFourLineNine = { \vOneBarItsNotGoingToStopCcge \vOneBarTilYouWiseUpTwo \vOneBarIntro \vOneBarIntro \break }
-vTwoLineTabOneScoreTwentyFourLineNine = { \vTwoBarItsNotGoingToStopCcge \vTwoBarTilYouWiseUpTwo \vTwoBarIntro \vTwoBarIntro \break }
+vOneStanzaVerseTwo = { \vOneLineVerseTwoLineOne \vOneLineVerseOneLineTwo }
+vTwoStanzaVerseTwo = { \vTwoLineVerseTwoLineOne \vTwoLineVerseOneLineTwo }
 
-vOneLineTabOneScoreTwentyFourLineTen = { \vOneBarPrepareAList \vOneBarBeforeYouSign \break }
-vTwoLineTabOneScoreTwentyFourLineTen = { \vTwoBarPrepareAList \vTwoBarBeforeYouSign \break }
+vOneStanzaChorusTwo = { \vOneLineChorusOneLineOne \vOneLineChorusTwoLineTwo }
+vTwoStanzaChorusTwo = { \vTwoLineChorusOneLineOne \vTwoLineChorusTwoLineTwo }
 
-vOneLineTabOneScoreTwentyFourLineTwelve = { \vOneBarItsNotGoingToStopCcge \vOneBarTilYouWiseUpThree \vOneBarItsNotGoingToStopCcgeTwo \vOneBarTilYouWiseUpThree \break }
-vTwoLineTabOneScoreTwentyFourLineTwelve = { \vTwoBarItsNotGoingToStopCcge \vTwoBarTilYouWiseUpThree \vTwoBarItsNotGoingToStopCcgeTwo \vTwoBarTilYouWiseUpThree \break }
+vOneStanzaBridge = { \vOneLineBridgeLineOne }
+vTwoStanzaBridge = { \vTwoLineBridgeLineOne }
 
-vOneLineTabOneScoreTwentyFourLineThirteen = { \vOneBarItsNotGoingToStopCcgeTwo \vOneBarTilYouWiseUpThree \vOneBarItsNotGoingToStopCcgeTwo \vOneBarSoJustGiveUp \break }
-vTwoLineTabOneScoreTwentyFourLineThirteen = { \vTwoBarItsNotGoingToStopCcgeTwo \vTwoBarTilYouWiseUpThree \vTwoBarItsNotGoingToStopCcgeTwo \vTwoBarSoJustGiveUp \break }
+vOneStanzaChorusThree = { \vOneLineChorusOneLineOne \vOneLineChorusThreeLineTwo \vOneLineChorusThreeLineThree }
+vTwoStanzaChorusThree = { \vTwoLineChorusOneLineOne \vTwoLineChorusThreeLineTwo \vTwoLineChorusThreeLineThree }
 
-vOneLineTabOneScoreTwentyFourLineFifteen = { \vOneBarOutro \vOneBarOutro \vOneBarOutro \vOneBarOutro \break }
-vTwoLineTabOneScoreTwentyFourLineFifteen = { \vTwoBarOutro \vTwoBarOutro \vTwoBarOutro \vTwoBarOutro \break }
+vOneStanzaOutro = { \vOneLineIntroLineOne \vOneLineOutroLineTwo }
+vTwoStanzaOutro = { \vTwoLineIntroLineOne \vTwoLineOutroLineTwo }
 
 
 %-----------------------------------------------------------------------
 % Scores
 
-vOneScoreTabOneScoreTwentyFour = { \vOneLineIntroLineOne \vOneLineTabOneScoreTwentyFourLineTwo \vOneLineVerseOneLineTwo \vOneLineChorusOneLineOne \vOneLineTabOneScoreTwentyFourLineFive \vOneLineTabOneScoreTwentyFourLineSix \vOneLineVerseOneLineTwo \vOneLineChorusOneLineOne \vOneLineTabOneScoreTwentyFourLineNine \vOneLineTabOneScoreTwentyFourLineTen \vOneLineChorusOneLineOne \vOneLineTabOneScoreTwentyFourLineTwelve \vOneLineTabOneScoreTwentyFourLineThirteen \vOneLineIntroLineOne \vOneLineTabOneScoreTwentyFourLineFifteen }
-vTwoScoreTabOneScoreTwentyFour = { \vTwoLineIntroLineOne \vTwoLineTabOneScoreTwentyFourLineTwo \vTwoLineVerseOneLineTwo \vTwoLineChorusOneLineOne \vTwoLineTabOneScoreTwentyFourLineFive \vTwoLineTabOneScoreTwentyFourLineSix \vTwoLineVerseOneLineTwo \vTwoLineChorusOneLineOne \vTwoLineTabOneScoreTwentyFourLineNine \vTwoLineTabOneScoreTwentyFourLineTen \vTwoLineChorusOneLineOne \vTwoLineTabOneScoreTwentyFourLineTwelve \vTwoLineTabOneScoreTwentyFourLineThirteen \vTwoLineIntroLineOne \vTwoLineTabOneScoreTwentyFourLineFifteen }
+vOneScoreTabOneScoreOne = { \vOneStanzaIntro \vOneStanzaVerseOne \vOneStanzaChorusOne \vOneStanzaVerseTwo \vOneStanzaChorusTwo \vOneStanzaBridge \vOneStanzaChorusThree \vOneStanzaOutro }
+vTwoScoreTabOneScoreOne = { \vTwoStanzaIntro \vTwoStanzaVerseOne \vTwoStanzaChorusOne \vTwoStanzaVerseTwo \vTwoStanzaChorusTwo \vTwoStanzaBridge \vTwoStanzaChorusThree \vTwoStanzaOutro }
 
 
 %-----------------------------------------------------------------------
 % Voices
 
-vOne = { \vOneScoreTabOneScoreTwentyFour }
+vOne = { \vOneScoreTabOneScoreOne }
+
+vTwo = { \vTwoScoreTabOneScoreOne }
+
 
-vTwo = { \vTwoScoreTabOneScoreTwentyFour }
+%-----------------------------------------------------------------------
+% 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
+}
 
+%-----------------------------------------------------------------------
 
 \score {
   \new StaffGroup <<
@@ -123,6 +171,10 @@ vTwo = { \vTwoScoreTabOneScoreTwentyFour }
       \tempo 4 = 75
       \clef "treble_8"
 
+      \new Voice \with { \remove Rest_engraver } {
+        \stanzaHeadings
+      }
+
       \new Voice {
         \voiceOne
         \vOne

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

@@ -116,55 +116,63 @@ Gitara.define do
   #-----------------------------------------------------------------------
 
   score do
-    # stanza Intro do
-    line :IntroLineOne
-
-    # stanza "Verse 1" do
-    line do
-      bar :ItsNot, :WhatYouThought, :WhenYouFirst, :BeganIt
+    stanza "Intro" do
+      line :IntroLineOne
     end
 
-    line :VerseOneLineTwo
+    stanza "Verse 1" do
+      line do
+        bar :ItsNot, :WhatYouThought, :WhenYouFirst, :BeganIt
+      end
 
-    # stanza "Chorus 1" do
-    line :ChorusOneLineOne
-    line do
-      bar :ItsNotGoingToStopCcge, :TilYouWiseUp, :Intro, :Intro
+      line :VerseOneLineTwo
     end
 
-    # stanza "Verse 2" do
-    line do
-      bar :YoureSure, :TheresACure, :WhenYouFirst, :BeganIt
+    stanza "Chorus 1" do
+      line :ChorusOneLineOne
+      line do
+        bar :ItsNotGoingToStopCcge, :TilYouWiseUp, :Intro, :Intro
+      end
     end
 
-    line :VerseOneLineTwo
+    stanza "Verse 2" do
+      line do
+        bar :YoureSure, :TheresACure, :WhenYouFirst, :BeganIt
+      end
 
-    # stanza "Chorus 2" do
-    line :ChorusOneLineOne
-    line do
-      bar :ItsNotGoingToStopCcge, :TilYouWiseUpTwo, :Intro, :Intro
+      line :VerseOneLineTwo
     end
 
-    # stanza "Bridge" do
-    line do
-      bar :PrepareAList, :BeforeYouSign
+    stanza "Chorus 2" do
+      line :ChorusOneLineOne
+      line do
+        bar :ItsNotGoingToStopCcge, :TilYouWiseUpTwo, :Intro, :Intro
+      end
     end
 
-    # stanza "Chorus 3" do
-    line :ChorusOneLineOne
-
-    line do
-      bar :ItsNotGoingToStopCcge, :TilYouWiseUpThree, :ItsNotGoingToStopCcgeTwo, :TilYouWiseUpThree
+    stanza "Bridge" do
+      line do
+        bar :PrepareAList, :BeforeYouSign
+      end
     end
 
-    line do
-      bar :ItsNotGoingToStopCcgeTwo, :TilYouWiseUpThree, :ItsNotGoingToStopCcgeTwo, :SoJustGiveUp
+    stanza "Chorus 3" do
+      line :ChorusOneLineOne
+
+      line do
+        bar :ItsNotGoingToStopCcge, :TilYouWiseUpThree, :ItsNotGoingToStopCcgeTwo, :TilYouWiseUpThree
+      end
+
+      line do
+        bar :ItsNotGoingToStopCcgeTwo, :TilYouWiseUpThree, :ItsNotGoingToStopCcgeTwo, :SoJustGiveUp
+      end
     end
 
-    # stanza "Outro" do
-    line :IntroLineOne
-    line do
-      bar :Outro, :Outro, :Outro, :Outro
+    stanza "Outro" do
+      line :IntroLineOne
+      line do
+        bar :Outro, :Outro, :Outro, :Outro
+      end
     end
   end
 end

data/examples/tab.ly

@@ -1,6 +1,10 @@
 \version "2.12.3"
 \include "english.ly"
 
+\paper {
+ indent = #0
+}
+
 %-----------------------------------------------------------------------
 % Bars
 
@@ -29,15 +33,22 @@ 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 }
 
-vOneLineTabOneScoreOneLineOne = { \vOneBarItsNot \vOneBarWhatYouThought \vOneBarWhenYouFirst \vOneBarBeganIt \break }
-vTwoLineTabOneScoreOneLineOne = { \vTwoBarItsNot \vTwoBarWhatYouThought \vTwoBarWhenYouFirst \vTwoBarBeganIt \break }
+vOneLineVerseOneLineOne = { \vOneBarItsNot \vOneBarWhatYouThought \vOneBarWhenYouFirst \vOneBarBeganIt \break }
+vTwoLineVerseOneLineOne = { \vTwoBarItsNot \vTwoBarWhatYouThought \vTwoBarWhenYouFirst \vTwoBarBeganIt \break }
+
+
+%-----------------------------------------------------------------------
+% Stanzas
+
+vOneStanzaVerseOne = { \vOneLineVerseOneLineOne \vOneLineVerseOneLineTwo }
+vTwoStanzaVerseOne = { \vTwoLineVerseOneLineOne \vTwoLineVerseOneLineTwo }
 
 
 %-----------------------------------------------------------------------
 % Scores
 
-vOneScoreTabOneScoreOne = { \vOneLineTabOneScoreOneLineOne \vOneLineVerseOneLineTwo }
-vTwoScoreTabOneScoreOne = { \vTwoLineTabOneScoreOneLineOne \vTwoLineVerseOneLineTwo }
+vOneScoreTabOneScoreOne = { \vOneStanzaVerseOne }
+vTwoScoreTabOneScoreOne = { \vTwoStanzaVerseOne }
 
 
 %-----------------------------------------------------------------------
@@ -48,12 +59,25 @@ vOne = { \vOneScoreTabOneScoreOne }
 vTwo = { \vTwoScoreTabOneScoreOne }
 
 
+%-----------------------------------------------------------------------
+% Stanza Headings
+
+stanzaHeadings = {
+  r1^"Verse 1" r r r r r r r
+}
+
+%-----------------------------------------------------------------------
+
 \score {
   \new StaffGroup <<
     \new Staff <<
       \tempo 4 = 75
       \clef "treble_8"
 
+      \new Voice \with { \remove Rest_engraver } {
+        \stanzaHeadings
+      }
+
       \new Voice {
         \voiceOne
         \vOne

data/examples/tab.rb

@@ -34,10 +34,12 @@ Gitara.define do
   end
 
   score do
-    line do
-      bar :ItsNot, :WhatYouThought, :WhenYouFirst, :BeganIt
-    end
+    stanza "Verse 1" do
+      line do
+        bar :ItsNot, :WhatYouThought, :WhenYouFirst, :BeganIt
+      end
 
-    line :VerseOneLineTwo
+      line :VerseOneLineTwo
+    end
   end
 end

data/gitara.gemspec

@@ -21,7 +21,6 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "active_support"
   s.add_runtime_dependency "erubis"
   s.add_runtime_dependency "linguistics"
-  s.add_runtime_dependency "parslet"
   s.add_runtime_dependency "pow"
   s.add_runtime_dependency "thor"
   s.add_runtime_dependency "valuable"

data/lib/gitara.rb

@@ -1,7 +1,6 @@
 require "active_support/inflector"
 require "erubis"
 require "linguistics"
-require "parslet"
 require "pow"
 require "thor"
 require "valuable"
@@ -15,6 +14,7 @@ require "gitara/node/bar/voiced_node"
 require "gitara/node/line"
 require "gitara/node/note_set"
 require "gitara/node/score"
+require "gitara/node/stanza"
 require "gitara/node/tab"
 require "gitara/pow/base"
 require "gitara/utilities"

data/lib/gitara/dsl.rb

@@ -31,5 +31,9 @@ module Gitara
     def score(*names, &block)
       add_names :names => names, :node_class => Node::Score, &block
     end
+
+    def stanza(*names, &block)
+      add_names :names => names, :node_class => Node::Stanza, &block
+    end
   end
 end

data/lib/gitara/node/base.rb

@@ -26,10 +26,26 @@ module Gitara
         end
       end
 
+      def definition(target = self)
+        if self.definition_of?(target)
+          self
+        else
+          result = parent.own_children.detect{|node| node.definition_of?(target) }
+          result ? result : parent.definition(target)
+        end
+      end
+
       def definition?
         ! own_children.empty?
       end
 
+      def definition_name
+        name.to_s.
+          gsub(/\W/, '_').
+          gsub(/\d+/){|s| Utilities.id_as_word(s)}.
+          camelize
+      end
+
       def definition_of?(target)
         self.definition? && self.name == target.name && self.class == target.class
       end
@@ -38,10 +54,18 @@ module Gitara
         self.is_a?(klass) && self.definition? ? [self] : self.own_children.map{|child| child.definitions(klass) }.flatten
       end
 
+      def descendants(klass)
+        self.is_a?(klass) ? [self.definition] : self.children.map{|child| child.descendants(klass) }.flatten
+      end
+
       def id_as_word
         Utilities.id_as_word(id)
       end
 
+      def inspect
+        Utilities.inspect_attributes self, :name
+      end
+
       def name
         attributes[:name] || "#{parent && parent.name}#{self.class.to_s.split('::').last}#{self.id_as_word}"
       end
@@ -67,17 +91,6 @@ module Gitara
           raise ArgumentError
         end
       end
-
-      private
-
-        def definition(target = self)
-          if self.definition_of?(target)
-            self
-          else
-            result = parent.own_children.detect{|node| node.definition_of?(target) }
-            result ? result : parent.definition(target)
-          end
-        end
     end
   end
 end

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

@@ -14,7 +14,7 @@ module Gitara
         end
 
         def definition_name
-          "#{voice.definition_name}#{node.class.to_s.split('::').last}#{node.name}"
+          "#{voice.definition_name}#{node.class.to_s.split('::').last}#{node.definition_name}"
         end
       end
     end

data/lib/gitara/node/stanza.rb

@@ -0,0 +1,11 @@
+module Gitara
+  module Node
+    class Stanza < Base
+      def heading_in_lilypond
+        results = Array.new(descendants(Node::Bar).size, 'r')
+        results[0] = %Q|r1^"#{name}"|
+        results.join(' ')
+      end
+    end
+  end
+end

data/lib/gitara/template/stanza.erb

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

data/lib/gitara/template/tab.erb

@@ -1,6 +1,10 @@
 \version "2.12.3"
 \include "english.ly"
 
+\paper {
+ indent = #0
+}
+
 %-----------------------------------------------------------------------
 % Bars
 
@@ -15,6 +19,13 @@
 <%= Gitara.render('line', line) %>
 <% end %>
 
+%-----------------------------------------------------------------------
+% Stanzas
+
+<% definitions(Gitara::Node::Stanza).each do |stanza| %>
+<%= Gitara.render('stanza', stanza) %>
+<% end %>
+
 %-----------------------------------------------------------------------
 % Scores
 
@@ -29,12 +40,27 @@
 <%= Gitara.render('voice', voice) %>
 <% end %>
 
+%-----------------------------------------------------------------------
+% Stanza Headings
+
+stanzaHeadings = {
+  <% definitions(Gitara::Node::Stanza).each do |stanza| %>
+  <%= stanza.heading_in_lilypond %>
+  <% end %>
+}
+
+%-----------------------------------------------------------------------
+
 \score {
   \new StaffGroup <<
     \new Staff <<
       \tempo 4 = 75
       \clef "treble_8"
 
+      \new Voice \with { \remove Rest_engraver } {
+        \stanzaHeadings
+      }
+
       <% voices.each do |voice| %>
       \new Voice {
         <%= voice.stem_type %>

data/lib/gitara/utilities.rb

@@ -3,6 +3,10 @@ module Gitara
     def self.id_as_word(id)
       id.en.numwords.gsub('-', '_').camelize
     end
+
+    def self.inspect_attributes(object, *attributes)
+      "#{object.class}(" + attributes.collect{|a| "#{a}=#{object.send(a).inspect}"}.join(', ') + ")"
+    end
   end
 end
 

data/lib/gitara/version.rb

@@ -1,3 +1,3 @@
 module Gitara
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/spec/lib/gitara/app_spec.rb

@@ -6,7 +6,11 @@ describe App do
       app = Gitara::App.new
       app.invoke :export, ['examples/tab.rb'], "target-directory" => test_tmp_dir.path, "run-lilypond" => false
 
-      (test_tmp_dir / 'tab.ly').read.should == Pow('examples/tab.ly').read
+      example = Pow('examples/tab.ly').read
+      actual = (test_tmp_dir / 'tab.ly').read
+
+      (Pow('tmp') / 'new-tab.ly').write actual if example != actual
+      actual.should == example
     end
   end
 end

data/spec/lib/gitara/dsl_spec.rb

@@ -169,5 +169,38 @@ describe Gitara do
         score.own_children[0].should == note_set
       end
     end
+
+    describe "stanza(name, &block)" do
+      it "should add a stanza with the name" do
+        dsl = Dsl.new(:node => Node::Tab.new)
+        dsl.node.own_children.should be_empty
+
+        dsl.stanza 'Intro'
+
+        dsl.node.own_children.should have(1).stanza
+
+        stanza = dsl.node.own_children[0]
+        stanza.name.should == 'Intro'
+        stanza.own_children.should be_empty
+      end
+
+      it "should add the children declared in the block to the stanza" do
+        dsl = Dsl.new(:node => Node::Tab.new)
+        dsl.node.own_children.should be_empty
+
+        line = Node::Line.new
+
+        dsl.stanza 'Intro' do
+          add line
+        end
+
+        dsl.node.own_children.should have(1).stanza
+        dsl.node.own_children[0].name.should == 'Intro'
+
+        stanza = dsl.node.own_children[0]
+        stanza.own_children.should have(1).line
+        stanza.own_children[0].should == line
+      end
+    end
   end
 end

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

@@ -214,4 +214,49 @@ describe Node::Base do
       node.id_as_word.should == "TwentyFour"
     end
   end
+
+  describe "definition_name" do
+    it "should turn the name to a lilypond acceptable name" do
+      node = Node::Base.new(:name => "Verse 1 line-2")
+      node.definition_name.should == "VerseOneLineTwo"
+    end
+  end
+
+  describe "descendants(klass)" do
+    it "should be itself if it is an instance of the klass" do
+      tab = Node::Tab.new(:children => [Node::Bar.new])
+      tab.descendants(Node::Tab).should == [tab]
+    end
+
+    it "should include descendants which are instances of klass" do
+      tab = Node::Tab.new(:children => [
+        Node::Bar.new(:name => :Intro, :children => [
+          Node::NoteSet.new
+        ])
+      ])
+
+      tab.descendants(Node::Bar).should have(1).bar
+    end
+
+    it "should follow the definitions of node references for descendants" do
+      tab = Node::Tab.new(:children => [
+        Node::Bar.new(:name => :Intro, :children => [
+          Node::NoteSet.new
+        ]),
+
+        Node::Line.new(:name => 'Line 1', :children => [
+          Node::Bar.new(:name => :Intro)
+        ]),
+
+        Node::Stanza.new(:children => [
+          Node::Line.new(:name => 'Line 1')
+        ])
+      ])
+
+      bar = tab.own_children[0]
+
+      stanza = tab.own_children[2]
+      stanza.descendants(Node::Bar).should == [bar]
+    end
+  end
 end

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

@@ -0,0 +1,16 @@
+require 'spec_helper'
+
+describe 'Stanza' do
+  describe "heading_in_lilypond" do
+    it "should allow the stanza's name to be added as a heading to the lilypond template" do
+      stanza = Node::Stanza.new(:name => "Verse 1", :children => [
+        Node::Line.new(:children => [
+          Node::Bar.new(:children => [Node::NoteSet.new]),
+          Node::Bar.new(:children => [Node::NoteSet.new]),
+        ])
+      ])
+
+      stanza.heading_in_lilypond.should == 'r1^"Verse 1" r'
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,6 +1,4 @@
 require 'gitara'
-require 'parslet/convenience'
-require 'parslet/rig/rspec'
 require 'pry'
 
 RSpec.configure do |config|

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gitara
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: 
   segments: 
   - 0
-  - 1
-  - 1
-  version: 0.1.1
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - George Mendoza
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-18 00:00:00 Z
+date: 2012-02-19 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: active_support
@@ -60,7 +60,7 @@ dependencies:
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: parslet
+  name: pow
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
@@ -74,7 +74,7 @@ dependencies:
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: pow
+  name: thor
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
@@ -88,7 +88,7 @@ dependencies:
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: thor
+  name: valuable
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
@@ -102,7 +102,7 @@ dependencies:
   type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: valuable
+  name: guard
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
@@ -113,10 +113,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
+  type: :development
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: guard
+  name: guard-rspec
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
@@ -130,7 +130,7 @@ dependencies:
   type: :development
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  name: guard-rspec
+  name: pry
   prerelease: false
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
@@ -144,7 +144,7 @@ dependencies:
   type: :development
   version_requirements: *id009
 - !ruby/object:Gem::Dependency 
-  name: pry
+  name: rb-inotify
   prerelease: false
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
@@ -158,7 +158,7 @@ dependencies:
   type: :development
   version_requirements: *id010
 - !ruby/object:Gem::Dependency 
-  name: rb-inotify
+  name: rspec
   prerelease: false
   requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
@@ -171,20 +171,6 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id011
-- !ruby/object:Gem::Dependency 
-  name: rspec
-  prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id012
 description: A Ruby DSL for generating Lilypond guitar tablatures.
 email: 
 - gsmendoza@gmail.com
@@ -221,11 +207,13 @@ files:
 - lib/gitara/node/line.rb
 - lib/gitara/node/note_set.rb
 - lib/gitara/node/score.rb
+- lib/gitara/node/stanza.rb
 - lib/gitara/node/tab.rb
 - lib/gitara/pow/base.rb
 - lib/gitara/template/bar.erb
 - lib/gitara/template/line.erb
 - lib/gitara/template/score.erb
+- lib/gitara/template/stanza.erb
 - lib/gitara/template/tab.erb
 - lib/gitara/template/voice.erb
 - lib/gitara/utilities.rb
@@ -238,6 +226,7 @@ files:
 - spec/lib/gitara/node/base/voiced_node_spec.rb
 - spec/lib/gitara/node/base_spec.rb
 - spec/lib/gitara/node/note_set_spec.rb
+- spec/lib/gitara/node/stanza_spec.rb
 - spec/lib/gitara/node/tab_spec.rb
 - spec/lib/gitara/voice_spec.rb
 - spec/lib/gitara_spec.rb