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

Conflicts:
	songs/Renan_Luce/le_lacrymal_circus.sg

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}

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}

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}

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}

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}

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}

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}
@@ -45,7 +45,7 @@
   \begin{repeatedchords}
     \begin{verse}
       \[Am]On en fait beaucoup
-      Se pen\[G]cher tordre son cou
+      Se pen\[G]cher, tordre son cou
       \[F]Pour voir l'infortune
       À quoi nos vies se ré\[C]sument
     \end{verse}

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}
@@ -42,11 +42,11 @@
     And everything's going \[E]right
   \end{bridge}
 
-  \begin{verse*}
+  \begin{bridge}
     And \[D]life has a funny \[E]way
     Of helping you out when you think everything's gone \[D]wrong
     And everything blows up in your \[A]face
-  \end{verse*}
+  \end{bridge}
 
 
   \begin{repeatedchords}

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}

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}

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}

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}

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}

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}

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}

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]
+\beginsong{A horse with no name}
+  [by={America},cov={America},album={America}]
 
   \cover
   \gtab{Em}{022000}
@@ -38,7 +38,9 @@
       My \[Em]skin began to turn \[D6/9]red
       After \[Em]three days in the \[D6/9]desert fun
       I was \[Em]looking at a river \[D6/9]bed
+    \end{bridge}
 
+    \begin{bridge}
       And the \[Em]story it told of a \[D6/9]river that flowed
       Made me \[Em]sad to think it was \[D6/9]dead
     \end{bridge}

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}

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}

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}

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}
@@ -84,7 +84,7 @@
   \end{repeatedchords}
 
   \begin{verse*}
-    \musicnote {\Outro : \nolyrics \[A{\shrp} C7 A Dm A{\shrp} Gm6 A Dm] \echo{adlib}}
+    \musicnote {\Outro : \nolyrics \[A{\shrp} C7 A Dm A{\shrp} Gm6 A Dm] \Adlib}
   \end{verse*}
 
 \endsong

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}

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}

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}

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}

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}

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}

As_De_Trefle/Pauvre_planete.sg

@@ -1,10 +1,9 @@
 \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}
   \gtab{D}{XX0232}
   \gtab{F#m}{2:022000}

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}

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}

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}

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}
@@ -10,6 +10,8 @@
   \gtab{D}{XX0232}
   \gtab{B&}{1:X02220}
   \gtab{E&}{6:X02220}
+  \ifnorepeatchords%
+  \else%
   \gtab{G}{320003}
   \gtab{Am}{X02210}
   \gtab{E}{022100}
