From da0574f2f4a966ff79027a94032f0b15912a06e0 Mon Sep 17 00:00:00 2001 From: broph Date: Wed, 16 May 2012 00:50:08 +0200 Subject: [PATCH 01/18] =?UTF-8?q?Add=20lilypond:=20Telephone=20-=20Le=20jo?= =?UTF-8?q?ur=20s'est=20lev=C3=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lilypond/Le_jour_s_est_leve.ly | 52 +++++++++++++++++++++++++++ songs/Telephone/Le_jour_s_est_leve.sg | 2 ++ 2 files changed, 54 insertions(+) create mode 100644 lilypond/Le_jour_s_est_leve.ly diff --git a/lilypond/Le_jour_s_est_leve.ly b/lilypond/Le_jour_s_est_leve.ly new file mode 100644 index 00000000..c487dffb --- /dev/null +++ b/lilypond/Le_jour_s_est_leve.ly @@ -0,0 +1,52 @@ +\include "header" +\paper{ + paper-height = 4\cm + paper-width= 8\cm + line-width= 8\cm +} + +TAB = \markup { + \raise #1.5 + \sans + \bold + \huge + \override #'(baseline-skip . 2.5) + \left-align + \center-column { + T + A + B + } +} + +symbols = { + \numericTimeSignature + \time 4/4 + 2 + 2 + 2 + d16\5 dis\5 f8\4 f16\4 g16\4 gis8\4 + + 2 + 2 + 2 + d8\5 dis\5 f\4 d8\5 + +} + +\score { + << + + \new Staff + + { + \override Staff.StringNumber #'transparent = +##t + \clef "G_8" \symbols } + %\chords { c2 | f2| g1 | c2 | f2| g1 } + \new TabStaff { + \override Staff.Clef #'stencil = #(lambda (grob) + (grob-interpret-markup grob TAB)) + \symbols } + >> +} diff --git a/songs/Telephone/Le_jour_s_est_leve.sg b/songs/Telephone/Le_jour_s_est_leve.sg index a8ca7ea5..dd9c9eff 100644 --- a/songs/Telephone/Le_jour_s_est_leve.sg +++ b/songs/Telephone/Le_jour_s_est_leve.sg @@ -13,6 +13,8 @@ \gtab*{G4}{3:022200} \gtab{Am7}{X02010} + \lilypond{Le_jour_s_est_leve} + \begin{verse} \[C]Le jour \[F]s'est le\[G]vé \[C]Sur une é\[F]trange i\[G]dée From 0d2afb669b1a41240987d774ef81e5a0f03917e4 Mon Sep 17 00:00:00 2001 From: broph Date: Wed, 16 May 2012 00:51:14 +0200 Subject: [PATCH 02/18] Add song: Patrick Coutin - J'aime regarder les filles --- songs/Patrick_Coutin/1981.jpg | Bin 0 -> 3674 bytes .../J_aime_regarder_les_filles.sg | 58 ++++++++++++++++++ 2 files changed, 58 insertions(+) create mode 100644 songs/Patrick_Coutin/1981.jpg create mode 100644 songs/Patrick_Coutin/J_aime_regarder_les_filles.sg diff --git a/songs/Patrick_Coutin/1981.jpg b/songs/Patrick_Coutin/1981.jpg new file mode 100644 index 0000000000000000000000000000000000000000..d2e8713e433da8c5281c0d36371ffaf43f9c2d58 GIT binary patch literal 3674 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 S__-&uqpL=RN_@}R)PDhTB-I!I literal 0 HcmV?d00001 diff --git a/songs/Patrick_Coutin/J_aime_regarder_les_filles.sg b/songs/Patrick_Coutin/J_aime_regarder_les_filles.sg new file mode 100644 index 00000000..5f2fa4a8 --- /dev/null +++ b/songs/Patrick_Coutin/J_aime_regarder_les_filles.sg @@ -0,0 +1,58 @@ +\selectlanguage{french} +\songcolumns{1} +\beginsong{J'aime regarder les filles} + [by=Patrick Coutin,cov=1981,album=1981] + \cover + \gtab{D}{5:X02220} + \gtab{C}{3:X02220} + \gtab{G}{3:022100} + \gtab{F}{1:022100} + + \begin{verse} + \[D]J'aime regar\[C]der les \[D]filles qui marchent \[C]sur la \[D]plage + Sur leur pea\[C]u le sol\[D]eil caresse bien tro\[C]p sage\[D] + Le vent qui \[C]les déco\[D]iffe au goût de sel \[C]sur me\[D]{s lèv}res + \end{verse} + + \begin{verse} + \[G]J'aime \[F] + \[G]J'aime regar\[F]der les \[G]filles qui marchent \[F]sur la \[G]plage + Les hanches \[F]qui bal\[G]ancent et les sourir\[F]{es fu}gac\[G]es + Je regarde l\[F]es vague\[G]{s qui} jouent avec l\[F]eur corp\[G]s + \end{verse} + + + \begin{verse} + \[D]J'aime \[C] + \begin{repeatedchords} + \[D]J'aime regar\[C]der les \[D]filles qui marchent \[C]sur la \[D]plage + Leurs poitri\[C]nes gonf\[D]lées par le désir d\[C]e vivre \[D] + Leurs yeux q\[C]ui se dé\[D]tournent quand tu le\[C]s regar\[D]des + \end{repeatedchords} + \end{verse} + + \begin{repeatedchords} + \begin{verse} + \[G]J'aime \[F] + \[G]J'aime regar\[F]der les \[G]filles qui marchent \[F]sur la \[G]plage + Le soleil su\[F]r leur pe\[G]au qui joue à cache-\[F]cache \[G] + Et des ambre\[F]s solair\[G]es le parfum volag\[F]e \[G] + \end{verse} + + \begin{verse} + \[D]J'aime \[C] + \[D]J'aime regar\[C]der les \[D]filles qui marchent \[C]sur la \[D]plage + Quand elles \[C]se déhab\[D]illent et font sembl\[C]ant d'êt\[D]re sages + Leurs yeux q\[C]ui se de\[D]mandent mais quel es\[C]t ce garç\[D]on + \end{verse} + + \begin{verse} + \[G]J'aime \[F] + \[G]J'aime regar\[F]der les \[G]filles qui marchent \[F]sur la \[G]plage + Leur ventre \[F]qui se col\[G]le sur le sable ch\[F]aud \[G] + Le vent qui \[F]les décoif\[G]fe et les sourire\[F]s fugac\[G]es + J'aime regar\[F]der les \[G]filles qui marchent \[F]sur la \[G]plage + \end{verse} + \end{repeatedchords} + +\endsong \ No newline at end of file From 2fe9069b8ae71819d21208bf87b6ce34fb9e512e Mon Sep 17 00:00:00 2001 From: Romain Goffe Date: Thu, 17 May 2012 14:45:20 +0200 Subject: [PATCH 03/18] windows: ensure there are no windows file separators. This fix the compilation under Windows with "songs":"all" --- songbook.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/songbook.py b/songbook.py index 0b074937..59504d42 100755 --- a/songbook.py +++ b/songbook.py @@ -34,7 +34,7 @@ def matchRegexp(reg, iterable): def songslist(songs): directories = set(["img/"] + map(lambda x: "songs/" + os.path.dirname(x), songs)) - result = [ '\\input{{songs/{0}}}'.format(s.strip()) for s in songs ] + result = [ '\\input{{songs/{0}}}'.format(s.replace("\\","/").strip()) for s in songs ] return '\n'.join(result) def parseTemplate(template): From 4a11c2a4c17dadccd79d6cdfcdaba33925f8d059 Mon Sep 17 00:00:00 2001 From: broph Date: Fri, 25 May 2012 18:59:46 +0200 Subject: [PATCH 04/18] =?UTF-8?q?Add=20song:=20Noir=20D=C3=A9sir=20-=20O?= =?UTF-8?q?=C3=B9=20veux-tu=20que=20je=20regarde=20=3F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- songs/Noir_Desir/Ou_veux_tu_qu_je_regarde.sg | 68 ++++++++++++++++++++ 1 file changed, 68 insertions(+) create mode 100755 songs/Noir_Desir/Ou_veux_tu_qu_je_regarde.sg diff --git a/songs/Noir_Desir/Ou_veux_tu_qu_je_regarde.sg b/songs/Noir_Desir/Ou_veux_tu_qu_je_regarde.sg new file mode 100755 index 00000000..a3ff7c01 --- /dev/null +++ b/songs/Noir_Desir/Ou_veux_tu_qu_je_regarde.sg @@ -0,0 +1,68 @@ +\selectlanguage{french} +\songcolumns{2} +\beginsong{Où veux tu que je regarde} + [by=Noir Désir,cov=ou-veux-tu-que-je-regarde,album=Où veux tu que je regarde] + + \cover + \gtab{G}{320003} + \gtab{Am}{X02210} + \gtab{Em}{022000} + + + \begin{verse} + \[G] Tu v\[Am]eux pas parle\[Em]r + \[G] Tu v\[Am]eux pas qu'je l'dis\[Em]e + \[G] Tout r\[Am]este enco\[Em]re + \[G] Ind\[Am]étermin\[Em]é \dots + \end{verse} + + \begin{repeatedchords} + \begin{verse} + \[G]Oh mais rappelle t\[Am]oi Barba\[Em]ra + \[G]Que tu n't'appelles \[Am]pas comme \[Em]ça + \[G] Ça p\[Am]eut servi\[Em]r + \[G] Pour l\[Am]es souveni\[Em]rs + \end{verse} + + \begin{verse} + \[G]Oh mais elle veut pas qu'\[Am]on la tou\[Em]che + \[G]Elle veut même pas qu'\[Am]on la voi\[Em]e + \[G] Mais y'\[Am]{a que} toi l\[Em]{à !} + \[G] Où veux-tu qu\[Am]{'je} r'g\[Em]arde ? \rep{2} + \end{verse} + + \begin{verse} + \[G] Elle \[Am]a changé d'a\[Em]ngle + \[G] Et \[Am]étend ses ja\[Em]mbes + \[G] Int\[Am]erminab\[Em]les + \[G] Comme un \[Am]jour sans nu\[Em]it + \end{verse} + + \begin{verse} + \[G]Et j'ai tremblé c'\[Am]est un si\[Em]gne + \[G]Je ne rester\[Am]ais pas di\[Em]gne + \[G] Les c\[Am]as extrê\[Em]mes + \[G] Sont to\[Am]ujours les m\[Em]êmes + \end{verse} + + \begin{verse} + \[G]Dans ton océ\[Am]an lacrym\[Em]al + \[G]Tout n'a pas l'air d'\[Am]être sans ma\[Em]l + \[G] Et m\[Am]oi qui plo\[Em]nge + \[G] J'sais m\[Am]ême pas na\[Em]ger + \end{verse} + + \begin{verse} + \[G]On ira dans t\[Am]ous les dés\[Em]erts + \[G]On ira dans\[Am]er sur les m\[Em]ers + \[G]Et on verra pourr\[Am]ir nos yeux t\[Em]endres + \[G] Sous les \[Am]lumières bla\[Em]nches \dots + \end{verse} + + \begin{verse} + \[G] Où veux-tu qu\[Am]{'je} r'g\[Em]arde ? + \[G] Où veux-tu qu\[Am]{'je} che\[Em]rche \dots + \end{verse} + \end{repeatedchords} + +\endsong From c1c79e77c0100803ab90fe1f01f1027e88ebf1a0 Mon Sep 17 00:00:00 2001 From: broph Date: Fri, 25 May 2012 19:00:33 +0200 Subject: [PATCH 05/18] Add song: Calvin RUssell - 5m2 --- songs/Calvin_Russell/5m2.sg | 57 +++++++++++++++++++++++++ songs/Calvin_Russell/dawg-eat-dawg.jpg | Bin 0 -> 6254 bytes 2 files changed, 57 insertions(+) create mode 100755 songs/Calvin_Russell/5m2.sg create mode 100755 songs/Calvin_Russell/dawg-eat-dawg.jpg diff --git a/songs/Calvin_Russell/5m2.sg b/songs/Calvin_Russell/5m2.sg new file mode 100755 index 00000000..a755cb21 --- /dev/null +++ b/songs/Calvin_Russell/5m2.sg @@ -0,0 +1,57 @@ +\selectlanguage{english} +\songcolumns{2} +\beginsong{5m2} + [by=Calvin Russell,cov=dawg-eat-dawg,album=Dawg eat dawg] + + \cover + \capo{5} + \gtab{Am}{X02210} + \gtab{Dm}{XX0231} + \gtab{F}{1:022100} + \gtab{E}{022100} + \gtab{Am/C}{X32210} + \gtab{G}{320003} + + \begin{verse} + \[Am] Cinq mètres carrés, plus de télé + \[Dm] L'eau qui fuit dans les WC + \[F] Encore un bol de ricoré + \[E] Un seul rève, avoir la clé + \end{verse} + + \begin{repeatedchords} + \begin{verse} + \[Am] Nous les voleurs, les meurtriers + \[Dm] Même en prison, faut exister + \[F] Concours de vieux joggings usés + \[E] Pour une promenade, à la santé + \end{verse} + \end{repeatedchords} + + \begin{chorus} + \[F] I'm dreaming, \[Am] I'm dreaming + o\[Am/C]f wh\[G]ere th\[Am/C]at s\[E]un + go\[G7]es do\[Am]wn \[G7] \[Am] + \end{chorus} + + \begin{repeatedchords} + \begin{verse} + \[Am] Sur un coin de mur, lézardé + \[Dm] Une photo trop abimée + \[F] D'une femme au regard désenchanté + \[E] Celui de celle qui m'a aimé + \end{verse} + + \begin{verse} + \[Am] Cinq mètres carrés, de liberté + \[Dm] Et la même gueule à qui parler + \[F] Et cette fenêtre grillagée + \[E] Mon seul espace pour m'évader + \end{verse} + \end{repeatedchords} + + \begin{verse*} + \musicnote{Instr.\nolyrics{ \[F] \[Am] \[F] \[Am] \[G] } } + \end{verse*} + +\endsong diff --git a/songs/Calvin_Russell/dawg-eat-dawg.jpg b/songs/Calvin_Russell/dawg-eat-dawg.jpg new file mode 100755 index 0000000000000000000000000000000000000000..303c03e8af0355e74f647f7f737cd348c8c8dd76 GIT binary patch literal 6254 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 literal 0 HcmV?d00001 From 19be3ef8fd07e938fc97eeb066fb579dec3ff9ef Mon Sep 17 00:00:00 2001 From: broph Date: Fri, 25 May 2012 19:01:25 +0200 Subject: [PATCH 06/18] Add song: Dire Straits - Brothers in arms --- songs/Dire_Straits/brothers-in-arms.jpg | Bin 0 -> 3409 bytes songs/Dire_Straits/brothers_in_arms.sg | 83 ++++++++++++++++++++++++ 2 files changed, 83 insertions(+) create mode 100755 songs/Dire_Straits/brothers-in-arms.jpg create mode 100755 songs/Dire_Straits/brothers_in_arms.sg diff --git a/songs/Dire_Straits/brothers-in-arms.jpg b/songs/Dire_Straits/brothers-in-arms.jpg new file mode 100755 index 0000000000000000000000000000000000000000..d0e76a37c164aa49a79a7c0820c914d8057216c2 GIT binary patch literal 3409 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 literal 0 HcmV?d00001 diff --git a/songs/Dire_Straits/brothers_in_arms.sg b/songs/Dire_Straits/brothers_in_arms.sg new file mode 100755 index 00000000..09e7030a --- /dev/null +++ b/songs/Dire_Straits/brothers_in_arms.sg @@ -0,0 +1,83 @@ +\selectlanguage{english} +\songcolumns{2} +\beginsong{Brothers in arms} + [by=Dire Straits,cov=brothers-in-arms,album=Brothers in arms] + + \cover + \gtab{G#m}{4:022000} + \gtab{E}{022100} + \gtab{C#m}{4:X02210} + \gtab{F#}{2:022100} + \gtab{B}{2:X02220} + \gtab{B4}{2:X02230} + \gtab{D#m}{6:X02210} + \gtab{F#4}{2:022200} + + \begin{verse*} + \musicnote{\Intro:\nolyrics{ | \[G\shrp{m}] \[E] | \[C\shrp{m}] \[E] | \[G\shrp{m}] \[E] | \[C\shrp{m}] }} + \musicnote{\nolyrics{ | \[G\shrp{m}] \[E] | \[C\shrp{m}] \[E] \[F\shrp]| \[G\shrp{m}] \[E] | \[C\shrp{m}] | \[G\shrp{m}] | }} + \end{verse*} + + \begin{verse} + These \[F#]mist-covered \[E]mountain\[F#]s + Are a home now for \[B]me \[B4] \[B] + But my \[D#m]home is the \[G#m]lowlan\[D#m]ds + And always will \[E]be \[F#4] + Some \[F#]day you'll retu\[G#m]rn to \[D#m] + Your valleys and your far\[E]ms \[C#m] \[F#4] + And you'll \[F#]no longer \[G#m]burn + To be \[E]brothers in \[F#4]arms \[F#] + \end{verse} + + + \begin{verse*} + \musicnote{\nolyrics{ | \[G\shrp{m}] \[E] | \[C\shrp{m}] \[E] | \[G\shrp{m}] \[E] | \[C\shrp{m}] | \[G\shrp{m}] | }} + \end{verse*} + + \begin{repeatedchords} + \begin{verse} + Through these \[F#]fields of des\[E]truction \[F#] + Baptisms of fir\[B]e \[B4] \[B] + I've \[D#m]witnessed your s\[G#m]ufferin\[D#m]g + As the battles raged high\[E]er \[F#4] + And \[F#]though they hurt \[G#m]me so \[D#m]bad + In the fear and a \[E]larm \[C#m] \[F#4] + You \[F#]did not de\[G#m]sert me + My \[E]brothers in \[F#4]arms \[F#] + \end{verse} + \end{repeatedchords} + + + \begin{verse*} + \musicnote{\nolyrics{ | \[G\shrp{m}] \[E] | \[C\shrp{m}] \[E] | \[G\shrp{m}] \[E] | \[C\shrp{m}] | \[G\shrp{m}] | }} + \end{verse*} + + \begin{bridge} + \[G#m] There's so \[F#]many different \[G#m]worlds + \[F#] So \[B]many different \[E]suns \[F#4] + And \[F#]we have just one \[G#m]world + \[F#] But we \[B]live in different \[E]ones + \end{bridge} + + \begin{verse*} + \musicnote{Instrumental = \Intro } + \end{verse*} + + \begin{repeatedchords} + \begin{verse} + Now the \[F#]sun's gone to \[E]hell \[F#] + And the moon's riding \[B]high \[B4] \[B] + Let me \[D#m]bid you farewe\[G#m]ll \[D#m] + Every man has to die \[E] \[F#4] + But it's \[F#]written in the \[G#m]star\[D#m]light + And every line on your \[E]palm \[C#m] \[F#4] + We're \[F#]fools to make \[G#m]war + On our \[E]brothers in \[F#4]arms \[F#] + \end{verse} + \end{repeatedchords} + + \begin{verse*} + \musicnote{Outro = \Intro \rep{4} } + \end{verse*} + +\endsong From 78a7f107076b712eca6bc240912b1232bf179805 Mon Sep 17 00:00:00 2001 From: Romain Goffe Date: Fri, 25 May 2012 19:02:03 +0200 Subject: [PATCH 07/18] corrections --- .../Sous_les_jupes_des_filles.sg | 38 ++++++++---------- songs/Debout_Sur_Le_Zinc/pitt-ocha.jpg | Bin 4302 -> 0 bytes songs/Jacques_Brel/Amsterdam.sg | 4 +- songs/Les_Cowboys_Fringants/Hannah.sg | 4 +- .../Poil_aux_yeux.sg | 2 +- songs/Maxime_Le_Forestier/La_rouille.sg | 8 ++-- songs/Thomas_Fersen/Diane_de_Poitiers.sg | 14 +++---- tex/license-nb.tex | 2 +- 8 files changed, 34 insertions(+), 38 deletions(-) delete mode 100644 songs/Debout_Sur_Le_Zinc/pitt-ocha.jpg rename songs/{Debout_Sur_Le_Zinc => Les_Ogres_de_Barback}/Poil_aux_yeux.sg (96%) diff --git a/songs/Alain_Souchon/Sous_les_jupes_des_filles.sg b/songs/Alain_Souchon/Sous_les_jupes_des_filles.sg index fdbc38de..bb95a75e 100644 --- a/songs/Alain_Souchon/Sous_les_jupes_des_filles.sg +++ b/songs/Alain_Souchon/Sous_les_jupes_des_filles.sg @@ -29,11 +29,14 @@ \end{repeatedchords} \begin{chorus} - \[Fm]Elles très fières + \[Fm]Elles, très fières Sur leurs \[G7]escabeaux en l'air - Regard méprisant et laissant le vent tout \[Cm]faire + Regard méprisant + Et laissant le vent tout \[Cm]faire + \end{chorus} - \[Fm]Elles dans l'suave + \begin{chorus} + \[Fm]Elles, dans l'suave La fai\[G7]blesse des hommes elles savent Que la seule chose qui tourne sur terre C'est leurs robes lé\[Cm]gères @@ -55,8 +58,7 @@ \end{verse*} \begin{chorus} - \nolyrics \[Fm G7 Cm] - + \nolyrics{\[Fm G7 Cm]} \[Fm]Si parfois Ça les \[G7]gène et qu'elles veulent pas Qu'on regarde leurs guiboles @@ -78,28 +80,22 @@ \end{verse*} \begin{chorus} - \[Fm]Elles pas fières + \[Fm]Elles, pas fières Sur leurs \[G7]escabeaux en l'air - Regard implorant et ne comprenant pas \[Cm]tout + Regard implorant + Et ne comprenant pas \[Cm]tout + \end{chorus} - \[Fm]Elles dans l'grave + \begin{chorus} + \[Fm]Elles, dans l'grave La fai\[G7]blesse des hommes elles savent Que la seule chose qui tourne sur terre C'est leurs robes lé\[Cm]gères \end{chorus} - \begin{verse} - \[Am]Rétines et pupilles - Les garçons \[G]ont les yeux qui brillent - \[F]Pour un jeu de dupes - Voir sous les jupes des \[C]filles - \end{verse} + \textnote[french]{Répeter \Verse 1} + \textnote[english]{Repeat \Verse 1} - \begin{verse*} - \[Am]Et la vie toute entière - Absor\[G]bée par cette affaire - \[F]Par ce jeu de dupes - Voir sous les jupes des \[C]filles - \end{verse*} \end{repeatedchords} -\endsong \ No newline at end of file + +\endsong diff --git a/songs/Debout_Sur_Le_Zinc/pitt-ocha.jpg b/songs/Debout_Sur_Le_Zinc/pitt-ocha.jpg deleted file mode 100644 index 4b43a1236f17c3dcf17bbf24c53b050acdcc29c6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4302 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 S<|p$~OZ}Jd&d!31Z~p`E%Jvli diff --git a/songs/Jacques_Brel/Amsterdam.sg b/songs/Jacques_Brel/Amsterdam.sg index 5c70f4d8..37d683f4 100644 --- a/songs/Jacques_Brel/Amsterdam.sg +++ b/songs/Jacques_Brel/Amsterdam.sg @@ -1,5 +1,5 @@ \selectlanguage{french} -\songcolumns{2} +\songcolumns{3} \beginsong{Amsterdam} [by=Jacques Brel,cov=amsterdam,album=Amsterdam] @@ -49,7 +49,7 @@ Jusque dans le cÅ“ur des frites Que leurs grosses mains invitent À revenir en plus - Puis se lève en riant + Puis se lèvent en riant Dans un bruit de tempête Referment leur braguette Et sortent en rotant diff --git a/songs/Les_Cowboys_Fringants/Hannah.sg b/songs/Les_Cowboys_Fringants/Hannah.sg index b759e5fc..2fb1fa57 100644 --- a/songs/Les_Cowboys_Fringants/Hannah.sg +++ b/songs/Les_Cowboys_Fringants/Hannah.sg @@ -66,7 +66,7 @@ \begin{repeatedchords} \begin{verse} - J'l'ai \[Am]écouté m'ja\[Dm]ser + J'l'ai \[Am]écoutée m'ja\[Dm]ser De son \[E7]enfance doulou\[Am]reuse Où \[Am]on l'a écra\[Dm]sée Même si c'était \[G]loin d'être une niai\[C]seuse @@ -119,7 +119,7 @@ Elle \[Am]avait commen\[A]cé Un cours \[A7]en secréta\[Dm]riat Mais \[G]elle l'a vite lâché - Voyant qu'ça l'interessait \[E7]pas + Voyant qu'ça n'l'interessait \[E7]pas \end{verse*} \begin{verse} diff --git a/songs/Debout_Sur_Le_Zinc/Poil_aux_yeux.sg b/songs/Les_Ogres_de_Barback/Poil_aux_yeux.sg similarity index 96% rename from songs/Debout_Sur_Le_Zinc/Poil_aux_yeux.sg rename to songs/Les_Ogres_de_Barback/Poil_aux_yeux.sg index 8f379e60..b977770a 100644 --- a/songs/Debout_Sur_Le_Zinc/Poil_aux_yeux.sg +++ b/songs/Les_Ogres_de_Barback/Poil_aux_yeux.sg @@ -1,7 +1,7 @@ \selectlanguage{french} \songcolumns{2} \beginsong{Poil aux yeux} - [by=Debout sur le Zinc,cov=pitt-ocha,album=Pitt Ocha] + [by=Les Ogres de Barback & Debout sur le Zinc,cov=pitt-ocha,album=Pitt Ocha] \cover \gtab{Em}{7:X02210} diff --git a/songs/Maxime_Le_Forestier/La_rouille.sg b/songs/Maxime_Le_Forestier/La_rouille.sg index 813f8ff7..8c200f35 100644 --- a/songs/Maxime_Le_Forestier/La_rouille.sg +++ b/songs/Maxime_Le_Forestier/La_rouille.sg @@ -31,13 +31,13 @@ S'il n'y venait per\[E4]sonne \[E] \end{verse*} - \begin{verse*} + \begin{chorus} \[C]Moi je la vois Comme \[G]une plaie u\[E]tile \[Am]Marquant le temps d'ocre \[Em]jaune et de roux \[F]La rouille au\[D7]rait un \[C]char\[E]me \[Am]fou Si elle ne s'\[Dm]attaquait qu'aux \[G]gril\[C]les - \end{verse*} + \end{chorus} \begin{verse} Avec le temps tout se dénoue @@ -55,12 +55,12 @@ Contre la rouille il n'y a rien a faire \end{verse*} - \begin{verse*} + \begin{chorus} Moi je la vois comme une déchirure Une blessure qui ne guérira pas Notre histoire va s'arrêter là Ce fut une belle aventure - \end{verse*} + \end{chorus} \begin{verse} \[F] Nous ne nous \[C]verrons plus et \[G]puis diff --git a/songs/Thomas_Fersen/Diane_de_Poitiers.sg b/songs/Thomas_Fersen/Diane_de_Poitiers.sg index 55fa9e68..9cab07c8 100644 --- a/songs/Thomas_Fersen/Diane_de_Poitiers.sg +++ b/songs/Thomas_Fersen/Diane_de_Poitiers.sg @@ -4,14 +4,14 @@ [by=Thomas Fersen,cov=piece-montee-des-grands-jours,album=Pièce montée des grands jours] \cover - \gtab{B&9}{X10111} - \gtab{B&7}{X10131} - \gtab{E&}{XX1343} + \gtab*{B&9}{X10111} + \gtab{B&7}{1:X0202} + \gtab{E&}{6:X02220} \gtab{F}{1:022100} - \gtab{Gm}{310033} - \gtab{B&}{X10331} + \gtab{Gm}3:022000} + \gtab{B&}{6:022100} \gtab{Cm}{3:X02210} - \utab{B&9}{1:0102} + \utab*{B&9}{1:0102} \utab{B&7}{1:0100} \utab{E&}{1:2220} \utab{F}{2010} @@ -147,4 +147,4 @@ \end{verse} \end{repeatedchords} -\endsong \ No newline at end of file +\endsong diff --git a/tex/license-nb.tex b/tex/license-nb.tex index c214c92d..57b41869 100644 --- a/tex/license-nb.tex +++ b/tex/license-nb.tex @@ -1,6 +1,6 @@ %Licence Creative Commons \begin{center} - \textbf{\LARGE{Creative Commons\footnote{ Cette création est mise à + \textbf{\LARGE{Creative Commons\footnote{ Ce document est mis à disposition selon le Contrat Attribution-ShareAlike 3.0 Unported disponible en ligne \url{http://creativecommons.org/licenses/by-sa/3.0/} ou par From 83b646035c92bd2b3019c1d5f2c55a9a9c41628d Mon Sep 17 00:00:00 2001 From: broph Date: Fri, 25 May 2012 19:06:19 +0200 Subject: [PATCH 08/18] =?UTF-8?q?Add=20song:=20Noir=20D=C3=A9sir=20-=20Tou?= =?UTF-8?q?jours=20=C3=AAtre=20ailleurs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lilypond/Toujours_etre_ailleurs_rythm.ly | 17 +++++++ songs/Noir_Desir/Toujours_etre_ailleurs.sg | 57 ++++++++++++++++++++++ 2 files changed, 74 insertions(+) create mode 100755 lilypond/Toujours_etre_ailleurs_rythm.ly create mode 100755 songs/Noir_Desir/Toujours_etre_ailleurs.sg diff --git a/lilypond/Toujours_etre_ailleurs_rythm.ly b/lilypond/Toujours_etre_ailleurs_rythm.ly new file mode 100755 index 00000000..02f79875 --- /dev/null +++ b/lilypond/Toujours_etre_ailleurs_rythm.ly @@ -0,0 +1,17 @@ +\include "header" +\paper{ + paper-height = 1.1\cm + paper-width = 4.3\cm +} + +<< + \chords { d1:m | f2 g2 } + \new RhythmicStaff { + \new Voice = "myRhythm" { + \numericTimeSignature + \time 4/4 + a4 a8 a~ a a a a + a4 a a a + } + } +>> \ No newline at end of file diff --git a/songs/Noir_Desir/Toujours_etre_ailleurs.sg b/songs/Noir_Desir/Toujours_etre_ailleurs.sg new file mode 100755 index 00000000..25457be3 --- /dev/null +++ b/songs/Noir_Desir/Toujours_etre_ailleurs.sg @@ -0,0 +1,57 @@ +\selectlanguage{french} +\songcolumns{2} +\beginsong{Toujours être ailleurs} + [by=Noir Désir,cov=ou-veux-tu-que-je-regarde,album=Où veux tu que je regarde] + + \cover + \gtab{F}{1:022100} + \gtab{G}{320003} + \gtab{Dm}{XX0231} + + \begin{verse*} + \lilypond{Toujours_etre_ailleurs_rythm} + \end{verse*} + + \begin{verse} + \[Dm] Oh chaque \[F]nuit se ré\[G]duire en \[Dm]cendre + Se laisser répandre + Dans les la\[F]vabos \[G]blancs \[Dm] + La solu\[F]tion est sans \[G]doute a\[Dm]mère + Si l'on considère + Qu'on n'sait p\[F]as où \[G]ça mè\[Dm]ne + Quelqu'un ic\[F]i pourrait-\[G]il me \[Dm]dire + Quelles sont les raisons qui me \[F]pou\[G]ssent ? \[Dm] + \end{verse} + + + + \begin{chorus} + Et les \[F]yeux \[G]vers l'ou\[Dm]est + Toujours \[F]être \[G]aille\[Dm]urs + Et les \[F]mains \[G]vers l'\[Dm]est + + J'veux toujours \[F]être \[G]aille\[Dm]urs ! + \end{chorus} + + \begin{repeatedchords} + \begin{verse} + \[Dm] J'ai la naus\[F]ée quand je \[G]reste ass\[Dm]is + Si je suis couché je n'joint pas \[F]les deb\[G]outs \[Dm] + Et je sour\[F]is pour le \[G]photogra\[Dm]phe + Qui va nous figer + Notez mon \[F]épit\[G]aphe \[Dm] + Notez ! + Je me sens s\[F]i bien hi\[G]er mat\[Dm]in + Que je voudrais être à d\[F]ema\[G]in \[Dm] + \end{verse} + + \begin{verse} + Oh j'ai jam\[F]ais pu \[G]oublier \[Dm] + L'odeur des \[F]endroits \[G]où j'ir\[Dm]ai + C'est seulement \[F]une quest\[G]ion de \[Dm]moeurs + J'veux toujours \[F]être \[G]aille\[Dm]urs ! + J'veux toujours \[F]être \[G]aille\[Dm]urs ! + \end{verse} + \end{repeatedchords} + +\endsong From 5a175344014ce5c1a55cbb57bb5acad6574586da Mon Sep 17 00:00:00 2001 From: Romain Goffe Date: Fri, 25 May 2012 19:13:30 +0200 Subject: [PATCH 09/18] corrections --- lilypond/Toujours_etre_ailleurs_rythm.ly | 0 songs/Calvin_Russell/5m2.sg | 0 songs/Calvin_Russell/dawg-eat-dawg.jpg | Bin songs/Dire_Straits/brothers-in-arms.jpg | Bin songs/Dire_Straits/brothers_in_arms.sg | 0 songs/Les_Ogres_de_Barback/Poil_aux_yeux.sg | 2 +- songs/Les_Ogres_de_Barback/Rue_Mazarine.sg | 7 +++---- songs/Noir_Desir/Ou_veux_tu_qu_je_regarde.sg | 0 songs/Noir_Desir/Toujours_etre_ailleurs.sg | 0 songs/Oldelaf_et_Monsieur_D/Super_heros.sg | 1 - songs/Thomas_Fersen/Chocolat.sg | 3 +-- songs/Thomas_Fersen/Deux_pieds.sg | 3 +-- songs/Thomas_Fersen/Diane_de_Poitiers.sg | 3 ++- songs/Thomas_Fersen/Je_n_ai_pas_la_gale.sg | 3 +-- songs/Thomas_Fersen/L_histoire_d_une_heure.sg | 3 +-- songs/Thomas_Fersen/La_malle.sg | 3 +-- songs/Thomas_Fersen/Le_chat_botte.sg | 3 +-- songs/Thomas_Fersen/Mon_macabre.sg | 1 - .../Thomas_Fersen/Parfois_au_clair_de_lune.sg | 3 +-- songs/Thomas_Fersen/Punaise.sg | 3 +-- songs/Thomas_Fersen/Que_l_on_est_bete.sg | 3 +-- ...ititi_ratata_il_parait_qu_elles_aiment_.sg | 18 +++++++++--------- songs/Thomas_Fersen/Zaza.sg | 1 - 23 files changed, 24 insertions(+), 36 deletions(-) mode change 100755 => 100644 lilypond/Toujours_etre_ailleurs_rythm.ly mode change 100755 => 100644 songs/Calvin_Russell/5m2.sg mode change 100755 => 100644 songs/Calvin_Russell/dawg-eat-dawg.jpg mode change 100755 => 100644 songs/Dire_Straits/brothers-in-arms.jpg mode change 100755 => 100644 songs/Dire_Straits/brothers_in_arms.sg mode change 100755 => 100644 songs/Noir_Desir/Ou_veux_tu_qu_je_regarde.sg mode change 100755 => 100644 songs/Noir_Desir/Toujours_etre_ailleurs.sg diff --git a/lilypond/Toujours_etre_ailleurs_rythm.ly b/lilypond/Toujours_etre_ailleurs_rythm.ly old mode 100755 new mode 100644 diff --git a/songs/Calvin_Russell/5m2.sg b/songs/Calvin_Russell/5m2.sg old mode 100755 new mode 100644 diff --git a/songs/Calvin_Russell/dawg-eat-dawg.jpg b/songs/Calvin_Russell/dawg-eat-dawg.jpg old mode 100755 new mode 100644 diff --git a/songs/Dire_Straits/brothers-in-arms.jpg b/songs/Dire_Straits/brothers-in-arms.jpg old mode 100755 new mode 100644 diff --git a/songs/Dire_Straits/brothers_in_arms.sg b/songs/Dire_Straits/brothers_in_arms.sg old mode 100755 new mode 100644 diff --git a/songs/Les_Ogres_de_Barback/Poil_aux_yeux.sg b/songs/Les_Ogres_de_Barback/Poil_aux_yeux.sg index b977770a..b66e04c2 100644 --- a/songs/Les_Ogres_de_Barback/Poil_aux_yeux.sg +++ b/songs/Les_Ogres_de_Barback/Poil_aux_yeux.sg @@ -1,7 +1,7 @@ \selectlanguage{french} \songcolumns{2} \beginsong{Poil aux yeux} - [by=Les Ogres de Barback & Debout sur le Zinc,cov=pitt-ocha,album=Pitt Ocha] + [by=Les Ogres de Barback \& Debout sur le Zinc,cov=pitt-ocha,album=Pitt Ocha] \cover \gtab{Em}{7:X02210} diff --git a/songs/Les_Ogres_de_Barback/Rue_Mazarine.sg b/songs/Les_Ogres_de_Barback/Rue_Mazarine.sg index f8375e32..8c6f7c0e 100644 --- a/songs/Les_Ogres_de_Barback/Rue_Mazarine.sg +++ b/songs/Les_Ogres_de_Barback/Rue_Mazarine.sg @@ -1,16 +1,15 @@ \selectlanguage{french} \songcolumns{1} -\beginsong{Rue Mazarine}[by=Les Ogres de Barback,cov=Terrain-vague,album=Terrain vague] +\beginsong{Rue Mazarine} + [by=Les Ogres de Barback,cov=terrain-vague,album=Terrain vague] \cover - \gtab{Fm}{1:022000} \gtab{C}{3:X02220} \gtab{B&m}{6:022000} \gtab{G}{3:022100} \gtab{E&}{6:X02220} \gtab{A&}{4:022100} - \utab{Fm}{1013} \utab{C}{0003} \utab{B&m}{1:2000} @@ -63,4 +62,4 @@ \end{verse} \end{repeatedchords} -\endsong \ No newline at end of file +\endsong diff --git a/songs/Noir_Desir/Ou_veux_tu_qu_je_regarde.sg b/songs/Noir_Desir/Ou_veux_tu_qu_je_regarde.sg old mode 100755 new mode 100644 diff --git a/songs/Noir_Desir/Toujours_etre_ailleurs.sg b/songs/Noir_Desir/Toujours_etre_ailleurs.sg old mode 100755 new mode 100644 diff --git a/songs/Oldelaf_et_Monsieur_D/Super_heros.sg b/songs/Oldelaf_et_Monsieur_D/Super_heros.sg index 0a544ef3..b12a788a 100644 --- a/songs/Oldelaf_et_Monsieur_D/Super_heros.sg +++ b/songs/Oldelaf_et_Monsieur_D/Super_heros.sg @@ -10,7 +10,6 @@ \gtab{F}{1:022100} \gtab{E}{022100} \gtab{C}{X32010} - \utab{Am}{2000} \utab{Em}{0432} \utab{D}{2220} diff --git a/songs/Thomas_Fersen/Chocolat.sg b/songs/Thomas_Fersen/Chocolat.sg index 99527574..9633d871 100644 --- a/songs/Thomas_Fersen/Chocolat.sg +++ b/songs/Thomas_Fersen/Chocolat.sg @@ -9,7 +9,6 @@ \gtab{G#m}{4:022000} \gtab{C#m}{4:X02210} \gtab{F#7}{2:020100} - \utab{B}{2:21000} \utab{D#7}{3:0001} \utab{G#m}{1:0231} @@ -74,4 +73,4 @@ \musicnote{\Outro : \nolyrics \[B D{\shrp}7 G{\shrp}m G{\shrp}m] \rep{2}} \end{verse*} -\endsong \ No newline at end of file +\endsong diff --git a/songs/Thomas_Fersen/Deux_pieds.sg b/songs/Thomas_Fersen/Deux_pieds.sg index 9fb6dc0c..72416d1a 100644 --- a/songs/Thomas_Fersen/Deux_pieds.sg +++ b/songs/Thomas_Fersen/Deux_pieds.sg @@ -9,7 +9,6 @@ \gtab{G#}{4:022100} \gtab{C#}{4:X03330} \gtab{Cm}{3:X02210} - \utab{Fm}{1013} \utab{D#}{1:2220} \utab{G#}{3:2010} @@ -80,4 +79,4 @@ \end{chorus} \end{repeatedchords} -\endsong \ No newline at end of file +\endsong diff --git a/songs/Thomas_Fersen/Diane_de_Poitiers.sg b/songs/Thomas_Fersen/Diane_de_Poitiers.sg index 9cab07c8..846e9209 100644 --- a/songs/Thomas_Fersen/Diane_de_Poitiers.sg +++ b/songs/Thomas_Fersen/Diane_de_Poitiers.sg @@ -8,7 +8,8 @@ \gtab{B&7}{1:X0202} \gtab{E&}{6:X02220} \gtab{F}{1:022100} - \gtab{Gm}3:022000} + + \gtab{Gm}{3:022000} \gtab{B&}{6:022100} \gtab{Cm}{3:X02210} \utab*{B&9}{1:0102} diff --git a/songs/Thomas_Fersen/Je_n_ai_pas_la_gale.sg b/songs/Thomas_Fersen/Je_n_ai_pas_la_gale.sg index c91f6818..4c0b99b1 100644 --- a/songs/Thomas_Fersen/Je_n_ai_pas_la_gale.sg +++ b/songs/Thomas_Fersen/Je_n_ai_pas_la_gale.sg @@ -10,7 +10,6 @@ \gtab{G}{320003} \gtab{F}{1:022100} \gtab{B&}{1:X02220} - \utab{Dm}{2210} \utab{C}{0003} \utab{Am}{2000} @@ -129,4 +128,4 @@ \end{chorus} \end{repeatedchords} -\endsong \ No newline at end of file +\endsong diff --git a/songs/Thomas_Fersen/L_histoire_d_une_heure.sg b/songs/Thomas_Fersen/L_histoire_d_une_heure.sg index d482d30a..06388bd6 100644 --- a/songs/Thomas_Fersen/L_histoire_d_une_heure.sg +++ b/songs/Thomas_Fersen/L_histoire_d_une_heure.sg @@ -9,7 +9,6 @@ \gtab{A}{X02220} \gtab{Edim}{2:XX0131} \gtab{F#dim}{XX4212} - \utab{B7}{2:0100} \utab{E}{2:2220} \utab{A}{2100} @@ -99,4 +98,4 @@ \nolyrics \[A E A E] \nolyrics \[Edim E F{\shrp}dim B7] \end{verse*} -\endsong \ No newline at end of file +\endsong diff --git a/songs/Thomas_Fersen/La_malle.sg b/songs/Thomas_Fersen/La_malle.sg index 874acc0c..9d9471d1 100644 --- a/songs/Thomas_Fersen/La_malle.sg +++ b/songs/Thomas_Fersen/La_malle.sg @@ -8,7 +8,6 @@ \gtab{F#m}{2:022000} \gtab{A}{X02220} \gtab{G#}{4:022100} - \utab{C#m}{1:0333} \utab{F#m}{2120} \utab{A}{2100} @@ -133,4 +132,4 @@ {\nolyrics \[A] \[G#]} (ad lib) \end{chorus} -\endsong \ No newline at end of file +\endsong diff --git a/songs/Thomas_Fersen/Le_chat_botte.sg b/songs/Thomas_Fersen/Le_chat_botte.sg index 2e43d341..4c088132 100644 --- a/songs/Thomas_Fersen/Le_chat_botte.sg +++ b/songs/Thomas_Fersen/Le_chat_botte.sg @@ -10,7 +10,6 @@ \gtab{D}{XX0232} \gtab{B7}{X21202} \gtab{G}{320003} - \utab{Em}{0432} \utab{C}{0003} \utab{Am}{2000} @@ -121,4 +120,4 @@ \end{verse*} \end{repeatedchords} -\endsong \ No newline at end of file +\endsong diff --git a/songs/Thomas_Fersen/Mon_macabre.sg b/songs/Thomas_Fersen/Mon_macabre.sg index a8bb1f63..d844f1b8 100644 --- a/songs/Thomas_Fersen/Mon_macabre.sg +++ b/songs/Thomas_Fersen/Mon_macabre.sg @@ -10,7 +10,6 @@ \gtab{B7}{X21202} \gtab{Bm}{2:X02210} \gtab{D}{XX0232} - \utab{Em}{0432} \utab{G}{0232} \utab{Am}{2000} diff --git a/songs/Thomas_Fersen/Parfois_au_clair_de_lune.sg b/songs/Thomas_Fersen/Parfois_au_clair_de_lune.sg index bf77a1e7..ace09b3d 100644 --- a/songs/Thomas_Fersen/Parfois_au_clair_de_lune.sg +++ b/songs/Thomas_Fersen/Parfois_au_clair_de_lune.sg @@ -10,7 +10,6 @@ \gtab{F}{1:022100} \gtab{G}{320003} \gtab{D}{XX0232} - \utab{C}{0003} \utab{E}{2:2220} \utab{Am}{2000} @@ -86,4 +85,4 @@ \musicnote {\Outro : \nolyrics \[C E Am F C E Am G] \[C F C G C]} \end{verse*} -\endsong \ No newline at end of file +\endsong diff --git a/songs/Thomas_Fersen/Punaise.sg b/songs/Thomas_Fersen/Punaise.sg index 33b300d2..30fc25c6 100644 --- a/songs/Thomas_Fersen/Punaise.sg +++ b/songs/Thomas_Fersen/Punaise.sg @@ -9,7 +9,6 @@ \gtab{A}{X02220} \gtab{D}{XX0232} \gtab{Em}{022000} - \utab{Bm}{2:2000} \utab{G}{0232} \utab{A}{2100} @@ -108,4 +107,4 @@ \nolyrics \[D] \[G] (ad lib.)}} \end{verse*} -\endsong \ No newline at end of file +\endsong diff --git a/songs/Thomas_Fersen/Que_l_on_est_bete.sg b/songs/Thomas_Fersen/Que_l_on_est_bete.sg index a26e6e65..8c7d890d 100644 --- a/songs/Thomas_Fersen/Que_l_on_est_bete.sg +++ b/songs/Thomas_Fersen/Que_l_on_est_bete.sg @@ -10,7 +10,6 @@ \gtab{D7}{XX0212} \gtab{F}{1:022100} \gtab{B&}{1:X02220} - \utab{Gm}{0231} \utab{Cm}{0333} \utab{E&}{1:2220} @@ -150,4 +149,4 @@ \nolyrics \[Gm Cm E{\flt} D7 Gm] \end{verse*} -\endsong \ No newline at end of file +\endsong diff --git a/songs/Thomas_Fersen/Rititi_ratata_il_parait_qu_elles_aiment_.sg b/songs/Thomas_Fersen/Rititi_ratata_il_parait_qu_elles_aiment_.sg index fbc678d8..2ea33180 100644 --- a/songs/Thomas_Fersen/Rititi_ratata_il_parait_qu_elles_aiment_.sg +++ b/songs/Thomas_Fersen/Rititi_ratata_il_parait_qu_elles_aiment_.sg @@ -4,16 +4,16 @@ [by=Thomas Fersen,cov=piece-montee-des-grands-jours,album=Pièce montée des grands jours] \cover - \gtab{E{\flt}m}{6:X02210} + \gtab{E&m}{6:X02210} \gtab{B}{2:X02210} - \gtab{A{\flt}m}{4:022000} - \gtab{G{\flt}}{2:022100} - \gtab{B{\flt}7}{1:X02020} - \utab{E{\flt}m}{1:2210} + \gtab{A&m}{4:022000} + \gtab{G&}{2:022100} + \gtab{B&7}{1:X02020} + \utab{E&m}{1:2210} \utab{B}{2:2100} - \utab{A{\flt}m}{2100} - \utab{G{\flt}}{3:2010} - \utab{B{\flt}7}{1:0100} + \utab{A&m}{2100} + \utab{G&}{3:2010} + \utab{B&7}{1:0100} \begin{verse*} \musicnote {\Intro : \nolyrics \[E{\flt}m B{\flt}7]} @@ -133,4 +133,4 @@ \musicnote {\nolyrics \[E{\flt}m B{\flt}7] \rep{2} (ad lib)} \end{verse*} -\endsong \ No newline at end of file +\endsong diff --git a/songs/Thomas_Fersen/Zaza.sg b/songs/Thomas_Fersen/Zaza.sg index 0842f64b..c110730d 100644 --- a/songs/Thomas_Fersen/Zaza.sg +++ b/songs/Thomas_Fersen/Zaza.sg @@ -9,7 +9,6 @@ \gtab{D}{XX0232} \gtab{B7}{X21202} \gtab{B}{2:X02220} - \utab{Em}{0432} \utab{Am}{2000} \utab{D}{2220} From c654ff616bd897f91c44e21cb5635f0f70c10d8e Mon Sep 17 00:00:00 2001 From: Romain Goffe Date: Fri, 25 May 2012 19:20:13 +0200 Subject: [PATCH 10/18] patacrep release version 3.5.9 --- NEWS | 15 +++++++++++++++ books/volume-5.sb | 7 +++++++ templates/ancient.tmpl | 2 +- templates/patacrep-en.tmpl | 2 +- templates/patacrep.tmpl | 2 +- 5 files changed, 25 insertions(+), 3 deletions(-) diff --git a/NEWS b/NEWS index 25a8a116..7557dbd8 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,19 @@ +version 3.5.9 + +Romain Goffe: +broph: + Patrick Coutin - J'aime regarder les filles + Noir Désir - Où veux-tu que je regarde ? + Calvin RUssell - 5m2 + Dire Straits - Brothers in arms + Noir Désir - Toujours être ailleurs +olivier desrobert: + : As de Trefle - Pauvre planete + : As de trefle - La revolution Modif : As de trefle - Pauvre planète + Les cowboys fringants - Hannah + : Les Ogres de Barback - Rue Mazarine + version 3.5.8 Kaosun: diff --git a/books/volume-5.sb b/books/volume-5.sb index 0c7e9448..619638b8 100644 --- a/books/volume-5.sb +++ b/books/volume-5.sb @@ -20,6 +20,7 @@ "As_De_Trefle/Pauvre_planete.sg", "As_De_Trefle/Toi_toi_toi.sg", "Belyscendre/Helas_madame.sg", + "Calvin_Russell/5m2.sg", "Calvin_Russell/Down_down_down.sg", "Debout_Sur_Le_Zinc/Comme_un_frisson.sg", "Debout_Sur_Le_Zinc/Elle_m_ennuie.sg", @@ -27,6 +28,7 @@ "Debout_Sur_Le_Zinc/Les_angles.sg", "Debout_Sur_Le_Zinc/Scylla.sg", "Debout_Sur_Le_Zinc/Sur_le_fil.sg", + "Dire_Straits/brothers_in_arms.sg", "Francis_Cabrel/La_corrida.sg", "Francis_Cabrel/Octobre.sg", "Gary_Jules/Mad_world.sg", @@ -42,7 +44,12 @@ "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/Poil_aux_yeux.sg", + "Les_Ogres_de_Barback/Rue_Mazarine.sg", "Maxime_Le_Forestier/Passer_ma_route.sg", + "Noir_Desir/Ou_veux_tu_qu_je_regarde.sg", + "Noir_Desir/Toujours_etre_ailleurs.sg", + "Patrick_Coutin/J_aime_regarder_les_filles.sg", "Phil_Barney/Un_enfant_de_toi.sg", "Roch_Voisine/Helene.sg", "Telephone/Le_jour_s_est_leve.sg", diff --git a/templates/ancient.tmpl b/templates/ancient.tmpl index efb92562..97b7abce 100644 --- a/templates/ancient.tmpl +++ b/templates/ancient.tmpl @@ -31,7 +31,7 @@ %%: {"name":"lang", "description":"Language", "default":"english"}, %%: {"name":"instruments", "description":"Instruments", "type":"flag", "values":["guitar","ukulele"], "join":",", "mandatory":true, "default":["guitar"]}, %%: {"name":"bookoptions", "description":"Options", "type":"flag", "values":["diagram","importantdiagramonly","lilypond","pictures","tabs","repeatchords","onesongperpage"], "join":",", "mandatory":true, "default":["diagram","pictures"]}, -%%: {"name":"version", "description":"Version", "default":"3.5.8"}, +%%: {"name":"version", "description":"Version", "default":"3.5.9"}, %%: {"name":"subtitle", "description":"Subtitle"}, %%: {"name":"web", "description":"Web", "default":"http://www.patacrep.com"}, %%: {"name":"mail", "description":"Email", "default":"crep@team-on-fire.com"}, diff --git a/templates/patacrep-en.tmpl b/templates/patacrep-en.tmpl index b6ac8992..0e27257f 100644 --- a/templates/patacrep-en.tmpl +++ b/templates/patacrep-en.tmpl @@ -31,7 +31,7 @@ %%: {"name":"lang", "description":"Language", "default":"english"}, %%: {"name":"instruments", "description":"Instruments", "type":"flag", "values":["guitar","ukulele"], "join":",", "mandatory":true, "default":["guitar"]}, %%: {"name":"bookoptions", "description":"Options", "type":"flag", "values":["diagram","importantdiagramonly","lilypond","pictures","tabs","repeatchords","onesongperpage"], "join":",", "mandatory":true, "default":["diagram","pictures"]}, -%%: {"name":"version", "description":"Version", "default":"3.5.8"}, +%%: {"name":"version", "description":"Version", "default":"3.5.9"}, %%: {"name":"subtitle", "description":"Subtitle"}, %%: {"name":"web", "description":"Web", "default":"http://www.patacrep.com"}, %%: {"name":"mail", "description":"Email", "default":"crep@team-on-fire.com"}, diff --git a/templates/patacrep.tmpl b/templates/patacrep.tmpl index 34c3387b..202d7da4 100644 --- a/templates/patacrep.tmpl +++ b/templates/patacrep.tmpl @@ -31,7 +31,7 @@ %%: {"name":"lang", "description":"Language", "default":"french"}, %%: {"name":"instruments", "description":"Instruments", "type":"flag", "values":["guitar","ukulele"], "join":",", "mandatory":true, "default":["guitar"]}, %%: {"name":"bookoptions", "description":"Options", "type":"flag", "values":["diagram","importantdiagramonly","lilypond","pictures","tabs","repeatchords","onesongperpage"], "join":",", "mandatory":true, "default":["diagram","pictures"]}, -%%: {"name":"version", "description":"Version", "default":"3.5.8"}, +%%: {"name":"version", "description":"Version", "default":"3.5.9"}, %%: {"name":"subtitle", "description":"Subtitle"}, %%: {"name":"web", "description":"Web", "default":"http://www.patacrep.com"}, %%: {"name":"mail", "description":"Email", "default":"crep@team-on-fire.com"}, From df68bbad438652671a841f180e00b4fced771160 Mon Sep 17 00:00:00 2001 From: Romain Goffe Date: Fri, 25 May 2012 19:26:49 +0200 Subject: [PATCH 11/18] correct renamed song in volume-2 --- books/volume-2.sb | 2 +- books/volume-5.sb | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/books/volume-2.sb b/books/volume-2.sb index d934e8a8..a6e12f1d 100644 --- a/books/volume-2.sb +++ b/books/volume-2.sb @@ -39,7 +39,6 @@ "Debout_Sur_Le_Zinc/La_declaration.sg", "Debout_Sur_Le_Zinc/Les_mots_d_amour.sg", "Debout_Sur_Le_Zinc/Ma_petite_cherie.sg", - "Debout_Sur_Le_Zinc/Poil_aux_yeux.sg", "Debout_Sur_Le_Zinc/Rester_debout.sg", "Dessins_Animes/Boumbo.sg", "Dessins_Animes/Denver.sg", @@ -113,6 +112,7 @@ "Les_Ogres_de_Barback/Bumbaia.sg", "Les_Ogres_de_Barback/Jojo.sg", "Les_Ogres_de_Barback/Le_temps.sg", + "Les_Ogres_de_Barback/Poil_aux_yeux.sg", "Les_Ogres_de_Barback/Ptit_chat.sg", "Les_Ogres_de_Barback/Rue_du_temps.sg", "Les_Ogres_de_Barback/Touche_pas_a_mon_ecole.sg", diff --git a/books/volume-5.sb b/books/volume-5.sb index 619638b8..1a212ef0 100644 --- a/books/volume-5.sb +++ b/books/volume-5.sb @@ -44,7 +44,6 @@ "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/Poil_aux_yeux.sg", "Les_Ogres_de_Barback/Rue_Mazarine.sg", "Maxime_Le_Forestier/Passer_ma_route.sg", "Noir_Desir/Ou_veux_tu_qu_je_regarde.sg", From f39adf096d14275408b7277840a2086823a99024 Mon Sep 17 00:00:00 2001 From: Dorian Goffe Date: Sat, 26 May 2012 08:58:00 +0200 Subject: [PATCH 12/18] correct lyrics --- songs/Yvon_Etienne/Y_a_des_nouilles_et_du_nougat.sg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/songs/Yvon_Etienne/Y_a_des_nouilles_et_du_nougat.sg b/songs/Yvon_Etienne/Y_a_des_nouilles_et_du_nougat.sg index 10ceb78f..2760f2d0 100644 --- a/songs/Yvon_Etienne/Y_a_des_nouilles_et_du_nougat.sg +++ b/songs/Yvon_Etienne/Y_a_des_nouilles_et_du_nougat.sg @@ -37,7 +37,7 @@ \begin{verse} Le fils du roi s'en va frimant - Avec ça me laisse et réban + Avec sa meule et ses Ray-Ban \end{verse} \begin{verse} From 838143fcce34d5f07e540397571a03d76b9f85ee Mon Sep 17 00:00:00 2001 From: Romain Goffe Date: Sat, 26 May 2012 11:50:02 +0200 Subject: [PATCH 13/18] corrections --- .../Sous_les_jupes_des_filles.sg | 4 +- songs/Alex_Beaupain/Les_yeux_au_ciel.sg | 10 ++--- songs/Alex_Beaupain/Ma_memoire_sale.sg | 4 +- songs/Anais/Mon_coeur_mon_amour.sg | 2 +- songs/Anis/Dans_tes_yeux.sg | 9 ++-- songs/Avril_Lavigne/Things_I_ll_never_say.sg | 2 +- songs/Belyscendre/Helas_madame.sg | 10 ++--- songs/Ben_Harper/Waiting_on_an_angel.sg | 10 ++--- songs/Ben_Harper/Widow_of_a_living_man.sg | 2 +- songs/Benabar/Quatre_murs_et_un_toit.sg | 3 +- songs/Buena_Vista_Social_Club/Chan_Chan.sg | 6 +-- songs/Calvin_Russell/5m2.sg | 12 +++--- songs/Charles_Aznavour/Les_comediens.sg | 2 +- songs/Charles_Aznavour/Mes_emmerdes.sg | 4 +- songs/Cranberries/Zombie.sg | 4 +- songs/Crash_Test_Dummies/mmm_mmm.sg | 4 +- songs/Daniel_Guichard/Mon_vieux.sg | 6 +-- songs/Dessins_Animes/Lucky_Luke.sg | 2 +- songs/Dire_Straits/brothers_in_arms.sg | 6 +-- songs/Eddie_Vedder/Guaranteed.sg | 4 +- .../{Guaranteed.jpg => into-the-wild.jpg} | Bin .../Eddy_Mitchell/Il_ne_rentre_pas_ce_soir.sg | 4 +- songs/Edith_Piaf/Padam_Padam.sg | 3 +- songs/Elton_John/Crocodile_rock.sg | 2 +- songs/Elvis_Presley/Love_me_tender.sg | 4 +- songs/Fleetwood_Mac/Temporary_one.sg | 2 +- .../Je_t_aimais_je_t_aime_et_je_t_aimerai.sg | 4 +- songs/Francis_Cabrel/L_encre_de_tes_yeux.sg | 4 +- songs/Francis_Cabrel/La_corrida.sg | 20 ++++----- .../Francis_Cabrel/Les_vidanges_du_diables.sg | 8 ++-- songs/Francis_Cabrel/Octobre.sg | 4 +- ...-soir.jpg => samedi-soir-sur-la-terre.jpg} | Bin songs/Georges_Brassens/A_l_ombre_des_maris.sg | 4 +- .../La_mauvaise_reputation.sg | 4 +- songs/Gerald_De_Palmas/Sur_la_route.sg | 2 +- songs/Gipsy_Kings/Bamboleo.sg | 2 +- songs/Graeme_Allwright/Petit_garcon.sg | 2 +- songs/Green_Day/American_idiot.sg | 8 ++-- songs/Green_Day/Boulevard_of_broken_dreams.sg | 12 +++--- songs/HK_Saltimbanks/Passer_ma_vie.sg | 6 +-- songs/Herman_s_Hermits/No_milk_today.sg | 2 +- songs/Howie_Day/Collide.sg | 8 ++-- songs/Hugues_Aufray/Alouette.sg | 4 +- .../Somewhere_over_the_rainbow.sg | 10 ++--- songs/JCFrog/La_mauvaise_ereputation.sg | 6 +-- .../Jacques_Dutronc/La_fille_du_Pere_Noel.sg | 4 +- songs/Jali/Espanola.sg | 9 ++-- songs/Jean-Jacques_Goldman/Comme_toi.sg | 4 +- songs/Jean-Jacques_Goldman/Encore_un_matin.sg | 2 +- songs/Jean-Jacques_Goldman/On_ira.sg | 5 ++- songs/Johnny_Hallyday/Le_penitencier.sg | 3 +- songs/Karpatt/Des_gnons_pour_des_pelles.sg | 3 +- songs/Karpatt/Le_magicien.sg | 4 +- songs/Karpatt/Les_ptits_cailloux.sg | 4 +- songs/La_Rue_Ketanou/Sao_loucas.sg | 4 +- .../La_machine_a_danser.sg | 2 +- songs/Laura_Veirs/Jailhouse_fire.sg | 5 +-- songs/Le_Donjon_de_Naheulbeuk/Bugger_off.sg | 2 +- .../Les_souliers_de_Lady_Fae.sg | 3 +- .../Massacrons_nous_dans_la_taverne.sg | 2 +- .../Le_Donjon_de_Naheulbeuk/Noel_en_Mordor.sg | 4 +- songs/Les_Amis_D_Ta_Femme/A_las_barricadas.sg | 4 +- songs/Les_Amis_D_Ta_Femme/Cayenne.sg | 5 +-- songs/Les_Cowboys_Fringants/Ces_temps_ci.sg | 7 +-- songs/Les_Cowboys_Fringants/Hannah.sg | 2 +- .../Histoire_de_peche.sg | 9 ++-- .../Les_Cowboys_Fringants/Toune_d_automne.sg | 2 +- .../Chasse_peche_et_nature.sg | 4 +- songs/Les_Fatals_Picards/Goldorak_est_mort.sg | 2 +- songs/Les_Hurlements_d_Leo/Ici_d_ailleurs.sg | 2 +- songs/Les_Innocents/L_autre_finistere.sg | 2 +- .../Comment_je_suis_devenu_voyageur.sg | 4 +- .../L_ennui_et_le_jour.sg | 2 +- ...pg => comment-je-suis-devenu-voyageur.jpg} | Bin songs/Les_Vieilles_Valises/Emilie.sg | 2 +- songs/Les_Wriggles/Plouf.sg | 10 ++--- songs/Linkin_Park/Numb.sg | 2 +- songs/Louis_Chedid/Tout_le_monde_se_presse.sg | 40 +++++++++--------- songs/Manu_Chao/Bienvenida_a_Tijuana.sg | 8 ++-- songs/Manu_Chao/Clandestino.sg | 9 ++-- songs/Manu_Chao/Desaparecido.sg | 4 +- songs/Matmatah/L_apologie.sg | 2 +- songs/Matticus/Le_p_tit_gars.sg | 3 +- .../Education_Sentimentale.sg | 8 ++-- songs/Maxime_Le_Forestier/L_auto_stop.sg | 2 +- songs/Maxime_Le_Forestier/Mon_frere.sg | 10 ++--- songs/Maxime_Le_Forestier/Parachutiste.sg | 2 +- songs/Maxime_Le_Forestier/Passer_ma_route.sg | 4 +- .../Le_cycle_du_vin.sg | 4 +- songs/Michel_Fugain/Forteresse.sg | 8 ++-- .../Michel_Fugain/Je_n_aurai_pas_le_temps.sg | 5 +-- songs/Michel_Fugain/Les_Acadiens.sg | 4 +- 92 files changed, 218 insertions(+), 245 deletions(-) rename songs/Eddie_Vedder/{Guaranteed.jpg => into-the-wild.jpg} (100%) rename songs/Francis_Cabrel/{samedi-soir.jpg => samedi-soir-sur-la-terre.jpg} (100%) rename songs/Les_Ogres_de_Barback/{voyageur.jpg => comment-je-suis-devenu-voyageur.jpg} (100%) diff --git a/songs/Alain_Souchon/Sous_les_jupes_des_filles.sg b/songs/Alain_Souchon/Sous_les_jupes_des_filles.sg index bb95a75e..0003d80b 100644 --- a/songs/Alain_Souchon/Sous_les_jupes_des_filles.sg +++ b/songs/Alain_Souchon/Sous_les_jupes_des_filles.sg @@ -61,7 +61,7 @@ \nolyrics{\[Fm G7 Cm]} \[Fm]Si parfois Ça les \[G7]gène et qu'elles veulent pas - Qu'on regarde leurs guiboles + Qu'on regarde leurs guibolles Les garçons s'affolent de \[Cm]ça \end{chorus} @@ -93,7 +93,7 @@ C'est leurs robes lé\[Cm]gères \end{chorus} - \textnote[french]{Répeter \Verse 1} + \textnote[french]{Répéter \Verse 1} \textnote[english]{Repeat \Verse 1} \end{repeatedchords} diff --git a/songs/Alex_Beaupain/Les_yeux_au_ciel.sg b/songs/Alex_Beaupain/Les_yeux_au_ciel.sg index bd54b40d..4a1bb5e2 100644 --- a/songs/Alex_Beaupain/Les_yeux_au_ciel.sg +++ b/songs/Alex_Beaupain/Les_yeux_au_ciel.sg @@ -5,11 +5,11 @@ \cover \gtab{Am}{X02210} - \gtab{Esus4}{020200} - \gtab{Bm7/5&}{X2323X} - \gtab{C6}{X32210} - \gtab{C7/6}{X32200} - \gtab{C7}{X32000} + \gtab*{Esus4}{020200} + \gtab*{Bm7/5&}{X2323X} + \gtab*{C6}{X32210} + \gtab*{C7/6}{X32200} + \gtab*{C7}{X32000} \begin{verse*} \musicnote{\Intro : \nolyrics{\[Am E7sus4 C7/6 E7sus4]} \rep{2}} diff --git a/songs/Alex_Beaupain/Ma_memoire_sale.sg b/songs/Alex_Beaupain/Ma_memoire_sale.sg index 5ed15420..35ebbb15 100644 --- a/songs/Alex_Beaupain/Ma_memoire_sale.sg +++ b/songs/Alex_Beaupain/Ma_memoire_sale.sg @@ -5,8 +5,8 @@ \cover \capo{1} - \gtab{C9+}{X32030} - \gtab{D9+}{XX0230} + \gtab*{C9+}{X32030} + \gtab*{D9+}{XX0230} \gtab{Em}{022000} \gtab{Bm}{2:X02210} diff --git a/songs/Anais/Mon_coeur_mon_amour.sg b/songs/Anais/Mon_coeur_mon_amour.sg index ff8549da..ac30db6f 100644 --- a/songs/Anais/Mon_coeur_mon_amour.sg +++ b/songs/Anais/Mon_coeur_mon_amour.sg @@ -5,7 +5,7 @@ \cover \gtab{F#}{2:022100} - \gtab{F7/C7}{2:002120} + \gtab*{F7/C7}{2:002120} \gtab{B}{2:X02220} \gtab{C#}{4:X02220} diff --git a/songs/Anis/Dans_tes_yeux.sg b/songs/Anis/Dans_tes_yeux.sg index 6b91398f..1c8b971d 100644 --- a/songs/Anis/Dans_tes_yeux.sg +++ b/songs/Anis/Dans_tes_yeux.sg @@ -1,15 +1,15 @@ \selectlanguage{french} \songcolumns{2} \beginsong{Dans tes yeux} - [by=Anis,album=Rodéo Boulevard,cov=rodeo-boulevard] + [by=Anis,cov=rodeo-boulevard,album=Rodéo Boulevard] \cover - \gtab{Dm6}{5:X02210} + \gtab{Dm}{5:X02210} \gtab{A#}{6:022100} \gtab{C7}{9:020100} \gtab{A}{5:022100} \gtab{Gm6}{7:X0101X} - \utab{Dm6}{2212} + \utab{Dm}{2212} \utab{A#}{1:2100} \utab{C7}{0001} \utab{A}{2100} @@ -86,4 +86,5 @@ \begin{verse*} \musicnote {\Outro : \nolyrics \[A{\shrp} C7 A Dm A{\shrp} Gm6 A Dm] \echo{adlib}} \end{verse*} -\endsong \ No newline at end of file + +\endsong diff --git a/songs/Avril_Lavigne/Things_I_ll_never_say.sg b/songs/Avril_Lavigne/Things_I_ll_never_say.sg index 3ac85158..f198cfc7 100644 --- a/songs/Avril_Lavigne/Things_I_ll_never_say.sg +++ b/songs/Avril_Lavigne/Things_I_ll_never_say.sg @@ -8,7 +8,7 @@ \gtab{A}{X02220} \gtab{Bm}{2:X02210} \gtab{G}{320033} - \gtab{Asus2}{X02200} + \gtab*{Asus2}{X02200} \gtab{Em}{022000} \gtab{C}{X32010} diff --git a/songs/Belyscendre/Helas_madame.sg b/songs/Belyscendre/Helas_madame.sg index 22d5dd24..df4be7e3 100644 --- a/songs/Belyscendre/Helas_madame.sg +++ b/songs/Belyscendre/Helas_madame.sg @@ -4,10 +4,10 @@ [by=Belyscendre,cov=belles-embarquez,album=Belles Embarquez !] \cover - \gtab*{Em}{022000} - \gtab*{D}{XX0232} - \gtab*{B}{2:X02220} - \gtab*{G}{320003} + \gtab{Em}{022000} + \gtab{D}{XX0232} + \gtab{B}{2:X02220} + \gtab{G}{320003} \begin{chorus} \[Em]Hélas ma\[D]dame, ce\[B]lle que j'ayme \[Em]tant @@ -46,4 +46,4 @@ \end{verse} \end{repeatedchords} -\endsong \ No newline at end of file +\endsong diff --git a/songs/Ben_Harper/Waiting_on_an_angel.sg b/songs/Ben_Harper/Waiting_on_an_angel.sg index 9ea6bacf..0ec8e33b 100644 --- a/songs/Ben_Harper/Waiting_on_an_angel.sg +++ b/songs/Ben_Harper/Waiting_on_an_angel.sg @@ -4,11 +4,11 @@ [by=Ben Harper,cov=welcome-to-the-cruel-world,album=Welcome to the cruel world] \cover - \gtab{C}{X30010} - \gtab{C/B}{X20010} - \gtab{Am7/E}{000010} - \gtab{G}{300000} - \gtab{F}{100210} + \gtab*{C}{X30010} + \gtab*{C/B}{X20010} + \gtab*{Am7/E}{000010} + \gtab*{G}{300000} + \gtab*{F}{100210} \begin{verse} \[C]Wait\[C/B]ing on \[Am/E7]an an\[G]gel diff --git a/songs/Ben_Harper/Widow_of_a_living_man.sg b/songs/Ben_Harper/Widow_of_a_living_man.sg index 67b9b3b1..34ab9b73 100644 --- a/songs/Ben_Harper/Widow_of_a_living_man.sg +++ b/songs/Ben_Harper/Widow_of_a_living_man.sg @@ -4,7 +4,7 @@ [by=Ben Harper,cov=the-will-to-live,album=The will to live] \cover - \gtab{Asus2}{X02200} + \gtab*{Asus2}{X02200} \gtab{C}{X32010} \gtab{G}{320003} \gtab{D}{XX0232} diff --git a/songs/Benabar/Quatre_murs_et_un_toit.sg b/songs/Benabar/Quatre_murs_et_un_toit.sg index 7a4b00fe..2ee7414d 100644 --- a/songs/Benabar/Quatre_murs_et_un_toit.sg +++ b/songs/Benabar/Quatre_murs_et_un_toit.sg @@ -63,7 +63,7 @@ La cabane du jardin trouve une deuxième jeunesse C'est le consulat que rouvrent les gosses Le grenier, sans bataille, livre ses trésors - Ses panoplies de cowboys aux petits ambassadeurs + Ses panoplies de cow-boys aux petits ambassadeurs Qui colonisent pour la dernière fois La modeste terre promise, quatre murs et un toit \end{verse} @@ -85,4 +85,5 @@ {\og}Les enfants : à table !{\fg} Écoutez la musique, est-ce que vous l'entendez ? \rep{3} \end{verse} + \endsong diff --git a/songs/Buena_Vista_Social_Club/Chan_Chan.sg b/songs/Buena_Vista_Social_Club/Chan_Chan.sg index 7ab01982..e972158f 100644 --- a/songs/Buena_Vista_Social_Club/Chan_Chan.sg +++ b/songs/Buena_Vista_Social_Club/Chan_Chan.sg @@ -4,9 +4,9 @@ [by=Compay Segundo,cov=chanchan,album=Chan Chan] \cover - \gtab{Dm}{100231} + \gtab*{Dm}{100231} \gtab{F}{1:022100} - \gtab{Gm6}{3:022020} + \gtab*{Gm6}{3:022020} \gtab{A}{X02220} \begin{verse} @@ -36,4 +36,4 @@ Y'así no puedo llegar \end{verse} -\endsong \ No newline at end of file +\endsong diff --git a/songs/Calvin_Russell/5m2.sg b/songs/Calvin_Russell/5m2.sg index a755cb21..04bc475c 100644 --- a/songs/Calvin_Russell/5m2.sg +++ b/songs/Calvin_Russell/5m2.sg @@ -1,4 +1,4 @@ -\selectlanguage{english} +\selectlanguage{french} \songcolumns{2} \beginsong{5m2} [by=Calvin Russell,cov=dawg-eat-dawg,album=Dawg eat dawg] @@ -9,13 +9,13 @@ \gtab{Dm}{XX0231} \gtab{F}{1:022100} \gtab{E}{022100} - \gtab{Am/C}{X32210} + \gtab*{Am/C}{X32210} \gtab{G}{320003} \begin{verse} \[Am] Cinq mètres carrés, plus de télé \[Dm] L'eau qui fuit dans les WC - \[F] Encore un bol de ricoré + \[F] Encore un bol de Ricoré \[E] Un seul rève, avoir la clé \end{verse} @@ -30,14 +30,14 @@ \begin{chorus} \[F] I'm dreaming, \[Am] I'm dreaming - o\[Am/C]f wh\[G]ere th\[Am/C]at s\[E]un - go\[G7]es do\[Am]wn \[G7] \[Am] + O\[Am/C]f wh\[G]ere th\[Am/C]at s\[E]un + Go\[G7]es do\[Am]wn \[G7] \[Am] \end{chorus} \begin{repeatedchords} \begin{verse} \[Am] Sur un coin de mur, lézardé - \[Dm] Une photo trop abimée + \[Dm] Une photo trop abîmée \[F] D'une femme au regard désenchanté \[E] Celui de celle qui m'a aimé \end{verse} diff --git a/songs/Charles_Aznavour/Les_comediens.sg b/songs/Charles_Aznavour/Les_comediens.sg index 614ca735..a654ac80 100644 --- a/songs/Charles_Aznavour/Les_comediens.sg +++ b/songs/Charles_Aznavour/Les_comediens.sg @@ -9,7 +9,7 @@ \gtab{Am}{X02210} \gtab{F}{1:022100} \gtab{G7}{320001} - \gtab{E7}{020130} + \gtab*{E7}{020130} \gtab{D7}{XX0212} \begin{chorus} diff --git a/songs/Charles_Aznavour/Mes_emmerdes.sg b/songs/Charles_Aznavour/Mes_emmerdes.sg index 79524dfc..a4a905ab 100644 --- a/songs/Charles_Aznavour/Mes_emmerdes.sg +++ b/songs/Charles_Aznavour/Mes_emmerdes.sg @@ -14,8 +14,8 @@ \gtab{A7}{x02020} \gtab{Dm}{XXX0231} \gtab{Fm}{1:022000} - \gtab{Bb}{1:XX3330} - \gtab{Eb}{XX1343} + \gtab{B&}{1:X02220} + \gtab*{E&}{XX1343} \gtab{G7}{320001} \begin{verse} diff --git a/songs/Cranberries/Zombie.sg b/songs/Cranberries/Zombie.sg index bee43b88..bd0a824c 100644 --- a/songs/Cranberries/Zombie.sg +++ b/songs/Cranberries/Zombie.sg @@ -5,8 +5,8 @@ \cover \gtab{Em}{022000} - \gtab{C}{332010} - \gtab{G}{3200XX} + \gtab*{C}{332010} + \gtab*{G}{3200XX} \gtab{F#m}{2:0220XX} \begin{verse} diff --git a/songs/Crash_Test_Dummies/mmm_mmm.sg b/songs/Crash_Test_Dummies/mmm_mmm.sg index c635f1bc..617c8a1c 100644 --- a/songs/Crash_Test_Dummies/mmm_mmm.sg +++ b/songs/Crash_Test_Dummies/mmm_mmm.sg @@ -8,7 +8,7 @@ \gtab{C}{X32010} \gtab{Em}{022000} \gtab{F}{1:022100} - \gtab{C4}{033000} + \gtab*{C4}{033000} \gtab{G}{320003} \gtab{Am}{X02210} \gtab{A&}{4:022100} @@ -54,4 +54,4 @@ They'd always just gone there \end{verse} -\endsong \ No newline at end of file +\endsong diff --git a/songs/Daniel_Guichard/Mon_vieux.sg b/songs/Daniel_Guichard/Mon_vieux.sg index 01d93107..d6c05847 100644 --- a/songs/Daniel_Guichard/Mon_vieux.sg +++ b/songs/Daniel_Guichard/Mon_vieux.sg @@ -10,9 +10,9 @@ \gtab{F}{1:022100} \gtab{G}{320003} \gtab{C7}{X32310} - \gtab{F7M}{XX3210} + \gtab*{F7M}{XX3210} \gtab{Dm}{XX0231} - \gtab{Dm7}{XX0211} + \gtab*{Dm7}{XX0211} \gtab{G7}{320001} \begin{verse} @@ -106,4 +106,4 @@ \[G]Pap\[Am]a \[Dm7] \[G7] \[C] \end{chorus} -\endsong \ No newline at end of file +\endsong diff --git a/songs/Dessins_Animes/Lucky_Luke.sg b/songs/Dessins_Animes/Lucky_Luke.sg index 041daed7..8d84c049 100644 --- a/songs/Dessins_Animes/Lucky_Luke.sg +++ b/songs/Dessins_Animes/Lucky_Luke.sg @@ -13,7 +13,7 @@ \[Am]On l'appelle Lucky Luke \[G]De l'Ouest au Far-Ouest \[F]Il arrive au galop - \[C]Ce cowboy héros + \[C]Ce cow-boy héros \end{verse} \begin{verse} diff --git a/songs/Dire_Straits/brothers_in_arms.sg b/songs/Dire_Straits/brothers_in_arms.sg index 09e7030a..7f61fa14 100644 --- a/songs/Dire_Straits/brothers_in_arms.sg +++ b/songs/Dire_Straits/brothers_in_arms.sg @@ -9,9 +9,9 @@ \gtab{C#m}{4:X02210} \gtab{F#}{2:022100} \gtab{B}{2:X02220} - \gtab{B4}{2:X02230} + \gtab*{B4}{2:X02230} \gtab{D#m}{6:X02210} - \gtab{F#4}{2:022200} + \gtab*{F#4}{2:022200} \begin{verse*} \musicnote{\Intro:\nolyrics{ | \[G\shrp{m}] \[E] | \[C\shrp{m}] \[E] | \[G\shrp{m}] \[E] | \[C\shrp{m}] }} @@ -41,7 +41,7 @@ I've \[D#m]witnessed your s\[G#m]ufferin\[D#m]g As the battles raged high\[E]er \[F#4] And \[F#]though they hurt \[G#m]me so \[D#m]bad - In the fear and a \[E]larm \[C#m] \[F#4] + In the fear and a\[E]larm \[C#m] \[F#4] You \[F#]did not de\[G#m]sert me My \[E]brothers in \[F#4]arms \[F#] \end{verse} diff --git a/songs/Eddie_Vedder/Guaranteed.sg b/songs/Eddie_Vedder/Guaranteed.sg index 87a67e24..596cb3fa 100644 --- a/songs/Eddie_Vedder/Guaranteed.sg +++ b/songs/Eddie_Vedder/Guaranteed.sg @@ -1,7 +1,7 @@ \selectlanguage{english} \songcolumns{1} \beginsong{Guaranteed} - [by=Eddie Vedder,cov=Guaranteed,album=Into the wild] + [by=Eddie Vedder,cov=into-the-wild,album=Into the wild] \cover \gtab{G}{3:022100} @@ -10,7 +10,7 @@ \gtab{Am7}{002010} \gtab{C}{X32010} \gtab{D}{XX0232} - \gtab{D4}{000230} + \gtab*{D4}{000230} \begin{verse} \[G]On bended knee is no \[Bm]way to be free diff --git a/songs/Eddie_Vedder/Guaranteed.jpg b/songs/Eddie_Vedder/into-the-wild.jpg similarity index 100% rename from songs/Eddie_Vedder/Guaranteed.jpg rename to songs/Eddie_Vedder/into-the-wild.jpg diff --git a/songs/Eddy_Mitchell/Il_ne_rentre_pas_ce_soir.sg b/songs/Eddy_Mitchell/Il_ne_rentre_pas_ce_soir.sg index 4ed2fb47..9dc11d7b 100644 --- a/songs/Eddy_Mitchell/Il_ne_rentre_pas_ce_soir.sg +++ b/songs/Eddy_Mitchell/Il_ne_rentre_pas_ce_soir.sg @@ -11,8 +11,8 @@ \gtab{F}{1:022100} \gtab{B}{1:X02220} \gtab{E}{022100} - \gtab*{B7}{X21202} - \gtab*{A7}{X02020} + \gtab{B7}{X21202} + \gtab{A7}{X02020} \begin{verse} Il éc\[Am]rase sa cigarette diff --git a/songs/Edith_Piaf/Padam_Padam.sg b/songs/Edith_Piaf/Padam_Padam.sg index b38464ab..51958dcf 100644 --- a/songs/Edith_Piaf/Padam_Padam.sg +++ b/songs/Edith_Piaf/Padam_Padam.sg @@ -7,12 +7,11 @@ \capo{1} \gtab{Am}{X02210} \gtab{Dm}{XX0231} - \gtab{E7}{022130} + \gtab*{E7}{022130} \gtab{A}{X02220} \gtab{E}{022100} \gtab{F}{1:022100} - \begin{verse} \[Am]Cet air qui m'obsède jour et \[Dm]nuit Cet \[E7]air n'est pas né d'aujourd'\[Am]hui diff --git a/songs/Elton_John/Crocodile_rock.sg b/songs/Elton_John/Crocodile_rock.sg index e69b615d..83ef27d3 100644 --- a/songs/Elton_John/Crocodile_rock.sg +++ b/songs/Elton_John/Crocodile_rock.sg @@ -7,7 +7,7 @@ \gtab{G}{320003} \gtab{Em}{022000} \gtab{C}{X32010} - \gtab{D}{XXX0232} + \gtab{D}{XX0232} \gtab{A7}{X02020} \gtab{D7}{XX0212} diff --git a/songs/Elvis_Presley/Love_me_tender.sg b/songs/Elvis_Presley/Love_me_tender.sg index 3f4a23be..07aaa353 100644 --- a/songs/Elvis_Presley/Love_me_tender.sg +++ b/songs/Elvis_Presley/Love_me_tender.sg @@ -6,7 +6,7 @@ \cover \gtab{G}{320003} \gtab{A7}{X02020} - \gtab{D7/4}{XX0214} + \gtab*{D7/4}{XX0214} \gtab{D7}{XX0212} \gtab{B7}{X21202} \gtab{Em}{022000} @@ -22,7 +22,7 @@ \begin{chorus} \[G]Love me \[B7]tender, \[Em]love me \[G7]true - \[C]All my dreams full\[G]fil + \[C]All my dreams ful\[G]fil \[G]For my \[E7]darlin' \[A7]I love you \[D7/4]And I \[D7]always \[G]will \end{chorus} diff --git a/songs/Fleetwood_Mac/Temporary_one.sg b/songs/Fleetwood_Mac/Temporary_one.sg index b3fb7a94..36d1039e 100644 --- a/songs/Fleetwood_Mac/Temporary_one.sg +++ b/songs/Fleetwood_Mac/Temporary_one.sg @@ -6,7 +6,7 @@ \cover \gtab*{G5}{XXX033} \gtab{A}{X02220} - \gtab{D}{XXX0232} + \gtab{D}{XX0232} \gtab{G}{320003} \gtab{Bm}{2:X02210} \gtab*{Asus4}{X02230} diff --git a/songs/Francis_Cabrel/Je_t_aimais_je_t_aime_et_je_t_aimerai.sg b/songs/Francis_Cabrel/Je_t_aimais_je_t_aime_et_je_t_aimerai.sg index 13e20eab..2ce4051b 100644 --- a/songs/Francis_Cabrel/Je_t_aimais_je_t_aime_et_je_t_aimerai.sg +++ b/songs/Francis_Cabrel/Je_t_aimais_je_t_aime_et_je_t_aimerai.sg @@ -1,13 +1,13 @@ \selectlanguage{french} \songcolumns{2} \beginsong{Je t'aimais, je t'aime et je t'aimerai} - [by=Francis Cabrel,cov=samedi-soir,album=Samedi soir sur la Terre] + [by=Francis Cabrel,cov=samedi-soir-sur-la-terre,album=Samedi soir sur la Terre] \cover \gtab{G}{320003} \gtab{D}{XX0232} \gtab{C}{X32010} - \gtab{Em}{022100} + \gtab{Em}{022000} \gtab{Am}{X02210} \begin{verse} diff --git a/songs/Francis_Cabrel/L_encre_de_tes_yeux.sg b/songs/Francis_Cabrel/L_encre_de_tes_yeux.sg index 442cc960..a33fe519 100644 --- a/songs/Francis_Cabrel/L_encre_de_tes_yeux.sg +++ b/songs/Francis_Cabrel/L_encre_de_tes_yeux.sg @@ -11,8 +11,8 @@ \gtab{Em}{022000} \gtab{F}{1:022100} \gtab{C7}{X32310} - \gtab{Dm11}{XX0011} - \gtab{Am}{X02010} + \gtab*{Dm11}{XX0011} + \gtab{Am7}{X02010} \begin{chorus} \musicnote{\Intro : \nolyrics{\[C G Am Am F C G G C G Am]}} diff --git a/songs/Francis_Cabrel/La_corrida.sg b/songs/Francis_Cabrel/La_corrida.sg index c50047a6..8abf0e81 100644 --- a/songs/Francis_Cabrel/La_corrida.sg +++ b/songs/Francis_Cabrel/La_corrida.sg @@ -1,16 +1,16 @@ \selectlanguage{french} \songcolumns{2} \beginsong{La corrida} - [by=Francis Cabrel,cov=samedi-soir,album=Samedi soir sur la Terre] + [by=Francis Cabrel,cov=samedi-soir-sur-la-terre,album=Samedi soir sur la Terre] \cover \gtab{Dm}{XX0231} \gtab{F}{1:022100} \gtab{C}{X32010} - \gtab{B&sus2}{1:002200} - \gtab{Csus2}{030010} - \gtab{Dsus4}{XX0233} - \gtab{Asus4}{X02230} + \gtab*{B&sus2}{1:002200} + \gtab*{Csus2}{030010} + \gtab*{Dsus4}{XX0233} + \gtab*{Asus4}{X02230} \begin{verse} Depuis le \[Dm]temps que je patiente @@ -27,14 +27,14 @@ \end{verse*} \begin{verse*} - \musicnote{\nolyrics \[Dm F C B{$\flat$}sus2]} + \musicnote{\nolyrics \[Dm F C B{\flt}sus2]} \end{verse*} \begin{repeatedchords} \begin{verse} Dans les pre\[Dm]miers moments j'ai cru - Qu'il fallait \[F]seulment se défendre + Qu'il fallait \[F]seulement se défendre Mais cette \[C]place est sans issue Je commence à \[B&sus2]comprendre \end{verse} @@ -71,7 +71,7 @@ \[B&sus2]J'en ai poursuivi des fan\[Csus2]tômes Presque tou\[Dm]ché leurs ballerines \[Dsus4 Dm] Ils ont fra\[Bsus2]ppé fort dans mon cou - Pour que je \[A]m'incline \[Asus2 A] + Pour que je \[A]m'incline \[Asus4 A] Ils sortent \[B&sus2]d'où ces acrobates \[Csus2]Avec leurs costumes de \[Dm]papier ? \[Dsus4 Dm] J'ai jamais \[B&sus2]appris à me battre @@ -79,7 +79,7 @@ \end{bridge} \begin{verse*} - \musicnote{\nolyrics \[Dm F C B{$\flat$}sus2]} + \musicnote{\nolyrics \[Dm F C B{\flt}sus2]} \end{verse*} \begin{repeatedchords} @@ -98,4 +98,4 @@ \end{verse*} \end{repeatedchords} -\endsong \ No newline at end of file +\endsong diff --git a/songs/Francis_Cabrel/Les_vidanges_du_diables.sg b/songs/Francis_Cabrel/Les_vidanges_du_diables.sg index 2dae3ecd..3b893695 100644 --- a/songs/Francis_Cabrel/Les_vidanges_du_diables.sg +++ b/songs/Francis_Cabrel/Les_vidanges_du_diables.sg @@ -1,15 +1,13 @@ \selectlanguage{french} \songcolumns{2} \beginsong{Les vidanges du diable} - [by=Francis Cabrel,cov=samedi-soir,album=Un samedi soir sur la terre] + [by=Francis Cabrel,cov=samedi-soir-sur-la-terre,album=Samedi soir sur la Terre] \cover - \gtab{Adim}{X12020} - \gtab{Adim}{X02323} + \gtab*{Adim}{X02323} \gtab{A}{X02220} \gtab{Bm}{2:X02210} \gtab{F#}{2:022100} - \gtab{F#m7}{2:020000} \gtab{G}{3:022100} \gtab{E}{0221000} \gtab{D}{XX0232} @@ -62,4 +60,4 @@ Un linge sur l'abat-jour \end{verse} -\endsong \ No newline at end of file +\endsong diff --git a/songs/Francis_Cabrel/Octobre.sg b/songs/Francis_Cabrel/Octobre.sg index e83e386c..26f057c4 100644 --- a/songs/Francis_Cabrel/Octobre.sg +++ b/songs/Francis_Cabrel/Octobre.sg @@ -1,7 +1,7 @@ \selectlanguage{french} \songcolumns{2} \beginsong{Octobre} - [by=Francis Cabrel,cov=samedi-soir,album=Samedi soir sur la Terre] + [by=Francis Cabrel,cov=samedi-soir-sur-la-terre,album=Samedi soir sur la Terre] \cover \gtab{E}{022100} @@ -80,4 +80,4 @@ \end{verse*} \end{repeatedchords} -\endsong \ No newline at end of file +\endsong diff --git a/songs/Francis_Cabrel/samedi-soir.jpg b/songs/Francis_Cabrel/samedi-soir-sur-la-terre.jpg similarity index 100% rename from songs/Francis_Cabrel/samedi-soir.jpg rename to songs/Francis_Cabrel/samedi-soir-sur-la-terre.jpg diff --git a/songs/Georges_Brassens/A_l_ombre_des_maris.sg b/songs/Georges_Brassens/A_l_ombre_des_maris.sg index 0dab118d..54d829db 100644 --- a/songs/Georges_Brassens/A_l_ombre_des_maris.sg +++ b/songs/Georges_Brassens/A_l_ombre_des_maris.sg @@ -92,10 +92,10 @@ \end{verse} \begin{verse} - Et je reste et, parfois, lorsque cette pimbèche + Et je reste et, parfois, lorsque cette pimbêche S'attarde en compagnie de son nouvel amant Que la nurse est sortie, le mari à la pêche C'est moi, pauvre de moi, qui garde les enfants \end{verse} -\endsong \ No newline at end of file +\endsong diff --git a/songs/Georges_Brassens/La_mauvaise_reputation.sg b/songs/Georges_Brassens/La_mauvaise_reputation.sg index 0386da63..17fec3d2 100644 --- a/songs/Georges_Brassens/La_mauvaise_reputation.sg +++ b/songs/Georges_Brassens/La_mauvaise_reputation.sg @@ -8,8 +8,8 @@ \gtab{F#7}{2:020100} \gtab{F#}{2:022100} \gtab{G}{3:022100} - \gtab{Em6}{3:XX212X} - \gtab{F4}{X2313X} + \gtab*{Em6}{3:XX212X} + \gtab*{F4}{X2323X} \begin{verse} \[Bm]Au village sans prétention diff --git a/songs/Gerald_De_Palmas/Sur_la_route.sg b/songs/Gerald_De_Palmas/Sur_la_route.sg index 6e0bcad2..55aa0aca 100644 --- a/songs/Gerald_De_Palmas/Sur_la_route.sg +++ b/songs/Gerald_De_Palmas/Sur_la_route.sg @@ -10,7 +10,7 @@ \gtab{D}{XX0232} \gtab{G}{320003} \gtab{Bm}{2:X02210} - \gtab{F#dim}{X20101} + \gtab*{F#dim}{X20101} \begin{verse} \[A] Entre toute autre chose, j'aurais dû m'arrêter \[E]faire une \[D]pause diff --git a/songs/Gipsy_Kings/Bamboleo.sg b/songs/Gipsy_Kings/Bamboleo.sg index 0bd150c0..fb093333 100644 --- a/songs/Gipsy_Kings/Bamboleo.sg +++ b/songs/Gipsy_Kings/Bamboleo.sg @@ -10,7 +10,7 @@ \gtab{Am}{X02210} \gtab{Am7}{X02010} \gtab{D7}{XX0212} - \gtab{Gmaj7}{320002} + \gtab*{Gmaj7}{320002} \begin{verse} \[Em]Este amor llega \[B7]asi esta ma\[Em]nera diff --git a/songs/Graeme_Allwright/Petit_garcon.sg b/songs/Graeme_Allwright/Petit_garcon.sg index 1dbe0635..73278854 100644 --- a/songs/Graeme_Allwright/Petit_garcon.sg +++ b/songs/Graeme_Allwright/Petit_garcon.sg @@ -20,7 +20,7 @@ \begin{chorus} Tes yeux se \[A]voi\[A7]lent - Ecoute les \[G]étoi\[D]les + Écoute les \[G]étoi\[D]les Tout est \[Bm]calme, reposé Entends-tu les clo\[E7]chettes tintinab\[A7]uler ? \end{chorus} diff --git a/songs/Green_Day/American_idiot.sg b/songs/Green_Day/American_idiot.sg index 38bf9e49..3d3a0a38 100644 --- a/songs/Green_Day/American_idiot.sg +++ b/songs/Green_Day/American_idiot.sg @@ -4,10 +4,10 @@ [by=Green Day,cov=american-idiot,album=American idiot] \cover - \gtab{A&5}{4:022XXX} - \gtab{D&5}{4:X022XX} - \gtab{G&5}{2:022XXX} - \gtab{E&5}{6:X022XX} + \gtab*{A&5}{4:022XXX} + \gtab*{D&5}{4:X022XX} + \gtab*{G&5}{2:022XXX} + \gtab*{E&5}{6:X022XX} \begin{verse} Don't wanna be an American idiot diff --git a/songs/Green_Day/Boulevard_of_broken_dreams.sg b/songs/Green_Day/Boulevard_of_broken_dreams.sg index e4a8a490..00f3b6f2 100644 --- a/songs/Green_Day/Boulevard_of_broken_dreams.sg +++ b/songs/Green_Day/Boulevard_of_broken_dreams.sg @@ -4,12 +4,12 @@ [by=Green Day,cov=american-idiot,album=American idiot] \cover - \gtab{F#5}{2:022XXX} - \gtab{A5}{5:022XXX} - \gtab{E5}{7:X022XX} - \gtab{B5}{7:022XXX} - \gtab{D5}{5:X022XX} - \gtab{C#5}{4:X022XX} + \gtab*{F#5}{2:022XXX} + \gtab*{A5}{5:022XXX} + \gtab*{E5}{7:X022XX} + \gtab*{B5}{7:022XXX} + \gtab*{D5}{5:X022XX} + \gtab*{C#5}{4:X022XX} \begin{verse} \[F#5]{I walk} a \[A5]lonely road diff --git a/songs/HK_Saltimbanks/Passer_ma_vie.sg b/songs/HK_Saltimbanks/Passer_ma_vie.sg index 0c88ec32..1815718a 100644 --- a/songs/HK_Saltimbanks/Passer_ma_vie.sg +++ b/songs/HK_Saltimbanks/Passer_ma_vie.sg @@ -1,7 +1,7 @@ \selectlanguage{french} \songcolumns{1} \beginsong{Passer ma vie} - [by=HK \& Les Saltimbanks,cov=citoyen-du-monde,album=Citoyen du monde] + [by=HK & Les Saltimbanks,cov=citoyen-du-monde,album=Citoyen du monde] \cover \gtab{C}{X32010} @@ -29,7 +29,7 @@ Ils ont bâ\[C]ti un monde de blasés Qui \[Em]pensent que tout est cuit, qui pensent que plus rien ne peut changer Nos rêves, nos \[Am]vies, nos espoirs écrasés - Enchainés à \[G]leur chienne de pensée, esclave de leur réalité + Enchaînés à \[G]leur chienne de pensée, esclave de leur réalité \end{chorus} \begin{repeatedchords} @@ -76,4 +76,4 @@ \end{chorus} \end{repeatedchords} -\endsong \ No newline at end of file +\endsong diff --git a/songs/Herman_s_Hermits/No_milk_today.sg b/songs/Herman_s_Hermits/No_milk_today.sg index 91ec1cb7..72c849a4 100644 --- a/songs/Herman_s_Hermits/No_milk_today.sg +++ b/songs/Herman_s_Hermits/No_milk_today.sg @@ -40,7 +40,7 @@ \begin{bridge} \[A]But all that's \[E]left is a \[D]place dark and \[E]lonely - \[A]A terraced \[E]house in a \[D]meanstreet back of \[F#m]town + \[A]A terraced \[E]house in a \[D]mean street back of \[F#m]town \[A]Becomes a \[E]shrine when I \[D]think of you \[E]only \[D]Just two up two \[E]down diff --git a/songs/Howie_Day/Collide.sg b/songs/Howie_Day/Collide.sg index c520fcb6..cae1e111 100644 --- a/songs/Howie_Day/Collide.sg +++ b/songs/Howie_Day/Collide.sg @@ -4,10 +4,10 @@ [by=Howie Day,cov=stop-all-the-world-now,album=Stop all the world now] \cover - \gtab{G}{320033} - \gtab{D}{200233} - \gtab{Em}{022033} - \gtab{C}{032033} + \gtab*{G}{320033} + \gtab*{D}{200233} + \gtab*{Em}{022033} + \gtab*{C}{032033} \begin{verse} \[G+] The dawn is \[D+]breaking diff --git a/songs/Hugues_Aufray/Alouette.sg b/songs/Hugues_Aufray/Alouette.sg index a0fd314a..750cc5cb 100644 --- a/songs/Hugues_Aufray/Alouette.sg +++ b/songs/Hugues_Aufray/Alouette.sg @@ -4,7 +4,7 @@ [by=Hugues Aufray] \gtab{Em}{022000} - \gtab{Am7}{002212} + \gtab*{Am7}{002212} \gtab{G7}{320001} \gtab{D7}{XX0212} \gtab{B7}{X21202} @@ -17,7 +17,7 @@ \[Em]Alouette, alouet\[Am7]te Je \[D7]te comprends \[G7]bien Moi aussi \[Em]{j'ai} en tê\[Am]te - \[B7]Beaucoup de cha\[Em]grain + \[B7]Beaucoup de cha\[Em]grin \end{verse} \begin{verse*} diff --git a/songs/Israel_Kamakawiwo_ole/Somewhere_over_the_rainbow.sg b/songs/Israel_Kamakawiwo_ole/Somewhere_over_the_rainbow.sg index aa65d25d..f4fc45f4 100644 --- a/songs/Israel_Kamakawiwo_ole/Somewhere_over_the_rainbow.sg +++ b/songs/Israel_Kamakawiwo_ole/Somewhere_over_the_rainbow.sg @@ -6,15 +6,15 @@ \cover \capo{5} \gtab{C}{X32010} - \gtab{D}{200232} + \gtab{D}{XX0232} \gtab{Em}{022000} - \gtab{Em7}{020030} + \gtab*{Em7}{020030} \gtab{Bm7}{2:002010} \gtab{G}{320033} \begin{verse*} \musicnote{\Intro} - \[G] \[D] \[Em] \[C] \[G] \[D] \[Em7] \[C] + {\nolyrics \[G D Em C G D Em7 C]} \[G]Oo-oo \[D]Oo-oo \[C]Oo-oo \[G]Oo-oo \[C]Oo-oo \[Bm7]Oo-oo \[Em]Oo-oo \[C]Oo-oo \end{verse*} @@ -27,7 +27,7 @@ \end{verse} \begin{verse} - \[G]Someday i'll wish upon a star + \[G]Someday I'll wish upon a star \[D]Wake up where the clouds are far beh\[Em]ind \[C]me \[G]Where trouble melts like lemon drops \[D]High above the chimney tops that's \[Em]where you'll \[C]find me @@ -38,4 +38,4 @@ And the dreams that you dare to, oh why, oh why can't I \end{verse} -\endsong \ No newline at end of file +\endsong diff --git a/songs/JCFrog/La_mauvaise_ereputation.sg b/songs/JCFrog/La_mauvaise_ereputation.sg index a3b62b29..c354e82e 100644 --- a/songs/JCFrog/La_mauvaise_ereputation.sg +++ b/songs/JCFrog/La_mauvaise_ereputation.sg @@ -1,6 +1,6 @@ \selectlanguage{french} \songcolumns{2} -\beginsong{La mauvaise e-reputation} +\beginsong{La mauvaise e-réputation} [by=JCFrog,cov=pastiche-geek-circus,album=Pastiche geek circus] \cover @@ -13,9 +13,9 @@ \begin{verse} \[Bm]Sur la toile sans prétention - J'ai mau\[F#7]vaise e-reputa\[Bm]tion + J'ai mau\[F#7]vaise e-réputa\[Bm]tion Certes, j'y dis n'importe quoi - Mais n'y \[F#7]sommes-nous point là pour \[Bm]ça + Mais n'y \[F#7]sommes-nous point là pour \[Bm]ça ? \end{verse} \begin{verse*} diff --git a/songs/Jacques_Dutronc/La_fille_du_Pere_Noel.sg b/songs/Jacques_Dutronc/La_fille_du_Pere_Noel.sg index cf97a93f..b6daa2ae 100644 --- a/songs/Jacques_Dutronc/La_fille_du_Pere_Noel.sg +++ b/songs/Jacques_Dutronc/La_fille_du_Pere_Noel.sg @@ -43,7 +43,7 @@ \[D]Je prends la fille \[C]dans mes \[D]bras Elle me \[G]dit : {\og}Mais non Bal\[D]thazar \[D]Ne fais donc pas le \[C]fier à \[D]bras - Je suis tom\[G]bée là par ha\[D]zard{\fg} + Je suis tom\[G]bée là par ha\[D]sard{\fg} \end{verse} \begin{verse} @@ -68,4 +68,4 @@ \end{chorus} \end{repeatedchords} -\endsong \ No newline at end of file +\endsong diff --git a/songs/Jali/Espanola.sg b/songs/Jali/Espanola.sg index 9d41830e..0fc9da55 100644 --- a/songs/Jali/Espanola.sg +++ b/songs/Jali/Espanola.sg @@ -1,7 +1,7 @@ \selectlanguage{french} \songcolumns{3} \beginsong{Española} - [by=Jali,album=Des jours et des lunes,cov=des-jours-et-des-lunes] + [by=Jali,cov=des-jours-et-des-lunes,album=Des jours et des lunes] \cover \gtab{Am}{X02210} @@ -13,7 +13,6 @@ \utab{C}{0003} \utab{G}{0232} - \begin{verse*} \musicnote {\Intro : \nolyrics \[Am Em] \rep{3} \[C G]} \end{verse*} @@ -37,7 +36,7 @@ Par le détroit de Gibral\[Am]tar Fais gaffe en traver\[Em]sant J'ai croisé pas mal de re\[C]nards - Echoués sur les \[G]plages + Échoués sur les \[G]plages Ou bien perdus dans le brouil\[Am]lard \end{verse*} \end{repeatedchords} @@ -121,7 +120,7 @@ \end{repeatedchords} \begin{chorus} - \[Am]hey ! \[Em Am Em] + \[Am]Hey ! \[Em Am Em] \end{chorus} -\endsong \ No newline at end of file +\endsong diff --git a/songs/Jean-Jacques_Goldman/Comme_toi.sg b/songs/Jean-Jacques_Goldman/Comme_toi.sg index 064e4d09..b548255e 100644 --- a/songs/Jean-Jacques_Goldman/Comme_toi.sg +++ b/songs/Jean-Jacques_Goldman/Comme_toi.sg @@ -7,7 +7,7 @@ \gtab{Dm}{XX0231} \gtab{Gm}{3:002200} \gtab*{A7}{X02020} - \gtab{Bb}{1:X02220} + \gtab{B&}{1:X02220} \begin{verse*} \musicnote{ \Intro : \nolyrics{ | \[Dm] | \[Dm] | \[Gm] | \[Gm] | \[A7] | \[A7] | \[Dm] | \[Dm] | }} @@ -67,4 +67,4 @@ \end{verse*} \end{repeatedchords} -\endsong \ No newline at end of file +\endsong diff --git a/songs/Jean-Jacques_Goldman/Encore_un_matin.sg b/songs/Jean-Jacques_Goldman/Encore_un_matin.sg index 6c3e2f4d..32adf28b 100644 --- a/songs/Jean-Jacques_Goldman/Encore_un_matin.sg +++ b/songs/Jean-Jacques_Goldman/Encore_un_matin.sg @@ -31,7 +31,7 @@ \end{verse} \begin{chorus} - Un ma\[G]tin, ça ne s\[A]sert à \[Bm]rien + Un ma\[G]tin, ça ne s\[A]ert à \[Bm]rien Un ma\[G]tin, sans un \[A]coup de \[Bm]main Ce ma\[G]tin, c'est le \[A]mien, c'est le \[Bm]tien Un ma\[G]tin, de \[A]rien, pour en \[G]faire \[A] diff --git a/songs/Jean-Jacques_Goldman/On_ira.sg b/songs/Jean-Jacques_Goldman/On_ira.sg index 2ce4cf34..96b5e285 100644 --- a/songs/Jean-Jacques_Goldman/On_ira.sg +++ b/songs/Jean-Jacques_Goldman/On_ira.sg @@ -7,7 +7,7 @@ \gtab{A}{X02220} \gtab{E}{022100} \gtab*{D/F#}{2X0232} - \gtab{E4}{022200} + \gtab*{E4}{022200} \gtab{F#m}{2:022000} \gtab{D}{XX0232} \gtab{Bm}{2:X02210} @@ -67,4 +67,5 @@ On sera des \[F#m]milliers dans ce \[D]cas, tu verras \[A]Et même si \[E]tout est joué d'a\[D]vance, on \[E]ira, on ira \end{chorus} -\endsong \ No newline at end of file + +\endsong diff --git a/songs/Johnny_Hallyday/Le_penitencier.sg b/songs/Johnny_Hallyday/Le_penitencier.sg index 9a8e5ca6..5ddd1803 100644 --- a/songs/Johnny_Hallyday/Le_penitencier.sg +++ b/songs/Johnny_Hallyday/Le_penitencier.sg @@ -7,10 +7,9 @@ \gtab{Am}{X02210} \gtab{C}{X32010} \gtab{D}{XX0232} - \gtab{F}{XX3211} + \gtab{F}{1:022100} \gtab{E}{022100} - \begin{verse} \[Am]Les portes d\[C]{u pén}\[D]itenc\[F]ier Bient\[Am]{ôt vont} \[C]{se referm}\[E]er diff --git a/songs/Karpatt/Des_gnons_pour_des_pelles.sg b/songs/Karpatt/Des_gnons_pour_des_pelles.sg index 469b9aaa..0f08c2a4 100644 --- a/songs/Karpatt/Des_gnons_pour_des_pelles.sg +++ b/songs/Karpatt/Des_gnons_pour_des_pelles.sg @@ -3,7 +3,6 @@ \beginsong{Des gnons pour des pelles} [by=Karpatt,cov=dans-le-caillou,album=Dans le caillou] - \cover \gtab{F#}{2:022100} \gtab{Bm}{2:X02210} @@ -13,7 +12,7 @@ \begin{verse} J'\[F#]avais 14 \[Bm]ans comme mon cou\[F#]sin et le cÅ“ur en \[Bm]fièvre \[F#] - Pour ces deux jo\[Bm]lies filles qui de\[A]vinrent nos cava\[D]llières + Pour ces deux jo\[Bm]lies filles qui de\[A]vinrent nos cava\[D]lières Après un bai\[G]ser, bien vite vo\[A]lé, peu de bavar\[D]dages Furent néce\[Em]ssaires pour en voir davan\[F#]tage \end{verse} diff --git a/songs/Karpatt/Le_magicien.sg b/songs/Karpatt/Le_magicien.sg index 67235eed..3edf2cd6 100644 --- a/songs/Karpatt/Le_magicien.sg +++ b/songs/Karpatt/Le_magicien.sg @@ -3,17 +3,15 @@ \beginsong{Le magicien} [by=Karpatt,cov=dans-le-caillou,album=Dans le caillou] - \cover \gtab{Bm}{2:X02210} \gtab{D}{5:X02220} \gtab{A}{5:022100} \gtab{F#}{2:022100} - \begin{verse} \[Bm]Y'a pas d'magie dans ton cha\[D]peau - \[A]Y'a pas d'lapin aux grandes o\[Bm]reiles + \[A]Y'a pas d'lapin aux grandes o\[Bm]reilles La cape c'est \[A]pour avoir l'air \[D]beau D'abord tu \[F#]fais même pas d'é\[Bm]clairs Y'a pas d'ma\[A]gie dans ton cha\[D]peau diff --git a/songs/Karpatt/Les_ptits_cailloux.sg b/songs/Karpatt/Les_ptits_cailloux.sg index 2ea9773f..eed03abf 100644 --- a/songs/Karpatt/Les_ptits_cailloux.sg +++ b/songs/Karpatt/Les_ptits_cailloux.sg @@ -8,7 +8,6 @@ \gtab{A}{5:022100} \gtab{F}{1:022100} - \begin{verse} J'ai\[Dm]merais sortir mon chien pour croiser la voisine Quand elle ballade le \[A]sien, elle est belle j'ima\[Dm]gine @@ -21,7 +20,7 @@ \end{verse} \begin{chorus} - \[F]Elle sème des p\[A]tits cailloux + \[F]Elle sème des p'\[A]tits cailloux \[F]Tout le long du che\[A]min \[Dm]Faci\[A]le de \[F]la trou\[A]ver Y'a \[Dm]qu'à sui\[A]vre les \[Dm]merdes \[A]du \[Dm]chien @@ -60,5 +59,4 @@ Ça me soulagerait le nez ! \end{verse} - \endsong diff --git a/songs/La_Rue_Ketanou/Sao_loucas.sg b/songs/La_Rue_Ketanou/Sao_loucas.sg index b41a54b7..6d17c2df 100644 --- a/songs/La_Rue_Ketanou/Sao_loucas.sg +++ b/songs/La_Rue_Ketanou/Sao_loucas.sg @@ -32,7 +32,7 @@ \end{verse*} \begin{chorus} - \[Dm] São loucas, \[C] são louca - \[Gm]as \rep{2} + \[Dm] São loucas,\[C] são louca - \[Gm]as \rep{2} \end{chorus} \begin{repeatedchords} @@ -93,4 +93,4 @@ \end{verse*} \end{repeatedchords} -\endsong \ No newline at end of file +\endsong diff --git a/songs/La_compagnie_creole/La_machine_a_danser.sg b/songs/La_compagnie_creole/La_machine_a_danser.sg index b24232c5..86f58e0a 100644 --- a/songs/La_compagnie_creole/La_machine_a_danser.sg +++ b/songs/La_compagnie_creole/La_machine_a_danser.sg @@ -15,7 +15,7 @@ \end{chorus} \begin{verse} - On l'a trou\[G7]vée dans une boîte à swin\[Cm]ger + On l'a trou\[G7]vée dans une boîte à swin\[Cm]guer Elle fait claquer des \[G7]mains, elle fait taper des \[Cm]pieds Et toutes les \[G7]nuits, au milieu des fu\[Cm]mées On est câlin-câ\[G7]lin, on est collé-col\[Cm]lé diff --git a/songs/Laura_Veirs/Jailhouse_fire.sg b/songs/Laura_Veirs/Jailhouse_fire.sg index 09d60568..7232b793 100644 --- a/songs/Laura_Veirs/Jailhouse_fire.sg +++ b/songs/Laura_Veirs/Jailhouse_fire.sg @@ -5,8 +5,8 @@ \cover \gtab{Gm}{3:022000} - \gtab{D#}{XXX343} - \gtab{D}{XX0232} + \gtab{D#}{6:X02220} + \gtab{D}{5:X02220} \begin{verse} \[Gm]Did you see that lady there? @@ -45,4 +45,3 @@ \end{verse} \endsong - diff --git a/songs/Le_Donjon_de_Naheulbeuk/Bugger_off.sg b/songs/Le_Donjon_de_Naheulbeuk/Bugger_off.sg index 2a9a3123..2753b908 100644 --- a/songs/Le_Donjon_de_Naheulbeuk/Bugger_off.sg +++ b/songs/Le_Donjon_de_Naheulbeuk/Bugger_off.sg @@ -26,7 +26,7 @@ \begin{verse} Here's to all the waitresses who've been servin' you your beers - And put up with your knoxious breath and your stupid drunken leers + And put up with your noxious breath and your stupid drunken leers Be leavin' all your money on the table when you go Tomorrow you'll have a sorry head and nothin' else to show \end{verse} diff --git a/songs/Le_Donjon_de_Naheulbeuk/Les_souliers_de_Lady_Fae.sg b/songs/Le_Donjon_de_Naheulbeuk/Les_souliers_de_Lady_Fae.sg index 8e01af43..5874c10a 100644 --- a/songs/Le_Donjon_de_Naheulbeuk/Les_souliers_de_Lady_Fae.sg +++ b/songs/Le_Donjon_de_Naheulbeuk/Les_souliers_de_Lady_Fae.sg @@ -20,7 +20,7 @@ \begin{verse} Soufflent les vents, tonne l'orage - Jusqu'à l'horizon, les badauds envoutés + Jusqu'à l'horizon, les badauds envoûtés Nul ne sait les ignorer chanter Des vertus magiques des souliers de Lady Fae \end{verse} @@ -85,5 +85,4 @@ \image[width=5cm]{nb_wizard} - \endsong diff --git a/songs/Le_Donjon_de_Naheulbeuk/Massacrons_nous_dans_la_taverne.sg b/songs/Le_Donjon_de_Naheulbeuk/Massacrons_nous_dans_la_taverne.sg index 7097884d..67a20487 100644 --- a/songs/Le_Donjon_de_Naheulbeuk/Massacrons_nous_dans_la_taverne.sg +++ b/songs/Le_Donjon_de_Naheulbeuk/Massacrons_nous_dans_la_taverne.sg @@ -45,7 +45,7 @@ \begin{verse} S'il reste un elfe encore vivant - Atrrapez-le par les cheveux + Attrapez-le par les cheveux Coupez-lui les jambes, c'est marrant Ça court moins vite et c'est tant mieux \end{verse} diff --git a/songs/Le_Donjon_de_Naheulbeuk/Noel_en_Mordor.sg b/songs/Le_Donjon_de_Naheulbeuk/Noel_en_Mordor.sg index fc044243..825f0733 100644 --- a/songs/Le_Donjon_de_Naheulbeuk/Noel_en_Mordor.sg +++ b/songs/Le_Donjon_de_Naheulbeuk/Noel_en_Mordor.sg @@ -28,9 +28,9 @@ \end{verse} \begin{verse} - Merry, Pippin, les Hobbits affamés + Merry, Pippin, les hobbits affamés Auraient reçu un festin magnifique - Sur du Lambas, un beau foie gras poêlé + Sur du lambas, un beau foie gras poêlé Gigot de cerf aux champignons jolis \end{verse} diff --git a/songs/Les_Amis_D_Ta_Femme/A_las_barricadas.sg b/songs/Les_Amis_D_Ta_Femme/A_las_barricadas.sg index 3d51a8f5..5aeabc33 100644 --- a/songs/Les_Amis_D_Ta_Femme/A_las_barricadas.sg +++ b/songs/Les_Amis_D_Ta_Femme/A_las_barricadas.sg @@ -1,4 +1,4 @@ -\selectlanguage{french} +\selectlanguage{spanish} \songcolumns{2} \beginsong{A las barricadas} [by=Les amis d'ta femme,cov=noir-et-rouge-aussi-un-peu,album=Noir et rouge aussi un peu] @@ -36,7 +36,7 @@ \end{verse} \begin{verse*} - ¡ A las barricadas ! ¡ A las barricadas ! + ¡A las barricadas! ¡A las barricadas! Por el triunfo de la Confederación \rep{2} \end{verse*} diff --git a/songs/Les_Amis_D_Ta_Femme/Cayenne.sg b/songs/Les_Amis_D_Ta_Femme/Cayenne.sg index 19e82707..407b2c13 100644 --- a/songs/Les_Amis_D_Ta_Femme/Cayenne.sg +++ b/songs/Les_Amis_D_Ta_Femme/Cayenne.sg @@ -3,14 +3,12 @@ \beginsong{Cayenne} [by=Les amis d'ta femme,cov=font-la-difference,album=Font la différence] - \cover \gtab{Em}{022000} \gtab{B}{2:X02220} \gtab{C}{X32010} \gtab{G}{320003} - \begin{verse} Je \[Em]me souviens encore De \[B]ma première \[Em]femme @@ -27,7 +25,7 @@ \[Em]Mort aux vaches Mort aux condés Vive \[B]les enfants de Cayenne - À bas ceux d'\[G]la \[B]sure\[Em]té + À bas ceux d'\[G]la \[B]sûre\[Em]té \end{chorus} \begin{verse} @@ -86,5 +84,4 @@ Que l'on mène au tombeau \end{verse} - \endsong diff --git a/songs/Les_Cowboys_Fringants/Ces_temps_ci.sg b/songs/Les_Cowboys_Fringants/Ces_temps_ci.sg index 827ffa2b..2c88f57f 100644 --- a/songs/Les_Cowboys_Fringants/Ces_temps_ci.sg +++ b/songs/Les_Cowboys_Fringants/Ces_temps_ci.sg @@ -9,14 +9,14 @@ \gtab{F}{1:022100} \gtab{C}{X32010} \gtab{G}{320003} - \gtab*{G7}{320001} + \gtab{G7}{320001} \gtab*{G6}{320000} \utab{Am}{2000} \utab{Em}{0432} \utab{F}{2010} \utab{C}{0003} \utab{G}{0232} - \utab*{G7}{0212} + \utab{G7}{0212} \utab*{G6}{0202} \begin{verse*} @@ -136,4 +136,5 @@ Dans \[F]ce monde complète\[C]ment fucké Où \[G]{j'aurais} p't'être eu \[C]besoin d'toé \end{chorus} -\endsong \ No newline at end of file + +\endsong diff --git a/songs/Les_Cowboys_Fringants/Hannah.sg b/songs/Les_Cowboys_Fringants/Hannah.sg index 2fb1fa57..5f9c60a9 100644 --- a/songs/Les_Cowboys_Fringants/Hannah.sg +++ b/songs/Les_Cowboys_Fringants/Hannah.sg @@ -119,7 +119,7 @@ Elle \[Am]avait commen\[A]cé Un cours \[A7]en secréta\[Dm]riat Mais \[G]elle l'a vite lâché - Voyant qu'ça n'l'interessait \[E7]pas + Voyant qu'ça n'l'intéressait \[E7]pas \end{verse*} \begin{verse} diff --git a/songs/Les_Cowboys_Fringants/Histoire_de_peche.sg b/songs/Les_Cowboys_Fringants/Histoire_de_peche.sg index 472fd182..beb6f0b0 100644 --- a/songs/Les_Cowboys_Fringants/Histoire_de_peche.sg +++ b/songs/Les_Cowboys_Fringants/Histoire_de_peche.sg @@ -5,11 +5,10 @@ \cover \capo{7} - \gtab{G}{320033} - \gtab{D}{XX0233} - \gtab{C}{X32033} - \gtab{Em}{022033} - + \gtab*{G}{320033} + \gtab*{D}{XX0233} + \gtab*{C}{X32033} + \gtab*{Em}{022033} \begin{verse} \[G]Le petit pêcheur \[D]gaspé\[G]sien diff --git a/songs/Les_Cowboys_Fringants/Toune_d_automne.sg b/songs/Les_Cowboys_Fringants/Toune_d_automne.sg index 5f765967..b23c0e40 100644 --- a/songs/Les_Cowboys_Fringants/Toune_d_automne.sg +++ b/songs/Les_Cowboys_Fringants/Toune_d_automne.sg @@ -29,7 +29,7 @@ \end{verse*} \begin{chorus} - Any\[G]way j'suis con\[Em]tent que tu r'\[C]viennes + Any\[G]way, j'suis con\[Em]tent que tu r'\[C]viennes T'arrives \[D]en même temps qu'l'au\[G]tomne T'sais qu'ça \[Em]m'a fait ben d'la \[C]peine De t'voir \[D]partir ma mi\[G]gnonne \[Em]\[B7] diff --git a/songs/Les_Fatals_Picards/Chasse_peche_et_nature.sg b/songs/Les_Fatals_Picards/Chasse_peche_et_nature.sg index a5140002..4e2fb92d 100644 --- a/songs/Les_Fatals_Picards/Chasse_peche_et_nature.sg +++ b/songs/Les_Fatals_Picards/Chasse_peche_et_nature.sg @@ -3,7 +3,6 @@ \beginsong{Chasse, pêche et nature} [by=Les Fatals Picards,cov=droit-de-veto,album=Droit de veto] - \cover \gtab{Am}{5:022000} \gtab{F}{1:022100} @@ -14,7 +13,6 @@ \gtab{D}{XX0232} \gtab{A}{X02220} - \begin{verse} \[Am]{Il est} 5 heures du matin Lorsque je réveille les \[F]chiens @@ -99,7 +97,7 @@ À chaque fois \[D]c'est un \[E]vrai car\[A]nage Pêche et bi\[E]ture Nous on res\[F#m]pecte la bi\[D]ture - Chevro\[A]tine et caisse de \[E]ruhm + Chevro\[A]tine et caisse de \[E]rhum Approche donc \[D]si qu'\[E]t'es un \[A]homme \end{chorus} diff --git a/songs/Les_Fatals_Picards/Goldorak_est_mort.sg b/songs/Les_Fatals_Picards/Goldorak_est_mort.sg index 2850ce1d..f0875dda 100644 --- a/songs/Les_Fatals_Picards/Goldorak_est_mort.sg +++ b/songs/Les_Fatals_Picards/Goldorak_est_mort.sg @@ -23,7 +23,7 @@ \begin{chorus} Oh putain, Goldorak est \[G]mort - Impossible de le r'demar\[D]rer + Impossible de le r'démar\[D]rer Oh la la, Goldorak est \[Em]mort C'est sûr mon père, il va m'\[C]tuer Il faut qu'j'arrive à joindre Al\[G]kor diff --git a/songs/Les_Hurlements_d_Leo/Ici_d_ailleurs.sg b/songs/Les_Hurlements_d_Leo/Ici_d_ailleurs.sg index b1cb790d..5c29b5f6 100644 --- a/songs/Les_Hurlements_d_Leo/Ici_d_ailleurs.sg +++ b/songs/Les_Hurlements_d_Leo/Ici_d_ailleurs.sg @@ -11,7 +11,7 @@ \gtab{C}{3:X02220} \begin{verse} - I\[Bm]ci, d'ailleurs, la mi\[G]sère a pu traîner ses \[Bm]grôles + I\[Bm]ci, d'ailleurs, la mi\[G]sère a pu traîner ses \[Bm]grolles \[G]Que vole l'illusion, le bien être à l'op\[Bm]tique \[Bm]Un homme tient un carton, quelques francs pour man\[F#]ger Il n'est pas ciné\[F#]phile, je lui demande par\[Bm]don diff --git a/songs/Les_Innocents/L_autre_finistere.sg b/songs/Les_Innocents/L_autre_finistere.sg index a2cc8ecf..972aea54 100644 --- a/songs/Les_Innocents/L_autre_finistere.sg +++ b/songs/Les_Innocents/L_autre_finistere.sg @@ -41,7 +41,7 @@ \begin{verse} Bien sûr, on se figure que le monde est mal fait - Que les jours nous abiment comme de la toile de Nîmes + Que les jours nous abîment comme de la toile de Nîmes Qu'entre nous, il y a des murs qui jamais ne fissurent Que même l'air nous opprime \end{verse} diff --git a/songs/Les_Ogres_de_Barback/Comment_je_suis_devenu_voyageur.sg b/songs/Les_Ogres_de_Barback/Comment_je_suis_devenu_voyageur.sg index c475b305..c604d4ea 100644 --- a/songs/Les_Ogres_de_Barback/Comment_je_suis_devenu_voyageur.sg +++ b/songs/Les_Ogres_de_Barback/Comment_je_suis_devenu_voyageur.sg @@ -1,7 +1,7 @@ \selectlanguage{french} \songcolumns{3} \beginsong{Comment je suis devenu voyageur} - [by=Les Ogres de Barback,cov=voyageur,album=Comment je suis devenu voyageur] + [by=Les Ogres de Barback,cov=comment-je-suis-devenu-voyageur,album=Comment je suis devenu voyageur] \cover \gtab{Em}{7:X02210} @@ -96,7 +96,7 @@ \begin{verse*} La police municipale - Par arêté préfectoral + Par arrêté préfectoral Qui vient faire, oh, bougre du sort Office de garde du corps \end{verse*} diff --git a/songs/Les_Ogres_de_Barback/L_ennui_et_le_jour.sg b/songs/Les_Ogres_de_Barback/L_ennui_et_le_jour.sg index 192654db..dd9bd93f 100644 --- a/songs/Les_Ogres_de_Barback/L_ennui_et_le_jour.sg +++ b/songs/Les_Ogres_de_Barback/L_ennui_et_le_jour.sg @@ -1,7 +1,7 @@ \selectlanguage{french} \songcolumns{2} \beginsong{L'ennui et le jour} - [by=Les Ogres de Barback,cov=voyageur,album=Comment je suis devenu voyageur] + [by=Les Ogres de Barback,cov=comment-je-suis-devenu-voyageur,album=Comment je suis devenu voyageur] \cover \gtab{Em}{7:X02210} diff --git a/songs/Les_Ogres_de_Barback/voyageur.jpg b/songs/Les_Ogres_de_Barback/comment-je-suis-devenu-voyageur.jpg similarity index 100% rename from songs/Les_Ogres_de_Barback/voyageur.jpg rename to songs/Les_Ogres_de_Barback/comment-je-suis-devenu-voyageur.jpg diff --git a/songs/Les_Vieilles_Valises/Emilie.sg b/songs/Les_Vieilles_Valises/Emilie.sg index fb0c00fa..d09461b6 100644 --- a/songs/Les_Vieilles_Valises/Emilie.sg +++ b/songs/Les_Vieilles_Valises/Emilie.sg @@ -31,7 +31,7 @@ \begin{chorus} \[Dm]Émilie qu'é\[G]tait sage et \[Am]jolie \[C] - \[Dm]Et qui l'est sure\[G]ment encore aujourd'\[Am]hui + \[Dm]Et qui l'est sûre\[G]ment encore aujourd'\[Am]hui \rep{2} \end{chorus} diff --git a/songs/Les_Wriggles/Plouf.sg b/songs/Les_Wriggles/Plouf.sg index 468a13b2..55df5e0c 100644 --- a/songs/Les_Wriggles/Plouf.sg +++ b/songs/Les_Wriggles/Plouf.sg @@ -4,16 +4,16 @@ [by=Les Wriggles,cov=partent-en-live,album=Partent en live] \cover - \gtab{D7M}{5:X02120} + \gtab*{D7M}{5:X02120} \gtab{C#7}{4:X02020} - \gtab{B7}{6:101X1X} - \gtab{C#m/A}{4:1X2210} + \gtab*{B7}{6:101X1X} + \gtab*{C#m/A}{4:1X2210} \gtab{C#m}{4:X02210} \gtab{F#m}{2:022000} \gtab*{F#m*}{9:X02210} \gtab{E}{022100} - \gtab{E7}{022130} - \gtab{E6}{022120} + \gtab*{E7}{022130} + \gtab*{E6}{022120} \begin{verse} Le \[D7M]{petit Jordy} a \[C#7]{très bien} compris diff --git a/songs/Linkin_Park/Numb.sg b/songs/Linkin_Park/Numb.sg index 64002ef8..2edc11b9 100644 --- a/songs/Linkin_Park/Numb.sg +++ b/songs/Linkin_Park/Numb.sg @@ -9,7 +9,7 @@ \gtab{C}{X32010} \gtab{G}{320003} \gtab{D}{XX0232} - \gtab{Bm}{2:X02220} + \gtab{B}{2:X02220} \begin{verse} \[Em]I'm tired of being what you \[C]want me to be diff --git a/songs/Louis_Chedid/Tout_le_monde_se_presse.sg b/songs/Louis_Chedid/Tout_le_monde_se_presse.sg index 97e4f8e7..c7dac41a 100644 --- a/songs/Louis_Chedid/Tout_le_monde_se_presse.sg +++ b/songs/Louis_Chedid/Tout_le_monde_se_presse.sg @@ -1,28 +1,26 @@ \selectlanguage{french} \songcolumns{2} \beginsong{Tout le monde se presse} - [by=Louis Chedid,album=Le soldat rose,cov=le-soldat-rose] + [by=Louis Chedid,cov=le-soldat-rose,album=Le soldat rose] \cover - \gtab{C7/9}{X35333} - \gtab{C7/9*} {X32333} - \gtab{F}{133211} - \gtab{F7}{131211} - \gtab{F7/9}{X87888} - \gtab{D7/9}{X54555} - \gtab{G}{355433} + \gtab*{C7/9}{3:X02000} + \gtab*{C7/9}{3:X2123X} + \gtab{F}{1:022100} + \gtab{F7}{1:020100} + \gtab*{F7/9}{8:X02000} + \gtab*{D7/9}{5:X2123X} + \gtab{G}{3:022100} \gtab{C7}{X32310} - \gtab{C#dim}{XX2323} - \gtab{Gm7}{XX3333} - \gtab{G7/5#}{XX3443} - \gtab{C#7/9}{X43444} - \gtab{Gdim}{XX2323} - \gtab{B&dim}{3:XX2323} - \gtab{C#dim}{6:XX2323} - \gtab{Edim}{9:XX2323} - \gtab{Gdim*}{12:XX2323} - - + \gtab*{C#dim}{XX2323} + \gtab*{Gm7}{XX3333} + \gtab*{G7/5#}{XX3443} + \gtab*{C#7/9}{4:X2123X} + \gtab*{Gdim}{XX2323} + \gtab*{B&dim}{3:XX2323} + \gtab*{C#dim}{6:XX2323} + \gtab*{Edim}{9:XX2323} + \gtab*{Gdim*}{12:XX2323} \begin{chorus} \[C7/9]Tout l'monde se presse, tout l'monde se presse @@ -66,7 +64,7 @@ \[C7/9]Tout l'monde se presse, tout l'monde se presse \[F]Attention au départ \[C#7/9]Tout l'monde se \[C7/9*]presse, tout l'monde se presse \rep{3} - \[Gdim] \[B&dim] \[C#dim] \[Edim] \[Gdim*] + {\nolyrics \[Gdim B&dim C#dim Edim Gdim*]} \echo{Zorro est arri{\dots}} \end{chorus} @@ -97,4 +95,4 @@ % |----------------------|----- %_____________________________________________________________________________ -\endsong \ No newline at end of file +\endsong diff --git a/songs/Manu_Chao/Bienvenida_a_Tijuana.sg b/songs/Manu_Chao/Bienvenida_a_Tijuana.sg index f0fa4628..edf22014 100644 --- a/songs/Manu_Chao/Bienvenida_a_Tijuana.sg +++ b/songs/Manu_Chao/Bienvenida_a_Tijuana.sg @@ -3,14 +3,12 @@ \beginsong{Bienvenida a Tijuana} [by=Manu Chao,cov=radio-bemba,album=Radio Bemba] - \cover \gtab{C}{X32010} \gtab{Am}{X02210} \gtab{F}{1:022100} \gtab{G}{320003} - \begin{verse} Bienvenida a Ti\[C]juana Bienvenida mi a\[Am]mor @@ -22,14 +20,14 @@ Bienvenida mamacita Ay mi ruta Babylon Bienvenida a la cena - Sopita de camaron + Sopita de camarón \end{verse} \begin{chorus} Calavera no llora Serenata de amor Calavera no llora - No tiene corazon + No tiene corazón \end{chorus} \begin{verse} @@ -42,7 +40,7 @@ \begin{verse} I wanna go to San Diego I wanna go y no puedo - Bienvenida a la juana + Bienvenida a la Juana Bienvenida a Tijuana \end{verse} diff --git a/songs/Manu_Chao/Clandestino.sg b/songs/Manu_Chao/Clandestino.sg index 750d56c9..9f344918 100644 --- a/songs/Manu_Chao/Clandestino.sg +++ b/songs/Manu_Chao/Clandestino.sg @@ -3,19 +3,17 @@ \beginsong{Clandestino} [by=Manu Chao,cov=clandestino,album=Clandestino] - \cover \gtab{F#m}{2:022000} \gtab{Bm}{2:X02210} \gtab{C#7}{X3231X} - \begin{chorus} So\[F#m]{lo voy} con mi pena Sola va mi con\[Bm]dena Correr es mi des\[C#7]tino Para burlar la \[F#m]ley - Perdido en el corazon + Perdido en el corazón De la grande Babylon Me dicen: ``El clandestino'' Por no llevar papel @@ -37,7 +35,7 @@ Sola va mi condena Correr es mi destino Para burlar la ley - Perdido en el corazon + Perdido en el corazón De la grande Babylon Me dicen: ``El clandestino'' Yo soy el quiebra ley @@ -47,8 +45,7 @@ Mano \[Bm]negra clandes\[F#m]tina Peru\[Bm]ano clandes\[F#m]tino Afri\[Bm]cano clandes\[F#m]tino - Mari\[C#7]juana ile\[F#m]gal + Mari\[C#7]huana ile\[F#m]gal \end{verse} - \endsong diff --git a/songs/Manu_Chao/Desaparecido.sg b/songs/Manu_Chao/Desaparecido.sg index e390a13d..7285df95 100644 --- a/songs/Manu_Chao/Desaparecido.sg +++ b/songs/Manu_Chao/Desaparecido.sg @@ -3,13 +3,11 @@ \beginsong{Desaparecido} [by=Manu Chao,cov=clandestino,album=Clandestino] - \cover \gtab{E}{022100} \gtab{Am}{X02210} \gtab{Dm}{XX0231} - \begin{chorus} Me llaman el desapare\[E]cido Cuando llega ya se ha i\[Am]do @@ -20,7 +18,7 @@ \begin{verse} Cuando me buscan nunca es\[Dm]toy Cuando me encuentran yo no \[Am]soy - El que esta enfrete porque \[E]ya + El que esta enfrente porque \[E]ya Me fui corriendo mas \[Am]allá \end{verse} diff --git a/songs/Matmatah/L_apologie.sg b/songs/Matmatah/L_apologie.sg index e22e49e3..45c29148 100644 --- a/songs/Matmatah/L_apologie.sg +++ b/songs/Matmatah/L_apologie.sg @@ -43,7 +43,7 @@ Si t'as \[E&]vraiment le ca\[Fm]fard \[Fm]À choisir y'a pas \[C#]photo Moi je choi\[E&]sis le maro\[Fm]co - \[Am]Les alcools ont leurs sou\[C#]lards + \[Am]Les alcools ont leurs soû\[C#]lards Le ca\[E&]na, c'est le pa\[Fm]nard \[Fm]{Y'en} a qui le mysti\[C#]fient Moi j'en fais \[E&]son apolo\[Fm]gie diff --git a/songs/Matticus/Le_p_tit_gars.sg b/songs/Matticus/Le_p_tit_gars.sg index 1fdab005..f8eb0658 100644 --- a/songs/Matticus/Le_p_tit_gars.sg +++ b/songs/Matticus/Le_p_tit_gars.sg @@ -32,7 +32,7 @@ \begin{verse} C'est un petit gars gentil, il a le sourire, il est poli Accoudé au comptoir, il ne fréquente que ce bar - Parfois, il lache son verre pour se trouver une cavalière + Parfois, il lâche son verre pour se trouver une cavalière Mais elle lui refuse en lui marmonnant des excuses \end{verse} @@ -65,4 +65,3 @@ \end{chorus} \endsong - diff --git a/songs/Maxime_Le_Forestier/Education_Sentimentale.sg b/songs/Maxime_Le_Forestier/Education_Sentimentale.sg index f57430d2..3191aab4 100644 --- a/songs/Maxime_Le_Forestier/Education_Sentimentale.sg +++ b/songs/Maxime_Le_Forestier/Education_Sentimentale.sg @@ -25,7 +25,7 @@ \[F]Pour toi ma princesse, \[G7]{j'en ferai} des tresses Et dans tes che\[C]veux \[E]Ces serments ma belle \[Am]{te rendront} cruelle - \[Dm]Pour tes a-\[G7]amou\[C]reux \[E Am G F G C] + \[Dm]Pour tes \[G7]amou\[C]reux \[E Am G F G C] \end{verse*} \begin{repeatedchords} @@ -33,14 +33,14 @@ \[C]Demain à l'aurore, \[Am]nous irons encore \[Dm]Glaner dans les champs\[G7] \[C]Cueillir des promesses, \[Am]{des fleurs} de tendresse - \[Dm]{Et de} sen-\[G7]enti\[C]ments + \[Dm]{Et de} s\[G7]enti\[C]ments \end{verse} \begin{verse*} \[F]Et sur la colline, \[G7]dans les sauvagines Tu te couche\[C]ras \[E]Dans mes bras ma brune, \[Am]éclairée de lune - \[Dm]{Tu te} do-\[G7]onne\[C]ras \[E Am G F G C] + \[Dm]{Tu te} d\[G7]onne\[C]ras \[E Am G F G C] \end{verse*} \begin{verse} @@ -54,7 +54,7 @@ \[F]Ne dis rien ma brune, \[G7]{pas même} à la lune Et moi dans mon \[C]coin \[E]J'irai solitaire, \[Am]{je saurai} me taire - \[Dm]{Je ne} di-\[G7]irai \[C]rien \[E Am G F G C] + \[Dm]{Je ne} d\[G7]irai \[C]rien \[E Am G F G C] \end{verse*} \end{repeatedchords} diff --git a/songs/Maxime_Le_Forestier/L_auto_stop.sg b/songs/Maxime_Le_Forestier/L_auto_stop.sg index 3c23146f..4832b680 100644 --- a/songs/Maxime_Le_Forestier/L_auto_stop.sg +++ b/songs/Maxime_Le_Forestier/L_auto_stop.sg @@ -58,7 +58,7 @@ \begin{verse*} Avec un verre de vin Chaque fois que quelqu'un s'arrête - C'était pas la féte + C'était pas la fête Mais enfin, on était bien \end{verse*} diff --git a/songs/Maxime_Le_Forestier/Mon_frere.sg b/songs/Maxime_Le_Forestier/Mon_frere.sg index b6814591..92bc51b7 100644 --- a/songs/Maxime_Le_Forestier/Mon_frere.sg +++ b/songs/Maxime_Le_Forestier/Mon_frere.sg @@ -5,12 +5,12 @@ \cover \gtab{Dm}{X32010} - \gtab{Gm}{X02210} + \gtab{Gm}{3:022000} \gtab{C}{XX0231} - \gtab{F}{320001} - \gtab{A}{1:022100} - \gtab{D}{022100} - \gtab{Bm}{320003} + \gtab{F}{1:022100} + \gtab{A}{X02220} + \gtab{D}{XX0232} + \gtab{Bm}{2:X02210} \gtab{G}{320003} \begin{verse} diff --git a/songs/Maxime_Le_Forestier/Parachutiste.sg b/songs/Maxime_Le_Forestier/Parachutiste.sg index 0836d6c5..16de4b2f 100644 --- a/songs/Maxime_Le_Forestier/Parachutiste.sg +++ b/songs/Maxime_Le_Forestier/Parachutiste.sg @@ -6,7 +6,7 @@ \cover \gtab{G}{320003} \gtab{D}{XX0232} - \gtab{Em}{022100} + \gtab{Em}{022000} \gtab{D7}{XX0212} \gtab{C}{X32010} \gtab*{D4}{XX0233} diff --git a/songs/Maxime_Le_Forestier/Passer_ma_route.sg b/songs/Maxime_Le_Forestier/Passer_ma_route.sg index 934e57bc..2d58ac4c 100644 --- a/songs/Maxime_Le_Forestier/Passer_ma_route.sg +++ b/songs/Maxime_Le_Forestier/Passer_ma_route.sg @@ -5,7 +5,7 @@ \cover \gtab{D}{XX0232} - \gtab{D7M}{XX0222} + \gtab*{D7M}{XX0222} \gtab{Em}{022000} \gtab{F#m}{2:022000} \gtab{A7}{X02020} @@ -41,4 +41,4 @@ \end{verse} \end{repeatedchords} -\endsong \ No newline at end of file +\endsong diff --git a/songs/Mes_souliers_sont_rouges/Le_cycle_du_vin.sg b/songs/Mes_souliers_sont_rouges/Le_cycle_du_vin.sg index 65f36003..6a3b1731 100644 --- a/songs/Mes_souliers_sont_rouges/Le_cycle_du_vin.sg +++ b/songs/Mes_souliers_sont_rouges/Le_cycle_du_vin.sg @@ -9,13 +9,12 @@ \gtab{F}{1:022100} \gtab{E}{022100} \gtab{C}{332010} - \gtab{A7}{002223} + \gtab{A7}{X02223} \gtab{A}{X02220} \gtab{E}{022100} \gtab{B}{2:X02220} \gtab{F#}{2:022100} - \begin{verse} \[Am]La terre en \[Dm]vigne, la voi\[F]là la jolie \[Am]vi\[E]gne \rep{2} Vigni vi\[Am]gnons, vignons le \[C]vin @@ -92,4 +91,3 @@ \end{chorus} \endsong - diff --git a/songs/Michel_Fugain/Forteresse.sg b/songs/Michel_Fugain/Forteresse.sg index cd0f8b40..4bc55a0a 100644 --- a/songs/Michel_Fugain/Forteresse.sg +++ b/songs/Michel_Fugain/Forteresse.sg @@ -6,12 +6,12 @@ \cover \capo{3} \gtab{Am}{X02210} - \gtab{E7}{X22130} + \gtab*{E7}{X22130} \gtab{Dm}{XX0231} - \gtab{Fmaj7}{XX3210} + \gtab*{Fmaj7}{XX3210} \gtab{A}{X02220} - \gtab{E&dim}{XX1212} - \gtab{Am/C}{X32210} + \gtab*{E&dim}{XX1212} + \gtab*{Am/C}{X32210} \begin{verse} \musicnote{\Intro : \nolyrics \[Am E7 Am E7]} diff --git a/songs/Michel_Fugain/Je_n_aurai_pas_le_temps.sg b/songs/Michel_Fugain/Je_n_aurai_pas_le_temps.sg index 87482ca5..329f5ec5 100644 --- a/songs/Michel_Fugain/Je_n_aurai_pas_le_temps.sg +++ b/songs/Michel_Fugain/Je_n_aurai_pas_le_temps.sg @@ -1,10 +1,10 @@ \selectlanguage{french} \songcolumns{2} \beginsong{Je n'aurai pas le temps} - [by=Michel Fugain,cov=live,album=live] + [by=Michel Fugain,cov=live,album=Live] \cover - \gtab{C}{320003} + \gtab{C}{X32010} \gtab{G}{320003} \gtab{F}{1:022100} \gtab{E}{X02210} @@ -60,5 +60,4 @@ Pas le temps \end{chorus} - \endsong diff --git a/songs/Michel_Fugain/Les_Acadiens.sg b/songs/Michel_Fugain/Les_Acadiens.sg index 8e9fc564..eb51e759 100644 --- a/songs/Michel_Fugain/Les_Acadiens.sg +++ b/songs/Michel_Fugain/Les_Acadiens.sg @@ -1,13 +1,13 @@ \selectlanguage{french} \songcolumns{2} \beginsong{Les Acadiens} - [by=Michel Fugain,cov=live,album=live] + [by=Michel Fugain,cov=live,album=Live] \cover \gtab{G}{320003} \gtab{D}{XX0232} \gtab{D7}{XX0212} - \gtab{C7}{1:X2120X} + \gtab{C7}{X32310} \gtab{F#}{2:022100} \gtab{F}{1:022100} \gtab{E}{022100} From 9ef0807038754753616fe0dd6bd1d628da862e87 Mon Sep 17 00:00:00 2001 From: yoyoma Date: Thu, 31 May 2012 18:23:21 +0200 Subject: [PATCH 14/18] Add song: Razorlight - America --- songs/Razorlight/America.sg | 98 ++++++++++++++++++++++++++++++++ songs/Razorlight/Razorlight.jpg | Bin 0 -> 4312 bytes 2 files changed, 98 insertions(+) create mode 100644 songs/Razorlight/America.sg create mode 100644 songs/Razorlight/Razorlight.jpg diff --git a/songs/Razorlight/America.sg b/songs/Razorlight/America.sg new file mode 100644 index 00000000..f11ace29 --- /dev/null +++ b/songs/Razorlight/America.sg @@ -0,0 +1,98 @@ +\selectlanguage{english} +\songcolumns{2} +\beginsong{America}[by=Razorlight,cov=Razorlight,album=Razorlight] + + \cover + \gtab{A}{X02220} + \gtab{B}{2:x03330} + \gtab{E}{022100} + \gtab{D}{xx0232} + \gtab{G}{320033} + + \begin{verse} + \[A]What a \[B]drag it is + The \[E]shape i'm \[A]in + \[A]Well I \[B]go out somewhere + Then \[E]I come home \[A]again + \end{verse} + + \begin{verse*} + \[A]I light a \[B]cigarette + 'Cause \[E]I can't get no \[A]sleep + \[A]Theres nothing on the TV \[B]nothing on the radio + That \[E]means that much to \[A]me + \end{verse*} + + \beginchorus + \[A]All my \[B]life \[E] + Watching \[A]America + \[A]All my \[B]life \[E] + There's panic in \[A]America + \[A]Oh Oh \[B]Oh, Oh\[E] + There's trouble in \[A]America + \[A]Oh Oh \[B]Oh, Oh\[E] + \endchorus + + \begin{repeatedchords} + \begin{verse} + \[A]Yesterday \[B]was easy + Happiness\[E] came and \[A]went + \[A]I got the \[B]movie script + But I \[E]don't know what it\[A] meant + \end{verse} + + \begin{verse*} + \[A]I light a \[B]cigarette + 'Cause \[E]I can't get no \[A]sleep + \[A]Theres nothing on the TV \[B]nothing on the radio + That \[E]means that much to \[A]me + \[A]Theres nothing on the TV \[B]nothing on the radio + That I \[E]can believe \[A]in + \end{verse*} + + \beginchorus + \[A]All my \[B]life \[E] + Watching \[A]America + \[A]All my \[B]life \[E] + There's panic in \[A]America + \[A]Oh Oh \[B]Oh, Oh\[E] + There's trouble in \[A]America + \[A]Oh Oh \[B]Oh, Oh\[E] + There's panic in \[A]America + \[A]Oh Oh \[B]Oh, Oh\[E] + \endchorus + \end{repeatedchords} + + \begin{verse} + \[A]Yester\[B]day was easy + \[D]Yes I got the \[G]news + \[A]When you \[B]get it straight, but \[D]stand up you just can't \[G]lose + \[A]Give you my \[B]confidence, \[D]all my faith in \[G]life + \[A]Dont stand me up + \[B]Don't let me down + \[E]I need you \[A]tonight + \[A]To hold \[B]me,\[E] say you'll \[A]be here + \[A]To hold \[B]me,\[E] say you'll \[A]be here + \[A]To hold \[B]me,\[E] say you'll \[A]be here + \[A]To hold..\[B] \[E] + \end{verse} + + \begin{repeatedchords} + \beginchorus + \[A]All my \[B]life \[E] + Watching \[A]America + \[A]All my \[B]life \[E] + There's panic in \[A]America + \[A]Oh Oh \[B]Oh, Oh\[E] + There's trouble in \[A]America + \[A]Oh Oh \[B]Oh, Oh\[E] + There's panic in \[A]America + \[A]Oh Oh \[B]Oh, Oh\[E] + \endchorus + \end{repeatedchords} + + \begin{verse} + \[A]Tell me how does it \[B]feel\[E] \[A]\rep{4} + \end{verse} + +\endsong \ No newline at end of file diff --git a/songs/Razorlight/Razorlight.jpg b/songs/Razorlight/Razorlight.jpg new file mode 100644 index 0000000000000000000000000000000000000000..b957026ee5c1593cc906fa138de438d2571fdc73 GIT binary patch literal 4312 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 S!Gk5v;|XA`F4zo0oA?hr+Z-1F literal 0 HcmV?d00001 From 360a65bcdd3192f75b7f37847577d8ada73c6e20 Mon Sep 17 00:00:00 2001 From: Romain Goffe Date: Thu, 31 May 2012 18:36:36 +0200 Subject: [PATCH 15/18] Corrections: Razorlight - America --- songs/Razorlight/America.sg | 65 +++++++++++-------------------------- 1 file changed, 19 insertions(+), 46 deletions(-) diff --git a/songs/Razorlight/America.sg b/songs/Razorlight/America.sg index f11ace29..8ded3340 100644 --- a/songs/Razorlight/America.sg +++ b/songs/Razorlight/America.sg @@ -1,12 +1,13 @@ \selectlanguage{english} \songcolumns{2} -\beginsong{America}[by=Razorlight,cov=Razorlight,album=Razorlight] +\beginsong{America} + [by=Razorlight,cov=Razorlight,album=Razorlight] \cover \gtab{A}{X02220} - \gtab{B}{2:x03330} + \gtab{B}{2:X03330} \gtab{E}{022100} - \gtab{D}{xx0232} + \gtab{D}{XX0232} \gtab{G}{320033} \begin{verse} @@ -19,24 +20,24 @@ \begin{verse*} \[A]I light a \[B]cigarette 'Cause \[E]I can't get no \[A]sleep - \[A]Theres nothing on the TV \[B]nothing on the radio + \[A]There's nothing on the TV, \[B]nothing on the radio That \[E]means that much to \[A]me \end{verse*} - \beginchorus - \[A]All my \[B]life \[E] + \begin{chorus} + \[A]All my \[B]life \[E] Watching \[A]America \[A]All my \[B]life \[E] There's panic in \[A]America - \[A]Oh Oh \[B]Oh, Oh\[E] + \[A]Oh, oh, \[B]oh, oh\[E] There's trouble in \[A]America - \[A]Oh Oh \[B]Oh, Oh\[E] - \endchorus + \[A]Oh, oh, \[B]oh, oh\[E] + \end{chorus} \begin{repeatedchords} \begin{verse} \[A]Yesterday \[B]was easy - Happiness\[E] came and \[A]went + Happiness \[E] came and \[A]went \[A]I got the \[B]movie script But I \[E]don't know what it\[A] meant \end{verse} @@ -49,21 +50,9 @@ \[A]Theres nothing on the TV \[B]nothing on the radio That I \[E]can believe \[A]in \end{verse*} - - \beginchorus - \[A]All my \[B]life \[E] - Watching \[A]America - \[A]All my \[B]life \[E] - There's panic in \[A]America - \[A]Oh Oh \[B]Oh, Oh\[E] - There's trouble in \[A]America - \[A]Oh Oh \[B]Oh, Oh\[E] - There's panic in \[A]America - \[A]Oh Oh \[B]Oh, Oh\[E] - \endchorus \end{repeatedchords} - \begin{verse} + \begin{bridge} \[A]Yester\[B]day was easy \[D]Yes I got the \[G]news \[A]When you \[B]get it straight, but \[D]stand up you just can't \[G]lose @@ -71,28 +60,12 @@ \[A]Dont stand me up \[B]Don't let me down \[E]I need you \[A]tonight - \[A]To hold \[B]me,\[E] say you'll \[A]be here - \[A]To hold \[B]me,\[E] say you'll \[A]be here - \[A]To hold \[B]me,\[E] say you'll \[A]be here - \[A]To hold..\[B] \[E] - \end{verse} + \[A]To hold \[B]me,\[E] say you'll \[A]be here \rep{3} + \[A]To hold \dots\[B] \[E] + \end{bridge} - \begin{repeatedchords} - \beginchorus - \[A]All my \[B]life \[E] - Watching \[A]America - \[A]All my \[B]life \[E] - There's panic in \[A]America - \[A]Oh Oh \[B]Oh, Oh\[E] - There's trouble in \[A]America - \[A]Oh Oh \[B]Oh, Oh\[E] - There's panic in \[A]America - \[A]Oh Oh \[B]Oh, Oh\[E] - \endchorus - \end{repeatedchords} - - \begin{verse} - \[A]Tell me how does it \[B]feel\[E] \[A]\rep{4} - \end{verse} + \begin{verse*} + \[A]Tell me how does it \[B]feel\[E] \[A] \rep{4} + \end{verse*} -\endsong \ No newline at end of file +\endsong From d51db63ae5c80c612396b922ca175b7b8ca10a88 Mon Sep 17 00:00:00 2001 From: Romain Goffe Date: Sat, 2 Jun 2012 02:02:13 +0200 Subject: [PATCH 16/18] corrections --- songs/HK_Saltimbanks/Citoyen_du_monde.sg | 2 +- songs/HK_Saltimbanks/On_lache_rien.sg | 2 +- songs/HK_Saltimbanks/Passer_ma_vie.sg | 2 +- songs/Nirvana/Dumb.sg | 2 +- songs/Noir_Desir/Charlie.sg | 4 ++-- songs/Noir_Desir/L_homme_presse.sg | 4 ++-- songs/Noir_Desir/Lazy.sg | 6 ++---- songs/Noir_Desir/Toujours_etre_ailleurs.sg | 7 +++---- songs/Oasis/Im_outta_time.sg | 2 +- songs/Oasis/Wonderwall.sg | 12 ++++++------ songs/Oldelaf_et_Monsieur_D/Courseulles_sur_Mer.sg | 2 +- songs/Oldelaf_et_Monsieur_D/Nathalie.sg | 4 +++- songs/Paco_Ibanez/A_galopar.sg | 3 +-- songs/Patrick_Coutin/J_aime_regarder_les_filles.sg | 5 +++-- songs/Pep_s/Liberta.sg | 13 +++++++------ songs/Pierre_Perret/Bernard_Pivot.sg | 2 +- songs/Pierre_Perret/Mon_ptit_loup.sg | 3 +-- songs/Red_Hot_Chili_Peppers/Dani_California.sg | 2 +- songs/Red_Hot_Chili_Peppers/Under_the_bridge.sg | 8 ++++---- songs/Renaud/Amoureux_de_paname.sg | 3 +-- songs/Renaud/Docteur_Renaud_Mister_Renard.sg | 9 ++++----- songs/Renaud/It_is_not_because_you_are.sg | 6 +++--- songs/Renaud/La_ballade_nord_irlandaise.sg | 4 ++-- songs/Renaud/Ma_gonzesse.sg | 10 +++++----- songs/Renaud/Manatthan-Kaboul.sg | 8 ++++---- songs/Renaud/Marche_a_l_ombre.sg | 2 +- songs/Renaud/Mort_les_enfants.sg | 6 +++--- songs/Ritchie_Valens/La_bamba.sg | 12 +++++------- songs/Roch_Voisine/Helene.sg | 5 +++-- songs/Rose/La_liste_de_Rose.sg | 10 ++-------- songs/Sheepbox/Devil_s_way.sg | 6 +++--- songs/Simon_Garfunkel/Feeling_groovy.sg | 2 +- songs/Simon_Garfunkel/Kathy_s_song.sg | 2 +- .../The_only_living_boy_in_New_York.sg | 2 +- songs/Sixpence_None_the_Richer/Kiss_me.sg | 13 ++++++------- songs/Soan/Putain_de_ballerine.sg | 5 ++--- .../I_am_a_man_of_constant_sorrow.sg | 6 +++--- songs/Soldat_Louis/C_est_un_pays.sg | 4 ++-- songs/Sting/Russians.sg | 2 +- songs/Telephone/New_York_avec_toi.sg | 4 ++-- songs/Terra_Naomi/Say_It_s_Possible.sg | 8 ++++---- songs/The_Beatles/Twist_and_shout.sg | 2 +- songs/The_Calling/Wherever_you_will_go.sg | 2 +- songs/The_Doors/Light_my_fire.sg | 2 +- songs/The_Fray/How_to_save_a_life.sg | 2 +- songs/The_Moldy_Peaches/Anyone_Else_But_You.sg | 2 +- songs/The_Nightwatchman/Let_freedom_ring.sg | 4 ++-- songs/The_Pogues/The_Irish_Rover.sg | 2 +- .../You_cant_always_get_what_you_want.sg | 3 +-- songs/Thomas_Fersen/Bambi.sg | 11 ++++++----- songs/Thomas_Fersen/Croque.sg | 4 ++-- songs/Thomas_Fersen/Deux_pieds.sg | 2 +- songs/Thomas_Fersen/Diane_de_Poitiers.sg | 3 +-- songs/Thomas_Fersen/L_histoire_d_une_heure.sg | 5 +++-- songs/Thomas_Fersen/Les_malheurs_du_lion.sg | 11 ++++++----- songs/Thomas_Fersen/Pegase.sg | 6 +++--- songs/Thomas_Fersen/Zaza.sg | 4 ++-- songs/Tit_Patapons/Marchand_de_couleurs.sg | 6 +++--- songs/Tournee_Generale/Avancer_mes_grolles.sg | 2 +- songs/Tracy_Chapman/Talkin_about_the_revolution.sg | 10 +++++----- songs/Traditionnel/L_homme_de_cromagnon.sg | 10 +++++----- songs/Traditionnel/La_cucaracha.sg | 2 +- songs/Tryo/Le_petit_chose.sg | 4 +--- songs/Vincent_Malone/L_escargot_malheureux.sg | 4 +--- songs/Yodelice/Sunday_with_a_flu.sg | 2 +- songs/Yuki_Kajiura/Vanity.sg | 2 +- 66 files changed, 153 insertions(+), 168 deletions(-) diff --git a/songs/HK_Saltimbanks/Citoyen_du_monde.sg b/songs/HK_Saltimbanks/Citoyen_du_monde.sg index 55b5dab4..f99e2594 100644 --- a/songs/HK_Saltimbanks/Citoyen_du_monde.sg +++ b/songs/HK_Saltimbanks/Citoyen_du_monde.sg @@ -91,4 +91,4 @@ \end{verse*} \end{repeatedchords} -\endsong \ No newline at end of file +\endsong diff --git a/songs/HK_Saltimbanks/On_lache_rien.sg b/songs/HK_Saltimbanks/On_lache_rien.sg index c4739ae2..ada15429 100644 --- a/songs/HK_Saltimbanks/On_lache_rien.sg +++ b/songs/HK_Saltimbanks/On_lache_rien.sg @@ -121,4 +121,4 @@ \textnote{\Chorus} \end{repeatedchords} -\endsong \ No newline at end of file +\endsong diff --git a/songs/HK_Saltimbanks/Passer_ma_vie.sg b/songs/HK_Saltimbanks/Passer_ma_vie.sg index 1815718a..77303b81 100644 --- a/songs/HK_Saltimbanks/Passer_ma_vie.sg +++ b/songs/HK_Saltimbanks/Passer_ma_vie.sg @@ -1,7 +1,7 @@ \selectlanguage{french} \songcolumns{1} \beginsong{Passer ma vie} - [by=HK & Les Saltimbanks,cov=citoyen-du-monde,album=Citoyen du monde] + [by=HK \& Les Saltimbanks,cov=citoyen-du-monde,album=Citoyen du monde] \cover \gtab{C}{X32010} diff --git a/songs/Nirvana/Dumb.sg b/songs/Nirvana/Dumb.sg index 0b596e73..209c3dd6 100644 --- a/songs/Nirvana/Dumb.sg +++ b/songs/Nirvana/Dumb.sg @@ -70,7 +70,7 @@ \end{verse*} \begin{verse*} - \musicnote{\Verse{} \& \Chorus 1} + \musicnote{\Verse \& \Chorus 1} \end{verse*} \begin{verse} diff --git a/songs/Noir_Desir/Charlie.sg b/songs/Noir_Desir/Charlie.sg index 09abf2a2..7e433b23 100644 --- a/songs/Noir_Desir/Charlie.sg +++ b/songs/Noir_Desir/Charlie.sg @@ -4,7 +4,7 @@ [by=Noir Désir,cov=du-ciment-sous-les-plaines,album=Du ciment sous les plaines] \cover - \gtab{F#m}{1:022000} + \gtab{F#m}{2:022000} \gtab{E}{022100} \begin{verse} @@ -46,7 +46,7 @@ \begin{repeatedchords} \begin{chorus} Mainte\[F#m]nant dans l'eau sale, elle traîne \[E]sa bouche pâle - Au fond du cani\[F#m]vau \[E] + Au fond du cani\[F#m]veau \[E] Où elle cou\[F#m]le ? \[E] \rep{2} Où elle cou\[F#m]le, la rivière \[E]de sang chaud \end{chorus} diff --git a/songs/Noir_Desir/L_homme_presse.sg b/songs/Noir_Desir/L_homme_presse.sg index a7d5cd98..49af8d9c 100644 --- a/songs/Noir_Desir/L_homme_presse.sg +++ b/songs/Noir_Desir/L_homme_presse.sg @@ -4,8 +4,8 @@ [by=Noir Désir,cov=666-667-club,album=666.667 Club~] \cover - \gtab{Am}{X022XX} - \gtab{D}{X002XX} + \gtab*{Am}{X022XX} + \gtab*{D}{X002XX} \gtab{G}{320003} \gtab{F}{1:022100} \gtab{C}{X32010} diff --git a/songs/Noir_Desir/Lazy.sg b/songs/Noir_Desir/Lazy.sg index 517b565a..4f165938 100644 --- a/songs/Noir_Desir/Lazy.sg +++ b/songs/Noir_Desir/Lazy.sg @@ -1,7 +1,7 @@ \selectlanguage{english} \songcolumns{2} \beginsong{Lazy} - [by=Noir Désir,cov=666-667-club,album=666.667 Clu&] + [by=Noir Désir,cov=666-667-club,album=666.667 Club~] \cover \gtab{Am}{X02210} @@ -34,9 +34,7 @@ I can deal with what's in your mind \[D] Anyway, I'm tired and I feel lazy \[Am] \end{verse} - \end{repeatedchords} - \begin{repeatedchords} \begin{verse} \[Am]{You know}, we're both lost in maze You're miserable, I'm so dazed \[D] @@ -46,4 +44,4 @@ \musicnote{\Chorus} -\endsong \ No newline at end of file +\endsong diff --git a/songs/Noir_Desir/Toujours_etre_ailleurs.sg b/songs/Noir_Desir/Toujours_etre_ailleurs.sg index 25457be3..391dbc45 100644 --- a/songs/Noir_Desir/Toujours_etre_ailleurs.sg +++ b/songs/Noir_Desir/Toujours_etre_ailleurs.sg @@ -13,7 +13,7 @@ \end{verse*} \begin{verse} - \[Dm] Oh chaque \[F]nuit se ré\[G]duire en \[Dm]cendre + \[Dm] Oh chaque \[F]nuit se ré\[G]duire en \[Dm]cendres Se laisser répandre Dans les la\[F]vabos \[G]blancs \[Dm] La solu\[F]tion est sans \[G]doute a\[Dm]mère @@ -29,14 +29,13 @@ Et les \[F]yeux \[G]vers l'ou\[Dm]est Toujours \[F]être \[G]aille\[Dm]urs Et les \[F]mains \[G]vers l'\[Dm]est - J'veux toujours \[F]être \[G]aille\[Dm]urs ! \end{chorus} \begin{repeatedchords} \begin{verse} \[Dm] J'ai la naus\[F]ée quand je \[G]reste ass\[Dm]is - Si je suis couché je n'joint pas \[F]les deb\[G]outs \[Dm] + Si je suis couché je n'joins pas \[F]les deb\[G]outs \[Dm] Et je sour\[F]is pour le \[G]photogra\[Dm]phe Qui va nous figer Notez mon \[F]épit\[G]aphe \[Dm] @@ -48,7 +47,7 @@ \begin{verse} Oh j'ai jam\[F]ais pu \[G]oublier \[Dm] L'odeur des \[F]endroits \[G]où j'ir\[Dm]ai - C'est seulement \[F]une quest\[G]ion de \[Dm]moeurs + C'est seulement \[F]une quest\[G]ion de \[Dm]mÅ“urs J'veux toujours \[F]être \[G]aille\[Dm]urs ! J'veux toujours \[F]être \[G]aille\[Dm]urs ! \end{verse} diff --git a/songs/Oasis/Im_outta_time.sg b/songs/Oasis/Im_outta_time.sg index d9b32d19..37947e9d 100644 --- a/songs/Oasis/Im_outta_time.sg +++ b/songs/Oasis/Im_outta_time.sg @@ -5,7 +5,7 @@ \cover \gtab{Em}{022000} - \gtab{Esus4}{022200} + \gtab*{Esus4}{022200} \gtab{Am}{X02210} \gtab{C}{X32010} \gtab{G}{320003} diff --git a/songs/Oasis/Wonderwall.sg b/songs/Oasis/Wonderwall.sg index a8d14ecc..5f77d53f 100644 --- a/songs/Oasis/Wonderwall.sg +++ b/songs/Oasis/Wonderwall.sg @@ -5,12 +5,12 @@ \cover \capo{2} - \gtab{Em7}{022033} - \gtab{G}{320033} - \gtab{Dsus4}{XX0233} - \gtab{A7sus4}{X02033} - \gtab{C}{X32033} - \gtab{G/F#}{2X0033} + \gtab*{Em7}{022033} + \gtab*{G}{320033} + \gtab*{Dsus4}{XX0233} + \gtab*{A7sus4}{X02033} + \gtab*{C}{X32033} + \gtab*{G/F#}{2X0033} \begin{verse} \[Em7]Today is \[G]gonna be the day that they're \[Dsus4]{gonna throw} it back to \[A7sus4]you diff --git a/songs/Oldelaf_et_Monsieur_D/Courseulles_sur_Mer.sg b/songs/Oldelaf_et_Monsieur_D/Courseulles_sur_Mer.sg index 13bdd253..3e754b7b 100644 --- a/songs/Oldelaf_et_Monsieur_D/Courseulles_sur_Mer.sg +++ b/songs/Oldelaf_et_Monsieur_D/Courseulles_sur_Mer.sg @@ -27,7 +27,7 @@ \end{verse*} \begin{chorus} - \[F]Et sur cette plage de Courseulles-sur\[C]Mer + \[F]Et sur cette plage de Courseulles-sur-\[C]Mer \[Dm]J'avoue que je ne me rappelle \[Am]pas \[F]Pourquoi tu paraissais un brin a\[C]mère \[F]Alors que j'étais \[E]si bien avec \[Am]toi diff --git a/songs/Oldelaf_et_Monsieur_D/Nathalie.sg b/songs/Oldelaf_et_Monsieur_D/Nathalie.sg index 877eccfa..a2571153 100644 --- a/songs/Oldelaf_et_Monsieur_D/Nathalie.sg +++ b/songs/Oldelaf_et_Monsieur_D/Nathalie.sg @@ -34,7 +34,9 @@ \begin{verse*} - \echo{Vous pouvez chanter avec nous car cette chanson est à la page 137 dans vos diapasons rouges} + \textnote[french]{parlé} + \textnote[english]{spoken} + Vous pouvez chanter avec nous car cette chanson est à la page 137 dans vos diapasons rouges \end{verse*} \begin{verse} diff --git a/songs/Paco_Ibanez/A_galopar.sg b/songs/Paco_Ibanez/A_galopar.sg index 2221b52a..a740b49d 100644 --- a/songs/Paco_Ibanez/A_galopar.sg +++ b/songs/Paco_Ibanez/A_galopar.sg @@ -1,7 +1,7 @@ \selectlanguage{spanish} \songcolumns{2} \beginsong{A galopar} - [by=Paco Ib\'a\~nez,cov=a-galopar,album=A galopar] + [by=Paco Ibáñez,cov=a-galopar,album=A galopar] \cover \gtab{Am}{X02210} @@ -37,4 +37,3 @@ \end{verse} \endsong - diff --git a/songs/Patrick_Coutin/J_aime_regarder_les_filles.sg b/songs/Patrick_Coutin/J_aime_regarder_les_filles.sg index 5f2fa4a8..1b90f191 100644 --- a/songs/Patrick_Coutin/J_aime_regarder_les_filles.sg +++ b/songs/Patrick_Coutin/J_aime_regarder_les_filles.sg @@ -2,6 +2,7 @@ \songcolumns{1} \beginsong{J'aime regarder les filles} [by=Patrick Coutin,cov=1981,album=1981] + \cover \gtab{D}{5:X02220} \gtab{C}{3:X02220} @@ -42,7 +43,7 @@ \begin{verse} \[D]J'aime \[C] \[D]J'aime regar\[C]der les \[D]filles qui marchent \[C]sur la \[D]plage - Quand elles \[C]se déhab\[D]illent et font sembl\[C]ant d'êt\[D]re sages + Quand elles \[C]se déshab\[D]illent et font sembl\[C]ant d'êt\[D]re sages Leurs yeux q\[C]ui se de\[D]mandent mais quel es\[C]t ce garç\[D]on \end{verse} @@ -55,4 +56,4 @@ \end{verse} \end{repeatedchords} -\endsong \ No newline at end of file +\endsong diff --git a/songs/Pep_s/Liberta.sg b/songs/Pep_s/Liberta.sg index 858fb886..da4c272d 100644 --- a/songs/Pep_s/Liberta.sg +++ b/songs/Pep_s/Liberta.sg @@ -5,15 +5,16 @@ \cover \capo{6} - \gtab {Em}{022000} - \gtab {C}{X32010} - \gtab {G}{32001} - \gtab {D/F#}{200232} + + \gtab{Em}{022000} + \gtab{C}{X32010} + \gtab{G}{320003} + \gtab*{D/F#}{200232} \begin{verse} - \[Em]Tu sais qu'il y a un bateaux qui mène au \[C]pays des rêves + \[Em]Tu sais qu'il y a un bateau qui mène au \[C]pays des rêves \[G]Là-bas où il fait chaud, où le ciel n'a \[D/F#]pas son pareil - Tu sais qu'au bout cette terre, oui les gens sèment + Tu sais qu'au bout de cette terre, oui les gens sèment Des milliers de graines de joie comme pousse ici la haine On m'avait dit, p'tit gars, là-bas on t'enlève tes chaînes On te donne une vie sans t'jeter dans l'arène diff --git a/songs/Pierre_Perret/Bernard_Pivot.sg b/songs/Pierre_Perret/Bernard_Pivot.sg index f5f5a570..fbf2909c 100644 --- a/songs/Pierre_Perret/Bernard_Pivot.sg +++ b/songs/Pierre_Perret/Bernard_Pivot.sg @@ -49,7 +49,7 @@ Quelques sardines un yaourt ou des Å“ufs Devant la télé Où la nourriture audiovisuelle - Sera dabord spirituelle + Sera d'abord spirituelle Car un seul homme à ce moment prévaut C'est Bernard Pivot \end{verse} diff --git a/songs/Pierre_Perret/Mon_ptit_loup.sg b/songs/Pierre_Perret/Mon_ptit_loup.sg index ab8bc43f..1cb1d35d 100644 --- a/songs/Pierre_Perret/Mon_ptit_loup.sg +++ b/songs/Pierre_Perret/Mon_ptit_loup.sg @@ -3,7 +3,6 @@ \beginsong{Mon p'tit loup} [by=Pierre Perret,cov=pierrot-l-amour,album=L'amour] - \cover \gtab{Am}{X02210} \gtab{Dm}{XX0231} @@ -22,7 +21,7 @@ Respirer la violette à Parme Et les é\[Dm]pices à \[G]Colom\[C]bo \[Am]On verra le fleuve Amaz\[Am]one - Et la vall\[Dm]ée des Orchi\[Am]dés + Et la vall\[Dm]ée des Orchi\[Am]dées Et les enfants qui ne savonnent Le ventre \[Dm]avec des fleurs coup\[Am]ées \end{verse} diff --git a/songs/Red_Hot_Chili_Peppers/Dani_California.sg b/songs/Red_Hot_Chili_Peppers/Dani_California.sg index 421c7b68..cc3736d7 100644 --- a/songs/Red_Hot_Chili_Peppers/Dani_California.sg +++ b/songs/Red_Hot_Chili_Peppers/Dani_California.sg @@ -42,7 +42,7 @@ She's a lover, Baby and a fighter Should've seen it coming when I got a little brighter With a name like ``Dani California'' - Day was gona come when I was gona mourn ya + Day was gonna come when I was gonna mourn ya A little low that she was stealing another bread I love my baby to death \end{verse} diff --git a/songs/Red_Hot_Chili_Peppers/Under_the_bridge.sg b/songs/Red_Hot_Chili_Peppers/Under_the_bridge.sg index 55ec0b16..b6080ca2 100644 --- a/songs/Red_Hot_Chili_Peppers/Under_the_bridge.sg +++ b/songs/Red_Hot_Chili_Peppers/Under_the_bridge.sg @@ -7,13 +7,13 @@ \gtab{E}{022100} \gtab{B}{2:X02220} \gtab{C#m}{4:X02210} - \gtab{G#m}{4:02200} + \gtab{G#m}{4:022000} \gtab{A}{5:022100} - \gtab{EM7}{021100} + \gtab*{EM7}{021100} \gtab{F#m}{2:022000} \gtab{Am7}{X02010} - \gtab{G6}{7:X02010} - \gtab{FM7}{1:X2110X} + \gtab*{G6}{7:X02010} + \gtab*{FM7}{1:X2110X} \gtab{C}{X32010} \begin{verse} diff --git a/songs/Renaud/Amoureux_de_paname.sg b/songs/Renaud/Amoureux_de_paname.sg index 084d433f..ddd6a645 100644 --- a/songs/Renaud/Amoureux_de_paname.sg +++ b/songs/Renaud/Amoureux_de_paname.sg @@ -5,7 +5,7 @@ \cover \capo{2} - \gtab{G}{022000} + \gtab{G}{320003} \gtab{Am}{X02210} \gtab{D}{XX0232} \gtab{Em}{022000} @@ -63,5 +63,4 @@ Le gaz carbonique, c'est mon hygiène \end{verse*} - \endsong diff --git a/songs/Renaud/Docteur_Renaud_Mister_Renard.sg b/songs/Renaud/Docteur_Renaud_Mister_Renard.sg index a575226e..126f9b87 100644 --- a/songs/Renaud/Docteur_Renaud_Mister_Renard.sg +++ b/songs/Renaud/Docteur_Renaud_Mister_Renard.sg @@ -7,10 +7,10 @@ \gtab{Am}{X02210} \gtab{F}{1:022100} \gtab{G}{320003} - \gtab{Em7}{022030} - \gtab{F2}{1330XX} - \gtab{G2}{3X02XX} - \gtab{E/G#}{2:311341} + \gtab*{Em7}{022030} + \gtab*{F2}{1330XX} + \gtab*{G2}{3X02XX} + \gtab*{E/G#}{2:311341} \begin{verse} \[Am]Comme y'a eu \[F]Gainsbourg et Gains\[G]barre @@ -93,5 +93,4 @@ Mais aimera toujours Renaud\[Am] \[F] \end{verse} - \endsong diff --git a/songs/Renaud/It_is_not_because_you_are.sg b/songs/Renaud/It_is_not_because_you_are.sg index 9f20699b..60e29a3f 100644 --- a/songs/Renaud/It_is_not_because_you_are.sg +++ b/songs/Renaud/It_is_not_because_you_are.sg @@ -1,14 +1,14 @@ \selectlanguage{english} \songcolumns{2} \beginsong{It is not because you are} - [by=Renaud,album=Marche à l'ombre,cov=marche-a-l-ombre] + [by=Renaud,cov=marche-a-l-ombre,album=Marche à l'ombre] \cover \gtab{F}{1:022100} \gtab{Dm}{XX0231} \gtab{Gm}{3:022000} \gtab{C}{X32010} - \gtab{E5+}{022222} + \gtab*{E5+}{022222} \begin{verse} When I \[F]have rencontred \[Dm]you @@ -81,4 +81,4 @@ \dots Qu'I am \[F]you \end{chorus} -\endsong \ No newline at end of file +\endsong diff --git a/songs/Renaud/La_ballade_nord_irlandaise.sg b/songs/Renaud/La_ballade_nord_irlandaise.sg index ae5339ce..1302d4a4 100644 --- a/songs/Renaud/La_ballade_nord_irlandaise.sg +++ b/songs/Renaud/La_ballade_nord_irlandaise.sg @@ -6,7 +6,7 @@ \cover \gtab{C}{X32010} \gtab{F}{1:022100} - \gtab{C/B}{X22010} + \gtab*{C/B}{X22010} \gtab{Am}{X02210} \gtab{G}{320003} @@ -45,4 +45,4 @@ Les fruits sucrés de la liberté \end{verse} -\endsong \ No newline at end of file +\endsong diff --git a/songs/Renaud/Ma_gonzesse.sg b/songs/Renaud/Ma_gonzesse.sg index 0478ad74..0df92c29 100644 --- a/songs/Renaud/Ma_gonzesse.sg +++ b/songs/Renaud/Ma_gonzesse.sg @@ -1,7 +1,7 @@ -\selectlanguage{english} +\selectlanguage{french} \songcolumns{2} \beginsong{Ma gonzesse} - [by=Renaud,album=Ma gonzesse,cov=ma-gonzesse] + [by=Renaud,cov=ma-gonzesse,album=Ma gonzesse] \cover \gtab{C}{X32010} @@ -10,7 +10,7 @@ \gtab{Am}{X02210} \gtab{D}{XX0232} \gtab{G}{320003} - \gtab{B&}{X13331} + \gtab{B&}{1:X02220} \begin{verse} \[C]Malgré le blouson clouté @@ -47,7 +47,7 @@ \[C]Tu sais bien les statues Du \[Dm]jardin des Tuileries \[Fm]Qui hiver comme été - Ex\[C]hibent leurs gui\[Am]boles + Ex\[C]hibent leurs gui\[Am]bolles \[D]Et se gèlent le cul \[G]Et le reste aussi \end{verse*} @@ -95,4 +95,4 @@ \end{repeatedchords} -\endsong \ No newline at end of file +\endsong diff --git a/songs/Renaud/Manatthan-Kaboul.sg b/songs/Renaud/Manatthan-Kaboul.sg index 7f8ee38b..5f2eb509 100644 --- a/songs/Renaud/Manatthan-Kaboul.sg +++ b/songs/Renaud/Manatthan-Kaboul.sg @@ -9,12 +9,12 @@ \gtab{G}{320003} \gtab{E}{022100} \gtab{Am}{X02210} - \gtab{Dm7}{XX0211} + \gtab*{Dm7}{XX0211} \gtab{Em}{022000} \gtab*{E*}{2:XX134X} - \gtab{E/D}{2:XX034X} - \gtab{E/C}{2:X2X34X} - \gtab{E/B}{2:X1X34X} + \gtab*{E/D}{2:XX034X} + \gtab*{E/C}{2:X2X34X} + \gtab*{E/B}{2:X1X34X} %intro à faire diff --git a/songs/Renaud/Marche_a_l_ombre.sg b/songs/Renaud/Marche_a_l_ombre.sg index bb6e5227..7f3e62e7 100644 --- a/songs/Renaud/Marche_a_l_ombre.sg +++ b/songs/Renaud/Marche_a_l_ombre.sg @@ -83,7 +83,7 @@ \end{verse} \begin{verse*} - Derrière ses pauvres Rayban + Derrière ses pauvres Ray-Ban J'vois pas ses yeux et ça m'énerve Si ça s'trouve il m'regarde Faut qu'il arrête sinon je l'crève diff --git a/songs/Renaud/Mort_les_enfants.sg b/songs/Renaud/Mort_les_enfants.sg index a797e714..d59623c5 100644 --- a/songs/Renaud/Mort_les_enfants.sg +++ b/songs/Renaud/Mort_les_enfants.sg @@ -1,13 +1,13 @@ \selectlanguage{french} \songcolumns{2} \beginsong{Morts les enfants} - [by=Renaud,album=Mistral Gagnant,cov=mistral-gagnant] + [by=Renaud,cov=mistral-gagnant,album=Mistral Gagnant] \cover \gtab{Dm}{XX0231} \gtab{E7}{020100} \gtab{A7}{X02020} - \gtab{B&}{X13331} + \gtab{B&}{1:X02220} \gtab{Gm}{3:022000} \gtab{F}{1:022100} \gtab{C}{X32010} @@ -91,4 +91,4 @@ \end{chorus} \end{repeatedchords} -\endsong \ No newline at end of file +\endsong diff --git a/songs/Ritchie_Valens/La_bamba.sg b/songs/Ritchie_Valens/La_bamba.sg index 1f0e83f8..c8a0d843 100644 --- a/songs/Ritchie_Valens/La_bamba.sg +++ b/songs/Ritchie_Valens/La_bamba.sg @@ -3,27 +3,25 @@ \beginsong{La Bamba} [by=Ritchie Valens,cov=la-bamba,album=La bamba] - \cover \gtab{C}{X32010} \gtab{F}{1:022100} \gtab{G}{320003} - \begin{verse} Para bailar la \[C]Bamba\[F G] Para bailar la \[C]Bamba - Se nece\[F]ssi\[G]ta una poca de \[C]gracia\[F G] + Se nece\[F]si\[G]ta una poca de \[C]gracia\[F G] Una poca de \[C]gracia Para \[F]mi, para \[G]ti, ay arriba, ay arri\[C]ba\[F G] Ay, arriba arri\[C]ba - Por \[F]ti se\[G]re, por ti se\[C]re, por \[F]ti se\[G]re + Por \[F]ti se\[G]ré, por ti se\[C]ré, por \[F]ti se\[G]ré \end{verse} \begin{verse} Yo no soy marinero - Yo no soy marinero, soy capitan - Soy capitan, soy capitan + Yo no soy marinero, soy capitán + Soy capitán, soy capitán Baila, bamba Baila, bamba Baila, bamba @@ -32,7 +30,7 @@ \begin{verse} Para bailar la Bamba Para bailar la Bamba - Se necessita una poca de gracia + Se necesita una poca de gracia Una poca de gracia Para mi, para ti, ay arriba, ay arriba \end{verse} diff --git a/songs/Roch_Voisine/Helene.sg b/songs/Roch_Voisine/Helene.sg index b6986f0a..9fc0338d 100644 --- a/songs/Roch_Voisine/Helene.sg +++ b/songs/Roch_Voisine/Helene.sg @@ -5,7 +5,7 @@ \cover \gtab{Em}{022000} - \gtab{G}{320002} + \gtab{G}{320003} \gtab{C}{X32010} \gtab{D}{XX0232} \gtab{Am}{X02210} @@ -70,4 +70,5 @@ \begin{verse*} Dans \[D]ton pays loin de \[Em]moi \end{verse*} -\endsong \ No newline at end of file + +\endsong diff --git a/songs/Rose/La_liste_de_Rose.sg b/songs/Rose/La_liste_de_Rose.sg index fdc622a2..93f947c1 100644 --- a/songs/Rose/La_liste_de_Rose.sg +++ b/songs/Rose/La_liste_de_Rose.sg @@ -1,7 +1,7 @@ \selectlanguage{french} \songcolumns{2} \beginsong{La liste de Rose} - [by=Rose,cov=Rose,album=Rose] + [by=Rose,cov=rose,album=Rose] \cover \capo{3} @@ -11,7 +11,7 @@ \gtab{D7}{X00212} \gtab{Em}{022000} \gtab{G}{320003} - \gtab{G4}{320503} + \gtab*{G4}{320503} \gtab{Am7}{002010} \gtab{A7}{X02020} \gtab{Bm7}{2:002010} @@ -98,9 +98,3 @@ \end{verse} \endsong - - - - - - diff --git a/songs/Sheepbox/Devil_s_way.sg b/songs/Sheepbox/Devil_s_way.sg index f8340348..9f46460b 100644 --- a/songs/Sheepbox/Devil_s_way.sg +++ b/songs/Sheepbox/Devil_s_way.sg @@ -3,6 +3,8 @@ \beginsong{Devil's Way} [by=Sheepbox,cov=sheepbox,album=Sheepbox] + \cover + % verse: 1.&.2.&.3.&.4.& % D D UD % Em Asus2 @@ -13,7 +15,7 @@ \cover \capo{9} \gtab{Em}{022000} - \gtab{Asus2}{X02200} + \gtab*{Asus2}{X02200} \gtab{Am}{X02210} \gtab{Dm}{XX0231} \gtab{C}{X32010} @@ -120,5 +122,3 @@ \musicnote{\Chorus} \endsong - - diff --git a/songs/Simon_Garfunkel/Feeling_groovy.sg b/songs/Simon_Garfunkel/Feeling_groovy.sg index 7054cfa8..3496f815 100644 --- a/songs/Simon_Garfunkel/Feeling_groovy.sg +++ b/songs/Simon_Garfunkel/Feeling_groovy.sg @@ -20,7 +20,7 @@ \end{chorus} \begin{verse} - Hello lamp post, what cha knowin' + Hello lamp post, whatcha knowin' I've come to watch your flowers growin' Aint'cha got no rhymes for me? Doot-in doo-doo, feelin'groovy diff --git a/songs/Simon_Garfunkel/Kathy_s_song.sg b/songs/Simon_Garfunkel/Kathy_s_song.sg index 6c874692..586bac24 100644 --- a/songs/Simon_Garfunkel/Kathy_s_song.sg +++ b/songs/Simon_Garfunkel/Kathy_s_song.sg @@ -7,7 +7,7 @@ \gtab{G}{320003} \gtab{C}{X32010} \gtab{Am}{X02210} - \gtab{Am6}{2X2210} + \gtab*{Am6}{2X2210} \gtab{D7}{XX0212} \gtab{Bm}{2:X02210} \gtab{D}{XX0232} diff --git a/songs/Simon_Garfunkel/The_only_living_boy_in_New_York.sg b/songs/Simon_Garfunkel/The_only_living_boy_in_New_York.sg index 00da3b96..6c3a950f 100644 --- a/songs/Simon_Garfunkel/The_only_living_boy_in_New_York.sg +++ b/songs/Simon_Garfunkel/The_only_living_boy_in_New_York.sg @@ -9,7 +9,7 @@ \gtab{Dm}{XX0231} \gtab{G}{320003} \gtab{Am}{X02210} - \gtab{G}{320001} + \gtab{G7}{320001} \begin{verse} \[C]Tom, get your plane right on \[F]time diff --git a/songs/Sixpence_None_the_Richer/Kiss_me.sg b/songs/Sixpence_None_the_Richer/Kiss_me.sg index 794d1562..193abefb 100644 --- a/songs/Sixpence_None_the_Richer/Kiss_me.sg +++ b/songs/Sixpence_None_the_Richer/Kiss_me.sg @@ -6,16 +6,15 @@ \cover \capo{1} \gtab{D}{XX0232} - \gtab{DM7}{XX0222} + \gtab*{DM7}{XX0222} \gtab{D7}{XX0212} \gtab{Em}{022000} \gtab{A}{X02220} \gtab{G}{320003} - \gtab{D/C#}{X40232} - \gtab{D/B}{X20232} - \gtab{D/A}{XX0232} - \gtab{G*}{320030} - \gtab{Asus4}{X02230} + \gtab*{D/C#}{X40232} + \gtab*{D/B}{X20232} + \gtab*{G*}{320030} + \gtab*{Asus4}{X02230} \begin{verse*} \musicnote {\Intro: \nolyrics \[D DM7 D7 DM7 \rep{2}]} @@ -43,4 +42,4 @@ We'll take the trail marked on your father's map \end{verse} -\endsong \ No newline at end of file +\endsong diff --git a/songs/Soan/Putain_de_ballerine.sg b/songs/Soan/Putain_de_ballerine.sg index b36d1304..cefd6a01 100644 --- a/songs/Soan/Putain_de_ballerine.sg +++ b/songs/Soan/Putain_de_ballerine.sg @@ -7,10 +7,9 @@ \gtab{Em}{022000} \gtab{Am}{X02210} \gtab{D}{XX0232} - \gtab{G}{320001} + \gtab{G}{320003} \gtab{B7}{X21202} - \begin{verse} C'est pas si \[Em]beau l'amour Quand c'est à toi qu'je pense @@ -73,4 +72,4 @@ Qui s'en \[Em]va ! \[B7] \[B7] \[Em] \[G] \[D] \[Em] \[B7] \end{verse} -\endsong \ No newline at end of file +\endsong diff --git a/songs/Soggy_Bottom_Boys/I_am_a_man_of_constant_sorrow.sg b/songs/Soggy_Bottom_Boys/I_am_a_man_of_constant_sorrow.sg index 5a0bf653..f3aec637 100644 --- a/songs/Soggy_Bottom_Boys/I_am_a_man_of_constant_sorrow.sg +++ b/songs/Soggy_Bottom_Boys/I_am_a_man_of_constant_sorrow.sg @@ -1,12 +1,12 @@ \selectlanguage{english} \songcolumns{2} \beginsong{I am a man of constant sorrow} - [by=Soggy Bottom Boys,,cov=o-brother,album=O brother] + [by=Soggy Bottom Boys,cov=o-brother,album=O brother] \cover \gtab{F}{1:022100} \gtab{B&}{1:X02220} - \gtab{C}{1:X02220} + \gtab{C}{3:X02220} \begin{chorus} \[F] In constant \[C]sorrow, all through his \[F]days @@ -67,4 +67,4 @@ He'll meet you on God's golden shore \end{chorus} -\endsong \ No newline at end of file +\endsong diff --git a/songs/Soldat_Louis/C_est_un_pays.sg b/songs/Soldat_Louis/C_est_un_pays.sg index ad48df41..f2a0cc28 100644 --- a/songs/Soldat_Louis/C_est_un_pays.sg +++ b/songs/Soldat_Louis/C_est_un_pays.sg @@ -86,7 +86,7 @@ Dans \[Am]tout c'merdier c'putain d'pays M'tient \[G]plus chaud qu'la gon\[F]zesse que j'traîne J'ai \[C]pas fini d'l'ouvrir pour lui - Pour \[Dm]{lui j'filerai} même \[F]des chataîgnes + Pour \[Dm]{lui j'filerai} même \[F]des châtaignes Au \[C]premier salaud qui l'détruit Ou \[Dm]{qui voudrait} lui re\[F]mettre \[G]des \[Am]chaînes \nolyrics \[Am Am] @@ -95,4 +95,4 @@ \musicnote{\Verse 1 \rep{2}} -\endsong \ No newline at end of file +\endsong diff --git a/songs/Sting/Russians.sg b/songs/Sting/Russians.sg index ad98d29f..528a0bdc 100644 --- a/songs/Sting/Russians.sg +++ b/songs/Sting/Russians.sg @@ -13,7 +13,7 @@ \begin{verse} In \[Am]Europe \[G]and A\[F]meri\[E7]ca - There's a \[Am]growing \[G]feeling of his\[F]teri\[E7]a + There's a \[Am]growing \[G]feeling of hys\[F]teri\[E7]a Con\[Am]ditioned to res\[G]pond to \[F]all the \[E7]threats In the \[Am]rhetorical \[G]speeches of \[F]the So\[E7]viets \end{verse} diff --git a/songs/Telephone/New_York_avec_toi.sg b/songs/Telephone/New_York_avec_toi.sg index 5d2df6bf..83a37d2c 100644 --- a/songs/Telephone/New_York_avec_toi.sg +++ b/songs/Telephone/New_York_avec_toi.sg @@ -11,7 +11,7 @@ \begin{verse} \[A]Un jour, j'irai a \[F#m]{New York} avec toi \[A]Toutes les nuits décon\[B]ner - \[A]Et voir aucun film en ent\[F#m]{ier, ca va} d'soi + \[A]Et voir aucun film en ent\[F#m]{ier, ça va} d'soi \[A]Avoir la vie partag\[B]{ée, taillad}\[D]ée \[A]Bercés par le ronron de l'air co\[F#m]nditionné \[A]Dormir dans un hôtel delat\[B]é @@ -55,4 +55,4 @@ \lilypond{New_york_avec_toi} -\endsong \ No newline at end of file +\endsong diff --git a/songs/Terra_Naomi/Say_It_s_Possible.sg b/songs/Terra_Naomi/Say_It_s_Possible.sg index 6f943d2d..2f0be5b9 100644 --- a/songs/Terra_Naomi/Say_It_s_Possible.sg +++ b/songs/Terra_Naomi/Say_It_s_Possible.sg @@ -4,10 +4,10 @@ [by=Terra Naomi,cov=under-the-influence,album=Under the influence] \cover - \gtab{Em7}{022033} - \gtab{C9}{X32033} - \gtab{G}{320033} - \gtab{G/F#}{2X0033} + \gtab*{Em7}{022033} + \gtab*{C9}{X32033} + \gtab*{G}{320033} + \gtab*{G/F#}{2X0033} \begin{verse} \[Em7]I \[C9]see the \[G]lights are \[G/F#]turning and I diff --git a/songs/The_Beatles/Twist_and_shout.sg b/songs/The_Beatles/Twist_and_shout.sg index a273b869..679756a5 100644 --- a/songs/The_Beatles/Twist_and_shout.sg +++ b/songs/The_Beatles/Twist_and_shout.sg @@ -7,7 +7,7 @@ \gtab{D}{5:X02220} \gtab{G}{3:022100} \gtab{A}{5:022100} - \gtab{A7}{5:020130} + \gtab*{A7}{5:020130} \begin{chorus} \[A7]Well, shake it up, \[D]baby, now \echo{\[G]shake it up, \[A]baby} diff --git a/songs/The_Calling/Wherever_you_will_go.sg b/songs/The_Calling/Wherever_you_will_go.sg index 47e0b992..ffc83559 100644 --- a/songs/The_Calling/Wherever_you_will_go.sg +++ b/songs/The_Calling/Wherever_you_will_go.sg @@ -6,7 +6,7 @@ \cover \capo{2} \gtab{C}{X32010} - \gtab{C/B}{X20010} + \gtab*{C/B}{X20010} \gtab{Am7}{X02010} \gtab{F}{1:022100} diff --git a/songs/The_Doors/Light_my_fire.sg b/songs/The_Doors/Light_my_fire.sg index 2d5fe4c3..35a2a620 100644 --- a/songs/The_Doors/Light_my_fire.sg +++ b/songs/The_Doors/Light_my_fire.sg @@ -5,7 +5,7 @@ \cover \gtab{Am7}{X02010} - \gtab{F#m7}{202220} + \gtab*{F#m7}{202220} \gtab{G}{320003} \gtab{A}{X02220} \gtab{D}{XX0232} diff --git a/songs/The_Fray/How_to_save_a_life.sg b/songs/The_Fray/How_to_save_a_life.sg index 64539115..48327e29 100644 --- a/songs/The_Fray/How_to_save_a_life.sg +++ b/songs/The_Fray/How_to_save_a_life.sg @@ -6,7 +6,7 @@ \cover \capo{3} \gtab{G}{320003} - \gtab{D4}{XX0233} + \gtab*{D4}{XX0233} \gtab{Em}{022000} \gtab{D}{XX0232} \gtab{C}{X32010} diff --git a/songs/The_Moldy_Peaches/Anyone_Else_But_You.sg b/songs/The_Moldy_Peaches/Anyone_Else_But_You.sg index c3378272..bfc27027 100644 --- a/songs/The_Moldy_Peaches/Anyone_Else_But_You.sg +++ b/songs/The_Moldy_Peaches/Anyone_Else_But_You.sg @@ -5,7 +5,7 @@ \cover \gtab{G}{320003} - \gtab{C7}{X32003} + \gtab*{C7}{X32003} \begin{verse} You're a \[G]part time lover and a full time friend diff --git a/songs/The_Nightwatchman/Let_freedom_ring.sg b/songs/The_Nightwatchman/Let_freedom_ring.sg index 5a5eecd9..b999938f 100644 --- a/songs/The_Nightwatchman/Let_freedom_ring.sg +++ b/songs/The_Nightwatchman/Let_freedom_ring.sg @@ -9,8 +9,8 @@ \gtab{Am}{X02210} \gtab{G}{320003} \gtab{C}{X32010} - \gtab{C/B}{X20010} - \gtab{F#}{200XXX} + \gtab*{C/B}{X20010} + \gtab*{F#}{200XXX} \musicnote[english]{\Intro: same chords as the chorus} \musicnote[french]{\Intro: même accords que le refrain} diff --git a/songs/The_Pogues/The_Irish_Rover.sg b/songs/The_Pogues/The_Irish_Rover.sg index 1af8bf64..da86c237 100644 --- a/songs/The_Pogues/The_Irish_Rover.sg +++ b/songs/The_Pogues/The_Irish_Rover.sg @@ -6,7 +6,7 @@ \cover \gtab{G}{320003} \gtab{C}{X32010} - \gtab{D}{XXX0232} + \gtab{D}{XX0232} \begin{verse} \[G]On the fourth of July diff --git a/songs/The_Rolling_Stones/You_cant_always_get_what_you_want.sg b/songs/The_Rolling_Stones/You_cant_always_get_what_you_want.sg index 83aa38de..66fdd1d1 100644 --- a/songs/The_Rolling_Stones/You_cant_always_get_what_you_want.sg +++ b/songs/The_Rolling_Stones/You_cant_always_get_what_you_want.sg @@ -6,7 +6,7 @@ \cover \capo{5} \gtab{G}{320003} - \gtab{C}{X32003} + \gtab*{C}{X32003} \gtab{A}{X02220} \begin{verse} @@ -54,5 +54,4 @@ Well I could tell by her bloodstained hands \end{verse} - \endsong diff --git a/songs/Thomas_Fersen/Bambi.sg b/songs/Thomas_Fersen/Bambi.sg index a920b253..fff361a3 100644 --- a/songs/Thomas_Fersen/Bambi.sg +++ b/songs/Thomas_Fersen/Bambi.sg @@ -1,20 +1,20 @@ \selectlanguage{french} \songcolumns{2} \beginsong{Bambi} - [by=Thomas Fersen,album=Pièce montée des grands jours,cov=piece-montee-des-grands-jours] - + [by=Thomas Fersen,cov=piece-montee-des-grands-jours,album=Pièce montée des grands jours] \cover \gtab{Dm}{XX0231} \gtab{F}{1:022100} - \gtab{B{\flt}}{2:X02220} + + \gtab{B&}{2:X02220} \gtab{G}{320003} \gtab{Am}{X02210} \gtab{C}{X32010} \gtab{A}{X02220} \utab{Dm}{2210} \utab{F}{2010} - \utab{B{\flt}}{1:2100} + \utab{B&}{1:2100} \utab{G}{0232} \utab{Am}{2000} \utab{C}{0003} @@ -78,4 +78,5 @@ \[Am]Pas casser les jouets\dots{} \end{chorus} \end{repeatedchords} -\endsong \ No newline at end of file + +\endsong diff --git a/songs/Thomas_Fersen/Croque.sg b/songs/Thomas_Fersen/Croque.sg index 23b1b7fe..4e5a9ed3 100644 --- a/songs/Thomas_Fersen/Croque.sg +++ b/songs/Thomas_Fersen/Croque.sg @@ -6,7 +6,7 @@ \cover \gtab{C#m}{4:X02210} \gtab{F#m}{2:022000} - \gtab{G#}{320003} + \gtab{G#}{4:X02210} \gtab{E}{022100} \gtab{A}{X02220} \utab{C#m}{1:0333} @@ -109,4 +109,4 @@ \nolyrics \[C{\shrp}m F{\shrp}m F{\shrp}m C{\shrp}m] \end{chorus} -\endsong \ No newline at end of file +\endsong diff --git a/songs/Thomas_Fersen/Deux_pieds.sg b/songs/Thomas_Fersen/Deux_pieds.sg index 72416d1a..5820e96d 100644 --- a/songs/Thomas_Fersen/Deux_pieds.sg +++ b/songs/Thomas_Fersen/Deux_pieds.sg @@ -7,7 +7,7 @@ \gtab{Fm}{1:022000} \gtab{D#}{3:X32010} \gtab{G#}{4:022100} - \gtab{C#}{4:X03330} + \gtab{C#}{4:X02220} \gtab{Cm}{3:X02210} \utab{Fm}{1013} \utab{D#}{1:2220} diff --git a/songs/Thomas_Fersen/Diane_de_Poitiers.sg b/songs/Thomas_Fersen/Diane_de_Poitiers.sg index 846e9209..7e1c4b94 100644 --- a/songs/Thomas_Fersen/Diane_de_Poitiers.sg +++ b/songs/Thomas_Fersen/Diane_de_Poitiers.sg @@ -5,10 +5,9 @@ \cover \gtab*{B&9}{X10111} - \gtab{B&7}{1:X0202} + \gtab{B&7}{1:X02020} \gtab{E&}{6:X02220} \gtab{F}{1:022100} - \gtab{Gm}{3:022000} \gtab{B&}{6:022100} \gtab{Cm}{3:X02210} diff --git a/songs/Thomas_Fersen/L_histoire_d_une_heure.sg b/songs/Thomas_Fersen/L_histoire_d_une_heure.sg index 06388bd6..cfc4b88d 100644 --- a/songs/Thomas_Fersen/L_histoire_d_une_heure.sg +++ b/songs/Thomas_Fersen/L_histoire_d_une_heure.sg @@ -7,8 +7,8 @@ \gtab{B7}{2:X02020} \gtab{E}{022100} \gtab{A}{X02220} - \gtab{Edim}{2:XX0131} - \gtab{F#dim}{XX4212} + \gtab*{Edim}{2:XX0131} + \gtab*{F#dim}{XX4212} \utab{B7}{2:0100} \utab{E}{2:2220} \utab{A}{2100} @@ -98,4 +98,5 @@ \nolyrics \[A E A E] \nolyrics \[Edim E F{\shrp}dim B7] \end{verse*} + \endsong diff --git a/songs/Thomas_Fersen/Les_malheurs_du_lion.sg b/songs/Thomas_Fersen/Les_malheurs_du_lion.sg index 778c798e..fb1bf902 100644 --- a/songs/Thomas_Fersen/Les_malheurs_du_lion.sg +++ b/songs/Thomas_Fersen/Les_malheurs_du_lion.sg @@ -7,12 +7,13 @@ \gtab{Cm}{3:X02210} \gtab{G}{320003} \gtab{A#}{1:X02220} - \gtab{D#}{XX1343} + \gtab{D#}{6:X02220} \gtab{Fm}{1:022000} \utab{Cm}{0333} \utab{G}{0232} - \utab{A{\shrp}}{2100} - \utab{D{\shrp}}{1:2220} + + \utab{A#}{2100} + \utab{D#}{1:2220} \utab{Fm}{1013} \begin{chorus} @@ -99,8 +100,8 @@ \end{verse} \begin{bridge} - Ta ba \[Cm]da ba da ba da\dots{} + Ta ba \[Cm]da ba da ba da\dots{} \end{bridge} \end{repeatedchords} -\endsong \ No newline at end of file +\endsong diff --git a/songs/Thomas_Fersen/Pegase.sg b/songs/Thomas_Fersen/Pegase.sg index d9f88bee..b563364e 100644 --- a/songs/Thomas_Fersen/Pegase.sg +++ b/songs/Thomas_Fersen/Pegase.sg @@ -1,10 +1,10 @@ \selectlanguage{french} \songcolumns{1} \beginsong{Pégase} - [by=Thomas Fersen,album=Le pavillon des fous,cov=le-pavillon-des-fous] + [by=Thomas Fersen,cov=le-pavillon-des-fous,album=Le pavillon des fous] \cover - \gtab{Em}{0022000} + \gtab{Em}{022000} \gtab{G}{320003} \gtab{Bm}{2:X02210} \gtab{C}{X32010} @@ -56,4 +56,4 @@ \end{verse} \end{repeatedchords} -\endsong \ No newline at end of file +\endsong diff --git a/songs/Thomas_Fersen/Zaza.sg b/songs/Thomas_Fersen/Zaza.sg index c110730d..e00637ad 100644 --- a/songs/Thomas_Fersen/Zaza.sg +++ b/songs/Thomas_Fersen/Zaza.sg @@ -1,7 +1,7 @@ \selectlanguage{french} \songcolumns{2} \beginsong{Zaza} - [by=Thomas Fersen,album=Le pavillon des fous,cov=le-pavillon-des-fous] + [by=Thomas Fersen,cov=le-pavillon-des-fous,album=Le pavillon des fous] \cover \gtab{Em}{022000} @@ -43,7 +43,7 @@ Pis Zaza, \[Em]c'est quoi ton problème ? Arrête d'in\[Em]gérer tout ce qui traîne Croquer ma \[Am]revue sur les gaines - Ça va pas \[D]te rafraichir l'ha\[Em]leine + Ça va pas \[D]te rafraîchir l'ha\[Em]leine \end{verse} \begin{verse*} diff --git a/songs/Tit_Patapons/Marchand_de_couleurs.sg b/songs/Tit_Patapons/Marchand_de_couleurs.sg index 3af8162d..670f006b 100644 --- a/songs/Tit_Patapons/Marchand_de_couleurs.sg +++ b/songs/Tit_Patapons/Marchand_de_couleurs.sg @@ -5,9 +5,9 @@ \cover \gtab{Am}{X02210} - \gtab{Asus4}{X02230} - \gtab{Asus2}{X02200} - \gtab{Am7}{X02213} + \gtab*{Asus4}{X02230} + \gtab*{Asus2}{X02200} + \gtab*{Am7}{X02213} \gtab{F}{1:022100} \gtab{C}{X32010} diff --git a/songs/Tournee_Generale/Avancer_mes_grolles.sg b/songs/Tournee_Generale/Avancer_mes_grolles.sg index 3cc47975..17c6cd12 100644 --- a/songs/Tournee_Generale/Avancer_mes_grolles.sg +++ b/songs/Tournee_Generale/Avancer_mes_grolles.sg @@ -20,7 +20,7 @@ \begin{repeatedchords} \begin{verse*} - \[Dm]Tu te résignes, persites et signes + \[Dm]Tu te résignes, persistes et signes Que je ne \[B&]suis qu'un \[C]pot de \[F]colle Mais ça n'colle \[A]pas, je passe à la \[Dm]ligne Pour faire \[B&]avan\[A]cer mes \[Dm]grolles diff --git a/songs/Tracy_Chapman/Talkin_about_the_revolution.sg b/songs/Tracy_Chapman/Talkin_about_the_revolution.sg index 0c8e3970..de08bb11 100644 --- a/songs/Tracy_Chapman/Talkin_about_the_revolution.sg +++ b/songs/Tracy_Chapman/Talkin_about_the_revolution.sg @@ -5,15 +5,15 @@ \cover \gtab{G}{320003} - \gtab{Cadd9}{032030} + \gtab*{Cadd9}{032030} \gtab{Em}{022000} - \gtab{Dsus4}{X00233} + \gtab*{Dsus4}{X00233} \gtab{D}{XX0232} \begin{chorus} D\[G]on't you \[Cadd9]know - \[Em]They're talkin' about\[Dsus4]a revolu\[G]tion - It\[Cadd9]sounds \[Em]like \[D]a whisper + \[Em]They're talkin' about \[Dsus4]a revolu\[G]tion + It \[Cadd9]sounds \[Em]like \[D]a whisper Don't you know They're talkin' about a revolution It sounds like a whisper @@ -29,7 +29,7 @@ \begin{chorus} D\[G]on't you \[Cadd9]know \[Em]They're talkin' about \[Dsus4]a revolu\[G]tion - It\[Cadd9]sounds \[Em]like \[D]a whisper + It \[Cadd9]sounds \[Em]like \[D]a whisper Don't you know They're talkin' about a revolution It sounds like a whisper diff --git a/songs/Traditionnel/L_homme_de_cromagnon.sg b/songs/Traditionnel/L_homme_de_cromagnon.sg index a12b23db..2bbced8b 100644 --- a/songs/Traditionnel/L_homme_de_cromagnon.sg +++ b/songs/Traditionnel/L_homme_de_cromagnon.sg @@ -1,6 +1,6 @@ \selectlanguage{french} \songcolumns{2} -\beginsong{L'homme de cromagnon} +\beginsong{L'homme de Cro-Magnon} [by=Traditionel] \gtab{C}{X32010} @@ -12,18 +12,18 @@ C'était au \[C]temps d'la préhistoire Il y a de ça trois cent mille \[G7]ans Vivait un être assez bizarre - Proche parent d'l'orang-out\[C]ang + Proche parent d'l'orang-out\[C]an Debout sur ses pattes de derrière Vêtu d'un slip en peau d'bi\[G7]son Il all\[F]ait conqué\[G]rir la \[C]terre - C'était l'homme \[G]de cromag\[C]non + C'était l'homme \[G]de Cro-Mag\[C]non \end{verse} \begin{chorus} L'homme de \[C]cro, l'homme de ma, l'homme de gnon - L'\[G7]homme de cromagn\[C]on \echo{bouh !} + L'\[G7]homme de Cro-Magn\[C]on \echo{bouh !} L'\[F]homme de cro, de mag\[C]non c'était pas du bi\[G]don - L'homme de croma\[C]gnon \rep{2} + L'homme de Cro-Ma\[C]gnon \rep{2} \end{chorus} \begin{verse} diff --git a/songs/Traditionnel/La_cucaracha.sg b/songs/Traditionnel/La_cucaracha.sg index 9fefea8d..b2b5cc1b 100644 --- a/songs/Traditionnel/La_cucaracha.sg +++ b/songs/Traditionnel/La_cucaracha.sg @@ -10,7 +10,7 @@ La cuca\[C]racha, la cucaracha Ya no puede cami\[G]nar Porque no tiene, porque le falta - Marijuana que fu\[C]mar + Marihuana que fu\[C]mar \end{verse} \endsong diff --git a/songs/Tryo/Le_petit_chose.sg b/songs/Tryo/Le_petit_chose.sg index e331ba4a..75730a2e 100644 --- a/songs/Tryo/Le_petit_chose.sg +++ b/songs/Tryo/Le_petit_chose.sg @@ -3,7 +3,6 @@ \beginsong{Le petit chose} [by=Tryo,cov=faut-qu-ils-s-activent,album=Faut qu'ils s'activent] - \cover \gtab{Dm}{5:X02210} \gtab{A}{5:022100} @@ -11,12 +10,11 @@ \gtab{A#}{6:022100} \gtab{C}{8:022100} - \begin{verse} On a \[Dm]tous nos intérieurs, nos petits \[A]choses Ce qui \[Dm]fait au fond de nous qu'on est tout d'\[A]même quelque chose Celui qui \[Gm]gratte ou qui s'ti\[Dm]tille - Celui qui \[A]dort ou qui s'ra\[Dm]bille + Celui qui \[A]dort ou qui s'rha\[Dm]bille Le petit \[A]chose au fond d'son \[A#]âme Qui nous com\[C]prend ou qui s'pa\[A]vane \end{verse} diff --git a/songs/Vincent_Malone/L_escargot_malheureux.sg b/songs/Vincent_Malone/L_escargot_malheureux.sg index 4a0ef76e..9717a9ab 100644 --- a/songs/Vincent_Malone/L_escargot_malheureux.sg +++ b/songs/Vincent_Malone/L_escargot_malheureux.sg @@ -10,7 +10,7 @@ \begin{verse} \[C]Il était une fois un petit \[F]escargot - \[C]Qui se balançait en haut d'un \[G7]esca\[C]bot + \[C]Qui se balançait en haut d'un \[G7]esca\[C]beau \[C]Mais voilà qu'il s'affole \[F]Que tout dégringole : {\og}Ah zut, flûte et pomme de terre @@ -28,5 +28,3 @@ \end{verse} \endsong - - diff --git a/songs/Yodelice/Sunday_with_a_flu.sg b/songs/Yodelice/Sunday_with_a_flu.sg index e3b7e752..21a9eeee 100644 --- a/songs/Yodelice/Sunday_with_a_flu.sg +++ b/songs/Yodelice/Sunday_with_a_flu.sg @@ -16,7 +16,7 @@ \begin{verse} \[Bm]Closed my door, forgot my key Missed my bus in the pouring rain - It's \[G]been the usual su\[D]nday with a flu \[Bm] + It's \[G]been the usual Su\[D]nday with a flu \[Bm] \[G]And I just can't \[D]get over you \[Bm] \end{verse} diff --git a/songs/Yuki_Kajiura/Vanity.sg b/songs/Yuki_Kajiura/Vanity.sg index 8298cf5a..92eee346 100644 --- a/songs/Yuki_Kajiura/Vanity.sg +++ b/songs/Yuki_Kajiura/Vanity.sg @@ -8,7 +8,7 @@ \gtab{G}{320003} \gtab{F}{1:022100} \gtab{C}{X32010} - \gtab{C/B}{X20010} + \gtab*{C/B}{X20010} \gtab{E7}{X20100} \lilypond{Vanity} From ca11217dc3f28ba15587982bad6a09a264327734 Mon Sep 17 00:00:00 2001 From: Romain Goffe Date: Sat, 2 Jun 2012 16:34:10 +0200 Subject: [PATCH 17/18] razor --- songs/Razorlight/America.sg | 82 ++++++++++++++++++++----------------- 1 file changed, 44 insertions(+), 38 deletions(-) diff --git a/songs/Razorlight/America.sg b/songs/Razorlight/America.sg index 8ded3340..31be976a 100644 --- a/songs/Razorlight/America.sg +++ b/songs/Razorlight/America.sg @@ -4,68 +4,74 @@ [by=Razorlight,cov=Razorlight,album=Razorlight] \cover + \gtab{G}{320003} \gtab{A}{X02220} - \gtab{B}{2:X03330} - \gtab{E}{022100} \gtab{D}{XX0232} - \gtab{G}{320033} + \gtab{Em}{022000} \begin{verse} - \[A]What a \[B]drag it is - The \[E]shape i'm \[A]in - \[A]Well I \[B]go out somewhere - Then \[E]I come home \[A]again + \[G]What a \[A]drag it is + The \[D]shape i'm \[G]in + Well I \[A]go out somewhere + Then I \[D]come home a\[G]gain \end{verse} \begin{verse*} - \[A]I light a \[B]cigarette - 'Cause \[E]I can't get no \[A]sleep - \[A]There's nothing on the TV, \[B]nothing on the radio - That \[E]means that much to \[A]me + \[G]{I light} a \[A]cigarette + 'Cause \[D]{I can't} get no \[G]sleep + There's \[G]nothing on the TV, \[A]nothing on the radio + That \[D]means that much to \[G]me \end{verse*} \begin{chorus} - \[A]All my \[B]life \[E] - Watching \[A]America - \[A]All my \[B]life \[E] - There's panic in \[A]America - \[A]Oh, oh, \[B]oh, oh\[E] - There's trouble in \[A]America - \[A]Oh, oh, \[B]oh, oh\[E] + \[G]All my \[A]life\[D] + Watching A\[G]merica + \[G]All my \[A]life \[D] + There's panic in A\[G]merica + \[Em]Oh, oh, \[A]oh, oh\[D] + There's trouble in A\[G]merica + \[Em]Oh, oh, \[A]oh, oh\[D] \end{chorus} \begin{repeatedchords} \begin{verse} - \[A]Yesterday \[B]was easy - Happiness \[E] came and \[A]went - \[A]I got the \[B]movie script - But I \[E]don't know what it\[A] meant + \[G]Yesterday \[A]was easy + Happiness \[D] came and \[G]went + I got the \[A]movie script + But I \[D]don't know what it \[G]meant \end{verse} \begin{verse*} - \[A]I light a \[B]cigarette - 'Cause \[E]I can't get no \[A]sleep - \[A]Theres nothing on the TV \[B]nothing on the radio - That \[E]means that much to \[A]me - \[A]Theres nothing on the TV \[B]nothing on the radio - That I \[E]can believe \[A]in + \[G]{I light} a \[A]cigarette + 'Cause \[D]I can't get no \[G]sleep + There's \[G]nothing on the TV, \[A]nothing on the radio + That \[D]means that much to \[G]me + There's \[G]nothing on the TV, \[A]nothing on the radio + That \[D]{I can} believe \[G]in + \end{verse*} + + \begin{verse} + \[G]Yester\[A]day was easy + \[D]Yes I got the \[G]news + When you \[A]get it straight + But \[D]stand up, you just can't \[G]lose + \end{verse} + + \begin{verse*} + \[G]Give you my \[A]confidence + \[D]All my faith in \[G]life + Don't stand me up, \[A]don't let me down + \[D]{I need} you to\[G]night \end{verse*} \end{repeatedchords} \begin{bridge} - \[A]Yester\[B]day was easy - \[D]Yes I got the \[G]news - \[A]When you \[B]get it straight, but \[D]stand up you just can't \[G]lose - \[A]Give you my \[B]confidence, \[D]all my faith in \[G]life - \[A]Dont stand me up - \[B]Don't let me down - \[E]I need you \[A]tonight - \[A]To hold \[B]me,\[E] say you'll \[A]be here \rep{3} - \[A]To hold \dots\[B] \[E] + To \[G]hold \[A]me, \[D] say you'll be \[G]here \rep{3} + To \[G]hold \dots\[A] \[D] \end{bridge} \begin{verse*} - \[A]Tell me how does it \[B]feel\[E] \[A] \rep{4} + \[G]Tell me how does it \[A]feel\[D] \[G] \rep{4} \end{verse*} \endsong From 8d8ba25e186e93059fcac24df7b63ad51f543a14 Mon Sep 17 00:00:00 2001 From: Alexandre Dupas Date: Tue, 5 Jun 2012 00:13:59 +0200 Subject: [PATCH 18/18] Clean last NEWS item due to malformed git commit message --- NEWS | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/NEWS b/NEWS index 7557dbd8..abe762b6 100644 --- a/NEWS +++ b/NEWS @@ -8,11 +8,11 @@ broph: Calvin RUssell - 5m2 Dire Straits - Brothers in arms Noir Désir - Toujours être ailleurs -olivier desrobert: - : As de Trefle - Pauvre planete - : As de trefle - La revolution Modif : As de trefle - Pauvre planète +Olivier Desrobert: + As de Trefle - Pauvre planete + As de trefle - La revolution Les cowboys fringants - Hannah - : Les Ogres de Barback - Rue Mazarine + Les Ogres de Barback - Rue Mazarine version 3.5.8