[trafficserver] branch master updated: Doc: Fix LaTex paper size options to work and not generate a warning.

[am...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

amc pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git


The following commit(s) were added to refs/heads/master by this push:
     new 14233c0  Doc: Fix LaTex paper size options to work and not generate a warning.
14233c0 is described below

commit 14233c087b25b7c39f131c5d300eeadff31fbe5c
Author: Alan M. Carroll <am...@apache.org>
AuthorDate: Fri Aug 4 19:01:54 2017 -0500

    Doc: Fix LaTex paper size options to work and not generate a warning.
---
 doc/Makefile.am | 7 +++++--
 doc/conf.py     | 5 +++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 557d8a4..f45921d 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -46,8 +46,11 @@ PAPER         = letter
 BUILDDIR      = docbuild
 
 # Internal variables.
-PAPEROPT_a4     = -D latex_paper_size=a4
-PAPEROPT_letter = -D latex_paper_size=letter
+# [amc] LaTex apparently doesn't work as of Sphinx 1.6.1
+# see https://media.readthedocs.org/pdf/sphinx/1.6.3/sphinx.pdf
+# section 24.3.2 around page 247, third item for 'NotImplementedError', so this is kind of useless.
+PAPEROPT_a4     = -t latex_a4
+PAPEROPT_letter = -t latex_letter
 ALLSPHINXOPTS   = $(SPHINXOPTS)
 # the i18n builder cannot share the environment and doctrees with the others
 I18NSPHINXOPTS  = $(SPHINXOPTS)
diff --git a/doc/conf.py b/doc/conf.py
index 5260a2d..3927bd6 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -335,6 +335,11 @@ latex_elements = {
     #'preamble': '',
 }
 
+if tags.has('latex_a4') :
+    latex_elements['papersize'] = 'a4paper'
+elif tags.has('latex_paper') :
+    latex_elements['papersiize'] = 'letterpaper'
+
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title, author, documentclass [howto/manual]).
 latex_documents = [

-- 
To stop receiving notification emails like this one, please contact
['"commits@trafficserver.apache.org" <co...@trafficserver.apache.org>'].