From 0389a320b11b665783b71a709a614b7f43563633 Mon Sep 17 00:00:00 2001 From: Luthaf Date: Wed, 7 May 2014 20:23:38 +0100 Subject: [PATCH 1/8] 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/8] 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 fc6426ff51dbb358c3363e27d57b455ed9f9f0ed Mon Sep 17 00:00:00 2001 From: Luthaf Date: Tue, 13 May 2014 17:36:36 +0200 Subject: [PATCH 3/8] Doublon. --- songs/anonymous/vent_frais.sg | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 songs/anonymous/vent_frais.sg diff --git a/songs/anonymous/vent_frais.sg b/songs/anonymous/vent_frais.sg deleted file mode 100644 index 8f8b5510..00000000 --- a/songs/anonymous/vent_frais.sg +++ /dev/null @@ -1,12 +0,0 @@ -\selectlanguage{french} -\songcolumns{1} -\beginsong{Vent frais}[ - by={}] -\begin{verse*} - \[Em]Vent \[B7]frais - \[Em]Vent du \[B7]matin - \[Em]Vent qui \[B7]souffle au \[Em]sommet des grands \[B7]pins - \[Em]Joie du \[B7]vent qui \[Em]soufle - Al\[B7]lons dans le grand \[Em]vent \dots -\end{verse*} -\endsong From 21739a7b7e86d3036a37302b414d206ee89a4835 Mon Sep 17 00:00:00 2001 From: Louis Date: Fri, 16 May 2014 19:54:39 +0200 Subject: [PATCH 4/8] 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"] From a1eca37f809bbcf6e49c5ef1cdf930ad580cddac Mon Sep 17 00:00:00 2001 From: Luthaf Date: Sat, 24 May 2014 16:43:16 +0100 Subject: [PATCH 5/8] =?UTF-8?q?Template=20avec=20des=20possibilit=C3=A9s?= =?UTF-8?q?=20de=20changements=20des=20polices?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Pour l'utiliser il faut régler les options chordfont, chorusfont et versefont sur i (italique), b (gras) ou n (normal). La couleur des accords se règle en hexadécimal RGB avec chordcolor. --- templates/fonts.tex | 75 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) create mode 100644 templates/fonts.tex diff --git a/templates/fonts.tex b/templates/fonts.tex new file mode 100644 index 00000000..f25d2924 --- /dev/null +++ b/templates/fonts.tex @@ -0,0 +1,75 @@ +% Copyright (C) 2014 The Songbook Team +% +% This program is free software; you can redistribute it and/or +% modify it under the terms of the GNU General Public License +% as published by the Free Software Foundation; either version 2 +% of the License, or (at your option) any later version. +% +% This program is distributed in the hope that it will be useful, +% but WITHOUT ANY WARRANTY; without even the implied warranty of +% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +% GNU General Public License for more details. +% +% You should have received a copy of the GNU General Public License +% along with this program; if not, write to the Free Software +% Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +% MA 02110-1301, USA. + +(* variables *) +{ +"chordfont":{ "description": {"english": "Chord font", + "french": "Police des accords"}, + "default": {"default": "i"} + }, +"chordcolor":{ "description": {"english": "Chord color, HTML notation", + "french": "Couleur des accords en notation HTML"}, + "default": {"default": "000000"} + }, +"versefont":{ "description": {"english": "Verse font", + "french": "Police des couplets"}, + "default": {"default": ""} + }, +"chorusfont":{ "description": {"english": "Chorus font", + "french": "Police des refrains"}, + "default": {"default": "i"} + } +} +(* endvariables *) + +% begin document +(* extends "data.tex" *) + +(* block preambule *) +(( super() )) +\makeatletter +\renewcommand{\chorusfont}{% + (* for letter in chorusfont *) + (* if letter=="i" *) \it % + (* elif letter=='b' *) \bf % + (* elif letter=='n' *) \normalfont % + (* endif *) + (* endfor *) +} + +\def\@chordfont{% + (* for letter in chordfont *) + (* if letter=="i" *) \it % + (* elif letter=='b' *) \bf % + (* elif letter=='n' *) \normalfont % + (* endif *) + (* endfor *) +} +\definecolor{ChordColor}{HTML}{(( chordcolor ))} +\renewcommand{\printchord}[1]{\@chordfont\textcolor{ChordColor}{#1}} + +\renewcommand{\lyricfont}{% + (* for letter in versefont *) + (* if letter=="i" *) \it % + (* elif letter=='b' *) \bf % + (* elif letter=='n' *) \normalfont % + (* endif *) + (* endfor *) +} +\makeatother +(* endblock preambule *) +% end document From 9b10984628eb72431c3521e90b01deeb80ff7447 Mon Sep 17 00:00:00 2001 From: Luthaf Date: Mon, 26 May 2014 10:58:19 +0100 Subject: [PATCH 6/8] Ajout du choix des polices dans le template data --- templates/data.tex | 46 +++++++++++++++++++++++++++ templates/fonts.tex | 75 --------------------------------------------- 2 files changed, 46 insertions(+), 75 deletions(-) delete mode 100644 templates/fonts.tex diff --git a/templates/data.tex b/templates/data.tex index 0d1e166e..2bf1cfb0 100644 --- a/templates/data.tex +++ b/templates/data.tex @@ -21,6 +21,22 @@ { "version":{ "description": {"english": "Version", "french": "Version"}, "default": {"default": "3.7.2"} + }, +"chordfont":{ "description": {"english": "Chord font", + "french": "Police des accords"}, + "default": {"default": "i"} + }, +"chordcolor":{ "description": {"english": "Chord color, HTML notation", + "french": "Couleur des accords en notation HTML"}, + "default": {"default": "000000"} + }, +"versefont":{ "description": {"english": "Verse font", + "french": "Police des couplets"}, + "default": {"default": ""} + }, +"chorusfont":{ "description": {"english": "Chorus font", + "french": "Police des refrains"}, + "default": {"default": "i"} } } (* endvariables *) @@ -30,6 +46,36 @@ (* block preambule *) \usepackage{licence} +\makeatletter +\renewcommand{\chorusfont}{% + (* for letter in chorusfont *) + (* if letter=="i" *) \it % + (* elif letter=='b' *) \bf % + (* elif letter=='n' *) \normalfont % + (* endif *) + (* endfor *) +} + +\def\@chordfont{% + (* for letter in chordfont *) + (* if letter=="i" *) \it % + (* elif letter=='b' *) \bf % + (* elif letter=='n' *) \normalfont % + (* endif *) + (* endfor *) +} +\definecolor{ChordColor}{HTML}{(( chordcolor ))} +\renewcommand{\printchord}[1]{\@chordfont\textcolor{ChordColor}{#1}} + +\renewcommand{\lyricfont}{% + (* for letter in versefont *) + (* if letter=="i" *) \it % + (* elif letter=='b' *) \bf % + (* elif letter=='n' *) \normalfont % + (* endif *) + (* endfor *) +} +\makeatother (* endblock *) (* block preface *) diff --git a/templates/fonts.tex b/templates/fonts.tex deleted file mode 100644 index f25d2924..00000000 --- a/templates/fonts.tex +++ /dev/null @@ -1,75 +0,0 @@ -% Copyright (C) 2014 The Songbook Team -% -% This program is free software; you can redistribute it and/or -% modify it under the terms of the GNU General Public License -% as published by the Free Software Foundation; either version 2 -% of the License, or (at your option) any later version. -% -% This program is distributed in the hope that it will be useful, -% but WITHOUT ANY WARRANTY; without even the implied warranty of -% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -% GNU General Public License for more details. -% -% You should have received a copy of the GNU General Public License -% along with this program; if not, write to the Free Software -% Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, -% MA 02110-1301, USA. - -(* variables *) -{ -"chordfont":{ "description": {"english": "Chord font", - "french": "Police des accords"}, - "default": {"default": "i"} - }, -"chordcolor":{ "description": {"english": "Chord color, HTML notation", - "french": "Couleur des accords en notation HTML"}, - "default": {"default": "000000"} - }, -"versefont":{ "description": {"english": "Verse font", - "french": "Police des couplets"}, - "default": {"default": ""} - }, -"chorusfont":{ "description": {"english": "Chorus font", - "french": "Police des refrains"}, - "default": {"default": "i"} - } -} -(* endvariables *) - -% begin document -(* extends "data.tex" *) - -(* block preambule *) -(( super() )) -\makeatletter -\renewcommand{\chorusfont}{% - (* for letter in chorusfont *) - (* if letter=="i" *) \it % - (* elif letter=='b' *) \bf % - (* elif letter=='n' *) \normalfont % - (* endif *) - (* endfor *) -} - -\def\@chordfont{% - (* for letter in chordfont *) - (* if letter=="i" *) \it % - (* elif letter=='b' *) \bf % - (* elif letter=='n' *) \normalfont % - (* endif *) - (* endfor *) -} -\definecolor{ChordColor}{HTML}{(( chordcolor ))} -\renewcommand{\printchord}[1]{\@chordfont\textcolor{ChordColor}{#1}} - -\renewcommand{\lyricfont}{% - (* for letter in versefont *) - (* if letter=="i" *) \it % - (* elif letter=='b' *) \bf % - (* elif letter=='n' *) \normalfont % - (* endif *) - (* endfor *) -} -\makeatother -(* endblock preambule *) -% end document From ed421698ab23ac6cc8724a463374ce3d70f6e303 Mon Sep 17 00:00:00 2001 From: Luthaf Date: Mon, 26 May 2014 11:19:32 +0100 Subject: [PATCH 7/8] Ajout d'options pour la taille et l'orientation du papier --- templates/data.tex | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/templates/data.tex b/templates/data.tex index 2bf1cfb0..d7ae1d8a 100644 --- a/templates/data.tex +++ b/templates/data.tex @@ -37,6 +37,22 @@ "chorusfont":{ "description": {"english": "Chorus font", "french": "Police des refrains"}, "default": {"default": "i"} + }, +"papersize":{ "description": {"english": "Paper size.", + "french": "Taille du papier."}, + "type": "enum", + "values": {"a4": {"default": "A4"}, + "a5": {"default": "A5"} + }, + "default": {"default":"a4"} + }, +"orientation":{ "description": {"english": "Paper orientation.", + "french": "Orientation du papier."}, + "type": "enum", + "values": {"landscape": {"english": "Landscape", "french": "Paysage" }, + "portrait": {"english": "Portrait", "french": "Portrait" } + }, + "default": {"default":"portrait"} } } (* endvariables *) @@ -46,6 +62,8 @@ (* block preambule *) \usepackage{licence} + +%! Font management \makeatletter \renewcommand{\chorusfont}{% (* for letter in chorusfont *) @@ -76,6 +94,9 @@ (* endfor *) } \makeatother +%! End of font management + +\geometry{((orientation)), ((papersize))paper} (* endblock *) (* block preface *) From 045188a333125546f7274e86d8870de7d52d2d52 Mon Sep 17 00:00:00 2001 From: Luthaf Date: Mon, 26 May 2014 12:29:08 +0100 Subject: [PATCH 8/8] =?UTF-8?q?Gestion=20des=20tailles=20de=20papier=20dif?= =?UTF-8?q?f=C3=A9rentes=20pour=20la=20license?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- latex/license.tex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/latex/license.tex b/latex/license.tex index 6cbcb1fd..9e8cd4d5 100644 --- a/latex/license.tex +++ b/latex/license.tex @@ -124,7 +124,7 @@ \begin{lblock}{Informations complémentaires~:} \hspace{0.4cm} - \parbox{15cm}{ + \parbox{\textwidth-.8cm}{ \paragraph{Dérogation --} Chacune des conditions optionnelles peut être levée après l'autorisation du titulaire des droits.