overhaul - add CCLI # and handle weird formatting

19 files changed, 47 insertions, 52 deletions

diff --git a/src/awake-my-soul.chordpro b/src/awake-my-soul.chordpro
index bc94b89..48afbc6 100644
--- a/src/awake-my-soul.chordpro
+++ b/src/awake-my-soul.chordpro
@@ -11,7 +11,8 @@
 {columns:2}
 {sob}
 %{composer}
-BPM:%{tempo} | %{time} | Key:
+BPM: %{tempo} | %{time} | Key:
+CCLI: #7134998
 {eob}
 
 {sov:Verse 1}
diff --git a/src/battle-belongs.chordpro b/src/battle-belongs.chordpro
index 21d433c..aab9a39 100644
--- a/src/battle-belongs.chordpro
+++ b/src/battle-belongs.chordpro
@@ -11,10 +11,9 @@
 {capo:0}

 {columns:1}

 {sob}

-Composers: %{composer}

-Key: %{key}

-Tempo: %{tempo}

-Time: %{time}

+%{composer}

+BPM: %{tempo} | %{time} | Key:

+CCLI: #7148126

 {eob}

 

 {sob:Intro}

@@ -41,11 +40,11 @@ I'll [Am7]sing through the [F2]night
 [*(1.)] O [C]God, the battle be-[G]longs to [C]You[*(To T/A / Bridge)]

 [*(2.)] O [C]God, the battle be-[G]longs to [Am7]You[*(To Ending)]

 {eoc}

-{column_break}

+

 {sob:Turnaround}

 [*|][C][*|][C][Csus][C][*|]

 {eob}

-

+{column_break}

 {sov:Verse 2}

 [C] And if You are for me,

 Who can be a-[F2]gainst me?[F2]

diff --git a/src/do-it-again.chordpro b/src/do-it-again.chordpro
index f92839f..e586e11 100644
--- a/src/do-it-again.chordpro
+++ b/src/do-it-again.chordpro
@@ -15,6 +15,7 @@
 {sob}
 %{composer}
 BPM: %{tempo} | %{time} | Key:
+CCLI: #7067555
 {eob}
 
 {sov:Intro}
@@ -41,7 +42,7 @@ you ne[Eb]ver failed me yet
 {sob:Interlude}
 [Bb/D] [Eb] [Bb/D] [Eb]
 {eob}
-
+{column_break}
 {sov:Verse 2}
 [Eb]I know the night won't last
 [Bb/D]Your word will come to pass
@@ -67,7 +68,7 @@ you ne[Eb]ver failed me yet
 [Bb/D] [Eb] [Bb/D] [Eb]
 [F/A] [Bb] [F/A] [Bb]
 {eob}
-
+{column_break}
 {sob:Bridge [ ]x}
 [Bb/D]I've[Eb] seen you m[Bb/D]ove, [Eb]
 you move the moun[F/A]tains [Bb]
diff --git a/src/fresh-wind.chordpro b/src/fresh-wind.chordpro
index 6ac32dd..1120050 100644
--- a/src/fresh-wind.chordpro
+++ b/src/fresh-wind.chordpro
@@ -14,7 +14,8 @@
 {columns:2}
 {sob}
 Composers: %{composer}
-Tempo: %{tempo} | Time: %{time}
+BPM: %{tempo} | %{time} | Key:
+CCLI: #7166857
 {eob}
 
 {sov:Intro / Turnaround}
@@ -43,7 +44,7 @@ For [F2(no3)]hearts that burn with [C]holy fear
 [Gsus]Puri-[G]fied in [Am7]faith and deed
 Re-[F2(no3)]finder's fire [C]strengthen what re[G]-mains
 {eov}
-
+{column_break}
 {sov:Verse 4}
 So [F2(no3)]we the church who [C]bear your light
 [Gsus]Lamp a-[G]flame [Am7]city bright
diff --git a/src/glorious-day.chordpro b/src/glorious-day.chordpro
index 62d8de8..1977054 100644
--- a/src/glorious-day.chordpro
+++ b/src/glorious-day.chordpro
@@ -15,6 +15,7 @@
 {sob}
 %{composer}
 BPM: %{tempo} | %{time} | Key:
+CCLI: #7081388
 {eob}
 
 {sov:Verse 1}
diff --git a/src/good-god-almighty.chordpro b/src/good-god-almighty.chordpro
index ce049d6..8208098 100644
--- a/src/good-god-almighty.chordpro
+++ b/src/good-god-almighty.chordpro
@@ -12,10 +12,9 @@
 {capo:0}

 {columns:1}

 {sob}

