foreign notation: replace "D \text{ s.t. } \isforeign{D}" with "D \in \foreign"

diff --git a/anticommit.tex b/anticommit.tex
index 39d13e5500c4d268375480aa92a623615c8a0a71..b8a3993946b3bdd30ed2ce67672b59b2189f760f 100644 (file)
--- a/anticommit.tex
+++ b/anticommit.tex
@@ -131,7 +131,7 @@ Single Parent Unique Tips applies.  $\qed$
 
 \subsection{Foreign Inclusion}
 
 
 \subsection{Foreign Inclusion}
 

-Consider some $D$ s.t. $\isforeign{D}$.  $D \neq C$.
+Consider some $D \in \foreign$.  $D \neq C$.

 So by Desired Contents $D \isin C \equiv D \isin L$.
 By Foreign Inclusion of $D$ in $L$, $D \isin L \equiv D \le L$.
 
 So by Desired Contents $D \isin C \equiv D \isin L$.
 By Foreign Inclusion of $D$ in $L$, $D \isin L \equiv D \le L$.
 

diff --git a/invariants.tex b/invariants.tex
index 6cebb053d65db879fe6ad327ab58f434bef93d74..bb926ea1f71460e1db981d110bf06078ab818a78 100644 (file)
--- a/invariants.tex
+++ b/invariants.tex
@@ -22,10 +22,10 @@ We maintain these each time we construct a new commit. \\
   \bigforall_{C,\p} C \haspatch \p \implies \pendsof{C}{\py} = \{ T \}
 }\]
 \[\eqn{Foreign Inclusion}{
   \bigforall_{C,\p} C \haspatch \p \implies \pendsof{C}{\py} = \{ T \}
 }\]
 \[\eqn{Foreign Inclusion}{

-  \bigforall_{D \text{ s.t. } \isforeign{D}} D \isin C \equiv D \leq C
+  \bigforall_{D \in \foreign} D \isin C \equiv D \leq C

 }\]
 \[\eqn{Foreign Contents}{
 }\]
 \[\eqn{Foreign Contents}{

-  \bigforall_{C \text{ s.t. } \isforeign{C}}
+  \bigforall_{C \in \foreign}

     D \le C \implies \isforeign{D}
 }\]
 
     D \le C \implies \isforeign{D}
 }\]
 

diff --git a/lemmas.tex b/lemmas.tex
index 83fc3f69d6048a9446271e5e235bc3dcae792afc..b432f9a5b1f21f727c078c9895e98edc3c061cba 100644 (file)
--- a/lemmas.tex
+++ b/lemmas.tex
@@ -175,12 +175,12 @@ $$
   \right]
  \implies
   \left[
   \right]
  \implies
   \left[

-   \bigforall_{D \text{ s.t. } \isforeign{D}}
+   \bigforall_{D \in \foreign}

      D \isin C \equiv D \le C
   \right]
 $$
 \proof{
      D \isin C \equiv D \le C
   \right]
 $$
 \proof{

-Consider some $D$ s.t. $\isforeign{D}$.
+Consider some $D \in \foreign$.

 If $D = C$, trivially true.  For $D \neq C$,
 by Foreign Inclusion of $D$ in $L$, $D \isin L \equiv D \le L$.
 And by Exact Ancestors $D \le L \equiv D \le C$.
 If $D = C$, trivially true.  For $D \neq C$,
 by Foreign Inclusion of $D$ in $L$, $D \isin L \equiv D \le L$.
 And by Exact Ancestors $D \le L \equiv D \le C$.

diff --git a/merge.tex b/merge.tex
index 54f83daf6fe47e93fd22c8b3fc02fd32b468bd06..b43d30fea899e45b07d47c1aae08d67eb2b7ee2a 100644 (file)
--- a/merge.tex
+++ b/merge.tex
@@ -280,7 +280,7 @@ $\qed$
 
 \subsection{Foreign Inclusion}
 
 
 \subsection{Foreign Inclusion}
 

-Consider some $D$ s.t. $\isforeign{D}$.
+Consider some $D \in \foreign$.

 By Foreign Inclusion of $L, M, R$:
 $D \isin L \equiv D \le L$;
 $D \isin M \equiv D \le M$;
 By Foreign Inclusion of $L, M, R$:
 $D \isin L \equiv D \le L$;
 $D \isin M \equiv D \le M$;

diff --git a/pseudomerge.tex b/pseudomerge.tex
index 9318c30cd6e4d72d21d6907631a0ec7ee16e6fe8..0decb5f023c73c701f4d940c0ffc28d923791f54 100644 (file)
--- a/pseudomerge.tex
+++ b/pseudomerge.tex
@@ -25,7 +25,7 @@ but whose contents are exactly those of $L$.
 }\]
 
 \[ \eqn{ Foreign Unaffected }{
 }\]
 
 \[ \eqn{ Foreign Unaffected }{

- \bigforall_{ D \text{ s.t. } \isforeign{D} }
+ \bigforall_{ D \in \foreign }

   \left[ \bigexists_{A \in \set A} D \le A \right]
    \implies
   D \le L
   \left[ \bigexists_{A \in \set A} D \le A \right]
    \implies
   D \le L