Mercurial > dottes

changeset 603:ef0d66742e01

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Revise build to allow multi-section books.
author Jim Hague <jim.hague@acm.org>
date Fri, 04 Nov 2016 17:59:10 +0000
parents c95364aa550c
children 3b8a457ea3c9
files dottes.tex makeAll.sh makeBooke.sh
diffstat 3 files changed, 66 insertions(+), 34 deletions(-) [+]
line wrap: on
line diff
--- a/dottes.tex	Fri Nov 04 00:48:23 2016 +0000
+++ b/dottes.tex	Fri Nov 04 17:59:10 2016 +0000
@@ -18,7 +18,6 @@
 
 \usepackage{hyperref}
 \hypersetup{
-    bookmarks=true,%
     colorlinks=true,%
     citecolor=black,%
     filecolor=black,%
--- a/makeAll.sh	Fri Nov 04 00:48:23 2016 +0000
+++ b/makeAll.sh	Fri Nov 04 17:59:10 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"
 }
--- a/makeBooke.sh	Fri Nov 04 00:48:23 2016 +0000
+++ b/makeBooke.sh	Fri Nov 04 17:59:10 2016 +0000
@@ -7,47 +7,80 @@
 # makeBookeTunePages.sh.
 #
 
-if [ $# != 2 ]; then
-    echo "Usage: makeBooke.sh <book dir name> <A4|A5>"
+if [ $# -lt 2 ]; then
+    echo "Usage: makeBooke.sh <A4|A5> <book dir name> [<book dir name>...]"
     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 $builddir/$1-$item.txt
-    if [ -r $booke/$item.txt ]; then
-        cp $booke/$item.txt $builddir/$item.txt
-        cp $booke/$item.txt $builddir/$1-$item.txt
-    else
-        touch $builddir/$item.txt
-        touch $builddir/$1-$item.txt
-    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 item in intro
-do
-    rm -f $builddir/$1-$item.tex
-    if [ -r $booke/$item.md ]; then
-        pandoc --from=markdown --to=latex --output=$builddir/$1-$item.tex $booke/$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
 
 for filename in $dir/*.${papersize}.tex
 do
@@ -61,6 +94,6 @@
 xelatex $booketex
 xelatex $booketex
 
-mv $bookepdf $dir/$1-${papersize}.pdf
+mv $bookepdf $dir/$bookename-${papersize}.pdf
 
 cd $dir