X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Foutput_xhtml.h;h=3c4ad2ae0dd69dc66d23e12f31ae3a2955f21b9d;hb=4c093a50c2aaebad1459991b90b625a8c00a69e8;hp=473ebe335a41a744e83663c22aab32fefdf1de8e;hpb=79f11f4e7daadcbf6977e50820d6bd01e6e690b3;p=lyx.git

diff --git a/src/output_xhtml.h b/src/output_xhtml.h
index 473ebe335a..3c4ad2ae0d 100644
--- a/src/output_xhtml.h
+++ b/src/output_xhtml.h
@@ -15,10 +15,11 @@
 #include "LayoutEnums.h"
 
 #include "support/docstream.h"
-#include "support/shared_ptr.h"
 #include "support/strfwd.h"
 
 #include <deque>
+#include <memory>
+
 
 namespace lyx {
 
@@ -116,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_;
 };
 
 
@@ -138,6 +133,7 @@ enum FontTypes {
 	FT_DBAR,
 	FT_WAVE,
 	FT_SOUT,
+	FT_XOUT,
 	// bold
 	FT_BOLD,
 	// shapes
@@ -209,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 &);
 	///
@@ -246,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();
@@ -275,12 +270,11 @@ private:
 	// own these pointers and how they will be deleted, so we use shared
 	// pointers.
 	///
-	typedef shared_ptr<html::StartTag> TagPtr;
+	typedef std::shared_ptr<html::StartTag> TagPtr;
 	typedef std::deque<TagPtr> TagDeque;
 	///
 	template <typename T>
-	shared_ptr<T> makeTagPtr(T const & tag)
-		{ return shared_ptr<T>(new T(tag)); }
+	TagPtr makeTagPtr(T const & tag) { return std::make_shared<T>(tag); }
 	///
 	TagDeque pending_tags_;
 	///