From f0bb0995c37236cf31d2d7b9fd431d7a34e65da6 Mon Sep 17 00:00:00 2001
From: Holden Rohrer <hr@hrhr.dev>
Date: Sun, 26 Jan 2020 14:38:26 -0500
Subject: moved format.orig.tex to document

---
 document/format.orig.tex | 28 ++++++++++++++++++++++++++++
 document/report.tex      |  2 +-
 format.orig.tex          | 28 ----------------------------
 make                     |  4 ++--
 4 files changed, 31 insertions(+), 31 deletions(-)
 create mode 100644 document/format.orig.tex
 delete mode 100644 format.orig.tex

diff --git a/document/format.orig.tex b/document/format.orig.tex
new file mode 100644
index 0000000..6238f1c
--- /dev/null
+++ b/document/format.orig.tex
@@ -0,0 +1,28 @@
+\input ../generic
+
+\twelverm\baselineskip=24pt
+\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/document/report.tex b/document/report.tex
index 1395d26..886286b 100644
--- a/document/report.tex
+++ b/document/report.tex
@@ -1,6 +1,6 @@
 \long\def\abstract{\input abstract\par}
 
-\input ../format
+\input format
 
 \include Introduction;intro
 
diff --git a/format.orig.tex b/format.orig.tex
deleted file mode 100644
index 6238f1c..0000000
--- a/format.orig.tex
+++ /dev/null
@@ -1,28 +0,0 @@
-\input ../generic
-
-\twelverm\baselineskip=24pt
-\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/make b/make
index e7cc565..4f080cd 100755
--- a/make
+++ b/make
@@ -12,12 +12,12 @@ python3 ../data.py nei || python ../data.py nei
 cd ..
 mkdir outputs
 cd document
-cp ../format.orig.tex ../format.tex
+cp format.orig.tex format.tex
 pdftex report.tex || echo "You must install \`pdftex\` (MacTeX, TeXLive, MikTeX, etc)"
 mv pageno.tex ..
 mv pageno2.tex ..
 mv report.pdf ../outputs/report-double.pdf
-sed ../format.orig.tex -e 's/\\baselineskip=24pt/\\baselineskip=14pt/g' >../format.tex
+sed format.orig.tex -e 's/\\baselineskip=24pt/\\baselineskip=14pt/g' >format.tex
 pdftex report.tex
 mv report.pdf ../outputs/report-single.pdf
 cd ..
-- 
cgit