Skip to content

Commit

Permalink
Merge pull request #950 from paulromano/release-0.10
Browse files Browse the repository at this point in the history
Final updates for next release
  • Loading branch information
nelsonag committed Jan 8, 2018
2 parents 9374695 + 59b15fe commit 455efff
Show file tree
Hide file tree
Showing 24 changed files with 669 additions and 336 deletions.
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (c) 2011-2017 Massachusetts Institute of Technology
Copyright (c) 2011-2018 Massachusetts Institute of Technology

Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
Expand Down
12 changes: 0 additions & 12 deletions docs/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,6 @@ PAPEROPT_a4 = -D latex_paper_size=a4
PAPEROPT_letter = -D latex_paper_size=letter
ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) source

# SVG to PDF conversion
SVG2PDF = inkscape
PDFS = $(patsubst %.svg,%.pdf,$(wildcard $(IMAGEDIR)/*.svg))

# Tikz to PNG conversion
PNGS = $(patsubst %.tex,%.png,$(wildcard $(IMAGEDIR)/*.tex))

Expand All @@ -41,21 +37,13 @@ help:
@echo " linkcheck to check all external links for integrity"
@echo " doctest to run all doctests embedded in the documentation (if enabled)"

# Pattern rule for converting SVG to PDF
%.pdf: %.svg
$(SVG2PDF) -f $< -A $@

%.png: %.tex
pdflatex --interaction=nonstopmode --output-directory=$(IMAGEDIR) $<
pdftoppm -r 120 -singlefile $(patsubst %.tex,%.pdf, $<) $(basename $<)
convert -trim -fuzz 2% -transparent white $(patsubst %.tex,%.ppm,$<) $@

# Rule to build PDFs
images: $(PDFS) $(PNGS)

clean:
-rm -rf $(BUILDDIR)/*
-rm -rf $(PDFS)
-rm -rf source/pythonapi/generated/

html:
Expand Down
Loading

0 comments on commit 455efff

Please sign in to comment.