#include "LyXRC.h"
#include "MetricsInfo.h"
#include "OutputParams.h"
+#include "xml.h"
#include "output_xhtml.h"
#include "Paragraph.h"
#include "ParagraphParameters.h"
}
-bool getTokenValue(string const & str, char const * token, Change & change, BufferParams bp)
+bool getTokenValue(string const & str, char const * token, Change & change, BufferParams & bp)
{
// set the change to be Change() as default as this it should be if not
// in the file format.
template <>
string const write_attribute(string const & name, Length const & value)
{
- // we write only the value if we really have one same reson as above.
+ // we write only the value if we really have one same reason as above.
return value.zero() ? string() : write_attribute(name, value.asString());
}
-string const write_attribute(string const & name, Change const & change, BufferParams const bp)
+string const write_attribute(string const & name, Change const & change, BufferParams const & bp)
{
odocstringstream ods;
if (change.inserted())
{
InsetTableCell tail = InsetTableCell(head);
DocIterator const dit = separatorPos(&head, align_d);
- hassep = (bool)dit;
+ hassep = static_cast<bool>(dit);
if (hassep) {
- pit_type const psize = head.paragraphs().front().size();
+ pos_type const psize = head.paragraphs().front().size();
head.paragraphs().front().eraseChars(dit.pos(), psize, false);
tail.paragraphs().front().eraseChars(0,
dit.pos() < psize ? dit.pos() + 1 : psize, false);
continue;
}
cell_info[row][column].inset->toggleMultiCol(false);
- // columnofcell needs to be called before setting width and aligment
+ // columnofcell needs to be called before setting width and alignment
// multirow cells inherit the width from the column width
if (!isPartOfMultiRow(row, column)) {
columnofcell[i] = column;
int restwidth = -1;
if (!tab_width.zero()) {
restwidth = mi.base.inPixels(tab_width);
- // Substract the fixed widths from the table width
- for (auto const w : max_pwidth)
+ // Subtract the fixed widths from the table width
+ for (auto const & w : max_pwidth)
restwidth -= w.second;
}
// Now consider that some variable width columns exceed the vcolwidth
if (vcolwidth > 0) {
bool changed = false;
- for (auto const w : max_width) {
+ for (auto const & w : max_width) {
if (tabularx || w.second > vcolwidth) {
--restcols;
restwidth -= w.second;
bool Tabular::isLastCell(idx_type cell) const
{
- if (cell + 1 < numberofcells)
- return false;
- return true;
+ return cell + 1 >= numberofcells;
}
}
-int Tabular::docbookRow(odocstream & os, row_type row,
- OutputParams const & runparams) const
+void Tabular::docbookRow(XMLStream & xs, row_type row,
+ OutputParams const & runparams, bool header) const
{
- int ret = 0;
+ switch (buffer().params().docbook_table_output) {
+ case BufferParams::HTMLTable:
+ docbookRowAsHTML(xs, row, runparams, header);
+ break;
+ case BufferParams::CALSTable:
+ docbookRowAsCALS(xs, row, runparams);
+ break;
+ }
+}
+
+
+void Tabular::docbookRowAsHTML(XMLStream & xs, row_type row,
+ OutputParams const & runparams, bool header) const
+{
+ string const celltag = header ? "th" : "td";
idx_type cell = getFirstCellInRow(row);
- os << "<row>\n";
+ xs << xml::StartTag("tr");
+ xs << xml::CR();
for (col_type c = 0; c < ncols(); ++c) {
- if (isPartOfMultiColumn(row, c))
+ if (isPartOfMultiColumn(row, c) || isPartOfMultiRow(row, c))
continue;
- os << "<entry align=\"";
+ stringstream attr;
+
+ Length const cwidth = column_info[c].p_width;
+ if (!cwidth.zero()) {
+ string const hwidth = cwidth.asHTMLString();
+ attr << "style =\"width: " << hwidth << ";\" ";
+ }
+
+ attr << "align='";
switch (getAlignment(cell)) {
+ case LYX_ALIGN_BLOCK:
+ attr << "justify";
+ break;
+ case LYX_ALIGN_DECIMAL: {
+ Language const *tlang = buffer().paragraphs().front().getParLanguage(buffer().params());
+ attr << "char' char='" << to_utf8(tlang->decimalSeparator());
+ }
+ break;
case LYX_ALIGN_LEFT:
- os << "left";
+ attr << "left";
break;
case LYX_ALIGN_RIGHT:
- os << "right";
+ attr << "right";
break;
default:
- os << "center";
+ attr << "center";
break;
}
-
- os << "\" valign=\"";
+ attr << "'";
+ attr << " valign='";
switch (getVAlignment(cell)) {
case LYX_VALIGN_TOP:
- os << "top";
+ attr << "top";
break;
case LYX_VALIGN_BOTTOM:
- os << "bottom";
+ attr << "bottom";
break;
case LYX_VALIGN_MIDDLE:
- os << "middle";
+ attr << "middle";
}
- os << '"';
+ attr << "'";
- if (isMultiColumn(cell)) {
- os << " namest=\"col" << c << "\" ";
- os << "nameend=\"col" << c + columnSpan(cell) - 1 << '"';
- }
+ if (isMultiColumn(cell))
+ attr << " colspan='" << columnSpan(cell) << "'";
+ else if (isMultiRow(cell))
+ attr << " rowspan='" << rowSpan(cell) << "'";
- os << '>';
- ret += cellInset(cell)->docbook(os, runparams);
- os << "</entry>\n";
+ xs << xml::StartTag(celltag, attr.str(), true);
+ cellInset(cell)->docbook(xs, runparams);
+ xs << xml::EndTag(celltag);
+ xs << xml::CR();
++cell;
}
- os << "</row>\n";
- return ret;
+ xs << xml::EndTag("tr");
+ xs << xml::CR();
}
-int Tabular::docbook(odocstream & os, OutputParams const & runparams) const
+void Tabular::docbookRowAsCALS(XMLStream & xs, row_type row,
+ OutputParams const & runparams) const
{
- int ret = 0;
+ idx_type cell = getFirstCellInRow(row);
- //+---------------------------------------------------------------------
- //+ first the opening preamble +
- //+---------------------------------------------------------------------
+ xs << xml::StartTag("row");
+ xs << xml::CR();
+ for (col_type c = 0; c < ncols(); ++c) {
+ if (isPartOfMultiColumn(row, c) || isPartOfMultiRow(row, c))
+ continue;
- os << "<tgroup cols=\"" << ncols()
- << "\" colsep=\"1\" rowsep=\"1\">\n";
+ stringstream attr;
- for (col_type c = 0; c < ncols(); ++c) {
- os << "<colspec colname=\"col" << c << "\" align=\"";
- switch (column_info[c].alignment) {
+ attr << "align='";
+ switch (getAlignment(cell)) {
+ case LYX_ALIGN_BLOCK:
+ attr << "justify";
+ break;
+ case LYX_ALIGN_DECIMAL: {
+ Language const *tlang = buffer().paragraphs().front().getParLanguage(buffer().params());
+ attr << "char' char='" << to_utf8(tlang->decimalSeparator());
+ }
+ break;
case LYX_ALIGN_LEFT:
- os << "left";
+ attr << "left";
break;
case LYX_ALIGN_RIGHT:
- os << "right";
+ attr << "right";
break;
+
default:
- os << "center";
+ attr << "center";
break;
}
- os << '"';
- if (runparams.flavor == OutputParams::XML)
- os << '/';
- os << ">\n";
- ++ret;
+ attr << "'";
+ attr << " valign='";
+ switch (getVAlignment(cell)) {
+ case LYX_VALIGN_TOP:
+ attr << "top";
+ break;
+ case LYX_VALIGN_BOTTOM:
+ attr << "bottom";
+ break;
+ case LYX_VALIGN_MIDDLE:
+ attr << "middle";
+ }
+ attr << "'";
+
+ if (isMultiColumn(cell))
+ attr << " colspan='" << columnSpan(cell) << "'";
+ else if (isMultiRow(cell))
+ attr << " rowspan='" << rowSpan(cell) << "'";
+ else
+ attr << " colname='c" << (c + 1) << "'"; // Column numbering starts at 1.
+
+ // All cases where there should be a line *below* this row.
+ if (row_info[row].bottom_space_default)
+ attr << " rowsep='1'";
+
+ xs << xml::StartTag("entry", attr.str(), true);
+ cellInset(cell)->docbook(xs, runparams);
+ xs << xml::EndTag("entry");
+ xs << xml::CR();
+ ++cell;
}
+ xs << xml::EndTag("row");
+ xs << xml::CR();
+}
- //+---------------------------------------------------------------------
- //+ Long Tabular case +
- //+---------------------------------------------------------------------
- // output caption info
- // The caption flag wins over head/foot
+void Tabular::docbook(XMLStream & xs, OutputParams const & runparams) const
+{
+ docstring ret;
+
+ // Some tables are inline. Likely limitation: cannot output a table within a table; is that really a limitation?
+ if (!runparams.docbook_in_table) { // Check on the *outer* set of parameters, so that the table can be closed
+ // properly at the end of this function.
+ xs << xml::StartTag("informaltable");
+ xs << xml::CR();
+ }
+
+ // "Formal" tables have a title and use the tag <table>; the distinction with <informaltable> is done outside.
+ // HTML has the caption first with titles forbidden, and CALS has a title first.
if (haveLTCaption()) {
- os << "<caption>\n";
- ++ret;
- for (row_type r = 0; r < nrows(); ++r) {
- if (row_info[r].caption) {
- ret += docbookRow(os, r, runparams);
- }
+ std::string tag = ((buffer().params().docbook_table_output) == BufferParams::HTMLTable) ? "caption" : "title";
+
+ xs << xml::StartTag(tag);
+ for (row_type r = 0; r < nrows(); ++r)
+ if (row_info[r].caption)
+ docbookRow(xs, r, runparams);
+ xs << xml::EndTag(tag);
+ xs << xml::CR();
+ }
+
+ // CALS header: describe all columns in this table. For names, take 'c' then the ID of the column.
+ // Start at one, as is customary with CALS!
+ if (buffer().params().docbook_table_output == BufferParams::CALSTable) {
+ for (col_type c = 0; c < ncols(); ++c) {
+ std::stringstream attr;
+ attr << "colnum='" << (c + 1) << "' ";
+ attr << "colname='c" << (c + 1) << "' ";
+ Length const cwidth = column_info[c].p_width;
+ if (!cwidth.zero())
+ attr << "colwidth='" << cwidth.asHTMLString() << "' ";
+ attr << "rowheader='norowheader'"; // Last attribute, hence no space at the end.
+
+ xs << xml::CompTag("colspec", attr.str());
+ xs << xml::CR();
}
- os << "</caption>\n";
- ++ret;
}
- // output header info
- if (haveLTHead(false) || haveLTFirstHead(false)) {
- os << "<thead>\n";
- ++ret;
+
+ // Output the header of the table. For both HTML and CALS, this is surrounded by a thead.
+ bool const havefirsthead = haveLTFirstHead(false);
+ // if we have a first head, then we are going to ignore the
+ // headers for the additional pages, since there aren't any
+ // in DocBook. this test accomplishes that.
+ bool const havehead = !havefirsthead && haveLTHead(false);
+ if (havehead || havefirsthead) {
+ xs << xml::StartTag("thead") << xml::CR();
for (row_type r = 0; r < nrows(); ++r) {
- if ((row_info[r].endhead || row_info[r].endfirsthead) &&
+ if (((havefirsthead && row_info[r].endfirsthead) ||
+ (havehead && row_info[r].endhead)) &&
!row_info[r].caption) {
- ret += docbookRow(os, r, runparams);
+ docbookRow(xs, r, runparams, true); // TODO: HTML vs CALS
}
}
- os << "</thead>\n";
- ++ret;
+ xs << xml::EndTag("thead");
+ xs << xml::CR();
}
- // output footer info
- if (haveLTFoot(false) || haveLTLastFoot(false)) {
- os << "<tfoot>\n";
- ++ret;
+
+ // Output the footer of the table. For both HTML and CALS, this is surrounded by a tfoot and output just after
+ // the header (and before the body).
+ bool const havelastfoot = haveLTLastFoot(false);
+ // as before.
+ bool const havefoot = !havelastfoot && haveLTFoot(false);
+ if (havefoot || havelastfoot) {
+ xs << xml::StartTag("tfoot") << xml::CR();
for (row_type r = 0; r < nrows(); ++r) {
- if ((row_info[r].endfoot || row_info[r].endlastfoot) &&
+ if (((havelastfoot && row_info[r].endlastfoot) ||
+ (havefoot && row_info[r].endfoot)) &&
!row_info[r].caption) {
- ret += docbookRow(os, r, runparams);
+ docbookRow(xs, r, runparams); // TODO: HTML vs CALS
}
}
- os << "</tfoot>\n";
- ++ret;
+ xs << xml::EndTag("tfoot");
+ xs << xml::CR();
}
- //+---------------------------------------------------------------------
- //+ the single row and columns (cells) +
- //+---------------------------------------------------------------------
+ // Output the main part of the table. The tbody container is mandatory for CALS, but optional for HTML (only if
+ // there is no header and no footer). It never hurts to have it, though.
+ xs << xml::StartTag("tbody");
+ xs << xml::CR();
+ for (row_type r = 0; r < nrows(); ++r)
+ if (isValidRow(r))
+ docbookRow(xs, r, runparams);
+ xs << xml::EndTag("tbody");
+ xs << xml::CR();
- os << "<tbody>\n";
- ++ret;
- for (row_type r = 0; r < nrows(); ++r) {
- if (isValidRow(r)) {
- ret += docbookRow(os, r, runparams);
- }
+ // If this method started the table tag, also make it close it.
+ if (!runparams.docbook_in_table) {
+ xs << xml::EndTag("informaltable");
+ xs << xml::CR();
}
- os << "</tbody>\n";
- ++ret;
- //+---------------------------------------------------------------------
- //+ the closing of the tabular +
- //+---------------------------------------------------------------------
-
- os << "</tgroup>";
- ++ret;
-
- return ret;
}
-docstring Tabular::xhtmlRow(XHTMLStream & xs, row_type row,
+docstring Tabular::xhtmlRow(XMLStream & xs, row_type row,
OutputParams const & runparams, bool header) const
{
docstring ret;
string const celltag = header ? "th" : "td";
idx_type cell = getFirstCellInRow(row);
- xs << html::StartTag("tr");
+ xs << xml::StartTag("tr");
for (col_type c = 0; c < ncols(); ++c) {
if (isPartOfMultiColumn(row, c) || isPartOfMultiRow(row, c))
continue;
else if (isMultiRow(cell))
attr << " rowspan='" << rowSpan(cell) << "'";
- xs << html::StartTag(celltag, attr.str(), true) << html::CR();
+ xs << xml::StartTag(celltag, attr.str(), true) << xml::CR();
ret += cellInset(cell)->xhtml(xs, runparams);
- xs << html::EndTag(celltag) << html::CR();
+ xs << xml::EndTag(celltag) << xml::CR();
++cell;
}
- xs << html::EndTag("tr");
+ xs << xml::EndTag("tr");
return ret;
}
-docstring Tabular::xhtml(XHTMLStream & xs, OutputParams const & runparams) const
+docstring Tabular::xhtml(XMLStream & xs, OutputParams const & runparams) const
{
docstring ret;
align = "right";
break;
}
- xs << html::StartTag("div", "class='longtable' style='text-align: " + align + ";'")
- << html::CR();
+ xs << xml::StartTag("div", "class='longtable' style='text-align: " + align + ";'");
+ xs << xml::CR();
// The caption flag wins over head/foot
if (haveLTCaption()) {
- xs << html::StartTag("div", "class='longtable-caption' style='text-align: " + align + ";'")
- << html::CR();
+ xs << xml::StartTag("div", "class='longtable-caption' style='text-align: " + align + ";'");
+ xs << xml::CR();
for (row_type r = 0; r < nrows(); ++r)
if (row_info[r].caption)
ret += xhtmlRow(xs, r, runparams);
- xs << html::EndTag("div") << html::CR();
+ xs << xml::EndTag("div");
+ xs << xml::CR();
}
}
- xs << html::StartTag("table") << html::CR();
+ xs << xml::StartTag("table");
+ xs << xml::CR();
// output header info
bool const havefirsthead = haveLTFirstHead(false);
// in XHTML. this test accomplishes that.
bool const havehead = !havefirsthead && haveLTHead(false);
if (havehead || havefirsthead) {
- xs << html::StartTag("thead") << html::CR();
+ xs << xml::StartTag("thead");
+ xs << xml::CR();
for (row_type r = 0; r < nrows(); ++r) {
if (((havefirsthead && row_info[r].endfirsthead) ||
(havehead && row_info[r].endhead)) &&
ret += xhtmlRow(xs, r, runparams, true);
}
}
- xs << html::EndTag("thead") << html::CR();
+ xs << xml::EndTag("thead");
+ xs << xml::CR();
}
// output footer info
bool const havelastfoot = haveLTLastFoot(false);
// as before.
bool const havefoot = !havelastfoot && haveLTFoot(false);
if (havefoot || havelastfoot) {
- xs << html::StartTag("tfoot") << html::CR();
+ xs << xml::StartTag("tfoot") << xml::CR();
for (row_type r = 0; r < nrows(); ++r) {
if (((havelastfoot && row_info[r].endlastfoot) ||
(havefoot && row_info[r].endfoot)) &&
ret += xhtmlRow(xs, r, runparams);
}
}
- xs << html::EndTag("tfoot") << html::CR();
+ xs << xml::EndTag("tfoot");
+ xs << xml::CR();
}
- xs << html::StartTag("tbody") << html::CR();
- for (row_type r = 0; r < nrows(); ++r) {
- if (isValidRow(r)) {
+ xs << xml::StartTag("tbody") << xml::CR();
+ for (row_type r = 0; r < nrows(); ++r)
+ if (isValidRow(r))
ret += xhtmlRow(xs, r, runparams);
- }
+ xs << xml::EndTag("tbody");
+ xs << xml::CR();
+ xs << xml::EndTag("table");
+ xs << xml::CR();
+ if (is_long_tabular) {
+ xs << xml::EndTag("div");
+ xs << xml::CR();
}
- xs << html::EndTag("tbody")
- << html::CR()
- << html::EndTag("table")
- << html::CR();
- if (is_long_tabular)
- xs << html::EndTag("div") << html::CR();
return ret;
}
isMultiColumn(false), isMultiRow(false), contentAlign(LYX_ALIGN_CENTER)
{}
-
bool InsetTableCell::forcePlainLayout(idx_type) const
{
return isMultiRow || (isMultiColumn && !isFixedWidth);
}
-docstring InsetTableCell::xhtml(XHTMLStream & xs, OutputParams const & rp) const
+docstring InsetTableCell::xhtml(XMLStream & xs, OutputParams const & rp) const
{
if (!isFixedWidth)
return InsetText::insetAsXHTML(xs, rp, InsetText::JustText);
}
+void InsetTableCell::docbook(XMLStream & xs, OutputParams const & runparams) const
+{
+ InsetText::docbook(xs, runparams);
+}
+
+
void InsetTableCell::metrics(MetricsInfo & mi, Dimension & dim) const
{
TextMetrics & tm = mi.base.bv->textMetrics(&text());
}
-
/////////////////////////////////////////////////////////////////////
//
// InsetTabular
}
+bool InsetTabular::allowMultiPar() const
+{
+ for (Tabular::col_type c = 0; c < tabular.ncols(); ++c) {
+ for (Tabular::row_type r = 0; r < tabular.nrows(); ++r) {
+ if (tabular.cellInset(r,c)->allowMultiPar())
+ return true;
+ }
+ }
+ return false;
+}
+
+
bool InsetTabular::allowsCaptionVariation(std::string const & newtype) const
{
return tabular.is_long_tabular &&
docstring const align_d = tabular.column_info[c].decimal_point;
dit = separatorPos(&tail, align_d);
- pit_type const psize = tail.paragraphs().front().size();
+ pos_type const psize = tail.paragraphs().front().size();
if (dit) {
tail.paragraphs().front().eraseChars(0,
dit.pos() < psize ? dit.pos() + 1 : psize, false);
}
-void InsetTabular::updateBuffer(ParIterator const & it, UpdateType utype)
+void InsetTabular::updateBuffer(ParIterator const & it, UpdateType utype, bool const /*deleted*/)
{
// In a longtable, tell captions what the current float is
Counters & cnts = buffer().masterBuffer()->params().documentClass().counters();
break;
}
}
+ else if (theClipboard().hasTextContents(Clipboard::LyXTextType)) {
+ // This might be tabular data from another LyX instance. Check!
+ docstring const clip =
+ theClipboard().getAsText(Clipboard::PlainTextType);
+ if (clip.find_first_of(from_ascii("\t\n")) != docstring::npos) {
+ FuncRequest ncmd = FuncRequest(LFUN_CLIPBOARD_PASTE, cmd.argument());
+ doDispatch(cur, ncmd);
+ break;
+ }
+ }
if (!cur.selIsMultiCell())
cell(cur.idx())->dispatch(cur, cmd);
break;
case Tabular::SET_LONGTABULAR:
case Tabular::TOGGLE_LONGTABULAR:
// setting as longtable is not allowed when table is inside a float
- if (cur.innerInsetOfType(FLOAT_CODE) != 0
- || cur.innerInsetOfType(WRAP_CODE) != 0)
+ if (cur.innerInsetOfType(FLOAT_CODE) != nullptr
+ || cur.innerInsetOfType(WRAP_CODE) != nullptr)
status.setEnabled(false);
else
status.setEnabled(true);
}
-Inset::DisplayType InsetTabular::display() const
+Inset::RowFlags InsetTabular::rowFlags() const
{
if (tabular.is_long_tabular) {
switch (tabular.longtabular_alignment) {
case Tabular::LYX_LONGTABULAR_ALIGN_LEFT:
- return AlignLeft;
+ return Display | AlignLeft;
case Tabular::LYX_LONGTABULAR_ALIGN_CENTER:
- return AlignCenter;
+ return Display;
case Tabular::LYX_LONGTABULAR_ALIGN_RIGHT:
- return AlignRight;
+ return Display | AlignRight;
default:
- return AlignCenter;
+ return Display;
}
} else
return Inline;
}
-int InsetTabular::docbook(odocstream & os, OutputParams const & runparams) const
+void InsetTabular::docbook(XMLStream & xs, OutputParams const & runparams) const
{
- int ret = 0;
- Inset * master = 0;
-
- // FIXME: Why not pass a proper DocIterator here?
-#if 0
- // if the table is inside a float it doesn't need the informaltable
- // wrapper. Search for it.
- for (master = owner(); master; master = master->owner())
- if (master->lyxCode() == FLOAT_CODE)
- break;
-#endif
-
- if (!master) {
- os << "<informaltable>";
- ++ret;
- }
- ret += tabular.docbook(os, runparams);
- if (!master) {
- os << "</informaltable>";
- ++ret;
- }
- return ret;
+ tabular.docbook(xs, runparams);
}
-docstring InsetTabular::xhtml(XHTMLStream & xs, OutputParams const & rp) const
+docstring InsetTabular::xhtml(XMLStream & xs, OutputParams const & rp) const
{
return tabular.xhtml(xs, rp);
}
paste_tabular.reset(new Tabular(tabular));
for (row_type r = 0; r < rs; ++r)
- paste_tabular->deleteRow(0);
+ paste_tabular->deleteRow(0, true);
row_type const rows = re - rs + 1;
while (paste_tabular->nrows() > rows)
- paste_tabular->deleteRow(rows);
+ paste_tabular->deleteRow(rows, true);
for (col_type c = 0; c < cs; ++c)
- paste_tabular->deleteColumn(0);
+ paste_tabular->deleteColumn(0, true);
col_type const columns = ce - cs + 1;
while (paste_tabular->ncols() > columns)
- paste_tabular->deleteColumn(columns);
+ paste_tabular->deleteColumn(columns, true);
paste_tabular->setBuffer(tabular.buffer());
odocstringstream os;
- OutputParams const runparams(0);
+ OutputParams const runparams(nullptr);
paste_tabular->plaintext(os, runparams, 0, true, '\t', INT_MAX);
// Needed for the "Edit->Paste recent" menu and the system clipboard.
cap::copySelection(cur, os.str());
getSelection(cur, actrow, re, actcol, ce);
}
- for (row_type r1 = 0, r2 = actrow;
- r1 < paste_tabular->nrows() && r2 < tabular.nrows();
- ++r1, ++r2) {
- for (col_type c1 = 0, c2 = actcol;
- c1 < paste_tabular->ncols() && c2 < tabular.ncols();
- ++c1, ++c2) {
+ col_type const oldncols = tabular.ncols();
+ for (row_type r1 = 0, r2 = actrow; r1 < paste_tabular->nrows(); ++r1, ++r2) {
+ // Append rows if needed
+ if (r2 == tabular.nrows())
+ tabular.insertRow(r2 - 1, false);
+ for (col_type c1 = 0, c2 = actcol; c1 < paste_tabular->ncols(); ++c1, ++c2) {
+ // Append columns if needed
+ if (c2 == tabular.ncols())
+ tabular.insertColumn(c2 - 1, false);
if (paste_tabular->isPartOfMultiColumn(r1, c1) &&
tabular.isPartOfMultiColumn(r2, c2))
continue;
// FIXME?: why do we need to do this explicitly? (EL)
tabular.cellInset(r2, c2)->setBuffer(tabular.buffer());
- // FIXME: change tracking (MG)
- inset->setChange(Change(buffer().params().track_changes ?
+ if (!lyxrc.ct_markup_copied) {
+ // do not paste deleted text
+ inset->acceptChanges();
+ inset->setChange(Change(buffer().params().track_changes ?
Change::INSERTED : Change::UNCHANGED));
+ }
cur.pos() = 0;
cur.pit() = 0;
}
}
+ // amend cursor position if cols have been appended
+ cur.idx() += actrow * (tabular.ncols() - oldncols);
return true;
}
}
+ParagraphList InsetTabular::asParList(idx_type stidx, idx_type enidx)
+{
+ LASSERT(stidx <= enidx, return ParagraphList());
+ ParagraphList retval;
+ col_type const col1 = tabular.cellColumn(stidx);
+ col_type const col2 = tabular.cellColumn(enidx);
+ row_type const row1 = tabular.cellRow(stidx);
+ row_type const row2 = tabular.cellRow(enidx);
+ for (col_type col = col1; col <= col2; col++)
+ for (row_type row = row1; row <= row2; row++)
+ for (auto par : tabular.cellInset(row, col)->paragraphs())
+ retval.push_back(par);
+ return retval;
+}
+
+
void InsetTabular::getSelection(Cursor & cur,
row_type & rs, row_type & re, col_type & cs, col_type & ce) const
{
Text * InsetTabular::getText(int idx) const
{
- return size_t(idx) < nargs() ? cell(idx)->getText(0) : 0;
+ return size_t(idx) < nargs() ? cell(idx)->getText(0) : nullptr;
}
CompletionList const * InsetTabular::createCompletionList(Cursor const & cur) const
{
- return completionSupported(cur) ? cur.text()->createCompletionList(cur) : 0;
+ return completionSupported(cur) ? cur.text()->createCompletionList(cur) : nullptr;
}
projects / lyx.git / blobdiff