Browse Source

Merge branch 'master' into staging

Conflicts:
	songs/Cesaria_Evora/Petit_pays.sg
	songs/JCFrog/Je_t_emmene_dedans.sg
	songs/JCFrog/La_mauvaise_ereputation.sg
	songs/JCFrog/Russians.sg
	songs/Jean-Jacques_Goldman/Il_changeait_la_vie.sg
	songs/Sting/Russians.sg
remotes/origin/staging
Romain Goffe 14 years ago
parent
commit
6e70cbea49
  1. 10
      books/lyricbook.sb
  2. 4
      books/naheulbeuk.sb
  3. 5
      books/songbook.sb
  4. 1
      books/volume-1.sb
  5. 1
      books/volume-2.sb
  6. 28
      books/volume-3.sb
  7. 57
      books/volume-4.sb
  8. BIN
      img/batterie.png
  9. BIN
      img/grosse-caisse.png
  10. BIN
      img/music_by_lauratheartist.jpg
  11. BIN
      img/naheulbeuk01.jpg
  12. BIN
      img/naheulbeuk02.jpg
  13. BIN
      img/naheulbeuk05.jpg
  14. BIN
      img/naheulbeuk08.jpg
  15. 0
      img/nb_barbarian.jpg
  16. 0
      img/nb_chest.jpg
  17. 0
      img/nb_cover.jpg
  18. 0
      img/nb_dwarf_01.jpg
  19. 0
      img/nb_dwarf_02.jpg
  20. 0
      img/nb_elf_01.jpg
  21. 0
      img/nb_elf_02.jpg
  22. 0
      img/nb_ogre.jpg
  23. 0
      img/nb_ranger.jpg
  24. 0
      img/nb_wizard.jpg
  25. BIN
      img/sound.jpg
  26. 2
      lilypond/10_sous_dans_ma_poche-1.ly
  27. 4
      lilypond/10_sous_dans_ma_poche-2.ly
  28. 2
      lilypond/A_l_aventure_compagnons.ly
  29. 2
      lilypond/Cupidon_s_en_fout.ly
  30. 2
      lilypond/Dans_la_tete.ly
  31. 2
      lilypond/Droit_devant-1.ly
  32. 2
      lilypond/Droit_devant-2.ly
  33. 2
      lilypond/Education_sentimentale.ly
  34. 2
      lilypond/Entre_deux_taxis.ly
  35. 2
      lilypond/Et_si_je_t_aime.ly
  36. 2
      lilypond/Etoiles_filantes-1.ly
  37. 2
      lilypond/Etoiles_filantes-2.ly
  38. 4
      lilypond/Fairytale_of_New_York.ly
  39. 2
      lilypond/Fuck_you.ly
  40. 34
      lilypond/Geste_heroique-1.ly
  41. 2
      lilypond/Geste_heroique-2.ly
  42. 2
      lilypond/Heart_of_gold.ly
  43. 2
      lilypond/Jessica.ly
  44. 2
      lilypond/Keep_on_the_sunny_side.ly
  45. 2
      lilypond/Kiss_the_children.ly
  46. 2
      lilypond/L_harmonica.ly
  47. 2
      lilypond/La_biere_du_donjon.ly
  48. 2
      lilypond/La_compagnie_du_chien_rugissant.ly
  49. 2
      lilypond/La_cumbia_del_mole.ly
  50. 2
      lilypond/La_danse_des_esquimaux.ly
  51. 2
      lilypond/La_declaration.ly
  52. 2
      lilypond/La_fiancee_de_l_eau.ly
  53. 2
      lilypond/La_premiere_fois.ly
  54. 2
      lilypond/La_reine.ly
  55. 2
      lilypond/La_sorciere_Grabouilla.ly
  56. 8
      lilypond/La_tribu_de_Dana.ly
  57. 2
      lilypond/La_vie_d_aventurier.ly
  58. 2
      lilypond/Le_cafe_des_jours_heureux.ly
  59. 11
      lilypond/Le_joueur_de_pipeau.ly
  60. 2
      lilypond/Le_laride_du_poulet.ly
  61. 2
      lilypond/Le_moustique.ly
  62. 21
      lilypond/Le_p_tit_gars.ly
  63. 2
      lilypond/Le_rat_de_l_opera-1.ly
  64. 2
      lilypond/Le_rat_de_l_opera-2.ly
  65. 2
      lilypond/Le_vent_nous_portera.ly
  66. 2
      lilypond/Lea.ly
  67. 2
      lilypond/Les_hommes_que_j_aime.ly
  68. 2
      lilypond/Les_souliers_de_Lady_Fae-1.ly
  69. 2
      lilypond/Les_souliers_de_Lady_Fae-2.ly
  70. 2
      lilypond/Les_souliers_rouges.ly
  71. 2
      lilypond/Lino.ly
  72. 2
      lilypond/Mamadou_avait_mal_aux_dents.ly
  73. 2
      lilypond/Marchand_de_couleurs.ly
  74. 2
      lilypond/Mrs_McGrath.ly
  75. 2
      lilypond/Noel_en_Mordor.ly
  76. 2
      lilypond/Notre_monde.ly
  77. 2
      lilypond/Nuit_humide_1.ly
  78. 2
      lilypond/Nuit_humide_2.ly
  79. 2
      lilypond/One_more_cup_of_coffee.ly
  80. 2
      lilypond/Petit_Pierrot.ly
  81. 4
      lilypond/Rue_de_Paname.ly
  82. 2
      lilypond/Rue_du_temps.ly
  83. 2
      lilypond/Sad_Lisa.ly
  84. 2
      lilypond/Sad_robot.ly
  85. 2
      lilypond/Sainte_Cecile.ly
  86. 2
      lilypond/Saturnin.ly
  87. 2
      lilypond/Souleve_ta_jupe.ly
  88. 2
      lilypond/The_boxer.ly
  89. 2
      lilypond/Tom_Sawyer_1.ly
  90. 2
      lilypond/Tom_Sawyer_2.ly
  91. 2
      lilypond/Ton_invitation_1.ly
  92. 2
      lilypond/Ton_invitation_2.ly
  93. 2
      lilypond/V_la_l_bon_vent.ly
  94. 2
      lilypond/Vanity.ly
  95. 9
      lilypond/header
  96. 14
      makefile
  97. 6
      songbook-makeindex.py
  98. 10
      songbook.py
  99. 4
      songbook.sb
  100. 108
      songs/Alain_Souchon/Bidon.sg

