From 3b97b5ad140ac524e28e6313334ec2899fd0bbd6 Mon Sep 17 00:00:00 2001 From: Oliverpool Date: Mon, 14 Sep 2015 20:53:32 +0200 Subject: [PATCH] Remove {start/end_of_verse}, fix #91 --- .../chordpro/data/chordpro/content_newline | 1 - .../chordpro/data/chordpro/content_verse | 6 +++ test/test_chordpro/01.sgc | 4 +- test/test_chordpro/08.sgc | 5 +- test/test_chordpro/09.sgc | 5 +- test/test_chordpro/10.sgc | 4 +- test/test_chordpro/11.sgc | 4 +- test/test_chordpro/12.sgc | 4 +- test/test_chordpro/21.sgc | 4 +- test/test_chordpro/28.sgc | 5 +- test/test_chordpro/29.sgc | 5 +- test/test_chordpro/chords.sgc | 32 ++++++------ test/test_chordpro/greensleeves.sgc | 52 +++++++------------ test/test_chordpro/invalid_chord.sgc | 4 +- 14 files changed, 51 insertions(+), 84 deletions(-) diff --git a/patacrep/songs/chordpro/data/chordpro/content_newline b/patacrep/songs/chordpro/data/chordpro/content_newline index 139597f9..8b137891 100644 --- a/patacrep/songs/chordpro/data/chordpro/content_newline +++ b/patacrep/songs/chordpro/data/chordpro/content_newline @@ -1,2 +1 @@ - diff --git a/patacrep/songs/chordpro/data/chordpro/content_verse b/patacrep/songs/chordpro/data/chordpro/content_verse index 465e7697..cd562cea 100644 --- 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 -*) diff --git a/test/test_chordpro/01.sgc b/test/test_chordpro/01.sgc index ae7eabc4..25d6a677 100644 --- 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 verse line diff --git a/test/test_chordpro/08.sgc b/test/test_chordpro/08.sgc index 61224d41..9a9f0566 100644 --- 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 lot of new lines diff --git a/test/test_chordpro/09.sgc b/test/test_chordpro/09.sgc index 942a91e1..193db1b0 100644 --- 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 lot of new lines diff --git a/test/test_chordpro/10.sgc b/test/test_chordpro/10.sgc index 23bce4fa..e7537b3b 100644 --- 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 line[A] with a chord diff --git a/test/test_chordpro/11.sgc b/test/test_chordpro/11.sgc index 79d44702..3610f67c 100644 --- 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 line ending with a chord[A] diff --git a/test/test_chordpro/12.sgc b/test/test_chordpro/12.sgc index 6afb5bf8..029ccad4 100644 --- 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]A line starting with a chord diff --git a/test/test_chordpro/21.sgc b/test/test_chordpro/21.sgc index ae7eabc4..25d6a677 100644 --- 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 verse line diff --git a/test/test_chordpro/28.sgc b/test/test_chordpro/28.sgc index 61224d41..9a9f0566 100644 --- 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 lot of new lines diff --git a/test/test_chordpro/29.sgc b/test/test_chordpro/29.sgc index 942a91e1..193db1b0 100644 --- 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 lot of new lines diff --git a/test/test_chordpro/chords.sgc b/test/test_chordpro/chords.sgc index 942a0223..040dcf07 100644 --- a/test/test_chordpro/chords.sgc +++ b/test/test_chordpro/chords.sgc @@ -1,19 +1,17 @@ {language: english} -{start_of_verse} - [A]Simple - [Bb]Bémol - [C#]Dièse - [Adim]dim - [Dmaj]maj - [Em3]m chiffre - [G4]Nombre - [Emaj3]maj et nombre - [Absus8]bémol, sus et nombre - [A/A]Deux notes - [F/Fb]Deux notes, bémol - [B/C#]Deux notes, dièse - [Ab B#/A]Plusieurs notes à la suite - [E5/A*]Avec une étoile - [B#+8]Avec un plus -{end_of_verse} +[A]Simple +[Bb]Bémol +[C#]Dièse +[Adim]dim +[Dmaj]maj +[Em3]m chiffre +[G4]Nombre +[Emaj3]maj et nombre +[Absus8]bémol, sus et nombre +[A/A]Deux notes +[F/Fb]Deux notes, bémol +[B/C#]Deux notes, dièse +[Ab B#/A]Plusieurs notes à la suite +[E5/A*]Avec une étoile +[B#+8]Avec un plus diff --git a/test/test_chordpro/greensleeves.sgc b/test/test_chordpro/greensleeves.sgc index ba6081a2..566669b0 100644 --- 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} +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 {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} +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 -{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} +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 -{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} +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 -{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} +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 diff --git a/test/test_chordpro/invalid_chord.sgc b/test/test_chordpro/invalid_chord.sgc index 7ec4fd65..acb5444f 100644 --- 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} +This is invalid.