Merge branch 'master' of ssh://lohrun.net/~crep/songbook

lilypond/Tom_Sawyer_2.ly

@@ -5,7 +5,7 @@
   \key c \major
   \time 2/4
   \relative c''{
-    e4 c g'2 a4 a8. a16 g8 e4 c8 a'4 a8. a16 g8 f e c d2~ d4
+    e4 c g'2 a4 a8. a16 g8 e4 c8 a'4 a8. a16 g8 e d c d2~ d4
     e8 f g4 g8. g16 f8 e d c a c4 a8 g4 c8 d e8 g4 g,8 e' e d d c2
   }
 }

songs/Antsy_Pants/Vampire.sg

@@ -26,13 +26,13 @@
     So I'm \[Rém]no more \[Sol]sata\[Do]nic yeah yeah
   \endverse
 
-  \beginverse*
+  \beginchorus
     I \[Ré]am a vampi\[Do]re and I am wal\[La]king in the ci\[Ré]ty
     But the \[Do]pretty \[La]girls \[Ré]don't look at me
     \echo{Don't look at me}
     Cause I \[Sol]{don't} \[La]have \[Ré]my fangs
     Cause I \[Sol]have \[La]lost \[Ré]my fangs
-  \endverse
+  \endchorus
 
   \beginverse
     I am a vampire, I am a vampire
@@ -49,13 +49,13 @@
     But my guitar is out of tune
   \endverse
 
-  \beginverse*
+  \beginchorus
     I am a vampire and I'm walking in the city
     But the musicals don't play with me
     \echo{Don't play with me}
     Cause I don't have my mouth organ
     And I have lost my mouth organ
-  \endverse
+  \endchorus
 
 \endsong
 

songs/Jonathan_Coulton/Still_alive.sg

@@ -14,22 +14,22 @@
   \gtab{Rém}{XX0231}
 
   \beginverse
-    \[Sim]This was a \[Ré]triumph \[Sim Ré]
-    \[Sim]I'm making a \[Ré]note here: \[Sim]huge succ\[Ré]ess \[Sim]
-    \[Mim]It's hard to over\[La]state my satis\[Ré]fact\[Sim]ion \[Ré]
+    This was a \[Ré]triumph \[Sim Ré]
+    I'm \[Sim]making a \[Ré]note here: \[Sim]huge succ\[Ré]ess \[Sim]
+    It's \[Mim]hard to over\[La]state my satis\[Ré]faction \[Sim Ré]
   \endverse
 
   \beginverse*
     \[Sim]Aperture \[Ré]Science \[Sim Ré]
-    \[Sim]We do what we \[Ré]must be\[Sim]cause we \[Ré]can \[Sim]
+    We \[Sim]do what we \[Ré]must be\[Sim]cause we \[Ré]can \[Sim]
     \[Mim]For the good of \[La]all of us
-    \[Si&]Except the ones who are dead
+    Except the \[Si&]ones who are dead
   \endverse
 
   \beginchorus
     But there's \[Fa]no sense \[Do]crying over \[Si&]every mis\[Fa]take
-    \[Fa]You just keep on \[Do]trying till you \[Si&]run out of \[Fa]cake
-    \[Si&]And the science gets \[Do]done and you \[Fa]make a neat \[Rém]gun
+    You just \[Fa]keep on \[Do]trying till you \[Si&]run out of \[Fa]cake
+    And the \[Si&]science gets \[Do]done and you \[Fa]make a neat \[Rém]gun
     For the \[Si&]people who \[La]are still alive \[Ré Sim Ré]
   \endchorus
 
@@ -76,7 +76,7 @@
   \beginverse
     \[Sim] And be\[Ré]lieve me I \[Sim]am still a\[Ré]live \[Sim]
     I'm doing \[Ré]science and \[Sim]I'm still a\[Ré]live \[Sim]
-    I feel \[Ré]fantastic and \[Sim]I'm still a\[Ré]live \[Sim]
+    I feel fan\[Ré]tastic and \[Sim]I'm still a\[Ré]live \[Sim]
     And while you're \[Ré]dying I'll \[Sim]be still a\[Ré]live \[Sim]
     And when you're \[Ré]dead I'll \[Sim]be still a\[Ré]live \[Sim]
     Still a\[Ré]live \rep{2}

songs/Linkin_Park/Numb.sg

@@ -33,9 +33,9 @@
     Holding too tightly afraid to lose control
     Cause everything that you thought I would be
     Has fallen apart right in front of you
-    (Caught in the undertone just caught in the undertone)
+    \echo{Caught in the undertone just caught in the undertone}
     Every step that I take is another mistake to you
-    (Caught in the undertone just caught in the undertone)
+    \echo{Caught in the undertone just caught in the undertone}
     And every second I waste is more than I can take
   \endverse
 

songs/Renaud/Manatthan-Kaboul.sg

@@ -5,7 +5,7 @@
 
   \cover
   \gtab{Do}{X32010}
-  \gtab{Fa}{133211}
+  \gtab{Fa}{1:022100}
   \gtab{Sol}{320003}
   \gtab{Mi}{022100}
   \gtab{Lam}{XX02210}