switched report to ISEF format

5 files changed, 21 insertions, 15 deletions

diff --git a/fmt/doc.h b/fmt/doc.h
index b6c229e..b627384 100644
--- a/fmt/doc.h
+++ b/fmt/doc.h
@@ -26,4 +26,4 @@
 \def\pic#1#2{\pdfximage width #1{#2}\pdfrefximage\pdflastximage}
 \def\picture#1#2{\vbox{\centerline{\pic{5in}{#1}}\caption{#2}}}
 \def\twopicture#1#2#3{\vbox{\line{\pic{3in}{#1}\hfil\pic{3in}{#2}}\caption{#3}}}
-\def\dubpicture#1#2#3#4{\line{\hsize=3in\parindent=0pt\vtop{\pic{3in}{#1}\caption{#3}}\hfil\vtop{\pic{3in}{#2}\caption{#4}}}}
+\def\dubpicture#1#2#3#4{\line{\hsize=2.5in\parindent=0pt\vtop{\pic{2.5in}{#1}\caption{#3}}\hfil\vtop{\pic{2.5in}{#2}\caption{#4}}}}
diff --git a/report2.tex b/report2.tex
index 7066715..4e7579b 100644
--- a/report2.tex
+++ b/report2.tex
@@ -13,10 +13,12 @@
     {\parindent=0in\leftskip=0pt plus 1fill\rightskip=\leftskip
         \parskip=\bigskipamount \the\text}
     \vskip 0pt plus .5fill
+    \edef\ab{\the\abstract}\ifx\ab\empty\else
     {\fourteenbf\centerline{Abstract}\par}
     {\parindent0pt\parfillskip0pt\leftskip=.5in\rightskip=\leftskip
     \baselineskip=14pt\relax
-    \the\abstract\par}
+    \ab\par}
+    \fi
     \vskip0pt plus 2fill
     \eject
 }}
@@ -28,23 +30,28 @@
 Antlion Herding Patterns with Interrupted Communication Pathways\par
 Holden Rohrer and Radeen Dixon\par
 Georgia Science Fair\par
-Source: \link{https://git.hrhr.dev/scifair}\par
 }
-\abstract={\input src/abstr2.i}
+\abstract={}
 \cover
 
-\section{Introduction}\input src/intro2.i
-\section{Background Research}\input src/research2.i
-\section{Procedure}\input src/methods2.i
-\section{Materials}\input src/mats2.i
+\section{Rationale}\input src/abstr2.i\input src/rationale.i
+\vfil\eject
+\section{Hypothesis}\input src/hypo2.i
+\vfil\eject
+\section{Procedure}\input src/mats2.i\input src/methods2.i
+\vfil\eject
 \section{Data Analysis}\input src/analysis2.i
-\section{Conclusion}\input src/conc2.i
+\vfil\eject
+\section{Addendum}\input src/conc2.i
+\vfil\eject
 
 \vfil\eject
 
 \section{Appendix A: Graphs}\input report2/graphs.i
+\vfil\eject
 
 \section{Appendix B: Tables}\input report2/tables.i
+\vfil\eject
 
 \section{Appendix C: Pictures}\input report2/pics.i
 
diff --git a/report2/pics.i b/report2/pics.i
index cbe6fa4..f684e0e 100644
--- a/report2/pics.i
+++ b/report2/pics.i
@@ -6,12 +6,12 @@ antlion pit}
 of the DNA barcoding process for species determination}{An image depicting
 the final settlement of the antlions during the $24\times24$
 trial with fake pits, showing how antlions tend to avoid fake
-pits.}\fi
+pits.}
 
-\dubpicture{img/2019-12-13-3.rot.jpg}{img/overhead-fake-pits.rot.jpg}{An antlion
-in the inter-trial holding containers with native sand}{An image
+\dubpicture{img/2019-12-13-3.rot.jpg}{img/overhead-fake-pits.rot.jpg}{An
+antlion in the inter-trial holding containers with native sand}{An image
 depicting the distribution of fake pits along the $24\times24$ trial,
-showing the 12 fake pits.}
+showing the 12 fake pits.}\fi
 
 \dubpicture{img/Overhead-with-obstacle.rot.jpg}{img/corner-settle.rot.jpg}{The
 $12\times12$ trial with the introduction of an obstacle, showing how the
diff --git a/src/biblio.i b/src/biblio.i
index 799154b..d2325af 100644
--- a/src/biblio.i
+++ b/src/biblio.i
@@ -2,7 +2,7 @@
 \baselineskip=24pt
 \hangindent=.5in
 
-\centerline{Works Cited}
+\centerline{Bibliography}
 {\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}
diff --git a/src/methods.i b/src/methods.i
index 1b96170..f98e616 100644
--- a/src/methods.i
+++ b/src/methods.i
@@ -1,4 +1,3 @@
-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.