From: Martin Vermeer <martin.vermeer@hut.fi>
Date: Mon, 22 Oct 2007 18:01:21 +0000 (+0000)
Subject: Simplify ERT by using verbatim
X-Git-Tag: 1.6.10~7720
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=5ab6d5bf653166934d1f5b6ed52eb67d489a6743;p=features.git

Simplify ERT by using verbatim

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21121 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/lib/layouts/stdinsets.inc b/lib/layouts/stdinsets.inc
index f5aebe7965..fc25ebcb9f 100644
--- a/lib/layouts/stdinsets.inc
+++ b/lib/layouts/stdinsets.inc
@@ -89,6 +89,7 @@ End
 
 InsetLayout ERT
 	LabelString           ERT
+	LatexType             none
 	Decoration            minimalistic
 	Font
 	  Color               latex
@@ -99,6 +100,7 @@ InsetLayout ERT
 	  Size                Small
 	EndFont
 	MultiPar              true
+	Verbatim              true
 End
 
 InsetLayout Branch
diff --git a/src/insets/InsetERT.cpp b/src/insets/InsetERT.cpp
index 8f560e883f..9c18419350 100644
--- a/src/insets/InsetERT.cpp
+++ b/src/insets/InsetERT.cpp
@@ -139,30 +139,10 @@ docstring const InsetERT::editMessage() const
 }
 
 
-int InsetERT::latex(Buffer const &, odocstream & os,
-		    OutputParams const &) const
+int InsetERT::latex(Buffer const & buf, odocstream & os,
+		    OutputParams const & op) const
 {
-	ParagraphList::const_iterator par = paragraphs().begin();
-	ParagraphList::const_iterator end = paragraphs().end();
-
-	int lines = 0;
-	while (par != end) {
-		pos_type siz = par->size();
-		for (pos_type i = 0; i < siz; ++i) {
-			// ignore all struck out text
-			if (par->isDeleted(i))
-				continue;
-
-			os.put(par->getChar(i));
-		}
-		++par;
-		if (par != end) {
-			os << "\n";
-			++lines;
-		}
-	}
-
-	return lines;
+	return InsetCollapsable::latex(buf, os, op);
 }
 
 
@@ -176,6 +156,7 @@ int InsetERT::plaintext(Buffer const &, odocstream &,
 int InsetERT::docbook(Buffer const &, odocstream & os,
 		      OutputParams const &) const
 {
+	// FIXME can we do the same thing here as for LaTeX?
 	ParagraphList::const_iterator par = paragraphs().begin();
 	ParagraphList::const_iterator end = paragraphs().end();
 
diff --git a/src/output_latex.cpp b/src/output_latex.cpp
index f5ed124b45..bf04a243c3 100644
--- a/src/output_latex.cpp
+++ b/src/output_latex.cpp
@@ -558,7 +558,7 @@ TeXOnePar(Buffer const & buf,
 	if (closing_rtl_ltr_environment)
 		os << "}";
 
-	if (pending_newline) {
+	if (pending_newline && !runparams.verbatim) {
 		os << '\n';
 		texrow.newline();
 	}