From c7417405b9a3f982b8d3a4ddd3bdbb005fc8b0fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mickae=CC=88l=20Gentil?= Date: Tue, 5 Jun 2012 09:24:01 +0200 Subject: [PATCH 02/16] Merged from origin songbook --- default.sxc | 8 ++++++++ sortindex.pyc | Bin 0 -> 1644 bytes 2 files changed, 8 insertions(+) create mode 100644 default.sxc create mode 100644 sortindex.pyc diff --git a/default.sxc b/default.sxc new file mode 100644 index 00000000..7f53b684 --- /dev/null +++ b/default.sxc @@ -0,0 +1,8 @@ +\SB@iwrite {titleidx}{TITLE INDEX DATA FILE} +\SB@iwrite {authidx}{AUTHOR INDEX DATA FILE} +\SB@iwrite {titleidx}{Talkin' about the revolution} +\SB@iwrite {titleidx}{1} +\SB@iwrite {titleidx}{song2-1.2} +\SB@iwrite {authidx}{Tracy Chapman} +\SB@iwrite {authidx}{1} +\SB@iwrite {authidx}{song2-1.2} diff --git a/sortindex.pyc b/sortindex.pyc new file mode 100644 index 0000000000000000000000000000000000000000..82f03ba1e55c2ee71482408604de4ea858c6eee9 GIT binary patch literal 1644 zcmbtU&u`pB6n@^_Ce4zxP@qs!U`VOrL@VdkLxq4S6saOAXjiBZtu=iqryNk<@9x5~)7m z2~x{|6;fvaXGuK?fX_L=)1;mOJWJ|4;5kyy11^wy0kBHyVgoM%ULy4}K#+O`utw?< zUD-pvSLrhpyTDbC;>+kD`wQ0%cLvMxb-g1#8IR*+^No$Wu7j=np9VPCZnUo(O*Yy$ z0rng1_pdxV7~R;u53t^9-v#ZU)qZIFTJ6W6t+m>hjo-BZ_rC~m&}u(5Hq+RC4zO>0 z#9cV1Wo_KxJ}^}OYk;+?(LN7{QnAyh-?nO+as)o#!?T0OB@mbpMs+tL5B?xK%;KGh z?hxI>y2p%yNUXu@C}v-G6_NS^*W1?2g%m#XxgH3sePs*b%v}3fRve1T$w{uo)L3j< zkF7*p_hKdsm1`$*lS-K5N##Q{Wr}srrw_Fk-UwLp_E6%qZ;r%o*`P3MfjNx$;Iu=&qQivS=J(#UY`iPKdN+*YL|!+N*C!&S|{eR z7KQO*qW=|5i3#G*GAE{0k^0OO0|XaRDb6$JqBpHBbD8S*r1#nun?hybU?FXtgiwJ8 z=He8d5zliBQLi!sm^w%RCm8k-Mox5LbhEfhJ>R9{KG~ZTMUn5(5#I66gVSIq@b%Dh z+M)B;uDW;dkH`)0~ubh9nd(KzRP*{yP%SeIHs=m0{()%}Re7d++EvR2G!m z(iTYI&@2%vF_#}aLeVia3c?Mr+Irt<>$d7jNwf8qNvpXoyxVf7IGh-Bj0L}cN}r&* z5Rz-U1V_i2De6Y6(Ml9PG7;o<%w>A+p?Tx{B9OVC8&>6bI6V+j&*&Jv+-DHacLoDL- Date: Thu, 7 Jun 2012 22:49:49 +0200 Subject: [PATCH 04/16] ignore python compiled files --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 4ca2fb39..042c46f2 100644 --- a/.gitignore +++ b/.gitignore @@ -15,6 +15,7 @@ utils/send.sh *.out *.d *.pdf +*.pyc *.tar.gz default.sb default.tex From 4a703984c038f7210b5dff85a4fba1606c6e9bcb Mon Sep 17 00:00:00 2001 From: Romain Goffe Date: Fri, 8 Jun 2012 17:36:03 +0200 Subject: [PATCH 05/16] apply rules.py --- default.sxc | 8 -------- sortindex.pyc | Bin 1644 -> 0 bytes 2 files changed, 8 deletions(-) delete mode 100644 default.sxc delete mode 100644 sortindex.pyc diff --git a/default.sxc b/default.sxc deleted file mode 100644 index 7f53b684..00000000 --- a/default.sxc +++ /dev/null @@ -1,8 +0,0 @@ -\SB@iwrite {titleidx}{TITLE INDEX DATA FILE} -\SB@iwrite {authidx}{AUTHOR INDEX DATA FILE} -\SB@iwrite {titleidx}{Talkin' about the revolution} -\SB@iwrite {titleidx}{1} -\SB@iwrite {titleidx}{song2-1.2} -\SB@iwrite {authidx}{Tracy Chapman} -\SB@iwrite {authidx}{1} -\SB@iwrite {authidx}{song2-1.2} diff --git a/sortindex.pyc b/sortindex.pyc deleted file mode 100644 index 82f03ba1e55c2ee71482408604de4ea858c6eee9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1644 zcmbtU&u`pB6n@^_Ce4zxP@qs!U`VOrL@VdkLxq4S6saOAXjiBZtu=iqryNk<@9x5~)7m z2~x{|6;fvaXGuK?fX_L=)1;mOJWJ|4;5kyy11^wy0kBHyVgoM%ULy4}K#+O`utw?< zUD-pvSLrhpyTDbC;>+kD`wQ0%cLvMxb-g1#8IR*+^No$Wu7j=np9VPCZnUo(O*Yy$ z0rng1_pdxV7~R;u53t^9-v#ZU)qZIFTJ6W6t+m>hjo-BZ_rC~m&}u(5Hq+RC4zO>0 z#9cV1Wo_KxJ}^}OYk;+?(LN7{QnAyh-?nO+as)o#!?T0OB@mbpMs+tL5B?xK%;KGh z?hxI>y2p%yNUXu@C}v-G6_NS^*W1?2g%m#XxgH3sePs*b%v}3fRve1T$w{uo)L3j< zkF7*p_hKdsm1`$*lS-K5N##Q{Wr}srrw_Fk-UwLp_E6%qZ;r%o*`P3MfjNx$;Iu=&qQivS=J(#UY`iPKdN+*YL|!+N*C!&S|{eR z7KQO*qW=|5i3#G*GAE{0k^0OO0|XaRDb6$JqBpHBbD8S*r1#nun?hybU?FXtgiwJ8 z=He8d5zliBQLi!sm^w%RCm8k-Mox5LbhEfhJ>R9{KG~ZTMUn5(5#I66gVSIq@b%Dh z+M)B;uDW;dkH`)0~ubh9nd(KzRP*{yP%SeIHs=m0{()%}Re7d++EvR2G!m z(iTYI&@2%vF_#}aLeVia3c?Mr+Irt<>$d7jNwf8qNvpXoyxVf7IGh-Bj0L}cN}r&* z5Rz-U1V_i2De6Y6(Ml9PG7;o<%w>A+p?Tx{B9OVC8&>6bI6V+j&*&Jv+-DHacLoDL- Date: Sat, 9 Jun 2012 14:57:34 +0200 Subject: [PATCH 11/16] ignore sxc files --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 042c46f2..5ea8035a 100644 --- a/.gitignore +++ b/.gitignore @@ -11,6 +11,7 @@ utils/send.sh *.sbd *.sbx *.sxd +*.sxc *.log *.out *.d From 6bf339ec710f8d70a2b6f666f383487c5acc0ace Mon Sep 17 00:00:00 2001 From: Romain Goffe Date: Sat, 9 Jun 2012 15:28:57 +0200 Subject: [PATCH 15/16] patacrep release version 3.6.0 --- NEWS | 18 ++++++++++++------ books/volume-5.sb | 6 ++++++ templates/ancient.tmpl | 2 +- templates/patacrep-en.tmpl | 2 +- templates/patacrep.tmpl | 2 +- 5 files changed, 21 insertions(+), 9 deletions(-) diff --git a/NEWS b/NEWS index abe762b6..148620c8 100644 --- a/NEWS +++ b/NEWS @@ -1,7 +1,17 @@ -version 3.5.9 +version 3.6.0 Romain Goffe: + Bloodhound Gang - Fire water burn + Pascale Picard - Smilin' + Coluche - Sois fainéant +yoyoma: + Razorlight - America + U2 - One + America - A Horse With No Name + +version 3.5.9 + broph: Patrick Coutin - J'aime regarder les filles Noir Désir - Où veux-tu que je regarde ? @@ -82,6 +92,7 @@ Romain Goffe: The Dubliners - The wild rover version 3.5.4 + BeXa: Jeanne Moreau - Les mots de rien Israel Kamakawiwo - Over the rainbow @@ -106,7 +117,6 @@ Kaosun: version 3.5.3 -Alexandre Dupas: BeXa: Vincent Delerm - La natation synchronisée Kaosun: @@ -151,10 +161,6 @@ broph: version 3.5.2 -Alexandre Dupas: -Matteo Cypriani: -Pipiou: -Romain Goffe: broph: Noir Désir - Lazy William Baldé - Rayon de soleil diff --git a/books/volume-5.sb b/books/volume-5.sb index 1a212ef0..2fa73f30 100644 --- a/books/volume-5.sb +++ b/books/volume-5.sb @@ -13,6 +13,7 @@ "songs" : [ "Alain_Souchon/La_ballade_de_Jim.sg", "Alain_Souchon/Sous_les_jupes_des_filles.sg", + "America/A_Horse_With_No_Name.sg", "Anis/Dans_tes_yeux.sg", "As_De_Trefle/A_l_oreille_de_ta_femme.sg", "As_De_Trefle/Chanson_d_amur.sg", @@ -20,8 +21,10 @@ "As_De_Trefle/Pauvre_planete.sg", "As_De_Trefle/Toi_toi_toi.sg", "Belyscendre/Helas_madame.sg", + "Bloodhound_Gang/Fire_water_burn.sg", "Calvin_Russell/5m2.sg", "Calvin_Russell/Down_down_down.sg", + "coluche/sois_faineant.sg", "Debout_Sur_Le_Zinc/Comme_un_frisson.sg", "Debout_Sur_Le_Zinc/Elle_m_ennuie.sg", "Debout_Sur_Le_Zinc/J_ai_deja_donne.sg", @@ -48,8 +51,10 @@ "Maxime_Le_Forestier/Passer_ma_route.sg", "Noir_Desir/Ou_veux_tu_qu_je_regarde.sg", "Noir_Desir/Toujours_etre_ailleurs.sg", + "Pascale_Picard/Smilin.sg", "Patrick_Coutin/J_aime_regarder_les_filles.sg", "Phil_Barney/Un_enfant_de_toi.sg", + "Razorlight/America.sg", "Roch_Voisine/Helene.sg", "Telephone/Le_jour_s_est_leve.sg", "The_Bloody_Irish_Boys/Drunk_tonight.sg", @@ -63,5 +68,6 @@ "Thomas_Fersen/Louise.sg", "Thomas_Fersen/Rititi_ratata_il_parait_qu_elles_aiment_.sg", "Tournee_Generale/Avancer_mes_grolles.sg", + "U2/One.sg", "Yves_Simon/Les_bateaux_du_metro.sg"] } diff --git a/templates/ancient.tmpl b/templates/ancient.tmpl index 97b7abce..d0c8a8d5 100644 --- a/templates/ancient.tmpl +++ b/templates/ancient.tmpl @@ -31,7 +31,7 @@ %%: {"name":"lang", "description":"Language", "default":"english"}, %%: {"name":"instruments", "description":"Instruments", "type":"flag", "values":["guitar","ukulele"], "join":",", "mandatory":true, "default":["guitar"]}, %%: {"name":"bookoptions", "description":"Options", "type":"flag", "values":["diagram","importantdiagramonly","lilypond","pictures","tabs","repeatchords","onesongperpage"], "join":",", "mandatory":true, "default":["diagram","pictures"]}, -%%: {"name":"version", "description":"Version", "default":"3.5.9"}, +%%: {"name":"version", "description":"Version", "default":"3.6.0"}, %%: {"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-en.tmpl b/templates/patacrep-en.tmpl index 0e27257f..95a1f831 100644 --- a/templates/patacrep-en.tmpl +++ b/templates/patacrep-en.tmpl @@ -31,7 +31,7 @@ %%: {"name":"lang", "description":"Language", "default":"english"}, %%: {"name":"instruments", "description":"Instruments", "type":"flag", "values":["guitar","ukulele"], "join":",", "mandatory":true, "default":["guitar"]}, %%: {"name":"bookoptions", "description":"Options", "type":"flag", "values":["diagram","importantdiagramonly","lilypond","pictures","tabs","repeatchords","onesongperpage"], "join":",", "mandatory":true, "default":["diagram","pictures"]}, -%%: {"name":"version", "description":"Version", "default":"3.5.9"}, +%%: {"name":"version", "description":"Version", "default":"3.6.0"}, %%: {"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 202d7da4..952ec424 100644 --- a/templates/patacrep.tmpl +++ b/templates/patacrep.tmpl @@ -31,7 +31,7 @@ %%: {"name":"lang", "description":"Language", "default":"french"}, %%: {"name":"instruments", "description":"Instruments", "type":"flag", "values":["guitar","ukulele"], "join":",", "mandatory":true, "default":["guitar"]}, %%: {"name":"bookoptions", "description":"Options", "type":"flag", "values":["diagram","importantdiagramonly","lilypond","pictures","tabs","repeatchords","onesongperpage"], "join":",", "mandatory":true, "default":["diagram","pictures"]}, -%%: {"name":"version", "description":"Version", "default":"3.5.9"}, +%%: {"name":"version", "description":"Version", "default":"3.6.0"}, %%: {"name":"subtitle", "description":"Subtitle"}, %%: {"name":"web", "description":"Web", "default":"http://www.patacrep.com"}, %%: {"name":"mail", "description":"Email", "default":"crep@team-on-fire.com"},