X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fxml.cpp;h=7ee8d9137a754749b08134bdc39dcfb29431113c;hb=9716e79624a4d;hp=4c4629f4bf992e0a8d7180fe3f201c73133b6e1d;hpb=3a02251bfa44a769d80838f77f00f9b7f31cd64d;p=lyx.git

diff --git a/src/xml.cpp b/src/xml.cpp
index 4c4629f4bf..7ee8d9137a 100644
--- a/src/xml.cpp
+++ b/src/xml.cpp
@@ -17,12 +17,12 @@
 #include "BufferParams.h"
 #include "Counters.h"
 #include "Layout.h"
-#include "OutputParams.h"
 #include "Paragraph.h"
 #include "Text.h"
 #include "TextClass.h"
 
 #include "support/convert.h"
+#include "support/debug.h"
 #include "support/docstream.h"
 #include "support/lassert.h"
 #include "support/lstrings.h"
@@ -166,7 +166,7 @@ bool FontTag::operator==(StartTag const & tag) const
 
 void XMLStream::writeError(std::string const &s)
 {
-	LYXERR0(s);
+	LYXERR(Debug::OUTFILE, s);
 	*this << ESCAPE_NONE << from_utf8("<!-- Output Error: " + s + " -->");
 	*this << xml::CR();
 }
@@ -174,7 +174,7 @@ void XMLStream::writeError(std::string const &s)
 
 void XMLStream::writeError(docstring const &s)
 {
-	LYXERR0(s);
+	LYXERR(Debug::OUTFILE, s);
 	*this << ESCAPE_NONE << from_utf8("<!-- Output Error: ");
 	*this << s;
 	*this << ESCAPE_NONE << from_utf8(" -->");
@@ -686,9 +686,9 @@ void xml::openTag(odocstream & os, string const & name, string const & attribute
     string param = subst(attribute, "<", "\"");
     param = subst(param, ">", "\"");
 
-    // Note: we ignore the name if it empty or if it is a comment "<!-- -->" or
+    // Note: we ignore the name if it is empty or if it is a comment "<!-- -->" or
     // if the name is *dummy*.
-    // We ignore dummy because dummy is not a valid docbook element and it is
+    // We ignore dummy because dummy is not a valid DocBook element and it is
     // the internal name given to single paragraphs in the latex output.
     // This allow us to simplify the code a lot and is a reasonable compromise.
     if (!name.empty() && name != "!-- --" && name != "dummy") {
@@ -836,7 +836,7 @@ void xml::openTag(XMLStream & xs, const std::string & tag, const docstring & att
 
 void xml::closeTag(XMLStream & xs, const docstring & tag, const std::string & tagtype)
 {
-	if (tag.empty() || tag == "NONE")
+	if (tag.empty() || tag == "NONE" || tag == "IGNORE")
 		return;
 
 	if (tag == "para" || tagtype == "paragraph") // Special case for <para>: always considered as a paragraph.