Browse Source

Merge pull request #96 from patacrep/fix_verse

Remove {start/end_of_verse}
pull/105/head
Louis 9 years ago
parent
commit
7d7bdd0417
  1. 1
      patacrep/songs/chordpro/data/chordpro/content_newline
  2. 6
      patacrep/songs/chordpro/data/chordpro/content_verse
  3. 2
      test/test_chordpro/01.sgc
  4. 3
      test/test_chordpro/08.sgc
  5. 3
      test/test_chordpro/09.sgc
  6. 2
      test/test_chordpro/10.sgc
  7. 2
      test/test_chordpro/11.sgc
  8. 2
      test/test_chordpro/12.sgc
  9. 2
      test/test_chordpro/21.sgc
  10. 3
      test/test_chordpro/28.sgc
  11. 3
      test/test_chordpro/29.sgc
  12. 2
      test/test_chordpro/chords.sgc
  13. 12
      test/test_chordpro/greensleeves.sgc
  14. 2
      test/test_chordpro/invalid_chord.sgc

1
patacrep/songs/chordpro/data/chordpro/content_newline

@ -1,2 +1 @@

6
patacrep/songs/chordpro/data/chordpro/content_verse

@ -1,5 +1,11 @@
(*- if content.type != 'verse' -*)
{start_of_(( content.type ))} {start_of_(( content.type ))}
(* for line in content.lines *) (* for line in content.lines *)
(( render(line) )) (( render(line) ))
(* endfor *) (* endfor *)
{end_of_(( content.type ))} {end_of_(( content.type ))}
(* else -*)
(*- for line in content.lines -*)
(( render(line) ))
(* endfor -*)
(*- endif -*)

2
test/test_chordpro/01.sgc

@ -1,5 +1,3 @@
{language: english} {language: english}
{start_of_verse}
A verse line A verse line
{end_of_verse}

3
test/test_chordpro/08.sgc

@ -1,7 +1,4 @@
{language: english} {language: english}
{start_of_verse}
A lot of new lines A lot of new lines
{end_of_verse}

3
test/test_chordpro/09.sgc

@ -2,7 +2,4 @@
{title: and a directive} {title: and a directive}
{start_of_verse}
A lot of new lines A lot of new lines
{end_of_verse}

2
test/test_chordpro/10.sgc

@ -1,5 +1,3 @@
{language: english} {language: english}
{start_of_verse}
A line[A] with a chord A line[A] with a chord
{end_of_verse}

2
test/test_chordpro/11.sgc

@ -1,5 +1,3 @@
{language: english} {language: english}
{start_of_verse}
A line ending with a chord[A] A line ending with a chord[A]
{end_of_verse}

2
test/test_chordpro/12.sgc

@ -1,5 +1,3 @@
{language: english} {language: english}
{start_of_verse}
[A]A line starting with a chord [A]A line starting with a chord
{end_of_verse}

2
test/test_chordpro/21.sgc

@ -1,5 +1,3 @@
{language: english} {language: english}
{start_of_verse}
A verse line A verse line
{end_of_verse}

3
test/test_chordpro/28.sgc

@ -1,7 +1,4 @@
{language: english} {language: english}
{start_of_verse}
A lot of new lines A lot of new lines
{end_of_verse}

3
test/test_chordpro/29.sgc

@ -2,7 +2,4 @@
{title: and a directive} {title: and a directive}
{start_of_verse}
A lot of new lines A lot of new lines
{end_of_verse}

2
test/test_chordpro/chords.sgc

@ -1,6 +1,5 @@
{language: english} {language: english}
{start_of_verse}
[A]Simple [A]Simple
[Bb]Bémol [Bb]Bémol
[C#]Dièse [C#]Dièse
@ -16,4 +15,3 @@
[Ab B#/A]Plusieurs notes à la suite [Ab B#/A]Plusieurs notes à la suite
[E5/A*]Avec une étoile [E5/A*]Avec une étoile
[B#+8]Avec un plus [B#+8]Avec un plus
{end_of_verse}

12
test/test_chordpro/greensleeves.sgc

@ -8,16 +8,12 @@
{cov: traditionnel} {cov: traditionnel}
{partition: greensleeves.ly} {partition: greensleeves.ly}
{start_of_verse}
A[Am]las, my love, ye [G]do me wrong A[Am]las, my love, ye [G]do me wrong
To [Am]cast me oft dis[E]curteously To [Am]cast me oft dis[E]curteously
And [Am]I have loved [G]you so long And [Am]I have loved [G]you so long
De[Am]lighting [E]in your [Am]companie De[Am]lighting [E]in your [Am]companie
{end_of_verse}
{start_of_chorus} {start_of_chorus}
@ -28,33 +24,25 @@
{end_of_chorus} {end_of_chorus}
{start_of_verse}
I [Am]have been ready [G]at your hand I [Am]have been ready [G]at your hand
To [Am]grant what ever [E]you would crave To [Am]grant what ever [E]you would crave
I [Am]have both waged [G]life and land I [Am]have both waged [G]life and land
Your [Am]love and [E]good will [Am]for to have Your [Am]love and [E]good will [Am]for to have
{end_of_verse}
{start_of_verse}
I [Am]bought thee kerchers [G]to thy head I [Am]bought thee kerchers [G]to thy head
That [Am]were wrought fine and [E]gallantly That [Am]were wrought fine and [E]gallantly
I [Am]kept thee both at [G]boord and bed I [Am]kept thee both at [G]boord and bed
Which [Am]cost my [E]purse well [Am]favouredly Which [Am]cost my [E]purse well [Am]favouredly
{end_of_verse}
{start_of_verse}
I [Am]bought thee peticotes [G]of the best I [Am]bought thee peticotes [G]of the best
The [Am]cloth so fine as [E]fine might be The [Am]cloth so fine as [E]fine might be
I [Am]gave thee jewels [G]for thy chest I [Am]gave thee jewels [G]for thy chest
And [Am]all this [E]cost I [Am]spent on thee And [Am]all this [E]cost I [Am]spent on thee
{end_of_verse}
{start_of_verse}
Thy [Am]smock of silke, both [G]faire and white Thy [Am]smock of silke, both [G]faire and white
With [Am]gold embrodered [E]gorgeously With [Am]gold embrodered [E]gorgeously
Thy [Am]peticote of [G]sendall right Thy [Am]peticote of [G]sendall right
And [Am]this I [E]bought thee [Am]gladly And [Am]this I [E]bought thee [Am]gladly
{end_of_verse}

2
test/test_chordpro/invalid_chord.sgc

@ -1,5 +1,3 @@
{language: english} {language: english}
{start_of_verse}
This is invalid. This is invalid.
{end_of_verse}

Loading…
Cancel
Save