Commit 3cb96306 authored by Dimitri van Heesch's avatar Dimitri van Heesch

Bug 732768 - nested html tables cause pdflatex to hang (1.8.4 and 1.8.6)

parent 7a119638
...@@ -434,6 +434,16 @@ ...@@ -434,6 +434,16 @@
}% }%
{\end{xtabular*}\par}% {\end{xtabular*}\par}%
% Used by nested tables
\newenvironment{TabularNC}[1]%
{%
\setlength{\tmplength}%
{\linewidth/(#1)-\tabcolsep*2-\arrayrulewidth*(#1+1)/(#1)}%
\par\begin{tabular*}{\linewidth}%
{*{#1}{|>{\PBS\raggedright\hspace{0pt}}p{\the\tmplength}}|}%
}%
{\end{tabular*}\par}%
% Used for member group headers % Used for member group headers
\newenvironment{Indent}{% \newenvironment{Indent}{%
\begin{list}{}{% \begin{list}{}{%
......
...@@ -809,6 +809,17 @@ void LatexDocVisitor::visitPost(DocHtmlDescData *) ...@@ -809,6 +809,17 @@ void LatexDocVisitor::visitPost(DocHtmlDescData *)
{ {
} }
static const char *getTableName(const DocNode *n)
{
bool isNested=FALSE;
while (n && !isNested)
{
isNested = n->kind()==DocNode::Kind_HtmlTable;
n = n->parent();
}
return isNested ? "TabularNC" : "TabularC";
}
void LatexDocVisitor::visitPre(DocHtmlTable *t) void LatexDocVisitor::visitPre(DocHtmlTable *t)
{ {
m_rowSpans.clear(); m_rowSpans.clear();
...@@ -818,7 +829,7 @@ void LatexDocVisitor::visitPre(DocHtmlTable *t) ...@@ -818,7 +829,7 @@ void LatexDocVisitor::visitPre(DocHtmlTable *t)
{ {
m_t << "\\begin{table}[h]"; m_t << "\\begin{table}[h]";
} }
m_t << "\\begin{TabularC}{" << t->numColumns() << "}\n"; m_t << "\\begin{" << getTableName(t->parent()) << "}{" << t->numColumns() << "}\n";
m_numCols = t->numColumns(); m_numCols = t->numColumns();
m_t << "\\hline\n"; m_t << "\\hline\n";
} }
...@@ -833,14 +844,14 @@ void LatexDocVisitor::visitPost(DocHtmlTable *t) ...@@ -833,14 +844,14 @@ void LatexDocVisitor::visitPost(DocHtmlTable *t)
} }
else else
{ {
m_t << "\\end{TabularC}\n"; m_t << "\\end{" << getTableName(t->parent()) << "}\n";
} }
} }
void LatexDocVisitor::visitPre(DocHtmlCaption *) void LatexDocVisitor::visitPre(DocHtmlCaption *c)
{ {
if (m_hide) return; if (m_hide) return;
m_t << "\\end{TabularC}\n\\centering\n\\caption{"; m_t << "\\end{" << getTableName(c->parent()) << "}\n\\centering\n\\caption{";
} }
void LatexDocVisitor::visitPost(DocHtmlCaption *) void LatexDocVisitor::visitPost(DocHtmlCaption *)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment