diff --git a/CHANGES b/CHANGES index 3c1b5d981..890d9bd59 100644 --- a/CHANGES +++ b/CHANGES @@ -4,6 +4,8 @@ Release 1.4.5 (in development) Bugs fixed ---------- +* #2676: (latex) Error with verbatim text in captions since Sphinx 1.4.4 + Release 1.4.4 (released Jun 12, 2016) ===================================== diff --git a/sphinx/texinputs/sphinx.sty b/sphinx/texinputs/sphinx.sty index 9b09b2b51..1c98654b3 100644 --- a/sphinx/texinputs/sphinx.sty +++ b/sphinx/texinputs/sphinx.sty @@ -145,10 +145,10 @@ % Some custom font markup commands. % \newcommand{\strong}[1]{{\textbf{#1}}} -% let \code and \bfcode use straight quotes (\@noligs patched by upquote) -% use \scantokens to handle e.g. \item[{\code{'fontenc'}}], too late for -% \code to change catcodes. -\newcommand{\code}[1]{{\@noligs\scantokens{\texttt{#1}}}} +% let \code and \bfcode use straight quotes. \@noligs patched by upquote, +% but needs protection in "moving arguments" such as for captions. +\newcommand{\code}{}% raise error if exists already +\DeclareRobustCommand{\code}[1]{{\@noligs\scantokens{\texttt{#1}}}} \newcommand{\bfcode}[1]{\code{\bfseries#1}} \newcommand{\email}[1]{\textsf{#1}} \newcommand{\tablecontinued}[1]{\textsf{#1}}