docstring ret;
idx_type cell = getFirstCellInRow(row);
- xs << StartTag("tr");
+ xs << html::StartTag("tr");
for (col_type j = 0; j < column_info.size(); ++j) {
if (isPartOfMultiColumn(row, j))
continue;
if (isMultiColumn(cell))
attr << " colspan='" << columnSpan(cell) << "'";
- xs << StartTag("td", attr.str());
+ xs << html::StartTag("td", attr.str());
ret += cellInset(cell)->xhtml(xs, runparams);
- xs << EndTag("td");
+ xs << html::EndTag("td");
++cell;
}
- xs << EndTag("tr");
+ xs << html::EndTag("tr");
return ret;
}
docstring Tabular::xhtml(XHTMLStream & xs, OutputParams const & runparams) const
{
docstring ret;
- xs << StartTag("table");
-
// It's unclear to me if we need to mess with the long table stuff.
// We can borrow that too from docbook, if so.
- xs << StartTag("tbody");
+ xs << html::StartTag("tbody");
for (row_type i = 0; i < row_info.size(); ++i) {
if (isValidRow(i)) {
ret += xhtmlRow(xs, i, runparams);
}
}
- xs << EndTag("tbody");
- xs << EndTag("table");
-
+ xs << html::EndTag("tbody");
return ret;
}
cur.pit() = 0;
cur.pos() = cur.lastpos(); // FIXME crude guess
}
+ cur.setCurrentFont();
// FIXME: this accesses the position cache before it is initialized
//resetPos(cur);
//cur.bv().fitCursor();
}
-void InsetTabular::updateLabels(ParIterator const & it, bool out)
+void InsetTabular::updateLabels(ParIterator const & it, UpdateType utype)
{
// In a longtable, tell captions what the current float is
Counters & cnts = buffer().masterBuffer()->params().documentClass().counters();
it2.forwardPos();
size_t const end = it2.nargs();
for ( ; it2.idx() < end; it2.top().forwardIdx())
- buffer().updateLabels(it2, out);
+ buffer().updateLabels(it2, utype);
//reset afterwards
if (tabular.is_long_tabular)
TextMetrics const & tm =
cur.bv().textMetrics(cell(cur.idx())->getText(0));
cur.pos() = tm.x2pos(cur.pit(), 0, cur.targetX());
+ cur.setCurrentFont();
}
}
if (sl == cur.top()) {
if (cur.selIsMultiCell()) {
cur.pit() = cur.lastpit();
cur.pos() = cur.lastpos();
+ cur.setCurrentFont();
return;
}
break;
ParagraphMetrics const & pm =
tm.parMetrics(cur.lastpit());
cur.pos() = tm.x2pos(cur.pit(), pm.rows().size()-1, cur.targetX());
+ cur.setCurrentFont();
}
}
if (sl == cur.top()) {
if (cur.selIsMultiCell()) {
cur.pit() = 0;
cur.pos() = cur.lastpos();
+ cur.setCurrentFont();
return;
}
break;
docstring InsetTabular::xhtml(XHTMLStream & xs, OutputParams const & rp) const
{
- return tabular.xhtml(xs, rp);
+ // FIXME XHTML
+ // It'd be better to be able to get this from an InsetLayout, but at present
+ // InsetLayouts do not seem really to work for things that aren't InsetTexts.
+ xs << html::StartTag("table");
+ docstring ret = tabular.xhtml(xs, rp);
+ xs << html::EndTag("table");
+ return ret;
}
void InsetTabular::validate(LaTeXFeatures & features) const
{
tabular.validate(features);
+ // FIXME XHTML
+ // It'd be better to be able to get this from an InsetLayout, but at present
+ // InsetLayouts do not seem really to work for things that aren't InsetTexts.
+ if (features.runparams().flavor == OutputParams::HTML)
+ features.addPreambleSnippet("<style type=\"text/css\">\n"
+ "table { border: 1px solid black; display: inline-block; }\n"
+ "td { border: 1px solid black; padding: 0.5ex; }\n"
+ "</style>");
}
break;
}
-
+ cur.setCurrentFont();
resetPos(cur);
}
break;
}
-
+ cur.setCurrentFont();
resetPos(cur);
}