fix bug

Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/core/pulls/468

Common/3dParty/apple/fetch.py

@@ -6,13 +6,12 @@ import os
 if not base.is_dir("glm"):
     base.cmd("git", ["clone", "https://github.com/g-truc/glm.git"])
     base.cmd_in_dir("glm", "git", ["checkout", "33b4a621a697a305bc3a7610d290677b96beb181", "--quiet"])
-    base.replaceInFile("./glm/glm/detail/func_common.inl", "vec<L, T, Q> v;", "vec<L, T, Q> v{};")
 
 if not base.is_dir("mdds"):
     base.cmd("git", ["clone", "https://github.com/kohei-us/mdds.git"])
     base.cmd_in_dir("mdds", "git", ["checkout", "0783158939c6ce4b0b1b89e345ab983ccb0f0ad0"], "--quiet")
 
-    fix_cpp_version  = "#if __cplusplus < 201703L\n"
+    fix_cpp_version  = "#if __cplusplus < 201402L\n"
     fix_cpp_version += "#ifndef _MSC_VER\n"
     fix_cpp_version += "namespace std {\n"
     fix_cpp_version += "  template<bool __v>\n"

Common/3dParty/html/css/CssCalculator.pri

@@ -3,8 +3,6 @@ DEPENDPATH += $$PWD
 
 CORE_ROOT_DIR = $$PWD/../../../..
 
-include($$CORE_ROOT_DIR/Common/3dParty/boost/boost.pri)
-
 css_calculator_without_xhtml {
 	HEADERS += \
 		$$PWD/src/CCssCalculator_Private.h \

Common/3dParty/html/css/src/CCompiledStyle.cpp

@@ -7,6 +7,7 @@
 #include <iterator>
 #include <map>
 
+#include <iostream>
 #include "../../../../../DesktopEditor/common/File.h"
 #include "StaticFunctions.h"
 #include "ConstValues.h"
@@ -17,16 +18,14 @@ namespace NSCSS
 {
 	typedef std::map<std::wstring, std::wstring>::const_iterator styles_iterator;
 
-	CCompiledStyle::CCompiledStyle()
-		: m_nDpi(96), m_UnitMeasure(Point), m_dCoreFontSize(DEFAULT_FONT_SIZE)
+	CCompiledStyle::CCompiledStyle() : m_nDpi(96), m_UnitMeasure(Point), m_dCoreFontSize(DEFAULT_FONT_SIZE)
 	{}
 
 	CCompiledStyle::CCompiledStyle(const CCompiledStyle& oStyle) :
 		m_arParentsStyles(oStyle.m_arParentsStyles), m_sId(oStyle.m_sId),
 		m_nDpi(oStyle.m_nDpi), m_UnitMeasure(oStyle.m_UnitMeasure), m_dCoreFontSize(oStyle.m_dCoreFontSize),
 		m_oFont(oStyle.m_oFont), m_oMargin(oStyle.m_oMargin), m_oPadding(oStyle.m_oPadding), m_oBackground(oStyle.m_oBackground),
-		m_oText(oStyle.m_oText), m_oBorder(oStyle.m_oBorder), m_oDisplay(oStyle.m_oDisplay), m_oTransform(oStyle.m_oTransform)
-	{}
+		m_oText(oStyle.m_oText), m_oBorder(oStyle.m_oBorder), m_oDisplay(oStyle.m_oDisplay), m_oTransform(oStyle.m_oTransform){}
 
 	CCompiledStyle::~CCompiledStyle()
 	{
@@ -35,8 +34,6 @@ namespace NSCSS
 
 	CCompiledStyle& CCompiledStyle::operator+= (const CCompiledStyle &oElement)
 	{
-		m_arParentsStyles.insert(oElement.m_arParentsStyles.begin(), oElement.m_arParentsStyles.end());
-
 		if (oElement.Empty())
 			return *this;
 
@@ -52,6 +49,8 @@ namespace NSCSS
 		if (!oElement.m_sId.empty())
 			m_sId += L'+' + oElement.m_sId;
 
+		m_arParentsStyles.insert(oElement.m_arParentsStyles.begin(), oElement.m_arParentsStyles.end());
+
 		return *this;
 	}
 

Common/3dParty/html/css/src/CCssCalculator_Private.cpp

@@ -15,33 +15,29 @@ inline static std::wstring StringifyValueList(const KatanaArray* oValues);
 inline static std::wstring StringifyValue(const KatanaValue* oValue);
 inline static bool         IsTableElement(const std::wstring& wsNameTag);
 
+bool operator<(const std::vector<NSCSS::CNode> &arLeftSelectors, const std::vector<NSCSS::CNode> &arRightSelectors)
+{
+	const size_t& sizeLeftSelectors = arLeftSelectors.size();
+	const size_t& sizeRightSelectors = arRightSelectors.size();
+
+	if (sizeLeftSelectors < sizeRightSelectors)
+		return true;
+	else if (sizeLeftSelectors > sizeRightSelectors)
+		return false;
+
+	for (size_t i = 0; i < arLeftSelectors.size(); ++i)
+	{
+		if (arLeftSelectors[i] < arRightSelectors[i])
+			return true;
+	}
+
+	return false;
+}
+
 namespace NSCSS
 {
-	bool operator<(const std::vector<NSCSS::CNode> &arLeftSelectors, const std::vector<NSCSS::CNode> &arRightSelectors)
-	{
-		if (arLeftSelectors.size() < arRightSelectors.size())
-			return true;
-		else if (arLeftSelectors.size() > arRightSelectors.size())
-			return false;
-
-		for (size_t i = 0; i < arLeftSelectors.size(); ++i)
-		{
-			if (arLeftSelectors[i] == arRightSelectors[i])
-				continue;
-
-			if (arLeftSelectors[i] < arRightSelectors[i])
-				return true;
-			else if (arRightSelectors[i] < arLeftSelectors[i])
-				return false;
-		}
-
-		return false;
-	}
-
 	CStyleStorage::CStyleStorage()
-	{
-		InitDefaultStyles();
-	}
+	{}
 
 	CStyleStorage::~CStyleStorage()
 	{
@@ -66,7 +62,6 @@ namespace NSCSS
 		m_arEmptyStyleFiles.clear();
 
 		ClearEmbeddedStyles();
-		ClearDefaultStyles();
 		ClearAllowedStyleFiles();
 
 		#ifdef CSS_CALCULATOR_WITH_XHTML
@@ -213,16 +208,6 @@ namespace NSCSS
 		return nullptr;
 	}
 
-	const CElement* CStyleStorage::FindDefaultElement(const std::wstring& wsSelector) const
-	{
-		if (wsSelector.empty())
-			return nullptr;
-
-		const CElement* pFoundElement = FindSelectorFromStyleData(wsSelector, m_mDefaultStyleData);
-
-		return (nullptr != pFoundElement) ? pFoundElement : nullptr;
-	}
-
 	void CStyleStorage::AddStyles(const std::string& sStyle, std::map<std::wstring, CElement*>& mStyleData)
 	{
 		if (sStyle.empty())
@@ -242,15 +227,6 @@ namespace NSCSS
 		m_mEmbeddedStyleData.clear();
 	}
 
-	void CStyleStorage::ClearDefaultStyles()
-	{
-		for (std::map<std::wstring, CElement*>::iterator oIter = m_mDefaultStyleData.begin(); oIter != m_mDefaultStyleData.end(); ++oIter)
-			if (oIter->second != nullptr)
-				delete oIter->second;
-
-		m_mDefaultStyleData.clear();
-	}
-
 	void CStyleStorage::ClearAllowedStyleFiles()
 	{
 		m_arAllowedStyleFiles.clear();
@@ -504,33 +480,7 @@ namespace NSCSS
 		return nullptr;
 	}
 
-	void CStyleStorage::InitDefaultStyles()
-	{
-		m_mDefaultStyleData[L"b"] = new CElement(L"b", {{L"font-weight", L"bold"}});
-		m_mDefaultStyleData[L"center"] = new CElement(L"center", {{L"text-align", L"center"}});
-		m_mDefaultStyleData[L"i"] = new CElement(L"i", {{L"font-style", L"italic"}});
-		m_mDefaultStyleData[L"code"] = new CElement(L"code", {{L"font-family", L"Courier New"}});
-		m_mDefaultStyleData[L"kbd"] = new CElement(L"kbd", {{L"font-family", L"Courier New"},
-		                                                    {L"font_weight", L"bold"}});
-		m_mDefaultStyleData[L"s"] = new CElement(L"s", {{L"text-decoration", L"line-through"}});
-		m_mDefaultStyleData[L"u"] = new CElement(L"u", {{L"text-decoration", L"underline"}});
-		m_mDefaultStyleData[L"mark"] = new CElement(L"mark", {{L"background-color", L"yellow"}});
-		m_mDefaultStyleData[L"sup"] = new CElement(L"sup", {{L"vertical-align", L"top"}});
-		m_mDefaultStyleData[L"sub"] = new CElement(L"sub", {{L"vertical-align", L"bottom"}});
-		m_mDefaultStyleData[L"dd"] = new CElement(L"dd", {{L"margin-left", L"720tw"}});
-		m_mDefaultStyleData[L"pre"] = new CElement(L"pre", {{L"font-family", L"Courier New"},
-		                                                    {L"margin-top", L"0"},
-		                                                    {L"margin-bottom", L"0"}});
-		m_mDefaultStyleData[L"blockquote"] = new CElement(L"blockquote", {{L"margin", L"0px"}});
-		m_mDefaultStyleData[L"ul"] = new CElement(L"ul", {{L"margin-top", L"100tw"},
-		                                                  {L"margin-bottom", L"100tw"}});
-		m_mDefaultStyleData[L"textarea"] = new CElement(L"textarea", {{L"border", L"1px solid black"}});
-	}
-
-	CCssCalculator_Private::CCssCalculator_Private()
-		: m_nDpi(96), m_nCountNodes(0), m_sEncoding(L"UTF-8")
-	{
-	}
+	CCssCalculator_Private::CCssCalculator_Private() : m_nDpi(96), m_nCountNodes(0), m_sEncoding(L"UTF-8"){}
 
 	CCssCalculator_Private::~CCssCalculator_Private()
 	{}
@@ -553,25 +503,17 @@ namespace NSCSS
 				arSelectors.back().m_pCompiledStyle->m_oBorder.Clear();
 			}
 
-			if (arSelectors.size() > 1)
-				arSelectors.back().m_pCompiledStyle->AddParent(arSelectors[arSelectors.size() - 2].m_wsName);
-
-			arSelectors.back().m_pCompiledStyle->SetID(L"text-" + std::to_wstring(++m_nCountNodes));
-
 			return true;
 		}
 
-		const std::map<std::vector<CNode>, CCompiledStyle>::const_iterator oItem = m_mUsedStyles.find(arSelectors);
+		const std::map<std::vector<CNode>, CCompiledStyle>::iterator oItem = m_mUsedStyles.find(arSelectors);
 
-		if (oItem != m_mUsedStyles.cend() && (arSelectors.back().m_wsId.empty() || !HaveStylesById(arSelectors.back().m_wsId)))
+		if (oItem != m_mUsedStyles.end())
 		{
 			arSelectors.back().SetCompiledStyle(new CCompiledStyle(oItem->second));
 			return true;
 		}
 
-		if (!arSelectors.back().m_pCompiledStyle->Empty())
-			return true;
-
 		arSelectors.back().m_pCompiledStyle->SetDpi(m_nDpi);
 		unsigned int unStart = 0;
 
@@ -580,8 +522,8 @@ namespace NSCSS
 		if (itFound != arSelectors.crend())
 			unStart = itFound.base() - arSelectors.cbegin();
 
-		std::vector<std::wstring> arNodes = CalculateAllNodes(arSelectors, unStart, arSelectors.size());
-		std::vector<std::wstring> arPrevNodes = CalculateAllNodes(arSelectors, 0, unStart);
+		std::vector<std::wstring> arNodes = CalculateAllNodes(arSelectors, unStart);
+		std::vector<std::wstring> arPrevNodes;
 		bool bInTable = false;
 
 		for (size_t i = 0; i < unStart; ++i)
@@ -597,8 +539,7 @@ namespace NSCSS
 			if (0 != i)
 				*arSelectors[i].m_pCompiledStyle += *arSelectors[i - 1].m_pCompiledStyle;
 
-			if (i != arSelectors.size() - 1)
-				arSelectors[i].m_pCompiledStyle->AddParent(arSelectors[i].m_wsName);
+			arSelectors[i].m_pCompiledStyle->AddParent(arSelectors[i].m_wsName);
 
 			if (!bInTable)
 				bInTable = IsTableElement(arSelectors[i].m_wsName);
@@ -607,7 +548,6 @@ namespace NSCSS
 			{
 				arSelectors[i].m_pCompiledStyle->m_oBackground.Clear();
 				arSelectors[i].m_pCompiledStyle->m_oBorder.Clear();
-				arSelectors[i].m_pCompiledStyle->m_oDisplay.Clear();
 			}
 
 			arSelectors[i].m_pCompiledStyle->AddStyle(arSelectors[i].m_mAttributes, i + 1);
@@ -652,14 +592,11 @@ namespace NSCSS
 	}
 	#endif
 
-	std::vector<std::wstring> CCssCalculator_Private::CalculateAllNodes(const std::vector<CNode> &arSelectors, unsigned int unStart, unsigned int unEnd)
+	std::vector<std::wstring> CCssCalculator_Private::CalculateAllNodes(const std::vector<CNode> &arSelectors, unsigned int unStart)
 	{
-		if ((0 != unEnd && (unEnd < unStart || unEnd > arSelectors.size())) || (unStart == unEnd))
-			return std::vector<std::wstring>();
-
 		std::vector<std::wstring> arNodes;
-
-		for (std::vector<CNode>::const_reverse_iterator oNode = arSelectors.rbegin() + ((0 != unEnd) ? (arSelectors.size() - unEnd) : 0); oNode != arSelectors.rend() - unStart; ++oNode)
+		
+		for (std::vector<CNode>::const_reverse_iterator oNode = arSelectors.rbegin(); oNode != arSelectors.rend() - unStart; ++oNode)
 		{
 			if (!oNode->m_wsName.empty())
 				arNodes.push_back(oNode->m_wsName);
@@ -671,8 +608,8 @@ namespace NSCSS
 					std::vector<std::wstring> arClasses = NS_STATIC_FUNCTIONS::GetWordsW(oNode->m_wsClass, false, L" ");
 
 					arNodes.push_back(std::accumulate(arClasses.begin(), arClasses.end(), std::wstring(),
-					                                  [](std::wstring sRes, const std::wstring& sClass)
-					                                  {return sRes += L'.' + sClass + L' ';}));
+													  [](std::wstring sRes, const std::wstring& sClass)
+														{return sRes += L'.' + sClass + L' ';}));
 				}
 				else
 					arNodes.push_back(L'.' + oNode->m_wsClass);
@@ -690,7 +627,7 @@ namespace NSCSS
 		if (arNextNodes.empty())
 			return;
 
-		const std::vector<CElement*> arTempPrev = pElement->GetPrevElements(arNextNodes.cbegin(), arNextNodes.cend());
+		const std::vector<CElement*> arTempPrev = pElement->GetPrevElements(arNextNodes.crbegin() + 1, arNextNodes.crend());
 		const std::vector<CElement*> arTempKins = pElement->GetNextOfKin(wsName, arClasses);
 
 		if (!arTempPrev.empty())
@@ -700,36 +637,6 @@ namespace NSCSS
 			arFindedElements.insert(arFindedElements.end(), arTempKins.begin(), arTempKins.end());
 	}
 
-	inline std::wstring GetAlternativeDefaultNodeName(const std::wstring& wsNodeName)
-	{
-		if (L"strong" == wsNodeName)
-			return L"b";
-
-		if (L"cite" == wsNodeName || L"dfn" == wsNodeName || L"em" == wsNodeName ||
-		    L"var" == wsNodeName || L"adress" == wsNodeName)
-			return L"i";
-
-		if (L"tt" == wsNodeName || L"samp" == wsNodeName)
-			return L"code";
-
-		if (L"strike" == wsNodeName || L"del" == wsNodeName)
-			return L"s";
-
-		if (L"ins" == wsNodeName)
-			return L"u";
-
-		if (L"xmp" == wsNodeName || L"nobr" == wsNodeName)
-			return L"pre";
-
-		if (L"ol" == wsNodeName)
-			return L"ul";
-
-		if (L"fieldset" == wsNodeName)
-			return L"textarea";
-
-		return wsNodeName;
-	}
-
 	std::vector<const CElement*> CCssCalculator_Private::FindElements(std::vector<std::wstring> &arNodes, std::vector<std::wstring> &arNextNodes)
 	{
 		if (arNodes.empty())
@@ -737,19 +644,20 @@ namespace NSCSS
 
 		std::vector<const CElement*> arFindedElements;
 
-		std::wstring wsName, wsClasses, wsId;
+		std::wstring wsName, wsId;
 		std::vector<std::wstring> arClasses;
 
 		if (!arNodes.empty() && arNodes.back()[0] == L'#')
 		{
 			wsId = arNodes.back();
 			arNodes.pop_back();
+			arNextNodes.push_back(wsId);
 		}
 
 		if (!arNodes.empty() && arNodes.back()[0] == L'.')
 		{
-			wsClasses = arNodes.back();
-			arClasses = NS_STATIC_FUNCTIONS::GetWordsW(wsClasses, false, L" ");
+			arClasses = NS_STATIC_FUNCTIONS::GetWordsW(arNodes.back(), false, L" ");
+			arNextNodes.push_back(arNodes.back());
 			arNodes.pop_back();
 		}
 
@@ -757,6 +665,7 @@ namespace NSCSS
 		{
 			wsName = arNodes.back();
 			arNodes.pop_back();
+			arNextNodes.push_back(wsName);
 		}
 
 		if (!wsId.empty())
@@ -788,11 +697,6 @@ namespace NSCSS
 			}
 		}
 
-		const CElement* pFoundDefault = m_oStyleStorage.FindDefaultElement(GetAlternativeDefaultNodeName(wsName));
-
-		if (nullptr != pFoundDefault)
-			arFindedElements.push_back(pFoundDefault);
-
 		const CElement* pFoundName = m_oStyleStorage.FindElement(wsName);
 
 		if (nullptr != pFoundName)
@@ -820,14 +724,6 @@ namespace NSCSS
 			          { return oFirstElement->GetWeight() > oSecondElement->GetWeight(); });
 		}
 
-		if (!wsId.empty())
-			arNextNodes.push_back(wsId);
-
-		if (!wsClasses.empty())
-			arNextNodes.push_back(wsClasses);
-
-		arNextNodes.push_back(wsName);
-
 		return arFindedElements;
 	}
 
@@ -842,7 +738,7 @@ namespace NSCSS
 		if (arSelectors.empty())
 			return false;
 
-		std::vector<std::wstring> arNodes = CalculateAllNodes(arSelectors, 0, arSelectors.size());
+		std::vector<std::wstring> arNodes = CalculateAllNodes(arSelectors);
 		std::vector<std::wstring> arNextNodes;
 
 		for (size_t i = 0; i < arSelectors.size(); ++i)

Common/3dParty/html/css/src/CCssCalculator_Private.h

@@ -27,7 +27,6 @@ namespace NSCSS
 		void AddStylesFromFile(const std::wstring& wsFileName);
 
 		void ClearEmbeddedStyles();
-		void ClearDefaultStyles();
 		void ClearAllowedStyleFiles();
 		void ClearStylesFromFile(const std::wstring& wsFileName);
 
@@ -39,7 +38,6 @@ namespace NSCSS
 		#endif
 
 		const CElement* FindElement(const std::wstring& wsSelector) const;
-		const CElement* FindDefaultElement(const std::wstring& wsSelector) const;
 	private:
 		typedef struct
 		{
@@ -51,7 +49,6 @@ namespace NSCSS
 		std::set<std::wstring> m_arAllowedStyleFiles;
 		std::vector<TStyleFileData*> m_arStyleFiles;
 		std::map<std::wstring, CElement*> m_mEmbeddedStyleData;
-		std::map<std::wstring, CElement*> m_mDefaultStyleData;
 
 		#ifdef CSS_CALCULATOR_WITH_XHTML
 		typedef struct
@@ -81,8 +78,6 @@ namespace NSCSS
 		void GetOutputData(KatanaOutput* oOutput, std::map<std::wstring, CElement*>& mStyleData);
 
 		const CElement* FindSelectorFromStyleData(const std::wstring& wsSelector, const std::map<std::wstring, CElement*>& mStyleData) const;
-
-		void InitDefaultStyles();
 	};
 
 	class CCssCalculator_Private
@@ -115,7 +110,7 @@ namespace NSCSS
 		void ClearPageData();
 		#endif
 
-		std::vector<std::wstring> CalculateAllNodes(const std::vector<CNode>& arSelectors, unsigned int unStart, unsigned int unEnd);
+		std::vector<std::wstring> CalculateAllNodes(const std::vector<CNode>& arSelectors, unsigned int unStart = 0);
 		std::vector<const CElement*> FindElements(std::vector<std::wstring>& arNodes, std::vector<std::wstring>& arNextNodes);
 
 		void AddStyles(const std::string& sStyle);

Common/3dParty/html/css/src/CElement.cpp

@@ -9,13 +9,6 @@ namespace NSCSS
 	CElement::CElement()
 	{
 	}
-
-	CElement::CElement(const std::wstring& wsSelector, std::map<std::wstring, std::wstring> mStyle)
-		: m_mStyle(mStyle), m_sSelector(wsSelector), m_sFullSelector(wsSelector)
-	{
-		UpdateWeight();
-	}
-
 	CElement::~CElement()
 	{
 		for (CElement* oElement : m_arPrevElements)
@@ -25,6 +18,7 @@ namespace NSCSS
 				continue;
 
 		m_mStyle.clear();
+
 	}
 
 	std::wstring CElement::GetSelector() const
@@ -182,14 +176,14 @@ namespace NSCSS
 		return arElements;
 	}
 
-	std::vector<CElement *> CElement::GetPrevElements(const std::vector<std::wstring>::const_iterator& oNodesBegin, const std::vector<std::wstring>::const_iterator& oNodesEnd) const
+	std::vector<CElement *> CElement::GetPrevElements(const std::vector<std::wstring>::const_reverse_iterator& oNodesRBegin, const std::vector<std::wstring>::const_reverse_iterator& oNodesREnd) const
 	{
-		if (oNodesBegin >= oNodesEnd || m_arPrevElements.empty())
+		if (oNodesRBegin >= oNodesREnd || m_arPrevElements.empty())
 			return std::vector<CElement*>();
 
 		std::vector<CElement*> arElements;
 
-		for (std::vector<std::wstring>::const_iterator iWord = oNodesBegin; iWord != oNodesEnd; ++iWord)
+		for (std::vector<std::wstring>::const_reverse_iterator iWord = oNodesRBegin; iWord != oNodesREnd; ++iWord)
 		{
 			if ((*iWord)[0] == L'.' && ((*iWord).find(L" ") != std::wstring::npos))
 			{
@@ -201,7 +195,7 @@ namespace NSCSS
 						if (oPrevElement->m_sSelector == wsClass)
 						{
 							arElements.push_back(oPrevElement);
-							std::vector<CElement*> arTempElements = oPrevElement->GetPrevElements(iWord + 1, oNodesEnd);
+							std::vector<CElement*> arTempElements = oPrevElement->GetPrevElements(iWord + 1, oNodesREnd);
 							arElements.insert(arElements.end(), arTempElements.begin(), arTempElements.end());
 						}
 					}
@@ -214,8 +208,9 @@ namespace NSCSS
 					if (oPrevElement->m_sSelector == *iWord)
 					{
 						arElements.push_back(oPrevElement);
-						std::vector<CElement*> arTempElements = oPrevElement->GetPrevElements(iWord + 1, oNodesEnd);
+						std::vector<CElement*> arTempElements = oPrevElement->GetPrevElements(iWord + 1, oNodesREnd);
 						arElements.insert(arElements.end(), arTempElements.begin(), arTempElements.end());
+	//                    return arElements;
 					}
 				}
 			}

Common/3dParty/html/css/src/CElement.h

@@ -22,7 +22,6 @@ namespace NSCSS
 
 	public:
 		CElement();
-		CElement(const std::wstring& wsSelector, std::map<std::wstring, std::wstring> mStyle);
 		~CElement();
 
 		std::wstring GetSelector() const;
@@ -40,7 +39,7 @@ namespace NSCSS
 		std::map<std::wstring, std::wstring> GetFullStyle(const std::vector<CNode>& arSelectors) const;
 		std::map<std::wstring, std::wstring> GetFullStyle(const std::vector<std::wstring>& arNodes) const;
 		std::vector<CElement *> GetNextOfKin(const std::wstring& sName, const std::vector<std::wstring>& arClasses = {}) const;
-		std::vector<CElement *> GetPrevElements(const std::vector<std::wstring>::const_iterator& oNodesBegin, const std::vector<std::wstring>::const_iterator& oNodesEnd) const;
+		std::vector<CElement *> GetPrevElements(const std::vector<std::wstring>::const_reverse_iterator& oNodesRBegin, const std::vector<std::wstring>::const_reverse_iterator& oNodesREnd) const;
 		std::map<std::wstring, std::wstring> GetConvertStyle(const std::vector<CNode>& arNodes) const;
 
 		CElement *FindPrevElement(const std::wstring& sSelector) const;

Common/3dParty/html/css/src/CNode.cpp

@@ -17,7 +17,8 @@ namespace NSCSS
 	      m_wsStyle(oNode.m_wsStyle), m_mAttributes(oNode.m_mAttributes)
 	{
 		#ifdef CSS_CALCULATOR_WITH_XHTML
-		m_pCompiledStyle = new CCompiledStyle(*oNode.m_pCompiledStyle);
+		m_pCompiledStyle = new CCompiledStyle();
+		*m_pCompiledStyle = *oNode.m_pCompiledStyle;
 		#endif
 	}
 
@@ -41,23 +42,6 @@ namespace NSCSS
 		return m_wsName.empty() && m_wsClass.empty() && m_wsId.empty() && m_wsStyle.empty();
 	}
 
-	bool CNode::GetAttributeValue(const std::wstring& wsAttributeName, std::wstring& wsAttributeValue) const
-	{
-		const std::map<std::wstring, std::wstring>::const_iterator itFound{m_mAttributes.find(wsAttributeName)};
-
-		if (m_mAttributes.cend() == itFound)
-			return false;
-
-		wsAttributeValue = itFound->second;
-		return true;
-	}
-
-	std::wstring CNode::GetAttributeValue(const std::wstring& wsAttributeName) const
-	{
-		const std::map<std::wstring, std::wstring>::const_iterator itFound{m_mAttributes.find(wsAttributeName)};
-		return (m_mAttributes.cend() != itFound) ? itFound->second : std::wstring();
-	}
-
 	#ifdef CSS_CALCULATOR_WITH_XHTML
 	void CNode::SetCompiledStyle(CCompiledStyle* pCompiledStyle)
 	{
@@ -102,9 +86,6 @@ namespace NSCSS
 		if(m_wsStyle != oNode.m_wsStyle)
 			return m_wsStyle < oNode.m_wsStyle;
 
-		if (m_mAttributes.size() != oNode.m_mAttributes.size())
-			return m_mAttributes.size() < oNode.m_mAttributes.size();
-
 		if (m_mAttributes != oNode.m_mAttributes)
 			return m_mAttributes < oNode.m_mAttributes;
 
@@ -113,9 +94,10 @@ namespace NSCSS
 
 	bool CNode::operator==(const CNode& oNode) const
 	{
-		return((m_wsName == oNode.m_wsName)   &&
-		       (m_wsClass == oNode.m_wsClass) &&
-		       (m_wsStyle == oNode.m_wsStyle) &&
-		       (m_mAttributes == oNode.m_mAttributes));
+		return((m_wsId == oNode.m_wsId)       &&
+			   (m_wsName == oNode.m_wsName)   &&
+			   (m_wsClass == oNode.m_wsClass) &&
+			  (m_wsStyle == oNode.m_wsStyle) &&
+			  (m_mAttributes == oNode.m_mAttributes));
 	}
 }

Common/3dParty/html/css/src/CNode.h

@@ -18,7 +18,6 @@ namespace NSCSS
 		std::wstring m_wsId;    // Id тэга
 		std::wstring m_wsStyle; // Стиль тэга
 		std::map<std::wstring, std::wstring> m_mAttributes; // Остальные аттрибуты тэга
-		//TODO:: возможно использование std::wstring излишне
 
 		#ifdef CSS_CALCULATOR_WITH_XHTML
 		CCompiledStyle *m_pCompiledStyle;
@@ -31,9 +30,6 @@ namespace NSCSS
 
 		bool Empty() const;
 
-		bool GetAttributeValue(const std::wstring& wsAttributeName, std::wstring& wsAttributeValue) const;
-		std::wstring GetAttributeValue(const std::wstring& wsAttributeName) const;
-
 		#ifdef CSS_CALCULATOR_WITH_XHTML
 		void SetCompiledStyle(CCompiledStyle* pCompiledStyle);
 		#endif

Common/3dParty/html/css/src/CUnitMeasureConverter.cpp

@@ -149,7 +149,7 @@ namespace NSCSS
 			case NSCSS::Millimeter:
 				return dValue * 0.01764;
 			case NSCSS::Inch:
-				return dValue / 1440.;
+				return dValue * 1440.;
 			case NSCSS::Peak:
 				return dValue * 0.004167; // 0.004167 = 6 / 1440
 			default:

Common/3dParty/html/css/src/ConstValues.h

@@ -69,10 +69,7 @@ namespace NSCSS
 				R_Highlight,
 				R_Shd,
 				R_SmallCaps,
-				R_Kern,
-				R_Vanish,
-				R_Strike,
-				R_VertAlign
+				R_Kern
 			} RunnerProperties;
 
 			typedef enum

Common/3dParty/html/css/src/StyleProperties.h

@@ -4,14 +4,11 @@
 #include <map>
 #include <string>
 #include <vector>
+#include <sstream>
 
 #include "../../../../DesktopEditor/graphics/Matrix.h"
 #include "CUnitMeasureConverter.h"
 
-#include <boost/optional.hpp>
-#include "boost/blank.hpp"
-#include <boost/variant2/variant.hpp>
-
 namespace NSCSS
 {
 	namespace NSProperties
@@ -19,34 +16,33 @@ namespace NSCSS
 	#define NEXT_LEVEL UINT_MAX, true
 
 	template<typename T>
-	class CValueBase
+	class CValue
 	{
-	protected:
-		CValueBase()
-			: m_unLevel(0), m_bImportant(false)
-		{}
-		CValueBase(const CValueBase& oValue)
-			: m_oValue(oValue.m_oValue), m_unLevel(oValue.m_unLevel), m_bImportant(oValue.m_bImportant)
-		{}
-
-		CValueBase(const T& oValue, unsigned int unLevel, bool bImportant)
-		    : m_oValue(oValue), m_unLevel(unLevel), m_bImportant(bImportant)
-		{}
+		friend class CString;
+		friend class CMatrix;
+		friend class CDigit;
+		friend class CColor;
+		friend class CEnum;
+		friend class CURL;
 
 		T            m_oValue;
 		unsigned int m_unLevel;
 		bool         m_bImportant;
 	public:
-		virtual bool Empty() const = 0;
-		virtual void Clear() = 0;
+		CValue(const T& oValue, unsigned int unLevel, bool bImportant) :
+		    m_oValue(oValue), m_unLevel(unLevel), m_bImportant(bImportant)
+		{
+		}
 
 		virtual bool SetValue(const std::wstring& wsValue, unsigned int unLevel, bool bHardMode) = 0;
 
+		virtual bool Empty() const = 0;
+		virtual void Clear() = 0;
 		virtual int ToInt() const = 0;
 		virtual double ToDouble() const = 0;
 		virtual std::wstring ToWString() const = 0;
 
-		static void Equation(CValueBase &oFirstValue, CValueBase &oSecondValue)
+		static void Equation(CValue &oFirstValue, CValue &oSecondValue)
 		{
 			if (oFirstValue.m_bImportant && !oSecondValue.m_bImportant && oFirstValue.Empty())
 				oSecondValue.Clear();
@@ -61,39 +57,18 @@ namespace NSCSS
 			}
 		}
 
-		static bool LevelIsSame(const CValueBase& oFirstValue, const CValueBase& oSecondValue)
+		static bool LevelIsSame(const CValue& oFirstValue, const CValue& oSecondValue)
 		{
 			return oFirstValue.m_unLevel == oSecondValue.m_unLevel;
 		}
 
-		friend bool operator==(const CValueBase& oLeftValue, const CValueBase& oRightValue)
-		{
-			if (oLeftValue.Empty() && oRightValue.Empty())
-				return true;
+		bool operator==(const T& oValue) const { return m_oValue == oValue; }
+		bool operator>=(const T& oValue) const { return m_oValue >= oValue; }
+		bool operator<=(const T& oValue) const { return m_oValue <= oValue; }
+		bool operator> (const T& oValue) const { return m_oValue > oValue; }
+		bool operator< (const T& oValue) const { return m_oValue < oValue; }
 
-			if (( oLeftValue.Empty() && !oRightValue.Empty()) ||
-			    (!oLeftValue.Empty() &&  oRightValue.Empty()))
-				return false;
-
-			return oLeftValue.m_oValue == oRightValue.m_oValue;
-		}
-
-		friend bool operator!=(const CValueBase& oLeftValue, const CValueBase& oRightValue)
-		{
-			return !(oLeftValue == oRightValue);
-		}
-
-		bool operator==(const T& oValue) const
-		{
-			return m_oValue == oValue;
-		}
-
-		bool operator!=(const T& oValue) const
-		{
-			return m_oValue != oValue;
-		}
-
-		virtual CValueBase& operator =(const CValueBase& oValue)
+		virtual CValue& operator =(const CValue& oValue)
 		{
 			m_oValue     = oValue.m_oValue;
 			m_unLevel    = oValue.m_unLevel;
@@ -102,93 +77,70 @@ namespace NSCSS
 			return *this;
 		}
 
-		virtual CValueBase& operator =(const T& oValue)
+		virtual CValue& operator =(const T& oValue)
 		{
-			m_oValue = oValue;
-
+			//m_oValue = oValue.m_oValue;
 			return *this;
 		}
 
-		virtual CValueBase& operator+=(const CValueBase& oValue)
+		virtual CValue& operator+=(const CValue& oValue)
 		{
 			if (m_unLevel > oValue.m_unLevel || (m_bImportant && !oValue.m_bImportant) || oValue.Empty())
 				return *this;
 
-			*this = oValue;
+			m_oValue     = oValue.m_oValue;
+			m_unLevel    = oValue.m_unLevel;
+			m_bImportant = oValue.m_bImportant;
 
 			return *this;
 		}
-	};
 
-	template<typename T>
-	class CValueOptional : public CValueBase<boost::optional<T>>
-	{
-	protected:
-		CValueOptional() = default;
-
-		CValueOptional(const T& oValue, unsigned int unLevel = 0, bool bImportant = false)
-		    : CValueBase<boost::optional<T>>(oValue, unLevel, bImportant)
-		{}
-	public:
-		virtual bool Empty() const override
+		virtual bool operator==(const CValue& oValue) const
 		{
-			return !this->m_oValue.has_value();
-		}
-		void Clear() override
-		{
-			this->m_oValue.reset();
-			this->m_unLevel = 0;
-			this->m_bImportant = false;
+			return m_oValue == oValue.m_oValue;
 		}
 
-		bool operator==(const T& oValue) const
+		virtual bool operator!=(const CValue& oValue) const
 		{
-			if (!this->m_oValue.has_value())
-				return false;
-
-			return this->m_oValue.value() == oValue;
-		}
-
-		virtual CValueOptional& operator=(const T& oValue)
-		{
-			this->m_oValue = oValue;
-
-			return *this;
+			return m_oValue != oValue.m_oValue;
 		}
 	};
 
-	class CString : public CValueOptional<std::wstring>
+	class CString : public CValue<std::wstring>
 	{
 	public:
-		CString() = default;
-		CString(const std::wstring& wsValue, unsigned int unLevel = 0, bool bImportant = false);
+		CString();
+		CString(const std::wstring& wsValue, unsigned int unLevel, bool bImportant = false);
 
 		bool SetValue(const std::wstring& wsValue, unsigned int unLevel, bool bHardMode) override;
 		bool SetValue(const std::wstring& wsValue, const std::vector<std::wstring>& arValiableValues, unsigned int unLevel, bool bHardMode);
 		bool SetValue(const std::wstring& wsValue, const std::map<std::wstring, std::wstring>& arValiableValues, unsigned int unLevel, bool bHardMode);
 
 		bool Empty() const override;
+		void Clear() override;
 
 		int          ToInt()     const override;
 		double       ToDouble()  const override;
 		std::wstring ToWString() const override;
 
-		bool operator==(const wchar_t* pValue) const;
-		bool operator!=(const wchar_t* pValue) const;
-
-		using CValueOptional<std::wstring>::operator=;
+		CString& operator+=(const CString& oString);
 	};
 
-	class CDigit : public CValueOptional<double>
+	class CDigit : public CValue<double>
 	{
+		UnitMeasure m_enUnitMeasure;
+
+		double ConvertValue(double dPrevValue, UnitMeasure enUnitMeasure) const;
 	public:
 		CDigit();
-		CDigit(const double& dValue, unsigned int unLevel = 0, bool bImportant = false);
+		CDigit(double dValue);
+		CDigit(double dValue, unsigned int unLevel, bool bImportant = false);
 
 		bool SetValue(const std::wstring& wsValue, unsigned int unLevel = 0, bool bHardMode = true) override;
 		bool SetValue(const CDigit& oValue);
-		bool SetValue(const double& dValue, UnitMeasure enUnitMeasure, unsigned int unLevel = 0, bool bHardMode = true);
+		bool SetValue(const double& dValue, unsigned int unLevel, bool bHardMode);
 
+		bool Empty() const override;
 		bool Zero() const;
 		void Clear() override;
 
@@ -204,7 +156,7 @@ namespace NSCSS
 
 		UnitMeasure GetUnitMeasure() const;
 
-		bool operator==(const double& dValue) const;
+		bool operator==(const double& oValue) const;
 		bool operator==(const CDigit& oDigit) const;
 
 		bool operator!=(const double& oValue) const;
@@ -219,19 +171,11 @@ namespace NSCSS
 
 		CDigit& operator+=(const CDigit& oDigit);
 		CDigit& operator-=(const CDigit& oDigit);
-		CDigit& operator+=(const double& dValue);
-		CDigit& operator-=(const double& dValue);
-		CDigit& operator*=(const double& dValue);
-		CDigit& operator/=(const double& dValue);
-
-		using CValueOptional<double>::operator=;
-	private:
-		UnitMeasure m_enUnitMeasure;
-
-		double ConvertValue(double dPrevValue, UnitMeasure enUnitMeasure) const;
-
-		template <typename Operation>
-		CDigit ApplyOperation(const CDigit& oDigit, Operation operation) const;
+		CDigit& operator+=(double dValue);
+		CDigit& operator-=(double dValue);
+		CDigit& operator*=(double dValue);
+		CDigit& operator/=(double dValue);
+		CDigit& operator =(double dValue);
 	};
 
 	struct TRGB
@@ -242,8 +186,6 @@ namespace NSCSS
 
 		bool Empty() const;
 
-		int ToInt() const;
-
 		bool operator==(const TRGB& oRGB) const;
 		bool operator!=(const TRGB& oRGB) const;
 	};
@@ -269,58 +211,31 @@ namespace NSCSS
 	
 	typedef enum
 	{
+		ColorEmpty,
 		ColorNone,
 		ColorRGB,
 		ColorHEX,
 		ColorUrl,
 		ColorContextStroke,
 		ColorContextFill
-	} EColorType;
+	} ColorType;
 
-	class CColorValue
-	{
-		using color_value = boost::variant2::variant<boost::blank, std::wstring, TRGB, CURL>;
-	protected:
-		EColorType  m_eType;
-	public:
-		CColorValue();
-		CColorValue(const CColorValue& oValue);
-		CColorValue(const std::wstring& wsValue);
-		CColorValue(const TRGB& oValue);
-		CColorValue(const CURL& oValue);
-
-		EColorType GetType() const;
-
-		bool operator==(const CColorValue& oValue) const;
-
-		color_value m_oValue;
-	};
-
-	class CColorValueContextStroke : public CColorValue
-	{
-	public:
-		CColorValueContextStroke();
-	};
-
-	class CColorValueContextFill : public CColorValue
-	{
-	public:
-		CColorValueContextFill();
-	};
-
-	class CColor : public CValueOptional<CColorValue>
+	class CColor : public CValue<void*>
 	{
 	public:
 		CColor();
+		CColor(const CColor& oColor);
+		~CColor();
 
 		bool SetValue(const std::wstring& wsValue, unsigned int unLevel = 0, bool bHardMode = true) override;
 		bool SetOpacity(const std::wstring& wsValue, unsigned int unLevel = 0, bool bHardMode = true);
 
+		bool Empty() const override;
 		bool None() const;
 		bool Url() const;
 		void Clear() override;
 
-		EColorType GetType() const;
+		ColorType GetType() const;
 
 		double GetOpacity() const;
 
@@ -334,15 +249,21 @@ namespace NSCSS
 		static TRGB ConvertHEXtoRGB(const std::wstring& wsValue);
 		static std::wstring ConvertRGBtoHEX(const TRGB& oValue);
 
-		using CValueOptional<CColorValue>::operator=;
+		bool operator==(const CColor& oColor) const;
+		bool operator!=(const CColor& oColor) const;
+
+		CColor& operator =(const CColor& oColor);
+		CColor& operator+=(const CColor& oColor);
 	private:
-		CDigit m_oOpacity;
+		CDigit    m_oOpacity;
+		ColorType m_enType;
 
 		void SetEmpty(unsigned int unLevel = 0);
 		void SetRGB(unsigned char uchR, unsigned char uchG, unsigned char uchB);
 		void SetRGB(const TRGB& oRGB);
 		void SetHEX(const std::wstring& wsValue);
-		bool SetUrl(const std::wstring& wsValue);
+		void SetUrl(const std::wstring& wsValue);
+		void SetNone();
 	};
 
 	typedef enum
@@ -358,7 +279,7 @@ namespace NSCSS
 
 	typedef std::vector<std::pair<std::vector<double>, TransformType>> MatrixValues;
 
-	class CMatrix : public CValueBase<MatrixValues>
+	class CMatrix : public CValue<MatrixValues>
 	{
 		std::vector<std::wstring> CutTransforms(const std::wstring& wsValue) const;
 	public:
@@ -381,29 +302,29 @@ namespace NSCSS
 		void ApplyTranform(Aggplus::CMatrix& oMatrix, Aggplus::MatrixOrder order = Aggplus::MatrixOrderPrepend) const;
 
 		bool operator==(const CMatrix& oMatrix) const;
-		CMatrix& operator+=(const CMatrix& oMatrix);
-		CMatrix& operator-=(const CMatrix& oMatrix);
-
-		using CValueBase<MatrixValues>::operator=;
 	};
 
-	class CEnum : public CValueOptional<int>
+	class CEnum : public CValue<int>
 	{
+		std::map<std::wstring, int> m_mMap;
 	public:
 		CEnum();
 
 		bool SetValue(const std::wstring& wsValue, unsigned int unLevel, bool bHardMode) override;
 		void SetMapping(const std::map<std::wstring, int>& mMap, int nDefaulvalue = -1);
 
-		int ToInt() const override;
+		bool Empty() const override;
+		void Clear() override;
 
-		using CValueOptional<int>::operator=;
+		CEnum &operator =(int nValue);
+
+		bool operator==(int nValue) const;
+		bool operator!=(int nValue) const;
+
+		int ToInt() const override;
 	private:
 		double ToDouble() const override;
 		std::wstring ToWString() const override;
-
-		int m_nDefaultValue;
-		std::map<std::wstring, int> m_mMap;
 	};
 
 	// PROPERTIES
@@ -450,7 +371,6 @@ namespace NSCSS
 		const CEnum& GetWhiteSpace() const;
 
 		bool Empty() const;
-		void Clear();
 
 		CDisplay& operator+=(const CDisplay& oDisplay);
 		bool      operator==(const CDisplay& oDisplay) const;
@@ -552,7 +472,7 @@ namespace NSCSS
 
 		bool SetValue(const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
 		bool SetWidth(const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
-		bool SetWidth(const double& dValue, UnitMeasure enUnitMeasure, unsigned int unLevel, bool bHardMode = false);
+		bool SetWidth(const double& dValue, unsigned int unLevel, bool bHardMode = false);
 		bool SetStyle(const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
 		bool SetColor(const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
 
@@ -604,7 +524,7 @@ namespace NSCSS
 
 		bool SetSides(const std::wstring& wsValue,    unsigned int unLevel, bool bHardMode = false);
 		bool SetWidth(const std::wstring& wsValue,    unsigned int unLevel, bool bHardMode = false);
-		bool SetWidth(const double& dValue,           UnitMeasure enUnitMeasure, unsigned int unLevel, bool bHardMode = false);
+		bool SetWidth(const double& dValue,           unsigned int unLevel, bool bHardMode = false);
 		bool SetStyle(const std::wstring& wsValue,    unsigned int unLevel, bool bHardMode = false);
 		bool SetColor(const std::wstring& wsValue,    unsigned int unLevel, bool bHardMode = false);
 		bool SetCollapse(const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
@@ -612,28 +532,28 @@ namespace NSCSS
 		//Left Side
 		bool SetLeftSide       (const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
 		bool SetWidthLeftSide  (const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
-		bool SetWidthLeftSide  (const double& dValue,        UnitMeasure enUnitMeasure, unsigned int unLevel, bool bHardMode = false);
+		bool SetWidthLeftSide  (const double& dValue,        unsigned int unLevel, bool bHardMode = false);
 		bool SetStyleLeftSide  (const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
 		bool SetColorLeftSide  (const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
 
 		//Top Side
 		bool SetTopSide        (const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
 		bool SetWidthTopSide   (const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
-		bool SetWidthTopSide   (const double& dValue,        UnitMeasure enUnitMeasure, unsigned int unLevel, bool bHardMode = false);
+		bool SetWidthTopSide   (const double& dValue,        unsigned int unLevel, bool bHardMode = false);
 		bool SetStyleTopSide   (const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
 		bool SetColorTopSide   (const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
 
 		//Right Side
 		bool SetRightSide      (const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
 		bool SetWidthRightSide (const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
-		bool SetWidthRightSide (const double& dValue,        UnitMeasure enUnitMeasure, unsigned int unLevel, bool bHardMode = false);
+		bool SetWidthRightSide (const double& dValue,        unsigned int unLevel, bool bHardMode = false);
 		bool SetStyleRightSide (const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
 		bool SetColorRightSide (const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
 
 		//Bottom Side
 		bool SetBottomSide     (const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
 		bool SetWidthBottomSide(const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
-		bool SetWidthBottomSide(const double& dValue,        UnitMeasure enUnitMeasure, unsigned int unLevel, bool bHardMode = false);
+		bool SetWidthBottomSide(const double& dValue,        unsigned int unLevel, bool bHardMode = false);
 		bool SetStyleBottomSide(const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
 		bool SetColorBottomSide(const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
 
@@ -696,30 +616,6 @@ namespace NSCSS
 		bool operator==(const TTextDecoration& oTextDecoration) const;
 	};
 
-	typedef enum
-	{
-		Baseline,
-		Sub,
-		Super,
-		Percentage,
-		Length
-	} EBaselineShift;
-
-	class CBaselineShift
-	{
-		CEnum   m_eType;
-		CDigit  m_oValue;
-	public:
-		CBaselineShift();
-
-		bool Empty() const;
-
-		EBaselineShift GetType() const;
-		double         GetValue() const;
-
-		bool SetValue(const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
-	};
-
 	class CText
 	{
 	public:
@@ -727,12 +623,11 @@ namespace NSCSS
 
 		static void Equation(CText &oFirstText, CText &oSecondText);
 
-		bool SetIndent        (const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
-		bool SetAlign         (const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
-		bool SetDecoration    (const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
-		bool SetColor         (const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
-		bool SetHighlight     (const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
-		bool SetBaselineShift (const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
+		bool SetIndent    (const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
+		bool SetAlign     (const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
+		bool SetDecoration(const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
+		bool SetColor     (const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
+		bool SetHighlight (const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
 
 		const CDigit&          GetIndent()     const;
 		const CString&         GetAlign()      const;
@@ -740,9 +635,6 @@ namespace NSCSS
 		const CColor&          GetColor()      const;
 		const CColor&          GetHighlight()  const;
 
-		EBaselineShift GetBaselineShiftType()  const;
-		double         GetBaselineShiftValue() const;
-
 		bool Empty() const;
 
 		bool Underline()   const;
@@ -752,7 +644,6 @@ namespace NSCSS
 		CText& operator+=(const CText& oText);
 		bool   operator==(const CText& oText) const;
 	private:
-		CBaselineShift  m_oBaselineShift;
 		TTextDecoration m_oDecoration;
 		CDigit          m_oIndent;
 		CString         m_oAlign;
@@ -775,15 +666,13 @@ namespace NSCSS
 
 		bool SetValues (const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
 		bool SetTop    (const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
+		bool SetTop    (const double& dValue,        unsigned int unLevel, bool bHardMode = false);
 		bool SetRight  (const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
+		bool SetRight  (const double& dValue,        unsigned int unLevel, bool bHardMode = false);
 		bool SetBottom (const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
+		bool SetBottom (const double& dValue,        unsigned int unLevel, bool bHardMode = false);
 		bool SetLeft   (const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
-
-		bool SetValues (const double& dValue, UnitMeasure enUnitMeasure, unsigned int unLevel, bool bHardMode = false);
-		bool SetTop    (const double& dValue, UnitMeasure enUnitMeasure, unsigned int unLevel, bool bHardMode = false);
-		bool SetRight  (const double& dValue, UnitMeasure enUnitMeasure, unsigned int unLevel, bool bHardMode = false);
-		bool SetBottom (const double& dValue, UnitMeasure enUnitMeasure, unsigned int unLevel, bool bHardMode = false);
-		bool SetLeft   (const double& dValue, UnitMeasure enUnitMeasure, unsigned int unLevel, bool bHardMode = false);
+		bool SetLeft   (const double& dValue,        unsigned int unLevel, bool bHardMode = false);
 
 		void UpdateAll   (const double& dParentFontSize, const double& dCoreFontSize);
 		void UpdateTop   (const double& dParentFontSize, const double& dCoreFontSize);
@@ -796,9 +685,6 @@ namespace NSCSS
 		const CDigit& GetBottom() const;
 		const CDigit& GetLeft  () const;
 
-		bool GetAfterAutospacing () const;
-		bool GetBeforeAutospacing() const;
-
 		bool Empty() const;
 		bool Zero() const;
 
@@ -826,7 +712,7 @@ namespace NSCSS
 
 		bool SetValue         (const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
 		bool SetSize          (const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
-		bool SetSize          (const double& dValue,        UnitMeasure enUnitMeasure, unsigned int unLevel, bool bHardMode = false);
+		bool SetSize          (const double& dValue,        unsigned int unLevel, bool bHardMode = false);
 		bool SetLineHeight    (const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
 		bool SetFamily        (const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
 		bool SetStretch       (const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
@@ -876,12 +762,6 @@ namespace NSCSS
 		bool SetFooter (const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
 		bool SetHeader (const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
 
-		bool SetWidth  (const double& dValue, UnitMeasure enUnitMeasure, unsigned int unLevel, bool bHardMode = false);
-		bool SetHeight (const double& dValue, UnitMeasure enUnitMeasure, unsigned int unLevel, bool bHardMode = false);
-		bool SetMargin (const double& dValue, UnitMeasure enUnitMeasure, unsigned int unLevel, bool bHardMode = false);
-		bool SetFooter (const double& dValue, UnitMeasure enUnitMeasure, unsigned int unLevel, bool bHardMode = false);
-		bool SetHeader (const double& dValue, UnitMeasure enUnitMeasure, unsigned int unLevel, bool bHardMode = false);
-
 		const CDigit&  GetWidth()  const;
 		const CDigit&  GetHeight() const;
 		const CIndent& GetMargin() const;

Common/3dParty/html/css/src/xhtml/CDocumentStyle.cpp

@@ -22,11 +22,6 @@ namespace NSCSS
 		: m_oStyle(oStyle), m_bIsPStyle(bIsPStyle)
 	{}
 
-	void CStyleUsed::SetFinalId(const std::wstring& wsFinalId)
-	{
-		m_wsFinalId = wsFinalId;
-	}
-
 	bool CheckArrays(const std::vector<std::wstring>& arInitial, const std::set<std::wstring>& arFirst, const std::set<std::wstring>& arSecond)
 	{
 		std::unordered_set<std::wstring> arInitialSet(arInitial.begin(), arInitial.end());
@@ -62,14 +57,19 @@ namespace NSCSS
 		       m_oStyle == oUsedStyle.m_oStyle;
 	}
 
-	std::wstring CStyleUsed::GetId() const
+	std::wstring CStyleUsed::getId()
 	{
-		return m_wsFinalId;
+		if (m_bIsPStyle)
+			return m_oStyle.GetId();
+
+		return m_oStyle.GetId() + L"-c";
 	}
 
-	CDocumentStyle::CDocumentStyle()
-		: m_arStandardStyles(Names_Standard_Styles)
-	{}
+	CDocumentStyle::CDocumentStyle() : m_arStandardStyles(Names_Standard_Styles)
+	{
+		for (const std::wstring& oNameStandardStyle : Names_Standard_Styles)
+			m_arStandardStyles.push_back(oNameStandardStyle + L"-c");
+	}
 
 	CDocumentStyle::~CDocumentStyle()
 	{
@@ -85,7 +85,7 @@ namespace NSCSS
 
 	std::wstring CDocumentStyle::GetIdAndClear()
 	{
-		const std::wstring sId = m_sId;
+		std::wstring sId = m_sId;
 		Clear();
 		return sId;
 	}
@@ -110,10 +110,10 @@ namespace NSCSS
 		m_sId = sId;
 	}
 
-	bool CDocumentStyle::CombineStandardStyles(const std::vector<std::wstring>& arStandartedStyles, CXmlElement& oElement)
+	void CDocumentStyle::CombineStandardStyles(const std::vector<std::wstring>& arStandartedStyles, CXmlElement& oElement)
 	{
 		if (arStandartedStyles.empty())
-			return false;
+			return;
 
 		std::vector<std::wstring> arStyles;
 		for (const std::wstring& sStyleName : arStandartedStyles)
@@ -123,7 +123,7 @@ namespace NSCSS
 		}
 
 		if (arStyles.empty())
-			return false;
+			return;
 
 		std::wstring sId;
 		for (std::vector<std::wstring>::const_reverse_iterator iStyleName = arStyles.rbegin(); iStyleName != arStyles.rend(); ++iStyleName)
@@ -142,25 +142,18 @@ namespace NSCSS
 
 		oElement.AddBasicProperties(BProperties::B_Name, sId);
 		oElement.AddBasicProperties(BProperties::B_StyleId, sId);
-
-		return true;
 	}
 
-	bool CDocumentStyle::CreateStandardStyle(const std::wstring& sNameStyle, CXmlElement& oElement)
+	void CDocumentStyle::CreateStandardStyle(const std::wstring& sNameStyle, CXmlElement& oElement)
 	{
 		if (std::find(m_arStandardStyles.begin(), m_arStandardStyles.end(), sNameStyle) != m_arStandardStyles.end())
-		{
 			oElement.CreateDefaultElement(sNameStyle);
-			return true;
-		}
-
-		return false;
 	}
 
-	bool CDocumentStyle::ConvertStyle(const NSCSS::CCompiledStyle& oStyle, CXmlElement& oElement, bool bIsPStyle)
+	void CDocumentStyle::ConvertStyle(const NSCSS::CCompiledStyle& oStyle, CXmlElement& oElement, bool bIsPStyle)
 	{
 		if (oStyle.GetId().empty())
-			return false;
+			return;
 
 		std::wstring sName = oStyle.GetId();
 		const size_t posPoint = sName.find(L'.');
@@ -190,25 +183,25 @@ namespace NSCSS
 			for (std::wstring& sParentName : arParentsName)
 				sParentName += L"-c";
 
-		bool bResult{false};
-
 		if (!arParentsName.empty())
 		{
-			bResult = CombineStandardStyles(arParentsName, oParentStyle);
+			CombineStandardStyles(arParentsName, oParentStyle);
 
 			if (!oParentStyle.Empty())
 			{
 				oParentStyle.AddBasicProperties(BProperties::B_BasedOn, L"normal");
-				oParentStyle.AddBasicProperties(BProperties::B_StyleId, oParentStyle.GetStyleId());
+				oParentStyle.AddBasicProperties(BProperties::B_StyleId, L"(" + oParentStyle.GetStyleId() + L")");
 				if (!bIsPStyle)
+				{
+					oParentStyle.AddBasicProperties(BProperties::B_StyleId, oParentStyle.GetStyleId() + L"-c");
 					oParentStyle.AddBasicProperties(BProperties::B_Type, L"character");
+				}
 			}
 		}
 
 		CXmlElement oStandardXmlElement;
 		if (std::find(m_arStandardStyles.begin(), m_arStandardStyles.end(), sName) != m_arStandardStyles.end())
-			if (CreateStandardStyle(sName, oStandardXmlElement))
-				bResult = true;
+			CreateStandardStyle(sName, oStandardXmlElement);
 
 		if (oStandardXmlElement.Empty() && !oParentStyle.Empty())
 		{
@@ -228,7 +221,7 @@ namespace NSCSS
 			if (oStyle.Empty())
 			{
 				m_sId = sParentsStyleID;
-				return true;
+				return;
 			}
 
 			oElement.AddBasicProperties(BProperties::B_BasedOn, sParentsStyleID);
@@ -241,7 +234,7 @@ namespace NSCSS
 				if (oStyle.Empty())
 				{
 					m_sId = sStandPlusParent;
-					return true;
+					return;
 				}
 				oElement.AddBasicProperties(BProperties::B_BasedOn, sStandPlusParent);
 			}
@@ -265,7 +258,7 @@ namespace NSCSS
 				if (oStyle.Empty())
 				{
 					m_sId = sStandPlusParent;
-					return true;
+					return;
 				}
 				oElement.AddBasicProperties(BProperties::B_BasedOn, oTempElement.GetStyleId());
 			}
@@ -288,7 +281,7 @@ namespace NSCSS
 			if (oStyle.Empty())
 			{
 				m_sId = sStandartStyleID;
-				return true;
+				return;
 			}
 			oElement.AddBasicProperties(BProperties::B_BasedOn, sStandartStyleID);
 		}
@@ -296,7 +289,7 @@ namespace NSCSS
 		if (oStyle.Empty() && oElement.Empty())
 		{
 			m_sId = L"normal";
-			return true;
+			return;
 		}
 
 		m_sId = oStyle.GetId();
@@ -309,19 +302,15 @@ namespace NSCSS
 		oElement.AddBasicProperties(BProperties::B_Name, m_sId);
 		oElement.AddBasicProperties(BProperties::B_Type, bIsPStyle ? L"paragraph" : L"character");
 		oElement.AddBasicProperties(BProperties::B_CustomStyle, L"1");
-
-		return bResult;
 	}
 
-	bool CDocumentStyle::SetPStyle(const NSCSS::CCompiledStyle& oStyle, CXmlElement& oXmlElement, bool bIsLite)
+	void CDocumentStyle::SetPStyle   (const NSCSS::CCompiledStyle& oStyle, CXmlElement& oXmlElement, bool bIsLite)
 	{
-		bool bResult{false};
-
 		if (!bIsLite)
-			bResult = ConvertStyle(oStyle, oXmlElement, true);
+			ConvertStyle(oStyle, oXmlElement, true);
 
 		if (oStyle.Empty())
-			return bResult;
+			return;
 
 		const bool bInTable{oStyle.HaveThisParent(L"table")};
 
@@ -352,14 +341,14 @@ namespace NSCSS
 		sSpacingValue.reserve(128);
 
 		if (!oStyle.m_oMargin.GetTop().Empty() && !oStyle.m_oMargin.GetTop().Zero())
-			sSpacingValue += L"w:before=\""  + std::to_wstring(VALUE_TO_INT(oStyle.m_oMargin.GetTop(), NSCSS::Twips))    + L"\" w:beforeAutospacing=\"1\"";
+			sSpacingValue += L"w:before=\""  + std::to_wstring(VALUE_TO_INT(oStyle.m_oMargin.GetTop(), NSCSS::Twips))    + L"\" w:beforeAutospacing=\"0\"";
 		else if (oStyle.m_oMargin.GetBottom().Zero() || bInTable)
-			sSpacingValue += L"w:before=\"0\" w:beforeAutospacing=\"1\"";
+			sSpacingValue += L"w:before=\"0\" w:beforeAutospacing=\"0\"";
 
 		if (!oStyle.m_oMargin.GetBottom().Empty() && !oStyle.m_oMargin.GetBottom().Zero())
-			sSpacingValue += L" w:after=\""   + std::to_wstring(VALUE_TO_INT(oStyle.m_oMargin.GetBottom(), NSCSS::Twips)) + L"\" w:afterAutospacing=\"1\"";
+			sSpacingValue += L" w:after=\""   + std::to_wstring(VALUE_TO_INT(oStyle.m_oMargin.GetBottom(), NSCSS::Twips)) + L"\" w:afterAutospacing=\"0\"";
 		else if (oStyle.m_oMargin.GetBottom().Zero() || bInTable)
-			sSpacingValue += L" w:after=\"0\" w:afterAutospacing=\"1\"";
+			sSpacingValue += L" w:after=\"0\" w:afterAutospacing=\"0\"";
 
 		if (!oStyle.m_oFont.GetLineHeight().Empty() && !oStyle.m_oFont.GetLineHeight().Zero())
 		{
@@ -401,8 +390,6 @@ namespace NSCSS
 					SetBorderStyle(oStyle, oXmlElement, PProperties::P_LeftBorder);
 			}
 		}
-
-		return bResult || !oXmlElement.Empty();
 	}
 
 	void CDocumentStyle::SetBorderStyle(const CCompiledStyle &oStyle, CXmlElement &oXmlElement, const PProperties &enBorderProperty)
@@ -486,15 +473,13 @@ namespace NSCSS
 		return  L"w:val=\"" + wsStyle + L"\" w:sz=\"" + std::to_wstring(nWidth) + + L"\" w:space=\"" + std::to_wstring(nSpace) + L"\" w:color=\"" + wsColor + L"\"";
 	}
 
-	bool CDocumentStyle::SetRStyle(const NSCSS::CCompiledStyle& oStyle, CXmlElement& oXmlElement, bool bIsLite)
+	void CDocumentStyle::SetRStyle(const NSCSS::CCompiledStyle& oStyle, CXmlElement& oXmlElement, bool bIsLite)
 	{
-		bool bResult{false};
-
 		if (!bIsLite)
-			bResult = ConvertStyle(oStyle, oXmlElement, false);
+			ConvertStyle(oStyle, oXmlElement, false);
 
 		if (oStyle.Empty() && oXmlElement.Empty())
-			return bResult;
+			return;
 
 		if (!oStyle.m_oFont.GetSize().Empty())
 			oXmlElement.AddPropertiesInR(RProperties::R_Sz, std::to_wstring(static_cast<int>(oStyle.m_oFont.GetSize().ToDouble(NSCSS::Point) * 2. * oStyle.m_oTransform.GetMatrix().GetFinalValue().sy() + 0.5))); // Значения шрифта увеличивает на 2
@@ -524,25 +509,10 @@ namespace NSCSS
 		else if (L"serif" == wsFontFamily)
 			wsFontFamily = L"Times New Roman";
 
-		if (oStyle.m_oDisplay.GetDisplay() == L"none")
-			oXmlElement.AddPropertiesInR(RProperties::R_Vanish, L"true");
-
 		oXmlElement.AddPropertiesInR(RProperties::R_RFonts, oStyle.m_oFont.GetFamily().ToWString());
 		oXmlElement.AddPropertiesInR(RProperties::R_I, oStyle.m_oFont.GetStyle().ToWString());
 		oXmlElement.AddPropertiesInR(RProperties::R_B, oStyle.m_oFont.GetWeight().ToWString());
 		oXmlElement.AddPropertiesInR(RProperties::R_SmallCaps, oStyle.m_oFont.GetVariant().ToWString());
-
-		if (oStyle.m_oText.LineThrough())
-		{
-			if (L"double" == oStyle.m_oText.GetDecoration().m_oStyle.ToWString())
-				oXmlElement.AddPropertiesInR(RProperties::R_Strike, L"dstrike");
-			else
-				oXmlElement.AddPropertiesInR(RProperties::R_Strike, L"strike");
-		}
-
-		oXmlElement.AddPropertiesInR(RProperties::R_VertAlign, oStyle.m_oDisplay.GetVAlign().ToWString());
-
-		return bResult || !oXmlElement.Empty();
 	}
 
 	bool CDocumentStyle::WriteRStyle(const NSCSS::CCompiledStyle& oStyle)
@@ -558,16 +528,16 @@ namespace NSCSS
 
 		if (oItem != m_arStyleUsed.end())
 		{
-			m_sId = (*oItem).GetId();
+			m_sId = (*oItem).getId();
 			return true;
 		}
 
 		CXmlElement oXmlElement;
+		SetRStyle(oStyle, oXmlElement);
 
-		if (!SetRStyle(oStyle, oXmlElement))
+		if (oXmlElement.Empty())
 			return false;
 
-		structStyle.SetFinalId(m_sId);
 		m_arStyleUsed.push_back(structStyle);
 		m_sStyle += oXmlElement.GetRStyle();
 
@@ -620,16 +590,16 @@ namespace NSCSS
 
 		if (oItem != m_arStyleUsed.end())
 		{
-			m_sId = (*oItem).GetId();
+			m_sId = (*oItem).getId();
 			return true;
 		}
 
 		CXmlElement oXmlElement;
+		SetPStyle(oStyle, oXmlElement);
 
-		if (!SetPStyle(oStyle, oXmlElement))
+		if (oXmlElement.Empty())
 			return false;
 
-		structStyle.SetFinalId(m_sId);
 		m_arStyleUsed.push_back(structStyle);
 		m_sStyle += oXmlElement.GetPStyle();
 

Common/3dParty/html/css/src/xhtml/CDocumentStyle.h

@@ -12,19 +12,16 @@ namespace NSCSS
 	{
 		CCompiledStyle m_oStyle;
 		bool m_bIsPStyle;
-		std::wstring m_wsFinalId;
 
 	public:
 		CStyleUsed(const CCompiledStyle& oStyle, bool bIsPStyle);
 
-		void SetFinalId(const std::wstring& wsFinalId);
-
 		bool operator==(const CStyleUsed& oUsedStyle) const;
 
-		std::wstring GetId() const;
+		std::wstring getId();
 	};
 
-	static const std::vector<std::wstring> Names_Standard_Styles = {L"a", L"a-c", L"li", L"h1", L"h2", L"h3", L"h4", L"h5", L"h6", L"h1-c", L"h2-c", L"h3-c", L"h4-c", L"h5-c", L"h6-c"};
+	static const std::vector<std::wstring> Names_Standard_Styles = {L"a", L"li", L"h1", L"h2", L"h3", L"h4", L"h5", L"h6",L"p", L"div"};
 
 	class CSSCALCULATOR_EXPORT CDocumentStyle
 	{
@@ -39,12 +36,12 @@ namespace NSCSS
 		std::wstring m_sStyle;
 		std::wstring m_sId;
 
-		bool CombineStandardStyles(const std::vector<std::wstring>& arStandartedStyles, CXmlElement& oElement);
-		bool CreateStandardStyle  (const std::wstring& sNameStyle, CXmlElement& oElement);
-		bool ConvertStyle         (const NSCSS::CCompiledStyle& oStyle, CXmlElement& oElement, bool bIsPStyle);
+		void CombineStandardStyles(const std::vector<std::wstring>& arStandartedStyles, CXmlElement& oElement);
+		void CreateStandardStyle  (const std::wstring& sNameStyle, CXmlElement& oElement);
+		void ConvertStyle         (const NSCSS::CCompiledStyle& oStyle, CXmlElement& oElement, bool bIsPStyle);
 
-		bool SetRStyle(const NSCSS::CCompiledStyle& oStyle, CXmlElement& oXmlElement, bool bIsLite = false);
-		bool SetPStyle(const NSCSS::CCompiledStyle& oStyle, CXmlElement& oXmlElement, bool bIsLite = false);
+		void SetRStyle(const NSCSS::CCompiledStyle& oStyle, CXmlElement& oXmlElement, bool bIsLite = false);
+		void SetPStyle(const NSCSS::CCompiledStyle& oStyle, CXmlElement& oXmlElement, bool bIsLite = false);
 
 		void SetBorderStyle(const NSCSS::CCompiledStyle& oStyle, CXmlElement& oXmlElement, const PProperties& enBorderProperty);
 	public:

Common/3dParty/html/css/src/xhtml/CXmlElement.cpp

@@ -5,6 +5,7 @@
 #include <cwctype>
 #include <functional>
 
+#include <iostream>
 #include "../ConstValues.h"
 
 #define DEFAULTFONTNAME L"Times New Roman"
@@ -66,7 +67,7 @@ void CXmlElement::CreateDefaultElement(const std::wstring& sNameDefaultElement)
 		AddBasicProperties(CSSProperties::BasicProperties::B_Link, L"h1-c");
 
 		AddPropertiesInP(CSSProperties::ParagraphProperties::P_OutlineLvl, L"0");
-		AddPropertiesInP(CSSProperties::ParagraphProperties::P_Spacing, L"w:before=\"100\" w:beforeAutospacing=\"1\" w:after=\"100\" w:afterAutospacing=\"1\"");
+//		AddPropertiesInP(CSSProperties::ParagraphProperties::P_Spacing, L"w:before=\"100\" w:beforeAutospacing=\"1\" w:after=\"100\" w:afterAutospacing=\"1\"");
 	}
 	else if (sNameDefaultElement == L"h2")
 	{
@@ -77,7 +78,7 @@ void CXmlElement::CreateDefaultElement(const std::wstring& sNameDefaultElement)
 		AddBasicProperties(CSSProperties::BasicProperties::B_Link, L"h2-c");
 
 		AddPropertiesInP(CSSProperties::ParagraphProperties::P_OutlineLvl, L"1");
-		AddPropertiesInP(CSSProperties::ParagraphProperties::P_Spacing, L"w:before=\"100\" w:beforeAutospacing=\"1\" w:after=\"100\" w:afterAutospacing=\"1\"");
+//		AddPropertiesInP(CSSProperties::ParagraphProperties::P_Spacing, L"w:before=\"100\" w:beforeAutospacing=\"1\" w:after=\"100\" w:afterAutospacing=\"1\"");
 	}
 	else if (sNameDefaultElement == L"h3")
 	{
@@ -88,7 +89,7 @@ void CXmlElement::CreateDefaultElement(const std::wstring& sNameDefaultElement)
 		AddBasicProperties(CSSProperties::BasicProperties::B_Link, L"h3-c");
 
 		AddPropertiesInP(CSSProperties::ParagraphProperties::P_OutlineLvl, L"2");
-		AddPropertiesInP(CSSProperties::ParagraphProperties::P_Spacing, L"w:before=\"100\" w:beforeAutospacing=\"1\" w:after=\"100\" w:afterAutospacing=\"1\"");
+//		AddPropertiesInP(CSSProperties::ParagraphProperties::P_Spacing, L"w:before=\"100\" w:beforeAutospacing=\"1\" w:after=\"100\" w:afterAutospacing=\"1\"");
 	}
 	else if (sNameDefaultElement == L"h4")
 	{
@@ -99,7 +100,7 @@ void CXmlElement::CreateDefaultElement(const std::wstring& sNameDefaultElement)
 		AddBasicProperties(CSSProperties::BasicProperties::B_Link, L"h4-c");
 
 		AddPropertiesInP(CSSProperties::ParagraphProperties::P_OutlineLvl, L"3");
-		AddPropertiesInP(CSSProperties::ParagraphProperties::P_Spacing, L"w:before=\"100\" w:beforeAutospacing=\"1\" w:after=\"100\" w:afterAutospacing=\"1\"");
+//		AddPropertiesInP(CSSProperties::ParagraphProperties::P_Spacing, L"w:before=\"100\" w:beforeAutospacing=\"1\" w:after=\"100\" w:afterAutospacing=\"1\"");
 	}
 	else if (sNameDefaultElement == L"h5")
 	{
@@ -110,7 +111,7 @@ void CXmlElement::CreateDefaultElement(const std::wstring& sNameDefaultElement)
 		AddBasicProperties(CSSProperties::BasicProperties::B_Link, L"h5-c");
 
 		AddPropertiesInP(CSSProperties::ParagraphProperties::P_OutlineLvl, L"4");
-		AddPropertiesInP(CSSProperties::ParagraphProperties::P_Spacing, L"w:before=\"100\" w:beforeAutospacing=\"1\" w:after=\"100\" w:afterAutospacing=\"1\"");
+//		AddPropertiesInP(CSSProperties::ParagraphProperties::P_Spacing, L"w:before=\"100\" w:beforeAutospacing=\"1\" w:after=\"100\" w:afterAutospacing=\"1\"");
 
 	}
 	else if (sNameDefaultElement == L"h6")
@@ -122,13 +123,13 @@ void CXmlElement::CreateDefaultElement(const std::wstring& sNameDefaultElement)
 		AddBasicProperties(CSSProperties::BasicProperties::B_Link, L"h6-c");
 
 		AddPropertiesInP(CSSProperties::ParagraphProperties::P_OutlineLvl, L"5");
-		AddPropertiesInP(CSSProperties::ParagraphProperties::P_Spacing, L"w:before=\"100\" w:beforeAutospacing=\"1\" w:after=\"100\" w:afterAutospacing=\"1\"");
+//		AddPropertiesInP(CSSProperties::ParagraphProperties::P_Spacing, L"w:before=\"100\" w:beforeAutospacing=\"1\" w:after=\"100\" w:afterAutospacing=\"1\"");
 	}
 	else if (sNameDefaultElement == L"h1-c")
 	{
 		AddBasicProperties(CSSProperties::BasicProperties::B_Type, L"character");
 		AddBasicProperties(CSSProperties::BasicProperties::B_StyleId, L"h1-c");
-		AddBasicProperties(CSSProperties::BasicProperties::B_Name, L"Heading 1 Sign");
+		AddBasicProperties(CSSProperties::BasicProperties::B_Name, L"Title 1 Sign");
 		AddBasicProperties(CSSProperties::BasicProperties::B_CustomStyle, L"1");
 		AddBasicProperties(CSSProperties::BasicProperties::B_UiPriority, L"9");
 		AddBasicProperties(CSSProperties::BasicProperties::B_Link, L"h1");
@@ -141,7 +142,7 @@ void CXmlElement::CreateDefaultElement(const std::wstring& sNameDefaultElement)
 	{
 		AddBasicProperties(CSSProperties::BasicProperties::B_Type, L"character");
 		AddBasicProperties(CSSProperties::BasicProperties::B_StyleId, L"h2-c");
-		AddBasicProperties(CSSProperties::BasicProperties::B_Name, L"Heading 2 Sign");
+		AddBasicProperties(CSSProperties::BasicProperties::B_Name, L"Title 2 Sign");
 		AddBasicProperties(CSSProperties::BasicProperties::B_CustomStyle, L"1");
 		AddBasicProperties(CSSProperties::BasicProperties::B_UiPriority, L"9");
 		AddBasicProperties(CSSProperties::BasicProperties::B_UnhideWhenUsed, L"true");
@@ -154,7 +155,7 @@ void CXmlElement::CreateDefaultElement(const std::wstring& sNameDefaultElement)
 	{
 		AddBasicProperties(CSSProperties::BasicProperties::B_Type, L"character");
 		AddBasicProperties(CSSProperties::BasicProperties::B_StyleId, L"h3-c");
-		AddBasicProperties(CSSProperties::BasicProperties::B_Name, L"Heading 3 Sign");
+		AddBasicProperties(CSSProperties::BasicProperties::B_Name, L"Title 3 Sign");
 		AddBasicProperties(CSSProperties::BasicProperties::B_CustomStyle, L"1");
 		AddBasicProperties(CSSProperties::BasicProperties::B_UiPriority, L"9");
 		AddBasicProperties(CSSProperties::BasicProperties::B_UnhideWhenUsed, L"true");
@@ -167,7 +168,7 @@ void CXmlElement::CreateDefaultElement(const std::wstring& sNameDefaultElement)
 	{
 		AddBasicProperties(CSSProperties::BasicProperties::B_Type, L"character");
 		AddBasicProperties(CSSProperties::BasicProperties::B_StyleId, L"h4-c");
-		AddBasicProperties(CSSProperties::BasicProperties::B_Name, L"Heading 4 Sign");
+		AddBasicProperties(CSSProperties::BasicProperties::B_Name, L"Title 4 Sign");
 		AddBasicProperties(CSSProperties::BasicProperties::B_CustomStyle, L"1");
 		AddBasicProperties(CSSProperties::BasicProperties::B_UiPriority, L"9");
 		AddBasicProperties(CSSProperties::BasicProperties::B_UnhideWhenUsed, L"true");
@@ -180,7 +181,7 @@ void CXmlElement::CreateDefaultElement(const std::wstring& sNameDefaultElement)
 	{
 		AddBasicProperties(CSSProperties::BasicProperties::B_Type, L"character");
 		AddBasicProperties(CSSProperties::BasicProperties::B_StyleId, L"h5-c");
-		AddBasicProperties(CSSProperties::BasicProperties::B_Name, L"Heading 5 Sign");
+		AddBasicProperties(CSSProperties::BasicProperties::B_Name, L"Title 5 Sign");
 		AddBasicProperties(CSSProperties::BasicProperties::B_CustomStyle, L"1");
 		AddBasicProperties(CSSProperties::BasicProperties::B_UiPriority, L"9");
 		AddBasicProperties(CSSProperties::BasicProperties::B_UnhideWhenUsed, L"true");
@@ -193,7 +194,7 @@ void CXmlElement::CreateDefaultElement(const std::wstring& sNameDefaultElement)
 	{
 		AddBasicProperties(CSSProperties::BasicProperties::B_Type, L"character");
 		AddBasicProperties(CSSProperties::BasicProperties::B_StyleId, L"h6-c");
-		AddBasicProperties(CSSProperties::BasicProperties::B_Name, L"Heading 6 Sign");
+		AddBasicProperties(CSSProperties::BasicProperties::B_Name, L"Title 6 Sign");
 		AddBasicProperties(CSSProperties::BasicProperties::B_CustomStyle, L"1");
 		AddBasicProperties(CSSProperties::BasicProperties::B_UiPriority, L"9");
 		AddBasicProperties(CSSProperties::BasicProperties::B_UnhideWhenUsed, L"true");
@@ -472,25 +473,6 @@ std::wstring CXmlElement::ConvertRStyle(bool bIsLite) const
 				sRStyle += L"<w:kern w:val=\"" + oItem.second + L"\"/>";
 				break;
 			}
-			case CSSProperties::RunnerProperties::R_Vanish:
-			{
-				if (oItem.second == L"true")
-					sRStyle += L"<w:vanish/>";
-				break;
-			}
-			case CSSProperties::RunnerProperties::R_Strike:
-			{
-				sRStyle += L"<w:" + oItem.second + L"/>";
-				break;
-			}
-			case CSSProperties::RunnerProperties::R_VertAlign:
-			{
-				if (L"top" == oItem.second)
-					sRStyle += L"<w:vertAlign w:val=\"superscript\"/>";
-				else if (L"bottom" == oItem.second)
-					sRStyle += L"<w:vertAlign w:val=\"subscript\"/>";
-				break;
-			}
 			default:
 				break;
 		}

Common/3dParty/html/gumbo.pri

@@ -7,5 +7,4 @@ core_windows:INCLUDEPATH += $$PWD/gumbo-parser/visualc/include
 HEADERS += $$files($$PWD/gumbo-parser/src/*.h, true) \
            $$PWD/htmltoxhtml.h
 
-SOURCES += $$files($$PWD/gumbo-parser/src/*.c, true) \
-           $$PWD/htmltoxhtml.cpp
+SOURCES += $$files($$PWD/gumbo-parser/src/*.c, true)

Common/3dParty/html/htmltoxhtml.cpp

@@ -1,657 +0,0 @@
-#include "htmltoxhtml.h"
-
-#include <map>
-#include <cctype>
-#include <vector>
-#include <algorithm>
-
-#include "gumbo-parser/src/gumbo.h"
-#include "../../../DesktopEditor/common/File.h"
-#include "../../../DesktopEditor/common/Directory.h"
-#include "../../../DesktopEditor/common/StringBuilder.h"
-#include "../../../UnicodeConverter/UnicodeConverter.h"
-#include "../../../HtmlFile2/src/StringFinder.h"
-
-namespace HTML
-{
-#if defined(CreateDirectory)
-#undef CreateDirectory
-#endif
-
-static std::string nonbreaking_inline  = "|a|abbr|acronym|b|bdo|big|cite|code|dfn|em|font|i|img|kbd|nobr|s|small|span|strike|strong|sub|sup|tt|";
-static std::string empty_tags          = "|area|base|basefont|bgsound|br|command|col|embed|event-source|frame|hr|image|img|input|keygen|link|menuitem|meta|param|source|spacer|track|wbr|";
-static std::string preserve_whitespace = "|pre|textarea|script|style|";
-static std::string special_handling    = "|html|body|";
-static std::string treat_like_inline   = "|p|";
-
-static std::vector<std::string> html_tags = {"div","span","a","img","p","h1","h2","h3","h4","h5","h6",
-                                             "ul", "ol", "li","td","tr","table","thead","tbody","tfoot","th",
-                                             "br","form","input","button","section","nav","header","footer",
-                                             "main","figure","figcaption","strong","em","i", "b", "u","pre",
-                                             "code","blockquote","hr","script","link","meta","style","title",
-                                             "head","body","html","legend","optgroup","option","select","dl",
-                                             "dt","dd","time","data","abbr","address","area","base","bdi",
-                                             "bdo","cite","col","iframe","video","source","track","textarea",
-                                             "label","fieldset","colgroup","del","ins","details","summary",
-                                             "dialog","embed","kbd","map","mark","menu","meter","object",
-                                             "output","param","progress","q","samp","small","sub","sup","var",
-                                             "wbr","acronym","applet","article","aside","audio","basefont",
-                                             "bgsound","big","blink","canvas","caption","center","command",
-                                             "comment","datalist","dfn","dir","font","frame","frameset",
-                                             "hgroup","isindex","keygen","marquee","nobr","noembed","noframes",
-                                             "noscript","plaintext","rp","rt","ruby","s","strike","tt","xmp"};
-
-static std::vector<std::string> unchecked_nodes_new = {"svg"};
-
-static void replace_all(std::string& s, const std::string& s1, const std::string& s2)
-{
-	size_t pos = s.find(s1);
-	while(pos != std::string::npos)
-	{
-		s.replace(pos, s1.length(), s2);
-		pos = s.find(s1, pos + s2.length());
-	}
-}
-
-static bool NodeIsUnprocessed(const std::string& sTagName)
-{
-	return "xml" == sTagName;
-}
-
-static bool IsUnckeckedNodes(const std::string& sValue)
-{
-	return unchecked_nodes_new.end() != std::find(unchecked_nodes_new.begin(), unchecked_nodes_new.end(), sValue);
-}
-
-static std::string Base64ToString(const std::string& sContent, const std::string& sCharset)
-{
-	std::string sRes;
-	int nSrcLen = (int)sContent.length();
-	int nDecodeLen = NSBase64::Base64DecodeGetRequiredLength(nSrcLen);
-	BYTE* pData = new BYTE[nDecodeLen];
-	if (TRUE == NSBase64::Base64Decode(sContent.c_str(), nSrcLen, pData, &nDecodeLen))
-	{
-		std::wstring sConvert;
-		if(!sCharset.empty() && NSStringFinder::Equals<std::string>("utf-8", sCharset))
-		{
-			NSUnicodeConverter::CUnicodeConverter oConverter;
-			sConvert = oConverter.toUnicode(reinterpret_cast<char *>(pData), (unsigned)nDecodeLen, sCharset.data());
-		}
-		sRes = sConvert.empty() ? std::string(reinterpret_cast<char *>(pData), nDecodeLen) : U_TO_UTF8(sConvert);
-	}
-	RELEASEARRAYOBJECTS(pData);
-	return sRes;
-}
-
-static std::string QuotedPrintableDecode(const std::string& sContent, std::string& sCharset)
-{
-	NSStringUtils::CStringBuilderA sRes;
-	size_t ip = 0;
-	size_t i  = sContent.find('=');
-
-	if(i == 0)
-	{
-		size_t nIgnore = 12;
-		std::string charset = sContent.substr(0, nIgnore);
-		if(charset == "=00=00=FE=FF")
-			sCharset = "UTF-32BE";
-		else if(charset == "=FF=FE=00=00")
-			sCharset = "UTF-32LE";
-		else if(charset == "=2B=2F=76=38" || charset == "=2B=2F=76=39" ||
-				charset == "=2B=2F=76=2B" || charset == "=2B=2F=76=2F")
-			sCharset = "UTF-7";
-		else if(charset == "=DD=73=66=73")
-			sCharset = "UTF-EBCDIC";
-		else if(charset == "=84=31=95=33")
-			sCharset = "GB-18030";
-		else
-		{
-			nIgnore -= 3;
-			charset.erase(nIgnore);
-			if(charset == "=EF=BB=BF")
-				sCharset = "UTF-8";
-			else if(charset == "=F7=64=4C")
-				sCharset = "UTF-1";
-			else if(charset == "=0E=FE=FF")
-				sCharset = "SCSU";
-			else if(charset == "=FB=EE=28")
-				sCharset = "BOCU-1";
-			else
-			{
-				nIgnore -= 3;
-				charset.erase(nIgnore);
-				if(charset == "=FE=FF")
-					sCharset = "UTF-16BE";
-				else if(charset == "=FF=FE")
-					sCharset = "UTF-16LE";
-				else
-					nIgnore -= 6;
-			}
-		}
-
-		ip = nIgnore;
-		i  = sContent.find('=', ip);
-	}
-
-	while(i != std::string::npos && i + 2 < sContent.length())
-	{
-		sRes.WriteString(sContent.c_str() + ip, i - ip);
-		std::string str = sContent.substr(i + 1, 2);
-		if(str.front() == '\n' || str.front() == '\r')
-		{
-			char ch = str[1];
-			if(ch != '\n' && ch != '\r')
-				sRes.WriteString(&ch, 1);
-		}
-		else
-		{
-			char* err;
-			char ch = (int)strtol(str.data(), &err, 16);
-			if(*err)
-				sRes.WriteString('=' + str);
-			else
-				sRes.WriteString(&ch, 1);
-		}
-		ip = i + 3;
-		i = sContent.find('=', ip);
-	}
-	if(ip != std::string::npos)
-		sRes.WriteString(sContent.c_str() + ip);
-	return sRes.GetData();
-}
-
-static std::string mhtTohtml(const std::string& sFileContent);
-
-static void ReadMht(const std::string& sMhtContent, std::map<std::string, std::string>& sRes, NSStringUtils::CStringBuilderA& oRes)
-{
-	size_t unContentPosition = 0, unCharsetBegin = 0, unCharsetEnd = std::string::npos;
-
-	NSStringFinder::TFoundedData<char> oData;
-
-	// Content-Type
-	oData =  NSStringFinder::FindProperty(sMhtContent, "content-type", {":"}, {";", "\\n", "\\r"});
-	const std::string sContentType{oData.m_sValue};
-
-	if (sContentType.empty())
-		return;
-
-	if (NSStringFinder::Equals(sContentType, "multipart/alternative"))
-	{
-		oRes.WriteString(mhtTohtml(sMhtContent.substr(oData.m_unEndPosition, sMhtContent.length() - oData.m_unEndPosition)));
-		return;
-	}
-
-	unContentPosition = std::max(unContentPosition, oData.m_unEndPosition);
-	unCharsetBegin = oData.m_unEndPosition;
-
-	// name
-//	std::string sName = NSStringFinder::FindProperty(sMhtContent, "name", {"="}, {";", "\\n", "\\r"}, 0, unLastPosition);
-//	unContentPosition = std::max(unContentPosition, unLastPosition);
-
-	// Content-Location
-	oData = NSStringFinder::FindProperty(sMhtContent, "content-location", {":"}, {";", "\\n", "\\r"});
-	std::string sContentLocation{oData.m_sValue};
-
-	if (!oData.Empty())
-		unContentPosition = std::max(unContentPosition, oData.m_unEndPosition);
-
-	// Content-ID
-	oData = NSStringFinder::FindProperty(sMhtContent, "content-id", {":"}, {";", "\\n", "\\r"});
-	std::string sContentID{oData.m_sValue};
-
-	if (!oData.Empty())
-	{
-		unContentPosition = std::max(unContentPosition, oData.m_unEndPosition);
-		unCharsetEnd = std::min(unCharsetEnd, oData.m_unBeginPosition);
-		NSStringFinder::CutInside<std::string>(sContentID, "<", ">");
-	}
-
-	if (sContentLocation.empty() && !sContentID.empty())
-		sContentLocation = "cid:" + sContentID;
-
-	// Content-Transfer-Encoding
-	oData = NSStringFinder::FindProperty(sMhtContent, "content-transfer-encoding", {":"}, {";", "\\n", "\\r"});
-	const std::string sContentEncoding{oData.m_sValue};
-
-	if (!oData.Empty())
-	{
-		unContentPosition = std::max(unContentPosition, oData.m_unEndPosition);
-		unCharsetEnd = std::min(unCharsetEnd, oData.m_unBeginPosition);
-	}
-
-	// charset
-	std::string sCharset = "utf-8";
-
-	if (std::string::npos != unCharsetEnd && unCharsetBegin < unCharsetEnd)
-	{
-		sCharset = NSStringFinder::FindProperty(sMhtContent.substr(unCharsetBegin, unCharsetEnd - unCharsetBegin), "charset", {"="}, {";", "\\n", "\\r"}).m_sValue;
-		NSStringFinder::CutInside<std::string>(sCharset, "\"");
-	}
-
-	// Content
-	std::string sContent = sMhtContent.substr(unContentPosition, sMhtContent.length() - unContentPosition);
-
-//	std::wstring sExtention = NSFile::GetFileExtention(UTF8_TO_U(sName));
-//	std::transform(sExtention.begin(), sExtention.end(), sExtention.begin(), tolower);
-	// Основной документ
-	if (NSStringFinder::Equals(sContentType, "multipart/alternative"))
-		oRes.WriteString(mhtTohtml(sContent));
-	else if ((NSStringFinder::Find(sContentType, "text") /*&& (sExtention.empty() || NSStringFinder::EqualOf(sExtention, {L"htm", L"html", L"xhtml", L"css"}))*/)
-	          || (NSStringFinder::Equals(sContentType, "application/octet-stream") && NSStringFinder::Find(sContentLocation, "css")))
-	{
-		// Стили заключаются в тэг <style>
-		const bool bAddTagStyle = NSStringFinder::Equals(sContentType, "text/css") /*|| NSStringFinder::Equals(sExtention, L"css")*/ || NSStringFinder::Find(sContentLocation, "css");
-
-		if (bAddTagStyle)
-			oRes.WriteString("<style>");
-
-		if (NSStringFinder::Equals(sContentEncoding, "base64"))
-			sContent = Base64ToString(sContent, sCharset);
-		else if (NSStringFinder::EqualOf(sContentEncoding, {"8bit", "7bit"}) || sContentEncoding.empty())
-		{
-			if (!NSStringFinder::Equals(sCharset, "utf-8") && !sCharset.empty())
-			{
-				NSUnicodeConverter::CUnicodeConverter oConverter;
-				sContent = U_TO_UTF8(oConverter.toUnicode(sContent, sCharset.data()));
-			}
-		}
-		else if (NSStringFinder::Equals(sContentEncoding, "quoted-printable"))
-		{
-			sContent = QuotedPrintableDecode(sContent, sCharset);
-			if (!NSStringFinder::Equals(sCharset, "utf-8") && !sCharset.empty())
-			{
-				NSUnicodeConverter::CUnicodeConverter oConverter;
-				sContent = U_TO_UTF8(oConverter.toUnicode(sContent, sCharset.data()));
-			}
-		}
-
-		if (NSStringFinder::Equals(sContentType, "text/html"))
-			sContent = U_TO_UTF8(htmlToXhtml(sContent, false));
-
-		oRes.WriteString(sContent);
-
-		if(bAddTagStyle)
-			oRes.WriteString("</style>");
-	}
-	// Картинки
-	else if ((NSStringFinder::Find(sContentType, "image") /*|| NSStringFinder::Equals(sExtention, L"gif")*/ || NSStringFinder::Equals(sContentType, "application/octet-stream")) &&
-			  NSStringFinder::Equals(sContentEncoding, "base64"))
-	{
-//		if (NSStringFinder::Equals(sExtention, L"ico") || NSStringFinder::Find(sContentType, "ico"))
-//			sContentType = "image/jpg";
-//		else if(NSStringFinder::Equals(sExtention, L"gif"))
-//			sContentType = "image/gif";
-		int nSrcLen = (int)sContent.length();
-		int nDecodeLen = NSBase64::Base64DecodeGetRequiredLength(nSrcLen);
-		BYTE* pData = new BYTE[nDecodeLen];
-		if (TRUE == NSBase64::Base64Decode(sContent.c_str(), nSrcLen, pData, &nDecodeLen))
-			sRes.insert(std::make_pair(sContentLocation, "data:" + sContentType + ";base64," + sContent));
-		RELEASEARRAYOBJECTS(pData);
-	}
-}
-
-static std::string mhtTohtml(const std::string& sFileContent)
-{
-	std::map<std::string, std::string> sRes;
-	NSStringUtils::CStringBuilderA oRes;
-
-	// Поиск boundary
-	NSStringFinder::TFoundedData<char> oData{NSStringFinder::FindProperty(sFileContent, "boundary", {"="}, {"\\r", "\\n", "\""})};
-
-	size_t nFound{oData.m_unEndPosition};
-	std::string sBoundary{oData.m_sValue};
-
-	if (sBoundary.empty())
-	{
-		size_t nFoundEnd = sFileContent.length();
-		nFound = 0;
-		ReadMht(sFileContent.substr(nFound, nFoundEnd), sRes, oRes);
-		return oRes.GetData();
-	}
-
-	NSStringFinder::CutInside<std::string>(sBoundary, "\"");
-
-	size_t nFoundEnd{nFound};
-
-	sBoundary = "--" + sBoundary;
-	size_t nBoundaryLength = sBoundary.length();
-
-	nFound = sFileContent.find(sBoundary, nFound) + nBoundaryLength;
-
-	// Цикл по boundary
-	while(nFound != std::string::npos)
-	{
-		nFoundEnd = sFileContent.find(sBoundary, nFound + nBoundaryLength);
-		if(nFoundEnd == std::string::npos)
-			break;
-
-		ReadMht(sFileContent.substr(nFound, nFoundEnd - nFound), sRes, oRes);
-
-		nFound = sFileContent.find(sBoundary, nFoundEnd);
-	}
-
-	std::string sFile = oRes.GetData();
-	for(const std::pair<std::string, std::string>& item : sRes)
-	{
-		std::string sName = item.first;
-		size_t found = sFile.find(sName);
-		size_t sfound = sName.rfind('/');
-		if(found == std::string::npos && sfound != std::string::npos)
-			found = sFile.find(sName.erase(0, sfound + 1));
-		while(found != std::string::npos)
-		{
-			size_t fq = sFile.find_last_of("\"\'>=", found);
-
-			if (std::string::npos == fq)
-				break;
-
-			char ch = sFile[fq];
-			if(ch != '\"' && ch != '\'')
-				fq++;
-			size_t tq = sFile.find_first_of("\"\'<> ", found) + 1;
-
-			if (std::string::npos == tq)
-				break;
-
-			if(sFile[tq] != '\"' && sFile[tq] != '\'')
-				tq--;
-			if(ch != '>')
-			{
-				std::string is = '\"' + item.second + '\"';
-				sFile.replace(fq, tq - fq, is);
-				found = sFile.find(sName, fq + is.length());
-			}
-			else
-				found = sFile.find(sName, tq);
-		}
-	}
-
-	return sFile;
-}
-
-// Заменяет сущности &,<,> в text
-static void substitute_xml_entities_into_text(std::string& text)
-{
-	// replacing & must come first
-	replace_all(text, "&", "&amp;");
-	replace_all(text, "<", "&lt;");
-	replace_all(text, ">", "&gt;");
-}
-
-// After running through Gumbo, the values of type "&#1;" are replaced with the corresponding code '0x01'
-// Since the attribute value does not use control characters (value <= 0x09),
-// then just delete them, otherwise XmlUtils::CXmlLiteReader crashes on them.
-// bug#73486
-static void remove_control_symbols(std::string& text)
-{
-	std::string::iterator itFound = std::find_if(text.begin(), text.end(), [](unsigned char chValue){ return chValue <= 0x09; });
-
-	while (itFound != text.end())
-	{
-		itFound = text.erase(itFound);
-		itFound = std::find_if(itFound, text.end(), [](unsigned char chValue){ return chValue <= 0x09; });
-	}
-}
-
-// Заменяет сущности " в text
-static void substitute_xml_entities_into_attributes(std::string& text)
-{
-	remove_control_symbols(text);
-	substitute_xml_entities_into_text(text);
-	replace_all(text, "\"", "&quot;");
-}
-
-static std::string handle_unknown_tag(GumboStringPiece* text)
-{
-	if (text->data == NULL)
-		return "";
-	GumboStringPiece gsp = *text;
-	gumbo_tag_from_original_text(&gsp);
-	std::string sAtr = std::string(gsp.data, gsp.length);
-	size_t found = sAtr.find_first_of("-'+,./=?;!*#@$_%<>&;\"\'()[]{}");
-	while(found != std::string::npos)
-	{
-		sAtr.erase(found, 1);
-		found = sAtr.find_first_of("-'+,./=?;!*#@$_%<>&;\"\'()[]{}", found);
-	}
-	return sAtr;
-}
-
-static std::string get_tag_name(GumboNode* node)
-{
-	std::string tagname = (node->type == GUMBO_NODE_DOCUMENT ? "document" : gumbo_normalized_tagname(node->v.element.tag));
-	if (tagname.empty())
-		tagname = handle_unknown_tag(&node->v.element.original_tag);
-	return tagname;
-}
-
-static void build_doctype(GumboNode* node, NSStringUtils::CStringBuilderA& oBuilder)
-{
-	if (node->v.document.has_doctype)
-	{
-		oBuilder.WriteString("<!DOCTYPE ");
-		oBuilder.WriteString(node->v.document.name);
-		std::string pi(node->v.document.public_identifier);
-		remove_control_symbols(pi);
-		if ((node->v.document.public_identifier != NULL) && !pi.empty())
-		{
-			oBuilder.WriteString(" PUBLIC \"");
-			oBuilder.WriteString(pi);
-			oBuilder.WriteString("\" \"");
-			oBuilder.WriteString(node->v.document.system_identifier);
-			oBuilder.WriteString("\"");
-		}
-		oBuilder.WriteString(">");
-	}
-}
-
-static void build_attributes(const GumboVector* attribs, NSStringUtils::CStringBuilderA& atts)
-{
-	std::vector<std::string> arrRepeat;
-	for (size_t i = 0; i < attribs->length; ++i)
-	{
-		GumboAttribute* at = static_cast<GumboAttribute*>(attribs->data[i]);
-		std::string sVal(at->value);
-		std::string sName(at->name);
-
-		remove_control_symbols(sVal);
-		remove_control_symbols(sName);
-
-		atts.WriteString(" ");
-
-		bool bCheck = false;
-		size_t nBad = sName.find_first_of("+,.=?#%<>&;\"\'()[]{}");
-		while(nBad != std::string::npos)
-		{
-			sName.erase(nBad, 1);
-			nBad = sName.find_first_of("+,.=?#%<>&;\"\'()[]{}", nBad);
-			if(sName.empty())
-				break;
-			bCheck = true;
-		}
-		if(sName.empty())
-			continue;
-		while(sName.front() >= '0' && sName.front() <= '9')
-		{
-			sName.erase(0, 1);
-			if(sName.empty())
-				break;
-			bCheck = true;
-		}
-		if(bCheck)
-		{
-			GumboAttribute* check = gumbo_get_attribute(attribs, sName.c_str());
-			if(check || std::find(arrRepeat.begin(), arrRepeat.end(), sName) != arrRepeat.end())
-				continue;
-			else
-				arrRepeat.push_back(sName);
-		}
-
-		if(sName.empty())
-			continue;
-		atts.WriteString(sName);
-
-		// determine original quote character used if it exists
-		std::string qs ="\"";
-		atts.WriteString("=");
-		atts.WriteString(qs);
-		substitute_xml_entities_into_attributes(sVal);
-		atts.WriteString(sVal);
-		atts.WriteString(qs);
-	}
-}
-
-static void prettyprint(GumboNode* node, NSStringUtils::CStringBuilderA& oBuilder, bool bCheckValidNode = true);
-
-static void prettyprint_contents(GumboNode* node, NSStringUtils::CStringBuilderA& contents, bool bCheckValidNode)
-{
-	std::string key             = "|" + get_tag_name(node) + "|";
-	bool keep_whitespace        = preserve_whitespace.find(key) != std::string::npos;
-	bool is_inline              = nonbreaking_inline.find(key) != std::string::npos;
-	bool is_like_inline         = treat_like_inline.find(key) != std::string::npos;
-
-	GumboVector* children = &node->v.element.children;
-
-	for (size_t i = 0; i < children->length; i++)
-	{
-		GumboNode* child = static_cast<GumboNode*> (children->data[i]);
-
-		if (child->type == GUMBO_NODE_TEXT)
-		{
-			std::string val(child->v.text.text);
-			remove_control_symbols(val);
-			substitute_xml_entities_into_text(val);
-
-			// Избавление от FF
-			size_t found = val.find_first_of("\014");
-			while(found != std::string::npos)
-			{
-				val.erase(found, 1);
-				found = val.find_first_of("\014", found);
-			}
-
-			contents.WriteString(val);
-		}
-		else if ((child->type == GUMBO_NODE_ELEMENT) || (child->type == GUMBO_NODE_TEMPLATE))
-			prettyprint(child, contents, bCheckValidNode);
-		else if (child->type == GUMBO_NODE_WHITESPACE)
-		{
-			if (keep_whitespace || is_inline || is_like_inline)
-				contents.WriteString(child->v.text.text);
-		}
-		else if (child->type != GUMBO_NODE_COMMENT)
-		{
-			// Сообщение об ошибке
-			// Does this actually exist: (child->type == GUMBO_NODE_CDATA)
-			// fprintf(stderr, "unknown element of type: %d\n", child->type);
-		}
-	}
-}
-
-static void prettyprint(GumboNode* node, NSStringUtils::CStringBuilderA& oBuilder, bool bCheckValidNode)
-{
-	// special case the document node
-	if (node->type == GUMBO_NODE_DOCUMENT)
-	{
-		build_doctype(node, oBuilder);
-		prettyprint_contents(node, oBuilder, bCheckValidNode);
-		return;
-	}
-
-	std::string tagname            = get_tag_name(node);
-	remove_control_symbols(tagname);
-
-	if (NodeIsUnprocessed(tagname))
-		return;
-
-	if (bCheckValidNode)
-		bCheckValidNode = !IsUnckeckedNodes(tagname);
-
-	if (bCheckValidNode && html_tags.end() == std::find(html_tags.begin(), html_tags.end(), tagname))
-	{
-		prettyprint_contents(node, oBuilder, bCheckValidNode);
-		return;
-	}
-
-	std::string close              = "";
-	std::string closeTag           = "";
-	std::string key                = "|" + tagname + "|";
-	bool is_empty_tag              = empty_tags.find(key) != std::string::npos;
-
-	// determine closing tag type
-	if (is_empty_tag)
-		close = "/";
-	else
-		closeTag = "</" + tagname + ">";
-
-	// build results
-	oBuilder.WriteString("<" + tagname);
-
-	// build attr string
-	const GumboVector* attribs = &node->v.element.attributes;
-	build_attributes(attribs, oBuilder);
-	oBuilder.WriteString(close + ">");
-
-	// prettyprint your contents
-	prettyprint_contents(node, oBuilder, bCheckValidNode);
-	oBuilder.WriteString(closeTag);
-}
-
-std::wstring htmlToXhtml(std::string& sFileContent, bool bNeedConvert)
-{
-	if (bNeedConvert)
-	{ // Определение кодировки
-		std::string sEncoding = NSStringFinder::FindProperty(sFileContent, "charset", {"="}, {";", "\\n", "\\r", " ", "\"", "'"}).m_sValue;
-
-		if (sEncoding.empty())
-			sEncoding = NSStringFinder::FindProperty(sFileContent, "encoding", {"="}, {";", "\\n", "\\r", " "}).m_sValue;
-
-		if (!sEncoding.empty() && !NSStringFinder::Equals("utf-8", sEncoding))
-		{
-			NSUnicodeConverter::CUnicodeConverter oConverter;
-			sFileContent = U_TO_UTF8(oConverter.toUnicode(sFileContent, sEncoding.c_str()));
-		}
-	}
-
-	// Избавляемся от лишних символов до <...
-	boost::regex oRegex("<[a-zA-Z]");
-	boost::match_results<typename std::string::const_iterator> oResult;
-
-	if (boost::regex_search(sFileContent, oResult, oRegex))
-		sFileContent.erase(0, oResult.position());
-
-	//Избавление от <a ... />
-	while (NSStringFinder::RemoveEmptyTag(sFileContent, "a"));
-	//Избавление от <title ... />
-	while (NSStringFinder::RemoveEmptyTag(sFileContent, "title"));
-	//Избавление от <script ... />
-	while (NSStringFinder::RemoveEmptyTag(sFileContent, "script"));
-
-	// Gumbo
-	GumboOptions options = kGumboDefaultOptions;
-	GumboOutput* output = gumbo_parse_with_options(&options, sFileContent.data(), sFileContent.length());
-
-	// prettyprint
-	NSStringUtils::CStringBuilderA oBuilder;
-	prettyprint(output->document, oBuilder);
-
-	// Конвертирование из string utf8 в wstring
-	return UTF8_TO_U(oBuilder.GetData());
-}
-
-std::wstring mhtToXhtml(std::string& sFileContent)
-{
-	sFileContent = mhtTohtml(sFileContent);
-
-	// Gumbo
-	GumboOptions options = kGumboDefaultOptions;
-	GumboOutput* output = gumbo_parse_with_options(&options, sFileContent.data(), sFileContent.length());
-
-	// prettyprint
-	NSStringUtils::CStringBuilderA oBuilder;
-	prettyprint(output->document, oBuilder);
-
-	// Конвертирование из string utf8 в wstring
-	return UTF8_TO_U(oBuilder.GetData());
-}
-}

Common/3dParty/html/htmltoxhtml.h

@@ -2,11 +2,658 @@
 #define HTMLTOXHTML_H
 
 #include <string>
+#include <map>
+#include <cctype>
+#include <vector>
+#include <algorithm>
 
-namespace HTML
+#include "gumbo-parser/src/gumbo.h"
+#include "../../../DesktopEditor/common/File.h"
+#include "../../../DesktopEditor/common/Directory.h"
+#include "../../../DesktopEditor/common/StringBuilder.h"
+#include "../../../DesktopEditor/xml/include/xmlutils.h"
+#include "../../../UnicodeConverter/UnicodeConverter.h"
+#include "../../../HtmlFile2/src/StringFinder.h"
+
+#if defined(CreateDirectory)
+#undef CreateDirectory
+#endif
+
+static std::string nonbreaking_inline  = "|a|abbr|acronym|b|bdo|big|cite|code|dfn|em|font|i|img|kbd|nobr|s|small|span|strike|strong|sub|sup|tt|";
+static std::string empty_tags          = "|area|base|basefont|bgsound|br|command|col|embed|event-source|frame|hr|image|img|input|keygen|link|menuitem|meta|param|source|spacer|track|wbr|";
+static std::string preserve_whitespace = "|pre|textarea|script|style|";
+static std::string special_handling    = "|html|body|";
+static std::string treat_like_inline   = "|p|";
+
+static std::vector<std::string> html_tags = {"div","span","a","img","p","h1","h2","h3","h4","h5","h6",
+                                             "ul", "ol", "li","td","tr","table","thead","tbody","tfoot","th",
+                                             "br","form","input","button","section","nav","header","footer",
+                                             "main","figure","figcaption","strong","em","i", "b", "u","pre",
+                                             "code","blockquote","hr","script","link","meta","style","title",
+                                             "head","body","html","legend","optgroup","option","select","dl",
+                                             "dt","dd","time","data","abbr","address","area","base","bdi",
+                                             "bdo","cite","col","iframe","video","source","track","textarea",
+                                             "label","fieldset","colgroup","del","ins","details","summary",
+                                             "dialog","embed","kbd","map","mark","menu","meter","object",
+                                             "output","param","progress","q","samp","small","sub","sup","var",
+                                             "wbr","acronym","applet","article","aside","audio","basefont",
+                                             "bgsound","big","blink","canvas","caption","center","command",
+                                             "comment","datalist","dfn","dir","font","frame","frameset",
+                                             "hgroup","isindex","keygen","marquee","nobr","noembed","noframes",
+                                             "noscript","plaintext","rp","rt","ruby","s","strike","tt","xmp"};
+
+static std::vector<std::string> unchecked_nodes_new = {"svg"};
+
+static void prettyprint(GumboNode*, NSStringUtils::CStringBuilderA& oBuilder, bool bCheckValidNode = true);
+static std::string mhtTohtml(const std::string &sFileContent);
+
+// Заменяет в строке s все символы s1 на s2
+static void replace_all(std::string& s, const std::string& s1, const std::string& s2)
 {
-std::wstring htmlToXhtml(std::string& sFileContent, bool bNeedConvert);
-std::wstring mhtToXhtml(std::string& sFileContent);
+	size_t pos = s.find(s1);
+	while(pos != std::string::npos)
+	{
+		s.replace(pos, s1.length(), s2);
+		pos = s.find(s1, pos + s2.length());
+	}
+}
+
+static bool NodeIsUnprocessed(const std::string& wsTagName)
+{
+	return "xml" == wsTagName;
+}
+
+static bool IsUnckeckedNodes(const std::string& sValue)
+{
+	return unchecked_nodes_new.end() != std::find(unchecked_nodes_new.begin(), unchecked_nodes_new.end(), sValue);
+}
+
+static std::wstring htmlToXhtml(std::string& sFileContent, bool bNeedConvert)
+{
+	if (bNeedConvert)
+	{ // Определение кодировки
+		std::string sEncoding = NSStringFinder::FindProperty(sFileContent, "charset", {"="}, {";", "\\n", "\\r", " ", "\"", "'"}).m_sValue;
+
+		if (sEncoding.empty())
+			sEncoding = NSStringFinder::FindProperty(sFileContent, "encoding", {"="}, {";", "\\n", "\\r", " "}).m_sValue;
+
+		if (!sEncoding.empty() && !NSStringFinder::Equals("utf-8", sEncoding))
+		{
+			NSUnicodeConverter::CUnicodeConverter oConverter;
+			sFileContent = U_TO_UTF8(oConverter.toUnicode(sFileContent, sEncoding.c_str()));
+		}
+	}
+
+	// Избавляемся от лишних символов до <...
+	boost::regex oRegex("<[a-zA-Z]");
+	boost::match_results<typename std::string::const_iterator> oResult;
+
+	if (boost::regex_search(sFileContent, oResult, oRegex))
+		sFileContent.erase(0, oResult.position());
+
+	//Избавление от <a ... />
+	while (NSStringFinder::RemoveEmptyTag(sFileContent, "a"));
+	//Избавление от <title ... />
+	while (NSStringFinder::RemoveEmptyTag(sFileContent, "title"));
+	//Избавление от <script ... />
+	while (NSStringFinder::RemoveEmptyTag(sFileContent, "script"));
+
+	// Gumbo
+	GumboOptions options = kGumboDefaultOptions;
+	GumboOutput* output = gumbo_parse_with_options(&options, sFileContent.data(), sFileContent.length());
+
+	// prettyprint
+	NSStringUtils::CStringBuilderA oBuilder;
+	prettyprint(output->document, oBuilder);
+
+	// Конвертирование из string utf8 в wstring
+	return UTF8_TO_U(oBuilder.GetData());
+}
+
+static std::string Base64ToString(const std::string& sContent, const std::string& sCharset)
+{
+	std::string sRes;
+	int nSrcLen = (int)sContent.length();
+	int nDecodeLen = NSBase64::Base64DecodeGetRequiredLength(nSrcLen);
+	BYTE* pData = new BYTE[nDecodeLen];
+	if (TRUE == NSBase64::Base64Decode(sContent.c_str(), nSrcLen, pData, &nDecodeLen))
+	{
+		std::wstring sConvert;
+		if(!sCharset.empty() && NSStringFinder::Equals<std::string>("utf-8", sCharset))
+		{
+			NSUnicodeConverter::CUnicodeConverter oConverter;
+			sConvert = oConverter.toUnicode(reinterpret_cast<char *>(pData), (unsigned)nDecodeLen, sCharset.data());
+		}
+		sRes = sConvert.empty() ? std::string(reinterpret_cast<char *>(pData), nDecodeLen) : U_TO_UTF8(sConvert);
+	}
+	RELEASEARRAYOBJECTS(pData);
+	return sRes;
+}
+
+static std::string QuotedPrintableDecode(const std::string& sContent, std::string& sCharset)
+{
+	NSStringUtils::CStringBuilderA sRes;
+	size_t ip = 0;
+	size_t i  = sContent.find('=');
+
+	if(i == 0)
+	{
+		size_t nIgnore = 12;
+		std::string charset = sContent.substr(0, nIgnore);
+		if(charset == "=00=00=FE=FF")
+			sCharset = "UTF-32BE";
+		else if(charset == "=FF=FE=00=00")
+			sCharset = "UTF-32LE";
+		else if(charset == "=2B=2F=76=38" || charset == "=2B=2F=76=39" ||
+				charset == "=2B=2F=76=2B" || charset == "=2B=2F=76=2F")
+			sCharset = "UTF-7";
+		else if(charset == "=DD=73=66=73")
+			sCharset = "UTF-EBCDIC";
+		else if(charset == "=84=31=95=33")
+			sCharset = "GB-18030";
+		else
+		{
+			nIgnore -= 3;
+			charset.erase(nIgnore);
+			if(charset == "=EF=BB=BF")
+				sCharset = "UTF-8";
+			else if(charset == "=F7=64=4C")
+				sCharset = "UTF-1";
+			else if(charset == "=0E=FE=FF")
+				sCharset = "SCSU";
+			else if(charset == "=FB=EE=28")
+				sCharset = "BOCU-1";
+			else
+			{
+				nIgnore -= 3;
+				charset.erase(nIgnore);
+				if(charset == "=FE=FF")
+					sCharset = "UTF-16BE";
+				else if(charset == "=FF=FE")
+					sCharset = "UTF-16LE";
+				else
+					nIgnore -= 6;
+			}
+		}
+
+		ip = nIgnore;
+		i  = sContent.find('=', ip);
+	}
+
+	while(i != std::string::npos && i + 2 < sContent.length())
+	{
+		sRes.WriteString(sContent.c_str() + ip, i - ip);
+		std::string str = sContent.substr(i + 1, 2);
+		if(str.front() == '\n' || str.front() == '\r')
+		{
+			char ch = str[1];
+			if(ch != '\n' && ch != '\r')
+				sRes.WriteString(&ch, 1);
+		}
+		else
+		{
+			char* err;
+			char ch = (int)strtol(str.data(), &err, 16);
+			if(*err)
+				sRes.WriteString('=' + str);
+			else
+				sRes.WriteString(&ch, 1);
+		}
+		ip = i + 3;
+		i = sContent.find('=', ip);
+	}
+	if(ip != std::string::npos)
+		sRes.WriteString(sContent.c_str() + ip);
+	return sRes.GetData();
+}
+
+static void ReadMht(const std::string& sMhtContent, std::map<std::string, std::string>& sRes, NSStringUtils::CStringBuilderA& oRes)
+{
+	size_t unContentPosition = 0, unCharsetBegin = 0, unCharsetEnd = std::string::npos;
+
+	NSStringFinder::TFoundedData<char> oData;
+	
+	// Content-Type
+	oData =  NSStringFinder::FindProperty(sMhtContent, "content-type", {":"}, {";", "\\n", "\\r"});
+	const std::string sContentType{oData.m_sValue};
+
+	if (sContentType.empty())
+		return;
+	
+	if (NSStringFinder::Equals(sContentType, "multipart/alternative"))
+	{
+		oRes.WriteString(mhtTohtml(sMhtContent.substr(oData.m_unEndPosition, sMhtContent.length() - oData.m_unEndPosition)));
+		return;
+	}
+
+	unContentPosition = std::max(unContentPosition, oData.m_unEndPosition);
+	unCharsetBegin = oData.m_unEndPosition;
+
+	// name
+//	std::string sName = NSStringFinder::FindProperty(sMhtContent, "name", {"="}, {";", "\\n", "\\r"}, 0, unLastPosition);
+//	unContentPosition = std::max(unContentPosition, unLastPosition);
+
+	// Content-Location
+	oData = NSStringFinder::FindProperty(sMhtContent, "content-location", {":"}, {";", "\\n", "\\r"});
+	std::string sContentLocation{oData.m_sValue};
+
+	if (!oData.Empty())
+		unContentPosition = std::max(unContentPosition, oData.m_unEndPosition);
+
+	// Content-ID
+	oData = NSStringFinder::FindProperty(sMhtContent, "content-id", {":"}, {";", "\\n", "\\r"});
+	std::string sContentID{oData.m_sValue};
+
+	if (!oData.Empty())
+	{
+		unContentPosition = std::max(unContentPosition, oData.m_unEndPosition);
+		unCharsetEnd = std::min(unCharsetEnd, oData.m_unBeginPosition);
+		NSStringFinder::CutInside<std::string>(sContentID, "<", ">");
+	}
+
+	if (sContentLocation.empty() && !sContentID.empty())
+		sContentLocation = "cid:" + sContentID;
+
+	// Content-Transfer-Encoding
+	oData = NSStringFinder::FindProperty(sMhtContent, "content-transfer-encoding", {":"}, {";", "\\n", "\\r"});
+	const std::string sContentEncoding{oData.m_sValue};
+
+	if (!oData.Empty())
+	{
+		unContentPosition = std::max(unContentPosition, oData.m_unEndPosition);
+		unCharsetEnd = std::min(unCharsetEnd, oData.m_unBeginPosition);
+	}
+
+	// charset
+	std::string sCharset = "utf-8";
+
+	if (std::string::npos != unCharsetEnd && unCharsetBegin < unCharsetEnd)
+	{
+		sCharset = NSStringFinder::FindProperty(sMhtContent.substr(unCharsetBegin, unCharsetEnd - unCharsetBegin), "charset", {"="}, {";", "\\n", "\\r"}).m_sValue;
+		NSStringFinder::CutInside<std::string>(sCharset, "\"");
+	}
+
+	// Content
+	std::string sContent = sMhtContent.substr(unContentPosition, sMhtContent.length() - unContentPosition);
+
+//	std::wstring sExtention = NSFile::GetFileExtention(UTF8_TO_U(sName));
+//	std::transform(sExtention.begin(), sExtention.end(), sExtention.begin(), tolower);
+	// Основной документ
+	if (NSStringFinder::Equals(sContentType, "multipart/alternative"))
+		oRes.WriteString(mhtTohtml(sContent));
+	else if ((NSStringFinder::Find(sContentType, "text") /*&& (sExtention.empty() || NSStringFinder::EqualOf(sExtention, {L"htm", L"html", L"xhtml", L"css"}))*/) 
+	          || (NSStringFinder::Equals(sContentType, "application/octet-stream") && NSStringFinder::Find(sContentLocation, "css")))
+	{
+		// Стили заключаются в тэг <style>
+		const bool bAddTagStyle = NSStringFinder::Equals(sContentType, "text/css") /*|| NSStringFinder::Equals(sExtention, L"css")*/ || NSStringFinder::Find(sContentLocation, "css");
+
+		if (bAddTagStyle)
+			oRes.WriteString("<style>");
+
+		if (NSStringFinder::Equals(sContentEncoding, "base64"))
+			sContent = Base64ToString(sContent, sCharset);
+		else if (NSStringFinder::EqualOf(sContentEncoding, {"8bit", "7bit"}) || sContentEncoding.empty())
+		{
+			if (!NSStringFinder::Equals(sCharset, "utf-8") && !sCharset.empty())
+			{
+				NSUnicodeConverter::CUnicodeConverter oConverter;
+				sContent = U_TO_UTF8(oConverter.toUnicode(sContent, sCharset.data()));
+			}
+		}
+		else if (NSStringFinder::Equals(sContentEncoding, "quoted-printable"))
+		{
+			sContent = QuotedPrintableDecode(sContent, sCharset);
+			if (!NSStringFinder::Equals(sCharset, "utf-8") && !sCharset.empty())
+			{
+				NSUnicodeConverter::CUnicodeConverter oConverter;
+				sContent = U_TO_UTF8(oConverter.toUnicode(sContent, sCharset.data()));
+			}
+		}
+
+		if (NSStringFinder::Equals(sContentType, "text/html"))
+			sContent = U_TO_UTF8(htmlToXhtml(sContent, false));
+
+		oRes.WriteString(sContent);
+
+		if(bAddTagStyle)
+			oRes.WriteString("</style>");
+	}
+	// Картинки
+	else if ((NSStringFinder::Find(sContentType, "image") /*|| NSStringFinder::Equals(sExtention, L"gif")*/ || NSStringFinder::Equals(sContentType, "application/octet-stream")) && 
+			  NSStringFinder::Equals(sContentEncoding, "base64"))
+	{
+//		if (NSStringFinder::Equals(sExtention, L"ico") || NSStringFinder::Find(sContentType, "ico"))
+//			sContentType = "image/jpg";
+//		else if(NSStringFinder::Equals(sExtention, L"gif"))
+//			sContentType = "image/gif";
+		int nSrcLen = (int)sContent.length();
+		int nDecodeLen = NSBase64::Base64DecodeGetRequiredLength(nSrcLen);
+		BYTE* pData = new BYTE[nDecodeLen];
+		if (TRUE == NSBase64::Base64Decode(sContent.c_str(), nSrcLen, pData, &nDecodeLen))
+			sRes.insert(std::make_pair(sContentLocation, "data:" + sContentType + ";base64," + sContent));
+		RELEASEARRAYOBJECTS(pData);
+	}
+}
+
+static std::string mhtTohtml(const std::string& sFileContent)
+{
+	std::map<std::string, std::string> sRes;
+	NSStringUtils::CStringBuilderA oRes;
+
+	// Поиск boundary
+	NSStringFinder::TFoundedData<char> oData{NSStringFinder::FindProperty(sFileContent, "boundary", {"="}, {"\\r", "\\n", "\""})};
+
+	size_t nFound{oData.m_unEndPosition};
+	std::string sBoundary{oData.m_sValue};
+
+	if (sBoundary.empty())
+	{
+		size_t nFoundEnd = sFileContent.length();
+		nFound = 0;
+		ReadMht(sFileContent.substr(nFound, nFoundEnd), sRes, oRes);
+		return oRes.GetData();
+	}
+
+	NSStringFinder::CutInside<std::string>(sBoundary, "\"");
+
+	size_t nFoundEnd{nFound};
+
+	sBoundary = "--" + sBoundary;
+	size_t nBoundaryLength = sBoundary.length();
+
+	nFound = sFileContent.find(sBoundary, nFound) + nBoundaryLength;
+
+	// Цикл по boundary
+	while(nFound != std::string::npos)
+	{
+		nFoundEnd = sFileContent.find(sBoundary, nFound + nBoundaryLength);
+		if(nFoundEnd == std::string::npos)
+			break;
+
+		ReadMht(sFileContent.substr(nFound, nFoundEnd - nFound), sRes, oRes);
+
+		nFound = sFileContent.find(sBoundary, nFoundEnd);
+	}
+
+	std::string sFile = oRes.GetData();
+	for(const std::pair<std::string, std::string>& item : sRes)
+	{
+		std::string sName = item.first;
+		size_t found = sFile.find(sName);
+		size_t sfound = sName.rfind('/');
+		if(found == std::string::npos && sfound != std::string::npos)
+			found = sFile.find(sName.erase(0, sfound + 1));
+		while(found != std::string::npos)
+		{
+			size_t fq = sFile.find_last_of("\"\'>=", found);
+
+			if (std::string::npos == fq)
+				break;
+
+			char ch = sFile[fq];
+			if(ch != '\"' && ch != '\'')
+				fq++;
+			size_t tq = sFile.find_first_of("\"\'<> ", found) + 1;
+
+			if (std::string::npos == tq)
+				break;
+
+			if(sFile[tq] != '\"' && sFile[tq] != '\'')
+				tq--;
+			if(ch != '>')
+			{
+				std::string is = '\"' + item.second + '\"';
+				sFile.replace(fq, tq - fq, is);
+				found = sFile.find(sName, fq + is.length());
+			}
+			else
+				found = sFile.find(sName, tq);
+		}
+	}
+
+	return sFile;
+}
+
+static std::wstring mhtToXhtml(std::string& sFileContent)
+{
+	sFileContent = mhtTohtml(sFileContent);
+
+	// Gumbo
+	GumboOptions options = kGumboDefaultOptions;
+	GumboOutput* output = gumbo_parse_with_options(&options, sFileContent.data(), sFileContent.length());
+
+	// prettyprint
+	NSStringUtils::CStringBuilderA oBuilder;
+	prettyprint(output->document, oBuilder);
+
+	// Конвертирование из string utf8 в wstring
+	return UTF8_TO_U(oBuilder.GetData());
+}
+
+// Заменяет сущности &,<,> в text
+static void substitute_xml_entities_into_text(std::string& text)
+{
+	// replacing & must come first
+	replace_all(text, "&", "&amp;");
+	replace_all(text, "<", "&lt;");
+	replace_all(text, ">", "&gt;");
+}
+
+// After running through Gumbo, the values of type "&#1;" are replaced with the corresponding code '0x01'
+// Since the attribute value does not use control characters (value <= 0x09),
+// then just delete them, otherwise XmlUtils::CXmlLiteReader crashes on them.
+// bug#73486
+static void remove_control_symbols(std::string& text)
+{
+	std::string::iterator itFound = std::find_if(text.begin(), text.end(), [](unsigned char chValue){ return chValue <= 0x09; });
+
+	while (itFound != text.end())
+	{
+		itFound = text.erase(itFound);
+		itFound = std::find_if(itFound, text.end(), [](unsigned char chValue){ return chValue <= 0x09; });
+	}
+}
+
+// Заменяет сущности " в text
+static void substitute_xml_entities_into_attributes(std::string& text)
+{
+	remove_control_symbols(text);
+	substitute_xml_entities_into_text(text);
+	replace_all(text, "\"", "&quot;");
+}
+
+static std::string handle_unknown_tag(GumboStringPiece* text)
+{
+	if (text->data == NULL)
+		return "";
+	GumboStringPiece gsp = *text;
+	gumbo_tag_from_original_text(&gsp);
+	std::string sAtr = std::string(gsp.data, gsp.length);
+	size_t found = sAtr.find_first_of("-'+,./=?;!*#@$_%<>&;\"\'()[]{}");
+	while(found != std::string::npos)
+	{
+		sAtr.erase(found, 1);
+		found = sAtr.find_first_of("-'+,./=?;!*#@$_%<>&;\"\'()[]{}", found);
+	}
+	return sAtr;
+}
+
+static std::string get_tag_name(GumboNode* node)
+{
+	std::string tagname = (node->type == GUMBO_NODE_DOCUMENT ? "document" : gumbo_normalized_tagname(node->v.element.tag));
+	if (tagname.empty())
+		tagname = handle_unknown_tag(&node->v.element.original_tag);
+	return tagname;
+}
+
+static void build_doctype(GumboNode* node, NSStringUtils::CStringBuilderA& oBuilder)
+{
+	if (node->v.document.has_doctype)
+	{
+		oBuilder.WriteString("<!DOCTYPE ");
+		oBuilder.WriteString(node->v.document.name);
+		std::string pi(node->v.document.public_identifier);
+		remove_control_symbols(pi);
+		if ((node->v.document.public_identifier != NULL) && !pi.empty())
+		{
+			oBuilder.WriteString(" PUBLIC \"");
+			oBuilder.WriteString(pi);
+			oBuilder.WriteString("\" \"");
+			oBuilder.WriteString(node->v.document.system_identifier);
+			oBuilder.WriteString("\"");
+		}
+		oBuilder.WriteString(">");
+	}
+}
+
+static void build_attributes(const GumboVector* attribs, NSStringUtils::CStringBuilderA& atts)
+{
+	std::vector<std::string> arrRepeat;
+	for (size_t i = 0; i < attribs->length; ++i)
+	{
+		GumboAttribute* at = static_cast<GumboAttribute*>(attribs->data[i]);
+		std::string sVal(at->value);
+		std::string sName(at->name);
+
+		remove_control_symbols(sVal);
+		remove_control_symbols(sName);
+
+		atts.WriteString(" ");
+
+		bool bCheck = false;
+		size_t nBad = sName.find_first_of("+,.=?#%<>&;\"\'()[]{}");
+		while(nBad != std::string::npos)
+		{
+			sName.erase(nBad, 1);
+			nBad = sName.find_first_of("+,.=?#%<>&;\"\'()[]{}", nBad);
+			if(sName.empty())
+				break;
+			bCheck = true;
+		}
+		if(sName.empty())
+			continue;
+		while(sName.front() >= '0' && sName.front() <= '9')
+		{
+			sName.erase(0, 1);
+			if(sName.empty())
+				break;
+			bCheck = true;
+		}
+		if(bCheck)
+		{
+			GumboAttribute* check = gumbo_get_attribute(attribs, sName.c_str());
+			if(check || std::find(arrRepeat.begin(), arrRepeat.end(), sName) != arrRepeat.end())
+				continue;
+			else
+				arrRepeat.push_back(sName);
+		}
+
+		if(sName.empty())
+			continue;
+		atts.WriteString(sName);
+
+		// determine original quote character used if it exists
+		std::string qs ="\"";
+		atts.WriteString("=");
+		atts.WriteString(qs);
+		substitute_xml_entities_into_attributes(sVal);
+		atts.WriteString(sVal);
+		atts.WriteString(qs);
+	}
+}
+
+static void prettyprint_contents(GumboNode* node, NSStringUtils::CStringBuilderA& contents, bool bCheckValidNode)
+{
+	std::string key             = "|" + get_tag_name(node) + "|";
+	bool keep_whitespace        = preserve_whitespace.find(key) != std::string::npos;
+	bool is_inline              = nonbreaking_inline.find(key) != std::string::npos;
+	bool is_like_inline         = treat_like_inline.find(key) != std::string::npos;
+
+	GumboVector* children = &node->v.element.children;
+
+	for (size_t i = 0; i < children->length; i++)
+	{
+		GumboNode* child = static_cast<GumboNode*> (children->data[i]);
+
+		if (child->type == GUMBO_NODE_TEXT)
+		{
+			std::string val(child->v.text.text);
+			remove_control_symbols(val);
+			substitute_xml_entities_into_text(val);
+
+			// Избавление от FF
+			size_t found = val.find_first_of("\014");
+			while(found != std::string::npos)
+			{
+				val.erase(found, 1);
+				found = val.find_first_of("\014", found);
+			}
+
+			contents.WriteString(val);
+		}
+		else if ((child->type == GUMBO_NODE_ELEMENT) || (child->type == GUMBO_NODE_TEMPLATE))
+			prettyprint(child, contents, bCheckValidNode);
+		else if (child->type == GUMBO_NODE_WHITESPACE)
+		{
+			if (keep_whitespace || is_inline || is_like_inline)
+				contents.WriteString(child->v.text.text);
+		}
+		else if (child->type != GUMBO_NODE_COMMENT)
+		{
+			// Сообщение об ошибке
+			// Does this actually exist: (child->type == GUMBO_NODE_CDATA)
+			// fprintf(stderr, "unknown element of type: %d\n", child->type);
+		}
+	}
+}
+
+static void prettyprint(GumboNode* node, NSStringUtils::CStringBuilderA& oBuilder, bool bCheckValidNode)
+{
+	// special case the document node
+	if (node->type == GUMBO_NODE_DOCUMENT)
+	{
+		build_doctype(node, oBuilder);
+		prettyprint_contents(node, oBuilder, bCheckValidNode);
+		return;
+	}
+
+	std::string tagname            = get_tag_name(node);
+	remove_control_symbols(tagname);
+
+	if (NodeIsUnprocessed(tagname))
+		return;
+
+	if (bCheckValidNode)
+		bCheckValidNode = !IsUnckeckedNodes(tagname);
+
+	if (bCheckValidNode && html_tags.end() == std::find(html_tags.begin(), html_tags.end(), tagname))
+	{
+		prettyprint_contents(node, oBuilder, bCheckValidNode);
+		return;
+	}
+
+	std::string close              = "";
+	std::string closeTag           = "";
+	std::string key                = "|" + tagname + "|";
+	bool is_empty_tag              = empty_tags.find(key) != std::string::npos;
+	
+	// determine closing tag type
+	if (is_empty_tag)
+		close = "/";
+	else
+		closeTag = "</" + tagname + ">";
+
+	// build results
+	oBuilder.WriteString("<" + tagname);
+
+	// build attr string
+	const GumboVector* attribs = &node->v.element.attributes;
+	build_attributes(attribs, oBuilder);
+	oBuilder.WriteString(close + ">");
+
+	// prettyprint your contents
+	prettyprint_contents(node, oBuilder, bCheckValidNode);
+	oBuilder.WriteString(closeTag);
 }
 
 #endif // HTMLTOXHTML_H

Common/3dParty/md/md2html.cpp

@@ -5,9 +5,6 @@
 
 namespace Md
 {
-#define MD_PARSER_FLAGS MD_DIALECT_GITHUB | MD_FLAG_NOINDENTEDCODEBLOCKS | MD_HTML_FLAG_SKIP_UTF8_BOM | MD_FLAG_HARD_SOFT_BREAKS | MD_HTML_FLAG_XHTML | MD_FLAG_LATEXMATHSPANS
-#define MD_RENDERER_FLAGS MD_HTML_FLAG_XHTML
-
 void ToHtml(const MD_CHAR* pValue, MD_SIZE uSize, void* pData)
 {
 	if (NULL != pData)
@@ -17,7 +14,7 @@ void ToHtml(const MD_CHAR* pValue, MD_SIZE uSize, void* pData)
 std::string ConvertMdStringToHtml(const std::string& sMdString)
 {
 	std::string sData;
-	md_html(sMdString.c_str(), sMdString.length(), ToHtml, &sData, MD_PARSER_FLAGS, MD_RENDERER_FLAGS);
+	md_html(sMdString.c_str(), sMdString.length(), ToHtml, &sData, 0, 0);
 	return sData;
 }
 
@@ -39,21 +36,22 @@ void WriteBaseHtmlStyles(NSFile::CFileBinary& oFile)
 	oFile.WriteStringUTF8(L"img { vertical-align: middle; }");
 
 	// Styles for tables
-	oFile.WriteStringUTF8(L"table { margin-bottom: 20px; width: 100%; max-width: 100%; border-spacing:0; border-collapse: collapse; border-color: gray; vertical-align:middle;}");
-	oFile.WriteStringUTF8(L"thead { display: table-header-group;}");
+	oFile.WriteStringUTF8(L"table { margin-bottom: 20px; width: 100%; max-width: 100%; border-spacing:0; border-collapse: collapse; border-color: gray;}");
+	oFile.WriteStringUTF8(L"thead { display: table-header-group; vertical-align: middle; }");
 	oFile.WriteStringUTF8(L"tr { display: table-row; }");
-	oFile.WriteStringUTF8(L"th { text-align: center; display: table-cell; font-weight: bold; }");
+	oFile.WriteStringUTF8(L"th { text-align: left; display: table-cell; font-weight: bold; }");
 
-	oFile.WriteStringUTF8(L"table thead tr th, table thead tr td { border-bottom: 2px solid #ddd; border-top: none; }");
-	oFile.WriteStringUTF8(L"table tbody tr th, table tbody tr td { padding 8px; line-height: 1.4; border-top: 1px solid #ddd; }");
+	oFile.WriteStringUTF8(L"table thead tr th { vertical-align: bottom; border-bottom: 2px solid #ddd; }");
+	oFile.WriteStringUTF8(L"table thead tr th, table tbody tr th, table thead tr td, table tbody tr td { padding 8px; line-height: 1.4; vertical-align: top; border-top: 1px solid #ddd; }");
+	oFile.WriteStringUTF8(L"table > caption + thead > tr > th, table > colgroup + thead > tr > th, table > thead > tr > th, table > caption + thead > tr > td, table > colgroup + thead > tr > td, table > thead > tr > td { border-top: 0; }");
 
 	// Styles for blockquote
 	oFile.WriteStringUTF8(L"blockquote { border-left: 3px solid #e9e9e9;  margin: 1.5em 0; padding: 0.5em 10px 0.5em 24px; font-size: 1.25rem; display: block; margin-top: 8pt; font-style: italic; color: #404040; }");
 
 	// Styles for code
-	oFile.WriteStringUTF8(L"code { padding: 2px 4px; font-size: 90%; color: #c7254e; background-color: #f9f2f4; }");
-	oFile.WriteStringUTF8(L"pre code { padding: 0px; white-space: pre-wrap; border-radius: 0; background-color: #f8f8f8; color:black; }");
-	oFile.WriteStringUTF8(L"pre { display: block; padding: 9.5px; margin: 0 0 10px; line-height: 1.4; word-break: break-all; word-wrap: break-word; background-color: #f8f8f8; border: none; font-size: 1em; }");
+	oFile.WriteStringUTF8(L"code { padding: 2px 4px; font-size: 90%; color: #c7254e; background-color: #f9f2f4; border-radius: 4px; }");
+	oFile.WriteStringUTF8(L"pre code { padding: 0px; white-space: pre-wrap; border-radius: 0; background-color: #f5f5f5; color:black; }");
+	oFile.WriteStringUTF8(L"pre { display: block; padding: 9.5px; margin: 0 0 10px; line-height: 1.4; word-break: break-all; word-wrap: break-word; background-color: #f5f5f5; border: 1px solid #ccc; border-radius: 4px; font-size: 1em; }");
 	oFile.WriteStringUTF8(L"code, pre { font-family: Menlo, Monaco, Consolas, \"Courier New\", monospace; }");
 
 	// Styles for headings
@@ -89,7 +87,9 @@ bool ConvertMdFileToHtml(const std::wstring& wsPathToMdFile, const std::wstring&
 
 	bool bResult = true;
 
-	if (0 != md_html(sMdData.c_str(), sMdData.length(), ToHtmlFile, &oFile, MD_PARSER_FLAGS, MD_RENDERER_FLAGS))
+	if (0 != md_html(sMdData.c_str(), sMdData.length(), ToHtmlFile, &oFile,
+					 MD_DIALECT_GITHUB | MD_FLAG_NOINDENTEDCODEBLOCKS | MD_HTML_FLAG_SKIP_UTF8_BOM,
+					 0))
 		bResult = false;
 
 	oFile.WriteStringUTF8(L"</body></html>");

Common/3dParty/pole/pole.h

@@ -90,7 +90,7 @@ static std::wstring convertUtf16ToWString(const UTF16 * Data, int nLength)
         return std::wstring();
     }
 
-    std::wstring wstr ((wchar_t *) pStrUtf32, nLength);
+    std::wstring wstr ((wchar_t *) pStrUtf32);
 
     delete [] pStrUtf32;
     return wstr;

Common/3dParty/socketio/.gitignore

@@ -1,2 +1 @@
 socket.io-client-cpp/
-socketio.data

Common/3dParty/socketrocket/SocketRocket/SRWebSocket.h

@@ -72,10 +72,6 @@ extern NSString *const SRHTTPResponseErrorKey;
 // Optional array of cookies (NSHTTPCookie objects) to apply to the connections
 @property (nonatomic, readwrite) NSArray * requestCookies;
 
-// Optional proxy configuration dictionary (kCFStreamPropertyHTTPProxy format).
-// Set before calling -open. Example: Proxyman at 127.0.0.1:9090.
-@property (nonatomic, strong) NSDictionary *proxyDictionary;
-
 // This returns the negotiated protocol.
 // It will be nil until after the handshake completes.
 @property (nonatomic, readonly, copy) NSString *protocol;

Common/3dParty/socketrocket/SocketRocket/SRWebSocket.m

@@ -619,16 +619,7 @@ static __strong NSData *CRLFCRLF;
     
     _inputStream.delegate = self;
     _outputStream.delegate = self;
-
-    if (self.proxyDictionary) {
-        CFReadStreamSetProperty((__bridge CFReadStreamRef)_inputStream,
-                                kCFStreamPropertyHTTPProxy,
-                                (__bridge CFDictionaryRef)self.proxyDictionary);
-        CFWriteStreamSetProperty((__bridge CFWriteStreamRef)_outputStream,
-                                 kCFStreamPropertyHTTPProxy,
-                                 (__bridge CFDictionaryRef)self.proxyDictionary);
-    }
-
+    
     [self setupNetworkServiceType:_urlRequest.networkServiceType];
 }
 

Common/3dParty/v8_89/.gitignore

@@ -1,6 +1,6 @@
 .cipd
-.gclient*
-.gcs*
+.gclient
+.gclient_entries
 v8
 depot_tools
 v8.data

Common/Network/FileTransporter/src/FileTransporter_mac.mm

@@ -188,7 +188,7 @@ namespace NSNetwork
 				else
 				{
 					NSURL* url = [NSURL URLWithString:escapedURL];
-					NSData* urlData = [[NSData alloc] initWithContentsOfURL:url];
+					NSData* urlData = [NSData dataWithContentsOfURL:url];
 					if ( urlData )
 					{
 						NSString* filePath = StringWToNSString(m_sDownloadFilePath);

Common/Network/WebSocket/src/socketio/socketio_internal_private.h

@@ -38,8 +38,6 @@
 #include <memory>
 #include "../../../../../DesktopEditor/graphics/BaseThread.h"
 
-#define _LOGGER_SOCKETS
-
 namespace NSNetwork
 {
     namespace NSWebSocket
@@ -126,10 +124,6 @@ namespace NSNetwork
                 }
 
                 //webSocket.connect(url, queryDst, sio::string_message::create(sAuth));
-#ifdef _LOGGER_SOCKETS
-                m_socket->set_proxy_basic_auth("http://127.0.0.1:9090", "", "");
-#endif
-
                 m_connecting_in_process = true;
                 m_socket->connect(m_base->url, queryDst, objAuth);
 

Common/Network/WebSocket/src/socketio/socketio_internal_private_no_tls.h

@@ -42,8 +42,6 @@
 #include <memory>
 #include "../../../../../DesktopEditor/graphics/BaseThread.h"
 
-#define _LOGGER_SOCKETS
-
 namespace NSNetwork
 {
     namespace NSWebSocket
@@ -115,10 +113,6 @@ namespace NSNetwork
                 }
 
                 //webSocket.connect(url, queryDst, sio_no_tls::string_message::create(sAuth));
-#ifdef _LOGGER_SOCKETS
-                m_socket->set_proxy_basic_auth("http://127.0.0.1:9090", "", "");
-#endif
-
                 m_connecting_in_process = true;
                 m_socket->connect(m_base->url, queryDst, objAuth);
 

Common/Network/WebSocket/src/socketrocket/socketRocket_objc.mm

@@ -48,7 +48,7 @@
 }
 
 - (void)open
-{
+{   
     if (m_url && m_url.length)
     {
         NSURLRequest *request = [NSURLRequest requestWithURL:[NSURL URLWithString:m_url]];
@@ -58,19 +58,6 @@
                                                         protocols:nil
                                    allowsUntrustedSSLCertificates:YES];
             self.socket.delegate = self;
-
-#ifdef _LOGGER_SOCKETS
-            self.socket.proxyDictionary = @{
-                (NSString *)kCFNetworkProxiesHTTPEnable:  @YES,
-                (NSString *)kCFNetworkProxiesHTTPProxy:   @"127.0.0.1",
-                (NSString *)kCFNetworkProxiesHTTPPort:    @9090,
-                (NSString *)kCFNetworkProxiesHTTPSEnable: @YES,
-                (NSString *)kCFNetworkProxiesHTTPSProxy:  @"127.0.0.1",
-                (NSString *)kCFNetworkProxiesHTTPSPort:   @9090
-            };
-            NSLog(@"[SocketRocket] Proxyman proxy enabled: 127.0.0.1:9090");
-#endif
-
             [self.socket open];
         }
     }
@@ -78,7 +65,7 @@
 
 - (void)send:(NSString*)message
 {
-#ifdef _LOGGER_SOCKETS
+#if _LOGGER_SOCKETS
         
     NSLog(@"------------------- SEND TO SOCKET -------------------");
     NSLog(@"%@", message);
@@ -114,7 +101,7 @@
 
 - (void)webSocket:(SRWebSocket *)webSocket didReceiveMessage:(id)message
 {
-#ifdef _LOGGER_SOCKETS
+#if _LOGGER_SOCKETS
         
     NSLog(@"------------------- SOCKET RECEIVE MESSAGE -------------------");
     NSLog(@"%@", message);
@@ -132,7 +119,7 @@
 {
     m_listener->onOpen();
 
-#ifdef _LOGGER_SOCKETS
+#if _LOGGER_SOCKETS
         
     NSLog(@"------------------- SOCKET OPEN -------------------");
     NSLog(@"URL : %@", webSocket.url);
@@ -147,7 +134,7 @@
 {
     m_listener->onError(error.localizedDescription.stdstring);
 
-#ifdef _LOGGER_SOCKETS
+#if _LOGGER_SOCKETS
     
     NSLog(@"---------------------------------------------------------");
     NSLog(@"------------------- SOCKET ERROR : %@ ------------", error);
@@ -160,7 +147,7 @@
 {
     m_listener->onClose(code, reason.stdstring); 
 
-#ifdef _LOGGER_SOCKETS
+#if _LOGGER_SOCKETS
         
     NSLog(@"---------------------------------------------------------");
     NSLog(@"------------------- SOCKET CLOSE : %@ -----------", reason);
@@ -171,7 +158,7 @@
 
 - (void)webSocket:(SRWebSocket *)webSocket didReceivePong:(NSData *)pongPayload
 {           
-#ifdef _LOGGER_SOCKETS
+#if _LOGGER_SOCKETS
         
     NSString *str = [[NSString alloc] initWithData:pongPayload encoding:NSUTF8StringEncoding];
         

Common/OfficeFileFormatChecker.h

@@ -74,7 +74,6 @@ public:
 	bool isDocFormatFile(const std::wstring& fileName);
 	bool isXlsFormatFile(const std::wstring& fileName);
 
-	bool isCompoundFile     (POLE::Storage* storage);
 	bool isOleObjectFile(POLE::Storage* storage);
 	bool isDocFormatFile(POLE::Storage* storage);
 	bool isXlsFormatFile(POLE::Storage* storage);

Common/OfficeFileFormatChecker2.cpp

@@ -552,15 +552,6 @@ bool COfficeFileFormatChecker::isPptFormatFile(POLE::Storage *storage)
 	return true;
 }
 
-bool COfficeFileFormatChecker::isCompoundFile(POLE::Storage* storage)
-{
-	if (storage == NULL) return false;
-
-	if (storage->GetAllStreams(L"/").size() == 1) return true;
-
-	return false;
-}
-
 std::wstring COfficeFileFormatChecker::getDocumentID(const std::wstring &_fileName)
 {
 #if defined(_WIN32) || defined(_WIN32_WCE) || defined(_WIN64)
@@ -758,11 +749,6 @@ bool COfficeFileFormatChecker::isOfficeFile(const std::wstring &_fileName)
 			nFileType = AVS_OFFICESTUDIO_FILE_OTHER_MS_VBAPROJECT;
 			return true;
 		}
-		else if (isCompoundFile(&storage))
-		{
-			nFileType = AVS_OFFICESTUDIO_FILE_OTHER_COMPOUND;
-			return true;
-		}
 		else if (isHwpFile(&storage))
 		{
 			nFileType = AVS_OFFICESTUDIO_FILE_DOCUMENT_HWP;
@@ -967,12 +953,7 @@ bool COfficeFileFormatChecker::isOfficeFile(const std::wstring &_fileName)
 		nFileType = AVS_OFFICESTUDIO_FILE_DOCUMENT_MHT;
 	else if (0 == sExt.compare(L".md"))
 		nFileType = AVS_OFFICESTUDIO_FILE_DOCUMENT_MD;
-	else if (0 == sExt.compare(L".tsv"))
-		nFileType = AVS_OFFICESTUDIO_FILE_SPREADSHEET_TSV;
-	else if (0 == sExt.compare(L".scsv"))
-		nFileType = AVS_OFFICESTUDIO_FILE_SPREADSHEET_SCSV;	
-	else if (0 == sExt.compare(L".csv") || 0 == sExt.compare(L".tsv") || 0 == sExt.compare(L".dsv") || 0 == sExt.compare(L".cssv")
-		|| 0 == sExt.compare(L".xls") || 0 == sExt.compare(L".xlsx") || 0 == sExt.compare(L".xlsb"))
+	else if (0 == sExt.compare(L".csv") || 0 == sExt.compare(L".xls") || 0 == sExt.compare(L".xlsx") || 0 == sExt.compare(L".xlsb"))
 		nFileType = AVS_OFFICESTUDIO_FILE_SPREADSHEET_CSV;
 	else if (0 == sExt.compare(L".html") || 0 == sExt.compare(L".htm"))
 		nFileType = AVS_OFFICESTUDIO_FILE_DOCUMENT_HTML;
@@ -1804,10 +1785,6 @@ std::wstring COfficeFileFormatChecker::GetExtensionByType(int type)
 		return L".ods";
 	case AVS_OFFICESTUDIO_FILE_SPREADSHEET_CSV:
 		return L".csv";
-	case AVS_OFFICESTUDIO_FILE_SPREADSHEET_TSV:
-		return L".tsv";
-	case AVS_OFFICESTUDIO_FILE_SPREADSHEET_SCSV:
-		return L".scsv";
 	case AVS_OFFICESTUDIO_FILE_SPREADSHEET_ODS_FLAT:
 		return L".fods";
 	case AVS_OFFICESTUDIO_FILE_SPREADSHEET_OTS:
@@ -1997,11 +1974,7 @@ int COfficeFileFormatChecker::GetFormatByExtension(const std::wstring &sExt)
 		return AVS_OFFICESTUDIO_FILE_SPREADSHEET_XLSB;
 	if (L".xls" == ext)
 		return AVS_OFFICESTUDIO_FILE_SPREADSHEET_XLS;
-	if (L".tsv" == ext)
-		return AVS_OFFICESTUDIO_FILE_SPREADSHEET_TSV;
-	if (L".scsv" == ext)
-		return AVS_OFFICESTUDIO_FILE_SPREADSHEET_SCSV;
-	if (L".csv" == ext || L".dsv" == ext)
+	if (L".csv" == ext)
 		return AVS_OFFICESTUDIO_FILE_SPREADSHEET_CSV;
 	if (L".fods" == ext)
 		return AVS_OFFICESTUDIO_FILE_SPREADSHEET_ODS_FLAT;

Common/OfficeFileFormats.h

@@ -87,14 +87,13 @@
 #define AVS_OFFICESTUDIO_FILE_SPREADSHEET_XLSM			AVS_OFFICESTUDIO_FILE_SPREADSHEET + 0x0005
 #define AVS_OFFICESTUDIO_FILE_SPREADSHEET_XLTX			AVS_OFFICESTUDIO_FILE_SPREADSHEET + 0x0006
 #define AVS_OFFICESTUDIO_FILE_SPREADSHEET_XLTM			AVS_OFFICESTUDIO_FILE_SPREADSHEET + 0x0007
+
 #define AVS_OFFICESTUDIO_FILE_SPREADSHEET_XLSB			AVS_OFFICESTUDIO_FILE_SPREADSHEET + 0x0008
 #define AVS_OFFICESTUDIO_FILE_SPREADSHEET_ODS_FLAT		AVS_OFFICESTUDIO_FILE_SPREADSHEET + 0x0009
 #define AVS_OFFICESTUDIO_FILE_SPREADSHEET_OTS			AVS_OFFICESTUDIO_FILE_SPREADSHEET + 0x000a
 #define AVS_OFFICESTUDIO_FILE_SPREADSHEET_XLSX_FLAT		AVS_OFFICESTUDIO_FILE_SPREADSHEET + 0x000b
 #define AVS_OFFICESTUDIO_FILE_SPREADSHEET_XLSX_PACKAGE	AVS_OFFICESTUDIO_FILE_SPREADSHEET + 0x000c
 #define AVS_OFFICESTUDIO_FILE_SPREADSHEET_NUMBERS		AVS_OFFICESTUDIO_FILE_SPREADSHEET + 0x000d
-#define AVS_OFFICESTUDIO_FILE_SPREADSHEET_TSV			AVS_OFFICESTUDIO_FILE_SPREADSHEET + 0x0014
-#define AVS_OFFICESTUDIO_FILE_SPREADSHEET_SCSV			AVS_OFFICESTUDIO_FILE_SPREADSHEET + 0x0024
 
 #define AVS_OFFICESTUDIO_FILE_CROSSPLATFORM				0x0200
 #define AVS_OFFICESTUDIO_FILE_CROSSPLATFORM_PDF			AVS_OFFICESTUDIO_FILE_CROSSPLATFORM + 0x0001
@@ -137,7 +136,6 @@
 #define AVS_OFFICESTUDIO_FILE_OTHER_MS_MITCRYPTO		AVS_OFFICESTUDIO_FILE_OTHER + 0x000b
 #define AVS_OFFICESTUDIO_FILE_OTHER_MS_VBAPROJECT		AVS_OFFICESTUDIO_FILE_OTHER + 0x000c
 #define AVS_OFFICESTUDIO_FILE_OTHER_PACKAGE_IN_OLE		AVS_OFFICESTUDIO_FILE_OTHER + 0x000d
-#define AVS_OFFICESTUDIO_FILE_OTHER_COMPOUND			AVS_OFFICESTUDIO_FILE_OTHER + 0x000e
 
 #define AVS_OFFICESTUDIO_FILE_TEAMLAB					0x1000
 #define AVS_OFFICESTUDIO_FILE_TEAMLAB_DOCY				AVS_OFFICESTUDIO_FILE_TEAMLAB + 0x0001

Common/base.pri

@@ -33,7 +33,8 @@ OO_BUILD_BRANDING = $$(OO_BRANDING)
 OO_DESTDIR_BUILD_OVERRIDE = $$(DESTDIR_BUILD_OVERRIDE)
 
 win32 {
-	CURRENT_YEAR = $$system(powershell -NoLogo -NoProfile -Command "(Get-Date).Year")
+	CURRENT_YEAR = $$system(wmic PATH Win32_LocalTime GET ^Year /FORMAT:VALUE | find \"=\")
+	CURRENT_YEAR = $$replace(CURRENT_YEAR, "Year=", "")
 	CURRENT_YEAR = $$replace(CURRENT_YEAR, "\r", "")
 	CURRENT_YEAR = $$replace(CURRENT_YEAR, "\n", "")
 	CURRENT_YEAR = $$replace(CURRENT_YEAR, "\t", "")
@@ -44,7 +45,6 @@ win32 {
 }
 
 DEFINES += COPYRIGHT_YEAR=$${CURRENT_YEAR}
-#DEFINES += _LOGOUT_ALWAYS
 
 QMAKE_TARGET_COMPANY = $$PUBLISHER_NAME
 QMAKE_TARGET_COPYRIGHT = © $${PUBLISHER_NAME} $${CURRENT_YEAR}. All rights reserved.
@@ -118,13 +118,13 @@ win32:contains(QMAKE_TARGET.arch, arm64): {
 }
 
 linux-clang-libc++ {
-	CONFIG += core_linux
+    CONFIG += core_linux
 	CONFIG += core_linux_64
 	CONFIG += core_linux_clang
 	message("linux-64-clang-libc++")
 }
 linux-clang-libc++-32 {
-	CONFIG += core_linux
+    CONFIG += core_linux
 	CONFIG += core_linux_32
 	CONFIG += core_linux_clang
 	message("linux-32-clang-libc++")
@@ -180,9 +180,9 @@ mac {
 	!core_ios {
 		CONFIG += core_mac
 		CONFIG += core_mac_64
-	}
 
-	DEFINES += _LIBCPP_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION
+		DEFINES += _LIBCPP_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION
+	}
 }
 
 # DEFINES
@@ -199,58 +199,32 @@ core_win_64 {
 	DEFINES += WIN64 _WIN64
 }
 
-defineTest(startsWith) {
-    tmp = $$2
-    tmp ~= s,^$$re_escape($$1),,
-    !equals(tmp, $$2): return(true)
-    return(false)
-}
-
 core_linux {
 	DEFINES += LINUX _LINUX
 
-	QMAKE_CUSTOM_SYSROOT = $$(QMAKE_CUSTOM_SYSROOT)
-	!isEmpty(QMAKE_CUSTOM_SYSROOT) {
-		CONFIG += core_linix_use_sysroot
-		message("using custom sysroot $$QMAKE_CUSTOM_SYSROOT")
+    QMAKE_CUSTOM_SYSROOT = $$(QMAKE_CUSTOM_SYSROOT)
+	QMAKE_CUSTOM_SYSROOT_BIN = $$(QMAKE_CUSTOM_SYSROOT)/usr/bin/
 
-		QMAKE_CUSTOM_SYSROOT_BIN = $$(QMAKE_CUSTOM_SYSROOT_BIN)
-		isEmpty(QMAKE_CUSTOM_SYSROOT_BIN) {
-			QMAKE_CUSTOM_SYSROOT_BIN = $$QMAKE_CUSTOM_SYSROOT/usr/bin
+    core_linux_64 {
+	    !linux_arm64 { # x86_64
+		    QMAKE_CUSTOM_SYSROOT_LIB = $$(QMAKE_CUSTOM_SYSROOT)/usr/lib/x86_64-linux-gnu
+			!isEmpty(QMAKE_CUSTOM_SYSROOT) {
+			    message("using custom sysroot $$QMAKE_CUSTOM_SYSROOT")
+				QMAKE_CC          = $$join(QMAKE_CUSTOM_SYSROOT_BIN, , , "gcc")
+				QMAKE_CXX         = $$join(QMAKE_CUSTOM_SYSROOT_BIN, , , "g++")
+				QMAKE_LINK        = $$join(QMAKE_CUSTOM_SYSROOT_BIN, , , "g++")
+				QMAKE_LINK_SHLIB  = $$join(QMAKE_CUSTOM_SYSROOT_BIN, , , "g++")
+
+                QMAKE_CFLAGS      += --sysroot $$QMAKE_CUSTOM_SYSROOT
+				QMAKE_CXXFLAGS    += --sysroot $$QMAKE_CUSTOM_SYSROOT
+				QMAKE_LFLAGS      += --sysroot $$QMAKE_CUSTOM_SYSROOT
+			}
 		}
-		QMAKE_CUSTOM_SYSROOT_BIN = $$join(QMAKE_CUSTOM_SYSROOT_BIN, , , /)
-
-		startsWith($$QMAKE_CUSTOM_SYSROOT, $$QMAKE_CUSTOM_SYSROOT_BIN) {
-			message("Using compilers from same sysroot")
-			QMAKE_CC          = $$join(QMAKE_CUSTOM_SYSROOT_BIN, , , "gcc")
-			QMAKE_CXX         = $$join(QMAKE_CUSTOM_SYSROOT_BIN, , , "g++")
-			QMAKE_LINK        = $$join(QMAKE_CUSTOM_SYSROOT_BIN, , , "g++")
-			QMAKE_LINK_SHLIB  = $$join(QMAKE_CUSTOM_SYSROOT_BIN, , , "g++")
-			QMAKE_AR          = $$join(QMAKE_CUSTOM_SYSROOT_BIN, , , "ar") cqs
-			QMAKE_RANLIB      = $$join(QMAKE_CUSTOM_SYSROOT_BIN, , , "ranlib")
-			QMAKE_STRIP       = $$join(QMAKE_CUSTOM_SYSROOT_BIN, , , "strip")
-		} else {
-			message("Using cross-compilers from host sysroot")
-			QMAKE_CC          = $$join(QMAKE_CUSTOM_SYSROOT_BIN, , , "aarch64-linux-gnu-gcc")
-			QMAKE_CXX         = $$join(QMAKE_CUSTOM_SYSROOT_BIN, , , "aarch64-linux-gnu-g++")
-			QMAKE_LINK        = $$join(QMAKE_CUSTOM_SYSROOT_BIN, , , "aarch64-linux-gnu-g++")
-			QMAKE_LINK_SHLIB  = $$join(QMAKE_CUSTOM_SYSROOT_BIN, , , "aarch64-linux-gnu-g++")
-			QMAKE_AR          = $$join(QMAKE_CUSTOM_SYSROOT_BIN, , , "aarch64-linux-gnu-ar") cqs
-			QMAKE_RANLIB      = $$join(QMAKE_CUSTOM_SYSROOT_BIN, , , "aarch64-linux-gnu-ranlib")
-			QMAKE_STRIP       = $$join(QMAKE_CUSTOM_SYSROOT_BIN, , , "aarch64-linux-gnu-strip")
-			QMAKE_OBJCOPY     = $$join(QMAKE_CUSTOM_SYSROOT_BIN, , , "aarch64-linux-gnu-objcopy")
-		}
-
-		QMAKE_CFLAGS      += --sysroot=$$QMAKE_CUSTOM_SYSROOT
-		QMAKE_CXXFLAGS    += --sysroot=$$QMAKE_CUSTOM_SYSROOT -std=gnu++1y
-
-		QMAKE_LFLAGS      += --sysroot=$$QMAKE_CUSTOM_SYSROOT
-		QMAKE_INCDIR      += $$QMAKE_CUSTOM_SYSROOT/usr/include
 	}
 }
 
 gcc {
-	COMPILER_VERSION = $$system($$QMAKE_CXX " -dumpversion")
+    COMPILER_VERSION = $$system($$QMAKE_CXX " -dumpversion")
 	COMPILER_MAJOR_VERSION_ARRAY = $$split(COMPILER_VERSION, ".")
 	COMPILER_MAJOR_VERSION = $$member(COMPILER_MAJOR_VERSION_ARRAY, 0)
 	lessThan(COMPILER_MAJOR_VERSION, 5): CONFIG += build_gcc_less_5
@@ -280,11 +254,6 @@ core_mac {
 		QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.12
 		!apple_silicon:QMAKE_APPLE_DEVICE_ARCHS = x86_64
 	}
-
-	!core_debug {
-		equals(TEMPLATE, app):QMAKE_POST_LINK += strip $(TARGET)
-		# TODO: plugin!
-	}
 }
 
 core_linux_clang {
@@ -343,10 +312,6 @@ core_linux {
 core_linux {
 	equals(TEMPLATE, app):CONFIG += core_static_link_libstd
 	plugin:CONFIG += core_static_link_libstd
-
-
-	equals(TEMPLATE, app):QMAKE_LFLAGS_RELEASE += -Wl,-s
-	plugin:QMAKE_LFLAGS_RELEASE += -Wl,-s
 }
 
 core_win_32 {
@@ -356,7 +321,7 @@ core_win_64 {
 	CORE_BUILDS_PLATFORM_PREFIX = win_64
 }
 core_win_arm64 {
-	CORE_BUILDS_PLATFORM_PREFIX = win_arm64
+    CORE_BUILDS_PLATFORM_PREFIX = win_arm64
 }
 core_linux_32 {
 	CORE_BUILDS_PLATFORM_PREFIX = linux_32
@@ -378,6 +343,27 @@ core_linux_arm {
 linux_arm64 {
 	CORE_BUILDS_PLATFORM_PREFIX = linux_arm64
 	DEFINES += _ARM_ALIGN_
+
+	ARM64_TOOLCHAIN_BIN = $$(ARM64_TOOLCHAIN_BIN)
+	ARM64_TOOLCHAIN_BIN_PREFIX = $$(ARM64_TOOLCHAIN_BIN_PREFIX)
+
+	!isEmpty(ARM64_TOOLCHAIN_BIN){
+		!isEmpty(ARM64_TOOLCHAIN_BIN_PREFIX){
+			ARM64_TOOLCHAIN_BIN_FULL = $$ARM64_TOOLCHAIN_BIN/$$ARM64_TOOLCHAIN_BIN_PREFIX
+			message("using arm64 toolchain $$ARM64_TOOLCHAIN_BIN")
+
+			QMAKE_CC          = $$join(ARM64_TOOLCHAIN_BIN_FULL, , , "gcc")
+			QMAKE_CXX         = $$join(ARM64_TOOLCHAIN_BIN_FULL, , , "g++")
+			QMAKE_LINK        = $$join(ARM64_TOOLCHAIN_BIN_FULL, , , "g++")
+			QMAKE_LINK_SHLIB  = $$join(ARM64_TOOLCHAIN_BIN_FULL, , , "g++")
+
+			QMAKE_AR          = $$join(ARM64_TOOLCHAIN_BIN_FULL, , , "ar cqs")
+			QMAKE_OBJCOPY     = $$join(ARM64_TOOLCHAIN_BIN_FULL, , , "objcopy")
+			QMAKE_NM          = $$join(ARM64_TOOLCHAIN_BIN_FULL, , , "nm -P")
+			QMAKE_STRIP       = $$join(ARM64_TOOLCHAIN_BIN_FULL, , , "strip")
+
+		}
+	}
 }
 core_ios {
 	CORE_BUILDS_PLATFORM_PREFIX = ios
@@ -478,15 +464,6 @@ core_android {
 	!core_android_no_unistd {
 		DEFINES += HAVE_UNISTD_H HAVE_FCNTL_H
 	}
-
-	core_release {
-		QMAKE_CFLAGS += -g0
-		QMAKE_CXXFLAGS += -g0
-		QMAKE_LFLAGS += -Wl,-s
-
-		QMAKE_CFLAGS -= -fno-limit-debug-info
-		QMAKE_CXXFLAGS -= -fno-limit-debug-info
-	}
 }
 
 core_debug {
@@ -713,105 +690,3 @@ ADD_INC_PATH = $$(ADDITIONAL_INCLUDE_PATH)
 !disable_precompiled_header {
 	CONFIG += precompile_header
 }
-
-SWIFT_SOURCES=
-defineTest(UseSwift) {
-	isEmpty(SWIFT_SOURCES): return(false)
-	# work only on ios and mac
-	!core_ios:!core_mac {
-		return(false)
-	}
-
-	# path to the bridging header that exposes Objective-C code to Swift
-	BRIDGING_HEADER = $$1
-	# sdk and toolchain (set from environment variables)
-	SDK_PATH = $$(SDK_PATH)
-	XCODE_TOOLCHAIN_PATH = $$(XCODE_TOOLCHAIN_PATH)
-
-	IOS_TARGET_PLATFORM = apple-ios11.0
-	SWIFT_GEN_HEADERS_PATH = $$PWD_ROOT_DIR/core_build/$$CORE_BUILDS_PLATFORM_PREFIX/$$CORE_BUILDS_CONFIGURATION_PREFIX
-	ARCHS = arm64
-	# simulator
-	xcframework_platform_ios_simulator {
-		IOS_TARGET_PLATFORM = $${IOS_TARGET_PLATFORM}-simulator
-		SWIFT_GEN_HEADERS_PATH = $$SWIFT_GEN_HEADERS_PATH/simulator
-		ARCHS += x86_64
-	}
-
-	# add swift compiler for each architecture
-	SWIFT_COMPILERS_OUT =
-	for(ARCH, ARCHS) {
-		COMPILER_NAME = swift_compiler_$${ARCH}
-		COMPILER_OUTPUT = $$SWIFT_GEN_HEADERS_PATH/swift_module_$${ARCH}.o
-		SWIFT_COMPILERS_OUT += $$COMPILER_OUTPUT
-
-		$${COMPILER_NAME}.name = SwiftCompiler_$${ARCH}
-		$${COMPILER_NAME}.input = SWIFT_SOURCES
-		$${COMPILER_NAME}.output = $$COMPILER_OUTPUT
-		SWIFT_CMD = swiftc -c $$SWIFT_SOURCES \
-					-module-name SwiftModule \
-					-whole-module-optimization \
-					-emit-objc-header \
-					-emit-objc-header-path $$SWIFT_GEN_HEADERS_PATH/SwiftModule-Swift.h \
-					-emit-object \
-					-sdk $$SDK_PATH \
-					-target $${ARCH}-$${IOS_TARGET_PLATFORM} \
-					-o $$COMPILER_OUTPUT \
-					-framework UIKit
-
-		!isEmpty(BRIDGING_HEADER) {
-			SWIFT_CMD += -import-objc-header $$BRIDGING_HEADER
-		}
-
-		$${COMPILER_NAME}.commands = $$SWIFT_CMD
-		$${COMPILER_NAME}.CONFIG = combine target_predeps no_link
-
-		export($${COMPILER_NAME}.name)
-		export($${COMPILER_NAME}.input)
-		export($${COMPILER_NAME}.output)
-		export($${COMPILER_NAME}.commands)
-		export($${COMPILER_NAME}.CONFIG)
-		QMAKE_EXTRA_COMPILERS += $${COMPILER_NAME}
-	}
-
-	# add lipo tool execution to form universal binary
-	LIPO_OUT = $$SWIFT_GEN_HEADERS_PATH/swift_module.o
-	lipo_tool.name = LipoTool
-	# as input for lipo_tool we set SWIFT_SOURCES (not SWIFT_COMPILERS_OUT as it won't be executed otherwise!)
-	lipo_tool.input = SWIFT_SOURCES
-	# compiled swift sources go into depends
-	lipo_tool.depends = $$SWIFT_COMPILERS_OUT
-	lipo_tool.output = $$LIPO_OUT
-	lipo_tool.commands = lipo -create $$SWIFT_COMPILERS_OUT -output $$LIPO_OUT
-	lipo_tool.CONFIG = combine target_predeps no_link
-	lipo_tool.variable_out = OBJECTS
-
-	export(lipo_tool.name)
-	export(lipo_tool.input)
-	export(lipo_tool.depends)
-	export(lipo_tool.output)
-	export(lipo_tool.commands)
-	export(lipo_tool.CONFIG)
-	export(lipo_tool.variable_out)
-	QMAKE_EXTRA_COMPILERS += lipo_tool
-
-	export(QMAKE_EXTRA_COMPILERS)
-
-	INCLUDEPATH += $$SWIFT_GEN_HEADERS_PATH
-	export(INCLUDEPATH)
-
-	# link with libs from toolchain
-	SWIFT_LIB_PATH = $$XCODE_TOOLCHAIN_PATH/usr/lib/swift/iphoneos
-	xcframework_platform_ios_simulator {
-		SWIFT_LIB_PATH = $$XCODE_TOOLCHAIN_PATH/usr/lib/swift/iphonesimulator
-	}
-	LIBS += -L$$SWIFT_LIB_PATH
-	LIBS += -lswiftCore -lswiftFoundation -lswiftObjectiveC
-
-	export(LIBS)
-
-	OTHER_FILES += $$SWIFT_SOURCES
-	export(OTHER_FILES)
-	return(true)
-}
-

DesktopEditor/common/File.h

@@ -45,10 +45,6 @@
 #undef DeleteFile
 #endif
 
-#if defined(GetSystemDirectory)
-#undef GetSystemDirectory
-#endif
-
 #ifndef _BUILD_FILE_CROSSPLATFORM_H_
 #define _BUILD_FILE_CROSSPLATFORM_H_
 

DesktopEditor/common/Path.cpp

@@ -246,11 +246,6 @@ namespace NSSystemPath
 
 		wsNewPath.pop_back();
 
-		#if !defined(_WIN32) && !defined(_WIN64)
-		if (L'/' == strPath[0] || L'\\' == strPath[0])
-			return L'/' + wsNewPath;
-		#endif
-
 		return wsNewPath;
 	}
 	

DesktopEditor/common/StringBuilder.cpp

@@ -195,16 +195,6 @@ namespace NSStringUtils
 		m_pDataCur = m_pData;
 		m_lSizeCur = m_lSize;
 	}
-
-	CStringBuilder::CStringBuilder(size_t nSize)
-	{
-		m_lSize = nSize;
-		m_pData = (wchar_t*)malloc(m_lSize * sizeof(wchar_t));
-
-		m_lSizeCur = 0;
-		m_pDataCur = m_pData;
-		return;
-	}
 	CStringBuilder::~CStringBuilder()
 	{
 		if (NULL != m_pData)

DesktopEditor/common/StringBuilder.h

@@ -86,7 +86,6 @@ namespace NSStringUtils
 
 	public:
 		CStringBuilder();
-		CStringBuilder(size_t nSize);
 		virtual ~CStringBuilder();
 
 		virtual void AddSize(size_t nSize);

DesktopEditor/common/SystemUtils.h

@@ -29,11 +29,11 @@
  * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
  *
  */
-#pragma once
+#ifndef _SYSTEMUTILS_H
+#define _SYSTEMUTILS_H
 
 #include <string>
 #include "../../Common/kernel_config.h"
-#include "../../OdfFile/Common/logging.h"
 
 #define VALUE_STRINGIFY(d) L##d
 #define VALUE_TO_STR(v)    VALUE_STRINGIFY(v)
@@ -59,8 +59,7 @@ namespace NSSystemUtils
 	static const wchar_t* gc_EnvLastModifiedBy = L"LAST_MODIFIED_BY";
 	static const wchar_t* gc_EnvModified = L"MODIFIED";
 	static const wchar_t* gc_EnvMemoryLimit = L"X2T_MEMORY_LIMIT";
-	static const wchar_t* gc_EnvMemoryLimitDefault = L"4GiB";
-	static const wchar_t* gc_EnvSigningKeystorePassphrase = L"SIGNING_KEYSTORE_PASSPHRASE";
+	static const wchar_t* gc_EnvMemoryLimitDefault = L"3GiB";
 
 	KERNEL_DECL std::string GetEnvVariableA(const std::wstring& strName);
 	KERNEL_DECL std::wstring GetEnvVariable(const std::wstring& strName);
@@ -77,3 +76,4 @@ namespace NSSystemUtils
 	};
 	KERNEL_DECL std::wstring GetSystemDirectory(const SystemDirectoryType& type);
 }
+#endif // _SYSTEMUTILS_H

DesktopEditor/cximage/CxImage/tif_xfile.cpp

@@ -16,15 +16,7 @@
 static tsize_t 
 _tiffReadProcEx(thandle_t fd, tdata_t buf, tsize_t size)
 {
-	tsize_t nReadCount = (tsize_t)((CxFile*)fd)->Read(buf, 1, size);
-
-	if (nReadCount < size)
-	{
-		memset(static_cast<char*>(buf) + nReadCount, 0, size - nReadCount);
-		return size;
-	}
-
-	return nReadCount;
+	return (tsize_t)((CxFile*)fd)->Read(buf, 1, size);
 }
 
 static tsize_t

DesktopEditor/doctrenderer/docbuilder.python/src/docbuilder.py

@@ -26,7 +26,7 @@ def _loadLibrary(path):
         library_name = 'libdocbuilder.c.dylib'
         # if there is no dylib file, get library from framework
         if not os.path.exists(path + '/' + library_name):
-            path = path + '/docbuilder.c.framework/Versions/A'
+            path = path + '/docbuilder.c.framework'
             library_name = 'docbuilder.c'
 
     _lib = ctypes.CDLL(path + '/' + library_name)

DesktopEditor/doctrenderer/docbuilder_p.cpp

@@ -347,11 +347,11 @@ bool CV8RealTimeWorker::OpenFile(const std::wstring& sBasePath, const std::wstri
 	}
 
 	if (!bIsBreak)
-		bIsBreak = !this->ExecuteCommand(L"Asc.editor.asc_nativeInitBuilder();");
+		bIsBreak = !this->ExecuteCommand(L"Api.asc_nativeInitBuilder();");
 	if (!bIsBreak)
-		bIsBreak = !this->ExecuteCommand(L"Asc.editor.asc_SetSilentMode(true);");
+		bIsBreak = !this->ExecuteCommand(L"Api.asc_SetSilentMode(true);");
 	if (!bIsBreak)
-		bIsBreak = !this->ExecuteCommand(L"Asc.editor.asc_showComments();");
+		bIsBreak = !this->ExecuteCommand(L"Api.asc_showComments();");
 
 	LOGGER_SPEED_LAP("open");
 
@@ -425,7 +425,7 @@ bool CV8RealTimeWorker::SaveFileWithChanges(int type, const std::wstring& _path,
 		bIsSilentMode = true;
 
 	if (bIsSilentMode)
-		this->ExecuteCommand(L"Asc.editor.asc_SetSilentMode(false);", NULL, isEnterContext);
+		this->ExecuteCommand(L"Api.asc_SetSilentMode(false);", NULL, isEnterContext);
 
 	std::wstring strError;
 	bool bIsError = Doct_renderer_SaveFile_ForBuilder(_formatDst,
@@ -437,7 +437,7 @@ bool CV8RealTimeWorker::SaveFileWithChanges(int type, const std::wstring& _path,
 													  sJsonParams);
 
 	if (bIsSilentMode)
-		this->ExecuteCommand(L"Asc.editor.asc_SetSilentMode(true);", NULL, isEnterContext);
+		this->ExecuteCommand(L"Api.asc_SetSilentMode(true);", NULL, isEnterContext);
 
 	if (isEnterContext)
 		m_context->Exit();
@@ -1507,7 +1507,7 @@ namespace NSDoctRenderer
 					if (m_pInternal->m_oParams.m_bSaveWithDoctrendererMode)
 					{
 						// перед сохранением в такой схеме нужно скинуть изменения
-						this->ExecuteCommand(L"Asc.editor.asc_Save();");
+						this->ExecuteCommand(L"Api.asc_Save();");
 					}
 
 					const wchar_t* sParams = NULL;

DesktopEditor/doctrenderer/doctrenderer.cpp

@@ -287,10 +287,7 @@ namespace NSDoctRenderer
 
 			JSSmart<CJSObject> js_objectApi = api_js_maybe_null;
 			if (!js_objectApi.IsInit() || js_objectApi->isUndefined())
-			{
-				JSSmart<CJSObject> js_objectAsc = global_js->get("Asc")->toObject();
-				js_objectApi = js_objectAsc->get("editor")->toObject();
-			}
+				js_objectApi = global_js->get("Api")->toObject();
 
 			bool bIsBreak = false;
 			if (js_objectApi->isUndefined() || !js_objectApi->isObject())
@@ -690,8 +687,7 @@ namespace NSDoctRenderer
 						bIsBreak = true;
 					}
 
-					JSSmart<CJSObject> js_objectAsc = global_js->get("Asc")->toObject();
-					js_objectApi = js_objectAsc->get("editor")->toObject();
+					js_objectApi = global_js->get("Api")->toObject();
 					if (try_catch->Check())
 					{
 						strError = L"code=\"open\"";

DesktopEditor/doctrenderer/drawingfile.h

@@ -120,7 +120,7 @@ public:
 	}
 
 public:
-	bool OpenFile(const std::wstring& sFile, const wchar_t* sPassword)
+	bool OpenFile(const std::wstring& sFile, const std::wstring& sPassword)
 	{
 		CloseFile();
 
@@ -171,7 +171,7 @@ public:
 
 		return m_pFile ? true : false;
 	}
-	bool OpenFile(BYTE* data, LONG size, const wchar_t* sPassword)
+	bool OpenFile(BYTE* data, LONG size, const std::wstring& sPassword)
 	{
 		CloseFile();
 
@@ -245,18 +245,7 @@ public:
 
 		return 0;
 	}
-	bool CheckOwnerPassword(const wchar_t* sPassword)
-	{
-		if (m_nType == 0)
-			return ((CPdfFile*)m_pFile)->CheckOwnerPassword(sPassword);
-		return true;
-	}
-	bool CheckPerm(int nPerm)
-	{
-		if (m_nType == 0)
-			return ((CPdfFile*)m_pFile)->CheckPerm(nPerm);
-		return true;
-	}
+
 	BYTE* GetInfo()
 	{
 		NSWasm::CData oRes;
@@ -322,7 +311,7 @@ public:
 			return ((CPdfFile*)m_pFile)->UnmergePages();
 		return false;
 	}
-	bool RedactPage(int nPageIndex, double* arrRedactBox, int nLengthX8, BYTE* data, int size, bool bCopy = false)
+	bool RedactPage(int nPageIndex, double* arrRedactBox, int nLengthX4, BYTE* data, int size, bool bCopy = false)
 	{
 		if (m_nType == 0)
 		{
@@ -334,7 +323,7 @@ public:
 				data = pCopy;
 			}
 			// Захватывает полученную память data
-			return ((CPdfFile*)m_pFile)->RedactPage(nPageIndex, arrRedactBox, nLengthX8, data, size);
+			return ((CPdfFile*)m_pFile)->RedactPage(nPageIndex, arrRedactBox, nLengthX4, data, size);
 		}
 		return false;
 	}
@@ -454,20 +443,6 @@ public:
 		if (m_nType == 0)
 			((CPdfFile*)m_pFile)->SetCMapMemory(data, size);
 	}
-	void SetScanPageFonts(int nPageIndex)
-	{
-		if (NULL == m_pImageStorage)
-			m_pImageStorage = NSDocxRenderer::CreateWasmImageStorage();
-
-		CDocxRenderer oRenderer(m_pApplicationFonts);
-		oRenderer.SetExternalImageStorage(m_pImageStorage);
-		oRenderer.SetTextAssociationType(NSDocxRenderer::TextAssociationType::tatParagraphToShape);
-
-		oRenderer.ScanPageBin(m_pFile, nPageIndex);
-
-		if (m_nType == 0)
-			((CPdfFile*)m_pFile)->SetPageFonts(nPageIndex);
-	}
 	BYTE* ScanPage(int nPageIndex, int mode)
 	{
 		if (NULL == m_pImageStorage)
@@ -504,9 +479,6 @@ public:
 				return NULL;
 		}
 
-		if (m_nType == 0)
-			((CPdfFile*)m_pFile)->SetPageFonts(nPageIndex);
-
 		BYTE* res = oRes.GetBuffer();
 		oRes.ClearWithoutAttack();
 		return res;
@@ -595,19 +567,6 @@ public:
 		}
 		return NULL;
 	}
-	BYTE* GetGIDByUnicode(const std::string& sPathA)
-	{
-		if (m_nType != 0)
-			return NULL;
-		std::wstring sFontName = UTF8_TO_U(sPathA);
-		return ((CPdfFile*)m_pFile)->GetGIDByUnicode(sFontName);
-	}
-	BYTE* GetGIDByUnicode(const std::wstring& wsPathA)
-	{
-		if (m_nType != 0)
-			return NULL;
-		return ((CPdfFile*)m_pFile)->GetGIDByUnicode(wsPathA);
-	}
 
 	std::wstring GetFontBinaryNative(const std::wstring& sName)
 	{

DesktopEditor/doctrenderer/embed/DrawingFileEmbed.cpp

@@ -26,8 +26,7 @@ CDrawingFileEmbed::~CDrawingFileEmbed()
 
 JSSmart<CJSValue> CDrawingFileEmbed::OpenFile(JSSmart<CJSValue> sFile, JSSmart<CJSValue> sPassword)
 {
-	std::wstring wsPassword = sPassword->isString() ? sPassword->toStringW() : L"";
-	bool bResult = m_pFile->OpenFile(sFile->toStringW(), sPassword->isString() ? wsPassword.c_str() : NULL);
+	bool bResult = m_pFile->OpenFile(sFile->toStringW(), sPassword->isString() ? sPassword->toStringW() : L"");
 	return CJSContext::createBool(bResult);
 }
 JSSmart<CJSValue> CDrawingFileEmbed::CloseFile()
@@ -137,10 +136,6 @@ JSSmart<CJSValue> CDrawingFileEmbed::DestroyTextInfo()
 	m_pFile->DestroyTextInfo();
 	return CJSContext::createUndefined();
 }
-JSSmart<CJSValue> CDrawingFileEmbed::GetGIDByUnicode(JSSmart<CJSValue> sId)
-{
-	return WasmMemoryToJS(m_pFile->GetGIDByUnicode(sId->toStringW()));
-}
 JSSmart<CJSValue> CDrawingFileEmbed::IsNeedCMap()
 {
 	return CJSContext::createBool(false);
@@ -149,11 +144,6 @@ JSSmart<CJSValue> CDrawingFileEmbed::ScanPage(JSSmart<CJSValue> nPageIndex, JSSm
 {
 	return WasmMemoryToJS(m_pFile->ScanPage(nPageIndex->toInt32(), mode->toInt32()));
 }
-JSSmart<CJSValue> CDrawingFileEmbed::SetScanPageFonts(JSSmart<CJSValue> nPageIndex)
-{
-	m_pFile->SetScanPageFonts(nPageIndex->toInt32());
-	return CJSContext::createUndefined();
-}
 
 JSSmart<CJSValue> CDrawingFileEmbed::GetImageBase64(JSSmart<CJSValue> rId)
 {
@@ -236,7 +226,7 @@ JSSmart<CJSValue> CDrawingFileEmbed::RedactPage(JSSmart<CJSValue> nPageIndex, JS
 		JSSmart<CJSTypedArray> dataPtr = dataFiller->toTypedArray();
 		CJSDataBuffer buffer = dataPtr->getData();
 
-		result = m_pFile->RedactPage(pageIndex, pBox, nCountBox / 8, buffer.Data, (int)buffer.Len, true);
+		result = m_pFile->RedactPage(pageIndex, pBox, nCountBox / 4, buffer.Data, (int)buffer.Len);
 
 		if (pBox)
 			delete[] pBox;
@@ -252,17 +242,6 @@ JSSmart<CJSValue> CDrawingFileEmbed::UndoRedact()
 	return CJSContext::createBool(false);
 }
 
-JSSmart<CJSValue> CDrawingFileEmbed::CheckOwnerPassword(JSSmart<CJSValue> sPassword)
-{
-	std::wstring wsPassword = sPassword->isString() ? sPassword->toStringW() : L"";
-	bool bResult = m_pFile->CheckOwnerPassword(sPassword->isString() ? wsPassword.c_str() : NULL);
-	return CJSContext::createBool(bResult);
-}
-JSSmart<CJSValue> CDrawingFileEmbed::CheckPerm(JSSmart<CJSValue> nPerm)
-{
-	return CJSContext::createBool(m_pFile->CheckPerm(nPerm->toInt32()));
-}
-
 bool EmbedDrawingFile(JSSmart<NSJSBase::CJSContext>& context, IOfficeDrawingFile* pFile)
 {
 	CJSContext::Embed<CDrawingFileEmbed>(false);

DesktopEditor/doctrenderer/embed/DrawingFileEmbed.h

@@ -43,11 +43,9 @@ public:
 	JSSmart<CJSValue> GetFontBinary(JSSmart<CJSValue> Id);
 	JSSmart<CJSValue> GetGlyphs(JSSmart<CJSValue> nPageIndex);
 	JSSmart<CJSValue> DestroyTextInfo();
-	JSSmart<CJSValue> GetGIDByUnicode(JSSmart<CJSValue> sId);
 
 	JSSmart<CJSValue> IsNeedCMap();
 	JSSmart<CJSValue> ScanPage(JSSmart<CJSValue> nPageIndex, JSSmart<CJSValue> mode);
-	JSSmart<CJSValue> SetScanPageFonts(JSSmart<CJSValue> nPageIndex);
 
 	JSSmart<CJSValue> GetImageBase64(JSSmart<CJSValue> rId);
 
@@ -59,9 +57,6 @@ public:
 	JSSmart<CJSValue> RedactPage(JSSmart<CJSValue> nPageIndex, JSSmart<CJSValue> arrRedactBox, JSSmart<CJSValue> dataFiller);
 	JSSmart<CJSValue> UndoRedact();
 
-	JSSmart<CJSValue> CheckOwnerPassword(JSSmart<CJSValue> sPassword);
-	JSSmart<CJSValue> CheckPerm(JSSmart<CJSValue> nPerm);
-
 	DECLARE_EMBED_METHODS
 };
 

DesktopEditor/doctrenderer/embed/NativeControlEmbed.cpp

@@ -194,9 +194,6 @@ JSSmart<CJSValue> CNativeControlEmbed::ZipOpenBase64(JSSmart<CJSValue> name)
 
 JSSmart<CJSValue> CNativeControlEmbed::ZipFileAsString(JSSmart<CJSValue> name)
 {
-	if (m_pInternal->m_oZipWorker.m_sTmpFolder.empty())
-		return CJSContext::createUndefined();
-
 	BYTE* pData = NULL;
 	DWORD len = 0;
 	m_pInternal->m_oZipWorker.GetFileData(name->toStringW(), pData, len);
@@ -205,9 +202,6 @@ JSSmart<CJSValue> CNativeControlEmbed::ZipFileAsString(JSSmart<CJSValue> name)
 
 JSSmart<CJSValue> CNativeControlEmbed::ZipFileAsBinary(JSSmart<CJSValue> name)
 {
-	if (m_pInternal->m_oZipWorker.m_sTmpFolder.empty())
-		return CJSContext::createUndefined();
-
 	return CJSContext::createUint8Array(m_pInternal->m_oZipWorker.m_sTmpFolder + L"/" + name->toStringW());
 }
 

DesktopEditor/doctrenderer/embed/jsc/jsc_DrawingFileEmbed.mm

@@ -23,19 +23,13 @@
 -(JSValue*) GetFontBinary : (JSValue*)Id;
 -(JSValue*) GetGlyphs : (JSValue*)nPageIndex;
 -(JSValue*) DestroyTextInfo;
--(JSValue*) GetGIDByUnicode : (JSValue*)sId;
 -(JSValue*) IsNeedCMap;
 -(JSValue*) ScanPage : (JSValue*)nPageIndex : (JSValue*)mode;
--(JSValue*) SetScanPageFonts : (JSValue*)nPageIndex;
 -(JSValue*) GetImageBase64 : (JSValue*)rId;
 -(JSValue*) FreeWasmData : (JSValue*)typedArray;
 -(JSValue*) SplitPages : (JSValue*)arrPageIndexes : (JSValue*)data;
 -(JSValue*) MergePages : (JSValue*)data : (JSValue*)nMaxID : (JSValue*)sPrefixForm;
 -(JSValue*) UnmergePages;
--(JSValue*) RedactPage : (JSValue*)nPageIndex : (JSValue*)arrRedactBox : (JSValue*)dataFiller;
--(JSValue*) UndoRedact;
--(JSValue*) CheckOwnerPassword : (JSValue*)sPassword;
--(JSValue*) CheckPerm : (JSValue*)nPerm;
 @end
 
 @interface CJSCDrawingFileEmbed : NSObject<IJSCDrawingFileEmbed, JSEmbedObjectProtocol>
@@ -66,19 +60,13 @@ FUNCTION_WRAPPER_JS_6(GetAnnotationsAP, GetAnnotationsAP)
 FUNCTION_WRAPPER_JS_1(GetFontBinary, GetFontBinary)
 FUNCTION_WRAPPER_JS_1(GetGlyphs, GetGlyphs)
 FUNCTION_WRAPPER_JS_0(DestroyTextInfo, DestroyTextInfo)
-FUNCTION_WRAPPER_JS_1(GetGIDByUnicode, GetGIDByUnicode)
 FUNCTION_WRAPPER_JS_0(IsNeedCMap, IsNeedCMap)
 FUNCTION_WRAPPER_JS_2(ScanPage, ScanPage)
-FUNCTION_WRAPPER_JS_1(SetScanPageFonts, SetScanPageFonts)
 FUNCTION_WRAPPER_JS_1(GetImageBase64, GetImageBase64)
 FUNCTION_WRAPPER_JS_1(FreeWasmData, FreeWasmData)
 FUNCTION_WRAPPER_JS_2(SplitPages, SplitPages)
 FUNCTION_WRAPPER_JS_3(MergePages, MergePages)
 FUNCTION_WRAPPER_JS_0(UnmergePages, UnmergePages)
-FUNCTION_WRAPPER_JS_3(RedactPage, RedactPage)
-FUNCTION_WRAPPER_JS_0(UndoRedact, UndoRedact)
-FUNCTION_WRAPPER_JS_1(CheckOwnerPassword, CheckOwnerPassword)
-FUNCTION_WRAPPER_JS_1(CheckPerm, CheckPerm)
 @end
 
 class CDrawingFileEmbedAdapter : public CJSEmbedObjectAdapterJSC

DesktopEditor/doctrenderer/embed/v8/v8_DrawingFileEmbed.cpp

@@ -26,10 +26,8 @@ namespace NSDrawingFileEmbed
 	FUNCTION_WRAPPER_V8_1(_GetFontBinary, GetFontBinary)
 	FUNCTION_WRAPPER_V8_1(_GetGlyphs, GetGlyphs)
 	FUNCTION_WRAPPER_V8_0(_DestroyTextInfo, DestroyTextInfo)
-	FUNCTION_WRAPPER_V8_1(_GetGIDByUnicode, GetGIDByUnicode)
 	FUNCTION_WRAPPER_V8_0(_IsNeedCMap, IsNeedCMap)
 	FUNCTION_WRAPPER_V8_2(_ScanPage, ScanPage)
-	FUNCTION_WRAPPER_V8_1(_SetScanPageFonts, SetScanPageFonts)
 	FUNCTION_WRAPPER_V8_1(_GetImageBase64, GetImageBase64)
 	FUNCTION_WRAPPER_V8_1(_FreeWasmData, FreeWasmData)
 	FUNCTION_WRAPPER_V8_2(_SplitPages, SplitPages)
@@ -37,8 +35,6 @@ namespace NSDrawingFileEmbed
 	FUNCTION_WRAPPER_V8_0(_UnmergePages, UnmergePages)
 	FUNCTION_WRAPPER_V8_3(_RedactPage, RedactPage)
 	FUNCTION_WRAPPER_V8_0(_UndoRedact, UndoRedact)
-	FUNCTION_WRAPPER_V8_1(_CheckOwnerPassword, CheckOwnerPassword)
-	FUNCTION_WRAPPER_V8_1(_CheckPerm, CheckPerm)
 
 	v8::Handle<v8::ObjectTemplate> CreateTemplate(v8::Isolate* isolate)
 	{
@@ -64,19 +60,15 @@ namespace NSDrawingFileEmbed
 		NSV8Objects::Template_Set(result, "GetFontBinary",	_GetFontBinary);
 		NSV8Objects::Template_Set(result, "GetGlyphs",	_GetGlyphs);
 		NSV8Objects::Template_Set(result, "DestroyTextInfo",	_DestroyTextInfo);
-		NSV8Objects::Template_Set(result, "GetGIDByUnicode",	_GetGIDByUnicode);
 		NSV8Objects::Template_Set(result, "IsNeedCMap",	_IsNeedCMap);
 		NSV8Objects::Template_Set(result, "ScanPage",	_ScanPage);
-		NSV8Objects::Template_Set(result, "SetScanPageFonts",	_SetScanPageFonts);
 		NSV8Objects::Template_Set(result, "GetImageBase64",	_GetImageBase64);
 		NSV8Objects::Template_Set(result, "FreeWasmData",	_FreeWasmData);
 		NSV8Objects::Template_Set(result, "SplitPages",	_SplitPages);
 		NSV8Objects::Template_Set(result, "MergePages",	_MergePages);
 		NSV8Objects::Template_Set(result, "UnmergePages",	_UnmergePages);
-		NSV8Objects::Template_Set(result, "RedactPage",	_RedactPage);
+		NSV8Objects::Template_Set(result, "RedactPage", _RedactPage);
 		NSV8Objects::Template_Set(result, "UndoRedact",	_UndoRedact);
-		NSV8Objects::Template_Set(result, "CheckOwnerPassword",	_CheckOwnerPassword);
-		NSV8Objects::Template_Set(result, "CheckPerm",	_CheckPerm);
 
 		return handle_scope.Escape(result);
 	}

DesktopEditor/doctrenderer/js_internal/v8/v8_base.cpp

@@ -461,8 +461,6 @@ namespace NSJSBase
 		v8::SnapshotCreator snapshotCreator;
 		v8::Isolate* isolate = snapshotCreator.GetIsolate();
 		{
-			CV8TryCatch try_catch(isolate);
-
 			v8::HandleScope handle_scope(isolate);
 			// Create a new context
 			v8::Local<v8::Context> context = v8::Context::New(isolate);
@@ -474,12 +472,11 @@ namespace NSJSBase
 			global->Set(context, v8::String::NewFromUtf8Literal(isolate, "self"), global).Check();
 			global->Set(context, v8::String::NewFromUtf8Literal(isolate, "native"), v8::Undefined(isolate)).Check();
 
-			// Compile
+			// Compile and run
 			v8::Local<v8::String> source = v8::String::NewFromUtf8(isolate, script.c_str()).ToLocalChecked();
 			v8::Local<v8::Script> script = v8::Script::Compile(context, source).ToLocalChecked();
-			// Run
-			script->Run(context).IsEmpty();
 
+			script->Run(context).IsEmpty();
 			snapshotCreator.SetDefaultContext(context);
 		}
 		v8::StartupData data = snapshotCreator.CreateBlob(v8::SnapshotCreator::FunctionCodeHandling::kKeep);

DesktopEditor/doctrenderer/js_internal/v8/v8_base.h

@@ -62,13 +62,7 @@ v8::Local<v8::String> CreateV8String(v8::Isolate* i, const std::string& str);
 #include <android/log.h>
 #define  LOGW(...)  __android_log_print(ANDROID_LOG_WARN, "js", __VA_ARGS__)
 #define  LOGE(...)  __android_log_print(ANDROID_LOG_ERROR, "js", __VA_ARGS__)
-#ifdef _DEBUG
-#define  LOGD(...)  __android_log_print(ANDROID_LOG_DEBUG, "js", __VA_ARGS__)
-#else
-// should be disabled for release builds
-#define  LOGD(...)
-#endif	// _DEBUG
-#endif	// ANDROID_LOGS
+#endif
 
 #endif
 
@@ -805,9 +799,6 @@ namespace NSJSBase
 		CV8TryCatch() : CJSTryCatch(), try_catch(V8IsolateOneArg)
 		{
 		}
-		CV8TryCatch(v8::Isolate* isolate) : CJSTryCatch(), try_catch(isolate)
-		{
-		}
 		virtual ~CV8TryCatch()
 		{
 		}

DesktopEditor/fontengine/ApplicationFontsWorker.cpp

@@ -837,63 +837,53 @@ public:
 				CSymbolSimpleChecker2 oAllChecker(arSymbolsAll, nMaxSymbol);
 
 				std::map<std::wstring, int> mapFontsPriorityStandard;
-				int nCurrentPriority = 1;
-
-				#define SET_FONT_PRIORITY(fontName) mapFontsPriorityStandard.insert(std::pair<std::wstring, int>(fontName, nCurrentPriority++))
-
-				SET_FONT_PRIORITY(L"ASCW3");
-				SET_FONT_PRIORITY(L"Arial");
-				SET_FONT_PRIORITY(L"Times New Roman");
-				SET_FONT_PRIORITY(L"Tahoma");
-				SET_FONT_PRIORITY(L"Cambria");
-				SET_FONT_PRIORITY(L"Calibri");
-				SET_FONT_PRIORITY(L"Verdana");
-				SET_FONT_PRIORITY(L"Georgia");
-				SET_FONT_PRIORITY(L"Open Sans");
-				SET_FONT_PRIORITY(L"Liberation Sans");
-				SET_FONT_PRIORITY(L"Helvetica");
-				SET_FONT_PRIORITY(L"Nimbus Sans L");
-				SET_FONT_PRIORITY(L"DejaVu Sans");
-				SET_FONT_PRIORITY(L"Liberation Serif");
-				SET_FONT_PRIORITY(L"Trebuchet MS");
-				SET_FONT_PRIORITY(L"Courier New");
-				SET_FONT_PRIORITY(L"Carlito");
-				SET_FONT_PRIORITY(L"Segoe UI");
-				SET_FONT_PRIORITY(L"SimSun");
-				SET_FONT_PRIORITY(L"MS Gothic");
-				SET_FONT_PRIORITY(L"Nirmala UI");
-				SET_FONT_PRIORITY(L"Batang");
-				SET_FONT_PRIORITY(L"MS Mincho");
-				SET_FONT_PRIORITY(L"Wingdings");
-				SET_FONT_PRIORITY(L"Microsoft JhengHei");
-				SET_FONT_PRIORITY(L"Microsoft JhengHei UI");
-				SET_FONT_PRIORITY(L"Microsoft YaHei");
-				SET_FONT_PRIORITY(L"PMingLiU");
-				SET_FONT_PRIORITY(L"MingLiU");
-				SET_FONT_PRIORITY(L"DFKai-SB");
-				SET_FONT_PRIORITY(L"FangSong");
-				SET_FONT_PRIORITY(L"KaiTi");
-				SET_FONT_PRIORITY(L"SimKai");
-				SET_FONT_PRIORITY(L"SimHei");
-				SET_FONT_PRIORITY(L"Meiryo");
+				mapFontsPriorityStandard.insert(std::pair<std::wstring, int>(L"ASCW3", 1));
+				mapFontsPriorityStandard.insert(std::pair<std::wstring, int>(L"Arial", 2));
+				mapFontsPriorityStandard.insert(std::pair<std::wstring, int>(L"Times New Roman", 3));
+				mapFontsPriorityStandard.insert(std::pair<std::wstring, int>(L"Tahoma", 4));
+				mapFontsPriorityStandard.insert(std::pair<std::wstring, int>(L"Cambria", 5));
+				mapFontsPriorityStandard.insert(std::pair<std::wstring, int>(L"Calibri", 6));
+				mapFontsPriorityStandard.insert(std::pair<std::wstring, int>(L"Verdana", 7));
+				mapFontsPriorityStandard.insert(std::pair<std::wstring, int>(L"Georgia", 8));
+				mapFontsPriorityStandard.insert(std::pair<std::wstring, int>(L"Open Sans", 9));
+				mapFontsPriorityStandard.insert(std::pair<std::wstring, int>(L"Liberation Sans", 10));
+				mapFontsPriorityStandard.insert(std::pair<std::wstring, int>(L"Helvetica", 11));
+				mapFontsPriorityStandard.insert(std::pair<std::wstring, int>(L"Nimbus Sans L", 12));
+				mapFontsPriorityStandard.insert(std::pair<std::wstring, int>(L"DejaVu Sans", 13));
+				mapFontsPriorityStandard.insert(std::pair<std::wstring, int>(L"Liberation Serif", 14));
+				mapFontsPriorityStandard.insert(std::pair<std::wstring, int>(L"Trebuchet MS", 15));
+				mapFontsPriorityStandard.insert(std::pair<std::wstring, int>(L"Courier New", 16));
+				mapFontsPriorityStandard.insert(std::pair<std::wstring, int>(L"Carlito", 17));
+				mapFontsPriorityStandard.insert(std::pair<std::wstring, int>(L"Segoe UI", 18));
+				mapFontsPriorityStandard.insert(std::pair<std::wstring, int>(L"SimSun", 19));
+				mapFontsPriorityStandard.insert(std::pair<std::wstring, int>(L"MS Gothic", 20));
+				mapFontsPriorityStandard.insert(std::pair<std::wstring, int>(L"Nirmala UI", 21));
+				mapFontsPriorityStandard.insert(std::pair<std::wstring, int>(L"Batang", 22));
+				mapFontsPriorityStandard.insert(std::pair<std::wstring, int>(L"MS Mincho", 23));
+				mapFontsPriorityStandard.insert(std::pair<std::wstring, int>(L"Wingdings", 24));
+				mapFontsPriorityStandard.insert(std::pair<std::wstring, int>(L"Microsoft JhengHei", 25));
+				mapFontsPriorityStandard.insert(std::pair<std::wstring, int>(L"Microsoft JhengHei UI", 26));
+				mapFontsPriorityStandard.insert(std::pair<std::wstring, int>(L"Microsoft YaHei", 27));
+				mapFontsPriorityStandard.insert(std::pair<std::wstring, int>(L"PMingLiU", 28));
+				mapFontsPriorityStandard.insert(std::pair<std::wstring, int>(L"MingLiU", 29));
+				mapFontsPriorityStandard.insert(std::pair<std::wstring, int>(L"DFKai-SB", 30));
+				mapFontsPriorityStandard.insert(std::pair<std::wstring, int>(L"FangSong", 31));
+				mapFontsPriorityStandard.insert(std::pair<std::wstring, int>(L"KaiTi", 32));
+				mapFontsPriorityStandard.insert(std::pair<std::wstring, int>(L"SimKai", 33));
+				mapFontsPriorityStandard.insert(std::pair<std::wstring, int>(L"SimHei", 34));
+				mapFontsPriorityStandard.insert(std::pair<std::wstring, int>(L"Meiryo", 35));
 
 #ifdef _MAC
-				SET_FONT_PRIORITY(L"PingFang SC");
-				SET_FONT_PRIORITY(L"PingFang TC");
-				SET_FONT_PRIORITY(L"PingFang HK");
+				mapFontsPriorityStandard.insert(std::pair<std::wstring, int>(L"PingFang SC", 36));
+				mapFontsPriorityStandard.insert(std::pair<std::wstring, int>(L"PingFang TC", 37));
+				mapFontsPriorityStandard.insert(std::pair<std::wstring, int>(L"PingFang HK", 38));
 
-				SET_FONT_PRIORITY(L"Heiti SC");
-				SET_FONT_PRIORITY(L"Heiti TC");
-				SET_FONT_PRIORITY(L"Songti SC");
-				SET_FONT_PRIORITY(L"Songti TC");
+				mapFontsPriorityStandard.insert(std::pair<std::wstring, int>(L"Heiti SC", 39));
+				mapFontsPriorityStandard.insert(std::pair<std::wstring, int>(L"Heiti TC", 40));
+				mapFontsPriorityStandard.insert(std::pair<std::wstring, int>(L"Songti SC", 41));
+				mapFontsPriorityStandard.insert(std::pair<std::wstring, int>(L"Songti TC", 42));
 #endif
 
-				SET_FONT_PRIORITY(L"Malgun Gothic");
-				SET_FONT_PRIORITY(L"Nanum Gothic");
-				SET_FONT_PRIORITY(L"NanumGothic");
-				SET_FONT_PRIORITY(L"Noto Sans KR");
-				SET_FONT_PRIORITY(L"TakaoGothic");
-
 				NSFonts::CApplicationFontsSymbols oApplicationChecker;
 
 				// приоритеты шрифтов. по имени (все стили)

DesktopEditor/fontengine/ApplicationFontsWorker.h

@@ -36,7 +36,7 @@
 #include <vector>
 #include "../graphics/pro/Fonts.h"
 
-#define ONLYOFFICE_FONTS_VERSION     15
+#define ONLYOFFICE_FONTS_VERSION     14
 #define ONLYOFFICE_ALL_FONTS_VERSION 2
 
 class CApplicationFontsWorkerBreaker

DesktopEditor/fontengine/FontFile.cpp

@@ -731,10 +731,10 @@ void CFontFile::CheckHintsSupport()
 int CFontFile::SetCMapForCharCode(long lUnicode, int *pnCMapIndex)
 {
 	*pnCMapIndex = -1;
-	if (!m_pFace || !m_pFace->num_charmaps)
+	if (!m_pFace)
 		return 0;
 
-	if ( m_bStringGID )
+	if ( m_bStringGID || 0 == m_pFace->num_charmaps )
 		return lUnicode;
 
 	int nCharIndex = 0;
@@ -1046,28 +1046,6 @@ int CFontFile::GetGIDByUnicode(int code)
 	return unGID;
 }
 
-int CFontFile::GetUnicodeByGID(int gid)
-{
-	if (!m_pFace)
-		return 0;
-
-	FT_ULong charcode;
-	FT_UInt gindex;
-
-	charcode = FT_Get_First_Char(m_pFace, &gindex);
-
-	while (gindex != 0)
-	{
-		if (gindex == gid)
-		{
-			return charcode;
-		}
-		charcode = FT_Get_Next_Char(m_pFace, charcode, &gindex);
-	}
-
-	return 0;
-}
-
 INT CFontFile::GetString(CGlyphString& oString)
 {
 	int nCountGlyph = oString.GetLength();

DesktopEditor/fontengine/FontFile.h

@@ -254,7 +254,6 @@ public:
 	double GetCharWidth(int gid);
 
 	int GetGIDByUnicode(int code);
-	int GetUnicodeByGID(int gid);
 
 	int GetKerning(FT_UInt unPrevGID, FT_UInt unGID);
 	void SetStringGID(const INT& bGID);

DesktopEditor/fontengine/FontManager.cpp

@@ -851,14 +851,6 @@ unsigned int CFontManager::GetGIDByUnicode(const unsigned int& unCode)
 
 	return m_pFont->GetGIDByUnicode(unCode);
 }
-int CFontManager::GetUnicodeByGID(const int& gid)
-{
-	if (!m_pFont)
-		return 0;
-
-	return m_pFont->GetUnicodeByGID(gid);
-}
-
 void CFontManager::SetSubpixelRendering(const bool& hmul, const bool& vmul)
 {
 	if (hmul)

DesktopEditor/fontengine/FontManager.h

@@ -186,7 +186,6 @@ public:
 	virtual std::wstring GetFontType();
 	virtual unsigned int GetNameIndex(const std::wstring& wsName);
 	virtual unsigned int GetGIDByUnicode(const unsigned int& unCode);
-	virtual int GetUnicodeByGID(const int& gid);
 
 	virtual void SetSubpixelRendering(const bool& hmul, const bool& vmul);
 

DesktopEditor/fontengine/js/cpp/text.cpp

@@ -117,7 +117,7 @@ WASM_EXPORT unsigned int ASC_FT_SetCMapForCharCode(FT_Face face, unsigned int un
 		return 0;
 
 	if ( 0 == face->num_charmaps )
-		return 0;
+		return unicode;
 
 	unsigned int nCharIndex = 0;
 

DesktopEditor/fontengine/js/libfont.json

@@ -265,15 +265,15 @@
 	},
 	{
 		"folder": "../../",
-		"files": ["graphics/Image.cpp", "raster/BgraFrame.cpp", "raster/ImageFileFormatChecker.cpp", "graphics/Matrix.cpp", "graphics/GraphicsPath.cpp"]
+		"files": ["graphics/Image.cpp", "raster/BgraFrame.cpp", "raster/ImageFileFormatChecker.cpp", "graphics/Matrix.cpp"]
 	},
 	{
 		"folder": "../../agg-2.4/src/",
-		"files": ["agg_trans_affine.cpp", "agg_bezier_arc.cpp"]
+		"files": ["agg_trans_affine.cpp"]
 	},
 	{
 		"folder": "../../raster/",
-		"files": ["PICT/PICFile.cpp"]
+		"files": ["PICT/PICFile.cpp", "PICT/pic.cpp"]
 	},
 	{
 		"folder": "../../graphics/pro/js/qt/raster",

DesktopEditor/graphics/BooleanOperations.cpp

@@ -85,13 +85,6 @@ bool Segment::IsEmpty() const noexcept
 	return Id == 0 && Index == -1 && P.IsZero() && HI.IsZero() && HO.IsZero();
 }
 
-bool Segment::Equals(const Segment& other) const noexcept
-{
-	return isZero(P.X - other.P.X) && isZero(P.Y - other.P.Y) &&
-		   isZero(HI.X - other.HI.X) && isZero(HI.Y - other.HI.Y) &&
-		   isZero(HO.X - other.HO.X) && isZero(HO.Y - other.HO.Y);
-}
-
 bool Segment::operator==(const Segment& other) const noexcept
 {
 	return (Index == other.Index) && (Id == other.Id);
@@ -697,12 +690,6 @@ bool Curve::IsStraight() const noexcept
 	return !Segment2.IsCurve;
 }
 
-bool Curve::Equals(const Curve& other) const noexcept
-{
-	return Segment1.Equals(other.Segment1) &&
-		   Segment2.Equals(other.Segment2);
-}
-
 bool Curve::operator==(const Curve& other) const noexcept
 {
 	return Segment1 == other.Segment1 &&
@@ -750,13 +737,11 @@ CBooleanOperations::CBooleanOperations(const CGraphicsPath& path1,
 									   const CGraphicsPath& path2,
 									   BooleanOpType op,
 									   long fillType,
-									   bool isLuminosity,
-									   bool isSelf) :
+									   bool isLuminosity) :
 	Op(op),
 	Close1(path1.Is_poly_closed()),
 	Close2(path2.Is_poly_closed()),
 	IsLuminosity(isLuminosity),
-	IsSelf(isSelf),
 	FillType(fillType),
 	Path1(path1),
 	Path2(path2)
@@ -783,25 +768,16 @@ bool CBooleanOperations::IsSelfInters(const CGraphicsPath& p)
 
 	GetIntersection();
 
-	if (Locations.empty())
-		return false;
-	else
-	{
-		for (const auto& l : Locations)
-		{
-			if (!isZero(l->Time) && !isZero(l->Time - 1.0) && l->C.Segment2.Index != l->Inters->C.Segment1.Index)
-				return true;
-		}
-	}
-	return false;
+	return !Locations.empty();
 }
 
 void CBooleanOperations::TraceBoolean()
 {
 	bool reverse = false;
+	bool self = Path1 == Path2;
 	if (((Op == Subtraction || Op == Exclusion) ^
 		 Path1.IsClockwise() ^
-		 Path2.IsClockwise()) && !IsSelf)
+		 Path2.IsClockwise()) && !self)
 		reverse = true;
 
 	PreparePath(Path1, 1, Segments1, Curves1);
@@ -812,7 +788,7 @@ void CBooleanOperations::TraceBoolean()
 
 	GetIntersection();
 
-	if (IsSelf)
+	if (self)
 	{
 		if (Op == Subtraction)
 			return;
@@ -837,13 +813,8 @@ void CBooleanOperations::TraceBoolean()
 		CreateNewPath(adj_matr);
 		return;
 	}
-	else if (Path1 == Path2)
-	{
-		Result = std::move(Path1);
-		return;
-	}
 
-	if (!Locations.empty() && !IsOnlyEnds())
+	if (!Locations.empty())
 	{
 		int length = static_cast<int>(Locations.size());
 		for (int i = 0; i < length; i++)
@@ -1217,10 +1188,7 @@ void CBooleanOperations::TracePaths()
 				Segment tmp = GetNextSegment(prev.Inters->S);
 				if (tmp.IsEmpty()) break;
 				if (tmp.IsValid(Op))
-				{
 					s = tmp;
-					valid = true;
-				}
 			}
 
 			if (!valid && prev.Inters)
@@ -1451,7 +1419,7 @@ void CBooleanOperations::CreateNewPath(const std::vector<std::vector<int>>& adjM
 			break;
 
 		auto add_seg = [&](int x, int prev_x) {
-			for (int j = adjMatr[x].size() - 1; j >= 0; j--)
+			for (size_t j = adjMatr[x].size() - 1; j >= 0; j--)
 			{
 				int ver = adjMatr[x][j];
 				if (seg_visited[ver] || ver == prev_x)
@@ -1546,7 +1514,7 @@ void CBooleanOperations::CreateNewPath(const std::vector<std::vector<int>>& adjM
 						return j;
 					}
 				}
-				x = (x >= Curves1.size() - 1) ? 0 : x + 1;
+				x = x + 1;
 				prev_x = -1;
 				if (Curves1[x].Segment2.IsCurve)
 					Result.CurveTo(Curves1[x].Segment2.HI.X + Curves1[x].Segment2.P.X, Curves1[x].Segment2.HI.Y + Curves1[x].Segment2.P.Y,
@@ -1858,7 +1826,7 @@ void CBooleanOperations::GetCurveIntersection(const Curve& curve1, const Curve&
 				AddCurveIntersection(flip ? curve2 : curve1, flip ? curve1 : curve2,
 									 flip ? curve2 : curve1, flip ? curve1 : curve2, flip);
 
-			if (Locations.size() == before && (!straight /*|| Locations.empty()*/))
+			if (Locations.size() == before && (!straight || Locations.empty()))
 			{
 				double t = curve2.GetTimeOf(curve1.Segment1.P);
 				if (t != -1.0)
@@ -2071,27 +2039,17 @@ bool CBooleanOperations::IsInside(const Segment& segment) const
 
 void CBooleanOperations::SetWinding()
 {
-	if (Locations.empty() || (Locations.size() == 2 && Locations[0]->Ends) || IsOnlyEnds())
+	if (Locations.empty() || (Locations.size() == 2 && Locations[0]->Ends))
 	{
-		Segment s1 = Segments1[0], s2 = Segments2[0];
+		Segment s1, s2;
 
 		for (const auto& s : Segments1)
-		{
-			bool skip = false;
-			for (const auto& ss : Segments2)
-				skip = skip || !s.Equals(ss);
-			if (!s.Inters && !skip)
+			if (!s.Inters)
 				s1 = s;
-		}
 
 		for (const auto& s : Segments2)
-		{
-			bool skip = false;
-			for (const auto& ss : Segments1)
-				skip = skip || !s.Equals(ss);
-			if (!s.Inters && !skip)
+			if (!s.Inters)
 				s2 = s;
-		}
 
 		bool winding = IsInside(s1);
 
@@ -2308,8 +2266,8 @@ bool CBooleanOperations::IsOneCurvePath(int pathIndex) const noexcept
 void CBooleanOperations::AddLocation(Curve curve1, Curve curve2, double t1,
 									 double t2, bool overlap, bool filter, bool ends)
 {
-	bool	excludeStart = !overlap &&	GetPreviousCurve(curve1).Equals(curve2),
-			excludeEnd = !overlap && curve1 != curve2 && GetNextCurve(curve1).Equals(curve2);
+	bool	excludeStart = !overlap &&	GetPreviousCurve(curve1) == curve2,
+			excludeEnd = !overlap && curve1 != curve2 && GetNextCurve(curve1) == curve2;
 	double	tMin = CURVETIME_EPSILON,
 			tMax = 1 - tMin;
 
@@ -2368,18 +2326,6 @@ bool CBooleanOperations::CheckLocation(std::shared_ptr<Location> loc, bool start
 	return false;
 }
 
-bool CBooleanOperations::IsOnlyEnds() const noexcept
-{
-	bool onlyEnds1 = true;
-	bool onlyEnds2 = true;
-	for (const auto& l : Locations)
-	{
-		onlyEnds1 = onlyEnds1 && l->Ends;
-		onlyEnds2 = onlyEnds2 && l->Inters->Ends;
-	}
-	return onlyEnds1 || onlyEnds2;
-}
-
 CGraphicsPath CalcBooleanOperation(const CGraphicsPath& path1,
 								   const CGraphicsPath& path2,
 								   BooleanOpType op,
@@ -2389,19 +2335,17 @@ CGraphicsPath CalcBooleanOperation(const CGraphicsPath& path1,
 	std::vector<CGraphicsPath>	paths1 = path1.GetSubPaths(),
 								paths2 = path2.GetSubPaths(),
 								paths;
-	int skip_end1 = -1;
+
 	for (size_t i = 0; i < paths2.size(); i++)
 	{
-		int  skip_end2 = -1;
 		CBooleanOperations o;
-		if (i > skip_end2 && o.IsSelfInters(paths2[i]))
+		if (o.IsSelfInters(paths2[i]))
 		{
-			CBooleanOperations operation(paths2[i], paths2[i], Intersection, fillType, isLuminosity, true);
+			CBooleanOperations operation(paths2[i], paths2[i], Intersection, fillType, isLuminosity);
 			CGraphicsPath p = std::move(operation.GetResult());
 
 			std::vector<CGraphicsPath> tmp_paths = p.GetSubPaths();
 			paths2[i] = tmp_paths[0];
-			skip_end2 = i + tmp_paths.size() - 1;
 			for (size_t k = 1; k < tmp_paths.size(); k++)
 				paths2.insert(paths2.begin() + i + k, tmp_paths[k]);
 		}
@@ -2409,19 +2353,18 @@ CGraphicsPath CalcBooleanOperation(const CGraphicsPath& path1,
 		for (size_t j = 0; j < paths1.size(); j++)
 		{
 			CBooleanOperations o2;
-			if (j > skip_end1 && o2.IsSelfInters(paths1[j]))
+			if (o2.IsSelfInters(paths1[j]))
 			{
-				CBooleanOperations operation(paths1[j], paths1[j], Intersection, fillType, isLuminosity, true);
+				CBooleanOperations operation(paths1[j], paths1[j], Intersection, fillType, isLuminosity);
 				CGraphicsPath p = std::move(operation.GetResult());
 
 				std::vector<CGraphicsPath> tmp_paths = p.GetSubPaths();
 				paths1[j] = tmp_paths[0];
-				skip_end1 = j + tmp_paths.size() - 1;
 				for (size_t k = 1; k < tmp_paths.size(); k++)
 					paths1.insert(paths1.begin() + i + k, tmp_paths[k]);
 			}
 
-			CBooleanOperations operation(paths1[j], paths2[i], op, fillType, isLuminosity, false);
+			CBooleanOperations operation(paths1[j], paths2[i], op, fillType, isLuminosity);
 			paths.push_back(operation.GetResult());
 		}
 
@@ -2435,17 +2378,17 @@ CGraphicsPath CalcBooleanOperation(const CGraphicsPath& path1,
 	return op == Subtraction ? CGraphicsPath(paths1) : CGraphicsPath(paths);
 }
 
-// For Unit-tests
-bool CGraphicsPath::Equals(const CGraphicsPath& other) noexcept
+//For unit-tests
+bool CGraphicsPath::operator==(const CGraphicsPath& other) noexcept
 {
 	unsigned pointsCount = GetPointCount(),
-		otherPointsCount = other.GetPointCount();
+			 otherPointsCount = other.GetPointCount();
 
 	if (pointsCount != otherPointsCount)
 		return false;
 
 	std::vector<PointD> points = GetPoints(0, pointsCount),
-		otherPoints = other.GetPoints(0, otherPointsCount);
+						otherPoints = other.GetPoints(0, otherPointsCount);
 
 	for (unsigned i = 0; i < pointsCount; i++)
 		if (getDistance(points[i], otherPoints[i]) > POINT_EPSILON)

DesktopEditor/graphics/BooleanOperations.h

@@ -37,7 +37,6 @@ namespace Aggplus
 
 		bool IsValid(const BooleanOpType& op) const noexcept;
 		bool IsEmpty() const noexcept;
-		bool Equals(const Segment& other)	  const noexcept;
 		bool operator==(const Segment& other) const noexcept;
 		bool operator!=(const Segment& other) const noexcept;
 	};
@@ -83,7 +82,6 @@ namespace Aggplus
 		void Flip() noexcept;
 
 		bool IsStraight()	const noexcept;
-		bool Equals(const Curve& other)		const noexcept;
 		bool operator==(const Curve& other) const noexcept;
 		bool operator!=(const Curve& other) const noexcept;
 	};
@@ -110,7 +108,7 @@ namespace Aggplus
 	{
 	public:
 		CBooleanOperations() {};
-		CBooleanOperations(const CGraphicsPath& path1, const CGraphicsPath& path2, BooleanOpType op, long fillType, bool isLuminosity, bool isSelf);
+		CBooleanOperations(const CGraphicsPath& path1, const CGraphicsPath& path2, BooleanOpType op, long fillType, bool isLuminosity);
 		~CBooleanOperations();
 		CGraphicsPath&& GetResult();
 		bool IsSelfInters(const CGraphicsPath& p);
@@ -161,7 +159,6 @@ namespace Aggplus
 		bool IsOneCurvePath(int pathIndex) const noexcept;
 		void AddOffsets(std::vector<double>& offsets, const Curve& curve, bool end);
 		bool CheckLocation(std::shared_ptr<Location> loc, bool start) const noexcept;
-		bool IsOnlyEnds() const noexcept;
 
 	private:
 		BooleanOpType Op = Intersection;
@@ -169,7 +166,6 @@ namespace Aggplus
 		bool Close1 = true;
 		bool Close2 = true;
 		bool IsLuminosity = false;
-		bool IsSelf = false;
 
 		// c_nStroke, c_nWindingFillMode, c_nEvenOddFillMode
 		long FillType = c_nWindingFillMode;

DesktopEditor/graphics/Brush.cpp

@@ -419,7 +419,6 @@ namespace Aggplus
 		m_bReleaseImage = FALSE;
 		Alpha = 255;
         m_bUseBounds = false;
-		m_bIsScale = false;
 	}
 
 	CBrushTexture::CBrushTexture(const std::wstring& strName, WrapMode wrapMode) : CBrush(BrushTypeTextureFill), m_wrapMode(wrapMode)
@@ -428,7 +427,6 @@ namespace Aggplus
 		m_bReleaseImage = TRUE;
 		Alpha = 255;
         m_bUseBounds = false;
-		m_bIsScale = false;
 	}
 
 	CBrushTexture::CBrushTexture(CImage *pImage, WrapMode wrapMode) : CBrush(BrushTypeTextureFill), m_wrapMode(wrapMode)
@@ -437,7 +435,6 @@ namespace Aggplus
 		m_bReleaseImage = FALSE;
 		Alpha = 255;
         m_bUseBounds = false;
-		m_bIsScale = false;
 	}
 	
 	CBrushTexture::~CBrushTexture() 

DesktopEditor/graphics/Brush.h

@@ -205,10 +205,6 @@ public:
 	bool m_bUseBounds;
 	CDoubleRect m_oBounds;
 
-	bool m_bIsScale;
-	double m_dScaleX;
-	double m_dScaleY;
-
 	BYTE Alpha;
 };
 }

DesktopEditor/graphics/Graphics.cpp

@@ -847,8 +847,6 @@ namespace Aggplus
 				double dScaleY = m_dDpiY / m_dDpiTile;
 
 				brushMatrix.Scale(dScaleX, dScaleY, Aggplus::MatrixOrderAppend);
-				if (ptxBrush->m_bIsScale)
-					brushMatrix.Scale(ptxBrush->m_dScaleX, ptxBrush->m_dScaleY, Aggplus::MatrixOrderAppend);
 			}
 
 			brushMatrix.Translate(x, y, Aggplus::MatrixOrderAppend);
@@ -2144,12 +2142,7 @@ namespace Aggplus
 			agg::trans_affine* full_trans = &m_oFullTransform.m_internal->m_agg_mtx;
 			double dDet = full_trans->determinant();
 
-			double sx = sqrt(full_trans->sx * full_trans->sx + full_trans->shx * full_trans->shx);
-			double sy = sqrt(full_trans->shy * full_trans->shy + full_trans->sy * full_trans->sy);
-			double scale = std::max(sx, sy);
-			double adaptive_threshold = 1.0 / (scale * scale * 10000.0);
-
-			if (fabs(dDet) < std::max(0.0001, adaptive_threshold))
+			if (fabs(dDet) < 0.0001)
 			{
 				path_copy.transform_all_paths(m_oFullTransform.m_internal->m_agg_mtx);
 				dWidth *= sqrt(fabs(dDet));
@@ -2247,8 +2240,6 @@ namespace Aggplus
 				LONG lCount2	= lCount / 2;
 
 				double dKoef = 1.0;
-				if (bIsUseIdentity)
-					dKoef = sqrt(fabs(m_oFullTransform.m_internal->m_agg_mtx.determinant()));
 
 				for (LONG i = 0; i < lCount2; ++i)
 				{

DesktopEditor/graphics/GraphicsPath.cpp

@@ -76,7 +76,7 @@ namespace Aggplus
 						j += 2;
 					}
 				}
-				//if (p.Is_poly_closed()) CloseFigure();
+				if (p.Is_poly_closed()) CloseFigure();
 			}
 		}
 	}
@@ -886,17 +886,17 @@ namespace Aggplus
 		if (isCurve)
 		{
 			std::vector<PointD> points = GetPoints(idx, 4);
-			area = 3.0 * ((points[3].Y - points[0].Y) * (points[1].X + points[2].X)
-						  - (points[3].X - points[0].X) * (points[1].Y + points[2].Y)
-						  + points[1].Y * (points[0].X - points[2].X)
-						  - points[1].X * (points[0].Y - points[2].Y)
-						  + points[3].Y * (points[2].X + points[0].X / 3.0)
-						  - points[3].X * (points[2].Y + points[0].Y / 3.0)) / 20.0;
+			area = (points[3].Y - points[0].Y) * (points[1].X + points[2].X)
+					- (points[3].X - points[0].X) * (points[1].Y + points[2].Y)
+					+ points[1].Y * (points[0].X - points[2].X)
+					- points[1].X * (points[0].Y - points[2].Y)
+					+ points[3].Y * (points[2].X + points[0].X / 3.0)
+					- points[3].X * (points[2].Y + points[0].Y / 3.0);
 		}
 		else
 		{
 			std::vector<PointD> points = GetPoints(idx, 2);
-			area = (points[1].Y * points[0].X - points[1].X * points[0].Y) / 2.0;
+			area = 4.0 * (points[1].Y * points[0].X - points[1].X * points[0].Y) / 3.0;
 		}
 
 		return area;
@@ -917,11 +917,14 @@ namespace Aggplus
 					PointD firstPoint = subPath.GetPoints(0, 1)[0];
 					double x, y;
 					subPath.GetLastPoint(x, y);
-					if ((abs(firstPoint.X - x) >= 1e-2 || abs(firstPoint.Y - y) >= 1e-2) ||
+					if ((abs(firstPoint.X - x) <= 1e-2 && abs(firstPoint.Y - y) <= 1e-2) ||
 						subPath.GetPointCount() == 1)
-						subPath.LineTo(firstPoint.X, firstPoint.Y);
+					{
+						if (!firstPoint.Equals(PointD(x, y)) || subPath.GetPointCount() == 1)
+							subPath.LineTo(firstPoint.X, firstPoint.Y);
+						subPath.CloseFigure();
+					}
 
-					subPath.CloseFigure();
 					result.push_back(subPath);
 					subPath.Reset();
 				}
@@ -949,7 +952,7 @@ namespace Aggplus
 				double x, y;
 				subPath.GetLastPoint(x, y);
 
-				if ((abs(firstPoint.X - x) >= 1e-2 || abs(firstPoint.Y - y) >= 1e-2) || subPath.GetPointCount() == 1)
+				if (!firstPoint.Equals(PointD(x, y)) || subPath.GetPointCount() == 1)
 					subPath.LineTo(firstPoint.X, firstPoint.Y);
 
 				subPath.CloseFigure();
@@ -1003,26 +1006,6 @@ namespace Aggplus
 
 		return *this;
 	}
-
-	bool CGraphicsPath::operator==(const CGraphicsPath& other) noexcept
-	{
-		unsigned pointsCount = GetPointCount(),
-				 otherPointsCount = other.GetPointCount();
-
-		if (pointsCount != otherPointsCount)
-			return false;
-
-		std::vector<PointD> points = GetPoints(0, pointsCount),
-							otherPoints = other.GetPoints(0, otherPointsCount);
-
-		bool reverse = IsClockwise() ^ other.IsClockwise();
-
-		for (unsigned i = 0; i < pointsCount; i++)
-			if (!points[i].Equals(otherPoints[reverse ? pointsCount - i - 1 : i]))
-				return false;
-
-		return true;
-	}
 }
 
 namespace Aggplus
@@ -1551,31 +1534,3 @@ namespace Aggplus
 		return false;
 	}
 }
-
-HRESULT IRenderer::AddPath(const Aggplus::CGraphicsPath& path)
-{
-	if (path.GetPointCount() == 0)
-		return S_FALSE;
-
-	size_t length = path.GetPointCount() + path.GetCloseCount();
-	std::vector<Aggplus::PointD> points = path.GetPoints(0, length);
-
-	for (size_t i = 0; i < length; i++)
-	{
-		if (path.IsCurvePoint(i))
-		{
-			PathCommandCurveTo(points[i].X, points[i].Y,
-							   points[i + 1].X, points[i + 1].Y,
-							   points[i + 2].X, points[i + 2].Y);
-			i += 2;
-		}
-		else if (path.IsMovePoint(i))
-			PathCommandMoveTo(points[i].X, points[i].Y);
-		else if (path.IsLinePoint(i))
-			PathCommandLineTo(points[i].X, points[i].Y);
-		else
-			PathCommandClose();
-	}
-
-	return S_OK;
-}

DesktopEditor/graphics/GraphicsPath.h

@@ -117,7 +117,6 @@ namespace Aggplus
 		std::vector<PointD>  GetPoints(unsigned idx, unsigned count) const noexcept;
 		std::vector<CGraphicsPath> GetSubPaths() const;
 
-		bool Equals(const CGraphicsPath& other)	noexcept;
 		CGraphicsPath& operator=(const CGraphicsPath& other)	noexcept;
 		CGraphicsPath& operator=(CGraphicsPath&& other)			noexcept;
 		bool operator==(const CGraphicsPath& other)	noexcept;

DesktopEditor/graphics/GraphicsRenderer.cpp

@@ -613,32 +613,6 @@ HRESULT CGraphicsRenderer::put_BrushTransform(const Aggplus::CMatrix& oMatrix)
 	m_oBrush.Transform = oMatrix;
 	return S_OK;
 }
-HRESULT CGraphicsRenderer::get_BrushOffset(double& offsetX, double& offsetY) const
-{
-	offsetX = m_oBrush.OffsetX;
-	offsetY = m_oBrush.OffsetY;
-	return S_OK;
-}
-HRESULT CGraphicsRenderer::put_BrushOffset(const double& offsetX, const double& offsetY)
-{
-	m_oBrush.OffsetX = offsetX;
-	m_oBrush.OffsetY = offsetY;
-	return S_OK;
-}
-HRESULT CGraphicsRenderer::get_BrushScale(bool& isScale, double& scaleX, double& scaleY) const
-{
-	isScale = m_oBrush.IsScale;
-	scaleX = m_oBrush.ScaleX;
-	scaleY = m_oBrush.ScaleY;
-	return S_OK;
-}
-HRESULT CGraphicsRenderer::put_BrushScale(bool isScale, const double& scaleX, const double& scaleY)
-{
-	m_oBrush.IsScale = isScale;
-	m_oBrush.ScaleX = scaleX;
-	m_oBrush.ScaleY = scaleY;
-	return S_OK;
-}
 HRESULT CGraphicsRenderer::BrushRect(const INT& val, const double& left, const double& top, const double& width, const double& height)
 {
 	m_oBrush.Rectable = val;
@@ -972,17 +946,10 @@ HRESULT CGraphicsRenderer::DrawPath(const LONG& nType)
 				switch (m_oBrush.TextureMode)
 				{
 				case c_BrushTextureModeTile:
-				case c_BrushTextureModeTileCenter:
 					oMode = Aggplus::WrapModeTile;
 					break;
-				case c_BrushTextureModeTileFlipX:
-					oMode = Aggplus::WrapModeTileFlipX;
-					break;
-				case c_BrushTextureModeTileFlipY:
-					oMode = Aggplus::WrapModeTileFlipY;
-					break;
-				case c_BrushTextureModeTileFlipXY:
-					oMode = Aggplus::WrapModeTileFlipXY;
+				case c_BrushTextureModeTileCenter:
+					oMode = Aggplus::WrapModeTile;
 					break;
 				default: 
 					break;
@@ -1056,18 +1023,11 @@ HRESULT CGraphicsRenderer::DrawPath(const LONG& nType)
                     if (m_oBrush.Rectable == 1)
                     {
                         pTextureBrush->m_bUseBounds = true;
-						pTextureBrush->m_oBounds.left = m_oBrush.Rect.X + m_oBrush.OffsetX;
-						pTextureBrush->m_oBounds.top = m_oBrush.Rect.Y + m_oBrush.OffsetY;
+                        pTextureBrush->m_oBounds.left = m_oBrush.Rect.X;
+                        pTextureBrush->m_oBounds.top = m_oBrush.Rect.Y;
                         pTextureBrush->m_oBounds.right = pTextureBrush->m_oBounds.left + m_oBrush.Rect.Width;
                         pTextureBrush->m_oBounds.bottom = pTextureBrush->m_oBounds.top + m_oBrush.Rect.Height;
                     }
-
-					if (m_oBrush.IsScale == 1)
-					{
-						pTextureBrush->m_bIsScale = true;
-						pTextureBrush->m_dScaleX = m_oBrush.ScaleX;
-						pTextureBrush->m_dScaleY = m_oBrush.ScaleY;
-					}
 				}
 
 				pBrush = pTextureBrush;

DesktopEditor/graphics/GraphicsRenderer.h

@@ -189,10 +189,6 @@ public:
 	virtual HRESULT put_BrushLinearAngle(const double& dAngle);
 	virtual HRESULT get_BrushTransform(Aggplus::CMatrix& oMatrix);
 	virtual HRESULT put_BrushTransform(const Aggplus::CMatrix& oMatrix);
-	virtual HRESULT get_BrushOffset(double& offsetX, double& offsetY) const;
-	virtual HRESULT put_BrushOffset(const double& offsetX, const double& offsetY);
-	virtual HRESULT get_BrushScale(bool& isScale, double& scaleX, double& scaleY) const;
-	virtual HRESULT put_BrushScale(bool isScale, const double& scaleX, const double& scaleY);
 	virtual HRESULT BrushRect(const INT& val, const double& left, const double& top, const double& width, const double& height);
 	virtual HRESULT BrushBounds(const double& left, const double& top, const double& width, const double& height);
 	virtual HRESULT put_BrushGradientColors(LONG* lColors, double* pPositions, LONG nCount);

DesktopEditor/graphics/IRenderer.h

@@ -117,7 +117,6 @@ const long c_nDarkMode          = 0x0008;
 const long c_nUseDictionaryFonts = 0x0010;
 const long c_nPenWidth0As1px	= 0x0020;
 const long c_nSupportPathTextAsText = 0x0040;
-const long c_nFontSubstitution  = 0x0080;
 
 // типы рендерера
 const long c_nUnknownRenderer   = 0x0000;
@@ -169,10 +168,7 @@ public:
 	AdvancedCommandType GetCommandType() { return m_nCommandType; }
 };
 
-namespace Aggplus {
-	class CImage;
-	class CGraphicsPath;
-}
+namespace Aggplus { class CImage; }
 
 // IRenderer
 class IRenderer : public IGrObject
@@ -244,32 +240,6 @@ public:
 	virtual HRESULT put_BrushTransform(const Aggplus::CMatrix& oMatrix) = 0;
 	virtual HRESULT get_BrushLinearAngle(double* dAngle)				= 0;
 	virtual HRESULT put_BrushLinearAngle(const double& dAngle)			= 0;
-	virtual HRESULT get_BrushOffset(double& offsetX, double& offsetY) const
-	{
-		UNUSED_VARIABLE(offsetX);
-		UNUSED_VARIABLE(offsetY);
-		return S_OK;
-	}
-	virtual HRESULT put_BrushOffset(const double& offsetX, const double& offsetY)
-	{
-		UNUSED_VARIABLE(offsetX);
-		UNUSED_VARIABLE(offsetY);
-		return S_OK;
-	}
-	virtual HRESULT get_BrushScale(bool& isScale, double& scaleX, double& scaleY) const
-	{
-		UNUSED_VARIABLE(isScale);
-		UNUSED_VARIABLE(scaleX);
-		UNUSED_VARIABLE(scaleY);
-		return S_OK;
-	}
-	virtual HRESULT put_BrushScale(bool isScale, const double& scaleX, const double& scaleY)
-	{
-		UNUSED_VARIABLE(isScale);
-		UNUSED_VARIABLE(scaleX);
-		UNUSED_VARIABLE(scaleY);
-		return S_OK;
-	}
 	virtual HRESULT BrushRect(const INT& val, const double& left, const double& top, const double& width, const double& height) = 0;
 	virtual HRESULT BrushBounds(const double& left, const double& top, const double& width, const double& height) = 0;
 
@@ -329,8 +299,6 @@ public:
 	virtual HRESULT PathCommandTextExCHAR(const LONG& c, const LONG& gid, const double& x, const double& y, const double& w, const double& h) = 0;
 	virtual HRESULT PathCommandTextEx(const std::wstring& sText, const unsigned int* pGids, const unsigned int nGidsCount, const double& x, const double& y, const double& w, const double& h) = 0;
 
-	HRESULT AddPath(const Aggplus::CGraphicsPath& path);
-
 	//-------- Функции для вывода изображений ---------------------------------------------------
 	virtual HRESULT DrawImage(IGrObject* pImage, const double& x, const double& y, const double& w, const double& h)		= 0;
 	virtual HRESULT DrawImageFromFile(const std::wstring&, const double& x, const double& y, const double& w, const double& h, const BYTE& lAlpha = 255)	= 0;

DesktopEditor/graphics/MetafileToRenderer.cpp

@@ -36,7 +36,6 @@
 #include "../fontengine/FontManager.h"
 #include "../raster/BgraFrame.h"
 #include "../common/StringExt.h"
-#include "GraphicsPath.h"
 
 // этот класс нужно переписать. должно работать как и в js
 // а не просто на каждом символе переключаться, если нужно
@@ -352,13 +351,7 @@ namespace NSOnlineOfficeBinToPdf
 		bool bIsPathOpened = false;
 		bool bIsEnableBrushRect = false;
 
-		double old_t1, old_t2, old_t3, old_t4, old_t5, old_t6;
-
 		CBufferReader oReader(pBuffer, lBufferLen);
-		Aggplus::CGraphicsPath path;
-		Aggplus::CMatrix transMatrRot;
-		Aggplus::RectF_T<double> clipRect;
-		bool isResetRot = false;
 		while (oReader.Check())
 		{
 			eCommand = (CommandType)(oReader.ReadByte());
@@ -389,8 +382,6 @@ namespace NSOnlineOfficeBinToPdf
 				if (bIsPathOpened)
 				{
 					pRenderer->PathCommandEnd();
-					if (path.GetPointCount())
-						path.Reset();
 					pRenderer->EndCommand(c_nPathType);
 				}
 				bIsPathOpened = false;
@@ -480,17 +471,6 @@ namespace NSOnlineOfficeBinToPdf
 				double m2 = oReader.ReadDouble();
 				double m3 = oReader.ReadDouble();
 				double m4 = oReader.ReadDouble();
-
-				clipRect = Aggplus::RectF_T<double>(m1, m2, m3, m4);
-
-				long type;
-				pRenderer->get_BrushTextureMode(&type);
-				if (type != c_BrushTextureModeStretch)
-				{
-					m1 = 0.0;
-					m2 = 0.0;
-				}
-
 				pRenderer->BrushRect(bIsEnableBrushRect ? 1 : 0, m1, m2, m3, m4);
 				break;
 			}
@@ -499,10 +479,7 @@ namespace NSOnlineOfficeBinToPdf
 				bIsEnableBrushRect = oReader.ReadBool();
 
 				if (!bIsEnableBrushRect)
-				{
 					pRenderer->BrushRect(bIsEnableBrushRect ? 1 : 0, 0, 0, 1, 1);
-					clipRect = Aggplus::RectF_T<double>();
-				}
 				break;
 			}
 			case ctBrushTexturePathOld:
@@ -613,16 +590,6 @@ namespace NSOnlineOfficeBinToPdf
 				pRenderer->put_BrushTextureAlpha(lAlpha);
 				break;
 			}
-			case ctBrushResetRotation:
-			{
-				pRenderer->GetTransform(&old_t1, &old_t2, &old_t3, &old_t4, &old_t5, &old_t6);
-
-				Aggplus::CMatrix mtr(old_t1, old_t2, old_t3, old_t4, old_t5, old_t6);
-				double rot = mtr.rotation();
-				transMatrRot.Rotate(agg::rad2deg(rot));
-				isResetRot = true;
-				break;
-			}
 			case ctSetTransform:
 			{
 				double m1 = oReader.ReadDouble();
@@ -639,15 +606,11 @@ namespace NSOnlineOfficeBinToPdf
 				if (bIsPathOpened)
 				{
 					pRenderer->PathCommandEnd();
-					if (path.GetPointCount())
-						path.Reset();
 					pRenderer->EndCommand(c_nPathType);
 				}
 
 				pRenderer->BeginCommand(c_nPathType);
 				pRenderer->PathCommandStart();
-				path.Reset();
-				path.StartFigure();
 
 				bIsPathOpened = true;
 				break;
@@ -656,14 +619,14 @@ namespace NSOnlineOfficeBinToPdf
 			{
 				double m1 = oReader.ReadDouble();
 				double m2 = oReader.ReadDouble();
-				path.MoveTo(m1, m2);
+				pRenderer->PathCommandMoveTo(m1, m2);
 				break;
 			}
 			case ctPathCommandLineTo:
 			{
 				double m1 = oReader.ReadDouble();
 				double m2 = oReader.ReadDouble();
-				path.LineTo(m1, m2);
+				pRenderer->PathCommandLineTo(m1, m2);
 				break;
 			}
 			case ctPathCommandCurveTo:
@@ -674,12 +637,12 @@ namespace NSOnlineOfficeBinToPdf
 				double m4 = oReader.ReadDouble();
 				double m5 = oReader.ReadDouble();
 				double m6 = oReader.ReadDouble();
-				path.CurveTo(m1, m2, m3, m4, m5, m6);
+				pRenderer->PathCommandCurveTo(m1, m2, m3, m4, m5, m6);
 				break;
 			}
 			case ctPathCommandClose:
 			{
-				path.CloseFigure();
+				pRenderer->PathCommandClose();
 				break;
 			}
 			case ctPathCommandEnd:
@@ -687,107 +650,14 @@ namespace NSOnlineOfficeBinToPdf
 				if (bIsPathOpened)
 				{
 					pRenderer->PathCommandEnd();
-					if (path.GetPointCount())
-						path.Reset();
 					pRenderer->EndCommand(c_nPathType);
 					bIsPathOpened = false;
 				}
 				break;
 			}
-			case ctPathCommandOffset:
-			{
-				double m1 = oReader.ReadDouble();
-				double m2 = oReader.ReadDouble();
-
-				pRenderer->put_BrushOffset(m1, m2);
-				break;
-			}
-			case ctPathCommandScale:
-			{
-				double m1 = oReader.ReadDouble();
-				double m2 = oReader.ReadDouble();
-
-				pRenderer->put_BrushScale(true, m1, m2);
-				break;
-			}
 			case ctDrawPath:
 			{
-				long fill = oReader.ReadInt();
-				long type;
-				pRenderer->get_BrushType(&type);
-
-				if (fill != c_nStroke && type == c_BrushTypeTexture)
-				{
-					Aggplus::CGraphicsPath clipPath;
-					Aggplus::CGraphicsPath drawPath(path);
-
-					if (isResetRot)
-					{
-						pRenderer->get_BrushTextureMode(&type);
-						bool isStretch = type == c_BrushTextureModeStretch;
-
-						double left, top, width, height;
-						drawPath.GetBounds(left, top, width, height);
-
-						double rot = transMatrRot.rotation();
-						double cX = left + width / 2.0;
-						double cY = top + height / 2.0;
-
-						bool isZeroPt = clipRect.X < 0.1 && clipRect.X > -0.1 && clipRect.Y < 0.1 && clipRect.Y > -0.1;
-						bool isZeroRot = rot < 1e-6 && rot > -1e-6;
-
-						transMatrRot.Reset();
-						transMatrRot.RotateAt(agg::rad2deg(rot), cX, cY, Aggplus::MatrixOrderAppend);
-
-						double offX = old_t5 - transMatrRot.tx();
-						double offY = old_t6 - transMatrRot.ty();
-
-						drawPath.Transform(&transMatrRot);
-						pRenderer->SetTransform(1.0, 0.0, 0.0, 1.0, offX, offY);
-
-						if (isZeroPt && !isZeroRot && isStretch)
-							drawPath.GetBounds(left, top, width, height);
-						else
-						{
-							Aggplus::CGraphicsPath tmpPath;
-							tmpPath.AddRectangle(left, top, width, height);
-							tmpPath.Transform(&transMatrRot);
-							tmpPath.GetBounds(left, top, width, height);
-						}
-
-						if (isZeroPt || !isStretch)
-							clipRect = Aggplus::RectF_T<double>(left, top, width, height);
-
-						if (isStretch)
-						{
-							if (!isZeroPt)
-								clipRect.Offset(-offX, -offY);
-							pRenderer->BrushRect(true, clipRect.X, clipRect.Y, clipRect.Width, clipRect.Height);
-						}
-						else
-						{
-							double tileOffX, tileOffY;
-							pRenderer->get_BrushOffset(tileOffX, tileOffY);
-							pRenderer->put_BrushOffset(tileOffX - offX, tileOffY - offY);
-						}
-					}
-
-					clipPath.AddRectangle(clipRect.X, clipRect.Y, clipRect.Width, clipRect.Height);
-					path = Aggplus::CalcBooleanOperation(drawPath, clipPath, Aggplus::Intersection);
-				}
-
-				pRenderer->AddPath(path);
-				pRenderer->DrawPath(fill);
-
-				if (isResetRot)
-				{
-					pRenderer->SetTransform(old_t1, old_t2, old_t3, old_t4, old_t5, old_t6);
-					transMatrRot.Reset();
-					isResetRot = false;
-				}
-
-				pRenderer->put_BrushScale(false, 1.0, 1.0);
-				pRenderer->put_BrushOffset(0.0, 0.0);
+				pRenderer->DrawPath(oReader.ReadInt());
 				break;
 			}
 			case ctDrawImageFromFile:
@@ -864,8 +734,6 @@ namespace NSOnlineOfficeBinToPdf
 				if (bIsPathOpened)
 				{
 					pRenderer->PathCommandEnd();
-					if (path.GetPointCount())
-						path.Reset();
 					pRenderer->EndCommand(4);
 					bIsPathOpened = false;
 				}
@@ -879,13 +747,8 @@ namespace NSOnlineOfficeBinToPdf
 					pRenderer->EndCommand(4);
 					bIsPathOpened = false;
 				}
-				int nCommand = oReader.ReadInt();
-				if (path.GetPointCount() && nCommand == c_nClipType)
-					pRenderer->AddPath(path);
-				pRenderer->EndCommand((DWORD)nCommand);
+				pRenderer->EndCommand((DWORD)(oReader.ReadInt()));
 				pRenderer->PathCommandEnd();
-				if (path.GetPointCount())
-					path.Reset();
 				break;
 			}
 			case ctGradientFill:
@@ -1269,10 +1132,6 @@ namespace NSOnlineOfficeBinToPdf
 				oReader.Skip(1);
 				break;
 			}
-			case ctBrushResetRotation:
-			{
-				break;
-			}
 			case ctSetTransform:
 			{
 				oReader.SkipInt(6);
@@ -1305,16 +1164,6 @@ namespace NSOnlineOfficeBinToPdf
 			{
 				break;
 			}
-			case ctPathCommandOffset:
-			{
-				oReader.SkipInt(2);
-				break;
-			}
-			case ctPathCommandScale:
-			{
-				oReader.SkipInt(2);
-				break;
-			}
 			case ctDrawPath:
 			{
 				oReader.SkipInt();

DesktopEditor/graphics/MetafileToRenderer.h

@@ -108,7 +108,6 @@ namespace NSOnlineOfficeBinToPdf
 		ctBrushRectableEnabled 		    = 30,
 		ctBrushGradient                 = 31,
 		ctBrushTexturePath              = 32,
-		ctBrushResetRotation			= 33,
 
 		// font
 		ctFontXML						= 40,
@@ -154,8 +153,6 @@ namespace NSOnlineOfficeBinToPdf
 		ctPathCommandGetCurrentPoint	= 101,
 		ctPathCommandText				= 102,
 		ctPathCommandTextEx			    = 103,
-		ctPathCommandOffset				= 104,
-		ctPathCommandScale				= 105,
 
 		// image
 		ctDrawImage					    = 110,

DesktopEditor/graphics/aggplustypes.h

@@ -212,20 +212,8 @@ public:
 		void Offset(const PointF_T<T>& point) { Offset(point.X, point.Y); }
 		void Offset(T dx, T dy) { X += dx; Y += dy; }
 
-		inline bool IsPositive() { return Width > 0 && Height > 0; }
+		inline bool IsPositive() { return X >= 0 && Y >= 0 && Width > 0 && Height > 0; }
 
-		RectF_T& operator=(const RectF_T& other)
-		{
-			if (this == &other)
-				return *this;
-
-			X = other.X;
-			Y = other.Y;
-			Width = other.Width;
-			Height = other.Height;
-
-			return *this;
-		};
 public:
 		T X, Y, Width, Height;
 };

DesktopEditor/graphics/commands/AnnotField.cpp

@@ -46,92 +46,6 @@
 // void Set(const std::wstring& ws) { m_ws = ws; }
 // const std::wstring& Get() { return m_ws; }
 
-CAnnotFieldInfo::CActionFieldPr* ReadAction(NSOnlineOfficeBinToPdf::CBufferReader* pReader)
-{
-	CAnnotFieldInfo::CActionFieldPr* pRes = new CAnnotFieldInfo::CActionFieldPr();
-
-	pRes->nActionType = pReader->ReadByte();
-	switch (pRes->nActionType)
-	{
-	case 14: // JavaScript
-	{
-		pRes->wsStr1 = pReader->ReadString();
-		break;
-	}
-	case 1: // GoTo
-	{
-		pRes->nInt1 = pReader->ReadInt();
-		pRes->nKind = pReader->ReadByte();
-		switch (pRes->nKind)
-		{
-		case 0:
-		case 2:
-		case 3:
-		case 6:
-		case 7:
-		{
-			pRes->nFlags = pReader->ReadInt();
-			if (pRes->nFlags & (1 << 0))
-				pRes->dD[0] = pReader->ReadDouble();
-			if (pRes->nFlags & (1 << 1))
-				pRes->dD[1] = pReader->ReadDouble();
-			if (pRes->nFlags & (1 << 2))
-				pRes->dD[2] = pReader->ReadDouble();
-			break;
-		}
-		case 4:
-		{
-			pRes->dD[0] = pReader->ReadDouble();
-			pRes->dD[1] = pReader->ReadDouble();
-			pRes->dD[2] = pReader->ReadDouble();
-			pRes->dD[3] = pReader->ReadDouble();
-			break;
-		}
-		case 1:
-		case 5:
-		default:
-		{
-			break;
-		}
-		}
-		break;
-	}
-	case 10: // Named
-	{
-		pRes->wsStr1 = pReader->ReadString();
-		break;
-	}
-	case 6: // URI
-	{
-		pRes->wsStr1 = pReader->ReadString();
-		break;
-	}
-	case 9: // Hide
-	{
-		pRes->nKind = pReader->ReadByte();
-		int n = pReader->ReadInt();
-		pRes->arrStr.reserve(n);
-		for (int i = 0; i < n; ++i)
-			pRes->arrStr.push_back(pReader->ReadString());
-		break;
-	}
-	case 12: // ResetForm
-	{
-		pRes->nInt1 = pReader->ReadInt();
-		int n = pReader->ReadInt();
-		pRes->arrStr.reserve(n);
-		for (int i = 0; i < n; ++i)
-			pRes->arrStr.push_back(pReader->ReadString());
-		break;
-	}
-	}
-
-	if (pReader->ReadByte())
-		pRes->pNext = ReadAction(pReader);
-
-	return pRes;
-}
-
 CAnnotFieldInfo::CAnnotFieldInfo() : IAdvancedCommand(AdvancedCommandType::Annotaion)
 {
 	m_nType = EAnnotType::Unknown;
@@ -163,7 +77,6 @@ CAnnotFieldInfo::CAnnotFieldInfo() : IAdvancedCommand(AdvancedCommandType::Annot
 	m_pCaretPr        = NULL;
 	m_pStampPr        = NULL;
 	m_pRedactPr       = NULL;
-	m_pLinkPr         = NULL;
 	m_pWidgetPr       = NULL;
 }
 CAnnotFieldInfo::~CAnnotFieldInfo()
@@ -180,7 +93,6 @@ CAnnotFieldInfo::~CAnnotFieldInfo()
 	RELEASEOBJECT(m_pCaretPr);
 	RELEASEOBJECT(m_pStampPr);
 	RELEASEOBJECT(m_pRedactPr);
-	RELEASEOBJECT(m_pLinkPr);
 	RELEASEOBJECT(m_pWidgetPr);
 }
 
@@ -201,12 +113,6 @@ void CAnnotFieldInfo::SetType(int nType)
 		m_pTextPr = new CAnnotFieldInfo::CTextAnnotPr();
 		break;
 	}
-	case EAnnotType::Link:
-	{
-		RELEASEOBJECT(m_pLinkPr);
-		m_pLinkPr = new CAnnotFieldInfo::CLinkAnnotPr();
-		break;
-	}
 	case EAnnotType::FreeText:
 	{
 		CreateMarkup();
@@ -399,10 +305,6 @@ bool CAnnotFieldInfo::IsRedact() const
 {
 	return (m_nType == 25);
 }
-bool CAnnotFieldInfo::IsLink() const
-{
-	return (m_nType == 1);
-}
 
 CAnnotFieldInfo::CMarkupAnnotPr*       CAnnotFieldInfo::GetMarkupAnnotPr()       { return m_pMarkupPr; }
 CAnnotFieldInfo::CTextAnnotPr*         CAnnotFieldInfo::GetTextAnnotPr()         { return m_pTextPr; }
@@ -416,7 +318,6 @@ CAnnotFieldInfo::CFreeTextAnnotPr*     CAnnotFieldInfo::GetFreeTextAnnotPr()
 CAnnotFieldInfo::CCaretAnnotPr*        CAnnotFieldInfo::GetCaretAnnotPr()        { return m_pCaretPr; }
 CAnnotFieldInfo::CStampAnnotPr*        CAnnotFieldInfo::GetStampAnnotPr()        { return m_pStampPr; }
 CAnnotFieldInfo::CRedactAnnotPr*       CAnnotFieldInfo::GetRedactAnnotPr()       { return m_pRedactPr; }
-CAnnotFieldInfo::CLinkAnnotPr*         CAnnotFieldInfo::GetLinkAnnotPr()         { return m_pLinkPr; }
 CAnnotFieldInfo::CWidgetAnnotPr*       CAnnotFieldInfo::GetWidgetAnnotPr()       { return m_pWidgetPr; }
 
 bool CAnnotFieldInfo::Read(NSOnlineOfficeBinToPdf::CBufferReader* pReader, IMetafileToRenderter* pCorrector)
@@ -511,8 +412,6 @@ bool CAnnotFieldInfo::Read(NSOnlineOfficeBinToPdf::CBufferReader* pReader, IMeta
 		m_pPopupPr->Read(pReader);
 	else if (IsWidget())
 		m_pWidgetPr->Read(pReader, nType);
-	else if (IsLink())
-		m_pLinkPr->Read(pReader);
 
 	return m_nType != -1;
 }
@@ -822,45 +721,6 @@ void CAnnotFieldInfo::CRedactAnnotPr::Read(NSOnlineOfficeBinToPdf::CBufferReader
 	}
 }
 
-CAnnotFieldInfo::CLinkAnnotPr::CLinkAnnotPr()
-{
-	m_pAction = NULL;
-	m_pPA = NULL;
-}
-CAnnotFieldInfo::CLinkAnnotPr::~CLinkAnnotPr()
-{
-	RELEASEOBJECT(m_pAction);
-	RELEASEOBJECT(m_pPA);
-}
-BYTE CAnnotFieldInfo::CLinkAnnotPr::GetH() const { return m_nH; }
-int CAnnotFieldInfo::CLinkAnnotPr::GetFlags() const { return m_nFlags; }
-const std::vector<double>& CAnnotFieldInfo::CLinkAnnotPr::GetQuadPoints() { return m_arrQuadPoints; }
-CAnnotFieldInfo::CActionFieldPr* CAnnotFieldInfo::CLinkAnnotPr::GetA() { return m_pAction; }
-CAnnotFieldInfo::CActionFieldPr* CAnnotFieldInfo::CLinkAnnotPr::GetPA() { return m_pPA; }
-void CAnnotFieldInfo::CLinkAnnotPr::Read(NSOnlineOfficeBinToPdf::CBufferReader* pReader)
-{
-	m_nFlags = pReader->ReadInt();
-	if (m_nFlags & (1 << 0))
-	{
-		pReader->ReadString();
-		m_pAction = ReadAction(pReader);
-	}
-	if (m_nFlags & (1 << 1))
-	{
-		pReader->ReadString();
-		m_pPA = ReadAction(pReader);
-	}
-	if (m_nFlags & (1 << 2))
-		m_nH = pReader->ReadByte();
-	if (m_nFlags & (1 << 3))
-	{
-		int n = pReader->ReadInt();
-		m_arrQuadPoints.reserve(n);
-		for (int i = 0; i < n; ++i)
-			m_arrQuadPoints.push_back(pReader->ReadDouble());
-	}
-}
-
 bool CAnnotFieldInfo::CPopupAnnotPr::IsOpen()      const { return m_bOpen; }
 int  CAnnotFieldInfo::CPopupAnnotPr::GetFlag()     const { return m_nFlag; }
 int  CAnnotFieldInfo::CPopupAnnotPr::GetParentID() const { return m_nParentID; }
@@ -892,7 +752,7 @@ const std::wstring& CAnnotFieldInfo::CWidgetAnnotPr::GetFontKey()   { return m_w
 const std::vector<double>& CAnnotFieldInfo::CWidgetAnnotPr::GetTC() { return m_arrTC; }
 const std::vector<double>& CAnnotFieldInfo::CWidgetAnnotPr::GetBC() { return m_arrBC; }
 const std::vector<double>& CAnnotFieldInfo::CWidgetAnnotPr::GetBG() { return m_arrBG; }
-const std::vector<CAnnotFieldInfo::CActionFieldPr*>& CAnnotFieldInfo::CWidgetAnnotPr::GetActions() { return m_arrAction; }
+const std::vector<CAnnotFieldInfo::CWidgetAnnotPr::CActionWidget*>& CAnnotFieldInfo::CWidgetAnnotPr::GetActions() { return m_arrAction; }
 CAnnotFieldInfo::CWidgetAnnotPr::CButtonWidgetPr*    CAnnotFieldInfo::CWidgetAnnotPr::GetButtonWidgetPr()    { return m_pButtonPr; }
 CAnnotFieldInfo::CWidgetAnnotPr::CTextWidgetPr*      CAnnotFieldInfo::CWidgetAnnotPr::GetTextWidgetPr()      { return m_pTextPr; }
 CAnnotFieldInfo::CWidgetAnnotPr::CChoiceWidgetPr*    CAnnotFieldInfo::CWidgetAnnotPr::GetChoiceWidgetPr()    { return m_pChoicePr; }
@@ -952,8 +812,93 @@ CAnnotFieldInfo::CWidgetAnnotPr::~CWidgetAnnotPr()
 		RELEASEOBJECT(m_arrAction[i]);
 }
 
-CAnnotFieldInfo::CActionFieldPr::CActionFieldPr() : pNext(NULL) {}
-CAnnotFieldInfo::CActionFieldPr::~CActionFieldPr() { RELEASEOBJECT(pNext); }
+CAnnotFieldInfo::CWidgetAnnotPr::CActionWidget::CActionWidget() : pNext(NULL) {}
+CAnnotFieldInfo::CWidgetAnnotPr::CActionWidget::~CActionWidget() { RELEASEOBJECT(pNext); }
+CAnnotFieldInfo::CWidgetAnnotPr::CActionWidget* ReadAction(NSOnlineOfficeBinToPdf::CBufferReader* pReader)
+{
+	CAnnotFieldInfo::CWidgetAnnotPr::CActionWidget* pRes = new CAnnotFieldInfo::CWidgetAnnotPr::CActionWidget();
+
+	pRes->nActionType = pReader->ReadByte();
+	switch (pRes->nActionType)
+	{
+	case 14: // JavaScript
+	{
+		pRes->wsStr1 = pReader->ReadString();
+		break;
+	}
+	case 1: // GoTo
+	{
+		pRes->nInt1 = pReader->ReadInt();
+		pRes->nKind = pReader->ReadByte();
+		switch (pRes->nKind)
+		{
+		case 0:
+		case 2:
+		case 3:
+		case 6:
+		case 7:
+		{
+			pRes->nFlags = pReader->ReadByte();
+			if (pRes->nFlags & (1 << 0))
+				pRes->dD[0] = pReader->ReadDouble();
+			if (pRes->nFlags & (1 << 1))
+				pRes->dD[1] = pReader->ReadDouble();
+			if (pRes->nFlags & (1 << 2))
+				pRes->dD[2] = pReader->ReadDouble();
+			break;
+		}
+		case 4:
+		{
+			pRes->dD[0] = pReader->ReadDouble();
+			pRes->dD[1] = pReader->ReadDouble();
+			pRes->dD[2] = pReader->ReadDouble();
+			pRes->dD[3] = pReader->ReadDouble();
+			break;
+		}
+		case 1:
+		case 5:
+		default:
+		{
+			break;
+		}
+		}
+		break;
+	}
+	case 10: // Named
+	{
+		pRes->wsStr1 = pReader->ReadString();
+		break;
+	}
+	case 6: // URI
+	{
+		pRes->wsStr1 = pReader->ReadString();
+		break;
+	}
+	case 9: // Hide
+	{
+		pRes->nKind = pReader->ReadByte();
+		int n = pReader->ReadInt();
+		pRes->arrStr.reserve(n);
+		for (int i = 0; i < n; ++i)
+			pRes->arrStr.push_back(pReader->ReadString());
+		break;
+	}
+	case 12: // ResetForm
+	{
+		pRes->nInt1 = pReader->ReadInt();
+		int n = pReader->ReadInt();
+		pRes->arrStr.reserve(n);
+		for (int i = 0; i < n; ++i)
+			pRes->arrStr.push_back(pReader->ReadString());
+		break;
+	}
+	}
+
+	if (pReader->ReadByte())
+		pRes->pNext = ReadAction(pReader);
+
+	return pRes;
+}
 void CAnnotFieldInfo::CWidgetAnnotPr::Read(NSOnlineOfficeBinToPdf::CBufferReader* pReader, BYTE nType)
 {
 	m_wsFN = pReader->ReadString();
@@ -1012,7 +957,7 @@ void CAnnotFieldInfo::CWidgetAnnotPr::Read(NSOnlineOfficeBinToPdf::CBufferReader
 	for (int i = 0; i < nAction; ++i)
 	{
 		std::wstring wsType = pReader->ReadString();
-		CAnnotFieldInfo::CActionFieldPr* pA = ReadAction(pReader);
+		CAnnotFieldInfo::CWidgetAnnotPr::CActionWidget* pA = ReadAction(pReader);
 		if (pA)
 		{
 			pA->wsType = wsType;
@@ -1042,7 +987,6 @@ const std::wstring& CAnnotFieldInfo::CWidgetAnnotPr::CButtonWidgetPr::GetCA() {
 const std::wstring& CAnnotFieldInfo::CWidgetAnnotPr::CButtonWidgetPr::GetRC() { return m_wsRC; }
 const std::wstring& CAnnotFieldInfo::CWidgetAnnotPr::CButtonWidgetPr::GetAC() { return m_wsAC; }
 const std::wstring& CAnnotFieldInfo::CWidgetAnnotPr::CButtonWidgetPr::GetAP_N_Yes() { return m_wsAP_N_Yes; }
-const std::vector< std::pair<std::wstring, std::wstring> >& CAnnotFieldInfo::CWidgetAnnotPr::CButtonWidgetPr::GetOpt() { return m_arrOpt; }
 void CAnnotFieldInfo::CWidgetAnnotPr::CButtonWidgetPr::Read(NSOnlineOfficeBinToPdf::CBufferReader* pReader, BYTE nType, int nFlags)
 {
 	if (nType == 27)
@@ -1083,17 +1027,6 @@ void CAnnotFieldInfo::CWidgetAnnotPr::CButtonWidgetPr::Read(NSOnlineOfficeBinToP
 		if (nFlags & (1 << 9))
 			m_wsV = pReader->ReadString();
 		m_nStyle = pReader->ReadByte();
-		if (nFlags & (1 << 10))
-		{
-			int n = pReader->ReadInt();
-			m_arrOpt.reserve(n);
-			for (int i = 0; i < n; ++i)
-			{
-				std::wstring s1 = pReader->ReadString();
-				std::wstring s2 = pReader->ReadString();
-				m_arrOpt.push_back(std::make_pair(s1, s2));
-			}
-		}
 		if (nFlags & (1 << 14))
 			m_wsAP_N_Yes = pReader->ReadString();
 	}
@@ -1259,7 +1192,7 @@ bool CWidgetsInfo::Read(NSOnlineOfficeBinToPdf::CBufferReader* pReader, IMetafil
 			for (int i = 0; i < nAction; ++i)
 			{
 				std::wstring wsType = pReader->ReadString();
-				CAnnotFieldInfo::CActionFieldPr* pA = ReadAction(pReader);
+				CAnnotFieldInfo::CWidgetAnnotPr::CActionWidget* pA = ReadAction(pReader);
 				if (pA)
 				{
 					pA->wsType = wsType;
@@ -1306,19 +1239,11 @@ bool CRedact::Read(NSOnlineOfficeBinToPdf::CBufferReader* pReader, IMetafileToRe
 		SRedact* pRedact = new SRedact();
 		pRedact->sID = pReader->ReadString();
 		int m = pReader->ReadInt();
-		pRedact->arrQuadPoints.reserve(m * 8);
+		pRedact->arrQuadPoints.reserve(m * 4);
 		for (int j = 0; j < m; ++j)
 		{
-			pRedact->arrQuadPoints.push_back(pReader->ReadDouble());
-			pRedact->arrQuadPoints.push_back(pReader->ReadDouble());
-			pRedact->arrQuadPoints.push_back(pReader->ReadDouble());
-			pRedact->arrQuadPoints.push_back(pReader->ReadDouble());
-			double x = pReader->ReadDouble();
-			double y = pReader->ReadDouble();
-			pRedact->arrQuadPoints.push_back(pReader->ReadDouble());
-			pRedact->arrQuadPoints.push_back(pReader->ReadDouble());
-			pRedact->arrQuadPoints.push_back(x);
-			pRedact->arrQuadPoints.push_back(y);
+			for (int k = 0; k < 4; ++k)
+				pRedact->arrQuadPoints.push_back(pReader->ReadDouble());
 		}
 		pRedact->nFlag = pReader->ReadInt();
 		if (pRedact->nFlag & (1 << 0))

DesktopEditor/graphics/commands/AnnotField.h

@@ -70,23 +70,6 @@ public:
 		WidgetSignature = 33
 	};
 
-	class GRAPHICS_DECL CActionFieldPr
-	{
-	public:
-		CActionFieldPr();
-		~CActionFieldPr();
-
-		BYTE nKind;
-		BYTE nFlags;
-		BYTE nActionType;
-		int  nInt1;
-		double dD[4]{};
-		std::wstring wsType;
-		std::wstring wsStr1;
-		std::vector<std::wstring> arrStr;
-		CActionFieldPr* pNext;
-	};
-
 	class GRAPHICS_DECL CWidgetAnnotPr
 	{
 	public:
@@ -107,7 +90,6 @@ public:
 			const std::wstring& GetRC();
 			const std::wstring& GetAC();
 			const std::wstring& GetAP_N_Yes();
-			const std::vector< std::pair<std::wstring, std::wstring> >& GetOpt();
 
 			void Read(NSOnlineOfficeBinToPdf::CBufferReader* pReader, BYTE nType, int nFlags);
 
@@ -126,7 +108,6 @@ public:
 			std::wstring m_wsRC;
 			std::wstring m_wsAC;
 			std::wstring m_wsAP_N_Yes;
-			std::vector< std::pair<std::wstring, std::wstring> > m_arrOpt;
 		};
 
 		class GRAPHICS_DECL CTextWidgetPr
@@ -178,6 +159,23 @@ public:
 
 		};
 
+		class GRAPHICS_DECL CActionWidget
+		{
+		public:
+			CActionWidget();
+			~CActionWidget();
+
+			BYTE nKind;
+			BYTE nFlags;
+			BYTE nActionType;
+			int  nInt1;
+			double dD[4]{};
+			std::wstring wsType;
+			std::wstring wsStr1;
+			std::vector<std::wstring> arrStr;
+			CActionWidget* pNext;
+		};
+
 		CWidgetAnnotPr(BYTE nType);
 		~CWidgetAnnotPr();
 
@@ -201,7 +199,7 @@ public:
 		const std::vector<double>& GetTC();
 		const std::vector<double>& GetBC();
 		const std::vector<double>& GetBG();
-		const std::vector<CActionFieldPr*>& GetActions();
+		const std::vector<CActionWidget*>& GetActions();
 
 		CButtonWidgetPr*    GetButtonWidgetPr();
 		CTextWidgetPr*      GetTextWidgetPr();
@@ -231,7 +229,7 @@ public:
 		std::vector<double> m_arrTC;
 		std::vector<double> m_arrBC;
 		std::vector<double> m_arrBG;
-		std::vector<CActionFieldPr*> m_arrAction;
+		std::vector<CActionWidget*> m_arrAction;
 
 		CButtonWidgetPr*    m_pButtonPr;
 		CTextWidgetPr*      m_pTextPr;
@@ -391,7 +389,7 @@ public:
 	{
 	public:
 		bool IsOpen()      const;
-		int  GetFlag()    const;
+		int  GetFlag()     const;
 		int  GetParentID() const;
 
 		void Read(NSOnlineOfficeBinToPdf::CBufferReader* pReader);
@@ -480,28 +478,6 @@ public:
 		std::vector<double> m_arrQuadPoints;
 	};
 
-	class GRAPHICS_DECL CLinkAnnotPr
-	{
-	public:
-		CLinkAnnotPr();
-		~CLinkAnnotPr();
-
-		BYTE GetH()    const;
-		int GetFlags() const;
-		const std::vector<double>& GetQuadPoints();
-		CActionFieldPr* GetA();
-		CActionFieldPr* GetPA();
-
-		void Read(NSOnlineOfficeBinToPdf::CBufferReader* pReader);
-
-	private:
-		BYTE m_nH;
-		int m_nFlags;
-		std::vector<double> m_arrQuadPoints;
-		CActionFieldPr* m_pAction;
-		CActionFieldPr* m_pPA;
-	};
-
 	CAnnotFieldInfo();
 	virtual ~CAnnotFieldInfo();
 
@@ -542,7 +518,6 @@ public:
 	bool IsCaret()           const;
 	bool IsStamp()           const;
 	bool IsRedact()          const;
-	bool IsLink()            const;
 
 	CMarkupAnnotPr*       GetMarkupAnnotPr();
 	CTextAnnotPr*         GetTextAnnotPr();
@@ -556,7 +531,6 @@ public:
 	CCaretAnnotPr*        GetCaretAnnotPr();
 	CStampAnnotPr*        GetStampAnnotPr();
 	CRedactAnnotPr*       GetRedactAnnotPr();
-	CLinkAnnotPr*         GetLinkAnnotPr();
 	CWidgetAnnotPr*       GetWidgetAnnotPr();
 
 	bool Read(NSOnlineOfficeBinToPdf::CBufferReader* pReader, IMetafileToRenderter* pCorrector);
@@ -602,7 +576,6 @@ private:
 	CCaretAnnotPr*        m_pCaretPr;
 	CStampAnnotPr*        m_pStampPr;
 	CRedactAnnotPr*       m_pRedactPr;
-	CLinkAnnotPr*         m_pLinkPr;
 	CWidgetAnnotPr*       m_pWidgetPr;
 };
 
@@ -637,7 +610,7 @@ public:
 		std::wstring sTU;
 		std::vector<int> arrI;
 		std::vector<std::wstring> arrV;
-		std::vector<CAnnotFieldInfo::CActionFieldPr*> arrAction;
+		std::vector<CAnnotFieldInfo::CWidgetAnnotPr::CActionWidget*> arrAction;
 		std::vector< std::pair<std::wstring, std::wstring> > arrOpt;
 	};
 

DesktopEditor/graphics/commands/DocInfo.cpp

@@ -179,6 +179,7 @@ CHeadings::CHeading::CHeading()
 	nPage = 0;
 	dX = 0.0;
 	dY = 0.0;
+	pParent = NULL;
 }
 CHeadings::CHeading::~CHeading()
 {
@@ -195,26 +196,35 @@ CHeadings::~CHeadings()
 const std::vector<CHeadings::CHeading*>& CHeadings::GetHeading() { return m_arrHeading; }
 bool CHeadings::Read(NSOnlineOfficeBinToPdf::CBufferReader* pReader, IMetafileToRenderter* pCorrector)
 {
-	std::vector<CHeading*> arrParentStack;
+	int nPredLevel = 0, nHeaderLevel = 0;
+	std::vector<CHeading*>* arrHeading = &m_arrHeading;
+	CHeading* pParent = NULL;
 	int nHeadings = pReader->ReadInt();
 	for (int i = 0; i < nHeadings; ++i)
 	{
 		int nLevel = pReader->ReadInt();
+		if (nLevel > nPredLevel && i > 0)
+		{
+			nHeaderLevel = nPredLevel;
+			pParent = arrHeading->back();
+			arrHeading = &pParent->arrHeading;
+		}
+		else if (nLevel < nPredLevel && nLevel <= nHeaderLevel)
+		{
+			nHeaderLevel = nLevel;
+			pParent = pParent ? pParent->pParent : NULL;
+			arrHeading = pParent ? &pParent->arrHeading : &m_arrHeading;
+		}
+		nPredLevel = nLevel;
+
 		CHeading* pHeading = new CHeading();
 		pHeading->nPage = pReader->ReadInt();
 		pHeading->dX = pReader->ReadDouble();
 		pHeading->dY = pReader->ReadDouble();
 		pHeading->wsTitle = pReader->ReadString();
+		pHeading->pParent = pParent;
 
-		while (arrParentStack.size() > nLevel)
-			arrParentStack.pop_back();
-
-		if (arrParentStack.empty())
-			m_arrHeading.push_back(pHeading);
-		else
-			arrParentStack.back()->arrHeading.push_back(pHeading);
-
-		arrParentStack.push_back(pHeading);
+		arrHeading->push_back(pHeading);
 	}
 	return true;
 }

DesktopEditor/graphics/commands/DocInfo.h

@@ -181,6 +181,7 @@ public:
 		int nPage;
 		double dX;
 		double dY;
+		CHeading* pParent;
 		std::vector<CHeading*> arrHeading;
 
 		CHeading();

DesktopEditor/graphics/pro/Fonts.h

@@ -639,7 +639,6 @@ namespace NSFonts
 		virtual double GetCharWidth(int gid) = 0;
 
 		virtual int GetGIDByUnicode(int code) = 0;
-		virtual int GetUnicodeByGID(int gid) = 0;
 
 		virtual int GetEmbeddingLicenceType() = 0;
 		virtual void FillFontSelectFormat(CFontSelectFormat& oFormat) = 0;
@@ -737,7 +736,6 @@ namespace NSFonts
 
 		virtual unsigned int GetNameIndex(const std::wstring& wsName) = 0;
 		virtual unsigned int GetGIDByUnicode(const unsigned int& unCode) = 0;
-		virtual int GetUnicodeByGID(const int& gid) = 0;
 
 		virtual void GetFace(double& d0, double& d1, double& d2) = 0;
 		virtual void GetLimitsY(double& dMin, double& dMax) = 0;

DesktopEditor/graphics/pro/js/drawingfile.json

@@ -46,20 +46,16 @@
 		"_InitializeFontsRanges",
 		"_SetFontBinary",
 		"_GetFontBinary",
-		"_GetGIDByUnicode",
 		"_IsFontBinaryExist",
 		"_DestroyTextInfo",
 		"_IsNeedCMap",
 		"_SetCMapData",
-		"_SetScanPageFonts",
 		"_ScanPage",
 		"_SplitPages",
 		"_MergePages",
 		"_UnmergePages",
 		"_RedactPage",
 		"_UndoRedact",
-		"_CheckOwnerPassword",
-		"_CheckPerm",
 		"_GetImageBase64",
 		"_GetImageBase64Len",
 		"_GetImageBase64Ptr",
@@ -101,7 +97,7 @@
 	"compile_files_array": [
 	{
 		"folder": "../../../raster/",
-		"files": ["BgraFrame.cpp", "ImageFileFormatChecker.cpp", "PICT/PICFile.cpp"]
+		"files": ["BgraFrame.cpp", "ImageFileFormatChecker.cpp", "PICT/PICFile.cpp", "PICT/pic.cpp"]
 	},
 	{
 		"folder": "../../../cximage/CxImage/",
@@ -161,11 +157,11 @@
 	},
 	{
 		"folder": "../../../agg-2.4/src/",
-		"files": ["agg_arc.cpp", "agg_vcgen_stroke.cpp", "agg_vcgen_dash.cpp", "agg_trans_affine.cpp", "agg_curves.cpp", "agg_image_filters.cpp", "agg_bezier_arc.cpp"]
+		"files": ["agg_arc.cpp", "agg_vcgen_stroke.cpp", "agg_vcgen_dash.cpp", "agg_trans_affine.cpp", "agg_curves.cpp", "agg_image_filters.cpp"]
 	},
 	{
 		"folder": "../../../common/",
-		"files": ["File.cpp", "Directory.cpp", "ByteBuilder.cpp", "Base64.cpp", "StringExt.cpp", "Path.cpp", "SystemUtils.cpp", "StringUTF32.cpp", "StringBuilder.cpp"]
+		"files": ["File.cpp", "Directory.cpp", "ByteBuilder.cpp", "Base64.cpp", "StringExt.cpp", "Path.cpp", "SystemUtils.cpp"]
 	},
 	{
 		"folder": "../../../../Common/3dParty/icu/icu/source/common/",
@@ -197,11 +193,11 @@
 	},
 	{
 		"folder": "../../../../PdfFile/SrcReader/",
-		"files": ["Adaptors.cpp", "GfxClip.cpp", "RendererOutputDev.cpp", "JPXStream2.cpp", "PdfAnnot.cpp", "PdfFont.cpp"]
+		"files": ["Adaptors.cpp", "GfxClip.cpp", "RendererOutputDev.cpp", "JPXStream2.cpp", "PdfAnnot.cpp"]
 	},
 	{
 		"folder": "../../../../PdfFile/SrcWriter/",
-		"files": ["AcroForm.cpp", "Annotation.cpp", "Catalog.cpp", "Destination.cpp", "Document.cpp", "Encrypt.cpp", "EncryptDictionary.cpp", "Field.cpp", "Font.cpp", "Font14.cpp", "FontCidTT.cpp", "FontOTWriter.cpp", "FontTT.cpp", "FontTTWriter.cpp", "GState.cpp", "Image.cpp", "Info.cpp", "Metadata.cpp", "Objects.cpp", "Outline.cpp", "Pages.cpp", "Pattern.cpp", "ResourcesDictionary.cpp", "Shading.cpp", "States.cpp", "Streams.cpp", "Utils.cpp", "RedactOutputDev.cpp"]
+		"files": ["AcroForm.cpp", "Annotation.cpp", "Catalog.cpp", "Destination.cpp", "Document.cpp", "Encrypt.cpp", "EncryptDictionary.cpp", "Field.cpp", "Font.cpp", "Font14.cpp", "FontCidTT.cpp", "FontOTWriter.cpp", "FontTT.cpp", "FontTTWriter.cpp", "GState.cpp", "Image.cpp", "Info.cpp", "Metadata.cpp", "Objects.cpp", "Outline.cpp", "Pages.cpp", "Pattern.cpp", "ResourcesDictionary.cpp", "Shading.cpp", "States.cpp", "Streams.cpp", "Utils.cpp"]
 	},
 	{
 		"folder": "../../../../PdfFile/Resources/",
@@ -256,8 +252,8 @@
 		"files": ["BaseItem.cpp", "ContText.cpp", "Paragraph.cpp", "Shape.cpp", "TextLine.cpp", "Table.cpp"]
 	},
 	{
-		"folder": "../../../../OdfFile/Common",
-		"files": ["logging.cpp"]
+		"folder": "../../../common",
+		"files": ["StringUTF32.cpp", "StringBuilder.cpp"]
 	}
 	]
 }

DesktopEditor/graphics/pro/js/qt/nativegraphics.pro

@@ -113,6 +113,7 @@ SOURCES += \
 	../../../../raster/ImageFileFormatChecker.cpp \
 	../../../../raster/Metafile/MetaFile.cpp \
 	../../../../raster/PICT/PICFile.cpp \
+	../../../../raster/PICT/pic.cpp \
 	\
 	../../../ArrowHead.cpp \
 	../../../Brush.cpp \
@@ -639,7 +640,6 @@ SOURCES += \
 	$$PDF_ROOT_DIR/SrcReader/Adaptors.cpp \
 	$$PDF_ROOT_DIR/SrcReader/GfxClip.cpp \
 	$$PDF_ROOT_DIR/SrcReader/PdfAnnot.cpp \
-	$$PDF_ROOT_DIR/SrcReader/PdfFont.cpp \
 	$$PDF_ROOT_DIR/Resources/BaseFonts.cpp \
 	$$PDF_ROOT_DIR/Resources/CMapMemory/cmap_memory.cpp
 
@@ -665,7 +665,6 @@ HEADERS +=\
 	$$PDF_ROOT_DIR/SrcReader/MemoryUtils.h \
 	$$PDF_ROOT_DIR/SrcReader/GfxClip.h \
 	$$PDF_ROOT_DIR/SrcReader/FontsWasm.h \
-	$$PDF_ROOT_DIR/SrcReader/PdfFont.h \
 	$$PDF_ROOT_DIR/SrcReader/PdfAnnot.h
 
 DEFINES += CRYPTOPP_DISABLE_ASM
@@ -702,8 +701,7 @@ HEADERS += \
 	$$PDF_ROOT_DIR/SrcWriter/Utils.h \
 	$$PDF_ROOT_DIR/SrcWriter/Metadata.h \
 	$$PDF_ROOT_DIR/SrcWriter/ICCProfile.h \
-	$$PDF_ROOT_DIR/SrcWriter/States.h \
-	$$PDF_ROOT_DIR/SrcWriter/RedactOutputDev.h
+	$$PDF_ROOT_DIR/SrcWriter/States.h
 
 SOURCES += \
 	$$PDF_ROOT_DIR/SrcWriter/AcroForm.cpp \
@@ -732,8 +730,7 @@ SOURCES += \
 	$$PDF_ROOT_DIR/SrcWriter/Streams.cpp \
 	$$PDF_ROOT_DIR/SrcWriter/Utils.cpp \
 	$$PDF_ROOT_DIR/SrcWriter/Metadata.cpp \
-	$$PDF_ROOT_DIR/SrcWriter/States.cpp \
-	$$PDF_ROOT_DIR/SrcWriter/RedactOutputDev.cpp
+	$$PDF_ROOT_DIR/SrcWriter/States.cpp
 
 # PdfFile
 

DesktopEditor/graphics/pro/js/wasm/js/drawingfile.js

@@ -145,17 +145,9 @@ CFile.prototype["isNeedPassword"] = function()
 {
 	return this._isNeedPassword;
 };
-CFile.prototype["CheckOwnerPassword"] = function(password)
+CFile.prototype["SplitPages"] = function(arrPageIndex, arrayBufferChanges)
 {
-	return this._CheckOwnerPassword(password);
-};
-CFile.prototype["CheckPerm"] = function(perm)
-{
-	return this._CheckPerm(perm);
-};
-CFile.prototype["SplitPages"] = function(arrOriginIndex, arrayBufferChanges)
-{
-	let ptr = this._SplitPages(arrOriginIndex, arrayBufferChanges);
+	let ptr = this._SplitPages(arrPageIndex, arrayBufferChanges);
 	let res = ptr.getMemory(true);
 	ptr.free();
 	return res;
@@ -168,9 +160,9 @@ CFile.prototype["UndoMergePages"] = function()
 {
 	return this._UndoMergePages();
 };
-CFile.prototype["RedactPage"] = function(originIndex, arrRedactBox, arrayBufferFiller)
+CFile.prototype["RedactPage"] = function(pageIndex, arrRedactBox, arrayBufferFiller)
 {
-	return this._RedactPage(originIndex, arrRedactBox, arrayBufferFiller);
+	return this._RedactPage(pageIndex, arrRedactBox, arrayBufferFiller);
 };
 CFile.prototype["UndoRedact"] = function()
 {
@@ -267,9 +259,9 @@ CFile.prototype["getStructure"] = function()
 	return res;
 };
 
-CFile.prototype["getLinks"] = function(originIndex)
+CFile.prototype["getLinks"] = function(pageIndex)
 {
-	let ptr = this._getLinks(originIndex);
+	let ptr = this._getLinks(pageIndex);
 	let reader = ptr.getReader();
 
 	if (!reader) return [];
@@ -292,12 +284,11 @@ CFile.prototype["getLinks"] = function(originIndex)
 };
 
 // TEXT
-CFile.prototype["getGlyphs"] = function(originIndex)
+CFile.prototype["getGlyphs"] = function(pageIndex)
 {
-	let pageIndex = this.pages.findIndex(function(page) {
-		return page.originIndex == originIndex;
-	});
 	let page = this.pages[pageIndex];
+	if (page.originIndex == undefined)
+		return [];
 	if (page.fonts.length > 0)
 	{
 		// waiting fonts
@@ -305,7 +296,7 @@ CFile.prototype["getGlyphs"] = function(originIndex)
 	}
 
 	this.lockPageNumForFontsLoader(pageIndex, UpdateFontsSource.Page);
-	let res = this._getGlyphs(originIndex);
+	let res = this._getGlyphs(page.originIndex);
 	// there is no need to delete the result; this buffer is used as a text buffer 
 	// for text commands on other pages. After receiving ALL text pages, 
 	// you need to call destroyTextInfo()
@@ -362,26 +353,6 @@ CFile.prototype["getFontByID"] = function(ID)
 	return this._getFontByID(ID);
 };
 
-CFile.prototype["getGIDByUnicode"] = function(ID)
-{
-	let ptr = this._getGIDByUnicode(ID);
-	let reader = ptr.getReader();
-	if (!reader)
-		return {};
-
-	let res = {};
-	let nFontLength = reader.readInt();
-	for (let i = 0; i < nFontLength; i++)
-	{
-		let np1 = reader.readInt();
-		let np2 = reader.readInt();
-		res[np2] = np1;
-	}
-
-	ptr.free();
-	return res;
-};
-
 CFile.prototype["setCMap"] = function(memoryBuffer)
 {
 	if (!this.nativeFile)
@@ -429,7 +400,7 @@ function readAction(reader, rec, readDoubleFunc, readStringFunc)
 			case 6:
 			case 7:
 			{
-				let nFlag = reader.readInt();
+				let nFlag = reader.readByte();
 				if (nFlag & (1 << 0))
 					rec["left"] = readDoubleFunc.call(reader);
 				if (nFlag & (1 << 1))
@@ -441,9 +412,9 @@ function readAction(reader, rec, readDoubleFunc, readStringFunc)
 			case 4:
 			{
 				rec["left"]   = readDoubleFunc.call(reader);
-				rec["top"] = readDoubleFunc.call(reader);
+				rec["bottom"] = readDoubleFunc.call(reader);
 				rec["right"]  = readDoubleFunc.call(reader);
-				rec["bottom"]    = readDoubleFunc.call(reader);
+				rec["top"]    = readDoubleFunc.call(reader);
 				break;
 			}
 			case 1:
@@ -649,7 +620,6 @@ function readAnnotType(reader, rec, readDoubleFunc, readDouble2Func, readStringF
 					oFont["vertical"] = readDoubleFunc.call(reader);
 				if (nFontFlag & (1 << 6))
 					oFont["actual"] = readStringFunc.call(reader);
-				oFont["rtl"] = (nFontFlag >> 7) & 1;
 				oFont["size"] = readDoubleFunc.call(reader);
 				oFont["color"] = [];
 				oFont["color"].push(readDouble2Func.call(reader));
@@ -1055,37 +1025,6 @@ function readAnnotType(reader, rec, readDoubleFunc, readDouble2Func, readStringF
 			rec["font"]["style"] = reader.readInt();
 		}
 	}
-	// Link
-	else if (rec["type"] == 1)
-	{
-		flags = reader.readInt();
-		if (flags & (1 << 0))
-		{
-			rec["A"] = {};
-			if (isRead)
-				readStringFunc.call(reader);
-			readAction(reader, rec["A"], readDoubleFunc, readStringFunc);
-		}
-		if (flags & (1 << 1))
-		{
-			rec["PA"] = {};
-			if (isRead)
-				readStringFunc.call(reader);
-			readAction(reader, rec["PA"], readDoubleFunc, readStringFunc);
-		}
-		// Selection mode - H
-		// 0 - none, 1 - invert, 2 - push, 3 - outline
-		if (flags & (1 << 2))
-			rec["highlight"] = reader.readByte();
-		// QuadPoints
-		if (flags & (1 << 3))
-		{
-			let n = reader.readInt();
-			rec["QuadPoints"] = [];
-			for (let i = 0; i < n; ++i)
-				rec["QuadPoints"].push(readDoubleFunc.call(reader));
-		}
-	}
 }
 function readWidgetType(reader, rec, readDoubleFunc, readDouble2Func, readStringFunc, isRead = false)
 {
@@ -1230,20 +1169,6 @@ function readWidgetType(reader, rec, readDoubleFunc, readDouble2Func, readString
 			rec["value"] = readStringFunc.call(reader);
 		// 0 - check, 1 - cross, 2 - diamond, 3 - circle, 4 - star, 5 - square
 		rec["style"] = reader.readByte();
-		if (flags & (1 << 10))
-		{
-			let n = reader.readInt();
-			rec["opt"] = [];
-			for (let i = 0; i < n; ++i)
-			{
-				let opt1 = readStringFunc.call(reader);
-				let opt2 = readStringFunc.call(reader);
-				if (opt1 == "")
-					rec["opt"].push(opt2);
-				else
-					rec["opt"].push([opt2, opt1]);
-			}
-		}
 		if (flags & (1 << 14))
 			rec["ExportValue"] = readStringFunc.call(reader);
 		// 12.7.4.2.1
@@ -1482,7 +1407,7 @@ CFile.prototype["getInteractiveFormsInfo"] = function()
 // optional nWidget     - rec["AP"]["i"]
 // optional sView       - N/D/R
 // optional sButtonView - state pushbutton-annotation - Off/Yes(or rec["ExportValue"])
-CFile.prototype["getInteractiveFormsAP"] = function(originIndex, width, height, backgroundColor, nWidget, sView, sButtonView)
+CFile.prototype["getInteractiveFormsAP"] = function(pageIndex, width, height, backgroundColor, nWidget, sView, sButtonView)
 {
 	let nView = -1;
 	if (sView)
@@ -1498,11 +1423,8 @@ CFile.prototype["getInteractiveFormsAP"] = function(originIndex, width, height,
 	if (sButtonView)
 		nButtonView = (sButtonView == "Off" ? 0 : 1);
 
-	let pageIndex = this.pages.findIndex(function(page) {
-		return page.originIndex == originIndex;
-	});
 	this.lockPageNumForFontsLoader(pageIndex, UpdateFontsSource.Forms);
-	let ptr = this._getInteractiveFormsAP(width, height, backgroundColor, originIndex, nWidget, nView, nButtonView);
+	let ptr = this._getInteractiveFormsAP(width, height, backgroundColor, pageIndex, nWidget, nView, nButtonView);
 	let reader = ptr.getReader();
 	this.unlockPageNumForFontsLoader();
 	
@@ -1587,13 +1509,13 @@ CFile.prototype["getButtonIcons"] = function(pageIndex, width, height, backgroun
 	ptr.free();
 	return res;
 };
-// optional originIndex - get annotations from specific page
-CFile.prototype["getAnnotationsInfo"] = function(originIndex)
+// optional pageIndex - get annotations from specific page
+CFile.prototype["getAnnotationsInfo"] = function(pageIndex)
 {
 	if (!this.nativeFile)
 		return [];
 
-	let ptr = this._getAnnotationsInfo(originIndex);
+	let ptr = this._getAnnotationsInfo(pageIndex);
 	let reader = ptr.getReader();
 
 	if (!reader) return [];
@@ -1625,7 +1547,7 @@ CFile.prototype["getAnnotationsInfo"] = function(originIndex)
 };
 // optional nAnnot ...
 // optional sView ...
-CFile.prototype["getAnnotationsAP"] = function(originIndex, width, height, backgroundColor, nAnnot, sView)
+CFile.prototype["getAnnotationsAP"] = function(pageIndex, width, height, backgroundColor, nAnnot, sView)
 {
 	let nView = -1;
 	if (sView)
@@ -1638,11 +1560,8 @@ CFile.prototype["getAnnotationsAP"] = function(originIndex, width, height, backg
 			nView = 2;
 	}
 
-	let pageIndex = this.pages.findIndex(function(page) {
-		return page.originIndex == originIndex;
-	});
 	this.lockPageNumForFontsLoader(pageIndex, UpdateFontsSource.Annotation);
-	let ptr = this._getAnnotationsAP(width, height, backgroundColor, originIndex, nAnnot, nView);
+	let ptr = this._getAnnotationsAP(width, height, backgroundColor, pageIndex, nAnnot, nView);
 	let reader = ptr.getReader();
 	this.unlockPageNumForFontsLoader();
 
@@ -1721,11 +1640,6 @@ CFile.prototype["readAnnotationsInfoFromBinary"] = function(AnnotInfo)
 };
 
 // SCAN PAGES
-CFile.prototype["scanPageFonts"] = function(page)
-{
-	this._setScanPageFonts(page);
-};
-
 CFile.prototype["scanPage"] = function(page, mode)
 {
 	let ptr = this._scanPage(page, mode);

DesktopEditor/graphics/pro/js/wasm/js/drawingfile_native.js

@@ -137,7 +137,7 @@ CFile.prototype._UndoMergePages = function()
 
 CFile.prototype._RedactPage = function(pageIndex, box, filler)
 {
-	let dataFiller = (undefined !== filler.byteLength) ? new Uint8Array(filler) : filler;
+	let dataFiller = (undefined !== filler.byteLength) ? new Float64Array(filler) : filler;
 	return g_native_drawing_file["RedactPage"](pageIndex, box, dataFiller);
 };
 
@@ -146,16 +146,6 @@ CFile.prototype._UndoRedact = function()
 	return g_native_drawing_file["UndoRedact"]();
 };
 
-CFile.prototype._CheckOwnerPassword = function(password)
-{
-	return true;
-}
-
-CFile.prototype._CheckPerm = function(perm)
-{
-	return true;
-}
-
 // FONTS
 CFile.prototype._isNeedCMap = function()
 {
@@ -172,12 +162,6 @@ CFile.prototype._getFontByID = function(ID)
 	return g_native_drawing_file["GetFontBinary"](ID);
 };
 
-CFile.prototype._getGIDByUnicode = function(ID)
-{
-	g_module_pointer.ptr = g_native_drawing_file["GetGIDByUnicode"](ID);
-	return g_module_pointer;
-}
-
 CFile.prototype._getInteractiveFormsFonts = function(type)
 {
 	g_module_pointer.ptr = g_native_drawing_file["GetInteractiveFormsFonts"](type);
@@ -252,11 +236,6 @@ CFile.prototype._getInteractiveFormsAP = function(width, height, backgroundColor
 };
 
 // SCAN PAGES
-CFile.prototype._setScanPageFonts = function(page)
-{
-	g_native_drawing_file["SetScanPageFonts"](page);
-};
-
 CFile.prototype._scanPage = function(page, mode)
 {
 	g_module_pointer.ptr = g_native_drawing_file["ScanPage"](page, (mode === undefined) ? 0 : mode);

DesktopEditor/graphics/pro/js/wasm/js/drawingfile_wasm.js

@@ -106,7 +106,7 @@ CFile.prototype._openFile = function(buffer, password)
 	}
 
 	let passwordPtr = 0;
-	if (password !== undefined)
+	if (password)
 	{
 		let passwordBuf = password.toUtf8();
 		passwordPtr = Module["_malloc"](passwordBuf.length);
@@ -211,7 +211,7 @@ CFile.prototype._RedactPage = function(pageIndex, arrRedactBox, arrayBufferFille
 	let pointer = Module["_malloc"](memoryBuffer.length * 4);
 	Module["HEAP32"].set(memoryBuffer, pointer >> 2);
 
-	let bRes = Module["_RedactPage"](this.nativeFile, pageIndex, pointer, memoryBuffer.length / 8, changesPtr, changesLen);
+	let bRes = Module["_RedactPage"](this.nativeFile, pageIndex, pointer, memoryBuffer.length / 4, changesPtr, changesLen);
 	changesPtr = 0; // Success or not, changesPtr is either taken or freed
 
 	Module["_free"](pointer);
@@ -224,29 +224,6 @@ CFile.prototype._UndoRedact = function()
 	return Module["_UndoRedact"](this.nativeFile) == 1;
 };
 
-CFile.prototype._CheckOwnerPassword = function(password)
-{
-	let passwordPtr = 0;
-	if (password !== undefined)
-	{
-		let passwordBuf = password.toUtf8();
-		passwordPtr = Module["_malloc"](passwordBuf.length);
-		Module["HEAP8"].set(passwordBuf, passwordPtr);
-	}
-
-	let bRes = Module["_CheckOwnerPassword"](this.nativeFile, passwordPtr);
-
-	if (passwordPtr)
-		Module["_free"](passwordPtr);
-
-	return bRes == 1;
-}
-
-CFile.prototype._CheckPerm = function(perm)
-{
-	return Module["_CheckPerm"](this.nativeFile, perm) == 1;
-}
-
 // FONTS
 CFile.prototype._isNeedCMap = function()
 {
@@ -286,19 +263,6 @@ CFile.prototype._getFontByID = function(ID)
 	return res;
 };
 
-CFile.prototype._getGIDByUnicode = function(ID)
-{
-	if (ID === undefined)
-		return null;
-
-	let idBuffer = ID.toUtf8();
-	let idPointer = Module["_malloc"](idBuffer.length);
-	Module["HEAP8"].set(idBuffer, idPointer);
-	g_module_pointer.ptr = Module["_GetGIDByUnicode"](this.nativeFile, idPointer);
-	Module["_free"](idPointer);
-	return g_module_pointer;
-}
-
 CFile.prototype._getInteractiveFormsFonts = function(type)
 {
 	g_module_pointer.ptr = Module["_GetInteractiveFormsFonts"](this.nativeFile, type);
@@ -373,11 +337,6 @@ CFile.prototype._getInteractiveFormsAP = function(width, height, backgroundColor
 };
 
 // SCAN PAGES
-CFile.prototype._setScanPageFonts = function(page)
-{
-	Module["_SetScanPageFonts"](this.nativeFile, page);
-};
-
 CFile.prototype._scanPage = function(page, mode)
 {
 	g_module_pointer.ptr = Module["_ScanPage"](this.nativeFile, page, (mode === undefined) ? 0 : mode);

DesktopEditor/graphics/pro/js/wasm/src/drawingfile.cpp

@@ -80,7 +80,7 @@ WASM_EXPORT CDrawingFile* Open(BYTE* data, LONG size, const char* password)
 	std::wstring sPassword = L"";
 	if (NULL != password)
 		sPassword = NSFile::CUtf8Converter::GetUnicodeStringFromUTF8((BYTE*)password, strlen(password));
-	pFile->OpenFile(data, size, password ? sPassword.c_str() : NULL);
+	pFile->OpenFile(data, size, sPassword);
 	return pFile;
 }
 WASM_EXPORT int GetType(CDrawingFile* pFile)
@@ -150,10 +150,6 @@ WASM_EXPORT BYTE* GetFontBinary(CDrawingFile* pFile, char* path)
 {
 	return pFile->GetFontBinary(std::string(path));
 }
-WASM_EXPORT BYTE* GetGIDByUnicode(CDrawingFile* pFile, char* path)
-{
-	return pFile->GetGIDByUnicode(std::string(path));
-}
 WASM_EXPORT void DestroyTextInfo(CDrawingFile* pFile)
 {
 	return pFile->DestroyTextInfo();
@@ -166,10 +162,6 @@ WASM_EXPORT void SetCMapData(CDrawingFile* pFile, BYTE* data, int size)
 {
 	pFile->SetCMapData(data, size);
 }
-WASM_EXPORT void SetScanPageFonts(CDrawingFile* pFile, int nPageIndex)
-{
-	return pFile->SetScanPageFonts(nPageIndex);
-}
 WASM_EXPORT BYTE* ScanPage(CDrawingFile* pFile, int nPageIndex, int mode)
 {
 	return pFile->ScanPage(nPageIndex, mode);
@@ -186,12 +178,12 @@ WASM_EXPORT int UnmergePages(CDrawingFile* pFile)
 {
 	return pFile->UnmergePages() ? 1 : 0;
 }
-WASM_EXPORT int RedactPage(CDrawingFile* pFile, int nPageIndex, int* arrRedactBox, int nLengthX8, BYTE* data, int size)
+WASM_EXPORT int RedactPage(CDrawingFile* pFile, int nPageIndex, int* arrRedactBox, int nLengthX4, BYTE* data, int size)
 {
-	double* arrDRedactBox = new double[nLengthX8 * 8];
-	for (int i = 0; i < nLengthX8 * 8; ++i)
+	double* arrDRedactBox = new double[nLengthX4 * 4];
+	for (int i = 0; i < nLengthX4 * 4; ++i)
 		arrDRedactBox[i] = arrRedactBox[i] / 10000.0;
-	int nRes = pFile->RedactPage(nPageIndex, arrDRedactBox, nLengthX8, data, size) ? 1 : 0;
+	int nRes = pFile->RedactPage(nPageIndex, arrDRedactBox, nLengthX4, data, size) ? 1 : 0;
 	delete[] arrDRedactBox;
 	return nRes;
 }
@@ -199,17 +191,6 @@ WASM_EXPORT int UndoRedact(CDrawingFile* pFile)
 {
 	return pFile->UndoRedact() ? 1 : 0;
 }
-WASM_EXPORT int CheckOwnerPassword(CDrawingFile* pFile, const char* password)
-{
-	std::wstring sPassword = L"";
-	if (NULL != password)
-		sPassword = NSFile::CUtf8Converter::GetUnicodeStringFromUTF8((BYTE*)password, strlen(password));
-	return pFile->CheckOwnerPassword(password ? sPassword.c_str() : NULL) ? 1 : 0;
-}
-WASM_EXPORT int CheckPerm(CDrawingFile* pFile, int nPermFlag)
-{
-	return pFile->CheckPerm(nPermFlag) ? 1 : 0;
-}
 
 WASM_EXPORT void* GetImageBase64(CDrawingFile* pFile, int rId)
 {

DesktopEditor/graphics/pro/js/wasm/src/drawingfile_test.cpp

@@ -704,23 +704,6 @@ void ReadInteractiveForms(BYTE* pWidgets, int& i)
 			i += 1;
 			std::cout << "Style " << arrStyle[nPathLength] << ", ";
 
-			if (nFlags & (1 << 10))
-			{
-				int nOptLength = READ_INT(pWidgets + i);
-				i += 4;
-				for (int j = 0; j < nOptLength; ++j)
-				{
-					nPathLength = READ_INT(pWidgets + i);
-					i += 4;
-					std::cout << std::to_string(j) << " Opt1 " << std::string((char*)(pWidgets + i), nPathLength) << ", ";
-					i += nPathLength;
-
-					nPathLength = READ_INT(pWidgets + i);
-					i += 4;
-					std::cout << std::to_string(j) << " Opt2 " << std::string((char*)(pWidgets + i), nPathLength) << ", ";
-					i += nPathLength;
-				}
-			}
 			if (nFlags & (1 << 14))
 			{
 				nPathLength = READ_INT(pWidgets + i);
@@ -955,36 +938,6 @@ void ReadInteractiveFormsFonts(CDrawingFile* pGrFile, int nType)
 				std::cout << "font" << j << ".txt";
 			}
 
-			if (pFont)
-				free(pFont);
-
-			if (true)
-				continue;
-
-			pFont = GetGIDByUnicode(pGrFile, (char*)sFontName.c_str());
-			nLength2 = READ_INT(pFont);
-			i2 = 4;
-			nLength2 -= 4;
-
-			while (i2 < nLength2)
-			{
-				int nFontLength = READ_INT(pFont + i2);
-				i2 += 4;
-
-				std::cout << std::endl << "GIDtoUnicode" << std::endl;
-
-				for (int j = 0; j < nFontLength; ++j)
-				{
-					unsigned int code = READ_INT(pFont + i2);
-					i2 += 4;
-					unsigned int unicode = READ_INT(pFont + i2);
-					i2 += 4;
-					std::cout << "gid\t" << code << "\tunicode\t" << unicode << std::endl;
-				}
-
-				std::cout << std::endl;
-			}
-
 			if (pFont)
 				free(pFont);
 		}
@@ -1023,8 +976,6 @@ bool GetFromBase64(const std::wstring& sPath, BYTE** pBuffer, int* nBufferLen)
 		if (!NSBase64::Base64Decode((const char*)pFileContent, dwFileSize, *pBuffer, nBufferLen))
 			return false;
 	}
-	else
-		return false;
 	oFile.CloseFile();
 	return true;
 }
@@ -1072,7 +1023,7 @@ int main(int argc, char* argv[])
 	if (!NSFile::CFileBinary::ReadAllBytes(sFilePath, &pFileData, nFileDataLen))
 		return 1;
 
-	CDrawingFile* pGrFile = Open(pFileData, (LONG)nFileDataLen, NULL);
+	CDrawingFile* pGrFile = Open(pFileData, (LONG)nFileDataLen, "");
 	int nError = GetErrorCode(pGrFile);
 
 	if (nError != 0)
@@ -1080,7 +1031,7 @@ int main(int argc, char* argv[])
 		Close(pGrFile);
 		if (nError == 4)
 		{
-			std::string sPassword = "";
+			std::string sPassword = "123456";
 			pGrFile = Open(pFileData, nFileDataLen, sPassword.c_str());
 		}
 		else
@@ -1098,7 +1049,7 @@ int main(int argc, char* argv[])
 		int nBufferLen = NULL;
 		BYTE* pBuffer = NULL;
 
-		if (true && GetFromBase64(NSFile::GetProcessDirectory() + L"/split.txt", &pBuffer, &nBufferLen))
+		if (GetFromBase64(NSFile::GetProcessDirectory() + L"/split1.txt", &pBuffer, &nBufferLen))
 		{
 			std::vector<int> arrPages = { 0 };
 			BYTE* pSplitPages = SplitPages(pGrFile, arrPages.data(), arrPages.size(), pBuffer, nBufferLen);
@@ -1107,28 +1058,40 @@ int main(int argc, char* argv[])
 			if (nLength > 4)
 			{
 				NSFile::CFileBinary oFile;
-				if (oFile.CreateFileW(NSFile::GetProcessDirectory() + L"/split.pdf"))
+				if (oFile.CreateFileW(NSFile::GetProcessDirectory() + L"/split1.pdf"))
 					oFile.WriteFile(pSplitPages + 4, nLength - 4);
 				oFile.CloseFile();
+
+				BYTE* pMallocData = (BYTE*)malloc(nLength - 4);
+				memcpy(pMallocData, pSplitPages + 4, nLength - 4);
+
+				MergePages(pGrFile, pMallocData, nLength - 4, 0, "merge1");
 			}
 			RELEASEARRAYOBJECTS(pSplitPages);
 		}
 		RELEASEARRAYOBJECTS(pBuffer);
 
-		if (true)
+		if (GetFromBase64(NSFile::GetProcessDirectory() + L"/split2.txt", &pBuffer, &nBufferLen))
 		{
-			NSFile::CFileBinary oFile;
-			if (oFile.OpenFile(NSFile::GetProcessDirectory() + L"/split.pdf"))
-			{
-				DWORD dwFileSize = oFile.GetFileSize();
-				BYTE* pFileContent = (BYTE*)malloc(dwFileSize);
+			std::vector<int> arrPages = { 0 };
+			BYTE* pSplitPages = SplitPages(pGrFile, arrPages.data(), arrPages.size(), pBuffer, nBufferLen);
+			int nLength = READ_INT(pSplitPages);
 
-				DWORD dwReaded;
-				if (oFile.ReadFile(pFileContent, dwFileSize, dwReaded))
-					MergePages(pGrFile, pFileContent, dwReaded, 0, "merge1");
+			if (nLength > 4)
+			{
+				NSFile::CFileBinary oFile;
+				if (oFile.CreateFileW(NSFile::GetProcessDirectory() + L"/split2.pdf"))
+					oFile.WriteFile(pSplitPages + 4, nLength - 4);
+				oFile.CloseFile();
+
+				BYTE* pMallocData = (BYTE*)malloc(nLength - 4);
+				memcpy(pMallocData, pSplitPages + 4, nLength - 4);
+
+				MergePages(pGrFile, pMallocData, nLength - 4, 0, "merge2");
 			}
-			oFile.CloseFile();
+			RELEASEARRAYOBJECTS(pSplitPages);
 		}
+		RELEASEARRAYOBJECTS(pBuffer);
 	}
 
 	// INFO
@@ -1172,38 +1135,26 @@ int main(int argc, char* argv[])
 		}
 	}
 
-	// OWNER PASSWORD
-	if (false)
-	{
-		std::string sPassword = "";
-		std::cout << "CheckPerm 4 Edit "  << CheckPerm(pGrFile, 4) << std::endl;
-		std::cout << "CheckPerm 4 Print " << CheckPerm(pGrFile, 3) << std::endl;
-
-		std::cout << "CheckOwnerPassword " << CheckOwnerPassword(pGrFile, sPassword.c_str()) << std::endl;
-		std::cout << "CheckPerm 4 Edit "  << CheckPerm(pGrFile, 4) << std::endl;
-		std::cout << "CheckPerm 4 Print " << CheckPerm(pGrFile, 3) << std::endl;
-	}
-
+	BYTE* pColor = new BYTE[12] { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
 	// REDACT
-	if (false)
+	if (true)
 	{
-		BYTE* pColor = new BYTE[12] { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
-		int pRect[8] = { 307499, 217499, 307499, 1124999, 1799999, 1124999, 1799999, 217499 };
+		int pRect[4] = { 307499, 217499, 1799999, 1124999 };
 		if (!RedactPage(pGrFile, nTestPage, pRect, 1, pColor, 12))
 			std::cout << "Redact false" << std::endl;
 	}
 
-	// RASTER
-	if (false)
+	int i = nTestPage;
+	//for (int i = 0; i < nPagesCount; ++i)
 	{
-		int i = nTestPage;
-		//for (int i = 0; i < nPagesCount; ++i)
+		// RASTER
+		if (true)
 		{
 			nWidth  = READ_INT(pInfo + i * 16 + 12);
 			nHeight = READ_INT(pInfo + i * 16 + 16);
 
-			//nWidth  *= 2;
-			//nHeight *= 2;
+			//nWidth  *= 3;
+			//nHeight *= 3;
 
 			BYTE* res = NULL;
 			res = GetPixmap(pGrFile, i, nWidth, nHeight, 0xFFFFFF);
@@ -1223,7 +1174,7 @@ int main(int argc, char* argv[])
 	free(pInfo);
 
 	// LINKS
-	if (false && nPagesCount > 0)
+	if (true && nPagesCount > 0)
 	{
 		BYTE* pLinks = GetLinks(pGrFile, nTestPage);
 		nLength = READ_INT(pLinks);
@@ -1259,7 +1210,7 @@ int main(int argc, char* argv[])
 	}
 
 	// STRUCTURE
-	if (false)
+	if (true)
 	{
 		BYTE* pStructure = GetStructure(pGrFile);
 		nLength = READ_INT(pStructure);
@@ -1572,8 +1523,6 @@ int main(int argc, char* argv[])
 								std::cout << "; font-actual:" << std::string((char*)(pAnnots + i), nPathLength) << "; ";
 								i += nPathLength;
 							}
-							if (nFontFlag & (1 << 7))
-								std::cout << "; dir:rtl; ";
 
 							nPathLength = READ_INT(pAnnots + i);
 							i += 4;
@@ -2191,44 +2140,6 @@ int main(int argc, char* argv[])
 						std::cout << nPathLength << ", ";
 					}
 				}
-				else if (sType == "Link")
-				{
-					nFlags = READ_INT(pAnnots + i);
-					i += 4;
-					if (nFlags & (1 << 0))
-					{
-						std::cout << std::endl << "A ";
-						ReadAction(pAnnots, i);
-						std::cout << std::endl;
-					}
-					if (nFlags & (1 << 1))
-					{
-						std::cout << std::endl << "PA ";
-						ReadAction(pAnnots, i);
-						std::cout << std::endl;
-					}
-					if (nFlags & (1 << 2))
-					{
-						std::string arrHighlighting[] = {"none", "invert", "push", "outline"};
-						nPathLength = READ_BYTE(pAnnots + i);
-						i += 1;
-						std::cout << "Highlight " << arrHighlighting[nPathLength] << ", ";
-					}
-					if (nFlags & (1 << 3))
-					{
-						std::cout << "QuadPoints";
-						int nQuadPointsLength = READ_INT(pAnnots + i);
-						i += 4;
-
-						for (int j = 0; j < nQuadPointsLength; ++j)
-						{
-							nPathLength = READ_INT(pAnnots + i);
-							i += 4;
-							std::cout << " " << (double)nPathLength / 100.0;
-						}
-						std::cout << ", ";
-					}
-				}
 
 				std::cout << std::endl << "]" << std::endl;
 			}
@@ -2251,13 +2162,12 @@ int main(int argc, char* argv[])
 			free(pAnnotAP);
 	}
 
-	// SCAN PAGE Fonts
+	// SCAN PAGE
 	if (false)
 	{
-		SetScanPageFonts(pGrFile, nTestPage);
-
-		ReadInteractiveFormsFonts(pGrFile, 1);
-		ReadInteractiveFormsFonts(pGrFile, 2);
+		BYTE* pScan = ScanPage(pGrFile, nTestPage, 1);
+		if (pScan)
+			free(pScan);
 	}
 
 	Close(pGrFile);

DesktopEditor/graphics/pro/metafile.pri

@@ -121,8 +121,7 @@ METAFILE_PATH = $$PWD/../../raster/Metafile
 			$$METAFILE_PATH/svg/SvgObjects/CFont.h \
 			$$METAFILE_PATH/svg/SvgObjects/CStyle.h \
 			$$METAFILE_PATH/svg/SvgObjects/CObjectBase.h \
-			$$METAFILE_PATH/svg/SvgUtils.h \
-			$$METAFILE_PATH/svg/SvgReader.h
+			$$METAFILE_PATH/svg/SvgUtils.h
 
 		SOURCES += 	\
 			$$METAFILE_PATH/svg/CSvgFile.cpp \
@@ -146,8 +145,7 @@ METAFILE_PATH = $$PWD/../../raster/Metafile
 			$$METAFILE_PATH/svg/SvgObjects/CPolyline.cpp \
 			$$METAFILE_PATH/svg/SvgObjects/CFont.cpp \
 			$$METAFILE_PATH/svg/SvgObjects/CObjectBase.cpp \
-			$$METAFILE_PATH/svg/SvgObjects/CStyle.cpp \
-			$$METAFILE_PATH/svg/SvgReader.cpp
+			$$METAFILE_PATH/svg/SvgObjects/CStyle.cpp
 
 		CONFIG += css_calculator_without_xhtml
 

DesktopEditor/graphics/pro/officedrawingfile.h

@@ -63,9 +63,9 @@ public:
 
     // Open
     virtual bool LoadFromFile(const std::wstring& file, const std::wstring& options = L"",
-								const wchar_t* owner_password = NULL, const wchar_t* user_password = NULL) = 0;
+                                const std::wstring& owner_password = L"", const std::wstring& user_password = L"") = 0;
     virtual bool LoadFromMemory(unsigned char* data, unsigned long length, const std::wstring& options = L"",
-								const wchar_t* owner_password = NULL, const wchar_t* user_password = NULL) = 0;
+                                const std::wstring& owner_password = L"", const std::wstring& user_password = L"") = 0;
 
     // Close
     virtual void Close() = 0;

DesktopEditor/graphics/structures.h

@@ -113,10 +113,7 @@ const long c_BrushTypeTensorCurveGradient = 6007;
 
 const long c_BrushTextureModeStretch = 0;
 const long c_BrushTextureModeTile = 1;
-const long c_BrushTextureModeTileFlipX = 2;
-const long c_BrushTextureModeTileFlipY = 3;
-const long c_BrushTextureModeTileFlipXY = 4;
-const long c_BrushTextureModeTileCenter = 5;
+const long c_BrushTextureModeTileCenter = 2;
 // --------------------------------------------------------------
 
 namespace Aggplus { class CImage; }
@@ -287,13 +284,6 @@ namespace NSStructures
 		Aggplus::RectF Rect;
 		Aggplus::CDoubleRect Bounds;
 
-		int IsScale;
-		double ScaleX;
-		double ScaleY;
-
-		double OffsetX;
-		double OffsetY;
-
 		double LinearAngle;
 		std::vector<TSubColor> m_arrSubColors;
 		NSStructures::GradientInfo m_oGradientInfo;
@@ -425,13 +415,6 @@ namespace NSStructures
 			Rect.Width = 0.0F;
 			Rect.Height = 0.0F;
 
-			IsScale = FALSE;
-			ScaleX = 1.0;
-			ScaleY = 1.0;
-
-			OffsetX = 0.0;
-			OffsetY = 0.0;
-
 			Bounds.left = 0;
 			Bounds.top = 0;
 			Bounds.right = 0;
@@ -471,10 +454,6 @@ namespace NSStructures
 			Rect = other.Rect;
 			Bounds = other.Bounds;
 
-			IsScale = other.IsScale;
-			ScaleX = other.ScaleX;
-			ScaleY = other.ScaleY;
-
 			LinearAngle = other.LinearAngle;
 			m_arrSubColors = other.m_arrSubColors;
 			m_oGradientInfo = other.m_oGradientInfo;

DesktopEditor/graphics/tests/BooleanOperations_Unit-tests/tst_booleanoperations.cpp

@@ -50,9 +50,9 @@ TEST(BooleanOperations, NoIntersOutside)
 	resultSubtract.CloseFigure();
 
 
-	EXPECT_TRUE(Aggplus::CalcBooleanOperation(path1, path2, Aggplus::Intersection).Equals(resultIntersect));
-	EXPECT_TRUE(Aggplus::CalcBooleanOperation(path1, path2, Aggplus::Union).Equals(resultUnite));
-	EXPECT_TRUE(Aggplus::CalcBooleanOperation(path1, path2, Aggplus::Subtraction).Equals(resultSubtract));
+	EXPECT_TRUE(Aggplus::CalcBooleanOperation(path1, path2, Aggplus::Intersection) == resultIntersect);
+	EXPECT_TRUE(Aggplus::CalcBooleanOperation(path1, path2, Aggplus::Union) == resultUnite);
+	EXPECT_TRUE(Aggplus::CalcBooleanOperation(path1, path2, Aggplus::Subtraction) == resultSubtract);
 }
 
 TEST(BooleanOperations, NoIntersInside)
@@ -105,9 +105,9 @@ TEST(BooleanOperations, NoIntersInside)
 	resultSubtract.CloseFigure();
 
 
-	EXPECT_TRUE(Aggplus::CalcBooleanOperation(path1, path2, Aggplus::Intersection).Equals(resultIntersect));
-	EXPECT_TRUE(Aggplus::CalcBooleanOperation(path1, path2, Aggplus::Union).Equals(resultUnite));
-	EXPECT_TRUE(Aggplus::CalcBooleanOperation(path1, path2, Aggplus::Subtraction).Equals(resultSubtract));
+	EXPECT_TRUE(Aggplus::CalcBooleanOperation(path1, path2, Aggplus::Intersection) == resultIntersect);
+	EXPECT_TRUE(Aggplus::CalcBooleanOperation(path1, path2, Aggplus::Union) == resultUnite);
+	EXPECT_TRUE(Aggplus::CalcBooleanOperation(path1, path2, Aggplus::Subtraction) == resultSubtract);
 }
 
 TEST(BooleanOperations, OneIntersOutside)
@@ -154,9 +154,9 @@ TEST(BooleanOperations, OneIntersOutside)
 	resultSubtract.CloseFigure();
 
 
-	EXPECT_TRUE(Aggplus::CalcBooleanOperation(path1, path2, Aggplus::Intersection).Equals(resultIntersect));
-	EXPECT_TRUE(Aggplus::CalcBooleanOperation(path1, path2, Aggplus::Union).Equals(resultUnite));
-	EXPECT_TRUE(Aggplus::CalcBooleanOperation(path1, path2, Aggplus::Subtraction).Equals(resultSubtract));
+	EXPECT_TRUE(Aggplus::CalcBooleanOperation(path1, path2, Aggplus::Intersection) == resultIntersect);
+	EXPECT_TRUE(Aggplus::CalcBooleanOperation(path1, path2, Aggplus::Union) == resultUnite);
+	EXPECT_TRUE(Aggplus::CalcBooleanOperation(path1, path2, Aggplus::Subtraction) == resultSubtract);
 }
 
 TEST(BooleanOperations, OneIntersInside)
@@ -206,9 +206,9 @@ TEST(BooleanOperations, OneIntersInside)
 	resultSubtract.CloseFigure();
 
 
-	EXPECT_TRUE(Aggplus::CalcBooleanOperation(path1, path2, Aggplus::Intersection).Equals(resultIntersect));
-	EXPECT_TRUE(Aggplus::CalcBooleanOperation(path1, path2, Aggplus::Union).Equals(resultUnite));
-	EXPECT_TRUE(Aggplus::CalcBooleanOperation(path1, path2, Aggplus::Subtraction).Equals(resultSubtract));
+	EXPECT_TRUE(Aggplus::CalcBooleanOperation(path1, path2, Aggplus::Intersection) == resultIntersect);
+	EXPECT_TRUE(Aggplus::CalcBooleanOperation(path1, path2, Aggplus::Union) == resultUnite);
+	EXPECT_TRUE(Aggplus::CalcBooleanOperation(path1, path2, Aggplus::Subtraction) == resultSubtract);
 }
 
 TEST(BooleanOperations, OverlapOutside)
@@ -258,9 +258,9 @@ TEST(BooleanOperations, OverlapOutside)
 	resultSubtract.CloseFigure();
 
 
-	EXPECT_TRUE(Aggplus::CalcBooleanOperation(path1, path2, Aggplus::Intersection).Equals(resultIntersect));
-	EXPECT_TRUE(Aggplus::CalcBooleanOperation(path1, path2, Aggplus::Union).Equals(resultUnite));
-	EXPECT_TRUE(Aggplus::CalcBooleanOperation(path1, path2, Aggplus::Subtraction).Equals(resultSubtract));
+	EXPECT_TRUE(Aggplus::CalcBooleanOperation(path1, path2, Aggplus::Intersection) == resultIntersect);
+	EXPECT_TRUE(Aggplus::CalcBooleanOperation(path1, path2, Aggplus::Union) == resultUnite);
+	EXPECT_TRUE(Aggplus::CalcBooleanOperation(path1, path2, Aggplus::Subtraction) == resultSubtract);
 }
 
 TEST(BooleanOperations, OverlapInside)
@@ -312,9 +312,9 @@ TEST(BooleanOperations, OverlapInside)
 	resultSubtract.CloseFigure();
 
 
-	EXPECT_TRUE(Aggplus::CalcBooleanOperation(path1, path2, Aggplus::Intersection).Equals(resultIntersect));
-	EXPECT_TRUE(Aggplus::CalcBooleanOperation(path1, path2, Aggplus::Union).Equals(resultUnite));
-	EXPECT_TRUE(Aggplus::CalcBooleanOperation(path1, path2, Aggplus::Subtraction).Equals(resultSubtract));
+	EXPECT_TRUE(Aggplus::CalcBooleanOperation(path1, path2, Aggplus::Intersection) == resultIntersect);
+	EXPECT_TRUE(Aggplus::CalcBooleanOperation(path1, path2, Aggplus::Union) == resultUnite);
+	EXPECT_TRUE(Aggplus::CalcBooleanOperation(path1, path2, Aggplus::Subtraction) == resultSubtract);
 }
 
 TEST(BooleanOperations, LineIntersLine)
@@ -368,9 +368,9 @@ TEST(BooleanOperations, LineIntersLine)
 	resultSubtract.CloseFigure();
 
 
-	EXPECT_TRUE(Aggplus::CalcBooleanOperation(path1, path2, Aggplus::Intersection).Equals(resultIntersect));
-	EXPECT_TRUE(Aggplus::CalcBooleanOperation(path1, path2, Aggplus::Union).Equals(resultUnite));
-	EXPECT_TRUE(Aggplus::CalcBooleanOperation(path1, path2, Aggplus::Subtraction).Equals(resultSubtract));
+	EXPECT_TRUE(Aggplus::CalcBooleanOperation(path1, path2, Aggplus::Intersection) == resultIntersect);
+	EXPECT_TRUE(Aggplus::CalcBooleanOperation(path1, path2, Aggplus::Union) == resultUnite);
+	EXPECT_TRUE(Aggplus::CalcBooleanOperation(path1, path2, Aggplus::Subtraction) == resultSubtract);
 }
 
 TEST(BooleanOperations, CurveIntersLine)
@@ -415,9 +415,9 @@ TEST(BooleanOperations, CurveIntersLine)
 	resultSubtract.CloseFigure();
 
 
-	EXPECT_TRUE(Aggplus::CalcBooleanOperation(path1, path2, Aggplus::Intersection).Equals(resultIntersect));
-	EXPECT_TRUE(Aggplus::CalcBooleanOperation(path1, path2, Aggplus::Union).Equals(resultUnite));
-	EXPECT_TRUE(Aggplus::CalcBooleanOperation(path1, path2, Aggplus::Subtraction).Equals(resultSubtract));
+	EXPECT_TRUE(Aggplus::CalcBooleanOperation(path1, path2, Aggplus::Intersection) == resultIntersect);
+	EXPECT_TRUE(Aggplus::CalcBooleanOperation(path1, path2, Aggplus::Union) == resultUnite);
+	EXPECT_TRUE(Aggplus::CalcBooleanOperation(path1, path2, Aggplus::Subtraction) == resultSubtract);
 }
 
 TEST(BooleanOperations, CurveIntersCurve)
@@ -453,9 +453,9 @@ TEST(BooleanOperations, CurveIntersCurve)
 	resultSubtract.CloseFigure();
 
 
-	EXPECT_TRUE(Aggplus::CalcBooleanOperation(path1, path2, Aggplus::Intersection).Equals(resultIntersect));
-	EXPECT_TRUE(Aggplus::CalcBooleanOperation(path1, path2, Aggplus::Union).Equals(resultUnite));
-	EXPECT_TRUE(Aggplus::CalcBooleanOperation(path1, path2, Aggplus::Subtraction).Equals(resultSubtract));
+	EXPECT_TRUE(Aggplus::CalcBooleanOperation(path1, path2, Aggplus::Intersection) == resultIntersect);
+	EXPECT_TRUE(Aggplus::CalcBooleanOperation(path1, path2, Aggplus::Union) == resultUnite);
+	EXPECT_TRUE(Aggplus::CalcBooleanOperation(path1, path2, Aggplus::Subtraction) == resultSubtract);
 }
 
 TEST(BooleanOperations, RectIntersRect)
@@ -508,9 +508,9 @@ TEST(BooleanOperations, RectIntersRect)
 	resultSubtract.LineTo(55.0, 25.0);
 	resultSubtract.CloseFigure();
 
-	EXPECT_TRUE(Aggplus::CalcBooleanOperation(path1, path2, Aggplus::Intersection).Equals(resultIntersect));
-	EXPECT_TRUE(Aggplus::CalcBooleanOperation(path1, path2, Aggplus::Union).Equals(resultUnite));
-	EXPECT_TRUE(Aggplus::CalcBooleanOperation(path1, path2, Aggplus::Subtraction).Equals(resultSubtract));
+	EXPECT_TRUE(Aggplus::CalcBooleanOperation(path1, path2, Aggplus::Intersection) == resultIntersect);
+	EXPECT_TRUE(Aggplus::CalcBooleanOperation(path1, path2, Aggplus::Union) == resultUnite);
+	EXPECT_TRUE(Aggplus::CalcBooleanOperation(path1, path2, Aggplus::Subtraction) == resultSubtract);
 }
 
 TEST(BooleanOperations, EllipseIntersEllipse)
@@ -550,9 +550,9 @@ TEST(BooleanOperations, EllipseIntersEllipse)
 	resultSubtract.CurveTo(303.228, 82.0, 348.0, 126.772, 348.0, 182.0);
 	resultSubtract.CloseFigure();
 
-	EXPECT_TRUE(Aggplus::CalcBooleanOperation(path1, path2, Aggplus::Intersection).Equals(resultIntersect));
-	EXPECT_TRUE(Aggplus::CalcBooleanOperation(path1, path2, Aggplus::Union).Equals(resultUnite));
-	EXPECT_TRUE(Aggplus::CalcBooleanOperation(path1, path2, Aggplus::Subtraction).Equals(resultSubtract));
+	EXPECT_TRUE(Aggplus::CalcBooleanOperation(path1, path2, Aggplus::Intersection) == resultIntersect);
+	EXPECT_TRUE(Aggplus::CalcBooleanOperation(path1, path2, Aggplus::Union) == resultUnite);
+	EXPECT_TRUE(Aggplus::CalcBooleanOperation(path1, path2, Aggplus::Subtraction) == resultSubtract);
 }
 
 TEST(BooleanOperations, EllipseIntersCross)
@@ -621,9 +621,9 @@ TEST(BooleanOperations, EllipseIntersCross)
 	resultSubtract.CurveTo(188.228, 60, 233, 104.772, 233, 160);
 	resultSubtract.CloseFigure();
 
-	EXPECT_TRUE(Aggplus::CalcBooleanOperation(path1, path2, Aggplus::Intersection).Equals(resultIntersect));
-	EXPECT_TRUE(Aggplus::CalcBooleanOperation(path1, path2, Aggplus::Union).Equals(resultUnite));
-	EXPECT_TRUE(Aggplus::CalcBooleanOperation(path1, path2, Aggplus::Subtraction).Equals(resultSubtract));
+	EXPECT_TRUE(Aggplus::CalcBooleanOperation(path1, path2, Aggplus::Intersection) == resultIntersect);
+	EXPECT_TRUE(Aggplus::CalcBooleanOperation(path1, path2, Aggplus::Union) == resultUnite);
+	EXPECT_TRUE(Aggplus::CalcBooleanOperation(path1, path2, Aggplus::Subtraction) == resultSubtract);
 }
 
 TEST(BooleanOperations, TriangleIntersEllipse)
@@ -665,9 +665,9 @@ TEST(BooleanOperations, TriangleIntersEllipse)
 	resultSubtract.CurveTo(243.078, 286.812, 260.127, 260.386, 263.419, 229.839);
 	resultSubtract.CloseFigure();
 
-	EXPECT_TRUE(Aggplus::CalcBooleanOperation(path1, path2, Aggplus::Intersection).Equals(resultIntersect));
-	EXPECT_TRUE(Aggplus::CalcBooleanOperation(path1, path2, Aggplus::Union).Equals(resultUnite));
-	EXPECT_TRUE(Aggplus::CalcBooleanOperation(path1, path2, Aggplus::Subtraction).Equals(resultSubtract));
+	EXPECT_TRUE(Aggplus::CalcBooleanOperation(path1, path2, Aggplus::Intersection) == resultIntersect);
+	EXPECT_TRUE(Aggplus::CalcBooleanOperation(path1, path2, Aggplus::Union) == resultUnite);
+	EXPECT_TRUE(Aggplus::CalcBooleanOperation(path1, path2, Aggplus::Subtraction) == resultSubtract);
 }
 
 TEST(BooleanOperations, TwoVerticesInters)
@@ -715,9 +715,9 @@ TEST(BooleanOperations, TwoVerticesInters)
 	resultSubtract.LineTo(-300, -300);
 	resultSubtract.CloseFigure();
 
-	EXPECT_TRUE(Aggplus::CalcBooleanOperation(path1, path2, Aggplus::Intersection).Equals(resultIntersect));
-	EXPECT_TRUE(Aggplus::CalcBooleanOperation(path1, path2, Aggplus::Union).Equals(resultUnite));
-	EXPECT_TRUE(Aggplus::CalcBooleanOperation(path1, path2, Aggplus::Subtraction).Equals(resultSubtract));
+	EXPECT_TRUE(Aggplus::CalcBooleanOperation(path1, path2, Aggplus::Intersection) == resultIntersect);
+	EXPECT_TRUE(Aggplus::CalcBooleanOperation(path1, path2, Aggplus::Union) == resultUnite);
+	EXPECT_TRUE(Aggplus::CalcBooleanOperation(path1, path2, Aggplus::Subtraction) == resultSubtract);
 }
 
 TEST(BooleanOperations, RectIntersEllipse)
@@ -773,9 +773,9 @@ TEST(BooleanOperations, RectIntersEllipse)
 	resultSubtract.CurveTo(257.623, 242.785, 258.883, 240.478, 260, 238.092);
 	resultSubtract.CloseFigure();
 
-	EXPECT_TRUE(Aggplus::CalcBooleanOperation(path1, path2, Aggplus::Intersection).Equals(resultIntersect));
-	EXPECT_TRUE(Aggplus::CalcBooleanOperation(path1, path2, Aggplus::Union).Equals(resultUnite));
-	EXPECT_TRUE(Aggplus::CalcBooleanOperation(path1, path2, Aggplus::Subtraction).Equals(resultSubtract));
+	EXPECT_TRUE(Aggplus::CalcBooleanOperation(path1, path2, Aggplus::Intersection) == resultIntersect);
+	EXPECT_TRUE(Aggplus::CalcBooleanOperation(path1, path2, Aggplus::Union) == resultUnite);
+	EXPECT_TRUE(Aggplus::CalcBooleanOperation(path1, path2, Aggplus::Subtraction) == resultSubtract);
 }
 
 TEST(BooleanOperations, RectIntersCross)
@@ -869,9 +869,9 @@ TEST(BooleanOperations, RectIntersCross)
 	resultSubtract.LineTo(-89.5, 24);
 	resultSubtract.CloseFigure();
 
-	EXPECT_TRUE(Aggplus::CalcBooleanOperation(path1, path2, Aggplus::Intersection).Equals(resultIntersect));
-	EXPECT_TRUE(Aggplus::CalcBooleanOperation(path1, path2, Aggplus::Union).Equals(resultUnite));
-	EXPECT_TRUE(Aggplus::CalcBooleanOperation(path1, path2, Aggplus::Subtraction).Equals(resultSubtract));
+	EXPECT_TRUE(Aggplus::CalcBooleanOperation(path1, path2, Aggplus::Intersection) == resultIntersect);
+	EXPECT_TRUE(Aggplus::CalcBooleanOperation(path1, path2, Aggplus::Union) == resultUnite);
+	EXPECT_TRUE(Aggplus::CalcBooleanOperation(path1, path2, Aggplus::Subtraction) == resultSubtract);
 }
 
 TEST(BooleanOperations, CrossIntersTriangle)
@@ -977,9 +977,9 @@ TEST(BooleanOperations, CrossIntersTriangle)
 	resultSubtract.LineTo(-6, 3.5);
 	resultSubtract.CloseFigure();
 
-	EXPECT_TRUE(Aggplus::CalcBooleanOperation(path1, path2, Aggplus::Intersection).Equals(resultIntersect));
-	EXPECT_TRUE(Aggplus::CalcBooleanOperation(path1, path2, Aggplus::Union).Equals(resultUnite));
-	EXPECT_TRUE(Aggplus::CalcBooleanOperation(path1, path2, Aggplus::Subtraction).Equals(resultSubtract));
+	EXPECT_TRUE(Aggplus::CalcBooleanOperation(path1, path2, Aggplus::Intersection) == resultIntersect);
+	EXPECT_TRUE(Aggplus::CalcBooleanOperation(path1, path2, Aggplus::Union) == resultUnite);
+	EXPECT_TRUE(Aggplus::CalcBooleanOperation(path1, path2, Aggplus::Subtraction) == resultSubtract);
 }
 
 TEST(BooleanOperations, CrossIntersCross)
@@ -1077,9 +1077,9 @@ TEST(BooleanOperations, CrossIntersCross)
 	resultSubtract.LineTo(-72, -191);
 	resultSubtract.CloseFigure();
 
-	EXPECT_TRUE(Aggplus::CalcBooleanOperation(path1, path2, Aggplus::Intersection).Equals(resultIntersect));
-	EXPECT_TRUE(Aggplus::CalcBooleanOperation(path1, path2, Aggplus::Union).Equals(resultUnite));
-	EXPECT_TRUE(Aggplus::CalcBooleanOperation(path1, path2, Aggplus::Subtraction).Equals(resultSubtract));
+	EXPECT_TRUE(Aggplus::CalcBooleanOperation(path1, path2, Aggplus::Intersection) == resultIntersect);
+	EXPECT_TRUE(Aggplus::CalcBooleanOperation(path1, path2, Aggplus::Union) == resultUnite);
+	EXPECT_TRUE(Aggplus::CalcBooleanOperation(path1, path2, Aggplus::Subtraction) == resultSubtract);
 }
 
 TEST(BooleanOperations, EllipseTouchEllipse)
@@ -1119,9 +1119,9 @@ TEST(BooleanOperations, EllipseTouchEllipse)
 	resultSubtract.CurveTo(138.137, 237, 165, 210.137, 165, 177);
 	resultSubtract.CloseFigure();
 
-	EXPECT_TRUE(Aggplus::CalcBooleanOperation(path1, path2, Aggplus::Intersection).Equals(resultIntersect));
-	EXPECT_TRUE(Aggplus::CalcBooleanOperation(path1, path2, Aggplus::Union).Equals(resultUnite));
-	EXPECT_TRUE(Aggplus::CalcBooleanOperation(path1, path2, Aggplus::Subtraction).Equals(resultSubtract));
+	EXPECT_TRUE(Aggplus::CalcBooleanOperation(path1, path2, Aggplus::Intersection) == resultIntersect);
+	EXPECT_TRUE(Aggplus::CalcBooleanOperation(path1, path2, Aggplus::Union) == resultUnite);
+	EXPECT_TRUE(Aggplus::CalcBooleanOperation(path1, path2, Aggplus::Subtraction) == resultSubtract);
 }
 
 TEST(BooleanOperations, TriangleOverlapTriangle)
@@ -1170,7 +1170,7 @@ TEST(BooleanOperations, TriangleOverlapTriangle)
 	resultSubtract.LineTo(-200, -300);
 	resultSubtract.CloseFigure();
 
-	EXPECT_TRUE(Aggplus::CalcBooleanOperation(path1, path2, Aggplus::Intersection).Equals(resultIntersect));
-	EXPECT_TRUE(Aggplus::CalcBooleanOperation(path1, path2, Aggplus::Union).Equals(resultUnite));
-	EXPECT_TRUE(Aggplus::CalcBooleanOperation(path1, path2, Aggplus::Subtraction).Equals(resultSubtract));
+	EXPECT_TRUE(Aggplus::CalcBooleanOperation(path1, path2, Aggplus::Intersection) == resultIntersect);
+	EXPECT_TRUE(Aggplus::CalcBooleanOperation(path1, path2, Aggplus::Union) == resultUnite);
+	EXPECT_TRUE(Aggplus::CalcBooleanOperation(path1, path2, Aggplus::Subtraction) == resultSubtract);
 }

DesktopEditor/raster/ImageFileFormatChecker.cpp

@@ -202,19 +202,6 @@ bool CImageFileFormatChecker::isWbcFile(BYTE* pBuffer,DWORD dwBytes)
 
 	return false;
 }
-//raster graphics file format developed by Google
-bool CImageFileFormatChecker::isWebPFile(BYTE* pBuffer, DWORD dwBytes)
-{
-	if (eFileType)return false;
-
-	if ((20 <= dwBytes) && ('R' == pBuffer[0] && 'I' == pBuffer[1] && 'F' == pBuffer[2] && 'F' == pBuffer[3]
-		//4–7	length + 12
-		&& 'W' == pBuffer[8] && 'E' == pBuffer[9] && 'B' == pBuffer[10] && 'P' == pBuffer[11])
-        && 'V' == pBuffer[12] && 'P' == pBuffer[13] && '8' == pBuffer[14])
-		return true;
-
-	return false;
-}
 //webshot(wb ver 1) HEX 57 57 42 42 31 31 31 31
 //webshot (wb ver 2) HEX 00 00 02 00 02 10 c9 00 02 00 c8 06 4c 00 02 00
 bool CImageFileFormatChecker::isWbFile(BYTE* pBuffer,DWORD dwBytes)
@@ -349,7 +336,7 @@ bool CImageFileFormatChecker::isSvgFile(BYTE* pBuffer,DWORD dwBytes)
 {
 	if (eFileType)return false;
 
-    if ( (6 <= dwBytes) && (0x3C == pBuffer[0] && 0x3F == pBuffer[1]  && 0x78 == pBuffer[2] && 0x6D == pBuffer[3]
+	if ( (6 <= dwBytes) &&(0x3C == pBuffer[0] && 0x3F == pBuffer[1]  && 0x78 == pBuffer[2] && 0x6D == pBuffer[3]
 						   && 0x6C == pBuffer[4] && 0x20 == pBuffer[5]))
 	{
 		std::string sXml_part = std::string((char*)pBuffer, dwBytes);
@@ -358,11 +345,6 @@ bool CImageFileFormatChecker::isSvgFile(BYTE* pBuffer,DWORD dwBytes)
 			return true;
 		}
 	}
-    else if ( (6 <= dwBytes) && (0x3C == pBuffer[0] && 's' == pBuffer[1]  && 'v' == pBuffer[2] && 'g' == pBuffer[3]
-                                  && 0x20 == pBuffer[4]))
-    {
-        return true;
-    }
 	return false;
 }
 
@@ -527,10 +509,6 @@ bool CImageFileFormatChecker::isImageFile(const std::wstring& fileName)
 	{
 		eFileType = _CXIMAGE_FORMAT_WB;
 	}
-	else if (isWebPFile(buffer, sizeRead))
-	{
-		eFileType = _CXIMAGE_FORMAT_WEBP;
-	}
 	else if (isPsdFile(buffer,sizeRead))
 	{
 		eFileType = _CXIMAGE_FORMAT_PSD;

DesktopEditor/raster/ImageFileFormatChecker.h

@@ -64,7 +64,6 @@ enum __ENUM_CXIMAGE_FORMATS
 	_CXIMAGE_FORMAT_SVG = 24,
     _CXIMAGE_FORMAT_PIC = 25,
 	_CXIMAGE_FORMAT_HEIF = 26,
-	_CXIMAGE_FORMAT_WEBP = 27
 };
 
 class GRAPHICS_DECL CImageFileFormatChecker
@@ -97,7 +96,6 @@ public:
 	bool isTiffFile(BYTE* pBuffer,DWORD dwBytes);
 	bool isJpgFile(BYTE* pBuffer,DWORD dwBytes);
 	bool isWbFile(BYTE* pBuffer,DWORD dwBytes);
-	bool isWebPFile(BYTE* pBuffer, DWORD dwBytes);
 
 	bool isIcoFile(BYTE* pBuffer,DWORD dwBytes);
 	bool isRasFile(BYTE* pBuffer,DWORD dwBytes);

DesktopEditor/raster/Metafile/Common/IOutputDevice.h

@@ -53,7 +53,7 @@ namespace MetaFile
 		virtual void DrawBitmap(double dX, double dY, double dW, double dH, BYTE* pBuffer, unsigned int unWidth, unsigned int unHeight, unsigned int nBlendMode) = 0;
 
 		virtual void DrawString(std::wstring& wsText, unsigned int unCharsCount, double dX, double dY, double* pDx,
-		                        int iGraphicsMode = 1, double dXScale = 1, double dYScale = 1, bool bUseGID = false) = 0;
+		                        int iGraphicsMode = 1, double dXScale = 1, double dYScale = 1) = 0;
 
 		virtual void DrawDriverString(const std::wstring& wsString, const std::vector<TPointD>& arPoints) = 0;
 
@@ -74,7 +74,7 @@ namespace MetaFile
 		virtual void EndClipPath(unsigned int unMode) = 0;
 
 		virtual void UpdateDC() = 0;
-		virtual void SetTransform(const double& dM11, const double& dM12, const double& dM21, const double& dM22, const double& dX, const double& dY) = 0;
+		virtual void SetTransform(double& dM11, double& dM12, double& dM21, double& dM22, double& dX, double& dY) = 0;
 		virtual void GetTransform(double* pdM11, double* pdM12, double* pdM21, double* pdM22, double* pdX, double* pdY) = 0;
 	};
 

DesktopEditor/raster/Metafile/Common/MetaFileRenderer.h

@@ -352,7 +352,7 @@ namespace MetaFile
 
 		}
 
-		void DrawString(std::wstring& wsText, unsigned int unCharsCount, double _dX, double _dY, double* pDx, int iGraphicsMode, double dXScale, double dYScale, bool bUseGID)
+		void DrawString(std::wstring& wsText, unsigned int unCharsCount, double _dX, double _dY, double* pDx, int iGraphicsMode, double dXScale, double dYScale)
 		{
 			CheckEndPath();
 			const IFont* pFont = m_pFile->GetFont();
@@ -681,12 +681,11 @@ namespace MetaFile
 				m_pRenderer->put_BrushColor1(m_pFile->GetTextColor());
 				m_pRenderer->put_BrushAlpha1(255);
 
-				if (bUseGID)
-					m_pRenderer->put_FontStringGID(TRUE);
-
 				// Рисуем сам текст
 				if (NULL == pDx)
+				{
 					m_pRenderer->CommandDrawText(wsString, dX, dY, 0, 0);
+				}
 				else
 				{
 					unsigned int unUnicodeLen = 0;
@@ -705,9 +704,6 @@ namespace MetaFile
 					}
 				}
 
-				if (bUseGID)
-					m_pRenderer->put_FontStringGID(FALSE);
-
 				if (bChangeCTM)
 					m_pRenderer->ResetTransform();
 			}
@@ -914,7 +910,7 @@ namespace MetaFile
 
 			m_bStartedPath = false;
 		}
-		void SetTransform(const double& dM11, const double& dM12, const double& dM21, const double& dM22, const double& dX, const double& dY)
+		void SetTransform(double& dM11, double& dM12, double& dM21, double& dM22, double& dX, double& dY)
 		{
 			double dKoefX = m_dScaleX;
 			double dKoefY = m_dScaleY;
@@ -1237,7 +1233,7 @@ namespace MetaFile
 
 			// Вычисление минимально возможной ширины пера
 			// # Код явялется дублированным из Graphics
-			const double dSqrtDet = sqrt(fabs(oMatrix.Determinant()));
+			const double dSqrtDet = sqrt(abs(oMatrix.Determinant()));
 			const double dWidthMinSize = (dSqrtDet != 0) ? (1.0 / dSqrtDet) : dWidth;
 
 			if (0 == pPen->GetWidth())
@@ -1270,6 +1266,19 @@ namespace MetaFile
 
 			if ((NULL != pDataDash && 0 != unSizeDash) || PS_SOLID != ulPenStyle)
 			{
+				// Дублированный код из Graphics
+				// Без этого используется оригинальный код в Graphics, который отрисовывает уже неверно
+				double dDashWidth{dWidth};
+
+				if (!Equals(dWidthMinSize, dWidth))
+				{
+					double dDet = oMatrix.Determinant();
+
+					if (fabs(dDet) < 0.0001)
+						dDashWidth *= dSqrtDet;
+				}
+				// -----------------------------
+
 				if (NULL != pDataDash && 0 != unSizeDash)
 				{
 					m_pRenderer->put_PenDashOffset(pPen->GetDashOffset());
@@ -1277,7 +1286,7 @@ namespace MetaFile
 					std::vector<double> arDashes(unSizeDash);
 
 					for (unsigned int unIndex = 0; unIndex < unSizeDash; ++unIndex)
-						arDashes[unIndex] = pDataDash[unIndex] * dWidth;
+						arDashes[unIndex] = pDataDash[unIndex] * dDashWidth;
 
 					m_pRenderer->PenDashPattern(arDashes.data(), unSizeDash);
 
@@ -1291,35 +1300,35 @@ namespace MetaFile
 					{
 						case PS_DASH:
 						{
-							arDashPattern.push_back(9 * dWidth);
-							arDashPattern.push_back(3 * dWidth);
+							arDashPattern.push_back(9 * dDashWidth);
+							arDashPattern.push_back(3 * dDashWidth);
 
 							break;
 						}
 						case PS_DOT:
 						{
-							arDashPattern.push_back(3 * dWidth);
-							arDashPattern.push_back(3 * dWidth);
+							arDashPattern.push_back(3 * dDashWidth);
+							arDashPattern.push_back(3 * dDashWidth);
 
 							break;
 						}
 						case PS_DASHDOT:
 						{
-							arDashPattern.push_back(9 * dWidth);
-							arDashPattern.push_back(6 * dWidth);
-							arDashPattern.push_back(3 * dWidth);
-							arDashPattern.push_back(6 * dWidth);
+							arDashPattern.push_back(9 * dDashWidth);
+							arDashPattern.push_back(6 * dDashWidth);
+							arDashPattern.push_back(3 * dDashWidth);
+							arDashPattern.push_back(6 * dDashWidth);
 
 							break;
 						}
 						case PS_DASHDOTDOT:
 						{
-							arDashPattern.push_back(9 * dWidth);
-							arDashPattern.push_back(6 * dWidth);
-							arDashPattern.push_back(3 * dWidth);
-							arDashPattern.push_back(6 * dWidth);
-							arDashPattern.push_back(3 * dWidth);
-							arDashPattern.push_back(6 * dWidth);
+							arDashPattern.push_back(9 * dDashWidth);
+							arDashPattern.push_back(6 * dDashWidth);
+							arDashPattern.push_back(3 * dDashWidth);
+							arDashPattern.push_back(6 * dDashWidth);
+							arDashPattern.push_back(3 * dDashWidth);
+							arDashPattern.push_back(6 * dDashWidth);
 
 							break;
 						}

DesktopEditor/raster/Metafile/Common/MetaFileUtils.cpp

@@ -999,21 +999,20 @@ namespace MetaFile
 	{
 		std::wstring wsText;
 		for (const wchar_t& wChar : wsString)
-		{
-			if (wChar == L'<')
+		    if (wChar == L'<')
 			   wsText += L"&lt;";
-			else if (wChar == L'>')
+		    else if (wChar == L'>')
 			   wsText += L"&gt;";
-			else if (wChar == L'&')
+		    else if (wChar == L'&')
 			   wsText += L"&amp;";
-			else if (wChar == L'\'')
+		    else if (wChar == L'\'')
 			   wsText += L"&apos;";
-			else if (wChar == L'"')
+		    else if (wChar == L'"')
 			   wsText += L"&quot;";
 			else if (wChar == L'\r' || (wChar >= 0x00 && wChar <=0x1F))
 				continue;
-			else wsText += wChar;
-		}
+
+		    else wsText += wChar;
 		return wsText;
 	}
 

DesktopEditor/raster/Metafile/Emf/EmfInterpretator/CEmfInterpretator.h

@@ -218,7 +218,7 @@ namespace MetaFile
 		void DrawBitmap(double dX, double dY, double dW, double dH, BYTE* pBuffer, unsigned int unWidth, unsigned int unHeight, unsigned int unBlendMode) override {};
 
 		void DrawString(std::wstring& wsText, unsigned int unCharsCount, double dX, double dY, double* pDx,
-						int iGraphicsMode = 1, double dXScale = 1, double dYScale = 1, bool bUseGID = false) override {};
+						int iGraphicsMode = 1, double dXScale = 1, double dYScale = 1) override {};
 
 		void DrawDriverString(const std::wstring& wsString, const std::vector<TPointD>& arPoints) override {};
 
@@ -239,7 +239,7 @@ namespace MetaFile
 		void EndClipPath(unsigned int unMode) override {};
 
 		void UpdateDC() override {};
-		void SetTransform(const double& dM11, const double& dM12, const double& dM21, const double& dM22, const double& dX, const double& dY) override {};
+		void SetTransform(double& dM11, double& dM12, double& dM21, double& dM22, double& dX, double& dY) override {};
 		void GetTransform(double* pdM11, double* pdM12, double* pdM21, double* pdM22, double* pdX, double* pdY) override {};
 	};
 }

DesktopEditor/raster/Metafile/Emf/EmfInterpretator/CEmfInterpretatorArray.cpp

@@ -80,10 +80,10 @@ namespace MetaFile
 	}
 
 	void CEmfInterpretatorArray::DrawString(std::wstring &wsText, unsigned int unCharsCount, double dX, double dY, double *pDx,
-	                                        int iGraphicsMode, double dXScale, double dYScale, bool bUseGID)
+											int iGraphicsMode, double dXScale, double dYScale)
 	{
 		for (CEmfInterpretatorBase* pInterpretator : m_arInterpretators)
-			pInterpretator->DrawString(wsText, unCharsCount, dX, dY, pDx, iGraphicsMode, dXScale, dYScale, bUseGID);
+			pInterpretator->DrawString(wsText, unCharsCount, dX, dY, pDx, iGraphicsMode, dXScale, dYScale);
 	}
 
 	void CEmfInterpretatorArray::DrawDriverString(const std::wstring& wsString, const std::vector<TPointD>& arPoints)
@@ -182,7 +182,7 @@ namespace MetaFile
 			pInterpretator->UpdateDC();
 	}
 
-	void CEmfInterpretatorArray::SetTransform(const double &dM11, const double &dM12, const double &dM21, const double &dM22, const double &dX, const double &dY)
+	void CEmfInterpretatorArray::SetTransform(double &dM11, double &dM12, double &dM21, double &dM22, double &dX, double &dY)
 	{
 		for (CEmfInterpretatorBase* pInterpretator : m_arInterpretators)
 			pInterpretator->SetTransform(dM11, dM12, dM21, dM22, dX, dY);

DesktopEditor/raster/Metafile/Emf/EmfInterpretator/CEmfInterpretatorArray.h

@@ -36,7 +36,7 @@ namespace MetaFile
 		void DrawBitmap(double dX, double dY, double dW, double dH, BYTE* pBuffer, unsigned int unWidth, unsigned int unHeight, unsigned int unBlendMode) override;
 
 		void DrawString(std::wstring& wsText, unsigned int unCharsCount, double dX, double dY, double* pDx,
-						int iGraphicsMode = 1, double dXScale = 1, double dYScale = 1, bool bUseGID = false) override;
+						int iGraphicsMode = 1, double dXScale = 1, double dYScale = 1) override;
 
 		void DrawDriverString(const std::wstring& wsString, const std::vector<TPointD>& arPoints) override;
 
@@ -57,7 +57,7 @@ namespace MetaFile
 		void EndClipPath(unsigned int unMode) override;
 
 		void UpdateDC() override;
-		void SetTransform(const double& dM11, const double& dM12, const double& dM21, const double& dM22, const double& dX, const double& dY) override;
+		void SetTransform(double& dM11, double& dM12, double& dM21, double& dM22, double& dX, double& dY) override;
 		void GetTransform(double* pdM11, double* pdM12, double* pdM21, double* pdM22, double* pdX, double* pdY) override;
 
 		void HANDLE_EMR_HEADER(const TEmfHeader& oTEmfHeader) override;

DesktopEditor/raster/Metafile/Emf/EmfInterpretator/CEmfInterpretatorRender.cpp

@@ -18,8 +18,8 @@ namespace MetaFile
 
 	void CEmfInterpretatorRender::ChangeConditional()
 	{
-		if (NULL != m_pMetaFileRenderer)
-			m_pMetaFileRenderer->ChangeConditional();
+			if (NULL != m_pMetaFileRenderer)
+				m_pMetaFileRenderer->ChangeConditional();
 	}
 
 	void CEmfInterpretatorRender::Begin()
@@ -41,10 +41,10 @@ namespace MetaFile
 	}
 
 	void CEmfInterpretatorRender::DrawString(std::wstring &wsText, unsigned int unCharsCount, double dX, double dY, double *pDx,
-	                                         int iGraphicsMode, double dXScale, double dYScale, bool bUseGID)
+	                                         int iGraphicsMode, double dXScale, double dYScale)
 	{
 		if (NULL != m_pMetaFileRenderer)
-			m_pMetaFileRenderer->DrawString(wsText, unCharsCount, dX, dY, pDx, iGraphicsMode, dXScale, dYScale, bUseGID);
+			m_pMetaFileRenderer->DrawString(wsText, unCharsCount, dX, dY, pDx, iGraphicsMode, dXScale, dYScale);
 	}
 
 	void CEmfInterpretatorRender::DrawDriverString(const std::wstring& wsString, const std::vector<TPointD>& arPoints)
@@ -143,7 +143,7 @@ namespace MetaFile
 			m_pMetaFileRenderer->UpdateDC();
 	}
 
-	void CEmfInterpretatorRender::SetTransform(const double& dM11, const double& dM12, const double& dM21, const double& dM22, const double& dX, const double& dY)
+	void CEmfInterpretatorRender::SetTransform(double &dM11, double &dM12, double &dM21, double &dM22, double &dX, double &dY)
 	{
 		if (NULL != m_pMetaFileRenderer)
 			m_pMetaFileRenderer->SetTransform(dM11, dM12, dM21, dM22, dX, dY);

DesktopEditor/raster/Metafile/Emf/EmfInterpretator/CEmfInterpretatorRender.h

@@ -22,7 +22,7 @@ namespace MetaFile
 		void DrawBitmap(double dX, double dY, double dW, double dH, BYTE* pBuffer, unsigned int unWidth, unsigned int unHeight, unsigned int unBlendMode) override;
 
 		void DrawString(std::wstring& wsText, unsigned int unCharsCount, double dX, double dY, double* pDx,
-						int iGraphicsMode = 1, double dXScale = 1, double dYScale = 1, bool bUseGID = false) override;
+						int iGraphicsMode = 1, double dXScale = 1, double dYScale = 1) override;
 
 		void DrawDriverString(const std::wstring& wsString, const std::vector<TPointD>& arPoints) override;
 
@@ -43,7 +43,7 @@ namespace MetaFile
 		void EndClipPath(unsigned int unMode) override;
 
 		void UpdateDC() override;
-		void SetTransform(const double& dM11, const double& dM12, const double& dM21, const double& dM22, const double& dX, const double& dY) override;
+		void SetTransform(double& dM11, double& dM12, double& dM21, double& dM22, double& dX, double& dY) override;
 		void GetTransform(double* pdM11, double* pdM12, double* pdM21, double* pdM22, double* pdX, double* pdY) override;
 
 		CMetaFileRenderer* GetRenderer() const;

DesktopEditor/raster/Metafile/Emf/EmfInterpretator/CEmfInterpretatorSvg.cpp

@@ -346,7 +346,7 @@ namespace MetaFile
 		if (NULL != oTEmfExtTextoutA.oEmrText.pOutputDx)
 			arDx = std::vector<double>(oTEmfExtTextoutA.oEmrText.pOutputDx, oTEmfExtTextoutA.oEmrText.pOutputDx + oTEmfExtTextoutA.oEmrText.unChars);
 
-		WriteText(wsText, TPointD(oTEmfExtTextoutA.oEmrText.oReference.X, oTEmfExtTextoutA.oEmrText.oReference.Y), oTEmfExtTextoutA.oBounds, TPointD(oTEmfExtTextoutA.dExScale, oTEmfExtTextoutA.dEyScale), arDx, oTEmfExtTextoutA.oEmrText.unOptions & 0x00000010);
+		WriteText(wsText, TPointD(oTEmfExtTextoutA.oEmrText.oReference.X, oTEmfExtTextoutA.oEmrText.oReference.Y), oTEmfExtTextoutA.oBounds, TPointD(oTEmfExtTextoutA.dExScale, oTEmfExtTextoutA.dEyScale), arDx);
 	}
 
 	void CEmfInterpretatorSvg::HANDLE_EMR_EXTTEXTOUTW(const TEmfExtTextoutW &oTEmfExtTextoutW)
@@ -358,7 +358,7 @@ namespace MetaFile
 		if (NULL != oTEmfExtTextoutW.oEmrText.pOutputDx)
 			arDx = std::vector<double>(oTEmfExtTextoutW.oEmrText.pOutputDx, oTEmfExtTextoutW.oEmrText.pOutputDx + oTEmfExtTextoutW.oEmrText.unChars);
 
-		WriteText(wsText, TPointD(oTEmfExtTextoutW.oEmrText.oReference.X, oTEmfExtTextoutW.oEmrText.oReference.Y), oTEmfExtTextoutW.oBounds, TPointD(oTEmfExtTextoutW.dExScale, oTEmfExtTextoutW.dEyScale), arDx, oTEmfExtTextoutW.oEmrText.unOptions & 0x00000010);
+		WriteText(wsText, TPointD(oTEmfExtTextoutW.oEmrText.oReference.X, oTEmfExtTextoutW.oEmrText.oReference.Y), oTEmfExtTextoutW.oBounds, TPointD(oTEmfExtTextoutW.dExScale, oTEmfExtTextoutW.dEyScale), arDx);
 	}
 
 	void CEmfInterpretatorSvg::HANDLE_EMR_LINETO(const TPointL &oPoint)