X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=article.tex;h=28bc7143c0aee4db8a4ccbc9bb29ebbb402ead5e;hb=9651f9e883566446133380e0fe39ef695a86c72d;hp=ac351fb6366734cafd90fc5357cc59c7bc267c64;hpb=93658ccf74d659dfcc2f00c6c29928804aa68600;p=topbloke-formulae.git

diff --git a/article.tex b/article.tex
index ac351fb..28bc714 100644
--- a/article.tex
+++ b/article.tex
@@ -1,8 +1,7 @@
-\documentclass[a4paper]{strayman}
+\documentclass[a4paper,leqno]{strayman}
 \let\numberwithin=\notdef
-\usepackage{MnSymbol}
-\usepackage{stmaryrd}
-\usepackage{slashed}
+\usepackage{amsmath}
+\usepackage{mathabx}
 \usepackage{txfonts}
 \usepackage{amsfonts}
 \usepackage{mdwlist}
@@ -14,12 +13,10 @@
 \newcommand{\has}{\sqsupseteq}
 \newcommand{\isin}{\sqsubseteq}
 
-\newcommand{\nothaspatch}{{%
-  \declareslashed{}{\sslash}{-0.04}{0}{\Sqsupset}\slashed{\Sqsupset}}}
-\newcommand{\notpatchisin}{{%
-  \declareslashed{}{\sslash}{-0.04}{0}{\Sqsubset}\slashed{\Sqsubset}}}
-\newcommand{\haspatch}{\Sqsupset}
-\newcommand{\patchisin}{\Sqsubset}
+\newcommand{\nothaspatch}{\mathrel{\,\not\!\not\relax\haspatch}}
+\newcommand{\notpatchisin}{\mathrel{\,\not\!\not\relax\patchisin}}
+\newcommand{\haspatch}{\sqSupset}
+\newcommand{\patchisin}{\sqSubset}
 
 \newcommand{\set}[1]{\mathbb #1}
 \newcommand{\pa}[1]{\varmathbb #1}
@@ -41,6 +38,8 @@
 \newcommand{\pancs}[2]{{\mathcal A} ( #1 , #2 ) }
 \newcommand{\pends}[2]{{\mathcal E} ( #1 , #2 ) }
 
+\renewcommand{\land}{\wedge}
+
 \begin{document}
 
 \section{Notation}
@@ -67,11 +66,29 @@ anticommits, the ``change made'' is only to be thought of as any
 conflict resolution.  This is not a partial order because it is not
 transitive.
 
+\item[ $ \p, \py, \pn $ ]
+A patch $\p$ consists of two sets of commits $\pn$ and $\py$, which
+are respectively the base and tip git branches.  $\p$ may be used
+where the context requires a set, in which case the statement
+is to be taken as applying to both $\py$ and $\pn$.
+All these sets are distinct.
+
+\item[ $ \pancs{C}{\set P} $ ]
+$ \{ A \; | \; A \le C \land A \in \set P \} $ 
+i.e. all the ancestors of $C$
+which are in $\set P$.
+
+\item[ $ \pends{C}{\set P} $ ]
+$ \{ E \; | \; E \in \pancs{C}{\set P}
+  \land \mathop{\not\exists}_{A \in \pancs{C}{\set P}}
+  A \neq E \land E \le A \} $ 
+i.e. all $\le$-maximal commits in $\pancs{C}{\set P}$.
+
 \end{basedescript}
 
 \section{Invariants}
 
-No replay: \[ C \has D \implies C \ge D \]
+\[ C \has D \implies C \ge D \tag*{\mbox{No replay:}} \]
 
 Unique base: \[ \mathop{\forall}_{C \in \py} \pends{C}{\pn} = \{ B \} \]
 
@@ -81,6 +98,10 @@ $ C \haspatch \p $
 
 $ C \nothaspatch \p $
 
+$ \p \patchisin C $
+
+$ \p \notpatchisin C $
+
 $ \{ B \} \areparents C $
 
 \end{document}