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

Conflicts: songs/Renan_Luce/le_lacrymal_circus.sg
13 years ago · 236f1d28c5
769 changed files with 2880 additions and 1819 deletions
--- a/16
+++ b/16
@ -1,4 +1,20 @@

+version 3.6.1
+
+Romain Goffe:
+  Le Donjon de Naheulbeuk - Chicken quest
+  Le Donjon de Naheulbeuk - Crom
+  Le Donjon de Naheulbeuk - HÃ©, la petite dame
+  Le Donjon de Naheulbeuk - La hache Durandil
+  Le Donjon de Naheulbeuk - Le petit gobelin
+  Le Donjon de Naheulbeuk - Tralala du nain
+  Les Amis d'ta femme - Le tango du viagra
+olivier desrobert:
+  Thomas Fersen - Au café de la paix
+  Thomas Fersen - Saint-Jean-du-Doigt
+  Renan Luce - Le Lacrymal Circus
+  Les Wriggles - Petit bonhomme
+
 version 3.6.0

 Romain Goffe:
--- a/books/naheulbeuk.sb
+++ b/books/naheulbeuk.sb
@ -8,7 +8,7 @@
  ],
 "booktype" : "chorded",
 "footer" : "Musique du Naheulband: \\url{http://www.penofchaos.com/warham/donjon-groupe.htm}",
-"license" : "\\input{license-nb.tex}",
+"license" : "license-nb.tex",
 "picture" : "nb_cover",
 "picturecopyright" : "Personnages par \\emph{Pen Of Chaos} / Illustrations par \\emph{Marion Poinsot}",
 "subtitle" : "Recueil de chansons non-officiel",
@ -19,6 +19,12 @@
    "Belyscendre/Mon_pere_veut_me_marier.sg",
    "Belyscendre/Prends_garde_au_loup.sg",
    "Le_Donjon_de_Naheulbeuk/10_sous_dans_ma_poche.sg",
+    "Le_Donjon_de_Naheulbeuk/Chicken_quest.sg",
+    "Le_Donjon_de_Naheulbeuk/Crom.sg",
+    "Le_Donjon_de_Naheulbeuk/La_hache_Durandil.sg",
+    "Le_Donjon_de_Naheulbeuk/Le_petit_gobelin.sg",
+    "Le_Donjon_de_Naheulbeuk/He_la_petite_dame.sg",
+    "Le_Donjon_de_Naheulbeuk/Tralala_du_nain.sg",
    "Le_Donjon_de_Naheulbeuk/Bugger_off.sg",
    "Le_Donjon_de_Naheulbeuk/La_biere_du_donjon.sg",
    "Le_Donjon_de_Naheulbeuk/La_compagnie_du_chien_rugissant.sg",
--- a/books/volume-5.sb
+++ b/books/volume-5.sb
@ -41,13 +41,21 @@
    "Jean-Jacques_Goldman/On_ira.sg",
    "La_Rue_Ketanou/Sao_loucas.sg",
    "Le_clandestin/Rue_Grenelle.sg",
+    "Le_Donjon_de_Naheulbeuk/Chicken_quest.sg",
+    "Le_Donjon_de_Naheulbeuk/Crom.sg",
+    "Le_Donjon_de_Naheulbeuk/He_la_petite_dame.sg",
+    "Le_Donjon_de_Naheulbeuk/La_hache_Durandil.sg",
+    "Le_Donjon_de_Naheulbeuk/Le_petit_gobelin.sg",
    "Le_Donjon_de_Naheulbeuk/Maitre_du_donjon.sg",
+    "Le_Donjon_de_Naheulbeuk/Tralala_du_nain.sg",
+    "Les_Amis_D_Ta_Femme/le_tango_du_viagra.sg",
    "Les_Booze_Brothers/Fields_of_Athenry.sg",
    "Les_Cowboys_Fringants/8_secondes.sg",
    "Les_Cowboys_Fringants/Ces_temps_ci.sg",
    "Les_Cowboys_Fringants/Hannah.sg",
    "Les_Fatals_Picards/Au_mariage_de_Kevin_et_de_ma_soeur.sg",
    "Les_Ogres_de_Barback/Rue_Mazarine.sg",
+    "Les_Wriggles/petit_bonhomme.sg",
    "Maxime_Le_Forestier/Passer_ma_route.sg",
    "Noir_Desir/Ou_veux_tu_qu_je_regarde.sg",
    "Noir_Desir/Toujours_etre_ailleurs.sg",
@ -55,10 +63,12 @@
    "Patrick_Coutin/J_aime_regarder_les_filles.sg",
    "Phil_Barney/Un_enfant_de_toi.sg",
    "Razorlight/America.sg",
+    "Renan_Luce/le_lacrymal_circus.sg",
    "Roch_Voisine/Helene.sg",
    "Telephone/Le_jour_s_est_leve.sg",
    "The_Bloody_Irish_Boys/Drunk_tonight.sg",
    "The_Dubliners/The_wild_rover.sg",
+    "Thomas_Fersen/au_cafe_de_la_paix.sg",
    "Thomas_Fersen/Bambi.sg",
    "Thomas_Fersen/Croque.sg",
    "Thomas_Fersen/Irene.sg",
@ -67,6 +77,7 @@
    "Thomas_Fersen/L_histoire_d_une_heure.sg",
    "Thomas_Fersen/Louise.sg",
    "Thomas_Fersen/Rititi_ratata_il_parait_qu_elles_aiment_.sg",
+    "Thomas_Fersen/saint_jean_du_doigt.sg",
    "Tournee_Generale/Avancer_mes_grolles.sg",
    "U2/One.sg",
    "Yves_Simon/Les_bateaux_du_metro.sg"]