@@ -19,6 +21,7 @@
   \gtab{B}{2:X02220}
   \gtab{C#m}{4:X02210}
   \gtab{G#}{4:022100}
+  \fi%
 
   \begin{verse}
     \[F]Un beau jour ou peut-être \[C]une nuit
@@ -28,45 +31,51 @@
     Surgit un \[D]aigle noir
   \end{verse}
 
+  \begin{repeatedchords}
+    \transposition{2}
     \begin{verse}
-    \[G]Lentement, les ailes \[D]déployées
-    \[Am]Lentement, je le vis \[E]tournoyer
-    \[C]Près de moi, dans un brui\[G]ssement d'ailes
-    Comme tom\[F]bé du ciel
-    L'oiseau vint \[E]se poser
+      \[F]Lentement, les ailes \[C]déployées
+      \[Gm]Lentement, je le vis \[D]tournoyer
+      \[B&]Près de moi, dans un brui\[F]ssement d'ailes
+      Comme tom\[E&]bé du ciel
+      L'oiseau vint \[D]se poser
     \end{verse}
 
+    \transposition{2}
     \begin{verse}
-    \[A]Il avait les yeux cou\[E]leur rubis
-    \[Bm]Et des plumes aux couleurs \[F#]de la nuit
-    \[D]À son front, brillant de \[A]mille feux
-    L'oiseau roi \[G]couronné
-    Portait un \[F#]diamant bleu
+      \[F]Il avait les yeux cou\[C]leur rubis
+      \[Gm]Et des plumes aux couleurs \[D]de la nuit
+      \[B&]À son front, brillant de \[F]mille feux
+      L'oiseau roi \[E&]couronné
+      Portait un \[D]diamant bleu
     \end{verse}
 
+    \transposition{2}
     \begin{verse}
-    \[B]De son bec, il a tou\[F#]ché ma joue
-    \[C#m]Dans ma main, il a gli\[G#]ssé son cou
-    \[E]{C'est} alors que je l'ai \[B]reconnu
-    Surgissant \[A]du passé
-    Il m'était \[G#]revenu
+      \[F]De son bec, il a tou\[C]ché ma joue
+      \[Gm]Dans ma main, il a gli\[D]ssé son cou
+      \[B&]{C'est} alors que je l'ai \[F]reconnu
+      Surgissant \[E&]du passé
+      Il m'était \[D]revenu
     \end{verse}
 
+    \transposition{-2}
     \begin{verse}
-    \[A]Dis l'oiseau, oh dis, em\[E]mène-moi
-    \[Bm]Retournons au pays \[F#]{d'autrefois}
-    \[D]Comme avant dans mes rê\[A]ves d'enfant
-    Pour cueillir \[G]en tremblant
-    Des étoiles, \[F#]des étoiles
+      \[F]Dis l'oiseau, oh dis, em\[C]mène-moi
+      \[Gm]Retournons au pays \[D]{d'autrefois}
+      \[B&]Comme avant dans mes rê\[F]ves d'enfant
+      Pour cueillir \[E&]en tremblant
+      Des étoiles, \[D]des étoiles
     \end{verse}
 
-
+    \transposition{2}
     \begin{verse}
-    \[B]Comme avant, dans mes rê\[F#]ves d'enfant
-    \[C#m]Comme avant, sur un nu\[G#]age blanc
-    \[E]Comme avant, allumer \[B]le soleil
-    Être fai\[A]seur de pluie
-    Et faire \[G#]des merveilles
+      \[F]Comme avant, dans mes rê\[C]ves d'enfant
+      \[Gm]Comme avant, sur un nu\[D]age blanc
+      \[B&]Comme avant, allumer \[F]le soleil
+      Être fai\[E&]seur de pluie
+      Et faire \[D]des merveilles
     \end{verse}
+  \end{repeatedchords}
 
 \endsong

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}

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}

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}

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}

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}

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}

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}

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}

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}

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}

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}

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

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}

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}

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}

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}

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}

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}

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}

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}

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}

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}

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}

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}

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}

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}

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}

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}

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}

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}

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}
@@ -17,46 +17,48 @@
     Bring 'em \[G]home, bring 'em \[C]home
   \end{verse}
 
+  \begin{repeatedchords}
     \begin{verse}
-    It will make the politicians sad, I know
-    Bring 'em home, bring 'em home
-    They wanna tangle with their foe
-    Bring 'em home, bring 'em home
+      It will \[C]make the politicians sad, I know
+      Bring 'em \[Am]home, bring 'em home
+      They wanna \[F]tangle with their \[C]foe
+      Bring 'em \[G]home, bring 'em \[C]home
     \end{verse}
 
     \begin{verse}
-    They wanna test their grand theories
-    Bring 'em home, bring 'em home
-    With the blood of you and me
-    Bring 'em home, bring 'em home
+      They wanna \[C]test their grand theories
+      Bring 'em \[Am]home, bring 'em home
+      With the \[F]blood of you and \[C]me
+      Bring 'em \[G]home, bring 'em \[C]home
     \end{verse}
 
     \begin{verse}
-    Now we'll give no more brave young lives
-    Bring 'em home, bring 'em home
-    For the gleam in someone's eyes
-    Bring 'em home, bring 'em home
+      Now we'll \[C]give no more brave young lives
+      Bring 'em \[Am]home, bring 'em home
+      For the \[F]gleam in someone's \[C]eyes
+      Bring 'em \[G]home, bring 'em \[C]home
     \end{verse}
 
     \begin{verse}
-    The men will cheer and the boys will shout
-    Bring 'em home, bring 'em home
-    Yeah and we will all turn out
-    Bring 'em home, bring 'em home
+      The men will \[C]cheer and the boys will shout
+      Bring 'em \[Am]home, bring 'em home
+      Yeah and we \[F]will all turn \[C]out
+      Bring 'em \[G]home, bring 'em \[C]home
     \end{verse}
 
     \begin{verse}
-    The church bells will ring with joy
-    Bring 'em home, bring 'em home
-    To welcome our darlin', girls and boys
-    Bring 'em home, bring 'em home
+      The church \[C]bells will ring with joy
+      Bring 'em \[Am]home, bring 'em home
+      To welcome our \[F]darlin', girls and \[C]boys
+      Bring 'em \[G]home, bring 'em \[C]home
     \end{verse}
 
     \begin{verse}
