Better fix for bug #5754: Caption inset not dissolved when unsetting longtable caption.

[lyx.git] / src / output_xhtml.h

diff --git a/src/output_xhtml.h b/src/output_xhtml.h
index f0e1578d1558a0baf36eba6ed9c603da8536513a..1b68261be34f34db94f61c56a715dd895d15bee2 100644 (file)
--- a/src/output_xhtml.h
+++ b/src/output_xhtml.h
@@ -60,6 +60,9 @@ struct EndTag {
 // Tags like <img />
 struct CompTag {
        ///
+       CompTag(std::string const & tag)
+               : tag_(tag) {}
+       ///
        CompTag(std::string const & tag, std::string const & attr)
                : tag_(tag), attr_(attr) {}
        /// <tag_ attr_ />
@@ -98,6 +101,12 @@ public:
        XHTMLStream & operator<<(EndTag const &);
        ///
        XHTMLStream & operator<<(CompTag const &);
+       /// A trivial struct that functions as a stream modifier.
+       /// << NextRaw() causes the next string-like thing sent to the
+       /// stream not to be escaped.
+       struct NextRaw {};
+       ///
+       XHTMLStream & operator<<(NextRaw const &);
 private:
        ///
        void clearTagDeque();
@@ -117,6 +126,8 @@ private:
        TagDeque pending_tags_;
        /// remembers the history, so we can make sure we nest properly.
        TagStack tag_stack_;
+       /// 
+       bool nextraw_;
 };
 
 ///