# HG changeset patch # User Jim Hague # Date 1478282359 0 # Node ID 3b8a457ea3c98cd41a0556a7c659fb248dd5bb65 # Parent 04fb44e2c9b77c0f25365b6ce89ae357e6bf97ce# Parent ef0d66742e01ea83f0d0c95dcb648bef81ee6064 Automated merge with ssh://hg.cryhavoc.org.uk/dottes diff -r 04fb44e2c9b7 -r 3b8a457ea3c9 dottes.tex --- a/dottes.tex Wed Nov 02 19:23:16 2016 +0000 +++ b/dottes.tex Fri Nov 04 17:59:19 2016 +0000 @@ -18,7 +18,6 @@ \usepackage{hyperref} \hypersetup{ - bookmarks=true,% colorlinks=true,% citecolor=black,% filecolor=black,% @@ -180,8 +179,6 @@ This collection is intended to help those like me who are inexpert with instrument and folk music generally, but have a little musical background. -\input{intro.tex} - Being folk tunes, many of the tunes herein have many variations. The music presented here is my attempt at reflecting what the musicians of Cry Havoc play. I'm in no way suggesting that they are @@ -220,17 +217,7 @@ \mainmatter -\addcontentsline{toc}{chapter}{Tunes} - -{ -\newcolumntype{L}{p{0.25\textwidth}}% -\newcolumntype{R}{>{\raggedleft\arraybackslash}p{0.25\textwidth}}% -\newcolumntype{C}{>{\centering\arraybackslash}X}% -\renewcommand{\tabularxcolumn}[1]{m{#1}}% -\renewcommand{\tabcolsep}{0pt} - \input{tunes.tex} -} % ----- @@ -242,13 +229,7 @@ You've heard it before, but don't remember the name. So here's a list of tune first lines to help you figure out what it is in time to join in. -{\renewcommand{\arraystretch}{2.5} -\setlength\LTleft{0pt} -\setlength\LTright{\fill} -\begin{longtable}{@{}>{\raggedright\arraybackslash}m{0.2\textwidth}r@{}} \input{firstlines.tex} -\end{longtable} -} % ----- Back cover page. A plain purple page. diff -r 04fb44e2c9b7 -r 3b8a457ea3c9 dottes.tex.section-firstlines --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/dottes.tex.section-firstlines Fri Nov 04 17:59:19 2016 +0000 @@ -0,0 +1,9 @@ +\section{@SECTION@ tunes} + +{\renewcommand{\arraystretch}{2.5} +\setlength\LTleft{0pt} +\setlength\LTright{\fill} +\begin{longtable}{@{}>{\raggedright\arraybackslash}m{0.2\textwidth}r@{}} +\input{@SECTION@-firstlines.tex} +\end{longtable} +} diff -r 04fb44e2c9b7 -r 3b8a457ea3c9 dottes.tex.section-tunes --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/dottes.tex.section-tunes Fri Nov 04 17:59:19 2016 +0000 @@ -0,0 +1,28 @@ +% ----- Tunes and intro page for a section. + +\newpage + +\addcontentsline{toc}{chapter}{@SECTION@ tunes} + +\vspace*{\fill} + +\begin{center} +{\Huge \input{@SECTION@-title.txt}}\\[\baselineskip] +{\Large \input{@SECTION@-subtitle.txt}} +\end{center} + +\vspace*{\fill} + +\input{@SECTION@-intro.tex} + +\newpage + +{ +\newcolumntype{L}{p{0.25\textwidth}}% +\newcolumntype{R}{>{\raggedleft\arraybackslash}p{0.25\textwidth}}% +\newcolumntype{C}{>{\centering\arraybackslash}X}% +\renewcommand{\tabularxcolumn}[1]{m{#1}}% +\renewcommand{\tabcolsep}{0pt} + +\input{@SECTION@-tunes.tex} +} diff -r 04fb44e2c9b7 -r 3b8a457ea3c9 makeAll.sh --- a/makeAll.sh Wed Nov 02 19:23:16 2016 +0000 +++ b/makeAll.sh Fri Nov 04 17:59:19 2016 +0000 @@ -11,10 +11,10 @@ { ./makeGraphics.sh "$1" ./makeBookeTunePages.sh "$1" - ./makeBooke.sh "$1" A4 - ./makeBooke.sh "$1" A5 + ./makeBooke.sh A4 "$1" + ./makeBooke.sh A4 "$1" ./makeBooklet.sh "$1" - ./makeBooke.sh "$1" Nook + ./makeBooke.sh Nook "$1" ./makeWebGraphics.sh "$1" ./makeWebAudio.sh "$1" ./makeWeb.sh "$1" "$1" "$2" @@ -24,10 +24,10 @@ { ./makeGraphics.sh "$1" ./makeBookeTunePages.sh "$1" - ./makeBooke.sh "$1" A4 - ./makeBooke.sh "$1" A5 + ./makeBooke.sh A4 "$1" + ./makeBooke.sh A5 "$1" ./makeBooklet.sh "$1" - ./makeBooke.sh "$1" Nook + ./makeBooke.sh Nook "$1" ./makeWebGraphics.sh "$1" ./makeWeb.sh "$1" "$2" "$3" } diff -r 04fb44e2c9b7 -r 3b8a457ea3c9 makeBooke.sh --- a/makeBooke.sh Wed Nov 02 19:23:16 2016 +0000 +++ b/makeBooke.sh Fri Nov 04 17:59:19 2016 +0000 @@ -7,41 +7,79 @@ # makeBookeTunePages.sh. # -if [ $# != 2 ]; then - echo "Usage: makeBooke.sh " +if [ $# -lt 2 ]; then + echo "Usage: makeBooke.sh [...]" exit 1 fi dir=`pwd` -booke=$dir/$1 -papersize=$2 builddir=$dir/build -booketex=$dir/dottes.tex +booketex=$builddir/dottes.tex bookepdf=$builddir/dottes.pdf +papersize=$1 +shift + mkdir -p $builddir +if [ $# -eq 1 ]; then + bookename=$1 + for item in title subtitle instrument + do + rm -f $builddir/$item.txt + if [ -r $1/$item.txt ]; then + cp $dir/$1/$item.txt $builddir/$item.txt + else + touch $builddir/$item.txt + fi + done +else + bookename="BumperBooke" + echo "The Bumper Booke" > $builddir/title.txt + echo "The collected Bookes of Bottes" > $builddir/subtitle.txt + rm -f $builddir/instrument.txt + if [ -r $1/instrument.txt ]; then + cp $1/instrument.txt $builddir/instrument.txt + else + touch $builddir/instrument.txt + fi +fi + cp dottes.tex $builddir cp buildno.txt $builddir cp buzzard.pdf $builddir -for item in title subtitle instrument + +rm -f $builddir/tunes.tex +rm -f $builddir/firstlines.tex + +while [ $# -gt 0 ] do - rm -f $builddir/$item.txt - if [ -r $booke/$item.txt ]; then - cp $booke/$item.txt $builddir - else - touch $builddir/$item.txt - fi -done -for item in intro -do - rm -f $builddir/$item.tex - if [ -r $booke/$item.md ]; then - pandoc --from=markdown --to=latex --output=$builddir/$item.tex $booke/$item.md - else - touch $builddir/$item.tex - fi + section=$dir/$1 + + for item in title subtitle instrument + do + rm -f $builddir/$1-$item.txt + if [ -r $section/$item.txt ]; then + cp $section/$item.txt $builddir/$1-$item.txt + else + touch $builddir/$1-$item.txt + fi + done + for item in intro + do + rm -f $builddir/$1-$item.tex + if [ -r $section/$item.md ]; then + pandoc --from=markdown --to=latex --output=$builddir/$1-$item.tex $section/$item.md + else + touch $builddir/$1-$item.tex + fi + done + + sed -e "s/@SECTION@/$1/" dottes.tex.section-tunes >> $builddir/tunes.tex + sed -e "s/@SECTION@/$1/" dottes.tex.section-firstlines >> $builddir/firstlines.tex + + shift done for filename in $dir/*.${papersize}.tex @@ -56,6 +94,6 @@ xelatex $booketex xelatex $booketex -mv $bookepdf $dir/$1-${papersize}.pdf +mv $bookepdf $dir/$bookename-${papersize}.pdf cd $dir diff -r 04fb44e2c9b7 -r 3b8a457ea3c9 makeBookeTunePages.sh --- a/makeBookeTunePages.sh Wed Nov 02 19:23:16 2016 +0000 +++ b/makeBookeTunePages.sh Fri Nov 04 17:59:19 2016 +0000 @@ -18,8 +18,8 @@ booke=$dir/$1 builddir=$dir/build graphicsdir=$dir/graphics/$1 -tunesoutput=$builddir/tunes.tex -indexoutput=$builddir/firstlines.tex +tunesoutput=$builddir/$1-tunes.tex +indexoutput=$builddir/$1-firstlines.tex mkdir -p $builddir