# HG changeset patch
# User Jim Hague <jim.hague@acm.org>
# Date 1553598058 0
# Node ID 6d05d414051dc61b67d64670a43d71cb25a0a8e6
# Parent  f91c617a4de2e05534aa2eef9bd236040b6559c1# Parent  7cc06a68a572d1e150f36016b031677f8f149b1e
Automated merge with ssh://hg.cryhavoc.org.uk/dottes

diff -r f91c617a4de2 -r 6d05d414051d Morris/image.jpg
Binary file Morris/image.jpg has changed
diff -r f91c617a4de2 -r 6d05d414051d Morris/image.md
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Morris/image.md	Tue Mar 26 11:00:58 2019 +0000
@@ -0,0 +1,1 @@
+Barbara Payne, _Havoc Musicians_
diff -r f91c617a4de2 -r 6d05d414051d Session/image.jpg
Binary file Session/image.jpg has changed
diff -r f91c617a4de2 -r 6d05d414051d Session/image.md
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Session/image.md	Tue Mar 26 11:00:58 2019 +0000
@@ -0,0 +1,1 @@
+Barbara Payne, _The Harlequin_
diff -r f91c617a4de2 -r 6d05d414051d dottes.tex
--- a/dottes.tex	Mon Mar 25 18:26:04 2019 +0000
+++ b/dottes.tex	Tue Mar 26 11:00:58 2019 +0000
@@ -1,6 +1,7 @@
 \input{docclass.tex}
 
 \usepackage{array}
+\usepackage{caption}
 \usepackage{color}
 \usepackage{fontspec}
 \usepackage{graphicx}
@@ -77,10 +78,13 @@
 
 % Show the section graphic.
 % Args are the graphic filename.
-\newcommand{\showsectiongraphic}[1]{%
-  \begin{center}
-  \includegraphics[height=0.60\textheight,keepaspectratio]{#1}
-  \end{center}
+\newcommand{\showsectiongraphic}[2]{%
+  \begin{figure}[h!]
+    \begin{center}
+      \includegraphics[height=0.60\textheight,keepaspectratio]{#1}
+    \end{center}
+    \ifemptyarg{#2}{}{\caption*{#2}}
+  \end{figure}
 }
 
 % ----- Paper size document setup
diff -r f91c617a4de2 -r 6d05d414051d dottes.tex.section-tunes
--- a/dottes.tex.section-tunes	Mon Mar 25 18:26:04 2019 +0000
+++ b/dottes.tex.section-tunes	Tue Mar 26 11:00:58 2019 +0000
@@ -15,7 +15,7 @@
 
 \ifdim \paperheight<200mm \newpage \fi
 
-\showsectiongraphic{@SECTION@-image.jpg}
+\showsectiongraphic{@SECTION@-image.jpg}{\input{@SECTION@-image.tex}}
 
 \vspace*{\fill}
 
diff -r f91c617a4de2 -r 6d05d414051d makeBooke.sh
--- a/makeBooke.sh	Mon Mar 25 18:26:04 2019 +0000
+++ b/makeBooke.sh	Tue Mar 26 11:00:58 2019 +0000
@@ -74,7 +74,7 @@
             touch $builddir/$1-$item
         fi
     done
-    for item in intro
+    for item in intro image
     do
         rm -f $builddir/$1-$item.tex
         if [ -r $section/$item.md ]; then
@@ -84,8 +84,8 @@
         fi
     done
 
-    sed -e "s/@SECTION@/$1/" -e "s/@SECTIONNAME@/$sectionname/" dottes.tex.section-tunes >> $builddir/tunes.tex
-    sed -e "s/@SECTION@/$1/" -e "s/@SECTIONNAME@/$sectionname/" dottes.tex.section-firstlines >> $builddir/firstlines.tex
+    sed -e "s/@SECTION@/$1/g" -e "s/@SECTIONNAME@/$sectionname/g" dottes.tex.section-tunes >> $builddir/tunes.tex
+    sed -e "s/@SECTION@/$1/g" -e "s/@SECTIONNAME@/$sectionname/g" dottes.tex.section-firstlines >> $builddir/firstlines.tex
 
     shift
 done