X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Foutput_xhtml.h;h=416e0daf4909337cdcf091693dd92e880d0a4b67;hb=55a3dd7b346d29a52ba305a4558e9e380ef50f47;hp=b2abc89d5bd83f5a5edc216e7258f84d9356271e;hpb=a81bf7731451ff333dd84d8b90b3a698a66dc90b;p=lyx.git

diff --git a/src/output_xhtml.h b/src/output_xhtml.h
index b2abc89d5b..416e0daf49 100644
--- a/src/output_xhtml.h
+++ b/src/output_xhtml.h
@@ -17,7 +17,6 @@
 #include "support/strfwd.h"
 
 #include <deque>
-#include <vector>
 
 namespace lyx {
 
@@ -84,6 +83,9 @@ struct CompTag {
 	std::string attr_;
 };
 
+// trivial struct for output of newlines
+struct CR{};
+
 } // namespace html
 
 class XHTMLStream {
@@ -91,8 +93,6 @@ public:
 	///
 	explicit XHTMLStream(odocstream & os);
 	///
-	void cr();
-	///
 	odocstream & os() { return os_; }
 	///
 	// int & tab() { return tab_; }
@@ -101,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 &);
 	///
@@ -118,6 +124,8 @@ public:
 	///
 	XHTMLStream & operator<<(html::CompTag const &);
 	///
+	XHTMLStream & operator<<(html::CR const &);
+	///
 	enum EscapeSettings {
 		ESCAPE_NONE,
 		ESCAPE_AND, // meaning &
@@ -136,13 +144,9 @@ private:
 	///
 	odocstream & os_;
 	///
-	// int tab_;
-	///
-	typedef std::deque<html::StartTag> TagDeque;
-	///
-	typedef std::vector<html::StartTag> TagStack;
+	typedef std::deque<html::StartTag> TagStack;
 	/// holds start tags until we know there is content in them.
-	TagDeque pending_tags_;
+	TagStack pending_tags_;
 	/// remembers the history, so we can make sure we nest properly.
 	TagStack tag_stack_;
 	///