X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FInsetMathGrid.cpp;h=16e519c11f42544fbdae3e64b479221c9fb3af9b;hb=faa87bf9f30b943397429a04254d96963bbf38bc;hp=ed38c920e493ade3f65cb53da10dcffe27703ee4;hpb=bd3d6369c294ce2980953e7702981d0daee53cea;p=lyx.git

diff --git a/src/mathed/InsetMathGrid.cpp b/src/mathed/InsetMathGrid.cpp
index ed38c920e4..16e519c11f 100644
--- a/src/mathed/InsetMathGrid.cpp
+++ b/src/mathed/InsetMathGrid.cpp
@@ -13,6 +13,7 @@
 
 #include "InsetMathGrid.h"
 
+#include "InsetMathUnknown.h"
 #include "MathData.h"
 #include "MathParser.h"
 #include "MathStream.h"
@@ -176,6 +177,22 @@ void InsetMathGrid::setDefaults()
 }
 
 
+bool InsetMathGrid::interpretString(Cursor & cur, docstring const & str)
+{
+	if (str == "\\hline") {
+		FuncRequest fr = FuncRequest(LFUN_INSET_MODIFY, "tabular add-hline-above");
+		FuncStatus status;
+		if (getStatus(cur, fr, status)) {
+			if (status.enabled()) {
+				rowinfo_[cur.row()].lines_++;
+				return true;
+			}
+		}
+	}
+	return InsetMathNest::interpretString(cur, str);
+}
+
+
 void InsetMathGrid::setHorizontalAlignments(docstring const & hh)
 {
 	col_type col = 0;
@@ -657,7 +674,7 @@ docstring InsetMathGrid::eolString(row_type row, bool fragile,
 	// make sure an upcoming '[' does not break anything
 	if (row + 1 < nrows()) {
 		MathData const & c = cell(index(row + 1, 0));
-		if (c.size() && c.front()->getChar() == '[')
+		if (!c.empty() && c.front()->getChar() == '[')
 			//eol += "[0pt]";
 			eol += "{}";
 	}
@@ -688,17 +705,6 @@ void InsetMathGrid::addRow(row_type row)
 }
 
 
-void InsetMathGrid::appendRow()
-{
-	rowinfo_.push_back(RowInfo());
-	//cells_.insert(cells_.end(), ncols(), MathData());
-	for (col_type col = 0; col < ncols(); ++col) {
-		cells_.push_back(cells_type::value_type());
-		cellinfo_.push_back(CellInfo());
-	}
-}
-
-
 void InsetMathGrid::delRow(row_type row)
 {
 	if (nrows() == 1)
@@ -799,7 +805,7 @@ int InsetMathGrid::cellXOffset(BufferView const & bv, idx_type idx) const
 {
 	col_type c = col(idx);
 	int x = colinfo_[c].offset_;
-	char align = colinfo_[c].align_;
+	char align = displayColAlign(c, row(idx));
 	Dimension const & celldim = cell(idx).dimension(bv);
 	if (align == 'r' || align == 'R')
 		x += colinfo_[c].width_ - celldim.wid;
@@ -899,7 +905,7 @@ bool InsetMathGrid::idxDelete(idx_type & idx)
 
 	// try to delete entire sequence of ncols() empty cells if possible
 	for (idx_type i = idx; i < idx + ncols(); ++i)
-		if (cell(i).size())
+		if (!cell(i).empty())
 			return false;
 
 	// move cells if necessary
@@ -1136,7 +1142,7 @@ void InsetMathGrid::doDispatch(Cursor & cur, FuncRequest & cmd)
 	switch (act) {
 
 	// insert file functions
-	case LFUN_LINE_DELETE:
+	case LFUN_LINE_DELETE_FORWARD:
 		cur.recordUndoInset();
 		//autocorrect_ = false;
 		//macroModeClose();
@@ -1191,7 +1197,7 @@ void InsetMathGrid::doDispatch(Cursor & cur, FuncRequest & cmd)
 		if (cur.idx() > 0)
 			--cur.idx();
 		cur.pos() = cur.lastpos();
-
+		cur.forceBufferUpdate();
 		//mathcursor->normalize();
 		//cmd = FuncRequest(LFUN_FINISHED_BACKWARD);
 		break;
@@ -1296,7 +1302,7 @@ void InsetMathGrid::doDispatch(Cursor & cur, FuncRequest & cmd)
 			docstring & special = colinfo_[cur.col()].special_;
 			if (!special.empty()) {
 				docstring::size_type i = special.rfind('|');
-				LASSERT(i != docstring::npos, /**/);
+				LASSERT(i != docstring::npos, break);
 				special.erase(i, 1);
 			}
 		}
@@ -1305,7 +1311,7 @@ void InsetMathGrid::doDispatch(Cursor & cur, FuncRequest & cmd)
 			docstring & special = colinfo_[cur.col()+1].special_;
 			if (!special.empty()) {
 				docstring::size_type i = special.find('|');
-				LASSERT(i != docstring::npos, /**/);
+				LASSERT(i != docstring::npos, break);
 				special.erase(i, 1);
 			}
 		}
@@ -1328,7 +1334,7 @@ void InsetMathGrid::doDispatch(Cursor & cur, FuncRequest & cmd)
 		cap::replaceSelection(cur);
 		docstring topaste;
 		if (cmd.argument().empty() && !theClipboard().isInternal())
-			topaste = theClipboard().getAsText();
+			topaste = theClipboard().getAsText(Clipboard::PlainTextType);
 		else {
 			idocstringstream is(cmd.argument());
 			int n = 0;
@@ -1337,17 +1343,31 @@ void InsetMathGrid::doDispatch(Cursor & cur, FuncRequest & cmd)
 		}
 		InsetMathGrid grid(buffer_, 1, 1);
 		if (!topaste.empty())
-			if ((topaste.size() == 1 && topaste.at(0) < 0x80)
+			if ((topaste.size() == 1 && isAscii(topaste))
 			    || !mathed_parse_normal(grid, topaste, parseflg)) {
 				resetGrid(grid);
 				mathed_parse_normal(grid, topaste, parseflg | Parse::VERBATIM);
 			}
 
+		bool hline_enabled = false;
+		FuncRequest fr = FuncRequest(LFUN_INSET_MODIFY, "tabular add-hline-above");
+		FuncStatus status;
+		if (getStatus(cur, fr, status))
+			hline_enabled = status.enabled();
 		if (grid.nargs() == 1) {
 			// single cell/part of cell
-			cur.recordUndo();
+			cur.recordUndoInset();
 			cur.cell().insert(cur.pos(), grid.cell(0));
 			cur.pos() += grid.cell(0).size();
+			if (hline_enabled)
+				rowinfo_[cur.row()].lines_ += grid.rowinfo_[0].lines_;
+			else {
+				for (unsigned int l = 0; l < grid.rowinfo_[0].lines_; ++l) {
+					 cur.cell().insert(0,
+						MathAtom(new InsetMathUnknown(from_ascii("\\hline"))));
+					 cur.pos()++;
+				}
+			}
 		} else {
 			// multiple cells
 			cur.recordUndoInset();
@@ -1360,6 +1380,15 @@ void InsetMathGrid::doDispatch(Cursor & cur, FuncRequest & cmd)
 					idx_type i = index(r + cur.row(), c + col(cur.idx()));
 					cell(i).insert(0, grid.cell(grid.index(r, c)));
 				}
+				if (hline_enabled)
+					rowinfo_[r].lines_ += grid.rowinfo_[r].lines_;
+				else {
+					for (unsigned int l = 0; l < grid.rowinfo_[r].lines_; ++l) {
+						idx_type i = index(r + cur.row(), 0);
+						cell(i).insert(0,
+							MathAtom(new InsetMathUnknown(from_ascii("\\hline"))));
+					}
+				}
 				// append the left over horizontal cells to the last column
 				idx_type i = index(r + cur.row(), ncols() - 1);
 				for (InsetMath::col_type c = numcols; c < grid.ncols(); ++c)
@@ -1367,9 +1396,18 @@ void InsetMathGrid::doDispatch(Cursor & cur, FuncRequest & cmd)
 			}
 			// append the left over vertical cells to the last _cell_
 			idx_type i = nargs() - 1;
-			for (row_type r = numrows; r < grid.nrows(); ++r)
+			for (row_type r = numrows; r < grid.nrows(); ++r) {
 				for (col_type c = 0; c < grid.ncols(); ++c)
 					cell(i).append(grid.cell(grid.index(r, c)));
+				if (hline_enabled)
+					rowinfo_[r].lines_ += grid.rowinfo_[r].lines_;
+				else {
+					for (unsigned int l = 0; l < grid.rowinfo_[r].lines_; ++l) {
+						cell(i).insert(0,
+							MathAtom(new InsetMathUnknown(from_ascii("\\hline"))));
+					}
+				}
+			}
 		}
 		cur.clearSelection(); // bug 393
 		// FIXME audit setBuffer calls