square voronoi diagrams & cleanup

1 files changed, 7 insertions, 8 deletions

diff --git a/poster/voronoi.tex b/poster/voronoi.tex
index ac24f45..1dc8424 100644
--- a/poster/voronoi.tex
+++ b/poster/voronoi.tex
@@ -1,16 +1,15 @@
 % Images of Voronoi Diagrams with side captions
 
-\def\twopic#1#2#3{%files, size
-  \hbox{\pic{#3}{#1}\pic{#3}{#2}}
+\def\twopic#1#2#3#4{%files, size
+  \hbox{\pdfximage width #3 height #4{#1}\pdfrefximage\pdflastximage\pdfximage width #3 height #4{#2}\pdfrefximage\pdflastximage}
 }
-\newdimen\tmp
-\def\fourpic#1#2#3#4#5{%four files, no caption, individual size
-  \vbox{\twopic{#1}{#2}{#5}\twopic{#3}{#4}{#5}}
+\def\fourpic#1#2#3#4#5#6{%four files, no caption, individual size (wid, hei)
+  \vbox{\twopic{#1}{#2}{#5}{#6}\twopic{#3}{#4}{#5}{#6}}
 }
   
 
 \line{
-  \fourpic{../imgs/2019-10-16.png}{../imgs/2019-10-30.png}{../imgs/2019-12-19.png}{../imgs/2019-12-3.png}{2.5in}
+  \fourpic{../imgs/2019-10-16.png}{../imgs/2019-10-30.png}{../imgs/2019-12-19.png}{../imgs/2019-12-3.png}{2.5in}{2in}
   \hfil
   \vbox{\hsize=5.5in
     \noindent{\bold Individual Trial Voronoi Diagrams}
@@ -20,10 +19,10 @@
     By examination of the Voronoi diagrams in conjunction with measurement of the closest neighboring pit, it was determined that ant\-lions reclude and cannibalize sufficiently to ensure roughly constant habitation density (proving, at least evolutionary, awareness of group strategies like allowing a few ant\-lions to become adults very quickly).
   }
 }
-\vskip.5in
+\vskip.2in
 \line{
   %%Images
-  \vbox to 5in{\fourpic{../imgs/2019-12-19.png}{../imgs/2019-12-20.png}{../imgs/2019-12-3.png}{../imgs/2019-12-5.png}{2.5in}}
+  \vbox to 5in{\fourpic{../imgs/2019-12-19.png}{../imgs/2019-12-20.png}{../imgs/2019-12-3.png}{../imgs/2019-12-5.png}{2.5in}{2in}}
   \hfil
   \vbox to 5in{\hsize=5.5in%
     \noindent{\bold Trial and subtrial Voronoi Diagrams}