X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=topbloke-formulae.git;a=blobdiff_plain;f=article.tex;h=fac5c82efd6483ac6cc865cbd2db836f2d29d81e;hp=b97f7bb606db5b814b129ec5561dc39ef6c62042;hb=13285d550a2eceb866519b89d1ed3c4894f3db65;hpb=c60a10efc12a3c6b09c536c424fc9ca24a167350

diff --git a/article.tex b/article.tex
index b97f7bb..fac5c82 100644
--- a/article.tex
+++ b/article.tex
@@ -490,10 +490,11 @@ We will occasionally use $X,Y$ s.t. $\{X,Y\} = \{L,R\}$.
 }\]
 \[ \eqn{ Merge Ends }{
     X \not\haspatch \p \land
-    Y \haspatch \p \land
-    E \in \pendsof{X}{\py}
-  \implies
+    Y \haspatch \p
+  \implies \left[
+  \bigforall_{E \in \pendsof{X}{\py}}
     E \le Y
+  \right]
 }\]
 
 \subsection{No Replay}
@@ -576,19 +577,15 @@ $C \haspatch \p \equiv M \nothaspatch \p$.
 
 \proofstarts
 
-Merge Ends applies.
+Merge Ends applies.  Recall that we are considering $D \in \py$.
+$D \isin Y \equiv D \le Y$.  $D \not\isin X$.
+We will show for each of
+various cases that $D \isin C \equiv M \nothaspatch \p \land D \le C$
+(which suffices by definition of $\haspatch$ and $\nothaspatch$).
 
-$D \isin Y \equiv D \le Y$.  $D \not\isin X$.  Recall that we
-are considering $D \in \py$.
-
-Consider $D = C$.  Thus $C \in \py, L \in \py$.  
-But $X \not\haspatch \p$ means xxx wip
-But $X \not\haspatch \p$ means $D \not\in X$, 
-
-so we have $L = Y, R =
-X$.  Thus $R \not\haspatch \p$ and by Tip Self Inpatch $R \not\in
-\py$.  Thus by Tip Merge $R \in \pn$ and $M = \baseof{L}$.
-So by Base Acyclic, $M \nothaspatch \py$.  Thus we are expecting 
-$C \haspatch \py$.  And indeed $D \isin C$ and $D \le C$.  OK.
+Consider $D = C$.  Thus $C \in \py, L \in \py$, and by Tip
+Self Inpatch $L \haspatch \p$, so $L=Y, R=X$.  By Tip Merge,
+$M=\baseof{L}$.  So by Base Acyclic $D \not\isin M$, i.e.
+$M \nothaspatch \p$.  And indeed $D \isin C$ and $D \le C$.  OK.
 
 \end{document}