X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Foutput_xhtml.h;h=a9ee0ea090baa8230509aa9cd811a09da9709084;hb=cf14e814124ccbc8155fa1dde98d03be319c0e87;hp=2b1704742c9177598b05ec5fe46d53eaa9790bdc;hpb=db954caf8b19879b9ae82f290fb429063ae2e37f;p=lyx.git

diff --git a/src/output_xhtml.h b/src/output_xhtml.h
index 2b1704742c..a9ee0ea090 100644
--- a/src/output_xhtml.h
+++ b/src/output_xhtml.h
@@ -75,7 +75,7 @@ struct StartTag
 struct EndTag
 {
 	///
-	explicit EndTag(std::string tag) : tag_(tag) {}
+	explicit EndTag(std::string const & tag) : tag_(tag) {}
 	///
 	virtual ~EndTag() {}
 	/// </tag_>
@@ -133,6 +133,7 @@ enum FontTypes {
 	FT_DBAR,
 	FT_WAVE,
 	FT_SOUT,
+	FT_XOUT,
 	// bold
 	FT_BOLD,
 	// shapes
@@ -204,12 +205,13 @@ 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();
+	/// sets a mark so we know what tags to close at the end.
+	/// normally called at the start of a paragraph.
+	void startDivision(bool keep_empty);
+	/// clears the mark set by previous method.
+	/// there should not be any other tags open before it on the stack,
+	/// but if there are, we will close them.
+	void endDivision();
 	///
 	XHTMLStream & operator<<(docstring const &);
 	///
@@ -241,12 +243,10 @@ 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
+	void dumpTagStack(std::string const & msg);
 private:
 	///
 	void clearTagDeque();