summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon Waltman <jonathan.waltman@gmail.com>2013-02-22 01:36:07 -0600
committerJon Waltman <jonathan.waltman@gmail.com>2013-02-22 01:36:07 -0600
commit389344cf4337f37f14479a650c60700fa8624d7c (patch)
tree70e78fe83d5c30eea3cc164c7f2bda18ebdd1bcd
parent1509bec4b601cd9846c7c4a6faabeac1b719e019 (diff)
parent50c93f3ca9f5e68b79425a611d8cd89da973e946 (diff)
downloadsphinx-389344cf4337f37f14479a650c60700fa8624d7c.tar.gz
Merged in mitya57/sphinx (pull request #114)
LaTeX writer: include cmap package by default
-rw-r--r--doc/config.rst6
-rw-r--r--sphinx/writers/latex.py2
2 files changed, 7 insertions, 1 deletions
diff --git a/doc/config.rst b/doc/config.rst
index 2b15a368..44954f6d 100644
--- a/doc/config.rst
+++ b/doc/config.rst
@@ -1077,7 +1077,7 @@ These options influence LaTeX output.
"Rejne". You can also set this to ``''`` to disable fncychap.
``'preamble'``
Additional preamble content, default empty.
- ``'footer'```
+ ``'footer'``
Additional footer content (before the indices), default empty.
* Keys that don't need be overridden unless in special cases are:
@@ -1085,6 +1085,10 @@ These options influence LaTeX output.
``'inputenc'``
"inputenc" package inclusion, default
``'\\usepackage[utf8]{inputenc}'``.
+ ``'cmappkg'``
+ "cmap" package inclusion, default ``'\\usepackage{cmap}'``.
+
+ .. versionadded:: 1.2
``'fontenc'``
"fontenc" package inclusion, default ``'\\usepackage[T1]{fontenc}'``.
``'maketitle'``
diff --git a/sphinx/writers/latex.py b/sphinx/writers/latex.py
index 9358ad12..1d008db5 100644
--- a/sphinx/writers/latex.py
+++ b/sphinx/writers/latex.py
@@ -34,6 +34,7 @@ HEADER = r'''%% Generated by Sphinx.
\documentclass[%(papersize)s,%(pointsize)s%(classoptions)s]{%(wrapperclass)s}
%(inputenc)s
%(utf8extra)s
+%(cmappkg)s
%(fontenc)s
%(babel)s
%(fontpkg)s
@@ -138,6 +139,7 @@ class LaTeXTranslator(nodes.NodeVisitor):
'extraclassoptions': '',
'inputenc': '\\usepackage[utf8]{inputenc}',
'utf8extra': '\\DeclareUnicodeCharacter{00A0}{\\nobreakspace}',
+ 'cmappkg': '\\usepackage{cmap}',
'fontenc': '\\usepackage[T1]{fontenc}',
'babel': '\\usepackage{babel}',
'fontpkg': '\\usepackage{times}',