diff options
Diffstat (limited to 'reproduce')
| -rw-r--r-- | reproduce/analysis/config/demo-year.conf (renamed from reproduce/analysis/config/menke-demo-year.conf) | 0 | ||||
| -rw-r--r-- | reproduce/analysis/make/demo-plot.mk | 4 | ||||
| -rw-r--r-- | reproduce/analysis/make/format.mk | 2 | ||||
| -rw-r--r-- | reproduce/analysis/make/paper.mk | 11 | ||||
| -rw-r--r-- | reproduce/software/config/texlive-packages.conf | 4 |
5 files changed, 14 insertions, 7 deletions
diff --git a/reproduce/analysis/config/menke-demo-year.conf b/reproduce/analysis/config/demo-year.conf index 429b220..429b220 100644 --- a/reproduce/analysis/config/menke-demo-year.conf +++ b/reproduce/analysis/config/demo-year.conf diff --git a/reproduce/analysis/make/demo-plot.mk b/reproduce/analysis/make/demo-plot.mk index ac05776..c14b83d 100644 --- a/reproduce/analysis/make/demo-plot.mk +++ b/reproduce/analysis/make/demo-plot.mk @@ -27,7 +27,7 @@ $(a2dir):; mkdir $@ # Table for Figure 1C of Menke+20 # ------------------------------- -a2mk20f1c = $(a2dir)/tools-per-year.txt +a2mk20f1c = $(a2dir)/columns.txt $(a2mk20f1c): $(mk20tab3) | $(a2dir) # Remove the (possibly) produced figure that is created from this @@ -47,7 +47,7 @@ $(a2mk20f1c): $(mk20tab3) | $(a2dir) # Final LaTeX macro -$(mtexdir)/demo-plot.tex: $(a2mk20f1c) $(pconfdir)/menke-demo-year.conf +$(mtexdir)/demo-plot.tex: $(a2mk20f1c) $(pconfdir)/demo-year.conf # Find the first year (first column of first row) of data. v=$$(awk 'NR==1{print $$1}' $(a2mk20f1c)) diff --git a/reproduce/analysis/make/format.mk b/reproduce/analysis/make/format.mk index d10034d..3070e6a 100644 --- a/reproduce/analysis/make/format.mk +++ b/reproduce/analysis/make/format.mk @@ -24,7 +24,7 @@ # Save the "Table 3" spreadsheet from the downloaded `.xlsx' file into a # simple plain-text file that is easy to use. a1dir = $(BDIR)/analysis1 -mk20tab3 = $(a1dir)/menke20-table-3.txt +mk20tab3 = $(a1dir)/table-3.txt $(a1dir):; mkdir $@ $(mk20tab3): $(indir)/menke20.xlsx | $(a1dir) diff --git a/reproduce/analysis/make/paper.mk b/reproduce/analysis/make/paper.mk index 4f2088b..a216370 100644 --- a/reproduce/analysis/make/paper.mk +++ b/reproduce/analysis/make/paper.mk @@ -86,15 +86,21 @@ $(mtexdir)/project.tex: $(mtexdir)/verify.tex # recipe and the `paper.pdf' recipe. But if `tex/src/references.bib' hasn't # been modified, we don't want to re-build the bibliography, only the final # PDF. -$(texbdir)/paper.bbl: tex/src/references.bib $(mtexdir)/dependencies-bib.tex \ +$(texbdir)/paper.bbl: tex/src/references.tex $(mtexdir)/dependencies-bib.tex \ | $(mtexdir)/project.tex # If `$(mtexdir)/project.tex' is empty, don't build PDF. @macros=$$(cat $(mtexdir)/project.tex) if [ x"$$macros" != x ]; then + # Unfortunately I can't get bibtex to look into a special + # directory for the references, so we'll copy it here. + p=$$(pwd) + if ! [ -L $(texbdir)/references.bib ]; then + ln -s $$p/tex/src/references.tex $(texbdir)/references.bib + fi + # We'll run LaTeX first to generate the `.bcf' file (necessary # for `biber') and then run `biber' to generate the `.bbl' file. - p=$$(pwd) export TEXINPUTS=$$p: cd $(texbdir); latex -shell-escape -halt-on-error $$p/paper.tex @@ -137,5 +143,4 @@ paper.pdf: $(mtexdir)/project.tex paper.tex $(texbdir)/paper.bbl # file here. cd $$p cp $(texbdir)/$@ $(final-paper) - fi diff --git a/reproduce/software/config/texlive-packages.conf b/reproduce/software/config/texlive-packages.conf index 70f246e..7dac084 100644 --- a/reproduce/software/config/texlive-packages.conf +++ b/reproduce/software/config/texlive-packages.conf @@ -16,4 +16,6 @@ # the basic installation scheme that we used to install tlmgr, they will be # ignored in the `tlmgr install' command, but will be used later when we # want their versions. -texlive-packages = times IEEEtran cite xcolor pgfplots courier ps2eps +texlive-typewriter-pkgs = courier inconsolata xkeyval upquote +texlive-packages = times IEEEtran cite xcolor pgfplots ps2eps \ + listing etoolbox $(texlive-typewriter-pkgs) |