From f51b945d897326548579847bb97f58a95e1a5bf1 Mon Sep 17 00:00:00 2001
From: tk0miya <i.tkomiya@gmail.com>
Date: Wed, 8 Oct 2014 21:52:33 +0900
Subject: [PATCH] Add frame to code-block in LaTeX

---
 sphinx/highlighting.py | 4 +++-
 tests/test_markup.py   | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/sphinx/highlighting.py b/sphinx/highlighting.py
index c2d2e89a6..e257c3702 100644
--- a/sphinx/highlighting.py
+++ b/sphinx/highlighting.py
@@ -96,7 +96,7 @@ class PygmentsBridge(object):
             source = source.translate(escape_hl_chars)
             # then, escape all characters nonrepresentable in LaTeX
             source = source.translate(tex_hl_escape_map_new)
-            return '\\begin{Verbatim}[commandchars=\\\\\\{\\}]\n' + \
+            return '\\begin{Verbatim}[frame=single,commandchars=\\\\\\{\\}]\n' + \
                    source + '\\end{Verbatim}\n'
 
     def try_parse(self, src):
@@ -190,6 +190,8 @@ class PygmentsBridge(object):
         if self.dest == 'html':
             return hlsource
         else:
+            hlsource = re.sub(r'(?<=\\begin{Verbatim}\[)(?=commandchars)',
+                              r'frame=single,', hlsource)
             if not isinstance(hlsource, text_type):  # Py2 / Pygments < 1.6
                 hlsource = hlsource.decode()
             return hlsource.translate(tex_hl_escape_map_new)
diff --git a/tests/test_markup.py b/tests/test_markup.py
index 88b8a2c7d..8bac63244 100644
--- a/tests/test_markup.py
+++ b/tests/test_markup.py
@@ -136,7 +136,7 @@ def test_latex_escaping():
            r'\(\Gamma\)\textbackslash{}\(\infty\)\$')
     # in verbatim code fragments
     yield (verify, u'::\n\n @Γ\\∞${}', None,
-           u'\\begin{Verbatim}[commandchars=\\\\\\{\\}]\n'
+           u'\\begin{Verbatim}[frame=single,commandchars=\\\\\\{\\}]\n'
            u'@\\(\\Gamma\\)\\PYGZbs{}\\(\\infty\\)\\PYGZdl{}\\PYGZob{}\\PYGZcb{}\n'
            u'\\end{Verbatim}')
     # in URIs