switched out sed for \input code (more reusable)

1 files changed, 10 insertions, 13 deletions

diff --git a/Makefile b/Makefile
index 2c11738..152d80b 100644
--- a/Makefile
+++ b/Makefile
@@ -5,10 +5,11 @@
 PDFTEX = pdftex
 PY = python3
 
-all: report.pdf poster.pdf logbook.pdf
+all: report.pdf poster.pdf logbook.pdf report2.pdf poster2.pdf \
+logbook2.pdf
 
 clean:
-	rm -rf {report,poster,logbook}.{pdf,log} qr gen graph imgs
+	rm -rf {report,poster,logbook}{,2}.{pdf,log} qr gen graph imgs
 
 .tex.pdf:
 	$(PDFTEX) -jobname $* $<
@@ -34,9 +35,9 @@ img/2019-11-21-2.jpg img/2019-11-21-3.jpg img/2019-12-02-1.jpg src/conc.i \
 img/2019-12-13-1.jpg img/2019-12-13-3.rot.jpg fmt/doc.h report/tables.i
 
 report.pdf poster.pdf logbook.pdf: fmt/com.h imgs graph/made \
-gen/tables.i fmt/font.h src/mats.i img/2019-12-02-2.jpg \
-img/2019-10-18-2.jpg img/2019-10-18-1.jpg img/2019-11-21-4.jpg \
-img/2019-12-13-2.jpg
+tables.i gen/deathtable.i gen/table.i fmt/font.h src/mats.i \
+img/2019-12-02-2.jpg img/2019-10-18-2.jpg img/2019-10-18-1.jpg \
+img/2019-11-21-4.jpg img/2019-12-13-2.jpg
 
 imgs: py/data.py py/img.py
 	mkdir -p imgs
@@ -46,15 +47,11 @@ 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.i: py/data.py py/deathtable.py gen/dir
+	$(PY) py/deathtable.py > gen/deathtable.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
+gen/table.i: py/data.py py/table.py gen/dir
+	$(PY) py/table.py > gen/table.i
 
 graph/dir:
 	mkdir -p graph