diff --git a/Makefile b/Makefile index e50c0a9..7aecb71 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ FILENAME = user_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 $@)).* @@ -70,7 +70,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; \ @@ -96,7 +96,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/SMU_Logo_Red.eps b/figures/SMU_Logo_Red.eps similarity index 100% rename from images/figures/SMU_Logo_Red.eps rename to figures/SMU_Logo_Red.eps diff --git a/images/figures/introduction/example.tex b/figures/introduction/example.tex similarity index 100% rename from images/figures/introduction/example.tex rename to figures/introduction/example.tex diff --git a/latex/packages.tex b/latex/packages.tex index 785592b..b6c9f3b 100644 --- a/latex/packages.tex +++ b/latex/packages.tex @@ -20,7 +20,7 @@ \usepackage{tabularx} % Package which allows paragraphs in Tables \usepackage[table]{xcolor} % Allows coloring of tables \usepackage{graphicx} % Extends graphics package for figures. Provides optional arguments to the \includegraphics command -\graphicspath{{images/figures/}} +\graphicspath{{figures/}} \usepackage[export]{adjustbox} % Extends the graphicx package to do trimming and other adjustments. \usepackage{epstopdf} % Converts eps images to PDF to use in graphicx package. Must be loaded after graphicx package \usepackage{longtable} % Allows for Automatic page breaks for long tables diff --git a/update_template.sh b/update_template.sh index 37c93a2..9bfe60d 100644 --- a/update_template.sh +++ b/update_template.sh @@ -63,7 +63,7 @@ function install { install_check "src/preface.tex" install_check "src/user_config.tex" fi - cp -r Dedman-Thesis-Latex-Template/images . + cp -r Dedman-Thesis-Latex-Template/figures . cp -r Dedman-Thesis-Latex-Template/bib . install_check "Makefile" @@ -86,7 +86,7 @@ function remove { if [[ -f Makefile ]]; then make realclean fi - rm -rf Makefile user_thesis.tex src latex images bib + rm -rf Makefile user_thesis.tex src latex figures bib } function main {