internal notation: rename \merge and \mergeof to \commitmerge and \commitmergeof...

[topbloke-formulae.git] / article.tex

diff --git a/article.tex b/article.tex
index 67f78900141398a04b4c7aca9dddec33c53190c7..8cb19b26b2b44b5483366bb540723ddb94a8e24a 100644 (file)
--- a/article.tex
+++ b/article.tex
@@ -84,20 +84,22 @@
 \newcommand{\pancsof}[2]{\pancs ( #1 , #2 ) }
 \newcommand{\pendsof}[2]{\pends ( #1 , #2 ) }
 
-\newcommand{\merge}{{\mathcal M}}
-\newcommand{\mergeof}[4]{\merge(#1,#2,#3,#4)}
+\newcommand{\commitmerge}{{\mathcal M}}
+\newcommand{\commitmergeof}[4]{\commitmerge(#1,#2,#3,#4)}
 %\newcommand{\merge}[4]{{#2 {{\frac{ #1 }{ #3 } #4}}}}
 
 \newcommand{\patch}{{\mathcal P}}
 \newcommand{\base}{{\mathcal B}}
 \newcommand{\depsreq}{{\mathcal G}}
 
+\newcommand{\allsrcs}{\set U}
+
 \newcommand{\patchof}[1]{\patch ( #1 ) }
 \newcommand{\baseof}[1]{\base ( #1 ) }
 \newcommand{\depsreqof}[1]{\depsreq ( #1 ) }
 
-\newcommand{\foreign}{\bot}
-\newcommand{\isforeign}[1]{\patchof{#1} = \foreign}
+\newcommand{\foreign}{\pa F}
+\newcommand{\isforeign}[1]{#1 \in \foreign}
 
 \newcommand{\allpatches}{\Upsilon}
 \newcommand{\assign}{\leftarrow}
@@ -149,6 +151,8 @@
 \newcommand{\proofstarts}{{\it Proof:}}
 \newcommand{\proof}[1]{\proofstarts #1 $\qed$}
 
+\newcommand{\statement}[2]{\[\eqn{ #1 }{ #2 }\]}
+
 \newcommand{\gathbegin}{\begin{gather} \tag*{}}
 \newcommand{\gathnext}{\\ \tag*{}}
 
@@ -174,5 +178,8 @@
 \chapter{Update strategy}
 
 \input{strategy.tex}
+\input{ranking.tex}
+\input{trav-alg.tex}
+\input{trav-proofs.tex}
 
 \end{document}