Fix bug #6388

[lyx.git] / src / output_xhtml.cpp

diff --git a/src/output_xhtml.cpp b/src/output_xhtml.cpp
index 27f36db5a05fbea14163b156dbeca398cd49386c..963bd490cae52f4d5489be1015ae1aab7ba7bb20 100644 (file)
--- a/src/output_xhtml.cpp
+++ b/src/output_xhtml.cpp
@@ -238,6 +238,7 @@ void XHTMLStream::clearTagDeque()
                StartTag const & tag = pending_tags_.front();
                // tabs?
                os_ << tag.asTag();
+               cr();
                tag_stack_.push_back(tag);
                pending_tags_.pop_front();
        }
@@ -306,6 +307,7 @@ XHTMLStream & XHTMLStream::operator<<(CompTag const & tag)
        clearTagDeque();
        // tabs?
        os_ << tag.asTag();
+       cr();
        return *this;
 }
 
@@ -350,7 +352,8 @@ XHTMLStream & XHTMLStream::operator<<(EndTag const & etag)
                        if (dit->tag_ == etag.tag_) {
                                // it was pending, so we just erase it
                                writeError("Tried to close pending tag `" + etag.tag_ 
-                                       + "' when other tags were pending. Tag discarded.");
+                                       + "' when other tags were pending. Last pending tag is `"
+                                       + pending_tags_.back().tag_ + "'. Tag discarded.");
                                pending_tags_.erase(dit);
                                return *this;
                        }
@@ -690,7 +693,7 @@ ParagraphList::const_iterator makeEnvironmentHtml(Buffer const & buf,
                                        if (style.labeltype == LABEL_MANUAL
                                            && style.htmllabeltag() != "NONE") {
                                                openLabelTag(xs, style);
-//                                             sep = par->firstWordLyXHTML(xs, runparams);
+                                               sep = par->firstWordLyXHTML(xs, runparams);
                                                closeLabelTag(xs, style);
                                                xs.cr();
                                        }
@@ -705,7 +708,7 @@ ParagraphList::const_iterator makeEnvironmentHtml(Buffer const & buf,
                                                openItemTag(xs, style);
                                }
                                par->simpleLyXHTMLOnePar(buf, xs, runparams, 
-                                       text.outerFont(distance(begin, par)), sep);
+                                       text.outerFont(distance(begin, par)), false, sep);
                                ++par;
                                // We may not want to close the tag yet, in particular,
                                // if we're not at the end...