hepthesis update (29sep06)

git-svn-id: svn://tug.org/texlive/trunk@2215 c570f23f-e606-0410-a88d-b1316a301751

15 files changed, 748 insertions, 73 deletions

diff --git a/Master/texmf-dist/doc/latex/hepthesis/ChangeLog b/Master/texmf-dist/doc/latex/hepthesis/ChangeLog
index 5677737927c..7843f7d11e3 100644
--- a/Master/texmf-dist/doc/latex/hepthesis/ChangeLog
+++ b/Master/texmf-dist/doc/latex/hepthesis/ChangeLog
@@ -1,3 +1,61 @@
+2006-09-28  Andy Buckley  <andy@insectnation.org>
+
+	* Updated date to today, ready for release 1.3.
+
+2006-09-25  Andy Buckley  <andy@insectnation.org>
+
+	* Updated example document to demonstrate the bold math in titles
+	and sans-serif titles.
+
+2006-09-21  Andy Buckley  <andy@insectnation.org>
+
+	* Made frontmatter centered titles have \LARGE size rather than
+	\Large.
+
+	* Added \boldmath to the definition of \bfseries so that maths in
+	titles etc. will automatically go bold. Thanks to Donald Arsenau
+	for supplying this neat trick!
+
+2006-09-18  Andy Buckley  <andy@insectnation.org>
+
+	* Fixed a bug in the definition of \definethesis (argument #2 was
+	never used).
+
+	* Added sftitles option, using the sfheaders package and some
+	changes to the hepthesis-specific sectioning commands. Updated
+	documentation to reflect this.
+
+2006-06-12  Andy Buckley  <andy@insectnation.org>
+
+	* Updated the documentation to reflect the recent changes.
+
+	* Removed some lingering \thesis-prefixed commands from the
+	examples.
+
+	* Aliased \maketitle to \titlepage{} (see below).
+
+	* Changed behaviour of \titlepage slightly: the first argument
+	will no longer be presented prefixed with "of" (so you should
+	include "of\\ " in the argument if you want the original,
+	non-internationalised behaviour). Also, the first argument is now
+	optional, so should be wrapped with square brackets rather than
+	curly braces. \thesistitlepage has been similarly updated.
+	
+	* Deprecated \definethesis command: it is now just a thin wrapper
+	for \title and \author.
+
+	* Added titling option to use the titling package if
+	available. Otherwise, redefine \title and \author to save their
+	arguments in \thetitle and \theauthor, as well as in \@title,
+	\@author, so that they are available in the document body, in
+	particular for building the title page.
+
+2006-06-06  Andy Buckley  <andy@insectnation.org>
+
+	* Prompted by a request from Claudia Strabel, the table, figure,
+	figure* and sidewaysfigure environments now use standard [!htbp]
+	placement specifiers.
+
 2006-02-23  Andy Buckley  <andy@insectnation.org>
 
 	* Ready for version 1.2 release (no changes since 2006-01-26 and
diff --git a/Master/texmf-dist/doc/latex/hepthesis/example/abhep.sty b/Master/texmf-dist/doc/latex/hepthesis/example/abhep.sty
new file mode 100644
index 00000000000..9bb0d868770
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/hepthesis/example/abhep.sty
@@ -0,0 +1,181 @@
+\ProvidesPackage{abhep}[2005/01/17]
+
+\RequirePackage{amsmath}
+\RequirePackage{cancel}
+\RequirePackage{abhepexpt}
+\RequirePackage{hepnicenames}
+\RequirePackage{hepunits}
+\RequirePackage{maybemath}
+\RequirePackage{abmath}
+
+
+%C++ macro (to be moved!)
+\DeclareRobustCommand{\CC}{C\nolinebreak\hspace{-.05em}\raisebox{.4ex}{\tiny\bf +}\nolinebreak\hspace{-.10em}\raisebox{.4ex}{\tiny\bf +}}
+\def\CCtwo{{C\nolinebreak[4]\hspace{-.05em}\raisebox{.4ex}{\tiny\bf ++}}}
+\DeclareRobustCommand{\Rplus}{\protect\nolinebreak\hspace{-.07em}\protect\raisebox{.25ex}{\small\textbf{+}}}
+\DeclareRobustCommand{\Cpp}{C\Rplus\Rplus\xspace}
+
+\DeclareRobustCommand{\rescatter}{re-scatter\xspace}
+\DeclareRobustCommand{\electroweak}{electro-weak\xspace}
+\DeclareRobustCommand{\StandardModel}{Standard Model\xspace}
+\DeclareRobustCommand{\SM}{Standard Model\xspace}
+
+% General lagrangian formalism
+\DeclareRobustCommand{\matrixelementM}{\mymath{ \mathcal{M} }\xspace}
+\DeclareRobustCommand{\matrixelementA}{\mymath{ \mathcal{A} }\xspace}
+
+\DeclareRobustCommand{\Amplitude}[1]{\mymath{
+    \mathcal{A}%
+    \begingroup%
+    \def\@empty{}%
+    \def\@arg{#1}%
+    \ifx\@arg\@empty{}\else\parenths{#1}\fi%
+    \endgroup%
+}}
+
+% also want Rate and BranchingRatio
+\DeclareRobustCommand{\Lagrangian}{\mymath{ \mathcal{L} }\xspace}
+\DeclareRobustCommand{\Hamiltonian}{\mymath{ \mathcal{H} }\xspace}
+\DeclareRobustCommand{\lagrangian}{\Lagrangian}
+\DeclareRobustCommand{\hamiltonian}{\Hamiltonian}
+\DeclareRobustCommand{\RenormalisationScale}{\mymath{ \mu }\xspace}
+
+\DeclareRobustCommand{\adjointField}[1]{\mymath{ \bar{#1} }\xspace}
+\DeclareRobustCommand{\scalarField}{\mymath{ \phi }\xspace}
+\DeclareRobustCommand{\spinorField}{\mymath{ \psi }\xspace}
+
+\DeclareRobustCommand{\pathD}{\mymath{ \mathcal{D} }\xspace}
+\DeclareRobustCommand{\VEV}{VEV\xspace}
+\DeclareRobustCommand{\QCD}{QCD\xspace}
+\DeclareRobustCommand{\EW}{EW\xspace}
+\DeclareRobustCommand{\EM}{EM\xspace}
+\DeclareRobustCommand{\PDG}{PDG\xspace}
+
+% covariant derivative
+% covariant vectors, tensors, vectors
+
+% Common Feynman rules
+%% photon propagator
+%% external vector boson
+%% Z,W propagator
+
+\DeclareRobustCommand{\pseudorapidity}{pseudo-rapidity\xspace}
+
+% Rates and measurements
+\DeclareRobustCommand{\BR}[1]{\mymath{%
+    \def\empty{}%
+    \def\thearg{#1}%
+    \mathcal{B}%
+    \ifx\thearg\empty{}\else{(\HepProcess{#1})}\fi%
+}\xspace}
+
+\DeclareRobustCommand{\efficiency}[1]{\mymath{
+    \def\empty{}%
+    \def\thearg{#1}%
+    \varepsilon%
+    \ifx\thearg\empty{}\else{(\text{#1})}\fi%
+}\xspace}
+
+\DeclareRobustCommand{\purity}{\mymath{p}\xspace}
+\DeclareRobustCommand{\luminosity}{\mymath{\mathcal{L}}\xspace}
+\DeclareRobustCommand{\sqrtS}{\mymath{\sqrt{s}}\xspace}
+
+%% CP violation
+\DeclareRobustCommand{\opC}{\mymath{\maybebm{\mathcal{C}}}\xspace}
+\DeclareRobustCommand{\opP}{\mymath{\maybebm{\mathcal{P}}}\xspace}
+\DeclareRobustCommand{\opT}{\mymath{\maybebm{\mathcal{T}}}\xspace}
+\DeclareRobustCommand{\opCP}{\mymath{\opC\opP}\xspace}
+\DeclareRobustCommand{\opCPT}{\mymath{\opC\opP\opT}\xspace}
+%% and for convenience...
+\DeclareRobustCommand{\CP}{\opCP}
+\DeclareRobustCommand{\CPT}{\opCPT}
+%% symmetry violation shorthands
+\DeclareRobustCommand{\CPv}{\mymath{\cancel{\opCP}}\xspace}
+\DeclareRobustCommand{\CPViolation}{\mymath{\opCP\text{-violation}}\xspace}
+\DeclareRobustCommand{\CPTv}{\mymath{\cancel{\opCPT}}\xspace}
+\DeclareRobustCommand{\CPTViolation}{\mymath{\opCPT\text{-violation}}\xspace}
+
+
+%% Important names (of effects, params, theories etc.) and suchlike
+\DeclareRobustCommand{\Cabibbo}{\ensuremath{\text{Cabibbo}}\xspace}
+\DeclareRobustCommand{\Maskawa}{\ensuremath{\text{Maskawa}}\xspace}
+\DeclareRobustCommand{\Kobayashi}{\ensuremath{\text{Kobayashi}}\xspace}
+\DeclareRobustCommand{\Jarlskog}{\ensuremath{\text{Jarlskog}}\xspace}
+\DeclareRobustCommand{\Sakharov}{\ensuremath{\text{Sakharov}}\xspace}
+\DeclareRobustCommand{\Majorana}{\ensuremath{\text{Majorana}}\xspace}
+\DeclareRobustCommand{\Planck}{\ensuremath{\text{Planck}}\xspace}
+\DeclareRobustCommand{\Dirac}{\ensuremath{\text{Dirac}}\xspace}
+\DeclareRobustCommand{\Weyl}{\ensuremath{\text{Weyl}}\xspace}
+
+%% Theories
+\DeclareRobustCommand{\SUSY}{\ensuremath{\text{SUSY}}\xspace}
+\DeclareRobustCommand{\AMSB}{\ensuremath{\text{AMSB}}\xspace}
+\DeclareRobustCommand{\mSUGRA}{\ensuremath{\text{mSUGRA}}\xspace}
+
+\DeclareRobustCommand{\JarlskogParam}{\mymath{J_{\CP}}\xspace}
+\DeclareRobustCommand{\thetaCabibbo}{\mymath{\maybebm{\theta_c}}}
+
+%% CKM matrix stuff
+\DeclareRobustCommand{\Vckm}{\mymath{ \boldmatrix{V}_{\!\mathrm{CKM}} }\xspace}
+\DeclareRobustCommand{\VckmFull}{\mymath{%
+\begin{pmatrix}
+ \Vud & \Vus & \Vub \\
+ \Vcd & \Vcs & \Vcb \\
+ \Vtd & \Vts & \Vtb \\
+\end{pmatrix}
+}}
+
+\DeclareRobustCommand{\alphaCKM}{\mymath{\alpha}\xspace}
+\DeclareRobustCommand{\betaCKM}{\mymath{\beta}\xspace}
+\DeclareRobustCommand{\gammaCKM}{\mymath{\gamma}\xspace}
+\DeclareRobustCommand{\CkmElementConj}[2]{\mymath{V_{{#1}{#2}}^{*}}\xspace}
+\DeclareRobustCommand{\CkmElement}[2]{\mymath{V_{{#1}{#2}}^{\phantom{*}}}\xspace}
+\DeclareRobustCommand{\Vud}{\CkmElement{\mathrm{u}}{\mathrm{d}}}
+\DeclareRobustCommand{\Vus}{\CkmElement{\mathrm{u}}{\mathrm{s}}}
+\DeclareRobustCommand{\Vub}{\CkmElement{\mathrm{u}}{\mathrm{b}}}
+\DeclareRobustCommand{\Vcd}{\CkmElement{\mathrm{c}}{\mathrm{d}}}
+\DeclareRobustCommand{\Vcs}{\CkmElement{\mathrm{c}}{\mathrm{s}}}
+\DeclareRobustCommand{\Vcb}{\CkmElement{\mathrm{c}}{\mathrm{b}}}
+\DeclareRobustCommand{\Vtd}{\CkmElement{\mathrm{t}}{\mathrm{d}}}
+\DeclareRobustCommand{\Vts}{\CkmElement{\mathrm{t}}{\mathrm{s}}}
+\DeclareRobustCommand{\Vtb}{\CkmElement{\mathrm{t}}{\mathrm{b}}}
+\DeclareRobustCommand{\VudConj}{\CkmElementConj{\mathrm{u}}{\mathrm{d}}}
+\DeclareRobustCommand{\VusConj}{\CkmElementConj{\mathrm{u}}{\mathrm{s}}}
+\DeclareRobustCommand{\VubConj}{\CkmElementConj{\mathrm{u}}{\mathrm{b}}}
+\DeclareRobustCommand{\VcdConj}{\CkmElementConj{\mathrm{c}}{\mathrm{d}}}
+\DeclareRobustCommand{\VcsConj}{\CkmElementConj{\mathrm{c}}{\mathrm{s}}}
+\DeclareRobustCommand{\VcbConj}{\CkmElementConj{\mathrm{c}}{\mathrm{b}}}
+\DeclareRobustCommand{\VtdConj}{\CkmElementConj{\mathrm{t}}{\mathrm{d}}}
+\DeclareRobustCommand{\VtsConj}{\CkmElementConj{\mathrm{t}}{\mathrm{s}}}
+\DeclareRobustCommand{\VtbConj}{\CkmElementConj{\mathrm{t}}{\mathrm{b}}}
+
+%% CKM element pairing for unitarity relations
+\newlength{\CKMPairWidth}
+\settowidth{\CKMPairWidth}{\Vtd\VtbConj}
+\DeclareRobustCommand{\@Vbox}[1]{\makebox[\CKMPairWidth]{#1}}
+\DeclareRobustCommand{\VCkmPair}[2]{\ensuremath{\@Vbox{{#1}{#2}}}}
+
+%% Theory acronyms
+\DeclareRobustCommand{\SCET}{SCET\xspace}
+\DeclareRobustCommand{\HQET}{HQET\xspace}
+\DeclareRobustCommand{\CKM}{CKM\xspace}
+\DeclareRobustCommand{\KM}{KM\xspace}
+\DeclareRobustCommand{\BSM}{BSM\xspace}
+\DeclareRobustCommand{\FCNC}{FCNC\xspace}
+
+%% Typical analysis concepts
+\DeclareRobustCommand{\PV}{\MathUpright{PV}}
+\DeclareRobustCommand{\IP}{\MathUpright{IP}}
+\DeclareRobustCommand{\pT}{\mymath{p_\MathUpright{T}}\xspace}
+\DeclareRobustCommand{\missingpT}{\mymath{\cancel{\pT}}\xspace}
+\DeclareRobustCommand{\Et}{\mymath{E_\MathUpright{T}}\xspace}
+\DeclareRobustCommand{\missingEt}{\mymath{\cancel{\Et}}\xspace}
+\DeclareRobustCommand{\p}{\mymath{p}\xspace}
+\DeclareRobustCommand{\chisq}{\mymath{\chi^2}\xspace}
+\DeclareRobustCommand{\tuple}[1]{\ensuremath{#1}-tuple\xspace}
+\DeclareRobustCommand{\tuples}[1]{\ensuremath{#1}-tuples\xspace}
+\DeclareRobustCommand{\ntuple}{\tuple{n}\xspace}
+\DeclareRobustCommand{\ntuples}{\tuples{n}\xspace}
+\DeclareRobustCommand{\dataset}{data set\xspace}
+\DeclareRobustCommand{\cutset}{cut set\xspace}
+\DeclareRobustCommand{\CoM}{CoM\xspace}
diff --git a/Master/texmf-dist/doc/latex/hepthesis/example/abhepexpt.sty b/Master/texmf-dist/doc/latex/hepthesis/example/abhepexpt.sty
new file mode 100644
index 00000000000..c51dd471aec
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/hepthesis/example/abhepexpt.sty
@@ -0,0 +1,64 @@
+\ProvidesPackage{abhepexpt}[2005/08/22]
+\RequirePackage{xspace}
+\RequirePackage{relsize}
+
+%% Generic expt stuff
+\providecommand{\TDR}{\ensuremath{\mathrm{TDR}}\xspace}
+
+%% Experiments
+\providecommand{\ALICE}{ALICE\xspace}
+\providecommand{\ATLAS}{ATLAS\xspace}
+\providecommand{\CMS}{CMS\xspace}
+\providecommand{\LHCb}{LHCb\xspace}
+%%
+\providecommand{\Belle}{Belle\xspace}
+\DeclareRobustCommand{\BaBar}{\mbox{\textsl{B\hspace{-0.08em}{\smaller A}\hspace{-0.1em}B\hspace{-0.08em}{\smaller A\hspace{-0.12em}R}}}\xspace}
+%\DeclareRobustCommand{\BaBar}{\textsl{B\hspace{-0.4em} {\scriptsize A}\hspace{-0.45em} B\hspace{-0.4em} {\scriptsize A\hspace{-0.12em}R}}\xspace}
+\providecommand{\CLEO}{CLEO\xspace}
+\providecommand{\BTeV}{BTeV\xspace}
+\providecommand{\KTeV}{KTeV\xspace}
+\providecommand{\HeraB}{\HERA-B\xspace}
+%%
+\providecommand{\Opal}{OPAL\xspace}
+\providecommand{\Delphi}{Delphi\xspace}
+\providecommand{\LThree}{L3\xspace}
+\providecommand{\Aleph}{Aleph\xspace}
+%%
+\providecommand{\DZero}{D\O\xspace}
+\providecommand{\CDF}{CDF\xspace}
+
+%% Institutes
+\providecommand{\CERN}{CERN\xspace}
+\providecommand{\KEK}{KEK\xspace}
+\providecommand{\FNAL}{FNAL\xspace}
+\providecommand{\Fermilab}{Fermilab\xspace}
+\providecommand{\SLAC}{SLAC\xspace}
+\providecommand{\BNL}{BNL\xspace}
+\providecommand{\DESY}{DESY\xspace}
+
+
+%% Accelerators
+\providecommand{\LHC}{LHC\xspace}
+\providecommand{\PEPII}{PEP-II\xspace}
+\providecommand{\KEKB}{KEK-B\xspace}
+\providecommand{\SLC}{SLC\xspace}
+\providecommand{\LEP}{LEP\xspace}
+\providecommand{\Tevatron}{Tevatron\xspace}
+\providecommand{\CESR}{CESR\xspace}
+\providecommand{\HERA}{HERA\xspace}
+
+
+% Various other experimental stuff
+\providecommand{\Geant}[1]{\begingroup\def\@empty{}\def\@arg{#1}Geant\ifx\@arg\@empty{}\else{#1}\fi\endgroup\xspace}
+\providecommand{\Cerenkov}{\v{C}erenkov\xspace}
+\providecommand{\thetaCerenkov}{\ensuremath{ \theta_C }\xspace}
+\providecommand{\PMT}{PMT\xspace}
+\providecommand{\PMTs}{\PMT{}s\xspace}
+\providecommand{\radlength}{\ensuremath{X_0}\xspace}
+\providecommand{\intlength}{\ensuremath{\lambda_I}\xspace}
+\providecommand{\PID}{PID\xspace}
+\providecommand{\subdetector}{sub-detector\xspace}
+
+%% Generators
+\providecommand{\Pythia}{Pythia\xspace}
+\providecommand{\Herwig}{Herwig\xspace}
diff --git a/Master/texmf-dist/doc/latex/hepthesis/example/abmath.sty b/Master/texmf-dist/doc/latex/hepthesis/example/abmath.sty
new file mode 100644
index 00000000000..fc8841e6386
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/hepthesis/example/abmath.sty
@@ -0,0 +1,267 @@
+\ProvidesPackage{abmath}[2006/04/12]
+\RequirePackage{maybemath}
+\RequirePackage{braket}
+\RequirePackage{xspace}
+
+%% --------------------------------------------------------------
+
+\DeclareRobustCommand{\mymath}[1]{\ensuremath{\maybebmsf{#1}}}
+\DeclareRobustCommand{\MathUpright}[1]{\mymath{\mathrm{#1}}}
+\DeclareRobustCommand{\MathText}[1]{\ensuremath{\text{#1}}}
+\DeclareRobustCommand{\RHS}{\MathText{right hand side}\xspace}
+\DeclareRobustCommand{\LHS}{\MathText{left hand side}\xspace}
+
+%% Groupings
+\DeclareRobustCommand{\parenths}[1]{\mymath{\left({#1}\right)}}
+\DeclareRobustCommand{\braces}[1]{\mymath{\left\{{#1}\right\}}}
+\DeclareRobustCommand{\angles}[1]{\mymath{\left\langle{#1}\right\rangle}}
+\DeclareRobustCommand{\sqbracs}[1]{\mymath{\left[{#1}\right]}}
+\DeclareRobustCommand{\mods}[1]{\mymath{\left\lvert{#1}\right\rvert}}
+\DeclareRobustCommand{\modsq}[1]{\mymath{\mods{#1}^2}}
+\DeclareRobustCommand{\dblmods}[1]{\mymath{\left\lVert{#1}\right\rVert}}
+% legacy names
+\DeclareRobustCommand{\bigparenths}[1]{\parenths{#1}}
+\DeclareRobustCommand{\bigbraces}[1]{\braces{#1}}
+\DeclareRobustCommand{\bigangles}[1]{\angles{#1}}
+\DeclareRobustCommand{\bigsqbracs}[1]{\sqbracs{#1}}
+\DeclareRobustCommand{\bigmods}[1]{\mods{#1}}
+\DeclareRobustCommand{\bigmodsq}[1]{\modsq{#1}}
+\DeclareRobustCommand{\bigdblmods}[1]{\dblmods{#1}}
+
+%% Misc
+\DeclareMathOperator{\diag}{diag}
+\DeclareMathOperator{\sign}{sgn}
+\DeclareMathOperator{\li}{li}
+\DeclareMathOperator{\trace}{Tr}
+\DeclareRobustCommand{\expparenths}[1]{\mymath{\exp{\!\parenths{#1}}}}
+\DeclareRobustCommand{\expbraces}[1]{\mymath{\exp{\!\braces{#1}}}}
+\DeclareRobustCommand{\expOf}[1]{\expparenths{#1}} % generalise to have braces specifier 1st arg
+\DeclareRobustCommand{\eexp}[1]{\mymath{e^{#1}}}
+\DeclareRobustCommand{\plusquad}{\mymath{\oplus}}
+\DeclareRobustCommand{\logOf}[1]{\log\!\parenths{#1}}
+\DeclareRobustCommand{\lnOf}[1]{\ln\!\parenths{#1}}
+\DeclareRobustCommand{\liOf}[1]{\li\!\parenths{#1}}
+\DeclareRobustCommand{\signOf}[1]{\sign\!\parenths{#1}}
+\DeclareRobustCommand{\diagOf}[1]{\diag\!\parenths{#1}}
+\DeclareRobustCommand{\traceOf}[1]{\trace\!\parenths{#1}}
+
+%% For use outside math mode
+\let\@oldpm\pm
+\DeclareRobustCommand{\pm}{\mymath{\,\@oldpm\,}}
+\let\@oldmp\mp
+\DeclareRobustCommand{\mp}{\mymath{\,\@oldmp\,}}
+\let\@oldVert\vert
+\DeclareRobustCommand{\vert}{\mymath{\@oldVert\,}}
+\let\@oldTo\to
+\DeclareRobustCommand{\to}{\mymath{\,\@oldTo\,}}
+\let\@oldsim\sim
+\DeclareRobustCommand{\sim}{\mymath{\,\@oldsim\,}}
+\let\@oldimplies\implies
+\DeclareRobustCommand{\implies}{\mymath{\@oldimplies}}
+\DeclareRobustCommand{\To}{\mymath{\@oldimplies}}
+\let\@oldtimes\times
+\DeclareRobustCommand{\times}{\mymath{\,\@oldtimes\,}}
+\let\@oldbra\bra
+\DeclareRobustCommand{\bra}[1]{\mymath{\@oldbra{#1}}}
+\let\@oldket\ket
+\DeclareRobustCommand{\ket}[1]{\mymath{\@oldket{#1}}}
+\let\@oldbraket\braket
+\DeclareRobustCommand{\braket}[1]{\mymath{\@oldbraket{#1}}}
+
+%% Re-define Greek letters for use outside math mode, too
+\let\@Oldalpha\alpha%
+\let\@Oldbeta\beta%
+\let\@Oldgamma\gamma%
+\let\@Olddelta\delta%
+\let\@Oldepsilon\epsilon%
+\let\@Oldvarepsilon\varepsilon%
+\let\@Oldzeta\zeta%
+\let\@Oldeta\eta%
+\let\@Oldtheta\theta%
+\let\@Oldvartheta\vartheta%
+\let\@Oldiota\iota%
+\let\@Oldkappa\kappa%
+\let\@Oldlambda\lambda%
+\let\@Oldmu\mu%
+\let\@Oldnu\nu%
+\let\@Oldxi\xi%
+\let\@Oldpi\pi%
+\let\@Oldvarpi\varpi%
+\let\@Oldrho\rho%
+\let\@Oldvarrho\varrho%
+\let\@Oldsigma\sigma%
+\let\@Oldvarsigma\varsigma%
+\let\@Oldtau\tau%
+\let\@Oldupsilon\upsilon%
+\let\@Oldphi\phi%
+\let\@Oldvarphi\varphi%
+\let\@Oldchi\chi%
+\let\@Oldpsi\psi%
+\let\@Oldomega\omega%
+\renewcommand{\alpha}{\mymath{\@Oldalpha}\xspace}%
+\renewcommand{\beta}{\mymath{\@Oldbeta}\xspace}%
+\renewcommand{\gamma}{\mymath{\@Oldgamma}\xspace}%
+\renewcommand{\delta}{\mymath{\@Olddelta}\xspace}%
+\renewcommand{\epsilon}{\mymath{\@Oldepsilon}\xspace}%
+\renewcommand{\varepsilon}{\mymath{\@Oldvarepsilon}\xspace}%
+\renewcommand{\zeta}{\mymath{\@Oldzeta}\xspace}%
+\renewcommand{\eta}{\mymath{\@Oldeta}\xspace}%
+\renewcommand{\theta}{\mymath{\@Oldtheta}\xspace}%
+\renewcommand{\vartheta}{\mymath{\@Oldvartheta}\xspace}%
+\renewcommand{\iota}{\mymath{\@Oldiota}\xspace}%
+\renewcommand{\kappa}{\mymath{\@Oldkappa}\xspace}%
+\renewcommand{\lambda}{\mymath{\@Oldlambda}\xspace}%
+\renewcommand{\mu}{\mymath{\@Oldmu}\xspace}%
+\renewcommand{\nu}{\mymath{\@Oldnu}\xspace}%
+\renewcommand{\xi}{\mymath{\@Oldxi}\xspace}%
+\renewcommand{\pi}{\mymath{\@Oldpi}\xspace}%
+\renewcommand{\varpi}{\mymath{\@Oldvarpi}\xspace}%
+\renewcommand{\rho}{\mymath{\@Oldrho}\xspace}%
+\renewcommand{\varrho}{\mymath{\@Oldvarrho}\xspace}%
+\renewcommand{\sigma}{\mymath{\@Oldsigma}\xspace}%
+\renewcommand{\varsigma}{\mymath{\@Oldvarsigma}\xspace}%
+\renewcommand{\tau}{\mymath{\@Oldtau}\xspace}%
+\renewcommand{\upsilon}{\mymath{\@Oldupsilon}\xspace}%
+\renewcommand{\phi}{\mymath{\@Oldphi}\xspace}%
+\renewcommand{\varphi}{\mymath{\@Oldvarphi}\xspace}%
+\renewcommand{\chi}{\mymath{\@Oldchi}\xspace}%
+\renewcommand{\psi}{\mymath{\@Oldpsi}\xspace}%
+\renewcommand{\omega}{\mymath{\@Oldomega}\xspace}%
+
+%% Commands
+\DeclareRobustCommand{\isabout}{\sim\,}
+\DeclareRobustCommand{\isAbout}{\isabout}
+\DeclareRobustCommand{\about}{\mymath{\@oldsim\!\,}}
+\DeclareRobustCommand{\goesto}{\mymath{ \, \Rightarrow \, }}
+\DeclareRobustCommand{\isdefined}{ \equiv }
+\DeclareRobustCommand{\isdefinedas}{ \equiv }
+%\DeclareRobustCommand{\expectation}[1]{\mymath{ \mathcal{E}\lbrack#1\rbrack }}
+\DeclareRobustCommand{\FT}[1]{\mymath{ \mathcal{FT}\lbrack {#1} \rbrack }}
+\DeclareRobustCommand{\LT}[1]{\mymath{ \mathcal{LT}\lbrack {#1} \rbrack }}
+\DeclareRobustCommand{\operand}{\mymath{ \bullet }}
+\DeclareRobustCommand{\scalesas}{\mymath{ \propto }}
+\DeclareRobustCommand{\powerten}[1]{\mymath{ \power{10}{#1} }}
+
+
+%% Parenthetic operations
+\DeclareRobustCommand{\ofOrder}[1]{\mymath{ \mathcal{O}\parenths{#1} }}
+\DeclareRobustCommand{\orderof}[1]{ \ofOrder{#1} }
+\DeclareRobustCommand{\isOfOrder}[1]{\mymath{ \sim \ofOrder{#1} }}
+\DeclareRobustCommand{\expectationOf}[1]{\mymath{ \mathscr{E}\bracs{#1} }}
+\DeclareRobustCommand{\DeltaOf}[1]{\mymath{ \Delta\!\mspace{2.0mu}{#1} }}
+\DeclareRobustCommand{\deltaOf}[1]{\mymath{ \delta\!\mspace{2.0mu}{#1} }}
+\DeclareRobustCommand{\argOf}[1]{\mymath{ \arg\!\parenths{#1} }}
+\DeclareRobustCommand{\sinOf}[1]{\mymath{ \sin\!\parenths{#1} }}
+\DeclareRobustCommand{\cosOf}[1]{\mymath{ \cos\!\parenths{#1} }}
+\DeclareRobustCommand{\tanOf}[1]{\mymath{ \tan\!\parenths{#1} }}
+\DeclareRobustCommand{\sinhOf}[1]{\mymath{ \sinh\!\parenths{#1} }}
+\DeclareRobustCommand{\coshOf}[1]{\mymath{ \cosh\!\parenths{#1} }}
+\DeclareRobustCommand{\tanhOf}[1]{\mymath{ \tanh\!\parenths{#1} }}
+\DeclareRobustCommand{\arcsinOf}[1]{\mymath{ \arcsin\!\parenths{#1} }}
+\DeclareRobustCommand{\arccosOf}[1]{\mymath{ \arccos\!\parenths{#1} }}
+\DeclareRobustCommand{\arctanOf}[1]{\mymath{ \arctan\!\parenths{#1} }}
+\DeclareRobustCommand{\arcsinhOf}[1]{\mymath{ \arcsinh\!\parenths{#1} }}
+\DeclareRobustCommand{\arccoshOf}[1]{\mymath{ \arccosh\!\parenths{#1} }}
+\DeclareRobustCommand{\arctanhOf}[1]{\mymath{ \arctanh\!\parenths{#1} }}
+
+%% Numbers
+\DeclareRobustCommand{\nhalfs}[1]{\mymath{\frac{#1}{2}\,}\xspace}
+\DeclareRobustCommand{\nthirds}[1]{\mymath{\frac{#1}{3}\,}\xspace}
+\DeclareRobustCommand{\nquarters}[1]{\mymath{\frac{#1}{4}\,}\xspace}
+\DeclareRobustCommand{\half}{\nhalfs{1}\xspace}
+\DeclareRobustCommand{\onethird}{\nthirds{1}\xspace}
+\DeclareRobustCommand{\onequarter}{\nquarters{1}\xspace}
+\DeclareRobustCommand{\oneover}[1]{\mymath{\frac{1}{#1}}\xspace}
+\DeclareRobustCommand{\I}{\mymath{\imath}}
+\let\@oldRe\Re
+\let\@oldIm\Im
+\DeclareRobustCommand{\Im}{\mymath{ \@oldIm{}\mathfrak{m} }\xspace}
+\DeclareRobustCommand{\Re}{\mymath{ \@oldRe{}\mathfrak{e}\mspace{3mu} }\xspace}
+\DeclareRobustCommand{\ImaginaryPart}[1]{\mymath{ \,\Im\!\,\braces{#1} }\xspace}
+\DeclareRobustCommand{\RealPart}[1]{\mymath{ \,\Re\!\braces{#1} }\xspace}
+\DeclareRobustCommand{\percent}{\%\xspace}
+
+%% Groups
+\DeclareRobustCommand{\group}[1]{\mymath{\mayberm{#1}}}
+\DeclareRobustCommand{\Ugroup}[1]{\group{U}\parenths{#1}}
+\DeclareRobustCommand{\SUgroup}[1]{\group{S}\Ugroup{#1}}
+\DeclareRobustCommand{\Ogroup}[1]{\group{O}\parenths{#1}}
+\DeclareRobustCommand{\SOgroup}[1]{\group{S}\Ogroup{#1}}
+\DeclareRobustCommand{\Egroup}[1]{\group{E}_{#1}}
+\DeclareRobustCommand{\directsum}{\mymath{\oplus}}
+\DeclareRobustCommand{\directprod}{\mymath{\otimes}}
+\DeclareRobustCommand{\covers}{\mymath{\supset}}
+\DeclareRobustCommand{\exclude}{\mymath{\backslash}}
+
+%% Physics
+\DeclareRobustCommand{\commutator}[2]{\sqbracs{{#1},{#2}}}
+\DeclareRobustCommand{\anticommutator}[2]{\braces{{#1},{#2}}}
+
+%% Tensors
+\DeclareRobustCommand{\Kronecker}{\mymath{\delta}\xspace} % have to specify indices separately now
+\DeclareRobustCommand{\LeviCivita}{\mymath{\epsilon}\xspace} % have to specify indices separately now
+
+%% Vectors, tuples and sets
+\DeclareRobustCommand{\cross}{\mymath{\times}\xspace}
+\DeclareRobustCommand{\bvec}[1]{\mymath{\bm{#1}}\xspace}
+\DeclareRobustCommand{\colset}[1]{\mymath{\begin{Bmatrix}#1\end{Bmatrix}}\xspace}
+\DeclareRobustCommand{\coltuple}[1]{\mymath{\begin{pmatrix}#1\end{pmatrix}}\xspace}
+\DeclareRobustCommand{\colvector}[1]{\mymath{\begin{pmatrix}#1\end{pmatrix}}\xspace}
+\DeclareRobustCommand{\colthreevec}[3]{\mymath{\begin{pmatrix}#1\\ #2\\ #3\end{pmatrix}}\xspace}
+\DeclareRobustCommand{\rowset}[1]{\braces{#1}\xspace}
+\DeclareRobustCommand{\rowtuple}[1]{\parenths{#1}\xspace}
+\DeclareRobustCommand{\rowvector}[1]{\parenths{#1}\xspace}
+\DeclareRobustCommand{\rowthreevec}[3]{\parenths{{#1}, {#2}, {#3}}\xspace}
+
+%% Ranges
+\DeclareRobustCommand{\rangeSS}[1]{\parenths{#1}\xspace}
+\DeclareRobustCommand{\rangeSH}[1]{\left({#1}\right]\xspace}
+\DeclareRobustCommand{\rangeHS}[1]{\left[{#1}\right)\xspace}
+\DeclareRobustCommand{\rangeHH}[1]{\sqbracs{#1}\xspace}
+\DeclareRobustCommand{\softrange}[1]{\rangeSS{#1}}
+\DeclareRobustCommand{\hardrange}[1]{\rangeHH{#1}}
+
+%% Matrix
+\DeclareRobustCommand{\boldmatrix}[1]{\mymath{\bm{\mathrm{#1}}}\xspace}
+\DeclareRobustCommand{\transposeT}{\MathUpright{T}\,}
+\DeclareRobustCommand{\hermitianT}{\dagger}
+\DeclareRobustCommand{\twomatrix}[2]{\mymath{\begin{pmatrix}#1\\ #2\end{pmatrix}}\xspace}
+\DeclareRobustCommand{\threematrix}[3]{\mymath{\begin{pmatrix}#1\\ #2\\ #3\end{pmatrix}}\xspace}
+
+%% Differentials
+\DeclareRobustCommand{\diff}[1]{\mymath{\mathrm{d} #1}}
+\DeclareRobustCommand{\pdiff}[1]{\mymath{\partial #1}}
+\DeclareRobustCommand{\dByd}[2]{\mymath{ \frac{\diff{#1}}{\diff{#2}} }}
+\DeclareRobustCommand{\pdByd}[2]{\mymath{ \frac{\pdiff{#1}}{\pdiff{#2}} }}
+\DeclareRobustCommand{\DeltaVec}[1]{\mymath{\boldsymbol{\Delta}\mathbf{#1}}}
+\DeclareRobustCommand{\DeltaN}[1]{\mymath{\Delta #1}}
+\DeclareRobustCommand{\deltaVec}[1]{\mymath{\boldsymbol{\delta}\mathbf{#1}}}
+\DeclareRobustCommand{\deltaN}[1]{\mymath{\delta #1}}
+\DeclareRobustCommand{\d}[1]{\mymath{\mathrm{d}#1}}
+\DeclareMathOperator{\curl}{curl} % curl
+%\DeclareMathOperator{\div}{div} % div
+\DeclareRobustCommand{\gradCross}[1]{\mymath{\nabla \cross #1}} % curl
+\DeclareRobustCommand{\gradDot}[1]{\mymath{\nabla \dot #1}} % div
+\DeclareRobustCommand{\Laplacian}{\mymath{\backslash}}
+\DeclareRobustCommand{\dAlembertian}{\mymath{\box^{2}}} % I like it with power of 2 attached :-)
+\DeclareRobustCommand{\exclude}{\mymath{\backslash}}
+
+
+%% Statistics and probability
+\DeclareRobustCommand{\mean}[1]{\angles{#1}}
+\DeclareRobustCommand{\given}{\mymath{\vert}}
+\DeclareRobustCommand{\probabilityP}{\mymath{\mayberm{p}}}
+\DeclareRobustCommand{\probability}[1]{\mymath{\probabilityP\parenths{#1}}}
+
+
+%% Principle value integral signs (from UK TeX FAQ)
+\def\Xint#1{\mathchoice
+   {\XXint\displaystyle\textstyle{#1}}%
+   {\XXint\textstyle\scriptstyle{#1}}%
+   {\XXint\scriptstyle\scriptscriptstyle{#1}}%
+   {\XXint\scriptscriptstyle\scriptscriptstyle{#1}}%
+   \!\int}
+\def\XXint#1#2#3{{\setbox0=\hbox{$#1{#2#3}{\int}$}
+     \vcenter{\hbox{$#2#3$}}\kern-.5\wd0}}
+\def\ddashint{\Xint=}
+\def\dashint{\Xint-}
diff --git a/Master/texmf-dist/doc/latex/hepthesis/example/appendices.tex b/Master/texmf-dist/doc/latex/hepthesis/example/appendices.tex
index 09eba1ed13d..91b9dc1ee26 100644
--- a/Master/texmf-dist/doc/latex/hepthesis/example/appendices.tex
+++ b/Master/texmf-dist/doc/latex/hepthesis/example/appendices.tex
@@ -10,5 +10,12 @@ bit of your thesis. Yeah. So everyone should have at least three of them\dots
 \label{sec:Duh}
 Padding? What do you mean?
 
+\section{$y = \alpha x^2$}
+\label{sec:EqnTitle}
+See, maths in titles automatically goes bold where it should (and check the 
+table of contents: it \emph{isn't} bold there!) Check the source: nothing
+needs to be specified to make this work. Thanks to Donald Arsenau for the
+(very teeny) hack that makes this work.
+
 %% Big appendixes should be split off into separate files, just like chapters
 %\input{app-myreallybigappendix}
diff --git a/Master/texmf-dist/doc/latex/hepthesis/example/chap2.tex b/Master/texmf-dist/doc/latex/hepthesis/example/chap2.tex
index f7c9e2611ca..1c143e359ba 100644
--- a/Master/texmf-dist/doc/latex/hepthesis/example/chap2.tex
+++ b/Master/texmf-dist/doc/latex/hepthesis/example/chap2.tex
@@ -21,6 +21,7 @@ precision physics of electroweak unification\dots
 
 \section{The \LHCb experiment}
 \label{sec:LHCbInDetail}
+
 Since both \bhadron{s} are preferentially produced in the same direction 
 and are forward-boosted along the beam-pipe, the detector is not required 
 to have full $4\pi$ solid-angle coverage. \LHCb takes advantage of this 
diff --git a/Master/texmf-dist/doc/latex/hepthesis/example/example.pdf b/Master/texmf-dist/doc/latex/hepthesis/example/example.pdf
index ed7ef3becd7..2109618b44c 100644
--- a/Master/texmf-dist/doc/latex/hepthesis/example/example.pdf
+++ b/Master/texmf-dist/doc/latex/hepthesis/example/example.pdf
diff --git a/Master/texmf-dist/doc/latex/hepthesis/example/example.tex b/Master/texmf-dist/doc/latex/hepthesis/example/example.tex
index 75e61322dcd..b37f1e42438 100644
--- a/Master/texmf-dist/doc/latex/hepthesis/example/example.tex
+++ b/Master/texmf-dist/doc/latex/hepthesis/example/example.tex
@@ -14,9 +14,8 @@ pdfauthor = {\textcopyright\ Andy Buckley}
 \makeatother
 
 %% Define the thesis title and author
-\definethesis%
-{A study of \BToKPi decays with the \LHCb experiment}%
-{Andrew Gordon Buckley}
+\title{A study of \BToKPi decays with\\ the \LHCb experiment}
+\author{Andrew Gordon Buckley}
 
 %% Start the document
 \begin{document}
diff --git a/Master/texmf-dist/doc/latex/hepthesis/example/frontmatter.tex b/Master/texmf-dist/doc/latex/hepthesis/example/frontmatter.tex
index f9d77a4c317..9406adf2e77 100644
--- a/Master/texmf-dist/doc/latex/hepthesis/example/frontmatter.tex
+++ b/Master/texmf-dist/doc/latex/hepthesis/example/frontmatter.tex
@@ -1,8 +1,7 @@
 %% Title
-\thesistitlepage
-{Churchill College}%\\University of Cambridge}
+\titlepage[of Churchill College]%
 {A dissertation submitted to the University of Cambridge\\ 
- for the degree of Doctor of Philosophy}
+  for the degree of Doctor of Philosophy}
 
 %% Abstract
 \begin{abstract}%[\smaller \thetitle\\ \vspace*{1cm} \smaller {\theauthor}]
@@ -41,6 +40,7 @@
   particle physics program, centred around the \LHCb detector and \LHC
   accelerator at \CERN in Geneva.
   
+  \noindent
   For this example, I'll just mention \ChapterRef{chap:SomeStuff} 
   and \ChapterRef{chap:MoreStuff}.
 \end{preface}
@@ -49,7 +49,7 @@
 \tableofcontents
 
 %% Strictly optional!
-\thesisfrontquote%
+\frontquote%
   {Writing in English is the most ingenious torture\\ 
    ever devised for sins committed in previous lives.}%
   {James Joyce}
diff --git a/Master/texmf-dist/doc/latex/hepthesis/example/thesis.cls b/Master/texmf-dist/doc/latex/hepthesis/example/thesis.cls
index a2c160e0d4a..17307ffeda1 100644
--- a/Master/texmf-dist/doc/latex/hepthesis/example/thesis.cls
+++ b/Master/texmf-dist/doc/latex/hepthesis/example/thesis.cls
@@ -1,6 +1,6 @@
 \ProvidesClass{thesis}
 %% For normal draft builds
-\LoadClass[hyperpdf,nobind,draft]{hepthesis}
+\LoadClass[hyperpdf,nobind,draft,sftitles]{hepthesis}
 %% For short draft builds (breaks citations by necessity)
 %\LoadClass[hyperpdf,nobind,draft,hidefrontback]{hepthesis}
 %% For Cambridge soft-bound version
diff --git a/Master/texmf-dist/doc/latex/hepthesis/hepthesis.pdf b/Master/texmf-dist/doc/latex/hepthesis/hepthesis.pdf
index 81ed51d0962..9d10d6b2ba8 100644
--- a/Master/texmf-dist/doc/latex/hepthesis/hepthesis.pdf
+++ b/Master/texmf-dist/doc/latex/hepthesis/hepthesis.pdf
diff --git a/Master/texmf-dist/doc/latex/hepthesis/hepthesis.tex b/Master/texmf-dist/doc/latex/hepthesis/hepthesis.tex
index 7209893924b..6f709b49053 100644
--- a/Master/texmf-dist/doc/latex/hepthesis/hepthesis.tex
+++ b/Master/texmf-dist/doc/latex/hepthesis/hepthesis.tex
@@ -1,7 +1,7 @@
 \documentclass[12pt]{article}
 %\usepackage{booktabs}
 \usepackage{maybemath, xspace, setspace, fancyvrb, a4wide, url, relsize}
-\usepackage[colorlinks=true,pdfpagemode=FullScreen,bookmarks=true]{hyperref}
+\usepackage[colorlinks=true,bookmarks=true]{hyperref}
 \newcommand{\maybemath}{\texttt{maybemath}\xspace}
 \newcommand{\hepthesis}{\texttt{hepthesis}\xspace}
 
@@ -41,16 +41,16 @@
 \section{Introduction}
 When I began my PhD, I was surprised to find that there was no standard \LaTeX
 thesis class used by students in my field (high-energy particle physics, hence
-the ``hep''). In retrospect, this is not so surprising --- groups tend to have
-an informal system of handing down slightly tailored thesis templates (complete
-with in line \texcommand{vspace}s, \texcommand{Huge}s and all the rest) through
-generations of students without ever formalising the style and attempting to do
-it ``properly''. By the time it came to write my own thesis it was obvious that
-I would only retain my sanity through measures of extreme procrastination and so
-this package came to be. It has now been edited and hacked for about 2 years,
-taking stylistic features from other theses that I've thought attractive. As my
-own thesis has been recently submitted, this seems an apt time to release the
-first official version of \hepthesis upon the world.
+the ``hep''). In retrospect, this is not so surprising --- research groups tend
+to have an informal system of handing down slightly tailored thesis templates
+(complete with in line \texcmd{vspace}s, \texcmd{Huge}s and all the
+rest) through generations of students without ever formalising the style and
+attempting to do it ``properly''. By the time it came to write my own thesis it
+was obvious that I would only retain my sanity through measures of extreme
+procrastination and so this package came to be. It has now been edited and
+hacked for about 2 years, taking stylistic features from other theses that I've
+thought attractive. As my own thesis has been recently submitted, this seems an
+apt time to release the first official version of \hepthesis upon the world.
 
 This document will document the structure of \hepthesis and how to make it work
 with you rather than against you. I may be unable to resist including other
@@ -70,6 +70,7 @@ decide for yourself:
 \item Nicely (re-)defined figure, table and equation environments
 \item Optional mode for generating hyper-links when building PDF files
 \item Built-in draft copy mode with line numbering
+\item Maths in section titles etc. will automatically be boldened if appropriate
 \end{itemize}
 
 
@@ -130,6 +131,8 @@ the class options:
 \item \textbf{booktabs~\cite{booktabs}:} non-standard. Disable with the |nobooktabs| option
 \item \textbf{draftcopy~\cite{draftcopy}:} very standard. Enable with the |draft| option
 \item \textbf{lineno~\cite{lineno}:} non-standard (?). Enable with the |draft| option
+\item \textbf{titling~\cite{titling}:} non-standard (?). Enable with the |titling| option
+\item \textbf{sfheaders~\cite{sfheaders}:} non-standard (?). Enable with the |sftitles| option
 \end{itemize}
 
 Some other handy packages (which aren't required at all for compatibility with
@@ -179,6 +182,10 @@ Prints ``DRAFT'' diagonally across the pages and numbers the lines, suitable for
 proof-reading. This makes use of the standard |draftcopy| and the less-standard
 |lineno| packages.
 
+\subsection{\texoption{sftitles}}
+Uses a sans-serif font for the title page and all chapter, section and
+subsection headings. Requires the |sfheaders| package.
+
 \subsection{\texoption{booktabs} \Or \texoption{nobooktabs}}
 Use the |booktabs| package to define the \hepthesis tabular environment.
 |booktabs| produces publication quality tables, as opposed to \TeX's rather
@@ -207,13 +214,24 @@ that this option requires some carefulness with the |.aux| file, since
 alternating between PS and PDF builds involves repeatedly writing and removing
 hyperref tokens. A solution to this is described in Appendix \ref{app:AuxFileProblem}.
 
-\subsection{\texoption{index}}
+\subsection{\texopt{index}}
 Include the |makeidx| package, to allow an index to be built. Note that you have
 to do this by hand and that it's probably best done as a retrospective feature
 after you've written the thesis. Not many people want to spend \emph{more} time
 with their thesis when they've done enough to pass!
 
-\subsection{\texoption{a4paper} \Or \texoption{a4narrow} \Or \texoption{letterpaper} \Or \dots}
+\subsection{\texopt{titling}}
+Use the |titling| package to redefine the \texcmd{title} and \texcmd{author}
+commands so that their arguments are available through the document as
+\texcmd{thetitle} and \texcmd{theauthor}. This is used, for example, by the
+\texcmd{titlepage} command. If this option isn't passed, a more basic attempt is
+made to do this definition without needing an external package.  It's unclear
+whether titling really helps but there may be complicated cases (such as those
+where the author includes a \texcmd{thanks}) where |titling| may do a better
+job. This is untested, though, and the result of using \texcmd{thanks} in a
+|hepthesis| document is to be considered undefined.
+
+\subsection{\texopt{a4paper} \Or \texoption{a4narrow} \Or \texoption{letterpaper} \Or \dots}
 Choose the paper size. Duh.
 
 %\subsection{\texoption{hep} \Or \texoption{hep\{fd,layout,hyper,float,all\}}}
@@ -228,22 +246,24 @@ choice is yours!
 
 Here are the environments and commands, roughly in the order that you'd use them:
 
-\subsection{\texcmd{definethesis}}
-This command should be placed in the preamble, and is used to define
-the thesis title and the author (you!). In future, maybe I'll find a nice way to
-use the built-in \texcmd{author} and \texcmd{title} commands for this. Use it like:
+\subsection{\texcmd{title} and \texcmd{author}}
+Up to version 1.3, a special \texcmd{definethesis} command was used to specify
+the thesis author and title. While this is still retained for backwards compatibility,
+it is deprecated and you should use the standard \texcmd{title} and \texcmd{author}
+macros instead. Don't use \texcmd{thanks} in the author argument: the results are
+undefined!
 %
 \begin{snippet}
-\definethesis%
-  {A study of \BToKPi decays with the \LHCb experiment}%
-  {Andrew Gordon Buckley}
+\title{A study of \BToKPi decays with the \LHCb experiment}
+\author{Andrew Gordon Buckley}
 ...
 \begin{document}
-...
+  ...
 \end{snippet}
 
-Once this command has been executed, the title and author strings are available
-via the \texcommand{thetitle} and \texcommand{theauthor} commands.
+Once these commands have been executed, the title and author strings are available
+via the \texcommand{thetitle} and \texcommand{theauthor} commands. These are used by
+\texcmd{titlepage}.
 
 \subsection{\texenv{frontmatter} \Or \texenv{mainmatter} \Or \texenv{appendices} \Or \texenv{backmatter}}
 Use these to delimit the auxiliary parts of your thesis from the main feature
@@ -258,17 +278,23 @@ itself, which is intended for such things as the bibliography, colophon etc.
 \subsection{\texcmd{titlepage}}
 The \texcmd{titlepage} macro generates a title page for the thesis and as such
 should probably be the first item in the front matter. It takes two arguments:
-the institution and the description of the award for which the thesis is being
-submitted. You may need to hack this or use a different macro if your
-institution has a very different prescribed format for the layout of thesis
-title pages. Here's an example:
+an optional elaboration of the author name and the description of the award for
+which the thesis is being submitted. You may need to use a different macro if
+your institution has a very different prescribed format for the layout of thesis
+title pages: in such a case, the \texcmd{theauthor} and \texcmd{thetitle}
+commands will probably be useful. Here's an example of usage:
 %
 \begin{snippet}
-\thesistitlepage
-{Churchill College}
-{A dissertation submitted to the University 
- of Cambridge\\ for the degree of Doctor of Philosophy}
+\thesistitlepage[of \\ Churchill College]%
+{A dissertation submitted to the University of Cambridge\\ 
+for the degree of Doctor of Philosophy}
 \end{snippet}
+%
+Additionally, the \texcmd{maketitle} command has been redefined to behave as
+\texcmd{titlepage} with two empty arguments. This is only provided to not
+confuse users who convert to |hepthesis| from a standard \LaTeX{} class and
+expect \texcmd{maketitle} to work: \texcmd{titlepage} is a more powerful
+command and should be used by those who are aware of it. That includes you!
 
 \subsection{\texenv{abstract}}
 Where you present the summary of your thesis: this should be within the
@@ -374,7 +400,8 @@ an example:
 \subsection{\texenv{table}}
 Tables --- use like any other table (probably combined with the tabular
 environment). It has been slightly modified to be horizontally centered and have
-an slightly increased vertical spacing at the top.
+an slightly increased vertical spacing at the top. It supports the standard
+\LaTeX{} ``[!htbp]'' float placement specifiers.
 
 \subsection{\texenv{tabular}}
 If the |booktabs| package is used (enabled by default), then the tabular
@@ -383,7 +410,8 @@ looks much nicer than \TeX's default tables.
 
 \subsection{\texenv{figure} and \texenv{sidewaysfigure}}
 The \texenv{figure}, \texenv{figure*} and \texenv{sidewaysfigure} environments
-are re-defined to be automatically centered.
+are re-defined to be automatically centered.  They support the standard \LaTeX{}
+``[!htbp]'' float placement specifiers.
 
 \subsection{\texenv{equation \Or displaymath}}
 These environments and their starred versions are re-defined so that
@@ -548,7 +576,12 @@ here's the TODO:
 \begin{itemize}
 \item Make |hepthesis| use |subfig| in place of |subfigure| and check out compatibility between |caption| and |caption2|.
 \item Make the spacing in the \texcmd{SectionRef} etc. commands customisable.
-\item Make the vertical spacings on the quote, dedication and title pages appropriate for the paper size
+\item Allow the PDF page style to be specified as a class argument
+\item Allow section titles to be centre / right justified?
+\item User control of frontmatter title sizes and alignments? (Probably not\dots)
+\item Provide different styles for the titlepage etc.
+\item Themes, like for Beamer?
+\item Make the vertical spacings on the quote, dedication and title pages change by paper size
 \end{itemize}
 
 
@@ -679,6 +712,8 @@ Otherwise you can just delete the |.aux| file when you change between using
 \bibitem{booktabs}{booktabs: \url{ctan:/macros/latex/contrib/booktabs/}}
 \bibitem{draftcopy}{draftcopy: \url{ctan:/macros/latex/contrib/draftcopy/}}
 \bibitem{lineno}{lineno: \url{ctan:/macros/latex/contrib/lineno/}}
+\bibitem{titling}{titling: \url{ctan:/macros/latex/contrib/titling/}}
+\bibitem{sfheaders}{sfheaders: \url{ctan:/macros/latex/contrib/sfheaders/}}
 \bibitem{SIunits}{SIunits: \url{ctan:/macros/latex/contrib/SIunits/}}
 \bibitem{hepunits}{hepunits: \url{ctan:/macros/latex/contrib/hepunits/}}
 \bibitem{hepnames}{hepnames: \url{ctan:/macros/latex/contrib/hepnames/}}
diff --git a/Master/texmf-dist/tex/latex/hepthesis/hepthesis.cls b/Master/texmf-dist/tex/latex/hepthesis/hepthesis.cls
index 36e02ff9d7b..71cf0c6769b 100644
--- a/Master/texmf-dist/tex/latex/hepthesis/hepthesis.cls
+++ b/Master/texmf-dist/tex/latex/hepthesis/hepthesis.cls
@@ -15,11 +15,10 @@
 %% ========================================================================
 %% Admin
 %% ========================================================================
-\def\fileversion{1.2}
-\def\filedate{2006/01/26}
+\def\fileversion{1.3}
+\def\filedate{2006/09/28}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesClass{hepthesis}[\filedate\space HEP thesis class by Andy Buckley (v\fileversion)]
-%\typeout{hepthesis v\fileversion{} by Andy Buckley}
 
 %% ========================================================================
 %% Option parsing
@@ -29,7 +28,9 @@
 \def\@yes{yes}
 \def\@requireamsmath{yes}
 \def\@requirebooktabs{yes}
+\def\@requiresfheaders{}
 \def\@requiremakeidx{}
+\def\@requiretitling{}
 \def\@requirehep{}
 \def\@requirehyper{}
 \def\@requiredraft{}
@@ -49,6 +50,10 @@
   \def\@oneside{}
   \PassOptionsToClass{twoside}{book}}
 
+%% Sans serif titles?
+\DeclareOption{sftitles}{%
+  \def\@sftitles{yes}}
+
 %% Pad inner margins for binding
 \DeclareOption{bind}{%
   \def\@bindmargins{yes}}
@@ -118,6 +123,11 @@
   \def\@requiremakeidx{yes}
 }
 
+%% Allows us to make an index
+\DeclareOption{titling}{%
+  \def\@requiretitling{yes}
+}
+
 %% Particle physics options
 \DeclareOption{hep}{%
   \def\@requirehep{yes}
@@ -171,13 +181,17 @@
 %% ========================================================================
 %% Base class and packages
 %% ========================================================================
+
 %% Base class
 \LoadClass[12pt]{book}
+
 %% Use wide format if using A4 paper
 \ifx\@requireAFourWide\@empty\else\RequirePackage{a4wide}\fi
+
 %% Hyperlinks (optional, has to come early in the package list)
 \ifx\@requirehyper\@empty\else\RequirePackage[colorlinks=true,bookmarks=true]{hyperref}\fi
-%pdfpagemode=FullScreen
+%pdfpagemode=None, FullScreen, UseThumbs, UseOutlines
+
 %% AMS math package (optional)
 \ifx\@requireamsmath\@empty\else%
   \RequirePackage{amsmath}
@@ -193,8 +207,24 @@
       {\expandafter\let\expandafter\@oldoldendalignstar \csname endalign*\endcsname \@oldoldendalignstar \ignorespacesafterend}
   }%
 \fi
+
 %% Index building (optional)
 \ifx\@requiremakeidx\@empty\else\RequirePackage{makeidx}\fi
+
+%% Use the \title and \author arguments to build the front page etc.
+\ifx\@requiretitling\@empty%
+%% Re-define \title and \author to store their args in \thetitle, \theauthor variables
+  \renewcommand*\title[1]{\gdef\@title{#1}\global\let\thetitle\@title}%
+  \renewcommand*\author[1]{\gdef\@author{#1}\global\let\theauthor\@author}%
+\else%
+  \RequirePackage{titling}%
+\fi
+
+%% Sans serif titles
+\ifx\@sftitles\@empty\else%
+  \RequirePackage{sfheaders}
+\fi
+
 %% Nice tables (optional)
 \ifx\@requirebooktabs\@empty\else%
   \RequirePackage{booktabs}
@@ -213,30 +243,44 @@
     %%
   }%
 \fi
+
 %% Convenience-included HEP packages (optional)
 \ifx\@requirehep\@empty\else\RequirePackage{hep}\fi
+
 %% ``DRAFT'' underprint and line numbering in draft mode (optional)
 \ifx\@requiredraft\@empty\else%
   \RequirePackage[pagewise, mathlines, displaymath]{lineno}
   \RequirePackage{draftcopy}
 \fi
+
 %% The right way to do custom spacing
 \RequirePackage{setspace}
+
 %% Funky headers
 \RequirePackage{fancyhdr}
+
 %% Make sure bibliography (but not ToC) appears in the ToC
 \RequirePackage[nottoc]{tocbibind}
+
 %% Verbatim things
 \RequirePackage{verbatim,comment}
+
 %% Subfigures
 \RequirePackage[loose]{subfigure}
 \subfiglabelskip=0pt
+
 %% Nice captions (with continuation option)
 \RequirePackage[subfigure]{ccaption} % this one must come first...
 \RequirePackage[margin=20pt,labelfont=bf]{caption}
+
 %% Rotated figures
 \RequirePackage{rotating}
 
+%% Make maths in titles go automatically bold
+\AtEndOfClass{%
+  \g@addto@macro\bfseries{\boldmath}
+}
+
 %% ========================================================================
 %% Length definitions
 %% ========================================================================
@@ -446,7 +490,10 @@
   \cleardoublepage%
   \vspace*{\@frontmattertopskip}%
   \begin{center}%
-    {\Large{\textbf{Acknowledgements}}}%
+    \begingroup
+    \ifx\@sftitles\@empty\else\sf\fi
+    {\LARGE{\textbf{Acknowledgements}}}%
+    \endgroup
   \end{center}%
   \vspace*{1cm}%
 }{%
@@ -460,7 +507,10 @@
   \cleardoublepage%
   \vspace*{\@frontmattertopskip}%
   \begin{center}%
-    {\Large{\textbf{Preface}}}%
+    \begingroup
+    \ifx\@sftitles\@empty\else\sf\fi
+    {\LARGE{\textbf{Preface}}}%
+    \endgroup
   \end{center}%
   \vspace*{1cm}%
 }{%
@@ -477,7 +527,10 @@
   \cleardoublepage%
   \vspace*{\@frontmattertopskip}%
   \begin{center}%
-    {\Large{\textbf{Declaration}}}%
+    \begingroup
+    \ifx\@sftitles\@empty\else\sf\fi
+    {\LARGE\textbf{Declaration}}%
+    \endgroup
   \end{center}%
   \vspace*{1cm}%
 }{%
@@ -498,7 +551,10 @@
   \cleardoublepage%
   \vspace*{\@frontmattertopskip}%
   \begin{center}%
-    {\Large\textbf{#1}}%
+    \begingroup
+    \ifx\@sftitles\@empty\else\sf\fi
+    {\LARGE\textbf{#1}}%
+    \endgroup
   \end{center}%
   \vspace*{1cm}%
   %\larger{%
@@ -509,34 +565,35 @@
   \ignorespacesafterend%
 }
 
-%% Command for defining the title and author in the preamble
+%% Deprecated: combined command for defining the title and author in the preamble
 \DeclareRobustCommand{\definethesis}[2]{%
-  \DeclareRobustCommand{\@thesistitle}{#1}%
-  \DeclareRobustCommand{\@thesisauthor}{#2}%
-  \author{\@thesisauthor}%
-  \title{\@thesistitle}%
-  \DeclareRobustCommand{\thetitle}{#1}%
-  \DeclareRobustCommand{\theauthor}{#2}%
+  \typeout{hepthesis: definethesis macro is deprecated. Use author and title macros instead.}
+  \author{#1}%
+  \title{#2}%
 }
 
 %% Makes a thesis title page
 \let\@oldtitlepage\titlepage
 \let\@oldendtitlepage\endtitlepage
-\DeclareRobustCommand{\titlepage}[2]{%
+\DeclareRobustCommand{\titlepage}[2][]{%
   \@oldtitlepage%
+  \begingroup
+  \ifx\@sftitles\@empty\else\sf\fi
   \begin{center}%
     \vspace*{\frontmattertitleskip}%
     \begin{doublespace}%
-      {\Large{\textbf{\@thesistitle}}}\\%
+      {\Huge\textbf{\thetitle}}\\%
     \end{doublespace}%
     \vspace*{3cm}%
-    {\large{{\@thesisauthor} \\ of \\ {#1}}}\\%
+    {\Large{{\theauthor} \\ {#1}}}\\%
     \vspace*{8cm}%
     {#2}%
   \end{center}%
+  \endgroup
   \@oldendtitlepage
   \cleardoublepage%
 }
+\renewcommand{\maketitle}[1]{\titlepage{}}
 
 %% A main quote page
 \DeclareRobustCommand{\frontquote}[2]{%
@@ -609,9 +666,9 @@
 %% Table environment
 \let\@oldtable\table
 \let\@oldendtable\endtable
-\renewenvironment{table}{%
+\renewenvironment{table}[1][tbp]{%
   \vspace{0.4cm}%
-  \@oldtable[ht]%
+  \@oldtable[#1]%
   \begin{center}%
 }{%
   \end{center}%
@@ -622,8 +679,8 @@
 %% Figure environment
 \let\@oldfigure\figure
 \let\@oldendfigure\endfigure
-\renewenvironment{figure}{
-  \@oldfigure%
+\renewenvironment{figure}[1][tbp]{
+  \@oldfigure[#1]%
   \begin{center}%
 }{%
   \end{center}%
@@ -634,8 +691,8 @@
 %% Figure* environment (lots of \expandafter and \csname gubbins reqd... *sigh*)
 \expandafter\let\expandafter\@oldfigurestar \csname figure*\endcsname
 \expandafter\let\expandafter\@oldendfigurestar \csname endfigure*\endcsname
-\renewenvironment{figure*}{
-  \@oldfigurestar%
+\renewenvironment{figure*}[1][tbp]{
+  \@oldfigurestar[#1]%
   \begin{center}%
 }{%
   \end{center}%
@@ -646,8 +703,8 @@
 %% Sideways figure environment
 \let\@oldsidewaysfigure\sidewaysfigure
 \let\@oldendsidewaysfigure\endsidewaysfigure
-\renewenvironment{sidewaysfigure}{
-  \@oldsidewaysfigure%
+\renewenvironment{sidewaysfigure}[1][tbp]{
+  \@oldsidewaysfigure[#1]%
   \begin{center}%
 }{%
   \end{center}%
@@ -657,7 +714,7 @@
 
 
 %% ``Thesis''-prefixed duplicate commands and environments (deprecated)
-\newcommand{\thesistypeout}{\typeout{hepthesis: thesis- prefix commands are deprecated}}
+\newcommand{\thesistypeout}{\typeout{hepthesis: thesis- prefix commands are deprecated and will soon be removed}}
 \newenvironment{thesistable}{\thesistypeout\table}{\endtable\ignorespacesafterend}
 \newenvironment{thesistabular}{\thesistypeout\tabular}{\endtabular\ignorespacesafterend}
 \newenvironment{thesisfigure}{\thesistypeout\expandafter\let\expandafter\@oldoldfigurestar \csname figure*\endcsname \@oldoldfigurestar}%
@@ -677,7 +734,7 @@
 \newenvironment{thesisfrontmatter}{\thesistypeout\frontmatter}{\ignorespacesafterend}
 \newenvironment{thesismainmatter}{\thesistypeout\mainmatter}{\ignorespacesafterend}
 \newenvironment{thesisbackmatter}{\thesistypeout\backmatter}{\ignorespacesafterend}
-\DeclareRobustCommand{\thesistitlepage}[2]{\thesistypeout\titlepage{#1}{#2}}
+\DeclareRobustCommand{\thesistitlepage}[2][]{\thesistypeout\titlepage{#1}{#2}}
 \DeclareRobustCommand{\thesisfrontquote}[2]{\thesistypeout\frontquote{#1}{#2}}
 \DeclareRobustCommand{\thesischapterquote}[2]{\thesistypeout\chapterquote{#1}{#2}}
 \DeclareRobustCommand{\thesisverysubsection}[1]{\thesistypeout\verysubsection{#1}}
diff --git a/Master/texmf-dist/tpm/hepthesis.tpm b/Master/texmf-dist/tpm/hepthesis.tpm
index 2c79b08cdbd..c19e51764ef 100644
--- a/Master/texmf-dist/tpm/hepthesis.tpm
+++ b/Master/texmf-dist/tpm/hepthesis.tpm
@@ -3,7 +3,7 @@
   <rdf:Description about="http://texlive.dante.de/texlive/Package/hepthesis.zip">
     <TPM:Name>hepthesis</TPM:Name>
     <TPM:Type>Package</TPM:Type>
-    <TPM:Date>2006/02/27 14:16:35</TPM:Date>
+    <TPM:Date>2006/09/28 11:10:25</TPM:Date>
     <TPM:Version></TPM:Version>
     <TPM:Creator>karl</TPM:Creator>
     <TPM:Title>The hepthesis package.</TPM:Title>
@@ -11,13 +11,16 @@
     <TPM:Author></TPM:Author>
     <TPM:Size>784389</TPM:Size>
     <TPM:Build/>
-    <TPM:RunFiles size="23698">
+    <TPM:RunFiles size="24804">
 texmf-dist/tex/latex/hepthesis/hepthesis.cls
 texmf-dist/tpm/hepthesis.tpm
     </TPM:RunFiles>
-    <TPM:DocFiles size="760691">
+    <TPM:DocFiles size="812055">
 texmf-dist/doc/latex/hepthesis/ChangeLog
 texmf-dist/doc/latex/hepthesis/README
+texmf-dist/doc/latex/hepthesis/example/abhep.sty
+texmf-dist/doc/latex/hepthesis/example/abhepexpt.sty
+texmf-dist/doc/latex/hepthesis/example/abmath.sty
 texmf-dist/doc/latex/hepthesis/example/appendices.tex
 texmf-dist/doc/latex/hepthesis/example/backmatter.tex
 texmf-dist/doc/latex/hepthesis/example/chap1.tex
diff --git a/Master/texmf/lists/hepthesis b/Master/texmf/lists/hepthesis
index ac6824a04ef..3e01f3481ca 100644
--- a/Master/texmf/lists/hepthesis
+++ b/Master/texmf/lists/hepthesis
@@ -1,5 +1,8 @@
 texmf-dist/doc/latex/hepthesis/ChangeLog
 texmf-dist/doc/latex/hepthesis/README
+texmf-dist/doc/latex/hepthesis/example/abhep.sty
+texmf-dist/doc/latex/hepthesis/example/abhepexpt.sty
+texmf-dist/doc/latex/hepthesis/example/abmath.sty
 texmf-dist/doc/latex/hepthesis/example/appendices.tex
 texmf-dist/doc/latex/hepthesis/example/backmatter.tex
 texmf-dist/doc/latex/hepthesis/example/chap1.tex