gitara 0.8.0 → 1.0.0

data/examples/{foo-fighters-walking-after-you/foo-fighters-walking-after-you.rb → foo-fighters-walking-after-you.rb}

@@ -3,8 +3,8 @@ Gitara.define do
   composer "Foo Fighters"
   arranger "Arranged by George Mendoza"
   instrument "DADGBE (capo on second fret)"
+  key 'g \major'
   midi_instrument "acoustic guitar (nylon)"
-
   string_tunings "#guitar-drop-d-tuning"
   tempo "4 = 100"
   transposition "d"

data/examples/tab-with-alternate-tuning.ly

@@ -1,4 +1,4 @@
-\version "2.12.3"
+\version "2.14.2"
 \include "english.ly"
 
 \paper {
@@ -22,7 +22,6 @@
 vOneBarTabOneBarOne = {  <d'\2 fs'\1 >4. <fs'\1 d'\2 >4 <fs'\1 d'\2 >8 \skip 4 }
 vTwoBarTabOneBarOne = {  <d,\6>4 <d\4>2 <d\4>8 <a,\5>8 }
 cBarTabOneBarOne = {   }
-sBarTabOneBarOne = {  r1 }
 
 
 %-----------------------------------------------------------------------
@@ -54,7 +53,8 @@ vTwo = {
 %-----------------------------------------------------------------------
 % Stanza Headings
 
-stanzaHeadings = { \sBarTabOneBarOne }
+stanzaHeadings = { 
+}
 
 %-----------------------------------------------------------------------
 % Chord Headings
@@ -66,26 +66,33 @@ chordHeadings = { \cBarTabOneBarOne }
 \score {
   \new StaffGroup <<
     \new Staff <<
+      
       \tempo 4 = 100
 
       \clef "treble_8"
 
+      \new ChordNames {
+        \chordHeadings
+      }
+
       \new Voice \with { \remove Rest_engraver } {
         \stanzaHeadings
       }
 
       \new Voice {
+        
         \voiceOne
         \vOne
       }
       \new Voice {
+        
         \voiceTwo
         \vTwo
       }
     >>
 
     \new TabStaff <<
-      \set TabStaff.stringTunings = #'(4 -1 -5 -10 -15 -22)
+      \set TabStaff.stringTunings = #guitar-drop-d-tuning
       \new TabVoice {
         \slurUp
         \vOne
@@ -94,9 +101,6 @@ chordHeadings = { \cBarTabOneBarOne }
         \slurUp
         \vTwo
       }
-      \new TabVoice {
-        \chordHeadings
-      }
     >>
   >>
 

data/examples/tab-with-alternate-tuning.rb

@@ -1,5 +1,5 @@
 Gitara.define do
-  string_tunings "#'(4 -1 -5 -10 -15 -22)" # Drop D
+  string_tunings "#guitar-drop-d-tuning"
   tempo "4 = 100"
   transposition "d"
 

data/examples/tab-with-chords.ly

@@ -0,0 +1,134 @@
+\version "2.14.2"
+\include "english.ly"
+
+\paper {
+ indent = #0
+}
+
+\header {
+  title = ""
+  composer = ""
+  arranger = ""
+  instrument = ""
+}
+
+%-----------------------------------------------------------------------
+% Chord Sets
+
+cChordSetCG = { \chordmode { c2 g:sus4 } }
+
+cChordSetFE = { \chordmode { f2 e } }
+
+
+%-----------------------------------------------------------------------
+% Bars
+
+vOneBarTabOneLineOneBarOne = {  a4 e c8 e r4 }
+cBarTabOneLineOneBarOne = {  \cChordSetCG }
+
+vOneBarTabOneLineOneBarTwo = {  b2 c4( d) }
+cBarTabOneLineOneBarTwo = {  \cChordSetFE }
+
+
+%-----------------------------------------------------------------------
+% Lines
+
+vOneLineTabOneLineOne = { \vOneBarTabOneLineOneBarOne \vOneBarTabOneLineOneBarTwo \break }
+cLineTabOneLineOne = { \cBarTabOneLineOneBarOne \cBarTabOneLineOneBarTwo }
+
+
+%-----------------------------------------------------------------------
+% Stanzas
+
+
+%-----------------------------------------------------------------------
+% Scores
+
+
+%-----------------------------------------------------------------------
+% Voices
+
+vOne = {
+  
+  \vOneLineTabOneLineOne
+}
+
+
+%-----------------------------------------------------------------------
+% Stanza Headings
+
+stanzaHeadings = { 
+}
+
+%-----------------------------------------------------------------------
+% Chord Headings
+
+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
+      }
+    >>
+  >>
+
+  \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
+      }
+    }
+  >>
+
+  \midi {}
+}

data/examples/tab-with-chords.rb

@@ -0,0 +1,16 @@
+Gitara.define do
+  chords :CG, 'c2 g:sus4'
+  chords :FE, 'f2 e'
+
+  line do
+    bar do
+      notes "a4 e c8 e r4"
+      chords :CG
+    end
+
+    bar do
+      notes "b2 c4( d)"
+      chords :FE
+    end
+  end
+end

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

