Browse Source

Merge remote-tracking branch 'crep/master'

Merge crep last modification in.
remotes/karagrat/master
Alexandre Dupas 13 years ago
parent
commit
95e5932de7
  1. 2
      .gitignore
  2. 18
      NEWS
  3. 6
      books/volume-5.sb
  4. 2
      lilypond/Toujours_etre_ailleurs_rythm.ly
  5. 58
      songs/America/A_Horse_With_No_Name.sg
  6. BIN
      songs/America/America.jpg
  7. 61
      songs/Bloodhound_Gang/Fire_water_burn.sg
  8. BIN
      songs/Bloodhound_Gang/one-fierce-beer-coaster.jpg
  9. 3
      songs/Calvin_Russell/5m2.sg
  10. 114
      songs/Pascale_Picard/Smilin.sg
  11. BIN
      songs/Pascale_Picard/me-myself-us.jpg
  12. 0
      songs/Rose/rose.jpg
  13. 80
      songs/U2/One.sg
  14. BIN
      songs/U2/achtung-baby.jpg
  15. BIN
      songs/coluche/integral.jpg
  16. 87
      songs/coluche/sois_faineant.sg
  17. 2
      templates/ancient.tmpl
  18. 2
      templates/patacrep-en.tmpl
  19. 2
      templates/patacrep.tmpl

2
.gitignore

@ -11,10 +11,12 @@ utils/send.sh
*.sbd
*.sbx
*.sxd
*.sxc
*.log
*.out
*.d
*.pdf
*.pyc
*.tar.gz
default.sb
default.tex

18
NEWS

@ -1,7 +1,17 @@
version 3.5.9
version 3.6.0
Romain Goffe:
Bloodhound Gang - Fire water burn
Pascale Picard - Smilin'
Coluche - Sois fainéant
yoyoma:
Razorlight - America
U2 - One
America - A Horse With No Name
version 3.5.9
broph:
Patrick Coutin - J'aime regarder les filles
Noir Désir - Où veux-tu que je regarde ?
@ -82,6 +92,7 @@ Romain Goffe:
The Dubliners - The wild rover
version 3.5.4
BeXa:
Jeanne Moreau - Les mots de rien
Israel Kamakawiwo - Over the rainbow
@ -106,7 +117,6 @@ Kaosun:
version 3.5.3
Alexandre Dupas:
BeXa:
Vincent Delerm - La natation synchronisée
Kaosun:
@ -151,10 +161,6 @@ broph:
version 3.5.2
Alexandre Dupas:
Matteo Cypriani:
Pipiou:
Romain Goffe:
broph:
Noir Désir - Lazy
William Baldé - Rayon de soleil

6
books/volume-5.sb

@ -13,6 +13,7 @@
"songs" : [
"Alain_Souchon/La_ballade_de_Jim.sg",
"Alain_Souchon/Sous_les_jupes_des_filles.sg",
"America/A_Horse_With_No_Name.sg",
"Anis/Dans_tes_yeux.sg",
"As_De_Trefle/A_l_oreille_de_ta_femme.sg",
"As_De_Trefle/Chanson_d_amur.sg",
@ -20,8 +21,10 @@
"As_De_Trefle/Pauvre_planete.sg",
"As_De_Trefle/Toi_toi_toi.sg",
"Belyscendre/Helas_madame.sg",
"Bloodhound_Gang/Fire_water_burn.sg",
"Calvin_Russell/5m2.sg",
"Calvin_Russell/Down_down_down.sg",
"coluche/sois_faineant.sg",
"Debout_Sur_Le_Zinc/Comme_un_frisson.sg",
"Debout_Sur_Le_Zinc/Elle_m_ennuie.sg",
"Debout_Sur_Le_Zinc/J_ai_deja_donne.sg",
@ -48,8 +51,10 @@
"Maxime_Le_Forestier/Passer_ma_route.sg",
"Noir_Desir/Ou_veux_tu_qu_je_regarde.sg",
"Noir_Desir/Toujours_etre_ailleurs.sg",
"Pascale_Picard/Smilin.sg",
"Patrick_Coutin/J_aime_regarder_les_filles.sg",
"Phil_Barney/Un_enfant_de_toi.sg",
"Razorlight/America.sg",
"Roch_Voisine/Helene.sg",
"Telephone/Le_jour_s_est_leve.sg",
"The_Bloody_Irish_Boys/Drunk_tonight.sg",
@ -63,5 +68,6 @@
"Thomas_Fersen/Louise.sg",
"Thomas_Fersen/Rititi_ratata_il_parait_qu_elles_aiment_.sg",
"Tournee_Generale/Avancer_mes_grolles.sg",
"U2/One.sg",
"Yves_Simon/Les_bateaux_du_metro.sg"]
}

