indent songs + use utf8 for titles/artists + minor corrections

15 years ago · 850a4975b4
289 changed files with 15453 additions and 15153 deletions
--- a/songs/Aaron/U_turn_lili.sg
+++ b/songs/Aaron/U_turn_lili.sg
@ -1,5 +1,6 @@
 \songcolumns{1}
-\beginsong{U-Turn (Lili)}[by=AaRON,cov=aaron]
+\beginsong{U-Turn (Lili)}
+  [by=AaRON,cov=aaron]

  \cover
  \gtab{Mim}{022000}
@ -17,7 +18,9 @@ So much stuff you got to under\[Fa]stand
    For every \[Lam]step in any walk
    Any \[Mim]town of any thought
    I'll be your \[Fa]guide
+  \endchorus

+  \beginchorus
    For every street of any scene,
    Any place you've never been
    I'll be your guide
--- a/songs/Alain_Bashung/Gaby_oh_gaby.sg
+++ b/songs/Alain_Bashung/Gaby_oh_gaby.sg
@ -1,5 +1,6 @@
 \songcolumns{1}
-\beginsong{Gaby, oh Gaby}[by=Alain Bashung,cov=roulette-russe]
+\beginsong{Gaby, oh Gaby}
+  [by=Alain Bashung,cov=roulette-russe]

  \cover
  \gtab{Mi}{022100}
--- a/songs/Alain_Souchon/Foule_sentimentale.sg
+++ b/songs/Alain_Souchon/Foule_sentimentale.sg
@ -1,5 +1,6 @@
 \songcolumns{2}
-\beginsong{Foule sentimentale}[by=Alain Souchon,cov=c-est-deja-ca]
+\beginsong{Foule sentimentale}
+  [by=Alain Souchon,cov=c-est-deja-ca]

  \cover
  \gtab{Mim}{022000}
--- a/songs/Alexis_HK/Gaspard.sg
+++ b/songs/Alexis_HK/Gaspard.sg
@ -1,5 +1,6 @@
 \songcolumns{1}
-\beginsong{Gaspard}[by=Alexis HK,cov=belle-ville]
+\beginsong{Gaspard}
+  [by=Alexis HK,cov=belle-ville]

  \capo{4}
  \cover
--- a/songs/Alicia_Keys/If_aint_got_you.sg
+++ b/songs/Alicia_Keys/If_aint_got_you.sg
@ -1,5 +1,6 @@
 \songcolumns{2}
