initial support for automatic transpositions between Staff and Tablature Staff with lilypond

12 years ago · 927bd37fa2
77 changed files with 83 additions and 6 deletions
--- a/lilypond/10_sous_dans_ma_poche-1.ly
+++ b/lilypond/10_sous_dans_ma_poche-1.ly
@ -1,6 +1,7 @@
 \include "header"
 \paper{paper-height = 2.5\cm}

+\new \songbookstaff
 {
  \relative c'
  {
--- a/lilypond/10_sous_dans_ma_poche-2.ly
+++ b/lilypond/10_sous_dans_ma_poche-2.ly
@ -1,6 +1,7 @@
 \include "header"
 \paper{paper-height = 4\cm}

+\new \songbookstaff
 {
  \relative c'
  {
--- a/lilypond/A_l_aventure_compagnons.ly
+++ b/lilypond/A_l_aventure_compagnons.ly
@ -1,6 +1,7 @@
 \include "header"
 \paper{paper-height = 5.6\cm}

+\new \songbookstaff
 {
  \key ees \major
  \time 2/4
--- a/lilypond/Chanson_pour_Pierrot.ly
+++ b/lilypond/Chanson_pour_Pierrot.ly
@ -1,6 +1,7 @@
 \include "header"
 \paper{paper-height = 2.4\cm}

+\new \songbookstaff
 {
  \key fis \minor
  \relative c'
--- a/lilypond/Cupidon_s_en_fout.ly
+++ b/lilypond/Cupidon_s_en_fout.ly
@ -1,6 +1,7 @@
 \include "header"
 \paper{paper-height = 3.6\cm}

+\new \songbookstaff
 {
  \key a \minor
  \time 2/4
--- a/lilypond/Dans_la_tete.ly
+++ b/lilypond/Dans_la_tete.ly
@ -1,6 +1,7 @@
 \include "header"
 \paper{paper-height = 2.4\cm}

+\new \songbookstaff
 {
  \relative c''
  {
--- a/lilypond/Droit_devant-1.ly
+++ b/lilypond/Droit_devant-1.ly
@ -1,6 +1,7 @@
 \include "header"
 \paper{paper-height = 2.4\cm}

+\new \songbookstaff
 {
  \key d \minor
  \relative c''
--- a/lilypond/Droit_devant-2.ly
+++ b/lilypond/Droit_devant-2.ly
@ -1,6 +1,7 @@
 \include "header"
 \paper{paper-height = 1.1\cm}

+\new \songbookstaff
 {
  \key d \minor
  \relative c''
--- a/lilypond/Education_sentimentale.ly
+++ b/lilypond/Education_sentimentale.ly
@ -1,6 +1,7 @@
 \include "header"
 \paper{paper-height = 2.5\cm}

+\new \songbookstaff
 {
  \key c \major
  \time 3/4
--- a/lilypond/Entre_deux_taxis.ly
+++ b/lilypond/Entre_deux_taxis.ly
@ -1,6 +1,7 @@
 \include "header"
 \paper{paper-height = 2.4\cm}

+\new \songbookstaff
 {
  \key c \major
  \time 4/4
--- a/lilypond/Et_si_je_t_aime.ly
+++ b/lilypond/Et_si_je_t_aime.ly
@ -1,6 +1,7 @@
 \include "header"
 \paper{paper-height = 5.2\cm}

+\new \songbookstaff
 {
  \relative c'''
  {
--- a/lilypond/Etoiles_filantes-1.ly
+++ b/lilypond/Etoiles_filantes-1.ly
@ -1,6 +1,7 @@
 \include "header"
 \paper{paper-height = 1.1\cm}

+\new \songbookstaff
 {
  \relative c'
  {
--- a/lilypond/Etoiles_filantes-2.ly
+++ b/lilypond/Etoiles_filantes-2.ly
@ -1,6 +1,7 @@
 \include "header"
 \paper{paper-height = 2.3\cm}

+\new \songbookstaff
 {
  \relative c''
  {
--- a/lilypond/Fairytale_of_New_York.ly
+++ b/lilypond/Fairytale_of_New_York.ly
@ -1,6 +1,7 @@
 \include "header"
 \paper{paper-height = 2.8\cm}

+\new \songbookstaff
 {
  \key d \major
  \time 2/4
--- a/lilypond/Fuck_you.ly
+++ b/lilypond/Fuck_you.ly
@ -1,6 +1,7 @@
 \include "header"
 \paper{paper-height = 1.1\cm}

+\new \songbookstaff
 {
  \key c \major
  \time 4/4
--- a/lilypond/Geste_heroique-2.ly
+++ b/lilypond/Geste_heroique-2.ly
@ -1,6 +1,7 @@
 \include "header"
 \paper{paper-height = 2.4\cm}

+\new \songbookstaff
 {
  \relative c''
  {
--- a/lilypond/Heart_of_gold.ly
+++ b/lilypond/Heart_of_gold.ly
@ -1,6 +1,7 @@
 \include "header"
 \paper{paper-height = 3.6\cm}

+\new \songbookstaff
 {
  \key g \major
  \time 2/4
--- a/lilypond/Jessica.ly
+++ b/lilypond/Jessica.ly
@ -1,6 +1,7 @@
 \include "header"
 \paper{paper-height = 1.2\cm}

+\new \songbookstaff
 {
  \key c \major
  \time 2/4
--- a/lilypond/Keep_on_the_sunny_side.ly
+++ b/lilypond/Keep_on_the_sunny_side.ly
@ -1,6 +1,7 @@
 \include "header"
 \paper{paper-height = 3.6\cm}

+\new \songbookstaff
 {
  \key bes \major
  \time 2/4
--- a/lilypond/Kiss_the_children.ly
+++ b/lilypond/Kiss_the_children.ly
@ -1,6 +1,7 @@
 \include "header"
 \paper{paper-height = 2.4\cm}

+\new \songbookstaff
 {
  \key c \minor
  \time 6/8
--- a/lilypond/L_harmonica.ly
+++ b/lilypond/L_harmonica.ly
@ -1,6 +1,7 @@
 \include "header"
 \paper{paper-height = 5.0\cm}

+\new \songbookstaff
 {
  \key a \minor
  \time 2/4
--- a/lilypond/La_biere_du_donjon.ly
+++ b/lilypond/La_biere_du_donjon.ly
@ -1,6 +1,7 @@
 \include "header"
 \paper{paper-height = 1.1\cm}

+\new \songbookstaff
 {
  \relative c''
  {
--- a/lilypond/La_blanche.ly
+++ b/lilypond/La_blanche.ly
@ -1,6 +1,7 @@
 \include "header"
 \paper{paper-height = 2.3\cm}

+\new \songbookstaff
 {
  \key d \major
  \relative c''
--- a/lilypond/La_compagnie_du_chien_rugissant.ly
+++ b/lilypond/La_compagnie_du_chien_rugissant.ly
@ -1,6 +1,7 @@
 \include "header"
 \paper{paper-height = 1.1\cm}

+\new \songbookstaff
 {
  \relative c''
  {
--- a/lilypond/La_cumbia_del_mole.ly
+++ b/lilypond/La_cumbia_del_mole.ly
@ -1,6 +1,7 @@
 \include "header"
 \paper{paper-height = 2.5\cm}

+\new \songbookstaff
 {
  \key e \minor
  \time 2/2
--- a/lilypond/La_danse_des_esquimaux.ly
+++ b/lilypond/La_danse_des_esquimaux.ly
@ -1,6 +1,7 @@
 \include "header"
 \paper{paper-height = 2.3\cm}

+\new \songbookstaff
 {
  \key e \major
  \time 2/4
--- a/lilypond/La_declaration.ly
+++ b/lilypond/La_declaration.ly
@ -1,6 +1,7 @@
 \include "header"
 \paper{paper-height = 1.1\cm}

+\new \songbookstaff
 {
  \key e \minor
  \time 4/4
--- a/lilypond/La_fiancee_de_l_eau.ly
+++ b/lilypond/La_fiancee_de_l_eau.ly
@ -1,6 +1,7 @@
 \include "header"
 \paper{paper-height = 3.7\cm}

+\new \songbookstaff
 {
  \key d \minor
  \time 6/8
--- a/lilypond/La_jument_de_Michao.ly
+++ b/lilypond/La_jument_de_Michao.ly
@ -1,6 +1,7 @@
 \include "header"
 \paper{paper-height = 13.7\cm}

+\new \songbookstaff
 {
  \key a \minor
  \relative c''
--- a/lilypond/La_premiere_fois.ly
+++ b/lilypond/La_premiere_fois.ly
@ -1,6 +1,7 @@
 \include "header"
 \paper{paper-height = 2.3\cm}

+\new \songbookstaff
 {
  \key ees \major
  \time 6/8
--- a/lilypond/La_reine.ly
+++ b/lilypond/La_reine.ly
@ -2,6 +2,7 @@
 \paper{paper-height = 8.8\cm}


+\new \songbookstaff
 {
  \key e \minor
  \time 2/2
--- a/lilypond/La_sorciere_Grabouilla.ly
+++ b/lilypond/La_sorciere_Grabouilla.ly
@ -1,6 +1,7 @@
 \include "header"
 \paper{paper-height = 6.1\cm}

+\new \songbookstaff
 {
  \key e \minor
  \time 2/4
--- a/lilypond/La_tribu_de_Dana.ly
+++ b/lilypond/La_tribu_de_Dana.ly
@ -6,6 +6,7 @@
  paper-height = 1.4\cm
 }

+\new \songbookstaff
 {
  \key c \minor
  \time 2/4
--- a/lilypond/La_vie_d_aventurier.ly
+++ b/lilypond/La_vie_d_aventurier.ly
@ -1,6 +1,7 @@
 \include "header"
 \paper{paper-height = 2.4\cm}

+\new \songbookstaff
 {
  \key a \minor
  \partial 8 e'8	
--- a/lilypond/Le_cafe_des_jours_heureux.ly
+++ b/lilypond/Le_cafe_des_jours_heureux.ly
@ -1,6 +1,7 @@
 \include "header"
 \paper{paper-height = 2.3\cm}

+\new \songbookstaff
 {
  \relative c'
  {
--- a/lilypond/Le_joueur_de_pipeau.ly
+++ b/lilypond/Le_joueur_de_pipeau.ly
@ -1,6 +1,7 @@
 \include "header"
 \paper{paper-height = 1.1\cm}

+\new \songbookstaff
 {
  \key d \minor
  \relative c''
--- a/lilypond/Le_laride_du_poulet.ly
+++ b/lilypond/Le_laride_du_poulet.ly
@ -1,6 +1,7 @@
 \include "header"
 \paper{paper-height = 2.4\cm}

+\new \songbookstaff
 {
  \key a \minor
  \time 2/4
--- a/lilypond/Le_moustique.ly
+++ b/lilypond/Le_moustique.ly
@ -1,6 +1,7 @@
 \include "header"
 \paper{paper-height = 2.4\cm}

+\new \songbookstaff
 {
  \relative c''
  {
--- a/lilypond/Le_p_tit_gars.ly
+++ b/lilypond/Le_p_tit_gars.ly
@ -4,6 +4,8 @@
  line-width   = 14.5\cm
  paper-width  = 15\cm
 }
+
+\new \songbookstaff
 {
  \relative c''
  {
--- a/lilypond/Le_rat_de_l_opera-1.ly
+++ b/lilypond/Le_rat_de_l_opera-1.ly
@ -1,6 +1,7 @@
 \include "header"
 \paper{paper-height = 6.0\cm}

+\new \songbookstaff
 {
  \key a \major
  \time 3/8
--- a/lilypond/Le_rat_de_l_opera-2.ly
+++ b/lilypond/Le_rat_de_l_opera-2.ly
@ -1,6 +1,7 @@
 \include "header"
 \paper{paper-height = 3.8\cm}

+\new \songbookstaff
 {
  \key a \major
  \time 3/8
--- a/lilypond/Le_vent_nous_portera.ly
+++ b/lilypond/Le_vent_nous_portera.ly
@ -1,6 +1,7 @@
 \include "header"
 \paper{paper-height = 2.6\cm}

+\new \songbookstaff
 {
  \key e \minor
  \time 2/4
--- a/lilypond/Lea.ly
+++ b/lilypond/Lea.ly
@ -1,6 +1,7 @@
 \include "header"
 \paper{paper-height = 2.4\cm}

+\new \songbookstaff
 {
  \key a \minor
  \time 2/4
--- a/lilypond/Les_hommes_que_j_aime.ly
+++ b/lilypond/Les_hommes_que_j_aime.ly
@ -1,6 +1,7 @@
 \include "header"
 \paper{paper-height = 2.4\cm}

+\new \songbookstaff
 {
  \relative c''
  {
--- a/lilypond/Les_mains_froides.ly
+++ b/lilypond/Les_mains_froides.ly
@ -1,6 +1,7 @@
 \include "header"
 \paper{paper-height = 2.3\cm}

+\new \songbookstaff
 {
  \relative c''
  {
--- a/lilypond/Les_souliers_de_Lady_Fae-1.ly
+++ b/lilypond/Les_souliers_de_Lady_Fae-1.ly
@ -1,6 +1,7 @@
 \include "header"
 \paper{paper-height = 2.4\cm}

+\new \songbookstaff
 {
  \key e \minor
  \time 6/8
--- a/lilypond/Les_souliers_de_Lady_Fae-2.ly
+++ b/lilypond/Les_souliers_de_Lady_Fae-2.ly
@ -1,6 +1,7 @@
 \include "header"
 \paper{paper-height = 3.6\cm}

+\new \songbookstaff
 {
  \key a \minor
  \time 6/8
--- a/lilypond/Les_souliers_rouges.ly
+++ b/lilypond/Les_souliers_rouges.ly
@ -1,6 +1,7 @@
 \include "header"
 \paper{paper-height = 3.6\cm}

+\new \songbookstaff
 {
  \key g \major
  \time 2/4
--- a/lilypond/Lino.ly
+++ b/lilypond/Lino.ly
@ -1,6 +1,7 @@
 \include "header"
 \paper{paper-height = 1.4\cm}

+\new \songbookstaff
 {
  \key d \minor
  \time 4/4
--- a/lilypond/Ma_gonzesse.ly
+++ b/lilypond/Ma_gonzesse.ly
@ -1,5 +1,7 @@
 \include "header"
 \paper{paper-height = 2.4\cm}
+
+\new \songbookstaff
 {
  \key c \major
  \time 4/4
@ -7,4 +9,4 @@
  {
    g4 c4. g8 a c g' f f e c4 g8 a e4~ e4. e8 f g f4 d2 c8 d f g a b c4 a g f e2 d8 e f a4. b4 a2 g2
  }
-}
+}
--- a/lilypond/Mamadou_avait_mal_aux_dents.ly
+++ b/lilypond/Mamadou_avait_mal_aux_dents.ly
@ -1,6 +1,7 @@
 \include "header"
 \paper{paper-height = 5.0\cm}

+\new \songbookstaff
 {
  \key c \major
  \time 2/4
--- a/lilypond/Marchand_de_couleurs.ly
+++ b/lilypond/Marchand_de_couleurs.ly
@ -1,6 +1,7 @@
 \include "header"
 \paper{paper-height = 2.4\cm}

+\new \songbookstaff
 {
  \key a \minor
  \time 12/8
--- a/lilypond/Mrs_McGrath.ly
+++ b/lilypond/Mrs_McGrath.ly
@ -1,6 +1,7 @@
 \include "header"
 \paper{paper-height = 2.4\cm}

+\new \songbookstaff
 {
  \key d \minor
  \time 6/8
--- a/lilypond/Noel_en_Mordor.ly
+++ b/lilypond/Noel_en_Mordor.ly
@ -1,6 +1,7 @@
 \include "header"
 \paper{paper-height = 2.4\cm}

+\new \songbookstaff
 {
  \key c \minor
  \time 2/4
--- a/lilypond/Notre_monde.ly
+++ b/lilypond/Notre_monde.ly
@ -1,7 +1,7 @@
 \include "header"
 \paper{paper-height = 2.4\cm}

-
+\new \songbookstaff
 {
  \key e \minor
  \time 4/4
--- a/lilypond/Nuit_humide_1.ly
+++ b/lilypond/Nuit_humide_1.ly
@ -1,6 +1,7 @@
 \include "header"
 \paper{paper-height = 4.0\cm}

+\new \songbookstaff
 {
  \key e \minor
  \time 2/4
--- a/lilypond/Nuit_humide_2.ly
+++ b/lilypond/Nuit_humide_2.ly
@ -1,6 +1,7 @@
 \include "header"
 \paper{paper-height = 4.0\cm}

+\new \songbookstaff
 {
  \key e \minor
  \time 4/4
--- a/lilypond/One_more_cup_of_coffee.ly
+++ b/lilypond/One_more_cup_of_coffee.ly
@ -6,6 +6,7 @@
  paper-height = 1.5\cm
 }

+\new \songbookstaff
 {
  \key a \minor
  \time 2/4
--- a/lilypond/Petit_Pierrot.ly
+++ b/lilypond/Petit_Pierrot.ly
@ -3,6 +3,7 @@
  paper-height = 2.6\cm
 }

+\new \songbookstaff
 {
  \relative c''
  {
--- a/lilypond/Rue_de_Paname.ly
+++ b/lilypond/Rue_de_Paname.ly
@ -1,6 +1,7 @@
 \include "header"
 \paper{paper-height = 3.6\cm}

+\new \songbookstaff
 {
  \key bes \major
  \time 6/8
--- a/lilypond/Rue_de_Paname_acc.ly
+++ b/lilypond/Rue_de_Paname_acc.ly
@ -1,6 +1,7 @@
 \include "header"
 \paper{paper-height = 3.6\cm}

+\new \songbookstaff
 {
  \key bes \major
  \time 6/8
@ -8,4 +9,4 @@
  {
    d4. f4 d8 c4.~ c8 bes c d4. d8 f d c4. a8 bes c d4. d8 g d c4. a8 bes c d4 d8 d ees d c c d ees d c \repeat volta 2 {d8 g, bes d g d c2.} d8 g, bes d g d c4.~ c8 bes a bes4. ees4 bes8 a2. 
  }
-}
+}
--- a/lilypond/Rue_du_temps.ly
+++ b/lilypond/Rue_du_temps.ly
@ -1,6 +1,7 @@
 \include "header"
 \paper{paper-height = 1.1\cm}

+\new \songbookstaff
 {
  \key d \minor
  \time 6/8
--- a/lilypond/Sad_Lisa.ly
+++ b/lilypond/Sad_Lisa.ly
@ -1,6 +1,7 @@
 \include "header"
 \paper{paper-height = 5.0\cm}

+\new \songbookstaff
 {
  \key e \minor
  \time 4/4
--- a/lilypond/Sad_robot.ly
+++ b/lilypond/Sad_robot.ly
@ -1,6 +1,7 @@
 \include "header"
 \paper{paper-height = 2.4\cm}

+\new \songbookstaff
 {
  \key d \minor
  \time 2/4
--- a/lilypond/Sainte_Cecile.ly
+++ b/lilypond/Sainte_Cecile.ly
@ -1,6 +1,7 @@
 \include "header"
 \paper{paper-height = 5.0\cm}

+\new \songbookstaff
 {
  \key d \minor
  \time 2/4
--- a/lilypond/Saturnin.ly
+++ b/lilypond/Saturnin.ly
@ -1,6 +1,7 @@
 \include "header"
 \paper{paper-height = 3.8\cm}

+\new \songbookstaff
 {
  \relative c''
  {
--- a/lilypond/Souleve_ta_jupe.ly
+++ b/lilypond/Souleve_ta_jupe.ly
@ -1,6 +1,7 @@
 \include "header"
 \paper{paper-height = 5.0\cm}

+\new \songbookstaff
 {
  \key d \minor
  \time 4/4
--- a/lilypond/The_boxer.ly
+++ b/lilypond/The_boxer.ly
@ -1,6 +1,7 @@
 \include "header"
 \paper{paper-height = 2.4\cm}

+\new \songbookstaff
 {
  \key c \major
  \time 4/4
--- a/lilypond/The_ring_of_fire.ly
+++ b/lilypond/The_ring_of_fire.ly
@ -1,6 +1,7 @@
 \include "header"
 \paper{paper-height = 2.3\cm}

+\new \songbookstaff
 {
  \key g \major
  \relative c''
--- a/lilypond/Tom_Sawyer_1.ly
+++ b/lilypond/Tom_Sawyer_1.ly
@ -3,6 +3,7 @@
  paper-height = 1.1\cm
 }

+\new \songbookstaff
 {
  \key c \major
  \time 2/4
@ -11,4 +12,3 @@
    e,4 c g'2 a4 c8. d16 e8 c4 g8 a4 c8. d16 e8 c d4 c2
  }
 }
-
--- a/lilypond/Tom_Sawyer_2.ly
+++ b/lilypond/Tom_Sawyer_2.ly
@ -1,6 +1,7 @@
 \include "header"
 \paper{paper-height = 3.8\cm}

+\new \songbookstaff
 {
  \key c \major
  \time 2/4
--- a/lilypond/Ton_invitation_1.ly
+++ b/lilypond/Ton_invitation_1.ly
@ -1,6 +1,7 @@
 \include "header"
 \paper{paper-height = 1.1\cm}

+\new \songbookstaff
 {
  \relative c''
  {
--- a/lilypond/Ton_invitation_2.ly
+++ b/lilypond/Ton_invitation_2.ly
@ -1,6 +1,7 @@
 \include "header"
 \paper{paper-height = 3.8\cm}

+\new \songbookstaff
 {
  \relative c''
  {
--- a/lilypond/V_la_l_bon_vent.ly
+++ b/lilypond/V_la_l_bon_vent.ly
@ -1,6 +1,7 @@
 \include "header"
 \paper{paper-height = 2.5\cm}

+\new \songbookstaff
 {
  \relative c'
  {
--- a/lilypond/Vanity.ly
+++ b/lilypond/Vanity.ly
@ -1,6 +1,7 @@
 \include "header"
 \paper{paper-height = 1.1\cm}

+\new \songbookstaff
 {
  \key a \minor
  \time 2/4
--- a/lilypond/header
+++ b/lilypond/header
@ -1,3 +1,4 @@
+#(use-modules (guile-user))
 \version "2.14.2"

 \paper
--- a/5
+++ b/5
@ -42,7 +42,8 @@ endif


 LATEX=pdflatex $(LATEX_OPTIONS)
-
+STAFF = "Staff"
+#STAFF = "TabStaff"
 ############################################################
 ### Targets

@ -87,7 +88,7 @@ $(PDF): %.pdf: %.tex %.aux
 	$(MAKE_SONGBOOK) -s $< -d -o $@

 %.pdf: %.ly
-	@$(LILYPOND) --format=pdf --output=$(@:%.pdf=%) $<
+	@$(LILYPOND) --format=pdf -e '(define-public songbookstaff $(STAFF))' --output=$(@:%.pdf=%) $<

 $(CHORDS): $(CHORDS_SRC)
 	$(MAKE_CHORDS) -o $@