chiark / gitweb /
strategy: wip
[topbloke-formulae.git] / article.tex
index 740a2bc..8ecdbc3 100644 (file)
@@ -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}
 \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%
 
 \begin{document}
 
+\chapter{Data model}
+
 \input{notation.tex}
 \input{invariants.tex}
 \input{lemmas.tex}
 \input{create-tip.tex}
 \input{anticommit.tex}
 \input{merge.tex}
+
+\chapter{Merge strategy}
+
 \input{strategy.tex}
 
 \end{document}