Update my email and status.

[lyx.git] / src / output_xhtml.h

diff --git a/src/output_xhtml.h b/src/output_xhtml.h
index 94bdf0bd2b7f643fbf18802175444dfa6550323b..497ffdbce019f3bbf8dfe0b316d0c701cccc0991 100644 (file)
--- a/src/output_xhtml.h
+++ b/src/output_xhtml.h
@@ -83,6 +83,9 @@ struct CompTag {
        std::string attr_;
 };
 
+// trivial struct for output of newlines
+struct CR{};
+
 } // namespace html
 
 class XHTMLStream {
@@ -90,8 +93,6 @@ public:
        ///
        explicit XHTMLStream(odocstream & os);
        ///
-       void cr();
-       ///
        odocstream & os() { return os_; }
        ///
        // int & tab() { return tab_; }
@@ -100,6 +101,12 @@ public:
        /// \return false if there are open font tags we could not close.
        /// because they are "blocked" by open non-font tags on the stack.
        bool closeFontTags();
+       /// call at start of paragraph. sets a mark so we know what tags
+       /// to close at the end. 
+       void startParagraph(bool keep_empty);
+       /// call at end of paragraph to clear that mark. note that this
+       /// will also close any tags still open. 
+       void endParagraph();
        ///
        XHTMLStream & operator<<(docstring const &);
        ///
@@ -117,6 +124,8 @@ public:
        ///
        XHTMLStream & operator<<(html::CompTag const &);
        ///
+       XHTMLStream & operator<<(html::CR const &);
+       ///
        enum EscapeSettings {
                ESCAPE_NONE,
                ESCAPE_AND, // meaning &
@@ -125,13 +134,21 @@ public:
        /// Sets what we are going to escape on the NEXT write.
        /// Everything is reset for the next time.
        XHTMLStream & operator<<(EscapeSettings);
+#if 0
+       /// This routine is for debugging the tag stack, etc. Code
+       /// for it is disabled by default, however, so you will need
+       /// to enable it if you want to use it.
+       void dumpTagStack(std::string const & msg) const;
+#endif
 private:
        ///
        void clearTagDeque();
        ///
-       bool isTagOpen(std::string const &);
+       bool isTagOpen(std::string const &) const;
+       ///
+       bool isTagPending(std::string const &) const;
        ///
-       void writeError(std::string const &);
+       void writeError(std::string const &) const;
        ///
        odocstream & os_;
        ///