From ba0d7a79f4fc38d6c20643c94f9fb00ab677e573 Mon Sep 17 00:00:00 2001 From: Romain Goffe Date: Thu, 17 May 2012 14:45:20 +0200 Subject: [PATCH 03/18] windows: ensure there are no windows file separators. This fix the compilation under Windows with "songs":"all" --- songbook.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/songbook.py b/songbook.py index 0b074937..59504d42 100755 --- a/songbook.py +++ b/songbook.py @@ -34,7 +34,7 @@ def matchRegexp(reg, iterable): def songslist(songs): directories = set(["img/"] + map(lambda x: "songs/" + os.path.dirname(x), songs)) - result = [ '\\input{{songs/{0}}}'.format(s.strip()) for s in songs ] + result = [ '\\input{{songs/{0}}}'.format(s.replace("\\","/").strip()) for s in songs ] return '\n'.join(result) def parseTemplate(template): From 64e92c495b667c2ed908d8f57d712aff3eb29120 Mon Sep 17 00:00:00 2001 From: Romain Goffe Date: Fri, 25 May 2012 19:02:03 +0200 Subject: [PATCH 07/18] corrections --- tex/license-nb.tex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tex/license-nb.tex b/tex/license-nb.tex index c214c92d..57b41869 100644 --- a/tex/license-nb.tex +++ b/tex/license-nb.tex @@ -1,6 +1,6 @@ %Licence Creative Commons \begin{center} - \textbf{\LARGE{Creative Commons\footnote{ Cette création est mise à + \textbf{\LARGE{Creative Commons\footnote{ Ce document est mis à disposition selon le Contrat Attribution-ShareAlike 3.0 Unported disponible en ligne \url{http://creativecommons.org/licenses/by-sa/3.0/} ou par From a4062f78769e715135e15ff6890141965068c6b0 Mon Sep 17 00:00:00 2001 From: Romain Goffe Date: Fri, 25 May 2012 19:20:13 +0200 Subject: [PATCH 10/18] patacrep release version 3.5.9 --- NEWS | 15 +++++++++++++++ books/volume-5.sb | 7 +++++++ templates/ancient.tmpl | 2 +- templates/patacrep-en.tmpl | 2 +- templates/patacrep.tmpl | 2 +- 5 files changed, 25 insertions(+), 3 deletions(-) diff --git a/NEWS b/NEWS index 25a8a116..7557dbd8 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,19 @@ +version 3.5.9 + +Romain Goffe: +broph: + Patrick Coutin - J'aime regarder les filles + Noir Désir - Où veux-tu que je regarde ? + Calvin RUssell - 5m2 + Dire Straits - Brothers in arms + Noir Désir - Toujours être ailleurs +olivier desrobert: + : As de Trefle - Pauvre planete + : As de trefle - La revolution Modif : As de trefle - Pauvre planète + Les cowboys fringants - Hannah + : Les Ogres de Barback - Rue Mazarine + version 3.5.8 Kaosun: diff --git a/books/volume-5.sb b/books/volume-5.sb index 0c7e9448..619638b8 100644 --- a/books/volume-5.sb +++ b/books/volume-5.sb @@ -20,6 +20,7 @@ "As_De_Trefle/Pauvre_planete.sg", "As_De_Trefle/Toi_toi_toi.sg", "Belyscendre/Helas_madame.sg", + "Calvin_Russell/5m2.sg", "Calvin_Russell/Down_down_down.sg", "Debout_Sur_Le_Zinc/Comme_un_frisson.sg", "Debout_Sur_Le_Zinc/Elle_m_ennuie.sg", @@ -27,6 +28,7 @@ "Debout_Sur_Le_Zinc/Les_angles.sg", "Debout_Sur_Le_Zinc/Scylla.sg", "Debout_Sur_Le_Zinc/Sur_le_fil.sg", + "Dire_Straits/brothers_in_arms.sg", "Francis_Cabrel/La_corrida.sg", "Francis_Cabrel/Octobre.sg", "Gary_Jules/Mad_world.sg", @@ -42,7 +44,12 @@ "Les_Cowboys_Fringants/Ces_temps_ci.sg", "Les_Cowboys_Fringants/Hannah.sg", "Les_Fatals_Picards/Au_mariage_de_Kevin_et_de_ma_soeur.sg", + "Les_Ogres_de_Barback/Poil_aux_yeux.sg", + "Les_Ogres_de_Barback/Rue_Mazarine.sg", "Maxime_Le_Forestier/Passer_ma_route.sg", + "Noir_Desir/Ou_veux_tu_qu_je_regarde.sg", + "Noir_Desir/Toujours_etre_ailleurs.sg", + "Patrick_Coutin/J_aime_regarder_les_filles.sg", "Phil_Barney/Un_enfant_de_toi.sg", "Roch_Voisine/Helene.sg", "Telephone/Le_jour_s_est_leve.sg", diff --git a/templates/ancient.tmpl b/templates/ancient.tmpl index efb92562..97b7abce 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.8"}, +%%: {"name":"version", "description":"Version", "default":"3.5.9"}, %%: {"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 b6ac8992..0e27257f 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.8"}, +%%: {"name":"version", "description":"Version", "default":"3.5.9"}, %%: {"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 34c3387b..202d7da4 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.8"}, +%%: {"name":"version", "description":"Version", "default":"3.5.9"}, %%: {"name":"subtitle", "description":"Subtitle"}, %%: {"name":"web", "description":"Web", "default":"http://www.patacrep.com"}, %%: {"name":"mail", "description":"Email", "default":"crep@team-on-fire.com"}, From 2b1f018d551b2e5b1e6b1bdc57fa75578ee3c74c Mon Sep 17 00:00:00 2001 From: Romain Goffe Date: Fri, 25 May 2012 19:26:49 +0200 Subject: [PATCH 11/18] correct renamed song in volume-2 --- books/volume-2.sb | 2 +- books/volume-5.sb | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/books/volume-2.sb b/books/volume-2.sb index d934e8a8..a6e12f1d 100644 --- a/books/volume-2.sb +++ b/books/volume-2.sb @@ -39,7 +39,6 @@ "Debout_Sur_Le_Zinc/La_declaration.sg", "Debout_Sur_Le_Zinc/Les_mots_d_amour.sg", "Debout_Sur_Le_Zinc/Ma_petite_cherie.sg", - "Debout_Sur_Le_Zinc/Poil_aux_yeux.sg", "Debout_Sur_Le_Zinc/Rester_debout.sg", "Dessins_Animes/Boumbo.sg", "Dessins_Animes/Denver.sg", @@ -113,6 +112,7 @@ "Les_Ogres_de_Barback/Bumbaia.sg", "Les_Ogres_de_Barback/Jojo.sg", "Les_Ogres_de_Barback/Le_temps.sg", + "Les_Ogres_de_Barback/Poil_aux_yeux.sg", "Les_Ogres_de_Barback/Ptit_chat.sg", "Les_Ogres_de_Barback/Rue_du_temps.sg", "Les_Ogres_de_Barback/Touche_pas_a_mon_ecole.sg", diff --git a/books/volume-5.sb b/books/volume-5.sb index 619638b8..1a212ef0 100644 --- a/books/volume-5.sb +++ b/books/volume-5.sb @@ -44,7 +44,6 @@ "Les_Cowboys_Fringants/Ces_temps_ci.sg", "Les_Cowboys_Fringants/Hannah.sg", "Les_Fatals_Picards/Au_mariage_de_Kevin_et_de_ma_soeur.sg", - "Les_Ogres_de_Barback/Poil_aux_yeux.sg", "Les_Ogres_de_Barback/Rue_Mazarine.sg", "Maxime_Le_Forestier/Passer_ma_route.sg", "Noir_Desir/Ou_veux_tu_qu_je_regarde.sg", From 16524a535400805d67c0d506490b9b5ec8135be0 Mon Sep 17 00:00:00 2001 From: Alexandre Dupas Date: Tue, 5 Jun 2012 00:13:59 +0200 Subject: [PATCH 18/18] Clean last NEWS item due to malformed git commit message --- NEWS | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/NEWS b/NEWS index 7557dbd8..abe762b6 100644 --- a/NEWS +++ b/NEWS @@ -8,11 +8,11 @@ broph: Calvin RUssell - 5m2 Dire Straits - Brothers in arms Noir Désir - Toujours être ailleurs -olivier desrobert: - : As de Trefle - Pauvre planete - : As de trefle - La revolution Modif : As de trefle - Pauvre planète +Olivier Desrobert: + As de Trefle - Pauvre planete + As de trefle - La revolution Les cowboys fringants - Hannah - : Les Ogres de Barback - Rue Mazarine + Les Ogres de Barback - Rue Mazarine version 3.5.8