10
books/lyricbook.sb

@ -0,0 +1,10 @@
{
"template" : "patacrep.tmpl",
"lang" : "french",
"bookoptions" : [],
"booktype" : "lyric",
"author" : "Crep (R.Goffe) \\and Lohrun (A.Dupas)",
"subtitle" : "parolier",
"title" : "Recueil de chansons",
"songs" : "all"
}

4
naheulbeuk.sb → books/naheulbeuk.sb

@ -1,6 +1,6 @@
{
"template" : "ancient.tmpl",
"author" : "Crep (R.Goffe) \\and Lohrun (A.Dupas)",
"lang" : "french",
"bookoptions" : [
"diagram",
"lilypond",
@ -9,7 +9,7 @@
"booktype" : "chorded",
"footer" : "Musique du Naheulband: \\url{http://www.penofchaos.com/warham/donjon-groupe.htm}",
"license" : "\\input{license-nb.tex}",
"picture" : "ranger",
"picture" : "nb_cover",
"picturecopyright" : "Personnages par \\emph{Pen Of Chaos} / Illustrations par \\emph{Marion Poinsot}",
"subtitle" : "Recueil de chansons non-officiel",
"title" : "Le Donjon de Naheulbeuk",

5
books/songbook.sb

@ -0,0 +1,5 @@
{
"template" : "patacrep.tmpl",
"lang" : "french",
"songs" : "all"
}

1
volume-1.sb → books/volume-1.sb

@ -1,5 +1,6 @@
{
"template" : "patacrep.tmpl",
"lang" : "french",
"bookoptions" : [
"diagram",
"lilypond",

1
volume-2.sb → books/volume-2.sb

@ -1,5 +1,6 @@
{
"template" : "patacrep.tmpl",
"lang" : "french",
"bookoptions" : [
"diagram",
"lilypond",

28
volume-3.sb → books/volume-3.sb

@ -1,5 +1,6 @@
{
"template" : "patacrep.tmpl",
"lang" : "french",
"bookoptions" : [
"diagram",
"lilypond",
@ -27,6 +28,7 @@
"Bruce_Springsteen/Mrs_McGrath.sg",
"Bruce_Springsteen/Old_Dan_Tucker.sg",
"Cat_Stevens/Wild_world.sg",
"Cesaria_Evora/Petit_pays.sg",
"Charles_Aznavour/Les_comediens.sg",
"Cookie_Dingler/Femme_liberee.sg",
"Crep/Bioman.sg",
@ -46,10 +48,13 @@
"Eddie_Vedder/Guaranteed.sg",
"Elton_John/Can_you_fell_the_love_tonight.sg",
"Elton_John/Crocodile_rock.sg",
"Elvis_Presley/Don_t_be_cruel.sg",
"Elvis_Presley/Love_me_tender.sg",
"Emiliana_Torrini/Jungle_drum.sg",
"Fools_Garden/Lemon_tree.sg",
"France_Gall/Il_jouait_du_piano_debout.sg",
"Francois_Corbier/Les_vieux_copains_de_la_tele.sg",
"Georges_Brassens/Chanson_pour_l_auvergnat.sg",
"Gerard_Lenorman/La_ballade_des_gens_heureux.sg",
"Gerard_Lenorman/Si_j_etais_president.sg",
"Gipsy_Kings/Baila_me.sg",
@ -69,6 +74,7 @@
"Hugues_Aufray/Alouette.sg",
"Hugues_Aufray/Celine.sg",
"Hugues_Aufray/Hasta_luego.sg",
"Hugues_Aufray/Le_joueur_de_pipeau.sg",
"Hugues_Aufray/Le_jour_ou_le_bateau_viendra.sg",
"Hugues_Aufray/L_epervier.sg",
"Hugues_Aufray/Les_couleurs.sg",
@ -79,14 +85,26 @@
"Jacques_Higelin/Poil_dans_la_main.sg",
"Jacques_Higelin/Tombe_du_ciel.sg",
"JCFrog/Hadopi_song_III.sg",
"JCFrog/Je_t_emmene_dedans.sg",
"JCFrog/La_mauvaise_ereputation.sg",
"JCFrog/Russians.sg",
"Jeanette/Porque_te_vas.sg",
"Jean-Jacques_Goldman/Encore_un_matin.sg",
"Jean-Jacques_Goldman/Il_changeait_la_vie.sg",
"Jean-Jacques_Goldman/Le_coureur.sg",
"Joe_Dassin/Les_champs_elysees.sg",
"Johnny_Cash/It_aint_me_babe.sg",
"Johnny_Cash/I_walk_the_line.sg",
"Johnny_Cash/Jackson.sg",
"Johnny_Cash/The_ring_of_fire.sg",
"Karpatt/Fan_de_maman.sg",
"Karpatt/Histoires_de_famille.sg",
"Karpatt/Histoire_de_famille.sg",
"Karpatt/Les_vieilles.sg",
"Karpatt/Lino.sg",
"Karpatt/Souleve_ta_jupe.sg",
"La_compagnie_creole/Ca_fait_rire_les_oiseaux.sg",
"La_compagnie_creole/La_machine_a_danser.sg",
"La_compagnie_creole/Le_bal_masque.sg",
"La_Maison_Tellier/La_chambre_rose.sg",
"La_Rue_Ketanou/Almarita.sg",
"La_Rue_Ketanou/Les_tontons.sg",
@ -147,13 +165,17 @@
"Renaud/C_est_quand_qu_on_va_ou.sg",
"Renaud/La_blanche.sg",
"Renaud/Salut_manouche.sg",
"Sting/Russians.sg",
"The_Beautiful_Girls/La_Mar.sg",
"The_Connells/74_75.sg",
"The_Innocence_Mission/The_lakes_of_Canada.sg",
"The_Nightwatchman/California_s_dark.sg",
"The_Pogues/The_Irish_Rover.sg",
"The_Rolling_Stones/Route_66.sg",
"The_Rolling_Stones/You_cant_always_get_what_you_want.sg",
"Tit_Patapons/Marchand_de_couleurs.sg",
"Traditionnel/L_homme_de_cromagnon.sg",
"Tri_Yann/Kiss_the_cildren_for_me_Mary.sg",
"Tri_Yann/Les_filles_de_Redon.sg"]
}
"Tri_Yann/Les_filles_de_Redon.sg"
]
}

57
books/volume-4.sb

@ -0,0 +1,57 @@
{
"template" : "patacrep.tmpl",
"lang" : "french",
"bookoptions" : [
"diagram",
"lilypond",
"pictures"
],
"booktype" : "chorded",
"picture" : "music_by_lauratheartist",
"picturecopyright" : "LauraTheArtist @ deviantart.com",
"subtitle" : "Tome 4",
"songs" : [
"Alain_Souchon/Bidon.sg",
"Bob_Marley/No_woman_no_cry.sg",
"Bob_Marley/Redemption_song.sg",
"Catherine_Le_Forestier/La_petite_fugue.sg",
"Charles_Aznavour/Mes_emmerdes.sg",
"Christophe/Aline.sg",
"Christophe/Les_mots_bleus.sg",
"Daniel_Lanois/Jolie_Louise.sg",
"Edith_Piaf/Padam_Padam.sg",
"Herman_s_Hermits/No_milk_today.sg",
"Jeanne_Moreau/Le_tourbillon_de_la_vie.sg",
"Joe_Dassin/Ma_bonne_etoile.sg",
"Julien_Clerc/Ce_n_est_rien.sg",
"Julien_Clerc/Melissa.sg",
"Julien_Clerc/Travailler_c_est_trop_dur.sg",
"Karpatt/En_pleine_mer.sg",
"Karpatt/Le_demenagement.sg",
"Laura_Veirs/Ballad_of_John_Vogelin.sg",
"Laura_Veirs/Black_eyed_Susan.sg",
"Laura_Veirs/Icebound_stream.sg",
"Laura_Veirs/Jailhouse_fire.sg",
"Les_Fatals_Picards/L_amour_a_la_francaise.sg",
"Les_Fatals_Picards/La_securite_de_l_emploi.sg",
"Matticus/Le_p_tit_gars.sg",
"Maxime_Le_Forestier/Entre_14_et_40_ans.sg",
"Maxime_Le_Forestier/Fontenay_aux_roses.sg",
"Maxime_Le_Forestier/Je_ne_sais_rien_faire.sg",
"Maxime_Le_Forestier/L_auto_stop.sg",
"Michel_Fugain/Forteresse.sg",
"Negresses_vertes/Sous_le_soleil_de_Bodega.sg",
"Nino_Ferrer/Mirza.sg",
"Oldelaf_et_Monsieur_D/Courseulles_sur_Mer.sg",
"Oldelaf_et_Monsieur_D/Mamy_blue.sg",
"Oldelaf_et_Monsieur_D/Mon_testament.sg",
"Oldelaf_et_Monsieur_D/Super_heros.sg",
"Oldelaf_et_Monsieur_D/Vendredi.sg",
"Pep_s/Liberta.sg",
"Pigalle/Dans_la_salle_du_bar_tabac_de_la_rue_des_martyrs.sg",
"Renan_Luce/La_lettre.sg",
"Renan_Luce/Monsieur_Marcel.sg",
"Telephone/Cendrillon.sg",
"Tracy_Chapman/Talkin_about_the_revolution.sg",
"Yves_Duteil/Le_petit_pont_de_bois.sg"]
}

BIN
img/batterie.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 57 KiB

BIN
img/grosse-caisse.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 42 KiB

BIN
img/music_by_lauratheartist.jpg

Binary file not shown.

After

Width:  |  Height:  |  Size: 43 KiB

BIN
img/naheulbeuk01.jpg

Binary file not shown.

Before

Width:  |  Height:  |  Size: 50 KiB

BIN
img/naheulbeuk02.jpg

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.5 KiB

BIN
img/naheulbeuk05.jpg

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.9 KiB

BIN
img/naheulbeuk08.jpg

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.5 KiB

0
img/barbare.jpg → img/nb_barbarian.jpg

Before

Width:  |  Height:  |  Size: 74 KiB

After

Width:  |  Height:  |  Size: 74 KiB

0
img/naheulbeuk07.jpg → img/nb_chest.jpg

Before

Width:  |  Height:  |  Size: 58 KiB

After

Width:  |  Height:  |  Size: 58 KiB

0
img/ranger.jpg → img/nb_cover.jpg

Before

Width:  |  Height:  |  Size: 140 KiB

After

Width:  |  Height:  |  Size: 140 KiB

0
img/nain.jpg → img/nb_dwarf_01.jpg

Before

Width:  |  Height:  |  Size: 57 KiB

After

Width:  |  Height:  |  Size: 57 KiB

0
img/naheulbeuk06.jpg → img/nb_dwarf_02.jpg

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 13 KiB

0
img/elfe.jpg → img/nb_elf_01.jpg

Before

Width:  |  Height:  |  Size: 62 KiB

After

Width:  |  Height:  |  Size: 62 KiB

0
img/naheulbeuk04.png → img/nb_elf_02.jpg

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 13 KiB

0
img/ogre.jpg → img/nb_ogre.jpg

Before

Width:  |  Height:  |  Size: 67 KiB

After

Width:  |  Height:  |  Size: 67 KiB

0
img/naheulbeuk03.jpg → img/nb_ranger.jpg

Before

Width:  |  Height:  |  Size: 42 KiB

After

Width:  |  Height:  |  Size: 42 KiB

0
img/magicienne.jpg → img/nb_wizard.jpg

Before

Width:  |  Height:  |  Size: 63 KiB

After

Width:  |  Height:  |  Size: 63 KiB

BIN
img/sound.jpg

Binary file not shown.

Before

Width:  |  Height:  |  Size: 32 KiB

After

Width:  |  Height:  |  Size: 86 KiB

2
lilypond/10_sous_dans_ma_poche-1.ly

@ -1,5 +1,5 @@
\include "header"
\paper{paper-height = 3.3\cm}
\paper{paper-height = 2.5\cm}
{
\relative c'

4
lilypond/10_sous_dans_ma_poche-2.ly

@ -1,5 +1,5 @@
\include "header"
\paper{paper-height = 4.5\cm}
\paper{paper-height = 4\cm}
{
\relative c'
@ -26,4 +26,4 @@
{c16 a b g a4\trill}
}
}
}
}

2
lilypond/A_l_aventure_compagnons.ly

@ -1,5 +1,5 @@
\include "header"
\paper{paper-height = 6.4\cm}
\paper{paper-height = 5.6\cm}
{
\key ees \major

2
lilypond/Cupidon_s_en_fout.ly

@ -1,5 +1,5 @@
\include "header"
\paper{paper-height = 3.5\cm}
\paper{paper-height = 2.2\cm}
{
\key a \minor

2
lilypond/Dans_la_tete.ly

@ -1,5 +1,5 @@
\include "header"
\paper{paper-height = 3.1\cm}
\paper{paper-height = 2.2\cm}
{
\relative c''

2
lilypond/Droit_devant-1.ly

@ -1,5 +1,5 @@
\include "header"
\paper{paper-height = 3.2\cm}
\paper{paper-height = 2\cm}
{
\key d \minor

2
lilypond/Droit_devant-2.ly

@ -1,5 +1,5 @@
\include "header"
\paper{paper-height = 1.6\cm}
\paper{paper-height = .9\cm}
{
\key d \minor

2
lilypond/Education_sentimentale.ly

@ -1,5 +1,5 @@
\include "header"
\paper{paper-height = 3.1\cm}
\paper{paper-height = 2.2\cm}
{
\key c \major

2
lilypond/Entre_deux_taxis.ly

@ -1,5 +1,5 @@
\include "header"
\paper{paper-height = 3.1\cm}
\paper{paper-height = 2.2\cm}
{
\key c \major

2
lilypond/Et_si_je_t_aime.ly

@ -1,5 +1,5 @@
\include "header"
\paper{paper-height = 5.2\cm}
\paper{paper-height = 4.2\cm}
{
\relative c'''

2
lilypond/Etoiles_filantes-1.ly

@ -1,5 +1,5 @@
\include "header"
\paper{paper-height = 1.6\cm}
\paper{paper-height = 0.9\cm}
{
\relative c'

2
lilypond/Etoiles_filantes-2.ly

@ -1,5 +1,5 @@
\include "header"
\paper{paper-height = 3.2\cm}
\paper{paper-height = 2.2\cm}
{
\relative c''

4
lilypond/Fairytale_of_New_York.ly

@ -1,5 +1,5 @@
\include "header"
\paper{paper-height = 3.4\cm}
\paper{paper-height = 2.4\cm}
{
\key d \major
@ -23,4 +23,4 @@
b16 a8 fis d fis a8. b16 a8 e8. fis16 e8
fis e d b a b a b cis d4.
}
}
}

2
lilypond/Fuck_you.ly

@ -1,5 +1,5 @@
\include "header"
\paper{paper-height = 1.6\cm}
\paper{paper-height = 0.9\cm}
{
\key c \major

34
lilypond/Geste_heroique-1.ly

@ -1,20 +1,20 @@
\include "header"
\paper{paper-height = 5.7\cm}
\paper{paper-height = 4.4\cm}
musique =
{
\parallelMusic #'(voiceA voiceB voiceC voiceD)
{
\repeat volta 2 {g'2 g'4 f' g' a' bes'2 bes'4 d'' c'' bes' bes' a' bes'2} |
\repeat volta 2 {d'2 d'4 c' d' f' f'2 f'4 f' e' f' g' f' f'2 } |
\repeat volta 2 {bes2 bes4 a bes c' d'2 d'4 bes g d' c' c' d'2 } |
\repeat volta 2 {g2 g4 d g f bes,2 bes,4 bes, c d ees f bes,2} |
\repeat volta 2 {a'2 a'4 g' a' b' c''2 c''4 e'' d'' c'' c'' b' c''2 } |
\repeat volta 2 {e'2 e'4 d' e' g' g'2 g'4 g' fis' g' a' g' g'2 } |
\repeat volta 2 {c'2 c'4 b c' d' e'2 e'4 c' a e' d' d' e'2 } |
\repeat volta 2 {a2 a4 e a g c2 c4 c d e f g c2 } |
\repeat volta 2 {bes'2 a'4 a' g' g' fis'2 fis' e'8 fis' g'4 g' fis' g'2} |
\repeat volta 2 {f'2 f'4 f' d' ees' d'2 d' c'4 d'4 d' d' b2 } |
\repeat volta 2 {d'2 c'4 d' bes c' a2 bes g4 bes4 a a g2 } |
\repeat volta 2 {bes2 f4 d g c d2 bes, c4 g,4 d d g,2} |
\repeat volta 2 {c''2 b'4 b' a' a' gis'2 gis' fis'8 gis' a'4 a' gis' a'2 } |
\repeat volta 2 {g'2 g'4 g' e' f' e'2 e' d'4 e'4 e' e' cis'2 } |
\repeat volta 2 {e'2 d'4 e' c' d' b2 c' a4 c'4 b b a2 } |
\repeat volta 2 {c'2 g4 e a d e2 c d4 a,4 e e a,2 } |
}
}
\score
@ -23,19 +23,15 @@ musique =
<<
\musique
\new Staff
<<
\key g \minor
\voiceA \\
\voiceB
>>
{
\key a \minor
<< \voiceA \\ \voiceB >>
}
\new Staff
{
\key g \minor
\key a \minor
\clef bass
<<
\voiceC \\
\voiceD
>>
<< \voiceC \\ \voiceD >>
}
>>
}

2
lilypond/Geste_heroique-2.ly

@ -1,5 +1,5 @@
\include "header"
\paper{paper-height = 3.2\cm}
\paper{paper-height = 2.2\cm}
{
\relative c''

2
lilypond/Heart_of_gold.ly

@ -1,5 +1,5 @@
\include "header"
\paper{paper-height = 3.5\cm}
\paper{paper-height = 2\cm}
{
\key g \major

2
lilypond/Jessica.ly

@ -1,5 +1,5 @@
\include "header"
\paper{paper-height = 1.6\cm}
\paper{paper-height = 0.9\cm}
{
\key c \major

2
lilypond/Keep_on_the_sunny_side.ly

@ -1,5 +1,5 @@
\include "header"
\paper{paper-height = 4.2\cm}
\paper{paper-height = 3\cm}
{
\key bes \major

2
lilypond/Kiss_the_children.ly

@ -1,5 +1,5 @@
\include "header"
\paper{paper-height = 3.1\cm}
\paper{paper-height = 2.2\cm}
{
\key c \minor

2
lilypond/L_harmonica.ly

@ -1,5 +1,5 @@
\include "header"
\paper{paper-height = 5\cm}
\paper{paper-height = 4\cm}
{
\key a \minor

2
lilypond/La_biere_du_donjon.ly

@ -1,5 +1,5 @@
\include "header"
\paper{paper-height = 1.6\cm}
\paper{paper-height = 0.9\cm}
{
\relative c''

2
lilypond/La_compagnie_du_chien_rugissant.ly

@ -1,5 +1,5 @@
\include "header"
\paper{paper-height = 1.6\cm}
\paper{paper-height = 0.9\cm}
{
\relative c''

2
lilypond/La_cumbia_del_mole.ly

@ -1,5 +1,5 @@
\include "header"
\paper{paper-height = 3.1\cm}
\paper{paper-height = 2.2\cm}
{
\key e \minor

2
lilypond/La_danse_des_esquimaux.ly

@ -1,5 +1,5 @@
\include "header"
\paper{paper-height = 3.1\cm}
\paper{paper-height = 2.2\cm}
{
\key e \major

2
lilypond/La_declaration.ly

@ -1,5 +1,5 @@
\include "header"
\paper{paper-height = 1.7\cm}
\paper{paper-height = 1\cm}
{
\key e \minor

2
lilypond/La_fiancee_de_l_eau.ly

@ -1,5 +1,5 @@
\include "header"
\paper{paper-height = 3.7\cm}
\paper{paper-height = 2.7\cm}
{
\key d \minor

2
lilypond/La_premiere_fois.ly

@ -1,5 +1,5 @@
\include "header"
\paper{paper-height = 3.2\cm}
\paper{paper-height = 2.2\cm}
{
\key ees \major

2
lilypond/La_reine.ly

@ -1,5 +1,5 @@
\include "header"
\paper{paper-height = 8.4\cm}
\paper{paper-height = 7\cm}
{

2
lilypond/La_sorciere_Grabouilla.ly

@ -1,5 +1,5 @@
\include "header"
\paper{paper-height = 6\cm}
\paper{paper-height = 5\cm}
{
\key e \minor

8
lilypond/La_tribu_de_Dana.ly

@ -1,9 +1,9 @@
\include "header"
\paper
{
paper-width = 15.5\cm
line-width = 15\cm
paper-height = 1.6\cm
paper-width = 15\cm
line-width = 14.5\cm
paper-height = 1.2\cm
}
{
@ -23,4 +23,4 @@
c4. c8 bes4 ees8 d c4 c8 bes16 a16 g8 a bes\trill g
c4. d8 bes bes ees8 d c c\trill bes4 c2
}
}
}

2
lilypond/La_vie_d_aventurier.ly

@ -1,5 +1,5 @@
\include "header"
\paper{paper-height = 3.2\cm}
\paper{paper-height = 2.2\cm}
{
\key a \minor

2
lilypond/Le_cafe_des_jours_heureux.ly

@ -1,5 +1,5 @@
\include "header"
\paper{paper-height = 1.6\cm}
\paper{paper-height = 0.9\cm}
{
\relative c'

11
lilypond/Le_joueur_de_pipeau.ly

@ -0,0 +1,11 @@
\include "header"
\paper{paper-height = 0.9\cm}
{
\key d \minor
\relative c''
{
\time 3/4
a4.( bes8 a g) f4.( g8 a c) a4.( bes8 c d) a2.
}
}

2
lilypond/Le_laride_du_poulet.ly

@ -1,5 +1,5 @@
\include "header"
\paper{paper-height = 3.1\cm}
\paper{paper-height = 2.2\cm}
{
\key a \minor

2
lilypond/Le_moustique.ly

@ -1,5 +1,5 @@
\include "header"
\paper{paper-height = 3.1\cm}
\paper{paper-height = 2.2\cm}
{
\relative c''

21
lilypond/Le_p_tit_gars.ly

@ -0,0 +1,21 @@
\include "header"
\paper{
paper-height = 0.9\cm
line-width = 14.5\cm
paper-width = 15\cm
}
{
\relative c''
{
\key a \minor
\time 2/4
\repeat volta 2
{
a8 c a c e d c b
b g b d g f e d
c b a b c d c b
c d e d b d c b
a2
}
}
}

2
lilypond/Le_rat_de_l_opera-1.ly

@ -1,5 +1,5 @@
\include "header"
\paper{paper-height = 5.1\cm}
\paper{paper-height = 4.2\cm}
{
\key a \major

2
lilypond/Le_rat_de_l_opera-2.ly

@ -1,5 +1,5 @@
\include "header"
\paper{paper-height = 4.3\cm}
\paper{paper-height = 3.3\cm}
{
\key a \major

2
lilypond/Le_vent_nous_portera.ly

@ -1,5 +1,5 @@
\include "header"
\paper{paper-height = 3.1\cm}
\paper{paper-height = 2.2\cm}
{
\key e \minor

2
lilypond/Lea.ly

@ -1,5 +1,5 @@
\include "header"
\paper{paper-height = 3.2\cm}
\paper{paper-height = 2.2\cm}
{
\key a \minor

2
lilypond/Les_hommes_que_j_aime.ly

@ -1,5 +1,5 @@
\include "header"
\paper{paper-height = 3.2\cm}
\paper{paper-height = 2\cm}
{
\relative c''

2
lilypond/Les_souliers_de_Lady_Fae-1.ly

@ -1,5 +1,5 @@
\include "header"
\paper{paper-height = 3.1\cm}
\paper{paper-height = 2\cm}
{
\key e \minor

2
lilypond/Les_souliers_de_Lady_Fae-2.ly

@ -1,5 +1,5 @@
\include "header"
\paper{paper-height = 4.1\cm}
\paper{paper-height = 3\cm}
{
\key a \minor

2
lilypond/Les_souliers_rouges.ly

@ -1,5 +1,5 @@
\include "header"
\paper{paper-height = 4.2\cm}
\paper{paper-height = 3.0\cm}
{
\key g \major

2
lilypond/Lino.ly

@ -1,5 +1,5 @@
\include "header"
\paper{paper-height = 1.6\cm}
\paper{paper-height = 1.3\cm}
{
\key d \minor

2
lilypond/Mamadou_avait_mal_aux_dents.ly

@ -1,5 +1,5 @@
\include "header"
\paper{paper-height=5.0\cm}
\paper{paper-height = 4.0\cm}
{
\key c \major

2
lilypond/Marchand_de_couleurs.ly

@ -1,5 +1,5 @@
\include "header"
\paper{paper-height = 1.6\cm}
\paper{paper-height = 0.9\cm}
{
\key a \minor

2
lilypond/Mrs_McGrath.ly

@ -1,5 +1,5 @@
\include "header"
\paper{paper-height = 3.1\cm}
\paper{paper-height = 2.2\cm}
{
\key d \minor

2
lilypond/Noel_en_Mordor.ly

@ -1,5 +1,5 @@
\include "header"
\paper{paper-height = 3.1\cm}
\paper{paper-height = 2\cm}
{
\key c \minor

2
lilypond/Notre_monde.ly

@ -1,5 +1,5 @@
\include "header"
\paper{paper-height = 3.1\cm}
\paper{paper-height = 2.2\cm}
{

2
lilypond/Nuit_humide_1.ly

@ -1,5 +1,5 @@
\include "header"
\paper{paper-height=4.3\cm}
\paper{paper-height = 3\cm}
{
\key e \minor

2
lilypond/Nuit_humide_2.ly

@ -1,5 +1,5 @@
\include "header"
\paper{paper-height=4.3\cm}
\paper{paper-height = 3\cm}
{
\key e \minor

2
lilypond/One_more_cup_of_coffee.ly

@ -3,7 +3,7 @@
{
paper-width = 15.5\cm
line-width = 15\cm
paper-height = 1.8\cm
paper-height = 1.3\cm
}
{

2
lilypond/Petit_Pierrot.ly

@ -1,5 +1,5 @@
\include "header"
\paper{paper-height = 3.3\cm}
\paper{paper-height = 2.2\cm}
{
\relative c''

4
lilypond/Rue_de_Paname.ly

@ -1,5 +1,5 @@
\include "header"
\paper{paper-height=4.1\cm}
\paper{paper-height = 3\cm}
{
\time 6/8
@ -10,4 +10,4 @@
\repeat volta 2 {c4 a8 a b c b2.}
c4 a8 a b c b4. b4 c8 d4. e4 c8 d2.
}
}
}

2
lilypond/Rue_du_temps.ly

@ -1,5 +1,5 @@
\include "header"
\paper{paper-height = 1.6\cm}
\paper{paper-height = 0.9\cm}
{
\key d \minor

2
lilypond/Sad_Lisa.ly

@ -1,5 +1,5 @@
\include "header"
\paper{paper-height = 5.2\cm}
\paper{paper-height = 4\cm}
{
\key e \minor

2
lilypond/Sad_robot.ly

@ -1,5 +1,5 @@
\include "header"
\paper{paper-height = 1.6\cm}
\paper{paper-height = 0.9\cm}
{
\key d \minor

2
lilypond/Sainte_Cecile.ly

@ -1,5 +1,5 @@
\include "header"
\paper{paper-height = 5.2\cm}
\paper{paper-height = 4\cm}
{
\key d \minor

2
lilypond/Saturnin.ly

@ -1,5 +1,5 @@
\include "header"
\paper{paper-height = 4.2\cm}
\paper{paper-height = 3\cm}
{
\relative c''

2
lilypond/Souleve_ta_jupe.ly

@ -1,5 +1,5 @@
\include "header"
\paper{paper-height=4.9\cm}
\paper{paper-height = 4\cm}
{
\key d \minor

2
lilypond/The_boxer.ly

@ -1,5 +1,5 @@
\include "header"
\paper{paper-height = 3.2\cm}
\paper{paper-height = 2.2\cm}
{
\key c \major

2
lilypond/Tom_Sawyer_1.ly

@ -1,5 +1,5 @@
\include "header"
\paper{paper-height=1.6\cm}
\paper{paper-height = 0.9\cm}
{
\key c \major

2
lilypond/Tom_Sawyer_2.ly

@ -1,5 +1,5 @@
\include "header"
\paper{paper-height = 3.3\cm}
\paper{paper-height = 2.2\cm}
{
\key c \major

2
lilypond/Ton_invitation_1.ly

@ -1,5 +1,5 @@
\include "header"
\paper{paper-height = 1.6\cm}
\paper{paper-height = 0.9\cm}
{
\relative c''

2
lilypond/Ton_invitation_2.ly

@ -1,5 +1,5 @@
\include "header"
\paper{paper-height = 4.3\cm}
\paper{paper-height = 3\cm}
{
\relative c''

2
lilypond/V_la_l_bon_vent.ly

@ -1,5 +1,5 @@
\include "header"
\paper{paper-height = 3.1\cm}
\paper{paper-height = 2.2\cm}
{
\relative c'

2
lilypond/Vanity.ly

@ -1,5 +1,5 @@
\include "header"
\paper{paper-height=1.6\cm}
\paper{paper-height = 0.9\cm}
{
\key a \minor

9
lilypond/header

@ -4,17 +4,22 @@
{
make-footer=##f
make-header=##f
page-top-space = 0\cm
head-separation = 0\cm
foot-separation = 0\cm
left-margin = 0\cm
top-margin = 0\cm
bottom-margin = 0\cm
indent = 0\cm
between-system-padding = 1\mm
between-system-padding = 0\cm
paper-width = 7.5\cm
line-width = 7\cm
paper-height = 1.6\cm
paper-height = 1\cm
}
#(set-global-staff-size 12)

14
makefile

@ -15,8 +15,9 @@
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
SONGBOOKS := $(wildcard *.sb)
TARGETS = $(SONGBOOKS:%.sb=%)
BOOKS_DIR=books/
SONGBOOKS := $(wildcard $(BOOKS_DIR)/*.sb)
TARGETS = $(SONGBOOKS:$(BOOKS_DIR)/%.sb=%)
PDF = $(TARGETS:%=%.pdf)
@ -58,7 +59,9 @@ clean:
@rm -f $(TARGETS:%=%.d) $(TARGETS:%=%.tex) $(TARGETS:%=%.aux) \
$(TARGETS:%=%.toc) $(TARGETS:%=%.out) $(TARGETS:%=%.log) \
$(TARGETS:%=%.nav) $(TARGETS:%=%.snm)
@rm -f *.sbx *.sxd
@rm -f *.sbx *.sxd *.sxc
@rm -f lilypond/*.ps
@rm -f *.pyc
cleanall: clean
@rm -f $(PDF)
@ -77,15 +80,14 @@ $(PDF): %.pdf: %.tex %.aux
%.sbx: %.sxd
$(MAKE_INDEX) $< > $@
%.tex: %.sb
%.tex: $(BOOKS_DIR)/%.sb
$(MAKE_SONGBOOK) -s $< -o $@
%.d: %.sb
%.d: $(BOOKS_DIR)/%.sb
$(MAKE_SONGBOOK) -s $< -d -o $@
%.pdf: %.ly
@$(LILYPOND) --output=$(@:%.pdf=%) $<
@rm $(@:%.pdf=%.ps)
$(CHORDS): $(CHORDS_SRC)
$(MAKE_CHORDS) -o $@

6
songbook-makeindex.py

@ -13,8 +13,9 @@ import sys
import os.path
import glob
import re
import locale
from optparse import OptionParser
import sortindex
import locale
# Pattern set to ignore latex command in title prefix
keywordPattern = re.compile(r"^%(\w+)\s?(\w*)")
@ -60,7 +61,7 @@ class index:
def idxBlockToStr(self, letter, entries):
str = '\\begin{idxblock}{'+letter+'}'+'\n'
for key in sorted(entries.keys(), cmp=locale.strcoll):
for key in sorted(entries.keys(), key=sortindex.sortkey):
str += self.entryToStr(key, entries[key])
str += '\\end{idxblock}'+'\n'
return str
@ -99,6 +100,7 @@ def usage(exitCode=None):
sys.exit(exitCode)
def main():
locale.setlocale(locale.LC_ALL, '')
usage = "usage: %prog [options] FILE"
parser = OptionParser(usage)
parser.add_option("-o", "--output", dest="filename",

10
songbook.py

@ -8,6 +8,7 @@ import glob
import re
import json
import locale
import sortindex
def matchRegexp(reg, iterable):
return [ m.group(1) for m in (reg.match(l) for l in iterable) if m ]
@ -95,7 +96,8 @@ def makeTexFile(sb, output):
# output songslist
if songs == "all":
songs = map(lambda x: x[6:], glob.glob('songs/*/*.sg'))
songs = sorted(songs, cmp=locale.strcoll)
songs.sort(key=sortindex.sortkey)
if len(songs) > 0:
out.write(formatDefinition('songslist', songslist(songs)))
out.write('\\makeatother\n')
@ -111,12 +113,13 @@ def makeTexFile(sb, output):
def makeDepend(sb, output):
name = output[:-2]
dependsPattern = re.compile(r"^[^%]*(?:include|input)\{(.*?)\}")
#dependsPattern = re.compile(r"^[^%]*(?:include|input)\{(.*?)\}")
indexPattern = re.compile(r"^[^%]*\\(?:newauthor|new)index\{.*\}\{(.*?)\}")
lilypondPattern = re.compile(r"^[^%]*\\(?:lilypond)\{(.*?)\}")
# check for deps (in sb data)
deps = matchRegexp(dependsPattern, [ v for v in sb.itervalues() if type(v) is not list ])
#deps = matchRegexp(dependsPattern, [ v for v in sb.itervalues() if type(v) is not list ])
deps = [];
if sb["songs"] == "all":
deps += glob.glob('songs/*/*.sg')
else:
@ -151,6 +154,7 @@ def usage():
print "No usage information yet."
def main():
locale.setlocale(locale.LC_ALL, '') # set script locale to match user's
try:
opts, args = getopt.getopt(sys.argv[1:],
"hs:o:d",

4
songbook.sb

@ -1,4 +0,0 @@
{
"template" : "patacrep.tmpl",
"songs" : "all"
}

108
songs/Alain_Souchon/Bidon.sg

@ -0,0 +1,108 @@
\selectlanguage{french}
\songcolumns{2}
\beginsong{Bidon}
[by=Alain Souchon,cov=bidon,album=Bidon]
\cover
\gtab{A}{X02220}
\gtab{E}{022100}
\gtab{D}{XX0232}
\gtab{D5+}{XX0332}
\gtab{D6}{XX0432}
\gtab{D7}{XX0212}
\gtab{Bm}{2:X02210}
\gtab{F#m}{2:022000}
\beginverse*
\musicnote{\Intro : \nolyrics \[A E F{\shrp}m E]}
\endverse
\beginverse
\[A]Elle croyait qu'j'étais James \[E]Dean
Américain d'ori\[F#m]gine
Le fils de Buffalo \[E]Bill
Alors admira\[A]tion \[E F#m E]
\endverse
\beginverse*
Faut dire qu'j'avais la ch'mise à carreaux
La guitare derrière dans l'dos
Pour faire le cow-boy très beau
Mais composition
\endverse
\beginverse*
\[Bm]Elle me parlait anglais tout l'\[F#]temps
J'lui \[Bm]répondais deux trois mots bi\[F#]don
Des \[Bm]trucs entendus dans des chan\[E]sons
Consterna\[A]tion \[E F#m E]
\endverse
\beginverse
Elle croyait qu'j'étais coureur
Qu'j'arrivais des vingt quatre-heures
Avec mon casque en couleur
Alors admiration
\endverse
\beginverse*
J'lui disais drapeau à damier
Dérapages bien contrôlés
Admirateurs fascinés
Télévision
\endverse
\beginverse*
Elle me dit : {\og}Partons à la mer{\fg}
Dans ton bolide fendant l'air
Elle passe pas l'quatre-vingt ma traction
Consternation
\endverse
\beginchorus
J'suis \[D]mal dans ma peau
En \[D5+]coureur très beau
And \[D6]{I just} go
Et ma \[D7]pince à vélo
J'suis \[G]bidon
J'suis bidon
\endchorus
\beginchorus
J'suis qu'un mec à frime
Bourré d'aspirine
And I just go
Et ma pince à vélo
J'suis bidon
J'suis bidon
\endchorus
\beginverse
Elle croyait qu'j'étais chanteur
Incognito, voyageur
Tournées, sono, filles en pleurs
Admiration
\endverse
\beginverse*
Faut dire qu'j'avais des talons aiguilles
Le manteau d'lapin d'une fille
Des micros bracelets aux ch'villes
Exhibition
\endverse
\beginverse*
Elle me dit : {\og}Chante-moi une chanson{\fg}
J'ai avalé deux trois maxitons
Puis j'ai bousillé satisfaction
Consternation
\endverse
\beginchorus
J'habite chez ma grand-mère
Derrière le garde barrière
And I just go
Et ma pince à vélo
\endchorus
\endsong

Some files were not shown because too many files changed in this diff

Loading…
Cancel
Save