X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Foutput_xhtml.h;h=981038ba8ef97b7a6f221a4a3bd6e454c0d6c4a5;hb=ee26e7fadf0b26b767edee709369c46514680bd4;hp=a2eac95ab437881bf06926839fe04e786aae94ac;hpb=b032e2dfafbf1e86918dd0cd66e5de602edeee00;p=lyx.git

diff --git a/src/output_xhtml.h b/src/output_xhtml.h
index a2eac95ab4..981038ba8e 100644
--- a/src/output_xhtml.h
+++ b/src/output_xhtml.h
@@ -117,16 +117,10 @@ struct CompTag
 struct ParTag : public StartTag
 {
 	///
-	explicit ParTag(std::string const & tag, std::string const & attr,
-	       std::string const & parid)
-	  : StartTag(tag, attr), parid_(parid)
-	{}
+	explicit ParTag(std::string const & tag, std::string attr,
+	       std::string const & parid);
 	///
 	~ParTag() {}
-	///
-	docstring writeTag() const;
-	/// the "magic par label" for this paragraph
-	std::string parid_;
 };
 
 
@@ -210,12 +204,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 &);
 	///
@@ -247,12 +242,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();