-/** The .tex to .lyx converter
- \author André Pönitz (2003)
+/**
+ * \file table.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author André Pönitz
+ * \author Jean-Marc Lasgouttes
+ *
+ * Full author contact details are available in file CREDITS.
*/
// {[(
using std::ostringstream;
using std::string;
using std::vector;
-using std::map;
#include "mathed/math_gridinfo.h"
-extern bool need_layout;
-
// filled in preamble.C
std::map<char, int> special_columns;
ci.special += t.character();
int const nargs = special_columns[t.character()];
for (int i = 0; i < nargs; ++i)
- ci.special += "{" + p.verbatim_item() + "}";
+ ci.special += "{" + p.verbatim_item() + "}";
//cerr << "handling special column '" << t << "' " << nargs
// << " '" << ci.special << "'\n";
colinfo.push_back(ci);
p.error("found 'end' unexpectedly");
}
- else
+ else
os << t.asInput();
}
}
void handle_tabular(Parser & p, ostream & os,
- LyXTextClass const & textclass)
+ Context & context)
{
string posopts = p.getOpt();
if (posopts.size())
vector< vector<CellInfo> > cellinfo(lines.size());
vector<RowInfo> rowinfo(lines.size());
-
+
// split into rows
//cerr << "// split into rows\n";
for (size_t row = 0; row < rowinfo.size(); ++row) {
// init row
cellinfo[row].resize(colinfo.size());
- // split row
+ // split row
vector<string> dummy;
//cerr << "\n########### LINE: " << lines[row] << "########\n";
split(lines[row], dummy, HLINE);
//cerr << "line: " << row << " below 2: " << dummy[2] << "\n";
//cerr << "line: " << row << " cells 1: " << dummy[1] << "\n";
- for (int i = 0; i <= 2; i += 2) {
+ for (int i = 0; i <= 2; i += 2) {
//cerr << " reading from line string '" << dummy[i] << "'\n";
Parser p1(dummy[i]);
while (p1.good()) {
handle_hline_above(rowinfo[row], cellinfo[row]);
//cerr << "above row: " << row << endl;
}
- } else {
+ } else {
//cerr << "below row: " << row << endl;
handle_hline_below(rowinfo[row], cellinfo[row]);
}
cell < cells.size() && col < colinfo.size(); ++col, ++cell) {
//cerr << "cell content: '" << cells[cell] << "'\n";
Parser p(cells[cell]);
- p.skip_spaces();
+ p.skip_spaces();
//cells[cell] << "'\n";
if (p.next_token().cs() == "multicolumn") {
// how many cells?
p.get_token();
size_t const ncells = string2int(p.verbatim_item());
- // special cell properties alignment
+ // special cell properties alignment
vector<ColInfo> t;
handle_colalign(p, t);
cellinfo[row][col].multi = 1;
cellinfo[row][col].align = t.front().align;
ostringstream os;
- parse_text_in_inset(p, os, FLAG_ITEM, false, textclass);
+ parse_text_in_inset(p, os, FLAG_ITEM, false, context);
cellinfo[row][col].content = os.str();
cellinfo[row][col].leftline |= t.front().leftline;
cellinfo[row][col].rightline |= t.front().rightline;
if (t.front().rightline > 1)
cellinfo[row][col + 1].leftline = true;
- } else {
+ } else {
// FLAG_END is a hack, we need to read all of it
cellinfo[row][col].leftline = colinfo[col].leftline;
cellinfo[row][col].rightline = colinfo[col].rightline;
cellinfo[row][col].align = colinfo[col].align;
ostringstream os;
- parse_text_in_inset(p, os, FLAG_ITEM, false, textclass);
+ parse_text_in_inset(p, os, FLAG_CELL, false, context);
cellinfo[row][col].content = os.str();
}
}
os << "<cell";
if (cell.multi)
os << " multicolumn=\"" << cell.multi << "\"";
- os << " alignment=\"" << verbose_align(cell.align)
+ os << " alignment=\"" << verbose_align(cell.align)
<< "\""
<< " valignment=\"top\"";
if (cell.topline)
}
os << "</row>\n";
}
-
+
os << "</lyxtabular>\n";
}