diff --git a/patacrep/songs/chordpro/data/latex/content_chordlist b/patacrep/songs/chordpro/data/latex/content_chordlist index d5ad7c3c..5ff3fa6b 100644 --- a/patacrep/songs/chordpro/data/latex/content_chordlist +++ b/patacrep/songs/chordpro/data/latex/content_chordlist @@ -1,6 +1,8 @@ +(* if content.chords *) \[ (*- for chord in content.chords -*) (* if not loop.first *) (* endif -*) (( render(chord) -)) (* endfor -*) ] +(*- endif -*) diff --git a/patacrep/songs/chordpro/data/latex/content_tablature b/patacrep/songs/chordpro/data/latex/content_tablature new file mode 100644 index 00000000..e4036783 --- /dev/null +++ b/patacrep/songs/chordpro/data/latex/content_tablature @@ -0,0 +1,4 @@ +% TODO TABLATURE +% (* for foo in content.content *) +% (( foo )) +% (* endfor *) diff --git a/patacrep/songs/chordpro/data/latex/content_verse b/patacrep/songs/chordpro/data/latex/content_verse index ac169e98..b6065a7f 100644 --- a/patacrep/songs/chordpro/data/latex/content_verse +++ b/patacrep/songs/chordpro/data/latex/content_verse @@ -1,5 +1,5 @@ \begin{(( content.type ))} - (* for line in content.lines -*) - (( render(line) )) - (* endfor *) + (* for line in content.lines *) + (( render(line) )) + (* endfor *) \end{(( content.type ))} diff --git a/patacrep/songs/chordpro/data/latex/song b/patacrep/songs/chordpro/data/latex/song index 4664d52f..ccc2742a 100644 --- a/patacrep/songs/chordpro/data/latex/song +++ b/patacrep/songs/chordpro/data/latex/song @@ -33,7 +33,7 @@ \cover (* endif *) -(*- for chord in metadata['define'] *) +(*- for chord in metadata['define'] -*) (( render(chord) )) (* endfor *) diff --git a/patacrep/songs/chordpro/test/00.tex b/patacrep/songs/chordpro/test/00.tex new file mode 100644 index 00000000..bd99a922 --- /dev/null +++ b/patacrep/songs/chordpro/test/00.tex @@ -0,0 +1,10 @@ +\selectlanguage{english} + +\beginsong{}[ + by={ + }, +] + + + +\endsong diff --git a/patacrep/songs/chordpro/test/01.tex b/patacrep/songs/chordpro/test/01.tex new file mode 100644 index 00000000..15825e69 --- /dev/null +++ b/patacrep/songs/chordpro/test/01.tex @@ -0,0 +1,13 @@ +\selectlanguage{english} + +\beginsong{}[ + by={ + }, +] + + +\begin{verse} + A verse line +\end{verse} + +\endsong diff --git a/patacrep/songs/chordpro/test/03.tex b/patacrep/songs/chordpro/test/03.tex new file mode 100644 index 00000000..c2d0cc18 --- /dev/null +++ b/patacrep/songs/chordpro/test/03.tex @@ -0,0 +1,12 @@ +\selectlanguage{english} + +\beginsong{}[ + by={ + }, +] + + + + + +\endsong diff --git a/patacrep/songs/chordpro/test/04.tex b/patacrep/songs/chordpro/test/04.tex new file mode 100644 index 00000000..d25d81fd --- /dev/null +++ b/patacrep/songs/chordpro/test/04.tex @@ -0,0 +1,13 @@ +\selectlanguage{english} + +\beginsong{}[ + by={ + }, +] + + +\begin{chorus} + A one line chorus +\end{chorus} + +\endsong diff --git a/patacrep/songs/chordpro/test/05.tex b/patacrep/songs/chordpro/test/05.tex new file mode 100644 index 00000000..be4a189b --- /dev/null +++ b/patacrep/songs/chordpro/test/05.tex @@ -0,0 +1,13 @@ +\selectlanguage{english} + +\beginsong{}[ + by={ + }, +] + + +\begin{bridge} + A one line bridge +\end{bridge} + +\endsong diff --git a/patacrep/songs/chordpro/test/06.tex b/patacrep/songs/chordpro/test/06.tex new file mode 100644 index 00000000..c2d0cc18 --- /dev/null +++ b/patacrep/songs/chordpro/test/06.tex @@ -0,0 +1,12 @@ +\selectlanguage{english} + +\beginsong{}[ + by={ + }, +] + + + + + +\endsong diff --git a/patacrep/songs/chordpro/test/07.tex b/patacrep/songs/chordpro/test/07.tex new file mode 100644 index 00000000..6b8b48c7 --- /dev/null +++ b/patacrep/songs/chordpro/test/07.tex @@ -0,0 +1,13 @@ +\selectlanguage{english} + +\beginsong{}[ + by={ + }, +] + + +% TODO TABLATURE +% % A tab +% + +\endsong diff --git a/patacrep/songs/chordpro/test/08.tex b/patacrep/songs/chordpro/test/08.tex new file mode 100644 index 00000000..70c26f87 --- /dev/null +++ b/patacrep/songs/chordpro/test/08.tex @@ -0,0 +1,17 @@ +\selectlanguage{english} + +\beginsong{}[ + by={ + }, +] + + + + +\begin{verse} + A lot of new lines +\end{verse} + + + +\endsong diff --git a/patacrep/songs/chordpro/test/09.tex b/patacrep/songs/chordpro/test/09.tex new file mode 100644 index 00000000..c57b285f --- /dev/null +++ b/patacrep/songs/chordpro/test/09.tex @@ -0,0 +1,17 @@ +\selectlanguage{english} + +\beginsong{and a directive}[ + by={ + }, +] + + + + +\begin{verse} + A lot of new lines +\end{verse} + + + +\endsong diff --git a/patacrep/songs/chordpro/test/10.tex b/patacrep/songs/chordpro/test/10.tex new file mode 100644 index 00000000..b17d3999 --- /dev/null +++ b/patacrep/songs/chordpro/test/10.tex @@ -0,0 +1,13 @@ +\selectlanguage{english} + +\beginsong{}[ + by={ + }, +] + + +\begin{verse} + A line\[A] with a chord +\end{verse} + +\endsong diff --git a/patacrep/songs/chordpro/test/11.tex b/patacrep/songs/chordpro/test/11.tex new file mode 100644 index 00000000..e5ed4113 --- /dev/null +++ b/patacrep/songs/chordpro/test/11.tex @@ -0,0 +1,13 @@ +\selectlanguage{english} + +\beginsong{}[ + by={ + }, +] + + +\begin{verse} + A line ending with a chord\[A] +\end{verse} + +\endsong diff --git a/patacrep/songs/chordpro/test/12.tex b/patacrep/songs/chordpro/test/12.tex new file mode 100644 index 00000000..ec3aca08 --- /dev/null +++ b/patacrep/songs/chordpro/test/12.tex @@ -0,0 +1,13 @@ +\selectlanguage{english} + +\beginsong{}[ + by={ + }, +] + + +\begin{verse} + \[A]A line starting with a chord +\end{verse} + +\endsong diff --git a/patacrep/songs/chordpro/test/13.tex b/patacrep/songs/chordpro/test/13.tex new file mode 100644 index 00000000..18ed8f96 --- /dev/null +++ b/patacrep/songs/chordpro/test/13.tex @@ -0,0 +1,15 @@ +\selectlanguage{english} + +\beginsong{}[ + by={ + }, +] + + +% TODO TABLATURE +% % A table +% % wit many # weir [ +% % [ symbols +% + +\endsong diff --git a/patacrep/songs/chordpro/test/21.tex b/patacrep/songs/chordpro/test/21.tex new file mode 100644 index 00000000..15825e69 --- /dev/null +++ b/patacrep/songs/chordpro/test/21.tex @@ -0,0 +1,13 @@ +\selectlanguage{english} + +\beginsong{}[ + by={ + }, +] + + +\begin{verse} + A verse line +\end{verse} + +\endsong diff --git a/patacrep/songs/chordpro/test/22.tex b/patacrep/songs/chordpro/test/22.tex new file mode 100644 index 00000000..b3ec6f17 --- /dev/null +++ b/patacrep/songs/chordpro/test/22.tex @@ -0,0 +1,10 @@ +\selectlanguage{english} + +\beginsong{A directive}[ + by={ + }, +] + + + +\endsong diff --git a/patacrep/songs/chordpro/test/23.tex b/patacrep/songs/chordpro/test/23.tex new file mode 100644 index 00000000..c2d0cc18 --- /dev/null +++ b/patacrep/songs/chordpro/test/23.tex @@ -0,0 +1,12 @@ +\selectlanguage{english} + +\beginsong{}[ + by={ + }, +] + + + + + +\endsong diff --git a/patacrep/songs/chordpro/test/24.tex b/patacrep/songs/chordpro/test/24.tex new file mode 100644 index 00000000..d25d81fd --- /dev/null +++ b/patacrep/songs/chordpro/test/24.tex @@ -0,0 +1,13 @@ +\selectlanguage{english} + +\beginsong{}[ + by={ + }, +] + + +\begin{chorus} + A one line chorus +\end{chorus} + +\endsong diff --git a/patacrep/songs/chordpro/test/25.tex b/patacrep/songs/chordpro/test/25.tex new file mode 100644 index 00000000..be4a189b --- /dev/null +++ b/patacrep/songs/chordpro/test/25.tex @@ -0,0 +1,13 @@ +\selectlanguage{english} + +\beginsong{}[ + by={ + }, +] + + +\begin{bridge} + A one line bridge +\end{bridge} + +\endsong diff --git a/patacrep/songs/chordpro/test/26.tex b/patacrep/songs/chordpro/test/26.tex new file mode 100644 index 00000000..c2d0cc18 --- /dev/null +++ b/patacrep/songs/chordpro/test/26.tex @@ -0,0 +1,12 @@ +\selectlanguage{english} + +\beginsong{}[ + by={ + }, +] + + + + + +\endsong diff --git a/patacrep/songs/chordpro/test/27.tex b/patacrep/songs/chordpro/test/27.tex new file mode 100644 index 00000000..6b8b48c7 --- /dev/null +++ b/patacrep/songs/chordpro/test/27.tex @@ -0,0 +1,13 @@ +\selectlanguage{english} + +\beginsong{}[ + by={ + }, +] + + +% TODO TABLATURE +% % A tab +% + +\endsong diff --git a/patacrep/songs/chordpro/test/28.tex b/patacrep/songs/chordpro/test/28.tex new file mode 100644 index 00000000..70c26f87 --- /dev/null +++ b/patacrep/songs/chordpro/test/28.tex @@ -0,0 +1,17 @@ +\selectlanguage{english} + +\beginsong{}[ + by={ + }, +] + + + + +\begin{verse} + A lot of new lines +\end{verse} + + + +\endsong diff --git a/patacrep/songs/chordpro/test/29.tex b/patacrep/songs/chordpro/test/29.tex new file mode 100644 index 00000000..c57b285f --- /dev/null +++ b/patacrep/songs/chordpro/test/29.tex @@ -0,0 +1,17 @@ +\selectlanguage{english} + +\beginsong{and a directive}[ + by={ + }, +] + + + + +\begin{verse} + A lot of new lines +\end{verse} + + + +\endsong diff --git a/patacrep/songs/chordpro/test/chords.tex b/patacrep/songs/chordpro/test/chords.tex new file mode 100644 index 00000000..9bb98002 --- /dev/null +++ b/patacrep/songs/chordpro/test/chords.tex @@ -0,0 +1,25 @@ +\selectlanguage{english} + +\beginsong{}[ + by={ + }, +] + + +\begin{verse} + \[A]Simple + \[B&]Bémol + \[C#]Dièse + \[Adim]dim + \[Dmaj]maj + \[Em3]m chiffre + \[G4]Nombre + \[Emaj3]maj et nombre + \[A&sus8]bémol, sus et nombre + \[A/A]Deux notes + \[F/F&]Deux notes, bémol + \[B/C#]Deux notes, dièse + \[A& B#/A]Plusieurs notes à la suite +\end{verse} + +\endsong diff --git a/patacrep/songs/chordpro/test/customchords.tex b/patacrep/songs/chordpro/test/customchords.tex new file mode 100644 index 00000000..3f2000b2 --- /dev/null +++ b/patacrep/songs/chordpro/test/customchords.tex @@ -0,0 +1,12 @@ +\selectlanguage{english} + +\beginsong{}[ + by={ + }, +] + +\gtab{E4}{7:0133XX} +\gtab{E5}{7:0133XX:012300} + + +\endsong diff --git a/patacrep/songs/chordpro/test/greensleeves.tex b/patacrep/songs/chordpro/test/greensleeves.tex new file mode 100644 index 00000000..4c2aac43 --- /dev/null +++ b/patacrep/songs/chordpro/test/greensleeves.tex @@ -0,0 +1,67 @@ +\selectlanguage{english} +\songcolumns{2} + +\beginsong{Greensleeves\\ +Un autre sous-titre\\ +Un sous titre}[ + by={ + Traditionnel }, + album={Angleterre}, + cov={DIRNAME/traditionnel}, +] + +\cover + + + +\lilypond{DIRNAME/greensleeves.ly} + + +\begin{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{verse} + + +\begin{chorus} + \[C]Green\[B]sleeves was \[G]all my joy + \[Am]Greensleeves was \[E]my delight + \[C]Greensleeves was my \[G]heart of gold + And \[Am]who but \[E]Ladie \[Am]Greensleeves +\end{chorus} + + +\begin{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{verse} + + +\begin{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{verse} + + +\begin{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{verse} + + +\begin{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{verse} + +\endsong diff --git a/patacrep/songs/chordpro/test/invalid_chord.tex b/patacrep/songs/chordpro/test/invalid_chord.tex new file mode 100644 index 00000000..8e874988 --- /dev/null +++ b/patacrep/songs/chordpro/test/invalid_chord.tex @@ -0,0 +1,15 @@ +\selectlanguage{english} + +\beginsong{}[ + by={ + }, +] + + +\begin{verse} + This is invalid. + This \[A]too. + And as well. +\end{verse} + +\endsong diff --git a/patacrep/songs/chordpro/test/invalid_customchord.tex b/patacrep/songs/chordpro/test/invalid_customchord.tex new file mode 100644 index 00000000..bd99a922 --- /dev/null +++ b/patacrep/songs/chordpro/test/invalid_customchord.tex @@ -0,0 +1,10 @@ +\selectlanguage{english} + +\beginsong{}[ + by={ + }, +] + + + +\endsong diff --git a/patacrep/songs/chordpro/test/metadata.tex b/patacrep/songs/chordpro/test/metadata.tex new file mode 100644 index 00000000..6bb1f6eb --- /dev/null +++ b/patacrep/songs/chordpro/test/metadata.tex @@ -0,0 +1,25 @@ +\selectlanguage{french} + +\beginsong{Title\\ +Subtitle1\\ +Subtitle2\\ +Subtitle3\\ +Subtitle4\\ +Subtitle5}[ + by={ + Author1, + Author2 }, + album={Album}, + copyright={Copyright}, + cov={DIRNAME/Cover}, + vcov={VCover}, +] + +\cover + +\textnote{Comment} +\musicnote{GuitarComment} +\image{DIRNAME/Image} +\lilypond{DIRNAME/Lilypond} + +\endsong