ramatevish/songs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rem fixes

Browse Source
This commit is contained in:
Steve Krulewitz 2022-06-01 11:15:55 -07:00
parent f6dd2fa612
commit ffe3c15509
7 changed files with 42 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/build.sh
View File

@ -48,4 +48,4 @@ function make_packet {
setup_pdflatex setup_pdflatex
#make_pdf "$1" #make_pdf "$1"
make_packet "packets/aircoustic202205.tex" make_packet "packets/rem.tex"

2
songs/R.E.M./Driver 8 (chords).tex
View File

@ -1,7 +1,7 @@
\documentclass{skrul-leadsheet-chords}[20pt] \documentclass{skrul-leadsheet-chords}[20pt]
\begin{document} \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} \begin{intr}
\instruction{8 bar guitar riff intro} \instruction{8 bar guitar riff intro}

4
songs/R.E.M./Everybody Hurts (chords).tex
View File

@ -19,7 +19,7 @@
\begin{c1} \begin{c1}
\chordtable{ \chordtable{
\xb{Em} & \xb{A} & \xb{Em} & \xb{A} & & \\ \xb{Em} & \xb{A} & \xb{Em} & \xb{A} & & \\
\xb{Em} & \xb{A}[\textbf{..}$\wedge$] & & & & \\ \xb{Em} & \xb{A}[\beats{2}\choke] & & & & \\
} }
\end{c1} \end{c1}
@ -41,7 +41,7 @@
\chordtable{ \chordtable{
\xb{F#} & \xb{Bm} & \xb{F#} & \xb{Bm} & & \\ \xb{F#} & \xb{Bm} & \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} \end{b1}

12
songs/R.E.M./Fall On Me (chords).tex
View File

@ -52,10 +52,6 @@
} }
\end{pre3} \end{pre3}
\begin{c2}
\instruction{Repeat Chorus}
\end{c2}
\begin{c3} \begin{c3}
\instruction{Repeat Chorus} \instruction{Repeat Chorus}
\end{c3} \end{c3}
@ -64,6 +60,14 @@
\instruction{Repeat Chorus} \instruction{Repeat Chorus}
\end{c4} \end{c4}
\begin{c5}
\instruction{Repeat Chorus}
\end{c5}
\begin{c6}
\instruction{Repeat Chorus}
\end{c6}
\begin{out} \begin{out}
\chordtable{ \chordtable{
\xb{Am}[\hold] & & & & & \\ \xb{Am}[\hold] & & & & & \\

2
songs/R.E.M./Radio Free Europe (chords).tex
View File

@ -1,7 +1,7 @@
\documentclass{skrul-leadsheet-chords}[20pt] \documentclass{skrul-leadsheet-chords}[20pt]
\begin{document} \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} \begin{v1}
\chordtable{ \chordtable{

2
songs/R.E.M./World Leader Pretend (chords).tex
View File

@ -1,7 +1,7 @@
\documentclass{skrul-leadsheet-chords}[20pt] \documentclass{skrul-leadsheet-chords}[20pt]
\begin{document} \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} \begin{intr}
\chordtable{ \chordtable{

45
tex/skrul-leadsheet-chords.cls
View File

@ -1,4 +1,4 @@
\ProvidesClass{skrul-leadsheet} \ProvidesClass{skrul-leadsheet-chords}
\LoadClassWithOptions{scrartcl} \LoadClassWithOptions{scrartcl}
\usepackage{savesym} \usepackage{savesym}
@ -29,6 +29,7 @@
\usepackage{xparse} \usepackage{xparse}
\usepackage{adjustbox} \usepackage{adjustbox}
\usepackage{amssymb} \usepackage{amssymb}
\usepackage{array}
\definesongproperty{bpm} \definesongproperty{bpm}
\definesongproperty{meter} \definesongproperty{meter}
@ -146,42 +147,44 @@
}} }}
\newcommand\choke{$\wedge$} \newcommand\choke{$\wedge$}
\newcommand\push{>}
\newcommand\hold{$\Diamond$}
\makeatletter \makeatletter
\newcommand\cellwidth{\TX@col@width} \newcommand\cellwidth{\TX@col@width}
\makeatother \makeatother
\NewDocumentCommand \xb { m O{\space} }{{ \NewDocumentCommand \xb { m O{\space} }{{
\smash{% %\smash{%
\raisebox{10pt}{% \raisebox{1ex}{%
\begin{tabular}{@{}c} \begin{tabular}{@{}c}
#2 \\ #2 \\[-0.3em]
\writechord{#1} \\ \writechord{#1} \\
\end{tabular} \end{tabular}
} }
} % }
}} }}
\NewDocumentCommand \xbb { m O{\space} m O{\space} }{{ \NewDocumentCommand \xbb { m O{\space} m O{\space} }{{
\smash{% %\smash{%
\raisebox{10pt}{% \raisebox{1ex}{%
\begin{tabular}{@{}cc@{}} \begin{tabular}{@{}cc@{}}
#2 & #4 \\ #2 & #4 \\[-0.3em]
\writechord{#1} & \writechord{#3} \\ \hline \writechord{#1} & \writechord{#3} \\ \hline
\end{tabular} \end{tabular}
} }
} % }
}} }}
\NewDocumentCommand \xbbb { m O{\space} m O{\space} m O{\space} }{{ \NewDocumentCommand \xbbb { m O{\space} m O{\space} m O{\space} }{{
\smash{% %\smash{%
\raisebox{10pt}{% \raisebox{1ex}{%
\begin{tabular}{@{}ccc@{}} \begin{tabular}{@{}ccc@{}}
#2 & #4 & #6 \\ #2 & #4 & #6 \\[-0.3em]
\writechord{#1} & \writechord{#3} & \writechord{#5} \\ \hline \writechord{#1} & \writechord{#3} & \writechord{#5} \\ \hline
\end{tabular} \end{tabular}
} }
} % }
}} }}
\NewDocumentCommand \xbbbb { m o m o m o m o }{{ \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 % Globally smashes the row height of all tabularx rows. However, this
% messes with the baseline of the first row so compensate for it later. % messes with the baseline of the first row so compensate for it later.
\setlength{\extrarowheight}{-1.5ex} %\setlength{\extrarowheight}{-1em}
\NewDocumentCommand \chordtable { m }{{ \NewDocumentCommand \chordtable { m }{{
\adjustbox{valign=t}{ \adjustbox{valign=t}{
\begin{tabularx}{\textwidth}{XXXXXX} \begin{tabularx}{\textwidth}{XXXXXX}
\\[0.4ex] % row height compensation % \\[0.4ex] % row height compensation
#1 #1
\end{tabularx} \end{tabularx}
} }
\vspace*{-4ex} % remote some extra padding on bottom? % \vspace*{4ex} % remote some extra padding on bottom?
}} }
}
\ExplSyntaxOff \ExplSyntaxOff
@ -250,6 +254,13 @@
\provideversetype{pre1}[name=Pre1] \provideversetype{pre1}[name=Pre1]
\provideversetype{pre2}[name=Pre2] \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{intr}[name=In]
\provideversetype{out}[name=Out] \provideversetype{out}[name=Out]