From efa828ad30734ceccbc0f6f33c03e5c413340c40 Mon Sep 17 00:00:00 2001
From: Romain Goffe <romain.goffe@gmail.com>
Date: Wed, 1 Jun 2011 00:25:49 +0200
Subject: [PATCH] prefer one environment for multiple chords when possible

---
 Georges_Brassens/A_l_ombre_du_coeur_de_ma_mie.sg | 2 +-
 Les_Wriggles/Plouf.sg                            | 2 +-
 Oasis/Wonderwall.sg                              | 4 ++--
 Simon_Garfunkel/The_boxer.sg                     | 2 +-
 The_Beatles/Let_it_be.sg                         | 4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Georges_Brassens/A_l_ombre_du_coeur_de_ma_mie.sg b/Georges_Brassens/A_l_ombre_du_coeur_de_ma_mie.sg
index 6084fc2f..1f6d1265 100644
--- a/Georges_Brassens/A_l_ombre_du_coeur_de_ma_mie.sg
+++ b/Georges_Brassens/A_l_ombre_du_coeur_de_ma_mie.sg
@@ -51,7 +51,7 @@
     Et c'est depuis ce temps, ma sœur \rep{2}
     Que je suis devenu chasseur \rep{2}
     Que, mon arbalète à la main
-    Je cours les voies et les che\[Sim]mins \[La] \[Sim]
+    Je cours les voies et les che\[Sim]mins \[La Sim]
   \endverse
 
 \endsong
diff --git a/Les_Wriggles/Plouf.sg b/Les_Wriggles/Plouf.sg
index 60b38f6f..fdc61f38 100644
--- a/Les_Wriggles/Plouf.sg
+++ b/Les_Wriggles/Plouf.sg
@@ -22,7 +22,7 @@
 
   \beginchorus
     \[Do#m/La]{Plouf !} \[Do#m]Plouf !
-    La vie, parfois fait \[Fa#m]plouf \[Fa#m*] \[Mi]\[Mi7]\[Mi6]\[Mi]
+    La vie, parfois fait \[Fa#m]plouf \[Fa#m* Mi Mi7 Mi6 Mi]
   \endchorus
 
   \beginverse
diff --git a/Oasis/Wonderwall.sg b/Oasis/Wonderwall.sg
index 34054d46..386d96b0 100644
--- a/Oasis/Wonderwall.sg
+++ b/Oasis/Wonderwall.sg
@@ -16,7 +16,7 @@
     \[Mim7]Today is \[Sol]gonna be the day that they're \[Résus4]{gonna throw} it back to \[La7sus4]you
     \[Mim7]{By now} you \[Sol]should've somehow realiz\[Résus4]{ed what} you gotta \[La7sus4]do
     \[Mim7]{I don't} believe that \[Sol]anybody \[Résus4]{feels the} way I \[La7sus4]do
-    About you \[Do]now \[Résus4] \[La7sus4]
+    About you \[Do]now \[Résus4 La7sus4]
   \endverse
 
   \beginverse
@@ -36,7 +36,7 @@
   \beginchorus
     Because \[Do]maybe, \[Mim7] \[Sol]
     \[Mim7]You're gonna be the one that \[Do]saves me \[Mim7] \[Sol]
-    And \[Mim7]after \[Do]all, \[Mim7] \[Sol]you're my \[Mim7]wonder\[Do]wall \[Mim7] \[Sol] \[Mim7]
+    And \[Mim7]after \[Do]all, \[Mim7] \[Sol]you're my \[Mim7]wonder\[Do]wall \[Mim7 Sol Mim7]
   \endchorus
 
   \beginverse
diff --git a/Simon_Garfunkel/The_boxer.sg b/Simon_Garfunkel/The_boxer.sg
index 7d9a9fd5..2fcdbd94 100644
--- a/Simon_Garfunkel/The_boxer.sg
+++ b/Simon_Garfunkel/The_boxer.sg
@@ -21,7 +21,7 @@
     All lies and \[Lam]jest
     Still a \[Sol]man hears
     What he \[Fa]wants to hear and
-    Disregards the \[Do]rest \[Sol]\[Sol7]\[Sol]\[Do]
+    Disregards the \[Do]rest \[Sol Sol7 Sol Do]
   \endverse
 
   \beginverse
diff --git a/The_Beatles/Let_it_be.sg b/The_Beatles/Let_it_be.sg
index 985ff9c0..c0203ccf 100644
--- a/The_Beatles/Let_it_be.sg
+++ b/The_Beatles/Let_it_be.sg
@@ -17,7 +17,7 @@
     When I \[Do]find myself in \[Sol]times of trouble
     \[Lam]Mother Mary \[Fa]comes to me
     \[Do]Speaking words of \[Sol]wisdom
-    Let it \[Fa*]be \[Mi*] \[Ré*] \[Do*]
+    Let it \[Fa*]be \[Mi* Ré* Do*]
   \endverse
 
   \beginverse*
@@ -31,7 +31,7 @@
     Let it \[Lam]be, let it \[Sol]be
     Let it \[Fa]be, let it \[Do]be
     \[Do]Whisper words of \[Sol]wisdom
-    Let it \[Fa*]be \[Mi*] \[Ré*] \[Do*]
+    Let it \[Fa*]be \[Mi* Ré* Do*]
   \endchorus
 
   \beginverse