aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile8
-rw-r--r--logbook.tex6
-rw-r--r--report/abstract.tex (renamed from document/abstract.tex)0
l---------report/analysis.tex (renamed from document/analysis.tex)0
-rw-r--r--report/biblio.tex (renamed from document/biblio.tex)0
l---------report/conclusion.tex (renamed from document/conclusion.tex)0
-rw-r--r--report/document.tex (renamed from document/report.tex)0
-rw-r--r--report/format.tex (renamed from document/format.tex)0
-rw-r--r--report/graphs.tex (renamed from document/graphs.tex)0
-rw-r--r--report/intro.tex (renamed from document/intro.tex)0
l---------report/materials.tex (renamed from document/materials.tex)0
-rw-r--r--report/pics.tex (renamed from document/pics.tex)0
l---------report/procedure.tex (renamed from document/procedure.tex)0
l---------report/research.tex (renamed from document/research.tex)0
-rw-r--r--report/tables.tex (renamed from document/tables.tex)0
15 files changed, 7 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index db2016b..243684e 100644
--- a/Makefile
+++ b/Makefile
@@ -29,15 +29,15 @@ outputs/posterboard.pdf: $(wildcard poster/*.tex) outputs/qr-source.png outputs/
rm poster/document.log
mv poster/document.pdf outputs/posterboard.pdf
-outputs/logbook.pdf: logbook.tex document/research.tex document/biblio.tex poster/hypothesis.tex data/mats.tex poster/vars.tex poster/methods.tex document/tables.tex poster/conclusion.tex data/bulletnotes.tex $(ASSETS)
+outputs/logbook.pdf: logbook.tex report/research.tex report/biblio.tex poster/hypothesis.tex data/mats.tex poster/vars.tex poster/methods.tex report/tables.tex poster/conclusion.tex data/bulletnotes.tex $(ASSETS)
pdftex logbook.tex >/dev/null
rm logbook.log
mv logbook.pdf outputs
outputs/report.pdf: $(wildcard document/*.tex) $(ASSETS)
- cd document && pdftex report.tex >/dev/null
- rm document/report.log
- mv document/report.pdf outputs
+ cd report && pdftex document.tex >/dev/null
+ rm report/document.log
+ mv report/document.pdf outputs/report.pdf
outputs/qr.png:
qrencode https://hrhr.dev/report.pdf -o outputs/qr.png
diff --git a/logbook.tex b/logbook.tex
index 8efc9bd..6106516 100644
--- a/logbook.tex
+++ b/logbook.tex
@@ -8,11 +8,11 @@
\noindent{\bf Background Research:}
-\input document/research
+\input report/research
\abreak
-{\input document/biblio\relax}
+{\input report/biblio\relax}
\abreak
@@ -51,7 +51,7 @@
\noindent{\bf Tables:}
-\input document/tables
+\input report/tables
\abreak
diff --git a/document/abstract.tex b/report/abstract.tex
index 2eda69c..2eda69c 100644
--- a/document/abstract.tex
+++ b/report/abstract.tex
diff --git a/document/analysis.tex b/report/analysis.tex
index 45c9c28..45c9c28 120000
--- a/document/analysis.tex
+++ b/report/analysis.tex
diff --git a/document/biblio.tex b/report/biblio.tex
index 5f672fb..5f672fb 100644
--- a/document/biblio.tex
+++ b/report/biblio.tex
diff --git a/document/conclusion.tex b/report/conclusion.tex
index ef0da77..ef0da77 120000
--- a/document/conclusion.tex
+++ b/report/conclusion.tex
diff --git a/document/report.tex b/report/document.tex
index 4abc32b..4abc32b 100644
--- a/document/report.tex
+++ b/report/document.tex
diff --git a/document/format.tex b/report/format.tex
index 7330f14..7330f14 100644
--- a/document/format.tex
+++ b/report/format.tex
diff --git a/document/graphs.tex b/report/graphs.tex
index 6807e5d..6807e5d 100644
--- a/document/graphs.tex
+++ b/report/graphs.tex
diff --git a/document/intro.tex b/report/intro.tex
index b2fe28d..b2fe28d 100644
--- a/document/intro.tex
+++ b/report/intro.tex
diff --git a/document/materials.tex b/report/materials.tex
index a634e65..a634e65 120000
--- a/document/materials.tex
+++ b/report/materials.tex
diff --git a/document/pics.tex b/report/pics.tex
index 5b5a7be..5b5a7be 100644
--- a/document/pics.tex
+++ b/report/pics.tex
diff --git a/document/procedure.tex b/report/procedure.tex
index 1638001..1638001 120000
--- a/document/procedure.tex
+++ b/report/procedure.tex
diff --git a/document/research.tex b/report/research.tex
index b465725..b465725 120000
--- a/document/research.tex
+++ b/report/research.tex
diff --git a/document/tables.tex b/report/tables.tex
index 155c234..155c234 100644
--- a/document/tables.tex
+++ b/report/tables.tex