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

This commit is contained in:
Jim Hague 2019-08-07 08:21:26 +01:00
commit fc0d494ad6
4 changed files with 55 additions and 5 deletions

View File

@ -16,3 +16,4 @@ web/Library.*/
web/tunes.*/ web/tunes.*/
Morris-.* Morris-.*
Session-.* Session-.*
Library-.*

View File

@ -1,3 +1,16 @@
% Inside back cover.
\newpage
\thispagestyle{empty}
\hbox{}
% Back cover page - or it it?
\newpage
% Pad pages to multiple of 4.
\newcounter{frontpages}
\setcounter{frontpages}{3 + \thelastfrontmatterpage}
\padpages{4}{\thefrontpages}
\pagecolor{havocpurple} \pagecolor{havocpurple}
\thispagestyle{empty} \thispagestyle{empty}
\mbox{} \mbox{}

View File

@ -18,10 +18,12 @@
\includegraphics[width=0.5\textwidth,keepaspectratio]{buzzard} \includegraphics[width=0.5\textwidth,keepaspectratio]{buzzard}
\vfill \vfill
{\Large Compiled by Jim Hague}\\ {\Large Compiled by Jim Hague}\\
% Inside cover
% Inside front cover
\newpage \newpage
\pagecolor{white} \pagecolor{white}
\hbox{} \hbox{}
\newpage \newpage
{\Large \havocfont{Ye}}\\[\baselineskip] {\Large \havocfont{Ye}}\\[\baselineskip]
{\Huge \havocfont{Crie Havock}}\\[\baselineskip] {\Huge \havocfont{Crie Havock}}\\[\baselineskip]
@ -38,5 +40,5 @@
% Page appearance. % Page appearance.
\newcommand*{\pagestylemod}{} \newcommand*{\pagestylemod}{}
\newcommand*{\tunestart}{} \newcommand*{\tunestart}{\filbreak\vfill}
\newcommand*{\tuneend}{\vfill} \newcommand*{\tuneend}{}

View File

@ -1,11 +1,13 @@
\input{docclass.tex} \input{docclass.tex}
\usepackage{array} \usepackage{array}
\usepackage{calc}
\usepackage{caption} \usepackage{caption}
\usepackage{color} \usepackage{color}
\usepackage{fontspec} \usepackage{fontspec}
\usepackage{graphicx} \usepackage{graphicx}
\usepackage{fancyhdr} \usepackage{fancyhdr}
\usepackage{ifthen}
\usepackage[defaultlines=4,all]{nowidow} \usepackage[defaultlines=4,all]{nowidow}
\usepackage{tabularx} \usepackage{tabularx}
\usepackage{longtable} \usepackage{longtable}
@ -47,6 +49,15 @@
\fi} \fi}
\makeatother \makeatother
% Replace \mainmatter with one that does a \clearpage
% not a \cleardoublepage.
\makeatletter
\renewcommand\mainmatter{%
\clearpage
\@mainmattertrue
\pagenumbering{arabic}}
\makeatother
% Show the main tune graphic and optional change. % Show the main tune graphic and optional change.
% Args are: % Args are:
% 1. Tune name % 1. Tune name
@ -89,6 +100,28 @@
\end{figure} \end{figure}
} }
% Add blank pages to make total page count up to a multiple
% Args are:
% 1. Multiple desired
% 2. Pages before start of current page count
\newcounter{modpage}
\newcounter{modpageno}
\newcounter{modpagenodiv}
\newcommand{\padpages}[2]{%
\pagestyle{empty}%
\setcounter{modpageno}{\thepage + #2}%
\setcounter{modpagenodiv}{\themodpageno/#1}%
\setcounter{modpage}{\themodpageno - #1*\themodpagenodiv}%
\ifthenelse{\themodpage=0}%
{\relax}%
{\setcounter{modpage}{#1 - \themodpage}%
\whiledo{\themodpage>0}{%
\mbox{}\clearpage\mbox{}%
\setcounter{modpage}{\themodpage - 1}%
}% end whiledo
}% end ifthenelse
}% end padpages
% ----- Paper size document setup % ----- Paper size document setup
\input{docsetup.tex} \input{docsetup.tex}
@ -237,6 +270,9 @@ in 2018.
\tableofcontents \tableofcontents
\newcounter{lastfrontmatterpage}
\setcounter{lastfrontmatterpage}{\value{page}}
% ----- % -----
\mainmatter \mainmatter
@ -245,8 +281,6 @@ in 2018.
% ----- % -----
\cleardoublepage
\chapter{List of tune first lines} \chapter{List of tune first lines}
You know the feeling. Everyone has just launched into a well-loved tune. You know the feeling. Everyone has just launched into a well-loved tune.