notation: strip word "merge" from \setmergeof etc.; use new definition of \commitmerg...

[topbloke-formulae.git] / article.tex

diff --git a/article.tex b/article.tex
index 2253d43bf91abe7088d77607f70bddcd0ac957d6..5df0d91f722c49c48cd097c47bb1a7f650ab52bd 100644 (file)
--- a/article.tex
+++ b/article.tex
@@ -84,10 +84,10 @@
 \newcommand{\pancsof}[2]{\pancs ( #1 , #2 ) }
 \newcommand{\pendsof}[2]{\pends ( #1 , #2 ) }
 
-\newcommand{\commitmerge}{{\mathcal M}}
-\newcommand{\commitmergeof}[4]{\commitmerge(#1,#2,#3,#4)}
+%\newcommand{\commitmerge}{\text{\commitmergename}}
+\newcommand{\commitmergeof}[4]{#1 \approx \stmtmergeof{#2}{#3}{#4}}
 %\newcommand{\merge}[4]{{#2 {{\frac{ #1 }{ #3 } #4}}}}
-\newcommand{\commitmergename}{${\mathcal M}$}
+\newcommand{\commitmergename}{Git Merge}
 
 \newcommand{\patch}{{\mathcal P}}
 \newcommand{\base}{{\mathcal B}}
@@ -110,9 +110,9 @@
 \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\mergeof{#1}{#2}{#3}}
-\newcommand{\stmtmergeof}[3]{\setmerge\mergeof{#1}{#2}{#3}}
+\newcommand{\setmerge}{\mergeof{}{}{}}
+\newcommand{\setmergeof}[3]{\mergeof{#1}{#2}{#3}}
+\newcommand{\stmtmergeof}[3]{\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}