File reorganization

More makefile-friendly

102 files changed, 570 insertions, 514 deletions

diff --git a/.gitignore b/.gitignore
index 81ad520..d4bc557 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1,5 @@
-*.svg
-*.png
+qr/
 *.pdf
-*.log
-*.csv
-__pycache__
-outputs/*
-imgs/made
-gen/tables.tex
-graph
-Makefile
+gen/
+imgs/
+graph/
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..de7820e
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,77 @@
+.POSIX:
+.SUFFIXES:
+.SUFFIXES: .tex .pdf
+
+PDFTEX = pdftex
+PY = python3
+
+all: report.pdf poster.pdf logbook.pdf
+
+clean:
+	rm -rf report.pdf poster.pdf logbook.pdf qr gen graph imgs
+
+.tex.pdf:
+	$(PDFTEX) -jobname $* $<
+
+qr:
+	mkdir qr
+	qrencode http://hrhr.dev/report.pdf        -o qr/pdf.png
+	qrencode http://git.hrhr.dev/scifair/about -o qr/git.png
+
+report.pdf: report.tex  src/abstract.i src/intro.i src/research.i \
+src/proc.i src/mats.i src/analysis.i src/conc.i report/graphs.i \
+report/tables.i report/pics.i src/biblio.i fmt/doc.h
+
+poster.pdf: poster.tex qr fmt/multicol.h fmt/font.h \
+src/hypo.i src/abstr.i src/research.i src/mats.i src/methods.i \
+poster/voronoi.i src/results.i src/vars.i src/notes.i src/analysis.i \
+poster/img1.i poster/img2.i poster/img3.i poster/img4.i poster/img5.i \
+img/diagram.jpg img/2019-10-18-1.jpg img/2019-12-13-2.jpg \
+img/2019-12-02-2.jpg img/2019-12-13-3.jpg img/2019-10-18-2.jpg \
+img/c.jpg img/2019-12-02-2.jpg img/2019-11-21-4.jpg img/a.jpg \
+img/code.png
+
+logbook.pdf: logbook.tex src/research.i src/biblio.i src/hypo.i \
+src/mats.i src/vars.i src/methods.i src/conc.i src/bullets.i \
+report/tables.i
+
+report.pdf logbook.pdf: img/2019-10-18-1.jpg img/2019-10-18-2.jpg \
+img/2019-10-30-1.jpg img/2019-11-21-1.jpg img/2019-11-21-2.jpg \
+img/2019-11-21-3.jpg img/2019-11-21-4.jpg img/2019-12-02-1.jpg \
+img/2019-12-02-2.jpg img/2019-12-13-1.jpg img/2019-12-13-2.jpg \
+img/2019-12-13-3.rot.jpg
+
+report.pdf poster.pdf logbook.pdf: fmt/com.h imgs graph/made gen/tables.i
+
+imgs: py/data.py py/img.py
+	mkdir -p imgs
+	cd imgs && $(PY) ../py/img.py
+
+gen/dir:
+	mkdir -p gen
+	touch gen/dir
+
+gen/tables.i: tables.orig.tex gen/deathtable gen/table gen/dir
+	sed -e '/%%DEATHTABLE%%/{r gen/deathtable' -e  'd}' \
+	-e '/%%MAINTABLE%%/{r gen/table' -e 'd}' tables.orig.tex >gen/tables.i
+
+gen/deathtable: py/data.py py/deathtable.py gen/dir
+	$(PY) py/deathtable.py > gen/deathtable
+
+gen/table: py/data.py py/table.py gen/dir
+	$(PY) py/table.py > gen/table
+
+graph/dir:
+	mkdir -p graph
+	touch graph/dir
+
+graph/made: graph/depth_width.png graph/nearest_neighbor.png graph/dir
+	touch graph/made
+
+graph/depth_width.png: py/data.py py/depwid.py graph/dir
+	$(PY) py/depwid.py
+	mv depth_width.png graph
+
+graph/nearest_neighbor.png: py/data.py py/neighbor.py graph/dir
+	$(PY) py/neighbor.py
+	mv nearest_neighbor.png graph
diff --git a/Makefile.orig b/Makefile.orig
deleted file mode 100644
index b0a3d3e..0000000
--- a/Makefile.orig
+++ /dev/null
@@ -1,47 +0,0 @@
-.POSIX:
-.SUFFIXES: .tex .pdf
-
-PDFS = poster/document.pdf report/document.pdf logbook/document.pdf
-QR = outputs/qr.png outputs/qr-source.png
-PYTHON = python3
-PDFTEX = pdftex
-GHOSTSCRIPT = gs
-
-pdfs: $(PDFS)
-png: outputs/poster.png
-clean:
-	rm -rf imgs graph gen/tables.tex data/tables.tex $(PDFS) $(QR)
-
-imgs: python/data.py python/img.py
-	mkdir -p imgs
-	cd imgs && \
-	$(PYTHON) ../python/img.py
-
-graph:
-	mkdir -p graph
-
-GRAPH = graph/depth_width.png graph/nearest_neighbor.png
-graph/depth_width.png: python/data.py python/depwid.py graph
-	cd graph && $(PYTHON) ../python/depwid.py
-
-graph/nearest_neighbor.png: python/data.py python/neighbor.py graph
-	cd graph && $(PYTHON) ../python/neighbor.py
-
-outputs/poster.png: poster/document.pdf
-	$(GHOSTSCRIPT) -sDEVICE=pngalpha -r288 -o outputs/poster.png outputs/poster.pdf
-
-$(PDFS): gen/tables.tex imgs $(GRAPH)
-
-.tex.pdf:
-	cd ${@D} && \
-	$(PDFTEX) document.tex
-	rm ${@D}/document.log
-
-poster/document.pdf: outputs/qr-source.png outputs/qr.png
-logbook/document.pdf report/document.pdf: generic.tex
-
-outputs/qr.png:
-	qrencode https://hrhr.dev/report.pdf -o outputs/qr.png
-
-outputs/qr-source.png:
-	qrencode https://git.hrhr.dev/scifair -o outputs/qr-source.png
diff --git a/configure b/configure
deleted file mode 100755
index 2e56ed4..0000000
--- a/configure
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-
-python3 --version >/dev/null || ( echo "Install python3" && exit 1 )
-pdftex --version >/dev/null || ( echo "Install pdftex (TeXLive)" && exit 1 )
-make -v >/dev/null || ( echo "Install make" && exit 1 )
-python -c "import numpy" >/dev/null || ( echo "Install numpy" && exit 1 )
-python -c "import scipy" >/dev/null || ( echo "Install scipy" && exit 1 )
-python -c "import matplotlib" >/dev/null || ( echo "Install matplotlib" && exit 1 )
-gs --version >/dev/null || echo "Ghostscript not installed (no PNG poster)"
-
-cp Makefile.orig Makefile
-
-for tgt in */document.tex; do
-    DIR=$(dirname $tgt)
-    ( echo -en "\n${DIR}/document.pdf: ${DIR}/document.tex "; find $DIR \!\
- -type d \! -name "document.tex" -a -name "*.tex" -exec echo {} +; ) >> Makefile
-done
-
-for gen in gen/*.orig.tex; do
-    BASE=$(basename $gen .orig.tex)
-    echo "gen/${BASE}.tex: gen/make${BASE}.sh gen/${BASE}.orig.tex" >> Makefile
-    echo -e "\t$<\n" >> Makefile
-done
diff --git a/data/mats.tex b/data/mats.tex
deleted file mode 100644
index 4f3965e..0000000
--- a/data/mats.tex
+++ /dev/null
@@ -1,18 +0,0 @@
-\newcount\list \list=0
-\def\item{\advance\list by 1\relax\pre{\the\list.}}
-
-{\obeylines
-\item 32x32 container
-\item Cardboard barriers to reduce the 32x33 container to a 24x24, 16x16, and 8x7 space
-\item 4 bags of quartz sand (200 pounds of sand)
-\item 40 antlions
-\item 41 circular containers, roughly 6 inches in diameter
-\item Meter stick
-\item 40 toothpicks
-\item Tape
-\item Ruler
-\item 160 ants
-\item Small plastic cup at about 2 inches in diameter
-\item Sharpie
-\item Sieve
-}
diff --git a/data/research.tex b/data/research.tex
deleted file mode 120000
index b465725..0000000
--- a/data/research.tex
+++ /dev/null
@@ -1 +0,0 @@
-../poster/research.tex
\ No newline at end of file
diff --git a/fmt/com.h b/fmt/com.h
new file mode 100644
index 0000000..0363798
--- /dev/null
+++ b/fmt/com.h
@@ -0,0 +1,25 @@
+%% links
+
+\def\link#1{%
+  \penalty-500%
+  \pdfstartlink
+    user{/Subtype /Link
+    /Border [ 0 0 0 ]
+    /A <<
+      /Type /Action
+      /S /URI
+      /URI (#1)
+    >>}%
+    {\tt \color{blue} #1}%
+  \pdfendlink
+}
+
+%% the godly `pre`
+
+\def\pre#1{\par\leavevmode\llap{\hbox to \parindent{\hfil #1 \hfil}}}
+
+%% gives image files surrounding stretch
+\newskip\imgskipamount
+\def\imgskip{\vskip\imgskipamount}
+\imgskipamount=0pt plus 48pt
+\def\image #1 {\imgskip\input #1\imgskip}
diff --git a/generic.tex b/fmt/doc.h
index 1001524..85cb134 100644
--- a/generic.tex
+++ b/fmt/doc.h
@@ -2,43 +2,18 @@
 
 \input color %blue links!
 
-%% Links
-\def\link#1{%
-  \pdfstartlink
-    user{/Subtype /Link
-    /Border [ 0 0 0 ]
-    /A <<
-      /Type /Action
-      /S /URI
-      /URI (#1)
-    >>}%
-    {\tt \color{blue} #1}%
-  \pdfendlink
-}
+\input fmt/font.h
 
 %% Fonts
-\font\fourteenbf=ptmb7t at 14pt
-\font\fourteenrm=ptmb7t at 14pt
-\font\twelverm=ptmr7t at 12pt
+\font\fourteenbf=ptmb at 14pt
+\font\fourteenrm=ptmb at 14pt
+\font\twelverm=ptmr at 12pt
+
+\spacing=120
 
 %% Sectioning
 \def\titlesub#1#2{\centerline{\fourteenbf #1}\centerline{#2}\bigskip}
-\def\section#1\par{\thesection{#1:}}
-\def\thesection#1{\vskip .3\hsize\goodbreak\vskip -.3\hsize\bigskip\noindent{\fourteenrm#1}}
-
-%% Modular Sections
-\def\include#1;#2\par{\section #1\par\par\input #2\relax}
-\def\sinclude#1;#2\par{\subsection #1\par\par\input #2\relax}
-
-%% Bullet Points and Numbering
-\def\pre#1{\par\leavevmode\llap{\hbox to \parindent{\hfil #1 \hfil}}}
-
-%% Pictures
-\newcount\pics \pics=0
-\def\pic#1#2{\pdfximage width #1{#2}\pdfrefximage\pdflastximage}
-\def\caption#1{\def\a{#1}\ifx\a\empty\else\line{\vbox{\smallskip\leftskip=0pt plus 1fill\rightskip=0pt plus 1fill\parindent=0pt\relax Fig \number\pics: #1\bigskip}}\fi}
-\def\picture#1#2{\def\a{#2}\ifx\a\empty\else\advance\pics by 1\fi\vbox{\centerline{\pic{5in}{#1}}\caption{#2}}}
-\def\twopicture#1#2#3{\def\a{#3}\ifx\a\empty\else\advance\pics by 1\fi\vbox{\line{\pic{3in}{#1}\hfil\pic{3in}{#2}}\caption{#3}}}
+\def\section#1{\vskip .3\hsize\goodbreak\vskip -.3\hsize\bigskip\noindent{\fourteenrm #1:}\par}
 
 %% Table
 \def\table#1{
@@ -53,3 +28,10 @@
   }}\hfil}}
   }
 }
+
+%% Pictures
+\newcount\pics
+\def\pic#1#2{\pdfximage width #1{#2}\pdfrefximage\pdflastximage}
+\def\caption#1{\def\a{#1}\ifx\a\empty\else\line{\vbox{\smallskip\leftskip=0pt plus 1fill\rightskip=0pt plus 1fill\parindent=0pt\relax Fig \number\pics: #1\bigskip}}\fi}
+\def\picture#1#2{\def\a{#2}\ifx\a\empty\else\advance\pics by 1\fi\vbox{\centerline{\pic{5in}{#1}}\caption{#2}}}
+\def\twopicture#1#2#3{\def\a{#3}\ifx\a\empty\else\advance\pics by 1\fi\vbox{\line{\pic{3in}{#1}\hfil\pic{3in}{#2}}\caption{#3}}}
diff --git a/fmt/font.h b/fmt/font.h
new file mode 100644
index 0000000..54d4b54
--- /dev/null
+++ b/fmt/font.h
@@ -0,0 +1,50 @@
+%% Fonts
+\newcount\thespacing
+\newdimen\size
+\begingroup
+  \edef\specialAt{{ \string a\string t }}%
+  \def\x#1{%
+    \def\getfontsize##1=##2{% The user level macro
+      \expandafter\getfontsizE\fontname##2#1\relax{##1}%
+    }%
+    \def\getfontsizE##1#1##2\relax##3{%
+      \ifx*##2*% Loaded at designsize
+        \begingroup
+          \font\tmpfont"##1" scaled 2000
+          \getfontsize\dimen0=\tmpfont
+          \divide\dimen0 by 2
+          \expandafter
+        \endgroup
+        \expandafter\getfontsiZe\the\dimen0\relax{##3}%
+      \else% Otherwise #2 holds the size. But is is followed by " at ", so we have to strip that
+        \getfontsiZE{##3}##2%
+      \fi
+    }%
+    \def\getfontsiZE##1##2#1{##1=##2}% Strip " at "
+    \def\getfontsiZe##1\relax##2{##2=##1}
+  }
+  \expandafter\expandafter\expandafter
+\endgroup
+\expandafter\x\specialAt % From StackOverflow
+{
+\catcode`\@=11
+
+\global\let\f@nt\font
+
+\gdef\spacing{
+    \afterassignment\adjs \thespacing}
+\gdef\adjs{%adjust spacing
+    \baselineskip=\size \multiply\baselineskip by \thespacing
+    \divide\baselineskip by 100\relax}
+
+\gdef\font#1{%
+    \def\orig{#1}\edef\realname{\csname\string#1@font\endcsname}
+    \afterassignment\xfont
+    \expandafter\f@nt\realname
+}
+\gdef\xfont{
+    \expandafter\getfontsize\expandafter\dimen0\expandafter=\realname
+    \expandafter\expandafter\expandafter\def
+    \expandafter\orig\expandafter{\realname\size\dimen0\adjs}
+}
+}
diff --git a/fmt/multicol.h b/fmt/multicol.h
new file mode 100644
index 0000000..1c45047
--- /dev/null
+++ b/fmt/multicol.h
@@ -0,0 +1,35 @@
+% Requires \newdimen\gap, \newcount\cols, adjusts to \newdimen\width
+
+\newdimen\fullhsize\fullhsize=\width \advance\fullhsize by -2in%1 in margin
+\def\fullline{\hbox to \fullhsize}%%modify \makeheadline\makefootline
+\def\widthline{\hbox to \width}
+\def\fullcenter#1{\fullline{\hfil #1\hfil}}
+\def\makeheadline{\vbox to 0pt{\vskip -22.5pt \fullline{%
+    \vbox to 8.5pt{}\the\headline}\vss}\nointerlineskip}
+\def\makefootline{\baselineskip24pt\lineskiplimit0pt \fullline{\the%
+    \footline}}
+\newcount\defs\defs=\cols\advance\defs by -1
+\hsize=\fullhsize \divide\hsize by \cols\advance\hsize by -\gap
+
+\newcount\col
+\let\isnum\ifnum
+\def\newb@x{\alloc@4\box\chardef\insc@unt}
+
+\loop\expandafter\newb@x\csname col\number\col\endcsname\advance\col
+    by 1\isnum\col<\defs\repeat
+\col=0
+\output={%
+\ifnum\col<\defs
+\expandafter\global\expandafter\setbox\csname col\number\col\endcsname\fullbox
+\global\advance\col by 1%
+\else \global\col=0\shipout\vbox{\makeheadline
+    \fullline{%
+        \loop\isnum\col<\defs\expandafter\box\csname col\number\col\endcsname\hfil
+        \advance\col by 1\repeat\fullbox}
+    \makefootline}
+\fi
+\ifnum\outputpenalty>-20000 \else\dosupereject\fi
+}
+\def\fullbox{\hbox{{\expandafter}\expandafter\ifx\csname color\endcsname\relax%is color defined?
+\else\colorbox{colo}{\columnbox}\fi}}
+\def\columnbox{\leftline{\vbox to \vsize{\vfil}\pagebody}}
diff --git a/gen/maketables.sh b/gen/maketables.sh
deleted file mode 100755
index 5108907..0000000
--- a/gen/maketables.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-export TABLE=`mktemp`
-export DEATHTABLE=`mktemp`
-python python/deathtable.py > $DEATHTABLE
-python python/table.py > $TABLE
-sed -e "/%%DEATHTABLE%%/{r $DEATHTABLE" -e "d}" -e "/%%MAINTABLE%%/{r $TABLE" -e "d}" <gen/tables.orig.tex >gen/tables.tex
-rm $DEATHTABLE $TABLE
diff --git a/photos/2019-10-18-1.jpg b/img/2019-10-18-1.jpg
index 051ccd2..051ccd2 100644
--- a/photos/2019-10-18-1.jpg
+++ b/img/2019-10-18-1.jpg
diff --git a/photos/2019-10-18-2.jpg b/img/2019-10-18-2.jpg
index 74e285e..74e285e 100644
--- a/photos/2019-10-18-2.jpg
+++ b/img/2019-10-18-2.jpg
diff --git a/photos/2019-10-30-1.jpg b/img/2019-10-30-1.jpg
index 4f3a004..4f3a004 100644
--- a/photos/2019-10-30-1.jpg
+++ b/img/2019-10-30-1.jpg
diff --git a/photos/2019-11-21-1.jpg b/img/2019-11-21-1.jpg
index f9fdf23..f9fdf23 100644
--- a/photos/2019-11-21-1.jpg
+++ b/img/2019-11-21-1.jpg
diff --git a/photos/2019-11-21-2.jpg b/img/2019-11-21-2.jpg
index 028ca71..028ca71 100644
--- a/photos/2019-11-21-2.jpg
+++ b/img/2019-11-21-2.jpg
diff --git a/photos/2019-11-21-3.jpg b/img/2019-11-21-3.jpg
index d0ad733..d0ad733 100644
--- a/photos/2019-11-21-3.jpg
+++ b/img/2019-11-21-3.jpg
diff --git a/photos/2019-11-21-4.jpg b/img/2019-11-21-4.jpg
index 8821ff6..8821ff6 100644
--- a/photos/2019-11-21-4.jpg
+++ b/img/2019-11-21-4.jpg
diff --git a/photos/2019-12-02-1.jpg b/img/2019-12-02-1.jpg
index 029ab62..029ab62 100644
--- a/photos/2019-12-02-1.jpg
+++ b/img/2019-12-02-1.jpg
diff --git a/photos/2019-12-02-2.jpg b/img/2019-12-02-2.jpg
index 5ee1a72..5ee1a72 100644
--- a/photos/2019-12-02-2.jpg
+++ b/img/2019-12-02-2.jpg
diff --git a/photos/2019-12-13-1.jpg b/img/2019-12-13-1.jpg
index 3d86c44..3d86c44 100644
--- a/photos/2019-12-13-1.jpg
+++ b/img/2019-12-13-1.jpg
diff --git a/photos/2019-12-13-2.jpg b/img/2019-12-13-2.jpg
index fc958c0..fc958c0 100644
--- a/photos/2019-12-13-2.jpg
+++ b/img/2019-12-13-2.jpg
diff --git a/photos/2019-12-13-3.jpg b/img/2019-12-13-3.jpg
index f0dce4d..f0dce4d 100644
--- a/photos/2019-12-13-3.jpg
+++ b/img/2019-12-13-3.jpg
diff --git a/photos/2019-12-13-3.rot.jpg b/img/2019-12-13-3.rot.jpg
index d0fd0d8..d0fd0d8 100644
--- a/photos/2019-12-13-3.rot.jpg
+++ b/img/2019-12-13-3.rot.jpg
diff --git a/photos/a.jpg b/img/a.jpg
index e8acaa3..e8acaa3 100644
--- a/photos/a.jpg
+++ b/img/a.jpg
diff --git a/photos/c.jpg b/img/c.jpg
index b6bd442..b6bd442 100644
--- a/photos/c.jpg
+++ b/img/c.jpg
diff --git a/photos/code.png b/img/code.png
index 313350e..313350e 100644
--- a/photos/code.png
+++ b/img/code.png
diff --git a/photos/diagram.jpg b/img/diagram.jpg
index 3bf88a6..3bf88a6 100644
--- a/photos/diagram.jpg
+++ b/img/diagram.jpg
diff --git a/photos/pcr.jpg b/img/pcr.jpg
index 7607799..7607799 100644
--- a/photos/pcr.jpg
+++ b/img/pcr.jpg
diff --git a/logbook.tex b/logbook.tex
new file mode 100644
index 0000000..1efbc22
--- /dev/null
+++ b/logbook.tex
@@ -0,0 +1,69 @@
+% Should generate a logbook and replace assets/logbook.pdf
+
+\input fmt/doc.h
+\input fmt/com.h
+\let\bf\fourteenbf
+\let\bold\bf
+\def\abreak{\bigbreak\filbreak\medbreak}
+\twelverm\baselineskip=14pt
+
+\noindent{\bf Background Research:}
+
+\input src/research.i
+
+  \abreak
+
+{\input src/biblio.i\relax}
+
+  \abreak
+
+\input src/hypo.i
+
+  \abreak
+
+\noindent{\bf Materials:}
+
+\input src/mats.i
+
+  \abreak
+
+\noindent{\bf Independent and Dependent Variables:}
+
+\input src/vars.i
+
+  \abreak
+
+\noindent{\bf Procedure:}
+
+\input src/methods.i
+
+  \abreak
+
+\noindent{\bf Graphs:}
+
+\twopicture{imgs/2019-10-16.png}{imgs/2019-10-30.png}{}
+\twopicture{imgs/2019-12-3.png}{imgs/2019-12-5.png}{}
+\twopicture{imgs/2019-12-19.png}{imgs/2019-12-20.png}{Voronoi diagrams showing the territory of each antlion that formed a pit and well as the location, depth, and width of each pit}
+
+\picture{graph/depth_width.png}{Shows pit depth and width in relation to the square root of the trial area (bigger dots mean more pits of that size)}
+\picture{graph/nearest_neighbor.png}{Shows the average nearest neighbor calculation for each trial group in relation to the square root of trial area, to create a ratio}
+
+\abreak
+
+\noindent{\bf Tables:}
+
+\input report/tables.i
+
+  \abreak
+
+\noindent{\bf Conclusion:}
+
+\input src/conc.i
+
+  \abreak
+
+\noindent{\bf Experimental Notes:}
+
+\input src/bullets.i
+
+\bye
diff --git a/logbook/biblio.tex b/logbook/biblio.tex
deleted file mode 120000
index 6af3002..0000000
--- a/logbook/biblio.tex
+++ /dev/null
@@ -1 +0,0 @@
-../data/biblio.tex
\ No newline at end of file
diff --git a/logbook/bulletnotes.tex b/logbook/bulletnotes.tex
deleted file mode 120000
index 6700a16..0000000
--- a/logbook/bulletnotes.tex
+++ /dev/null
@@ -1 +0,0 @@
-../data/bulletnotes.tex
\ No newline at end of file
diff --git a/logbook/conclusion.tex b/logbook/conclusion.tex
deleted file mode 120000
index a48f6b7..0000000
--- a/logbook/conclusion.tex
+++ /dev/null
@@ -1 +0,0 @@
-../data/conclusion.tex
\ No newline at end of file
diff --git a/logbook/datatables.tex b/logbook/datatables.tex
deleted file mode 120000
index bc02edd..0000000
--- a/logbook/datatables.tex
+++ /dev/null
@@ -1 +0,0 @@
-../gen/tables.tex
\ No newline at end of file
diff --git a/logbook/document.tex b/logbook/document.tex
deleted file mode 100644
index 9b019f3..0000000
--- a/logbook/document.tex
+++ /dev/null
@@ -1,68 +0,0 @@
-% Should generate a logbook and replace assets/logbook.pdf
-
-\input ../generic
-\let\bf\fourteenbf
-\let\bold\bf
-\def\abreak{\bigbreak\filbreak\medbreak}
-\twelverm\baselineskip=14pt
-
-\noindent{\bf Background Research:}
-
-\input research
-
-  \abreak
-
-{\input biblio\relax}
-
-  \abreak
-
-\input hypothesis
-
-  \abreak
-
-\noindent{\bf Materials:}
-
-\input mats
-
-  \abreak
-
-\noindent{\bf Independent and Dependent Variables:}
-
-\input vars
-
-  \abreak
-
-\noindent{\bf Procedure:}
-
-\input methods
-
-  \abreak
-
-\noindent{\bf Graphs:}
-
-\twopicture{../imgs/2019-10-16.png}{../imgs/2019-10-30.png}{}
-\twopicture{../imgs/2019-12-3.png}{../imgs/2019-12-5.png}{}
-\twopicture{../imgs/2019-12-19.png}{../imgs/2019-12-20.png}{Voronoi diagrams showing the territory of each antlion that formed a pit and well as the location, depth, and width of each pit}
-
-\picture{../graph/depth_width.png}{Shows pit depth and width in relation to the square root of the trial area (bigger dots mean more pits of that size)}
-\picture{../graph/nearest_neighbor.png}{Shows the average nearest neighbor calculation for each trial group in relation to the square root of trial area, to create a ratio}
-
-  \abreak
-
-\noindent{\bf Tables:}
-
-\input datatables
-
-  \abreak
-
-\noindent{\bf Conclusion:}
-
-\input conclusion
-
-  \abreak
-
-\noindent{\bf Experimental Notes:}
-
-\input bulletnotes
-
-\bye
diff --git a/logbook/hypothesis.tex b/logbook/hypothesis.tex
deleted file mode 120000
index e68c480..0000000
--- a/logbook/hypothesis.tex
+++ /dev/null
@@ -1 +0,0 @@
-../data/hypothesis.tex
\ No newline at end of file
diff --git a/logbook/mats.tex b/logbook/mats.tex
deleted file mode 120000
index a26eab7..0000000
--- a/logbook/mats.tex
+++ /dev/null
@@ -1 +0,0 @@
-../data/mats.tex
\ No newline at end of file
diff --git a/logbook/methods.tex b/logbook/methods.tex
deleted file mode 120000
index 0c21b77..0000000
--- a/logbook/methods.tex
+++ /dev/null
@@ -1 +0,0 @@
-../data/methods.tex
\ No newline at end of file
diff --git a/logbook/research.tex b/logbook/research.tex
deleted file mode 120000
index c2dc7cd..0000000
--- a/logbook/research.tex
+++ /dev/null
@@ -1 +0,0 @@
-../data/research.tex
\ No newline at end of file
diff --git a/logbook/vars.tex b/logbook/vars.tex
deleted file mode 120000
index 1e97452..0000000
--- a/logbook/vars.tex
+++ /dev/null
@@ -1 +0,0 @@
-../data/vars.tex
\ No newline at end of file
diff --git a/outputs/document.pdf b/outputs/document.pdf
deleted file mode 120000
index e00fe07..0000000
--- a/outputs/document.pdf
+++ /dev/null
@@ -1 +0,0 @@
-../logbook/document.pdf
\ No newline at end of file
diff --git a/outputs/poster.pdf b/outputs/poster.pdf
deleted file mode 120000
index 471dfbf..0000000
--- a/outputs/poster.pdf
+++ /dev/null
@@ -1 +0,0 @@
-../poster/document.pdf
\ No newline at end of file
diff --git a/outputs/report.pdf b/outputs/report.pdf
deleted file mode 120000
index e556b83..0000000
--- a/outputs/report.pdf
+++ /dev/null
@@ -1 +0,0 @@
-../report/document.pdf
\ No newline at end of file
diff --git a/poster.tex b/poster.tex
new file mode 100644
index 0000000..9ddb28a
--- /dev/null
+++ b/poster.tex
@@ -0,0 +1,109 @@
+%% Formatting %%
+\newdimen\gap\gap=.5in
+\newcount\cols\cols=4
+\newdimen\vskp\vskp=4.3in
+\newdimen\botmarg\botmarg=1in
+
+\pdfpagewidth=48in
+\newdimen\width\width=\pdfpagewidth
+\pdfpageheight=36in\vsize=\pdfpageheight
+\voffset=\vskp\advance\voffset by -1in
+\advance\vsize by -\vskp\advance\vsize by -\botmarg
+\catcode`\@11
+\input fmt/font.h
+\input fmt/multicol.h
+\input fmt/com.h
+\input color
+\fboxsep=0pt
+\input poster/palette.h
+
+%% pictures
+
+\newcount\pics
+\def\pic#1#2{\pdfximage width #1{#2}\pdfrefximage\pdflastximage}
+\def\caption#1{\def\a{#1}\ifx\a\empty\else\global\advance\pics by 1\line{\vbox{\baselineskip=18pt\smallskip\leftskip=0pt plus 1fill\rightskip=0pt plus 1fill\parindent=0pt\relax Fig \number\pics: #1\bigskip}}\fi}
+\def\picture#1#2#3{\vbox{\pic{#3}{#1}\hsize=#3\caption{#2}}}
+\def\picturetop#1#2#3{\vtop{\pic{#3}{#1}\hsize=#3\caption{#2}}}
+
+\def\section#1{{%
+    \leftskip0pt\rightskip\leftskip\noindent\colorbox{section}{%
+        \vbox{%
+            \vskip5pt%
+            \centerline{\head\color{sectiontext}#1}%
+            \vskip10pt%
+        }%
+    }%
+    \bigbreak
+}\noindent}
+\def\incl#1#2{\penalty-500\section{#1}\input #2\bigbreak}
+
+\catcode`\@13
+
+%% particularly hairy \makeheadline code
+
+\def\makeheadline{\vbox to 0pt{\vskip -\vskp
+    \hbox to 0pt{%
+        \hskip-1in\colorbox{head}{%
+            \widthline{%
+                \vbox to \vskp{}\the\headline}
+            }
+        \hss}
+    \vss}
+\nointerlineskip}
+
+\def\bf{\fam\bffam\bftext}
+\def\it{\fam\itfam\ittext}
+\def\rm{\fam0\rmtext}
+\font\title=cmss10 at 72pt
+\font\sub=cmss10 at 48pt
+\font\head=cmb10 at 24pt
+\font\etrm=cmr10 at 18pt
+\font\etbf=cmb10 at 18pt
+\font\etit=cmmi10 at 18pt
+\def\text{\let\bftext\etbf\let\ittext\etit\let\rmtext\etrm\rm}
+
+\parindent=.5in
+\spacing=110
+\text
+\nopagenumbers
+\pagecolor{page}
+\leftskip=12pt\rightskip=\leftskip
+
+%% Document %%
+
+\headline={%
+    \hbox to 0pt{\widthline{%
+        \pdfximage height \vskp{qr/git.png}\pdfrefximage\pdflastximage
+        \hfil
+        \pdfximage height \vskp{qr/pdf.png}\pdfrefximage\pdflastximage
+    }\hss}
+    \widthline{\vbox{\vskip 1in%
+        \color{title}
+        \fullcenter{%
+            \title Antlions' Group Distribution and Behavior under
+            Varying Spatial Constraints}
+        \vskip.5in
+        \fullcenter{\sub Holden Rohrer and Radeen Dixon}
+        \fullline{\sub\hskip0pt plus .2fil
+            Source Code\hfil Report Full Text
+            \hskip0pt plus .2fil}
+        \vss
+    }}
+}
+\incl{Essential Question and Hypothesis}{src/hypo.i}
+\incl{Abstract}{src/abstr.i}
+\image poster/img1.i
+\incl{Background Information}{src/research.i}
+\image poster/img2.i
+\incl{Materials}{src/mats.i}
+\image poster/img3.i
+\incl{Methods}{src/methods.i}
+\incl{Voronoi Diagrams}{poster/voronoi.i}
+\incl{Results}{src/results.i}
+\incl{Variables}{src/vars.i}
+\image poster/img4.i
+\incl{Experiment Notes}{src/notes.i}
+{\spacing105\incl{Data Analysis}{src/analysis.i}}
+\image poster/img5.i
+\incl{Conclusion}{src/conc.i}
+\supereject\end
diff --git a/poster/conclusion.tex b/poster/conclusion.tex
deleted file mode 120000
index a48f6b7..0000000
--- a/poster/conclusion.tex
+++ /dev/null
@@ -1 +0,0 @@
-../data/conclusion.tex
\ No newline at end of file
diff --git a/poster/datatables.tex b/poster/datatables.tex
deleted file mode 120000
index bc02edd..0000000
--- a/poster/datatables.tex
+++ /dev/null
@@ -1 +0,0 @@
-../gen/tables.tex
\ No newline at end of file
diff --git a/poster/document.tex b/poster/document.tex
deleted file mode 100644
index 7e27dfb..0000000
--- a/poster/document.tex
+++ /dev/null
@@ -1,62 +0,0 @@
-\input format
-
-\vbox{%
-  \noindent\colorbox{head}{\vbox{
-    \fullline{%
-      \vbox to 0pt{\pdfximage height 4.3in{../outputs/qr-source.png}\pdfrefximage\pdflastximage\vss}%
-      \hfil
-      \vbox to 0pt{\pdfximage height 4.3in{../outputs/qr.png}\pdfrefximage\pdflastximage\vss}%
-    }%
-  \vskip1in
-  \vbox to 0pt{%
-    \color{title}
-    \fullline{%
-      \hfil
-      \title Antlions' Group Distribution and Behavior under Varying Spatial Constraints%
-      \hfil
-    }%
-    \vskip.5in
-    \fullline{
-      \hfil
-      \subtitle Holden Rohrer and Radeen Dixon
-      \hfil
-    }
-    \fullline{
-      \subtitle
-      \hskip0pt plus .2fil
-      Source Code
-      \hfil
-      Report Full Text
-      \hskip0pt plus .2fil
-    }
-    \vss
-  }%
-  \vskip3in}}%
-  \vskip1pt
-  \fullline{%
-    \hfil
-    \colo{%
-      \include Essential Question and Hypothesis;hypothesis
-      \include Abstract;abstract
-      \image imagesone
-      \include Background Information;research
-      \image imagestwo
-    }\hfil\colo{
-      \include Materials;materials
-      \image imagesthree
-      \include Methods;methods
-      \include Voronoi Diagrams;voronoi
-    }\hfil\colo{
-      \include Results;results
-      \include Variables;vars
-      \image imagesfour
-      \include Experiment Notes;notes
-    }\hfil\colo{
-      \spacing=110\include Data Analysis;analysis
-      \image imagesfive
-      \include Conclusion;conclusion
-    }\hfil
-  }
-}
-
-\bye
diff --git a/poster/format.tex b/poster/format.tex
deleted file mode 100644
index 6c1dd91..0000000
--- a/poster/format.tex
+++ /dev/null
@@ -1,76 +0,0 @@
-\input color
-
-\fboxsep=0pt %color.tex is stupid
-
-\input palette
-
-\pagecolor{page} %
-\color{text} %text color
-
-\long\def\colo#1{\colorbox{colo}{\vbox to 31.5in{#1\vfil}}}
-
-\pdfpageheight=36in
-\pdfpagewidth=48in
-\newdimen\fullhsize\fullhsize=48in
-\voffset=-1in\hoffset=-1in
-\def\fullline{\hbox to \fullhsize}
-\hsize=11in
-\vsize=36in
-\nopagenumbers
-
-%gives ''\newfont myfont=cmr10@14pt''
-\newcount\thespacing
-\newdimen\size
-\def\spacing{
-  \afterassignment\adjs \thespacing}
-\def\adjs{%adjust spacing
-  \baselineskip=\size \multiply\baselineskip by \thespacing \divide\baselineskip by 100
-}
-\def\newfont#1=#2@#3pt{%name, base, size
-  \expandafter\font\csname x#1\endcsname=#2 at #3pt
-  \expandafter\edef\csname #1\endcsname{\size=#3pt \adjs \csname x#1\endcsname}
-}
-
-% font definitions
-\spacing=120
-\newfont title=cmss10@72pt
-\newfont subtitle=cmss10@48pt
-\newfont text=cmr10@18pt\text
-\newfont bold=cmb10@18pt
-\newfont ital=cmmi10@18pt
-\newfont head=cmb10@24pt
-
-\parindent=.5in
-
-% sectioning
-\def\section#1{%
-  \noindent\colorbox{section}{%
-    \vbox{%
-      \vskip5pt%
-      \centerline{\head\color{sectiontext}#1}
-      \vskip10pt%
-    }%
-  }%
-  \bigbreak\noindent
-}
-
-\def\include #1;#2 {
-  \section{#1}%
-  {\leftskip=12pt\rightskip=\leftskip\input #2\par}
-  \bigbreak
-}
-
-%% pictures
-\newcount\pics
-\def\pic#1#2{\pdfximage width #1{#2}\pdfrefximage\pdflastximage}
-\def\caption#1{\def\a{#1}\ifx\a\empty\else\global\advance\pics by 1\line{\vbox{\baselineskip=18pt\smallskip\leftskip=0pt plus 1fill\rightskip=0pt plus 1fill\parindent=0pt\relax Fig \number\pics: #1\bigskip}}\fi}
-\def\picture#1#2#3{\vbox{\pic{#3}{#1}\hsize=#3\caption{#2}}}
-\def\picturetop#1#2#3{\vtop{\pic{#3}{#1}\hsize=#3\caption{#2}}}
-
-%% the godly `pre`
-
-\def\pre#1{\par\leavevmode\llap{\hbox to \parindent{\hfil #1 \hfil}}}
-
-%% gives image files infinite stretch
-
-\def\image #1 {\vfil\input #1\vfil}
diff --git a/poster/hypothesis.tex b/poster/hypothesis.tex
deleted file mode 120000
index e68c480..0000000
--- a/poster/hypothesis.tex
+++ /dev/null
@@ -1 +0,0 @@
-../data/hypothesis.tex
\ No newline at end of file
diff --git a/poster/imagesfive.tex b/poster/imagesfive.tex
deleted file mode 100644
index d5f9a4e..0000000
--- a/poster/imagesfive.tex
+++ /dev/null
@@ -1,7 +0,0 @@
-\line{
-  \hskip 0pt plus .5fil
-  \picture{../photos/a.jpg}{Part of the DNA barcoding process for species determination: concentrated mixture after chemicals, centrifuging, and crushing}{5in}
-  \hfil
-  \picture{../photos/code.png}{The code used to create Voronoi diagrams with SciPy and Matplotlib}{5in}
-  \hskip 0pt plus .5fil
-}
diff --git a/poster/imagesfour.tex b/poster/imagesfour.tex
deleted file mode 100644
index 88b81fb..0000000
--- a/poster/imagesfour.tex
+++ /dev/null
@@ -1,7 +0,0 @@
-\line{
-  \hfil
-  \picture{../photos/2019-12-02-2.jpg}{A photo of a relatively large trial showing the constancy of trails and establishment of one pit in a 16x17 container}{4in}
-  \hfil
-  \picture{../photos/2019-11-21-4.jpg}{7 well-established pits in the 17x16 trial}{4in}
-  \hfil
-}
diff --git a/poster/imagesone.tex b/poster/imagesone.tex
deleted file mode 100644
index fc0e62b..0000000
--- a/poster/imagesone.tex
+++ /dev/null
@@ -1,8 +0,0 @@
-\line{%
-  \hfil
-  \picture{../photos/diagram.jpg}{The relative sizes of each trial}{4in}
-  \hfil
-  \picture{../photos/2019-10-18-1.jpg}{A 3cm antlion pit}{4in}
-  \hfil
-}
-
diff --git a/poster/imagesthree.tex b/poster/imagesthree.tex
deleted file mode 100644
index 0f4f39e..0000000
--- a/poster/imagesthree.tex
+++ /dev/null
@@ -1,8 +0,0 @@
-\line{
-  \hfil
-  \picture{../photos/2019-12-13-3.jpg}{An antlion in the inter-trial holding containers with native sand}{3.5in}
-  \hfil
-  \picture{../photos/2019-10-18-2.jpg}{The full, original hosting container for antlions (32x33), with significant wandering}{3.5in}
-  \hfil
-  \picture{../photos/c.jpg}{All of the antlion holding containers in the corner}{3.5in}
-}
diff --git a/poster/imagestwo.tex b/poster/imagestwo.tex
deleted file mode 100644
index 4f5db63..0000000
--- a/poster/imagestwo.tex
+++ /dev/null
@@ -1,7 +0,0 @@
-\line{
-  \hfil
-  \picture{../photos/2019-12-13-2.jpg}{An antlion being pulled out of the 8x7 enclosure}{5in}
-  \hfil
-  \picture{../photos/2019-12-02-2.jpg}{A number of lines formed by wandering antlions determining density}{5in}
-  \hfil
-}
diff --git a/poster/img1.i b/poster/img1.i
new file mode 100644
index 0000000..8f3385f
--- /dev/null
+++ b/poster/img1.i
@@ -0,0 +1,8 @@
+\line{%
+  \hfil
+  \picture{img/diagram.jpg}{The relative sizes of each trial}{4in}
+  \hfil
+  \picture{img/2019-10-18-1.jpg}{A 3cm antlion pit}{4in}
+  \hfil
+}
+
diff --git a/poster/img2.i b/poster/img2.i
new file mode 100644
index 0000000..9dcec3f
--- /dev/null
+++ b/poster/img2.i
@@ -0,0 +1,7 @@
+\line{
+  \hfil
+  \picture{img/2019-12-13-2.jpg}{An antlion being pulled out of the 8x7 enclosure}{5in}
+  \hfil
+  \picture{img/2019-12-02-2.jpg}{A number of lines formed by wandering antlions determining density}{5in}
+  \hfil
+}
diff --git a/poster/img3.i b/poster/img3.i
new file mode 100644
index 0000000..29aa00a
--- /dev/null
+++ b/poster/img3.i
@@ -0,0 +1,8 @@
+\line{
+  \hfil
+  \picture{img/2019-12-13-3.jpg}{An antlion in the inter-trial holding containers with native sand}{3.5in}
+  \hfil
+  \picture{img/2019-10-18-2.jpg}{The full, original hosting container for antlions (32x33), with significant wandering}{3.5in}
+  \hfil
+  \picture{img/c.jpg}{All of the antlion holding containers in the corner}{3.5in}
+}
diff --git a/poster/img4.i b/poster/img4.i
new file mode 100644
index 0000000..26109ec
--- /dev/null
+++ b/poster/img4.i
@@ -0,0 +1,7 @@
+\line{
+  \hfil
+  \picture{img/2019-12-02-2.jpg}{A photo of a relatively large trial showing the constancy of trails and establishment of one pit in a 16x17 container}{4in}
+  \hfil
+  \picture{img/2019-11-21-4.jpg}{7 well-established pits in the 17x16 trial}{4in}
+  \hfil
+}
diff --git a/poster/img5.i b/poster/img5.i
new file mode 100644
index 0000000..b362e0a
--- /dev/null
+++ b/poster/img5.i
@@ -0,0 +1,7 @@
+\line{
+  \hskip 0pt plus .5fil
+  \picture{img/a.jpg}{Part of the DNA barcoding process for species determination: concentrated mixture after chemicals, centrifuging, and crushing}{5in}
+  \hfil
+  \picture{img/code.png}{The code used to create Voronoi diagrams with SciPy and Matplotlib}{5in}
+  \hskip 0pt plus .5fil
+}
diff --git a/poster/methods.tex b/poster/methods.tex
deleted file mode 120000
index 0c21b77..0000000
--- a/poster/methods.tex
+++ /dev/null
@@ -1 +0,0 @@
-../data/methods.tex
\ No newline at end of file
diff --git a/poster/palette.tex b/poster/palette.h
index eba186e..eba186e 100644
--- a/poster/palette.tex
+++ b/poster/palette.h
diff --git a/poster/results.tex b/poster/results.tex
deleted file mode 100644
index 8506bdd..0000000
--- a/poster/results.tex
+++ /dev/null
@@ -1,21 +0,0 @@
-\input datatables
-\newfont tablefont=cmr10@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}}
-}
-\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{../photos/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}
-}
-
-\territory{The Pit Depths, Widths, and ``Territory,'' Observed in Each Trial}
diff --git a/poster/vars.tex b/poster/vars.tex
deleted file mode 120000
index 1e97452..0000000
--- a/poster/vars.tex
+++ /dev/null
@@ -1 +0,0 @@
-../data/vars.tex
\ No newline at end of file
diff --git a/poster/voronoi.tex b/poster/voronoi.i
index d8dba8c..bbf35ee 100644
--- a/poster/voronoi.tex
+++ b/poster/voronoi.i
@@ -9,10 +9,10 @@
   
 
 \line{
-  \fourpic{../imgs/2019-10-16.png}{../imgs/2019-10-30.png}{../imgs/2019-12-19.png}{../imgs/2019-12-3.png}{2.5in}{2in}
+  \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}
+    \noindent{\bf Individual Trial Voronoi Diagrams}
 
     The ant\-lions were studied in several different (restricted) container sizes.
     These Voronoi diagrams which label the territories of each ant\-lion (an ant\-lion ``possesses'' a part of the map within its segmented portion if its pit (the blue dot) is closest to that point).
@@ -22,10 +22,11 @@
 \vskip.2in
 \line{
   %%Images
-  \fourpic{../imgs/2019-12-19.png}{../imgs/2019-12-20.png}{../imgs/2019-12-3.png}{../imgs/2019-12-5.png}{2.5in}{2in}
+  \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{\hsize=5.5in%
-    \noindent{\bold Trial and subtrial Voronoi Diagrams}
+    \noindent{\bf Trial and subtrial Voronoi Diagrams}
+
     Two trial sizes were tested twice (earlier on left, later on right) because the ant\-lions submerged themsel\-ves in the sand and became inaccessible.
     This shows that, when given appropriate time to develop new nursery conditions, ant\-lions manage to successfully redistribute themselves.
     In the wild, this would correspond to a number becoming full adults and the remaining larvae rising to the surface.
diff --git a/python/data.py b/py/data.py
index de850e8..de850e8 100644
--- a/python/data.py
+++ b/py/data.py
diff --git a/python/deathtable.py b/py/deathtable.py
index f393cc8..f393cc8 100644
--- a/python/deathtable.py
+++ b/py/deathtable.py
diff --git a/python/depwid.py b/py/depwid.py
index 081167f..081167f 100644
--- a/python/depwid.py
+++ b/py/depwid.py
diff --git a/python/img.py b/py/img.py
index 177a7a2..177a7a2 100644
--- a/python/img.py
+++ b/py/img.py
diff --git a/python/neighbor.py b/py/neighbor.py
index 004979a..004979a 100644
--- a/python/neighbor.py
+++ b/py/neighbor.py
diff --git a/python/table.py b/py/table.py
index 1d11779..1d11779 100644
--- a/python/table.py
+++ b/py/table.py
diff --git a/report.tex b/report.tex
new file mode 100644
index 0000000..bcd24d7
--- /dev/null
+++ b/report.tex
@@ -0,0 +1,59 @@
+\long\def\abstract{\input abstract\par}
+\overfullrule=0pt
+
+\input fmt/doc.h
+\input fmt/com.h
+
+\parindent=.5in
+%% Headers
+\expandafter\ifx\csname abstract\endcsname\relax\fi
+\newtoks\abstract
+\newtoks\text
+\def\cover{{
+    \hbox{}\vskip0pt plus 2fill
+    {\parindent=0in\leftskip=0pt plus 1fill\rightskip=\leftskip
+        \parskip=\bigskipamount \the\text}
+    \vskip 0pt plus .5fill
+    \centerline{\fourteenbf Abstract}
+    {\leftskip=.5in\rightskip=\leftskip\baselineskip=14pt\relax
+    \the\abstract\par}
+    \vskip0pt plus 2fill
+    \eject
+}}
+
+\pageno=1
+\nopagenumbers
+\headline={\baselineskip=0.5in \twelverm \hfil \ifnum\pageno=1\else Dixon \& Rohrer \the\pageno \fi}
+\text={
+Antlions' Group Distribution and Behavior under Varying Spatial Constraints\par
+Holden Rohrer and Radeen Dixon\par
+Georgia Science Fair\par
+Source: \penalty10000\link{https://git.hrhr.dev/scifair}\par
+}
+\abstract={\input src/abstract.i}
+\cover
+
+\section{Introduction}\input src/intro.i
+\section{Background Research}\input src/research.i
+\section{Procedure}\input src/proc.i
+\section{Materials}\input src/mats.i
+\section{Data Analysis}\input src/analysis.i
+\section{Conclusion}\input src/conc.i
+
+\vfil\eject
+
+\section{Appendix A: Graphs}\input report/graphs.i
+
+\vfil\eject
+
+\section{Appendix B: Tables}\input report/tables.i
+
+\vfil\eject
+
+\section{Appendix C: Pictures}\input report/pics.i
+
+\vfil\eject
+
+\input src/biblio.i
+
+\bye
diff --git a/report/analysis.tex b/report/analysis.tex
deleted file mode 120000
index 45c9c28..0000000
--- a/report/analysis.tex
+++ /dev/null
@@ -1 +0,0 @@
-../poster/analysis.tex
\ No newline at end of file
diff --git a/report/biblio.tex b/report/biblio.tex
deleted file mode 120000
index 6af3002..0000000
--- a/report/biblio.tex
+++ /dev/null
@@ -1 +0,0 @@
-../data/biblio.tex
\ No newline at end of file
diff --git a/report/conclusion.tex b/report/conclusion.tex
deleted file mode 120000
index ef0da77..0000000
--- a/report/conclusion.tex
+++ /dev/null
@@ -1 +0,0 @@
-../poster/conclusion.tex
\ No newline at end of file
diff --git a/report/datatables.tex b/report/datatables.tex
deleted file mode 120000
index bc02edd..0000000
--- a/report/datatables.tex
+++ /dev/null
@@ -1 +0,0 @@
-../gen/tables.tex
\ No newline at end of file
diff --git a/report/document.tex b/report/document.tex
deleted file mode 100644
index 4abc32b..0000000
--- a/report/document.tex
+++ /dev/null
@@ -1,34 +0,0 @@
-\long\def\abstract{\input abstract\par}
-\overfullrule=0pt
-
-\input format
-
-\include Introduction;intro
-
-\include Background Research;research
-
-\include Procedure;procedure
-
-\include Materials;materials
-
-\include Data Analysis;analysis
-
-\include Conclusion;conclusion
-
-\vfil\eject
-
-\include Appendix A: Graphs;graphs
-
-\vfil\eject
-
-\include Appendix B: Tables;tables
-
-\vfil\eject
-
-\include Appendix C: Pictures;pics
-
-\vfil\eject
-
-\input biblio
-
-\bye
diff --git a/report/format.tex b/report/format.tex
deleted file mode 100644
index 7330f14..0000000
--- a/report/format.tex
+++ /dev/null
@@ -1,28 +0,0 @@
-\input ../generic
-
-\twelverm\baselineskip=14pt
-\parindent=.5in
-%% Headers
-\expandafter\ifx\csname abstract\endcsname\relax
-  \let\abstract\relax
-\fi
-\nopagenumbers
-{\parindent=0in\leftskip=0pt plus 1fill\rightskip=0pt plus 1fill\parskip=\bigskipamount
-\hbox{}
-\vskip0pt plus 2fill
-{\obeylines Antlions' Group Distribution and Behavior under Varying Spatial Constraints
-Holden Rohrer and Radeen Dixon
-Georgia Science Fair
-Source: \link{https://git.hrhr.dev/scifair}
-}
-\vskip 0pt plus .5fill
-\centerline{\fourteenbf Abstract}
-{\leftskip=.5in\rightskip=.5in\baselineskip=14pt
-\abstract
-}
-\vskip0pt plus 2fill
-\eject
-}
-\pageno=1
-\headline={\baselineskip=0.5in \twelverm \hfil \vbox{\hbox{\ifnum\pageno=1\else Dixon \& Rohrer \the\pageno \fi}}}
-
diff --git a/report/graphs.i b/report/graphs.i
new file mode 100644
index 0000000..8fb8ad3
--- /dev/null
+++ b/report/graphs.i
@@ -0,0 +1,6 @@
+\twopicture{imgs/2019-10-16.png}{imgs/2019-10-30.png}{}
+\twopicture{imgs/2019-12-3.png}{imgs/2019-12-5.png}{}
+\twopicture{imgs/2019-12-19.png}{imgs/2019-12-20.png}{Voronoi diagrams showing the territory of each antlion that formed a pit and well as the location, depth, and width of each pit}
+
+\picture{graph/depth_width.png}{Shows pit depth and width in relation to the square root of the trial area}
+\picture{graph/nearest_neighbor.png}{Shows the average nearest neighbor calculation for each trial group in relation to the square root of trial area, to create a ratio. Larger dots means more pits had that same area and depth or width.}
diff --git a/report/graphs.tex b/report/graphs.tex
deleted file mode 100644
index 6807e5d..0000000
--- a/report/graphs.tex
+++ /dev/null
@@ -1,6 +0,0 @@
-\twopicture{../imgs/2019-10-16.png}{../imgs/2019-10-30.png}{}
-\twopicture{../imgs/2019-12-3.png}{../imgs/2019-12-5.png}{}
-\twopicture{../imgs/2019-12-19.png}{../imgs/2019-12-20.png}{Voronoi diagrams showing the territory of each antlion that formed a pit and well as the location, depth, and width of each pit}
-
-\picture{../graph/depth_width.png}{Shows pit depth and width in relation to the square root of the trial area}
-\picture{../graph/nearest_neighbor.png}{Shows the average nearest neighbor calculation for each trial group in relation to the square root of trial area, to create a ratio. Larger dots means more pits had that same area and depth or width.}
diff --git a/report/materials.tex b/report/materials.tex
deleted file mode 120000
index a634e65..0000000
--- a/report/materials.tex
+++ /dev/null
@@ -1 +0,0 @@
-../poster/materials.tex
\ No newline at end of file
diff --git a/report/pics.i b/report/pics.i
new file mode 100644
index 0000000..f02cf06
--- /dev/null
+++ b/report/pics.i
@@ -0,0 +1,6 @@
+\twopicture{img/2019-10-18-1.jpg}{img/2019-10-18-2.jpg}{Pictures of the 32x33 trial group, a six inch ruler is shown for scale.}
+\twopicture{img/2019-10-30-1.jpg}{img/2019-11-21-1.jpg}{Initial pictures of the 24x25 trial group including the new cardboard barrier for reference.}
+\twopicture{img/2019-11-21-2.jpg}{img/2019-11-21-3.jpg}{(Left) A photograph of the first 16x17 trial, note antlion trails that are shown, a six inch ruler is shown for scale. (Right) A picture of the reinforced cardboard barrier to prevent antlions from escaping.}
+\twopicture{img/2019-11-21-4.jpg}{img/2019-12-02-1.jpg}{Two alternate views of the 16x17 trial size, note antlion trails and toothpicks denoting the location of antlion pits.}
+\twopicture{img/2019-12-02-2.jpg}{img/2019-12-13-1.jpg}{(Left) A close up image of the 16x17 trial size, note pits and dead antlions, ruler shown for scale (Right) A close up image of the 8x9 trial size, note smaller and less consistent pits, a six inch ruler shown for scale}
+\twopicture{img/2019-12-13-2.jpg}{img/2019-12-13-3.rot.jpg}{(Left) A picture of an antlion being removed from the trial period (Right) An image of an antlion in its temporary container}
diff --git a/report/pics.tex b/report/pics.tex
deleted file mode 100644
index 5b5a7be..0000000
--- a/report/pics.tex
+++ /dev/null
@@ -1,6 +0,0 @@
-\twopicture{../photos/2019-10-18-1.jpg}{../photos/2019-10-18-2.jpg}{Pictures of the 32x33 trial group, a six inch ruler is shown for scale.}
-\twopicture{../photos/2019-10-30-1.jpg}{../photos/2019-11-21-1.jpg}{Initial pictures of the 24x25 trial group including the new cardboard barrier for reference.}
-\twopicture{../photos/2019-11-21-2.jpg}{../photos/2019-11-21-3.jpg}{(Left)A photograph of the first 16x17 trial, note antlion trails that are shown, a six inch ruler is shown for scale. (Right) A picture of the reinforced cardboard barrier to prevent antlions from escaping.}
-\twopicture{../photos/2019-11-21-4.jpg}{../photos/2019-12-02-1.jpg}{Two alternate views of the 16x17 trial size, note antlion trails and toothpicks denoting the location of antlion pits.}
-\twopicture{../photos/2019-12-02-2.jpg}{../photos/2019-12-13-1.jpg}{(Left) A close up image of the 16x17 trial size, note pits and dead antlions, ruler shown for scale (Right) A close up image of the 8x9 trial size, note smaller and less consistent pits, a six inch ruler shown for scale}
-\twopicture{../photos/2019-12-13-2.jpg}{../photos/2019-12-13-3.rot.jpg}{(Left) A picture of an antlion being removed from the trial period (Right) An image of an antlion in its temporary container}
diff --git a/report/procedure.tex b/report/procedure.tex
deleted file mode 120000
index 1638001..0000000
--- a/report/procedure.tex
+++ /dev/null
@@ -1 +0,0 @@
-../poster/methods.tex
\ No newline at end of file
diff --git a/report/research.tex b/report/research.tex
deleted file mode 120000
index c2dc7cd..0000000
--- a/report/research.tex
+++ /dev/null
@@ -1 +0,0 @@
-../data/research.tex
\ No newline at end of file
diff --git a/report/tables.tex b/report/tables.i
index 288e5a6..78280ce 100644
--- a/report/tables.tex
+++ b/report/tables.i
@@ -1,12 +1,11 @@
-\input datatables
-\newdimen\oldbaseskip \oldbaseskip=\baselineskip
-\baselineskip=13pt
+\input gen/tables.i
+{\baselineskip=13pt
 \deaths
-\advance\pics by 1\relax
+\global\advance\pics by 1\relax
 \nobreak\centerline{Figure \number\pics: Number of Deaths and Pits Successfully Formed in Each Trial/Subtrial}
 
 \territory
-\advance\pics by 1\relax
+\global\advance\pics by 1\relax
 \nobreak\centerline{Figure \number\pics: The Pit Depths, Widths, and ``Territory,'' Observed in Each Trial}
-\eject
-\baselineskip=\oldbaseskip
+\vfil\eject
+}
diff --git a/poster/abstract.tex b/src/abstr.i
index 6bbd412..6bbd412 100644
--- a/poster/abstract.tex
+++ b/src/abstr.i
diff --git a/report/abstract.tex b/src/abstract.i
index 2eda69c..2eda69c 100644
--- a/report/abstract.tex
+++ b/src/abstract.i
diff --git a/poster/analysis.tex b/src/analysis.i
index 8c3e55a..8c3e55a 100644
--- a/poster/analysis.tex
+++ b/src/analysis.i
diff --git a/data/biblio.tex b/src/biblio.i
index 5f672fb..5f672fb 100644
--- a/data/biblio.tex
+++ b/src/biblio.i
diff --git a/src/biblio.tex b/src/biblio.tex
new file mode 100644
index 0000000..5f672fb
--- /dev/null
+++ b/src/biblio.tex
@@ -0,0 +1,19 @@
+\parindent=0pt
+\baselineskip=24pt
+\hangindent=.5in
+
+\centerline{Works Cited}
+{\everypar{\hangindent=.5in\hangafter=-1}
+\parskip=\baselineskip
+Muvengwi, J., Davies, A. B., Parrini, F., \& Witkowski, E. T. F. (2018). Geology drives the spatial patterning and structure of termite mounds in an African savanna. Ecosphere, 9(3), e02148. \link{https://doi.org/10.1002/ecs2.2148}
+
+Bowen*, T., Cabello*, G., Gidden*, T., Schlueter, M., \& Cain, P. (2019). BIOTIC AND ABIOTIC FACTORS INFLUENCING ANTLION PIT PLACEMENT **. Georgia Journal of Science, 77(1). Retrieved from \link{https://digitalcommons.gaacademy.org/gjs/vol77/iss1/72}
+
+Barkae, E. D., Golan, O., \& Ovadia, O. (2014). Dangerous neighbors: Interactive effects of factors influencing cannibalism in pit-building antlion larvae. Behavioral Ecology, 25(6), 1311--1319. \link{https://doi.org/10.1093/beheco/aru123}
+
+Scharf, I., Hollender, Y., Subach, A., \& Ovadia, O. (2008). Effect of spatial pattern and microhabitat on pit construction and relocation in Myrmeleon hyalinus (Neuroptera: Myrmeleontidae) larvae. Ecological Entomology, 33(3), 337--345. \link{https://doi.org/10.1111/j.1365-2311.2007.00967.x}
+
+Crowley, P. H., \& Linton, M. C. (1999). Antlion Foraging: Tracking Prey Across Space and Time. Ecology, 80(7), 2271--2282. \link{https://doi.org/10.1890/0012-9658(1999)080[2271:AFTPAS]2.0.CO;2}
+
+A. S Erasmus, B. F. N. *. (2000). A modelling approach to antlion (Neuroptera: Myrmeleontidae) distribution patterns. African Entomology, 8(2), 157--168.
+}
diff --git a/data/bulletnotes.tex b/src/bullets.i
index 76befb7..76befb7 100644
--- a/data/bulletnotes.tex
+++ b/src/bullets.i
diff --git a/data/conclusion.tex b/src/conc.i
index b39208c..b39208c 100644
--- a/data/conclusion.tex
+++ b/src/conc.i
diff --git a/data/hypothesis.tex b/src/hypo.i
index 834aad3..7951127 100644
--- a/data/hypothesis.tex
+++ b/src/hypo.i
@@ -1,8 +1,8 @@
-\noindent{\bold Essential Question:}
+\noindent{\bf Essential Question:}
 
 How do antlion spatial patterns, such as pit depth, width, and nearest neighbor, as well as  behaviors, such as cannibalism and eating habits vary with respect to spatial constraints and temporal change?
 
 \medbreak
-\noindent{\bold Hypothesis:} 
+\noindent{\bf Hypothesis:} 
 
 As the space available to antlion groups decreases, each claims less territory, and the populations tend towards more extreme behaviors, such as cannibalism and reclusivity, to limit competition for ants as an emergent feature of individual interactions.
diff --git a/report/intro.tex b/src/intro.i
index c1bd36f..c1bd36f 100644
--- a/report/intro.tex
+++ b/src/intro.i
diff --git a/poster/materials.tex b/src/mats.i
index a0d584e..a0d584e 100644
--- a/poster/materials.tex
+++ b/src/mats.i
diff --git a/data/methods.tex b/src/methods.i
index 1b96170..1b96170 100644
--- a/data/methods.tex
+++ b/src/methods.i
diff --git a/poster/notes.tex b/src/notes.i
index 16ab39b..16ab39b 100644
--- a/poster/notes.tex
+++ b/src/notes.i
diff --git a/src/proc.i b/src/proc.i
new file mode 100644
index 0000000..1b96170
--- /dev/null
+++ b/src/proc.i
@@ -0,0 +1,26 @@
+To start the procedure the materials needed to be obtained.
+Once materials were obtained the 160 ants were kept in one of the 6 inch plastic containers, and 200 grams of native sand was poured into each of the 40 remaining six inch containers.
+Next, each of the 40 antlions (Myrmeleon immaculatus) were placed in one of the plastic containers containing sand, with each antlion getting its own container.
+Following this each noticeable antlion pit was given two ants as food once every week, starting the Friday after the antlions were introduced to their temporary containers.
+Then, the remaining amount of sand was placed into the 32x32 container and spread out using a meter stick until the surface of the sand was level.
+Next, a meter stick was used to mark the sides of the 32x32 container with inch markers starting from the bottom right of the container on its lid.
+Much like a coordinate plane, marks were made one inch apart going vertically from the bottom of the lid of the container and subsequently labeled with their position away from the bottom of the box in inches, this acted as the y-axis.
+After this, marks were made one inch apart going horizontally from the right most section of the lid of the container and subsequently labeled with their position away from the right of the box in inches, this functioned as the x-axis.
+Next, the 2 inch cup was placed at the center of the container and buried under 3cm of sand.
+After this 4 antlions were introduced to the container every 24 hours until 30 antlions had been introduced, starting at 3:30 pm.
+This was done by using the sieve to obtain four random antlions from their temporary containers and place them on the center of the container, where the plastic cup was.
+Antlions were moved by using the sieve to remove the antlion from its six inch holding container.
+As new antlion pits appeared toothpicks were inserted next to them to signify their presence.
+Following the introduction of all 31 antlions a 24 settling period was allotted, after which the location of each antlion was measured using the grid system created earlier.
+Following this a program was used to find the nearest neighbor and a ruler was used to find the pit depth and width in cm.
+After data was taken the antlions were transferred back to their temporary containers by using a sieve to obtain the antlions from pits, where they were later placed in their temporary containers, dead antlions were kept in a freezer.
+Following this a barrier was inserted to reduce the available space to 24x23 inches using cardboard dividers and sealed using making tape, to prevent antlions from escaping the enclosure.
+After this another hour introductory period every 24 hours was repeated, will all remaining antlions, as some died in the previous trial.
+Once all antlions were introduced another 24 hour settling period was allocated and pit depth, width and location were found using the same methods as above, and the antlions were returned to their temporary containers.
+Following this the area of the box was reduced to 16x15 inches and all antlions were again introduced, 4 every 24 hours until all remaining antlions were placed in the pit.
+Then another 24 hour settlement period was allotted and all data was collected the same was as the previous two trials, and the antlions were returned to their temporary containers.
+Lastly, the area of the box was reduced to 8x7 inches and all antlions were again introduced, 4 every 24 hours until all remaining antlions were placed in the pit.
+Then another 24 hour settlement period was allotted and all data was collected the same was as the previous three trials, and the antlions were returned to their enclosures.
+To further understand the relevance of the study, the species of the antlions were examined through DNA barcoding.
+Using  min PCR and a gel barcoding system the antlion DNA was extracted, and used a strand of mitochondrial DNA, cytochrome C in order to identify the antlions using a national protein database.
+The observed genus and species was Myrmeleon Immaculatus.
diff --git a/poster/research.tex b/src/research.i
index da280aa..da280aa 100644
--- a/poster/research.tex
+++ b/src/research.i
diff --git a/src/results.i b/src/results.i
new file mode 100644
index 0000000..da4d84c
--- /dev/null
+++ b/src/results.i
@@ -0,0 +1,21 @@
+\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}}
+}
+\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}
+}
+
+\territory{The Pit Depths, Widths, and ``Territory,'' Observed in Each Trial}
diff --git a/data/vars.tex b/src/vars.i
index 256c3e4..256c3e4 100644
--- a/data/vars.tex
+++ b/src/vars.i
diff --git a/gen/tables.orig.tex b/tables.orig.tex
index 3e2de5f..3e2de5f 100644
--- a/gen/tables.orig.tex
+++ b/tables.orig.tex