-Composers: %{composer}

-Key: %{key}

-Tempo: %{tempo}

-Time: %{time}

+%{composer}

+BPM: %{tempo} | %{time} | Key:

+CCLI: #7168602

 {eob}

 

 {sob:Intro}

diff --git a/src/goodness-of-god.chordpro b/src/goodness-of-god.chordpro
index 0bdbf68..a3f0f48 100644
--- a/src/goodness-of-god.chordpro
+++ b/src/goodness-of-god.chordpro
@@ -14,10 +14,10 @@
 {capo:0}
 {columns:1}
 {sob}
-Composers: %{composer}
-Tempo: %{tempo} | Time: %{time}
+%{composer}
+BPM: %{tempo} | %{time} | Key:
+CCLI: #7117726
 {eob}
-
 {sov:Verse 1}
 I love You L[C]ord oh Your mer[F]cy never fa[C]ils me
 [G/B] All my [Am7]days I've been h[F]eld in Your h[G4]ands
diff --git a/src/great-things.chordpro b/src/great-things.chordpro
index 10696d9..db03cbd 100644
--- a/src/great-things.chordpro
+++ b/src/great-things.chordpro
@@ -13,6 +13,7 @@
 {sob}
 %{composer}
 BPM: %{tempo} | %{time} | Key:
+CCLI: #7111321
 {eob}
 
 {sob:Intro}
diff --git a/src/homecoming.chordpro b/src/homecoming.chordpro
index bb55ae1..e75c346 100644
--- a/src/homecoming.chordpro
+++ b/src/homecoming.chordpro
@@ -15,6 +15,7 @@
 {sob}
 %{composer}
 BPM: %{tempo} | %{time} | Key:
+CCLI: #7183255
 {eob}
 
 {sov:Verse 1}
diff --git a/src/house-of-the-lord.chordpro b/src/house-of-the-lord.chordpro
index a35b5dc..f3caab7 100644
--- a/src/house-of-the-lord.chordpro
+++ b/src/house-of-the-lord.chordpro
@@ -13,6 +13,7 @@
 {sob}
 %{composer}
 BPM: %{tempo} | %{time} | Key:
+CCLI: #7168995
 {eob}
 
 {sov:Intro}
diff --git a/src/king-of-kings.chordpro b/src/king-of-kings.chordpro
index 9eea6a9..41b257d 100644
--- a/src/king-of-kings.chordpro
+++ b/src/king-of-kings.chordpro
@@ -14,6 +14,7 @@
 {sob}
 %{composer}
 BPM: %{tempo} | %{time} | Key:
+CCLI: #7127647
 {eob}
 
 {sov:Verse 1}
diff --git a/src/lord-send-revival.chordpro b/src/lord-send-revival.chordpro
index debe6e1..35ed41c 100644
--- a/src/lord-send-revival.chordpro
+++ b/src/lord-send-revival.chordpro
@@ -14,6 +14,7 @@
 {sob}

 %{composer}

 BPM: %{tempo} | %{time} | Key:

+CCLI: #7147651

 {eob}

 

 {sob:Intro}

diff --git a/src/oceans-loop-radio.chordpro b/src/oceans-loop-radio.chordpro
index c87b671..9d743de 100644
--- a/src/oceans-loop-radio.chordpro
+++ b/src/oceans-loop-radio.chordpro
@@ -12,8 +12,9 @@
 {capo:0}
 {columns:1}
 {sob}
-Composers: %{composer}
-Tempo: %{tempo} | Time: %{time}
+%{composer}
+BPM: %{tempo} | %{time} | Key:
+CCLI: #6428767
 {eob}
 
 {sov:Verse 1}
diff --git a/src/pure-exaltation.chordpro b/src/pure-exaltation.chordpro
index 380ee7b..785d44e 100644
--- a/src/pure-exaltation.chordpro
+++ b/src/pure-exaltation.chordpro
@@ -14,6 +14,7 @@
 {sob}

 %{composer}

 BPM: %{tempo} | %{time} | Key:

+CCLI: #7123473

 {eob}

 

 {sob:Intro}

diff --git a/src/same-god.chordpro b/src/same-god.chordpro
index 4a239c9..c4079e7 100644
--- a/src/same-god.chordpro
+++ b/src/same-god.chordpro
@@ -15,6 +15,7 @@
 {sob}
 %{composer}
 BPM: %{tempo} | %{time} | Key:
