Browse Source

Merge remote branch 'crep/master'

remotes/bexa/master
Alexandre Dupas 13 years ago
parent
commit
9fbf91b147
  1. 12
      img/src/by-sa.svg
  2. 15
      img/src/by.svg
  3. 194
      img/src/capodastre.svg
  4. 15
      img/src/remix.svg
  5. 15
      img/src/sa.svg
  6. 15
      img/src/share.svg
  7. 42
      songs/Ben_E_King/Stand_by_me.sg
  8. BIN
      songs/Ben_E_King/ben-e-king-best-of.jpg
  9. 2
      songs/Crep/Nostalgeek.sg
  10. 4
      songs/Gipsy_Kings/Bamboleo.sg
  11. 2
      songs/Hugues_Aufray/Debout_les_gars.sg
  12. 4
      songs/Michel_Fugain/Forteresse.sg
  13. 8
      songs/Tri_Yann/La_jument_de_Michao.sg
  14. BIN
      songs/Tri_Yann/la-decouverte-ou-l-ignorance.jpg

12
img/src/by-sa.svg

@ -13,20 +13,12 @@
height="42"
id="svg2759"
sodipodi:version="0.32"
inkscape:version="0.47 r22583"
inkscape:version="0.48.2 r9819"
version="1.0"
sodipodi:docname="by-sa.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape">
<defs
id="defs2761">
<inkscape:perspective
sodipodi:type="inkscape:persp3d"
inkscape:vp_x="0 : 21 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_z="120 : 21 : 1"
inkscape:persp3d-origin="60 : 14 : 1"
id="perspective31" />
</defs>
id="defs2761" />
<sodipodi:namedview
id="base"
pagecolor="#ffffff"

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 14 KiB

15
img/src/by.svg

@ -18,23 +18,12 @@
viewBox="5.5 -3.5 64 64"
enable-background="new 5.5 -3.5 64 64"
xml:space="preserve"
inkscape:version="0.47 r22583"
inkscape:version="0.48.2 r9819"
sodipodi:docname="by.svg"><metadata
id="metadata15"><rdf:RDF><cc:Work
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
id="defs13"><inkscape:perspective
sodipodi:type="inkscape:persp3d"
inkscape:vp_x="0 : 32 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_z="64 : 32 : 1"
inkscape:persp3d-origin="32 : 21.333333 : 1"
id="perspective17" />
</defs><sodipodi:namedview
id="defs13" /><sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"

Before

Width:  |  Height:  |  Size: 3.4 KiB

After

Width:  |  Height:  |  Size: 3.2 KiB

194
img/src/capodastre.svg

