strategy: new, wip

[topbloke-formulae.git] / article.tex

diff --git a/article.tex b/article.tex
index 198ced4b05e9700e0a4e5ac41b07e0e8dad1c631..18c75dfb1514c6ca0748097dde557140d89658aa 100644 (file)
--- a/article.tex
+++ b/article.tex
@@ -65,8 +65,8 @@
 %\newcommand{\hasparents}{\underaccent{1}{>}}
 %\newcommand{\hasparents}{{%
 %  \declareslashed{}{_{_1}}{0}{-0.8}{>}\slashed{>}}}
-\newcommand{\hasparents}{>_{\mkern-7.0mu _1}}
-\newcommand{\areparents}{<_{\mkern-14.0mu _1\mkern+5.0mu}}
+\newcommand{\hasparents}{>_{\mkern-7.0mu _{1:}}}
+\newcommand{\areparents}{<_{\mkern-14.0mu _{1:}\mkern+5.0mu}}
 
 \renewcommand{\implies}{\Rightarrow}
 \renewcommand{\equiv}{\Leftrightarrow}
@@ -92,9 +92,32 @@
 \newcommand{\baseof}[1]{\base ( #1 ) }
 \newcommand{\depsreqof}[1]{\depsreq ( #1 ) }
 
+\newcommand{\allpatches}{\Upsilon}
+\newcommand{\assign}{\leftarrow}
+%\newcommand{\assign}{' =}
+
 \newcommand{\eqntag}[2]{ #2 \tag*{\mbox{#1}} }
 \newcommand{\eqn}[2]{ #2 \tag*{\mbox{\bf #1}} }
 
+\newcommand{\hasdirdep}{\succ_{\mkern-7.0mu _1}}
+\newcommand{\hasdep}{\succ}
+\newcommand{\isdep}{\prec}
+
+\newcommand{\tipz}{ T^0 }
+\newcommand{\tipc}{ T }
+\newcommand{\tipu}{ T' }
+\newcommand{\tipf}{ T^* }
+
+\newcommand{\tipza}[1]{ \tipz_{#1} }
+\newcommand{\tipca}[1]{ \tipc_{#1} }
+\newcommand{\tipua}[1]{ \tipu_{#1} }
+\newcommand{\tipfa}[1]{ \tipf_{#1} }
+
+\newcommand{\tipzc}{ \tipza \pc }
+\newcommand{\tipcc}{ \tipca \pc }
+\newcommand{\tipuc}{ \tipua \pc }
+\newcommand{\tipfc}{ \tipfa \pc }
+
 %\newcommand{\bigforall}{\mathop{\hbox{\huge$\forall$}}}
 \newcommand{\bigforall}{%
   \mathop{\mathchoice%
@@ -139,7 +162,7 @@
 \input{anticommit.tex}
 \input{merge.tex}
 
-\chapter{Merge strategy}
+\chapter{Update strategy}
 
 \input{strategy.tex}