Fix: footnotes from table get displayed twice in LaTeX. To fix this, restoring footnote support hotfix for tabulary.sty that had been lost at f938a95 for #949. Closes #1522

This commit is contained in:
Takayuki Shimizukawa 2014-08-26 22:37:18 +09:00
parent 438f9fe3de
commit e9aae6563d
2 changed files with 5 additions and 0 deletions

View File

@ -40,6 +40,8 @@ Bugs fixed
to Takeshi Komiya.
* #1477: gettext does not extract nodes.line in a table or list.
* #1544: `make text` generate wrong table when it has empty table cells.
* #1522: Footnotes from table get displayed twice in LaTeX. This problem has
been appeared from Sphinx-1.2.1 by #949.
Release 1.2.2 (released Mar 2, 2014)
====================================

View File

@ -109,6 +109,8 @@ Z \string\tymax: \the\tymax^^J}%
\global\advance\TY@linewidth-#1\relax}
\def\endtabulary{%
\gdef\@halignto{}%
\let\TY@footnote\footnote%
\def\footnote{}% prevent footnotes from doing anything
\expandafter\TY@tab\the\toks@
\crcr\omit
{\xdef\TY@save@row{}%
@ -172,6 +174,7 @@ Z \message{> tymin}%
\TY@checkmin
\TY@count\z@
\let\TY@box\TY@box@v
\let\footnote\TY@footnote % restore footnotes
{\expandafter\TY@final\the\toks@\endTY@final}%
\count@\z@
\@tempswatrue