enclose options into braces + add 'original song' infos

Conflicts: songs/Hugues_Aufray/N_y_pense_plus_tout_est_bien.sg
13 years ago · 3814985828
745 changed files with 755 additions and 748 deletions
--- a/Aaron/U_turn_lili.sg
+++ b/Aaron/U_turn_lili.sg
@ -1,7 +1,7 @@
 \selectlanguage{english}
 \songcolumns{1}
 \beginsong{U-Turn (Lili)}
-  [by=AaRON,cov=aaron,album=Aaron]
+  [by={AaRON},cov={aaron},album={Aaron}]
  \cover
  \gtab{Em}{022000}
--- a/Alain_Bashung/Gaby_oh_gaby.sg
+++ b/Alain_Bashung/Gaby_oh_gaby.sg
@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{1}
 \beginsong{Gaby, oh Gaby}
-  [by=Alain Bashung,cov=roulette-russe,album=Roulette russe]
+  [by={Alain Bashung},cov={roulette-russe},album={Roulette russe}]
  \cover
  \gtab{E}{022100}
--- a/Alain_Souchon/Bidon.sg
+++ b/Alain_Souchon/Bidon.sg
@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{Bidon}
-  [by=Alain Souchon,cov=bidon,album=Bidon]
+  [by={Alain Souchon},cov={bidon},album={Bidon}]
  \cover
  \gtab{A}{X02220}
