diff --git a/NEWS b/NEWS index ecbdc22a..1a473109 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,40 @@ +version 3.7.2 + +Louis: +Narz: + Hubert-Félix Thiéfaine - Sweet amanit phalloide queen + Georges Brassens - Les trompettes de la renommée +Romain Goffe: +m@rco: + Hubert-Félix Thiéfaine - Alligators 427 + Thomas Fersen - Borborygmes + Thomas Fersen - Cosmos +spalax: + +version 3.7.1 + +JBB: + Buddy Holly - Everyday + Cranberries - Dreaming my dreams + Cranberries - Linger + Cranberries - No need to argue + Cranberries - Ode to my family + Daniel Powter - Bad day + Eddy Mitchell - La dernière séance + Grégoire - Toi + moi + Hoobastank - The reason + Joe Dassin - À toi + Kenny Rogers - The greatest + Monty Python - Always look on the bright side of life + Renaud - La médaille + Roch Voisine - La légende oochigeas + Suzanne Vega - Luka + Terry Bush - Maybe tomorrow +Romain Goffe: + Traditionnel - Sur le pont d'Avignon + Traditionnel - Il pleut bergère + version 3.7.0 Alexandre Dupas: diff --git a/books/volume-5.sb b/books/volume-5.sb index 23040fa0..a5ae5f62 100644 --- a/books/volume-5.sb +++ b/books/volume-5.sb @@ -31,13 +31,19 @@ "bloodhound_gang/fire_water_burn.sg", "bob_dylan/i_want_you.sg", "bob_seger/against_the_wind.sg", + "buddy_holly/everyday.sg", "calvin_russell/5m2.sg", "calvin_russell/down_down_down.sg", "charles_aznavour/comme_ils_disent.sg", "charlie_winston/like_a_hobo.sg", "coluche/sois_faineant.sg", + "cranberries/dreaming_my_dreams.sg", + "cranberries/linger.sg", + "cranberries/no_need_to_argue.sg", + "cranberries/ode_to_my_family.sg", "creedence_clearwater_revival/bad_moon_rising.sg", "crep/ptit_pingouin.sg", + "daniel_powter/bad_day.sg", "debout_sur_le_zinc/aller_simple.sg", "debout_sur_le_zinc/comme_un_frisson.sg", "debout_sur_le_zinc/elle_m_ennuie.sg", @@ -48,10 +54,12 @@ "debout_sur_le_zinc/se_dire_adieu.sg", "debout_sur_le_zinc/sur_le_fil.sg", "dire_straits/brothers_in_arms.sg", + "eddy_mitchell/la_derniere_seance.sg", "etienne_daho/comme_un_boomerang.sg", "francis_cabrel/la_corrida.sg", "francis_cabrel/octobre.sg", "gary_jules/mad_world.sg", + "georges_brassens/les_trompettes_de_la_renommee.sg", "georges_brassens/l_orage.sg", "georges_brassens/pour_me_rendre_a_mon_bureau.sg", "georges_brassens/quatre-vingt-quinze-pour-cent.sg", @@ -63,10 +71,13 @@ "gotye/somebody_that_i_used_to_know.sg", "graeme_allwright/la_ligne_holworth.sg", "green_day/misery.sg", + "gregoire/toi_moi.sg", "hk_saltimbanks/indignez-vous.sg", "hk_saltimbanks/niquons_la_planete.sg", + "hoobastank/the_reason.sg", "hubert-felix_thiefaine/542_lunes_et_7_jours_environ.sg", "hubert-felix_thiefaine/ad_orgasmum_aeternum.sg", + "hubert-felix_thiefaine/alligators_427.sg", "hubert-felix_thiefaine/la_deche_le_twist_et_le_reste.sg", "hubert-felix_thiefaine/la_fille_du_coupeur_de_joints.sg", "hubert-felix_thiefaine/la_fin_du_saint_empire_romain_germanique.sg", @@ -74,15 +85,18 @@ "hubert-felix_thiefaine/le_chant_du_fou.sg", "hubert-felix_thiefaine/lorelei_Sebasto_Cha.sg", "hubert-felix_thiefaine/maison_borniol.sg", + "hubert-felix_thiefaine/sweet_amanite_phalloide_queen.sg", "iggy_pop/in_the_death_car.sg", "jacques_brel/au_suivant.sg", "jacques_dutronc/la_fille_du_pere_noel.sg", "jali/espanola.sg", "jean-jacques_goldman/et_l_on_y_peut_rien.sg", "jean-jacques_goldman/on_ira.sg", + "joe_dassin/a_toi.sg", "john_denver/last_hobo.sg", "johnny_hallyday/gabrielle.sg", "karpatt/la_chose_qui_dort_dans_mon_lit.sg", + "kenny_rogers/the_greatest.sg", "la_chanson_du_dimanche/super_pouvoir_d_achat.sg", "la_maison_tellier/babouin.sg", "la_rue_ketanou/ou_je_vais.sg", @@ -117,6 +131,7 @@ "michel_polnareff/l_amour_avec_toi.sg", "michel_polnareff/lettre_a_france.sg", "michel_polnareff/love_me_please_love_me.sg", + "monty_python/always_look_on_the_bright_side_of_life.sg", "noir_desir/lola.sg", "noir_desir/ou_veux_tu_qu_je_regarde.sg", "noir_desir/the_holy_economic_war.sg", @@ -137,12 +152,16 @@ "razorlight/america.sg", "r_e_m/losing_my_religion.sg", "renan_luce/le_lacrymal_circus.sg", + "renaud/la_medaille.sg", "renaud/morgane_de_toi.sg", "roch_voisine/helene.sg", + "roch_voisine/la_legende_oochigeas.sg", "soan/en_chemin.sg", "soan/the_storm.sg", "soul_asylum/runaway_train.sg", + "suzanne_vega/luka.sg", "telephone/le_jour_s_est_leve.sg", + "terry_bush/maybe_tomorrow.sg", "the_beach_boys/surfin_usa.sg", "the_bloody_irish_boys/drunk_tonight.sg", "the_dubliners/the_wild_rover.sg", @@ -151,6 +170,8 @@ "the_rolling_stones/mother_s_little_helper.sg", "thomas_fersen/au_cafe_de_la_paix.sg", "thomas_fersen/bambi.sg", + "thomas_fersen/borborygmes.sg", + "thomas_fersen/cosmos.sg", "thomas_fersen/croque.sg", "thomas_fersen/irene.sg", "thomas_fersen/le_bouton.sg", @@ -162,6 +183,8 @@ "tom_petty/american_girl.sg", "tournee_generale/avancer_mes_grolles.sg", "traditionnel/greensleeves.sg", + "traditionnel/il_pleut_bergere.sg", + "traditionnel/sur_le_pont_d_avignon.sg", "u2/one.sg", "vincent_malone/bad_bili.sg", "walz/comme_on_dit.sg", diff --git a/lilypond/Il_pleut_bergere.ly b/lilypond/Il_pleut_bergere.ly new file mode 100644 index 00000000..f28e6f3c --- /dev/null +++ b/lilypond/Il_pleut_bergere.ly @@ -0,0 +1,18 @@ +\include "header" +\paper{paper-height = 4.8\cm} + +\new \songbookstaff +{ + \relative c'' + { + \time 6/8 + \key g \major + \partial 8 b8 + d4 b8 d4 b8 g4. d4. + g8. fis16 g8 a4 a8 b2. + b8. a16 b8 c4 c8 d4. b4. d8. e16 d8 d (c) b b4. (a4.) + a8. b16 a8 a4 c8 b4. d4. + c8. b16 a8 b4 g8 b4. (a4) b8 + d4 b8 d4 b8 c4. e4. d8. e16 d8 a4 b8 g2. + } +} diff --git a/lilypond/Sur_le_pont_d_avignon.ly b/lilypond/Sur_le_pont_d_avignon.ly new file mode 100644 index 00000000..73ee3571 --- /dev/null +++ b/lilypond/Sur_le_pont_d_avignon.ly @@ -0,0 +1,16 @@ +\include "header" +\paper{paper-height = 2.6\cm} + +\new \songbookstaff +{ + \relative c'' + { + \time 2/4 + \key g \major + \partial 4 g8 g8 + g4 a8 a a4 b8 c d g, fis g a d, + g g g4 a8 a a4 b8 c d g, a fis g4 + g8 g g g g a8~ a8 g8~ g4 + g8 g g g a4 g + } +} diff --git a/makefile b/makefile index 60e8289e..bbe65c1f 100644 --- a/makefile +++ b/makefile @@ -62,7 +62,6 @@ clean: $(TARGETS:%=%.nav) $(TARGETS:%=%.snm) @rm -f *.sbx *.sxd *.sxc @rm -f *.pyc - @rm -rf covers/ cleanall: clean @rm -f $(PDF) @@ -99,7 +98,6 @@ archive: cleanall --exclude=$(BOOKS_DIR)/default.sb \ --exclude=perso/* --exclude=perso \ --exclude=build/* --exclude=build \ - --exclude=covers/* --exclude=covers \ --exclude=data/* --exclude=data \ --exclude=*tar.gz \ --transform 's/songbook/songbook-$(DATE)/1' \ diff --git a/songbook.py b/songbook.py index 43a7e1c1..f07a3006 100755 --- a/songbook.py +++ b/songbook.py @@ -15,27 +15,6 @@ from tools import recursiveFind from song import * from index import * -if platform.system() == "Linux": - from xdg.BaseDirectory import * - cachePath = os.path.join(xdg_cache_home, 'songbook') -else: - cachePath = os.path.join('cache', 'songbook') - -def makeCoverCache(library): - ''' - Copy all pictures found in the libraries into a unique cache - folder. - ''' - # create the cache directory if it does not exist - if not os.path.exists(cachePath): - os.makedirs(cachePath) - - # copy pictures file into the cache directory - covers = recursiveFind(os.path.join(library, 'songs'), '*.jpg') - for cover in covers: - coverPath = os.path.join(cachePath, os.path.basename(cover)) - shutil.copy(cover, coverPath) - def matchRegexp(reg, iterable): return [ m.group(1) for m in (reg.match(l) for l in iterable) if m ] @@ -166,9 +145,6 @@ def makeTexFile(sb, library, output): content = [ line for line in f if not commentPattern.match(line) ] for index, line in enumerate(content): - if re.compile("getCacheDirectory").search(line): - line = line.replace("\\getCacheDirectory", cachePath.replace("\\","/") + "/") - content[index] = line if re.compile("getLibraryImgDirectory").search(line): line = line.replace("\\getLibraryImgDirectory", library + "img/") content[index] = line @@ -254,8 +230,6 @@ def main(): texFile = basename + ".tex" pdfFile = basename + ".pdf" - - makeCoverCache(library) f = open(sbFile) sb = json.load(f) f.close() diff --git a/songs/buddy_holly/everyday.sg b/songs/buddy_holly/everyday.sg new file mode 100644 index 00000000..ea533222 --- /dev/null +++ b/songs/buddy_holly/everyday.sg @@ -0,0 +1,69 @@ +\selectlanguage{english} +\songcolumns{1} +\beginsong{Everyday} + [by={Buddy Holly},cov={the-very-best-of-buddy-holly},album={The very best of}] + + \cover + \capo{1} + \gtab{D}{XX0232} + \gtab{G}{320003} + \gtab{A7}{X02020} + \gtab{D7}{XX0212} + \gtab{F}{1:022100} + \gtab{B&}{1:X02220} + \gtab{A}{X02220} + + \begin{verse} + \[D]Everyday, \[G]it's a gettin' \[A7]closer + \[D]Goin' faster \[G]than a roller \[A7]coaster + \[D]Love like yours will \[G]surely come my \[D]way, (\[G]A-hey, \[D]A-hey \[A7]hey) + \end{verse} + + \begin{repeatedchords} + \begin{verse} + \[D]Everyday, \[G]it's a gettin' \[A7]faster + \[D]Everyone says \[G]go ahead and \[A7]ask her + \[D]Love like yours will \[G]surely come my \[D]way, (\[G]A-hey, \[D]A-hey \[A7]hey) + \end{verse} + \end{repeatedchords} + + \begin{chorus} + \[G]Everyday, seems a little longer + \[C]Every way, love's a little stronger + \[D]Come that way, do you ever long for \[B&]true love from\[A] m\[A7]e + \end{chorus} + + \begin{repeatedchords} + \begin{verse} + \[D]Everyday, \[G]it's a gettin' \[A7]closer + \[D]Goin' faster \[G]than a roller \[A7]coaster + \[D]Love like yours will \[G]surely come my \[D]way, (\[G]A-hey, \[D]A-hey \[A7]hey) + \end{verse} + \end{repeatedchords} + + \begin{verse*} + \musicnote {\nolyrics \[D G A7] \rep{2}} + \musicnote {\nolyrics \[D G A7 D G D A7]} + \musicnote {\nolyrics \[D G A7] \rep{2}} + \musicnote {\nolyrics \[D G A7 D G D A7]} + \end{verse*} + + \begin{repeatedchords} + \begin{chorus} + \[G]Everyday, seems a little longer + \[C]Every way, love's a little stronger + \[D]Come that way, do you ever long for \[B&]true love from \[A] m\[A7]e + \end{chorus} + + \begin{verse} + \[D]Everyday, \[G]it's a gettin' \[A7]closer + \[D]Goin' faster \[G]than a roller \[A7]coaster + \[D]Love like yours will \[G]surely come my \[D]way \echo{\[G]A-hey, \[D]A-hey \[A7]hey} + \end{verse} + \end{repeatedchords} + + \begin{verse*} + \[D]Love like yours will \[G]surely \[A7]come my \[D]way \[G] + \end{verse*} + +\endsong diff --git a/songs/buddy_holly/the-very-best-of-buddy-holly.jpg b/songs/buddy_holly/the-very-best-of-buddy-holly.jpg new file mode 100644 index 00000000..05231dd3 Binary files /dev/null and b/songs/buddy_holly/the-very-best-of-buddy-holly.jpg differ diff --git a/songs/cranberries/Everybody-else-is-doing-it-so-why-cant-we.jpg b/songs/cranberries/Everybody-else-is-doing-it-so-why-cant-we.jpg new file mode 100644 index 00000000..673d0e92 Binary files /dev/null and b/songs/cranberries/Everybody-else-is-doing-it-so-why-cant-we.jpg differ diff --git a/songs/cranberries/dreaming_my_dreams.sg b/songs/cranberries/dreaming_my_dreams.sg new file mode 100644 index 00000000..14a5e096 --- /dev/null +++ b/songs/cranberries/dreaming_my_dreams.sg @@ -0,0 +1,64 @@ +\selectlanguage{english} +\songcolumns{2} +\beginsong{Dreaming my dreams} + [by={The Cranberries},cov={no-need-to-argue},album={No need to argue}] + + \cover + \gtab{C}{X32010} + \gtab{G}{320003} + \gtab{Am}{X02210} + \gtab{F}{1:022100} + + \begin{verse} + Al\[C]{l the} th\[G]ings you sa\[Am]{id to} me toda\[F]y + Ch\[C]ange my\[G]{ perspectiv}\[Am]{e in} every wa\[F]y + Th\[C]ese thin\[G]gs{ count} to\[Am]{ mean} so m\[F]uch to me + In\[C]{to my} fa\[G]ith, you and\[Am]{ your} bab\[F]y + \end{verse} + + \begin{bridge} + \[C]It's out{ the}\[G]{re, }\[Am]{it's out} the\[F]re + \[C]It's out the\[G]re{ if} \[Am]{you want} me I'll be \[F]here + \[C]It's out the\[G]re, \[Am]{it's out} the\[F]re + \[C]It's out the\[G]re{ if} \[Am]{you want} me I'll be \[F]here + \end{bridge} + + \begin{chorus} + I'\[C]{ll be} drea\[G]ming my dreams\[Am]{ with} you \[F] + I'\[C]{ll be} drea\[G]ming my dreams\[Am]{ with} you \[F] + And\[C]{ there}'s\[G]{ no} other p\[Am]lace, that I'd lay d\[F]own my face + D\[C]reaming \[G]my dreams w\[Am]{ith you} \[F] + \end{chorus} + + \begin{verse*} + \musicnote{\nolyrics \[C G Am F]} + \end{verse*} + + \begin{bridge} + It's out there, it's out there + It's out there if you want me I'll be here + It's out there, it's out there + It's out there if you want me I'll be here + \end{bridge} + + \begin{chorus} + I'll be dreaming my dreams with you + I'll be dreaming my dreams with you + And there's no other place + That I'd lay down my face + I'll be dreaming my dreams with you + \end{chorus} + + \begin{chorus} + Dreaming my dreams with you + I'll be dreaming my dreams with you + And there's no other place + That I'd lay down my face + I'll be dreaming my dreams with you + \end{chorus} + + \begin{verse*} + \musicnote{\nolyrics \[C]} + \end{verse*} + +\endsong diff --git a/songs/cranberries/linger.sg b/songs/cranberries/linger.sg new file mode 100644 index 00000000..365b5169 --- /dev/null +++ b/songs/cranberries/linger.sg @@ -0,0 +1,60 @@ +\selectlanguage{english} +\songcolumns{2} +\beginsong{Linger} + [by={The Cranberries},cov={Everybody-else-is-doing-it-so-why-cant-we},% + album={Everybody else is doing it so why can't we?}] + + \cover + \gtab{D}{XX0232} + \gtab{A}{X02220} + \gtab{C}{X32010} + \gtab{G}{320003} + + \begin{verse*} + \musicnote{\Intro: \nolyrics \[D]} + \end{verse*} + + \begin{verse} + If \[D]you, if you could return + Don't let it \[A]burn, don't let it fade + I'm sure I'm not being \[C]rude + But it's just your attitude + It's tearing me \[G]apart + It's ruining everything + \end{verse} + + \begin{verse*} + And I \[D]swore, I swore I would be true + And honey so did \[A]you + So why were you holding her \[C]hand? + Is that the way we stand? + Were you lying all the \[G]time? + Was it just a game to you? + \end{verse*} + + \begin{chorus} + But I'm in so \[D]deep + You know I'm such a \[A]fool for you + You got me wrapped around your \[C]finger + Do you have to let it \[G]linger? + Do you have to? Do you have to? + Do you have to let it \[D]linger? + \end{chorus} + + \begin{verse} + Oh, I \[A]thought the world of you + I thought \[C]nothing could go wrong + But I was \[G]wrong + I was wrong + If \[D]you, if you could get by + \end{verse} + + \begin{verse*} + Trying not to \[A]lie + Things wouldn't be so \[C]confused + And I wouldn't feel so used + But you always really \[G]knew + I just wanna be with you + \end{verse*} + +\endsong diff --git a/songs/cranberries/no-need-to-argue.jpg b/songs/cranberries/no-need-to-argue.jpg index efe1360d..d67709fc 100644 Binary files a/songs/cranberries/no-need-to-argue.jpg and b/songs/cranberries/no-need-to-argue.jpg differ diff --git a/songs/cranberries/no_need_to_argue.sg b/songs/cranberries/no_need_to_argue.sg new file mode 100644 index 00000000..14ae2aba --- /dev/null +++ b/songs/cranberries/no_need_to_argue.sg @@ -0,0 +1,42 @@ +\selectlanguage{english} +\songcolumns{2} +\beginsong{No need to argue} + [by={The Cranberries},cov={no-need-to-argue},album={No need to argue}] + + \cover + \gtab{C}{X32010} + \gtab{F}{1:022100} + \gtab{G}{320030} + \gtab{Am}{X02210} + + \begin{verse} + \[C] There's no \[F]need to ar\[G]gue any\[C]more + I gave \[F]all I could but it \[G]left me so \[C]sore + And the thing that makes me \[G]mad + Is the \[C]one thing that I \[Am]had + I \[F]knew, I \[G]knew, I'd lose you \[C] + You'll always \[Am]{be special} to \[F]me, special to \[G]me, to \[C]me + \end{verse} + + \begin{verse} + And I remember all the things we once shared + Watching TV movies on the living room armchair + But they say it will work out fine + Was it all a waste of time + 'Cause I knew, I knew, I'd lose you + You'll always be special to me, special to me, to me + \end{verse} + + \begin{verse} + \[Am] Will I forget in \[G]time? \echo{Ah-\[Am]aa-aa} + You said I was on your \[G]mind + \[Am]There's no need to argue\[F] + No need to ar\[G]gue any\[C]more \[Am] + There's no \[F]need to ar\[G]gue any\[C]more + \end{verse} + + \begin{verse*} + \musicnote{\nolyrics \[Am F G C Am F G --- C]} + \end{verse*} + +\endsong diff --git a/songs/cranberries/ode_to_my_family.sg b/songs/cranberries/ode_to_my_family.sg new file mode 100644 index 00000000..53d1fbec --- /dev/null +++ b/songs/cranberries/ode_to_my_family.sg @@ -0,0 +1,57 @@ +\selectlanguage{english} +\songcolumns{1} +\beginsong{Ode to my family} + [by={The Cranberries},cov={no-need-to-argue},album={No need to argue}] + + \cover + \capo{2} + \gtab{C}{X32010} + \gtab{Am}{X02210} + \gtab{Em}{022000} + \gtab{F}{1:022100} + + \begin{verse*} + Doo \[C]doo doo doo, doo \[Am]doo doo doo, doo \[Em]doo doo doo, doo \[F]doo doo doo \rep{2} + \end{verse*} + + \begin{verse*} + \musicnote{\nolyrics \[C Am Em F] \rep{2}} + \end{verse*} + + \begin{verse} + \[C]Unders\[Am]tand the things I \[Em]say, don't \[F]turn away from \[C]me + \[C]'Cause I've spent \[Am]half my life out \[Em]there, you \[F]wouldn't disa\[C]gree + \[C]Do you see me\[Am]? Do you see? Do you \[Em]like me? Do you \[F]like me, standing \[C]there? + \[C]Do you notice\[Am]? Do you know? Do you \[Em]see me? Do you \[F]see me? Does anyone \[C]care? + \end{verse} + + \begin{chorus} + \[C]Unhappi\[Am]ness, where's when \[Em]I was young and we \[F]didn't give a \[C]damn + \[C]'Cause we were \[Am]raised, to see \[Em]life as fun and \[F]take it if we \[C]can + \[C]My mother\[Am], my mother, she \[Em]hold me, she \[F]hold me, when I was out \[C]there + \[C]My father\[Am], my father, he \[Em]liked me, oh he \[F]liked me, does anyone \[C]care? + \end{chorus} + + \begin{verse} + Understand what I've become, it wasn't my design + And people everywhere think, something better than I am + But I miss you, I miss, 'cause I liked it, 'cause I liked it, when I was out there + Do you know this? Do you know? You did not find me, you did not find, does anyone care? + \end{verse} + + \begin{chorus} + Unhappiness, where's when I was young and we didn't give a damn + 'Cause we were raised, to see life as fun and take it if we can + My mother, my mother, she hold me, she hold me, when I was out there + My father, my father, he liked me, oh he liked me + \end{chorus} + + \begin{verse*} + Does anyone \[C]care? Does anyone \[Am]care? Does anyone \[Em]care? Does anyone \[F]care? \rep{2} + \end{verse*} + + \begin{verse*} + Doo \[C]doo doo doo, doo \[Am]doo doo doo, doo \[Em]doo doo doo, doo \[F]doo doo doo \rep{3} + \end{verse*} + +\endsong diff --git a/songs/daniel_guichard/mon-vieux.jpg b/songs/daniel_guichard/mon-vieux.jpg index 41eb779e..3cd4a344 100644 Binary files a/songs/daniel_guichard/mon-vieux.jpg and b/songs/daniel_guichard/mon-vieux.jpg differ diff --git a/songs/daniel_guichard/mon_vieux.sg b/songs/daniel_guichard/mon_vieux.sg index 460cd341..dcc1469d 100644 --- a/songs/daniel_guichard/mon_vieux.sg +++ b/songs/daniel_guichard/mon_vieux.sg @@ -33,7 +33,7 @@ \[C7]L'été, on allait voir la \[F7M]mer \[Dm]{Tu vois}, c'\[G]était pas la mi\[Em]sère \[Am]C'était pas non plus l'para\[F]dis - Eh \[Dm]{oui, tant} \[E]pis + Eh \[Dm]{ouais, tant} \[E]pis \end{chorus} \begin{verse} @@ -102,8 +102,8 @@ \begin{chorus} \[C7]Maintenant qu'il est loin d'\[F7M]ici \[Dm]{En pensant} \[G]{à tout} ça, j'me \[Em]dis - \[Am]J'aimerais bien qu'il soit près de \[F]moi - \[G]Pap\[Am]a \[Dm7] \[G7] \[C] + \[Am]Qu'j'aimerais bien qu'il soit près de \[F]moi + \[G] Pap\[Am]a \[Dm7] \[G7] \[C] \end{chorus} \endsong diff --git a/songs/daniel_powter/bad_day.sg b/songs/daniel_powter/bad_day.sg new file mode 100644 index 00000000..feca6fb5 --- /dev/null +++ b/songs/daniel_powter/bad_day.sg @@ -0,0 +1,96 @@ +\selectlanguage{english} +\songcolumns{2} +\beginsong{Bad day} + [by={Daniel Powter},cov={daniel-powter},album={Daniel Powter}] + + \cover + \capo{1} + \gtab{D}{XX0232} + \gtab{G}{320003} + \gtab{A}{X02220} + \gtab{Bm}{2:X02210} + \gtab{B&}{1:X02220} + \gtab{F}{1:022100} + \gtab{Bm7}{X20202} + \gtab{Bm6}{X20102} + + \begin{verse*} + \musicnote{\Intro: \nolyrics \[D G A G]} + \end{verse*} + + \begin{verse} + \[D]Where is the \[G]moment when we need it the \[A]most \[G] + \[D]You kick up the \[G]leaves and the magic is \[A]lost \[G] + \[Bm]They tell me your \[A]blue sky's faded to \[G]grey + They tell me your \[D]passion's gone a\[Em]way + And I don't need no carrying \[A]on \[G] \[A] + \end{verse} + + \begin{verse} + \[D]Stand in the \[G]line just ahead of the \[A]law \[G] + \[D]You're faking a \[G]smile with the coffee you \[A]go \[G] + \[Bm]You tell me your \[A]life's been way off \[G]line + You're falling to \[D]pieces every\[Em]time + And I don't need no carrying \[A]on + \end{verse} + + \begin{chorus} + 'Cause you had a bad \[D]day + You're taking one \[G]down + You sing a sad \[Em]song just to turn it a\[A]round + You say you don't \[D]know + You tell me don't \[G]lie + You work at a \[Em]smile and you go for a \[A]ride + You had a bad \[Bm]day + The camera don't \[A]lie + You're coming back \[G]down and you really don't \[D]mind + You had a bad \[Em]day \[A] + You had a bad \[D]day + \end{chorus} + + \begin{verse*} + \musicnote{\nolyrics \[D G A G] \rep{2}} + \end{verse*} + + \begin{bridge} + Well you need a \[A]blue sky holi\[G]day + The point is they \[D]laugh at what you \[Em]say + And I don't need no carrying \[A]on + \end{bridge} + + \musicnote{\Chorus} + + \begin{bridge} + \[F]Sometimes the system goes on the blink + And the \[B&]whole thing it turns out wrong + You \[F]might not make it back and you know + That you could \[B&]be well oh that strong + Well I'm not \[A]wrong + Yeah{\dots} + \end{bridge} + + \begin{bridge} + \[D]So where is the \[G]passion when you need it the \[A]most + \[G]Oh you and I + \[D]You kick up the \[G]leaves and the magic is \[A]lost + \end{bridge} + + \begin{chorus} + Cause you had a bad \[D]day + You're taking one \[G]down + You sing a sad \[Em]song just to turn it a\[A]round + You say you don't \[D]know + You tell me don't \[G]lie + You work at a \[Em]smile and you go for a \[A]ride + You had a bad \[Bm]day + It seem what you \[Bm]like + And how does it \[Bm7]feel for one more \[Bm6]time + You had a bad \[A]day + You had a bad \[D]day + \end{chorus} + + \begin{verse*} + \musicnote{\Outro: \nolyrics \[D G Em A] \rep{4}} + \end{verse*} + +\endsong diff --git a/songs/daniel_powter/daniel-powter.jpg b/songs/daniel_powter/daniel-powter.jpg new file mode 100644 index 00000000..7fc8aabe Binary files /dev/null and b/songs/daniel_powter/daniel-powter.jpg differ diff --git a/songs/eddie_vedder/into-the-wild.jpg b/songs/eddie_vedder/into-the-wild.jpg index 77fccdef..d14e661c 100644 Binary files a/songs/eddie_vedder/into-the-wild.jpg and b/songs/eddie_vedder/into-the-wild.jpg differ diff --git a/songs/eddy_mitchell/la-derniere-seance.jpg b/songs/eddy_mitchell/la-derniere-seance.jpg new file mode 100644 index 00000000..394a79d3 Binary files /dev/null and b/songs/eddy_mitchell/la-derniere-seance.jpg differ diff --git a/songs/eddy_mitchell/la_derniere_seance.sg b/songs/eddy_mitchell/la_derniere_seance.sg new file mode 100644 index 00000000..b6869f92 --- /dev/null +++ b/songs/eddy_mitchell/la_derniere_seance.sg @@ -0,0 +1,80 @@ +\selectlanguage{french} +\songcolumns{2} +\beginsong{La dernière séance} + [by={Eddy Mitchell},cov={la-derniere-seance},album={La dernière séance}] + + \cover + \gtab{C}{X32010} + \gtab{Em}{022000} + \gtab{F}{1:022100} + \gtab{A7}{X02020} + \gtab{Fm}{1:022000} + \gtab{Am}{X02210} + \gtab{Dm}{XX0231} + \gtab{G}{320003} + \gtab{B&7}{1:X02020} + \gtab{C7}{X32310} + + \begin{verse} + \[C] La lumière revient déjà + \[Em] Et le film est terminé + \[F] Je réveille mon voisin + \[Em] Il dort comme un \[A7]nouveau-né + \[Fm] Je relève mon strapontin + \[Em] J'ai une envie \[Am]de bailler + \[Dm] C'était la dernière séquence + \[G] C'était la dernière séance + \[Dm] Et le rideau \[G]sur l'écran est \[C]tombé + \end{verse} + + \begin{verse} + La photo sur le mot fin + Peut faire sourire ou pleurer + Mais je connais le destin + D'un cinéma de quartier + Il finira en garage + En building, supermarché + Il n'a plus aucune chance + C'était sa dernière séance + Et le rideau sur l'écran est tombé + \end{verse} + + \begin{chorus} + Bye \[Fm]bye, les héros que j'ai\[B&7]mais + L'entracte est termi\[C7]née + Bye \[Fm]bye, rendez-vous à ja\[B&7]mais + Mes chocolats gla\[Em]cés, gla\[G]cés + \end{chorus} + + \begin{verse} + J'allais rue des Solitaires + À l'école de mon quartier + À cinq heure j'étais sorti + Mon père venait me chercher + On voyait Gary Cooper + Qui défendait l'opprimé + C'était vraiment bien l'enfance + Mais c'est la dernière séquence + Et le rideau sur l'écran est tombé + \end{verse} + + \begin{chorus} + Bye bye, les filles qui tremblaient + Pour les jeunes premiers + Bye bye, rendez-vous à jamais + Mes chocolats glacés, glacés + \end{chorus} + + \begin{verse} + La lumière s'éteint déjà + La salle est vide à pleurer + Mon voisin détend ses bras + Il s'en va boire un café + Un vieux pleure dans un coin + Son cinéma est fermé + C'était la dernière séquence + C'était sa dernière séance + Et le rideau sur l'écran est tombé + \end{verse} + +\endsong diff --git a/songs/georges_brassens/les-trompettes-de-la-renommee.jpg b/songs/georges_brassens/les-trompettes-de-la-renommee.jpg new file mode 100644 index 00000000..9e848de2 Binary files /dev/null and b/songs/georges_brassens/les-trompettes-de-la-renommee.jpg differ diff --git a/songs/georges_brassens/les_trompettes_de_la_renommee.sg b/songs/georges_brassens/les_trompettes_de_la_renommee.sg new file mode 100644 index 00000000..5621fe61 --- /dev/null +++ b/songs/georges_brassens/les_trompettes_de_la_renommee.sg @@ -0,0 +1,114 @@ +\selectlanguage{french} +\beginsong{Les trompettes de la renommée} + [by={Georges Brassens},cov={les-trompettes-de-la-renommee},album={Les trompettes de la renommée}] + + \cover + \gtab{F#m}{2:022000} + \gtab{D7/D#}{XX1212} + \gtab{A&}{4:022100} + \gtab{C#m}{4:X02210} + \gtab{F#}{2:022100} + \gtab{Bm}{2:X02210} + \gtab{E}{022100} + \gtab{A}{X02220} + \gtab{D}{XX0232} + \gtab{G}{320033} + \gtab{G7/F#}{3:XX1212} + \gtab{C#}{4:X02220} + + \begin{verse} + Je \[F#m]vivais à l'é\[D7/D#]cart de \[A&]la place pu\[C#m]blique + Se\[F#]rein, contempla\[Bm]tif, té\[E]nébreux, buco\[A]lique + \[D]Refusant d'acqui\[G]tter la \[F#]rançon de la \[Bm]gloire + Sur \[F#]mon brin de lau\[A&]rier, je dor\[D7/D#]mais comme un \[A&]loir + Les \[D7/D#]gens de bon con\[G7/F#]seil ont \[A&]su me faire com\[C#m]prendre + Qu'à l'\[F#]homme de la \[Bm]rue, j'avais des \[E]comptes à \[A]rendre + Et \[D]que, sous peine de \[G]choir dans un oub\[F#]li com\[Bm]plet + J'de\[Bm]vais mettre au grand \[A&]jour tous \[C#]mes petits se\[F#]crets + \end{verse} + + \begin{chorus} + Trom\[A]pettes + De \[C#]la Renommée + Vous \[F#m]êtes + Bien \[E]mal embou\[F#m]chées + \end{chorus} + + \begin{verse} + Manquant à la pudeur la plus élémentaire + Dois-je, pour les besoins de la cause publicitaire + Divulguer avec qui, et dans quelle position ? + Je plonge dans le stupre et la fornication + Si je publie des noms, combien de Pénélopes + Passeront illico pour de fieffées salopes ? + Combien de bons amis me r'gard'ront de travers ? + Combien je recevrai de coups de revolver ? + \end{verse} + + \begin{verse} + À toute exhibition, ma nature est rétive + Souffrant d'une modestie quasiment maladive + Je ne fais voir mes organes procréateurs + À personne, excepté mes femmes et mes docteurs + Dois-je, pour défrayer la chronique des scandales + Battre le tambour avec mes parties génitales ? + Dois-je les arborer plus ostensiblement + Comme un enfant de chœur porte un saint sacrement ? + \end{verse} + + \begin{verse} + Une femme du monde, et qui souvent me laisse + Faire mes quatre voluptés dans ses quartiers de noblesse + M'a sournoisement passé, sur son divan de soie + Des parasites du plus bas étage qui soit + Sous prétexte de bruit, sous couleur de réclame + Ai-je le droit de ternir l'honneur de cette dame + En criant sur les toits, et sur l'air des lampions + Madame la marquise m'a foutu des morpions + \end{verse} + + \begin{verse} + Le ciel en soit loué, je vis en bonne entente + Avec le Père Duval, la calotte chantante + Lui, le catéchumène, et moi, l'énergumène + Il me laisse dire merde, je lui laisse dire amen + En accord avec lui, dois-je écrire dans la presse + Qu'un soir je l'ai surpris aux genoux de ma maîtresse + Chantant la mélopée d'une voix qui susurre + Tandis qu'elle lui cherchait des poux dans la tonsure + \end{verse} + + \begin{verse} + Avec qui, ventrebleu ! faut-il que je couche + Pour faire parler un peu la déesse aux cent bouches ? + Faut-il qu'une femme célèbre, une étoile, une star + Vienn' prendre entre mes bras la place de ma guitare ? + Pour exciter le peuple et les folliculaires + Qui est-ce qui veut me prêter sa croupe populaire ? + Qui est-ce qui veut me laisser faire, in naturalibus + Un p'tit peu d'alpinisme sur son mont de Vénus ? + \end{verse} + + \begin{verse} + Sonneraient-elles plus fort, ces divines trompettes ? + Si, comm' tout un chacun, j'étais un peu tapette + Si je me déhanchais comme une demoiselle + Et prenais tout à coup des allures de gazelle + Mais je ne sache pas qu'ça profite à ces drôles + De jouer le jeu de l'amour en inversant les rôles + Qu'ça confère à ma gloire une once de plus-value + Le crime pédérastique, aujourd'hui, ne paie plus + \end{verse} + + \begin{verse} + Après ce tour d'horizon des mille et une recettes + Qui vous valent à coup sûr les honneurs des gazettes + J'aime mieux m'en tenir à ma première façon + Et me gratter le ventre en chantant des chansons + Si le public en veut, je les sors dare-dare + S'il n'en veut pas, je les remets dans ma guitare + Refusant d'acquitter la rançon de la gloire + Sur mon brin de laurier, je m'endors comme un loir + \end{verse} + +\endsong diff --git a/songs/gregoire/toi-moi.jpg b/songs/gregoire/toi-moi.jpg new file mode 100644 index 00000000..a8757316 Binary files /dev/null and b/songs/gregoire/toi-moi.jpg differ diff --git a/songs/gregoire/toi_moi.sg b/songs/gregoire/toi_moi.sg new file mode 100644 index 00000000..a9005666 --- /dev/null +++ b/songs/gregoire/toi_moi.sg @@ -0,0 +1,70 @@ +\selectlanguage{french} +\songcolumns{2} +\beginsong{Toi + Moi} + [by={Grégoire},cov={toi-moi},album={Toi + Moi}] + + \cover + \gtab{Am}{X02210} + \gtab{F}{1:022100} + \gtab{C}{X32010} + \gtab{G}{320003} + + \begin{chorus} + \[Am]Toi, plus moi, plus eux, plus tous ceux qui le \[F]veulent + Plus lui, plus elle, et tous ceux qui sont \[C]seuls + Allez, venez, et entrez dans la \[G]danse + Allez, venez, laissez faire l'insou\[Am]ciance + \end{chorus} + + \begin{verse} + \[Am]À deux, à mille, je sais qu'on est ca\[F]pables + Tout est possible, tout est réali\[C]sable + On peut s'enfuir bien plus haut que nos \[G]rêves + On peut partir bien plus loin que la \[Am]grève + \end{verse} + + \begin{repeatedchords} + \begin{chorus} + Oh toi, plus moi, plus tous ceux qui le veulent + Plus lui, plus elle, plus tous ceux qui sont seuls + Allez, venez, et entrez dans la danse + Allez, venez, c'est notre jour de chance + \end{chorus} + + \begin{verse} + Avec l'envie, la force et le courage + Le froid, la peur, ne sont que des mirages + Laissez tomber les malheurs pour une fois + Allez, venez, reprenez avec moi + \end{verse} + + \begin{chorus} + Oh toi, plus moi, plus tous ceux qui le veulent + Plus lui, plus elle, et tous ceux qui sont seuls + Allez, venez, et entrez dans la danse + Allez, venez, laissez faire l'insouciance + \end{chorus} + + \begin{verse} + Je sais, c'est vrai, ma chanson est naïve + Même un peu bête, mais bien inoffensive + Et même si elle ne change pas le monde + Elle vous invite à entrer dans la ronde + \end{verse} + + \begin{chorus} + Oh toi, plus moi, plus tous ceux qui le veulent + Plus lui, plus elle, et tous ceux qui sont seuls + Allez, venez, et entrez dans la danse + Allez, venez, c'est notre jour de chance + \end{chorus} + + \begin{verse} + L'espoir, l'ardeur, prends tout ce qu'il te faut + Mes bras, mon cœur, mes épaules et mon dos + Je veux te voir des étoiles dans les yeux + Je veux nous voir insoumis et heureux + \end{verse} + \end{repeatedchords} + +\endsong diff --git a/songs/hoobastank/the-reason.jpg b/songs/hoobastank/the-reason.jpg new file mode 100644 index 00000000..41b2846f Binary files /dev/null and b/songs/hoobastank/the-reason.jpg differ diff --git a/songs/hoobastank/the_reason.sg b/songs/hoobastank/the_reason.sg new file mode 100644 index 00000000..2b89b224 --- /dev/null +++ b/songs/hoobastank/the_reason.sg @@ -0,0 +1,47 @@ +\selectlanguage{english} +\songcolumns{2} +\beginsong{The reason} + [by={Hoobastank},cov={the-reason},album={The reason}] + + \cover + \capo{2} + \gtab{D}{XX0232} + \gtab{Bm}{2:X02210} + \gtab{G}{320003} + \gtab{A}{X02220} + + \begin{verse} + \[D]I'm not a perfect per\[Bm]son + There's many things I wish I didn't \[D]do + But I continue lear\[Bm]ning + I never meant to do those things to \[G]you + And so I have to say before I \[A]go + That I just want you to k\[D]now + \end{verse} + + \begin{chorus} + I've found a reason for \[Bm]me + To change who I used to \[G]be + A reason to start over \[A]new + And the reason is \[D]you + \end{chorus} + + \begin{verse} + I'm sorry that I hurt you + It's something I must live with everyday + And all the pain I put you through + I wish that I could take it all away + And be the one who catches all your tears + That's why I need you to hear + \end{verse} + + \begin{verse} + I'm not a perfect person + There's many things I wish I didn't do + But I continue learning + I never meant to do those things to you + And so I have to say before I go + That I just want you to know + \end{verse} + +\endsong diff --git a/songs/hubert-felix_thiefaine/meteo-fur-nada.jpg b/songs/hubert-felix_thiefaine/meteo-fur-nada.jpg new file mode 100644 index 00000000..cf4fbe83 Binary files /dev/null and b/songs/hubert-felix_thiefaine/meteo-fur-nada.jpg differ diff --git a/songs/hubert-felix_thiefaine/sweet_amanite_phalloide_queen.sg b/songs/hubert-felix_thiefaine/sweet_amanite_phalloide_queen.sg new file mode 100644 index 00000000..080a1251 --- /dev/null +++ b/songs/hubert-felix_thiefaine/sweet_amanite_phalloide_queen.sg @@ -0,0 +1,47 @@ +\selectlanguage{french} +\songcolumns{2} +\beginsong{Sweet amanite phalloïde queen} + [by={Hubert-Félix Thiéfaine},album={Meteo fur nada},cov={meteo-fur-nada}] + + \cover + \gtab{F#}{2:022000} + \gtab{B}{2:X02220} + \gtab{Eb}{6:X02220} + \gtab{C#}{4:X02220} + \gtab{B&m}{6:022000} + + \begin{verse} + \[F#] Pilote aux yeux de gélatine + Dans ce \[B] vieux satellite-usine + \[G#m] Manufacture de recyclage + Des mélancolies hors d'us\[C#]age + \end{verse} + + + \begin{chorus} + O swe\[E&]et a\[B]manite phal\[F#]loïde que\[C#]en \rep{3} + \end{chorus} + + + \begin{verse} + Je suis le \[B&m]Captain M' Acchab \[F#]\[B&m] + Aux ordres d'une beau\[F#]té na\[B&m]bab \[F#]\[B&m] + \[F#]Prima bel\[B]ladona made in + Moloch-city destroy-ma\[F#]chine + \end{verse} + + \begin{verse} + Amour-amok and paradise + Quand elle fumivore ses King Size + Dans son antichambre d'azur + Avant la séance de torture + \end{verse} + + \begin{verse} + Je suis le rebelle éclaté + Au service de Sa Majesté + La reine aux désirs écarlates + Des galaxies d'amour-pirate + \end{verse} + +\endsong diff --git a/songs/jean-jacques_goldman/en-passant.jpg b/songs/jean-jacques_goldman/en-passant.jpg index 0d756746..778596f0 100644 Binary files a/songs/jean-jacques_goldman/en-passant.jpg and b/songs/jean-jacques_goldman/en-passant.jpg differ diff --git a/songs/jean-jacques_goldman/singulier.jpg b/songs/jean-jacques_goldman/singulier.jpg index 76267886..184fdd28 100644 Binary files a/songs/jean-jacques_goldman/singulier.jpg and b/songs/jean-jacques_goldman/singulier.jpg differ diff --git a/songs/jeanne_moreau/bof-jules-et-jim.jpg b/songs/jeanne_moreau/bof-jules-et-jim.jpg index 81142cc0..7304b431 100644 Binary files a/songs/jeanne_moreau/bof-jules-et-jim.jpg and b/songs/jeanne_moreau/bof-jules-et-jim.jpg differ diff --git a/songs/joe_dassin/a_toi.sg b/songs/joe_dassin/a_toi.sg new file mode 100644 index 00000000..dc0bf950 --- /dev/null +++ b/songs/joe_dassin/a_toi.sg @@ -0,0 +1,71 @@ +\selectlanguage{french} +\songcolumns{2} +\beginsong{À toi} + [by={Joe Dassin},cov={eternel},album={Éternel}] + + \cover + \gtab{Am}{X02210} + \gtab{Dm}{XX0231} + \gtab{G7}{320001} + \gtab{C}{X32010} + \gtab{E7}{020100} + \gtab{E}{022100} + + \begin{verse} + À \[Am]toi + À la façon que tu as d'\[Dm]être belle + À la façon que tu as d'\[G7]être à moi + À tes mots tendres un peu ar\[C]tificiels + Quelques \[E7]fois + \end{verse} + + \begin{verse*} + À toi + À la petite fille que tu étais + À celle que tu es encore souvent + À ton passé, à tes secrets + À tes anciens princes charmants + \end{verse*} + + \begin{chorus} + À la \[Am]vie, à l'amour + À nos nuits, à nos jours + À l'é\[E7]ternel retour de la \[Am]chance + À l'enfant qui viendra + Qui nous ressemblera + Qui s\[G7]era à la fois toi et \[E]moi \[E7] + \end{chorus} + + \begin{verse} + À moi + À la folie dont tu es la raison + À mes colères sans savoir pourquoi + À mes silences et à mes trahisons + Quelques fois + \end{verse} + + \begin{verse*} + À moi + Au temps que j'ai passé à te chercher + Aux qualités dont tu te moques bien + Aux défauts que je t'ai cachés + À mes idées de baladin + \end{verse*} + + \begin{verse} + À nous + Aux souvenirs que nous allons nous faire + À l'avenir et au présent surtout + À la santé de cette vieille Terre + Qui s'en fout + \end{verse} + + \begin{verse*} + À nous + À nos espoirs et à nos illusions + À notre prochain premier rendez-vous + À la santé de ces millions d'amoureux + Qui sont comme nous + \end{verse*} + +\endsong diff --git a/songs/joe_dassin/eternel.jpg b/songs/joe_dassin/eternel.jpg new file mode 100644 index 00000000..d2609455 Binary files /dev/null and b/songs/joe_dassin/eternel.jpg differ diff --git a/songs/kenny_rogers/she-rides-wild-horses.jpg b/songs/kenny_rogers/she-rides-wild-horses.jpg new file mode 100644 index 00000000..e47f0c8b Binary files /dev/null and b/songs/kenny_rogers/she-rides-wild-horses.jpg differ diff --git a/songs/kenny_rogers/the_greatest.sg b/songs/kenny_rogers/the_greatest.sg new file mode 100644 index 00000000..570b1140 --- /dev/null +++ b/songs/kenny_rogers/the_greatest.sg @@ -0,0 +1,72 @@ +\selectlanguage{english} +\songcolumns{2} +\beginsong{The greatest} + [by={Kenny Rogers},cov={she-rides-wild-horses},album={She rides wild horses}] + + \cover + \capo{1} + \gtab{D}{XX0232} + \gtab{A}{X02220} + \gtab{G}{320003} + \gtab{Bm}{2:X02210} + + \begin{verse} + \[D]Little boy, in a baseball hat + Stands \[A]in the field, with his \[G]ball and \[D]bat + \[D]Says, ``I am the greatest, player of them all'' + Puts his \[A]bat on his shoulder, and he \[G]tosses up his \[D]ball + \end{verse} + + \begin{chorus} + And the \[A]ball goes up, and the ball comes down + \[G]Swings his bat all the \[D]way around + The \[A]world's so still you can hear the sound + The \[G]baseball falls{\dots} to the ground \[D] + \end{chorus} + + \begin{verse} + Now the little boy, doesn't say a word + Picks up his ball, he is undeterred + Says, ``I am the greatest, there has ever been'' + And he grits his teeth, and he tries it again + \end{verse} + + \begin{chorus} + And the ball goes up, and the ball comes down + Swings his bat all the way around + The world's so still you can hear the sound + The baseball falls{\dots} to the ground + \end{chorus} + + \begin{bridge} + He \[Bm]makes no excuses, he \[G]shows no fear + He just \[D]closes his eyes, and \[A]listens to the cheers + \end{bridge} + + \begin{verse} + Little boy, he adjusts his hat + Picks up his ball, stares at his bat + Says, ``I am the greatest, the game is on the line'' + And he gives his all, one last time + \end{verse} + + \begin{chorus} + And the ball goes up, like the moon so bright + Swings his bat with all his might + And the world's so still as still can be + And the baseball falls{\dots} that's strike three + \end{chorus} + + \begin{verse} + Now it's supper time, and his mama calls + Little boy starts home, with his bat and ball + Says, ``I am the greatest, that is a fact + But even I didn't know, I could pitch like that'' + \end{verse} + + \begin{verse*} + Says, ``I am the greatest, that is understood + But even I didn't know, I could pitch that good'' + \end{verse*} + +\endsong diff --git a/songs/monty_python/always_look_on_the_bright_side_of_life.sg b/songs/monty_python/always_look_on_the_bright_side_of_life.sg new file mode 100644 index 00000000..090a6726 --- /dev/null +++ b/songs/monty_python/always_look_on_the_bright_side_of_life.sg @@ -0,0 +1,83 @@ +\selectlanguage{english} +\songcolumns{1} +\beginsong{Always look on the bright side of life} + [by={Monty Python},cov={life-of-brian},album={Life of Brian}] + + \cover + \gtab{Am}{X02210} + \gtab{D}{XX0232} + \gtab{G}{320003} + \gtab{Em}{022000} + \gtab{D7}{XX0212} + \gtab{A}{X02220} + \gtab{F#}{2:022100} + \gtab{Bm}{2:X02210} + \gtab{E7}{020100} + + \begin{verse} + Some \[Am]things in life are \[D]bad, they can \[G]really make you \[Em]mad + Other \[Am]things just make you \[D]swear and \[G]curse + When you've \[Am]chewing an life's \[D]gristle, don't \[G]grumble, give a \[Em]whistle + And \[Am]this'll help things turn out for the \[D7]best + \end{verse} + + \begin{chorus} + And \[G]always \[Em]look on the \[Am]bright \[D7]side of \[G]life \[Em] \[Am] \[D7] + Al\[G]ways \[Em]look on the \[Am]light \[D7]side of \[G]life \[Em] \[Am] \[D7] + \end{chorus} + + \begin{repeatedchords} + \begin{verse} + If \[Am]life seems jolly \[D]rotten, there's \[G]something you've \[Em]forgotten + And that's to \[Am]laugh and smile and \[D]dance and \[G]sing + When you've \[Am]feeling in the \[D]dumps, don't be \[G]silly \[Em]chumps + Just \[Am]purse your lips and whistle - that's the \[D7]thing + \end{verse} + \end{repeatedchords} + + \begin{repeatedchords} + \begin{chorus} + And \[G]always \[Em]look on the \[Am]bright \[D7]side of \[G]life \[Em] \[Am] \[D7] + Al\[G]ways \[Em]look on the \[Am]bright \[D7]side of \[G]life \[Em] \[Am] \[D7] + \end{chorus} + \end{repeatedchords} + + \begin{repeatedchords} + \begin{verse} + For l\[Am]ife is quite abs\[D]urd, and d\[G]eath's the final w\[Em]ord + You must \[Am]always face the \[D]curtains with a \[G]bow + For\[Am]get about your \[D]sin - give the \[G]audience a \[Em]grin + En\[Am]joy it - it's your last chance any\[D7]how + \end{verse} + \end{repeatedchords} + + \begin{repeatedchords} + \begin{chorus} + So \[G]always \[Em]look on the \[Am]bright \[D7]side of \[G]death \[Em] \[Am] \[D7] + J\[G]ust be\[Em]fore you \[Am]draw your ter\[D7]minal \[G]breath \[Em] \[Am] \[D7] + \end{chorus} + \end{repeatedchords} + + \begin{repeatedchords} + \begin{verse} + \[Am]Life's a piece of \[D]shit, \[G]when you look at \[Em]it + \[Am]Life's a laugh and \[D]death's a joke it's \[G]true + You'll \[Am]see it's all a \[D]show, keep'em \[G]laughing as you \[Em]go + Just re\[Am]member that the last laugh is on \[D7]you + \end{verse} + \end{repeatedchords} + + \begin{repeatedchords} + \begin{chorus} + And \[G]always \[Em]look on the \[Am]bright \[D7]side of \[G]life \[Em] \[Am] \[D7] + Al\[G]ways \[Em]look on the \[Am]right \[D7]side of \[G]life \[Em] \[Am] \[D7] + \end{chorus} + \end{repeatedchords} + + \begin{chorus} + \[A]Always \[F#]look on the \[Bm]bright \[E7]side of \[A]life \[F#] \[Bm] \[E7] + \[A]Always \[F#]look on the \[Bm]right \[E7]side of \[A]life \[F#] \[Bm] \[E7] + {\dots} + \end{chorus} + +\endsong diff --git a/songs/monty_python/life-of-brian.jpg b/songs/monty_python/life-of-brian.jpg new file mode 100644 index 00000000..d25e9294 Binary files /dev/null and b/songs/monty_python/life-of-brian.jpg differ diff --git a/songs/ralph_mctell/streets_of_london.sg b/songs/ralph_mctell/streets_of_london.sg index 722a68bb..483be489 100644 --- a/songs/ralph_mctell/streets_of_london.sg +++ b/songs/ralph_mctell/streets_of_london.sg @@ -4,6 +4,7 @@ [by={Ralph McTell},cov={spiral_staircase},album={Spiral Staircase}] \cover + \capo{2} \gtab{C}{X32010} \gtab{G}{320003} \gtab{Am}{X02210} @@ -14,38 +15,38 @@ \begin{verse} \[C]Have you seen the \[G]old man, \[Am]in the closed-down \[Em]market - \[Em]Picking up the \[C]papers, with his \[D7]worn-out \[G7]shoes? + \[F]picking up the \[C]papers, with his \[D7]worn-out \[G7]shoes? \[C]In his eyes you \[G]see no pride, \[Am]and held loosely \[Em]by his side - \[F]Yesterday's \[C]papers, telling \[G7]yesterday's \[C]news + \[F]yesterday's \[C]papers, telling \[G7]yesterday's \[C]news \end{verse} \begin{chorus} \[C] So \[F]how can you \[Em]tell me, you're \[C]lo - ne - \[Am]ly - \[D7] And say for \[D7]you that the sun don't \[G]shine? \[G7] + \[D7] and say for \[D7]you that the sun don't \[G]shine? \[G7] \[C]Let me take you \[G]by the hand, and \[Am]lead you through the \[Em]streets of London \[F] I'll show you \[C]something, to \[G7]make you change your \[C]mind \end{chorus} \begin{repeatedchords} \begin{verse} - Have you seen the old gal, who walks the streets of London - Dirt in her hair, and her clothes in rags? - She's no time for talking, she just keeps right on walking - Carrying her home, in two carrier bags + \[C]Have you seen the \[G]old gal, \[Am]who walks the streets of \[Em]London + \[Em]dirt in her \[C]hair, and her \[D7]clothes in \[G7]rags? + \[C]She's no time for \[G]talking, she \[Am]just keeps right on \[Em]walking + \[F]Carrying her \[C]home, in \[G7]two carrier \[C]bags \end{verse} \begin{verse} - And in the all-night cafe, at a quarter past eleven - Some old man sitting there, all on his own - Looking at the world, over the rim of his tea-cup - Each day lasts an hour, then he wanders home alone + \[C]In the all-night \[G]cafe, at a \[Am]quarter past el\[Em]even + \[Em]same old \[C]man sitting \[D7]there, on his \[G7]own + \[C]Looking at the \[G]world, over the \[Am]rim of his \[Em]tea-cup + \[F]Each day lasts an \[C]hour, then he \[G7]wanders home a\[C]lone \end{verse} \begin{verse} - And have you seen the old man, outside the seaman's mission? - His memory's fading, with those medal ribbons that he wears - And in our winter city, the rain cries little pity - For one more forgotten hero, and a world that doesn't care + \[C]Have you seen the \[G]old man, \[Am]outside the seaman's \[Em]mission? + \[Em]His memory's \[C]fading, with those \[D7]medal ribbons that he \[G7]wears + \[C]And in our winter \[G]city, the rain \[Am]cries little \[Em]pity + \[F]For one more forgotten \[C]hero, and a \[G7]world that doesn't \[C]care \end{verse} \end{repeatedchords} diff --git a/songs/renaud/a-la-belle-de-mai.jpg b/songs/renaud/a-la-belle-de-mai.jpg index ff17e187..4e6b3c93 100644 Binary files a/songs/renaud/a-la-belle-de-mai.jpg and b/songs/renaud/a-la-belle-de-mai.jpg differ diff --git a/songs/renaud/la_medaille.sg b/songs/renaud/la_medaille.sg new file mode 100644 index 00000000..bbe54906 --- /dev/null +++ b/songs/renaud/la_medaille.sg @@ -0,0 +1,74 @@ +\selectlanguage{french} +\songcolumns{2} +\beginsong{La médaille} + [by={Renaud},cov={a-la-belle-de-mai},album={À la belle de mai}] + + \cover + \gtab{D}{XX0232} + \gtab{F#m}{2:022000} + \gtab{G}{320003} + \gtab{Gm}{3:022000} + \gtab{Em}{022000} + \gtab{A}{X02220} + + \begin{verse} + \[D]Un pigeon s'est posé + \[D]Sur l'épaule galonnée + \[D]Du Maréchal de \[F#m]France + \[F#m]Et il a décoré + \[F#m]La statue dressée + \[F#m]D'une gastrique of\[G]fense + \[Gm]Maréchaux assassins + \[Gm]Sur vos bustes d'airain + \[Gm]Vos poitrines su\[D]perbes + \[Em]Vos médailles ne sont + \[Em]Que fientes de pi\[A]geons + De la \[D]merde + \end{verse} + + \begin{verse} + Un enfant est venu + Aux pieds de la statue + Du Maréchal de France + Une envie naturelle + L'a fait pisser contre elle + Mais en toute innocence + Maréchaux assassins + Le môme mine de rien + A joliment vengé + Les enfants et les mères + Que dans vos sales guerres + Vous avez massacrés + \end{verse} + + \begin{verse} + Un clodo s'est couché + Une nuit juste aux pieds + Du Maréchal de France + Ivre mort au matin + Il a vomi son vin + Dans une gerbe immense + Maréchaux assassins + Vous ne méritez rien + De mieux pour vos méfaits + Que cet hommage immonde + Pour tout le sang du monde + Par vos sabres versé + \end{verse} + + \begin{verse} + Un couple d'amoureux + S'embrasse sous les yeux + Du Maréchal de France + Muet comme un vieux bonze + Il restera de bronze + Raide comme une lance + Maréchaux assassins + L'amour ne vous dit rien + À part bien sûr celui + De la Patrie hélas + Cette idée dégueulasse + Qu'à mon tour je conchie + \end{verse} + +\endsong diff --git a/songs/roch_voisine/ill-always-be-there.jpg b/songs/roch_voisine/ill-always-be-there.jpg new file mode 100644 index 00000000..4151c438 Binary files /dev/null and b/songs/roch_voisine/ill-always-be-there.jpg differ diff --git a/songs/roch_voisine/la_legende_oochigeas.sg b/songs/roch_voisine/la_legende_oochigeas.sg new file mode 100644 index 00000000..13a68437 --- /dev/null +++ b/songs/roch_voisine/la_legende_oochigeas.sg @@ -0,0 +1,66 @@ +\selectlanguage{french} +\songcolumns{2} +\beginsong{La légende Oochigeas} + [by={Roch Voisine},cov={ill-always-be-there},album={I'll always be there}] + + \cover + \capo{2} + \gtab{Em}{022000} + \gtab{D}{XX0232} + \gtab{C}{X32010} + \gtab{G}{320003} + \gtab{B7}{X21202} + + \begin{verse} + \[Em] Au temps des légendes an\[D]ciennes + Avant que l'homme blanc ne \[C]vienne + Vivait une jeune orphe\[Em]line \[D] \[C] \[Em] + \end{verse} + + \begin{verse*} + \[Em] Un jour une flamme trop \[D]vive + Que le vent souffla de la \[C]rive + Lui vola sa beauté di\[Em]vine \[D] \[C] \[G] + \end{verse*} + + \begin{verse*} + \[G] Son cri résonna dans la \[D]plaine + La terre et le vent se sou\[C]viennent + De son courage et de sa \[B7]peine + \end{verse*} + + \begin{chorus} + \echo{Elle s'appelait} + \[Em]Oo-oo-oo-\[D]oo-oo-oo-\[C]oo-chige\[Em]as \rep{2} + \end{chorus} + + \begin{verse} + Dans un des villages voisins + Vivait un prince magicien + Qui fit la promesse impossible + \end{verse} + + \begin{verse*} + D'unir sa vie et son histoire + À celle qui saurait le voir + Lui, que l'on savait invisible + \end{verse*} + + \begin{verse*} + Toutes les filles du village + Ne virent là-bas que son mirage + Et la seule à voir son visage + \end{verse*} + + \begin{chorus} + \echo{S'appelait} + Oo-oo-oo-oo-oo-oo-oo-chigeas \rep{2} + \end{chorus} + + \begin{verse*} + Au temps des légendes anciennes + Avant que l'homme blanc ne vienne{\dots} + Vivait une orpheline{\dots} indienne + \end{verse*} + +\endsong diff --git a/songs/suzanne_vega/luka.sg b/songs/suzanne_vega/luka.sg new file mode 100644 index 00000000..e4068e1d --- /dev/null +++ b/songs/suzanne_vega/luka.sg @@ -0,0 +1,83 @@ +\selectlanguage{english} +\songcolumns{2} +\beginsong{Luka} + [by={Suzanne Vega},cov={tried-and-true},album={Tried and true}] + + \cover + \capo{2} + \gtab{G}{320003} + \gtab{D}{XX0232} + \gtab{C}{X32010} + \gtab{Em}{022000} + + \begin{verse*} + \musicnote{\Intro: \nolyrics \[G D C D] \rep{2}} + \end{verse*} + + \begin{verse} + \[G] My name is \[D]Luka + \[C] I live on the \[D]second floor + \[G] I live ups\[D]tairs from you + \[C] Yes I think you've \[D]seen me before + \end{verse} + + \begin{chorus} + \[Em] If you hear \[D]something late at night + \[Em] Some kind of \[D]trouble, some kind of fight + \[C] Just don't \[D]ask me what it was \rep{3} + \end{chorus} + + \begin{verse} + I think it's because I'm clumsy + I try not to talk too loud + Maybe it's because I'm crazy + I try not to act too proud + \end{verse} + + \begin{chorus} + They only hit until you cry + After that you don't ask why + You just don't argue anymore \rep{3} + \end{chorus} + + \begin{verse*} + \musicnote{\nolyrics \[G D C D] \rep{2}} + \end{verse*} + + \begin{verse} + Yes I think I'm okay + I walked into the door again + Well, if you ask that's what I'll say + And it's not your business anyway + \end{verse} + + \begin{chorus} + I guess I'd like to be alone + With nothing broken, nothing thrown + Just don't ask me how I am \rep{3} + \end{chorus} + + \begin{verse} + My name is Luka + I live on the second floor + I live upstairs from you + Yes I think you've seen me before + \end{verse} + + \begin{chorus} + If you hear something late at night + Some kind of trouble, some kind of fight + Just don't ask me what it was \rep{3} + \end{chorus} + + \begin{chorus} + They only hit until you cry + After that you don't ask why + You just don't argue anymore \rep{3} + \end{chorus} + + \begin{verse*} + \musicnote{\Outro: \nolyrics \[G D C D] \rep{2}} + \end{verse*} + +\endsong diff --git a/songs/suzanne_vega/tried-and-true.jpg b/songs/suzanne_vega/tried-and-true.jpg new file mode 100644 index 00000000..88fa9ae2 Binary files /dev/null and b/songs/suzanne_vega/tried-and-true.jpg differ diff --git a/songs/terry_bush/maybe_tomorrow.sg b/songs/terry_bush/maybe_tomorrow.sg new file mode 100644 index 00000000..aa6e688c --- /dev/null +++ b/songs/terry_bush/maybe_tomorrow.sg @@ -0,0 +1,68 @@ +\selectlanguage{english} +\songcolumns{1} +\beginsong{Maybe tomorrow} + [by={Terry Bush},cov={the-littlest-hobo},album={The littlest hobo}] + + \cover + \gtab{F}{1:022100} + \gtab{Dm}{XX0231} + \gtab{C}{X32010} + \gtab{B&}{1:X02220} + \gtab{Am7}{002010} + \gtab{Gm}{3:022000} + + \begin{verse*} + \musicnote{\Intro: \nolyrics \[F]} + \end{verse*} + + \begin{verse} + There's a \[Dm]voice, that keeps on calling \[C]me + Down the \[Dm]road, that's where I'll always \[C]be + Every \[F]stop I make, I make a new \[Dm]friend + Can't stay for \[B&]long, just turn a\[C]round and I'm gone a\[F]gain + Maybe tomo\[Dm]rrow, I'll \[B&]want to settle \[F]down \[Am7] \[Dm] + Until tomo\[Gm]rrow, I'll \[B&]just keep movin' \[F]on + \end{verse} + + \begin{verse} + Down this road, that never seems to end + Where new adventure, lies just around the bend + So if you wanna join me for a while + Just grab your hat, come travel light, that's hobo style + Maybe tomorrow, I'll want to settle down + Until tomorrow, the whole world is my home + \end{verse} + + \begin{chorus} + So if you \[F]wanna join me for a \[Dm]while + Just grab your \[B&]hat, come travel \[C]light, that's hobo \[F]style + Maybe tomo\[Dm]rrow, I'll \[B&]want to settle \[F]down \[Am7] \[Dm] + Until tomo\[Gm]rrow, I'll \[B&]just keep movin' \[F]on + \end{chorus} + + \begin{verse*} + \musicnote {\nolyrics \[Dm C Dm C F Dm B{\flt} C F]} + \end{verse*} + + \begin{bridge} + Maybe tomo\[Dm]rrow, I'll \[B&]want to settle \[F]down \[Am7] \[Dm] + Until tomo\[Gm]rrow, I'll \[B&]just keep movin' \[F]on + \end{bridge} + + \begin{verse} + There's a world, that's waiting to unfold + A brand new tale, no one has ever told + We've journey'd far, far, but now it won't be long + We're almost there and we've paid our fare with the hobo song + Maybe tomorrow, I'll want to settle down + Until tomorrow, I'll just keep movin' on + \end{verse} + + \begin{chorus} + So if you wanna join me for a while + Just grab your hat, come travel light, that's hobo style + Maybe tomorrow, I'll find what I call home + Until tomorrow, you know I'm free to roam + \end{chorus} + +\endsong diff --git a/songs/terry_bush/the-littlest-hobo.jpg b/songs/terry_bush/the-littlest-hobo.jpg new file mode 100644 index 00000000..b886d848 Binary files /dev/null and b/songs/terry_bush/the-littlest-hobo.jpg differ diff --git a/songs/the_eagles/complete-greatest-hits.jpg b/songs/the_eagles/complete-greatest-hits.jpg deleted file mode 100644 index b8744661..00000000 Binary files a/songs/the_eagles/complete-greatest-hits.jpg and /dev/null differ diff --git a/songs/the_eagles/hotel-california.jpg b/songs/the_eagles/hotel-california.jpg new file mode 100644 index 00000000..bb32a691 Binary files /dev/null and b/songs/the_eagles/hotel-california.jpg differ diff --git a/songs/the_eagles/hotel_california.sg b/songs/the_eagles/hotel_california.sg index f94dee1a..758f4c93 100644 --- a/songs/the_eagles/hotel_california.sg +++ b/songs/the_eagles/hotel_california.sg @@ -1,7 +1,7 @@ \selectlanguage{english} \songcolumns{2} \beginsong{Hotel California} - [by={The Eagles},cov={complete-greatest-hits},album={Complete greatest hits}] + [by={Eagles},cov={hotel-california},album={Hotel California}] \cover @@ -12,15 +12,19 @@ \gtab{G}{320003} \gtab{D}{XX0232} + \begin{verse*} + \musicnote{\Intro: \nolyrics \[Bm F{\shrp} A E G D Em F{\shrp}] \rep{2}} + \end{verse*} + \begin{verse} - \[Bm]On a dark desert highway - \[F#]Cool wind in my hair - \[A]Warm smell of colitas - \[E]Rising up through the air - \[G]Up ahead in the distance - \[D]I saw a shimmering light - \[Em]My head grew heavy and my sight grew dim - \[F#]{I had} to stop for the night + \[Bm] On a dark desert highway + \[F#] Cool wind in my hair + \[A] Warm smell of colitas + \[E] Rising up through the air + \[G] Up ahead in the distance + \[D] {I saw} a shimmering light + \[Em] My head grew heavy and my sight grew dim + \[F#] {I had} to stop for the night \end{verse} \begin{verse} @@ -36,7 +40,7 @@ \begin{chorus} \[G]Welcome to the Hotel Cali\[D]fornia - Such a \[Em]lovely place + Such a \[Em]lovely place \echo{such a lovely place} Such a \[F#]lovely face \[G]Plenty of room at the Hotel Cali\[D]fornia Any \[Em]time of year \echo{any time of year} @@ -67,7 +71,7 @@ \begin{chorus} Welcome to the Hotel California - Such a lovely place + Such a lovely place \echo{such a lovely place} Such a lovely face They livin' it up at the Hotel California What a nice surprise \echo{what a nice surprise} @@ -76,8 +80,8 @@ \begin{verse} Mirrors on the ceiling - The pink champagne on ice - And she said, ``We are all just prisoners here + The pink champagne on ice \echo{and she said} + ``We are all just prisoners here Of our own device'' And in the master's chambers They gathered for the feast @@ -91,8 +95,8 @@ I had to find the passage back To the place I was before ``Relax'' said the nightman - ``We are programmed to receive'' - ``You can check out anytime you like + ``We are programmed to receive + You can check out anytime you like But you can never leave'' \end{verse} diff --git a/songs/traditionnel/il_pleut_bergere.sg b/songs/traditionnel/il_pleut_bergere.sg new file mode 100644 index 00000000..008066ca --- /dev/null +++ b/songs/traditionnel/il_pleut_bergere.sg @@ -0,0 +1,57 @@ +\selectlanguage{french} +\songcolumns{2} +\beginsong{Il pleut bergère} + [by={Traditionnel},cov={traditionnel},album={France}] + + \cover + \gtab{G}{320003} + \gtab{D}{XX0232} + \gtab{C}{X32010} + + \begin{verse} + Il \[G]pleut, il pleut bergère + Presse tes \[D]blancs mou\[G]tons + \[D]Allons sous ma chau\[G]mière + Bergère, vite, al\[D]lons + \end{verse} + + \begin{verse*} + \[D]J'entends sur le feuil\[G]lage + \[C]L'eau qui tombe \[G]à grand \[D]bruit + Voi\[G]ci, voici l'o\[C]rage + \[G]Voilà l'é\[D]clair qui \[G]luit + \end{verse*} + + \begin{repeatedchords} + \begin{verse} + En\[G]tends-tu le tonnerre ? + Il roule en \[D]appro\[G]chant + \[D]Prends un abri, ber\[G]gère + À ma droite, en mar\[D]chant + \end{verse} + + \begin{verse*} + \[D]Je vois notre ca\[G]bane + \[C]Et, tiens, voi\[G]ci ve\[D]nir + Ma \[G]mère et ma sœur \[C]Anne + \[G]Qui vont l'é\[D]table ouv\[G]rir + \end{verse*} + + \begin{verse} + Bon\[G]soir, bonsoir, ma mère + Ma sœur \[D]Anne, bon\[G]soir + \[D]J'amène ma ber\[G]gère + Près de vous pour ce \[D]soir + \end{verse} + + \begin{verse*} + \[D]Va te sécher, ma \[G]mie + \[C]Auprès de \[G]nos ti\[D]sons + Soeur, \[G]fais-lui compa\[C]gnie + \[G]Entrez, pe\[D]tits mou\[G]tons + \end{verse*} + \end{repeatedchords} + + \lilypond{Il_pleut_bergere} + +\endsong diff --git a/songs/traditionnel/sur_le_pont_d_avignon.sg b/songs/traditionnel/sur_le_pont_d_avignon.sg new file mode 100644 index 00000000..39dec131 --- /dev/null +++ b/songs/traditionnel/sur_le_pont_d_avignon.sg @@ -0,0 +1,43 @@ +\selectlanguage{french} +\songcolumns{2} +\beginsong{Sur le pont d'Avignon} + [by={Traditionnel},cov={traditionnel},album={France}] + + \cover + \gtab{G}{320003} + \gtab{D}{XX0232} + + \begin{chorus} + \[G]Sur le pont \[D]{d'Avignon} + \[G]L'on y danse, \[D]l'on y danse + \[G]Sur le pont \[D]{d'Avignon} + \[G]L'on y danse \[D]tous en \[G]rond + \end{chorus} + + \begin{verse} + \[G]Les beaux Messieurs font \[D]comme \[G]ça + \[G]Et puis encore \[D]comme \[G]ça + \end{verse} + + \begin{verse} + Les professeurs \dots + \end{verse} + + \begin{verse} + Les écoliers \dots + \end{verse} + + \begin{verse} + Les demoiselles \dots + \end{verse} + + \begin{verse} + Les belles dames \dots + \end{verse} + + \lilypond{Sur_le_pont_d_avignon} + +\endsong +\beginscripture{}% + La chanson continue en citant des noms de profession.% +\endscripture% diff --git a/templates/ancient.tmpl b/templates/ancient.tmpl index 364a6411..b4075a75 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.7.0"}, +%%: {"name":"version", "description":"Version", "default":"3.7.2"}, %%: {"name":"subtitle", "description":"Subtitle"}, %%: {"name":"web", "description":"Web", "default":"http://www.patacrep.com"}, %%: {"name":"mail", "description":"Email", "default":"crep@team-on-fire.com"}, @@ -68,7 +68,7 @@ \newindex{titleidx}{\getname_title} \newauthorindex{authidx}{\getname_auth} -\graphicspath{ {img/}, {\getLibraryImgDirectory}, {\getLibraryLilypondDirectory}, {\getCacheDirectory} } +\graphicspath{ {img/}, {\getLibraryImgDirectory}, {\getLibraryLilypondDirectory} } \renewcommand{\lilypond}[1]{% \iflilypond% diff --git a/templates/minimal.tmpl b/templates/minimal.tmpl index 175c2da4..a159a5b4 100644 --- a/templates/minimal.tmpl +++ b/templates/minimal.tmpl @@ -42,7 +42,7 @@ \usepackage[italian,portuguese,spanish,english,french]{babel} \lang{\getlang} -\graphicspath{ {img/}, {\getLibraryImgDirectory}, {\getLibraryLilypondDirectory}, {\getCacheDirectory} } +\graphicspath{ {img/}, {\getLibraryImgDirectory}, {\getLibraryLilypondDirectory} } \renewcommand{\lilypond}[1]{% \iflilypond% diff --git a/templates/patacrep.tmpl b/templates/patacrep.tmpl index 89e1e919..9a1fa2e6 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.7.0"}, +%%: {"name":"version", "description":"Version", "default":"3.7.2"}, %%: {"name":"subtitle", "description":"Subtitle"}, %%: {"name":"web", "description":"Web", "default":"http://www.patacrep.com"}, %%: {"name":"mail", "description":"Email", "default":"crep@team-on-fire.com"}, @@ -69,7 +69,7 @@ \newindex{titleidx}{\getname_title} \newauthorindex{authidx}{\getname_auth} -\graphicspath{ {img/}, {\getLibraryImgDirectory}, {\getLibraryLilypondDirectory}, {\getCacheDirectory} } +\graphicspath{ {img/}, {\getLibraryImgDirectory}, {\getLibraryLilypondDirectory} } \renewcommand{\lilypond}[1]{% \iflilypond% diff --git a/tex/crepbook.cls b/tex/crepbook.cls index 7bd8c952..c256a7dd 100644 --- a/tex/crepbook.cls +++ b/tex/crepbook.cls @@ -73,6 +73,7 @@ \RequirePackage{xstring} \RequirePackage{ifthen} \RequirePackage{framed} +\RequirePackage{currfile} \iflyric% \tabsfalse% @@ -202,7 +203,7 @@ \setlength{\coverspace}{0.1cm} \newcommand{\songcover}{} \newcommand{\songalbum}{} -\newsongkey{cov}{\let\songcover\@empty}{\def\songcover{#1}} +\newsongkey{cov}{\let\songcover\@empty}{\def\songcover{\currfiledir#1}} \newsongkey{album}{\let\songalbum\@empty}{\def\songalbum{#1}} \newsongkey{url}{\let\songurl\@empty}{\def\songurl{#1}} \newsongkey{original}{\let\songoriginal\@empty}{\def\songoriginal{#1}} diff --git a/utils/songbook-gtab.py b/utils/songbook-gtab.py index 36a8e69d..c957a8ca 100755 --- a/utils/songbook-gtab.py +++ b/utils/songbook-gtab.py @@ -6,6 +6,8 @@ import re from optparse import OptionParser from utils.utils import recursiveFind +from utils.utils import recursiveFind + # Pattern set to ignore latex command in title prefix gtabPattern = re.compile(r"\\gtab\{(.*)\}\{(.*)\}"); @@ -27,6 +29,7 @@ def main(): positions = dict() songfiles = recursiveFind(os.path.join(library, 'songs'), '*.sg') + for file in songfiles: for line in open(file): result = gtabPattern.match(line)