Merge branch release/v9.0.0 into master

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

Common/3dParty/boost/boost.pri

@@ -4,6 +4,7 @@ CORE_BOOST_LIBS = $$PWD/build/$$CORE_BUILDS_PLATFORM_PREFIX/lib
 core_ios:CONFIG += disable_enum_constexpr_conversion
 core_android:CONFIG += disable_enum_constexpr_conversion
 core_mac:CONFIG += disable_enum_constexpr_conversion
+core_linux_clang:CONFIG += disable_enum_constexpr_conversion
 
 core_android {
     INCLUDEPATH += $$PWD/build/android/include

Common/3dParty/harfbuzz/test/main.cpp

@@ -84,7 +84,7 @@ public:
 
 /* fonts */
 const char *fonts_paths[NUM_EXAMPLES] = {
-	"C:/Windows/Fonts/arial.ttf",
+	"C:/Windows/Fonts/calibri.ttf",
 	//"C:/Windows/Fonts/arial.ttf",
 	"C:/Users/korol/AppData/Local/Microsoft/Windows/Fonts/ArabicTest.ttf",
 	"C:/Windows/Fonts/simsun.ttc"
@@ -95,7 +95,7 @@ const char *num_glyph_types[NUM_GLYPH_TYPES] = {"UNCLASSIFIED", "BASE_GLYPH", "L
 
 /* tranlations courtesy of google */
 const char *texts[NUM_EXAMPLES] = {
-	"hello",
+	"fi",
 	"لا لآ لأ لا",
 	"懶惰的姜貓"
 };
@@ -107,7 +107,7 @@ const hb_direction_t text_directions[NUM_EXAMPLES] = {
 };
 
 const int text_skip[NUM_EXAMPLES] = {
-	1,
+	0,
 	0,
 	1,
 };
@@ -435,6 +435,11 @@ static void print_layout_info_using_private_api(hb_blob_t *blob)
 /* end of private API use */
 #endif
 
+struct hb_feature_test {
+	hb_tag_t tag;
+	uint32_t value;
+};
+
 int main(int argc, char *argv[])
 {
 	// hb_blob_t* blobFileTest = hb_blob_create_from_file("C:/Windows/Fonts/calibri.ttf");
@@ -499,28 +504,34 @@ int main(int argc, char *argv[])
 		hb_buffer_set_language(buf, hb_language_from_string(languages[i], strlen(languages[i])));
 		// hb_buffer_set_cluster_level (buf, HB_BUFFER_CLUSTER_LEVEL_MONOTONE_GRAPHEMES);
 		// hb_buffer_set_cluster_level (buf, HB_BUFFER_CLUSTER_LEVEL_MONOTONE_CHARACTERS);
-		hb_buffer_set_cluster_level(buf, HB_BUFFER_CLUSTER_LEVEL_CHARACTERS);
+		hb_buffer_set_cluster_level(buf, HB_BUFFER_CLUSTER_LEVEL_MONOTONE_GRAPHEMES);
 
-#if 0
-#define userfeatures_count 4
-        hb_feature_t userfeatures[userfeatures_count];
-        hb_tag_t tags[] = {
-            HB_TAG('l','i','g','a'),
-            HB_TAG('c','l','i','g'),
-            HB_TAG('d','l','i','g'),
-            HB_TAG('h','l','i','g'),
-        };
-        for (int f = 0; f < userfeatures_count; f++)
-        {
-            userfeatures[f].tag = tags[f];
-            userfeatures[f].value = 1;
-            userfeatures[f].start = HB_FEATURE_GLOBAL_START;
-            userfeatures[f].end = HB_FEATURE_GLOBAL_END;
-        }
-#else
-#define userfeatures_count 0
-		hb_feature_t *userfeatures = NULL;
-#endif
+		hb_feature_test features[] {
+			{HB_TAG('r','l','i','g'), 1},
+			{HB_TAG('l','i','g','a'), 0},
+			{HB_TAG('c','l','i','g'), 1},
+			{HB_TAG('h','l','i','g'), 1},
+			{HB_TAG('d','l','i','g'), 1},
+			{HB_TAG('k','e','r','n'), 2},
+			{0, 0}
+		};
+
+		int userfeatures_count = 0;
+		hb_feature_t userfeatures[100];
+
+		hb_feature_test* current_feature = features;
+		while (current_feature->tag != 0)
+		{
+			if (current_feature->value != 2)
+			{
+				userfeatures[userfeatures_count].tag   = current_feature->tag;
+				userfeatures[userfeatures_count].value = current_feature->value;
+				userfeatures[userfeatures_count].start = HB_FEATURE_GLOBAL_START;
+				userfeatures[userfeatures_count].end   = HB_FEATURE_GLOBAL_END;
+				userfeatures_count++;
+			}
+			current_feature++;
+		}
 
 		/* Layout the text */
 		hb_buffer_add_utf8(buf, texts[i], strlen(texts[i]), 0, strlen(texts[i]));
@@ -531,7 +542,7 @@ int main(int argc, char *argv[])
 		// const char*const pHbShapers[] = { "graphite2", "coretext_aat", "ot", "fallback", nullptr };
 		// bool ok = hb_shape_full(hb_ft_font[i], buf, userfeatures, userfeatures_count, pHbShapers);
 
-		hb_shape(hb_ft_font[i], buf, userfeatures, userfeatures_count);
+		hb_shape(hb_ft_font[i], buf, (userfeatures_count != 0) ? userfeatures : NULL, userfeatures_count);
 
 		unsigned int glyph_count;
 		hb_glyph_info_t *glyph_info = hb_buffer_get_glyph_infos(buf, &glyph_count);

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

@@ -12,7 +12,7 @@
 #include "StaticFunctions.h"
 #include "ConstValues.h"
 
-#define DEFAULT_FONT_SIZE 14
+#define DEFAULT_FONT_SIZE 12
 
 namespace NSCSS
 {
@@ -49,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;
 	}
 
@@ -69,6 +71,8 @@ namespace NSCSS
 		m_oDisplay      = oElement.m_oDisplay;
 		m_oTransform    = oElement.m_oTransform;
 
+		m_arParentsStyles = oElement.m_arParentsStyles;
+
 		return *this;
 	}
 
@@ -109,7 +113,8 @@ namespace NSCSS
 	bool CCompiledStyle::Empty() const
 	{
 		return m_oBackground.Empty() && m_oBorder.Empty() && m_oFont.Empty() &&
-		       m_oMargin.Empty() && m_oPadding.Empty() && m_oText.Empty() && m_oDisplay.Empty();
+		       m_oMargin.Empty() && m_oPadding.Empty() && m_oText.Empty() &&
+		       m_oDisplay.Empty() && m_oTransform.Empty();
 	}
 
 	void CCompiledStyle::AddPropSel(const std::wstring& sProperty, const std::wstring& sValue, const unsigned int unLevel, const bool& bHardMode)
@@ -314,6 +319,7 @@ namespace NSCSS
 				}
 				//BORDER TOP
 				CASE(L"border-top"):
+				CASE(L"mso-border-top-alt"):
 				{
 					m_oBorder.SetTopSide(pPropertie.second, unLevel, bHardMode);
 					break;
@@ -335,6 +341,7 @@ namespace NSCSS
 				}
 				//BORDER RIGHT
 				CASE(L"border-right"):
+				CASE(L"mso-border-right-alt"):
 				{
 					m_oBorder.SetRightSide(pPropertie.second, unLevel, bHardMode);
 					break;
@@ -356,6 +363,7 @@ namespace NSCSS
 				}
 				//BORDER bottom
 				CASE(L"border-bottom"):
+				CASE(L"mso-border-bottom-alt"):
 				{
 					m_oBorder.SetBottomSide(pPropertie.second, unLevel, bHardMode);
 					break;
@@ -377,6 +385,7 @@ namespace NSCSS
 				}
 				//BORDER LEFT
 				CASE(L"border-left"):
+				CASE(L"mso-border-left-alt"):
 				{
 					m_oBorder.SetLeftSide(pPropertie.second, unLevel, bHardMode);
 					break;
@@ -435,6 +444,11 @@ namespace NSCSS
 					m_oDisplay.SetVAlign(pPropertie.second, unLevel, bHardMode);
 					break;
 				}
+				CASE(L"white-space"):
+				{
+					m_oDisplay.SetWhiteSpace(pPropertie.second, unLevel, bHardMode);
+					break;
+				}
 				//TRANSFORM
 				CASE(L"transform"):
 				{
@@ -521,7 +535,7 @@ namespace NSCSS
 	{
 		return m_sId;
 	}
-	
+
 	bool CCompiledStyle::HaveThisParent(const std::wstring &wsParentName) const
 	{
 		return m_arParentsStyles.end() != m_arParentsStyles.find(wsParentName);

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

@@ -1,9 +1,6 @@
 #ifndef CCOMPILEDSTYLE_H
 #define CCOMPILEDSTYLE_H
 
-#include "CssCalculator_global.h"
-#include "ConstValues.h"
-
 #include <map>
 #include <set>
 #include <vector>

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

@@ -13,14 +13,9 @@ namespace NSCSS
 		delete m_pInternal;
 	}
 
-	CCompiledStyle CCssCalculator::GetCompiledStyle(const std::vector<CNode> &arSelectors) const
+	bool CCssCalculator::CalculateCompiledStyle(std::vector<CNode>& arSelectors) const
 	{
-		return m_pInternal->GetCompiledStyle(arSelectors);
-	}
-
-	bool CCssCalculator::GetCompiledStyle(CCompiledStyle &oStyle, const std::vector<CNode> &arSelectors) const
-	{
-		return m_pInternal->GetCompiledStyle(oStyle, arSelectors);
+		return m_pInternal->CalculateCompiledStyle(arSelectors);
 	}
 
 	std::wstring CCssCalculator::CalculateStyleId(const CNode& oNode)
@@ -63,6 +58,11 @@ namespace NSCSS
 		return m_pInternal->GetDpi();
 	}
 
+	bool CCssCalculator::HaveStylesById(const std::wstring& wsId) const
+	{
+		return m_pInternal->HaveStylesById(wsId);
+	}
+
 	void CCssCalculator::ClearPageData()
 	{
 		m_pInternal->ClearPageData();

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

@@ -2,10 +2,8 @@
 #define CCSSCALCULATOR_H
 
 #include "CssCalculator_global.h"
-#include "CCompiledStyle.h"
-#include "ConstValues.h"
-#include <iostream>
-#include <map>
+#include "StyleProperties.h"
+#include "CNode.h"
 #include <vector>
 
 namespace NSCSS
@@ -19,8 +17,7 @@ namespace NSCSS
 		CCssCalculator();
 		~CCssCalculator();
 
-		CCompiledStyle GetCompiledStyle(const std::vector<CNode> &arSelectors) const;
-		bool GetCompiledStyle(CCompiledStyle& oStyle, const std::vector<CNode> &arSelectors) const;
+		bool CalculateCompiledStyle(std::vector<CNode>& arSelectors) const;
 
 		std::wstring CalculateStyleId(const CNode& oNode);
 		bool CalculatePageStyle(NSProperties::CPage& oPageData, const std::vector<CNode> &arSelectors);
@@ -35,6 +32,8 @@ namespace NSCSS
 		std::wstring GetEncoding()   const;
 		unsigned short int GetDpi()  const;
 
+		bool HaveStylesById(const std::wstring& wsId) const;
+
 		void ClearPageData();
 		void ClearEmbeddedStyles();
 		void ClearAllowedStyleFiles();

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

@@ -2,8 +2,6 @@
 
 #include <string>
 #include <vector>
-#include <fstream>
-#include <cmath>
 #include <algorithm>
 #include <numeric>
 
@@ -186,7 +184,7 @@ namespace NSCSS
 	}
 	#endif
 
-	const CElement* CStyleStorage::FindElement(const std::wstring& wsSelector)
+	const CElement* CStyleStorage::FindElement(const std::wstring& wsSelector) const
 	{
 		if (wsSelector.empty())
 			return nullptr;
@@ -472,7 +470,7 @@ namespace NSCSS
 		}
 	}
 
-	const CElement* CStyleStorage::FindSelectorFromStyleData(const std::wstring& wsSelector, const std::map<std::wstring, CElement*>& mStyleData)
+	const CElement* CStyleStorage::FindSelectorFromStyleData(const std::wstring& wsSelector, const std::map<std::wstring, CElement*>& mStyleData) const
 	{
 		std::map<std::wstring, CElement*>::const_iterator itFound = mStyleData.find(wsSelector);
 
@@ -488,6 +486,95 @@ namespace NSCSS
 	{}
 
 	#ifdef CSS_CALCULATOR_WITH_XHTML
+	bool CCssCalculator_Private::CalculateCompiledStyle(std::vector<CNode>& arSelectors)
+	{
+		if (arSelectors.empty())
+			return false;
+
+		if (L"#text" == arSelectors.back().m_wsName)
+		{
+			if (arSelectors.size() > 1 && arSelectors.back().m_pCompiledStyle->Empty())
+				*arSelectors.back().m_pCompiledStyle += *(arSelectors.end() - 2)->m_pCompiledStyle;
+
+			if(arSelectors.crend() != std::find_if(arSelectors.crbegin(), arSelectors.crend(),
+			                                       [](const CNode& oNode){ return IsTableElement(oNode.m_wsName); }))
+			{
+				arSelectors.back().m_pCompiledStyle->m_oBackground.Clear();
+				arSelectors.back().m_pCompiledStyle->m_oBorder.Clear();
+			}
+
+			return true;
+		}
+
+		const std::map<std::vector<CNode>, CCompiledStyle>::iterator oItem = m_mUsedStyles.find(arSelectors);
+
+		if (oItem != m_mUsedStyles.end())
+		{
+			arSelectors.back().SetCompiledStyle(new CCompiledStyle(oItem->second));
+			return true;
+		}
+
+		arSelectors.back().m_pCompiledStyle->SetDpi(m_nDpi);
+		unsigned int unStart = 0;
+
+		std::vector<CNode>::const_reverse_iterator itFound = std::find_if(arSelectors.crbegin(), arSelectors.crend(), [](const CNode& oNode){ return !oNode.m_pCompiledStyle->Empty(); });
+
+		if (itFound != arSelectors.crend())
+			unStart = itFound.base() - arSelectors.cbegin();
+
+		std::vector<std::wstring> arNodes = CalculateAllNodes(arSelectors, unStart);
+		std::vector<std::wstring> arPrevNodes;
+		bool bInTable = false;
+
+		for (size_t i = 0; i < unStart; ++i)
+		{
+			if (!bInTable)
+				bInTable = IsTableElement(arSelectors[i].m_wsName);
+			else
+				break;
+		}
+
+		for (size_t i = unStart; i < arSelectors.size(); ++i)
+		{
+			if (0 != i)
+				*arSelectors[i].m_pCompiledStyle += *arSelectors[i - 1].m_pCompiledStyle;
+
+			arSelectors[i].m_pCompiledStyle->AddParent(arSelectors[i].m_wsName);
+
+			if (!bInTable)
+				bInTable = IsTableElement(arSelectors[i].m_wsName);
+
+			if (bInTable)
+			{
+				arSelectors[i].m_pCompiledStyle->m_oBackground.Clear();
+				arSelectors[i].m_pCompiledStyle->m_oBorder.Clear();
+			}
+
+			arSelectors[i].m_pCompiledStyle->AddStyle(arSelectors[i].m_mAttributes, i + 1);
+
+			for (const CElement* oElement : FindElements(arNodes, arPrevNodes))
+				arSelectors[i].m_pCompiledStyle->AddStyle(oElement->GetStyle(), i + 1);
+
+			if (!arSelectors[i].m_wsStyle.empty())
+				arSelectors[i].m_pCompiledStyle->AddStyle(arSelectors[i].m_wsStyle, i + 1, true);
+
+			// Скидываем некоторые внешние стили, которые внутри таблицы переопределяются
+			if (bInTable && i < arSelectors.size() - 1)
+			{
+				arSelectors[i].m_pCompiledStyle->m_oFont.GetLineHeight().Clear();
+				arSelectors[i].m_pCompiledStyle->m_oPadding.Clear();
+				arSelectors[i].m_pCompiledStyle->m_oMargin.Clear();
+			}
+		}
+
+		arSelectors.back().m_pCompiledStyle->SetID(CalculateStyleId(arSelectors.back()));
+
+		if (!arSelectors.back().m_pCompiledStyle->Empty())
+			m_mUsedStyles[arSelectors] = *arSelectors.back().m_pCompiledStyle;
+
+		return true;
+	}
+
 	void CCssCalculator_Private::SetPageData(NSProperties::CPage &oPage, const std::map<std::wstring, std::wstring> &mData, unsigned int unLevel, bool bHardMode)
 	{
 		//TODO:: пересмотреть данный метод
@@ -505,11 +592,11 @@ namespace NSCSS
 	}
 	#endif
 
-	std::vector<std::wstring> CCssCalculator_Private::CalculateAllNodes(const std::vector<CNode> &arSelectors)
+	std::vector<std::wstring> CCssCalculator_Private::CalculateAllNodes(const std::vector<CNode> &arSelectors, unsigned int unStart)
 	{
 		std::vector<std::wstring> arNodes;
 		
-		for (std::vector<CNode>::const_reverse_iterator oNode = arSelectors.rbegin(); oNode != arSelectors.rend(); ++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);
@@ -620,6 +707,16 @@ namespace NSCSS
 			FindPrevAndKindElements(pFoundName, arNextNodes, arFindedElements, wsName, arClasses);
 		}
 
+		const CElement* pFoundAll = m_oStyleStorage.FindElement(L"*");
+
+		if (nullptr != pFoundAll)
+		{
+			if (!pFoundAll->Empty())
+				arFindedElements.push_back(pFoundAll);
+
+			FindPrevAndKindElements(pFoundAll, arNextNodes, arFindedElements, wsName, arClasses);
+		}
+
 		if (arFindedElements.size() > 1)
 		{
 			std::sort(arFindedElements.rbegin(), arFindedElements.rend(),
@@ -631,79 +728,6 @@ namespace NSCSS
 	}
 
 	#ifdef CSS_CALCULATOR_WITH_XHTML
-	CCompiledStyle CCssCalculator_Private::GetCompiledStyle(const std::vector<CNode>& arSelectors)
-	{
-		if (arSelectors.empty())
-			return CCompiledStyle();
-
-		CCompiledStyle oStyle;
-
-		GetCompiledStyle(oStyle, arSelectors);
-
-		return oStyle;
-	}
-
-	bool CCssCalculator_Private::GetCompiledStyle(CCompiledStyle &oStyle, const std::vector<CNode> &arSelectors)
-	{
-		if (arSelectors.empty())
-			return false;
-
-		const std::map<std::vector<CNode>, CCompiledStyle>::iterator oItem = m_mUsedStyles.find(arSelectors);
-
-		if (oItem != m_mUsedStyles.end())
-		{
-			oStyle = oItem->second;
-			return true;
-		}
-
-		oStyle.SetDpi(m_nDpi);
-
-		std::vector<std::wstring> arNodes = CalculateAllNodes(arSelectors);
-		std::vector<std::wstring> arPrevNodes;
-		bool bInTable = false;
-		
-		for (size_t i = 0; i < arSelectors.size(); ++i)
-		{
-			oStyle.AddParent(arSelectors[i].m_wsName);
-
-			if (!bInTable)
-				bInTable = IsTableElement(arSelectors[i].m_wsName);
-
-			if (bInTable)
-			{
-				oStyle.m_oBackground.Clear();
-				oStyle.m_oBorder.Clear();
-			}
-
-			CCompiledStyle oTempStyle;
-
-			oTempStyle.AddStyle(arSelectors[i].m_mAttributes, i + 1);
-
-			for (const CElement* oElement : FindElements(arNodes, arPrevNodes))
-				oTempStyle.AddStyle(oElement->GetStyle(), i + 1);
-
-			if (!arSelectors[i].m_wsStyle.empty())
-				oTempStyle.AddStyle(arSelectors[i].m_wsStyle, i + 1, true);
-
-			oStyle += oTempStyle;
-
-			// Скидываем некоторые внешние стили, которые внутри таблицы переопределяются
-			if (bInTable && i < arSelectors.size() - 1)
-			{
-				oStyle.m_oFont.GetLineHeight().Clear();
-				oStyle.m_oPadding.Clear();
-				oStyle.m_oMargin.Clear();
-			}
-		}
-
-		oStyle.SetID(CalculateStyleId(arSelectors.back()));
-
-		if (!oStyle.Empty())
-			m_mUsedStyles[arSelectors] = oStyle;
-
-		return true;
-	}
-
 	std::wstring CCssCalculator_Private::CalculateStyleId(const CNode& oNode)
 	{
 		return oNode.m_wsName + ((!oNode.m_wsClass.empty()) ? L'.' + oNode.m_wsClass : L"") + ((oNode.m_wsId.empty()) ? L"" : L'#' + oNode.m_wsId) + L'-' + std::to_wstring(++m_nCountNodes);
@@ -766,6 +790,11 @@ namespace NSCSS
 		return m_nDpi;
 	}
 
+	bool CCssCalculator_Private::HaveStylesById(const std::wstring& wsId) const
+	{
+		return nullptr != m_oStyleStorage.FindElement(L'#' + wsId);
+	}
+
 	void CCssCalculator_Private::ClearEmbeddedStyles()
 	{
 		m_oStyleStorage.ClearEmbeddedStyles();
@@ -910,4 +939,11 @@ inline static std::wstring StringifyValue(const KatanaValue* oValue)
 	return str;
 }
 
+inline static bool IsTableElement(const std::wstring& wsNameTag)
+{
+	return  L"td" == wsNameTag || L"tr" == wsNameTag || L"table" == wsNameTag ||
+	        L"tbody" == wsNameTag || L"thead" == wsNameTag || L"tfoot" == wsNameTag ||
+	        L"th" == wsNameTag;
+}
+
 

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

@@ -37,7 +37,7 @@ namespace NSCSS
 		void ClearPageData();
 		#endif
 
-		const CElement* FindElement(const std::wstring& wsSelector);
+		const CElement* FindElement(const std::wstring& wsSelector) const;
 	private:
 		typedef struct
 		{
@@ -77,7 +77,7 @@ 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 CElement* FindSelectorFromStyleData(const std::wstring& wsSelector, const std::map<std::wstring, CElement*>& mStyleData) const;
 	};
 
 	class CCssCalculator_Private
@@ -102,8 +102,7 @@ namespace NSCSS
 		~CCssCalculator_Private();
 
 		#ifdef CSS_CALCULATOR_WITH_XHTML
-		CCompiledStyle GetCompiledStyle(const std::vector<CNode> &arSelectors);
-		bool GetCompiledStyle(CCompiledStyle& oStyle, const std::vector<CNode> &arSelectors);
+		bool CalculateCompiledStyle(std::vector<CNode>& arSelectors);
 
 		std::wstring CalculateStyleId(const CNode& oNode);
 		bool CalculatePageStyle(NSProperties::CPage& oPageData, const std::vector<CNode> &arSelectors);
@@ -111,7 +110,7 @@ namespace NSCSS
 		void ClearPageData();
 		#endif
 
-		std::vector<std::wstring> CalculateAllNodes(const std::vector<CNode>& arSelectors);
+		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);
@@ -123,6 +122,8 @@ namespace NSCSS
 		std::wstring GetEncoding() const;
 		unsigned short int GetDpi() const;
 
+		bool HaveStylesById(const std::wstring& wsId) const;
+
 		void ClearEmbeddedStyles();
 		void ClearAllowedStyleFiles();
 		void ClearStylesFromFile(const std::wstring& wsFilePath);

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

@@ -1,19 +1,58 @@
 #include "CNode.h"
 
+#ifdef CSS_CALCULATOR_WITH_XHTML
+#include "CCompiledStyle.h"
+#endif
+
 namespace NSCSS
 {
 	CNode::CNode()
+	#ifdef CSS_CALCULATOR_WITH_XHTML
+		: m_pCompiledStyle(new CCompiledStyle())
+    #endif
 	{}
 
+	CNode::CNode(const CNode& oNode)
+		: m_wsName(oNode.m_wsName), m_wsClass(oNode.m_wsClass), m_wsId(oNode.m_wsId),
+	      m_wsStyle(oNode.m_wsStyle), m_mAttributes(oNode.m_mAttributes)
+	{
+		#ifdef CSS_CALCULATOR_WITH_XHTML
+		m_pCompiledStyle = new CCompiledStyle();
+		*m_pCompiledStyle = *oNode.m_pCompiledStyle;
+		#endif
+	}
+
 	CNode::CNode(const std::wstring& wsName, const std::wstring& wsClass, const std::wstring& wsId)
 		: m_wsName(wsName), m_wsClass(wsClass), m_wsId(wsId)
+	    #ifdef CSS_CALCULATOR_WITH_XHTML
+	    , m_pCompiledStyle(new CCompiledStyle())
+		#endif
 	{}
 
+	CNode::~CNode()
+	{
+		#ifdef CSS_CALCULATOR_WITH_XHTML
+		if (nullptr != m_pCompiledStyle)
+			delete m_pCompiledStyle;
+		#endif
+	}
+
 	bool CNode::Empty() const
 	{
 		return m_wsName.empty() && m_wsClass.empty() && m_wsId.empty() && m_wsStyle.empty();
 	}
 
+	#ifdef CSS_CALCULATOR_WITH_XHTML
+	void CNode::SetCompiledStyle(CCompiledStyle* pCompiledStyle)
+	{
+		if (nullptr != m_pCompiledStyle)
+			delete m_pCompiledStyle;
+
+		m_pCompiledStyle = new CCompiledStyle();
+		*m_pCompiledStyle = *pCompiledStyle;
+	}
+	#endif
+
 	void CNode::Clear()
 	{
 		m_wsName     .clear();

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

@@ -7,6 +7,9 @@
 
 namespace NSCSS
 {
+	#ifdef CSS_CALCULATOR_WITH_XHTML
+	class CCompiledStyle;
+	#endif
 	class CNode
 	{
 	public:
@@ -16,12 +19,21 @@ namespace NSCSS
 		std::wstring m_wsStyle; // Стиль тэга
 		std::map<std::wstring, std::wstring> m_mAttributes; // Остальные аттрибуты тэга
 
+		#ifdef CSS_CALCULATOR_WITH_XHTML
+		CCompiledStyle *m_pCompiledStyle;
+		#endif
 	public:
 		CNode();
+		CNode(const CNode& oNode);
 		CNode(const std::wstring& wsName, const std::wstring& wsClass, const std::wstring& wsId);
+		~CNode();
 
 		bool Empty() const;
 
+		#ifdef CSS_CALCULATOR_WITH_XHTML
+		void SetCompiledStyle(CCompiledStyle* pCompiledStyle);
+		#endif
+
 		void Clear();
 
 		std::vector<std::wstring> GetData() const;

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

@@ -1328,8 +1328,14 @@ namespace NSCSS
 
 	// DISPLAY
 	CDisplay::CDisplay()
-	    : m_oDisplay(L"inline", 0)
-	{}
+	{
+		m_eWhiteSpace.SetMapping({{L"normal",   EWhiteSpace::Normal  },
+		                          {L"nowrap",   EWhiteSpace::Nowrap  },
+		                          {L"pre",      EWhiteSpace::Pre     },
+		                          {L"pre-line", EWhiteSpace::Pre_Line},
+		                          {L"pre-wrap", EWhiteSpace::Pre_Wrap}},
+		                                        EWhiteSpace::Normal);
+	}
 
 	void CDisplay::Equation(CDisplay &oFirstDisplay, CDisplay &oSecondDisplay)
 	{
@@ -1342,6 +1348,8 @@ namespace NSCSS
 		CString::Equation(oFirstDisplay.m_oHAlign, oSecondDisplay.m_oHAlign);
 
 		CString::Equation(oFirstDisplay.m_oDisplay, oSecondDisplay.m_oDisplay);
+
+		CEnum::Equation(oFirstDisplay.m_eWhiteSpace, oSecondDisplay.m_eWhiteSpace);
 	}
 
 	bool CDisplay::SetX(const std::wstring &wsValue, unsigned int unLevel, bool bHardMode)
@@ -1405,6 +1413,11 @@ namespace NSCSS
 		return m_oDisplay.SetValue(wsValue, NSConstValues::DISPLAY_VALUES, unLevel, bHardMode);
 	}
 
+	bool CDisplay::SetWhiteSpace(const std::wstring& wsValue, unsigned int unLevel, bool bHardMode)
+	{
+		return m_eWhiteSpace.SetValue(wsValue, unLevel, bHardMode);
+	}
+
 	const CDigit& CDisplay::GetX() const
 	{
 		return m_oX;
@@ -1440,34 +1453,42 @@ namespace NSCSS
 		return m_oDisplay;
 	}
 
+	const CEnum& CDisplay::GetWhiteSpace() const
+	{
+		return m_eWhiteSpace;
+	}
+
 	bool CDisplay::Empty() const
 	{
 		return m_oX.Empty() && m_oY.Empty() && m_oWidth.Empty() && m_oHeight.Empty() &&
-		       m_oHeight.Empty() && m_oVAlign.Empty() && m_oDisplay.Empty();
+		       m_oHeight.Empty() && m_oVAlign.Empty() && m_oDisplay.Empty() &&
+		       (m_eWhiteSpace.Empty() || m_eWhiteSpace == EWhiteSpace::Normal);
 	}
 
 	CDisplay &CDisplay::operator+=(const CDisplay &oDisplay)
 	{
-		m_oX       += oDisplay.m_oX;
-		m_oY       += oDisplay.m_oY;
-		m_oWidth   = oDisplay.m_oWidth;
-		m_oHeight  = oDisplay.m_oHeight;
-		m_oHAlign  += oDisplay.m_oHAlign;
-		m_oVAlign  += oDisplay.m_oVAlign;
-		m_oDisplay += oDisplay.m_oDisplay;
+		m_oX          += oDisplay.m_oX;
+		m_oY          += oDisplay.m_oY;
+		m_oWidth       = oDisplay.m_oWidth;
+		m_oHeight      = oDisplay.m_oHeight;
+		m_oHAlign     += oDisplay.m_oHAlign;
+		m_oVAlign     += oDisplay.m_oVAlign;
+		m_oDisplay    += oDisplay.m_oDisplay;
+		m_eWhiteSpace += oDisplay.m_eWhiteSpace;
 
 		return *this;
 	}
 
 	bool CDisplay::operator==(const CDisplay &oDisplay) const
 	{
-		return m_oX       == oDisplay.m_oX      &&
-		       m_oY       == oDisplay.m_oY      &&
-		       m_oWidth   == oDisplay.m_oWidth  &&
-		       m_oHeight  == oDisplay.m_oHeight &&
-		       m_oHAlign  == oDisplay.m_oHAlign &&
-		       m_oVAlign  == oDisplay.m_oVAlign &&
-		       m_oDisplay == oDisplay.m_oDisplay;
+		return m_oX          == oDisplay.m_oX       &&
+		       m_oY          == oDisplay.m_oY       &&
+		       m_oWidth      == oDisplay.m_oWidth   &&
+		       m_oHeight     == oDisplay.m_oHeight  &&
+		       m_oHAlign     == oDisplay.m_oHAlign  &&
+		       m_oVAlign     == oDisplay.m_oVAlign  &&
+		       m_oDisplay    == oDisplay.m_oDisplay &&
+		       m_eWhiteSpace == oDisplay.m_eWhiteSpace.ToInt();
 	}
 
 	// STROKE

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

@@ -328,6 +328,15 @@ namespace NSCSS
 	};
 
 	// PROPERTIES
+	typedef enum
+	{
+		Normal,
+		Nowrap,
+		Pre,
+		Pre_Line,
+		Pre_Wrap
+	} EWhiteSpace;
+
 	class CDisplay
 	{
 	public:
@@ -347,6 +356,8 @@ namespace NSCSS
 
 		bool SetDisplay(const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
 
+		bool SetWhiteSpace(const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
+
 		const CDigit& GetX()      const;
 		const CDigit& GetY()      const;
 		const CDigit& GetWidth()  const;
@@ -357,6 +368,8 @@ namespace NSCSS
 
 		const CString& GetDisplay() const;
 
+		const CEnum& GetWhiteSpace() const;
+
 		bool Empty() const;
 
 		CDisplay& operator+=(const CDisplay& oDisplay);
@@ -371,6 +384,8 @@ namespace NSCSS
 		CString m_oVAlign;
 
 		CString m_oDisplay;
+
+		CEnum m_eWhiteSpace;
 	};
 
 	class CStroke

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

@@ -22,10 +22,10 @@ namespace NSCSS
 		: m_oStyle(oStyle), m_bIsPStyle(bIsPStyle)
 	{}
 
-	bool CheckArrays(const std::vector<std::wstring>& arInitial, const std::set<std::wstring>& arFirst, const std::set<std::wstring>& arSecond) 
+	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());
-	
+
 		std::vector<std::wstring> arCommonElements1;
 		std::vector<std::wstring> arCommonElements2;
 
@@ -470,9 +470,6 @@ namespace NSCSS
 
 		int nSpace{0};
 
-		if (NULL != pPadding && !pPadding->Empty() && !pPadding->Zero())
-			nSpace = pPadding->ToInt(NSCSS::Point);
-
 		return  L"w:val=\"" + wsStyle + L"\" w:sz=\"" + std::to_wstring(nWidth) + + L"\" w:space=\"" + std::to_wstring(nSpace) + L"\" w:color=\"" + wsColor + L"\"";
 	}
 
@@ -559,7 +556,7 @@ namespace NSCSS
 
 		if (oXmlElement.Empty())
 			return false;
-		
+
 		m_sStyle += oXmlElement.GetPStyle(true);
 		return true;
 	}

Common/3dParty/html/htmltoxhtml.h

@@ -68,10 +68,10 @@ static std::wstring htmlToXhtml(std::string& sFileContent, bool bNeedConvert)
 {
 	if (bNeedConvert)
 	{ // Определение кодировки
-		std::string sEncoding = NSStringFinder::FindPropety(sFileContent, "charset", {"="}, {";", "\\n", "\\r", " ", "\""}).m_sValue;
+		std::string sEncoding = NSStringFinder::FindProperty(sFileContent, "charset", {"="}, {";", "\\n", "\\r", " ", "\""}).m_sValue;
 
 		if (sEncoding.empty())
-			sEncoding = NSStringFinder::FindPropety(sFileContent, "encoding", {"="}, {";", "\\n", "\\r", " "}).m_sValue;
+			sEncoding = NSStringFinder::FindProperty(sFileContent, "encoding", {"="}, {";", "\\n", "\\r", " "}).m_sValue;
 
 		if (!sEncoding.empty() && !NSStringFinder::Equals("utf-8", sEncoding))
 		{
@@ -210,7 +210,7 @@ static void ReadMht(const std::string& sMhtContent, std::map<std::string, std::s
 	NSStringFinder::TFoundedData<char> oData;
 	
 	// Content-Type
-	oData =  NSStringFinder::FindPropety(sMhtContent, "content-type", {":"}, {";", "\\n", "\\r"});
+	oData =  NSStringFinder::FindProperty(sMhtContent, "content-type", {":"}, {";", "\\n", "\\r"});
 	const std::string sContentType{oData.m_sValue};
 
 	if (sContentType.empty())
@@ -226,18 +226,18 @@ static void ReadMht(const std::string& sMhtContent, std::map<std::string, std::s
 	unCharsetBegin = oData.m_unEndPosition;
 
 	// name
-//	std::string sName = NSStringFinder::FindPropety(sMhtContent, "name", {"="}, {";", "\\n", "\\r"}, 0, unLastPosition);
+//	std::string sName = NSStringFinder::FindProperty(sMhtContent, "name", {"="}, {";", "\\n", "\\r"}, 0, unLastPosition);
 //	unContentPosition = std::max(unContentPosition, unLastPosition);
 
 	// Content-Location
-	oData = NSStringFinder::FindPropety(sMhtContent, "content-location", {":"}, {";", "\\n", "\\r"});
+	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::FindPropety(sMhtContent, "content-id", {":"}, {";", "\\n", "\\r"});
+	oData = NSStringFinder::FindProperty(sMhtContent, "content-id", {":"}, {";", "\\n", "\\r"});
 	std::string sContentID{oData.m_sValue};
 
 	if (!oData.Empty())
@@ -251,7 +251,7 @@ static void ReadMht(const std::string& sMhtContent, std::map<std::string, std::s
 		sContentLocation = "cid:" + sContentID;
 
 	// Content-Transfer-Encoding
-	oData = NSStringFinder::FindPropety(sMhtContent, "content-transfer-encoding", {":"}, {";", "\\n", "\\r"});
+	oData = NSStringFinder::FindProperty(sMhtContent, "content-transfer-encoding", {":"}, {";", "\\n", "\\r"});
 	const std::string sContentEncoding{oData.m_sValue};
 
 	if (!oData.Empty())
@@ -265,7 +265,7 @@ static void ReadMht(const std::string& sMhtContent, std::map<std::string, std::s
 
 	if (std::string::npos != unCharsetEnd && unCharsetBegin < unCharsetEnd)
 	{
-		sCharset = NSStringFinder::FindPropety(sMhtContent.substr(unCharsetBegin, unCharsetEnd - unCharsetBegin), "charset", {"="}, {";", "\\n", "\\r"}).m_sValue;
+		sCharset = NSStringFinder::FindProperty(sMhtContent.substr(unCharsetBegin, unCharsetEnd - unCharsetBegin), "charset", {"="}, {";", "\\n", "\\r"}).m_sValue;
 		NSStringFinder::CutInside<std::string>(sCharset, "\"");
 	}
 
@@ -337,7 +337,7 @@ static std::string mhtTohtml(const std::string& sFileContent)
 	NSStringUtils::CStringBuilderA oRes;
 
 	// Поиск boundary
-	NSStringFinder::TFoundedData<char> oData{NSStringFinder::FindPropety(sFileContent, "boundary", {"="}, {"\\r", "\\n", "\""})};
+	NSStringFinder::TFoundedData<char> oData{NSStringFinder::FindProperty(sFileContent, "boundary", {"="}, {"\\r", "\\n", "\""})};
 
 	size_t nFound{oData.m_unEndPosition};
 	std::string sBoundary{oData.m_sValue};
@@ -436,17 +436,17 @@ static void substitute_xml_entities_into_text(std::string& text)
 }
 
 // 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 <= 0x1F),
+// 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(), [](char chValue){ return chValue <= 0x1F; });
+	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(), [](char chValue){ return chValue <= 0x1F; });
+		itFound = std::find_if(itFound, text.end(), [](unsigned char chValue){ return chValue <= 0x09; });
 	}
 }
 
@@ -489,6 +489,7 @@ static void build_doctype(GumboNode* node, NSStringUtils::CStringBuilderA& oBuil
 		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 \"");
@@ -509,6 +510,10 @@ static void build_attributes(const GumboVector* attribs, NSStringUtils::CStringB
 		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;
@@ -569,6 +574,7 @@ static void prettyprint_contents(GumboNode* node, NSStringUtils::CStringBuilderA
 		if (child->type == GUMBO_NODE_TEXT)
 		{
 			std::string val(child->v.text.text);
+			remove_control_symbols(val);
 			substitute_xml_entities_into_text(val);
 
 			// Избавление от FF
@@ -608,6 +614,7 @@ static void prettyprint(GumboNode* node, NSStringUtils::CStringBuilderA& oBuilde
 	}
 
 	std::string tagname            = get_tag_name(node);
+	remove_control_symbols(tagname);
 
 	if (NodeIsUnprocessed(tagname))
 		return;

Common/3dParty/hunspell/autogen/generate.py

@@ -0,0 +1,43 @@
+import os
+import glob
+import json
+import subprocess
+
+curDirectory = os.path.dirname(os.path.realpath(__file__))
+dictionatiesDirectory = curDirectory + "/../../../../../dictionaries"
+
+all_dictionaties = {}
+for dir in glob.glob(dictionatiesDirectory + "/*"):
+    if not os.path.isdir(dir):
+        continue
+    dictionaryName = os.path.basename(dir)
+    configFile = dictionatiesDirectory + "/" + dictionaryName + "/" + dictionaryName + ".json"
+    if not os.path.isfile(configFile):
+        continue
+    isHyphen = False
+    hyphenFile = dictionatiesDirectory + "/" + dictionaryName + "/hyph_" + dictionaryName + ".dic"
+    if os.path.isfile(hyphenFile):
+        isHyphen = True
+    with open(configFile, 'r', encoding='utf-8') as file:
+        data = json.loads(file.read())
+        for lang in data["codes"]:
+            all_dictionaties[str(lang)] = {
+                "name": dictionaryName,
+                "hyphen": isHyphen
+            }
+
+content = ""
+content += "#define DictionaryRec_count " + str(len(all_dictionaties)) + "\n"
+content += "typedef struct {\n"
+content += "    const char* m_name;\n"
+content += "    int         m_lang;\n"
+content += "} DictionaryRec;\n\n"
+content += "static const DictionaryRec Dictionaries[DictionaryRec_count] = {\n"
+
+for lang in all_dictionaties:
+    info = all_dictionaties[lang]
+    content += "    { \"" + info["name"] + "\", " + str(lang) + " },\n"
+content += "};\n"
+
+with open("./records.h", 'w', encoding='utf-8') as f:
+    f.write(content)

Common/3dParty/hunspell/autogen/records.h

@@ -0,0 +1,73 @@
+#define DictionaryRec_count 65
+typedef struct {
+    const char* m_name;
+    int         m_lang;
+} DictionaryRec;
+
+static const DictionaryRec Dictionaries[DictionaryRec_count] = {
+    { "ar", 1025 },
+    { "ar", 2049 },
+    { "ar", 3073 },
+    { "ar", 4097 },
+    { "ar", 5121 },
+    { "ar", 6145 },
+    { "ar", 7169 },
+    { "ar", 8193 },
+    { "ar", 9217 },
+    { "ar", 10241 },
+    { "ar", 11265 },
+    { "ar", 12289 },
+    { "ar", 13313 },
+    { "ar", 14337 },
+    { "ar", 15361 },
+    { "ar", 16385 },
+    { "az_Latn_AZ", 1068 },
+    { "bg_BG", 1026 },
+    { "ca_ES", 1027 },
+    { "ca_ES_valencia", 2051 },
+    { "cs_CZ", 1029 },
+    { "da_DK", 1030 },
+    { "de_AT", 3079 },
+    { "de_CH", 2055 },
+    { "de_DE", 1031 },
+    { "el_GR", 1032 },
+    { "en_AU", 3081 },
+    { "en_CA", 4105 },
+    { "en_GB", 2057 },
+    { "en_US", 1033 },
+    { "en_ZA", 7177 },
+    { "es_ES", 3082 },
+    { "eu_ES", 1069 },
+    { "fr_FR", 1036 },
+    { "gl_ES", 1110 },
+    { "hr_HR", 1050 },
+    { "hu_HU", 1038 },
+    { "id_ID", 1057 },
+    { "it_IT", 1040 },
+    { "kk_KZ", 1087 },
+    { "ko_KR", 1042 },
+    { "lb_LU", 1134 },
+    { "lt_LT", 1063 },
+    { "lv_LV", 1062 },
+    { "mn_MN", 1104 },
+    { "nb_NO", 1044 },
+    { "nl_NL", 1043 },
+    { "nl_NL", 2067 },
+    { "nn_NO", 2068 },
+    { "oc_FR", 1154 },
+    { "pl_PL", 1045 },
+    { "pt_BR", 1046 },
+    { "pt_PT", 2070 },
+    { "ro_RO", 1048 },
+    { "ru_RU", 1049 },
+    { "sk_SK", 1051 },
+    { "sl_SI", 1060 },
+    { "sr_Cyrl_RS", 10266 },
+    { "sr_Latn_RS", 9242 },
+    { "sv_SE", 1053 },
+    { "tr_TR", 1055 },
+    { "uk_UA", 1058 },
+    { "uz_Cyrl_UZ", 2115 },
+    { "uz_Latn_UZ", 1091 },
+    { "vi_VN", 1066 },
+};

Common/3dParty/md/.gitignore

@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+md4c
+# Except this file
+!.gitignore

Common/3dParty/md/fetch.py

@@ -0,0 +1,13 @@
+#!/usr/bin/env python
+
+import sys
+sys.path.append('../../../../build_tools/scripts')
+import config
+import base
+import os
+
+base_directory = os.getcwd()
+
+if not base.is_dir("md4c"):
+  base.cmd("git", ["clone", "https://github.com/mity/md4c.git"])
+  base.cmd_in_dir("md4c", "git", ["checkout", "481fbfbdf72daab2912380d62bb5f2187d438408"])

Common/3dParty/md/md2html.cpp

@@ -0,0 +1,105 @@
+#include "md2html.h"
+
+#include "md4c/src/md4c-html.h"
+#include "../../../DesktopEditor/common/File.h"
+
+namespace Md
+{
+void ToHtml(const MD_CHAR* pValue, MD_SIZE uSize, void* pData)
+{
+	if (NULL != pData)
+		(*(std::string*)pData).append(pValue, uSize);
+}
+
+std::string ConvertMdStringToHtml(const std::string& sMdString)
+{
+	std::string sData;
+	md_html(sMdString.c_str(), sMdString.length(), ToHtml, &sData, 0, 0);
+	return sData;
+}
+
+void ToHtmlFile(const MD_CHAR* pValue, MD_SIZE uSize, void* pData)
+{
+	if (NULL != pData)
+		((NSFile::CFileBinary*)pData)->WriteFile(pValue, uSize);
+}
+
+void WriteBaseHtmlStyles(NSFile::CFileBinary& oFile)
+{
+	oFile.WriteStringUTF8(L"<style>");
+
+	// Main styles
+	oFile.WriteStringUTF8(L"* { font-family: Arial; color:black; white-space:pre; }");
+	oFile.WriteStringUTF8(L"p { margin: 0 0 10px; display: block; }");
+	oFile.WriteStringUTF8(L"a { color: #0553c1; text-decoration: underline; } a:visited { color: #954f72; text-decoration: underline; }");
+	oFile.WriteStringUTF8(L"ul { margin-top: 0; margin-bottom: 10px; }");
+	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;}");
+	oFile.WriteStringUTF8(L"thead { display: table-header-group; vertical-align: middle; }");
+	oFile.WriteStringUTF8(L"tr { display: table-row; }");
+	oFile.WriteStringUTF8(L"th { text-align: left; display: table-cell; font-weight: bold; }");
+
+	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; 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
+	oFile.WriteStringUTF8(L"h1 { font-size: 20pt; color: #0f4761; margin-top: 18pt; margin-bottom: 4pt; }");
+	oFile.WriteStringUTF8(L"h2 { font-size: 16pt; color: #0f4761; margin-top: 8pt; margin-bottom: 4pt; }");
+	oFile.WriteStringUTF8(L"h3 { font-size: 14pt; color: #0f4761; margin-top: 8pt; margin-bottom: 4pt; }");
+	oFile.WriteStringUTF8(L"h4 { font-style: italic; color: #0f4761; margin-top: 4pt; margin-bottom: 2pt; }");
+	oFile.WriteStringUTF8(L"h5 { color: #0f4761; margin-top: 4pt; margin-bottom: 2pt; }");
+	oFile.WriteStringUTF8(L"h6 { font-style: italic; color: #595959; margin-top: 2pt; margin-bottom: 0; }");
+
+	oFile.WriteStringUTF8(L"</style>");
+}
+
+bool ConvertMdFileToHtml(const std::wstring& wsPathToMdFile, const std::wstring& wsPathToHtmlFile)
+{
+	std::string sMdData;
+
+	if (!NSFile::CFileBinary::ReadAllTextUtf8A(wsPathToMdFile, sMdData))
+		return false;
+
+	NSFile::CFileBinary oFile;
+
+	if (!oFile.CreateFile(wsPathToHtmlFile))
+		return false;
+
+	oFile.WriteStringUTF8(L"<html><body>");
+
+	oFile.WriteStringUTF8(L"<head>");
+	//oFile.WriteStringUTF8(L"<meta charset=\"UTF-8\">");
+	oFile.WriteStringUTF8(L"<meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\">");
+	WriteBaseHtmlStyles(oFile);
+	oFile.WriteStringUTF8(L"</head>");
+
+	bool bResult = true;
+
+	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>");
+
+	oFile.CloseFile();
+
+	if (!bResult)
+		NSFile::CFileBinary::Remove(wsPathToHtmlFile);
+
+	return bResult;
+}
+}
+

Common/3dParty/md/md2html.h

@@ -0,0 +1,19 @@
+#ifndef MD2HTML_H
+#define MD2HTML_H
+
+#include <string>
+
+#ifndef MDCONVERTER_DECL_EXPORT
+#define MDCONVERTER_DECL_EXPORT
+#else
+#include "../../../DesktopEditor/common/base_export.h"
+#define MDCONVERTER_DECL_EXPORT Q_DECL_EXPORT
+#endif
+
+namespace Md
+{
+std::string MDCONVERTER_DECL_EXPORT ConvertMdStringToHtml(const std::string& sMdString);
+bool MDCONVERTER_DECL_EXPORT ConvertMdFileToHtml(const std::wstring& wsPathToMdFile, const std::wstring& wsPathToHtmlFile);
+}
+
+#endif // MD2HTML_H

Common/3dParty/md/md2html.pri

@@ -0,0 +1,11 @@
+DEFINES += MD4C_USE_UTF8
+
+HEADERS += $$PWD/md4c/src/md4c.h \
+           $$PWD/md4c/src/md4c-html.h \
+           $$PWD/md4c/src/entity.h \
+           $$PWD/md2html.h \
+
+SOURCES += $$PWD/md4c/src/md4c.c \
+           $$PWD/md4c/src/md4c-html.c \
+           $$PWD/md4c/src/entity.c \
+           $$PWD/md2html.cpp

Common/3dParty/md/test/TestMd.pro

@@ -0,0 +1,16 @@
+QT -= core
+QT -= gui
+
+TARGET = test
+TEMPLATE = app
+
+CONFIG += console
+CONFIG -= app_bundle
+
+CORE_ROOT_DIR = $$PWD/../../../../
+
+SOURCES += main.cpp
+
+include($$CORE_ROOT_DIR/Common/3dParty/md/md2html.pri)
+
+DESTDIR = $$PWD/build/$$CORE_BUILDS_PLATFORM_PREFIX

Common/3dParty/md/test/files/file-1.md

@@ -0,0 +1 @@
+ * foo **bar [link](http://example.com) baz**

Common/3dParty/md/test/main.cpp

@@ -0,0 +1,10 @@
+#include <iostream>
+
+#include "../md2html.h"
+
+int main(int argc, char *argv[])
+{
+	std::cout << (ConvertMdFileToHtml(L"YOUR_PATH", L"YOUR_PATH") ? "Good" : "Bad") << std::endl;
+
+	return 0;
+}

Common/OfficeFileFormatChecker.h

@@ -103,9 +103,11 @@ public:
 	bool isBinaryDoctFormatFile(unsigned char* pBuffer, int dwBytes);
 	bool isBinaryXlstFormatFile(unsigned char* pBuffer, int dwBytes);
 	bool isBinaryPpttFormatFile(unsigned char* pBuffer, int dwBytes);
+	bool isBinaryVsdtFormatFile(unsigned char* pBuffer, int dwBytes);
 
 	bool isDjvuFormatFile(unsigned char* pBuffer, int dwBytes);
 	bool isMobiFormatFile(unsigned char* pBuffer, int dwBytes);
 	bool isFB2FormatFile(unsigned char* pBuffer, int dwBytes);
 	bool isXpsFile(const std::wstring& fileName);
+	bool isOFDFile(const std::wstring& fileName);
 };

Common/OfficeFileFormatChecker2.cpp

@@ -44,6 +44,7 @@
 
 #include "3dParty/pole/pole.h"
 #include <algorithm>
+#include <limits>
 
 #include "OfficeFileFormatDefines.h"
 
@@ -222,6 +223,16 @@ bool COfficeFileFormatChecker::isBinaryPpttFormatFile(unsigned char *pBuffer, in
 
 	return false;
 }
+bool COfficeFileFormatChecker::isBinaryVsdtFormatFile(unsigned char* pBuffer, int dwBytes)
+{
+	if (pBuffer == NULL)
+		return false;
+
+	if ((4 <= dwBytes) && ('V' == pBuffer[0] && 'S' == pBuffer[1] && 'D' == pBuffer[2] && 'Y' == pBuffer[3]))
+		return true;
+
+	return false;
+}
 bool COfficeFileFormatChecker::isPdfFormatFile(unsigned char *pBuffer, int dwBytes, std::wstring &documentID)
 {
 	if (pBuffer == NULL)
@@ -786,6 +797,13 @@ bool COfficeFileFormatChecker::isOfficeFile(const std::wstring &_fileName)
             bufferDetect = NULL;
             return true;
         }
+		else if (isOFDFile(fileName))
+		{
+			if (bufferDetect)
+				delete[] bufferDetect;
+			bufferDetect = NULL;
+			return true;
+		}
 		else if (isMacFormatFile(fileName))
 		{
 			if (bufferDetect)
@@ -816,6 +834,10 @@ bool COfficeFileFormatChecker::isOfficeFile(const std::wstring &_fileName)
 		{
 			nFileType = AVS_OFFICESTUDIO_FILE_CANVAS_PRESENTATION;
 		}
+		else if (isBinaryVsdtFormatFile(bufferDetect, sizeRead)) // min size - 4
+		{
+			nFileType = AVS_OFFICESTUDIO_FILE_CANVAS_DRAW;
+		}
 		else if (isOOXFlatFormatFile(bufferDetect, sizeRead))
 		{
 			// nFileType;
@@ -915,6 +937,8 @@ bool COfficeFileFormatChecker::isOfficeFile(const std::wstring &_fileName)
 	}
 	else if (0 == sExt.compare(L".mht") || 0 == sExt.compare(L".mhtml"))
 		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".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"))
@@ -923,7 +947,7 @@ bool COfficeFileFormatChecker::isOfficeFile(const std::wstring &_fileName)
 		nFileType = AVS_OFFICESTUDIO_FILE_CANVAS_PDF;
 	else if (0 == sExt.compare(L".doct")) // случай архива с html viewer
 		nFileType = AVS_OFFICESTUDIO_FILE_TEAMLAB_DOCY;
-	else if (0 == sExt.compare(L".txt") || 0 == sExt.compare(L".xml") || 0 == sExt.compare(L".rtf")	|| 0 == sExt.compare(L".doc") || 0 == sExt.compare(L".docx") || 0 == sExt.compare(L".md"))
+	else if (0 == sExt.compare(L".txt") || 0 == sExt.compare(L".xml") || 0 == sExt.compare(L".rtf")	|| 0 == sExt.compare(L".doc") || 0 == sExt.compare(L".docx"))
 		nFileType = AVS_OFFICESTUDIO_FILE_DOCUMENT_TXT;
 	else if (0 == sExt.compare(L".pages"))
 		nFileType = AVS_OFFICESTUDIO_FILE_DOCUMENT_PAGES;
@@ -1150,6 +1174,10 @@ bool COfficeFileFormatChecker::isOnlyOfficeFormatFile(const std::wstring &fileNa
 		{
 			nFileType = AVS_OFFICESTUDIO_FILE_TEAMLAB_PPTY;
 		}
+		else if (isBinaryVsdtFormatFile(pBuffer, nBufferSize))
+		{
+			nFileType = AVS_OFFICESTUDIO_FILE_TEAMLAB_VSDY;
+		}
 
 		delete[] pBuffer;
 		pBuffer = NULL;
@@ -1573,12 +1601,15 @@ bool COfficeFileFormatChecker::isOOXFlatFormatFile(unsigned char *pBuffer, int d
 	const char *xlsxPackage = "progid=\"Excel.Sheet\"";
 	const char *pptxPackage = "progid=\"PowerPoint.Show\"";
 	const char *packageFormatLine = "xmlns:pkg=\"http://schemas.microsoft.com/office/2006/xmlPackage\"";
+	const char* workbookFormatLine = "<Workbook";
+	const char* htmlFormatLine = "<html";
 
 	if (std::string::npos != xml_string.find(docxFormatLine))
 	{
 		nFileType = AVS_OFFICESTUDIO_FILE_DOCUMENT_DOCX_FLAT;
 	}
-	else if (std::string::npos != xml_string.find(xlsxFormatLine))
+	else if (std::string::npos != xml_string.find(xlsxFormatLine) && (	std::string::npos != xml_string.find(workbookFormatLine) ||
+																		std::string::npos == xml_string.find(htmlFormatLine)))
 	{
 		nFileType = AVS_OFFICESTUDIO_FILE_SPREADSHEET_XLSX_FLAT;
 	}
@@ -1639,6 +1670,14 @@ std::wstring COfficeFileFormatChecker::GetExtensionByType(int type)
 		return L".fodt";
 	case AVS_OFFICESTUDIO_FILE_DOCUMENT_OTT:
 		return L".ott";
+	case AVS_OFFICESTUDIO_FILE_DOCUMENT_PAGES:
+		return L".pages";
+	case AVS_OFFICESTUDIO_FILE_DOCUMENT_HWP:
+		return L".hwp";
+	case AVS_OFFICESTUDIO_FILE_DOCUMENT_HWPX:
+		return L".hwpx";
+	case AVS_OFFICESTUDIO_FILE_DOCUMENT_MD:
+		return L".md";
 
 	case AVS_OFFICESTUDIO_FILE_PRESENTATION_PPTX:
 		return L".pptx";
@@ -1660,6 +1699,10 @@ std::wstring COfficeFileFormatChecker::GetExtensionByType(int type)
 		return L".fodp";
 	case AVS_OFFICESTUDIO_FILE_PRESENTATION_OTP:
 		return L".otp";
+	case AVS_OFFICESTUDIO_FILE_PRESENTATION_ODG:
+		return L".odg";
+	case AVS_OFFICESTUDIO_FILE_PRESENTATION_KEY:
+		return L".key";
 
 	case AVS_OFFICESTUDIO_FILE_SPREADSHEET_XLSX:
 		return L".xlsx";
@@ -1681,6 +1724,8 @@ std::wstring COfficeFileFormatChecker::GetExtensionByType(int type)
 		return L".fods";
 	case AVS_OFFICESTUDIO_FILE_SPREADSHEET_OTS:
 		return L".ots";
+	case AVS_OFFICESTUDIO_FILE_SPREADSHEET_NUMBERS:
+		return L".numbers";
 
 	case AVS_OFFICESTUDIO_FILE_CROSSPLATFORM_PDF:
 	case AVS_OFFICESTUDIO_FILE_DOCUMENT_OFORM_PDF:
@@ -1691,6 +1736,8 @@ std::wstring COfficeFileFormatChecker::GetExtensionByType(int type)
 		return L".djvu";
 	case AVS_OFFICESTUDIO_FILE_CROSSPLATFORM_XPS:
 		return L".xps";
+	case AVS_OFFICESTUDIO_FILE_CROSSPLATFORM_OFD:
+		return L".ofd";
 	case AVS_OFFICESTUDIO_FILE_CROSSPLATFORM_SVG:
 		return L".svg";
 	case AVS_OFFICESTUDIO_FILE_CROSSPLATFORM_HTMLR:
@@ -1732,12 +1779,15 @@ std::wstring COfficeFileFormatChecker::GetExtensionByType(int type)
 	case AVS_OFFICESTUDIO_FILE_CANVAS_WORD:
 	case AVS_OFFICESTUDIO_FILE_CANVAS_SPREADSHEET:
 	case AVS_OFFICESTUDIO_FILE_CANVAS_PRESENTATION:
+	case AVS_OFFICESTUDIO_FILE_CANVAS_DRAW:
 		return L".bin";
 	case AVS_OFFICESTUDIO_FILE_OTHER_OLD_DOCUMENT:
 	case AVS_OFFICESTUDIO_FILE_TEAMLAB_DOCY:
 		return L".doct";
 	case AVS_OFFICESTUDIO_FILE_TEAMLAB_XLSY:
 		return L".xlst";
+	case AVS_OFFICESTUDIO_FILE_TEAMLAB_VSDY:
+		return L".vsdt";
 	case AVS_OFFICESTUDIO_FILE_OTHER_OLD_PRESENTATION:
 	case AVS_OFFICESTUDIO_FILE_OTHER_OLD_DRAWING:
 	case AVS_OFFICESTUDIO_FILE_TEAMLAB_PPTY:
@@ -1805,6 +1855,14 @@ int COfficeFileFormatChecker::GetFormatByExtension(const std::wstring &sExt)
 		return AVS_OFFICESTUDIO_FILE_DOCUMENT_ODT_FLAT;
 	if (L".ott" == ext)
 		return AVS_OFFICESTUDIO_FILE_DOCUMENT_OTT;
+	if (L".pages" == ext)
+		return AVS_OFFICESTUDIO_FILE_DOCUMENT_PAGES;
+	if (L".hwp" == ext)
+		return AVS_OFFICESTUDIO_FILE_DOCUMENT_HWP;
+	if (L".hwpx" == ext)
+		return AVS_OFFICESTUDIO_FILE_DOCUMENT_HWPX;
+	if (L".md" == ext)
+		return AVS_OFFICESTUDIO_FILE_DOCUMENT_MD;
 
 	if (L".pptx" == ext)
 		return AVS_OFFICESTUDIO_FILE_PRESENTATION_PPTX;
@@ -1826,6 +1884,10 @@ int COfficeFileFormatChecker::GetFormatByExtension(const std::wstring &sExt)
 		return AVS_OFFICESTUDIO_FILE_PRESENTATION_ODP_FLAT;
 	if (L".otp" == ext)
 		return AVS_OFFICESTUDIO_FILE_PRESENTATION_OTP;
+	if (L".odg" == ext)
+		return AVS_OFFICESTUDIO_FILE_PRESENTATION_ODG;
+	if (L".key" == ext)
+		return AVS_OFFICESTUDIO_FILE_PRESENTATION_KEY;
 
 	if (L".xlsx" == ext)
 		return AVS_OFFICESTUDIO_FILE_SPREADSHEET_XLSX;
@@ -1853,6 +1915,8 @@ int COfficeFileFormatChecker::GetFormatByExtension(const std::wstring &sExt)
 		return AVS_OFFICESTUDIO_FILE_SPREADSHEET_OTS;
 	if (L".ods" == ext)
 		return AVS_OFFICESTUDIO_FILE_SPREADSHEET_ODS;
+	if (L".numbers" == ext)
+		return AVS_OFFICESTUDIO_FILE_SPREADSHEET_NUMBERS;
 
 	if (L".ooxml" == ext)
 		return AVS_OFFICESTUDIO_FILE_OTHER_OOXML;
@@ -1865,6 +1929,8 @@ int COfficeFileFormatChecker::GetFormatByExtension(const std::wstring &sExt)
 		return AVS_OFFICESTUDIO_FILE_CROSSPLATFORM_DJVU;
 	if (L".xps" == ext || L".oxps" == ext)
 		return AVS_OFFICESTUDIO_FILE_CROSSPLATFORM_XPS;
+	if (L"ofd" == ext)
+		return AVS_OFFICESTUDIO_FILE_CROSSPLATFORM_OFD;
 
 	if (L".jpg" == ext || L".jpeg" == ext || L".jpe" == ext || L".jfif" == ext)
 		return AVS_OFFICESTUDIO_FILE_IMAGE_JPG;
@@ -1899,6 +1965,8 @@ int COfficeFileFormatChecker::GetFormatByExtension(const std::wstring &sExt)
 		return AVS_OFFICESTUDIO_FILE_TEAMLAB_XLSY;
 	if (L".pptt" == ext)
 		return AVS_OFFICESTUDIO_FILE_TEAMLAB_PPTY;
+	if (L".vsdt" == ext)
+		return AVS_OFFICESTUDIO_FILE_TEAMLAB_VSDY;
 
 	if (L".vsdx" == ext)
 		return AVS_OFFICESTUDIO_FILE_DRAW_VSDX;
@@ -2001,3 +2069,26 @@ bool COfficeFileFormatChecker::isXpsFile(const std::wstring &fileName)
 	}
 	return false;
 }
+
+bool COfficeFileFormatChecker::isOFDFile(const std::wstring& fileName)
+{
+	COfficeUtils OfficeUtils(NULL);
+
+	ULONG nBufferSize = 0;
+	BYTE *pBuffer = NULL;
+
+	HRESULT hresult = OfficeUtils.LoadFileFromArchive(fileName, L"OFD.xml", &pBuffer, nBufferSize);
+	if (hresult == S_OK && pBuffer != NULL)
+	{
+		if (19 <= nBufferSize && NULL != strstr((char *)pBuffer, "ofd:OFD"))
+			nFileType = AVS_OFFICESTUDIO_FILE_CROSSPLATFORM_OFD;
+
+		delete[] pBuffer;
+		pBuffer = NULL;
+
+		if (nFileType != AVS_OFFICESTUDIO_FILE_UNKNOWN)
+			return true;
+	}
+
+	return false;
+}

Common/OfficeFileFormats.h

@@ -58,7 +58,8 @@
 #define AVS_OFFICESTUDIO_FILE_DOCUMENT_OFORM_PDF		AVS_OFFICESTUDIO_FILE_DOCUMENT + 0x0017
 #define AVS_OFFICESTUDIO_FILE_DOCUMENT_PAGES			AVS_OFFICESTUDIO_FILE_DOCUMENT + 0x0018
 #define AVS_OFFICESTUDIO_FILE_DOCUMENT_HWP				AVS_OFFICESTUDIO_FILE_DOCUMENT + 0x0019
-#define AVS_OFFICESTUDIO_FILE_DOCUMENT_HWPX				AVS_OFFICESTUDIO_FILE_DOCUMENT + 0x0020
+#define AVS_OFFICESTUDIO_FILE_DOCUMENT_HWPX				AVS_OFFICESTUDIO_FILE_DOCUMENT + 0x001a
+#define AVS_OFFICESTUDIO_FILE_DOCUMENT_MD				AVS_OFFICESTUDIO_FILE_DOCUMENT + 0x001b
 
 #define AVS_OFFICESTUDIO_FILE_DOCUMENT_XML				AVS_OFFICESTUDIO_FILE_DOCUMENT + 0x0030
 
@@ -103,6 +104,7 @@
 #define AVS_OFFICESTUDIO_FILE_CROSSPLATFORM_HTMLRMenu	AVS_OFFICESTUDIO_FILE_CROSSPLATFORM + 0x0007
 #define AVS_OFFICESTUDIO_FILE_CROSSPLATFORM_HTMLRCanvas	AVS_OFFICESTUDIO_FILE_CROSSPLATFORM + 0x0008
 #define AVS_OFFICESTUDIO_FILE_CROSSPLATFORM_PDFA		AVS_OFFICESTUDIO_FILE_CROSSPLATFORM + 0x0009
+#define AVS_OFFICESTUDIO_FILE_CROSSPLATFORM_OFD			AVS_OFFICESTUDIO_FILE_CROSSPLATFORM + 0x000a
 
 #define AVS_OFFICESTUDIO_FILE_IMAGE						0x0400
 #define AVS_OFFICESTUDIO_FILE_IMAGE_JPG					AVS_OFFICESTUDIO_FILE_IMAGE + 0x0001
@@ -138,12 +140,14 @@
 #define AVS_OFFICESTUDIO_FILE_TEAMLAB_DOCY				AVS_OFFICESTUDIO_FILE_TEAMLAB + 0x0001
 #define AVS_OFFICESTUDIO_FILE_TEAMLAB_XLSY				AVS_OFFICESTUDIO_FILE_TEAMLAB + 0x0002
 #define AVS_OFFICESTUDIO_FILE_TEAMLAB_PPTY				AVS_OFFICESTUDIO_FILE_TEAMLAB + 0x0003
+#define AVS_OFFICESTUDIO_FILE_TEAMLAB_VSDY				AVS_OFFICESTUDIO_FILE_TEAMLAB + 0x0004
 
 #define AVS_OFFICESTUDIO_FILE_CANVAS					0x2000
 #define AVS_OFFICESTUDIO_FILE_CANVAS_WORD				AVS_OFFICESTUDIO_FILE_CANVAS + 0x0001
 #define AVS_OFFICESTUDIO_FILE_CANVAS_SPREADSHEET		AVS_OFFICESTUDIO_FILE_CANVAS + 0x0002
 #define AVS_OFFICESTUDIO_FILE_CANVAS_PRESENTATION		AVS_OFFICESTUDIO_FILE_CANVAS + 0x0003
 #define AVS_OFFICESTUDIO_FILE_CANVAS_PDF				AVS_OFFICESTUDIO_FILE_CANVAS + 0x0004
+#define AVS_OFFICESTUDIO_FILE_CANVAS_DRAW				AVS_OFFICESTUDIO_FILE_CANVAS + 0x0005
 
 #define AVS_OFFICESTUDIO_FILE_DRAW						0x4000
 #define AVS_OFFICESTUDIO_FILE_DRAW_VSDX					AVS_OFFICESTUDIO_FILE_DRAW + 0x0001

Common/base.pri

@@ -109,6 +109,31 @@ win32:!contains(QMAKE_TARGET.arch, x86_64): {
 	CONFIG += core_win_32
 }
 
+linux-clang-libc++ {
+    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_32
+	CONFIG += core_linux_clang
+	message("linux-32-clang-libc++")
+}
+linux-clang {
+	CONFIG += core_linux
+	CONFIG += core_linux_64
+	CONFIG += core_linux_clang
+	message("linux-64-clang")
+}
+linux-clang-32 {
+	CONFIG += core_linux
+	CONFIG += core_linux_32
+	CONFIG += core_linux_clang
+	message("linux-32-clang")
+}
+
 linux-g++ {
 	CONFIG += core_linux
 linux-g++:contains(QMAKE_HOST.arch, x86_64): {
@@ -196,6 +221,10 @@ core_mac {
 	}
 }
 
+core_linux_clang {
+	QMAKE_CFLAGS += -Wno-implicit-function-declaration
+}
+
 # PREFIXES
 core_windows {
 	CONFIG -= debug_and_release debug_and_release_target
@@ -416,6 +445,12 @@ message($$CORE_BUILDS_PLATFORM_PREFIX/$$CORE_BUILDS_CONFIGURATION_PREFIX)
 # COMPILER
 CONFIG += c++11
 
+#CONFIG += enable_cpp_17
+enable_cpp_17 {
+	CONFIG += c++1z
+	DEFINES += _LIBCPP_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION
+}
+
 !core_windows {
 	QMAKE_CXXFLAGS += -Wno-register
 	QMAKE_CFLAGS += -Wno-register
@@ -423,7 +458,11 @@ CONFIG += c++11
 
 core_linux {
 core_static_link_libstd {
-	QMAKE_LFLAGS += -static-libstdc++ -static-libgcc
+	!core_linux_clang {
+		QMAKE_LFLAGS += -static-libstdc++ -static-libgcc
+	} else {
+		# TODO: add libc++abi?
+	}
 	message(core_static_link_libstd)
 }
 plugin {

DesktopEditor/agg-2.4/include/agg_color_rgba.h

@@ -416,6 +416,16 @@ namespace agg
         {
             return self_type(rgba::from_wavelength(wl, gamma));
         }
+
+		bool operator==(const self_type& other)
+		{
+			return a == other.a && r == other.r && g == other.g && b == other.b;
+		}
+
+		bool operator!=(const self_type& other)
+		{
+			return !operator==(other);
+		}
     };
 
 

DesktopEditor/agg-2.4/include/agg_pixfmt_rgba.h

@@ -1465,7 +1465,29 @@ namespace agg
         }
     };
 
+    template<class ColorT, class Order> struct comp_op_rgba_draw_on_black
+    {
+        typedef ColorT color_type;
+        typedef Order order_type;
+        typedef typename color_type::value_type value_type;
+        typedef typename color_type::calc_type calc_type;
+        enum base_scale_e
+        {
+            base_shift = color_type::base_shift,
+            base_mask  = color_type::base_mask
+        };
 
+        static AGG_INLINE void blend_pix(value_type* p,
+                                         unsigned sr, unsigned sg, unsigned sb,
+                                         unsigned sa, unsigned cover)
+        {
+
+            if (0x00 != p[Order::R] || 0x00 != p[Order::G] || 0x00 != p[Order::B])
+                return;
+
+            comp_op_rgba_src_over   <ColorT,Order>::blend_pix(p, sr, sg, sb, sa, cover);
+        }
+    };
 
 
 
@@ -1515,6 +1537,9 @@ namespace agg
         comp_op_rgba_contrast   <ColorT,Order>::blend_pix,
         comp_op_rgba_invert     <ColorT,Order>::blend_pix,
         comp_op_rgba_invert_rgb <ColorT,Order>::blend_pix,
+
+        //Custom function
+        comp_op_rgba_draw_on_black<ColorT,Order>::blend_pix,
         0
     };
 
@@ -1551,6 +1576,9 @@ namespace agg
         comp_op_invert,        //----comp_op_invert
         comp_op_invert_rgb,    //----comp_op_invert_rgb
 
+        //Custom modes
+        comp_op_draw_on_black, //----comp_op_draw_on_black
+
         end_of_comp_op_e
     };
 

DesktopEditor/agg-2.4/include/test_grads/custom_gradients.h

@@ -1000,7 +1000,17 @@ namespace agg
 				{
 					if (i < RES && j < RES)
 					{
-						precalc[i][j] = c;
+						if (m_oGradientInfo.luminocity)
+						{
+							ColorT fillC;
+							fillC.r = m_oGradientInfo.shading.fill_color.r * c.r / 255 + 255 - c.r;
+							fillC.g = m_oGradientInfo.shading.fill_color.g * c.g / 255 + 255 - c.g;
+							fillC.b = m_oGradientInfo.shading.fill_color.b * c.b / 255 + 255 - c.b;
+							fillC.a = 255;
+							precalc[i][j] = fillC;
+						}
+						else
+							precalc[i][j] = c;
 					}
 				}
 			}

DesktopEditor/common/File.cpp

@@ -1629,6 +1629,10 @@ namespace NSFile
 		{
 			wsTemp = L"";
 		}
+#if defined(_WIN32) || defined (_WIN64)
+		if (wsTempDir)
+			free(wsTempDir);
+#endif
 		wsTemp += L"x";
 		int nTime = (int)time(NULL);
 		for (int nIndex = 0; nIndex < 1000; ++nIndex)

DesktopEditor/common/StringBuilder.cpp

@@ -319,7 +319,14 @@ namespace NSStringUtils
 	{
 		WriteEncodeXmlString(sString.c_str(), (int)sString.length());
 	}
-
+	void CStringBuilder::WriteEncodeXmlString(const std::string& sString)
+	{
+		WriteEncodeXmlString(std::wstring(sString.begin(), sString.end()));
+	}
+	void CStringBuilder::WriteUtf8EncodeXmlString(const std::string& sString)
+    {
+        WriteEncodeXmlString(NSFile::CUtf8Converter::GetUnicodeStringFromUTF8((BYTE*)sString.c_str(), sString.size()));
+	}
 	void CStringBuilder::WriteEncodeXmlString(const wchar_t* pString, int nCount)
 	{
 		if (sizeof(wchar_t) == 2)

DesktopEditor/common/StringBuilder.h

@@ -110,6 +110,9 @@ namespace NSStringUtils
 		void WriteEncodeXmlString(const std::wstring& sString);
 		void WriteEncodeXmlString(const wchar_t* pString, int nCount = -1);
 
+		void WriteEncodeXmlString(const std::string& sString);
+		void WriteUtf8EncodeXmlString(const std::string& sString);
+
 		void WriteEncodeXmlStringHHHH(const std::wstring& sString);
 		void WriteEncodeXmlStringHHHH(const wchar_t* pString, int nCount = -1);
 

DesktopEditor/cximage/png/pngpriv.h

@@ -332,6 +332,7 @@
     *  DBL_MAX  Maximum floating point number (can be set to an arbitrary value)
     */
 #  include <float.h>
+#  include <math.h>
 
 #  if (defined(__MWERKS__) && defined(macintosh)) || defined(applec) || \
     defined(THINK_C) || defined(__SC__) || defined(TARGET_OS_MAC)

DesktopEditor/doctrenderer/app_builder/main.cpp

@@ -81,6 +81,8 @@ void parse_args(NSDoctRenderer::CDocBuilder* builder, int argc, char *argv[])
 
 bool CheckLicense(const std::wstring& sSrc, const std::wstring& sDst)
 {
+	if (sDst.empty())
+		return false;
 	NSFile::CFileBinary::Remove(sDst);
 	NSFile::CFileBinary::Copy(sSrc, sDst);
 	return NSFile::CFileBinary::Exists(sDst);

DesktopEditor/doctrenderer/docbuilder.cpp

@@ -57,7 +57,7 @@ namespace NSDoctRenderer
 	}
 	bool CDocBuilder::ExecuteCommand(const wchar_t* command, CDocBuilderValue* retValue)
 	{
-		return m_pInternal->ExecuteCommand(command, retValue);
+		return m_pInternal->ExecuteCommand(command, retValue, false, false);
 	}
 
 	CDocBuilderContext CDocBuilder::GetContext(bool enterContext)

DesktopEditor/doctrenderer/docbuilder.java/src/jni/docbuilder_CDocBuilder.cpp

@@ -16,18 +16,18 @@ static std::wstring wstringFromJavaString(JNIEnv* env, jstring jstr)
 	return wstr;
 }
 
-jlong Java_docbuilder_CDocBuilder_c_1Create(JNIEnv* env, jclass cls)
+JNIEXPORT jlong JNICALL Java_docbuilder_CDocBuilder_c_1Create(JNIEnv* env, jclass cls)
 {
 	return reinterpret_cast<jlong>(new CDocBuilder());
 }
 
-void Java_docbuilder_CDocBuilder_c_1Destroy(JNIEnv* env, jclass cls, jlong self)
+JNIEXPORT void JNICALL Java_docbuilder_CDocBuilder_c_1Destroy(JNIEnv* env, jclass cls, jlong self)
 {
 	CDocBuilder* pSelf = reinterpret_cast<CDocBuilder*>(self);
 	delete pSelf;
 }
 
-jint Java_docbuilder_CDocBuilder_c_1OpenFile(JNIEnv* env, jclass cls, jlong self, jstring path, jstring params)
+JNIEXPORT jint JNICALL Java_docbuilder_CDocBuilder_c_1OpenFile(JNIEnv* env, jclass cls, jlong self, jstring path, jstring params)
 {
 	CDocBuilder* pSelf = reinterpret_cast<CDocBuilder*>(self);
 	std::wstring strPath = wstringFromJavaString(env, path);
@@ -35,34 +35,34 @@ jint Java_docbuilder_CDocBuilder_c_1OpenFile(JNIEnv* env, jclass cls, jlong self
 	return (jint)pSelf->OpenFile(strPath.c_str(), strParams.c_str());
 }
 
-jboolean Java_docbuilder_CDocBuilder_c_1CreateFileByType(JNIEnv* env, jclass cls, jlong self, jint type)
+JNIEXPORT jboolean JNICALL Java_docbuilder_CDocBuilder_c_1CreateFileByType(JNIEnv* env, jclass cls, jlong self, jint type)
 {
 	CDocBuilder* pSelf = reinterpret_cast<CDocBuilder*>(self);
 	return (jboolean)pSelf->CreateFile((int)type);
 }
 
-jboolean Java_docbuilder_CDocBuilder_c_1CreateFileByExtension(JNIEnv* env, jclass cls, jlong self, jstring extension)
+JNIEXPORT jboolean JNICALL Java_docbuilder_CDocBuilder_c_1CreateFileByExtension(JNIEnv* env, jclass cls, jlong self, jstring extension)
 {
 	CDocBuilder* pSelf = reinterpret_cast<CDocBuilder*>(self);
 	std::wstring strExtension = wstringFromJavaString(env, extension);
 	return (jboolean)pSelf->CreateFile(strExtension.c_str());
 }
 
-void Java_docbuilder_CDocBuilder_c_1SetTmpFolder(JNIEnv* env, jclass cls, jlong self, jstring folder)
+JNIEXPORT void JNICALL Java_docbuilder_CDocBuilder_c_1SetTmpFolder(JNIEnv* env, jclass cls, jlong self, jstring folder)
 {
 	CDocBuilder* pSelf = reinterpret_cast<CDocBuilder*>(self);
 	std::wstring strFolder = wstringFromJavaString(env, folder);
 	pSelf->SetTmpFolder(strFolder.c_str());
 }
 
-jint Java_docbuilder_CDocBuilder_c_1SaveFileByType(JNIEnv* env, jclass cls, jlong self, jint type, jstring path)
+JNIEXPORT jint JNICALL Java_docbuilder_CDocBuilder_c_1SaveFileByType(JNIEnv* env, jclass cls, jlong self, jint type, jstring path)
 {
 	CDocBuilder* pSelf = reinterpret_cast<CDocBuilder*>(self);
 	std::wstring strPath = wstringFromJavaString(env, path);
 	return (jint)pSelf->SaveFile((int)type, strPath.c_str());
 }
 
-jint Java_docbuilder_CDocBuilder_c_1SaveFileByTypeWithParams(JNIEnv* env, jclass cls, jlong self, jint type, jstring path, jstring params)
+JNIEXPORT jint JNICALL Java_docbuilder_CDocBuilder_c_1SaveFileByTypeWithParams(JNIEnv* env, jclass cls, jlong self, jint type, jstring path, jstring params)
 {
 	CDocBuilder* pSelf = reinterpret_cast<CDocBuilder*>(self);
 	std::wstring strPath = wstringFromJavaString(env, path);
@@ -70,7 +70,7 @@ jint Java_docbuilder_CDocBuilder_c_1SaveFileByTypeWithParams(JNIEnv* env, jclass
 	return (jint)pSelf->SaveFile((int)type, strPath.c_str(), strParams.c_str());
 }
 
-jint Java_docbuilder_CDocBuilder_c_1SaveFileByExtension(JNIEnv* env, jclass cls, jlong self, jstring extension, jstring path)
+JNIEXPORT jint JNICALL Java_docbuilder_CDocBuilder_c_1SaveFileByExtension(JNIEnv* env, jclass cls, jlong self, jstring extension, jstring path)
 {
 	CDocBuilder* pSelf = reinterpret_cast<CDocBuilder*>(self);
 	std::wstring strExtension = wstringFromJavaString(env, extension);
@@ -78,7 +78,7 @@ jint Java_docbuilder_CDocBuilder_c_1SaveFileByExtension(JNIEnv* env, jclass cls,
 	return (jint)pSelf->SaveFile(strExtension.c_str(), strPath.c_str());
 }
 
-jint Java_docbuilder_CDocBuilder_c_1SaveFileByExtensionWithParams(JNIEnv* env, jclass cls, jlong self, jstring extension, jstring path, jstring params)
+JNIEXPORT jint JNICALL Java_docbuilder_CDocBuilder_c_1SaveFileByExtensionWithParams(JNIEnv* env, jclass cls, jlong self, jstring extension, jstring path, jstring params)
 {
 	CDocBuilder* pSelf = reinterpret_cast<CDocBuilder*>(self);
 	std::wstring strExtension = wstringFromJavaString(env, extension);
@@ -87,20 +87,20 @@ jint Java_docbuilder_CDocBuilder_c_1SaveFileByExtensionWithParams(JNIEnv* env, j
 	return (jint)pSelf->SaveFile(strExtension.c_str(), strPath.c_str(), strParams.c_str());
 }
 
-void Java_docbuilder_CDocBuilder_c_1CloseFile(JNIEnv* env, jclass cls, jlong self)
+JNIEXPORT void JNICALL Java_docbuilder_CDocBuilder_c_1CloseFile(JNIEnv* env, jclass cls, jlong self)
 {
 	CDocBuilder* pSelf = reinterpret_cast<CDocBuilder*>(self);
 	pSelf->CloseFile();
 }
 
-jboolean Java_docbuilder_CDocBuilder_c_1ExecuteCommand(JNIEnv* env, jclass cls, jlong self, jstring command)
+JNIEXPORT jboolean JNICALL Java_docbuilder_CDocBuilder_c_1ExecuteCommand(JNIEnv* env, jclass cls, jlong self, jstring command)
 {
 	CDocBuilder* pSelf = reinterpret_cast<CDocBuilder*>(self);
 	std::wstring strCommand = wstringFromJavaString(env, command);
 	return (jboolean)pSelf->ExecuteCommand(strCommand.c_str());
 }
 
-jboolean Java_docbuilder_CDocBuilder_c_1ExecuteCommandWithRetValue(JNIEnv* env, jclass cls, jlong self, jstring command, jlong retValue)
+JNIEXPORT jboolean JNICALL Java_docbuilder_CDocBuilder_c_1ExecuteCommandWithRetValue(JNIEnv* env, jclass cls, jlong self, jstring command, jlong retValue)
 {
 	CDocBuilder* pSelf = reinterpret_cast<CDocBuilder*>(self);
 	std::wstring strCommand = wstringFromJavaString(env, command);
@@ -108,14 +108,14 @@ jboolean Java_docbuilder_CDocBuilder_c_1ExecuteCommandWithRetValue(JNIEnv* env,
 	return (jboolean)pSelf->ExecuteCommand(strCommand.c_str(), pRetValue);
 }
 
-jboolean Java_docbuilder_CDocBuilder_c_1Run(JNIEnv* env, jclass cls, jlong self, jstring path)
+JNIEXPORT jboolean JNICALL Java_docbuilder_CDocBuilder_c_1Run(JNIEnv* env, jclass cls, jlong self, jstring path)
 {
 	CDocBuilder* pSelf = reinterpret_cast<CDocBuilder*>(self);
 	std::wstring strPath = wstringFromJavaString(env, path);
 	return (jboolean)pSelf->Run(strPath.c_str());
 }
 
-jboolean Java_docbuilder_CDocBuilder_c_1RunText(JNIEnv* env, jclass cls, jlong self, jstring commands)
+JNIEXPORT jboolean JNICALL Java_docbuilder_CDocBuilder_c_1RunText(JNIEnv* env, jclass cls, jlong self, jstring commands)
 {
 	CDocBuilder* pSelf = reinterpret_cast<CDocBuilder*>(self);
 	const char* strUtfCommands = env->GetStringUTFChars(commands, nullptr);
@@ -124,7 +124,7 @@ jboolean Java_docbuilder_CDocBuilder_c_1RunText(JNIEnv* env, jclass cls, jlong s
 	return result;
 }
 
-void Java_docbuilder_CDocBuilder_c_1SetProperty(JNIEnv* env, jclass cls, jlong self, jstring param, jstring value)
+JNIEXPORT void JNICALL Java_docbuilder_CDocBuilder_c_1SetProperty(JNIEnv* env, jclass cls, jlong self, jstring param, jstring value)
 {
 	CDocBuilder* pSelf = reinterpret_cast<CDocBuilder*>(self);
 	const char* strUtfParam = env->GetStringUTFChars(param, nullptr);
@@ -133,7 +133,7 @@ void Java_docbuilder_CDocBuilder_c_1SetProperty(JNIEnv* env, jclass cls, jlong s
 	env->ReleaseStringUTFChars(param, strUtfParam);
 }
 
-void Java_docbuilder_CDocBuilder_c_1WriteData(JNIEnv* env, jclass cls, jlong self, jstring path, jstring data, jboolean append)
+JNIEXPORT void JNICALL Java_docbuilder_CDocBuilder_c_1WriteData(JNIEnv* env, jclass cls, jlong self, jstring path, jstring data, jboolean append)
 {
 	CDocBuilder* pSelf = reinterpret_cast<CDocBuilder*>(self);
 	std::wstring strPath = wstringFromJavaString(env, path);
@@ -141,13 +141,13 @@ void Java_docbuilder_CDocBuilder_c_1WriteData(JNIEnv* env, jclass cls, jlong sel
 	pSelf->WriteData(strPath.c_str(), strData.c_str(), (bool)append);
 }
 
-jboolean Java_docbuilder_CDocBuilder_c_1IsSaveWithDoctrendererMode(JNIEnv* env, jclass cls, jlong self)
+JNIEXPORT jboolean JNICALL Java_docbuilder_CDocBuilder_c_1IsSaveWithDoctrendererMode(JNIEnv* env, jclass cls, jlong self)
 {
 	CDocBuilder* pSelf = reinterpret_cast<CDocBuilder*>(self);
 	return (jboolean)pSelf->IsSaveWithDoctrendererMode();
 }
 
-jstring Java_docbuilder_CDocBuilder_c_1GetVersion(JNIEnv* env, jclass cls, jlong self)
+JNIEXPORT jstring JNICALL Java_docbuilder_CDocBuilder_c_1GetVersion(JNIEnv* env, jclass cls, jlong self)
 {
 	CDocBuilder* pSelf = reinterpret_cast<CDocBuilder*>(self);
 	char* strUtfVersion = pSelf->GetVersion();
@@ -156,30 +156,30 @@ jstring Java_docbuilder_CDocBuilder_c_1GetVersion(JNIEnv* env, jclass cls, jlong
 	return jstrVersion;
 }
 
-jlong Java_docbuilder_CDocBuilder_c_1GetContext(JNIEnv* env, jclass cls, jlong self)
+JNIEXPORT jlong JNICALL Java_docbuilder_CDocBuilder_c_1GetContext(JNIEnv* env, jclass cls, jlong self)
 {
 	CDocBuilder* pSelf = reinterpret_cast<CDocBuilder*>(self);
 	return reinterpret_cast<jlong>(new CDocBuilderContext(pSelf->GetContext()));
 }
 
-jlong Java_docbuilder_CDocBuilder_c_1GetContextWithEnterParam(JNIEnv* env, jclass cls, jlong self, jboolean enterContext)
+JNIEXPORT jlong JNICALL Java_docbuilder_CDocBuilder_c_1GetContextWithEnterParam(JNIEnv* env, jclass cls, jlong self, jboolean enterContext)
 {
 	CDocBuilder* pSelf = reinterpret_cast<CDocBuilder*>(self);
 	return reinterpret_cast<jlong>(new CDocBuilderContext(pSelf->GetContext((bool)enterContext)));
 }
 
-void Java_docbuilder_CDocBuilder_c_1Initialize(JNIEnv* env, jclass cls)
+JNIEXPORT void JNICALL Java_docbuilder_CDocBuilder_c_1Initialize(JNIEnv* env, jclass cls)
 {
 	CDocBuilder::Initialize();
 }
 
-void Java_docbuilder_CDocBuilder_c_1InitializeWithDirectory(JNIEnv* env, jclass cls, jstring directory)
+JNIEXPORT void JNICALL Java_docbuilder_CDocBuilder_c_1InitializeWithDirectory(JNIEnv* env, jclass cls, jstring directory)
 {
 	std::wstring strDirectory = wstringFromJavaString(env, directory);
 	CDocBuilder::Initialize(strDirectory.c_str());
 }
 
-void Java_docbuilder_CDocBuilder_c_1Dispose(JNIEnv* env, jclass cls)
+JNIEXPORT void JNICALL Java_docbuilder_CDocBuilder_c_1Dispose(JNIEnv* env, jclass cls)
 {
 	CDocBuilder::Dispose();
 }

DesktopEditor/doctrenderer/docbuilder.java/src/jni/docbuilder_CDocBuilderContext.cpp

@@ -4,60 +4,60 @@
 
 using namespace NSDoctRenderer;
 
-jlong Java_docbuilder_CDocBuilderContext_c_1Create(JNIEnv* env, jclass cls)
+JNIEXPORT jlong JNICALL Java_docbuilder_CDocBuilderContext_c_1Create(JNIEnv* env, jclass cls)
 {
 	return reinterpret_cast<jlong>(new CDocBuilderContext());
 }
 
-jlong Java_docbuilder_CDocBuilderContext_c_1Copy(JNIEnv* env, jclass cls, jlong other)
+JNIEXPORT jlong JNICALL Java_docbuilder_CDocBuilderContext_c_1Copy(JNIEnv* env, jclass cls, jlong other)
 {
 	CDocBuilderContext* pOther = reinterpret_cast<CDocBuilderContext*>(other);
 	return reinterpret_cast<jlong>(new CDocBuilderContext(*pOther));
 }
 
-void Java_docbuilder_CDocBuilderContext_c_1Destroy(JNIEnv* env, jclass cls, jlong self)
+JNIEXPORT void JNICALL Java_docbuilder_CDocBuilderContext_c_1Destroy(JNIEnv* env, jclass cls, jlong self)
 {
 	CDocBuilderContext* pSelf = reinterpret_cast<CDocBuilderContext*>(self);
 	delete pSelf;
 }
 
-jlong Java_docbuilder_CDocBuilderContext_c_1CreateUndefined(JNIEnv* env, jclass cls, jlong self)
+JNIEXPORT jlong JNICALL Java_docbuilder_CDocBuilderContext_c_1CreateUndefined(JNIEnv* env, jclass cls, jlong self)
 {
 	CDocBuilderContext* pSelf = reinterpret_cast<CDocBuilderContext*>(self);
 	return reinterpret_cast<jlong>(new CDocBuilderValue(pSelf->CreateUndefined()));
 }
 
-jlong Java_docbuilder_CDocBuilderContext_c_1CreateNull(JNIEnv* env, jclass cls, jlong self)
+JNIEXPORT jlong JNICALL Java_docbuilder_CDocBuilderContext_c_1CreateNull(JNIEnv* env, jclass cls, jlong self)
 {
 	CDocBuilderContext* pSelf = reinterpret_cast<CDocBuilderContext*>(self);
 	return reinterpret_cast<jlong>(new CDocBuilderValue(pSelf->CreateNull()));
 }
 
-jlong Java_docbuilder_CDocBuilderContext_c_1CreateObject(JNIEnv* env, jclass cls, jlong self)
+JNIEXPORT jlong JNICALL Java_docbuilder_CDocBuilderContext_c_1CreateObject(JNIEnv* env, jclass cls, jlong self)
 {
 	CDocBuilderContext* pSelf = reinterpret_cast<CDocBuilderContext*>(self);
 	return reinterpret_cast<jlong>(new CDocBuilderValue(pSelf->CreateObject()));
 }
 
-jlong Java_docbuilder_CDocBuilderContext_c_1CreateArray(JNIEnv* env, jclass cls, jlong self, jint length)
+JNIEXPORT jlong JNICALL Java_docbuilder_CDocBuilderContext_c_1CreateArray(JNIEnv* env, jclass cls, jlong self, jint length)
 {
 	CDocBuilderContext* pSelf = reinterpret_cast<CDocBuilderContext*>(self);
 	return reinterpret_cast<jlong>(new CDocBuilderValue(pSelf->CreateArray((int)length)));
 }
 
-jlong Java_docbuilder_CDocBuilderContext_c_1GetGlobal(JNIEnv* env, jclass cls, jlong self)
+JNIEXPORT jlong JNICALL Java_docbuilder_CDocBuilderContext_c_1GetGlobal(JNIEnv* env, jclass cls, jlong self)
 {
 	CDocBuilderContext* pSelf = reinterpret_cast<CDocBuilderContext*>(self);
 	return reinterpret_cast<jlong>(new CDocBuilderValue(pSelf->GetGlobal()));
 }
 
-jlong Java_docbuilder_CDocBuilderContext_c_1CreateScope(JNIEnv* env, jclass cls, jlong self)
+JNIEXPORT jlong JNICALL Java_docbuilder_CDocBuilderContext_c_1CreateScope(JNIEnv* env, jclass cls, jlong self)
 {
 	CDocBuilderContext* pSelf = reinterpret_cast<CDocBuilderContext*>(self);
 	return reinterpret_cast<jlong>(new CDocBuilderContextScope(pSelf->CreateScope()));
 }
 
-jboolean Java_docbuilder_CDocBuilderContext_c_1IsError(JNIEnv* env, jclass cls, jlong self)
+JNIEXPORT jboolean JNICALL Java_docbuilder_CDocBuilderContext_c_1IsError(JNIEnv* env, jclass cls, jlong self)
 {
 	CDocBuilderContext* pSelf = reinterpret_cast<CDocBuilderContext*>(self);
 	return (jboolean)pSelf->IsError();

DesktopEditor/doctrenderer/docbuilder.java/src/jni/docbuilder_CDocBuilderContextScope.cpp

@@ -4,24 +4,24 @@
 
 using namespace NSDoctRenderer;
 
-jlong Java_docbuilder_CDocBuilderContextScope_c_1Create(JNIEnv* env, jclass cls)
+JNIEXPORT jlong JNICALL Java_docbuilder_CDocBuilderContextScope_c_1Create(JNIEnv* env, jclass cls)
 {
 	return reinterpret_cast<jlong>(new CDocBuilderContextScope());
 }
 
-jlong Java_docbuilder_CDocBuilderContextScope_c_1Copy(JNIEnv* env, jclass cls, jlong other)
+JNIEXPORT jlong JNICALL Java_docbuilder_CDocBuilderContextScope_c_1Copy(JNIEnv* env, jclass cls, jlong other)
 {
 	CDocBuilderContextScope* pOther = reinterpret_cast<CDocBuilderContextScope*>(other);
 	return reinterpret_cast<jlong>(new CDocBuilderContextScope(*pOther));
 }
 
-void Java_docbuilder_CDocBuilderContextScope_c_1Destroy(JNIEnv* env, jclass cls, jlong self)
+JNIEXPORT void JNICALL Java_docbuilder_CDocBuilderContextScope_c_1Destroy(JNIEnv* env, jclass cls, jlong self)
 {
 	CDocBuilderContextScope* pSelf = reinterpret_cast<CDocBuilderContextScope*>(self);
 	delete pSelf;
 }
 
-void Java_docbuilder_CDocBuilderContextScope_c_1Close(JNIEnv* env, jclass cls, jlong self)
+JNIEXPORT void JNICALL Java_docbuilder_CDocBuilderContextScope_c_1Close(JNIEnv* env, jclass cls, jlong self)
 {
 	CDocBuilderContextScope* pSelf = reinterpret_cast<CDocBuilderContextScope*>(self);
 	pSelf->Close();

DesktopEditor/doctrenderer/docbuilder.java/src/jni/docbuilder_CDocBuilderValue.cpp

@@ -8,114 +8,114 @@
 
 using namespace NSDoctRenderer;
 
-jlong Java_docbuilder_CDocBuilderValue_c_1Create(JNIEnv* env, jclass cls)
+JNIEXPORT jlong JNICALL Java_docbuilder_CDocBuilderValue_c_1Create(JNIEnv* env, jclass cls)
 {
 	return reinterpret_cast<jlong>(new CDocBuilderValue());
 }
 
-jlong Java_docbuilder_CDocBuilderValue_c_1Copy(JNIEnv* env, jclass cls, jlong other)
+JNIEXPORT jlong JNICALL Java_docbuilder_CDocBuilderValue_c_1Copy(JNIEnv* env, jclass cls, jlong other)
 {
 	CDocBuilderValue* pOther = reinterpret_cast<CDocBuilderValue*>(other);
 	return reinterpret_cast<jlong>(new CDocBuilderValue(*pOther));
 }
 
-void Java_docbuilder_CDocBuilderValue_c_1Destroy(JNIEnv* env, jclass cls, jlong self)
+JNIEXPORT void JNICALL Java_docbuilder_CDocBuilderValue_c_1Destroy(JNIEnv* env, jclass cls, jlong self)
 {
 	CDocBuilderValue* pSelf = reinterpret_cast<CDocBuilderValue*>(self);
 	delete pSelf;
 }
 
-jboolean Java_docbuilder_CDocBuilderValue_c_1IsEmpty(JNIEnv* env, jclass cls, jlong self)
+JNIEXPORT jboolean JNICALL Java_docbuilder_CDocBuilderValue_c_1IsEmpty(JNIEnv* env, jclass cls, jlong self)
 {
 	CDocBuilderValue* pSelf = reinterpret_cast<CDocBuilderValue*>(self);
 	return (jboolean)pSelf->IsEmpty();
 }
 
-void Java_docbuilder_CDocBuilderValue_c_1Clear(JNIEnv* env, jclass cls, jlong self)
+JNIEXPORT void JNICALL Java_docbuilder_CDocBuilderValue_c_1Clear(JNIEnv* env, jclass cls, jlong self)
 {
 	CDocBuilderValue* pSelf = reinterpret_cast<CDocBuilderValue*>(self);
 	pSelf->Clear();
 }
 
-jboolean Java_docbuilder_CDocBuilderValue_c_1IsNull(JNIEnv* env, jclass cls, jlong self)
+JNIEXPORT jboolean JNICALL Java_docbuilder_CDocBuilderValue_c_1IsNull(JNIEnv* env, jclass cls, jlong self)
 {
 	CDocBuilderValue* pSelf = reinterpret_cast<CDocBuilderValue*>(self);
 	return (jboolean)pSelf->IsNull();
 }
 
-jboolean Java_docbuilder_CDocBuilderValue_c_1IsUndefined(JNIEnv* env, jclass cls, jlong self)
+JNIEXPORT jboolean JNICALL Java_docbuilder_CDocBuilderValue_c_1IsUndefined(JNIEnv* env, jclass cls, jlong self)
 {
 	CDocBuilderValue* pSelf = reinterpret_cast<CDocBuilderValue*>(self);
 	return (jboolean)pSelf->IsUndefined();
 }
 
-jboolean Java_docbuilder_CDocBuilderValue_c_1IsBool(JNIEnv* env, jclass cls, jlong self)
+JNIEXPORT jboolean JNICALL Java_docbuilder_CDocBuilderValue_c_1IsBool(JNIEnv* env, jclass cls, jlong self)
 {
 	CDocBuilderValue* pSelf = reinterpret_cast<CDocBuilderValue*>(self);
 	return (jboolean)pSelf->IsBool();
 }
 
-jboolean Java_docbuilder_CDocBuilderValue_c_1IsInt(JNIEnv* env, jclass cls, jlong self)
+JNIEXPORT jboolean JNICALL Java_docbuilder_CDocBuilderValue_c_1IsInt(JNIEnv* env, jclass cls, jlong self)
 {
 	CDocBuilderValue* pSelf = reinterpret_cast<CDocBuilderValue*>(self);
 	return (jboolean)pSelf->IsInt();
 }
 
-jboolean Java_docbuilder_CDocBuilderValue_c_1IsDouble(JNIEnv* env, jclass cls, jlong self)
+JNIEXPORT jboolean JNICALL Java_docbuilder_CDocBuilderValue_c_1IsDouble(JNIEnv* env, jclass cls, jlong self)
 {
 	CDocBuilderValue* pSelf = reinterpret_cast<CDocBuilderValue*>(self);
 	return (jboolean)pSelf->IsDouble();
 }
 
-jboolean Java_docbuilder_CDocBuilderValue_c_1IsString(JNIEnv* env, jclass cls, jlong self)
+JNIEXPORT jboolean JNICALL Java_docbuilder_CDocBuilderValue_c_1IsString(JNIEnv* env, jclass cls, jlong self)
 {
 	CDocBuilderValue* pSelf = reinterpret_cast<CDocBuilderValue*>(self);
 	return (jboolean)pSelf->IsString();
 }
 
-jboolean Java_docbuilder_CDocBuilderValue_c_1IsFunction(JNIEnv* env, jclass cls, jlong self)
+JNIEXPORT jboolean JNICALL Java_docbuilder_CDocBuilderValue_c_1IsFunction(JNIEnv* env, jclass cls, jlong self)
 {
 	CDocBuilderValue* pSelf = reinterpret_cast<CDocBuilderValue*>(self);
 	return (jboolean)pSelf->IsFunction();
 }
 
-jboolean Java_docbuilder_CDocBuilderValue_c_1IsObject(JNIEnv* env, jclass cls, jlong self)
+JNIEXPORT jboolean JNICALL Java_docbuilder_CDocBuilderValue_c_1IsObject(JNIEnv* env, jclass cls, jlong self)
 {
 	CDocBuilderValue* pSelf = reinterpret_cast<CDocBuilderValue*>(self);
 	return (jboolean)pSelf->IsObject();
 }
 
-jboolean Java_docbuilder_CDocBuilderValue_c_1IsArray(JNIEnv* env, jclass cls, jlong self)
+JNIEXPORT jboolean JNICALL Java_docbuilder_CDocBuilderValue_c_1IsArray(JNIEnv* env, jclass cls, jlong self)
 {
 	CDocBuilderValue* pSelf = reinterpret_cast<CDocBuilderValue*>(self);
 	return (jboolean)pSelf->IsArray();
 }
 
-jint Java_docbuilder_CDocBuilderValue_c_1GetLength(JNIEnv* env, jclass cls, jlong self)
+JNIEXPORT jint JNICALL Java_docbuilder_CDocBuilderValue_c_1GetLength(JNIEnv* env, jclass cls, jlong self)
 {
 	CDocBuilderValue* pSelf = reinterpret_cast<CDocBuilderValue*>(self);
 	return (jint)pSelf->GetLength();
 }
 
-jboolean Java_docbuilder_CDocBuilderValue_c_1ToBool(JNIEnv* env, jclass cls, jlong self)
+JNIEXPORT jboolean JNICALL Java_docbuilder_CDocBuilderValue_c_1ToBool(JNIEnv* env, jclass cls, jlong self)
 {
 	CDocBuilderValue* pSelf = reinterpret_cast<CDocBuilderValue*>(self);
 	return (jboolean)pSelf->ToBool();
 }
 
-jint Java_docbuilder_CDocBuilderValue_c_1ToInt(JNIEnv* env, jclass cls, jlong self)
+JNIEXPORT jint JNICALL Java_docbuilder_CDocBuilderValue_c_1ToInt(JNIEnv* env, jclass cls, jlong self)
 {
 	CDocBuilderValue* pSelf = reinterpret_cast<CDocBuilderValue*>(self);
 	return (jint)pSelf->ToInt();
 }
 
-jdouble Java_docbuilder_CDocBuilderValue_c_1ToDouble(JNIEnv* env, jclass cls, jlong self)
+JNIEXPORT jdouble JNICALL Java_docbuilder_CDocBuilderValue_c_1ToDouble(JNIEnv* env, jclass cls, jlong self)
 {
 	CDocBuilderValue* pSelf = reinterpret_cast<CDocBuilderValue*>(self);
 	return (jdouble)pSelf->ToDouble();
 }
 
-jstring Java_docbuilder_CDocBuilderValue_c_1ToString(JNIEnv* env, jclass cls, jlong self)
+JNIEXPORT jstring JNICALL Java_docbuilder_CDocBuilderValue_c_1ToString(JNIEnv* env, jclass cls, jlong self)
 {
 	CDocBuilderValue* pSelf = reinterpret_cast<CDocBuilderValue*>(self);
 	CString strValue = pSelf->ToString();
@@ -123,7 +123,7 @@ jstring Java_docbuilder_CDocBuilderValue_c_1ToString(JNIEnv* env, jclass cls, jl
 	return env->NewStringUTF(strUtfData.c_str());
 }
 
-jlong Java_docbuilder_CDocBuilderValue_c_1GetProperty(JNIEnv* env, jclass cls, jlong self, jstring name)
+JNIEXPORT jlong JNICALL Java_docbuilder_CDocBuilderValue_c_1GetProperty(JNIEnv* env, jclass cls, jlong self, jstring name)
 {
 	CDocBuilderValue* pSelf = reinterpret_cast<CDocBuilderValue*>(self);
 	const char* strUtfName = env->GetStringUTFChars(name, nullptr);
@@ -132,14 +132,14 @@ jlong Java_docbuilder_CDocBuilderValue_c_1GetProperty(JNIEnv* env, jclass cls, j
 	return reinterpret_cast<jlong>(pValue);
 }
 
-jlong Java_docbuilder_CDocBuilderValue_c_1GetByIndex(JNIEnv* env, jclass cls, jlong self, jint index)
+JNIEXPORT jlong JNICALL Java_docbuilder_CDocBuilderValue_c_1GetByIndex(JNIEnv* env, jclass cls, jlong self, jint index)
 {
 	CDocBuilderValue* pSelf = reinterpret_cast<CDocBuilderValue*>(self);
 	CDocBuilderValue* pValue = new CDocBuilderValue(pSelf->Get((int)index));
 	return reinterpret_cast<jlong>(pValue);
 }
 
-void Java_docbuilder_CDocBuilderValue_c_1SetProperty(JNIEnv* env, jclass cls, jlong self, jstring name, jlong value)
+JNIEXPORT void JNICALL Java_docbuilder_CDocBuilderValue_c_1SetProperty(JNIEnv* env, jclass cls, jlong self, jstring name, jlong value)
 {
 	CDocBuilderValue* pSelf = reinterpret_cast<CDocBuilderValue*>(self);
 	CDocBuilderValue* pValue = reinterpret_cast<CDocBuilderValue*>(value);
@@ -149,29 +149,29 @@ void Java_docbuilder_CDocBuilderValue_c_1SetProperty(JNIEnv* env, jclass cls, jl
 	env->ReleaseStringUTFChars(name, strUtfName);
 }
 
-void Java_docbuilder_CDocBuilderValue_c_1SetByIndex(JNIEnv* env, jclass cls, jlong self, jint index, jlong value)
+JNIEXPORT void JNICALL Java_docbuilder_CDocBuilderValue_c_1SetByIndex(JNIEnv* env, jclass cls, jlong self, jint index, jlong value)
 {
 	CDocBuilderValue* pSelf = reinterpret_cast<CDocBuilderValue*>(self);
 	CDocBuilderValue* pValue = reinterpret_cast<CDocBuilderValue*>(value);
 	pSelf->Set((int)index, *pValue);
 }
 
-jlong Java_docbuilder_CDocBuilderValue_c_1CreateWithBool(JNIEnv* env, jclass cls, jboolean value)
+JNIEXPORT jlong JNICALL Java_docbuilder_CDocBuilderValue_c_1CreateWithBool(JNIEnv* env, jclass cls, jboolean value)
 {
 	return reinterpret_cast<jlong>(new CDocBuilderValue((bool)value));
 }
 
-jlong Java_docbuilder_CDocBuilderValue_c_1CreateWithInt(JNIEnv* env, jclass cls, jint value)
+JNIEXPORT jlong JNICALL Java_docbuilder_CDocBuilderValue_c_1CreateWithInt(JNIEnv* env, jclass cls, jint value)
 {
 	return reinterpret_cast<jlong>(new CDocBuilderValue((int)value));
 }
 
-jlong Java_docbuilder_CDocBuilderValue_c_1CreateWithDouble(JNIEnv* env, jclass cls, jdouble value)
+JNIEXPORT jlong JNICALL Java_docbuilder_CDocBuilderValue_c_1CreateWithDouble(JNIEnv* env, jclass cls, jdouble value)
 {
 	return reinterpret_cast<jlong>(new CDocBuilderValue((double)value));
 }
 
-jlong Java_docbuilder_CDocBuilderValue_c_1CreateWithString(JNIEnv* env, jclass cls, jstring str)
+JNIEXPORT jlong JNICALL Java_docbuilder_CDocBuilderValue_c_1CreateWithString(JNIEnv* env, jclass cls, jstring str)
 {
 	const char* strUtf = env->GetStringUTFChars(str, nullptr);
 	CDocBuilderValue* pValue = new CDocBuilderValue(strUtf);
@@ -179,22 +179,22 @@ jlong Java_docbuilder_CDocBuilderValue_c_1CreateWithString(JNIEnv* env, jclass c
 	return reinterpret_cast<jlong>(pValue);
 }
 
-jlong Java_docbuilder_CDocBuilderValue_c_1CreateUndefined(JNIEnv* env, jclass cls)
+JNIEXPORT jlong JNICALL Java_docbuilder_CDocBuilderValue_c_1CreateUndefined(JNIEnv* env, jclass cls)
 {
 	return reinterpret_cast<jlong>(new CDocBuilderValue(CDocBuilderValue::CreateUndefined()));
 }
 
-jlong Java_docbuilder_CDocBuilderValue_c_1CreateNull(JNIEnv* env, jclass cls)
+JNIEXPORT jlong JNICALL Java_docbuilder_CDocBuilderValue_c_1CreateNull(JNIEnv* env, jclass cls)
 {
 	return reinterpret_cast<jlong>(new CDocBuilderValue(CDocBuilderValue::CreateNull()));
 }
 
-jlong Java_docbuilder_CDocBuilderValue_c_1CreateArray(JNIEnv* env, jclass cls, jint length)
+JNIEXPORT jlong JNICALL Java_docbuilder_CDocBuilderValue_c_1CreateArray(JNIEnv* env, jclass cls, jint length)
 {
 	return reinterpret_cast<jlong>(new CDocBuilderValue(CDocBuilderValue::CreateArray((int)length)));
 }
 
-jlong Java_docbuilder_CDocBuilderValue_c_1Call0(JNIEnv* env, jclass cls, jlong self, jstring name)
+JNIEXPORT jlong JNICALL Java_docbuilder_CDocBuilderValue_c_1Call0(JNIEnv* env, jclass cls, jlong self, jstring name)
 {
 	CDocBuilderValue* pSelf = reinterpret_cast<CDocBuilderValue*>(self);
 	const char* strUtfName = env->GetStringUTFChars(name, nullptr);
@@ -203,7 +203,7 @@ jlong Java_docbuilder_CDocBuilderValue_c_1Call0(JNIEnv* env, jclass cls, jlong s
 	return reinterpret_cast<jlong>(pReturnValue);
 }
 
-jlong Java_docbuilder_CDocBuilderValue_c_1Call1(JNIEnv* env, jclass cls, jlong self, jstring name, jlong p1)
+JNIEXPORT jlong JNICALL Java_docbuilder_CDocBuilderValue_c_1Call1(JNIEnv* env, jclass cls, jlong self, jstring name, jlong p1)
 {
 	CDocBuilderValue* pSelf = reinterpret_cast<CDocBuilderValue*>(self);
 	CDocBuilderValue* pParam1 = reinterpret_cast<CDocBuilderValue*>(p1);
@@ -213,7 +213,7 @@ jlong Java_docbuilder_CDocBuilderValue_c_1Call1(JNIEnv* env, jclass cls, jlong s
 	return reinterpret_cast<jlong>(pReturnValue);
 }
 
-jlong Java_docbuilder_CDocBuilderValue_c_1Call2(JNIEnv* env, jclass cls, jlong self, jstring name, jlong p1, jlong p2)
+JNIEXPORT jlong JNICALL Java_docbuilder_CDocBuilderValue_c_1Call2(JNIEnv* env, jclass cls, jlong self, jstring name, jlong p1, jlong p2)
 {
 	CDocBuilderValue* pSelf = reinterpret_cast<CDocBuilderValue*>(self);
 	CDocBuilderValue* pParam1 = reinterpret_cast<CDocBuilderValue*>(p1);
@@ -224,7 +224,7 @@ jlong Java_docbuilder_CDocBuilderValue_c_1Call2(JNIEnv* env, jclass cls, jlong s
 	return reinterpret_cast<jlong>(pReturnValue);
 }
 
-jlong Java_docbuilder_CDocBuilderValue_c_1Call3(JNIEnv* env, jclass cls, jlong self, jstring name, jlong p1, jlong p2, jlong p3)
+JNIEXPORT jlong JNICALL Java_docbuilder_CDocBuilderValue_c_1Call3(JNIEnv* env, jclass cls, jlong self, jstring name, jlong p1, jlong p2, jlong p3)
 {
 	CDocBuilderValue* pSelf = reinterpret_cast<CDocBuilderValue*>(self);
 	CDocBuilderValue* pParam1 = reinterpret_cast<CDocBuilderValue*>(p1);
@@ -236,7 +236,7 @@ jlong Java_docbuilder_CDocBuilderValue_c_1Call3(JNIEnv* env, jclass cls, jlong s
 	return reinterpret_cast<jlong>(pReturnValue);
 }
 
-jlong Java_docbuilder_CDocBuilderValue_c_1Call4(JNIEnv* env, jclass cls, jlong self, jstring name, jlong p1, jlong p2, jlong p3, jlong p4)
+JNIEXPORT jlong JNICALL Java_docbuilder_CDocBuilderValue_c_1Call4(JNIEnv* env, jclass cls, jlong self, jstring name, jlong p1, jlong p2, jlong p3, jlong p4)
 {
 	CDocBuilderValue* pSelf = reinterpret_cast<CDocBuilderValue*>(self);
 	CDocBuilderValue* pParam1 = reinterpret_cast<CDocBuilderValue*>(p1);
@@ -249,7 +249,7 @@ jlong Java_docbuilder_CDocBuilderValue_c_1Call4(JNIEnv* env, jclass cls, jlong s
 	return reinterpret_cast<jlong>(pReturnValue);
 }
 
-jlong Java_docbuilder_CDocBuilderValue_c_1Call5(JNIEnv* env, jclass cls, jlong self, jstring name, jlong p1, jlong p2, jlong p3, jlong p4, jlong p5)
+JNIEXPORT jlong JNICALL Java_docbuilder_CDocBuilderValue_c_1Call5(JNIEnv* env, jclass cls, jlong self, jstring name, jlong p1, jlong p2, jlong p3, jlong p4, jlong p5)
 {
 	CDocBuilderValue* pSelf = reinterpret_cast<CDocBuilderValue*>(self);
 	CDocBuilderValue* pParam1 = reinterpret_cast<CDocBuilderValue*>(p1);
@@ -263,7 +263,7 @@ jlong Java_docbuilder_CDocBuilderValue_c_1Call5(JNIEnv* env, jclass cls, jlong s
 	return reinterpret_cast<jlong>(pReturnValue);
 }
 
-jlong Java_docbuilder_CDocBuilderValue_c_1Call6(JNIEnv* env, jclass cls, jlong self, jstring name, jlong p1, jlong p2, jlong p3, jlong p4, jlong p5, jlong p6)
+JNIEXPORT jlong JNICALL Java_docbuilder_CDocBuilderValue_c_1Call6(JNIEnv* env, jclass cls, jlong self, jstring name, jlong p1, jlong p2, jlong p3, jlong p4, jlong p5, jlong p6)
 {
 	CDocBuilderValue* pSelf = reinterpret_cast<CDocBuilderValue*>(self);
 	CDocBuilderValue* pParam1 = reinterpret_cast<CDocBuilderValue*>(p1);

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

@@ -383,6 +383,20 @@ class CDocBuilderValue:
     def __setitem__(self, key, value):
         self.Set(key, value)
 
+    def __getattr__(self, name):
+        def method(*args):
+            return self.Call(name, *args)
+        return method
+
+    def __len__(self):
+        return self.GetLength()
+
+    def __iter__(self):
+        if not self.IsArray():
+            raise TypeError("Object is not iterable")
+        for i in range(self.GetLength()):
+            yield self.Get(i)
+
     @staticmethod
     def CreateUndefined():
         return CDocBuilderValue(OBJECT_HANDLE(_lib.CDocBuilderValue_CreateUndefined()))
@@ -423,6 +437,36 @@ class CDocBuilderValue:
                 return CDocBuilderValue(OBJECT_HANDLE(_lib.CDocBuilderValue_Call6(self._internal, ctypes.c_wchar_p(name), values[0]._internal, values[1]._internal, values[2]._internal, values[3]._internal, values[4]._internal, values[5]._internal)))
         else:
             raise TypeError("Call() expects at most 6 arguments")
+            
+    def append(self, value):
+        if not self.IsArray():
+            raise TypeError("Object is not an array")
+        length = self.GetLength()
+        self.Set(length, value)
+        return self
+
+    def extend(self, iterable):
+        if not self.IsArray():
+            raise TypeError("Object is not an array")
+        length = self.GetLength()
+        for i, value in enumerate(iterable, start=length):
+            self.Set(i, value)
+        return self
+
+    def insert(self, i, x):
+        if not self.IsArray():
+            raise TypeError("Object is not an array")
+        length = self.GetLength()
+        if i < 0:
+            if abs(i) > length:
+                raise IndexError("list index out of range")
+            i = max(0, length + i)
+        if i >= length:
+            raise IndexError("list index out of range")
+        for idx in range(length, i, -1):
+            self.Set(idx, self.Get(idx - 1))
+        self.Set(i, x)
+
 
 class CDocBuilder:
     _initialized = False
@@ -435,7 +479,7 @@ class CDocBuilder:
         # using self._lib instead of global _lib because it might be already garbage collected during this function call
         self._lib.CDocBuilder_Destroy(self._internal)
 
-    def OpenFile(self, path, params):
+    def OpenFile(self, path, params=""):
         return _lib.CDocBuilder_OpenFile(self._internal, ctypes.c_wchar_p(path), ctypes.c_wchar_p(params))
 
     def CreateFile(self, type):
@@ -618,6 +662,8 @@ def registerLibrary(license_path):
     docbuilder_bin = os.path.join(builder_path, "docbuilder")
     if ("windows" == platform.system().lower()):
         docbuilder_bin += ".exe"
-    return subprocess.call([docbuilder_bin, "-register", license_path], stderr=subprocess.STDOUT, shell=True)
+        return subprocess.call([docbuilder_bin, "-register", license_path], stderr=subprocess.STDOUT, shell=True)
+    command = docbuilder_bin + " -register \"" +  license_path.replace('\"', '\\\"') + "\""
+    return subprocess.call(command, stderr=subprocess.STDOUT, shell=True)
 
 atexit.register(CDocBuilder.Dispose)

DesktopEditor/doctrenderer/docbuilder.python/test/docbuilder_test.py

@@ -13,16 +13,16 @@ scope = context.CreateScope()
 globalObj = context.GetGlobal()
 
 api = globalObj['Api']
-document = api.Call('GetDocument')
-paragraph1 = api.Call('CreateParagraph')
-paragraph1.Call('SetSpacingAfter', 1000, False)
-paragraph1.Call('AddText', 'Hello from Python!')
+document = api.GetDocument()
+paragraph1 = api.CreateParagraph()
+paragraph1.SetSpacingAfter(1000, False)
+paragraph1.AddText('Hello from Python!')
 
-paragraph2 = api.Call('CreateParagraph')
-paragraph2.Call('AddText', 'Goodbye!')
+paragraph2 = api.CreateParagraph()
+paragraph2.AddText('Goodbye!')
 
 content = [paragraph1, paragraph2]
-document.Call('InsertContent', content)
+document.InsertContent(content)
 
 dstPath = os.getcwd() + '/result.docx'
 builder.SaveFile(docbuilder.FileTypes.Document.DOCX, dstPath)

DesktopEditor/doctrenderer/docbuilder.python/test/docbuilder_test_old.py

@@ -0,0 +1,29 @@
+import os
+import sys
+sys.path.append('path_to_docbuilder')
+import docbuilder
+
+builder = docbuilder.CDocBuilder()
+
+builder.CreateFile(docbuilder.FileTypes.Document.DOCX)
+
+context = builder.GetContext()
+scope = context.CreateScope()
+
+globalObj = context.GetGlobal()
+
+api = globalObj['Api']
+document = api.Call('GetDocument')
+paragraph1 = api.Call('CreateParagraph')
+paragraph1.Call('SetSpacingAfter', 1000, False)
+paragraph1.Call('AddText', 'Hello from Python!')
+
+paragraph2 = api.Call('CreateParagraph')
+paragraph2.Call('AddText', 'Goodbye!')
+
+content = [paragraph1, paragraph2]
+document.Call('InsertContent', content)
+
+dstPath = os.getcwd() + '/result.docx'
+builder.SaveFile(docbuilder.FileTypes.Document.DOCX, dstPath)
+builder.CloseFile()

DesktopEditor/doctrenderer/docbuilder_p.cpp

@@ -74,6 +74,7 @@ CV8RealTimeWorker::CV8RealTimeWorker(NSDoctRenderer::CDocBuilder* pBuilder, cons
 	global->set("native", oNativeCtrl);
 
 	CBuilderEmbed* pBuilderJSNative = static_cast<CBuilderEmbed*>(oBuilderJS->getNative());
+	pBuilderJSNative->SetExternalize(true);
 	pBuilderJSNative->m_pBuilder = pBuilder;
 }
 CV8RealTimeWorker::~CV8RealTimeWorker()
@@ -82,7 +83,7 @@ CV8RealTimeWorker::~CV8RealTimeWorker()
 	m_context->Dispose();
 }
 
-bool CV8RealTimeWorker::ExecuteCommand(const std::wstring& command, NSDoctRenderer::CDocBuilderValue* retValue, const bool& isEnterContext)
+bool CV8RealTimeWorker::ExecuteCommand(const std::wstring& command, NSDoctRenderer::CDocBuilderValue* retValue, const bool& isEnterContextSrc)
 {
 	LOGGER_SPEED_START();
 
@@ -92,6 +93,10 @@ bool CV8RealTimeWorker::ExecuteCommand(const std::wstring& command, NSDoctRender
 	std::string commandA = U_TO_UTF8(command);
 	//commandA = "Api." + commandA;
 
+	bool isEnterContext = isEnterContextSrc;
+	if (!isEnterContext && !m_context->IsEntered())
+		isEnterContext = true;
+
 	if (isEnterContext)
 		m_context->Enter();
 
@@ -1237,13 +1242,13 @@ namespace NSDoctRenderer
 
 		while (true)
 		{
-			while (_currentPos < _commandsLen && !(_commandsPtr[_currentPos] == '\"' && _commandsPtr[_currentPos - 1] != '\\'))
+			while (_currentPos < _commandsLen && !((_commandsPtr[_currentPos] == '\"' || _commandsPtr[_currentPos] == '\'') && _commandsPtr[_currentPos - 1] != '\\'))
 				++_currentPos;
 
 			++_currentPos;
 			size_t _start = _currentPos;
 
-			while (_currentPos < _commandsLen && !(_commandsPtr[_currentPos] == '\"' && _commandsPtr[_currentPos - 1] != '\\'))
+			while (_currentPos < _commandsLen && !((_commandsPtr[_currentPos] == '\"' || _commandsPtr[_currentPos] == '\'') && _commandsPtr[_currentPos - 1] != '\\'))
 				++_currentPos;
 
 			if (_currentPos > _start)

DesktopEditor/doctrenderer/docbuilder_p.h

@@ -1275,7 +1275,7 @@ namespace NSDoctRenderer
 			return SaveFile(nType, path, params);
 		}
 
-		bool ExecuteCommand(const std::wstring& command, CDocBuilderValue* retValue = NULL, const bool& forceExecute = false)
+		bool ExecuteCommand(const std::wstring& command, CDocBuilderValue* retValue = NULL, const bool& forceExecute = false, const bool& isEnterContext = true)
 		{
 			if (command.length() < 7 && !retValue) // minimum command (!!!)
 				return true;
@@ -1291,12 +1291,12 @@ namespace NSDoctRenderer
 			if (CheckWorker())
 			{
 				bool bIsOpenedFromSimpleJSOld = m_bIsOpenedFromSimpleJS;
-				bool bResult = m_pWorker->ExecuteCommand(command, retValue);
+				bool bResult = m_pWorker->ExecuteCommand(command, retValue, isEnterContext);
 				if (!bResult && !bIsOpenedFromSimpleJSOld && m_bIsOpenedFromSimpleJS)
 				{
 					RELEASEOBJECT(m_pWorker);
 					CheckWorker();
-					return m_pWorker->ExecuteCommand(command, retValue);
+					return m_pWorker->ExecuteCommand(command, retValue, isEnterContext);
 				}
 				else
 				{

DesktopEditor/doctrenderer/drawingfile.h

@@ -171,7 +171,6 @@ public:
 
 		return m_pFile ? true : false;
 	}
-
 	bool OpenFile(BYTE* data, LONG size, const std::wstring& sPassword)
 	{
 		CloseFile();
@@ -284,6 +283,34 @@ public:
 			return NULL;
 		return m_pFile->ConvertToPixels(nPageIndex, nRasterW, nRasterH, true, m_pFontManager, nBackgroundColor, (nBackgroundColor == 0xFFFFFF) ? false : true);
 	}
+	BYTE* SplitPages(int* arrPageIndex, int nLength, BYTE* data, LONG size)
+	{
+		if (m_nType == 0)
+			return ((CPdfFile*)m_pFile)->SplitPages(arrPageIndex, nLength, data, size);
+		return NULL;
+	}
+	bool MergePages(BYTE* data, LONG size, int nMaxID, const std::string& sPrefixForm, bool bCopy = false)
+	{
+		if (m_nType == 0)
+		{
+			// Память из CDrawingFileEmbed освобождается сразу после вызова функции, поэтому копируем
+			if (bCopy)
+			{
+				BYTE* pCopy = (BYTE*)malloc(size);
+				memcpy(pCopy, data, size);
+				data = pCopy;
+			}
+			// Захватывает полученную память, будет освобождена либо в деструкторе MemStream, либо free в случае неудачи
+			return ((CPdfFile*)m_pFile)->MergePages(data, size, nMaxID, sPrefixForm);
+		}
+		return false;
+	}
+	bool UnmergePages()
+	{
+		if (m_nType == 0)
+			return ((CPdfFile*)m_pFile)->UnmergePages();
+		return false;
+	}
 
 	BYTE* GetGlyphs(int nPageIndex)
 	{
@@ -403,22 +430,32 @@ public:
 		oRenderer.SetExternalImageStorage(m_pImageStorage);
 		oRenderer.SetTextAssociationType(NSDocxRenderer::TextAssociationType::tatParagraphToShape);
 
-		std::vector<std::wstring> arShapes;
-		if (0 == mode)
-			arShapes = oRenderer.ScanPage(m_pFile, nPageIndex);
-		else
-			arShapes = oRenderer.ScanPagePptx(m_pFile, nPageIndex);
-
-		int nLen = (int)arShapes.size();
-
 		NSWasm::CData oRes;
-		oRes.SkipLen();
-		oRes.AddInt(nLen);
+		switch (mode)
+		{
+			case 0:
+			case 1:
+			{
+				std::vector<std::wstring> arShapes = (0 == mode) ? oRenderer.ScanPage(m_pFile, nPageIndex) : oRenderer.ScanPagePptx(m_pFile, nPageIndex);
+				int nLen = (int)arShapes.size();
 
-		for (int i = 0; i < nLen; ++i)
-			oRes.WriteString(arShapes[i]);
+				oRes.SkipLen();
+				oRes.AddInt(nLen);
 
-		oRes.WriteLen();
+				for (int i = 0; i < nLen; ++i)
+					oRes.WriteString(arShapes[i]);
+
+				oRes.WriteLen();
+				break;
+			}
+			case 2:
+			{
+				oRes = oRenderer.ScanPageBin(m_pFile, nPageIndex);
+				break;
+			}
+			default:
+				return NULL;
+		}
 
 		BYTE* res = oRes.GetBuffer();
 		oRes.ClearWithoutAttack();

DesktopEditor/doctrenderer/embed/DrawingFileEmbed.cpp

@@ -166,6 +166,48 @@ JSSmart<CJSValue> CDrawingFileEmbed::FreeWasmData(JSSmart<CJSValue> typedArray)
 	return NULL;
 }
 
+JSSmart<CJSValue> CDrawingFileEmbed::SplitPages(JSSmart<CJSValue> arrPageIndexes, JSSmart<CJSValue> data)
+{
+	JSSmart<CJSArray> arrPages = arrPageIndexes->toArray();
+	CJSDataBuffer changes;
+	if (data->isTypedArray())
+		changes = data->toTypedArray()->getData();
+
+	int nCountPages = arrPages->getCount();
+	int* pPages = NULL;
+	if (0 < nCountPages)
+		pPages = new int[nCountPages];
+
+	for (int i = 0; i < nCountPages; i++)
+		pPages[i] = arrPages->get(i)->toInt32();
+
+	JSSmart<CJSValue> res = WasmMemoryToJS(m_pFile->SplitPages(pPages, nCountPages, changes.Data, (LONG)changes.Len));
+	if (pPages)
+		delete [] pPages;
+	return res;
+}
+JSSmart<CJSValue> CDrawingFileEmbed::MergePages(JSSmart<CJSValue> data, JSSmart<CJSValue> nMaxID, JSSmart<CJSValue> sPrefixForm)
+{
+	bool result = false;
+	if (m_pFile)
+	{
+		JSSmart<CJSTypedArray> dataPtr = data->toTypedArray();
+		int maxID = nMaxID->toInt32();
+		std::string prefix = sPrefixForm->toStringA();
+		CJSDataBuffer buffer = dataPtr->getData();
+		result = m_pFile->MergePages(buffer.Data, (LONG)buffer.Len, maxID, prefix, true);
+		if (buffer.IsExternalize)
+			buffer.Free();
+	}
+	return CJSContext::createBool(result);
+}
+JSSmart<CJSValue> CDrawingFileEmbed::UnmergePages()
+{
+	if (m_pFile)
+		return CJSContext::createBool(m_pFile->UnmergePages());
+	return CJSContext::createBool(false);
+}
+
 bool EmbedDrawingFile(JSSmart<NSJSBase::CJSContext>& context, IOfficeDrawingFile* pFile)
 {
 	CJSContext::Embed<CDrawingFileEmbed>(false);

DesktopEditor/doctrenderer/embed/DrawingFileEmbed.h

@@ -51,6 +51,10 @@ public:
 
 	JSSmart<CJSValue> FreeWasmData(JSSmart<CJSValue> typedArray);
 
+	JSSmart<CJSValue> SplitPages(JSSmart<CJSValue> arrPageIndexes, JSSmart<CJSValue> data);
+	JSSmart<CJSValue> MergePages(JSSmart<CJSValue> data, JSSmart<CJSValue> nMaxID, JSSmart<CJSValue> sPrefixForm);
+	JSSmart<CJSValue> UnmergePages();
+
 	DECLARE_EMBED_METHODS
 };
 

DesktopEditor/doctrenderer/embed/GraphicsEmbed.cpp

@@ -165,9 +165,14 @@ JSSmart<CJSValue> CGraphicsEmbed::create(JSSmart<CJSValue> Native, JSSmart<CJSVa
 		JSSmart<CJSObject> pNativeObject = Native->toObject();
 		CJSEmbedObject* pNativeEmbedObject = pNativeObject->getNative();
 
-		if (m_pInternal->m_pAppImage)
+		if (m_pInternal->m_pAppImage && pNativeEmbedObject)
+		{
 			delete m_pInternal->m_pAppImage;
-		m_pInternal->m_pAppImage = new CGraphicsAppImage();
+			m_pInternal->m_pAppImage = NULL;
+		}
+
+		if (NULL == m_pInternal->m_pAppImage)
+			m_pInternal->m_pAppImage = new CGraphicsAppImage();
 
 		if (pNativeEmbedObject)
 		{
@@ -191,7 +196,9 @@ JSSmart<CJSValue> CGraphicsEmbed::create(JSSmart<CJSValue> Native, JSSmart<CJSVa
 }
 JSSmart<CJSValue> CGraphicsEmbed::Destroy()
 {
+	// For save image bits, if needed.
 	m_pInternal->Destroy();
+	RELEASEOBJECT(m_pInternal);
 	return NULL;
 }
 JSSmart<CJSValue> CGraphicsEmbed::EndDraw()

DesktopEditor/doctrenderer/embed/NativeBuilderDocumentEmbed.h

@@ -45,7 +45,7 @@ public:
 
 public:
 	CBuilderDocumentEmbed() : m_pBuilder(NULL), m_bIsValid(false) {}
-	~CBuilderDocumentEmbed() { if(m_pBuilder) RELEASEOBJECT(m_pBuilder); }
+	~CBuilderDocumentEmbed() { if(m_pBuilder && !m_isExternalize) RELEASEOBJECT(m_pBuilder); }
 
 	virtual void* getObject() { return (void*)m_pBuilder; }
 	NSDoctRenderer::CDocBuilder_Private* GetPrivate(NSDoctRenderer::CDocBuilder* pBuilder) { return pBuilder->GetPrivate(); }

DesktopEditor/doctrenderer/embed/NativeBuilderEmbed.cpp

@@ -88,6 +88,7 @@ JSSmart<CJSValue> CBuilderEmbed::OpenTmpFile(JSSmart<CJSValue> path, JSSmart<CJS
 	JSSmart<CJSObject> oBuilderTmpDoc = CJSContext::createEmbedObject("CBuilderDocumentEmbed");
 	CBuilderDocumentEmbed* pBuilderTmpDocNative = static_cast<CBuilderDocumentEmbed*>(oBuilderTmpDoc->getNative());
 	pBuilderTmpDocNative->m_pBuilder = m_pBuilder;
+	pBuilderTmpDocNative->SetExternalize(true);
 	pBuilderTmpDocNative->_OpenFile(sPath, sParams);
 	return oBuilderTmpDoc->toValue();
 }

DesktopEditor/doctrenderer/embed/NativeBuilderEmbed.h

@@ -47,7 +47,7 @@ public:
 	NSDoctRenderer::CDocBuilder* m_pBuilder;
 
 	CBuilderEmbed() : m_pBuilder(NULL) {}
-	~CBuilderEmbed() { if(m_pBuilder) RELEASEOBJECT(m_pBuilder); }
+	~CBuilderEmbed() { if(m_pBuilder && !m_isExternalize) RELEASEOBJECT(m_pBuilder); }
 
 	virtual void* getObject() { return (void*)m_pBuilder; }
 	NSDoctRenderer::CDocBuilder_Private* GetPrivate() { return m_pBuilder->GetPrivate(); }

DesktopEditor/doctrenderer/embed/jsc/jsc_DrawingFileEmbed.mm

@@ -27,6 +27,9 @@
 -(JSValue*) ScanPage : (JSValue*)nPageIndex : (JSValue*)mode;
 -(JSValue*) GetImageBase64 : (JSValue*)rId;
 -(JSValue*) FreeWasmData : (JSValue*)typedArray;
+-(JSValue*) SplitPages : (JSValue*)arrPageIndexes : (JSValue*)data;
+-(JSValue*) MergePages : (JSValue*)data : (JSValue*)nMaxID : (JSValue*)sPrefixForm;
+-(JSValue*) UnmergePages;
 @end
 
 @interface CJSCDrawingFileEmbed : NSObject<IJSCDrawingFileEmbed, JSEmbedObjectProtocol>
@@ -61,6 +64,9 @@ FUNCTION_WRAPPER_JS_0(IsNeedCMap, IsNeedCMap)
 FUNCTION_WRAPPER_JS_2(ScanPage, ScanPage)
 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)
 @end
 
 class CDrawingFileEmbedAdapter : public CJSEmbedObjectAdapterJSC

DesktopEditor/doctrenderer/embed/v8/v8_DrawingFileEmbed.cpp

@@ -30,6 +30,9 @@ namespace NSDrawingFileEmbed
 	FUNCTION_WRAPPER_V8_2(_ScanPage, ScanPage)
 	FUNCTION_WRAPPER_V8_1(_GetImageBase64, GetImageBase64)
 	FUNCTION_WRAPPER_V8_1(_FreeWasmData, FreeWasmData)
+	FUNCTION_WRAPPER_V8_2(_SplitPages, SplitPages)
+	FUNCTION_WRAPPER_V8_3(_MergePages, MergePages)
+	FUNCTION_WRAPPER_V8_0(_UnmergePages, UnmergePages)
 
 	v8::Handle<v8::ObjectTemplate> CreateTemplate(v8::Isolate* isolate)
 	{
@@ -59,6 +62,9 @@ namespace NSDrawingFileEmbed
 		NSV8Objects::Template_Set(result, "ScanPage",	_ScanPage);
 		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);
 
 		return handle_scope.Escape(result);
 	}

DesktopEditor/doctrenderer/graphics.cpp

@@ -42,6 +42,7 @@ namespace NSGraphics
 
 		m_pRenderer = NSGraphics::Create();
 		m_pRenderer->SetFontManager(pManager);
+		RELEASEINTERFACE(pManager);
 
 		int nRasterW = (int)width_px;
 		int nRasterH = (int)height_px;

DesktopEditor/doctrenderer/graphics.h

@@ -115,17 +115,16 @@ namespace NSGraphics
 	class CGraphics
 	{
 	public:
-		CGraphicsAppImage* m_pAppImage;
+		CGraphicsAppImage* m_pAppImage = nullptr;
 		CBgraFrame m_oFrame;
 
 	private:
-		NSGraphics::IGraphicsRenderer* m_pRenderer;
+		NSGraphics::IGraphicsRenderer* m_pRenderer = nullptr;
 		CGrState   m_oGrState;
 
 	public:
 		CGraphics()
 		{
-			m_pAppImage = NULL;
 		}
 		~CGraphics()
 		{

DesktopEditor/doctrenderer/js_internal/js_base.cpp

@@ -31,6 +31,7 @@ namespace NSJSBase {
 	{
 		embed_native_internal = nullptr;
 		m_pAdapter = nullptr;
+		m_isExternalize = false;
 	}
 
 	CJSEmbedObject::~CJSEmbedObject()
@@ -44,6 +45,16 @@ namespace NSJSBase {
 		return nullptr;
 	}
 
+	void CJSEmbedObject::SetExternalize(const bool& isExternalize)
+	{
+		m_isExternalize = isExternalize;
+	}
+
+	bool CJSEmbedObject::GetExternalize()
+	{
+		return m_isExternalize;
+	}
+
 	CJSEmbedObjectAdapterBase* CJSEmbedObject::getAdapter()
 	{
 		return nullptr;

DesktopEditor/doctrenderer/js_internal/js_base.h

@@ -194,10 +194,18 @@ namespace NSJSBase
 		 */
 		virtual CJSEmbedObjectAdapterBase* getAdapter();
 
+		/**
+		 * Use the externalize flag if you are monitoring the object's destruction yourself.
+		 */
+		virtual void SetExternalize(const bool& isExternalize = true);
+		virtual bool GetExternalize();
+
 	protected:
 		CJSEmbedObjectPrivateBase* embed_native_internal;
 		CJSEmbedObjectAdapterBase* m_pAdapter;
 
+		bool m_isExternalize;
+
 		friend class CJSEmbedObjectPrivateBase;
 		friend class CJSEmbedObjectPrivate;
 	};
@@ -483,6 +491,12 @@ namespace NSJSBase
 		 */
 		void Exit();
 
+		/**
+		 * Сheck if context is current.
+		 * This method is not safe.
+		 */
+		bool IsEntered();
+
 		/**
 		 * Embeds specified class in JS contexts.
 		 * @tparam T Embedded class name.

DesktopEditor/doctrenderer/js_internal/js_embed.h

@@ -10,6 +10,7 @@
 
 @protocol JSEmbedObjectProtocol
 -(void*) getNative;
+-(void) freeNative;
 @end
 
 #if __has_feature(objc_arc)
@@ -41,6 +42,10 @@
 -(void*) getNative								\
 {                                               \
 	return m_internal;                          \
+}                                               \
+-(void) freeNative                              \
+{                                               \
+	RELEASEOBJECT(m_internal);                  \
 }
 
 namespace NSJSBase

DesktopEditor/doctrenderer/js_internal/jsc/jsc_base.h

@@ -34,6 +34,7 @@ namespace NSJSBase
 
 	// embed
 	id CreateEmbedNativeObject(NSString* name);
+	void FreeNativeObject(id embedded_object);
 }
 
 namespace NSJSBase

DesktopEditor/doctrenderer/js_internal/jsc/jsc_base.mm

@@ -232,10 +232,14 @@ namespace NSJSBase
 		{
 			[m_internal->context evaluateScript:@"function jsc_toBase64(r){for(var o=[\"A\",\"B\",\"C\",\"D\",\"E\",\"F\",\"G\",\"H\",\"I\",\"J\",\"K\",\"L\",\"M\",\"N\",\"O\",\"P\",\"Q\",\"R\",\"S\",\"T\",\"U\",\"V\",\"W\",\"X\",\"Y\",\"Z\",\"a\",\"b\",\"c\",\"d\",\"e\",\"f\",\"g\",\"h\",\"i\",\"j\",\"k\",\"l\",\"m\",\"n\",\"o\",\"p\",\"q\",\"r\",\"s\",\"t\",\"u\",\"v\",\"w\",\"x\",\"y\",\"z\",\"0\",\"1\",\"2\",\"3\",\"4\",\"5\",\"6\",\"7\",\"8\",\"9\",\"+\",\"/\"],a=r.length,f=4*(a/3>>0),n=f/76>>0,t=19,v=0,e=[],i=\"\",s=0;s<=n;s++){s==n&&(t=f%76/4>>0);for(var u=0;u<t;u++){for(var c=0,h=0;h<3;h++)c|=r[0+v++],c<<=8;i=\"\";for(var A=0;A<4;A++){i+=o[c>>>26&255],c<<=6,c&=4294967295}e.push(i)}}if(n=a%3!=0?a%3+1:0){for(c=0,h=0;h<3;h++)h<a%3&&(c|=r[0+v++]),c<<=8;i=\"\";for(A=0;A<n;A++){i+=o[c>>>26&255],c<<=6}t=0!=n?4-n:0;for(u=0;u<t;u++)i+=\"=\";e.push(i)}return e.join(\"\")}function jsc_fromBase64(r,o){for(var a,f=r.length,n=0,t=new Array(void 0===o?f:o),v=t,e=0,i=0;e<f;){for(var s=0,u=0,c=0;c<4&&!(f<=e);c++){var h=65<=(a=r.charCodeAt(e++))&&a<=90?a-65:97<=a&&a<=122?a-71:48<=a&&a<=57?a+4:43==a?62:47==a?63:-1;-1!=h?(s<<=6,s|=h,u+=6):c--}for(s<<=24-u,i=u>>>3,c=0;c<i;c++)v[n++]=(16711680&s)>>>16,s<<=8}return t}\n"];
 		}
-		// insert CreateEmbedObject() function to global object of this context
+		// insert embed functions to global object of this context
 		m_internal->context[@"CreateEmbedObject"] = ^(NSString* name) {
 			return CreateEmbedNativeObject(name);
 		};
+		m_internal->context[@"FreeEmbedObject"] = ^(id embedded_object) {
+			FreeNativeObject(embedded_object);
+		};
+
 
 		JSValue* global_js = [m_internal->context globalObject];
 		[global_js setValue:global_js forProperty:[[NSString alloc] initWithUTF8String:"window"]];
@@ -246,6 +250,8 @@ namespace NSJSBase
 		{
 			CGlobalContext::GetInstance().UnregisterContextForId(*i);
 		}
+		// remove any exceptions pending to not prevent any JSValue deallocations
+		m_internal->context.exception = nil;
 		m_internal->context = nil;
 	}
 
@@ -439,6 +445,11 @@ namespace NSJSBase
 	{
 	}
 
+	bool CJSContext::IsEntered()
+	{
+		return true;
+	}
+
 	class CJSLocalScopePrivate
 	{
 	public:
@@ -498,6 +509,15 @@ namespace NSJSBase
 		return pEmbedObj;
 	}
 
+	void FreeNativeObject(id embedded_object)
+	{
+		// check if the object was actually embedded and do nothing if it wasn't
+		if ([embedded_object conformsToProtocol:@protocol(JSEmbedObjectProtocol)])
+		{
+			[embedded_object freeNative];
+		}
+	}
+
 	JSSmart<CJSValue> CJSEmbedObjectAdapterJSC::Native2Value(JSValue* value)
 	{
 		return js_value(value);

DesktopEditor/doctrenderer/js_internal/v8/v8_base.cpp

@@ -214,12 +214,41 @@ namespace NSJSBase
 			m_internal->m_contextPersistent.Reset(isolate, v8::Context::New(isolate));
 			// create temporary local handle to context
 			m_internal->m_context = v8::Local<v8::Context>::New(isolate, m_internal->m_contextPersistent);
-			// insert CreateEmbedObject() function to global object of this context
+			// insert embed functions to global object of this context
 			m_internal->InsertToGlobal("CreateEmbedObject", CreateEmbedNativeObject);
+			m_internal->InsertToGlobal("FreeEmbedObject", FreeNativeObject);
 			// clear temporary local handle
 			m_internal->m_context.Clear();
 		}
 	}
+
+	class WeakHandleVisitor : public v8::PersistentHandleVisitor
+	{
+	private:
+		WeakHandleVisitor() = default;
+
+	public:
+		void VisitPersistentHandle(v8::Persistent<v8::Value>* value, uint16_t class_id) override
+		{
+			if (class_id == CJSEmbedObjectPrivate::kWeakHandleId)
+			{
+				v8::Isolate* isolate = v8::Isolate::GetCurrent();
+				v8::HandleScope scope(isolate);
+				v8::Local<v8::Object> handle = value->Get(isolate).As<v8::Object>();
+				v8::Local<v8::External> field = v8::Local<v8::External>::Cast(handle->GetInternalField(0));
+				CJSEmbedObject* native = static_cast<CJSEmbedObject*>(field->Value());
+				delete native;
+			}
+		}
+
+	public:
+		static WeakHandleVisitor* getInstance()
+		{
+			static WeakHandleVisitor visitor;
+			return &visitor;
+		}
+	};
+
 	void CJSContext::Dispose()
 	{
 #ifdef V8_INSPECTOR
@@ -228,7 +257,13 @@ namespace NSJSBase
 #endif
 
 		m_internal->m_contextPersistent.Reset();
-		m_internal->m_isolate->Dispose();
+		// destroy native object in the weak handles before isolate disposal
+		v8::Isolate* isolate = m_internal->m_isolate;
+		{
+			v8::Isolate::Scope scope(isolate);
+			isolate->VisitHandlesWithClassIds(WeakHandleVisitor::getInstance());
+		}
+		isolate->Dispose();
 		m_internal->m_isolate = NULL;
 	}
 
@@ -255,6 +290,8 @@ namespace NSJSBase
 		m_internal->m_context = v8::Local<v8::Context>::New(isolate, m_internal->m_contextPersistent);
 		if (!m_internal->m_context.IsEmpty())
 			m_internal->m_context->Enter();
+
+		m_internal->m_entered = true;
 	}
 
 	void CJSContext::Exit()
@@ -271,6 +308,13 @@ namespace NSJSBase
 		else
 			m_internal->m_context = m_internal->m_isolate->GetCurrentContext();
 		m_internal->m_isolate->Exit();
+
+		m_internal->m_entered = false;
+	}
+
+	bool CJSContext::IsEntered()
+	{
+		return m_internal->m_entered;
 	}
 
 	CJSValue* CJSContext::createUndefined()
@@ -646,4 +690,22 @@ namespace NSJSBase
 		NSJSBase::CJSEmbedObjectPrivate::CreateWeaker(obj);
 		args.GetReturnValue().Set(obj);
 	}
+
+	void FreeNativeObject(const v8::FunctionCallbackInfo<v8::Value>& args)
+	{
+		v8::Isolate* isolate = args.GetIsolate();
+		v8::HandleScope scope(isolate);
+
+		if (args.Length() != 1)
+		{
+			args.GetReturnValue().Set(v8::Undefined(isolate));
+			return;
+		}
+
+		v8::Local<v8::Object> obj = args[0].As<v8::Object>();
+		v8::Local<v8::External> field = v8::Local<v8::External>::Cast(obj->GetInternalField(0));
+		CJSEmbedObject* native = static_cast<CJSEmbedObject*>(field->Value());
+		delete native;
+		// weak persistent handle will be cleared and removed in CJSEmbedObjectPrivate destructor
+	}
 }

DesktopEditor/doctrenderer/js_internal/v8/v8_base.h

@@ -857,12 +857,14 @@ namespace NSJSBase
 		v8::Local<v8::Context>			m_context;
 
 		v8::StartupData m_startup_data;
+		bool m_entered;
 
 	public:
 		CJSContextPrivate() : m_isolate(NULL)
 		{
 			m_startup_data.data = NULL;
 			m_startup_data.raw_size = 0;
+			m_entered = false;
 		}
 
 		void InsertToGlobal(const std::string& name, v8::FunctionCallback creator)
@@ -881,6 +883,7 @@ namespace NSJSBase
 
 	// embed
 	void CreateEmbedNativeObject(const v8::FunctionCallbackInfo<v8::Value>& args);
+	void FreeNativeObject(const v8::FunctionCallbackInfo<v8::Value>& args);
 
 	class CJSEmbedObjectAdapterV8Template : public CJSEmbedObjectAdapterBase
 	{
@@ -898,6 +901,8 @@ namespace NSJSBase
 	{
 	public:
 		v8::Persistent<v8::Object> handle;
+		// contstant id for all weak native handles
+		static const uint16_t kWeakHandleId = 1;
 
 		CJSEmbedObjectPrivate(v8::Local<v8::Object> obj)
 		{
@@ -916,6 +921,8 @@ namespace NSJSBase
 
 			handle.Reset(CV8Worker::GetCurrent(), obj);
 			handle.SetWeak(pEmbedObject, EmbedObjectWeakCallback, v8::WeakCallbackType::kParameter);
+			// set class_id for being able to iterate over all these handles to destroy them on isolate disposal
+			handle.SetWrapperClassId(kWeakHandleId);
 
 			pEmbedObject->embed_native_internal = this;
 		}
@@ -929,8 +936,6 @@ namespace NSJSBase
 
 		static void EmbedObjectWeakCallback(const v8::WeakCallbackInfo<CJSEmbedObject>& data)
 		{
-			v8::Isolate* isolate = data.GetIsolate();
-			v8::HandleScope scope(isolate);
 			CJSEmbedObject* wrap = data.GetParameter();
 			((CJSEmbedObjectPrivate*)wrap->embed_native_internal)->handle.Reset();
 			delete wrap;

DesktopEditor/doctrenderer/test/embed/external/Embed.cpp

@@ -1,4 +1,15 @@
 #include "Embed.h"
+#include <iostream>
+
+CTestEmbed::CTestEmbed()
+{
+	std::cout << "debug: CTestEmbed constructed" << std::endl;
+}
+
+CTestEmbed::~CTestEmbed()
+{
+	std::cout << "debug: CTestEmbed destroyed" << std::endl;
+}
 
 #ifdef ENABLE_SUM_DEL
 JSSmart<CJSValue> CTestEmbed::FunctionSum(JSSmart<CJSValue> param1, JSSmart<CJSValue> param2)

DesktopEditor/doctrenderer/test/embed/external/Embed.h

@@ -1,5 +1,5 @@
-#ifndef _BUILD_NATIVE_HASH_EMBED_H_
-#define _BUILD_NATIVE_HASH_EMBED_H_
+#ifndef CTESTEMBED_H_
+#define CTESTEMBED_H_
 
 #include "js_internal/js_base.h"
 
@@ -10,13 +10,8 @@ using namespace NSJSBase;
 class CTestEmbed : public CJSEmbedObject
 {
 public:
-	CTestEmbed()
-	{
-	}
-
-	~CTestEmbed()
-	{
-	}
+	CTestEmbed();
+	~CTestEmbed();
 
 	virtual void* getObject() override { return NULL; }
 
@@ -33,4 +28,4 @@ public:
 	DECLARE_EMBED_METHODS
 };
 
-#endif // _BUILD_NATIVE_HASH_EMBED_H_
+#endif // CTESTEMBED_H_

DesktopEditor/doctrenderer/test/embed/external/main.cpp

@@ -1,278 +1,14 @@
-/*
- * (c) Copyright Ascensio System SIA 2010-2019
- *
- * This program is a free software product. You can redistribute it and/or
- * modify it under the terms of the GNU Affero General Public License (AGPL)
- * version 3 as published by the Free Software Foundation. In accordance with
- * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
- * that Ascensio System SIA expressly excludes the warranty of non-infringement
- * of any third-party rights.
- *
- * This program is distributed WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
- * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
- *
- * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
- * street, Riga, Latvia, EU, LV-1050.
- *
- * The  interactive user interfaces in modified source and object code versions
- * of the Program must display Appropriate Legal Notices, as required under
- * Section 5 of the GNU AGPL version 3.
- *
- * Pursuant to Section 7(b) of the License you must retain the original Product
- * logo when distributing the program. Pursuant to Section 7(e) we decline to
- * grant you any rights under trademark law for use of our trademarks.
- *
- * All the Product's GUI elements, including illustrations and icon sets, as
- * well as technical writing content are licensed under the terms of the
- * Creative Commons Attribution-ShareAlike 4.0 International. See the License
- * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
- *
- */
+#include "test_functions.h"
 
-#include <iostream>
-
-#include "embed/Default.h"
-#include "js_internal/js_base.h"
-#include "Embed.h"
-
-using namespace NSJSBase;
-int main(int argc, char *argv[])
+int main()
 {
-#if 0
-	// Primitives example
+	// TODO: test
 
-	JSSmart<CJSContext> oContext1 = new CJSContext(false);
-	oContext1->Initialize();
-
-	JSSmart<CJSContext> oContext2 = new CJSContext;
-//	oContext2->Initialize();
-
-	// Work with first context
-	oContext1->Enter();
-
-	{
-		CJSContextScope scope(oContext1);
-		CJSLocalScope local_scope;
-		JSSmart<CJSValue> oResLocal = oContext1->runScript("function f() { return 'Local scope test'; }; f();");
-		std::cout << oResLocal->toStringA() << std::endl;
-	}
-	JSSmart<CJSObject> oGlobal1 = oContext1->GetGlobal();
-	JSSmart<CJSValue> oVar2 = oContext1->createString("Hel");
-	oGlobal1->set("v1", oVar2.GetPointer());
-	oContext1->runScript("var res = v1 + 'lo'");
-
-	oContext1->Exit();
-
-	// Work with second context with CJSContextScope usage
-	{
-		CJSContextScope scope(oContext2);
-
-		JSSmart<CJSObject> oGlobal2 = oContext2->GetGlobal();
-		JSSmart<CJSValue> oVar4 = oContext2->createString("Wor");
-		oGlobal2->set("v1", oVar4.GetPointer());
-		oContext2->runScript("var res = v1 + 'ld!'");
-	}
-
-	// Print result from first context
-	oContext1->Enter();
-
-	JSSmart<CJSValue> oRes1 = oContext1->runScript("function f() { return res; }; f();");
-	std::string strRes1 = oRes1->toStringA();
-	std::cout << strRes1 << std::endl;
-
-	// Print second variable
-	oContext2->Enter();
-
-	JSSmart<CJSValue> oRes2 = oContext1->runScript("function f() { return res; }; f();");
-	std::string strRes2 = oRes2->toStringA();
-	std::cout << strRes2 << std::endl;
-
-	oContext2->Exit();
-	oContext1->Exit();
-
-//	oContext1->Dispose();
-	oContext2->Dispose();
-
-#endif
-
-#if 0
-	// External embed example
-
-	JSSmart<CJSContext> oContext1 = new CJSContext();
-
-	// Embedding
-	CJSContextScope scope(oContext1);
-	CJSContext::Embed<CTestEmbed>();
-
-	JSSmart<CJSValue> oResTestEmbed1 = oContext1->runScript("(function() { var value = CreateEmbedObject('CTestEmbed'); return value.FunctionSum(10, 5); })();");
-	std::cout << "FunctionSum(10, 5) = " << oResTestEmbed1->toInt32() << std::endl;
-
-	JSSmart<CJSValue> oResTestEmbed2 = oContext1->runScript("(function() { var value = CreateEmbedObject('CTestEmbed'); return value.FunctionSquare(4); })();");
-	std::cout << "FunctionSquare(4) = " << oResTestEmbed2->toInt32() << std::endl;
-
-	JSSmart<CJSValue> oResTestEmbed3 = oContext1->runScript("(function() { var value = CreateEmbedObject('CTestEmbed'); return value.FunctionDel(30, 3); })();");
-	std::cout << "FunctionDel(30, 3) = " << oResTestEmbed3->toInt32() << std::endl;
-
-	JSSmart<CJSValue> oResTestEmbed4 = oContext1->runScript("(function() { var value = CreateEmbedObject('CTestEmbed'); return value.FunctionGet(); })();");
-	std::cout << "FunctionGet() = " << oResTestEmbed4->toInt32() << std::endl;
-
-#endif
-
-#if 0
-	// CZipEmbed example
-
-	JSSmart<CJSContext> oContext1 = new CJSContext();
-	JSSmart<CJSContext> oContext2 = new CJSContext();
-
-	// Work with first context
-	oContext1->Enter();
-	CreateDefaults();
-	JSSmart<CJSValue> oRes1 = oContext1->runScript(
-		"var oZip = CreateEmbedObject('CZipEmbed');\n"
-		"var files = oZip.open('" CURR_DIR "');\n"
-		"oZip.close();");
-	oContext1->Exit();
-
-	// Work with second context
-	{
-		CJSContextScope scope(oContext2);
-//		CreateDefaults();
-		JSSmart<CJSValue> oRes2 = oContext2->runScript(
-			"var oZip = CreateEmbedObject('CZipEmbed');\n"
-			"var files = oZip.open('" CURR_DIR "/../embed');\n"
-			"oZip.close();");
-	}
-
-	// Print first result
-	oContext1->Enter();
-	JSSmart<CJSObject> oGlobal1 = oContext1->GetGlobal();
-	JSSmart<CJSArray> oFiles1 = oGlobal1->get("files")->toArray();
-	std::cout << "\nRESULT FROM CONTEXT 1:\n";
-	for (int i = 0; i < oFiles1->getCount(); i++)
-	{
-		std::cout << oFiles1->get(i)->toStringA() << std::endl;
-	}
-
-	// Print second result
-	oContext2->Enter();
-	JSSmart<CJSObject> oGlobal2 = oContext2->GetGlobal();
-	JSSmart<CJSArray> oFiles2 = oGlobal2->get("files")->toArray();
-	std::cout << "\nRESULT FROM CONTEXT 2:\n";
-	for (int i = 0; i < oFiles2->getCount(); i++)
-	{
-		std::cout << oFiles2->get(i)->toStringA() << std::endl;
-	}
-	oContext2->Exit();
-	oContext1->Exit();
-
-#endif
-
-#if 0
-	// CHashEmbed example
-
-	JSSmart<CJSContext> oContext1 = new CJSContext();
-
-	// Call hash() on first context
-	CJSContextScope scope(oContext1);
-	CreateDefaults();
-	JSSmart<CJSValue> oRes1 = oContext1->runScript(
-		"var oHash = CreateEmbedObject('CHashEmbed');\n"
-		"var str = 'test';\n"
-		"var hash = oHash.hash(str, str.length, 0);");
-
-	// Print first result
-	JSSmart<CJSObject> oGlobal1 = oContext1->GetGlobal();
-	JSSmart<CJSTypedArray> oHash = oGlobal1->get("hash")->toTypedArray();
-	std::cout << "\nRESULTED HASH:\n";
-	for (int i = 0; i < oHash->getCount(); i++)
-	{
-		std::cout << std::hex << static_cast<unsigned>(oHash->getData().Data[i]);
-	}
-	std::cout << std::endl;
-
-	// Call hash2() on first context
-	JSSmart<CJSValue> oRes2 = oContext1->runScript(
-		"var str2 = 'test';\n"
-		"var hash2 = oHash.hash2(str2, 'yrGivlyCImiWnryRee1OJw==', 100000, 7);");
-
-	// Print first result
-	JSSmart<CJSTypedArray> oHash2 = oGlobal1->get("hash2")->toTypedArray();
-	std::cout << "\nRESULTED HASH2:\n";
-	for (int i = 0; i < oHash2->getCount(); i++)
-	{
-		std::cout << std::hex << static_cast<unsigned>(oHash2->getData().Data[i]);
-	}
-	std::cout << std::endl;
-
-#endif
-
-#if 1
-	// Mixed embed example
-
-	JSSmart<CJSContext> oContext1 = new CJSContext();
-
-	// External CTestEmbed
-	CJSContextScope scope(oContext1);
-	CJSContext::Embed<CTestEmbed>(false);
-
-	JSSmart<CJSValue> oResTestEmbed1 = oContext1->runScript("(function() { var value = CreateEmbedObject('CTestEmbed'); return value.FunctionSum(10, 5); })();");
-	if (oResTestEmbed1->isNumber())
-		std::cout << "FunctionSum(10, 5) = " << oResTestEmbed1->toInt32() << std::endl;
-
-	JSSmart<CJSObject> oTestEmbed = CJSContext::createEmbedObject("CTestEmbed");
-
-//	JSSmart<CJSValue> oResTestEmbed2 = oContext1->runScript("(function() { var value = CreateEmbedObject('CTestEmbed'); return value.FunctionSquare(4); })();");
-	JSSmart<CJSValue> args2[1];
-	args2[0] = CJSContext::createInt(4);
-	JSSmart<CJSValue> oResTestEmbed2 = oTestEmbed->call_func("FunctionSquare", 1, args2);
-	if (oResTestEmbed2->isNumber())
-		std::cout << "FunctionSquare(4) = " << oResTestEmbed2->toInt32() << std::endl;
-
-//	JSSmart<CJSValue> oResTestEmbed3 = oContext1->runScript("(function() { var value = CreateEmbedObject('CTestEmbed'); return value.FunctionDel(30, 3); })();");
-	JSSmart<CJSValue> args3[2];
-	args3[0] = CJSContext::createInt(30);
-	args3[1] = CJSContext::createInt(3);
-	JSSmart<CJSValue> oResTestEmbed3 = oTestEmbed->call_func("FunctionDel", 2, args3);
-	if (oResTestEmbed3->isNumber())
-		std::cout << "FunctionDel(30, 3) = " << oResTestEmbed3->toInt32() << std::endl;
-
-	JSSmart<CJSValue> oResTestEmbed4 = oContext1->runScript("(function() { var value = CreateEmbedObject('CTestEmbed'); return value.FunctionGet(); })();");
-	if (oResTestEmbed4->isNumber())
-		std::cout << "FunctionGet() = " << oResTestEmbed4->toInt32() << std::endl;
-
-	// Internal CHashEmbed
-	CreateDefaults();
-	oContext1->runScript(
-		"var oHash = CreateEmbedObject('CHashEmbed');\n"
-		"var str = 'test';\n"
-		"var hash = oHash.hash(str, str.length, 0);");
-
-	// Print hash
-	JSSmart<CJSObject> oGlobal = oContext1->GetGlobal();
-	JSSmart<CJSTypedArray> oHash = oGlobal->get("hash")->toTypedArray();
-	std::cout << "\nRESULTED HASH:\n";
-	for (int i = 0; i < oHash->getCount(); i++)
-	{
-		std::cout << std::hex << static_cast<unsigned>(oHash->getData().Data[i]);
-	}
-	std::cout << std::endl;
-
-	// Internal CZipEmbed
-	oContext1->runScript(
-		"var oZip = CreateEmbedObject('CZipEmbed');\n"
-		"var files = oZip.open('" CURR_DIR "');\n"
-		"oZip.close();");
-
-	// Print files
-	JSSmart<CJSArray> oFiles1 = oGlobal->get("files")->toArray();
-	std::cout << "\nFILES IN CURRENT DIRECTORY:\n";
-	for (int i = 0; i < oFiles1->getCount(); i++)
-	{
-		std::cout << oFiles1->get(i)->toStringA() << std::endl;
-	}
-
-#endif
+	// testMultipleContexts();
+	testEmbedExternal();
+	// testEmbedInternal();
+	// testHashEmbed();
+	// testEmbedMixed();
 
 	return 0;
 }

DesktopEditor/doctrenderer/test/embed/external/main.mm

@@ -0,0 +1,14 @@
+#include "test_functions.h"
+
+int main()
+{
+	// all test functions should be called inside the `@autoreleasepool` block!
+	@autoreleasepool
+	{
+		testEmbedExternal();
+		// testHashEmbed();
+		// testEmbedMixed();
+	}
+
+	return 0;
+}

DesktopEditor/doctrenderer/test/embed/external/test.pro

@@ -29,10 +29,18 @@ core_linux {
     LIBS += -ldl
 }
 
-SOURCES += main.cpp \
-    Embed.cpp
-
 HEADERS += \
-    Embed.h
+	Embed.h \
+	test_functions.h
+
+SOURCES += \
+	Embed.cpp \
+	test_functions.cpp
+
+use_javascript_core {
+	OBJECTIVE_SOURCES += main.mm
+} else {
+	SOURCES += main.cpp
+}
 
 ADD_FILES_FOR_EMBEDDED_CLASS_HEADER(Embed.h)

DesktopEditor/doctrenderer/test/embed/external/test_functions.cpp

@@ -0,0 +1,286 @@
+#include "test_functions.h"
+
+#include <iostream>
+
+#include "embed/Default.h"
+#include "js_internal/js_base.h"
+#include "Embed.h"
+
+using namespace NSJSBase;
+
+void testMultipleContexts()
+{
+	// passing `false` when creating CJSContext means that we need to initialize it manually
+	JSSmart<CJSContext> context1 = new CJSContext(false);
+	context1->Initialize();
+
+	// while creating CJSContext without any arguments will create initialized CJSContext
+	JSSmart<CJSContext> context2 = new CJSContext;
+	// we don't need it:
+	// oContext2->Initialize();
+
+	// entering the first context
+	context1->Enter();
+	{
+		// entering the first context the second time in scope creation  - it's allowed and the scopes stack correctly
+		CJSContextScope scope(context1);
+		// allocate new local variables inside a custom local scope instead of
+		//  the one that is provided by CJSContextScope by default
+		CJSLocalScope local_scope;
+		JSSmart<CJSValue> res_local = context1->runScript("(function() { return 'Local scope test'; })();");
+		std::cout << res_local->toStringA() << std::endl;
+		// the first context is going to be exited at the end of the scope
+	}
+	// at this moment we are still inside the first context, since we have entered it twices
+	JSSmart<CJSObject> global1 = context1->GetGlobal();
+	JSSmart<CJSValue> var = context1->createString("Hel");
+	global1->set("v1", var);
+	// here `res` is set to be "Hello"
+	context1->runScript("var res = v1 + 'lo'");
+	// exit from the first context
+	context1->Exit();
+
+	// now we are going to work with the second context
+	{
+		// enter the second context via context scope
+		CJSContextScope scope(context2);
+
+		JSSmart<CJSObject> global2 = context2->GetGlobal();
+		JSSmart<CJSValue> var = context2->createString("Wor");
+		global2->set("v1", var);
+		// `res` is "World!"
+		context2->runScript("var res = v1 + 'ld!'");
+		// the second context is going to be exited at the end of the scope
+	}
+
+	// enter the first context
+	context1->Enter();
+	// print `res` variable from the first context
+	JSSmart<CJSValue> res1 = context1->runScript("(function() { return res; })();");
+	std::string str_res1 = res1->toStringA();
+	std::cout << str_res1 << ", ";
+	// make new variable `v2` in first context
+	// important to note, that accessing previous `global1` object is undefined behaviour and can lead to crashes!
+	// that is because when we exited from the first context, every local handle inside CJSValue and CJSObject was invalidated
+	global1 = context1->GetGlobal();
+	global1->set("v2", CJSContext::createInt(42));
+
+	// enter from the second context (notice, we haven't exited the first context before)
+	context2->Enter();
+	// print `res` variable from the second context
+	JSSmart<CJSValue> res2 = context1->runScript("(function() { return res; })();");
+	std::string str_res2 = res2->toStringA();
+	std::cout << str_res2 << std::endl;
+
+	// exit from the second context
+	context2->Exit();
+
+	// at this moment we are still in the first context
+	// we can validate that accessing `v2` variable, which exists only in the first context
+	global1 = context1->GetGlobal();
+	std::cout << global1->get("v2")->toInt32() << std::endl;
+	// exit from the first context
+	context1->Exit();
+
+	// manual disposing is not necessary, since it's going to be called in CJSContext's destructor anyway
+	// so we don't need to explicitly write:
+	// oContext1->Dispose();
+
+	// but still nothing wrong will happen if we do:
+	context2->Dispose();
+}
+
+void testEmbedExternal()
+{
+	JSSmart<CJSContext> context = new CJSContext();
+
+	// Embedding
+	CJSContextScope scope(context);
+	CJSContext::Embed<CTestEmbed>();
+
+	JSSmart<CJSValue> res1 = context->runScript("(function() { let value = CreateEmbedObject('CTestEmbed'); let ret = value.FunctionSum(10, 5); FreeEmbedObject(value); return ret; })();");
+	std::cout << "FunctionSum(10, 5) = " << res1->toInt32() << std::endl;
+
+	JSSmart<CJSValue> res2 = context->runScript("(function() { let value = CreateEmbedObject('CTestEmbed'); let ret = value.FunctionSquare(4); FreeEmbedObject(value); return ret; })();");
+	std::cout << "FunctionSquare(4) = " << res2->toInt32() << std::endl;
+
+	JSSmart<CJSValue> res3 = context->runScript("(function() { let value = CreateEmbedObject('CTestEmbed'); let ret = value.FunctionDel(30, 3); FreeEmbedObject(value); return ret; })();");
+	std::cout << "FunctionDel(30, 3) = " << res3->toInt32() << std::endl;
+
+	JSSmart<CJSValue> res4 = context->runScript("(function() { let value = CreateEmbedObject('CTestEmbed'); let ret = value.FunctionGet(); FreeEmbedObject(value); return ret; })();");
+	std::cout << "FunctionGet() = " << res4->toInt32() << std::endl;
+}
+
+void testEmbedInternal()
+{
+	// create both contexts
+	JSSmart<CJSContext> context1 = new CJSContext();
+	JSSmart<CJSContext> context2 = new CJSContext();
+
+	// work with the first context
+	context1->Enter();
+	// create embedding info for internally embedded objects (CZipEmbed is the one of them)
+	CreateDefaults();
+	context1->runScript(
+		"var oZip = CreateEmbedObject('CZipEmbed');\n"
+		"var files = oZip.open('" CURR_DIR "');\n"
+		"oZip.close();"
+	);
+	context1->Exit();
+
+	// work with the second context via context scope
+	{
+		CJSContextScope scope(context2);
+		// function CJSContext::Embed() is context-independent, so we don't actually need to call it in another context
+		// CreateDefaults();
+		context2->runScript(
+			"var oZip = CreateEmbedObject('CZipEmbed');\n"
+			"var files = oZip.open('" CURR_DIR "/../../../embed');\n"
+			"oZip.close();"
+		);
+	}
+
+	// print the files from the first context
+	context1->Enter();
+	JSSmart<CJSObject> global1 = context1->GetGlobal();
+	JSSmart<CJSArray> file_list1 = global1->get("files")->toArray();
+	std::cout << "\nRESULT FROM CONTEXT 1:\n";
+	for (int i = 0; i < file_list1->getCount(); i++)
+	{
+		std::cout << file_list1->get(i)->toStringA() << std::endl;
+	}
+
+	// print the files from the second result (note, we haven't exited the first context before)
+	context2->Enter();
+	JSSmart<CJSObject> global2 = context2->GetGlobal();
+	JSSmart<CJSArray> file_list2 = global2->get("files")->toArray();
+	std::cout << "\nRESULT FROM CONTEXT 2:\n";
+	for (int i = 0; i < file_list2->getCount(); i++)
+	{
+		std::cout << file_list2->get(i)->toStringA() << std::endl;
+	}
+
+	// exit the contexts in reverse order
+	context2->Exit();
+	context1->Exit();
+}
+
+void testHashEmbed()
+{
+	JSSmart<CJSContext> context = new CJSContext();
+
+	// test hash()
+	CJSContextScope scope(context);
+	CreateDefaults();
+	context->runScript(
+		"var oHash = CreateEmbedObject('CHashEmbed');\n"
+		"var str = 'test';\n"
+		"var hash = oHash.hash(str, str.length, 0);"
+	);
+
+	JSSmart<CJSObject> global = context->GetGlobal();
+	JSSmart<CJSTypedArray> res_hash = global->get("hash")->toTypedArray();
+	std::cout << "\nRESULTED HASH:\n";
+	for (int i = 0; i < res_hash->getCount(); i++)
+	{
+		std::cout << std::hex << static_cast<unsigned>(res_hash->getData().Data[i]);
+	}
+	std::cout << std::endl;
+
+	// test hash2()
+	context->runScript(
+		"var str2 = 'test';\n"
+		"var hash2 = oHash.hash2(str2, 'yrGivlyCImiWnryRee1OJw==', 100000, 7);"
+	);
+
+	JSSmart<CJSTypedArray> res_hash2 = global->get("hash2")->toTypedArray();
+	std::cout << "\nRESULTED HASH2:\n";
+	for (int i = 0; i < res_hash2->getCount(); i++)
+	{
+		std::cout << std::hex << static_cast<unsigned>(res_hash2->getData().Data[i]);
+	}
+	std::cout << std::endl;
+}
+
+void testEmbedMixed()
+{
+	JSSmart<CJSContext> context = new CJSContext();
+	CJSContextScope scope(context);
+
+
+	// --- test external embedding with CTestEmbed ---
+	// embed with `false` - means we are not able to create the object directly from JavaScript.
+	CJSContext::Embed<CTestEmbed>(false);
+
+	// example of incorrect usage:
+	JSSmart<CJSValue> res1 = context->runScript("(function() { var value = CreateEmbedObject('CTestEmbed'); return value.FunctionSum(10, 5); })();");
+	if (res1->isNumber())
+	{
+		// this wouldn't print anything, since `res1` not a number - embedded object was not created in JS and exception was thrown.
+		std::cout << "FunctionSum(10, 5) = " << res1->toInt32() << std::endl;
+	}
+
+	// example of correct usage:
+	JSSmart<CJSObject> embedded_object = CJSContext::createEmbedObject("CTestEmbed");
+	JSSmart<CJSValue> args2[1];
+	args2[0] = CJSContext::createInt(4);
+	JSSmart<CJSValue> res2 = embedded_object->call_func("FunctionSquare", 1, args2);
+	if (res2->isNumber())
+	{
+		// should print: "FunctionSquare(4) = 16"
+		std::cout << "FunctionSquare(4) = " << res2->toInt32() << std::endl;
+	}
+
+	// another example of correct usage:
+	JSSmart<CJSValue> args3[2];
+	args3[0] = CJSContext::createInt(30);
+	args3[1] = CJSContext::createInt(3);
+	JSSmart<CJSValue> oResTestEmbed3 = embedded_object->call_func("FunctionDel", 2, args3);
+	if (oResTestEmbed3->isNumber())
+	{
+		// should print: "FunctionDel(30, 3) = 10"
+		std::cout << "FunctionDel(30, 3) = " << oResTestEmbed3->toInt32() << std::endl;
+	}
+
+	// another example of incorrect usage:
+	JSSmart<CJSValue> oResTestEmbed4 = context->runScript("(function() { var value = CreateEmbedObject('CTestEmbed'); return value.FunctionGet(); })();");
+	if (oResTestEmbed4->isNumber())
+	{
+		// again, this won't be executed and nothing will be printed
+		std::cout << "FunctionGet() = " << oResTestEmbed4->toInt32() << std::endl;
+	}
+
+
+	// --- test internal embedding with CHashEmbed ---
+	CreateDefaults();
+	context->runScript(
+		"var oHash = CreateEmbedObject('CHashEmbed');\n"
+		"var str = 'test';\n"
+		"var hash = oHash.hash(str, str.length, 0);"
+	);
+	// print hash
+	JSSmart<CJSObject> global = context->GetGlobal();
+	JSSmart<CJSTypedArray> hash = global->get("hash")->toTypedArray();
+	std::cout << "\nRESULTED HASH:\n";
+	for (int i = 0; i < hash->getCount(); i++)
+	{
+		std::cout << std::hex << static_cast<unsigned>(hash->getData().Data[i]);
+	}
+	std::cout << std::endl;
+
+
+	// --- test internal embedding with CZipEmbed ---
+	context->runScript(
+		"var oZip = CreateEmbedObject('CZipEmbed');\n"
+		"var files = oZip.open('" CURR_DIR "');\n"
+		"oZip.close();"
+	);
+
+	// print files
+	JSSmart<CJSArray> file_list = global->get("files")->toArray();
+	std::cout << "\nFILES IN CURRENT DIRECTORY:\n";
+	for (int i = 0; i < file_list->getCount(); i++)
+	{
+		std::cout << file_list->get(i)->toStringA() << std::endl;
+	}
+}

DesktopEditor/doctrenderer/test/embed/external/test_functions.h

@@ -0,0 +1,34 @@
+#ifndef TEST_FUNCTIONS_H_
+#define TEST_FUNCTIONS_H_
+
+
+/**
+ * NOTE: V8 ONLY!
+ * The function tests the work of two CJSContexts in one thread.
+ * Current working context is managed with Enter() and Exit() functions, or with CJSContextScope.
+ */
+void testMultipleContexts();
+
+/**
+ * The function tests external embedding functionality by embedding CTestEmbed class.
+ */
+void testEmbedExternal();
+
+/**
+ * NOTE: V8 ONLY!
+ * The function tests internal embedding functionality by using CZipEmbed class.
+ * It also shows how embedding works for two CJSContext in the same thread (similar to testMultipleContexts()).
+ */
+void testEmbedInternal();
+
+/**
+ * The function tests CHashEmbed class that is embedded internally.
+ */
+void testHashEmbed();
+
+/**
+ * The function tests both internal and external embedding in a more complicated way.
+ */
+void testEmbedMixed();
+
+#endif // TEST_FUNCTIONS_H_

DesktopEditor/graphics/BooleanOperations.cpp

@@ -1020,22 +1020,39 @@ void CBooleanOperations::TracePaths()
 {
 	size_t length = Segments1.size();
 	Result.StartFigure();
+	bool first_start = true;
 	for (size_t i = 0; i < length + Segments2.size(); i++)
 	{
 		Segment s = i >= length ? Segments2[i - length] : Segments1[i];
 		bool valid = s.IsValid(Op),
-			start = true;
+			 start = true;
+		PointD start_point;
 		while (valid)
 		{
 			if (!start || (Op == Intersection && s.Inters && !GetNextSegment(s).Inters))
 				SetVisited(s);
 
-			if (start)
+			if (first_start)
+			{
 				Result.MoveTo(s.P.X, s.P.Y);
+				start_point = s.P;
+			}
+			else if (start)
+			{
+				double x, y;
+				Result.GetLastPoint(x, y);
+				if (isZero(start_point.X - x) && isZero(start_point.Y - y))
+				{
+					Result.MoveTo(s.P.X, s.P.Y);
+					start_point = s.P;
+				}
+				else
+					Result.LineTo(s.P.X, s.P.Y);
+			}
 			else if (s.IsCurve)
 				Result.CurveTo(s.HI.X + s.P.X, s.HI.Y + s.P.Y,
-								s.HO.X + s.P.X, s.HO.Y + s.P.Y,
-								s.P.X, s.P.Y);
+							   s.HO.X + s.P.X, s.HO.Y + s.P.Y,
+							   s.P.X, s.P.Y);
 			else
 				Result.LineTo(s.P.X, s.P.Y);
 
@@ -1065,6 +1082,9 @@ void CBooleanOperations::TracePaths()
 
 			if (start)
 				start = false;
+
+			if (first_start)
+				first_start = false;
 		}
 
 		if (!start && AllOverlap()) break;
@@ -1645,12 +1665,14 @@ int CBooleanOperations::CheckInters(const PointD& point, const Segment& segment,
 		std::vector<double> roots = curve.GetCurveLineIntersection(segment.P.X,segment.P.Y, point.X - segment.P.X, point.Y - segment.P.Y);
 		Curve line(segment, Segment(point));
 
-		int count = 0;
-		for (const auto& r : roots)
-			if (line.GetTimeOf(curve.GetPoint(r)) != -1)
-				count++;
+		return roots.size() % 2;
 
-		return count;
+		// int count = 0;
+		// for (const auto& r : roots)
+		// 	if (line.GetTimeOf(curve.GetPoint(r)) != -1)
+		// 		count++;
+
+		// return count;
 	}
 	return 0;
 }

DesktopEditor/graphics/GraphicsPath.cpp

@@ -863,20 +863,22 @@ namespace Aggplus
 
 	double CGraphicsPath::GetArea(unsigned idx, bool isCurve) const noexcept
 	{
-		float area;
+		double area;
 		if (isCurve)
 		{
 			std::vector<PointD> points = GetPoints(idx, 4);
-			area = 3 * ((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)
-						- points[3].X * (points[2].Y - points[0].Y / 3)) / 20;
+			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 = 4.0 * (points[1].Y * points[0].X - points[1].X * points[0].Y) / 3.0;
 		}
-
-		std::vector<PointD> points = GetPoints(idx, 2);
-		area = (points[1].Y * points[0].X - points[1].X * points[0].Y) / 20;
 
 		return area;
 	}

DesktopEditor/graphics/commands/AnnotField.cpp

@@ -214,6 +214,7 @@ int  CAnnotFieldInfo::GetFlag()      const { return m_nFlag; }
 int  CAnnotFieldInfo::GetID()        const { return m_nID; }
 int  CAnnotFieldInfo::GetAnnotFlag() const { return m_nAnnotFlag; }
 int  CAnnotFieldInfo::GetPage()      const { return m_nPage; }
+int CAnnotFieldInfo::GetCopyAP()     const { return m_nCopyAP; }
 void CAnnotFieldInfo::GetBE(BYTE& nS, double& dI) { nS = m_pBE.first; dI = m_pBE.second; }
 BYTE* CAnnotFieldInfo::GetRender(LONG& nLen)
 {
@@ -359,6 +360,8 @@ bool CAnnotFieldInfo::Read(NSOnlineOfficeBinToPdf::CBufferReader* pReader, IMeta
 	}
 	if (nFlags & (1 << 7))
 		m_wsOUserID = pReader->ReadString();
+	if (nFlags & (1 << 8))
+		m_nCopyAP = pReader->ReadInt();
 
 	if (IsMarkup())
 	{
@@ -686,6 +689,7 @@ const std::wstring& CAnnotFieldInfo::CWidgetAnnotPr::GetDV() { return m_wsDV; }
 const std::wstring& CAnnotFieldInfo::CWidgetAnnotPr::GetT()  { return m_wsT; }
 const std::wstring& CAnnotFieldInfo::CWidgetAnnotPr::GetFontName()  { return m_wsFN; }
 const std::wstring& CAnnotFieldInfo::CWidgetAnnotPr::GetFontKey()   { return m_wsFK; }
+const std::wstring& CAnnotFieldInfo::CWidgetAnnotPr::GetOMetadata() { return m_wsOMetadata; }
 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; }
@@ -886,6 +890,8 @@ void CAnnotFieldInfo::CWidgetAnnotPr::Read(NSOnlineOfficeBinToPdf::CBufferReader
 		m_nParentID = pReader->ReadInt();
 	if (nFlags & (1 << 18))
 		m_wsT = pReader->ReadString();
+	if (nFlags & (1 << 20))
+		m_wsOMetadata = pReader->ReadString();
 
 	// Action
 	int nAction = pReader->ReadInt();
@@ -982,7 +988,7 @@ void CAnnotFieldInfo::CWidgetAnnotPr::CTextWidgetPr::Read(NSOnlineOfficeBinToPdf
 		m_wsV = pReader->ReadString();
 	if (nFlags & (1 << 10))
 		m_nMaxLen = pReader->ReadInt();
-	if (nWidgetFlag & (1 << 25))
+	if (nFlags & (1 << 11))
 		m_wsRV = pReader->ReadString();
 	if (nFlags & (1 << 12))
 		m_wsAPV = pReader->ReadString();
@@ -1061,15 +1067,21 @@ CWidgetsInfo::~CWidgetsInfo()
 	for (int i = 0; i < m_arrParents.size(); ++i)
 		RELEASEOBJECT(m_arrParents[i]);
 }
-const std::vector<int>& CWidgetsInfo::GetCO() { return m_arrCO; }
+const std::vector< std::pair<int, int> >& CWidgetsInfo::GetCO() { return m_arrCO; }
 const std::vector<std::wstring>& CWidgetsInfo::GetButtonImg() { return m_arrButtonImg; }
 const std::vector<CWidgetsInfo::CParent*>& CWidgetsInfo::GetParents() { return m_arrParents; }
+void CWidgetsInfo::ChangeCO(int i, int nNum, int nGen)
+{
+	if (i < 0 || i > m_arrCO.size() - 1)
+		return;
+	m_arrCO[i] = std::make_pair(nNum, nGen);
+}
 bool CWidgetsInfo::Read(NSOnlineOfficeBinToPdf::CBufferReader* pReader, IMetafileToRenderter* pCorrector)
 {
 	int n = pReader->ReadInt();
 	m_arrCO.reserve(n);
 	for (int i = 0; i < n; ++i)
-		m_arrCO.push_back(pReader->ReadInt());
+		m_arrCO.push_back(std::make_pair(pReader->ReadInt(), -1));
 
 	n = pReader->ReadInt();
 	m_arrParents.reserve(n);
@@ -1101,6 +1113,36 @@ bool CWidgetsInfo::Read(NSOnlineOfficeBinToPdf::CBufferReader* pReader, IMetafil
 			for (int i = 0; i < n; ++i)
 				pParent->arrV.push_back(pReader->ReadString());
 		}
+		if (nFlags & (1 << 6))
+		{
+			int n = pReader->ReadInt();
+			pParent->arrOpt.reserve(n);
+			for (int i = 0; i < n; ++i)
+			{
+				std::wstring s1 = pReader->ReadString();
+				std::wstring s2 = pReader->ReadString();
+				pParent->arrOpt.push_back(std::make_pair(s1, s2));
+			}
+		}
+		if (nFlags & (1 << 7))
+			pParent->nFieldFlag = pReader->ReadInt();
+		if (nFlags & (1 << 8))
+		{
+			// Action
+			int nAction = pReader->ReadInt();
+			for (int i = 0; i < nAction; ++i)
+			{
+				std::wstring wsType = pReader->ReadString();
+				CAnnotFieldInfo::CWidgetAnnotPr::CActionWidget* pA = ReadAction(pReader);
+				if (pA)
+				{
+					pA->wsType = wsType;
+					pParent->arrAction.push_back(pA);
+				}
+			}
+		}
+		if (nFlags & (1 << 9))
+			pParent->nMaxLen = pReader->ReadInt();
 		m_arrParents.push_back(pParent);
 	}
 

DesktopEditor/graphics/commands/AnnotField.h

@@ -194,6 +194,7 @@ public:
 		const std::wstring& GetT();
 		const std::wstring& GetFontName();
 		const std::wstring& GetFontKey();
+		const std::wstring& GetOMetadata();
 		const std::vector<double>& GetTC();
 		const std::vector<double>& GetBC();
 		const std::vector<double>& GetBG();
@@ -223,6 +224,7 @@ public:
 		std::wstring m_wsT;
 		std::wstring m_wsFN;
 		std::wstring m_wsFK;
+		std::wstring m_wsOMetadata;
 		std::vector<double> m_arrTC;
 		std::vector<double> m_arrBC;
 		std::vector<double> m_arrBG;
@@ -463,6 +465,7 @@ public:
 	int   GetID()        const;
 	int   GetAnnotFlag() const;
 	int   GetPage()      const;
+	int   GetCopyAP()    const;
 	void  GetBE(BYTE& nS, double& dI);
 	BYTE* GetRender(LONG& nLen);
 	const std::wstring& GetNM();
@@ -520,6 +523,7 @@ private:
 	int          m_nID;
 	int          m_nAnnotFlag;
 	int          m_nPage;
+	int          m_nCopyAP;
 	std::wstring m_wsNM;
 	std::wstring m_wsLM;
 	std::wstring m_wsOUserID;
@@ -565,25 +569,31 @@ public:
 	{
 		int nID;
 		int nFlags;
+		int nMaxLen;
 		int nParentID;
+		int nFieldFlag;
 		std::wstring sName;
 		std::wstring sV;
 		std::wstring sDV;
 		std::vector<int> arrI;
 		std::vector<std::wstring> arrV;
+		std::vector<CAnnotFieldInfo::CWidgetAnnotPr::CActionWidget*> arrAction;
+		std::vector< std::pair<std::wstring, std::wstring> > arrOpt;
 	};
 
 	CWidgetsInfo();
 	virtual ~CWidgetsInfo();
 
-	const std::vector<int>& GetCO();
+	const std::vector< std::pair<int, int> >& GetCO();
 	const std::vector<std::wstring>& GetButtonImg();
 	const std::vector<CParent*>& GetParents();
 
+	void ChangeCO(int i, int nNum, int nGen);
+
 	bool Read(NSOnlineOfficeBinToPdf::CBufferReader* pReader, IMetafileToRenderter* pCorrector);
 
 private:
-	std::vector<int> m_arrCO;
+	std::vector< std::pair<int, int> > m_arrCO;
 	std::vector<std::wstring> m_arrButtonImg;
 	std::vector<CParent*> m_arrParents;
 };

DesktopEditor/graphics/pro/js/deploy.py

@@ -7,7 +7,7 @@ import os
 
 base.configure_common_apps()
 
-base.cmd_in_dir("./../../../../../core/Common/js", "make.py", ["./../../DesktopEditor/graphics/pro/js/drawingfile.json"])
+base.cmd_in_dir("./../../../../../core/Common/js", sys.executable, ["make.py", "./../../DesktopEditor/graphics/pro/js/drawingfile.json"])
 
 src_dir = "./deploy/"
 dst_dir = "./../../../../../sdkjs/pdf/src/engine/"

DesktopEditor/graphics/pro/js/drawingfile.json

@@ -51,6 +51,9 @@
 		"_IsNeedCMap",
 		"_SetCMapData",
 		"_ScanPage",
+		"_SplitPages",
+		"_MergePages",
+		"_UnmergePages",
 		"_GetImageBase64",
 		"_GetImageBase64Len",
 		"_GetImageBase64Ptr",
@@ -67,6 +70,7 @@
 		"../../../../PdfFile/lib/goo", "../../../../PdfFile/lib/fofi", "../../../../PdfFile/lib/splash", "../../../../PdfFile/lib", 
 		"../../../raster/Jp2/openjpeg", "../../../raster/Jp2/openjpeg/openjpeg-2.4.0/src/lib/openjp2", 
 		"../../../../Common/3dParty/openssl/openssl/include", 
+		"../../../../Common/3dParty/openssl/build/linux_64/include", 
 		"../../../../DocxRenderer"
 	],
 	"define": [
@@ -86,7 +90,7 @@
 		"NO_CONSOLE_IO", "USE_EXTERNAL_JPEG2000", "USE_JPIP", "OPJ_STATIC", "FONT_ENGINE_DISABLE_FILESYSTEM",
 		"IMAGE_CHECKER_DISABLE_XML",
 		"USE_OPENSSL_HASH",
-		"DISABLE_FULL_DOCUMENT_CREATION", "DISABLE_FILESYSTEM"
+		"DISABLE_FULL_DOCUMENT_CREATION", "DISABLE_FILESYSTEM", "CRYPTOPP_DISABLE_ASM", "DISABLE_TYPE_MISMATCH"
 	],
 	"compile_files_array": [
 	{
@@ -135,7 +139,7 @@
 	},
 	{
 		"folder": "./wasm/src/",
-		"files": ["lib/wasm_jmp.cpp", "drawingfile.cpp", "metafile.cpp", "pdfwriter.cpp", "HTMLRendererText.cpp"]
+		"files": ["lib/wasm_jmp.cpp", "drawingfile.cpp", "metafile.cpp", "HTMLRendererText.cpp"]
 	},
 	{
 		"folder": "freetype-2.10.4/src/",
@@ -143,7 +147,7 @@
 	},
 	{
 		"folder": "../../",
-		"files": ["GraphicsRenderer.cpp", "pro/pro_Graphics.cpp", "pro/pro_Fonts.cpp", "pro/pro_Image.cpp", "Graphics.cpp", "Brush.cpp", "BaseThread.cpp", "GraphicsPath.cpp", "BooleanOperations.cpp", "Image.cpp", "Matrix.cpp", "Clip.cpp", "TemporaryCS.cpp", "AlphaMask.cpp", "GraphicsLayer.cpp", "commands/DocInfo.cpp", "commands/AnnotField.cpp", "commands/FormField.cpp"]
+		"files": ["GraphicsRenderer.cpp", "pro/pro_Graphics.cpp", "pro/pro_Fonts.cpp", "pro/pro_Image.cpp", "Graphics.cpp", "Brush.cpp", "BaseThread.cpp", "GraphicsPath.cpp", "BooleanOperations.cpp", "Image.cpp", "Matrix.cpp", "Clip.cpp", "TemporaryCS.cpp", "AlphaMask.cpp", "GraphicsLayer.cpp", "commands/DocInfo.cpp", "commands/AnnotField.cpp", "commands/FormField.cpp", "MetafileToRenderer.cpp", "MetafileToRendererReader.cpp"]
 	},
 	{
 		"folder": "../../../fontengine/",
@@ -155,12 +159,16 @@
 	},
 	{
 		"folder": "../../../common/",
-		"files": ["File.cpp", "Directory.cpp", "ByteBuilder.cpp", "Base64.cpp", "StringExt.cpp", "Path.cpp"]
+		"files": ["File.cpp", "Directory.cpp", "ByteBuilder.cpp", "Base64.cpp", "StringExt.cpp", "Path.cpp", "SystemUtils.cpp"]
 	},
 	{
 		"folder": "../../../../Common/3dParty/icu/icu/source/common/",
 		"files": ["ucnv.c", "ustr_wcs.cpp", "ucnv_err.c", "ucnv_bld.cpp", "ustrtrns.cpp", "ucnv_cb.c", "udata.cpp", "ucnv_io.cpp", "uhash.c", "udatamem.c", "cmemory.c", "ustring.cpp", "umutex.cpp", "putil.cpp", "ustr_cnv.cpp", "ucnvmbcs.cpp", "ucnvlat1.c", "ucnv_u16.c", "ucnv_u8.c", "ucnv_u32.c", "ucnv_u7.c", "ucln_cmn.cpp", "ucnv2022.cpp", "ucnv_lmb.c", "ucnvhz.c", "ucnvscsu.c", "ucnvisci.c", "ucnvbocu.cpp", "ucnv_ct.c", "ucnv_cnv.c", "stringpiece.cpp", "charstr.cpp", "umapfile.c", "ucmndata.c", "ucnv_ext.cpp", "uobject.cpp", "umath.c", "ubidi_props.c", "uchar.c", "uinvchar.c", "usprep.cpp", "unistr.cpp", "uniset_props.cpp", "loadednormalizer2impl.cpp", "filterednormalizer2.cpp", "utrie2.cpp", "normalizer2.cpp", "normalizer2impl.cpp", "utrie.cpp", "ucase.cpp", "uniset.cpp", "ruleiter.cpp", "parsepos.cpp", "util.cpp", "uprops.cpp", "uvector.cpp", "unames.cpp", "propname.cpp", "utrie2_builder.cpp", "unifunct.cpp", "bmpset.cpp", "unisetspan.cpp", "unifilt.cpp", "patternprops.cpp", "utf_impl.c", "ustrcase.cpp", "cstring.c", "bytestrie.cpp"]
 	},
+	{
+		"folder": "../../../../Common/3dParty/cryptopp/",
+		"files": ["cryptlib.cpp", "cpu.cpp", "integer.cpp", "3way.cpp", "adler32.cpp", "algebra.cpp", "algparam.cpp", "allocate.cpp", "arc4.cpp", "aria.cpp", "aria_simd.cpp", "ariatab.cpp", "asn.cpp", "authenc.cpp", "base32.cpp", "base64.cpp", "basecode.cpp", "bfinit.cpp", "blake2.cpp", "blake2s_simd.cpp", "blake2b_simd.cpp", "blowfish.cpp", "blumshub.cpp", "camellia.cpp", "cast.cpp", "casts.cpp", "cbcmac.cpp", "ccm.cpp", "chacha.cpp", "chacha_simd.cpp", "chacha_avx.cpp", "chachapoly.cpp", "cham.cpp", "cham_simd.cpp", "channels.cpp", "cmac.cpp", "crc.cpp", "crc_simd.cpp", "darn.cpp", "default.cpp", "des.cpp", "dessp.cpp", "dh.cpp", "dh2.cpp", "dll.cpp", "donna_32.cpp", "donna_64.cpp", "donna_sse.cpp", "dsa.cpp", "eax.cpp", "ec2n.cpp", "ecp.cpp", "eccrypto.cpp", "eprecomp.cpp", "elgamal.cpp", "emsa2.cpp", "eprecomp.cpp", "esign.cpp", "files.cpp", "filters.cpp", "fips140.cpp", "gcm.cpp", "gcm_simd.cpp", "gf256.cpp", "gf2_32.cpp", "gf2n.cpp", "gf2n_simd.cpp", "gfpcrypt.cpp", "gost.cpp", "gzip.cpp", "hc128.cpp", "hc256.cpp", "hex.cpp", "hight.cpp", "hmac.cpp", "hrtimer.cpp", "ida.cpp", "idea.cpp", "iterhash.cpp", "kalyna.cpp", "md5.cpp", "randpool.cpp", "osrng.cpp", "rijndael.cpp", "modes.cpp", "misc.cpp", "rdtables.cpp", "sha.cpp", "mqueue.cpp", "queue.cpp"]
+	},
 	{
 		"folder": "../../../../OfficeUtils/src/",
 		"files": ["OfficeUtils.cpp", "ZipBuffer.cpp", "ZipUtilsCP.cpp", "zlib_addon.c"]
@@ -179,7 +187,23 @@
 	},
 	{
 		"folder": "../../../../PdfFile/",
-		"files": ["SrcReader/Adaptors.cpp", "SrcReader/GfxClip.cpp", "SrcReader/RendererOutputDev.cpp", "SrcReader/JPXStream2.cpp", "SrcReader/PdfAnnot.cpp", "Resources/BaseFonts.cpp", "Resources/CMapMemory/cmap_memory.cpp", "lib/fofi/FofiBase.cc", "lib/fofi/FofiEncodings.cc", "lib/fofi/FofiIdentifier.cc", "lib/fofi/FofiTrueType.cc", "lib/fofi/FofiType1.cc", "lib/fofi/FofiType1C.cc", "lib/goo/FixedPoint.cc", "lib/goo/gfile.cc", "lib/goo/GHash.cc", "lib/goo/GList.cc", "lib/goo/gmem.cc", "lib/goo/gmempp.cc", "lib/goo/GString.cc", "lib/goo/parseargs.c", "lib/goo/Trace.cc", "lib/splash/Splash.cc", "lib/splash/SplashBitmap.cc", "lib/splash/SplashClip.cc", "lib/splash/SplashFont.cc", "lib/splash/SplashFontEngine.cc", "lib/splash/SplashFontFile.cc", "lib/splash/SplashFontFileID.cc", "lib/splash/SplashFTFont.cc", "lib/splash/SplashFTFontEngine.cc", "lib/splash/SplashFTFontFile.cc", "lib/splash/SplashPath.cc", "lib/splash/SplashPattern.cc", "lib/splash/SplashScreen.cc", "lib/splash/SplashState.cc", "lib/splash/SplashXPath.cc", "lib/splash/SplashXPathScanner.cc", "lib/xpdf/AcroForm.cc", "lib/xpdf/Annot.cc", "lib/xpdf/Array.cc", "lib/xpdf/BuiltinFont.cc", "lib/xpdf/BuiltinFontTables.cc", "lib/xpdf/Catalog.cc", "lib/xpdf/CharCodeToUnicode.cc", "lib/xpdf/CMap.cc", "lib/xpdf/Decrypt.cc", "lib/xpdf/Dict.cc", "lib/xpdf/DisplayState.cc", "lib/xpdf/Error.cc", "lib/xpdf/FontEncodingTables.cc", "lib/xpdf/Function.cc", "lib/xpdf/Gfx.cc", "lib/xpdf/GfxFont.cc", "lib/xpdf/GfxState.cc", "lib/xpdf/GlobalParams.cc", "lib/xpdf/ImageOutputDev.cc", "lib/xpdf/JArithmeticDecoder.cc", "lib/xpdf/JBIG2Stream.cc", "lib/xpdf/JPXStream.cc", "lib/xpdf/Lexer.cc", "lib/xpdf/Link.cc", "lib/xpdf/NameToCharCode.cc", "lib/xpdf/Object.cc", "lib/xpdf/OptionalContent.cc", "lib/xpdf/Outline.cc", "lib/xpdf/OutputDev.cc", "lib/xpdf/Page.cc", "lib/xpdf/Parser.cc", "lib/xpdf/PDF417Barcode.cc", "lib/xpdf/PDFCore.cc", "lib/xpdf/PDFDoc.cc", "lib/xpdf/PDFDocEncoding.cc", "lib/xpdf/PreScanOutputDev.cc", "lib/xpdf/PSOutputDev.cc", "lib/xpdf/PSTokenizer.cc", "lib/xpdf/SecurityHandler.cc", "lib/xpdf/ShadingImage.cc", "lib/xpdf/SplashOutputDev.cc", "lib/xpdf/Stream.cc", "lib/xpdf/TextOutputDev.cc", "lib/xpdf/TextString.cc", "lib/xpdf/TileCache.cc", "lib/xpdf/TileCompositor.cc", "lib/xpdf/TileMap.cc", "lib/xpdf/UnicodeMap.cc", "lib/xpdf/UnicodeRemapping.cc", "lib/xpdf/UnicodeTypeTable.cc", "lib/xpdf/UTF8.cc", "lib/xpdf/WebFont.cc", "lib/xpdf/XFAScanner.cc", "lib/xpdf/XRef.cc", "lib/xpdf/Zoox.cc", "PdfFile.cpp", "PdfReader.cpp"]
+		"files": ["PdfFile.cpp", "PdfReader.cpp", "PdfWriter.cpp", "PdfEditor.cpp", "OnlineOfficeBinToPdf.cpp"]
+	},
+	{
+		"folder": "../../../../PdfFile/SrcReader/",
+		"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", "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/",
+		"files": ["BaseFonts.cpp", "CMapMemory/cmap_memory.cpp"]
+	},
+	{
+		"folder": "../../../../PdfFile/lib/",
+		"files": ["fofi/FoFiBase.cc", "fofi/FoFiEncodings.cc", "fofi/FoFiIdentifier.cc", "fofi/FoFiTrueType.cc", "fofi/FoFiType1.cc", "fofi/FoFiType1C.cc", "goo/FixedPoint.cc", "goo/gfile.cc", "goo/GHash.cc", "goo/GList.cc", "goo/gmem.cc", "goo/gmempp.cc", "goo/GString.cc", "goo/parseargs.c", "goo/Trace.cc", "splash/Splash.cc", "splash/SplashBitmap.cc", "splash/SplashClip.cc", "splash/SplashFont.cc", "splash/SplashFontEngine.cc", "splash/SplashFontFile.cc", "splash/SplashFontFileID.cc", "splash/SplashFTFont.cc", "splash/SplashFTFontEngine.cc", "splash/SplashFTFontFile.cc", "splash/SplashPath.cc", "splash/SplashPattern.cc", "splash/SplashScreen.cc", "splash/SplashState.cc", "splash/SplashXPath.cc", "splash/SplashXPathScanner.cc", "xpdf/AcroForm.cc", "xpdf/Annot.cc", "xpdf/Array.cc", "xpdf/BuiltinFont.cc", "xpdf/BuiltinFontTables.cc", "xpdf/Catalog.cc", "xpdf/CharCodeToUnicode.cc", "xpdf/CMap.cc", "xpdf/Decrypt.cc", "xpdf/Dict.cc", "xpdf/DisplayState.cc", "xpdf/Error.cc", "xpdf/FontEncodingTables.cc", "xpdf/Function.cc", "xpdf/Gfx.cc", "xpdf/GfxFont.cc", "xpdf/GfxState.cc", "xpdf/GlobalParams.cc", "xpdf/ImageOutputDev.cc", "xpdf/JArithmeticDecoder.cc", "xpdf/JBIG2Stream.cc", "xpdf/JPXStream.cc", "xpdf/Lexer.cc", "xpdf/Link.cc", "xpdf/NameToCharCode.cc", "xpdf/Object.cc", "xpdf/OptionalContent.cc", "xpdf/Outline.cc", "xpdf/OutputDev.cc", "xpdf/Page.cc", "xpdf/Parser.cc", "xpdf/PDF417Barcode.cc", "xpdf/PDFCore.cc", "xpdf/PDFDoc.cc", "xpdf/PDFDocEncoding.cc", "xpdf/PreScanOutputDev.cc", "xpdf/PSOutputDev.cc", "xpdf/PSTokenizer.cc", "xpdf/SecurityHandler.cc", "xpdf/ShadingImage.cc", "xpdf/SplashOutputDev.cc", "xpdf/Stream.cc", "xpdf/TextOutputDev.cc", "xpdf/TextString.cc", "xpdf/TileCache.cc", "xpdf/TileCompositor.cc", "xpdf/TileMap.cc", "xpdf/UnicodeMap.cc", "xpdf/UnicodeRemapping.cc", "xpdf/UnicodeTypeTable.cc", "xpdf/UTF8.cc", "xpdf/WebFont.cc", "xpdf/XFAScanner.cc", "xpdf/XRef.cc", "xpdf/Zoox.cc"]
 	},
 	{
 		"folder": "../../../raster/Jp2/openjpeg/openjpeg-2.4.0/src/lib/openjp2/",

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

@@ -619,10 +619,7 @@ INCLUDEPATH += \
 	$$PDF_ROOT_DIR/lib/splash \
 	$$PDF_ROOT_DIR/lib
 
-HEADERS += \
-	$$PDF_ROOT_DIR/lib/aconf.h \
-	$$$files($$PDF_ROOT_DIR/lib/*.h)
-
+HEADERS += $$files($$PDF_ROOT_DIR/lib/*.h, true)
 SOURCES += $$files($$PDF_ROOT_DIR/lib/*.c, true)
 SOURCES += $$files($$PDF_ROOT_DIR/lib/*.cc, true)
 
@@ -644,9 +641,7 @@ SOURCES += \
 	$$PDF_ROOT_DIR/SrcReader/GfxClip.cpp \
 	$$PDF_ROOT_DIR/SrcReader/PdfAnnot.cpp \
 	$$PDF_ROOT_DIR/Resources/BaseFonts.cpp \
-	$$PDF_ROOT_DIR/Resources/CMapMemory/cmap_memory.cpp \
-	$$PDF_ROOT_DIR/PdfReader.cpp \
-	$$PDF_ROOT_DIR/PdfFile.cpp
+	$$PDF_ROOT_DIR/Resources/CMapMemory/cmap_memory.cpp
 
 HEADERS +=\
 	$$PDF_ROOT_DIR/Resources/Fontd050000l.h \
@@ -670,9 +665,87 @@ HEADERS +=\
 	$$PDF_ROOT_DIR/SrcReader/MemoryUtils.h \
 	$$PDF_ROOT_DIR/SrcReader/GfxClip.h \
 	$$PDF_ROOT_DIR/SrcReader/FontsWasm.h \
-	$$PDF_ROOT_DIR/SrcReader/PdfAnnot.h \
+	$$PDF_ROOT_DIR/SrcReader/PdfAnnot.h
+
+DEFINES += CRYPTOPP_DISABLE_ASM
+LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lCryptoPPLib
+
+# PdfWriter
+HEADERS += \
+	$$PDF_ROOT_DIR/SrcWriter/AcroForm.h \
+	$$PDF_ROOT_DIR/SrcWriter/Annotation.h \
+	$$PDF_ROOT_DIR/SrcWriter/Catalog.h \
+	$$PDF_ROOT_DIR/SrcWriter/Consts.h \
+	$$PDF_ROOT_DIR/SrcWriter/Destination.h \
+	$$PDF_ROOT_DIR/SrcWriter/Document.h \
+	$$PDF_ROOT_DIR/SrcWriter/Encodings.h \
+	$$PDF_ROOT_DIR/SrcWriter/Encrypt.h \
+	$$PDF_ROOT_DIR/SrcWriter/EncryptDictionary.h \
+	$$PDF_ROOT_DIR/SrcWriter/Field.h \
+	$$PDF_ROOT_DIR/SrcWriter/Font.h \
+	$$PDF_ROOT_DIR/SrcWriter/Font14.h \
+	$$PDF_ROOT_DIR/SrcWriter/FontCidTT.h \
+	$$PDF_ROOT_DIR/SrcWriter/FontTT.h \
+	$$PDF_ROOT_DIR/SrcWriter/FontTTWriter.h \
+	$$PDF_ROOT_DIR/SrcWriter/GState.h \
+	$$PDF_ROOT_DIR/SrcWriter/Image.h \
+	$$PDF_ROOT_DIR/SrcWriter/Info.h \
+	$$PDF_ROOT_DIR/SrcWriter/Objects.h \
+	$$PDF_ROOT_DIR/SrcWriter/Outline.h \
+	$$PDF_ROOT_DIR/SrcWriter/Pages.h \
+	$$PDF_ROOT_DIR/SrcWriter/Pattern.h \
+	$$PDF_ROOT_DIR/SrcWriter/ResourcesDictionary.h \
+	$$PDF_ROOT_DIR/SrcWriter/Shading.h \
+	$$PDF_ROOT_DIR/SrcWriter/Streams.h \
+	$$PDF_ROOT_DIR/SrcWriter/Types.h \
+	$$PDF_ROOT_DIR/SrcWriter/Utils.h \
+	$$PDF_ROOT_DIR/SrcWriter/Metadata.h \
+	$$PDF_ROOT_DIR/SrcWriter/ICCProfile.h \
+	$$PDF_ROOT_DIR/SrcWriter/States.h
+
+SOURCES += \
+	$$PDF_ROOT_DIR/SrcWriter/AcroForm.cpp \
+	$$PDF_ROOT_DIR/SrcWriter/Annotation.cpp \
+	$$PDF_ROOT_DIR/SrcWriter/Catalog.cpp \
+	$$PDF_ROOT_DIR/SrcWriter/Destination.cpp \
+	$$PDF_ROOT_DIR/SrcWriter/Document.cpp \
+	$$PDF_ROOT_DIR/SrcWriter/Encrypt.cpp \
+	$$PDF_ROOT_DIR/SrcWriter/EncryptDictionary.cpp \
+	$$PDF_ROOT_DIR/SrcWriter/Field.cpp \
+	$$PDF_ROOT_DIR/SrcWriter/Font.cpp \
+	$$PDF_ROOT_DIR/SrcWriter/Font14.cpp \
+	$$PDF_ROOT_DIR/SrcWriter/FontCidTT.cpp \
+	$$PDF_ROOT_DIR/SrcWriter/FontTT.cpp \
+	$$PDF_ROOT_DIR/SrcWriter/FontTTWriter.cpp \
+	$$PDF_ROOT_DIR/SrcWriter/GState.cpp \
+	$$PDF_ROOT_DIR/SrcWriter/Image.cpp \
+	$$PDF_ROOT_DIR/SrcWriter/Info.cpp \
+	$$PDF_ROOT_DIR/SrcWriter/Objects.cpp \
+	$$PDF_ROOT_DIR/SrcWriter/Outline.cpp \
+	$$PDF_ROOT_DIR/SrcWriter/Pages.cpp \
+	$$PDF_ROOT_DIR/SrcWriter/Pattern.cpp \
+	$$PDF_ROOT_DIR/SrcWriter/ResourcesDictionary.cpp \
+	$$PDF_ROOT_DIR/SrcWriter/Shading.cpp \
+	$$PDF_ROOT_DIR/SrcWriter/Streams.cpp \
+	$$PDF_ROOT_DIR/SrcWriter/Utils.cpp \
+	$$PDF_ROOT_DIR/SrcWriter/Metadata.cpp \
+	$$PDF_ROOT_DIR/SrcWriter/States.cpp
+
+# PdfFile
+
+HEADERS += \
+	$$PDF_ROOT_DIR/PdfFile.h \
+	$$PDF_ROOT_DIR/PdfWriter.h \
 	$$PDF_ROOT_DIR/PdfReader.h \
-	$$PDF_ROOT_DIR/PdfFile.h
+	$$PDF_ROOT_DIR/PdfEditor.h \
+	$$PDF_ROOT_DIR/OnlineOfficeBinToPdf.h
+
+SOURCES += \
+	$$PDF_ROOT_DIR/PdfFile.cpp \
+	$$PDF_ROOT_DIR/PdfWriter.cpp \
+	$$PDF_ROOT_DIR/PdfReader.cpp \
+	$$PDF_ROOT_DIR/PdfEditor.cpp \
+	$$PDF_ROOT_DIR/OnlineOfficeBinToPdf.cpp
 
 # DocxRenderer
 DOCX_RENDERER_ROOT_DIR = $$CORE_ROOT_DIR/DocxRenderer
@@ -729,7 +802,6 @@ HEADERS += \
 	../wasm/src/Text.h
 
 SOURCES += \
-	../wasm/src/pdfwriter.cpp \
 	../wasm/src/HTMLRendererText.cpp \
 	../wasm/src/drawingfile.cpp \
 	../wasm/src/drawingfile_test.cpp

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

@@ -42,6 +42,19 @@ CNativePointer.prototype.free = function()
 		g_native_drawing_file["FreeWasmData"](this.ptr);
 	this.ptr = null;
 };
+CNativePointer.prototype.getMemory = function(isCopy)
+{
+	if (!this.ptr)
+		return null;
+
+	if (!isCopy)
+		return this.ptr;
+
+	let copyArray = new Uint8Array(this.ptr.length);
+	copyArray.set(this.ptr);
+
+	return copyArray;
+};
 CNativePointer.prototype.getReader = function()
 {
 	if (!this.ptr)
@@ -94,6 +107,34 @@ CFile.prototype._getError = function()
 	return g_native_drawing_file["GetErrorCode"]();
 };
 
+CFile.prototype._SplitPages = function(pages, changes)
+{
+	let dataChanges = null;
+	if (changes) 
+		dataChanges = (undefined !== changes.byteLength) ? new Uint8Array(changes) : changes;
+	g_module_pointer.ptr = g_native_drawing_file["SplitPages"](pages, dataChanges);
+	return g_module_pointer;
+};
+
+CFile.prototype._MergePages = function(buffer, maxID, prefixForm)
+{
+	if (!buffer)
+		return false;
+
+	if (!maxID)
+		maxID = 0;
+	if (!prefixForm)
+		prefixForm = "";
+
+	let data = (undefined !== buffer.byteLength) ? new Uint8Array(buffer) : buffer;
+	return g_native_drawing_file["MergePages"](data, maxID, prefixForm);
+};
+
+CFile.prototype._UndoMergePages = function()
+{
+	return g_native_drawing_file["UnmergePages"]();
+};
+
 // FONTS
 CFile.prototype._isNeedCMap = function()
 {

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

@@ -39,7 +39,7 @@ CWasmPointer.prototype.free = function()
 	Module["_free"](this.ptr);
 	this.ptr = 0;
 };
-CWasmPointer.prototype.getReader = function()
+CWasmPointer.prototype.getMemory = function(isCopy)
 {
 	if (!this.ptr)
 		return null;
@@ -59,8 +59,23 @@ CWasmPointer.prototype.getReader = function()
 	}
 
 	len -= 4;
-	let buffer = new Uint8Array(Module["HEAP8"].buffer, this.ptr + 4, len);
-	return new CBinaryReader(buffer, 0, len);
+	
+	let noCopyArray = new Uint8Array(Module["HEAP8"].buffer, this.ptr + 4, len);
+	if (!isCopy)
+		return noCopyArray;
+
+	let copyArray = new Uint8Array(len);
+	copyArray.set(noCopyArray);
+
+	return copyArray;
+};
+CWasmPointer.prototype.getReader = function()
+{
+	let noCopyArray = this.getMemory(false);
+	if (!noCopyArray)
+		return null;
+	
+	return new CBinaryReader(noCopyArray, 0, noCopyArray.length);
 };
 
 var g_module_pointer = new CWasmPointer();
@@ -112,7 +127,7 @@ CFile.prototype._closeFile = function()
 
 CFile.prototype._getType = function()
 {
-	return Module["_GetType"](this.stream, this.stream_size);
+	return Module["_GetType"](this.nativeFile);
 };
 
 CFile.prototype._getError = function()
@@ -120,6 +135,63 @@ CFile.prototype._getError = function()
 	return Module["_GetErrorCode"](this.nativeFile);
 };
 
+CFile.prototype._SplitPages = function(memoryBuffer, arrayBufferChanges)
+{
+	let changesPtr = 0;
+	let changesLen = 0;
+	if (arrayBufferChanges)
+	{
+		let changes = new Uint8Array(arrayBufferChanges);
+		changesLen = changes.length;
+		changesPtr = Module["_malloc"](changesLen);
+		Module["HEAP8"].set(changes, changesPtr);
+	}
+
+	let pointer = Module["_malloc"](memoryBuffer.length * 4);
+	Module["HEAP32"].set(memoryBuffer, pointer >> 2);
+	let ptr = Module["_SplitPages"](this.nativeFile, pointer, memoryBuffer.length, changesPtr, changesLen);
+	Module["_free"](pointer);
+	if (changesPtr)
+		Module["_free"](changesPtr);
+
+	g_module_pointer.ptr = ptr;
+	return g_module_pointer;
+};
+
+CFile.prototype._MergePages = function(buffer, maxID, prefixForm)
+{
+	if (!buffer)
+		return false;
+
+	let data = (undefined !== buffer.byteLength) ? new Uint8Array(buffer) : buffer;
+	let stream2 = Module["_malloc"](data.length);
+	Module["HEAP8"].set(data, stream2);
+
+	if (!maxID)
+		maxID = 0;
+
+	let prefixPtr = 0;
+	if (prefixForm)
+	{
+		let prefixBuf = prefixForm.toUtf8();
+		prefixPtr = Module["_malloc"](prefixBuf.length);
+		Module["HEAP8"].set(prefixBuf, prefixPtr);
+	}
+
+	let bRes = Module["_MergePages"](this.nativeFile, stream2, data.length, maxID, prefixPtr);
+	stream2 = 0; // Success or not, stream2 is either taken or freed
+
+	if (prefixPtr)
+		Module["_free"](prefixPtr);
+
+	return bRes == 1;
+};
+
+CFile.prototype._UndoMergePages = function()
+{
+	return Module["_UnmergePages"](this.nativeFile) == 1;
+};
+
 // FONTS
 CFile.prototype._isNeedCMap = function()
 {

DesktopEditor/graphics/pro/js/wasm/js/stream.js

@@ -42,6 +42,12 @@ CBinaryReader.prototype.readByte = function()
 	this.pos += 1;
 	return val;
 };
+CBinaryReader.prototype.readShort = function()
+{
+	let val = this.data[this.pos] | this.data[this.pos + 1] << 8;
+	this.pos += 2;
+	return val;
+};
 CBinaryReader.prototype.readInt = function()
 {
 	let val = this.data[this.pos] | this.data[this.pos + 1] << 8 | this.data[this.pos + 2] << 16 | this.data[this.pos + 3] << 24;
@@ -56,6 +62,10 @@ CBinaryReader.prototype.readDouble2 = function()
 {
 	return this.readInt() / 10000;
 };
+CBinaryReader.prototype.readDouble3 = function()
+{
+	return this.readInt() / 100000;
+};
 CBinaryReader.prototype.readString = function()
 {
 	let len = this.readInt();
@@ -63,9 +73,20 @@ CBinaryReader.prototype.readString = function()
 	this.pos += len;
 	return val;
 };
+CBinaryReader.prototype.readString2 = function()
+{
+	let len = this.readShort();
+	let val = "";
+	for (let i = 0; i < len; ++i)
+	{
+		let c = this.readShort();
+		val += String.fromCharCode(c);
+	}
+	return val;
+};
 CBinaryReader.prototype.readData = function()
 {
-	let len = this.readInt();
+	let len = this.readInt() - 4;
 	let val = this.data.slice(this.pos, this.pos + len);
 	this.pos += len;
 	return val;

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

@@ -68,25 +68,6 @@ WASM_EXPORT int IsFontBinaryExist(char* path)
 	return 0;
 }
 
-WASM_EXPORT int GetType(BYTE* data, LONG size)
-{
-	// 0 - PDF
-	// 1 - DJVU
-	// 2 - XPS
-	LONG nHeaderSearchSize = 1024;
-	LONG nSize = size < nHeaderSearchSize ? size : nHeaderSearchSize;
-	char* pData = (char*)data;
-	for (int i = 0; i < nSize - 5; ++i)
-	{
-		int nPDF = strncmp(&pData[i], "%PDF-", 5);
-		if (!nPDF)
-			return 0;
-	}
-	if ( (8 <= size) && (0x41 == data[0] && 0x54 == data[1] && 0x26 == data[2] && 0x54 == data[3] &&
-						 0x46 == data[4] && 0x4f == data[5] && 0x52 == data[6] && 0x4d == data[7]))
-		return 1;
-	return 2;
-}
 WASM_EXPORT CDrawingFile* Open(BYTE* data, LONG size, const char* password)
 {
 	if (!g_applicationFonts)
@@ -102,6 +83,13 @@ WASM_EXPORT CDrawingFile* Open(BYTE* data, LONG size, const char* password)
 	pFile->OpenFile(data, size, sPassword);
 	return pFile;
 }
+WASM_EXPORT int GetType(CDrawingFile* pFile)
+{
+	// 0 - PDF
+	// 1 - DJVU
+	// 2 - XPS
+	return pFile->GetType();
+}
 WASM_EXPORT int GetErrorCode(CDrawingFile* pFile)
 {
 	if (!pFile)
@@ -125,7 +113,7 @@ WASM_EXPORT BYTE* GetGlyphs(CDrawingFile* pFile, int nPageIndex)
 {
 	return pFile->GetGlyphs(nPageIndex);
 }
-WASM_EXPORT BYTE* GetLinks  (CDrawingFile* pFile, int nPageIndex)
+WASM_EXPORT BYTE* GetLinks(CDrawingFile* pFile, int nPageIndex)
 {
 	return pFile->GetLinks(nPageIndex);
 }
@@ -177,6 +165,18 @@ WASM_EXPORT BYTE* ScanPage(CDrawingFile* pFile, int nPageIndex, int mode)
 {
 	return pFile->ScanPage(nPageIndex, mode);
 }
+WASM_EXPORT BYTE* SplitPages(CDrawingFile* pFile, int* arrPageIndex, int nLength, BYTE* data, LONG size)
+{
+	return pFile->SplitPages(arrPageIndex, nLength, data, size);
+}
+WASM_EXPORT int MergePages(CDrawingFile* pFile, BYTE* data, LONG size, int nMaxID, const char* sPrefixForm)
+{
+	return pFile->MergePages(data, size, nMaxID, sPrefixForm) ? 1 : 0;
+}
+WASM_EXPORT int UnmergePages(CDrawingFile* pFile)
+{
+	return pFile->UnmergePages() ? 1 : 0;
+}
 
 WASM_EXPORT void* GetImageBase64(CDrawingFile* pFile, int rId)
 {

DesktopEditor/graphics/pro/js/wasm/src/serialize.h

@@ -2,8 +2,11 @@
 #define _WASM_SERIALIZE_H
 
 #include <vector>
+#include <stack>
 #include "../../../../../common/File.h"
 
+#define CLEAR_STACK(stack) while (!(stack).empty()) (stack).pop()
+
 namespace NSWasm
 {
 	class CData
@@ -15,6 +18,8 @@ namespace NSWasm
 		BYTE* m_pDataCur;
 		size_t m_lSizeCur;
 
+		std::stack<size_t> m_lStack;
+
 	public:
 		CData()
 		{
@@ -24,10 +29,70 @@ namespace NSWasm
 			m_pDataCur = m_pData;
 			m_lSizeCur = m_lSize;
 		}
+		CData(const CData& other)
+		{
+			m_lSize = other.m_lSize;
+			m_lSizeCur = other.m_lSizeCur;
+
+			m_pData = (BYTE*)malloc(m_lSize * sizeof(BYTE));
+			memcpy(m_pData, other.m_pData, other.m_lSizeCur * sizeof(BYTE));
+			m_pDataCur = m_pData + m_lSizeCur;
+
+			m_lStack = other.m_lStack;
+		}
+		CData(CData&& other)
+		{
+			m_lSize = other.m_lSize;
+			m_lSizeCur = other.m_lSizeCur;
+
+			m_pData = other.m_pData;
+			m_pDataCur = other.m_pDataCur;
+
+			m_lStack = std::move(other.m_lStack);
+
+			other.ClearWithoutAttack();
+		}
 		virtual ~CData()
 		{
 			Clear();
 		}
+		CData& operator= (const CData& other)
+		{
+			if (this == &other)
+				return *this;
+
+			Clear();
+
+			m_lSize = other.m_lSize;
+			m_lSizeCur = other.m_lSizeCur;
+
+			m_pData = (BYTE*)malloc(m_lSize * sizeof(BYTE));
+			memcpy(m_pData, other.m_pData, other.m_lSizeCur * sizeof(BYTE));
+			m_pDataCur = m_pData + m_lSizeCur;
+
+			m_lStack = other.m_lStack;
+
+			return *this;
+		}
+		CData& operator= (CData&& other)
+		{
+			if (this == &other)
+				return *this;
+
+			Clear();
+
+			m_lSize = other.m_lSize;
+			m_lSizeCur = other.m_lSizeCur;
+
+			m_pData = other.m_pData;
+			m_pDataCur = other.m_pDataCur;
+
+			other.ClearWithoutAttack();
+
+			m_lStack = std::move(other.m_lStack);
+
+			return *this;
+		}
 
 		inline void AddSize(size_t nSize)
 		{
@@ -68,6 +133,20 @@ namespace NSWasm
 		}
 
 	public:
+		void StartRecord(BYTE type)
+		{
+			AddSize(5); // sizeof (BYTE + unsigned int)
+			WriteBYTE(type);
+			AddInt(0);
+			m_lStack.push(m_lSizeCur);
+		}
+		void EndRecord()
+		{
+			size_t start = m_lStack.top();
+			unsigned int len = m_lSizeCur - start;
+			memcpy(m_pData + start - 4, &len, sizeof(unsigned int));
+			m_lStack.pop();
+		}
 		void AddInt(unsigned int value)
 		{
 			AddSize(4);
@@ -75,6 +154,13 @@ namespace NSWasm
 			m_pDataCur += 4;
 			m_lSizeCur += 4;
 		}
+		void AddSInt(int value)
+		{
+			AddSize(4);
+			memcpy(m_pDataCur, &value, sizeof(int));
+			m_pDataCur += 4;
+			m_lSizeCur += 4;
+		}
 		void AddInt(unsigned int value, size_t pos)
 		{
 			if (pos < m_lSizeCur)
@@ -93,6 +179,10 @@ namespace NSWasm
 			m_pDataCur += sizeof(BYTE);
 			m_lSizeCur += sizeof(BYTE);
 		}
+		void WriteBool(bool value)
+		{
+			WriteBYTE(value ? 1 : 0);
+		}
 		void WriteDouble(double value)
 		{
 			int nV = value * 10000;
@@ -151,6 +241,37 @@ namespace NSWasm
 			WriteString(pDataUtf8, (unsigned int)lDataUtf8);
 			RELEASEARRAYOBJECTS(pDataUtf8);
 		}
+		void WriteStringUtf16(const std::wstring& sStr, const bool& isBytes = false)
+		{
+			unsigned int size = static_cast<unsigned int>(sStr.length());
+
+			int len = 0;
+			size_t posLen = m_lSizeCur;
+
+			// len reserve
+			AddInt(0);
+
+			if (sizeof(wchar_t) == 4)
+			{
+				AddSize(4 * size + 2/*'\0'*/);
+				NSFile::CUtf8Converter::GetUtf16StringFromUnicode_4bytes(sStr.c_str(), (LONG)size, m_pDataCur, len, false);
+			}
+			else
+			{
+				size_t bufferLen = 2 * size;
+				AddSize(bufferLen);
+				len = (int)(bufferLen);
+				memcpy(m_pDataCur, sStr.c_str(), bufferLen);
+			}
+
+			m_pDataCur += static_cast<unsigned int>(len);
+			m_lSizeCur += static_cast<unsigned int>(len);
+
+			if (!isBytes)
+				len /= 2;
+
+			AddInt((unsigned int)len, posLen);
+		}
 		void Write(BYTE* value, unsigned int len)
 		{
 			if (!value || len == 0)
@@ -165,6 +286,13 @@ namespace NSWasm
 			return m_pData;
 		}
 
+		BYTE* MoveBuffer()
+		{
+			BYTE* pData = m_pData;
+			ClearWithoutAttack();
+			return pData;
+		}
+
 		void Clear()
 		{
 			if (m_pData)
@@ -175,6 +303,8 @@ namespace NSWasm
 
 			m_pDataCur = m_pData;
 			m_lSizeCur = 0;
+
+			CLEAR_STACK(m_lStack);
 		}
 		void ClearWithoutAttack()
 		{
@@ -183,11 +313,15 @@ namespace NSWasm
 
 			m_pDataCur = m_pData;
 			m_lSizeCur = 0;
+
+			CLEAR_STACK(m_lStack);
 		}
 		void ClearNoAttack()
 		{
 			m_pDataCur = m_pData;
 			m_lSizeCur = 0;
+
+			CLEAR_STACK(m_lStack);
 		}
 		unsigned int GetSize()
 		{

DesktopEditor/graphics/pro/officedrawingfile.h

@@ -40,6 +40,7 @@ enum OfficeDrawingFileType
     odftPDF = 0,
     odftXPS = 1,
     odftDJVU = 2,
+    odftOFD = 3,
     odftUndefined = 255
 };
 

DesktopEditor/graphics/pro/raster.pri

@@ -19,6 +19,10 @@ core_linux {
 	QMAKE_CXXFLAGS += -Wno-narrowing
 }
 
+core_linux_clang {
+    QMAKE_CFLAGS += -Wno-incompatible-function-pointer-types
+}
+
 core_mac {
 	DEFINES += HAVE_UNISTD_H HAVE_FCNTL_H
 }

DesktopEditor/graphics/shading_info.h

@@ -371,6 +371,7 @@ namespace NSStructures
 		 *
 		 * Наверное напишу адаптор который переводит порядок точек из 6 типа в общий.
 		 */
+		agg::rgba8 fill_color;
 		std::vector<std::vector<Point>> patch;
 		std::vector<std::vector<agg::rgba8>> patch_colors; // 2 на 2 цвета по углам
 		std::vector<std::vector<float>> patch_parameters; // 2 на 2 параметра
@@ -388,8 +389,8 @@ namespace NSStructures
 			xsize(1.0f), ysize(1.0f),
 			linstretch(1.0f), linoffset(0.0f),
 			continue_shading_f(false),
-			continue_shading_b(false)
-
+			continue_shading_b(false),
+			luminocity(false)
 		{
 		}
 		void setAngleDegrees(float deg)
@@ -404,6 +405,57 @@ namespace NSStructures
 		{
 			discrete_step = 1.0f / n;
 		}
+		bool checkLuminosity() const
+		{
+			if (shading.patch_colors.empty())
+				return false;
+
+			for (const auto& ar : shading.patch_colors)
+				for (const auto& c : ar)
+					if (c.r != c.g || c.g != c.b)
+						return false;
+
+			return true;
+		}
+		bool colorEqual(const agg::rgba8& c1, const agg::rgba8& c2) const
+		{
+			return	c1.r == c2.r &&
+					c1.g == c2.g &&
+					c1.b == c2.b &&
+					c1.a == c2.a;
+		}
+		bool isOneColor() const
+		{
+			switch (shading.shading_type)
+			{
+			case ShadingInfo::FunctionOnly:
+			case ShadingInfo::Parametric:
+				return false;
+			case ShadingInfo::TriangleInterpolation:
+				return	colorEqual(shading.triangle_colors[0], shading.triangle_colors[1]) &&
+						colorEqual(shading.triangle_colors[1], shading.triangle_colors[2]);
+			case ShadingInfo::CurveInterpolation:
+			case ShadingInfo::TensorCurveInterpolation:
+				return	colorEqual(shading.patch_colors[0][0], shading.patch_colors[0][1]) &&
+						colorEqual(shading.patch_colors[0][1], shading.patch_colors[1][0]) &&
+						colorEqual(shading.patch_colors[1][0], shading.patch_colors[1][1]);
+			default:
+				return false;
+			}
+		}
+		agg::rgba8 getFillColor() const
+		{
+			if (!shading.triangle_colors.empty())
+				return shading.triangle_colors[0];
+			if (!shading.patch_colors.empty())
+				return shading.patch_colors[0][0];
+			return agg::rgba8(0, 0, 0);
+		}
+		void setFillColor(const agg::rgba8& color)
+		{
+			shading.fill_color = color;
+			luminocity = true;
+		}
 		void transform(const Aggplus::CMatrix& matrix)
 		{
 			// shading transform
@@ -502,6 +554,7 @@ namespace NSStructures
 		float linstretch; // stretch linear gradient, can be negative (eq angle = 180) can not be zero
 		float linoffset;  // offset relative to image size
 		float continue_shading_b, continue_shading_f;
+		bool luminocity;
 		ShadingInfo shading;
 	};
 
@@ -643,6 +696,7 @@ namespace NSStructures
 											 const std::vector<std::vector<float>> &curve_parametrs,
 											 const std::vector<std::vector<agg::rgba8>> &curve_colors,
 											 bool parametric,
+											 bool luminosity = false,
 											 float t0 = 0.0f, float t1 = 1.0f)
 		{
 			GradientInfo ginfo;
@@ -651,6 +705,7 @@ namespace NSStructures
 
 			ginfo.shading.f_type = ShadingInfo::UseNew;
 			ginfo.shading.function = ColorFunction<agg::rgba8>(256, t0, t1);
+			ginfo.luminocity = luminosity;
 			ginfo.continue_shading_f = false;
 			ginfo.continue_shading_b = false;
 

DesktopEditor/raster/ImageFileFormatChecker.cpp

@@ -58,7 +58,7 @@ CImageFileFormatChecker::CImageFileFormatChecker()
 {
 	eFileType = _CXIMAGE_FORMAT_UNKNOWN;
 }
-CImageFileFormatChecker::CImageFileFormatChecker(std::wstring sFileName)
+CImageFileFormatChecker::CImageFileFormatChecker(const std::wstring& sFileName)
 {
 	eFileType = _CXIMAGE_FORMAT_UNKNOWN;
 	isImageFile(sFileName);
@@ -433,7 +433,7 @@ bool CImageFileFormatChecker::isPicFile(BYTE *pBuffer, DWORD dwBytes)
     return false;
 }
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-bool CImageFileFormatChecker::isImageFile(std::wstring& fileName)
+bool CImageFileFormatChecker::isImageFile(const std::wstring& fileName)
 {
 	eFileType  = _CXIMAGE_FORMAT_UNKNOWN;
 	///////////////////////////////////////////////////////////////////////////////
@@ -673,7 +673,7 @@ bool CImageFileFormatChecker::isImageFile(BYTE* buffer, DWORD sizeRead)
 	if (eFileType) return true;
 	return false;
 }
-bool CImageFileFormatChecker::isSvmFile(std::wstring & fileName)
+bool CImageFileFormatChecker::isSvmFile(const std::wstring & fileName)
 {
 	eFileType = _CXIMAGE_FORMAT_UNKNOWN;
 	////////////////////////////////////////////////////////////////////////////////
@@ -703,7 +703,7 @@ bool CImageFileFormatChecker::isSvmFile(std::wstring & fileName)
 	if (eFileType)return true;
 	else return false;
 }
-bool CImageFileFormatChecker::isPngFile(std::wstring & fileName)
+bool CImageFileFormatChecker::isPngFile(const std::wstring & fileName)
 {
 	eFileType = _CXIMAGE_FORMAT_UNKNOWN;
 	////////////////////////////////////////////////////////////////////////////////
@@ -735,7 +735,7 @@ bool CImageFileFormatChecker::isPngFile(std::wstring & fileName)
 
 }
 
-bool CImageFileFormatChecker::isRawFile(std::wstring& fileName)
+bool CImageFileFormatChecker::isRawFile(const std::wstring& fileName)
 {
 	// TODO:
 	return false;
@@ -745,7 +745,7 @@ bool CImageFileFormatChecker::isRawFile(BYTE* pBuffer, DWORD dwBytes)
 	// TODO:
 	return false;
 }
-bool CImageFileFormatChecker::isSvgFile(std::wstring& fileName)
+bool CImageFileFormatChecker::isSvgFile(const std::wstring& fileName)
 {
 #ifndef IMAGE_CHECKER_DISABLE_XML
 	XmlUtils::CXmlLiteReader oReader;

DesktopEditor/raster/ImageFileFormatChecker.h

@@ -71,17 +71,17 @@ public:
 	__ENUM_CXIMAGE_FORMATS eFileType;
 	
 	CImageFileFormatChecker();
-	CImageFileFormatChecker(std::wstring sFileName);
+	CImageFileFormatChecker(const std::wstring& sFileName);
 	CImageFileFormatChecker(BYTE* pBuffer, DWORD dwBytes);
 
-	bool isImageFileInZip(std::wstring& fileName);
+	bool isImageFileInZip(const std::wstring& fileName);
 	
-	bool isImageFile(std::wstring& fileName);
-	bool isPngFile(std::wstring& fileName);
-	bool isSvmFile(std::wstring& fileName);
+	bool isImageFile(const std::wstring& fileName);
+	bool isPngFile(const std::wstring& fileName);
+	bool isSvmFile(const std::wstring& fileName);
 
-	bool isRawFile(std::wstring& fileName);
-	bool isSvgFile(std::wstring& fileName);
+	bool isRawFile(const std::wstring& fileName);
+	bool isSvgFile(const std::wstring& fileName);
 
 	bool isImageFile(BYTE* pBuffer,DWORD dwBytes);
 	bool isBmpFile(BYTE* pBuffer,DWORD dwBytes);

DesktopEditor/raster/Metafile/Common/IOutputDevice.h

@@ -50,7 +50,7 @@ namespace MetaFile
 		virtual void End() = 0;
 
 		// pBuffer - BGRA картинка размерами ulWidth, ulHeight, которую надо нарисовать в заданном ректе
-		virtual void DrawBitmap(double dX, double dY, double dW, double dH, BYTE* pBuffer, unsigned int unWidth, unsigned int unHeight) = 0;
+		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) = 0;

DesktopEditor/raster/Metafile/Common/MetaFileRenderer.h

@@ -236,7 +236,7 @@ namespace MetaFile
 			m_bUpdatedClip = false;
 		}
 		
-		void DrawBitmap(double dX, double dY, double dW, double dH, BYTE* pBuffer, unsigned int unWidth, unsigned int unHeight)
+		void DrawBitmap(double dX, double dY, double dW, double dH, BYTE* pBuffer, unsigned int unWidth, unsigned int unHeight, unsigned int unBlendMode)
 		{
 			if (!pBuffer || 0 == unWidth || 0 == unHeight)
 				return;
@@ -284,7 +284,11 @@ namespace MetaFile
 				m_pRenderer->SetTransform(dKx * dM11, dKx * dM12, dKy * dM21, dKy * dM22, dShiftKoefX * dM11 + dShiftKoefY * dM21 + dMx, dShiftKoefX * dM12 + dShiftKoefY * dM22 + dMy);
 			}
 
+			m_pRenderer->BeginCommand(c_nLayerType);
+			m_pRenderer->put_BlendMode(unBlendMode);
 			m_pRenderer->DrawImage(&oImage, dImageX, dImageY, dImageW, dImageH);
+			m_pRenderer->EndCommand(c_nLayerType);
+			m_pRenderer->put_BlendMode(BLEND_MODE_DEFAULT);
 		}
 		void DrawDriverString(const std::wstring& wsString, const std::vector<TPointD>& arPoints)
 		{

DesktopEditor/raster/Metafile/Common/MetaFileTypes.h

@@ -34,6 +34,7 @@
 
 #include <string>
 #include <cfloat>
+#include <cmath>
 #include "../../../common/StringExt.h"
 
 #ifndef BYTE
@@ -347,6 +348,12 @@ typedef unsigned char BYTE;
 #define HS_OUTLINEDDIAMOND  51
 #define HS_SOLIDDIAMOND     52
 
+//Blend mode's
+#define BLEND_MODE_SRC_OVER      3
+#define BLEND_MODE_XOR           11
+#define BLEND_MODE_DRAW_ON_BLACK 28
+#define BLEND_MODE_DEFAULT       BLEND_MODE_SRC_OVER
+
 namespace MetaFile
 {
 	#define DEFAULT_FONT_SIZE 14

DesktopEditor/raster/Metafile/Common/MetaFileUtils.cpp

@@ -93,7 +93,7 @@ namespace MetaFile
 
 		return false;
 	}
-	bool ReadImageInfoHeader(BYTE* pHeaderBuffer, unsigned int ulHeaderBufferLen, BYTE* pImageBuffer, unsigned int ulImageBufferLen, BYTE** ppDstBuffer, unsigned int* pulWidth, unsigned int* pulHeight)
+	bool ReadImageInfoHeader(BYTE* pHeaderBuffer, unsigned int ulHeaderBufferLen, BYTE* pImageBuffer, unsigned int ulImageBufferLen, BYTE** ppDstBuffer, unsigned int* pulWidth, unsigned int* pulHeight, unsigned int& unColorUsed)
 	{
 		CDataStream oHeaderStream;
 		oHeaderStream.SetStream(pHeaderBuffer, ulHeaderBufferLen);
@@ -108,7 +108,6 @@ namespace MetaFile
 		unsigned int unImageSize;
 		unsigned int unXPelsPerMeter;
 		unsigned int unYPelsPerMeter;
-		unsigned int unColorUsed;
 		unsigned int unColorImportant;
 
 		oHeaderStream >> nWidth;
@@ -817,7 +816,7 @@ namespace MetaFile
 
 		return false;
 	}
-	void ReadImage(BYTE* pHeaderBuffer, unsigned int ulHeaderBufferLen, BYTE* pImageBuffer, unsigned int ulImageBufferLen, BYTE** ppDstBuffer, unsigned int* pulWidth, unsigned int* pulHeight)
+	void ReadImage(BYTE* pHeaderBuffer, unsigned int ulHeaderBufferLen, BYTE* pImageBuffer, unsigned int ulImageBufferLen, BYTE** ppDstBuffer, unsigned int* pulWidth, unsigned int* pulHeight, unsigned int& unColorUsed)
 	{
 		if (ulHeaderBufferLen <= 0 || NULL == pHeaderBuffer || NULL == pImageBuffer || ulImageBufferLen < 0)
 			return;
@@ -834,9 +833,9 @@ namespace MetaFile
 		else if (0x0000000C == ulHeaderSize) // BitmapCoreHeader
 			ReadImageCoreHeader(pHeaderBuffer + 4, ulHeaderBufferLen - 4, pImageBuffer, ulImageBufferLen, ppDstBuffer, pulWidth, pulHeight);
 		else // BitmapInfoHeader
-			ReadImageInfoHeader(pHeaderBuffer + 4, ulHeaderBufferLen - 4, pImageBuffer, ulImageBufferLen, ppDstBuffer, pulWidth, pulHeight);
+			ReadImageInfoHeader(pHeaderBuffer + 4, ulHeaderBufferLen - 4, pImageBuffer, ulImageBufferLen, ppDstBuffer, pulWidth, pulHeight, unColorUsed);
 	}
-	void ReadImage(BYTE* pImageBuffer, unsigned int unBufferLen, unsigned int unColorUsage, BYTE** ppDstBuffer, unsigned int* punWidth, unsigned int* punHeight)
+	void ReadImage(BYTE* pImageBuffer, unsigned int unBufferLen, unsigned int unColorUsage, BYTE** ppDstBuffer, unsigned int* punWidth, unsigned int* punHeight, unsigned int& unColorUsed)
 	{
 		if (unBufferLen <= 0 || NULL == pImageBuffer)
 			return;
@@ -866,7 +865,7 @@ namespace MetaFile
 			unsigned int unImageSize;
 			unsigned int unXPelsPerMeter;
 			unsigned int unYPelsPerMeter;
-			unsigned int unColorUsed;
+			// unsigned int unColorUsed;
 			unsigned int unColorImportant;
 
 			oHeaderStream >> nWidth;
@@ -897,7 +896,7 @@ namespace MetaFile
 				}
 
 				unHeaderSize += 4 * unColorUsed; // RGBQuad
-				ReadImageInfoHeader(pImageBuffer + 4, unHeaderSize - 4, pImageBuffer + unHeaderSize, unBufferLen - unHeaderSize, ppDstBuffer, punWidth, punHeight);
+				ReadImageInfoHeader(pImageBuffer + 4, unHeaderSize - 4, pImageBuffer + unHeaderSize, unBufferLen - unHeaderSize, ppDstBuffer, punWidth, punHeight, unColorUsed);
 			}
 			else
 			{
@@ -982,21 +981,6 @@ namespace MetaFile
 			for (unsigned int unIndex = 3; unIndex < unWidth * 4 * unHeight; unIndex += 4)
 				pBgra[unIndex] = 0xff;
 		}
-		else if (0x00660046 == unRasterOperation) //SRCINVERT
-		{
-			BYTE* pCur = pBgra;
-
-			for (unsigned int unY = 0; unY < unHeight; unY++)
-			{
-				for (unsigned int unX = 0; unX < unWidth; unX++)
-				{
-					unsigned int unIndex = (unY * unWidth + unX) * 4;
-
-					if (0x00 == pCur[unIndex + 0] && 0x00 == pCur[unIndex + 1] && 0x00 == pCur[unIndex + 2])
-						pCur[unIndex + 3] = 0;
-				}
-			}
-		}
 	}
 
 	std::wstring GetTempFilename(const std::wstring& sFolder)

DesktopEditor/raster/Metafile/Common/MetaFileUtils.h

@@ -1174,8 +1174,8 @@ namespace MetaFile
 		BYTE *pEnd;
 	};
 
-	void ReadImage(BYTE* pHeaderBuffer, unsigned int ulHeaderBufferLen, BYTE* pImageBuffer, unsigned int ulImageBufferLen, BYTE** ppDstBuffer, unsigned int* pulWidth, unsigned int* pulHeight);
-	void ReadImage(BYTE* pImageBuffer, unsigned int unBufferLen, unsigned int unColorUsage, BYTE** ppDstBuffer, unsigned int* punWidth, unsigned int* punHeight);
+	void ReadImage(BYTE* pHeaderBuffer, unsigned int ulHeaderBufferLen, BYTE* pImageBuffer, unsigned int ulImageBufferLen, BYTE** ppDstBuffer, unsigned int* pulWidth, unsigned int* pulHeight, unsigned int& unColorUsed);
+	void ReadImage(BYTE* pImageBuffer, unsigned int unBufferLen, unsigned int unColorUsage, BYTE** ppDstBuffer, unsigned int* punWidth, unsigned int* punHeight, unsigned int& unColorUsed);
 	double GetEllipseAngle(int nL, int nT, int nR, int nB, int nX, int nY);
 	void ProcessRasterOperation(unsigned int unRasterOperation, BYTE** ppBgra, unsigned int unWidth, unsigned int unHeight);
 	std::wstring GetTempFilename(const std::wstring& sFolder = L"");

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

@@ -215,7 +215,7 @@ namespace MetaFile
 		void Begin() override {};
 		void End() override {};
 
-		void DrawBitmap(double dX, double dY, double dW, double dH, BYTE* pBuffer, unsigned int unWidth, unsigned int unHeight) override {};
+		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) override {};

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

@@ -73,10 +73,10 @@ namespace MetaFile
 			pInterpretator->End();
 	}
 
-	void CEmfInterpretatorArray::DrawBitmap(double dX, double dY, double dW, double dH, BYTE *pBuffer, unsigned int unWidth, unsigned int unHeight)
+	void CEmfInterpretatorArray::DrawBitmap(double dX, double dY, double dW, double dH, BYTE *pBuffer, unsigned int unWidth, unsigned int unHeight, unsigned int unBlendMode)
 	{
 		for (CEmfInterpretatorBase* pInterpretator : m_arInterpretators)
-			pInterpretator->DrawBitmap(dX, dY, dW, dH, pBuffer, unWidth, unHeight);
+			pInterpretator->DrawBitmap(dX, dY, dW, dH, pBuffer, unWidth, unHeight, unBlendMode);
 	}
 
 	void CEmfInterpretatorArray::DrawString(std::wstring &wsText, unsigned int unCharsCount, double dX, double dY, double *pDx,

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

@@ -33,7 +33,7 @@ namespace MetaFile
 		void Begin() override;
 		void End() override;
 
-		void DrawBitmap(double dX, double dY, double dW, double dH, BYTE* pBuffer, unsigned int unWidth, unsigned int unHeight) override;
+		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) override;

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

@@ -34,10 +34,10 @@ namespace MetaFile
 			m_pMetaFileRenderer->End();
 	}
 
-	void CEmfInterpretatorRender::DrawBitmap(double dX, double dY, double dW, double dH, BYTE *pBuffer, unsigned int unWidth, unsigned int unHeight)
+	void CEmfInterpretatorRender::DrawBitmap(double dX, double dY, double dW, double dH, BYTE *pBuffer, unsigned int unWidth, unsigned int unHeight, unsigned int unBlendMode)
 	{
 		if (NULL != m_pMetaFileRenderer)
-			m_pMetaFileRenderer->DrawBitmap(dX, dY, dW, dH, pBuffer, unWidth, unHeight);
+			m_pMetaFileRenderer->DrawBitmap(dX, dY, dW, dH, pBuffer, unWidth, unHeight, unBlendMode);
 	}
 
 	void CEmfInterpretatorRender::DrawString(std::wstring &wsText, unsigned int unCharsCount, double dX, double dY, double *pDx,

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

@@ -19,7 +19,7 @@ namespace MetaFile
 		void Begin() override;
 		void End() override;
 
-		void DrawBitmap(double dX, double dY, double dW, double dH, BYTE* pBuffer, unsigned int unWidth, unsigned int unHeight) override;
+		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) override;