From a55350fde655f81159b022d4047f26258755e278 Mon Sep 17 00:00:00 2001 From: "Jip J. Dekker" Date: Wed, 3 Mar 2021 15:26:11 +1100 Subject: [PATCH] Update shorthands from half-reification --- assets/packages.tex | 60 +------------------------------------ assets/shorthands.tex | 70 +++++++++++++++++++++++++++++++++++++------ 2 files changed, 62 insertions(+), 68 deletions(-) diff --git a/assets/packages.tex b/assets/packages.tex index 2a0e77e..0ed9a65 100644 --- a/assets/packages.tex +++ b/assets/packages.tex @@ -4,6 +4,7 @@ \usepackage[australian]{babel} \usepackage{hyperref} \hypersetup{bookmarksnumbered} +\usepackage{xspace} % Fonts \usepackage{fontspec} @@ -97,62 +98,3 @@ outputdir=build, % Proof Tree \usepackage[nounderscore]{syntax} \usepackage{bussproofs} - -% Half-reification math things - -% \DeclareMathOperator{\rules}{\mathit{rules}} -% \DeclareMathOperator{\lazy}{\mathit{lazy}} -% \DeclareMathOperator{\events}{\mathit{events}} -% \DeclareMathOperator{\domain}{\mathit{domain}} -% \DeclareMathOperator{\bc}{\mathit{bc}} -% \DeclareMathOperator{\lbc}{\mathit{lbc}} -% \DeclareMathOperator{\ubc}{\mathit{ubc}} -% \DeclareMathOperator{\dmc}{\mathit{dmc}} -% \DeclareMathOperator{\fix}{\mathit{fix}} -% \DeclareMathOperator{\event}{\mathit{event}} -% \DeclareMathOperator{\minassign}{\mathit{minassign}} -% \DeclareMathOperator{\assign}{\mathit{assign}} -% \DeclareMathOperator{\rep}{\mathit{rep}} -% \DeclareMathOperator{\cl}{\mathit{cl}} -% \DeclareMathOperator{\UP}{\mathit{UP}} -% \DeclareMathOperator{\up}{\mathit{up}} -% \DeclareMathOperator{\DOM}{\mathit{DOM}} -% \DeclareMathOperator{\false}{\mathit{false}} -% \DeclareMathOperator{\true}{\mathit{true}} -% \DeclareMathOperator{\lit}{\mathit{lit}} -% \DeclareMathOperator{\setb}{\mathit{sb}} -% \DeclareMathOperator{\bnd}{\mathit{bnd}} -% \DeclareMathOperator{\dsb}{\mathit{dsb}} -% \DeclareMathOperator{\vars}{\mathit{vars}} -% \DeclareMathOperator{\ivars}{\mathit{input}} -% \DeclareMathOperator{\ovars}{\mathit{output}} -% %\DeclareMathOperator{\supp}{supp} -% \DeclareMathOperator{\solns}{\mathit{solns}} -% \DeclareMathOperator{\solv}{\mathit{solv}} -% \DeclareMathOperator{\isolv}{\mathit{isolv}} -% \DeclareMathOperator{\conv}{\mathit{conv}} -% \DeclareMathOperator{\ran}{\mathit{ran}} -% \DeclareMathOperator{\ite}{\mathit{ite}} -% \DeclareMathOperator{\VAR}{\mathit{VAR}} - -% \newcommand{\VV}{{\cal V}} -% \newcommand{\PP}{{\cal P}} -% \newcommand{\range}[2]{\left[\,#1\,..\,#2\,\right]} -% \newcommand{\gfp}{\textup{gfp}} -% \newcommand{\lfp}{\textup{lfp}} -% \newcommand{\iter}{\mathit{iter}} - -% \newcommand{\half}{\Rightarrow} -% \newcommand{\full}{\Leftrightarrow} -% \renewcommand{\half}{\rightarrow} -% \renewcommand{\full}{\leftrightarrow} - -% \newcommand{\cross}{\times} -% \renewcommand{\cross}{\baucross} -% \renewcommand{\cross}{\ding{54}} -% \newcommand{\entails}{\models} -% \newcommand{\bigsqcap}{\mathop{\lower.1ex\hbox{\Large$\sqcap$}}} - -% \newcommand{\mdiv}{\texttt{div}} -% \newcommand{\element}{\texttt{element}} -% \newcommand{\alldiff}{\texttt{all\_different}} diff --git a/assets/shorthands.tex b/assets/shorthands.tex index 126bcef..7706213 100644 --- a/assets/shorthands.tex +++ b/assets/shorthands.tex @@ -1,12 +1,12 @@ -\newcommand{\eg}{e.g.,} -\newcommand{\ie}{e.g.,} -\newcommand{\flatzinc}{\gls{flatzinc}} -\newcommand{\microzinc}{\gls{microzinc}} -\newcommand{\minisearch}{\gls{minisearch}} -\newcommand{\minizinc}{\gls{minizinc}} -\newcommand{\nanozinc}{\gls{nanozinc}} -\newcommand{\cml}{\gls{constraint-modelling} language} -\newcommand{\cmls}{\gls{constraint-modelling} languages} +\newcommand{\eg}{e.g.,\xspace{}} +\newcommand{\ie}{e.g.,\xspace{}} +\newcommand{\flatzinc}{\gls{flatzinc}\xspace{}} +\newcommand{\microzinc}{\gls{microzinc}\xspace{}} +\newcommand{\minisearch}{\gls{minisearch}\xspace{}} +\newcommand{\minizinc}{\gls{minizinc}\xspace{}} +\newcommand{\nanozinc}{\gls{nanozinc}\xspace{}} +\newcommand{\cml}{\gls{constraint-modelling} language\xspace{}} +\newcommand{\cmls}{\gls{constraint-modelling} languages\xspace{}} \newcommand{\vari}{\mzninline{var}} \newcommand{\pari}{\mzninline{par}} @@ -19,3 +19,55 @@ \newcommand{\Cbind}{\ensuremath{\wedge}} \newcommand{\true}{\mzninline{true}} \newcommand{\false}{\mzninline{false}} + +\newcommand{\mdiv}{\mzninline{div}} +\newcommand{\element}{\mzninline{element}} +\newcommand{\alldiff}{\mzninline{all_different}} + +% Half-reification math things + +\newcommand{\VV}{{\cal V}} +\newcommand{\PP}{{\cal P}} +\newcommand{\range}[2]{\left[\,#1\,..\,#2\,\right]} +\newcommand{\gfp}{\textup{gfp}} +\newcommand{\lfp}{\textup{lfp}} +\newcommand{\iter}{\mathit{iter}} + +\newcommand{\half}{\Rightarrow} +\newcommand{\full}{\Leftrightarrow} +\renewcommand{\half}{\rightarrow} +\renewcommand{\full}{\leftrightarrow} + +\newcommand{\entails}{\models} +\newcommand{\bigsqcap}{\mathop{\lower.1ex\hbox{\Large$\sqcap$}}} + +\DeclareMathOperator{\rules}{\mathit{rules}} +\DeclareMathOperator{\lazy}{\mathit{lazy}} +\DeclareMathOperator{\events}{\mathit{events}} +\DeclareMathOperator{\domain}{\mathit{domain}} +\DeclareMathOperator{\bc}{\mathit{bc}} +\DeclareMathOperator{\lbc}{\mathit{lbc}} +\DeclareMathOperator{\ubc}{\mathit{ubc}} +\DeclareMathOperator{\dmc}{\mathit{dmc}} +\DeclareMathOperator{\fix}{\mathit{fix}} +\DeclareMathOperator{\event}{\mathit{event}} +\DeclareMathOperator{\minassign}{\mathit{minassign}} +\DeclareMathOperator{\assign}{\mathit{assign}} +\DeclareMathOperator{\cl}{\mathit{cl}} +\DeclareMathOperator{\UP}{\mathit{UP}} +\DeclareMathOperator{\up}{\mathit{up}} +\DeclareMathOperator{\DOM}{\mathit{DOM}} +\DeclareMathOperator{\setb}{\mathit{sb}} +\DeclareMathOperator{\bnd}{\mathit{bnd}} +\DeclareMathOperator{\dsb}{\mathit{dsb}} +\DeclareMathOperator{\vars}{\mathit{vars}} +\DeclareMathOperator{\ivars}{\mathit{input}} +\DeclareMathOperator{\ovars}{\mathit{output}} + +\DeclareMathOperator{\solns}{\mathit{solns}} +\DeclareMathOperator{\solv}{\mathit{solv}} +\DeclareMathOperator{\isolv}{\mathit{isolv}} +\DeclareMathOperator{\conv}{\mathit{conv}} +\DeclareMathOperator{\ran}{\mathit{ran}} +\DeclareMathOperator{\ite}{\mathit{ite}} +\DeclareMathOperator{\VAR}{\mathit{VAR}}