Update structure

0-front/cover/cover.tex

@@ -4,7 +4,7 @@
 
 % Inclure les infos de chaque établissement
 % Include each institution data
-\input{00-cover/liste-ecoles-etablissements}
+\input{0-front/cover/liste-ecoles-etablissements}
 
 % Inclure infos de l'école doctorale
 % Include doctoral school data
@@ -84,3 +84,4 @@
 }
 
 \maketitle
+\pdfbookmark[-1]{Front Matter}{frontmatter}

0-front/cover/cover_background.tex

@@ -17,6 +17,6 @@
   \fill[couleur-ecole-recto, fill opacity = 1] (-1,0) -- (-1,12.7817142857) -- (14,8.556) -- (14,6.4) -- (\paperwidth,4.4281) -- (\paperwidth,0) -- cycle;
 
   %points
-  \input{00-cover/cover_points}
+  \input{0-front/cover/cover_points}
   \shade[shading=axis, top color = white, path fading = south] (14,8.556) rectangle (\paperwidth,10);
 \end{tikzpicture}

1-introduction/introduction/introduction.tex

@@ -7,6 +7,8 @@
 
 Touch is the only sense that allows not only to perceive the environment, but also to interact with it. Explain how both vision and touch are complementary and important for combined perception and interaction with the environment.
 
+\fig{real}{Foo bar baz}
+
 \subsectionstartoc{Wearable Haptics and the Augmentation of Touch}
 
 Present what is wearable haptics, how they can be used to augment the sense of touch~\autocite{pacchierotti2017wearable}. Detail then how they have been used with virtual reality, but how little they have been used with augmented reality.

1-introduction/part.tex

@@ -0,0 +1,2 @@
+\part{Introduction}
+\label{part:introduction}

1-introduction/related-work/related-work.tex

@@ -1,4 +1,5 @@
-\mainchapter{12-related-work}{Related Work}
+\mainchapter{Related Work}
+\label{ch:related-work}
 
 \section{Haptics}
 

13-chapitre2/chapitre2.tex

@@ -1,13 +0,0 @@
-\part{Augmenting the Visuo-haptic Texture Perception of Tangible Surfaces}
-\label{part:texture}
-
-\mainchapter{13-chapitre2}{Perception of Visual-Haptic Texture Augmentation in Augmented and Virtual Reality}
-
-\mainchapter{13-chapitre2}{Augmenting the Texture Perception of Tangible Surfaces in Augmented Reality using Vibrotactile Haptics}
-
-\part{Improving Virtual Object Manipulation with Visuo-Haptic Augmentations of the Hand}
-\label{part:hand}
-
-\mainchapter{13-chapitre2}{Visual Rendering of the Hand in Augmented Reality}
-
-\mainchapter{13-chapitre2}{Visuo-Haptic Rendering of the Hand in Augmented Reality}

2-perception/ar-textures/ar-textures.tex

@@ -0,0 +1,2 @@
+\mainchapter{Augmenting the Texture Perception of Tangible Surfaces in Augmented Reality using Vibrotactile Haptics}
+\label{ch:ar-textures}

2-perception/perception.tex

@@ -0,0 +1,2 @@
+\part{Augmenting the Visuo-haptic Texture Perception of Tangible Surfaces}
+\label{part:texture}

2-perception/xr-perception/xr-perception.tex

@@ -0,0 +1,3 @@
+\mainchapter{Perception of Visual-Haptic Texture Augmentation in Augmented and Virtual Reality}
+\label{ch:xr-perception}
+

3-manipulation/manipulation.tex

@@ -0,0 +1,2 @@
+\part{Improving Virtual Object Manipulation with Visuo-Haptic Augmentations of the Hand}
+\label{part:manipulation}

3-manipulation/visual-hand/visual-hand.tex

@@ -0,0 +1,2 @@
+\mainchapter{Visual Rendering of the Hand in Augmented Reality}
+\label{ch:visual-hand}

3-manipulation/visuo-haptic-hand/visuo-haptic-hand.tex

