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. 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} diff --git a/templates/data.tex b/templates/data.tex index 0d1e166e..d7ae1d8a 100644 --- a/templates/data.tex +++ b/templates/data.tex @@ -21,6 +21,38 @@ { "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"} + }, +"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 *) @@ -30,6 +62,41 @@ (* block preambule *) \usepackage{licence} + +%! Font management +\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 +%! End of font management + +\geometry{((orientation)), ((papersize))paper} (* endblock *) (* block preface *)