-\beginsong{If I ain't got you}[by=Alicia Keys,cov=If_aint_got_you]
+\beginsong{If I ain't got you}
+  [by=Alicia Keys,cov=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,5 +1,6 @@
 \songcolumns{1}
-\beginsong{Mr. Rock'n Roll}[by=Amy MacDonald,cov=this-is-the-life]
+\beginsong{Mr. Rock'n Roll}
+  [by=Amy MacDonald,cov=this-is-the-life]

  \capo{7}
  \cover
@ -55,4 +56,5 @@ And so they must be depart too many moral broken hearts
    But I've seen that all before in TV, books and films and more
    And there's a happy ending, every single day.
  \endverse
+
 \endsong
--- a/songs/Amy_MacDonald/This_is_the_life.sg
+++ b/songs/Amy_MacDonald/This_is_the_life.sg
@ -1,5 +1,6 @@
 \songcolumns{1}
-\beginsong{This is the life}[by=Amy MacDonald,cov=this-is-the-life]
+\beginsong{This is the life}
+  [by=Amy MacDonald,cov=this-is-the-life]

  \capo{4}
  \cover
--- a/songs/Anais/Mon_coeur_mon_amour.sg
+++ b/songs/Anais/Mon_coeur_mon_amour.sg
@ -1,5 +1,6 @@
 \songcolumns{2}
-\beginsong{Mon cœur, mon amour}[by=Anais,cov=the-cheap-show]
+\beginsong{Mon cœur, mon amour}
+  [by=Anais,cov=the-cheap-show]

  \cover
  \gtab{Fa#}{2:022100}
@ -70,5 +71,4 @@ Un, deux, trois,
    J'suis encore là !
  \endverse

-
 \endsong
--- 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,5 +1,6 @@
 \songcolumns{2}
-\beginsong{La danse des esquimaux}[by=Anny et Jean-Marc Versini,cov=les-chansons-de-la-marmotte]
+\beginsong{La danse des esquimaux}
+  [by=Anny et Jean-Marc Versini,cov=les-chansons-de-la-marmotte]

  \capo{4}
  \cover
@ -22,4 +23,3 @@

 \endsong

-
--- a/songs/As_De_Trefle/Jessica.sg
+++ b/songs/As_De_Trefle/Jessica.sg
@ -1,5 +1,6 @@
 \songcolumns{1}
-\beginsong{Jessica}[by=As de Trêfle,cov=merci-bonsoir]
+\beginsong{Jessica}
+  [by=As de Trêfle,cov=merci-bonsoir]

  \cover
  \gtab{Do}{X32010}
--- a/songs/Avril_Lavigne/Things_I_ll_never_say.sg
+++ b/songs/Avril_Lavigne/Things_I_ll_never_say.sg
@ -1,5 +1,6 @@
 \songcolumns{1}
-\beginsong{Things I'll never say}[by=Avril Lavigne,cov=let-go]
+\beginsong{Things I'll never say}
+  [by=Avril Lavigne,cov=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,5 +1,7 @@
 \songcolumns{1}
-\beginsong{All I want is you}[by=Barry Louis Polisar,cov=juno]
+\beginsong{All I want is you}
+  [by=Barry Louis Polisar,cov=juno]
+
  \cover
  \gtab{Sol}{320003}
  \gtab{Do}{X32010}
--- a/songs/Beau_Dommage/La_complainte_du_phoque_en_alaska.sg
+++ b/songs/Beau_Dommage/La_complainte_du_phoque_en_alaska.sg
@ -1,5 +1,6 @@
 \songcolumns{2}
-\beginsong{La complainte du phoque en Alaska}[by=Beau Dommage,cov=le-meilleur-de-beau-dommage]
+\beginsong{La complainte du phoque en Alaska}
+  [by=Beau Dommage,cov=le-meilleur-de-beau-dommage]

  \capo{3}
  \cover
--- a/songs/Belle_Sebastian/Piazza_New-York_catcher.sg
+++ b/songs/Belle_Sebastian/Piazza_New-York_catcher.sg
@ -1,5 +1,6 @@
 \songcolumns{1}
-\beginsong{Piazza, New-York catcher}[by=Belle \& Sebastian,cov=juno]
+\beginsong{Piazza, New-York catcher}
+  [by=Belle \& Sebastian,cov=juno]

  \cover
  \gtab{Fa#}{2:022100}
@ -16,6 +17,7 @@ How \[Sol#m]many nights of limping round on \[Do#]pagan holidays?
    Oh e\[Si]lope with me in private and we'll \[Re#m]{set something} ablaze
    A \[Sol#m]{trail for} the \[Do#]devil to \[Re#m]erase 
  \endverse
+
  \beginverse
    San Francisco's calling us, the Giants and Mets will play
    Piazza, New York catcher, are you straight or are you gay ?
--- a/songs/Belyscendre/Mon_pere_veut_me_marier.sg
+++ b/songs/Belyscendre/Mon_pere_veut_me_marier.sg
@ -1,5 +1,6 @@
 \songcolumns{2}
-\beginsong{Mon père veut me marier}[by=Belyscendre,cov=prends-garde-au-loup]
+\beginsong{Mon père veut me marier}
+  [by=Belyscendre,cov=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,5 +1,6 @@
 \songcolumns{2}
-\beginsong{Prends garde au loup}[by=Belyscendre,cov=prends-garde-au-loup]
+\beginsong{Prends garde au loup}
+  [by=Belyscendre,cov=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,5 +1,6 @@
 \songcolumns{2}
-\beginsong{Waiting on an Angel}[by=Ben Harper,cov=welcome-to-the-cruel-world]
+\beginsong{Waiting on an Angel}
+  [by=Ben Harper,cov=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,5 +1,6 @@
 \songcolumns{2}
-\beginsong{Widow of a Living Man}[by=Ben Harper,cov=the-will-to-live]
+\beginsong{Widow of a Living Man}
+  [by=Ben Harper,cov=the-will-to-live]

  \cover
  \gtab{Lasus2}{X02200}
--- a/songs/Benabar/Le_diner.sg
+++ b/songs/Benabar/Le_diner.sg
@ -1,5 +1,6 @@
 \songcolumns{2}
-\beginsong{Le d\^iner}[by=B\'enabar,cov=reprise-des-negociations]
+\beginsong{Le dîner}
+  [by=Bénabar,cov=reprise-des-negociations]

  \cover
  \gtab{Sim}{2:X02210}
@ -87,4 +88,5 @@ Comment oses-tu dire ça ?
    Moi qui suis malheureux et triste
    Et j'ai même pas de home cinema
  \endverse
+
 \endsong
--- a/songs/Benabar/Quatre_murs_et_un_toit.sg
+++ b/songs/Benabar/Quatre_murs_et_un_toit.sg
@ -1,5 +1,6 @@
 \songcolumns{2}
-\beginsong{Quatre murs et un toit}[by=B\'enabar,cov=reprise-des-negociations]
+\beginsong{Quatre murs et un toit}
+  [by=Bénabar,cov=reprise-des-negociations]

  \capo{2}
  \cover
--- 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,5 +1,6 @@
 \songcolumns{1}
-\beginsong{Y'a une fille qu'habite chez moi}[by=B\'enabar,cov=benabar]
+\beginsong{Y'a une fille qu'habite chez moi}
+  [by=Bénabar,cov=benabar]

  \cover
  \gtab{Dom}{3:X02210}
--- a/songs/Bob_Dylan/Blowin_in_the_wind.sg
+++ b/songs/Bob_Dylan/Blowin_in_the_wind.sg
@ -1,5 +1,6 @@
 \songcolumns{2}
-\beginsong{Blowin' in the wind}[by=Bob Dylan,cov=the-freewheelin]
+\beginsong{Blowin' in the wind}
+  [by=Bob Dylan,cov=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,5 +1,6 @@
 \songcolumns{2}
-\beginsong{Knocking on heavens door}[by=Bob Dylan,cov=mtv-unplugged]
+\beginsong{Knocking on heavens door}
+  [by=Bob Dylan,cov=mtv-unplugged]

  \capo{2}
  \cover
--- a/songs/Bob_Dylan/Mr_tambourine_man.sg
+++ b/songs/Bob_Dylan/Mr_tambourine_man.sg
@ -1,5 +1,6 @@
 \songcolumns{2}
-\beginsong{Mr Tambourine Man}[by=Bob Dylan,cov=the-freewheelin]
+\beginsong{Mr Tambourine Man}
+  [by=Bob Dylan,cov=the-freewheelin]

  \cover
  \gtab{Do}{X32010}
--- a/songs/Boby_Lapointe/La_maman_des_poissons.sg
+++ b/songs/Boby_Lapointe/La_maman_des_poissons.sg
@ -1,5 +1,6 @@
 \songcolumns{2}
-\beginsong{La maman des poissons}[by=Boby Lapointe,cov=l-integrale]
+\beginsong{La maman des poissons}
+  [by=Boby Lapointe,cov=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,5 +1,6 @@
 \songcolumns{2}
-\beginsong{\dots~Baby one more time}[by=Britney Spears,cov=baby-one-more-time]
+\beginsong{\dots~Baby one more time}
+  [by=Britney Spears,cov=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,5 +1,6 @@
 \songcolumns{2}
-\beginsong{Bring 'em home}[by=Bruce Springsteen,cov=we-shall-overcome]
+\beginsong{Bring 'em home}
+  [by=Bruce Springsteen,cov=we-shall-overcome]

  \capo{3}
  \cover
--- a/songs/Bruce_Springsteen/Buffalo_gals.sg
+++ b/songs/Bruce_Springsteen/Buffalo_gals.sg
@ -1,5 +1,6 @@
 \songcolumns{2}
-\beginsong{Buffalo gals}[by=Bruce Springsteen,cov=we-shall-overcome]
+\beginsong{Buffalo gals}
+  [by=Bruce Springsteen,cov=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,5 +1,6 @@
 \songcolumns{2}
-\beginsong{O Mary don't you weep}[by=Bruce Springsteen,cov=we-shall-overcome]
+\beginsong{O Mary don't you weep}
+  [by=Bruce Springsteen,cov=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,5 +1,6 @@
 \songcolumns{2}
-\beginsong{Pay me my money down}[by=Bruce Springsteen,cov=we-shall-overcome]
+\beginsong{Pay me my money down}
+  [by=Bruce Springsteen,cov=we-shall-overcome]

  \cover
  \gtab{Sol}{320003}
--- a/songs/Carter_Family/In_the_highways.sg
+++ b/songs/Carter_Family/In_the_highways.sg
@ -1,5 +1,6 @@
 \songcolumns{2}
-\beginsong{In the highways}[by=Carter Family,cov=o-brother]
+\beginsong{In the highways}
+  [by=Carter Family,cov=o-brother]

  \capo{1}
  \cover
--- a/songs/Carter_Family/Keep_on_the_sunny_side.sg
+++ b/songs/Carter_Family/Keep_on_the_sunny_side.sg
@ -1,5 +1,6 @@
 \songcolumns{2}
-\beginsong{Keep on the sunny side}[by=Carter Family,cov=o-brother]
+\beginsong{Keep on the sunny side}
+  [by=Carter Family,cov=o-brother]

  \cover
  \gtab{Si&}{6:022100}
--- a/songs/Cat_Stevens/Father_and_son.sg
+++ b/songs/Cat_Stevens/Father_and_son.sg
@ -1,5 +1,6 @@
 \songcolumns{2}
-\beginsong{Father and Son}[by=Cat Stevens,cov=tea-for-the-tillerman]
+\beginsong{Father and Son}
+  [by=Cat Stevens,cov=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,5 +1,6 @@
 \songcolumns{2}
-\beginsong{Here comes my baby}[by=Cat Stevens,cov=matthew-and-son]
+\beginsong{Here comes my baby}
+  [by=Cat Stevens,cov=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,5 +1,6 @@
 \songcolumns{2}
-\beginsong{My lady d'Arbanville}[by=Cat Stevens,cov=mona-bone-jakon]
+\beginsong{My lady d'Arbanville}
+  [by=Cat Stevens,cov=mona-bone-jakon]

  \cover
  \gtab{Mim}{022000}
--- a/songs/Cat_Stevens/Sad_Lisa.sg
+++ b/songs/Cat_Stevens/Sad_Lisa.sg
@ -1,5 +1,6 @@
 \songcolumns{2}
-\beginsong{Sad Lisa}[by=Cat Stevens,cov=tea-for-the-tillerman]
+\beginsong{Sad Lisa}
+  [by=Cat Stevens,cov=tea-for-the-tillerman]

  \cover
  \gtab{Mim}{022000}
--- a/songs/Cat_Stevens/The_wind.sg
+++ b/songs/Cat_Stevens/The_wind.sg
@ -1,5 +1,6 @@
 \songcolumns{2}
-\beginsong{The wind}[by=Cat Stevens,cov=teaser-and-the-firecat]
+\beginsong{The wind}
+  [by=Cat Stevens,cov=teaser-and-the-firecat]

  \cover
  \gtab{Ré}{XX0232}
--- a/songs/Charles_Aznavour/Emmenez-moi.sg
+++ b/songs/Charles_Aznavour/Emmenez-moi.sg
@ -1,5 +1,6 @@
 \songcolumns{2}
-\beginsong{Emmenez-moi}[by=Charles Aznavour,cov=40-chansons-d-or]
+\beginsong{Emmenez-moi}
+  [by=Charles Aznavour,cov=40-chansons-d-or]

  \cover
  \gtab{Lam}{X02210}
--- a/songs/Claude_Nougaro/Armstrong.sg
+++ b/songs/Claude_Nougaro/Armstrong.sg
@ -1,5 +1,6 @@
 \songcolumns{2}
-\beginsong{Armstrong}[by=Claude Nougaro,cov=toulouse]
+\beginsong{Armstrong}
+  [by=Claude Nougaro,cov=toulouse]

  \capo{3}
  \cover
--- a/songs/Cranberries/Animal_instinct.sg
+++ b/songs/Cranberries/Animal_instinct.sg
@ -1,5 +1,6 @@
 \songcolumns{2}
-\beginsong{Animal instinct}[by=Cranberries,cov=bury-the-hatchet]
+\beginsong{Animal instinct}
+  [by=Cranberries,cov=bury-the-hatchet]

  \cover
  \gtab{Mim}{022000}
--- a/songs/Cranberries/Zombie.sg
+++ b/songs/Cranberries/Zombie.sg
@ -1,5 +1,6 @@
 \songcolumns{2}
-\beginsong{Zombie}[by=Cranberries,cov=no-need-to-argue]
+\beginsong{Zombie}
+  [by=Cranberries,cov=no-need-to-argue]

  \cover
  \gtab{Mim}{022000}
--- a/songs/Debout_Sur_Le_Zinc/La_declaration.sg
+++ b/songs/Debout_Sur_Le_Zinc/La_declaration.sg
@ -1,5 +1,6 @@
 \songcolumns{2}
-\beginsong{La déclaration}[by=Debout sur le Zinc,cov=les-promesses]
+\beginsong{La déclaration}
+  [by=Debout sur le Zinc,cov=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,5 +1,6 @@
 \songcolumns{2}
-\beginsong{Les mots d'amour}[by=Debout sur le Zinc,cov=les-promesses]
+\beginsong{Les mots d'amour}
+  [by=Debout sur le Zinc,cov=les-promesses]

  \capo{2}
  \cover
--- a/songs/Debout_Sur_Le_Zinc/Poil_aux_yeux.sg
+++ b/songs/Debout_Sur_Le_Zinc/Poil_aux_yeux.sg
@ -1,5 +1,6 @@
 \songcolumns{2}
-\beginsong{Poil aux yeux}[by=Debout sur le Zinc,cov=pitt-ocha]
+\beginsong{Poil aux yeux}
+  [by=Debout sur le Zinc,cov=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,5 +1,6 @@
 \songcolumns{2}
-\beginsong{Rester debout}[by=Debout sur le Zinc,cov=les-promesses]
+\beginsong{Rester debout}
+  [by=Debout sur le Zinc,cov=les-promesses]

  \cover
  \gtab{Fa}{1:022100}
--- a/songs/Dessins_Animes/I_Wanna_be_like_you.sg
+++ b/songs/Dessins_Animes/I_Wanna_be_like_you.sg
@ -1,5 +1,6 @@
 \songcolumns{2}
-\beginsong{Le livre de la jungle: I wanna be like you}[by=Dessins Animés,cov=the-jungle-book]
+\beginsong{Le livre de la jungle: I wanna be like you}
+  [by=Dessins Animés,cov=the-jungle-book]

  \cover
  \gtab{Mim}{7:X02210}
--- a/songs/Dessins_Animes/Inspecteur_Gadget.sg
+++ b/songs/Dessins_Animes/Inspecteur_Gadget.sg
@ -1,5 +1,6 @@
 \songcolumns{2}
-\beginsong{Inspecteur Gadget}[by=Dessins Animés,cov=inspecteur-gadget]
+\beginsong{Inspecteur Gadget}
+  [by=Dessins Animés,cov=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,5 +1,6 @@
 \songcolumns{2}
-\beginsong{L'histoire d'Actarus}[by=Dessins Animés,cov=actarus]
+\beginsong{L'histoire d'Actarus}
+  [by=Dessins Animés,cov=actarus]

  \capo{5}
  \cover
--- a/songs/Dessins_Animes/L_oiseau_bleu.sg
+++ b/songs/Dessins_Animes/L_oiseau_bleu.sg
@ -1,5 +1,6 @@
 \songcolumns{2}
-\beginsong{L'oiseau bleu}[by=Dessins Animés,cov=oiseau-bleu]
+\beginsong{L'oiseau bleu}
+  [by=Dessins Animés,cov=oiseau-bleu]

  \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,5 +1,6 @@
 \songcolumns{2}
-\beginsong{Les mystérieuses cités d'or}[by=Dessins Animés,cov=mysterieuses-cites-d-or]
+\beginsong{Les mystérieuses cités d'or}
+  [by=Dessins Animés,cov=mysterieuses-cites-d-or]

  \cover
  \gtab{Do}{X32010}
--- a/songs/Dessins_Animes/Nicky_Larson.sg
+++ b/songs/Dessins_Animes/Nicky_Larson.sg
@ -1,5 +1,6 @@
 \songcolumns{2}
-\beginsong{Nicky Larson}[by=Dessins Animés,cov=nicky-larson]
+\beginsong{Nicky Larson}
+  [by=Dessins Animés,cov=nicky-larson]

  \cover
  \gtab{Solm}{3:022000}
--- a/songs/Dessins_Animes/Themis_et_Nono.sg
+++ b/songs/Dessins_Animes/Themis_et_Nono.sg
@ -1,5 +1,6 @@
 \songcolumns{2}
-\beginsong{Ulysse 31: Thémis et Nono}[by=Dessins Animés,cov=ulysse]
+\beginsong{Ulysse 31: Thémis et Nono}
+  [by=Dessins Animés,cov=ulysse]

  \capo{2}
  \cover
--- a/songs/Dessins_Animes/Tom_Sawyer_debut.sg
+++ b/songs/Dessins_Animes/Tom_Sawyer_debut.sg
@ -1,5 +1,6 @@
 \songcolumns{2}
-\beginsong{Tom Sawyer (début)}[by=Dessins Animés,cov=tom-sawyer-debut]
+\beginsong{Tom Sawyer (début)}
+  [by=Dessins Animés,cov=tom-sawyer-debut]

  \capo{1}
  \cover
--- a/songs/Dessins_Animes/Tom_Sawyer_fin.sg
+++ b/songs/Dessins_Animes/Tom_Sawyer_fin.sg
@ -1,5 +1,6 @@
 \songcolumns{2}
-\beginsong{Tom Sawyer (fin)}[by=Dessins Animés,cov=tom-sawyer-fin]
+\beginsong{Tom Sawyer (fin)}
+  [by=Dessins Animés,cov=tom-sawyer-fin]

  \cover
  \gtab{Do}{X32010}
--- a/songs/Eels/Dirty_girl.sg
+++ b/songs/Eels/Dirty_girl.sg
@ -1,5 +1,6 @@
 \songcolumns{2}
-\beginsong{Dirty girl}[by=Eels,cov=shootenanny]
+\beginsong{Dirty girl}
+  [by=Eels,cov=shootenanny]

  \cover
  \gtab{Do}{X32010}
--- a/songs/Eels/Hey_man.sg
+++ b/songs/Eels/Hey_man.sg
@ -1,5 +1,6 @@
 \songcolumns{2}
-\beginsong{Hey man}[by=Eels,cov=blinking-lights]
+\beginsong{Hey man}
+  [by=Eels,cov=blinking-lights]

  \cover
  \gtab{Sol}{320003}
--- a/songs/Eels/I_like_birds.sg
+++ b/songs/Eels/I_like_birds.sg
@ -1,5 +1,6 @@
 \songcolumns{2}
-\beginsong{I like birds}[by=Eels,cov=daisies-of-the-galaxy]
+\beginsong{I like birds}
+  [by=Eels,cov=daisies-of-the-galaxy]

  \capo{2}
  \cover
--- a/songs/Eels/Packing_blankets.sg
+++ b/songs/Eels/Packing_blankets.sg
@ -1,5 +1,6 @@
 \songcolumns{2}
-\beginsong{Packing blankets}[by=Eels,cov=daisies-of-the-galaxy]
+\beginsong{Packing blankets}
+  [by=Eels,cov=daisies-of-the-galaxy]

  \capo{3}
  \cover
--- a/songs/Francine_Pohl/La_sorciere_Grabouilla.sg
+++ b/songs/Francine_Pohl/La_sorciere_Grabouilla.sg
@ -1,5 +1,6 @@
 \songcolumns{2}
-\beginsong{La sorcière Grabouilla}[by=Francine Pohl]
+\beginsong{La sorcière Grabouilla}
+  [by=Francine Pohl]

  \gtab{Mim}{022000}
  \gtab{Si7}{X21202}
--- a/songs/Francis_Cabrel/Je_l_aime_a_mourir.sg
+++ b/songs/Francis_Cabrel/Je_l_aime_a_mourir.sg
@ -1,5 +1,6 @@
 \songcolumns{2}
-\beginsong{Je l'aime \`a mourir}[by=Francis Cabrel,cov=les-chemins-de-traverse]
+\beginsong{Je l'aime à mourir}
+  [by=Francis Cabrel,cov=les-chemins-de-traverse]

  \capo{5}
  \cover
@ -69,4 +70,5 @@ Je l'aime à mourir
  \endverse

  \image{brunocb-tux-to-hell---acdc--7044}{4}
+
 \endsong
--- a/songs/Francis_Cabrel/Petite_Marie.sg
+++ b/songs/Francis_Cabrel/Petite_Marie.sg
@ -1,5 +1,6 @@
 \songcolumns{2}
-\beginsong{Petite Marie}[by=Francis Cabrel,cov=les-murs-de-poussiere]
+\beginsong{Petite Marie}
+  [by=Francis Cabrel,cov=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,6 +1,6 @@
 \songcolumns{2}
-
-\beginsong{F*** you}[by=Garfunkel and Oates,cov=garfunkel-and-oates]
+\beginsong{F*** you}
+  [by=Garfunkel and Oates,cov=garfunkel-and-oates]

  \cover
  \gtab{Do}{X32010}
--- a/songs/Georges_Brassens/Cupidon_s_en_fout.sg
+++ b/songs/Georges_Brassens/Cupidon_s_en_fout.sg
@ -1,5 +1,6 @@
 \songcolumns{2}
-\beginsong{Cupidon s'en fout}[by=Georges Brassens,cov=don-juan]
+\beginsong{Cupidon s'en fout}
+  [by=Georges Brassens,cov=don-juan]

  \cover
  \gtab{Lam}{X02210}
--- a/songs/Georges_Brassens/Grand_pere.sg
+++ b/songs/Georges_Brassens/Grand_pere.sg
@ -1,5 +1,6 @@
 \songcolumns{2}
-\beginsong{Grand-père}[by=Georges Brassens,cov=je-me-suis-fais-tout-petit]
+\beginsong{Grand-père}
+  [by=Georges Brassens,cov=je-me-suis-fais-tout-petit]

  \capo{2}
  \cover
--- a/songs/Georges_Brassens/La_chanson_du_herisson.sg
+++ b/songs/Georges_Brassens/La_chanson_du_herisson.sg
@ -1,5 +1,6 @@
 \songcolumns{2}
-\beginsong{La chanson du h\'erisson}[by=Georges Brassens \& Philippe Chatel,cov=emilie-jolie]
+\beginsong{La chanson du hérisson}
+  [by=Georges Brassens \& Philippe Chatel,cov=emilie-jolie]

  \cover
  \gtab{Sim}{2:X02210}
--- a/songs/Georges_Brassens/La_mauvaise_reputation.sg
+++ b/songs/Georges_Brassens/La_mauvaise_reputation.sg
@ -1,5 +1,6 @@
 \songcolumns{2}
-\beginsong{La mauvaise r\'eputation}[by=Georges Brassens,cov=la-mauvaise-reputation]
+\beginsong{La mauvaise réputation}
+  [by=Georges Brassens,cov=la-mauvaise-reputation]

  \cover
  \gtab{Sim}{2:X02210}
@ -9,7 +10,6 @@
  \gtab{Mim6}{3:XX212X}
  \gtab{Fa4}{X2313X}

-
  \beginverse
    \[Sim]Au village sans prétention
    J'ai mau\[Fa#7]vaise réputa\[Sim]tion
@ -82,5 +82,4 @@ Tout l'monde viendra me voir pendu
    Sauf les aveugles, bien entendu
  \endchorus

-
 \endsong
--- a/songs/Georges_Brassens/Le_gorille.sg
+++ b/songs/Georges_Brassens/Le_gorille.sg
@ -1,5 +1,6 @@
 \songcolumns{2}
-\beginsong{Le gorille}[by=Georges Brassens,cov=la-mauvaise-reputation]
+\beginsong{Le gorille}
+  [by=Georges Brassens,cov=la-mauvaise-reputation]

  \capo{2}
  \cover
@ -108,4 +109,5 @@ Criait: ``Maman !'', pleurait beaucoup,
    Comme l'homme auquel, le jour même,
    Il avait fait trancher le cou.
  \endverse
+
 \endsong
--- a/songs/Georges_Brassens/Le_petit_cheval.sg
+++ b/songs/Georges_Brassens/Le_petit_cheval.sg
@ -1,5 +1,6 @@
 \songcolumns{2}
-\beginsong{Le petit cheval}[by=Georges Brassens,cov=la-mauvaise-reputation]
+\beginsong{Le petit cheval}
+  [by=Georges Brassens,cov=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,5 +1,6 @@
 \songcolumns{2}
-\beginsong{Les copains d'abord}[by=Georges Brassens,cov=les-copains-d-abord]
+\beginsong{Les copains d'abord}
+  [by=Georges Brassens,cov=les-copains-d-abord]

  \cover
  \gtab{Ré}{XX0232}
--- a/songs/Graeme_Allwright/Ca_je_l_ai_jamais_vu.sg
+++ b/songs/Graeme_Allwright/Ca_je_l_ai_jamais_vu.sg
@ -1,5 +1,6 @@
 \songcolumns{1}
-\beginsong{Ça je l'ai jamais vu}[by=Graeme Allwright,cov=emmene-moi]
+\beginsong{Ça je l'ai jamais vu}
+  [by=Graeme Allwright,cov=emmene-moi]


  \cover
--- a/songs/Graeme_Allwright/Henrik.sg
+++ b/songs/Graeme_Allwright/Henrik.sg
@ -1,5 +1,6 @@
 \songcolumns{2}
-\beginsong{Henrik}[by=Graeme Allwright,cov=emmene-moi]
+\beginsong{Henrik}
+  [by=Graeme Allwright,cov=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,5 +1,6 @@
 \songcolumns{2}
-\beginsong{Il faut que je m'en aille}[by=Graeme Allwright,cov=le-jour-de-clarte]
+\beginsong{Il faut que je m'en aille}
+  [by=Graeme Allwright,cov=le-jour-de-clarte]

  \cover
  \gtab{Do}{X32010}
--- a/songs/Graeme_Allwright/Johnny.sg
+++ b/songs/Graeme_Allwright/Johnny.sg
@ -1,5 +1,6 @@
 \songcolumns{2}
-\beginsong{Johnny}[by=Graeme Allwright,cov=emmene-moi]
+\beginsong{Johnny}
+  [by=Graeme Allwright,cov=emmene-moi]


  \cover
--- a/songs/Graeme_Allwright/Jolie_Bouteille.sg
+++ b/songs/Graeme_Allwright/Jolie_Bouteille.sg
@ -1,5 +1,6 @@
 \songcolumns{2}
-\beginsong{Jolie bouteille}[by=Graeme Allwright,cov=emmene-moi]
+\beginsong{Jolie bouteille}
+  [by=Graeme Allwright,cov=emmene-moi]


  \cover
--- a/songs/Graeme_Allwright/Jusqu_a_la_ceinture.sg
+++ b/songs/Graeme_Allwright/Jusqu_a_la_ceinture.sg
@ -1,5 +1,6 @@
 \songcolumns{1}
-\beginsong{Jusqu'\`a la ceinture}[by=Graeme Allwright,cov=emmene-moi]
+\beginsong{Jusqu'à la ceinture}
+  [by=Graeme Allwright,cov=emmene-moi]


  \cover
--- a/songs/Graeme_Allwright/La_mouche_bleue.sg
+++ b/songs/Graeme_Allwright/La_mouche_bleue.sg
@ -1,5 +1,6 @@
 \songcolumns{2}
-\beginsong{La mouche bleue}[by=Graeme Allwright,cov=emmene-moi]
+\beginsong{La mouche bleue}
+  [by=Graeme Allwright,cov=emmene-moi]

  \cover
  \gtab{Ré}{XX0232}
--- a/songs/Graeme_Allwright/Le_clochard_americain.sg
+++ b/songs/Graeme_Allwright/Le_clochard_americain.sg
@ -1,5 +1,6 @@
 \songcolumns{2}
-\beginsong{Le clochard américain}[by=Graeme Allwright,cov=emmene-moi]
+\beginsong{Le clochard américain}
+  [by=Graeme Allwright,cov=emmene-moi]

  \cover
  \gtab{Fa}{8:X02220}
--- a/songs/Graeme_Allwright/Petit_garcon.sg
+++ b/songs/Graeme_Allwright/Petit_garcon.sg
@ -1,5 +1,6 @@
 \songcolumns{2}
-\beginsong{Petit garçon}[by=Graeme Allwright,cov=emmene-moi]
+\beginsong{Petit garçon}
+  [by=Graeme Allwright,cov=emmene-moi]

  \cover
  \gtab{Ré}{XX0232}
--- a/songs/Graeme_Allwright/Petites_boites.sg
+++ b/songs/Graeme_Allwright/Petites_boites.sg
@ -1,5 +1,6 @@
 \songcolumns{2}
-\beginsong{Petites bo\^ites}[by=Graeme Allwright,cov=emmene-moi]
+\beginsong{Petites boîtes}
+  [by=Graeme Allwright,cov=emmene-moi]

  \cover
  \gtab{La}{X02220}
--- a/songs/Green_Day/American_idiot.sg
+++ b/songs/Green_Day/American_idiot.sg
@ -1,5 +1,6 @@
 \songcolumns{2}
-\beginsong{American idiot}[by=Green Day,cov=american-idiot]
+\beginsong{American idiot}
+  [by=Green Day,cov=american-idiot]

  \cover
  \gtab{La&5}{4:022XXX}
--- a/songs/Green_Day/Boulevard_of_broken_dreams.sg
+++ b/songs/Green_Day/Boulevard_of_broken_dreams.sg
@ -1,5 +1,6 @@
 \songcolumns{2}
-\beginsong{Boulevard of broken dreams}[by=Green Day,cov=american-idiot]
+\beginsong{Boulevard of broken dreams}
+  [by=Green Day,cov=american-idiot]

  \cover
  \gtab{Fa#5}{2:022XXX}
--- a/songs/Henri_Des/Les_betises_a_l_ecole.sg
+++ b/songs/Henri_Des/Les_betises_a_l_ecole.sg
@ -1,5 +1,6 @@
 \songcolumns{2}
-\beginsong{Les bêtises à l'école}[by=Henri Dès,cov=les-betises]
+\beginsong{Les bêtises à l'école}
+  [by=Henri Dès,cov=les-betises]

  \capo{4}
  \cover
--- a/songs/Henri_Des/Mon_cheval_gris.sg
+++ b/songs/Henri_Des/Mon_cheval_gris.sg
@ -1,5 +1,6 @@
 \songcolumns{2}
-\beginsong{Mon cheval gris}[by=Henri Dès,cov=les-betises]
+\beginsong{Mon cheval gris}
+  [by=Henri Dès,cov=les-betises]

  \cover
  \gtab{Do}{X32010}
--- a/songs/Herman_Dune/I_wish_I_could_see_you_soon.sg
+++ b/songs/Herman_Dune/I_wish_I_could_see_you_soon.sg
@ -1,5 +1,6 @@
 \songcolumns{2}
-\beginsong{I wish I could see you soon}[by=Herman Dune,cov=giant]
+\beginsong{I wish I could see you soon}
+  [by=Herman Düne,cov=giant]


  \cover
--- a/songs/Howie_Day/Collide.sg
+++ b/songs/Howie_Day/Collide.sg
@ -1,5 +1,6 @@
 \songcolumns{2}
-\beginsong{Collide}[by=Howie Day,cov=stop-all-the-world-now]
+\beginsong{Collide}
+  [by=Howie Day,cov=stop-all-the-world-now]

  \cover
  \gtab{Sol}{320033}
--- a/songs/Hugues_Aufray/Debout_les_gars.sg
+++ b/songs/Hugues_Aufray/Debout_les_gars.sg
@ -1,5 +1,6 @@
 \songcolumns{2}
-\beginsong{Debout les gars}[by=Hugues Aufray,cov=le-meilleur-de-hugues-aufray]
+\beginsong{Debout les gars}
+  [by=Hugues Aufray,cov=le-meilleur-de-hugues-aufray]

  \cover
  \gtab{Lam}{X02210}
--- a/songs/Hugues_Aufray/Elle_descend_de_la_montagne.sg
+++ b/songs/Hugues_Aufray/Elle_descend_de_la_montagne.sg
@ -1,5 +1,6 @@
 \songcolumns{2}
-\beginsong{Elle descend de la montagne}[by=Hugues Aufray,cov=little-troubadour]
+\beginsong{Elle descend de la montagne}
+  [by=Hugues Aufray,cov=little-troubadour]

  \cover
  \gtab{Do}{X32010}
--- a/songs/Hugues_Aufray/Je_reviens.sg
+++ b/songs/Hugues_Aufray/Je_reviens.sg
@ -1,5 +1,6 @@
 \songcolumns{2}
-\beginsong{Je reviens (Les portes de Saint-Malo)}[by=Hugues Aufray,cov=le-meilleur-de-hugues-aufray]
+\beginsong{Je reviens (Les portes de Saint-Malo)}
+  [by=Hugues Aufray,cov=le-meilleur-de-hugues-aufray]

  \capo{2}
  \cover
@ -53,4 +54,5 @@ S'envolaient, comme des oiseaux
    C'était toi vraiment la plus belle
    De New-York jusqu'à Saint-Malo.
  \endverse
+
 \endsong
--- a/songs/Hugues_Aufray/Le_Bon_Dieu_s_enervait.sg
+++ b/songs/Hugues_Aufray/Le_Bon_Dieu_s_enervait.sg
@ -1,5 +1,6 @@
 \songcolumns{2}
-\beginsong{Le Bon Dieu s'\'enervait}[by=Hugues Aufray]
+\beginsong{Le Bon Dieu s'énervait}
+  [by=Hugues Aufray]


  \cover
@ -42,4 +43,5 @@ En regardant le monde qu'il avait fabriqué
    ``Ces gens se battent comme des chiffonniers
    Et je ne peux plus dormir en paix''
  \endverse
+
 \endsong
--- a/songs/Hugues_Aufray/Le_petit_ane_gris.sg
+++ b/songs/Hugues_Aufray/Le_petit_ane_gris.sg
@ -1,5 +1,6 @@
 \songcolumns{2}
-\beginsong{Le petit \^ane gris}[by=Hugues Aufray,cov=la-terre-est-si-belle]
+\beginsong{Le petit âne gris}
+  [by=Hugues Aufray,cov=la-terre-est-si-belle]


  \cover
@ -51,4 +52,5 @@ Vous racontait l'histoire, d'un petit âne gris \rep{2}
  \endverse

  \image{contrebasse}{4}
+
 \endsong
--- a/songs/Hugues_Aufray/N_y_pense_plus_tout_est_bien.sg
+++ b/songs/Hugues_Aufray/N_y_pense_plus_tout_est_bien.sg
@ -1,5 +1,6 @@
 \songcolumns{2}
-\beginsong{N'y pense plus, tout est bien}[by=Hugues Aufray,cov=la-terre-est-si-belle]
+\beginsong{N'y pense plus, tout est bien}
+  [by=Hugues Aufray,cov=la-terre-est-si-belle]


  \cover
@ -55,4 +56,5 @@ On m'avait dit de toi, ce n'est qu'une enfant
    J'allais perdre mon âme dans tes mains
    Mais n'y pense plus: tout est bien
  \endverse
+
 \endsong
--- a/songs/Hugues_Aufray/Santiano.sg
+++ b/songs/Hugues_Aufray/Santiano.sg
@ -1,5 +1,6 @@
 \songcolumns{2}
-\beginsong{Santiano}[by=Hugues Aufray,cov=la-terre-est-si-belle]
+\beginsong{Santiano}
+  [by=Hugues Aufray,cov=la-terre-est-si-belle]


  \cover
@ -54,4 +55,5 @@ Hissez ho ! Santiano
    Sur la mer qui fait le gros dos 
    Nous irons jusqu'à San Francisco 
  \endchorus
+
 \endsong
--- a/songs/Hugues_Aufray/Tu_sens_bon_la_terre.sg
+++ b/songs/Hugues_Aufray/Tu_sens_bon_la_terre.sg
@ -1,5 +1,6 @@
 \songcolumns{2}
-\beginsong{Tu sens bon la terre}[by=Hugues Aufray]
+\beginsong{Tu sens bon la terre}
+  [by=Hugues Aufray]

  \cover
  \gtab{Rém}{5:X02210}
--- a/songs/Indochine/J_ai_demande_a_la_lune.sg
+++ b/songs/Indochine/J_ai_demande_a_la_lune.sg
@ -1,5 +1,6 @@
 \songcolumns{2}
-\beginsong{J'ai demandé à la lune}[by=Indochine,cov=paradize]
+\beginsong{J'ai demandé à la lune}
+  [by=Indochine,cov=paradize]

  \cover
  \gtab{La}{X02220}
--- a/songs/Indochine/L_aventurier.sg
+++ b/songs/Indochine/L_aventurier.sg
@ -1,5 +1,6 @@
 \songcolumns{2}
-\beginsong{L'aventurier}[by=Indochine,cov=generation-indochine]
+\beginsong{L'aventurier}
+  [by=Indochine,cov=generation-indochine]

  \cover
  \gtab{Lam}{X02210}
--- a/songs/Jack_Johnson/Taylor.sg
+++ b/songs/Jack_Johnson/Taylor.sg
@ -1,5 +1,6 @@
 \songcolumns{2}
-\beginsong{Taylor}[by=Jack Johnson,cov=on-and-on]
+\beginsong{Taylor}
+  [by=Jack Johnson,cov=on-and-on]

  \cover
  %\utab{C}{0003}
--- a/songs/Jacques_Brel/Vesoul.sg
+++ b/songs/Jacques_Brel/Vesoul.sg
@ -1,5 +1,6 @@
 \songcolumns{2}
-\beginsong{Vesoul}[by=Jacques Brel,cov=master-series-1]
+\beginsong{Vesoul}
+  [by=Jacques Brel,cov=master-series-1]


  \cover
--- a/songs/Jason_Marz/I_m_yours.sg
+++ b/songs/Jason_Marz/I_m_yours.sg
@ -1,5 +1,6 @@
 \songcolumns{2}
-\beginsong{I'm yours}[by=Jason Marz,cov=I_m_yours]
+\beginsong{I'm yours}
+  [by=Jason Marz,cov=I_m_yours]

  \cover
  \gtab{Si}{2:X02220}
--- a/songs/Jeff_Buckley/Hallelujah.sg
+++ b/songs/Jeff_Buckley/Hallelujah.sg
@ -1,5 +1,6 @@
 \songcolumns{2}
-\beginsong{Hallelujah}[by=Jeff Buckley,cov=grace]
+\beginsong{Hallelujah}
+  [by=Jeff Buckley,cov=grace]

  \capo{5}
  \cover
@ -57,4 +58,5 @@ Well it's not a cry that you hear at night
    It's not somebody who's seen the light
    It's a cold and it's a broken Hallelujah
  \endverse
+
 \endsong
--- a/songs/Joe_Dassin/La_fleur_aux_dents.sg
+++ b/songs/Joe_Dassin/La_fleur_aux_dents.sg
@ -1,5 +1,6 @@
 \songcolumns{2}
-\beginsong{La fleur aux dents}[by=Joe Dassin,cov=le-meilleur-de-joe-dassin]
+\beginsong{La fleur aux dents}
+  [by=Joe Dassin,cov=le-meilleur-de-joe-dassin]

  \cover
  \gtab{Do}{X32010}