X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=topbloke-formulae.git;a=blobdiff_plain;f=article.tex;h=1e7adc26461f2083df2e4199726814428a396255;hp=6ea245aca456a263a6454b654225a2b0d4eb4dfc;hb=588087cf4ec7d7c90cb21ac1b3790b86283ba992;hpb=5dcbf70314a603f304c34e5cdebfc7e6914eb676;ds=sidebyside

diff --git a/article.tex b/article.tex
index 6ea245a..1e7adc2 100644
--- a/article.tex
+++ b/article.tex
@@ -90,7 +90,7 @@
 
 \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 ) }
@@ -101,27 +101,27 @@
 \newcommand{\iassign}{\leftarrow}
 %\newcommand{\assign}{' =}
 
+\newcommand{\alg}[1]{\text{\bf #1}}
+\newcommand{\setmerge}{\alg{merge}}
+\newcommand{\setmergeof}[3]{\setmerge\left\langle #1 \;\middle\langle #2 \middle\rangle\; #3 \right\rangle}
+%\newcommand{\setmergeof}[3]{\setmerge\left\lgroup #1 \;\middle\lmoustache\; #2 \;\middle\rmoustache\; #3 \right\rgroup}
+%\newcommand{\setmergeof}[3]{\setmerge\left\rmoustache #1 \middle\rmoustache #2 \middle\lmoustache #3 \right\lmoustache}
+%\newcommand{\setmergeof}[3]{\setmerge\left\lfloor #1 \middle\lfloor #2 \middle\rfloor #3 \right\rfloor}
+
 \newcommand{\eqntag}[2]{ #2 \tag*{\mbox{#1}} }
 \newcommand{\eqn}[2]{ #2 \tag*{\mbox{\bf #1}} }
 
 \newcommand{\hasdirdep}{\succ_{\mkern-7.0mu _1}}
 \newcommand{\hasdep}{\succ}
 \newcommand{\isdep}{\prec}
-
-\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{\tipzc}{ \tipza \pc }
-\newcommand{\tipcc}{ \tipca \pc }
-\newcommand{\tipuc}{ \tipua \pc }
-\newcommand{\tipfc}{ \tipfa \pc }
+\newcommand{\isdirdep}{\prec_{\mkern-18.0mu _1}{\mkern+10mu}}
+
+\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}{%