From 0389a320b11b665783b71a709a614b7f43563633 Mon Sep 17 00:00:00 2001 From: Luthaf Date: Wed, 7 May 2014 20:23:38 +0100 Subject: [PATCH 1/3] Fix songs syntax with the new booleans --- songs/barbara/l_aigle_noir.sg | 3 +-- songs/bruce_springsteen/pay_me_my_money_down.sg | 3 +-- songs/le_donjon_de_naheulbeuk/chicken_quest.sg | 8 ++++---- songs/michel_sardou/les_lacs_du_connemara.sg | 3 +-- songs/roger_glover/love_is_all.sg | 2 +- 5 files changed, 8 insertions(+), 11 deletions(-) diff --git a/songs/barbara/l_aigle_noir.sg b/songs/barbara/l_aigle_noir.sg index 7c2bfa5a..8039773a 100644 --- a/songs/barbara/l_aigle_noir.sg +++ b/songs/barbara/l_aigle_noir.sg @@ -10,8 +10,7 @@ \gtab{D}{XX0232} \gtab{B&}{1:X02220} \gtab{E&}{6:X02220} - \ifnorepeatchords% - \else% + \ifrepeatchords% \gtab{G}{320003} \gtab{Am}{X02210} \gtab{E}{022100} diff --git a/songs/bruce_springsteen/pay_me_my_money_down.sg b/songs/bruce_springsteen/pay_me_my_money_down.sg index 1e3026cd..43c01f65 100644 --- a/songs/bruce_springsteen/pay_me_my_money_down.sg +++ b/songs/bruce_springsteen/pay_me_my_money_down.sg @@ -6,8 +6,7 @@ \cover \gtab{G}{320003} \gtab{D}{XX0232} - \ifnorepeatchords% - \else% + \ifrepeatchords% \gtab{B&}{1:X02220} \gtab{F}{1:022100} \fi% diff --git a/songs/le_donjon_de_naheulbeuk/chicken_quest.sg b/songs/le_donjon_de_naheulbeuk/chicken_quest.sg index 8e7e6103..7bfc011a 100644 --- a/songs/le_donjon_de_naheulbeuk/chicken_quest.sg +++ b/songs/le_donjon_de_naheulbeuk/chicken_quest.sg @@ -13,16 +13,16 @@ \gtab{E}{022100} \gtab{Dm}{XX0231} \gtab{G#}{4:022100} - \ifnorepeatchords% - \gtab*{G6}{320000} - \gtab{F#7}{2:020100} - \else% + \ifrepeatchords% \gtab{Cm}{3:X02210} \gtab{E&}{3:X32010} \gtab{B&}{1:X02220} \gtab{A&}{4:022100} \gtab*{B&6}{3:020000} \gtab{A7}{X02020} + \else% + \gtab*{G6}{320000} + \gtab{F#7}{2:020100} \fi% \textnote{\Intro} diff --git a/songs/michel_sardou/les_lacs_du_connemara.sg b/songs/michel_sardou/les_lacs_du_connemara.sg index 574099b0..dfd0beef 100644 --- a/songs/michel_sardou/les_lacs_du_connemara.sg +++ b/songs/michel_sardou/les_lacs_du_connemara.sg @@ -10,8 +10,7 @@ \gtab{Dm}{XX0231} \gtab{Gm}{1:022000} \gtab{D7}{XX0212} - \ifnorepeatchords% - \else% + \ifrepeatchords% \gtab{Gm7}{1:022030} \gtab{G#}{3:022100} \gtab{C#}{1:X32010} diff --git a/songs/roger_glover/love_is_all.sg b/songs/roger_glover/love_is_all.sg index f69914b1..c78fd45b 100644 --- a/songs/roger_glover/love_is_all.sg +++ b/songs/roger_glover/love_is_all.sg @@ -54,7 +54,7 @@ It's ea\[G]sy, yes it's so \[C]easy At the \[Am]Butterfly Ball where \[D]love is all And \[G]it's so \[C]easy - \ifnorepeatchords\else\nolyrics{ | \[B] | \[E] | \[A] | \[D] | \rep{4} }\fi + \ifrepeatchords\nolyrics{ | \[B] | \[E] | \[A] | \[D] | \rep{4} }\fi \end{chorus} \begin{verse} From 5abf28f427a9bb22acaf310879d66e451bd76767 Mon Sep 17 00:00:00 2001 From: Luthaf Date: Thu, 8 May 2014 22:54:45 +0100 Subject: [PATCH 2/3] Correction d'un plantage LaTeX --- books/lyricbook.sb | 2 +- books/lyricbook_en.sb | 2 +- books/lyricbook_fr.sb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/books/lyricbook.sb b/books/lyricbook.sb index fea74e3e..82a8ef98 100644 --- a/books/lyricbook.sb +++ b/books/lyricbook.sb @@ -3,7 +3,7 @@ "lang" : "french", "bookoptions" : [], "booktype" : "lyric", -"author" : "Crep (R.Goffe) \\and Lohrun (A.Dupas)", +"author" : "Crep (R.Goffe) and Lohrun (A.Dupas)", "subtitle" : "parolier", "title" : "Recueil de chansons", "authwords" : { diff --git a/books/lyricbook_en.sb b/books/lyricbook_en.sb index 853d5e67..7e6dde22 100644 --- a/books/lyricbook_en.sb +++ b/books/lyricbook_en.sb @@ -3,7 +3,7 @@ "lang" : "english", "bookoptions" : [], "booktype" : "lyric", -"author" : "Crep (R.Goffe) \\and Lohrun (A.Dupas)", +"author" : "Crep (R.Goffe) and Lohrun (A.Dupas)", "subtitle" : "lyrics", "authwords" : { "sep" : ["and", "et"] diff --git a/books/lyricbook_fr.sb b/books/lyricbook_fr.sb index 871b1493..c556cf48 100644 --- a/books/lyricbook_fr.sb +++ b/books/lyricbook_fr.sb @@ -3,7 +3,7 @@ "lang" : "french", "bookoptions" : [], "booktype" : "lyric", -"author" : "Crep (R.Goffe) \\and Lohrun (A.Dupas)", +"author" : "Crep (R.Goffe) and Lohrun (A.Dupas)", "subtitle" : "parolier", "authwords" : { "sep" : ["and", "et"] From 21739a7b7e86d3036a37302b414d206ee89a4835 Mon Sep 17 00:00:00 2001 From: Louis Date: Fri, 16 May 2014 19:54:39 +0200 Subject: [PATCH 3/3] Revert "Correction d'un plantage LaTeX" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit La commande `\and` est une commande parfaitement valide pour les listes d'auteurs en LaTeX. Si elle lève une erreur, c'est ailleurs qu'il faut corriger quelque chose. - Commentaire expliquant l'erreur : https://github.com/patacrep/songbook-core/pull/32#issuecomment-42860258 - Correction de l'erreur : https://github.com/patacrep/songbook-core/commit/baed32f3de7468e27466b2e88afedaf37e05fc18 This reverts commit 5abf28f427a9bb22acaf310879d66e451bd76767. --- books/lyricbook.sb | 2 +- books/lyricbook_en.sb | 2 +- books/lyricbook_fr.sb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/books/lyricbook.sb b/books/lyricbook.sb index 82a8ef98..fea74e3e 100644 --- a/books/lyricbook.sb +++ b/books/lyricbook.sb @@ -3,7 +3,7 @@ "lang" : "french", "bookoptions" : [], "booktype" : "lyric", -"author" : "Crep (R.Goffe) and Lohrun (A.Dupas)", +"author" : "Crep (R.Goffe) \\and Lohrun (A.Dupas)", "subtitle" : "parolier", "title" : "Recueil de chansons", "authwords" : { diff --git a/books/lyricbook_en.sb b/books/lyricbook_en.sb index 7e6dde22..853d5e67 100644 --- a/books/lyricbook_en.sb +++ b/books/lyricbook_en.sb @@ -3,7 +3,7 @@ "lang" : "english", "bookoptions" : [], "booktype" : "lyric", -"author" : "Crep (R.Goffe) and Lohrun (A.Dupas)", +"author" : "Crep (R.Goffe) \\and Lohrun (A.Dupas)", "subtitle" : "lyrics", "authwords" : { "sep" : ["and", "et"] diff --git a/books/lyricbook_fr.sb b/books/lyricbook_fr.sb index c556cf48..871b1493 100644 --- a/books/lyricbook_fr.sb +++ b/books/lyricbook_fr.sb @@ -3,7 +3,7 @@ "lang" : "french", "bookoptions" : [], "booktype" : "lyric", -"author" : "Crep (R.Goffe) and Lohrun (A.Dupas)", +"author" : "Crep (R.Goffe) \\and Lohrun (A.Dupas)", "subtitle" : "parolier", "authwords" : { "sep" : ["and", "et"]