Merge pull request #96 from patacrep/fix_verse

Remove {start/end_of_verse}

patacrep/songs/chordpro/data/chordpro/content_newline

@@ -1,2 +1 @@
 
-

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 -*)

test/test_chordpro/01.sgc

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

test/test_chordpro/08.sgc

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

test/test_chordpro/09.sgc

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

test/test_chordpro/10.sgc

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

test/test_chordpro/11.sgc

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

test/test_chordpro/12.sgc

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

test/test_chordpro/21.sgc

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

test/test_chordpro/28.sgc

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

test/test_chordpro/29.sgc

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

test/test_chordpro/chords.sgc

@@ -1,19 +1,17 @@
 {language: english}
 
-{start_of_verse}
+[A]Simple
-    [A]Simple
+[Bb]Bémol
-    [Bb]Bémol
+[C#]Dièse
-    [C#]Dièse
+[Adim]dim
-    [Adim]dim
+[Dmaj]maj
-    [Dmaj]maj
+[Em3]m chiffre
-    [Em3]m chiffre
+[G4]Nombre
-    [G4]Nombre
+[Emaj3]maj et nombre
-    [Emaj3]maj et nombre
+[Absus8]bémol, sus et nombre
-    [Absus8]bémol, sus et nombre
+[A/A]Deux notes
-    [A/A]Deux notes
+[F/Fb]Deux notes, bémol
-    [F/Fb]Deux notes, bémol
+[B/C#]Deux notes, dièse
-    [B/C#]Deux notes, dièse
+[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}

test/test_chordpro/greensleeves.sgc

@@ -8,16 +8,12 @@
 {cov: traditionnel}
 
 
-
 {partition: greensleeves.ly}
 
-
+A[Am]las, my love, ye [G]do me wrong
-{start_of_verse}
+To [Am]cast me oft dis[E]curteously
-    A[Am]las, my love, ye [G]do me wrong
+And [Am]I have loved [G]you so long
-    To [Am]cast me oft dis[E]curteously
+De[Am]lighting [E]in your [Am]companie
-    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
-    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}

test/test_chordpro/invalid_chord.sgc

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