Merge branch 'xnos' of https://github.com/dendrondal/phd_thesis_markdown

 into xnos

.travis.yml

@@ -32,8 +32,8 @@ before_install:
  - brew install pandoc-citeproc
  - brew cask install mactex
  - tlmgr info fontspec
- - pip install pandoc-fignos pandoc-eqnos pandoc-tablenos \
- pandoc-secnos pandoc-shortcaption --user
+ - sudo pip3 install pandoc-fignos pandoc-eqnos pandoc-tablenos \
+ pandoc-secnos pandoc-shortcaption
 
 # Attempt to create a PDF
 script:

Makefile

@@ -15,7 +15,8 @@ help:
  @echo 'Makefile for the Markdown thesis '
  @echo ' '
  @echo 'Usage: '
- @echo ' make html generate a web version '
+ @echo ' make install install pandoc plugins
+ @echo ' make html generate a web version 
  @echo ' make pdf generate a PDF file '
  @echo ' make docx generate a Docx file '
  @echo ' make tex generate a Latex file '
@@ -24,10 +25,14 @@ help:
  @echo 'get local templates with: pandoc -D latex/html/etc '
  @echo 'or generic ones from: https://github.com/jgm/pandoc-templates '
 
+install:
+ sh $(BASEDIR)/install.sh
+
 pdf:
  pandoc \
  --filter=pandoc-shortcaption \
  --filter=pandoc-xnos \
+ --template="$(STYLEDIR)/template.tex" \
  "$(INPUTDIR)"/*.md \
  -o "$(OUTPUTDIR)/thesis.pdf" \
  -H "$(STYLEDIR)/preamble.tex" \
@@ -41,6 +46,9 @@ pdf:
 
 tex:
  pandoc "$(INPUTDIR)"/*.md \
+ --filter=pandoc-shortcaption \
+ --filter=pandoc-xnos \
+ --template="$(STYLEDIR)/template.tex" \
  --bibliography="$(BIBFILE)" \
  -V fontsize=12pt \
  -V papersize=a4paper \
@@ -75,4 +83,4 @@ html:
  cp -r "$(INPUTDIR)/figures" "$(OUTPUTDIR)/source/figures"
 
 
-.PHONY: help pdf docx html tex 
+.PHONY: help install pdf docx html tex 

README.md

@@ -48,7 +48,7 @@ There are some minor annoyances:
  - A text editor, like [Sublime](https://www.sublimetext.com/), which is what you'll use write the thesis. 
  - A LaTeX distribution (for example, [MacTeX](https://tug.org/mactex/) for Mac users).
  - [Pandoc](http://johnmacfarlane.net/pandoc), for converting the Markdown to the output format of your choice. 
- - Pandoc plugins by running ```bash install.sh``` in the main direcotry
+ - Pandoc plugins by running ```make install```
  - Git, for version control.
 2. [Fork the repository](https://github.com/tompollard/phd_thesis_markdown/fork) on Github 
 3. Clone the repository onto your local computer (or [download the Zip file](https://github.com/tompollard/phd_thesis_markdown/archive/master.zip)). 

install.sh

@@ -0,0 +1,16 @@
+
+#!/usr/bin/env bash
+
+sudo apt-get install pandoc-citeproc &&
+sudo tlmgr install truncate &&
+sudo tlmgr install tocloft &&
+sudo tlmgr install wallpaper &&
+sudo tlmgr install morefloats &&
+sudo tlmgr install sectsty &&
+sudo tlmgr install siunitx &&
+sudo tlmgr install threeparttable &&
+sudo tlmgr update l3packages &&
+sudo tlmgr update l3kernel &&
+sudo tlmgr update l3experimental &&
+pip3 install pandoc-fignos pandoc-eqnos pandoc-tablenos \
+ pandoc-secnos pandoc-shortcaption

source/01_title_page.md

@@ -9,7 +9,8 @@ and add the centred logo
 
  % Delete the following line
  % to remove the UCL header logo
-  
+ \ThisULCornerWallPaper{1.0}{style/univ_logo.eps} 
+
   \vspace*{2.5cm}
   
   \huge

source/12_chapter_4.md

@@ -35,7 +35,7 @@ Fig. @fig:my_fig shows how to add a figure. Donec ut lacinia nibh. Nam tincidunt
 
 <!-- 
 Figures can be added with the following syntax:
-![main_text_caption](source/figures/my_image.pdf, "short_caption(optional)"){#fig:mylabel}{ width=50% }
+![main_text_caption](source/figures/my_image.pdf "short_caption(optional)"){#fig:mylabel}{ width=50% }
 
 For details on setting attributes like width and height, see:
 http://pandoc.org/MANUAL.html#extension-link_attributes