Merge branch 'master' of ssh://lohrun.net/~crep/songbook

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%
 }

templates/ancient.tmpl

@@ -28,8 +28,8 @@
 %%:  {"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":"version", "description":"Version", "default":"3.3.3"},
+%%:  {"name":"bookoptions", "description":"Options", "type":"flag", "values":["diagram","tabs","pictures"], "join":",", "mandatory":true, "default":["diagram","pictures"]},
+%%:  {"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"},

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"}
 %%:]
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

templates/patacrep-en.tmpl

@@ -28,8 +28,8 @@
 %%:  {"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":"version", "description":"Version", "default":"3.3.3"},
+%%:  {"name":"bookoptions", "description":"Options", "type":"flag", "values":["diagram","tabs","pictures"], "join":",", "mandatory":true, "default":["diagram","pictures"]},
+%%:  {"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"},

templates/patacrep.tmpl

@@ -28,8 +28,8 @@
 %%:  {"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":"version", "description":"Version", "default":"3.3.3"},
+%%:  {"name":"bookoptions", "description":"Options", "type":"flag", "values":["diagram","tabs","pictures"], "join":",", "mandatory":true, "default":["diagram","pictures"]},
+%%:  {"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"},

utils/header-french

@@ -1,4 +1,9 @@
 {
 "template" : "patacrep.tmpl",
 "subtitle" : "chanson francaise",
+"bookoptions" : [
+    "diagram",
+    "lilypond",
+    "pictures"
+  ],
 "songs" : [

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" : [

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

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",