X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=article.tex;h=45510aa70d507d9daddd33c5b01306e983f40848;hb=HEAD;hp=5df0d91f722c49c48cd097c47bb1a7f650ab52bd;hpb=8a69195a6c694ebddaf1d383ca0301041b05c2b4;p=topbloke-formulae.git

diff --git a/article.tex b/article.tex
index 5df0d91..45510aa 100644
--- a/article.tex
+++ b/article.tex
@@ -5,11 +5,14 @@
 \usepackage{mathabx}
 \usepackage{txfonts}
 \usepackage{amsfonts}
+\usepackage{eufrak}
 \usepackage{mdwlist}
+\usepackage{hyperref}
+%\usepackage{lastpage}
 %\usepackage{accents}
 
 \usepackage{fancyhdr}
-\pagestyle{fancy}
+\pagestyle{fancyplain}
 \rhead[\rightmark]{}
 \lhead[]{\rightmark}
 \rfoot[\thepage]{\input{revid.inc}}
@@ -38,6 +41,8 @@
           \hidehacktrue\ifhidehack#1\else#2\fi\hidehackfalse}
         \newcommand{\pa}[1]{\hidefromedef{\varmathbb{#1}}{#1}}
 
+\newcommand{\stmt}[1]{\mathfrak{#1}}
+
 \newcommand{\set}[1]{\mathbb{#1}}
 \newcommand{\pay}[1]{\pa{#1}^+}
 \newcommand{\pan}[1]{\pa{#1}^-}
@@ -69,6 +74,9 @@
 %\newcommand{\hasparents}{\underaccent{1}{>}}
 %\newcommand{\hasparents}{{%
 %  \declareslashed{}{_{_1}}{0}{-0.8}{>}\slashed{>}}}
+\newcommand{\hasparent}{>_{\mkern-7.0mu _{1}}}
+\newcommand{\isparent}{<_{\mkern-18.0mu _{1}\mkern+9.0mu}}
+
 \newcommand{\hasparents}{>_{\mkern-7.0mu _{1:}}}
 \newcommand{\areparents}{<_{\mkern-14.0mu _{1:}\mkern+5.0mu}}
 
@@ -85,7 +93,7 @@
 \newcommand{\pendsof}[2]{\pends ( #1 , #2 ) }
 
 %\newcommand{\commitmerge}{\text{\commitmergename}}
-\newcommand{\commitmergeof}[4]{#1 \approx \stmtmergeof{#2}{#3}{#4}}
+\newcommand{\commitmergeof}[4]{#1 \has \stmtmergeof{#2}{#3}{#4}}
 %\newcommand{\merge}[4]{{#2 {{\frac{ #1 }{ #3 } #4}}}}
 \newcommand{\commitmergename}{Git Merge}
 
@@ -94,6 +102,8 @@
 \newcommand{\depsreq}{{\mathcal G}}
 
 \newcommand{\allsrcs}{\set U}
+\newcommand{\allreach}{\set O}
+\newcommand{\allreachof}[1]{\set O^{#1}}
 
 \newcommand{\patchof}[1]{\patch ( #1 ) }
 \newcommand{\baseof}[1]{\base ( #1 ) }
@@ -133,6 +143,9 @@
 \newcommand{\tipdn}{ \tipa \pdn }
 \newcommand{\tipdy}{ \tipa \pdy }
 
+\newcommand{\tippn}{ \tipa \pn }
+\newcommand{\tippy}{ \tipa \py }
+
 %\newcommand{\bigforall}{\mathop{\hbox{\huge$\forall$}}}
 \newcommand{\bigforall}{%
   \mathop{\mathchoice%
@@ -156,6 +169,14 @@
 \newcommand{\proofstarts}{{\it Proof:}}
 \newcommand{\proof}[1]{\proofstarts #1 $\qed$}
 
+\newcommand{\commitproof}[1]{{\bf Proof of commit generation conditions:}
+ #1 $\qed$}
+\newcommand{\condproof}[2]{
+
+{\it #1:} #2
+
+}
+
 \newcommand{\statement}[2]{\[\eqn{ #1 }{ #2 }\]}
 
 \newcommand{\gathbegin}{\begin{gather} \tag*{}}
@@ -184,7 +205,10 @@
 
 \input{strategy.tex}
 \input{ranking.tex}
-\input{trav-alg.tex}
-\input{trav-proofs.tex}
+\input{traversal.tex}
+
+%\AtEndDocument{\par\bigskip\centerline{\Large\bfseries Document ends here}}
+
+\par$\bigboxdot$
 
 \end{document}