X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Foutput_xhtml.h;h=a2eac95ab437881bf06926839fe04e786aae94ac;hb=0f5c34b8abcaf5bf4ae2df665b2f5aed40229502;hp=76f7bd98de7dc3e9653b0f52be7b6d634f350a57;hpb=43d75a0796781ec8f5b9d33bfc544926a07aafd2;p=lyx.git

diff --git a/src/output_xhtml.h b/src/output_xhtml.h
index 76f7bd98de..a2eac95ab4 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 {
 
@@ -41,8 +42,8 @@ struct StartTag
 	///
 	explicit StartTag(std::string const & tag) : tag_(tag), keepempty_(false) {}
 	///
-	explicit StartTag(std::string const & tag, std::string const & attr, 
-		bool keepempty = false) 
+	explicit StartTag(std::string const & tag, std::string const & attr,
+		bool keepempty = false)
 		: tag_(tag), attr_(attr), keepempty_(keepempty) {}
 	///
 	virtual ~StartTag() {}
@@ -75,6 +76,8 @@ struct EndTag
 {
 	///
 	explicit EndTag(std::string tag) : tag_(tag) {}
+	///
+	virtual ~EndTag() {}
 	/// </tag_>
 	virtual docstring writeEndTag() const;
 	///
@@ -208,10 +211,10 @@ public:
 	/// 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. 
+	/// 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. 
+	/// will also close any tags still open.
 	void endParagraph();
 	///
 	XHTMLStream & operator<<(docstring const &);
@@ -263,22 +266,21 @@ private:
 	void writeError(std::string const &) const;
 	///
 	odocstream & os_;
-	/// 
+	///
 	EscapeSettings escape_;
 	// What we would really like to do here is simply use a
 	// deque<StartTag>. But we want to store both StartTags and
-	// sub-classes thereof on this stack, which means we run into the 
+	// sub-classes thereof on this stack, which means we run into the
 	// so-called polymorphic class problem with the STL. We therefore have
 	// to use a deque<StartTag *>, which leads to the question who will
 	// 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)); }
+	template <typename T>
+	TagPtr makeTagPtr(T const & tag) { return std::make_shared<T>(tag); }
 	///
 	TagDeque pending_tags_;
 	///
@@ -303,12 +305,8 @@ docstring htmlize(docstring const & str, XHTMLStream::EscapeSettings e);
 /// cleans \param str for use as an atttribute by replacing
 /// all non-alnum by "_"
 docstring cleanAttr(docstring const & str);
-///
-std::string escapeChar(char c, XHTMLStream::EscapeSettings e);
-/// 
-std::string htmlize(std::string const & str, XHTMLStream::EscapeSettings e);
-/// 
-std::string cleanAttr(std::string const & str);
+/// \p c must be ASCII
+docstring escapeChar(char c, XHTMLStream::EscapeSettings e);
 
 } // namespace html
 } // namespace lyx