From a087c28ecfbdbbce64615f5d85bab0ad0030867f Mon Sep 17 00:00:00 2001 From: Jim Hague Date: Tue, 26 Mar 2019 11:00:35 +0000 Subject: [PATCH] Add optional image caption taken from
/image.md. --- Morris/image.md | 1 + Session/image.md | 1 + dottes.tex | 12 ++++++++---- dottes.tex.section-tunes | 2 +- makeBooke.sh | 6 +++--- 5 files changed, 14 insertions(+), 8 deletions(-) create mode 100644 Morris/image.md create mode 100644 Session/image.md diff --git a/Morris/image.md b/Morris/image.md new file mode 100644 index 0000000..9ff1b22 --- /dev/null +++ b/Morris/image.md @@ -0,0 +1 @@ +Barbara Payne, _Havoc Musicians_ diff --git a/Session/image.md b/Session/image.md new file mode 100644 index 0000000..ecebe29 --- /dev/null +++ b/Session/image.md @@ -0,0 +1 @@ +Barbara Payne, _The Harlequin_ diff --git a/dottes.tex b/dottes.tex index 9ee121d..07fda46 100644 --- a/dottes.tex +++ b/dottes.tex @@ -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 --git a/dottes.tex.section-tunes b/dottes.tex.section-tunes index c3b38d5..0188a3c 100644 --- a/dottes.tex.section-tunes +++ b/dottes.tex.section-tunes @@ -15,7 +15,7 @@ \ifdim \paperheight<200mm \newpage \fi -\showsectiongraphic{@SECTION@-image.jpg} +\showsectiongraphic{@SECTION@-image.jpg}{\input{@SECTION@-image.tex}} \vspace*{\fill} diff --git a/makeBooke.sh b/makeBooke.sh index 4f53122..e0f0cd2 100755 --- a/makeBooke.sh +++ b/makeBooke.sh @@ -74,7 +74,7 @@ do 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 @@ do 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