From e00500c3dc1eafa4e60576e957c76208749966c8 Mon Sep 17 00:00:00 2001 From: Alphrag <34252790+Alphrag@users.noreply.github.com> Date: Fri, 8 Jul 2022 23:39:13 +0100 Subject: [PATCH] Fix urls and trailing spaces --- York-Thesis/C-Begin/beg.tex | 4 ++-- York-Thesis/C-End/end.tex | 2 +- York-Thesis/main.pdf | Bin 499890 -> 499787 bytes York-Thesis/main.tex | 28 ++++++++++++------------ York-Thesis/mypreamble.tex | 22 +++++++++---------- York-Thesis/thesisoptions.sty | 40 +++++++++++++++++----------------- York-Thesis/yorkthesis.cls | 8 +++---- 7 files changed, 52 insertions(+), 52 deletions(-) diff --git a/York-Thesis/C-Begin/beg.tex b/York-Thesis/C-Begin/beg.tex index 6f9cd4c..f803e58 100644 --- a/York-Thesis/C-Begin/beg.tex +++ b/York-Thesis/C-Begin/beg.tex @@ -22,7 +22,7 @@ % % This work consists of all the files listed in the README.md, % and provides a copy of the original hosted on -% https://git.tigrau.ovh/Ambroise/LaTeX-Templates/York-Thesis. +% https://git.tigrau.ovh/Ambroise/LaTeX-Templates/. \documentclass[../main]{subfiles} %\myexternaldocument{main} % for overleaf to get the cross references @@ -33,4 +33,4 @@ This is the beginning of your work where you will refer to equation \eqref{eq:th \blindmathpaper -\end{document} \ No newline at end of file +\end{document} diff --git a/York-Thesis/C-End/end.tex b/York-Thesis/C-End/end.tex index ffdc990..5b32feb 100644 --- a/York-Thesis/C-End/end.tex +++ b/York-Thesis/C-End/end.tex @@ -22,7 +22,7 @@ % % This work consists of all the files listed in the README.md, % and provides a copy of the original hosted on -% https://git.tigrau.ovh/Ambroise/LaTeX-Templates/York-Thesis. +% https://git.tigrau.ovh/Ambroise/LaTeX-Templates/. \documentclass[../main]{subfiles} \begin{document} diff --git a/York-Thesis/main.pdf b/York-Thesis/main.pdf index 072d08f0874543ab1740533f763dff541202bf71..127ac6a6e54c313c845e473c6a55f6d8c68634dc 100644 GIT binary patch delta 18211 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 delta 18322 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 G7X<*!06HcB diff --git a/York-Thesis/main.tex b/York-Thesis/main.tex index b9f0e94..00d5a7c 100644 --- a/York-Thesis/main.tex +++ b/York-Thesis/main.tex @@ -22,7 +22,7 @@ % % This work consists of all the files listed in the README.md, % and provides a copy of the original hosted on -% https://git.tigrau.ovh/Ambroise/LaTeX-Templates/York-Thesis. +% https://git.tigrau.ovh/Ambroise/LaTeX-Templates/. %%% ==== Begin file % FORMAT: Font size must be at least 11pt, 12pt is set as default @@ -49,29 +49,29 @@ % FORMAT: All pages should be numbered continuously. % Suppressing the numbering style and headers for the opening pages -\frontmatter* +\frontmatter* -%% Call the title page to be made. Use this instead of \titlepage to get the yorkthesis class format +%% Call the title page to be made. Use this instead of \titlepage to get the yorkthesis class format \makethesistitle %% Abstract of the thesis [required] \chapter{Abstract} -% TODO: +% TODO: \todo[noline]{Write the abstract.} % FORMAT: At most 300 words. \vspace*{-2em}\begin{quote} \centering \scshape \itshape The \texttt{Abstract} section is a requirement and should not be longer than 300 words. \end{quote}\todo[caption={Shorten the abstract}, size=footnotesize]{Keep it under the limit to prevent doing the same thing I'm doing reducing fonts} {\small -This document serves as an example of the look the \texttt{yorkthesis} class can provide while being at the same time a documentation for the code this document is built upon. -This whole project was prompted from the fact that the template provided by the department was very old and outdated, and didn't provide a ``good enough`` look. +This document serves as an example of the look the \texttt{yorkthesis} class can provide while being at the same time a documentation for the code this document is built upon. +This whole project was prompted from the fact that the template provided by the department was very old and outdated, and didn't provide a ``good enough`` look. For a thesis document, the usual \texttt{article} environment does not provide the chapter layout one would expect to structure such an important piece of work. -The class that is recommended is the \href{https://ctan.org/pkg/memoir}{\texttt{memoir}} class, but its documentation and setting can be a bit daunting at first glance due to its sheer volume (at the time of writing the documentation is $615$ pages long, and its implementation in \TeX consists of more than $37000$ lines of code). +The class that is recommended is the \href{https://ctan.org/pkg/memoir}{\texttt{memoir}} class, but its documentation and setting can be a bit daunting at first glance due to its sheer volume (at the time of writing the documentation is $615$ pages long, and its implementation in \TeX consists of more than $37000$ lines of code). For his thesis in 2020, Alessandro Pezzoni decided to write a class on top of the \texttt{memoir} one that would contain the structure required by the university while being also easier to use (you can find his initial implementation in his github project at \url{https://github.com/donbex/yorkthesis}). -He accepted to share this for others to use it, and I am really grateful for that. +He accepted to share this for others to use it, and I am really grateful for that. I decided to add two elements to his class implementation (the possibility of a subtitle and an easier handling of margins), but thought that a thorough example of a good folder structure for writing a thesis would benefit people. -On top of being hosted on the maths departmental moodle page, the up to date code can be downloaded on my personal Gitea repository (at \url{https://git.tigrau.ovh/Ambroise/LaTeX-Templates/York-Thesis}), where suggestions and requests can be made, and a copy of it can also be found as an Overleaf project (at \url{https://www.overleaf.com/read/mmprbwrdbgbx}). +On top of being hosted on the maths departmental moodle page, the up to date code can be downloaded on my personal Gitea repository (at \url{https://git.tigrau.ovh/Ambroise/LaTeX-Templates/src/branch/master/York-Thesis}), where suggestions and requests can be made, and a copy of it can also be found as an Overleaf project (at \url{https://www.overleaf.com/read/mmprbwrdbgbx}). I hope this will be useful to many others.}\todo[color=red!60, inline, size=footnotesize,caption={Warning for old \LaTeX\ versions}]{Warning: Some features might not work as intended if the installed \LaTeX\ version and its packages are not up to date} @@ -121,10 +121,10 @@ As for myself, I want to thank Alessandro for his template which makes the perfe \bigskip This section should include a text similar to: \begin{verbatim} - I declare that the work presented in this thesis, except where - otherwise stated, is based on my own research carried out at - the University of York and has not been submitted previously - for any degree at this or any other university. Sources are + I declare that the work presented in this thesis, except where + otherwise stated, is based on my own research carried out at + the University of York and has not been submitted previously + for any degree at this or any other university. Sources are acknowledged by explicit references. \end{verbatim} If you have submitted a paper (either already published or currently under review), this should be explicitly mentioned in this section with a reference to its bibliography entry. @@ -163,4 +163,4 @@ If you have submitted a paper (either already published or currently under revie % FORMAT: The index, if there is one, goes here. -\end{document} \ No newline at end of file +\end{document} diff --git a/York-Thesis/mypreamble.tex b/York-Thesis/mypreamble.tex index 94d1698..d5cb95a 100644 --- a/York-Thesis/mypreamble.tex +++ b/York-Thesis/mypreamble.tex @@ -20,7 +20,7 @@ % % This work consists of all the files listed in the README.md, % and provides a copy of the original hosted on -% https://git.tigrau.ovh/Ambroise/LaTeX-Templates/York-Thesis. +% https://git.tigrau.ovh/Ambroise/LaTeX-Templates/. %%% ===== Folder structure @@ -30,15 +30,15 @@ \externaldocument{\subfix{main}} % all refs available in subfiles by \ref{labelname} as usual %% NOTE: The following code make an additional paths search -%% search to simplify the calls to \subfile if you don't want -%% to bother with relative paths. If you uncomment it, add -%% the folders' name appropriately to the list with the {dir/} +%% search to simplify the calls to \subfile if you don't want +%% to bother with relative paths. If you uncomment it, add +%% the folders' name appropriately to the list with the {dir/} %% syntax (brackets and trailing slash). %% WARNING: This slows down compilation time A LOT!!! \makeatletter \def\input@path{ % - {../Bibfiles/}{C-Begin/}{C-Middle/}{C-End/} % list of folders - } + {../Bibfiles/}{C-Begin/}{C-Middle/}{C-End/} % list of folders + } \makeatother @@ -68,11 +68,11 @@ %%% ===== List of recommended packages you need to include \usepackage{amsmath, amsthm} \usepackage{amssymb, amsfonts} -\usepackage[final]{hyperref} % links with final option to force them to appear even in draft mode +\usepackage[final]{hyperref} % links with final option to force them to appear even in draft mode \usepackage{xspace} % for automatic spaces after text commands \usepackage{xcolor} % to use colours in different parts -% NOTE: Package for the todo notes. Notice that it uses multiple packages such as -% ifthen, xkeyval, xcolor, tikz (w/ graphicx) and calc, and thus they need +% NOTE: Package for the todo notes. Notice that it uses multiple packages such as +% ifthen, xkeyval, xcolor, tikz (w/ graphicx) and calc, and thus they need % to be called before todonotes if specific options are wanted \usepackage[obeyDraft, textsize=small, colorinlistoftodos]{todonotes} @@ -105,7 +105,7 @@ \theoremstyle{plain} % the style for theorem, propositions and lemmas % Counter used to make it continuous numbering with subsubsection value appended \newtheorem{thm}[subsubsection]{Theorem} % name shortcut for Theorem & counter check -\newtheorem{prop}[subsubsection]{Proposition} % idem for rest... +\newtheorem{prop}[subsubsection]{Proposition} % idem for rest... \newtheorem{lem}[subsubsection]{Lemma} \newtheorem{cor}[subsubsection]{Corollary} \newtheorem{conj}[subsubsection]{Conjecture} @@ -126,4 +126,4 @@ %%% ===== List of your own macros here -\newcommand{\AG}{\ensuremath{\mathscr{A\hspace*{-3pt}{G}}}\xspace} \ No newline at end of file +\newcommand{\AG}{\ensuremath{\mathscr{A\hspace*{-3pt}{G}}}\xspace} diff --git a/York-Thesis/thesisoptions.sty b/York-Thesis/thesisoptions.sty index 8cb6ead..74908e9 100644 --- a/York-Thesis/thesisoptions.sty +++ b/York-Thesis/thesisoptions.sty @@ -20,7 +20,7 @@ % % This work consists of all the files listed in the README.md, % and provides a copy of the original hosted on -% https://git.tigrau.ovh/Ambroise/LaTeX-Templates/York-Thesis. +% https://git.tigrau.ovh/Ambroise/LaTeX-Templates/. \ProvidesPackage{thesisoptions}[2022/07/08 v1.0 Options for the York Thesis class] @@ -35,22 +35,22 @@ %%% ==== Margins % Margins of the document can be set using some helper macros defined in the class file. % The block size of the document will adjust relatively to the values of the margin defined. -% Horizontal margins are set relatively to the spine edge of the page, while vertical ones -% are relatively to the upper edge. +% Horizontal margins are set relatively to the spine edge of the page, while vertical ones +% are relatively to the upper edge. % Defaults: The defaults margins are 3cm on spine and foredge and 4cm on upper and lower edges. -% Commands: The available commands are the following: -% \horizontalmarginsvalue, \horizontalmarginsratio, \verticalmarginsvalue and -% \verticalmarginsratio which all takes one required parameter and one optional. It -% is expected that at most one of the horizontal commands and at most one of the -% vertical commands is called (see limitations below). +% Commands: The available commands are the following: +% \horizontalmarginsvalue, \horizontalmarginsratio, \verticalmarginsvalue and +% \verticalmarginsratio which all takes one required parameter and one optional. It +% is expected that at most one of the horizontal commands and at most one of the +% vertical commands is called (see limitations below). % Arguments: For the \horizontal* commands the required one is the spine margin with its unit, -% and the upper edge margin with its unit for the \vertical* commands. +% and the upper edge margin with its unit for the \vertical* commands. % For the \*marginsvalue commands the optional argument is the opposite edge margin -% value with its unit (with default the same value as the required argument), and for -% the \*marginsratio it corresponds to a ratio between the margin set for the reference -% and the margin obtained for the opposite side (with default value 1, meaning that +% value with its unit (with default the same value as the required argument), and for +% the \*marginsratio it corresponds to a ratio between the margin set for the reference +% and the margin obtained for the opposite side (with default value 1, meaning that % margin values will be the same), under the rule: oppside = ratio * refside. -% Limitations: Since the horizontal ratio cannot be set if the margins on both the spine and the +% Limitations: Since the horizontal ratio cannot be set if the margins on both the spine and the % foredge sides are set, this ratio is discarded. This means that calling both the % \horizontalmarginsvalue and \horizontalmarginsratio commands will set the spine margin % to the value set by the last of the two commands called, and the foredge margin will @@ -66,25 +66,25 @@ %%% ==== Styling chapters/sections % See the manual of the `memoir` class for more predefined styles: -% - Appendix B for chapter styles (or for more examples consult +% - Appendix B for chapter styles (or for more examples consult % https://ctan.uib.no/info/latex-samples/MemoirChapStyles/MemoirChapStyles.pdf); % - Section 6.9 for lower level heading styles. % To learn how to define your own, see Chapter 6. -% The order of call between \headstyles and \chapterstyle is important since -% the chapter header is defined in both of these, but the former defines +% The order of call between \headstyles and \chapterstyle is important since +% the chapter header is defined in both of these, but the former defines % the other sections style headers, so calling \headstyle second would % override the parameters of \chapterstyle. -% As a baseline choice, I use dowding for the [sub]sections headers (defined +% As a baseline choice, I use dowding for the [sub]sections headers (defined % in memoir.dtx in `\makeheadstyles{dowding}`) and then I set the chapter style to % dash (defined in `\makechapterstyle{dash}`) \headstyles{dowding} -\chapterstyle{dash} +\chapterstyle{dash} % Personal styling choice, modifying the look and placement of section headers % (using the definitions in file for the base code but suppressing \centering % to manually set the indentation) -\setsecheadstyle{\normalfont\large\MakeTextUppercase} % large CAPS +\setsecheadstyle{\normalfont\large\MakeTextUppercase} % large CAPS \setsubsecheadstyle{\normalfont\scshape} % small caps \setsubsecindent{1em} \setsubsubsecheadstyle{\normalfont\normalsize\itshape} % italicised for subsubsection @@ -117,4 +117,4 @@ %%%% ==== DEBUG % If you want the version of the packages you use appear when they load in the log file, uncomment the following line: -\listfiles \ No newline at end of file +\listfiles diff --git a/York-Thesis/yorkthesis.cls b/York-Thesis/yorkthesis.cls index 2d263b8..1efa54b 100644 --- a/York-Thesis/yorkthesis.cls +++ b/York-Thesis/yorkthesis.cls @@ -24,7 +24,7 @@ % % This work consists of all the files listed in the README.md, % and provides a copy of the original hosted on -% https://git.tigrau.ovh/Ambroise/LaTeX-Templates/York-Thesis. +% https://git.tigrau.ovh/Ambroise/LaTeX-Templates/. % Comments starting with FORMAT highlight requirements from the UoY thesis @@ -59,14 +59,14 @@ % FORMAT: Use 1.5 line spacing. \OnehalfSpacing -% FORMAT: GRS states as a recommendation that: +% FORMAT: GRS states as a recommendation that: % spine margin should be at least 40mm, % other margins should be at least 15mm. % In effect, their view is the following: % "We would recommend that they stick with the guidance re. margin on binding edge merely because we still get examiners who prefer to make themselves a physical copy to mark up, rather than using the digital annotation." -% I have taken the stand to set the default value to 3cm on both sizes horizontally, +% I have taken the stand to set the default value to 3cm on both sizes horizontally, % while putting 4cm vertically. The implementation below prevents the use of setting -% the blocksize and then letting the margins be defined by a value relatively to that +% the blocksize and then letting the margins be defined by a value relatively to that % blocksize. If you want to use these instead, you need to delete the macros below. % DOC: Check memoir package sec2.4.2 p.17-21 \newcommand{\horizontalmarginsvalue}[2][*]{\def\margin@spine{#2} \def\margin@foredge{#1}}