28 files changed, 38 insertions, 26 deletions
diff --git a/figs/assymmetry/Makefile b/figs/assymmetry.fig/Makefile
index 704310e..704310e 120000
--- a/figs/assymmetry/Makefile
+++ b/figs/assymmetry.fig/Makefile
diff --git a/figs/assymmetry/assymmetry1.tikz.tex b/figs/assymmetry.fig/assymmetry1.tikz.tex
index d4f7251..d4f7251 100644
--- a/figs/assymmetry/assymmetry1.tikz.tex
+++ b/figs/assymmetry.fig/assymmetry1.tikz.tex
diff --git a/figs/assymmetry/assymmetry2.tikz.tex b/figs/assymmetry.fig/assymmetry2.tikz.tex
index 5877a47..5877a47 100644
--- a/figs/assymmetry/assymmetry2.tikz.tex
+++ b/figs/assymmetry.fig/assymmetry2.tikz.tex
diff --git a/figs/assymmetry/libs/shapes.sty b/figs/assymmetry.fig/libs/shapes.sty
index eaa25c7..eaa25c7 120000
--- a/figs/assymmetry/libs/shapes.sty
+++ b/figs/assymmetry.fig/libs/shapes.sty
diff --git a/figs/cross_packing/Makefile b/figs/cross_packing.fig/Makefile
index 704310e..704310e 120000
--- a/figs/cross_packing/Makefile
+++ b/figs/cross_packing.fig/Makefile
diff --git a/figs/cross_packing/cross_packing_l.tikz.tex b/figs/cross_packing.fig/cross_packing_l.tikz.tex
index db9fb74..eb60e9e 100644
--- a/figs/cross_packing/cross_packing_l.tikz.tex
+++ b/figs/cross_packing.fig/cross_packing_l.tikz.tex
@@ -5,9 +5,9 @@
 
 \begin{document}
 \begin{tikzpicture}