2
lilypond/Toujours_etre_ailleurs_rythm.ly

@ -1,7 +1,7 @@
\include "header"
\paper{
paper-height = 1.1\cm
paper-width = 4.3\cm
paper-width = 5.2\cm
}
<<

58
songs/America/A_Horse_With_No_Name.sg

@ -0,0 +1,58 @@
\selectlanguage{english}
\songcolumns{2}
\beginsong{A Horse With No Name}
[by=America,cov=America,album=America]
\cover
\gtab{Em}{022000}
\gtab{D6/9}{200200}
\gtab{Em9}{X20002}
\gtab{Dmaj9}{XX0220}
\begin{verse}
On the \[Em]first part of the \[D6/9]journey
I was \[Em]lookin at all the \[D6/9]life
There were \[Em]plants and birds and \[D6/9]rocks and things
There were \[Em]sand and hills and \[D6/9]rings
The \[Em]first thing I met was a \[D6/9]fly with a buzz
And the \[Em]sky with no \[D6/9]clouds
The \[Em]heat was hot and the \[D6/9]ground was dry
But the \[Em]air was full of \[D6/9]sound
\end{verse}
\begin{chorus}
I've \[Em9]been thru the desert on a \[Dmaj9]horse with no name
It felt \[Em9]good to be out of the \[Dmaj9]rain
In the \[Em]desert you can't \[Dmaj9]remember your name
Cause there \[Em]ain't no one for to \[Dmaj9]give you no pain
\[Em9]La la la
\[Dmaj9]La la la la la
\[Em9]La la la
\[Dmaj9]La la la la la
\end{chorus}
\begin{repeatedchords}
\begin{bridge}
After \[Em]two days in the \[D6/9]desert sun
My \[Em]skin began to turn \[D6/9]red
After \[Em]three days in the \[D6/9]desert fun
I was \[Em]looking at a river \[D6/9]bed
And the \[Em]story it told of a \[D6/9]river that flowed
Made me \[Em]sad to think it was \[D6/9]dead
\end{bridge}
\begin{verse}
After \[Em]nine days I let the \[D6/9]horse run free
Cause the \[Em]desert had \[D6/9]turned to sea
There were \[Em]plants and birds and \[D6/9]rocks and things
There were \[Em]sand and hills and \[D6/9]rings
The \[Em]ocean is a desert with its \[D6/9]life underground
And the \[Em]perfect disguise \[D6/9]above
Under the \[Em]cities lies a \[D6/9]heart made of ground
But the \[Em]humans will give no \[D6/9]love
\end{verse}
\end{repeatedchords}
\endsong

BIN
songs/America/America.jpg

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.3 KiB

61
songs/Bloodhound_Gang/Fire_water_burn.sg