--- a/Alain_Souchon/Foule_sentimentale.sg
+++ b/Alain_Souchon/Foule_sentimentale.sg
@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{Foule sentimentale}
-  [by=Alain Souchon,cov=c-est-deja-ca,album=C'est déjà ça]
+  [by={Alain Souchon},cov={c-est-deja-ca},album={C'est déjà ça}]
  \cover
  \gtab{Em}{022000}
--- a/Alain_Souchon/L_amour_a_la_machine.sg
+++ b/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,album=C'est déjà ça]
+  [by={Alain Souchon},cov={c-est-deja-ca},album={C'est déjà ça}]
  \cover
  \gtab{Em}{022000}
--- a/Alain_Souchon/La_ballade_de_Jim.sg
+++ b/Alain_Souchon/La_ballade_de_Jim.sg
@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{Ballade de Jim}
-  [by=Alain Souchon,cov=comme-vous-voulez,album=C'est comme vous voulez]
+  [by={Alain Souchon},cov={comme-vous-voulez},album={C'est comme vous voulez}]
  \cover
  \capo{3}
--- a/Alain_Souchon/Sous_les_jupes_des_filles.sg
+++ b/Alain_Souchon/Sous_les_jupes_des_filles.sg
@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{Sous les jupes des filles}
-  [by=Alain Souchon,cov=c-est-deja-ca,album=C'est déjà ça]
+  [by={Alain Souchon},cov={c-est-deja-ca},album={C'est déjà ça}]
  \cover
  \gtab{Am}{X02210}
--- a/Alanis_Morissette/Ironic.sg
+++ b/Alanis_Morissette/Ironic.sg
@ -1,7 +1,7 @@
 \selectlanguage{english}
 \songcolumns{1}
 \beginsong{Ironic}
-  [by=Alanis Morissette,cov=ironic,album=Ironic]
+  [by={Alanis Morissette},cov={ironic},album={Ironic}]
  \cover
  \capo{2}
--- a/Alex_Beaupain/As_tu_deja_aime.sg
+++ b/Alex_Beaupain/As_tu_deja_aime.sg
@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{As-tu déjà aimé ?}
-  [by=Alex Beaupain,cov=les-chansons-d-amour,album=Les chansons d'amour]
+  [by={Alex Beaupain},cov={les-chansons-d-amour},album={Les chansons d'amour}]
  \cover
  \gtab{C}{X32010}
--- a/Alex_Beaupain/De_bonnes_raisons.sg
+++ b/Alex_Beaupain/De_bonnes_raisons.sg
@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{De bonnes raisons}
-  [by=Alex Beaupain,cov=les-chansons-d-amour,album=Les chansons d'amour]
+  [by={Alex Beaupain},cov={les-chansons-d-amour},album={Les chansons d'amour}]
  \cover
  \gtab{Am}{X02210}
--- a/Alex_Beaupain/Je_n_aime_que_toi.sg
+++ b/Alex_Beaupain/Je_n_aime_que_toi.sg
@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{Je n'aime que toi}
-  [by=Alex Beaupain,cov=les-chansons-d-amour,album=Les chansons d'amour]
+  [by={Alex Beaupain},cov={les-chansons-d-amour},album={Les chansons d'amour}]
  \cover
  \gtab{D}{XX0232}
--- a/Alex_Beaupain/Les_yeux_au_ciel.sg
+++ b/Alex_Beaupain/Les_yeux_au_ciel.sg
@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{Les yeux au ciel}
-  [by=Alex Beaupain,cov=les-chansons-d-amour,album=Les chansons d'amour]
+  [by={Alex Beaupain},cov={les-chansons-d-amour},album={Les chansons d'amour}]
  \cover
  \gtab{Am}{X02210}
--- a/Alex_Beaupain/Ma_memoire_sale.sg
+++ b/Alex_Beaupain/Ma_memoire_sale.sg
@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{Ma mémoire sale}
-  [by=Alex Beaupain,cov=les-chansons-d-amour,album=Les chansons d'amour]
+  [by={Alex Beaupain},cov={les-chansons-d-amour},album={Les chansons d'amour}]
  \cover
  \capo{1}
--- a/Alexis_HK/Gaspard.sg
+++ b/Alexis_HK/Gaspard.sg
@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{1}
 \beginsong{Gaspard}
-  [by=Alexis HK,cov=belle-ville,album=Belle ville]
+  [by={Alexis HK},cov={belle-ville},album={Belle ville}]
  \cover
  \capo{4}
--- a/Alicia_Keys/If_aint_got_you.sg
+++ b/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,album=The diary of Alicia Keys]
+  [by={Alicia Keys},cov={If_aint_got_you},album={The diary of Alicia Keys}]
  \cover
  \gtab{G7}{320001}
--- a/America/A_Horse_With_No_Name.sg
+++ b/America/A_Horse_With_No_Name.sg
@ -1,7 +1,7 @@
 \selectlanguage{english}
 \songcolumns{2}
 \beginsong{A horse with no name}
-  [by=America,cov=America,album=America]
+  [by={America},cov={America},album={America}]
  \cover
  \gtab{Em}{022000}
--- a/Amy_MacDonald/Mr._Rock_n_Roll.sg
+++ b/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,album=This is the life]
+  [by={Amy MacDonald},cov={this-is-the-life},album={This is the life}]
  \cover
  \capo{7}
--- a/Amy_MacDonald/This_is_the_life.sg
+++ b/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,album=This is the life]
+  [by={Amy MacDonald},cov={this-is-the-life},album={This is the life}]
  \cover
  \capo{4}
--- a/Anais/Mon_coeur_mon_amour.sg
+++ b/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,album=The cheap show]
+  [by={Anaïs},cov={the-cheap-show},album={The cheap show}]
  \cover
  \gtab{F#}{2:022100}
--- a/Anis/Dans_tes_yeux.sg
+++ b/Anis/Dans_tes_yeux.sg
@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{Dans tes yeux}
-  [by=Anis,cov=rodeo-boulevard,album=Rodéo Boulevard]
+  [by={Anis},cov={rodeo-boulevard},album={Rodéo Boulevard}]
  \cover
  \gtab{Dm}{5:X02210}
--- a/Anny_Et_Jean-Marc_Versini/La_danse_des_esquimaux.sg
+++ b/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,album=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/Antsy_Pants/Vampire.sg
+++ b/Antsy_Pants/Vampire.sg
@ -1,7 +1,7 @@
 \selectlanguage{english}
 \songcolumns{2}
 \beginsong{Vampire}
-  [by=Antsy Pants,cov=juno,album=Juno]
+  [by={Antsy Pants},cov={juno},album={Juno}]
  \cover
  \gtab{Dm}{XX0231}
--- a/As_De_Trefle/A_l_oreille_de_ta_femme.sg
+++ b/As_De_Trefle/A_l_oreille_de_ta_femme.sg
@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{À l'oreille de ta femme}
-  [by=As de Trêfle,cov=houlala,album=Houlala]
+  [by={As de Trêfle},cov={houlala},album={Houlala}]
  \cover
  \gtab{Em}{022000}
--- a/As_De_Trefle/Chanson_d_amur.sg
+++ b/As_De_Trefle/Chanson_d_amur.sg
@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{Chanson d'amur}
-  [by=As de Trêfle,cov=haut-les-nains,album=Haut les nains]
+  [by={As de Trêfle},cov={haut-les-nains},album={Haut les nains}]
  \cover
  \gtab{Cm}{3:X02210}
--- a/As_De_Trefle/Jessica.sg
+++ b/As_De_Trefle/Jessica.sg
@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{1}
 \beginsong{Jessica}
-  [by=As de Trêfle,cov=merci-bonsoir,album=Merci bonsoir]
+  [by={As de Trêfle},cov={merci-bonsoir},album={Merci bonsoir}]
  \cover
  \gtab{C}{X32010}
--- a/As_De_Trefle/La_revolution.sg
+++ b/As_De_Trefle/La_revolution.sg
@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{La révolution}
-  [by=As de Trêfle,cov=houlala,album=Houlala]
+  [by={As de Trêfle},cov={houlala},album={Houlala}]
  \cover
  \gtab{B&m}{1:X02210}
--- a/As_De_Trefle/Pauvre_planete.sg
+++ b/As_De_Trefle/Pauvre_planete.sg
@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{Pauvre planète}
-  [by=As de Trêfle,cov=houlala,album=Houlala]
+  [by={As de Trêfle},cov={houlala},album={Houlala}]
  \cover
  \gtab{G}{320003}
--- a/As_De_Trefle/Toi_toi_toi.sg
+++ b/As_De_Trefle/Toi_toi_toi.sg
@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{Toi, toi, toi}
-  [by=As de Trêfle,cov=sans-les-mains,album=Sans les mains]
+  [by={As de Trêfle},cov={sans-les-mains},album={Sans les mains}]
  \cover
  \gtab{D}{XX0232}
--- a/Avenue_Q/The_internet_is_for_porn.sg
+++ b/Avenue_Q/The_internet_is_for_porn.sg
@ -1,7 +1,7 @@
 \selectlanguage{english}
 \songcolumns{1}
 \beginsong{The Internet is for porn}
-  [by=Avenue Q,cov=avenue-q,album=Avenue Q]
+  [by={Avenue Q},cov={avenue-q},album={Avenue Q}]
  \cover
  \gtab{E}{7:X02220}
--- a/Avril_Lavigne/Things_I_ll_never_say.sg
+++ b/Avril_Lavigne/Things_I_ll_never_say.sg
@ -1,7 +1,7 @@
 \selectlanguage{english}
 \songcolumns{1}
 \beginsong{Things I'll never say}
-  [by=Avril Lavigne,cov=let-go,album=Let go]
+  [by={Avril Lavigne},cov={let-go},album={Let go}]
  \cover
  \gtab{D}{XX0232}
--- a/Barbara/L_aigle_noir.sg
+++ b/Barbara/L_aigle_noir.sg
@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{L'aigle noir}
-  [by=Barbara,cov=l-aigle-noir,album=L'aigle noir]
+  [by={Barbara},cov={l-aigle-noir},album={L'aigle noir}]
  \cover
  \gtab{F}{1:022100}
--- a/Barry_Louis_Polisar/All_I_Want_Is_You.sg
+++ b/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,album=Juno]
+  [by={Barry Louis Polisar},cov={juno},album={Juno}]
  \cover
  \gtab{G}{320003}
--- a/Beau_Dommage/La_complainte_du_phoque_en_alaska.sg
+++ b/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,album=Le meilleur de Beau Dommage]
+  [by={Beau Dommage},cov={le-meilleur-de-beau-dommage},album={Le meilleur de Beau Dommage}]
  \cover
  \capo{3}
--- a/Belle_Sebastian/Piazza_New_York_catcher.sg
+++ b/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,album=Juno]
+  [by={Belle \& Sebastian},cov={juno},album={Juno}]
  \cover
  \gtab{F#}{2:022100}
--- a/Belyscendre/Helas_madame.sg
+++ b/Belyscendre/Helas_madame.sg
@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{Hélas madame}
-  [by=Belyscendre,cov=belles-embarquez,album=Belles Embarquez !]
+  [by={Belyscendre},cov={belles-embarquez},album={Belles Embarquez !}]
  \cover
  \gtab{Em}{022000}
--- a/Belyscendre/Mon_pere_veut_me_marier.sg
+++ b/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,album=Prends garde au loup]
+  [by={Belyscendre},cov={prends-garde-au-loup},album={Prends garde au loup}]
  \cover
  \gtab{C}{X32010}
--- a/Belyscendre/Prends_garde_au_loup.sg
+++ b/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,album=Prends garde au loup]
+  [by={Belyscendre},cov={prends-garde-au-loup},album={Prends garde au loup}]
  \cover
  \gtab{Am}{X02210}
--- a/Ben_E_King/Stand_by_me.sg
+++ b/Ben_E_King/Stand_by_me.sg
@ -1,7 +1,7 @@
 \selectlanguage{english}
 \songcolumns{2}
 \beginsong{Stand by me}
-  [by=Ben E.King,cov=ben-e-king-best-of,album=Best of]
+  [by={Ben E.King},cov={ben-e-king-best-of},album={Best of}]
  \cover
  \gtab{C}{X32010}
--- a/Ben_Harper/Waiting_on_an_angel.sg
+++ b/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,album=Welcome to the cruel world]
+  [by={Ben Harper},cov={welcome-to-the-cruel-world},album={Welcome to the cruel world}]
  \cover
  \gtab*{C}{X30010}
--- a/Ben_Harper/Widow_of_a_living_man.sg
+++ b/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,album=The will to live]
+  [by={Ben Harper},cov={the-will-to-live},album={The will to live}]
  \cover
  \gtab*{Asus2}{X02200}
--- a/Benabar/Le_diner.sg
+++ b/Benabar/Le_diner.sg
@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{Le dîner}
-  [by=Bénabar,cov=reprise-des-negociations,album=Reprise des négociations]
+  [by={Bénabar},cov={reprise-des-negociations},album={Reprise des négociations}]
  \cover
  \gtab{Bm}{2:X02210}
--- a/Benabar/Quatre_murs_et_un_toit.sg
+++ b/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,album=Reprise des négociations]
+  [by={Bénabar},cov={reprise-des-negociations},album={Reprise des négociations}]
  \cover
  \capo{2}
--- a/Benabar/Y_a_une_fille_qu_habite_chez_moi.sg
+++ b/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,album=Bénabar]
+  [by={Bénabar},cov={benabar},album={Bénabar}]
  \cover
  %verse
--- a/Bill_Withers/Just_two_of_us.sg
+++ b/Bill_Withers/Just_two_of_us.sg
@ -1,7 +1,7 @@
 \selectlanguage{english}
 \songcolumns{2}
 \beginsong{Just the two of us}
-  [by=Bill Withers,album=Greatest hits,cov=greatest-hits]
+  [by={Bill Withers},album={Greatest hits},cov={greatest-hits}]
  \cover
  \capo{1}
--- a/Bloodhound_Gang/Fire_water_burn.sg
+++ b/Bloodhound_Gang/Fire_water_burn.sg
@ -1,7 +1,7 @@
 \selectlanguage{english}
 \songcolumns{1}
 \beginsong{Fire water burn}
-  [by=Bloodhound Gang,cov=one-fierce-beer-coaster,album=One fierce beer coaster]
+  [by={Bloodhound Gang},cov={one-fierce-beer-coaster},album={One fierce beer coaster}]
  \cover
  \gtab{G}{320003}
--- a/Bob_Dylan/Ballad_of_Hollis_Brown.sg
+++ b/Bob_Dylan/Ballad_of_Hollis_Brown.sg
@ -1,7 +1,7 @@
 \selectlanguage{english}
 \songcolumns{2}
 \beginsong{Ballad of Hollis Brown}
-  [by=Bob Dylan,cov=the-times-they-are-a-changin,album=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{E&m}{6:X02210}
--- a/Bob_Dylan/Blowin_in_the_wind.sg
+++ b/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,album=The freewheelin]
+  [by={Bob Dylan},cov={the-freewheelin},album={The freewheelin}]
  \cover
  \gtab{D}{XX0232}
--- a/Bob_Dylan/Don_t_think_twice_it_s_all_right.sg
+++ b/Bob_Dylan/Don_t_think_twice_it_s_all_right.sg
@ -1,7 +1,7 @@
 \selectlanguage{english}
 \songcolumns{2}
 \beginsong{Don't think twice, it's all right}
-  [by=Bob Dylan,cov=the-freewheelin,album=The freewheelin]
+  [by={Bob Dylan},cov={the-freewheelin},album={The freewheelin}]
  \capo{4}
  \gtab{C}{X32010}
--- a/Bob_Dylan/Hurricane.sg
+++ b/Bob_Dylan/Hurricane.sg
@ -1,7 +1,7 @@
 \selectlanguage{english}
 \songcolumns{1}
 \beginsong{Hurricane}
-  [by=Bob Dylan,cov=desire,album=Desire]
+  [by={Bob Dylan},cov={desire},album={Desire}]
  \cover
  \gtab{Am}{X02210}
--- a/Bob_Dylan/Knocking_on_heavens_door.sg
+++ b/Bob_Dylan/Knocking_on_heavens_door.sg
@ -1,7 +1,7 @@
 \selectlanguage{english}
 \songcolumns{2}
 \beginsong{Knockin' on heaven's door}
-  [by=Bob Dylan,cov=mtv-unplugged,album=MTV unplugged]
+  [by={Bob Dylan},cov={mtv-unplugged},album={MTV unplugged}]
  \cover
  \capo{2}
--- a/Bob_Dylan/Mr_tambourine_man.sg
+++ b/Bob_Dylan/Mr_tambourine_man.sg
@ -1,7 +1,7 @@
 \selectlanguage{english}
 \songcolumns{2}
 \beginsong{Mr. Tambourine Man}
-  [by=Bob Dylan,cov=the-freewheelin,album=The freewheelin]
+  [by={Bob Dylan},cov={the-freewheelin},album={The freewheelin}]
  \cover
  \gtab{C}{X32010}
--- a/Bob_Dylan/One_more_cup_of_coffee.sg
+++ b/Bob_Dylan/One_more_cup_of_coffee.sg
@ -1,7 +1,7 @@
 \selectlanguage{english}
 \songcolumns{1}
 \beginsong{One more cup of coffee}
-  [by=Bob Dylan,cov=desire,album=Desire]
+  [by={Bob Dylan},cov={desire},album={Desire}]
  \cover
  \gtab{Am}{X02210}
--- a/Bob_Dylan/The_times_they_are_a-changin.sg
+++ b/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,album=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{G}{320003}
--- a/Bob_Marley/No_woman_no_cry.sg
+++ b/Bob_Marley/No_woman_no_cry.sg
@ -1,7 +1,7 @@
 \selectlanguage{english}
 \songcolumns{2}
 \beginsong{No woman, no cry}
-  [by=Bob Marley,cov=legend,album=Legend]
+  [by={Bob Marley},cov={legend},album={Legend}]
  \cover
  \gtab{C}{X32010}
--- a/Bob_Marley/Redemption_song.sg
+++ b/Bob_Marley/Redemption_song.sg
@ -1,7 +1,7 @@
 \selectlanguage{english}
 \songcolumns{2}
 \beginsong{Redemption song}
-  [by=Bob Marley,cov=legend,album=Legend]
+  [by={Bob Marley},cov={legend},album={Legend}]
  \cover
  \gtab{G}{320003}
--- a/Bobby_McFerrin/Don_t_worry_be_happy.sg
+++ b/Bobby_McFerrin/Don_t_worry_be_happy.sg
@ -1,7 +1,7 @@
 \selectlanguage{english}
 \songcolumns{2}
 \beginsong{Don't worry, be happy}
-  [by=Bobby McFerrin,cov=dont-worry-be-happy,album=Don't worry be happy]
+  [by={Bobby McFerrin},cov={dont-worry-be-happy},album={Don't worry be happy}]
  \cover
  \gtab{C}{X32010}
--- a/Boby_Lapointe/Aragon_et_Castille.sg
+++ b/Boby_Lapointe/Aragon_et_Castille.sg
@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{Aragon et Castille}
-  [by=Boby Lapointe,cov=l-integrale,album=L'intégrale]
+  [by={Boby Lapointe},cov={l-integrale},album={L'intégrale}]
  \cover
  \gtab{C}{X32010}
--- a/Boby_Lapointe/Framboise.sg
+++ b/Boby_Lapointe/Framboise.sg
@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{Framboise}
-  [by=Boby Lapointe,cov=l-integrale,album=L'intégrale]
+  [by={Boby Lapointe},cov={l-integrale},album={L'intégrale}]
  \cover
  \gtab{Dm}{5:X02210}
--- a/Boby_Lapointe/La_maman_des_poissons.sg
+++ b/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,album=L'intégrale]
+  [by={Boby Lapointe},cov={l-integrale},album={L'intégrale}]
  \cover
  \gtab{G}{320003}
--- a/Boby_Lapointe/Meli-Melodie.sg
+++ b/Boby_Lapointe/Meli-Melodie.sg
@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{Méli-Mélodie}
-  [by=Boby Lapointe,cov=l-integrale,album=L'intégrale]
+  [by={Boby Lapointe},cov={l-integrale},album={L'intégrale}]
  \cover
  \gtab{C}{X32010}
--- a/Britney_Spears/Baby_one_more_time.sg
+++ b/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,album=Baby one more time]
+  [by={Britney Spears},cov={baby-one-more-time},album={Baby one more time}]
  \cover
  \gtab{F#}{2:022100}
--- a/Bruce_Springsteen/Bring_em_home.sg
+++ b/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,album=We shall overcome]
+  [by={Bruce Springsteen},cov={we-shall-overcome},album={We shall overcome}]
  \cover
  \capo{3}
--- a/Bruce_Springsteen/Buffalo_gals.sg
+++ b/Bruce_Springsteen/Buffalo_gals.sg
@ -1,7 +1,7 @@
 \selectlanguage{english}
 \songcolumns{2}
 \beginsong{Buffalo gals}
-  [by=Bruce Springsteen,cov=we-shall-overcome,album=We shall overcome]
+  [by={Bruce Springsteen},cov={we-shall-overcome},album={We shall overcome}]
  \cover
  \gtab{F}{1:022100}
--- a/Bruce_Springsteen/John_Henry.sg
+++ b/Bruce_Springsteen/John_Henry.sg
@ -1,7 +1,7 @@
 \selectlanguage{english}
 \songcolumns{2}
 \beginsong{John Henry}
-  [by=Bruce Springsteen,cov=we-shall-overcome,album=We shall overcome]
+  [by={Bruce Springsteen},cov={we-shall-overcome},album={We shall overcome}]
  \cover
  \gtab{F}{1:022100}
--- a/Bruce_Springsteen/Mrs_McGrath.sg
+++ b/Bruce_Springsteen/Mrs_McGrath.sg
@ -1,7 +1,7 @@
 \selectlanguage{english}
 \songcolumns{2}
 \beginsong{Mrs. McGrath}
-  [by=Bruce Springsteen,cov=we-shall-overcome,album=We shall overcome]
+  [by={Bruce Springsteen},cov={we-shall-overcome},album={We shall overcome}]
  \cover
  \gtab{Dm}{XX0231}
--- a/Bruce_Springsteen/O_Mary_don_t_you_weep.sg
+++ b/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,album=We shall overcome]
+  [by={Bruce Springsteen},cov={we-shall-overcome},album={We shall overcome}]
  \cover
  \gtab{Gm}{3:022000}
--- a/Bruce_Springsteen/Old_Dan_Tucker.sg
+++ b/Bruce_Springsteen/Old_Dan_Tucker.sg
@ -1,7 +1,7 @@
 \selectlanguage{english}
 \songcolumns{2}
 \beginsong{Old Dan Tucker}
-  [by=Bruce Springsteen,cov=we-shall-overcome,album=We shall overcome]
+  [by={Bruce Springsteen},cov={we-shall-overcome},album={We shall overcome}]
  \cover
  \capo{3}
--- a/Bruce_Springsteen/Pay_me_my_money_down.sg
+++ b/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,album=We shall overcome]
+  [by={Bruce Springsteen},cov={we-shall-overcome},album={We shall overcome}]
  \cover
  \gtab{G}{320003}
--- a/Buena_Vista_Social_Club/Chan_Chan.sg
+++ b/Buena_Vista_Social_Club/Chan_Chan.sg
@ -1,7 +1,7 @@
 \selectlanguage{spanish}
 \songcolumns{2}
 \beginsong{Chan Chan}
-  [by=Compay Segundo,cov=chanchan,album=Chan Chan]
+  [by={Compay Segundo},cov={chanchan},album={Chan Chan}]
  \cover
  \gtab*{Dm}{100231}
--- a/Calvin_Russell/5m2.sg
+++ b/Calvin_Russell/5m2.sg
@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{$5m^2$}
-  [by=Calvin Russell,cov=dawg-eat-dawg,album=Dawg eat dawg]
+  [by={Calvin Russell},cov={dawg-eat-dawg},album={Dawg eat dawg}]
  \cover
  \capo{5}
--- a/Calvin_Russell/Baby_I_love_you.sg
+++ b/Calvin_Russell/Baby_I_love_you.sg
@ -1,7 +1,7 @@
 \selectlanguage{english}
 \songcolumns{2}
 \beginsong{Baby I love you}
-  [by=Calvin Russell,cov=sounds_from_the_fourth_world,album=Sounds from the fourth world]
+  [by={Calvin Russell},cov={sounds_from_the_fourth_world},album={Sounds from the fourth world}]
  \cover
  \gtab{D}{XX0232}
--- a/Calvin_Russell/Crossroad.sg
+++ b/Calvin_Russell/Crossroad.sg
@ -1,7 +1,7 @@
 \selectlanguage{english}
 \songcolumns{2}
 \beginsong{Crossroad}
-  [by=Calvin Russell,cov=sounds_from_the_fourth_world,album=Sounds from the fourth world]
+  [by={Calvin Russell},cov={sounds_from_the_fourth_world},album={Sounds from the fourth world}]
  \cover
  \gtab{Am}{X02210}
--- a/Calvin_Russell/Down_down_down.sg
+++ b/Calvin_Russell/Down_down_down.sg
@ -1,7 +1,7 @@
 \selectlanguage{english}
 \songcolumns{1}
 \beginsong{Down down down}
-  [by=Calvin Russell,cov=sounds_from_the_fourth_world,album=Sounds from the fourth world]
+  [by={Calvin Russell},cov={sounds_from_the_fourth_world},album={Sounds from the fourth world}]
  \cover
  \gtab{C}{X32010}
--- a/Calvin_Russell/Midnite_man.sg
+++ b/Calvin_Russell/Midnite_man.sg
@ -1,7 +1,7 @@
 \selectlanguage{english}
 \songcolumns{2}
 \beginsong{Midnite man}
-  [by=Calvin Russell,cov=unrepentant,album=Unrepentant]
+  [by={Calvin Russell},cov={unrepentant},album={Unrepentant}]
  \cover
  \gtab{Am}{X02210}
--- a/Calvin_Russell/One_Meat_Ball.sg
+++ b/Calvin_Russell/One_Meat_Ball.sg
@ -1,7 +1,7 @@
 \selectlanguage{english}
 \songcolumns{2}
 \beginsong{One Meat Ball}
-  [by=Calvin Russell,cov=sounds_from_the_fourth_world,album=Sounds from the fourth world]
+  [by={Calvin Russell},cov={sounds_from_the_fourth_world},album={Sounds from the fourth world}]
  \cover
  \gtab{Am}{X02210}
--- a/Carter_Family/In_the_highways.sg
+++ b/Carter_Family/In_the_highways.sg
@ -1,7 +1,7 @@
 \selectlanguage{english}
 \songcolumns{2}
 \beginsong{In the highways}
-  [by=Carter Family,cov=o-brother,album=O brother]
+  [by={Carter Family},cov={o-brother},album={O brother}]
  \cover
  \capo{1}
--- a/Carter_Family/Keep_on_the_sunny_side.sg
+++ b/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,album=O brother]
+  [by={Carter Family},cov={o-brother},album={O brother}]
  \cover
  \gtab{B&}{6:022100}
--- a/Cat_Stevens/Father_and_son.sg
+++ b/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,album=Tea for the tillerman]
+  [by={Cat Stevens},cov={tea-for-the-tillerman},album={Tea for the tillerman}]
  \cover
  \gtab{G}{320003}
--- a/Cat_Stevens/Here_comes_my_baby.sg
+++ b/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,album=Matthew and son]
+  [by={Cat Stevens},cov={matthew-and-son},album={Matthew and son}]
  \cover
  \gtab{G}{320003}
--- a/Cat_Stevens/My_Lady_d_Arbanville.sg
+++ b/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,album=Mona bone jakon]
+  [by={Cat Stevens},cov={mona-bone-jakon},album={Mona bone jakon}]
  \cover
  \gtab{Em}{022000}
--- a/Cat_Stevens/Sad_Lisa.sg
+++ b/Cat_Stevens/Sad_Lisa.sg
@ -1,7 +1,7 @@
 \selectlanguage{english}
 \songcolumns{2}
 \beginsong{Sad Lisa}
-  [by=Cat Stevens,cov=tea-for-the-tillerman,album=Tea for the tillerman]
+  [by={Cat Stevens},cov={tea-for-the-tillerman},album={Tea for the tillerman}]
  \cover
  \gtab{Em}{022000}
--- a/Cat_Stevens/The_wind.sg
+++ b/Cat_Stevens/The_wind.sg
@ -1,7 +1,7 @@
 \selectlanguage{english}
 \songcolumns{2}
 \beginsong{The wind}
-  [by=Cat Stevens,cov=teaser-and-the-firecat,album=Teaser and the firecat]
+  [by={Cat Stevens},cov={teaser-and-the-firecat},album={Teaser and the firecat}]
  \cover
  \gtab{D}{XX0232}
--- a/Cat_Stevens/Wild_world.sg
+++ b/Cat_Stevens/Wild_world.sg
@ -1,7 +1,7 @@
 \selectlanguage{english}
 \songcolumns{2}
 \beginsong{Wild world}
-  [by=Cat Stevens,cov=tea-for-the-tillerman,album=Tea for the tillerman]
+  [by={Cat Stevens},cov={tea-for-the-tillerman},album={Tea for the tillerman}]
  \cover
  \gtab{Am}{X02210}
--- a/Catherine_Le_Forestier/La_petite_fugue.sg
+++ b/Catherine_Le_Forestier/La_petite_fugue.sg
@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{La petite fugue}
-  [by=Catherine Le Forestier,cov=l-amour-avec-lui,album=L'amour avec lui]
+  [by={Catherine Le Forestier},cov={l-amour-avec-lui},album={L'amour avec lui}]
  \cover
  \gtab{A}{X02220}
--- a/Cesaria_Evora/Petit_pays.sg
+++ b/Cesaria_Evora/Petit_pays.sg
@ -1,7 +1,7 @@
 \selectlanguage{portuguese}
 \songcolumns{2}
 \beginsong{Petit pays}
-  [by=Cesária Évora,cov=cesaria,album=Cesária]
+  [by={Cesária Évora},cov={cesaria},album={Cesária}]
  \cover
  \gtab{Em}{022000}
--- a/Charles_Aznavour/Emmenez-moi.sg
+++ b/Charles_Aznavour/Emmenez-moi.sg
@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{Emmenez-moi}
-  [by=Charles Aznavour,cov=40-chansons-d-or,album=40 chansons d'or]
+  [by={Charles Aznavour},cov={40-chansons-d-or},album={40 chansons d'or}]
  \cover
  \gtab{Am}{X02210}
--- a/Charles_Aznavour/Les_comediens.sg
+++ b/Charles_Aznavour/Les_comediens.sg
@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{Les comédiens}
-  [by=Charles Aznavour,cov=40-chansons-d-or,album=40 chansons d'or]
+  [by={Charles Aznavour},cov={40-chansons-d-or},album={40 chansons d'or}]
  \cover
  \capo{3}
--- a/Charles_Aznavour/Mes_emmerdes.sg
+++ b/Charles_Aznavour/Mes_emmerdes.sg
@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{Mes emmerdes}
-  [by=Charles Aznavour,cov=40-chansons-d-or,album=40 chansons d'or]
+  [by={Charles Aznavour},cov={40-chansons-d-or},album={40 chansons d'or}]
  \cover
  \capo{3}
--- a/Christophe/Aline.sg
+++ b/Christophe/Aline.sg
@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{Aline}
-  [by=Christophe,cov=aline,album=Aline]
+  [by={Christophe},cov={aline},album={Aline}]
  \cover
  \gtab{C}{X32010}
--- a/Christophe/Les_mots_bleus.sg
+++ b/Christophe/Les_mots_bleus.sg
@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{Les mots bleus}
-  [by=Christophe,cov=les-mots-bleus,album=Les mots bleus]
+  [by={Christophe},cov={les-mots-bleus},album={Les mots bleus}]
  \cover
  \capo{4}
--- a/Claude_Nougaro/Armstrong.sg
+++ b/Claude_Nougaro/Armstrong.sg
@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{Armstrong}
-  [by=Claude Nougaro,cov=toulouse,album=Toulouse]
+  [by={Claude Nougaro},cov={toulouse},album={Toulouse}]
  \cover
  \capo{3}
--- a/Coldplay/Paradise.sg
+++ b/Coldplay/Paradise.sg
@ -1,7 +1,7 @@
 \selectlanguage{english}
 \songcolumns{2}
 \beginsong{Paradise}
-  [by=Coldplay,cov=mylo-xyloto,album=Mylo Xyloto]
+  [by={Coldplay},cov={mylo-xyloto},album={Mylo Xyloto}]
  \cover
  \gtab{Dm}{XX0231}
--- a/Cookie_Dingler/Femme_liberee.sg
+++ b/Cookie_Dingler/Femme_liberee.sg
@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{Femme libérée}
-  [by=Cookie Dingler,cov=femme-liberee,album=Femme libérée]
+  [by={Cookie Dingler},cov={femme-liberee},album={Femme libérée}]
  \cover
  \capo{2}
--- a/Cranberries/Animal_instinct.sg
+++ b/Cranberries/Animal_instinct.sg
@ -1,7 +1,7 @@
 \selectlanguage{english}
 \songcolumns{2}
 \beginsong{Animal instinct}
-  [by=Cranberries,cov=bury-the-hatchet,album=Bury the hatchet]
+  [by={Cranberries},cov={bury-the-hatchet},album={Bury the hatchet}]
  \cover
  \gtab{Em}{022000}
--- a/Cranberries/Zombie.sg
+++ b/Cranberries/Zombie.sg
@ -1,7 +1,7 @@
 \selectlanguage{english}
 \songcolumns{2}
 \beginsong{Zombie}
-  [by=Cranberries,cov=no-need-to-argue,album=No need to argue]
+  [by={Cranberries},cov={no-need-to-argue},album={No need to argue}]
  \cover
  \gtab{Em}{022000}
--- a/Crash_Test_Dummies/mmm_mmm.sg
+++ b/Crash_Test_Dummies/mmm_mmm.sg
@ -1,7 +1,7 @@
 \selectlanguage{english}
 \songcolumns{2}
 \beginsong{Mmm mmm}
-  [by=Crash Test Dummies,cov=god-shuffled-his-feet,album=God shuffled his feet ]
+  [by={Crash Test Dummies},cov={god-shuffled-his-feet},album={God shuffled his feet }]
  \cover
  \capo{3}
--- a/Crep/Bioman.sg
+++ b/Crep/Bioman.sg
@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{Bioman}
-  [by=Crep,cov=histoires-d-un-manchot,album=Histoires d'un manchot,%
+  [by={Crep},cov={histoires-d-un-manchot},album={Histoires d'un manchot},%
  url={http://www.patacrep.com/static3/audio}]
  \cover
--- a/Crep/Calimero.sg
+++ b/Crep/Calimero.sg
@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{Caliméro}
-  [by=Crep,cov=histoires-d-un-manchot,album=Histoires d'un manchot,%
+  [by={Crep},cov={histoires-d-un-manchot},album={Histoires d'un manchot},%
  url={http://www.patacrep.com/static3/audio}]
  \cover
--- a/Crep/Encore.sg
+++ b/Crep/Encore.sg
@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{Encore}
-  [by=Crep,cov=mon-voisin-le-manchot,album=Mon voisin le manchot,%
+  [by={Crep},cov={mon-voisin-le-manchot},album={Mon voisin le manchot},%
  url={http://www.patacrep.com/static3/audio}]
  \cover
--- a/Crep/Fichu_doctorat.sg
+++ b/Crep/Fichu_doctorat.sg
@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{Fichu doctorat}
-  [by=Crep,cov=histoires-d-un-manchot,album=Histoires d'un manchot,%
+  [by={Crep},cov={histoires-d-un-manchot},album={Histoires d'un manchot},%
  url={http://www.patacrep.com/static3/audio},original={Tri Yann - La jument de Michao}]
  \cover