-  \foreach \i in {0,...,3}{
-    \foreach \j in {0,...,3}{
-      \cross{green}{(-2*\j,\j)++(\i,2*\i)}
+  \foreach \k in {0,...,3}{
+    \foreach \l in {0,...,3}{
+      \cross{cyan}{(-2*\l,\l)++(\k,2*\k)}
     }
   }
 \end{tikzpicture}
diff --git a/figs/cross_packing/cross_packing_r.tikz.tex b/figs/cross_packing.fig/cross_packing_r.tikz.tex
index 18db92a..22e1488 100644
--- a/figs/cross_packing/cross_packing_r.tikz.tex
+++ b/figs/cross_packing.fig/cross_packing_r.tikz.tex
@@ -5,9 +5,9 @@
 
 \begin{document}
 \begin{tikzpicture}
-  \foreach \i in {0,...,3}{
-    \foreach \j in {0,...,3}{
-      \cross{teal}{(-\j,2*\j)++(2*\i,\i)}
+  \foreach \k in {0,...,3}{
+    \foreach \l in {0,...,3}{
+      \cross{cyan}{(-\l,2*\l)++(2*\k,\k)}
     }
   }
 \end{tikzpicture}
diff --git a/figs/cross_packing/libs/shapes.sty b/figs/cross_packing.fig/libs/shapes.sty
index eaa25c7..eaa25c7 120000
--- a/figs/cross_packing/libs/shapes.sty
+++ b/figs/cross_packing.fig/libs/shapes.sty
diff --git a/figs/gaunt_fisher/Makefile b/figs/gaunt_fisher.fig/Makefile
index 704310e..704310e 120000
--- a/figs/gaunt_fisher/Makefile
+++ b/figs/gaunt_fisher.fig/Makefile
diff --git a/figs/gaunt_fisher/gaunt_fisher1.tikz.tex b/figs/gaunt_fisher.fig/gaunt_fisher1.tikz.tex
index 9c132f5..9c132f5 100644
--- a/figs/gaunt_fisher/gaunt_fisher1.tikz.tex
+++ b/figs/gaunt_fisher.fig/gaunt_fisher1.tikz.tex
diff --git a/figs/gaunt_fisher/gaunt_fisher2.tikz.tex b/figs/gaunt_fisher.fig/gaunt_fisher2.tikz.tex
index 4bbb433..4bbb433 100644
--- a/figs/gaunt_fisher/gaunt_fisher2.tikz.tex
+++ b/figs/gaunt_fisher.fig/gaunt_fisher2.tikz.tex
diff --git a/figs/gaunt_fisher/gaunt_fisher3.tikz.tex b/figs/gaunt_fisher.fig/gaunt_fisher3.tikz.tex
index d16d0e6..7b7920e 100644
--- a/figs/gaunt_fisher/gaunt_fisher3.tikz.tex
+++ b/figs/gaunt_fisher.fig/gaunt_fisher3.tikz.tex
@@ -5,12 +5,12 @@
 
 \begin{document}
 \begin{tikzpicture}
-  \foreach\i in {2,...,4}{
-    \cross{cyan}{(2*\i,\i)}
-    \cross{cyan}{(5,15)++(\i,-2*\i)}
+  \foreach\k in {2,...,4}{
+    \cross{cyan}{(2*\k,\k)}
+    \cross{cyan}{(5,15)++(\k,-2*\k)}
   }
-  \foreach\i in {1,...,3}{
-    \cross{cyan}{(-5,10)++(2*\i,\i)}
+  \foreach\k in {1,...,3}{
+    \cross{cyan}{(-5,10)++(2*\k,\k)}
   }
   \cross{cyan}{(3,5)}
   \cross{cyan}{(5,9)}
diff --git a/figs/gaunt_fisher/libs/shapes.sty b/figs/gaunt_fisher.fig/libs/shapes.sty
index eaa25c7..eaa25c7 120000
--- a/figs/gaunt_fisher/libs/shapes.sty
+++ b/figs/gaunt_fisher.fig/libs/shapes.sty
diff --git a/figs/hole_example/Makefile b/figs/hole_example.fig/Makefile
index 704310e..704310e 120000
--- a/figs/hole_example/Makefile
+++ b/figs/hole_example.fig/Makefile
diff --git a/figs/hole_example/hole_example_cross.tikz.tex b/figs/hole_example.fig/hole_example_cross.tikz.tex
index f9208e1..f9208e1 100644
--- a/figs/hole_example/hole_example_cross.tikz.tex
+++ b/figs/hole_example.fig/hole_example_cross.tikz.tex
diff --git a/figs/hole_example/hole_example_square.tikz.tex b/figs/hole_example.fig/hole_example_square.tikz.tex
index 4b3fb7c..79962b5 100644
--- a/figs/hole_example/hole_example_square.tikz.tex
+++ b/figs/hole_example.fig/hole_example_square.tikz.tex
@@ -5,6 +5,9 @@
 
 \begin{document}
 \begin{tikzpicture}
+  \ttsquare{black}{(2,1)}
+  \ttsquare{black}{(2,15)}
+
   \foreach\i in {0,...,8}{
     \ttsquare{teal}{(0,2*\i)}
     \ttsquare{teal}{(4,2*\i)}
@@ -15,10 +18,5 @@
     \ttsquare{green}{(2,2*\i+1)}
   }
 
-  \square{black}{(1.5,1.5)}
-  \square{black}{(2.5,1.5)}
-  \square{black}{(1.5,14.5)}
-  \square{black}{(2.5,14.5)}
-
 \end{tikzpicture}
 \end{document}
diff --git a/figs/hole_example/libs/shapes.sty b/figs/hole_example.fig/libs/shapes.sty
index eaa25c7..eaa25c7 120000
--- a/figs/hole_example/libs/shapes.sty
+++ b/figs/hole_example.fig/libs/shapes.sty
diff --git a/figs/interface/Makefile b/figs/interface.fig/Makefile
index 704310e..704310e 120000
--- a/figs/interface/Makefile
+++ b/figs/interface.fig/Makefile
diff --git a/figs/interface/interface.tikz.tex b/figs/interface.fig/interface.tikz.tex
index 86415bf..7429e95 100644
--- a/figs/interface/interface.tikz.tex
+++ b/figs/interface.fig/interface.tikz.tex
@@ -5,15 +5,15 @@
 
 \begin{document}
 \begin{tikzpicture}
-  \foreach\i in {0,...,5}{
-    \cross{teal}{(2*\i,\i)}
-    \cross{teal}{(-\i,2*\i)}
-    \cross{teal}{(-5,10)++(2*\i,\i)}
-    \cross{teal}{(5,15)++(\i,-2*\i)}
+  \foreach\k in {0,...,5}{
+    \cross{teal}{(2*\k,\k)}
+    \cross{teal}{(-\k,2*\k)}
+    \cross{teal}{(-5,10)++(2*\k,\k)}
+    \cross{teal}{(5,15)++(\k,-2*\k)}
   }
-  \foreach\i in {0,...,2}{
-    \foreach\j in {0,...,1}{
-      \cross{green}{(3,5)++(\i,2*\i)++(-2*\j,\j)}
+  \foreach\k in {0,...,2}{
+    \foreach\l in {0,...,1}{
+      \cross{green}{(3,5)++(\k,2*\k)++(-2*\l,\l)}
     }
   }
   \cross{green}{(-1,7)}
diff --git a/figs/interface/libs/shapes.sty b/figs/interface.fig/libs/shapes.sty
index eaa25c7..eaa25c7 120000
--- a/figs/interface/libs/shapes.sty
+++ b/figs/interface.fig/libs/shapes.sty
diff --git a/figs/libs/shapes.sty b/figs/libs/shapes.sty
index 9e4633b..6e9e6ac 100644
--- a/figs/libs/shapes.sty
+++ b/figs/libs/shapes.sty
@@ -12,24 +12,38 @@
 % cross (color #1, position #2)
 \def\cross#1#2{
   \fill[color=#1]#2++(0.5,0.5)--++(0,1)--++(-1,0)--++(0,-1)--++(-1,0)--++(0,-1)--++(1,0)--++(0,-1)--++(1,0)--++(0,1)--++(1,0)--++(0,1)--++(-1,0);
+  \begin{scope}
+    \clip#2++(0.5,0.5)--++(0,1)--++(-1,0)--++(0,-1)--++(-1,0)--++(0,-1)--++(1,0)--++(0,-1)--++(1,0)--++(0,1)--++(1,0)--++(0,1)--++(-1,0);
+    \grid44{[color=white]#2++(-2,-2)}
+  \end{scope}
   \draw[color=black]#2++(0.5,0.5)--++(0,1)--++(-1,0)--++(0,-1)--++(-1,0)--++(0,-1)--++(1,0)--++(0,-1)--++(1,0)--++(0,1)--++(1,0)--++(0,1)--++(-1,0);
 }
 
-
 % 1x1 square (color #1, position #2)
 \def\square#1#2{
   \fill[color=#1]#2++(-0.5,-0.5)--++(0,1)--++(1,0)--++(0,-1)--cycle;
   \draw[color=black]#2++(-0.5,-0.5)--++(0,1)--++(1,0)--++(0,-1)--cycle;
+  \draw[color=white]#2++(-0.5,0)--++(1,0);
+  \draw[color=white]#2++(0,-0.5)--++(0,1);
 }
 
 % 2x2 square (color #1, position #2)
 \def\ttsquare#1#2{
   \fill[color=#1]#2++(-1,-1)--++(0,2)--++(2,0)--++(0,-2)--cycle;
   \draw[color=black]#2++(-1,-1)--++(0,2)--++(2,0)--++(0,-2)--cycle;
+  \draw[color=white]#2++(-1,0)--++(2,0);
+  \draw[color=white]#2++(0,-1)--++(0,2);
+}
+\def\ttsquareempty#1{
+  \draw[color=black]#1++(-1,-1)--++(0,2)--++(2,0)--++(0,-2)--cycle;
 }
 
 % diamond (color #1, position #2)
 \def\diamond#1#2{
   \fill[color=#1]#2++(0,-1)--++(1,1)--++(-1,1)--++(-1,-1)--cycle;
+  \begin{scope}
+    \clip#2++(0,-1)--++(1,1)--++(-1,1)--++(-1,-1)--cycle;
+    \grid22{[color=white]#2++(-1,-1)}
+  \end{scope}
   \draw[color=black]#2++(0,-1)--++(1,1)--++(-1,1)--++(-1,-1)--cycle;
 }
diff --git a/figs/shapes/Makefile b/figs/shapes.fig/Makefile
index 704310e..704310e 120000
--- a/figs/shapes/Makefile
+++ b/figs/shapes.fig/Makefile
diff --git a/figs/shapes/cross.tikz.tex b/figs/shapes.fig/cross.tikz.tex
index f29bf57..bede7cd 100644
--- a/figs/shapes/cross.tikz.tex
+++ b/figs/shapes.fig/cross.tikz.tex
@@ -5,7 +5,7 @@
 
 \begin{document}
 \begin{tikzpicture}
-\grid55{(-2.5,-2.5)}
+\grid44{(-2,-2)}
 \cross{cyan}{(0,0)}
 \end{tikzpicture}
 \end{document}
diff --git a/figs/shapes/diamond.tikz.tex b/figs/shapes.fig/diamond.tikz.tex
index 1deae69..1deae69 100644
--- a/figs/shapes/diamond.tikz.tex
+++ b/figs/shapes.fig/diamond.tikz.tex
diff --git a/figs/shapes/libs/shapes.sty b/figs/shapes.fig/libs/shapes.sty
index eaa25c7..eaa25c7 120000
--- a/figs/shapes/libs/shapes.sty
+++ b/figs/shapes.fig/libs/shapes.sty
diff --git a/figs/sliding/Makefile b/figs/sliding.fig/Makefile
index 704310e..704310e 120000
--- a/figs/sliding/Makefile
+++ b/figs/sliding.fig/Makefile
diff --git a/figs/sliding/libs/shapes.sty b/figs/sliding.fig/libs/shapes.sty
index eaa25c7..eaa25c7 120000
--- a/figs/sliding/libs/shapes.sty
+++ b/figs/sliding.fig/libs/shapes.sty
diff --git a/figs/sliding/sliding.tikz.tex b/figs/sliding.fig/sliding.tikz.tex
index 1951f8b..1951f8b 100644
--- a/figs/sliding/sliding.tikz.tex
+++ b/figs/sliding.fig/sliding.tikz.tex