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

diff --git a/article.tex b/article.tex
index 714578d..b97f7bb 100644
--- a/article.tex
+++ b/article.tex
@@ -572,14 +572,23 @@ 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.
 
-$D \isin Y \equiv D \le Y$.  $D \not\isin X$.
+$D \isin Y \equiv D \le Y$.  $D \not\isin X$.  Recall that we
+are considering $D \in \py$.
 
-Consider $D = C$.  
+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.
 
 \end{document}