@@ -0,0 +1,2 @@
+\mainchapter{Visuo-Haptic Rendering of the Hand in Augmented Reality}
+\label{ch:visuo-haptic-hand}

4-conclusion/backcover/backcover.tex

@@ -9,7 +9,7 @@
         \put(0,0){%
             \parbox[t][\paperheight]{\paperwidth}{%
                 \vspace{-33.1cm}
-                \input{20-back/backcover_background}
+                \input{4-conclusion/backcover/backcover_background}
             }}
     }
     \hspace{9mm}
@@ -39,6 +39,7 @@
         docens, idque, incertum qua mente, ne lateret adfectans. quibus mox Caesar acrius efferatus, velut contumaciae quoddam vexillum altius erigens, sine respectu salutis alienae vel suae ad vertenda opposita instar rapidi fluminis irrevocabili impetu ferebatur.
         Hae duae provinciae bello quondam piratico catervis mixtae praedonum.}
 
+    \addcontentsline{toc}{chapter}{Back Cover}
 }
 
 \restoregeometry

4-conclusion/bibliography.tex

@@ -0,0 +1 @@
+\printbibliography[heading=bibintoc]

4-conclusion/conclusion.tex

@@ -1,4 +1,2 @@
-\resetparts
-
 \chapter{Conclusion}
 \label{ch:conclusion}

4-conclusion/part.tex

@@ -0,0 +1,2 @@
+\part{Conclusion}
+\label{part:conclusion}

main.tex

@@ -44,12 +44,14 @@
 
 %% Typography
 % babel, csquotes, fontenc, microtype, lmodern, textcomp are already loaded by the class
-\usepackage[varqu, varl]{inconsolata} % Better monospace font (with alternative quote [varqu] and l [varl])
+\usepackage[varqu, varl]{inconsolata} % Better monospace font (with alternative "quote" [varqu] and "l" [varl])
-\usepackage[libertinus]{newtx} % Use Garamond font for text and math
+%\usepackage{newtx} % Use Libertinus font for text and math
 \usepackage{microtype} % Micro-typography improvements (slightly more compact, better to read)
 
+% Customise fonts (sectsty package, loaded by the class)
+\renewcommand*{\selectfontchapheads}{}
+\chapterfont{\sffamily} % Smaller chapter titles
 \allsectionsfont{\sffamily} % Sans-serif for section titles
-\chapterfont{\sffamily} % Sans-serif for chapter titles
 
 %% Custom commands
 \input{utils/commands}
