remove a spurious \newpage

[topbloke-formulae.git] / article.tex

diff --git a/article.tex b/article.tex
index 4af8e0531ea2a659c79755b407b8e6ae7f772a49..763cd820403b748450ebd50a30ef49f816ccf538 100644 (file)
--- a/article.tex
+++ b/article.tex
@@ -157,7 +157,7 @@ See Unique Base, below.
 
 \item[ $ C \haspatch \p $ ]
 $\displaystyle \bigforall_{D \in \py} D \isin C \equiv D \le C $.
-~ Informally, $C$ has the contents of $\p$.
+~ Informally, $C$ has all the reachable contents of $\p$.
 
 \item[ $ C \nothaspatch \p $ ]
 $\displaystyle \bigforall_{D \in \py} D \not\isin C $.
@@ -183,7 +183,7 @@ $\displaystyle D \isin C \equiv
 $
 
 \end{basedescript}
-\newpage
+
 \section{Invariants}
 
 We maintain these each time we construct a new commit. \\
@@ -800,6 +800,9 @@ Merge commits $L$ and $R$ using merge base $M$:
 \end{gather}
 We will occasionally use $X,Y$ s.t. $\{X,Y\} = \{L,R\}$.
 
+This can also be used for dependency re-insertion, by setting
+$L \in \pn$, $R \in \pry$, $M = \baseof{R}$.
+
 \subsection{Conditions}
 \[ \eqn{ Ingredients }{
  M \le L, M \le R
@@ -820,15 +823,15 @@ We will occasionally use $X,Y$ s.t. $\{X,Y\} = \{L,R\}$.
 }\]
 \[ \eqn{ Removal Merge Ends }{
     X \not\haspatch \p \land
-    Y \haspatch \p \land
-    M \haspatch \p
+    M \haspatch \p \land
+    Y \haspatch \p
   \implies
     \pendsof{Y}{\py} = \pendsof{M}{\py}
 }\]
 \[ \eqn{ Addition Merge Ends }{
     X \not\haspatch \p \land
-    Y \haspatch \p \land
-    M \nothaspatch \p
+    M \nothaspatch \p \land
+    Y \haspatch \p
    \implies \left[
     \bigforall_{E \in \pendsof{X}{\py}} E \le Y
    \right]