Merge pull request #345 from pdebuyl/fix_papersize

fix the sphinx settings for papersize

Author: pdebuyl

Makefile

@@ -5,12 +5,8 @@
 PYTHON        = python
 SPHINXOPTS    =
 SPHINXBUILD   = $(PYTHON) -m sphinx
-PAPER         = a4
 
-# Internal variables.
-PAPEROPT_a4     = -D latex_paper_size=a4
-PAPEROPT_letter = -D latex_paper_size=letter
-ALLSPHINXOPTS   = -d build/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
+ALLSPHINXOPTS   = -d build/doctrees $(SPHINXOPTS) .
 
 
 .PHONY: help clean html web pickle htmlhelp latex changes linkcheck zip

conf.py

@@ -346,6 +346,7 @@ def __init__(self, **options):
 """
 
 latex_elements = {
+    'papersize': 'a4paper',
     'preamble': preamble,
     'fontpkg': '\\usepackage{lmodern}',
     'fncychap': r'''%