X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=article.tex;h=eb490e67b4beebceb9a1d34f47ca69b84c41023a;hb=29f2e80b8172eefb43a4dce9fad4070609e22dcf;hp=d5e73b1a7e19da4ee9041dcb04a1bebcf5a7b4d4;hpb=7dc335c17ae313c006e2283a35ca214b213ffcd9;p=topbloke-formulae.git

diff --git a/article.tex b/article.tex
index d5e73b1..eb490e6 100644
--- a/article.tex
+++ b/article.tex
@@ -10,7 +10,10 @@
 
 \usepackage{fancyhdr}
 \pagestyle{fancy}
-\lhead[\rightmark]{}
+\rhead[\rightmark]{}
+\lhead[]{\rightmark}
+\rfoot[\thepage]{\input{revid.inc}}
+\lfoot[\input{revid.inc}]{\thepage}
 
 \let\stdsection\section
 \renewcommand\section{\newpage\stdsection}
@@ -27,6 +30,8 @@
 \newcommand{\notpatchisin}{\mathrel{\,\not\!\not\relax\patchisin}}
 \newcommand{\haspatch}{\sqSupset}
 \newcommand{\patchisin}{\sqSubset}
+%\newcommand{\zhaspatch}{\mathrel{\underset{\fullmoon}\sqSupset}}
+\newcommand{\zhaspatch}{\mathrel{\sqSupset_\varnothing\mkern-4mu}}
 
         \newif\ifhidehack\hidehackfalse
         \DeclareRobustCommand\hidefromedef[2]{%
@@ -41,6 +46,18 @@
 \newcommand{\py}{\pay{P}}
 \newcommand{\pn}{\pan{P}}
 
+\newcommand{\pc}{\pa{C}}
+\newcommand{\pcy}{\pay{C}}
+\newcommand{\pcn}{\pan{C}}
+
+\newcommand{\pd}{\pa{D}}
+\newcommand{\pdy}{\pay{D}}
+\newcommand{\pdn}{\pan{D}}
+
+\newcommand{\pl}{\pa{L}}
+\newcommand{\ply}{\pay{L}}
+\newcommand{\pln}{\pan{L}}
+
 \newcommand{\pq}{\pa{Q}}
 \newcommand{\pqy}{\pay{Q}}
 \newcommand{\pqn}{\pan{Q}}
@@ -52,8 +69,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}
@@ -73,13 +90,38 @@
 
 \newcommand{\patch}{{\mathcal P}}
 \newcommand{\base}{{\mathcal B}}
+\newcommand{\depsreq}{{\mathcal D}}
 
 \newcommand{\patchof}[1]{\patch ( #1 ) }
 \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%
@@ -88,6 +130,13 @@
     {\hbox{\normalsize$\forall$}}%
     {\hbox{\scriptsize$\forall$}}}%
 }
+\newcommand{\bigexists}{%
+  \mathop{\mathchoice%
+    {\hbox{\huge$\exists$}}%
+    {\hbox{\Large$\exists$}}%
+    {\hbox{\normalsize$\exists$}}%
+    {\hbox{\scriptsize$\exists$}}}%
+}
 
 \newcommand{\Largeexists}{\mathop{\hbox{\Large$\exists$}}}
 \newcommand{\Largenexists}{\mathop{\hbox{\Large$\nexists$}}}
@@ -104,6 +153,8 @@
 
 \begin{document}
 
+\chapter{Data model}
+
 \input{notation.tex}
 \input{invariants.tex}
 \input{lemmas.tex}
@@ -115,4 +166,8 @@
 \input{anticommit.tex}
 \input{merge.tex}
 
+\chapter{Update strategy}
+
+\input{strategy.tex}
+
 \end{document}