hepthesis 1.4.3 (3jun10)

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

18 files changed, 1372 insertions, 151 deletions

diff --git a/Master/texmf-dist/doc/latex/hepthesis/ChangeLog b/Master/texmf-dist/doc/latex/hepthesis/ChangeLog
index 495f7cdc558..7e13e1a077d 100644
--- a/Master/texmf-dist/doc/latex/hepthesis/ChangeLog
+++ b/Master/texmf-dist/doc/latex/hepthesis/ChangeLog
@@ -1,3 +1,18 @@
+2010-05-27  Andy Buckley  <andy@insectnation.org>
+
+	* 1.4.3 release.
+
+	* Upgrading to use changepage in place of deprecated chngpage
+	package, and a few other fixes. Also tidying some of the example
+	document, improving the example makefile, and demonstrating
+	sub-figure references with continued captions. Thanks to Ben Wynne
+	for the heads-up.
+
+2009-02-12  Andy Buckley  <andy@insectnation.org>
+
+	* Fixed Makefile to put all the relevant files from example into
+	the tarball.
+
 2008-07-10  Andy Buckley  <andy@insectnation.org>
 
 	* Ready for *real* 1.4.2 release (more than a month after the
@@ -154,7 +169,7 @@
 	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.
 
@@ -218,7 +233,7 @@
 	* Added a sidewaysfigure environment, which introduces a
 	dependency on the rotating package. It's very standard, so I'm not
 	bothered. Maybe add an option to disable the rotating dependency later...
-	
+
 	* Added the hide{front,back,frontback} options.
 
 2005-09-26  Andy Buckley  <andy@insectnation.org>
@@ -234,8 +249,8 @@
 
 	* Changed \oddsidemargin and \evensidemargin settings to use the
 	\@bindextramargin length.
-	
+
 	* Added bindnopdf option.
-	
+
 	* Started ChangeLog entries. Oops, I should have started a bit
 	earlier, eh?
diff --git a/Master/texmf-dist/source/latex/hepthesis/Makefile b/Master/texmf-dist/doc/latex/hepthesis/Makefile
index 00fe86daab6..4c84db67b0b 100644
--- a/Master/texmf-dist/source/latex/hepthesis/Makefile
+++ b/Master/texmf-dist/doc/latex/hepthesis/Makefile
@@ -9,7 +9,9 @@ $(HT).tar.gz: README ChangeLog $(HT).pdf example/example.pdf
 	@mkdir $(HT)
 	@cp README TODO ChangeLog Makefile $(HT).pdf $(HT).cls $(HT).tex $(HT)
 	@mkdir $(HT)/example
-	@cp example/*.pdf example/*.tex example/extrastyles.zip Makefile $(HT)/example
+	@cp example/*.pdf example/*.tex example/extrastyles.zip example/Makefile $(HT)/example
+	@cp example/getNewBibtex example/h-physrev.bst $(HT)/example
+	@cp example/mythesis.bib example/mythesis.cls example/mythesis.sty example/mythesismath.sty $(HT)/example
 	tar czf $@ $(HT)
 	@rm -rf $(HT)
 
diff --git a/Master/texmf-dist/doc/latex/hepthesis/TODO b/Master/texmf-dist/doc/latex/hepthesis/TODO
index cfa0e8c8f28..66cf31a81a7 100644
--- a/Master/texmf-dist/doc/latex/hepthesis/TODO
+++ b/Master/texmf-dist/doc/latex/hepthesis/TODO
@@ -46,3 +46,27 @@ From Manuel Bahr:
 }{%
   \usepackage{cite}
 }
+
+
+From giuseppe.passino@elec.qmul.ac.uk:
+
+I'm actually using kile on linux, and I'm keen on the error window facility of clicking on an error and being redirected to the error line, as well as the backward referencing facility by which you can insert source information in the dvi file and be redirected to the correspondent line in the tex file when clicking in the dvi.
+
+Unfortunately, all this cool stuff with hepthesis does not work, since the comment.sty style is used, that wraps the source into a temporary comment.cut file that spoils everything. This is because you define mainmatter etc. as specialcomment. I changed them into \renewcommand, and this problem disappeared. I was anyway curious to know why you went for the comment style instead of a simpler \renewcommand. Hence this email. Additionally, maybe the problem I described above is a reason good enough for you to change the definition of mainmatter end friends..
+
+Just to give you an example, this is the new mainmatter:
+
+\let\@oldmainmatter\mainmatter
+\def\BeginMainMatter{%
+ %\@oldmainmatter%
+ \@mainmattertrue
+ \pagenumbering{arabic}%
+ \adjustwidth[]{\@mainmatterextramargin}{\@mainmatterextramargin}%
+ \begin{\@mainmatterspacing}%
+}
+\def\EndMainMatter{%
+ \end{\@mainmatterspacing}%
+ \endadjustwidth%
+ \ignorespacesafterend%
+}
+\renewenvironment{mainmatter}{\BeginMainMatter}{\EndMainMatter}
diff --git a/Master/texmf-dist/doc/latex/hepthesis/example/Makefile b/Master/texmf-dist/doc/latex/hepthesis/example/Makefile
index 00fe86daab6..5400f26abf8 100644
--- a/Master/texmf-dist/doc/latex/hepthesis/example/Makefile
+++ b/Master/texmf-dist/doc/latex/hepthesis/example/Makefile
@@ -1,34 +1,17 @@
-HT := hepthesis
-.PHONY: all clean check
+.PHONY: clean
 
-all: $(HT).tar.gz
-	@true
+EXTRASTYS = abhepexpt.sty abhep.sty  abmath.sty lineno.sty SIunits.sty varwidth.sty
 
-$(HT).tar.gz: README ChangeLog $(HT).pdf example/example.pdf 
-	@rm -rf $(HT)
-	@mkdir $(HT)
-	@cp README TODO ChangeLog Makefile $(HT).pdf $(HT).cls $(HT).tex $(HT)
-	@mkdir $(HT)/example
-	@cp example/*.pdf example/*.tex example/extrastyles.zip Makefile $(HT)/example
-	tar czf $@ $(HT)
-	@rm -rf $(HT)
-
-$(HT).pdf: $(HT).tex example/example.pdf 
-	(rm -f $(HT).{aux,toc,lof,lot} && pdflatex $(HT).tex && pdflatex $(HT).tex && rm -f $(HT).{aux,toc,lof,lot})
-
-example/example.pdf: force_look
-	cd example && $(MAKE) $(MFLAGS)
+example.pdf: example.tex mythesis.cls chap1.tex chap2.tex chap3.tex frontmatter.tex appendices.tex
+	@rm -f $(EXTRASTYS)
+	unzip extrastyles.zip
+	@rm -f example.{aux,toc,lof,lot}
+	(pdflatex example && bibtex example && pdflatex example && pdflatex example) || rm -f $(EXTRASTYS) example.pdf
+	@rm -f example.{aux,toc,lof,lot}
+	@rm -f $(EXTRASTYS)
 
 clean:
-	@rm -rf $(HT)
-	@rm -f $(HT).tar.gz
-	@rm -f $(HT).pdf $(HT).log $(HT).aux $(HT).out $(HT).dvi comment.cut
-	cd example && $(MAKE) $(MFLAGS) clean
-
-check: $(HT).tar.gz
-	@rm -rf $(HT)
-	@tar xzf $(HT).tar.gz
-	(cd $(HT) && make $(HT).pdf && make example/example.pdf)
-
-force_look:
-	@true
\ No newline at end of file
+	@rm -f $(EXTRASTYS)
+	@rm -f example.pdf example.log example.aux
+	@rm -f *.bbl *.blg *.lof *.cut
+	@rm -f *.lot *.out *.toc
diff --git a/Master/texmf-dist/doc/latex/hepthesis/example/chap2.tex b/Master/texmf-dist/doc/latex/hepthesis/example/chap2.tex
index 9fe3a9c7e42..257c3a8586e 100644
--- a/Master/texmf-dist/doc/latex/hepthesis/example/chap2.tex
+++ b/Master/texmf-dist/doc/latex/hepthesis/example/chap2.tex
@@ -6,15 +6,15 @@
 
 \section{The \LHC}
 The Large Hadron Collider (\LHC) at \CERN is a new hadron collider,
-located in the same tunnel as the Large Electron-Positron collider 
-(\LEP)~\cite{Brianti:2004qq}. Where \LEP's chief task was the use 
-of \unit{90--207}{\GeV} \epluseminus collisions to establish the 
+located in the same tunnel as the Large Electron-Positron collider
+(\LEP)~\cite{Brianti:2004qq}. Where \LEP's chief task was the use
+of \unit{90--207}{\GeV} \epluseminus collisions to establish the
 precision physics of electroweak unification\dots
 
 \begin{figure}
   \includegraphics[width=\largefigwidth]{ckmfitter-alpha-combined}
   \caption[CKM Fitter constraints on \alphaCKM.]%
-  {CKM Fitter constraints on \alphaCKM from combined \BToPiPi, 
+  {CKM Fitter constraints on \alphaCKM from combined \BToPiPi,
     \BToRhoPi and \BToRhoRho decay analyses.}
   \label{fig:CKMFitter}
 \end{figure}
@@ -22,10 +22,10 @@ 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 
-by using a wedge-shaped single-arm detector with angular acceptance 
+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
+by using a wedge-shaped single-arm detector with angular acceptance
 \unit{10-300}{\mrad} in the horizontal (bending) plane~\cite{Amato:1998xt}.
 
 \vspace{1cm}
@@ -36,7 +36,7 @@ by using a wedge-shaped single-arm detector with angular acceptance
 
 \vspace{1cm}
 
-The detector is illustrated in \FigureRef{fig:LHCbCrossSection}, showing 
+The detector is illustrated in \FigureRef{fig:LHCbCrossSection}, showing
 the overall scale of the experiment and the surrounding cavern structure.
 
 \begin{sidewaysfigure}
@@ -49,9 +49,9 @@ the overall scale of the experiment and the surrounding cavern structure.
 \end{sidewaysfigure}
 
 The single-sided detector design was chosen in preference to a two-armed
-design since the detector dimensions are restricted by the layout of the 
-IP8 (ex-Delphi) cavern in which \LHCb is located. Using all the available 
-space for a single-arm spectrometer more than compensates in performance 
+design since the detector dimensions are restricted by the layout of the
+IP8 (ex-Delphi) cavern in which \LHCb is located. Using all the available
+space for a single-arm spectrometer more than compensates in performance
 for the \about{50\percent} drop in luminosity.
 
 \section{The \Cerenkov mechanism}
@@ -64,7 +64,7 @@ track,
 \begin{subequations}
   \label{eq:cosThetaCk}
   \begin{equation}
-    \cos\,\thetaCerenkov  &= \frac{1}{n \beta} + 
+    \cos\,\thetaCerenkov  &= \frac{1}{n \beta} +
                              \frac{\hbar k}{2p}%
                              \parenths{ 1 - \frac{1}{n^2} } \\
                           &\,\sim \frac{1}{n \beta}%
@@ -79,7 +79,7 @@ where $\beta \equiv v/c$, the relativistic velocity fraction,
 An overview of the \LHCb trigger characteristics broken down by level
 is shown in \Table~\ref{tab:TriggerDetails}:
 
-\begin{table}
+\begin{table}[bht]
   \begin{tabular}{lllll}
                 & L0              & L1              & HLT             \\
     \midrule
diff --git a/Master/texmf-dist/doc/latex/hepthesis/example/chap3.tex b/Master/texmf-dist/doc/latex/hepthesis/example/chap3.tex
index bbea1745206..4b48c46b452 100644
--- a/Master/texmf-dist/doc/latex/hepthesis/example/chap3.tex
+++ b/Master/texmf-dist/doc/latex/hepthesis/example/chap3.tex
@@ -1,25 +1,37 @@
 \chapter{Continued captions}
 \label{chap:ContCaptions}
 
-Here are some funky ``continued captions''\dots
+Here are some funky floats using ``continued captions'', i.e. for a semantically
+collected group of float contents which are too numerous to fit into a single
+float, such as the pretty circles in the following figure:
 
-\begin{figure}
-  \subfloat[][Example 1a]{\label{fig:cc1a}\rule{3cm}{3cm}}
-  \subfloat[][Example 1b]{\label{fig:cc1b}\rule{3cm}{3cm}}
-  \subfloat[][Example 1c]{\label{fig:cc1c}\rule{3cm}{3cm}}
-  \subfloat[][Example 1d]{\label{fig:cc1d}\rule{3cm}{3cm}}
-  \caption{Demonstration of \texttt{ccaption}.}
+\newcommand{\circleimg}[1]{%
+\begin{tikzpicture}
+  \draw[color=black,fill=#1,thick] (1,0) circle (1.5cm);
+\end{tikzpicture}%
+}
+
+\begin{figure}[hb]
+  \subfloat[][Example 1a]{\label{fig:cc1a}\circleimg{red!80}}\quad
+  \subfloat[][Example 1b]{\label{fig:cc1b}\circleimg{green!70!yellow}}\quad
+  \subfloat[][Example 1c]{\label{fig:cc1c}\circleimg{blue!80}}\quad
+  \subfloat[][Example 1d]{\label{fig:cc1d}\circleimg{orange}}
+  \caption{Demonstration of \texttt{subfig} continued captions.}
   \label{fig:cc1}
 \end{figure}
 
-\begin{figure}
+\begin{figure}[p]
   \ContinuedFloat
-  \subfloat[][Example 1e]{\label{fig:cc1e}\rule{3cm}{3cm}}
-  \subfloat[][Example 1f]{\label{fig:cc1f}\rule{3cm}{3cm}}
-  \subfloat[][Example 1g]{\label{fig:cc1g}\rule{3cm}{3cm}}
-  \subfloat[][Example 1h]{\label{fig:cc1h}\rule{3cm}{3cm}}
-  \caption[]{Demonstration of \texttt{ccaption} (continued).}
-  %\label{fig:cc1}
+  \subfloat[][Example 1e]{\label{fig:cc1e}\circleimg{violet}}\quad
+  \subfloat[][Example 1f]{\label{fig:cc1f}\circleimg{cyan}}\quad
+  \subfloat[][Example 1g]{\label{fig:cc1g}\circleimg{magenta}}\quad
+  \subfloat[][Example 1h]{\label{fig:cc1h}\circleimg{yellow}}
+  \caption[]{Demonstration of \texttt{subfig} continued captions (continued).}
 \end{figure}
 
-Just for the hell of it, let's refer to \SectionRef{sec:neutralmixing}.
+This mechanism means that the same float label is used for both pages of
+floats. Note that we can refer to \FigureRef{fig:cc1} in general, or to
+\FigureRef{fig:cc1g} on \PageRef{fig:cc1g} in particular!
+
+\noindent
+Just for the hell of it, let's also refer to \SectionRef{sec:neutralmixing}.
diff --git a/Master/texmf-dist/doc/latex/hepthesis/example/example.pdf b/Master/texmf-dist/doc/latex/hepthesis/example/example.pdf
index 1c0e9d1f30e..e7af2a74ed9 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 7b8e4f282b0..56dd42143fe 100644
--- a/Master/texmf-dist/doc/latex/hepthesis/example/example.tex
+++ b/Master/texmf-dist/doc/latex/hepthesis/example/example.tex
@@ -46,7 +46,7 @@ pdfauthor = {\textcopyright\ Andy Buckley}
   \input{appendices}
 \end{appendices}
 
-%% Produce the un-numbered back matter (e.g. colophon, 
+%% Produce the un-numbered back matter (e.g. colophon,
 %% bibliography, tables of figures etc., index...)
 \begin{backmatter}
   \input{backmatter}
diff --git a/Master/texmf-dist/doc/latex/hepthesis/example/frontmatter.tex b/Master/texmf-dist/doc/latex/hepthesis/example/frontmatter.tex
index 5988b95749b..e3990873011 100644
--- a/Master/texmf-dist/doc/latex/hepthesis/example/frontmatter.tex
+++ b/Master/texmf-dist/doc/latex/hepthesis/example/frontmatter.tex
@@ -1,12 +1,12 @@
 %% Title
 \titlepage[of Churchill College]%
-{A dissertation submitted to the University of Cambridge\\ 
+{A dissertation submitted to the University of Cambridge\\
   for the degree of Doctor of Philosophy}
 
 %% Abstract
 \begin{abstract}%[\smaller \thetitle\\ \vspace*{1cm} \smaller {\theauthor}]
   %\thispagestyle{empty}
-  \LHCb is a \bphysics detector experiment which will take data at 
+  \LHCb is a \bphysics detector experiment which will take data at
   the \unit{14}{\TeV} \LHC accelerator at \CERN from 2007 onward\dots
 \end{abstract}
 
@@ -15,8 +15,8 @@
 \begin{declaration}
   This dissertation is the result of my own work, except where explicit
   reference is made to the work of others, and has not been submitted
-  for another qualification to this or any other university. This 
-  dissertation does not exceed the word limit for the respective Degree 
+  for another qualification to this or any other university. This
+  dissertation does not exceed the word limit for the respective Degree
   Committee.
   \vspace*{1cm}
   \begin{flushright}
@@ -27,7 +27,7 @@
 
 %% Acknowledgements
 \begin{acknowledgements}
-  Of the many people who deserve thanks, some are particularly prominent, 
+  Of the many people who deserve thanks, some are particularly prominent,
   such as my supervisor\dots
 \end{acknowledgements}
 
@@ -37,9 +37,9 @@
   This thesis describes my research on various aspects of the \LHCb
   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} 
+  For this example, I'll just mention \ChapterRef{chap:SomeStuff}
   and \ChapterRef{chap:MoreStuff}.
 \end{preface}
 
@@ -48,6 +48,6 @@
 
 %% Strictly optional!
 \frontquote%
-  {Writing in English is the most ingenious torture\\ 
+  {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/getNewBibtex b/Master/texmf-dist/doc/latex/hepthesis/example/getNewBibtex
new file mode 100644
index 00000000000..ae2863bb141
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/hepthesis/example/getNewBibtex
@@ -0,0 +1,16 @@
+#! /usr/bin/env bash
+
+if [[ -n $( echo $* | egrep -- "-h\>|--help\>" ) ]]; then
+    echo -e "Usage: $0 <myfile.tex>"
+    echo "NB. \\input and \\include operations will only work in"
+    echo "the current directory, rather than via the full TeX path."
+    exit 0
+fi
+
+maintexfile=$1
+tempfile=texmerge.$$
+
+cat $maintexfile | sed -e s/'\\input{\([^}]*\)}'/'#include "\1\.tex"'/g > $tempfile
+#cat $tempfile
+cpp $tempfile 2> /dev/null | mail -s "generate bibtex" slaclib2@slac.stanford.edu
+rm -f $tempfile
diff --git a/Master/texmf-dist/doc/latex/hepthesis/example/h-physrev.bst b/Master/texmf-dist/doc/latex/hepthesis/example/h-physrev.bst
new file mode 100644
index 00000000000..0d200a0197e
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/hepthesis/example/h-physrev.bst
@@ -0,0 +1,949 @@
+ENTRY
+{ address
+eprint
+author
+booktitle
+chapter
+collaboration
+edition
+editor
+howpublished
+institution
+journal
+key
+month
+note
+number
+organization
+pages
+publisher
+school
+series
+title
+type
+volume
+year
+}
+{}
+{ label }
+INTEGERS { output.state before.all mid.sentence after.sentence after.block }
+FUNCTION {init.state.consts}
+{ #0 'before.all :=
+#1 'mid.sentence :=
+#2 'after.sentence :=
+#3 'after.block :=
+}
+STRINGS { s t }
+FUNCTION {output.nonnull}
+{ 's :=
+output.state mid.sentence =
+{ ", " * write$ }
+{ output.state after.block =
+{ "," * write$
+newline$
+"\newblock " write$
+}
+{ output.state before.all =
+'write$
+{ add.period$ " " * write$ }
+if$
+}
+if$
+mid.sentence 'output.state :=
+}
+if$
+s
+}
+FUNCTION {output}
+{ duplicate$ empty$
+'pop$
+'output.nonnull
+if$
+}
+FUNCTION {output.check}
+{ 't :=
+duplicate$ empty$
+{ pop$ "empty " t * " in " * cite$ * warning$ }
+'output.nonnull
+if$
+}
+FUNCTION {output.bibitem}
+{ newline$
+"\bibitem{" write$
+cite$ write$
+"}" write$
+newline$
+""
+before.all 'output.state :=
+}
+FUNCTION {fin.entry}
+{ add.period$
+write$
+newline$
+}
+FUNCTION {new.block}
+{ output.state before.all =
+'skip$
+{ after.block 'output.state := }
+if$
+}
+FUNCTION {new.sentence}
+{ skip$
+}
+FUNCTION {not}
+{   { #0 }
+{ #1 }
+if$
+}
+FUNCTION {and}
+{   'skip$
+{ pop$ #0 }
+if$
+}
+FUNCTION {or}
+{   { pop$ #1 }
+'skip$
+if$
+}
+FUNCTION {new.block.checka}
+{ empty$
+'skip$
+'new.block
+if$
+}
+FUNCTION {new.block.checkb}
+{ empty$
+swap$ empty$
+and
+'skip$
+'new.block
+if$
+}
+FUNCTION {new.sentence.checka}
+{ empty$
+'skip$
+'new.sentence
+if$
+}
+FUNCTION {new.sentence.checkb}
+{ empty$
+swap$ empty$
+and
+'skip$
+'new.sentence
+if$
+}
+FUNCTION {field.or.null}
+{ duplicate$ empty$
+{ pop$ "" }
+'skip$
+if$
+}
+FUNCTION {emphasize}
+{ duplicate$ empty$
+{ pop$ "" }
+{ "{\em " swap$ * "}" * }
+if$
+}
+FUNCTION {embolden}
+{ duplicate$ empty$
+{ pop$ "" }
+{ "{\bf " swap$ * "}" * }
+if$
+}
+FUNCTION {paren}
+{ duplicate$ empty$
+{ pop$ "" }
+{ "(" swap$ * ")" * }
+if$
+}
+INTEGERS { nameptr namesleft numnames }
+INTEGERS { etal }
+FUNCTION {format.names}
+{ 's :=
+#1 'nameptr :=
+s num.names$ 'numnames :=
+numnames #5 >
+s numnames "{ll}" format.name$ "others" = numnames #1 > and
+or 'etal :=
+etal
+{ #1 #1 + 'namesleft := }
+{ numnames 'namesleft := }
+if$
+{ namesleft #0 > }
+{ s nameptr "{f.~}{vv~}{ll}{, jj}" format.name$ 't :=
+nameptr #1 >
+{ namesleft #1 >
+{ ", " * t * }
+{ nameptr #2 >
+{ "," * }
+'skip$
+if$
+t "others" =
+etal or
+{ " {\em et~al.}" * }
+{ " and " * t * }
+if$
+}
+if$
+}
+'t
+if$
+nameptr #1 + 'nameptr :=
+namesleft #1 - 'namesleft :=
+}
+while$
+}
+FUNCTION {format.authors}
+{ author empty$
+{ "" }
+{ author format.names }
+if$
+}
+FUNCTION {format.editors}
+{ editor empty$
+{ "" }
+{ editor format.names
+editor num.names$ #1 >
+{ ", editors" * }
+{ ", editor" * }
+if$
+}
+if$
+}
+FUNCTION {format.edited}
+{ editor empty$
+{ "" }
+{ "edited by " editor format.names * }
+if$
+}
+FUNCTION {format.title}
+{ title empty$
+{ "" }
+{ title "t" change.case$ }
+if$
+}
+FUNCTION {n.dashify}
+{ 't :=
+""
+{ t empty$ not }
+{ t #1 #1 substring$ "-" =
+{ t #1 #2 substring$ "--" = not
+{ "--" *
+t #2 global.max$ substring$ 't :=
+}
+{   { t #1 #1 substring$ "-" = }
+{ "-" *
+t #2 global.max$ substring$ 't :=
+}
+while$
+}
+if$
+}
+{ t #1 #1 substring$ *
+t #2 global.max$ substring$ 't :=
+}
+if$
+}
+while$
+}
+FUNCTION {first.page}
+{ 't :=
+""
+{  t empty$ not t #1 #1 substring$ "-" = not and }
+{ t #1 #1 substring$ *
+t #2 global.max$ substring$ 't :=
+}
+while$
+}
+FUNCTION {format.date}
+{ year empty$
+{ "" }
+'year
+if$
+}
+FUNCTION {format.btitle}
+{ title emphasize
+}
+FUNCTION {tie.or.space.connect}
+{ duplicate$ text.length$ #3 <
+{ "~" }
+{ " " }
+if$
+swap$ * *
+}
+FUNCTION {either.or.check}
+{ empty$
+'pop$
+{ "can't use both " swap$ * " fields in " * cite$ * warning$ }
+if$
+}
+FUNCTION {format.bvolume}
+{ volume empty$
+{ "" }
+{ series empty$
+'skip$
+{ ", " series * }
+if$
+" Vol." volume tie.or.space.connect *
+"volume and number" number either.or.check
+}
+if$
+}
+FUNCTION {format.number.series}
+{ volume empty$
+{ number empty$
+{ series field.or.null }
+{  series empty$
+{ "there's a number but no series in " cite$ * warning$ }
+{ ", " series * }
+if$
+" No. " number tie.or.space.connect *
+}
+if$
+}
+{ "" }
+if$
+}
+FUNCTION {format.edition}
+{ edition empty$
+{ "" }
+{ output.state mid.sentence =
+{ ", " edition "l" change.case$ *  }
+{ ", " edition "t" change.case$ *  }
+if$
+" ed." *
+}
+if$
+}
+INTEGERS { multiresult }
+FUNCTION {multi.page.check}
+{ 't :=
+#0 'multiresult :=
+{ multiresult not
+t empty$ not
+and
+}
+{ t #1 #1 substring$
+duplicate$ "-" =
+swap$ duplicate$ "," =
+swap$ "+" =
+or or
+{ #1 'multiresult := }
+{ t #2 global.max$ substring$ 't := }
+if$
+}
+while$
+multiresult
+}
+FUNCTION {format.pages}
+{ pages empty$
+{ "" }
+{ pages multi.page.check
+{ "pp." pages n.dashify tie.or.space.connect }
+{ "p." pages tie.or.space.connect }
+if$
+}
+if$
+}
+FUNCTION {format.pages.a}
+{ pages empty$
+{ "" }
+{ "p." pages first.page tie.or.space.connect }
+if$
+}
+FUNCTION {format.vol.num.pages}
+{ volume field.or.null embolden
+" " swap$ * *
+pages empty$
+'skip$
+{ duplicate$ empty$
+{ pop$ format.pages.a }
+{ ", " * pages first.page * }
+if$
+}
+if$
+}
+FUNCTION {format.chapter.pages}
+{ chapter empty$
+'format.pages
+{ type empty$
+{ "chap." }
+{ type "l" change.case$ }
+if$
+chapter tie.or.space.connect
+pages empty$
+'skip$
+{ ", " * format.pages * }
+if$
+}
+if$
+}
+FUNCTION {format.pub.addr.date}
+{ publisher empty$
+{ "" "empty publisher in " cite$ * warning$ }
+{ publisher
+address empty$
+'skip$
+{ ", " * address * }
+if$
+}
+if$
+year empty$
+{ "empty year in " cite$ * warning$ }
+{ ", " * year * }
+if$
+paren " " swap$ *
+}
+FUNCTION {format.book.entry}
+{ format.btitle
+format.bvolume *
+format.number.series *
+format.edition *
+format.pub.addr.date *
+}
+FUNCTION {format.inbook.entry}
+{ format.book.entry
+", " *
+format.chapter.pages *
+}
+FUNCTION {format.in.ed.booktitle}
+{ booktitle empty$
+{ "" }
+{ editor empty$
+{ "in " booktitle emphasize * }
+{ "in " booktitle emphasize * ", " * format.edited * }
+if$
+}
+if$
+}
+FUNCTION {empty.misc.check}
+{ author empty$ title empty$ howpublished empty$
+month empty$ year empty$ note empty$
+and and and and and
+{ "all relevant fields are empty in " cite$ * warning$ }
+'skip$
+if$
+}
+FUNCTION {format.thesis.type}
+{ type empty$
+'skip$
+{ pop$
+type "t" change.case$
+}
+if$
+}
+FUNCTION {format.inst.tr.num.date}
+{ institution empty$
+{ "" "empty institution in " cite$ * warning$ }
+{ institution }
+if$
+" Report No." *
+number empty$
+{ "" }
+{ number tie.or.space.connect }
+if$
+year empty$
+{ "empty year in " cite$ * warning$ }
+{ ", " * year * " (unpublished)" * }
+if$
+}
+FUNCTION {format.article.crossref}
+{ key empty$
+{ journal empty$
+{ "need key or journal for " cite$ * " to crossref " * crossref *
+warning$
+""
+}
+{ "In " journal * }
+if$
+}
+{ "In " key * }
+if$
+" \cite{" * crossref * "}" *
+}
+FUNCTION {format.crossref.editor}
+{ editor #1 "{vv~}{ll}" format.name$
+editor num.names$ duplicate$
+#2 >
+{ pop$ " {\em et~al.}" * }
+{ #2 <
+'skip$
+{ editor #2 "{ff }{vv }{ll}{ jj}" format.name$ "others" =
+{ " {\em et~al.}" * }
+{ " and " * editor #2 "{vv~}{ll}" format.name$ * }
+if$
+}
+if$
+}
+if$
+}
+FUNCTION {format.book.crossref}
+{ volume empty$
+{ "empty volume in " cite$ * "'s crossref of " * crossref * warning$
+"In "
+}
+{ "Volume" volume tie.or.space.connect
+" of " *
+}
+if$
+editor empty$
+editor field.or.null author field.or.null =
+or
+{ key empty$
+{ series empty$
+{ "need editor, key, or series for " cite$ * " to crossref " *
+crossref * warning$
+"" *
+}
+{ "{\em " * series * "\/}" * }
+if$
+}
+{ key * }
+if$
+}
+{ format.crossref.editor * }
+if$
+" \cite{" * crossref * "}" *
+}
+FUNCTION {format.incoll.inproc.crossref}
+{ editor empty$
+editor field.or.null author field.or.null =
+or
+{ key empty$
+{ booktitle empty$
+{ "need editor, key, or booktitle for " cite$ * " to crossref " *
+crossref * warning$
+""
+}
+{ "In {\em " booktitle * "\/}" * }
+if$
+}
+{ "In " key * }
+if$
+}
+{ "In " format.crossref.editor * }
+if$
+" \cite{" * crossref * "}" *
+}
+FUNCTION {article}
+{ output.bibitem
+collaboration output
+format.authors "author" output.check
+new.block
+crossref missing$
+{ journal field.or.null
+format.vol.num.pages 
+format.date empty$
+'skip$
+{ duplicate$ empty$
+{ pop$ format.date paren }
+{ " " * format.date paren * }
+if$
+}
+if$
+output
+}
+{ format.article.crossref output.nonnull
+format.pages output
+}
+if$
+eprint output
+new.block
+note output
+fin.entry
+}
+FUNCTION {book}
+{ output.bibitem
+collaboration output
+author empty$
+{ format.editors "author and editor" output.check }
+{ format.authors output.nonnull
+crossref missing$
+{ "author and editor" editor either.or.check }
+'skip$
+if$
+}
+if$
+new.block
+crossref missing$
+{ format.book.entry output }
+{ new.block
+format.book.crossref output.nonnull
+}
+if$    
+eprint output
+new.block
+note output
+fin.entry
+}
+FUNCTION {booklet}
+{ output.bibitem
+collaboration output
+format.authors output
+new.block
+format.title "title" output.check
+howpublished address new.block.checkb
+howpublished output
+address output
+format.date output
+eprint output
+new.block
+note output
+fin.entry
+}
+FUNCTION {inbook}
+{ output.bibitem
+collaboration output
+author empty$
+{ format.editors "author and editor" output.check }
+{ format.authors output.nonnull
+crossref missing$
+{ "author and editor" editor either.or.check }
+'skip$
+if$
+}
+if$
+new.block
+crossref missing$
+{ format.inbook.entry output }
+{ format.chapter.pages "chapter and pages" output.check
+new.block
+format.book.crossref output.nonnull
+}
+if$
+eprint output
+new.block
+note output
+fin.entry
+}
+FUNCTION {incollection}
+{ output.bibitem
+collaboration output
+format.authors "author" output.check
+new.block
+format.title "title" output.check
+new.block
+crossref missing$
+{ format.in.ed.booktitle "booktitle" output.check
+format.bvolume output
+format.number.series output
+format.chapter.pages output
+new.sentence
+publisher "publisher" output.check
+address output
+format.edition output
+format.date "year" output.check
+}
+{ format.incoll.inproc.crossref output.nonnull
+format.chapter.pages output
+}
+if$
+eprint output
+new.block
+note output
+fin.entry
+}
+FUNCTION {inproceedings}
+{ output.bibitem
+collaboration output
+format.authors "author" output.check
+new.block
+format.title "title" output.check
+new.block
+crossref missing$
+{ format.in.ed.booktitle "booktitle" output.check
+format.bvolume output
+format.number.series output
+format.pages output
+address empty$
+{ organization publisher new.sentence.checkb
+organization output
+publisher output
+format.date "year" output.check
+}
+{ address output.nonnull
+format.date "year" output.check
+new.sentence
+organization output
+publisher output
+}
+if$
+}
+{ format.incoll.inproc.crossref output.nonnull
+format.pages output
+}
+if$
+eprint output
+new.block
+note output
+fin.entry
+}
+FUNCTION {conference} { inproceedings }
+FUNCTION {manual}
+{ output.bibitem
+collaboration output
+author empty$
+{ organization empty$
+'skip$
+{ organization output.nonnull
+address output
+}
+if$
+}
+{ format.authors output.nonnull }
+if$
+new.block
+format.btitle "title" output.check
+author empty$
+{ organization empty$
+{ address new.block.checka
+address output
+}
+'skip$
+if$
+}
+{ organization address new.block.checkb
+organization output
+address output
+}
+if$
+format.edition output
+format.date output
+eprint output
+new.block
+note output
+fin.entry
+}
+FUNCTION {mastersthesis}
+{ output.bibitem
+format.authors "author" output.check
+new.block
+format.title "title" output.check
+new.block
+"Master's thesis" format.thesis.type output.nonnull
+school "school" output.check
+address output
+format.date "year" output.check
+eprint output
+new.block
+note output
+fin.entry
+}
+FUNCTION {misc}
+{ output.bibitem
+collaboration output
+format.authors output
+title howpublished new.block.checkb
+format.title output
+howpublished new.block.checka
+howpublished output
+format.date output
+eprint output
+new.block
+note output
+fin.entry
+empty.misc.check
+}
+FUNCTION {phdthesis}
+{ output.bibitem
+format.authors "author" output.check
+new.block
+format.btitle "title" output.check
+new.block
+"PhD thesis" format.thesis.type output.nonnull
+school "school" output.check
+address output
+format.date "year" output.check
+eprint output
+new.block
+note output
+fin.entry
+}
+FUNCTION {proceedings}
+{ output.bibitem
+collaboration output
+editor empty$
+{ organization output }
+{ format.editors output.nonnull }
+if$
+new.block
+format.btitle "title" output.check
+format.bvolume output
+format.number.series output
+address empty$
+{ editor empty$
+{ publisher new.sentence.checka }
+{ organization publisher new.sentence.checkb
+organization output
+}
+if$
+publisher output
+format.date "year" output.check
+}
+{ address output.nonnull
+format.date "year" output.check
+new.sentence
+editor empty$
+'skip$
+{ organization output }
+if$
+publisher output
+}
+if$
+eprint output
+new.block
+note output
+fin.entry
+}
+FUNCTION {techreport}
+{ output.bibitem
+collaboration output
+format.authors "author" output.check
+new.block
+format.inst.tr.num.date output.nonnull
+eprint output
+new.block
+note output
+fin.entry
+}
+FUNCTION {unpublished}
+{ output.bibitem
+collaboration output
+format.authors "author" output.check
+new.block
+format.title "title" output.check
+new.block
+note "note" output.check
+format.date output
+fin.entry
+}
+FUNCTION {default.type} { misc }
+MACRO {jan} {"Jan."}
+MACRO {feb} {"Feb."}
+MACRO {mar} {"Mar."}
+MACRO {apr} {"Apr."}
+MACRO {may} {"May"}
+MACRO {jun} {"June"}
+MACRO {jul} {"July"}
+MACRO {aug} {"Aug."}
+MACRO {sep} {"Sept."}
+MACRO {oct} {"Oct."}
+MACRO {nov} {"Nov."}
+MACRO {dec} {"Dec."}
+MACRO {acmcs} {"ACM Comput. Surv."}
+MACRO {acta} {"Acta Inf."}
+MACRO {cacm} {"Commun. ACM"}
+MACRO {ibmjrd} {"IBM J. Res. Dev."}
+MACRO {ibmsj} {"IBM Syst.~J."}
+MACRO {ieeese} {"IEEE Trans. Softw. Eng."}
+MACRO {ieeetc} {"IEEE Trans. Comput."}
+MACRO {ieeetcad}
+{"IEEE Trans. Comput.-Aided Design Integrated Circuits"}
+MACRO {ipl} {"Inf. Process. Lett."}
+MACRO {jacm} {"J.~ACM"}
+MACRO {jcss} {"J.~Comput. Syst. Sci."}
+MACRO {scp} {"Sci. Comput. Programming"}
+MACRO {sicomp} {"SIAM J. Comput."}
+MACRO {tocs} {"ACM Trans. Comput. Syst."}
+MACRO {tods} {"ACM Trans. Database Syst."}
+MACRO {tog} {"ACM Trans. Gr."}
+MACRO {toms} {"ACM Trans. Math. Softw."}
+MACRO {toois} {"ACM Trans. Office Inf. Syst."}
+MACRO {toplas} {"ACM Trans. Prog. Lang. Syst."}
+MACRO {tcs} {"Theoretical Comput. Sci."}
+MACRO {advp} {"Adv. Phys."}
+MACRO {ajp} {"Am. J. Phys."}
+MACRO {ao} {"Appl. Opt."}
+MACRO {apj} {"Astrophys. J."}
+MACRO {apl} {"Appl. Phys. Lett."}
+MACRO {arnps} {"Ann. Rev. Nucl. Sci."}
+MACRO {arns} {"Ann. Rev. Nucl. Part. Sci."}
+MACRO {baps} {"Bull. Am. Phys. Soc."}
+MACRO {cpc} {"Computer Phys. Comm."}
+MACRO {cppcf} {"Comments Plasma Phys. Controlled Fusion"}
+MACRO {fed} {"Fusion Eng. Design"}
+MACRO {ft} {"Fusion Tech."}
+MACRO {ieeens} {"IEEE Trans. Nucl. Sci."}
+MACRO {ieeeps} {"IEEE Trans. Plasma Sci."}
+MACRO {ijimw} {"Int. J. Infrared Millimeter Waves"}
+MACRO {ip} {"Infrared Phys."}
+MACRO {jap} {"J. Appl. Phys."}
+MACRO {jcp} {"J. Comput. Phys."}
+MACRO {jetp} {"Sov. Phys.-JETP"}
+MACRO {jfe} {"J. Fusion Energy"}
+MACRO {jfm} {"J. Fluid Mech."}
+MACRO {jgr} {"J. Geophys. Res."}
+MACRO {jmp} {"J. Math. Phys."}
+MACRO {jne} {"J. Nucl. Energy"}
+MACRO {jnm} {"J. Nucl. Mater."}
+MACRO {josa} {"J. Opt. Soc. Am."}
+MACRO {jpg} {"J. Phys.~G: Nucl. and Part. Phys."}
+MACRO {jphys} {"J. Phys"}
+MACRO {jpp} {"J. Plasma Phys."}
+MACRO {jpsj} {"J. Phys. Soc. Jpn"}
+MACRO {jvst} {"J. Vac. Sci. Technol."}
+MACRO {modphyslettA} {"Mod. Phys. Lett. A"}
+MACRO {nedf} {"Nucl. Eng. Design/Fusion"}
+MACRO {nf} {"Nucl. Fusion"}
+MACRO {nim} {"Nucl. Instrum. Methods"}
+MACRO {np} {"Nucl. Phys."}
+MACRO {npb} {"Nucl. Phys.~B"}
+MACRO {npbps} {"Nucl. Phys. B (Proc. Suppl.)"}
+MACRO {nt/f} {"Nucl. Tech./Fusion"}
+MACRO {pf} {"Phys. Fluids"}
+MACRO {pl} {"Phys. Lett."}
+MACRO {plb} {"Phys. Lett.~B"}
+MACRO {pnas} {"Proc. Nat. Acad. Sci. USA"}
+MACRO {pp} {"Plasma Phys."}
+MACRO {physrep} {"Phys. Rep."}
+MACRO {physrev} {"Phys. Rev."}
+MACRO {pr} {"Phys. Rev."}
+MACRO {prd} {"Phys. Rev.~D"}
+MACRO {prl} {"Phys. Rev. Lett."}
+MACRO {procroysoc} {"Proc. Roy. Soc"}
+MACRO {ps} {"Physica Scripta"}
+MACRO {rmp} {"Rev. Mod. Phys."}
+MACRO {rsi} {"Rev. Sci. Instrum."}
+MACRO {sjnp} {"Sov. J. Nucl. Phys."}
+MACRO {sjpp} {"Sov. J. Plasma Phys."}
+MACRO {spd} {"Sov. Phys.-Dokl."}
+MACRO {sptp} {"Sov. Phys.-Tech. Phys."}
+MACRO {spu} {"Sov. Phys.-Usp."}
+MACRO {zp} {"Z. Phys."}
+MACRO {zpc} {"Z. Phys.~C"}
+READ
+STRINGS { longest.label }
+INTEGERS { number.label longest.label.width }
+FUNCTION {initialize.longest.label}
+{ "" 'longest.label :=
+#1 'number.label :=
+#0 'longest.label.width :=
+}
+FUNCTION {longest.label.pass}
+{ number.label int.to.str$ 'label :=
+number.label #1 + 'number.label :=
+label width$ longest.label.width >
+{ label 'longest.label :=
+label width$ 'longest.label.width :=
+}
+'skip$
+if$
+}
+EXECUTE {initialize.longest.label}
+ITERATE {longest.label.pass}
+FUNCTION {begin.bib}
+{ preamble$ empty$
+'skip$
+{ preamble$ write$ newline$ }
+if$
+"\begin{thebibliography}{"  longest.label  * "}" * write$ newline$
+}
+EXECUTE {begin.bib}
+EXECUTE {init.state.consts}
+ITERATE {call.type$}
+FUNCTION {end.bib}
+{ newline$
+"\end{thebibliography}" write$ newline$
+}
+EXECUTE {end.bib}
diff --git a/Master/texmf-dist/doc/latex/hepthesis/example/mythesis.bib b/Master/texmf-dist/doc/latex/hepthesis/example/mythesis.bib
new file mode 100644
index 00000000000..f8dc85a0e39
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/hepthesis/example/mythesis.bib
@@ -0,0 +1,51 @@
+%% Obtained via the getNewBibTeX script and the SPIRES biblio service
+
+@Article{Phys.Rev.Lett.19.1264,
+     author    = "Weinberg, Steven",
+     title     = "A MODEL OF LEPTONS",
+     journal   = "Phys. Rev. Lett.",
+     volume    = "19",
+     year      = "1967",
+     pages     = "1264-1266",
+     SLACcitation  = "%%CITATION = PRLTA,19,1264;%%"
+}
+
+@Article{Phys.Rev.D2.1285,
+     author    = "Glashow, S. L. and Iliopoulos, J. and Maiani, L.",
+     title     = "WEAK INTERACTIONS WITH LEPTON - HADRON SYMMETRY",
+     journal   = "Phys. Rev.",
+     volume    = "D2",
+     year      = "1970",
+     pages     = "1285-1292",
+     SLACcitation  = "%%CITATION = PHRVA,D2,1285;%%"
+}
+
+@Article{hep-ph/0410370,
+     author    = "Willenbrock, Scott",
+     title     = "Symmetries of the standard model",
+     year      = "2004",
+     eprint    = "hep-ph/0410370",
+     SLACcitation  = "%%CITATION = HEP-PH 0410370;%%"
+}
+
+@Article{Brianti:2004qq,
+     author    = "Brianti, G.",
+     title     = "The Large Hadron Collider project: Historical account",
+     journal   = "Phys. Rept.",
+     volume    = "403-404",
+     year      = "2004",
+     pages     = "349-364",
+     SLACcitation  = "%%CITATION = PRPLC,403-404,349;%%"
+}
+
+@Article{Amato:1998xt,
+     author    = "Amato, S. and others",
+ collaboration = "LHCb",
+     title     = "LHCb technical proposal",
+     note     = "CERN-LHCC-98-4"
+}
+
+@Misc{hepthesis,
+     author = "Buckley, Andy",
+     title  = "The hepthesis {\LaTeX} class"
+}
diff --git a/Master/texmf-dist/doc/latex/hepthesis/example/mythesis.cls b/Master/texmf-dist/doc/latex/hepthesis/example/mythesis.cls
new file mode 100644
index 00000000000..adb9a87fc35
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/hepthesis/example/mythesis.cls
@@ -0,0 +1,33 @@
+\ProvidesClass{thesis}
+%% For normal draft builds
+\LoadClass[hyperpdf,nobind,draft,sftitles,oneside]{hepthesis}
+%\LoadClass[hyperpdf,nobind,draft,twoside]{hepthesis}
+%% For short draft builds (breaks citations by necessity)
+%\LoadClass[hyperpdf,nobind,draft,hidefrontback]{hepthesis}
+%% For Cambridge soft-bound version
+%\LoadClass[hyperpdf,bindnopdf]{hepthesis}
+%% For Cambridge hard-bound version (must be one-sided)
+%\LoadClass[hyperpdf,oneside]{hepthesis}
+
+%% -------------------------------------
+%% Standard packages
+%% -------------------------------------
+\RequirePackage{cite}
+%\RequirePackage{morefloats}
+\RequirePackage{mathrsfs} % script font
+\RequirePackage{afterpage}
+
+%% Using Babel allows other languages to be used and mixed-in easily
+\RequirePackage[ngerman,english]{babel}
+\selectlanguage{english}
+
+%% Quotes in different languages are different.
+%% Using \enquote{bla} automatically uses the correct quotes
+%% according to the Babel language that is set
+\RequirePackage[babel]{csquotes}
+
+%% Subfigures - note subfig is incompatible with ccaption
+\RequirePackage{subfig}
+
+%% TikZ is a marvellous drawing package
+\RequirePackage{tikz}
diff --git a/Master/texmf-dist/doc/latex/hepthesis/example/mythesis.sty b/Master/texmf-dist/doc/latex/hepthesis/example/mythesis.sty
new file mode 100644
index 00000000000..c26f4c5b166
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/hepthesis/example/mythesis.sty
@@ -0,0 +1,65 @@
+\ProvidesPackage{thesis}[2005/07/28]
+%\RequirePackage{timing}
+\RequirePackage{hepnicenames,hepunits,abhep}
+
+%% Citation spacing hack to bring the citation
+%% number a little closer to the referring text
+\let\@OldCite\cite
+\renewcommand{\cite}[1]{\mbox{\!\!\!\@OldCite{#1}}}
+
+%% Maths
+\DeclareRobustCommand{\thesismath}[1]{\ensuremath{\maybebmsf{#1}}}
+\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}}
+\DeclareRobustCommand{\expOf}[1]{\mymath{\exp{\!\parenths{#1}}}}
+\DeclareRobustCommand{\eexp}[1]{\mymath{e^{#1}}}
+\DeclareRobustCommand{\plusquad}{\mymath{\oplus}}
+\DeclareRobustCommand{\logOf}[1]{\log\!\parenths{#1}}
+\DeclareRobustCommand{\lnOf}[1]{\ln\!\parenths{#1}}
+\DeclareRobustCommand{\ofOrder}[1]{\mymath{ \mathcal{O}\parenths{#1} }}
+
+%% General utility defns
+\DeclareRobustCommand{\arXivCode}[1]{arXiv:#1}
+\DeclareRobustCommand{\CPviolation}{\CP-violation\xspace}
+\DeclareRobustCommand{\CPv}{\CPviolation}
+\DeclareRobustCommand{\LHCb}{LHCb\xspace}
+\DeclareRobustCommand{\LHC}{LHC\xspace}
+\DeclareRobustCommand{\LEP}{LEP\xspace}
+\DeclareRobustCommand{\CERN}{CERN\xspace}
+
+%% Basic rate formalisms
+\DeclareRobustCommand{\Rate}{\thesismath{\Gamma}\xspace}
+\DeclareRobustCommand{\RateOf}[1]{\thesismath{\Gamma}\parenths{#1}\xspace}
+
+%% Phrases to be consistent about (with b/B)
+\DeclareRobustCommand{\bphysics}{\Pbottom-physics\xspace}
+\DeclareRobustCommand{\bhadron}{\Pbottom-hadron\xspace}
+\DeclareRobustCommand{\Bmeson}{\PB-meson\xspace}
+\DeclareRobustCommand{\bbaryon}{\Pbottom-baryon\xspace}
+\DeclareRobustCommand{\Bdecay}{\PB-decay\xspace}
+\DeclareRobustCommand{\bdecay}{\Pbottom-decay\xspace}
+
+%% Processes
+\DeclareRobustCommand{\BToKPi}{\HepProcess{ \PB \to \PK \, \Ppi }\xspace}
+\DeclareRobustCommand{\BToPiPi}{\HepProcess{ \PB \to \Ppi \, \Ppi }\xspace}
+\DeclareRobustCommand{\BToKK}{\HepProcess{\PB \to \PK \, \PK}\xspace}
+\DeclareRobustCommand{\BToRhoPi}{\HepProcess{ \PB \to \Prho \, \Ppi }\xspace}
+\DeclareRobustCommand{\BToRhoRho}{\HepProcess{ \PB \to \Prho \Prho }\xspace}
+\DeclareRobustCommand{\X}{\thesismath{X}\xspace}
+\DeclareRobustCommand{\Xbar}{\thesismath{\overline{X}}\xspace}
+\DeclareRobustCommand{\Xzero}{\HepGenParticle{X}{}{0}\xspace}
+\DeclareRobustCommand{\Xzerobar}{\HepGenAntiParticle{X}{}{0}\xspace}
+\DeclareRobustCommand{\epluseminus}{\Pelectron\Ppositron\xspace}
+
+% Fix hyperref labels in PDFTeX
+\@ifpackageloaded{hyperref}{%
+  \pdfstringdefDisableCommands{%
+      \def\pi{pi}%
+      \def\gamma{gamma}%
+  }%
+}{} 
diff --git a/Master/texmf-dist/doc/latex/hepthesis/example/mythesismath.sty b/Master/texmf-dist/doc/latex/hepthesis/example/mythesismath.sty
new file mode 100644
index 00000000000..95ac64fadef
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/hepthesis/example/mythesismath.sty
@@ -0,0 +1,69 @@
+\ProvidesPackage{thesismath}[2005/11/01]
+
+\DeclareRobustCommand{\thesismath}[1]{\ensuremath{\maybebmsf{#1}}}
+\DeclareRobustCommand{\parenths}[1]{\thesismath{\left({#1}\right)}}
+\DeclareRobustCommand{\braces}[1]{\thesismath{\left\{{#1}\right\}}}
+\DeclareRobustCommand{\angles}[1]{\thesismath{\left\langle{#1}\right\rangle}}
+\DeclareRobustCommand{\sqbracs}[1]{\thesismath{\left[{#1}\right]}}
+\DeclareRobustCommand{\mods}[1]{\thesismath{\left\lvert{#1}\right\rvert}}
+\DeclareRobustCommand{\modsq}[1]{\thesismath{\mods{#1}^2}}
+\DeclareRobustCommand{\dblmods}[1]{\thesismath{\left\lVert{#1}\right\rVert}}
+\DeclareRobustCommand{\expOf}[1]{\thesismath{\exp{\!\parenths{#1}}}}
+\DeclareRobustCommand{\eexp}[1]{\thesismath{e^{#1}}}
+\DeclareRobustCommand{\plusquad}{\thesismath{\oplus}}
+\DeclareRobustCommand{\logOf}[1]{\log\!\parenths{#1}}
+\DeclareRobustCommand{\lnOf}[1]{\ln\!\parenths{#1}}
+\DeclareRobustCommand{\ofOrder}[1]{\thesismath{ \mathcal{O}\parenths{#1} }}
+\DeclareRobustCommand{\about}{\thesismath{\sim\!\,}}
+
+%% Vectors, tuples and sets
+\DeclareRobustCommand{\cross}{\thesismath{\times}\xspace}
+\DeclareRobustCommand{\bvec}[1]{\thesismath{\bm{#1}}\xspace}
+\DeclareRobustCommand{\colset}[1]{\thesismath{\begin{Bmatrix}#1\end{Bmatrix}}\xspace}
+\DeclareRobustCommand{\coltuple}[1]{\thesismath{\begin{pmatrix}#1\end{pmatrix}}\xspace}
+\DeclareRobustCommand{\colvector}[1]{\thesismath{\begin{pmatrix}#1\end{pmatrix}}\xspace}
+\DeclareRobustCommand{\colthreevec}[3]{\thesismath{\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]{\thesismath{\bm{\mathrm{#1}}}\xspace}
+\DeclareRobustCommand{\transposeT}{\MathUpright{T}\,}
+\DeclareRobustCommand{\hermitianT}{\dagger}
+\DeclareRobustCommand{\twomatrix}[2]{\thesismath{\begin{pmatrix}#1\\ #2\end{pmatrix}}\xspace}
+\DeclareRobustCommand{\threematrix}[3]{\thesismath{\begin{pmatrix}#1\\ #2\\ #3\end{pmatrix}}\xspace}
+
+%% Differentials
+\DeclareRobustCommand{\diff}[1]{\thesismath{\mathrm{d} #1}}
+\DeclareRobustCommand{\pdiff}[1]{\thesismath{\partial #1}}
+\DeclareRobustCommand{\dByd}[2]{\thesismath{ \frac{\diff{#1}}{\diff{#2}} }}
+\DeclareRobustCommand{\pdByd}[2]{\thesismath{ \frac{\pdiff{#1}}{\pdiff{#2}} }}
+\DeclareRobustCommand{\DeltaVec}[1]{\thesismath{\boldsymbol{\Delta}\mathbf{#1}}}
+\DeclareRobustCommand{\DeltaN}[1]{\thesismath{\Delta #1}}
+\DeclareRobustCommand{\deltaVec}[1]{\thesismath{\boldsymbol{\delta}\mathbf{#1}}}
+\DeclareRobustCommand{\deltaN}[1]{\thesismath{\delta #1}}
+\DeclareRobustCommand{\d}[1]{\thesismath{\mathrm{d}#1}}
+
+%% Complex numbers
+\DeclareRobustCommand{\I}{\thesismath{\imath}}
+\let\@oldRe\Re
+\let\@oldIm\Im
+\DeclareRobustCommand{\Im}{\thesismath{ \@oldIm{}\mathfrak{m} }\xspace}
+\DeclareRobustCommand{\Re}{\thesismath{ \@oldRe{}\mathfrak{e}\mspace{3mu} }\xspace}
+\DeclareRobustCommand{\ImaginaryPart}[1]{\thesismath{ \,\Im\!\,\braces{#1} }\xspace}
+\DeclareRobustCommand{\RealPart}[1]{\thesismath{ \,\Re\!\braces{#1} }\xspace}
+
+%% Groups
+\DeclareRobustCommand{\group}[1]{\thesismath{\mayberm{#1}}}
+\DeclareRobustCommand{\Ugroup}[1]{\group{U}\parenths{#1}}
+\DeclareRobustCommand{\SUgroup}[1]{\group{S}\Ugroup{#1}}
diff --git a/Master/texmf-dist/doc/latex/hepthesis/hepthesis.pdf b/Master/texmf-dist/doc/latex/hepthesis/hepthesis.pdf
index 00fb16b753b..c48bc2ec4f1 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 7d18f68de14..fdca18876db 100644
--- a/Master/texmf-dist/doc/latex/hepthesis/hepthesis.tex
+++ b/Master/texmf-dist/doc/latex/hepthesis/hepthesis.tex
@@ -19,8 +19,8 @@
 
 \newcommand{\Or}{\texorpdfstring{\ensuremath{\vert}\xspace}{or}}
 \newcommand{\manifestsAs}{\texorpdfstring{\ensuremath{\Rightarrow\quad}\xspace}{->}}
-\newcommand{\texcmd}[1]{\texorpdfstring{\texttt{\char`\\#1}}{#1}} 
-\newcommand{\texenv}[1]{\texorpdfstring{\texttt{#1}}{#1}} 
+\newcommand{\texcmd}[1]{\texorpdfstring{\texttt{\char`\\#1}}{#1}}
+\newcommand{\texenv}[1]{\texorpdfstring{\texttt{#1}}{#1}}
 \newcommand{\texopt}[1]{\texorpdfstring{\texttt{#1}}{#1}}
 \newcommand{\texarg}[1]{\texorpdfstring{\texttt{\{#1\}}}{\textbraceleft#1\textbraceright}}
 \newcommand{\texargoptgen}[1]{\texorpdfstring{\texttt{[}\gen{#1}\texttt{]}}{\textbraceleft<#1>\textbraceright}}
@@ -93,7 +93,7 @@ The basic usage mode for \hepthesis is to place
 %
 in the preamble of your document. This will then set up the document's appearance and
 provide the \hepthesis macros as do the standard \LaTeX{} classes like |article|
-and |report|. A more sophisticated and flexible approach is described in 
+and |report|. A more sophisticated and flexible approach is described in
 Appendix~\ref{app:DerivedClass}.
 
 Although strictly unrelated to \hepthesis, it is usual to write each thesis
@@ -121,25 +121,25 @@ be natively available in your \TeX{} distribution; the rest from CTAN.
 
 Here's the mandatory packages:
 \begin{itemize}
-\item \textbf{scrbook~\cite{scrbook}} (from KOMA-scripts)
-\item \textbf{setspace~\cite{setspace}}
-\item \textbf{fancyhdr~\cite{fancyhdr}}
-\item \textbf{rotating~\cite{rotating}}
-\item \textbf{tocbibind~\cite{tocbibind}}
-\item \textbf{caption~\cite{caption}}
-\item \textbf{chngpage~\cite{chngpage}}
-\item \textbf{varwidth~\cite{varwidth}}
+\item \textbf{scrbook\,\cite{scrbook}} (from KOMA-scripts)
+\item \textbf{setspace\,\cite{setspace}}
+\item \textbf{fancyhdr\,\cite{fancyhdr}}
+\item \textbf{rotating\,\cite{rotating}}
+\item \textbf{tocbibind\,\cite{tocbibind}}
+\item \textbf{caption\,\cite{caption}}
+\item \textbf{changepage\,\cite{changepage}}
+\item \textbf{varwidth\,\cite{varwidth}}
 \end{itemize}
 
 \vspace{0.4cm}
 \noindent\fbox{\begin{minipage}{0.85\textwidth}\textsl{
 %
-Note that the \texpkg{subfig}\cite{subfig} (previously \texpkg{subfigure}) 
-and \texpkg{ccaption}\cite{ccaption} package, which were required up to 
-version 1.3, are no longer needed. 
-If you need sub-figures then you should \texcmd{usepackage} the package as 
-usual in your document preamble or custom class file, and make use of the 
-\texcmd{ContinuedFloat} command for continuation captions, which is 
+Note that the \texpkg{subfig}\,\cite{subfig} (previously \texpkg{subfigure})
+and \texpkg{ccaption}\,\cite{ccaption} packages, which were required up to
+version 1.3, are no longer needed.
+If you need sub-figures then you should \texcmd{usepackage} the package as
+usual in your document preamble or custom class file, and make use of the
+\texcmd{ContinuedFloat} command for continuation captions, which is
 provided by the mandatory \texpkg{caption} package.
 %
 }\end{minipage}}
@@ -149,16 +149,16 @@ Additionally, there are several packages which are only required depending on
 the class options:
 
 \begin{itemize}
-%\item \textbf{cite~\cite{cite}}
-\item \textbf{csquotes~\cite{csquotes}:} very standard. Quotation commands will use this if loaded.
-\item \textbf{babel~\cite{babel}:} very standard. Quotation commands will use this if loaded.
-\item \textbf{a4wide~\cite{a4wide}:} very standard. Disabled with any paper size option other than |a4paper|
-\item \textbf{amsmath~\cite{amsmath}:} very, \emph{very} standard. Disabled with the |noams| option
-\item \textbf{hyperref~\cite{hyperref}:} very standard. Enabled with the |hyper| option
-\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{cite\,\cite{cite}}
+\item \textbf{csquotes\,\cite{csquotes}:} very standard. Quotation commands will use this if loaded.
+\item \textbf{babel\,\cite{babel}:} very standard. Quotation commands will use this if loaded.
+\item \textbf{a4wide\,\cite{a4wide}:} very standard. Disabled with any paper size option other than |a4paper|
+\item \textbf{amsmath\,\cite{amsmath}:} very, \emph{very} standard. Disabled with the |noams| option
+\item \textbf{hyperref\,\cite{hyperref}:} very standard. Enabled with the |hyper| option
+\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
 \end{itemize}
 
 Some other handy packages (which aren't required at all for compatibility with
@@ -167,15 +167,15 @@ Section~\ref{sec:ExtraPackages}.
 
 \subsection{Troublesome interactions}
 Unfortunately not all \LaTeX{} packages get on well with each other --- if
-you are unlucky then you may get some of \TeX's wondertully cryptic error 
+you are unlucky then you may get some of \TeX's wondertully cryptic error
 messages on trying to use \texpkg{hepthesis}. Here are the problems that I'm
 aware of\dots
 
 \begin{itemize}
-\item 
-If you have problems with \LaTeX{} complaining about bad definitions of 
-\texcmd{pdfstringdefPreHook}, you may be using an old version of \texpkg{csquotes}, 
-which doesn't interface well to \texpkg{hyperref}. I think this is fixed in 
+\item
+If you have problems with \LaTeX{} complaining about bad definitions of
+\texcmd{pdfstringdefPreHook}, you may be using an old version of \texpkg{csquotes},
+which doesn't interface well to \texpkg{hyperref}. I think this is fixed in
 \texpkg{csquotes} version 3.2 and later --- it certainly works for version
 3.7. Try including the \texpkg{csquotes} package with
 %
@@ -376,7 +376,7 @@ Each command takes a single argument, which is just a \TeX{} length. Here's an e
 
 %% TODO Change in v1.5
 \subsection{\texcmd{title}\texarggen{title} and \texcmd{author}\texarggen{author}}
-The usual commands for setting the author and title. Don't use \texcmd{thanks} in 
+The usual commands for setting the author and title. Don't use \texcmd{thanks} in
 the \hepthesis author argument: the results are undefined!
 %
 \begin{fsnippet}
@@ -418,7 +418,7 @@ commands will probably be useful. Here's an example of usage:
 %
 \begin{fsnippet}
 \titlepage[of \\ Churchill College]%
-{A dissertation submitted to the University of Cambridge\\ 
+{A dissertation submitted to the University of Cambridge\\
 for the degree of Doctor of Philosophy}
 \end{fsnippet}
 %
@@ -463,7 +463,7 @@ obligatory thanks to a supervisor). Use it (in the front matter again) like:
 %
 \begin{fsnippet}
 \begin{acknowledgements}
-  Of the many people who deserve thanks, some are 
+  Of the many people who deserve thanks, some are
   particularly prominent, for example...
 \end{acknowledgements}
 \end{fsnippet}
@@ -503,13 +503,13 @@ your thesis in a few choice words, for example:
 \end{fsnippet}
 %
 \texcmd{frontquote} also takes an optional argument indicating which language the
-quote is in. This will change the quotation mark and hyphenation styles, if the 
+quote is in. This will change the quotation mark and hyphenation styles, if the
 \texpkg{babel} and \texpkg{csquotes} packages are loaded:
 %
 \begin{fsnippet}
   \frontquote[french]%
   {Le savant n'\'etudie pas la nature parce que cela est utile; \\
-  il l'\'etudie parce qu'il y prend plaisir et il y prend plaisir 
+  il l'\'etudie parce qu'il y prend plaisir et il y prend plaisir
   parce qu'elle est belle.}%
   {Henri Poincar\'e, 1854--1912}
   ...
@@ -533,7 +533,7 @@ As for \texcmd{frontquote}, an optional language argument can be used.
 A colophon is an inscription placed at the end of a book or other work that
 talks about how the work was created and what things were used in its creation.
 This should go in the back matter of your thesis and is completely optional.
-If you use this, please mention \hepthesis' r\^ole in making your thesis! Here's 
+If you use this, please mention \hepthesis' r\^ole in making your thesis! Here's
 an example:
 %
 \begin{fsnippet}
@@ -599,7 +599,7 @@ the text width and chosen to avoid overflows. Use them like this:
   \label{fig:CKMFitter}
 \end{figure}
 \end{fsnippet}
-  
+
 Note also that this way of including images will automatically look for an
 |.eps| file when building PostScript and a |.pdf| file when building PDF. You
 may find the |eps2pdf| and |pdf2eps| utilities useful.
@@ -647,7 +647,7 @@ which is the version described above, prefixed with ``thesis''\footnote{This
   is a hang-over from early versions of my thesis, when I didn't know how to
   robustly extend and re-define environments and commands.}. These forms are
 frankly a bit of a pain to use, so use the short versions, please. The
-``thesis---'' versions should be considered deprecated and \textbf{will be removed 
+``thesis---'' versions should be considered deprecated and \textbf{will be removed
 in the next release, version 1.5}.
 
 
@@ -655,19 +655,19 @@ in the next release, version 1.5}.
 \label{sec:ExtraPackages}
 Here are some other packages it might be good to know about:
 \begin{itemize}
-\item \textbf{SIunits~\cite{SIunits}:} \emph{the} way to do units and get it right.
-\item \textbf{hepunits~\cite{hepunits}:} my extension of |SIunits| to include some common HEP units not used elsewhere.
-\item \textbf{hepnames~\cite{hepnames} and hepparticles~\cite{hepparticles}:} my packages for typesetting HEP particle names \emph{properly}, with |hepnames| defining macros for a lot of the standard ones. Requires |maybemath|~\cite{maybemath}
-\item \textbf{braket~\cite{braket}:} decent implementation of Dirac bra and ket notation
-\item \textbf{cancel~\cite{cancel}:} the best way to do Feynman slashes (in my opinion)
-\item \textbf{feynmf/feynmp~\cite{feynmf} and axodraw~\cite{axodraw}:} various approaches to doing Feynman diagrams, especially in equations, inline contexts and so-on.
+\item \textbf{SIunits\,\cite{SIunits}:} \emph{the} way to do units and get it right.
+\item \textbf{hepunits\,\cite{hepunits}:} my extension of |SIunits| to include some common HEP units not used elsewhere.
+\item \textbf{hepnames\,\cite{hepnames} and hepparticles\,\cite{hepparticles}:} my packages for typesetting HEP particle names \emph{properly}, with |hepnames| defining macros for a lot of the standard ones. Requires |maybemath|\,\cite{maybemath}
+\item \textbf{braket\,\cite{braket}:} decent implementation of Dirac bra and ket notation
+\item \textbf{cancel\,\cite{cancel}:} the best way to do Feynman slashes (in my opinion)
+\item \textbf{feynmf/feynmp\,\cite{feynmf} and axodraw\,\cite{axodraw}:} various approaches to doing Feynman diagrams, especially in equations, inline contexts and so-on.
 \end{itemize}
 %
 and some related software:
 %
 \begin{itemize}
-\item \textbf{FeynDiagram~\cite{feyndiagram} and Jaxodraw~\cite{jaxodraw}}: for Feynman diagrams outside \TeX. You might also
-  be interested in my |pyfeyn|~\cite{pyfeyn} program.
+\item \textbf{FeynDiagram\,\cite{feyndiagram} and Jaxodraw\,\cite{jaxodraw}}: for Feynman diagrams outside \TeX. You might also
+  be interested in my |pyfeyn|\,\cite{pyfeyn} program.
 \item \textbf{SLAC SPIRES' biblio tools service:} see \url{www.slac.stanford.edu/spires/}
 \end{itemize}
 
@@ -689,7 +689,7 @@ writing an HEP thesis then I'd encourage you to use the |hepnames| \LaTeX{}
 package for typesetting particle names --- it depends on the extra
 |hepparticles| and |maybemath| packages, which you'll also have to download. The
 examples used here also rely on the |hepunits| package: you can all these extra
-packages from the CTAN~\cite{CTAN}. See Appendix~\ref{app:InstallingPackages} for
+packages from the CTAN\,\cite{CTAN}. See Appendix~\ref{app:InstallingPackages} for
 a quick guide on how to install personal copies of \LaTeX{} packages.
 
 
@@ -718,7 +718,7 @@ a quick guide on how to install personal copies of \LaTeX{} packages.
 \section{Wishlist / TODO}
 I'm not planning on writing another thesis, but maybe I'll add features if
 there's demand. If you add a nice feature, pass it on to me and I'll think about
-including it in the package (and will give you some credit, of course). But anyway, 
+including it in the package (and will give you some credit, of course). But anyway,
 here's the TODO:
 %
 \begin{itemize}
@@ -745,7 +745,7 @@ constructive criticism! Email your thoughts to
 
 \section{Acknowledgements}
 I'd like to thank all the people who have provided bug reports, patches, suggestions
-and who have otherwise helped me to get \hepthesis to the state it's in. See the 
+and who have otherwise helped me to get \hepthesis to the state it's in. See the
 |ChangeLog| file in the distribution for names!
 
 
@@ -753,7 +753,7 @@ and who have otherwise helped me to get \hepthesis to the state it's in. See the
 
 \section{Using your own derived document class}
 \label{app:DerivedClass}
-If you're feeling sophisticated, then you can make your own document class based on 
+If you're feeling sophisticated, then you can make your own document class based on
 \hepthesis by placing
 %
 \begin{snippet}
@@ -780,7 +780,7 @@ $ mkdir -p $HOME/local/texmf/tex/latex
 $ mkdir -p $HOME/local/texmf/bibtex/bib
 $ mkdir -p $HOME/local/texmf/bibtex/bst
 \end{snippet}
-\item Download the packages from CTAN~\cite{CTAN} or wherever.
+\item Download the packages from CTAN\,\cite{CTAN} or wherever.
 \item Follow the packages' installation instructions to install them into the \\
   |$HOME/local/texmf/tex/latex| %$
   directory you made above (or an appropriately-named sub-directory of it if you
@@ -860,7 +860,7 @@ Otherwise you can just delete the |.aux| file when you change between using
 \bibitem{subfig}{subfig: \url{ctan:/obsolete/macros/latex/contrib/subfig/}}
 \bibitem{caption}{caption: \url{ctan:/macros/latex/contrib/caption/}}
 \bibitem{ccaption}{ccaption: \url{ctan:/macros/latex/contrib/ccaption/}}
-\bibitem{chngpage}{chngpage: \url{ctan:/macros/latex/contrib/chngpage/}}
+\bibitem{changepage}{changepage: \url{ctan:/macros/latex/contrib/changepage/}}
 \bibitem{varwidth}{varwidth: \url{ctan:/macros/latex/contrib/varwidth/}}
 \bibitem{csquotes}{csquotes: \url{ctan:/macros/latex/contrib/csquotes/}}
 \bibitem{babel}{babel: \url{ctan:/macros/latex/contrib/babel/}}
diff --git a/Master/texmf-dist/tex/latex/hepthesis/hepthesis.cls b/Master/texmf-dist/tex/latex/hepthesis/hepthesis.cls
index b7c7deec09c..a25773da227 100644
--- a/Master/texmf-dist/tex/latex/hepthesis/hepthesis.cls
+++ b/Master/texmf-dist/tex/latex/hepthesis/hepthesis.cls
@@ -15,8 +15,8 @@
 %% ========================================================================
 %% Admin
 %% ========================================================================
-\def\fileversion{1.4.2}
-\def\filedate{2008/05/23}
+\def\fileversion{1.4.3}
+\def\filedate{2010/05/27}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesClass{hepthesis}[\filedate\space HEP thesis class by Andy Buckley (v\fileversion)]
 
@@ -41,8 +41,6 @@
 \def\@bindmargins{yes}
 \def\@hidefrontmatter{}
 \def\@hidebackmatter{}
-%% TODO: how to handle this?
-%\usepackage[babel]{csquotes}[2007/03/25]
 
 %% Part-wise spacing commands and definitions
 \def\@frontmatterspacing{onehalfspacing}
@@ -73,7 +71,7 @@
 \DeclareOption{bindnopdf}{
   \ifx\pdfoutput\undefined%
   \def\@bindmargins{yes}%
-  \else%  
+  \else%
   \def\@bindmargins{}%
   \fi%
 }
@@ -116,12 +114,12 @@
 
 % Use hyperref package (with decent options) only if output is PDF
 \DeclareOption{hyperpdf}{
-  \ifx\pdfoutput\undefined\else%  
+  \ifx\pdfoutput\undefined\else%
   \def\@requirehyper{yes}%
   \fi%
 }
 
-%% Don't break enumerations (etc.) across pages in 
+%% Don't break enumerations (etc.) across pages in
 %% an ugly manner
 \clubpenalty = 10000
 \widowpenalty = 10000
@@ -204,8 +202,11 @@
 %% Use wide format if using A4 paper
 \ifx\@requireAFourWide\@empty\else\RequirePackage{a4wide}\fi
 
+%% If building with PDFLaTeX, use microtype spacing adjustments
+\RequirePackage{microtype}
+
 %% Need to be able to locally change the text width.
-\RequirePackage{chngpage}
+\RequirePackage{changepage}
 
 %% Used to center the variable width page quote (must be version >= 0.9a)
 \RequirePackage{varwidth}[2003/03/10]
@@ -244,8 +245,8 @@
   \addtokomafont{sectioning}{\rmfamily\bfseries}
 \fi
 
-%% In standard tabular: aligns \hline properly with vertical 
-%% lines (check with zoom). But you shouldn't using vertical 
+%% In standard tabular: aligns \hline properly with vertical
+%% lines (check with zoom). But you shouldn't using vertical
 %% lines, should you? See booktabs documentation ;-)
 %\RequirePackage{array}
 
@@ -439,7 +440,7 @@
 
 
 %% Provide mixed-case versions of the Table of contents,
-%% List of tables, List of figures, Bibliography etc. header names 
+%% List of tables, List of figures, Bibliography etc. header names
 \DeclareRobustCommand{\contentsname}{Contents}
 \DeclareRobustCommand{\bibname}{Bibliography}
 \DeclareRobustCommand{\listfigurename}{List of figures}
@@ -455,8 +456,9 @@
 %% Internal environments and commands
 %% ========================================================================
 
-%% Provide dumb quoting commands in case the csquotes package hasn't been used.
 \AtEndOfClass{%
+  \usepackage[babel]{csquotes}[2007/03/25]
+  %% Provide dumb quoting commands in case the csquotes package hasn't been used.
   \providecommand{\enquote}[1]{``#1''}%
   \providecommand{\foreignquote}[1]{``#1''}%
 }
@@ -504,7 +506,7 @@
   \setcounter{secnumdepth}{2}% number down to subsections
   \newcounter{iterlist}%
   \@oldfrontmatter%
-  \adjustwidth[]{\@frontmatterextramargin}{\@frontmatterextramargin}%
+  \adjustwidth{\@frontmatterextramargin}{\@frontmatterextramargin}%
   \begin{\@frontmatterspacing}%
 }{%
   \end{\@frontmatterspacing}%
@@ -519,7 +521,7 @@
   %\@oldmainmatter%
   \@mainmattertrue
   \pagenumbering{arabic}%
-  \adjustwidth[]{\@mainmatterextramargin}{\@mainmatterextramargin}%
+  \adjustwidth{\@mainmatterextramargin}{\@mainmatterextramargin}%
   \begin{\@mainmatterspacing}%
 }{%
   \end{\@mainmatterspacing}%
@@ -530,7 +532,7 @@
 
 %% Environment for appendices
 \specialcomment{appendices}{%
-  \adjustwidth[]{\@appendixextramargin}{\@appendixextramargin}%
+  \adjustwidth{\@appendixextramargin}{\@appendixextramargin}%
   \begin{\@appendixspacing}%
   \appendix%
 }{%
@@ -544,7 +546,7 @@
 \let\@oldbackmatter\backmatter
 \specialcomment{backmatter}{%
   \@oldbackmatter%
-  \adjustwidth[]{\@backmatterextramargin}{\@backmatterextramargin}%
+  \adjustwidth{\@backmatterextramargin}{\@backmatterextramargin}%
   \begin{\@backmatterspacing}%
   \appendix%
 }{%
@@ -557,7 +559,7 @@
 %% Environment for acknowledgements page in frontmatter
 \newenvironment{acknowledgements}{%
   \cleardoublepage%
-  \adjustwidth[]{\@acknowledgementsextramargin}{\@acknowledgementsextramargin}%
+  \adjustwidth{\@acknowledgementsextramargin}{\@acknowledgementsextramargin}%
   \vspace*{\@frontmattertopskip}%
   \begin{center}%
     \begingroup
@@ -575,7 +577,7 @@
 %% Environment for preface page in frontmatter
 \newenvironment{preface}{%
   \cleardoublepage%
-  \adjustwidth[]{\@prefaceextramargin}{\@prefaceextramargin}%
+  \adjustwidth{\@prefaceextramargin}{\@prefaceextramargin}%
   \vspace*{\@frontmattertopskip}%
   \begin{center}%
     \begingroup
@@ -592,11 +594,11 @@
 
 %% Environment for declaration rubrik page in frontmatter
 %% (flushright doesn't work in this macro for some reason,
-%% so you'll have to do that bit yourself like in the 
+%% so you'll have to do that bit yourself like in the
 %% example file)
 \newenvironment{declaration}{%
   \cleardoublepage%
-  \adjustwidth[]{\@declarationextramargin}{\@declarationextramargin}%
+  \adjustwidth{\@declarationextramargin}{\@declarationextramargin}%
   \vspace*{\@frontmattertopskip}%
   \begin{center}%
     \begingroup
@@ -619,7 +621,7 @@
 %% Environment for thesis abstract in frontmatter
 %% (argument is the thesis title)
 \newenvironment{abstract}[1][Abstract]{%
-  \adjustwidth[]{\@abstractextramargin}{\@abstractextramargin}%
+  \adjustwidth{\@abstractextramargin}{\@abstractextramargin}%
   \cleardoublepage%
   \vspace*{\@frontmattertopskip}%
   \begin{center}%
@@ -682,9 +684,9 @@
     \def\@samelang{same}%
     \def\@reqlang{#1}%
     \ifx\@samelang\@reqlang%
-      \noindent\textsl{\enquote{#2}}%
+      \noindent\textsl{\enquote{\hspace{0.1ex}#2}}%
     \else%
-      \noindent\textsl{\foreignquote{\@reqlang}{#2}}%
+      \noindent\textsl{\foreignquote{\@reqlang}{\hspace{0.1ex}#2}}%
     \fi%
     \newline%
     \setlength{\parindent}{\@oldparindent}
@@ -729,7 +731,7 @@
 \DeclareRobustCommand{\chapterquote}[3][same]{%
   \def\@samelang{same}%
   \def\@reqlang{#1}%
-  \begin{adjustwidth}[]{}{3cm}%
+  \begin{adjustwidth}{}{3cm}%
   \ifx\@samelang\@reqlang%
     \noindent\emph{\enquote{#2}}%
   \else%