X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=topbloke-formulae.git;a=blobdiff_plain;f=article.tex;h=8ecdbc394a04fde93eadc52bda85d26199fd8174;hp=1302cad6c0bdcdce65a1ee5d1334ce4179e0da5b;hb=e6e07a7cef3baaf2751438efa0b70828ef1b1da5;hpb=0521d8a0c152969d574178683eebc86d9f646754

diff --git a/article.tex b/article.tex
index 1302cad..8ecdbc3 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,10 @@
 \newcommand{\py}{\pay{P}}
 \newcommand{\pn}{\pan{P}}
 
+\newcommand{\pc}{\pa{C}}
+\newcommand{\pcy}{\pay{C}}
+\newcommand{\pcn}{\pan{C}}
+
 \newcommand{\pl}{\pa{L}}
 \newcommand{\ply}{\pay{L}}
 \newcommand{\pln}{\pan{L}}
@@ -56,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}
@@ -77,13 +86,34 @@
 
 \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{\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{\grefz}{ T^0 }
+\newcommand{\grefc}{ T }
+\newcommand{\grefu}{ T' }
+\newcommand{\greff}{ T^* }
+
+\newcommand{\grefza}[1]{ \grefz_{#1} }
+\newcommand{\grefca}[1]{ \grefc_{#1} }
+\newcommand{\grefua}[1]{ \grefu_{#1} }
+\newcommand{\greffa}[1]{ \greff_{#1} }
+
+\newcommand{\grefzc}{ \grefza \pc }
+\newcommand{\grefcc}{ \grefca \pc }
+\newcommand{\grefuc}{ \grefua \pc }
+\newcommand{\greffc}{ \greffa \pc }
+
 %\newcommand{\bigforall}{\mathop{\hbox{\huge$\forall$}}}
 \newcommand{\bigforall}{%
   \mathop{\mathchoice%
@@ -92,6 +122,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$}}}
@@ -108,6 +145,8 @@
 
 \begin{document}
 
+\chapter{Data model}
+
 \input{notation.tex}
 \input{invariants.tex}
 \input{lemmas.tex}
@@ -119,4 +158,8 @@
 \input{anticommit.tex}
 \input{merge.tex}
 
+\chapter{Merge strategy}
+
+\input{strategy.tex}
+
 \end{document}