Fix #423 Code blocks in sidebars cause LaTeX errors.

Do not use the "alltt" enviromnent in sidebars.

In admonitions and system-messages, "alltt" is used
unless the "legacy-class-functions" setting is True.
(Admonitions and system-messages are implemented as
environments since rev 8479.)

Thanks to Clément Pit-Claudel for reporting.

git-svn-id: https://svn.code.sf.net/p/docutils/code/trunk@8820 929543f6-e4f2-0310-98a6-ba3bd3dd1d04

5 files changed, 63 insertions, 10 deletions

diff --git a/docutils/test/functional/expected/latex_literal_block.tex b/docutils/test/functional/expected/latex_literal_block.tex
index f93dabfbc..355bd5945 100644
--- a/docutils/test/functional/expected/latex_literal_block.tex
+++ b/docutils/test/functional/expected/latex_literal_block.tex
@@ -6,6 +6,7 @@
 \usepackage[utf8]{inputenc}
 \usepackage{alltt}
 \usepackage{amsmath}
+\usepackage{color}
 \usepackage{graphicx}
 \usepackage{longtable,ltcaption,array}
 \setlength{\extrarowheight}{2pt}
@@ -106,12 +107,22 @@ test &
 A literal block in an admonition:
 
 \begin{quote}
-\ttfamily\raggedright
-\textbackslash{}sin\textasciicircum{}2~x
+\begin{alltt}
+\textbackslash{}sin^2 x
+\end{alltt}
 \end{quote}
 \end{DUadmonition}
 \end{DUclass}
 
+\DUsidebar{
+\DUtitle{Literal Block in a Sidebar}
+
+\begin{quote}
+\ttfamily\raggedright
+\textbackslash{}sin\textasciicircum{}2~x
+\end{quote}
+}
+
 Parsed literal block with inline markup and leading whitespace:
 
 \begin{quote}
diff --git a/docutils/test/functional/expected/latex_literal_block_fancyvrb.tex b/docutils/test/functional/expected/latex_literal_block_fancyvrb.tex
index a334e03d0..9370c963f 100644
--- a/docutils/test/functional/expected/latex_literal_block_fancyvrb.tex
+++ b/docutils/test/functional/expected/latex_literal_block_fancyvrb.tex
@@ -5,6 +5,7 @@
 \usepackage[T1]{fontenc}
 \usepackage[utf8]{inputenc}
 \usepackage{amsmath}
+\usepackage{color}
 \usepackage{graphicx}
 \usepackage{fancyvrb}
 \usepackage{longtable,ltcaption,array}
@@ -106,12 +107,22 @@ test &
 A literal block in an admonition:
 
 \begin{quote}
-\ttfamily\raggedright
-\textbackslash{}sin\textasciicircum{}2~x
+\begin{Verbatim}
+\sin^2 x
+\end{Verbatim}
 \end{quote}
 \end{DUadmonition}
 \end{DUclass}
 
+\DUsidebar{
+\DUtitle{Literal Block in a Sidebar}
+
+\begin{quote}
+\ttfamily\raggedright
+\textbackslash{}sin\textasciicircum{}2~x
+\end{quote}
+}
+
 Parsed literal block with inline markup and leading whitespace:
 
 \begin{quote}
diff --git a/docutils/test/functional/expected/latex_literal_block_listings.tex b/docutils/test/functional/expected/latex_literal_block_listings.tex
index 61bf6e54d..c4ae02733 100644
--- a/docutils/test/functional/expected/latex_literal_block_listings.tex
+++ b/docutils/test/functional/expected/latex_literal_block_listings.tex
@@ -5,6 +5,7 @@
 \usepackage[T1]{fontenc}
 \usepackage[utf8]{inputenc}
 \usepackage{amsmath}
+\usepackage{color}
 \usepackage{graphicx}
 \usepackage{listings}
 \lstset{xleftmargin=\leftmargin}
@@ -110,12 +111,20 @@ test &
 
 A literal block in an admonition:
 
+\begin{lstlisting}
+\sin^2 x
+\end{lstlisting}
+\end{DUadmonition}
+\end{DUclass}
+
+\DUsidebar{
+\DUtitle{Literal Block in a Sidebar}
+
 \begin{quote}
 \ttfamily\raggedright
 \textbackslash{}sin\textasciicircum{}2~x
 \end{quote}
-\end{DUadmonition}
-\end{DUclass}
+}
 
 Parsed literal block with inline markup and leading whitespace:
 
diff --git a/docutils/test/functional/expected/latex_literal_block_verbatim.tex b/docutils/test/functional/expected/latex_literal_block_verbatim.tex
index 823651730..35d5b0da6 100644
--- a/docutils/test/functional/expected/latex_literal_block_verbatim.tex
+++ b/docutils/test/functional/expected/latex_literal_block_verbatim.tex
@@ -5,6 +5,7 @@
 \usepackage[T1]{fontenc}
 \usepackage[utf8]{inputenc}
 \usepackage{amsmath}
+\usepackage{color}
 \usepackage{graphicx}
 \usepackage{longtable,ltcaption,array}
 \setlength{\extrarowheight}{2pt}
@@ -105,12 +106,22 @@ test &
 A literal block in an admonition:
 
 \begin{quote}
-\ttfamily\raggedright
-\textbackslash{}sin\textasciicircum{}2~x
+\begin{verbatim}
+\sin^2 x
+\end{verbatim}
 \end{quote}
 \end{DUadmonition}
 \end{DUclass}
 
+\DUsidebar{
+\DUtitle{Literal Block in a Sidebar}
+
+\begin{quote}
+\ttfamily\raggedright
+\textbackslash{}sin\textasciicircum{}2~x
+\end{quote}
+}
+
 Parsed literal block with inline markup and leading whitespace:
 
 \begin{quote}
diff --git a/docutils/test/functional/expected/latex_literal_block_verbatimtab.tex b/docutils/test/functional/expected/latex_literal_block_verbatimtab.tex
index 2da4fde8b..46b863585 100644
--- a/docutils/test/functional/expected/latex_literal_block_verbatimtab.tex
+++ b/docutils/test/functional/expected/latex_literal_block_verbatimtab.tex
@@ -5,6 +5,7 @@
 \usepackage[T1]{fontenc}
 \usepackage[utf8]{inputenc}
 \usepackage{amsmath}
+\usepackage{color}
 \usepackage{graphicx}
 \usepackage{moreverb}
 \usepackage{longtable,ltcaption,array}
@@ -106,12 +107,22 @@ test &
 A literal block in an admonition:
 
 \begin{quote}
-\ttfamily\raggedright
-\textbackslash{}sin\textasciicircum{}2~x
+\begin{verbatimtab}
+\sin^2 x
+\end{verbatimtab}
 \end{quote}
 \end{DUadmonition}
 \end{DUclass}
 
+\DUsidebar{
+\DUtitle{Literal Block in a Sidebar}
+
+\begin{quote}
+\ttfamily\raggedright
+\textbackslash{}sin\textasciicircum{}2~x
+\end{quote}
+}
+
 Parsed literal block with inline markup and leading whitespace:
 
 \begin{quote}