internal notation: invent \commitmergename and use it everywhere

[topbloke-formulae.git] / article.tex

diff --git a/article.tex b/article.tex
index 8cb19b26b2b44b5483366bb540723ddb94a8e24a..2253d43bf91abe7088d77607f70bddcd0ac957d6 100644 (file)
--- a/article.tex
+++ b/article.tex
@@ -87,6 +87,7 @@
 \newcommand{\commitmerge}{{\mathcal M}}
 \newcommand{\commitmergeof}[4]{\commitmerge(#1,#2,#3,#4)}
 %\newcommand{\merge}[4]{{#2 {{\frac{ #1 }{ #3 } #4}}}}
+\newcommand{\commitmergename}{${\mathcal M}$}
 
 \newcommand{\patch}{{\mathcal P}}
 \newcommand{\base}{{\mathcal B}}
@@ -106,9 +107,13 @@
 \newcommand{\iassign}{\leftarrow}
 %\newcommand{\assign}{' =}
 
+\newcommand{\mergeof}[3]{\left\langle #1 \;\middle\langle #2 \middle\rangle\; #3 \right\rangle}
+
 \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\mergeof{#1}{#2}{#3}}
+\newcommand{\stmtmergeof}[3]{\setmerge\mergeof{#1}{#2}{#3}}
+
 %\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}