-    We will lift their voice and song
-    Bring 'em home, bring 'em home
-    When Johnny comes marching home
-    Bring 'em home, bring 'em home
+      We will \[C]lift their voice and song
+      Bring 'em \[Am]home, bring 'em home
+      When John\[F]ny comes marching \[C]home
+      Bring 'em \[G]home, bring 'em \[C]home
     \end{verse}
+  \end{repeatedchords}
 
 \endsong

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}
@@ -10,10 +10,11 @@
   \begin{verse}
     \[F]As I was walking down the street
     \[C7]Down the street, \[F]down the street
-    A pretty girl I chanced to meet
+    \[F]{A pretty} girl I chanced to meet
     And we \[C7]danced by the light of the \[F]moon
   \end{verse}
 
+  \begin{repeatedchords}
     \begin{chorus}
       \[F]Buffalo gals won't you come out tonight
       \[C7]Come out tonight, \[F]come out tonight
@@ -22,10 +23,11 @@
     \end{chorus}
 
     \begin{verse}
-    I danced with a gal with a hole in her stocking
-    And he knees was a-knockin' and her shoes was a'rockin'
-    I danced with a gal with a hole in her stocking
-    And we danced by the light of the moon
+      I \[F]danced with a gal with a hole in her stocking
+      And he \[C7]knees was a-knockin' and her \[F]shoes was a'rockin'
+      I \[F]danced with a gal with a hole in her stocking
+      And we \[C7]danced by the light of the \[F]moon
     \end{verse}
+  \end{repeatedchords}
 
 \endsong

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}

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}

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}
@@ -22,46 +22,48 @@
     \[D7]{O Mary}, don't you \[Gm]weep
   \end{chorus}
 
+  \begin{repeatedchords}
     \begin{verse}
-    Well Mary wore three links of chain
-    On every link was Jesus' name
-    Pharaoh's army got drownded
-    O Mary, don't you weep
+      Well \[Gm]Mary wore three \[D7]links of chain
+      On \[D7]every link was \[Gm]Jesus' name
+      \[Cm]Pharaoh's army got \[Gm]drownded
+      \[D7]{O Mary}, don't you \[Gm]weep
     \end{verse}
 
     \begin{verse}
-    Well one of these nights bout 12 o'clock
-    This old world is gonna rock
-    Pharaoh's army got drownded
-    O Mary, don't you weep
+      Well \[Gm]one of these nights bout \[D7]12 o'clock
+      \[D7]This old world is \[Gm]gonna rock
+      \[Cm]Pharaoh's army got \[Gm]drownded
+      \[D7]{O Mary}, don't you weep
     \end{verse}
 
     \begin{verse}
-    Well Moses stood on the Red Sea shore
-    And smote the water with a two by four
-    Pharaoh's army got drownded
-    O Mary, don't you weep
+      Well \[Gm]Moses stood on the \[D7]Red Sea shore
+      And \[D7]smote the water with a \[Gm]two by four
+      \[Cm]Pharaoh's army got \[Gm]drownded
+      \[D7]{O Mary}, don't you \[Gm]weep
     \end{verse}
 
     \begin{verse}
-    Well, old Mr. Satan he got mad
-    Missed that soul that he thought he had
-    Pharaoh's army get drownded
-    O Mary, don't you weep
+      Well, \[Gm]old Mr. Satan \[D7]he got mad
+      \[D7]Missed that soul that he \[Gm]thought he had
+      \[Cm]Pharaoh's army get \[Gm]drownded
+      \[D7]{O Mary}, don't you weep
     \end{verse}
 
     \begin{verse}
-    Brothers and sisters don't you cry
-    They'll be good times by and by
-    Pharaoh's army got drownded
-    O Mary, don't you weep
+      \[Gm]Brothers and sisters \[D7]don't you cry
+      \[D7]They'll be good times \[Gm]by and by
+      \[Cm]Pharaoh's army got \[Gm]drownded
+      \[D7]{O Mary}, don't you \[Gm]weep
     \end{verse}
 
     \begin{verse}
-    God gave Noah the rainbow sign
-    Said, ``No more water, but fire next time''
-    Pharaoh's army got drownded
-    O Mary, don't you weep
+      \[Gm]God gave Noah the \[D7]rainbow sign
+      \[D7]Said, ``No more water, but \[Gm]fire next time''
+      \[Cm]Pharaoh's army got \[Gm]drownded
+      \[D7]{O Mary}, don't you weep
     \end{verse}
