Fix #2676: (latex) Error with verbatim text in captions

Was caused by PR#2627 due to fragile ``\@noligs`` added to ``\code``.
sphinx-doc · Jun 14, 2016 · 8608387 · 8608387
1 parent c0df920
commit 8608387
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git 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
@@ -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}}