Merge branch 'master' of git://git.lohrun.net/songbook

14 years ago · 018d428adb
343 changed files with 402 additions and 340 deletions
--- a/crepbook.cls
+++ b/crepbook.cls
@ -151,7 +151,9 @@
 \newlength{\coverspace}
 \setlength{\coverspace}{0.1cm}
 \newcommand{\songcover}{}
 \newcommand{\songalbum}{}
 \newsongkey{cov}{\let\songcover\@empty}{\def\songcover{#1}}
 \newsongkey{album}{\let\songalbum\@empty}{\def\songalbum{#1}}
 \newcommand\cover{%
  \ifchorded%
    \ifx\songcover\@empty\else%
--- a/songs/Aaron/U_turn_lili.sg
+++ b/songs/Aaron/U_turn_lili.sg
@ -1,7 +1,7 @@
 \selectlanguage{english}
 \songcolumns{1}
 \beginsong{U-Turn (Lili)}
-  [by=AaRON,cov=aaron]
+  [by=AaRON,cov=aaron,album=Aaron]
  \cover
  \gtab{Mim}{022000}
--- a/songs/Alain_Bashung/Gaby_oh_gaby.sg
+++ b/songs/Alain_Bashung/Gaby_oh_gaby.sg
@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{1}
 \beginsong{Gaby, oh Gaby}
-  [by=Alain Bashung,cov=roulette-russe]
+  [by=Alain Bashung,cov=roulette-russe,album=Roulette russe]
  \cover
  \gtab{Mi}{022100}
--- a/songs/Alain_Souchon/Foule_sentimentale.sg
+++ b/songs/Alain_Souchon/Foule_sentimentale.sg
@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{Foule sentimentale}
-  [by=Alain Souchon,cov=c-est-deja-ca]
+  [by=Alain Souchon,cov=c-est-deja-ca,album=C est deja ca]
  \cover
  \gtab{Mim}{022000}
--- a/songs/Alain_Souchon/L_amour_a_la_machine.sg
+++ b/songs/Alain_Souchon/L_amour_a_la_machine.sg
@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{L'amour à la machine}
-  [by=Alain Souchon,cov=c-est-deja-ca]
+  [by=Alain Souchon,cov=c-est-deja-ca,album=C est deja ca]
  \cover
  \gtab{Mim}{022000}
--- a/songs/Alex_Beaupain/Je_n_aime_que_toi.sg
+++ b/songs/Alex_Beaupain/Je_n_aime_que_toi.sg
@ -1,6 +1,6 @@
 \selectlanguage{french}
 \beginsong{Je n'aime que toi}
-  [by=Alex Beaupain,cov=les-chansons-d-amour]
+  [by=Alex Beaupain,cov=les-chansons-d-amour,album=Les chansons d amour]
  \cover
  \gtab{Ré}{XX0232}
--- a/songs/Alexis_HK/Gaspard.sg
+++ b/songs/Alexis_HK/Gaspard.sg
@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{1}
 \beginsong{Gaspard}
-  [by=Alexis HK,cov=belle-ville]
+  [by=Alexis HK,cov=belle-ville,album=Belle ville]
  \cover
  \capo{4}
--- a/songs/Alicia_Keys/If_aint_got_you.sg
+++ b/songs/Alicia_Keys/If_aint_got_you.sg
@ -1,7 +1,7 @@
 \selectlanguage{english}
 \songcolumns{2}
 \beginsong{If I ain't got you}
-  [by=Alicia Keys,cov=If_aint_got_you]
+  [by=Alicia Keys,cov=If_aint_got_you,album=If aint got you]
  \cover
  \gtab{Sol7}{320001}
--- a/songs/Amy_MacDonald/Mr._Rock_n_Roll.sg
+++ b/songs/Amy_MacDonald/Mr._Rock_n_Roll.sg
@ -1,7 +1,7 @@
 \selectlanguage{english}
 \songcolumns{1}
 \beginsong{Mr. Rock'n Roll}
-  [by=Amy MacDonald,cov=this-is-the-life]
+  [by=Amy MacDonald,cov=this-is-the-life,album=This is the life]
  \cover
  \capo{7}
--- a/songs/Amy_MacDonald/This_is_the_life.sg
+++ b/songs/Amy_MacDonald/This_is_the_life.sg
@ -1,7 +1,7 @@
 \selectlanguage{english}
 \songcolumns{1}
 \beginsong{This is the life}
-  [by=Amy MacDonald,cov=this-is-the-life]
+  [by=Amy MacDonald,cov=this-is-the-life,album=This is the life]
  \cover
  \capo{4}
--- a/songs/Anais/Mon_coeur_mon_amour.sg
+++ b/songs/Anais/Mon_coeur_mon_amour.sg
@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{Mon cœur, mon amour}
-  [by=Anaïs,cov=the-cheap-show]
+  [by=Anaïs,cov=the-cheap-show,album=The cheap show]
  \cover
  \gtab{Fa#}{2:022100}
--- a/songs/Anny_Et_Jean-Marc_Versini/La_danse_des_esquimaux.sg
+++ b/songs/Anny_Et_Jean-Marc_Versini/La_danse_des_esquimaux.sg
@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{La danse des esquimaux}
-  [by=Anny et Jean-Marc Versini,cov=les-chansons-de-la-marmotte]
+  [by=Anny et Jean-Marc Versini,cov=les-chansons-de-la-marmotte,album=Les chansons de la marmotte]
  \cover
  \capo{4}
--- a/songs/Antsy_Pants/Vampire.sg
+++ b/songs/Antsy_Pants/Vampire.sg
@ -1,7 +1,7 @@
 \selectlanguage{english}
 \songcolumns{2}
 \beginsong{Vampire}
-  [by=Antsy Pants,cov=juno]
+  [by=Antsy Pants,cov=juno,album=Juno]
  \cover
  \gtab{Rém}{XX0231}
--- a/songs/As_De_Trefle/Jessica.sg
+++ b/songs/As_De_Trefle/Jessica.sg
@ -1,7 +1,7 @@
 \selectlanguage{english}
 \songcolumns{1}
 \beginsong{Jessica}
-  [by=As de Trêfle,cov=merci-bonsoir]
+  [by=As de Trêfle,cov=merci-bonsoir,album=Merci bonsoir]
  \cover
  \gtab{Do}{X32010}
--- a/songs/Avenue_Q/The_internet_is_for_porn.sg
+++ b/songs/Avenue_Q/The_internet_is_for_porn.sg
@ -1,7 +1,7 @@
 \selectlanguage{english}
 \songcolumns{2}
 \beginsong{The internet is for porn}
-  [by=Avenue Q,cov=avenue-q]
+  [by=Avenue Q,cov=avenue-q,album=Avenue q]
  \cover
  \gtab{Mi}{7:X02220}
--- a/songs/Avril_Lavigne/Things_I_ll_never_say.sg
+++ b/songs/Avril_Lavigne/Things_I_ll_never_say.sg
@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{1}
 \beginsong{Things I'll never say}
-  [by=Avril Lavigne,cov=let-go]
+  [by=Avril Lavigne,cov=let-go,album=Let go]
  \cover
  \gtab{Ré}{XX0232}
--- a/songs/Barry_Louis_Polisar/All_I_Want_Is_You.sg
+++ b/songs/Barry_Louis_Polisar/All_I_Want_Is_You.sg
@ -1,7 +1,7 @@
 \selectlanguage{english}
 \songcolumns{1}
 \beginsong{All I want is you}
-  [by=Barry Louis Polisar,cov=juno]
+  [by=Barry Louis Polisar,cov=juno,album=Juno]
  \cover
  \gtab{Sol}{320003}
--- a/songs/Beau_Dommage/La_complainte_du_phoque_en_alaska.sg
+++ b/songs/Beau_Dommage/La_complainte_du_phoque_en_alaska.sg
@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{La complainte du phoque en Alaska}
-  [by=Beau Dommage,cov=le-meilleur-de-beau-dommage]
+  [by=Beau Dommage,cov=le-meilleur-de-beau-dommage,album=Le meilleur de beau dommage]
  \cover
  \capo{3}
--- a/songs/Belle_Sebastian/Piazza_New_York_catcher.sg
+++ b/songs/Belle_Sebastian/Piazza_New_York_catcher.sg
@ -1,7 +1,7 @@
 \selectlanguage{english}
 \songcolumns{1}
 \beginsong{Piazza, New York catcher}
-  [by=Belle \& Sebastian,cov=juno]
+  [by=Belle \& Sebastian,cov=juno,album=Juno]
  \cover
  \gtab{Fa#}{2:022100}
--- a/songs/Belyscendre/Mon_pere_veut_me_marier.sg
+++ b/songs/Belyscendre/Mon_pere_veut_me_marier.sg
@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{Mon père veut me marier}
-  [by=Belyscendre,cov=prends-garde-au-loup]
+  [by=Belyscendre,cov=prends-garde-au-loup,album=Prends garde au loup]
  \cover
  \gtab{Do}{X32010}
--- a/songs/Belyscendre/Prends_garde_au_loup.sg
+++ b/songs/Belyscendre/Prends_garde_au_loup.sg
@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{Prends garde au loup}
-  [by=Belyscendre,cov=prends-garde-au-loup]
+  [by=Belyscendre,cov=prends-garde-au-loup,album=Prends garde au loup]
  \cover
  \gtab{Lam}{X02210}
--- a/songs/Ben_Harper/Waiting_on_an_angel.sg
+++ b/songs/Ben_Harper/Waiting_on_an_angel.sg
@ -1,7 +1,7 @@
 \selectlanguage{english}
 \songcolumns{2}
 \beginsong{Waiting on an Angel}
-  [by=Ben Harper,cov=welcome-to-the-cruel-world]
+  [by=Ben Harper,cov=welcome-to-the-cruel-world,album=Welcome to the cruel world]
  \cover
  \gtab{Do}{X30010}
--- a/songs/Ben_Harper/Widow_of_a_living_man.sg
+++ b/songs/Ben_Harper/Widow_of_a_living_man.sg
@ -1,7 +1,7 @@
 \selectlanguage{english}
 \songcolumns{2}
 \beginsong{Widow of a Living Man}
-  [by=Ben Harper,cov=the-will-to-live]
+  [by=Ben Harper,cov=the-will-to-live,album=The will to live]
  \cover
  \gtab{Lasus2}{X02200}
--- a/songs/Benabar/Le_diner.sg
+++ b/songs/Benabar/Le_diner.sg
@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{Le dîner}
-  [by=Bénabar,cov=reprise-des-negociations]
+  [by=Bénabar,cov=reprise-des-negociations,album=Reprise des negociations]
  \cover
  \gtab{Sim}{2:X02210}
--- a/songs/Benabar/Quatre_murs_et_un_toit.sg
+++ b/songs/Benabar/Quatre_murs_et_un_toit.sg
@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{Quatre murs et un toit}
-  [by=Bénabar,cov=reprise-des-negociations]
+  [by=Bénabar,cov=reprise-des-negociations,album=Reprise des negociations]
  \cover
  \capo{2}
--- a/songs/Benabar/Y_a_une_fille_qu_habite_chez_moi.sg
+++ b/songs/Benabar/Y_a_une_fille_qu_habite_chez_moi.sg
@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{1}
 \beginsong{Y'a une fille qu'habite chez moi}
-  [by=Bénabar,cov=benabar]
+  [by=Bénabar,cov=benabar,album=Benabar]
  \cover
  %verse
--- a/songs/Bob_Dylan/Blowin_in_the_wind.sg
+++ b/songs/Bob_Dylan/Blowin_in_the_wind.sg
@ -1,7 +1,7 @@
 \selectlanguage{english}
 \songcolumns{2}
 \beginsong{Blowin' in the wind}
-  [by=Bob Dylan,cov=the-freewheelin]
+  [by=Bob Dylan,cov=the-freewheelin,album=The freewheelin]
  \cover
  \gtab{Ré}{XX0232}
--- a/songs/Bob_Dylan/Knocking_on_heavens_door.sg
+++ b/songs/Bob_Dylan/Knocking_on_heavens_door.sg
@ -1,7 +1,7 @@
 \selectlanguage{english}
 \songcolumns{2}
 \beginsong{Knocking on heavens door}
-  [by=Bob Dylan,cov=mtv-unplugged]
+  [by=Bob Dylan,cov=mtv-unplugged,album=Mtv unplugged]
  \cover
  \capo{2}
--- a/songs/Bob_Dylan/Mr_tambourine_man.sg
+++ b/songs/Bob_Dylan/Mr_tambourine_man.sg
@ -1,7 +1,7 @@
 \selectlanguage{english}
 \songcolumns{2}
 \beginsong{Mr Tambourine Man}
-  [by=Bob Dylan,cov=the-freewheelin]
+  [by=Bob Dylan,cov=the-freewheelin,album=The freewheelin]
  \cover
  \gtab{Do}{X32010}
--- a/songs/Bob_Dylan/The_times_they_are_a-changin.sg
+++ b/songs/Bob_Dylan/The_times_they_are_a-changin.sg
@ -1,7 +1,7 @@
 \selectlanguage{english}
 \songcolumns{2}
 \beginsong{The times they are a-changin'}
-  [by=Bob Dylan,cov=the-times-they-are-a-changin]
+  [by=Bob Dylan,cov=the-times-they-are-a-changin,album=The times they are a changin]
  \cover
  \gtab{Sol}{320003}
--- a/songs/Boby_Lapointe/La_maman_des_poissons.sg
+++ b/songs/Boby_Lapointe/La_maman_des_poissons.sg
@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{La maman des poissons}
-  [by=Boby Lapointe,cov=l-integrale]
+  [by=Boby Lapointe,cov=l-integrale,album=L integrale]
  \cover
  \gtab{Sol}{320003}
--- a/songs/Britney_Spears/Baby_one_more_time.sg
+++ b/songs/Britney_Spears/Baby_one_more_time.sg
@ -1,7 +1,7 @@
 \selectlanguage{english}
 \songcolumns{2}
 \beginsong{\dots~Baby one more time}
-  [by=Britney Spears,cov=baby-one-more-time]
+  [by=Britney Spears,cov=baby-one-more-time,album=Baby one more time]
  \cover
  \gtab{Fa#}{2:022100}
--- a/songs/Bruce_Springsteen/Bring_em_home.sg
+++ b/songs/Bruce_Springsteen/Bring_em_home.sg
@ -1,7 +1,7 @@
 \selectlanguage{english}
 \songcolumns{2}
 \beginsong{Bring 'em home}
-  [by=Bruce Springsteen,cov=we-shall-overcome]
+  [by=Bruce Springsteen,cov=we-shall-overcome,album=We shall overcome]
  \cover
  \capo{3}
--- a/songs/Bruce_Springsteen/Buffalo_gals.sg
+++ b/songs/Bruce_Springsteen/Buffalo_gals.sg
@ -1,7 +1,7 @@
 \selectlanguage{english}
 \songcolumns{2}
 \beginsong{Buffalo gals}
-  [by=Bruce Springsteen,cov=we-shall-overcome]
+  [by=Bruce Springsteen,cov=we-shall-overcome,album=We shall overcome]
  \cover
  \gtab{Fa}{1:022100}
--- a/songs/Bruce_Springsteen/John_Henry.sg
+++ b/songs/Bruce_Springsteen/John_Henry.sg
@ -1,7 +1,7 @@
 \selectlanguage{english}
 \songcolumns{2}
 \beginsong{John Henry}
-  [by=Bruce Springsteen,cov=we-shall-overcome]
+  [by=Bruce Springsteen,cov=we-shall-overcome,album=We shall overcome]
  \cover
  \gtab{Fa}{1:022100}
--- a/songs/Bruce_Springsteen/O_Mary_don_t_you_weep.sg
+++ b/songs/Bruce_Springsteen/O_Mary_don_t_you_weep.sg
@ -1,7 +1,7 @@
 \selectlanguage{english}
 \songcolumns{2}
 \beginsong{O Mary don't you weep}
-  [by=Bruce Springsteen,cov=we-shall-overcome]
+  [by=Bruce Springsteen,cov=we-shall-overcome,album=We shall overcome]
  \cover
  \gtab{Solm}{3:022000}
--- a/songs/Bruce_Springsteen/Pay_me_my_money_down.sg
+++ b/songs/Bruce_Springsteen/Pay_me_my_money_down.sg
@ -1,7 +1,7 @@
 \selectlanguage{english}
 \songcolumns{2}
 \beginsong{Pay me my money down}
-  [by=Bruce Springsteen,cov=we-shall-overcome]
+  [by=Bruce Springsteen,cov=we-shall-overcome,album=We shall overcome]
  \cover
  \gtab{Sol}{320003}
--- a/songs/Carter_Family/In_the_highways.sg
+++ b/songs/Carter_Family/In_the_highways.sg
@ -1,7 +1,7 @@
 \selectlanguage{english}
 \songcolumns{2}
 \beginsong{In the highways}
-  [by=Carter Family,cov=o-brother]
+  [by=Carter Family,cov=o-brother,album=O brother]
  \cover
  \capo{1}
--- a/songs/Carter_Family/Keep_on_the_sunny_side.sg
+++ b/songs/Carter_Family/Keep_on_the_sunny_side.sg
@ -1,7 +1,7 @@
 \selectlanguage{english}
 \songcolumns{2}
 \beginsong{Keep on the sunny side}
-  [by=Carter Family,cov=o-brother]
+  [by=Carter Family,cov=o-brother,album=O brother]
  \cover
  \gtab{Si&}{6:022100}
--- a/songs/Cat_Stevens/Father_and_son.sg
+++ b/songs/Cat_Stevens/Father_and_son.sg
@ -1,7 +1,7 @@
 \selectlanguage{english}
 \songcolumns{2}
 \beginsong{Father and Son}
-  [by=Cat Stevens,cov=tea-for-the-tillerman]
+  [by=Cat Stevens,cov=tea-for-the-tillerman,album=Tea for the tillerman]
  \cover
  \gtab{Sol}{320003}
--- a/songs/Cat_Stevens/Here_comes_my_baby.sg
+++ b/songs/Cat_Stevens/Here_comes_my_baby.sg
@ -1,7 +1,7 @@
 \selectlanguage{english}
 \songcolumns{2}
 \beginsong{Here comes my baby}
-  [by=Cat Stevens,cov=matthew-and-son]
+  [by=Cat Stevens,cov=matthew-and-son,album=Matthew and son]
  \cover
  \gtab{Sol}{320003}
--- a/songs/Cat_Stevens/My_Lady_d_Arbanville.sg
+++ b/songs/Cat_Stevens/My_Lady_d_Arbanville.sg
@ -1,7 +1,7 @@
 \selectlanguage{english}
 \songcolumns{2}
 \beginsong{My lady d'Arbanville}
-  [by=Cat Stevens,cov=mona-bone-jakon]
+  [by=Cat Stevens,cov=mona-bone-jakon,album=Mona bone jakon]
  \cover
  \gtab{Mim}{022000}
--- a/songs/Cat_Stevens/Sad_Lisa.sg
+++ b/songs/Cat_Stevens/Sad_Lisa.sg
@ -1,7 +1,7 @@
 \selectlanguage{english}
 \songcolumns{2}
 \beginsong{Sad Lisa}
-  [by=Cat Stevens,cov=tea-for-the-tillerman]
+  [by=Cat Stevens,cov=tea-for-the-tillerman,album=Tea for the tillerman]
  \cover
  \gtab{Mim}{022000}
--- a/songs/Cat_Stevens/The_wind.sg
+++ b/songs/Cat_Stevens/The_wind.sg
@ -1,7 +1,7 @@
 \selectlanguage{english}
 \songcolumns{2}
 \beginsong{The wind}
-  [by=Cat Stevens,cov=teaser-and-the-firecat]
+  [by=Cat Stevens,cov=teaser-and-the-firecat,album=Teaser and the firecat]
  \cover
  \gtab{Ré}{XX0232}
--- a/songs/Charles_Aznavour/Emmenez-moi.sg
+++ b/songs/Charles_Aznavour/Emmenez-moi.sg
@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{Emmenez-moi}
-  [by=Charles Aznavour,cov=40-chansons-d-or]
+  [by=Charles Aznavour,cov=40-chansons-d-or,album=40 chansons d or]
  \cover
  \gtab{Lam}{X02210}
--- a/songs/Claude_Nougaro/Armstrong.sg
+++ b/songs/Claude_Nougaro/Armstrong.sg
@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{Armstrong}
-  [by=Claude Nougaro,cov=toulouse]
+  [by=Claude Nougaro,cov=toulouse,album=Toulouse]
  \cover
  \capo{3}
--- a/songs/Cranberries/Animal_instinct.sg
+++ b/songs/Cranberries/Animal_instinct.sg
@ -1,7 +1,7 @@
 \selectlanguage{english}
 \songcolumns{2}
 \beginsong{Animal instinct}
-  [by=Cranberries,cov=bury-the-hatchet]
+  [by=Cranberries,cov=bury-the-hatchet,album=Bury the hatchet]
  \cover
  \gtab{Mim}{022000}
--- a/songs/Cranberries/Zombie.sg
+++ b/songs/Cranberries/Zombie.sg
@ -1,7 +1,7 @@
 \selectlanguage{english}
 \songcolumns{2}
 \beginsong{Zombie}
-  [by=Cranberries,cov=no-need-to-argue]
+  [by=Cranberries,cov=no-need-to-argue,album=No need to argue]
  \cover
  \gtab{Mim}{022000}
--- a/songs/Crep/Bioman.sg
+++ b/songs/Crep/Bioman.sg
@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{Bioman}
-  [by=Crep,cov=histoires-d-un-manchot]
+  [by=Crep,cov=histoires-d-un-manchot,album=Histoires d un manchot]
  \cover
  \capo{3}
--- a/songs/Crep/Calimero.sg
+++ b/songs/Crep/Calimero.sg
@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{Caliméro}
-  [by=Crep,cov=histoires-d-un-manchot]
+  [by=Crep,cov=histoires-d-un-manchot,album=Histoires d un manchot]
  \cover
  \gtab{Rém}{5:X02210}
--- a/songs/Crep/Fichu_doctorat.sg
+++ b/songs/Crep/Fichu_doctorat.sg
@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{Fichu doctorat}
-  [by=Crep,cov=histoires-d-un-manchot]
+  [by=Crep,cov=histoires-d-un-manchot,album=Histoires d un manchot]
  \cover
  \gtab{Mim}{022000}
--- a/songs/Crep/Soiree_pepere.sg
+++ b/songs/Crep/Soiree_pepere.sg
@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{Soirée pépère}
-  [by=Crep,cov=histoires-d-un-manchot]
+  [by=Crep,cov=histoires-d-un-manchot,album=Histoires d un manchot]
  \cover
  \gtab{Lam}{5:022000}
--- a/songs/Crep/iScream.sg
+++ b/songs/Crep/iScream.sg
@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{iScream}
-  [by=Crep,cov=histoires-d-un-manchot]
+  [by=Crep,cov=histoires-d-un-manchot,album=Histoires d un manchot]
  \cover
  \gtab{La}{X02220}
--- a/songs/Debout_Sur_Le_Zinc/La_declaration.sg
+++ b/songs/Debout_Sur_Le_Zinc/La_declaration.sg
@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{La déclaration}
-  [by=Debout sur le Zinc,cov=les-promesses]
+  [by=Debout sur le Zinc,cov=les-promesses,album=Les promesses]
  \cover
  \gtab{Mim}{022000}
--- a/songs/Debout_Sur_Le_Zinc/Les_mots_d_amour.sg
+++ b/songs/Debout_Sur_Le_Zinc/Les_mots_d_amour.sg
@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{Les mots d'amour}
-  [by=Debout sur le Zinc,cov=les-promesses]
+  [by=Debout sur le Zinc,cov=les-promesses,album=Les promesses]
  \cover
  \capo{2}
--- a/songs/Debout_Sur_Le_Zinc/Ma_petite_cherie.sg
+++ b/songs/Debout_Sur_Le_Zinc/Ma_petite_cherie.sg
@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{Ma petite chérie}
-  [by=Debout sur le Zinc,cov=debout-sur-le-zinc]
+  [by=Debout sur le Zinc,cov=debout-sur-le-zinc,album=Debout sur le zinc]
  \cover
  \gtab{Do}{3:X02220}
--- a/songs/Debout_Sur_Le_Zinc/Poil_aux_yeux.sg
+++ b/songs/Debout_Sur_Le_Zinc/Poil_aux_yeux.sg
@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{Poil aux yeux}
-  [by=Debout sur le Zinc,cov=pitt-ocha]
+  [by=Debout sur le Zinc,cov=pitt-ocha,album=Pitt ocha]
  \cover
  \gtab{Mim}{7:X02210}
--- a/songs/Debout_Sur_Le_Zinc/Rester_debout.sg
+++ b/songs/Debout_Sur_Le_Zinc/Rester_debout.sg
@ -1,6 +1,6 @@
 \songcolumns{2}
 \beginsong{Rester debout}
-  [by=Debout sur le Zinc,cov=les-promesses]
+  [by=Debout sur le Zinc,cov=les-promesses,album=Les promesses]
  \cover
  \gtab{Fa}{1:022100}
--- a/songs/Dessins_Animes/Boumbo.sg
+++ b/songs/Dessins_Animes/Boumbo.sg
@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{Boumbo}
-  [by=Dessins Animés,cov=boumbo]
+  [by=Dessins Animés,cov=boumbo,album=Boumbo]
  \cover
  \gtab{Do}{X32010}
--- a/songs/Dessins_Animes/Denver.sg
+++ b/songs/Dessins_Animes/Denver.sg
@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{Denver, le dernier dinosaure}
-  [by=Dessins Animés,cov=denver]
+  [by=Dessins Animés,cov=denver,album=Denver]
  \cover
  \gtab{Ré}{XX0232}
--- a/songs/Dessins_Animes/Dragon_Ball.sg
+++ b/songs/Dessins_Animes/Dragon_Ball.sg
@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{Dragon Ball}
-  [by=Dessins Animés,cov=dragon-ball]
+  [by=Dessins Animés,cov=dragon-ball,album=Dragon ball]
  \cover
  \gtab{La}{X02220}
--- a/songs/Dessins_Animes/Dragon_Ball_Z.sg
+++ b/songs/Dessins_Animes/Dragon_Ball_Z.sg
@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{Dragon Ball Z}
-  [by=Dessins Animés,cov=dragon-ball-z]
+  [by=Dessins Animés,cov=dragon-ball-z,album=Dragon ball z]
  \cover
  \gtab{Do}{X32010}
--- a/songs/Dessins_Animes/I_Wanna_be_like_you.sg
+++ b/songs/Dessins_Animes/I_Wanna_be_like_you.sg
@ -1,7 +1,7 @@
 \selectlanguage{english}
 \songcolumns{2}
 \beginsong{Le livre de la jungle: I wanna be like you}
-  [by=Dessins Animés,cov=the-jungle-book]
+  [by=Dessins Animés,cov=the-jungle-book,album=The jungle book]
  \cover
  \gtab{Mim}{7:X02210}
--- a/songs/Dessins_Animes/Inspecteur_Gadget.sg
+++ b/songs/Dessins_Animes/Inspecteur_Gadget.sg
@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{Inspecteur Gadget}
-  [by=Dessins Animés,cov=inspecteur-gadget]
+  [by=Dessins Animés,cov=inspecteur-gadget,album=Inspecteur gadget]
  \cover
  \gtab{Lam}{X02210}
--- a/songs/Dessins_Animes/L_histoire_d_Actarus.sg
+++ b/songs/Dessins_Animes/L_histoire_d_Actarus.sg
@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{L'histoire d'Actarus}
-  [by=Dessins Animés,cov=actarus]
+  [by=Dessins Animés,cov=actarus,album=Actarus]
  \cover
  \capo{5}
--- a/songs/Dessins_Animes/L_oiseau_bleu.sg
+++ b/songs/Dessins_Animes/L_oiseau_bleu.sg
@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{L'oiseau bleu}
-  [by=Dessins Animés,cov=oiseau-bleu]
+  [by=Dessins Animés,cov=oiseau-bleu,album=Oiseau bleu]
  \cover
  \gtab{La}{X02220}
--- a/songs/Dessins_Animes/Les_chevaliers_du_zodiaque.sg
+++ b/songs/Dessins_Animes/Les_chevaliers_du_zodiaque.sg
@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{Les chevaliers du zodiaque}
-  [by=Dessins Animés,cov=zodiaque]
+  [by=Dessins Animés,cov=zodiaque,album=Zodiaque]
  \cover
  \gtab{La}{X02220}
--- a/songs/Dessins_Animes/Les_mysterieuses_cites_d_or.sg
+++ b/songs/Dessins_Animes/Les_mysterieuses_cites_d_or.sg
@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{Les mystérieuses cités d'or}
-  [by=Dessins Animés,cov=mysterieuses-cites-d-or]
+  [by=Dessins Animés,cov=mysterieuses-cites-d-or,album=Mysterieuses cites d or]
  \cover
  \gtab{Do}{X32010}
--- a/songs/Dessins_Animes/Lucky_Luke.sg
+++ b/songs/Dessins_Animes/Lucky_Luke.sg
@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{Lucky Luke}
-  [by=Dessins Animés,cov=lucky-luke]
+  [by=Dessins Animés,cov=lucky-luke,album=Lucky luke]
  \cover
  \gtab{Lam}{X02210}
--- a/songs/Dessins_Animes/Nicky_Larson.sg
+++ b/songs/Dessins_Animes/Nicky_Larson.sg
@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{Nicky Larson}
-  [by=Dessins Animés,cov=nicky-larson]
+  [by=Dessins Animés,cov=nicky-larson,album=Nicky larson]
  \cover
  \gtab{Solm}{3:022000}
--- a/songs/Dessins_Animes/Sherlock_Holmes.sg
+++ b/songs/Dessins_Animes/Sherlock_Holmes.sg
@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{Sherlock Holmes}
-  [by=Dessins Animés,cov=sherlock-holmes]
+  [by=Dessins Animés,cov=sherlock-holmes,album=Sherlock holmes]
  \cover
  \capo{1}
--- a/songs/Dessins_Animes/Themis_et_Nono.sg
+++ b/songs/Dessins_Animes/Themis_et_Nono.sg
@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{Ulysse 31 : Thémis et Nono}
-  [by=Dessins Animés,cov=ulysse]
+  [by=Dessins Animés,cov=ulysse,album=Ulysse]
  \cover
  \capo{2}
--- a/songs/Dessins_Animes/Tom_Sawyer_debut.sg
+++ b/songs/Dessins_Animes/Tom_Sawyer_debut.sg
@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{Tom Sawyer (début)}
-  [by=Dessins Animés,cov=tom-sawyer-debut]
+  [by=Dessins Animés,cov=tom-sawyer-debut,album=Tom sawyer debut]
  \cover
  \capo{1}
--- a/songs/Dessins_Animes/Tom_Sawyer_fin.sg
+++ b/songs/Dessins_Animes/Tom_Sawyer_fin.sg
@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{Tom Sawyer (fin)}
-  [by=Dessins Animés,cov=tom-sawyer-fin]
+  [by=Dessins Animés,cov=tom-sawyer-fin,album=Tom sawyer fin]
  \cover
  \gtab{Do}{X32010}
--- a/songs/Edith_Piaf/L_homme_a_la_moto.sg
+++ b/songs/Edith_Piaf/L_homme_a_la_moto.sg
@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{L'homme à la moto}
-  [by=Édith Piaf,cov=l-homme-a-la-moto]
+  [by=Édith Piaf,cov=l-homme-a-la-moto,album=L homme a la moto]
  \cover
  \gtab{Dom}{3:X02210}
--- a/songs/Eels/Dirty_girl.sg
+++ b/songs/Eels/Dirty_girl.sg
@ -1,7 +1,7 @@
 \selectlanguage{english}
 \songcolumns{2}
 \beginsong{Dirty girl}
-  [by=Eels,cov=shootenanny]
+  [by=Eels,cov=shootenanny,album=Shootenanny]
  \cover
  \gtab{Do}{X32010}
--- a/songs/Eels/Hey_man.sg
+++ b/songs/Eels/Hey_man.sg
@ -1,7 +1,7 @@
 \selectlanguage{english}
 \songcolumns{2}
 \beginsong{Hey man}
-  [by=Eels,cov=blinking-lights]
+  [by=Eels,cov=blinking-lights,album=Blinking lights]
  \cover
  \gtab{Sol}{320003}
--- a/songs/Eels/I_like_birds.sg
+++ b/songs/Eels/I_like_birds.sg
@ -1,7 +1,7 @@
 \selectlanguage{english}
 \songcolumns{2}
 \beginsong{I like birds}
-  [by=Eels,cov=daisies-of-the-galaxy]
+  [by=Eels,cov=daisies-of-the-galaxy,album=Daisies of the galaxy]
  \cover
  \capo{2}
--- a/songs/Eels/Packing_blankets.sg
+++ b/songs/Eels/Packing_blankets.sg
@ -1,7 +1,7 @@
 \selectlanguage{english}
 \songcolumns{2}
 \beginsong{Packing blankets}
-  [by=Eels,cov=daisies-of-the-galaxy]
+  [by=Eels,cov=daisies-of-the-galaxy,album=Daisies of the galaxy]
  \cover
  \capo{3}
--- a/songs/Fools_Garden/Lemon_tree.sg
+++ b/songs/Fools_Garden/Lemon_tree.sg
@ -1,7 +1,7 @@
 \selectlanguage{english}
 \songcolumns{2}
 \beginsong{Lemon tree}
-  [by=Fool's Garden,cov=dish-of-the-day]
+  [by=Fool's Garden,cov=dish-of-the-day,album=Dish of the day]
  \cover
  \gtab{Mim}{7:X02210}
--- a/songs/Francis_Cabrel/Je_l_aime_a_mourir.sg
+++ b/songs/Francis_Cabrel/Je_l_aime_a_mourir.sg
@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{Je l'aime à mourir}
-  [by=Francis Cabrel,cov=les-chemins-de-traverse]
+  [by=Francis Cabrel,cov=les-chemins-de-traverse,album=Les chemins de traverse]
  \cover
  \capo{5}
--- a/songs/Francis_Cabrel/Petite_Marie.sg
+++ b/songs/Francis_Cabrel/Petite_Marie.sg
@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{Petite Marie}
-  [by=Francis Cabrel,cov=les-murs-de-poussiere]
+  [by=Francis Cabrel,cov=les-murs-de-poussiere,album=Les murs de poussiere]
  \cover
  \gtab{Mim}{022000}
--- a/songs/Garfunkel_and_Oates/Fuck_you.sg
+++ b/songs/Garfunkel_and_Oates/Fuck_you.sg
@ -1,7 +1,7 @@
 \selectlanguage{english}
 \songcolumns{2}
 \beginsong{F*** you}
-  [by=Garfunkel and Oates,cov=garfunkel-and-oates]
+  [by=Garfunkel and Oates,cov=garfunkel-and-oates,album=Garfunkel and oates]
  \cover
  \gtab{Do}{X32010}
--- a/songs/Georges_Brassens/A_l_ombre_du_coeur_de_ma_mie.sg
+++ b/songs/Georges_Brassens/A_l_ombre_du_coeur_de_ma_mie.sg
@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{À l'ombre du cœur de ma mie}
-  [by=Georges Brassens,cov=le-pornographe]
+  [by=Georges Brassens,cov=le-pornographe,album=Le pornographe]
  \cover
  \gtab{Sim}{2:X02210}
--- a/songs/Georges_Brassens/Ballade_des_dames_du_temps_jadis.sg
+++ b/songs/Georges_Brassens/Ballade_des_dames_du_temps_jadis.sg
@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{Ballade des dames du temps jadis}
-  [by=Georges Brassens,cov=la-mauvaise-reputation]
+  [by=Georges Brassens,cov=la-mauvaise-reputation,album=La mauvaise reputation]
  \cover
  \gtab{La}{X02220}
--- a/songs/Georges_Brassens/Cupidon_s_en_fout.sg
+++ b/songs/Georges_Brassens/Cupidon_s_en_fout.sg
@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{Cupidon s'en fout}
-  [by=Georges Brassens,cov=don-juan]
+  [by=Georges Brassens,cov=don-juan,album=Don juan]
  \cover
  \gtab{Lam}{X02210}
--- a/songs/Georges_Brassens/Grand_pere.sg
+++ b/songs/Georges_Brassens/Grand_pere.sg
@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{Grand-père}
-  [by=Georges Brassens,cov=je-me-suis-fais-tout-petit]
+  [by=Georges Brassens,cov=je-me-suis-fais-tout-petit,album=Je me suis fais tout petit]
  \cover
  \capo{2}
--- a/songs/Georges_Brassens/Je_me_suis_fait_tout_petit.sg
+++ b/songs/Georges_Brassens/Je_me_suis_fait_tout_petit.sg
@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{Je me suis fait tout petit}
-  [by=Georges Brassens,cov=je-me-suis-fais-tout-petit]
+  [by=Georges Brassens,cov=je-me-suis-fais-tout-petit,album=Je me suis fais tout petit]
  \cover
  \gtab{Sim}{2:X02210}
--- a/songs/Georges_Brassens/La_chanson_du_herisson.sg
+++ b/songs/Georges_Brassens/La_chanson_du_herisson.sg
@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{La chanson du hérisson}
-  [by=Georges Brassens \& Philippe Chatel,cov=emilie-jolie]
+  [by=Georges Brassens \& Philippe Chatel,cov=emilie-jolie,album=Emilie jolie]
  \cover
  \gtab{Sim}{2:X02210}
--- a/songs/Georges_Brassens/La_mauvaise_reputation.sg
+++ b/songs/Georges_Brassens/La_mauvaise_reputation.sg
@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{La mauvaise réputation}
-  [by=Georges Brassens,cov=la-mauvaise-reputation]
+  [by=Georges Brassens,cov=la-mauvaise-reputation,album=La mauvaise reputation]
  \cover
  \gtab{Sim}{2:X02210}
--- a/songs/Georges_Brassens/Le_gorille.sg
+++ b/songs/Georges_Brassens/Le_gorille.sg
@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{Le gorille}
-  [by=Georges Brassens,cov=la-mauvaise-reputation]
+  [by=Georges Brassens,cov=la-mauvaise-reputation,album=La mauvaise reputation]
  \cover
  \capo{2}
--- a/songs/Georges_Brassens/Le_petit_cheval.sg
+++ b/songs/Georges_Brassens/Le_petit_cheval.sg
@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{Le petit cheval}
-  [by=Georges Brassens,cov=la-mauvaise-reputation]
+  [by=Georges Brassens,cov=la-mauvaise-reputation,album=La mauvaise reputation]
  \cover
  \gtab{La}{X02220}
--- a/songs/Georges_Brassens/Les_copains_d_abord.sg
+++ b/songs/Georges_Brassens/Les_copains_d_abord.sg
@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{Les copains d'abord}
-  [by=Georges Brassens,cov=les-copains-d-abord]
+  [by=Georges Brassens,cov=les-copains-d-abord,album=Les copains d abord]
  \cover
  \gtab{Ré}{XX0232}
--- a/songs/Gilles_Servat/La_blanche_hermine.sg
+++ b/songs/Gilles_Servat/La_blanche_hermine.sg
@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{La blanche hermine}
-  [by=Gilles Servat,cov=la-blanche-hermine]
+  [by=Gilles Servat,cov=la-blanche-hermine,album=La blanche hermine]
  \cover
  \gtab{Lam}{X02210}
--- a/songs/Gogol_Bordello/Oh_no.sg
+++ b/songs/Gogol_Bordello/Oh_no.sg
@ -1,7 +1,7 @@
 \selectlanguage{english}
 \songcolumns{2}
 \beginsong{Oh no}
-  [by=Gogol Bordello,cov=gypsy-punks]
+  [by=Gogol Bordello,cov=gypsy-punks,album=Gypsy punks]
  \cover
  \gtab{Mim}{7:X02210}
--- a/songs/Graeme_Allwright/Ca_je_l_ai_jamais_vu.sg
+++ b/songs/Graeme_Allwright/Ca_je_l_ai_jamais_vu.sg
@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{1}
 \beginsong{Ça je l'ai jamais vu}
-  [by=Graeme Allwright,cov=emmene-moi]
+  [by=Graeme Allwright,cov=emmene-moi,album=Emmene moi]
  \cover
--- a/songs/Graeme_Allwright/Henrik.sg
+++ b/songs/Graeme_Allwright/Henrik.sg
@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{Henrik}
-  [by=Graeme Allwright,cov=emmene-moi]
+  [by=Graeme Allwright,cov=emmene-moi,album=Emmene moi]
  \cover
--- a/songs/Graeme_Allwright/Il_faut_que_je_m_en_aille.sg
+++ b/songs/Graeme_Allwright/Il_faut_que_je_m_en_aille.sg
@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{Il faut que je m'en aille}
-  [by=Graeme Allwright,cov=le-jour-de-clarte]
+  [by=Graeme Allwright,cov=le-jour-de-clarte,album=Le jour de clarte]
  \cover
  \gtab{Do}{X32010}
--- a/songs/Graeme_Allwright/Johnny.sg
+++ b/songs/Graeme_Allwright/Johnny.sg
@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{Johnny}
-  [by=Graeme Allwright,cov=emmene-moi]
+  [by=Graeme Allwright,cov=emmene-moi,album=Emmene moi]
  \cover
--- a/songs/Graeme_Allwright/Jolie_Bouteille.sg
+++ b/songs/Graeme_Allwright/Jolie_Bouteille.sg
@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{Jolie bouteille}
-  [by=Graeme Allwright,cov=emmene-moi]
+  [by=Graeme Allwright,cov=emmene-moi,album=Emmene moi]
  \cover