(finishing patch -- question was restored, but there were still problems)

[lyx.git] / src / output_xhtml.cpp

diff --git a/src/output_xhtml.cpp b/src/output_xhtml.cpp
index f7533eee1b298bb83ded5b8df8b8181315013299..f6ab5a5a02ff72942d4aef3be0d78393e3825bf5 100644 (file)
--- a/src/output_xhtml.cpp
+++ b/src/output_xhtml.cpp
@@ -292,8 +292,10 @@ XHTMLStream & XHTMLStream::operator<<(char c)
        if (nextraw_) {
                os_ << c;
                nextraw_ = false;
-       } else
-               os_ << html::escapeChar(c);
+       } else {
+               string const d = html::escapeChar(c);
+               os_ << from_ascii(d);
+       }
        return *this;
 }
 
@@ -835,7 +837,7 @@ void makeCommand(Buffer const & buf,
        if (!style.counter.empty())
                buf.params().documentClass().counters().step(style.counter, OutputUpdate);
 
-       openTag(xs, style);
+       openTag(xs, style, pbegin->params());
 
        // Label around sectioning number:
        // FIXME Probably need to account for LABEL_MANUAL