--- a/img/internet.png
+++ b/img/internet.png
--- a/img/src/internet.svg
+++ b/img/src/internet.svg
@ -0,0 +1,216 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg11300"
+   height="22"
+   width="22"
+   version="1.0"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="internet.svg"
+   inkscape:export-filename="/home/crep/desktop/applications-internet.png"
+   inkscape:export-xdpi="73.639999"
+   inkscape:export-ydpi="73.639999">
+  <metadata
+     id="metadata45">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1625"
+     inkscape:window-height="1026"
+     id="namedview43"
+     showgrid="false"
+     inkscape:zoom="15.170655"
+     inkscape:cx="-0.42694966"
+     inkscape:cy="25.572501"
+     inkscape:window-x="55"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg11300" />
+  <defs
+     id="defs3">
+    <linearGradient
+       id="linearGradient3156">
+      <stop
+         id="stop3158"
+         style="stop-color:#fff"
+         offset="0" />
+      <stop
+         id="stop3160"
+         style="stop-color:#fff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5575"
+       y2="24.654"
+       xlink:href="#linearGradient3156"
+       gradientUnits="userSpaceOnUse"
+       x2="29.725"
+       gradientTransform="matrix(-.080599 -.53926 .24452 .0082709 8.3675 28.1)"
+       y1="55.647"
+       x1="30.502" />
+    <linearGradient
+       id="linearGradient5577"
+       y2="20.664"
+       xlink:href="#linearGradient3156"
+       gradientUnits="userSpaceOnUse"
+       x2="28.29"
+       gradientTransform="matrix(-.048560 -.54248 .33934 -.019372 3.6551 28.93)"
+       y1="-2.3103"
+       x1="28.221" />
+    <linearGradient
+       id="linearGradient5579"
+       y2="20.664"
+       xlink:href="#linearGradient3156"
+       gradientUnits="userSpaceOnUse"
+       x2="28.29"
+       gradientTransform="matrix(.54285 -.0033948 .00054207 .37140 -4.4843 4.0902)"
+       y1="-.81503"
+       x1="27.889" />
+    <linearGradient
+       id="linearGradient5581"
+       y2="20.664"
+       xlink:href="#linearGradient3156"
+       gradientUnits="userSpaceOnUse"
+       x2="28.29"
+       gradientTransform="matrix(.53414 -.14026 .096919 .34395 -6.5733 9.6565)"
+       y1="61.853"
+       x1="24.335" />
+    <radialGradient
+       id="radialGradient5863"
+       gradientUnits="userSpaceOnUse"
+       cy="4.625"
+       cx="62.625"
+       gradientTransform="matrix(.94118 0 0 .23529 -47.941 21.412)"
+       r="10.625">
+      <stop
+         id="stop8840"
+         offset="0" />
+      <stop
+         id="stop8842"
+         style="stop-opacity:0"
+         offset="1" />
+    </radialGradient>
+    <radialGradient
+       id="radialGradient5552"
+       fy="6.8828"
+       xlink:href="#linearGradient3156"
+       gradientUnits="userSpaceOnUse"
+       cy="13.344"
+       cx="21.419"
+       gradientTransform="matrix(.70713 0 0 .47143 -7.0986 1.2927)"
+       r="14" />
+    <radialGradient
+       id="radialGradient5555"
+       xlink:href="#linearGradient3156"
+       gradientUnits="userSpaceOnUse"
+       cy="33"
+       cx="102.75"
+       gradientTransform="matrix(1.1993 0 0 1.1 -115.8 -32.1)"
+       r="9" />
+  </defs>
+  <g
+     id="g6339"
+     transform="translate(0,-2)">
+    <path
+       id="path6401"
+       style="opacity:.4;fill-rule:evenodd;enable-background:new;fill:url(#radialGradient5863)"
+       d="m21 22.5c0 1.381-4.477 2.5-10 2.5-5.5228 0-10-1.119-10-2.5s4.4772-2.5 10-2.5 10 1.1193 10 2.5z" />
+    <path
+       id="path6653"
+       style="stroke-linejoin:round;stroke:#2e3436;stroke-linecap:round;fill:#555753"
+       d="m21.5 13c0 5.796-4.704 10.5-10.5 10.5s-10.5-4.704-10.5-10.5c0-5.7959 4.704-10.5 10.5-10.5s10.5 4.704 10.5 10.5z" />
+    <path
+       id="path6657"
+       style="fill:#eeeeec"
+       d="m20.682 10.847-0.094 0.36235c-0.27818-0.23108-0.59051-0.42541-0.90767-0.62836l-0.6962 0.07221-0.63607-0.50684v0.62725l0.54495 0.29067 0.36272 0.28955 0.48473-0.38642c0.12202 0.1611 0.24237 0.3222 0.36355 0.4833v0.48277l-0.54578 0.43457-0.99879 0.4833-0.75642 0.53208-0.48474-0.3876 0.24237-0.43457-0.48398-0.38642-0.81738-1.2315-0.6962-0.55498-0.18223 0.14448 0.27327 0.70064 0.51405 0.4105c0.29359 0.59743 0.58401 1.1684 0.96955 1.7395 0.59784 0 1.1614-0.04474 1.7552-0.09746v0.33828l-0.72635 1.2559-0.66614 0.53091-0.54495 0.82216v1.3519l0.18223 0.53208-0.30258 0.24083-0.66697 0.29008-0.6962 0.4105 0.57585 0.4587-0.78732 0.48388 0.15125 0.31304-1.181 0.94258h-0.78649l-0.66614 0.29008h-0.4246v-0.38642l-0.18057-0.77402c-0.23429-0.48506-0.47824-0.96665-0.72635-1.4482 0-0.35548 0.03007-0.70751 0.06022-1.0629l0.30342-0.48277-0.4246-0.58022 0.0309-0.79692-0.57585-0.4587 0.28793-0.66394-0.46849-0.37468h-0.81822l-0.2727-0.217-0.8174 0.363-0.3326-0.266-0.7573 0.459c-0.514-0.411-1.0289-0.822-1.5437-1.232l-0.6052-1.015 0.545-0.579-0.3026-0.241 0.6653-1.112c0.5466-0.479 1.1176-0.9392 1.6951-1.4007l1.0297-0.19321 1.1501-0.096342 0.78732 0.14507 1.12 0.79633 0.3937-0.31362 0.54412-0.048142 1.0297 0.24135h0.78732l0.54495-0.33828 0.24237-0.24135-0.54578-0.24135-0.9085-0.048142c-0.252-0.2465-0.486-0.5056-0.786-0.7247l-0.303 0.0964-0.121 0.6283-0.545-0.4345-0.121-0.4839-0.605-0.3371h-0.2432l0.60592 0.48277-0.24237 0.43457-0.48398 0.096342 0.303-0.4346-0.546-0.1927-0.483-0.3864-0.9092 0.1445-0.1204 0.1926-0.5449 0.242-0.3026 0.5315-0.7564 0.2654-0.3335-0.2654h-0.36272v-0.86972l0.78732-0.29008h0.60517l-0.122-0.3377-0.4832-0.3383 0.8166-0.121 0.4539-0.3618 0.3627-0.4351h0.66697l-0.18223-0.3377 0.4246-0.19321v0.38642l0.90767 0.14448 0.90767-0.53091 0.06097-0.24194 0.78648-0.38613c-0.28468 0.024952-0.56935 0.043268-0.84754 0.096636v-0.43509l0.30258-0.48306h-0.30258l-0.66497 0.43457-0.18223 0.24165 0.18223 0.33858-0.303 0.5791-0.484-0.1932-0.423-0.3377-0.6669 0.3377-0.2424-0.7726 1.1501-0.5312v-0.29008l0.7271-0.33799 1.1501-0.19351 0.78732 0.19351 1.0899 0.48277h-0.78732l0.78732 0.57964 0.60517-0.48277s2.4081 1.2085 3.6518 2.8799c1.2102 1.6263 1.7168 3.4747 1.7697 3.8588z" />
+    <path
+       id="path6661"
+       style="opacity:.4;stroke-linejoin:round;stroke:url(#radialGradient5555);stroke-linecap:round;stroke-width:1.0517;fill:none"
+       d="m20.374 13c0 5.1745-4.1995 9.3742-9.3739 9.3742s-9.3739-4.1996-9.3739-9.3742 4.1995-9.3742 9.3739-9.3742 9.3739 4.1996 9.3739 9.3742z" />
+    <path
+       id="path6663"
+       style="opacity:.4;fill:url(#radialGradient5552)"
+       d="m21.01 9.5518c0 3.6432-4.4351 5.6481-9.8998 5.6481s-9.8998-2.0049-9.8998-5.6481 4.4351-7.552 9.8998-7.552 9.8998 3.9087 9.8998 7.552z" />
+    <path
+       id="path6665"
+       style="opacity:.5;stroke:url(#linearGradient5581);stroke-linecap:round;stroke-width:.99694;fill:none"
+       d="m20.347 11.545c0.93672 3.3243-2.4889 7.118-7.6514 8.4736-5.1624 1.356-10.107-0.24-11.044-3.565-0.93619-3.324 2.4895-7.1176 7.6519-8.4732 5.1621-1.3556 10.107 0.2404 11.043 3.5642z" />
+    <path
+       id="path6667"
+       style="opacity:.5;stroke:url(#linearGradient5579);stroke-linecap:round;stroke-width:1.0004;fill:none"
+       d="m20.5 12.941c0.0052 3.5896-4.2437 6.5261-9.4903 6.559-5.2466 0.03281-9.5041-2.8505-9.5093-6.4401-0.00524-3.5896 4.2437-6.5261 9.4903-6.559 5.2466-0.032811 9.5041 2.8505 9.5093 6.4401z" />
+    <path
+       id="path6669"
+       style="opacity:.5;stroke:url(#linearGradient5577);stroke-linecap:round;stroke-width:1.0009;fill:none"
+       d="m9.6502 3.5066c3.2798-0.1873 6.3188 3.9113 6.7878 9.1544 0.47 5.243-1.809 9.645-5.088 9.832-3.2799 0.188-6.319-3.911-6.7884-9.154-0.4693-5.2431 1.8089-9.6452 5.0886-9.8324z" />
+    <path
+       id="path6671"
+       style="opacity:.9;stroke:url(#linearGradient5575);stroke-linecap:round;stroke-width:.98696;fill:none"
+       d="m10.59 3.4946c2.3633 0.079938 6.6007 5.2149 7.3797 10.427 0.77899 5.212-2.1955 8.5272-4.5588 8.4473-2.364-0.08-4.9111-4.37-5.6901-9.582-0.779-5.2121 0.5053-9.3724 2.8691-9.2924z" />
+    <g
+       id="g6673"
+       style="opacity:.6;stroke-width:2.108"
+       transform="matrix(.49781 -.13842 .13541 .50886 -1.647 2.0422)">
+      <path
+         id="path6675"
+         style="opacity:.8;fill:#fff"
+         d="m31.375 37.875c0 0.9665-0.7835 1.75-1.75 1.75s-1.75-0.7835-1.75-1.75 0.7835-1.75 1.75-1.75 1.75 0.7835 1.75 1.75z"
+         transform="matrix(.85714 0 0 .85714 4.1071 5.0357)" />
+    </g>
+    <g
+       id="g6677"
+       style="opacity:.6;stroke-width:2.1112"
+       transform="matrix(.49172 -.11974 .15605 .51358 -14.084 4.1819)">
+      <path
+         id="path6679"
+         style="opacity:.5;fill:#fff"
+         d="m31.375 37.875c0 0.9665-0.7835 1.75-1.75 1.75s-1.75-0.7835-1.75-1.75 0.7835-1.75 1.75-1.75 1.75 0.7835 1.75 1.75z"
+         transform="matrix(.85714 0 0 .85714 4.1071 5.0357)" />
+    </g>
+    <g
+       id="g6681"
+       style="opacity:.6;stroke-width:2.1103"
+       transform="matrix(.47705 -.16815 .19641 .49982 -6.4521 -6.9074)">
+      <path
+         id="path6683"
+         style="opacity:.8;fill:#fff"
+         d="m31.375 37.875c0 0.9665-0.7835 1.75-1.75 1.75s-1.75-0.7835-1.75-1.75 0.7835-1.75 1.75-1.75 1.75 0.7835 1.75 1.75z"
+         transform="matrix(.85714 0 0 .85714 4.1071 5.0357)" />
+    </g>
+    <g
+       id="g6685"
+       style="opacity:.6;stroke-width:2.1575"
+       transform="matrix(.51592 -.14876 -.0086906 .50593 -10.12 -6.3754)">
+      <path
+         id="path6687"
+         style="opacity:.5;fill:#fff"
+         d="m31.375 37.875c0 0.9665-0.7835 1.75-1.75 1.75s-1.75-0.7835-1.75-1.75 0.7835-1.75 1.75-1.75 1.75 0.7835 1.75 1.75z"
+         transform="matrix(.85714 0 0 .85714 4.1071 5.0357)" />
+    </g>
+  </g>
+</svg>
--- a/macos/clean.sh
+++ b/macos/clean.sh
@ -2,3 +2,5 @@
 #
 echo "manually performs 'make clean'"
 rm -rf *.aux *.d *.toc *.out *.log *.nav *.snm *.sbx *.sxd
