Merge pull request #96 from patacrep/fix_verse

Remove {start/end_of_verse}
10 years ago · 7d7bdd0417
14 changed files with 51 additions and 84 deletions
--- a/patacrep/songs/chordpro/data/chordpro/content_newline
+++ b/patacrep/songs/chordpro/data/chordpro/content_newline
@ -1,2 +1 @@

-
--- a/patacrep/songs/chordpro/data/chordpro/content_verse
+++ b/patacrep/songs/chordpro/data/chordpro/content_verse
@ -1,5 +1,11 @@
+(*- if content.type != 'verse' -*)
 {start_of_(( content.type ))}
  (* for line in content.lines *)
    (( render(line) ))
  (* endfor *)
 {end_of_(( content.type ))}
+(* else -*)
+  (*- for line in content.lines -*)
+    (( render(line) ))
+  (* endfor -*)
+(*- endif -*)
--- a/test/test_chordpro/01.sgc
+++ b/test/test_chordpro/01.sgc
@ -1,5 +1,3 @@
 {language: english}

-{start_of_verse}
 A verse line
-{end_of_verse}
--- a/test/test_chordpro/08.sgc
+++ b/test/test_chordpro/08.sgc
@ -1,7 +1,4 @@
 {language: english}


-
-{start_of_verse}
 A lot of new lines
-{end_of_verse}
--- a/test/test_chordpro/09.sgc
+++ b/test/test_chordpro/09.sgc
@ -2,7 +2,4 @@
 {title: and a directive}


-
-{start_of_verse}
 A lot of new lines
-{end_of_verse}
--- a/test/test_chordpro/10.sgc
+++ b/test/test_chordpro/10.sgc
@ -1,5 +1,3 @@
 {language: english}

-{start_of_verse}
 A line[A] with a chord
-{end_of_verse}
--- a/test/test_chordpro/11.sgc
+++ b/test/test_chordpro/11.sgc
@ -1,5 +1,3 @@
 {language: english}

-{start_of_verse}
 A line ending with a chord[A]
-{end_of_verse}
--- a/test/test_chordpro/12.sgc
+++ b/test/test_chordpro/12.sgc
@ -1,5 +1,3 @@
 {language: english}

-{start_of_verse}
 [A]A line starting with a chord
-{end_of_verse}
--- a/test/test_chordpro/21.sgc
+++ b/test/test_chordpro/21.sgc
@ -1,5 +1,3 @@
 {language: english}

-{start_of_verse}
 A verse line
-{end_of_verse}
--- a/test/test_chordpro/28.sgc
+++ b/test/test_chordpro/28.sgc
@ -1,7 +1,4 @@
 {language: english}


-
-{start_of_verse}
 A lot of new lines
-{end_of_verse}
--- a/test/test_chordpro/29.sgc
+++ b/test/test_chordpro/29.sgc
@ -2,7 +2,4 @@
 {title: and a directive}


-
-{start_of_verse}
 A lot of new lines
-{end_of_verse}
--- a/test/test_chordpro/chords.sgc
+++ b/test/test_chordpro/chords.sgc
@ -1,6 +1,5 @@
 {language: english}

-{start_of_verse}
 [A]Simple
 [Bb]Bémol
 [C#]Dièse
@ -16,4 +15,3 @@
 [Ab B#/A]Plusieurs notes à la suite
 [E5/A*]Avec une étoile
 [B#+8]Avec un plus
-{end_of_verse}
--- a/test/test_chordpro/greensleeves.sgc
+++ b/test/test_chordpro/greensleeves.sgc
@ -8,16 +8,12 @@
 {cov: traditionnel}


-
 {partition: greensleeves.ly}

-
-{start_of_verse}
 A[Am]las, my love, ye [G]do me wrong
 To [Am]cast me oft dis[E]curteously
 And [Am]I have loved [G]you so long
 De[Am]lighting [E]in your [Am]companie
-{end_of_verse}


 {start_of_chorus}
@ -28,33 +24,25 @@
 {end_of_chorus}


-{start_of_verse}
 I [Am]have been ready [G]at your hand
 To [Am]grant what ever [E]you would crave
 I [Am]have both waged [G]life and land
 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
 That [Am]were wrought fine and [E]gallantly
 I [Am]kept thee both at [G]boord and bed
 Which [Am]cost my [E]purse well [Am]favouredly
-{end_of_verse}


-{start_of_verse}
 I [Am]bought thee peticotes [G]of the best
 The [Am]cloth so fine as [E]fine might be
 I [Am]gave thee jewels [G]for thy chest
 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
 With [Am]gold embrodered [E]gorgeously
 Thy [Am]peticote of [G]sendall right
 And [Am]this I [E]bought thee [Am]gladly
-{end_of_verse}
--- a/test/test_chordpro/invalid_chord.sgc
+++ b/test/test_chordpro/invalid_chord.sgc
@ -1,5 +1,3 @@
 {language: english}

-{start_of_verse}
 This is  invalid.
-{end_of_verse}