foreign notation: change \bot to \foreign everywhere

[topbloke-formulae.git] / article.tex

diff --git a/article.tex b/article.tex
index 462f4f38ec15a95f7e93cfe2a1a913a00f6cfecc..ffd940fbb32410e9fbf755a4c0615ed31b170f08 100644 (file)
--- a/article.tex
+++ b/article.tex
@@ -90,12 +90,14 @@
 
 \newcommand{\patch}{{\mathcal P}}
 \newcommand{\base}{{\mathcal B}}
-\newcommand{\depsreq}{{\mathcal D}}
+\newcommand{\depsreq}{{\mathcal G}}
 
 \newcommand{\patchof}[1]{\patch ( #1 ) }
 \newcommand{\baseof}[1]{\base ( #1 ) }
 \newcommand{\depsreqof}[1]{\depsreq ( #1 ) }
 
+\newcommand{\foreign}{\bot}
+
 \newcommand{\allpatches}{\Upsilon}
 \newcommand{\assign}{\leftarrow}
 \newcommand{\iassign}{\leftarrow}
@@ -114,22 +116,14 @@
 \newcommand{\hasdirdep}{\succ_{\mkern-7.0mu _1}}
 \newcommand{\hasdep}{\succ}
 \newcommand{\isdep}{\prec}
-\newcommand{\isdirdep}{\prec_{\mkern-7.0mu _1}}
-
-\newcommand{\tipz}{ T^0 }
-\newcommand{\tipc}{ T }
-\newcommand{\tipu}{ T' }
-\newcommand{\tipf}{ T^* }
-
-\newcommand{\tipza}[1]{ \tipz_{#1} }
-\newcommand{\tipca}[1]{ \tipc_{#1} }
-\newcommand{\tipua}[1]{ \tipu_{#1} }
-\newcommand{\tipfa}[1]{ \tipf_{#1} }
+\newcommand{\isdirdep}{\prec_{\mkern-18.0mu _1}{\mkern+10mu}}
 
-\newcommand{\tipzc}{ \tipza \pc }
-\newcommand{\tipcc}{ \tipca \pc }
-\newcommand{\tipuc}{ \tipua \pc }
-\newcommand{\tipfc}{ \tipfa \pc }
+\newcommand{\tip}{ T }
+\newcommand{\tipa}[1]{ \tip^{#1} }
+\newcommand{\tipcn}{ \tipa \pcn }
+\newcommand{\tipcy}{ \tipa \pcy }
+\newcommand{\tipdn}{ \tipa \pdn }
+\newcommand{\tipdy}{ \tipa \pdy }
 
 %\newcommand{\bigforall}{\mathop{\hbox{\huge$\forall$}}}
 \newcommand{\bigforall}{%
@@ -174,6 +168,7 @@
 \input{create-tip.tex}
 \input{anticommit.tex}
 \input{merge.tex}
+\input{pseudomerge.tex}
 
 \chapter{Update strategy}