+CCLI: #7183537
 {eob}
 
 {sov:Verse 1}
diff --git a/src/set-a-fire.chordpro b/src/set-a-fire.chordpro
index 3467b3f..a0aad3b 100644
--- a/src/set-a-fire.chordpro
+++ b/src/set-a-fire.chordpro
@@ -12,6 +12,7 @@
 {sob}

 %{composer}

 BPM: %{tempo} | %{time} | Key:

+CCLI: #5911299

 {eob}

 

 {sov:Intro}

diff --git a/src/way-maker.chordpro b/src/way-maker.chordpro
index 44332d7..d9b03c9 100644
--- a/src/way-maker.chordpro
+++ b/src/way-maker.chordpro
@@ -10,54 +10,38 @@
 {capo:0}

 {columns:1}

 {sob}

-Composers: %{composer}

-Key: %{key}

-Tempo: %{tempo}

-Time: %{time}

+%{composer}

+BPM: %{tempo} | %{time} | Key:

+CCLI #7115744

 {eob}

 

 {sov:Verse 1}

-You are here[G] moving in our[D] midst

-I worship [Asus]You I worship [Bm]You

-You are here[G] working in this[D] place

-I worship [Asus]You I worship [Bm]You

+You are here[G] moving in our[D] midst, I worship [Asus]You I worship [Bm]You

+You are here[G] working in this[D] place, I worship [Asus]You I worship [Bm]You

 {eov}

-

 {soc:Chorus}

 (You are)[G] Way Maker Miracle Worker Pro[D]mise Keeper

 Light in the dark[Asus]ness my God that is who You [Bm]are

 {eoc}

-

 {sov:Verse 2}

-You [A]are here[G] touching every[D] heart

-I worship [Asus]You I worship[Bm] You

-You are here[G] healing every[D] heart

-I worship [Asus]You I worship [Bm]You

+You [A]are here[G] touching every[D] heart, I worship [Asus]You I worship[Bm] You

+You are here[G] healing every[D] heart, I worship [Asus]You I worship [Bm]You

 {eov}

-

 {sov:Verse 3}

-You are here[G] turning lives a[D]-round

-I worship [Asus]You I worship [Bm]You

-You are here[G] mending every[D] heart

-I worship [Asus]You yeah I worship[Bm] You Lord

+You are here[G] turning lives a[D]-round, I worship [Asus]You I worship [Bm]You

+You are here[G] mending every[D] heart, I worship [Asus]You yeah I worship[Bm] You Lord

 {eov}

-{column_break}

 {sob:Tag 1A}

 That is who You [G]are, That is who You [D/F#]are

 That is who You [A]are, That is who You [Bm]are

 {eob}

-

 {sob:Bridge}

-[G] Even when I don't see it You're working

-[D] Even when I don't feel it You're working

-[Asus] You never stop You never stop working

-[Bm] You never stop You never stop working

+[G] Even when I don't see it You're working, [D] Even when I don't feel it You're working

+[Asus] You never stop You never stop working, [Bm] You never stop You never stop working

 {eob}

-

 {sob:Instrumental}

 [*||:][G2][*|][D][*|][A(4)][*|][Bm7][*:||]

 {eob}

-

 {sob:Tag 1B}

 That is who You [G2]are, That is who You [D/F#]are

 That is who You [A(4)]are, That is who You [Bm7]are [*(][G2][*)][*(Last time)]

diff --git a/src/we-believe.chordpro b/src/we-believe.chordpro
index 5759e87..a9a373b 100644
--- a/src/we-believe.chordpro
+++ b/src/we-believe.chordpro
@@ -12,10 +12,9 @@
 {capo:0}
 {columns:1}
 {sob}
-Composers: %{composer}
-Key: %{key}
-Tempo: %{tempo}
-Time: %{time}
+%{composer}
+BPM: %{tempo} | %{time} | Key:
+CCLI: #6367165
 {eob}
 
 {sov:Verse 1}
diff --git a/src/what-i-see.chordpro b/src/what-i-see.chordpro
index b0b4267..b81f252 100644
--- a/src/what-i-see.chordpro
+++ b/src/what-i-see.chordpro
@@ -14,7 +14,8 @@
 {columns:2}
 {sob}
 Composers: %{composer}
-Tempo: %{tempo} | Time: %{time}
+BPM: %{tempo} | %{time} | Key:
+CCLI: #7181677
 {eob}
 
 {sob:Intro}