anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-25 19:07:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

XHTML/DocBook tables: slight refactoring.

Browse Source
This commit is contained in:
Thibaut Cuvelier 2022-04-01 20:39:02 +02:00
parent 72f630cb8f
commit 838157392a
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/insets/InsetTabular.cpp
View File

@ -3659,9 +3659,10 @@ docstring Tabular::xmlRow(XMLStream & xs, row_type row, OutputParams const & run
bool header, bool is_xhtml, BufferParams::TableOutput docbook_table_output) const bool header, bool is_xhtml, BufferParams::TableOutput docbook_table_output) const
{ {
docstring ret; docstring ret;
const bool is_xhtml_table = is_xhtml || docbook_table_output == BufferParams::TableOutput::HTMLTable;
std::string const row_tag = (is_xhtml || docbook_table_output == BufferParams::TableOutput::HTMLTable) ? "tr" : "row"; std::string const row_tag = is_xhtml_table ? "tr" : "row";
std::string const cell_tag = (is_xhtml || docbook_table_output == BufferParams::TableOutput::HTMLTable) ? (header ? "th" : "td") : "entry"; std::string const cell_tag = is_xhtml_table ? (header ? "th" : "td") : "entry";
idx_type cell = getFirstCellInRow(row); idx_type cell = getFirstCellInRow(row);
xs << xml::StartTag(row_tag); xs << xml::StartTag(row_tag);
@ -3672,7 +3673,7 @@ docstring Tabular::xmlRow(XMLStream & xs, row_type row, OutputParams const & run
stringstream attr; stringstream attr;
if (is_xhtml || docbook_table_output == BufferParams::TableOutput::HTMLTable) { if (is_xhtml_table) {
Length const cwidth = column_info[c].p_width; Length const cwidth = column_info[c].p_width;
if (!cwidth.zero()) { if (!cwidth.zero()) {
string const hwidth = cwidth.asHTMLString(); string const hwidth = cwidth.asHTMLString();