Automated merge with ssh://hg.cryhavoc.org.uk/dottes

This commit is contained in:
Jim Hague 2019-03-26 11:00:58 +00:00
commit c8c7c1e33e
7 changed files with 14 additions and 8 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.0 MiB

After

Width:  |  Height:  |  Size: 2.4 MiB

1
Morris/image.md Normal file
View File

@ -0,0 +1 @@
Barbara Payne, _Havoc Musicians_

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.4 MiB

After

Width:  |  Height:  |  Size: 69 KiB

1
Session/image.md Normal file
View File

@ -0,0 +1 @@
Barbara Payne, _The Harlequin_

View File

@ -1,6 +1,7 @@
\input{docclass.tex} \input{docclass.tex}
\usepackage{array} \usepackage{array}
\usepackage{caption}
\usepackage{color} \usepackage{color}
\usepackage{fontspec} \usepackage{fontspec}
\usepackage{graphicx} \usepackage{graphicx}
@ -77,10 +78,13 @@
% Show the section graphic. % Show the section graphic.
% Args are the graphic filename. % Args are the graphic filename.
\newcommand{\showsectiongraphic}[1]{% \newcommand{\showsectiongraphic}[2]{%
\begin{figure}[h!]
\begin{center} \begin{center}
\includegraphics[height=0.60\textheight,keepaspectratio]{#1} \includegraphics[height=0.60\textheight,keepaspectratio]{#1}
\end{center} \end{center}
\ifemptyarg{#2}{}{\caption*{#2}}
\end{figure}
} }
% ----- Paper size document setup % ----- Paper size document setup

View File

@ -15,7 +15,7 @@
\ifdim \paperheight<200mm \newpage \fi \ifdim \paperheight<200mm \newpage \fi
\showsectiongraphic{@SECTION@-image.jpg} \showsectiongraphic{@SECTION@-image.jpg}{\input{@SECTION@-image.tex}}
\vspace*{\fill} \vspace*{\fill}

View File

@ -74,7 +74,7 @@ do
touch $builddir/$1-$item touch $builddir/$1-$item
fi fi
done done
for item in intro for item in intro image
do do
rm -f $builddir/$1-$item.tex rm -f $builddir/$1-$item.tex
if [ -r $section/$item.md ]; then if [ -r $section/$item.md ]; then
@ -84,8 +84,8 @@ do
fi fi
done done
sed -e "s/@SECTION@/$1/" -e "s/@SECTIONNAME@/$sectionname/" dottes.tex.section-tunes >> $builddir/tunes.tex sed -e "s/@SECTION@/$1/g" -e "s/@SECTIONNAME@/$sectionname/g" 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-firstlines >> $builddir/firstlines.tex
shift shift
done done