+echo "remove temporary covers"
+rm -rf covers/
--- a/1
+++ b/1
@ -61,6 +61,7 @@ clean:
 	       $(TARGETS:%=%.nav) $(TARGETS:%=%.snm)
 	@rm -f *.sbx *.sxd *.sxc
 	@rm -f *.pyc
+	@rm -rf covers/

 cleanall: clean
 	@rm -f $(PDF)
--- a/songbook.py
+++ b/songbook.py
@ -8,8 +8,21 @@ import glob
 import re
 import json
 import locale
-import sortindex
 import shutil
+import locale
+
+reTitle  = re.compile('(?<=beginsong\\{)(.(?<!\\}]))+')
+reArtist = re.compile('(?<=by=)(.(?<![,\\]\\}]))+')
+reAlbum  = re.compile('(?<=album=)(.(?<![,\\]\\}]))+')
+
+class Song:
+   def __init__(self, title, artist, album, path):
+      self.title  = title
+      self.artist = artist
+      self.album  = album
+      self.path   = path
+   def __repr__(self):
+      return repr((self.title, self.artist, self.album, self.path))

 def copyCovers():
   '''
@ -33,9 +46,26 @@ def matchRegexp(reg, iterable):
    return [ m.group(1) for m in (reg.match(l) for l in iterable) if m ]

 def songslist(songs):
-    directories = set(["img/"] + map(lambda x: "songs/" + os.path.dirname(x), songs))
-    result = [ '\\input{{songs/{0}}}'.format(s.replace("\\","/").strip()) for s in songs ]
-    return '\n'.join(result)
+   song_objects = []
+   for s in songs:
+      path = 'songs/'+s
+      with open(path, 'r+') as f:
+         data   = f.read()
+         title  = reTitle.search(data).group(0)
+         artist = reArtist.search(data.replace("{","")).group(0)
+         match  = reAlbum.search(data.replace("{",""))
+         if match:
+            album = match.group(0)
+         else:
+            album = ''
+         song_objects.append(Song(title, artist, album, path))
+
+   song_objects = sorted(song_objects, key=lambda x: locale.strxfrm(x.title))
+   song_objects = sorted(song_objects, key=lambda x: locale.strxfrm(x.album))
+   song_objects = sorted(song_objects, key=lambda x: locale.strxfrm(x.artist))
+
+   result = [ '\\input{{{0}}}'.format(song.path.replace("\\","/").strip()) for song in song_objects ]
+   return '\n'.join(result)

 def parseTemplate(template):
    embeddedJsonPattern = re.compile(r"^%%:")
@ -116,7 +146,6 @@ def makeTexFile(sb, output):
    if songs == "all":
        songs = map(lambda x: x[6:], glob.glob('songs/*/*.sg'))

-    songs.sort(key=sortindex.sortkey)
    if len(songs) > 0:
        out.write(formatDefinition('songslist', songslist(songs)))
    out.write('\\makeatother\n')
--- a/songs/Aaron/U_turn_lili.sg
+++ b/songs/Aaron/U_turn_lili.sg
@ -1,7 +1,7 @@
 \selectlanguage{english}
 \songcolumns{1}
 \beginsong{U-Turn (Lili)}
-  [by=AaRON,cov=aaron,album=Aaron]
+  [by={AaRON},cov={aaron},album={Aaron}]

  \cover
  \gtab{Em}{022000}
--- a/songs/Alain_Bashung/Gaby_oh_gaby.sg
+++ b/songs/Alain_Bashung/Gaby_oh_gaby.sg
@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{1}
 \beginsong{Gaby, oh Gaby}
-  [by=Alain Bashung,cov=roulette-russe,album=Roulette russe]
+  [by={Alain Bashung},cov={roulette-russe},album={Roulette russe}]

  \cover
  \gtab{E}{022100}
--- a/songs/Alain_Souchon/Bidon.sg
+++ b/songs/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/songs/Alain_Souchon/Foule_sentimentale.sg
+++ b/songs/Alain_Souchon/Foule_sentimentale.sg
@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{Foule sentimentale}
-  [by=Alain Souchon,cov=c-est-deja-ca,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/songs/Alain_Souchon/L_amour_a_la_machine.sg
+++ b/songs/Alain_Souchon/L_amour_a_la_machine.sg
@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{L'amour à la machine}
-  [by=Alain Souchon,cov=c-est-deja-ca,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/songs/Alain_Souchon/La_ballade_de_Jim.sg
+++ b/songs/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/songs/Alain_Souchon/Sous_les_jupes_des_filles.sg
+++ b/songs/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}
--- a/songs/Alanis_Morissette/Ironic.sg
+++ b/songs/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}
--- a/songs/Alex_Beaupain/As_tu_deja_aime.sg
+++ b/songs/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/songs/Alex_Beaupain/De_bonnes_raisons.sg
+++ b/songs/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/songs/Alex_Beaupain/Je_n_aime_que_toi.sg
+++ b/songs/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/songs/Alex_Beaupain/Les_yeux_au_ciel.sg
+++ b/songs/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/songs/Alex_Beaupain/Ma_memoire_sale.sg
+++ b/songs/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/songs/Alexis_HK/Gaspard.sg
+++ b/songs/Alexis_HK/Gaspard.sg
@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{1}
 \beginsong{Gaspard}
-  [by=Alexis HK,cov=belle-ville,album=Belle ville]
+  [by={Alexis HK},cov={belle-ville},album={Belle ville}]

  \cover
  \capo{4}
--- a/songs/Alicia_Keys/If_aint_got_you.sg
+++ b/songs/Alicia_Keys/If_aint_got_you.sg
@ -1,7 +1,7 @@
 \selectlanguage{english}
 \songcolumns{2}
 \beginsong{If I ain't got you}
-  [by=Alicia Keys,cov=If_aint_got_you,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/songs/America/A_Horse_With_No_Name.sg
+++ b/songs/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}
@ -55,4 +57,4 @@
    \end{verse}
  \end{repeatedchords}

-\endsong
+\endsong
--- a/songs/Amy_MacDonald/Mr._Rock_n_Roll.sg
+++ b/songs/Amy_MacDonald/Mr._Rock_n_Roll.sg
@ -1,7 +1,7 @@
 \selectlanguage{english}
 \songcolumns{1}
 \beginsong{Mr. Rock'n Roll}
-  [by=Amy MacDonald,cov=this-is-the-life,album=This is the life]
+  [by={Amy MacDonald},cov={this-is-the-life},album={This is the life}]

  \cover
  \capo{7}
--- a/songs/Amy_MacDonald/This_is_the_life.sg
+++ b/songs/Amy_MacDonald/This_is_the_life.sg
@ -1,7 +1,7 @@
 \selectlanguage{english}
 \songcolumns{1}
 \beginsong{This is the life}
-  [by=Amy MacDonald,cov=this-is-the-life,album=This is the life]
+  [by={Amy MacDonald},cov={this-is-the-life},album={This is the life}]

  \cover
  \capo{4}
--- a/songs/Anais/Mon_coeur_mon_amour.sg
+++ b/songs/Anais/Mon_coeur_mon_amour.sg
@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{Mon cœur, mon amour}
-  [by=Anaïs,cov=the-cheap-show,album=The cheap show]
+  [by={Anaïs},cov={the-cheap-show},album={The cheap show}]

  \cover
  \gtab{F#}{2:022100}
--- a/songs/Anis/Dans_tes_yeux.sg
+++ b/songs/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
--- a/songs/Anny_Et_Jean-Marc_Versini/La_danse_des_esquimaux.sg
+++ b/songs/Anny_Et_Jean-Marc_Versini/La_danse_des_esquimaux.sg
@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{La danse des esquimaux}
-  [by=Anny et Jean-Marc Versini,cov=les-chansons-de-la-marmotte,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/songs/Antsy_Pants/Vampire.sg
+++ b/songs/Antsy_Pants/Vampire.sg
@ -1,7 +1,7 @@
 \selectlanguage{english}
 \songcolumns{2}
 \beginsong{Vampire}
-  [by=Antsy Pants,cov=juno,album=Juno]
+  [by={Antsy Pants},cov={juno},album={Juno}]

  \cover
  \gtab{Dm}{XX0231}
--- a/songs/As_De_Trefle/A_l_oreille_de_ta_femme.sg
+++ b/songs/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/songs/As_De_Trefle/Chanson_d_amur.sg
+++ b/songs/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/songs/As_De_Trefle/Jessica.sg
+++ b/songs/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/songs/As_De_Trefle/La_revolution.sg
+++ b/songs/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/songs/As_De_Trefle/Pauvre_planete.sg
+++ b/songs/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}
@ -89,4 +88,4 @@

  \end{repeatedchords}

-\endsong
+\endsong
--- a/songs/As_De_Trefle/Toi_toi_toi.sg
+++ b/songs/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/songs/Avenue_Q/The_internet_is_for_porn.sg
+++ b/songs/Avenue_Q/The_internet_is_for_porn.sg
@ -1,7 +1,7 @@
 \selectlanguage{english}
 \songcolumns{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/songs/Avril_Lavigne/Things_I_ll_never_say.sg
+++ b/songs/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/songs/Barbara/L_aigle_noir.sg
+++ b/songs/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{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
-  \end{verse}
+  \begin{repeatedchords}
+    \transposition{2}
+    \begin{verse}
+      \[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}

-  \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
-  \end{verse}
+    \transposition{2}
+    \begin{verse}
+      \[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}

-  \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
-  \end{verse}
-
-  \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
-  \end{verse}
+    \transposition{2}
+    \begin{verse}
+      \[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}
+      \[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}

-  \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
-  \end{verse}
+    \transposition{2}
+    \begin{verse}
+      \[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
--- a/songs/Barry_Louis_Polisar/All_I_Want_Is_You.sg
+++ b/songs/Barry_Louis_Polisar/All_I_Want_Is_You.sg
@ -1,7 +1,7 @@
 \selectlanguage{english}
 \songcolumns{1}
 \beginsong{All I want is you}
-  [by=Barry Louis Polisar,cov=juno,album=Juno]
+  [by={Barry Louis Polisar},cov={juno},album={Juno}]

  \cover
  \gtab{G}{320003}
--- a/songs/Beau_Dommage/La_complainte_du_phoque_en_alaska.sg
+++ b/songs/Beau_Dommage/La_complainte_du_phoque_en_alaska.sg
@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{La complainte du phoque en Alaska}
-  [by=Beau Dommage,cov=le-meilleur-de-beau-dommage,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/songs/Belle_Sebastian/Piazza_New_York_catcher.sg
+++ b/songs/Belle_Sebastian/Piazza_New_York_catcher.sg
@ -1,7 +1,7 @@
 \selectlanguage{english}
 \songcolumns{1}
 \beginsong{Piazza, New York catcher}
-  [by=Belle \& Sebastian,cov=juno,album=Juno]
+  [by={Belle \& Sebastian},cov={juno},album={Juno}]

  \cover
  \gtab{F#}{2:022100}
--- a/songs/Belyscendre/Helas_madame.sg
+++ b/songs/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/songs/Belyscendre/Mon_pere_veut_me_marier.sg
+++ b/songs/Belyscendre/Mon_pere_veut_me_marier.sg
@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{Mon père veut me marier}
-  [by=Belyscendre,cov=prends-garde-au-loup,album=Prends garde au loup]
+  [by={Belyscendre},cov={prends-garde-au-loup},album={Prends garde au loup}]

  \cover
  \gtab{C}{X32010}
--- a/songs/Belyscendre/Prends_garde_au_loup.sg
+++ b/songs/Belyscendre/Prends_garde_au_loup.sg
@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{Prends garde au loup}
-  [by=Belyscendre,cov=prends-garde-au-loup,album=Prends garde au loup]
+  [by={Belyscendre},cov={prends-garde-au-loup},album={Prends garde au loup}]

  \cover
  \gtab{Am}{X02210}
--- a/songs/Ben_E_King/Stand_by_me.sg
+++ b/songs/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/songs/Ben_Harper/Waiting_on_an_angel.sg
+++ b/songs/Ben_Harper/Waiting_on_an_angel.sg
@ -1,7 +1,7 @@
 \selectlanguage{english}
 \songcolumns{2}
 \beginsong{Waiting on an angel}
-  [by=Ben Harper,cov=welcome-to-the-cruel-world,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/songs/Ben_Harper/Widow_of_a_living_man.sg
+++ b/songs/Ben_Harper/Widow_of_a_living_man.sg
@ -1,7 +1,7 @@
 \selectlanguage{english}
 \songcolumns{2}
 \beginsong{Widow of a living man}
-  [by=Ben Harper,cov=the-will-to-live,album=The will to live]
+  [by={Ben Harper},cov={the-will-to-live},album={The will to live}]

  \cover
  \gtab*{Asus2}{X02200}
--- a/songs/Benabar/Le_diner.sg
+++ b/songs/Benabar/Le_diner.sg
@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{Le dîner}
-  [by=Bénabar,cov=reprise-des-negociations,album=Reprise des négociations]
+  [by={Bénabar},cov={reprise-des-negociations},album={Reprise des négociations}]

  \cover
  \gtab{Bm}{2:X02210}
--- a/songs/Benabar/Quatre_murs_et_un_toit.sg
+++ b/songs/Benabar/Quatre_murs_et_un_toit.sg
@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{Quatre murs et un toit}
-  [by=Bénabar,cov=reprise-des-negociations,album=Reprise des négociations]
+  [by={Bénabar},cov={reprise-des-negociations},album={Reprise des négociations}]

  \cover
  \capo{2}
--- a/songs/Benabar/Y_a_une_fille_qu_habite_chez_moi.sg
+++ b/songs/Benabar/Y_a_une_fille_qu_habite_chez_moi.sg
@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{1}
 \beginsong{Y'a une fille qu'habite chez moi}
-  [by=Bénabar,cov=benabar,album=Bénabar]
+  [by={Bénabar},cov={benabar},album={Bénabar}]

  \cover
  %verse
--- a/songs/Bill_Withers/Just_two_of_us.sg
+++ b/songs/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/songs/Bloodhound_Gang/Fire_water_burn.sg
+++ b/songs/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/songs/Bob_Dylan/Ballad_of_Hollis_Brown.sg
+++ b/songs/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/songs/Bob_Dylan/Blowin_in_the_wind.sg
+++ b/songs/Bob_Dylan/Blowin_in_the_wind.sg
@ -1,7 +1,7 @@
 \selectlanguage{english}
 \songcolumns{2}
 \beginsong{Blowin' in the wind}
-  [by=Bob Dylan,cov=the-freewheelin,album=The freewheelin]
+  [by={Bob Dylan},cov={the-freewheelin},album={The freewheelin}]

  \cover
  \gtab{D}{XX0232}
--- a/songs/Bob_Dylan/Don_t_think_twice_it_s_all_right.sg
+++ b/songs/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/songs/Bob_Dylan/Hurricane.sg
+++ b/songs/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/songs/Bob_Dylan/Knocking_on_heavens_door.sg
+++ b/songs/Bob_Dylan/Knocking_on_heavens_door.sg
@ -1,7 +1,7 @@
 \selectlanguage{english}
 \songcolumns{2}
 \beginsong{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/songs/Bob_Dylan/Mr_tambourine_man.sg
+++ b/songs/Bob_Dylan/Mr_tambourine_man.sg
@ -1,7 +1,7 @@
 \selectlanguage{english}
 \songcolumns{2}
 \beginsong{Mr. Tambourine Man}
-  [by=Bob Dylan,cov=the-freewheelin,album=The freewheelin]
+  [by={Bob Dylan},cov={the-freewheelin},album={The freewheelin}]

  \cover
  \gtab{C}{X32010}
--- a/songs/Bob_Dylan/One_more_cup_of_coffee.sg
+++ b/songs/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/songs/Bob_Dylan/The_times_they_are_a-changin.sg
+++ b/songs/Bob_Dylan/The_times_they_are_a-changin.sg
@ -1,7 +1,7 @@
 \selectlanguage{english}
 \songcolumns{2}
 \beginsong{The times they are a-changin'}
-  [by=Bob Dylan,cov=the-times-they-are-a-changin,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/songs/Bob_Marley/No_woman_no_cry.sg
+++ b/songs/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/songs/Bob_Marley/Redemption_song.sg
+++ b/songs/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/songs/Bobby_McFerrin/Don_t_worry_be_happy.sg
+++ b/songs/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/songs/Boby_Lapointe/Aragon_et_Castille.sg
+++ b/songs/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/songs/Boby_Lapointe/Framboise.sg
+++ b/songs/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/songs/Boby_Lapointe/La_maman_des_poissons.sg
+++ b/songs/Boby_Lapointe/La_maman_des_poissons.sg
@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{La maman des poissons}
-  [by=Boby Lapointe,cov=l-integrale,album=L'intégrale]
+  [by={Boby Lapointe},cov={l-integrale},album={L'intégrale}]

  \cover
  \gtab{G}{320003}
--- a/songs/Boby_Lapointe/Meli-Melodie.sg
+++ b/songs/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/songs/Britney_Spears/Baby_one_more_time.sg
+++ b/songs/Britney_Spears/Baby_one_more_time.sg
@ -1,7 +1,7 @@
 \selectlanguage{english}
 \songcolumns{2}
 \beginsong{\dots~Baby one more time}
-  [by=Britney Spears,cov=baby-one-more-time,album=Baby one more time]
+  [by={Britney Spears},cov={baby-one-more-time},album={Baby one more time}]

  \cover
  \gtab{F#}{2:022100}
--- a/songs/Bruce_Springsteen/Bring_em_home.sg
+++ b/songs/Bruce_Springsteen/Bring_em_home.sg
@ -1,7 +1,7 @@
 \selectlanguage{english}
 \songcolumns{2}
 \beginsong{Bring 'em home}
-  [by=Bruce Springsteen,cov=we-shall-overcome,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{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
-  \end{verse}
+  \begin{repeatedchords}
+    \begin{verse}
+      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
-  \end{verse}
+    \begin{verse}
+      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
-  \end{verse}
+    \begin{verse}
+      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
-  \end{verse}
+    \begin{verse}
+      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
-  \end{verse}
+    \begin{verse}
+      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
-  \end{verse}
+    \begin{verse}
+      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
--- a/songs/Bruce_Springsteen/Buffalo_gals.sg
+++ b/songs/Bruce_Springsteen/Buffalo_gals.sg
@ -1,7 +1,7 @@
 \selectlanguage{english}
 \songcolumns{2}
 \beginsong{Buffalo gals}
-  [by=Bruce Springsteen,cov=we-shall-overcome,album=We shall overcome]
+  [by={Bruce Springsteen},cov={we-shall-overcome},album={We shall overcome}]

  \cover
  \gtab{F}{1:022100}
@ -10,22 +10,24 @@
  \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{chorus}
-    \[F]Buffalo gals won't you come out tonight
-    \[C7]Come out tonight, \[F]come out tonight
-    \[F]Buffalo gals won't you come out tonight
-    And we'll \[C7]dance by the light of the \[F]moon
-  \end{chorus}
+  \begin{repeatedchords}
+    \begin{chorus}
+      \[F]Buffalo gals won't you come out tonight
+      \[C7]Come out tonight, \[F]come out tonight
+      \[F]Buffalo gals won't you come out tonight
+      And we'll \[C7]dance by the light of the \[F]moon
+    \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
-  \end{verse}
+    \begin{verse}
+      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
--- a/songs/Bruce_Springsteen/John_Henry.sg
+++ b/songs/Bruce_Springsteen/John_Henry.sg
@ -1,7 +1,7 @@
 \selectlanguage{english}
 \songcolumns{2}
 \beginsong{John Henry}
-  [by=Bruce Springsteen,cov=we-shall-overcome,album=We shall overcome]
+  [by={Bruce Springsteen},cov={we-shall-overcome},album={We shall overcome}]

  \cover
  \gtab{F}{1:022100}
--- a/songs/Bruce_Springsteen/Mrs_McGrath.sg
+++ b/songs/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/songs/Bruce_Springsteen/O_Mary_don_t_you_weep.sg
+++ b/songs/Bruce_Springsteen/O_Mary_don_t_you_weep.sg
@ -1,7 +1,7 @@
 \selectlanguage{english}
 \songcolumns{2}
 \beginsong{O Mary don't you weep}
-  [by=Bruce Springsteen,cov=we-shall-overcome,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{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
-  \end{verse}
+  \begin{repeatedchords}
+    \begin{verse}
+      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
-  \end{verse}
+    \begin{verse}
+      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
-  \end{verse}
+    \begin{verse}
+      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
-  \end{verse}
+    \begin{verse}
+      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
-  \end{verse}
+    \begin{verse}
+      \[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
-  \end{verse}
+    \begin{verse}
+      \[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
--- a/songs/Bruce_Springsteen/Old_Dan_Tucker.sg
+++ b/songs/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{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
-  \end{verse}
+  \begin{repeatedchords}
+    \begin{verse}
+      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!
-  \end{verse}
+    \begin{verse}
+      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
-  \end{verse}
+    \begin{verse}
+      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
--- a/songs/Bruce_Springsteen/Pay_me_my_money_down.sg
+++ b/songs/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{chorus}
-    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
-    He knocked me down with the end of a spar
-    Pay me my money down
-  \end{verse}
-
-  \begin{verse}
-    Well if I'd been a rich man's son
-    Pay me my money down
-    I'd sit on the river and watch it run
-    Pay me my money down
-  \end{verse}
-
-  \begin{verse}
-    \[B&]Well, I wish I was Mr. Gates
-    Pay me my \[F]money down
-    Haul my money in egg crates
-    Pay me my \[B&]money down
-  \end{verse}
-
-  \begin{verse}
-    \[G]Well, 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}
+  \begin{repeatedchords}
+    \begin{chorus}
+      \[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}
+      \[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 \[G]money down
+    \end{verse}
+
+    \begin{verse}
+      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 \[G]money down
+    \end{verse}
+
+    \transposition{3}
+    \begin{verse}
+      Well, I wish \[G]{I was} Mr. Gates
+      Pay me my \[D]money down
+      Haul my money in egg crates
+      Pay me my \[G]money down
+    \end{verse}
+
+    \transposition{-3}
+    \begin{verse}
+      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
-
--- a/songs/Buena_Vista_Social_Club/Chan_Chan.sg
+++ b/songs/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/songs/Calvin_Russell/5m2.sg
+++ b/songs/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/songs/Calvin_Russell/Baby_I_love_you.sg
+++ b/songs/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/songs/Calvin_Russell/Crossroad.sg
+++ b/songs/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/songs/Calvin_Russell/Down_down_down.sg
+++ b/songs/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/songs/Calvin_Russell/Midnite_man.sg
+++ b/songs/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/songs/Calvin_Russell/One_Meat_Ball.sg
+++ b/songs/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/songs/Carter_Family/In_the_highways.sg
+++ b/songs/Carter_Family/In_the_highways.sg
@ -1,7 +1,7 @@
 \selectlanguage{english}
 \songcolumns{2}
 \beginsong{In the highways}
-  [by=Carter Family,cov=o-brother,album=O brother]
+  [by={Carter Family},cov={o-brother},album={O brother}]

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

  \cover
  \gtab{B&}{6:022100}
--- a/songs/Cat_Stevens/Father_and_son.sg
+++ b/songs/Cat_Stevens/Father_and_son.sg
@ -1,7 +1,7 @@
 \selectlanguage{english}
 \songcolumns{2}
 \beginsong{Father and son}
-  [by=Cat Stevens,cov=tea-for-the-tillerman,album=Tea for the tillerman]
+  [by={Cat Stevens},cov={tea-for-the-tillerman},album={Tea for the tillerman}]

  \cover
  \gtab{G}{320003}
--- a/songs/Cat_Stevens/Here_comes_my_baby.sg
+++ b/songs/Cat_Stevens/Here_comes_my_baby.sg
@ -1,7 +1,7 @@
 \selectlanguage{english}
 \songcolumns{2}
 \beginsong{Here comes my baby}
-  [by=Cat Stevens,cov=matthew-and-son,album=Matthew and son]
+  [by={Cat Stevens},cov={matthew-and-son},album={Matthew and son}]

  \cover
  \gtab{G}{320003}
--- a/songs/Cat_Stevens/My_Lady_d_Arbanville.sg
+++ b/songs/Cat_Stevens/My_Lady_d_Arbanville.sg
@ -1,7 +1,7 @@
 \selectlanguage{english}
 \songcolumns{2}
 \beginsong{My lady d'Arbanville}
-  [by=Cat Stevens,cov=mona-bone-jakon,album=Mona bone jakon]
+  [by={Cat Stevens},cov={mona-bone-jakon},album={Mona bone jakon}]

  \cover
  \gtab{Em}{022000}
--- a/songs/Cat_Stevens/Sad_Lisa.sg
+++ b/songs/Cat_Stevens/Sad_Lisa.sg
@ -1,7 +1,7 @@
 \selectlanguage{english}
 \songcolumns{2}
 \beginsong{Sad Lisa}
-  [by=Cat Stevens,cov=tea-for-the-tillerman,album=Tea for the tillerman]
+  [by={Cat Stevens},cov={tea-for-the-tillerman},album={Tea for the tillerman}]

  \cover
  \gtab{Em}{022000}
--- a/songs/Cat_Stevens/The_wind.sg
+++ b/songs/Cat_Stevens/The_wind.sg
@ -1,7 +1,7 @@
 \selectlanguage{english}
 \songcolumns{2}
 \beginsong{The wind}
-  [by=Cat Stevens,cov=teaser-and-the-firecat,album=Teaser and the firecat]
+  [by={Cat Stevens},cov={teaser-and-the-firecat},album={Teaser and the firecat}]

  \cover
  \gtab{D}{XX0232}
--- a/songs/Cat_Stevens/Wild_world.sg
+++ b/songs/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/songs/Catherine_Le_Forestier/La_petite_fugue.sg
+++ b/songs/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/songs/Cesaria_Evora/Petit_pays.sg
+++ b/songs/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/songs/Charles_Aznavour/Emmenez-moi.sg
+++ b/songs/Charles_Aznavour/Emmenez-moi.sg
@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{Emmenez-moi}
-  [by=Charles Aznavour,cov=40-chansons-d-or,album=40 chansons d'or]
+  [by={Charles Aznavour},cov={40-chansons-d-or},album={40 chansons d'or}]

  \cover
  \gtab{Am}{X02210}
--- a/songs/Charles_Aznavour/Les_comediens.sg
+++ b/songs/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/songs/Charles_Aznavour/Mes_emmerdes.sg
+++ b/songs/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/songs/Christophe/Aline.sg
+++ b/songs/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/songs/Christophe/Les_mots_bleus.sg
+++ b/songs/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/songs/Claude_Nougaro/Armstrong.sg
+++ b/songs/Claude_Nougaro/Armstrong.sg
@ -1,7 +1,7 @@
 \selectlanguage{french}
 \songcolumns{2}
 \beginsong{Armstrong}
-  [by=Claude Nougaro,cov=toulouse,album=Toulouse]
+  [by={Claude Nougaro},cov={toulouse},album={Toulouse}]

  \cover
  \capo{3}
--- a/songs/Coldplay/Paradise.sg
+++ b/songs/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}