chiark
/
gitweb
/
~ian
/
topbloke-formulae.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
27639d3
)
wip merge tip contents
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sun, 11 Mar 2012 08:32:59 +0000
(08:32 +0000)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sun, 11 Mar 2012 08:32:59 +0000
(08:32 +0000)
article.tex
patch
|
blob
|
history
diff --git
a/article.tex
b/article.tex
index 2121fb40c6e678230ff5f2414351aed415409914..72230e331f1aa22869514bcb957aea9525256982 100644
(file)
--- a/
article.tex
+++ b/
article.tex
@@
-638,7
+638,7
@@
And $\patchof{C} = \patchof{L}$
so $L \in \py$ so $L \haspatch \p$. We will use the coherence and
patch inclusion of $C$ as just proved.
so $L \in \py$ so $L \haspatch \p$. We will use the coherence and
patch inclusion of $C$ as just proved.
-Firstly we
prove
$C \haspatch \p$: If $R \in \py$, then $R \haspatch
+Firstly we
show
$C \haspatch \p$: If $R \in \py$, then $R \haspatch
\p$ and by coherence/inclusion $C \haspatch \p$ . If $R \not\in \py$
then by Tip Merge $M = \baseof{L}$ so by Base Acyclic and definition
of $\nothaspatch$, $M \nothaspatch \p$. So by coherence/inclusion $C
\p$ and by coherence/inclusion $C \haspatch \p$ . If $R \not\in \py$
then by Tip Merge $M = \baseof{L}$ so by Base Acyclic and definition
of $\nothaspatch$, $M \nothaspatch \p$. So by coherence/inclusion $C
@@
-650,9
+650,14
@@
We will consider some $D$ and prove the Exclusive Tip Contents form.
$C \haspatch \p$ so by definition of $\haspatch$, $D \isin C \equiv D
\le C$. OK.
$C \haspatch \p$ so by definition of $\haspatch$, $D \isin C \equiv D
\le C$. OK.
-xxx up to here
+\subsubsection{For $D \not\in \py, R \not\in \py$:}
-\subsubsection{For $L \in \py, D \not\in \py, R \in \py$:}
+$D \neq C$. By Tip Contents of $L$,
+$D \isin L \equiv D \isin \baseof{L}$, and by Tip Merge condition,
+$D \isin L \equiv D \isin M$. xxx up to here
+
+
+\subsubsection{For $D \not\in \py, R \in \py$:}
%D \in \py$:}
%D \in \py$:}