Browse Source

Merge remote-tracking branch 'crep/master'

remotes/bexa/master
Alexandre Dupas 13 years ago
parent
commit
e83ca55ef4
  1. 21
      NEWS
  2. 2
      books/volume-4.sb
  3. 8
      lilypond/A_l_aventure_compagnons.ly
  4. 2
      lilypond/Cupidon_s_en_fout.ly
  5. 2
      lilypond/Dans_la_tete.ly
  6. 2
      lilypond/Droit_devant-1.ly
  7. 2
      lilypond/Droit_devant-2.ly
  8. 2
      lilypond/Education_sentimentale.ly
  9. 2
      lilypond/Entre_deux_taxis.ly
  10. 2
      lilypond/Et_si_je_t_aime.ly
  11. 2
      lilypond/Etoiles_filantes-1.ly
  12. 2
      lilypond/Etoiles_filantes-2.ly
  13. 0
      lilypond/Everybody_hurts.ly
  14. 2
      lilypond/Fairytale_of_New_York.ly
  15. 2
      lilypond/Fuck_you.ly
  16. 2
      lilypond/Geste_heroique-1.ly
  17. 2
      lilypond/Geste_heroique-2.ly
  18. 2
      lilypond/Heart_of_gold.ly
  19. 2
      lilypond/Jessica.ly
  20. 2
      lilypond/Keep_on_the_sunny_side.ly
  21. 7
      lilypond/Kiss_me_forever.ly
  22. 2
      lilypond/Kiss_the_children.ly
  23. 2
      lilypond/L_harmonica.ly
  24. 2
      lilypond/La_biere_du_donjon.ly
  25. 2
      lilypond/La_compagnie_du_chien_rugissant.ly
  26. 2
      lilypond/La_cumbia_del_mole.ly
  27. 2
      lilypond/La_danse_des_esquimaux.ly
  28. 2
      lilypond/La_declaration.ly
  29. 2
      lilypond/La_fiancee_de_l_eau.ly
  30. 2
      lilypond/La_jument_de_Michao.ly
  31. 2
      lilypond/La_premiere_fois.ly
  32. 2
      lilypond/La_reine.ly
  33. 5
      lilypond/La_seine_riff1.ly
  34. 4
      lilypond/La_seine_rythm.ly
  35. 2
      lilypond/La_sorciere_Grabouilla.ly
  36. 2
      lilypond/La_tribu_de_Dana.ly
  37. 2
      lilypond/La_vie_d_aventurier.ly
  38. 2
      lilypond/Le_cafe_des_jours_heureux.ly
  39. 2
      lilypond/Le_joueur_de_pipeau.ly
  40. 2
      lilypond/Le_laride_du_poulet.ly
  41. 2
      lilypond/Le_moustique.ly
  42. 6
      lilypond/Le_p_tit_gars.ly
  43. 2
      lilypond/Le_rat_de_l_opera-1.ly
  44. 2
      lilypond/Le_rat_de_l_opera-2.ly
  45. 2
      lilypond/Le_vent_nous_portera.ly
  46. 2
      lilypond/Lea.ly
  47. 2
      lilypond/Les_hommes_que_j_aime.ly
  48. 2
      lilypond/Les_souliers_de_Lady_Fae-1.ly
  49. 2
      lilypond/Les_souliers_de_Lady_Fae-2.ly
  50. 2
      lilypond/Les_souliers_rouges.ly
  51. 2
      lilypond/Lino.ly
  52. 2
      lilypond/Mamadou_avait_mal_aux_dents.ly
  53. 2
      lilypond/Marchand_de_couleurs.ly
  54. 2
      lilypond/Mrs_McGrath.ly
  55. 3
      lilypond/New_york_avec_toi.ly
  56. 2
      lilypond/Noel_en_Mordor.ly
  57. 2
      lilypond/Notre_monde.ly
  58. 2
      lilypond/Nuit_humide_1.ly
  59. 2
      lilypond/Nuit_humide_2.ly
  60. 2
      lilypond/One_more_cup_of_coffee.ly
  61. 4
      lilypond/Petit_Pierrot.ly
  62. 2
      lilypond/Rue_de_Paname.ly
  63. 2
      lilypond/Rue_du_temps.ly
  64. 2
      lilypond/Sad_Lisa.ly
  65. 2
      lilypond/Sad_robot.ly
  66. 2
      lilypond/Sainte_Cecile.ly
  67. 2
      lilypond/Saturnin.ly
  68. 2
      lilypond/Souleve_ta_jupe.ly
  69. 5
      lilypond/Stuck_in_the_middle.ly
  70. 2
      lilypond/The_boxer.ly
  71. 4
      lilypond/Tom_Sawyer_1.ly
  72. 2
      lilypond/Tom_Sawyer_2.ly
  73. 2
      lilypond/Ton_invitation_1.ly
  74. 2
      lilypond/Ton_invitation_2.ly
  75. 2
      lilypond/V_la_l_bon_vent.ly
  76. 2
      lilypond/Vanity.ly
  77. 16
      songs/Bob_Dylan/Knocking_on_heavens_door.sg
  78. 2
      songs/Eddy_Mitchell/Pas_de_boogie_woogie.sg
  79. 49
      songs/Noir_Desir/Lazy.sg
  80. 92
      songs/William_Balde/Rayon_de_soleil.sg
  81. BIN
      songs/William_Balde/william-balde-en-corps-etranger.jpg
  82. 2
      templates/ancient.tmpl
  83. 2
      templates/patacrep-en.tmpl
  84. 2
      templates/patacrep.tmpl
  85. 6
      utils/release.sh

