yes and amen - convert chordpro and format

2 files changed, 98 insertions, 38 deletions

diff --git a/configs/yes-and-amen.json b/configs/yes-and-amen.json
new file mode 100644
index 0000000..7d66f7f
--- /dev/null
+++ b/configs/yes-and-amen.json
@@ -0,0 +1,22 @@
+{
+  "pdf": {
+    "fonts": {
+      "chord": {
+        "size": 11
+      },
+      "text": {
+        "size": 11
+      },
+      "comment": {
+        "size": 12
+      },
+      "title": {
+        "size": 12
+      }
+    },
+    "columnspace": 10
+  },
+  "settings": {
+    "columns": 2
+ }
+}
diff --git a/src/yes-and-amen.chordpro b/src/yes-and-amen.chordpro
index 5b108b3..962ecab 100644
--- a/src/yes-and-amen.chordpro
+++ b/src/yes-and-amen.chordpro
@@ -1,40 +1,78 @@
-{title: Yes And Amen}
+{title:Yes and Amen}
+#{sorttitle:asdf}
+{subtitle:(Based on the recording by Chris Tomlin)}
+{composer:Anthony Brown}
+{composer:Chris McClarney}
+{composer:Nate Moore}
+{artist:Chris Tomlin}
+{transpose:10}
+{tempo:420}
+{time:4/4}
 {key: D}
-{capo: 0}
-{start_column}
-{c:Intro}
+{capo:0}
+{sob}
+%{composer}
+BPM: %{tempo} | %{time} | Key:
+CCLI: #7048885
+{eob}
+
+{sob:Intro}
 [D]
-{c:Verse 1}
-[A]Father of [Bm]kindness
-You have [Bm]poured out [D]grace
-You [G]brought me out of [D]darkness
-You have [Bm]filled me with [D/A]peace
-[A]Giver of [Bm]mercy
-Your my [Bm]help in [D]time of [G]need
-Lord [G]I can’t [A]help but [D]sing
-{c:Chorus}
-[A]Faith[Bm]ful, you are [G] [D]
-[A]Faith[Bm]ful, for[G]ever, you will [D]be
-[A]Faith[Bm]ful, you are [G] [D]
-[A]All y[Bm]our promises are 
-“[G]yes" and "a[D]men"
-[A]All y[Bm]our promises are 
-“[G]yes" and "a[D]men"
-{c:Instrumental}
-[A] [Bm] [G] [D]
-{end_column}
-{start_column}
-{c:Verse 2}
-[A]Beautiful [Bm]saviour
-You have [G]brought me [D]near
-You [A]pulled me from the [Bm]ashes
-You have [G]broken every [A]curse
-[A]Blessed re[Bm]deemer
-You have [Bm]set this [D]captive [G]free
-Lord [G]I can’t [A]help but [D]sing
-{c:Bridge}
-I will [A]rest [Bm]
-in your [G]promi[D]ses
-my confi[A]dence [Bm]
-is your [G]faithful[D]ness
-{end_column}
\ No newline at end of file
+{eob}
+
+{sov:Verse 1}
+[A/D]Father of [Bm7/D]kindness
+You have [G2/D]poured out [D]grace
+You [A/D]brought me out of [Bm7/D]darkness
+You have [G2/D]filled me with [A/D]peace
+[A/D]Giver of [Bm7/D]mercy
+You're my [G2/D]help in [D]time of [G2/D]need
+Lord [G2/D]I can’t [A/D]help but [D]sing
+{eov}
+
+{soc:Chorus}
+[A]Faith-[Bm7]ful, You [G]are [D]
+[A]Faith-[Bm7]ful, for[G]ever, You [D]will be
+[A]Faith-[Bm7]ful, You [G]are [D]
+[A]All [Bm7]Your promises are “[G]Yes" and "A-[D]men"
+[A]All [Bm7]Your promises are “[G]Yes" and "A-[D]men"
+{eoc}
+
+{sob:Instrumental}
+[*|][A][Bm7][*|][G2][D][*|][A][Bm7][*|][G2][D][*|]
+{eob}
+{column_break}
+{sov:Verse 2}
+[A]Beautiful [Bm7]Saviour
+You have [G2]brought me [D]near
+You [A]pulled me from the [Bm7]ashes
+You have [G2]broken every [A]curse
+[A]Blessed re-[Bm7]deemer
+You have [G2]set this [D]captive [G2]free
+Lord [G2]I can't [A]help but [D]sing
+{eov}
+
+{soc:Chorus 2x}
+{eoc}
+
+{sob:Instrumental}
+[*|][A][Bm7][*|][G2][D][*|][A][Bm7][*|][G2][D][*|]
+{eob}
+
+{sob:Bridge}
+I will [A]rest [Bm7] in Your [G2]promi[D]ses
+My confi-[A]dence [Bm7] is Your [G2]faithful[D]ness
+{eob}
+
+{soc:Chorus}
+[A]Faith-[Bm7]ful, You [G]are [D]
+[A]Faith-[Bm7]ful, for[G]ever, You [D]will be
+[A]Faith-[Bm7]ful, You [G]are [D]
+[A]All [Bm7]Your promises are “[G]Yes" and "A-[D]men"
+[A]All [Bm7]Your promises are “[G]Yes" and "A-[D]men"
+{eoc}
+
+{sob:Ending}
+[A]All [Bm7]Your promises are “[G]Yes" and "A-[D]men"
+[A]All [Bm7]Your promises are “[G]Yes" and "A-[D]men"
+{eob}