Update POCO library.

vendor/POCO/PocoDoc/src/DocWriter.cpp

@@ -808,7 +808,7 @@ void DocWriter::writeNavigationFrame(std::ostream& ostr, const std::string& grou
 		query += item;
 	}
 	ostr << "<div id=\"navigation\">\n";
-	ostr << "<iframe src=\"navigation.html" << query << "\" onload=\"iFrameResize(this);\" scrolling=\"no\"></iframe>\n";
+	ostr << "<iframe sandbox=\"allow-scripts allow-top-navigation-by-user-activation allow-same-origin\" src=\"navigation.html" << query << "\" onload=\"iFrameResize(this);\" scrolling=\"no\"></iframe>\n";
 	ostr << "</div>\n";
 }
 
@@ -1400,7 +1400,10 @@ void DocWriter::nextToken(std::string::const_iterator& it, const std::string::co
 	{
 		token += *it++;
 		if (it != end && std::ispunct(*it)) token += *it++;
-		if (it != end && std::ispunct(*it)) token += *it++;
+		if (token != "<[" && token != "<*" && token != "<!")
+		{
+			if (it != end && std::ispunct(*it)) token += *it++;
+		}
 	}
 	else if (it != end && *it == '[')
 	{

vendor/POCO/PocoDoc/src/DocWriter.h

@@ -47,13 +47,13 @@ public:
 
 	~DocWriter();
 		/// Destroys the DocWriter.
-		
+
 	void write();
 		/// Writes all documentation files.
-		
+
 	void writeEclipseTOC();
 		/// Write Eclipse Table-Of-Contents XML files.
-		
+
 	void addPage(const std::string& path);
 		/// Adds a page.
 
@@ -66,7 +66,7 @@ protected:
 		TEXT_LITERAL,
 		TEXT_WHITESPACE
 	};
-	
+
 	struct Page
 	{
 		std::string path;
@@ -74,14 +74,14 @@ protected:
 		std::string title;
 		std::string category;
 	};
-	
+
 	enum
 	{
 		MAX_TITLE_LEVEL = 3,
 		PAGE_INDEX_COLUMNS = 2,
 		NAMESPACE_INDEX_COLUMNS = 4
 	};
-	
+
 	enum
 	{
 		NO_CUSTOM_HTML = 1,
@@ -94,10 +94,10 @@ protected:
 		int level;
 		int id;
 	};
-	
+
 	typedef std::vector<TOCEntry> TOC;
-	typedef std::map<std::string, Poco::CppParser::Function*> MethodMap;	
-	typedef std::map<std::string, std::string> StringMap;	
+	typedef std::map<std::string, Poco::CppParser::Function*> MethodMap;
+	typedef std::map<std::string, std::string> StringMap;
 	typedef std::map<std::string, Page> PageMap;
 
 	void writePages();
@@ -108,10 +108,10 @@ protected:
 	void writeCategoryIndex(std::ostream& ostr, const std::string& category, const std::string& target);
 	void writePageIndex(std::ostream& ostr);
 	void writeNameSpaceIndex(std::ostream& ostr);
-	
+
 	void writeClass(const Poco::CppParser::Struct* pStruct);
 	void writeNameSpace(const Poco::CppParser::NameSpace* pNameSpace);
-	
+
 	void writeNavigation();
 	void writePackage(const std::string& file, const std::string& library, const std::string& package);
 
@@ -196,11 +196,11 @@ protected:
 	static std::string projectURI(const std::string& id);
 
 	static Poco::Logger& logger();
-	
+
 	static const std::string RFC_URI;
 	static const std::string GITHUB_POCO_URI;
-	
-private:	
+
+private:
 	bool _prettifyCode;
 	bool _noFrames;
 	bool _htmlMode;
@@ -212,10 +212,10 @@ private:
 	bool _pendingLine;
 	int  _indent;
 	int  _titleId;
-	
+
 	static std::string _language;
 	static StringMap   _strings;
-	
+
 	static Poco::Logger* _pLogger;
 };
 

vendor/POCO/PocoDoc/src/PocoDoc.cpp

@@ -321,6 +321,11 @@ protected:
 				logger().log(exc);
 				++errors;
 			}
+			catch (std::exception& exc)
+			{
+				logger().error(std::string(exc.what()));
+				++errors;
+			}
 		}
 		return errors;
 	}