From ca14b62964828f8268945ed22a9446f02074d251 Mon Sep 17 00:00:00 2001 From: Holden Rohrer Date: Thu, 28 May 2020 17:08:24 -0400 Subject: moved makefile to makefile.orig --- Makefile | 64 ----------------------------------------------------------- Makefile.orig | 64 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 64 insertions(+), 64 deletions(-) delete mode 100644 Makefile create mode 100644 Makefile.orig diff --git a/Makefile b/Makefile deleted file mode 100644 index f55bb12..0000000 --- a/Makefile +++ /dev/null @@ -1,64 +0,0 @@ -.POSIX: -.SUFFIXES: .tex .pdf - -DIRS = outputs graph -PDFS = poster/document.pdf report/document.pdf logbook/document.pdf -pdfs: outputs/poster.pdf outputs/report.pdf outputs/logbook.pdf -$(DIRS): - mkdir -p $@ - -outputs/poster.pdf: poster/document.pdf outputs - cp -f $< $@ -outputs/report.pdf: report/document.pdf outputs - cp -f $< $@ -outputs/logbook.pdf: logbook/document.pdf outputs - cp -f $< $@ - -png: outputs/poster.png -clean: - rm -rf imgs gen/tables.tex $(DIRS) data/tables.tex $(PDFS) - -imgs: python/data.py python/img.py - mkdir -p imgs - cd imgs && \ - python3 ../python/img.py - -graph/depth_width.png: python/data.py python/depwid.py graph - cd graph && python3 ../python/depwid.py - -graph/nearest_neighbor.png: python/data.py python/neighbor.py graph - cd graph && python3 ../python/neighbor.py - -graph/made: graph/depth_width.png graph/nearest_neighbor.png graph - touch graph/made - -outputs/poster.png: outputs/poster.pdf outputs - gs -sDEVICE=pngalpha -r288 -o outputs/poster.png outputs/poster.pdf - -$(PDFS): gen/tables.tex imgs graph/made - -.tex.pdf: - cd ${@D} && \ - pdftex document.tex >/dev/null - rm ${@D}/document.log - -poster/document.pdf: poster/abstract.tex poster/analysis.tex poster/conclusion.tex poster/document.tex poster/format.tex poster/hypothesis.tex poster/imagesfive.tex poster/imagesfour.tex poster/imagesone.tex poster/imagesthree.tex poster/imagestwo.tex poster/materials.tex poster/methods.tex poster/notes.tex poster/palette.tex poster/research.tex poster/results.tex poster/vars.tex poster/voronoi.tex - -report/document.pdf: report/abstract.tex report/analysis.tex report/biblio.tex report/conclusion.tex report/document.tex report/format.tex report/graphs.tex report/intro.tex report/materials.tex report/pics.tex report/procedure.tex report/research.tex report/tables.tex - -logbook/document.pdf: logbook/biblio.tex logbook/bulletnotes.tex logbook/conclusion.tex logbook/document.tex logbook/hypothesis.tex logbook/mats.tex logbook/methods.tex logbook/research.tex logbook/vars.tex - -gen/tables.tex: gen/maketables.sh gen/tables.orig.tex - gen/maketables.sh - -poster/document.pdf: outputs/qr-source.png outputs/qr.png -logbook/document.pdf report/document.pdf: generic.tex - -logbook/tables.tex poster/tables.tex: data/tables.tex - -outputs/qr.png: outputs - qrencode https://hrhr.dev/report.pdf -o outputs/qr.png - -outputs/qr-source.png: outputs - qrencode https://git.hrhr.dev/scifair -o outputs/qr-source.png - diff --git a/Makefile.orig b/Makefile.orig new file mode 100644 index 0000000..f55bb12 --- /dev/null +++ b/Makefile.orig @@ -0,0 +1,64 @@ +.POSIX: +.SUFFIXES: .tex .pdf + +DIRS = outputs graph +PDFS = poster/document.pdf report/document.pdf logbook/document.pdf +pdfs: outputs/poster.pdf outputs/report.pdf outputs/logbook.pdf +$(DIRS): + mkdir -p $@ + +outputs/poster.pdf: poster/document.pdf outputs + cp -f $< $@ +outputs/report.pdf: report/document.pdf outputs + cp -f $< $@ +outputs/logbook.pdf: logbook/document.pdf outputs + cp -f $< $@ + +png: outputs/poster.png +clean: + rm -rf imgs gen/tables.tex $(DIRS) data/tables.tex $(PDFS) + +imgs: python/data.py python/img.py + mkdir -p imgs + cd imgs && \ + python3 ../python/img.py + +graph/depth_width.png: python/data.py python/depwid.py graph + cd graph && python3 ../python/depwid.py + +graph/nearest_neighbor.png: python/data.py python/neighbor.py graph + cd graph && python3 ../python/neighbor.py + +graph/made: graph/depth_width.png graph/nearest_neighbor.png graph + touch graph/made + +outputs/poster.png: outputs/poster.pdf outputs + gs -sDEVICE=pngalpha -r288 -o outputs/poster.png outputs/poster.pdf + +$(PDFS): gen/tables.tex imgs graph/made + +.tex.pdf: + cd ${@D} && \ + pdftex document.tex >/dev/null + rm ${@D}/document.log + +poster/document.pdf: poster/abstract.tex poster/analysis.tex poster/conclusion.tex poster/document.tex poster/format.tex poster/hypothesis.tex poster/imagesfive.tex poster/imagesfour.tex poster/imagesone.tex poster/imagesthree.tex poster/imagestwo.tex poster/materials.tex poster/methods.tex poster/notes.tex poster/palette.tex poster/research.tex poster/results.tex poster/vars.tex poster/voronoi.tex + +report/document.pdf: report/abstract.tex report/analysis.tex report/biblio.tex report/conclusion.tex report/document.tex report/format.tex report/graphs.tex report/intro.tex report/materials.tex report/pics.tex report/procedure.tex report/research.tex report/tables.tex + +logbook/document.pdf: logbook/biblio.tex logbook/bulletnotes.tex logbook/conclusion.tex logbook/document.tex logbook/hypothesis.tex logbook/mats.tex logbook/methods.tex logbook/research.tex logbook/vars.tex + +gen/tables.tex: gen/maketables.sh gen/tables.orig.tex + gen/maketables.sh + +poster/document.pdf: outputs/qr-source.png outputs/qr.png +logbook/document.pdf report/document.pdf: generic.tex + +logbook/tables.tex poster/tables.tex: data/tables.tex + +outputs/qr.png: outputs + qrencode https://hrhr.dev/report.pdf -o outputs/qr.png + +outputs/qr-source.png: outputs + qrencode https://git.hrhr.dev/scifair -o outputs/qr-source.png + -- cgit From dd42da12a95995ffa32d2fa782eb1fd0e60e618e Mon Sep 17 00:00:00 2001 From: Holden Rohrer Date: Thu, 28 May 2020 17:09:13 -0400 Subject: fixed dep list and added ./configure --- README | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README b/README index 6ed2300..2b602b7 100644 --- a/README +++ b/README @@ -8,17 +8,17 @@ Contains some .tex files for generating the report in plain TeX and .py files fo Requisites: -- GNU Make +- Make - Python3 -- PDFTeX - -- Color.tex (usually preinstalled) +- PDFTeX with color.tex, miniltx.tex (installed with TeX Live) - SciPy, Matplotlib, numpy (Python libraries) -Run `make -j8` in the toplevel directory to build with the GNU Makefile. +- Ghostscript for PNG building + +Run `./configure ; make -j8` in the toplevel directory to build with the GNU Makefile. ## Results -- cgit From bd2ee55ce5fd7c5a0365204382bf48776061ba2f Mon Sep 17 00:00:00 2001 From: Holden Rohrer Date: Thu, 28 May 2020 17:09:35 -0400 Subject: ignore generated makefile --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 6c7023f..81ad520 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ outputs/* imgs/made gen/tables.tex graph +Makefile -- cgit From 090dc2da6abd7dfcb9ab22559ccb684700148794 Mon Sep 17 00:00:00 2001 From: Holden Rohrer Date: Thu, 28 May 2020 17:32:38 -0400 Subject: ./configure replaces manual tex search --- Makefile.orig | 7 ------- configure | 8 ++++++++ 2 files changed, 8 insertions(+), 7 deletions(-) create mode 100755 configure diff --git a/Makefile.orig b/Makefile.orig index f55bb12..6d668ef 100644 --- a/Makefile.orig +++ b/Makefile.orig @@ -42,12 +42,6 @@ $(PDFS): gen/tables.tex imgs graph/made pdftex document.tex >/dev/null rm ${@D}/document.log -poster/document.pdf: poster/abstract.tex poster/analysis.tex poster/conclusion.tex poster/document.tex poster/format.tex poster/hypothesis.tex poster/imagesfive.tex poster/imagesfour.tex poster/imagesone.tex poster/imagesthree.tex poster/imagestwo.tex poster/materials.tex poster/methods.tex poster/notes.tex poster/palette.tex poster/research.tex poster/results.tex poster/vars.tex poster/voronoi.tex - -report/document.pdf: report/abstract.tex report/analysis.tex report/biblio.tex report/conclusion.tex report/document.tex report/format.tex report/graphs.tex report/intro.tex report/materials.tex report/pics.tex report/procedure.tex report/research.tex report/tables.tex - -logbook/document.pdf: logbook/biblio.tex logbook/bulletnotes.tex logbook/conclusion.tex logbook/document.tex logbook/hypothesis.tex logbook/mats.tex logbook/methods.tex logbook/research.tex logbook/vars.tex - gen/tables.tex: gen/maketables.sh gen/tables.orig.tex gen/maketables.sh @@ -61,4 +55,3 @@ outputs/qr.png: outputs outputs/qr-source.png: outputs qrencode https://git.hrhr.dev/scifair -o outputs/qr-source.png - diff --git a/configure b/configure new file mode 100755 index 0000000..91ce029 --- /dev/null +++ b/configure @@ -0,0 +1,8 @@ +#!/bin/sh + +cp Makefile.orig Makefile +for tgt in */document.tex; do + DIR=$(dirname $tgt) + ( echo; echo -n "${DIR}/document.pdf: ${DIR}/document.tex "; find $DIR \!\ + -type d \! -name "document.tex" -a -name "*.tex" -exec echo {} +; ) >> Makefile +done -- cgit From fd6f2bc4f1c97234b5d3d9989ea5fb4016969622 Mon Sep 17 00:00:00 2001 From: Holden Rohrer Date: Thu, 28 May 2020 17:57:59 -0400 Subject: generalized python/pdftex/gs and added dep checks --- Makefile.orig | 20 ++++++++------------ configure | 12 +++++++++++- 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/Makefile.orig b/Makefile.orig index 6d668ef..ed3c2d6 100644 --- a/Makefile.orig +++ b/Makefile.orig @@ -3,16 +3,12 @@ DIRS = outputs graph PDFS = poster/document.pdf report/document.pdf logbook/document.pdf +PYTHON = python3 +PDFTEX = pdftex +GHOSTSCRIPT = gs pdfs: outputs/poster.pdf outputs/report.pdf outputs/logbook.pdf $(DIRS): mkdir -p $@ - -outputs/poster.pdf: poster/document.pdf outputs - cp -f $< $@ -outputs/report.pdf: report/document.pdf outputs - cp -f $< $@ -outputs/logbook.pdf: logbook/document.pdf outputs - cp -f $< $@ png: outputs/poster.png clean: @@ -21,25 +17,25 @@ clean: imgs: python/data.py python/img.py mkdir -p imgs cd imgs && \ - python3 ../python/img.py + $(PYTHON) ../python/img.py graph/depth_width.png: python/data.py python/depwid.py graph - cd graph && python3 ../python/depwid.py + cd graph && $(PYTHON) ../python/depwid.py graph/nearest_neighbor.png: python/data.py python/neighbor.py graph - cd graph && python3 ../python/neighbor.py + cd graph && $(PYTHON) ../python/neighbor.py graph/made: graph/depth_width.png graph/nearest_neighbor.png graph touch graph/made outputs/poster.png: outputs/poster.pdf outputs - gs -sDEVICE=pngalpha -r288 -o outputs/poster.png outputs/poster.pdf + $(GHOSTSCRIPT) -sDEVICE=pngalpha -r288 -o outputs/poster.png outputs/poster.pdf $(PDFS): gen/tables.tex imgs graph/made .tex.pdf: cd ${@D} && \ - pdftex document.tex >/dev/null + $(PDFTEX) document.tex >/dev/null rm ${@D}/document.log gen/tables.tex: gen/maketables.sh gen/tables.orig.tex diff --git a/configure b/configure index 91ce029..0e08c74 100755 --- a/configure +++ b/configure @@ -1,8 +1,18 @@ #!/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; echo -n "${DIR}/document.pdf: ${DIR}/document.tex "; find $DIR \!\ + ( echo -en "\n${DIR}/document.pdf: ${DIR}/document.tex "; find $DIR \!\ -type d \! -name "document.tex" -a -name "*.tex" -exec echo {} +; ) >> Makefile + echo -e "\noutputs/${DIR}.pdf: ${DIR}/document.pdf outputs\n\tcp -f $< \$@"\ + >> Makefile done -- cgit From 644eb8e78f80bb8811a7abb72b25866a424ac633 Mon Sep 17 00:00:00 2001 From: Holden Rohrer Date: Thu, 28 May 2020 18:08:24 -0400 Subject: dep-check was broken --- configure | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/configure b/configure index 0e08c74..ab40b19 100755 --- a/configure +++ b/configure @@ -1,11 +1,11 @@ #!/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 +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 -- cgit From e56e36cb400c605baeec1f304927f9fe78bd428d Mon Sep 17 00:00:00 2001 From: Holden Rohrer Date: Thu, 28 May 2020 18:15:45 -0400 Subject: generalized gen/ --- Makefile.orig | 3 --- configure | 6 ++++++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Makefile.orig b/Makefile.orig index ed3c2d6..3f23a3c 100644 --- a/Makefile.orig +++ b/Makefile.orig @@ -38,9 +38,6 @@ $(PDFS): gen/tables.tex imgs graph/made $(PDFTEX) document.tex >/dev/null rm ${@D}/document.log -gen/tables.tex: gen/maketables.sh gen/tables.orig.tex - gen/maketables.sh - poster/document.pdf: outputs/qr-source.png outputs/qr.png logbook/document.pdf report/document.pdf: generic.tex diff --git a/configure b/configure index ab40b19..00d5722 100755 --- a/configure +++ b/configure @@ -9,6 +9,7 @@ python -c "import matplotlib" >/dev/null || ( echo "Install matplotlib" && exit 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 \!\ @@ -16,3 +17,8 @@ for tgt in */document.tex; do echo -e "\noutputs/${DIR}.pdf: ${DIR}/document.pdf outputs\n\tcp -f $< \$@"\ >> 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 +done -- cgit From 69a6e7cea14d7310d84012b4870eb3464046c6ff Mon Sep 17 00:00:00 2001 From: Holden Rohrer Date: Thu, 28 May 2020 18:26:02 -0400 Subject: outputs/ made into symlink --- Makefile.orig | 18 +++++++++--------- configure | 2 -- outputs/document.pdf | 1 + outputs/poster.pdf | 1 + outputs/report.pdf | 1 + 5 files changed, 12 insertions(+), 11 deletions(-) create mode 120000 outputs/document.pdf create mode 120000 outputs/poster.pdf create mode 120000 outputs/report.pdf diff --git a/Makefile.orig b/Makefile.orig index 3f23a3c..68f8903 100644 --- a/Makefile.orig +++ b/Makefile.orig @@ -1,18 +1,18 @@ .POSIX: .SUFFIXES: .tex .pdf -DIRS = outputs graph 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: outputs/poster.pdf outputs/report.pdf outputs/logbook.pdf -$(DIRS): - mkdir -p $@ +pdfs: $(PDFS) +graph: + mkdir -p graph png: outputs/poster.png clean: - rm -rf imgs gen/tables.tex $(DIRS) data/tables.tex $(PDFS) + rm -rf imgs graph gen/tables.tex data/tables.tex $(PDFS) $(QR) imgs: python/data.py python/img.py mkdir -p imgs @@ -28,14 +28,14 @@ graph/nearest_neighbor.png: python/data.py python/neighbor.py graph graph/made: graph/depth_width.png graph/nearest_neighbor.png graph touch graph/made -outputs/poster.png: outputs/poster.pdf outputs +outputs/poster.png: poster/document.pdf $(GHOSTSCRIPT) -sDEVICE=pngalpha -r288 -o outputs/poster.png outputs/poster.pdf $(PDFS): gen/tables.tex imgs graph/made .tex.pdf: cd ${@D} && \ - $(PDFTEX) document.tex >/dev/null + $(PDFTEX) document.tex rm ${@D}/document.log poster/document.pdf: outputs/qr-source.png outputs/qr.png @@ -43,8 +43,8 @@ logbook/document.pdf report/document.pdf: generic.tex logbook/tables.tex poster/tables.tex: data/tables.tex -outputs/qr.png: outputs +outputs/qr.png: qrencode https://hrhr.dev/report.pdf -o outputs/qr.png -outputs/qr-source.png: outputs +outputs/qr-source.png: qrencode https://git.hrhr.dev/scifair -o outputs/qr-source.png diff --git a/configure b/configure index 00d5722..8789201 100755 --- a/configure +++ b/configure @@ -14,8 +14,6 @@ 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 - echo -e "\noutputs/${DIR}.pdf: ${DIR}/document.pdf outputs\n\tcp -f $< \$@"\ - >> Makefile done for gen in gen/*.orig.tex; do diff --git a/outputs/document.pdf b/outputs/document.pdf new file mode 120000 index 0000000..e00fe07 --- /dev/null +++ b/outputs/document.pdf @@ -0,0 +1 @@ +../logbook/document.pdf \ No newline at end of file diff --git a/outputs/poster.pdf b/outputs/poster.pdf new file mode 120000 index 0000000..471dfbf --- /dev/null +++ b/outputs/poster.pdf @@ -0,0 +1 @@ +../poster/document.pdf \ No newline at end of file diff --git a/outputs/report.pdf b/outputs/report.pdf new file mode 120000 index 0000000..e556b83 --- /dev/null +++ b/outputs/report.pdf @@ -0,0 +1 @@ +../report/document.pdf \ No newline at end of file -- cgit From a58f693959514bad90848d6f65f2fa1c11c3da9c Mon Sep 17 00:00:00 2001 From: Holden Rohrer Date: Thu, 28 May 2020 18:28:01 -0400 Subject: made gen/ generator valid --- configure | 1 + 1 file changed, 1 insertion(+) diff --git a/configure b/configure index 8789201..2e56ed4 100755 --- a/configure +++ b/configure @@ -19,4 +19,5 @@ 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 -- cgit From b3cd8f95680e4248d34f283bab94db8ba721f2b1 Mon Sep 17 00:00:00 2001 From: Holden Rohrer Date: Thu, 28 May 2020 18:28:48 -0400 Subject: removed trailing nl --- Makefile.orig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.orig b/Makefile.orig index 68f8903..24db337 100644 --- a/Makefile.orig +++ b/Makefile.orig @@ -9,7 +9,7 @@ GHOSTSCRIPT = gs pdfs: $(PDFS) graph: mkdir -p graph - + png: outputs/poster.png clean: rm -rf imgs graph gen/tables.tex data/tables.tex $(PDFS) $(QR) -- cgit From 48649e6423710ab1ce56ef1bec2310c363aebde3 Mon Sep 17 00:00:00 2001 From: Holden Rohrer Date: Thu, 28 May 2020 18:33:18 -0400 Subject: symlinked datatables --- Makefile.orig | 2 -- logbook/datatables.tex | 1 + logbook/document.tex | 2 +- poster/datatables.tex | 1 + poster/results.tex | 2 +- report/datatables.tex | 1 + report/tables.tex | 2 +- 7 files changed, 6 insertions(+), 5 deletions(-) create mode 120000 logbook/datatables.tex create mode 120000 poster/datatables.tex create mode 120000 report/datatables.tex diff --git a/Makefile.orig b/Makefile.orig index 24db337..4159232 100644 --- a/Makefile.orig +++ b/Makefile.orig @@ -41,8 +41,6 @@ $(PDFS): gen/tables.tex imgs graph/made poster/document.pdf: outputs/qr-source.png outputs/qr.png logbook/document.pdf report/document.pdf: generic.tex -logbook/tables.tex poster/tables.tex: data/tables.tex - outputs/qr.png: qrencode https://hrhr.dev/report.pdf -o outputs/qr.png diff --git a/logbook/datatables.tex b/logbook/datatables.tex new file mode 120000 index 0000000..bc02edd --- /dev/null +++ b/logbook/datatables.tex @@ -0,0 +1 @@ +../gen/tables.tex \ No newline at end of file diff --git a/logbook/document.tex b/logbook/document.tex index 07c0726..9b019f3 100644 --- a/logbook/document.tex +++ b/logbook/document.tex @@ -51,7 +51,7 @@ \noindent{\bf Tables:} -\input ../gen/tables +\input datatables \abreak diff --git a/poster/datatables.tex b/poster/datatables.tex new file mode 120000 index 0000000..bc02edd --- /dev/null +++ b/poster/datatables.tex @@ -0,0 +1 @@ +../gen/tables.tex \ No newline at end of file diff --git a/poster/results.tex b/poster/results.tex index 5004db8..8506bdd 100644 --- a/poster/results.tex +++ b/poster/results.tex @@ -1,4 +1,4 @@ -\input ../gen/tables +\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} diff --git a/report/datatables.tex b/report/datatables.tex new file mode 120000 index 0000000..bc02edd --- /dev/null +++ b/report/datatables.tex @@ -0,0 +1 @@ +../gen/tables.tex \ No newline at end of file diff --git a/report/tables.tex b/report/tables.tex index a3ebb4d..288e5a6 100644 --- a/report/tables.tex +++ b/report/tables.tex @@ -1,4 +1,4 @@ -\input ../gen/tables +\input datatables \newdimen\oldbaseskip \oldbaseskip=\baselineskip \baselineskip=13pt \deaths -- cgit From d6ed0246fef2253ad8f4c4e98fcf27c016bdbd37 Mon Sep 17 00:00:00 2001 From: Holden Rohrer Date: Thu, 28 May 2020 18:42:16 -0400 Subject: reorganized makefile --- Makefile.orig | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/Makefile.orig b/Makefile.orig index 4159232..b0a3d3e 100644 --- a/Makefile.orig +++ b/Makefile.orig @@ -6,10 +6,8 @@ QR = outputs/qr.png outputs/qr-source.png PYTHON = python3 PDFTEX = pdftex GHOSTSCRIPT = gs -pdfs: $(PDFS) -graph: - mkdir -p graph +pdfs: $(PDFS) png: outputs/poster.png clean: rm -rf imgs graph gen/tables.tex data/tables.tex $(PDFS) $(QR) @@ -19,19 +17,20 @@ imgs: python/data.py python/img.py 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 -graph/made: graph/depth_width.png graph/nearest_neighbor.png graph - touch graph/made - outputs/poster.png: poster/document.pdf $(GHOSTSCRIPT) -sDEVICE=pngalpha -r288 -o outputs/poster.png outputs/poster.pdf -$(PDFS): gen/tables.tex imgs graph/made +$(PDFS): gen/tables.tex imgs $(GRAPH) .tex.pdf: cd ${@D} && \ -- cgit