@@ -61,11 +63,13 @@
 
 \newcommand{\inputchapter}[1]{\clearemptydoublepage\input{#1}} % Load a chapter after a clear double page
 
-\newcommand{\mainchapter}[2]{%
+\newcommand{\inputchapterfigures}[2]{% Load a chapter (#2) with figures from a specific directory (#1)
-    \chapter{#2}%
+    \graphicspath{{#1/#2/figures/}}%
-    \label{ch:#1}%
+    \inputchapter{#1/#2/#2}%
-    %
+}
-    \graphicspath{{#1/figures/}}% Load figures from the chapter folder
+
+\newcommand{\mainchapter}[1]{%
+    \chapter{#1}%
     %
     % Print the table of contents for the chapter
     \vspace*{-1cm}%
@@ -83,28 +87,36 @@
 
 \frontmatter
 \selectlanguage{french}
-\input{00-cover/cover}
+\input{0-front/cover/cover}
 \selectlanguage{english}
 
-\inputchapter{01-front/acknowledgement}
+\inputchapter{0-front/content/acknowledgement}
-\inputchapter{01-front/abstract}
+\inputchapter{0-front/content/abstract}
-\inputchapter{01-front/résumé}
+\inputchapter{0-front/content/résumé}
-\inputchapter{01-front/publications}
+\inputchapter{0-front/content/publications}
-\inputchapter{01-front/contents}
+\inputchapter{0-front/content/contents}
-\inputchapter{01-front/acronyms}
+\inputchapter{0-front/content/acronyms}
-\inputchapter{01-front/figures}
+\inputchapter{0-front/content/figures}
-\inputchapter{01-front/tables}
+\inputchapter{0-front/content/tables}
 
 \mainmatter
-\inputchapter{11-introduction/introduction}
+\input{1-introduction/part}
-\inputchapter{12-related-work/related-work}
+\inputchapterfigures{1-introduction}{introduction}
-\inputchapter{13-chapitre2/chapitre2}
+\inputchapterfigures{1-introduction}{related-work}
-\inputchapter{14-conclusion/conclusion}
+
+\input{2-perception/perception}
+\inputchapterfigures{2-perception}{xr-perception}
+\inputchapterfigures{2-perception}{ar-textures}
+
+\input{3-manipulation/manipulation}
+\inputchapterfigures{3-manipulation}{visual-hand}
+\inputchapterfigures{3-manipulation}{visuo-haptic-hand}
+
+\input{4-conclusion/part}
+\inputchapter{4-conclusion/conclusion}
 
 \backmatter
-\clearemptydoublepage
+\inputchapter{4-conclusion/bibliography}
-\printbibliography[heading=bibintoc]
+\inputchapter{4-conclusion/backcover/backcover}
-
-\inputchapter{20-back/backcover}
 
 \end{document}

thesis.cls

@@ -177,7 +177,7 @@
 %%%%%%%%%%%%%%%% VARIABLES PAGE DE GARDE %%%%%%%%%%%%%%%%
 
 %%%%% Dossier contenant les info de l'ecole doctorale
-\newcommand*{\direcole}[1]{\gdef\vdirecole{./00-cover/ecoles-doctorales/#1}}
+\newcommand*{\direcole}[1]{\gdef\vdirecole{0-front/cover/ecoles-doctorales/#1}}
 \direcole{}
 
 %%%%% Nom ecole, une variable par ligne
@@ -271,7 +271,7 @@
                 {\ifthenelse{\equal{\vlogoetablissementA}{}\and\equal{\vlogoetablissementB}{UR1-noir}}{
                             $\vcenter{\hbox{%
                                         \includegraphics[keepaspectratio,height=\vhauteurlogoetablissementB,width=7cm
-                                        ]{./00-cover/logos-etablissements/\vlogoetablissementB}%
+                                        ]{0-front/cover/logos-etablissements/\vlogoetablissementB}%
                                     }}$
                         }{%
                             $\vcenter{\hbox{%
@@ -282,13 +282,13 @@
                             {\if\vlogoetablissementA\empty \else
                                     $\vcenter{\hbox{%
                                                 \includegraphics[keepaspectratio,height=\vhauteurlogoetablissementA,width=7cm
-                                                ]{./00-cover/logos-etablissements/\vlogoetablissementA}%
+                                                ]{0-front/cover/logos-etablissements/\vlogoetablissementA}%
                                             }}$
                                 \fi}%
                             \hspace{3mm}
                             $\vcenter{\hbox{%
                                         \includegraphics[keepaspectratio,height=\vhauteurlogoetablissementB,width=7cm
-                                        ]{./00-cover/logos-etablissements/\vlogoetablissementB}%
+                                        ]{0-front/cover/logos-etablissements/\vlogoetablissementB}%
                                     }}$
                         }}%
             }%
@@ -306,7 +306,7 @@
     \AddToShipoutPicture*{%
         \put(0,0){%
             \parbox[b][42.6cm]{\paperwidth}{%
-                \input{./00-cover/cover_background}
+                \input{0-front/cover/cover_background}
                 \vspace{10cm}
             }}}
     \displayLogos

utils/commands.tex

@@ -112,7 +112,7 @@
 
 
 %% Maths
-\renewcommand{\eqref}[1]{Eq.~\ref{eq:#1}}
+\newcommand{\eqref}[1]{Eq.~\ref{eq:#1}}
 
 \newcommand{\measure}[3]{$\mathrm{#1} = \qty{#2}{#3}$}