Skip to content

Commit

Permalink
revert pandoc-shortcaption tompollard#47 for now. fixes tompollard#48.
Browse files Browse the repository at this point in the history
  • Loading branch information
tompollard committed Feb 15, 2017
1 parent f24d043 commit f122589
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 8 deletions.
3 changes: 1 addition & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ env:

before_install:
# Fetch pandoc and pandoc-citeproc binaries
- wget https://github.com/jgm/pandoc/releases/download/1.17.2/pandoc-1.17.2-1-amd64.deb && ar p pandoc-1.17.2-1-amd64.deb data.tar.gz | tar zx
- wget https://github.com/jgm/pandoc/releases/download/1.15.0.5/pandoc-1.15.0.5-1-amd64.deb && ar p pandoc-1.15.0.5-1-amd64.deb data.tar.gz | tar zx
# Install TeX Live
- sudo add-apt-repository -y ppa:texlive-backports/ppa
- sudo apt-get update -qq
Expand All @@ -25,7 +25,6 @@ before_install:
- sudo apt-get install texlive-science
# Install fonts
- sudo apt-get install lmodern
- sudo pip install pandoc-shortcaption

# Attempt to create a PDF
script:
Expand Down
5 changes: 2 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ help:

pdf:
pandoc "$(INPUTDIR)"/*.md \
--filter pandoc-shortcaption \
-o "$(OUTPUTDIR)/thesis.pdf" \
-H "$(STYLEDIR)/preamble.tex" \
--template="$(STYLEDIR)/template.tex" \
Expand All @@ -48,8 +47,8 @@ tex:
-V papersize=a4paper \
-V documentclass:report \
-N \
--filter pandoc-shortcaption
--csl="$(STYLEDIR)/ref_format.csl"
--csl="$(STYLEDIR)/ref_format.csl" \
--latex-engine=xelatex

docx:
pandoc "$(INPUTDIR)"/*.md \
Expand Down
Binary file modified output/thesis.pdf
Binary file not shown.
5 changes: 3 additions & 2 deletions source/06_list_of_figures.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
<!--
# List of figures {.unnumbered}

<!--
For me, this was the only drawback of writing in Markdown: it is not possible to add a short caption to figures and tables. This means that the \listoftables and \listoffigures commands will generate lists using the full titles, which is probably isn't what you want. For now, the solution is to create the lists manually, when everything else is finished.
-->

\listoffigures
Figure 4.1 This is an example figure . . . \hfill{pp}
Figure x.x Short title of the figure . . . \hfill{pp}

\pagenumbering{roman}
\setcounter{page}{3}
Expand Down
2 changes: 1 addition & 1 deletion source/12_chapter_4.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ For details on setting attributes like width and height, see:
http://pandoc.org/MANUAL.html#extension-link_attributes
-->

![RV Calypso is a former British Royal Navy minesweeper converted into a research vessel for the oceanographic researcher Jacques-Yves Cousteau. It was equipped with a mobile laboratory for underwater field research. \label{ref_a_figure}](source/figures/example_figure.pdf "RV Calypso research vessel"){ width=100% }
![RV Calypso is a former British Royal Navy minesweeper converted into a research vessel for the oceanographic researcher Jacques-Yves Cousteau. It was equipped with a mobile laboratory for underwater field research. \label{ref_a_figure}](source/figures/example_figure.pdf){ width=100% }

## Conclusion

Expand Down

0 comments on commit f122589

Please sign in to comment.