From e4efa00f8c13fb3e2fae7a398cbebe2f28901cc3 Mon Sep 17 00:00:00 2001 From: Georg Baum Date: Mon, 27 Dec 2010 17:56:48 +0000 Subject: [PATCH] Increase tex2lyx output format to 322. 321: Move leftlines/rightlines from column headers to cells 322: Nothing to do (tex2lyx does not produce plain layouts) git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37009 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/tex2lyx/table.cpp | 34 ++++++++++++++++++++++++++++++---- src/tex2lyx/tex2lyx.h | 2 +- 2 files changed, 31 insertions(+), 5 deletions(-) diff --git a/src/tex2lyx/table.cpp b/src/tex2lyx/table.cpp index c5a1d716eb..447716a0c4 100644 --- a/src/tex2lyx/table.cpp +++ b/src/tex2lyx/table.cpp @@ -1038,6 +1038,36 @@ void handle_tabular(Parser & p, ostream & os, bool is_long_tabular, } } + // Distribute lines from rows/columns to cells + // The code was stolen from convert_tablines() in lyx2lyx/lyx_1_6.py. + // Each standard cell inherits the settings of the corresponding + // rowinfo/colinfo. This works because all cells with individual + // settings were converted to multicolumn cells above. + // Each multicolumn cell inherits the settings of the rowinfo/colinfo + // corresponding to the first column of the multicolumn cell (default + // of the multicol package). This works because the special field + // overrides the line fields. + for (size_t row = 0; row < rowinfo.size(); ++row) { + for (size_t col = 0; col < cellinfo[row].size(); ++col) { + if (cellinfo[row][col].multi == CELL_NORMAL) { + cellinfo[row][col].topline = rowinfo[row].topline; + cellinfo[row][col].bottomline = rowinfo[row].bottomline; + cellinfo[row][col].leftlines = colinfo[col].leftlines; + cellinfo[row][col].rightlines = colinfo[col].rightlines; + } else if (cellinfo[row][col].multi == CELL_BEGIN_OF_MULTICOLUMN) { + size_t s = col + 1; + while (s < cellinfo[row].size() && + cellinfo[row][s].multi == CELL_PART_OF_MULTICOLUMN) + s++; + if (s < cellinfo[row].size() && + cellinfo[row][s].multi != CELL_BEGIN_OF_MULTICOLUMN) + cellinfo[row][col].rightlines = colinfo[col].rightlines; + if (col > 0 && cellinfo[row][col-1].multi == CELL_NORMAL) + cellinfo[row][col].leftlines = colinfo[col].leftlines; + } + } + } + //cerr << "// output what we have\n"; // output what we have os << "\n 0) - << write_attribute("rightline", colinfo[col].rightlines > 0) << write_attribute("width", translate_len(colinfo[col].width)) << write_attribute("special", colinfo[col].special) << ">\n"; @@ -1063,8 +1091,6 @@ void handle_tabular(Parser & p, ostream & os, bool is_long_tabular, for (size_t row = 0; row < rowinfo.size(); ++row) { os << "