Skip to content
Snippets Groups Projects
Commit fb510937 authored by Malin Freeborn's avatar Malin Freeborn
Browse files

Merge commit 'b6cc3296' into dev

parents b166556b b6cc3296
No related branches found
No related tags found
No related merge requests found
...@@ -219,7 +219,7 @@ bookmarks=true]% ...@@ -219,7 +219,7 @@ bookmarks=true]%
\newcommand{\pic}[1]{ \newcommand{\pic}[1]{
\noindent% \noindent%
\IfFileExists{images/#1.svg}{% \IfFileExists{images/#1.svg}{%
\noindent\includesvg[width=\linewidth]{images/#1.svg} \noindent\includesvg[width=\linewidth]{images/#1}
}{% }{%
\includegraphics[width=\linewidth]{images/#1.jpg} \includegraphics[width=\linewidth]{images/#1.jpg}
} }
...@@ -230,7 +230,7 @@ bookmarks=true]% ...@@ -230,7 +230,7 @@ bookmarks=true]%
\needspace{2cm}\begin{wrapfigure}{R}{.#1\linewidth} \needspace{2cm}\begin{wrapfigure}{R}{.#1\linewidth}
\noindent% \noindent%
\IfFileExists{images/#2.svg}{% \IfFileExists{images/#2.svg}{%
\includesvg[width=\linewidth]{images/#2.svg} \includesvg[width=\linewidth]{images/#2}
}{ }{
\includegraphics[width=\linewidth]{images/#2.jpg} \includegraphics[width=\linewidth]{images/#2.jpg}
} }
...@@ -239,7 +239,6 @@ bookmarks=true]% ...@@ -239,7 +239,6 @@ bookmarks=true]%
} }
\newcommand{\toppic}[2]{ \newcommand{\toppic}[2]{
\iftoggle{verbose}{
\begin{figure*}[t!] \begin{figure*}[t!]
\IfFileExists{images/#1.svg}{ \IfFileExists{images/#1.svg}{
\includesvg[width=\textwidth]{images/#1} \includesvg[width=\textwidth]{images/#1}
...@@ -249,10 +248,8 @@ bookmarks=true]% ...@@ -249,10 +248,8 @@ bookmarks=true]%
#2 #2
\end{figure*} \end{figure*}
} }
}
\newcommand{\bottompic}[2]{ \newcommand{\bottompic}[2]{
\iftoggle{verbose}{
\begin{figure*}[b!] \begin{figure*}[b!]
\IfFileExists{images/#1.svg}{ \IfFileExists{images/#1.svg}{
\includesvg[width=\textwidth]{images/#1} \includesvg[width=\textwidth]{images/#1}
...@@ -262,13 +259,13 @@ bookmarks=true]% ...@@ -262,13 +259,13 @@ bookmarks=true]%
#2 #2
\end{figure*} \end{figure*}
} }
}
\colorlet{chapnumcol}{black!100} \colorlet{chapnumcol}{black!100}
%%%%% Section Formatting %%%%% %%%%% Section Formatting %%%%%
\newcommand{\frontpage}[3]{ \newcommand{\frontpage}[3]{
\iftoggle{verbose}{
\begin{titlepage} \begin{titlepage}
\centering \centering
\vspace{2cm} \vspace{2cm}
...@@ -281,6 +278,7 @@ bookmarks=true]% ...@@ -281,6 +278,7 @@ bookmarks=true]%
\end{titlepage} \end{titlepage}
\cleardoublepage \cleardoublepage
}{}
} }
\titleformat{\chapter}[display] \titleformat{\chapter}[display]
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment