X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FText3.cpp;h=7e24041cef7f7918aa64dd6341970f44b8e613ea;hb=1e519d1115f41f71c253cb9e2fbb7803e9a583a9;hp=6db9c2b8d5d7337c044d16b366a6bc0b39dc67b3;hpb=f659af339efad6ed8e35d59404746c343fe9fcbd;p=lyx.git

diff --git a/src/Text3.cpp b/src/Text3.cpp
index 6db9c2b8d5..7e24041cef 100644
--- a/src/Text3.cpp
+++ b/src/Text3.cpp
@@ -70,6 +70,7 @@
 
 #include "support/convert.h"
 #include "support/debug.h"
+#include "support/filetools.h"
 #include "support/gettext.h"
 #include "support/lassert.h"
 #include "support/limited_stack.h"
@@ -561,10 +562,10 @@ void Text::number(Cursor & cur)
 }
 
 
-bool Text::isRTL(Paragraph const & par) const
+bool Text::isRTL(pit_type const pit) const
 {
 	Buffer const & buffer = owner_->buffer();
-	return par.isRTL(buffer.params());
+	return pars_[pit].isRTL(buffer.params());
 }
 
 
@@ -926,6 +927,14 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 		break;
 	}
 
+	case LFUN_PARAGRAPH_SELECT:
+		if (cur.pos() > 0)
+			needsUpdate |= setCursor(cur, cur.pit(), 0);
+		needsUpdate |= cur.selHandle(true);
+		if (cur.pos() < cur.lastpos())
+			needsUpdate |= setCursor(cur, cur.pit(), cur.lastpos());
+		break;
+
 	case LFUN_PARAGRAPH_UP:
 	case LFUN_PARAGRAPH_UP_SELECT:
 		needsUpdate |= cur.selHandle(cmd.action() == LFUN_PARAGRAPH_UP_SELECT);
@@ -1761,9 +1770,12 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 
 	case LFUN_MOUSE_TRIPLE:
 		if (cmd.button() == mouse_button::button1) {
-			tm->cursorHome(cur);
+			if (cur.pos() > 0)
+				setCursor(cur, cur.pit(), 0);
+			bv->cursor() = cur;
 			cur.resetAnchor();
-			tm->cursorEnd(cur);
+			if (cur.pos() < cur.lastpos())
+				setCursor(cur, cur.pit(), cur.lastpos());
 			cur.setSelection();
 			bv->cursor() = cur;
 		}
@@ -2030,6 +2042,16 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 		// inside it.
 		doInsertInset(cur, this, cmd, true, true);
 		cur.posForward();
+		if (act == LFUN_SCRIPT_INSERT) {
+			/* Script insets change the font style in metrics(), and
+			 * this is used to compute the height of the caret
+			 * (because the font is stored in TextMetrics::font_).
+			 * When we insert, we have to make sure that metrics are
+			 * computed so that the caret height is wrong. Arguably,
+			 * this is hackish.*/
+			bv->processUpdateFlags(Update::SinglePar);
+		}
+		cur.setCurrentFont();
 		// Some insets are numbered, others are shown in the outline pane so
 		// let's update the labels and the toc backend.
 		cur.forceBufferUpdate();
@@ -2066,14 +2088,78 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 		break;
 	}
 
-	case LFUN_TABULAR_INSERT:
+	case LFUN_TABULAR_INSERT: {
 		// if there were no arguments, just open the dialog
+		if (cmd.argument().empty()) {
+			bv->showDialog("tabularcreate");
+			break;
+		} else if (cur.buffer()->masterParams().tablestyle != "default"
+			   || bv->buffer().params().documentClass().tablestyle() != "default") {
+			string tabstyle = cur.buffer()->masterParams().tablestyle;
+			if (tabstyle == "default")
+				tabstyle = bv->buffer().params().documentClass().tablestyle();
+			if (!libFileSearch("tabletemplates", tabstyle + ".lyx").empty()) {
+				FuncRequest fr(LFUN_TABULAR_STYLE_INSERT,
+					       tabstyle + " " + to_ascii(cmd.argument()));
+				lyx::dispatch(fr);
+				break;
+			} else
+				// Unknown style. Report and fall back to default.
+				cur.errorMessage(from_utf8(N_("Table Style ")) + from_utf8(tabstyle) +
+						     from_utf8(N_(" not known")));
+			
+		}
 		if (doInsertInset(cur, this, cmd, false, true))
 			cur.posForward();
-		else
-			bv->showDialog("tabularcreate");
+		break;
+	}
 
+	case LFUN_TABULAR_STYLE_INSERT: {
+		string const style = cmd.getArg(0);
+		string const rows = cmd.getArg(1);
+		string const cols = cmd.getArg(2);
+		if (cols.empty() || !isStrInt(cols)
+		    || rows.empty() || !isStrInt(rows))
+			break;
+		int const r = convert<int>(rows);
+		int const c = convert<int>(cols);
+			
+		string suffix;
+		if (r == 1)
+			suffix = "_1x1";
+		else if (r == 2)
+			suffix = "_1x2";
+		FileName const tabstyle = libFileSearch("tabletemplates",
+							style + suffix + ".lyx", "lyx");
+		if (tabstyle.empty())
+			    break;
+		UndoGroupHelper ugh(cur.buffer());
+		cur.recordUndo();
+		FuncRequest cmd2(LFUN_FILE_INSERT, tabstyle.absFileName() + " ignorelang");
+		lyx::dispatch(cmd2);
+		// go into table
+		cur.backwardPos();
+		if (r > 2) {
+			// move one cell up to middle cell
+			cur.up();
+			// add the missing rows
+			int const addrows = r - 3;
+			for (int i = 0 ; i < addrows ; ++i) {
+				FuncRequest fr(LFUN_TABULAR_FEATURE, "append-row");
+				lyx::dispatch(fr);
+			}
+		}
+		// add the missing columns
+		int const addcols = c - 1;
+		for (int i = 0 ; i < addcols ; ++i) {
+			FuncRequest fr(LFUN_TABULAR_FEATURE, "append-column");
+			lyx::dispatch(fr);
+		}
+		if (r > 1)
+			// go to first cell
+			cur.up();
 		break;
+	}
 
 	case LFUN_FLOAT_INSERT:
 	case LFUN_FLOAT_WIDE_INSERT:
@@ -2772,7 +2858,7 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd,
 	bool enable = true;
 	bool allow_in_passthru = false;
 	InsetCode code = NO_CODE;
-
+	
 	switch (cmd.action()) {
 
 	case LFUN_DEPTH_DECREMENT:
@@ -2862,6 +2948,9 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd,
 	case LFUN_TABULAR_INSERT:
 		code = TABULAR_CODE;
 		break;
+	case LFUN_TABULAR_STYLE_INSERT:
+		code = TABULAR_CODE;
+		break;
 	case LFUN_MARGINALNOTE_INSERT:
 		code = MARGIN_CODE;
 		break;
@@ -3456,6 +3545,7 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd,
 	case LFUN_UP_SELECT:
 	case LFUN_DOWN:
 	case LFUN_DOWN_SELECT:
+	case LFUN_PARAGRAPH_SELECT:
 	case LFUN_PARAGRAPH_UP_SELECT:
 	case LFUN_PARAGRAPH_DOWN_SELECT:
 	case LFUN_LINE_BEGIN_SELECT: