From d2938aa6c432888fefa593905d2cc305b6a9ee10 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 2 Dec 2014 22:29:00 +0000 Subject: hepthesis (2dec14) git-svn-id: svn://tug.org/texlive/trunk@35720 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/hepthesis/ChangeLog | 27 ++++++ Master/texmf-dist/doc/latex/hepthesis/Makefile | 24 +++--- .../doc/latex/hepthesis/example/Makefile | 4 +- .../doc/latex/hepthesis/example/appendices.tex | 8 +- .../doc/latex/hepthesis/example/chap1.tex | 21 +++-- .../doc/latex/hepthesis/example/chap2.tex | 30 +++---- .../doc/latex/hepthesis/example/chap3.tex | 3 +- .../doc/latex/hepthesis/example/example.pdf | Bin 499408 -> 345111 bytes .../doc/latex/hepthesis/example/example.tex | 45 +++++++--- .../doc/latex/hepthesis/example/frontmatter.tex | 14 +-- .../texmf-dist/doc/latex/hepthesis/example/mwe.tex | 13 +++ .../doc/latex/hepthesis/example/mythesis.cls | 33 ------- .../doc/latex/hepthesis/example/mythesis.sty | 65 -------------- .../doc/latex/hepthesis/example/preamble.tex | 70 +++++++++++++++ .../texmf-dist/doc/latex/hepthesis/hepthesis.pdf | Bin 318621 -> 260350 bytes .../texmf-dist/doc/latex/hepthesis/hepthesis.tex | 18 ++-- .../texmf-dist/tex/latex/hepthesis/hepthesis.cls | 96 ++++++++++++++------- 17 files changed, 270 insertions(+), 201 deletions(-) create mode 100644 Master/texmf-dist/doc/latex/hepthesis/example/mwe.tex delete mode 100644 Master/texmf-dist/doc/latex/hepthesis/example/mythesis.cls delete mode 100644 Master/texmf-dist/doc/latex/hepthesis/example/mythesis.sty create mode 100644 Master/texmf-dist/doc/latex/hepthesis/example/preamble.tex (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex/hepthesis/ChangeLog b/Master/texmf-dist/doc/latex/hepthesis/ChangeLog index 7e13e1a077d..b337bd4bf1b 100644 --- a/Master/texmf-dist/doc/latex/hepthesis/ChangeLog +++ b/Master/texmf-dist/doc/latex/hepthesis/ChangeLog @@ -1,3 +1,30 @@ +2014-08-27 Andy Buckley + + * 1.5.0 release. + + * Changing example doc font, and removing mythesis.sty/cls files + in favour of a preamble.tex + + * Tweaking use of frontmatter, mainmatter, backmatter + etc. environments and using afterpage to ensure that page + numbering and header styling works more consistently. Apologies + that this took so long, + cf. http://tex.stackexchange.com/questions/170231/page-numbering-transition-from-frontmatter-to-mainmatter-going-wrong/ + +2012-08-02 Andy Buckley + + * Make \frontquote/\pagequote set the "empty" page style, and + minor updates in the example document, including forcing the first + page of the first main chapter to be page 1, via judicious use of + \pagenumbering{arabic}. + + * Remove dependence on siunitx in the example -- this needs to be + sorted out properly in hepunits. + +2011-01-01 Andy Buckley + + * Fix too-early page numbering: thanks to Steven te Brinke. + 2010-05-27 Andy Buckley * 1.4.3 release. diff --git a/Master/texmf-dist/doc/latex/hepthesis/Makefile b/Master/texmf-dist/doc/latex/hepthesis/Makefile index 4c84db67b0b..68039accc13 100644 --- a/Master/texmf-dist/doc/latex/hepthesis/Makefile +++ b/Master/texmf-dist/doc/latex/hepthesis/Makefile @@ -1,21 +1,21 @@ HT := hepthesis .PHONY: all clean check -all: $(HT).tar.gz +all: $(HT).zip @true -$(HT).tar.gz: README ChangeLog $(HT).pdf example/example.pdf +$(HT).zip: README ChangeLog $(HT).pdf example/example.pdf @rm -rf $(HT) @mkdir $(HT) - @cp README TODO ChangeLog Makefile $(HT).pdf $(HT).cls $(HT).tex $(HT) + @cp README TODO ChangeLog Makefile $(HT).pdf $(HT).cls $(HT).tex $(HT)/ @mkdir $(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) + @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/preamble.tex example/mythesismath.sty $(HT)/example/ + zip -r $@ $(HT) @rm -rf $(HT) -$(HT).pdf: $(HT).tex example/example.pdf +$(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 @@ -23,14 +23,14 @@ example/example.pdf: force_look clean: @rm -rf $(HT) - @rm -f $(HT).tar.gz + @rm -f $(HT).zip @rm -f $(HT).pdf $(HT).log $(HT).aux $(HT).out $(HT).dvi comment.cut cd example && $(MAKE) $(MFLAGS) clean -check: $(HT).tar.gz +check: $(HT).zip @rm -rf $(HT) - @tar xzf $(HT).tar.gz + @unzip $(HT).zip (cd $(HT) && make $(HT).pdf && make example/example.pdf) force_look: - @true \ No newline at end of file + @true diff --git a/Master/texmf-dist/doc/latex/hepthesis/example/Makefile b/Master/texmf-dist/doc/latex/hepthesis/example/Makefile index 5400f26abf8..6fd9df294f4 100644 --- a/Master/texmf-dist/doc/latex/hepthesis/example/Makefile +++ b/Master/texmf-dist/doc/latex/hepthesis/example/Makefile @@ -1,8 +1,8 @@ .PHONY: clean -EXTRASTYS = abhepexpt.sty abhep.sty abmath.sty lineno.sty SIunits.sty varwidth.sty +EXTRASTYS = abhepexpt.sty abhep.sty abmath.sty lineno.sty siunitx.sty SIunits.sty varwidth.sty -example.pdf: example.tex mythesis.cls chap1.tex chap2.tex chap3.tex frontmatter.tex appendices.tex +example.pdf: example.tex preamble.tex chap1.tex chap2.tex chap3.tex frontmatter.tex appendices.tex @rm -f $(EXTRASTYS) unzip extrastyles.zip @rm -f example.{aux,toc,lof,lot} diff --git a/Master/texmf-dist/doc/latex/hepthesis/example/appendices.tex b/Master/texmf-dist/doc/latex/hepthesis/example/appendices.tex index 973b2f5540a..7eb5a08b935 100644 --- a/Master/texmf-dist/doc/latex/hepthesis/example/appendices.tex +++ b/Master/texmf-dist/doc/latex/hepthesis/example/appendices.tex @@ -3,9 +3,9 @@ \chapter{Pointless extras} \label{app:Pointless} -\chapterquote[french]% -{Le savant n'\'etudie pas la nature parce que cela est utile; \\ -\indent il l'\'etudie parce qu'il y prend plaisir, \\ +\chapterquote{% +Le savant n'\'etudie pas la nature parce que cela est utile; \\ +\indent il l'\'etudie parce qu'il y prend plaisir, \\ \indent et il y prend plaisir parce qu'elle est belle.}% {Henri Poincar\'e, 1854--1912} @@ -19,7 +19,7 @@ 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 +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 teeny hack that makes this work. diff --git a/Master/texmf-dist/doc/latex/hepthesis/example/chap1.tex b/Master/texmf-dist/doc/latex/hepthesis/example/chap1.tex index f531623f3fa..a2b6b2d2087 100644 --- a/Master/texmf-dist/doc/latex/hepthesis/example/chap1.tex +++ b/Master/texmf-dist/doc/latex/hepthesis/example/chap1.tex @@ -1,11 +1,14 @@ \chapter{\CP violation in the \Bmeson system} \label{chap:SomeStuff} -%% Note that the citations in this chapter use the journal and -%% arXiv keys: I used the SLAC-SPIRES online BibTeX retriever +%% Restart the numbering to make sure that this is definitely page #1! +\pagenumbering{arabic} + +%% Note that the citations in this chapter use the journal and +%% arXiv keys: I used the SLAC-SPIRES online BibTeX retriever %% to build my bibliography. There are also quite a few non-standard %% macros, which come from my personal collection. You can have them -%% if you want, or I might get round to properly releasing them at +%% if you want, or I might get round to properly releasing them at %% some point myself. \chapterquote{Laws were made to be broken.}% @@ -13,16 +16,16 @@ Symmetries, either intact or broken, have proved to be at the heart of how matter interacts. The Standard Model of fundamental interactions -(SM) is composed of three independent continuous symmetry groups denoted -$\SUgroup{3} \times \SUgroup{2} \times \Ugroup{1}$, representing the -strong force, weak isospin and hypercharge +(SM) is composed of three independent continuous symmetry groups denoted +$\SUgroup{3} \times \SUgroup{2} \times \Ugroup{1}$, representing the +strong force, weak isospin and hypercharge respectively~\cite{Phys.Rev.Lett.19.1264, Phys.Rev.D2.1285,hep-ph/0410370}. \section{Neutral meson mixing} \label{sec:neutralmixing} We can go a long way with an effective Hamiltonian approach in canonical single-particle quantum mechanics. To do this we construct -a wavefunction from a combination of a generic neutral meson state +a wavefunction from a combination of a generic neutral meson state $\ket{\Xzero}$ and its anti-state $\ket{\Xzerobar}$: % \begin{equation} @@ -35,9 +38,9 @@ which is governed by a time-dependent matrix differential equation, \I \pdByd{}{t} \colvector{a \\ b} = \underbrace{% - \twomatrix{ M_{11}-\frac{\I}{2}\Gamma_{11} + \twomatrix{ M_{11}-\frac{\I}{2}\Gamma_{11} & M_{12}-\frac{\I}{2}\Gamma_{12} } - { M_{12}^\ast-\frac{\I}{2}\Gamma_{12}^\ast + { M_{12}^\ast-\frac{\I}{2}\Gamma_{12}^\ast & M_{22}-\frac{\I}{2}\Gamma_{22} } }_{\boldmatrix{H}} \colvector{a \\ b} diff --git a/Master/texmf-dist/doc/latex/hepthesis/example/chap2.tex b/Master/texmf-dist/doc/latex/hepthesis/example/chap2.tex index 257c3a8586e..c365719223e 100644 --- a/Master/texmf-dist/doc/latex/hepthesis/example/chap2.tex +++ b/Master/texmf-dist/doc/latex/hepthesis/example/chap2.tex @@ -11,13 +11,13 @@ located in the same tunnel as the Large Electron-Positron collider 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, - \BToRhoPi and \BToRhoRho decay analyses.} - \label{fig:CKMFitter} -\end{figure} +% \begin{figure} +% \includegraphics[width=\largefigwidth]{ckmfitter-alpha-combined} +% \caption[CKM Fitter constraints on \alphaCKM.]% +% {CKM Fitter constraints on \alphaCKM from combined \BToPiPi, +% \BToRhoPi and \BToRhoRho decay analyses.} +% \label{fig:CKMFitter} +% \end{figure} \section{The \LHCb experiment} \label{sec:LHCbInDetail} @@ -40,12 +40,12 @@ The detector is illustrated in \FigureRef{fig:LHCbCrossSection}, showing the overall scale of the experiment and the surrounding cavern structure. \begin{sidewaysfigure} - %\begin{center} + \begin{center} \includegraphics[width=0.8\textheight]{lhcb-detector-cross-section} - \caption[Cross-section view of \LHCb, cut in the non-bending $y-z$ plane]% - {Cross-section view of \LHCb, cut in the non-bending $y-z$ plane.} + \caption[Cross-section view of \LHCb, cut in the non-bending $y$--$z$ plane]% + {Cross-section view of \LHCb, cut in the non-bending $y$--$z$ plane.} \label{fig:LHCbCrossSection} - %\end{center} + \end{center} \end{sidewaysfigure} The single-sided detector design was chosen in preference to a two-armed @@ -72,17 +72,17 @@ track, \end{equation} \end{subequations} % -where $\beta \equiv v/c$, the relativistic velocity fraction, +where $\beta \equiv v/c$, the relativistic velocity fraction. \section{Trigger system} \label{sec:triggers} An overview of the \LHCb trigger characteristics broken down by level -is shown in \Table~\ref{tab:TriggerDetails}: +is shown in \Table~\ref{tab:TriggerDetails}. -\begin{table}[bht] +\begin{table}[bp] \begin{tabular}{lllll} & L0 & L1 & HLT \\ - \midrule + \midrule\\ Input rate & \unit{40}{\MHz} & \unit{1}{\MHz} & \unit{40}{\kHz} \\ Output rate & \unit{1}{\MHz} & \unit{40}{\kHz} & \unit{2}{\kHz} \\ Location & On detector & Counting room & Counting room \\ diff --git a/Master/texmf-dist/doc/latex/hepthesis/example/chap3.tex b/Master/texmf-dist/doc/latex/hepthesis/example/chap3.tex index 4b48c46b452..85b5a18a8bb 100644 --- a/Master/texmf-dist/doc/latex/hepthesis/example/chap3.tex +++ b/Master/texmf-dist/doc/latex/hepthesis/example/chap3.tex @@ -15,7 +15,7 @@ float, such as the pretty circles in the following figure: \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}} + \subfloat[][Example 1d]{\label{fig:cc1d}\circleimg{orange!80!yellow}} \caption{Demonstration of \texttt{subfig} continued captions.} \label{fig:cc1} \end{figure} @@ -29,6 +29,7 @@ float, such as the pretty circles in the following figure: \caption[]{Demonstration of \texttt{subfig} continued captions (continued).} \end{figure} +\noindent 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! diff --git a/Master/texmf-dist/doc/latex/hepthesis/example/example.pdf b/Master/texmf-dist/doc/latex/hepthesis/example/example.pdf index e7af2a74ed9..a9a3b7d84f3 100644 Binary files a/Master/texmf-dist/doc/latex/hepthesis/example/example.pdf and b/Master/texmf-dist/doc/latex/hepthesis/example/example.pdf differ diff --git a/Master/texmf-dist/doc/latex/hepthesis/example/example.tex b/Master/texmf-dist/doc/latex/hepthesis/example/example.tex index 56dd42143fe..6563dc27a4b 100644 --- a/Master/texmf-dist/doc/latex/hepthesis/example/example.tex +++ b/Master/texmf-dist/doc/latex/hepthesis/example/example.tex @@ -1,26 +1,44 @@ -\documentclass{mythesis} -\usepackage{mythesis} +%% For normal draft builds (figs undisplayed hence fast compile) +%\documentclass[hyperpdf,nobind,draft,oneside]{hepthesis} +%\documentclass[hyperpdf,nobind,draft,twoside]{hepthesis} + +%% For short draft builds (breaks citations by necessity) +%\documentclass[hyperpdf,nobind,draft,hidefrontback]{hepthesis} + +%%For Cambridge soft-bound version +\documentclass[hyperpdf,bindnopdf]{hepthesis} +%% For Cambridge hard-bound version (must be one-sided) +%\documentclass[hyperpdf,oneside]{hepthesis} + +%% Load special font packages here if you wish +%\usepackage{lmodern} +\usepackage{mathpazo} +%\usepackage{euler} + +%% Put package includes etc. into preamble.tex for convenience +\input{preamble} %% You can set the line spacing this way %\setallspacing{double} %% or a section at a time like this %\setfrontmatterspacing{double} -%% PDF metadata + +%% Define the thesis title and author +\title{A study of \BToKPi decays with\\ the \LHCb experiment} +\author{Andrew Gordon Buckley} + +%% Doc-specific PDF metadata \makeatletter \@ifpackageloaded{hyperref}{% \hypersetup{% -pdftitle = {Studying B to K pi decays with LHCb}, -pdfsubject = {Andy Buckley's PhD thesis}, -pdfkeywords = {LHCb, B, physics, LHC, heavy flavour}, -pdfauthor = {\textcopyright\ Andy Buckley} -} -}{} + pdftitle = {Studying B to K pi decays with LHCb}, + pdfsubject = {Andy Buckley's PhD thesis}, + pdfkeywords = {LHCb, B, physics, LHC, heavy flavour}, + pdfauthor = {\textcopyright\ Andy Buckley} +}}{} \makeatother -%% Define the thesis title and author -\title{A study of \BToKPi decays with\\ the \LHCb experiment} -\author{Andrew Gordon Buckley} %% Start the document \begin{document} @@ -36,8 +54,7 @@ pdfauthor = {\textcopyright\ Andy Buckley} \input{chap1} \input{chap2} \input{chap3} - %% To ignore a specific chapter while working on another, - %% making the build faster, comment it out like this: + %% To ignore a specific chapter while working on another, making the build faster, comment it out: %\input{chap4} \end{mainmatter} diff --git a/Master/texmf-dist/doc/latex/hepthesis/example/frontmatter.tex b/Master/texmf-dist/doc/latex/hepthesis/example/frontmatter.tex index e3990873011..30adb15bf9e 100644 --- a/Master/texmf-dist/doc/latex/hepthesis/example/frontmatter.tex +++ b/Master/texmf-dist/doc/latex/hepthesis/example/frontmatter.tex @@ -1,7 +1,6 @@ %% Title -\titlepage[of Churchill College]% -{A dissertation submitted to the University of Cambridge\\ - for the degree of Doctor of Philosophy} +\titlepage[of Churchill College]{% + A dissertation submitted to the University of Cambridge\\ for the degree of Doctor of Philosophy} %% Abstract \begin{abstract}%[\smaller \thetitle\\ \vspace*{1cm} \smaller {\theauthor}] @@ -46,8 +45,11 @@ %% ToC \tableofcontents + %% Strictly optional! -\frontquote% - {Writing in English is the most ingenious torture\\ - ever devised for sins committed in previous lives.}% +\frontquote{% + Writing in English is the most ingenious torture\\ + ever devised for sins committed in previous lives.}% {James Joyce} +%% I don't want a page number on the following blank page either. +\thispagestyle{empty} diff --git a/Master/texmf-dist/doc/latex/hepthesis/example/mwe.tex b/Master/texmf-dist/doc/latex/hepthesis/example/mwe.tex new file mode 100644 index 00000000000..253311e9987 --- /dev/null +++ b/Master/texmf-dist/doc/latex/hepthesis/example/mwe.tex @@ -0,0 +1,13 @@ +\documentclass[oneside]{hepthesis} + +\begin{document} + \begin{frontmatter} + \tableofcontents + \end{frontmatter} + + \begin{mainmatter} + \chapter{Introduction} + lalala + \end{mainmatter} + +\end{document} diff --git a/Master/texmf-dist/doc/latex/hepthesis/example/mythesis.cls b/Master/texmf-dist/doc/latex/hepthesis/example/mythesis.cls deleted file mode 100644 index adb9a87fc35..00000000000 --- a/Master/texmf-dist/doc/latex/hepthesis/example/mythesis.cls +++ /dev/null @@ -1,33 +0,0 @@ -\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 deleted file mode 100644 index c26f4c5b166..00000000000 --- a/Master/texmf-dist/doc/latex/hepthesis/example/mythesis.sty +++ /dev/null @@ -1,65 +0,0 @@ -\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/preamble.tex b/Master/texmf-dist/doc/latex/hepthesis/example/preamble.tex new file mode 100644 index 00000000000..6c73e5f5d45 --- /dev/null +++ b/Master/texmf-dist/doc/latex/hepthesis/example/preamble.tex @@ -0,0 +1,70 @@ +\usepackage{xspace} +\usepackage{tikz} +\usepackage{morefloats,subfig,afterpage} +\usepackage{mathrsfs} % script font +\usepackage{verbatim} + +%% Using Babel allows other languages to be used and mixed-in easily +%\usepackage[ngerman,english]{babel} +\usepackage[english]{babel} +\selectlanguage{english} + +%% Citation system tweaks +\usepackage{cite} +% \let\@OldCite\cite +% \renewcommand{\cite}[1]{\mbox{\!\!\!\@OldCite{#1}}} + +%% Maths +% TODO: rework or eliminate maybemath +\usepackage{abmath} +\DeclareRobustCommand{\mymath}[1]{\ensuremath{\maybebmsf{#1}}} +% \DeclareRobustCommand{\parenths}[1]{\mymath{\left({#1}\right)}\xspace} +% \DeclareRobustCommand{\braces}[1]{\mymath{\left\{{#1}\right\}}\xspace} +% \DeclareRobustCommand{\angles}[1]{\mymath{\left\langle{#1}\right\rangle}\xspace} +% \DeclareRobustCommand{\sqbracs}[1]{\mymath{\left[{#1}\right]}\xspace} +% \DeclareRobustCommand{\mods}[1]{\mymath{\left\lvert{#1}\right\rvert}\xspace} +% \DeclareRobustCommand{\modsq}[1]{\mymath{\mods{#1}^2}\xspace} +% \DeclareRobustCommand{\dblmods}[1]{\mymath{\left\lVert{#1}\right\rVert}\xspace} +% \DeclareRobustCommand{\expOf}[1]{\mymath{\exp{\!\parenths{#1}}}\xspace} +% \DeclareRobustCommand{\eexp}[1]{\mymath{e^{#1}}\xspace} +% \DeclareRobustCommand{\plusquad}{\mymath{\oplus}\xspace} +% \DeclareRobustCommand{\logOf}[1]{\mymath{\log\!\parenths{#1}}\xspace} +% \DeclareRobustCommand{\lnOf}[1]{\mymath{\ln\!\parenths{#1}}\xspace} +% \DeclareRobustCommand{\ofOrder}[1]{\mymath{\mathcal{O}\parenths{#1}}\xspace} +% \DeclareRobustCommand{\SOgroup}[1]{\mymath{\mathup{SO}\parenths{#1}}\xspace} +% \DeclareRobustCommand{\SUgroup}[1]{\mymath{\mathup{SU}\parenths{#1}}\xspace} +% \DeclareRobustCommand{\Ugroup}[1]{\mymath{\mathup{U}\parenths{#1}}\xspace} +% \DeclareRobustCommand{\I}[1]{\mymath{\mathrm{i}}\xspace} +% \DeclareRobustCommand{\colvector}[1]{\mymath{\begin{pmatrix}#1\end{pmatrix}}\xspace} +\DeclareRobustCommand{\Rate}{\mymath{\Gamma}\xspace} +\DeclareRobustCommand{\RateOf}[1]{\mymath{\Gamma}\parenths{#1}\xspace} + +%% High-energy physics stuff +\usepackage{abhep} +\usepackage{hepnames} +\usepackage{hepunits} +\DeclareRobustCommand{\arXivCode}[1]{arXiv:#1} +\DeclareRobustCommand{\CP}{\ensuremath{\mathcal{CP}}\xspace} +\DeclareRobustCommand{\CPviolation}{\CP-violation\xspace} +\DeclareRobustCommand{\CPv}{\CPviolation} +\DeclareRobustCommand{\LHCb}{LHCb\xspace} +\DeclareRobustCommand{\LHC}{LHC\xspace} +\DeclareRobustCommand{\LEP}{LEP\xspace} +\DeclareRobustCommand{\CERN}{CERN\xspace} +\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} +\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}{\Ppositron\!\Pelectron\xspace} +\DeclareRobustCommand{\protonproton}{\Pproton\APantiproton\xspace} diff --git a/Master/texmf-dist/doc/latex/hepthesis/hepthesis.pdf b/Master/texmf-dist/doc/latex/hepthesis/hepthesis.pdf index c48bc2ec4f1..29add0ffb80 100644 Binary files a/Master/texmf-dist/doc/latex/hepthesis/hepthesis.pdf and b/Master/texmf-dist/doc/latex/hepthesis/hepthesis.pdf differ diff --git a/Master/texmf-dist/doc/latex/hepthesis/hepthesis.tex b/Master/texmf-dist/doc/latex/hepthesis/hepthesis.tex index fdca18876db..7a32d7127cc 100644 --- a/Master/texmf-dist/doc/latex/hepthesis/hepthesis.tex +++ b/Master/texmf-dist/doc/latex/hepthesis/hepthesis.tex @@ -10,7 +10,7 @@ \setlength{\fboxsep}{10pt} \addtolength{\fboxrule}{0.6\fboxrule} -\newcommand{\hepthesisversion}{v1.4} +\newcommand{\hepthesisversion}{v1.5} \author{Andy Buckley, \texttt{andy@insectnation.org}} \title{\hepthesis \hepthesisversion \\ \smaller A class for typesetting academic theses} @@ -125,6 +125,7 @@ Here's the mandatory packages: \item \textbf{setspace\,\cite{setspace}} \item \textbf{fancyhdr\,\cite{fancyhdr}} \item \textbf{rotating\,\cite{rotating}} +\item \textbf{comment\,\cite{comment}} \item \textbf{tocbibind\,\cite{tocbibind}} \item \textbf{caption\,\cite{caption}} \item \textbf{changepage\,\cite{changepage}} @@ -155,7 +156,7 @@ the class options: \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{booktabs\,\cite{booktabs}:} very 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 @@ -675,7 +676,7 @@ and some related software: \section{An example \texttt{hepthesis} thesis} Here are some selected snippets from my thesis, which hopefully demonstrate the -features described. I split my thesis into |thesis.cls|, |thesis.sty| and +features described. I split my thesis into |preamble.tex| and |thesis.tex| files, with the front matter, back matter and chapters \texcmd{input}'d into |thesis.tex|. The output was built by running e.g. % @@ -685,19 +686,16 @@ pdflatex thesis.tex && bibtex thesis && pdflatex thesis.tex % (though I used a Makefile rather than do it directly). You should note that you might not be able to build this exact thesis due to missing packages: if you're -writing an HEP thesis then I'd encourage you to use the |hepnames| \LaTeX{} +writing a 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 +|hepparticles| and |maybemath| packages. 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 a quick guide on how to install personal copies of \LaTeX{} packages. -\subsection{\texttt{thesis.cls}} -{\smaller \VerbatimInput{example/mythesis.cls}} - -\subsection{\texttt{thesis.sty}} -{\smaller \VerbatimInput{example/mythesis.sty}} +\subsection{\texttt{preamble.tex}} +{\smaller \VerbatimInput{example/preamble.tex}} \subsection{\texttt{thesis.tex}} {\smaller \VerbatimInput{example/example.tex}} diff --git a/Master/texmf-dist/tex/latex/hepthesis/hepthesis.cls b/Master/texmf-dist/tex/latex/hepthesis/hepthesis.cls index a25773da227..8208cffecd4 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.3} -\def\filedate{2010/05/27} +\def\fileversion{1.5.0} +\def\filedate{2014/08/27} \NeedsTeXFormat{LaTeX2e} \ProvidesClass{hepthesis}[\filedate\space HEP thesis class by Andy Buckley (v\fileversion)] @@ -35,8 +35,8 @@ \def\@requiredraft{} \def\@useAFour{yes} \def\@requireAFourWide{} +\def\@useTwelvePt{yes} \def\@oneside{} -%% TODO: Make "yes" by default... \def\@sftitles{} \def\@bindmargins{yes} \def\@hidefrontmatter{} @@ -181,6 +181,24 @@ \fi +%% Font size (12pt is default) +\DeclareOption{10pt}{% + \def\@useTwelvePt{}% + \PassOptionsToClass{10pt}{scrbook}% +} +\DeclareOption{11pt}{% + \def\@useTwelvePt{}% + \PassOptionsToClass{11pt}{scrbook}% +} +\DeclareOption{12pt}{% + \def\@useTwelvePt{yes}% +} +%% Handle the 12pt default font size +\ifx\@useTwelvePt\@empty\else% + \PassOptionsToClass{12pt}{scrbook}% +\fi + + %% Options to be passed to the hep package \DeclareOption{hepfd}{\def\@requirehep{yes}\PassOptionsToPackage{fd}{hep}} \DeclareOption{heplayout}{\def\@requirehep{yes}\PassOptionsToPackage{layout}{hep}} @@ -202,6 +220,12 @@ %% Use wide format if using A4 paper \ifx\@requireAFourWide\@empty\else\RequirePackage{a4wide}\fi +%% Use Type 1 font encoding +\RequirePackage[T1]{fontenc} + +%% Useful tools +\RequirePackage{etoolbox} + %% If building with PDFLaTeX, use microtype spacing adjustments \RequirePackage{microtype} @@ -289,21 +313,18 @@ %% Make sure bibliography (but not ToC) appears in the ToC \RequirePackage[nottoc]{tocbibind} -%% Verbatim things -\RequirePackage{verbatim,comment} +%% Special comments for block enabling/disabling +\RequirePackage{comment} -%% Rotated figures +%% Rotated figures (used to define sidewaysfigure) \RequirePackage{rotating} %% Re-defines captions of figures and tables %% TODO: make configurable / optional? \RequirePackage[format=hang,labelfont=bf,labelsep=colon,font=small]{caption}[2004/01/23] -%% Hyperlinks (optional, has to come late in the package list) -\ifx\@requirehyper\@empty\else% -\RequirePackage[colorlinks=true,bookmarks=true,plainpages=false]{hyperref}% -%pdfpagemode=None, FullScreen, UseThumbs, UseOutlines -\fi +%% Ability to specify a hook for after a page is completed +\RequirePackage{afterpage} %% Misc tweaks \AtEndOfClass{% @@ -327,7 +348,6 @@ %% Increase inner margins for binding \newlength{\@bindextramargin} \AtEndOfClass{% - \ifx\@bindmargins\@empty% \setlength{\@bindextramargin}{0.0in} \else% @@ -438,15 +458,6 @@ \newpage% \if@twocolumn\hbox{}\newpage\fi\fi\fi}% - -%% Provide mixed-case versions of the Table of contents, -%% List of tables, List of figures, Bibliography etc. header names -\DeclareRobustCommand{\contentsname}{Contents} -\DeclareRobustCommand{\bibname}{Bibliography} -\DeclareRobustCommand{\listfigurename}{List of figures} -\DeclareRobustCommand{\listtablename}{List of tables} - - %% Commenting out front and back matter \ifx\@hidefrontmatter\@yes\AtBeginDocument{\excludecomment{frontmatter}}\fi \ifx\@hidebackmatter\@yes\AtBeginDocument{\excludecomment{backmatter}}\fi @@ -456,11 +467,31 @@ %% Internal environments and commands %% ======================================================================== -\AtEndOfClass{% - \usepackage[babel]{csquotes}[2007/03/25] +\AtEndPreamble{% + \RequirePackage[autostyle]{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''}% + + %% Provide mixed-case versions of the Table of contents, + %% List of tables, List of figures, Bibliography etc. header names + \@ifpackageloaded{babel}{\addto\captionsenglish{% + \renewcommand*{\contentsname}{Contents} + \renewcommand*{\bibname}{Bibliography} + \renewcommand*{\listfigurename}{List of figures} + \renewcommand*{\listtablename}{List of tables} + }}{% + \renewcommand*{\contentsname}{Contents} + \renewcommand*{\bibname}{Bibliography} + \renewcommand*{\listfigurename}{List of figures} + \renewcommand*{\listtablename}{List of tables} + } + + %% Hyperlinks (optional, has to come late in the package list) + \ifx\@requirehyper\@empty\else% + \RequirePackage[colorlinks=true,bookmarks=true,plainpages=false]{hyperref}% + % pdfpagemode=None, FullScreen, UseThumbs, UseOutlines + \fi } @@ -512,6 +543,7 @@ \end{\@frontmatterspacing}% \endadjustwidth% \ignorespacesafterend% + % \thispagestyle{empty} } @@ -519,8 +551,9 @@ \let\@oldmainmatter\mainmatter \specialcomment{mainmatter}{% %\@oldmainmatter% - \@mainmattertrue - \pagenumbering{arabic}% + \if@twoside\clearpage\fi% + \@mainmattertrue% + \afterpage{\pagenumbering{arabic}}% \adjustwidth{\@mainmatterextramargin}{\@mainmatterextramargin}% \begin{\@mainmatterspacing}% }{% @@ -545,7 +578,9 @@ %% Environment for all the junk at the end of the thesis \let\@oldbackmatter\backmatter \specialcomment{backmatter}{% - \@oldbackmatter% + %\thispagestyle{plain}% + %pagestyle{plain}% + %\@oldbackmatter% \adjustwidth{\@backmatterextramargin}{\@backmatterextramargin}% \begin{\@backmatterspacing}% \appendix% @@ -677,8 +712,9 @@ \DeclareRobustCommand{\pagequote}[3][same]{% \cleardoublepage% \vspace*{\stretch{2}}% - \thispagestyle{plain}% - \pagestyle{plain}% + \thispagestyle{empty}% + % \thispagestyle{plain}% + % \pagestyle{plain}% \begin{center}% \begin{varwidth}{\textwidth}% \def\@samelang{same}% @@ -694,8 +730,8 @@ \end{varwidth}% \end{center}% \vspace*{\stretch{4}}% - %\cleardoublepage% - \pagestyle{plain}% + \if@twoside\clearpage\fi% + \thispagestyle{plain}% } %% Alias \let\frontquote\pagequote -- cgit v1.2.3