X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=topbloke-formulae.git;a=blobdiff_plain;f=article.tex;h=2ee37593eaec32d49957386b6721ab1fc1c68880;hp=2b54eecf517c70c0cd08522e2c7dad1c9334815f;hb=f5f93d74c204fcd773074e61aa4fac1a3e48aa3c;hpb=8f439786bda0cd262aee087f20fc6322ed7a144f

diff --git a/article.tex b/article.tex
index 2b54eec..2ee3759 100644
--- a/article.tex
+++ b/article.tex
@@ -5,11 +5,13 @@
 \usepackage{mathabx}
 \usepackage{txfonts}
 \usepackage{amsfonts}
+\usepackage{eufrak}
 \usepackage{mdwlist}
+%\usepackage{lastpage}
 %\usepackage{accents}
 
 \usepackage{fancyhdr}
-\pagestyle{fancy}
+\pagestyle{fancyplain}
 \rhead[\rightmark]{}
 \lhead[]{\rightmark}
 \rfoot[\thepage]{\input{revid.inc}}
@@ -38,6 +40,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 +73,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 +92,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}
 
@@ -160,6 +167,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*{}}
@@ -188,7 +203,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}