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

diff --git a/src/insets/InsetERT.cpp b/src/insets/InsetERT.cpp
index c05a6a5e87..eb9a808fbf 100644
--- a/src/insets/InsetERT.cpp
+++ b/src/insets/InsetERT.cpp
@@ -24,15 +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"
 
@@ -43,19 +39,13 @@ using namespace lyx::support;
 
 namespace lyx {
 
-InsetERT::InsetERT(Buffer const & buf, CollapseStatus status)
+InsetERT::InsetERT(Buffer * buf, CollapseStatus status)
 	: InsetCollapsable(buf)
 {
 	status_ = status;
 }
 
 
-InsetERT::~InsetERT()
-{
-	hideDialogs("ert", this);
-}
-
-
 void InsetERT::write(ostream & os) const
 {
 	os << "ERT" << "\n";
@@ -63,9 +53,34 @@ void InsetERT::write(ostream & os) const
 }
 
 
-int InsetERT::plaintext(odocstream &, OutputParams const &) const
+int InsetERT::plaintext(odocstringstream & os,
+        OutputParams const & rp, size_t max_length) const
 {
-	return 0; // do not output TeX code
+	if (!rp.inIndexEntry)
+		// do not output TeX code
+		return 0;
+
+	ParagraphList::const_iterator par = paragraphs().begin();
+	ParagraphList::const_iterator end = paragraphs().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);
+			// output the active characters
+			switch (c) {
+			case '|':
+			case '!':
+			case '@':
+				os.put(c);
+				break;
+			default:
+				break;
+			}
+		}
+		++par;
+	}
+	return 0;
 }
 
 
@@ -93,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);
 	}
@@ -128,14 +150,6 @@ docstring const InsetERT::buttonLabel(BufferView const & bv) const
 }
 
 
-bool InsetERT::showInsetDialog(BufferView * bv) const
-{
-	bv->showDialog("ert", params2string(status(*bv)), 
-		const_cast<InsetERT *>(this));
-	return true;
-}
-
-
 InsetCollapsable::CollapseStatus InsetERT::string2params(string const & in)
 {
 	if (in.empty())
@@ -159,7 +173,7 @@ string InsetERT::params2string(CollapseStatus status)
 }
 
 
-docstring InsetERT::xhtml(odocstream &, OutputParams const &) const
+docstring InsetERT::xhtml(XHTMLStream &, OutputParams const &) const
 {
 	return docstring();
 }