@ -0,0 +1,61 @@
\selectlanguage{english}
\songcolumns{1}
\beginsong{Fire water burn}
[by=Bloodhound Gang,cov=one-fierce-beer-coaster,album=One fierce beer coaster]
\cover
\gtab{G}{320003}
\gtab{Em}{022000}
\gtab{D}{XX0232}
\gtab{C}{X32010}
\begin{chorus}
The \[G]roof, the roof, the \[Em]roof is on fire \rep{3}
\[D]We don't need no water, let the \[C]motherfucker
Burn motherfucker, \[G]burn
{\nolyrics \[G Em G Em]} \rep{2}
\end{chorus}
\begin{verse}
Hel\[G]lo my name is Jimmy Pop and \[Em]{I'm} a dumb white guy
I'm not \[G]old or new but middle school fifth \[Em]grade like junior high
I don't \[G]know mofo if y'all peeps be buggin' give \[Em]props to my ho cause she all fly
But I can \[D]take the heat cause I'm the other white meat known \[C]as \emph{Kid Funky Fry}
\end{verse}
\begin{repeatedchords}
\begin{verse*}
Yeah, I'm \[G]hung like planet Pluto hard to \[Em]see with the naked eye
But if I \[G]crashed into Uranus I would \[Em]stick it where the sun don't shine
Cause I'm \[G]kinda like Han Solo always \[Em]struck in my own wookie
I'm the \[D]root of all that's evil, yeah, but \[C]you can call me cookie
\end{verse*}
\begin{verse}
Yo, yo, this \[G]hard-core ghetto gangster image \[Em]takes a lot of practice
I'm not \[G]black like Barry White no I am \[Em]white like Frank Black is
So if \[G]man is five and the devil is six than \[Em]that must make me seven
\[G] This honkey's \[Em]gone to heaven
\end{verse}
\begin{verse*}
But if \[G]{I go} to hell then I \[Em]hope I burn well
I'll spend my \[G]days with J.F.K., Marvin Gaye, Martha \[Em]Raye, and Lawrence Welk
And Kurt Co\[G]bain, Kojak, Mark Twain and Jimi \[Em]Hendrix's poltergeist
And \[D]Webster yeah Emmanuel Lewis cause \[C]{he's} the anti-christ
\end{verse*}
\end{repeatedchords}
\begin{bridge}
Everybody here we go
\[G]{Oh, oh,} c'mon party people
\[Em]{Oh, oh,} throw your hands in the air
\[G]{Oh, oh,} c'mon party people
\[Em]{Oh, oh,} wave 'em like you don't care
\[G]{Oh, oh,} c'mon party people
\[Em]{Oh, oh,} everbody say ho
\[G]{Oh, oh,} c'mon party people
\[Em]{Oh, oh,} everybody here we go
\end{bridge}
\endsong

BIN
songs/Bloodhound_Gang/one-fierce-beer-coaster.jpg

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.2 KiB

3
songs/Calvin_Russell/5m2.sg

@ -1,6 +1,6 @@
\selectlanguage{french}
\songcolumns{2}
\beginsong{5m2}
\beginsong{$5m^2$}
[by=Calvin Russell,cov=dawg-eat-dawg,album=Dawg eat dawg]
\cover
@ -11,6 +11,7 @@
\gtab{E}{022100}
\gtab*{Am/C}{X32210}
\gtab{G}{320003}
\gtab{G7}{320001}
\begin{verse}
\[Am] Cinq mètres carrés, plus de télé

114
songs/Pascale_Picard/Smilin.sg

@ -0,0 +1,114 @@
\selectlanguage{english}
\songcolumns{2}
\beginsong{Smilin'}
[by=Pascale Picard,cov=me-myself-us,album=Me myself \& us]
\cover
\capo{5}
\gtab{G}{320003}
\gtab{D}{XX0232}
\gtab{Em}{022000}
\gtab{C}{X32010}
\begin{verse}
\[C]{I am} not gonna \[Am]make it
\[C]{I can} see the crowd a\[Am]round me
Is getting \[G]bigger and as it is
I'm trying to fi\[Dm]gure out
Why \[F]{I feel} \[G]so iso\[C]lated
\end{verse}
\begin{verse*}
\[C]{I have} my \[Am]friends
But don't have much time for \[C]them
\[C]{I have} my \[Am]house
A tiny pocket in my \[G]luggage
I have my \[Dm]boyfriend
But he's also so \[F]tired of listening \[G]to me \[C]
\end{verse*}
\begin{verse*}
\[C]Every single \[Am]day
Seems like a mountain to \[C]climb
Every single \[Am]word
It takes all my strength to \[G]get it out
I'm tired of \[Dm]talking about me
But in fact, it's the \[F]only thing I get a \[G]grip on
\end{verse*}
\begin{verse*}
\[C]{I feel} \[Am]like I'm not gonna make it
\[C]{I really} feel \[Am]like I'm not gonna make \[G]it
But it \[Dm]might be the best thing
That ever happened \[F]to me, so \[G]now
\end{verse*}
\begin{chorus}
\[C]Hey, little girl keep on \[Em]smiling
'Cause they don't want to \[Dm]hear you complaining
You're a \[F]lucky girl, your life's \[G]so exciting \[C]
So I'll \[C]keep on making bad \[Em]jokes
'Cause you think I'm st\[Dm]rong
And it might be the way you like \[F]it
Oh how I \[G]need you to like \[C]me?
\end{chorus}
\begin{repeatedchords}
\begin{verse}
\[C]{I have} tried as hard as \[Am]{I can}
\[C]{I have} tried to \[Am]go through 9 to 5
But I was like a \[G]train
Between work and \[Dm]bars
Never found out \[F]what I was \[G]travelling for \[C]
\end{verse}
\begin{verse*}
\[C]Now I have my \[Am]car
But I ain't got no safe place to \[C]go
\[C]{I still} hold my \[Am]drink
But I'm not as \[Am]thirsty as be\[G]fore
I have my \[Dm]voice but I heard lately that people
\[F]Don't want to hear sad \[G]songs \[C]
\end{verse*}
\begin{verse*}
\[C]Every single \[Am]place
It's all the same to \[C]me
Every single \[Am]face
I know it will be re\[G]placed
By another smiley \[Dm]one
Who will also be left soon \[F]somewhere be\[G]hind
\end{verse*}
\begin{verse*}
\[C]I feel \[Am]like I'm not gonna make it
\[C]I really feel \[Am]like I'm not gonna make \[G]it
But it \[Dm]might be the best thing
That ever happened \[F]to me, so \[G]now
\end{verse*}
\end{repeatedchords}
\begin{verse}
\[C]Please now just don't count on \[Em]me
I can't handle it any\[Dm]more
And don't ask me why
If you don't want me to \[C]lie
\end{verse}
\begin{verse*}
\[C]But don't be a\[Em]larmed
Don't you see that I'm just \[Dm]down
Just \[F]{don't} worry soon
I'll be \[G]back on the tracks
\end{verse*}
\begin{chorus}
\[C]Smiling!'Cause I'll get tired of com\[Em]plaining
I'm a \[F]lucky girl and I'm \[G]doing exactly what I wanted
So I'll \[C]keep on making bad \[Em]jokes
'Cause I need to be \[Dm]strong
It might be my only chance to get out of \[F]it
And now I \[G]really need to \[C]make it
\end{chorus}
\endsong

BIN
songs/Pascale_Picard/me-myself-us.jpg

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.1 KiB

0
songs/Rose/Rose.jpg → songs/Rose/rose.jpg

Before

Width:  |  Height:  |  Size: 3.9 KiB

After

Width:  |  Height:  |  Size: 3.9 KiB

80
songs/U2/One.sg

@ -0,0 +1,80 @@
\selectlanguage{english}
\songcolumns{2}
\beginsong{One}
[by=U2,cov=achtung-baby,album=Achtung Baby]
\cover
\gtab{Am}{X02210}
\gtab{D}{XX0232}
\gtab{F}{1:022100}
\gtab{G}{320003}
\gtab{C}{X32010}
\begin{verse}
\[Am] Is it getting \[D]better
\[F] Or do you feel the \[G]same?
\[Am] Will it make it \[D]easier on you, now
\[F] You got someone to \[G]blame?
\end{verse}
\begin{chorus}
You say \[C] one love, \[Am] one life
\[F] When it's one need \[C] in the night
\[C] One love, \[Am] we get to share it
\[F] Leaves you baby if you \[C]don't care for it
\end{chorus}
\begin{repeatedchords}
\begin{verse}
\[Am] Did I disap\[D]point you
\[F] Or leave a bad taste in your \[G]mouth?
\[Am] You act like you never \[D]had love
\[F] You want me to go with\[G]out
\end{verse}
\begin{chorus}
Well it's \[C] too late, \[Am] tonight
\[F] To drag the past out \[C] into the light
\[C] We're one, but \[Am] we're not the same
We get to \[F] carry each other, \[C] carry each other
\end{chorus}
\begin{verse}
\[Am] Have you come here for for\[D]giveness?
\[F] Have you come to raise \[G]the dead?
\[Am] Have you come here to play \[D]Jesus
\[F] To the lepers in your \[G]head?
\end{verse}
\begin{chorus}
\[C] Did I ask too much? \[Am] More than a lot?
\[F] You gave me nothing, now it's \[C] all I got
\[C] We're one but we're \[Am]not the same
Well we \[F] hurt each other, then we \[C]do it again
\end{chorus}
\end{repeatedchords}
\begin{bridge}
\[C]You say love is a \[Am]temple, love a higher law
\[C]Love is a temple, \[Am]love the higher law
You \[C]ask me to enter but \[G]then you make me crawl
And \[G]{I can't} be holding \[F]on to what you got \[F]when all you got is hurt
\end{bridge}
\begin{repeatedchords}
\begin{chorus}
\[C] One love, \[Am] one blood
\[F] One life, you got to \[C]do what you should
\[C] One life \[Am] with each other
\[F] Sisters, \[C] brothers
\end{chorus}
\begin{chorus}
\[C]One life, but we're \[Am]not the same
We get to \[F] carry each other, car\[C]ry each other
One \[C] \[Am] \[F] \[C]\rep{2}
\end{chorus}
\end{repeatedchords}
\endsong

BIN
songs/U2/achtung-baby.jpg

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.5 KiB

BIN
songs/coluche/integral.jpg

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.0 KiB

87
songs/coluche/sois_faineant.sg

@ -0,0 +1,87 @@
\selectlanguage{french}
\songcolumns{2}
\beginsong{Sois fainéant}
[by=Coluche,cov=integral,album=Intégral]
\cover
\gtab{D}{XX0232}
\gtab{A}{X02220}
\gtab{G}{320003}
\begin{verse}
\[D]{À toi} l'enfant qui vient de naître
Je dois dire pour être honnête
Que ce n'est pas en travail\[A]lant
Qu'on trouve le bonheur sur \[G]terre
J'en veux l'exemple que mon \[D]père
Qui vit l'jour de son enterre\[A]ment
Qu'il était le \[G]plus riche du cime\[D]tière
\end{verse}
\begin{chorus}
\[D]Sois fainéant, sois fainéant
\[A]Tu vivras con\[D]tent
Sois fai\[G]néant, sois fai\[D]néant
\[A]Tu vivras long\[D]temps
\end{chorus}
\begin{repeatedchords}
\begin{verse}
\[D]Plutôt que d'apprendre à l'école
Baise et collectionne les véroles
La médecine fait quelques pro\[A]grès
Tandis qu'a gagner du ba\[G]gage
Tu n'aboutirais qu'au chô\[D]mage
Où déjà se sont entas\[A]sés
Ceux qu'ont cru \[G]en la socié\[D]té
\end{verse}
\begin{verse}
\[D]Moins tu en fais, plus tu l'espères
Plus ta santé déjà précaire
Te libère de ses tour\[A]ments
Gagner ta vie ne vaut pas l'\[G]coup
Attendu que tu l'as dé\[D]jà
Le boulot y'en a pas beau\[A]coup
Faut le lais\[G]ser à ceux qu'aiment \[A]ça
\end{verse}
\begin{verse}
\[D]Si jamais tu voles un copain
Tu en auras moins de chagrin
Que si tu n'as pas à man\[A]ger
Et si t'as la main sur le \[G]cœur
N'hésite pas à la cou\[D]per
Tu entendras moins les mo\[A]queurs
Si c'est toi \[G]qui les a rou\[D]lés
\end{verse}
\begin{verse}
\[D]Si jamais tu voles un couillon
Qui t'envoie tout droit en prison
Dis-toi qu'il est plus mal lo\[A]gé
Car pour payer sa pi\[G]tance
Tandis que tu f'ras péni\[D]tence
Lui qu'est si fier de t'enfer\[A]mer
Faudra en\[G]core qu'il aille bos\[A]ser
\end{verse}
\begin{verse}
\[D]Voilà, c'était mon héritage
Comme tu vois j'ai fait mes bagages
Je te laisse avec ta mo\[A]man
Tu perds rien, j'ai pas l'gros \[G]lot
Et tant pis pour toi si je \[D]triche
Tu s'ras p't'être un enfant d'sa\[A]laud
Mais tu s'ras \[G]pas un gosse de \[D]riche
\end{verse}
\begin{chorus}
\[D]Sois fainéant, sois fainéant
\[A]Tu vivras con\[D]tent
Sois fai\[G]néant, mon en\[D]fant
\[A]{L'avenir} t'at\[D]tend
\end{chorus}
\end{repeatedchords}
\endsong

2
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.9"},
%%: {"name":"version", "description":"Version", "default":"3.6.0"},
%%: {"name":"subtitle", "description":"Subtitle"},
%%: {"name":"web", "description":"Web", "default":"http://www.patacrep.com"},
%%: {"name":"mail", "description":"Email", "default":"crep@team-on-fire.com"},

2
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.9"},
%%: {"name":"version", "description":"Version", "default":"3.6.0"},
%%: {"name":"subtitle", "description":"Subtitle"},
%%: {"name":"web", "description":"Web", "default":"http://www.patacrep.com"},
%%: {"name":"mail", "description":"Email", "default":"crep@team-on-fire.com"},

2
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.9"},
%%: {"name":"version", "description":"Version", "default":"3.6.0"},
%%: {"name":"subtitle", "description":"Subtitle"},
%%: {"name":"web", "description":"Web", "default":"http://www.patacrep.com"},
%%: {"name":"mail", "description":"Email", "default":"crep@team-on-fire.com"},

Loading…
Cancel
Save