# HG changeset patch
# User Scott Morrison <scott@tqft.net>
# Date 1323746817 28800
# Node ID 0dbaf072e9162e43cd30cc08913980b93c7cf40f
# Parent  87bfea2e3150996cd9055f359d5ca0f543afd352# Parent  d875a8378d83468683f0c3b5fd21cd4f62eb1d24
Automated merge with https://tqft.net/hg/blob

diff -r 87bfea2e3150 -r 0dbaf072e916 sandbox.tex
--- a/sandbox.tex	Mon Dec 12 16:32:10 2011 -0800
+++ b/sandbox.tex	Mon Dec 12 19:26:57 2011 -0800
@@ -9,6 +9,20 @@
 \title{Sandbox}
 \begin{document}
 
+\newcommand{\vertex}{node[circle,fill=black,inner sep=1pt] {}}
+
+\begin{tikzpicture}
+\coordinate (P) at (0,0);
+\coordinate (Q) at (3,0);
+\coordinate (R) at (1.5,-0.5);
+\draw (P) \vertex to[out=40,in=140] node[above] {$a$} (Q) \vertex -- node[below] {\scriptsize $y \times I$} (R) \vertex to[out=-180,in=-40] node[below] {$a$} (P);
+\clip (P) to[out=40,in=140] (Q) -- (R) to[out=-180,in=-40] (P);
+\foreach \x in {1,...,9} {
+	\path (P) to[out=40,in=140] node[pos=\x/10] (PQ\x) {} (Q);
+	\path (P) to[out=-40,in=-180] node[pos=\x/10] (PR\x) {} (R);
+	\draw[green!50!brown] (PQ\x.center) -- (PR\x.center);
+}
+\end{tikzpicture}
 
 \begin{tikzpicture}
 \node[circle,fill=black,inner sep=1pt] (A) at (1.73,0) {};
diff -r 87bfea2e3150 -r 0dbaf072e916 text/appendixes/comparing_defs.tex
--- a/text/appendixes/comparing_defs.tex	Mon Dec 12 16:32:10 2011 -0800
+++ b/text/appendixes/comparing_defs.tex	Mon Dec 12 19:26:57 2011 -0800
@@ -932,6 +932,7 @@
 \begin{align*}
 \mathfig{0.4}{triangle/triangle4a} \\
 \mathfig{0.4}{triangle/triangle4b} \\
+u & =
 \mathfig{0.4}{triangle/triangle4c} 
 \end{align*}
 \nn{remember to change `assoc' to $\alpha$}