X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetERT.cpp;h=2d96f952f636c919df1bce41594089f77231df4f;hb=705302f6dee4e4be9ea46213aa1b0cc18be0cfb0;hp=3de5ccaf50423a17a02e517ef986e1e66967b016;hpb=6490dd8636b57e178684e507449aa87589fe06e4;p=lyx.git

diff --git a/src/insets/InsetERT.cpp b/src/insets/InsetERT.cpp
index 3de5ccaf50..2d96f952f6 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"
 
@@ -45,7 +40,7 @@ using namespace lyx::support;
 namespace lyx {
 
 InsetERT::InsetERT(Buffer * buf, CollapseStatus status)
-	: InsetCollapsable(buf)
+	: InsetCollapsible(buf)
 {
 	status_ = status;
 }
@@ -54,11 +49,12 @@ InsetERT::InsetERT(Buffer * buf, CollapseStatus status)
 void InsetERT::write(ostream & os) const
 {
 	os << "ERT" << "\n";
-	InsetCollapsable::write(os);
+	InsetCollapsible::write(os);
 }
 
 
-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,28 +108,35 @@ 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(this);
+			setStatus(cur, string2params(to_utf8(cmd.argument())));
+			break;
+		}
+		//fall-through
 	default:
-		InsetCollapsable::doDispatch(cur, cmd);
+		InsetCollapsible::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);
+		return InsetCollapsible::getStatus(cur, cmd, status);
 	}
 }
 
@@ -147,7 +150,7 @@ docstring const InsetERT::buttonLabel(BufferView const & bv) const
 }
 
 
-InsetCollapsable::CollapseStatus InsetERT::string2params(string const & in)
+InsetCollapsible::CollapseStatus InsetERT::string2params(string const & in)
 {
 	if (in.empty())
 		return Collapsed;