From e23435f4d586b0b51e58a3751bd582d65175e144 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Sun, 4 May 2008 07:47:16 +0000
Subject: [PATCH] Fix footnote handling with paragraphs.

---
 CHANGES                     | 1 +
 sphinx/texinputs/sphinx.sty | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/CHANGES b/CHANGES
index 17486b7b6..63ed210d3 100644
--- a/CHANGES
+++ b/CHANGES
@@ -17,6 +17,7 @@ New features added
 
 * A new directive ``tabularcolumns`` can be used to give a tabular column
   specification for LaTeX output.  Tables now use the ``tabulary`` package.
+  Literal blocks can now be placed in tables, with several caveats.
 
 * A new config value, `latex_use_parts`, can be used to enable parts in LaTeX
   documents.
diff --git a/sphinx/texinputs/sphinx.sty b/sphinx/texinputs/sphinx.sty
index a4845a012..94c275cd4 100644
--- a/sphinx/texinputs/sphinx.sty
+++ b/sphinx/texinputs/sphinx.sty
@@ -95,11 +95,11 @@
 % work even in footnote context.
 \newif\ifpy@infootnote \py@infootnotefalse
 \let\py@oldmakefntext\@makefntext
-\def\@makefntext#1{%
-  \bgroup%
+\renewcommand{\@makefntext}[1]{%
+  \begingroup%
     \py@infootnotetrue
     \py@oldmakefntext{#1}%
-  \egroup%
+  \endgroup%
 }
 \def\py@defaultsize{%
   \ifpy@infootnote\footnotesize\else\normalsize\fi%