From 0d92707366748084f880a4cdac327de972249c89 Mon Sep 17 00:00:00 2001 From: Steve Krulewitz Date: Tue, 7 Jul 2020 20:45:43 -0700 Subject: [PATCH] progress --- bin/build.sh | 14 +++++++------- packets/aircoustic202007.tex | 10 ++++++++++ songs/Commodores/Nightshift.tex | 2 +- songs/Funkadelic/Can You Get To That.tex | 2 +- songs/Morcheeba/Part of the Process.tex | 2 +- songs/Prince/Kiss.tex | 2 +- songs/Tracy Chapman/Give Me One Reason.tex | 2 +- {songs/Prince => tex/emoji}/1F618.pdf | Bin 8 files changed, 22 insertions(+), 12 deletions(-) create mode 100644 packets/aircoustic202007.tex rename {songs/Prince => tex/emoji}/1F618.pdf (100%) diff --git a/bin/build.sh b/bin/build.sh index 96b2b53..e236069 100755 --- a/bin/build.sh +++ b/bin/build.sh @@ -1,7 +1,7 @@ -#!/bin/bash +#!/bin/zsh TEXML_HOME=$HOME/Library/texmf/tex/latex -PDF_JOINER="/System/Library/Automator/Combine PDF Pages.action/Contents/Resources/join.py" +SONGS_HOME=`pwd` function setup_pdflatex { if [ ! -d $TEXML_HOME ]; then @@ -9,14 +9,14 @@ function setup_pdflatex { fi if [ ! -d $TEXML_HOME/tex ]; then - ln -s "`realpath .`" $TEXML_HOME + ln -s $SONGS_HOME/tex $TEXML_HOME fi } function make_pdf { - infile="`realpath "$1"`" + infile="$SONGS_HOME/$1" indir=$(dirname "$1") - pdf_outdir="`realpath "build/pdf"`/${indir#songs/}" + pdf_outdir="$SONGS_HOME/build/pdf/${indir#songs/}" #aux_outdir="`realpath "aux"`/${indir#songs/}" mkdir -p "$pdf_outdir" @@ -42,6 +42,6 @@ function make_packet { } setup_pdflatex -#make_pdf "$1" +make_pdf "$1" -make_packet "packets/pha202006.tex" +#make_packet "packets/aircoustic202007.tex" diff --git a/packets/aircoustic202007.tex b/packets/aircoustic202007.tex new file mode 100644 index 0000000..e500698 --- /dev/null +++ b/packets/aircoustic202007.tex @@ -0,0 +1,10 @@ +\documentclass{article} +\usepackage{grffile} +\usepackage{pdfpages} +\begin{document} +\includepdf[pages=-]{build/pdf/Commodores/Nightshift.pdf} +\includepdf[pages=-]{build/pdf/Funkadelic/Can You Get To That.pdf} +\includepdf[pages=-]{build/pdf/Morcheeba/Part of the Process.pdf} +\includepdf[pages=-]{build/pdf/Prince/Kiss.pdf} +\includepdf[pages=-]{build/pdf/Tracy Chapman/Give Me One Reason.pdf} +\end{document} diff --git a/songs/Commodores/Nightshift.tex b/songs/Commodores/Nightshift.tex index d15567d..fb7ec26 100644 --- a/songs/Commodores/Nightshift.tex +++ b/songs/Commodores/Nightshift.tex @@ -40,7 +40,7 @@ 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 ^{Cadd0}us; -^{G} Your love it ^{G}lifted us, \\ +^{G} Your love it ^{D}lifted us, \\ Higher and higher. \end{verse} diff --git a/songs/Funkadelic/Can You Get To That.tex b/songs/Funkadelic/Can You Get To That.tex index 7421d59..5aaa7cc 100644 --- a/songs/Funkadelic/Can You Get To That.tex +++ b/songs/Funkadelic/Can You Get To That.tex @@ -12,7 +12,7 @@ \begin{verse} I ^{E}once had a life, or rather, ^{A}life had me \\ -I was ^{E}one among many or at ^{A}least I seemed to be \\ +I was ^{E}one among many, or at ^{A}least I seemed to be \\ Well, I ^{E}read an old quotation in a ^{A}book just yesterday \\ Said "Gonna ^{E}reap just what you sow, \\ The debts you ^{A}make you have to pay." Can you get to that? diff --git a/songs/Morcheeba/Part of the Process.tex b/songs/Morcheeba/Part of the Process.tex index c6bc5d5..ccf85a2 100644 --- a/songs/Morcheeba/Part of the Process.tex +++ b/songs/Morcheeba/Part of the Process.tex @@ -7,7 +7,7 @@ |_{Dm} & |_{Dm} & |_{Dm} & |_{Dm} & | \\ \end{tabular} \end{intro} - \begin{verse} + \begin{verse} ^{Dm}Angry faces, ^{Dm}cursing loud, ^{Dm}changing places, ^{Dm}falling proud \\ ^{C} Behind the bomb, ^{G} no one cares, ^{Dm}time is money, ^{Dm}we're taught to tear \end{verse} diff --git a/songs/Prince/Kiss.tex b/songs/Prince/Kiss.tex index 2c20461..6d81841 100644 --- a/songs/Prince/Kiss.tex +++ b/songs/Prince/Kiss.tex @@ -2,7 +2,7 @@ \usepackage{graphicx} \usepackage[export]{adjustbox} -\newcommand{\kiss}{\includegraphics[width=1em,valign=t,raise=-0.1em]{1F618.pdf}} +\newcommand{\kiss}{\includegraphics[width=1em,valign=t,raise=-0.1em]{emoji/1F618.pdf}} \begin{document} \begin{song}[transpose-capo=true]{title={Kiss}, band={Prince}, year={1986}, key={A}} diff --git a/songs/Tracy Chapman/Give Me One Reason.tex b/songs/Tracy Chapman/Give Me One Reason.tex index 96277a7..dc4dec3 100644 --- a/songs/Tracy Chapman/Give Me One Reason.tex +++ b/songs/Tracy Chapman/Give Me One Reason.tex @@ -52,7 +52,7 @@ wasting my precious ^{F#}energy ^{F#7} ^{F#} \begin{verse} ^{F#}Baby, just give me one reason, ^{B} give me ^{C#7}just one reason ^{F#}why ^{F#7} ^{F#} \\ ^{B}Baby, just give me one reason, oh, ^{B7} give me ^{C#7}just one reason why I should ^{F#}stay ^{F#7} ^{F#} \\ -Said I ^{C#7}told you that I loved you ^{B} +Said I ^{C#7}told you that I loved you ^{B*} and there ain't no more to ^{F#}say ^{F#7} ^{B} ^{B7} ^{F#} \end{verse} diff --git a/songs/Prince/1F618.pdf b/tex/emoji/1F618.pdf similarity index 100% rename from songs/Prince/1F618.pdf rename to tex/emoji/1F618.pdf