template overhaul, added a fukton of commands. Yes i do need to fix the code block macro

Signed-off-by: Ash Entwisle <[email protected]>

Author: ash-entwisle

build.bat

@@ -1,5 +1,5 @@
 xelatex --shell-escape report.tex
-bibtex report.aux
 xelatex --shell-escape report.tex
+bibtex report.aux
 xelatex --shell-escape report.tex
 xelatex --shell-escape report.tex

chapters/1-example-chapter.tex

@@ -16,57 +16,24 @@ \subsection{C-Sharp Code Block}
             }
         }
     \end{minted}
-    \caption{C-Sharp Code Block}
-    \label{fig:CSharpCodeBlock}
+    \macFC{CSharp Code Block}{cscb}
 \end{figure}
 
+
 \subsection{Python Code Block}
 
 You can print to the python standard output using the \mintinline{python}|print| keyword. 
 
-\begin{figure}[ht]
-    \centering
-    \begin{lstlisting}[language=python]
-:        print("Hello World!, this is listings instead of minted")
-    \end{lstlisting}
-    \caption{Python Code Block}
-    \label{fig:PythonCodeBlock}
-\end{figure}
-
-
-\begin{figure}[ht]
-    \centering
-    \begin{Verbatim}
-        print("this is as-is")
-    \end{Verbatim}
-    \caption{Mother Mother}
-    \label{fig:berbatim}
-\end{figure}
-
 \newpage
 
 
 \section{Maths}
 
-\begin{figure}[ht]
-    \centering
-    \begin{math}
-        E=mc^2 
-    \end{math}
-    \caption{Einstein Formula}
-    \label{fig:Emc2}
-
-\end{figure}
-
-\begin{figure}[ht]
-    \centering
-    \begin{math}
-        \frac{1}{2} 
-    \end{math}
-    \caption{Fraction}
-    \label{fig:Fraction-1}
-
-\end{figure}
+\macMath{
+    E = mc^2
+} 
+{Einstein Formula}
+{emc2}
 
 \subsection{this is a subsection}
 
@@ -77,7 +44,7 @@ \subsection{another subection with a table in it}
 
 \begin{table}[h!]
 \centering
-\begin{tabular}{||c c c c||} 
+\begin{tabular}{||c|c|c|c||} 
  \hline
  Col1 & Col2 & Col2 & Col3 \\ [0.5ex] 
  \hline\hline
@@ -88,8 +55,7 @@ \subsection{another subection with a table in it}
  5 & 88 & 788 & 6344 \\ [1ex] 
  \hline
 \end{tabular}
-\caption{Table to test captions and labels.}
-\label{table:1}
+\macFC{Table to test captions and labels.}{table:example}
 \end{table}
 
 \newpage

config/commands.tex

@@ -1 +1,46 @@
-\newcommand{\bib}{\bibliographystyle{config/hull}\bibliography{ref.bib}}
+\newcommand{\bib}{
+\bibliographystyle{config/hull}
+\bibliography{ref.bib}
+}
+
+\newcommand{\macFC}[2]{
+\caption{#1}
+\label{#2}
+}
+
+\newcommand{\macMath}[3]{
+\begin{figure}[ht]
+\centering
+\begin{math}
+#1
+\end{math}
+\caption{#2}
+\label{fig:#3}
+\end{figure}
+}
+
+% may be borked
+\newcommand{\macCode}[4]{
+\begin{figure}[ht]
+#2
+\macFC{#3}{#4}
+\end{figure}
+}
+
+\newcommand{\macImg}[3]{
+\begin{figure}[ht]
+\centering
+\includegraphics[width=\textwidth]{#1}
+\macFC{#2}{#3}
+\end{figure}
+}
+
+\newcommand{\macVerb}[3]{
+\begin{figure}[ht]
+\centering
+\begin{Verbatim}
+#1
+\end{Verbatim}
+\macfc{#2}{#3}
+\end{figure}
+}

config/titlepage.tex

@@ -3,9 +3,12 @@
   \Large\bfseries{\reportModNumber : \reportModName}
 }
 \author{
-  \reportAuthors
+  \reportAuthors \\
+}
+\date{
+  Word Count: \reportWordCount \\ 
+  \reportDate
 }
-\date{\reportDate}
 
 \newcommand{\buildtitle}{\maketitle\normalsize}
 \newcommand{\authorNameNo}[2]{#1 \textit{(#2)} \\}

report.pdf

@@ -5,6 +5,7 @@
 \newcommand{\reportModNumber}{Module\_Number}
 \newcommand{\reportModName}{Module Name}
 \newcommand{\reportDate}{Date/Due/In}
+\newcommand{\reportWordCount}{XXXX}
 \newcommand{\reportAuthors} {
   \authorNameNo{1st Author}{author no.}
   \authorName{2nd Author}