From ffe3c15509963aaa7b2a3217f27dfc5a7296614b Mon Sep 17 00:00:00 2001 From: Steve Krulewitz Date: Wed, 1 Jun 2022 11:15:55 -0700 Subject: [PATCH] rem fixes --- bin/build.sh | 2 +- songs/R.E.M./Driver 8 (chords).tex | 2 +- songs/R.E.M./Everybody Hurts (chords).tex | 4 +- songs/R.E.M./Fall On Me (chords).tex | 12 +++-- songs/R.E.M./Radio Free Europe (chords).tex | 2 +- .../R.E.M./World Leader Pretend (chords).tex | 2 +- tex/skrul-leadsheet-chords.cls | 45 ++++++++++++------- 7 files changed, 42 insertions(+), 27 deletions(-) diff --git a/bin/build.sh b/bin/build.sh index a5e39cc..20622cb 100755 --- a/bin/build.sh +++ b/bin/build.sh @@ -48,4 +48,4 @@ function make_packet { setup_pdflatex #make_pdf "$1" -make_packet "packets/aircoustic202205.tex" +make_packet "packets/rem.tex" diff --git a/songs/R.E.M./Driver 8 (chords).tex b/songs/R.E.M./Driver 8 (chords).tex index 3973891..522c95a 100644 --- a/songs/R.E.M./Driver 8 (chords).tex +++ b/songs/R.E.M./Driver 8 (chords).tex @@ -1,7 +1,7 @@ \documentclass{skrul-leadsheet-chords}[20pt] \begin{document} -\begin{song}[transpose-capo=true]{title={Driver 8}, band={R.E.M.}, bpm={}, key={}} +\begin{song}[transpose-capo=true]{title={Driver 8}, band={R.E.M.}, bpm={160}, key={}} \begin{intr} \instruction{8 bar guitar riff intro} diff --git a/songs/R.E.M./Everybody Hurts (chords).tex b/songs/R.E.M./Everybody Hurts (chords).tex index e123ec9..abb7dc4 100644 --- a/songs/R.E.M./Everybody Hurts (chords).tex +++ b/songs/R.E.M./Everybody Hurts (chords).tex @@ -19,7 +19,7 @@ \begin{c1} \chordtable{ \xb{Em} & \xb{A} & \xb{Em} & \xb{A} & & \\ -\xb{Em} & \xb{A}[\textbf{..}$\wedge$] & & & & \\ +\xb{Em} & \xb{A}[\beats{2}\choke] & & & & \\ } \end{c1} @@ -41,7 +41,7 @@ \chordtable{ \xb{F#} & \xb{Bm} & \xb{F#} & \xb{Bm} & & \\ \xb{F#} & \xb{Bm} & & & & \\ -\xb{C} & \xb{G} & \xbb{C}[\beats{3}]{C/B}[\beats{1}] & \xb{A}[\textbf{..}$\wedge$] & & \\ +\xb{C} & \xb{G} & \xbb{C}[\beats{3}]{C/B}[\beats{1}] & \xb{A}[\beats{2}\choke] & & \\ } \end{b1} diff --git a/songs/R.E.M./Fall On Me (chords).tex b/songs/R.E.M./Fall On Me (chords).tex index 34fab49..fded3f2 100644 --- a/songs/R.E.M./Fall On Me (chords).tex +++ b/songs/R.E.M./Fall On Me (chords).tex @@ -52,10 +52,6 @@ } \end{pre3} -\begin{c2} -\instruction{Repeat Chorus} -\end{c2} - \begin{c3} \instruction{Repeat Chorus} \end{c3} @@ -64,6 +60,14 @@ \instruction{Repeat Chorus} \end{c4} +\begin{c5} +\instruction{Repeat Chorus} +\end{c5} + +\begin{c6} +\instruction{Repeat Chorus} +\end{c6} + \begin{out} \chordtable{ \xb{Am}[\hold] & & & & & \\ diff --git a/songs/R.E.M./Radio Free Europe (chords).tex b/songs/R.E.M./Radio Free Europe (chords).tex index af0e8cf..b258e56 100644 --- a/songs/R.E.M./Radio Free Europe (chords).tex +++ b/songs/R.E.M./Radio Free Europe (chords).tex @@ -1,7 +1,7 @@ \documentclass{skrul-leadsheet-chords}[20pt] \begin{document} -\begin{song}[transpose-capo=true]{title={Radio Free Europe}, band={R.E.M.}, bpm={}, key={}} +\begin{song}[transpose-capo=true]{title={Radio Free Europe}, band={R.E.M.}, bpm={152}, key={}} \begin{v1} \chordtable{ diff --git a/songs/R.E.M./World Leader Pretend (chords).tex b/songs/R.E.M./World Leader Pretend (chords).tex index 1499e0b..ad00fe6 100644 --- a/songs/R.E.M./World Leader Pretend (chords).tex +++ b/songs/R.E.M./World Leader Pretend (chords).tex @@ -1,7 +1,7 @@ \documentclass{skrul-leadsheet-chords}[20pt] \begin{document} -\begin{song}[transpose-capo=true]{title={World Leader Pretend}, band={R.E.M.}, bpm={}, key={}} +\begin{song}[transpose-capo=true]{title={World Leader Pretend}, band={R.E.M.}, bpm={126}, key={}} \begin{intr} \chordtable{ diff --git a/tex/skrul-leadsheet-chords.cls b/tex/skrul-leadsheet-chords.cls index 060e425..29ed9d5 100644 --- a/tex/skrul-leadsheet-chords.cls +++ b/tex/skrul-leadsheet-chords.cls @@ -1,4 +1,4 @@ -\ProvidesClass{skrul-leadsheet} +\ProvidesClass{skrul-leadsheet-chords} \LoadClassWithOptions{scrartcl} \usepackage{savesym} @@ -29,6 +29,7 @@ \usepackage{xparse} \usepackage{adjustbox} \usepackage{amssymb} +\usepackage{array} \definesongproperty{bpm} \definesongproperty{meter} @@ -146,42 +147,44 @@ }} \newcommand\choke{$\wedge$} +\newcommand\push{>} +\newcommand\hold{$\Diamond$} \makeatletter \newcommand\cellwidth{\TX@col@width} \makeatother \NewDocumentCommand \xb { m O{\space} }{{ -\smash{% - \raisebox{10pt}{% +%\smash{% + \raisebox{1ex}{% \begin{tabular}{@{}c} - #2 \\ + #2 \\[-0.3em] \writechord{#1} \\ \end{tabular} } - } +% } }} \NewDocumentCommand \xbb { m O{\space} m O{\space} }{{ -\smash{% - \raisebox{10pt}{% +%\smash{% + \raisebox{1ex}{% \begin{tabular}{@{}cc@{}} - #2 & #4 \\ + #2 & #4 \\[-0.3em] \writechord{#1} & \writechord{#3} \\ \hline \end{tabular} } - } +% } }} \NewDocumentCommand \xbbb { m O{\space} m O{\space} m O{\space} }{{ -\smash{% - \raisebox{10pt}{% +%\smash{% + \raisebox{1ex}{% \begin{tabular}{@{}ccc@{}} - #2 & #4 & #6 \\ + #2 & #4 & #6 \\[-0.3em] \writechord{#1} & \writechord{#3} & \writechord{#5} \\ \hline \end{tabular} } - } +% } }} \NewDocumentCommand \xbbbb { m o m o m o m o }{{ @@ -193,17 +196,18 @@ % Globally smashes the row height of all tabularx rows. However, this % messes with the baseline of the first row so compensate for it later. -\setlength{\extrarowheight}{-1.5ex} +%\setlength{\extrarowheight}{-1em} \NewDocumentCommand \chordtable { m }{{ \adjustbox{valign=t}{ \begin{tabularx}{\textwidth}{XXXXXX} - \\[0.4ex] % row height compensation +% \\[0.4ex] % row height compensation #1 \end{tabularx} } - \vspace*{-4ex} % remote some extra padding on bottom? - }} +% \vspace*{4ex} % remote some extra padding on bottom? + } +} \ExplSyntaxOff @@ -250,6 +254,13 @@ \provideversetype{pre1}[name=Pre1] \provideversetype{pre2}[name=Pre2] +\provideversetype{pre3}[name=Pre3] +\provideversetype{pre4}[name=Pre4] + +\provideversetype{post1}[name=Post1] +\provideversetype{post2}[name=Post2] +\provideversetype{post3}[name=Post3] +\provideversetype{post4}[name=Post4] \provideversetype{intr}[name=In] \provideversetype{out}[name=Out]