X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=topbloke-formulae.git;a=blobdiff_plain;f=article.tex;h=92092d285d92fc2e228e37e2839a15acf984d11a;hp=462f4f38ec15a95f7e93cfe2a1a913a00f6cfecc;hb=c497f56e8a7f09c4c328bd7560631d8773b7e676;hpb=7e6fe6ed683ada1dd7c118556e22abc900801df5

diff --git a/article.tex b/article.tex
index 462f4f3..92092d2 100644
--- a/article.tex
+++ b/article.tex
@@ -90,12 +90,17 @@
 
 \newcommand{\patch}{{\mathcal P}}
 \newcommand{\base}{{\mathcal B}}
-\newcommand{\depsreq}{{\mathcal D}}
+\newcommand{\depsreq}{{\mathcal G}}
+
+\newcommand{\allsrcs}{\set U}
 
 \newcommand{\patchof}[1]{\patch ( #1 ) }
 \newcommand{\baseof}[1]{\base ( #1 ) }
 \newcommand{\depsreqof}[1]{\depsreq ( #1 ) }
 
+\newcommand{\foreign}{\pa F}
+\newcommand{\isforeign}[1]{#1 \in \foreign}
+
 \newcommand{\allpatches}{\Upsilon}
 \newcommand{\assign}{\leftarrow}
 \newcommand{\iassign}{\leftarrow}
@@ -114,22 +119,14 @@
 \newcommand{\hasdirdep}{\succ_{\mkern-7.0mu _1}}
 \newcommand{\hasdep}{\succ}
 \newcommand{\isdep}{\prec}
-\newcommand{\isdirdep}{\prec_{\mkern-7.0mu _1}}
-
-\newcommand{\tipz}{ T^0 }
-\newcommand{\tipc}{ T }
-\newcommand{\tipu}{ T' }
-\newcommand{\tipf}{ T^* }
+\newcommand{\isdirdep}{\prec_{\mkern-18.0mu _1}{\mkern+10mu}}
 
-\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{\tip}{ T }
+\newcommand{\tipa}[1]{ \tip^{#1} }
+\newcommand{\tipcn}{ \tipa \pcn }
+\newcommand{\tipcy}{ \tipa \pcy }
+\newcommand{\tipdn}{ \tipa \pdn }
+\newcommand{\tipdy}{ \tipa \pdy }
 
 %\newcommand{\bigforall}{\mathop{\hbox{\huge$\forall$}}}
 \newcommand{\bigforall}{%
@@ -154,6 +151,8 @@
 \newcommand{\proofstarts}{{\it Proof:}}
 \newcommand{\proof}[1]{\proofstarts #1 $\qed$}
 
+\newcommand{\statement}[2]{\[\eqn{ #1 }{ #2 }\]}
+
 \newcommand{\gathbegin}{\begin{gather} \tag*{}}
 \newcommand{\gathnext}{\\ \tag*{}}
 
@@ -174,9 +173,13 @@
 \input{create-tip.tex}
 \input{anticommit.tex}
 \input{merge.tex}
+\input{pseudomerge.tex}
 
 \chapter{Update strategy}
 
 \input{strategy.tex}
+\input{ranking.tex}
+\input{trav-alg.tex}
+\input{trav-proofs.tex}
 
 \end{document}