cleanup, extension, and table improvements

1 files changed, 18 insertions, 16 deletions

diff --git a/src/results.i b/src/results.i
index da4d84c..f1a5bd5 100644
--- a/src/results.i
+++ b/src/results.i
@@ -1,21 +1,23 @@
 \input gen/tables.i 
 \font\tablefont=cmr10 at 11pt
-\def\table#1#2{
-  \vbox{\setbox0=\vbox{\halign{&\vrule\strut\hskip3pt\hfil {\tablefont ##}\hfil\hskip3pt\vrule\cr\noalign{\hrule}
-    #1
-  }}\hsize=\wd0\box0\caption{#2}}
+{\offinterlineskip\par}
+\kern -19pt%very hacky, but I don't exactly understand the glue
+\line{%
+    \picturetop{graph/depth_width.png}{Antlions' pits' depths and widths
+    correlate strongly with square root of trial area, meaning that
+    antlions are aware of how to optimally obtain ants for the group.
+    Bigger dots mean more pits of that size in that trial
+    area}{6in}\hfil
+  \picturetop{img/pcr.jpg}{DNA Ladder and PCR tests were used to detect
+  Cytochrome-B gene appearance in a primed DNA mixture from crushed
+  antlions.}{4in}%
 }
-\def\vtable#1#2{
-  \vbox{\line{\hfil{\hsize=2in\valign{&\hrule\vfil\vskip2pt\tablefont\noindent ##\par\vfil\vskip2pt\hrule\cr\noalign{\vrule}
-    #1
-  }}\hfil}\caption{#2}}
-}
-\par\line{\picturetop{graph/depth_width.png}{Antlions' pits' depths and widths correlate strongly with square root of trial area, meaning that antlions are aware of how to optimally obtain ants for the group. Bigger dots mean more pits of that size in that trial area}{6in}\hfil
-  \picturetop{img/pcr.jpg}{DNA Ladder and PCR tests were used to detect Cytochrome-B gene appearance in a primed DNA mixture from crushed antlions.}{4in}
-}
-\kern-1.3in\hbox{
-  \picture{graph/nearest_neighbor.png}{The geometric average of trial edge length correlates closely with nearest neighbor distance, demonstrating consistent spacing by antlions.}{6in}
-  \deaths{Number of Deaths and Pits Successfully Formed in Each Trial/Subtrial}
+\kern-1.3in\line{%
+  \picture{graph/nearest_neighbor.png}{The geometric average of trial
+  edge length correlates closely with nearest neighbor distance,
+  demonstrating consistent spacing by antlions.}{6in}%
+  \hfil
+  {\tablefont\vbox{\deaths\vskip1in}}\hfil%
 }
 
-\territory{The Pit Depths, Widths, and ``Territory,'' Observed in Each Trial}
+\centerline{\territory}