translate musicnote environments

Conflicts: songs/Les_Cowboys_Fringants/Plus_rien.sg songs/Sheepbox/Not_scared_to_die.sg
14 years ago · 054d42db3a
24 changed files with 78 additions and 41 deletions
--- a/songs/Alex_Beaupain/Je_n_aime_que_toi.sg
+++ b/songs/Alex_Beaupain/Je_n_aime_que_toi.sg
@ -11,7 +11,9 @@
  \gtab{Bm}{2:X02210}
  \gtab{F#7}{2:020100}

-  \musicnote{intro : D F{\shrp}m Em A \rep{2}}
+  \beginverse*
+    \musicnote{\Intro : \nolyrics{\[D F{\shrp}m Em A]} \rep{2}}
+  \endverse

  \beginverse
    \[D]Petit salaud, ton \[F#m]jeu est clair
--- a/songs/Alex_Beaupain/Les_yeux_au_ciel.sg
+++ b/songs/Alex_Beaupain/Les_yeux_au_ciel.sg
@ -11,7 +11,9 @@
  \gtab{C7/6}{X32200}
  \gtab{C7}{X32000}

-  \musicnote{intro : Am E7sus4 C7/6 E7sus4 \rep{2}}
+  \beginverse*
+    \musicnote{\Intro : \nolyrics{\[Am E7sus4 C7/6 E7sus4]} \rep{2}}
+  \endverse

  \beginverse
    \[Am]Les yeux \[E7sus4]au \[C6]ciel
--- a/songs/Alex_Beaupain/Ma_memoire_sale.sg
+++ b/songs/Alex_Beaupain/Ma_memoire_sale.sg
@ -9,8 +9,11 @@
  \gtab{D9+}{XX0230}
  \gtab{Em}{022000}
  \gtab{Bm}{2:X02210}
-  \musicnote{intro : C9+ Em C9+ Em}

+  \beginverse*
+    \musicnote{\Intro : \nolyrics{\[C9+ Em C9+ Em]}}
+  \endverse
+    
  \beginverse
    L\[C9+]ave
    \[Em] Ma mémoire sale dans ce fleuve de \[C9+]boue
--- a/songs/Alicia_Keys/If_aint_got_you.sg
+++ b/songs/Alicia_Keys/If_aint_got_you.sg
@ -43,7 +43,10 @@
    Cares for me
  \endverse

-  %\musicnote{outro (picking): C7 Bm}
+  \beginverse*
+    \musicnote{\Outro : \nolyrics{\[C7 Bm]}}
+  \endverse
+  
  \beginverse
    If I ain't \[Am]got you with me baby \[G7]
    \[G7]So \[Am]nothing in \[Bm]this \[C7]whole wide world don't mean a \[Bm]thing
--- a/songs/Debout_Sur_Le_Zinc/Poil_aux_yeux.sg
+++ b/songs/Debout_Sur_Le_Zinc/Poil_aux_yeux.sg
@ -10,7 +10,9 @@
  \gtab{B}{7:022100}
  \gtab{D}{5:X02220}

-  \musicnote{intro : Em C Am B \rep{2}}
+  \beginverse*
+    \musicnote{\Intro : \nolyrics{\[Em C Am B]} \rep{2}}
+  \endverse

  \beginverse
    \[Em]Un beau jour que j'\[C]allais aller, \[Am]aller à l'é\[B]cole
@ -26,7 +28,9 @@
    Pour grimper de mes pieds jusqu'à ma tête
  \endverse

-  \musicnote{Em C Em C Em C B7 \rep{2}}
+  \beginverse*
+    \musicnote{\nolyrics{\[Em C Em C Em C B7]} \rep{2}}
+  \endverse

  \beginverse
    Elle avait de petits bras et pleins de poils pour gratter
--- a/songs/Georges_Brassens/Je_me_suis_fait_tout_petit.sg
+++ b/songs/Georges_Brassens/Je_me_suis_fait_tout_petit.sg
@ -30,7 +30,9 @@
    Qui fait {\og}ma\[Bm]man{\fg} quand \[D]on la \[G]touche\[F#]
  \endchorus

-  \musicnote{Bm Em F\shrp Bm}
+  \beginverse*
+    \musicnote{\nolyrics{\[Bm Em F\shrp Bm]}}
+  \endverse

  \beginverse
    J'étais dur à cuire, elle m'a converti
--- a/songs/Gogol_Bordello/Oh_no.sg
+++ b/songs/Gogol_Bordello/Oh_no.sg
@ -10,8 +10,10 @@
  \gtab{G}{3:022100}
  \gtab{D}{5:X02220}

-  \musicnote{intro: Em}
-
+  \beginverse*
+    \musicnote{\Intro : \nolyrics{\[Em]}}
+  \endverse
+    
  \beginverse
    Sometimes when facing common \[B]trouble
    When whole town is \[Em]screwed
--- a/songs/Green_Day/Minority.sg
+++ b/songs/Green_Day/Minority.sg
@ -23,7 +23,7 @@
    Wi\[C]thout a doubt, \[F]singled out, the \[G]only way I \[C]know
  \endverse

-  \musicnote{Bridge}
+  \musicnote{\Bridge}
  \beginverse
    \[Am]Stepped out of the \[F]line,\[C]
    \[Am]Like a sheep runs \[F]from the \[G]herd
--- a/songs/Kimya_Dawson/Tree_hugger.sg
+++ b/songs/Kimya_Dawson/Tree_hugger.sg
@ -60,6 +60,7 @@
    But hug my flower with your eyes''
  \endverse

-  \musicnote{repeat verse 1, 2, and 3}
+  \musicnote[english]{repeat \Verse 1, 2, and 3}
+  \musicnote[french]{répéter \Verse 1, 2 et 3}

 \endsong
--- a/songs/La_Rue_Ketanou/Les_tontons.sg
+++ b/songs/La_Rue_Ketanou/Les_tontons.sg
@ -39,7 +39,9 @@
    Un navire de pa\[Am]pa
  \endverse

-  \musicnote{Am F C E7 \rep{2}}
+  \beginverse*
+    \musicnote{\nolyrics{\[Am F C E7]} \rep{2}}
+  \endverse

  \beginverse
    \[Am]{Et puis} un jour, c'est lui qui apprendra
--- a/songs/La_tete_a_toto/Les_projets.sg
+++ b/songs/La_tete_a_toto/Les_projets.sg
@ -11,7 +11,9 @@
  \gtab{C}{X32010}
  \gtab{Em}{022000}

-  \musicnote{intro : Am F G \rep{2}}
+  \beginverse*
+    \musicnote{\Intro : \nolyrics{\[Am F G]} \rep{2}}
+  \endverse

  \beginverse
    \[Am]Tous les soirs, assis sur mon arrosoir de whisky
--- a/songs/Les_Cowboys_Fringants/Plus_rien.sg
+++ b/songs/Les_Cowboys_Fringants/Plus_rien.sg
@ -10,7 +10,7 @@
  \gtab{Gm}{3:022000}
  \gtab{B&}{1:X02220}
  \gtab{A7}{X02020}
-
+ 
  \beginverse*
    \musicnote{\Pattern 1 : \nolyrics{\[Dm F C G]}}
  \endverse
--- a/songs/Les_Petites_Bourrettes/Dans_la_tete.sg
+++ b/songs/Les_Petites_Bourrettes/Dans_la_tete.sg
@ -35,7 +35,9 @@
  \endchorus


-  \musicnote{G7 Am F C \rep{2}}
+  \beginverse*
+    \musicnote{\nolyrics{\[G7 Am F C]} \rep{2}}
+  \endverse

  \beginverse
    Si on aime que l'on nous rappelle
--- a/songs/MC_Solaar/Caroline.sg
+++ b/songs/MC_Solaar/Caroline.sg
@ -10,8 +10,9 @@
  \gtab{G}{320003}
  \gtab{Em}{022000}

-  \musicnote[english]{intro : Am C G Em}
-  \musicnote[french]{intro : Lam Do Sol Mim}
+  \beginverse*
+    \musicnote{\Intro : \nolyrics{\[Am C G Em]}}
+  \endverse

  \beginverse
    \[Am]J'étais cool, assis sur un banc. C'était au printemps
@ -65,7 +66,7 @@
    Je sens un pincement dans son cœur, mais elle n'ose dire un mot
  \endverse

-  \musicnote{chorus}
+  \musicnote{\Chorus}

  \beginverse
    Claude MC prend le microphone, genre love story raggamuffin
@ -88,6 +89,6 @@
    Je joue les rouges, cœur, Caro
  \endverse

-  \musicnote{chorus \rep{2}}
+  \musicnote{\Chorus \rep{2}}

 \endsong
--- a/songs/Oldelaf_et_Monsieur_D/Trahis.sg
+++ b/songs/Oldelaf_et_Monsieur_D/Trahis.sg
@ -10,8 +10,9 @@
  \gtab{E}{022100}
  \gtab{C#}{4:X02220}

-  \musicnote[english]{intro : F{\shrp}m D A E \rep{2}}
-  \musicnote[french]{intro : Fa{\shrp}m Ré La Mi \rep{2}}
+  \beginverse*
+    \musicnote{\Intro : \nolyrics{\[F#m D A E]} \rep{2}}
+  \endverse

  \beginverse
    \[F#m]{Tu as} eu une \[D]{si riche} car\[A]riè\[E]re
--- a/songs/Pixies/Where_Is_My_Mind.sg
+++ b/songs/Pixies/Where_Is_My_Mind.sg
@ -34,6 +34,6 @@
    Except the little fish but they told me, he swears tryin' to talk to me to me to me
  \endverse

-  \musicnote{chorus, bridge, solo, repeat verse 1, chorus}
+  \musicnote{\Chorus, \Bridge, \Solo, \Verse 1, \Chorus}

 \endsong
--- a/songs/Sheepbox/Devil_s_way.sg
+++ b/songs/Sheepbox/Devil_s_way.sg
@ -87,7 +87,7 @@
    Remaining pride is scum
  \endverse

-  \musicnote{chorus}
+  \musicnote{\Chorus}

  \beginverse
    I had a job
@ -117,7 +117,7 @@
    And finally happy!
  \endverse

-  \musicnote{chorus}
+  \musicnote{\Chorus}

 \endsong

--- a/songs/Sheepbox/Not_scared_to_die.sg
+++ b/songs/Sheepbox/Not_scared_to_die.sg
@ -37,7 +37,7 @@
    Someone like me\dots{} Just want to be free
  \endverse

-  \musicnote{chorus}
+  \musicnote{\Chorus}

  \beginchorus
    \[E]Dying \[G]{is not} \[D]happy\[A]{!}
@ -60,6 +60,4 @@
    Enjoying my life\dots{} Before I die!
  \endverse

-  \musicnote{chorus $\times 2$, chorus$^2$ $\times 2$}
-
 \endsong
--- a/songs/Simon_Garfunkel/Me_and_Julio_down_by_the_schoolyard.sg
+++ b/songs/Simon_Garfunkel/Me_and_Julio_down_by_the_schoolyard.sg
@ -10,8 +10,10 @@
  \gtab{D}{XX0232}
  \gtab{F}{1:022100}

-  \musicnote[english]{intro: G C G D \rep{2}}
-  \musicnote[french]{intro: Sol Do Sol Ré \rep{2}}
+  \beginverse*
+  \musicnote{\Intro : \nolyrics{\[G C G D]} \rep{2}}
+  \endverse
+  

  \beginverse
    The \[G]mama pajama rolled out of bed
--- a/songs/The_Beatles/Twist_and_shout.sg
+++ b/songs/The_Beatles/Twist_and_shout.sg
@ -23,7 +23,7 @@
    Just like I knew you would \echo{like I knew you would, oooh!}
  \endverse

-  \musicnote{chorus}
+  \musicnote{\Chorus}

  \beginverse
    You know you're a twisty little girl \echo{twist little girl}
@ -36,7 +36,8 @@
    \[A]Ah \echo{Ah Ah} Ah \echo{Ah Ah}
  \endverse

-  \musicnote{chorus, repeat verse 2}
+  \musicnote[english]{\Chorus, repeat \Verse 2}
+  \musicnote[french]{\Chorus, répéter le \Verse 2}

  \beginverse*
    \[A7]Well, shake it, shake it, shake it, \[D]baby, now \echo{\[G]shake it up \[A]baby} \rep{3}
--- a/songs/The_Calling/Wherever_you_will_go.sg
+++ b/songs/The_Calling/Wherever_you_will_go.sg
@ -49,7 +49,9 @@
  \bar
  \end{tab}

-  \musicnote{intro: C C/B Am7 F}
+  \beginverse*
+    \musicnote{\Intro : \nolyrics{\[C C/B Am7 F]}}
+  \endverse

  \beginverse
    \[C]So lately \[C/B]You're wondering
@ -80,7 +82,7 @@
    Out there who can bring me back to you
  \endverse

-  \musicnote{chorus}
+  \musicnote{\Chorus}

  \beginverse*
    \[F]Run away with my \[C/B]heart
@ -95,7 +97,7 @@
    I'll stay with you for all of time
  \endverse

-  \musicnote{chorus}
+  \musicnote{\Chorus}

  \beginchorus
    If I could turn back time
--- a/songs/The_Fray/How_to_save_a_life.sg
+++ b/songs/The_Fray/How_to_save_a_life.sg
@ -11,7 +11,9 @@
  \gtab{D}{XX0232}
  \gtab{C}{X32010}

-  \musicnote{intro: G D4 Em D D4 G}
+  \beginverse*
+    \musicnote{\Intro : \nolyrics{\[G D4 Em D D4 G]}}
+  \endverse

  \beginverse
    \[G]Step one you say we \[D4]{need to talk}
@ -42,7 +44,7 @@
    And pay the God he hears you
  \endverse

-  \musicnote{chorus}
+  \musicnote{\Chorus}

  \beginverse
    As he begins to raise his voice
@ -55,6 +57,6 @@
    And you'll begin to wonder why you came
  \endverse

-  \musicnote{chorus \rep{3}}
+  \musicnote{\Chorus \rep{3}}

 \endsong
--- a/songs/The_Innocence_Mission/The_lakes_of_Canada.sg
+++ b/songs/The_Innocence_Mission/The_lakes_of_Canada.sg
@ -11,7 +11,9 @@
  \gtab{G}{320003}
  \gtab{Am}{X02210}

-  \musicnote{intro: Dm F C G \rep{2}}
+  \beginverse*
+    \musicnote{\Intro : \nolyrics{\[Dm F C G]} \rep{2}}
+  \endverse

  \beginverse
    \[F]Look for me another \[C]day
--- a/songs/Yodelice/Sunday_with_a_flu.sg
+++ b/songs/Yodelice/Sunday_with_a_flu.sg
@ -9,7 +9,9 @@
  \gtab{G}{320003}
  \gtab{D}{XX0232}

-  \musicnote{intro: Bm G D Bm}
+  \beginverse*
+    \musicnote{\Intro : \nolyrics{\[Bm G D Bm]}}
+  \endverse

  \beginverse
    \[Bm]Closed my door, forgot my key
@ -38,7 +40,8 @@
    And I just can't get over you
  \endverse

-  \musicnote{chorus, whistled verse, and chorus}
+  \musicnote[english]{\Chorus, whistled verse, and \Chorus}
+  \musicnote[french]{\Chorus, couplet sifflé et \Chorus}

  \beginverse
    Called a cabbage, threw the garbage
@ -47,6 +50,6 @@
    And I just can't get over you
  \endverse

-  \musicnote{chorus}
+  \musicnote{\Chorus}

 \endsong