From 54887c8c2d223dc9ca8308a4615dae78cf00ce7a Mon Sep 17 00:00:00 2001 From: Romain Goffe Date: Sat, 7 May 2011 15:06:03 +0200 Subject: [PATCH 03/14] remove lilypond from templates' default options --- templates/ancient.tmpl | 2 +- templates/minimal.tmpl | 2 +- templates/patacrep-en.tmpl | 2 +- templates/patacrep.tmpl | 2 +- utils/header-french | 5 +++++ 5 files changed, 9 insertions(+), 4 deletions(-) diff --git a/templates/ancient.tmpl b/templates/ancient.tmpl index 87fa18db..318eb433 100644 --- a/templates/ancient.tmpl +++ b/templates/ancient.tmpl @@ -28,7 +28,7 @@ %%: {"name":"title", "description":"Title", "default":"Recueil de chansons pour guitare", "mandatory":true}, %%: {"name":"author", "description":"Author", "default":"Romain Goffe \\and Alexandre Dupas", "mandatory":true}, %%: {"name":"booktype", "description":"Type", "type":"enum", "values":["chorded","lyric"], "default":"chorded", "mandatory":true}, -%%: {"name":"bookoptions", "description":"Options", "type":"flag", "values":["diagram","lilypond","tabs","pictures"], "join":",", "mandatory":true, "default":["diagram","pictures"]}, +%%: {"name":"bookoptions", "description":"Options", "type":"flag", "values":["diagram","tabs","pictures"], "join":",", "mandatory":true, "default":["diagram","pictures"]}, %%: {"name":"version", "description":"Version", "default":"3.3.3"}, %%: {"name":"subtitle", "description":"Subtitle"}, %%: {"name":"web", "description":"Web", "default":"http://www.patacrep.com"}, diff --git a/templates/minimal.tmpl b/templates/minimal.tmpl index 53bf5020..4f9af9d4 100644 --- a/templates/minimal.tmpl +++ b/templates/minimal.tmpl @@ -26,7 +26,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%:[ %%: {"name":"booktype", "description":"Type", "type":"enum", "values":["chorded","lyric"], "default":"chorded", "mandatory":true}, -%%: {"name":"bookoptions", "description":"Options", "type":"flag", "values":["diagram","lilypond","tabs","pictures"], "join":",", "mandatory":true}, +%%: {"name":"bookoptions", "description":"Options", "type":"flag", "values":["diagram","tabs","pictures"], "join":",", "mandatory":true}, %%: {"name":"mainfontsize", "description":"Font Size", "type":"font", "default":"10"} %%:] %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/templates/patacrep-en.tmpl b/templates/patacrep-en.tmpl index 9d70dd8c..dae361e2 100644 --- a/templates/patacrep-en.tmpl +++ b/templates/patacrep-en.tmpl @@ -28,7 +28,7 @@ %%: {"name":"title", "description":"Title", "default":"Patacrep Songbook", "mandatory":true}, %%: {"name":"author", "description":"Author", "default":"Romain Goffe \\and Alexandre Dupas", "mandatory":true}, %%: {"name":"booktype", "description":"Type", "type":"enum", "values":["chorded","lyric"], "default":"chorded", "mandatory":true}, -%%: {"name":"bookoptions", "description":"Options", "type":"flag", "values":["diagram","lilypond","tabs","pictures"], "join":",", "mandatory":true, "default":["diagram","pictures"]}, +%%: {"name":"bookoptions", "description":"Options", "type":"flag", "values":["diagram","tabs","pictures"], "join":",", "mandatory":true, "default":["diagram","pictures"]}, %%: {"name":"version", "description":"Version", "default":"3.3.3"}, %%: {"name":"subtitle", "description":"Subtitle"}, %%: {"name":"web", "description":"Web", "default":"http://www.patacrep.com"}, diff --git a/templates/patacrep.tmpl b/templates/patacrep.tmpl index 4e4e5a64..c642610c 100644 --- a/templates/patacrep.tmpl +++ b/templates/patacrep.tmpl @@ -28,7 +28,7 @@ %%: {"name":"title", "description":"Title", "default":"Recueil de chansons pour guitare", "mandatory":true}, %%: {"name":"author", "description":"Author", "default":"Romain Goffe \\and Alexandre Dupas", "mandatory":true}, %%: {"name":"booktype", "description":"Type", "type":"enum", "values":["chorded","lyric"], "default":"chorded", "mandatory":true}, -%%: {"name":"bookoptions", "description":"Options", "type":"flag", "values":["diagram","lilypond","tabs","pictures"], "join":",", "mandatory":true, "default":["diagram","pictures"]}, +%%: {"name":"bookoptions", "description":"Options", "type":"flag", "values":["diagram","tabs","pictures"], "join":",", "mandatory":true, "default":["diagram","pictures"]}, %%: {"name":"version", "description":"Version", "default":"3.3.3"}, %%: {"name":"subtitle", "description":"Subtitle"}, %%: {"name":"web", "description":"Web", "default":"http://www.patacrep.com"}, diff --git a/utils/header-french b/utils/header-french index 0df8e2bc..cda63f23 100644 --- a/utils/header-french +++ b/utils/header-french @@ -1,4 +1,9 @@ { "template" : "patacrep.tmpl", "subtitle" : "chanson francaise", +"bookoptions" : [ + "diagram", + "lilypond", + "pictures" + ], "songs" : [ From 8b1614840bf6ac3de492b2d073ae9e1c3d795620 Mon Sep 17 00:00:00 2001 From: Romain Goffe Date: Sat, 7 May 2011 15:14:04 +0200 Subject: [PATCH 04/14] Utils: add script to generate volume-3 songs list --- utils/header-volume-3 | 12 ++++++++++++ utils/volume-3.sh | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+) create mode 100644 utils/header-volume-3 create mode 100755 utils/volume-3.sh diff --git a/utils/header-volume-3 b/utils/header-volume-3 new file mode 100644 index 00000000..839fdf6d --- /dev/null +++ b/utils/header-volume-3 @@ -0,0 +1,12 @@ +{ +"template" : "patacrep.tmpl", +"bookoptions" : [ + "diagram", + "lilypond", + "pictures" + ], +"booktype" : "chorded", +"picture" : "Mousey_Band_by_Duffzilla", +"picturecopyright" : "duffzilla @ deviantart.com", +"subtitle" : "Tome 3", +"songs" : [ diff --git a/utils/volume-3.sh b/utils/volume-3.sh new file mode 100755 index 00000000..d1f07ab1 --- /dev/null +++ b/utils/volume-3.sh @@ -0,0 +1,40 @@ +#!/bin/sh +#Author: Romain Goffe +#Date: 07/05/2011 +#Description: Generate an sb file containing all the songs that are not +# already in volume-1 and volume-2 + +#all songs +cd songs +ls -1 */*.sg > ../res1 +cd .. + +#get volume 1 list +tail -n +12 volume-1.sb > tmp1 +head -n -2 tmp1 > list1 +sed -i -e "s/\",//g" -e "s/ \"//g" -e "s/\"//g" list1 + +#remove volume 1 songs +grep -vf list1 res1 > res2 + +#get volume 2 list +tail -n +13 volume-2.sb > tmp2 +head -n -2 tmp2 > list2 +sed -i -e "s/\",//g" -e "s/ \"//g" -e "s/\"//g" list2 + +#remove volume 2 songs +grep -vf list2 res2 > res3 + +#format song list +sed -i -e "s/^/ \"/g" -e "s/$/\",/g" res3 +head -c -2 res3 > res + + +#make volume 3 sb file +cat utils/header-volume-3 > volume-3.sb +cat res >> volume-3.sb +echo "]" >> volume-3.sb +echo "}" >> volume-3.sb + +#remove tmp files +rm -f res res1 res2 res3 list1 list2 tmp1 tmp2 From 9db8602681ad0da64e2c1f3c94b27404d6a6f4a3 Mon Sep 17 00:00:00 2001 From: Romain Goffe Date: Sun, 15 May 2011 14:15:10 +0200 Subject: [PATCH 09/14] modify image macro to behave as includegraphics --- crepbook.cls | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crepbook.cls b/crepbook.cls index 3ec33ce2..7863070f 100644 --- a/crepbook.cls +++ b/crepbook.cls @@ -200,10 +200,10 @@ \fi% } -\newcommand{\image}[2]{% +\newcommand{\image}[2][]{% \ifpictures% \begin{flushright}% - \includegraphics[width=#2cm]{#1}% + \includegraphics[#1]{#2}% \end{flushright}% \fi% } From 6d20b3a12684dfb1c3fdf5df1d712a69a31295e1 Mon Sep 17 00:00:00 2001 From: Romain Goffe Date: Sun, 15 May 2011 15:52:51 +0200 Subject: [PATCH 14/14] patacrep release version 3.3.4 --- templates/ancient.tmpl | 2 +- templates/patacrep-en.tmpl | 2 +- templates/patacrep.tmpl | 2 +- volume-3.sb | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/templates/ancient.tmpl b/templates/ancient.tmpl index 318eb433..9cc50524 100644 --- a/templates/ancient.tmpl +++ b/templates/ancient.tmpl @@ -29,7 +29,7 @@ %%: {"name":"author", "description":"Author", "default":"Romain Goffe \\and Alexandre Dupas", "mandatory":true}, %%: {"name":"booktype", "description":"Type", "type":"enum", "values":["chorded","lyric"], "default":"chorded", "mandatory":true}, %%: {"name":"bookoptions", "description":"Options", "type":"flag", "values":["diagram","tabs","pictures"], "join":",", "mandatory":true, "default":["diagram","pictures"]}, -%%: {"name":"version", "description":"Version", "default":"3.3.3"}, +%%: {"name":"version", "description":"Version", "default":"3.3.4"}, %%: {"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 dae361e2..471301d8 100644 --- a/templates/patacrep-en.tmpl +++ b/templates/patacrep-en.tmpl @@ -29,7 +29,7 @@ %%: {"name":"author", "description":"Author", "default":"Romain Goffe \\and Alexandre Dupas", "mandatory":true}, %%: {"name":"booktype", "description":"Type", "type":"enum", "values":["chorded","lyric"], "default":"chorded", "mandatory":true}, %%: {"name":"bookoptions", "description":"Options", "type":"flag", "values":["diagram","tabs","pictures"], "join":",", "mandatory":true, "default":["diagram","pictures"]}, -%%: {"name":"version", "description":"Version", "default":"3.3.3"}, +%%: {"name":"version", "description":"Version", "default":"3.3.4"}, %%: {"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 c642610c..4077ca9a 100644 --- a/templates/patacrep.tmpl +++ b/templates/patacrep.tmpl @@ -29,7 +29,7 @@ %%: {"name":"author", "description":"Author", "default":"Romain Goffe \\and Alexandre Dupas", "mandatory":true}, %%: {"name":"booktype", "description":"Type", "type":"enum", "values":["chorded","lyric"], "default":"chorded", "mandatory":true}, %%: {"name":"bookoptions", "description":"Options", "type":"flag", "values":["diagram","tabs","pictures"], "join":",", "mandatory":true, "default":["diagram","pictures"]}, -%%: {"name":"version", "description":"Version", "default":"3.3.3"}, +%%: {"name":"version", "description":"Version", "default":"3.3.4"}, %%: {"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/volume-3.sb b/volume-3.sb index c6bf25fb..d699d7d3 100644 --- a/volume-3.sb +++ b/volume-3.sb @@ -41,6 +41,7 @@ "Gogol_Bordello/Alcohol.sg", "Gogol_Bordello/Supertheory_of_supereverything.sg", "Graeme_Allwright/Le_jour_de_clarte.sg", + "Henri_Salvador/Une_chanson_douce.sg", "Hugues_Aufray/Alouette.sg", "Hugues_Aufray/Hasta_luego.sg", "Hugues_Aufray/L_epervier.sg", @@ -65,9 +66,13 @@ "Mes_souliers_sont_rouges/Cahin_Caha.sg", "Mes_souliers_sont_rouges/L_arbre_est_dans_ses_feuilles.sg", "Mes_souliers_sont_rouges/Sortis_du_bois.sg", + "Michel_Fugain/Je_n_aurai_pas_le_temps.sg", + "Michel_Fugain/Les_Acadiens.sg", "Mon_cote_punk/Youssef.sg", + "Nirvana/Come_as_you_are.sg", "Noir_Desir/Le_vent_nous_portera.sg", "Noir_Desir/L_homme_presse.sg", + "Outkast/Hey_Ya.sg", "Philippe_Lavil/Il_tape_sur_des_bambous.sg", "Pierre_Perret/Les_jolies_colonies_de_vacances.sg", "Renaud/C_est_quand_qu_on_va_ou.sg",