Books: add volume-4

books/volume-3.sb

@@ -98,7 +98,7 @@
     "Johnny_Cash/Jackson.sg",
     "Johnny_Cash/The_ring_of_fire.sg",
     "Karpatt/Fan_de_maman.sg",
-    "Karpatt/Histoires_de_famille.sg",
+    "Karpatt/Histoire_de_famille.sg",
     "Karpatt/Les_vieilles.sg",
     "Karpatt/Lino.sg",
     "Karpatt/Souleve_ta_jupe.sg",
@@ -176,5 +176,6 @@
     "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"]
+    "Tri_Yann/Les_filles_de_Redon.sg"
+  ]
 }

books/volume-4.sb

@@ -0,0 +1,19 @@
+{
+"template" : "patacrep.tmpl",
+"lang" : "french",
+"bookoptions" : [
+    "diagram",
+    "lilypond",
+    "pictures"
+  ],
+"booktype" : "chorded",
+"picture" : "music_by_lauratheartist",
+"picturecopyright" : "LauraTheArtist @ deviantart.com",
+"subtitle" : "Tome 4",
+"songs" : [
+    "Joe_Dassin/Ma_bonne_etoile.sg",
+    "Karpatt/En_pleine_mer.sg",
+    "Karpatt/Le_demenagement.sg",
+    "Les_Fatals_Picards/L_amour_a_la_francaise.sg",
+    "Les_Fatals_Picards/La_securite_de_l_emploi.sg"]
+}

utils/header-volume-3 → utils/header-last-volume

@@ -7,7 +7,7 @@
     "pictures"
   ],
 "booktype" : "chorded",
-"picture" : "Mousey_Band_by_Duffzilla",
+"picture" : "music_by_lauratheartist",
-"picturecopyright" : "duffzilla @ deviantart.com",
+"picturecopyright" : "LauraTheArtist @ deviantart.com",
-"subtitle" : "Tome 3",
+"subtitle" : "Tome 4",
 "songs" : [

utils/volume-3.sh → utils/last-volume.sh

@@ -2,7 +2,7 @@
 #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
+# already in previous volumes
 
 GREP="$GREP_OPTIONS"
 export GREP_OPTIONS=""
@@ -30,18 +30,26 @@ sed -i -e "s/\",//g" -e "s/    \"//g" -e "s/\"//g" list2
 #remove volume 2 songs
 grep -vf list2 res2 > res3 
 
+#get volume 3 list
+tail -n +14 "$BOOKS_DIR/volume-3.sb" > tmp3
+head -n -2 tmp3 > list3
+sed -i -e "s/\",//g" -e "s/    \"//g" -e "s/\"//g" list3
+
+#remove volume 3 songs
+grep -vf list3 res3 > res4 
+
 #format song list
-sed -i -e "s/^/    \"/g" -e "s/$/\",/g" res3
+sed -i -e "s/^/    \"/g" -e "s/$/\",/g" res4
-head -c -2 res3 > res
+head -c -2 res4 > res
 
 
-#make volume 3 sb file
+#make volume 4 sb file
-cat utils/header-volume-3 > "$BOOKS_DIR/volume-3.sb"
+cat utils/header-last-volume > "$BOOKS_DIR/volume-4.sb"
-cat res >> "$BOOKS_DIR/volume-3.sb"
+cat res >> "$BOOKS_DIR/volume-4.sb"
-echo "]" >> "$BOOKS_DIR/volume-3.sb"
+echo "]" >> "$BOOKS_DIR/volume-4.sb"
-echo "}" >> "$BOOKS_DIR/volume-3.sb"
+echo "}" >> "$BOOKS_DIR/volume-4.sb"
 
 #remove tmp files
-rm -f res res1 res2 res3 list1 list2 tmp1 tmp2
+rm -f res res1 res2 res3 res4 list1 list2 list3 tmp1 tmp2 tmp3
 
 export GREP_OPTIONS="$GREP"

utils/release.sh

@@ -8,8 +8,8 @@
 GREP="$GREP_OPTIONS"
 export GREP_OPTIONS=""
 
-#volume-3.sb
+#last volume
-./utils/volume-3.sh
+./utils/last-volume.sh
 #english.sb
 ./utils/langbooks.sh english 
 #french.sb
@@ -58,6 +58,7 @@ make naheulbeuk.pdf
 make volume-1.pdf 
 make volume-2.pdf 
 make volume-3.pdf 
+make volume-4.pdf 
 make english.pdf 
 make french.pdf 
 make songbook.pdf