From c58478355add7c9e973076e5f0c15419dee7922f Mon Sep 17 00:00:00 2001
From: "Jip J. Dekker" <jip@dekker.one>
Date: Sat, 22 May 2021 14:38:14 +1000
Subject: [PATCH] work work

---
 assets/packages.tex       |  6 +++---
 chapters/2_background.tex | 14 +++++++++-----
 chapters/3_rewriting.tex  |  2 +-
 dekker_thesis.tex         |  1 -
 4 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/assets/packages.tex b/assets/packages.tex
index 77624e4..f9cb43d 100644
--- a/assets/packages.tex
+++ b/assets/packages.tex
@@ -1,6 +1,5 @@
-\usepackage{silence}
-\WarningFilter{biblatex}{File 'australian-apa.lbx'}
-\hfuzz=1.5pt
+\hfuzz=5pt
+\usepackage{scrhack}
 \usepackage{fvextra}
 \usepackage{csquotes}
 \usepackage[australian]{babel}
@@ -52,6 +51,7 @@
 \usepackage[
   style=apa,
 ]{biblatex}
+\DeclareLanguageMapping{australian}{english-apa}
 \usepackage[noabbrev]{cleveref}
 
 % Tables
diff --git a/chapters/2_background.tex b/chapters/2_background.tex
index 330e386..dd3740c 100644
--- a/chapters/2_background.tex
+++ b/chapters/2_background.tex
@@ -153,8 +153,12 @@ the following model is the result of flattening:
   var 0..1: selection_1;
   var 0..1: selection_2;
   var 0..175: total_joy:: is_defined_var;
-  constraint int_lin_le([32,8,40],[selection_0,selection_1,selection_2],44);
-  constraint int_lin_eq([63,12,100,-1],[selection_0,selection_1,selection_2,total_joy],0):: defines_var(total_joy);
+  constraint int_lin_le([32,8,40], [selection_0,selection_1,selection_2], 44);
+  constraint int_lin_eq(
+    [63,12,100,-1],
+    [selection_0,selection_1,selection_2,total_joy],
+    0
+  ):: defines_var(total_joy);
   solve maximize total_joy;
 \end{mzn}
 
@@ -492,7 +496,7 @@ both contexts.
 Some expressions in the \cmls\ do not always have a well-defined result.
 
 \begin{example}\label{ex:back-undef}
-  Consider the following ``complex constraint''
+  Consider, for example, the following ``complex constraint''
 
   \begin{mzn}
     constraint i <= 4 -> a[i] * x >= 6;
@@ -970,7 +974,7 @@ only \minizinc\ allows modellers to extend the language using their own
 (user-defined) functions. In other \cmls\ the modeller is restricted to the
 expressions and functions provided by the language.
 
-\subsection{\glsentrytext{ampl}}%
+\subsection{AMPL}%
 \label{sub:back-ampl}
 \glsreset{ampl}
 
@@ -1046,7 +1050,7 @@ when using a \gls{cp} \solver{} \autocite{fourer-2002-amplcp}.
 
 
 
-\subsection{\glsentrytext{opl}}%
+\subsection{OPL}%
 \label{sub:back-opl}
 \glsreset{opl}
 
diff --git a/chapters/3_rewriting.tex b/chapters/3_rewriting.tex
index 0b7925f..950feb8 100644
--- a/chapters/3_rewriting.tex
+++ b/chapters/3_rewriting.tex
@@ -1017,7 +1017,7 @@ proceed as normal with the root context constraint.
 \minizinc{} distinguishes not only between root and reified contexts, but in
 addition recognises constraints in \emph{positive} contexts, also known as
 \emph{half-reified} \autocite{feydy-2011-half-reif}. A full explanation and
-discussion of half-reification can be found in \cref{ch:half_reif}.
+discussion of half-reification can be found in \cref{ch:half-reif}.
 
 \jip{TODO:\ Reification should also be discussed in the background. How can we
   make this more specific to how it works in \nanozinc{}.}
diff --git a/dekker_thesis.tex b/dekker_thesis.tex
index 781dd0c..5919bc0 100644
--- a/dekker_thesis.tex
+++ b/dekker_thesis.tex
@@ -105,7 +105,6 @@ following publication:
 \include{chapters/5_incremental}
 
 \appendix{}
-\include{chapters/A3_temp_hr}
 \include{chapters/A1_minizinc_grammar}
 \include{chapters/A2_benchmark}