From 58d2050dbc318e7d0cbe354d1f5484b4a632a700 Mon Sep 17 00:00:00 2001 From: Alexandre Dupas Date: Sun, 28 Feb 2010 16:20:07 +0100 Subject: [PATCH 1/3] Add music note and change layout. --- songs/Pixies/Where_Is_My_Mind.sg | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/songs/Pixies/Where_Is_My_Mind.sg b/songs/Pixies/Where_Is_My_Mind.sg index bee91f28..0c2fe0ed 100644 --- a/songs/Pixies/Where_Is_My_Mind.sg +++ b/songs/Pixies/Where_Is_My_Mind.sg @@ -6,30 +6,34 @@ \gtab{Do#m}{4:X02210} \gtab{La&}{4:022100} \gtab{La}{5:022100} +\gtab{Lam}{4:022000} \gtab{Do#}{4:X02220} \gtab{Si}{2:X02220} \beginverse -With your \[Mi]feet in the air and your \[Do#m]head on the ground. \[La&] \[La] -\[Mi] Try this trick\[Do#m] and s\[La&]pin it. Ye\[La]ah, -\[Mi] Your head will coll\[Do#m]apse but there's \[La&]nothing in it and you'll \[La]ask yourself. +With your \[Mi]feet in the air and your \[Do#m]{head on} the ground. \[La&] \[La] +\[Mi] Try this tri\[Do#m]ck and \[La&]spin it. Ye\[La]ah! +\[Mi] Your head will coll\[Do#m]{apse but} there's \[La&]nothing in it and you'll \[La]ask yourself. \endverse \beginchorus -\[Mi]Where is my \[Do#m]mind? \[La&] Where is my mind?\[La] -\[Mi]Where is my \[Do#m]mind? \[La&] \[La] +Where is my mind? Where is my mind? +Where is my mind? \endchorus \beginverse* -\[Mi]Way \[Labm]out in the \[La]water see it \[Lam]swimmin' \[Do#] {\ldots} \[Si] +\[Mi]Way \[La&]{out, in} the \[La]water, see it \[Lam]swimmin'. +\[Do#] \[Si] \endverse \beginverse -I was swimmin' in the Carribean -Animals were hiding behind the rock +I was swimmin' in the Carribean. +Animals were hiding behind the rock. Except the little fish but they told me, he swears tryin' to talk to me to me to me. \endverse +\musicnote{chorus, bridge, solo, repeat verse 1, chorus} + \image{brunocb-smells-like-tux-spirit---nirvana-8121}{4} \endsong From fffb11b482a6cdae802950ffbd190cc24e6bbf89 Mon Sep 17 00:00:00 2001 From: crep Date: Sat, 27 Feb 2010 15:40:25 +0100 Subject: [PATCH 2/3] img capodastre: add a few gradients --- img/src/capodastre.svg | 412 ++++++++++++++++++++++++++++++++++------- 1 file changed, 347 insertions(+), 65 deletions(-) diff --git a/img/src/capodastre.svg b/img/src/capodastre.svg index 8437a6dc..7d787ce1 100644 --- a/img/src/capodastre.svg +++ b/img/src/capodastre.svg @@ -1,23 +1,95 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + inkscape:window-y="25" + inkscape:snap-center="false" + inkscape:snap-object-midpoints="true" + inkscape:window-maximized="1" + borderlayer="false" + showborder="false" + inkscape:showpageshadow="false" /> @@ -65,99 +348,98 @@ inkscape:label="Calque 1" inkscape:groupmode="layer" id="layer1" - transform="translate(-14.494294,-12.539998)"> + transform="translate(-81.643273,-443.30076)"> + id="g4576"> + id="path3251-1" + d="m 100.90317,548.47876 c -5.263051,1.17607 -3.048885,-1.92685 -3.491379,-2.60482 -1.006646,-0.0796 -2.758421,-0.24288 -5.014317,-0.34098 -2.026364,-0.50612 -6.691272,-3.89135 -0.799804,-8.93264 l 177.72947,-60.21137 c 5.67085,1.39509 9.17634,6.45627 10.49432,12.6395 -49.69638,12.54822 -173.79352,57.94294 -178.91829,59.45031 z" + style="fill:#fcaf3e;fill-rule:evenodd;stroke:#2e3436;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + id="path3267-6" + d="m 314.37156,514.0032 c 5.58399,2.23709 20.94075,-2.6281 19.20925,-6.98518 l 0.23284,-5.64635 -19.44209,12.63153 z" + style="fill:#555753;fill-rule:evenodd;stroke:#2e3436;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + id="path3259-8" + d="m 258.3857,560.22324 c 7.24482,-1.15572 32.5238,-19.82231 44.36559,-35.56108 7.90094,-10.50103 4.54736,-12.07788 -1.51345,-12.52168 l -42.85214,48.08276 z" + style="fill:#888a85;fill-rule:evenodd;stroke:#2e3436;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + id="path3263-6" + d="m 314.86895,513.82703 c -1.26406,6.83613 -2.25176,14.19043 -6.91497,14.65316 -4.35456,-0.0697 -4.23037,-5.89774 -2.46964,-13.82994 l 9.38461,-0.82322 z" + style="fill:#888a85;fill-rule:evenodd;stroke:#2e3436;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + id="path3247-0" + d="m 160.10521,691.31142 c 12.49777,3.46358 31.49768,-36.81936 36.83564,-48.53387 5.01336,-11.00214 30.4489,-43.46725 9.86655,-83.3578 -9.62411,0.1379 -25.11961,-2.61433 -19.66085,10.93058 l 10.24494,33.52886 -37.28628,87.43223 z" + style="fill:url(#linearGradient4594);fill-opacity:1;fill-rule:evenodd;stroke:#2e3436;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + id="path3249-7" + d="m 313.56176,448.22265 c 38.77054,-17.04646 46.49301,20.66446 46.56446,21.01718 -0.69357,65.70699 -0.0576,85.43265 0.25281,129.05122 l -15.83307,9.31357 -1.26064,-130.58293 c -13.03059,-32.14496 -20.63988,-21.91425 -29.72356,-28.79904 z" + style="fill:url(#linearGradient4596);fill-opacity:1;fill-rule:evenodd;stroke:#2e3436;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + id="path3265-6" + d="m 313.05789,513.50774 c -0.64272,9.23335 -3.84612,15.42982 -6.461,13.94141 -2.09668,-1.19345 -1.86293,-7.35419 -0.71849,-13.06653 l 7.17949,-0.87488 z" + style="fill:#d3d7cf;fill-rule:evenodd;stroke:#2e3436;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + id="path3255-6" + d="m 344.7905,608.1833 c 9.98497,22.97383 19.47525,41.82012 18.92333,63.24756 -2.12814,13.58583 -0.21617,21.86648 -5.88433,40.56569 3.75891,0.94847 5.2533,1.55935 8.5751,-2.73757 19.13155,-29.42293 2.34855,-65.5443 -16.43515,-103.98275 -2.35557,0.7495 -4.57926,2.15757 -5.17895,2.90707 z" + style="fill:#fcaf3e;fill-rule:evenodd;stroke:#2e3436;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + id="path3257-0" + d="m 362.9568,597.79713 -13.07209,7.28621 c 17.83126,42.75963 27.58744,72.50031 16.41511,103.30638 0.076,7.2569 20.38918,-26.07489 15.50043,-50.95748 -2.02089,-15.85479 -8.93018,-36.32641 -18.84345,-59.63511 z" + style="fill:#ce5c00;fill-rule:evenodd;stroke:#2e3436;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + id="path3269-8" + d="m 345.57475,606.76761 4.52766,-1.97571 12.75978,-7.24426 -2.38732,0.49393 -14.90012,8.72604 z" + style="fill:#ce5c00;fill-rule:evenodd;stroke:#2e3436;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + id="path3271-0" + d="m 97.190659,545.78578 c -0.05205,3.66172 1.176256,3.16234 2.328392,2.91049 7.315219,-2.05686 119.989889,-43.31056 179.751989,-58.67553 l -1.39704,-5.82098 c -69.84915,19.80499 -164.07834,54.98193 -180.683341,61.58602 z" + style="fill:url(#linearGradient4598);fill-opacity:1;fill-rule:evenodd;stroke:#2e3436;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + id="path3253-4" + d="m 158.60375,531.6425 c -4.83248,0.14813 -4.14114,12.70054 -4.05471,13.0955 l 98.87399,10.96968 41.43655,-49.21184 c -2.70507,-0.18538 -6.69283,-1.36358 -8.79867,0.25424 -10.84482,12.65061 -15.74533,17.01725 -30.18195,32.8606 -16.08304,-0.78903 -56.72049,-0.17668 -97.27521,-7.96818 z" + style="fill:#fcaf3e;fill-rule:evenodd;stroke:#2e3436;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + id="path3273-8" + d="m 157.72889,531.23331 c -1.53438,0.91635 -2.94804,2.2552 -3.25975,7.45087 35.0582,2.86002 72.00296,7.9593 99.65524,5.12246 5.16231,-6.4613 3.2177,-5.96001 1.39704,-4.65678 -24.33548,-1.12711 -55.71601,1.03035 -97.79253,-7.91655 z" + style="fill:#ce5c00;fill-rule:evenodd;stroke:#2e3436;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + sodipodi:nodetypes="cccccccccccccccccccccccccccc" + id="path2473-9" + d="m 82.229408,540.99302 c -4.226609,-14.57594 148.112912,-71.65501 232.513112,-93.1162 6.92896,1.4561 17.08926,0.11498 29.33775,29.80344 1.54805,4.67419 -1.15234,129.50786 1.39704,130.39005 16.76409,26.4697 26.60481,74.1 12.16172,103.63005 -1.33075,1.9484 -9.00147,2.54249 -9.36764,-3.50913 -1.12161,-9.37894 0.97572,-27.60367 9.97214,-45.33064 0.62025,-8.07751 -18.98073,-41.8212 -29.50909,-64.79401 1.04241,-5.48162 6.23732,-8.41528 8.36066,-11.4175 -0.86071,2.89508 -2.67227,-79.93113 -4.19111,-82.89081 -3.66187,9.12963 -30.17064,13.97534 -31.66615,8.84789 1.21067,2.96309 -33.81105,43.16498 -44.36217,48.74132 -17.12469,6.35114 -74.08046,-13.40307 -68.79776,9.9342 4.17329,4.43543 8.2929,14.96024 10.7106,28.17357 -3.80193,29.33775 -20.65532,58.58275 -34.06457,87.20622 -5.38951,8.2917 -9.4477,3.57163 -8.77786,-4.08257 l 30.73479,-71.24885 c 5.42375,-24.01896 -5.69433,-43.90248 -35.39158,-59.1412 l 2.3284,-7.45085 85.68488,8.38222 19.09283,-5.58815 34.68136,-41.83118 -4.5321,-3.516 c -2.20085,2.59433 -4.88139,2.29934 -6.74306,-0.16707 -2.861,-8.93665 -2.47897,-22.54508 -12.53096,-24.69024 l -173.8628,59.0282 c -6.293403,2.07224 -9.189273,4.27222 -3.040642,9.18211 -3.306226,-1.00557 -6.831565,0.49029 -10.13779,-4.54487 z" + style="fill:#eeeeec;fill-rule:evenodd;stroke:#2e3436;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + id="path2475-2" + style="fill:#babdb6;fill-opacity:1;fill-rule:nonzero;stroke:#2e3436;stroke-width:0.50460911;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" + sodipodi:type="arc" + transform="matrix(0.97052297,0,0,1.0116354,-71.009231,199.69635)" /> + id="path3277-4" + style="fill:url(#linearGradient4600);fill-opacity:1;fill-rule:nonzero;stroke:#2e3436;stroke-width:0.53474259;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" + sodipodi:type="arc" + transform="matrix(0.90986526,0,0,0.96088939,-47.396051,214.0251)" /> From 15337aed9220fc61a2861d2a63e46728f2a3d1b4 Mon Sep 17 00:00:00 2001 From: Alexandre Dupas Date: Sun, 28 Feb 2010 18:40:20 +0100 Subject: [PATCH 3/3] Add missing chorus. Update layout of Trahis. --- songs/Oldelaf_et_Monsieur_D/Trahis.sg | 61 +++++++++++++++------------ 1 file changed, 34 insertions(+), 27 deletions(-) diff --git a/songs/Oldelaf_et_Monsieur_D/Trahis.sg b/songs/Oldelaf_et_Monsieur_D/Trahis.sg index 77c5480d..24f890b7 100644 --- a/songs/Oldelaf_et_Monsieur_D/Trahis.sg +++ b/songs/Oldelaf_et_Monsieur_D/Trahis.sg @@ -1,7 +1,6 @@ \songcolumns{2} \beginsong{Trahis}[by=Oldelaf et Monsieur~D.,cov=derniere-chance-d-etre-disque-d-or] - \cover \gtab{Fa#m}{2:022000} \gtab{Ré}{XX0232} @@ -9,45 +8,53 @@ \gtab{Mi}{022100} \gtab{Do#}{4:X02220} +\musicnote{intro : Fa\#m Ré La Mi \rep{2}} \beginverse -\[Fa#m]Tu as eu une \[Ré]si riche car\[La]riè{\ldots}\[Mi]re -\[Fa#m]Toujours fréquen\[Ré]té les hautes \[La]sphè{\ldots}\[Mi]res -\[Ré]Tu vivais un peu comme dans une \[Fa#m]rê{\ldots}ve -\[Ré]Pourquoi faudrait-il que tout s'a\[Do#]chè{\ldots}ve +\[Fa#m]{Tu as} eu une \[Ré]{si riche} car\[La]riè{\ldots}\[Mi]re. +\[Fa#m]Toujours fréquen\[Ré]té les hautes \[La]sphè{\ldots}\[Mi]res. +\[Ré]{Tu vivais} un peu comme dans un \[Fa#m]rê{\ldots}ve. +\[Ré]Pourquoi faudrait-il que tout s'a\[Do#]chè{\ldots}ve. \endverse \beginverse -Dire que t'avais tout pour ton bonheur -Intelligente et belle comme un cœur -Tu étais la reine pour tous les hommes -On avait même acheté ton album +Dire que t'avais tout pour ton bonheur. +Intelligente et belle comme un cœur. +Tu étais la reine pour tous les hommes. +On avait même acheté ton album. \endverse \beginchorus -Tu nous as tra\[Fa#m]his -Tu nous as tra\[Ré]his -\[La]Mais qu'est-ce que t'as fait Carla Bru\[Do#]ni -Tu nous as tra\[Fa#m]his -Tu nous as tra\[Ré]his -\[La]Calvier et Bigard sont tes nouveaux a\[Mi]mis +Tu nous as tra\[Fa#m]his, tu nous as tra\[Ré]his, +\[La]Et dire que t'étais à Charlé\[Mi]ty. +Tu nous as tra\[Fa#m]his, tu nous as tra\[Ré]his, +\[La]Mais qu'est-ce que t'as fait Carla Bru\[Do#]ni. +\endchorus + +\beginchorus +Tu nous as trahis, tu nous as trahis, +Calvier et Bigard sont tes nouveaux amis. +Tu nous as trahis, tu nous as trahis, +Tu peux plus mettre de talons aiguilles. \endchorus \beginchorus -Tu nous as trahis -Tu nous as trahis -Tu peux plus mettre de talons aiguilles -Tu nous as trahis -Tu nous as trahis -Il paraît que t'as rencontré Goufi +Tu nous as trahis, tu nous as trahis, +Dis moi que c'était pour un pari. +Tu nous as trahis, tu nous as trahis, +Il paraît que t'as rencontré Goufi. \endchorus \beginchorus -Tu nous as déçus -Tu nous as trahis -A moins que t'aies des problèmes de vue -Tu nous as déçus -Tu nous as trahis -Mais qu'est ce que t'as fait Carla Nibru +Tu nous as déçus, tu nous as déçus, +À moins que t'aies des problèmes de vue. +Tu nous as déçus, tu nous as déçus, +Mais qu'est ce que t'as fait Carla Nibru? \endchorus + +\beginverse* +Tu nous as trahis \echo{Y-a quelqu'un qui m'a dit!} \rep{8} +Carla Bruni! +\endverse + \endsong