8 files changed, 106 insertions, 75 deletions
diff --git a/Master/texmf-dist/doc/latex/hepthesis/ChangeLog b/Master/texmf-dist/doc/latex/hepthesis/ChangeLog
index b337bd4bf1b..5ce44c910cc 100644
--- a/Master/texmf-dist/doc/latex/hepthesis/ChangeLog
+++ b/Master/texmf-dist/doc/latex/hepthesis/ChangeLog
@@ -1,7 +1,27 @@
-2014-08-27  Andy Buckley  <andy.buckley@cern.ch>
+2017-09-20  Andy Buckley  <andy.buckley@cern.ch>
+
+	* 1.5.1 release.
+
+	* Disable deprecated \thesis... commands -- as promised for 1.5.0!
+
+	* Change hepthesis.tex class to basic article, since fancyvrb
+	still generates \tt macros and scrartcl bans them.
+
+	* Replace \sf -> \sffamily and \bf -> \bfseries for proper
+	NFSS/modern LaTeX compatibility. Thanks to William Fawcett for
+	highlighting the problem.
+
+	* Fix a typo (extra 'g') in the \setfrontmatterextramargins
+	command definition. Thanks to Clement Dallard.
+
+2014-12-02  Andy Buckley  <andy.buckley@cern.ch>
 
 	* 1.5.0 release.
 
+	* Minor tweaks to Makefile, adding a \thispagestyle{empty} tweak to the example, bump version date.
+
+2014-08-27  Andy Buckley  <andy.buckley@cern.ch>
+
 	* Changing example doc font, and removing mythesis.sty/cls files
 	in favour of a preamble.tex
 
diff --git a/Master/texmf-dist/doc/latex/hepthesis/example/backmatter.tex b/Master/texmf-dist/doc/latex/hepthesis/example/backmatter.tex
index 3926f699a24..a695bf3a080 100644
--- a/Master/texmf-dist/doc/latex/hepthesis/example/backmatter.tex
+++ b/Master/texmf-dist/doc/latex/hepthesis/example/backmatter.tex
@@ -14,6 +14,6 @@
 \listoftables
 
 %% If you have time and interest to generate a (decent) index,
-%% then you've clearly spent more time on the write-up than the 
+%% then you've clearly spent more time on the write-up than the
 %% research ;-)
 %\printindex
diff --git a/Master/texmf-dist/doc/latex/hepthesis/example/example.pdf b/Master/texmf-dist/doc/latex/hepthesis/example/example.pdf
index a9a3b7d84f3..1f1c688dc23 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 6563dc27a4b..9f9c432ed27 100644
--- a/Master/texmf-dist/doc/latex/hepthesis/example/example.tex
+++ b/Master/texmf-dist/doc/latex/hepthesis/example/example.tex
@@ -5,7 +5,7 @@
 %% For short draft builds (breaks citations by necessity)
 %\documentclass[hyperpdf,nobind,draft,hidefrontback]{hepthesis}
 
-%%For Cambridge soft-bound version
+%% For Cambridge soft-bound version
 \documentclass[hyperpdf,bindnopdf]{hepthesis}
 %% For Cambridge hard-bound version (must be one-sided)
 %\documentclass[hyperpdf,oneside]{hepthesis}
diff --git a/Master/texmf-dist/doc/latex/hepthesis/example/h-physrev.bst b/Master/texmf-dist/doc/latex/hepthesis/example/h-physrev.bst
index 0d200a0197e..7c3c09f9bdb 100644
--- a/Master/texmf-dist/doc/latex/hepthesis/example/h-physrev.bst
+++ b/Master/texmf-dist/doc/latex/hepthesis/example/h-physrev.bst
@@ -142,13 +142,13 @@ if$
 FUNCTION {emphasize}
 { duplicate$ empty$
 { pop$ "" }
-{ "{\em " swap$ * "}" * }
+{ "{\itshape " swap$ * "}" * }
 if$
 }
 FUNCTION {embolden}
 { duplicate$ empty$
 { pop$ "" }
-{ "{\bf " swap$ * "}" * }
+{ "{\bfseries " swap$ * "}" * }
 if$
 }
 FUNCTION {paren}