@ -14,174 +14,12 @@
height="270.24902"
id="svg2"
sodipodi:version="0.32"
inkscape:version="0.47pre4 r22446"
inkscape:version="0.48.2 r9819"
sodipodi:docname="capodastre.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape"
version="1.0">
<defs
id="defs4">
<linearGradient
inkscape:collect="always"
id="linearGradient4264">
<stop
style="stop-color:#ce5c00;stop-opacity:0.18978103;"
offset="0"
id="stop4266" />
<stop
id="stop4274"
offset="0.04529195"
style="stop-color:#ce5c00;stop-opacity:0.65490196;" />
<stop
id="stop4272"
offset="0.5"
style="stop-color:#ce5c00;stop-opacity:1;" />
<stop
style="stop-color:#ce5c00;stop-opacity:1"
offset="1"
id="stop4268" />
</linearGradient>
<linearGradient
id="linearGradient4208">
<stop
style="stop-color:#d3d7cf;stop-opacity:1;"
offset="0"
id="stop4210" />
<stop
id="stop4216"
offset="0.5"
style="stop-color:#d3d7cf;stop-opacity:0.49803922;" />
<stop
style="stop-color:#d3d7cf;stop-opacity:0;"
offset="1"
id="stop4212" />
</linearGradient>
<linearGradient
inkscape:collect="always"
id="linearGradient4152">
<stop
style="stop-color:#babdbd;stop-opacity:1;"
offset="0"
id="stop4154" />
<stop
style="stop-color:#babdbd;stop-opacity:0;"
offset="1"
id="stop4156" />
</linearGradient>
<linearGradient
id="linearGradient4136">
<stop
style="stop-color:#888a85;stop-opacity:1;"
offset="0"
id="stop4138" />
<stop
style="stop-color:#888a85;stop-opacity:0;"
offset="1"
id="stop4140" />
</linearGradient>
<linearGradient
inkscape:collect="always"
id="linearGradient4096">
<stop
style="stop-color:#888a85;stop-opacity:1;"
offset="0"
id="stop4098" />
<stop
style="stop-color:#888a85;stop-opacity:0;"
offset="1"
id="stop4100" />
</linearGradient>
<inkscape:perspective
sodipodi:type="inkscape:persp3d"
inkscape:vp_x="0 : 526.18109 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_z="744.09448 : 526.18109 : 1"
inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
id="perspective10" />
<inkscape:perspective
id="perspective2467"
inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
inkscape:vp_z="744.09448 : 526.18109 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_x="0 : 526.18109 : 1"
sodipodi:type="inkscape:persp3d" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4096"
id="linearGradient4102"
x1="291.38043"
y1="12.497697"
x2="341.96307"
y2="191.24435"
gradientUnits="userSpaceOnUse" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4096"
id="linearGradient4129"
gradientUnits="userSpaceOnUse"
x1="291.38043"
y1="12.497697"
x2="359.49289"
y2="313.4053"
gradientTransform="matrix(0.9219968,0,0,0.9219968,11.130602,15.263875)" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4136"
id="linearGradient4142"
x1="139.24814"
y1="148.48941"
x2="194.34111"
y2="305.30725"
gradientUnits="userSpaceOnUse" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4152"
id="linearGradient4158"
x1="389.28571"
y1="256.38773"
x2="389.28571"
y2="308.33664"
gradientUnits="userSpaceOnUse" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4208"
id="linearGradient4214"
x1="389.55643"
y1="257.24625"
x2="389.28571"
y2="282.36218"
gradientUnits="userSpaceOnUse" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4264"
id="linearGradient4270"
x1="18.029827"
y1="143.94373"
x2="315.51974"
y2="84.344727"
gradientUnits="userSpaceOnUse" />
<inkscape:perspective
id="perspective4286"
inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
inkscape:vp_z="1 : 0.5 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_x="0 : 0.5 : 1"
sodipodi:type="inkscape:persp3d" />
<inkscape:perspective
id="perspective4459"
inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
inkscape:vp_z="1 : 0.5 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_x="0 : 0.5 : 1"
sodipodi:type="inkscape:persp3d" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4208-7"
id="linearGradient4214-9"
x1="389.55643"
y1="257.24625"
x2="389.28571"
y2="282.36218"
gradientUnits="userSpaceOnUse" />
<linearGradient
id="linearGradient4208-7">
<stop
@ -197,16 +35,6 @@
offset="1"
id="stop4212-7" />
</linearGradient>
<linearGradient
gradientTransform="translate(57.187979,416.51405)"
inkscape:collect="always"
xlink:href="#linearGradient4264-7"
id="linearGradient4270-4"
x1="18.029827"
y1="143.94373"
x2="315.51974"
y2="84.344727"
gradientUnits="userSpaceOnUse" />
<linearGradient
inkscape:collect="always"
id="linearGradient4264-7">
@ -227,16 +55,6 @@
offset="1"
id="stop4268-2" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4096-0"
id="linearGradient4129-3"
gradientUnits="userSpaceOnUse"
x1="291.38043"
y1="12.497697"
x2="359.49289"
y2="313.4053"
gradientTransform="matrix(0.9219968,0,0,0.9219968,68.318581,431.77793)" />
<linearGradient
inkscape:collect="always"
id="linearGradient4096-0">
@ -249,16 +67,6 @@
offset="1"
id="stop4100-0" />
</linearGradient>
<linearGradient
gradientTransform="translate(57.187979,416.51405)"
inkscape:collect="always"
xlink:href="#linearGradient4136-7"
id="linearGradient4142-5"
x1="139.24814"
y1="148.48941"
x2="194.34111"
y2="305.30725"
gradientUnits="userSpaceOnUse" />
<linearGradient
id="linearGradient4136-7">
<stop

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 13 KiB

15
img/src/remix.svg

@ -18,23 +18,12 @@
viewBox="5.5 -3.5 64 64"
enable-background="new 5.5 -3.5 64 64"
xml:space="preserve"
inkscape:version="0.47 r22583"
inkscape:version="0.48.2 r9819"
sodipodi:docname="remix.svg"><metadata
id="metadata15"><rdf:RDF><cc:Work
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
id="defs13"><inkscape:perspective
sodipodi:type="inkscape:persp3d"
inkscape:vp_x="0 : 32 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_z="64 : 32 : 1"
inkscape:persp3d-origin="32 : 21.333333 : 1"
id="perspective17" />
</defs><sodipodi:namedview
id="defs13" /><sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"

Before

Width:  |  Height:  |  Size: 3.0 KiB

After

Width:  |  Height:  |  Size: 2.8 KiB

15
img/src/sa.svg

@ -18,23 +18,12 @@
viewBox="5.5 -3.5 64 64"
enable-background="new 5.5 -3.5 64 64"
xml:space="preserve"
inkscape:version="0.47 r22583"
inkscape:version="0.48.2 r9819"
sodipodi:docname="sa.svg"><metadata
id="metadata15"><rdf:RDF><cc:Work
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
id="defs13"><inkscape:perspective
sodipodi:type="inkscape:persp3d"
inkscape:vp_x="0 : 32 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_z="64 : 32 : 1"
inkscape:persp3d-origin="32 : 21.333333 : 1"
id="perspective17" />
</defs><sodipodi:namedview
id="defs13" /><sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 2.9 KiB

15
img/src/share.svg

