fixes

packets/aircoustic202105.tex

@@ -4,6 +4,7 @@
 \begin{document}
 \includepdf[pages=-]{build/pdf/Marvin Gaye/What's Going On.pdf}
 \includepdf[pages=-]{build/pdf/Commodores/Nightshift.pdf}
+\includepdf[pages=-]{build/pdf/Commodores/Nightshift Capo I.pdf}
 \includepdf[pages=-]{build/pdf/Barrett Strong/Money (That's What I Want).pdf}
 \includepdf[pages=-]{build/pdf/Smokey Robinson & The Miracles/The Tracks of My Tears.pdf}
 \includepdf[pages=-]{build/pdf/Smokey Robinson & The Miracles/I Second That Emotion.pdf}

songs/Barrett Strong/Money (That's What I Want).tex

@@ -50,9 +50,9 @@ That's what I ^{C}want (that's ^{A#}what I want) \\
 \begin{outro}
 ^*{F}Mo ^{-}ney ^{A#} (that's ^{F}what I ^{-}want) ^{A#} \\
 Lots of ^{F}money ^{-}(that's ^{A#} \hspace{20pt} ^{F}what I ^{-}want) ^{A#} \\
-Whole lot of ^{F}money ^{-}(that's ^{A#} \hspace{20pt} ^{F}what I ^{-}want) ^{A#} \\
+Whole lot of ^{A#}money ^{-}(that's ^{D#} \hspace{20pt} ^{A#}what I ^{-}want) ^{D#} \\
 Uh ^{F}huh (^{-}that's ^{A#} \hspace{20pt} ^{F}what I ^{-}want) ^{A#} \\
-All I ^{F}want (^{-}that's ^{A#} \hspace{20pt} ^{F}what I ^{-}want) ^{A#} \\
+All I ^{C}want that's \hspace{20pt} ^{Bb}what I want)	 \\
 ^{F}Whoah yea^{-}h (that's ^{A#} \hspace{20pt} ^{F*}what I want) ^{C} \instruction{continue with same chords....} \\
 \\
 Give me Money (that's what I want) \\

songs/Commodores/Nightshift Body.tex

@@ -0,0 +1,68 @@
+\begin{intro}
+\begin{tabular}[t]{@{}lllll}
+|_{G#} & |_{Fm7} - _{C#} & |_{D#} & |_{D#} & | \\
+|_{C#} & |_{C#} & |_{G#} & |_{G#} & | \\
+\end{tabular}
+\end{intro}
+
+\begin{verse}
+^{G#} Marvin,  ^{Fm7} ^{-} ^{C#} he was a ^{D#}friend of mine,
+and he could ^{C#}sing a ^{C#add9}song, ^{C#} his heart in ^{D#}every line \\
+^{G#} Marvin,  ^{Fm7} ^{-} ^{C#} sang of the ^{D#}joy and pain,
+he opened ^{C#}up our ^{C#add9}minds, ^{C#} and I still can ^{D#}hear him say
+\end{verse}
+
+\begin{bridge}
+Aww, ^{Fm}talk to me, so ^{A#m7}you can see what's ^*{A#m7/D}going on \\
+^{Fm}Say you will, ^{A#m7}sing your songs, for-^{C#add9}evermore, evermore, evermore
+\end{bridge}
+
+\begin{chorus}
+Gonna be some ^{G#}sweet sounds, ^*{Fm}comi ^{-}ng ^{C#}down, on the ^{A#m7/D}nightshift \\
+I bet you're ^{C#}singing proud, oh, I bet you'll ^{G#}pull a crowd \\
+Gonna be a ^{G#}long night; it's gonna be ^*{Fm}all ^*{-}- ^{C#}right, on the ^{A#m7/D}nightshift \\
+Oh, you found a-^{C#}nother home, I know you're ^{D#}not alone on the ^{G#}nightshift. ^{Fm7} \\
+You found a-^{C#}nother home, I know you're ^{D#}not alone on the ^{(G#)}nightshift
+\end{chorus}
+
+\begin{interlude}
+\begin{tabular}[t]{@{}lllll}
+|_{G#} & |_{Fm7} - _{C#} & |_{D#} & |_{D#} & | \\
+\end{tabular}
+\end{interlude}
+
+\begin{verse}
+^{G#} Jackie, ^{Fm7} ^{-} ^{C#} hey, what you ^{D#}doing now?
+It seems like ^{C#}yester ^{C#add9}day,     
+^{C#} When we were ^{D#}working out \\
+^{G#} Jackie, ^{Fm7} ^{-} ^{C#} you set the ^{D#}world on fire.
+You came and ^{C#}gifted ^{C#add9}us;       
+^{C#} Your love it ^{D#}\mbox{lifted us, higher and higher}
+\end{verse}
+
+\begin{bridge}
+^{Fm}Keep it up and ^{A#m7}we'll be there, ^{A#m7/D}At your side \\
+Oh, ^{Fm}say you will, ^{A#m7}sing your songs, For-^{C#add9}evermore, evermore, evermore
+\end{bridge}
+
+\begin{chorus}
+\instruction{Repeat chorus but end on _{Fm7} to transition to a-capella bit}
+\end{chorus}
+
+\begin{outro}
+\instruction{Percussion only} \\
+Gonna be some sweet sounds (sweet sounds), coming down, on the nightshift (whoah on the nightshift) \\
+I bet you're singing proud (oh you're singing proud), I bet you'll pull a crowd (oh yeah) \\
+\instruction{Band returns} \\
+Gonna be a ^{G#}long night; it's gonna be ^{Fm}all ^{-}- ^{C#}right, 
+on the ^{A#m7/D}nightshift (on the nightshift) \\
+You found a-^{C#}nother home,
+I know you're ^{D#}not alone
+on the nightshift ^{G#} ^{G#} \\
+\\
+Gonna miss your ^{G#}sweet voice, that ^*{Fm}soulf ^{-}ul ^{C#}noise , on the ^{A#m7/D}nightshift \\
+We all ^{C#}remember you, your songs are ^{G#}coming through \\
+And at the end of a ^{G#}long day, it's gonna be ^*{Fm}oka ^{-}y ^{C#}, on the ^{A#m7/D}nightshift \\
+You found a-^{C#}nother home, I know you're ^{D#}not alone
+on the ^{G#}nightshift
+\end{outro}

songs/Commodores/Nightshift Capo I.tex

@@ -0,0 +1,8 @@
+\documentclass{skrul-leadsheet}
+\begin{document}
+\begin{song}[transpose-capo=true]{title={Nightshift}, band={Commodores}, year={1985}, key={G#}, capo={1}}
+
+\input{"Nightshift Body.tex"}
+
+\end{song}
+\end{document}

songs/Commodores/Nightshift.tex

@@ -1,68 +1,8 @@
 \documentclass{skrul-leadsheet}
 \begin{document}
-\begin{song}[transpose-capo=true]{title={Nightshift}, band={Commodores}, year={1985}, key={G}}
+\begin{song}[transpose-capo=true]{title={Nightshift}, band={Commodores}, year={1985}, key={G#}}
 
-\begin{intro}
+\input{"Nightshift Body.tex"}
-\begin{tabular}[t]{@{}lllll}
-|_{G} & |_{Em7} - _{C} & |_{D} & |_{D} & | \\
-|_{C} & |_{C} & |_{G} & |_{G} & | \\
-\end{tabular}
-\end{intro}
 
-\begin{verse}
-^{G} Marvin,  ^{Em7} ^{-} ^{C} he was a ^{D}friend of mine,
-and he could ^{C}sing a ^{Cadd9}song, ^{C} his heart in ^{D}every line \\
-^{G} Marvin,  ^{Em7} ^{-} ^{C} sang of the ^{D}joy and pain,
-he opened ^{C}up our ^{Cadd9}minds, ^{C} and I still can ^{D}hear him say
-\end{verse}
-
-\begin{bridge}
-Aww, ^{Em}talk to me, so ^{Am7}you can see what's ^*{Am7/D}going on \\
-^{Em}Say you will, ^{Am7}sing your songs, for-^{Cadd9}evermore, evermore, evermore
-\end{bridge}
-
-\begin{chorus}
-Gonna be some ^{G}sweet sounds, ^*{Em}comi ^{-}ng ^{C}down, on the ^{Am7/D}nightshift \\
-I bet you're ^{C}singing proud, oh, I bet you'll ^{G}pull a crowd \\
-Gonna be a ^{G}long night; it's gonna be ^*{Em}all ^*{-}- ^{C}right, on the ^{Am7/D}nightshift \\
-Oh, you found a-^{C}nother home, I know you're ^{D}not alone on the ^{G}nightshift. ^{Em7} \\
-You found a-^{C}nother home, I know you're ^{D}not alone on the ^{(G)}nightshift
-\end{chorus}
-
-\begin{interlude}
-\begin{tabular}[t]{@{}lllll}
-|_{G} & |_{Em7} - _{C} & |_{D} & |_{D} & | \\
-\end{tabular}
-\end{interlude}
-
-\begin{verse}
-^{G} Jackie, ^{Em7} ^{-} ^{C} hey, what you ^{D}doing now?
-It seems like ^{C}yester ^{Cadd9}day,     
-^{C} When we were ^{D}working out \\
-^{G} Jackie, ^{Em7} ^{-} ^{C} you set the ^{D}world on fire.
-You came and ^{C}gifted ^{Cadd9}us;       
-^{C} Your love it ^{D}\mbox{lifted us,
-higher and higher}
-
-\end{verse}
-
-\begin{bridge}
-^{Em}Keep it up and ^{Am7}we'll be there, ^{Am7/D}At your side \\
-Oh, ^{Em}say you will, ^{Am7}sing your songs, For-^{Cadd9}evermore, evermore, evermore
-\end{bridge}
-
-\begin{chorus}
-Gonna be some ^{G}sweet sounds, ^*{Em}comi ^{-}ng ^{C}down,
-on the ^{Am7/D}nightshift \\
-I bet you're ^{C}singing proud,
-oh, I bet you'll ^{G}pull a crowd \\
-Gonna be a ^{G}long night; it's gonna be ^{Em}all ^{-}- ^{C}right, 
-on the ^{Am7/D}nightshift \\
-Oh, you found a-^{C}nother home,
-I know you're ^{D}not alone
-on the ^{1/	 Em7 2/ G}nightshift \\
-
-\instruction{Repeat Second Chorus, end on G}
-\end{chorus}
 \end{song}
 \end{document}

songs/Smokey Robinson & The Miracles/I Second That Emotion.tex

@@ -1,6 +1,6 @@
 \documentclass{skrul-leadsheet}
 \begin{document}
-\begin{song}[transpose-capo=true]{title={I Second That Emotion}, band={Smokey Robinson \& The Miracles}, year={1967}, key={}}
+\begin{song}[transpose-capo=true]{title={I Second That Emotion}, band={Smokey Robinson \& The Miracles}, year={1967}, key={D}}
 
 \begin{intro}
 \begin{tabular}[t]{@{}llll}

songs/Smokey Robinson & The Miracles/The Tracks of My Tears.tex

@@ -44,7 +44,6 @@ because, ^{G} you'r^{-}e the ^{C}permanent one \riff
 \instruction{Repeat Break}
 \end{xbreak}
 
- 
 \begin{bridge}
 \instruction{Pause for 4 beats} \\
 ^{C} ^{-} ^{G} Hey hey h^{C}ey y^{-}eah ^{G}  \\

tex/skrul-leadsheet.cls

@@ -80,6 +80,7 @@
     G##maj7=A\textsuperscript{maj7},
     G##sus4=A\textsuperscript{sus4},
     G##7=A\textsuperscript{7},
+    G##m7/C#=Am\textsuperscript{7}/D,
     G#b*=G*,
     G#b=G,
     G##m7=Am7,
@@ -91,6 +92,7 @@
     (F##)=(G),
     Cadd9=C\textsuperscript{add9},
     A7=A\textsuperscript{7},
+    Am7=Am\textsuperscript{7},
     D7=D\textsuperscript{7},
     Bm7=Bm\textsuperscript{7},
     F##sus2=G\textsuperscript{sus2},