+  \end{repeatedchords}
 
 \endsong

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}
@@ -22,25 +22,27 @@
     \rep{2}
   \end{chorus}
 
+  \begin{repeatedchords}
     \begin{verse}
-    Now Old Dan Tucker come to town
-    Ridin' a billy goat, leadin' a hound
-    The hound dog barked and billy goat jumped
-    And landed old Tucker on a stump
+      Now \[C]Old Dan Tucker \[F]come to town
+      \[G]Ridin' a billy goat, \[C]leadin' a hound
+      The \[C]hound dog barked and bil\[F]ly goat jumped
+      And \[G]landed old Tucker \[C]on a stump
     \end{verse}
 
     \begin{verse}
-    Now Old Dan Tucker got drunk and fell
-    In the fire and kicked up holy hell
-    A red-hot coal got in his shoe
-    And, oh my Lord, the ashes flew!
+      Now \[C]Old Dan Tucker got \[F]drunk and fell
+      In the \[G]fire and kicked up \[C]holy hell
+      A \[C]red-hot coal got \[F]in his shoe
+      And, \[G]oh my Lord, the \[C]ashes flew!
     \end{verse}
 
     \begin{verse}
-    Now Old Dan Tucker come to town
-    Swinging them ladies all round
-    First to the right and then to the left
-    Then to the gal that he loved best
+      Now \[C]Old Dan Tucker \[F]come to town
+      \[G]Swinging them ladies \[C]all round
+      \[C]First to the right and \[F]then to the left
+      \[G]Then to the gal that \[C]he loved best
     \end{verse}
+  \end{repeatedchords}
 
 \endsong

Bruce_Springsteen/Pay_me_my_money_down.sg

@@ -1,55 +1,61 @@
 \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}
   \gtab{D}{XX0232}
+  \ifnorepeatchords%
+  \else%
   \gtab{B&}{1:X02220}
   \gtab{F}{1:022100}
+  \fi%
 
   \begin{verse}
-    \[G]Well, I thought I heard the captain say
+    Well, I \[G]thought I heard the captain say
     ``Pay me my \[D]money down
     Tomorrow is my sailing day
     Pay me my \[G]money down''
   \end{verse}
 
+  \begin{repeatedchords}
     \begin{chorus}
-    Pay me, pay me
+      \[G] Pay me, pay me
       Pay me my \[D]money down
       Pay me or go to jail
       Pay me my \[G]money down
     \end{chorus}
 
     \begin{verse}
-    Soon as that boat was clear of the bar
-    Pay me my money down
+      \[G]Soon as that boat was clear of the bar
+      Pay me my \[D]money down
       He knocked me down with the end of a spar
-    Pay me my money down
+      Pay me my \[G]money down
     \end{verse}
 
     \begin{verse}
-    Well if I'd been a rich man's son
-    Pay me my money down
+      Well \[G]if I'd been a rich man's son
+      Pay me my \[D]money down
       I'd sit on the river and watch it run
-    Pay me my money down
+      Pay me my \[G]money down
     \end{verse}
 
+    \transposition{3}
     \begin{verse}
-    \[B&]Well, I wish I was Mr. Gates
-    Pay me my \[F]money down
+      Well, I wish \[G]{I was} Mr. Gates
+      Pay me my \[D]money down
       Haul my money in egg crates
-    Pay me my \[B&]money down
+      Pay me my \[G]money down
     \end{verse}
 
+    \transposition{-3}
     \begin{verse}
-    \[G]Well, 40 nights, nights at sea
+      Well, \[G]40 nights, nights at sea
       Pay me my \[D]money down
       Captain worked every last dollar out of me
       Pay me my \[G]money down
     \end{verse}
+  \end{repeatedchords}
 
 \endsong
-

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}

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}

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}

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}

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}

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}

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}

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}

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}

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}

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}

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}

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}

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}

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}

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}

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}

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}

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}

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}

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}

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}

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}

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}

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}

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}

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}

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}

Crep/Bioman.sg

@@ -1,7 +1,8 @@
 \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
   \capo{3}

Crep/Calimero.sg

@@ -1,7 +1,8 @@
 \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
   \gtab{Dm}{5:X02210}

Crep/Encore.sg

@@ -1,7 +1,8 @@
 \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
   \gtab{Cm}{3:X02210}

Crep/Fichu_doctorat.sg

@@ -1,7 +1,8 @@
 \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
   \gtab{Em}{022000}