diff --git a/books/volume-3.sb b/books/volume-3.sb index e64b7ec0..70ddb61a 100644 --- a/books/volume-3.sb +++ b/books/volume-3.sb @@ -28,6 +28,7 @@ "Bruce_Springsteen/Mrs_McGrath.sg", "Bruce_Springsteen/Old_Dan_Tucker.sg", "Cat_Stevens/Wild_world.sg", + "Cesaria_Evora/Petit_pays.sg", "Charles_Aznavour/Les_comediens.sg", "Cookie_Dingler/Femme_liberee.sg", "Crep/Bioman.sg", @@ -48,10 +49,12 @@ "Elton_John/Can_you_fell_the_love_tonight.sg", "Elton_John/Crocodile_rock.sg", "Elvis_Presley/Don_t_be_cruel.sg", + "Elvis_Presley/Love_me_tender.sg", "Emiliana_Torrini/Jungle_drum.sg", "Fools_Garden/Lemon_tree.sg", "France_Gall/Il_jouait_du_piano_debout.sg", "Francois_Corbier/Les_vieux_copains_de_la_tele.sg", + "Georges_Brassens/Chanson_pour_l_auvergnat.sg", "Gerard_Lenorman/La_ballade_des_gens_heureux.sg", "Gerard_Lenorman/Si_j_etais_president.sg", "Gipsy_Kings/Baila_me.sg", @@ -71,6 +74,7 @@ "Hugues_Aufray/Alouette.sg", "Hugues_Aufray/Celine.sg", "Hugues_Aufray/Hasta_luego.sg", + "Hugues_Aufray/Le_joueur_de_pipeau.sg", "Hugues_Aufray/Le_jour_ou_le_bateau_viendra.sg", "Hugues_Aufray/L_epervier.sg", "Hugues_Aufray/Les_couleurs.sg", @@ -81,15 +85,26 @@ "Jacques_Higelin/Poil_dans_la_main.sg", "Jacques_Higelin/Tombe_du_ciel.sg", "JCFrog/Hadopi_song_III.sg", + "JCFrog/Je_t_emmene_dedans.sg", + "JCFrog/La_mauvaise_ereputation.sg", + "JCFrog/Russians.sg", "Jeanette/Porque_te_vas.sg", + "Jean-Jacques_Goldman/Encore_un_matin.sg", + "Jean-Jacques_Goldman/Il_changeait_la_vie.sg", "Jean-Jacques_Goldman/Le_coureur.sg", + "Joe_Dassin/Les_champs_elysees.sg", "Johnny_Cash/It_aint_me_babe.sg", "Johnny_Cash/I_walk_the_line.sg", + "Johnny_Cash/Jackson.sg", + "Johnny_Cash/The_ring_of_fire.sg", "Karpatt/Fan_de_maman.sg", "Karpatt/Histoires_de_famille.sg", "Karpatt/Les_vieilles.sg", "Karpatt/Lino.sg", "Karpatt/Souleve_ta_jupe.sg", + "La_compagnie_creole/Ca_fait_rire_les_oiseaux.sg", + "La_compagnie_creole/La_machine_a_danser.sg", + "La_compagnie_creole/Le_bal_masque.sg", "La_Maison_Tellier/La_chambre_rose.sg", "La_Rue_Ketanou/Almarita.sg", "La_Rue_Ketanou/Les_tontons.sg", @@ -150,6 +165,7 @@ "Renaud/C_est_quand_qu_on_va_ou.sg", "Renaud/La_blanche.sg", "Renaud/Salut_manouche.sg", + "Sting/Russians.sg", "The_Beautiful_Girls/La_Mar.sg", "The_Connells/74_75.sg", "The_Innocence_Mission/The_lakes_of_Canada.sg", @@ -158,6 +174,7 @@ "The_Rolling_Stones/Route_66.sg", "The_Rolling_Stones/You_cant_always_get_what_you_want.sg", "Tit_Patapons/Marchand_de_couleurs.sg", + "Traditionnel/L_homme_de_cromagnon.sg", "Tri_Yann/Kiss_the_cildren_for_me_Mary.sg", "Tri_Yann/Les_filles_de_Redon.sg"] } diff --git a/songs/Georges_Brassens/Chanson_pour_l_auvergnat.sg b/songs/Georges_Brassens/Chanson_pour_l_auvergnat.sg index f220e81c..6b244054 100644 --- a/songs/Georges_Brassens/Chanson_pour_l_auvergnat.sg +++ b/songs/Georges_Brassens/Chanson_pour_l_auvergnat.sg @@ -14,8 +14,6 @@ \gtab{Em}{022000} \gtab{G7}{3:020100} -\titi - \beginverse \[Bm]Elle est à toi cet\[F#]te chanson Toi l'Auvergnat qui \[Bm]sans façons @@ -37,7 +35,7 @@ À \[G]la manière \[G7]{d'un} feu de \[F#]joie \endverse - \beginverse* + \beginverse* \[Bm]Toi l'Auvergnat quand \[F#]tu mourras Quand le croque-mort t'em\[Bm]portera \[Bm]Qu'il te conduise \[E]à travers \[A]ciel diff --git a/templates/patacrep-en.tmpl b/templates/patacrep-en.tmpl index b9540cf3..ef762edd 100644 --- a/templates/patacrep-en.tmpl +++ b/templates/patacrep-en.tmpl @@ -30,7 +30,7 @@ %%: {"name":"booktype", "description":"Type", "type":"enum", "values":["chorded","lyric"], "default":"chorded", "mandatory":true}, %%: {"name":"lang", "description":"Language", "default":"english"}, %%: {"name":"bookoptions", "description":"Options", "type":"flag", "values":["diagram","lilypond","pictures","tabs"], "join":",", "mandatory":true, "default":["diagram","pictures"]}, -%%: {"name":"version", "description":"Version", "default":"3.3.10"}, +%%: {"name":"version", "description":"Version", "default":"3.4.1"}, %%: {"name":"subtitle", "description":"Subtitle"}, %%: {"name":"web", "description":"Web", "default":"http://www.patacrep.com"}, %%: {"name":"mail", "description":"Email", "default":"crep@team-on-fire.com"}, diff --git a/templates/patacrep.tmpl b/templates/patacrep.tmpl index 50f6e68f..6f6489e8 100644 --- a/templates/patacrep.tmpl +++ b/templates/patacrep.tmpl @@ -30,7 +30,7 @@ %%: {"name":"booktype", "description":"Type", "type":"enum", "values":["chorded","lyric"], "default":"chorded", "mandatory":true}, %%: {"name":"lang", "description":"Language", "default":"french"}, %%: {"name":"bookoptions", "description":"Options", "type":"flag", "values":["diagram","lilypond","pictures","tabs"], "join":",", "mandatory":true, "default":["diagram","pictures"]}, -%%: {"name":"version", "description":"Version", "default":"3.3.10"}, +%%: {"name":"version", "description":"Version", "default":"3.4.1"}, %%: {"name":"subtitle", "description":"Subtitle"}, %%: {"name":"web", "description":"Web", "default":"http://www.patacrep.com"}, %%: {"name":"mail", "description":"Email", "default":"crep@team-on-fire.com"}, diff --git a/utils/release.sh b/utils/release.sh index 1008715b..7b081223 100755 --- a/utils/release.sh +++ b/utils/release.sh @@ -72,7 +72,7 @@ git status if [ $# -eq 1 ]; then - #git add templates/patacrep-en.tmpl templates/patacrep.tmpl + git add templates/patacrep-en.tmpl templates/patacrep.tmpl git commit -a -m "patacrep release version $MAIN.$MAJOR.$MINOR" git tag "patacrep_$MAIN.$MAJOR.$MINOR" fi