changeset 336:72a63db1cc43

Automated merge with ssh://hg.cryhavoc.org.uk/dottes
author Jim Hague <jim.hague@acm.org>
date Mon, 12 Aug 2013 11:53:32 +0100
parents 9f9df5c40d1b (diff) 6b9bba8c2624 (current diff)
children eb587fee5db2
files Session/CaddamWood.abc Session/SiBheagSiMhor.abc
diffstat 8 files changed, 57 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/Session/ButteredPeas.abc	Mon Aug 12 11:53:20 2013 +0100
+++ b/Session/ButteredPeas.abc	Mon Aug 12 11:53:32 2013 +0100
@@ -1,14 +1,11 @@
 X:1
 T:Buttered Peas
-R:Polka
 O:England
-Z:Paul Hardy's Session Tunebook 2013 (see www.paulhardy.net). Creative Commons cc by-nc-sa licenced.
-N: Credit: Paul Hardy's Session Tunebook
-M:2/2
+M:4/4
 L:1/8
 Q:1/4=180
 K:D
-AG|"D"FG A2 A2 F2|"G"GA B2 B2 G2|"D"FG A2 A2 F2|"Em"G2 E2 "A"E2 AG|
-"D"FG A2 A2 F2|"G"GA B2 B2 G2|"D"FG A2 "Em"E3 G|"D"F2 D2 D2:|
-|:AG|"D"FGAB "A"A2 Bc|"D"dcde d3 G|FG A2 A2 F2|"Em"G2 E2 "A"E2 AG|
-"D"FGAB "A"A2 Bc|"D"dc de d3 G|FG A2 "A7"E3 G|"D"F2 D2 D2:|
+"D" F2 A2 AG F2 | "G" G2 B2 BA G2 | "D" F2 A2 AG F2 | "Em" G2 E2 "A" E4 |
+"D" F2 A2 AG F2 | "G" G2 B2 BA G2 | "D" FG A2 E2 G2 | "D" F2 D2 D4 :|
+"D" EF A2 "A" A2 Bc | "D" dcdc d2 A2 | FG A2 A2 F2 | "Em" G2 E2 "A" E4 |
+"D" EF A2 "A" A2 Bc | "D" dcdc d2 A2 | FG A2 "A7" E2>G2 | "D" F2 D2 D4 :|
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/docend.A4.tex	Mon Aug 12 11:53:32 2013 +0100
@@ -0,0 +1,3 @@
+\pagecolor{havocpurple}
+\thispagestyle{empty}
+\mbox{}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/docend.A5.tex	Mon Aug 12 11:53:32 2013 +0100
@@ -0,0 +1,3 @@
+\pagecolor{havocpurple}
+\thispagestyle{empty}
+\mbox{}
--- a/docsetup.A4.tex	Mon Aug 12 11:53:20 2013 +0100
+++ b/docsetup.A4.tex	Mon Aug 12 11:53:32 2013 +0100
@@ -6,6 +6,7 @@
 \newfontfamily\havocfont[Scale=3.5]{English Towne}
 
 \newcommand*{\titleBoD}{\begingroup
+\pagecolor{havocpurple}
 \centering
 {\Large \havocfont{Ye}}\\[\baselineskip]
 {\Huge \havocfont{Crie Havock}}\\[\baselineskip]
@@ -18,4 +19,9 @@
 \includegraphics[width=0.5\textwidth,keepaspectratio]{buzzard}
 \vfill
 {Compiled by Jim Hague}\\
+\newpage
+\pagecolor{white}
 \endgroup}
+
+% Page appearance.
+\newcommand*{\pagestylemod}{}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/docsetup.A4Lulu.tex	Mon Aug 12 11:53:32 2013 +0100
@@ -0,0 +1,25 @@
+\usepackage[margin=0.75in]{geometry}
+
+% -----
+
+% Title page
+\newfontfamily\havocfont[Scale=3.5]{English Towne}
+
+\newcommand*{\titleBoD}{\begingroup
+\centering
+{\Large \havocfont{Ye}}\\[\baselineskip]
+{\Huge \havocfont{Crie Havock}}\\[\baselineskip]
+{\Large \havocfont{Booke of}}\\[\baselineskip]
+{\Huge \havocfont{\instrument Dottes}}\\[\baselineskip]
+\vfill
+{\Huge \input{title.txt}}\\[\baselineskip]
+{\Large \input{subtitle.txt}}\\[\baselineskip]
+\vfill
+\includegraphics[width=0.5\textwidth,keepaspectratio]{buzzard}
+\vfill
+{Compiled by Jim Hague}\\
+\newpage
+\endgroup}
+
+% Page appearance.
+\newcommand*{\pagestylemod}{}
--- a/docsetup.A5.tex	Mon Aug 12 11:53:20 2013 +0100
+++ b/docsetup.A5.tex	Mon Aug 12 11:53:32 2013 +0100
@@ -6,6 +6,7 @@
 \newfontfamily\havocfont[Scale=2.1]{English Towne}
 
 \newcommand*{\titleBoD}{\begingroup
+\pagecolor{havocpurple}
 \centering
 {\Large \havocfont{Ye}}\\[\baselineskip]
 {\Huge \havocfont{Crie Havock}}\\[\baselineskip]
@@ -18,4 +19,9 @@
 \includegraphics[width=0.12\textwidth,keepaspectratio]{buzzard}
 \vfill
 {Compiled by Jim Hague}\\
+\newpage
+\pagecolor{white}
 \endgroup}
+
+% Page appearance.
+\newcommand*{\pagestylemod}{}
--- a/docsetup.Nook.tex	Mon Aug 12 11:53:20 2013 +0100
+++ b/docsetup.Nook.tex	Mon Aug 12 11:53:32 2013 +0100
@@ -1,4 +1,4 @@
-\usepackage[paperwidth=4.1in,paperheight=5in,left=0.1in,right=0.1in,top=0.5in,bottom=0.5in]{geometry}
+\usepackage[paperwidth=4.1in,paperheight=5in,left=0.1in,right=0.1in,top=0.5in,bottom=0.2in]{geometry}
 
 % -----
 
@@ -19,3 +19,8 @@
 \vfill
 {Compiled by Jim Hague}\\
 \endgroup}
+
+% Page appearance.
+\newcommand*{\pagestylemod}{\begingroup
+\cfoot{}
+\endgroup}
--- a/dottes.tex	Mon Aug 12 11:53:20 2013 +0100
+++ b/dottes.tex	Mon Aug 12 11:53:32 2013 +0100
@@ -97,6 +97,8 @@
 \cfoot{\thepage}
 \renewcommand{\headrulewidth}{0pt}
 
+\pagestylemod
+
 \frontmatter
 
 % No page numbering for now, thanks.
@@ -106,13 +108,10 @@
 
 \newgeometry{margin=0.5in}
 \begin{titlepage}
-\pagecolor{havocpurple}
 \titleBoD
 \end{titlepage}
 \restoregeometry
 
-\pagecolor{white}
-
 % ----- First inside pages. No page numbering here, thanks.
 
 % Publisher info page.
@@ -256,8 +255,6 @@
 
 \backmatter
 
-\pagecolor{havocpurple}
-\thispagestyle{empty}
-\mbox{}
+\input{docend.tex}
 
 \end{document}