diff --git a/.envrc b/.envrc
new file mode 100644
index 0000000..3550a30
--- /dev/null
+++ b/.envrc
@@ -0,0 +1 @@
+use flake
diff --git a/.gitignore b/.gitignore
index 05506b5..0061f36 100755
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,5 @@
*~
-out/
+.DS_Store
build/
tmp/
-midi/
-music/
-.DS_Store
+.direnv/
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
deleted file mode 100644
index fcb276c..0000000
--- a/.gitlab-ci.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-build:
- image: thallian/latex-builder
- script:
- - make
- artifacts:
- paths:
- - build/*
- expire_in: 1 week
diff --git a/Makefile b/Makefile
index dac4332..4265be2 100644
--- a/Makefile
+++ b/Makefile
@@ -3,99 +3,49 @@ WORKING_DIR := $(patsubst %/,%,$(dir $(mkfile_path)))
BOOKNAME=singalongs
SRC_DIR=src
BUILD_DIR=build
-TMP_DIR=tmp
SONG_DIR=${SRC_DIR}/songs
-BUILD_BOOK_DIR=${BUILD_DIR}/books
-TMP_BOOK_DIR=${TMP_DIR}/books
BUILD_SONG_DIR=${BUILD_DIR}/songs
-TMP_SONG_DIR=${TMP_DIR}/songs
-BUILD_MIDI_DIR=${BUILD_DIR}/midi
-TMP_MIDI_DIR=${TMP_DIR}/midi
-BUILD_OPUS_DIR=${BUILD_DIR}/opus
+BUILD_BOOK_DIR=${BUILD_DIR}/book
+BOOK_FULL=$(BUILD_BOOK_DIR)/full.pdf
+BOOKLET=$(BUILD_BOOK_DIR)/booklet.pdf
+GENERATED_SONGS=$(BUILD_DIR)/songs.typ
+TYP_FILES=$(wildcard ${SONG_DIR}/*.typ)
LY_FILES=$(wildcard ${SONG_DIR}/*.ly)
LY_PDFS=$(patsubst %.ly,${BUILD_SONG_DIR}/%.pdf,$(notdir ${LY_FILES}))
-LY_TMP_PDFS=$(patsubst %.ly,${TMP_SONG_DIR}/%.pdf,$(notdir ${LY_FILES}))
-LY_MIDIS=$(patsubst %.ly,${BUILD_MIDI_DIR}/%.midi,$(notdir ${LY_FILES}))
-LY_TMP_MIDIS=$(patsubst %.ly,${TMP_MIDI_DIR}/%.midi,$(notdir ${LY_FILES}))
-LY_OPUS=$(patsubst %.ly,${BUILD_OPUS_DIR}/%.opus,$(notdir ${LY_FILES}))
+LY_SVGS=$(patsubst %.ly,${BUILD_SONG_DIR}/%.svg,$(notdir ${LY_FILES}))
-.PHONY: book songs midi opus clean directories all
+.PHONY: clean directories all
.DEFAULT_GOAL := all
-directories: ${BUILD_DIR} ${BUILD_BOOK_DIR} ${TMP_BOOK_DIR} ${BUILD_SONG_DIR} ${BUILD_MIDI_DIR} ${TMP_DIR} ${TMP_SONG_DIR} ${TMP_MIDI_DIR} ${BUILD_OPUS_DIR}
+directories: $(BUILD_DIR) $(BUILD_SONG_DIR) $(BUILD_BOOK_DIR)
-${BUILD_DIR}:
- mkdir -p ${BUILD_DIR}
+$(BUILD_DIR):
+ mkdir -p $(BUILD_DIR)
-${BUILD_BOOK_DIR}:
- mkdir -p ${BUILD_BOOK_DIR}
+$(BUILD_SONG_DIR):
+ mkdir -p $(BUILD_SONG_DIR)
-${BUILD_SONG_DIR}:
- mkdir -p ${BUILD_SONG_DIR}
+$(BUILD_BOOK_DIR):
+ mkdir -p $(BUILD_BOOK_DIR)
-${BUILD_MIDI_DIR}:
- mkdir -p ${BUILD_MIDI_DIR}
+$(GENERATED_SONGS): $(LY_FILES) $(TYP_FILES)
+ bin/generate
-${TMP_DIR}:
- mkdir -p ${TMP_DIR}
+$(BUILD_SONG_DIR)/%.pdf: $(SONG_DIR)/%.ly $(SRC_DIR)/setup.ly
+ lilypond --pdf -o $(basename $@) $<
+ pdfcrop $@ $@
-${TMP_BOOK_DIR}:
- mkdir -p ${TMP_BOOK_DIR}
+$(BUILD_SONG_DIR)/%.svg: $(BUILD_SONG_DIR)/%.pdf
+ pdftocairo -svg $< $@
-${TMP_SONG_DIR}:
- mkdir -p ${TMP_SONG_DIR}
+$(BOOK_FULL): $(TYP_FILES) $(LY_SVGS) $(GENERATED_SONGS) $(SRC_DIR)/singalongs.typ $(SRC_DIR)/song.typ
+ typst compile --root $(WORKING_DIR) $(SRC_DIR)/singalongs.typ $@
-${TMP_MIDI_DIR}:
- mkdir -p ${TMP_MIDI_DIR}
+$(BOOKLET): $(BOOK_FULL)
+ pdfbook2 --short-edge $<
-${BUILD_OPUS_DIR}:
- mkdir -p ${BUILD_OPUS_DIR}
-
-${TMP_SONG_DIR}/%.pdf: ${SONG_DIR}/%.ly ${SONG_DIR}/%.tex
- cd ${SRC_DIR} && lualatex --jobname='$(notdir $(basename $@))' --output-directory=${WORKING_DIR}/${TMP_SONG_DIR} --shell-escape ${WORKING_DIR}/${SRC_DIR}/song.tex ${WORKING_DIR}/${SONG_DIR}/$(notdir $(basename $@)).ly ${WORKING_DIR}/${SONG_DIR}/$(notdir $(basename $@)).tex
- rm -r ${SRC_DIR}/tmp-ly
-
-${BUILD_MIDI_DIR}/%.midi: ${TMP_MIDI_DIR}/%-1.midi
- cp $< $@
-
-${TMP_MIDI_DIR}/%-1.midi: ${SONG_DIR}/%.ly
- lilypond --output=${TMP_MIDI_DIR} ${WORKING_DIR}/$<
-
-${BUILD_OPUS_DIR}/%.opus: ${BUILD_MIDI_DIR}/%.midi
- timidity $< -Ow -o - | opusenc - $@
-
-${TMP_BOOK_DIR}/%.pdf: ${SRC_DIR}/%.tex ${SRC_DIR}/images/title.png
- latexmk -cd -lualatex -e '$$lualatex=q/lualatex %O -shell-escape %S/' -output-directory=${WORKING_DIR}/${TMP_BOOK_DIR} $<
- rm -r ${SRC_DIR}/tmp-ly
-
-${TMP_BOOK_DIR}/%-folio.pdf: ${TMP_BOOK_DIR}/%.pdf
- cd ${TMP_BOOK_DIR} && \
- ../../bin/makebook -v -t folio -i $(notdir $<) -o $(notdir $@)
-
-#long edge binding
-${TMP_BOOK_DIR}/%-quarto.pdf: ${TMP_BOOK_DIR}/%.pdf
- cd ${TMP_BOOK_DIR} && \
- ../../bin/makebook -v -t quarto -i $(notdir $<) -o $(notdir $@)
-
-${TMP_BOOK_DIR}/%-sexto.pdf: ${TMP_BOOK_DIR}/%.pdf
- cd ${TMP_BOOK_DIR} && \
- ../../bin/makebook -v -t sexto -i $(notdir $<) -o $(notdir $@)
-
-#short edge binding
-${TMP_BOOK_DIR}/%-octavo.pdf: ${TMP_BOOK_DIR}/%.pdf
- cd ${TMP_BOOK_DIR} && \
- ../../bin/makebook -v -t octavo -i $(notdir $<) -o $(notdir $@)
-
-${BUILD_DIR}/%.pdf: ${TMP_DIR}/%.pdf
- cp $< $@
-
-book: directories ${BUILD_BOOK_DIR}/${BOOKNAME}.pdf ${BUILD_BOOK_DIR}/${BOOKNAME}-folio.pdf ${BUILD_BOOK_DIR}/${BOOKNAME}-quarto.pdf ${BUILD_BOOK_DIR}/${BOOKNAME}-sexto.pdf ${BUILD_BOOK_DIR}/${BOOKNAME}-octavo.pdf ${LY_FILES}
-songs: directories ${LY_PDFS}
-midi: directories ${LY_MIDIS}
-opus: directories ${LY_OPUS}
-all: book songs midi opus
+all: directories $(BOOK_FULL) $(BOOKLET) $(LY_SVGS) $(GENERATED_SONGS)
clean:
- rm -rf ${BUILD_DIR}
- rm -rf ${TMP_DIR}
+ rm -rf $(BUILD_DIR)
diff --git a/bin/generate b/bin/generate
new file mode 100755
index 0000000..e0365e4
--- /dev/null
+++ b/bin/generate
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+echo -en "#import \"/src/song.typ\": * \n" >build/songs.typ
+
+for t in src/songs/*.typ; do
+ base="$(basename $t .typ)"
+ title="$(grep -oP '^\W*title\W*=\W*"\K.*(?="\W*$$)' src/songs/$base.ly)"
+
+ echo -en "#song(\"$title\", \"$base\")\n" >>build/songs.typ
+done
diff --git a/bin/makebook b/bin/makebook
deleted file mode 100755
index 93913e0..0000000
--- a/bin/makebook
+++ /dev/null
@@ -1,655 +0,0 @@
-#!/bin/sh
-# +AMDG This document was begun just before Christmas,
-# 2010, and it is humbly dedicated to St. Wulfric, patron of
-# bookbinders, and to the Immaculate Heart of Mary for their
-# prayers, and to the Sacred Heart of Jesus for His mercy.
-#
-#**********************************************************#
-# makebook #
-# written by Donald P. Goodman III #
-# Copyright (C) 2011 #
-# #
-# Impose pdf pages for binding #
-#**********************************************************#
-#
-# This program is free software: you can redistribute it
-# and/or modify it under the terms of the GNU General Public
-# License as published by the Free Software Foundation,
-# either version 3 of the License, or (at your option) any
-# later version.
-#
-# This program is distributed in the hope that it will be
-# useful, but WITHOUT ANY WARRANTY; without even the implied
-# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-# PURPOSE. See the GNU General Public License for more
-# details.
-#
-# For a full copy of the GNU General Public License, see
-# .
-#
-#**********************************************************#
-# begin the code #
-#**********************************************************#
-# make script more portable and secure
-PATH=/bin:/usr/bin:/usr/local/bin ; export PATH
-umask 033
-# define our revision number variable for rcs
-REVISION="2.1"
-# define error codes
-E_WRONG_ARGS=64 # too many or few args
-E_BAD_SIG_TYPE=65 # invalid type of signature
-E_BAD_UNIT=66 # unrecognized dimension unit used
-E_BAD_FILENAME=67 # filename contains insecure chars,
- # or doesn't exist
-E_BAD_OPT=68 # bad command-line flag requested
-E_NO_PROG=69 # missing a required program
-# define usage variables
-VERBOSE=0 # 0 if not verbose, 1 if -v
-SIG_TYPE="folio" # type of section desired
-PAGES_PER_SIG=4 # number of pages per signature
-SECT_TYPE=1 # number of signatures per section
-NUP="2x1" # default format of signatures
-FRONT_FAVOR=0 # favor front for blanks; off by default
-# define various variables to be zero by default
-TGT_PAGE_WIDTH=0
-TGT_PAGE_HEIGHT=0
-HORIZ_DELTA=0
-VERT_DELTA=0
-HORIZ_OFFSET=0
-VERT_OFFSET=0
-SCALE=1
-# make sure user has the right programs installed, and die
-# horribly if not
-command -v od >/dev/null 2>&1 ||
- { echo >&2 "makebook: error: requires od, but it's not installed";
- exit $E_NO_PROG;
- }
-command -v pdflatex >/dev/null 2>&1 ||
- { echo >&2 "makebook: error: requires pdflatex, but it's not installed";
- exit $E_NO_PROG;
- }
-command -v pdfinfo >/dev/null 2>&1 ||
- { echo >&2 "makebook: error: requires pdfinfo, but it's not installed";
- exit $E_NO_PROG;
- }
-command -v pdftk >/dev/null 2>&1 ||
- { echo >&2 "makebook: error: requires pdftk, but it's not installed";
- exit $E_NO_PROG;
- }
-command -v dc >/dev/null 2>&1 ||
- { echo >&2 "makebook: error: requires dc, but it's not installed";
- exit $E_NO_PROG;
- }
-command -v bc >/dev/null 2>&1 ||
- { echo >&2 "makebook: error: requires bc, but it's not installed";
- exit $E_NO_PROG;
- }
-
-# print the version information and exit successfully
-versionfunc ()
-{
- echo "makebook v${REVISION}. Copyright (C) 2011, Donald P."
- echo "Goodman III."
- echo "This program comes with ABSOLUTELY NO WARRANTY."
- echo "This is free software, and you are welcome to "
- echo "redistribute it under certain conditions; see "
- echo "the GNU GPL v3 for details."
- exit 0
-}
-
-# print the online help and exit successfully
-helpfunc ()
-{
-cat <&2
- exit $E_BAD_UNIT
- fi
- if [ `expr match "$1" '.*\(in\)'` ]
- then
- OPTARG=`echo "scale=0; ${1%in} * 72" | bc`
- OPTARG=${OPTARG%.*}
- elif [ `expr match "$1" '.*\(cm\)'` ]
- then
- OPTARG=`echo "scale=0; ${1%cm} * 28.3464567" | bc`
- OPTARG=${OPTARG%.*}
- elif [ `expr match "$1" '.*\(mm\)'` ]
- then
- OPTARG=`echo "scale=0; ${1%mm} * 2.83464567" | bc`
- OPTARG=${OPTARG%.*}
- elif [ `expr match "$1" '.*\(pt\)'` ]
- then
- OPTARG=`echo "scale=0; ${1%pt} / 1.00375" | bc`
- OPTARG=${OPTARG%.*}
- elif [ `expr match "$1" '.*\(pc\)'` ]
- then
- OPTARG=`echo "scale=0; (${1%pc} / 1.00375) * 12" | bc`
- OPTARG=${OPTARG%.*}
- elif [ `expr match "$1" '.*\(bp\)'` ]
- then
- OPTARG=${1%bp}
- else
- OPTARG=${1%.*}
- fi
-}
-# define a for dealing with section types; convert ()
-# to words; e.g., "4to" to "quarto"
-typearg ()
-{
- if [ "$1" = "4to" ] || [ "$1" = "quarto" ]
- then
- PAGES_PER_SIG=8
- NUP="2x2"
- OPTARG="quarto"
- elif [ "$1" = "2o" ] || [ "$1" = "folio" ]
- then
- PAGES_PER_SIG=4
- NUP="2x1"
- OPTARG="folio"
- elif [ "$1" = "8vo" ] || [ "$1" = "octavo" ]
- then
- PAGES_PER_SIG=16
- NUP="4x2"
- OPTARG="octavo"
- elif [ "$1" = "6to" ] || [ "$1" = "sexto" ]
- then
- PAGES_PER_SIG=12
- NUP="2x3"
- OPTARG="sexto"
- elif [ "$1" = "12mo" ] || [ "$1" = "duodecimo" ]
- then
- PAGES_PER_SIG=24
- NUP="4x3"
- OPTARG="duodecimo"
- else
- echo "ERROR: signature type \"$1\" not recognized." >&2
- exit $E_BAD_SIG_TYPE
- fi
-}
-
-# clean up filename argument
-filefunc ()
-{
- err_message="ERROR: bad characters in file name."
- if [ `echo "$1" | grep '\?'` ]
- then
- echo "$err_message" >&2
- exit $E_BAD_FILENAME
- elif [ `echo "$1" | grep '\*'` ]
- then
- echo "$err_message" >&2
- exit $E_BAD_FILENAME
- elif [ `echo "$1" | grep '"'` ]
- then
- echo "$err_message" >&2
- exit $E_BAD_FILENAME
- elif [ `echo "$1" | grep ';'` ]
- then
- echo "$err_message" >&2
- exit $E_BAD_FILENAME
- elif [ `echo "$1" | grep '[\\]'` ]
- then
- echo "$err_message" >&2
- exit $E_BAD_FILENAME
- elif [ `echo "$1" | grep ' '` ]
- then
- echo "$err_message" >&2
- exit $E_BAD_FILENAME
- fi
- OPTARG=`basename $1`
-}
-
-# now identify and parse the options
-while getopts "Vhvfn:t:H:w:d:D:m:M:s:i:o:" Option
-do
- case $Option in
- V ) versionfunc;;
- h ) helpfunc;;
- v ) VERBOSE=1;;
- f ) FRONT_FAVOR=1;;
- n ) SECT_TYPE=$OPTARG;;
- t ) typearg "$OPTARG"; SIG_TYPE=$OPTARG;;
- H ) unitarg "$OPTARG"; TGT_PAGE_HEIGHT=$OPTARG;;
- w ) unitarg "$OPTARG"; TGT_PAGE_WIDTH=$OPTARG;;
- d ) unitarg "$OPTARG"; HORIZ_DELTA=$OPTARG;;
- D ) unitarg "$OPTARG"; VERT_DELTA=$OPTARG;;
- m ) unitarg "$OPTARG"; HORIZ_OFFSET=$OPTARG;;
- M ) unitarg "$OPTARG"; VERT_OFFSET=$OPTARG;;
- s ) SCALE=$OPTARG;;
- i ) filefunc "$OPTARG"; FILE_NAME=$OPTARG;;
- o ) filefunc "$OPTARG"; OUTFILE_NAME=$OPTARG;;
- * ) echo "ERROR: unknown flag \
- \"$Option\"." >&2; exit $E_BAD_OPT;;
- esac
-done
-
-# make random file name to use for input
-NEW_FILE_NAME="tmp_`od -An -N4 -t uL /dev/urandom | tr -d '\ '`.pdf"
-# if input file specified, use file; if not, read stdin
-if [ "$FILE_NAME" ]
-then
- cp "$FILE_NAME" "$NEW_FILE_NAME"
-else
- FILE_NAME="book.pdf"
- cat /dev/stdin > "$NEW_FILE_NAME"
-fi
-# declare holder variable for pdftk
-tmp_name="tmp_`od -An -N4 -t uL /dev/urandom | tr -d '\ '`.pdf"
-# if output file specified, use that; if not, name it; if
-# "-", use stdout
-[ "$OUTFILE_NAME" ] || OUTFILE_NAME="sigs_$FILE_NAME"
-if [ "$OUTFILE_NAME" = "stdout" ]
-then
- VERBOSE=0
-fi
-# print our introduction message
-if [ $VERBOSE -eq 1 ]
-then
- echo "makebook. Copyright (C) 2011, Donald P. Goodman III."
- echo "This program comes with ABSOLUTELY NO WARRANTY."
- echo "This is free software, and you are welcome to "
- echo "redistribute it under certain conditions; see "
- echo "the GNU GPL v3 for details."
- echo "IMPOSING pdf pages onto \"$OUTFILE_NAME\"..."
-fi
-
-# get some information about our source document
-NUM_PAGES=`pdfinfo "$NEW_FILE_NAME" | awk '/Pages:/ {print $2}'`;
-SRC_PAGE_WIDTH=`pdfinfo "$NEW_FILE_NAME" | awk '/Page\ size:/ {print $3}'`;
-SRC_PAGE_HEIGHT=`pdfinfo "$NEW_FILE_NAME" | awk '/Page\ size:/ {print $5}'`;
-# find the number of pages we'll have per signature
-PAGES_PER_SIG=$(dc -e "$PAGES_PER_SIG $SECT_TYPE * p")
-# determine if extra pages will be necessary
-NUM_BLANKS=`expr $NUM_PAGES % $PAGES_PER_SIG`
-if [ $NUM_BLANKS -ne 0 ]
-then
- NUM_BLANKS=`expr $PAGES_PER_SIG - $NUM_BLANKS`
-fi
-tmp=`expr $NUM_PAGES + $NUM_BLANKS`
-NUM_SIGS=`expr $tmp / $PAGES_PER_SIG`
-
-# if extra pages are needed, generate blank page
-if [ $NUM_BLANKS -gt 0 ] && [ ! -e "./blank.pdf" ]
-then
- echo "\documentclass{article}" > blank.tex
- echo '\\thispagestyle{empty}' >> blank.tex
- echo "\usepackage[paperwidth=${SRC_PAGE_WIDTH}bp,paperheight="${SRC_PAGE_HEIGHT}bp"]{geometry}" >> blank.tex
- echo '\\begin{document}' >> blank.tex
- echo "\quad \\\\end{document}" >> blank.tex
- if [ $VERBOSE -eq 1 ]
- then
- echo "CREATING blank page to fill sections...";
- fi
- pdflatex blank.tex > /dev/null 2&>1
-fi
-# now insert blank pages as needed, preferring the back for
-# odd numbers by default, front if stated
-if [ $NUM_BLANKS -eq 1 ]
-then
- if [ $VERBOSE -eq 1 ]
- then
- echo "INSERTING one blank page..."
- fi
- if [ $FRONT_FAVOR -eq 0 ]
- then
- pdftk A="$NEW_FILE_NAME" B=blank.pdf cat A1-end \
- B1 output "$tmp_name"
- else
- pdftk A="$NEW_FILE_NAME" B=blank.pdf cat B1 \
- A1-end output "$tmp_name"
- fi
- mv "$tmp_name" "$NEW_FILE_NAME"
-else
-# tmp=`expr $NUM_BLANKS / 2`
-# START_BLANKS=${tmp/.*}
- START_BLANKS=`expr $NUM_BLANKS / 2`
- END_BLANKS=`expr $NUM_BLANKS - $START_BLANKS`
- if [ `expr $START_BLANKS % 2` -ne 0 ]; then : else
- START_BLANKS=`expr $START_BLANKS - 1`
- END_BLANKS=`expr $END_BLANKS + 1 `
- fi
- if [ $FRONT_FAVOR -eq 1 ]
- then
- tmp=$START_BLANKS
- START_BLANKS=$END_BLANKS
- END_BLANKS=$tmp
- if [ `expr $START_BLANKS % 2` -ne 0 ]; then : else
- START_BLANKS=`expr $START_BLANKS - 1`
- END_BLANKS=`expr $END_BLANKS + 1 `
- fi
- fi
- if [ $VERBOSE -eq 1 ]
- then
- echo "INSERTING $START_BLANKS blank pages at start..."
- echo "INSERTING $END_BLANKS blank pages at end...";
- fi
- i=0
- while [ $i -lt $START_BLANKS ]
- do
- pdftk A="$NEW_FILE_NAME" B=blank.pdf cat B1 A1-end output "$tmp_name"
- mv "$tmp_name" "$NEW_FILE_NAME"
- i=`expr $i + 1`
- done
- i=0
- while [ $i -lt $END_BLANKS ]
- do
- pdftk A="$NEW_FILE_NAME" B=blank.pdf cat A1-end B1 output "$tmp_name"
- mv "$tmp_name" "$NEW_FILE_NAME"
- i=`expr $i + 1`
- done
-fi
-# begin the imposing, announcing if appropriate
-tmp=`expr $NUM_PAGES + $NUM_BLANKS`
-if [ $VERBOSE -eq 1 ]
-then
- echo "IMPOSING $NUM_PAGES pages ($tmp with blanks) on
- $(dc -e "$NUM_SIGS $SECT_TYPE * p") signature(s) gathered in
- sections of $SECT_TYPE signature(s) each...";
-fi
-# arrange the pages for impression on signatures
-i=1
-j=1
-if [ $VERBOSE -eq 1 ]
-then
- echo "REARRANGING pages...";
-fi
-while [ $j -le $NUM_SIGS ]
-do
- if [ "$SIG_TYPE" = "quarto" ]
- then
- # determine size of target page
- if [ $TGT_PAGE_HEIGHT -eq 0 ]
- then
- TGT_PAGE_HEIGHT=$(dc -e "$SRC_PAGE_HEIGHT 2 * p")
- fi
- if [ $TGT_PAGE_WIDTH -eq 0 ]
- then
- TGT_PAGE_WIDTH=$(dc -e "$SRC_PAGE_WIDTH 2 * p")
- fi
- # do the rearranging
- k=$i; n=1; total=$(dc -e "$SECT_TYPE 8 * p"); m=$total
- while [ $n -le $SECT_TYPE ]
- do
- pdftk "$NEW_FILE_NAME" cat `expr $k + $m - 1` $k \
- `expr $k + $m - 4`south `expr $k + 3`south \
- `expr $k + 1` `expr $k + $m - 2` `expr $k + 2`south \
- `expr $k + $m - 3`south output ${tmp_name%.pdf}_$n;
- k=`expr $k + 4`; n=`expr $n + 1`; m=`expr $m - 8`
- done
- n=1
- while [ `expr $n + 0` -le $SECT_TYPE ]
- do
- if [ ! -e "$tmp_name" ]
- then
- pdftk A=${tmp_name%.pdf}_$n cat A1-end \
- output "$tmp_name"
- else
- pdftk A=$tmp_name B=${tmp_name%.pdf}_`expr $n` \
- cat A1-end B1-end output ${tmp_name}_tmp
- mv ${tmp_name}_tmp "$tmp_name"
- fi
- n=`expr $n + 1`
- done
- if [ $VERBOSE -eq 1 ]
- then
- echo "REARRANGING section number $j..."
- fi
- j=`expr $j + 1`;
- i=`expr $i + $total`;
- elif [ "$SIG_TYPE" = "folio" ]
- then
- # determine size of target page
- if [ 1 -eq "$(echo "${TGT_PAGE_HEIGHT} == 0" | bc)" ]
- then
- TGT_PAGE_HEIGHT=$(dc -e "$SRC_PAGE_HEIGHT 1 * p")
- fi
- if [ 1 -eq "$(echo "${TGT_PAGE_WIDTH} == 0" | bc)" ]
- then
- TGT_PAGE_WIDTH=$(dc -e "$SRC_PAGE_WIDTH 2 * p")
- fi
- # do the rearranging
- k=$i; n=1; total=$(dc -e "$SECT_TYPE 4 * p"); m=$total
- while [ $n -le $SECT_TYPE ]
- do
- pdftk "$NEW_FILE_NAME" cat `expr $k + $m - 1` \
- `expr $k` `expr $k + 1` `expr $k + $m - 2` \
- output ${tmp_name%.pdf}_$n;
- k=`expr $k + 2`; n=`expr $n + 1`; m=`expr $m - 4`
- done
- n=1
- while [ `expr $n + 0` -le $SECT_TYPE ]
- do
- if [ ! -e "$tmp_name" ]
- then
- pdftk A=${tmp_name%.pdf}_$n cat A1-end \
- output "$tmp_name"
- else
- pdftk A="$tmp_name" B=${tmp_name%.pdf}_`expr $n` \
- cat A1-end B1-end output ${tmp_name}_tmp
- mv ${tmp_name}_tmp "$tmp_name"
- fi
- n=`expr $n + 1`
- done
- if [ $VERBOSE -eq 1 ]
- then
- echo "REARRANGING section number $j..."
- fi
- j=`expr $j + 1`;
- i=`expr $i + $total`;
- elif [ "$SIG_TYPE" = "octavo" ]
- then
- # determine target page dimensions
- if [ 1 -eq "$(echo "${TGT_PAGE_HEIGHT} == 0" | bc)" ]
- then
- TGT_PAGE_HEIGHT=$(dc -e "$SRC_PAGE_HEIGHT 2 * p")
- fi
- if [ 1 -eq "$(echo "${TGT_PAGE_WIDTH} == 0" | bc)" ]
- then
- TGT_PAGE_WIDTH=$(dc -e "$SRC_PAGE_WIDTH 4 * p")
- fi
- # do the rearranging
- k=$i; n=1; total=$(dc -e "$SECT_TYPE 16 * p"); m=$total
- while [ $n -le $SECT_TYPE ]
- do
- pdftk "$NEW_FILE_NAME" cat `expr $k + 3` \
- `expr $k + $m - 4` `expr $k + $m - 1` $k \
- `expr $k + 4`south `expr $k + $m - 5`south \
- `expr $k + $m - 8`south `expr $k + 7`south \
- `expr $k + 1` `expr $k + $m - 2` `expr $k + $m - 3` \
- `expr $k + 2` `expr $k + 6`south `expr $k + $m - 7`south \
- `expr $k + $m - 6`south `expr $k + 5`south \
- output ${tmp_name%.pdf}_$n;
- k=`expr $k + 8`; n=`expr $n + 1`; m=`expr $m - 16`
- done
- n=1
- while [ `expr $n + 0` -le $SECT_TYPE ]
- do
- if [ ! -e "$tmp_name" ]
- then
- pdftk A=${tmp_name%.pdf}_$n cat A1-end \
- output "$tmp_name"
- else
- pdftk A="$tmp_name" B=${tmp_name%.pdf}_`expr $n` \
- cat A1-end B1-end output ${tmp_name}_tmp
- mv ${tmp_name}_tmp "$tmp_name"
- fi
- n=`expr $n + 1`
- done
- if [ $VERBOSE -eq 1 ]
- then
- echo "REARRANGING section number $j..."
- fi
- j=`expr $j + 1`;
- i=`expr $i + $total`;
- elif [ "$SIG_TYPE" = "sexto" ]
- then
- # determine target page dimensions
- if [ $TGT_PAGE_HEIGHT -eq 0 ]
- then
- TGT_PAGE_HEIGHT=$(dc -e "$SRC_PAGE_HEIGHT 3 * p")
- fi
- if [ $TGT_PAGE_WIDTH -eq 0 ]
- then
- TGT_PAGE_WIDTH=$(dc -e "$SRC_PAGE_WIDTH 2 * p")
- fi
- # do the rearranging
- k=$i; n=1; total=$(dc -e "$SECT_TYPE 12 * p"); m=$total
- while [ $n -le $SECT_TYPE ]
- do
- pdftk "$NEW_FILE_NAME" cat `expr $k + 5` \
- `expr $k + 6` `expr $k + $m - 1` $k \
- `expr $k + $m - 1 - 3`south `expr $k + 3`south \
- `expr $k + 7` `expr $k + 4` \
- `expr $k + 1` `expr $k + $m - 1 - 1` \
- `expr $k + 2`south `expr $k + $m - 1 - 2`south \
- output ${tmp_name%.pdf}_$n;
- k=`expr $k + 6`; n=`expr $n + 1`; m=`expr $m - 12`
- done
- n=1
- while [ `expr $n + 0` -le $SECT_TYPE ]
- do
- if [ ! -e "$tmp_name" ]
- then
- pdftk A=${tmp_name%.pdf}_$n cat A1-end \
- output "$tmp_name"
- else
- pdftk A=$tmp_name B=${tmp_name%.pdf}_`expr $n` \
- cat A1-end B1-end output ${tmp_name}_tmp
- mv ${tmp_name}_tmp "$tmp_name"
- fi
- n=`expr $n + 1`
- done
- if [ $VERBOSE -eq 1 ]
- then
- echo "REARRANGING section number $j..."
- fi
- j=`expr $j + 1`;
- i=`expr $i + $total`;
- elif [ "$SIG_TYPE" = "duodecimo" ]
- then
- # determine target page dimensions
- if [ $TGT_PAGE_HEIGHT -eq 0 ]
- then
- TGT_PAGE_HEIGHT=$(dc -e "$SRC_PAGE_HEIGHT 3 * p")
- fi
- if [ $TGT_PAGE_WIDTH -eq 0 ]
- then
- TGT_PAGE_WIDTH=$(dc -e "$SRC_PAGE_WIDTH 4 * p")
- fi
- # do the rearranging
- k=$i; n=1; total=$(dc -e "$SECT_TYPE 24 * p"); m=$total
- while [ $n -le $SECT_TYPE ]
- do
- pdftk "$NEW_FILE_NAME" cat `expr $k + 8` \
- `expr $k + $m - 1 - 8` `expr $k + 12` \
- `expr $k + 11` `expr $k + 4` \
- `expr $k + $m - 1 - 3` `expr $k + $m - 1` \
- $k `expr $k + 4`south `expr $k + $m - 1 - 4`south \
- `expr $k + $m - 1 - 7`south `expr $k + 7`south \
- `expr $k + 10` `expr $k + 13` `expr $k + 14` \
- `expr $k + 9` `expr $k + 1` `expr $k + $m - 1 - 1` \
- `expr $k + $m - 1 - 2` `expr $k + 2` \
- `expr $k + 6`south `expr $k + $m - 1 - 6`south \
- `expr $k + $m - 1 - 5`south `expr $k + 5`south \
- output ${tmp_name%.pdf}_$n;
- k=`expr $k + 12`; n=`expr $n + 1`; m=`expr $m - 24`
- done
- n=1
- while [ `expr $n + 0` -le $SECT_TYPE ]
- do
- if [ ! -e "$tmp_name" ]
- then
- pdftk A=${tmp_name%.pdf}_$n cat A1-end \
- output $tmp_name
- else
- pdftk A="$tmp_name" B=${tmp_name%.pdf}_`expr $n` \
- cat A1-end B1-end output ${tmp_name}_tmp
- mv ${tmp_name}_tmp "$tmp_name"
- fi
- n=`expr $n + 1`
- done
- if [ $VERBOSE -eq 1 ]
- then
- echo "REARRANGING section number $j..."
- fi
- j=`expr $j + 1`;
- i=`expr $i + $total`;
- fi
-done
-mv "$tmp_name" "$NEW_FILE_NAME"
-rm ${tmp_name%.pdf}*
-echo "\documentclass{article}
- \usepackage{pdfpages}
- \usepackage[paperwidth=${TGT_PAGE_WIDTH}bp,paperheight=${TGT_PAGE_HEIGHT}bp]{geometry}
- \pagestyle{empty}" > ${OUTFILE_NAME%.pdf}.tex
-echo '\\begin{document}' >> ${OUTFILE_NAME%.pdf}.tex
-echo "\includepdf[nup=$NUP,pages=-,turn=false,columnstrict,
- noautoscale,delta=${HORIZ_DELTA}bp ${VERT_DELTA}bp,
- offset=${HORIZ_OFFSET}bp ${VERT_OFFSET}bp,scale=${SCALE}]
- {./"$NEW_FILE_NAME"}" >> ${OUTFILE_NAME%.pdf}.tex
-echo "\\\\end{document}" >> ${OUTFILE_NAME%.pdf}.tex
-if [ $VERBOSE -eq 1 ]
-then
- echo "IMPOSING sections..."
-fi
-pdflatex ${OUTFILE_NAME%.pdf}.tex > /dev/null 2>&1
-if [ $VERBOSE -eq 1 ]
-then
- echo "CLEANING up..."
-fi
-rm ${OUTFILE_NAME%.pdf}.tex ${OUTFILE_NAME%.pdf}.aux \
- ${OUTFILE_NAME%.pdf}.log "$NEW_FILE_NAME"
-if [ -e "./blank.tex" ]; then
- rm ./blank.tex
-fi
-if [ -e "./blank.aux" ]; then
- rm ./blank.aux
-fi
-if [ -e "./blank.log" ]; then
- rm ./blank.log
-fi
-if [ $VERBOSE -eq 1 ]
-then
- echo "`expr $NUM_PAGES + $NUM_BLANKS` pages imposed in
- $(dc -e "$NUM_SIGS $SECT_TYPE * p") $SIG_TYPE signatures gathered
- in sections of $SECT_TYPE signature(s) each and output to
- ${OUTFILE_NAME%.pdf}.pdf."
-fi
-if [ "$OUTFILE_NAME" = "stdout" ]
-then
- cat ${OUTFILE_NAME}.pdf
- rm ${OUTFILE_NAME}.pdf
-fi
-exit 0
diff --git a/flake.lock b/flake.lock
new file mode 100644
index 0000000..2684eab
--- /dev/null
+++ b/flake.lock
@@ -0,0 +1,61 @@
+{
+ "nodes": {
+ "flake-utils": {
+ "inputs": {
+ "systems": "systems"
+ },
+ "locked": {
+ "lastModified": 1710146030,
+ "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
+ "owner": "numtide",
+ "repo": "flake-utils",
+ "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
+ "type": "github"
+ },
+ "original": {
+ "owner": "numtide",
+ "repo": "flake-utils",
+ "type": "github"
+ }
+ },
+ "nixpkgs": {
+ "locked": {
+ "lastModified": 1721562059,
+ "narHash": "sha256-Tybxt65eyOARf285hMHIJ2uul8SULjFZbT9ZaEeUnP8=",
+ "owner": "NixOS",
+ "repo": "nixpkgs",
+ "rev": "68c9ed8bbed9dfce253cc91560bf9043297ef2fe",
+ "type": "github"
+ },
+ "original": {
+ "owner": "NixOS",
+ "ref": "nixos-unstable",
+ "repo": "nixpkgs",
+ "type": "github"
+ }
+ },
+ "root": {
+ "inputs": {
+ "flake-utils": "flake-utils",
+ "nixpkgs": "nixpkgs"
+ }
+ },
+ "systems": {
+ "locked": {
+ "lastModified": 1681028828,
+ "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+ "owner": "nix-systems",
+ "repo": "default",
+ "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+ "type": "github"
+ },
+ "original": {
+ "owner": "nix-systems",
+ "repo": "default",
+ "type": "github"
+ }
+ }
+ },
+ "root": "root",
+ "version": 7
+}
diff --git a/flake.nix b/flake.nix
new file mode 100644
index 0000000..0e4fc53
--- /dev/null
+++ b/flake.nix
@@ -0,0 +1,33 @@
+{
+ description = "carnival tunes";
+ inputs = {
+ nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+ flake-utils.url = "github:numtide/flake-utils";
+ };
+
+ outputs =
+ { nixpkgs, flake-utils, ... }:
+ flake-utils.lib.eachDefaultSystem (
+ system:
+ let
+ pkgs = import nixpkgs { inherit system; };
+ in
+ {
+ devShells.default =
+ with pkgs;
+ mkShell {
+ buildInputs = [
+ texlivePackages.pdfbook2
+ lilypond-with-fonts
+ poppler_utils
+ gnumake
+ opusTools
+ soundfont-fluid
+ timidity
+ source-han-serif
+ source-han-sans
+ ];
+ };
+ }
+ );
+}
diff --git a/src/images/title.png b/src/assets/title.png
similarity index 100%
rename from src/images/title.png
rename to src/assets/title.png
diff --git a/src/headfoot.tex b/src/headfoot.tex
deleted file mode 100644
index 92c6f62..0000000
--- a/src/headfoot.tex
+++ /dev/null
@@ -1,17 +0,0 @@
-\setlength{\headheight}{15pt}
-
-\pagestyle{fancy}
-\renewcommand{\chaptermark}[1]{ \markboth{#1}{} }
-\renewcommand{\sectionmark}[1]{ \markright{#1}{} }
-
-\fancyhf{}
-\fancyhead[LE,RO]{\thepage}
-\fancyhead[RE]{\textit{ \nouppercase{\leftmark}} }
-\fancyhead[LO]{\textit{ \nouppercase{\rightmark}} }
-
-\fancypagestyle{plain}{
- \fancyhf{}
- \fancyhead[LE,RO]{\thepage}
- \fancyhead[RE]{\textit{ \nouppercase{Sing-Alongs}} }
- \fancyhead[LO]{\textit{ \nouppercase{Sing-Alongs}} }
-}
diff --git a/src/settings.tex b/src/settings.tex
deleted file mode 100644
index 2fc06d9..0000000
--- a/src/settings.tex
+++ /dev/null
@@ -1,18 +0,0 @@
-\setlength{\columnseprule}{0.2pt}
-
-\hypersetup
-{
- bookmarks=true, % show bookmarks bar?
- unicode=true, % non-Latin characters in Acrobat’s bookmarks
- pdftoolbar=true, % show Acrobat’s toolbar?
- pdfmenubar=false, % show Acrobat’s menu?
- pdffitwindow=false, % window fit to page when opened
- pdfstartview={FitH}, % fits the width of the page to the window
- pdftitle={Sing-Alongs}, % title
- pdfauthor={Sebastian Hugentobler}, % author
- pdfsubject={Music to sing along}, % subject of the document
- pdfcreator={Sebastian Hugentobler}, % creator of the document
- pdfproducer={Sebastian Hugentobler}, % producer of the document
- pdfnewwindow=true, % links in new window
- colorlinks=false, % false: boxed links; true: colored links
-}
diff --git a/src/setup.ly b/src/setup.ly
new file mode 100644
index 0000000..e1463c6
--- /dev/null
+++ b/src/setup.ly
@@ -0,0 +1,16 @@
+\layout {
+ indent = 0.0
+ tagline = #f
+ copyright = #f
+}
+
+\paper {
+ system-system-spacing = #'((basic-distance . 0) (minimum-distance . 0) (padding . 1) (stretchability . 0))
+ ragged-bottom = ##t
+ ragged-last-bottom = ##t
+}
+
+\header {
+ tagline = ""
+ copyright = ""
+}
diff --git a/src/singalongs.tex b/src/singalongs.tex
deleted file mode 100644
index d240d89..0000000
--- a/src/singalongs.tex
+++ /dev/null
@@ -1,73 +0,0 @@
-% !Mode:: "TeX:UTF-8"
-
-\documentclass[11pt, openany, twoside]{scrbook}
-\usepackage[utf8]{inputenc}
-\usepackage{fontspec}
-\usepackage{fancyhdr}
-\usepackage[a4paper]{geometry}
-\usepackage{tgschola}
-\usepackage{tocloft}
-\usepackage[unicode]{hyperref}
-\usepackage{multicol}
-\usepackage{songs}
-\usepackage{lyluatex}
-\usepackage{graphicx}
-
-\makeatletter
-
-\newcommand{\unchapter}[1]{%
- \begingroup
- \let\@makechapterhead\@gobble % make \@makechapterhead do nothing
- \chapter{#1}
- \endgroup
-}
-
-\makeatother
-
-\directlua {
- local f = assert(io.popen('git rev-parse --short HEAD', 'r'))
- local s = assert(f:read('*a'))
- f:close()
-
- tex.sprint("\string\\newcommand {\string\\revision}{" .. s .. "}")
-}
-
-\input{settings.tex}
-\input{headfoot.tex}
-
-\begin{document}
- \pagenumbering{roman}
-
- \input{title.tex}
-
- Please do not take this little book as a definite source, it is more of a suggestion on how to
- play a particular piece. Music is here to be played and not to be nailed down.\\
- ~\\
- As the notation of public domain music falls not under copyright, this booklet is not copyrighted. \\
- Commercial use is encouraged and it is not necessary to retain the contributor notice but of course
- appreciated if you do.\\
- ~\\
- If you use this booklet in a form it would be nice when you drop us a line but this is just out of
- interest and again you are in no way obliged to do so.
-
- \chapter*{Contributors}
- \begin{itemize}
- \item Matias Hugentobler
- \item Sebastian Hugentobler
- \end{itemize}
-
- \tableofcontents
-
- \newpage
-
- \pagenumbering{arabic}
-
- \lysetoption{staffsize}{22}
- \lysetoption{quote}{true}
- \lysetoption{indent}{false}
- \lysetoption{insert}{inline}
- \lysetoption{pass-fonts}{true}
-
- \songs
-
-\end{document}
diff --git a/src/singalongs.typ b/src/singalongs.typ
new file mode 100644
index 0000000..ab786f7
--- /dev/null
+++ b/src/singalongs.typ
@@ -0,0 +1,12 @@
+#import "title.typ": *
+
+#set page(margin: (inside: 2.5cm, outside: 2cm, y: 1.75cm))
+
+#titlepage()
+
+#outline()
+#pagebreak()
+
+#counter(page).update(1)
+#set page(numbering: "1")
+#include "/build/songs.typ"
diff --git a/src/song.tex b/src/song.tex
deleted file mode 100644
index 6e15eb6..0000000
--- a/src/song.tex
+++ /dev/null
@@ -1,31 +0,0 @@
-% !Mode:: "TeX:UTF-8"
-
-\documentclass[11pt, openany, oneside]{scrbook}
-
-\usepackage{fontspec}
-\usepackage[a4paper]{geometry}
-\usepackage{lmodern}
-\usepackage{tgschola}
-\usepackage[unicode]{hyperref}
-\usepackage{multicol}
-\usepackage{lyluatex}
-
-\begin{document}
-
- \pagenumbering{gobble}
-
- \lysetoption{staffsize}{22}
- \lysetoption{quote}{true}
- \lysetoption{indent}{false}
- \lysetoption{insert}{inline}
- \lysetoption{pass-fonts}{true}
-
- \directlua{
- tex.sprint("\string\\lilypondfile{" .. arg[5] .. "}")
- }
- ~\\
- \directlua{
- tex.sprint("\string\\input{" .. arg[6] .. "}")
- }
-
-\end{document}
diff --git a/src/song.typ b/src/song.typ
new file mode 100644
index 0000000..397d8d6
--- /dev/null
+++ b/src/song.typ
@@ -0,0 +1,6 @@
+#let song(title, basename) = {
+ hide(heading(title))
+ image("/build/songs/" + basename + ".svg")
+ include ("/src/songs/" + basename + ".typ")
+ pagebreak()
+}
diff --git a/src/songs.lua b/src/songs.lua
deleted file mode 100644
index 8f4f560..0000000
--- a/src/songs.lua
+++ /dev/null
@@ -1,36 +0,0 @@
-require "lfs"
-
-local open = io.open
-
-local function read_file(path)
- local file = open(path, "rb") -- r read mode and b binary mode
- if not file then return nil end
- local content = file:read "*a" -- *a or *all reads the whole file
- file:close()
- return content
-end
-
-function string.ends(String,End)
- return End=='' or string.sub(String,-string.len(End))==End
-end
-
-function find_songs(dir)
- local files = {}
- for file in lfs.dir(dir) do
- table.insert(files, file)
- end
- table.sort(files)
-
- for i = 1, #files do
- local file = files[i]
- if string.ends(file, ".ly") then
- local ly_content = read_file(dir .. '/' .. file)
- local ly_title = string.match(ly_content, 'title = "(.-)"')
- tex.sprint('\\unchapter{' .. ly_title .. '}')
- tex.sprint('\\lilypondfile{' .. dir .. '/' .. file .. '}')
- tex.sprint('~\\\\')
- tex.sprint('~\\\\')
- tex.sprint('\\input{' .. dir .. '/' .. file:gsub("%.ly", ".tex") .. '}')
- end
- end
-end
diff --git a/src/songs.sty b/src/songs.sty
deleted file mode 100644
index ddc9816..0000000
--- a/src/songs.sty
+++ /dev/null
@@ -1,18 +0,0 @@
-\ProvidesPackage{songs}
-
-\RequirePackage{luatexbase}
-\RequirePackage{luaotfload}
-\RequirePackage{kvoptions}
-\RequirePackage{keycommand}
-\RequirePackage{currfile}
-\directlua{dofile(kpse.find_file("songs.lua"))}
-
-\def\songpath{"./songs"}
-
-% Commandes principales
-% Inclusion d'un fichier ly
-\newkeycommand*\songs[songpath=\songpath]{%
-\directlua{%
- find_songs(\songpath)%
-}%
-}
diff --git a/src/songs/AllForMeGrog.ly b/src/songs/AllForMeGrog.ly
index af21683..1d24057 100644
--- a/src/songs/AllForMeGrog.ly
+++ b/src/songs/AllForMeGrog.ly
@@ -1,5 +1,6 @@
\version "2.18.2"
\include "articulate.ly"
+\include "../setup.ly"
\header {
title = "All for Me Grog"
diff --git a/src/songs/AllForMeGrog.tex b/src/songs/AllForMeGrog.tex
deleted file mode 100644
index 0416222..0000000
--- a/src/songs/AllForMeGrog.tex
+++ /dev/null
@@ -1,42 +0,0 @@
-\begin{center}
-\textit{[Chorus] \\
-Well it's all for me grog, me jolly jolly grog, \\
-It's all for me beer and tobacco. \\
-For I spent all me tin on the lassies drinking gin, \\
-Far across the western ocean I must wander. \\ }
-~\\
-I’m sick in the head and I haven’t been to bed \\
-Since first I came ashore with me plunder \\
-I’ve seen centipedes and snakes and me head is full of aches \\
-And I think I’ll take a path for way out yonder. \\
-~\\
-\textit{[Chorus] \\}
-~\\
-Where are me boots, me noggin', noggin' boots, \\
-They're all sold for beer and tobacco. \\
-See the soles they were thin and the uppers were lettin’ in \\
-And the heels were looking out for better weather. \\
-~\\
-\textit{[Chorus] \\}
-~\\
-Where is me shirt, me noggin', noggin' shirt, \\
-It's all sold for beer and tobacco, \\
-You see the sleeves were all worn out and the collar been torn about, \\
-And the tail is looking out for better weather. \\
-~\\
-\textit{[Chorus] \\}
-~\\
-Where is me wife, me noggin', noggin' wife \\
-She's all sold for beer and tobacco \\
-You see her front it was worn out and her tail got kicked about \\
-And I'm sure she's lookin' out for better weather \\
-~\\
-\textit{[Chorus] \\}
-~\\
-Where is me bed, me noggin', noggin' bed \\
-It's all sold for beer and tobacco \\
-You see I sold it to the girls until the springs were all in twirls \\
-And the sheets they're lookin' out for better weather \\
-~\\
-\textit{[Chorus] \\}
-\end{center}
diff --git a/src/songs/AllForMeGrog.typ b/src/songs/AllForMeGrog.typ
new file mode 100644
index 0000000..11a77e9
--- /dev/null
+++ b/src/songs/AllForMeGrog.typ
@@ -0,0 +1,40 @@
+_[Chorus] \
+Well it's all for me grog, me jolly jolly grog, \
+It's all for me beer and tobacco. \
+For I spent all me tin on the lassies drinking gin, \
+Far across the western ocean I must wander._ \
+
+I’m sick in the head and I haven’t been to bed \
+Since first I came ashore with me plunder \
+I’ve seen centipedes and snakes and me head is full of aches \
+And I think I’ll take a path for way out yonder. \
+
+_[Chorus]_
+
+Where are me boots, me noggin', noggin' boots, \
+They're all sold for beer and tobacco. \
+See the soles they were thin and the uppers were lettin’ in \
+And the heels were looking out for better weather. \
+
+_[Chorus]_
+
+Where is me shirt, me noggin', noggin' shirt, \
+It's all sold for beer and tobacco, \
+You see the sleeves were all worn out and the collar been torn about, \
+And the tail is looking out for better weather. \
+
+_[Chorus]_
+
+Where is me wife, me noggin', noggin' wife \
+She's all sold for beer and tobacco \
+You see her front it was worn out and her tail got kicked about \
+And I'm sure she's lookin' out for better weather \
+
+_[Chorus]_
+
+Where is me bed, me noggin', noggin' bed \
+It's all sold for beer and tobacco \
+You see I sold it to the girls until the springs were all in twirls \
+And the sheets they're lookin' out for better weather \
+
+_[Chorus]_
diff --git a/src/songs/AuldLangSyne.ly b/src/songs/AuldLangSyne.ly
index bde5a50..c2c533d 100644
--- a/src/songs/AuldLangSyne.ly
+++ b/src/songs/AuldLangSyne.ly
@@ -1,5 +1,6 @@
\version "2.18.2"
\include "articulate.ly"
+\include "../setup.ly"
\header {
title = "Auld Lang Syne"
@@ -62,4 +63,4 @@ melody = \relative a' {
\tempo 4 = 130
}
}
-}
\ No newline at end of file
+}
diff --git a/src/songs/AuldLangSyne.tex b/src/songs/AuldLangSyne.tex
deleted file mode 100644
index 85c5cd6..0000000
--- a/src/songs/AuldLangSyne.tex
+++ /dev/null
@@ -1,42 +0,0 @@
-\begin{multicols*}{2}
-\begin{center}
-Should auld acquaintance be forgot, \\
-And never brought to mind? \\
-Should auld acquaintance be forgot, \\
-And days of auld lang syne? \\
-~\\
-\textit{[Chorus] \\
-For auld lang syne, my dear, \\
-For auld lang syne. \\
-We'll take a cup o' kindness yet, \\
-For auld lang syne. \\}
-~\\
-And surely ye'll be your pint-stowp! \\
-And surely I'll be mine! \\
-And we'll take a cup o' kindness yet, \\
-for auld lang syne. \\
-~\\
-\textit{[Chorus] \\}
-~\\
-We twa hae run about the braes \\
-And pou'd the gowans fine. \\
-We've wandered mony a weary foot, \\
-Sin' auld lang syne. \\
-~\\
-\textit{[Chorus] \\}
-~\\
-We twa hae sported i' the burn, \\
-From morning sun till dine, \\
-But seas between us braid hae roared \\
-Sin' auld lang syne. \\
-~\\
-\textit{[Chorus] \\}
-~\\
-And ther's a hand, my trusty friend, \\
-And gie's a hand o' thine; \\
-We'll tak' a right good willie-waught, \\
-For auld lang syne. \\
-~\\
-\textit{[Chorus] \\}
-\end{center}
-\end{multicols*}
diff --git a/src/songs/AuldLangSyne.typ b/src/songs/AuldLangSyne.typ
new file mode 100644
index 0000000..b6cf5bd
--- /dev/null
+++ b/src/songs/AuldLangSyne.typ
@@ -0,0 +1,42 @@
+#columns(2, gutter: 11pt)[
+
+ Should auld acquaintance be forgot, \
+ And never brought to mind? \
+ Should auld acquaintance be forgot, \
+ And days of auld lang syne? \
+
+ _[Chorus] \
+For auld lang syne, my dear, \
+For auld lang syne. \
+We'll take a cup o' kindness yet, \
+For auld lang syne._ \
+
+ And surely ye'll be your pint-stowp! \
+ And surely I'll be mine! \
+ And we'll take a cup o' kindness yet, \
+ for auld lang syne. \
+
+ _[Chorus]_
+
+ We twa hae run about the braes \
+ And pou'd the gowans fine. \
+ We've wandered mony a weary foot, \
+ Sin' auld lang syne. \
+
+ _[Chorus]_
+
+ We twa hae sported i' the burn, \
+ From morning sun till dine, \
+ But seas between us braid hae roared \
+ Sin' auld lang syne. \
+
+ _[Chorus]_
+
+ And ther's a hand, my trusty friend, \
+ And gie's a hand o' thine; \
+ We'll tak' a right good willie-waught, \
+ For auld lang syne. \
+
+ _[Chorus]_
+
+]
diff --git a/src/songs/BlackVelvetBand.ly b/src/songs/BlackVelvetBand.ly
index e4f2d8a..4fd0823 100644
--- a/src/songs/BlackVelvetBand.ly
+++ b/src/songs/BlackVelvetBand.ly
@@ -1,5 +1,6 @@
\version "2.18.2"
\include "articulate.ly"
+\include "../setup.ly"
\header {
title = "The Black Velvet Band"
@@ -62,4 +63,4 @@ melody = \relative g'' {
\tempo 4 = 130
}
}
-}
\ No newline at end of file
+}
diff --git a/src/songs/BlackVelvetBand.tex b/src/songs/BlackVelvetBand.tex
deleted file mode 100644
index 9e69d0e..0000000
--- a/src/songs/BlackVelvetBand.tex
+++ /dev/null
@@ -1,62 +0,0 @@
-\begin{multicols*}{2}
-\begin{center}
-Well, in a neat little town they call Belfast, \\
-apprentice to trade I was bound \\
-Many an hours sweet happiness, \\
-have I spent in that neat little town \\
-A sad misfortune came over me, \\
-which caused me to stray from the land \\
-Far away from my friends and relations,
-betrayed by the black velvet band \\
-~\\
-\textit{[Chorus] \\
-Her eyes they shone like diamonds, \\
-I thought her the queen of the land. \\
-And her hair it hung over her shoulder, \\
-tied up with a black velvet band. \\}
-~\\
-As I went walking down Broadway, \\
-meaning not long for to stay, \\
-When who should I meet but this pretty fair maid \\
-comes a tripping along the highway, \\
-She was both fair and handsome, \\
-her neck it was just like a swans \\
-And her hair it hung over her shoulder, \\
-tied up with a black velvet band \\
-~\\
-\textit{[Chorus] \\ }
-~\\
-I took a stroll with this pretty fair maid \\
-And a gentleman passing us by \\
-Well, I knew she meant the doing of him \\
-By the look in her roguish black eye \\
-A gold watch she took from his pocket \\
-And placed it right into my hand \\
-And the very first thing that I said, was \\
-bad luck to the black velvet band \\
-~\\
-\textit{[Chorus] \\ }
-~\\
-Before the judge and jury, \\
-next morning I had to appear, \\
-The judge he says to me: \\
-"Young man, your case it is proven clear \\
-We'll give you seven years penal servitude, \\
-to be spent faraway from the land \\
-Far away from your friends and companions, \\
-betrayed by the black velvet band" \\
-~\\
-\textit{[Chorus] \\ }
-~\\
-So come all you jolly young fellows \\
-a warning take by me \\
-When you are out on the town me lads, \\
-beware of them pretty colleens \\
-For they feed you with strong drink, \\
-"Oh yeah", 'til you are unable to stand \\
-And the very next thing that you'll know is \\
-you've landed in Van Diemens Land \\
-~\\
-\textit{[Chorus] \\ }
-\end{center}
-\end{multicols*}
diff --git a/src/songs/BlackVelvetBand.typ b/src/songs/BlackVelvetBand.typ
new file mode 100644
index 0000000..d16564b
--- /dev/null
+++ b/src/songs/BlackVelvetBand.typ
@@ -0,0 +1,62 @@
+#columns(2, gutter: 11pt)[
+
+ Well, in a neat little town they call Belfast, \
+ apprentice to trade I was bound \
+ Many an hours sweet happiness, \
+ have I spent in that neat little town \
+ A sad misfortune came over me, \
+ which caused me to stray from the land \
+ Far away from my friends and relations, \
+ betrayed by the black velvet band \
+
+ _[Chorus] \
+Her eyes they shone like diamonds, \
+I thought her the queen of the land. \
+And her hair it hung over her shoulder, \
+tied up with a black velvet band._
+
+ As I went walking down Broadway, \
+ meaning not long for to stay, \
+ When who should I meet but this pretty fair maid \
+ comes a tripping along the highway, \
+ She was both fair and handsome, \
+ her neck it was just like a swans \
+ And her hair it hung over her shoulder, \
+ tied up with a black velvet band \
+
+ _[Chorus]_
+
+ I took a stroll with this pretty fair maid \
+ And a gentleman passing us by \
+ Well, I knew she meant the doing of him \
+ By the look in her roguish black eye \
+ A gold watch she took from his pocket \
+ And placed it right into my hand \
+ And the very first thing that I said, was \
+ bad luck to the black velvet band \
+
+ _[Chorus]_
+
+ Before the judge and jury, \
+ next morning I had to appear, \
+ The judge he says to me: \
+ "Young man, your case it is proven clear \
+ We'll give you seven years penal servitude, \
+ to be spent faraway from the land \
+ Far away from your friends and companions, \
+ betrayed by the black velvet band" \
+
+ _[Chorus]_
+
+ So come all you jolly young fellows \
+ a warning take by me \
+ When you are out on the town me lads, \
+ beware of them pretty colleens \
+ For they feed you with strong drink, \
+ "Oh yeah", 'til you are unable to stand \
+ And the very next thing that you'll know is \
+ you've landed in Van Diemens Land \
+
+ _[Chorus]_
+
+]
diff --git a/src/songs/Buergerlied.ly b/src/songs/Buergerlied.ly
index 7c23f99..a7be78e 100644
--- a/src/songs/Buergerlied.ly
+++ b/src/songs/Buergerlied.ly
@@ -1,5 +1,6 @@
\version "2.18.2"
\include "articulate.ly"
+\include "../setup.ly"
\header {
title = "Bürgerlied"
diff --git a/src/songs/Buergerlied.tex b/src/songs/Buergerlied.tex
deleted file mode 100644
index be01265..0000000
--- a/src/songs/Buergerlied.tex
+++ /dev/null
@@ -1,52 +0,0 @@
-\begin{multicols*}{2}
-\begin{center}
-Ob wir rote, gelbe Kragen \\
-Helme oder Hüte tragen \\
-Stiefel tragen oder Schuh \\
-Oder ob wir Röcke nähen \\
-Und zu Schuhen Drähte drehen \\
-Das tut, das tut nichts dazu. \\
-~\\
-Ob wir können präsidieren, \\
-Oder müssen Akten schmieren \\
-Ohne Rast und ohne Ruh \\
-Ob wir just Kollegia lesen \\
-Oder aber binden Besen \\
-Das tut, das tut nichts dazu. \\
-~\\
-Ob wir stolz zu Rosse reiten, \\
-Oder ob zu Fuß wir schreiten, \\
-Fürbaß unser'm Ziele zu. \\
-Ob uns Kreuze vorne schmücken \\
-Oder Kreuze hinten drücken, \\
-Das tut, das tut nichts dazu. \\
-~\\
-Aber ob wir Neues bauen \\
-Oder Altes nur verdauen \\
-Wie das Gras verdaut die Kuh \\
-Ob wir in der Welt was schaffen \\
-Oder nur die Welt begaffen \\
-Das tut, das tut was dazu \\
-~\\
-Ob im Kopfe etwas Grütze \\
-Und im Herzen Licht und Hitze \\
-Daß es brennt in einem Nu \\
-Oder ob wir hinter Mauern \\
-Im dunkeln träge kauern, \\
-Das tut, das tut was dazu \\
-~\\
-Ob wir rüstig und geschäftig \\
-Wo es gilt zu wirken kräftig \\
-Immer tapfer greifen zu \\
-Oder ob wir schläfrig denken \\
-Gott wird's wohl im Schlafe schenken \\
-Das tut, das tut was dazu! \\
-~\\
-Drum, ihr Bürger, drum, ihr Brüder \\
-Alle eines Bundes Glieder \\
-Was auch jeder von uns tu! \\
-Alle, die dies Lied gesungen, \\
-So die Alten, wie die Jungen, \\
-Tun wir, tun wir was dazu. \\
-\end{center}
-\end{multicols*}
diff --git a/src/songs/Buergerlied.typ b/src/songs/Buergerlied.typ
new file mode 100644
index 0000000..bc363d4
--- /dev/null
+++ b/src/songs/Buergerlied.typ
@@ -0,0 +1,52 @@
+#columns(2, gutter: 11pt)[
+
+ Ob wir rote, gelbe Kragen \
+ Helme oder Hüte tragen \
+ Stiefel tragen oder Schuh \
+ Oder ob wir Röcke nähen \
+ Und zu Schuhen Drähte drehen \
+ Das tut, das tut nichts dazu. \
+
+ Ob wir können präsidieren, \
+ Oder müssen Akten schmieren \
+ Ohne Rast und ohne Ruh \
+ Ob wir just Kollegia lesen \
+ Oder aber binden Besen \
+ Das tut, das tut nichts dazu. \
+
+ Ob wir stolz zu Rosse reiten, \
+ Oder ob zu Fuß wir schreiten, \
+ Fürbaß unser'm Ziele zu. \
+ Ob uns Kreuze vorne schmücken \
+ Oder Kreuze hinten drücken, \
+ Das tut, das tut nichts dazu. \
+
+ Aber ob wir Neues bauen \
+ Oder Altes nur verdauen \
+ Wie das Gras verdaut die Kuh \
+ Ob wir in der Welt was schaffen \
+ Oder nur die Welt begaffen \
+ Das tut, das tut was dazu \
+
+ Ob im Kopfe etwas Grütze \
+ Und im Herzen Licht und Hitze \
+ Daß es brennt in einem Nu \
+ Oder ob wir hinter Mauern \
+ Im dunkeln träge kauern, \
+ Das tut, das tut was dazu \
+
+ Ob wir rüstig und geschäftig \
+ Wo es gilt zu wirken kräftig \
+ Immer tapfer greifen zu \
+ Oder ob wir schläfrig denken \
+ Gott wird's wohl im Schlafe schenken \
+ Das tut, das tut was dazu! \
+
+ Drum, ihr Bürger, drum, ihr Brüder \
+ Alle eines Bundes Glieder \
+ Was auch jeder von uns tu! \
+ Alle, die dies Lied gesungen, \
+ So die Alten, wie die Jungen, \
+ Tun wir, tun wir was dazu. \
+
+]
diff --git a/src/songs/DrunkenSailor.ly b/src/songs/DrunkenSailor.ly
index 01551ca..546ce7d 100644
--- a/src/songs/DrunkenSailor.ly
+++ b/src/songs/DrunkenSailor.ly
@@ -1,5 +1,6 @@
\version "2.18.2"
\include "articulate.ly"
+\include "../setup.ly"
\header {
title = "Drunken Sailor"
diff --git a/src/songs/DrunkenSailor.tex b/src/songs/DrunkenSailor.tex
deleted file mode 100644
index 9d3290b..0000000
--- a/src/songs/DrunkenSailor.tex
+++ /dev/null
@@ -1,57 +0,0 @@
-\begin{multicols*}{2}
-\begin{center}
-\textit{[Chorus] \\
-Way-hey up she rises \\
-Way-hey up she rises \\
-Way-hey up she rises \\
-Earl-eye in the morning! \\}
-~\\
-\textit{
-What shall we do with a drunken sailor? \\
-What shall we do with a drunken sailor? \\
-What shall we do with a drunken sailor? \\
-Earl-eye in the morning? \\}
-~\\
-Put him in a long-boat till he's sober \\
-~\\
-\textit{[Chorus] \\}
-~\\
-Keep him there and make 'im bale 'er. \\
-~\\
-\textit{[Chorus] \\}
-~\\
-Trice him up in a runnin' bowline. \\
-~\\
-\textit{[Chorus] \\}
-~\\
-Put him in the scuppers with a hose-pipe on him. \\
-~\\
-\textit{[Chorus] \\}
-~\\
-Take 'im and shake 'im and try an' wake i'm. \\
-~\\
-\textit{[Chorus] \\}
-~\\
-Give 'im a taste of the bosun's rope-end. \\
-~\\
-\textit{[Chorus] \\}
-~\\
-Shave his belly with a rusty razor. \\
-~\\
-\textit{[Chorus] \\}
-~\\
-Put him in the bed with the captain's daughter. \\
-~\\
-\textit{[Chorus] \\}
-~\\
-Way-hey up she rises \\
-Way-hey up she rises \\
-Way-hey up she rises \\
-Early in the morning! \\
-~\\
-That's what we do with a drunken sailor \\
-That's what we do with a drunken sailor \\
-That's what we do with a drunken sailor \\
-Early in the morning! \\
-\end{center}
-\end{multicols*}
diff --git a/src/songs/DrunkenSailor.typ b/src/songs/DrunkenSailor.typ
new file mode 100644
index 0000000..d045f7b
--- /dev/null
+++ b/src/songs/DrunkenSailor.typ
@@ -0,0 +1,56 @@
+#columns(2, gutter: 11pt)[
+
+ _[Chorus]
+Way-hey up she rises \
+Way-hey up she rises \
+Way-hey up she rises \
+Early in the morning!_
+
+ _What shall we do with a drunken sailor? \
+What shall we do with a drunken sailor? \
+What shall we do with a drunken sailor? \
+Earl-eye in the morning?_
+
+ Put him in a long-boat till he's sober \
+
+ _[Chorus]_
+
+ Keep him there and make 'im bale 'er. \
+
+ _[Chorus]_
+
+ Trice him up in a runnin' bowline. \
+
+ _[Chorus]_
+
+ Put him in the scuppers with a hose-pipe on him. \
+
+ _[Chorus]_
+
+ Take 'im and shake 'im and try an' wake i'm. \
+
+ _[Chorus]_
+
+ Give 'im a taste of the bosun's rope-end.
+
+ _[Chorus]_
+
+ Shave his belly with a rusty razor. \
+
+ _[Chorus]_
+
+ Put him in the bed with the captain's daughter. \
+
+ _[Chorus]_
+
+ Way-hey up she rises \
+ Way-hey up she rises \
+ Way-hey up she rises \
+ Early in the morning! \
+
+ That's what we do with a drunken sailor \
+ That's what we do with a drunken sailor \
+ That's what we do with a drunken sailor \
+ Early in the morning! \
+
+]
diff --git a/src/songs/FinnegansWake.ly b/src/songs/FinnegansWake.ly
index 10bdb95..1d74369 100644
--- a/src/songs/FinnegansWake.ly
+++ b/src/songs/FinnegansWake.ly
@@ -1,5 +1,6 @@
\version "2.18.2"
\include "articulate.ly"
+\include "../setup.ly"
\header {
title = "Finnegan's Wake"
diff --git a/src/songs/FinnegansWake.tex b/src/songs/FinnegansWake.tex
deleted file mode 100644
index 8abc09c..0000000
--- a/src/songs/FinnegansWake.tex
+++ /dev/null
@@ -1,62 +0,0 @@
-\begin{multicols*}{2}
-\begin{center}
-Tim Finnegan lived in Walkin' Street \\
-A gentle Irishman, mighty odd; \\
-He had a brogue both rich and sweet \\
-And to rise in the world he carried a hod. \\
-Now Tim had a sort of the tipplin' way \\
-With a love for the liquor he was born \\
-And to help on with is work each day \\
-He'd a "drop of the cray-thur" every morn. \\
-~\\
-\textit{[Chorus] \\
-Whack fol the dah O, dance to your partner \\
-Whirl the floor, your trotters shake; \\
-Wasn't it the truth I told you \\
-Lots of fun at Finnegan's wake! \\}
-~\\
-One mornin' Tim was feelin' foul \\
-His head was heavy and it made him shake; \\
-He fell from a ladder and he broke his skull \\
-And they carried him home his corpse to wake. \\
-They rolled him up in a nice clean sheet \\
-And laid him out upon the bed, \\
-A gallon of whiskey at his feet \\
-and a barrel of porter at his head. \\
-~\\
-\textit{[Chorus] \\}
-~\\
-His friends assembled at the wake \\
-And Mrs. Finnegan called for lunch, \\
-First they brought in tea and cake \\
-Then pipes, tobacco and brandy punch. \\
-Biddy O'Brien began to bawl \\
-"Such a nice clean corpse did you ever see? \\
-O Tim, mavourneed, why did you die?" \\
-"Hold your gob," said Paddy McGee! \\
-~\\
-\textit{[Chorus] \\}
-~\\
-Then Maggie O'Connor took up the job \\
-"O Biddy," says she, "You're wrong I'm sure" \\
-Biddy she gave her a belt in the gob \\
-And left her sprawlin on the floor. \\
-And then the war did soon engage \\
-It was woman to woman and man to man \\
-Shillelagh law was all the rage \\
-And a row and a ruccus soon began. \\
-~\\
-\textit{[Chorus] \\}
-~\\
-Then Mickey Maloney ducked his head \\
-When a noggin of whiskey flew at him \\
-It missed, and falling on the bed \\
-The liquor squattered over Tim! \\
-The corpse revives! See how he rises! \\
-Tim Finnegan rising from the bed, \\
-Says, "Whirl your whiskey round like blazes \\
-d'anam don diabhal!* Do you think I'm dead?" \\
-~\\
-*"Your soul to the devil! (spoken: Danum un deel)"
-\end{center}
-\end{multicols*}
\ No newline at end of file
diff --git a/src/songs/FinnegansWake.typ b/src/songs/FinnegansWake.typ
new file mode 100644
index 0000000..7a7c4b4
--- /dev/null
+++ b/src/songs/FinnegansWake.typ
@@ -0,0 +1,62 @@
+#columns(2, gutter: 11pt)[
+
+ Tim Finnegan lived in Walkin' Street \
+ A gentle Irishman, mighty odd; \
+ He had a brogue both rich and sweet \
+ And to rise in the world he carried a hod. \
+ Now Tim had a sort of the tipplin' way \
+ With a love for the liquor he was born \
+ And to help on with is work each day \
+ He'd a "drop of the cray-thur" every morn. \
+
+ _[Chorus] \
+Whack fol the dah O, dance to your partner \
+Whirl the floor, your trotters shake; \
+Wasn't it the truth I told you \
+Lots of fun at Finnegan's wake!_
+
+ One mornin' Tim was feelin' foul \
+ His head was heavy and it made him shake; \
+ He fell from a ladder and he broke his skull \
+ And they carried him home his corpse to wake. \
+ They rolled him up in a nice clean sheet \
+ And laid him out upon the bed, \
+ A gallon of whiskey at his feet \
+ and a barrel of porter at his head. \
+
+ _[Chorus]_
+
+ His friends assembled at the wake \
+ And Mrs. Finnegan called for lunch, \
+ First they brought in tea and cake \
+ Then pipes, tobacco and brandy punch. \
+ Biddy O'Brien began to bawl \
+ "Such a nice clean corpse did you ever see? \
+ O Tim, mavourneed, why did you die?" \
+ "Hold your gob," said Paddy McGee! \
+
+ _[Chorus]_
+
+ Then Maggie O'Connor took up the job \
+ "O Biddy," says she, "You're wrong I'm sure" \
+ Biddy she gave her a belt in the gob \
+ And left her sprawlin on the floor. \
+ And then the war did soon engage \
+ It was woman to woman and man to man \
+ Shillelagh law was all the rage \
+ And a row and a ruccus soon began. \
+
+ _[Chorus]_
+
+ Then Mickey Maloney ducked his head \
+ When a noggin of whiskey flew at him \
+ It missed, and falling on the bed \
+ The liquor squattered over Tim! \
+ The corpse revives! See how he rises! \
+ Tim Finnegan rising from the bed, \
+ Says, "Whirl your whiskey round like blazes \
+ d'anam don diabhal!\* Do you think I'm dead?" \
+
+ \*"Your soul to the devil! (spoken: Danum un deel)"
+
+]
diff --git a/src/songs/FoggyDew.ly b/src/songs/FoggyDew.ly
index d8368f0..69348e1 100644
--- a/src/songs/FoggyDew.ly
+++ b/src/songs/FoggyDew.ly
@@ -1,5 +1,6 @@
\version "2.18.2"
\include "articulate.ly"
+\include "../setup.ly"
\header {
title = "The Foggy Dew"
diff --git a/src/songs/FoggyDew.tex b/src/songs/FoggyDew.tex
deleted file mode 100644
index d9c873a..0000000
--- a/src/songs/FoggyDew.tex
+++ /dev/null
@@ -1,48 +0,0 @@
-\begin{multicols*}{2}
-\begin{center}
-As down the glen one Easter morn \\
-To a city fair rode I \\
-There armed lines of marching men \\
-In squadrons passed me by \\
-No fife did hum nor battle drum \\
-Did sound it's dread tatoo \\
-But the Angelus bell o'er the Liffey swell \\
-Rang out through the foggy dew \\
-~\\
-Right proudly high over Dublin Town \\
-They hung out the flag of war \\
-'Twas better to die 'neath an Irish sky \\
-Than at Sulva or Sud El Bar \\
-And from the plains of Royal Meath \\
-Strong men came hurrying through \\
-While Britannia's Huns, with their long range guns \\
-Sailed in through the foggy dew \\
-~\\
-'Twas Britannia bade our Wild Geese go \\
-That small nations might be free \\
-But their lonely graves are by Suvla's waves \\
-Or the shore of the Great North Sea \\
-Oh, had they died by Pearse's side \\
-Or fought with Cathal Brugha \\
-Their names we will keep where the fenians sleep \\
-'Neath the shroud of the foggy dew \\
-~\\
-But the bravest fell, and the requiem bell \\
-Rang mournfully and clear \\
-For those who died that Eastertide \\
-In the springing of the year \\
-And the world did gaze, in deep amaze, \\
-At those fearless men, but few \\
-Who bore the fight that freedom's light \\
-Might shine through the foggy dew \\
-~\\
-Ah, back through the glen I rode again \\
-And my heart with grief was sore \\
-For I parted then with valiant men \\
-Whom I never shall see no more \\
-But to and fro in my dreams I go \\
-And I'd kneel and pray for you, \\
-For slavery fled, O glorious dead, \\
-When you fell in the foggy dew \\
-\end{center}
-\end{multicols*}
diff --git a/src/songs/FoggyDew.typ b/src/songs/FoggyDew.typ
new file mode 100644
index 0000000..f2adbca
--- /dev/null
+++ b/src/songs/FoggyDew.typ
@@ -0,0 +1,48 @@
+#columns(2, gutter: 11pt)[
+
+ As down the glen one Easter morn \
+ To a city fair rode I \
+ There armed lines of marching men \\
+ In squadrons passed me by \
+ No fife did hum nor battle drum \\
+ Did sound it's dread tatoo \
+ But the Angelus bell o'er the Liffey swell \
+ Rang out through the foggy dew \
+
+ Right proudly high over Dublin Town \
+ They hung out the flag of war \
+ 'Twas better to die 'neath an Irish sky \
+ Than at Sulva or Sud El Bar \
+ And from the plains of Royal Meath \
+ Strong men came hurrying through \
+ While Britannia's Huns, with their long range guns \
+ Sailed in through the foggy dew \
+
+ 'Twas Britannia bade our Wild Geese go \
+ That small nations might be free \
+ But their lonely graves are by Suvla's waves \
+ Or the shore of the Great North Sea \
+ Oh, had they died by Pearse's side \
+ Or fought with Cathal Brugha \
+ Their names we will keep where the fenians sleep \
+ 'Neath the shroud of the foggy dew \
+
+ But the bravest fell, and the requiem bell \
+ Rang mournfully and clear \
+ For those who died that Eastertide \
+ In the springing of the year \
+ And the world did gaze, in deep amaze, \
+ At those fearless men, but few \
+ Who bore the fight that freedom's light \
+ Might shine through the foggy dew \
+
+ Ah, back through the glen I rode again \
+ And my heart with grief was sore \
+ For I parted then with valiant men \
+ Whom I never shall see no more \
+ But to and fro in my dreams I go \
+ And I'd kneel and pray for you, \
+ For slavery fled, O glorious dead, \
+ When you fell in the foggy dew \
+
+]
diff --git a/src/songs/ImARoverSeldomSober.ly b/src/songs/ImARoverSeldomSober.ly
index ade67c8..7c8ec04 100644
--- a/src/songs/ImARoverSeldomSober.ly
+++ b/src/songs/ImARoverSeldomSober.ly
@@ -1,5 +1,6 @@
\version "2.18.2"
\include "articulate.ly"
+\include "../setup.ly"
\header {
title = "I'm a Rover Seldom Sober"
diff --git a/src/songs/ImARoverSeldomSober.tex b/src/songs/ImARoverSeldomSober.tex
deleted file mode 100644
index 322f4e1..0000000
--- a/src/songs/ImARoverSeldomSober.tex
+++ /dev/null
@@ -1,43 +0,0 @@
-\begin{multicols*}{2}
-\begin{center}
-I'm a rover and seldom sober \\
-I'm a rover, o' high degree; \\
-And when I'm drinking, I'm always thinking \\
-How to gain my love's company. \\
-~\\
-Though the night be dark as dungeon \\
-No' a star to be seen above, \\
-I will be guided without a stumble \\
-Into the arms o' my ain true love. \\
-~\\
-He steppit up to her bedroom window, \\
-Kneelin' gently upon a stone; \\
-He rappit at her bedroom-window \\
-"Darlin' dear, do you lie alone?" \\
-~\\
-She raised her head on her snow-white pillow \\
-Wi' her arms aboot her breast, \\
-"Wha' is that at my bedroom window \\
-Disturbin' me at my long night's rest?" \\
-~\\
-"It's only me, your ain true lover, \\
-Open the door and let me in. \\
-For I have come on a long journey, \\
-And I'm near drenched to the skin." \\
-~\\
-She opened the door wi' the greatest pleasure, \\
-She opened the door and let him in, \\
-They baith shook hands and embraced each other \\
-Until the mornin' they lay as one. \\
-~\\
-The cocks were crawin', the birds were whistlin' \\
-The burns they ran free abune the brae; \\
-"Remember, lass, I'm a ploughman laddie \\
-And the farmer I must obey." \\
-~\\
-"Noo, my lass, I must gang and leave thee \\
-And though the hills they are high above, \\
-I will climb them wi' greater pleasure \\
-Since I been in the arms o' my love. \\
-\end{center}
-\end{multicols*}
\ No newline at end of file
diff --git a/src/songs/ImARoverSeldomSober.typ b/src/songs/ImARoverSeldomSober.typ
new file mode 100644
index 0000000..220e71b
--- /dev/null
+++ b/src/songs/ImARoverSeldomSober.typ
@@ -0,0 +1,43 @@
+#columns(2, gutter: 11pt)[
+
+ I'm a rover and seldom sober \
+ I'm a rover, o' high degree; \
+ And when I'm drinking, I'm always thinking \
+ How to gain my love's company. \
+
+ Though the night be dark as dungeon \
+ No' a star to be seen above, \
+ I will be guided without a stumble \
+ Into the arms o' my ain true love. \
+
+ He steppit up to her bedroom window, \
+ Kneelin' gently upon a stone; \
+ He rappit at her bedroom-window \
+ "Darlin' dear, do you lie alone?" \
+
+ She raised her head on her snow-white pillow \
+ Wi' her arms aboot her breast, \
+ "Wha' is that at my bedroom window \
+ Disturbin' me at my long night's rest?" \
+
+ "It's only me, your ain true lover, \
+ Open the door and let me in. \
+ For I have come on a long journey, \
+ And I'm near drenched to the skin." \
+
+ She opened the door wi' the greatest pleasure, \
+ She opened the door and let him in, \
+ They baith shook hands and embraced each other \
+ Until the mornin' they lay as one. \
+
+ The cocks were crawin', the birds were whistlin' \
+ The burns they ran free abune the brae; \
+ "Remember, lass, I'm a ploughman laddie \
+ And the farmer I must obey." \
+
+ "Noo, my lass, I must gang and leave thee \
+ And though the hills they are high above, \
+ I will climb them wi' greater pleasure \
+ Since I been in the arms o' my love. \
+
+]
diff --git a/src/songs/IrishRover.ly b/src/songs/IrishRover.ly
index 66cc60d..69dd3f7 100644
--- a/src/songs/IrishRover.ly
+++ b/src/songs/IrishRover.ly
@@ -1,5 +1,6 @@
\version "2.18.2"
\include "articulate.ly"
+\include "../setup.ly"
\header {
title = "The Irish Rover"
diff --git a/src/songs/IrishRover.tex b/src/songs/IrishRover.tex
deleted file mode 100644
index 73da90e..0000000
--- a/src/songs/IrishRover.tex
+++ /dev/null
@@ -1,46 +0,0 @@
-\begin{center}
-On the fourth of July eighteen hundred and six \\
-We set sail from the sweet cove of Cork \\
-We were sailing away with a cargo of bricks \\
-For the grand city hall in New York \\
-'Twas a wonderful craft, she was rigged fore-and-aft \\
-And oh, how the wild winds drove her. \\
-She'd got several blasts, she'd twenty-seven masts \\
-And we called her the Irish Rover. \\
-~\\
-We had one million bales of the best Sligo rags \\
-We had two million barrels of stones \\
-We had three million sides of old blind horses hides, \\
-We had four million barrels of bones. \\
-We had five million hogs, we had six million dogs, \\
-Seven million barrels of porter. \\
-We had eight million bails of old nanny goats' tails, \\
-In the hold of the Irish Rover. \\
-~\\
-There was awl Mickey Coote who played hard on his flute \\
-When the ladies lined up for his set \\
-He was tootin' with skill for each sparkling quadrille \\
-Though the dancers were fluther'd and bet \\
-With his sparse witty talk he was cock of the walk \\
-As he rolled the dames under and over \\
-They all knew at a glance when he took up his stance \\
-And he sailed in the Irish Rover \\
-~\\
-There was Barney McGee from the banks of the Lee, \\
-There was Hogan from County Tyrone \\
-There was Jimmy McGurk who was scarred stiff of work \\
-And a man from Westmeath called Malone \\
-There was Slugger O'Toole who was drunk as a rule \\
-And fighting Bill Tracey from Dover \\
-And your man Mick McCann from the banks of the Bann \\
-Was the skipper of the Irish Rover \\
-~\\
-We had sailed seven years when the measles broke out \\
-And the ship lost it's way in a fog. \\
-And that whale of the crew was reduced down to two, \\
-Just meself and the captain's old dog. \\
-Then the ship struck a rock, oh Lord what a shock \\
-The bulkhead was turned right over \\
-Turned nine times around, and the poor dog was drowned \\
-I'm the last of the Irish Rover \\
-\end{center}
diff --git a/src/songs/IrishRover.typ b/src/songs/IrishRover.typ
new file mode 100644
index 0000000..776d3ea
--- /dev/null
+++ b/src/songs/IrishRover.typ
@@ -0,0 +1,47 @@
+#columns(2, gutter: 11pt)[
+ On the fourth of July eighteen hundred and six \
+ We set sail from the sweet cove of Cork \
+ We were sailing away with a cargo of bricks \
+ For the grand city hall in New York \
+ 'Twas a wonderful craft, she was rigged fore-and-aft \
+ And oh, how the wild winds drove her. \
+ She'd got several blasts, she'd twenty-seven masts \
+ And we called her the Irish Rover. \
+
+ We had one million bales of the best Sligo rags \
+ We had two million barrels of stones \
+ We had three million sides of old blind horses hides, \
+ We had four million barrels of bones. \
+ We had five million hogs, we had six million dogs, \
+ Seven million barrels of porter. \
+ We had eight million bails of old nanny goats' tails, \
+ In the hold of the Irish Rover. \
+
+ There was awl Mickey Coote who played hard on his flute \
+ When the ladies lined up for his set \
+ He was tootin' with skill for each sparkling quadrille \
+ Though the dancers were fluther'd and bet \
+ With his sparse witty talk he was cock of the walk \
+ As he rolled the dames under and over \
+ They all knew at a glance when he took up his stance \
+ And he sailed in the Irish Rover \
+
+ There was Barney McGee from the banks of the Lee, \
+ There was Hogan from County Tyrone \
+ There was Jimmy McGurk who was scarred stiff of work \
+ And a man from Westmeath called Malone \
+ There was Slugger O'Toole who was drunk as a rule \
+ And fighting Bill Tracey from Dover \
+ And your man Mick McCann from the banks of the Bann \
+ Was the skipper of the Irish Rover \
+
+ We had sailed seven years when the measles broke out \
+ And the ship lost it's way in a fog. \
+ And that whale of the crew was reduced down to two, \
+ Just meself and the captain's old dog. \
+ Then the ship struck a rock, oh Lord what a shock \
+ The bulkhead was turned right over \
+ Turned nine times around, and the poor dog was drowned \
+ I'm the last of the Irish Rover \
+
+]
diff --git a/src/songs/JohnnyIHardlyKnewYe.ly b/src/songs/JohnnyIHardlyKnewYe.ly
index 7455c81..5e766a9 100644
--- a/src/songs/JohnnyIHardlyKnewYe.ly
+++ b/src/songs/JohnnyIHardlyKnewYe.ly
@@ -1,5 +1,6 @@
\version "2.18.2"
\include "articulate.ly"
+\include "../setup.ly"
\header {
title = "Johnny I hardly Knew Ye"
diff --git a/src/songs/JohnnyIHardlyKnewYe.tex b/src/songs/JohnnyIHardlyKnewYe.tex
deleted file mode 100644
index ffedd98..0000000
--- a/src/songs/JohnnyIHardlyKnewYe.tex
+++ /dev/null
@@ -1,55 +0,0 @@
-\begin{center}
-While goin' the road to sweet Athy, hurroo, hurroo \\
-While goin' the road to sweet Athy, hurroo, hurroo \\
-While goin' the road to sweet Athy \\
-A stick in me hand and a drop in me eye \\
-A doleful damsel I heard cry, \\
-Johnny I hardly knew ye. \\
-~\\
-\textit{[Chorus] \\
-With your guns and drums and drums and guns, hurroo, hurroo \\
-With your guns and drums and drums and guns, hurroo, hurroo \\
-With your guns and drums and drums and guns \\
-The enemy nearly slew ye \\
-Oh my darling dear, Ye look so queer \\
-Johnny I hardly knew ye. \\}
-~\\
-Where are your eyes that were so mild, hurroo, hurroo \\
-Where are your eyes that were so mild, hurroo, hurroo \\
-Where are your eyes that were so mild \\
-When my heart you so beguiled? \\
-Why did ye skedaddle from me and the child? \\
-Oh Johnny, I hardly knew ye. \\
-~\\
-Where are your legs that used to run, hurroo, hurroo \\
-Where are your legs that used to run, hurroo, hurroo \\
-Where are your legs that used to run \\
-When you went for to carry a gun \\
-Indeed your dancing days are done \\
-Oh Johnny, I hardly knew ye. \\
-~\\
-\textit{[Chorus] \\ }
-~\\
-I'm happy for to see ye home, hurroo, hurroo \\
-I'm happy for to see ye home, hurroo, hurroo \\
-I'm happy for to see ye home \\
-All from the island of Ceylon \\
-So low in flesh, so high in bone \\
-Oh Johnny I hardly knew ye. \\
-~\\
-Ye haven't an arm, ye haven't a leg, hurroo, hurroo \\
-Ye haven't an arm, ye haven't a leg, hurroo, hurroo \\
-Ye haven't an arm, ye haven't a leg, \\
-Ye're an armless, boneless, chickenless egg, \\
-Ye'll have to be put with a bowl to beg, \\
-Oh Johnny I hardly knew ye. \\
-~\\
-\textit{[Chorus] \\ }
-~\\
-They're rolling out the guns again, hurroo, hurroo \\
-They're rolling out the guns again, hurroo, hurroo \\
-They're rolling out the guns again, \\
-But they never will take our sons again, \\
-No they never will take our sons again, \\
-Johnny I'm swearing to ye.
-\end{center}
diff --git a/src/songs/JohnnyIHardlyKnewYe.typ b/src/songs/JohnnyIHardlyKnewYe.typ
new file mode 100644
index 0000000..15bcc20
--- /dev/null
+++ b/src/songs/JohnnyIHardlyKnewYe.typ
@@ -0,0 +1,57 @@
+#columns(2, gutter: 11pt)[
+
+ While goin' the road to sweet Athy, hurroo, hurroo \
+ While goin' the road to sweet Athy, hurroo, hurroo \
+ While goin' the road to sweet Athy \
+ A stick in me hand and a drop in me eye \
+ A doleful damsel I heard cry, \
+ Johnny I hardly knew ye.
+
+ _[Chorus] \
+With your guns and drums and drums and guns, hurroo, hurroo \
+With your guns and drums and drums and guns, hurroo, hurroo \
+With your guns and drums and drums and guns \
+The enemy nearly slew ye \
+Oh my darling dear, Ye look so queer \
+Johnny I hardly knew ye._
+
+ Where are your eyes that were so mild, hurroo, hurroo \
+ Where are your eyes that were so mild, hurroo, hurroo \
+ Where are your eyes that were so mild \
+ When my heart you so beguiled? \
+ Why did ye skedaddle from me and the child? \
+ Oh Johnny, I hardly knew ye. \
+
+ Where are your legs that used to run, hurroo, hurroo \
+ Where are your legs that used to run, hurroo, hurroo \
+ Where are your legs that used to run \
+ When you went for to carry a gun \
+ Indeed your dancing days are done \
+ Oh Johnny, I hardly knew ye. \
+
+ _[Chorus]_
+
+ I'm happy for to see ye home, hurroo, hurroo \
+ I'm happy for to see ye home, hurroo, hurroo \
+ I'm happy for to see ye home \
+ All from the island of Ceylon \
+ So low in flesh, so high in bone \
+ Oh Johnny I hardly knew ye. \
+
+ Ye haven't an arm, ye haven't a leg, hurroo, hurroo \
+ Ye haven't an arm, ye haven't a leg, hurroo, hurroo \
+ Ye haven't an arm, ye haven't a leg, \
+ Ye're an armless, boneless, chickenless egg, \
+ Ye'll have to be put with a bowl to beg, \
+ Oh Johnny I hardly knew ye. \
+
+ _[Chorus]_
+
+ They're rolling out the guns again, hurroo, hurroo \
+ They're rolling out the guns again, hurroo, hurroo \
+ They're rolling out the guns again, \
+ But they never will take our sons again, \
+ No they never will take our sons again, \
+ Johnny I'm swearing to ye.
+
+]
diff --git a/src/songs/KerryRecruit.ly b/src/songs/KerryRecruit.ly
index 4f772e9..2c7b4ab 100644
--- a/src/songs/KerryRecruit.ly
+++ b/src/songs/KerryRecruit.ly
@@ -1,5 +1,6 @@
\version "2.18.2"
\include "articulate.ly"
+\include "../setup.ly"
\header {
title = "The Kerry Recruit"
diff --git a/src/songs/KerryRecruit.tex b/src/songs/KerryRecruit.tex
deleted file mode 100644
index 167b164..0000000
--- a/src/songs/KerryRecruit.tex
+++ /dev/null
@@ -1,73 +0,0 @@
-\begin{center}
-About four years ago I was digging the land \\
-With me brogues on me feet and me spade in me hand \\
-Says I to me self, what a pity to see,\\
-Such a fine strapping lad footing turf round Tralee \\
-~\\
-\textit{[Chorus] \\
-Wid me too ra na nya with me too ra na nya, \\
-Wid me too ra na noo ra na noo ra na nya \\}
-~\\
-Well I buttered me brogues, an shook hands with me spade, \\
-An the way down the road like a dashing young blade \\
-When up comes a sergeant an he asks me to list, \\
-'Arra, sergeant a gra, stick a bob in me fist' \\
-~\\
-\textit{[Chorus] \\ }
-~\\
-Well here is a shilling as I got no more \\
-When you get to headquarters you'll get half a score \\
-And a quick strucking mean said the sergeant good bye \\
-You'd not wish to be quarted neither would die \\
-~\\
-\textit{[Chorus] \\ }
-~\\
-Now the first thing they gave me it was a red coat, \\
-With a wide strap of leather to tie round me throat \\
-And the next thing they gave me I asked what was that, \\
-And they told me it was a cockade for me hat \\
-~\\
-\textit{[Chorus] \\ }
-~\\
-An' the next thing they gave me they called it a gun \\
-With powder an ball an' a place for me thumb \\
-Well first she spat fire and then she spewed smoke, \\
-She gave a great leap and me shoulder near broke \\
-~\\
-\textit{[Chorus] \\ }
-~\\
-Well the first place they sent me was down to the sea, \\
-On the board of a warship bound for the Crimea \\
-Three sticks in the middle all rowled round with sheets, \\
-Lord, she walked on the water without any feet \\
-~\\
-\textit{[Chorus] \\ }
-~\\
-When at Balaclava we landed quite sound, \\
-Cold, wet and hungry we lay on the ground \\
-Next morning for action the bugle did call, \\
-And we had a hot breakfast of powder and ball \\
-~\\
-\textit{[Chorus] \\ }
-~\\
-Well we fought at the Alma, likewise Inkermann, \\
-But the Russians they whaled us at the Redan \\
-In scalin' the walls there meself lost an eye, \\
-And a big Russian bullet ran off with me thigh \\
-~\\
-\textit{[Chorus] \\ }
-~\\
-Well 'tis off there we lay stretched upon the cold ground, \\
-'Twas heads, legs and arms were all scattered around \\
-Says I, If me mam and me claveens were nigh, \\
-So they'd bury me decent and gave a loud cry \\
-~\\
-\textit{[Chorus] \\ }
-~\\
-Well they brought me a doctor and he soon staunched wi' blood, \\
-And he made me a great elegant leg made of wood \\
-They gave me a medal and ten pence a day, \\
-So contented with Sheila, I'll live on half pay \\
-~\\
-\textit{[Chorus] \\ }
-\end{center}
diff --git a/src/songs/KerryRecruit.typ b/src/songs/KerryRecruit.typ
new file mode 100644
index 0000000..258c5bf
--- /dev/null
+++ b/src/songs/KerryRecruit.typ
@@ -0,0 +1,75 @@
+#columns(2, gutter: 11pt)[
+
+ About four years ago I was digging the land \
+ With me brogues on me feet and me spade in me hand \
+ Says I to me self, what a pity to see, \
+ Such a fine strapping lad footing turf round Tralee \
+
+ _[Chorus] \
+Wid me too ra na nya with me too ra na nya, \
+Wid me too ra na noo ra na noo ra na nya_
+
+ Well I buttered me brogues, an shook hands with me spade, \
+ An the way down the road like a dashing young blade \
+ When up comes a sergeant an he asks me to list, \
+ 'Arra, sergeant a gra, stick a bob in me fist' \
+
+ _[Chorus]_
+
+ Well here is a shilling as I got no more \
+ When you get to headquarters you'll get half a score \
+ And a quick strucking mean said the sergeant good bye \
+ You'd not wish to be quarted neither would die \
+
+ _[Chorus]_
+
+ Now the first thing they gave me it was a red coat, \
+ With a wide strap of leather to tie round me throat \
+ And the next thing they gave me I asked what was that, \
+ And they told me it was a cockade for me hat \
+
+ _[Chorus]_
+
+ An' the next thing they gave me they called it a gun \
+ With powder an ball an' a place for me thumb \
+ Well first she spat fire and then she spewed smoke, \
+ She gave a great leap and me shoulder near broke \
+
+ _[Chorus]_
+
+ Well the first place they sent me was down to the sea, \
+ On the board of a warship bound for the Crimea \
+ Three sticks in the middle all rowled round with sheets, \
+ Lord, she walked on the water without any feet \
+
+ _[Chorus]_
+
+ When at Balaclava we landed quite sound, \
+ Cold, wet and hungry we lay on the ground \
+ Next morning for action the bugle did call, \
+ And we had a hot breakfast of powder and ball \
+
+ _[Chorus]_
+
+ Well we fought at the Alma, likewise Inkermann, \
+ But the Russians they whaled us at the Redan \
+ In scalin' the walls there meself lost an eye, \
+ And a big Russian bullet ran off with me thigh \
+
+ _[Chorus]_
+
+ Well 'tis off there we lay stretched upon the cold ground, \
+ 'Twas heads, legs and arms were all scattered around \
+ Says I, If me mam and me claveens were nigh, \
+ So they'd bury me decent and gave a loud cry \
+
+ _[Chorus]_
+
+ Well they brought me a doctor and he soon staunched wi' blood, \
+ And he made me a great elegant leg made of wood \
+ They gave me a medal and ten pence a day, \
+ So contented with Sheila, I'll live on half pay \
+
+ _[Chorus]_
+
+]
diff --git a/src/songs/MacPhersonsFarewell.ly b/src/songs/MacPhersonsFarewell.ly
index 3e4f80e..e8d8b34 100644
--- a/src/songs/MacPhersonsFarewell.ly
+++ b/src/songs/MacPhersonsFarewell.ly
@@ -1,5 +1,6 @@
\version "2.18.2"
\include "articulate.ly"
+\include "../setup.ly"
\header {
title = "MacPherson's Farewell"
diff --git a/src/songs/MacPhersonsFarewell.tex b/src/songs/MacPhersonsFarewell.tex
deleted file mode 100644
index 41c5e84..0000000
--- a/src/songs/MacPhersonsFarewell.tex
+++ /dev/null
@@ -1,57 +0,0 @@
-\begin{multicols*}{2}
-\begin{center}
-Farewell ye dungeons, dark and strong. \\
-Farewell, farewell to thee. \\
-MacPherson's time will no be long \\
-On yonder gallows tree. \\
-~\\
-\textit{[Chorus] \\
-So ranting, so wontonly, \\
-So dauntingly gaed he; \\
-He played a tune, and he danced it roun' \\
-About the gallows tree. \\}
-~\\
-It was by a woman's treacherous hand \\
-That I was condemned to dee. \\
-By a ledge at a window she stood, \\
-And a blanket she threw o'er me. \\
-~\\
-The Laird o' Grant, that Highland Saint, \\
-That first layed hands on me. \\
-He played the cause on Peter Broon \\
-To let MacPherson dee. \\
-~\\
-\textit{[Chorus] \\ }
-~\\
-Untie these bands from off my hands, \\
-And give to me my sword, \\
-An' there's no' a man in all Scotland, \\
-But I'll brave him at a word. \\
-~\\
-There's some come here to see me hanged \\
-And some to buy my fiddle \\
-But before that I do part wi' her \\
-I'll brake her thro' the middle. \\
-~\\
-\textit{[Chorus] \\ }
-~\\
-He took the fiddle into both his hands \\
-And he broke it o'er a stone \\
-Says there's nae other hand shall play on thee \\
-When I am dead and gone. \\
-~\\
-O, little did my mother think \\
-When she first cradled me \\
-That I would turn a rovin' boy \\
-And die on the gallows tree. \\
-~\\
-\textit{[Chorus] \\ }
-~\\
-The reprieve was a comin' o'er the brig o' Banff, \\
-To let MacPherson free; \\
-But they put the clock a quarter afore, \\
-And hanged him to the tree. \\
-~\\
-\textit{[Chorus] \\ }
-\end{center}
-\end{multicols*}
diff --git a/src/songs/MacPhersonsFarewell.typ b/src/songs/MacPhersonsFarewell.typ
new file mode 100644
index 0000000..ed8f082
--- /dev/null
+++ b/src/songs/MacPhersonsFarewell.typ
@@ -0,0 +1,57 @@
+#columns(2, gutter: 11pt)[
+
+ Farewell ye dungeons, dark and strong. \
+ Farewell, farewell to thee. \
+ MacPherson's time will no be long \
+ On yonder gallows tree. \
+
+ _[Chorus] \
+So ranting, so wontonly, \
+So dauntingly gaed he; \
+He played a tune, and he danced it roun' \
+About the gallows tree._
+
+ It was by a woman's treacherous hand \
+ That I was condemned to dee. \
+ By a ledge at a window she stood, \
+ And a blanket she threw o'er me. \
+
+ The Laird o' Grant, that Highland Saint, \
+ That first layed hands on me. \
+ He played the cause on Peter Broon \
+ To let MacPherson dee. \
+
+ _[Chorus]_
+
+ Untie these bands from off my hands, \
+ And give to me my sword, \
+ An' there's no' a man in all Scotland, \
+ But I'll brave him at a word. \
+
+ There's some come here to see me hanged \
+ And some to buy my fiddle \
+ But before that I do part wi' her \
+ I'll brake her thro' the middle. \
+
+ _[Chorus]_
+
+ He took the fiddle into both his hands \
+ And he broke it o'er a stone \
+ Says there's nae other hand shall play on thee \
+ When I am dead and gone. \
+
+ O, little did my mother think \
+ When she first cradled me \
+ That I would turn a rovin' boy \
+ And die on the gallows tree. \
+
+ _[Chorus]_
+
+ The reprieve was a comin' o'er the brig o' Banff, \
+ To let MacPherson free; \
+ But they put the clock a quarter afore, \
+ And hanged him to the tree. \
+
+ _[Chorus]_
+
+]
diff --git a/src/songs/MollyMalone.ly b/src/songs/MollyMalone.ly
index 9772e5b..30050d6 100644
--- a/src/songs/MollyMalone.ly
+++ b/src/songs/MollyMalone.ly
@@ -1,5 +1,6 @@
\version "2.18.2"
\include "articulate.ly"
+\include "../setup.ly"
\header {
title = "Molly Malone"
diff --git a/src/songs/MollyMalone.tex b/src/songs/MollyMalone.tex
deleted file mode 100644
index 42164a5..0000000
--- a/src/songs/MollyMalone.tex
+++ /dev/null
@@ -1,31 +0,0 @@
-\begin{center}
-In Dublin's fair city, \\
-Where the girls are so pretty, \\
-I first set my eyes on sweet Molly Malone, \\
-As she wheeled her wheel-barrow, \\
-Through streets broad and narrow, \\
-Crying, "Cockles and mussels, alive, alive, oh!" \\
-~\\
-\textit{[Chorus] \\
-Alive, alive, oh, \\
-Alive, alive, oh, \\
-Crying "Cockles and mussels, alive, alive, oh". \\}
-~\\
-She was a fishmonger, \\
-But sure 'twas no wonder, \\
-For so were her father and mother before, \\
-And they each wheeled their barrow, \\
-Through streets broad and narrow, \\
-Crying, "Cockles and mussels, alive, alive, oh!" \\
-~\\
-\textit{[Chorus] \\ }
-~\\
-She died of a fever, \\
-And no one could save her, \\
-And that was the end of sweet Molly Malone. \\
-Now her ghost wheels her barrow, \\
-Through streets broad and narrow, \\
-Crying, "Cockles and mussels, alive, alive, oh!" \\
-~\\
-\textit{[Chorus] \\ }
-\end{center}
diff --git a/src/songs/MollyMalone.typ b/src/songs/MollyMalone.typ
new file mode 100644
index 0000000..cb7eabe
--- /dev/null
+++ b/src/songs/MollyMalone.typ
@@ -0,0 +1,29 @@
+In Dublin's fair city, \
+Where the girls are so pretty, \
+I first set my eyes on sweet Molly Malone, \
+As she wheeled her wheel-barrow, \
+Through streets broad and narrow, \
+Crying, "Cockles and mussels, alive, alive, oh!" \
+
+_[Chorus] \
+Alive, alive, oh, \
+Alive, alive, oh, \
+Crying "Cockles and mussels, alive, alive, oh"._
+
+She was a fishmonger, \
+But sure 'twas no wonder, \
+For so were her father and mother before, \
+And they each wheeled their barrow, \
+Through streets broad and narrow, \
+Crying, "Cockles and mussels, alive, alive, oh!" \
+
+_[Chorus]_
+
+She died of a fever, \
+And no one could save her, \
+And that was the end of sweet Molly Malone. \
+Now her ghost wheels her barrow, \
+Through streets broad and narrow, \
+Crying, "Cockles and mussels, alive, alive, oh!" \
+
+_[Chorus]_
diff --git a/src/songs/MuirsheenDurkin.ly b/src/songs/MuirsheenDurkin.ly
index 2f533af..36fc871 100644
--- a/src/songs/MuirsheenDurkin.ly
+++ b/src/songs/MuirsheenDurkin.ly
@@ -1,5 +1,6 @@
\version "2.18.2"
\include "articulate.ly"
+\include "../setup.ly"
\header {
title = "Muirsheen Durkin"
diff --git a/src/songs/MuirsheenDurkin.tex b/src/songs/MuirsheenDurkin.tex
deleted file mode 100644
index 16554b0..0000000
--- a/src/songs/MuirsheenDurkin.tex
+++ /dev/null
@@ -1,28 +0,0 @@
-\begin{center}
-In the days I went a courting, I was never tired of sporting \\
-To the alehouse and the playhouse and many's the house besides, \\
-So I told me brother Seamus I'd go off and be right famous \\
-And before I'd return again I'd roam the whole world wide. \\
-~\\
-\textit{[Chorus] \\
-So goodbye, Muirsheen Durkin, I'm sick and tired of working, \\
-No more I'll dig the praties, no longer I'll be poor. \\
-For as sure as me name is Carney \\
-I'll be off to California, where instead of digging praties \\
-I'll be digging lumps of gold. \\}
-~\\
-I've courted girls in Blarney, in Kanturk, and in Killarney \\
-In Passage, and in Queenstown--that is, the Cobh of Cork. \\
-But goodbye to all this pleasure, for I'm going to take me leisure \\
-And the next time that you hear from me \\
-Will be a letter from New York. \\
-~\\
-\textit{[Chorus] \\}
-~\\
-Goodbye to all the boys at home, I'm sailing far across the foam \\
-To try to make me fortune in far America, \\
-For there's silver there aplenty for the poor man and the gentry \\
-And when I do come back again I never more will stray. \\
-~\\
-\textit{[Chorus] \\}
-\end{center}
diff --git a/src/songs/MuirsheenDurkin.typ b/src/songs/MuirsheenDurkin.typ
new file mode 100644
index 0000000..3004a5f
--- /dev/null
+++ b/src/songs/MuirsheenDurkin.typ
@@ -0,0 +1,26 @@
+In the days I went a courting, I was never tired of sporting \
+To the alehouse and the playhouse and many's the house besides, \
+So I told me brother Seamus I'd go off and be right famous \
+And before I'd return again I'd roam the whole world wide. \
+
+_[Chorus] \
+So goodbye, Muirsheen Durkin, I'm sick and tired of working, \
+No more I'll dig the praties, no longer I'll be poor. \
+For as sure as me name is Carney \
+I'll be off to California, where instead of digging praties \
+I'll be digging lumps of gold._
+
+I've courted girls in Blarney, in Kanturk, and in Killarney \
+In Passage, and in Queenstown--that is, the Cobh of Cork. \
+But goodbye to all this pleasure, for I'm going to take me leisure \
+And the next time that you hear from me \
+Will be a letter from New York. \
+
+_[Chorus]_
+
+Goodbye to all the boys at home, I'm sailing far across the foam \
+To try to make me fortune in far America, \
+For there's silver there aplenty for the poor man and the gentry \
+And when I do come back again I never more will stray. \
+
+_[Chorus]_
diff --git a/src/songs/NationOnceAgain.ly b/src/songs/NationOnceAgain.ly
index 74f9db7..1961a07 100644
--- a/src/songs/NationOnceAgain.ly
+++ b/src/songs/NationOnceAgain.ly
@@ -1,5 +1,6 @@
\version "2.18.2"
\include "articulate.ly"
+\include "../setup.ly"
\header {
title = "A Nation Once Again"
diff --git a/src/songs/NationOnceAgain.tex b/src/songs/NationOnceAgain.tex
deleted file mode 100644
index 1901d7e..0000000
--- a/src/songs/NationOnceAgain.tex
+++ /dev/null
@@ -1,51 +0,0 @@
-\begin{multicols*}{2}
-\begin{center}
-When boyhood's fire was in my blood \\
-I read of ancient freemen, \\
-For Greece and Rome who bravely stood, \\
-Three hundred men and three men; \\
-And then I prayed I yet might see \\
-Our fetters rent in twain, \\
-And Ireland, long a province, be. \\
-A Nation once again! \\
-~\\
-\textit{[Chorus] \\
-A Nation once again, \\
-A Nation once again, \\
-And lreland, long a province, be \\
-A Nation once again! \\}
-~\\
-And from that time, through wildest woe, \\
-That hope has shone a far light, \\
-Nor could love's brightest summer glow \\
-Outshine that solemn starlight; \\
-It seemed to watch above my head \\
-In forum, field and fane, \\
-Its angel voice sang round my bed, \\
-A Nation once again! \\
-~\\
-\textit{[Chorus] \\}
-~\\
-It whisper'd too, that freedom's ark \\
-And service high and holy, \\
-Would be profaned by feelings dark \\
-And passions vain or lowly; \\
-For, Freedom comes from God's right hand, \\
-And needs a Godly train; \\
-And righteous men must make our land \\
-A Nation once again! \\
-~\\
-\textit{[Chorus] \\}
-~\\
-So, as I grew from boy to man, \\
-I bent me to that bidding \\
-My spirit of each selfish plan \\
-And cruel passion ridding; \\
-For, thus I hoped some day to aid, \\
-Oh, can such hope be vain? \\
-When my dear country shall be made \\
-A Nation once again! \\
-~\\
-\textit{[Chorus] \\}
-\end{center}
-\end{multicols*}
diff --git a/src/songs/NationOnceAgain.typ b/src/songs/NationOnceAgain.typ
new file mode 100644
index 0000000..58852d7
--- /dev/null
+++ b/src/songs/NationOnceAgain.typ
@@ -0,0 +1,51 @@
+#columns(2, gutter: 11pt)[
+
+ When boyhood's fire was in my blood \
+ I read of ancient freemen, \
+ For Greece and Rome who bravely stood, \
+ Three hundred men and three men; \
+ And then I prayed I yet might see \
+ Our fetters rent in twain, \
+ And Ireland, long a province, be. \
+ A Nation once again! \
+
+ _[Chorus] \
+A Nation once again, \
+A Nation once again, \
+And lreland, long a province, be \
+A Nation once again!_
+
+ And from that time, through wildest woe, \
+ That hope has shone a far light, \
+ Nor could love's brightest summer glow \
+ Outshine that solemn starlight; \
+ It seemed to watch above my head \
+ In forum, field and fane, \
+ Its angel voice sang round my bed, \
+ A Nation once again! \
+
+ _[Chorus]_
+
+ It whisper'd too, that freedom's ark \
+ And service high and holy, \
+ Would be profaned by feelings dark \
+ And passions vain or lowly; \
+ For, Freedom comes from God's right hand, \
+ And needs a Godly train; \
+ And righteous men must make our land \
+ A Nation once again! \
+
+ _[Chorus]_
+
+ So, as I grew from boy to man, \
+ I bent me to that bidding \
+ My spirit of each selfish plan \
+ And cruel passion ridding; \
+ For, thus I hoped some day to aid, \
+ Oh, can such hope be vain? \
+ When my dear country shall be made \
+ A Nation once again! \
+
+ _[Chorus]_
+
+]
diff --git a/src/songs/PartingGlass.ly b/src/songs/PartingGlass.ly
index e529b70..f85470a 100644
--- a/src/songs/PartingGlass.ly
+++ b/src/songs/PartingGlass.ly
@@ -1,5 +1,6 @@
\version "2.18.2"
\include "articulate.ly"
+\include "../setup.ly"
\header {
title = "The Parting Glass"
diff --git a/src/songs/PartingGlass.tex b/src/songs/PartingGlass.tex
deleted file mode 100644
index d2c15bd..0000000
--- a/src/songs/PartingGlass.tex
+++ /dev/null
@@ -1,28 +0,0 @@
-\begin{center}
-Of all the money that e'er I spent \\
-I've spent it in good company \\
-And all the harm that I ever did \\
-Alas it was to none but me \\
-And all I've done for want of wit \\
-To memory now I can't recall \\
-So fill to me the parting glass \\
-Good night and joy be with you all. \\
-~\\
-If I had money enough to spend \\
-And leisure time to sit awhile \\
-There is a fair maid in this town \\
-That sorely has my heart beguiled \\
-Her rosy cheeks and ruby lips \\
-I own she has my heart enthralled \\
-So fill to me the parting glass \\
-Good night and joy be with you all. \\
-~\\
-Oh, all the comrades that e're I had \\
-They're sorry for my going away \\
-And all the sweethearts that e'er I had \\
-They'd wish me one more day to stay \\
-But since it falls unto my lot \\
-That I should rise and you should not \\
-I'll gently rise and softly call \\
-Good night and joy be with you all. \\
-\end{center}
diff --git a/src/songs/PartingGlass.typ b/src/songs/PartingGlass.typ
new file mode 100644
index 0000000..725e96f
--- /dev/null
+++ b/src/songs/PartingGlass.typ
@@ -0,0 +1,26 @@
+Of all the money that e'er I spent \
+I've spent it in good company \
+And all the harm that I ever did \
+Alas it was to none but me \
+And all I've done for want of wit \
+To memory now I can't recall \
+So fill to me the parting glass \
+Good night and joy be with you all. \
+
+If I had money enough to spend \
+And leisure time to sit awhile \
+There is a fair maid in this town \
+That sorely has my heart beguiled \
+Her rosy cheeks and ruby lips \
+I own she has my heart enthralled \
+So fill to me the parting glass \
+Good night and joy be with you all. \
+
+Oh, all the comrades that e're I had \
+They're sorry for my going away \
+And all the sweethearts that e'er I had \
+They'd wish me one more day to stay \
+But since it falls unto my lot \
+That I should rise and you should not \
+I'll gently rise and softly call \
+Good night and joy be with you all. \
diff --git a/src/songs/RisingOfTheMoon.ly b/src/songs/RisingOfTheMoon.ly
index 2ffa843..7c72eaa 100644
--- a/src/songs/RisingOfTheMoon.ly
+++ b/src/songs/RisingOfTheMoon.ly
@@ -1,5 +1,6 @@
\version "2.18.2"
\include "articulate.ly"
+\include "../setup.ly"
\header {
title = "The Rising of the Moon"
diff --git a/src/songs/RisingOfTheMoon.tex b/src/songs/RisingOfTheMoon.typ
similarity index 56%
rename from src/songs/RisingOfTheMoon.tex
rename to src/songs/RisingOfTheMoon.typ
index 0113a99..a8943dc 100644
--- a/src/songs/RisingOfTheMoon.tex
+++ b/src/songs/RisingOfTheMoon.typ
@@ -1,29 +1,27 @@
-\begin{center}
-"Oh! then tell me, Shawn O'Ferrall, tell me why you hurry so?" \\
-"Hush ma bouchal, hush and listen", and his cheeks were all a-glow. \\
-"I bear orders from the captain, make you ready quick and soon, \\
-For the pikes must be together by the risin' of the moon". \\
-By the risin' of the moon, by the risin' of the moon, \\
-For the pikes must be together by the risin' of the moon. \\
-~\\
-"Oh! then tell me, Shawn O'Ferrall, where the gatherin' is to be?" \\
-"In the ould spot by the river, right well known to you and me. \\
-One word more - for signal token whistle up the marchin' tune, \\
-With your pike upon your shoulder, by the risin' of the moon". \\
-By the risin' of the moon, by the risin' of the moon, \\
-With your pike upon your shoulder, by the risin' of the moon. \\
-~\\
-Out of many a mudwall cabin eyes were watching through the night, \\
-Many a manly heart was throbbing for the coming morning light. \\
-Rumours ran along the valleys like the banshee's lonely croon, \\
-And a thousand blades were flashing by the risin' of the moon. \\
-By the risin' of the moon, by the risin' of the moon, \\
-And a thousand blades were flashing by the risin' of the moon. \\
-~\\
-All along the singing river that dark mass of men was seen, \\
-Far above their shining weapons hung their own beloved green. \\
-"Death to ev'ry foe and traitor! Forward! strike the marchin' tune, \\
-And hurrah, my boys, for freedom! 'Tis the risin' of the moon". \\
-'Tis the risin' of the moon, 'Tis the risin' of the moon, \\
-And hurrah my boys for freedom! 'Tis the risin' of the moon. \\
-\end{center}
+"Oh! then tell me, Shawn O'Ferrall, tell me why you hurry so?" \
+"Hush ma bouchal, hush and listen", and his cheeks were all a-glow. \
+"I bear orders from the captain, make you ready quick and soon, \
+For the pikes must be together by the risin' of the moon". \
+By the risin' of the moon, by the risin' of the moon, \
+For the pikes must be together by the risin' of the moon. \
+
+"Oh! then tell me, Shawn O'Ferrall, where the gatherin' is to be?" \
+"In the ould spot by the river, right well known to you and me. \
+One word more - for signal token whistle up the marchin' tune, \
+With your pike upon your shoulder, by the risin' of the moon". \
+By the risin' of the moon, by the risin' of the moon, \
+With your pike upon your shoulder, by the risin' of the moon. \
+
+Out of many a mudwall cabin eyes were watching through the night, \
+Many a manly heart was throbbing for the coming morning light. \
+Rumours ran along the valleys like the banshee's lonely croon, \
+And a thousand blades were flashing by the risin' of the moon. \
+By the risin' of the moon, by the risin' of the moon, \
+And a thousand blades were flashing by the risin' of the moon. \
+
+All along the singing river that dark mass of men was seen, \
+Far above their shining weapons hung their own beloved green. \
+"Death to ev'ry foe and traitor! Forward! strike the marchin' tune, \
+And hurrah, my boys, for freedom! 'Tis the risin' of the moon". \
+'Tis the risin' of the moon, 'Tis the risin' of the moon, \
+And hurrah my boys for freedom! 'Tis the risin' of the moon. \
diff --git a/src/songs/SpancilHill.ly b/src/songs/SpancilHill.ly
index 89dbcba..f8adab5 100644
--- a/src/songs/SpancilHill.ly
+++ b/src/songs/SpancilHill.ly
@@ -1,5 +1,6 @@
\version "2.18.2"
\include "articulate.ly"
+\include "../setup.ly"
\header {
title = "Spancil Hill"
diff --git a/src/songs/SpancilHill.tex b/src/songs/SpancilHill.tex
deleted file mode 100644
index 8dc34dc..0000000
--- a/src/songs/SpancilHill.tex
+++ /dev/null
@@ -1,56 +0,0 @@
-\begin{center}
-Last night as I lay dreaming, of the pleasant days gone by, \\
-My mind being bent on rambling and to Erin’s Isle I did fly. \\
-I stepped on board a vision and sailed out with a will, \\
-‘Till I gladly came to anchor at the Cross of Spancil Hill. \\
-~\\
-Enchanted by the novelty, delighted with the scenes, \\
-Where in my early childhood, I often times have been. \\
-I thought I heard a murmur, I think I hear it still, \\
-‘Tis that little stream of water at the Cross of Spancil Hill. \\
-~\\
-And to amuse my fancy, I lay upon the ground, \\
-Where all my school companions, in crowds assembled ’round. \\
-Some have grown to manhood, while more their graves did fill, \\
-Oh I thought we were all young again, at the Cross of Spancil Hill. \\
-~\\
-It being on a Sabbath morning, I thought I heard a bell, \\
-O’er hills and vallies sounded, in notes that seemed to tell, \\
-That Father Dan was coming, his duty to fulfill, \\
-At the parish church of Clooney, just one mile from Spancil Hill. \\
-~\\
-And when our duty did commence, we all knelt down in prayer, \\
-In hopes for to be ready, to climb the Golden Stair. \\
-And when back home returning, we danced with right good will, \\
-To Martin Moilens music, at the Cross of Spancil Hill. \\
-~\\
-It being on the twenty third of June, the day before the fair, \\
-Sure Erin’s sons and daughters, they all assembled there. \\
-The young, the old, the stout and the bold, they came to sport and kill, \\
-What a curious combination, at the Fair of Spancil Hill. \\
-~\\
-I went into my old home, as every stone can tell, \\
-The old boreen was just the same, and the apple tree over the well, \\
-I miss my sister Ellen, my brothers Pat and Bill, \\
-Sure I only met my strange faces at my home in Spancil Hill. \\
-~\\
-I called to see my neighbours, to hear what they might say, \\
-The old were getting feeble, and the young ones turning grey. \\
-I met with tailor Quigley, he’s as brave as ever still, \\
-Sure he always made my breeches when I lived in Spancil Hill. \\
-~\\
-I paid a flying visit, to my first and only love, \\
-She’s as pure as any lily, and as gentle as a dove. \\
-She threw her arms around me, saying Mike I love you still, \\
-She is Mack the Rangers daughter, the Pride of Spancil Hill. \\
-~\\
-I thought I stooped to kiss her, as I did in days of yore, \\
-Says she Mike you’re only joking, as you often were before, \\
-The cock crew on the roost again, he crew both loud and shrill, \\
-And I awoke in California, many miles from Spancil Hill. \\
-~\\
-But when my vision faded, the tears came in my eyes, \\
-In hope to see that dear old spot, some day before I die. \\
-May the Joyous King of Angels, his Choicest Blessings spill, \\
-On that Glorious spot of Nature, the Cross of Spancil Hill. \\
-\end{center}
diff --git a/src/songs/SpancilHill.typ b/src/songs/SpancilHill.typ
new file mode 100644
index 0000000..ffa2359
--- /dev/null
+++ b/src/songs/SpancilHill.typ
@@ -0,0 +1,54 @@
+Last night as I lay dreaming, of the pleasant days gone by, \
+My mind being bent on rambling and to Erin’s Isle I did fly. \
+I stepped on board a vision and sailed out with a will, \
+‘Till I gladly came to anchor at the Cross of Spancil Hill. \
+
+Enchanted by the novelty, delighted with the scenes, \
+Where in my early childhood, I often times have been. \
+I thought I heard a murmur, I think I hear it still, \
+‘Tis that little stream of water at the Cross of Spancil Hill. \
+
+And to amuse my fancy, I lay upon the ground, \
+Where all my school companions, in crowds assembled ’round. \
+Some have grown to manhood, while more their graves did fill, \
+Oh I thought we were all young again, at the Cross of Spancil Hill. \
+
+It being on a Sabbath morning, I thought I heard a bell, \
+O’er hills and vallies sounded, in notes that seemed to tell, \
+That Father Dan was coming, his duty to fulfill, \
+At the parish church of Clooney, just one mile from Spancil Hill. \
+
+And when our duty did commence, we all knelt down in prayer, \
+In hopes for to be ready, to climb the Golden Stair. \
+And when back home returning, we danced with right good will, \
+To Martin Moilens music, at the Cross of Spancil Hill. \
+
+It being on the twenty third of June, the day before the fair, \
+Sure Erin’s sons and daughters, they all assembled there. \
+The young, the old, the stout and the bold, they came to sport and kill, \
+What a curious combination, at the Fair of Spancil Hill. \
+
+I went into my old home, as every stone can tell, \
+The old boreen was just the same, and the apple tree over the well, \
+I miss my sister Ellen, my brothers Pat and Bill, \
+Sure I only met my strange faces at my home in Spancil Hill. \
+
+I called to see my neighbours, to hear what they might say, \
+The old were getting feeble, and the young ones turning grey. \
+I met with tailor Quigley, he’s as brave as ever still, \
+Sure he always made my breeches when I lived in Spancil Hill. \
+
+I paid a flying visit, to my first and only love, \
+She’s as pure as any lily, and as gentle as a dove. \
+She threw her arms around me, saying Mike I love you still, \
+She is Mack the Rangers daughter, the Pride of Spancil Hill. \
+
+I thought I stooped to kiss her, as I did in days of yore, \
+Says she Mike you’re only joking, as you often were before, \
+The cock crew on the roost again, he crew both loud and shrill, \
+And I awoke in California, many miles from Spancil Hill. \
+
+But when my vision faded, the tears came in my eyes, \
+In hope to see that dear old spot, some day before I die. \
+May the Joyous King of Angels, his Choicest Blessings spill, \
+On that Glorious spot of Nature, the Cross of Spancil Hill. \
diff --git a/src/songs/StarOfTheCountyDown.ly b/src/songs/StarOfTheCountyDown.ly
index cf0e388..3fa8437 100644
--- a/src/songs/StarOfTheCountyDown.ly
+++ b/src/songs/StarOfTheCountyDown.ly
@@ -1,5 +1,6 @@
\version "2.18.2"
\include "articulate.ly"
+\include "../setup.ly"
\header {
title = "The Star of the County Down"
diff --git a/src/songs/StarOfTheCountyDown.tex b/src/songs/StarOfTheCountyDown.tex
deleted file mode 100644
index 9b1d25d..0000000
--- a/src/songs/StarOfTheCountyDown.tex
+++ /dev/null
@@ -1,51 +0,0 @@
-\begin{multicols*}{2}
-\begin{center}
-Near to Bambridge Town, in the County Down \\
-One morning in July, \\
-Down a boreen green came a sweet coleen, \\
-And she smiled as she passed me by; \\
-Oh, she looked so neat from her two white feet \\
-To the sheen of her nut-brown hair, \\
-Sure the coaxing elf, I'd to shake myself \\
-To make sure I was standing there \\
-~\\
-\textit{[Chorus] \\
-Oh, from Bantry Bay up to Derry Quay, \\
-And from Galway to Dublin Town \\
-No maid I've seen like the brown collen \\
-That I met in the County Down. \\ }
-~\\
-As she onward sped I shook my head \\
-And I gazed with a feeling quare; \\
-And I said, says I, to a passer-by, \\
-"Who's the maid with the nut-brown hair?" \\
-Oh, he smiled at me, and with pride says he, \\
-"That's the gem of Ireland's crown, \\
-She's young Rosie McCann from the banks of the Bann, \\
-She's the Star of the County Down." \\
-~\\
-\textit{[Chorus] \\ }
-~\\
-I've tavelled a bit, but never was hit \\
-Since my roving career began; \\
-But fair and square I surrended there \\
-To the charms of young Rose McCann. \\
-I'd a heart ot let and no tenant yet \\
-Did I meet with in shawl or gown, \\
-But in she went and I asked no rent \\
-From the Star of the County Down. \\
-~\\
-\textit{[Chorus] \\ }
-~\\
-At the crossroads fair, I'll be surely there \\
-And I'll dress in my Sunday clothes \\
-And I'll try sheep's eyes, and deludhering lies \\
-On the heart of the nut-brown Rose. \\
-No pipe I'll smoke, no horse I'll yoke \\
-Though with rust my plow turns brown, \\
-Till a smiling bride by my own fireside \\
-Sits the Star of the County Down. \\
-~\\
-\textit{[Chorus] \\ }
-\end{center}
-\end{multicols*}
diff --git a/src/songs/StarOfTheCountyDown.typ b/src/songs/StarOfTheCountyDown.typ
new file mode 100644
index 0000000..de74d22
--- /dev/null
+++ b/src/songs/StarOfTheCountyDown.typ
@@ -0,0 +1,51 @@
+#columns(2, gutter: 11pt)[
+
+ Near to Bambridge Town, in the County Down \
+ One morning in July, \
+ Down a boreen green came a sweet coleen, \
+ And she smiled as she passed me by; \
+ Oh, she looked so neat from her two white feet \
+ To the sheen of her nut-brown hair, \
+ Sure the coaxing elf, I'd to shake myself \
+ To make sure I was standing there \
+
+ _[Chorus] \
+Oh, from Bantry Bay up to Derry Quay, \
+And from Galway to Dublin Town \
+No maid I've seen like the brown collen \
+That I met in the County Down._
+
+ As she onward sped I shook my head \
+ And I gazed with a feeling quare; \
+ And I said, says I, to a passer-by, \
+ "Who's the maid with the nut-brown hair?" \
+ Oh, he smiled at me, and with pride says he, \
+ "That's the gem of Ireland's crown, \
+ She's young Rosie McCann from the banks of the Bann, \
+ She's the Star of the County Down." \
+
+ _[Chorus]_
+
+ I've tavelled a bit, but never was hit \
+ Since my roving career began; \
+ But fair and square I surrended there \
+ To the charms of young Rose McCann. \
+ I'd a heart ot let and no tenant yet \
+ Did I meet with in shawl or gown, \
+ But in she went and I asked no rent \
+ From the Star of the County Down. \
+
+ _[Chorus]_
+
+ At the crossroads fair, I'll be surely there \
+ And I'll dress in my Sunday clothes \
+ And I'll try sheep's eyes, and deludhering lies \
+ On the heart of the nut-brown Rose. \
+ No pipe I'll smoke, no horse I'll yoke \
+ Though with rust my plow turns brown, \
+ Till a smiling bride by my own fireside \
+ Sits the Star of the County Down. \
+
+ _[Chorus]_
+
+]
diff --git a/src/songs/WhiskeyInTheJar.ly b/src/songs/WhiskeyInTheJar.ly
index 9cb8feb..463ab33 100644
--- a/src/songs/WhiskeyInTheJar.ly
+++ b/src/songs/WhiskeyInTheJar.ly
@@ -1,5 +1,6 @@
\version "2.18.2"
\include "articulate.ly"
+\include "../setup.ly"
\header {
title = "Whiskey in the Jar"
diff --git a/src/songs/WhiskeyInTheJar.tex b/src/songs/WhiskeyInTheJar.tex
deleted file mode 100644
index bd0b8d9..0000000
--- a/src/songs/WhiskeyInTheJar.tex
+++ /dev/null
@@ -1,51 +0,0 @@
-\begin{center}
-As I was going over Kilgarry Mountain, \\
-I spied Captain Farrell and his money he was countin'. \\
-I first produced me pistol, and then produced me rapier, \\
-Sayin' stand and deliver for I am your bold receiver. \\
-~\\
-\textit{[Chorus] \\
-Well shirigim duraham da \\
-Wack fall the daddy oh, wack fall the daddy oh \\
-There's whiskey in the jar. \\}
-~\\
-He counted out his money, and it made a pretty penny, \\
-I put it in me pocket, and I took it home to Jenny. \\
-She sighed and she swore that she never would deceive me. \\
-But the devil take the women for the always lie so easy. \\
-~\\
-\textit{[Chorus] \\}
-~\\
-I went into me chamber all for to take a slumber, \\
-To dream of gold and girls and of course it was no wonder, \\
-Me Jenny took me charges and she filled them up with water. \\
-Called on Captain Farrell to get ready for the slaughter. \\
-~\\
-\textit{[Chorus] \\}
-~\\
-Next morning early before I rose to travel, \\
-There came a band of footmen and likewise Captain Farrell \\
-I goes to draw me pistol for she'd stole away my rapier, \\
-But a prisoner I was taken, I couldn't shoot the water. \\
-~\\
-\textit{[Chorus] \\}
-~\\
-They put me into jail with a judge all a writin' \\
-For robbin' Captain Farrel on Kilgary Moutnain. \\
-But they didn't take me fists so I knocked the jailer down, \\
-And bid a farewell to this tightfisted town. \\
-~\\
-\textit{[Chorus] \\}
-~\\
-I'd like to find me brother, the one that's in the army, \\
-I don't know where he's stationed, in Cork or in Killarney. \\
-Together we'd go roving o'er the mountains of Killkenney \\
-And I swear he'd treat me better than darling sporting Jenny. \\
-~\\
-\textit{[Chorus] \\}
-~\\
-There's some takes delight in the carriages and rolling, \\
-Some takes delight in the hurley or the bowlin' \\
-But I takes delight in the juice of the barley, \\
-Counting pretty maids in the morning oh so early. \\
-\end{center}
diff --git a/src/songs/WhiskeyInTheJar.typ b/src/songs/WhiskeyInTheJar.typ
new file mode 100644
index 0000000..6b4e1c4
--- /dev/null
+++ b/src/songs/WhiskeyInTheJar.typ
@@ -0,0 +1,49 @@
+As I was going over Kilgarry Mountain, \
+I spied Captain Farrell and his money he was countin'. \
+I first produced me pistol, and then produced me rapier, \
+Sayin' stand and deliver for I am your bold receiver. \
+
+_[Chorus]
+Well shirigim duraham da \
+Wack fall the daddy oh, wack fall the daddy oh \
+There's whiskey in the jar._
+
+He counted out his money, and it made a pretty penny, \
+I put it in me pocket, and I took it home to Jenny. \
+She sighed and she swore that she never would deceive me. \
+But the devil take the women for the always lie so easy. \
+
+_[Chorus]_
+
+I went into me chamber all for to take a slumber, \
+To dream of gold and girls and of course it was no wonder, \
+Me Jenny took me charges and she filled them up with water. \
+Called on Captain Farrell to get ready for the slaughter. \
+
+_[Chorus]_
+
+Next morning early before I rose to travel, \
+There came a band of footmen and likewise Captain Farrell \
+I goes to draw me pistol for she'd stole away my rapier, \
+But a prisoner I was taken, I couldn't shoot the water. \
+
+_[Chorus]_
+
+They put me into jail with a judge all a writin' \
+For robbin' Captain Farrel on Kilgary Moutnain. \
+But they didn't take me fists so I knocked the jailer down, \
+And bid a farewell to this tightfisted town. \
+
+_[Chorus]_
+
+I'd like to find me brother, the one that's in the army, \
+I don't know where he's stationed, in Cork or in Killarney. \
+Together we'd go roving o'er the mountains of Killkenney \
+And I swear he'd treat me better than darling sporting Jenny. \
+
+_[Chorus]_
+
+There's some takes delight in the carriages and rolling, \
+Some takes delight in the hurley or the bowlin' \
+But I takes delight in the juice of the barley, \
+Counting pretty maids in the morning oh so early. \
diff --git a/src/songs/WildRover.ly b/src/songs/WildRover.ly
index db97420..587d3b0 100644
--- a/src/songs/WildRover.ly
+++ b/src/songs/WildRover.ly
@@ -1,5 +1,6 @@
\version "2.18.2"
\include "articulate.ly"
+\include "../setup.ly"
\header {
title = "The Wild Rover"
diff --git a/src/songs/WildRover.tex b/src/songs/WildRover.tex
deleted file mode 100644
index 4f16fca..0000000
--- a/src/songs/WildRover.tex
+++ /dev/null
@@ -1,35 +0,0 @@
-\begin{multicols*}{2}
-\begin{center}
-I've been a wild rover for many a year \\
-And I've spent all my money on whiskey and beer, \\
-And now I'm returning with gold and great store \\
-And I never will play the wild rover no more \\
-~\\
-\textit{[Chorus] \\
-And it's no, nay, never \\
-No nay never no more \\
-Will I play the wild rover \\
-No never no more. \\ }
-~\\
-I went to an ale-house I used to frequent \\
-And I told the landlady me money was spent. \\
-I asked her for credit, she answered me "nay \\
-Such a custom as yours I could have any day." \\
-~\\
-\textit{[Chorus] \\}
-~\\
-I took from my pocket ten soverigns bright \\
-And the landlady's eyes opened wide with delight. \\
-She said "I have whiskey and wines of the best \\
-And the words that I spoke were only in jest." \\
-~\\
-\textit{[Chorus] \\}
-~\\
-I'll go home to my parents, confess what I've done \\
-And I'll ask them to pardon their prodigal son. \\
-And if they forgive me as oftimes before \\
-Sure I never will play the wild rover no more. \\
-~\\
-\textit{[Chorus] \\}
-\end{center}
-\end{multicols*}
diff --git a/src/songs/WildRover.typ b/src/songs/WildRover.typ
new file mode 100644
index 0000000..5655212
--- /dev/null
+++ b/src/songs/WildRover.typ
@@ -0,0 +1,35 @@
+#columns(2, gutter: 11pt)[
+
+ I've been a wild rover for many a year \
+ And I've spent all my money on whiskey and beer, \
+ And now I'm returning with gold and great store \
+ And I never will play the wild rover no more \
+
+ _[Chorus] \
+And it's no, nay, never \
+No nay never no more \
+Will I play the wild rover \
+No never no more._
+
+ I went to an ale-house I used to frequent \
+ And I told the landlady me money was spent. \
+ I asked her for credit, she answered me "nay \
+ Such a custom as yours I could have any day." \
+
+ _[Chorus]_
+
+ I took from my pocket ten soverigns bright \
+ And the landlady's eyes opened wide with delight. \
+ She said "I have whiskey and wines of the best \
+ And the words that I spoke were only in jest." \
+
+ _[Chorus]_
+
+ I'll go home to my parents, confess what I've done \
+ And I'll ask them to pardon their prodigal son. \
+ And if they forgive me as oftimes before \
+ Sure I never will play the wild rover no more. \
+
+ _[Chorus]_
+
+]
diff --git a/src/title.tex b/src/title.tex
deleted file mode 100644
index 67c9855..0000000
--- a/src/title.tex
+++ /dev/null
@@ -1,25 +0,0 @@
-\begin{titlepage}
- \begin{center}
- \includegraphics[width=0.50\textwidth]{images/title.png}\\
-
- \rule{\linewidth}{0.5mm} \\[0.4cm]
- { \huge \bfseries Sing-Alongs}
-
- \rule{\linewidth}{0.5mm} \\[1.5cm]
-
- \begin{minipage}{0.5\textwidth}
- \begin{flushleft} \large
- \emph{Project Website:} \\
- \href{https://code.vanwa.ch/sebastian/sing-alongs}{code.vanwa.ch/sebastian/sing-alongs} \\
- \end{flushleft}
- \end{minipage}
- \begin{minipage}{0.4\textwidth}
- \begin{flushright} \large
- \emph{Revision:} \\
- \texttt{\revision} \\
- \end{flushright}
- \end{minipage}
-
- \end{center}
-
-\end{titlepage}
diff --git a/src/title.typ b/src/title.typ
new file mode 100644
index 0000000..46fc2d9
--- /dev/null
+++ b/src/title.typ
@@ -0,0 +1,28 @@
+#let titlepage() = {
+ set page(
+ margin: (left: 20mm, right: 20mm, top: 30mm, bottom: 30mm),
+ numbering: none,
+ number-align: center,
+ )
+
+ set par(leading: 0.5em)
+
+ v(1cm)
+ align(center, image("assets/title.png", width: 50%))
+
+ v(5mm)
+ align(
+ center,
+ text(
+ 4em,
+ weight: 700,
+ "Sing-Alongs",
+ ),
+ )
+
+ v(5mm)
+ align(
+ center,
+ link("https://code.vanwa.ch/shu/sing-alongs"),
+ )
+}