21
NEWS

@ -1,20 +1,16 @@
version 3.5.1
version 3.5.2
Alexandre Dupas:
Matteo Cypriani:
Jean Leloup - Promeneur
Maxime Le Forestier - Parachutiste
Yves Simon - Les bateaux du métro
Soldat Louis - Du rhum des femmes
Soldat Louis - Tirer des caisses
Soldat Louis - Savannah
Thiéfaine - Sentiments numériques revisités
Leonard Cohen - Winter Lady
Leonard Cohen - A Bunch of Lonesome Heroes
Leonard Cohen - The Old Revolution
Jacques Higelin - Je ne peux plus dire je t'aime
Pipiou:
Romain Goffe:
broph:
Noir Désir - Lazy
William Baldé - Rayon de soleil
version 3.5.1
broph:
M - La Seine
Noir Désir - Charlie
@ -42,7 +38,6 @@ broph:
version 3.5.0
Alexandre Dupas:
Matteo Cypriani:
Jean Leloup - Promeneur
Maxime Le Forestier - Parachutiste

2
books/volume-4.sb

@ -80,6 +80,7 @@
"Noir_Desir/Joey_I.sg",
"Noir_Desir/La_chaleur.sg",
"Noir_Desir/La_rage.sg",
"Noir_Desir/Lazy.sg",
"Noir_Desir/Le_fleuve.sg",
"Noir_Desir/Si_rien_ne_bouge.sg",
"Noir_Desir/Tu_m_donnes_le_mal.sg",
@ -112,6 +113,7 @@
"Telephone/New_York_avec_toi.sg",
"Tonton_David/Chacun_sa_route.sg",
"Tracy_Chapman/Talkin_about_the_revolution.sg",
"William_Balde/Rayon_de_soleil.sg",
"Yves_Duteil/Le_petit_pont_de_bois.sg",
"Yves_Simon/Les_bateaux_du_metro.sg"]
}

8
lilypond/A_l_aventure_compagnons.ly

@ -6,10 +6,10 @@
\time 2/4
\relative c''
{
<< {g'2 f8. g16 aes4~ aes4 g8. f16 ees8. d16} \\ {bes'2 aes8. g16 f4~ f4 ees8. d16 c8. bes16} >> \break
<< {c4}\\{aes4} >> bes2 \break
c8. bes16 c8. d16 ees8. g16 f8. d16 ees4 << {g4~ g4}\\{bes4~ bes} >> ees,8. g16 \break
\repeat volta 4 { bes8. g16 ees8. g16 bes8. g16 ees8. g16 \break }
<< {g'2 f8. g16 aes4~ aes4 g8. f16 ees8. d16} \\ {bes'2 aes8. g16 f4~ f4 ees8. d16 c8. bes16} >>
<< {c4}\\{aes4} >> bes2
c8. bes16 c8. d16 ees8. g16 f8. d16 ees4 << {g4~ g4}\\{bes4~ bes} >> ees,8. g16
\repeat volta 4 { bes8. g16 ees8. g16 bes8. g16 ees8. g16 }
\alternative { {bes8. g16 \times 2/3 { bes,8 c d } \times 2/3 { ees f g } ees8. g16} { bes4 << {g4~ g2}\\{bes4~ bes2} >> } }
}
}