@@ -1,4 +1,4 @@
-\version "2.12.3"
+\version "2.14.2"
 \include "english.ly"
 
 \paper {
@@ -14,19 +14,28 @@
 
 %-----------------------------------------------------------------------
 % Chord Sets
+
+
 %-----------------------------------------------------------------------
 % Bars
 
 vOneBarTabOneBarOne = {  <d'\2 fs'\1 >4. <fs'\1 d'\2 >4 <fs'\1 d'\2 >8 \skip 4 }
 vTwoBarTabOneBarOne = {  <d,\6>4 <d\4>2 <d\4>8 <a,\5>8 }
 cBarTabOneBarOne = {   }
-sBarTabOneBarOne = {  r1 }
+
+
 %-----------------------------------------------------------------------
 % Lines
+
+
 %-----------------------------------------------------------------------
 % Stanzas
+
+
 %-----------------------------------------------------------------------
 % Scores
+
+
 %-----------------------------------------------------------------------
 % Voices
 
@@ -39,10 +48,13 @@ vTwo = {
   \transposition d'
   \vTwoBarTabOneBarOne
 }
+
+
 %-----------------------------------------------------------------------
 % Stanza Headings
 
-stanzaHeadings = { \sBarTabOneBarOne }
+stanzaHeadings = { 
+}
 
 %-----------------------------------------------------------------------
 % Chord Headings
@@ -54,10 +66,15 @@ chordHeadings = { \cBarTabOneBarOne }
 \score {
   \new StaffGroup <<
     \new Staff <<
+      
       \tempo 4 = 100
 
       \clef "treble_8"
 
+      \new ChordNames {
+        \chordHeadings
+      }
+
       \new Voice \with { \remove Rest_engraver } {
         \stanzaHeadings
       }
@@ -75,7 +92,7 @@ chordHeadings = { \cBarTabOneBarOne }
     >>
 
     \new TabStaff <<
-      \set TabStaff.stringTunings = #'(4 -1 -5 -10 -15 -22)
+      \set TabStaff.stringTunings = #guitar-drop-d-tuning
       \new TabVoice {
         \slurUp
         \vOne
@@ -84,9 +101,6 @@ chordHeadings = { \cBarTabOneBarOne }
         \slurUp
         \vTwo
       }
-      \new TabVoice {
-        \chordHeadings
-      }
     >>
   >>
 

data/examples/tab-with-key-signature.rb

@@ -1,6 +1,6 @@
 Gitara.define do
   key 'd \major'
-  string_tunings "#'(4 -1 -5 -10 -15 -22)" # Drop D
+  string_tunings "#guitar-drop-d-tuning"
   tempo "4 = 100"
   transposition "d"
 
@@ -8,4 +8,4 @@ Gitara.define do
     notes "<d'/2 fs'/1 >4. <fs'/1 d'/2 >4 <fs'/1 d'/2 >8 /skip 4"
     notes "<d,/6>4 <d/4>2 <d/4>8 <a,/5>8"
   end
-end
+end

data/examples/tab-with-line-with-no-break.ly

@@ -1,4 +1,4 @@
-\version "2.12.3"
+\version "2.14.2"
 \include "english.ly"
 
 \paper {
@@ -22,22 +22,18 @@
 vOneBarTabOneScoreOneLineOneBarOne = {  <fs'\1>4. <d'\2>4 <a\3>4 <d'~\2>8  }
 vTwoBarTabOneScoreOneLineOneBarOne = {  <d,\6>4 <d\4>4 <d,\6>4 <d\4>4  }
 cBarTabOneScoreOneLineOneBarOne = {   }
-sBarTabOneScoreOneLineOneBarOne = {  r1 }
 
 vOneBarTabOneScoreOneLineOneBarTwo = {  <d'\2>8 <a\3>4 <d'\2>4 <a\3>8 \skip 4  }
 vTwoBarTabOneScoreOneLineOneBarTwo = {  <d,\6>4 <d\4>4 <d,\6>4 <d\4>4  }
 cBarTabOneScoreOneLineOneBarTwo = {   }
-sBarTabOneScoreOneLineOneBarTwo = {  r1 }
 
 vOneBarTabOneScoreOneLineTwoBarOne = {  \skip 4 r8 <d'\2 fs'\1 >4 <d'\2 fs'\1 >4 <d'~\2 fs'~\1 >8  }
 vTwoBarTabOneScoreOneLineTwoBarOne = {  <d,\6>4 <d\4>4 r4 <d\4>4  }
 cBarTabOneScoreOneLineTwoBarOne = {   }
-sBarTabOneScoreOneLineTwoBarOne = {  r1 }
 
 vOneBarTabOneScoreOneLineTwoBarTwo = {  <d'\2 fs'\1 >8 <d'\2 fs'\1 >4 <d'\2>8 <d'\2>8 <e'\1>4.  }
 vTwoBarTabOneScoreOneLineTwoBarTwo = {  r4 <d\4>4 r4 r4  }
 cBarTabOneScoreOneLineTwoBarTwo = {   }
-sBarTabOneScoreOneLineTwoBarTwo = {  r1 }
 
 
 %-----------------------------------------------------------------------
@@ -46,12 +42,10 @@ sBarTabOneScoreOneLineTwoBarTwo = {  r1 }
 vOneLineTabOneScoreOneLineOne = { \vOneBarTabOneScoreOneLineOneBarOne \vOneBarTabOneScoreOneLineOneBarTwo  }
 vTwoLineTabOneScoreOneLineOne = { \vTwoBarTabOneScoreOneLineOneBarOne \vTwoBarTabOneScoreOneLineOneBarTwo  }
 cLineTabOneScoreOneLineOne = { \cBarTabOneScoreOneLineOneBarOne \cBarTabOneScoreOneLineOneBarTwo }
-sLineTabOneScoreOneLineOne = { \sBarTabOneScoreOneLineOneBarOne \sBarTabOneScoreOneLineOneBarTwo }
 
 vOneLineTabOneScoreOneLineTwo = { \vOneBarTabOneScoreOneLineTwoBarOne \vOneBarTabOneScoreOneLineTwoBarTwo \break }
 vTwoLineTabOneScoreOneLineTwo = { \vTwoBarTabOneScoreOneLineTwoBarOne \vTwoBarTabOneScoreOneLineTwoBarTwo \break }
 cLineTabOneScoreOneLineTwo = { \cBarTabOneScoreOneLineTwoBarOne \cBarTabOneScoreOneLineTwoBarTwo }
-sLineTabOneScoreOneLineTwo = { \sBarTabOneScoreOneLineTwoBarOne \sBarTabOneScoreOneLineTwoBarTwo }
 
 
 %-----------------------------------------------------------------------
@@ -64,7 +58,6 @@ sLineTabOneScoreOneLineTwo = { \sBarTabOneScoreOneLineTwoBarOne \sBarTabOneScore
 vOneScoreTabOneScoreOne = { \vOneLineTabOneScoreOneLineOne \vOneLineTabOneScoreOneLineTwo }
 vTwoScoreTabOneScoreOne = { \vTwoLineTabOneScoreOneLineOne \vTwoLineTabOneScoreOneLineTwo }
 cScoreTabOneScoreOne = { \cLineTabOneScoreOneLineOne \cLineTabOneScoreOneLineTwo }
-sScoreTabOneScoreOne = { \sLineTabOneScoreOneLineOne \sLineTabOneScoreOneLineTwo }
 
 
 %-----------------------------------------------------------------------
@@ -84,7 +77,8 @@ vTwo = {
 %-----------------------------------------------------------------------
 % Stanza Headings
 
-stanzaHeadings = { \sScoreTabOneScoreOne }
+stanzaHeadings = { 
+}
 
 %-----------------------------------------------------------------------
 % Chord Headings
@@ -101,6 +95,10 @@ chordHeadings = { \cScoreTabOneScoreOne }
 
       \clef "treble_8"
 
+      \new ChordNames {
+        \chordHeadings
+      }
+
       \new Voice \with { \remove Rest_engraver } {
         \stanzaHeadings
       }
@@ -127,9 +125,6 @@ chordHeadings = { \cScoreTabOneScoreOne }
         \slurUp
         \vTwo
       }
-      \new TabVoice {
-        \chordHeadings
-      }
     >>
   >>
 

data/examples/tab-with-partial.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,12 +34,10 @@ 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 }
 
 
 %-----------------------------------------------------------------------
@@ -42,7 +46,6 @@ sBarVerseLineOneBarTwo = {  r1 }
 vOneLineVerseLineOne = { \vOneBarVerseLineOneBarOne \vOneBarVerseLineOneBarTwo \break }
 vTwoLineVerseLineOne = { \vTwoBarVerseLineOneBarOne \vTwoBarVerseLineOneBarTwo \break }
 cLineVerseLineOne = { \cBarVerseLineOneBarOne \cBarVerseLineOneBarTwo }
-sLineVerseLineOne = { \sBarVerseLineOneBarOne \sBarVerseLineOneBarTwo }
 
 
 %-----------------------------------------------------------------------
@@ -51,7 +54,7 @@ sLineVerseLineOne = { \sBarVerseLineOneBarOne \sBarVerseLineOneBarTwo }
 vOneStanzaVerse = { \vOneLineVerseLineOne }
 vTwoStanzaVerse = { \vTwoLineVerseLineOne }
 cStanzaVerse = { \cLineVerseLineOne }
-sStanzaVerse = { \sLineVerseLineOne }
+sStanzaVerse = { r8^"Verse" r1 }
 
 
 %-----------------------------------------------------------------------
@@ -80,7 +83,9 @@ vTwo = {
 %-----------------------------------------------------------------------
 % Stanza Headings
 
-stanzaHeadings = { \sScoreTabOneScoreOne }
+stanzaHeadings = { 
+\sScoreTabOneScoreOne 
+}
 
 %-----------------------------------------------------------------------
 % Chord Headings
@@ -92,25 +97,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
@@ -119,9 +132,6 @@ chordHeadings = { \cScoreTabOneScoreOne }
         \slurUp
         \vTwo
       }
-      \new TabVoice {
-        \chordHeadings
-      }
     >>
   >>