X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fbuffer.C;h=77851ce8d3005b65e76321a391f650b7942c388d;hb=9dafe9b9a5cb12e19e0f3a1a9669d81dc140b0e3;hp=c42098707bacd16f6a317ccef77d38358371ece2;hpb=7ea7dabed1b72cc25dcbdc482ac006f2b61dacfd;p=lyx.git

diff --git a/src/buffer.C b/src/buffer.C
index c42098707b..77851ce8d3 100644
--- a/src/buffer.C
+++ b/src/buffer.C
@@ -66,7 +66,6 @@
 #include "insets/insettoc.h"
 #include "insets/insetparent.h"
 #include "insets/insetspecialchar.h"
-#include "insets/figinset.h"
 #include "insets/insettext.h"
 #include "insets/insetert.h"
 #include "insets/insetgraphics.h"
@@ -299,7 +298,9 @@ std::stack<ErtComp> ert_stack;
 ErtComp ert_comp;
 #endif
 
+#ifdef WITH_WARNINGS
 #warning And _why_ is this here? (Lgb)
+#endif
 int unknown_layouts;
 int unknown_tokens;
 
@@ -406,7 +407,7 @@ void Buffer::insertErtContents(Paragraph * par, int & pos, bool set_inactive)
 	if (!ert_comp.contents.empty()) {
 		lyxerr[Debug::INSETS] << "ERT contents:\n'"
 				      << ert_comp.contents << "'" << endl;
-		Inset * inset = new InsetERT(ert_comp.contents, true);
+		Inset * inset = new InsetERT(params.language, ert_comp.contents, true);
 		par->insertInset(pos++, inset, ert_comp.font);
 		ert_comp.contents.erase();
 	}
@@ -3408,8 +3409,13 @@ void Buffer::simpleDocBookOnePar(ostream & os,
 		if (par->isInset(i)) {
 			Inset * inset = par->getInset(i);
 			// don't print the inset in position 0 if desc_on == 3 (label)
-			if (i || desc_on != 3)
+			if ( i || desc_on != 3) {
+				if(style.latexparam() == "CDATA")
+					os << "]]>";
 				inset->docbook(this, os);
+				if(style.latexparam() == "CDATA")
+					os << "<![CDATA[";
+			}
 		} else {
 			char c = par->getChar(i);
 			string sgml_string;