X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=topbloke-formulae.git;a=blobdiff_plain;f=article.tex;h=95e71b9a980038b4ba83c414c7c5c98c875e9140;hp=7bff6920bd91db6129b61de48da10bb779183756;hb=f4b799f5604417c83c799c3ff513864502f5ef67;hpb=6256831867d9cb3c135bbc73dad80db2a8677754

diff --git a/article.tex b/article.tex
index 7bff692..95e71b9 100644
--- a/article.tex
+++ b/article.tex
@@ -5,7 +5,9 @@
 \usepackage{mathabx}
 \usepackage{txfonts}
 \usepackage{amsfonts}
+\usepackage{eufrak}
 \usepackage{mdwlist}
+%\usepackage{lastpage}
 %\usepackage{accents}
 
 \usepackage{fancyhdr}
@@ -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}}
 
@@ -84,15 +91,18 @@
 \newcommand{\pancsof}[2]{\pancs ( #1 , #2 ) }
 \newcommand{\pendsof}[2]{\pends ( #1 , #2 ) }
 
-\newcommand{\commitmerge}{{\mathcal M}}
-\newcommand{\commitmergeof}[4]{\commitmerge(#1,#2,#3,#4)}
+%\newcommand{\commitmerge}{\text{\commitmergename}}
+\newcommand{\commitmergeof}[4]{#1 \has \stmtmergeof{#2}{#3}{#4}}
 %\newcommand{\merge}[4]{{#2 {{\frac{ #1 }{ #3 } #4}}}}
+\newcommand{\commitmergename}{Git Merge}
 
 \newcommand{\patch}{{\mathcal P}}
 \newcommand{\base}{{\mathcal B}}
 \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 ) }
@@ -109,9 +119,9 @@
 \newcommand{\mergeof}[3]{\left\langle #1 \;\middle\langle #2 \middle\rangle\; #3 \right\rangle}
 
 \newcommand{\alg}[1]{\text{\bf #1}}
-\newcommand{\setmerge}{\alg{merge}}
-\newcommand{\setmergeof}[3]{\setmerge\mergeof{#1}{#2}{#3}}
-\newcommand{\stmtmergeof}[3]{\setmerge\mergeof{#1}{#2}{#3}}
+\newcommand{\setmerge}{\mergeof{}{}{}}
+\newcommand{\setmergeof}[3]{\mergeof{#1}{#2}{#3}}
+\newcommand{\stmtmergeof}[3]{\mergeof{#1}{#2}{#3}}
 
 %\newcommand{\setmergeof}[3]{\setmerge\left\lgroup #1 \;\middle\lmoustache\; #2 \;\middle\rmoustache\; #3 \right\rgroup}
 %\newcommand{\setmergeof}[3]{\setmerge\left\rmoustache #1 \middle\rmoustache #2 \middle\lmoustache #3 \right\lmoustache}
@@ -132,6 +142,8 @@
 \newcommand{\tipdn}{ \tipa \pdn }
 \newcommand{\tipdy}{ \tipa \pdy }
 
+\newcommand{\tippy}{ \tipa \py }
+
 %\newcommand{\bigforall}{\mathop{\hbox{\huge$\forall$}}}
 \newcommand{\bigforall}{%
   \mathop{\mathchoice%
@@ -155,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*{}}
@@ -183,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}