Mercurial > dottes

changeset 869:7cc06a68a572

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add optional image caption taken from <section>/image.md.
author Jim Hague <jim.hague@acm.org>
date Tue, 26 Mar 2019 11:00:35 +0000
parents 4d6e9af2bb6e
children 6d05d414051d
files Morris/image.md Session/image.md dottes.tex dottes.tex.section-tunes makeBooke.sh
diffstat 5 files changed, 14 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Morris/image.md	Tue Mar 26 11:00:35 2019 +0000
@@ -0,0 +1,1 @@
+Barbara Payne, _Havoc Musicians_
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Session/image.md	Tue Mar 26 11:00:35 2019 +0000
@@ -0,0 +1,1 @@
+Barbara Payne, _The Harlequin_
--- a/dottes.tex	Tue Mar 26 10:44:20 2019 +0000
+++ b/dottes.tex	Tue Mar 26 11:00:35 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
--- a/dottes.tex.section-tunes	Tue Mar 26 10:44:20 2019 +0000
+++ b/dottes.tex.section-tunes	Tue Mar 26 11:00:35 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}
 
--- a/makeBooke.sh	Tue Mar 26 10:44:20 2019 +0000
+++ b/makeBooke.sh	Tue Mar 26 11:00:35 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