chiark
/
gitweb
/
~ian
/
topbloke-formulae.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
ed18b8e
)
strategy: notation: setmerge -> merge
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sun, 27 May 2012 18:48:02 +0000
(19:48 +0100)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sun, 27 May 2012 18:48:02 +0000
(19:48 +0100)
article.tex
patch
|
blob
|
history
diff --git
a/article.tex
b/article.tex
index b38099c11f12c9411590515d639b96e2a984a83d..f52c275f3679ece3236f940fe5b4c98d6a66e163 100644
(file)
--- a/
article.tex
+++ b/
article.tex
@@
-102,7
+102,7
@@
%\newcommand{\assign}{' =}
\newcommand{\alg}[1]{\text{\bf #1}}
%\newcommand{\assign}{' =}
\newcommand{\alg}[1]{\text{\bf #1}}
-\newcommand{\setmerge}{\alg{
set-
merge}}
+\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\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}