}
+//////////////////////////////////////////////////////////////
+
+
MathGridInset::RowInfo::RowInfo()
: upperline_(false), lowerline_(false)
{}
+
+int MathGridInset::RowInfo::skipPixels() const
+{
+#ifdef WITH_WARNINGS
+#warning fix this once the interface to LyXLength has improved
+#endif
+ return int(skip_.value());
+}
+
+
+
+//////////////////////////////////////////////////////////////
+
+
MathGridInset::ColInfo::ColInfo()
- : h_align_('c'), leftline_(false), rightline_(false)
+ : align_('c'), leftline_(false), rightline_(false), skip_(MATH_COLSEP)
{}
-MathGridInset::MathGridInset(int m, int n, string const & nm)
- : MathNestInset(m * n, nm), rowinfo_(n), colinfo_(m), v_align_('c')
+//////////////////////////////////////////////////////////////
+
+
+MathGridInset::MathGridInset(col_type m, row_type n)
+ : MathNestInset(m * n), rowinfo_(n), colinfo_(m), v_align_('c')
{
- if (m <= 0)
- lyxerr << "positve number of columns expected\n";
- if (n <= 0)
- lyxerr << "positve number of rows expected\n";
+ setDefaults();
}
-int MathGridInset::index(int row, int col) const
+MathGridInset::MathGridInset(int m, int n, char v, string const & h)
+ : MathNestInset(m * n), rowinfo_(n), colinfo_(m), v_align_(v)
+{
+ setDefaults();
+ valign(v);
+ halign(h);
+}
+
+
+MathInset::idx_type MathGridInset::index(row_type row, col_type col) const
{
return col + ncols() * row;
}
+void MathGridInset::setDefaults()
+{
+ if (ncols() <= 0)
+ lyxerr << "positve number of columns expected\n";
+ if (nrows() <= 0)
+ lyxerr << "positve number of rows expected\n";
+ for (col_type col = 0; col < ncols(); ++col) {
+ colinfo_[col].align_ = defaultColAlign(col);
+ colinfo_[col].skip_ = defaultColSpace(col);
+ }
+}
+
+
void MathGridInset::halign(string const & hh)
{
- int n = hh.size();
+ col_type n = hh.size();
if (n > ncols())
n = ncols();
- for (int i = 0; i < n; ++i)
- colinfo_[i].h_align_ = hh[i];
+ for (col_type col = 0; col < n; ++col)
+ colinfo_[col].align_ = hh[col];
}
-void MathGridInset::halign(char h, int col)
+
+void MathGridInset::halign(char h, col_type col)
{
- colinfo_[col].h_align_ = h;
+ colinfo_[col].align_ = h;
}
-char MathGridInset::halign(int col) const
+
+char MathGridInset::halign(col_type col) const
{
- return colinfo_[col].h_align_;
+ return colinfo_[col].align_;
}
+
+
void MathGridInset::valign(char c)
{
v_align_ = c;
}
+
char MathGridInset::valign() const
{
return v_align_;
}
-void MathGridInset::metrics(MathStyles st) const
+
+
+void MathGridInset::vskip(LyXLength const & skip, row_type row)
+{
+ rowinfo_[row].skip_ = skip;
+}
+
+
+LyXLength MathGridInset::vskip(row_type row) const
+{
+ return rowinfo_[row].skip_;
+}
+
+
+void MathGridInset::metrics(MathMetricsInfo const & st) const
{
// let the cells adjust themselves
MathNestInset::metrics(st);
size_ = st;
// adjust vertical structure
- for (int row = 0; row < nrows(); ++row) {
+ for (row_type row = 0; row < nrows(); ++row) {
int asc = 0;
int desc = 0;
- for (int col = 0; col < ncols(); ++col) {
+ for (col_type col = 0; col < ncols(); ++col) {
MathXArray const & c = xcell(index(row, col));
asc = std::max(asc, c.ascent());
desc = std::max(desc, c.descent());
rowinfo_[row].offset_ =
rowinfo_[row - 1].offset_ +
rowinfo_[row - 1].descent_ +
+ rowinfo_[row - 1].skipPixels() +
MATH_ROWSEP +
rowinfo_[row].ascent_;
else
h = rowinfo_.back().offset_ / 2;
}
- for (int row = 0; row < nrows(); ++row) {
+ for (row_type row = 0; row < nrows(); ++row) {
rowinfo_[row].offset_ -= h;
rowinfo_[row].offset_ += MATH_BORDER;
}
// adjust horizontal structure
- for (int col = 0; col < ncols(); ++col) {
+ for (col_type col = 0; col < ncols(); ++col) {
int wid = 0;
- for (int row = 0; row < nrows(); ++row)
+ for (row_type row = 0; row < nrows(); ++row)
wid = std::max(wid, xcell(index(row, col)).width());
colinfo_[col].width_ = wid;
colinfo_[col].offset_ = colinfo_[col].width_;
if (col)
colinfo_[col].offset_ =
- colinfo_[col - 1].offset_ + colinfo_[col - 1].width_ + MATH_COLSEP;
+ colinfo_[col - 1].offset_ +
+ colinfo_[col - 1].width_ +
+ colinfo_[col - 1].skip_;
else
colinfo_[col].offset_ = 0;
/*
// Increase ws_[i] for 'R' columns (except the first one)
for (int i = 1; i < nc_; ++i)
- if (h_align_[i] == 'R')
+ if (align_[i] == 'R')
ws_[i] += 10 * df_width;
// Increase ws_[i] for 'C' column
- if (h_align_[0] == 'C')
+ if (align_[0] == 'C')
if (ws_[0] < 7 * workwidth / 8)
ws_[0] = 7 * workwidth / 8;
cxrow->setTab(i, df_width);
isvoid = true;
}
- switch (h_align_[i]) {
+ switch (align_[i]) {
case 'l':
lf = 0;
break;
{
xo(x);
yo(y);
- for (int idx = 0; idx < nargs(); ++idx)
+ for (idx_type idx = 0; idx < nargs(); ++idx)
xcell(idx).draw(pain, x + cellXOffset(idx), y + cellYOffset(idx));
}
-void MathGridInset::write(std::ostream & os, bool fragile) const
+void MathGridInset::write(MathWriteInfo & os) const
{
- for (int row = 0; row < nrows(); ++row) {
- if (row)
- os << " \\\\\n";
- for (int col = 0; col < ncols(); ++col) {
- if (col)
- os << " & ";
- cell(index(row, col)).write(os, fragile);
+ for (row_type row = 0; row < nrows(); ++row) {
+ for (col_type col = 0; col < ncols(); ++col)
+ os << cell(index(row, col)) << eocString(col);
+ os << eolString(row);
+ }
+}
+
+
+void MathGridInset::writeNormal(std::ostream & os) const
+{
+ os << "[grid ";
+ for (row_type row = 0; row < nrows(); ++row) {
+ os << "[row ";
+ for (col_type col = 0; col < ncols(); ++col) {
+ os << "[cell ";
+ cell(index(row, col)).writeNormal(os);
+ os << "]";
}
+ os << "]";
}
+ os << "]";
+}
+
+
+string MathGridInset::eolString(row_type row) const
+{
+ if (row + 1 == nrows())
+ return "";
+
+ if (rowinfo_[row].skip_.value() != 0)
+ return "\\\\[" + rowinfo_[row].skip_.asLatexString() + "]\n";
+
+ // make sure an upcoming '[' does not break anything
+ MathArray const & c = cell(index(row + 1, 0));
+ if (c.size() && (*c.begin())->getChar() == '[')
+ return "\\\\[0pt]\n";
+
+ return "\\\\\n";
+}
+
+
+string MathGridInset::eocString(col_type col) const
+{
+ if (col + 1 == ncols())
+ return "";
+ return " & ";
}
-void MathGridInset::addRow(int row)
+void MathGridInset::addRow(row_type row)
{
rowinfo_.insert(rowinfo_.begin() + row + 1, RowInfo());
cells_.insert(cells_.begin() + (row + 1) * ncols(), ncols(), MathXArray());
}
+
void MathGridInset::appendRow()
{
rowinfo_.push_back(RowInfo());
- for (int i = 0; i < ncols(); ++i)
+ for (col_type col = 0; col < ncols(); ++col)
cells_.push_back(cells_type::value_type());
}
-void MathGridInset::delRow(int row)
+void MathGridInset::delRow(row_type row)
{
if (nrows() == 1)
return;
}
-void MathGridInset::addCol(int newcol)
+void MathGridInset::addCol(col_type newcol)
{
- int const nc = ncols();
- int const nr = nrows();
+ const col_type nc = ncols();
+ const row_type nr = nrows();
cells_type new_cells((nc + 1) * nr);
- for (int row = 0; row < nr; ++row)
- for (int col = 0; col < nc; ++col)
+ for (row_type row = 0; row < nr; ++row)
+ for (col_type col = 0; col < nc; ++col)
new_cells[row * (nc + 1) + col + (col > newcol)]
= cells_[row * nc + col];
std::swap(cells_, new_cells);
- colinfo_.insert(colinfo_.begin() + newcol, ColInfo());
+ ColInfo inf;
+ inf.skip_ = defaultColSpace(newcol);
+ inf.align_ = defaultColAlign(newcol);
+ colinfo_.insert(colinfo_.begin() + newcol, inf);
}
-void MathGridInset::delCol(int col)
+void MathGridInset::delCol(col_type col)
{
if (ncols() == 1)
return;
cells_type tmpcells;
- for (int i = 0; i < nargs(); ++i)
+ for (col_type i = 0; i < nargs(); ++i)
if (i % ncols() != col)
tmpcells.push_back(cells_[i]);
std::swap(cells_, tmpcells);
}
-int MathGridInset::cellXOffset(int idx) const
+int MathGridInset::cellXOffset(idx_type idx) const
{
- int c = col(idx);
+ col_type c = col(idx);
int x = colinfo_[c].offset_;
- char align = colinfo_[c].h_align_;
+ char align = colinfo_[c].align_;
if (align == 'r' || align == 'R')
x += colinfo_[c].width_ - xcell(idx).width();
if (align == 'c' || align == 'C')
}
-int MathGridInset::cellYOffset(int idx) const
+int MathGridInset::cellYOffset(idx_type idx) const
{
return rowinfo_[row(idx)].offset_;
}
-bool MathGridInset::idxUp(int & idx, int & pos) const
+
+bool MathGridInset::idxUp(idx_type & idx, pos_type & pos) const
{
if (idx < ncols())
return false;
+ int x = cellXOffset(idx) + xcell(idx).pos2x(pos);
idx -= ncols();
- pos = 0;
+ pos = xcell(idx).x2pos(x - cellXOffset(idx));
return true;
}
-bool MathGridInset::idxDown(int & idx, int & pos) const
+bool MathGridInset::idxDown(idx_type & idx, pos_type & pos) const
{
if (idx >= ncols() * (nrows() - 1))
return false;
+ int x = cellXOffset(idx) + xcell(idx).pos2x(pos);
idx += ncols();
- pos = 0;
+ pos = xcell(idx).x2pos(x - cellXOffset(idx));
return true;
}
-bool MathGridInset::idxLeft(int & idx, int & pos) const
+bool MathGridInset::idxLeft(idx_type & idx, pos_type & pos) const
{
// leave matrix if on the left hand edge
if (col(idx) == 0)
}
-bool MathGridInset::idxRight(int & idx, int & pos) const
+bool MathGridInset::idxRight(idx_type & idx, pos_type & pos) const
{
// leave matrix if on the right hand edge
if (col(idx) == ncols() - 1)
}
-bool MathGridInset::idxFirst(int & idx, int & pos) const
+bool MathGridInset::idxFirst(idx_type & idx, pos_type & pos) const
{
switch (v_align_) {
case 't':
}
-bool MathGridInset::idxLast(int & idx, int & pos) const
+bool MathGridInset::idxLast(idx_type & idx, pos_type & pos) const
{
switch (v_align_) {
case 't':
}
-void MathGridInset::idxDelete(int & idx, bool & popit, bool & deleteit)
+void MathGridInset::idxDelete(idx_type & idx, bool & popit, bool & deleteit)
{
popit = false;
deleteit = false;
- // delete entire row if in first cell of empty row
- if (col(idx) == 0 && nrows() > 1) {
+ // delete entire sequence of ncols() empty cells if possible
+ if (idx <= index(nrows() - 1, 0)) {
bool deleterow = true;
- for (int i = idx; i < idx + ncols(); ++i)
+ for (idx_type i = idx; i < idx + ncols(); ++i)
if (cell(i).size()) {
deleterow = false;
break;
}
- if (deleterow)
+
+ if (deleterow) {
+ // move cells if necessary
+ for (idx_type i = index(row(idx), 0); i < idx; ++i)
+ cell(i).swap(cell(i + ncols()));
+
delRow(row(idx));
- if (idx >= nargs())
- idx = nargs() - 1;
- return;
+ if (idx >= nargs())
+ idx = nargs() - 1;
+ return;
+ }
}
// undo effect of Ctrl-Tab (i.e. pull next cell)
}
-void MathGridInset::idxDeleteRange(int /*from*/, int /*to*/)
+void MathGridInset::idxDeleteRange(idx_type /*from*/, idx_type /*to*/)
{
// leave this unimplemented unless someone wants to have it.
/*
}
-MathGridInset::RowInfo const & MathGridInset::rowinfo(int i) const
+MathGridInset::RowInfo const & MathGridInset::rowinfo(row_type row) const
{
- return rowinfo_[i];
+ return rowinfo_[row];
}
-MathGridInset::RowInfo & MathGridInset::rowinfo(int i)
+MathGridInset::RowInfo & MathGridInset::rowinfo(row_type row)
{
- return rowinfo_[i];
+ return rowinfo_[row];
}
-std::vector<int> MathGridInset::idxBetween(int from, int to) const
+std::vector<MathInset::idx_type>
+ MathGridInset::idxBetween(idx_type from, idx_type to) const
{
- int r1 = std::min(row(from), row(to));
- int r2 = std::max(row(from), row(to));
- int c1 = std::min(col(from), col(to));
- int c2 = std::max(col(from), col(to));
- std::vector<int> res;
- for (int i = r1; i <= r2; ++i)
- for (int j = c1; j <= c2; ++j)
+ row_type r1 = std::min(row(from), row(to));
+ row_type r2 = std::max(row(from), row(to));
+ col_type c1 = std::min(col(from), col(to));
+ col_type c2 = std::max(col(from), col(to));
+ std::vector<idx_type> res;
+ for (row_type i = r1; i <= r2; ++i)
+ for (col_type j = c1; j <= c2; ++j)
res.push_back(index(i, j));
return res;
}
projects / lyx.git / blobdiff