#include "support/convert.h"
#include "support/lstrings.h"
+#include <algorithm>
#include <iostream>
#include <sstream>
#include <vector>
namespace lyx {
-// filled in preamble.cpp
-map<char, int> special_columns;
-
namespace {
class ColInfo {
public:
- ColInfo() : align('n'), valign('n'), rightlines(0), leftlines(0) {}
+ ColInfo() : align('n'), valign('n'), rightlines(0), leftlines(0),
+ decimal_point('\0') {}
/// column alignment
char align;
/// vertical alignment
int rightlines;
/// number of lines on the left
int leftlines;
+ /// decimal separator
+ char decimal_point;
};
/// the numeric values are part of the file format!
-enum Multicolumn {
+enum Multi {
/// A normal cell
CELL_NORMAL = 0,
/// A multicolumn cell. The number of columns is <tt>1 + number
/// of CELL_PART_OF_MULTICOLUMN cells</tt> that follow directly
- CELL_BEGIN_OF_MULTICOLUMN = 1,
+ CELL_BEGIN_OF_MULTICOLUMN,
/// This is a dummy cell (part of a multicolumn cell)
- CELL_PART_OF_MULTICOLUMN = 2
+ CELL_PART_OF_MULTICOLUMN,
+ ///
+ CELL_BEGIN_OF_MULTIROW,
+ ///
+ CELL_PART_OF_MULTIROW
};
public:
CellInfo() : multi(CELL_NORMAL), align('n'), valign('n'),
leftlines(0), rightlines(0), topline(false),
- bottomline(false), rotate(0) {}
+ bottomline(false), rotate(0), mrxnum(0) {}
/// cell content
string content;
/// multicolumn flag
- Multicolumn multi;
+ Multi multi;
/// cell alignment
char align;
/// vertical cell alignment
string width;
/// special formatting for multicolumn cells
string special;
+ /// multirow offset
+ string mroffset;
+ /// number of further multirows
+ int mrxnum;
};
class ltType {
public:
// constructor
- ltType() : topDL(false), bottomDL(false), empty(false) {}
+ ltType() : set(false), topDL(false), bottomDL(false), empty(false) {}
// we have this header type (is set in the getLT... functions)
bool set;
// double borders on top
return "right";
case 'l':
return "left";
+ case 'd':
+ return "decimal";
default:
return "none";
}
}
+string const write_attribute(string const & name, int const & i)
+{
+ // we write only true attribute values so we remove a bit of the
+ // file format bloat for tabulars.
+ return i ? write_attribute(name, convert<string>(i)) : string();
+}
+
+
/*! rather brutish way to code table structure in a string:
\verbatim
// this case.
return;
+ if (ci.decimal_point != '\0') {
+ // we only support decimal point natively
+ // with 'l' alignment in or 'n' alignment
+ // with width in second row
+ if (ci.align != 'l' && ci.align != 'n') {
+ ci.decimal_point = '\0';
+ return;
+ } else
+ ci.special.clear();
+ }
+
if (!ci.width.empty()) {
switch (ci.align) {
case 'l':
}
switch (t.character()) {
+ case ' ':
+ // whitespace, ignore.
+ break;
case 'c':
case 'l':
case 'r':
// new column, horizontal aligned
next.align = t.character();
- if (!next.special.empty())
+ if (!next.special.empty()) {
ci2special(next);
+ // handle decimal separator
+ if (next.decimal_point != '\0') {
+ if (!colinfo.empty() && colinfo.back().align == 'r') {
+ colinfo.back().align = 'd';
+ colinfo.back().decimal_point = next.decimal_point;
+ } else
+ next.decimal_point = '\0';
+ }
+ }
colinfo.push_back(next);
next = ColInfo();
break;
// new column, vertical aligned box
next.valign = t.character();
next.width = p.verbatim_item();
- if (!next.special.empty())
+ if (!next.special.empty()) {
ci2special(next);
+ // handle decimal separator
+ if (next.decimal_point != '\0') {
+ if (!colinfo.empty() && colinfo.back().align == 'r') {
+ colinfo.back().align = 'd';
+ colinfo.back().decimal_point = next.decimal_point;
+ } else
+ next.decimal_point = '\0';
+ }
+ }
colinfo.push_back(next);
next = ColInfo();
break;
break;
}
case '*': {
+ if (p.next_token().character() != '{')
+ continue;
// *{n}{arg} means 'n' columns of type 'arg'
string const num = p.verbatim_item();
string const arg = p.verbatim_item();
}
case '@':
// text instead of the column spacing
- case '!':
+ case '!': {
// text in addition to the column spacing
+ string const arg = p.verbatim_item();
next.special += t.character();
- next.special += '{' + p.verbatim_item() + '}';
+ next.special += '{' + arg + '}';
+ string const sarg = arg.size() > 2 ? arg.substr(0, arg.size() - 1) : string();
+ if (t.character() == '@' && sarg == "\\extracolsep{0pt}")
+ next.decimal_point = arg.back();
break;
- default:
+ }
+ default: {
// try user defined column types
- if (special_columns.find(t.character()) !=
- special_columns.end()) {
- ci2special(next);
- next.special += t.character();
- int const nargs =
- special_columns[t.character()];
- for (int i = 0; i < nargs; ++i)
- next.special += '{' +
- p.verbatim_item() +
- '}';
- colinfo.push_back(next);
- next = ColInfo();
- } else
- cerr << "Ignoring column specification"
- " '" << t << "'." << endl;
+ // unknown column types (nargs == -1) are
+ // assumed to consume no arguments
+ ci2special(next);
+ next.special += t.character();
+ int const nargs =
+ preamble.getSpecialTableColumnArguments(t.character());
+ for (int i = 0; i < nargs; ++i)
+ next.special += '{' +
+ p.verbatim_item() + '}';
+ colinfo.push_back(next);
+ next = ColInfo();
break;
}
+ }
}
// Maybe we have some column separators that need to be added to the
}
}
- else if (t.cat() == catSpace
+ else if (t.cat() == catSpace
|| t.cat() == catNewline
- || t.cat() == catLetter
- || t.cat() == catSuper
- || t.cat() == catSub
- || t.cat() == catOther
- || t.cat() == catActive
+ || t.cat() == catLetter
+ || t.cat() == catSuper
+ || t.cat() == catSub
+ || t.cat() == catOther
+ || t.cat() == catActive
|| t.cat() == catParameter)
os << t.cs();
// treat the nested environment as a block, don't
// parse &, \\ etc, because they don't belong to our
// table if they appear.
- os << p.verbatimEnvironment(name);
+ os << p.ertEnvironment(name);
os << "\\end{" << name << '}';
active_environments.pop_back();
}
void handle_tabular(Parser & p, ostream & os, string const & name,
- string const & tabularwidth, Context & context)
+ string const & tabularwidth, string const & halign,
+ Context & context)
{
bool const is_long_tabular(name == "longtable");
bool booktabs = false;
<< cells[cell] << "'." << endl;
continue;
}
- Parser p(cells[cell]);
+ string cellcont = cells[cell];
+ // For decimal cells, ass the content of the second one to the first one
+ // of a pair.
+ if (colinfo[col].decimal_point != '\0' && colinfo[col].align == 'd' && cell < cells.size() - 1)
+ cellcont += colinfo[col].decimal_point + cells[cell + 1];
+ Parser p(cellcont);
p.skip_spaces();
//cells[cell] << "'\n";
- if (p.next_token().cs() == "multicolumn") {
+ if (p.next_token().cs() == "multirow") {
+ // We do not support the vpos arg yet.
+ if (p.hasOpt()) {
+ string const vpos = p.getArg('[', ']');
+ p.skip_spaces(true);
+ cerr << "Ignoring multirow's vpos arg '"
+ << vpos << "'!" << endl;
+ }
+ // how many cells?
+ p.get_token();
+ size_t const ncells =
+ convert<unsigned int>(p.verbatim_item());
+ // We do not support the bigstrut arg yet.
+ if (p.hasOpt()) {
+ string const bs = p.getArg('[', ']');
+ p.skip_spaces(true);
+ cerr << "Ignoring multirow's bigstrut arg '"
+ << bs << "'!" << endl;
+ }
+ // the width argument
+ string const width = p.getArg('{', '}');
+ // the vmove arg
+ string vmove;
+ if (p.hasOpt()) {
+ vmove = p.getArg('[', ']');
+ p.skip_spaces(true);
+ }
+
+ if (width != "*")
+ colinfo[col].width = width;
+ if (!vmove.empty())
+ cellinfo[row][col].mroffset = vmove;
+ cellinfo[row][col].multi = CELL_BEGIN_OF_MULTIROW;
+ cellinfo[row][col].leftlines = colinfo[col].leftlines;
+ cellinfo[row][col].rightlines = colinfo[col].rightlines;
+ cellinfo[row][col].mrxnum = ncells - 1;
+
+ ostringstream os2;
+ parse_text_in_inset(p, os2, FLAG_ITEM, false, context);
+ if (!cellinfo[row][col].content.empty()) {
+ // This may or may not work in LaTeX,
+ // but it does not work in LyX.
+ // FIXME: Handle it correctly!
+ cerr << "Moving cell content '"
+ << cells[cell]
+ << "' into a multirow cell. "
+ "This will probably not work."
+ << endl;
+ }
+ cellinfo[row][col].content += os2.str();
+ } else if (p.next_token().cs() == "multicolumn") {
// how many cells?
p.get_token();
size_t const ncells =
cellinfo[row][col].content += os.str();
// add dummy cells for multicol
- for (size_t i = 0; i < ncells - 1 && col < colinfo.size(); ++i) {
+ for (size_t i = 0; i < ncells - 1; ++i) {
++col;
+ if (col >= colinfo.size()) {
+ cerr << "The cell '"
+ << cells[cell]
+ << "' specifies "
+ << convert<string>(ncells)
+ << " columns while the table has only "
+ << convert<string>(colinfo.size())
+ << " columns!"
+ << " Therefore the surplus columns will be ignored."
+ << endl;
+ break;
+ }
cellinfo[row][col].multi = CELL_PART_OF_MULTICOLUMN;
cellinfo[row][col].align = 'c';
}
for (size_t c = 1; c < colinfo.size(); ++c)
cellinfo[row][c].multi = CELL_PART_OF_MULTICOLUMN;
} else {
+ bool turn = false;
+ int rotate = 0;
+ if (p.next_token().cs() == "begin") {
+ p.pushPosition();
+ p.get_token();
+ string const env = p.getArg('{', '}');
+ if (env == "sideways" || env == "turn") {
+ string angle = "90";
+ if (env == "turn") {
+ turn = true;
+ angle = p.getArg('{', '}');
+ }
+ active_environments.push_back(env);
+ p.ertEnvironment(env);
+ active_environments.pop_back();
+ p.skip_spaces();
+ if (!p.good() && support::isStrInt(angle))
+ rotate = convert<int>(angle);
+ }
+ p.popPosition();
+ }
cellinfo[row][col].leftlines = colinfo[col].leftlines;
cellinfo[row][col].rightlines = colinfo[col].rightlines;
cellinfo[row][col].align = colinfo[col].align;
ostringstream os;
- parse_text_in_inset(p, os, FLAG_CELL, false, context);
+ if (rotate != 0) {
+ cellinfo[row][col].rotate = rotate;
+ p.get_token();
+ active_environments.push_back(p.getArg('{', '}'));
+ if (turn)
+ p.getArg('{', '}');
+ parse_text_in_inset(p, os, FLAG_END, false, context);
+ active_environments.pop_back();
+ preamble.registerAutomaticallyLoadedPackage("rotating");
+ } else {
+ parse_text_in_inset(p, os, FLAG_CELL, false, context);
+ }
cellinfo[row][col].content += os.str();
}
}
// and cellinfo.
// Unfortunately LyX has some limitations that we need to work around.
- // Convert cells with special content to multicolumn cells
- // (LyX ignores the special field for non-multicolumn cells).
+ // Some post work
for (size_t row = 0; row < rowinfo.size(); ++row) {
for (size_t col = 0; col < cellinfo[row].size(); ++col) {
+ // Convert cells with special content to multicolumn cells
+ // (LyX ignores the special field for non-multicolumn cells).
if (cellinfo[row][col].multi == CELL_NORMAL &&
!cellinfo[row][col].special.empty())
cellinfo[row][col].multi = CELL_BEGIN_OF_MULTICOLUMN;
+ // Add multirow dummy cells
+ if (row > 1 && (cellinfo[row - 1][col].multi == CELL_PART_OF_MULTIROW
+ || cellinfo[row - 1][col].multi == CELL_BEGIN_OF_MULTIROW)
+ && cellinfo[row - 1][col].mrxnum > 0) {
+ // add dummy cells for multirow
+ cellinfo[row][col].multi = CELL_PART_OF_MULTIROW;
+ cellinfo[row][col].align = 'c';
+ cellinfo[row][col].mrxnum = cellinfo[row - 1][col].mrxnum - 1;
+ }
}
}
cellinfo[row][col].rightlines = colinfo[col].rightlines;
if (col > 0 && cellinfo[row][col-1].multi == CELL_NORMAL)
cellinfo[row][col].leftlines = colinfo[col].leftlines;
+ } else if (cellinfo[row][col].multi == CELL_BEGIN_OF_MULTIROW) {
+ size_t s = row + 1;
+ while (s < rowinfo.size() &&
+ cellinfo[s][col].multi == CELL_PART_OF_MULTIROW)
+ s++;
+ if (s < cellinfo[row].size() &&
+ cellinfo[s][col].multi != CELL_BEGIN_OF_MULTIROW)
+ cellinfo[row][col].bottomline = rowinfo[row].bottomline;
+ if (row > 0 && cellinfo[row - 1][col].multi == CELL_NORMAL)
+ cellinfo[row][col].topline = rowinfo[row].topline;
}
}
}
//cerr << "// output what we have\n";
// output what we have
+ string const rotate = "0";
+ size_type cols = colinfo.size();
+ for (size_t col = 0; col < colinfo.size(); ++col) {
+ if (colinfo[col].decimal_point != '\0' && colinfo[col].align != 'd')
+ --cols;
+ }
os << "\n<lyxtabular version=\"3\" rows=\"" << rowinfo.size()
- << "\" columns=\"" << colinfo.size() << "\">\n";
+ << "\" columns=\"" << cols << "\">\n";
os << "<features"
- << write_attribute("rotate", false)
+ << write_attribute("rotate", rotate)
<< write_attribute("booktabs", booktabs)
<< write_attribute("islongtable", is_long_tabular);
if (is_long_tabular) {
<< write_attribute("lastFootTopDL", endlastfoot.topDL)
<< write_attribute("lastFootBottomDL", endlastfoot.bottomDL)
<< write_attribute("lastFootEmpty", endlastfoot.empty);
+ if (!halign.empty())
+ os << write_attribute("longtabularalignment", halign);
} else
os << write_attribute("tabularvalignment", tabularvalignment)
<< write_attribute("tabularwidth", tabularwidth);
//cerr << "// after header\n";
for (size_t col = 0; col < colinfo.size(); ++col) {
+ if (colinfo[col].decimal_point != '\0' && colinfo[col].align != 'd')
+ continue;
os << "<column alignment=\""
- << verbose_align(colinfo[col].align) << "\""
- << " valignment=\""
+ << verbose_align(colinfo[col].align) << "\"";
+ if (colinfo[col].decimal_point != '\0')
+ os << " decimal_point=\"" << colinfo[col].decimal_point << "\"";
+ os << " valignment=\""
<< verbose_valign(colinfo[col].valign) << "\""
<< write_attribute("width", translate_len(colinfo[col].width))
<< write_attribute("special", colinfo[col].special)
<< ">\n";
for (size_t col = 0; col < colinfo.size(); ++col) {
CellInfo const & cell = cellinfo[row][col];
+ if (colinfo[col].decimal_point != '\0' && colinfo[col].align != 'd')
+ // These are the second columns in a salign pair. Skip.
+ continue;
os << "<cell";
- if (cell.multi != CELL_NORMAL)
+ if ((cell.multi == CELL_BEGIN_OF_MULTICOLUMN
+ || cell.multi == CELL_PART_OF_MULTICOLUMN)
+ && colinfo[col].align != 'd')
os << " multicolumn=\"" << cell.multi << "\"";
+ if (cell.multi == CELL_BEGIN_OF_MULTIROW
+ || cell.multi == CELL_PART_OF_MULTIROW)
+ os << " multirow=\"" << cell.multi << "\"";
os << " alignment=\"" << verbose_align(cell.align)
<< "\""
<< " valignment=\"" << verbose_valign(cell.valign)
<< write_attribute("bottomline", cell.bottomline)
<< write_attribute("leftline", cell.leftlines > 0)
<< write_attribute("rightline", cell.rightlines > 0)
- << write_attribute("rotate", cell.rotate);
+ << write_attribute("rotate", cell.rotate)
+ << write_attribute("mroffset", cell.mroffset);
//cerr << "\nrow: " << row << " col: " << col;
//if (cell.topline)
// cerr << " topline=\"true\"";
projects / lyx.git / blobdiff