diff --git a/Frontpage.md b/Frontpage.md index 005a375..7d18d80 100644 --- a/Frontpage.md +++ b/Frontpage.md @@ -47,7 +47,7 @@ TEX-declaration: Supporting/OriginallityStatement.tex bibliography: example-bib.bib #Bibliograpy Style -csl: harvard-coventry-university.csl +csl: Template/harvard-coventry-university.csl --- diff --git a/Makefile b/Makefile index 43c4d52..1132d22 100755 --- a/Makefile +++ b/Makefile @@ -5,29 +5,11 @@ # If we have multiple inputs we we can stick them here # NOTE, It is important they are in order # Again we can pass this through the command line -SOURCES = -TARGET = +SOURCES = Frontpage.md EG-Intro.md Lorum.md References.md +TARGET = Dissertaion.pdf -#Give options for creating either Presentations or Reports -#Just comment this line out to switch. -# Alternatively run with Make PRES= -PRES=0 - -#Reveal -#pandoc -t revealjs -V revealjs-url=http://lab.hakim.se/reveal-js --standalone --self-contained presentation.md -o presentation.html - -#I think I quite Like Slideous - - - -ifdef PRES -#Presentations - PDF_PANDOC_OPTIONS = -f markdown+native_divs -t beamer -V theme:metropolis - HTML_PANDOC_OPTIONS = -t revealjs -V revealjs-url=http://lab.hakim.se/reveal-js --standalone -else -#Reports - PDF_PANDOC_OPTIONS = --filter=pandoc-citeproc -endif +#Report Export Options +PDF_PANDOC_OPTIONS = --filter=pandoc-citeproc --template=Template/disso.latex --top-level-division=chapter #Default Sources to the input provide ifndef SOURCES @@ -39,6 +21,7 @@ ifndef TARGET endif #Build a PDF from the relevant sources +#%.pdf: %.md %.pdf: %.md # Old way of doing it, now dealt with through target # #pandoc $(PANDOC_OPTIONS) -o $@ $< @@ -46,15 +29,9 @@ endif %.html: %.md -# #pandoc -t revealjs -V revealjs-url=http://lab.hakim.se/reveal-js $(SOURCES) -o $(TARGET) pandoc $(HTML_PANDOC_OPTIONS) $(SOURCES) -o $(TARGET) - -# #%.tex: $(SOURCES) - -# #Helper method to make all will create target -# all: $(SOURCES) $(TARGET) - - -# .PHONY: all -#pandoc -t revealjs -V revealjs-url=http://lab.hakim.se/reveal-js +%.tex: %.md +# Old way of doing it, now dealt with through target +# #pandoc $(PANDOC_OPTIONS) -o $@ $< + pandoc $(PDF_PANDOC_OPTIONS) -s $(SOURCES) -o Diso.tex