X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetERT.cpp;h=eb9a808fbf733e028bf82e031e02150005227967;hb=d044d6afa7192b2119784e1415e71dad644bc335;hp=10452d7cf11f33a7b52aaf9917211387e908a426;hpb=1eed486fc4292906c57130b7b42f327fdba0c1d8;p=lyx.git

diff --git a/src/insets/InsetERT.cpp b/src/insets/InsetERT.cpp
index 10452d7cf1..eb9a808fbf 100644
--- a/src/insets/InsetERT.cpp
+++ b/src/insets/InsetERT.cpp
@@ -24,16 +24,11 @@
 #include "Layout.h"
 #include "Lexer.h"
 #include "LyXAction.h"
-#include "MetricsInfo.h"
 #include "OutputParams.h"
 #include "ParagraphParameters.h"
 #include "Paragraph.h"
 #include "TextClass.h"
 
-#include "frontends/alert.h"
-#include "frontends/Application.h"
-
-#include "support/debug.h"
 #include "support/gettext.h"
 #include "support/lstrings.h"
 
@@ -58,7 +53,8 @@ void InsetERT::write(ostream & os) const
 }
 
 
-int InsetERT::plaintext(odocstream & os, OutputParams const & rp) const
+int InsetERT::plaintext(odocstringstream & os,
+        OutputParams const & rp, size_t max_length) const
 {
 	if (!rp.inIndexEntry)
 		// do not output TeX code
@@ -67,7 +63,7 @@ int InsetERT::plaintext(odocstream & os, OutputParams const & rp) const
 	ParagraphList::const_iterator par = paragraphs().begin();
 	ParagraphList::const_iterator end = paragraphs().end();
 
-	while (par != end) {
+	while (par != end && os.str().size() <= max_length) {
 		pos_type siz = par->size();
 		for (pos_type i = 0; i < siz; ++i) {
 			char_type const c = par->getChar(i);
@@ -112,26 +108,33 @@ int InsetERT::docbook(odocstream & os, OutputParams const &) const
 
 void InsetERT::doDispatch(Cursor & cur, FuncRequest & cmd)
 {
-	switch (cmd.action) {
-	case LFUN_INSET_MODIFY: {
-		setStatus(cur, string2params(to_utf8(cmd.argument())));
-		break;
-	}
+	switch (cmd.action()) {
+	case LFUN_INSET_MODIFY:
+		if (cmd.getArg(0) == "ert") {
+			cur.recordUndoInset(ATOMIC_UNDO, this);
+			setStatus(cur, string2params(to_utf8(cmd.argument())));
+			break;
+		}
+		//fall-through
 	default:
 		InsetCollapsable::doDispatch(cur, cmd);
 		break;
 	}
+
 }
 
 
 bool InsetERT::getStatus(Cursor & cur, FuncRequest const & cmd,
 	FuncStatus & status) const
 {
-	switch (cmd.action) {
+	switch (cmd.action()) {
 	case LFUN_INSET_MODIFY:
-		status.setEnabled(true);
-		return true;
-		
+		if (cmd.getArg(0) == "ert") {
+			status.setEnabled(true);
+			return true;
+		}
+		//fall through
+
 	default:
 		return InsetCollapsable::getStatus(cur, cmd, status);
 	}
@@ -147,13 +150,6 @@ docstring const InsetERT::buttonLabel(BufferView const & bv) const
 }
 
 
-bool InsetERT::showInsetDialog(BufferView * bv) const
-{
-	bv->showDialog("ert");
-	return true;
-}
-
-
 InsetCollapsable::CollapseStatus InsetERT::string2params(string const & in)
 {
 	if (in.empty())