X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=article.tex;h=701422d9c0157c5b2ad0158bb16ba1fb6beddadb;hb=0ea398fd0deefa25d31fb4caa8903a930aea5cf8;hp=609e0e3138576ccc9377a0968ce4054dd32e24eb;hpb=6768952437fc5b6b4178361ea7fc852c2e4945cd;p=topbloke-formulae.git

diff --git a/article.tex b/article.tex
index 609e0e3..701422d 100644
--- a/article.tex
+++ b/article.tex
@@ -572,23 +572,19 @@ So indeed $L \haspatch \p \land R \haspatch \p \implies C \haspatch \p$.
 
 \subsubsection{For (wlog) $X \not\haspatch \p, Y \haspatch \p$:}
 
-$C \haspatch \p \equiv C \nothaspatch M$.
+$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}