@ -18,23 +18,12 @@
viewBox="5.5 -3.5 64 64"
enable-background="new 5.5 -3.5 64 64"
xml:space="preserve"
inkscape:version="0.47 r22583"
inkscape:version="0.48.2 r9819"
sodipodi:docname="share.svg"><metadata
id="metadata15"><rdf:RDF><cc:Work
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
id="defs13"><inkscape:perspective
sodipodi:type="inkscape:persp3d"
inkscape:vp_x="0 : 32 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_z="64 : 32 : 1"
inkscape:persp3d-origin="32 : 21.333333 : 1"
id="perspective17" />
</defs><sodipodi:namedview
id="defs13" /><sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"

Before

Width:  |  Height:  |  Size: 3.3 KiB

After

Width:  |  Height:  |  Size: 3.1 KiB

42
songs/Ben_E_King/Stand_by_me.sg

@ -0,0 +1,42 @@
\selectlanguage{english}
\songcolumns{2}
\beginsong{Stand by me}
[by=Ben E.King,cov=ben-e-king-best-of,album=Best of]
\cover
\gtab{C}{X32010}
\gtab{Am}{X02210}
\gtab{F}{1:022100}
\gtab{G}{320003}
\beginverse
When the \[C]night has come \[Am] and the land is dark
And the \[F]moon is the \[G]only light we \[C]see
\endverse
\beginverse*
No I won't be afraid, oh, I won't be afraid
Just as long as you stand, stand by me
\endverse
\beginchorus
So darling, darling, stand by me, oh stand by me
Oh stand, stand by me, stand by me
\endchorus
\beginverse
If the sky that we look upon should tumble and fall
Or the mountains should crumble to the sea
\endverse
\beginverse*
I won't cry, I won't cry, no I won't shed a tear
Just as long as you stand, stand by me
\endverse
\beginchorus
Whenever your in trouble won't you stand by me, oh stand by me
Oh stand, oh stand, stand by me
\endchorus
\endsong

BIN
songs/Ben_E_King/ben-e-king-best-of.jpg

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.7 KiB

2
songs/Crep/Nostalgeek.sg

@ -6,7 +6,7 @@
\cover
\gtab{C}{X32010}
\gtab{F}{1:022100}
\gtab{So7}{320001}
\gtab{G7}{320001}
\gtab{G}{320003}
\gtab{Cm}{3:X02210}
\gtab{B&}{1:X02220}

4
songs/Gipsy_Kings/Bamboleo.sg

@ -10,7 +10,7 @@
\gtab{Am}{X02210}
\gtab{Am7}{X02010}
\gtab{D7}{XX0212}
\gtab{GMaj7}{320002}
\gtab{Gmaj7}{320002}
\beginverse
\[Em]Este amor llega \[B7]asi esta ma\[Em]nera
@ -36,7 +36,7 @@
\beginverse
No tiene pardon de \[Am7]dios
Tu eres mi \[D7]vida, la fortuna del des\[GMaj7]tino
Tu eres mi \[D7]vida, la fortuna del des\[Gmaj7]tino
Pero el des\[C]tino tendressa \[Am]para dos
Lo mismo yo que \[B7]ayer
Lo mismo soy \[Em]yo

2
songs/Hugues_Aufray/Debout_les_gars.sg

@ -26,7 +26,7 @@
Il ne faut pas se dégonfler
Devant des tonnes de rochers
On va faire un 14 juillet
À coup de dynamite
À coups de dynamite
\endverse
\beginverse

4
songs/Michel_Fugain/Forteresse.sg

@ -10,7 +10,7 @@
\gtab{Dm}{XX0231}
\gtab{Fmaj7}{XX3210}
\gtab{A}{X02220}
\gtab{Eb(dim)}{XX1212}
\gtab{E&dim}{XX1212}
\gtab{Am/C}{X32210}
\beginverse
@ -20,7 +20,7 @@
\beginverse
L'\[Am]amour est une forte\[E7]resse
Dont \[Am]les murs sont faits de pro\[Dm]messes
C'est \[Fmaj7]là que dorment les \[Eb(dim)]amants
C'est \[Fmaj7]là que dorment les \[E&dim]amants
Ca\[E7]chés de tout, cachés du temps
\endverse

8
songs/Tri_Yann/La_jument_de_Michao.sg

@ -1,11 +1,11 @@
\selectlanguage{french}
\songcolumns{2}
\beginsong{La jument de Michao}
[by=Tri Yann,cov=le-meilleur-de-tri-yann,album=Le meilleur de Tri Yann]
[by=Tri Yann,cov=la-decouverte-ou-l-ignorance,album=Le meilleur de Tri Yann]
\cover
\gtab{Am}{022000}
\gtab{G}{XX0232}
\gtab{Am}{X02210}
\gtab{G}{320003}
\beginverse
C'est dans dix \[Am]ans, je m'en \[G]i\[Am]rai
@ -24,7 +24,7 @@
\beginverse*
La jument de Michao et son petit poulain
A passé dans le pré, a mangé tout le foin \rep{2}
A passé dans le pré et mangé tout le foin \rep{2}
\endverse
\beginverse*

BIN
songs/Tri_Yann/la-decouverte-ou-l-ignorance.jpg

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.0 KiB

Loading…
Cancel
Save