From 8f7c849990bdf7f74c1aa99d69bcd07d8b095d8b Mon Sep 17 00:00:00 2001
From: "Jip J. Dekker" <jip@dekker.one>
Date: Mon, 17 May 2021 10:42:13 +1000
Subject: [PATCH] Correctly reset acronym usage

---
 assets/acronyms.tex       |  2 +-
 assets/layout.tex         |  2 ++
 chapters/2_background.tex | 32 ++++++++++++++++++++++++--------
 3 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/assets/acronyms.tex b/assets/acronyms.tex
index d89125f..af79c25 100644
--- a/assets/acronyms.tex
+++ b/assets/acronyms.tex
@@ -39,7 +39,7 @@
 \newacronym[see={[Glossary:]{gls-mip}}]{mip}{MIP\glsadd{gls-mip}}{Mixed Integer
   Programming}
 
-\newacronym[see={[Glossary:]{gls-opl}}]{opl}{OPL\glsadd{gls-opl}}{The OPL
+\newacronym[see={[Glossary:]{gls-opl}}]{opl}{OPL\glsadd{gls-opl}}{The
   Optimisation Programming Language}
 
 \newacronym{ram}{RAM}{Random Access Memory}
diff --git a/assets/layout.tex b/assets/layout.tex
index 1486058..f52e41f 100644
--- a/assets/layout.tex
+++ b/assets/layout.tex
@@ -19,4 +19,6 @@
 \addtokomafont{title}{\normalfont\girassol{}}
 \addtokomafont{author}{\normalfont\fontsize{20}{20}\satisfyfont{}}
 
+\setkomafont{disposition}{\girassol{}}
+
 \RedeclareSectionCommand[beforeskip=0pt,afterskip=8\baselineskip]{chapter}
diff --git a/chapters/2_background.tex b/chapters/2_background.tex
index b4d43e8..2bbd9f2 100644
--- a/chapters/2_background.tex
+++ b/chapters/2_background.tex
@@ -615,12 +615,23 @@ this section will discuss the other dominant technologies used used by
 
 \subsection{Constraint Programming}%
 \label{subsec:back-cp}
+\glsreset{cp}
 
-\subsection{Boolean Satisfiability}%
-\label{subsec:back-sat}
+\gls{cp}
+
+\paragraph{Constraint Propagation}
 
 \subsection{Mathematical Programming}%
 \label{subsec:back-mip}
+\glsreset{mip}
+
+\gls{mip}
+
+\subsection{Boolean Satisfiability}%
+\label{subsec:back-sat}
+\glsreset{sat}
+
+\gls{sat}
 
 \subsection{Hybrid Technologies}%
 \label{subsec:back-hybrid}
@@ -642,8 +653,9 @@ 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{AMPL}%
+\subsection{\glsentrytext{ampl}}%
 \label{sub:back-ampl}
+\glsreset{ampl}
 
 One of the most used \cmls\ is \gls{ampl} \autocite{fourer-2003-ampl}. As the
 name suggest, \gls{ampl} was designed to allow modellers to express problems
@@ -722,12 +734,13 @@ has even been extended to allow the usage of certain \glspl{global} when using a
 
 
 
-\subsection{OPL}%
+\subsection{\glsentrytext{opl}}%
 \label{sub:back-opl}
+\glsreset{opl}
 
-\glsaccesslong{opl} \autocite{van-hentenryck-1999-opl} is a \cml\ that has a
-focus aims to combine the strengths of mathematical programming languages like
-\gls{ampl} with the strengths of \gls{cp}. The syntax of \gls{opl} is very
+\gls{opl} is a \cml\ that has a focus aims to combine the strengths of
+mathematical programming languages like \gls{ampl} with the strengths of
+\gls{cp} \autocite{van-hentenryck-1999-opl}. The syntax of \gls{opl} is very
 similar to the \minizinc\ syntax.
 
 Where the \gls{opl} really shines is when modelling scheduling problems.
@@ -916,6 +929,7 @@ and \glspl{variable} compatible with the targeted solver.
 
 \section{Term Rewriting}%
 \label{sec:back-term}
+\glsreset{trs}
 
 At the heart of the flattening process lies a \gls{trs}. A \gls{trs}
 \autocite{baader-1998-term-rewriting} describes a computational model the full
@@ -973,10 +987,11 @@ translation process terminates (so the solving process can start).
 
 In the remainder of this section we will discuss two types of \glspl{trs} that
 are closely related to \cmls\ and their compilation into solver level constraint
-models: \glsaccesslong{clp} and \glsaccesslong{chr}.
+models: \gls{clp} and \gls{chr}.
 
 \subsection{Constraint Logic Programming}%
 \label{subsec:back-clp}
+\glsreset{clp}
 
 \gls{clp} \autocite{marriott-1998-clp} can be seen as a predecessor of \cmls{}
 like \minizinc. A constraint logic program describes the process in which a high
@@ -1029,6 +1044,7 @@ satisfied.
 
 \subsection{Constraint Handling Rules}%
 \label{sub:back-chr}
+\glsreset{chr}
 
 When \glspl{constraint} are seen as terms in a \gls{trs}, then it is not just
 possible to define rules to rewrite constraints to the level of a \gls{solver}.