From 0a11494e60f3bf7c42eee61712ec281986a4c0d7 Mon Sep 17 00:00:00 2001
From: Dmitry Shachnev <mitya57@gmail.com>
Date: Sun, 10 Feb 2013 18:02:21 +0400
Subject: [PATCH 1/3] LaTeX writer: include cmap package by default. Also, fix
 a small typo in config.rst.

---
 doc/config.rst          | 4 +++-
 sphinx/writers/latex.py | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/doc/config.rst b/doc/config.rst
index 34d862e9a..fe8717aac 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,8 @@ These options influence LaTeX output.
      ``'inputenc'``
         "inputenc" package inclusion, default
         ``'\\usepackage[utf8]{inputenc}'``.
+     ``'cmappkg'``
+        "cmap" package inclusion, default ``'\\usepackage{cmap}'``.
      ``'fontenc'``
         "fontenc" package inclusion, default ``'\\usepackage[T1]{fontenc}'``.
      ``'maketitle'``
diff --git a/sphinx/writers/latex.py b/sphinx/writers/latex.py
index fc5da4163..7fae4a1b0 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}\n',
         'fontenc':         '\\usepackage[T1]{fontenc}',
         'babel':           '\\usepackage{babel}',
         'fontpkg':         '\\usepackage{times}',

From 0bca7c4d6e86d30b08aab82f870ca64438de1c9e Mon Sep 17 00:00:00 2001
From: Dmitry Shachnev <mitya57@gmail.com>
Date: Sun, 10 Feb 2013 18:15:28 +0400
Subject: [PATCH 2/3] No need for \n in previous change

---
 sphinx/writers/latex.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sphinx/writers/latex.py b/sphinx/writers/latex.py
index 7fae4a1b0..fbd135194 100644
--- a/sphinx/writers/latex.py
+++ b/sphinx/writers/latex.py
@@ -139,7 +139,7 @@ class LaTeXTranslator(nodes.NodeVisitor):
         'extraclassoptions': '',
         'inputenc':        '\\usepackage[utf8]{inputenc}',
         'utf8extra':       '\\DeclareUnicodeCharacter{00A0}{\\nobreakspace}',
-        'cmappkg':         '\\usepackage{cmap}\n',
+        'cmappkg':         '\\usepackage{cmap}',
         'fontenc':         '\\usepackage[T1]{fontenc}',
         'babel':           '\\usepackage{babel}',
         'fontpkg':         '\\usepackage{times}',

From 6d4efb2d1f7706f8a78a660e14929f45778a005c Mon Sep 17 00:00:00 2001
From: Dmitry Shachnev <mitya57@gmail.com>
Date: Mon, 11 Feb 2013 09:11:18 +0400
Subject: [PATCH 3/3] Add a versionadded directive

---
 doc/config.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/config.rst b/doc/config.rst
index fe8717aac..9c969c44e 100644
--- a/doc/config.rst
+++ b/doc/config.rst
@@ -1087,6 +1087,8 @@ These options influence LaTeX output.
         ``'\\usepackage[utf8]{inputenc}'``.
      ``'cmappkg'``
         "cmap" package inclusion, default ``'\\usepackage{cmap}'``.
+
+        .. versionadded:: 1.2
      ``'fontenc'``
         "fontenc" package inclusion, default ``'\\usepackage[T1]{fontenc}'``.
      ``'maketitle'``