From af108bbfb1e1577f08abb4820f1357da2d9fe875 Mon Sep 17 00:00:00 2001
From: Matteo Cypriani <mcy@lm7.fr>
Date: Mon, 22 Feb 2016 16:30:53 +0100
Subject: [PATCH] Rework John Lennon's Imagine

- Reworked placement of the chords on the lyrics.
- Added chord diagrams.
- Added missing "album" field.
- Added missing cover.
- Indentation.
- Reorganised repeatedchords blocks.
---
 songs/john_lennon/imagine.jpg | Bin 0 -> 5199 bytes
 songs/john_lennon/imagine.sg  | 115 ++++++++++++++++++----------------
 2 files changed, 62 insertions(+), 53 deletions(-)
 create mode 100644 songs/john_lennon/imagine.jpg

diff --git a/songs/john_lennon/imagine.jpg b/songs/john_lennon/imagine.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..d5635c4348188649221f41d412b01fdb0354a9b0
GIT binary patch
literal 5199
zcmb7|c{CJY_s3_(%-FNeSVN-hvS*Tg9Xm4^ON1fo5Mzl@7)!Q^v6gl0OWBvQL?MYR
zS%xBON+gmkUcKkM=luTteV=>oIrlvG`#Jad@1Eyu=4=tbjMO#I1pt8n0Py?(&gKAG
z=hgoa2t)<?ComNihzbIRKp<c+7y_k+LLk&oFc?Y;rKb5O2$YtNmWJ+M@elHk@XvJ~
zH0Q4Ww*0@+Sr34P1`q`ZrveHBKrBEi7U0=yz(oK6L<Iz#$NvPSKBrRwL9~GLYXma@
z1O!2V5Ngo*r2krgASy5m0K$4n2FfO=VSbyM-Twix=%;Kw?6T%7i-%)hc4#={w4Beq
z-2brW`X3kopaMfcP~boARTcmc3_O1f@W0T1-19kDE`eEPG$3q(=1|Ss{=}j)3V`8!
zG7t+D3qTEUDAcJesd>p0e<|Hu3EKB-rmkYcpWox^i$=wz{XV9$DFfMWp>B_L1ZA9h
zq9WC%S-)G9(S|866SWHwa5%&i?AWuM>jZ#6F<sign4I!KEDUjrUe`2}?oJ1iMd&UI
z&jq_EDCeZZrGm+^$#oVi+9$KWgPh~CwK4D6Sp#TJ9hhbb04hL)42<Ya79n(z`n&zn
z(a-7RfUp>Pj1CEFi_PSY3{^WC5IkXvw+xH*W^JlhIcALZ&{_AoAMWo@3LNn%Sc5*!
z%`I-IsZ4hYe!jqFDN^~Mw5+n^ajrT__F8l7v+g+vyNpNL=OI|>5SdlmLm)99X7?zs
zAggyqW=Lolonx#5GK=iNwG!r+zGVrB2{xJX#v0e)DgypKx6_#Tc&%R;i|0;I0(?^|
z=;Dy0icx12!-$EMooe+o>XP}#TmqKEZLp+X<zulS?ak4HR{HzxM~gA8m6U4<x3q73
zZ@qU0ut#!5zIZ7>P6n=swBh2W`I$d8HS}sU-)&cruVp8${=9~UZ!PR|KE508<^zp~
zfGItU5hWZKrLF3RGx~GLWnm90?7Y&XRJK$PR8vLDg_M&&=~CMHB?OK=hVGafUfq~X
z8z?I<5L~nii@>Ga-8;>EET`X4_{%~4$e-|_@Q?2pgMvnPDeeo-MCRzdWmSHNccFb+
z@Ej+-lf-de;HJ(89Ygs$-ZlU!lVhGQUO6iwV(Olv9BmT7mIWg(`%#JU1o`C3R|w5R
z%JkK*e)S^_l#awthO-bF_F$8fMN?7Hl6k)jWk&Hc0F#zb5$BeKPTQ~kf_<OO0`dL&
zi4S9C9+-5uL$8jeS~_{W=L(6=mvJEZM3NBUxG7DJjj$ePum5-kVB0KxGW7x+*C?>>
zInCkDfZ_>pT&?<B5GFQ=pce6NA$9JTu3)fFTcGNacs{=CS`Mpo-}o9$HUd?ZcGh!J
zn?Rq(rB8?PR}J=fm8p^DtD*Tg#GPSm&O?c>(w{ge$GaOzGE;m*h%-RBTwC$`Ul<_|
z=_1j=+#Y`6!|mk8+{j6OYcs>VGXQPz#t;QuL-M$}YN-D+II$6-&yi-;7x6uSy!eOQ
zDD8XrTN^){suB2G6?0SDGc4p-)Z$v;3kjTJAvAAG3UBXoJGSYlQyacM6){wPCED<&
zOqL5L9P~<c1iR6d{Y~JnWBSL*)m#QVkpvtw;FYY4=${e%o{~^nn||&4NLsnUk%es~
zyB=@kaFl%-Mtz14us1NtyFSychnEa&ue(iL{k8Uk!@1$50HwEwxcn$TcHfv3Sf^u2
zL?3tR@W_lm%_pPVRTKt<7G)2QRr{kOmx?%+q%Th`Dei?iir$khHo<4DadkOeP2t4o
z#Dwu2=G{w@KPs5@&QZ0?dI_TylB2&PCH1Ux^Ce|&Irz7A<7w(US=%SA67MpThRFH-
zjAQ|OFE6`3I^OL|NQx&nK|+qk#kq!NcG^JA$wVdY?OXBfsAlQq&BU82@Q5ko=*@ih
z`|?_7>~EQgY|^_ZE?O}uDRL^alHdVb$&mOrIGP^TY%e`|+Q*Hl5L>Isv>on6KJ_m)
zsNE{pZ&~~?u$`FmODJ^31)>7c;?b3WynMO;X3#y9J=DJG2)=cYBoxRcscoVAs1%Ey
z?A;fW@WGX<X1fQDTTk`PT1jXYF$FICrVqfW*sGfAp=DUf8C!+Ey2P;1lO5JLse881
zQ)LHBIy5`$R7-|tlrQ+bMcxznS%$){X!m5V@Gzd70i@$)#zrU>RD3bBcpICD8Q0?{
z7Fx^`yskjM(F#75i0qTuaQ!8i56?G%0)dLlHqdwJF`-+sCJki|$zXFK`?T`$0lr{z
zR$rsLDm_YYEKWYjLHB~J?lKR^yB}rWWr|y%pPwu9bg97-0=Q?qFGB|)tV&Ha&sBKH
zjr)$6slQmgtg-1ebWReoD($AGoEZNGq-X7f)&KdC>I=lze*5l9krhU(HLE&}J7YCr
z4LGL|(9B@hAY$RhSNlp&S$tx9X*_kJI`URuXKVcF!Clm`JE1E-T~gV8xOnsP&()g#
z<LH1e)(Fmms)@E-Dthux?%<5l&4J*p<fD=qE7K>crj`?-DRvXH#`1_Oj(FB)%a9w5
zzQ&J0q1$X>OULBD1;-k-NbawH8{FDSz<FDa?L7X|KNd*-Uvq@(Cf&{U1HwbPb`BE1
z+g-O<UMPZW1MB~Ctgk0@4gKwK>%3~NGjTXCyUxYRqxntkDagKHm$IDhA0tG#-=-oi
z;~5yc6zeE&qE^~fSv3TYcW|}y;`oH?mzI=7*)rdFtf;iWm9DV=N;T5bl*z=>+Pt@c
zRFP2_APAxKgv{^!;S_$h{~&(_#%?)ge!R*O!v&ipOya!wOHb-KzdA;RI!N3yk2}y+
z{(<*3dZcHUH94wo>RzWHg|hjR|Ctx}{Q(kz@czs_<SBZ?CV`cZxY&REFk<Su+Qvwg
zZ%GLZ&Hj$P!~46py&L}X3Kv`+F}3(C`IK}1(tEs>bwitq@2A-0jx53V4W5UhULs;Q
z-yXjcj4nNB@1EFr0Ixz-hP>di365sIFlUz+F*7w=iuUy|mdDScU>~FdGvgnHZ*Rn;
z_>7xrS=|3j1sTP2e&e{>*VlXSRetw=owQ@=jYruQ79K?yioVrdb%fR0%Hb31iAhwm
zw`>qgqqrz`g+AnvS1#Z}2C1y_#|@eVbB-HIule~R!_~<f_i_XEroox2@ZW0oDDS9P
z;154#z2vOpEjvaniyG~#Vl7ucggV_93E&QP&__mj+t^q9o@4NCwOtL|L00otN%;Eq
z;rLZ_a<i)ke;KV18`4|fZO1Ax>!WO?o>VVB;bva(Opk8m<3zbDkH2yd!W#GN9Gv(~
zRsD&&IT_4m(6$~fv5P>+S-n@dESJXE2TYCHEOjG}$io9S7-|W|NQFT)l3)42?MI&T
zHLrJM70A9mZmL0DHv$__E#^pP`j;-oCprY_&MC4{tqSpZ%Zi=<UY}%WuT4MAfQYs7
zLwsV2LPA1k?UE^Ij>mbqxFMuE0Ldwqw8VAAQoQO<(;={1k!n4GE6&5x@uC7urMcO&
zsOdF1O=V>MHgR)ZKshtO(6GYLVwf|5Q!EvP+xgj3>Q_@1Sg*p3^N2b05rQIo3x=x0
z*uhox5_bMUK8go+6Hu;;!59NWUNoz@q7h~=MmYD{3;ILHW2dSD$?%R+ZsjDC>Q6E}
z+g*#P1WBtDvanWF-ucR<tkiNqygV@eE%3<sM(Os1a=KpjY}n;21e;ji=Mx`X=7H3o
zp|`sjCrP6ZWtqkTDI4vdPu23Avjhkk4Po<Qr8+$`%&j}SXMiLQ%}dIUOt~6JX1LBD
z_fNA?-79_-G(TlKs~e5ph%j<vQI8SL**RguG%C-^3fg*)iXU_D1>QqPWp*u5F8nz@
zJqR|0$n^;k<#lQdK%chvd**Y3-Nub)Gm;_-djS0>_k&**<{#2}6e+!r%{n4*ld5iW
zXIWIydvLUTF35Af2>BA29Mkc(^MJD8LMTU>5AMn&vq%8e_fB56^sHXNR252U!7WON
z8@RnU`k!J)49i+cf+_KO`ZOu>E^d5E@ZEtN=e*V_XJ`3MJu2^8W@DfvF(GtnUl`l3
zf!tU`_N5h{og<gYkR<^Ca}ZXS0<Pjg*BGoXZ^XK}gG$ZqNL#7j)aICwuOyzc6CW0J
z{x}10TDfHm{k9f<M!w*a41PIQQ$3CjFwim*f+t<+p91yx_?k#M^iIpEd_noOF0(r@
z3&n|-6VuxZh5P3DyJ*h<gqzyGket-b?Q^@{*Ct{WwR{~!c0(JE+Lw`WDfxzNt^)9x
zM~->E;ePkitSp6yO%@H4Z~(5GultEpYH4TAUa+}F=IE0(bVjq!Cw#)Q&+F&|9+tf~
z{r5M|_mX?oGDVN0l|3mz4UC5Oq5bPV@r!oLu?)3RbssC_w`V)vNYaltyt2;HY=nrY
z!@UAF9*%xNdDhBSH40Gv2!!}V=EI-fkdT?M@OW&}LwPOs;5)8znV}*;f32Z<Fu^(G
zugz0=%<~ROxi|Ehf7Og7-8`<en=xOg)7%VN2k-fy0<0~?;*%1eeo7hGP9b75@J17i
z<|DL9dg6Zm!Ft9pm5zte<OTmQezlYXR2%h`+%f&tyKSsj+|Ux?+4M^V*UEJ4<h%qP
z!<X60hDV(*$MYPd$yf_(kn)xBFMv+d0IIcXx@=x@P&Bx%_FWONl$BMmy}g@X!b$<;
zfHXqacn2mA{CRcDUr^AHGgN_EQPeA9rlthzmLjQ7`*}V6^dL0Fe8q=XTK{e@bI^l7
zi<IdBy4-7T`k($-k9L1BE_`cJ;pH@p<Ojmr^*DONp7kD2N{h%ACs;5WD)o)h&94ck
zbeRoKE2=nN7;3w{>8sJr(c7wAj1hOpbcRnIKVjxUj&OOg@1c-65>&crD21Wz$TGUR
z;=+rzB|I6eRMR*D_{gO8g0TsUR<O?7pK}x7$+zquAuH(yE&DsyUG`!}I2Z?yr5<xq
zg|(A-llLC_w8ky4{xYep8T<}LvsivK8#MI*kHHz=Bp-H({~G+{z-!>7lh889q{iSl
zjeTzPLEbON4Ybzx_Zs8U*D8MmVJ&0zEh0CyqS#>Sp+ti)LYubDvU%h*>~?;dw#TZc
z=H)E?dOD_O*M~4LquHCTiNx#@ECagz@&wb?lhNB1i7<?BzIyUsMULLwL|$=KH8Va{
z`w|3_p<moc90{dP>keCtmMR<0xB4NR;>5UrWxsvpXXtCsdv2BHFUUdNN+&z7F0uyE
z$t#aD#V;&LCzxc8z&h^Gxi;;P?|S+rNtfTR*UOgG;&Kyv-y@vL&tOvbG!Y56sadE<
zZ|nJeZ*o$%lccXd8H}oZrRu&xDB<@|cIAjQl-@NPLS_otFvW2;yxWM<Ati44;0!~4
zq_XFPkC*RaF`Ryye9{j&iGXo-R!M@=gP2DSSicIhqQH)mRMqS{61PshL)*ObTCoC4
zrGRw4fSjO>UTy4y`d1}(VU?C2$FIkDVV(4%mgzPrk9BJNB)vkuyhBt(zodEIeI4y?
zd8sY{2mE^-Unu&F=yaM=9P%qyTYm8jAgS&Zu=)^ECTcY-n*GQo*e8-8xOd+h-;Tai
z?k+j|AZX^NVhc?<vaRZJ%&h<~5A^&|>ZnAx?H!S>de<1s46Y~o4^>Y|W{jijoUUW$
zB&=Ljbyb=={3;+6?vOV)mUV^Ic#pCP*zH>oEhTWXr%B-CZfy&{+?0&vldaisIvDGv
zt}ZTm=!r;B_iS{TP16fVcDzNMB6YV&7-rgOZdqX%_aUgYZyFZbX~XqY-=mO~dLmLi
zh_k&Y)bnz3bR$3-J2Uq#96KxwhZ1sW<BX^Hwgfz!Ds}wd#CN`|xn`a98wK-+mJ_V_
zKYmi-^J^qmU}dTs1)u{K^9)?8Pjh=$P`X)j`n(Z7v5tT)7@=c8q=nX^+8n@aG9=kr
zG=PZ9?-#NYUG`;K93bPFzzo{);WaW)?|w|})^{HL@}uNOyevr?e!POV{_>)3u^Q0z
z@PJTG+3#50MW4g(@e#Y$+zv~wie}y>>&#YVg_%k}Bu5mTHA*AJAsW~h1zIg46bwFn
zR`zMV%y%JII$n_j#vMA0D}7VcNw_XezqGhK2jXq1e&D?AbZ@Y7RVDI}RX(ZW@Zd|1
zgZVtgjz09ZXo1!6VN#q84->C^KSeV{4(l2b^;V99kYvDS+4HRi_}2v|#jzg89-6@}
ztEZFohM_qoW=d!9pg;n>r)Zc*2d}IuuW%ZRqN|2AKWk*H4<_!dd3u%&>oB}G;V}xf
z&>Kh!Z6lJhi|)uz+Udxfwce&YG~}b0NsKE_Q+;qc1Bg{*uYTJZ;3ejLr6P90U|d&R
zt~g&Z4RJ1>u7A#_7Ov31&{gEI#9-T#&%PDfyLGY3TSU5IHJ`iE^$v?`0L53jet@?`
zvC2SO=^~NJz#Qk8&&kzok~kFj@uH?l_rbh$DsivJZWU9?@a9{^Cv(YClF7m45Utr?
z&*L|$%9Ak5j4jjGg$surF{zE(OY8Ira##!(*?>j8b109&4(p&{AhZguT~vZobIm-x
z4Ks+vWFuEI!7g0gqhI!3&sU03<jl?NbrsR`jx3^$yu~-yNv_Ks(DM%s<ARD}?52lv
z5LHSL=hVE#&n9sXPxnbQ4OV5|nHO)FxqVS_Ig$a2S|>sM0yk1l=oh>-VEEq_4R63d
z2VN<*A2=m>f>TOjhB8~kJ%5x~0YFmHT>>aKe?(!hC60dgfpu~I^^~an%j@B&QJ9_B
z%lMsC#@g^ZvIkmVTfyooT`hMr;{lc1T2D%HH)xdjd3lU^cV4q={%9Uqr?cPc3arC^
TMEud6dR6?WsiktN`)u|<JPKdD

literal 0
HcmV?d00001

diff --git a/songs/john_lennon/imagine.sg b/songs/john_lennon/imagine.sg
index 6ad3256b..2efbd61d 100644
--- a/songs/john_lennon/imagine.sg
+++ b/songs/john_lennon/imagine.sg
@@ -1,64 +1,73 @@
 \selectlanguage{english}
 \songcolumns{2}
 \beginsong{Imagine}
-  [by={John Lennon}]
-\beginverse
-\[C]  Imagine there's \[Cmaj7]no he\[F]aven
-\[C]  It's easy if \[Cmaj7]you \[F]try
-\[C]  No hell \[Cmaj7]below us \[F]
-\[C]  Above us \[Cmaj7]only sk\[F]y
-\endverse
+  [by={John Lennon},album={Imagine},cover={imagine}]
 
-\beginchorus
-Imagine \[Am]all the peo\[Dm7]ple  \[F/C]
-\[G]Living for \[C/G]today  \[G7]
-\endchorus
+  \cover
+  \gtab{C}{X32010}
+  \gtab*{Cmaj7}{X32000}
+  \gtab{F}{1:022100}
+  \gtab{Am}{X02210}
+  \gtab{Dm7}{XX0211}
+  \gtab*{F/C}{X33111}
+  \gtab{G}{320003}
+  \gtab*{C/G}{332010}
+  \gtab{G7}{320001}
+  \gtab{E}{022100}
+  \gtab{E7}{020130}
 
-\beginverse
-\begin{repeatedchords}
- \[C]Imagine there's no\[Cmaj7] countri\[F]es
- \[C]It isn't hard t\[Cmaj7]o do\[F]
- \[C]Nothing to\[Cmaj7] kill or\[F] die for
- \[C]And no reli\[Cmaj7]gion too\[F]
-\end{repeatedchords}
-\endverse
+  \beginverse
+    \[C] Imagine there's \[Cmaj7]no heave\[F]n
+    \[C] It's easy if \[Cmaj7]you tr\[F]y
+    \[C] No hell \[Cmaj7]below us\[F]
+    \[C] Above us \[Cmaj7]only sk\[F]y
+  \endverse
 
-\beginchorus
-\begin{repeatedchords}
-Imagine \[Am]all the peo\[Dm7]ple \[F/C]
-\[G]Living life\[C/G] in pe\[G7]ace
-\end{repeatedchords}
-\endchorus
+  \beginchorus
+    Imagine \[Am]all the peo\[Dm7]ple \[F/C]
+    \[G]Living for \[C/G]to\[G7]day
+  \endchorus
 
-\begin{bridge}
-\[F] You may \[G]say I'm a \[C]drea\[Cmaj7]mer \[E E7 F]
-But I'm \[G]not the only \[C]one \[Cmaj7 E E7 F]
-I hope some\[G]day you'll \[C]join us \[Cmaj7 E E7 F]
-And the \[G]world will \[C]be as one
-\end{bridge}
+  \begin{repeatedchords}
+    \beginverse
+      \[C] Imagine there's \[Cmaj7]no coun\[F]tries
+      \[C] It isn't \[Cmaj7]hard to d\[F]o
+      \[C] Nothing to \[Cmaj7]kill or d\[F]ie for
+      \[C] And no re\[Cmaj7]ligion t\[F]oo
+    \endverse
 
-\beginverse
-\begin{repeatedchords}
-\[C]Imagine no possess\[Cmaj7]ions \[F]
-\[C]I wonder if you \[Cmaj7]can \[F]
-\[C]No need \[Cmaj7]for greed \[F]or hunger
-\[C]A brother\[Cmaj7]hood of \[F]man
-\end{repeatedchords}
-\endverse
+    \beginchorus
+      Imagine \[Am]all the peo\[Dm7]ple \[F/C]
+      \[G]Living life \[C/G]in p\[G7]eace \echo{Yoo-hoo oohoo\[F]hoo}
+    \endchorus
+  \end{repeatedchords}
 
-\beginchorus
-\begin{repeatedchords}
-Imagine \[Am]all the pe\[Dm7]ople \[F/C]
-\[G]Sharing all \[C/G]the \[G7]world
-\end{repeatedchords}
-\endchorus
+  \begin{bridge}
+    \[F] You may \[G]say I'm a \[C]drea\[Cmaj7]mer \[E E7]
+    \[F] But I'm \[G]not the only \[C]one \[Cmaj7 E E7]
+    \[F] I hope some\[G]day you'll \[C]join us \[Cmaj7 E E7]
+    \[F] And the \[G]world will \[C]{be as one}
+  \end{bridge}
+
+  \begin{repeatedchords}
+    \beginverse
+      \[C] Imagine no po\[Cmaj7]ssessi\[F]ons
+      \[C] I wonder if yo\[Cmaj7]u ca\[F]n
+      \[C] No need for greed \[Cmaj7]or hun\[F]ger
+      \[C] A brotherhood \[Cmaj7]of ma\[F]n
+    \endverse
+
+    \beginchorus
+      Imagine \[Am]all the peo\[Dm7]ple \[F/C]
+      \[G]Sharing all \[C/G]the \[G7]world \echo{Yoo-hoo oohoo\[F]hoo}
+    \endchorus
+
+    \begin{bridge}
+      \[F] You may \[G]say I'm a \[C]drea\[Cmaj7]mer \[E E7]
+      \[F] But I'm \[G]not the only \[C]one \[Cmaj7 E E7]
+      \[F] I hope some\[G]day you'll \[C]join us \[Cmaj7 E E7]
+      \[F] And the \[G]world will \[C]{be as one}
+    \end{bridge}
+  \end{repeatedchords}
 
-\begin{bridge}
-\begin{repeatedchords}
-\[F] You may \[G]say I'm a \[C]drea\[Cmaj7]mer \[E E7 F]
-But I'm \[G]not the only \[C]one \[Cmaj7 E E7 F]
-I hope some\[G]day you'll \[C]join us \[Cmaj7 E E7 F]
-And the \[G]world will \[C]be as one
-\end{repeatedchords}
-\end{bridge}
 \endsong