@@ -533,7 +533,7 @@ format.authors "author" output.check
 new.block
 crossref missing$
 { journal field.or.null
-format.vol.num.pages 
+format.vol.num.pages
 format.date empty$
 'skip$
 { duplicate$ empty$
@@ -571,7 +571,7 @@ crossref missing$
 { new.block
 format.book.crossref output.nonnull
 }
-if$    
+if$
 eprint output
 new.block
 note output
diff --git a/Master/texmf-dist/doc/latex/hepthesis/hepthesis.pdf b/Master/texmf-dist/doc/latex/hepthesis/hepthesis.pdf
index 29add0ffb80..8aabf61cce1 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 7a32d7127cc..94b113adafb 100644
--- a/Master/texmf-dist/doc/latex/hepthesis/hepthesis.tex
+++ b/Master/texmf-dist/doc/latex/hepthesis/hepthesis.tex
@@ -1,5 +1,6 @@
-\documentclass[12pt]{scrartcl}
-\usepackage{maybemath,xspace,setspace,fancyvrb,fancybox}
+\documentclass[12pt]{article}
+\usepackage{mathpazo}
+\usepackage{maybemath,xspace,setspace,fancybox,fancyvrb}
 \usepackage{a4wide,url,relsize,underscore}
 \usepackage[colorlinks=true,bookmarks=true]{hyperref}
 \newcommand{\maybemath}{\texttt{maybemath}\xspace}
@@ -10,9 +11,9 @@
 \setlength{\fboxsep}{10pt}
 \addtolength{\fboxrule}{0.6\fboxrule}
 
-\newcommand{\hepthesisversion}{v1.5}
+\newcommand{\hepthesisversion}{v1.5.1}
 \author{Andy Buckley, \texttt{andy@insectnation.org}}
-\title{\hepthesis \hepthesisversion \\ \smaller A class for typesetting academic theses}
+\title{hepthesis \hepthesisversion \\ \smaller A class for typesetting academic theses}
 
 %% Bold tt font
 \DeclareFontShape{OT1}{cmtt}{bx}{n}{<5><6><7><8><9><10><10.95><12><14.4><17.28><20.74><24.88>cmttb10}{}
@@ -28,15 +29,23 @@
 \newcommand{\gen}[1]{\ensuremath{\langle\text{\mdseries\itshape#1\/}\rangle}}
 \newcommand{\texpkg}[1]{#1}
 \newcommand{\texoption}[1]{\texopt{#1}}
+
 \newenvironment{snippet}{\Verbatim}{\endVerbatim}
 \newenvironment{fsnippet}%
   {\VerbatimEnvironment
     \begin{Sbox}\begin{minipage}{0.82\textwidth}\begin{Verbatim}}%
   {\end{Verbatim}\end{minipage}\end{Sbox}
-    \setlength{\fboxsep}{12pt}\vspace*{4mm}\newline\fbox{\TheSbox}\vspace{4mm}}
+    \setlength{\fboxsep}{12pt}\vspace*{4mm}\newline\fbox{\TheSbox}\vspace{4mm}\par\noindent}
+
+% \newenvironment{snippet}%
+% {\begin{minted}{latex}}{\end{minted}}
+% \newenvironment{fsnippet}%
+%   {\begin{Sbox}\begin{minipage}{0.82\textwidth}\begin{minted}{latex}}%
+%   {\end{minted}\end{minipage}\end{Sbox}
+%     \setlength{\fboxsep}{12pt}\vspace*{4mm}\newline\fbox{\TheSbox}\vspace{4mm}}
 
 \begin{document}
-{\sf \maketitle}
+{\larger[3] \sffamily \bfseries \maketitle}
 
 \abstract{%
   The \hepthesis class provides an attractive framework in which to write a PhD
@@ -48,21 +57,22 @@
 
 \section{Introduction}
 When I began my PhD in 2001, 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 ---
-research groups tend to have an informal system of handing down slightly
-tailored thesis templates (complete with in line \texcmd{vspace}s,
+\LaTeX{} thesis class used by students in my field (\emph{h}igh-\emph{e}nergy
+\emph{p}article physics, hence the ``hep''). In retrospect, this is not so
+surprising --- research groups often 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 on and off since roughly mid-2004, taking stylistic
-features from other theses that I've thought attractive and adding features
-based on my own pickiness and user requests. The typography isn't motivated by
-any formal understanding of the subject, though, so I'm sure there's still
-plenty of room for improvement!
-
-This document will document the structure of \hepthesis and how to make it work
+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 on and off since roughly mid-2004,
+taking stylistic features from other theses that I've thought attractive and
+adding features based on my own pickiness and user requests. The typography
+isn't motivated by any formal understanding of the subject, though, so I'm sure
+there's still plenty of room for improvement.
+
+This document documents the structure of \hepthesis and how to make it work
 with you rather than against you. I may be unable to resist including other
 hints and tips on how to make your thesis-writing go smoothly. Please contact me
 with suggested improvements, either to the package or to this documentation.
@@ -184,7 +194,7 @@ which doesn't interface well to \texpkg{hyperref}. I think this is fixed in
 \usepackage{csquotes}[2007/03/25]
 \end{snippet}
 %
-so that a new enough version will be used.
+so that sufficiently recent version will be used.
 
 \item
 Similarly, version 0.9 of the \texpkg{varwidth} package has a deformed version
@@ -533,14 +543,15 @@ As for \texcmd{frontquote}, an optional language argument can be used.
 \subsection{\texenv{colophon} environment}
 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
-an example:
+This should go in the back matter of your thesis and is completely
+optional. Frankly, I've only ever seen them in O'Reilly tech books (and my own
+thesis, of course).  If you use this, please mention \hepthesis' r\^ole in
+making your thesis! Here's an example:
 %
 \begin{fsnippet}
   \begin{backmatter}
   \begin{colophon}
-    This thesis was made with ``hepthesis'' and it was really cool...
+    This thesis was made with ``hepthesis'' and it blew my mind...
   \end{colophon}
   ...
 \end{fsnippet}
@@ -642,14 +653,14 @@ over line breaks. The equation, reference and page forms will call the
 \texcmd{eqref}, \texcmd{cite} and \texcmd{pageref} reference macros rather than
 \texcmd{ref}, which is used for all others.
 
-\subsection{``thesis---'' prefix versions}
-Additionally, all \hepthesis environments and commands have an alternative name,
-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
-in the next release, version 1.5}.
+% \subsection{``thesis---'' prefix versions}
+% Additionally, all \hepthesis environments and commands have an alternative name,
+% 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
+% in the next release, version 1.5}.
 
 
 \section{Recommended extra packages}
diff --git a/Master/texmf-dist/tex/latex/hepthesis/hepthesis.cls b/Master/texmf-dist/tex/latex/hepthesis/hepthesis.cls
index 8208cffecd4..fca6c856a38 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.5.0}
-\def\filedate{2014/08/27}
+\def\fileversion{1.5.1}
+\def\filedate{2017/09/20}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesClass{hepthesis}[\filedate\space HEP thesis class by Andy Buckley (v\fileversion)]
 
@@ -520,7 +520,7 @@
   \setappendixextramargins{#1}%
   \setbackmatterextramargins{#1}%
 }
-\DeclareRobustCommand{\setfrontmatterextramarginsg}[1]{\setlength{\@frontmatterextramargin}{#1}}
+\DeclareRobustCommand{\setfrontmatterextramargins}[1]{\setlength{\@frontmatterextramargin}{#1}}
 \DeclareRobustCommand{\setmainmatterextramargins}[1]{\setlength{\@mainmatterextramargin}{#1}}
 \DeclareRobustCommand{\setappendixextramargins}[1]{\setlength{\@appendixextramargin}{#1}}
 \DeclareRobustCommand{\setbackmatterextramargins}[1]{\setlength{\@backmatterextramargin}{#1}}
@@ -598,7 +598,7 @@
   \vspace*{\@frontmattertopskip}%
   \begin{center}%
     \begingroup
-    \ifx\@sftitles\@empty\else\sf\fi
+    \ifx\@sftitles\@empty\else\sffamily\fi
     {\LARGE{\textbf{Acknowledgements}}}%
     \endgroup
   \end{center}%
@@ -616,7 +616,7 @@
   \vspace*{\@frontmattertopskip}%
   \begin{center}%
     \begingroup
-    \ifx\@sftitles\@empty\else\sf\fi
+    \ifx\@sftitles\@empty\else\sffamily\fi
     {\LARGE{\textbf{Preface}}}%
     \endgroup
   \end{center}%
@@ -637,7 +637,7 @@
   \vspace*{\@frontmattertopskip}%
   \begin{center}%
     \begingroup
-    \ifx\@sftitles\@empty\else\sf\fi
+    \ifx\@sftitles\@empty\else\sffamily\fi
     {\LARGE\textbf{Declaration}}%
     \endgroup
   \end{center}%
@@ -661,7 +661,7 @@
   \vspace*{\@frontmattertopskip}%
   \begin{center}%
     \begingroup
-    \ifx\@sftitles\@empty\else\sf\fi
+    \ifx\@sftitles\@empty\else\sffamily\fi
     {\LARGE\textbf{#1}}%
     \endgroup
   \end{center}%
@@ -688,7 +688,7 @@
   %\@oldtitlepage%
   \thispagestyle{empty}%
   \begingroup%
-  \ifx\@sftitles\@empty\else\sf\fi%
+  \ifx\@sftitles\@empty\else\sffamily\fi%
   \begin{center}%
     \vspace*{\frontmattertitleskip}%
     \begin{doublespace}%
@@ -791,11 +791,11 @@
     \sffamily%
   \else%
   \ifx\thearg\italic%
-    \it%
+    \itshape%
   \else%
   \ifx\thearg\sansit%
     \sffamily%
-    \it%
+    \itshape%
   \fi\fi\fi%
 }{%
   \ignorespacesafterend%
@@ -855,31 +855,31 @@
 }
 
 
-%% ``Thesis''-prefixed duplicate commands and environments (deprecated)
-\newcommand{\thesistypeout}{\typeout{hepthesis: thesis- prefix commands are deprecated and will be removed from hepthesis v1.5 onwards}}
-\newenvironment{thesistable}{\thesistypeout\table}{\endtable\ignorespacesafterend}
-\newenvironment{thesistabular}{\thesistypeout\tabular}{\endtabular\ignorespacesafterend}
-\newenvironment{thesisfigure}{\thesistypeout\expandafter\let\expandafter\@oldoldfigurestar \csname figure*\endcsname \@oldoldfigurestar}%
-  {\expandafter\let\expandafter\@oldoldendfigurestar \csname endfigure*\endcsname \@oldoldendfigurestar \ignorespacesafterend}
-\newenvironment{thesissidewaysfigure}{\thesistypeout\sidewaysfigure}{\endsidewaysfigure\ignorespacesafterend}
-\newenvironment{thesisdisplaymath}{\thesistypeout\displaymath}{\enddisplaymath\ignorespacesafterend}
-\newenvironment{thesisdisplaymath*}{\thesistypeout\expandafter\let\expandafter\@oldolddisplaymathstar \csname displaymath*\endcsname \@oldolddisplaymathstar}%
-  {\expandafter\let\expandafter\@oldoldenddisplaymathstar \csname enddisplaymath*\endcsname \@oldoldenddisplaymathstar \ignorespacesafterend}
-\newenvironment{thesisequation}{\thesistypeout\equation}{\endequation\ignorespacesafterend}
-\newenvironment{thesisequation*}{\thesistypeout\expandafter\let\expandafter\@oldoldequationstar \csname equation*\endcsname \@oldoldequationstar}%
-  {\expandafter\let\expandafter\@oldoldendequationstar \csname endequation*\endcsname \@oldoldendequationstar \ignorespacesafterend}
-\newenvironment{thesisdeclaration}{\thesistypeout\declaration}{\enddeclaration\ignorespacesafterend}
-\newenvironment{thesisabstract}[1][Abstract]{\thesistypeout\abstract[#1]}{\endabstract\ignorespacesafterend}
-\newenvironment{thesischapterintro}[1]{\thesistypeout\chapterintro{#1}}{\endchapterintro\ignorespacesafterend}
-\newenvironment{thesispreface}{\thesistypeout\preface}{\endpreface\ignorespacesafterend}
-\newenvironment{thesisacknowledgements}[1]{\thesistypeout\acknowledgements}{\endacknowledgements\ignorespacesafterend}
-\newenvironment{thesisfrontmatter}{\thesistypeout\frontmatter}{\ignorespacesafterend}
-\newenvironment{thesismainmatter}{\thesistypeout\mainmatter}{\ignorespacesafterend}
-\newenvironment{thesisbackmatter}{\thesistypeout\backmatter}{\ignorespacesafterend}
-\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}}
+% %% ``Thesis''-prefixed duplicate commands and environments (deprecated)
+% \newcommand{\thesistypeout}{\typeout{hepthesis: thesis- prefix commands are deprecated and will be removed from hepthesis v1.5 onwards}}
+% \newenvironment{thesistable}{\thesistypeout\table}{\endtable\ignorespacesafterend}
+% \newenvironment{thesistabular}{\thesistypeout\tabular}{\endtabular\ignorespacesafterend}
+% \newenvironment{thesisfigure}{\thesistypeout\expandafter\let\expandafter\@oldoldfigurestar \csname figure*\endcsname \@oldoldfigurestar}%
+%   {\expandafter\let\expandafter\@oldoldendfigurestar \csname endfigure*\endcsname \@oldoldendfigurestar \ignorespacesafterend}
+% \newenvironment{thesissidewaysfigure}{\thesistypeout\sidewaysfigure}{\endsidewaysfigure\ignorespacesafterend}
+% \newenvironment{thesisdisplaymath}{\thesistypeout\displaymath}{\enddisplaymath\ignorespacesafterend}
+% \newenvironment{thesisdisplaymath*}{\thesistypeout\expandafter\let\expandafter\@oldolddisplaymathstar \csname displaymath*\endcsname \@oldolddisplaymathstar}%
+%   {\expandafter\let\expandafter\@oldoldenddisplaymathstar \csname enddisplaymath*\endcsname \@oldoldenddisplaymathstar \ignorespacesafterend}
+% \newenvironment{thesisequation}{\thesistypeout\equation}{\endequation\ignorespacesafterend}
+% \newenvironment{thesisequation*}{\thesistypeout\expandafter\let\expandafter\@oldoldequationstar \csname equation*\endcsname \@oldoldequationstar}%
+%   {\expandafter\let\expandafter\@oldoldendequationstar \csname endequation*\endcsname \@oldoldendequationstar \ignorespacesafterend}
+% \newenvironment{thesisdeclaration}{\thesistypeout\declaration}{\enddeclaration\ignorespacesafterend}
+% \newenvironment{thesisabstract}[1][Abstract]{\thesistypeout\abstract[#1]}{\endabstract\ignorespacesafterend}
+% \newenvironment{thesischapterintro}[1]{\thesistypeout\chapterintro{#1}}{\endchapterintro\ignorespacesafterend}
+% \newenvironment{thesispreface}{\thesistypeout\preface}{\endpreface\ignorespacesafterend}
+% \newenvironment{thesisacknowledgements}[1]{\thesistypeout\acknowledgements}{\endacknowledgements\ignorespacesafterend}
+% \newenvironment{thesisfrontmatter}{\thesistypeout\frontmatter}{\ignorespacesafterend}
+% \newenvironment{thesismainmatter}{\thesistypeout\mainmatter}{\ignorespacesafterend}
+% \newenvironment{thesisbackmatter}{\thesistypeout\backmatter}{\ignorespacesafterend}
+% \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}}
 
 %% In-document references
 \DeclareRobustCommand{\Chapter}{Chapter\xspace}