X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetERT.cpp;h=d120a58114d783aad6dacf6ce94048d0cf7dee9d;hb=1cdd5fcb6f76ef8066707c521eef0c01cead00dd;hp=d6544cd7cb39d98cff3b3715d011691aee3fa7a5;hpb=d6f1915684328c6e3fe61c6eef8846b5cabec334;p=lyx.git

diff --git a/src/insets/InsetERT.cpp b/src/insets/InsetERT.cpp
index d6544cd7cb..d120a58114 100644
--- a/src/insets/InsetERT.cpp
+++ b/src/insets/InsetERT.cpp
@@ -3,8 +3,8 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author Jürgen Vigna
- * \author Lars Gullik Bjønnes
+ * \author Jürgen Vigna
+ * \author Lars Gullik Bjønnes
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -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,21 +53,33 @@ void InsetERT::write(ostream & os) const
 }
 
 
-docstring InsetERT::editMessage() const
+int InsetERT::plaintext(odocstream & os, OutputParams const & rp) const
 {
-	return _("Opened ERT Inset");
-}
-
-
-int InsetERT::latex(odocstream & os, OutputParams const & op) const
-{
-	return InsetCollapsable::latex(os, op);
-}
+	if (!rp.inIndexEntry)
+		// do not output TeX code
+		return 0;
 
+	ParagraphList::const_iterator par = paragraphs().begin();
+	ParagraphList::const_iterator end = paragraphs().end();
 
-int InsetERT::plaintext(odocstream &, OutputParams const &) const
-{
-	return 0; // do not output TeX code
+	while (par != end) {
+		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;
 }
 
 
@@ -105,83 +107,45 @@ int InsetERT::docbook(odocstream & os, OutputParams const &) const
 
 void InsetERT::doDispatch(Cursor & cur, FuncRequest & cmd)
 {
-	BufferParams const & bp = cur.buffer().params();
-	Layout const layout = bp.documentClass().plainLayout();
-	//lyxerr << "\nInsetERT::doDispatch (begin): cmd: " << cmd << endl;
-	switch (cmd.action) {
-	case LFUN_QUOTE_INSERT: {
-		// We need to bypass the fancy quotes in Text
-		FuncRequest f(LFUN_SELF_INSERT, "\"");
-		dispatch(cur, f);
-		break;
-	}
-	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:
-		// Force any new text to latex_language
-		// FIXME: This should not be necessary but
-		// new paragraphs that are created by pressing enter at the
-		// start of an existing paragraph get the buffer language
-		// and not latex_language, so we take this brute force
-		// approach.
-		cur.current_font.fontInfo() = layout.font;
-		cur.real_current_font.fontInfo() = layout.font;
 		InsetCollapsable::doDispatch(cur, cmd);
 		break;
 	}
+
 }
 
 
 bool InsetERT::getStatus(Cursor & cur, FuncRequest const & cmd,
 	FuncStatus & status) const
 {
-	switch (cmd.action) {
-		case LFUN_CLIPBOARD_PASTE:
-		case LFUN_INSET_MODIFY:
-		case LFUN_PASTE:
-		case LFUN_PRIMARY_SELECTION_PASTE:
-		case LFUN_QUOTE_INSERT:
+	switch (cmd.action()) {
+	case LFUN_INSET_MODIFY:
+		if (cmd.getArg(0) == "ert") {
 			status.setEnabled(true);
 			return true;
-
-		// this one is difficult to get right. As a half-baked
-		// solution, we consider only the first action of the sequence
-		case LFUN_COMMAND_SEQUENCE: {
-			// argument contains ';'-terminated commands
-			string const firstcmd = token(to_utf8(cmd.argument()), ';', 0);
-			FuncRequest func(lyxaction.lookupFunc(firstcmd));
-			func.origin = cmd.origin;
-			return getStatus(cur, func, status);
 		}
+		//fall through
 
-		default:
-			return InsetCollapsable::getStatus(cur, cmd, status);
+	default:
+		return InsetCollapsable::getStatus(cur, cmd, status);
 	}
 }
 
 
-void InsetERT::setButtonLabel()
+docstring const InsetERT::buttonLabel(BufferView const & bv) const
 {
 	if (decoration() == InsetLayout::CLASSIC)
-		setLabel(isOpen() ? _("ERT") : getNewLabel(_("ERT")));
+		return isOpen(bv) ? _("ERT") : getNewLabel(_("ERT"));
 	else
-		setLabel(getNewLabel(_("ERT")));
-}
-
-
-bool InsetERT::insetAllowed(InsetCode /* code */) const
-{
-	return false;
-}
-
-
-bool InsetERT::showInsetDialog(BufferView * bv) const
-{
-	bv->showDialog("ert", params2string(status()), 
-		const_cast<InsetERT *>(this));
-	return true;
+		return getNewLabel(_("ERT"));
 }
 
 
@@ -208,4 +172,9 @@ string InsetERT::params2string(CollapseStatus status)
 }
 
 
+docstring InsetERT::xhtml(XHTMLStream &, OutputParams const &) const
+{
+	return docstring();
+}
+
 } // namespace lyx