public:
CellInfo() : multi(CELL_NORMAL), align('n'), valign('n'),
leftlines(0), rightlines(0), topline(false),
- bottomline(false), rotate(0), mrxnum(0) {}
+ bottomline(false), topline_ltrim(false),
+ topline_rtrim(false), bottomline_ltrim(false),
+ bottomline_rtrim(false), rotate(0), mrxnum(0) {}
/// cell content
string content;
/// multicolumn flag
bool topline;
/// do we have a line below?
bool bottomline;
+ /// Left trimming of top line
+ bool topline_ltrim;
+ /// Right trimming of top line
+ bool topline_rtrim;
+ /// Left trimming of bottom line
+ bool bottomline_ltrim;
+ /// Right trimming of top line
+ bool bottomline_rtrim;
/// how is the cell rotated?
int rotate;
/// width for multicolumn cells
case '@':
// text instead of the column spacing
case '!': {
- // text in addition to the column spacing
- string const arg = p.verbatim_item();
- next.special += t.character();
- 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;
+ // text in addition to the column spacing
+ string const arg = p.verbatim_item();
+ next.special += t.character();
+ 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: {
// try user defined column types
{
// Try to move extra leftlines to the previous column.
// We do this only if both special fields are empty, otherwise we
- // can't tell wether the result will be the same.
+ // can't tell whether the result will be the same.
for (size_t col = 0; col < colinfo.size(); ++col) {
if (colinfo[col].leftlines > 1 &&
colinfo[col].special.empty() && col > 0 &&
}
// Move the lines and alignment settings to the special field if
// necessary
- for (size_t col = 0; col < colinfo.size(); ++col)
- fix_colalign(colinfo[col]);
+ for (auto & col : colinfo)
+ fix_colalign(col);
}
/*!
* Parse hlines and similar stuff.
- * \returns wether the token \p t was parsed
+ * \returns whether the token \p t was parsed
*/
bool parse_hlines(Parser & p, Token const & t, string & hlines,
bool is_long_tabular)
hlines += "\\cline{" + p.verbatim_item() + '}';
else if (t.cs() == "cmidrule") {
- // We cannot handle the \cmidrule(l){3-4} form
p.pushPosition();
p.skip_spaces(true);
- bool const hasParentheses(p.getFullArg('(', ')').first);
- p.popPosition();
- if (hasParentheses)
+ // We do not support the optional height argument
+ if (p.hasOpt())
return false;
- hlines += "\\cmidrule{" + p.verbatim_item() + '}';
+ // We support the \cmidrule(l){3-4} form but
+ // not the trim length parameters (l{<with>}r{<width>})
+ string const trim = p.getFullParentheseArg();
+ string const range = p.verbatim_item();
+ if (!trim.empty()) {
+ if (support::contains(trim, "{"))
+ return false;
+ hlines += "\\cmidrule" + trim + "{" + range + "}";
+ } else
+ hlines += "\\cmidrule{" + range + '}';
}
else if (t.cs() == "addlinespace") {
}
// We need to handle structure stuff first in order to
- // determine wether we need to output a HLINE separator
+ // determine whether we need to output a HLINE separator
// before the row or not.
if (t.cat() == catEscape) {
if (parse_hlines(p, t, hlines, is_long_tabular)) {
void handle_hline_above(RowInfo & ri, vector<CellInfo> & ci)
{
ri.topline = true;
- for (size_t col = 0; col < ci.size(); ++col)
- ci[col].topline = true;
+ for (auto & col : ci)
+ col.topline = true;
}
void handle_hline_below(RowInfo & ri, vector<CellInfo> & ci)
{
ri.bottomline = true;
- for (size_t col = 0; col < ci.size(); ++col)
- ci[col].bottomline = true;
+ for (auto & col : ci)
+ col.bottomline = true;
}
void handle_tabular(Parser & p, ostream & os, string const & name,
string const & tabularwidth, string const & halign,
- Context & context)
+ Context const & context)
{
bool const is_long_tabular(name == "longtable" || name == "xltabular");
bool booktabs = false;
for (int i = 0; i <= 2; i += 2) {
//cerr << " reading from line string '" << dummy[i] << "'\n";
- Parser p1(dummy[i]);
+ Parser p1(dummy[size_type(i)]);
while (p1.good()) {
Token t = p1.get_token();
//cerr << "read token: " << t << "\n";
handle_hline_below(rowinfo[row], cellinfo[row]);
}
} else if (t.cs() == "cline" || t.cs() == "cmidrule") {
- if (t.cs() == "cmidrule")
+ string trim;
+ if (t.cs() == "cmidrule") {
booktabs = true;
+ trim = p1.getFullParentheseArg();
+ }
string arg = p1.verbatim_item();
- //cerr << "read " << t.cs() << " arg: '" << arg << "'\n";
+ //cerr << "read " << t.cs() << " arg: '" << arg << "', trim: '" << trim << "'\n";
vector<string> cols;
split(arg, cols, '-');
cols.resize(2);
if (i == 0) {
rowinfo[row].topline = true;
cellinfo[row][col].topline = true;
+ if (support::contains(trim, 'l') && col == from) {
+ //rowinfo[row].topline_ltrim = true;
+ cellinfo[row][col].topline_ltrim = true;
+ }
+ else if (support::contains(trim, 'r') && col == to) {
+ //rowinfo[row].topline_rtrim = true;
+ cellinfo[row][col].topline_rtrim = true;
+ }
} else {
rowinfo[row].bottomline = true;
cellinfo[row][col].bottomline = true;
+ if (support::contains(trim, 'l') && col == from) {
+ //rowinfo[row].bottomline_ltrim = true;
+ cellinfo[row][col].bottomline_ltrim = true;
+ }
+ else if (support::contains(trim, 'r') && col == to) {
+ //rowinfo[row].bottomline_rtrim = true;
+ cellinfo[row][col].bottomline_rtrim = true;
+ }
}
}
} else if (t.cs() == "addlinespace") {
//cerr << "// output what we have\n";
// output what we have
size_type cols = colinfo.size();
- for (size_t col = 0; col < colinfo.size(); ++col) {
- if (colinfo[col].decimal_point != '\0' && colinfo[col].align != 'd')
+ for (auto const & col : colinfo) {
+ if (col.decimal_point != '\0' && col.align != 'd')
--cols;
}
os << "\n<lyxtabular version=\"3\" rows=\"" << rowinfo.size()
os << write_attribute("tabularwidth", tabularwidth) << ">\n";
//cerr << "// after header\n";
- for (size_t col = 0; col < colinfo.size(); ++col) {
- if (colinfo[col].decimal_point != '\0' && colinfo[col].align != 'd')
+ for (auto const & col : colinfo) {
+ if (col.decimal_point != '\0' && col.align != 'd')
continue;
os << "<column alignment=\""
- << verbose_align(colinfo[col].align) << "\"";
- if (colinfo[col].decimal_point != '\0')
- os << " decimal_point=\"" << colinfo[col].decimal_point << "\"";
+ << verbose_align(col.align) << "\"";
+ if (col.decimal_point != '\0')
+ os << " decimal_point=\"" << col.decimal_point << "\"";
os << " valignment=\""
- << verbose_valign(colinfo[col].valign) << "\""
- << write_attribute("width", translate_len(colinfo[col].width))
- << write_attribute("special", colinfo[col].special)
- << write_attribute("varwidth", colinfo[col].varwidth)
+ << verbose_valign(col.valign) << "\""
+ << write_attribute("width", translate_len(col.width))
+ << write_attribute("special", col.special)
+ << write_attribute("varwidth", col.varwidth)
<< ">\n";
}
//cerr << "// after cols\n";
<< " valignment=\"" << verbose_valign(cell.valign)
<< "\""
<< write_attribute("topline", cell.topline)
+ << write_attribute("toplineltrim", cell.topline_ltrim)
+ << write_attribute("toplinertrim", cell.topline_rtrim)
<< write_attribute("bottomline", cell.bottomline)
+ << write_attribute("bottomlineltrim", cell.bottomline_ltrim)
+ << write_attribute("bottomlinertrim", cell.bottomline_rtrim)
<< write_attribute("leftline", cell.leftlines > 0)
<< write_attribute("rightline", cell.rightlines > 0)
<< write_attribute("rotate", cell.rotate)