2
lilypond/Cupidon_s_en_fout.ly

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

2
lilypond/Dans_la_tete.ly

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

2
lilypond/Droit_devant-1.ly

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

2
lilypond/Droit_devant-2.ly

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

2
lilypond/Education_sentimentale.ly

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

2
lilypond/Entre_deux_taxis.ly

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

2
lilypond/Et_si_je_t_aime.ly

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

2
lilypond/Etoiles_filantes-1.ly

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

2
lilypond/Etoiles_filantes-2.ly

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

0
lilypond/Everybody_hurts.ly

2
lilypond/Fairytale_of_New_York.ly

@ -1,5 +1,5 @@
\include "header"
\paper{paper-height = 2.4\cm}
\paper{paper-height = 2.8\cm}
{
\key d \major

2
lilypond/Fuck_you.ly

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

2
lilypond/Geste_heroique-1.ly

@ -1,5 +1,5 @@
\include "header"
\paper{paper-height = 4.4\cm}
\paper{paper-height = 5.0\cm}
musique =

2
lilypond/Geste_heroique-2.ly

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

2
lilypond/Heart_of_gold.ly

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

2
lilypond/Jessica.ly

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

2
lilypond/Keep_on_the_sunny_side.ly

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

7
lilypond/Kiss_me_forever.ly

@ -1,7 +1,8 @@
\include "header"
\paper{
paper-height = 0.6\cm
paper-width= 2.7\cm
\paper{
paper-height = 0.8\cm
paper-width = 3\cm
line-width = 2.7\cm
}
<<

2
lilypond/Kiss_the_children.ly

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

2
lilypond/L_harmonica.ly

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

2
lilypond/La_biere_du_donjon.ly

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

2
lilypond/La_compagnie_du_chien_rugissant.ly

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

2
lilypond/La_cumbia_del_mole.ly

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

2
lilypond/La_danse_des_esquimaux.ly

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

2
lilypond/La_declaration.ly

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

2
lilypond/La_fiancee_de_l_eau.ly

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

2
lilypond/La_jument_de_Michao.ly

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

2
lilypond/La_premiere_fois.ly

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

2
lilypond/La_reine.ly

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

5
lilypond/La_seine_riff1.ly

@ -1,7 +1,8 @@
\include "header"
\paper{
paper-height = 1\cm
paper-width= 2.5\cm
paper-height = 1.1\cm
paper-width = 2.5\cm
line-width = 2.2\cm
}
\new TabStaff \relative c, {

4
lilypond/La_seine_rythm.ly

@ -1,7 +1,7 @@
\include "header"
\paper{
paper-height = 1.8\cm
paper-width= 7.1\cm
paper-height = 2.4\cm
paper-width = 7.1\cm
}
<<

2
lilypond/La_sorciere_Grabouilla.ly

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

2
lilypond/La_tribu_de_Dana.ly

@ -3,7 +3,7 @@
{
paper-width = 15\cm
line-width = 14.5\cm
paper-height = 1.2\cm
paper-height = 1.4\cm
}
{

2
lilypond/La_vie_d_aventurier.ly

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

2
lilypond/Le_cafe_des_jours_heureux.ly

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

2
lilypond/Le_joueur_de_pipeau.ly

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

2
lilypond/Le_laride_du_poulet.ly

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

2
lilypond/Le_moustique.ly

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

6
lilypond/Le_p_tit_gars.ly

@ -1,8 +1,8 @@
\include "header"
\paper{
paper-height = 0.9\cm
line-width = 14.5\cm
paper-width = 15\cm
paper-height = 1.1\cm
line-width = 14.5\cm
paper-width = 15\cm
}
{
\relative c''

2
lilypond/Le_rat_de_l_opera-1.ly

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

2
lilypond/Le_rat_de_l_opera-2.ly

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

2
lilypond/Le_vent_nous_portera.ly

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

2
lilypond/Lea.ly

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

2
lilypond/Les_hommes_que_j_aime.ly

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

2
lilypond/Les_souliers_de_Lady_Fae-1.ly

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

2
lilypond/Les_souliers_de_Lady_Fae-2.ly

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

2
lilypond/Les_souliers_rouges.ly

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

2
lilypond/Lino.ly

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

2
lilypond/Mamadou_avait_mal_aux_dents.ly

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

2
lilypond/Marchand_de_couleurs.ly

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

2
lilypond/Mrs_McGrath.ly

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

3
lilypond/New_york_avec_toi.ly

@ -1,7 +1,8 @@
\include "header"
\paper{
paper-height = 1.1\cm
paper-width= 5.2\cm
line-width = 5.8\cm
paper-width = 5.6\cm
}
symbols = {

2
lilypond/Noel_en_Mordor.ly

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

2
lilypond/Notre_monde.ly

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

2
lilypond/Nuit_humide_1.ly

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

2
lilypond/Nuit_humide_2.ly

@ -1,5 +1,5 @@
\include "header"
\paper{paper-height = 3\cm}
\paper{paper-height = 4.0\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.3\cm
paper-height = 1.5\cm
}
{

4
lilypond/Petit_Pierrot.ly

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

2
lilypond/Rue_de_Paname.ly

@ -1,5 +1,5 @@
\include "header"
\paper{paper-height = 3\cm}
\paper{paper-height = 3.6\cm}
{
\time 6/8

2
lilypond/Rue_du_temps.ly

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

2
lilypond/Sad_Lisa.ly

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

2
lilypond/Sad_robot.ly

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

2
lilypond/Sainte_Cecile.ly

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

2
lilypond/Saturnin.ly

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

2
lilypond/Souleve_ta_jupe.ly

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

5
lilypond/Stuck_in_the_middle.ly

@ -1,7 +1,8 @@
\include "header"
\paper{
paper-height = 0.6\cm
paper-width= 2.7\cm
paper-height = 0.9\cm
line-width = 2.7\cm
paper-width = 3.0\cm
}
<<

2
lilypond/The_boxer.ly

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

4
lilypond/Tom_Sawyer_1.ly

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

2
lilypond/Tom_Sawyer_2.ly

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

2
lilypond/Ton_invitation_1.ly

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

2
lilypond/Ton_invitation_2.ly

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

2
lilypond/V_la_l_bon_vent.ly

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

2
lilypond/Vanity.ly

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

16
songs/Bob_Dylan/Knocking_on_heavens_door.sg

@ -1,6 +1,6 @@
\selectlanguage{english}
\songcolumns{2}
\beginsong{Knocking on heavens door}
\beginsong{Knockin' on heaven's door}
[by=Bob Dylan,cov=mtv-unplugged,album=MTV unplugged]
\cover
@ -14,28 +14,28 @@
\[G]Mama take this b\[D]adge off of \[Am]me
\[G]I can't \[D]use it anym\[C]ore
\[G]It's getting dar\[D]k, too dark to s\[Am]ee
\[G]I feel I'm kn\[D]ocking on heaven's do\[C]or
\[G]I feel I'm kn\[D]ockin' on heaven's do\[C]or
\endverse
\beginchorus
\[G]Knock, knock, kn\[D]ocking on heavens d\[Am]oor
\[G]Knock, knock, kn\[D]ocking on heavens d\[C]oor
\[G]Knock, knock, kn\[D]ocking on heavens d\[Am]oor
\[G]Knock, knock, kn\[D]ocking on heavens d\[C]oor
\[G]Knock, knock, kn\[D]ockin' on heaven's d\[Am]oor
\[G]Knock, knock, kn\[D]ockin' on heaven's d\[C]oor
\[G]Knock, knock, kn\[D]ockin' on heaven's d\[Am]oor
\[G]Knock, knock, kn\[D]ockin' on heaven's d\[C]oor
\endchorus
\beginverse
Mama put my guns in the ground
I can't shoot them anymore
That long black cloud is coming down
I feel I'm knocking on heaven's door
I feel I'm knockin' on heaven's door
\endverse
\beginverse
Mama wipe the blood from my face
I'm sick and tired of the war
Got a feeling that's hard to trace
I feel I'm knocking on heaven's door
I feel I'm knockin' on heaven's door
\endverse
\endsong

2
songs/Eddy_Mitchell/Pas_de_boogie_woogie.sg

@ -11,7 +11,7 @@
\gtab{B7}{2:X02020}
\gtab{E}{022100}
\gtab{D7}{XX0212}
\gtab{E}{020100}
\gtab{E7}{020100}
\beginverse*
\[A]{ Le pape} a \[A7]{dit que} l'acte d'am\[A]our

49
songs/Noir_Desir/Lazy.sg

@ -0,0 +1,49 @@
\selectlanguage{english}
\songcolumns{2}
\beginsong{Lazy}
[by=Noir Désir,cov=666-667-club,album=666.667 Clu&]
\cover
\gtab{Am}{X02210}
\gtab{D}{XX0232}
\gtab{G}{320003}
\beginverse
\[Am]{I can} see you're young and pretty
\[G]{I know} it would be so ea\[D]sy
Anyway, dark lady, I feel lazy \[Am]
\endverse
\begin{repeatedchords}
\beginverse
\[Am]Those afternoons are confused
\[G]{I don't} think that you really cho\[D]ose
There's even one more reason to feel lazy \[Am]
\endverse
\end{repeatedchords}
\beginchorus
\[Am]While you go awa\[G]y
\[D]While you go awa\[Am]y
\rep{2}
\endchorus
\begin{repeatedchords}
\beginverse
\[Am]{I could} die but I could lie
I can deal with what's in your mind \[D]
Anyway, I'm tired and I feel lazy \[Am]
\endverse
\end{repeatedchords}
\begin{repeatedchords}
\beginverse
\[Am]{You know}, we're both lost in maze
You're miserable, I'm so dazed \[D]
Don't you think you should feel suddenly l\[Am]azy
\endverse
\end{repeatedchords}
\musicnote{\Chorus}
\endsong

92
songs/William_Balde/Rayon_de_soleil.sg

@ -0,0 +1,92 @@
\selectlanguage{french}
\songcolumns{2}
\beginsong{Rayon de soleil}
[by=William Baldé,cov=william-balde-en-corps-etranger,album=En corps étranger]
\cover
\gtab{G}{320030}
\gtab{D}{XX0232}
\gtab{C}{X32010}
\gtab{E}{022100}
\gtab{A}{X02220}
\beginverse*
\musicnote{\Intro :\nolyrics{ | \[G] | \[D] | \rep{2} }}
\endverse
\beginverse
\[G]Un rayon de so\[D]leil
Dort sur tes cheveux lo\[G]ngs
Sur nos corps de sei\[D]gle
Et nous joue du v\[G]iolon
\echo{Ouhouhou\[D]h}
\endverse
\begin{repeatedchords}
\beginverse
\[G]Un rayon de so\[D]leil
Sur le sommeil de pl\[G]omb
Une guitare s\[D]èche
Lou Reed à la mais\[G]on
Hey babe take a walk on a wil\[D]d side
\endverse
\end{repeatedchords}
\beginchorus
\[G]Un matin suspendu aux fleurs de ton jardin
\[D]Ma main sur ton p'tit cul cherche le chemin
\rep{2}
\endchorus
\begin{repeatedchords}
\beginverse
\[G]Un rayon de sole\[D]il
J'embrasse tes pieds sal\[G]es
Un disque de M\[D]arley
Joue {\og}No woman no c\[G]ry{\fg}
No woman \echo{No woman}, no \[D]woman no cry
\endverse
\end{repeatedchords}
\begin{bridge}
\[C]Par la fenêtre ouverte
L'\[G]air que nous respirons
\[C]Ses petites poussières
Si p\[D]âle d'émotions
\end{bridge}
\textnote{\Chorus}
\begin{repeatedchords}
\beginverse
\[G]Un rayon de sole\[D]il
Sur ton si beau visa\[G]ge
\[G]Aux abeilles se mèl\[D]ent
La voix de Bob Dyla\[G]n
Knock, knock, knockin' on h\[D]eaven's door
\endverse
\end{repeatedchords}
\beginchorus
\[G]Un matin suspendu aux fleurs de ton jardin
\[D]Ma main sur ton p'tit cul cherche le chemin
\[G]Un matin suspendu aux fleurs de ton jardin
\[E]Ma main sur ton p'tit cul {\dots}
\endchorus
\beginverse
\[A]Un rayon de sole\[E]il
Tu t'rhabilles pour de bo\[A]n
J'te ramène par l\[E]es tresses
À mon corps de garç\[A]on
Yeah, yeah, yeah, yea\[E]h
\endverse
\beginchorus
\[A]Un matin suspendu aux fleurs de ton jardin
\[E]Ma main sur ton p'tit cul cherche le chemin
\[A]Un matin suspendu aux fleurs de ton jardin
\[E]Ma main sur ton p'tit cul
\endchorus
\endsong

BIN
songs/William_Balde/william-balde-en-corps-etranger.jpg

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.9 KiB

2
templates/ancient.tmpl

@ -30,7 +30,7 @@
%%: {"name":"booktype", "description":"Type", "type":"enum", "values":["chorded","lyric"], "default":"chorded", "mandatory":true},
%%: {"name":"lang", "description":"Language", "default":"english"},
%%: {"name":"bookoptions", "description":"Options", "type":"flag", "values":["diagram","lilypond","pictures","tabs"], "join":",", "mandatory":true, "default":["diagram","pictures"]},
%%: {"name":"version", "description":"Version", "default":"3.5.1"},
%%: {"name":"version", "description":"Version", "default":"3.5.2"},
%%: {"name":"subtitle", "description":"Subtitle"},
%%: {"name":"web", "description":"Web", "default":"http://www.patacrep.com"},
%%: {"name":"mail", "description":"Email", "default":"crep@team-on-fire.com"},

2
templates/patacrep-en.tmpl

@ -30,7 +30,7 @@
%%: {"name":"booktype", "description":"Type", "type":"enum", "values":["chorded","lyric"], "default":"chorded", "mandatory":true},
%%: {"name":"lang", "description":"Language", "default":"english"},
%%: {"name":"bookoptions", "description":"Options", "type":"flag", "values":["diagram","lilypond","pictures","tabs"], "join":",", "mandatory":true, "default":["diagram","pictures"]},
%%: {"name":"version", "description":"Version", "default":"3.5.1"},
%%: {"name":"version", "description":"Version", "default":"3.5.2"},
%%: {"name":"subtitle", "description":"Subtitle"},
%%: {"name":"web", "description":"Web", "default":"http://www.patacrep.com"},
%%: {"name":"mail", "description":"Email", "default":"crep@team-on-fire.com"},

2
templates/patacrep.tmpl

@ -30,7 +30,7 @@
%%: {"name":"booktype", "description":"Type", "type":"enum", "values":["chorded","lyric"], "default":"chorded", "mandatory":true},
%%: {"name":"lang", "description":"Language", "default":"french"},
%%: {"name":"bookoptions", "description":"Options", "type":"flag", "values":["diagram","importantdiagramonly","lilypond","pictures","tabs","repeatchords"], "join":",", "mandatory":true, "default":["diagram","pictures"]},
%%: {"name":"version", "description":"Version", "default":"3.5.1"},
%%: {"name":"version", "description":"Version", "default":"3.5.2"},
%%: {"name":"subtitle", "description":"Subtitle"},
%%: {"name":"web", "description":"Web", "default":"http://www.patacrep.com"},
%%: {"name":"mail", "description":"Email", "default":"crep@team-on-fire.com"},

6
utils/release.sh

@ -38,7 +38,6 @@ then
sed -i "s/\"[0-9]\+.[0-9]\+.[0-9]\+\"/\"$MAIN.$MAJOR.$MINOR\"/" templates/patacrep.tmpl
sed -i "s/\"[0-9]\+.[0-9]\+.[0-9]\+\"/\"$MAIN.$MAJOR.$MINOR\"/" templates/ancient.tmpl
sed -i "s/\"[0-9]\+.[0-9]\+.[0-9]\+\"/\"$MAIN.$MAJOR.$MINOR\"/" templates/patacrep-en.tmpl
sed -i "s/\"[0-9]\+.[0-9]\+.[0-9]\+\"/\"$MAIN.$MAJOR.$MINOR\"/" templates/patacrep-improved.tmpl
else
echo "keeping release version"
fi;
@ -51,6 +50,11 @@ fi;
./utils/rules.py
./utils/resize-cover.py
#check for rights
chmod 755 songs/*
chmod 644 songs/*.*
chmod 644 lilypond/*.ly
#build all songbooks
rm -f *.d
make cleanall

Loading…
Cancel
Save