+#include <config.h>
+
#include "math_gridinset.h"
#include "math_mathmlstream.h"
#include "math_streamstr.h"
using std::min;
using std::vector;
using std::istream;
+using std::auto_ptr;
+using std::endl;
class GridInsetMailer : public MailInset {
///
virtual string const & name() const
{
- static const string theName = "tabular";
+ static string const theName = "tabular";
return theName;
}
///
- virtual string const inset2string() const
+ virtual string const inset2string(Buffer const &) const
{
ostringstream data;
//data << name() << " active_cell " << inset.getActCell() << '\n';
data << name() << " active_cell " << 0 << '\n';
WriteStream ws(data);
inset_.write(ws);
- return data.str();
+ return STRCONV(data.str());
}
protected:
InsetBase & inset() const { return inset_; }
- MathGridInset & inset_;
+ MathGridInset & inset_;
};
}
+//////////////////////////////////////////////////////////////
+
+
+MathGridInset::CellInfo::CellInfo()
+ : dummy_(false)
+{}
+
+
+
+
+//////////////////////////////////////////////////////////////
+
+
+MathGridInset::RowInfo::RowInfo()
+ : lines_(0), skip_(0)
+{}
+
+
+
int MathGridInset::RowInfo::skipPixels() const
{
return crskip_.inBP();
+//////////////////////////////////////////////////////////////
+
+
+MathGridInset::ColInfo::ColInfo()
+ : align_('c'), leftline_(false), rightline_(false), lines_(0)
+{}
+
+
//////////////////////////////////////////////////////////////
MathGridInset::MathGridInset(char v, string const & h)
- : MathNestInset(1), rowinfo_(1), colinfo_(1), cellinfo_(1)
+ : MathNestInset(guessColumns(h)),
+ rowinfo_(2),
+ colinfo_(guessColumns(h) + 1),
+ cellinfo_(1 * guessColumns(h))
{
setDefaults();
valign(v);
halign(h);
- //lyxerr << "created grid with " << ncols() << " columns\n";
+ //lyxerr << "created grid with " << ncols() << " columns" << endl;
}
MathGridInset::MathGridInset()
- : MathNestInset(1), rowinfo_(1), colinfo_(1), cellinfo_(1), v_align_('c')
+ : MathNestInset(1),
+ rowinfo_(1 + 1),
+ colinfo_(1 + 1),
+ cellinfo_(1),
+ v_align_('c')
{
setDefaults();
}
MathGridInset::MathGridInset(col_type m, row_type n)
: MathNestInset(m * n),
- rowinfo_(n), colinfo_(m), cellinfo_(m * n), v_align_('c')
+ rowinfo_(n + 1),
+ colinfo_(m + 1),
+ cellinfo_(m * n),
+ v_align_('c')
{
setDefaults();
}
MathGridInset::MathGridInset(col_type m, row_type n, char v, string const & h)
: MathNestInset(m * n),
- rowinfo_(n), colinfo_(m), cellinfo_(m * n), v_align_(v)
+ rowinfo_(n + 1),
+ colinfo_(m + 1),
+ cellinfo_(m * n),
+ v_align_(v)
{
setDefaults();
valign(v);
}
-MathInset * MathGridInset::clone() const
+auto_ptr<InsetBase> MathGridInset::clone() const
{
- return new MathGridInset(*this);
+ return auto_ptr<InsetBase>(new MathGridInset(*this));
}
void MathGridInset::setDefaults()
{
if (ncols() <= 0)
- lyxerr << "positive number of columns expected\n";
+ lyxerr << "positive number of columns expected" << endl;
//if (nrows() <= 0)
- // lyxerr << "positive number of rows expected\n";
+ // lyxerr << "positive number of rows expected" << endl;
for (col_type col = 0; col < ncols(); ++col) {
- colinfo_[col].align = defaultColAlign(col);
- colinfo_[col].skip_ = defaultColSpace(col);
+ colinfo_[col].align_ = defaultColAlign(col);
+ colinfo_[col].skip_ = defaultColSpace(col);
}
}
{
col_type col = 0;
for (string::const_iterator it = hh.begin(); it != hh.end(); ++it) {
- if (col == ncols())
- addCol(ncols() - 1);
+ if (col >= ncols())
+ break;
char c = *it;
if (c == '|') {
colinfo_[col].lines_++;
} else if (c == 'c' || c == 'l' || c == 'r') {
- colinfo_[col].align = c;
+ colinfo_[col].align_ = c;
++col;
colinfo_[col].lines_ = 0;
} else {
- lyxerr << "unknown column separator: '" << c << "'\n";
+ lyxerr << "unknown column separator: '" << c << "'" << endl;
}
}
}
+MathGridInset::col_type MathGridInset::guessColumns(string const & hh) const
+{
+ col_type col = 0;
+ for (string::const_iterator it = hh.begin(); it != hh.end(); ++it)
+ if (*it == 'c' || *it == 'l' || *it == 'r')
+ ++col;
+ // let's have at least one column, even if we did not recognize its
+ // alignment
+ if (col == 0)
+ col = 1;
+ return col;
+}
+
void MathGridInset::halign(char h, col_type col)
{
- colinfo_[col].align = h;
+ colinfo_[col].align_ = h;
}
char MathGridInset::halign(col_type col) const
{
- return colinfo_[col].align;
+ return colinfo_[col].align_;
}
string res;
for (col_type col = 0; col < ncols(); ++col) {
res += string(colinfo_[col].lines_, '|');
- res += colinfo_[col].align;
+ res += colinfo_[col].align_;
}
- return res;
+ return res + string(colinfo_[ncols()].lines_, '|');
}
MathGridInset::col_type MathGridInset::ncols() const
{
- return colinfo_.size();
+ return colinfo_.size() - 1;
}
MathGridInset::row_type MathGridInset::nrows() const
{
- return rowinfo_.size();
+ return rowinfo_.size() - 1;
}
rowinfo_[row].descent_ = desc;
}
rowinfo_[0].ascent_ += hlinesep() * rowinfo_[0].lines_;
+ rowinfo_[nrows()].ascent_ = 0;
+ rowinfo_[nrows()].descent_ = 0;
// compute vertical offsets
rowinfo_[0].offset_ = 0;
- for (row_type row = 1; row < nrows(); ++row) {
+ for (row_type row = 1; row <= nrows(); ++row) {
rowinfo_[row].offset_ =
rowinfo_[row - 1].offset_ +
rowinfo_[row - 1].descent_ +
default:
h = rowinfo_[nrows() - 1].offset_ / 2;
}
- for (row_type row = 0; row < nrows(); ++row)
+ for (row_type row = 0; row <= nrows(); ++row)
rowinfo_[row].offset_ -= h;
wid = max(wid, cell(index(row, col)).width());
colinfo_[col].width_ = wid;
}
+ colinfo_[ncols()].width_ = 0;
// compute horizontal offsets
colinfo_[0].offset_ = border();
- for (col_type col = 1; col < ncols(); ++col) {
+ for (col_type col = 1; col <= ncols(); ++col) {
colinfo_[col].offset_ =
colinfo_[col - 1].offset_ +
colinfo_[col - 1].width_ +
}
- dim_.w = colinfo_[ncols() - 1].offset_
+ dim_.wid = colinfo_[ncols() - 1].offset_
+ colinfo_[ncols() - 1].width_
- //+ vlinesep() * colinfo_[ncols()].lines_
+ + vlinesep() * colinfo_[ncols()].lines_
+ border();
- dim_.a = - rowinfo_[0].offset_
+ dim_.asc = - rowinfo_[0].offset_
+ rowinfo_[0].ascent_
+ hlinesep() * rowinfo_[0].lines_
+ border();
- dim_.d = rowinfo_[nrows() - 1].offset_
+ dim_.des = rowinfo_[nrows() - 1].offset_
+ rowinfo_[nrows() - 1].descent_
- //+ hlinesep() * rowinfo_[nrows()].lines_
+ + hlinesep() * rowinfo_[nrows()].lines_
+ border();
}
+void MathGridInset::metrics(MetricsInfo & mi, Dimension & dim) const
+{
+ metrics(mi);
+ dim = dim_;
+}
+
+
void MathGridInset::draw(PainterInfo & pi, int x, int y) const
{
for (idx_type idx = 0; idx < nargs(); ++idx)
cell(idx).draw(pi, x + cellXOffset(idx), y + cellYOffset(idx));
- for (row_type row = 0; row < nrows(); ++row)
+ for (row_type row = 0; row <= nrows(); ++row)
for (int i = 0; i < rowinfo_[row].lines_; ++i) {
int yy = y + rowinfo_[row].offset_ - rowinfo_[row].ascent_
- i * hlinesep() - hlinesep()/2 - rowsep()/2;
- pi.pain.line(x + 1, yy, x + width() - 1, yy);
+ pi.pain.line(x + 1, yy, x + dim_.width() - 1, yy);
}
- for (col_type col = 0; col < ncols(); ++col)
+ for (col_type col = 0; col <= ncols(); ++col)
for (int i = 0; i < colinfo_[col].lines_; ++i) {
int xx = x + colinfo_[col].offset_
- i * vlinesep() - vlinesep()/2 - colsep()/2;
- pi.pain.line(xx, y - ascent() + 1, xx, y + descent() - 1);
+ pi.pain.line(xx, y - dim_.ascent() + 1, xx, y + dim_.descent() - 1);
}
}
-void MathGridInset::metricsT(TextMetricsInfo const & mi) const
+void MathGridInset::metricsT(TextMetricsInfo const & mi, Dimension & dim) const
{
// let the cells adjust themselves
//MathNestInset::metrics(mi);
for (idx_type i = 0; i < nargs(); ++i)
- cell(i).metricsT(mi);
+ cell(i).metricsT(mi, dim);
// compute absolute sizes of vertical structure
for (row_type row = 0; row < nrows(); ++row) {
rowinfo_[row].descent_ = desc;
}
//rowinfo_[0].ascent_ += hlinesep() * rowinfo_[0].lines_;
+ rowinfo_[nrows()].ascent_ = 0;
+ rowinfo_[nrows()].descent_ = 0;
// compute vertical offsets
rowinfo_[0].offset_ = 0;
- for (row_type row = 1; row < nrows(); ++row) {
+ for (row_type row = 1; row <= nrows(); ++row) {
rowinfo_[row].offset_ =
rowinfo_[row - 1].offset_ +
rowinfo_[row - 1].descent_ +
default:
h = rowinfo_[nrows() - 1].offset_ / 2;
}
- for (row_type row = 0; row < nrows(); ++row)
+ for (row_type row = 0; row <= nrows(); ++row)
rowinfo_[row].offset_ -= h;
wid = max(wid, cell(index(row, col)).width());
colinfo_[col].width_ = wid;
}
+ colinfo_[ncols()].width_ = 0;
// compute horizontal offsets
colinfo_[0].offset_ = border();
- for (col_type col = 1; col < ncols(); ++col) {
+ for (col_type col = 1; col <= ncols(); ++col) {
colinfo_[col].offset_ =
colinfo_[col - 1].offset_ +
colinfo_[col - 1].width_ +
}
- dim_.w = colinfo_[ncols() - 1].offset_
+ dim.wid = colinfo_[ncols() - 1].offset_
+ colinfo_[ncols() - 1].width_
//+ vlinesep() * colinfo_[ncols()].lines_
+ 2;
- dim_.a = -rowinfo_[0].offset_
+ dim.asc = -rowinfo_[0].offset_
+ rowinfo_[0].ascent_
//+ hlinesep() * rowinfo_[0].lines_
+ 1;
- dim_.d = rowinfo_[nrows() - 1].offset_
+ dim.des = rowinfo_[nrows() - 1].offset_
+ rowinfo_[nrows() - 1].descent_
//+ hlinesep() * rowinfo_[nrows()].lines_
+ 1;
-
}
swap(cellinfo_, new_cellinfo);
ColInfo inf;
- inf.skip_ = defaultColSpace(newcol);
- inf.align = defaultColAlign(newcol);
+ inf.skip_ = defaultColSpace(newcol);
+ inf.align_ = defaultColAlign(newcol);
colinfo_.insert(colinfo_.begin() + newcol, inf);
}
{
col_type c = col(idx);
int x = colinfo_[c].offset_;
- char align = colinfo_[c].align;
+ char align = colinfo_[c].align_;
if (align == 'r' || align == 'R')
x += colinfo_[c].width_ - cell(idx).width();
if (align == 'c' || align == 'C')
if (!emptyline && row + 1 < nrows())
os << "\n";
}
- //string const s = verboseHLine(rowinfo_[nrows()].lines_);
- //if (!s.empty() && s != " ") {
- // if (os.fragile())
- // os << "\\protect";
- // os << "\\\\" << s;
- //}
+ string const s = verboseHLine(rowinfo_[nrows()].lines_);
+ if (!s.empty() && s != " ") {
+ if (os.fragile())
+ os << "\\protect";
+ os << "\\\\" << s;
+ }
}
case LFUN_MOUSE_RELEASE:
//if (cmd.button() == mouse_button::button3) {
- // GridInsetMailer mailer(*this);
- // mailer.showDialog();
+ // GridInsetMailer(*this).showDialog();
// return DISPATCHED;
//}
- break;
+ return UNDISPATCHED;
- case LFUN_INSET_DIALOG_UPDATE: {
- GridInsetMailer mailer(*this);
- mailer.updateDialog(cmd.view());
- break;
- }
+ case LFUN_INSET_DIALOG_UPDATE:
+ GridInsetMailer(*this).updateDialog(cmd.view());
+ return UNDISPATCHED;
// insert file functions
case LFUN_DELETE_LINE_FORWARD:
return DISPATCHED_POP;
case LFUN_CELL_SPLIT:
- //bv->lockedInsetStoreUndo(Undo::EDIT);
+ //recordUndo(bv, Undo::ATOMIC);
splitCell(idx, pos);
return DISPATCHED_POP;
case LFUN_BREAKLINE: {
- //bv->lockedInsetStoreUndo(Undo::INSERT);
+ //recordUndo(bv, Undo::INSERT);
row_type const r = row(idx);
addRow(r);
}
case LFUN_TABULAR_FEATURE: {
- //lyxerr << "handling tabular-feature " << cmd.argument << "\n";
- istringstream is(cmd.argument);
+ //lyxerr << "handling tabular-feature " << cmd.argument << endl;
+ istringstream is(STRCONV(cmd.argument));
string s;
is >> s;
if (s == "valign-top")
else if (s == "append-row")
for (int i = 0, n = extractInt(is); i < n; ++i)
addRow(row(idx));
- else if (s == "delete-row")
+ else if (s == "delete-row")
for (int i = 0, n = extractInt(is); i < n; ++i) {
delRow(row(idx));
if (idx > nargs())
idx -= ncols();
}
- else if (s == "copy-row")
+ else if (s == "copy-row")
for (int i = 0, n = extractInt(is); i < n; ++i)
copyRow(row(idx));
else if (s == "swap-row")
swapRow(row(idx));
- else if (s == "append-column")
+ else if (s == "append-column")
for (int i = 0, n = extractInt(is); i < n; ++i) {
row_type r = row(idx);
col_type c = col(idx);
addCol(c);
idx = index(r, c);
}
- else if (s == "delete-column")
+ else if (s == "delete-column")
for (int i = 0, n = extractInt(is); i < n; ++i) {
row_type r = row(idx);
col_type c = col(idx);
swapCol(col(idx));
else
return UNDISPATCHED;
- lyxerr << "returning DISPATCHED_POP\n";
+ lyxerr << "returning DISPATCHED_POP" << endl;
return DISPATCHED_POP;
}
case LFUN_PASTE: {
- //lyxerr << "pasting '" << cmd.argument << "'\n";
+ //lyxerr << "pasting '" << cmd.argument << "'" << endl;
MathGridInset grid(1, 1);
mathed_parse_normal(grid, cmd.argument);
if (grid.nargs() == 1) {
default:
return MathNestInset::dispatch(cmd, idx, pos);
}
- return UNDISPATCHED;
}
projects / lyx.git / blobdiff