diff --git a/Dedman-Thesis-Latex-Template b/Dedman-Thesis-Latex-Template index 928428e..21df920 160000 --- a/Dedman-Thesis-Latex-Template +++ b/Dedman-Thesis-Latex-Template @@ -1 +1 @@ -Subproject commit 928428e2d2005fa64e52b7cc7e4ac93eeb8b46ed +Subproject commit 21df92065f22111f48188e5c492fcceae5e73a82 diff --git a/Makefile b/Makefile index 4f8b3b4..b6defeb 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ FILENAME = feickert_thesis date = $(shell date +%Y-%m-%d) output_file = draft_$(date).pdf -figure_src = $(wildcard images/figures/*.tex images/figures/*/*.tex) +figure_src = $(wildcard figures/*.tex figures/*/*.tex) figure_list = $(figure_src:.tex=.pdf) # LATEX = pdflatex @@ -28,7 +28,7 @@ abstract.pdf: latex/standalone_abstract.tex figures: $(figure_list) # Target assumes figure source is in same directory as expected figure path -images/%.pdf: images/%.tex +figures/%.pdf: figures/%.tex latexmk -$(LATEX) -interaction=nonstopmode -halt-on-error $(basename $@) mv $(notdir $(basename $@)).pdf $(basename $@).pdf rm $(notdir $(basename $@)).* @@ -74,7 +74,7 @@ arXiv: realclean document cp *.tex submit_to_arXiv cp *.bbl submit_to_arXiv/ms.bbl cp Makefile submit_to_arXiv - cp -r src latex bib images submit_to_arXiv + cp -r src latex bib figures submit_to_arXiv if [ -d Dedman-Thesis-Latex-Template ]; then \ mkdir submit_to_arXiv/Dedman-Thesis-Latex-Template; \ cp Dedman-Thesis-Latex-Template/LICENSE submit_to_arXiv/Dedman-Thesis-Latex-Template/LICENSE; \ @@ -100,7 +100,7 @@ arXiv: realclean document fi find submit_to_arXiv/ -name "*.bak" -type f -delete # Having .tex and .pdf files of the same name will cause arXiv to delete the .pdf - find submit_to_arXiv/images/ -name "*.tex" -type f -delete + find submit_to_arXiv/figures/ -name "*.tex" -type f -delete # arXiv requires .bib files to be compiled to .bbl files and will remove any .bib files find submit_to_arXiv/ -name "*.bib" -type f -delete tar -zcvf submit_to_arXiv.tar.gz submit_to_arXiv/ diff --git a/images/figures/LHC/LHC_accelerator_complex.jpg b/figures/LHC/LHC_accelerator_complex.jpg similarity index 100% rename from images/figures/LHC/LHC_accelerator_complex.jpg rename to figures/LHC/LHC_accelerator_complex.jpg diff --git a/images/figures/LHC/LHC_dipole_cross_section.jpg b/figures/LHC/LHC_dipole_cross_section.jpg similarity index 100% rename from images/figures/LHC/LHC_dipole_cross_section.jpg rename to figures/LHC/LHC_dipole_cross_section.jpg diff --git a/images/figures/preface/LHC_coordinate_system.tex b/figures/preface/LHC_coordinate_system.tex similarity index 100% rename from images/figures/preface/LHC_coordinate_system.tex rename to figures/preface/LHC_coordinate_system.tex diff --git a/images/figures/results/BH_final.pdf b/figures/results/BH_final.pdf similarity index 100% rename from images/figures/results/BH_final.pdf rename to figures/results/BH_final.pdf diff --git a/images/figures/results/Final_Limits.pdf b/figures/results/Final_Limits.pdf similarity index 100% rename from images/figures/results/Final_Limits.pdf rename to figures/results/Final_Limits.pdf diff --git a/images/figures/results/SRPostFit_mass.pdf b/figures/results/SRPostFit_mass.pdf similarity index 100% rename from images/figures/results/SRPostFit_mass.pdf rename to figures/results/SRPostFit_mass.pdf diff --git a/images/figures/results/contourFinal.pdf b/figures/results/contourFinal.pdf similarity index 100% rename from images/figures/results/contourFinal.pdf rename to figures/results/contourFinal.pdf diff --git a/images/figures/results/gqlimit.pdf b/figures/results/gqlimit.pdf similarity index 100% rename from images/figures/results/gqlimit.pdf rename to figures/results/gqlimit.pdf