gitara 0.8.0 → 1.0.0

data/examples/tab-with-partial.rb

@@ -7,12 +7,12 @@ Gitara.define do
   transposition "cs"
   tempo "4 = 90"
 
-  chords :G, 'r1-"G"'
-  chords :G8, 'r8-"G"'
-  chords :C, 'r1-"C"'
-  chords :A7, 'r1-"A7"'
-  chords :Em, 'r1-"Em"'
-  chords :D, 'r1-"D"'
+  chords :G, 'g1'
+  chords :G8, 'g8'
+  chords :C, 'c1'
+  chords :A7, 'a1:7'
+  chords :Em, 'e1:m'
+  chords :D, 'd1'
 
   score do
     stanza "Verse" do
@@ -32,4 +32,4 @@ Gitara.define do
       end
     end
   end
-end
+end

data/examples/tab-with-repeats.ly

@@ -1,4 +1,4 @@
-\version "2.12.3"
+\version "2.14.2"
 \include "english.ly"
 
 \paper {
@@ -14,40 +14,50 @@
 
 %-----------------------------------------------------------------------
 % Chord Sets
+
+
 %-----------------------------------------------------------------------
 % Bars
 
 vOneBarTabOneLineOneRepeatOneBarOne = {  c4 d e f }
 cBarTabOneLineOneRepeatOneBarOne = {   }
-sBarTabOneLineOneRepeatOneBarOne = {  r1 }
 
 vOneBarTabOneLineOneAlternativeOneBarOne = {  d2 e }
 cBarTabOneLineOneAlternativeOneBarOne = {   }
-sBarTabOneLineOneAlternativeOneBarOne = {  r1 }
 
 vOneBarTabOneLineOneAlternativeOneBarTwo = {  f2 g }
 cBarTabOneLineOneAlternativeOneBarTwo = {   }
-sBarTabOneLineOneAlternativeOneBarTwo = {  r1 }
+
+
 %-----------------------------------------------------------------------
 % Lines
 
 vOneLineTabOneLineOne = { \repeat volta 4 { \vOneBarTabOneLineOneRepeatOneBarOne } \alternative { { \vOneBarTabOneLineOneAlternativeOneBarOne } { \vOneBarTabOneLineOneAlternativeOneBarTwo } } \break }
 cLineTabOneLineOne = { \repeat volta 4 { \cBarTabOneLineOneRepeatOneBarOne } \alternative { { \cBarTabOneLineOneAlternativeOneBarOne } { \cBarTabOneLineOneAlternativeOneBarTwo } } }
-sLineTabOneLineOne = { \repeat volta 4 { \sBarTabOneLineOneRepeatOneBarOne } \alternative { { \sBarTabOneLineOneAlternativeOneBarOne } { \sBarTabOneLineOneAlternativeOneBarTwo } } }
+
+
 %-----------------------------------------------------------------------
 % Stanzas
+
+
 %-----------------------------------------------------------------------
 % Scores
+
+
 %-----------------------------------------------------------------------
 % Voices
 
 vOne = {
+  
   \vOneLineTabOneLineOne
 }
+
+
 %-----------------------------------------------------------------------
 % Stanza Headings
 
-stanzaHeadings = { \sLineTabOneLineOne }
+stanzaHeadings = { 
+}
 
 %-----------------------------------------------------------------------
 % Chord Headings
@@ -59,26 +69,31 @@ chordHeadings = { \cLineTabOneLineOne }
 \score {
   \new StaffGroup <<
     \new Staff <<
+      
+      
       \clef "treble_8"
 
+      \new ChordNames {
+        \chordHeadings
+      }
+
       \new Voice \with { \remove Rest_engraver } {
         \stanzaHeadings
       }
 
       \new Voice {
+        
         \voiceOne
         \vOne
       }
     >>
 
     \new TabStaff <<
+      
       \new TabVoice {
         \slurUp
         \vOne
       }
-      \new TabVoice {
-        \chordHeadings
-      }
     >>
   >>
 
@@ -104,6 +119,7 @@ chordHeadings = { \cLineTabOneLineOne }
 % showLastLength = R1*4
 \score {
   \new Staff \with {midiInstrument = #"acoustic guitar (nylon)"} <<
+    
     \clef "treble_8"
 
     \new Voice {

data/examples/tab-with-reused-bar-in-stanza.ly

@@ -0,0 +1,154 @@
+\version "2.14.2"
+\include "english.ly"
+
+\paper {
+ indent = #0
+}
+
+\header {
+  title = ""
+  composer = ""
+  arranger = ""
+  instrument = ""
+}
+
+%-----------------------------------------------------------------------
+% Chord Sets
+
+
+%-----------------------------------------------------------------------
+% Bars
+
+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 = {   }
+
+
+%-----------------------------------------------------------------------
+% Lines
+
+vOneLineIntroLineOne = { \vOneBarIntro \vOneBarIntro \vOneBarIntro \vOneBarIntro \break }
+vTwoLineIntroLineOne = { \vTwoBarIntro \vTwoBarIntro \vTwoBarIntro \vTwoBarIntro \break }
+cLineIntroLineOne = { \cBarIntro \cBarIntro \cBarIntro \cBarIntro }
+
+
+%-----------------------------------------------------------------------
+% Stanzas
+
+vOneStanzaIntro = { \vOneLineIntroLineOne }
+vTwoStanzaIntro = { \vTwoLineIntroLineOne }
+cStanzaIntro = { \cLineIntroLineOne }
+sStanzaIntro = { r1^"Intro" r1 r1 r1 }
+
+
+%-----------------------------------------------------------------------
+% Scores
+
+
+%-----------------------------------------------------------------------
+% Voices
+
+vOne = {
+  
+  \vOneStanzaIntro
+}
+
+vTwo = {
+  
+  \vTwoStanzaIntro
+}
+
+
+%-----------------------------------------------------------------------
+% Stanza Headings
+
+stanzaHeadings = { 
+\sStanzaIntro 
+}
+
+%-----------------------------------------------------------------------
+% Chord Headings
+
+chordHeadings = { \cStanzaIntro }
+
+%-----------------------------------------------------------------------
+
+\score {
+  \new StaffGroup <<
+    \new Staff <<
+      
+      
+      \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
+      }
+      \new TabVoice {
+        \slurUp
+        \vTwo
+      }
+    >>
+  >>
+
+  \layout {
+    \context { \Staff
+      \override TimeSignature #'style = #'numbered
+      \override StringNumber #'transparent = ##t
+    }
+    \context { \TabStaff
+      \override TimeSignature #'style = #'numbered
+    }
+    \context { \Voice
+      \remove Slur_engraver
+    }
+    \context { \TabVoice
+      \remove Dots_engraver
+      \remove Stem_engraver
+      \remove Rest_engraver
+    }
+  }
+}
+
+% showLastLength = R1*4
+\score {
+  \new Staff \with {midiInstrument = #"acoustic guitar (nylon)"} <<
+    
+    \clef "treble_8"
+
+    \new Voice {
+      \unfoldRepeats {
+        \vOne
+      }
+    }
+    \new Voice {
+      \unfoldRepeats {
+        \vTwo
+      }
+    }
+  >>
+
+  \midi {}
+}

data/examples/tab-with-reused-bar-in-stanza.rb

@@ -0,0 +1,14 @@
+Gitara.define do
+  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"
+  end
+
+  line :IntroLineOne do
+    bar :Intro, :Intro, :Intro, :Intro
+  end
+
+  stanza "Intro" do
+    line :IntroLineOne
+  end
+end

data/examples/tab-with-time-signature.ly

@@ -1,4 +1,4 @@
-\version "2.12.3"
+\version "2.14.2"
 \include "english.ly"
 
 \paper {
@@ -14,36 +14,49 @@
 
 %-----------------------------------------------------------------------
 % Chord Sets
+
+
 %-----------------------------------------------------------------------
 % Bars
 
 vOneBarCChordBarOne = {  c4 e4 }
 cBarCChordBarOne = {   }
-sBarCChordBarOne = {  r4^"C chord" r4 }
 
 vOneBarCChordBarTwo = {  g2 }
 cBarCChordBarTwo = {   }
-sBarCChordBarTwo = {  r4 r4 }
+
+
 %-----------------------------------------------------------------------
 % Lines
+
+
 %-----------------------------------------------------------------------
 % Stanzas
 
 vOneStanzaCChord = { \vOneBarCChordBarOne \vOneBarCChordBarTwo }
 cStanzaCChord = { \cBarCChordBarOne \cBarCChordBarTwo }
-sStanzaCChord = { \sBarCChordBarOne \sBarCChordBarTwo }
+sStanzaCChord = { r4^"C chord" r4 r4 r4 }
+
+
 %-----------------------------------------------------------------------
 % Scores
+
+
 %-----------------------------------------------------------------------
 % Voices
 
 vOne = {
+  
   \vOneStanzaCChord
 }
+
+
 %-----------------------------------------------------------------------
 % Stanza Headings
 
-stanzaHeadings = { \sStanzaCChord }
+stanzaHeadings = { 
+\sStanzaCChord 
+}
 
 %-----------------------------------------------------------------------
 % Chord Headings
@@ -56,26 +69,31 @@ chordHeadings = { \cStanzaCChord }
   \new StaffGroup <<
     \new Staff <<
       \time 2/4
+
+      
       \clef "treble_8"
 
+      \new ChordNames {
+        \chordHeadings
+      }
+
       \new Voice \with { \remove Rest_engraver } {
         \stanzaHeadings
       }
 
       \new Voice {
+        
         \voiceOne
         \vOne
       }
     >>
 
     \new TabStaff <<
+      
       \new TabVoice {
         \slurUp
         \vOne
       }
-      \new TabVoice {
-        \chordHeadings
-      }
     >>
   >>
 
@@ -101,6 +119,7 @@ chordHeadings = { \cStanzaCChord }
 % showLastLength = R1*4
 \score {
   \new Staff \with {midiInstrument = #"acoustic guitar (nylon)"} <<
+    
     \clef "treble_8"
 
     \new Voice {

data/lib/gitara/node/bar.rb

@@ -5,10 +5,6 @@ module Gitara
       # @attribute $1
       has_value :specified_duration
 
-      def first_bar_of_stanza?
-        stanza && stanza.descendants(Node::Bar)[0] == self
-      end
-
       def note_sets
         definition_children.select{|child| child.is_a?(Node::NoteSet)}
       end
@@ -17,28 +13,7 @@ module Gitara
         specified_duration ? "\\partial #{specified_duration}" : nil
       end
 
-      def stanza
-        self.ancestor(Node::Stanza)
-      end
-
       def stanza_heading
-        first_bar_of_stanza? ?  stanza_heading_for_first_bar : stanza_heading_for_succeeding_bars
-      end
-
-      def stanza_heading_for_first_bar
-        if specified_duration
-          %Q|r#{specified_duration}^"#{ancestor(Node::Stanza).name}"|
-        else
-          ts = ancestor(Node::Tab).time_signature
-          if ts.generates_whole_note_bars?
-            %Q|#{ts.rest_bar_value}^"#{ancestor(Node::Stanza).name}"|
-          else
-            %Q|r#{ts.beat_unit}^"#{ancestor(Node::Stanza).name}" | + ("r#{ts.beat_unit} " * (ts.beats_per_bar - 1)).strip
-          end
-        end
-      end
-
-      def stanza_heading_for_succeeding_bars
         specified_duration ? "r#{specified_duration}" : ancestor(Node::Tab).time_signature.rest_bar_value
       end
     end