Merge branch 'develop' of https://github.com/kks32/phd-thesis-template into develop

Conflicts:
	thesis.pdf

Chapter1/chapter1.tex

@@ -14,12 +14,22 @@
 %********************************** %First Section  **************************************
 \section{What is loren ipsum? Title with math \texorpdfstring{$\sigma$}{[sigma]}} %Section - 1.1 
 
-Lorem Ipsum is simply dummy text of the printing and typesetting industry (see Section~\ref{section1.3}). Lorem Ipsum~\citep{Aup91} has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum~\citep{AAB95,Con90,LM65}.
-\mynote{Hey! I have a note}
-The most famous equation in the world: $E^2 = (m_0c^2)^2 + (pc)^2$, which is known as the \textbf{energy-mass-momentum} relation as an in-line equation.
+Lorem Ipsum is simply dummy text of the printing and typesetting industry (see 
+Section~\ref{section1.3}). Lorem Ipsum~\citep{Aup91} has been the industry's 
+standard dummy text ever since the 1500s, when an unknown printer took a galley 
+of type and scrambled it to make a type specimen book. It has survived not only 
+five centuries, but also the leap into electronic typesetting, remaining 
+essentially unchanged. It was popularised in the 1960s with the release of 
+Letraset sheets containing Lorem Ipsum passages, and more recently with desktop 
+publishing software like Aldus PageMaker including versions of Lorem 
+Ipsum~\citep{AAB95,Con90,LM65}.
+
+The most famous equation in the world: $E^2 = (m_0c^2)^2 + (pc)^2$, which is 
+known as the \textbf{energy-mass-momentum} relation as an in-line equation.
 
 A {\em \LaTeX{} class file}\index{\LaTeX{} class file@LaTeX class file} is a file, which holds style information for a particular \LaTeX{}.
 
+
 \begin{align}
 CIF: \hspace*{5mm}F_0^j(a) = \frac{1}{2\pi \iota} \oint_{\gamma} \frac{F_0^j(z)}{z - a} dz
 \end{align}

Classes/PhDThesisPSnPDF.cls

@@ -28,7 +28,7 @@
 \newif\if@print\@printfalse
 \DeclareOption{print}{\@printtrue}
 
-\newif\ifPHD@draft\PHD@draftfalse
+\newif\ifsetDraft\setDraftfalse
 
 % ****************************** Define index **********************************
 \newif\ifPHD@index\PHD@indexfalse
@@ -209,11 +209,11 @@ footnotes.}
 \DeclareOption{twoside}{\PassOptionsToClass{\CurrentOption}{book}}%
 
 % Draft Mode
-\DeclareOption{draft}{\PassOptionsToClass{\CurrentOption}{book} 
+\DeclareOption{draft}{\PassOptionsToClass{\CurrentOption}{book}
 \ClassWarning{PhDThesisPSnPDF}{Draft is ON. You can use `draftmode' instead,
   which adds watermark with timestamp and line numbering. Don't forget to turn 
   `draft' off for your final version.}}%
-\DeclareOption{draftmode}{\PassOptionsToClass{draft}{book}\PHD@drafttrue 
+\DeclareOption{draftmode}{\PassOptionsToClass{draft}{book}\setDrafttrue 
 \ClassWarning{PhDThesisPSnPDF}{Draft Mode is ON.
   Don't forget to turn it off for your final version.}}% 
 
@@ -326,7 +326,7 @@ supported!}
 
 
 % If Draft Mode is active
-\ifPHD@draft
+\ifsetDraft
 
 % Line numbering (can be switched off)
 \ifPHD@lineno
@@ -360,10 +360,6 @@ supported!}
 
 \fi % End \ifPDH@lineno
 
-% Todo notes functionality
-\usepackage[colorinlistoftodos]{todonotes}
-\newcommand{\mynote}[1]{\todo[author={\@author},size=\small,inline,color=green!40]{#1}}
-
 % Creates a Watermark Draft at the specified location.
 % The settings can be tweaked in the preamble
 
@@ -421,9 +417,7 @@ supported!}
 % If NOT Draft Mode
 \else 
 
-% Todo notes are not displayed in production mode
-\newcommand{\mynote}[1]{}
-\newcommand{\listoftodos}{}
+
 
 \renewcommand\SetDraftText[1]{\ClassWarning{PhDThesisPSnPDF}{DraftMode is
     inactive, to use SetDraftText include `draftmode' in the document 

Preamble/preamble.tex

@@ -179,4 +179,17 @@
 %\SetDraftGrayScale{0.8}
 
 
+%% Todo notes functionality
+%% Uncomment the following lines to have todonotes.
+
+%\ifsetDraft
+%	\usepackage[colorinlistoftodos]{todonotes}
+%	\newcommand{\mynote}[1]{\todo[author=kks32,size=\small,inline,color=green!40]{#1}}
+%\else
+%	\newcommand{\mynote}[1]{}
+%	\newcommand{\listoftodos}{}
+%\fi
+
+% Example todo: \mynote{Hey! I have a note}
+