diff --git a/Common/3dParty/html/css/src/CCompiledStyle.cpp b/Common/3dParty/html/css/src/CCompiledStyle.cpp
index e86d3404cc..3340ba64bc 100644
--- a/Common/3dParty/html/css/src/CCompiledStyle.cpp
+++ b/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
 {
@@ -444,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"):
 				{
diff --git a/Common/3dParty/html/css/src/CCssCalculator.cpp b/Common/3dParty/html/css/src/CCssCalculator.cpp
index 8459444250..99f5d65e05 100644
--- a/Common/3dParty/html/css/src/CCssCalculator.cpp
+++ b/Common/3dParty/html/css/src/CCssCalculator.cpp
@@ -58,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();
diff --git a/Common/3dParty/html/css/src/CCssCalculator.h b/Common/3dParty/html/css/src/CCssCalculator.h
index 678095428b..5047193e6e 100644
--- a/Common/3dParty/html/css/src/CCssCalculator.h
+++ b/Common/3dParty/html/css/src/CCssCalculator.h
@@ -32,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();
diff --git a/Common/3dParty/html/css/src/CCssCalculator_Private.cpp b/Common/3dParty/html/css/src/CCssCalculator_Private.cpp
index 45017aa9f9..3223e8f34f 100644
--- a/Common/3dParty/html/css/src/CCssCalculator_Private.cpp
+++ b/Common/3dParty/html/css/src/CCssCalculator_Private.cpp
@@ -184,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;
@@ -470,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);
 
@@ -491,6 +491,21 @@ namespace NSCSS
 		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())
@@ -692,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(),
@@ -765,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();
diff --git a/Common/3dParty/html/css/src/CCssCalculator_Private.h b/Common/3dParty/html/css/src/CCssCalculator_Private.h
index 814e7228cd..f57c97a189 100644
--- a/Common/3dParty/html/css/src/CCssCalculator_Private.h
+++ b/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
@@ -122,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);
diff --git a/Common/3dParty/html/css/src/StyleProperties.cpp b/Common/3dParty/html/css/src/StyleProperties.cpp
index f94118dbd8..111cba1147 100644
--- a/Common/3dParty/html/css/src/StyleProperties.cpp
+++ b/Common/3dParty/html/css/src/StyleProperties.cpp
@@ -1328,7 +1328,14 @@ namespace NSCSS
 
 	// DISPLAY
 	CDisplay::CDisplay()
-	{}
+	{
+		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)
 	{
@@ -1341,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)
@@ -1404,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;
@@ -1439,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
diff --git a/Common/3dParty/html/css/src/StyleProperties.h b/Common/3dParty/html/css/src/StyleProperties.h
index 2fa1ce1935..e85c6980e8 100644
--- a/Common/3dParty/html/css/src/StyleProperties.h
+++ b/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
diff --git a/Common/3dParty/md/md2html.cpp b/Common/3dParty/md/md2html.cpp
index 84a0511418..d3be666e7f 100644
--- a/Common/3dParty/md/md2html.cpp
+++ b/Common/3dParty/md/md2html.cpp
@@ -29,7 +29,7 @@ void WriteBaseHtmlStyles(NSFile::CFileBinary& oFile)
 	oFile.WriteStringUTF8(L"<style>");
 
 	// Main styles
-	oFile.WriteStringUTF8(L"* { font-family: Arial; }");
+	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; }");
@@ -50,11 +50,10 @@ void WriteBaseHtmlStyles(NSFile::CFileBinary& oFile)
 
 	// 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; background-color: transparent; border-radius: 0; color: inherit; }");
+	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; }");
@@ -81,12 +80,16 @@ bool ConvertMdFileToHtml(const std::wstring& wsPathToMdFile, const std::wstring&
 	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, 0))
+	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>");
diff --git a/Common/OfficeFileFormatChecker2.cpp b/Common/OfficeFileFormatChecker2.cpp
index 582591db6b..bf6845478a 100644
--- a/Common/OfficeFileFormatChecker2.cpp
+++ b/Common/OfficeFileFormatChecker2.cpp
@@ -1601,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;
 	}
diff --git a/DesktopEditor/doctrenderer/docbuilder_p.cpp b/DesktopEditor/doctrenderer/docbuilder_p.cpp
index ec83b72aab..5839d377b8 100644
--- a/DesktopEditor/doctrenderer/docbuilder_p.cpp
+++ b/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()
@@ -1241,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)
diff --git a/DesktopEditor/doctrenderer/drawingfile.h b/DesktopEditor/doctrenderer/drawingfile.h
index cc8fd36858..b86705b6d1 100644
--- a/DesktopEditor/doctrenderer/drawingfile.h
+++ b/DesktopEditor/doctrenderer/drawingfile.h
@@ -289,10 +289,20 @@ public:
 			return ((CPdfFile*)m_pFile)->SplitPages(arrPageIndex, nLength, data, size);
 		return NULL;
 	}
-	bool MergePages(BYTE* data, LONG size, int nMaxID, const std::string& sPrefixForm)
+	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()
@@ -420,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();
diff --git a/DesktopEditor/doctrenderer/embed/DrawingFileEmbed.cpp b/DesktopEditor/doctrenderer/embed/DrawingFileEmbed.cpp
index c3d1c72d7e..c8b29f8e55 100644
--- a/DesktopEditor/doctrenderer/embed/DrawingFileEmbed.cpp
+++ b/DesktopEditor/doctrenderer/embed/DrawingFileEmbed.cpp
@@ -195,7 +195,7 @@ JSSmart<CJSValue> CDrawingFileEmbed::MergePages(JSSmart<CJSValue> data, JSSmart<
 		int maxID = nMaxID->toInt32();
 		std::string prefix = sPrefixForm->toStringA();
 		CJSDataBuffer buffer = dataPtr->getData();
-		result = m_pFile->MergePages(buffer.Data, (LONG)buffer.Len, maxID, prefix);
+		result = m_pFile->MergePages(buffer.Data, (LONG)buffer.Len, maxID, prefix, true);
 		if (buffer.IsExternalize)
 			buffer.Free();
 	}
diff --git a/DesktopEditor/doctrenderer/embed/GraphicsEmbed.cpp b/DesktopEditor/doctrenderer/embed/GraphicsEmbed.cpp
index f20a2c57e3..0c713f88cd 100644
--- a/DesktopEditor/doctrenderer/embed/GraphicsEmbed.cpp
+++ b/DesktopEditor/doctrenderer/embed/GraphicsEmbed.cpp
@@ -196,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()
diff --git a/DesktopEditor/doctrenderer/embed/NativeBuilderDocumentEmbed.h b/DesktopEditor/doctrenderer/embed/NativeBuilderDocumentEmbed.h
index ab06cada81..f547004a31 100644
--- a/DesktopEditor/doctrenderer/embed/NativeBuilderDocumentEmbed.h
+++ b/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(); }
diff --git a/DesktopEditor/doctrenderer/embed/NativeBuilderEmbed.cpp b/DesktopEditor/doctrenderer/embed/NativeBuilderEmbed.cpp
index dcdeab51ae..9041f8ffd2 100644
--- a/DesktopEditor/doctrenderer/embed/NativeBuilderEmbed.cpp
+++ b/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();
 }
diff --git a/DesktopEditor/doctrenderer/embed/NativeBuilderEmbed.h b/DesktopEditor/doctrenderer/embed/NativeBuilderEmbed.h
index 62625747d9..445a8278c4 100644
--- a/DesktopEditor/doctrenderer/embed/NativeBuilderEmbed.h
+++ b/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(); }
diff --git a/DesktopEditor/doctrenderer/graphics.cpp b/DesktopEditor/doctrenderer/graphics.cpp
index 1df4b26bae..7e6886242d 100644
--- a/DesktopEditor/doctrenderer/graphics.cpp
+++ b/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;
diff --git a/DesktopEditor/doctrenderer/graphics.h b/DesktopEditor/doctrenderer/graphics.h
index 8146c45a08..c8099a0a60 100644
--- a/DesktopEditor/doctrenderer/graphics.h
+++ b/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()
 		{
diff --git a/DesktopEditor/doctrenderer/js_internal/js_base.cpp b/DesktopEditor/doctrenderer/js_internal/js_base.cpp
index 7df327b703..53bf200722 100644
--- a/DesktopEditor/doctrenderer/js_internal/js_base.cpp
+++ b/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;
diff --git a/DesktopEditor/doctrenderer/js_internal/js_base.h b/DesktopEditor/doctrenderer/js_internal/js_base.h
index 85bb23b6ae..c9d3fc7ead 100644
--- a/DesktopEditor/doctrenderer/js_internal/js_base.h
+++ b/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;
 	};
diff --git a/DesktopEditor/doctrenderer/js_internal/js_embed.h b/DesktopEditor/doctrenderer/js_internal/js_embed.h
index d763ee522c..642beb3de6 100644
--- a/DesktopEditor/doctrenderer/js_internal/js_embed.h
+++ b/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
diff --git a/DesktopEditor/doctrenderer/js_internal/jsc/jsc_base.h b/DesktopEditor/doctrenderer/js_internal/jsc/jsc_base.h
index 0093c00295..5e53e66fce 100644
--- a/DesktopEditor/doctrenderer/js_internal/jsc/jsc_base.h
+++ b/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
diff --git a/DesktopEditor/doctrenderer/js_internal/jsc/jsc_base.mm b/DesktopEditor/doctrenderer/js_internal/jsc/jsc_base.mm
index ffb56a55d3..bf3691d07e 100644
--- a/DesktopEditor/doctrenderer/js_internal/jsc/jsc_base.mm
+++ b/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;
 	}
 
@@ -503,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);
diff --git a/DesktopEditor/doctrenderer/js_internal/v8/v8_base.cpp b/DesktopEditor/doctrenderer/js_internal/v8/v8_base.cpp
index 2de48b9409..bacd5dedac 100644
--- a/DesktopEditor/doctrenderer/js_internal/v8/v8_base.cpp
+++ b/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;
 	}
 
@@ -655,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
+	}
 }
diff --git a/DesktopEditor/doctrenderer/js_internal/v8/v8_base.h b/DesktopEditor/doctrenderer/js_internal/v8/v8_base.h
index f52b942301..f6a424bca6 100644
--- a/DesktopEditor/doctrenderer/js_internal/v8/v8_base.h
+++ b/DesktopEditor/doctrenderer/js_internal/v8/v8_base.h
@@ -883,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
 	{
@@ -900,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)
 		{
@@ -918,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;
 		}
@@ -931,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;
diff --git a/DesktopEditor/doctrenderer/test/embed/external/Embed.cpp b/DesktopEditor/doctrenderer/test/embed/external/Embed.cpp
index 7c6710b39b..8a5de29a67 100644
--- a/DesktopEditor/doctrenderer/test/embed/external/Embed.cpp
+++ b/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)
diff --git a/DesktopEditor/doctrenderer/test/embed/external/Embed.h b/DesktopEditor/doctrenderer/test/embed/external/Embed.h
index 2d67bf898a..4c0802f671 100644
--- a/DesktopEditor/doctrenderer/test/embed/external/Embed.h
+++ b/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_
diff --git a/DesktopEditor/doctrenderer/test/embed/external/main.cpp b/DesktopEditor/doctrenderer/test/embed/external/main.cpp
index bf1d7156ba..572d24afdf 100644
--- a/DesktopEditor/doctrenderer/test/embed/external/main.cpp
+++ b/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;
 }
diff --git a/DesktopEditor/doctrenderer/test/embed/external/main.mm b/DesktopEditor/doctrenderer/test/embed/external/main.mm
new file mode 100644
index 0000000000..84763f143f
--- /dev/null
+++ b/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;
+}
diff --git a/DesktopEditor/doctrenderer/test/embed/external/test.pro b/DesktopEditor/doctrenderer/test/embed/external/test.pro
index 6d2b027065..4bc449418e 100644
--- a/DesktopEditor/doctrenderer/test/embed/external/test.pro
+++ b/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)
diff --git a/DesktopEditor/doctrenderer/test/embed/external/test_functions.cpp b/DesktopEditor/doctrenderer/test/embed/external/test_functions.cpp
new file mode 100644
index 0000000000..b4cc5424e5
--- /dev/null
+++ b/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;
+	}
+}
diff --git a/DesktopEditor/doctrenderer/test/embed/external/test_functions.h b/DesktopEditor/doctrenderer/test/embed/external/test_functions.h
new file mode 100644
index 0000000000..8ac425ddcd
--- /dev/null
+++ b/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_
diff --git a/DesktopEditor/graphics/pro/js/wasm/js/drawingfile.js b/DesktopEditor/graphics/pro/js/wasm/js/drawingfile.js
index 390ee1f955..0e508fc231 100644
--- a/DesktopEditor/graphics/pro/js/wasm/js/drawingfile.js
+++ b/DesktopEditor/graphics/pro/js/wasm/js/drawingfile.js
@@ -40,7 +40,7 @@ var UpdateFontsSource = {
 function CFile()
 {
 	this.nativeFile = 0;
-	this.stream = [];
+	this.stream = -1;
 	this.stream_size = 0;
 	this.type = -1;
 	this.pages = [];
@@ -128,17 +128,17 @@ CFile.prototype["close"] = function()
 	this.pages = [];
 	this.info = null;
 	this.StartID = null;
-	for (let i = 0; i < this.stream.length; i++)
-		this._free(this.stream[i]);
-	this.stream = [];
+	if (this.stream > 0)
+		this._free(this.stream);
+	this.stream = -1;
 	self.drawingFile = null;
 };
 
 CFile.prototype["getFileBinary"] = function()
 {
-	if (this.stream.length == 0)
+	if (0 >= this.stream)
 		return "";
-	return new Uint8Array(Module["HEAP8"].buffer, this.stream[0], this.stream_size);
+	return new Uint8Array(Module["HEAP8"].buffer, this.stream, this.stream_size);
 };
 
 CFile.prototype["isNeedPassword"] = function()
@@ -1566,8 +1566,13 @@ CFile.prototype["readAnnotationsInfoFromBinary"] = function(AnnotInfo)
 CFile.prototype["scanPage"] = function(page, mode)
 {
 	let ptr = this._scanPage(page, mode);
-	let reader = ptr.getReader();
+	if (mode == 2) {
+		data = ptr.getMemory(true);
+		ptr.free();
+		return data;
+	}
 
+	let reader = ptr.getReader();
 	if (!reader) return [];
 
 	let shapesCount = reader.readInt();
diff --git a/DesktopEditor/graphics/pro/js/wasm/js/drawingfile_wasm.js b/DesktopEditor/graphics/pro/js/wasm/js/drawingfile_wasm.js
index a26e90ed90..06c303a27b 100644
--- a/DesktopEditor/graphics/pro/js/wasm/js/drawingfile_wasm.js
+++ b/DesktopEditor/graphics/pro/js/wasm/js/drawingfile_wasm.js
@@ -101,9 +101,8 @@ CFile.prototype._openFile = function(buffer, password)
 	{
 		let data = new Uint8Array(buffer);
 		this.stream_size = data.length;
-		let stream = Module["_malloc"](this.stream_size);
-		Module["HEAP8"].set(data, stream);
-		this.stream.push(stream);
+		this.stream = Module["_malloc"](this.stream_size);
+		Module["HEAP8"].set(data, this.stream);
 	}
 
 	let passwordPtr = 0;
@@ -114,7 +113,7 @@ CFile.prototype._openFile = function(buffer, password)
 		Module["HEAP8"].set(passwordBuf, passwordPtr);
 	}
 
-	this.nativeFile = Module["_Open"](this.stream[0], this.stream_size, passwordPtr);
+	this.nativeFile = Module["_Open"](this.stream, this.stream_size, passwordPtr);
 
 	if (passwordPtr)
 		Module["_free"](passwordPtr);
@@ -128,7 +127,7 @@ CFile.prototype._closeFile = function()
 
 CFile.prototype._getType = function()
 {
-	return Module["_GetType"](this.stream[0], this.stream_size);
+	return Module["_GetType"](this.nativeFile);
 };
 
 CFile.prototype._getError = function()
@@ -180,10 +179,7 @@ CFile.prototype._MergePages = function(buffer, maxID, prefixForm)
 	}
 
 	let bRes = Module["_MergePages"](this.nativeFile, stream2, data.length, maxID, prefixPtr);
-	if (bRes == 1)
-		this.stream.push(stream2);
-	else
-		Module["_free"](stream2);
+	stream2 = 0; // Success or not, stream2 is either taken or freed
 
 	if (prefixPtr)
 		Module["_free"](prefixPtr);
@@ -193,13 +189,7 @@ CFile.prototype._MergePages = function(buffer, maxID, prefixForm)
 
 CFile.prototype._UndoMergePages = function()
 {
-	let bRes = Module["_UnmergePages"](this.nativeFile);
-	if (bRes == 1)
-	{
-		let str = this.stream.pop();
-		Module["_free"](str);
-	}
-	return bRes == 1;
+	return Module["_UnmergePages"](this.nativeFile) == 1;
 };
 
 // FONTS
diff --git a/DesktopEditor/graphics/pro/js/wasm/src/drawingfile.cpp b/DesktopEditor/graphics/pro/js/wasm/src/drawingfile.cpp
index a944ce9d4d..c20a4880fc 100644
--- a/DesktopEditor/graphics/pro/js/wasm/src/drawingfile.cpp
+++ b/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)
diff --git a/DesktopEditor/graphics/pro/js/wasm/src/drawingfile_test.cpp b/DesktopEditor/graphics/pro/js/wasm/src/drawingfile_test.cpp
index 5cb964c49a..f8b720a8c1 100644
--- a/DesktopEditor/graphics/pro/js/wasm/src/drawingfile_test.cpp
+++ b/DesktopEditor/graphics/pro/js/wasm/src/drawingfile_test.cpp
@@ -1022,9 +1022,9 @@ int main(int argc, char* argv[])
 		}
 	}
 
+	RELEASEARRAYOBJECTS(pFileData);
+
 	// SPLIT & MERGE
-	BYTE* pSplitPages = NULL;
-	BYTE* pFileMerge = NULL;
 	if (false)
 	{
 		int nBufferLen = NULL;
@@ -1036,12 +1036,19 @@ int main(int argc, char* argv[])
 			BYTE* pSplitPages = SplitPages(pGrFile, arrPages.data(), arrPages.size(), pBuffer, nBufferLen);
 			int nLength = READ_INT(pSplitPages);
 
-			NSFile::CFileBinary oFile;
-			if (oFile.CreateFileW(NSFile::GetProcessDirectory() + L"/split1.pdf"))
-				oFile.WriteFile(pSplitPages + 4, nLength - 4);
-			oFile.CloseFile();
+			if (nLength > 4)
+			{
+				NSFile::CFileBinary oFile;
+				if (oFile.CreateFileW(NSFile::GetProcessDirectory() + L"/split1.pdf"))
+					oFile.WriteFile(pSplitPages + 4, nLength - 4);
+				oFile.CloseFile();
 
-			MergePages(pGrFile, pSplitPages + 4, nLength - 4, 0, "merge1");
+				BYTE* pMallocData = (BYTE*)malloc(nLength - 4);
+				memcpy(pMallocData, pSplitPages + 4, nLength - 4);
+
+				MergePages(pGrFile, pMallocData, nLength - 4, 0, "merge1");
+			}
+			RELEASEARRAYOBJECTS(pSplitPages);
 		}
 		RELEASEARRAYOBJECTS(pBuffer);
 
@@ -1051,12 +1058,19 @@ int main(int argc, char* argv[])
 			BYTE* pSplitPages = SplitPages(pGrFile, arrPages.data(), arrPages.size(), pBuffer, nBufferLen);
 			int nLength = READ_INT(pSplitPages);
 
-			NSFile::CFileBinary oFile;
-			if (oFile.CreateFileW(NSFile::GetProcessDirectory() + L"/split2.pdf"))
-				oFile.WriteFile(pSplitPages + 4, nLength - 4);
-			oFile.CloseFile();
+			if (nLength > 4)
+			{
+				NSFile::CFileBinary oFile;
+				if (oFile.CreateFileW(NSFile::GetProcessDirectory() + L"/split2.pdf"))
+					oFile.WriteFile(pSplitPages + 4, nLength - 4);
+				oFile.CloseFile();
 
-			MergePages(pGrFile, pSplitPages + 4, nLength - 4, 0, "merge2");
+				BYTE* pMallocData = (BYTE*)malloc(nLength - 4);
+				memcpy(pMallocData, pSplitPages + 4, nLength - 4);
+
+				MergePages(pGrFile, pMallocData, nLength - 4, 0, "merge2");
+			}
+			RELEASEARRAYOBJECTS(pSplitPages);
 		}
 		RELEASEARRAYOBJECTS(pBuffer);
 	}
@@ -2053,10 +2067,6 @@ int main(int argc, char* argv[])
 	}
 
 	Close(pGrFile);
-	RELEASEARRAYOBJECTS(pFileData);
-	RELEASEARRAYOBJECTS(pSplitPages);
-	RELEASEARRAYOBJECTS(pFileMerge);
-	RELEASEARRAYOBJECTS(pCMapData);
 
 	return 0;
 }
diff --git a/DesktopEditor/graphics/pro/js/wasm/src/serialize.h b/DesktopEditor/graphics/pro/js/wasm/src/serialize.h
index 9b2d6962c1..1d36cbbabc 100644
--- a/DesktopEditor/graphics/pro/js/wasm/src/serialize.h
+++ b/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()
 		{
diff --git a/DocxRenderer/DocxRenderer.cpp b/DocxRenderer/DocxRenderer.cpp
index 740f66beac..d6fa60366b 100644
--- a/DocxRenderer/DocxRenderer.cpp
+++ b/DocxRenderer/DocxRenderer.cpp
@@ -37,12 +37,19 @@
 #include "../DesktopEditor/graphics/commands/DocInfo.h"
 #include <algorithm>
 
+enum class ShapeSerializeType
+{
+	sstBinary,
+	sstXml
+};
+
 class CDocxRenderer_Private
 {
 public:
 	NSDocxRenderer::CDocument m_oDocument;
 	std::wstring m_sTempDirectory;
 	bool m_bIsSupportShapeCommands = false;
+	ShapeSerializeType m_eShapeSerializeType = ShapeSerializeType::sstBinary;
 
 public:
 	CDocxRenderer_Private(NSFonts::IApplicationFonts* pFonts, IRenderer* pRenderer) : m_oDocument(pRenderer, pFonts)
@@ -139,12 +146,28 @@ std::vector<std::wstring> CDocxRenderer::ScanPagePptx(IOfficeDrawingFile* pFile,
 	m_pInternal->m_oDocument.m_oCurrentPage.m_bWriteStyleRaw = true;
 	m_pInternal->m_bIsSupportShapeCommands = true;
 
+	m_pInternal->m_eShapeSerializeType = ShapeSerializeType::sstXml;
 	DrawPage(pFile, nPage);
+	m_pInternal->m_eShapeSerializeType = ShapeSerializeType::sstBinary;
 
 	auto xml_shapes = m_pInternal->m_oDocument.m_oCurrentPage.GetXmlShapesPptx();
 	m_pInternal->m_oDocument.Clear();
 	return xml_shapes;
 }
+NSWasm::CData CDocxRenderer::ScanPageBin(IOfficeDrawingFile* pFile, size_t nPage)
+{
+	m_pInternal->m_oDocument.Clear();
+	m_pInternal->m_oDocument.Init(false);
+	m_pInternal->m_oDocument.m_oCurrentPage.m_bUseDefaultFont = true;
+	m_pInternal->m_oDocument.m_oCurrentPage.m_bWriteStyleRaw = true;
+	m_pInternal->m_bIsSupportShapeCommands = true;
+
+	DrawPage(pFile, nPage);
+
+	auto bin_shapes = m_pInternal->m_oDocument.m_oCurrentPage.GetShapesBin();
+	m_pInternal->m_oDocument.Clear();
+	return bin_shapes;
+}
 
 void CDocxRenderer::SetExternalImageStorage(NSDocxRenderer::IImageStorage* pStorage)
 {
@@ -194,6 +217,7 @@ HRESULT CDocxRenderer::IsSupportAdvancedCommand(const IAdvancedCommand::Advanced
 
 	return S_FALSE;
 }
+
 HRESULT CDocxRenderer::AdvancedCommand(IAdvancedCommand* command)
 {
 	if (NULL == command)
@@ -205,14 +229,69 @@ HRESULT CDocxRenderer::AdvancedCommand(IAdvancedCommand* command)
 	{
 		CShapeStart* pShape = (CShapeStart*)command;
 		std::string& sUtf8Shape = pShape->GetShapeXML();
+		UINT nImageId = 0xFFFFFFFF;
+
 		Aggplus::CImage* pImage = pShape->GetShapeImage();
 		if (pImage)
 		{
 			std::shared_ptr<NSDocxRenderer::CImageInfo> pInfo = m_pInternal->m_oDocument.m_oImageManager.GenerateImageID(pImage);
-			std::string sNewId = "r:embed=\"rId" + std::to_string(pInfo->m_nId + c_iStartingIdForImages) + "\"";
-			NSStringUtils::string_replaceA(sUtf8Shape, "r:embed=\"\"", sNewId);
+			nImageId = pInfo->m_nId;
+		}
+
+		if (sUtf8Shape.empty())
+			return S_FALSE;
+
+		if ('<' == sUtf8Shape.at(0))
+		{
+			if (m_pInternal->m_eShapeSerializeType == ShapeSerializeType::sstBinary)
+				return S_FALSE;
+
+			if (0xFFFFFFFF != nImageId)
+			{
+				std::string sNewId = "r:embed=\"rId" + std::to_string(nImageId + c_iStartingIdForImages) + "\"";
+				NSStringUtils::string_replaceA(sUtf8Shape, "r:embed=\"\"", sNewId);
+			}
+			m_pInternal->m_oDocument.m_oCurrentPage.AddCompleteXml(UTF8_TO_U(sUtf8Shape));
+		}
+		else
+		{
+			if (m_pInternal->m_eShapeSerializeType == ShapeSerializeType::sstXml)
+				return S_FALSE;
+
+			if (0xFFFFFFFF != nImageId)
+			{
+				std::wstring rId_new = L"rId" + std::to_wstring(nImageId + c_iStartingIdForImages);
+				NSWasm::CData rId_record;
+				rId_record.StartRecord(100);
+				rId_record.WriteStringUtf16(rId_new);
+				rId_record.EndRecord();
+
+				int buff_len = NSBase64::Base64DecodeGetRequiredLength(sUtf8Shape.size());
+				BYTE* buff = new BYTE[buff_len + rId_record.GetSize()];
+
+				if (NSBase64::Base64Decode(sUtf8Shape.c_str(), (int)sUtf8Shape.size(), buff, &buff_len))
+				{
+					memcpy(buff + buff_len, rId_record.GetBuffer(), rId_record.GetSize());
+
+					unsigned int curr_len = 0;
+					memcpy(&curr_len, buff + 1, sizeof(unsigned int)); // first byte is "type" byte
+
+					curr_len += rId_record.GetSize();
+					memcpy(buff + 1, &curr_len, sizeof(unsigned int));
+				}
+
+				int buff_len_new = buff_len + rId_record.GetSize();
+				int size_base64 = NSBase64::Base64EncodeGetRequiredLength(buff_len_new);
+				char* data_base64 = new char[size_base64];
+				NSBase64::Base64Encode(buff, buff_len_new, (BYTE*)data_base64, &size_base64, NSBase64::B64_BASE64_FLAG_NOCRLF);
+
+				sUtf8Shape = std::string(data_base64, size_base64);
+
+				delete[] buff;
+				delete[] data_base64;
+			}
+			m_pInternal->m_oDocument.m_oCurrentPage.AddCompleteBinBase64(sUtf8Shape);
 		}
-		m_pInternal->m_oDocument.m_oCurrentPage.AddCompleteXml(UTF8_TO_U(sUtf8Shape));
 		return S_OK;
 	}
 	case IAdvancedCommand::AdvancedCommandType::ShapeEnd:
diff --git a/DocxRenderer/DocxRenderer.h b/DocxRenderer/DocxRenderer.h
index 18aa23a8de..0903f78acc 100644
--- a/DocxRenderer/DocxRenderer.h
+++ b/DocxRenderer/DocxRenderer.h
@@ -45,6 +45,7 @@
 
 #include "convert_params.h"
 #include "src/logic/managers/ExternalImageStorage.h"
+#include "../DesktopEditor/graphics/pro/js/wasm/src/serialize.h"
 
 class CDocxRenderer_Private;
 class DOCXRENDERER_DECL_EXPORT CDocxRenderer : public IRenderer
@@ -178,6 +179,7 @@ public:
 	int Convert(IOfficeDrawingFile* pFile, const std::wstring& sDstFile, bool bIsOutCompress = true);
 	std::vector<std::wstring> ScanPage(IOfficeDrawingFile* pFile, size_t nPage);
 	std::vector<std::wstring> ScanPagePptx(IOfficeDrawingFile* pFile, size_t nPage);
+	NSWasm::CData ScanPageBin(IOfficeDrawingFile* pFile, size_t nPage);
 
 	void SetExternalImageStorage(NSDocxRenderer::IImageStorage* pStorage);
 private:
diff --git a/DocxRenderer/src/logic/Document.cpp b/DocxRenderer/src/logic/Document.cpp
index a2c73e2a9f..4420d950d2 100644
--- a/DocxRenderer/src/logic/Document.cpp
+++ b/DocxRenderer/src/logic/Document.cpp
@@ -12,10 +12,10 @@
 namespace NSDocxRenderer
 {
 	CDocument::CDocument(IRenderer* pRenderer, NSFonts::IApplicationFonts* pFonts) :
-		m_pAppFonts(pFonts),
-		m_oFontManager(pFonts),
-		m_oFontSelector(pFonts),
-		m_oCurrentPage(pFonts, {&m_oImageManager, &m_oFontStyleManager, &m_oParagraphStyleManager, &m_oFontManager, &m_oFontSelector})
+	    m_pAppFonts(pFonts),
+	    m_oFontManager(pFonts),
+	    m_oFontSelector(pFonts),
+	    m_oCurrentPage(pFonts, {&m_oImageManager, &m_oFontStyleManager, &m_oParagraphStyleManager, &m_oFontManager, &m_oFontSelector})
 	{
 		m_oSimpleGraphicsConverter.SetRenderer(pRenderer);
 	}
@@ -492,8 +492,8 @@ namespace NSDocxRenderer
 
 	//-------- Функции для вывода текста --------------------------------------------------------
 	HRESULT CDocument::CommandDrawTextPrivate(const int* pUnicodes, const int* pGids, int nCount,
-											  const double& dX, const double& dY, const double& dW,
-											  const double& dH, const double& dBaseLineOffset)
+	                                          const double& dX, const double& dY, const double& dW,
+	                                          const double& dH, const double& dBaseLineOffset)
 	{
 		double dAngleMatrix = m_oCurrentPage.m_oTransform.z_Rotation();
 		if (fabs(dAngleMatrix) > 1 || m_oCurrentPage.m_oTransform.sx() < 0 || m_oCurrentPage.m_oTransform.sy() < 0)
@@ -830,44 +830,44 @@ namespace NSDocxRenderer
 
 		oDocumentStream.CreateFileW(m_strTempDirectory + L"/word/document.xml");
 		oDocumentStream.WriteStringUTF8(L"<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\
-										<w:document xmlns:wpc=\"http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas\" \
-				xmlns:cx=\"http://schemas.microsoft.com/office/drawing/2014/chartex\" \
-				xmlns:cx1=\"http://schemas.microsoft.com/office/drawing/2015/9/8/chartex\" \
-				xmlns:cx2=\"http://schemas.microsoft.com/office/drawing/2015/10/21/chartex\" \
-				xmlns:cx3=\"http://schemas.microsoft.com/office/drawing/2016/5/9/chartex\" \
-				xmlns:cx4=\"http://schemas.microsoft.com/office/drawing/2016/5/10/chartex\" \
-				xmlns:cx5=\"http://schemas.microsoft.com/office/drawing/2016/5/11/chartex\" \
-				xmlns:cx6=\"http://schemas.microsoft.com/office/drawing/2016/5/12/chartex\" \
-				xmlns:cx7=\"http://schemas.microsoft.com/office/drawing/2016/5/13/chartex\" \
-				xmlns:cx8=\"http://schemas.microsoft.com/office/drawing/2016/5/14/chartex\" \
-				xmlns:mc=\"http://schemas.openxmlformats.org/markup-compatibility/2006\" \
-				xmlns:aink=\"http://schemas.microsoft.com/office/drawing/2016/ink\" \
-				xmlns:am3d=\"http://schemas.microsoft.com/office/drawing/2017/model3d\" \
-				xmlns:o=\"urn:schemas-microsoft-com:office:office\" \
-				xmlns:r=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships\" \
-				xmlns:m=\"http://schemas.openxmlformats.org/officeDocument/2006/math\" \
-				xmlns:v=\"urn:schemas-microsoft-com:vml\" \
-				xmlns:a=\"http://schemas.openxmlformats.org/drawingml/2006/main\" \
-				xmlns:pic=\"http://schemas.openxmlformats.org/drawingml/2006/picture\" \
-				xmlns:wp14=\"http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing\" \
-				xmlns:wp=\"http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing\" \
-				xmlns:w10=\"urn:schemas-microsoft-com:office:word\" \
-				xmlns:w=\"http://schemas.openxmlformats.org/wordprocessingml/2006/main\" \
-				xmlns:w14=\"http://schemas.microsoft.com/office/word/2010/wordml\" \
-				xmlns:w15=\"http://schemas.microsoft.com/office/word/2012/wordml\" \
-				xmlns:w16cex=\"http://schemas.microsoft.com/office/word/2018/wordml/cex\" \
-				xmlns:w16cid=\"http://schemas.microsoft.com/office/word/2016/wordml/cid\" \
-				xmlns:w16=\"http://schemas.microsoft.com/office/word/2018/wordml\" \
-				xmlns:w16sdtdh=\"http://schemas.microsoft.com/office/word/2020/wordml/sdtdatahash\" \
-				xmlns:w16se=\"http://schemas.microsoft.com/office/word/2015/wordml/symex\" \
-				xmlns:wpg=\"http://schemas.microsoft.com/office/word/2010/wordprocessingGroup\" \
-				xmlns:wpi=\"http://schemas.microsoft.com/office/word/2010/wordprocessingInk\" \
-				xmlns:wne=\"http://schemas.microsoft.com/office/word/2006/wordml\" \
-				xmlns:wps=\"http://schemas.microsoft.com/office/word/2010/wordprocessingShape\" \
-				mc:Ignorable=\"w14 w15 w16se w16cid w16 w16cex w16sdtdh wp14\">\
-				<w:body>");
+		                                <w:document xmlns:wpc=\"http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas\" \
+		        xmlns:cx=\"http://schemas.microsoft.com/office/drawing/2014/chartex\" \
+		        xmlns:cx1=\"http://schemas.microsoft.com/office/drawing/2015/9/8/chartex\" \
+		        xmlns:cx2=\"http://schemas.microsoft.com/office/drawing/2015/10/21/chartex\" \
+		        xmlns:cx3=\"http://schemas.microsoft.com/office/drawing/2016/5/9/chartex\" \
+		        xmlns:cx4=\"http://schemas.microsoft.com/office/drawing/2016/5/10/chartex\" \
+		        xmlns:cx5=\"http://schemas.microsoft.com/office/drawing/2016/5/11/chartex\" \
+		        xmlns:cx6=\"http://schemas.microsoft.com/office/drawing/2016/5/12/chartex\" \
+		        xmlns:cx7=\"http://schemas.microsoft.com/office/drawing/2016/5/13/chartex\" \
+		        xmlns:cx8=\"http://schemas.microsoft.com/office/drawing/2016/5/14/chartex\" \
+		        xmlns:mc=\"http://schemas.openxmlformats.org/markup-compatibility/2006\" \
+		        xmlns:aink=\"http://schemas.microsoft.com/office/drawing/2016/ink\" \
+		        xmlns:am3d=\"http://schemas.microsoft.com/office/drawing/2017/model3d\" \
+		        xmlns:o=\"urn:schemas-microsoft-com:office:office\" \
+		        xmlns:r=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships\" \
+		        xmlns:m=\"http://schemas.openxmlformats.org/officeDocument/2006/math\" \
+		        xmlns:v=\"urn:schemas-microsoft-com:vml\" \
+		        xmlns:a=\"http://schemas.openxmlformats.org/drawingml/2006/main\" \
+		        xmlns:pic=\"http://schemas.openxmlformats.org/drawingml/2006/picture\" \
+		        xmlns:wp14=\"http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing\" \
+		        xmlns:wp=\"http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing\" \
+		        xmlns:w10=\"urn:schemas-microsoft-com:office:word\" \
+		        xmlns:w=\"http://schemas.openxmlformats.org/wordprocessingml/2006/main\" \
+		        xmlns:w14=\"http://schemas.microsoft.com/office/word/2010/wordml\" \
+		        xmlns:w15=\"http://schemas.microsoft.com/office/word/2012/wordml\" \
+		        xmlns:w16cex=\"http://schemas.microsoft.com/office/word/2018/wordml/cex\" \
+		        xmlns:w16cid=\"http://schemas.microsoft.com/office/word/2016/wordml/cid\" \
+		        xmlns:w16=\"http://schemas.microsoft.com/office/word/2018/wordml\" \
+		        xmlns:w16sdtdh=\"http://schemas.microsoft.com/office/word/2020/wordml/sdtdatahash\" \
+		        xmlns:w16se=\"http://schemas.microsoft.com/office/word/2015/wordml/symex\" \
+		        xmlns:wpg=\"http://schemas.microsoft.com/office/word/2010/wordprocessingGroup\" \
+		        xmlns:wpi=\"http://schemas.microsoft.com/office/word/2010/wordprocessingInk\" \
+		        xmlns:wne=\"http://schemas.microsoft.com/office/word/2006/wordml\" \
+		        xmlns:wps=\"http://schemas.microsoft.com/office/word/2010/wordprocessingShape\" \
+		        mc:Ignorable=\"w14 w15 w16se w16cid w16 w16cex w16sdtdh wp14\">\
+		        <w:body>");
 
-				for (size_t i = 0; i < m_mapXmlString.size(); ++i)
+		        for (size_t i = 0; i < m_mapXmlString.size(); ++i)
 		{
 			oDocumentStream.WriteStringUTF8(m_mapXmlString[i]->GetData());
 		}
@@ -883,12 +883,12 @@ namespace NSDocxRenderer
 		NSStringUtils::CStringBuilder oWriter;
 
 		oWriter.WriteString(L"<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\
-							<Relationships xmlns=\"http://schemas.openxmlformats.org/package/2006/relationships\">\
-				<Relationship Id=\"rId1\" Type=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships/styles\" Target=\"styles.xml\"/>\
-				<Relationship Id=\"rId2\" Type=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships/settings\" Target=\"settings.xml\"/>\
-				<Relationship Id=\"rId3\" Type=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships/webSettings\" Target=\"webSettings.xml\"/>\
-				<Relationship Id=\"rId4\" Type=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships/fontTable\" Target=\"fontTable.xml\"/>\
-				<Relationship Id=\"rId5\" Type=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships/theme\" Target=\"theme/theme.xml\"/>");
+		                    <Relationships xmlns=\"http://schemas.openxmlformats.org/package/2006/relationships\">\
+		        <Relationship Id=\"rId1\" Type=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships/styles\" Target=\"styles.xml\"/>\
+		        <Relationship Id=\"rId2\" Type=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships/settings\" Target=\"settings.xml\"/>\
+		        <Relationship Id=\"rId3\" Type=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships/webSettings\" Target=\"webSettings.xml\"/>\
+		        <Relationship Id=\"rId4\" Type=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships/fontTable\" Target=\"fontTable.xml\"/>\
+		        <Relationship Id=\"rId5\" Type=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships/theme\" Target=\"theme/theme.xml\"/>");
 
 		for (const auto& pImage : m_oImageManager.m_mapImageData)
 		{
@@ -912,17 +912,17 @@ namespace NSDocxRenderer
 		NSStringUtils::CStringBuilder oWriter;
 		// сохраним fontTable
 		oWriter.WriteString(L"<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\
-							<w:fonts xmlns:mc=\"http://schemas.openxmlformats.org/markup-compatibility/2006\" \
-				xmlns:r=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships\" \
-				xmlns:w=\"http://schemas.openxmlformats.org/wordprocessingml/2006/main\" \
-				xmlns:w14=\"http://schemas.microsoft.com/office/word/2010/wordml\" \
-				xmlns:w15=\"http://schemas.microsoft.com/office/word/2012/wordml\" \
-				xmlns:w16cex=\"http://schemas.microsoft.com/office/word/2018/wordml/cex\" \
-				xmlns:w16cid=\"http://schemas.microsoft.com/office/word/2016/wordml/cid\" \
-				xmlns:w16=\"http://schemas.microsoft.com/office/word/2018/wordml\" \
-				xmlns:w16sdtdh=\"http://schemas.microsoft.com/office/word/2020/wordml/sdtdatahash\" \
-				xmlns:w16se=\"http://schemas.microsoft.com/office/word/2015/wordml/symex\" \
-				mc:Ignorable=\"w14 w15 w16se w16cid w16 w16cex w16sdtdh\">");
+		                    <w:fonts xmlns:mc=\"http://schemas.openxmlformats.org/markup-compatibility/2006\" \
+		        xmlns:r=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships\" \
+		        xmlns:w=\"http://schemas.openxmlformats.org/wordprocessingml/2006/main\" \
+		        xmlns:w14=\"http://schemas.microsoft.com/office/word/2010/wordml\" \
+		        xmlns:w15=\"http://schemas.microsoft.com/office/word/2012/wordml\" \
+		        xmlns:w16cex=\"http://schemas.microsoft.com/office/word/2018/wordml/cex\" \
+		        xmlns:w16cid=\"http://schemas.microsoft.com/office/word/2016/wordml/cid\" \
+		        xmlns:w16=\"http://schemas.microsoft.com/office/word/2018/wordml\" \
+		        xmlns:w16sdtdh=\"http://schemas.microsoft.com/office/word/2020/wordml/sdtdatahash\" \
+		        xmlns:w16se=\"http://schemas.microsoft.com/office/word/2015/wordml/symex\" \
+		        mc:Ignorable=\"w14 w15 w16se w16cid w16 w16cex w16sdtdh\">");
 
 		const auto& cache = m_oFontSelector.GetCache();
 		std::list<CFontSelector::CFontSelectInfo> font_table;
@@ -994,17 +994,17 @@ namespace NSDocxRenderer
 
 		// сохраним styles
 		oWriter.WriteString(L"<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\
-							<w:styles xmlns:mc=\"http://schemas.openxmlformats.org/markup-compatibility/2006\" \
-				xmlns:r=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships\" \
-				xmlns:w=\"http://schemas.openxmlformats.org/wordprocessingml/2006/main\" \
-				xmlns:w14=\"http://schemas.microsoft.com/office/word/2010/wordml\" \
-				xmlns:w15=\"http://schemas.microsoft.com/office/word/2012/wordml\" \
-				xmlns:w16cex=\"http://schemas.microsoft.com/office/word/2018/wordml/cex\" \
-				xmlns:w16cid=\"http://schemas.microsoft.com/office/word/2016/wordml/cid\" \
-				xmlns:w16=\"http://schemas.microsoft.com/office/word/2018/wordml\" \
-				xmlns:w16sdtdh=\"http://schemas.microsoft.com/office/word/2020/wordml/sdtdatahash\" \
-				xmlns:w16se=\"http://schemas.microsoft.com/office/word/2015/wordml/symex\" \
-				mc:Ignorable=\"w14 w15 w16se w16cid w16 w16cex w16sdtdh\">");
+		                    <w:styles xmlns:mc=\"http://schemas.openxmlformats.org/markup-compatibility/2006\" \
+		        xmlns:r=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships\" \
+		        xmlns:w=\"http://schemas.openxmlformats.org/wordprocessingml/2006/main\" \
+		        xmlns:w14=\"http://schemas.microsoft.com/office/word/2010/wordml\" \
+		        xmlns:w15=\"http://schemas.microsoft.com/office/word/2012/wordml\" \
+		        xmlns:w16cex=\"http://schemas.microsoft.com/office/word/2018/wordml/cex\" \
+		        xmlns:w16cid=\"http://schemas.microsoft.com/office/word/2016/wordml/cid\" \
+		        xmlns:w16=\"http://schemas.microsoft.com/office/word/2018/wordml\" \
+		        xmlns:w16sdtdh=\"http://schemas.microsoft.com/office/word/2020/wordml/sdtdatahash\" \
+		        xmlns:w16se=\"http://schemas.microsoft.com/office/word/2015/wordml/symex\" \
+		        mc:Ignorable=\"w14 w15 w16se w16cid w16 w16cex w16sdtdh\">");
 
 		oWriter.WriteString(L"<w:docDefaults>");
 		oWriter.WriteString(L"<w:rPrDefault><w:rPr>");
diff --git a/DocxRenderer/src/logic/Page.cpp b/DocxRenderer/src/logic/Page.cpp
index 1d10c6e6c6..dd355e6404 100644
--- a/DocxRenderer/src/logic/Page.cpp
+++ b/DocxRenderer/src/logic/Page.cpp
@@ -2,8 +2,9 @@
 
 #include <memory>
 #include <map>
+#include <set>
+// #include <assert.h>
 
-#include "../../../DesktopEditor/graphics/GraphicsPath.h"
 #include "../../../DesktopEditor/graphics/pro/Graphics.h"
 
 #include "../resources/Constants.h"
@@ -12,7 +13,7 @@
 namespace NSDocxRenderer
 {
 	CPage::CPage(NSFonts::IApplicationFonts* pAppFonts, const CManagers& oManagers) :
-		m_oManagers(oManagers), m_oContBuilder(oManagers.pFontStyleManager, oManagers.pFontSelector)
+	    m_oManagers(oManagers), m_oContBuilder(oManagers.pFontStyleManager, oManagers.pFontSelector)
 	{
 		m_pAppFonts = pAppFonts;
 		CShape::ResetRelativeHeight();
@@ -59,15 +60,14 @@ namespace NSDocxRenderer
 		m_oTransform.Reset();
 
 		m_oHorVerLinesCollector.Clear();
-		m_arConts.clear();
 		m_arTextLines.clear();
-		m_arDiacriticalSymbols.clear();
 		m_arShapes.clear();
 		m_arParagraphs.clear();
 		m_arTables.clear();
 		m_arOutputObjects.clear();
 		m_oCurrVectorGraphics.Clear();
 		m_oClipVectorGraphics.Clear();
+		m_oContBuilder.Clear();
 		m_arCompleteObjectsXml.clear();
 		m_arLuminosityShapes.clear();
 	}
@@ -81,7 +81,7 @@ namespace NSDocxRenderer
 	{
 		if (m_bIsDeleteTextClipPage)
 			for (auto& line : m_arTextLines)
-				if (line && (line->m_dTop >= m_dHeight || line->m_dBaselinePos <= 0))
+				if (line && (line->m_dTop >= m_dHeight || line->m_dBot <= 0))
 					line = nullptr;
 	}
 
@@ -181,14 +181,14 @@ namespace NSDocxRenderer
 			if (lType & c_nStroke)
 			{
 				s->m_bIsNoStroke = false;
-				s->m_oPen = m_oPen;
-				s->m_oPen.Size *= transform_det;
 			}
 			if (lType & c_nWindingFillMode || lType & c_nEvenOddFillMode)
 			{
 				s->m_bIsNoFill = false;
 				s->m_oBrush = m_oBrush;
 			}
+			s->m_oPen = m_oPen;
+			s->m_oPen.Size *= transform_det;
 		};
 
 		if (!m_arShapes.empty())
@@ -217,10 +217,10 @@ namespace NSDocxRenderer
 		if (!m_oClipVectorGraphics.IsEmpty())
 		{
 			CVectorGraphics new_vector_graphics = CVectorGraphics::CalcBoolean(
-				m_oCurrVectorGraphics,
-				m_oClipVectorGraphics,
-				m_lClipMode,
-				lType);
+			            m_oCurrVectorGraphics,
+			            m_oClipVectorGraphics,
+			            m_lClipMode,
+			            lType);
 
 			if (new_vector_graphics.IsEmpty())
 			{
@@ -260,9 +260,9 @@ namespace NSDocxRenderer
 			return;
 
 		// big white shape with page width & height skip
-		if (fabs(shape->m_dHeight - m_dHeight) <= c_dSHAPE_X_OFFSET * 2 &&
-			fabs(shape->m_dWidth - m_dWidth) <= c_dSHAPE_X_OFFSET * 2 &&
-			shape->m_oBrush.Color1 == c_iWhiteColor)
+		if (fabs(shape->m_dHeight - m_dHeight) <= c_dSHAPE_X_OFFSET_MM * 2 &&
+		        fabs(shape->m_dWidth - m_dWidth) <= c_dSHAPE_X_OFFSET_MM * 2 &&
+		        shape->m_oBrush.Color1 == c_iWhiteColor && !info)
 			return;
 
 		if (!skip_shape)
@@ -273,14 +273,14 @@ namespace NSDocxRenderer
 	}
 
 	void CPage::AddText(
-		const PUINT pUnicodes,
-		const PUINT pGids,
-		const UINT& nCount,
-		const double& fX,
-		const double& fY,
-		const double& fWidth,
-		const double& fHeight,
-		const double& fBaseLineOffset)
+	        const PUINT pUnicodes,
+	        const PUINT pGids,
+	        const UINT& nCount,
+	        const double& fX,
+	        const double& fY,
+	        const double& fWidth,
+	        const double& fHeight,
+	        const double& fBaseLineOffset)
 	{
 		// 9 - \t
 		if (*pUnicodes == 9)
@@ -347,19 +347,23 @@ namespace NSDocxRenderer
 	void CPage::Analyze()
 	{
 		// building objects from symbols
-		m_arConts = m_oContBuilder.GetConts();
-		m_arDiacriticalSymbols = MoveDiacriticalSymbols();
-		m_arTextLines = BuildTextLines();
+		auto conts = m_oContBuilder.GetConts();
+		auto diacs = m_oContBuilder.GetDiacs();
+
+		m_arTextLines = BuildTextLines(conts);
+		AddDiacriticalSymbols(diacs);
 
 		// analyzing data. can take shapes and set them to nullptr
 		AnalyzeShapes();
 		AnalyzeTextLines();
 
+		auto text_line_groups = BuildTextLineGroups();
+
 		// building final objects
-		m_arParagraphs = BuildParagraphs();
+		m_arParagraphs = BuildParagraphs(text_line_groups);
 
 		// if (m_bIsBuildTables)
-		// 	m_arTables = BuildTables();
+		// m_arTables = BuildTables(text_line_groups);
 
 		// post analyze
 		CalcSelected();
@@ -411,10 +415,52 @@ namespace NSDocxRenderer
 
 		return xml_shapes;
 	}
-	void CPage::AddCompleteXml(const std::wstring oXml)
+	NSWasm::CData CPage::GetShapesBin()
+	{
+		ReorderShapesForPptx();
+
+		NSWasm::CData writer;
+		writer.SkipLen();
+		writer.AddInt(0);
+		int countShapes = 0;
+		for (const auto& shape : m_arShapes)
+		{
+			if (!shape)
+				continue;
+			shape->ToBin(writer);
+			++countShapes;
+		}
+
+		if (!m_arCompleteObjectsBinBase64.empty())
+		{
+			for (const auto& elem : m_arCompleteObjectsBinBase64)
+			{
+				int buff_len = NSBase64::Base64DecodeGetRequiredLength(elem.size());
+				BYTE* buff = new BYTE[buff_len];
+
+				if (NSBase64::Base64Decode(elem.c_str(), (int)elem.length(), buff, &buff_len))
+				{
+					writer.Write(buff, buff_len);
+					++countShapes;
+				}
+
+				delete[] buff;
+			}
+		}
+
+		writer.AddInt(countShapes, 4);
+		writer.WriteLen();
+
+		return writer;
+	}
+	void CPage::AddCompleteXml(const std::wstring& oXml)
 	{
 		m_arCompleteObjectsXml.push_back(oXml);
 	}
+	void CPage::AddCompleteBinBase64(const std::string& oBase64)
+	{
+		m_arCompleteObjectsBinBase64.push_back(oBase64);
+	}
 	void CPage::ReorderShapesForPptx()
 	{
 		// переместим nullptr в конец и удалим
@@ -428,26 +474,24 @@ namespace NSDocxRenderer
 		});
 	}
 
-	std::vector<CPage::cont_ptr_t> CPage::MoveDiacriticalSymbols()
+	std::vector<CPage::text_line_ptr_t> CPage::BuildTextLines(const std::vector<cont_ptr_t>& arConts)
 	{
-		std::vector<cont_ptr_t> diac_symbols;
-		for (auto& cont : m_arConts)
-			if (cont && cont->IsDiacritical())
-				diac_symbols.push_back(std::move(cont));
-		return diac_symbols;
-	}
+		text_line_ptr_t curr_line = nullptr;
+		std::vector<text_line_ptr_t> text_lines;
 
-	std::vector<CPage::line_ptr_t> CPage::BuildTextLines()
-	{
-		line_ptr_t curr_line = nullptr;
-		std::vector<line_ptr_t> text_lines;
-
-		for (auto& cont : m_arConts)
+		for (auto& cont : arConts)
 		{
 			if (!cont)
 				continue;
 
-			if (curr_line && fabs(curr_line->m_dBaselinePos - cont->m_dBaselinePos) <= c_dTHE_SAME_STRING_Y_PRECISION_MM)
+			double avg_space_width = cont->m_pFontStyle->GetAvgSpaceWidth();
+			double space_width =
+			        avg_space_width != 0.0 ?
+			            avg_space_width * c_dAVERAGE_SPACE_WIDTH_COEF :
+			            cont->CalculateSpace() * c_dSPACE_WIDTH_COEF;
+
+			if (curr_line && fabs(curr_line->m_dBot - cont->m_dBot) <= c_dTHE_SAME_STRING_Y_PRECISION_MM &&
+			        fabs(curr_line->m_dRight - cont->m_dLeft) <= 3 * space_width)
 			{
 				curr_line->AddCont(cont);
 				continue;
@@ -456,10 +500,11 @@ namespace NSDocxRenderer
 			bool skip = false;
 			for (size_t i = 0; i < text_lines.size(); ++i)
 			{
-				if (fabs(text_lines[i]->m_dBaselinePos - cont->m_dBaselinePos) <= c_dTHE_SAME_STRING_Y_PRECISION_MM)
+				if (fabs(text_lines[i]->m_dBot - cont->m_dBot) <= c_dTHE_SAME_STRING_Y_PRECISION_MM &&
+				        fabs(curr_line->m_dRight - cont->m_dLeft) <= 2 * space_width)
 				{
 					curr_line = text_lines[i];
-					cont->m_bPossibleSplit = true;
+					cont->m_bPossibleHorSplit = true;
 					curr_line->AddCont(cont);
 					skip = true;
 				}
@@ -485,7 +530,10 @@ namespace NSDocxRenderer
 				}
 			}
 			if (only_spaces)
+			{
 				text_lines.erase(text_lines.begin() + i, text_lines.begin() + i + 1);
+				--i;
+			}
 		}
 		return text_lines;
 	}
@@ -522,12 +570,12 @@ namespace NSDocxRenderer
 		}
 	}
 
-	std::vector<CPage::item_ptr_t> CPage::BuildOutputObjects()
+	std::vector<CPage::ooxml_item_ptr_t> CPage::BuildOutputObjects()
 	{
-		std::vector<item_ptr_t> output_objects;
+		std::vector<ooxml_item_ptr_t> output_objects;
 
 		if (m_eTextAssociationType == TextAssociationType::tatPlainParagraph ||
-		    m_eTextAssociationType == TextAssociationType::tatPlainLine)
+		        m_eTextAssociationType == TextAssociationType::tatPlainLine)
 		{
 			CBaseItem* prev_p = nullptr;
 
@@ -540,7 +588,7 @@ namespace NSDocxRenderer
 				if (second_index != m_arParagraphs.size())
 				{
 					auto& second_p = m_arParagraphs[second_index];
-					while (second_index < m_arParagraphs.size() && first_p->m_dBaselinePos > second_p->m_dTop)
+					while (second_index < m_arParagraphs.size() && first_p->m_dBot > second_p->m_dTop)
 						second_index++;
 				}
 
@@ -549,9 +597,9 @@ namespace NSDocxRenderer
 					auto& p = m_arParagraphs[first_index];
 
 					if (!prev_p)
-						p->m_dSpaceBefore = p->m_dTop + c_dCORRECTION_FOR_FIRST_PARAGRAPH;
+						p->m_dSpaceBefore = p->m_dTop + c_dCORRECTION_FIRST_PARAGRAPH_MM;
 					else
-						p->m_dSpaceBefore = p->m_dTop - prev_p->m_dBaselinePos;
+						p->m_dSpaceBefore = p->m_dTop - prev_p->m_dBot;
 
 					output_objects.push_back(p);
 					prev_p = p.get();
@@ -608,8 +656,8 @@ namespace NSDocxRenderer
 		for (size_t i = 0; i < m_arShapes.size(); ++i)
 		{
 			if (!m_arShapes[i] || m_arShapes[i]->m_dHeight > c_dMAX_LINE_HEIGHT_MM || // рассматриваем только тонкие объекты
-				(m_arShapes[i]->m_eGraphicsType != eGraphicsType::gtRectangle &&
-				 m_arShapes[i]->m_eGraphicsType != eGraphicsType::gtCurve))
+			        (m_arShapes[i]->m_eGraphicsType != eGraphicsType::gtRectangle &&
+			         m_arShapes[i]->m_eGraphicsType != eGraphicsType::gtCurve))
 			{
 				continue;
 			}
@@ -632,7 +680,7 @@ namespace NSDocxRenderer
 				bool bIf4 = fabs(m_arShapes[i]->m_dHeight - m_arShapes[j]->m_dHeight) < c_dGRAPHICS_ERROR_IN_LINES_MM;
 
 				// все должно быть на одной линии
-				bool bIf5 = fabs(m_arShapes[i]->m_dBaselinePos - m_arShapes[j]->m_dBaselinePos) < c_dGRAPHICS_ERROR_IN_LINES_MM * 5;
+				bool bIf5 = fabs(m_arShapes[i]->m_dBot - m_arShapes[j]->m_dBot) < c_dGRAPHICS_ERROR_IN_LINES_MM * 5;
 
 				if (bIf1 && (bIf2 || bIf3) && bIf4 && bIf5) // все должно быть на одной линии
 					curr_shape_indexes.push_back(j);
@@ -668,12 +716,12 @@ namespace NSDocxRenderer
 			{
 				const double out_of_page_coeff = 1.1;
 				bool is_out_of_page = shape->m_dTop < 0 ||
-				                      shape->m_dBaselinePos > this->m_dHeight * out_of_page_coeff ||
-				                      shape->m_dLeft < 0 ||
-				                      shape->m_dRight > this->m_dWidth * out_of_page_coeff;
+				        shape->m_dBot > this->m_dHeight * out_of_page_coeff ||
+				        shape->m_dLeft < 0 ||
+				        shape->m_dRight > this->m_dWidth * out_of_page_coeff;
 
 
-				bool is_too_big = (!shape->m_bIsNoFill && (shape->m_dWidth > c_dSHAPE_TROUGH_MAX_MM || shape->m_dHeight > c_dSHAPE_TROUGH_MAX_MM));
+				bool is_too_big = (!shape->m_bIsNoFill && (shape->m_dWidth > c_dSHAPE_TROUGH_MAX_MM && shape->m_dHeight > c_dSHAPE_TROUGH_MAX_MM));
 
 				if (is_too_big || is_out_of_page)
 					continue;
@@ -684,9 +732,8 @@ namespace NSDocxRenderer
 
 	void CPage::AnalyzeTextLines()
 	{
-		// вся логика основана на отсортированных списках объектов
-		std::sort(m_arTextLines.begin(), m_arTextLines.end(), [] (const line_ptr_t& a, const line_ptr_t& b) {
-			return a->m_dBaselinePos < b->m_dBaselinePos;
+		std::sort(m_arTextLines.begin(), m_arTextLines.end(), [] (const text_line_ptr_t& a, const text_line_ptr_t& b) {
+			return a->m_dBot < b->m_dBot;
 		});
 
 		AnalyzeDropCaps();
@@ -695,19 +742,21 @@ namespace NSDocxRenderer
 
 		GetHorVerLines();
 
-		AddDiacriticalSymbols();
 		MergeTextLinesByVatType();
 		DeleteTextClipPage();
 		MergeConts();
 		SplitLines();
 		AnalyzeOverlapLines();
 
-		// переместим nullptr в конец и удалим
+		for (auto& line : m_arTextLines)
+			if (line && line->m_arConts.empty())
+				line = nullptr;
+
 		auto right = MoveNullptr(m_arTextLines.begin(), m_arTextLines.end());
 		m_arTextLines.erase(right, m_arTextLines.end());
 
-		std::sort(m_arTextLines.begin(), m_arTextLines.end(), [] (const line_ptr_t& a, const line_ptr_t& b) {
-			return a->m_dBaselinePos < b->m_dBaselinePos;
+		std::sort(m_arTextLines.begin(), m_arTextLines.end(), [] (const text_line_ptr_t& a, const text_line_ptr_t& b) {
+			return a->m_dBot < b->m_dBot;
 		});
 	}
 
@@ -715,7 +764,7 @@ namespace NSDocxRenderer
 	{
 		double avg_font_size = m_oManagers.pParagraphStyleManager->GetAvgFontSize();
 
-		std::vector<std::pair<cont_ptr_t&, line_ptr_t&>> possible_caps;
+		std::vector<std::pair<cont_ptr_t&, text_line_ptr_t&>> possible_caps;
 		std::vector<cont_ptr_t> drop_caps;
 
 		for (size_t i = 0; i < m_arTextLines.size(); i++)
@@ -796,7 +845,7 @@ namespace NSDocxRenderer
 
 				// берем вторую линию, если символ последний - то начиная со следуюущей, иначе с той же
 				for (size_t uNextLineIndex = uCurrContIndex >= pCurrLine->m_arConts.size() - 1 ?
-												 uCurrLineIndex + 1 : uCurrLineIndex; uNextLineIndex < m_arTextLines.size(); ++uNextLineIndex)
+				     uCurrLineIndex + 1 : uCurrLineIndex; uNextLineIndex < m_arTextLines.size(); ++uNextLineIndex)
 				{
 					auto& pNextLine = m_arTextLines[uNextLineIndex];
 
@@ -806,7 +855,7 @@ namespace NSDocxRenderer
 
 					// посимвольно смотрим некст линию - если та же то следующий символ, если другая - то с нуля
 					for (size_t uNextContIndex = uNextLineIndex != uCurrLineIndex ? 0 : uCurrContIndex + 1;
-						 uNextContIndex < pNextLine->m_arConts.size(); ++uNextContIndex)
+					     uNextContIndex < pNextLine->m_arConts.size(); ++uNextContIndex)
 					{
 						if (!pCurrCont)
 							break;
@@ -825,9 +874,9 @@ namespace NSDocxRenderer
 							pCurrLine->SetVertAlignType(pCurrCont->m_eVertAlignType);
 							pNextLine->SetVertAlignType(pNextCont->m_eVertAlignType);
 							if ((pCurrLine->m_eVertAlignType == eVertAlignType::vatSuperscript &&
-								 pNextLine->m_eVertAlignType == eVertAlignType::vatBase) ||
-								(pCurrLine->m_eVertAlignType == eVertAlignType::vatBase &&
-								 pNextLine->m_eVertAlignType == eVertAlignType::vatSubscript))
+							     pNextLine->m_eVertAlignType == eVertAlignType::vatBase) ||
+							        (pCurrLine->m_eVertAlignType == eVertAlignType::vatBase &&
+							         pNextLine->m_eVertAlignType == eVertAlignType::vatSubscript))
 							{
 								pCurrLine->m_pLine = pNextLine;
 								pNextLine->m_pLine = pCurrLine;
@@ -859,6 +908,7 @@ namespace NSDocxRenderer
 		for (size_t i = 0; i < m_arShapes.size(); ++i)
 		{
 			auto& shape = m_arShapes[i];
+			double shape_coverage = 0;
 			if (!shape || shape->m_eGraphicsType == eGraphicsType::gtNoGraphics)
 				continue;
 
@@ -870,8 +920,8 @@ namespace NSDocxRenderer
 					continue;
 
 				bool is_no_crossing_v = curr_line->AreObjectsNoCrossingByVertically(shape.get());
-				bool is_higher = curr_line->m_dTop > shape->m_dBaselinePos;
-				bool is_lower = curr_line->m_dBaselinePos + curr_line->m_dHeight < shape->m_dTop;
+				bool is_higher = curr_line->m_dTop > shape->m_dBot;
+				bool is_lower = curr_line->m_dBot + curr_line->m_dHeight < shape->m_dTop;
 				if (is_no_crossing_v && (is_higher || is_lower))
 					continue;
 
@@ -881,12 +931,13 @@ namespace NSDocxRenderer
 					if (!curr_cont)
 						continue;
 
-					bool is_width_equal = (curr_line->m_dWidth * 1.05 - shape->m_dWidth) > 0;
+					bool is_line_width_equal = (curr_line->m_dWidth * 1.05 - shape->m_dWidth) > 0;
+					bool is_line_height_equal = (curr_line->m_dHeight * 1.5 - shape->m_dHeight) > 0;
 
-					bool is_crossing_text = IsLineCrossingText(shape, curr_cont) && is_width_equal;
-					bool is_below_text = IsLineBelowText(shape, curr_cont) && is_width_equal;
+					bool is_crossing_text = IsLineCrossingText(shape, curr_cont) && is_line_width_equal;
+					bool is_below_text = IsLineBelowText(shape, curr_cont) && is_line_width_equal;
 					bool is_outline = IsOutline(shape, curr_cont);
-					bool is_highlight = IsHighlight(shape, curr_cont) && curr_line->m_dHeight * 1.5 > shape->m_dHeight && is_width_equal;
+					bool is_highlight = IsHighlight(shape, curr_cont) && is_line_height_equal && is_line_width_equal;
 
 					bool is_smth_true = is_crossing_text || is_below_text || is_outline || is_highlight;
 					if (is_smth_true)
@@ -931,6 +982,8 @@ namespace NSDocxRenderer
 							curr_cont->m_pShape = shape;
 							curr_cont->m_bIsHighlightPresent = true;
 							curr_cont->m_lHighlightColor = shape->m_oBrush.Color1;
+
+							shape_coverage += curr_cont->m_dWidth / shape->m_dWidth;
 						}
 
 						else if (is_outline)
@@ -939,11 +992,11 @@ namespace NSDocxRenderer
 							oBrush.Color1 = shape->m_oPen.Color;
 
 							curr_cont->m_pFontStyle = m_oManagers.pFontStyleManager->GetOrAddFontStyle(
-								oBrush,
-								curr_cont->m_pFontStyle->wsFontName,
-								curr_cont->m_pFontStyle->dFontSize,
-								curr_cont->m_pFontStyle->bItalic,
-								curr_cont->m_pFontStyle->bBold);
+							            oBrush,
+							            curr_cont->m_pFontStyle->wsFontName,
+							            curr_cont->m_pFontStyle->dFontSize,
+							            curr_cont->m_pFontStyle->bItalic,
+							            curr_cont->m_pFontStyle->bBold);
 
 							curr_cont->m_bIsShadowPresent = true;
 							curr_cont->m_bIsOutlinePresent = true;
@@ -955,7 +1008,7 @@ namespace NSDocxRenderer
 						shape_used = true;
 				}
 			}
-			if (shape_used)
+			if (shape_used && (shape_coverage == 0 || shape_coverage > 0.8))
 				shape = nullptr;
 		}
 	}
@@ -964,23 +1017,23 @@ namespace NSDocxRenderer
 	{
 		auto h_type = pCont->CBaseItem::GetHorizontalCrossingType(pShape.get());
 		double dTopBorder = pCont->m_dTop + pCont->m_dHeight / 3;
-		double dBotBorder = pCont->m_dBaselinePos - pCont->m_dHeight / 6;
+		double dBotBorder = pCont->m_dBot - pCont->m_dHeight / 6;
 
 		bool bIf1 = pShape->m_eGraphicsType == eGraphicsType::gtRectangle &&
-					pShape->m_eLineType != eLineType::ltUnknown;
+		        pShape->m_eLineType != eLineType::ltUnknown;
 
 		// Условие пересечения по вертикали
-		bool bIf2 = pShape->m_dTop > dTopBorder && pShape->m_dBaselinePos < dBotBorder;
+		bool bIf2 = pShape->m_dTop > dTopBorder && pShape->m_dBot < dBotBorder;
 
 		// Условие пересечения по горизонтали
 		bool bIf3 = h_type != eHorizontalCrossingType::hctUnknown &&
-					h_type != eHorizontalCrossingType::hctCurrentLeftOfNext &&
-					h_type != eHorizontalCrossingType::hctNoCrossingCurrentLeftOfNext &&
-					h_type != eHorizontalCrossingType::hctNoCrossingCurrentRightOfNext;
+		        h_type != eHorizontalCrossingType::hctCurrentLeftOfNext &&
+		        h_type != eHorizontalCrossingType::hctNoCrossingCurrentLeftOfNext &&
+		        h_type != eHorizontalCrossingType::hctNoCrossingCurrentRightOfNext;
 
 		// Условие для размеров по высоте
 		bool bIf4 = pShape->m_dHeight < pCont->m_dHeight &&
-					pCont->m_dHeight - pShape->m_dHeight > c_dERROR_FOR_TEXT_WITH_GRAPHICS_MM;
+		        pCont->m_dHeight - pShape->m_dHeight > c_dERROR_FOR_TEXT_WITH_GRAPHICS_MM;
 
 		return bIf1 && bIf2 && bIf3 && bIf4;
 	}
@@ -989,22 +1042,22 @@ namespace NSDocxRenderer
 	{
 		auto h_type = pCont->CBaseItem::GetHorizontalCrossingType(pShape.get());
 		bool bIf1 = (pShape->m_eGraphicsType == eGraphicsType::gtRectangle ||
-					 pShape->m_eGraphicsType == eGraphicsType::gtCurve) &&
-					pShape->m_eLineType != eLineType::ltUnknown;
+		             pShape->m_eGraphicsType == eGraphicsType::gtCurve) &&
+		        pShape->m_eLineType != eLineType::ltUnknown;
 
 		//Условие по вертикали
 		double max_diff = std::min(c_dGRAPHICS_ERROR_MM * 3, pCont->m_dHeight * 0.5);
-		bool bIf2 = fabs(pShape->m_dBaselinePos - pCont->m_dBaselinePos) < max_diff;
+		bool bIf2 = fabs(pShape->m_dBot - pCont->m_dBot) < max_diff;
 
 		//Условие пересечения по горизонтали
 		bool bIf3 = h_type != eHorizontalCrossingType::hctUnknown &&
-					h_type != eHorizontalCrossingType::hctCurrentLeftOfNext &&
-					h_type != eHorizontalCrossingType::hctNoCrossingCurrentLeftOfNext &&
-					h_type != eHorizontalCrossingType::hctNoCrossingCurrentRightOfNext;
+		        h_type != eHorizontalCrossingType::hctCurrentLeftOfNext &&
+		        h_type != eHorizontalCrossingType::hctNoCrossingCurrentLeftOfNext &&
+		        h_type != eHorizontalCrossingType::hctNoCrossingCurrentRightOfNext;
 
 		//Условие для размеров по высоте
 		bool bIf4 = pShape->m_dHeight < pCont->m_dHeight * 0.5 &&
-					pCont->m_dHeight - pShape->m_dHeight > c_dERROR_FOR_TEXT_WITH_GRAPHICS_MM;
+		        pCont->m_dHeight - pShape->m_dHeight > c_dERROR_FOR_TEXT_WITH_GRAPHICS_MM;
 
 		return bIf1 && bIf2 && bIf3 && bIf4;
 	}
@@ -1013,22 +1066,22 @@ namespace NSDocxRenderer
 	{
 		auto h_type = pCont->CBaseItem::GetHorizontalCrossingType(pShape.get());
 
-		double dSomeBaseLine1 = pCont->m_dBaselinePos - pCont->m_dHeight * 0.70;
-		double dSomeBaseLine2 = pCont->m_dBaselinePos - pCont->m_dHeight * 0.5;
-		double dSomeBaseLine3 = pCont->m_dBaselinePos - pCont->m_dHeight * 0.3;
+		double dSomeBaseLine1 = pCont->m_dBot - pCont->m_dHeight * 0.70;
+		double dSomeBaseLine2 = pCont->m_dBot - pCont->m_dHeight * 0.5;
+		double dSomeBaseLine3 = pCont->m_dBot - pCont->m_dHeight * 0.3;
 
 		bool bIf1 = pShape->m_eGraphicsType == eGraphicsType::gtRectangle;
 
 		//Условие пересечения по вертикали
-		bool bIf2 = (dSomeBaseLine1 > pShape->m_dTop && dSomeBaseLine1 < pShape->m_dBaselinePos &&
-					 dSomeBaseLine2 > pShape->m_dTop && dSomeBaseLine2 < pShape->m_dBaselinePos &&
-					 dSomeBaseLine3 > pShape->m_dTop && dSomeBaseLine3 < pShape->m_dBaselinePos);
+		bool bIf2 = (dSomeBaseLine1 > pShape->m_dTop && dSomeBaseLine1 < pShape->m_dBot &&
+		             dSomeBaseLine2 > pShape->m_dTop && dSomeBaseLine2 < pShape->m_dBot &&
+		             dSomeBaseLine3 > pShape->m_dTop && dSomeBaseLine3 < pShape->m_dBot);
 
 		//Условие пересечения по горизонтали
 		bool bIf3 = h_type != eHorizontalCrossingType::hctUnknown &&
-					h_type != eHorizontalCrossingType::hctCurrentLeftOfNext &&
-					h_type != eHorizontalCrossingType::hctNoCrossingCurrentLeftOfNext &&
-					h_type != eHorizontalCrossingType::hctNoCrossingCurrentRightOfNext;
+		        h_type != eHorizontalCrossingType::hctNoCrossingCurrentLeftOfNext &&
+		        h_type != eHorizontalCrossingType::hctCurrentLeftOfNext &&
+		        h_type != eHorizontalCrossingType::hctNoCrossingCurrentRightOfNext;
 
 		//Цвета должны быть разными
 		bool bIf4 = pCont->m_pFontStyle->oBrush.Color1 != pShape->m_oBrush.Color1;
@@ -1058,9 +1111,9 @@ namespace NSDocxRenderer
 		return false;
 	}
 
-	void CPage::AddDiacriticalSymbols()
+	void CPage::AddDiacriticalSymbols(const std::vector<cont_ptr_t>& arDiac)
 	{
-		for (auto& d_sym : m_arDiacriticalSymbols)
+		for (auto& d_sym : arDiac)
 		{
 			if (!d_sym)
 				continue;
@@ -1081,9 +1134,9 @@ namespace NSDocxRenderer
 					eHorizontalCrossingType eHType = cont->GetHorizontalCrossingType(d_sym.get());
 
 					if (eVType != eVerticalCrossingType::vctNoCrossingCurrentAboveNext &&
-						eVType != eVerticalCrossingType::vctNoCrossingCurrentBelowNext &&
-						eHType != eHorizontalCrossingType::hctNoCrossingCurrentLeftOfNext &&
-						eHType != eHorizontalCrossingType::hctNoCrossingCurrentRightOfNext)
+					        eVType != eVerticalCrossingType::vctNoCrossingCurrentBelowNext &&
+					        eHType != eHorizontalCrossingType::hctNoCrossingCurrentLeftOfNext &&
+					        eHType != eHorizontalCrossingType::hctNoCrossingCurrentRightOfNext)
 					{
 						bool bIf1 = eHType == eHorizontalCrossingType::hctCurrentOutsideNext;
 						bool bIf2 = eHType == eHorizontalCrossingType::hctCurrentLeftOfNext;
@@ -1092,7 +1145,7 @@ namespace NSDocxRenderer
 						bool bIf5 = eHType == eHorizontalCrossingType::hctRightBorderMatch;
 
 						bool bIf6 = eVType == eVerticalCrossingType::vctCurrentBelowNext ||
-									eVType == eVerticalCrossingType::vctCurrentAboveNext;
+						        eVType == eVerticalCrossingType::vctCurrentAboveNext;
 						bool bIf7 = eVType == eVerticalCrossingType::vctTopAndBottomBordersMatch;
 						bool bIf8 = eVType == eVerticalCrossingType::vctDublicate;
 
@@ -1104,7 +1157,6 @@ namespace NSDocxRenderer
 						{
 							cont->AddSymFront(d_sym->GetText().at(0), 0);
 						}
-						d_sym = nullptr;
 						isBreak = true;
 						break;
 					}
@@ -1123,9 +1175,9 @@ namespace NSDocxRenderer
 				continue;
 
 			if (line->m_eVertAlignType == eVertAlignType::vatSuperscript
-				|| line->m_eVertAlignType == eVertAlignType::vatSubscript)
+			        || line->m_eVertAlignType == eVertAlignType::vatSubscript)
 			{
-				line_ptr_t& base_line = line->m_pLine;
+				text_line_ptr_t& base_line = line->m_pLine;
 				if (base_line)
 				{
 					for (auto& pCont : line->m_arConts)
@@ -1201,11 +1253,11 @@ namespace NSDocxRenderer
 				if (pCont->m_pShape && pCont->m_pShape != pDominantShape)
 				{
 					if (pCont->m_pShape->m_dLeft < pCont->m_dLeft &&
-						pCont->m_pShape->m_dRight > pCont->m_dRight)
+					        pCont->m_pShape->m_dRight > pCont->m_dRight)
 					{
 						if (!pDominantShape ||
-							(pCont->m_pShape->m_dLeft < pDominantShape->m_dLeft &&
-							 pCont->m_pShape->m_dRight > pDominantShape->m_dRight))
+						        (pCont->m_pShape->m_dLeft < pDominantShape->m_dLeft &&
+						         pCont->m_pShape->m_dRight > pDominantShape->m_dRight))
 						{
 							pDominantShape = pCont->m_pShape;
 						}
@@ -1218,37 +1270,37 @@ namespace NSDocxRenderer
 		}
 	}
 
-	bool CPage::IsVerticalLineBetween(item_ptr_t pFirst, item_ptr_t pSecond) const noexcept
+	bool CPage::IsVerticalLineBetween(base_item_ptr_t pFirst, base_item_ptr_t pSecond) const noexcept
 	{
 		double left = std::min(pFirst->m_dRight, pSecond->m_dRight);
 		double right = std::max(pFirst->m_dLeft, pSecond->m_dLeft);
 		double top = std::min(pFirst->m_dTop, pSecond->m_dTop);
-		double bot = std::max(pFirst->m_dBaselinePos, pSecond->m_dBaselinePos);
+		double bot = std::max(pFirst->m_dBot, pSecond->m_dBot);
 
 		auto dummy_cont = std::make_shared<CContText>();
 		dummy_cont->m_dLeft = left - c_dGRAPHICS_ERROR_MM;
 		dummy_cont->m_dRight = right + c_dGRAPHICS_ERROR_MM;
 		dummy_cont->m_dTop = top - c_dGRAPHICS_ERROR_MM;
-		dummy_cont->m_dBaselinePos = bot + c_dGRAPHICS_ERROR_MM;
+		dummy_cont->m_dBot = bot + c_dGRAPHICS_ERROR_MM;
 
 		return IsVerticalLineTrough(dummy_cont);
 	}
-	bool CPage::IsHorizontalLineBetween(item_ptr_t pFirst, item_ptr_t pSecond) const noexcept
+	bool CPage::IsHorizontalLineBetween(base_item_ptr_t pFirst, base_item_ptr_t pSecond) const noexcept
 	{
 		double left = std::min(pFirst->m_dLeft, pSecond->m_dLeft);
 		double right = std::max(pFirst->m_dRight, pSecond->m_dRight);
-		double top = std::min(pFirst->m_dBaselinePos, pSecond->m_dBaselinePos);
+		double top = std::min(pFirst->m_dBot, pSecond->m_dBot);
 		double bot = std::max(pFirst->m_dTop, pSecond->m_dTop);
 
 		auto dummy_cont = std::make_shared<CContText>();
 		dummy_cont->m_dLeft = left - c_dGRAPHICS_ERROR_MM;
 		dummy_cont->m_dRight = right + c_dGRAPHICS_ERROR_MM;
 		dummy_cont->m_dTop = top - c_dGRAPHICS_ERROR_MM;
-		dummy_cont->m_dBaselinePos = bot + c_dGRAPHICS_ERROR_MM;
+		dummy_cont->m_dBot = bot + c_dGRAPHICS_ERROR_MM;
 
 		return IsHorizontalLineTrough(dummy_cont);
 	}
-	bool CPage::IsVerticalLineBetween(line_ptr_t pFirst, line_ptr_t pSecond) const noexcept
+	bool CPage::IsVerticalLineBetween(text_line_ptr_t pFirst, text_line_ptr_t pSecond) const noexcept
 	{
 		double left = std::min(pFirst->m_dRight, pSecond->m_dRight);
 		double right = std::max(pFirst->m_dLeft, pSecond->m_dLeft);
@@ -1259,11 +1311,11 @@ namespace NSDocxRenderer
 		dummy_cont->m_dLeft = left - c_dGRAPHICS_ERROR_MM;
 		dummy_cont->m_dRight = right + c_dGRAPHICS_ERROR_MM;
 		dummy_cont->m_dTop = top - c_dGRAPHICS_ERROR_MM;
-		dummy_cont->m_dBaselinePos = bot + c_dGRAPHICS_ERROR_MM;
+		dummy_cont->m_dBot = bot + c_dGRAPHICS_ERROR_MM;
 
 		return IsVerticalLineTrough(dummy_cont);
 	}
-	bool CPage::IsHorizontalLineBetween(line_ptr_t pFirst, line_ptr_t pSecond) const noexcept
+	bool CPage::IsHorizontalLineBetween(text_line_ptr_t pFirst, text_line_ptr_t pSecond) const noexcept
 	{
 		double left = std::min(pFirst->m_dLeft, pSecond->m_dLeft);
 		double right = std::max(pFirst->m_dRight, pSecond->m_dRight);
@@ -1274,15 +1326,15 @@ namespace NSDocxRenderer
 		dummy_cont->m_dLeft = left - c_dGRAPHICS_ERROR_MM;
 		dummy_cont->m_dRight = right + c_dGRAPHICS_ERROR_MM;
 		dummy_cont->m_dTop = top - c_dGRAPHICS_ERROR_MM;
-		dummy_cont->m_dBaselinePos = bot + c_dGRAPHICS_ERROR_MM;
+		dummy_cont->m_dBot = bot + c_dGRAPHICS_ERROR_MM;
 
 		return IsHorizontalLineTrough(dummy_cont);
 	}
 
-	bool CPage::IsVerticalLineTrough(item_ptr_t pFirst) const noexcept
+	bool CPage::IsVerticalLineTrough(base_item_ptr_t pFirst) const noexcept
 	{
 		const auto& ver_lines = m_oHorVerLinesCollector.GetVertical();
-		const auto height = pFirst->m_dBaselinePos - pFirst->m_dTop;
+		const auto height = pFirst->m_dBot - pFirst->m_dTop;
 		const auto center = pFirst->m_dTop + height / 2;
 
 		for (const auto& line : ver_lines)
@@ -1291,14 +1343,14 @@ namespace NSDocxRenderer
 
 		return false;
 	}
-	bool CPage::IsHorizontalLineTrough(item_ptr_t pFirst) const noexcept
+	bool CPage::IsHorizontalLineTrough(base_item_ptr_t pFirst) const noexcept
 	{
 		const auto& hor_lines = m_oHorVerLinesCollector.GetHorizontal();
 		const auto width = pFirst->m_dRight - pFirst->m_dLeft;
 		const auto center = pFirst->m_dLeft + width / 2;
 
 		for (const auto& line : hor_lines)
-			if (line.pos > pFirst->m_dTop && line.pos < pFirst->m_dBaselinePos && line.min <= center && line.max >= center)
+			if (line.pos > pFirst->m_dTop && line.pos < pFirst->m_dBot && line.min <= center && line.max >= center)
 				return true;
 
 		return false;
@@ -1320,9 +1372,9 @@ namespace NSDocxRenderer
 				bool is_cont_wide = line->m_arConts[i]->m_dWidth > c_dLINE_SPLIT_DISTANCE_MM;
 				bool is_shape_trough = IsVerticalLineTrough(line->m_arConts[i]);
 
-				if ((i != line->m_arConts.size() - 1 && line->m_arConts[i + 1]->m_bPossibleSplit && is_space)
-					|| (is_space && is_cont_wide)
-					|| is_shape_trough)
+				if ((i != line->m_arConts.size() - 1 && line->m_arConts[i + 1]->m_bPossibleHorSplit && is_space)
+				        || (is_space && is_cont_wide)
+				        || is_shape_trough)
 				{
 					std::vector<cont_ptr_t> line_conts_first;
 					std::vector<cont_ptr_t> line_conts_second;
@@ -1336,8 +1388,8 @@ namespace NSDocxRenderer
 						if (line->m_arConts[j])
 							line_conts_second.push_back(line->m_arConts[j]);
 
-					line_ptr_t line_first(new CTextLine());
-					line_ptr_t line_second(new CTextLine());
+					text_line_ptr_t line_first(new CTextLine());
+					text_line_ptr_t line_second(new CTextLine());
 
 					line_first->AddConts(line_conts_first);
 					line_second->AddConts(line_conts_second);
@@ -1362,85 +1414,116 @@ namespace NSDocxRenderer
 		}
 	}
 
-	std::vector<std::vector<CPage::line_ptr_t>> CPage::GetLinesByGroups()
+	std::vector<CPage::text_line_group_ptr_t> CPage::BuildTextLineGroups()
 	{
-		struct Group {
-			double left{};
-			double right{};
-			double top{};
-			double bot{};
-			bool closed{false};
-		};
+		if (m_arTextLines.empty())
+			return {};
 
-		std::vector<std::vector<line_ptr_t>> line_groups;
-		std::vector<Group> groups;
+		double curr_bot = std::numeric_limits<double>::max();
+		std::vector<std::vector<text_line_ptr_t>> bot_aligned_text_lines;
 
-		for (auto& line : m_arTextLines)
+		for (const auto& line : m_arTextLines)
 		{
-			bool is_found = false;
-			bool is_create_new = false;
-			size_t insert_index = 0;
-
-			for (size_t index = 0; index < groups.size(); ++index)
+			if (fabs(line->m_dBotWithMaxDescent - curr_bot) < 4 * c_dTHE_SAME_STRING_Y_PRECISION_MM)
 			{
-				auto& group = groups[index];
-				bool is_crossing_h = !((line->m_dRight <= group.left) || (line->m_dLeft >= group.right));
-				bool is_crossing_v = !((line->m_dBotWithMaxDescent <= group.top) || (line->m_dTopWithMaxAscent >= group.bot));
-
-				if (!group.closed && is_crossing_h)
-				{
-					if (is_crossing_v)
-					{
-						groups[index].closed = true;
-						continue;
-					}
-					if (!is_found && !is_create_new)
-					{
-						is_found = true;
-						insert_index = index;
-					}
-					else
-					{
-						groups[insert_index].closed = true;
-						groups[index].closed = true;
-						is_create_new = true;
-						is_found = false;
-					}
-				}
-			}
-			if (is_found)
-			{
-				groups[insert_index].left = std::min(groups[insert_index].left, line->m_dLeft);
-				groups[insert_index].right = std::max(groups[insert_index].right, line->m_dRight);
-				groups[insert_index].bot = std::max(groups[insert_index].bot, line->m_dBaselinePos);
-				groups[insert_index].top = std::min(groups[insert_index].top, line->m_dTop);
-				line_groups[insert_index].push_back(line);
+				bot_aligned_text_lines.back().push_back(line);
 			}
 			else
 			{
-				Group new_group;
-				new_group.left = line->m_dLeft;
-				new_group.right = line->m_dRight;
-				new_group.top = line->m_dTop;
-				new_group.bot = line->m_dBaselinePos;
-				new_group.closed = false;
-				groups.push_back(new_group);
-
-				std::vector<line_ptr_t> line_group;
-				line_group.push_back(line);
-				line_groups.push_back(line_group);
+				bot_aligned_text_lines.push_back({});
+				bot_aligned_text_lines.back().push_back(line);
+				curr_bot = line->m_dBotWithMaxDescent;
 			}
 		}
-		return line_groups;
+
+		std::vector<text_line_group_ptr_t> text_line_groups;
+		std::vector<bool> ar_is_group_open;
+		for (const auto& text_lines : bot_aligned_text_lines)
+		{
+			// lines [i] belongs group [j] (like a matrix)
+			// only 1 [i] to 1 [j] on the same bot position
+			std::vector<std::vector<bool>> lines_x_groups(text_lines.size());
+			for (auto& lxg : lines_x_groups)
+				lxg.resize(text_line_groups.size());
+
+			for (size_t i = 0; i < text_lines.size(); ++i)
+			{
+				for (size_t j = 0; j < text_line_groups.size(); ++j)
+				{
+					if (!ar_is_group_open[j])
+						continue;
+
+					// line inside of the group
+					if (CmpOrEqual(text_lines[i]->m_dLeft, text_line_groups[j]->m_dRight, c_dTHE_SAME_STRING_X_PRECISION_MM) &&
+					        CmpOrEqual(text_line_groups[j]->m_dLeft, text_lines[i]->m_dRight, c_dTHE_SAME_STRING_X_PRECISION_MM))
+					{
+						lines_x_groups[i][j] = true;
+					}
+				}
+			}
+
+			for (size_t j = 0; j < text_line_groups.size(); ++j)
+			{
+				size_t lines_counter = 0;
+				for (size_t i = 0; i < text_lines.size(); ++i)
+					if (lines_x_groups[i][j])
+						lines_counter++;
+
+				// if lines_counter > 1 then group is overloaded - 1 group 1 text line
+				if (lines_counter > 1)
+					ar_is_group_open[j] = false;
+			}
+
+			std::vector<text_line_group_ptr_t> groups_add_later;
+
+			for (size_t i = 0; i < text_lines.size(); ++i)
+			{
+				std::vector<size_t> groups_taken;
+				for (size_t j = 0; j < text_line_groups.size(); ++j)
+				{
+					if (!ar_is_group_open[j])
+						continue;
+
+					if (lines_x_groups[i][j])
+						groups_taken.push_back(j);
+				}
+				if (groups_taken.size() != 1 ||
+				        text_lines[i]->m_dTop - text_line_groups[groups_taken[0]]->m_dBot > c_dLINE_GROUP_SPLIT_MM)
+				{
+					for (const auto& taken : groups_taken)
+						ar_is_group_open[taken] = false;
+
+					auto group_new = std::make_shared<CBaseItemGroup<CTextLine>>();
+					group_new->AddItem(text_lines[i]);
+					groups_add_later.push_back(std::move(group_new));
+					ar_is_group_open.push_back(true);
+				}
+				else
+				{
+					text_line_groups[groups_taken[0]]->AddItem(text_lines[i]);
+				}
+			}
+			for (auto&& group : groups_add_later)
+				text_line_groups.push_back(std::move(group));
+		}
+
+		std::sort(text_line_groups.begin(), text_line_groups.end(),
+		          [] (const text_line_group_ptr_t& g1, const text_line_group_ptr_t& g2) {
+			if (fabs(g1->m_dTop - g2->m_dTop) < 4 * c_dTHE_SAME_STRING_Y_PRECISION_MM)
+				return g1->m_dLeft < g2->m_dLeft;
+			return g1->m_dTop < g2->m_dTop;
+
+		});
+		return text_line_groups;
 	}
 
 	void CPage::AnalyzeOverlapLines()
 	{
 		auto no_crossing = [] (const eHorizontalCrossingType& h_type, const eVerticalCrossingType& v_type) {
 			return h_type == eHorizontalCrossingType::hctNoCrossingCurrentLeftOfNext ||
-			       h_type == eHorizontalCrossingType::hctNoCrossingCurrentRightOfNext ||
-			       v_type == eVerticalCrossingType::vctNoCrossingCurrentAboveNext ||
-			       v_type == eVerticalCrossingType::vctNoCrossingCurrentBelowNext;
+			        h_type == eHorizontalCrossingType::hctNoCrossingCurrentRightOfNext ||
+			        v_type == eVerticalCrossingType::vctNoCrossingCurrentAboveNext ||
+			        v_type == eVerticalCrossingType::vctNoCrossingCurrentBelowNext;
 		};
 
 		// линии из которых сделаем шейпы
@@ -1482,12 +1565,11 @@ namespace NSDocxRenderer
 		}
 	}
 
-	std::vector<CPage::paragraph_ptr_t> CPage::BuildParagraphs()
+	std::vector<CPage::paragraph_ptr_t> CPage::BuildParagraphs(const std::vector<text_line_group_ptr_t>& arTextLineGroups)
 	{
-		if (m_arTextLines.empty())
+		if (arTextLineGroups.empty())
 			return {};
 
-		auto line_groups = GetLinesByGroups();
 		std::vector<paragraph_ptr_t> ar_paragraphs;
 
 		double min_left{m_dWidth};
@@ -1503,18 +1585,18 @@ namespace NSDocxRenderer
 		// lamda to setup and add paragpraph
 		auto add_paragraph = [this, &max_right, &min_left, &ar_paragraphs] (paragraph_ptr_t& paragraph) {
 
-			paragraph->m_dBaselinePos = paragraph->m_arLines.back()->m_dBaselinePos;
-			paragraph->m_dTop = paragraph->m_arLines.front()->m_dTop;
-			paragraph->m_dRight = max_right + c_dERROR_OF_PARAGRAPH_BORDERS_MM;
+			paragraph->m_dBot = paragraph->m_arTextLines.back()->m_dBot;
+			paragraph->m_dTop = paragraph->m_arTextLines.front()->m_dTop;
+			paragraph->m_dRight = max_right;
 			paragraph->m_dLeft = min_left;
 
 			paragraph->m_dWidth = paragraph->m_dRight - paragraph->m_dLeft;
-			paragraph->m_dHeight = paragraph->m_dBaselinePos - paragraph->m_dTop;
+			paragraph->m_dHeight = paragraph->m_dBot - paragraph->m_dTop;
 
 			paragraph->m_dRightBorder = m_dWidth - paragraph->m_dRight;
 			paragraph->m_dLeftBorder = min_left;
 
-			paragraph->m_dLineHeight = paragraph->m_dHeight / paragraph->m_arLines.size();
+			paragraph->m_dLineHeight = paragraph->m_dHeight / paragraph->m_arTextLines.size();
 			paragraph->m_bIsNeedFirstLineIndent = false;
 			paragraph->m_dFirstLine = 0;
 			paragraph->m_wsStyleId = m_oManagers.pParagraphStyleManager->GetDefaultParagraphStyleId(*paragraph);
@@ -1522,7 +1604,7 @@ namespace NSDocxRenderer
 			paragraph->MergeLines();
 
 			// setting TextAlignmentType
-			if (paragraph->m_arLines.size() > 1)
+			if (paragraph->m_arTextLines.size() > 1)
 			{
 				Position position_curr;
 				position_curr.left   = true;
@@ -1531,10 +1613,10 @@ namespace NSDocxRenderer
 
 				bool first_left = false;
 
-				for (size_t index = 1; index < paragraph->m_arLines.size(); ++index)
+				for (size_t index = 1; index < paragraph->m_arTextLines.size(); ++index)
 				{
-					auto& curr_line = paragraph->m_arLines[index];
-					auto& prev_line = paragraph->m_arLines[index - 1];
+					auto& curr_line = paragraph->m_arTextLines[index];
+					auto& prev_line = paragraph->m_arTextLines[index - 1];
 
 					// indent check
 					if (index == 1)
@@ -1561,7 +1643,7 @@ namespace NSDocxRenderer
 				// indent check
 				if (paragraph->m_eTextAlignmentType == CParagraph::tatByLeft && !first_left)
 				{
-					double left_diff = paragraph->m_arLines[0]->m_dLeft - paragraph->m_arLines[1]->m_dLeft;
+					double left_diff = paragraph->m_arTextLines[0]->m_dLeft - paragraph->m_arTextLines[1]->m_dLeft;
 					paragraph->m_bIsNeedFirstLineIndent = true;
 					paragraph->m_dFirstLine = left_diff;
 
@@ -1578,13 +1660,13 @@ namespace NSDocxRenderer
 		};
 
 		// lamda to add line and setup min_left/max_right
-		auto add_line = [&min_left, &max_right] (paragraph_ptr_t& paragraph, const line_ptr_t& curr_line) {
+		auto add_line = [&min_left, &max_right] (paragraph_ptr_t& paragraph, const text_line_ptr_t& curr_line) {
 			min_left = std::min(min_left, curr_line->m_dLeft);
 			max_right = std::max(max_right, curr_line->m_dRight);
-			paragraph->m_arLines.push_back(curr_line);
+			paragraph->m_arTextLines.push_back(curr_line);
 		};
 
-		auto build_paragraphs = [this, add_line, add_paragraph] (const std::vector<line_ptr_t>& text_lines) {
+		auto build_paragraphs = [this, add_line, add_paragraph] (const std::vector<text_line_ptr_t>& text_lines) {
 			// ar_spacing[index]- расстояние строки до строки снизу
 			// если 0.0 - строка последняя
 			std::vector<double> ar_spacings(text_lines.size(), 0.0);
@@ -1611,7 +1693,7 @@ namespace NSDocxRenderer
 			// calcs spacings & positions
 			for (size_t index = 0; index < text_lines.size() - 1; ++index)
 			{
-				ar_spacings[index] = text_lines[index + 1]->m_dTop - text_lines[index]->m_dBaselinePos;
+				ar_spacings[index] = text_lines[index + 1]->m_dTop - text_lines[index]->m_dBot;
 				avg_spacing = (avg_spacing / (avg_spacing_n + 1)) * avg_spacing_n + (ar_spacings[index] / (avg_spacing_n + 1));
 
 				auto& left_curr = text_lines[index]->m_dLeft;
@@ -1710,7 +1792,8 @@ namespace NSDocxRenderer
 				}
 
 				// первая строка может быть с отступом
-				if (is_first_line)
+				double first_line_indent = line_top->m_dLeft - line_bot->m_dLeft;
+				if (is_first_line && first_line_indent < c_dMAX_FIRST_LINE_INDENT)
 				{
 					// если больше трех линий - проверим третью
 					if (index < ar_positions.size() - 2)
@@ -1773,7 +1856,7 @@ namespace NSDocxRenderer
 
 				double diff = 0;
 
-				if (position.right)
+				if (position.right && !position.left)
 					diff = line_with_first_left - curr_min_left;
 				else if (position.left || ar_indents[index])
 					diff = curr_max_right - line_with_first_right;
@@ -1816,7 +1899,7 @@ namespace NSDocxRenderer
 
 		// 1 строчка в параграфе
 		if (m_eTextAssociationType == TextAssociationType::tatPlainLine ||
-			m_eTextAssociationType == TextAssociationType::tatShapeLine)
+		        m_eTextAssociationType == TextAssociationType::tatShapeLine)
 		{
 			auto paragraph = std::make_shared<CParagraph>();
 			for (auto& curr_line : m_arTextLines)
@@ -1827,25 +1910,254 @@ namespace NSDocxRenderer
 		}
 
 		else if (m_eTextAssociationType == TextAssociationType::tatPlainParagraph ||
-				 m_eTextAssociationType == TextAssociationType::tatParagraphToShape)
+		         m_eTextAssociationType == TextAssociationType::tatParagraphToShape)
 		{
-			for (auto& g : line_groups)
-				build_paragraphs(g);
+			for (auto& g : arTextLineGroups)
+				build_paragraphs(g->m_arItems);
 		}
 
 		std::sort(ar_paragraphs.begin(), ar_paragraphs.end(), [] (const paragraph_ptr_t& a, const paragraph_ptr_t& b) {
-			return a->m_dBaselinePos < b->m_dBaselinePos;
+			return a->m_dBot < b->m_dBot;
 		});
 
 		return ar_paragraphs;
 	}
 
-	std::vector<CPage::table_ptr_t> CPage::BuildTables()
+	std::vector<CPage::text_cell_group_ptr_t> CPage::BuildTextCellGroups(const std::vector<CPage::text_line_group_ptr_t>& arTextLineGroups)
 	{
-		auto cells = BuildCells();
-		auto rows = BuildRows(cells);
-		std::vector<table_ptr_t> tables;
+		std::vector<CPage::text_cell_ptr_t> text_cells;
+		for (const auto& text_line_group : arTextLineGroups)
+		{
+			auto text_cell_new = std::make_shared<CTextCell>();
+			text_cell_new->RecalcWithNewItem(text_line_group.get());
+			text_cells.push_back(std::move(text_cell_new));
+		}
 
+		std::sort(text_cells.begin(), text_cells.end(),
+		        [] (const text_cell_ptr_t& cell1, const text_cell_ptr_t& cell2) {
+			if (fabs(cell1->m_dTop - cell2->m_dTop) < c_dMAX_TABLE_LINE_WIDTH_MM)
+				return cell1->m_dLeft < cell2->m_dLeft;
+			return cell1->m_dTop < cell2->m_dTop;
+		});
+
+		std::vector<text_cell_group_ptr_t> text_cell_groups;
+		text_cell_group_ptr_t curr_group = std::make_shared<CBaseItemGroup<CTextCell>>();
+		curr_group->AddItem(text_cells[0]);
+
+		double curr_bot = text_cells[0]->m_dBot;
+		for (size_t i = 1; i < text_cells.size(); ++i)
+		{
+			const auto& cell = text_cells[i];
+			if (cell->m_dTop - curr_bot < 10)
+				curr_group->AddItem(cell);
+			else
+			{
+				text_cell_groups.push_back(std::move(curr_group));
+				curr_group = std::make_shared<CBaseItemGroup<CTextCell>>();
+				curr_group->AddItem(cell);
+			}
+			curr_bot = cell->m_dBot;
+		}
+		text_cell_groups.push_back(curr_group);
+
+		auto vert_crossing = [] (const CBaseItem* item1, const CBaseItem* item2) {
+			bool left_inside = item1->m_dLeft < item2->m_dRight;
+			bool right_inside = item1->m_dRight > item2->m_dLeft;
+			return left_inside && right_inside;
+		};
+
+		auto hor_crossing = [] (const CBaseItem* item1, const CBaseItem* item2) {
+			bool left_inside = item1->m_dTop < item2->m_dBot;
+			bool right_inside = item1->m_dBot > item2->m_dTop;
+			return left_inside && right_inside;
+		};
+
+		for (const auto& text_cells : text_cell_groups)
+		{
+			// calc max gaps between groups bot / right
+			for (size_t i = 0; i < text_cells->m_arItems.size(); ++i)
+			{
+				// max bot calc
+				for (size_t j = 0; j < text_cells->m_arItems.size(); ++j)
+					if (text_cells->m_arItems[i]->m_dBot < text_cells->m_arItems[j]->m_dTop && vert_crossing(text_cells->m_arItems[i].get(), text_cells->m_arItems[j].get()))
+						text_cells->m_arItems[i]->m_dMaxPossibleBot = std::min(text_cells->m_arItems[i]->m_dMaxPossibleBot, text_cells->m_arItems[j]->m_dTop);
+
+				// max right calc
+				for (size_t j = 0; j < text_cells->m_arItems.size(); ++j)
+					if (text_cells->m_arItems[i]->m_dRight < text_cells->m_arItems[j]->m_dLeft &&
+					        hor_crossing(text_cells->m_arItems[i].get(), text_cells->m_arItems[j].get()))
+						text_cells->m_arItems[i]->m_dMaxPossibleRight = std::min(text_cells->m_arItems[i]->m_dMaxPossibleRight, text_cells->m_arItems[j]->m_dLeft);
+			}
+
+			// setting aligned params bot / right
+			for (size_t i = 0; i < text_cells->m_arItems.size(); ++i)
+			{
+				// bot recalc
+				for (size_t j = 0; j < text_cells->m_arItems.size(); ++j)
+				{
+					if (hor_crossing(text_cells->m_arItems[i].get(), text_cells->m_arItems[j].get()) && i != j)
+					{
+						if (text_cells->m_arItems[i]->m_dMaxPossibleBot > text_cells->m_arItems[j]->m_dBot)
+						{
+							text_cells->m_arItems[i]->m_dBot = std::max(text_cells->m_arItems[i]->m_dBot, text_cells->m_arItems[j]->m_dBot);
+							text_cells->m_arItems[i]->m_dHeight = text_cells->m_arItems[i]->m_dBot - text_cells->m_arItems[i]->m_dTop;
+						}
+						else
+							break;
+					}
+				}
+
+				// right recalc
+				for (size_t j = 0; j < text_cells->m_arItems.size(); ++j)
+				{
+					if (vert_crossing(text_cells->m_arItems[i].get(), text_cells->m_arItems[j].get()) && i != j)
+					{
+						if (text_cells->m_arItems[i]->m_dMaxPossibleRight > text_cells->m_arItems[j]->m_dRight)
+						{
+							text_cells->m_arItems[i]->m_dRight = std::max(text_cells->m_arItems[i]->m_dRight, text_cells->m_arItems[j]->m_dRight);
+							text_cells->m_arItems[i]->m_dWidth = text_cells->m_arItems[i]->m_dRight - text_cells->m_arItems[i]->m_dLeft;
+						}
+						else
+							break;
+					}
+				}
+			}
+
+			// calc max gaps between groups top / left
+			for (int i = text_cells->m_arItems.size() - 1; i >= 0; --i)
+			{
+				// max top calc
+				for (int j = text_cells->m_arItems.size() - 1; j >= 0; --j)
+					if (text_cells->m_arItems[i]->m_dTop > text_cells->m_arItems[j]->m_dBot &&
+					        vert_crossing(text_cells->m_arItems[i].get(), text_cells->m_arItems[j].get()))
+						text_cells->m_arItems[i]->m_dMinPossibleTop = std::max(text_cells->m_arItems[i]->m_dMinPossibleTop, text_cells->m_arItems[j]->m_dBot);
+
+				// max left calc
+				for (int j = text_cells->m_arItems.size() - 1; j >= 0; --j)
+					if (text_cells->m_arItems[i]->m_dLeft > text_cells->m_arItems[j]->m_dRight &&
+					        hor_crossing(text_cells->m_arItems[i].get(), text_cells->m_arItems[j].get()))
+						text_cells->m_arItems[i]->m_dMinPossibleLeft = std::max(text_cells->m_arItems[i]->m_dMinPossibleLeft, text_cells->m_arItems[j]->m_dRight);
+			}
+
+			// setting aligned params top / left
+			for (int i = text_cells->m_arItems.size() - 1; i >= 0; --i)
+			{
+				// top recalc
+				for (int j = text_cells->m_arItems.size() - 1; j >= 0; --j)
+				{
+					if (hor_crossing(text_cells->m_arItems[i].get(), text_cells->m_arItems[j].get()) && i != j)
+					{
+						if (text_cells->m_arItems[i]->m_dMinPossibleTop < text_cells->m_arItems[j]->m_dTop)
+						{
+							text_cells->m_arItems[i]->m_dTop = std::min(text_cells->m_arItems[i]->m_dTop, text_cells->m_arItems[j]->m_dTop);
+							text_cells->m_arItems[i]->m_dHeight = text_cells->m_arItems[i]->m_dBot - text_cells->m_arItems[i]->m_dTop;
+						}
+						else
+							break;
+					}
+				}
+
+				// left recalc
+				for (int j = text_cells->m_arItems.size() - 1; j >= 0; --j)
+				{
+					if (vert_crossing(text_cells->m_arItems[i].get(), text_cells->m_arItems[j].get()) && i != j)
+					{
+						if (text_cells->m_arItems[i]->m_dMinPossibleLeft > text_cells->m_arItems[j]->m_dLeft)
+						{
+							text_cells->m_arItems[i]->m_dRight = std::min(text_cells->m_arItems[i]->m_dLeft, text_cells->m_arItems[j]->m_dLeft);
+							text_cells->m_arItems[i]->m_dWidth = text_cells->m_arItems[i]->m_dRight - text_cells->m_arItems[i]->m_dLeft;
+						}
+						else
+							break;
+					}
+				}
+			}
+		}
+
+		return text_cell_groups;
+	}
+
+	std::vector<CPage::table_ptr_t> CPage::BuildTables(const std::vector<text_line_group_ptr_t>& arTextLineGroups)
+	{
+		auto graphical_cells = BuildGraphicalCells();
+		auto text_cell_groups = BuildTextCellGroups(arTextLineGroups);
+
+		std::vector<cell_group_ptr_t> cell_groups;
+		for (const auto& text_cell_group : text_cell_groups)
+		{
+			cell_group_ptr_t cell_group_new = std::make_shared<CBaseItemGroup<CTable::CCell>>();
+			for (auto& text_cell : text_cell_group->m_arItems)
+			{
+				auto cell_new = std::make_shared<CTable::CCell>();
+				cell_new->RecalcWithNewItem(text_cell.get());
+				cell_group_new->AddItem(std::move(cell_new));
+			}
+			cell_groups.push_back(std::move(cell_group_new));
+			cell_group_new = std::make_shared<CBaseItemGroup<CTable::CCell>>();
+		}
+
+		if (cell_groups.empty())
+			return {};
+
+		// sets paragraphs into cells
+		for (auto& cells : cell_groups)
+			for (auto& cell : cells->m_arItems)
+				for (auto& paragraph : m_arParagraphs)
+				{
+					if (!paragraph)
+						continue;
+
+					bool top = fabs(cell->m_dTop - paragraph->m_arTextLines.front()->m_dTopWithMaxAscent) < c_dGRAPHICS_ERROR_MM
+					        || paragraph->m_arTextLines.front()->m_dTopWithMaxAscent > cell->m_dTop;
+					bool bot = fabs(cell->m_dBot - paragraph->m_dBot) < c_dGRAPHICS_ERROR_MM
+					        || paragraph->m_dBot < cell->m_dBot;
+					bool left = fabs(cell->m_dLeft - paragraph->m_dLeft) < c_dGRAPHICS_ERROR_MM
+					        || paragraph->m_dLeft > cell->m_dLeft;
+					bool right = fabs(cell->m_dRight - paragraph->m_dRight) < c_dGRAPHICS_ERROR_MM
+					        || paragraph->m_dRight < cell->m_dRight;
+					if (top && bot && left && right)
+					{
+						paragraph->m_dLeftBorder = paragraph->m_dLeft - cell->m_dLeft;
+						paragraph->m_dRightBorder = 0;
+						if (!cell->m_arParagraphs.empty())
+							paragraph->m_dSpaceBefore = paragraph->m_dTop - cell->m_arParagraphs.back()->m_dBot;
+						else if (paragraph->m_dTop - cell->m_dTop > 0)
+							paragraph->m_dSpaceBefore = paragraph->m_dTop - cell->m_dTop;
+						else
+							paragraph->m_dSpaceBefore = 0;
+						paragraph->m_dSpaceAfter = 0;
+						cell->AddParagraph(paragraph);
+						paragraph = nullptr;
+					}
+				}
+
+		auto right = MoveNullptr(m_arParagraphs.begin(), m_arParagraphs.end());
+		m_arParagraphs.erase(right, m_arParagraphs.end());
+
+		std::sort(m_arParagraphs.begin(), m_arParagraphs.end(), [] (const paragraph_ptr_t& p1, const paragraph_ptr_t& p2) {
+			return p1->m_dBot < p2->m_dBot;
+		});
+
+		std::vector<CTable::row_ptr_t> rows;
+		CTable::row_ptr_t curr_row = nullptr;
+		for (auto& cells : cell_groups)
+			for (auto& cell : cells->m_arItems)
+			{
+				if (!curr_row)
+				{
+					curr_row = std::make_shared<CTable::CRow>();
+				}
+				else if (fabs(curr_row->m_dBot - cell->m_dBot) > c_dMAX_TABLE_LINE_WIDTH_MM)
+				{
+					rows.push_back(std::move(curr_row));
+					curr_row = std::make_shared<CTable::CRow>();
+				}
+				curr_row->AddCell(cell);
+			}
+		if (!curr_row->IsEmpty())
+			rows.push_back(std::move(curr_row));
+
+		std::vector<table_ptr_t> tables;
 		table_ptr_t curr_table = nullptr;
 		for (const auto& row : rows)
 		{
@@ -1853,7 +2165,7 @@ namespace NSDocxRenderer
 			{
 				curr_table = std::make_shared<CTable>();
 			}
-			else if (fabs(curr_table->m_dBaselinePos - row->m_dTop) > c_dGRAPHICS_ERROR_MM)
+			else if (fabs(curr_table->m_dBot - row->m_dTop) > c_dMAX_TABLE_LINE_WIDTH_MM)
 			{
 				tables.push_back(std::move(curr_table));
 				curr_table = std::make_shared<CTable>();
@@ -1863,34 +2175,244 @@ namespace NSDocxRenderer
 		if (!curr_table->IsEmpty())
 			tables.push_back(std::move(curr_table));
 
+
+		for (auto& t : tables)
+			t->CalcGridCols();
+
 		return tables;
 	}
-	std::vector<CTable::cell_ptr_t> CPage::BuildCells()
+
+	std::vector<CPage::graphical_cell_ptr_t> CPage::BuildGraphicalCells()
 	{
+		struct Crossing;
+		struct Line;
+
+		enum class eLineDirection
+		{
+			ldTop,
+			ldBot,
+			ldLeft,
+			ldRight
+		};
+
+		struct Line
+		{
+			Crossing* crossing;
+			size_t shape_index;
+			eLineDirection direction;
+		};
+
+		// crossing is a logical intersection between two lines
+		// contains the lines from this crossing
 		struct Crossing
 		{
 			Point p {};
-			std::vector<Point> lines {};
-			Crossing(const Point& _p, const std::vector<Point>& _lines)
+			std::vector<Line> lines {};
+
+			Crossing() = default;
+			Crossing(const Point& _p, const std::vector<Line> _lines)
 			{
 				p = _p;
 				lines = _lines;
 			}
 		};
-		std::vector<Crossing> crossings;
+
+		// returns index of the line with a direction
+		auto get_line = [] (const eLineDirection& direction, const std::vector<Line>& lines) -> const Line* {
+			for (size_t i = 0; i < lines.size(); ++i)
+				if (lines[i].direction == direction)
+					return &lines[i];
+			return nullptr;
+		};
+
+		// goes into direction through crossings (like a graph).
+		// add used shapes into out_indexes to remove it later
+		auto go_direction_until = [&get_line] (Crossing* crossing,
+		        const Point& p,
+		        const eLineDirection& direction,
+		        std::set<size_t>& out_indexes) -> bool {
+
+			// difference depends on direction
+			auto diff = [&crossing, &p, &direction] () -> double {
+				if (direction == eLineDirection::ldRight) return p.x - crossing->p.x;
+				if (direction == eLineDirection::ldLeft) return crossing->p.x - p.x;
+				if (direction == eLineDirection::ldBot) return p.y - crossing->p.y;
+				if (direction == eLineDirection::ldTop) return crossing->p.y - p.y;
+			};
+
+			while (diff() > c_dMAX_TABLE_LINE_WIDTH_MM)
+			{
+				auto curr_line = get_line(direction, crossing->lines);
+				if (!curr_line)
+					return false;
+
+				out_indexes.insert(curr_line->shape_index);
+				crossing = curr_line->crossing;
+
+				if (fabs(diff()) < c_dMAX_TABLE_LINE_WIDTH_MM)
+					return true;
+			}
+			return false;
+		};
+
+		// vector contains ptrs for easy exist-check
+		std::vector<std::shared_ptr<Crossing>> crossings;
 		auto find_crossing = [&crossings] (const Point& p) -> Crossing* {
 			for (auto& crossing : crossings)
 			{
-				if (fabs(crossing.p.x - p.x) < c_dGRAPHICS_ERROR_MM &&
-				        fabs(crossing.p.y - p.y) < c_dGRAPHICS_ERROR_MM)
-					return &crossing;
+				if (!crossing)
+					continue;
+
+				if (fabs(crossing->p.x - p.x) < c_dMAX_TABLE_LINE_WIDTH_MM &&
+				        fabs(crossing->p.y - p.y) < c_dMAX_TABLE_LINE_WIDTH_MM)
+					return crossing.get();
 			}
 			return nullptr;
 		};
 
-		for (const auto& shape : m_arShapes)
+		auto precise_crossing_p = [] (Crossing* cr, const Point& p, const eLineDirection& direction) {
+			if (cr->lines.size() == 1)
+			{
+				switch (cr->lines[0].direction)
+				{
+				case eLineDirection::ldLeft:
+				case eLineDirection::ldRight:
+					if (direction == eLineDirection::ldLeft || direction == eLineDirection::ldRight)
+						cr->p.x = (cr->p.x + p.x) / 2;
+					else
+						cr->p.x = p.x;
+					break;
+				case eLineDirection::ldBot:
+				case eLineDirection::ldTop:
+					if (direction == eLineDirection::ldBot || direction == eLineDirection::ldTop)
+						cr->p.y = (cr->p.y + p.y) / 2;
+					else
+						cr->p.y = p.y;
+					break;
+				default:
+					break;
+				}
+			}
+		};
+
+		// check and adds points
+		auto add_crossings = [&precise_crossing_p, &crossings, &find_crossing, this] (const Point& p1, const Point& p2, size_t index) {
+			Crossing* crossing1 = find_crossing(p1);
+			Crossing* crossing2 = find_crossing(p2);
+
+			eLineDirection direction12;
+			eLineDirection direction21;
+
+			if (fabs(p1.y - p2.y) < c_dMAX_TABLE_LINE_WIDTH_MM)
+			{
+				direction12 = p1.x > p2.x ? eLineDirection::ldLeft : eLineDirection::ldRight;
+				direction21 = p1.x < p2.x ? eLineDirection::ldLeft : eLineDirection::ldRight;
+			}
+
+			else if (fabs(p1.x - p2.x) < c_dMAX_TABLE_LINE_WIDTH_MM)
+			{
+				direction12 = p1.y > p2.y ? eLineDirection::ldTop : eLineDirection::ldBot;
+				direction21 = p1.y < p2.y ? eLineDirection::ldTop : eLineDirection::ldBot;
+			}
+
+			// add empty crossing if no exists
+			if (!crossing1)
+			{
+				Crossing cr;
+				cr.p = p1;
+				crossings.push_back(std::make_shared<Crossing>(cr));
+				crossing1 = crossings.back().get();
+			}
+			if (!crossing2)
+			{
+				Crossing cr;
+				cr.p = p2;
+				crossings.push_back(std::make_shared<Crossing>(cr));
+				crossing2 = crossings.back().get();
+			}
+
+			auto curr_crossing_eq = [&crossing1] (const Line& line) -> bool {
+				return line.crossing == crossing1;
+			};
+			if (std::find_if(crossing2->lines.begin(), crossing2->lines.end(), curr_crossing_eq) == crossing2->lines.end())
+			{
+				precise_crossing_p(crossing2, p2, direction21);
+				Line line {crossing1, index, direction21};
+				crossing2->lines.push_back(std::move(line));
+			}
+
+			auto prev_crossing_eq = [&crossing2] (const Line& line) -> bool {
+				return line.crossing == crossing2;
+			};
+			if (std::find_if(crossing1->lines.begin(), crossing1->lines.end(), prev_crossing_eq) == crossing1->lines.end())
+			{
+				precise_crossing_p(crossing1, p1, direction12);
+				Line line {crossing2, index, direction12};
+				crossing1->lines.push_back(std::move(line));
+			}
+
+		};
+
+		// 2 main cases
+		// 1. lines of tables as a big rectangles with lines (onlyoffice), work with path commands
+		// 2. lines of tables as a small rectangels for a single line (adobe), work with entire shape
+		// also word -> pdf adobe sets points as crossings of the table lines, so we can use it
+
+		// check for adobe points
+		std::vector<std::pair<const Crossing*, size_t>> points_delete_later;
+		for (size_t i = 0; i < m_arShapes.size(); ++i)
 		{
-			if (!shape)
+			auto& shape = m_arShapes[i];
+			if (!shape || shape->m_eGraphicsType != eGraphicsType::gtRectangle || shape->m_pImageInfo != nullptr)
+				continue;
+
+			// possible point of crossing in a adobe table
+			if (shape->m_dWidth < c_dMAX_TABLE_LINE_WIDTH_MM && shape->m_dHeight < c_dMAX_TABLE_LINE_WIDTH_MM)
+			{
+				Crossing cr;
+				cr.p.x = shape->m_dLeft + shape->m_dWidth / 2;
+				cr.p.y = shape->m_dTop + shape->m_dHeight;
+				auto cr_ptr = std::make_shared<Crossing>(cr);
+				crossings.push_back(cr_ptr);
+				points_delete_later.push_back({cr_ptr.get(), i});
+			}
+		}
+
+		for (size_t i = 0; i < m_arShapes.size(); ++i)
+		{
+			auto& shape = m_arShapes[i];
+			if (!shape || shape->m_eGraphicsType != eGraphicsType::gtRectangle || shape->m_pImageInfo != nullptr)
+				continue;
+
+			bool is_done = false;
+			if (shape->m_eSimpleLineType == eSimpleLineType::sltUnknown)
+			{
+				// possible point of crossing in a adobe table
+				if (shape->m_dWidth < c_dMAX_TABLE_LINE_WIDTH_MM && shape->m_dHeight < c_dMAX_TABLE_LINE_WIDTH_MM)
+				{
+					is_done = true;
+				}
+
+				// vertical line
+				else if (shape->m_dWidth < c_dMAX_TABLE_LINE_WIDTH_MM && shape->m_dHeight > c_dMAX_TABLE_LINE_WIDTH_MM)
+				{
+					Point p1(shape->m_dLeft + shape->m_dWidth / 2, shape->m_dTop);
+					Point p2(shape->m_dLeft + shape->m_dWidth / 2, shape->m_dBot);
+					add_crossings(p1, p2, i);
+					is_done = true;
+				}
+
+				// horizontal line
+				else if (shape->m_dWidth > c_dMAX_TABLE_LINE_WIDTH_MM && shape->m_dHeight < c_dMAX_TABLE_LINE_WIDTH_MM)
+				{
+					Point p1(shape->m_dLeft, shape->m_dTop + shape->m_dHeight / 2);
+					Point p2(shape->m_dRight, shape->m_dTop + shape->m_dHeight / 2);
+					add_crossings(p1, p2, i);
+					is_done = true;
+				}
+			}
+
+			if (is_done)
 				continue;
 
 			Point prev {};
@@ -1901,134 +2423,103 @@ namespace NSDocxRenderer
 					if (command.type == CVectorGraphics::ePathCommandType::pctLine)
 					{
 						const auto& curr = command.points.back();
-						auto prev_crossing = find_crossing(prev);
-						auto curr_crossing = find_crossing(curr);
 
-						// add empty vector if no exists
-						if (!prev_crossing)
-							crossings.push_back({prev, {curr}});
-						else
-							prev_crossing->lines.push_back(curr);
-
-						if (!curr_crossing)
-							crossings.push_back({curr, {prev}});
-						else
-							curr_crossing->lines.push_back(prev);
-
-						prev = curr;
+						// pure vertical / horizontal lines only
+						// not small lines
+						if (fabs(prev.x - curr.x) > c_dMAX_TABLE_LINE_WIDTH_MM && fabs(prev.y - curr.y) > c_dMAX_TABLE_LINE_WIDTH_MM ||
+						        (fabs(prev.x - curr.x) < c_dMAX_TABLE_LINE_WIDTH_MM && fabs(prev.y - curr.y) < c_dMAX_TABLE_LINE_WIDTH_MM))
+						{
+							prev = curr;
+							continue;
+						}
+						add_crossings(prev, curr, i);
 					}
 					prev = command.points.back();
 				}
 			}
 		}
 
+		// remove adobe points line crossing shapes if used
+		for (auto& cr : points_delete_later)
+			if (!cr.first->lines.empty())
+				m_arShapes[cr.second] = nullptr;
+
+		// remove empty crossings
+		for (auto& cr : crossings)
+			if (cr && cr->lines.empty())
+				cr = nullptr;
+
+		auto cr_right = MoveNullptr(crossings.begin(), crossings.end());
+		crossings.erase(cr_right, crossings.end());
+
 		// sorting guarantee creating cell once (by taking second cross j > i)
-		std::sort(crossings.begin(), crossings.end(), [] (const Crossing& c1, const Crossing& c2) {
-			if (fabs(c1.p.y - c2.p.y) < c_dGRAPHICS_ERROR_MM)
-				return c1.p.x < c2.p.x;
-			return c1.p.y < c2.p.y;
+		std::sort(crossings.begin(), crossings.end(), [] (const std::shared_ptr<Crossing>& c1, const std::shared_ptr<Crossing>& c2) {
+			if (fabs(c1->p.y - c2->p.y) < c_dMAX_TABLE_LINE_WIDTH_MM)
+				return c1->p.x < c2->p.x;
+			return c1->p.y < c2->p.y;
 		});
 
-		std::vector<CTable::cell_ptr_t> cells;
+		std::vector<graphical_cell_ptr_t> graphical_cells;
+		std::map<size_t, bool> remove_later;
 		for (size_t i = 0; i < crossings.size(); ++i)
 		{
 			for (size_t j = i + 1; j < crossings.size(); ++j)
 			{
-				const auto& first = crossings.at(i);
-				const auto& second = crossings.at(j);
+				const auto& cr_first = crossings.at(i);
+				const auto& cr_second = crossings.at(j);
 
 				// first should be top left corner
 				// and second right bot (not the same line ofc)
-				if (fabs(first.p.x - second.p.x) < c_dGRAPHICS_ERROR_MM ||
-				        first.p.x > second.p.x ||
-				        fabs(first.p.y - second.p.y) < c_dGRAPHICS_ERROR_MM ||
-				        first.p.y > second.p.y)
+				if (fabs(cr_first->p.x - cr_second->p.x) < c_dMAX_TABLE_LINE_WIDTH_MM ||
+				        cr_first->p.x > cr_second->p.x ||
+				        fabs(cr_first->p.y - cr_second->p.y) < c_dMAX_TABLE_LINE_WIDTH_MM ||
+				        cr_first->p.y > cr_second->p.y)
 					continue;
 
-				// 2 points should be the same
-				size_t equals = 0;
-				for (const auto& fl : first.lines)
-					for (const auto& sl : second.lines)
-						if (fabs(fl.x - sl.x) < c_dGRAPHICS_ERROR_MM && fabs(fl.y - sl.y) < c_dGRAPHICS_ERROR_MM)
-							++equals;
+				const Line* cr_f_top = get_line(eLineDirection::ldRight, cr_first->lines);
+				const Line* cr_f_left = get_line(eLineDirection::ldBot, cr_first->lines);
+				const Line* cr_s_bot = get_line(eLineDirection::ldLeft, cr_second->lines);
+				const Line* cr_s_right = get_line(eLineDirection::ldTop, cr_second->lines);
 
-				if (equals == 2)
-				{
-					auto cell = std::make_shared<CTable::CCell>();
-					cell->m_dLeft = first.p.x;
-					cell->m_dRight = second.p.x;
-					cell->m_dTop = first.p.y;
-					cell->m_dBaselinePos = second.p.y;
-					cell->m_dWidth = cell->m_dRight - cell->m_dLeft;
-					cell->m_dHeight = cell->m_dBaselinePos - cell->m_dTop;
-					cells.push_back(cell);
-					break;
-				}
+				if (!cr_f_top || !cr_f_left || !cr_s_bot ||  !cr_s_right)
+					continue;
+
+				std::set<size_t> shape_indexes;
+				bool is_connected = go_direction_until(cr_first.get(), cr_second->p, eLineDirection::ldRight, shape_indexes);
+				is_connected &= go_direction_until(cr_first.get(), cr_second->p, eLineDirection::ldBot, shape_indexes);
+				is_connected &= go_direction_until(cr_second.get(), cr_first->p, eLineDirection::ldLeft, shape_indexes);
+				is_connected &= go_direction_until(cr_second.get(), cr_first->p, eLineDirection::ldTop, shape_indexes);
+
+				if (!is_connected)
+					continue;
+
+				for (const auto& index : shape_indexes)
+					remove_later[index] = true;
+
+				auto graphical_cell = std::make_shared<CGraphicalCell>();
+				graphical_cell->m_dLeft = cr_first->p.x;
+				graphical_cell->m_dRight = cr_second->p.x;
+				graphical_cell->m_dTop = cr_first->p.y;
+				graphical_cell->m_dBot = cr_second->p.y;
+				graphical_cell->m_dWidth = graphical_cell->m_dRight - graphical_cell->m_dLeft;
+				graphical_cell->m_dHeight = graphical_cell->m_dBot - graphical_cell->m_dTop;
+				graphical_cells.push_back(std::move(graphical_cell));
+				break;
 			}
 		}
 
-		// sets paragraphs into cells
-		for (auto& cell : cells)
-			for (auto& paragraph : m_arParagraphs)
-			{
-				if (!paragraph)
-					continue;
-
-				bool top = fabs(cell->m_dTop - paragraph->m_dTop) < 2 * c_dGRAPHICS_ERROR_MM || paragraph->m_dTop > cell->m_dTop;
-				bool bot = fabs(cell->m_dBaselinePos - paragraph->m_dBaselinePos) < c_dGRAPHICS_ERROR_MM || paragraph->m_dBaselinePos < cell->m_dBaselinePos;
-				bool left = fabs(cell->m_dLeft - paragraph->m_dLeft) < c_dGRAPHICS_ERROR_MM || paragraph->m_dLeft > cell->m_dLeft;
-				bool right = fabs(cell->m_dRight - paragraph->m_dRight) < c_dGRAPHICS_ERROR_MM || paragraph->m_dRight < cell->m_dRight;
-				if (top && bot && left && right)
-				{
-					cell->AddParagraph(paragraph);
-					paragraph = nullptr;
-				}
-			}
-		auto right = MoveNullptr(m_arParagraphs.begin(), m_arParagraphs.end());
-		m_arParagraphs.erase(right, m_arParagraphs.end());
-		std::sort(m_arParagraphs.begin(), m_arParagraphs.end(), [] (const paragraph_ptr_t& p1, const paragraph_ptr_t& p2) {
-			return p1->m_dBaselinePos < p2->m_dBaselinePos;
-		});
-		return cells;
-	}
-	std::vector<CTable::row_ptr_t> CPage::BuildRows(std::vector<CTable::cell_ptr_t>& arCells)
-	{
-		std::sort(arCells.begin(), arCells.end(), [] (const CTable::cell_ptr_t c1, const CTable::cell_ptr_t& c2) {
-			if (fabs(c1->m_dBaselinePos - c2->m_dBaselinePos) < c_dGRAPHICS_ERROR_MM)
-				return c1->m_dLeft < c2->m_dLeft;
-			return c1->m_dBaselinePos < c2->m_dBaselinePos;
-		});
-
-		std::vector<CTable::row_ptr_t> rows;
-		CTable::row_ptr_t curr_row = nullptr;
-		for (auto& cell : arCells)
-		{
-			if (!curr_row)
-			{
-				curr_row = std::make_shared<CTable::CRow>();
-			}
-			else if (fabs(curr_row->m_dBaselinePos - cell->m_dBaselinePos) > c_dGRAPHICS_ERROR_MM)
-			{
-				rows.push_back(std::move(curr_row));
-				curr_row = std::make_shared<CTable::CRow>();
-			}
-			curr_row->AddCell(cell);
-		}
-		if (!curr_row->IsEmpty())
-			rows.push_back(std::move(curr_row));
-
-		return rows;
+		return graphical_cells;
 	}
 
-	CPage::shape_ptr_t CPage::CreateSingleLineShape(line_ptr_t& pLine)
+	CPage::shape_ptr_t CPage::CreateSingleLineShape(text_line_ptr_t& pLine)
 	{
 		auto pParagraph = std::make_shared<CParagraph>();
 
-		pParagraph->m_arLines.push_back(pLine);
+		pParagraph->m_arTextLines.push_back(pLine);
 		pParagraph->m_dLeft = pLine->m_dLeft;
 		pParagraph->m_dTop = pLine->m_dTop;
-		pParagraph->m_dBaselinePos = pLine->m_dBaselinePos;
-		pParagraph->m_dWidth = pLine->m_dWidth + c_dERROR_OF_PARAGRAPH_BORDERS_MM;
+		pParagraph->m_dBot = pLine->m_dBot;
+		pParagraph->m_dWidth = pLine->m_dWidth;
 		pParagraph->m_dHeight = pLine->m_dHeight;
 		pParagraph->m_dRight = pLine->m_dRight;
 		pParagraph->m_dLineHeight = pParagraph->m_dHeight;
@@ -2046,7 +2537,7 @@ namespace NSDocxRenderer
 
 		pShape->m_dLeft = pParagraph->m_dLeft;
 		pShape->m_dTop = pParagraph->m_dTop;
-		pShape->m_dBaselinePos = pParagraph->m_dBaselinePos;
+		pShape->m_dBot = pParagraph->m_dBot;
 		pShape->m_dWidth = pParagraph->m_dWidth;
 		pShape->m_dHeight = pParagraph->m_dHeight;
 		pShape->m_dRight = pParagraph->m_dRight;
@@ -2062,7 +2553,7 @@ namespace NSDocxRenderer
 		pShape->m_dLeft = pParagraph->m_dLeft;
 		pShape->m_dTop = pParagraph->m_dTop;
 		pShape->m_dRight =  pParagraph->m_dRight;
-		pShape->m_dBaselinePos = pParagraph->m_dBaselinePos;
+		pShape->m_dBot = pParagraph->m_dBot;
 		pShape->m_dHeight = pParagraph->m_dHeight;
 		pShape->m_dWidth = pParagraph->m_dWidth;
 
@@ -2176,7 +2667,7 @@ namespace NSDocxRenderer
 
 		Aggplus::CImage img;
 		img.Create(data, width_pix, height_pix, stride, true);
-		auto info = m_oManagers.pImageManager->WriteImage(&img, pShape->m_dTop, pShape->m_dBaselinePos, pShape->m_dWidth, pShape->m_dHeight);
+		auto info = m_oManagers.pImageManager->WriteImage(&img, pShape->m_dTop, pShape->m_dBot, pShape->m_dWidth, pShape->m_dHeight);
 		pShape->m_dRotation = 0;
 
 		DrawImage(pShape, info, pShape->m_oVector);
diff --git a/DocxRenderer/src/logic/Page.h b/DocxRenderer/src/logic/Page.h
index 0b2567de24..c425923f90 100644
--- a/DocxRenderer/src/logic/Page.h
+++ b/DocxRenderer/src/logic/Page.h
@@ -68,50 +68,65 @@ namespace NSDocxRenderer
 		void DrawPath(LONG lType, const std::shared_ptr<CImageInfo> pInfo);
 
 		void AddText(
-			const PUINT pUnicodes,
-			const PUINT pGids,
-			const UINT& nCount,
-			const double& fX,
-			const double& fY,
-			const double& fWidth,
-			const double& fHeight,
-			const double& fBaseLineOffset);
+		        const PUINT pUnicodes,
+		        const PUINT pGids,
+		        const UINT& nCount,
+		        const double& fX,
+		        const double& fY,
+		        const double& fWidth,
+		        const double& fHeight,
+		        const double& fBaseLineOffset);
 
 		void Analyze();
 		void Record(NSStringUtils::CStringBuilder& oWriter, bool bIsLastPage);
 
 		std::vector<std::wstring> GetXmlShapes();
 		std::vector<std::wstring> GetXmlShapesPptx();
-		void AddCompleteXml(const std::wstring oXml);
+		NSWasm::CData GetShapesBin();
+
+		void AddCompleteXml(const std::wstring& oXml);
+		void AddCompleteBinBase64(const std::string& oBase64);
 
 	private:
 		using shape_ptr_t = std::shared_ptr<CShape>;
 		using cont_ptr_t = std::shared_ptr<CContText>;
-		using line_ptr_t = std::shared_ptr<CTextLine>;
-		using item_ptr_t = std::shared_ptr<CBaseItem>;
+		using text_line_ptr_t = std::shared_ptr<CTextLine>;
+		using base_item_ptr_t = std::shared_ptr<CBaseItem>;
+		using ooxml_item_ptr_t = std::shared_ptr<IOoxmlItem>;
 		using paragraph_ptr_t = std::shared_ptr<CParagraph>;
 		using table_ptr_t = std::shared_ptr<CTable>;
 
+		using graphical_cell_ptr_t = std::shared_ptr<CGraphicalCell>;
+		using text_cell_ptr_t = std::shared_ptr<CTextCell>;
+		using cell_ptr_t = std::shared_ptr<CTable::CCell>;
+
+		using text_line_group_ptr_t = std::shared_ptr<CBaseItemGroup<CTextLine>>;
+		using text_cell_group_ptr_t = std::shared_ptr<CBaseItemGroup<CTextCell>>;
+		using cell_group_ptr_t = std::shared_ptr<CBaseItemGroup<CTable::CCell>>;
+
 		// returns std::vector of conts with diac. symbols and remove it from m_arConts
 		std::vector<cont_ptr_t> MoveDiacriticalSymbols();
 
 		// returns std::vector of text lines builded from m_arConts
-		std::vector<line_ptr_t> BuildTextLines();
+		std::vector<text_line_ptr_t> BuildTextLines(const std::vector<cont_ptr_t>& arConts);
+
+		// build text line groups
+		std::vector<text_line_group_ptr_t> BuildTextLineGroups();
 
 		// returns std::vector of paragraphs builded from m_arTextLines
-		std::vector<paragraph_ptr_t> BuildParagraphs();
+		std::vector<paragraph_ptr_t> BuildParagraphs(const std::vector<text_line_group_ptr_t>& arTextLineGroups);
+
+		// return groups of text cells
+		std::vector<text_cell_group_ptr_t> BuildTextCellGroups(const std::vector<text_line_group_ptr_t>& arTextLineGroups);
 
 		// returns std::vector of tables builded from shapes and paragraphes
-		std::vector<table_ptr_t> BuildTables();
+		std::vector<table_ptr_t> BuildTables(const std::vector<text_line_group_ptr_t>& arTextLineGroups);
 
-		// returns std::vector of cells for tables
-		std::vector<CTable::cell_ptr_t> BuildCells();
-
-		// returns std::vector of rows for tables
-		std::vector<CTable::row_ptr_t> BuildRows(std::vector<CTable::cell_ptr_t>& arCells);
+		// return std::vector of graphical cells (from shapes)
+		std::vector<graphical_cell_ptr_t> BuildGraphicalCells();
 
 		// returns std::vector of base items builded from m_arParagraphs
-		std::vector<item_ptr_t> BuildOutputObjects();
+		std::vector<ooxml_item_ptr_t> BuildOutputObjects();
 
 		// analyze shapes (set lines type)
 		void AnalyzeShapes();
@@ -132,7 +147,7 @@ namespace NSDocxRenderer
 		void AnalyzeEffects();
 
 		// adds diacritical symbols in conts
-		void AddDiacriticalSymbols();
+		void AddDiacriticalSymbols(const std::vector<cont_ptr_t>& arDiac);
 
 		// super-sub scripts line merge
 		void MergeTextLinesByVatType();
@@ -167,27 +182,24 @@ namespace NSDocxRenderer
 		// for drawingml is no tag behind-doc - so we need to reorder shapes
 		void ReorderShapesForPptx();
 
-		// get lines by groups by X
-		std::vector<std::vector<line_ptr_t>> GetLinesByGroups();
-
 		bool IsLineCrossingText(shape_ptr_t pShape, cont_ptr_t pCont) const noexcept;
 		bool IsLineBelowText(shape_ptr_t pShape, cont_ptr_t pCont) const noexcept;
 		bool IsHighlight(shape_ptr_t pShape, cont_ptr_t pCont) const noexcept;
 		bool IsOutline(shape_ptr_t pShape, cont_ptr_t pCont) const noexcept;
 
-		bool IsVerticalLineBetween(item_ptr_t pFirst, item_ptr_t pSecond) const noexcept;
-		bool IsHorizontalLineBetween(item_ptr_t pFirst, item_ptr_t pSecond) const noexcept;
+		bool IsVerticalLineBetween(base_item_ptr_t pFirst, base_item_ptr_t pSecond) const noexcept;
+		bool IsHorizontalLineBetween(base_item_ptr_t pFirst, base_item_ptr_t pSecond) const noexcept;
 
-		bool IsVerticalLineBetween(line_ptr_t pFirst, line_ptr_t pSecond) const noexcept;
-		bool IsHorizontalLineBetween(line_ptr_t pFirst, line_ptr_t pSecond) const noexcept;
+		bool IsVerticalLineBetween(text_line_ptr_t pFirst, text_line_ptr_t pSecond) const noexcept;
+		bool IsHorizontalLineBetween(text_line_ptr_t pFirst, text_line_ptr_t pSecond) const noexcept;
 
-		bool IsVerticalLineTrough(item_ptr_t pFirst) const noexcept;
-		bool IsHorizontalLineTrough(item_ptr_t pFirst) const noexcept;
+		bool IsVerticalLineTrough(base_item_ptr_t pFirst) const noexcept;
+		bool IsHorizontalLineTrough(base_item_ptr_t pFirst) const noexcept;
 
 		void ToXml(NSStringUtils::CStringBuilder& oWriter) const noexcept;
 		void WriteSectionToFile(bool bLastPage, NSStringUtils::CStringBuilder& oWriter) const noexcept;
 
-		static shape_ptr_t CreateSingleLineShape(line_ptr_t& pLine);
+		static shape_ptr_t CreateSingleLineShape(text_line_ptr_t& pLine);
 		static shape_ptr_t CreateSingleParagraphShape(paragraph_ptr_t& pParagraph);
 
 		void DrawImage(shape_ptr_t pShape, std::shared_ptr<CImageInfo> oImg, CVectorGraphics& imageVector);
@@ -204,15 +216,14 @@ namespace NSDocxRenderer
 		CContTextBuilder      m_oContBuilder;
 		CHorVerLinesCollector m_oHorVerLinesCollector;
 
-		std::vector<cont_ptr_t>      m_arConts;
-		std::vector<line_ptr_t>      m_arTextLines;
-		std::vector<cont_ptr_t>      m_arDiacriticalSymbols;
-		std::vector<shape_ptr_t>     m_arShapes;
-		std::vector<paragraph_ptr_t> m_arParagraphs;
-		std::vector<table_ptr_t>     m_arTables;
+		std::vector<shape_ptr_t>      m_arShapes;
+		std::vector<text_line_ptr_t>  m_arTextLines;
+		std::vector<paragraph_ptr_t>  m_arParagraphs;
+		std::vector<table_ptr_t>      m_arTables;
+		std::vector<ooxml_item_ptr_t> m_arOutputObjects;
 
-		std::vector<item_ptr_t>   m_arOutputObjects;
 		std::vector<std::wstring> m_arCompleteObjectsXml;
+		std::vector<std::string>  m_arCompleteObjectsBinBase64;
 
 		// save the luminosity shapes for later filling
 		std::vector<shape_ptr_t> m_arLuminosityShapes;
diff --git a/DocxRenderer/src/logic/elements/BaseItem.cpp b/DocxRenderer/src/logic/elements/BaseItem.cpp
index 48406eb64f..cc9c5fa4af 100644
--- a/DocxRenderer/src/logic/elements/BaseItem.cpp
+++ b/DocxRenderer/src/logic/elements/BaseItem.cpp
@@ -6,76 +6,102 @@
 
 namespace NSDocxRenderer
 {
-	CBaseItem& CBaseItem::operator=(const CBaseItem& oSrc)
+	CBaseItem::CBaseItem()
 	{
-		if (this == &oSrc)
+	}
+	CBaseItem::CBaseItem(const CBaseItem& other) :
+	    m_dTop(other.m_dTop),
+	    m_dBot(other.m_dBot),
+	    m_dLeft(other.m_dLeft),
+	    m_dRight(other.m_dRight),
+	    m_dHeight(other.m_dHeight),
+	    m_dWidth(other.m_dWidth)
+	{
+	}
+
+	CBaseItem::CBaseItem(CBaseItem&& other) :
+	    m_dTop(other.m_dTop),
+	    m_dBot(other.m_dBot),
+	    m_dLeft(other.m_dLeft),
+	    m_dRight(other.m_dRight),
+	    m_dHeight(other.m_dHeight),
+	    m_dWidth(other.m_dWidth)
+	{
+	}
+	CBaseItem::~CBaseItem()
+	{
+	}
+
+	CBaseItem& CBaseItem::operator=(const CBaseItem& other)
+	{
+		if (this == &other)
 			return *this;
 
-		m_dLeft = oSrc.m_dLeft;
-		m_dTop = oSrc.m_dTop;
-		m_dWidth = oSrc.m_dWidth;
-		m_dHeight = oSrc.m_dHeight;
-		m_dBaselinePos = oSrc.m_dBaselinePos;
-		m_dRight = oSrc.m_dRight;
-
+		m_dTop = other.m_dTop;
+		m_dBot = other.m_dBot;
+		m_dLeft = other.m_dLeft;
+		m_dRight = other.m_dRight;
+		m_dHeight = other.m_dHeight;
+		m_dWidth = other.m_dWidth;
 		return *this;
 	}
-	bool CBaseItem::operator==(const CBaseItem& oSrc)
+	CBaseItem& CBaseItem::operator=(CBaseItem&& other)
 	{
-		if (this == &oSrc)
-			return true;
+		if (this == &other)
+			return *this;
 
-		return m_dLeft == oSrc.m_dLeft &&
-			   m_dTop == oSrc.m_dTop &&
-			   m_dWidth == oSrc.m_dWidth &&
-			   m_dHeight == oSrc.m_dHeight &&
-			   m_dBaselinePos == oSrc.m_dBaselinePos &&
-			   m_dRight == oSrc.m_dRight;
+		m_dTop = other.m_dTop;
+		m_dBot = other.m_dBot;
+		m_dLeft = other.m_dLeft;
+		m_dRight = other.m_dRight;
+		m_dHeight = other.m_dHeight;
+		m_dWidth = other.m_dWidth;
+		return *this;
 	}
 
-	eVerticalCrossingType CBaseItem::GetVerticalCrossingType(const CBaseItem* oSrc) const
+	eVerticalCrossingType CBaseItem::GetVerticalCrossingType(const CBaseItem* pBaseItem) const
 	{
-		if (m_dTop > oSrc->m_dTop && m_dBaselinePos < oSrc->m_dBaselinePos)
+		if (m_dTop > pBaseItem->m_dTop && m_dBot < pBaseItem->m_dBot)
 		{
 			return eVerticalCrossingType::vctCurrentInsideNext;
 		}
-		else if (m_dTop < oSrc->m_dTop && m_dBaselinePos > oSrc->m_dBaselinePos)
+		else if (m_dTop < pBaseItem->m_dTop && m_dBot > pBaseItem->m_dBot)
 		{
 			return  eVerticalCrossingType::vctCurrentOutsideNext;
 		}
-		else if (m_dTop < oSrc->m_dTop && m_dBaselinePos < oSrc->m_dBaselinePos &&
-				 (m_dBaselinePos >= oSrc->m_dTop || fabs(m_dBaselinePos - oSrc->m_dTop) < c_dTHE_SAME_STRING_Y_PRECISION_MM))
+		else if (m_dTop < pBaseItem->m_dTop && m_dBot < pBaseItem->m_dBot &&
+		         (m_dBot >= pBaseItem->m_dTop || fabs(m_dBot - pBaseItem->m_dTop) < c_dTHE_SAME_STRING_Y_PRECISION_MM))
 		{
 			return  eVerticalCrossingType::vctCurrentAboveNext;
 		}
-		else if (m_dTop > oSrc->m_dTop && m_dBaselinePos > oSrc->m_dBaselinePos &&
-				 (m_dTop <= oSrc->m_dBaselinePos || fabs(m_dTop - oSrc->m_dBaselinePos) < c_dTHE_SAME_STRING_Y_PRECISION_MM))
+		else if (m_dTop > pBaseItem->m_dTop && m_dBot > pBaseItem->m_dBot &&
+		         (m_dTop <= pBaseItem->m_dBot || fabs(m_dTop - pBaseItem->m_dBot) < c_dTHE_SAME_STRING_Y_PRECISION_MM))
 		{
 			return  eVerticalCrossingType::vctCurrentBelowNext;
 		}
-		else if (m_dTop == oSrc->m_dTop && m_dBaselinePos == oSrc->m_dBaselinePos &&
-				 m_dLeft == oSrc->m_dLeft && m_dRight == oSrc->m_dRight)
+		else if (m_dTop == pBaseItem->m_dTop && m_dBot == pBaseItem->m_dBot &&
+		         m_dLeft == pBaseItem->m_dLeft && m_dRight == pBaseItem->m_dRight)
 		{
 			return  eVerticalCrossingType::vctDublicate;
 		}
-		else if (fabs(m_dTop - oSrc->m_dTop) < c_dTHE_SAME_STRING_Y_PRECISION_MM &&
-				 fabs(m_dBaselinePos - oSrc->m_dBaselinePos) < c_dTHE_SAME_STRING_Y_PRECISION_MM)
+		else if (fabs(m_dTop - pBaseItem->m_dTop) < c_dTHE_SAME_STRING_Y_PRECISION_MM &&
+		         fabs(m_dBot - pBaseItem->m_dBot) < c_dTHE_SAME_STRING_Y_PRECISION_MM)
 		{
 			return  eVerticalCrossingType::vctTopAndBottomBordersMatch;
 		}
-		else if (fabs(m_dTop - oSrc->m_dTop) < c_dTHE_SAME_STRING_Y_PRECISION_MM)
+		else if (fabs(m_dTop - pBaseItem->m_dTop) < c_dTHE_SAME_STRING_Y_PRECISION_MM)
 		{
 			return  eVerticalCrossingType::vctTopBorderMatch;
 		}
-		else if (fabs(m_dBaselinePos - oSrc->m_dBaselinePos) < c_dTHE_SAME_STRING_Y_PRECISION_MM)
+		else if (fabs(m_dBot - pBaseItem->m_dBot) < c_dTHE_SAME_STRING_Y_PRECISION_MM)
 		{
 			return  eVerticalCrossingType::vctBottomBorderMatch;
 		}
-		else if (m_dBaselinePos < oSrc->m_dTop)
+		else if (m_dBot < pBaseItem->m_dTop)
 		{
 			return  eVerticalCrossingType::vctNoCrossingCurrentAboveNext;
 		}
-		else if (m_dTop > oSrc->m_dBaselinePos)
+		else if (m_dTop > pBaseItem->m_dBot)
 		{
 			return  eVerticalCrossingType::vctNoCrossingCurrentBelowNext;
 		}
@@ -84,49 +110,49 @@ namespace NSDocxRenderer
 			return  eVerticalCrossingType::vctUnknown;
 		}
 	}
-	eHorizontalCrossingType CBaseItem::GetHorizontalCrossingType(const CBaseItem* oSrc) const
+	eHorizontalCrossingType CBaseItem::GetHorizontalCrossingType(const CBaseItem* pBaseItem) const
 	{
-		if (m_dLeft > oSrc->m_dLeft && m_dRight < oSrc->m_dRight)
+		if (m_dLeft > pBaseItem->m_dLeft && m_dRight < pBaseItem->m_dRight)
 		{
 			return eHorizontalCrossingType::hctCurrentInsideNext;
 		}
-		else if (m_dLeft < oSrc->m_dLeft && m_dRight > oSrc->m_dRight)
+		else if (m_dLeft < pBaseItem->m_dLeft && m_dRight > pBaseItem->m_dRight)
 		{
 			return  eHorizontalCrossingType::hctCurrentOutsideNext;
 		}
-		else if (m_dLeft < oSrc->m_dLeft && m_dRight < oSrc->m_dRight &&
-				 (m_dRight >= oSrc->m_dLeft || fabs(m_dRight - oSrc->m_dLeft) < c_dTHE_SAME_STRING_X_PRECISION_MM))
-		{
-			return  eHorizontalCrossingType::hctCurrentLeftOfNext;
-		}
-		else if (m_dLeft > oSrc->m_dLeft && m_dRight > oSrc->m_dRight &&
-				 (m_dLeft <= oSrc->m_dRight || fabs(m_dLeft - oSrc->m_dRight) < c_dTHE_SAME_STRING_X_PRECISION_MM))
-		{
-			return  eHorizontalCrossingType::hctCurrentRightOfNext;
-		}
-		else if (m_dLeft == oSrc->m_dLeft && m_dRight == oSrc->m_dRight &&
-				 m_dTop == oSrc->m_dTop && m_dBaselinePos == oSrc->m_dBaselinePos)
-		{
-			return  eHorizontalCrossingType::hctDublicate;
-		}
-		else if (fabs(m_dLeft - oSrc->m_dLeft) < c_dTHE_SAME_STRING_X_PRECISION_MM &&
-				 fabs(m_dRight - oSrc->m_dRight) < c_dTHE_SAME_STRING_X_PRECISION_MM)
+		else if (fabs(m_dLeft - pBaseItem->m_dLeft) < c_dTHE_SAME_STRING_X_PRECISION_MM &&
+		         fabs(m_dRight - pBaseItem->m_dRight) < c_dTHE_SAME_STRING_X_PRECISION_MM)
 		{
 			return  eHorizontalCrossingType::hctLeftAndRightBordersMatch;
 		}
-		else if (fabs(m_dLeft - oSrc->m_dLeft) < c_dTHE_SAME_STRING_Y_PRECISION_MM)
+		else if (m_dLeft < pBaseItem->m_dLeft && m_dRight < pBaseItem->m_dRight &&
+		         (m_dRight >= pBaseItem->m_dLeft || fabs(m_dRight - pBaseItem->m_dLeft) < c_dTHE_SAME_STRING_X_PRECISION_MM))
+		{
+			return  eHorizontalCrossingType::hctCurrentLeftOfNext;
+		}
+		else if (m_dLeft > pBaseItem->m_dLeft && m_dRight > pBaseItem->m_dRight &&
+		         (m_dLeft <= pBaseItem->m_dRight || fabs(m_dLeft - pBaseItem->m_dRight) < c_dTHE_SAME_STRING_X_PRECISION_MM))
+		{
+			return  eHorizontalCrossingType::hctCurrentRightOfNext;
+		}
+		else if (m_dLeft == pBaseItem->m_dLeft && m_dRight == pBaseItem->m_dRight &&
+		         m_dTop == pBaseItem->m_dTop && m_dBot == pBaseItem->m_dBot)
+		{
+			return  eHorizontalCrossingType::hctDublicate;
+		}
+		else if (fabs(m_dLeft - pBaseItem->m_dLeft) < c_dTHE_SAME_STRING_Y_PRECISION_MM)
 		{
 			return  eHorizontalCrossingType::hctLeftBorderMatch;
 		}
-		else if (fabs(m_dRight - oSrc->m_dRight) < c_dTHE_SAME_STRING_Y_PRECISION_MM)
+		else if (fabs(m_dRight - pBaseItem->m_dRight) < c_dTHE_SAME_STRING_Y_PRECISION_MM)
 		{
 			return  eHorizontalCrossingType::hctRightBorderMatch;
 		}
-		else if (m_dRight < oSrc->m_dLeft)
+		else if (m_dRight < pBaseItem->m_dLeft)
 		{
 			return  eHorizontalCrossingType::hctNoCrossingCurrentLeftOfNext;
 		}
-		else if (m_dLeft > oSrc->m_dRight)
+		else if (m_dLeft > pBaseItem->m_dRight)
 		{
 			return  eHorizontalCrossingType::hctNoCrossingCurrentRightOfNext;
 		}
@@ -136,31 +162,32 @@ namespace NSDocxRenderer
 		}
 	}
 
-	bool CBaseItem::AreObjectsNoCrossingByVertically(const CBaseItem* pObj) const noexcept
+	bool CBaseItem::AreObjectsNoCrossingByVertically(const CBaseItem* pBaseItem) const noexcept
 	{
-		eVerticalCrossingType eVType = GetVerticalCrossingType(pObj);
+		eVerticalCrossingType eVType = GetVerticalCrossingType(pBaseItem);
 
 		return (eVType == eVerticalCrossingType::vctNoCrossingCurrentAboveNext ||
-				eVType == eVerticalCrossingType::vctNoCrossingCurrentBelowNext);
+		        eVType == eVerticalCrossingType::vctNoCrossingCurrentBelowNext);
 	}
-	bool CBaseItem::AreObjectsNoCrossingByHorizontally(const CBaseItem* pObj) const noexcept
+	bool CBaseItem::AreObjectsNoCrossingByHorizontally(const CBaseItem* pBaseItem) const noexcept
 	{
-		eHorizontalCrossingType eHType = GetHorizontalCrossingType(pObj);
+		eHorizontalCrossingType eHType = GetHorizontalCrossingType(pBaseItem);
 
 		return (eHType == eHorizontalCrossingType::hctNoCrossingCurrentLeftOfNext ||
-				eHType == eHorizontalCrossingType::hctNoCrossingCurrentRightOfNext);
+		        eHType == eHorizontalCrossingType::hctNoCrossingCurrentRightOfNext);
 	}
-	bool CBaseItem::IsEqual(double dTop, double dBaselinePos, double dLeft, double dRight) const noexcept
+	bool CBaseItem::IsEqual(double dTop, double dBot, double dLeft, double dRight) const noexcept
 	{
-		return m_dLeft == dLeft &&
-			   m_dTop == dTop &&
-			   m_dBaselinePos == dBaselinePos &&
-			   m_dRight == dRight;
+		return m_dLeft == dLeft && m_dTop == dTop && m_dBot == dBot && m_dRight == dRight;
+	}
+	bool CBaseItem::operator==(const CBaseItem& other)
+	{
+		return IsEqual(other.m_dTop, other.m_dBot, other.m_dLeft, other.m_dRight);
 	}
 
 	void CBaseItem::RecalcWithNewItem(const CBaseItem* pItem)
 	{
-		m_dBaselinePos = std::max(m_dBaselinePos, pItem->m_dBaselinePos);
+		m_dBot = std::max(m_dBot, pItem->m_dBot);
 
 		if ((pItem->m_dLeft < m_dLeft) || (pItem->m_dLeft > 0 && m_dLeft == 0.0))
 			m_dLeft = pItem->m_dLeft;
@@ -172,6 +199,6 @@ namespace NSDocxRenderer
 			m_dTop = pItem->m_dTop;
 
 		m_dWidth = m_dRight - m_dLeft;
-		m_dHeight = m_dBaselinePos - m_dTop;
+		m_dHeight = m_dBot - m_dTop;
 	}
 }
diff --git a/DocxRenderer/src/logic/elements/BaseItem.h b/DocxRenderer/src/logic/elements/BaseItem.h
index c2818ca994..5a96d133f9 100644
--- a/DocxRenderer/src/logic/elements/BaseItem.h
+++ b/DocxRenderer/src/logic/elements/BaseItem.h
@@ -1,6 +1,10 @@
 #pragma once
 
+#include <memory>
+#include <vector>
+
 #include "../../../../DesktopEditor/common/StringBuilder.h"
+#include "../../../../DesktopEditor/graphics/pro/js/wasm/src/serialize.h"
 
 namespace NSDocxRenderer
 {
@@ -39,30 +43,112 @@ namespace NSDocxRenderer
 	class CBaseItem
 	{
 	public:
-		double m_dTop {0.0};
-		double m_dBaselinePos {0.0};
+		double m_dTop    {0.0};
+		double m_dBot    {0.0};
+		double m_dLeft   {0.0};
+		double m_dRight  {0.0};
 		double m_dHeight {0.0};
+		double m_dWidth  {0.0};
 
-		double m_dLeft {0.0};
-		double m_dRight {0.0};
-		double m_dWidth {0.0};
+		CBaseItem();
+		CBaseItem(const CBaseItem& other);
+		CBaseItem(CBaseItem&& other);
+		virtual ~CBaseItem();
 
-		CBaseItem() = default;
-		virtual ~CBaseItem() = default;
+		CBaseItem& operator=(const CBaseItem& other);
+		CBaseItem& operator=(CBaseItem&& other);
 
-		virtual void Clear() = 0;
+		virtual eVerticalCrossingType GetVerticalCrossingType(const CBaseItem* pBaseItem) const;
+		virtual eHorizontalCrossingType GetHorizontalCrossingType(const CBaseItem* pBaseItem) const;
+		virtual void RecalcWithNewItem(const CBaseItem* pBaseItem);
+
+		bool AreObjectsNoCrossingByVertically(const CBaseItem* pBaseItem) const noexcept;
+		bool AreObjectsNoCrossingByHorizontally(const CBaseItem* pBaseItem) const noexcept;
+		bool IsEqual(double dTop, double dBot, double dLeft, double dRight) const noexcept;
+
+		bool operator==(const CBaseItem& other);
+	};
+
+	class IOoxmlItem
+	{
+	public:
 		virtual void ToXml(NSStringUtils::CStringBuilder& oWriter) const = 0;
 		virtual void ToXmlPptx(NSStringUtils::CStringBuilder& oWriter) const = 0;
+		virtual void ToBin(NSWasm::CData& oWriter) const = 0;
 
-		virtual eVerticalCrossingType GetVerticalCrossingType(const CBaseItem* oSrc) const;
-		virtual eHorizontalCrossingType GetHorizontalCrossingType(const CBaseItem* oSrc) const;
-		virtual void RecalcWithNewItem(const CBaseItem* pObj);
+		static const BYTE kBin_g_nodeAttributeStart = 250;
+		static const BYTE kBin_g_nodeAttributeEnd = 251;
+	};
 
-		bool AreObjectsNoCrossingByVertically(const CBaseItem* pObj) const noexcept;
-		bool AreObjectsNoCrossingByHorizontally(const CBaseItem* pObj) const noexcept;
-		bool IsEqual(double dTop, double dBaselinePos, double dLeft, double dRight) const noexcept;
+	// using template to avoid downcasting
+	template <typename T>
+	class CBaseItemGroup : public CBaseItem
+	{
+	public:
+		std::vector<std::shared_ptr<T>> m_arItems;
 
-		CBaseItem& operator=(const CBaseItem& oSrc);
-		bool operator==(const CBaseItem& oSrc);
+		CBaseItemGroup()
+		{
+			static_assert(std::is_base_of<CBaseItem, T>::value, "T should has base of CBaseItem!");
+		}
+		CBaseItemGroup(const CBaseItemGroup<T>& other) : CBaseItemGroup()
+		{
+			for (const auto value : other.m_arItems)
+				m_arItems.push_back(value);
+		}
+		CBaseItemGroup(CBaseItemGroup<T>&& other) : CBaseItemGroup()
+		{
+			m_arItems = std::move(other);
+		}
+		virtual ~CBaseItemGroup() {}
+
+		CBaseItemGroup<T>& operator=(const CBaseItemGroup<T>& other)
+		{
+			if (this == &other)
+				return *this;
+
+			m_arItems.clear();
+			for (const auto value : other.m_arItems)
+				m_arItems.push_back(value);
+
+			return *this;
+		}
+		CBaseItemGroup<T>& operator=(CBaseItemGroup<T>&& other)
+		{
+			if (this == &other)
+				return *this;
+
+			m_arItems = std::move(other);
+			return *this;
+		}
+
+		void AddItem(const std::shared_ptr<T>& pItem)
+		{
+			CBaseItem::RecalcWithNewItem(pItem.get());
+			m_arItems.push_back(pItem);
+		}
+		void AddItem(std::shared_ptr<T>&& pItem)
+		{
+			CBaseItem::RecalcWithNewItem(pItem.get());
+			m_arItems.push_back(std::move(pItem));
+		}
+	};
+
+	enum class eBaseItemCmpType
+	{
+		bictVertical,
+		bictHorizontal
+	};
+
+	template <eBaseItemCmpType CmpType>
+	struct CBaseItemCmp
+	{
+		bool operator() (const CBaseItem& item1, const CBaseItem& item2) const
+		{
+			if (CmpType == eBaseItemCmpType::bictVertical)
+				return item1.m_dBot < item2.m_dBot;
+			if (CmpType == eBaseItemCmpType::bictHorizontal)
+				return item1.m_dLeft < item2.m_dLeft;
+		}
 	};
 }
diff --git a/DocxRenderer/src/logic/elements/ContText.cpp b/DocxRenderer/src/logic/elements/ContText.cpp
index 566d934f49..e9fe4b8096 100644
--- a/DocxRenderer/src/logic/elements/ContText.cpp
+++ b/DocxRenderer/src/logic/elements/ContText.cpp
@@ -70,7 +70,7 @@ namespace NSDocxRenderer
 		m_dBotWithDescent = rCont.m_dBotWithDescent;
 
 		m_oSelectedFont = rCont.m_oSelectedFont;
-		m_bPossibleSplit = rCont.m_bPossibleSplit;
+		m_bPossibleHorSplit = rCont.m_bPossibleHorSplit;
 		m_bWriteStyleRaw = rCont.m_bWriteStyleRaw;
 
 		m_arSymWidths.clear();
@@ -135,7 +135,7 @@ namespace NSDocxRenderer
 		m_dRight = cont->m_dLeft;
 		m_dWidth = m_dRight - m_dLeft;
 		m_arSymWidths.resize(index + 1);
-		m_bPossibleSplit = false;
+		m_bPossibleHorSplit = false;
 
 		return cont;
 	}
@@ -181,18 +181,18 @@ namespace NSDocxRenderer
 			return  eVerticalCrossingType::vctCurrentOutsideNext;
 
 		else if (this_top < other_top && this_bot < other_bot &&
-				 (this_bot >= other_top || fabs(this_bot - other_top) < c_dTHE_SAME_STRING_Y_PRECISION_MM))
+		         (this_bot >= other_top || fabs(this_bot - other_top) < c_dTHE_SAME_STRING_Y_PRECISION_MM))
 			return  eVerticalCrossingType::vctCurrentAboveNext;
 
 		else if (this_top > other_top && this_bot > other_bot &&
-				 (this_top <= other_bot || fabs(this_top - other_bot) < c_dTHE_SAME_STRING_Y_PRECISION_MM))
+		         (this_top <= other_bot || fabs(this_top - other_bot) < c_dTHE_SAME_STRING_Y_PRECISION_MM))
 			return  eVerticalCrossingType::vctCurrentBelowNext;
 
 		else if (this_top == other_top && this_bot == other_bot)
 			return  eVerticalCrossingType::vctDublicate;
 
 		else if (fabs(this_top - other_top) < c_dTHE_SAME_STRING_Y_PRECISION_MM &&
-				 fabs(this_bot - other_bot) < c_dTHE_SAME_STRING_Y_PRECISION_MM)
+		         fabs(this_bot - other_bot) < c_dTHE_SAME_STRING_Y_PRECISION_MM)
 			return  eVerticalCrossingType::vctTopAndBottomBordersMatch;
 
 		else if (fabs(this_top - other_top) < c_dTHE_SAME_STRING_Y_PRECISION_MM)
@@ -475,7 +475,7 @@ namespace NSDocxRenderer
 		oWriter.WriteString(L" x=\"");
 		oWriter.AddDouble(m_dLeft, 4);
 		oWriter.WriteString(L"\" y=\"");
-		oWriter.AddDouble(m_dBaselinePos, 4);
+		oWriter.AddDouble(m_dBot, 4);
 		oWriter.WriteString(L"\" widths=\"");
 		for (auto& w : m_arSymWidths)
 		{
@@ -490,6 +490,117 @@ namespace NSDocxRenderer
 		oWriter.WriteString(L"\" />");
 		oWriter.WriteString(L"</a:r>");
 	}
+	void CContText::ToBin(NSWasm::CData& oWriter) const
+	{
+		int lCalculatedSpacing = 0;
+		if (!m_oText.empty())
+		{
+			double dSpacing = (m_dWidth - m_oSelectedSizes.dWidth) / (m_oText.length());
+			dSpacing *= c_dMMToPt * 100;
+			lCalculatedSpacing = static_cast<LONG>(dSpacing);
+		}
+		lCalculatedSpacing -= 15;
+
+		const BYTE kPARRUN_TYPE_RUN = 1;
+		oWriter.StartRecord(kPARRUN_TYPE_RUN);
+
+		oWriter.WriteBYTE(kBin_g_nodeAttributeStart);
+		oWriter.WriteBYTE(0); oWriter.WriteStringUtf16(m_oText.ToStdWString());
+		oWriter.WriteBYTE(kBin_g_nodeAttributeEnd);
+
+		// WriteRecord WriteRunProperties
+		[&oWriter, this, lCalculatedSpacing] () {
+			oWriter.StartRecord(0);
+			oWriter.WriteBYTE(kBin_g_nodeAttributeStart);
+
+			oWriter.WriteBYTE(1); oWriter.WriteBool(m_pFontStyle->bBold);
+			oWriter.WriteBYTE(7); oWriter.WriteBool(m_pFontStyle->bItalic);
+
+			BYTE strike = 1;
+			if (m_bIsDoubleStrikeout) strike = 0;
+			else if (m_bIsStrikeoutPresent) strike = 2;
+			oWriter.WriteBYTE(16); oWriter.WriteBYTE(strike);
+			oWriter.WriteBYTE(15); oWriter.AddSInt(lCalculatedSpacing);
+			oWriter.WriteBYTE(18); oWriter.WriteBYTE(m_bIsUnderlinePresent ? 13 : 12);
+			unsigned int font_size = static_cast<unsigned int>(m_pFontStyle->dFontSize) * 100;
+			const unsigned int min_font_size = 100;
+			oWriter.WriteBYTE(17); oWriter.AddInt(std::max(font_size, std::max(font_size, min_font_size)));
+
+			oWriter.WriteBYTE(2);
+			if (m_eVertAlignType == eVertAlignType::vatSubscript)
+				oWriter.AddSInt(-25000);
+			else if (m_eVertAlignType == eVertAlignType::vatSuperscript)
+				oWriter.AddSInt(30000);
+			else
+				oWriter.AddInt(0);
+
+			oWriter.WriteBYTE(kBin_g_nodeAttributeEnd);
+
+			// WriteTextFontTypeface
+			auto WriteTextFontTypeface = [this, &oWriter] (const std::wstring& wsTypeface) {
+				oWriter.WriteBYTE(kBin_g_nodeAttributeStart);
+				oWriter.WriteBYTE(3); oWriter.WriteStringUtf16(wsTypeface);
+				oWriter.WriteBYTE(kBin_g_nodeAttributeEnd);
+			};
+
+			// WriteRecord WriteTextFontTypeface
+			oWriter.StartRecord(3); WriteTextFontTypeface(m_pFontStyle->wsFontName); oWriter.EndRecord();
+			oWriter.StartRecord(4); WriteTextFontTypeface(m_pFontStyle->wsFontName); oWriter.EndRecord();
+			oWriter.StartRecord(5); WriteTextFontTypeface(m_pFontStyle->wsFontName); oWriter.EndRecord();
+
+			// WriteUniColor
+			auto WriteUniColor = [&oWriter] (long color, long alpha) {
+				BYTE r = reinterpret_cast<BYTE*>(&color)[0];
+				BYTE g = reinterpret_cast<BYTE*>(&color)[1];
+				BYTE b = reinterpret_cast<BYTE*>(&color)[2];
+
+				oWriter.StartRecord(1); // COLOR_TYPE_SRGB
+				oWriter.WriteBYTE(kBin_g_nodeAttributeStart);
+				oWriter.WriteBYTE(0); oWriter.WriteBYTE(r);
+				oWriter.WriteBYTE(1); oWriter.WriteBYTE(g);
+				oWriter.WriteBYTE(2); oWriter.WriteBYTE(b);
+				oWriter.WriteBYTE(kBin_g_nodeAttributeEnd);
+				// WriteMods (alpha)
+				oWriter.StartRecord(0);
+				oWriter.AddInt(1);
+				oWriter.StartRecord(1);
+				oWriter.WriteBYTE(kBin_g_nodeAttributeStart);
+				oWriter.WriteBYTE(0); oWriter.WriteStringUtf16(L"alpha");
+				oWriter.WriteBYTE(1); oWriter.AddInt(alpha * 100000 / 255);
+				oWriter.WriteBYTE(kBin_g_nodeAttributeEnd);
+				oWriter.EndRecord();
+				oWriter.EndRecord();
+				oWriter.EndRecord();
+			};
+
+			auto WriteUniFill = [&oWriter, this, &WriteUniColor] () {
+				oWriter.StartRecord(3); // FILL_TYPE_SOLID
+				oWriter.StartRecord(0);
+				WriteUniColor(m_pFontStyle->oBrush.Color1, m_pFontStyle->oBrush.Alpha1);
+				oWriter.EndRecord();
+				oWriter.EndRecord();
+			};
+
+			// WriteRecord WriteUniFill
+			oWriter.StartRecord(1);
+			WriteUniFill();
+			oWriter.EndRecord();
+
+			// WriteRecord WriteHighlightColor
+			if (m_bIsHighlightPresent)
+			{
+				oWriter.StartRecord(12);
+				oWriter.WriteBYTE(kBin_g_nodeAttributeStart);
+				oWriter.WriteBYTE(kBin_g_nodeAttributeEnd);
+				oWriter.StartRecord(0);
+				WriteUniColor(m_lHighlightColor, 255);
+				oWriter.EndRecord();
+				oWriter.EndRecord();
+			}
+			oWriter.EndRecord();
+		}();
+		oWriter.EndRecord();
+	}
 
 	bool CContText::IsEqual(const CContText *pCont) const noexcept
 	{
@@ -510,7 +621,7 @@ namespace NSDocxRenderer
 		bool bIf15 = m_eVertAlignType == eVertAlignType::vatBase && pCont->m_eVertAlignType == eVertAlignType::vatUnknown;
 
 		return (bIf1 && bIf2 && bIf3 && bIf4 && bIf5 && bIf6 && bIf7 &&
-				bIf8 && bIf9 && bIf10 && bIf11 && bIf12 && (bIf13 || bIf14 || bIf15));
+		        bIf8 && bIf9 && bIf10 && bIf11 && bIf12 && (bIf13 || bIf14 || bIf15));
 	}
 
 	UINT CContText::GetNumberOfFeatures() const noexcept
@@ -529,10 +640,11 @@ namespace NSDocxRenderer
 	bool CContText::IsDuplicate(CContText* pCont, eVerticalCrossingType eVType, eHorizontalCrossingType eHType) const noexcept
 	{
 		return m_oText == pCont->m_oText &&
-			   eVType == eVerticalCrossingType::vctDublicate &&
-			   (eHType == eHorizontalCrossingType::hctDublicate ||
-				eHType == eHorizontalCrossingType::hctCurrentLeftOfNext ||
-				eHType == eHorizontalCrossingType::hctCurrentRightOfNext);
+		        eVType == eVerticalCrossingType::vctDublicate &&
+		        (eHType == eHorizontalCrossingType::hctDublicate ||
+		         eHType == eHorizontalCrossingType::hctCurrentLeftOfNext ||
+		         eHType == eHorizontalCrossingType::hctCurrentRightOfNext ||
+		         eHType == eHorizontalCrossingType::hctLeftAndRightBordersMatch);
 	}
 
 	bool CContText::IsOnlySpaces() const
@@ -555,7 +667,7 @@ namespace NSDocxRenderer
 	void CContText::AddTextBack(const NSStringUtils::CStringUTF32& oText, const std::vector<double>& arSymWidths)
 	{
 		bool is_space_twice = m_oText.at(m_oText.length() - 1) == c_SPACE_SYM &&
-							  oText.at(0) == c_SPACE_SYM;
+		        oText.at(0) == c_SPACE_SYM;
 
 		for (size_t i = 0; i < arSymWidths.size(); ++i)
 		{
@@ -660,10 +772,10 @@ namespace NSDocxRenderer
 	}
 
 	bool CContText::CheckFontEffects
-		(std::shared_ptr<CContText>& pFirstCont,
-		 std::shared_ptr<CContText>& pSecondCont,
-		 eVerticalCrossingType eVType,
-		 eHorizontalCrossingType eHType)
+	(std::shared_ptr<CContText>& pFirstCont,
+	 std::shared_ptr<CContText>& pSecondCont,
+	 eVerticalCrossingType eVType,
+	 eHorizontalCrossingType eHType)
 	{
 		//Условие пересечения по вертикали
 		bool bIf1 = eVType == eVerticalCrossingType::vctCurrentAboveNext; //текущий cont выше
@@ -743,28 +855,28 @@ namespace NSDocxRenderer
 	}
 
 	bool CContText::CheckVertAlignTypeBetweenConts
-		(std::shared_ptr<CContText> pFirstCont,
-		 std::shared_ptr<CContText> pSecondCont,
-		 eVerticalCrossingType eVType,
-		 eHorizontalCrossingType eHType)
+	(std::shared_ptr<CContText> pFirstCont,
+	 std::shared_ptr<CContText> pSecondCont,
+	 eVerticalCrossingType eVType,
+	 eHorizontalCrossingType eHType)
 	{
 
 		bool bIf1 = eVType == eVerticalCrossingType::vctCurrentAboveNext ||
-					eVType == eVerticalCrossingType::vctCurrentInsideNext;
+		        eVType == eVerticalCrossingType::vctCurrentInsideNext;
 
 		bool bIf2 = eVType == eVerticalCrossingType::vctCurrentBelowNext;
 
 		bool bIf3 = (eHType == eHorizontalCrossingType::hctNoCrossingCurrentLeftOfNext ||
-					 eHType == eHorizontalCrossingType::hctCurrentLeftOfNext) &&
-					fabs(pFirstCont->m_dRight - pSecondCont->m_dLeft) < c_dTHE_STRING_X_PRECISION_MM * 3;
+		             eHType == eHorizontalCrossingType::hctCurrentLeftOfNext) &&
+		        fabs(pFirstCont->m_dRight - pSecondCont->m_dLeft) < c_dTHE_STRING_X_PRECISION_MM * 3;
 
 		bool bIf4 = (eHType == eHorizontalCrossingType::hctNoCrossingCurrentRightOfNext ||
-					 eHType == eHorizontalCrossingType::hctCurrentRightOfNext) &&
-					fabs(pFirstCont->m_dLeft - pSecondCont->m_dRight) < c_dTHE_STRING_X_PRECISION_MM * 3;
+		             eHType == eHorizontalCrossingType::hctCurrentRightOfNext) &&
+		        fabs(pFirstCont->m_dLeft - pSecondCont->m_dRight) < c_dTHE_STRING_X_PRECISION_MM * 3;
 
 		//Размеры шрифта должны бать разными
-		bool bIf5 = pFirstCont->m_pFontStyle->dFontSize * 0.7 > pSecondCont->m_pFontStyle->dFontSize;
-		bool bIf6 = pFirstCont->m_pFontStyle->dFontSize <  pSecondCont->m_pFontStyle->dFontSize * 0.7;
+        bool bIf5 = pFirstCont->m_pFontStyle->dFontSize * 0.8 > pSecondCont->m_pFontStyle->dFontSize;
+        bool bIf6 = pFirstCont->m_pFontStyle->dFontSize <  pSecondCont->m_pFontStyle->dFontSize * 0.8;
 
 		if (bIf3 || bIf4)
 		{
@@ -774,7 +886,7 @@ namespace NSDocxRenderer
 				pSecondCont->m_pCont = pFirstCont;
 				pFirstCont->m_eVertAlignType = eVertAlignType::vatBase;
 				pFirstCont->m_pCont = pSecondCont;
-				pFirstCont->m_bPossibleSplit = false;
+				pFirstCont->m_bPossibleHorSplit = false;
 				return true;
 			}
 			else if (bIf2 && bIf5)
@@ -783,7 +895,7 @@ namespace NSDocxRenderer
 				pSecondCont->m_pCont = pFirstCont;
 				pFirstCont->m_eVertAlignType = eVertAlignType::vatBase;
 				pFirstCont->m_pCont = pSecondCont;
-				pFirstCont->m_bPossibleSplit = false;
+				pFirstCont->m_bPossibleHorSplit = false;
 				return true;
 			}
 			else if (bIf1 && bIf6)
@@ -792,7 +904,7 @@ namespace NSDocxRenderer
 				pFirstCont->m_pCont = pSecondCont;
 				pSecondCont->m_eVertAlignType = eVertAlignType::vatBase;
 				pSecondCont->m_pCont = pFirstCont;
-				pSecondCont->m_bPossibleSplit = false;
+				pSecondCont->m_bPossibleHorSplit = false;
 				return true;
 			}
 			else if (bIf2 && bIf6)
@@ -801,7 +913,7 @@ namespace NSDocxRenderer
 				pFirstCont->m_pCont = pSecondCont;
 				pSecondCont->m_eVertAlignType = eVertAlignType::vatBase;
 				pSecondCont->m_pCont = pFirstCont;
-				pSecondCont->m_bPossibleSplit = false;
+				pSecondCont->m_bPossibleHorSplit = false;
 				return true;
 			}
 		}
@@ -824,15 +936,15 @@ namespace NSDocxRenderer
 	{
 		// more symbols of delims
 		bool is_bullet =
-			(cSym == 0x2022) || (cSym == 0x2023) || (cSym == 0x2043) || (cSym == 0x204C) ||
-			(cSym == 0x204D) || (cSym == 0x2219) || (cSym == 0x25CB) || (cSym == 0x25CF) ||
-			(cSym == 0x25D8) || (cSym == 0x25E6) || (cSym == 0x2619) || (cSym == 0x2765) ||
-			(cSym == 0x2767) || (cSym == 0x29BE) || (cSym == 0x29BF) || (cSym == 0x25C9);
+		        (cSym == 0x2022) || (cSym == 0x2023) || (cSym == 0x2043) || (cSym == 0x204C) ||
+		        (cSym == 0x204D) || (cSym == 0x2219) || (cSym == 0x25CB) || (cSym == 0x25CF) ||
+		        (cSym == 0x25D8) || (cSym == 0x25E6) || (cSym == 0x2619) || (cSym == 0x2765) ||
+		        (cSym == 0x2767) || (cSym == 0x29BE) || (cSym == 0x29BF) || (cSym == 0x25C9);
 
 		bool is_another =
-			(cSym == 0xB7) || (cSym == 0xA7) || (cSym == 0xF076) || (cSym == 0x2013) ||
-			(cSym == 0x2713) || (cSym == 0x2714) || (cSym == 0x2756) || (cSym == 0x25C6) ||
-			(cSym == 0x25C7) || (cSym == 0x25C8);
+		        (cSym == 0xB7) || (cSym == 0xA7) || (cSym == 0xF076) || (cSym == 0x2013) ||
+		        (cSym == 0x2713) || (cSym == 0x2714) || (cSym == 0x2756) || (cSym == 0x25C6) ||
+		        (cSym == 0x25C7) || (cSym == 0x25C8);
 
 		return is_bullet || is_another;
 	}
@@ -852,9 +964,9 @@ namespace NSDocxRenderer
 	bool CContText::IsUnicodeSymbol(uint32_t cSym )
 	{
 		bool is_unicode =
-			(( 0x0009 == cSym) || (0x000A == cSym ) || (0x000D == cSym ) ||
-			(( 0x0020 <= cSym) && (0xD7FF >= cSym )) || ((0xE000 <= cSym) && (cSym <= 0xFFFD )) ||
-			(( 0x10000 <= cSym) && cSym));
+		        (( 0x0009 == cSym) || (0x000A == cSym ) || (0x000D == cSym ) ||
+		         (( 0x0020 <= cSym) && (0xD7FF >= cSym )) || ((0xE000 <= cSym) && (cSym <= 0xFFFD )) ||
+		         (( 0x10000 <= cSym) && cSym));
 
 		return is_unicode;
 	}
@@ -869,35 +981,42 @@ namespace NSDocxRenderer
 	}
 
 	CContTextBuilder::CContTextBuilder(CFontStyleManager* pFontStyleManager, CFontSelector* pFontSelector) :
-		m_pFontStyleManager(pFontStyleManager), m_pFontSelector(pFontSelector)
+	    m_pFontStyleManager(pFontStyleManager), m_pFontSelector(pFontSelector)
 	{}
 
 	std::vector<CContTextBuilder::cont_ptr_t> CContTextBuilder::GetConts()
 	{
 		return std::move(m_arConts);
+		m_pCurrCont = nullptr;
+	}
+	std::vector<CContTextBuilder::cont_ptr_t> CContTextBuilder::GetDiacs()
+	{
+		return std::move(m_arDiacs);
+		m_pCurrCont = nullptr;
 	}
 
 	void CContTextBuilder::AddUnicode(
-		double dTop,
-		double dBot,
-		double dLeft,
-		double dRight,
-		const NSStructures::CFont& oFont,
-		const NSStructures::CBrush& oBrush,
-		CFontManager* pFontManager,
-		const NSStringUtils::CStringUTF32& oText,
-		bool bForcedBold,
-		bool bUseDefaultFont,
-		bool bWriteStyleRaw)
+	        double dTop,
+	        double dBot,
+	        double dLeft,
+	        double dRight,
+	        const NSStructures::CFont& oFont,
+	        const NSStructures::CBrush& oBrush,
+	        CFontManager* pFontManager,
+	        const NSStringUtils::CStringUTF32& oText,
+	        bool bForcedBold,
+	        bool bUseDefaultFont,
+	        bool bWriteStyleRaw)
 	{
 		double dWidth = dRight - dLeft;
 		double dHeight = dBot - dTop;
 
 		// if new text is close to current cont
 		if (m_pCurrCont != nullptr &&
-			fabs(m_pCurrCont->m_dBaselinePos - dBot) < c_dTHE_SAME_STRING_Y_PRECISION_MM &&
-			m_oPrevFont.IsEqual2(&oFont) &&
-			m_oPrevBrush.IsEqual(&oBrush))
+		        fabs(m_pCurrCont->m_dBot - dBot) < c_dTHE_SAME_STRING_Y_PRECISION_MM &&
+		        m_oPrevFont.IsEqual2(&oFont) &&
+		        m_oPrevBrush.IsEqual(&oBrush) && !(
+		            oText.length() == 1 && CContText::IsUnicodeDiacriticalMark(oText.at(0))))
 		{
 
 			double avg_width = dWidth / oText.length();
@@ -907,9 +1026,9 @@ namespace NSDocxRenderer
 
 			double avg_space_width = m_pCurrCont->m_pFontStyle->GetAvgSpaceWidth();
 			double space_width =
-				avg_space_width != 0.0 ?
-					avg_space_width * c_dAVERAGE_SPACE_WIDTH_COEF :
-					m_pCurrCont->CalculateSpace() * c_dSPACE_WIDTH_COEF;
+			        avg_space_width != 0.0 ?
+			            avg_space_width * c_dAVERAGE_SPACE_WIDTH_COEF :
+			            m_pCurrCont->CalculateSpace() * c_dSPACE_WIDTH_COEF;
 
 			bool is_added = false;
 
@@ -940,8 +1059,8 @@ namespace NSDocxRenderer
 			if (is_added)
 			{
 				m_pCurrCont->m_dTop = std::min(m_pCurrCont->m_dTop, dTop);
-				m_pCurrCont->m_dBaselinePos = std::max(m_pCurrCont->m_dBaselinePos, dBot);
-				m_pCurrCont->m_dHeight = m_pCurrCont->m_dBaselinePos - m_pCurrCont->m_dTop;
+				m_pCurrCont->m_dBot = std::max(m_pCurrCont->m_dBot, dBot);
+				m_pCurrCont->m_dHeight = m_pCurrCont->m_dBot - m_pCurrCont->m_dTop;
 				m_pCurrCont->m_dWidth = m_pCurrCont->m_dRight - m_pCurrCont->m_dLeft;
 				return;
 			}
@@ -952,19 +1071,19 @@ namespace NSDocxRenderer
 		const auto& oMetrics = pFontManager->GetFontMetrics();
 		m_pFontSelector->SelectFont(oParams, oMetrics, oText);
 
-		pCont->m_dBaselinePos = dBot;
-		pCont->m_dTop         = dTop;
-		pCont->m_dHeight      = dHeight;
-		pCont->m_dLeft        = dLeft;
+		pCont->m_dBot    = dBot;
+		pCont->m_dTop    = dTop;
+		pCont->m_dHeight = dHeight;
+		pCont->m_dLeft   = dLeft;
 
 		// первичное получение стиля для текущего символа
 		// при дальнейшем анализе может измениться
 		pCont->m_pFontStyle = m_pFontStyleManager->GetOrAddFontStyle(
-			oBrush,
-			m_pFontSelector->GetSelectedName(),
-			oFont.Size,
-			m_pFontSelector->IsSelectedItalic(),
-			m_pFontSelector->IsSelectedBold() || bForcedBold);
+		            oBrush,
+		            m_pFontSelector->GetSelectedName(),
+		            oFont.Size,
+		            m_pFontSelector->IsSelectedItalic(),
+		            m_pFontSelector->IsSelectedBold() || bForcedBold);
 
 		// just in case if oText contains more than 1 symbol
 		std::vector<double> ar_widths;
@@ -985,8 +1104,8 @@ namespace NSDocxRenderer
 		double em_height = oMetrics.dEmHeight;
 		double ratio = font_size / em_height * c_dPtToMM;
 
-		pCont->m_dTopWithAscent = pCont->m_dBaselinePos - (oMetrics.dAscent * ratio) - oMetrics.dBaselineOffset;
-		pCont->m_dBotWithDescent = pCont->m_dBaselinePos + (oMetrics.dDescent * ratio) - oMetrics.dBaselineOffset;
+		pCont->m_dTopWithAscent = pCont->m_dBot - (oMetrics.dAscent * ratio) - oMetrics.dBaselineOffset;
+		pCont->m_dBotWithDescent = pCont->m_dBot + (oMetrics.dDescent * ratio) - oMetrics.dBaselineOffset;
 		pCont->m_dSpaceWidthMM = pFontManager->GetSpaceWidthMM();
 		pCont->m_wsOriginFontName = oFont.Name;
 
@@ -1005,10 +1124,31 @@ namespace NSDocxRenderer
 			pCont->m_oSelectedFont.Italic = m_pFontSelector->IsSelectedItalic();
 		}
 		pCont->m_bWriteStyleRaw = bWriteStyleRaw;
-		m_arConts.push_back(pCont);
+
+		if (pCont->IsDiacritical())
+		{
+			m_arDiacs.push_back(std::move(pCont));
+		}
+        else
+        {
+            m_arConts.push_back(pCont);
+        }
 
 		m_pCurrCont = pCont;
 		m_oPrevFont = oFont;
 		m_oPrevBrush = oBrush;
 	}
+
+	void CContTextBuilder::NullCurrCont()
+	{
+		m_pCurrCont = nullptr;
+	}
+	void CContTextBuilder::Clear()
+	{
+		m_pCurrCont = nullptr;
+		m_arConts.clear();
+		m_arDiacs.clear();
+		m_oPrevFont.SetDefaultParams();
+		m_oPrevBrush.SetDefaultParams();
+	}
 }
diff --git a/DocxRenderer/src/logic/elements/ContText.h b/DocxRenderer/src/logic/elements/ContText.h
index e1de82704f..f9420c6c99 100644
--- a/DocxRenderer/src/logic/elements/ContText.h
+++ b/DocxRenderer/src/logic/elements/ContText.h
@@ -2,16 +2,15 @@
 #include "../../../../DesktopEditor/common/StringBuilder.h"
 
 #include "BaseItem.h"
+#include "Shape.h"
 #include "../managers/FontManager.h"
-#include "../managers//FontStyleManager.h"
+#include "../managers/FontStyleManager.h"
 #include "../styles/FontStyle.h"
 #include "../../resources/Constants.h"
 #include "../../resources/LinesTable.h"
 
 namespace NSDocxRenderer
 {
-	class CShape;
-
 	enum class eVertAlignType
 	{
 		vatUnknown,
@@ -32,7 +31,7 @@ namespace NSDocxRenderer
 		CSelectedSizes& operator=(const CSelectedSizes& oSelectedSizes);
 	};
 
-	class CContText : public CBaseItem
+	class CContText : public CBaseItem, public IOoxmlItem
 	{
 	public:
 		// utils
@@ -76,16 +75,17 @@ namespace NSDocxRenderer
 
 		bool m_bIsAddBrEnd{false};
 		bool m_bWriteStyleRaw{false};
-		bool m_bPossibleSplit{false};
+		bool m_bPossibleHorSplit{false};
 
 		CContText() = default;
 		CContText(CFontManager* pManager) : m_pManager(pManager) {}
 		CContText(const CContText& rCont);
 		virtual ~CContText();
 
-		virtual void Clear() override final;
+		virtual void Clear();
 		virtual void ToXml(NSStringUtils::CStringBuilder& oWriter) const override final;
 		virtual void ToXmlPptx(NSStringUtils::CStringBuilder& oWriter) const override final;
+		virtual void ToBin(NSWasm::CData& oWriter) const override final;
 		virtual eVerticalCrossingType GetVerticalCrossingType(const CContText* pItem) const noexcept;
 
 		// calc sizes in selected font (uses m_oSelectedFont & m_pManager)
@@ -123,16 +123,16 @@ namespace NSDocxRenderer
 		// check font effect and delete not needed cont
 		// return true if was deleted
 		static bool CheckFontEffects
-			(std::shared_ptr<CContText>& pFirstCont,
-			 std::shared_ptr<CContText>& pSecondCont,
-			 eVerticalCrossingType eVType,
-			 eHorizontalCrossingType eHType);
+		(std::shared_ptr<CContText>& pFirstCont,
+		 std::shared_ptr<CContText>& pSecondCont,
+		 eVerticalCrossingType eVType,
+		 eHorizontalCrossingType eHType);
 
 		static bool CheckVertAlignTypeBetweenConts
-			(std::shared_ptr<CContText> pFirstCont,
-			 std::shared_ptr<CContText> pSecondCont,
-			 eVerticalCrossingType eVType,
-			 eHorizontalCrossingType eHType);
+		(std::shared_ptr<CContText> pFirstCont,
+		 std::shared_ptr<CContText> pSecondCont,
+		 eVerticalCrossingType eVType,
+		 eHorizontalCrossingType eHType);
 
 		static bool IsUnicodeRtl(uint32_t cSym);
 		static bool IsUnicodeBullet(uint32_t cSym);
@@ -157,24 +157,34 @@ namespace NSDocxRenderer
 		CContTextBuilder(CFontStyleManager* pFontStyleManager, CFontSelector* pFontSelector);
 		~CContTextBuilder() = default;
 
-		// after call CContTextBuilder is empty
+		// after call CContTextBuilder conts is empty
 		std::vector<cont_ptr_t> GetConts();
+
+		// after call CContTextBuilder diacs is empty
+		std::vector<cont_ptr_t> GetDiacs();
+
 		void AddUnicode(
-			double dTop,
-			double dBot,
-			double dLeft,
-			double dRight,
-			const NSStructures::CFont& oFont,
-			const NSStructures::CBrush& oBrush,
-			CFontManager* pFontManager,
-			const NSStringUtils::CStringUTF32& oText,
-			bool bForcedBold = false,
-			bool bUseDefaultFont = false,
-			bool bWriteStyleRaw = false);
+		        double dTop,
+		        double dBot,
+		        double dLeft,
+		        double dRight,
+		        const NSStructures::CFont& oFont,
+		        const NSStructures::CBrush& oBrush,
+		        CFontManager* pFontManager,
+		        const NSStringUtils::CStringUTF32& oText,
+		        bool bForcedBold = false,
+		        bool bUseDefaultFont = false,
+		        bool bWriteStyleRaw = false);
+
+		void NullCurrCont();
+		void Clear();
 
 	private:
 		std::vector<cont_ptr_t> m_arConts;
+		std::vector<cont_ptr_t> m_arDiacs;
+
 		cont_ptr_t m_pCurrCont {nullptr};
+
 		NSStructures::CFont m_oPrevFont;
 		NSStructures::CBrush m_oPrevBrush;
 
diff --git a/DocxRenderer/src/logic/elements/Paragraph.cpp b/DocxRenderer/src/logic/elements/Paragraph.cpp
index dedde15539..1fc93141fc 100644
--- a/DocxRenderer/src/logic/elements/Paragraph.cpp
+++ b/DocxRenderer/src/logic/elements/Paragraph.cpp
@@ -11,7 +11,7 @@ namespace NSDocxRenderer
 
 	void CParagraph::Clear()
 	{
-		m_arLines.clear();
+		m_arTextLines.clear();
 	}
 
 	void CParagraph::ToXml(NSStringUtils::CStringBuilder& oWriter) const
@@ -20,7 +20,7 @@ namespace NSDocxRenderer
 		oWriter.WriteString(L"<w:pPr>");
 
 		// styles
-		if(!m_wsStyleId.empty()) oWriter.WriteString(L"<w:pStyle w:val=\"" + m_wsStyleId + L"\"/>");
+		if (!m_wsStyleId.empty()) oWriter.WriteString(L"<w:pStyle w:val=\"" + m_wsStyleId + L"\"/>");
 
 		oWriter.WriteString(L"<w:spacing");
 
@@ -105,7 +105,7 @@ namespace NSDocxRenderer
 		}
 
 		oWriter.WriteString(L"</w:pPr>");
-		for(const auto& line : m_arLines)
+		for(const auto& line : m_arTextLines)
 			if(line)
 				line->ToXml(oWriter);
 		oWriter.WriteString(L"</w:p>");
@@ -135,14 +135,28 @@ namespace NSDocxRenderer
 			break;
 		}
 
-		oWriter.WriteString(L"\"");
+		oWriter.WriteString(L"\" ");
 
 		if (m_bIsNeedFirstLineIndent)
 		{
-			oWriter.WriteString(L" indent=\"");
+			oWriter.WriteString(L" indent=\" ");
 			oWriter.AddInt(static_cast<int>(m_dFirstLine * c_dMMToEMU));
 			oWriter.WriteString(L"\"");
 		}
+
+		if (m_dLeftBorder > 0)
+		{
+			oWriter.WriteString(L" marL=\" ");
+			oWriter.AddInt(static_cast<int>(m_dLeftBorder * c_dMMToEMU));
+			oWriter.WriteString(L"\"");
+		}
+		if (m_dRightBorder > 0)
+		{
+			oWriter.WriteString(L" marR=\"");
+			oWriter.AddInt(static_cast<int>(m_dRightBorder * c_dMMToEMU));
+			oWriter.WriteString(L"\"");
+		}
+
 		oWriter.WriteString(L">");
 
 		oWriter.WriteString(L"<a:spcBef>");
@@ -151,10 +165,9 @@ namespace NSDocxRenderer
 		oWriter.WriteString(L"\"/>");
 		oWriter.WriteString(L"</a:spcBef>");
 
-
 		oWriter.WriteString(L"<a:spcAft>");
 		oWriter.WriteString(L"<a:spcPts val=\"");
-		oWriter.AddInt(static_cast<int>(m_dSpaceBefore * c_dMMToPt * 100));
+		oWriter.AddInt(static_cast<int>(m_dSpaceAfter * c_dMMToPt * 100));
 		oWriter.WriteString(L"\"/>");
 		oWriter.WriteString(L"</a:spcAft>");
 
@@ -165,20 +178,113 @@ namespace NSDocxRenderer
 		oWriter.WriteString(L"</a:lnSpc>");
 
 		oWriter.WriteString(L"</a:pPr>");
-		for(const auto& line : m_arLines)
+		for(const auto& line : m_arTextLines)
 			if(line)
 				line->ToXmlPptx(oWriter);
 		oWriter.WriteString(L"</a:p>");
 	}
+	void CParagraph::ToBin(NSWasm::CData& oWriter) const
+	{
+		// WriteRecord WriteTextParagraphPr
+		[this, &oWriter] () {
+			oWriter.StartRecord(0);
+			oWriter.WriteBYTE(kBin_g_nodeAttributeStart);
+			oWriter.WriteBYTE(0);
+			switch (m_eTextAlignmentType)
+			{
+			case tatByCenter:
+				oWriter.WriteBYTE(0);
+				break;
+			case tatByRight:
+				oWriter.WriteBYTE(5);
+				break;
+			case tatByWidth:
+				oWriter.WriteBYTE(2);
+				break;
+			case tatByLeft:  // fallthrough
+			case tatUnknown: // fallthrough
+			default:
+				oWriter.WriteBYTE(4);
+				break;
+			}
+
+			// marL
+			if (m_dLeftBorder > 0)
+			{
+				oWriter.WriteBYTE(8);
+				oWriter.AddSInt(static_cast<int>(m_dLeftBorder * c_dMMToEMU));
+			}
+
+			// marR
+			if (m_dRightBorder > 0)
+			{
+				oWriter.WriteBYTE(9);
+				oWriter.AddSInt(static_cast<int>(m_dRightBorder * c_dMMToEMU));
+			}
+
+			// indent
+			if (m_bIsNeedFirstLineIndent)
+			{
+				oWriter.WriteBYTE(5);
+				oWriter.AddSInt(static_cast<int>(m_dFirstLine * c_dMMToEMU));
+			}
+			oWriter.WriteBYTE(kBin_g_nodeAttributeEnd);
+
+			const int max_value = 158400;
+
+			// line spacing
+			oWriter.StartRecord(0);
+			oWriter.WriteBYTE(kBin_g_nodeAttributeStart);
+			int height_value = static_cast<int>(m_dLineHeight * c_dMMToPt * 100);
+			if (fabs(height_value) > max_value)
+				height_value > 0 ? height_value = max_value : height_value = -max_value;
+			oWriter.WriteBYTE(1); oWriter.AddSInt(static_cast<int>(height_value));
+			oWriter.WriteBYTE(kBin_g_nodeAttributeEnd);
+			oWriter.EndRecord();
+
+			// space after
+			oWriter.StartRecord(1);
+			oWriter.WriteBYTE(kBin_g_nodeAttributeStart);
+			int after_value = static_cast<int>(m_dSpaceAfter * c_dMMToPt * 100);
+			if (fabs(after_value) > max_value)
+				after_value > 0 ? after_value = max_value : after_value = -max_value;
+			oWriter.WriteBYTE(1); oWriter.AddSInt(static_cast<int>(after_value));
+			oWriter.WriteBYTE(kBin_g_nodeAttributeEnd);
+			oWriter.EndRecord();
+
+			// space before
+			oWriter.StartRecord(2);
+			oWriter.WriteBYTE(kBin_g_nodeAttributeStart);
+			int before_value = static_cast<int>(m_dSpaceBefore * c_dMMToPt * 100);
+			if (fabs(before_value) > max_value)
+				before_value > 0 ? before_value = max_value : before_value = -max_value;
+			oWriter.WriteBYTE(1); oWriter.AddSInt(static_cast<int>(before_value));
+			oWriter.WriteBYTE(kBin_g_nodeAttributeEnd);
+			oWriter.EndRecord();
+
+			oWriter.EndRecord();
+		}();
+
+		oWriter.StartRecord(2);
+		unsigned int count = 0;
+		for (const auto& text_line : m_arTextLines)
+			count += text_line->m_arConts.size();
+
+		oWriter.AddInt(count);
+		for (const auto& text_line : m_arTextLines)
+			text_line->ToBin(oWriter);
+
+		oWriter.EndRecord();
+	}
 
 	void CParagraph::RemoveHighlightColor()
 	{
 		if (!m_bIsShadingPresent)
 			return;
 
-		for(size_t i = 0; i < m_arLines.size(); ++i)
+		for(size_t i = 0; i < m_arTextLines.size(); ++i)
 		{
-			auto& pLine = m_arLines[i];
+			auto& pLine = m_arTextLines[i];
 			if (pLine || pLine->m_pDominantShape)
 			{
 				for (size_t j = 0; j < pLine->m_arConts.size(); ++j)
@@ -194,9 +300,9 @@ namespace NSDocxRenderer
 
 	void CParagraph::MergeLines()
 	{
-		for(size_t i = 0; i < m_arLines.size() - 1; ++i)
+		for(size_t i = 0; i < m_arTextLines.size() - 1; ++i)
 		{
-			auto pLine = m_arLines[i];
+			auto pLine = m_arTextLines[i];
 			auto pLastCont = pLine->m_arConts.back();
 			size_t iNumConts = pLine->m_arConts.size() - 1;
 
@@ -206,7 +312,7 @@ namespace NSDocxRenderer
 			auto text = pLastCont->GetText();
 			auto last_sym = text[text.length() - 1];
 
-			if (last_sym != c_SPACE_SYM && m_arLines.size() != 1)
+			if (last_sym != c_SPACE_SYM && m_arTextLines.size() != 1)
 				pLastCont->AddSymBack(c_SPACE_SYM, 0);
 		}
 	}
diff --git a/DocxRenderer/src/logic/elements/Paragraph.h b/DocxRenderer/src/logic/elements/Paragraph.h
index eef9894cb1..4c4e859cd8 100644
--- a/DocxRenderer/src/logic/elements/Paragraph.h
+++ b/DocxRenderer/src/logic/elements/Paragraph.h
@@ -4,7 +4,7 @@
 
 namespace NSDocxRenderer
 {
-	class CParagraph : public CBaseItem
+	class CParagraph : public CBaseItem, public IOoxmlItem
 	{
 	public:
 		enum TextAlignmentType
@@ -31,15 +31,16 @@ namespace NSDocxRenderer
 		double m_dSpaceAfter {0.0}; // в shape по умолчанию выставляется 8pt, если отсутсвует w:after
 		double m_dLineHeight {0.0};
 
-		std::vector<std::shared_ptr<CTextLine>> m_arLines;
+		std::vector<std::shared_ptr<CTextLine>> m_arTextLines;
 		std::wstring m_wsStyleId;
 
 	public:
 		CParagraph() : CBaseItem() {}
 		virtual ~CParagraph();
-		virtual void Clear() override final;
+		virtual void Clear();
 		virtual void ToXml(NSStringUtils::CStringBuilder& oWriter) const override final;
 		virtual void ToXmlPptx(NSStringUtils::CStringBuilder& oWriter) const override final;
+		virtual void ToBin(NSWasm::CData& oWriter) const override final;
 
 		void RemoveHighlightColor();
 		void MergeLines();
diff --git a/DocxRenderer/src/logic/elements/Shape.cpp b/DocxRenderer/src/logic/elements/Shape.cpp
index 6bdb4f2c3f..52278ad575 100644
--- a/DocxRenderer/src/logic/elements/Shape.cpp
+++ b/DocxRenderer/src/logic/elements/Shape.cpp
@@ -25,7 +25,7 @@ namespace NSDocxRenderer
 	}
 
 	CShape::CShape(std::shared_ptr<CImageInfo> pInfo, const std::wstring& strDstMedia) :
-		m_strDstMedia(strDstMedia), m_pImageInfo(pInfo)
+	    m_strDstMedia(strDstMedia), m_pImageInfo(pInfo)
 	{
 		m_nRelativeHeight = m_gRelativeHeight;
 		m_gRelativeHeight += c_iStandartRelativeHeight;
@@ -94,7 +94,7 @@ namespace NSDocxRenderer
 		if (m_dHeight < 0.0001)
 			m_dHeight = 0.0001;
 
-		m_dBaselinePos = m_dTop + m_dHeight;
+		m_dBot = m_dTop + m_dHeight;
 		m_dRight = m_dLeft + m_dWidth;
 	}
 
@@ -110,40 +110,40 @@ namespace NSDocxRenderer
 		double dHorNearby = 30;
 		double dVerNearby = 30;
 
-		if(
-			// только для фигур
-			(pShape->m_eGraphicsType == eGraphicsType::gtComplicatedFigure ||
-			 pShape->m_eGraphicsType == eGraphicsType::gtRectangle) &&
+		if (
+		        // только для фигур
+		        (pShape->m_eGraphicsType == eGraphicsType::gtComplicatedFigure ||
+		         pShape->m_eGraphicsType == eGraphicsType::gtRectangle) &&
 
-			(this->m_eGraphicsType == eGraphicsType::gtComplicatedFigure ||
-			 this->m_eGraphicsType == eGraphicsType::gtRectangle) &&
+		        (this->m_eGraphicsType == eGraphicsType::gtComplicatedFigure ||
+		         this->m_eGraphicsType == eGraphicsType::gtRectangle) &&
 
-				// все совпадает
-				pShape->m_eType == this->m_eType &&
-			pShape->m_oPen.IsEqual(&m_oPen) &&
-			pShape->m_oBrush.IsEqual(&m_oBrush) &&
-			pShape->m_bIsNoFill == m_bIsNoFill &&
-			pShape->m_bIsNoStroke == m_bIsNoStroke &&
+		        // все совпадает
+		        pShape->m_eType == this->m_eType &&
+		        pShape->m_oPen.IsEqual(&m_oPen) &&
+		        pShape->m_oBrush.IsEqual(&m_oBrush) &&
+		        pShape->m_bIsNoFill == m_bIsNoFill &&
+		        pShape->m_bIsNoStroke == m_bIsNoStroke &&
 
-				// не картинка
-				pShape->m_pImageInfo == nullptr &&
-			this->m_pImageInfo == nullptr &&
+		        // не картинка
+		        pShape->m_pImageInfo == nullptr &&
+		        this->m_pImageInfo == nullptr &&
 
-			// недалеко друг от друга по горизонтали
-			(fabs(pShape->m_dRight - this->m_dLeft) < dHorNearby ||
-			 fabs(pShape->m_dLeft - this->m_dRight) < dHorNearby ||
+		        // недалеко друг от друга по горизонтали
+		        (fabs(pShape->m_dRight - this->m_dLeft) < dHorNearby ||
+		         fabs(pShape->m_dLeft - this->m_dRight) < dHorNearby ||
 
-				 // друг в друге тоже учитываем
-				 fabs(pShape->m_dRight - this->m_dRight) < dHorNearby ||
-			 fabs(pShape->m_dLeft - this->m_dLeft) < dHorNearby) &&
+		         // друг в друге тоже учитываем
+		         fabs(pShape->m_dRight - this->m_dRight) < dHorNearby ||
+		         fabs(pShape->m_dLeft - this->m_dLeft) < dHorNearby) &&
 
-			// недалеко друг от друга по вертикали
-			(fabs(pShape->m_dBaselinePos - this->m_dTop) < dVerNearby ||
-			 fabs(pShape->m_dTop - this->m_dBaselinePos) < dVerNearby ||
+		        // недалеко друг от друга по вертикали
+		        (fabs(pShape->m_dBot - this->m_dTop) < dVerNearby ||
+		         fabs(pShape->m_dTop - this->m_dBot) < dVerNearby ||
 
-				 // друг в друге
-				 fabs(pShape->m_dBaselinePos - this->m_dBaselinePos) < dVerNearby ||
-			 fabs(pShape->m_dTop - this->m_dTop) < dVerNearby))
+		         // друг в друге
+		         fabs(pShape->m_dBot - this->m_dBot) < dVerNearby ||
+		         fabs(pShape->m_dTop - this->m_dTop) < dVerNearby))
 		{
 			RecalcWithNewItem(pShape.get());
 			m_oVector.Join(std::move(pShape->m_oVector));
@@ -327,7 +327,7 @@ namespace NSDocxRenderer
 			return;
 
 		if (!pFirstShape->IsItFitLine() || !pSecondShape->IsItFitLine() || !pFirstShape->IsCorrelated(pSecondShape) ||
-		    fabs(pFirstShape->m_dHeight - pSecondShape->m_dHeight) > c_dGRAPHICS_ERROR_IN_LINES_MM)
+		        fabs(pFirstShape->m_dHeight - pSecondShape->m_dHeight) > c_dGRAPHICS_ERROR_IN_LINES_MM)
 		{
 			return; // линия должна быть одного размера по высоте
 		}
@@ -360,8 +360,8 @@ namespace NSDocxRenderer
 		}
 
 		else if (fabs(pFirstShape->m_dTop - pSecondShape->m_dTop) < c_dGRAPHICS_ERROR_IN_LINES_MM * 5 &&
-				 fabs(pFirstShape->m_dWidth - pSecondShape->m_dWidth) < c_dGRAPHICS_ERROR_IN_LINES_MM &&
-				 fabs(pFirstShape->m_dLeft - pSecondShape->m_dLeft) < c_dGRAPHICS_ERROR_IN_LINES_MM)
+		         fabs(pFirstShape->m_dWidth - pSecondShape->m_dWidth) < c_dGRAPHICS_ERROR_IN_LINES_MM &&
+		         fabs(pFirstShape->m_dLeft - pSecondShape->m_dLeft) < c_dGRAPHICS_ERROR_IN_LINES_MM)
 		{
 			// условие первого определения
 			if (pFirstShape->m_eSimpleLineType == eSimpleLineType::sltHLongDash && pSecondShape->m_eSimpleLineType == eSimpleLineType::sltHLongDash)
@@ -450,14 +450,14 @@ namespace NSDocxRenderer
 			if (pSecondShape->m_eSimpleLineType == eSimpleLineType::sltHDot)
 			{
 				if ((pFirstShape->m_eLineType == eLineType::ltUnknown || pFirstShape->m_eLineType == eLineType::ltDotted ||
-					 pFirstShape->m_eLineType == eLineType::ltDottedHeavy) && pSecondShape->m_eLineType == eLineType::ltUnknown)
+				     pFirstShape->m_eLineType == eLineType::ltDottedHeavy) && pSecondShape->m_eLineType == eLineType::ltUnknown)
 				{
 					pFirstShape->m_eLineType = pFirstShape->m_dHeight > 0.3 ? eLineType::ltDottedHeavy : eLineType::ltDotted;
 					passed = true;
 				}
 				else if ((pFirstShape->m_eLineType == eLineType::ltDotDash || pFirstShape->m_eLineType == eLineType::ltDashDotHeavy ||
-						  pFirstShape->m_eLineType == eLineType::ltDotDotDash || pFirstShape->m_eLineType == eLineType::ltDashDotDotHeavy) &&
-						 pSecondShape->m_eLineType == eLineType::ltUnknown)
+				          pFirstShape->m_eLineType == eLineType::ltDotDotDash || pFirstShape->m_eLineType == eLineType::ltDashDotDotHeavy) &&
+				         pSecondShape->m_eLineType == eLineType::ltUnknown)
 				{
 					pFirstShape->m_eLineType = pFirstShape->m_dHeight > 0.3 ? eLineType::ltDashDotDotHeavy : eLineType::ltDotDotDash;
 					pFirstShape->m_eSimpleLineType = eSimpleLineType::sltHDot;
@@ -467,13 +467,13 @@ namespace NSDocxRenderer
 			else if (pSecondShape->m_eSimpleLineType == eSimpleLineType::sltHDash)
 			{
 				if ((pFirstShape->m_eLineType == eLineType::ltDotDash || pFirstShape->m_eLineType == eLineType::ltDashDotHeavy) &&
-					pSecondShape->m_eLineType == eLineType::ltUnknown)
+				        pSecondShape->m_eLineType == eLineType::ltUnknown)
 				{
 					pFirstShape->m_eSimpleLineType = eSimpleLineType::sltHDash;
 					passed = true;
 				}
 				else if ((pFirstShape->m_eLineType == eLineType::ltDotDotDash || pFirstShape->m_eLineType == eLineType::ltDashDotDotHeavy) &&
-						 pSecondShape->m_eLineType == eLineType::ltUnknown)
+				         pSecondShape->m_eLineType == eLineType::ltUnknown)
 				{
 					pFirstShape->m_eSimpleLineType = eSimpleLineType::sltHDash;
 					passed = true;
@@ -485,13 +485,13 @@ namespace NSDocxRenderer
 			if (pSecondShape->m_eSimpleLineType == eSimpleLineType::sltHDash)
 			{
 				if ((pFirstShape->m_eLineType == eLineType::ltUnknown || pFirstShape->m_eLineType == eLineType::ltDash ||
-					 pFirstShape->m_eLineType == eLineType::ltDashedHeavy) && pSecondShape->m_eLineType == eLineType::ltUnknown)
+				     pFirstShape->m_eLineType == eLineType::ltDashedHeavy) && pSecondShape->m_eLineType == eLineType::ltUnknown)
 				{
 					pFirstShape->m_eLineType = pFirstShape->m_dHeight > 0.3 ? eLineType::ltDashedHeavy : eLineType::ltDash;
 					passed = true;
 				}
 				else if ((pFirstShape->m_eLineType == eLineType::ltDotDash || pFirstShape->m_eLineType == eLineType::ltDashDotHeavy) &&
-						 pSecondShape->m_eLineType == eLineType::ltUnknown)
+				         pSecondShape->m_eLineType == eLineType::ltUnknown)
 				{
 					passed = true;
 				}
@@ -499,14 +499,14 @@ namespace NSDocxRenderer
 			else if (pSecondShape->m_eSimpleLineType == eSimpleLineType::sltHDot)
 			{
 				if ((pFirstShape->m_eLineType == eLineType::ltUnknown || pFirstShape->m_eLineType == eLineType::ltDotDash ||
-					 pFirstShape->m_eLineType == eLineType::ltDashDotHeavy) && pSecondShape->m_eLineType == eLineType::ltUnknown)
+				     pFirstShape->m_eLineType == eLineType::ltDashDotHeavy) && pSecondShape->m_eLineType == eLineType::ltUnknown)
 				{
 					pFirstShape->m_eLineType = pFirstShape->m_dHeight > 0.3 ? eLineType::ltDashDotHeavy : eLineType::ltDotDash;
 					pFirstShape->m_eSimpleLineType = eSimpleLineType::sltHDot;
 					passed = true;
 				}
 				else if ((pFirstShape->m_eLineType == eLineType::ltDotDotDash || pFirstShape->m_eLineType == eLineType::ltDashDotDotHeavy) &&
-						 pSecondShape->m_eLineType == eLineType::ltUnknown)
+				         pSecondShape->m_eLineType == eLineType::ltUnknown)
 				{
 					pFirstShape->m_eSimpleLineType = eSimpleLineType::sltHDot;
 					passed = true;
@@ -516,13 +516,13 @@ namespace NSDocxRenderer
 
 		case eSimpleLineType::sltHLongDash:
 			if (fabs(pFirstShape->m_dLeft +pFirstShape->m_dWidth - pSecondShape->m_dLeft) < 0.7 ||
-				pFirstShape->m_eLineType == eLineType::ltThick || pFirstShape->m_eLineType == eLineType::ltSingle)
+			        pFirstShape->m_eLineType == eLineType::ltThick || pFirstShape->m_eLineType == eLineType::ltSingle)
 			{
 				pFirstShape->m_eLineType = pFirstShape->m_dHeight > 0.3 ? eLineType::ltThick : eLineType::ltSingle;
 				passed = true;
 			}
 			else if ((pFirstShape->m_eLineType == eLineType::ltUnknown || pFirstShape->m_eLineType == eLineType::ltDashLong ||
-					  pFirstShape->m_eLineType == eLineType::ltDashLongHeavy) && pSecondShape->m_eLineType == eLineType::ltUnknown)
+			          pFirstShape->m_eLineType == eLineType::ltDashLongHeavy) && pSecondShape->m_eLineType == eLineType::ltUnknown)
 			{
 				pFirstShape->m_eLineType = pFirstShape->m_dHeight > 0.3 ? eLineType::ltDashLongHeavy : eLineType::ltDashLong;
 				passed = true;
@@ -531,8 +531,8 @@ namespace NSDocxRenderer
 
 		case eSimpleLineType::sltHWave:
 			if ((pFirstShape->m_eLineType == eLineType::ltUnknown || pFirstShape->m_eLineType == eLineType::ltWave ||
-				 pFirstShape->m_eLineType == eLineType::ltWavyHeavy || pFirstShape->m_eLineType == eLineType::ltWavyDouble) &&
-				pSecondShape->m_eLineType == eLineType::ltUnknown)
+			     pFirstShape->m_eLineType == eLineType::ltWavyHeavy || pFirstShape->m_eLineType == eLineType::ltWavyDouble) &&
+			        pSecondShape->m_eLineType == eLineType::ltUnknown)
 			{
 				pFirstShape->m_eLineType = pFirstShape->m_oPen.Size > 0.3 ? eLineType::ltWavyHeavy : eLineType::ltWave;
 				passed = true;
@@ -585,7 +585,7 @@ namespace NSDocxRenderer
 		double left = fabs(m_dRotation) > c_dMIN_ROTATION ? m_oNoRotVector.GetLeft() : m_dLeft;
 		double right = fabs(m_dRotation) > c_dMIN_ROTATION ? m_oNoRotVector.GetRight() : m_dRight;
 		double top = fabs(m_dRotation) > c_dMIN_ROTATION ? m_oNoRotVector.GetTop() : m_dTop;
-		double bot = fabs(m_dRotation) > c_dMIN_ROTATION ? m_oNoRotVector.GetBottom() : m_dBaselinePos;
+		double bot = fabs(m_dRotation) > c_dMIN_ROTATION ? m_oNoRotVector.GetBottom() : m_dBot;
 
 		double width = right - left;
 		double height = bot - top;
@@ -707,7 +707,7 @@ namespace NSDocxRenderer
 			double left = fabs(m_dRotation) > c_dMIN_ROTATION ? m_oNoRotVector.GetLeft() : m_dLeft;
 			double right = fabs(m_dRotation) > c_dMIN_ROTATION ? m_oNoRotVector.GetRight() : m_dRight;
 			double top = fabs(m_dRotation) > c_dMIN_ROTATION ? m_oNoRotVector.GetTop() : m_dTop;
-			double bot = fabs(m_dRotation) > c_dMIN_ROTATION ? m_oNoRotVector.GetBottom() : m_dBaselinePos;
+			double bot = fabs(m_dRotation) > c_dMIN_ROTATION ? m_oNoRotVector.GetBottom() : m_dBot;
 
 			double height = bot - top;
 			double width = right - left;
@@ -908,7 +908,7 @@ namespace NSDocxRenderer
 		double left = fabs(m_dRotation) > c_dMIN_ROTATION ? m_oNoRotVector.GetLeft() : m_dLeft;
 		double right = fabs(m_dRotation) > c_dMIN_ROTATION ? m_oNoRotVector.GetRight() : m_dRight;
 		double top = fabs(m_dRotation) > c_dMIN_ROTATION ? m_oNoRotVector.GetTop() : m_dTop;
-		double bot = fabs(m_dRotation) > c_dMIN_ROTATION ? m_oNoRotVector.GetBottom() : m_dBaselinePos;
+		double bot = fabs(m_dRotation) > c_dMIN_ROTATION ? m_oNoRotVector.GetBottom() : m_dBot;
 
 		double height = bot - top;
 		double width = right - left;
@@ -1047,4 +1047,345 @@ namespace NSDocxRenderer
 		}
 		oWriter.WriteString(L"</p:sp>");
 	}
+	void CShape::ToBin(NSWasm::CData& oWriter) const
+	{
+		auto& vector = fabs(m_dRotation) > c_dMIN_ROTATION ? m_oNoRotVector : m_oVector;
+		auto& data = vector.GetData();
+
+		double left = fabs(m_dRotation) > c_dMIN_ROTATION ? m_oNoRotVector.GetLeft() : m_dLeft;
+		double right = fabs(m_dRotation) > c_dMIN_ROTATION ? m_oNoRotVector.GetRight() : m_dRight;
+		double top = fabs(m_dRotation) > c_dMIN_ROTATION ? m_oNoRotVector.GetTop() : m_dTop;
+		double bot = fabs(m_dRotation) > c_dMIN_ROTATION ? m_oNoRotVector.GetBottom() : m_dBot;
+
+		double height = bot - top;
+		double width = right - left;
+
+		// WriteUniColor
+		auto WriteUniColor = [&oWriter] (long color, long alpha) {
+			BYTE r = reinterpret_cast<BYTE*>(&color)[0];
+			BYTE g = reinterpret_cast<BYTE*>(&color)[1];
+			BYTE b = reinterpret_cast<BYTE*>(&color)[2];
+
+			oWriter.StartRecord(1); // COLOR_TYPE_SRGB
+			oWriter.WriteBYTE(kBin_g_nodeAttributeStart);
+			oWriter.WriteBYTE(0); oWriter.WriteBYTE(r);
+			oWriter.WriteBYTE(1); oWriter.WriteBYTE(g);
+			oWriter.WriteBYTE(2); oWriter.WriteBYTE(b);
+			oWriter.WriteBYTE(kBin_g_nodeAttributeEnd);
+			// WriteMods (alpha)
+			oWriter.StartRecord(0);
+			oWriter.AddInt(1);
+			oWriter.StartRecord(1);
+			oWriter.WriteBYTE(kBin_g_nodeAttributeStart);
+			oWriter.WriteBYTE(0); oWriter.WriteStringUtf16(L"alpha");
+			oWriter.WriteBYTE(1); oWriter.AddInt(alpha * 100000 / 255);
+			oWriter.WriteBYTE(kBin_g_nodeAttributeEnd);
+			oWriter.EndRecord();
+			oWriter.EndRecord();
+			oWriter.EndRecord();
+		};
+
+		auto WriteUniFill = [&oWriter, &WriteUniColor] (long color, long alpha) {
+			oWriter.StartRecord(3); // FILL_TYPE_SOLID
+			oWriter.StartRecord(0);
+			WriteUniColor(color, alpha);
+			oWriter.EndRecord();
+			oWriter.EndRecord();
+		};
+
+		auto write_spPr = [this, &oWriter, &vector, &data, &WriteUniFill, &top, &left, &height, &width] () {
+			oWriter.WriteBYTE(kBin_g_nodeAttributeStart);
+			oWriter.WriteBYTE(kBin_g_nodeAttributeEnd);
+
+			// WriteRecord WriteXfrm
+			oWriter.StartRecord(0);
+			oWriter.WriteBYTE(kBin_g_nodeAttributeStart);
+			oWriter.WriteBYTE(0); oWriter.AddInt(static_cast<unsigned int>(left * c_dMMToEMU));
+			oWriter.WriteBYTE(1); oWriter.AddInt(static_cast<unsigned int>(top * c_dMMToEMU));
+			oWriter.WriteBYTE(2); oWriter.AddInt(static_cast<unsigned int>(width * c_dMMToEMU));
+			oWriter.WriteBYTE(3); oWriter.AddInt(static_cast<unsigned int>(height * c_dMMToEMU));
+
+			if (fabs(m_dRotation) > c_dMIN_ROTATION)
+			{
+				double degree = m_dRotation;
+				if (m_dRotation < 0) degree = 360.0 - m_dRotation;
+				oWriter.WriteBYTE(10); oWriter.AddInt(degree * c_dDegreeToAngle);
+			}
+			oWriter.WriteBYTE(kBin_g_nodeAttributeEnd);
+			oWriter.EndRecord();
+			// end of WriteRecord WriteXfrm
+
+			// WriteRecord WriteGeometry
+			oWriter.StartRecord(1);
+			if (vector.IsEmpty())
+			{
+				oWriter.StartRecord(1);
+				oWriter.WriteBYTE(kBin_g_nodeAttributeStart);
+				oWriter.WriteBYTE(0); oWriter.WriteStringUtf16(L"rect"); // default rect for text
+				oWriter.WriteBYTE(kBin_g_nodeAttributeEnd);
+				oWriter.EndRecord();
+			}
+			else
+			{
+				oWriter.StartRecord(2);
+
+				// WritePathLst
+				oWriter.StartRecord(4);
+				oWriter.AddInt(1);
+				oWriter.StartRecord(1);
+				oWriter.WriteBYTE(kBin_g_nodeAttributeStart);
+				oWriter.WriteBYTE(2); oWriter.AddInt(height * c_dMMToEMU); // pathH
+				oWriter.WriteBYTE(4); oWriter.AddInt(width * c_dMMToEMU); // pathW
+				oWriter.WriteBYTE(kBin_g_nodeAttributeEnd);
+				oWriter.StartRecord(0);
+				oWriter.AddInt(static_cast<unsigned int>(data.size()));
+
+				auto write_coords = [&oWriter, &left, &top] (const CVectorGraphics::CPathCommand& command) {
+					BYTE byte_count = 0;
+					oWriter.WriteBYTE(kBin_g_nodeAttributeStart);
+					for (const auto& point : command.points)
+					{
+						int x_coord = static_cast<int>((point.x - left) * c_dMMToEMU);
+						int y_coord = static_cast<int>((point.y - top) * c_dMMToEMU);
+						oWriter.WriteBYTE(byte_count++);
+						oWriter.WriteStringUtf16(std::to_wstring(x_coord));
+						oWriter.WriteBYTE(byte_count++);
+						oWriter.WriteStringUtf16(std::to_wstring(y_coord));
+					}
+					oWriter.WriteBYTE(kBin_g_nodeAttributeEnd);
+				};
+
+				for (const auto& command : data)
+				{
+					oWriter.StartRecord(0);
+					switch (command.type)
+					{
+					case CVectorGraphics::ePathCommandType::pctMove:
+						oWriter.StartRecord(1);
+						write_coords(command);
+						oWriter.EndRecord();
+						break;
+					case CVectorGraphics::ePathCommandType::pctLine:
+						oWriter.StartRecord(2);
+						write_coords(command);
+						oWriter.EndRecord();
+						break;
+					case CVectorGraphics::ePathCommandType::pctCurve:
+						oWriter.StartRecord(4);
+						write_coords(command);
+						oWriter.EndRecord();
+						break;
+					case CVectorGraphics::ePathCommandType::pctClose:
+						oWriter.StartRecord(3);
+						oWriter.EndRecord();
+						break;
+					default:
+						break;
+					}
+					oWriter.EndRecord();
+				}
+				oWriter.EndRecord();
+				oWriter.EndRecord();
+				oWriter.EndRecord();
+				// end of WritePathLst
+
+				// WriteRecord WriteTextRect
+				oWriter.StartRecord(5);
+				oWriter.WriteBYTE(kBin_g_nodeAttributeStart);
+				oWriter.WriteBYTE(0); oWriter.WriteStringUtf16(L"l");
+				oWriter.WriteBYTE(1); oWriter.WriteStringUtf16(L"t");
+				oWriter.WriteBYTE(2); oWriter.WriteStringUtf16(L"r");
+				oWriter.WriteBYTE(3); oWriter.WriteStringUtf16(L"b");
+				oWriter.WriteBYTE(kBin_g_nodeAttributeEnd);
+				oWriter.EndRecord();
+				// end of WriteRecord WriteTextRect
+
+				oWriter.EndRecord();
+			}
+			oWriter.EndRecord();
+			// end of WriteRecord WriteGeometry
+
+			// WriteRecord WriteUniFill
+			if (!m_bIsNoFill && m_eType != CShape::eShapeType::stVectorTexture)
+			{
+				oWriter.StartRecord(2);
+				WriteUniFill(m_oBrush.Color1, m_oBrush.Alpha1);
+				oWriter.EndRecord();
+			}
+
+			if (!m_bIsNoStroke)
+			{
+				// WriteRecord WriteLn
+				oWriter.StartRecord(3);
+				oWriter.WriteBYTE(kBin_g_nodeAttributeStart);
+				oWriter.WriteBYTE(3); oWriter.AddInt(static_cast<unsigned int>(m_oPen.Size * c_dMMToEMU)); // ln w
+				oWriter.WriteBYTE(kBin_g_nodeAttributeEnd);
+
+				oWriter.StartRecord(0);
+				WriteUniFill(m_oPen.Color, m_oPen.Alpha);
+				oWriter.EndRecord();
+
+				oWriter.EndRecord();
+			}
+		};
+
+		if (m_eType == eShapeType::stVectorTexture)
+		{
+			oWriter.StartRecord(2);
+
+			// WriteRecord WriteUniNvPr
+			oWriter.StartRecord(0);
+
+			// WriteRecord Write_cNvPr
+			oWriter.StartRecord(0);
+			oWriter.WriteBYTE(kBin_g_nodeAttributeStart);
+			oWriter.WriteBYTE(0); oWriter.AddInt(m_pImageInfo->m_nId);
+			std::wstring name = L"Picture " + std::to_wstring(m_pImageInfo->m_nId);
+			oWriter.WriteBYTE(1); oWriter.WriteStringUtf16(name);
+			oWriter.WriteBYTE(kBin_g_nodeAttributeEnd);
+			oWriter.EndRecord();
+
+			// WriteRecord WritePicCNvPr
+			oWriter.StartRecord(1);
+			oWriter.WriteBYTE(kBin_g_nodeAttributeStart);
+			oWriter.WriteBYTE(3); oWriter.WriteBool(true); // noChangeAspect
+			oWriter.WriteBYTE(kBin_g_nodeAttributeEnd);
+			oWriter.EndRecord();
+
+			oWriter.EndRecord();
+			// end of WriteRecord WriteUniNvPr
+
+			// WriteRecord WriteUniFill (blip)
+			oWriter.StartRecord(1);
+			oWriter.StartRecord(1); // FILL_TYPE_BLIP
+			oWriter.WriteBYTE(kBin_g_nodeAttributeStart);
+			oWriter.WriteBYTE(kBin_g_nodeAttributeEnd);
+
+			// WriteBlip
+			oWriter.StartRecord(0);
+			oWriter.WriteBYTE(kBin_g_nodeAttributeStart);
+			oWriter.WriteBYTE(kBin_g_nodeAttributeEnd);
+			oWriter.StartRecord(2);
+			oWriter.AddInt(0); // effects
+			oWriter.EndRecord();
+
+			std::wstring rId = L"rId" + std::to_wstring(c_iStartingIdForImages + m_pImageInfo->m_nId);
+			oWriter.WriteBYTE(10); oWriter.WriteStringUtf16(rId); // embed
+
+			oWriter.EndRecord();
+			// end of WriteBlip
+
+			if (m_oBrush.Image == NULL)
+			{
+				oWriter.StartRecord(1);
+				oWriter.WriteBYTE(kBin_g_nodeAttributeStart);
+
+				// coeff
+				double src_offset_left = 1 - (width / (right - m_dImageLeft));
+				double src_offset_right = 1 - (width / (m_dImageRight - left));
+				double src_offset_top = 1 - (height / (bot - m_dImageTop));
+				double src_offset_bot = 1 - (height / (m_dImageBot - top));
+
+				// percentage
+				src_offset_left *= 100;
+				src_offset_right *= 100;
+				src_offset_top *= 100;
+				src_offset_bot *= 100;
+
+				std::wstring l = std::to_wstring(static_cast<int>(src_offset_left * 1000));
+				std::wstring t = std::to_wstring(static_cast<int>(src_offset_top * 1000));
+				std::wstring r = std::to_wstring(static_cast<int>(src_offset_right * 1000));
+				std::wstring b = std::to_wstring(static_cast<int>(src_offset_bot * 1000));
+
+				oWriter.WriteBYTE(0); oWriter.WriteStringUtf16(l);
+				oWriter.WriteBYTE(1); oWriter.WriteStringUtf16(t);
+				oWriter.WriteBYTE(2); oWriter.WriteStringUtf16(r);
+				oWriter.WriteBYTE(3); oWriter.WriteStringUtf16(b);
+
+				oWriter.WriteBYTE(kBin_g_nodeAttributeEnd);
+				oWriter.EndRecord();
+
+				oWriter.StartRecord(3);
+				oWriter.EndRecord();
+			}
+			else // tile
+			{
+				oWriter.StartRecord(2);
+				oWriter.WriteBYTE(kBin_g_nodeAttributeStart);
+				oWriter.WriteBYTE(0); oWriter.AddInt(100);
+				oWriter.WriteBYTE(1); oWriter.AddInt(100);
+				oWriter.WriteBYTE(kBin_g_nodeAttributeEnd);
+				oWriter.EndRecord();
+			}
+
+			oWriter.EndRecord();
+			oWriter.EndRecord();
+			// end of WriteRecord WriteUniFill (blip)
+
+			// WriteRecord WriteSpPr
+			oWriter.StartRecord(2); write_spPr(); oWriter.EndRecord();
+
+			oWriter.EndRecord();
+			return;
+		}
+
+		oWriter.StartRecord(1);
+		oWriter.WriteBYTE(kBin_g_nodeAttributeStart);
+		oWriter.WriteBYTE(kBin_g_nodeAttributeEnd);
+
+		// WriteRecord WriteSpPr
+		oWriter.StartRecord(1); write_spPr(); oWriter.EndRecord();
+
+		if (m_eType == eShapeType::stTextBox && !m_arOutputObjects.empty())
+		{
+			// WriteRecord WriteTxBody
+			oWriter.StartRecord(3);
+
+			// WriteRecord WriteBodyPr
+			oWriter.StartRecord(0);
+			oWriter.WriteBYTE(kBin_g_nodeAttributeStart);
+			oWriter.WriteBYTE(1); oWriter.WriteBYTE(1);      // anchor
+			oWriter.WriteBYTE(2); oWriter.WriteBool(false);  // anchorCtr
+			oWriter.WriteBYTE(3); oWriter.AddInt(0);         // bIns
+			oWriter.WriteBYTE(4); oWriter.WriteBool(true);   // compatLnSpc
+			oWriter.WriteBYTE(5); oWriter.WriteBool(false);  // forceAA
+			oWriter.WriteBYTE(6); oWriter.WriteBool(false);  // fromWordArt
+			oWriter.WriteBYTE(7); oWriter.WriteBYTE(1);      // horzOverflow
+			oWriter.WriteBYTE(8); oWriter.AddInt(0);         // lIns
+			oWriter.WriteBYTE(9); oWriter.AddInt(1);         // numCol
+			oWriter.WriteBYTE(10); oWriter.AddInt(0);        // rIns
+			oWriter.WriteBYTE(11); oWriter.AddInt(0);        // rot
+			oWriter.WriteBYTE(12); oWriter.WriteBool(false); // rtlCol
+			oWriter.WriteBYTE(13); oWriter.AddInt(0);        // spcCol
+			oWriter.WriteBYTE(14); oWriter.WriteBool(false); // spcFirstLastPara
+			oWriter.WriteBYTE(15); oWriter.AddInt(0);        // tIns
+			// 16 is upright param
+			oWriter.WriteBYTE(17); oWriter.WriteBYTE(1);     // vert
+			oWriter.WriteBYTE(18); oWriter.WriteBYTE(1);     // vertOverflow
+			oWriter.WriteBYTE(19); oWriter.WriteBYTE(1);     // vert
+
+			oWriter.WriteBYTE(kBin_g_nodeAttributeEnd);
+			// todo WritePrstTxWarp
+			oWriter.EndRecord();
+			// end of WriteRecord WriteBodyPr
+
+			// WriteRecordArray WriteParagraph
+			oWriter.StartRecord(2);
+			unsigned int len = static_cast<unsigned int>(m_arOutputObjects.size());
+			oWriter.AddInt(len);
+			for (const auto& o : m_arOutputObjects)
+			{
+				oWriter.StartRecord(0);
+				o->ToBin(oWriter);
+				oWriter.EndRecord();
+			}
+
+			oWriter.EndRecord();
+			// end of WriteRecordArray WriteParagraph
+
+			oWriter.EndRecord();
+			// end of WriteRecord WriteTxBody
+		}
+		oWriter.EndRecord();
+	}
 }; // namespace NSDocxRenderer
diff --git a/DocxRenderer/src/logic/elements/Shape.h b/DocxRenderer/src/logic/elements/Shape.h
index 0599b07b09..c3ae1384e8 100644
--- a/DocxRenderer/src/logic/elements/Shape.h
+++ b/DocxRenderer/src/logic/elements/Shape.h
@@ -20,7 +20,7 @@ namespace NSDocxRenderer
 		gtNoGraphics,
 	};
 
-	class CShape : public CBaseItem
+	class CShape : public CBaseItem, public IOoxmlItem
 	{
 	public:
 		enum class eShapeType
@@ -63,15 +63,16 @@ namespace NSDocxRenderer
 		eSimpleLineType m_eSimpleLineType{eSimpleLineType::sltUnknown};
 		eLineType m_eLineType            {eLineType::ltUnknown};
 
-		std::vector<std::shared_ptr<CBaseItem>> m_arOutputObjects;
+		std::vector<std::shared_ptr<IOoxmlItem>> m_arOutputObjects;
 
 	public:
 		CShape();
 		CShape(std::shared_ptr<CImageInfo> pInfo, const std::wstring& strDstMedia);
 		virtual ~CShape();
-		virtual void Clear() override final;
+		virtual void Clear();
 		virtual void ToXml(NSStringUtils::CStringBuilder& oWriter) const override final;
 		virtual void ToXmlPptx(NSStringUtils::CStringBuilder& oWriter)const override final;
+		virtual void ToBin(NSWasm::CData& oWriter) const override final;
 
 		void SetVector(CVectorGraphics&& oVector);
 		void CalcNoRotVector();
diff --git a/DocxRenderer/src/logic/elements/Table.cpp b/DocxRenderer/src/logic/elements/Table.cpp
index f70646bfab..12ac24f5dc 100644
--- a/DocxRenderer/src/logic/elements/Table.cpp
+++ b/DocxRenderer/src/logic/elements/Table.cpp
@@ -5,7 +5,11 @@
 
 namespace NSDocxRenderer
 {
-    void CTable::CCell::Clear()
+	CTable::CCell::CCell(const CCell& other)
+	{
+		*this = other;
+	}
+	void CTable::CCell::Clear()
 	{
 		m_arParagraphs.clear();
 	}
@@ -15,17 +19,33 @@ namespace NSDocxRenderer
 		oWriter.WriteString(L"<w:tcPr>");
 		oWriter.WriteString(L"<w:tcW w:w=\"");
 		oWriter.AddUInt(static_cast<unsigned int>(m_dWidth * c_dMMToDx));
-		oWriter.WriteString(L"\"w:type=\"dxa\"/>");
+		oWriter.WriteString(L"\" w:type=\"dxa\"/>");
+
+		oWriter.WriteString(L"<w:gridSpan w:val=\"");
+		oWriter.AddUInt(m_nGridSpan);
+		oWriter.WriteString(L"\"/>");
+
+		oWriter.WriteString(L"<w:vMerge w:val=\"");
+		switch (m_eVMerge) {
+		case eVMerge::vmContinue:
+			oWriter.WriteString(L"continue");
+			break;
+		case eVMerge::vmRestart:
+			oWriter.WriteString(L"restart");
+			break;
+		default:
+			break;
+		}
+		oWriter.WriteString(L"\"/>");
 
 		oWriter.WriteString(L"<w:tcBorders>");
-
 		auto write_border = [&oWriter] (const CBorder& border, const std::wstring& prefix) {
 			oWriter.WriteString(L"<w:");
 			oWriter.WriteString(prefix);
 			oWriter.WriteString(L" w:val=");
 			oWriter.WriteString(SingletonInstance<LinesTable>().ConvertLineToString(border.lineType));
 			oWriter.WriteString(L" w:sz=\"");
-			oWriter.AddUInt(static_cast<unsigned int>(border.dWidth * c_dMMToPt / 8));
+			oWriter.AddUInt(static_cast<unsigned int>(border.dWidth * c_dMMToPt * 8));
 			oWriter.WriteString(L"\" w:space=\"");
 			oWriter.AddUInt(static_cast<unsigned int>(border.dSpacing * c_dMMToPt));
 			oWriter.WriteString(L"\" w:color=\"");
@@ -34,7 +54,7 @@ namespace NSDocxRenderer
 		};
 
 		write_border(m_oBorderTop, L"top");
-		write_border(m_oBorderBot, L"bot");
+		write_border(m_oBorderBot, L"bottom");
 		write_border(m_oBorderLeft, L"left");
 		write_border(m_oBorderRight, L"right");
 
@@ -49,6 +69,28 @@ namespace NSDocxRenderer
 	void CTable::CCell::ToXmlPptx(NSStringUtils::CStringBuilder& oWriter) const
 	{
 
+	}
+	void CTable::CCell::ToBin(NSWasm::CData& oWriter) const
+	{
+
+	}
+	CTable::CCell& CTable::CCell::operator=(const CCell& other)
+	{
+		CBaseItem::operator=(other);
+
+		m_oBorderBot = other.m_oBorderBot;
+		m_oBorderTop = other.m_oBorderTop;
+		m_oBorderLeft = other.m_oBorderLeft;
+		m_oBorderRight = other.m_oBorderRight;
+
+		m_nGridSpan = other.m_nGridSpan;
+		m_eVMerge = other.m_eVMerge;
+
+		m_arParagraphs.clear();
+		for (const auto& p : other.m_arParagraphs)
+			m_arParagraphs.push_back(p);
+
+		return *this;
 	}
 	void CTable::CCell::AddParagraph(const paragraph_ptr_t& pParagraph)
 	{
@@ -77,6 +119,10 @@ namespace NSDocxRenderer
 	void CTable::CRow::ToXmlPptx(NSStringUtils::CStringBuilder& oWriter) const
 	{
 
+	}
+	void CTable::CRow::ToBin(NSWasm::CData& oWriter) const
+	{
+
 	}
 	void CTable::CRow::AddCell(const cell_ptr_t& pCell)
 	{
@@ -97,12 +143,26 @@ namespace NSDocxRenderer
 		oWriter.WriteString(L"<w:tbl>");
 
 		oWriter.WriteString(L"<w:tblPr>");
+		oWriter.WriteString(L"<w:tblpPr ");
+
+		oWriter.WriteString(L"w:horzAnchor=\"page\" w:vertAnchor=\"page\" w:tblpX=\"");
+		oWriter.AddInt64(static_cast<long long>(m_dLeft * c_dMMToDx));
+		oWriter.WriteString(L"\" w:tblpY=\"");
+		oWriter.AddInt64(static_cast<long long>(m_dTop * c_dMMToDx));
+		oWriter.WriteString(L"\" />");
+
 		oWriter.WriteString(L"<w:tblW w:w=\"");
 		oWriter.AddUInt(static_cast<unsigned int>(m_dWidth * c_dMMToDx));
-		oWriter.WriteString(L"\"w:type=\"dxa\"/>");
+		oWriter.WriteString(L"\" w:type=\"dxa\"/>");
 		oWriter.WriteString(L"</w:tblPr>");
 
 		oWriter.WriteString(L"<w:tblGrid>");
+		for (const auto& gc : m_arGridCols)
+		{
+			oWriter.WriteString(L"<w:gridCol w:w=\"");
+			oWriter.AddUInt(static_cast<unsigned int>(gc * c_dMMToDx));
+			oWriter.WriteString(L"\" />");
+		}
 		oWriter.WriteString(L"</w:tblGrid>");
 
 		for (const auto& r : m_arRows)
@@ -113,15 +173,58 @@ namespace NSDocxRenderer
 	void CTable::ToXmlPptx(NSStringUtils::CStringBuilder& oWriter) const
 	{
 
+	}
+	void CTable::ToBin(NSWasm::CData& oWriter) const
+	{
+
 	}
 	void CTable::AddRow(const row_ptr_t& pRow)
 	{
 		CBaseItem::RecalcWithNewItem(pRow.get());
 		m_arRows.push_back(pRow);
 	}
+	void CTable::CalcGridCols()
+	{
+		std::vector<double> cells_left;
+		auto add_if_no_exists = [&cells_left] (double val) {
+			bool exists = false;
+			for (const auto& curr : cells_left)
+			{
+				if (fabs(curr - val) < c_dMAX_TABLE_LINE_WIDTH_MM)
+				{
+					exists = true;
+					break;
+				}
+			}
+			if (!exists)
+				cells_left.push_back(val);
+		};
+
+		double right = 0;
+		for (const auto& row : m_arRows)
+		{
+			for (const auto& cell : row->m_arCells)
+			{
+				right = std::max(right, cell->m_dRight);
+				add_if_no_exists(cell->m_dLeft);
+			}
+		}
+		std::sort(cells_left.begin(), cells_left.end(), std::less<double>{});
+
+		for (size_t i = 0; i < cells_left.size() - 1; ++i)
+			m_arGridCols.push_back(cells_left[i + 1] - cells_left[i]);
+
+		m_arGridCols.push_back(right - cells_left.back());
+	}
 	bool CTable::IsEmpty() const
 	{
 		return m_arRows.empty();
 	}
 
+	void CTextCell::AddTextLine(const std::shared_ptr<CTextLine>& pTextLine)
+	{
+		CBaseItem::RecalcWithNewItem(pTextLine.get());
+		m_arTextLines.push_back(pTextLine);
+	}
+
 } // namespace NSDocxRenderer
diff --git a/DocxRenderer/src/logic/elements/Table.h b/DocxRenderer/src/logic/elements/Table.h
index 4c2ac69720..84226bb611 100644
--- a/DocxRenderer/src/logic/elements/Table.h
+++ b/DocxRenderer/src/logic/elements/Table.h
@@ -5,12 +5,16 @@
 
 #include "BaseItem.h"
 #include "Paragraph.h"
+#include "Shape.h"
 
 #include "../../resources/LinesTable.h"
 
 namespace NSDocxRenderer
 {
-    class CTable : public CBaseItem
+	class CGraphicalCell;
+	class CTextCell;
+
+	class CTable : public CBaseItem, public IOoxmlItem
 	{
 	public:
 		class CCell;
@@ -21,22 +25,33 @@ namespace NSDocxRenderer
 		using paragraph_ptr_t = std::shared_ptr<CParagraph>;
 
 	public:
-		class CCell : public CBaseItem
+		class CCell : public CBaseItem, public IOoxmlItem
 		{
+			friend class CTable;
 		public:
 			struct CBorder
 			{
 				double dWidth{};
 				double dSpacing{};
 				long lColor{};
-				eLineType lineType{};
+				eLineType lineType{eLineType::ltNone};
+			};
+
+			enum class eVMerge
+			{
+				vmRestart,
+				vmContinue
 			};
 
 			CCell() = default;
+			CCell(const CCell& other);
 			virtual ~CCell() = default;
-			virtual void Clear() override final;
+			virtual void Clear();
 			virtual void ToXml(NSStringUtils::CStringBuilder& oWriter) const override final;
 			virtual void ToXmlPptx(NSStringUtils::CStringBuilder& oWriter) const override final;
+			virtual void ToBin(NSWasm::CData& oWriter) const override final;
+
+			CCell& operator=(const CCell& other);
 
 			void AddParagraph(const paragraph_ptr_t& pParagraph);
 
@@ -45,17 +60,21 @@ namespace NSDocxRenderer
 			CBorder m_oBorderLeft;
 			CBorder m_oBorderRight;
 
-		private:
+			unsigned int m_nGridSpan = 1;
+			eVMerge m_eVMerge = CTable::CCell::eVMerge::vmRestart;
+
 			std::vector<paragraph_ptr_t> m_arParagraphs;
 		};
-		class CRow : public CBaseItem
+		class CRow : public CBaseItem, IOoxmlItem
 		{
+			friend class CTable;
 		public:
 			CRow() = default;
 			virtual ~CRow() = default;
-			virtual void Clear() override final;
+			virtual void Clear();
 			virtual void ToXml(NSStringUtils::CStringBuilder& oWriter) const override final;
 			virtual void ToXmlPptx(NSStringUtils::CStringBuilder& oWriter) const override final;
+			virtual void ToBin(NSWasm::CData& oWriter) const override final;
 
 			void AddCell(const cell_ptr_t& pCell);
 			bool IsEmpty() const;
@@ -66,15 +85,37 @@ namespace NSDocxRenderer
 
 		CTable() = default;
 		virtual ~CTable() = default;
-		virtual void Clear() override final;
+		virtual void Clear();
 		virtual void ToXml(NSStringUtils::CStringBuilder& oWriter) const override final;
 		virtual void ToXmlPptx(NSStringUtils::CStringBuilder& oWriter) const override final;
+		virtual void ToBin(NSWasm::CData& oWriter) const override final;
 
 		void AddRow(const row_ptr_t& pRow);
+		void CalcGridCols();
 		bool IsEmpty() const;
 
 	private:
 		std::vector<row_ptr_t> m_arRows;
+		std::vector<double> m_arGridCols;
+	};
+
+	class CGraphicalCell : public CBaseItem
+	{
+	public:
+		// realization
+	};
+
+	class CTextCell : public CBaseItem
+	{
+	public:
+		void AddTextLine(const std::shared_ptr<CTextLine>& pTextLine);
+		std::vector<std::shared_ptr<CTextLine>> m_arTextLines;
+
+		double m_dMinPossibleTop = std::numeric_limits<double>::lowest();
+		double m_dMinPossibleLeft = std::numeric_limits<double>::lowest();
+
+		double m_dMaxPossibleBot = std::numeric_limits<double>::max();
+		double m_dMaxPossibleRight = std::numeric_limits<double>::max();
 	};
 } // namespace NSDocxRenderer
 
diff --git a/DocxRenderer/src/logic/elements/TextLine.cpp b/DocxRenderer/src/logic/elements/TextLine.cpp
index 2d1905c097..83901fa95c 100644
--- a/DocxRenderer/src/logic/elements/TextLine.cpp
+++ b/DocxRenderer/src/logic/elements/TextLine.cpp
@@ -17,14 +17,14 @@ namespace NSDocxRenderer
 		m_arConts.clear();
 		m_pLine = nullptr;
 	}
-	void CTextLine::AddCont(std::shared_ptr<CContText> oCont)
+	void CTextLine::AddCont(const std::shared_ptr<CContText>& oCont)
 	{
 		RecalcWithNewItem(oCont.get());
 		m_arConts.push_back(oCont);
 	}
 	void CTextLine::AddConts(const std::vector<std::shared_ptr<CContText>>& arConts)
 	{
-		for (auto& cont : arConts)
+		for (const auto& cont : arConts)
 			AddCont(cont);
 	}
 
@@ -71,7 +71,7 @@ namespace NSDocxRenderer
 		std::shared_ptr<CContText> pFirst;
 		size_t j = 0;
 
-		for(; j < m_arConts.size() && !pFirst; ++j)
+		for (; j < m_arConts.size() && !pFirst; ++j)
 			pFirst = m_arConts[j];
 
 		for (size_t i = j; i < m_arConts.size(); ++i)
@@ -82,8 +82,8 @@ namespace NSDocxRenderer
 
 			double avg_space_width = pCurrent->m_pFontStyle->GetAvgSpaceWidth();
 			double space_width = avg_space_width != 0.0 ?
-									 avg_space_width * c_dAVERAGE_SPACE_WIDTH_COEF :
-									 pCurrent->CalculateSpace() * c_dSPACE_WIDTH_COEF;
+			            avg_space_width * c_dAVERAGE_SPACE_WIDTH_COEF :
+			            pCurrent->CalculateSpace() * c_dSPACE_WIDTH_COEF;
 
 			double dDifference = pCurrent->m_dLeft - pFirst->m_dRight;
 
@@ -91,7 +91,7 @@ namespace NSDocxRenderer
 			bool bIsSpaceDelta = dDifference > space_width;
 			bool bIsWideSpaceDelta = dDifference > space_width * 3;
 
-			if (bIsWideSpaceDelta || (pCurrent->m_bPossibleSplit && bIsSpaceDelta))
+			if (bIsWideSpaceDelta || (pCurrent->m_bPossibleHorSplit && bIsSpaceDelta))
 			{
 				if (CContText::IsUnicodeSpace(pFirst->GetLastSym()))
 					pFirst->RemoveLastSym();
@@ -104,7 +104,7 @@ namespace NSDocxRenderer
 					wide_space->m_dRight = pCurrent->m_dLeft;
 					wide_space->m_dWidth = wide_space->m_dRight - wide_space->m_dLeft;
 
-					wide_space->m_dBaselinePos = pCurrent->m_dBaselinePos;
+					wide_space->m_dBot = pCurrent->m_dBot;
 					wide_space->m_dTop = pCurrent->m_dTop;
 
 					wide_space->m_dTopWithAscent = pCurrent->m_dTopWithAscent;
@@ -217,7 +217,7 @@ namespace NSDocxRenderer
 		m_dTop = 0.0;
 		m_dWidth = 0.0;
 		m_dHeight = 0.0;
-		m_dBaselinePos = 0.0;
+		m_dBot = 0.0;
 		m_dRight = 0.0;
 		m_dHeight = 0.0;
 
@@ -241,19 +241,19 @@ namespace NSDocxRenderer
 			return  eVerticalCrossingType::vctCurrentOutsideNext;
 
 		else if (this_top < other_top && this_bot < other_bot &&
-				 (this_bot >= other_top || fabs(this_bot - other_top) < c_dTHE_SAME_STRING_Y_PRECISION_MM))
+		         (this_bot >= other_top || fabs(this_bot - other_top) < c_dTHE_SAME_STRING_Y_PRECISION_MM))
 			return  eVerticalCrossingType::vctCurrentAboveNext;
 
 		else if (this_top > other_top && this_bot > other_bot &&
-				 (this_top <= other_bot || fabs(this_top - other_bot) < c_dTHE_SAME_STRING_Y_PRECISION_MM))
+		         (this_top <= other_bot || fabs(this_top - other_bot) < c_dTHE_SAME_STRING_Y_PRECISION_MM))
 			return  eVerticalCrossingType::vctCurrentBelowNext;
 
 		else if (this_top == other_top && this_bot == other_bot &&
-				 m_dLeft == pLine->m_dLeft && m_dRight == pLine->m_dRight)
+		         m_dLeft == pLine->m_dLeft && m_dRight == pLine->m_dRight)
 			return  eVerticalCrossingType::vctDublicate;
 
 		else if (fabs(this_top - other_top) < c_dTHE_SAME_STRING_Y_PRECISION_MM &&
-				 fabs(this_bot - other_bot) < c_dTHE_SAME_STRING_Y_PRECISION_MM)
+		         fabs(this_bot - other_bot) < c_dTHE_SAME_STRING_Y_PRECISION_MM)
 			return  eVerticalCrossingType::vctTopAndBottomBordersMatch;
 
 		else if (fabs(this_top - other_top) < c_dTHE_SAME_STRING_Y_PRECISION_MM)
@@ -294,24 +294,33 @@ namespace NSDocxRenderer
 	bool CTextLine::IsShadingPresent(const CTextLine *pLine) const noexcept
 	{
 		return (m_pDominantShape && pLine->m_pDominantShape &&
-				m_pDominantShape->m_oBrush.Color1 == pLine->m_pDominantShape->m_oBrush.Color1 &&
-				fabs(m_pDominantShape->m_dLeft - pLine->m_pDominantShape->m_dLeft) < c_dGRAPHICS_ERROR_IN_LINES_MM &&
-				fabs(m_pDominantShape->m_dWidth - pLine->m_pDominantShape->m_dWidth) < c_dGRAPHICS_ERROR_IN_LINES_MM);
+		        m_pDominantShape->m_oBrush.Color1 == pLine->m_pDominantShape->m_oBrush.Color1 &&
+		        fabs(m_pDominantShape->m_dLeft - pLine->m_pDominantShape->m_dLeft) < c_dGRAPHICS_ERROR_IN_LINES_MM &&
+		        fabs(m_pDominantShape->m_dWidth - pLine->m_pDominantShape->m_dWidth) < c_dGRAPHICS_ERROR_IN_LINES_MM);
 	}
 
 	void CTextLine::ToXml(NSStringUtils::CStringBuilder& oWriter) const
 	{
 		for (const auto& cont : m_arConts)
-			if(cont)
+			if (cont)
 				cont->ToXml(oWriter);
 	}
 
 	void CTextLine::ToXmlPptx(NSStringUtils::CStringBuilder& oWriter) const
 	{
 		for (const auto& cont : m_arConts)
-			if(cont)
+			if (cont)
 				cont->ToXmlPptx(oWriter);
 	}
+	void CTextLine::ToBin(NSWasm::CData& oWriter) const
+	{
+		for (const auto& cont : m_arConts)
+		{
+			oWriter.StartRecord(0);
+			cont->ToBin(oWriter);
+			oWriter.EndRecord();
+		}
+	}
 
 	size_t CTextLine::GetLength() const
 	{
diff --git a/DocxRenderer/src/logic/elements/TextLine.h b/DocxRenderer/src/logic/elements/TextLine.h
index 05796a6e88..03eb0b021d 100644
--- a/DocxRenderer/src/logic/elements/TextLine.h
+++ b/DocxRenderer/src/logic/elements/TextLine.h
@@ -4,7 +4,7 @@
 
 namespace NSDocxRenderer
 {
-	class CTextLine : public CBaseItem
+	class CTextLine : public CBaseItem, public IOoxmlItem
 	{
 	public:
 		enum AssumedTextAlignmentType
@@ -31,16 +31,19 @@ namespace NSDocxRenderer
 
 		double m_dFirstWordWidth{0.0};
 
+		bool m_bIsPossibleVerSplit = false;
+
 	public:
 		CTextLine() = default;
 		virtual ~CTextLine();
-		virtual void Clear() override final;
+		virtual void Clear();
 		virtual void ToXml(NSStringUtils::CStringBuilder& oWriter) const override final;
 		virtual void ToXmlPptx(NSStringUtils::CStringBuilder& oWriter) const override final;
+		virtual void ToBin(NSWasm::CData& oWriter) const override final;
 		virtual void RecalcWithNewItem(const CContText* pCont);
 		virtual eVerticalCrossingType GetVerticalCrossingType(const CTextLine* pLine) const noexcept;
 
-		void AddCont(std::shared_ptr<CContText> pCont);
+		void AddCont(const std::shared_ptr<CContText>& pCont);
 		void AddConts(const std::vector<std::shared_ptr<CContText>>& arConts);
 		void MergeConts();
 		void CalcFirstWordWidth();
diff --git a/DocxRenderer/src/logic/managers/FontManager.cpp b/DocxRenderer/src/logic/managers/FontManager.cpp
index f2a6c6b591..b7c00b6b2e 100644
--- a/DocxRenderer/src/logic/managers/FontManager.cpp
+++ b/DocxRenderer/src/logic/managers/FontManager.cpp
@@ -10,8 +10,8 @@
 namespace NSDocxRenderer
 {
 	CUnicodeRange::CUnicodeRange(const int& _start, const int& _end,
-								 const BYTE& _range, const BYTE& _rangenum):
-		RangeNum(_rangenum), Range(_range), Start(_start), End(_end)
+	                             const BYTE& _range, const BYTE& _rangenum):
+	    RangeNum(_rangenum), Range(_range), Start(_start), End(_end)
 	{
 	}
 
@@ -314,13 +314,13 @@ namespace NSDocxRenderer
 
 	void CFontSelector::ClearCache()
 	{
-		if(!m_arParamsCache.empty())
+		if (!m_arParamsCache.empty())
 			m_arParamsCache.clear();
 	}
 
 	void CFontSelector::SelectFont(const CFontSelectParams& oFontSelectParams,
-								   const CFontMetrics& oFontMetrics,
-								   const NSStringUtils::CStringUTF32& oText)
+	                               const CFontMetrics& oFontMetrics,
+	                               const NSStringUtils::CStringUTF32& oText)
 	{
 		BYTE lRangeNum	= 0xFF;
 		BYTE lRange		= 0xFF;
@@ -605,14 +605,14 @@ namespace NSDocxRenderer
 	}
 
 	void CFontManager::MeasureString(
-		const std::wstring& wsText,
-		double x,
-		double y,
-		double& dBoxX,
-		double& dBoxY,
-		double& dBoxWidth,
-		double& dBoxHeight,
-		MeasureType measureType) const
+	        const std::wstring& wsText,
+	        double x,
+	        double y,
+	        double& dBoxX,
+	        double& dBoxY,
+	        double& dBoxWidth,
+	        double& dBoxHeight,
+	        MeasureType measureType) const
 	{
 		dBoxX		= 0;
 		dBoxY		= 0;
@@ -640,15 +640,15 @@ namespace NSDocxRenderer
 		dBoxHeight	*= c_dPixToMM;
 	}
 	void CFontManager::MeasureStringGids(
-		unsigned int* pGids,
-		unsigned int count,
-		double x,
-		double y,
-		double& dBoxX,
-		double& dBoxY,
-		double& dBoxWidth,
-		double& dBoxHeight,
-		MeasureType measureType) const
+	        unsigned int* pGids,
+	        unsigned int count,
+	        double x,
+	        double y,
+	        double& dBoxX,
+	        double& dBoxY,
+	        double& dBoxWidth,
+	        double& dBoxHeight,
+	        MeasureType measureType) const
 	{
 		dBoxX		= 0;
 		dBoxY		= 0;
diff --git a/DocxRenderer/src/logic/managers/FontManager.h b/DocxRenderer/src/logic/managers/FontManager.h
index 17e4d7286a..ec717a14e6 100644
--- a/DocxRenderer/src/logic/managers/FontManager.h
+++ b/DocxRenderer/src/logic/managers/FontManager.h
@@ -80,8 +80,8 @@ namespace NSDocxRenderer
 		~CFontSelector();
 
 		void SelectFont(const CFontSelectParams& oFontSelectParams,
-						const CFontMetrics& oFontMetrics,
-						const NSStringUtils::CStringUTF32& oText);
+		                const CFontMetrics& oFontMetrics,
+		                const NSStringUtils::CStringUTF32& oText);
 		std::wstring GetSelectedName() const noexcept;
 		bool IsSelectedBold() const noexcept;
 		bool IsSelectedItalic() const noexcept;
@@ -129,25 +129,25 @@ namespace NSDocxRenderer
 		void SetStringGid(const LONG& lGid);
 
 		void MeasureString(
-			const std::wstring& wsText,
-			double x,
-			double y,
-			double& dBoxX,
-			double& dBoxY,
-			double& dBoxWidth,
-			double& dBoxHeight,
-			MeasureType measureType) const;
+		        const std::wstring& wsText,
+		        double x,
+		        double y,
+		        double& dBoxX,
+		        double& dBoxY,
+		        double& dBoxWidth,
+		        double& dBoxHeight,
+		        MeasureType measureType) const;
 
 		void MeasureStringGids(
-			unsigned int* pGids,
-			unsigned int count,
-			double x,
-			double y,
-			double& dBoxX,
-			double& dBoxY,
-			double& dBoxWidth,
-			double& dBoxHeight,
-			MeasureType measureType) const;
+		        unsigned int* pGids,
+		        unsigned int count,
+		        double x,
+		        double y,
+		        double& dBoxX,
+		        double& dBoxY,
+		        double& dBoxWidth,
+		        double& dBoxHeight,
+		        MeasureType measureType) const;
 
 		void ClearCache();
 	private:
diff --git a/DocxRenderer/src/logic/managers/FontStyleManager.cpp b/DocxRenderer/src/logic/managers/FontStyleManager.cpp
index 63d8aadeba..737feced25 100644
--- a/DocxRenderer/src/logic/managers/FontStyleManager.cpp
+++ b/DocxRenderer/src/logic/managers/FontStyleManager.cpp
@@ -27,30 +27,30 @@ namespace NSDocxRenderer
 	std::shared_ptr<CFontStyle> CFontStyleManager::GetOrAddFontStyle(const CFontStyle& oFontStyle)
 	{
 		return GetOrAddFontStyle(
-			oFontStyle.oBrush,
-			oFontStyle.wsFontName,
-			oFontStyle.dFontSize,
-			oFontStyle.bItalic,
-			oFontStyle.bBold);
+		            oFontStyle.oBrush,
+		            oFontStyle.wsFontName,
+		            oFontStyle.dFontSize,
+		            oFontStyle.bItalic,
+		            oFontStyle.bBold);
 	}
 	std::shared_ptr<CFontStyle> CFontStyleManager::GetOrAddFontStyle(
-		const NSStructures::CBrush& oBrush,
-		const std::wstring& wsFontName,
-		double dFontSize,
-		bool bItalic,
-		bool bBold)
+	        const NSStructures::CBrush& oBrush,
+	        const std::wstring& wsFontName,
+	        double dFontSize,
+	        bool bItalic,
+	        bool bBold)
 	{
 		for(auto it = m_arFontStyles.begin(); it != m_arFontStyles.end(); ++it)
 		{
 			if (oBrush.Type == (*it)->oBrush.Type &&
-				oBrush.Color1 == (*it)->oBrush.Color1 &&
-				oBrush.Color2 == (*it)->oBrush.Color2 &&
-				oBrush.Alpha1 == (*it)->oBrush.Alpha1 &&
-				oBrush.Alpha2 == (*it)->oBrush.Alpha2 &&
-				oBrush.LinearAngle == (*it)->oBrush.LinearAngle &&
-				dFontSize == (*it)->dFontSize &&
-				wsFontName == (*it)->wsFontName &&
-				(bItalic == (*it)->bItalic) && (bBold == (*it)->bBold))
+			        oBrush.Color1 == (*it)->oBrush.Color1 &&
+			        oBrush.Color2 == (*it)->oBrush.Color2 &&
+			        oBrush.Alpha1 == (*it)->oBrush.Alpha1 &&
+			        oBrush.Alpha2 == (*it)->oBrush.Alpha2 &&
+			        oBrush.LinearAngle == (*it)->oBrush.LinearAngle &&
+			        dFontSize == (*it)->dFontSize &&
+			        wsFontName == (*it)->wsFontName &&
+			        (bItalic == (*it)->bItalic) && (bBold == (*it)->bBold))
 			{
 				auto val = *it;
 
diff --git a/DocxRenderer/src/logic/managers/FontStyleManager.h b/DocxRenderer/src/logic/managers/FontStyleManager.h
index eb58389d6d..cf9cb30dbd 100644
--- a/DocxRenderer/src/logic/managers/FontStyleManager.h
+++ b/DocxRenderer/src/logic/managers/FontStyleManager.h
@@ -16,11 +16,11 @@ namespace NSDocxRenderer
 
 		std::shared_ptr<CFontStyle> GetOrAddFontStyle(const CFontStyle& oFontStyle);
 		std::shared_ptr<CFontStyle> GetOrAddFontStyle(
-			const NSStructures::CBrush& oBrush,
-			const std::wstring& wsFontName,
-			double dFontSize,
-			bool bItalic,
-			bool bBold);
+		        const NSStructures::CBrush& oBrush,
+		        const std::wstring& wsFontName,
+		        double dFontSize,
+		        bool bItalic,
+		        bool bBold);
 
 	private:
 		std::list<std::shared_ptr<CFontStyle>> m_arFontStyles;
diff --git a/DocxRenderer/src/logic/managers/ParagraphStyleManager.cpp b/DocxRenderer/src/logic/managers/ParagraphStyleManager.cpp
index dd38ee699c..1a769eb9e2 100644
--- a/DocxRenderer/src/logic/managers/ParagraphStyleManager.cpp
+++ b/DocxRenderer/src/logic/managers/ParagraphStyleManager.cpp
@@ -29,11 +29,11 @@ namespace NSDocxRenderer
 
 	std::wstring CParagraphStyleManager::GetDefaultParagraphStyleId(const CParagraph& oParagraph) const noexcept
 	{
-		if(oParagraph.m_arLines.size() > 1) return L"Normal";
+		if (oParagraph.m_arTextLines.size() > 1) return L"Normal";
 
 		bool isHeading = true;
-		for(auto& val : oParagraph.m_arLines[0]->m_arConts)
-			if(val && val->m_pFontStyle->dFontSize <= m_dAvgFontSize + 1 && !val->m_pFontStyle->bBold)
+		for (auto& val : oParagraph.m_arTextLines[0]->m_arConts)
+			if (val && val->m_pFontStyle->dFontSize <= m_dAvgFontSize + 1 && !val->m_pFontStyle->bBold)
 				isHeading = false;
 
 		return isHeading ? L"Heading1" : L"Normal";
diff --git a/DocxRenderer/src/logic/styles/ParagraphStyle.cpp b/DocxRenderer/src/logic/styles/ParagraphStyle.cpp
index ec04f1a6cf..bf011097e4 100644
--- a/DocxRenderer/src/logic/styles/ParagraphStyle.cpp
+++ b/DocxRenderer/src/logic/styles/ParagraphStyle.cpp
@@ -21,7 +21,7 @@ namespace NSDocxRenderer
 		oWriter.WriteString(L"w:styleId=\"" + wsStyleId + L"\">");
 		oWriter.WriteString(L"<w:name w:val=\"" + wsName + L"\"/>");
 
-		if(!wsBasedOn.empty()) oWriter.WriteString(L"<w:basedOn w:val=\"" + wsBasedOn + L"\"/>");
+		if (!wsBasedOn.empty()) oWriter.WriteString(L"<w:basedOn w:val=\"" + wsBasedOn + L"\"/>");
 		if(bIsUnhideWhenUsed) oWriter.WriteString(L"<w:unhideWhenUsed/>");
 		if(bIsSemiHidden) oWriter.WriteString(L"<w:semiHidden/>");
 		oWriter.WriteString(L"<w:uiPriority w:val=\"" + std::to_wstring(nUiPriority) + L"\"/>");
diff --git a/DocxRenderer/src/resources/Constants.h b/DocxRenderer/src/resources/Constants.h
index 0e9b1d98c3..98a74b3a66 100644
--- a/DocxRenderer/src/resources/Constants.h
+++ b/DocxRenderer/src/resources/Constants.h
@@ -1,5 +1,6 @@
 #pragma once
 #include <type_traits>
+#include <cstdlib>
 #include <limits>
 
 #include "../../../DesktopEditor/common/Types.h"
@@ -27,22 +28,26 @@ const double c_dTHE_SAME_STRING_Y_PRECISION_MM  = 0.02;
 const double c_dTHE_SAME_STRING_X_PRECISION_MM  = 0.02;
 const double c_dLINE_DISTANCE_ERROR_MM          = 0.3;
 const double c_dERROR_OF_PARAGRAPH_BORDERS_MM   = 1.0;
-const double c_dERROR_GAP                       = 1.5;
 const double c_dCENTER_POSITION_ERROR_MM        = 1.5;
 const double c_dTHE_STRING_X_PRECISION_MM       = 0.5;
 const double c_dERROR_FOR_TEXT_WITH_GRAPHICS_MM = 0.1;
 const double c_dGRAPHICS_ERROR_MM               = 0.5;
+const double c_dMAX_TABLE_LINE_WIDTH_MM         = 2.2;
+const double c_dMAX_TABLE_CELL_DIFF_MM          = 7.0;
 const double c_dGRAPHICS_ERROR_IN_LINES_MM      = 0.3;
 const double c_dMAX_LINE_HEIGHT_MM              = 2.5;
 const double c_dMAX_LINE_WITH_TEXT_ERROR_MM     = 2.5;
-const double c_dCORRECTION_FOR_FIRST_PARAGRAPH  = -1.5;
+const double c_dCELL_GROUP_SPLIT_MM             = 12.0;
+const double c_dLINE_GROUP_SPLIT_MM             = 12.0;
+const double c_dCORRECTION_FIRST_PARAGRAPH_MM   = -1.5;
 const double c_dLINE_DISTANCE_MAX_MM            = 50.0;
-const double c_dSHAPE_TROUGH_MAX_MM             = 120.0;
+const double c_dSHAPE_TROUGH_MAX_MM             = 80.0;
 const double c_dLINE_SPLIT_DISTANCE_MM          = 10.0;
-const double c_dSHAPE_X_OFFSET                  = 1.5;
+const double c_dSHAPE_X_OFFSET_MM               = 1.5;
 const double c_dAVERAGE_SPACE_WIDTH_COEF        = 0.9;
 const double c_dSPACE_WIDTH_COEF                = 0.4;
 const double c_dMIN_ROTATION                    = 0.01;
+const double c_dMAX_FIRST_LINE_INDENT           = 20.0;
 
 const UINT   c_iWhiteColor = 0xFFFFFF;
 const UINT   c_iBlackColor = 0x000000;
diff --git a/DocxRenderer/src/resources/VectorGraphics.cpp b/DocxRenderer/src/resources/VectorGraphics.cpp
index 56e8d46be2..69b4d3e269 100644
--- a/DocxRenderer/src/resources/VectorGraphics.cpp
+++ b/DocxRenderer/src/resources/VectorGraphics.cpp
@@ -14,17 +14,17 @@ namespace NSDocxRenderer
 		ResetBorders();
 	}
 	CVectorGraphics::CVectorGraphics(const CVectorGraphics& other) noexcept
-		: CVectorGraphics()
+	    : CVectorGraphics()
 	{
 		*this = other;
 	}
 	CVectorGraphics::CVectorGraphics(CVectorGraphics&& other) noexcept
-		: CVectorGraphics()
+	    : CVectorGraphics()
 	{
 		*this = std::move(other);
 	}
 	CVectorGraphics::CVectorGraphics(const Aggplus::CGraphicsPath& other) noexcept
-		: CVectorGraphics()
+	    : CVectorGraphics()
 	{
 		size_t close_count = other.GetCloseCount();
 		size_t count = static_cast<size_t>(other.GetPointCount()) + close_count;
@@ -35,11 +35,11 @@ namespace NSDocxRenderer
 			if (other.IsMovePoint(idx))
 				MoveTo(point.X, point.Y);
 			else if (other.IsLinePoint(idx))
-				LineTo(point.X, point.Y);	
+				LineTo(point.X, point.Y);
 			else if (idx < count - 2 &&
-					 other.IsCurvePoint(idx) &&
-					 other.IsCurvePoint(idx + 1) &&
-					 other.IsCurvePoint(idx + 2))
+			         other.IsCurvePoint(idx) &&
+			         other.IsCurvePoint(idx + 1) &&
+			         other.IsCurvePoint(idx + 2))
 			{
 				const auto& point1 = points[idx + 1];
 				const auto& point2 = points[idx + 2];
@@ -86,23 +86,23 @@ namespace NSDocxRenderer
 	bool CVectorGraphics::operator<(const CVectorGraphics& other) const noexcept
 	{
 		return m_dBottom < other.m_dBottom &&
-				m_dTop > other.m_dTop &&
-				m_dRight < other.m_dRight &&
-				m_dLeft > other.m_dLeft;
+		        m_dTop > other.m_dTop &&
+		        m_dRight < other.m_dRight &&
+		        m_dLeft > other.m_dLeft;
 	}
 	bool CVectorGraphics::operator>(const CVectorGraphics& other) const noexcept
 	{
 		return m_dBottom > other.m_dBottom &&
-				m_dTop < other.m_dTop &&
-				m_dRight > other.m_dRight &&
-				m_dLeft < other.m_dLeft;
+		        m_dTop < other.m_dTop &&
+		        m_dRight > other.m_dRight &&
+		        m_dLeft < other.m_dLeft;
 	}
 	bool CVectorGraphics::operator==(const CVectorGraphics& other) const noexcept
 	{
 		return fabs(m_dBottom - other.m_dBottom < c_dGRAPHICS_ERROR_MM) &&
-				fabs(m_dTop - other.m_dTop < c_dGRAPHICS_ERROR_MM) &&
-				fabs(m_dRight - other.m_dRight < c_dGRAPHICS_ERROR_MM) &&
-				fabs(m_dLeft - other.m_dLeft < c_dGRAPHICS_ERROR_MM);
+		        fabs(m_dTop - other.m_dTop < c_dGRAPHICS_ERROR_MM) &&
+		        fabs(m_dRight - other.m_dRight < c_dGRAPHICS_ERROR_MM) &&
+		        fabs(m_dLeft - other.m_dLeft < c_dGRAPHICS_ERROR_MM);
 	}
 	bool CVectorGraphics::operator!=(const CVectorGraphics& other) const noexcept
 	{
@@ -111,16 +111,16 @@ namespace NSDocxRenderer
 	bool CVectorGraphics::operator<=(const CVectorGraphics& other) const noexcept
 	{
 		return m_dBottom - c_dGRAPHICS_ERROR_MM < other.m_dBottom &&
-				m_dTop + c_dGRAPHICS_ERROR_MM > other.m_dTop &&
-				m_dRight - c_dGRAPHICS_ERROR_MM < other.m_dRight &&
-				m_dLeft + c_dGRAPHICS_ERROR_MM > other.m_dLeft;
+		        m_dTop + c_dGRAPHICS_ERROR_MM > other.m_dTop &&
+		        m_dRight - c_dGRAPHICS_ERROR_MM < other.m_dRight &&
+		        m_dLeft + c_dGRAPHICS_ERROR_MM > other.m_dLeft;
 	}
 	bool CVectorGraphics::operator>=(const CVectorGraphics& other) const noexcept
 	{
 		return m_dBottom + c_dGRAPHICS_ERROR_MM > other.m_dBottom &&
-				m_dTop - c_dGRAPHICS_ERROR_MM < other.m_dTop &&
-				m_dRight + c_dGRAPHICS_ERROR_MM > other.m_dRight &&
-				m_dLeft - c_dGRAPHICS_ERROR_MM < other.m_dLeft;
+		        m_dTop - c_dGRAPHICS_ERROR_MM < other.m_dTop &&
+		        m_dRight + c_dGRAPHICS_ERROR_MM > other.m_dRight &&
+		        m_dLeft - c_dGRAPHICS_ERROR_MM < other.m_dLeft;
 	}
 
 	void CVectorGraphics::ResetBorders() noexcept
@@ -164,7 +164,7 @@ namespace NSDocxRenderer
 		return m_arData.empty();
 	}
 
-	const std::list<CVectorGraphics::PathCommand>& CVectorGraphics::GetData() const
+	const std::list<CVectorGraphics::CPathCommand>& CVectorGraphics::GetData() const
 	{
 		return m_arData;
 	}
@@ -188,9 +188,9 @@ namespace NSDocxRenderer
 	}
 
 	void CVectorGraphics::CurveTo(
-		const double &x1, const double &y1,
-		const double &x2, const double &y2,
-		const double &x3, const double &y3)
+	        const double &x1, const double &y1,
+	        const double &x2, const double &y2,
+	        const double &x3, const double &y3)
 	{
 		double x0 = m_arData.back().points.back().x;
 		double y0 = m_arData.back().points.back().y;
@@ -200,7 +200,7 @@ namespace NSDocxRenderer
 		m_arData.push_back({type, points});
 
 		std::vector<Point> curve_points = GetPointsCurve(
-			{Point{x0, y0}, Point{x1, y1}, Point{x2, y2}, Point{x3, y3}}, 0.1);
+		            {Point{x0, y0}, Point{x1, y1}, Point{x2, y2}, Point{x3, y3}}, 0.1);
 
 		for(auto& point : curve_points)
 			CheckPoint(point);
@@ -218,7 +218,7 @@ namespace NSDocxRenderer
 		ResetBorders();
 	}
 
-	void CVectorGraphics::Add(const PathCommand& command)
+	void CVectorGraphics::Add(const CPathCommand& command)
 	{
 		m_arData.push_back(command);
 	}
@@ -279,9 +279,9 @@ namespace NSDocxRenderer
 					points.push_back(point);
 
 				CurveTo(
-					points[0].x, points[0].y,
-					points[1].x, points[1].y,
-					points[2].x, points[2].y);
+				            points[0].x, points[0].y,
+				            points[1].x, points[1].y,
+				            points[2].x, points[2].y);
 			}
 		}
 	}
@@ -302,9 +302,9 @@ namespace NSDocxRenderer
 					points.push_back(point);
 
 				renderer->PathCommandCurveTo(
-					points[0].x, points[0].y,
-					points[1].x, points[1].y,
-					points[2].x, points[2].y);
+				            points[0].x, points[0].y,
+				            points[1].x, points[1].y,
+				            points[2].x, points[2].y);
 			}
 		}
 	}
@@ -344,9 +344,9 @@ namespace NSDocxRenderer
 					points.push_back(point);
 
 				ret_value.CurveTo(
-					points[0].x, points[0].y,
-					points[1].x, points[1].y,
-					points[2].x, points[2].y);
+				            points[0].x, points[0].y,
+				            points[1].x, points[1].y,
+				            points[2].x, points[2].y);
 			}
 		}
 
@@ -370,13 +370,13 @@ namespace NSDocxRenderer
 		auto calc = [&curve] (double t) -> Point {
 			Point point;
 			point.x = pow(1 - t, 3) * curve[0].x +
-					  3 * pow(1 - t, 2) * t * curve[1].x +
-					  3 * (1 - t) * t * t * curve[2].x +
-					  t * t * t * curve[3].x;
+			        3 * pow(1 - t, 2) * t * curve[1].x +
+			        3 * (1 - t) * t * t * curve[2].x +
+			        t * t * t * curve[3].x;
 			point.y = pow(1 - t, 3) * curve[0].y +
-					  3 * pow(1 - t, 2) * t * curve[1].y +
-					  3 * (1 - t) * t * t * curve[2].y +
-					  t * t * t * curve[3].y;
+			        3 * pow(1 - t, 2) * t * curve[1].y +
+			        3 * (1 - t) * t * t * curve[2].y +
+			        t * t * t * curve[3].y;
 			return point;
 		};
 
@@ -416,10 +416,10 @@ namespace NSDocxRenderer
 				double x = command.points.front().x;
 				double y = command.points.front().y;
 
-				if (x - last_x <= std::numeric_limits<double>::epsilon())
+				if (fabs(x - last_x) <= std::numeric_limits<double>::epsilon())
 					m_arVertical.push_back({std::min(last_y, y), std::max(last_y, y), x});
 
-				else if (y - last_y <= std::numeric_limits<double>::epsilon())
+				else if (fabs(y - last_y) <= std::numeric_limits<double>::epsilon())
 					m_arHorizontal.push_back({std::min(last_x, x), std::max(last_x, x), y});
 			}
 			if (!command.points.empty())
diff --git a/DocxRenderer/src/resources/VectorGraphics.h b/DocxRenderer/src/resources/VectorGraphics.h
index 11fa3b8eb0..5dcb1cfff1 100644
--- a/DocxRenderer/src/resources/VectorGraphics.h
+++ b/DocxRenderer/src/resources/VectorGraphics.h
@@ -28,7 +28,7 @@ namespace NSDocxRenderer
 			pctClose = 3
 		};
 
-		struct PathCommand
+		struct CPathCommand
 		{
 			ePathCommandType type;
 			std::list<Point> points;
@@ -50,7 +50,7 @@ namespace NSDocxRenderer
 		bool operator<=(const CVectorGraphics& other) const noexcept;
 		bool operator>=(const CVectorGraphics& other) const noexcept;
 
-		const std::list<PathCommand>& GetData() const;
+		const std::list<CPathCommand>& GetData() const;
 
 		double GetLeft() const noexcept;
 		double GetTop() const noexcept;
@@ -64,12 +64,12 @@ namespace NSDocxRenderer
 		void MoveTo(const double& x1, const double& y1);
 		void LineTo(const double& x1, const double& y1);
 		void CurveTo(
-			const double& x1, const double& y1,
-			const double& x2, const double& y2,
-			const double& x3, const double& y3);
+		        const double& x1, const double& y1,
+		        const double& x2, const double& y2,
+		        const double& x3, const double& y3);
 		void Close();
 
-		void Add(const PathCommand& command);
+		void Add(const CPathCommand& command);
 		void Join(CVectorGraphics&& other);
 
 		void Clear();
@@ -83,7 +83,7 @@ namespace NSDocxRenderer
 		static CVectorGraphics CalcBoolean(const CVectorGraphics& vg1, const CVectorGraphics& vg2, long clipType, long fillType = c_nWindingFillMode);
 
 	private:
-		std::list<PathCommand> m_arData;
+		std::list<CPathCommand> m_arData;
 
 		double m_dLeft;
 		double m_dTop;
diff --git a/DocxRenderer/src/resources/utils.h b/DocxRenderer/src/resources/utils.h
index 96820a7ce4..41325fedb0 100644
--- a/DocxRenderer/src/resources/utils.h
+++ b/DocxRenderer/src/resources/utils.h
@@ -1,15 +1,15 @@
 #pragma once
 #include <type_traits>
+#include <limits>
+#include <algorithm>
 
 #include "../../../DesktopEditor/common/Types.h"
-#include "../../../DesktopEditor/common/StringUTF32.h"
 
 inline LONG ConvertColorBGRToRGB(LONG lBGR)
 {
 	return (0x00FFFFFF & (((lBGR & 0xFF) << 16) | (lBGR & 0x0000FF00) | ((lBGR >> 16) & 0xFF)));
 }
 
-// перемещает nullptr в конец и возвращает итератор, после которого начинаются nullptr
 template<typename It>
 It MoveNullptr(It start, It end)
 {
@@ -27,3 +27,12 @@ It MoveNullptr(It start, It end)
 
 	return right;
 }
+
+template <class T, class Cmp = std::less<T>>
+bool CmpOrEqual(const T& val1,
+                const T& val2,
+                const T& eps = std::numeric_limits<T>::epsilon(),
+                const Cmp& cmp = Cmp())
+{
+	return std::abs(val1 - val2) < eps || cmp(val1, val2);
+}
diff --git a/DocxRenderer/test/TextCommandRenderer/TextCommandRenderer.cpp b/DocxRenderer/test/TextCommandRenderer/TextCommandRenderer.cpp
new file mode 100644
index 0000000000..58295860af
--- /dev/null
+++ b/DocxRenderer/test/TextCommandRenderer/TextCommandRenderer.cpp
@@ -0,0 +1,976 @@
+/*
+ *(c) Copyright Ascensio System SIA 2010-2023
+ *
+ * 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-6 Ernesta Birznieka-Upish
+ * 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 "TextCommandRenderer.h"
+
+#include <array>
+
+#include "../../../DesktopEditor/graphics/pro/Graphics.h"
+
+#include "Utils.h"
+
+class CTextCommandRenderer::CTextCommandRendererImpl
+{
+public:
+	CTextCommandRendererImpl() = delete;
+	explicit CTextCommandRendererImpl(NSFonts::IApplicationFonts* pFonts);
+	CTextCommandRendererImpl(const CTextCommandRendererImpl& other) = delete;
+	CTextCommandRendererImpl(CTextCommandRendererImpl&& other) = delete;
+	virtual ~CTextCommandRendererImpl();
+
+	void BeginCommand(const DWORD& lType);
+	void EndCommand  (const DWORD& lType);
+	void AddText(double x, double y, double w, double h);
+	void NewPage();
+	void SetFolder(const std::wstring& wsFolder);
+
+	Aggplus::CMatrix m_oTransform{};
+	NSStructures::CFont m_oFont{};
+
+	double m_dWidth = 0.0;
+	double m_dHeight = 0.0;
+
+	double m_dDpiX = c_dDpiX;
+	double m_dDpiY = c_dDpiY;
+
+private:
+	void CreateFrame();
+	void ResetMinMax();
+
+	long GetNextColor();
+
+	std::unique_ptr<NSGraphics::IGraphicsRenderer> m_pRenderer{nullptr};
+	std::unique_ptr<CBgraFrame> m_pFrame{nullptr};
+	std::unique_ptr<NSFonts::IFontManager> m_pManager{nullptr};
+
+	double m_dXMin = c_dX_MIN_DEFAULT;
+	double m_dYMin = c_dY_MIN_DEFAULT;
+
+	double m_dXMax = c_dX_MAX_DEFAULT;
+	double m_dYMax = c_dY_MAX_DEFAULT;
+
+	double m_dPrevCenterX = 0;
+	double m_dPrevCenterY = 0;
+	bool m_bIsFirst = true;
+
+	std::wstring m_wsFolder = L"./output";
+	size_t m_nPage = 1;
+
+	const double m_dPenSizeRect = 0.6;
+	const double m_dPenSizeLine = 0.3;
+	const double m_dPenSizeDot = 1;
+
+	const std::wstring m_wsBaseFilename = L"page";
+	const std::wstring m_wsBaseExt = L".png";
+	const std::wstring m_wsBaseSep = L"/";
+
+	size_t m_nCurrColorIndex = 0;
+	const std::array<long, 20> m_arColors = {
+	    0xFF400000, // Deep Red
+	    0xFF800000, // Dark Red
+	    0xFFFF0000, // Pure Red
+	    0xFFFF4000, // Red-Orange
+	    0xFFFF8000, // Orange
+	    0xFFFFC000, // Light Orange
+	    0xFFFFFF00, // Yellow
+	    0xFFC0FF00, // Yellow-Green
+	    0xFF80FF00, // Lime
+	    0xFF40FF00, // Green-Yellow
+	    0xFF00FF00, // Pure Green
+	    0xFF00FF80, // Green-Cyan
+	    0xFF00FFFF, // Cyan
+	    0xFF0080FF, // Light Blue
+	    0xFF0040FF, // Blue
+	    0xFF0000FF, // Pure Blue
+	    0xFF4000FF, // Blue-Purple
+	    0xFF8000FF, // Purple
+	    0xFFC000FF, // Violet
+	    0xFFFF00FF  // Magenta
+	};
+};
+
+CTextCommandRenderer::CTextCommandRendererImpl::CTextCommandRendererImpl(NSFonts::IApplicationFonts* pFonts)
+    : m_pRenderer(NSGraphics::Create()), m_pManager(pFonts->GenerateFontManager())
+{
+	m_pManager->CreateOwnerCache(8);
+}
+CTextCommandRenderer::CTextCommandRendererImpl::~CTextCommandRendererImpl()
+{
+}
+void CTextCommandRenderer::CTextCommandRendererImpl::BeginCommand(const DWORD& lType)
+{
+	if (lType == c_nTextType)
+	{
+		if (!m_pFrame) CreateFrame();
+		ResetMinMax();
+	}
+}
+void CTextCommandRenderer::CTextCommandRendererImpl::EndCommand(const DWORD& lType)
+{
+	if (lType == c_nPageType)
+	{
+		// if no text on the page
+		if (!m_pFrame) CreateFrame();
+		std::wstring filename = m_wsFolder + m_wsBaseSep + m_wsBaseFilename + std::to_wstring(m_nPage) + m_wsBaseExt;
+		m_pFrame->SaveFile(filename, _CXIMAGE_FORMAT_PNG);
+		m_pFrame = nullptr;
+		++m_nPage;
+	}
+	else if (lType == c_nTextType)
+	{
+		// 1. draw rect of command
+		double w = m_dXMax - m_dXMin;
+		double h = m_dYMax - m_dYMin;
+
+		m_pRenderer->BeginCommand(c_nPathType);
+		m_pRenderer->AddRect(m_dXMin, m_dYMin, w, h);
+
+		m_pRenderer->put_PenSize(m_dPenSizeRect);
+
+		long color = GetNextColor();
+		m_pRenderer->put_PenColor(color);
+
+		m_pRenderer->Stroke();
+		m_pRenderer->PathCommandEnd();
+		m_pRenderer->EndCommand(c_nPathType);
+
+		// 2. draw line from prev command to curr
+		double curr_center_x = m_dXMin + w / 2;
+		double curr_center_y = m_dYMin + h / 2;
+
+		if (m_bIsFirst)
+		{
+			m_bIsFirst = false;
+			m_dPrevCenterX = curr_center_x;
+			m_dPrevCenterY = curr_center_y;
+			return;
+		}
+
+		m_pRenderer->BeginCommand(c_nPathType);
+		m_pRenderer->PathCommandMoveTo(m_dPrevCenterX, m_dPrevCenterY);
+		m_pRenderer->PathCommandLineTo(curr_center_x, curr_center_y);
+		m_pRenderer->PathCommandClose();
+
+		m_pRenderer->put_PenSize(m_dPenSizeLine);
+		m_pRenderer->put_PenColor(0); // black color
+
+		m_pRenderer->Stroke();
+		m_pRenderer->PathCommandEnd();
+		m_pRenderer->EndCommand(c_nPathType);
+
+		m_dPrevCenterX = curr_center_x;
+		m_dPrevCenterY = curr_center_y;
+
+		// 3. draw a point of center
+		const double half_dot_size = m_dPenSizeDot / 2;
+		const double dot_x = curr_center_x - half_dot_size;
+		const double dot_y = curr_center_y - half_dot_size;
+		const double dot_w = m_dPenSizeDot;
+		const double dot_h = m_dPenSizeDot;
+
+		m_pRenderer->BeginCommand(c_nPathType);
+		m_pRenderer->AddRect(dot_x, dot_y, dot_w, dot_h);
+
+		m_pRenderer->put_PenSize(m_dPenSizeLine);
+		m_pRenderer->put_PenColor(0); // black color
+
+		m_pRenderer->Stroke();
+		m_pRenderer->PathCommandEnd();
+		m_pRenderer->EndCommand(c_nPathType);
+	}
+}
+void CTextCommandRenderer::CTextCommandRendererImpl::AddText(double x, double y, double w, double h)
+{
+	MAYBE_UNUSED(h);
+
+	m_pManager->LoadFontFromFile(m_oFont.Path, (int)m_oFont.FaceIndex, (float)m_oFont.Size, c_dDpiX, c_dDpiY);
+	m_pManager->AfterLoad();
+
+	double line_height = m_pManager->GetLineHeight();
+	double em_height = m_pManager->GetUnitsPerEm();
+
+	h = c_dPtToMM * (line_height * m_oFont.Size) / em_height;
+
+	double x2 = x + w;
+	double y2 = y + h;
+
+	m_oTransform.TransformPoint(x, y);
+	m_oTransform.TransformPoint(x2, y2);
+
+	m_dXMin = std::min(m_dXMin, x);
+	m_dYMin = std::min(m_dYMin, y);
+
+	m_dXMax = std::max(m_dXMax, x2);
+	m_dYMax = std::max(m_dYMax, y2);
+}
+void CTextCommandRenderer::CTextCommandRendererImpl::NewPage()
+{
+	ResetMinMax();
+	m_nCurrColorIndex = 0;
+	m_bIsFirst = true;
+}
+void CTextCommandRenderer::CTextCommandRendererImpl::SetFolder(const std::wstring& wsFolder)
+{
+	m_wsFolder = wsFolder;
+}
+
+void CTextCommandRenderer::CTextCommandRendererImpl::CreateFrame()
+{
+	long width_pix = static_cast<long>(m_dWidth * c_dMMToPix);
+	long height_pix = static_cast<long>(m_dHeight * c_dMMToPix);
+
+	const long step = 4;
+	const long stride = -step * width_pix;
+
+	m_pFrame = std::unique_ptr<CBgraFrame>(new CBgraFrame());
+	size_t data_size = width_pix * height_pix * step;
+	BYTE* data = new BYTE[data_size];
+
+	// white and alpha is min (full transparent)
+	for (long i = 0; i < width_pix * height_pix; ++i)
+		reinterpret_cast<unsigned int*>(data)[i] = 0xffffffff;
+
+	m_pFrame->put_Data(data);
+	m_pFrame->put_Height(height_pix);
+	m_pFrame->put_Width(width_pix);
+	m_pFrame->put_Stride(stride);
+
+	m_pRenderer->NewPage();
+	m_pRenderer->CreateFromBgraFrame(m_pFrame.get());
+	m_pRenderer->SetSwapRGB(true);
+	m_pRenderer->put_Width(m_dWidth);
+	m_pRenderer->put_Height(m_dHeight);
+}
+void CTextCommandRenderer::CTextCommandRendererImpl::ResetMinMax()
+{
+	m_dXMin = c_dX_MIN_DEFAULT;
+	m_dYMin = c_dY_MIN_DEFAULT;
+
+	m_dXMax = c_dX_MAX_DEFAULT;
+	m_dYMax = c_dY_MAX_DEFAULT;
+}
+long CTextCommandRenderer::CTextCommandRendererImpl::GetNextColor()
+{
+	m_nCurrColorIndex = (m_nCurrColorIndex + 1) % m_arColors.size();
+	return m_arColors[m_nCurrColorIndex];
+}
+
+CTextCommandRenderer::CTextCommandRenderer(NSFonts::IApplicationFonts* pFonts)
+    : m_pImpl(std::unique_ptr<CTextCommandRendererImpl>(new CTextCommandRendererImpl(pFonts)))
+{
+}
+CTextCommandRenderer::~CTextCommandRenderer()
+{
+}
+
+// base settings
+HRESULT CTextCommandRenderer::get_Type(LONG* lType)
+{
+	MAYBE_UNUSED(lType);
+	return S_FALSE;
+}
+HRESULT CTextCommandRenderer::NewPage()
+{
+	m_pImpl->NewPage();
+	return S_OK;
+}
+HRESULT CTextCommandRenderer::get_Height(double* dHeight)
+{
+	*dHeight = m_pImpl->m_dHeight;
+	return S_OK;
+}
+HRESULT CTextCommandRenderer::put_Height(const double& dHeight)
+{
+	m_pImpl->m_dHeight = dHeight;
+	return S_OK;
+}
+HRESULT CTextCommandRenderer::get_Width(double* dWidth)
+{
+	*dWidth = m_pImpl->m_dWidth;
+	return S_OK;
+}
+HRESULT CTextCommandRenderer::put_Width(const double& dWidth)
+{
+	m_pImpl->m_dWidth = dWidth;
+	return S_OK;
+}
+HRESULT CTextCommandRenderer::get_DpiX(double* dDpiX)
+{
+	*dDpiX = m_pImpl->m_dDpiX;
+	return S_OK;
+}
+HRESULT CTextCommandRenderer::get_DpiY(double* dDpiY)
+{
+	*dDpiY = m_pImpl->m_dDpiY;
+	return S_OK;
+}
+
+// pen settings
+HRESULT CTextCommandRenderer::get_PenColor(LONG* lColor)
+{
+	MAYBE_UNUSED(lColor);
+	return S_FALSE;
+}
+HRESULT CTextCommandRenderer::put_PenColor(const LONG& lColor)
+{
+	MAYBE_UNUSED(lColor);
+	return S_FALSE;
+}
+
+HRESULT CTextCommandRenderer::get_PenAlpha(LONG* lAlpha)
+{
+	MAYBE_UNUSED(lAlpha);
+	return S_FALSE;
+}
+HRESULT CTextCommandRenderer::put_PenAlpha(const LONG& lAlpha)
+{
+	MAYBE_UNUSED(lAlpha);
+	return S_FALSE;
+}
+
+HRESULT CTextCommandRenderer::get_PenSize(double* dSize)
+{
+	MAYBE_UNUSED(dSize);
+	return S_FALSE;
+}
+HRESULT CTextCommandRenderer::put_PenSize(const double& dSize)
+{
+	MAYBE_UNUSED(dSize);
+	return S_FALSE;
+}
+
+HRESULT CTextCommandRenderer::get_PenDashStyle(BYTE* nDashStyle)
+{
+	MAYBE_UNUSED(nDashStyle);
+	return S_FALSE;
+}
+HRESULT CTextCommandRenderer::put_PenDashStyle(const BYTE& nDashStyle)
+{
+	MAYBE_UNUSED(nDashStyle);
+	return S_FALSE;
+}
+
+HRESULT CTextCommandRenderer::get_PenLineStartCap(BYTE* nCapStyle)
+{
+	MAYBE_UNUSED(nCapStyle);
+	return S_FALSE;
+}
+HRESULT CTextCommandRenderer::put_PenLineStartCap(const BYTE& nCapStyle)
+{
+	MAYBE_UNUSED(nCapStyle);
+	return S_FALSE;
+}
+
+HRESULT CTextCommandRenderer::get_PenLineEndCap(BYTE* nCapStyle)
+{
+	MAYBE_UNUSED(nCapStyle);
+	return S_FALSE;
+}
+HRESULT CTextCommandRenderer::put_PenLineEndCap(const BYTE& nCapStyle)
+{
+	MAYBE_UNUSED(nCapStyle);
+	return S_FALSE;
+}
+
+HRESULT CTextCommandRenderer::get_PenLineJoin(BYTE* nJoinStyle)
+{
+	MAYBE_UNUSED(nJoinStyle);
+	return S_FALSE;
+}
+HRESULT CTextCommandRenderer::put_PenLineJoin(const BYTE& nJoinStyle)
+{
+	MAYBE_UNUSED(nJoinStyle);
+	return S_FALSE;
+}
+
+HRESULT CTextCommandRenderer::get_PenDashOffset(double* dOffset)
+{
+	MAYBE_UNUSED(dOffset);
+	return S_FALSE;
+}
+HRESULT CTextCommandRenderer::put_PenDashOffset(const double& dOffset)
+{
+	MAYBE_UNUSED(dOffset);
+	return S_FALSE;
+}
+
+HRESULT CTextCommandRenderer::get_PenAlign(LONG* lAlign)
+{
+	MAYBE_UNUSED(lAlign);
+	return S_FALSE;
+}
+HRESULT CTextCommandRenderer::put_PenAlign(const LONG& lAlign)
+{
+	MAYBE_UNUSED(lAlign);
+	return S_FALSE;
+}
+
+HRESULT CTextCommandRenderer::get_PenMiterLimit(double* dMiter)
+{
+	MAYBE_UNUSED(dMiter);
+	return S_FALSE;
+}
+HRESULT CTextCommandRenderer::put_PenMiterLimit(const double& dMiter)
+{
+	MAYBE_UNUSED(dMiter);
+	return S_FALSE;
+}
+
+HRESULT CTextCommandRenderer::PenDashPattern(double* pPattern, LONG lCount)
+{
+	MAYBE_UNUSED(pPattern); MAYBE_UNUSED(lCount);
+	return S_FALSE;
+}
+
+// brush settings
+HRESULT CTextCommandRenderer::get_BrushType(LONG* lType)
+{
+	MAYBE_UNUSED(lType);
+	return S_FALSE;
+}
+HRESULT CTextCommandRenderer::put_BrushType(const LONG& lType)
+{
+	MAYBE_UNUSED(lType);
+	return S_FALSE;
+}
+
+HRESULT CTextCommandRenderer::get_BrushColor1(LONG* lColor)
+{
+	MAYBE_UNUSED(lColor);
+	return S_FALSE;
+}
+HRESULT CTextCommandRenderer::put_BrushColor1(const LONG& lColor)
+{
+	MAYBE_UNUSED(lColor);
+	return S_FALSE;
+}
+
+HRESULT CTextCommandRenderer::get_BrushAlpha1(LONG* lAlpha)
+{
+	MAYBE_UNUSED(lAlpha);
+	return S_FALSE;
+}
+HRESULT CTextCommandRenderer::put_BrushAlpha1(const LONG& lAlpha)
+{
+	MAYBE_UNUSED(lAlpha);
+	return S_FALSE;
+}
+
+HRESULT CTextCommandRenderer::get_BrushColor2(LONG* lColor)
+{
+	MAYBE_UNUSED(lColor);
+	return S_FALSE;
+}
+HRESULT CTextCommandRenderer::put_BrushColor2(const LONG& lColor)
+{
+	MAYBE_UNUSED(lColor);
+	return S_FALSE;
+}
+
+HRESULT CTextCommandRenderer::get_BrushAlpha2(LONG* lAlpha)
+{
+	MAYBE_UNUSED(lAlpha);
+	return S_FALSE;
+}
+HRESULT CTextCommandRenderer::put_BrushAlpha2(const LONG& lAlpha)
+{
+	MAYBE_UNUSED(lAlpha);
+	return S_FALSE;
+}
+
+HRESULT CTextCommandRenderer::get_BrushTexturePath(std::wstring* wsPath)
+{
+	MAYBE_UNUSED(wsPath);
+	return S_FALSE;
+}
+HRESULT CTextCommandRenderer::put_BrushTexturePath(const std::wstring& wsPath)
+{
+	MAYBE_UNUSED(wsPath);
+	return S_FALSE;
+}
+
+HRESULT CTextCommandRenderer::get_BrushTextureMode(LONG* lMode)
+{
+	MAYBE_UNUSED(lMode);
+	return S_FALSE;
+}
+HRESULT CTextCommandRenderer::put_BrushTextureMode(const LONG& lMode)
+{
+	MAYBE_UNUSED(lMode);
+	return S_FALSE;
+}
+
+HRESULT CTextCommandRenderer::get_BrushTextureAlpha(LONG* lAlpha)
+{
+	MAYBE_UNUSED(lAlpha);
+	return S_FALSE;
+}
+HRESULT CTextCommandRenderer::put_BrushTextureAlpha(const LONG& lAlpha)
+{
+	MAYBE_UNUSED(lAlpha);
+	return S_FALSE;
+}
+
+HRESULT CTextCommandRenderer::get_BrushLinearAngle(double* dAngle)
+{
+	MAYBE_UNUSED(dAngle);
+	return S_FALSE;
+}
+HRESULT CTextCommandRenderer::put_BrushLinearAngle(const double& dAngle)
+{
+	MAYBE_UNUSED(dAngle);
+	return S_FALSE;
+}
+
+HRESULT CTextCommandRenderer::BrushRect(const INT& nVal,
+                                        const double& dLeft,
+                                        const double& dTop,
+                                        const double& dWidth,
+                                        const double& dHeight)
+{
+	MAYBE_UNUSED(nVal); MAYBE_UNUSED(dLeft); MAYBE_UNUSED(dTop);
+	MAYBE_UNUSED(dWidth); MAYBE_UNUSED(dHeight);
+	return S_FALSE;
+}
+
+HRESULT CTextCommandRenderer::BrushBounds(const double& dLeft,
+                                          const double& dTop,
+                                          const double& dWidth,
+                                          const double& dHeight)
+{
+	MAYBE_UNUSED(dLeft); MAYBE_UNUSED(dTop); MAYBE_UNUSED(dWidth); MAYBE_UNUSED(dHeight);
+	return S_FALSE;
+}
+
+HRESULT CTextCommandRenderer::put_BrushGradientColors(LONG* pColors,
+                                                      double* pPositions,
+                                                      LONG lCount)
+{
+	MAYBE_UNUSED(pColors); MAYBE_UNUSED(pPositions); MAYBE_UNUSED(lCount);
+	return S_FALSE;
+}
+
+HRESULT CTextCommandRenderer::get_BrushTextureImage(Aggplus::CImage** pImage)
+{
+	MAYBE_UNUSED(pImage);
+	return S_FALSE;
+}
+HRESULT CTextCommandRenderer::put_BrushTextureImage(Aggplus::CImage* pImage)
+{
+	MAYBE_UNUSED(pImage);
+	return S_FALSE;
+}
+
+HRESULT CTextCommandRenderer::get_BrushTransform(Aggplus::CMatrix& oMatrix)
+{
+	MAYBE_UNUSED(oMatrix);
+	return S_FALSE;
+}
+HRESULT CTextCommandRenderer::put_BrushTransform(const Aggplus::CMatrix& oMatrix)
+{
+	MAYBE_UNUSED(oMatrix);
+	return S_FALSE;
+}
+
+void CTextCommandRenderer::put_BrushGradInfo(void* pGradInfo)
+{
+	MAYBE_UNUSED(pGradInfo);
+}
+
+// font settings
+HRESULT CTextCommandRenderer::get_FontName(std::wstring* wsName)
+{
+	*wsName = m_pImpl->m_oFont.Name;
+	return S_OK;
+}
+HRESULT CTextCommandRenderer::put_FontName(const std::wstring& wsName)
+{
+	m_pImpl->m_oFont.Name = wsName;
+	return S_OK;
+}
+
+HRESULT CTextCommandRenderer::get_FontPath(std::wstring* wsPath)
+{
+	*wsPath = m_pImpl->m_oFont.Path;
+	return S_OK;
+}
+HRESULT CTextCommandRenderer::put_FontPath(const std::wstring& wsPath)
+{
+	m_pImpl->m_oFont.Path = wsPath;
+	return S_OK;
+}
+
+HRESULT CTextCommandRenderer::get_FontSize(double* dSize)
+{
+	*dSize = m_pImpl->m_oFont.Size;
+	return S_OK;
+}
+HRESULT CTextCommandRenderer::put_FontSize(const double& dSize)
+{
+	m_pImpl->m_oFont.Size = dSize;
+	return S_OK;
+}
+
+HRESULT CTextCommandRenderer::get_FontStyle(LONG* lStyle)
+{
+	*lStyle = m_pImpl->m_oFont.GetStyle();
+	return S_OK;
+}
+HRESULT CTextCommandRenderer::put_FontStyle(const LONG& lStyle)
+{
+	m_pImpl->m_oFont.SetStyle(lStyle);
+	return S_OK;
+}
+
+HRESULT CTextCommandRenderer::get_FontStringGID(INT* bGid)
+{
+	*bGid = m_pImpl->m_oFont.StringGID;
+	return S_OK;
+}
+HRESULT CTextCommandRenderer::put_FontStringGID(const INT& bGid)
+{
+	m_pImpl->m_oFont.StringGID = bGid;
+	return S_OK;
+}
+
+HRESULT CTextCommandRenderer::get_FontCharSpace(double* dSpace)
+{
+	*dSpace = m_pImpl->m_oFont.CharSpace;
+	return S_OK;
+}
+HRESULT CTextCommandRenderer::put_FontCharSpace(const double& dSpace)
+{
+	m_pImpl->m_oFont.CharSpace = dSpace;
+	return S_OK;
+}
+
+HRESULT CTextCommandRenderer::get_FontFaceIndex(int* lFaceIndex)
+{
+	*lFaceIndex = m_pImpl->m_oFont.FaceIndex;
+	return S_OK;
+}
+HRESULT CTextCommandRenderer::put_FontFaceIndex(const int& lFaceIndex)
+{
+	m_pImpl->m_oFont.FaceIndex = lFaceIndex;
+	return S_OK;
+}
+
+// text commands
+HRESULT CTextCommandRenderer::CommandDrawTextCHAR(const LONG& lUnicode,
+                                                  const double& dX,
+                                                  const double& dY,
+                                                  const double& dW,
+                                                  const double& dH)
+{
+	MAYBE_UNUSED(lUnicode);
+	m_pImpl->AddText(dX, dY, dW, dH);
+	return S_OK;
+}
+
+HRESULT CTextCommandRenderer::CommandDrawTextExCHAR(const LONG& lUnicode,
+                                                    const LONG& lGid,
+                                                    const double& dX,
+                                                    const double& dY,
+                                                    const double& dW,
+                                                    const double& dH)
+{
+	MAYBE_UNUSED(lUnicode); MAYBE_UNUSED(lGid);
+	m_pImpl->AddText(dX, dY, dW, dH);
+	return S_OK;
+}
+
+HRESULT CTextCommandRenderer::CommandDrawText(const std::wstring& wsUnicodeText,
+                                              const double& dX,
+                                              const double& dY,
+                                              const double& dW,
+                                              const double& dH)
+{
+	MAYBE_UNUSED(wsUnicodeText);
+	m_pImpl->AddText(dX, dY, dW, dH);
+	return S_OK;
+}
+
+HRESULT CTextCommandRenderer::CommandDrawTextEx(const std::wstring& wsUnicodeText,
+                                                const unsigned int* pGids,
+                                                const unsigned int nGidsCount,
+                                                const double& dX,
+                                                const double& dY,
+                                                const double& dW,
+                                                const double& dH)
+{
+	MAYBE_UNUSED(wsUnicodeText); MAYBE_UNUSED(pGids); MAYBE_UNUSED(nGidsCount);
+	m_pImpl->AddText(dX, dY, dW, dH);
+	return S_OK;
+}
+
+// command type
+HRESULT CTextCommandRenderer::BeginCommand(const DWORD& lType)
+{
+	m_pImpl->BeginCommand(lType);
+	return S_OK;
+}
+HRESULT CTextCommandRenderer::EndCommand(const DWORD& lType)
+{
+	m_pImpl->EndCommand(lType);
+	return S_OK;
+}
+
+// graphic commands
+HRESULT CTextCommandRenderer::PathCommandMoveTo(const double& dX, const double& dY)
+{
+	MAYBE_UNUSED(dX); MAYBE_UNUSED(dY);
+	return S_FALSE;
+}
+HRESULT CTextCommandRenderer::PathCommandLineTo(const double& dX, const double& dY)
+{
+	MAYBE_UNUSED(dX); MAYBE_UNUSED(dY);
+	return S_FALSE;
+}
+HRESULT CTextCommandRenderer::PathCommandLinesTo(double* pPoints, const int& nCount)
+{
+	MAYBE_UNUSED(pPoints); MAYBE_UNUSED(nCount);
+	return S_FALSE;
+}
+HRESULT CTextCommandRenderer::PathCommandCurveTo(const double& dX1,
+                                                 const double& dY1,
+                                                 const double& dX2,
+                                                 const double& dY2,
+                                                 const double& dXe,
+                                                 const double& dYe)
+{
+	MAYBE_UNUSED(dX1); MAYBE_UNUSED(dY1); MAYBE_UNUSED(dX2);
+	MAYBE_UNUSED(dY2); MAYBE_UNUSED(dXe); MAYBE_UNUSED(dYe);
+	return S_FALSE;
+}
+
+HRESULT CTextCommandRenderer::PathCommandCurvesTo(double* pPoints, const int& nCount)
+{
+	MAYBE_UNUSED(pPoints); MAYBE_UNUSED(nCount);
+	return S_FALSE;
+}
+HRESULT CTextCommandRenderer::PathCommandArcTo(const double& dX,
+                                               const double& dY,
+                                               const double& dW,
+                                               const double& dH,
+                                               const double& dStartAngle,
+                                               const double& dSweepAngle)
+{
+	MAYBE_UNUSED(dX); MAYBE_UNUSED(dY); MAYBE_UNUSED(dW);
+	MAYBE_UNUSED(dH); MAYBE_UNUSED(dStartAngle); MAYBE_UNUSED(dSweepAngle);
+	return S_FALSE;
+}
+
+HRESULT CTextCommandRenderer::PathCommandClose()
+{
+	return S_FALSE;
+}
+HRESULT CTextCommandRenderer::PathCommandEnd()
+{
+	return S_FALSE;
+}
+HRESULT CTextCommandRenderer::DrawPath(const LONG& lType)
+{
+	MAYBE_UNUSED(lType);
+	return S_FALSE;
+}
+HRESULT CTextCommandRenderer::PathCommandStart()
+{
+	return S_FALSE;
+}
+
+HRESULT CTextCommandRenderer::PathCommandGetCurrentPoint(double* dX, double* dY)
+{
+	MAYBE_UNUSED(dX); MAYBE_UNUSED(dY);
+	return S_FALSE;
+}
+
+HRESULT CTextCommandRenderer::PathCommandTextCHAR(const LONG& lUnicode,
+                                                  const double& dX,
+                                                  const double& dY,
+                                                  const double& dW,
+                                                  const double& dH)
+{
+	MAYBE_UNUSED(lUnicode);
+	m_pImpl->AddText(dX, dY, dW, dH);
+	return S_OK;
+}
+
+HRESULT CTextCommandRenderer::PathCommandTextExCHAR(const LONG& lUnicode,
+                                                    const LONG& lGid,
+                                                    const double& dX,
+                                                    const double& dY,
+                                                    const double& dW,
+                                                    const double& dH)
+{
+	MAYBE_UNUSED(lUnicode); MAYBE_UNUSED(lGid);
+	m_pImpl->AddText(dX, dY, dW, dH);
+	return S_OK;
+}
+
+HRESULT CTextCommandRenderer::PathCommandText(const std::wstring& wsUnicodeText,
+                                              const double& dX,
+                                              const double& dY,
+                                              const double& dW,
+                                              const double& dH)
+{
+	MAYBE_UNUSED(wsUnicodeText);
+	m_pImpl->AddText(dX, dY, dW, dH);
+	return S_OK;
+}
+
+HRESULT CTextCommandRenderer::PathCommandTextEx(const std::wstring& wsUnicodeText,
+                                                const unsigned int* pGids,
+                                                const unsigned int nGidsCount,
+                                                const double& dX,
+                                                const double& dY,
+                                                const double& dW,
+                                                const double& dH)
+{
+	MAYBE_UNUSED(wsUnicodeText); MAYBE_UNUSED(pGids); MAYBE_UNUSED(nGidsCount);
+	m_pImpl->AddText(dX, dY, dW, dH);
+	return S_OK;
+}
+
+// image commands
+HRESULT CTextCommandRenderer::DrawImage(IGrObject* pImage,
+                                        const double& dX,
+                                        const double& dY,
+                                        const double& dW,
+                                        const double& dH)
+{
+	MAYBE_UNUSED(pImage); MAYBE_UNUSED(dX); MAYBE_UNUSED(dY);
+	MAYBE_UNUSED(dW); MAYBE_UNUSED(dH);
+	return S_FALSE;
+}
+
+HRESULT CTextCommandRenderer::DrawImageFromFile(const std::wstring& wsImagePath,
+                                                const double& dX,
+                                                const double& dY,
+                                                const double& dW,
+                                                const double& dH,
+                                                const BYTE& nAlpha)
+{
+	MAYBE_UNUSED(wsImagePath); MAYBE_UNUSED(dX); MAYBE_UNUSED(dY);
+	MAYBE_UNUSED(dW); MAYBE_UNUSED(dH); MAYBE_UNUSED(nAlpha);
+	return S_FALSE;
+}
+
+// transform commands
+HRESULT CTextCommandRenderer::SetTransform(const double& dM11,
+                                           const double& dM12,
+                                           const double& dM21,
+                                           const double& dM22,
+                                           const double& dX,
+                                           const double& dY)
+{
+	m_pImpl->m_oTransform.SetElements(dM11, dM12, dM21, dM22, dX, dY);
+	return S_OK;
+}
+
+HRESULT CTextCommandRenderer::GetTransform(double* dM11,
+                                           double* dM12,
+                                           double* dM21,
+                                           double* dM22,
+                                           double* dX,
+                                           double* dY)
+{
+	MAYBE_UNUSED(dM11); MAYBE_UNUSED(dM12); MAYBE_UNUSED(dM21);
+	MAYBE_UNUSED(dM22); MAYBE_UNUSED(dX); MAYBE_UNUSED(dY);
+	return S_FALSE;
+}
+
+HRESULT CTextCommandRenderer::ResetTransform()
+{
+	m_pImpl->m_oTransform.Reset();
+	return S_OK;
+}
+
+HRESULT CTextCommandRenderer::get_ClipMode(LONG* lMode)
+{
+	MAYBE_UNUSED(lMode);
+	return S_FALSE;
+}
+HRESULT CTextCommandRenderer::put_ClipMode(const LONG& lMode)
+{
+	MAYBE_UNUSED(lMode);
+	return S_FALSE;
+}
+
+HRESULT CTextCommandRenderer::CommandLong(const LONG& lType, const LONG& lCommand)
+{
+	MAYBE_UNUSED(lType); MAYBE_UNUSED(lCommand);
+	return S_FALSE;
+}
+HRESULT CTextCommandRenderer::CommandDouble(const LONG& lType, const double& dCommand)
+{
+	MAYBE_UNUSED(lType); MAYBE_UNUSED(dCommand);
+	return S_FALSE;
+}
+HRESULT CTextCommandRenderer::CommandString(const LONG& lType, const std::wstring& sCommand)
+{
+	MAYBE_UNUSED(lType); MAYBE_UNUSED(sCommand);
+	return S_FALSE;
+}
+
+HRESULT CTextCommandRenderer::IsSupportAdvancedCommand(const IAdvancedCommand::AdvancedCommandType& type)
+{
+	MAYBE_UNUSED(type);
+	return S_FALSE;
+}
+HRESULT CTextCommandRenderer::AdvancedCommand(IAdvancedCommand* command)
+{
+	MAYBE_UNUSED(command);
+	return S_FALSE;
+}
+
+void CTextCommandRenderer::Do(IOfficeDrawingFile* pFile, const std::wstring& wsFolder)
+{
+	m_pImpl->SetFolder(wsFolder);
+	int pages_count = pFile->GetPagesCount();
+	for (int i = 0; i < pages_count; ++i)
+		DrawPage(pFile, i);
+}
+void CTextCommandRenderer::DrawPage(IOfficeDrawingFile* pFile, int nPage)
+{
+	NewPage();
+
+	double width, height, dpi_x, dpi_y;
+	pFile->GetPageInfo(nPage, &width, &height, &dpi_x, &dpi_y);
+
+	width  *= 25.4 / dpi_x;
+	height *= 25.4 / dpi_y;
+
+	put_Width(width);
+	put_Height(height);
+
+	pFile->DrawPageOnRenderer(this, nPage, nullptr);
+}
diff --git a/DocxRenderer/test/TextCommandRenderer/TextCommandRenderer.h b/DocxRenderer/test/TextCommandRenderer/TextCommandRenderer.h
new file mode 100644
index 0000000000..5cc8dbb5c0
--- /dev/null
+++ b/DocxRenderer/test/TextCommandRenderer/TextCommandRenderer.h
@@ -0,0 +1,305 @@
+/*
+ * (c) Copyright Ascensio System SIA 2010-2023
+ *
+ * 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-6 Ernesta Birznieka-Upish
+ * 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
+ *
+ */
+#pragma once
+#include <memory>
+
+#include "../../../DesktopEditor/graphics/IRenderer.h"
+#include "../../../DesktopEditor/graphics/pro/officedrawingfile.h"
+#include "../../../DesktopEditor/graphics/pro/Fonts.h"
+
+#ifndef TEXTCOMMANDRENDERER_USE_DYNAMIC_LIBRARY
+#define TEXTCOMMANDRENDERER_DECL_EXPORT
+#else
+#include "../../../DesktopEditor/common/base_export.h"
+#define TEXTCOMMANDRENDERER_DECL_EXPORT Q_DECL_EXPORT
+#endif
+
+class TEXTCOMMANDRENDERER_DECL_EXPORT CTextCommandRenderer : public IRenderer
+{
+public:
+	CTextCommandRenderer() = delete;
+	explicit CTextCommandRenderer(NSFonts::IApplicationFonts* pFonts);
+	CTextCommandRenderer(const CTextCommandRenderer& other) = delete;
+	CTextCommandRenderer(CTextCommandRenderer&& other) = delete;
+	virtual ~CTextCommandRenderer();
+
+	// base settings
+	virtual HRESULT get_Type  (LONG* lType)           override;
+	virtual HRESULT NewPage   ()                      override;
+	virtual HRESULT get_Height(double* dHeight)       override;
+	virtual HRESULT put_Height(const double& dHeight) override;
+	virtual HRESULT get_Width (double* dWidth)        override;
+	virtual HRESULT put_Width (const double& dWidth)  override;
+	virtual HRESULT get_DpiX  (double* dDpiX)         override;
+	virtual HRESULT get_DpiY  (double* dDpiY)         override;
+
+	// pen settings
+	virtual HRESULT get_PenColor(LONG* lColor)       override;
+	virtual HRESULT put_PenColor(const LONG& lColor) override;
+
+	virtual HRESULT get_PenAlpha(LONG* lAlpha)       override;
+	virtual HRESULT put_PenAlpha(const LONG& lAlpha) override;
+
+	virtual HRESULT get_PenSize(double* dSize)       override;
+	virtual HRESULT put_PenSize(const double& dSize) override;
+
+	virtual HRESULT get_PenDashStyle(BYTE* nDashStyle)       override;
+	virtual HRESULT put_PenDashStyle(const BYTE& nDashStyle) override;
+
+	virtual HRESULT get_PenLineStartCap(BYTE* nCapStyle)       override;
+	virtual HRESULT put_PenLineStartCap(const BYTE& nCapStyle) override;
+
+	virtual HRESULT get_PenLineEndCap(BYTE* nCapStyle)       override;
+	virtual HRESULT put_PenLineEndCap(const BYTE& nCapStyle) override;
+
+	virtual HRESULT get_PenLineJoin(BYTE* nJoinStyle)       override;
+	virtual HRESULT put_PenLineJoin(const BYTE& nJoinStyle) override;
+
+	virtual HRESULT get_PenDashOffset(double* dOffset)       override;
+	virtual HRESULT put_PenDashOffset(const double& dOffset) override;
+
+	virtual HRESULT get_PenAlign(LONG* lAlign)       override;
+	virtual HRESULT put_PenAlign(const LONG& lAlign) override;
+
+	virtual HRESULT get_PenMiterLimit(double* dMiter)       override;
+	virtual HRESULT put_PenMiterLimit(const double& dMiter) override;
+
+	virtual HRESULT PenDashPattern(double* pPattern, LONG lCount) override;
+
+	// brush settings
+	virtual HRESULT get_BrushType(LONG* lType)      override;
+	virtual HRESULT put_BrushType(const LONG& lType)override;
+
+	virtual HRESULT get_BrushColor1(LONG* lColor)       override;
+	virtual HRESULT put_BrushColor1(const LONG& lColor) override;
+
+	virtual HRESULT get_BrushAlpha1(LONG* lAlpha)       override;
+	virtual HRESULT put_BrushAlpha1(const LONG& lAlpha) override;
+
+	virtual HRESULT get_BrushColor2(LONG* lColor)       override;
+	virtual HRESULT put_BrushColor2(const LONG& lColor) override;
+
+	virtual HRESULT get_BrushAlpha2(LONG* lAlpha)       override;
+	virtual HRESULT put_BrushAlpha2(const LONG& lAlpha) override;
+
+	virtual HRESULT get_BrushTexturePath(std::wstring* wsPath)       override;
+	virtual HRESULT put_BrushTexturePath(const std::wstring& wsPath) override;
+
+	virtual HRESULT get_BrushTextureMode(LONG* lMode)       override;
+	virtual HRESULT put_BrushTextureMode(const LONG& lMode) override;
+
+	virtual HRESULT get_BrushTextureAlpha(LONG* lAlpha)       override;
+	virtual HRESULT put_BrushTextureAlpha(const LONG& lAlpha) override;
+
+	virtual HRESULT get_BrushLinearAngle(double* dAngle)       override;
+	virtual HRESULT put_BrushLinearAngle(const double& dAngle) override;
+
+	virtual HRESULT BrushRect  (const INT& nVal,
+	                            const double& dLeft,
+	                            const double& dTop,
+	                            const double& dWidth,
+	                            const double& dHeight) override;
+
+	virtual HRESULT BrushBounds(const double& dLeft,
+	                            const double& dTop,
+	                            const double& dWidth,
+	                            const double& dHeight) override;
+
+	virtual HRESULT put_BrushGradientColors(LONG* pColors,
+	                                        double* pPositions,
+	                                        LONG lCount) override;
+
+	virtual HRESULT get_BrushTextureImage(Aggplus::CImage** pImage) override;
+	virtual HRESULT put_BrushTextureImage(Aggplus::CImage* pImage)  override;
+
+	virtual HRESULT get_BrushTransform(Aggplus::CMatrix& oMatrix)       override;
+	virtual HRESULT put_BrushTransform(const Aggplus::CMatrix& oMatrix) override;
+
+	virtual void put_BrushGradInfo(void* pGradInfo) override;
+
+	// font settings
+	virtual HRESULT get_FontName(std::wstring* wsName)       override;
+	virtual HRESULT put_FontName(const std::wstring& wsName) override;
+
+	virtual HRESULT get_FontPath(std::wstring* wsPath)       override;
+	virtual HRESULT put_FontPath(const std::wstring& wsPath) override;
+
+	virtual HRESULT get_FontSize(double* dSize)       override;
+	virtual HRESULT put_FontSize(const double& dSize) override;
+
+	virtual HRESULT get_FontStyle(LONG* lStyle)       override;
+	virtual HRESULT put_FontStyle(const LONG& lStyle) override;
+
+	virtual HRESULT get_FontStringGID(INT* bGid)       override;
+	virtual HRESULT put_FontStringGID(const INT& bGid) override;
+
+	virtual HRESULT get_FontCharSpace(double* dSpace)       override;
+	virtual HRESULT put_FontCharSpace(const double& dSpace) override;
+
+	virtual HRESULT get_FontFaceIndex(int* lFaceIndex)       override;
+	virtual HRESULT put_FontFaceIndex(const int& lFaceIndex) override;
+
+	// text commands
+	virtual HRESULT CommandDrawTextCHAR(const LONG& lUnicode,
+	                                    const double& dX,
+	                                    const double& dY,
+	                                    const double& dW,
+	                                    const double& dH) override;
+
+	virtual HRESULT CommandDrawTextExCHAR(const LONG& lUnicode,
+	                                      const LONG& lGid,
+	                                      const double& dX,
+	                                      const double& dY,
+	                                      const double& dW,
+	                                      const double& dH) override;
+
+	virtual HRESULT CommandDrawText(const std::wstring& wsUnicodeText,
+	                                const double& dX,
+	                                const double& dY,
+	                                const double& dW,
+	                                const double& dH) override;
+
+	virtual HRESULT CommandDrawTextEx(const std::wstring& wsUnicodeText,
+	                                  const unsigned int* pGids,
+	                                  const unsigned int nGidsCount,
+	                                  const double& dX,
+	                                  const double& dY,
+	                                  const double& dW,
+	                                  const double& dH) override;
+
+	// command type
+	virtual HRESULT BeginCommand(const DWORD& lType) override;
+	virtual HRESULT EndCommand(const DWORD& lType)   override;
+
+	// graphic commands
+	virtual HRESULT PathCommandMoveTo  (const double& dX, const double& dY) override;
+	virtual HRESULT PathCommandLineTo  (const double& dX, const double& dY) override;
+	virtual HRESULT PathCommandLinesTo (double* pPoints, const int& nCount) override;
+	virtual HRESULT PathCommandCurveTo (const double& dX1,
+	                                    const double& dY1,
+	                                    const double& dX2,
+	                                    const double& dY2,
+	                                    const double& dXe,
+	                                    const double& dYe) override;
+
+	virtual HRESULT PathCommandCurvesTo(double* pPoints, const int& nCount) override;
+	virtual HRESULT PathCommandArcTo  (const double& dX,
+	                                   const double& dY,
+	                                   const double& dW,
+	                                   const double& dH,
+	                                   const double& dStartAngle,
+	                                   const double& dSweepAngle) override;
+
+	virtual HRESULT PathCommandClose  ()                  override;
+	virtual HRESULT PathCommandEnd    ()                  override;
+	virtual HRESULT DrawPath          (const LONG& lType) override;
+	virtual HRESULT PathCommandStart  ()                  override;
+
+	virtual HRESULT PathCommandGetCurrentPoint(double* dX, double* dY) override;
+
+	virtual HRESULT PathCommandTextCHAR(const LONG& lUnicode,
+	                                    const double& dX,
+	                                    const double& dY,
+	                                    const double& dW,
+	                                    const double& dH) override;
+
+	virtual HRESULT PathCommandTextExCHAR(const LONG& lUnicode,
+	                                      const LONG& lGid,
+	                                      const double& dX,
+	                                      const double& dY,
+	                                      const double& dW,
+	                                      const double& dH) override;
+
+	virtual HRESULT PathCommandText(const std::wstring& wsUnicodeText,
+	                                const double& dX,
+	                                const double& dY,
+	                                const double& dW,
+	                                const double& dH) override;
+
+	virtual HRESULT PathCommandTextEx (const std::wstring& wsUnicodeText,
+	                                   const unsigned int* pGids,
+	                                   const unsigned int nGidsCount,
+	                                   const double& dX,
+	                                   const double& dY,
+	                                   const double& dW,
+	                                   const double& dH) override;
+
+	// image commands
+	virtual HRESULT DrawImage(IGrObject* pImage,
+	                          const double& dX,
+	                          const double& dY,
+	                          const double& dW,
+	                          const double& dH) override;
+
+	virtual HRESULT DrawImageFromFile(const std::wstring& wsImagePath,
+	                                  const double& dX,
+	                                  const double& dY,
+	                                  const double& dW,
+	                                  const double& dH,
+	                                  const BYTE& nAlpha = 255) override;
+
+	// transform commands
+	virtual HRESULT SetTransform(const double& dM11,
+	                             const double& dM12,
+	                             const double& dM21,
+	                             const double& dM22,
+	                             const double& dX,
+	                             const double& dY) override;
+
+	virtual HRESULT GetTransform(double* dM11,
+	                             double* dM12,
+	                             double* dM21,
+	                             double* dM22,
+	                             double* dX,
+	                             double* dY) override;
+
+	virtual HRESULT ResetTransform() override;
+
+	virtual HRESULT get_ClipMode(LONG* lMode)       override;
+	virtual HRESULT put_ClipMode(const LONG& lMode) override;
+
+	// advanced
+	virtual HRESULT CommandLong(const LONG& lType, const LONG& lCommand)           override;
+	virtual HRESULT CommandDouble(const LONG& lType, const double& dCommand)       override;
+	virtual HRESULT CommandString(const LONG& lType, const std::wstring& sCommand) override;
+
+	virtual HRESULT IsSupportAdvancedCommand(const IAdvancedCommand::AdvancedCommandType& type) override;
+	virtual HRESULT AdvancedCommand(IAdvancedCommand* command) override;
+
+	// main methods
+	void Do(IOfficeDrawingFile* pFile, const std::wstring& wsFolder = L"./output");
+	void DrawPage(IOfficeDrawingFile* pFile, int nPage);
+
+private:
+	class CTextCommandRendererImpl;
+	std::unique_ptr<CTextCommandRendererImpl> m_pImpl;
+};
diff --git a/DocxRenderer/test/TextCommandRenderer/TextCommandRenderer.pro b/DocxRenderer/test/TextCommandRenderer/TextCommandRenderer.pro
new file mode 100644
index 0000000000..033f1385ab
--- /dev/null
+++ b/DocxRenderer/test/TextCommandRenderer/TextCommandRenderer.pro
@@ -0,0 +1,32 @@
+QT       -= core gui
+
+VERSION = 1.0.0
+TARGET = TextCommandRenderer
+TEMPLATE = lib
+
+CONFIG += c++11
+CONFIG += shared
+CONFIG += plugin
+
+CORE_ROOT_DIR = $$PWD/../../../
+PWD_ROOT_DIR = $$PWD
+include(../../../Common/base.pri)
+
+DEFINES += TEXTCOMMANDRENDERER_USE_DYNAMIC_LIBRARY
+
+ADD_DEPENDENCY(UnicodeConverter, kernel, graphics)
+
+core_windows {
+LIBS += \
+    -lgdi32 \
+	-ladvapi32 \
+	-luser32 \
+	-lshell32
+}
+
+HEADERS += \
+    TextCommandRenderer.h \
+    Utils.h
+
+SOURCES += \
+    TextCommandRenderer.cpp
diff --git a/DocxRenderer/test/TextCommandRenderer/Utils.h b/DocxRenderer/test/TextCommandRenderer/Utils.h
new file mode 100644
index 0000000000..ee927db227
--- /dev/null
+++ b/DocxRenderer/test/TextCommandRenderer/Utils.h
@@ -0,0 +1,17 @@
+#pragma once
+
+#define MAYBE_UNUSED(x) (void)(x)
+
+const double c_dDpiX = 72.0;
+const double c_dDpiY = 72.0;
+
+constexpr double c_dMMToPix = 72.0 / 25.4;
+constexpr double c_dPixToMM = 25.4 / 72.0;
+constexpr double c_dMMToPt  = 72.0 / 25.4;
+constexpr double c_dPtToMM  = 25.4 / 72.0;
+
+const double c_dX_MIN_DEFAULT = 10000;
+const double c_dY_MIN_DEFAULT = 10000;
+
+const double c_dX_MAX_DEFAULT = -10000;
+const double c_dY_MAX_DEFAULT = -10000;
diff --git a/DocxRenderer/test/main.cpp b/DocxRenderer/test/main.cpp
index 43640f6398..8056d743a9 100644
--- a/DocxRenderer/test/main.cpp
+++ b/DocxRenderer/test/main.cpp
@@ -40,6 +40,8 @@
 #include "../DocxRenderer.h"
 #include "../../Common/OfficeFileFormatChecker.h"
 
+#include "TextCommandRenderer/TextCommandRenderer.h"
+
 #include <fstream>
 
 #ifdef TEST_FOR_HTML_RENDERER_TEXT
@@ -75,6 +77,8 @@ int main(int argc, char *argv[])
 	oWorker.m_sDirectory = NSFile::GetProcessDirectory() + L"/fonts_cache";
 	oWorker.m_bIsNeedThumbnails = false;
 
+    // oWorker.m_arAdditionalFolders.push_back(L"");
+
 	if (!NSDirectory::Exists(oWorker.m_sDirectory))
 		NSDirectory::CreateDirectory(oWorker.m_sDirectory);
 
@@ -178,6 +182,10 @@ int main(int argc, char *argv[])
 //		auto shapes = oDocxRenderer.ScanPagePptx(pReader, 0);
 //		for (auto& s : shapes)
 //			fin << U_TO_UTF8(s);
+
+		CTextCommandRenderer oTextCommandRenderer(pFonts);
+		oTextCommandRenderer.Do(pReader);
+
 #endif
 		RELEASEOBJECT(pReader);
 		RELEASEOBJECT(pExternalImagheStorage);
diff --git a/DocxRenderer/test/test.pro b/DocxRenderer/test/test.pro
index 5858aaffb7..d05ab705d2 100644
--- a/DocxRenderer/test/test.pro
+++ b/DocxRenderer/test/test.pro
@@ -10,7 +10,7 @@ CORE_ROOT_DIR = $$PWD/../..
 PWD_ROOT_DIR = $$PWD
 include($$CORE_ROOT_DIR/Common/base.pri)
 
-ADD_DEPENDENCY(UnicodeConverter, kernel, kernel_network, graphics, PdfFile, DjVuFile, XpsFile, DocxRenderer)
+ADD_DEPENDENCY(UnicodeConverter, kernel, kernel_network, graphics, PdfFile, DjVuFile, XpsFile, DocxRenderer, TextCommandRenderer)
 
 core_linux:include($$PWD/../../Common/3dParty/icu/icu.pri)
 core_windows:LIBS += -lgdi32 -ladvapi32 -luser32 -lshell32
diff --git a/HtmlFile2/htmlfile2.cpp b/HtmlFile2/htmlfile2.cpp
index 926e3295a0..bce3f68cf1 100644
--- a/HtmlFile2/htmlfile2.cpp
+++ b/HtmlFile2/htmlfile2.cpp
@@ -264,6 +264,7 @@ struct CTextSettings
 	bool bAddSpaces; // Добавлять пробелы перед текстом?
 	bool bMergeText; // Объединять подяр идущий текст в 1?
 	int  nLi;  // Уровень списка
+	bool bNumberingLi; // Является ли список нумерованным
 
 	std::wstring sPStyle;
 
@@ -277,11 +278,12 @@ struct CTextSettings
 	NSCSS::CCompiledStyle oAdditionalStyle;
 
 	CTextSettings()
-		: bBdo(false), bPre(false), bQ(false), bAddSpaces(true), bMergeText(false), nLi(-1), eTextMode(Normal)
+		: bBdo(false), bPre(false), bQ(false), bAddSpaces(true), bMergeText(false), nLi(-1), bNumberingLi(false), eTextMode(Normal)
 	{}
 
 	CTextSettings(const CTextSettings& oTS) :
-		bBdo(oTS.bBdo), bPre(oTS.bPre), bQ(oTS.bQ), bAddSpaces(oTS.bAddSpaces), bMergeText(oTS.bMergeText), nLi(oTS.nLi), sPStyle(oTS.sPStyle), eTextMode(oTS.eTextMode)
+		bBdo(oTS.bBdo), bPre(oTS.bPre), bQ(oTS.bQ), bAddSpaces(oTS.bAddSpaces), bMergeText(oTS.bMergeText),
+	    nLi(oTS.nLi),bNumberingLi(oTS.bNumberingLi), sPStyle(oTS.sPStyle), eTextMode(oTS.eTextMode)
 	{}
 
 	void AddPStyle(const std::wstring& wsStyle)
@@ -2288,6 +2290,9 @@ private:
 			{
 				oNode.m_wsId = EncodeXmlString(m_oLightReader.GetText());
 				WriteBookmark(oXml, oNode.m_wsId);
+
+				if (!m_oStylesCalculator.HaveStylesById(oNode.m_wsId))
+					oNode.m_wsId.clear();
 			}
 			else if(sName == L"style")
 				oNode.m_wsStyle += m_oLightReader.GetText();
@@ -2381,7 +2386,30 @@ private:
 
 		std::wstring sText = m_oLightReader.GetText();
 
-		if (sText.end() == std::find_if_not(sText.begin(), sText.end(), [](wchar_t wchChar){ return iswspace(wchChar) && 0xa0 != wchChar;}))
+		if (sText.empty())
+			return false;
+
+		m_oStylesCalculator.CalculateCompiledStyle(arSelectors);
+
+		bool bPre = oTS.bPre;
+
+		if (!bPre && nullptr != arSelectors.back().m_pCompiledStyle)
+		{
+			NSCSS::CCompiledStyle* pCompiledStyle{arSelectors.back().m_pCompiledStyle};
+
+			// TODO::поведение должно быть немного разное (реализовать)
+			switch(pCompiledStyle->m_oDisplay.GetWhiteSpace().ToInt())
+			{
+				case NSCSS::NSProperties::EWhiteSpace::Pre:
+				case NSCSS::NSProperties::EWhiteSpace::Pre_Wrap:
+				case NSCSS::NSProperties::EWhiteSpace::Pre_Line:
+					bPre = true;
+				default:
+					break;
+			}
+		}
+
+		if (!bPre && sText.end() == std::find_if_not(sText.begin(), sText.end(), [](wchar_t wchChar){ return iswspace(wchChar) && 0xa0 != wchChar;}))
 			return false;
 
 		if(oTS.bBdo)
@@ -2389,22 +2417,14 @@ private:
 
 		const bool bInT = m_oState.m_bInT;
 
-		if (oTS.bPre)
-		{
-			CloseT(pXml);
-			CloseR(pXml);
-		}
-
 		GetSubClass(pXml, arSelectors);
 
-		if (oTS.bAddSpaces && m_oState.m_bInP && !m_oState.m_bInR && !iswspace(sText.front()) && !m_oState.m_bWasSpace && CTextSettings::Normal == oTS.eTextMode)
-			WriteSpace(pXml);
-
+		//TODO:: сделать так, чтобы параграф (со своими стилями) открывался при чтении сооответствующей ноды, а не при чтении текста
 		OpenP(pXml);
 
 		NSStringUtils::CStringBuilder oPPr;
 
-		std::wstring sPStyle = wrP(&oPPr, arSelectors, oTS);
+		const std::wstring sPStyle = wrP(&oPPr, arSelectors, oTS);
 
 		WriteToStringBuilder(oPPr, *pXml);
 
@@ -2424,89 +2444,79 @@ private:
 		if (oTS.bQ)
 			pXml->WriteString(L"<w:t xml:space=\"preserve\">&quot;</w:t>");
 
-		if(oTS.bPre)
+		if (!bPre && oTS.bAddSpaces && m_oState.m_bInP && !m_oState.m_bInR && !iswspace(sText.front()) && !iswpunct(sText.front()) && !m_oState.m_bWasSpace && CTextSettings::Normal == oTS.eTextMode)
+			WriteSpace(pXml);
+
+		if(bPre)
 		{
-			if (L'\n' == sText.front() || L'\r' == sText.front())
-				sText.erase(0, 1);
+			size_t unBegin = 0, unEnd = sText.find_first_of(L"\n\r\t");
 
-			size_t nAfter = sText.find_first_of(L"\n\r\t");
-			while(nAfter != std::wstring::npos)
+			while (std::wstring::npos != unBegin)
 			{
-				if (L'\t' == sText[0])
+				if (OpenR(pXml))
 				{
-					pXml->WriteString(L"<w:tab/>");
-					sText.erase(0, 1);
-
-					if (0 == nAfter)
-					{
-						nAfter = sText.find_first_of(L"\n\r\t");
-						continue;
-					}
-
-					nAfter--;
+					pXml->WriteString(L"<w:test/>");
+					WriteToStringBuilder(oRPr, *pXml);
 				}
 
 				OpenT(pXml);
-				pXml->WriteEncodeXmlString(sText.c_str(), nAfter);
-				CloseT(pXml);
-				CloseR(pXml);
-
-				if (L'\t' == sText[nAfter])
+				if (unEnd == std::wstring::npos)
 				{
-					sText.erase(0, nAfter);
-					nAfter = 1;
+					pXml->WriteEncodeXmlString(sText.c_str() + unBegin, sText.length() - unBegin);
+					break;
 				}
-				else
-				{
-					CloseP(pXml, arSelectors);
-					OpenP(pXml);
-					WriteToStringBuilder(oPPr, *pXml);
-					sText.erase(0, nAfter + 1);
-					nAfter = 0;
-				}
-				OpenR(pXml);
-				WriteToStringBuilder(oRPr, *pXml);
-				nAfter = sText.find_first_of(L"\n\r\t", nAfter);
-			}
 
-			if (sText.empty())
-			{
-				arSelectors.pop_back();
-				return true;
+				if (unBegin != unEnd)
+				{
+					pXml->WriteEncodeXmlString(sText.c_str() + unBegin, unEnd - unBegin);
+					CloseT(pXml);
+				}
+
+				if (L'\n' == sText[unEnd])
+				{
+					pXml->WriteString(L"<w:br/>");
+				}
+				else if (L'\t' == sText[unEnd])
+				{
+					pXml->WriteString(L"<w:tab/>");
+				}
+
+				unBegin = unEnd + 1;
+				unEnd = sText.find_first_of(L"\n\r\t", unBegin);
 			}
 		}
 		else
+		{
 			ReplaceSpaces(sText);
 
-		if (!sText.empty() && L'\t' == sText[0])
-		{
-			pXml->WriteString(L"<w:tab/>");
-			sText.erase(0, 1);
-		}
+			if (!sText.empty() && L'\t' == sText[0])
+			{
+				pXml->WriteString(L"<w:tab/>");
+				sText.erase(0, 1);
+			}
 
-		if (!oTS.bPre && !sText.empty() && std::iswspace(sText.front()) && m_oState.m_bWasSpace)
-			sText.erase(0, 1);
+			if (!sText.empty() && std::iswspace(sText.front()) && m_oState.m_bWasSpace)
+				sText.erase(0, 1);
 
-		if (!sText.empty())
-		{
 			OpenT(pXml);
 
-			if (oTS.bMergeText && !m_oState.m_bWasSpace && bInT && !oTS.bPre)
+			if (oTS.bMergeText && !m_oState.m_bWasSpace && bInT && !bPre)
 				pXml->WriteEncodeXmlString(L" ");
 
-			m_oState.m_bWasSpace = std::iswspace(sText.back());
-
-			pXml->WriteEncodeXmlString(sText);
+			if (!sText.empty())
+			{
+				m_oState.m_bWasSpace = std::iswspace(sText.back());
+				pXml->WriteEncodeXmlString(sText);
+			}
 		}
 
 		if (oTS.bQ)
 			pXml->WriteString(L"<w:t xml:space=\"preserve\">&quot;</w:t>");
 
+		CloseT(pXml);
+
 		if (!oTS.bMergeText)
-		{
-			CloseT(pXml);
 			CloseR(pXml);
-		}
 
 		arSelectors.pop_back();
 		return true;
@@ -2616,7 +2626,6 @@ private:
 
 		CTextSettings oTSR(oTS);
 		oTSR.oAdditionalStyle.m_oFont.SetFamily(L"Courier New", UINT_MAX, true);
-		oTSR.oAdditionalStyle.m_oFont.SetSize(20, UINT_MAX, true);
 
 		return readStream(pXml, arSelectors, oTSR);
 	}
@@ -2757,7 +2766,10 @@ private:
 		if (NULL == pXml || arSelectors.empty() || arSelectors.back().m_wsClass == L"MsoFootnoteReference")
 			return false;
 
-		return readStream(pXml, arSelectors, oTS);
+		CTextSettings oTSR(oTS);
+		oTSR.bAddSpaces = false;
+
+		return readStream(pXml, arSelectors, oTSR);
 	}
 
 	bool ReadNobr(NSStringUtils::CStringBuilder* pXml, std::vector<NSCSS::CNode>& arSelectors, CTextSettings& oTS)
@@ -3922,6 +3934,8 @@ private:
 
 			CTextSettings oTSLiP(oTS);
 
+			oTSLiP.bNumberingLi = !bType;
+
 			std::wstring wsValue;
 			const std::wstring wsParentName{(!sSelectors.empty()) ? sSelectors.back().m_wsName : L""};
 
@@ -3944,27 +3958,11 @@ private:
 					oTSLiP.oAdditionalStyle.m_oText.SetColor(L"#808080", NEXT_LEVEL);
 				else if (L"selected" == wsArgumentName)
 					oTSLiP.oAdditionalStyle.m_oText.SetDecoration(L"underline", NEXT_LEVEL);
-					// oTSLiP.AddRStyle(L"<w:u w:val=\"single\"/>");
 			}
 			m_oLightReader.MoveToElement();
 
-			if (std::wstring::npos != oTS.sPStyle.find(L"<w:numPr>"))
-			{
-				wrP(oXml, sSelectors, oTS);
-				CloseP(oXml, sSelectors);
-				oTSLiP.sPStyle.clear();
-			}
-
 			oTSLiP.nLi++;
 
-			const std::wstring wsOldPStyle{oTSLiP.sPStyle};
-
-			oTSLiP.sPStyle += L"<w:numPr><w:ilvl w:val=\"" + std::to_wstring(oTSLiP.nLi) + L"\"/><w:numId w:val=\"" +
-			                  (bType ? L"1" : std::to_wstring(m_nNumberingId + 1)) + L"\"/></w:numPr>";
-
-			wrP(oXml, sSelectors, oTSLiP);
-			oTSLiP.sPStyle = wsOldPStyle;
-
 			if (!wsValue.empty())
 			{
 				OpenR(oXml);
@@ -4095,6 +4093,8 @@ private:
 		{
 			if (m_oState.m_bInHyperlink)
 			{
+				CloseT(oXml);
+				CloseR(oXml);
 				oXml->WriteString(L"</w:hyperlink>");
 				m_oState.m_bInHyperlink = false;
 			}
@@ -4369,7 +4369,7 @@ private:
 		if (sPStyle.empty() && !ElementInTable(sSelectors))
 			sPStyle = L"normal-web";
 
-		if (sPStyle.empty() && oTS.sPStyle.empty())
+		if (sPStyle.empty() && oTS.sPStyle.empty() && 0 > oTS.nLi)
 			return L"";
 
 		m_oXmlStyle.WriteLitePStyle(oTS.oAdditionalStyle);
@@ -4385,6 +4385,10 @@ private:
 			oXml->WriteString(L"\"/>");
 		}
 
+		if (oTS.nLi >= 0)
+			oXml->WriteString(L"<w:numPr><w:ilvl w:val=\"" + std::to_wstring(oTS.nLi) + L"\"/><w:numId w:val=\"" +
+							  (!oTS.bNumberingLi ? L"1" : std::to_wstring(m_nNumberingId + 1)) + L"\"/></w:numPr>");
+
 		oXml->WriteString(oTS.sPStyle + sPSettings);
 		oXml->WriteNodeEnd(L"w:pPr");
 		m_oState.m_bWasPStyle = true;
diff --git a/HtmlFile2/src/StringFinder.h b/HtmlFile2/src/StringFinder.h
index 48656ad563..a89720cd5f 100644
--- a/HtmlFile2/src/StringFinder.h
+++ b/HtmlFile2/src/StringFinder.h
@@ -108,7 +108,7 @@ namespace NSStringFinder
 
 			wsEndingValue.pop_back();
 
-			wsRegexValue += L"\\s*(.[^" + wsEndingValue + L"]*)\\s*[" + wsEndingValue + L"]?";
+			wsRegexValue += L"\\s*[" + wsEndingValue + L"]?(.[^" + wsEndingValue + L"]*)\\s*[" + wsEndingValue + L"]?";
 		}
 		else
 			wsRegexValue += L"\\s*(.*)[\\n|\\r]?";
diff --git a/HwpFile/HWPFile.pro b/HwpFile/HWPFile.pro
index 424f357bff..f1d3d1318d 100644
--- a/HwpFile/HWPFile.pro
+++ b/HwpFile/HWPFile.pro
@@ -28,6 +28,7 @@ SOURCES += \
     HwpDoc/Conversion/FootnoteConverter.cpp \
     HwpDoc/Conversion/NumberingConverter.cpp \
     HwpDoc/Conversion/OleConverter.cpp \
+    HwpDoc/Conversion/StyleConverter.cpp \
     HwpDoc/HWPDocInfo.cpp \
     HwpDoc/HWPElements/HWPRecord.cpp \
     HwpDoc/HWPElements/HWPRecordBinData.cpp \
@@ -100,10 +101,12 @@ HEADERS += \
     HwpDoc/Common/Common.h \
     HwpDoc/Common/XMLNode.h \
     HwpDoc/Common/WriterContext.h \
+    HwpDoc/Conversion/ConversionState.h \
     HwpDoc/Conversion/Converter2OOXML.h \
     HwpDoc/Conversion/FootnoteConverter.h \
     HwpDoc/Conversion/NumberingConverter.h \
     HwpDoc/Conversion/OleConverter.h \
+    HwpDoc/Conversion/StyleConverter.h \
     HwpDoc/Conversion/Transform.h \
     HwpDoc/Conversion/Types.h \
     HwpDoc/Errors.h \
diff --git a/HwpFile/HwpDoc/Common/WriterContext.cpp b/HwpFile/HwpDoc/Common/WriterContext.cpp
index ad5f6955cf..04b91cdc67 100644
--- a/HwpFile/HwpDoc/Common/WriterContext.cpp
+++ b/HwpFile/HwpDoc/Common/WriterContext.cpp
@@ -250,7 +250,7 @@ const CHWPRecordNumbering* CWriterContext::GetNumbering(short shId)
 	if (nullptr == pDocInfo)
 		return nullptr;
 
-	return (CHWPRecordNumbering*)pDocInfo->GetNumbering(shId);
+	return (CHWPRecordNumbering*)pDocInfo->GetNumbering(shId - 1);
 }
 
 const CHWPRecordBullet* CWriterContext::GetBullet(short shId)
@@ -299,7 +299,8 @@ bool CWriterContext::GetBinBytes(const HWP_STRING& sId, CHWPStream& oBuffer, HWP
 	if (nullptr == pBinData)
 		return false;
 
-	if (EType::LINK == pBinData->GetType())
+	if (EType::LINK == pBinData->GetType() ||
+	    EType::EMBEDDING == pBinData->GetType())
 	{
 		switch (m_eType)
 		{
@@ -309,30 +310,28 @@ bool CWriterContext::GetBinBytes(const HWP_STRING& sId, CHWPStream& oBuffer, HWP
 				return m_pHWPXFile->GetChildStream(pBinData->GetPath(), oBuffer);
 			}
 			default:
-				return false;
+				break;
 		}
 	}
-	else
-	{
-		std::wostringstream oStringStream;
 
-		switch (m_eType)
+	std::wostringstream oStringStream;
+
+	switch (m_eType)
+	{
+		case EHanType::HWP:
 		{
-			case EHanType::HWP:
-			{
-				oStringStream << L"BIN" << std::setw(4) << std::setfill(L'0') << std::hex << pBinData->GetBinDataID() << L"." << pBinData->GetFormat();
-				sFileName = oStringStream.str();
-				return m_pHWPFile->GetChildStream(oStringStream.str(), pBinData->GetCompressed(), oBuffer);
-			}
-			case EHanType::HWPX:
-			{
-				oStringStream << sId << L"." << pBinData->GetFormat();
-				sFileName = oStringStream.str();
-				return m_pHWPXFile->GetChildStream(L"BinData/" + oStringStream.str(), oBuffer);
-			}
-			default:
-				return false;
+			oStringStream << L"BIN" << std::setw(4) << std::setfill(L'0') << std::hex << pBinData->GetBinDataID() << L"." << pBinData->GetFormat();
+			sFileName = oStringStream.str();
+			return m_pHWPFile->GetChildStream(oStringStream.str(), pBinData->GetCompressed(), oBuffer);
 		}
+		case EHanType::HWPX:
+		{
+			oStringStream << sId << L"." << pBinData->GetFormat();
+			sFileName = oStringStream.str();
+			return m_pHWPXFile->GetChildStream(L"BinData/" + oStringStream.str(), oBuffer);
+		}
+		default:
+			break;
 	}
 
 	return false;
diff --git a/HwpFile/HwpDoc/Conversion/ConversionState.h b/HwpFile/HwpDoc/Conversion/ConversionState.h
new file mode 100644
index 0000000000..ae2f1e9389
--- /dev/null
+++ b/HwpFile/HwpDoc/Conversion/ConversionState.h
@@ -0,0 +1,76 @@
+#ifndef CONVERSIONSTATE_H
+#define CONVERSIONSTATE_H
+
+#include "Types.h"
+
+#include "../Paragraph/CtrlHeadFoot.h"
+#include "../Paragraph/CtrlSectionDef.h"
+#include "../Paragraph/CtrlPageNumPos.h"
+#include "../Paragraph/CtrlNewNumber.h"
+#include "../Paragraph/CtrlColumnDef.h"
+#include "../Paragraph/CtrlField.h"
+
+namespace HWP
+{
+struct TConversionState
+{
+	bool m_bOpenedP;
+	bool m_bOpenedR;
+	bool m_bIsNote;
+	bool m_bInTable;
+
+	struct TLastNode
+	{
+		unsigned int m_unParaIndex;
+		enum class ELastNodeType
+		{
+			Empty,
+			Paragraph,
+			Table
+		} m_eType;
+
+		TLastNode()
+		    : m_unParaIndex(0), m_eType(ELastNodeType::Empty)
+		{}
+
+		void Clear()
+		{
+			m_unParaIndex = 0;
+			m_eType = ELastNodeType::Empty;
+		}
+	} m_oLastNode;
+
+	bool m_bInTextBox; // TODO:: используется, чтобы в wps:txbx не появилась новая фигура (посмотреть этот момент нужно подробнее)
+
+	unsigned short m_ushLastCharShapeId;
+	unsigned short m_ushSecdIndex;
+	unsigned int m_unParaIndex;
+
+	VECTOR<const CCtrlHeadFoot*> m_arCtrlsHeadFoot; //only for hwpx
+	std::stack<int> m_arOpenedBookmarks;
+
+	const CCtrlSectionDef* m_pSectionDef;
+	const CCtrlColumnDef*  m_pColumnDef;
+	const CCtrlPageNumPos* m_pPageNum;
+	const CCtrlNewNumber*  m_pNewNumber;
+
+	VECTOR<TRelationship>* m_pRelationships;
+
+	enum class EBreakType
+	{
+		Page,
+		Column,
+		TextWrapping,
+		None
+	} m_eBreakType;
+
+	std::map<unsigned int, const CCtrlField*> m_mOpenField;
+
+	TConversionState()
+	    : m_bOpenedP(false), m_bOpenedR(false), m_bIsNote(false), m_bInTable(false), m_bInTextBox(false), m_ushLastCharShapeId(-1), m_ushSecdIndex(0), m_unParaIndex(0),
+	      m_pSectionDef(nullptr), m_pColumnDef(nullptr), m_pPageNum(nullptr), m_pNewNumber(nullptr), m_pRelationships(nullptr), m_eBreakType(EBreakType::None)
+	{}
+};
+}
+
+#endif // CONVERSIONSTATE_H
diff --git a/HwpFile/HwpDoc/Conversion/Converter2OOXML.cpp b/HwpFile/HwpDoc/Conversion/Converter2OOXML.cpp
index 95d57abbf5..c98600f13b 100644
--- a/HwpFile/HwpDoc/Conversion/Converter2OOXML.cpp
+++ b/HwpFile/HwpDoc/Conversion/Converter2OOXML.cpp
@@ -22,21 +22,10 @@
 
 #include "Transform.h"
 
-#define DEFAULT_FONT_FAMILY std::wstring(L"Arial")
-#define DEFAULT_FONT_SIZE 18
-#define DEFAULT_LANGUAGE std::wstring(L"en")
 #define PARA_SPACING_SCALE 0.85
-#define SPACING_SCALE_MS_WORD 1.21
 
 namespace HWP
 {
-static const std::vector<std::pair<THWPColor, std::wstring>> arHighlightColors
-	{{{{0,   0,   0},   L"black"},    {{0,   0,   255}, L"blue"},      {{0,   255, 255}, L"cyan"},
-	  {{0,   255, 0},   L"green"},    {{255, 0,   255}, L"magenta"},   {{255, 0,   0},   L"red"},
-	  {{255, 255, 0},   L"yellow"},   {{255, 255, 255}, L"white"},     {{0,   0,   139}, L"darkBlue"},
-	  {{0,   139, 139}, L"darkCyan"}, {{0,   100, 0},   L"darkGreen"}, {{139, 0,   139}, L"darkMagenta"},
-	  {{139, 0,   0},   L"darkRed"},  {{128, 128, 0},   L"darkYellow"},{{169, 169, 169}, L"darkGray"},
-	  {{211, 211, 211}, L"lightGray"}}};
 
 enum class EShapeObjectType
 {
@@ -184,22 +173,6 @@ void CConverter2OOXML::FillDefaultData()
 	m_oNoteXmlRels.WriteString(L"<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?><Relationships xmlns=\"http://schemas.openxmlformats.org/package/2006/relationships\">");
 	m_oDocXml     .WriteString(L"<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?><w:document xmlns:wpc=\"http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas\" xmlns:mc=\"http://schemas.openxmlformats.org/markup-compatibility/2006\" xmlns:o=\"urn:schemas-microsoft-com:office:office\" xmlns:r=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships\" xmlns:m=\"http://schemas.openxmlformats.org/officeDocument/2006/math\" xmlns:v=\"urn:schemas-microsoft-com:vml\" xmlns:wp14=\"http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing\" xmlns:wp=\"http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing\" xmlns:w10=\"urn:schemas-microsoft-com:office:word\" xmlns:w=\"http://schemas.openxmlformats.org/wordprocessingml/2006/main\" xmlns:w14=\"http://schemas.microsoft.com/office/word/2010/wordml\" xmlns:w15=\"http://schemas.microsoft.com/office/word/2012/wordml\" xmlns:wpg=\"http://schemas.microsoft.com/office/word/2010/wordprocessingGroup\" xmlns:wpi=\"http://schemas.microsoft.com/office/word/2010/wordprocessingInk\" xmlns:a=\"http://schemas.openxmlformats.org/drawingml/2006/main\" xmlns:wne=\"http://schemas.microsoft.com/office/word/2006/wordml\" xmlns:wps=\"http://schemas.microsoft.com/office/word/2010/wordprocessingShape\" mc:Ignorable=\"w14 w15 wp14\"><w:body>");
 	m_oWebSettings.WriteString(L"<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?><w:webSettings xmlns:w=\"http://schemas.openxmlformats.org/wordprocessingml/2006/main\"><w:optimizeForBrowser/>");
-
-	m_oStylesXml.WriteString(L"<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?><w:styles xmlns:mc=\"http://schemas.openxmlformats.org/markup-compatibility/2006\" xmlns:r=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships\" xmlns:w=\"http://schemas.openxmlformats.org/wordprocessingml/2006/main\" xmlns:w14=\"http://schemas.microsoft.com/office/word/2010/wordml\" xmlns:w15=\"http://schemas.microsoft.com/office/word/2012/wordml\" mc:Ignorable=\"w14 w15\">");
-	m_oStylesXml.WriteString(L"<w:rPrDefault><w:rPr>");
-	m_oStylesXml.WriteString(L"<w:rFonts w:ascii=\"" + DEFAULT_FONT_FAMILY + L"\" w:eastAsia=\"" + DEFAULT_FONT_FAMILY + L"\"  w:hAnsi=\"" + DEFAULT_FONT_FAMILY + L"\" w:cs=\"" + DEFAULT_FONT_FAMILY + L"\"/>");
-	m_oStylesXml.WriteString(L"<w:sz w:val=\"" + std::to_wstring(DEFAULT_FONT_SIZE) + L"\"/><w:szCs w:val=\"" + std::to_wstring(DEFAULT_FONT_SIZE) + L"\"/>");
-	m_oStylesXml.WriteString(L"<w:lang w:val=\"" + DEFAULT_LANGUAGE + L"\" w:eastAsia=\"en-US\" w:bidi=\"ar-SA\"/>");
-	m_oStylesXml.WriteString(L"</w:rPr></w:rPrDefault><w:pPrDefault/>");
-
-	m_oStylesXml.WriteString(L"<w:style w:type=\"paragraph\" w:styleId=\"normal\" w:default=\"1\"><w:name w:val=\"Normal\"/><w:qFormat/><w:rPr><w:rFonts w:eastAsiaTheme=\"minorEastAsia\"/>");
-	m_oStylesXml.WriteString(L"<w:sz w:val=\"" + std::to_wstring(DEFAULT_FONT_SIZE) + L"\"/><w:szCs w:val=\"" + std::to_wstring(DEFAULT_FONT_SIZE) + L"\"/>");
-	m_oStylesXml.WriteString(L"</w:rPr></w:style>");
-
-	m_oStylesXml.WriteString(L"<w:style w:type=\"paragraph\" w:styleId=\"li\"><w:name w:val=\"List Paragraph\"/><w:basedOn w:val=\"normal\"/><w:qFormat/><w:uiPriority w:val=\"34\"/><w:pPr><w:contextualSpacing w:val=\"true\"/><w:ind w:left=\"720\"/></w:pPr></w:style>");
-	m_oStylesXml.WriteString(L"<w:style w:type=\"character\" w:styleId=\"a\"><w:name w:val=\"Hyperlink\"/><w:uiPriority w:val=\"99\"/><w:unhideWhenUsed/><w:rPr><w:color w:val=\"0000FF\" w:themeColor=\"hyperlink\"/><w:u w:val=\"single\"/></w:rPr></w:style>");
-	m_oStylesXml.WriteString(L"<w:style w:type=\"character\" w:styleId=\"footnote\"><w:name w:val=\"footnote reference\"/><w:uiPriority w:val=\"99\"/><w:unhideWhenUsed/><w:rPr><w:vertAlign w:val=\"superscript\"/></w:rPr></w:style><w:style w:type=\"paragraph\" w:styleId=\"footnote-p\"><w:name w:val=\"footnote text\"/><w:basedOn w:val=\"normal\"/><w:link w:val=\"footnote-c\"/><w:uiPriority w:val=\"99\"/><w:semiHidden/><w:unhideWhenUsed/><w:rPr><w:sz w:val=\"18\"/></w:rPr><w:pPr><w:spacing w:lineRule=\"auto\" w:line=\"240\" w:after=\"40\"/></w:pPr></w:style><w:style w:type=\"character\" w:styleId=\"footnote-c\" w:customStyle=\"1\"><w:name w:val=\"footnote text character\"/><w:link w:val=\"footnote-p\"/><w:uiPriority w:val=\"99\"/><w:rPr><w:sz w:val=\"18\"/></w:rPr></w:style>");
-	m_oStylesXml.WriteString(L"<w:style w:type=\"paragraph\" w:styleId=\"normal-web\"><w:name w:val=\"Normal (Web)\"/><w:basedOn w:val=\"normal\"/><w:uiPriority w:val=\"99\"/><w:semiHidden/><w:unhideWhenUsed/><w:pPr><w:spacing w:before=\"100\" w:beforeAutospacing=\"1\" w:after=\"100\" w:afterAutospacing=\"1\"/></w:pPr></w:style>");
 }
 
 void CConverter2OOXML::Close()
@@ -224,13 +197,7 @@ void CConverter2OOXML::Close()
 	}
 
 	// styles.xml
-	m_oStylesXml.WriteString(L"</w:styles>");
-	NSFile::CFileBinary oStylesWriter;
-	if (oStylesWriter.CreateFileW(m_sTempDirectory + L"/word/styles.xml"))
-	{
-		oStylesWriter.WriteStringUTF8(m_oStylesXml.GetData());
-		oStylesWriter.CloseFile();
-	}
+	m_oStyleConverter.SaveToFile(m_sTempDirectory + FILE_SEPARATOR_STR + L"word" + FILE_SEPARATOR_STR);
 
 	// numbering.xml
 	if (m_oNumberingConverter.SaveToFile(m_sTempDirectory + FILE_SEPARATOR_STR + L"word" + FILE_SEPARATOR_STR))
@@ -315,6 +282,8 @@ void CConverter2OOXML::Convert()
 			m_oDocXml.WriteString(L"</w:pPr></w:p>");
 
 		++oState.m_ushSecdIndex;
+
+		oState.m_oLastNode.Clear();
 	}
 }
 
@@ -323,7 +292,7 @@ bool CConverter2OOXML::IsRasterFormat(const HWP_STRING& sFormat)
 	return L"png" == sFormat || L"jpg" == sFormat || L"jpeg" == sFormat || L"bmp" == sFormat;
 }
 
-void CConverter2OOXML::WriteCharacter(const CCtrlCharacter* pCharacter, short shParaShapeID, NSStringUtils::CStringBuilder& oBuilder, TConversionState& oState)
+void CConverter2OOXML::WriteCharacter(const CCtrlCharacter* pCharacter, short shParaShapeID, short shParaStyleID, NSStringUtils::CStringBuilder& oBuilder, TConversionState& oState)
 {
 	if (nullptr == pCharacter)
 		return;
@@ -332,11 +301,18 @@ void CConverter2OOXML::WriteCharacter(const CCtrlCharacter* pCharacter, short sh
 	{
 		case ECtrlCharType::PARAGRAPH_BREAK:
 		{
-			if (!oState.m_bOpenedP)
+			// Таблицы пишутся без тега <w:p>, поэтому для них не открывается параграф
+			if (TConversionState::TLastNode::ELastNodeType::Table == oState.m_oLastNode.m_eType &&
+			    oState.m_unParaIndex == oState.m_oLastNode.m_unParaIndex && !oState.m_bInTable)
+			{
+				oState.m_oLastNode.m_eType = TConversionState::TLastNode::ELastNodeType::Table;
 				break;
+			}
 
-			oState.m_bOpenedP = false;
-			oBuilder.WriteString(L"</w:p>");
+			if (!oState.m_bOpenedP)
+				WriteEmptyParagraph(shParaShapeID, shParaStyleID, pCharacter->GetCharShapeId(), oBuilder, oState);
+			else
+				CloseParagraph(oBuilder, oState);
 
 			break;
 		}
@@ -351,7 +327,7 @@ void CConverter2OOXML::WriteCharacter(const CCtrlCharacter* pCharacter, short sh
 	}
 }
 
-void CConverter2OOXML::WriteShape(const CCtrlGeneralShape* pShape, short shParaShapeID, NSStringUtils::CStringBuilder& oBuilder, TConversionState& oState)
+void CConverter2OOXML::WriteShape(const CCtrlGeneralShape* pShape, short shParaShapeID, short shParaStyleID, NSStringUtils::CStringBuilder& oBuilder, TConversionState& oState)
 {
 	if (nullptr == pShape || oState.m_bInTextBox)
 		return;
@@ -365,32 +341,36 @@ void CConverter2OOXML::WriteShape(const CCtrlGeneralShape* pShape, short shParaS
 		case EShapeType::Polygon:
 		case EShapeType::Curve:
 		{
-			WriteGeometryShape(pShape, shParaShapeID, oBuilder, oState);
+			WriteGeometryShape(pShape, shParaShapeID, shParaStyleID, oBuilder, oState);
 			break;
 		}
 		case EShapeType::Pic:
 		{
-			WritePicture((const CCtrlShapePic*)pShape, shParaShapeID, oBuilder, oState);
+			WritePicture((const CCtrlShapePic*)pShape, shParaShapeID, shParaStyleID, oBuilder, oState);
 			break;
 		}
 		case EShapeType::EqEdit:
 		{
-			WriteEqEditShape((const CCtrlEqEdit*)pShape, shParaShapeID, oBuilder, oState);
+			WriteEqEditShape((const CCtrlEqEdit*)pShape, shParaShapeID, shParaStyleID, oBuilder, oState);
 			break;
 		}
 		case EShapeType::Ole:
 		{
-			WriteOleShape((const CCtrlShapeOle*)pShape, shParaShapeID, oBuilder, oState);
+			WriteOleShape((const CCtrlShapeOle*)pShape, shParaShapeID, shParaStyleID, oBuilder, oState);
 			break;
 		}
 		case EShapeType::Video:
 		{
-			WriteVideo((const CCtrlShapeVideo*)pShape, shParaShapeID, oBuilder, oState);
+			WriteVideo((const CCtrlShapeVideo*)pShape, shParaShapeID, shParaStyleID, oBuilder, oState);
+			break;
+		}
+		case EShapeType::Container:
+		{
+			WriteContainer((const CCtrlContainer*)pShape, shParaShapeID, shParaStyleID, oBuilder, oState);
 			break;
 		}
 		case EShapeType::GeneralShape:
 		case EShapeType::ConnectLine:
-		case EShapeType::Container:
 		case EShapeType::TextArt:
 			break;
 	}
@@ -398,16 +378,22 @@ void CConverter2OOXML::WriteShape(const CCtrlGeneralShape* pShape, short shParaS
 
 void CConverter2OOXML::WriteNote(const CCtrlNote* pNote, short shParaShapeID, NSStringUtils::CStringBuilder& oBuilder, TConversionState& oState)
 {
+	if (nullptr == pNote)
+		return;
+
 	oBuilder.WriteString(L"<w:r>");
 
-	WriteRunnerStyle(oState.m_ushLastCharShapeId, oBuilder, oState, L"<w:vertAlign w:val=\"superscript\"/>");
+	CRunnerStyle oRunnerStyle;
+	oRunnerStyle.SetVerticalAlign(EVerticalAlignRun::Superscript);
+
+	WriteRunnerStyle(oState.m_ushLastCharShapeId, oBuilder, oState, oRunnerStyle);
 
 	oBuilder.WriteString(m_oFootnoteConverter.CreateNote((const CCtrlNote*)pNote, *this));
 
 	oBuilder.WriteString(L"</w:r>");
 }
 
-void CConverter2OOXML::WriteField(const CCtrlField* pShape, short shParaShapeID, NSStringUtils::CStringBuilder& oBuilder, TConversionState& oState)
+void CConverter2OOXML::WriteField(const CCtrlField* pShape, short shParaShapeID, short shParaStyleID, NSStringUtils::CStringBuilder& oBuilder, TConversionState& oState)
 {
 	if (nullptr == pShape)
 		return;
@@ -441,9 +427,9 @@ void CConverter2OOXML::WriteField(const CCtrlField* pShape, short shParaShapeID,
 			if (wsHref.empty())
 				break;
 
-			const HWP_STRING wsID = AddRelationship(L"hyperlink", wsHref);
+			const HWP_STRING wsID = AddRelationship(L"hyperlink", wsHref, &oState);
 
-			OpenParagraph(shParaShapeID, oBuilder, oState);
+			OpenParagraph(shParaShapeID, shParaStyleID, oBuilder, oState);
 			oBuilder.WriteString(L"<w:hyperlink r:id=\"" + wsID + L"\">");
 
 			oState.m_mOpenField.insert(std::make_pair(pShape->GetInstanceID(), pShape));
@@ -517,6 +503,21 @@ void CConverter2OOXML::WriteCaption(const CCtrlCommon* pCtrlCommon, NSStringUtil
 		WriteParagraph(pCapParagraph, oBuilder, oState);
 }
 
+void CConverter2OOXML::WriteEmptyParagraph(short shParaShapeID, short shParaStyleID, short shCharShapeID, NSStringUtils::CStringBuilder& oBuilder, TConversionState& oState)
+{
+	if (oState.m_bOpenedP)
+		return;
+
+	oBuilder.WriteString(L"<w:p>");
+	oBuilder.WriteString(L"<w:pPr>");
+
+	WriteParaShapeProperties(shParaShapeID, shParaStyleID, oBuilder, oState);
+	WriteRunnerStyle(shCharShapeID, oBuilder, oState);
+
+	oBuilder.WriteString(L"</w:pPr>");
+	oBuilder.WriteString(L"</w:p>");
+}
+
 void CConverter2OOXML::WriteParagraph(const CHWPPargraph* pParagraph, NSStringUtils::CStringBuilder& oBuilder, TConversionState& oState)
 {
 	if (nullptr == pParagraph)
@@ -545,23 +546,22 @@ void CConverter2OOXML::WriteParagraph(const CHWPPargraph* pParagraph, NSStringUt
 		{
 			case ECtrlObjectType::ParaText:
 			{
-				WriteText((const CParaText*)pCtrl, pParagraph->GetRangeTags(), pParagraph->GetShapeID(),  oBuilder, oState);
-				// WriteText(((const CParaText*)pCtrl)->GetText(), pParagraph->GetShapeID(), ((const CParaText*)pCtrl)->GetCharShapeID(), oBuilder, oState);
+				WriteText((const CParaText*)pCtrl, pParagraph->GetRangeTags(), pParagraph->GetShapeID(), pParagraph->GetStyleID(), oBuilder, oState);
 				break;
 			}
 			case ECtrlObjectType::Character:
 			{
-				WriteCharacter((const CCtrlCharacter*)pCtrl, pParagraph->GetShapeID(), oBuilder, oState);
+				WriteCharacter((const CCtrlCharacter*)pCtrl, pParagraph->GetShapeID(), pParagraph->GetStyleID(), oBuilder, oState);
 				break;
 			}
 			case ECtrlObjectType::Shape:
 			{
-				WriteShape((const CCtrlGeneralShape*)pCtrl, pParagraph->GetShapeID(), oBuilder, oState);
+				WriteShape((const CCtrlGeneralShape*)pCtrl, pParagraph->GetShapeID(), pParagraph->GetStyleID(), oBuilder, oState);
 				break;
 			}
 			case ECtrlObjectType::Table:
 			{
-				WriteTable((const CCtrlTable*)pCtrl, pParagraph->GetShapeID(), oBuilder, oState);
+				WriteTable((const CCtrlTable*)pCtrl, pParagraph->GetShapeID(), pParagraph->GetStyleID(), oBuilder, oState);
 				break;
 			}
 			case ECtrlObjectType::Note:
@@ -581,12 +581,12 @@ void CConverter2OOXML::WriteParagraph(const CHWPPargraph* pParagraph, NSStringUt
 			}
 			case ECtrlObjectType::AutoNumber:
 			{
-				WriteAutoNumber((const CCtrlAutoNumber*)pCtrl, pParagraph->GetShapeID(), oState.m_ushLastCharShapeId, oBuilder, oState);
+				WriteAutoNumber((const CCtrlAutoNumber*)pCtrl, pParagraph->GetShapeID(), pParagraph->GetStyleID(), oState.m_ushLastCharShapeId, oBuilder, oState);
 				break;
 			}
 			case ECtrlObjectType::Field:
 			{
-				WriteField((const CCtrlField*)pCtrl, pParagraph->GetShapeID(), oBuilder, oState);
+				WriteField((const CCtrlField*)pCtrl, pParagraph->GetShapeID(), pParagraph->GetStyleID(), oBuilder, oState);
 				break;
 			}
 			case ECtrlObjectType::HeadFoot:
@@ -595,6 +595,16 @@ void CConverter2OOXML::WriteParagraph(const CHWPPargraph* pParagraph, NSStringUt
 					oState.m_arCtrlsHeadFoot.push_back((const CCtrlHeadFoot*)pCtrl);
 				break;
 			}
+			case ECtrlObjectType::PageNumPos:
+			{
+				oState.m_pPageNum = dynamic_cast<const CCtrlPageNumPos*>(pCtrl);
+				break;
+			}
+			case ECtrlObjectType::NewNumber:
+			{
+				oState.m_pNewNumber = dynamic_cast<const CCtrlNewNumber*>(pCtrl);
+				break;
+			}
 			default:
 				break;
 		}
@@ -603,92 +613,46 @@ void CConverter2OOXML::WriteParagraph(const CHWPPargraph* pParagraph, NSStringUt
 	CloseParagraph(oBuilder, oState);
 }
 
-void CConverter2OOXML::WriteParagraphProperties(short shParaShapeID, NSStringUtils::CStringBuilder& oBuilder, TConversionState& oState)
+void CConverter2OOXML::WriteParagraphProperties(short shParaShapeID, short shParaStyleID, NSStringUtils::CStringBuilder& oBuilder, TConversionState& oState)
 {
 	oBuilder.WriteString(L"<w:pPr>");
 
-	WriteParaShapeProperties(shParaShapeID, oBuilder, oState);
+	WriteParaShapeProperties(shParaShapeID, shParaStyleID, oBuilder, oState);
 
 	oBuilder.WriteString(L"</w:pPr>");
 }
 
-void CConverter2OOXML::WriteParaShapeProperties(short shParaShapeID, NSStringUtils::CStringBuilder& oBuilder, TConversionState& oState)
+void CConverter2OOXML::WriteParaShapeProperties(short shParaShapeID, short shParaStyleID, NSStringUtils::CStringBuilder& oBuilder, TConversionState& oState)
 {
 	if (nullptr == m_pContext)
 		return;
 
-	const CHWPRecordParaShape* pParaShape = dynamic_cast<const CHWPRecordParaShape*>(m_pContext->GetParaShape(shParaShapeID));
+	const std::wstring wsStyleId = m_oStyleConverter.CreateStyle(shParaShapeID, shParaStyleID, *m_pContext, oState);
+
+	if (!wsStyleId.empty())
+	{
+		oBuilder.WriteString(L"<w:pStyle w:val=\"");
+		oBuilder.WriteEncodeXmlString(wsStyleId);
+		oBuilder.WriteString(L"\"/>");
+	}
+
+	if (oState.m_bInTable)
+		oBuilder.WriteString(L"<w:wordWrap w:val=\"1\"/>");
+
+	if (m_oStyleConverter.GetLastParaShapeId() != shParaShapeID)
+		m_oStyleConverter.WriteDifferenceParagraphStyles(m_oStyleConverter.GetLastParaShapeId(), shParaShapeID, *m_pContext, oBuilder);
+
+	const CHWPRecordParaShape* pParaShape= dynamic_cast<const CHWPRecordParaShape*>(m_pContext->GetParaShape(shParaShapeID));
 
 	if (nullptr == pParaShape)
 		return;
 
-	if (pParaShape->GetPageBreakBefore())
-		oState.m_eBreakType = TConversionState::EBreakType::Page;
-
-	oBuilder.WriteString(L"<w:keepNext w:val=\"" + HWP_STRING((pParaShape->KeepWithNext()) ? L"true" : L"false") + L"\"/>");
-
-	const int nIndent = pParaShape->GetIndent();
-
-	if (0 != nIndent)
-		oBuilder.WriteString(L"<w:ind w:firstLine=\"" + std::to_wstring(static_cast<int>(std::ceil(nIndent / 10.))) + L"\"/>");
-
-	switch(pParaShape->GetHorizantalAlign())
-	{
-		case EHorizontalAlign::JUSTIFY: oBuilder.WriteString(L"<w:jc w:val=\"both\"/>"); break;
-		case EHorizontalAlign::LEFT: oBuilder.WriteString(L"<w:jc w:val=\"left\"/>"); break;
-		case EHorizontalAlign::RIGHT: oBuilder.WriteString(L"<w:jc w:val=\"right\"/>"); break;
-		case EHorizontalAlign::CENTER: oBuilder.WriteString(L"<w:jc w:val=\"center\"/>"); break;
-		case EHorizontalAlign::DISTRIBUTE:
-		case EHorizontalAlign::DISTRIBUTE_SPACE: oBuilder.WriteString(L"<w:jc w:val=\"distribute\"/>"); break;
-	}
-
-	switch(pParaShape->GetVerticalAlign())
-	{
-		case EVerticalAlign::BOTTOM: oBuilder.WriteString(L"<w:textAlignment w:val=\"bottom\"/>"); break;
-		case EVerticalAlign::TOP: oBuilder.WriteString(L"<w:textAlignment w:val=\"top\"/>"); break;
-		case EVerticalAlign::CENTER: oBuilder.WriteString(L"<w:textAlignment w:val=\"center\"/>"); break;
-		case EVerticalAlign::BASELINE:
-			break;
-	}
-
-	int nLineSpacing = 240;
-	HWP_STRING sType = L"auto";
-
-	switch(pParaShape->GetLineSpacingType())
-	{
-		case 0x0:
-		{
-			sType = L"auto";
-			nLineSpacing = static_cast<int>(240. * (double)pParaShape->GetLineSpacing() / 100.); // TODO:: в hwp изначально межстрочный интервал меньше. Множитель 1 в hwp ≈ 0.65 MS
-			break;
-		}
-		case 0x01:
-		{
-			sType = L"exact";
-			nLineSpacing = static_cast<int>((double)pParaShape->GetLineSpacing() / 2. * 20)/*0.352778*/; //(1pt=0.352778mm) //TODO:: проверить, как найдется пример
-			break;
-			break;
-		}
-		case 0x02:
-		case 0x03:
-		default:
-		{
-			sType = L"atLeast";
-			nLineSpacing = static_cast<int>((double)pParaShape->GetLineSpacing());  //TODO:: проверить, как найдется пример
-			break;
-		}
-	}
-
-	oBuilder.WriteString(L"<w:spacing w:lineRule=\"" + sType + L"\" w:line=\"" + std::to_wstring(nLineSpacing) +
-	                      L"\" w:before=\"" + std::to_wstring(static_cast<int>((double)pParaShape->GetMarginPrev() / 10.)) +
-	                      L"\" w:after=\"" + std::to_wstring(static_cast<int>((double)pParaShape->GetMarginNext() / 10.)) + L"\"/>");
-
 	switch (pParaShape->GetHeadingType())
 	{
 		case EHeadingType::NUMBER:
 		case EHeadingType::BULLET:
 		{
-			const int nNumId = m_oNumberingConverter.CreateNumbering(dynamic_cast<const CHWPRecordNumbering*>(m_pContext->GetNumbering(pParaShape->GetHeadingIdRef())), pParaShape->GetHeadingType());
+			const int nNumId = m_oNumberingConverter.CreateNumbering(dynamic_cast<const CHWPRecordNumbering*>(m_pContext->GetNumbering(pParaShape->GetHeadingIdRef())), pParaShape->GetHeadingType(), *this);
 
 			if (0 == nNumId)
 				break;
@@ -708,18 +672,25 @@ void CConverter2OOXML::WriteParaShapeProperties(short shParaShapeID, NSStringUti
 	}
 }
 
-void CConverter2OOXML::WriteTable(const CCtrlTable* pTable, short shParaShapeID, NSStringUtils::CStringBuilder& oBuilder, TConversionState& oState)
+void CConverter2OOXML::WriteTable(const CCtrlTable* pTable, short shParaShapeID, short shParaStyleID, NSStringUtils::CStringBuilder& oBuilder, TConversionState& oState)
 {
 	if (nullptr == pTable || pTable->Empty())
 		return;
 
+	if (TConversionState::TLastNode::ELastNodeType::Table == oState.m_oLastNode.m_eType)
+		oBuilder.WriteString(L"<w:p><w:r><w:rPr><w:vanish/></w:rPr></w:r></w:p>");
+
 	CloseParagraph(oBuilder, oState);
 
 	++m_ushTableCount;
 
 	oBuilder.WriteString(L"<w:tbl>");
 
-	WriteTableProperties(pTable, shParaShapeID, oBuilder, oState);
+	const bool bTableInTable = oState.m_bInTable;
+
+	oState.m_bInTable = true;
+
+	WriteTableProperties(pTable, shParaShapeID, shParaStyleID, oBuilder, oState);
 
 	std::vector<std::vector<std::pair<ECellCreator, const CTblCell*>>> m_arrCells(pTable->GetRows());
 
@@ -794,30 +765,47 @@ void CConverter2OOXML::WriteTable(const CCtrlTable* pTable, short shParaShapeID,
 	}
 
 	oBuilder.WriteString(L"</w:tbl>");
+
+	oState.m_oLastNode.m_eType = TConversionState::TLastNode::ELastNodeType::Table;
+	oState.m_oLastNode.m_unParaIndex = oState.m_unParaIndex;
+
+	oState.m_bInTable = bTableInTable;
 }
 
-void CConverter2OOXML::WriteTableProperties(const CCtrlTable* pTable, short shParaShapeID, NSStringUtils::CStringBuilder& oBuilder, TConversionState& oState)
+void CConverter2OOXML::WriteTableProperties(const CCtrlTable* pTable, short shParaShapeID, short shParaStyleID, NSStringUtils::CStringBuilder& oBuilder, TConversionState& oState)
 {
 	if (nullptr == pTable)
 		return;
 
 	oBuilder.WriteString(L"<w:tblPr>");
 
+	// TODO:: сделать вычисление
 	oBuilder.WriteString(L"<w:tblW w:w=\"0\" w:type=\"auto\"/>");
 
-	WriteParaShapeProperties(shParaShapeID, oBuilder, oState);
-
-	const CHWPRecordBorderFill* pBorderFill = nullptr;
-
-	if (nullptr != m_pContext)
-		pBorderFill = dynamic_cast<const CHWPRecordBorderFill*>(m_pContext->GetBorderFill(pTable->GetBorderFillID()));
-
-	if (nullptr == pBorderFill)
+	if (0 != pTable->GetInLSpace() || 0 != pTable->GetInTSpace() ||
+	    0 != pTable->GetInRSpace() || 0 != pTable->GetInBSpace())
 	{
-		oBuilder.WriteString(L"</w:tblPr>");
-		return;
+		oBuilder.WriteString(L"<w:tblCellMar>");
+		oBuilder.WriteString(L"<w:top w:w=\""    + std::to_wstring(Transform::HWPUINT2Twips(pTable->GetInTSpace())) + L"\" w:type=\"dxa\"/>");
+		oBuilder.WriteString(L"<w:left w:w=\""   + std::to_wstring(Transform::HWPUINT2Twips(pTable->GetInLSpace())) + L"\" w:type=\"dxa\"/>");
+		oBuilder.WriteString(L"<w:bottom w:w=\"" + std::to_wstring(Transform::HWPUINT2Twips(pTable->GetInBSpace())) + L"\" w:type=\"dxa\"/>");
+		oBuilder.WriteString(L"<w:right w:w=\""  + std::to_wstring(Transform::HWPUINT2Twips(pTable->GetInRSpace())) + L"\" w:type=\"dxa\"/>");
+		oBuilder.WriteString(L"</w:tblCellMar>");
 	}
 
+	WriteParaShapeProperties(shParaShapeID, shParaStyleID, oBuilder, oState);
+
+	// const CHWPRecordBorderFill* pBorderFill = nullptr;
+
+	// if (nullptr != m_pContext)
+	// 	pBorderFill = dynamic_cast<const CHWPRecordBorderFill*>(m_pContext->GetBorderFill(pTable->GetBorderFillID()));
+
+	// if (nullptr == pBorderFill)
+	// {
+	// 	oBuilder.WriteString(L"</w:tblPr>");
+	// 	return;
+	// }
+
 	oBuilder.WriteString(L"</w:tblPr>");
 }
 
@@ -856,13 +844,16 @@ void CConverter2OOXML::WriteCell(const CTblCell* pCell, NSStringUtils::CStringBu
 		for (const CHWPPargraph* pParagraph : pCell->GetParagraphs())
 		{
 			NSStringUtils::CStringBuilder oCellBuilder;
+
 			TConversionState oCellState;
+			oCellState.m_pRelationships = oState.m_pRelationships;
+			oCellState.m_bInTable       = oState.m_bInTable;
 
 			WriteParagraph(pParagraph, oCellBuilder, oCellState);
 
 			if (0 == oCellBuilder.GetCurSize())
 			{
-				OpenParagraph(pParagraph->GetShapeID(), oBuilder, oCellState);
+				OpenParagraph(pParagraph->GetShapeID(), pParagraph->GetStyleID(), oBuilder, oCellState);
 				CloseParagraph(oBuilder, oCellState);
 			}
 			else
@@ -885,8 +876,16 @@ void CConverter2OOXML::WriteCellProperties(short shBorderFillID, NSStringUtils::
 	if (nullptr == pBorderFill)
 		return;
 
-	if (nullptr != pBorderFill->GetFill() && pBorderFill->GetFill()->ColorFill())
-		oBuilder.WriteString(L"<w:shd w:val=\"clear\" w:color=\"auto\" w:fill=\"" + Transform::IntColorToHEX(pBorderFill->GetFill()->GetFaceColor()) + L"\"/>");
+	if(nullptr != pBorderFill->GetFill())
+	{
+		const CFill* pFill{pBorderFill->GetFill()};
+
+		if (pFill->ColorFill())
+			oBuilder.WriteString(L"<w:shd w:val=\"clear\" w:color=\"auto\" w:fill=\"" + Transform::IntColorToHEX(pFill->GetFaceColor()) + L"\"/>");
+		// In OOXML, there is no gradient support for cell fills, so we fill in the first color of the gradient.
+		else if (pFill->GradFill() && 0 != pFill->GetGradColorNum())
+			oBuilder.WriteString(L"<w:shd w:val=\"clear\" w:color=\"auto\" w:fill=\"" + Transform::IntColorToHEX(pFill->GetGradColors().front()) + L"\"/>");
+	}
 
 	oBuilder.WriteString(L"<w:tcBorders>");
 
@@ -900,7 +899,7 @@ void CConverter2OOXML::WriteCellProperties(short shBorderFillID, NSStringUtils::
 
 void CConverter2OOXML::WriteBorder(const TBorder& oBorder, const HWP_STRING& sBorderName, NSStringUtils::CStringBuilder& oBuilder)
 {
-	if (0x00 == oBorder.m_chWidth || sBorderName.empty())
+	if (sBorderName.empty())
 		return;
 
 	HWP_STRING sType;
@@ -916,14 +915,13 @@ void CConverter2OOXML::WriteBorder(const TBorder& oBorder, const HWP_STRING& sBo
 		case ELineStyle2::DASH_DOT_DOT: sType = L"dotDotDash"; break;
 		case ELineStyle2::LONG_DASH: sType = L"dashed"; break;
 		case ELineStyle2::CIRCLE: sType = L"dashed"; break;
-		case ELineStyle2::DOUBLE_SLIM: sType = L"thickThinMediumGap"; break;
-		case ELineStyle2::SLIM_THICK: sType = L"thickThinMediumGap"; break;
-		case ELineStyle2::THICK_SLIM: sType = L"thickThinMediumGap"; break;
-		case ELineStyle2::SLIM_THICK_SLIM: sType = L"thickThinMediumGap"; break;
-			break;
+		case ELineStyle2::DOUBLE_SLIM: sType = L"double"; break;
+		case ELineStyle2::SLIM_THICK: sType = L"thinThickSmallGap"; break;
+		case ELineStyle2::THICK_SLIM: sType = L"thickThinSmallGap"; break;
+		case ELineStyle2::SLIM_THICK_SLIM: sType = L"thinThickThinSmallGap"; break;
 	}
 
-	oBuilder.WriteString(L"<w:" + sBorderName + L" w:val=\"" + sType + L"\" w:sz=\"" + std::to_wstring(Transform::LineWidth2Pt((short)oBorder.m_chWidth)) + L"\" w:space=\"0\" w:color=\"" + Transform::IntColorToHEX(oBorder.m_nColor) + L"\"/>");
+	oBuilder.WriteString(L"<w:" + sBorderName + L" w:val=\"" + sType + L"\" w:sz=\"" + std::to_wstring(Transform::LineWidth2Pt((short)oBorder.m_chWidth)) + L"\" w:color=\"" + Transform::IntColorToHEX(oBorder.m_nColor) + L"\"/>");
 }
 
 VECTOR<TPoint> ArcToBezier(const TPoint& oStart, const TPoint& oEnd, const TPoint& oCenter)
@@ -944,7 +942,7 @@ VECTOR<TPoint> ArcToBezier(const TPoint& oStart, const TPoint& oEnd, const TPoin
 	return {oStart, oControl1, oControl2, oEnd};
 }
 
-void CConverter2OOXML::WriteGeometryShape(const CCtrlGeneralShape* pGeneralShape, short shParaShapeID, NSStringUtils::CStringBuilder& oBuilder, TConversionState& oState)
+void CConverter2OOXML::WriteGeometryShape(const CCtrlGeneralShape* pGeneralShape, short shParaShapeID, short shParaStyleID, NSStringUtils::CStringBuilder& oBuilder, TConversionState& oState)
 {
 	if (nullptr == pGeneralShape)
 		return;
@@ -958,7 +956,7 @@ void CConverter2OOXML::WriteGeometryShape(const CCtrlGeneralShape* pGeneralShape
 
 	WriteCaption((const CCtrlCommon*)pGeneralShape, oBuilder, oState);
 
-	OpenParagraph(shParaShapeID, oBuilder, oState);
+	OpenParagraph(shParaShapeID, shParaStyleID, oBuilder, oState);
 
 	const int nWidth =  Transform::HWPUINT2OOXML(pGeneralShape->GetWidth());
 	const int nHeight = Transform::HWPUINT2OOXML(pGeneralShape->GetHeight());
@@ -1075,7 +1073,7 @@ void CConverter2OOXML::WriteGeometryShape(const CCtrlGeneralShape* pGeneralShape
 		oBuilder.WriteString(L"<a:solidFill><a:srgbClr val=\"" + Transform::IntColorToHEX(pFill->GetFaceColor()) + L"\"/></a:solidFill>");
 	else if (pFill->ImageFill())
 	{
-		const HWP_STRING sPictureId = SavePicture(pFill->GetBinItemID());
+		const HWP_STRING sPictureId = SavePicture(pFill->GetBinItemID(), oState);
 
 		if (!sPictureId.empty())
 			oBuilder.WriteString(L"<a:blipFill><a:blip r:embed=\"" + sPictureId + L"\"><a:extLst><a:ext uri=\"{28A0092B-C50C-407E-A947-70E740481C1C}\"><a14:useLocalDpi xmlns:a14=\"http://schemas.microsoft.com/office/drawing/2010/main\" val=\"0\"/></a:ext></a:extLst></a:blip><a:srcRect/><a:stretch><a:fillRect/></a:stretch></a:blipFill>");
@@ -1109,14 +1107,14 @@ void CConverter2OOXML::WriteGeometryShape(const CCtrlGeneralShape* pGeneralShape
 	oBuilder.WriteString(L"</mc:Choice></mc:AlternateContent></w:r>");
 }
 
-void CConverter2OOXML::WriteEqEditShape(const CCtrlEqEdit* pEqEditShape, short shParaShapeID, NSStringUtils::CStringBuilder& oBuilder, TConversionState& oState)
+void CConverter2OOXML::WriteEqEditShape(const CCtrlEqEdit* pEqEditShape, short shParaShapeID, short shParaStyleID, NSStringUtils::CStringBuilder& oBuilder, TConversionState& oState)
 {
 	//TODO:: добавить конвертацию eqn формулы в ooxml
 	++m_ushEquationCount;
 
 	WriteCaption((const CCtrlCommon*)pEqEditShape, oBuilder, oState);
 
-	OpenParagraph(shParaShapeID, oBuilder, oState);
+	OpenParagraph(shParaShapeID, shParaStyleID, oBuilder, oState);
 
 	oBuilder.WriteString(L"<w:r>");
 
@@ -1125,7 +1123,7 @@ void CConverter2OOXML::WriteEqEditShape(const CCtrlEqEdit* pEqEditShape, short s
 	oBuilder.WriteString(L"</w:t></w:r>");
 }
 
-void CConverter2OOXML::WriteOleShape(const CCtrlShapeOle* pOleShape, short shParaShapeID, NSStringUtils::CStringBuilder& oBuilder, TConversionState& oState)
+void CConverter2OOXML::WriteOleShape(const CCtrlShapeOle* pOleShape, short shParaShapeID, short shParaStyleID, NSStringUtils::CStringBuilder& oBuilder, TConversionState& oState)
 {
 	//TODO:: добавить конвертацию hwp ole -> ooxml chart
 	//TODO:: необходимо добавить поддержку формата "Hwp Document File Formats - Charts" (для случаев, когда нет ooxml представления)
@@ -1154,9 +1152,9 @@ void CConverter2OOXML::WriteOleShape(const CCtrlShapeOle* pOleShape, short shPar
 
 	const std::wstring wsWidth  = std::to_wstring(Transform::HWPUINT2OOXML(pOleShape->GetWidth()));
 	const std::wstring wsHeight = std::to_wstring(Transform::HWPUINT2OOXML(pOleShape->GetHeight()));
-	const std::wstring wsRelID  = AddRelationship(L"chart", L"charts/chart" + std::to_wstring(unChartIndex) + L".xml");
+	const std::wstring wsRelID  = AddRelationship(L"chart", L"charts/chart" + std::to_wstring(unChartIndex) + L".xml", &oState);
 
-	OpenParagraph(shParaShapeID, oBuilder, oState);
+	OpenParagraph(shParaShapeID, shParaStyleID, oBuilder, oState);
 
 	oBuilder.WriteString(L"<w:r><w:rPr><w:noProof/></w:rPr>");
 
@@ -1174,6 +1172,12 @@ void CConverter2OOXML::WriteOleShape(const CCtrlShapeOle* pOleShape, short shPar
 	AddContentType(L"charts/colors" + std::to_wstring(unChartIndex) + L".xml", L"application/vnd.ms-office.chartcolorstyle+xml");
 }
 
+void CConverter2OOXML::WriteContainer(const CCtrlContainer* pContainer, short shParaShapeID, short shParaStyleID, NSStringUtils::CStringBuilder& oBuilder, TConversionState& oState)
+{
+	for (const CCtrlGeneralShape* pGeneralShape : pContainer->GetShapes())
+		WriteShape(pGeneralShape, shParaShapeID, shParaStyleID, oBuilder, oState);
+}
+
 void CConverter2OOXML::WriteSectionSettings(TConversionState& oState)
 {
 	m_oDocXml.WriteString(L"<w:sectPr>");
@@ -1190,21 +1194,34 @@ void CConverter2OOXML::WriteSectionSettings(TConversionState& oState)
 			oState.m_arCtrlsHeadFoot.clear();
 		}
 
+		#define WRITE_ID(id)\
+		if (!id.empty() && id.length() > 6)\
+		{\
+			const std::wstring wsType = id.substr(0, 6);\
+			AddContentType(id, L"application/vnd.openxmlformats-officedocument.wordprocessingml." + wsType + L"+xml");\
+			m_oDocXml.WriteString(L"<w:" + wsType + L"Reference w:type=\"default\" r:id=\"" + AddRelationship(wsType, id, &oState) + L"\"/>");\
+		}
+
+		if (nullptr != oState.m_pPageNum)
+		{
+			const std::wstring wsID = m_oFootnoteConverter.CreatePageNum(oState.m_pPageNum, *this);
+
+			WRITE_ID(wsID);
+
+			oState.m_pPageNum = nullptr;
+		}
+
 		for (const CCtrlHeadFoot* pCtrlHeadFoot : arCtrlsHeadFoot)
 		{
 			const std::wstring wsID = m_oFootnoteConverter.CreateHeadOrFoot((const CCtrlHeadFoot*)pCtrlHeadFoot, *this);
 
-			if (!wsID.empty() && wsID.length() > 6)
-			{
-				const std::wstring wsType = wsID.substr(0, 6);
-
-				AddContentType(wsID, L"application/vnd.openxmlformats-officedocument.wordprocessingml." + wsType + L"+xml");
-
-				m_oDocXml.WriteString(L"<w:" + wsType + L"Reference w:type=\"default\" r:id=\"" + AddRelationship(wsType, wsID) + L"\"/>");
-			}
+			WRITE_ID(wsID);
 		}
 	}
 
+	if (nullptr != oState.m_pNewNumber && ENumType::PAGE == oState.m_pNewNumber->GetNumType())
+		m_oDocXml.WriteString(L"<w:pgNumType w:start=\"" + std::to_wstring(oState.m_pNewNumber->GetNum()) + L"\"/>");
+
 	const CPage *pPage = (nullptr != oState.m_pSectionDef) ? oState.m_pSectionDef->GetPage() : nullptr;
 
 	if (nullptr == pPage)
@@ -1238,12 +1255,12 @@ void CConverter2OOXML::WriteSectionSettings(TConversionState& oState)
 	m_oDocXml.WriteString(L"</w:sectPr>");
 }
 
-void CConverter2OOXML::WritePicture(const CCtrlShapePic* pCtrlPic, short shParaShapeId, NSStringUtils::CStringBuilder& oBuilder, TConversionState& oState)
+void CConverter2OOXML::WritePicture(const CCtrlShapePic* pCtrlPic, short shParaShapeId, short shParaStyleID, NSStringUtils::CStringBuilder& oBuilder, TConversionState& oState)
 {
 	if (nullptr == pCtrlPic)
 		return;
 
-	HWP_STRING sPictureID = SavePicture(pCtrlPic->GetBinDataID());
+	HWP_STRING sPictureID = SavePicture(pCtrlPic->GetBinDataID(), oState);
 
 	if (sPictureID.empty())
 		return;
@@ -1252,11 +1269,13 @@ void CConverter2OOXML::WritePicture(const CCtrlShapePic* pCtrlPic, short shParaS
 
 	WriteCaption((const CCtrlCommon*)pCtrlPic, oBuilder, oState);
 
-	OpenParagraph(shParaShapeId, oBuilder, oState);
+	OpenParagraph(shParaShapeId, shParaStyleID, oBuilder, oState);
 
 	oBuilder.WriteString(L"<w:r><w:rPr><w:noProof/></w:rPr>");
 
-	OpenDrawingNode(pCtrlPic, oBuilder);
+	int nWidth{pCtrlPic->GetImageRectWidth()}, nHeight{pCtrlPic->GetIMageRectHeight()};
+
+	OpenDrawingNode(pCtrlPic, oBuilder, &nWidth, &nHeight);
 
 	oBuilder.WriteString(L"<a:graphic xmlns:a=\"http://schemas.openxmlformats.org/drawingml/2006/main\">");
 	oBuilder.WriteString(L"<a:graphicData uri=\"http://schemas.openxmlformats.org/drawingml/2006/picture\">");
@@ -1264,7 +1283,15 @@ void CConverter2OOXML::WritePicture(const CCtrlShapePic* pCtrlPic, short shParaS
 	oBuilder.WriteString(L"<pic:nvPicPr><pic:cNvPr id=\"" + std::to_wstring(m_ushShapeCount) + L"\" name=\"Shape " + std::to_wstring(m_ushShapeCount) + L"\"/>");
 	oBuilder.WriteString(L"<pic:cNvPicPr/></pic:nvPicPr>");
 	oBuilder.WriteString(L"<pic:blipFill><a:blip r:embed=\"" + sPictureID + L"\"><a:extLst><a:ext uri=\"{28A0092B-C50C-407E-A947-70E740481C1C}\"><a14:useLocalDpi xmlns:a14=\"http://schemas.microsoft.com/office/drawing/2010/main\" val=\"0\"/></a:ext></a:extLst></a:blip><a:srcRect/><a:stretch><a:fillRect/></a:stretch></pic:blipFill>");
-	oBuilder.WriteString(L"<pic:spPr bwMode=\"auto\"><a:xfrm><a:off x=\"0\" y=\"0\"/><a:ext cx=\"" + std::to_wstring(Transform::HWPUINT2OOXML(pCtrlPic->GetFinalWidth())) + L"\" cy=\"" + std::to_wstring(Transform::HWPUINT2OOXML(pCtrlPic->GetFinalHeight())) + L"\"/></a:xfrm>");
+	oBuilder.WriteString(L"<pic:spPr bwMode=\"auto\">");
+
+	oBuilder.WriteString(L"<a:xfrm");
+	if (pCtrlPic->HorzFlip())
+		oBuilder.WriteString(L" flipH=\"1\"");
+	if (pCtrlPic->VertFlip())
+		oBuilder.WriteString(L" flipV=\"1\"");
+
+	oBuilder.WriteString(L"><a:off x=\"0\" y=\"0\"/><a:ext cx=\"" + std::to_wstring(nWidth) + L"\" cy=\"" + std::to_wstring(nHeight) + L"\"/></a:xfrm>");
 	oBuilder.WriteString(L"<a:prstGeom prst=\"rect\"><a:avLst/></a:prstGeom><a:noFill/>");
 	WriteBorderSettings(pCtrlPic, oBuilder);
 	oBuilder.WriteString(L"</pic:spPr></pic:pic></a:graphicData></a:graphic>");
@@ -1272,12 +1299,12 @@ void CConverter2OOXML::WritePicture(const CCtrlShapePic* pCtrlPic, short shParaS
 	oBuilder.WriteString(L"</w:r>");
 }
 
-void CConverter2OOXML::WriteVideo(const CCtrlShapeVideo* pCtrlVideo, short shParaShapeId, NSStringUtils::CStringBuilder& oBuilder, TConversionState& oState)
+void CConverter2OOXML::WriteVideo(const CCtrlShapeVideo* pCtrlVideo, short shParaShapeId, short shParaStyleID, NSStringUtils::CStringBuilder& oBuilder, TConversionState& oState)
 {
 	if (nullptr == pCtrlVideo || 1 != pCtrlVideo->GetVideoType())
 		return;
 
-	HWP_STRING sPictureID = SavePicture(pCtrlVideo->GetThumnailBinID());
+	HWP_STRING sPictureID = SavePicture(pCtrlVideo->GetThumnailBinID(), oState);
 
 	if (sPictureID.empty())
 		return;
@@ -1286,7 +1313,7 @@ void CConverter2OOXML::WriteVideo(const CCtrlShapeVideo* pCtrlVideo, short shPar
 
 	WriteCaption((const CCtrlCommon*)pCtrlVideo, oBuilder, oState);
 
-	OpenParagraph(shParaShapeId, oBuilder, oState);
+	OpenParagraph(shParaShapeId, shParaStyleID, oBuilder, oState);
 
 	oBuilder.WriteString(L"<w:r><w:rPr><w:noProof/></w:rPr>");
 
@@ -1296,7 +1323,7 @@ void CConverter2OOXML::WriteVideo(const CCtrlShapeVideo* pCtrlVideo, short shPar
 	oBuilder.WriteString(L"<a:graphicData uri=\"http://schemas.openxmlformats.org/drawingml/2006/picture\">");
 	oBuilder.WriteString(L"<pic:pic xmlns:pic=\"http://schemas.openxmlformats.org/drawingml/2006/picture\">");
 	oBuilder.WriteString(L"<pic:nvPicPr><pic:cNvPr id=\"" + std::to_wstring(m_ushShapeCount) + L"\" name=\"Video " + std::to_wstring(m_ushShapeCount) + L"\" descr=\"" + pCtrlVideo->GetDesc() + L"\">");
-	oBuilder.WriteString(L"<a:hlinkClick r:id=\"" + AddRelationship(L"hyperlink", pCtrlVideo->GetWebUrl()) + L"\"/></pic:cNvPr>");
+	oBuilder.WriteString(L"<a:hlinkClick r:id=\"" + AddRelationship(L"hyperlink", pCtrlVideo->GetWebUrl(), &oState) + L"\"/></pic:cNvPr>");
 	oBuilder.WriteString(L"<pic:cNvPicPr/></pic:nvPicPr>");
 	oBuilder.WriteString(L"<pic:blipFill><a:blip r:embed=\"" + sPictureID + L"\"><a:extLst>");
 	oBuilder.WriteString(L"<a:ext uri=\"{28A0092B-C50C-407E-A947-70E740481C1C}\"><a14:useLocalDpi xmlns:a14=\"http://schemas.microsoft.com/office/drawing/2010/main\" val=\"0\"/></a:ext>");
@@ -1419,7 +1446,7 @@ bool CConverter2OOXML::SaveSVGFile(const HWP_STRING& sSVG, HWP_STRING& sFileName
 	return true;
 }
 
-HWP_STRING CConverter2OOXML::SavePicture(const HWP_STRING& sBinItemId)
+HWP_STRING CConverter2OOXML::SavePicture(const HWP_STRING& sBinItemId, TConversionState& oState)
 {
 	if (nullptr == m_pContext)
 		return HWP_STRING();
@@ -1452,132 +1479,28 @@ HWP_STRING CConverter2OOXML::SavePicture(const HWP_STRING& sBinItemId)
 	}
 
 	AddContentType(L"media/" + sFileName, L"image/" + NSFile::GetFileExtention(sFileName));
-	return AddRelationship(L"image", L"media/" + sFileName);
+	return AddRelationship(L"image", L"media/" + sFileName, &oState);
 }
 
-HWP_STRING ConvertIntRgbToStr(const THWPColor& oCurrentColor)
-{
-	std::wstring wsSelectedColor;
-	double dMinDistance = DBL_MAX;
-	double dDistance;
-
-	for (const std::pair<THWPColor, std::wstring>& oColor : arHighlightColors)
-	{
-		dDistance = sqrt(pow(oCurrentColor.m_uchRed - oColor.first.m_uchRed, 2) + pow(oCurrentColor.m_uchGreen - oColor.first.m_uchGreen, 2) + pow(oCurrentColor.m_uchBlue - oColor.first.m_uchBlue, 2));
-
-		if (dDistance < dMinDistance)
-		{
-			dMinDistance = dDistance;
-			wsSelectedColor = oColor.second;
-		}
-	}
-
-	return wsSelectedColor;
-}
-
-void CConverter2OOXML::WriteRunnerStyle(short shCharShapeID, NSStringUtils::CStringBuilder& oBuilder, TConversionState& oState, const HWP_STRING& sExternStyles)
+void CConverter2OOXML::WriteRunnerStyle(short shCharShapeID, NSStringUtils::CStringBuilder& oBuilder, TConversionState& oState, const CRunnerStyle& sExternStyles)
 {
 	if (nullptr == m_pContext)
 		return;
 
-	const CHWPRecordCharShape* pCharShape = dynamic_cast<const CHWPRecordCharShape*>(m_pContext->GetCharShape(shCharShapeID));
-
-	if (nullptr == pCharShape)
-		return;
-
-	oState.m_ushLastCharShapeId = shCharShapeID;
-
 	oBuilder.WriteString(L"<w:rPr>");
 
-	HWP_STRING sFontFamily = pCharShape->GetFontName(ELang::LATIN);
-	HWP_STRING sFontFamilyAsian = pCharShape->GetFontName(ELang::HANGUL);
+	if (m_oStyleConverter.GetLastCharShapeId() != shCharShapeID)
+		m_oStyleConverter.WriteDifferenceRunnerStyles(m_oStyleConverter.GetLastCharShapeId(), shCharShapeID, *m_pContext, oBuilder);
 
-	if (sFontFamilyAsian.empty() && !sFontFamily.empty())
-		sFontFamilyAsian = sFontFamily;
-	else if (!sFontFamilyAsian.empty() && sFontFamily.empty())
-		sFontFamily = sFontFamilyAsian;
+	const CHWPRecordCharShape* pCharShape = dynamic_cast<const CHWPRecordCharShape*>(m_pContext->GetCharShape(shCharShapeID));
 
-	if (!sFontFamily.empty() && !sFontFamilyAsian.empty())
+	if (nullptr != pCharShape)
 	{
-		oBuilder.WriteString(L"<w:rFonts w:ascii=\"" + sFontFamily +
-		                            L"\" w:hAnsi=\"" + sFontFamily +
-		                            L"\" w:cs=\"" + sFontFamily +
-		                            L"\" w:eastAsia=\"" + sFontFamilyAsian + L"\"/>");
+		WriteTextBorderStyle(pCharShape->GetBorderFillID(), oBuilder, oState);
+		oState.m_ushLastCharShapeId = shCharShapeID;
 	}
 
-	if (pCharShape->Bold())
-		oBuilder.WriteString(L"<w:b/><w:bCs/>");
-
-	if (pCharShape->Italic())
-		oBuilder.WriteString(L"<w:i/><w:iCs/>");
-
-	const int nHeight = static_cast<int>(((double)(std::abs)(pCharShape->GetHeight()) * ((double)pCharShape->GetRelSize(ELang::LATIN) / 100.) / 100.) * 2.);
-
-	oBuilder.WriteString(L"<w:sz w:val=\"" + std::to_wstring(nHeight) + L"\"/><w:szCs w:val=\"" + std::to_wstring(nHeight) + L"\"/>");
-
-	oBuilder.WriteString(L"<w:color w:val=\"" + Transform::IntColorToHEX(pCharShape->GetTextColor()) + L"\"/>");
-
-	bool bStrike = false;
-
-	if (pCharShape->Underline())
-	{
-		EUnderline eUnderlineType = pCharShape->GetUnderlineType();
-		ELineStyle1 eUnderlineStyle = pCharShape->GetUnderlineStyle();
-
-		if (EUnderline::BOTTOM == eUnderlineType)
-		{
-			oBuilder.WriteString(L"<w:u w:val=\"");
-
-			switch (eUnderlineStyle)
-			{
-				case ELineStyle1::SOLID: oBuilder.WriteString(L"single"); break;
-				case ELineStyle1::DASH: oBuilder.WriteString(L"dash"); break;
-				case ELineStyle1::DOT: oBuilder.WriteString(L"dotted"); break;
-				case ELineStyle1::DASH_DOT: oBuilder.WriteString(L"dotDash"); break;
-				case ELineStyle1::DASH_DOT_DOT: oBuilder.WriteString(L"dotDotDash"); break;
-				case ELineStyle1::LONG_DASH: oBuilder.WriteString(L"dotDash"); break;
-				case ELineStyle1::CIRCLE: oBuilder.WriteString(L"dotted"); break;
-				case ELineStyle1::DOUBLE_SLIM: oBuilder.WriteString(L"double"); break;
-				case ELineStyle1::SLIM_THICK: oBuilder.WriteString(L"double"); break;
-				case ELineStyle1::THICK_SLIM: oBuilder.WriteString(L"double"); break;
-				case ELineStyle1::SLIM_THICK_SLIM: oBuilder.WriteString(L"double"); break;
-				case ELineStyle1::WAVE: oBuilder.WriteString(L"wave"); break;
-				case ELineStyle1::DOUBLE_WAVE: oBuilder.WriteString(L"wavyDouble"); break;
-				case ELineStyle1::THICK_3D: oBuilder.WriteString(L"thick"); break;
-				case ELineStyle1::THICK_3D_REVERS_LI: oBuilder.WriteString(L"thick"); break;
-				case ELineStyle1::SOLID_3D: oBuilder.WriteString(L"thick"); break;
-				case ELineStyle1::SOLID_3D_REVERS_LI: oBuilder.WriteString(L"thick"); break;
-			}
-
-			oBuilder.WriteString(L"\" w:color=\"" + Transform::IntColorToHEX(pCharShape->GetUnderlineColor()) + L"\"/>");
-		}
-		else if (EUnderline::CENTER == eUnderlineType)
-		{
-			if (eUnderlineStyle == ELineStyle1::DOUBLE_SLIM ||
-				eUnderlineStyle == ELineStyle1::DOUBLE_WAVE)
-				oBuilder.WriteString(L"<w:dstrike/>");
-			else
-				oBuilder.WriteString(L"<w:strike/>");
-
-			bStrike = true;
-		}
-	}
-
-	if (!bStrike && pCharShape->StrikeOut())
-		oBuilder.WriteString(L"<w:strike/>");
-
-	//TODO:: на данный момент вычисляется не правильно. Необходимо более точно разобраться
-	// double dSpacing = ((double)pCharShape->GetHeight() / 100.) * ((double)pCharShape->GetSpacing(ELang::HANGUL) / 100) * 0.8 + 0.4;
-	// dSpacing *= 20; // pt to twips (20 = 1440 / 72)
-
-	// oBuilder.WriteString(L"<w:spacing w:val=\"" + std::to_wstring((int)std::round(dSpacing)) + L"\"/>");
-
-	if (nullptr != oState.m_pHighlightColor)
-		oBuilder.WriteString(L"<w:highlight w:val=\"" + ConvertIntRgbToStr(*oState.m_pHighlightColor) + L"\"/>");
-
-	WriteTextBorderStyle(pCharShape->GetBorderFillID(), oBuilder, oState);
-
-	oBuilder.WriteString(sExternStyles);
+	m_oStyleConverter.WriteRunnerProperties(sExternStyles, oBuilder);
 
 	oBuilder.WriteString(L"</w:rPr>");
 
@@ -1611,7 +1534,7 @@ void CConverter2OOXML::WriteTextBorderStyle(short shBorderFillId, NSStringUtils:
 	WriteBorder(pBorderFill->GetLeftBorder(), L"bdr", oBuilder);
 }
 
-void CConverter2OOXML::OpenDrawingNode(const CCtrlCommon* pCtrlShape, NSStringUtils::CStringBuilder& oBuilder)
+void CConverter2OOXML::OpenDrawingNode(const CCtrlObjElement* pCtrlShape, NSStringUtils::CStringBuilder& oBuilder, int* pWidth, int* pHeight)
 {
 	if (nullptr == pCtrlShape)
 		return;
@@ -1620,33 +1543,33 @@ void CConverter2OOXML::OpenDrawingNode(const CCtrlCommon* pCtrlShape, NSStringUt
 
 	if (pCtrlShape->GetTreatAsChar())
 	{
-		oBuilder.WriteString(L"<wp:inline distT=\"" + std::to_wstring(Transform::HWPUINT2OOXML(pCtrlShape->GetTopMargin() / 10)) +
-		                             L"\" distB=\"" + std::to_wstring(Transform::HWPUINT2OOXML(pCtrlShape->GetBottomMargin() / 10)) +
-		                             L"\" distL=\"" + std::to_wstring(Transform::HWPUINT2OOXML(pCtrlShape->GetLeftMargin() / 10)) +
-		                             L"\" distR=\"" + std::to_wstring(Transform::HWPUINT2OOXML(pCtrlShape->GetRightMargin() / 10)) +
+		oBuilder.WriteString(L"<wp:inline distT=\"" + std::to_wstring(Transform::HWPUINT2OOXML(pCtrlShape->GetTopOutMargin() / 10)) +
+		                             L"\" distB=\"" + std::to_wstring(Transform::HWPUINT2OOXML(pCtrlShape->GetBottomOutMargin() / 10)) +
+		                             L"\" distL=\"" + std::to_wstring(Transform::HWPUINT2OOXML(pCtrlShape->GetLeftOutMargin() / 10)) +
+		                             L"\" distR=\"" + std::to_wstring(Transform::HWPUINT2OOXML(pCtrlShape->GetRightOutMargin() / 10)) +
 		                     L"\">");
 
-		WriteShapeExtent(pCtrlShape, oBuilder);
+		WriteShapeExtent(pCtrlShape, oBuilder, pWidth, pHeight);
 	}
 	else
 	{
 		oBuilder.WriteString(L"<wp:anchor behindDoc=\"" + std::wstring((ETextWrap::BEHIND_TEXT == pCtrlShape->GetTextWrap() ? L"1" : L"0")) +
 		                     L"\" relativeHeight=\"" + std::to_wstring(pCtrlShape->GetZOrder()) +
-		                     L"\" distT=\"" + std::to_wstring(Transform::HWPUINT2OOXML(pCtrlShape->GetTopMargin() / 10)) +
-		                     L"\" distB=\"" + std::to_wstring(Transform::HWPUINT2OOXML(pCtrlShape->GetBottomMargin() / 10)) +
-		                     L"\" distL=\"" + std::to_wstring(Transform::HWPUINT2OOXML(pCtrlShape->GetLeftMargin() / 10)) +
-		                     L"\" distR=\"" + std::to_wstring(Transform::HWPUINT2OOXML(pCtrlShape->GetRightMargin() / 10)) +
+		                     L"\" distT=\"" + std::to_wstring(Transform::HWPUINT2OOXML(pCtrlShape->GetTopOutMargin() / 10)) +
+		                     L"\" distB=\"" + std::to_wstring(Transform::HWPUINT2OOXML(pCtrlShape->GetBottomOutMargin() / 10)) +
+		                     L"\" distL=\"" + std::to_wstring(Transform::HWPUINT2OOXML(pCtrlShape->GetLeftOutMargin() / 10)) +
+		                     L"\" distR=\"" + std::to_wstring(Transform::HWPUINT2OOXML(pCtrlShape->GetRightOutMargin() / 10)) +
 		                     L"\" simplePos=\"0\" locked=\"0\" layoutInCell=\"1\" allowOverlap=\"1\">");
 
 		WriteShapePosition(pCtrlShape, oBuilder);
-		WriteShapeExtent(pCtrlShape, oBuilder);
+		WriteShapeExtent(pCtrlShape, oBuilder, pWidth, pHeight);
 		WriteShapeWrapMode(pCtrlShape, oBuilder);
 	}
 
 	WriteShapeProperty(pCtrlShape, oBuilder);
 }
 
-void CConverter2OOXML::CloseDrawingNode(const CCtrlCommon* pCtrlShape, NSStringUtils::CStringBuilder& oBuilder)
+void CConverter2OOXML::CloseDrawingNode(const CCtrlObjElement* pCtrlShape, NSStringUtils::CStringBuilder& oBuilder)
 {
 	if (nullptr == pCtrlShape)
 		return;
@@ -1705,16 +1628,88 @@ void CConverter2OOXML::WriteShapePosition(const CCtrlCommon* pCtrlShape, NSStrin
 		return;
 
 	oBuilder.WriteString(L"<wp:simplePos x=\"0\" y=\"0\"/>");
-	oBuilder.WriteString(L"<wp:positionH relativeFrom=\"" + GetHRelativeFrom(pCtrlShape->GetHorzRelTo()) + L"\"><wp:posOffset>" + std::to_wstring(Transform::HWPUINT2OOXML(pCtrlShape->GetHorzOffset())) + L"</wp:posOffset></wp:positionH>");
+
+	oBuilder.WriteString(L"<wp:positionH relativeFrom=\"");
+
+	if (0 == pCtrlShape->GetHorzOffset())
+	{
+		oBuilder.WriteString(L"margin\">");
+		oBuilder.WriteString(L"<wp:align>left</wp:align>");
+	}
+	else
+	{
+		oBuilder.WriteString(GetHRelativeFrom(pCtrlShape->GetHorzRelTo()) + L"\">");
+		oBuilder.WriteString(L"<wp:posOffset>" + std::to_wstring(Transform::HWPUINT2OOXML(pCtrlShape->GetHorzOffset())) + L"</wp:posOffset>");
+	}
+
+	oBuilder.WriteString(L"</wp:positionH>");
+
 	oBuilder.WriteString(L"<wp:positionV relativeFrom=\"" + GetVRelativeFrom(pCtrlShape->GetVertRelTo()) + L"\"><wp:posOffset>" + std::to_wstring(Transform::HWPUINT2OOXML(pCtrlShape->GetVertOffset())) + L"</wp:posOffset></wp:positionV>");
 }
 
-void CConverter2OOXML::WriteShapeExtent(const CCtrlCommon* pCtrlShape, NSStringUtils::CStringBuilder& oBuilder)
+void CConverter2OOXML::WriteShapeExtent(const CCtrlObjElement* pCtrlShape, NSStringUtils::CStringBuilder& oBuilder, int* pWidth, int* pHeight)
 {
 	if (nullptr == pCtrlShape)
 		return;
 
-	oBuilder.WriteString(L"<wp:extent cx=\"" + std::to_wstring(Transform::HWPUINT2OOXML(pCtrlShape->GetWidth())) + L"\" cy=\"" + std::to_wstring(Transform::HWPUINT2OOXML(pCtrlShape->GetHeight())) + L"\"/>");
+	double dScaleX = 1., dScaleY = 1.;
+
+	const int nOrgWidth{pCtrlShape->GetOrgWidth()}, nOrgHeight{pCtrlShape->GetOrgHeight()};
+	const int nCurWidth{pCtrlShape->GetCurWidth()}, nCurHeight{pCtrlShape->GetCurHeight()};
+
+	if (0 != nCurWidth && 0 != nOrgWidth)
+		dScaleX = (double)nCurWidth / (double)nOrgWidth;
+
+	if (0 != nCurHeight && 0 != nOrgHeight)
+		dScaleY = (double)nCurHeight / (double)nOrgHeight;
+
+	if (0 != pCtrlShape->GetWidth() && 0 != nCurWidth)
+		dScaleX *= (double)pCtrlShape->GetWidth() / (double)nCurWidth;
+
+	if (0 != pCtrlShape->GetHeight() && 0 != nCurHeight)
+		dScaleY *= (double)pCtrlShape->GetHeight() / (double)nCurHeight;
+
+	int nFinalWidth {pCtrlShape->GetWidth() };
+	int nFinalHeight{pCtrlShape->GetHeight()};
+
+	if (0 == nFinalWidth)
+	{
+		if (nullptr != pWidth && 0 != *pWidth)
+			nFinalWidth = *pWidth;
+		else
+			nFinalWidth = nCurWidth;
+	}
+
+	if (nullptr != pWidth && 0 != *pWidth)
+		dScaleX *= (double)*pWidth / (double)nFinalWidth;
+
+	if (0 == nFinalHeight)
+	{
+		if (nullptr != pHeight && 0 != *pHeight)
+			nFinalHeight = *pHeight;
+		else
+			nFinalHeight = nCurHeight;
+	}
+
+	if (nullptr != pHeight && 0 != *pHeight)
+		dScaleY *= (double)*pHeight / (double)nFinalHeight;
+
+	TMatrix oFinalMatrix{pCtrlShape->GetFinalMatrix()};
+	oFinalMatrix.ApplyToSize(dScaleX, dScaleY);
+
+	nFinalWidth = ceil((double)nFinalWidth * dScaleX);
+	nFinalHeight = ceil((double)nFinalHeight * dScaleY);
+
+	nFinalWidth  -= (pCtrlShape->GetLeftInMargin() + pCtrlShape->GetRightInMargin());
+	nFinalHeight -= (pCtrlShape->GetTopInMargin() + pCtrlShape->GetBottomInMargin());
+
+	if (nullptr != pWidth)
+		*pWidth = Transform::HWPUINT2OOXML(nFinalWidth);
+
+	if (nullptr != pHeight)
+		*pHeight = Transform::HWPUINT2OOXML(nFinalHeight);
+
+	oBuilder.WriteString(L"<wp:extent cx=\"" + std::to_wstring(Transform::HWPUINT2OOXML(nFinalWidth)) + L"\" cy=\"" + std::to_wstring(Transform::HWPUINT2OOXML(nFinalHeight)) + L"\"/>");
 	oBuilder.WriteString(L"<wp:effectExtent l=\"0\" t=\"0\" r=\"0\" b=\"0\"/>");
 }
 
@@ -1752,14 +1747,14 @@ void CConverter2OOXML::WriteShapeWrapMode(const CCtrlCommon* pCtrlShape, NSStrin
 	}
 }
 
-void CConverter2OOXML::OpenParagraph(short shParaShapeID, NSStringUtils::CStringBuilder& oBuilder, TConversionState& oState)
+void CConverter2OOXML::OpenParagraph(short shParaShapeID, short shParaStyleID, NSStringUtils::CStringBuilder& oBuilder, TConversionState& oState)
 {
 	if (oState.m_bOpenedP)
 		return;
 
 	oBuilder.WriteString(L"<w:p>");
 	oState.m_bOpenedP = true;
-	WriteParagraphProperties(shParaShapeID, oBuilder, oState);
+	WriteParagraphProperties(shParaShapeID, shParaStyleID, oBuilder, oState);
 }
 
 void CConverter2OOXML::CloseParagraph(NSStringUtils::CStringBuilder& oBuilder, TConversionState& oState)
@@ -1769,16 +1764,19 @@ void CConverter2OOXML::CloseParagraph(NSStringUtils::CStringBuilder& oBuilder, T
 
 	oBuilder.WriteString(L"</w:p>");
 	oState.m_bOpenedP = false;
+
+	oState.m_oLastNode.m_unParaIndex = oState.m_unParaIndex;
+	oState.m_oLastNode.m_eType = TConversionState::TLastNode::ELastNodeType::Paragraph;
 }
 
-void CConverter2OOXML::WriteText(const CParaText* pParaText, const std::vector<TRangeTag>& arRangeTags, short shParaShapeID, NSStringUtils::CStringBuilder& oBuilder, TConversionState& oState)
+void CConverter2OOXML::WriteText(const CParaText* pParaText, const std::vector<TRangeTag>& arRangeTags, short shParaShapeID, short shParaStyleID, NSStringUtils::CStringBuilder& oBuilder, TConversionState& oState)
 {
 	if (nullptr == pParaText)
 		return;
 
 	if (arRangeTags.empty())
 	{
-		WriteText(pParaText->GetText(), shParaShapeID, pParaText->GetCharShapeID(), oBuilder, oState);
+		WriteText(pParaText->GetText(), shParaShapeID, shParaStyleID, pParaText->GetCharShapeID(), oBuilder, oState);
 		return;
 	}
 
@@ -1786,20 +1784,22 @@ void CConverter2OOXML::WriteText(const CParaText* pParaText, const std::vector<T
 	int nParaTextPosition = pParaText->GetStartIDx();
 	int unStartText = 0;
 
+	TColor *pHighlightColor = nullptr;
+
 	for (size_t unTextPosition = 0; unTextPosition < wsText.length(); ++unTextPosition)
 	{
 		for (const TRangeTag& oRangeTag : arRangeTags)
 		{
 			if (unTextPosition + nParaTextPosition == oRangeTag.m_nStartPos)
 			{
-				WriteText(wsText.substr(unStartText, unTextPosition - unStartText), shParaShapeID, pParaText->GetCharShapeID(), oBuilder, oState);
+				WriteText(wsText.substr(unStartText, unTextPosition - unStartText), shParaShapeID, shParaStyleID, pParaText->GetCharShapeID(), oBuilder, oState);
 				unStartText = unTextPosition;
 
 				switch (oRangeTag.m_chType)
 				{
 					case 0x02: //highlight
 					{
-						oState.m_pHighlightColor = new THWPColor{(unsigned char)oRangeTag.m_arData[0], (unsigned char)oRangeTag.m_arData[1], (unsigned char)oRangeTag.m_arData[2]};
+						pHighlightColor = new TColor{(unsigned char)oRangeTag.m_arData[0], (unsigned char)oRangeTag.m_arData[1], (unsigned char)oRangeTag.m_arData[2]};
 						break;
 					}
 					default:
@@ -1808,17 +1808,27 @@ void CConverter2OOXML::WriteText(const CParaText* pParaText, const std::vector<T
 			}
 			else if (unTextPosition + nParaTextPosition == oRangeTag.m_nEndPos)
 			{
-				WriteText(wsText.substr(unStartText, unTextPosition - unStartText), shParaShapeID, pParaText->GetCharShapeID(), oBuilder, oState);
+				if (nullptr == pHighlightColor)
+				{
+					WriteText(wsText.substr(unStartText, unTextPosition - unStartText), shParaShapeID, shParaStyleID, pParaText->GetCharShapeID(), oBuilder, oState);
+					unStartText = unTextPosition;
+					continue;
+				}
+
+				CRunnerStyle oRunnerStyle;
+				oRunnerStyle.SetHighlight(NormalizeHighlightColor(*pHighlightColor));
+
+				WriteText(wsText.substr(unStartText, unTextPosition - unStartText), shParaShapeID, shParaStyleID, pParaText->GetCharShapeID(), oBuilder, oState, oRunnerStyle);
 				unStartText = unTextPosition;
 
 				switch (oRangeTag.m_chType)
 				{
 					case 0x02: //highlight
 					{
-						if (nullptr != oState.m_pHighlightColor)
+						if (nullptr != pHighlightColor)
 						{
-							delete oState.m_pHighlightColor;
-							oState.m_pHighlightColor = nullptr;
+							delete pHighlightColor;
+							pHighlightColor = nullptr;
 						}
 						break;
 					}
@@ -1830,7 +1840,7 @@ void CConverter2OOXML::WriteText(const CParaText* pParaText, const std::vector<T
 	}
 
 	if (unStartText < wsText.length())
-		WriteText(wsText.substr(unStartText), shParaShapeID, pParaText->GetCharShapeID(), oBuilder, oState);
+		WriteText(wsText.substr(unStartText), shParaShapeID, shParaStyleID, pParaText->GetCharShapeID(), oBuilder, oState);
 }
 
 std::vector<std::wstring> SplitText(const std::wstring& wsText)
@@ -1864,21 +1874,24 @@ std::vector<std::wstring> SplitText(const std::wstring& wsText)
 	return arTexts;
 }
 
-void CConverter2OOXML::WriteText(const HWP_STRING& wsText, short shParaShapeID, short shCharShapeID, NSStringUtils::CStringBuilder& oBuilder, TConversionState& oState)
+void CConverter2OOXML::WriteText(const HWP_STRING& wsText, short shParaShapeID, short shParaStyleID, short shCharShapeID, NSStringUtils::CStringBuilder& oBuilder, TConversionState& oState, const CRunnerStyle& oExternalStyle)
 {
-	OpenParagraph(shParaShapeID, oBuilder, oState);
+	if (!oState.m_bOpenedP && wsText.empty())
+		return;
+
+	OpenParagraph(shParaShapeID, shParaStyleID, oBuilder, oState);
 
 	if (wsText.empty())
 	{
 		oBuilder.WriteString(L"<w:r>");
-		WriteRunnerStyle(shCharShapeID, oBuilder, oState);
+		WriteRunnerStyle(shCharShapeID, oBuilder, oState, oExternalStyle);
 		oBuilder.WriteString(L"</w:r>");
 		return;
 	}
 
 	oBuilder.WriteString(L"<w:r>");
 
-	WriteRunnerStyle(shCharShapeID, oBuilder, oState);
+	WriteRunnerStyle(shCharShapeID, oBuilder, oState, oExternalStyle);
 
 	oBuilder.WriteString(L"<w:t");
 
@@ -1905,7 +1918,7 @@ void CConverter2OOXML::WriteText(const HWP_STRING& wsText, short shParaShapeID,
 	{
 		oBuilder.WriteString(L"<w:r>");
 
-		WriteRunnerStyle(shCharShapeID, oBuilder, oState);
+		WriteRunnerStyle(shCharShapeID, oBuilder, oState, oExternalStyle);
 
 		if (!wsTextElement.empty())
 		{
@@ -2032,13 +2045,16 @@ void CConverter2OOXML::WriteLineSettings(ELineStyle2 eLineStyle, int nColor, int
 
 void CConverter2OOXML::WriteBorderSettings(const CCtrlShapePic* pCtrlPic, NSStringUtils::CStringBuilder& oBuilder)
 {
-	if (nullptr == pCtrlPic)
+	if (nullptr == pCtrlPic || nullptr == m_pContext)
 		return;
 
-	WriteLineSettings(pCtrlPic->GetBorderLineStyle(), pCtrlPic->GetBorderColor(), pCtrlPic->GetBorderThick(), pCtrlPic->GetBorderCompoundLineType(), oBuilder);
+	if (EHanType::HWP == m_pContext->GetType())
+		WriteLineSettings(pCtrlPic->GetBorderLineStyle(), pCtrlPic->GetBorderColor(), pCtrlPic->GetBorderThick(), pCtrlPic->GetBorderCompoundLineType(), oBuilder);
+	else if (EHanType::HWPX == m_pContext->GetType())
+		WriteLineSettings(pCtrlPic->GetLineStyle(), pCtrlPic->GetLineColor(), pCtrlPic->GetLineThick(), 1, oBuilder);
 }
 
-void CConverter2OOXML::WriteAutoNumber(const CCtrlAutoNumber* pAutoNumber,short shParaShapeID, short shCharShapeID, NSStringUtils::CStringBuilder& oBuilder, TConversionState& oState)
+void CConverter2OOXML::WriteAutoNumber(const CCtrlAutoNumber* pAutoNumber, short shParaShapeID, short shParaStyleID, short shCharShapeID, NSStringUtils::CStringBuilder& oBuilder, TConversionState& oState)
 {
 	if (nullptr == pAutoNumber)
 		return;
@@ -2051,7 +2067,7 @@ void CConverter2OOXML::WriteAutoNumber(const CCtrlAutoNumber* pAutoNumber,short
 	{
 		case ENumType::PAGE:
 		{
-			OpenParagraph(shParaShapeID, oBuilder, oState);
+			OpenParagraph(shParaShapeID, shParaStyleID, oBuilder, oState);
 			oBuilder.WriteString(L"<w:fldSimple w:instr=\"PAGE \\* ARABIC\"><w:r><w:t>1</w:t></w:r></w:fldSimple>");
 			return;
 		}
@@ -2059,17 +2075,25 @@ void CConverter2OOXML::WriteAutoNumber(const CCtrlAutoNumber* pAutoNumber,short
 			ushValue = m_ushPageCount; break;
 		case ENumType::FOOTNOTE:
 		{
-			OpenParagraph(shParaShapeID, oBuilder, oState);
+			OpenParagraph(shParaShapeID, shParaStyleID, oBuilder, oState);
 			oBuilder.WriteString(L"<w:r>");
-			WriteRunnerStyle(shCharShapeID, oBuilder, oState, L"<w:vertAlign w:val=\"superscript\"/>");
+
+			CRunnerStyle oRunnerStyle;
+			oRunnerStyle.SetVerticalAlign(EVerticalAlignRun::Superscript);
+			WriteRunnerStyle(shCharShapeID, oBuilder, oState, oRunnerStyle);
+
 			oBuilder.WriteString(L"<w:footnoteRef/></w:r>");
 			return;
 		}
 		case ENumType::ENDNOTE:
 		{
-			OpenParagraph(shParaShapeID, oBuilder, oState);
+			OpenParagraph(shParaShapeID, shParaStyleID, oBuilder, oState);
 			oBuilder.WriteString(L"<w:r>");
-			WriteRunnerStyle(shCharShapeID, oBuilder, oState, L"<w:vertAlign w:val=\"superscript\"/>");
+
+			CRunnerStyle oRunnerStyle;
+			oRunnerStyle.SetVerticalAlign(EVerticalAlignRun::Superscript);
+			WriteRunnerStyle(shCharShapeID, oBuilder, oState, oRunnerStyle);
+
 			oBuilder.WriteString(L"<w:endnoteRef/></w:r>");
 			return;
 		}
@@ -2096,20 +2120,27 @@ void CConverter2OOXML::WriteAutoNumber(const CCtrlAutoNumber* pAutoNumber,short
 	if (!wsType.empty())
 		oBuilder.WriteString(L"<w:fldSimple w:instr=\" SEQ " + wsType + L" \\* ARABIC \">");
 
-	WriteText(std::to_wstring(ushValue), shParaShapeID, shCharShapeID, oBuilder, oState);
+	WriteText(std::to_wstring(ushValue), shParaShapeID, shParaStyleID, shCharShapeID, oBuilder, oState);
 
 	if (!wsType.empty())
 		oBuilder.WriteString(L"</w:fldSimple>");
 }
 
-HWP_STRING CConverter2OOXML::AddRelationship(const HWP_STRING& wsType, const HWP_STRING& wsTarget)
+HWP_STRING CConverter2OOXML::AddRelationship(const HWP_STRING& wsType, const HWP_STRING& wsTarget, TConversionState* pState)
 {
 	if (wsType.empty() || wsTarget.empty())
 		return HWP_STRING();
 
-	VECTOR<TRelationship>::const_iterator itFound = std::find_if(m_arRelationships.cbegin(), m_arRelationships.cend(), [wsTarget](const TRelationship& oRelationship){ return wsTarget == oRelationship.m_wsTarget; });
+	VECTOR<TRelationship> *pRelationships = nullptr;
 
-	if (m_arRelationships.cend() != itFound)
+	if (nullptr != pState && nullptr != pState->m_pRelationships)
+		pRelationships = pState->m_pRelationships;
+	else
+		pRelationships = &m_arRelationships;
+
+	VECTOR<TRelationship>::const_iterator itFound = std::find_if(pRelationships->cbegin(), pRelationships->cend(), [wsTarget](const TRelationship& oRelationship){ return wsTarget == oRelationship.m_wsTarget; });
+
+	if (pRelationships->cend() != itFound)
 		return itFound->m_wsID;
 
 	if (L"hyperlink" == wsType)
@@ -2117,12 +2148,12 @@ HWP_STRING CConverter2OOXML::AddRelationship(const HWP_STRING& wsType, const HWP
 		NSStringUtils::CStringBuilder oBuilder;
 		oBuilder.WriteEncodeXmlString(wsTarget);
 
-		m_arRelationships.push_back({L"rId" + std::to_wstring(m_arRelationships.size() + 1), wsType, oBuilder.GetData()});
+		pRelationships->push_back({L"rId" + std::to_wstring(pRelationships->size() + 1), wsType, oBuilder.GetData()});
 	}
 	else
-		m_arRelationships.push_back({L"rId" + std::to_wstring(m_arRelationships.size() + 1), wsType, wsTarget});
+		pRelationships->push_back({L"rId" + std::to_wstring(pRelationships->size() + 1), wsType, wsTarget});
 
-	return m_arRelationships.back().m_wsID;
+	return pRelationships->back().m_wsID;
 }
 
 void CConverter2OOXML::AddContentType(const HWP_STRING& wsName, const HWP_STRING& wsType)
@@ -2193,10 +2224,4 @@ HWP_STRING CConverter2OOXML::GetTempDirectory() const
 {
 	return m_sTempDirectory;
 }
-
-TConversionState::TConversionState()
-	: m_bOpenedP(false), m_bOpenedR(false), m_bIsNote(false), m_bInTextBox(false), m_ushLastCharShapeId(-1), m_ushSecdIndex(0), m_unParaIndex(0), m_pHighlightColor(nullptr),
-      m_pSectionDef(nullptr), m_pColumnDef(nullptr), m_eBreakType(EBreakType::None)
-{}
-
 }
diff --git a/HwpFile/HwpDoc/Conversion/Converter2OOXML.h b/HwpFile/HwpDoc/Conversion/Converter2OOXML.h
index 29f28b6239..10510e1887 100644
--- a/HwpFile/HwpDoc/Conversion/Converter2OOXML.h
+++ b/HwpFile/HwpDoc/Conversion/Converter2OOXML.h
@@ -3,12 +3,9 @@
 
 #include "../../../DesktopEditor/common/StringBuilder.h"
 
-#include "../Paragraph/CtrlField.h"
 #include "../Paragraph/CtrlAutoNumber.h"
-#include "../Paragraph/CtrlSectionDef.h"
 #include "../Paragraph/CtrlShapeVideo.h"
 #include "../Paragraph/CtrlCharacter.h"
-#include "../Paragraph/CtrlColumnDef.h"
 #include "../Paragraph/CtrlShapePic.h"
 #include "../Paragraph/CtrlShapeOle.h"
 #include "../Paragraph/CtrlEqEdit.h"
@@ -21,58 +18,13 @@
 #include "FootnoteConverter.h"
 #include "OleConverter.h"
 #include "NumberingConverter.h"
+#include "StyleConverter.h"
 
 #include "../Common/WriterContext.h"
 
 namespace HWP
 {
-struct THWPColor
-{
-	BYTE m_uchRed;
-	BYTE m_uchGreen;
-	BYTE m_uchBlue;
-};
 
-struct TConversionState
-{
-	bool m_bOpenedP;
-	bool m_bOpenedR;
-	bool m_bIsNote;
-
-	bool m_bInTextBox; // TODO:: используется, чтобы в wps:txbx не появилась новая фигура (посмотреть этот момент нужно подробнее)
-
-	unsigned short m_ushLastCharShapeId;
-
-	unsigned short m_ushSecdIndex;
-	unsigned int m_unParaIndex;
-
-	THWPColor *m_pHighlightColor;
-
-	VECTOR<const CCtrlHeadFoot*> m_arCtrlsHeadFoot; //only for hwpx
-	std::stack<int> m_arOpenedBookmarks;
-
-	const CCtrlSectionDef* m_pSectionDef;
-	const CCtrlColumnDef*  m_pColumnDef;
-
-	enum class EBreakType
-	{
-		Page,
-		Column,
-		TextWrapping,
-		None
-	} m_eBreakType;
-
-	std::map<unsigned int, const CCtrlField*> m_mOpenField;
-
-	TConversionState();
-};
-
-struct TRelationship
-{
-	HWP_STRING m_wsID;
-	HWP_STRING m_wsType;
-	HWP_STRING m_wsTarget;
-};
 
 struct TContentType
 {
@@ -89,10 +41,11 @@ enum class ECellCreator
 
 class CConverter2OOXML
 {
+	friend class CNumberingConverter;
+
 	CWriterContext * m_pContext;
 	HWP_STRING m_sTempDirectory;
 
-	NSStringUtils::CStringBuilder m_oStylesXml;   // styles.xml
 	NSStringUtils::CStringBuilder m_oDocXml;      // document.xml
 	NSStringUtils::CStringBuilder m_oNoteXmlRels; // footnotes.xml.rels
 	NSStringUtils::CStringBuilder m_oWebSettings; // webSettings.xml
@@ -104,6 +57,7 @@ class CConverter2OOXML
 	CNumberingConverter m_oNumberingConverter;
 	CFootnoteConverter m_oFootnoteConverter;
 	COleConverter m_oOleConverter;
+	CStyleConverter m_oStyleConverter;
 
 	unsigned short m_ushShapeCount;
 	unsigned short m_ushPageCount;
@@ -119,56 +73,60 @@ class CConverter2OOXML
 
 	bool IsRasterFormat(const HWP_STRING& sFormat);
 
-	void WriteParagraphProperties(short shParaShapeID, NSStringUtils::CStringBuilder& oBuilder, TConversionState& oState);
-	void WriteTable(const CCtrlTable* pTable, short shParaShapeID, NSStringUtils::CStringBuilder& oBuilder, TConversionState& oState);
-	void WriteTableProperties(const CCtrlTable* pTable, short shParaShapeID, NSStringUtils::CStringBuilder& oBuilder, TConversionState& oState);
+	void WriteParagraphProperties(short shParaShapeID, short shParaStyleID, NSStringUtils::CStringBuilder& oBuilder, TConversionState& oState);
+	void WriteTable(const CCtrlTable* pTable, short shParaShapeID, short shParaStyleID, NSStringUtils::CStringBuilder& oBuilder, TConversionState& oState);
+	void WriteTableProperties(const CCtrlTable* pTable, short shParaShapeID, short shParaStyleID, NSStringUtils::CStringBuilder& oBuilder, TConversionState& oState);
 	void WriteCell(const CTblCell* pCell, NSStringUtils::CStringBuilder& oBuilder, TConversionState& oState, ECellCreator eCellCreator);
 	void WriteCellProperties(short shBorderFillID, NSStringUtils::CStringBuilder& oBuilder);
 	void WriteBorder(const TBorder& oBorder, const HWP_STRING& sBorderName, NSStringUtils::CStringBuilder& oBuilder);
 
-	void WriteGeometryShape(const CCtrlGeneralShape* pGeneralShape, short shParaShapeID, NSStringUtils::CStringBuilder& oBuilder, TConversionState& oState);
-	void WriteEqEditShape(const CCtrlEqEdit* pEqEditShape, short shParaShapeID, NSStringUtils::CStringBuilder& oBuilder, TConversionState& oState);
-	void WriteOleShape(const CCtrlShapeOle* pOleShape, short shParaShapeID, NSStringUtils::CStringBuilder& oBuilder, TConversionState& oState);
+	void WriteGeometryShape(const CCtrlGeneralShape* pGeneralShape, short shParaShapeID, short shParaStyleID, NSStringUtils::CStringBuilder& oBuilder, TConversionState& oState);
+	void WriteEqEditShape(const CCtrlEqEdit* pEqEditShape, short shParaShapeID, short shParaStyleID, NSStringUtils::CStringBuilder& oBuilder, TConversionState& oState);
+	void WriteOleShape(const CCtrlShapeOle* pOleShape, short shParaShapeID, short shParaStyleID, NSStringUtils::CStringBuilder& oBuilder, TConversionState& oState);
+
+	void WriteContainer(const CCtrlContainer* pContainer, short shParaShapeID, short shParaStyleID, NSStringUtils::CStringBuilder& oBuilder, TConversionState& oState);
 
 	void WriteSectionSettings(TConversionState& oState);
-	void WritePicture(const CCtrlShapePic* pCtrlPic, short shParaShapeID, NSStringUtils::CStringBuilder& oBuilder, TConversionState& oState);
-	void WriteVideo(const CCtrlShapeVideo* pCtrlVideo, short shParaShapeID, NSStringUtils::CStringBuilder& oBuilder, TConversionState& oState);
+	void WritePicture(const CCtrlShapePic* pCtrlPic, short shParaShapeID, short shParaStyleID, NSStringUtils::CStringBuilder& oBuilder, TConversionState& oState);
+	void WriteVideo(const CCtrlShapeVideo* pCtrlVideo, short shParaShapeID, short shParaStyleID, NSStringUtils::CStringBuilder& oBuilder, TConversionState& oState);
 	bool SaveSVGFile(const HWP_STRING& sSVG, HWP_STRING& sFileName);
-	HWP_STRING SavePicture(const HWP_STRING& sBinItemId);
+	HWP_STRING SavePicture(const HWP_STRING& sBinItemId, TConversionState& oState);
 
-	void WriteParaShapeProperties(short shParaShapeID, NSStringUtils::CStringBuilder& oBuilder, TConversionState& oState);
-	void WriteRunnerStyle(short shCharShapeID, NSStringUtils::CStringBuilder& oBuilder, TConversionState& oState, const HWP_STRING& sExternStyles = L"");
+	void WriteParaShapeProperties(short shParaShapeID, short shParaStyleID, NSStringUtils::CStringBuilder& oBuilder, TConversionState& oState);
+	void WriteRunnerStyle(short shCharShapeID, NSStringUtils::CStringBuilder& oBuilder, TConversionState& oState, const CRunnerStyle& sExternStyles = CRunnerStyle());
 	void WriteTextBorderStyle(short shBorderFillId, NSStringUtils::CStringBuilder& oBuilder, TConversionState& oState);
 
-	void OpenDrawingNode(const CCtrlCommon* pCtrlShape, NSStringUtils::CStringBuilder& oBuilder);
-	void CloseDrawingNode(const CCtrlCommon* pCtrlShape, NSStringUtils::CStringBuilder& oBuilder);
+	void OpenDrawingNode(const CCtrlObjElement* pCtrlShape, NSStringUtils::CStringBuilder& oBuilder, int* pWidth = nullptr, int *pHeight = nullptr);
+	void CloseDrawingNode(const CCtrlObjElement* pCtrlShape, NSStringUtils::CStringBuilder& oBuilder);
 
 	void WriteShapePosition(const CCtrlCommon* pCtrlShape, NSStringUtils::CStringBuilder& oBuilder);
-	void WriteShapeExtent(const CCtrlCommon* pCtrlShape, NSStringUtils::CStringBuilder& oBuilder);
+	void WriteShapeExtent(const CCtrlObjElement* pCtrlShape, NSStringUtils::CStringBuilder& oBuilder, int* pWidth = nullptr, int *pHeight = nullptr);
 	void WriteShapeWrapMode(const CCtrlCommon* pCtrlShape, NSStringUtils::CStringBuilder& oBuilder);
 	void WriteShapeProperty(const CCtrlCommon* pCtrlShape, NSStringUtils::CStringBuilder& oBuilder);
 
-	void OpenParagraph(short shParaShapeID, NSStringUtils::CStringBuilder& oBuilder, TConversionState& oState);
+	void OpenParagraph(short shParaShapeID, short shParaStyleID, NSStringUtils::CStringBuilder& oBuilder, TConversionState& oState);
 	void CloseParagraph(NSStringUtils::CStringBuilder& oBuilder, TConversionState& oState);
 
-	void WriteText(const CParaText* pParaText, const VECTOR<TRangeTag>& arRangeTags, short shParaShapeID, NSStringUtils::CStringBuilder& oBuilder, TConversionState& oState);
-	void WriteText(const HWP_STRING& wsText, short shParaShapeID, short shCharShapeID, NSStringUtils::CStringBuilder& oBuilder, TConversionState& oState);
+	void WriteText(const CParaText* pParaText, const VECTOR<TRangeTag>& arRangeTags, short shParaShapeID, short shParaStyleID, NSStringUtils::CStringBuilder& oBuilder, TConversionState& oState);
+	void WriteText(const HWP_STRING& wsText, short shParaShapeID, short shParaStyleID, short shCharShapeID, NSStringUtils::CStringBuilder& oBuilder, TConversionState& oState, const CRunnerStyle& oExternalStyle = CRunnerStyle());
 	void WriteLineSettings(const CCtrlGeneralShape* pCtrlGeneralShape, NSStringUtils::CStringBuilder& oBuilder);
 	void WriteLineSettings(ELineStyle2 eLineStyle, int nColor, int nThick, HWP_BYTE nCompoundLineType, NSStringUtils::CStringBuilder& oBuilder);
 	void WriteBorderSettings(const CCtrlShapePic* pCtrlPic, NSStringUtils::CStringBuilder& oBuilder);
 
-	void WriteAutoNumber(const CCtrlAutoNumber* pAutoNumber, short shParaShapeID, short shCharShapeID, NSStringUtils::CStringBuilder& oBuilder, TConversionState& oState);
-	void WriteCharacter(const CCtrlCharacter* pCharacter, short shParaShapeID, NSStringUtils::CStringBuilder& oBuilder, TConversionState& oState);
-	void WriteShape(const CCtrlGeneralShape* pShape, short shParaShapeID, NSStringUtils::CStringBuilder& oBuilder, TConversionState& oState);
+	void WriteAutoNumber(const CCtrlAutoNumber* pAutoNumber, short shParaShapeID, short shParaStyleID, short shCharShapeID, NSStringUtils::CStringBuilder& oBuilder, TConversionState& oState);
+	void WriteCharacter(const CCtrlCharacter* pCharacter, short shParaShapeID, short shParaStyleID, NSStringUtils::CStringBuilder& oBuilder, TConversionState& oState);
+	void WriteShape(const CCtrlGeneralShape* pShape, short shParaShapeID, short shParaStyleID, NSStringUtils::CStringBuilder& oBuilder, TConversionState& oState);
 
 	void WriteNote(const CCtrlNote* pNote, short shParaShapeID, NSStringUtils::CStringBuilder& oBuilder, TConversionState& oState);
 
-	void WriteField(const CCtrlField* pHyperlink, short shParaShapeID, NSStringUtils::CStringBuilder& oBuilder, TConversionState& oState);
+	void WriteField(const CCtrlField* pHyperlink, short shParaShapeID, short shParaStyleID, NSStringUtils::CStringBuilder& oBuilder, TConversionState& oState);
 	void CloseField(const CCtrlField* pHyperlink, NSStringUtils::CStringBuilder& oBuilder, TConversionState& oState);
 
 	void WriteCaption(const CCtrlCommon* pCtrlCommon, NSStringUtils::CStringBuilder& oBuilder, TConversionState& oState);
 
-	HWP_STRING AddRelationship(const HWP_STRING& wsType, const HWP_STRING& wsTarget);
+	void WriteEmptyParagraph(short shParaShapeID, short shParaStyleID, short shCharShapeID, NSStringUtils::CStringBuilder& oBuilder, TConversionState& oState);
+
+	HWP_STRING AddRelationship(const HWP_STRING& wsType, const HWP_STRING& wsTarget, TConversionState* pState = nullptr);
 	void AddContentType(const HWP_STRING& wsName, const HWP_STRING& wsType);
 	void AddDefaultContentType(const HWP_STRING& wsName);
 public:
diff --git a/HwpFile/HwpDoc/Conversion/FootnoteConverter.cpp b/HwpFile/HwpDoc/Conversion/FootnoteConverter.cpp
index 7f0f8460b6..4d97ab2d90 100644
--- a/HwpFile/HwpDoc/Conversion/FootnoteConverter.cpp
+++ b/HwpFile/HwpDoc/Conversion/FootnoteConverter.cpp
@@ -54,6 +54,9 @@ std::wstring CFootnoteConverter::CreateHeadOrFoot(const CCtrlHeadFoot* pCtrlHead
 
 	TConversionState oState;
 
+	VECTOR<TRelationship> arRelationships;
+	oState.m_pRelationships = &arRelationships;
+
 	for (const CHWPPargraph* pParagraphs : pCtrlHeadFoot->GetParagraphs())
 		oConverter.WriteParagraph(pParagraphs, oNewDocumentBuilder, oState);
 
@@ -104,6 +107,156 @@ std::wstring CFootnoteConverter::CreateHeadOrFoot(const CCtrlHeadFoot* pCtrlHead
 	oFile.WriteStringUTF8(oNewDocumentBuilder.GetData());
 	oFile.WriteStringUTF8(L"</w:" + wsNodeName + L">");
 
+	oFile.CloseFile();
+
+	if (arRelationships.empty())
+		return wsFileName;
+
+	// TODO:: пока это копия из Converter2OOXML
+	NSFile::CFileBinary oRelsWriter;
+	if (oRelsWriter.CreateFileW(oConverter.GetTempDirectory() + L"/word/_rels/" + wsFileName + L".rels"))
+	{
+		oRelsWriter.WriteStringUTF8(L"<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?><Relationships xmlns=\"http://schemas.openxmlformats.org/package/2006/relationships\">");
+
+		for (const TRelationship& oRelationship : arRelationships)
+		{
+			oRelsWriter.WriteStringUTF8(L"<Relationship Id=\"" + oRelationship.m_wsID + L"\" Type=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships/" + oRelationship.m_wsType + L"\" Target=\"" + oRelationship.m_wsTarget + L'\"');
+
+			if (L"hyperlink" == oRelationship.m_wsType)
+				oRelsWriter.WriteStringUTF8(L" TargetMode=\"External\"/>");
+			else
+				oRelsWriter.WriteStringUTF8(L"/>");
+			}
+
+		oRelsWriter.WriteStringUTF8(L"</Relationships>");
+
+		oRelsWriter.CloseFile();
+	}
+
+	return wsFileName;
+}
+
+std::wstring CFootnoteConverter::CreatePageNum(const CCtrlPageNumPos* pCtrlPageNumPos, CConverter2OOXML& oConverter)
+{
+	if (nullptr == pCtrlPageNumPos || ENumberShape2::DIGIT != pCtrlPageNumPos->GetFormatType() ||
+	    ENumPos::NONE == pCtrlPageNumPos->GetPos())
+		return std::wstring();
+
+	std::wstring wsNodeName, wsJs;
+
+	switch(pCtrlPageNumPos->GetPos())
+	{
+		case ENumPos::TOP_LEFT:
+		{
+			wsNodeName = L"hdr";
+			wsJs = L"left";
+			break;
+		}
+		case ENumPos::TOP_CENTER:
+		case ENumPos::TOP_OUTER:
+		case ENumPos::TOP_INNER:
+		{
+			wsNodeName = L"hdr";
+			wsJs = L"center";
+			break;
+		}
+		case ENumPos::TOP_RIGHT:
+		{
+			wsNodeName = L"hdr";
+			wsJs = L"right";
+			break;
+		}
+		case ENumPos::BOTTOM_LEFT:
+		{
+			wsNodeName = L"ftr";
+			wsJs = L"left";
+			break;
+		}
+		case ENumPos::BOTTOM_CENTER:
+		case ENumPos::BOTTOM_OUTER:
+		case ENumPos::BOTTOM_INNER:
+		{
+			wsNodeName = L"ftr";
+			wsJs = L"center";
+			break;
+		}
+		case ENumPos::BOTTOM_RIGHT:
+		{
+			wsNodeName = L"ftr";
+			wsJs = L"right";
+			break;
+		}
+		case ENumPos::NONE:
+			break;
+	}
+
+	const std::wstring wsFileName((L"hdr" == wsNodeName) ? (L"header" + std::to_wstring(++m_ushHeaderCount)) : (L"footer" + std::to_wstring(++m_ushFooterCount)) + L".xml");
+
+	NSFile::CFileBinary oFile;
+	if (!oFile.CreateFileW(oConverter.GetTempDirectory() + L"/word/" + wsFileName))
+		return std::wstring();
+
+	oFile.WriteStringUTF8(L"<w:" + wsNodeName);
+	oFile.WriteStringUTF8(L" xmlns:wpc=\"http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas\" "
+	                      "xmlns:cx=\"http://schemas.microsoft.com/office/drawing/2014/chartex\" "
+	                      "xmlns:cx1=\"http://schemas.microsoft.com/office/drawing/2015/9/8/chartex\" "
+	                      "xmlns:cx2=\"http://schemas.microsoft.com/office/drawing/2015/10/21/chartex\" "
+	                      "xmlns:cx3=\"http://schemas.microsoft.com/office/drawing/2016/5/9/chartex\" "
+	                      "xmlns:cx4=\"http://schemas.microsoft.com/office/drawing/2016/5/10/chartex\" "
+	                      "xmlns:cx5=\"http://schemas.microsoft.com/office/drawing/2016/5/11/chartex\" "
+	                      "xmlns:cx6=\"http://schemas.microsoft.com/office/drawing/2016/5/12/chartex\" "
+	                      "xmlns:cx7=\"http://schemas.microsoft.com/office/drawing/2016/5/13/chartex\" "
+	                      "xmlns:cx8=\"http://schemas.microsoft.com/office/drawing/2016/5/14/chartex\" "
+	                      "xmlns:mc=\"http://schemas.openxmlformats.org/markup-compatibility/2006\" "
+	                      "xmlns:aink=\"http://schemas.microsoft.com/office/drawing/2016/ink\" "
+	                      "xmlns:am3d=\"http://schemas.microsoft.com/office/drawing/2017/model3d\" "
+	                      "xmlns:o=\"urn:schemas-microsoft-com:office:office\" "
+	                      "xmlns:oel=\"http://schemas.microsoft.com/office/2019/extlst\" "
+	                      "xmlns:r=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships\" "
+	                      "xmlns:m=\"http://schemas.openxmlformats.org/officeDocument/2006/math\" "
+	                      "xmlns:v=\"urn:schemas-microsoft-com:vml\" "
+	                      "xmlns:wp14=\"http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing\" "
+	                      "xmlns:wp=\"http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing\" "
+	                      "xmlns:w10=\"urn:schemas-microsoft-com:office:word\" "
+	                      "xmlns:w=\"http://schemas.openxmlformats.org/wordprocessingml/2006/main\" "
+	                      "xmlns:w14=\"http://schemas.microsoft.com/office/word/2010/wordml\" "
+	                      "xmlns:w15=\"http://schemas.microsoft.com/office/word/2012/wordml\" "
+	                      "xmlns:w16cex=\"http://schemas.microsoft.com/office/word/2018/wordml/cex\" "
+	                      "xmlns:w16cid=\"http://schemas.microsoft.com/office/word/2016/wordml/cid\" "
+	                      "xmlns:w16=\"http://schemas.microsoft.com/office/word/2018/wordml\" "
+	                      "xmlns:w16du=\"http://schemas.microsoft.com/office/word/2023/wordml/word16du\" "
+	                      "xmlns:w16sdtdh=\"http://schemas.microsoft.com/office/word/2020/wordml/sdtdatahash\" "
+	                      "xmlns:w16sdtfl=\"http://schemas.microsoft.com/office/word/2024/wordml/sdtformatlock\" "
+	                      "xmlns:w16se=\"http://schemas.microsoft.com/office/word/2015/wordml/symex\" "
+	                      "xmlns:wpg=\"http://schemas.microsoft.com/office/word/2010/wordprocessingGroup\" "
+	                      "xmlns:wpi=\"http://schemas.microsoft.com/office/word/2010/wordprocessingInk\" "
+	                      "xmlns:wne=\"http://schemas.microsoft.com/office/word/2006/wordml\" "
+	                      "xmlns:wps=\"http://schemas.microsoft.com/office/word/2010/wordprocessingShape\">");
+
+	oFile.WriteStringUTF8(L"<w:sdt><w:sdtContent><w:p>");
+
+	oFile.WriteStringUTF8(L"<w:pPr>");
+	oFile.WriteStringUTF8(L"<w:jc w:val=\"" + wsJs + L"\"/>");
+	oFile.WriteStringUTF8(L"</w:pPr>");
+
+	if (!pCtrlPageNumPos->GetPrefix().empty())
+		oFile.WriteStringUTF8(L"<w:r><w:rPr><w:sz w:val=\"28\"/><w:szCs w:val=\"28\"/></w:rPr><w:t>" + pCtrlPageNumPos->GetPrefix() + L"</w:t></w:r>");
+
+	oFile.WriteStringUTF8(L"<w:r><w:fldChar w:fldCharType=\"begin\"/></w:r>");
+	oFile.WriteStringUTF8(L"<w:r><w:instrText>PAGE \\* MERGEFORMAT</w:instrText></w:r>");
+	oFile.WriteStringUTF8(L"<w:r><w:fldChar w:fldCharType=\"separate\"/></w:r>");
+	oFile.WriteStringUTF8(L"<w:r><w:rPr><w:sz w:val=\"28\"/><w:szCs w:val=\"28\"/></w:rPr><w:t>2</w:t></w:r>");
+	oFile.WriteStringUTF8(L"<w:r><w:fldChar w:fldCharType=\"end\"/></w:r>");
+
+	if (!pCtrlPageNumPos->GetPostfix().empty())
+		oFile.WriteStringUTF8(L"<w:r><w:rPr><w:sz w:val=\"28\"/><w:szCs w:val=\"28\"/></w:rPr><w:t>" + pCtrlPageNumPos->GetPostfix() + L"</w:t></w:r>");
+
+	oFile.WriteStringUTF8(L"</w:p></w:sdtContent></w:sdt>");
+
+	oFile.WriteStringUTF8(L"</w:" + wsNodeName + L">");
+
+	oFile.CloseFile();
+
 	return wsFileName;
 }
 
diff --git a/HwpFile/HwpDoc/Conversion/FootnoteConverter.h b/HwpFile/HwpDoc/Conversion/FootnoteConverter.h
index 0f5e45cdb7..6bf337a5dc 100644
--- a/HwpFile/HwpDoc/Conversion/FootnoteConverter.h
+++ b/HwpFile/HwpDoc/Conversion/FootnoteConverter.h
@@ -5,6 +5,7 @@
 
 #include "../Paragraph/CtrlNote.h"
 #include "../Paragraph/CtrlHeadFoot.h"
+#include "../Paragraph/CtrlPageNumPos.h"
 
 namespace HWP
 {
@@ -24,6 +25,7 @@ public:
 
 	std::wstring CreateNote(const CCtrlNote* pNote, CConverter2OOXML& oConverter);
 	std::wstring CreateHeadOrFoot(const CCtrlHeadFoot* pCtrlHeadFoot, CConverter2OOXML& oConverter);
+	std::wstring CreatePageNum(const CCtrlPageNumPos* pCtrlPageNumPos, CConverter2OOXML& oConverter);
 
 	bool SaveToFile(const std::wstring& wsDirectory);
 
diff --git a/HwpFile/HwpDoc/Conversion/NumberingConverter.cpp b/HwpFile/HwpDoc/Conversion/NumberingConverter.cpp
index c0db760fdd..40b0a2f2bc 100644
--- a/HwpFile/HwpDoc/Conversion/NumberingConverter.cpp
+++ b/HwpFile/HwpDoc/Conversion/NumberingConverter.cpp
@@ -1,6 +1,8 @@
 #include "NumberingConverter.h"
 #include "../../../DesktopEditor/common/File.h"
 
+#include "Converter2OOXML.h"
+
 namespace HWP
 {
 CNumberingConverter::CNumberingConverter()
@@ -22,7 +24,7 @@ std::wstring HeadingTypeToWSTR(EHeadingType eHeadingType)
 	}
 }
 
-int CNumberingConverter::CreateNumbering(const CHWPRecordNumbering* pNumbering, EHeadingType eHeadingType)
+int CNumberingConverter::CreateNumbering(const CHWPRecordNumbering* pNumbering, EHeadingType eHeadingType, CConverter2OOXML& oConverter)
 {
 	if (nullptr == pNumbering || eHeadingType == EHeadingType::NONE || EHeadingType::OUTLINE == eHeadingType)
 		return 0;
@@ -74,6 +76,14 @@ int CNumberingConverter::CreateNumbering(const CHWPRecordNumbering* pNumbering,
 			}
 			m_oNumberXml.WriteString(L"\"/>");
 
+			int nCharShape = pNumbering->GetCharShape(shIndex);
+
+			if (INT_MAX == nCharShape)
+				nCharShape = 0;
+
+			TConversionState oState;
+			oConverter.WriteRunnerStyle(nCharShape, m_oNumberXml, oState);
+
 			m_oNumberXml.WriteString(L"</w:lvl>");
 		}
 	}
diff --git a/HwpFile/HwpDoc/Conversion/NumberingConverter.h b/HwpFile/HwpDoc/Conversion/NumberingConverter.h
index bee7f33944..d09dd7dea5 100644
--- a/HwpFile/HwpDoc/Conversion/NumberingConverter.h
+++ b/HwpFile/HwpDoc/Conversion/NumberingConverter.h
@@ -8,6 +8,7 @@
 
 namespace HWP
 {
+class CConverter2OOXML;
 class CNumberingConverter
 {
 	NSStringUtils::CStringBuilder m_oNumberXml;
@@ -17,7 +18,7 @@ public:
 
 	unsigned int GetCountNumbering() const;
 
-	int CreateNumbering(const CHWPRecordNumbering* pNumbering, EHeadingType eHeadingType);
+	int CreateNumbering(const CHWPRecordNumbering* pNumbering, EHeadingType eHeadingType, CConverter2OOXML& oConverter);
 	bool SaveToFile(const std::wstring& wsDirectory);
 };
 }
diff --git a/HwpFile/HwpDoc/Conversion/StyleConverter.cpp b/HwpFile/HwpDoc/Conversion/StyleConverter.cpp
new file mode 100644
index 0000000000..d84ef39330
--- /dev/null
+++ b/HwpFile/HwpDoc/Conversion/StyleConverter.cpp
@@ -0,0 +1,818 @@
+#include "StyleConverter.h"
+#include "../Common/WriterContext.h"
+#include "Transform.h"
+#include <cmath>
+
+namespace HWP
+{
+#define DEFAULT_FONT_FAMILY std::wstring(L"Arial")
+#define DEFAULT_FONT_SIZE 18
+#define DEFAULT_LANGUAGE std::wstring(L"en")
+#define DEFAULT_STYLE_NAME L"Style"
+#define DEFAULT_SPACING 240
+
+#define SPACING_SCALE_MS_WORD 1.21
+
+#define ADD_COLOR(r, g, b, enum_value) {{r, g, b}, enum_value}
+
+static const std::vector<std::pair<TColor, EHighlightColors>> s_arHighlightColors
+{
+	ADD_COLOR(  0,   0,   0, EHighlightColors::Black),
+	ADD_COLOR(  0,   0, 255, EHighlightColors::Blue),
+	ADD_COLOR(  0, 255, 255, EHighlightColors::Cyan),
+	ADD_COLOR(  0, 255,   0, EHighlightColors::Green),
+	ADD_COLOR(255,   0, 255, EHighlightColors::Magenta),
+	ADD_COLOR(255,   0,   0, EHighlightColors::Red),
+	ADD_COLOR(255, 255,   0, EHighlightColors::Yellow),
+	ADD_COLOR(255, 255, 255, EHighlightColors::White),
+
+	ADD_COLOR(  0,   0, 139, EHighlightColors::DarkBlue),
+	ADD_COLOR(  0, 139, 139, EHighlightColors::DarkCyan),
+	ADD_COLOR(  0, 100,   0, EHighlightColors::DarkGreen),
+	ADD_COLOR(139,   0, 139, EHighlightColors::DarkMagenta),
+	ADD_COLOR(139,   0,   0, EHighlightColors::DarkRed),
+	ADD_COLOR(128, 128,   0, EHighlightColors::DarkYellow),
+	ADD_COLOR(169, 169, 169, EHighlightColors::DarkGray),
+
+	ADD_COLOR(211, 211, 211, EHighlightColors::LightGray)
+};
+
+CStyleConverter::CStyleConverter()
+	: m_ushLastParaShapeId(0), m_ushLastCharShapeId(0)
+{
+	m_mUsedStyleNames.insert(std::make_pair(DEFAULT_STYLE_NAME, 0));
+}
+
+std::wstring CStyleConverter::CreateStyle(short shParaShapeId, short shParaStyleId, CWriterContext& oContext, TConversionState& oState)
+{
+	std::map<unsigned short, std::wstring>::const_iterator itFound = m_mUsedStyles.find(shParaStyleId);
+
+	if (m_mUsedStyles.cend() != itFound)
+		return itFound->second;
+
+	const CHWPRecordStyle *pParaStyle = dynamic_cast<const CHWPRecordStyle*>(oContext.GetParaStyle(shParaStyleId));
+
+	if (nullptr == pParaStyle)
+		return std::wstring();
+
+	const CHWPRecordParaShape* pParaShapeRecord = dynamic_cast<const CHWPRecordParaShape*>(oContext.GetParaShape(pParaStyle->GetParaShapeId()));
+
+	if (nullptr == pParaShapeRecord)
+		return  std::wstring();
+
+	std::wstring wsParaStyleName = !pParaStyle->GetEngName().empty() ? pParaStyle->GetEngName() : pParaStyle->GetName();
+
+	if (wsParaStyleName.empty())
+		wsParaStyleName = DEFAULT_STYLE_NAME;
+
+	const std::wstring wsStyleName = GenerateUniqueID(wsParaStyleName);
+
+	m_oStylesXml.WriteString(L"<w:style w:type=\"paragraph\" w:customStyle=\"1\" w:styleId=\"");
+	m_oStylesXml.WriteEncodeXmlString(wsStyleName);
+	m_oStylesXml.WriteString(L"\">");
+	m_oStylesXml.WriteString(L"<w:name w:val=\"");
+	m_oStylesXml.WriteEncodeXmlString(wsStyleName);
+	m_oStylesXml.WriteString(L"\"/>");
+	m_oStylesXml.WriteString(L"<w:qFormat/>");
+	m_oStylesXml.WriteString(L"<w:pPr>");
+	WriteParagraphProperties(GenerateParagraphStyle(*pParaShapeRecord), m_oStylesXml);
+	m_oStylesXml.WriteString(L"</w:pPr>");
+
+	const CHWPRecordCharShape *pCharShapeRecord = dynamic_cast<const CHWPRecordCharShape*>(oContext.GetCharShape(pParaStyle->GetCharShapeId()));
+
+	if (nullptr != pCharShapeRecord)
+	{
+		m_oStylesXml.WriteString(L"<w:rPr>");
+		WriteRunnerProperties(GenerateRunnerStyle(*pCharShapeRecord), m_oStylesXml);
+		m_oStylesXml.WriteString(L"</w:rPr>");
+	}
+
+	m_oStylesXml.WriteString(L"</w:style>");
+
+	m_mUsedStyles.insert(std::make_pair(shParaStyleId, wsStyleName));
+
+	m_ushLastParaShapeId = pParaStyle->GetParaShapeId();
+	m_ushLastCharShapeId = pParaStyle->GetCharShapeId();
+
+	return wsStyleName;
+}
+
+bool CStyleConverter::WriteDifferenceParagraphStyles(short shFirtsParaShapeId, short shSecondParaShapeId, CWriterContext& oContext, NSStringUtils::CStringBuilder& oBuilder)
+{
+	const CHWPRecordParaShape* pFirstParaShape = dynamic_cast<const CHWPRecordParaShape*>(oContext.GetParaShape(shFirtsParaShapeId));
+
+	if (nullptr == pFirstParaShape)
+		return false;
+
+	const CHWPRecordParaShape* pSecondParaShape = dynamic_cast<const CHWPRecordParaShape*>(oContext.GetParaShape(shSecondParaShapeId));
+
+	if (nullptr == pSecondParaShape)
+		return false;
+
+	CParagraphsStyle oFirstParagraphStyle {GenerateParagraphStyle(*pFirstParaShape )};
+	CParagraphsStyle oSecondParagraphStyle{GenerateParagraphStyle(*pSecondParaShape)};
+
+	oSecondParagraphStyle -= oFirstParagraphStyle;
+
+	WriteParagraphProperties(oSecondParagraphStyle, oBuilder);
+
+	return true;
+}
+
+bool CStyleConverter::WriteDifferenceRunnerStyles(short shFirtsCharShapeId, short shSecondCharShapeId, CWriterContext& oContext, NSStringUtils::CStringBuilder& oBuilder)
+{
+	const CHWPRecordCharShape* pFirstCharShape = dynamic_cast<const CHWPRecordCharShape*>(oContext.GetCharShape(shFirtsCharShapeId));
+
+	if (nullptr == pFirstCharShape)
+		return false;
+
+	const CHWPRecordCharShape* pSecondCharShape = dynamic_cast<const CHWPRecordCharShape*>(oContext.GetCharShape(shSecondCharShapeId));
+
+	if (nullptr == pSecondCharShape)
+		return false;
+
+	CRunnerStyle oFirstRunnerStyle {GenerateRunnerStyle(*pFirstCharShape )};
+	CRunnerStyle oSecondRunnerStyle{GenerateRunnerStyle(*pSecondCharShape)};
+
+	oSecondRunnerStyle -= oFirstRunnerStyle;
+
+	WriteRunnerProperties(oSecondRunnerStyle, oBuilder);
+
+	return true;
+}
+
+unsigned short CStyleConverter::GetLastParaShapeId() const
+{
+	return m_ushLastParaShapeId;
+}
+
+unsigned short CStyleConverter::GetLastCharShapeId() const
+{
+	return m_ushLastCharShapeId;
+}
+
+std::wstring CStyleConverter::GenerateUniqueID(const std::wstring& wsName)
+{
+	std::unordered_map<std::wstring, int>::const_iterator itFound = m_mUsedStyleNames.find(wsName);
+
+	if (itFound == m_mUsedStyleNames.cend())
+	{
+		m_mUsedStyleNames.insert(std::make_pair(wsName, 0));
+		return wsName;
+	}
+
+	return wsName + std::to_wstring(++m_mUsedStyleNames[wsName]);
+}
+
+CParagraphsStyle CStyleConverter::GenerateParagraphStyle(const CHWPRecordParaShape& oParaShape)
+{
+	CParagraphsStyle oParagraphsStyle;
+
+	if (oParaShape.KeepWithNext())
+		oParagraphsStyle.SetKeepNext(true);
+
+	oParagraphsStyle.SetFirstLine(oParaShape.GetIndent());
+	oParagraphsStyle.SetLeftInd(oParaShape.GetLeftIndent());
+	oParagraphsStyle.SetRightInd(oParaShape.GetRightIndent());
+
+	switch(oParaShape.GetHorizantalAlign())
+	{
+		case EHorizontalAlign::JUSTIFY: oParagraphsStyle.SetJs(EJs::Both); break;
+		case EHorizontalAlign::LEFT: oParagraphsStyle.SetJs(EJs::Left); break;
+		case EHorizontalAlign::RIGHT: oParagraphsStyle.SetJs(EJs::Right); break;
+		case EHorizontalAlign::CENTER: oParagraphsStyle.SetJs(EJs::Center); break;
+		case EHorizontalAlign::DISTRIBUTE:
+		case EHorizontalAlign::DISTRIBUTE_SPACE: oParagraphsStyle.SetJs(EJs::Distribute); break;
+	}
+
+	switch(oParaShape.GetVerticalAlign())
+	{
+		case EVerticalAlign::BOTTOM: oParagraphsStyle.SetTextAlignment(ETextAlignment::Bottom); break;
+		case EVerticalAlign::TOP:oParagraphsStyle.SetTextAlignment(ETextAlignment::Top); break;
+		case EVerticalAlign::CENTER: oParagraphsStyle.SetTextAlignment(ETextAlignment::Center); break;
+		case EVerticalAlign::BASELINE:
+			break;
+	}
+
+	switch(oParaShape.GetLineSpacingType())
+	{
+		case 0x0:
+		{
+			oParagraphsStyle.SetSpacingLineRule(ELineRule::Auto);
+			oParagraphsStyle.SetSpacing(static_cast<int>(2.4 * (double)oParaShape.GetLineSpacing())); // 240 / 100
+			break;
+		}
+		case 0x01:
+		{
+			oParagraphsStyle.SetSpacingLineRule(ELineRule::Exact);
+			oParagraphsStyle.SetSpacing(static_cast<int>((double)oParaShape.GetLineSpacing() / 10.)); /*0.352778*/; //(1pt=0.352778mm) //TODO:: проверить, как найдется пример
+			break;
+		}
+		case 0x02:
+		case 0x03:
+		{
+			oParagraphsStyle.SetSpacingLineRule(ELineRule::AtLeast);
+			oParagraphsStyle.SetSpacing(static_cast<int>((double)oParaShape.GetLineSpacing() / 10.)); //TODO:: проверить, как найдется пример
+			break;
+		}
+		default:
+			break;
+	}
+
+	if (0 != oParaShape.GetMarginPrev())
+		oParagraphsStyle.SetSpacingBefore(static_cast<int>((double)oParaShape.GetMarginPrev() / 10.));
+
+	if (0 != oParaShape.GetMarginNext())
+		oParagraphsStyle.SetSpacingAfter(static_cast<int>((double)oParaShape.GetMarginNext() / 10.));
+
+	return oParagraphsStyle;
+}
+
+CRunnerStyle CStyleConverter::GenerateRunnerStyle(const CHWPRecordCharShape& oCharShape)
+{
+	CRunnerStyle oRunnerStyle;
+
+	oRunnerStyle.SetAscii(oCharShape.GetFontName(ELang::LATIN));
+	oRunnerStyle.SetEastAsia(oCharShape.GetFontName(ELang::HANGUL));
+	oRunnerStyle.SetRatio(oCharShape.GetRatio(ELang::LATIN));
+	oRunnerStyle.SetSpacing(static_cast<short>((double)oCharShape.GetSpacing(ELang::LATIN) * SPACING_SCALE_MS_WORD));
+
+	if (oCharShape.Bold())
+		oRunnerStyle.SetBold(true);
+
+	if (oCharShape.Italic())
+		oRunnerStyle.SetItalic(true);
+
+	if (oCharShape.StrikeOut())
+		oRunnerStyle.SetStrike(EStrikeType::Single);
+
+	if (oCharShape.SuperScript())
+		oRunnerStyle.SetVerticalAlign(EVerticalAlignRun::Superscript);
+	else if (oCharShape.SubScript())
+		oRunnerStyle.SetVerticalAlign(EVerticalAlignRun::Subscript);
+
+	const int nHeight = static_cast<int>(((double)(std::abs)(oCharShape.GetHeight()) * ((double)oCharShape.GetRelSize(ELang::HANGUL) / 100.) / 100.) * 2.);
+	oRunnerStyle.SetSz(nHeight);
+
+	oRunnerStyle.SetColor(oCharShape.GetTextColor());
+
+	if (oCharShape.Underline())
+	{
+		EUnderline eUnderlineType   = oCharShape.GetUnderlineType();
+		ELineStyle1 eUnderlineStyle = oCharShape.GetUnderlineStyle();
+
+		if (EUnderline::BOTTOM == eUnderlineType)
+		{
+			switch (eUnderlineStyle)
+			{
+				case ELineStyle1::SOLID: oRunnerStyle.SetU({EUType::Single, oCharShape.GetUnderlineColor()}); break;
+				case ELineStyle1::DASH: oRunnerStyle.SetU({EUType::Dash, oCharShape.GetUnderlineColor()}); break;
+				case ELineStyle1::DOT: oRunnerStyle.SetU({EUType::Dotted, oCharShape.GetUnderlineColor()}); break;
+				case ELineStyle1::DASH_DOT: oRunnerStyle.SetU({EUType::DotDash, oCharShape.GetUnderlineColor()}); break;
+				case ELineStyle1::DASH_DOT_DOT: oRunnerStyle.SetU({EUType::DotDotDash, oCharShape.GetUnderlineColor()}); break;
+				case ELineStyle1::LONG_DASH: oRunnerStyle.SetU({EUType::DotDash, oCharShape.GetUnderlineColor()}); break;
+				case ELineStyle1::CIRCLE: oRunnerStyle.SetU({EUType::Dotted, oCharShape.GetUnderlineColor()}); break;
+				case ELineStyle1::DOUBLE_SLIM:
+				case ELineStyle1::SLIM_THICK:
+				case ELineStyle1::THICK_SLIM:
+				case ELineStyle1::SLIM_THICK_SLIM: oRunnerStyle.SetU({EUType::Double, oCharShape.GetUnderlineColor()}); break;
+				case ELineStyle1::WAVE: oRunnerStyle.SetU({EUType::Wave, oCharShape.GetUnderlineColor()}); break;
+				case ELineStyle1::DOUBLE_WAVE: oRunnerStyle.SetU({EUType::WavyDouble, oCharShape.GetUnderlineColor()}); break;
+				case ELineStyle1::THICK_3D:
+				case ELineStyle1::THICK_3D_REVERS_LI:
+				case ELineStyle1::SOLID_3D:
+				case ELineStyle1::SOLID_3D_REVERS_LI: oRunnerStyle.SetU({EUType::Thick, oCharShape.GetUnderlineColor()}); break;
+			}
+		}
+		else if (EUnderline::CENTER == eUnderlineType)
+		{
+			if (eUnderlineStyle == ELineStyle1::DOUBLE_SLIM ||
+				eUnderlineStyle == ELineStyle1::DOUBLE_WAVE)
+				oRunnerStyle.SetStrike(EStrikeType::Double);
+			else
+				oRunnerStyle.SetStrike(EStrikeType::Single);
+		}
+	}
+
+	if (0xFFFFFFFF != oCharShape.GetShadeColor())
+		oRunnerStyle.SetShadeColor(oCharShape.GetShadeColor());
+
+	return oRunnerStyle;
+}
+
+void CStyleConverter::WriteParagraphProperties(const CParagraphsStyle& oParagraphsStyle, NSStringUtils::CStringBuilder& oBuilder)
+{
+	if (oParagraphsStyle.Empty())
+		return;
+
+	if (oParagraphsStyle.KeepNextIsSet() && oParagraphsStyle.KeepNext())
+		oBuilder.WriteString(L"<w:keepNext w:val=\"true\"/>");
+
+	if ((oParagraphsStyle.FirstLineIsSet() && 0 != oParagraphsStyle.GetFirstLine()) ||
+	    (oParagraphsStyle.LeftIndIsSet() && 0 != oParagraphsStyle.GetLeftInd()) ||
+	    (oParagraphsStyle.RightIndIsSet() && 0 != oParagraphsStyle.GetRightInd()))
+	{
+		oBuilder.WriteString(L"<w:ind");
+
+		const int nLeftInd {(oParagraphsStyle.LeftIndIsSet())  ? oParagraphsStyle.GetLeftInd()  : 0};
+
+		if (oParagraphsStyle.FirstLineIsSet() && 0 != oParagraphsStyle.GetFirstLine())
+		{
+			if (oParagraphsStyle.GetFirstLine() > 0)
+			{
+				oBuilder.WriteString(L" w:firstLine=\"" + std::to_wstring(static_cast<int>(std::round(oParagraphsStyle.GetFirstLine() / 10.))) + L"\"");
+
+				if (0 != nLeftInd)
+					oBuilder.WriteString(L" w:left=\"" + std::to_wstring(static_cast<int>(std::round(nLeftInd / 10.))) + L"\"");
+			}
+			else
+			{
+				const int nHanging{static_cast<int>(std::round(-oParagraphsStyle.GetFirstLine() / 10.))};
+
+				oBuilder.WriteString(L" w:hanging=\"" + std::to_wstring(nHanging) + L"\"");
+				oBuilder.WriteString(L" w:left=\"" + std::to_wstring(static_cast<int>(std::round(nLeftInd / 10.)) + nHanging) + L"\"");
+			}
+		}
+		else if (0 != nLeftInd)
+			oBuilder.WriteString(L" w:left=\"" + std::to_wstring(static_cast<int>(std::round(oParagraphsStyle.GetLeftInd() / 10.))) + L"\"");
+
+		if (oParagraphsStyle.RightIndIsSet() && 0 != oParagraphsStyle.GetRightInd())
+			oBuilder.WriteString(L" w:right=\"" + std::to_wstring(static_cast<int>(std::round(oParagraphsStyle.GetRightInd() / 10.))) + L"\"");
+
+		oBuilder.WriteString(L"/>");
+	}
+
+	if (oParagraphsStyle.JsIsSet())
+	{
+		switch(oParagraphsStyle.GetJs())
+		{
+			case EJs::Left: oBuilder.WriteString(L"<w:jc w:val=\"left\"/>"); break;
+			case EJs::Center: oBuilder.WriteString(L"<w:jc w:val=\"center\"/>"); break;
+			case EJs::Right: oBuilder.WriteString(L"<w:jc w:val=\"right\"/>"); break;
+			case EJs::Both: oBuilder.WriteString(L"<w:jc w:val=\"both\"/>"); break;
+			case EJs::Distribute:oBuilder.WriteString(L"<w:jc w:val=\"distribute\"/>"); break;
+		}
+	}
+
+	if (oParagraphsStyle.TextAlignmentIsSet())
+	{
+		switch(oParagraphsStyle.GetTextAlignment())
+		{
+			case ETextAlignment::Top: oBuilder.WriteString(L"<w:textAlignment w:val=\"top\"/>"); break;
+			case ETextAlignment::Center: oBuilder.WriteString(L"<w:textAlignment w:val=\"center\"/>"); break;
+			case ETextAlignment::Bottom: oBuilder.WriteString(L"<w:textAlignment w:val=\"bottom\"/>"); break;
+		}
+	}
+
+	if (oParagraphsStyle.SpacingLineRuleIsSet() || oParagraphsStyle.SpacingIsSet() || oParagraphsStyle.SpacingBeforeIsSet() || oParagraphsStyle.SpacingAfterIsSet())
+	{
+		oBuilder.WriteString(L"<w:spacing w:lineRule=\"");
+
+		if (oParagraphsStyle.SpacingLineRuleIsSet())
+		{
+			switch (oParagraphsStyle.GetSpacingLineRule())
+			{
+				case ELineRule::Auto: oBuilder.WriteString(L"auto"); break;
+				case ELineRule::Exact:  oBuilder.WriteString(L"exact"); break;
+				case ELineRule::AtLeast: oBuilder.WriteString(L"atLeast"); break;
+			}
+		}
+		else
+			oBuilder.WriteString(L"auto");
+
+		oBuilder.WriteString(L"\" w:line=\"" + std::to_wstring((oParagraphsStyle.SpacingIsSet()) ? oParagraphsStyle.GetSpacing() : DEFAULT_SPACING) + L"\"");
+
+		if (oParagraphsStyle.SpacingBeforeIsSet())
+			oBuilder.WriteString(L" w:before=\"" + std::to_wstring(oParagraphsStyle.GetSpacingBefore()) + L"\"");
+
+		if (oParagraphsStyle.SpacingAfterIsSet())
+			oBuilder.WriteString(L" w:after=\"" + std::to_wstring(oParagraphsStyle.GetSpacingAfter()) + L"\"");
+
+		oBuilder.WriteString(L"/>");
+	}
+}
+
+void CStyleConverter::WriteParagraphsStyle(const CParagraphsStyle& oParagraphsStyle, const std::wstring& wsName, const std::wstring& wsLink, NSStringUtils::CStringBuilder& oBuilder)
+{
+	oBuilder.WriteString(L"<w:style w:type=\"paragraph\" w:customStyle=\"1\" w:styleId=\"");
+	oBuilder.WriteEncodeXmlString(wsName);
+	oBuilder.WriteString(L"\">");
+	oBuilder.WriteString(L"<w:name w:val=\"");
+	oBuilder.WriteEncodeXmlString(wsName);
+	oBuilder.WriteString(L"\"/>");
+	oBuilder.WriteString(L"<w:link w:val=\"");
+	oBuilder.WriteEncodeXmlString(wsLink);
+	oBuilder.WriteString(L"\"/>");
+	oBuilder.WriteString(L"<w:qFormat/>");
+	oBuilder.WriteString(L"<w:pPr>");
+	WriteParagraphProperties(oParagraphsStyle, oBuilder);
+	oBuilder.WriteString(L"</w:pPr>");
+	oBuilder.WriteString(L"</w:style>");
+}
+
+void CStyleConverter::WriteRunnerProperties(const CRunnerStyle& oRunnerStyle, NSStringUtils::CStringBuilder& oBuilder)
+{
+	if (oRunnerStyle.Empty())
+		return;
+
+	std::wstring wsAScii, wsEastAsia;
+
+	if (oRunnerStyle.AsciiIsSet())
+		wsAScii = oRunnerStyle.GetAscii();
+
+	if (oRunnerStyle.EastAsiaIsSet())
+		wsEastAsia = oRunnerStyle.GetEastAsia();
+
+	if (!wsAScii.empty() || !wsEastAsia.empty())
+	{
+		oBuilder.WriteString(L"<w:rFonts");
+
+		if (!wsAScii.empty())
+			oBuilder.WriteString(L" w:ascii=\"" + wsAScii +  L"\" w:hAnsi=\"" + wsAScii + L"\" w:cs=\"" + wsAScii + L'"');
+
+		if (!wsEastAsia.empty())
+			oBuilder.WriteString(L" w:eastAsia=\"" + wsEastAsia + L'"');
+
+		oBuilder.WriteString(L"/>");
+	}
+
+	if (oRunnerStyle.BoldIsSet() && oRunnerStyle.Bold())
+		oBuilder.WriteString(L"<w:b/><w:bCs/>");
+
+	if (oRunnerStyle.ItalicIsSet() && oRunnerStyle.Italic())
+		oBuilder.WriteString(L"<w:i/><w:iCs/>");
+
+	if (oRunnerStyle.SzIsSet())
+		oBuilder.WriteString(L"<w:sz w:val=\"" + std::to_wstring(oRunnerStyle.GetSz()) + L"\"/><w:szCs w:val=\"" + std::to_wstring(oRunnerStyle.GetSz()) + L"\"/>");
+
+	if (oRunnerStyle.ColorIsSet())
+		oBuilder.WriteString(L"<w:color w:val=\"" + oRunnerStyle.GetColor().ToHEX() + L"\"/>");
+
+	if (oRunnerStyle.RatioIsSet() && 100 != oRunnerStyle.GetRatio())
+		oBuilder.WriteString(L"<w:w w:val=\"" + std::to_wstring(oRunnerStyle.GetRatio()) + L"\"/>");
+
+	if (oRunnerStyle.SpacingIsSet() && 0 != oRunnerStyle.GetSpacing())
+		oBuilder.WriteString(L"<w:spacing w:val=\"" + std::to_wstring(oRunnerStyle.GetSpacing()) + L"\"/>");
+
+	if (oRunnerStyle.UIsSet())
+	{
+		oBuilder.WriteString(L"<w:u w:val=\"");
+
+		switch (oRunnerStyle.GetU().m_eVal)
+		{
+			case EUType::Single: oBuilder.WriteString(L"single"); break;
+			case EUType::Dash: oBuilder.WriteString(L"dash"); break;
+			case EUType::Dotted: oBuilder.WriteString(L"dotted"); break;
+			case EUType::DotDash: oBuilder.WriteString(L"dotDash"); break;
+			case EUType::DotDotDash: oBuilder.WriteString(L"dotDotDash"); break;
+			case EUType::Double: oBuilder.WriteString(L"double"); break;
+			case EUType::Wave: oBuilder.WriteString(L"wave"); break;
+			case EUType::WavyDouble: oBuilder.WriteString(L"wavyDouble"); break;
+			case EUType::Thick: oBuilder.WriteString(L"thick"); break;
+		}
+
+		oBuilder.WriteString(L"\" w:color=\"" + oRunnerStyle.GetU().m_oColor.ToHEX() + L"\"/>");
+	}
+
+	if (oRunnerStyle.StrikeIsSet())
+	{
+		switch (oRunnerStyle.GetStrike())
+		{
+			case EStrikeType::Single: oBuilder.WriteString(L"<w:strike/>"); break;
+			case EStrikeType::Double: oBuilder.WriteString(L"<w:dstrike/>"); break;
+		}
+	}
+
+	if (oRunnerStyle.HighlightIsSet())
+	{
+		oBuilder.WriteString(L"<w:highlight w:val=\"");
+
+		switch (oRunnerStyle.GetHighlight())
+		{
+			case EHighlightColors::Black: oBuilder.WriteString(L"black"); break;
+			case EHighlightColors::Blue: oBuilder.WriteString(L"blue"); break;
+			case EHighlightColors::Cyan: oBuilder.WriteString(L"cyan"); break;
+			case EHighlightColors::Green: oBuilder.WriteString(L"green"); break;
+			case EHighlightColors::Magenta: oBuilder.WriteString(L"magenta"); break;
+			case EHighlightColors::Red: oBuilder.WriteString(L"red"); break;
+			case EHighlightColors::Yellow: oBuilder.WriteString(L"yellow"); break;
+			case EHighlightColors::White: oBuilder.WriteString(L"white"); break;
+			case EHighlightColors::DarkBlue: oBuilder.WriteString(L"darkBlue"); break;
+			case EHighlightColors::DarkCyan: oBuilder.WriteString(L"darkCyan"); break;
+			case EHighlightColors::DarkGreen: oBuilder.WriteString(L"darkGreen"); break;
+			case EHighlightColors::DarkMagenta: oBuilder.WriteString(L"darkMagenta"); break;
+			case EHighlightColors::DarkRed: oBuilder.WriteString(L"darkRed"); break;
+			case EHighlightColors::DarkYellow: oBuilder.WriteString(L"darkYellow"); break;
+			case EHighlightColors::DarkGray: oBuilder.WriteString(L"darkGray"); break;
+			case EHighlightColors::LightGray: oBuilder.WriteString(L"lightGray"); break;
+				break;
+		}
+
+		oBuilder.WriteString(L"\"/>");
+	}
+
+	if (oRunnerStyle.ShadeColorIsSet())
+		oBuilder.WriteString(L"<w:shd w:val=\"clear\" w:fill=\"" + Transform::IntColorToHEX(oRunnerStyle.GetShadeColor()) + L"\"/>");
+
+	if (oRunnerStyle.VerticalAlignIsSet())
+	{
+		switch (oRunnerStyle.GetVerticalAlign())
+		{
+			case EVerticalAlignRun::Baseline: break;
+			case EVerticalAlignRun::Superscript: oBuilder.WriteString(L"<w:vertAlign w:val=\"superscript\"/>"); break;
+			case EVerticalAlignRun::Subscript: oBuilder.WriteString(L"<w:vertAlign w:val=\"subscript\"/>"); break;
+		}
+	}
+}
+
+void CStyleConverter::WriteRunnerStyle(const CRunnerStyle& oRunnerStyle, const std::wstring& wsName, const std::wstring& wsLink, NSStringUtils::CStringBuilder& oBuilder)
+{
+	oBuilder.WriteString(L"<w:style w:type=\"character\" w:customStyle=\"1\" w:styleId=\"");
+	oBuilder.WriteEncodeXmlString(wsName);
+	oBuilder.WriteString(L"-c\">");
+	oBuilder.WriteString(L"<w:name w:val=\"");
+	oBuilder.WriteEncodeXmlString(wsName);
+	oBuilder.WriteString(L" Character\"/>");
+	oBuilder.WriteString(L"<w:link w:val=\"");
+	oBuilder.WriteEncodeXmlString(wsLink);
+	oBuilder.WriteString(L"\"/>");
+	oBuilder.WriteString(L"<w:rPr>");
+	WriteRunnerProperties(oRunnerStyle, oBuilder);
+	oBuilder.WriteString(L"</w:rPr>");
+	oBuilder.WriteString(L"</w:style>");
+}
+
+bool CStyleConverter::SaveToFile(const std::wstring& wsDirectory)
+{
+	NSFile::CFileBinary oStylesWriter;
+	if (!oStylesWriter.CreateFileW(wsDirectory + L"styles.xml"))
+		return false;
+
+	oStylesWriter.WriteStringUTF8(L"<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?><w:styles xmlns:mc=\"http://schemas.openxmlformats.org/markup-compatibility/2006\" xmlns:r=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships\" xmlns:w=\"http://schemas.openxmlformats.org/wordprocessingml/2006/main\" xmlns:w14=\"http://schemas.microsoft.com/office/word/2010/wordml\" xmlns:w15=\"http://schemas.microsoft.com/office/word/2012/wordml\" mc:Ignorable=\"w14 w15\">");
+	oStylesWriter.WriteStringUTF8(L"<w:rPrDefault><w:rPr>");
+	oStylesWriter.WriteStringUTF8(L"<w:rFonts w:ascii=\"" + DEFAULT_FONT_FAMILY + L"\" w:eastAsia=\"" + DEFAULT_FONT_FAMILY + L"\"  w:hAnsi=\"" + DEFAULT_FONT_FAMILY + L"\" w:cs=\"" + DEFAULT_FONT_FAMILY + L"\"/>");
+	oStylesWriter.WriteStringUTF8(L"<w:sz w:val=\"" + std::to_wstring(DEFAULT_FONT_SIZE) + L"\"/><w:szCs w:val=\"" + std::to_wstring(DEFAULT_FONT_SIZE) + L"\"/>");
+	oStylesWriter.WriteStringUTF8(L"<w:lang w:val=\"" + DEFAULT_LANGUAGE + L"\" w:eastAsia=\"en-US\" w:bidi=\"ar-SA\"/>");
+	oStylesWriter.WriteStringUTF8(L"</w:rPr></w:rPrDefault><w:pPrDefault/>");
+
+	oStylesWriter.WriteStringUTF8(L"<w:style w:type=\"paragraph\" w:styleId=\"normal\" w:default=\"1\"><w:name w:val=\"Normal\"/><w:qFormat/><w:rPr><w:rFonts w:eastAsiaTheme=\"minorEastAsia\"/>");
+	oStylesWriter.WriteStringUTF8(L"<w:sz w:val=\"" + std::to_wstring(DEFAULT_FONT_SIZE) + L"\"/><w:szCs w:val=\"" + std::to_wstring(DEFAULT_FONT_SIZE) + L"\"/>");
+	oStylesWriter.WriteStringUTF8(L"</w:rPr></w:style>");
+
+	oStylesWriter.WriteStringUTF8(L"<w:style w:type=\"paragraph\" w:styleId=\"li\"><w:name w:val=\"List Paragraph\"/><w:basedOn w:val=\"normal\"/><w:qFormat/><w:uiPriority w:val=\"34\"/><w:pPr><w:contextualSpacing w:val=\"true\"/><w:ind w:left=\"720\"/></w:pPr></w:style>");
+	oStylesWriter.WriteStringUTF8(L"<w:style w:type=\"character\" w:styleId=\"a\"><w:name w:val=\"Hyperlink\"/><w:uiPriority w:val=\"99\"/><w:unhideWhenUsed/><w:rPr><w:color w:val=\"0000FF\" w:themeColor=\"hyperlink\"/><w:u w:val=\"single\"/></w:rPr></w:style>");
+	oStylesWriter.WriteStringUTF8(L"<w:style w:type=\"character\" w:styleId=\"footnote\"><w:name w:val=\"footnote reference\"/><w:uiPriority w:val=\"99\"/><w:unhideWhenUsed/><w:rPr><w:vertAlign w:val=\"superscript\"/></w:rPr></w:style><w:style w:type=\"paragraph\" w:styleId=\"footnote-p\"><w:name w:val=\"footnote text\"/><w:basedOn w:val=\"normal\"/><w:link w:val=\"footnote-c\"/><w:uiPriority w:val=\"99\"/><w:semiHidden/><w:unhideWhenUsed/><w:rPr><w:sz w:val=\"18\"/></w:rPr><w:pPr><w:spacing w:lineRule=\"auto\" w:line=\"240\" w:after=\"40\"/></w:pPr></w:style><w:style w:type=\"character\" w:styleId=\"footnote-c\" w:customStyle=\"1\"><w:name w:val=\"footnote text character\"/><w:link w:val=\"footnote-p\"/><w:uiPriority w:val=\"99\"/><w:rPr><w:sz w:val=\"18\"/></w:rPr></w:style>");
+	oStylesWriter.WriteStringUTF8(L"<w:style w:type=\"paragraph\" w:styleId=\"normal-web\"><w:name w:val=\"Normal (Web)\"/><w:basedOn w:val=\"normal\"/><w:uiPriority w:val=\"99\"/><w:semiHidden/><w:unhideWhenUsed/><w:pPr><w:spacing w:before=\"100\" w:beforeAutospacing=\"1\" w:after=\"100\" w:afterAutospacing=\"1\"/></w:pPr></w:style>");
+
+	oStylesWriter.WriteStringUTF8(m_oStylesXml.GetData());
+
+	oStylesWriter.WriteStringUTF8(L"</w:styles>");
+
+	return true;
+}
+
+CParagraphsStyle::CParagraphsStyle()
+{}
+
+CParagraphsStyle& CParagraphsStyle::operator-=(const CParagraphsStyle& oParagraphStyle)
+{
+	if (Empty() || oParagraphStyle.Empty())
+		return *this;
+
+	m_bKeepNext      -= oParagraphStyle.m_bKeepNext;
+	m_oInd           -= oParagraphStyle.m_oInd;
+	m_eJs            -= oParagraphStyle.m_eJs;
+	m_eTextAlignment -= oParagraphStyle.m_eTextAlignment;
+	m_oSpacing       -= oParagraphStyle.m_oSpacing;
+
+	return *this;
+}
+
+void CParagraphsStyle::Clear()
+{
+	m_bKeepNext.UnSet();
+	m_eJs.UnSet();
+	m_eTextAlignment.UnSet();
+
+	m_oInd.m_nFirstLine.UnSet();
+	m_oInd.m_nLeft.UnSet();
+	m_oInd.m_nRight.UnSet();
+
+	m_oSpacing.m_eLineRule.UnSet();
+	m_oSpacing.m_nLine.UnSet();
+	m_oSpacing.m_nAfter.UnSet();
+	m_oSpacing.m_nBefore.UnSet();
+}
+
+bool CParagraphsStyle::Empty() const
+{
+	return !m_bKeepNext.IsSet() && !m_oInd.m_nFirstLine.IsSet() && !m_oInd.m_nLeft.IsSet() &&
+	       !m_oInd.m_nRight.IsSet() && !m_eJs.IsSet() && !m_eTextAlignment.IsSet() &&
+	       !m_oSpacing.m_eLineRule.IsSet() && !m_oSpacing.m_nLine.IsSet() &&
+	       !m_oSpacing.m_nAfter.IsSet() && !m_oSpacing.m_nBefore.IsSet();
+}
+
+#define CREATE_BODY_METHODS_FOR_PROPERTY(class_name, type, name, variable_name)\
+	void class_name::Set##name(type oValue)\
+	{\
+		variable_name = oValue;\
+	}\
+	bool class_name::name##IsSet() const\
+	{\
+		return variable_name.IsSet();\
+	}\
+	type class_name::Get##name() const\
+	{\
+		return variable_name;\
+	}
+
+#define CREATE_BODY_METHODS_FOR_PROPERTY_BOOL(class_name, name, variable_name)\
+	void class_name::Set##name(bool oValue)\
+	{\
+		variable_name = oValue;\
+	}\
+	bool class_name::name##IsSet() const\
+	{\
+		return variable_name.IsSet();\
+	}\
+	bool class_name::name() const\
+	{\
+		return variable_name;\
+	}
+
+CREATE_BODY_METHODS_FOR_PROPERTY_BOOL(CParagraphsStyle, KeepNext, m_bKeepNext)
+CREATE_BODY_METHODS_FOR_PROPERTY(CParagraphsStyle, int, FirstLine, m_oInd.m_nFirstLine)
+CREATE_BODY_METHODS_FOR_PROPERTY(CParagraphsStyle, int, LeftInd, m_oInd.m_nLeft)
+CREATE_BODY_METHODS_FOR_PROPERTY(CParagraphsStyle, int, RightInd, m_oInd.m_nRight)
+CREATE_BODY_METHODS_FOR_PROPERTY(CParagraphsStyle, EJs, Js, m_eJs)
+CREATE_BODY_METHODS_FOR_PROPERTY(CParagraphsStyle, ETextAlignment, TextAlignment, m_eTextAlignment)
+CREATE_BODY_METHODS_FOR_PROPERTY(CParagraphsStyle, ELineRule, SpacingLineRule, m_oSpacing.m_eLineRule)
+CREATE_BODY_METHODS_FOR_PROPERTY(CParagraphsStyle, int, Spacing, m_oSpacing.m_nLine)
+CREATE_BODY_METHODS_FOR_PROPERTY(CParagraphsStyle, int, SpacingBefore, m_oSpacing.m_nBefore)
+CREATE_BODY_METHODS_FOR_PROPERTY(CParagraphsStyle, int, SpacingAfter, m_oSpacing.m_nAfter)
+
+template<class T>
+CProperty<T>::CProperty()
+	: m_bIsSet(false)
+{}
+
+template<class T>
+void CProperty<T>::UnSet()
+{
+	m_bIsSet = false;
+}
+
+template<class T>
+void CProperty<T>::SetValue(T oValue)
+{
+	m_oValue = oValue;
+	m_bIsSet = true;
+}
+
+template<class T>
+bool CProperty<T>::IsSet() const
+{
+	return m_bIsSet;
+}
+
+template<class T>
+T CProperty<T>::GetValue() const
+{
+	return m_oValue;
+}
+
+template<class T>
+CProperty<T>& CProperty<T>::operator=(T oValue)
+{
+	SetValue(oValue);
+	return *this;
+}
+
+template<class T>
+CProperty<T>& CProperty<T>::operator-=(const CProperty<T>& oProperty)
+{
+	if (!m_bIsSet || !oProperty.m_bIsSet || m_oValue != oProperty.m_oValue)
+		return *this;
+
+	m_bIsSet = false;
+
+	return *this;
+}
+
+template<class T>
+CProperty<T>::operator T() const
+{
+	return m_oValue;
+}
+
+TRFonts& TRFonts::operator-=(const TRFonts& oRFonts)
+{
+	m_wsAscii    -= oRFonts.m_wsAscii;
+	m_wsEastAsia -= oRFonts.m_wsEastAsia;
+
+	return *this;
+}
+
+CRunnerStyle::CRunnerStyle()
+{}
+
+CRunnerStyle& CRunnerStyle::operator-=(const CRunnerStyle& oRunnerStyle)
+{
+	m_oRFonts        -= oRunnerStyle.m_oRFonts;
+	m_bBold          -= oRunnerStyle.m_bBold;
+	m_bItalic        -= oRunnerStyle.m_bItalic;
+	m_nSz            -= oRunnerStyle.m_nSz;
+	m_oColor         -= oRunnerStyle.m_oColor;
+	m_nShadeColor    -= oRunnerStyle.m_nShadeColor;
+	m_shRatio        -= oRunnerStyle.m_shRatio;
+	m_oU             -= oRunnerStyle.m_oU;
+	m_eStrike        -= oRunnerStyle.m_eStrike;
+	m_shSpacing      -= oRunnerStyle.m_shSpacing;
+	m_oHighlight     -= oRunnerStyle.m_oHighlight;
+	m_eVerticalAlign -= oRunnerStyle.m_eVerticalAlign;
+
+	return *this;
+}
+
+void CRunnerStyle::Clear()
+{
+	m_oRFonts.m_wsAscii.UnSet();
+	m_oRFonts.m_wsEastAsia.UnSet();
+	m_bBold.UnSet();
+	m_bItalic.UnSet();
+	m_nSz.UnSet();
+	m_oColor.UnSet();
+	m_nShadeColor.UnSet();
+	m_shRatio.UnSet();
+	m_oU.UnSet();
+	m_eStrike.UnSet();
+	m_shSpacing.UnSet();
+	m_oHighlight.UnSet();
+	m_eVerticalAlign.UnSet();
+}
+
+bool CRunnerStyle::Empty() const
+{
+	return !m_oRFonts.m_wsAscii.IsSet() && !m_oRFonts.m_wsEastAsia.IsSet() && !m_bBold.IsSet() && !m_bItalic.IsSet() &&
+	       !m_nSz.IsSet() && !m_oColor.IsSet() && !m_nShadeColor.IsSet() && !m_shRatio.IsSet() && !m_oU.IsSet() &&
+	       !m_eStrike.IsSet() && !m_shSpacing.IsSet() && !m_oHighlight.IsSet() && !m_eVerticalAlign.IsSet();
+}
+
+CREATE_BODY_METHODS_FOR_PROPERTY(CRunnerStyle, std::wstring, Ascii, m_oRFonts.m_wsAscii);
+CREATE_BODY_METHODS_FOR_PROPERTY(CRunnerStyle, std::wstring, EastAsia, m_oRFonts.m_wsEastAsia);
+CREATE_BODY_METHODS_FOR_PROPERTY_BOOL(CRunnerStyle, Bold, m_bBold);
+CREATE_BODY_METHODS_FOR_PROPERTY_BOOL(CRunnerStyle, Italic, m_bItalic);
+CREATE_BODY_METHODS_FOR_PROPERTY(CRunnerStyle, int, Sz, m_nSz);
+CREATE_BODY_METHODS_FOR_PROPERTY(CRunnerStyle, TColor, Color, m_oColor);
+CREATE_BODY_METHODS_FOR_PROPERTY(CRunnerStyle, int, ShadeColor, m_nShadeColor)
+CREATE_BODY_METHODS_FOR_PROPERTY(CRunnerStyle, short, Ratio, m_shRatio)
+CREATE_BODY_METHODS_FOR_PROPERTY(CRunnerStyle, TU, U, m_oU);
+CREATE_BODY_METHODS_FOR_PROPERTY(CRunnerStyle, EStrikeType, Strike, m_eStrike);
+CREATE_BODY_METHODS_FOR_PROPERTY(CRunnerStyle, short, Spacing, m_shSpacing);
+CREATE_BODY_METHODS_FOR_PROPERTY(CRunnerStyle, EHighlightColors, Highlight, m_oHighlight);
+CREATE_BODY_METHODS_FOR_PROPERTY(CRunnerStyle, EVerticalAlignRun, VerticalAlign, m_eVerticalAlign);
+
+bool TU::operator!=(const TU& oU) const
+{
+	return m_eVal != oU.m_eVal || m_oColor != oU.m_oColor;
+}
+
+EHighlightColors NormalizeHighlightColor(const TColor& oCurrentColor)
+{
+	EHighlightColors eSelectedColor{EHighlightColors::Yellow};
+	double dMinDistance = 999.;
+	double dDistance;
+
+	for (const std::pair<TColor, EHighlightColors>& oColor : s_arHighlightColors)
+	{
+		dDistance = sqrt(pow(oCurrentColor.m_uchRed - oColor.first.m_uchRed, 2) + pow(oCurrentColor.m_uchGreen - oColor.first.m_uchGreen, 2) + pow(oCurrentColor.m_uchBlue - oColor.first.m_uchBlue, 2));
+
+		if (dDistance < dMinDistance)
+		{
+			dMinDistance = dDistance;
+			eSelectedColor = oColor.second;
+		}
+	}
+
+	return eSelectedColor;
+}
+
+TLineSpacing& TLineSpacing::operator-=(const TLineSpacing& oLineSpacing)
+{
+	m_eLineRule -= oLineSpacing.m_eLineRule;
+	m_nLine     -= oLineSpacing.m_nLine;
+	m_nAfter    -= oLineSpacing.m_nAfter;
+	m_nBefore   -= oLineSpacing.m_nBefore;
+
+	return *this;
+}
+
+TInd& TInd::operator-=(const TInd& oInd)
+{
+	m_nFirstLine -= oInd.m_nFirstLine;
+	m_nLeft -= oInd.m_nLeft;
+	m_nRight -= oInd.m_nRight;
+
+	return *this;
+}
+}
diff --git a/HwpFile/HwpDoc/Conversion/StyleConverter.h b/HwpFile/HwpDoc/Conversion/StyleConverter.h
new file mode 100644
index 0000000000..5128ec29e9
--- /dev/null
+++ b/HwpFile/HwpDoc/Conversion/StyleConverter.h
@@ -0,0 +1,253 @@
+#ifndef STYLECONVERTER_H
+#define STYLECONVERTER_H
+
+#include "../HWPElements/HWPRecordParaShape.h"
+#include "../HWPElements/HWPRecordCharShape.h"
+
+#include "ConversionState.h"
+#include "Types.h"
+
+#include <unordered_map>
+
+namespace HWP
+{
+enum class EJs
+{
+	Left,
+	Center,
+	Right,
+	Both,
+	Distribute
+};
+
+enum class ETextAlignment
+{
+	Top,
+	Center,
+	Bottom
+};
+
+enum class ELineRule
+{
+	Auto,
+	Exact,
+	AtLeast
+};
+
+template <class T>
+class CProperty
+{
+public:
+	CProperty();
+
+	void UnSet();
+
+	void SetValue(T oValue);
+	bool IsSet() const;
+
+	T GetValue() const;
+
+	CProperty<T>& operator=(T oValue);
+	CProperty<T>& operator-=(const CProperty<T>& oProperty);
+	operator T() const;
+private:
+	bool m_bIsSet;
+	T m_oValue;
+};
+
+struct TLineSpacing
+{
+	CProperty<ELineRule> m_eLineRule;
+	CProperty<int> m_nLine;
+	CProperty<int> m_nBefore;
+	CProperty<int> m_nAfter;
+
+	TLineSpacing& operator-=(const TLineSpacing& oLineSpacing);
+};
+
+struct TInd
+{
+	CProperty<int> m_nFirstLine;
+	CProperty<int> m_nLeft;
+	CProperty<int> m_nRight;
+
+	TInd& operator-=(const TInd& oInd);
+};
+
+#define CREATE_METHODS_FOR_PROPERTY(type, name)\
+	void Set##name(type oValue);\
+	bool name##IsSet() const;\
+	type Get##name() const
+
+#define CREATE_METHODS_FOR_PROPERTY_BOOL(name)\
+	void Set##name(bool oValue);\
+	bool name##IsSet() const;\
+	bool name() const
+
+class CParagraphsStyle
+{
+public:
+	CParagraphsStyle();
+	CParagraphsStyle& operator-=(const CParagraphsStyle& oParagraphStyle);
+
+	void Clear();
+	bool Empty() const;
+
+	CREATE_METHODS_FOR_PROPERTY_BOOL(KeepNext);
+	CREATE_METHODS_FOR_PROPERTY(int, Ind);
+	CREATE_METHODS_FOR_PROPERTY(EJs, Js);
+	CREATE_METHODS_FOR_PROPERTY(ETextAlignment, TextAlignment);
+	CREATE_METHODS_FOR_PROPERTY(ELineRule, SpacingLineRule);
+	CREATE_METHODS_FOR_PROPERTY(int, FirstLine);
+	CREATE_METHODS_FOR_PROPERTY(int, LeftInd);
+	CREATE_METHODS_FOR_PROPERTY(int, RightInd);
+	CREATE_METHODS_FOR_PROPERTY(int, Spacing);
+	CREATE_METHODS_FOR_PROPERTY(int, SpacingBefore);
+	CREATE_METHODS_FOR_PROPERTY(int, SpacingAfter);
+private:
+	CProperty<bool> m_bKeepNext;
+	TInd m_oInd;
+	CProperty<EJs> m_eJs;
+	CProperty<ETextAlignment> m_eTextAlignment;
+	TLineSpacing    m_oSpacing;
+};
+
+struct TRFonts
+{
+	CProperty<std::wstring> m_wsAscii;
+	CProperty<std::wstring> m_wsEastAsia;
+
+	TRFonts& operator-=(const TRFonts& oRFonts);
+};
+
+enum class EUType
+{
+	Single,
+	Dash,
+	Dotted,
+	DotDash,
+	DotDotDash,
+	Double,
+	Wave,
+	WavyDouble,
+	Thick
+};
+
+struct TU
+{
+	EUType m_eVal;
+	TColor m_oColor;
+
+	bool operator!=(const TU& oU) const;
+};
+
+enum class EStrikeType
+{
+	Single,
+	Double
+};
+
+enum class EHighlightColors
+{
+	Black,
+	Blue,
+	Cyan,
+	Green,
+	Magenta,
+	Red,
+	Yellow,
+	White,
+	DarkBlue,
+	DarkCyan,
+	DarkGreen,
+	DarkMagenta,
+	DarkRed,
+	DarkYellow,
+	DarkGray,
+	LightGray
+};
+
+enum class EVerticalAlignRun
+{
+	Baseline,
+	Superscript,
+	Subscript
+};
+
+struct CRunnerStyle
+{
+public:
+	CRunnerStyle();
+	CRunnerStyle& operator-=(const CRunnerStyle& oRunnerStyle);
+
+	void Clear();
+	bool Empty() const;
+
+	CREATE_METHODS_FOR_PROPERTY(std::wstring, Ascii);
+	CREATE_METHODS_FOR_PROPERTY(std::wstring, EastAsia);
+	CREATE_METHODS_FOR_PROPERTY_BOOL(Bold);
+	CREATE_METHODS_FOR_PROPERTY_BOOL(Italic);
+	CREATE_METHODS_FOR_PROPERTY(int, Sz);
+	CREATE_METHODS_FOR_PROPERTY(TColor, Color);
+	CREATE_METHODS_FOR_PROPERTY(int, ShadeColor);
+	CREATE_METHODS_FOR_PROPERTY(short, Ratio);
+	CREATE_METHODS_FOR_PROPERTY(TU, U);
+	CREATE_METHODS_FOR_PROPERTY(EStrikeType, Strike);
+	CREATE_METHODS_FOR_PROPERTY(short, Spacing);
+	CREATE_METHODS_FOR_PROPERTY(EHighlightColors, Highlight);
+	CREATE_METHODS_FOR_PROPERTY(EVerticalAlignRun, VerticalAlign);
+private:
+	TRFonts m_oRFonts;
+	CProperty<bool> m_bBold;
+	CProperty<bool> m_bItalic;
+	CProperty<int> m_nSz;
+	CProperty<TColor> m_oColor;
+	CProperty<int> m_nShadeColor;
+	CProperty<short> m_shRatio;
+	CProperty<TU> m_oU;
+	CProperty<EStrikeType> m_eStrike;
+	CProperty<short> m_shSpacing;
+	CProperty<EHighlightColors> m_oHighlight;
+	CProperty<EVerticalAlignRun> m_eVerticalAlign;
+};
+
+class CWriterContext;
+class CStyleConverter
+{
+	std::unordered_map<std::wstring, int> m_mUsedStyleNames;
+	std::map<unsigned short, std::wstring> m_mUsedStyles;
+
+	unsigned short m_ushLastParaShapeId;
+	unsigned short m_ushLastCharShapeId;
+
+	NSStringUtils::CStringBuilder m_oStylesXml;
+
+	std::wstring GenerateUniqueID(const std::wstring& wsName);
+
+	static CParagraphsStyle GenerateParagraphStyle(const CHWPRecordParaShape& oParaShape);
+	static CRunnerStyle GenerateRunnerStyle(const CHWPRecordCharShape& oCharShape);
+
+	static void WriteParagraphsStyle(const CParagraphsStyle& oParagraphsStyle, const std::wstring& wsName, const std::wstring& wsLink, NSStringUtils::CStringBuilder& oBuilder);
+
+	static void WriteRunnerStyle(const CRunnerStyle& oRunnerStyle, const std::wstring& wsName, const std::wstring& wsLink, NSStringUtils::CStringBuilder& oBuilder);
+public:
+	CStyleConverter();
+
+	std::wstring CreateStyle(short shParaShapeId, short shParaStyleId, CWriterContext& oContext, TConversionState& oState);
+
+	static void WriteParagraphProperties(const CParagraphsStyle& oParagraphsStyle, NSStringUtils::CStringBuilder& oBuilder);
+	static void WriteRunnerProperties(const CRunnerStyle& oRunnerStyle, NSStringUtils::CStringBuilder& oBuilder);
+
+	static bool WriteDifferenceParagraphStyles(short shFirtsParaShapeId, short shSecondParaShapeId, CWriterContext& oContext, NSStringUtils::CStringBuilder& oBuilder);
+	static bool WriteDifferenceRunnerStyles(short shFirtsCharShapeId, short shSecondCharShapeId, CWriterContext& oContext, NSStringUtils::CStringBuilder& oBuilder);
+
+	unsigned short GetLastParaShapeId() const;
+	unsigned short GetLastCharShapeId() const;
+
+	bool SaveToFile(const std::wstring& wsDirectory);
+};
+
+EHighlightColors NormalizeHighlightColor(const TColor& oCurrentColor);
+}
+
+#endif // STYLECONVERTER_H
diff --git a/HwpFile/HwpDoc/Conversion/Transform.h b/HwpFile/HwpDoc/Conversion/Transform.h
index 3f83f5ac33..7c01cb8d22 100644
--- a/HwpFile/HwpDoc/Conversion/Transform.h
+++ b/HwpFile/HwpDoc/Conversion/Transform.h
@@ -31,45 +31,45 @@ namespace Transform
 		return oSStream.str();
 	}
 
-	short LineWidth2Pt(short shHWPThick)
+	inline short LineWidth2Pt(short shHWPThick)
 	{
 		//TODO:: проверить
-		return (short)std::ceil((double)shHWPThick * 4 * 25.4 / 72.);
+		// return (short)std::ceil((double)shHWPThick * 4 * 25.4 / 72.);
 
 		switch(shHWPThick)
 		{
 			case 0: // 0.1mm
-				return 10;
+				return 2;
 			case 1: // 0.12mm
-				return 12;
+				return 3;
 			case 2: // 0.15mm
-				return 15;
+				return 4;
 			case 3: // 0.2mm
-				return 20;
+				return 5;
 			case 4: // 0.25mm
-				return 25;
+				return 6;
 			case 5: // 0.3mm
-				return 30;
+				return 7;
 			case 6: // 0.4mm
-				return 40;
+				return 9;
 			case 7: // 0.5mm
-				return 50;
+				return 11;
 			case 8: // 0.6mm
-				return 60;
+				return 14;
 			case 9: // 0.7mm
-				return 70;
+				return 16;
 			case 10: // 1.0mm
-				return 100;
+				return 23;
 			case 11: // 1.5mm
-				return 150;
+				return 34;
 			case 12: // 2.0mm
-				return 200;
+				return 46;
 			case 13: // 3.0mm
-				return 300;
+				return 69;
 			case 14: // 4.0mm
-				return 400;
+				return 92 ;
 			case 15: // 5.0mm
-				return 500;
+				return 115;
 			default:
 				return 0;
 		}
diff --git a/HwpFile/HwpDoc/Conversion/Types.h b/HwpFile/HwpDoc/Conversion/Types.h
index 4cc8ffbbbb..4eb2ae3bed 100644
--- a/HwpFile/HwpDoc/Conversion/Types.h
+++ b/HwpFile/HwpDoc/Conversion/Types.h
@@ -1,6 +1,9 @@
 #ifndef TYPES_H
 #define TYPES_H
 
+#include <cwchar>
+#include <string>
+
 namespace HWP
 {
 	struct TBorderLine
@@ -10,6 +13,51 @@ namespace HWP
 		int m_nOuterLineWudth;
 		int nLineDistance;
 	};
+
+	struct TColor
+	{
+		unsigned char m_uchRed;
+		unsigned char m_uchGreen;
+		unsigned char m_uchBlue;
+
+		TColor()
+			: m_uchRed(0x00), m_uchGreen(0x00), m_uchBlue(0x00)
+		{}
+
+		TColor(int nColor)
+		{
+			m_uchRed   = (nColor >> 16 ) & 0xFF;
+			m_uchGreen = (nColor >> 8  ) & 0xFF;
+			m_uchBlue  = (nColor >> 0  ) & 0xFF;
+		}
+
+		TColor(unsigned char uchRed, unsigned char uchGreen, unsigned char chBlue)
+			: m_uchRed(uchRed), m_uchGreen(uchGreen), m_uchBlue(chBlue)
+		{}
+
+		bool operator!=(const TColor& oColor) const
+		{
+			return m_uchRed != oColor.m_uchRed || m_uchGreen != oColor.m_uchGreen || m_uchBlue != oColor.m_uchBlue;
+		}
+
+		std::wstring ToHEX() const
+		{
+			const int tempLen = 7;
+			wchar_t arTemp[tempLen];
+
+			swprintf(arTemp, tempLen, L"%02X%02X%02X", m_uchRed, m_uchGreen, m_uchBlue);
+
+			return std::wstring(arTemp, 6);
+		}
+
+	};
+
+	struct TRelationship
+	{
+		std::wstring m_wsID;
+		std::wstring m_wsType;
+		std::wstring m_wsTarget;
+	};
 }
 
 #endif // TYPES_H
diff --git a/HwpFile/HwpDoc/HWPDocInfo.cpp b/HwpFile/HwpDoc/HWPDocInfo.cpp
index cb9cc18366..09d461a450 100644
--- a/HwpFile/HwpDoc/HWPDocInfo.cpp
+++ b/HwpFile/HwpDoc/HWPDocInfo.cpp
@@ -321,26 +321,12 @@ const CHWPRecord* CHWPDocInfo::GetBinData(const HWP_STRING& sID) const
 	switch (m_eHanType)
 	{
 		case EHanType::HWP:
-		{
-			short shID = std::stoi(sID) - 1;
-
-			if (shID >= m_mBinDatas.size())
-				return nullptr;
-
-			std::map<HWP_STRING, CHWPRecord*>::const_iterator itElement = m_mBinDatas.cbegin();
-
-			for (unsigned short ushIndex = 0; ushIndex < shID; ++ushIndex)
-				++itElement;
-
-			return itElement->second;
-		}
 		case EHanType::HWPX:
 		{
-			if (m_mBinDatas.end() == m_mBinDatas.find(sID))
-				return nullptr;
+			std::map<HWP_STRING, CHWPRecord*>::const_iterator itFound = m_mBinDatas.find(sID);
 
-			return m_mBinDatas.at(sID);
-			break;
+			if (m_mBinDatas.cend() != itFound)
+				return itFound->second;
 		}
 		default:
 			return nullptr;
diff --git a/HwpFile/HwpDoc/HWPElements/HWPRecordBorderFill.cpp b/HwpFile/HwpDoc/HWPElements/HWPRecordBorderFill.cpp
index 503586237b..e41b2e4b45 100644
--- a/HwpFile/HwpDoc/HWPElements/HWPRecordBorderFill.cpp
+++ b/HwpFile/HwpDoc/HWPElements/HWPRecordBorderFill.cpp
@@ -1,5 +1,4 @@
 #include "HWPRecordBorderFill.h"
-#include <regex>
 
 namespace HWP
 {
@@ -61,15 +60,17 @@ EColorFillPattern GetColorFillPattern(int nPattern)
 
 void TBorder::ReadFromNode(CXMLNode& oNode)
 {
-	m_eStyle = GetLineStyle2(oNode.GetAttribute(L"type"));
-	m_nColor = oNode.GetAttributeColor(L"color");
+	m_eStyle  = GetLineStyle2(oNode.GetAttribute(L"type"));
+	m_nColor  = oNode.GetAttributeColor(L"color");
 	m_chWidth = (HWP_BYTE)ConvertWidthToHWP(oNode.GetAttribute(L"width"));
 }
 
 CFill::CFill()
+	: m_nFillType(0)
 {}
 
 CFill::CFill(CHWPStream& oBuffer, int nOff, int nSize)
+	: m_nFillType(0)
 {
 	oBuffer.SavePosition();
 
@@ -90,7 +91,7 @@ CFill::CFill(CHWPStream& oBuffer, int nOff, int nSize)
 	{
 		HWP_BYTE chTypeNum;
 		oBuffer.ReadByte(chTypeNum);
-		m_eGradType = GetGradFillType((int)chTypeNum);
+		m_eGradType = ::HWP::GetGradFillType((int)chTypeNum);
 
 		oBuffer.ReadInt(m_nAngle);
 		oBuffer.ReadInt(m_nCenterX);
@@ -147,6 +148,7 @@ CFill::CFill(CHWPStream& oBuffer, int nOff, int nSize)
 }
 
 CFill::CFill(CXMLNode& oNode)
+	: m_nFillType(0)
 {
 	for (CXMLNode& oChild : oNode.GetChilds())
 	{
@@ -178,7 +180,7 @@ void CFill::ReadWinBrush(CXMLNode& oNode)
 
 void CFill::ReadGradation(CXMLNode& oNode)
 {
-	m_eGradType = GetGradFillType(oNode.GetAttributeInt(L"type"));
+	m_eGradType = ::HWP::GetGradFillType(oNode.GetAttributeInt(L"type"));
 	m_nAngle = oNode.GetAttributeInt(L"angle");
 	m_nCenterX = oNode.GetAttributeInt(L"centerX");
 	m_nCenterY = oNode.GetAttributeInt(L"centerY");
@@ -189,12 +191,12 @@ void CFill::ReadGradation(CXMLNode& oNode)
 
 	std::vector<XmlUtils::CXmlNode> arChilds;
 
-	oNode.GetNodes(L"Color", arChilds);
+	oNode.GetNodes(L"hc:color", arChilds);
 
 	m_arColors.resize(arChilds.size());
 
 	for (unsigned int unIndex = 0; unIndex < arChilds.size(); ++unIndex)
-		m_arColors[unIndex] = ConvertHexToInt(arChilds[unIndex].GetTextA());
+		m_arColors[unIndex] = CXMLNode(arChilds[unIndex]).GetAttributeColor(L"value");
 }
 
 void CFill::ReadImgBrush(CXMLNode& oNode)
@@ -253,6 +255,41 @@ int CFill::GetFaceColor() const
 	return m_nFaceColor;
 }
 
+EGradFillType CFill::GetGradFillType() const
+{
+	return m_eGradType;
+}
+
+int CFill::GetGradAngle() const
+{
+	return m_nAngle;
+}
+
+int CFill::GetGradCenterX() const
+{
+	return m_nCenterX;
+}
+
+int CFill::GetGradCenterY() const
+{
+	return m_nCenterY;
+}
+
+int CFill::GetGradStep() const
+{
+	return m_nStep;
+}
+
+int CFill::GetGradColorNum() const
+{
+	return m_nColorNum;
+}
+
+std::vector<int> CFill::GetGradColors() const
+{
+	return m_arColors;
+}
+
 HWP_STRING CFill::GetBinItemID() const
 {
 	return m_sBinItemID;
diff --git a/HwpFile/HwpDoc/HWPElements/HWPRecordBorderFill.h b/HwpFile/HwpDoc/HWPElements/HWPRecordBorderFill.h
index 55568594a4..b84dbab16f 100644
--- a/HwpFile/HwpDoc/HWPElements/HWPRecordBorderFill.h
+++ b/HwpFile/HwpDoc/HWPElements/HWPRecordBorderFill.h
@@ -101,6 +101,15 @@ public:
 	bool ImageFill() const;
 
 	int GetFaceColor() const;
+
+	EGradFillType GetGradFillType() const;
+	int GetGradAngle() const;
+	int GetGradCenterX() const;
+	int GetGradCenterY() const;
+	int GetGradStep() const;
+	int GetGradColorNum() const;
+	std::vector<int> GetGradColors() const;
+
 	HWP_STRING GetBinItemID() const;
 };
 
diff --git a/HwpFile/HwpDoc/HWPElements/HWPRecordCharShape.cpp b/HwpFile/HwpDoc/HWPElements/HWPRecordCharShape.cpp
index 1c4fa48513..3c472815f3 100644
--- a/HwpFile/HwpDoc/HWPElements/HWPRecordCharShape.cpp
+++ b/HwpFile/HwpDoc/HWPElements/HWPRecordCharShape.cpp
@@ -134,27 +134,26 @@ CHWPRecordCharShape::CHWPRecordCharShape(CHWPDocInfo& oDocInfo, int nTagNum, int
 			m_arFontNames[nIndex] = pFaceName->GetFaceName();
 	}
 
-	#define READ_SHORT (short)(oBuffer[0] & 0x00FF); oBuffer.Skip(1)
+	#define READ_ELEMENT(_type) (_type)(oBuffer[0] & 0x00FF); oBuffer.Skip(1)
 
 	for (int nIndex = 0; nIndex < MAX_ELEMENTS; ++nIndex)
 	{
-		m_arRatios[nIndex] = READ_SHORT;
+		m_arRatios[nIndex] = READ_ELEMENT(short);
 	}
 
 	for (int nIndex = 0; nIndex < MAX_ELEMENTS; ++nIndex)
 	{
-		m_arSpacings[nIndex] = READ_SHORT;
+		m_arSpacings[nIndex] = READ_ELEMENT(HWP_BYTE);
 	}
 
 	for (int nIndex = 0; nIndex < MAX_ELEMENTS; ++nIndex)
 	{
-		m_arRelSizes[nIndex] = READ_SHORT;
+		m_arRelSizes[nIndex] = READ_ELEMENT(short);
 	}
 
 	for (int nIndex = 0; nIndex < MAX_ELEMENTS; ++nIndex)
 	{
-		m_arCharOffset[nIndex] = (HWP_BYTE)(oBuffer[0] & 0x00FF);
-		oBuffer.Skip(1);
+		m_arCharOffset[nIndex] = READ_ELEMENT(HWP_BYTE);
 	}
 
 	oBuffer.ReadInt(m_nHeight);
@@ -184,7 +183,7 @@ CHWPRecordCharShape::CHWPRecordCharShape(CHWPDocInfo& oDocInfo, int nTagNum, int
 	oBuffer.ReadColor(m_nTextColor);
 	oBuffer.ReadColor(m_nUnderlineColor);
 	oBuffer.ReadColor(m_nShadeColor);
-	oBuffer.ReadColor(m_nShadeColor);
+	oBuffer.ReadColor(m_nShadowColor);
 
 	if (nSize > oBuffer.GetDistanceToLastPos())
 		oBuffer.ReadShort(m_shBorderFillIDRef);
@@ -314,6 +313,16 @@ bool CHWPRecordCharShape::StrikeOut() const
 	return ELineStyle2::NONE != m_eStrikeOutShape;
 }
 
+bool CHWPRecordCharShape::SuperScript() const
+{
+	return m_bSuperScript;
+}
+
+bool CHWPRecordCharShape::SubScript() const
+{
+	return m_bSubScript;
+}
+
 int CHWPRecordCharShape::GetHeight() const
 {
 	return m_nHeight;
@@ -360,6 +369,14 @@ HWP_STRING CHWPRecordCharShape::GetFontName(ELang eLang) const
 	return m_arFontNames[(int)eLang];
 }
 
+short CHWPRecordCharShape::GetRatio(ELang eLang) const
+{
+	if (ELang::MAX == eLang)
+		return 0;
+
+	return m_arRatios[(int)eLang];
+}
+
 short CHWPRecordCharShape::GetSpacing(ELang eLang) const
 {
 	if (ELang::MAX == eLang)
@@ -373,6 +390,11 @@ int CHWPRecordCharShape::GetTextColor() const
 	return m_nTextColor;
 }
 
+int CHWPRecordCharShape::GetShadeColor() const
+{
+	return m_nShadeColor;
+}
+
 short CHWPRecordCharShape::GetBorderFillID() const
 {
 	return m_shBorderFillIDRef;
diff --git a/HwpFile/HwpDoc/HWPElements/HWPRecordCharShape.h b/HwpFile/HwpDoc/HWPElements/HWPRecordCharShape.h
index e6d304cdb5..d33a066452 100644
--- a/HwpFile/HwpDoc/HWPElements/HWPRecordCharShape.h
+++ b/HwpFile/HwpDoc/HWPElements/HWPRecordCharShape.h
@@ -109,6 +109,8 @@ public:
 	bool Italic() const;
 	bool Underline() const;
 	bool StrikeOut() const;
+	bool SuperScript() const;
+	bool SubScript() const;
 
 	int GetHeight() const;
 
@@ -121,8 +123,10 @@ public:
 
 	short GetRelSize(ELang eLang) const;
 	HWP_STRING GetFontName(ELang eLang) const;
+	short GetRatio(ELang eLang) const;
 	short GetSpacing(ELang eLang) const;
 	int GetTextColor() const;
+	int GetShadeColor() const;
 
 	short GetBorderFillID() const;
 };
diff --git a/HwpFile/HwpDoc/HWPElements/HWPRecordParaShape.cpp b/HwpFile/HwpDoc/HWPElements/HWPRecordParaShape.cpp
index 42b5e4a790..a5d1a06264 100644
--- a/HwpFile/HwpDoc/HWPElements/HWPRecordParaShape.cpp
+++ b/HwpFile/HwpDoc/HWPElements/HWPRecordParaShape.cpp
@@ -228,14 +228,19 @@ void CHWPRecordParaShape::RecursiveParaShape(CXMLNode& oNode)
 		m_nMarginPrev = oNode.GetAttributeInt(L"value");
 	else if (L"hc:next" == oNode.GetName())
 		m_nMarginNext = oNode.GetAttributeInt(L"value");
-	else if (L"hp:switch" == oNode.GetName() ||
+	else if (/*L"hp:switch" == oNode.GetName() ||
 	         L"hp:case" == oNode.GetName() ||
-	         L"hp:default" == oNode.GetName() ||
+	         L"hp:default" == oNode.GetName() ||*/
 	         L"hh:margin" == oNode.GetName())
 	{
 		for (CXMLNode& oChild : oNode.GetChilds())
 			RecursiveParaShape(oChild);
 	}
+	else if (L"hp:switch" == oNode.GetName())
+	{
+		for (CXMLNode& oChild : oNode.GetChild(L"hp:default").GetChilds())
+			RecursiveParaShape(oChild);
+	}
 }
 
 EHorizontalAlign CHWPRecordParaShape::GetHorizantalAlign() const
@@ -293,6 +298,16 @@ int CHWPRecordParaShape::GetIndent() const
 	return m_nIndent;
 }
 
+int CHWPRecordParaShape::GetLeftIndent() const
+{
+	return m_nMarginLeft;
+}
+
+int CHWPRecordParaShape::GetRightIndent() const
+{
+	return m_nMarginRight;
+}
+
 bool CHWPRecordParaShape::KeepWithNext() const
 {
 	return m_bKeepWithNext;
diff --git a/HwpFile/HwpDoc/HWPElements/HWPRecordParaShape.h b/HwpFile/HwpDoc/HWPElements/HWPRecordParaShape.h
index f0498c2ea0..55193ee47d 100644
--- a/HwpFile/HwpDoc/HWPElements/HWPRecordParaShape.h
+++ b/HwpFile/HwpDoc/HWPElements/HWPRecordParaShape.h
@@ -91,6 +91,8 @@ public:
 	int GetMarginNext() const;
 
 	int GetIndent() const;
+	int GetLeftIndent() const;
+	int GetRightIndent() const;
 
 	bool KeepWithNext() const;
 };
diff --git a/HwpFile/HwpDoc/HWPElements/HWPRecordParaText.cpp b/HwpFile/HwpDoc/HWPElements/HWPRecordParaText.cpp
index 89161d88be..d4fa2e0023 100644
--- a/HwpFile/HwpDoc/HWPElements/HWPRecordParaText.cpp
+++ b/HwpFile/HwpDoc/HWPElements/HWPRecordParaText.cpp
@@ -30,95 +30,168 @@ LIST<CCtrl*> CHWPRecordParaText::Parse(int nTagNum, int nLevel, int nSize, CHWPS
 
 	HWP_STRING sText;
 	oBuffer.ReadString(sText, nSize, EStringCharacter::UTF16);
+	oBuffer.Skip(nSize - oBuffer.GetDistanceToLastPos(true));
 
 	if (sText.empty())
-	{
-		oBuffer.Skip(nSize - oBuffer.GetDistanceToLastPos(true));
 		return LIST<CCtrl*>();
-	}
 
-	//TODO:: перейти на обычный проход по символам
-	std::wregex oRegex(L"([\\u0000-\\u001f]|.{2}[\\u0000-\\u0017]{4})"); // [\\u0000\\u000a\\u000d\\u0018-\\u001f]|[\\u0001\\u0002-\\u0009\\u000b-\\u000c\\u000e-\\u0017].{6}[\\u0001\\u0002-\\u0009\\u000b-\\u000c\\u000e-\\u0017]
-	std::wsregex_iterator itCurrent(sText.begin(), sText.end(), oRegex);
-	std::wsregex_iterator itEnd = std::wsregex_iterator();
+	HWP_STRING::const_iterator itFound = std::find_if(sText.cbegin(), sText.cend(), [](wchar_t wChar){ return wChar < 0x20; });
 
-	int nPrevIndex = 0;
+	if (sText.cend() == itFound)
+		return {new CParaText(L"____", sText, 0)};
 
 	LIST<CCtrl*> arParas;
 
 	HWP_STRING sCurrentText;
-	bool bEnd = false;
+	int nStartText = -1;
 
-	#define UPDATE_CURRENT_TEXT() \
-	do { \
-	if (!sCurrentText.empty() && (unsigned int)sCurrentText[0] > 0x001f) \
-	{ \
-		arParas.push_back(new CParaText(L"____", sCurrentText, nPrevIndex + 1)); \
-		sCurrentText.clear(); \
-	}} while (false)
+	#define UPDATE_CURRENT_TEXT()\
+	do{\
+	if (!sCurrentText.empty())\
+	{\
+		arParas.push_back(new CParaText(L"____", sCurrentText, nStartText + 1));\
+		sCurrentText.clear();\
+	}}\
+	while(false)
 
-	while(itCurrent != itEnd && !bEnd)
+	for (unsigned int unIndex = 0; unIndex < sText.length(); ++unIndex)
 	{
-		if (itCurrent->position() > nPrevIndex)
+		if (0x20 > (int)sText[unIndex])
 		{
-			// write text
-			sCurrentText += sText.substr(nPrevIndex, itCurrent->position() - nPrevIndex);
-		}
-
-		if (1 == itCurrent->length())
-		{
-			switch(itCurrent->str()[0])
+			switch ((int)sText[unIndex])
 			{
-				case 0x00:
-				case 0x02:
-				// case 0x17:
-				// case 0x19:
+				case 0x00: // Unusable
+					continue;
+				case 0x01: // Scheduling
+				case 0x02: // Define Zones/Define Units
+				case 0x03: // Field start
+				case 0x04: // End of field
+				case 0x0b: // Drawing objects/tables
+				case 0x0c: // Scheduling
+				case 0x0e: // Scheduling
+				case 0x0f: // Behind the scenes
+				case 0x10: // Header/Footer
+				case 0x11: // Footnotes/endnotes
+				case 0x12: // Auto-numbering (footnotes, tables, etc.)
+				case 0x15: // Page controls (hide, start with new number, etc.)
+				case 0x16: // Bookmark/Browse Marks
+				case 0x17: // Comment/Text Overlap
 				{
-					sCurrentText.clear();
+					HWP_STRING sType;
+
+					unsigned int unInfoLength = 0;
+
+					if (sText.length() > unIndex + 6 && sText[unIndex] == sText[unIndex + 6] && sText[unIndex + 1] >= 0x20)
+						unInfoLength = 4;
+					else if (sText.length() > unIndex + 7 && sText[unIndex] == sText[unIndex + 7] && sText[unIndex + 1] >= 0x20)
+						unInfoLength = 5;
+					else if (6 >= unIndex && unIndex > 2) //Случай, когда запись в самом начале
+					{
+						nStartText = -1;
+						sCurrentText.clear();
+
+						sType.resize(4);
+						sType[0] = (sText[0] & 0xFF);
+						sType[1] = ((sText[0] >> 8) & 0xFF);
+						sType[2] = (sText[1] & 0xFF);
+						sType[3] = ((sText[1] >> 8) & 0xFF);
+
+						unInfoLength = 4;
+						unIndex = 0;
+					}
+					else
+						continue;
+
+					if (sType.empty())
+					{
+						UPDATE_CURRENT_TEXT();
+
+						sType.resize(4);
+
+						sType[0] = (sText[unIndex + 1] & 0xFF);
+						sType[1] = ((sText[unIndex + 1] >> 8) & 0xFF);
+						sType[2] = (sText[unIndex + 2] & 0xFF);
+						sType[3] = ((sText[unIndex + 2] >> 8) & 0xFF);
+					}
+
+					if (0x17 >= sType[3])
+						sType[3] = L' ';
+
+					if (L"daeh" == sType ||
+					    L"tood" == sType)
+						arParas.push_back(new CCtrlHeadFoot(sType));
+					else if (L"onta" == sType)
+						arParas.push_back(new CCtrlAutoNumber(sType));
+					else if (L"pngp" == sType)
+						arParas.push_back(new CCtrlPageNumPos(sType));
+					else if (L"onwn" == sType)
+						arParas.push_back(new CCtrlNewNumber(sType));
+					else if (L"dces" == sType)
+						arParas.push_back(new CCtrlSectionDef(sType));
+					else if (L"dloc" == sType)
+						arParas.push_back(new CCtrlColumnDef(sType));
+					else if (L"  nf" == sType ||
+					         L"  ne" == sType)
+						arParas.push_back(new CCtrlNote(sType));
+					else if (L" osg" == sType)
+						arParas.push_back(new CCtrlGeneralShape(sType));
+					else if (L" lbt" == sType)
+						arParas.push_back(new CCtrlTable(sType));
+					else if (L"deqe" == sType)
+						arParas.push_back(new CCtrlEqEdit(sType));
+					else if (L"klh%" == sType ||  // hyperlink start
+					         L"klh " == sType ||  // hyperlink end
+					         L"kmb%" == sType ||  // bookmark start
+					         L"kmb " == sType)    // bookmark end
+						arParas.push_back(new CCtrlField(sType));
+
+					unIndex += unInfoLength + 2;
 					break;
 				}
-				case 0x03:
-				case 0x04:
+				case 0x05: // Scheduling
+				case 0x06: // Scheduling
+				case 0x07: // Scheduling
+				case 0x08: // Title mark
+				case 0x09: // Tabs
+				case 0x13: // Scheduling
+				case 0x14: // Scheduling
 				{
 					UPDATE_CURRENT_TEXT();
+
+					if (sText.length() < unIndex + 6 || sText[unIndex] != sText[unIndex + 6])
+						continue;
+					unIndex += 6;
 					break;
 				}
-				case 0x08:
-				{
-					if (!sCurrentText.empty())
-						sCurrentText.pop_back();
-					break;
-				}
-				case 0x09:
-				{
-					sCurrentText.push_back(L'\t');
-					break;
-				}
-				case 0x0b:
-				{
-					sCurrentText.push_back(L'\v');
-					break;
-				}
-				case 0x0a:
+				case 0x0a: // End of line (line break)
 				{
 					UPDATE_CURRENT_TEXT();
 					arParas.push_back(new CCtrlCharacter(L"   _", ECtrlCharType::LINE_BREAK));
 					break;
 				}
-				case 0x0d:
+				case 0x0d: // End of paragraph (para break)
 				{
 					UPDATE_CURRENT_TEXT();
 					arParas.push_back(new CCtrlCharacter(L"   _", ECtrlCharType::PARAGRAPH_BREAK));
 					break;
 				}
-				case 0x18:
+				case 0x18:// hyphen
 				{
 					UPDATE_CURRENT_TEXT();
 					arParas.push_back(new CCtrlCharacter(L"   _", ECtrlCharType::HARD_HYPHEN));
 					break;
 				}
-				case 0x1e:
-				case 0x1f:
+				case 0x19: // Scheduling
+				case 0x1a: // Scheduling
+				case 0x1b: // Scheduling
+				case 0x1c: // Scheduling
+				case 0x1d: // Scheduling
+				{
+					UPDATE_CURRENT_TEXT();
+					continue;
+				}
+				case 0x1e: // Tied blanks
+				case 0x1f: // Fixed-width blanks
 				{
 					UPDATE_CURRENT_TEXT();
 					arParas.push_back(new CCtrlCharacter(L"   _", ECtrlCharType::HARD_SPACE));
@@ -126,68 +199,18 @@ LIST<CCtrl*> CHWPRecordParaText::Parse(int nTagNum, int nLevel, int nSize, CHWPS
 				}
 			}
 		}
-		// Пока данный вариант невозможен
-		else if (6 == itCurrent->length())
+		else
 		{
-			UPDATE_CURRENT_TEXT();
+			if (nStartText < 0)
+				nStartText = unIndex;
 
-			//TODO:: Проверить
-			HWP_STRING sInfo = sText.substr(itCurrent->position(), 2);
-			std::wregex wrReplaceRegex(L"[\\u0000-\\u0017]+$");
-			sInfo = std::regex_replace(sInfo, wrReplaceRegex, L"");
-
-			HWP_STRING sType;
-			sType.resize(4);
-
-			sType[0] = (sInfo[0] & 0xFF);
-			sType[1] = ((sInfo[0] >> 8) & 0xFF);
-			sType[2] = (sInfo[1] & 0xFF);
-			sType[3] = ((sInfo[1] >> 8) & 0xFF);
-
-			if (0x17 >= sType[3])
-				sType[3] = L' ';
-
-			//TODO:: более подробно разобраться в данном моменте
-			if (L"daeh" == sType ||
-			    L"tood" == sType)
-				arParas.push_back(new CCtrlHeadFoot(sType));
-			else if (L"onta" == sType)
-				arParas.push_back(new CCtrlAutoNumber(sType));
-			else if (L"pngp" == sType)
-				arParas.push_back(new CCtrlPageNumPos(sType));
-			else if (L"onwn" == sType)
-				arParas.push_back(new CCtrlNewNumber(sType));
-			else if (L"dces" == sType)
-				arParas.push_back(new CCtrlSectionDef(sType));
-			else if (L"dloc" == sType)
-				arParas.push_back(new CCtrlColumnDef(sType));
-			else if (L"  nf" == sType ||
-			         L"  ne" == sType)
-				arParas.push_back(new CCtrlNote(sType));
-			else if (L" osg" == sType)
-				arParas.push_back(new CCtrlGeneralShape(sType));
-			else if (L" lbt" == sType)
-				arParas.push_back(new CCtrlTable(sType));
-			else if (L"deqe" == sType)
-				arParas.push_back(new CCtrlEqEdit(sType));
-			else if (L"klh%" == sType ||  // hyperlink start
-			         L"klh " == sType ||  // hyperlink end
-			         L"kmb%" == sType ||  // bookmark start
-			         L"kmb " == sType)    // bookmark end
-				arParas.push_back(new CCtrlField(sType));
+			sCurrentText.push_back(sText[unIndex]);
 		}
-
-		nPrevIndex = itCurrent->position() + itCurrent->length();
-		++itCurrent;
 	}
 
-	if (!bEnd)
-		sCurrentText += sText.substr(nPrevIndex);
-
 	if (!sCurrentText.empty())
-		arParas.push_back(new CParaText(L"____", sCurrentText, nPrevIndex + 1));
+		arParas.push_back(new CParaText(L"____", sCurrentText, (0 == nStartText) ? 0 : (nStartText + 1)));
 
-	oBuffer.Skip(nSize - oBuffer.GetDistanceToLastPos(true));
 	return arParas;
 }
 }
diff --git a/HwpFile/HwpDoc/HWPElements/HWPRecordStyle.cpp b/HwpFile/HwpDoc/HWPElements/HWPRecordStyle.cpp
index 3b1834cadc..c287a95034 100644
--- a/HwpFile/HwpDoc/HWPElements/HWPRecordStyle.cpp
+++ b/HwpFile/HwpDoc/HWPElements/HWPRecordStyle.cpp
@@ -38,4 +38,44 @@ CHWPRecordStyle::CHWPRecordStyle(CHWPDocInfo& oDocInfo, CXMLNode& oNode, int nVe
 	m_shLangID = oNode.GetAttributeInt(L"langID");
 	m_bLockForm = oNode.GetAttributeBool(L"lockForm");
 }
+
+HWP_STRING CHWPRecordStyle::GetName() const
+{
+	return m_sName;
+}
+
+HWP_STRING CHWPRecordStyle::GetEngName() const
+{
+	return m_sEngName;
+}
+
+HWP_BYTE CHWPRecordStyle::GetType() const
+{
+	return m_chType;
+}
+
+HWP_BYTE CHWPRecordStyle::GetNextStyle() const
+{
+	return m_chNextStyle;
+}
+
+short CHWPRecordStyle::GetLangId() const
+{
+	return m_shLangID;
+}
+
+int CHWPRecordStyle::GetParaShapeId() const
+{
+	return m_nParaShape;
+}
+
+int CHWPRecordStyle::GetCharShapeId() const
+{
+	return m_nCharShape;
+}
+
+bool CHWPRecordStyle::LockForm() const
+{
+	return m_bLockForm;
+}
 }
diff --git a/HwpFile/HwpDoc/HWPElements/HWPRecordStyle.h b/HwpFile/HwpDoc/HWPElements/HWPRecordStyle.h
index 123fea9b57..6715dce63f 100644
--- a/HwpFile/HwpDoc/HWPElements/HWPRecordStyle.h
+++ b/HwpFile/HwpDoc/HWPElements/HWPRecordStyle.h
@@ -23,6 +23,15 @@ public:
 	CHWPRecordStyle(int nTagNum, int nLevel, int nSize);
 	CHWPRecordStyle(CHWPDocInfo& oDocInfo, int nTagNum, int nLevel, int nSize, CHWPStream& oBuffer, int nOff, int nVersion);
 	CHWPRecordStyle(CHWPDocInfo& oDocInfo, CXMLNode& oNode, int nVersion);
+
+	HWP_STRING GetName() const;
+	HWP_STRING GetEngName() const;
+	HWP_BYTE GetType() const;
+	HWP_BYTE GetNextStyle() const;
+	short GetLangId() const;
+	int GetParaShapeId() const;
+	int GetCharShapeId() const;
+	bool LockForm() const;
 };
 }
 
diff --git a/HwpFile/HwpDoc/HWPFile.cpp b/HwpFile/HwpDoc/HWPFile.cpp
index b0dd099d10..65fd1e7d4f 100644
--- a/HwpFile/HwpDoc/HWPFile.cpp
+++ b/HwpFile/HwpDoc/HWPFile.cpp
@@ -121,7 +121,20 @@ bool CHWPFile::GetComponent(const HWP_STRING& sEntryName, CHWPStream& oBuffer)
 {
 	return m_oOleFile.GetComponent(sEntryName, oBuffer);
 }
+
 //------------
+bool CompareStrings(const HWP_STRING& sFirst, const HWP_STRING& sSecond)
+{
+	if (sFirst.length() != sSecond.length())
+		return false;
+
+	for (unsigned int unIndex = 0; unIndex < sFirst.length(); ++unIndex)
+		if (tolower(sFirst[unIndex]) != tolower(sSecond[unIndex]))
+			return false;
+
+	return true;
+}
+
 CDirectoryEntry* CHWPFile::FindChildEntry(const HWP_STRING& sBasePath, const CDirectoryEntry& oBaseEntry, const HWP_STRING& sEntryName) const
 {
 	for (CDirectoryEntry* pEntry : m_oOleFile.GetChildEntries(&oBaseEntry))
@@ -134,7 +147,7 @@ CDirectoryEntry* CHWPFile::FindChildEntry(const HWP_STRING& sBasePath, const CDi
 		}
 		else
 		{
-			if (sEntryName == pEntry->GetDirectoryEntryName())
+			if (CompareStrings(sEntryName, pEntry->GetDirectoryEntryName()))
 				return pEntry;
 		}
 	}
diff --git a/HwpFile/HwpDoc/Paragraph/CtrlAutoNumber.h b/HwpFile/HwpDoc/Paragraph/CtrlAutoNumber.h
index 1d28a62ae6..9b7906a5c8 100644
--- a/HwpFile/HwpDoc/Paragraph/CtrlAutoNumber.h
+++ b/HwpFile/HwpDoc/Paragraph/CtrlAutoNumber.h
@@ -9,7 +9,6 @@
 
 namespace HWP
 {
-
 enum class ENumType
 {
 	PAGE,
diff --git a/HwpFile/HwpDoc/Paragraph/CtrlCharacter.cpp b/HwpFile/HwpDoc/Paragraph/CtrlCharacter.cpp
index 463e6fc7ef..9f64a2e640 100644
--- a/HwpFile/HwpDoc/Paragraph/CtrlCharacter.cpp
+++ b/HwpFile/HwpDoc/Paragraph/CtrlCharacter.cpp
@@ -3,7 +3,7 @@
 namespace HWP
 {
 CCtrlCharacter::CCtrlCharacter(const HWP_STRING& sCtrlID, ECtrlCharType eCtrlChar)
-	: CCtrl(sCtrlID), m_eCtrlChar(eCtrlChar)
+	: CCtrl(sCtrlID), m_eCtrlChar(eCtrlChar), m_nCharShapeID(0)
 {}
 
 CCtrlCharacter::CCtrlCharacter(const HWP_STRING& sCtrlID, ECtrlCharType eCtrlChar, int nCharShapeID)
@@ -20,7 +20,6 @@ int CCtrlCharacter::GetCharShapeId() const
 	return m_nCharShapeID;
 }
 
-
 ECtrlCharType CCtrlCharacter::GetType() const
 {
 	return m_eCtrlChar;
diff --git a/HwpFile/HwpDoc/Paragraph/CtrlCommon.cpp b/HwpFile/HwpDoc/Paragraph/CtrlCommon.cpp
index 0e8ea2642c..e28b3671cb 100644
--- a/HwpFile/HwpDoc/Paragraph/CtrlCommon.cpp
+++ b/HwpFile/HwpDoc/Paragraph/CtrlCommon.cpp
@@ -1,5 +1,6 @@
 #include "CtrlCommon.h"
 #include "../Common/Common.h"
+#include <climits>
 
 #include "CapParagraph.h"
 
@@ -142,15 +143,15 @@ namespace HWP
 	}
 
 	CCtrlCommon::CCtrlCommon()
-		: m_nVertOffset(0), m_nHorzOffset(0)
+	    : m_bTreatAsChar(false), m_eVertRelTo(EVRelTo::PARA), m_eHorzRelTo(EHRelTo::PARA), m_nVertOffset(0), m_nHorzOffset(0), m_nWidth(0), m_nHeight(0), m_arOutMargin{0, 0, 0, 0}, m_arInMargin{0, 0, 0, 0}
 	{}
 
 	CCtrlCommon::CCtrlCommon(const HWP_STRING& sCtrlID)
-		: CCtrl(sCtrlID), m_eTextVerAlign(EVertAlign::TOP)
+		: CCtrl(sCtrlID), m_bTreatAsChar(false), m_eVertRelTo(EVRelTo::PARA), m_eHorzRelTo(EHRelTo::PARA), m_nVertOffset(0), m_nHorzOffset(0), m_nWidth(0), m_nHeight(0), m_arOutMargin{0, 0, 0, 0}, m_arInMargin{0, 0, 0, 0}, m_eTextVerAlign(EVertAlign::TOP)
 	{}
 
 	CCtrlCommon::CCtrlCommon(const CCtrlCommon& oCtrlCommon)
-		: CCtrl(oCtrlCommon.GetID())
+		: CCtrl(oCtrlCommon.GetID()), m_nWidth(0), m_nHeight(0), m_arOutMargin{0, 0, 0, 0}, m_arInMargin{0, 0, 0, 0}
 	{
 		m_nObjAttr = oCtrlCommon.m_nObjAttr;
 		m_bTreatAsChar = oCtrlCommon.m_bTreatAsChar;
@@ -203,7 +204,7 @@ namespace HWP
 	}
 
 	CCtrlCommon::CCtrlCommon(const HWP_STRING& sCtrlID, int nSize, CHWPStream& oBuffer, int nOff, int nVersion)
-		: CCtrl(sCtrlID)
+		: CCtrl(sCtrlID), m_nWidth(0), m_nHeight(0), m_arOutMargin{0, 0, 0, 0}, m_arInMargin{0, 0, 0, 0}
 	{
 		oBuffer.SavePosition();
 
@@ -240,7 +241,7 @@ namespace HWP
 	}
 
 	CCtrlCommon::CCtrlCommon(const HWP_STRING& sCtrlID, CXMLNode& oNode, int nVersion)
-	    : CCtrl(sCtrlID), m_eTextVerAlign(EVertAlign::TOP)
+	    : CCtrl(sCtrlID), m_bTreatAsChar(false), m_eVertRelTo(EVRelTo::PARA), m_eHorzRelTo(EHRelTo::PARA), m_nVertOffset(0), m_nHorzOffset(0), m_nWidth(0), m_nHeight(0), m_arOutMargin{0, 0, 0, 0},  m_arInMargin{0, 0, 0, 0}, m_eTextVerAlign(EVertAlign::TOP)
 	{
 		m_nObjInstanceID = std::abs(oNode.GetAttributeInt(L"id"));
 
@@ -315,6 +316,13 @@ namespace HWP
 				m_arOutMargin[2] = oChild.GetAttributeInt(L"top");
 				m_arOutMargin[3] = oChild.GetAttributeInt(L"bottom");
 			}
+			else if (L"hp:inMargin" == oChild.GetName())
+			{
+				m_arInMargin[0] = oChild.GetAttributeInt(L"left");
+				m_arInMargin[1] = oChild.GetAttributeInt(L"right");
+				m_arInMargin[2] = oChild.GetAttributeInt(L"top");
+				m_arInMargin[3] = oChild.GetAttributeInt(L"bottom");
+			}
 			else if (L"hp:caption" == oChild.GetName())
 			{
 				HWP_STRING sType = oChild.GetAttribute(L"side");
@@ -397,26 +405,46 @@ namespace HWP
 		return m_arParas[unIndex];
 	}
 
-	short CCtrlCommon::GetLeftMargin() const
+	short CCtrlCommon::GetLeftOutMargin() const
 	{
 		return m_arOutMargin[0];
 	}
 
-	short CCtrlCommon::GetTopMargin() const
+	short CCtrlCommon::GetTopOutMargin() const
 	{
 		return m_arOutMargin[2];
 	}
 
-	short CCtrlCommon::GetRightMargin() const
+	short CCtrlCommon::GetRightOutMargin() const
 	{
 		return m_arOutMargin[1];
 	}
 
-	short CCtrlCommon::GetBottomMargin() const
+	short CCtrlCommon::GetBottomOutMargin() const
 	{
 		return m_arOutMargin[3];
 	}
 
+	short CCtrlCommon::GetLeftInMargin() const
+	{
+		return m_arInMargin[0];
+	}
+
+	short CCtrlCommon::GetTopInMargin() const
+	{
+		return m_arInMargin[2];
+	}
+
+	short CCtrlCommon::GetRightInMargin() const
+	{
+		return m_arInMargin[1];
+	}
+
+	short CCtrlCommon::GetBottomInMargin() const
+	{
+		return m_arInMargin[3];
+	}
+
 	bool CCtrlCommon::GetTreatAsChar() const
 	{
 		return m_bTreatAsChar;
@@ -429,11 +457,17 @@ namespace HWP
 
 	int CCtrlCommon::GetHorzOffset() const
 	{
+		if (INT_MAX == m_nHorzOffset || INT_MIN == m_nHorzOffset)
+			return 0;
+
 		return m_nHorzOffset;
 	}
 
 	int CCtrlCommon::GetVertOffset() const
 	{
+		if (INT_MAX == m_nVertOffset || INT_MIN == m_nVertOffset)
+			return 0;
+
 		return m_nVertOffset;
 	}
 
diff --git a/HwpFile/HwpDoc/Paragraph/CtrlCommon.h b/HwpFile/HwpDoc/Paragraph/CtrlCommon.h
index 525d88e7ce..a3d80e3b8b 100644
--- a/HwpFile/HwpDoc/Paragraph/CtrlCommon.h
+++ b/HwpFile/HwpDoc/Paragraph/CtrlCommon.h
@@ -91,6 +91,7 @@ class CCtrlCommon : public CCtrl
 	int m_nHeight;
 	int m_nZOrder;
 	short m_arOutMargin[4];
+	short m_arInMargin [4];
 	int m_nObjInstanceID;
 	int m_nBlockPageBreak;
 	HWP_STRING m_sObjDesc;
@@ -127,10 +128,15 @@ public:
 	unsigned int GetCountParagraphs() const;
 	const CHWPPargraph* GetParagraphs(unsigned int unIndex) const;
 
-	short GetLeftMargin() const;
-	short GetTopMargin() const;
-	short GetRightMargin() const;
-	short GetBottomMargin() const;
+	short GetLeftOutMargin() const;
+	short GetTopOutMargin() const;
+	short GetRightOutMargin() const;
+	short GetBottomOutMargin() const;
+
+	short GetLeftInMargin() const;
+	short GetTopInMargin() const;
+	short GetRightInMargin() const;
+	short GetBottomInMargin() const;
 
 	bool GetTreatAsChar() const;
 	bool GetFlowWithText() const;
diff --git a/HwpFile/HwpDoc/Paragraph/CtrlContainer.cpp b/HwpFile/HwpDoc/Paragraph/CtrlContainer.cpp
index 320aaeec06..42f98354d4 100644
--- a/HwpFile/HwpDoc/Paragraph/CtrlContainer.cpp
+++ b/HwpFile/HwpDoc/Paragraph/CtrlContainer.cpp
@@ -57,7 +57,7 @@ CCtrlContainer::CCtrlContainer(const HWP_STRING& sCtrlID, CXMLNode& oNode, int n
 
 CCtrlContainer::~CCtrlContainer()
 {
-	for (CCtrlGeneralShape* pElement : m_arShapes)
+	for (const CCtrlGeneralShape* pElement : m_arShapes)
 	{
 		if (nullptr != pElement)
 			delete pElement;
@@ -79,7 +79,7 @@ bool CCtrlContainer::Empty() const
 	return m_arShapes.empty();
 }
 
-std::vector<CCtrlGeneralShape*> CCtrlContainer::GetShapes() const
+VECTOR<CCtrlGeneralShape*> CCtrlContainer::GetShapes() const
 {
 	return m_arShapes;
 }
diff --git a/HwpFile/HwpDoc/Paragraph/CtrlNewNumber.cpp b/HwpFile/HwpDoc/Paragraph/CtrlNewNumber.cpp
index f0052b7a83..b6f8dcfd10 100644
--- a/HwpFile/HwpDoc/Paragraph/CtrlNewNumber.cpp
+++ b/HwpFile/HwpDoc/Paragraph/CtrlNewNumber.cpp
@@ -12,7 +12,7 @@ CCtrlNewNumber::CCtrlNewNumber(const HWP_STRING& sCtrlID, int nSize, CHWPStream&
 	int nAttr;
 	oBuffer.ReadInt(nAttr);
 
-	m_eNumType = GetNumType(nAttr & 0xF);
+	m_eNumType = ::HWP::GetNumType(nAttr & 0xF);
 	m_eNumShape = GetNumberShape2((nAttr >> 4) & 0xF);
 
 	oBuffer.ReadShort(m_shNum);
@@ -24,7 +24,7 @@ CCtrlNewNumber::CCtrlNewNumber(const HWP_STRING& sCtrlID, CXMLNode& oNode, int n
 	: CCtrl(sCtrlID)
 {
 	m_shNum = oNode.GetAttributeInt(L"num");
-	m_eNumType = GetNumType(oNode.GetAttributeInt(L"numType"));
+	m_eNumType = ::HWP::GetNumType(oNode.GetAttribute(L"numType"));
 	//TODO:: проверить данный момент
 	m_eNumShape = GetNumberShape2(oNode.GetAttributeInt(L"autoNumFormat"));
 
@@ -35,4 +35,14 @@ ECtrlObjectType CCtrlNewNumber::GetCtrlType() const
 {
 	return ECtrlObjectType::NewNumber;
 }
+
+ENumType CCtrlNewNumber::GetNumType() const
+{
+	return m_eNumType;
+}
+
+short CCtrlNewNumber::GetNum() const
+{
+	return m_shNum;
+}
 }
diff --git a/HwpFile/HwpDoc/Paragraph/CtrlNewNumber.h b/HwpFile/HwpDoc/Paragraph/CtrlNewNumber.h
index a2d82efdee..845b3f2e2f 100644
--- a/HwpFile/HwpDoc/Paragraph/CtrlNewNumber.h
+++ b/HwpFile/HwpDoc/Paragraph/CtrlNewNumber.h
@@ -16,6 +16,9 @@ public:
 	CCtrlNewNumber(const HWP_STRING& sCtrlID, CXMLNode& oNode, int nVersion);
 
 	ECtrlObjectType GetCtrlType() const override;
+
+	ENumType GetNumType() const;
+	short GetNum() const;
 };
 }
 
diff --git a/HwpFile/HwpDoc/Paragraph/CtrlObjElement.cpp b/HwpFile/HwpDoc/Paragraph/CtrlObjElement.cpp
index 8e8700aee7..3577795689 100644
--- a/HwpFile/HwpDoc/Paragraph/CtrlObjElement.cpp
+++ b/HwpFile/HwpDoc/Paragraph/CtrlObjElement.cpp
@@ -3,14 +3,24 @@
 namespace HWP
 {
 CCtrlObjElement::CCtrlObjElement()
-{
-	InitMatrix();
-}
+{}
 
 CCtrlObjElement::CCtrlObjElement(const HWP_STRING& sCtrlID)
 	: CCtrlCommon(sCtrlID)
+{}
+
+TMatrix ReadMatrix(CHWPStream& oBuffer)
 {
-	InitMatrix();
+	TMatrix oMatrix;
+
+	oBuffer.ReadDouble(oMatrix.m_dM11);
+	oBuffer.ReadDouble(oMatrix.m_dM12);
+	oBuffer.ReadDouble(oMatrix.m_dDX);
+	oBuffer.ReadDouble(oMatrix.m_dM21);
+	oBuffer.ReadDouble(oMatrix.m_dM22);
+	oBuffer.ReadDouble(oMatrix.m_dDY);
+
+	return oMatrix;
 }
 
 CCtrlObjElement::CCtrlObjElement(const CCtrlObjElement& oObjElement)
@@ -20,8 +30,8 @@ CCtrlObjElement::CCtrlObjElement(const CCtrlObjElement& oObjElement)
 	m_nYGrpOffset = oObjElement.m_nYGrpOffset;
 	m_shNGrp = oObjElement.m_shNGrp;
 	m_shVer = oObjElement.m_shVer;
-	m_nIniWidth = oObjElement.m_nIniWidth;
-	m_nIniHeight = oObjElement.m_nIniHeight;
+	m_nOrgWidth = oObjElement.m_nOrgWidth;
+	m_nOrgHeight = oObjElement.m_nOrgHeight;
 	m_nCurWidth = oObjElement.m_nCurWidth;
 	m_nCurHeight = oObjElement.m_nCurHeight;
 	m_bHorzFlip = oObjElement.m_bHorzFlip;
@@ -30,33 +40,31 @@ CCtrlObjElement::CCtrlObjElement(const CCtrlObjElement& oObjElement)
 	m_nXCenter = oObjElement.m_nXCenter;
 	m_nYCenter = oObjElement.m_nYCenter;
 	m_shMatCnt = oObjElement.m_shMatCnt;
-
-	m_arMatrix.resize(6);
-	for (unsigned int unIndex = 0; unIndex < 6; ++unIndex)
-		m_arMatrix[unIndex] = oObjElement.m_arMatrix[unIndex];
-
-	m_arMatrixSeq.resize(oObjElement.m_arMatrixSeq.size());
-	for (unsigned int unIndex = 0; unIndex < oObjElement.m_arMatrixSeq.size(); ++unIndex)
-		m_arMatrixSeq[unIndex] = oObjElement.m_arMatrixSeq[unIndex];
+	m_arMatrixs = oObjElement.m_arMatrixs;
 }
 
 CCtrlObjElement::CCtrlObjElement(const HWP_STRING& sCtrlID, int nSize, CHWPStream& oBuffer, int nOff, int nVersion)
 	: CCtrlCommon(sCtrlID, nSize, oBuffer, nOff, nVersion)
+{}
+
+TMatrix ReadMatrix(CXMLNode& oNode)
 {
-	InitMatrix();
+	return TMatrix
+	{
+		oNode.GetAttributeDouble(L"e1", 1.),
+		oNode.GetAttributeDouble(L"e2"),
+		oNode.GetAttributeDouble(L"e4"),
+		oNode.GetAttributeDouble(L"e5", 1.),
+		oNode.GetAttributeDouble(L"e3"),
+		oNode.GetAttributeDouble(L"e6"),
+	};
 }
 
 CCtrlObjElement::CCtrlObjElement(const HWP_STRING& sCtrlID, CXMLNode& oNode, int nVersion)
 	: CCtrlCommon(sCtrlID, oNode, nVersion)
 {
-	InitMatrix();
-
 	m_shNGrp = oNode.GetAttributeInt(L"groupLevel");
 
-	m_arMatrixSeq.resize((m_shNGrp + 1) * 6 * 2);
-
-	short shScaMatCnt = 0, shRotMatCnt = 0;
-
 	for (CXMLNode& oChild : oNode.GetChilds())
 	{
 		if (L"hp:offset" == oChild.GetName())
@@ -66,8 +74,8 @@ CCtrlObjElement::CCtrlObjElement(const HWP_STRING& sCtrlID, CXMLNode& oNode, int
 		}
 		else if (L"hp:orgSz" == oChild.GetName())
 		{
-			m_nIniWidth  = oChild.GetAttributeInt(L"width");
-			m_nIniHeight = oChild.GetAttributeInt(L"height");
+			m_nOrgWidth  = oChild.GetAttributeInt(L"width");
+			m_nOrgHeight = oChild.GetAttributeInt(L"height");
 		}
 		else if (L"hp:curSz" == oChild.GetName())
 		{
@@ -89,18 +97,13 @@ CCtrlObjElement::CCtrlObjElement(const HWP_STRING& sCtrlID, CXMLNode& oNode, int
 		{
 			for (CXMLNode& oGrandChild : oChild.GetChilds())
 			{
+				// Сначала идёт 1 hc:transMatrix, а после попарно идут hc:scaMatrix с hc:rotMatrix
 				if (L"hc:transMatrix" == oGrandChild.GetName())
-					SetMatrix(oGrandChild, m_arMatrix, 0);
+					m_arMatrixs.push_back(ReadMatrix(oGrandChild));
 				else if (L"hc:scaMatrix" == oGrandChild.GetName())
-				{
-					SetMatrix(oGrandChild, m_arMatrixSeq, shScaMatCnt * 12);
-					++shScaMatCnt;
-				}
+					m_arMatrixs.push_back(ReadMatrix(oGrandChild));
 				else if (L"hc:rotMatrix" == oGrandChild.GetName())
-				{
-					SetMatrix(oGrandChild, m_arMatrixSeq, shRotMatCnt * 12 + 6);
-					++shRotMatCnt;
-				}
+					m_arMatrixs.push_back(ReadMatrix(oGrandChild));
 			}
 		}
 	}
@@ -116,6 +119,16 @@ int CCtrlObjElement::GetCurHeight() const
 	return m_nCurHeight;
 }
 
+int CCtrlObjElement::GetOrgWidth() const
+{
+	return m_nOrgWidth;
+}
+
+int CCtrlObjElement::GetOrgHeight() const
+{
+	return m_nOrgHeight;
+}
+
 int CCtrlObjElement::GetFinalWidth() const
 {
 	if (0 != m_nCurWidth)
@@ -132,6 +145,29 @@ int CCtrlObjElement::GetFinalHeight() const
 	return CCtrlCommon::GetHeight();
 }
 
+TMatrix CCtrlObjElement::GetFinalMatrix() const
+{
+	if (m_arMatrixs.empty() || 0 == m_shNGrp)
+		return TMatrix();
+
+	TMatrix oMatrix{m_arMatrixs.front()};
+
+	for (unsigned int unIndex = 1; unIndex < m_arMatrixs.size(); ++ unIndex)
+		oMatrix.Multiply(m_arMatrixs[unIndex]);
+
+	return oMatrix;
+}
+
+bool CCtrlObjElement::HorzFlip() const
+{
+	return m_bHorzFlip;
+}
+
+bool CCtrlObjElement::VertFlip() const
+{
+	return m_bVerFlip;
+}
+
 int CCtrlObjElement::ParseCtrl(CCtrlObjElement& oObj, int nSize, CHWPStream& oBuffer, int nOff, int nVersion)
 {
 	oBuffer.SavePosition();
@@ -142,8 +178,8 @@ int CCtrlObjElement::ParseCtrl(CCtrlObjElement& oObj, int nSize, CHWPStream& oBu
 	oBuffer.ReadInt(oObj.m_nYGrpOffset);
 	oBuffer.ReadShort(oObj.m_shNGrp);
 	oBuffer.ReadShort(oObj.m_shVer);
-	oBuffer.ReadInt(oObj.m_nIniWidth);
-	oBuffer.ReadInt(oObj.m_nIniHeight);
+	oBuffer.ReadInt(oObj.m_nOrgWidth);
+	oBuffer.ReadInt(oObj.m_nOrgHeight);
 	oBuffer.ReadInt(oObj.m_nCurWidth);
 	oBuffer.ReadInt(oObj.m_nCurHeight);
 	oObj.m_bHorzFlip = CHECK_FLAG(oBuffer[0], 0x01);
@@ -154,39 +190,55 @@ int CCtrlObjElement::ParseCtrl(CCtrlObjElement& oObj, int nSize, CHWPStream& oBu
 	oBuffer.ReadInt(oObj.m_nYCenter);
 	oBuffer.ReadShort(oObj.m_shMatCnt);
 
-	for (int nIndex = 0; nIndex < 6; ++nIndex)
-		oBuffer.ReadDouble(oObj.m_arMatrix[nIndex]);
+	oObj.m_arMatrixs.push_back(ReadMatrix(oBuffer));
 
-	int nMatrixSize = ((int)oObj.m_shMatCnt) * 6 * 2;
-	if (nMatrixSize > 0)
-	{
-		oObj.m_arMatrixSeq.resize(nMatrixSize);
-
-		for (int nIndex = 0; nIndex < nMatrixSize; ++nIndex)
-			oBuffer.ReadDouble(oObj.m_arMatrixSeq[nIndex]);
-	}
+	for (unsigned int unIndex = 0; unIndex < ((int)oObj.m_shMatCnt) * 2; ++ unIndex)
+		oObj.m_arMatrixs.push_back(ReadMatrix(oBuffer));
 
 	return oBuffer.GetDistanceToLastPos(true);
 }
 
-void CCtrlObjElement::InitMatrix()
+TMatrix::TMatrix()
+	: m_dM11(1.), m_dM12(0.), m_dM21(0.), m_dM22(1.), m_dDX(0.), m_dDY(0.)
+{}
+
+TMatrix::TMatrix(double dM11, double dM12, double dM21, double dM22, double dDX, double dDY)
+    : m_dM11(dM11), m_dM12(dM12), m_dM21(dM21), m_dM22(dM22), m_dDX(dDX), m_dDY(dDY)
+{}
+
+void TMatrix::Multiply(const TMatrix& oMatrix)
 {
-	m_arMatrix.resize(6);
-	m_arMatrix[0] = 1.;
-	m_arMatrix[1] = 0.;
-	m_arMatrix[2] = 0.;
-	m_arMatrix[3] = 1.;
-	m_arMatrix[4] = 0.;
-	m_arMatrix[5] = 0.;
+	const double dM11 = m_dM11 * oMatrix.m_dM11 + m_dM12 * oMatrix.m_dM21;
+	const double dM12 = m_dM11 * oMatrix.m_dM12 + m_dM12 * oMatrix.m_dM22;
+	const double dM21 = m_dM21 * oMatrix.m_dM11 + m_dM22 * oMatrix.m_dM21;
+	const double dM22 = m_dM21 * oMatrix.m_dM12 + m_dM22 * oMatrix.m_dM22;
+
+	const double dDx = m_dDX * oMatrix.m_dM11 + m_dDY * oMatrix.m_dM21 + oMatrix.m_dDX;
+	const double dDy = m_dDX * oMatrix.m_dM12 + m_dDY * oMatrix.m_dM22 + oMatrix.m_dDY;
+
+	m_dM11 = dM11;
+	m_dM12 = dM12;
+	m_dM21 = dM21;
+	m_dM22 = dM22;
+	m_dDX  = dDx;
+	m_dDY  = dDy;
 }
 
-void CCtrlObjElement::SetMatrix(CXMLNode& oNode, std::vector<double>& arMatrix, int nOffset)
+void TMatrix::ApplyToPoint(double& dX, double& dY)
 {
-	arMatrix[0 + nOffset] = oNode.GetAttributeDouble(L"e1");
-	arMatrix[1 + nOffset] = oNode.GetAttributeDouble(L"e2");
-	arMatrix[2 + nOffset] = oNode.GetAttributeDouble(L"e3");
-	arMatrix[3 + nOffset] = oNode.GetAttributeDouble(L"e4");
-	arMatrix[4 + nOffset] = oNode.GetAttributeDouble(L"e5");
-	arMatrix[5 + nOffset] = oNode.GetAttributeDouble(L"e6");
+	const double _dX = dX;
+	const double _dY = dY;
+
+	dX = _dX * m_dM11 + _dY * m_dM21 + m_dDX;
+	dY = _dX * m_dM12 + _dY * m_dM22 + m_dDY;
+}
+
+void TMatrix::ApplyToSize(double& dW, double& dH)
+{
+	const double _dW = dW;
+	const double _dH = dH;
+
+	dW = _dW * m_dM11 + _dH * m_dM21;
+	dH = _dW * m_dM12 + _dH * m_dM22;
 }
 }
diff --git a/HwpFile/HwpDoc/Paragraph/CtrlObjElement.h b/HwpFile/HwpDoc/Paragraph/CtrlObjElement.h
index b2583130c9..b1a2f5d39a 100644
--- a/HwpFile/HwpDoc/Paragraph/CtrlObjElement.h
+++ b/HwpFile/HwpDoc/Paragraph/CtrlObjElement.h
@@ -5,14 +5,31 @@
 
 namespace HWP
 {
+struct TMatrix
+{
+	double m_dM11; // e1
+	double m_dM12; // e2
+	double m_dM21; // e3
+	double m_dM22; // e4
+	double m_dDX;  // e5
+	double m_dDY;  // e6
+
+	TMatrix();
+	TMatrix(double dM11, double dM12, double dM21, double dM22, double dDX, double dDY);
+	void Multiply(const TMatrix& oMatrix);
+
+	void ApplyToPoint(double& dX, double& dY);
+	void ApplyToSize(double& dW, double& dH);
+};
+
 class CCtrlObjElement : public CCtrlCommon
 {
 	int m_nXGrpOffset;
 	int m_nYGrpOffset;
 	short m_shNGrp;
 	short m_shVer;
-	int m_nIniWidth;
-	int m_nIniHeight;
+	int m_nOrgWidth;
+	int m_nOrgHeight;
 	int m_nCurWidth;
 	int m_nCurHeight;
 	bool m_bHorzFlip;
@@ -21,12 +38,7 @@ class CCtrlObjElement : public CCtrlCommon
 	int m_nXCenter;
 	int m_nYCenter;
 	short m_shMatCnt;
-	VECTOR<double> m_arMatrix;
-	VECTOR<double> m_arMatrixSeq;
-
-	void InitMatrix();
-
-	void SetMatrix(CXMLNode& oNode, VECTOR<double>& arMatrix, int nOffset);
+	VECTOR<TMatrix> m_arMatrixs;
 public:
 	CCtrlObjElement();
 	CCtrlObjElement(const HWP_STRING& sCtrlID);
@@ -37,9 +49,17 @@ public:
 	int GetCurWidth() const;
 	int GetCurHeight() const;
 
+	int GetOrgWidth() const;
+	int GetOrgHeight() const;
+
 	int GetFinalWidth() const;
 	int GetFinalHeight() const;
 
+	TMatrix GetFinalMatrix() const;
+
+	bool HorzFlip() const;
+	bool VertFlip() const;
+
 	static int ParseCtrl(CCtrlObjElement& oObj, int nSize, CHWPStream& oBuffer, int nOff, int nVersion);
 };
 }
diff --git a/HwpFile/HwpDoc/Paragraph/CtrlPageNumPos.cpp b/HwpFile/HwpDoc/Paragraph/CtrlPageNumPos.cpp
index 5297386323..fdd6846b4b 100644
--- a/HwpFile/HwpDoc/Paragraph/CtrlPageNumPos.cpp
+++ b/HwpFile/HwpDoc/Paragraph/CtrlPageNumPos.cpp
@@ -4,25 +4,37 @@ namespace HWP
 {
 ENumPos GetNumPos(int nValue)
 {
-	switch(static_cast<ENumPos>(nValue))
+	SWITCH(ENumPos, nValue)
 	{
-		case ENumPos::LEFT_TOP:
-		case ENumPos::CENTER_TOP:
-		case ENumPos::RIGHT_TOP:
-		case ENumPos::LEFT_BOTTOM:
-		case ENumPos::BOTTOM_CENTER:
-		case ENumPos::RIGHT_BOTTOM:
-		case ENumPos::OUTER_TOP:
-		case ENumPos::OUTER_BOTTOM:
-		case ENumPos::INNER_TOP:
-		case ENumPos::INNER_BOTTOM:
-			return static_cast<ENumPos>(nValue);
-		case ENumPos::NONE:
-		default:
-			return ENumPos::NONE;
+		DEFAULT(ENumPos::NONE);
+		CASE(ENumPos::TOP_LEFT);
+		CASE(ENumPos::TOP_CENTER);
+		CASE(ENumPos::TOP_RIGHT);
+		CASE(ENumPos::BOTTOM_LEFT);
+		CASE(ENumPos::BOTTOM_CENTER);
+		CASE(ENumPos::BOTTOM_RIGHT);
+		CASE(ENumPos::TOP_OUTER);
+		CASE(ENumPos::BOTTOM_OUTER);
+		CASE(ENumPos::TOP_INNER);
+		CASE(ENumPos::BOTTOM_INNER);
 	}
 }
 
+ENumPos GetNumPos(const HWP_STRING& sValue)
+{
+	IF_STRING_IN_ENUM(TOP_LEFT, sValue, ENumPos);
+	ELSE_IF_STRING_IN_ENUM(TOP_CENTER, sValue, ENumPos);
+	ELSE_IF_STRING_IN_ENUM(TOP_RIGHT, sValue, ENumPos);
+	ELSE_IF_STRING_IN_ENUM(BOTTOM_LEFT, sValue, ENumPos);
+	ELSE_IF_STRING_IN_ENUM(BOTTOM_CENTER, sValue, ENumPos);
+	ELSE_IF_STRING_IN_ENUM(BOTTOM_RIGHT, sValue, ENumPos);
+	ELSE_IF_STRING_IN_ENUM(TOP_OUTER, sValue, ENumPos);
+	ELSE_IF_STRING_IN_ENUM(BOTTOM_OUTER, sValue, ENumPos);
+	ELSE_IF_STRING_IN_ENUM(TOP_INNER, sValue, ENumPos);
+	ELSE_IF_STRING_IN_ENUM(BOTTOM_INNER, sValue, ENumPos);
+	ELSE_STRING_IN_ENUM(NONE, ENumPos);
+}
+
 CCtrlPageNumPos::CCtrlPageNumPos(const HWP_STRING& sCtrlID)
 	: CCtrl(sCtrlID)
 {}
@@ -45,8 +57,31 @@ CCtrlPageNumPos::CCtrlPageNumPos(const HWP_STRING& sCtrlID, int nSize, CHWPStrea
 CCtrlPageNumPos::CCtrlPageNumPos(const HWP_STRING& sCtrlID, CXMLNode& oNode, int nVersion)
 	: CCtrl(sCtrlID)
 {
-	m_ePos = GetNumPos(oNode.GetAttributeInt(L"pos"));
+	m_ePos = GetNumPos(oNode.GetAttribute(L"pos"));
 	m_eNumShape = GetNumberShape2(oNode.GetAttributeInt(L"formatType"));
+
+	m_sPostfix = oNode.GetAttribute(L"sideChar");
+	m_sPrefix  = m_sPostfix;
+}
+
+ENumPos CCtrlPageNumPos::GetPos() const
+{
+	return m_ePos;
+}
+
+HWP_STRING CCtrlPageNumPos::GetPrefix() const
+{
+	return m_sPrefix;
+}
+
+HWP_STRING CCtrlPageNumPos::GetPostfix() const
+{
+	return m_sPostfix;
+}
+
+ENumberShape2 CCtrlPageNumPos::GetFormatType() const
+{
+	return m_eNumShape;
 }
 
 ECtrlObjectType CCtrlPageNumPos::GetCtrlType() const
diff --git a/HwpFile/HwpDoc/Paragraph/CtrlPageNumPos.h b/HwpFile/HwpDoc/Paragraph/CtrlPageNumPos.h
index 8306cfa0cc..036d306afd 100644
--- a/HwpFile/HwpDoc/Paragraph/CtrlPageNumPos.h
+++ b/HwpFile/HwpDoc/Paragraph/CtrlPageNumPos.h
@@ -11,16 +11,16 @@ namespace HWP
 enum class ENumPos
 {
 	NONE,
-	LEFT_TOP,
-	CENTER_TOP,
-	RIGHT_TOP,
-	LEFT_BOTTOM,
+	TOP_LEFT,
+	TOP_CENTER,
+	TOP_RIGHT,
+	BOTTOM_LEFT,
 	BOTTOM_CENTER,
-	RIGHT_BOTTOM,
-	OUTER_TOP,
-	OUTER_BOTTOM,
-	INNER_TOP,
-	INNER_BOTTOM
+	BOTTOM_RIGHT,
+	TOP_OUTER,
+	BOTTOM_OUTER,
+	TOP_INNER,
+	BOTTOM_INNER
 };
 
 class CCtrlPageNumPos : public CCtrl
@@ -36,6 +36,13 @@ public:
 	CCtrlPageNumPos(const HWP_STRING& sCtrlID, int nSize, CHWPStream& oBuffer, int nOff, int nVersion);
 	CCtrlPageNumPos(const HWP_STRING& sCtrlID, CXMLNode& oNode, int nVersion);
 
+	ENumPos GetPos() const;
+
+	HWP_STRING GetPrefix() const;
+	HWP_STRING GetPostfix() const;
+
+	ENumberShape2 GetFormatType() const;
+
 	ECtrlObjectType GetCtrlType() const override;
 };
 }
diff --git a/HwpFile/HwpDoc/Paragraph/CtrlShapePic.cpp b/HwpFile/HwpDoc/Paragraph/CtrlShapePic.cpp
index 78df7aa240..9d49958d92 100644
--- a/HwpFile/HwpDoc/Paragraph/CtrlShapePic.cpp
+++ b/HwpFile/HwpDoc/Paragraph/CtrlShapePic.cpp
@@ -32,7 +32,7 @@ CPicColor::CPicColor(CXMLNode& oNode)
 }
 
 CPicEffect::CPicEffect(EPicEffectType eType)
-	: m_eType(eType)
+	: m_eType(eType), m_nSize(0)
 {}
 
 CPicEffect::CPicEffect(int nType)
@@ -228,8 +228,8 @@ CCtrlShapePic::CCtrlShapePic(const HWP_STRING& sCtrlID, CXMLNode& oNode, int nVe
 				{
 					if ((L"hc:pt" + std::to_wstring(unIndex)) == oGrandChild.GetName())
 					{
-						m_arBorderPoints[unIndex].m_nX = oChild.GetAttributeInt(L"x");
-						m_arBorderPoints[unIndex].m_nY = oChild.GetAttributeInt(L"y");
+						m_arBorderPoints[unIndex].m_nX = oGrandChild.GetAttributeInt(L"x");
+						m_arBorderPoints[unIndex].m_nY = oGrandChild.GetAttributeInt(L"y");
 						break;
 					}
 				}
@@ -329,6 +329,16 @@ int CCtrlShapePic::GetBorderThick() const
 	return m_nBorderThick;
 }
 
+int CCtrlShapePic::GetImageRectWidth() const
+{
+	return m_arBorderPoints[1].m_nX - m_arBorderPoints[0].m_nX;
+}
+
+int CCtrlShapePic::GetIMageRectHeight() const
+{
+	return m_arBorderPoints[2].m_nY - m_arBorderPoints[0].m_nY;
+}
+
 int CCtrlShapePic::ParseElement(CCtrlShapePic& oObj, int nSize, CHWPStream& oBuffer, int nOff, int nVersion)
 {
 	oBuffer.SavePosition();
diff --git a/HwpFile/HwpDoc/Paragraph/CtrlShapePic.h b/HwpFile/HwpDoc/Paragraph/CtrlShapePic.h
index 2f8078fc2f..deaaa9479b 100644
--- a/HwpFile/HwpDoc/Paragraph/CtrlShapePic.h
+++ b/HwpFile/HwpDoc/Paragraph/CtrlShapePic.h
@@ -148,6 +148,9 @@ public:
 	int GetBorderColor() const;
 	int GetBorderThick() const;
 
+	int GetImageRectWidth() const;
+	int GetIMageRectHeight() const;
+
 	static int ParseElement(CCtrlShapePic& oObj, int nSize, CHWPStream& oBuffer, int nOff, int nVersion);
 	static int ParseCtrl(CCtrlShapePic& oObj, int nSize, CHWPStream& oBuffer, int nOff, int nVersion);
 };
diff --git a/HwpFile/HwpDoc/Paragraph/CtrlTable.cpp b/HwpFile/HwpDoc/Paragraph/CtrlTable.cpp
index 0aafd41c9f..786b580bea 100644
--- a/HwpFile/HwpDoc/Paragraph/CtrlTable.cpp
+++ b/HwpFile/HwpDoc/Paragraph/CtrlTable.cpp
@@ -103,6 +103,26 @@ short CCtrlTable::GetBorderFillID() const
 	return m_shBorderFillID;
 }
 
+short CCtrlTable::GetInLSpace() const
+{
+	return m_shInLSpace;
+}
+
+short CCtrlTable::GetInTSpace() const
+{
+	return m_shInTSpace;
+}
+
+short CCtrlTable::GetInRSpace() const
+{
+	return m_shInRSpace;
+}
+
+short CCtrlTable::GetInBSpace() const
+{
+	return m_shInBSpace;
+}
+
 void CCtrlTable::AddCell(CTblCell* pCell)
 {
 	m_arCells.push_back(pCell);
diff --git a/HwpFile/HwpDoc/Paragraph/CtrlTable.h b/HwpFile/HwpDoc/Paragraph/CtrlTable.h
index f0fc18742e..8b4613299c 100644
--- a/HwpFile/HwpDoc/Paragraph/CtrlTable.h
+++ b/HwpFile/HwpDoc/Paragraph/CtrlTable.h
@@ -44,6 +44,11 @@ public:
 	short GetCountCells() const;
 	short GetBorderFillID() const;
 
+	short GetInLSpace() const;
+	short GetInRSpace() const;
+	short GetInTSpace() const;
+	short GetInBSpace() const;
+
 	void AddCell(CTblCell* pCell);
 
 	bool HaveCells();
diff --git a/HwpFile/HwpDoc/Paragraph/HWPPargraph.cpp b/HwpFile/HwpDoc/Paragraph/HWPPargraph.cpp
index 01fdbe30ee..b399fb85f4 100644
--- a/HwpFile/HwpDoc/Paragraph/HWPPargraph.cpp
+++ b/HwpFile/HwpDoc/Paragraph/HWPPargraph.cpp
@@ -60,7 +60,7 @@ CHWPPargraph::CHWPPargraph(CXMLNode& oNode, int nVersion)
 	}
 
 	if (m_arP.empty() || ECtrlObjectType::Character != m_arP.back()->GetCtrlType())
-		m_arP.push_back(new CCtrlCharacter(L"   _", ECtrlCharType::PARAGRAPH_BREAK));
+		m_arP.push_back(new CCtrlCharacter(L"   _", ECtrlCharType::PARAGRAPH_BREAK, nCharShapeID));
 }
 
 CHWPPargraph::~CHWPPargraph()
diff --git a/HwpFile/HwpDoc/Paragraph/TblCell.cpp b/HwpFile/HwpDoc/Paragraph/TblCell.cpp
index 2d0ffd922a..e5b6a61c2f 100644
--- a/HwpFile/HwpDoc/Paragraph/TblCell.cpp
+++ b/HwpFile/HwpDoc/Paragraph/TblCell.cpp
@@ -55,7 +55,7 @@ CTblCell::CTblCell(CXMLNode& oNode, int nVersion)
 		}
 		else if (L"hp:subList" == oChild.GetName())
 		{
-			m_eVertAlign = ::HWP::GetVertAlign(oChild.GetAttributeInt(L"vertAlign"));
+			m_eVertAlign = ::HWP::GetVertAlign(oChild.GetAttribute(L"vertAlign"));
 
 			for (CXMLNode& oGrandChild : oChild.GetChilds(L"hp:p"))
 			{
diff --git a/MsBinaryFile/XlsFile/Format/Logic/Biff_records/BoolErr.cpp b/MsBinaryFile/XlsFile/Format/Logic/Biff_records/BoolErr.cpp
index b29f16e5a3..59f5fba68f 100644
--- a/MsBinaryFile/XlsFile/Format/Logic/Biff_records/BoolErr.cpp
+++ b/MsBinaryFile/XlsFile/Format/Logic/Biff_records/BoolErr.cpp
@@ -76,12 +76,36 @@ int BoolErr::serialize(std::wostream & stream)
 		CP_XML_NODE(L"c")
 		{
 			CP_XML_ATTR(L"r", ref);
+			CP_XML_ATTR(L"t", L"b");
 
 			if (cell.ixfe - global_info_->cellStyleXfs_count > 0)
 			{
 				CP_XML_ATTR(L"s", cell.ixfe - global_info_->cellStyleXfs_count);
 			}
-		}			
+			CP_XML_NODE(L"v")
+			{
+				if (bes.fError)
+				{
+					switch (bes.bBoolErr)
+					{
+					case 0x00: CP_XML_STREAM() << L"#NULL!"; break;
+					case 0x07: CP_XML_STREAM() << L"#DIV/0!"; break;
+					case 0x0F: CP_XML_STREAM() << L"#VALUE!"; break;
+					case 0x17: CP_XML_STREAM() << L"#REF!"; break;
+					case 0x1D: CP_XML_STREAM() << L"#NAME?"; break;
+					case 0x24: CP_XML_STREAM() << L"#NUM!"; break;
+					case 0x2A: CP_XML_STREAM() << L"#N/A"; break;
+					case 0x2B: CP_XML_STREAM() << L"#GETTING_DATA"; break;
+					default:
+						break;
+					}
+				}
+				else
+				{
+					CP_XML_STREAM() << std::to_wstring(bes.bBoolErr);
+				}
+			}
+		}
 	}
 	return 0;
 }
diff --git a/MsBinaryFile/XlsFile/Format/Logic/Biff_records/Theme.cpp b/MsBinaryFile/XlsFile/Format/Logic/Biff_records/Theme.cpp
index 0170b413ad..781247c4b7 100644
--- a/MsBinaryFile/XlsFile/Format/Logic/Biff_records/Theme.cpp
+++ b/MsBinaryFile/XlsFile/Format/Logic/Biff_records/Theme.cpp
@@ -75,31 +75,22 @@ global_info->sTheme = \
 	else
 	{
 		nThemeDataSize = record.getDataSize() - record.getRdPtr();
-		pThemeData = boost::shared_array<char>(new char[nThemeDataSize]);
+		pThemeData = boost::shared_array<BYTE>(new BYTE[nThemeDataSize]);
 
 		memcpy(pThemeData.get(), record.getCurData<char>(), nThemeDataSize);
 		record.skipNunBytes(nThemeDataSize);
 
-		std::wstring tempThemePath = global_info->tempDirectory + FILE_SEPARATOR_STR + L"theme.temp";
-		
-		NSFile::CFileBinary file;	
-		if (!file.CreateFileW(tempThemePath)) return;
-
-		file.WriteFile((BYTE*)pThemeData.get(), nThemeDataSize);
-		file.CloseFile();
-
-		COfficeUtils OfficeUtils(NULL);
-		
 		ULONG nBufferSize = 0;
-		BYTE *pBuffer = NULL;
+		BYTE *pBuffer = NULL;		
 
-		HRESULT hresult = OfficeUtils.LoadFileFromArchive(tempThemePath, L"theme1.xml", &pBuffer, nBufferSize);// todooo - parsing ThemeManager
+		COfficeUtils OfficeUtils(NULL);		
+		HRESULT hresult = OfficeUtils.LoadFileFromArchive(pThemeData.get(), nThemeDataSize, L"theme1.xml", &pBuffer, nBufferSize);// todooo - parsing ThemeManager
 
 		if (hresult != S_OK || pBuffer == NULL)
-			hresult = OfficeUtils.LoadFileFromArchive(tempThemePath, L"theme/theme1.xml", &pBuffer, nBufferSize);
+			hresult = OfficeUtils.LoadFileFromArchive(pThemeData.get(), nThemeDataSize, L"theme/theme1.xml", &pBuffer, nBufferSize);
 		
 		if (hresult != S_OK || pBuffer == NULL)
-			hresult = OfficeUtils.LoadFileFromArchive(tempThemePath, L"theme/theme/theme1.xml", &pBuffer, nBufferSize);
+			hresult = OfficeUtils.LoadFileFromArchive(pThemeData.get(), nThemeDataSize, L"theme/theme/theme1.xml", &pBuffer, nBufferSize);
 
 		if (hresult == S_OK && pBuffer != NULL)
 		{
diff --git a/MsBinaryFile/XlsFile/Format/Logic/Biff_records/Theme.h b/MsBinaryFile/XlsFile/Format/Logic/Biff_records/Theme.h
index 68c7f25233..36fa6fd2b4 100644
--- a/MsBinaryFile/XlsFile/Format/Logic/Biff_records/Theme.h
+++ b/MsBinaryFile/XlsFile/Format/Logic/Biff_records/Theme.h
@@ -56,7 +56,7 @@ public:
 	FrtHeader	frtHeader;
 
 	_UINT32		nThemeDataSize;
-	boost::shared_array<char> pThemeData;
+	boost::shared_array<BYTE> pThemeData;
 };
 
 } // namespace XLS
diff --git a/OOXML/Binary/Document/BinReader/BinaryReaderD.cpp b/OOXML/Binary/Document/BinReader/BinaryReaderD.cpp
index 4aa058d45c..70a2f07c39 100644
--- a/OOXML/Binary/Document/BinReader/BinaryReaderD.cpp
+++ b/OOXML/Binary/Document/BinReader/BinaryReaderD.cpp
@@ -3119,6 +3119,12 @@ int Binary_NumberingTableReader::ReadAbstractNum(BYTE type, long length, void* p
 		odocANum->m_oMultiLevelType->m_oVal.Init();
 		odocANum->m_oMultiLevelType->m_oVal->SetValueFromByte(m_oBufferedStream.GetUChar());
 	}
+	else if (c_oSerNumTypes::Nsid == type)
+	{
+		odocANum->m_oNsid.Init();
+		odocANum->m_oNsid->m_oVal.Init();
+		odocANum->m_oNsid->m_oVal->SetValue(m_oBufferedStream.GetULong());
+	}
 	else
 		res = c_oSerConstants::ReadUnknown;
 	return res;
diff --git a/OOXML/Binary/Document/BinWriter/BinReaderWriterDefines.h b/OOXML/Binary/Document/BinWriter/BinReaderWriterDefines.h
index ae0ce98b01..79f98d7339 100644
--- a/OOXML/Binary/Document/BinWriter/BinReaderWriterDefines.h
+++ b/OOXML/Binary/Document/BinWriter/BinReaderWriterDefines.h
@@ -184,7 +184,8 @@ extern int g_nCurFormatVersion;
 		Legacy = 34,
 		LegacyIndent = 35,
 		LegacySpace = 36,
-		lvl_Jc = 37
+		lvl_Jc = 37,
+		Nsid = 38
 	};}
 	namespace c_oSerOtherTableTypes{enum c_oSerOtherTableTypes
 	{
diff --git a/OOXML/Binary/Document/BinWriter/BinaryWriterD.cpp b/OOXML/Binary/Document/BinWriter/BinaryWriterD.cpp
index 0e50ddb243..7aa5530d9b 100644
--- a/OOXML/Binary/Document/BinWriter/BinaryWriterD.cpp
+++ b/OOXML/Binary/Document/BinWriter/BinaryWriterD.cpp
@@ -3141,7 +3141,12 @@ void BinaryNumberingTableWriter::WriteAbstractNum(const OOX::Numbering::CAbstrac
 		m_oBcw.m_oStream.WriteBYTE(c_oSerNumTypes::StyleLink);
 		m_oBcw.m_oStream.WriteStringW(num.m_oStyleLink.get().ToString2());
 	}
-
+	if (num.m_oNsid.IsInit() && num.m_oNsid->m_oVal.IsInit())
+	{
+		nCurPos = m_oBcw.WriteItemStart(c_oSerNumTypes::Nsid);
+		m_oBcw.m_oStream.WriteULONG(num.m_oNsid->m_oVal->GetValue());
+		m_oBcw.WriteItemEnd(nCurPos);
+	}
 	if (false != num.m_oAbstractNumId.IsInit() && false == num.m_arrLvl.empty())
 	{
 		nCurPos = m_oBcw.WriteItemStart(c_oSerNumTypes::AbstractNum_Lvls);
diff --git a/OOXML/Binary/Sheets/Common/BinReaderWriterDefines.h b/OOXML/Binary/Sheets/Common/BinReaderWriterDefines.h
index 20ec0466f5..3416f86765 100644
--- a/OOXML/Binary/Sheets/Common/BinReaderWriterDefines.h
+++ b/OOXML/Binary/Sheets/Common/BinReaderWriterDefines.h
@@ -589,7 +589,8 @@ namespace BinXlsxRW
 		Text = 53,
 		Print = 54,
 		ItemLst = 55,
-		Item = 56
+		Item = 56,
+		Shape = 57
 	};}
 	namespace c_oSerCellTypes{enum c_oSerCellTypes
 	{
diff --git a/OOXML/Binary/Sheets/Reader/BinaryWriterS.cpp b/OOXML/Binary/Sheets/Reader/BinaryWriterS.cpp
index 072463790a..ad1e8c2d10 100644
--- a/OOXML/Binary/Sheets/Reader/BinaryWriterS.cpp
+++ b/OOXML/Binary/Sheets/Reader/BinaryWriterS.cpp
@@ -6364,8 +6364,6 @@ void BinaryWorksheetTableWriter::WriteControls(const OOX::Spreadsheet::CWorkshee
 		{
 			continue;
 		}
-		if (pShape)
-			pFind->second.bUsed = true;
 //-----------------------------------------------------------------------------------------------------
 		int nCurPos2 = m_oBcw.WriteItemStart(c_oSerControlTypes::Control);
 			int nCurPos3 = m_oBcw.WriteItemStart(c_oSerControlTypes::ControlAnchor);
@@ -6378,6 +6376,21 @@ void BinaryWorksheetTableWriter::WriteControls(const OOX::Spreadsheet::CWorkshee
 				m_oBcw.m_oStream.WriteStringW(*pControl->m_oName);
 			}
 			WriteControlPr(pControl->m_oControlPr.GetPointer(), pFormControlPr);
+			if (pShape)
+			{
+				pFind->second.bUsed = true;
+
+				nCurPos3 = m_oBcw.WriteItemStart(c_oSerControlTypes::Shape);
+
+				std::wstring* pMainProps = NULL;
+				smart_ptr<OOX::IFileContainer> oldRels = m_pOfficeDrawingConverter->GetRels();
+				m_pOfficeDrawingConverter->SetRels(pVmlDrawing);
+
+				m_pOfficeDrawingConverter->AddObject(L"<pict>" + pFind->second.sXml + L"</pict>", &pMainProps);
+
+				m_pOfficeDrawingConverter->SetRels(oldRels);
+				m_oBcw.WriteItemEnd(nCurPos3);
+			}
 		m_oBcw.WriteItemEnd(nCurPos2);
 	}
 	m_oBcw.WriteItemEnd(nCurPos);
diff --git a/OOXML/Binary/Sheets/Reader/CSVReader.cpp b/OOXML/Binary/Sheets/Reader/CSVReader.cpp
index 0dd68887ae..2e66d2c625 100644
--- a/OOXML/Binary/Sheets/Reader/CSVReader.cpp
+++ b/OOXML/Binary/Sheets/Reader/CSVReader.cpp
@@ -54,7 +54,7 @@ class CSVReader::Impl
 {
 public:
 	Impl() {}
-    _UINT32 Read(const std::wstring &sFileName, OOX::Spreadsheet::CXlsx &oXlsx, _UINT32 nCodePage, const std::wstring& wcDelimiter, _INT32 lcid);
+    _UINT32 Read(const std::wstring &sFileName, OOX::Spreadsheet::CXlsx &oXlsx, _UINT32 nCodePage, const std::wstring& wcDelimiter, _INT32 lcid, bool readToCache);
 private:
 	int AddCell(std::wstring &sText, INT nStartCell, std::stack<INT> &oDeleteChars, OOX::Spreadsheet::CRow &oRow, INT nRow, INT nCol, bool bIsWrap);
 
@@ -209,7 +209,7 @@ int CSVReader::Impl::AddCell(std::wstring &sText, INT nStartCell, std::stack<INT
 
 	return result;
 }
-_UINT32 CSVReader::Impl::Read(const std::wstring &sFileName, OOX::Spreadsheet::CXlsx &oXlsx, _UINT32 nCodePage, const std::wstring& sDelimiter, _INT32 lcid)
+_UINT32 CSVReader::Impl::Read(const std::wstring &sFileName, OOX::Spreadsheet::CXlsx &oXlsx, _UINT32 nCodePage, const std::wstring& sDelimiter, _INT32 lcid, bool readToCache)
 {
 	NSFile::CFileBinary oFile;
 	if (false == oFile.OpenFile(sFileName)) return AVS_FILEUTILS_ERROR_CONVERT;
@@ -219,7 +219,7 @@ _UINT32 CSVReader::Impl::Read(const std::wstring &sFileName, OOX::Spreadsheet::C
 	// Создадим стили
 	oXlsx.CreateStyles();
 
-    cellFormatController_ = std::make_shared<CellFormatController>(oXlsx.m_pStyles, lcid);
+	cellFormatController_ = std::make_shared<CellFormatController>(oXlsx.m_pStyles, lcid);
 
 	smart_ptr<OOX::Spreadsheet::CWorksheet> pWorksheet(new OOX::Spreadsheet::CWorksheet(NULL));
 	pWorksheet->m_oSheetData.Init();
@@ -290,26 +290,26 @@ _UINT32 CSVReader::Impl::Read(const std::wstring &sFileName, OOX::Spreadsheet::C
 	WCHAR wcDelimiterLeading = L'\0';
 	WCHAR wcDelimiterTrailing = L'\0';
 	int nDelimiterSize = 0;
-    if(sFileDataW.size() > 7 && sFileDataW.substr(0, 4) == L"sep=")
-    {
-        wcDelimiterLeading = sFileDataW[4];
-        nDelimiterSize = 1;
-        if (2 == sizeof(wchar_t) && 0xD800 <= wcDelimiterLeading && wcDelimiterLeading <= 0xDBFF &&( sFileDataW[5] != L'\r' || sFileDataW[5] != L'\n'))
-        {
-            wcDelimiterTrailing = sFileDataW[5];
-            nDelimiterSize = 2;
-        }
-        auto newPos = 4 + nDelimiterSize;
-        if(sFileDataW[newPos] == L'\r' || sFileDataW[newPos] == L'\n')
-        {
-            newPos++;
-            if(sFileDataW[newPos] == L'\r' || sFileDataW[newPos] == L'\n')
-                newPos++;
-        }
-        sFileDataW.erase(0, newPos);
-        nSize = sFileDataW.length();
-    }
-    else if (sDelimiter.length() > 0)
+	if(sFileDataW.size() > 7 && sFileDataW.substr(0, 4) == L"sep=")
+	{
+		wcDelimiterLeading = sFileDataW[4];
+		nDelimiterSize = 1;
+		if (2 == sizeof(wchar_t) && 0xD800 <= wcDelimiterLeading && wcDelimiterLeading <= 0xDBFF &&( sFileDataW[5] != L'\r' || sFileDataW[5] != L'\n'))
+		{
+			wcDelimiterTrailing = sFileDataW[5];
+			nDelimiterSize = 2;
+		}
+		auto newPos = 4 + nDelimiterSize;
+		if(sFileDataW[newPos] == L'\r' || sFileDataW[newPos] == L'\n')
+		{
+			newPos++;
+			if(sFileDataW[newPos] == L'\r' || sFileDataW[newPos] == L'\n')
+				newPos++;
+		}
+		sFileDataW.erase(0, newPos);
+		nSize = sFileDataW.length();
+	}
+	else if (sDelimiter.length() > 0)
 	{
 		wcDelimiterLeading = sDelimiter[0];
 		nDelimiterSize = 1;
@@ -357,14 +357,23 @@ _UINT32 CSVReader::Impl::Read(const std::wstring &sFileName, OOX::Spreadsheet::C
 			{
 				bMsLimitCell = true;
 			}
-			
+
 			oDeleteChars = std::stack<INT>();
 			bIsWrap = false;
 
 			if (nIndex + nDelimiterSize == nSize)
-			{
-				pWorksheet->m_oSheetData->m_arrItems.push_back(pRow);
-				pRow = NULL;
+			{	if(readToCache)
+				{
+					pRow->storeXmlCache();
+					pWorksheet->m_oSheetData->AddRowToCache(*pRow);
+					delete pRow;
+					pRow = NULL;
+				}
+				else
+				{
+					pWorksheet->m_oSheetData->m_arrItems.push_back(pRow);
+					pRow = NULL;
+				}
 			}
 
 			if (nIndex + nDelimiterSize > 500000)
@@ -411,8 +420,15 @@ _UINT32 CSVReader::Impl::Read(const std::wstring &sFileName, OOX::Spreadsheet::C
 			}
 			else
 				nStartCell = nIndex + 1;
-
-			pWorksheet->m_oSheetData->m_arrItems.push_back(pRow);
+			if(readToCache)
+			{
+				pRow->storeXmlCache();
+				pWorksheet->m_oSheetData->AddRowToCache(*pRow);
+				delete pRow;
+				pRow = NULL;
+			}
+			else
+				pWorksheet->m_oSheetData->m_arrItems.push_back(pRow);
 
 			pRow = new OOX::Spreadsheet::CRow();
 			pRow->m_oR.Init();
@@ -466,7 +482,15 @@ _UINT32 CSVReader::Impl::Read(const std::wstring &sFileName, OOX::Spreadsheet::C
 		{
 			bMsLimitCell = true;
 		}
-		pWorksheet->m_oSheetData->m_arrItems.push_back(pRow);
+		if(readToCache)
+		{
+			pRow->storeXmlCache();
+			pWorksheet->m_oSheetData->AddRowToCache(*pRow);
+			delete pRow;
+			pRow = NULL;
+		}
+		else
+			pWorksheet->m_oSheetData->m_arrItems.push_back(pRow);
 	}
 	else
 	{
@@ -501,5 +525,5 @@ CSVReader::~CSVReader()
 }
 _UINT32 CSVReader::Read(const std::wstring &sFileName, OOX::Spreadsheet::CXlsx &oXlsx, _UINT32 nCodePage, const std::wstring& sDelimiter, _INT32 lcid)
 {
-    return impl_->Read(sFileName, oXlsx, nCodePage, sDelimiter, lcid);
+    return impl_->Read(sFileName, oXlsx, nCodePage, sDelimiter, lcid, readToxmlCache_);
 }
diff --git a/OOXML/Binary/Sheets/Reader/CSVReader.h b/OOXML/Binary/Sheets/Reader/CSVReader.h
index c2a2da9b9b..7c6f978976 100644
--- a/OOXML/Binary/Sheets/Reader/CSVReader.h
+++ b/OOXML/Binary/Sheets/Reader/CSVReader.h
@@ -50,6 +50,7 @@ public:
 	CSVReader();
 	~CSVReader();
     _UINT32 Read(const std::wstring &sFileName, OOX::Spreadsheet::CXlsx &oXlsx, _UINT32 nCodePage, const std::wstring& wcDelimiter, _INT32 lcid);
+    bool readToxmlCache_ = false;
 private:
 	class Impl;
 	boost::shared_ptr<Impl> impl_;
diff --git a/OOXML/Binary/Sheets/Writer/BinaryReaderS.cpp b/OOXML/Binary/Sheets/Writer/BinaryReaderS.cpp
index 486a021492..8c2e0c0da5 100644
--- a/OOXML/Binary/Sheets/Writer/BinaryReaderS.cpp
+++ b/OOXML/Binary/Sheets/Writer/BinaryReaderS.cpp
@@ -6453,7 +6453,9 @@ int BinaryWorksheetsTableReader::ReadDrawings(BYTE type, long length, void* poRe
 				oWriter.m_lObjectIdVML = m_pCurVmlDrawing->m_lObjectIdVML;
 
 				NSCommon::smart_ptr<PPTX::Logic::ClrMap> oClrMap;
-				oShape.toXmlWriterVML(&oWriter, m_oSaveParams.pTheme, oClrMap, false, true);
+				NSCommon::smart_ptr<OOX::IFileContainer> oContainer = m_pCurVmlDrawing.smart_dynamic_cast<OOX::IFileContainer>();
+				
+				oShape.toXmlWriterVML(&oWriter, m_oSaveParams.pTheme, oClrMap, oContainer, false, true);
 
 				std::wstring strXml = oWriter.GetXmlString();
 
@@ -6567,12 +6569,17 @@ int BinaryWorksheetsTableReader::ReadLegacyDrawingHF(BYTE type, long length, voi
 	if (c_oSer_LegacyDrawingHF::Drawings == type)
 	{
 		m_pOfficeDrawingConverter->SetDstContentRels();
+		
 		OOX::CVmlDrawing* pVmlDrawing = new OOX::CVmlDrawing(NULL, false);
 		pVmlDrawing->m_lObjectIdVML = m_lObjectIdVML;
+		
 		READ1_DEF(length, res, this->ReadLegacyDrawingHFDrawings, pVmlDrawing);
+		
 		m_lObjectIdVML = pVmlDrawing->m_lObjectIdVML;
+		
 		NSCommon::smart_ptr<OOX::File> pVmlDrawingFile(pVmlDrawing);
 		const OOX::RId oRId = m_pCurWorksheet->Add(pVmlDrawingFile);
+		
 		pLegacyDrawingHF->m_oId.Init();
 		pLegacyDrawingHF->m_oId->SetValue(oRId.get());
 
@@ -6700,7 +6707,10 @@ int BinaryWorksheetsTableReader::ReadLegacyDrawingHFDrawings(BYTE type, long len
 
 			//oWriter.m_strId = oVmlShape.sXml.c_str(); //??
 			
-			pSpTree->toXmlWriterVML(&oWriter, m_oSaveParams.pTheme, oClrMap);
+			NSCommon::smart_ptr<OOX::IFileContainer> oContainer(pVmlDrawing);
+			oContainer.AddRef();
+
+			pSpTree->toXmlWriterVML(&oWriter, m_oSaveParams.pTheme, oClrMap, oContainer);
 			pVmlDrawing->m_lObjectIdVML = oWriter.m_lObjectIdVML;
 			pVmlDrawing->m_arObjectXml.push_back(oWriter.GetXmlString());
 		}
@@ -7119,10 +7129,8 @@ int BinaryWorksheetsTableReader::ReadControls(BYTE type, long length, void* poRe
 
 		READ1_DEF(length, res, this->ReadControl, pControl.GetPointer());
 		
-		std::wstring strXml = GetControlVmlShape(pControl.GetPointer());
+		GetControlVmlShape(pControl.GetPointer());
 				
-		m_pCurVmlDrawing->m_arControlXml.push_back(strXml);
-
 		smart_ptr<OOX::Spreadsheet::CCtrlPropFile> pCtrlPropFile(new OOX::Spreadsheet::CCtrlPropFile(NULL));		
 		pCtrlPropFile->m_oFormControlPr = pControl->m_oFormControlPr;
 
@@ -7339,6 +7347,15 @@ int BinaryWorksheetsTableReader::ReadControl(BYTE type, long length, void* poRes
 		pControl->m_oFormControlPr->m_oItemLst.Init();
 		READ1_DEF(length, res, this->ReadControlItems, pControl->m_oFormControlPr->m_oItemLst.GetPointer());
 	}
+	else if (c_oSerControlTypes::Shape == type)
+	{
+		pControl->m_oShape = new PPTX::Logic::SpTreeElem();
+		BYTE typeRec1 = m_oBufferedStream.GetUChar();    // must be 0;
+		LONG _e = m_oBufferedStream.GetPos() + m_oBufferedStream.GetLong() + 4;
+		m_oBufferedStream.Skip(5); // type record (must be 1) + 4 byte - len recor
+		
+		pControl->m_oShape->fromPPTY(&m_oBufferedStream);
+	}
 	else
 		res = c_oSerConstants::ReadUnknown;
 	return res;
@@ -7359,7 +7376,7 @@ int BinaryWorksheetsTableReader::ReadControlItems(BYTE type, long length, void*
 		res = c_oSerConstants::ReadUnknown;
 	return res;
 }
-std::wstring BinaryWorksheetsTableReader::GetControlVmlShape(void* pC)
+void BinaryWorksheetsTableReader::GetControlVmlShape(void* pC)
 {
 	OOX::Spreadsheet::CControl* pControl = static_cast<OOX::Spreadsheet::CControl*>(pC);
 //generate ClientData
@@ -7442,29 +7459,64 @@ std::wstring BinaryWorksheetsTableReader::GetControlVmlShape(void* pC)
 	oClientData.m_oFmlaTxbx = pControl->m_oFormControlPr->m_oFmlaTxbx;
 	oClientData.m_oFmlaGroup = pControl->m_oFormControlPr->m_oFmlaGroup;
 
-	std::wstring result = L"<v:shape type=\"#_x0000_t201\" id=\"_x0000_s" + std::to_wstring(pControl->m_oShapeId->GetValue()) + L"\"";
-	result += L" style='position:absolute' stroked=\"f\" strokecolor=\"windowText [64]\" o:insetmode=\"auto\"";
-	result += L" filled=\"f\" fillcolor=\"window [65]\"";
+	std::wstring strXmlShapeControl;
+
+	std::wstring strFillAttr;
+	std::wstring strStrokeAttr;
+	std::wstring strFillNode;
+	std::wstring strStrokeNode;
+
+	smart_ptr<PPTX::Logic::Shape> oShape;
+
+	if (pControl->m_oShape.IsInit() && pControl->m_oShape->is_init())
+	{
+		oShape = pControl->m_oShape->GetElem().smart_dynamic_cast<PPTX::Logic::Shape>();
+	}
+
+	if (oShape.IsInit())
+	{
+		NSCommon::smart_ptr<PPTX::Logic::ClrMap> oClrMap;
+
+		NSCommon::smart_ptr<OOX::IFileContainer> pContainer = m_pCurVmlDrawing.smart_dynamic_cast<OOX::IFileContainer>();
+
+		CalculateFill(XMLWRITER_DOC_TYPE_XLSX, oShape->spPr, oShape->style, m_oSaveParams.pTheme, oClrMap, pContainer, strFillAttr, strFillNode, false, false);
+		CalculateLine(XMLWRITER_DOC_TYPE_XLSX, oShape->spPr, oShape->style, m_oSaveParams.pTheme, oClrMap, strStrokeAttr, strStrokeNode, false);
+	}
+	else
+	{
+		strStrokeAttr = L" stroked='f' strokecolor='windowText [64]'";
+		strFillAttr = L" filled='f' fillcolor='window [65]'";
+	}
+	strXmlShapeControl = L"<v:shape type='#_x0000_t201' id='_x0000_s" + std::to_wstring(pControl->m_oShapeId->GetValue()) + L"'";
+	strXmlShapeControl += L" style='position:absolute' o:insetmode='auto'";
 	
+	strXmlShapeControl += strFillAttr;
+	strXmlShapeControl += strStrokeAttr;
+
 	if (objectType == SimpleTypes::Vml::vmlclientdataobjecttypeButton)
 	{
-		result += L" o:button=\"t\"";
+		strXmlShapeControl += L" o:button=\"t\"";
 	}
-	result += L">";
-	result += L"<o:lock v:ext=\"edit\" rotation=\"t\" text=\"t\"/>";
-
-	result += oClientData.toXML();
+	strXmlShapeControl += L">";
+	
+	strXmlShapeControl += strFillNode;
+	strXmlShapeControl += strStrokeNode;
 
+	strXmlShapeControl += L"<o:lock v:ext=\"edit\" rotation=\"t\" text=\"t\"/>";
+	
 	if (pControl->m_oFormControlPr->m_oText.IsInit())
 	{
 		OOX::Vml::CTextbox oTextbox;
 
 		oTextbox.m_oText = pControl->m_oFormControlPr->m_oText;
-		result += oTextbox.toXML();
+		strXmlShapeControl += oTextbox.toXML();
 	}
-	result += L"</v:shape>";
 
-	return result;
+	strXmlShapeControl += oClientData.toXML();
+
+	strXmlShapeControl += L"</v:shape>";
+	
+	m_pCurVmlDrawing->m_arControlXml.push_back(strXmlShapeControl);
 }
 int BinaryWorksheetsTableReader::ReadFormula(BYTE type, long length, void* poResult)
 {
diff --git a/OOXML/Binary/Sheets/Writer/BinaryReaderS.h b/OOXML/Binary/Sheets/Writer/BinaryReaderS.h
index 39312a00cf..33c028d419 100644
--- a/OOXML/Binary/Sheets/Writer/BinaryReaderS.h
+++ b/OOXML/Binary/Sheets/Writer/BinaryReaderS.h
@@ -413,7 +413,7 @@ namespace BinXlsxRW
 
 		void WriteComments();
 		void AddLineBreak(OOX::Spreadsheet::CSi& oSi);
-		std::wstring GetControlVmlShape(void* pControl);
+		void GetControlVmlShape(void* pControl);
         int ReadSheetDataToBin(BYTE type, long length, void* poResult);
         bool m_bWriteToXlsb = false;
 	};
diff --git a/OOXML/DocxFormat/Diagram/DiagramData.cpp b/OOXML/DocxFormat/Diagram/DiagramData.cpp
index 3e2c67465f..e507ac1396 100644
--- a/OOXML/DocxFormat/Diagram/DiagramData.cpp
+++ b/OOXML/DocxFormat/Diagram/DiagramData.cpp
@@ -57,8 +57,8 @@ namespace OOX
 	{
 		ReadAttributes(oReader);
 
-		if (oReader.IsEmptyNode())
-			return;
+		if (!oReader.IsEmptyNode())
+			oReader.ReadTillEnd();
 	}
 
 	template<typename E>
@@ -1062,8 +1062,8 @@ namespace OOX
 	{
 		ReadAttributes(oReader);
 
-		if (oReader.IsEmptyNode())
-			return;
+		if (!oReader.IsEmptyNode())
+			oReader.ReadTillEnd();
 	}
 
 	EElementType Diagram::CCxn::getType() const
@@ -1563,8 +1563,8 @@ namespace OOX
 	{
 		ReadAttributes(oReader);
 
-		if (oReader.IsEmptyNode())
-			return;
+		if (!oReader.IsEmptyNode())
+			oReader.ReadTillEnd();
 	}
 
 	EElementType Diagram::CCat::getType() const
@@ -1711,8 +1711,8 @@ namespace OOX
 
 		ReadAttributes(oReader);
 
-		if (oReader.IsEmptyNode())
-			return;
+		if (!oReader.IsEmptyNode())
+			oReader.ReadTillEnd();
 	}
 
 	void Diagram::CText::fromPPTY(NSBinPptxRW::CBinaryFileReader* pReader)
diff --git a/OOXML/DocxFormat/Diagram/DiagramLayout.cpp b/OOXML/DocxFormat/Diagram/DiagramLayout.cpp
index 6277d0b437..9ca6b90569 100644
--- a/OOXML/DocxFormat/Diagram/DiagramLayout.cpp
+++ b/OOXML/DocxFormat/Diagram/DiagramLayout.cpp
@@ -1725,8 +1725,8 @@ namespace OOX
 	{
 		ReadAttributes(oReader);
 
-		if (oReader.IsEmptyNode())
-			return;
+		if (!oReader.IsEmptyNode())
+			oReader.ReadTillEnd();
 	}
 	EElementType Diagram::CParam::getType() const
 	{
@@ -1973,8 +1973,8 @@ namespace OOX
 	{
 		ReadAttributes(oReader);
 
-		if (oReader.IsEmptyNode())
-			return;
+		if (!oReader.IsEmptyNode())
+			oReader.ReadTillEnd();
 	}
 	EElementType Diagram::CShapeAdjust::getType() const
 	{
diff --git a/OOXML/PPTXFormat/DrawingConverter/ASCOfficeDrawingConverter.cpp b/OOXML/PPTXFormat/DrawingConverter/ASCOfficeDrawingConverter.cpp
index 3e243830fd..fb53e89ba5 100644
--- a/OOXML/PPTXFormat/DrawingConverter/ASCOfficeDrawingConverter.cpp
+++ b/OOXML/PPTXFormat/DrawingConverter/ASCOfficeDrawingConverter.cpp
@@ -559,9 +559,40 @@ namespace NS_DWC_Common
 	bool getColorFromString(const std::wstring& colorStr, ODRAW::CColor & color)
 	{
 		bool bSet = false;
-		if (colorStr.find(L"#") != std::wstring::npos)
+		
+		int RGB = 0;
+		std::wstring str;
+
+		size_t pos = colorStr.find(L"["); //"buttonFace [67]" "#9c0 [50]"
+		if (pos != std::wstring::npos)
 		{
-			if (colorStr.length() == 4)
+			size_t pos1 = colorStr.find(L"]", pos + 1);
+			if (pos1 != std::wstring::npos)
+			{
+				str = colorStr.substr(pos + 1, pos1 - pos - 1);
+
+				if (NSStringUtils::IsNumber(str))
+				{
+					int index = XmlUtils::GetInteger(str);
+					if (index < 64)
+					{
+						RGB = shemeDefaultColor[index];
+						bSet = true;
+					}
+				}
+			}
+			//else if (index < 93)
+			//{
+			//	RGB = background ? controlPanelColors2[index - 65] : controlPanelColors1[index - 65];
+			//	bSet = true;
+			//}
+		}
+		if (!bSet && colorStr.find(L"#") == 0) // "#9c0 [50]"
+		{
+			size_t pos_end = colorStr.find(L" ", 1); //"buttonFace [67]" "#9c0 [50]"
+			if (pos_end == std::wstring::npos) pos_end = colorStr.length();
+			
+			if (pos_end == 4)
 			{
 				int lColor = XmlUtils::GetColorBGR(colorStr.substr(1, 3));
 				BYTE lB = ((lColor >> 16) & 0x0F);
@@ -581,293 +612,264 @@ namespace NS_DWC_Common
 				color.B = (BYTE)(lColor >> 16);
 				color.A = 0;
 			}
+			RGB = color.GetLONG_RGB();
 			bSet = true;
 		}
-		else
+
+		if (!bSet)
 		{
-			int RGB = 0;
-			std::wstring str;
+			pos = colorStr.find(' ');
+			if (pos == std::wstring::npos)
+				str = colorStr;
+			else
+				str = colorStr.substr(0, pos);
 
-			size_t pos = colorStr.find(L"["); //"buttonFace [67]"
-			if (pos != std::wstring::npos)
+			switch (str[0])
 			{
-				size_t pos1 = colorStr.find(L"]", pos + 1);
-				if (pos1 != std::wstring::npos)
-				{
-					str = colorStr.substr(pos + 1, pos1 - pos - 1);
-
-					if (NSStringUtils::IsNumber(str))
-					{
-						int index = XmlUtils::GetInteger(str);
-						if (index < 64)
-						{
-							RGB = shemeDefaultColor[index];
-							bSet = true;
-						}
-					}
-				}
-				//else if (index < 93)
-				//{
-				//	RGB = background ? controlPanelColors2[index - 65] : controlPanelColors1[index - 65];
-				//	bSet = true;
-				//}
-			}
-
-			if (!bSet)
-			{
-				pos = colorStr.find(' ');
-				if (pos == std::wstring::npos)
-					str = colorStr;
-				else
-					str = colorStr.substr(0, pos);
-
-				switch (str[0])
-				{
-				case 'a':
-					if (str == L"aliceBlue") { RGB = 0xF0F8FF; bSet = true; break; } // (Alice Blue Preset Color)		Specifies a color with RGB value (240,248,255)
-					else if (str == L"antiqueWhite") { RGB = 0xFAEBD7; bSet = true; break; } // (Antique White Preset Color)	Specifies a color with RGB value (250,235,215)
-					else if (str == L"aqua") { RGB = 0x00FFFF; bSet = true; break; } // (Aqua Preset Color)				Specifies a color with RGB value (0,255,255)
-					else if (str == L"aquamarine") { RGB = 0x7FFFD4; bSet = true; break; } // (Aquamarine Preset Color)		Specifies a color with RGB value (127,255,212)
-					else if (str == L"azure") { RGB = 0xF0FFFF; bSet = true; break; } // (Azure Preset Color)			Specifies a color with RGB value (240,255,255)
-					break;
-				case 'b':
-					if (str == L"beige") { RGB = 0xF5F5DC; bSet = true; break; } // (Beige Preset Color)			Specifies a color with RGB value (245,245,220)
-					else if (str == L"bisque") { RGB = 0xFFE4C4; bSet = true; break; } // (Bisque Preset Color)			Specifies a color with RGB value (255,228,196)
-					else if (str == L"black") { RGB = 0x000000; bSet = true; break; } // (Black Preset Color)			Specifies a color with RGB value (0,0,0)
-					else if (str == L"blanchedAlmond") { RGB = 0xFFEBCD; bSet = true; break; } // (Blanched Almond Preset Color)  Specifies a color with RGB value (255,235,205)
-					else if (str == L"blue") { RGB = 0x0000FF; bSet = true; break; } // (Blue Preset Color)				Specifies a color with RGB value (0,0,255)
-					else if (str == L"blueViolet") { RGB = 0x8A2BE2; bSet = true; break; } // (Blue Violet Preset Color)		Specifies a color with RGB value (138,43,226)
-					else if (str == L"brown") { RGB = 0xA52A2A; bSet = true; break; } // (Brown Preset Color)			Specifies a color with RGB value (165,42,42)
-					else if (str == L"burlyWood") { RGB = 0xDEB887; bSet = true; break; } // (Burly Wood Preset Color)		Specifies a color with RGB value (222,184,135)
-					else if (str == L"buttonFace") { RGB = 0xF0F0F0; bSet = true; break; }
-					else if (str == L"buttonText") { RGB = 0x000000; bSet = true; break; }
-					break;
-				case 'c':
-					if (str == L"cadetBlue") { RGB = 0x5F9EA0; bSet = true; break; } // (Cadet Blue Preset Color)		Specifies a color with RGB value (95,158,160)
-					else if (str == L"chartreuse") { RGB = 0x7FFF00; bSet = true; break; } // (Chartreuse Preset Color)		Specifies a color with RGB value (127,255,0)
-					else if (str == L"chocolate") { RGB = 0xD2691E; bSet = true; break; } // (Chocolate Preset Color)		Specifies a color with RGB value (210,105,30)
-					else if (str == L"coral") { RGB = 0xFF7F50; bSet = true; break; } // (Coral Preset Color)			Specifies a color with RGB value (255,127,80)
-					else if (str == L"cornflowerBlue") { RGB = 0x6495ED; bSet = true; break; } // (Cornflower Blue Preset Color)  Specifies a color with RGB value (100,149,237)
-					else if (str == L"cornsilk") { RGB = 0xFFF8DC; bSet = true; break; } // (Cornsilk Preset Color)			Specifies a color with RGB value (255,248,220)
-					else if (str == L"crimson") { RGB = 0xDC143C; bSet = true; break; } // (Crimson Preset Color)			Specifies a color with RGB value (220,20,60)
-					else if (str == L"cyan") { RGB = 0x00FFFF; bSet = true; break; } // (Cyan Preset Color)				Specifies a color with RGB value (0,255,255)
-					break;
-				case 'd':
-					if (str == L"darkBlue") { RGB = 0x00008B; bSet = true; break; } // (Dark Blue Preset Color)		Specifies a color with RGB value (0,0,139)
-					else if (str == L"darkCyan") { RGB = 0x008B8B; bSet = true; break; } // (Dark Cyan Preset Color)		Specifies a color with RGB value (0,139,139)
-					else if (str == L"darkGoldenrod") { RGB = 0xB8860B; bSet = true; break; } // (Dark Goldenrod Preset Color)	Specifies a color with RGB value (184,134,11)
-					else if (str == L"darkGray") { RGB = 0xA9A9A9; bSet = true; break; } // (Dark Gray Preset Color)		Specifies a color with RGB value (169,169,169)
-					else if (str == L"darkGreen") { RGB = 0x006400; bSet = true; break; } // (Dark Green Preset Color)		Specifies a color with RGB value (0,100,0)
-					else if (str == L"darkGrey") { RGB = 0xA9A9A9; bSet = true; break; } // (Dark Gray Preset Color)		Specifies a color with RGB value (169,169,169)
-					else if (str == L"darkKhaki") { RGB = 0xBDB76B; bSet = true; break; } // (Dark Khaki Preset Color)		Specifies a color with RGB value (189,183,107)
-					else if (str == L"darkMagenta") { RGB = 0x8B008B; bSet = true; break; } // (Dark Magenta Preset Color)		Specifies a color with RGB value (139,0,139)
-					else if (str == L"darkOliveGreen") { RGB = 0x556B2F; bSet = true; break; } // (Dark Olive Green Preset Color) Specifies a color with RGB value (85,107,47)
-					else if (str == L"darkOrange") { RGB = 0xFF8C00; bSet = true; break; } // (Dark Orange Preset Color)		Specifies a color with RGB value (255,140,0)
-					else if (str == L"darkOrchid") { RGB = 0x9932CC; bSet = true; break; } // (Dark Orchid Preset Color)		Specifies a color with RGB value (153,50,204)
-					else if (str == L"darkRed") { RGB = 0x8B0000; bSet = true; break; } // (Dark Red Preset Color)			Specifies a color with RGB value (139,0,0)
-					else if (str == L"darkSalmon") { RGB = 0xE9967A; bSet = true; break; } // (Dark Salmon Preset Color)		Specifies a color with RGB value (233,150,122)
-					else if (str == L"darkSeaGreen") { RGB = 0x8FBC8F; bSet = true; break; } // (Dark Sea Green Preset Color)	Specifies a color with RGB value (143,188,143)
-					else if (str == L"darkSlateBlue") { RGB = 0x483D8B; bSet = true; break; } // (Dark Slate Blue Preset Color)  Specifies a color with RGB value (72,61,139)
-					else if (str == L"darkSlateGray") { RGB = 0x2F4F4F; bSet = true; break; } // (Dark Slate Gray Preset Color)  Specifies a color with RGB value (47,79,79)
-					else if (str == L"darkSlateGrey") { RGB = 0x2F4F4F; bSet = true; break; } // (Dark Slate Gray Preset Color)  Specifies a color with RGB value (47,79,79)
-					else if (str == L"darkTurquoise") { RGB = 0x00CED1; bSet = true; break; } // (Dark Turquoise Preset Color)	Specifies a color with RGB value (0,206,209)
-					else if (str == L"darkViolet") { RGB = 0x9400D3; bSet = true; break; } // (Dark Violet Preset Color)		Specifies a color with RGB value (148,0,211)
-					else if (str == L"deepPink") { RGB = 0xFF1493; bSet = true; break; } // (Deep Pink Preset Color)		Specifies a color with RGB value (255,20,147)
-					else if (str == L"deepSkyBlue") { RGB = 0x00BFFF; bSet = true; break; } // (Deep Sky Blue Preset Color)	Specifies a color with RGB value (0,191,255)
-					else if (str == L"dimGray") { RGB = 0x696969; bSet = true; break; } // (Dim Gray Preset Color)			Specifies a color with RGB value (105,105,105)
-					else if (str == L"dimGrey") { RGB = 0x696969; bSet = true; break; } // (Dim Gray Preset Color)			Specifies a color with RGB value (105,105,105)
-					else if (str == L"dkBlue") { RGB = 0x00008B; bSet = true; break; } // (Dark Blue Preset Color)		Specifies a color with RGB value (0,0,139)
-					else if (str == L"dkCyan") { RGB = 0x008B8B; bSet = true; break; } // (Dark Cyan Preset Color)		Specifies a color with RGB value (0,139,139)
-					else if (str == L"dkGoldenrod") { RGB = 0xB8860B; bSet = true; break; } // (Dark Goldenrod Preset Color)	Specifies a color with RGB value (184,134,11)
-					else if (str == L"dkGray") { RGB = 0xA9A9A9; bSet = true; break; } // (Dark Gray Preset Color)		Specifies a color with RGB value (169,169,169)
-					else if (str == L"dkGreen") { RGB = 0x006400; bSet = true; break; } // (Dark Green Preset Color)		Specifies a color with RGB value (0,100,0)
-					else if (str == L"dkGrey") { RGB = 0xA9A9A9; bSet = true; break; } // (Dark Gray Preset Color)		Specifies a color with RGB value (169,169,169)
-					else if (str == L"dkKhaki") { RGB = 0xBDB76B; bSet = true; break; } // (Dark Khaki Preset Color)		Specifies a color with RGB value (189,183,107)
-					else if (str == L"dkMagenta") { RGB = 0x8B008B; bSet = true; break; } // (Dark Magenta Preset Color)		Specifies a color with RGB value (139,0,139)
-					else if (str == L"dkOliveGreen") { RGB = 0x556B2F; bSet = true; break; } // (Dark Olive Green Preset Color) Specifies a color with RGB value (85,107,47)
-					else if (str == L"dkOrange") { RGB = 0xFF8C00; bSet = true; break; } // (Dark Orange Preset Color)		Specifies a color with RGB value (255,140,0)
-					else if (str == L"dkOrchid") { RGB = 0x9932CC; bSet = true; break; } // (Dark Orchid Preset Color)		Specifies a color with RGB value (153,50,204)
-					else if (str == L"dkRed") { RGB = 0x8B0000; bSet = true; break; } // (Dark Red Preset Color)			Specifies a color with RGB value (139,0,0)
-					else if (str == L"dkSalmon") { RGB = 0xE9967A; bSet = true; break; } // (Dark Salmon Preset Color)		Specifies a color with RGB value (233,150,122)
-					else if (str == L"dkSeaGreen") { RGB = 0x8FBC8B; bSet = true; break; } // (Dark Sea Green Preset Color)	Specifies a color with RGB value (143,188,139)
-					else if (str == L"dkSlateBlue") { RGB = 0x483D8B; bSet = true; break; } // (Dark Slate Blue Preset Color)  Specifies a color with RGB value (72,61,139)
-					else if (str == L"dkSlateGray") { RGB = 0x2F4F4F; bSet = true; break; } // (Dark Slate Gray Preset Color)  Specifies a color with RGB value (47,79,79)
-					else if (str == L"dkSlateGrey") { RGB = 0x2F4F4F; bSet = true; break; } // (Dark Slate Gray Preset Color)  Specifies a color with RGB value (47,79,79)
-					else if (str == L"dkTurquoise") { RGB = 0x00CED1; bSet = true; break; } // (Dark Turquoise Preset Color)	Specifies a color with RGB value (0,206,209)
-					else if (str == L"dkViolet") { RGB = 0x9400D3; bSet = true; break; } // (Dark Violet Preset Color)		Specifies a color with RGB value (148,0,211)
-					else if (str == L"dodgerBlue") { RGB = 0x1E90FF; bSet = true; break; } // (Dodger Blue Preset Color)		Specifies a color with RGB value (30,144,255)
-					break;
-				case 'f':
-					if (str == L"firebrick") { RGB = 0xB22222; bSet = true; break; } // (Firebrick Preset Color)		Specifies a color with RGB value (178,34,34)
-					else if (str == L"floralWhite") { RGB = 0xFFFAF0; bSet = true; break; } // (Floral White Preset Color)		Specifies a color with RGB value (255,250,240)
-					else if (str == L"forestGreen") { RGB = 0x228B22; bSet = true; break; } // (Forest Green Preset Color)		Specifies a color with RGB value (34,139,34)
-					else if (str == L"fuchsia") { RGB = 0xFF00FF; bSet = true; break; } // (Fuchsia Preset Color)			Specifies a color with RGB value (255,0,255)
-					break;
-				case 'g':
-					if (str == L"gainsboro") { RGB = 0xDCDCDC; bSet = true; break; } // (Gainsboro Preset Color)		Specifies a color with RGB value (220,220,220)
-					else if (str == L"ghostWhite") { RGB = 0xF8F8FF; bSet = true; break; } // (Ghost White Preset Color)		Specifies a color with RGB value (248,248,255)
-					else if (str == L"gold") { RGB = 0xFFD700; bSet = true; break; } // (Gold Preset Color)				Specifies a color with RGB value (255,215,0)
-					else if (str == L"goldenrod") { RGB = 0xDAA520; bSet = true; break; } // (Goldenrod Preset Color)		Specifies a color with RGB value (218,165,32)
-					else if (str == L"gray") { RGB = 0x808080; bSet = true; break; } // (Gray Preset Color)				Specifies a color with RGB value (128,128,128)
-					else if (str == L"green") { RGB = 0x008000; bSet = true; break; } // (Green Preset Color)				Specifies a color with RGB value (0,128,0)
-					else if (str == L"greenYellow") { RGB = 0xADFF2F; bSet = true; break; } // (Green Yellow Preset Color)		Specifies a color with RGB value (173,255,47)
-					else if (str == L"grey") { RGB = 0x808080; bSet = true; break; } // (Gray Preset Color)				Specifies a color with RGB value (128,128,128)
-					break;
-				case 'h':
-					if (str == L"honeydew") { RGB = 0xF0FFF0; bSet = true; break; } // (Honeydew Preset Color)			Specifies a color with RGB value (240,255,240)
-					else if (str == L"hotPink") { RGB = 0xFF69B4; bSet = true; break; } // (Hot Pink Preset Color)			Specifies a color with RGB value (255,105,180)
-					break;
-				case 'i':
-					if (str == L"indianRed") { RGB = 0xCD5C5C; bSet = true; break; } // (Indian Red Preset Color)		Specifies a color with RGB value (205,92,92)
-					else if (str == L"indigo") { RGB = 0x4B0082; bSet = true; break; } // (Indigo Preset Color)			Specifies a color with RGB value (75,0,130)
-					else if (str == L"ivory") { RGB = 0xFFFFF0; bSet = true; break; } // (Ivory Preset Color)			Specifies a color with RGB value (255,255,240)
-					else if (str == L"infoText") { RGB = 0x000000; bSet = true; break; }
-					break;
-				case 'k':
-					if (str == L"khaki") { RGB = 0xF0E68C; bSet = true; break; } // (Khaki Preset Color)			Specifies a color with RGB value (240,230,140)
-					break;
-				case 'l':
-					if (str == L"lavender") { RGB = 0xE6E6FA; bSet = true; break; } // (Lavender Preset Color)			Specifies a color with RGB value (230,230,250)
-					else if (str == L"lavenderBlush") { RGB = 0xFFF0F5; bSet = true; break; } // (Lavender Blush Preset Color)	Specifies a color with RGB value (255,240,245)
-					else if (str == L"lawnGreen") { RGB = 0x7CFC00; bSet = true; break; } // (Lawn Green Preset Color)		Specifies a color with RGB value (124,252,0)
-					else if (str == L"lemonChiffon") { RGB = 0xFFFACD; bSet = true; break; } // (Lemon Chiffon Preset Color)	Specifies a color with RGB value (255,250,205)
-					else if (str == L"lightBlue") { RGB = 0xADD8E6; bSet = true; break; } // (Light Blue Preset Color)		Specifies a color with RGB value (173,216,230)
-					else if (str == L"lightCoral") { RGB = 0xF08080; bSet = true; break; } // (Light Coral Preset Color)		Specifies a color with RGB value (240,128,128)
-					else if (str == L"lightCyan") { RGB = 0xE0FFFF; bSet = true; break; } // (Light Cyan Preset Color)		Specifies a color with RGB value (224,255,255)
-					else if (str == L"lightGoldenrodYellow") { RGB = 0xFAFAD2; bSet = true; break; } // (Light Goldenrod Color)			Specifies a color with RGB value (250,250,210)
-					else if (str == L"lightGray") { RGB = 0xD3D3D3; bSet = true; break; } // (Light Gray Preset Color)		Specifies a color with RGB value (211,211,211)
-					else if (str == L"lightGreen") { RGB = 0x90EE90; bSet = true; break; } // (Light Green Preset Color)		Specifies a color with RGB value (144,238,144)
-					else if (str == L"lightGrey") { RGB = 0xD3D3D3; bSet = true; break; } // (Light Gray Preset Color)		Specifies a color with RGB value (211,211,211)
-					else if (str == L"lightPink") { RGB = 0xFFB6C1; bSet = true; break; } // (Light Pink Preset Color)		Specifies a color with RGB value (255,182,193)
-					else if (str == L"lightSalmon") { RGB = 0xFFA07A; bSet = true; break; } // (Light Salmon Preset Color)		Specifies a color with RGB value (255,160,122)
-					else if (str == L"lightSeaGreen") { RGB = 0x20B2AA; bSet = true; break; } // (Light Sea Green Preset Color)  Specifies a color with RGB value (32,178,170)
-					else if (str == L"lightSkyBlue") { RGB = 0x87CEFA; bSet = true; break; } // (Light Sky Blue Preset Color)	Specifies a color with RGB value (135,206,250)
-					else if (str == L"lightSlateGray") { RGB = 0x778899; bSet = true; break; } // (Light Slate Gray Preset Color) Specifies a color with RGB value (119,136,153)
-					else if (str == L"lightSlateGrey") { RGB = 0x778899; bSet = true; break; } // (Light Slate Gray Preset Color) Specifies a color with RGB value (119,136,153)
-					else if (str == L"lightSteelBlue") { RGB = 0xB0C4DE; bSet = true; break; } // (Light Steel Blue Preset Color) Specifies a color with RGB value (176,196,222)
-					else if (str == L"lightYellow") { RGB = 0xFFFFE0; bSet = true; break; } // (Light Yellow Preset Color)		Specifies a color with RGB value (255,255,224)
-					else if (str == L"lime") { RGB = 0x00FF00; bSet = true; break; } // (Lime Preset Color)				Specifies a color with RGB value (0,255,0)
-					else if (str == L"limeGreen") { RGB = 0x32CD32; bSet = true; break; } // (Lime Green Preset Color)		Specifies a color with RGB value (50,205,50)
-					else if (str == L"linen") { RGB = 0xFAF0E6; bSet = true; break; } // (Linen Preset Color)			Specifies a color with RGB value (250,240,230)
-					else if (str == L"ltBlue") { RGB = 0xADD8E6; bSet = true; break; } // (Light Blue Preset Color)		Specifies a color with RGB value (173,216,230)
-					else if (str == L"ltCoral") { RGB = 0xF08080; bSet = true; break; } // (Light Coral Preset Color)		Specifies a color with RGB value (240,128,128)
-					else if (str == L"ltCyan") { RGB = 0xE0FFFF; bSet = true; break; } // (Light Cyan Preset Color)		Specifies a color with RGB value (224,255,255)
-					else if (str == L"ltGoldenrodYellow") { RGB = 0xFAFA78; bSet = true; break; } // (Light Goldenrod Color)			Specifies a color with RGB value (250,250,120)
-					else if (str == L"ltGray") { RGB = 0xD3D3D3; bSet = true; break; } // (Light Gray Preset Color)		Specifies a color with RGB value (211,211,211)
-					else if (str == L"ltGreen") { RGB = 0x90EE90; bSet = true; break; } // (Light Green Preset Color)		Specifies a color with RGB value (144,238,144)
-					else if (str == L"ltGrey") { RGB = 0xD3D3D3; bSet = true; break; } // (Light Gray Preset Color)		Specifies a color with RGB value (211,211,211)
-					else if (str == L"ltPink") { RGB = 0xFFB6C1; bSet = true; break; } // (Light Pink Preset Color)		Specifies a color with RGB value (255,182,193)
-					else if (str == L"ltSalmon") { RGB = 0xFFA07A; bSet = true; break; } // (Light Salmon Preset Color)		Specifies a color with RGB value (255,160,122)
-					else if (str == L"ltSeaGreen") { RGB = 0x20B2AA; bSet = true; break; } // (Light Sea Green Preset Color)  Specifies a color with RGB value (32,178,170)
-					else if (str == L"ltSkyBlue") { RGB = 0x87CEFA; bSet = true; break; } // (Light Sky Blue Preset Color)	Specifies a color with RGB value (135,206,250)
-					else if (str == L"ltSlateGray") { RGB = 0x778899; bSet = true; break; } // (Light Slate Gray Preset Color) Specifies a color with RGB value (119,136,153)
-					else if (str == L"ltSlateGrey") { RGB = 0x778899; bSet = true; break; } // (Light Slate Gray Preset Color) Specifies a color with RGB value (119,136,153)
-					else if (str == L"ltSteelBlue") { RGB = 0xB0C4DE; bSet = true; break; } // (Light Steel Blue Preset Color) Specifies a color with RGB value (176,196,222)
-					else if (str == L"ltYellow") { RGB = 0xFFFFE0; bSet = true; break; } // (Light Yellow Preset Color)		Specifies a color with RGB value (255,255,224)
-					break;
-				case 'm':
-					if (str == L"magenta") { RGB = 0xFF00FF; bSet = true; break; } // (Magenta Preset Color)			Specifies a color with RGB value (255,0,255)
-					else if (str == L"maroon") { RGB = 0x800000; bSet = true; break; } // (Maroon Preset Color)			Specifies a color with RGB value (128,0,0)
-					else if (str == L"medAquamarine") { RGB = 0x66CDAA; bSet = true; break; } // (Medium Aquamarine Preset Color)Specifies a color with RGB value (102,205,170)
-					else if (str == L"medBlue") { RGB = 0x0000CD; bSet = true; break; } // (Medium Blue Preset Color)		Specifies a color with RGB value (0,0,205)
-					else if (str == L"mediumAquamarine") { RGB = 0x66CDAA; bSet = true; break; } // (Medium Aquamarine Color)		Specifies a color with RGB value (102,205,170)
-					else if (str == L"mediumBlue") { RGB = 0x0000CD; bSet = true; break; } // (Medium Blue Preset Color)		Specifies a color with RGB value (0,0,205)
-					else if (str == L"mediumOrchid") { RGB = 0xBA55D3; bSet = true; break; } // (Medium Orchid Preset Color)	Specifies a color with RGB value (186,85,211)
-					else if (str == L"mediumPurple") { RGB = 0x9370DB; bSet = true; break; } // (Medium Purple Preset Color)	Specifies a color with RGB value (147,112,219)
-					else if (str == L"mediumSeaGreen") { RGB = 0x3CB371; bSet = true; break; } // (Medium Sea Green Preset Color) Specifies a color with RGB value (60,179,113)
-					else if (str == L"mediumSlateBlue") { RGB = 0x7B68EE; bSet = true; break; } // (Medium Slate Blue Preset Color)Specifies a color with RGB value (123,104,238)
-					else if (str == L"mediumSpringGreen") { RGB = 0x00FA9A; bSet = true; break; } // (Medium Spring Color)			Specifies a color with RGB value (0,250,154)
-					else if (str == L"mediumTurquoise") { RGB = 0x48D1CC; bSet = true; break; } // (Medium Turquoise Preset Color) Specifies a color with RGB value (72,209,204)
-					else if (str == L"mediumVioletRed") { RGB = 0xC71585; bSet = true; break; } // (Medium Violet Red Preset Color)Specifies a color with RGB value (199,21,133)
-					else if (str == L"medOrchid") { RGB = 0xBA55D3; bSet = true; break; } // (Medium Orchid Preset Color)	Specifies a color with RGB value (186,85,211)
-					else if (str == L"medPurple") { RGB = 0x9370DB; bSet = true; break; } // (Medium Purple Preset Color)	Specifies a color with RGB value (147,112,219)
-					else if (str == L"medSeaGreen") { RGB = 0x3CB371; bSet = true; break; } // (Medium Sea Green Preset Color) Specifies a color with RGB value (60,179,113)
-					else if (str == L"medSlateBlue") { RGB = 0x7B68EE; bSet = true; break; } // (Medium Slate Blue Preset Color)Specifies a color with RGB value (123,104,238)
-					else if (str == L"medSpringGreen") { RGB = 0x00FA9A; bSet = true; break; } // (Medium Spring Preset Color)	Specifies a color with RGB value (0,250,154)
-					else if (str == L"medTurquoise") { RGB = 0x48D1CC; bSet = true; break; } // (Medium Turquoise Preset Color) Specifies a color with RGB value (72,209,204)
-					else if (str == L"medVioletRed") { RGB = 0xC71585; bSet = true; break; } // (Medium Violet Red Preset Color)Specifies a color with RGB value (199,21,133)
-					else if (str == L"midnightBlue") { RGB = 0x191970; bSet = true; break; } // (Midnight Blue Preset Color)	Specifies a color with RGB value (25,25,112)
-					else if (str == L"mintCream") { RGB = 0xF5FFFA; bSet = true; break; } // (Mint Cream Preset Color)		Specifies a color with RGB value (245,255,250)
-					else if (str == L"mistyRose") { RGB = 0xFFE4FF; bSet = true; break; } // (Misty Rose Preset Color)		Specifies a color with RGB value (255,228,225)
-					else if (str == L"moccasin") { RGB = 0xFFE4B5; bSet = true; break; } // (Moccasin Preset Color)			Specifies a color with RGB value (255,228,181)
-					else if (str == L"menuText") { RGB = 0x000000; bSet = true; break; }
-					break;
-				case 'n':
-					if (str == L"navajoWhite") { RGB = 0xFFDEAD; bSet = true; break; } // (Navajo White Preset Color)		Specifies a color with RGB value (255,222,173)
-					else if (str == L"navy") { RGB = 0x000080; bSet = true; break; } // (Navy Preset Color)				Specifies a color with RGB value (0,0,128)
-					break;
-				case 'o':
-					if (str == L"oldLace") { RGB = 0xFDF5E6; bSet = true; break; } // (Old Lace Preset Color)			Specifies a color with RGB value (253,245,230)
-					else if (str == L"olive") { RGB = 0x808000; bSet = true; break; } // (Olive Preset Color)			Specifies a color with RGB value (128,128,0)
-					else if (str == L"oliveDrab") { RGB = 0x6B8E23; bSet = true; break; } // (Olive Drab Preset Color)		Specifies a color with RGB value (107,142,35)
-					else if (str == L"orange") { RGB = 0xFFA500; bSet = true; break; } // (Orange Preset Color)			Specifies a color with RGB value (255,165,0)
-					else if (str == L"orangeRed") { RGB = 0xFF4500; bSet = true; break; } // (Orange Red Preset Color)		Specifies a color with RGB value (255,69,0)
-					else if (str == L"orchid") { RGB = 0xDA70D6; bSet = true; break; } // (Orchid Preset Color)			Specifies a color with RGB value (218,112,214)
-					break;
-				case 'p':
-					if (str == L"paleGoldenrod") { RGB = 0xEEE8AA; bSet = true; break; } // (Pale Goldenrod Preset Color)	Specifies a color with RGB value (238,232,170)
-					else if (str == L"paleGreen") { RGB = 0x98FB98; bSet = true; break; } // (Pale Green Preset Color)		Specifies a color with RGB value (152,251,152)
-					else if (str == L"paleTurquoise") { RGB = 0xAFEEEE; bSet = true; break; } // (Pale Turquoise Preset Color)	Specifies a color with RGB value (175,238,238)
-					else if (str == L"paleVioletRed") { RGB = 0xDB7093; bSet = true; break; } // (Pale Violet Red Preset Color)  Specifies a color with RGB value (219,112,147)
-					else if (str == L"papayaWhip") { RGB = 0xFFEFD5; bSet = true; break; } // (Papaya Whip Preset Color)		Specifies a color with RGB value (255,239,213)
-					else if (str == L"peachPuff") { RGB = 0xFFDAB9; bSet = true; break; } // (Peach Puff Preset Color)		Specifies a color with RGB value (255,218,185)
-					else if (str == L"peru") { RGB = 0xCD853F; bSet = true; break; } // (Peru Preset Color)				Specifies a color with RGB value (205,133,63)
-					else if (str == L"pink") { RGB = 0xFFC0CB; bSet = true; break; } // (Pink Preset Color)				Specifies a color with RGB value (255,192,203)
-					else if (str == L"plum") { RGB = 0xD3A0D3; bSet = true; break; } // (Plum Preset Color)				Specifies a color with RGB value (221,160,221)
-					else if (str == L"powderBlue") { RGB = 0xB0E0E6; bSet = true; break; } // (Powder Blue Preset Color)		Specifies a color with RGB value (176,224,230)
-					else if (str == L"purple") { RGB = 0x800080; bSet = true; break; } // (Purple Preset Color)			Specifies a color with RGB value (128,0,128)
-					break;
-				case 'r':
-					if (str == L"red") { RGB = 0xFF0000; bSet = true; break; } // (Red Preset Color)				Specifies a color with RGB value (255,0,0)
-					else if (str == L"rosyBrown") { RGB = 0xBC8F8F; bSet = true; break; } // (Rosy Brown Preset Color)		Specifies a color with RGB value (188,143,143)
-					else if (str == L"royalBlue") { RGB = 0x4169E1; bSet = true; break; } // (Royal Blue Preset Color)		Specifies a color with RGB value (65,105,225)
-					break;
-				case 's':
-					if (str == L"saddleBrown") { RGB = 0x8B4513; bSet = true; break; } // (Saddle Brown Preset Color)		Specifies a color with RGB value (139,69,19)
-					else if (str == L"salmon") { RGB = 0xFA8072; bSet = true; break; } // (Salmon Preset Color)			Specifies a color with RGB value (250,128,114)
-					else if (str == L"sandyBrown") { RGB = 0xF4A460; bSet = true; break; } // (Sandy Brown Preset Color)		Specifies a color with RGB value (244,164,96)
-					else if (str == L"seaGreen") { RGB = 0x2E8B57; bSet = true; break; } // (Sea Green Preset Color)		Specifies a color with RGB value (46,139,87)
-					else if (str == L"seaShell") { RGB = 0xFFF5EE; bSet = true; break; } // (Sea Shell Preset Color)		Specifies a color with RGB value (255,245,238)
-					else if (str == L"sienna") { RGB = 0xA0522D; bSet = true; break; } // (Sienna Preset Color)			Specifies a color with RGB value (160,82,45)
-					else if (str == L"silver") { RGB = 0xC0C0C0; bSet = true; break; } // (Silver Preset Color)			Specifies a color with RGB value (192,192,192)
-					else if (str == L"skyBlue") { RGB = 0x87CEEB; bSet = true; break; } // (Sky Blue Preset Color)			Specifies a color with RGB value (135,206,235)
-					else if (str == L"slateBlue") { RGB = 0x6A5AEB; bSet = true; break; } // (Slate Blue Preset Color)		Specifies a color with RGB value (106,90,205)
-					else if (str == L"slateGray") { RGB = 0x708090; bSet = true; break; } // (Slate Gray Preset Color)		Specifies a color with RGB value (112,128,144)
-					else if (str == L"slateGrey") { RGB = 0x708090; bSet = true; break; } // (Slate Gray Preset Color)		Specifies a color with RGB value (112,128,144)
-					else if (str == L"snow") { RGB = 0xFFFAFA; bSet = true; break; } // (Snow Preset Color)				Specifies a color with RGB value (255,250,250)
-					else if (str == L"springGreen") { RGB = 0x00FF7F; bSet = true; break; } // (Spring Green Preset Color)		Specifies a color with RGB value (0,255,127)
-					else if (str == L"steelBlue") { RGB = 0x4682B4; bSet = true; break; } // (Steel Blue Preset Color)		Specifies a color with RGB value (70,130,180)
-					break;
-				case 't':
-					if (str == L"tan") { RGB = 0xD2B48C; bSet = true; break; } // (Tan Preset Color)				Specifies a color with RGB value (210,180,140)
-					else if (str == L"teal") { RGB = 0x008080; bSet = true; break; } // (Teal Preset Color)				Specifies a color with RGB value (0,128,128)
-					else if (str == L"thistle") { RGB = 0xD8BFD8; bSet = true; break; } // (Thistle Preset Color)			Specifies a color with RGB value (216,191,216)
-					else if (str == L"tomato") { RGB = 0xFF7347; bSet = true; break; } // (Tomato Preset Color)			Specifies a color with RGB value (255,99,71)
-					else if (str == L"turquoise") { RGB = 0x40E0D0; bSet = true; break; } // (Turquoise Preset Color)		Specifies a color with RGB value (64,224,208)
-					break;
-				case 'v':
-					if (str == L"violet") { RGB = 0xEE82EE; bSet = true; break; } // (Violet Preset Color)			Specifies a color with RGB value (238,130,238)
-					break;
-				case 'w':
-					if (str == L"wheat") { RGB = 0xF5DEB3; bSet = true; break; } // (Wheat Preset Color)			Specifies a color with RGB value (245,222,179)
-					else if (str == L"white") { RGB = 0xFFFFFF; bSet = true; break; } // (White Preset Color)			Specifies a color with RGB value (255,255,255)
-					else if (str == L"whiteSmoke") { RGB = 0xF5F5F5; bSet = true; break; } // (White Smoke Preset Color)		Specifies a color with RGB value (245,245,245)
-					else if (str == L"windowsText") { RGB = 0x000000; bSet = true; break; } // (White Smoke Preset Color)		Specifies a color with RGB value (245,245,245)
-					break;
-				case 'y':
-					if (str == L"yellow") { RGB = 0xFFFF00; bSet = true; break; } // (Yellow Preset Color)			Specifies a color with RGB value (255,255,0)
-					else if (str == L"yellowGreen") { RGB = 0x9ACD32; bSet = true; break; } // (Yellow Green Preset Color)		Specifies a color with RGB value (154,205,50)
-					break;
-				}
-			}
-			if (bSet)
-			{
-				color.R = (BYTE)(RGB >> 16);
-				color.G = (BYTE)(RGB >> 8);
-				color.B = (BYTE)(RGB);
-				color.A = 0;
+			case 'a':
+				if (str == L"aliceBlue") { RGB = 0xF0F8FF; bSet = true; break; } // (Alice Blue Preset Color)		Specifies a color with RGB value (240,248,255)
+				else if (str == L"antiqueWhite") { RGB = 0xFAEBD7; bSet = true; break; } // (Antique White Preset Color)	Specifies a color with RGB value (250,235,215)
+				else if (str == L"aqua") { RGB = 0x00FFFF; bSet = true; break; } // (Aqua Preset Color)				Specifies a color with RGB value (0,255,255)
+				else if (str == L"aquamarine") { RGB = 0x7FFFD4; bSet = true; break; } // (Aquamarine Preset Color)		Specifies a color with RGB value (127,255,212)
+				else if (str == L"azure") { RGB = 0xF0FFFF; bSet = true; break; } // (Azure Preset Color)			Specifies a color with RGB value (240,255,255)
+				break;
+			case 'b':
+				if (str == L"beige") { RGB = 0xF5F5DC; bSet = true; break; } // (Beige Preset Color)			Specifies a color with RGB value (245,245,220)
+				else if (str == L"bisque") { RGB = 0xFFE4C4; bSet = true; break; } // (Bisque Preset Color)			Specifies a color with RGB value (255,228,196)
+				else if (str == L"black") { RGB = 0x000000; bSet = true; break; } // (Black Preset Color)			Specifies a color with RGB value (0,0,0)
+				else if (str == L"blanchedAlmond") { RGB = 0xFFEBCD; bSet = true; break; } // (Blanched Almond Preset Color)  Specifies a color with RGB value (255,235,205)
+				else if (str == L"blue") { RGB = 0x0000FF; bSet = true; break; } // (Blue Preset Color)				Specifies a color with RGB value (0,0,255)
+				else if (str == L"blueViolet") { RGB = 0x8A2BE2; bSet = true; break; } // (Blue Violet Preset Color)		Specifies a color with RGB value (138,43,226)
+				else if (str == L"brown") { RGB = 0xA52A2A; bSet = true; break; } // (Brown Preset Color)			Specifies a color with RGB value (165,42,42)
+				else if (str == L"burlyWood") { RGB = 0xDEB887; bSet = true; break; } // (Burly Wood Preset Color)		Specifies a color with RGB value (222,184,135)
+				else if (str == L"buttonFace") { RGB = 0xF0F0F0; bSet = true; break; }
+				else if (str == L"buttonText") { RGB = 0x000000; bSet = true; break; }
+				break;
+			case 'c':
+				if (str == L"cadetBlue") { RGB = 0x5F9EA0; bSet = true; break; } // (Cadet Blue Preset Color)		Specifies a color with RGB value (95,158,160)
+				else if (str == L"chartreuse") { RGB = 0x7FFF00; bSet = true; break; } // (Chartreuse Preset Color)		Specifies a color with RGB value (127,255,0)
+				else if (str == L"chocolate") { RGB = 0xD2691E; bSet = true; break; } // (Chocolate Preset Color)		Specifies a color with RGB value (210,105,30)
+				else if (str == L"coral") { RGB = 0xFF7F50; bSet = true; break; } // (Coral Preset Color)			Specifies a color with RGB value (255,127,80)
+				else if (str == L"cornflowerBlue") { RGB = 0x6495ED; bSet = true; break; } // (Cornflower Blue Preset Color)  Specifies a color with RGB value (100,149,237)
+				else if (str == L"cornsilk") { RGB = 0xFFF8DC; bSet = true; break; } // (Cornsilk Preset Color)			Specifies a color with RGB value (255,248,220)
+				else if (str == L"crimson") { RGB = 0xDC143C; bSet = true; break; } // (Crimson Preset Color)			Specifies a color with RGB value (220,20,60)
+				else if (str == L"cyan") { RGB = 0x00FFFF; bSet = true; break; } // (Cyan Preset Color)				Specifies a color with RGB value (0,255,255)
+				break;
+			case 'd':
+				if (str == L"darkBlue") { RGB = 0x00008B; bSet = true; break; } // (Dark Blue Preset Color)		Specifies a color with RGB value (0,0,139)
+				else if (str == L"darkCyan") { RGB = 0x008B8B; bSet = true; break; } // (Dark Cyan Preset Color)		Specifies a color with RGB value (0,139,139)
+				else if (str == L"darkGoldenrod") { RGB = 0xB8860B; bSet = true; break; } // (Dark Goldenrod Preset Color)	Specifies a color with RGB value (184,134,11)
+				else if (str == L"darkGray") { RGB = 0xA9A9A9; bSet = true; break; } // (Dark Gray Preset Color)		Specifies a color with RGB value (169,169,169)
+				else if (str == L"darkGreen") { RGB = 0x006400; bSet = true; break; } // (Dark Green Preset Color)		Specifies a color with RGB value (0,100,0)
+				else if (str == L"darkGrey") { RGB = 0xA9A9A9; bSet = true; break; } // (Dark Gray Preset Color)		Specifies a color with RGB value (169,169,169)
+				else if (str == L"darkKhaki") { RGB = 0xBDB76B; bSet = true; break; } // (Dark Khaki Preset Color)		Specifies a color with RGB value (189,183,107)
+				else if (str == L"darkMagenta") { RGB = 0x8B008B; bSet = true; break; } // (Dark Magenta Preset Color)		Specifies a color with RGB value (139,0,139)
+				else if (str == L"darkOliveGreen") { RGB = 0x556B2F; bSet = true; break; } // (Dark Olive Green Preset Color) Specifies a color with RGB value (85,107,47)
+				else if (str == L"darkOrange") { RGB = 0xFF8C00; bSet = true; break; } // (Dark Orange Preset Color)		Specifies a color with RGB value (255,140,0)
+				else if (str == L"darkOrchid") { RGB = 0x9932CC; bSet = true; break; } // (Dark Orchid Preset Color)		Specifies a color with RGB value (153,50,204)
+				else if (str == L"darkRed") { RGB = 0x8B0000; bSet = true; break; } // (Dark Red Preset Color)			Specifies a color with RGB value (139,0,0)
+				else if (str == L"darkSalmon") { RGB = 0xE9967A; bSet = true; break; } // (Dark Salmon Preset Color)		Specifies a color with RGB value (233,150,122)
+				else if (str == L"darkSeaGreen") { RGB = 0x8FBC8F; bSet = true; break; } // (Dark Sea Green Preset Color)	Specifies a color with RGB value (143,188,143)
+				else if (str == L"darkSlateBlue") { RGB = 0x483D8B; bSet = true; break; } // (Dark Slate Blue Preset Color)  Specifies a color with RGB value (72,61,139)
+				else if (str == L"darkSlateGray") { RGB = 0x2F4F4F; bSet = true; break; } // (Dark Slate Gray Preset Color)  Specifies a color with RGB value (47,79,79)
+				else if (str == L"darkSlateGrey") { RGB = 0x2F4F4F; bSet = true; break; } // (Dark Slate Gray Preset Color)  Specifies a color with RGB value (47,79,79)
+				else if (str == L"darkTurquoise") { RGB = 0x00CED1; bSet = true; break; } // (Dark Turquoise Preset Color)	Specifies a color with RGB value (0,206,209)
+				else if (str == L"darkViolet") { RGB = 0x9400D3; bSet = true; break; } // (Dark Violet Preset Color)		Specifies a color with RGB value (148,0,211)
+				else if (str == L"deepPink") { RGB = 0xFF1493; bSet = true; break; } // (Deep Pink Preset Color)		Specifies a color with RGB value (255,20,147)
+				else if (str == L"deepSkyBlue") { RGB = 0x00BFFF; bSet = true; break; } // (Deep Sky Blue Preset Color)	Specifies a color with RGB value (0,191,255)
+				else if (str == L"dimGray") { RGB = 0x696969; bSet = true; break; } // (Dim Gray Preset Color)			Specifies a color with RGB value (105,105,105)
+				else if (str == L"dimGrey") { RGB = 0x696969; bSet = true; break; } // (Dim Gray Preset Color)			Specifies a color with RGB value (105,105,105)
+				else if (str == L"dkBlue") { RGB = 0x00008B; bSet = true; break; } // (Dark Blue Preset Color)		Specifies a color with RGB value (0,0,139)
+				else if (str == L"dkCyan") { RGB = 0x008B8B; bSet = true; break; } // (Dark Cyan Preset Color)		Specifies a color with RGB value (0,139,139)
+				else if (str == L"dkGoldenrod") { RGB = 0xB8860B; bSet = true; break; } // (Dark Goldenrod Preset Color)	Specifies a color with RGB value (184,134,11)
+				else if (str == L"dkGray") { RGB = 0xA9A9A9; bSet = true; break; } // (Dark Gray Preset Color)		Specifies a color with RGB value (169,169,169)
+				else if (str == L"dkGreen") { RGB = 0x006400; bSet = true; break; } // (Dark Green Preset Color)		Specifies a color with RGB value (0,100,0)
+				else if (str == L"dkGrey") { RGB = 0xA9A9A9; bSet = true; break; } // (Dark Gray Preset Color)		Specifies a color with RGB value (169,169,169)
+				else if (str == L"dkKhaki") { RGB = 0xBDB76B; bSet = true; break; } // (Dark Khaki Preset Color)		Specifies a color with RGB value (189,183,107)
+				else if (str == L"dkMagenta") { RGB = 0x8B008B; bSet = true; break; } // (Dark Magenta Preset Color)		Specifies a color with RGB value (139,0,139)
+				else if (str == L"dkOliveGreen") { RGB = 0x556B2F; bSet = true; break; } // (Dark Olive Green Preset Color) Specifies a color with RGB value (85,107,47)
+				else if (str == L"dkOrange") { RGB = 0xFF8C00; bSet = true; break; } // (Dark Orange Preset Color)		Specifies a color with RGB value (255,140,0)
+				else if (str == L"dkOrchid") { RGB = 0x9932CC; bSet = true; break; } // (Dark Orchid Preset Color)		Specifies a color with RGB value (153,50,204)
+				else if (str == L"dkRed") { RGB = 0x8B0000; bSet = true; break; } // (Dark Red Preset Color)			Specifies a color with RGB value (139,0,0)
+				else if (str == L"dkSalmon") { RGB = 0xE9967A; bSet = true; break; } // (Dark Salmon Preset Color)		Specifies a color with RGB value (233,150,122)
+				else if (str == L"dkSeaGreen") { RGB = 0x8FBC8B; bSet = true; break; } // (Dark Sea Green Preset Color)	Specifies a color with RGB value (143,188,139)
+				else if (str == L"dkSlateBlue") { RGB = 0x483D8B; bSet = true; break; } // (Dark Slate Blue Preset Color)  Specifies a color with RGB value (72,61,139)
+				else if (str == L"dkSlateGray") { RGB = 0x2F4F4F; bSet = true; break; } // (Dark Slate Gray Preset Color)  Specifies a color with RGB value (47,79,79)
+				else if (str == L"dkSlateGrey") { RGB = 0x2F4F4F; bSet = true; break; } // (Dark Slate Gray Preset Color)  Specifies a color with RGB value (47,79,79)
+				else if (str == L"dkTurquoise") { RGB = 0x00CED1; bSet = true; break; } // (Dark Turquoise Preset Color)	Specifies a color with RGB value (0,206,209)
+				else if (str == L"dkViolet") { RGB = 0x9400D3; bSet = true; break; } // (Dark Violet Preset Color)		Specifies a color with RGB value (148,0,211)
+				else if (str == L"dodgerBlue") { RGB = 0x1E90FF; bSet = true; break; } // (Dodger Blue Preset Color)		Specifies a color with RGB value (30,144,255)
+				break;
+			case 'f':
+				if (str == L"firebrick") { RGB = 0xB22222; bSet = true; break; } // (Firebrick Preset Color)		Specifies a color with RGB value (178,34,34)
+				else if (str == L"floralWhite") { RGB = 0xFFFAF0; bSet = true; break; } // (Floral White Preset Color)		Specifies a color with RGB value (255,250,240)
+				else if (str == L"forestGreen") { RGB = 0x228B22; bSet = true; break; } // (Forest Green Preset Color)		Specifies a color with RGB value (34,139,34)
+				else if (str == L"fuchsia") { RGB = 0xFF00FF; bSet = true; break; } // (Fuchsia Preset Color)			Specifies a color with RGB value (255,0,255)
+				break;
+			case 'g':
+				if (str == L"gainsboro") { RGB = 0xDCDCDC; bSet = true; break; } // (Gainsboro Preset Color)		Specifies a color with RGB value (220,220,220)
+				else if (str == L"ghostWhite") { RGB = 0xF8F8FF; bSet = true; break; } // (Ghost White Preset Color)		Specifies a color with RGB value (248,248,255)
+				else if (str == L"gold") { RGB = 0xFFD700; bSet = true; break; } // (Gold Preset Color)				Specifies a color with RGB value (255,215,0)
+				else if (str == L"goldenrod") { RGB = 0xDAA520; bSet = true; break; } // (Goldenrod Preset Color)		Specifies a color with RGB value (218,165,32)
+				else if (str == L"gray") { RGB = 0x808080; bSet = true; break; } // (Gray Preset Color)				Specifies a color with RGB value (128,128,128)
+				else if (str == L"green") { RGB = 0x008000; bSet = true; break; } // (Green Preset Color)				Specifies a color with RGB value (0,128,0)
+				else if (str == L"greenYellow") { RGB = 0xADFF2F; bSet = true; break; } // (Green Yellow Preset Color)		Specifies a color with RGB value (173,255,47)
+				else if (str == L"grey") { RGB = 0x808080; bSet = true; break; } // (Gray Preset Color)				Specifies a color with RGB value (128,128,128)
+				break;
+			case 'h':
+				if (str == L"honeydew") { RGB = 0xF0FFF0; bSet = true; break; } // (Honeydew Preset Color)			Specifies a color with RGB value (240,255,240)
+				else if (str == L"hotPink") { RGB = 0xFF69B4; bSet = true; break; } // (Hot Pink Preset Color)			Specifies a color with RGB value (255,105,180)
+				break;
+			case 'i':
+				if (str == L"indianRed") { RGB = 0xCD5C5C; bSet = true; break; } // (Indian Red Preset Color)		Specifies a color with RGB value (205,92,92)
+				else if (str == L"indigo") { RGB = 0x4B0082; bSet = true; break; } // (Indigo Preset Color)			Specifies a color with RGB value (75,0,130)
+				else if (str == L"ivory") { RGB = 0xFFFFF0; bSet = true; break; } // (Ivory Preset Color)			Specifies a color with RGB value (255,255,240)
+				else if (str == L"infoText") { RGB = 0x000000; bSet = true; break; }
+				break;
+			case 'k':
+				if (str == L"khaki") { RGB = 0xF0E68C; bSet = true; break; } // (Khaki Preset Color)			Specifies a color with RGB value (240,230,140)
+				break;
+			case 'l':
+				if (str == L"lavender") { RGB = 0xE6E6FA; bSet = true; break; } // (Lavender Preset Color)			Specifies a color with RGB value (230,230,250)
+				else if (str == L"lavenderBlush") { RGB = 0xFFF0F5; bSet = true; break; } // (Lavender Blush Preset Color)	Specifies a color with RGB value (255,240,245)
+				else if (str == L"lawnGreen") { RGB = 0x7CFC00; bSet = true; break; } // (Lawn Green Preset Color)		Specifies a color with RGB value (124,252,0)
+				else if (str == L"lemonChiffon") { RGB = 0xFFFACD; bSet = true; break; } // (Lemon Chiffon Preset Color)	Specifies a color with RGB value (255,250,205)
+				else if (str == L"lightBlue") { RGB = 0xADD8E6; bSet = true; break; } // (Light Blue Preset Color)		Specifies a color with RGB value (173,216,230)
+				else if (str == L"lightCoral") { RGB = 0xF08080; bSet = true; break; } // (Light Coral Preset Color)		Specifies a color with RGB value (240,128,128)
+				else if (str == L"lightCyan") { RGB = 0xE0FFFF; bSet = true; break; } // (Light Cyan Preset Color)		Specifies a color with RGB value (224,255,255)
+				else if (str == L"lightGoldenrodYellow") { RGB = 0xFAFAD2; bSet = true; break; } // (Light Goldenrod Color)			Specifies a color with RGB value (250,250,210)
+				else if (str == L"lightGray") { RGB = 0xD3D3D3; bSet = true; break; } // (Light Gray Preset Color)		Specifies a color with RGB value (211,211,211)
+				else if (str == L"lightGreen") { RGB = 0x90EE90; bSet = true; break; } // (Light Green Preset Color)		Specifies a color with RGB value (144,238,144)
+				else if (str == L"lightGrey") { RGB = 0xD3D3D3; bSet = true; break; } // (Light Gray Preset Color)		Specifies a color with RGB value (211,211,211)
+				else if (str == L"lightPink") { RGB = 0xFFB6C1; bSet = true; break; } // (Light Pink Preset Color)		Specifies a color with RGB value (255,182,193)
+				else if (str == L"lightSalmon") { RGB = 0xFFA07A; bSet = true; break; } // (Light Salmon Preset Color)		Specifies a color with RGB value (255,160,122)
+				else if (str == L"lightSeaGreen") { RGB = 0x20B2AA; bSet = true; break; } // (Light Sea Green Preset Color)  Specifies a color with RGB value (32,178,170)
+				else if (str == L"lightSkyBlue") { RGB = 0x87CEFA; bSet = true; break; } // (Light Sky Blue Preset Color)	Specifies a color with RGB value (135,206,250)
+				else if (str == L"lightSlateGray") { RGB = 0x778899; bSet = true; break; } // (Light Slate Gray Preset Color) Specifies a color with RGB value (119,136,153)
+				else if (str == L"lightSlateGrey") { RGB = 0x778899; bSet = true; break; } // (Light Slate Gray Preset Color) Specifies a color with RGB value (119,136,153)
+				else if (str == L"lightSteelBlue") { RGB = 0xB0C4DE; bSet = true; break; } // (Light Steel Blue Preset Color) Specifies a color with RGB value (176,196,222)
+				else if (str == L"lightYellow") { RGB = 0xFFFFE0; bSet = true; break; } // (Light Yellow Preset Color)		Specifies a color with RGB value (255,255,224)
+				else if (str == L"lime") { RGB = 0x00FF00; bSet = true; break; } // (Lime Preset Color)				Specifies a color with RGB value (0,255,0)
+				else if (str == L"limeGreen") { RGB = 0x32CD32; bSet = true; break; } // (Lime Green Preset Color)		Specifies a color with RGB value (50,205,50)
+				else if (str == L"linen") { RGB = 0xFAF0E6; bSet = true; break; } // (Linen Preset Color)			Specifies a color with RGB value (250,240,230)
+				else if (str == L"ltBlue") { RGB = 0xADD8E6; bSet = true; break; } // (Light Blue Preset Color)		Specifies a color with RGB value (173,216,230)
+				else if (str == L"ltCoral") { RGB = 0xF08080; bSet = true; break; } // (Light Coral Preset Color)		Specifies a color with RGB value (240,128,128)
+				else if (str == L"ltCyan") { RGB = 0xE0FFFF; bSet = true; break; } // (Light Cyan Preset Color)		Specifies a color with RGB value (224,255,255)
+				else if (str == L"ltGoldenrodYellow") { RGB = 0xFAFA78; bSet = true; break; } // (Light Goldenrod Color)			Specifies a color with RGB value (250,250,120)
+				else if (str == L"ltGray") { RGB = 0xD3D3D3; bSet = true; break; } // (Light Gray Preset Color)		Specifies a color with RGB value (211,211,211)
+				else if (str == L"ltGreen") { RGB = 0x90EE90; bSet = true; break; } // (Light Green Preset Color)		Specifies a color with RGB value (144,238,144)
+				else if (str == L"ltGrey") { RGB = 0xD3D3D3; bSet = true; break; } // (Light Gray Preset Color)		Specifies a color with RGB value (211,211,211)
+				else if (str == L"ltPink") { RGB = 0xFFB6C1; bSet = true; break; } // (Light Pink Preset Color)		Specifies a color with RGB value (255,182,193)
+				else if (str == L"ltSalmon") { RGB = 0xFFA07A; bSet = true; break; } // (Light Salmon Preset Color)		Specifies a color with RGB value (255,160,122)
+				else if (str == L"ltSeaGreen") { RGB = 0x20B2AA; bSet = true; break; } // (Light Sea Green Preset Color)  Specifies a color with RGB value (32,178,170)
+				else if (str == L"ltSkyBlue") { RGB = 0x87CEFA; bSet = true; break; } // (Light Sky Blue Preset Color)	Specifies a color with RGB value (135,206,250)
+				else if (str == L"ltSlateGray") { RGB = 0x778899; bSet = true; break; } // (Light Slate Gray Preset Color) Specifies a color with RGB value (119,136,153)
+				else if (str == L"ltSlateGrey") { RGB = 0x778899; bSet = true; break; } // (Light Slate Gray Preset Color) Specifies a color with RGB value (119,136,153)
+				else if (str == L"ltSteelBlue") { RGB = 0xB0C4DE; bSet = true; break; } // (Light Steel Blue Preset Color) Specifies a color with RGB value (176,196,222)
+				else if (str == L"ltYellow") { RGB = 0xFFFFE0; bSet = true; break; } // (Light Yellow Preset Color)		Specifies a color with RGB value (255,255,224)
+				break;
+			case 'm':
+				if (str == L"magenta") { RGB = 0xFF00FF; bSet = true; break; } // (Magenta Preset Color)			Specifies a color with RGB value (255,0,255)
+				else if (str == L"maroon") { RGB = 0x800000; bSet = true; break; } // (Maroon Preset Color)			Specifies a color with RGB value (128,0,0)
+				else if (str == L"medAquamarine") { RGB = 0x66CDAA; bSet = true; break; } // (Medium Aquamarine Preset Color)Specifies a color with RGB value (102,205,170)
+				else if (str == L"medBlue") { RGB = 0x0000CD; bSet = true; break; } // (Medium Blue Preset Color)		Specifies a color with RGB value (0,0,205)
+				else if (str == L"mediumAquamarine") { RGB = 0x66CDAA; bSet = true; break; } // (Medium Aquamarine Color)		Specifies a color with RGB value (102,205,170)
+				else if (str == L"mediumBlue") { RGB = 0x0000CD; bSet = true; break; } // (Medium Blue Preset Color)		Specifies a color with RGB value (0,0,205)
+				else if (str == L"mediumOrchid") { RGB = 0xBA55D3; bSet = true; break; } // (Medium Orchid Preset Color)	Specifies a color with RGB value (186,85,211)
+				else if (str == L"mediumPurple") { RGB = 0x9370DB; bSet = true; break; } // (Medium Purple Preset Color)	Specifies a color with RGB value (147,112,219)
+				else if (str == L"mediumSeaGreen") { RGB = 0x3CB371; bSet = true; break; } // (Medium Sea Green Preset Color) Specifies a color with RGB value (60,179,113)
+				else if (str == L"mediumSlateBlue") { RGB = 0x7B68EE; bSet = true; break; } // (Medium Slate Blue Preset Color)Specifies a color with RGB value (123,104,238)
+				else if (str == L"mediumSpringGreen") { RGB = 0x00FA9A; bSet = true; break; } // (Medium Spring Color)			Specifies a color with RGB value (0,250,154)
+				else if (str == L"mediumTurquoise") { RGB = 0x48D1CC; bSet = true; break; } // (Medium Turquoise Preset Color) Specifies a color with RGB value (72,209,204)
+				else if (str == L"mediumVioletRed") { RGB = 0xC71585; bSet = true; break; } // (Medium Violet Red Preset Color)Specifies a color with RGB value (199,21,133)
+				else if (str == L"medOrchid") { RGB = 0xBA55D3; bSet = true; break; } // (Medium Orchid Preset Color)	Specifies a color with RGB value (186,85,211)
+				else if (str == L"medPurple") { RGB = 0x9370DB; bSet = true; break; } // (Medium Purple Preset Color)	Specifies a color with RGB value (147,112,219)
+				else if (str == L"medSeaGreen") { RGB = 0x3CB371; bSet = true; break; } // (Medium Sea Green Preset Color) Specifies a color with RGB value (60,179,113)
+				else if (str == L"medSlateBlue") { RGB = 0x7B68EE; bSet = true; break; } // (Medium Slate Blue Preset Color)Specifies a color with RGB value (123,104,238)
+				else if (str == L"medSpringGreen") { RGB = 0x00FA9A; bSet = true; break; } // (Medium Spring Preset Color)	Specifies a color with RGB value (0,250,154)
+				else if (str == L"medTurquoise") { RGB = 0x48D1CC; bSet = true; break; } // (Medium Turquoise Preset Color) Specifies a color with RGB value (72,209,204)
+				else if (str == L"medVioletRed") { RGB = 0xC71585; bSet = true; break; } // (Medium Violet Red Preset Color)Specifies a color with RGB value (199,21,133)
+				else if (str == L"midnightBlue") { RGB = 0x191970; bSet = true; break; } // (Midnight Blue Preset Color)	Specifies a color with RGB value (25,25,112)
+				else if (str == L"mintCream") { RGB = 0xF5FFFA; bSet = true; break; } // (Mint Cream Preset Color)		Specifies a color with RGB value (245,255,250)
+				else if (str == L"mistyRose") { RGB = 0xFFE4FF; bSet = true; break; } // (Misty Rose Preset Color)		Specifies a color with RGB value (255,228,225)
+				else if (str == L"moccasin") { RGB = 0xFFE4B5; bSet = true; break; } // (Moccasin Preset Color)			Specifies a color with RGB value (255,228,181)
+				else if (str == L"menuText") { RGB = 0x000000; bSet = true; break; }
+				break;
+			case 'n':
+				if (str == L"navajoWhite") { RGB = 0xFFDEAD; bSet = true; break; } // (Navajo White Preset Color)		Specifies a color with RGB value (255,222,173)
+				else if (str == L"navy") { RGB = 0x000080; bSet = true; break; } // (Navy Preset Color)				Specifies a color with RGB value (0,0,128)
+				break;
+			case 'o':
+				if (str == L"oldLace") { RGB = 0xFDF5E6; bSet = true; break; } // (Old Lace Preset Color)			Specifies a color with RGB value (253,245,230)
+				else if (str == L"olive") { RGB = 0x808000; bSet = true; break; } // (Olive Preset Color)			Specifies a color with RGB value (128,128,0)
+				else if (str == L"oliveDrab") { RGB = 0x6B8E23; bSet = true; break; } // (Olive Drab Preset Color)		Specifies a color with RGB value (107,142,35)
+				else if (str == L"orange") { RGB = 0xFFA500; bSet = true; break; } // (Orange Preset Color)			Specifies a color with RGB value (255,165,0)
+				else if (str == L"orangeRed") { RGB = 0xFF4500; bSet = true; break; } // (Orange Red Preset Color)		Specifies a color with RGB value (255,69,0)
+				else if (str == L"orchid") { RGB = 0xDA70D6; bSet = true; break; } // (Orchid Preset Color)			Specifies a color with RGB value (218,112,214)
+				break;
+			case 'p':
+				if (str == L"paleGoldenrod") { RGB = 0xEEE8AA; bSet = true; break; } // (Pale Goldenrod Preset Color)	Specifies a color with RGB value (238,232,170)
+				else if (str == L"paleGreen") { RGB = 0x98FB98; bSet = true; break; } // (Pale Green Preset Color)		Specifies a color with RGB value (152,251,152)
+				else if (str == L"paleTurquoise") { RGB = 0xAFEEEE; bSet = true; break; } // (Pale Turquoise Preset Color)	Specifies a color with RGB value (175,238,238)
+				else if (str == L"paleVioletRed") { RGB = 0xDB7093; bSet = true; break; } // (Pale Violet Red Preset Color)  Specifies a color with RGB value (219,112,147)
+				else if (str == L"papayaWhip") { RGB = 0xFFEFD5; bSet = true; break; } // (Papaya Whip Preset Color)		Specifies a color with RGB value (255,239,213)
+				else if (str == L"peachPuff") { RGB = 0xFFDAB9; bSet = true; break; } // (Peach Puff Preset Color)		Specifies a color with RGB value (255,218,185)
+				else if (str == L"peru") { RGB = 0xCD853F; bSet = true; break; } // (Peru Preset Color)				Specifies a color with RGB value (205,133,63)
+				else if (str == L"pink") { RGB = 0xFFC0CB; bSet = true; break; } // (Pink Preset Color)				Specifies a color with RGB value (255,192,203)
+				else if (str == L"plum") { RGB = 0xD3A0D3; bSet = true; break; } // (Plum Preset Color)				Specifies a color with RGB value (221,160,221)
+				else if (str == L"powderBlue") { RGB = 0xB0E0E6; bSet = true; break; } // (Powder Blue Preset Color)		Specifies a color with RGB value (176,224,230)
+				else if (str == L"purple") { RGB = 0x800080; bSet = true; break; } // (Purple Preset Color)			Specifies a color with RGB value (128,0,128)
+				break;
+			case 'r':
+				if (str == L"red") { RGB = 0xFF0000; bSet = true; break; } // (Red Preset Color)				Specifies a color with RGB value (255,0,0)
+				else if (str == L"rosyBrown") { RGB = 0xBC8F8F; bSet = true; break; } // (Rosy Brown Preset Color)		Specifies a color with RGB value (188,143,143)
+				else if (str == L"royalBlue") { RGB = 0x4169E1; bSet = true; break; } // (Royal Blue Preset Color)		Specifies a color with RGB value (65,105,225)
+				break;
+			case 's':
+				if (str == L"saddleBrown") { RGB = 0x8B4513; bSet = true; break; } // (Saddle Brown Preset Color)		Specifies a color with RGB value (139,69,19)
+				else if (str == L"salmon") { RGB = 0xFA8072; bSet = true; break; } // (Salmon Preset Color)			Specifies a color with RGB value (250,128,114)
+				else if (str == L"sandyBrown") { RGB = 0xF4A460; bSet = true; break; } // (Sandy Brown Preset Color)		Specifies a color with RGB value (244,164,96)
+				else if (str == L"seaGreen") { RGB = 0x2E8B57; bSet = true; break; } // (Sea Green Preset Color)		Specifies a color with RGB value (46,139,87)
+				else if (str == L"seaShell") { RGB = 0xFFF5EE; bSet = true; break; } // (Sea Shell Preset Color)		Specifies a color with RGB value (255,245,238)
+				else if (str == L"sienna") { RGB = 0xA0522D; bSet = true; break; } // (Sienna Preset Color)			Specifies a color with RGB value (160,82,45)
+				else if (str == L"silver") { RGB = 0xC0C0C0; bSet = true; break; } // (Silver Preset Color)			Specifies a color with RGB value (192,192,192)
+				else if (str == L"skyBlue") { RGB = 0x87CEEB; bSet = true; break; } // (Sky Blue Preset Color)			Specifies a color with RGB value (135,206,235)
+				else if (str == L"slateBlue") { RGB = 0x6A5AEB; bSet = true; break; } // (Slate Blue Preset Color)		Specifies a color with RGB value (106,90,205)
+				else if (str == L"slateGray") { RGB = 0x708090; bSet = true; break; } // (Slate Gray Preset Color)		Specifies a color with RGB value (112,128,144)
+				else if (str == L"slateGrey") { RGB = 0x708090; bSet = true; break; } // (Slate Gray Preset Color)		Specifies a color with RGB value (112,128,144)
+				else if (str == L"snow") { RGB = 0xFFFAFA; bSet = true; break; } // (Snow Preset Color)				Specifies a color with RGB value (255,250,250)
+				else if (str == L"springGreen") { RGB = 0x00FF7F; bSet = true; break; } // (Spring Green Preset Color)		Specifies a color with RGB value (0,255,127)
+				else if (str == L"steelBlue") { RGB = 0x4682B4; bSet = true; break; } // (Steel Blue Preset Color)		Specifies a color with RGB value (70,130,180)
+				break;
+			case 't':
+				if (str == L"tan") { RGB = 0xD2B48C; bSet = true; break; } // (Tan Preset Color)				Specifies a color with RGB value (210,180,140)
+				else if (str == L"teal") { RGB = 0x008080; bSet = true; break; } // (Teal Preset Color)				Specifies a color with RGB value (0,128,128)
+				else if (str == L"thistle") { RGB = 0xD8BFD8; bSet = true; break; } // (Thistle Preset Color)			Specifies a color with RGB value (216,191,216)
+				else if (str == L"tomato") { RGB = 0xFF7347; bSet = true; break; } // (Tomato Preset Color)			Specifies a color with RGB value (255,99,71)
+				else if (str == L"turquoise") { RGB = 0x40E0D0; bSet = true; break; } // (Turquoise Preset Color)		Specifies a color with RGB value (64,224,208)
+				break;
+			case 'v':
+				if (str == L"violet") { RGB = 0xEE82EE; bSet = true; break; } // (Violet Preset Color)			Specifies a color with RGB value (238,130,238)
+				break;
+			case 'w':
+				if (str == L"wheat") { RGB = 0xF5DEB3; bSet = true; break; } // (Wheat Preset Color)			Specifies a color with RGB value (245,222,179)
+				else if (str == L"white") { RGB = 0xFFFFFF; bSet = true; break; } // (White Preset Color)			Specifies a color with RGB value (255,255,255)
+				else if (str == L"whiteSmoke") { RGB = 0xF5F5F5; bSet = true; break; } // (White Smoke Preset Color)		Specifies a color with RGB value (245,245,245)
+				else if (str == L"windowsText") { RGB = 0x000000; bSet = true; break; } // (White Smoke Preset Color)		Specifies a color with RGB value (245,245,245)
+				break;
+			case 'y':
+				if (str == L"yellow") { RGB = 0xFFFF00; bSet = true; break; } // (Yellow Preset Color)			Specifies a color with RGB value (255,255,0)
+				else if (str == L"yellowGreen") { RGB = 0x9ACD32; bSet = true; break; } // (Yellow Green Preset Color)		Specifies a color with RGB value (154,205,50)
+				break;
 			}
 		}
+		if (bSet)
+		{
+			color.R = (BYTE)(RGB >> 16);
+			color.G = (BYTE)(RGB >> 8);
+			color.B = (BYTE)(RGB);
+			color.A = 0;
+		}
 		return bSet;
 	}
 }
@@ -2107,8 +2109,12 @@ bool CDrawingConverter::ParceObject(const std::wstring& strXml, std::wstring** p
 							pOle = NULL;								
 						}
 					}
+					//std::wstring test;
 					if (pElem)
+					{
 						m_pBinaryWriter->WriteRecord1(1, *pElem);
+						//test = pElem->toXML();
+					}
 
 					RELEASEOBJECT(pElem)
 					RELEASEOBJECT(pOle)
@@ -5094,11 +5100,16 @@ void CDrawingConverter::CheckBrushShape(PPTX::Logic::SpTreeElem* oElem, XmlUtils
 		}
 
 		nullable_string sRid;
-		XmlMacroReadAttributeBase(oNodeFill, L"r:id", sRid);
+		XmlMacroReadAttributeBase(oNodeFill, L"o:relid", sRid);
+
 		if (false == sRid.IsInit())
 		{
 			XmlMacroReadAttributeBase(oNodeFill, L"relationships:id", sRid);
 		}
+		if (false == sRid.IsInit())
+		{
+			XmlMacroReadAttributeBase(oNodeFill, L"o:relid", sRid);
+		}
 		if (sRid.is_init())
 		{
 			PPTX::Logic::BlipFill* pBlipFill = NULL;
@@ -5339,7 +5350,7 @@ void CDrawingConverter::CheckBrushShape(PPTX::Logic::SpTreeElem* oElem, XmlUtils
 			nullable_string sPictId;
 			XmlMacroReadAttributeBase(oNodeFillID, L"r:pict", sPictId);
 
-			if (sRid.is_init() || sRelid.is_init() || sPictId.is_init() || oElem->m_binaryData.IsInit() || sTitle.IsInit())
+			if (sRid.is_init() || sRelid.is_init() || sPictId.is_init() || oElem->m_binaryData.IsInit() || (sTitle.IsInit() && !sTitle->empty()))
 			{
 				nullable_string sType;
 				XmlMacroReadAttributeBase(oNodeFillID, L"type", sType);
@@ -6143,7 +6154,8 @@ std::wstring CDrawingConverter::SaveObjectBackground(LONG lStart, LONG lLength)
 		oXmlWriter.m_bIsTop = true; // не забыть скинуть в самом шейпе
 
 		PPTX::Logic::Shape& oShape = oElem.as<PPTX::Logic::Shape>();
-		oShape.toXmlWriterVMLBackground(&oXmlWriter, *m_pTheme, *m_pClrMap);
+		smart_ptr<OOX::IFileContainer> rels = GetRels();
+		oShape.toXmlWriterVMLBackground(&oXmlWriter, *m_pTheme, *m_pClrMap, rels);
 	}
 	--m_nCurrentIndexObject;
 
@@ -6171,7 +6183,8 @@ void CDrawingConverter::ConvertShapeVML(PPTX::Logic::SpTreeElem& oElem, const st
 		oWriter.m_bIsTop = true; // не забыть скинуть в самом шейпе
 		
 		PPTX::Logic::Shape& oShape = oElem.as<PPTX::Logic::Shape>();
-		oShape.toXmlWriterVML(&oWriter, *m_pTheme, *m_pClrMap, false, bSignature);
+		smart_ptr<OOX::IFileContainer> rels = GetRels();
+		oShape.toXmlWriterVML(&oWriter, *m_pTheme, *m_pClrMap, rels, false, bSignature);
 	}
 }
 
@@ -6184,7 +6197,8 @@ void CDrawingConverter::ConvertGroupVML(PPTX::Logic::SpTreeElem& oElem, const st
 		oWriter.m_bIsTop = true; // не забыть скинуть в самом шейпе (вместе с остальными параметрами)
 		
 		PPTX::Logic::SpTree& oGroup = oElem.as<PPTX::Logic::SpTree>();
-		oGroup.toXmlWriterVML(&oWriter, *m_pTheme, *m_pClrMap);
+		smart_ptr<OOX::IFileContainer> rels = GetRels();
+		oGroup.toXmlWriterVML(&oWriter, *m_pTheme, *m_pClrMap, rels);
 	}
 }
 void CDrawingConverter::ConvertTextVML(XmlUtils::CXmlNode &nodeTextBox, PPTX::Logic::Shape* pShape)
diff --git a/OOXML/PPTXFormat/Logic/Shape.cpp b/OOXML/PPTXFormat/Logic/Shape.cpp
index 9172823544..70f86c9fc0 100644
--- a/OOXML/PPTXFormat/Logic/Shape.cpp
+++ b/OOXML/PPTXFormat/Logic/Shape.cpp
@@ -686,7 +686,8 @@ namespace PPTX
 			}
 		}
 
-		void Shape::toXmlWriterVML(NSBinPptxRW::CXmlWriter *pWriter, NSCommon::smart_ptr<PPTX::Theme>& oTheme, NSCommon::smart_ptr<PPTX::Logic::ClrMap>& oClrMap, bool in_group, bool bSignature)
+		void Shape::toXmlWriterVML(NSBinPptxRW::CXmlWriter *pWriter, NSCommon::smart_ptr<PPTX::Theme>& oTheme, NSCommon::smart_ptr<PPTX::Logic::ClrMap>& oClrMap
+									, NSCommon::smart_ptr<OOX::IFileContainer>& pContainer, bool in_group, bool bSignature)
 		{
 			std::wstring strPath, strTextRect;
 			SimpleTypes::Vml::SptType vmlPrst = SimpleTypes::Vml::sptNotPrimitive;
@@ -736,7 +737,7 @@ namespace PPTX
 			std::wstring strFillNode;
 			std::wstring strStrokeNode;;
 
-			CalculateFill(pWriter->m_lDocType, spPr, style, oTheme, oClrMap, strFillAttr, strFillNode, false, bSignature);
+			CalculateFill(pWriter->m_lDocType, spPr, style, oTheme, oClrMap, pContainer, strFillAttr, strFillNode, false, bSignature);
 			CalculateLine(pWriter->m_lDocType, spPr, style, oTheme, oClrMap, strStrokeAttr, strStrokeNode, false);
 			//-------------------------------------------------------------
 			std::wstring node_name = L"v:shape";
@@ -922,10 +923,10 @@ namespace PPTX
 			pWriter->m_strStyleMain.clear();
 			pWriter->m_strStyleWrap.clear();
 		}
-		void Shape::toXmlWriterVMLBackground(NSBinPptxRW::CXmlWriter *pWriter, NSCommon::smart_ptr<PPTX::Theme>& oTheme, NSCommon::smart_ptr<PPTX::Logic::ClrMap>& oClrMap)
+		void Shape::toXmlWriterVMLBackground(NSBinPptxRW::CXmlWriter *pWriter, NSCommon::smart_ptr<PPTX::Theme>& oTheme, NSCommon::smart_ptr<PPTX::Logic::ClrMap>& oClrMap, NSCommon::smart_ptr<OOX::IFileContainer>& pContainer)
 		{
 			std::wstring strFillAttr, strFillNode;
-			CalculateFill(pWriter->m_lDocType, spPr, style, oTheme, oClrMap, strFillAttr, strFillNode, false);
+			CalculateFill(pWriter->m_lDocType, spPr, style, oTheme, oClrMap, pContainer, strFillAttr, strFillNode, false);
 
 			pWriter->StartNode(L"v:background");
 			pWriter->StartAttributes();
diff --git a/OOXML/PPTXFormat/Logic/Shape.h b/OOXML/PPTXFormat/Logic/Shape.h
index 63ae952648..3bb2501ee3 100644
--- a/OOXML/PPTXFormat/Logic/Shape.h
+++ b/OOXML/PPTXFormat/Logic/Shape.h
@@ -313,8 +313,8 @@ namespace PPTX
 			void SetLevelUpElement( Shape* p){m_pLevelUp = p;};
 
 			virtual void toPPTY(NSBinPptxRW::CBinaryFileWriter* pWriter) const;
-			void toXmlWriterVML				(NSBinPptxRW::CXmlWriter* pWriter, smart_ptr<PPTX::Theme>& oTheme, smart_ptr<PPTX::Logic::ClrMap>& oClrMap, bool in_group = false, bool bSignature = false);
-			void toXmlWriterVMLBackground	(NSBinPptxRW::CXmlWriter *pWriter, NSCommon::smart_ptr<PPTX::Theme>& oTheme, NSCommon::smart_ptr<PPTX::Logic::ClrMap>& oClrMap);
+			void toXmlWriterVML				(NSBinPptxRW::CXmlWriter* pWriter, smart_ptr<PPTX::Theme>& oTheme, smart_ptr<PPTX::Logic::ClrMap>& oClrMap, NSCommon::smart_ptr<OOX::IFileContainer>& pContainer, bool in_group = false, bool bSignature = false);
+			void toXmlWriterVMLBackground	(NSBinPptxRW::CXmlWriter *pWriter, NSCommon::smart_ptr<PPTX::Theme>& oTheme, NSCommon::smart_ptr<PPTX::Logic::ClrMap>& oClrMap, NSCommon::smart_ptr<OOX::IFileContainer>& pContainer);
 
 			virtual void toXmlWriter	(NSBinPptxRW::CXmlWriter* pWriter) const;			
 			virtual void fromPPTY		(NSBinPptxRW::CBinaryFileReader* pReader);
diff --git a/OOXML/PPTXFormat/Logic/SmartArt.cpp b/OOXML/PPTXFormat/Logic/SmartArt.cpp
index b7ecdd7863..eecba7df29 100644
--- a/OOXML/PPTXFormat/Logic/SmartArt.cpp
+++ b/OOXML/PPTXFormat/Logic/SmartArt.cpp
@@ -161,17 +161,18 @@ namespace PPTX
 			if (m_oDrawing.IsInit())
 				return;
 
-			OOX::IFileContainer	& pRelsPPTX = parentFileAs<OOX::IFileContainer>();
-			OOX::IFileContainer	* pRels = NULL;
-
-			if (pWriter)
+			bool result = false;
+			if (parentFileIs<OOX::IFileContainer>())
 			{
-				pRels = pWriter->GetRels().GetPointer();
+				OOX::IFileContainer	& pRelsPPTX = parentFileAs<OOX::IFileContainer>();
+				result = LoadDrawing(&pRelsPPTX);
 			}
 
-			bool result = LoadDrawing(&pRelsPPTX);
-			if (!result)
+			if (!result && pWriter)
+			{
+				OOX::IFileContainer	* pRels = pWriter->GetRels().GetPointer();
 				result = LoadDrawing(pRels);
+			}
 		}
 		void SmartArt::toPPTY(NSBinPptxRW::CBinaryFileWriter* pWriter) const
 		{
diff --git a/OOXML/PPTXFormat/Logic/SpTree.cpp b/OOXML/PPTXFormat/Logic/SpTree.cpp
index 176a105ef6..3bc95f9a00 100644
--- a/OOXML/PPTXFormat/Logic/SpTree.cpp
+++ b/OOXML/PPTXFormat/Logic/SpTree.cpp
@@ -188,7 +188,7 @@ namespace PPTX
 
 			return XmlUtils::CreateNode(name_, oValue);
 		}
-		void SpTree::toXmlWriterVML(NSBinPptxRW::CXmlWriter *pWriter, NSCommon::smart_ptr<PPTX::Theme>& oTheme, NSCommon::smart_ptr<PPTX::Logic::ClrMap>& oClrMap, bool in_group)
+		void SpTree::toXmlWriterVML(NSBinPptxRW::CXmlWriter *pWriter, NSCommon::smart_ptr<PPTX::Theme>& oTheme, NSCommon::smart_ptr<PPTX::Logic::ClrMap>& oClrMap, NSCommon::smart_ptr<OOX::IFileContainer>& pContainer, bool in_group)
 		{
 			pWriter->StartNode(_T("v:group"));
 			pWriter->StartAttributes();
@@ -311,7 +311,7 @@ namespace PPTX
 			{
 				if (SpTreeElems[i].is<PPTX::Logic::Shape>())
 				{
-					SpTreeElems[i].as<PPTX::Logic::Shape>().toXmlWriterVML(pWriter, oTheme, oClrMap, true);
+					SpTreeElems[i].as<PPTX::Logic::Shape>().toXmlWriterVML(pWriter, oTheme, oClrMap, pContainer, true);
 				}
 				else if (SpTreeElems[i].is<PPTX::Logic::Pic>())
 				{
@@ -319,7 +319,7 @@ namespace PPTX
 				}
 				else if (SpTreeElems[i].is<PPTX::Logic::SpTree>())
 				{
-					SpTreeElems[i].as<PPTX::Logic::SpTree>().toXmlWriterVML(pWriter, oTheme, oClrMap, true);
+					SpTreeElems[i].as<PPTX::Logic::SpTree>().toXmlWriterVML(pWriter, oTheme, oClrMap, pContainer, true);
 				}				
 			}
 
diff --git a/OOXML/PPTXFormat/Logic/SpTree.h b/OOXML/PPTXFormat/Logic/SpTree.h
index 3dd0fb18dd..c95a2659ca 100644
--- a/OOXML/PPTXFormat/Logic/SpTree.h
+++ b/OOXML/PPTXFormat/Logic/SpTree.h
@@ -56,7 +56,7 @@ namespace PPTX
 			virtual void fromXML(XmlUtils::CXmlNode& node);
 			virtual std::wstring toXML() const;
 
-			void toXmlWriterVML(NSBinPptxRW::CXmlWriter* pWriter, smart_ptr<PPTX::Theme>& oTheme, smart_ptr<PPTX::Logic::ClrMap>& oClrMap, bool in_group = false);
+			void toXmlWriterVML(NSBinPptxRW::CXmlWriter* pWriter, smart_ptr<PPTX::Theme>& oTheme, smart_ptr<PPTX::Logic::ClrMap>& oClrMap, NSCommon::smart_ptr<OOX::IFileContainer>& pContainer, bool in_group = false);
 
 			virtual void toXmlWriter(NSBinPptxRW::CXmlWriter* pWriter) const;
 
diff --git a/OOXML/PPTXFormat/Logic/SpTreeElem.cpp b/OOXML/PPTXFormat/Logic/SpTreeElem.cpp
index a6117dcf6c..4aa4efc0ed 100644
--- a/OOXML/PPTXFormat/Logic/SpTreeElem.cpp
+++ b/OOXML/PPTXFormat/Logic/SpTreeElem.cpp
@@ -64,7 +64,7 @@ namespace PPTX
 		}
 
 		void CalculateFill(BYTE lDocType, PPTX::Logic::SpPr& oSpPr, nullable<ShapeStyle>& pShapeStyle, NSCommon::smart_ptr<PPTX::Theme>& oTheme,
-			NSCommon::smart_ptr<PPTX::Logic::ClrMap>& oClrMap, std::wstring& strAttr, std::wstring& strNode, bool bOle, bool bSignature)
+			NSCommon::smart_ptr<PPTX::Logic::ClrMap>& oClrMap, NSCommon::smart_ptr<OOX::IFileContainer>& pContainer, std::wstring& strAttr, std::wstring& strNode, bool bOle, bool bSignature)
 		{
 			PPTX::Logic::UniFill fill;
 			DWORD ARGB = 0;
@@ -129,8 +129,17 @@ namespace PPTX
 							}
 						}
 					}
-
 					std::wstring strId = oBlip.blip->embed->ToString();
+					
+					NSCommon::smart_ptr<OOX::Image> pImageFileVml(new OOX::Image(NULL, false));
+					pImageFileVml->set_filename(oBlip.blip->imageFilepath, false);
+
+					smart_ptr<OOX::File> pFileVml = pImageFileVml.smart_dynamic_cast<OOX::File>();
+
+					if (pContainer.IsInit())
+					{
+						pContainer->Add(strId, pFileVml);
+					}
 					if (XMLWRITER_DOC_TYPE_XLSX == lDocType)
 					{
 						strId = L"o:relid=\"" + strId + L"\"";
@@ -158,7 +167,7 @@ namespace PPTX
 				BYTE A = (BYTE)((ARGB >> 24) & 0xFF);
 				if (A != 255)
 				{
-					int fopacity = 100 - (int)(((double)A / 255.0) * 65536);
+					int fopacity = (int)((double)A / 255. * 65536.);
 					strNode = L"<v:fill opacity=\"" + std::to_wstring(fopacity) + L"f\" />";
 				}
 			}
@@ -218,7 +227,7 @@ namespace PPTX
 					BYTE A = (BYTE)((ARGB >> 24) & 0xFF);
 					if (A != 255)
 					{
-						int fopacity = 100 - (int)(((double)A / 255.0) * 65536);
+						int fopacity = (int)((double)A / 255. * 65536.);
 						op = std::to_wstring(fopacity) + L"f";
 					}
 
@@ -696,7 +705,7 @@ namespace PPTX
 				return m_elem->toXML();
 			return L"";
 		}
-		void SpTreeElem::toXmlWriterVML	(NSBinPptxRW::CXmlWriter* pWriter, smart_ptr<PPTX::Theme>& oTheme, smart_ptr<PPTX::Logic::ClrMap>& oClrMap) const
+		void SpTreeElem::toXmlWriterVML	(NSBinPptxRW::CXmlWriter* pWriter, smart_ptr<PPTX::Theme>& oTheme, smart_ptr<PPTX::Logic::ClrMap>& oClrMap, NSCommon::smart_ptr<OOX::IFileContainer>& pContainer) const
 		{
 			if (m_elem.IsInit() == false) return;
 
@@ -705,7 +714,7 @@ namespace PPTX
 				case OOX::et_a_Shape:
 				{
 					smart_ptr<PPTX::Logic::Shape> oShape = m_elem.smart_dynamic_cast<PPTX::Logic::Shape>();
-					if (oShape.IsInit()) oShape->toXmlWriterVML(pWriter, oTheme, oClrMap);
+					if (oShape.IsInit()) oShape->toXmlWriterVML(pWriter, oTheme, oClrMap, pContainer);
 				}break;
 				case OOX::et_pic:
 				{
@@ -716,7 +725,7 @@ namespace PPTX
 				case OOX::et_lc_LockedCanvas:
 				{
 					smart_ptr<PPTX::Logic::SpTree> oSpTree = m_elem.smart_dynamic_cast<PPTX::Logic::SpTree>();
-					if (oSpTree.IsInit()) oSpTree->toXmlWriterVML(pWriter, oTheme, oClrMap);
+					if (oSpTree.IsInit()) oSpTree->toXmlWriterVML(pWriter, oTheme, oClrMap, pContainer);
 				}break;
 				default:
 					break;
diff --git a/OOXML/PPTXFormat/Logic/SpTreeElem.h b/OOXML/PPTXFormat/Logic/SpTreeElem.h
index 670e5c8eea..fb404a9923 100644
--- a/OOXML/PPTXFormat/Logic/SpTreeElem.h
+++ b/OOXML/PPTXFormat/Logic/SpTreeElem.h
@@ -51,7 +51,7 @@ namespace PPTX
 	namespace Logic
 	{
         void CalculateFill(BYTE lDocType, PPTX::Logic::SpPr& oSpPr, nullable<ShapeStyle>& pShapeStyle, smart_ptr<PPTX::Theme>& oTheme,
-				smart_ptr<PPTX::Logic::ClrMap>& oClrMap, std::wstring& strAttr, std::wstring& strNode, bool bOle = false, bool bSignature = false);
+				smart_ptr<PPTX::Logic::ClrMap>& oClrMap, NSCommon::smart_ptr<OOX::IFileContainer>& pContainer, std::wstring& strAttr, std::wstring& strNode, bool bOle = false, bool bSignature = false);
 
         void CalculateLine(BYTE lDocType, PPTX::Logic::SpPr& oSpPr, nullable<ShapeStyle>& pShapeStyle,
 				smart_ptr<PPTX::Theme>& oTheme, smart_ptr<PPTX::Logic::ClrMap>& oClrMap, std::wstring& strAttr, std::wstring& strNode, bool bOle = false);
@@ -85,11 +85,11 @@ namespace PPTX
 
 			void InitElem(WrapperWritingElement* pElem);
 
-			virtual void fromPPTY	(NSBinPptxRW::CBinaryFileReader* pReader);
-			virtual void toPPTY		(NSBinPptxRW::CBinaryFileWriter* pWriter) const;
+			virtual void fromPPTY (NSBinPptxRW::CBinaryFileReader* pReader);
+			virtual void toPPTY (NSBinPptxRW::CBinaryFileWriter* pWriter) const;
 
-			void toXmlWriterVML	(NSBinPptxRW::CXmlWriter* pWriter, smart_ptr<PPTX::Theme>& oTheme, smart_ptr<PPTX::Logic::ClrMap>& oClrMap) const;
-			virtual void toXmlWriter	(NSBinPptxRW::CXmlWriter* pWriter) const;
+			void toXmlWriterVML (NSBinPptxRW::CXmlWriter* pWriter, smart_ptr<PPTX::Theme>& oTheme, smart_ptr<PPTX::Logic::ClrMap>& oClrMap, NSCommon::smart_ptr<OOX::IFileContainer>& pContainer) const;
+			virtual void toXmlWriter (NSBinPptxRW::CXmlWriter* pWriter) const;
 
 			std::wstring GetUriElem();			
 			smart_ptr<WrapperWritingElement> GetElem();
diff --git a/OOXML/PPTXFormat/Theme/ClrScheme.cpp b/OOXML/PPTXFormat/Theme/ClrScheme.cpp
index 07a022ac38..a71760b8b2 100644
--- a/OOXML/PPTXFormat/Theme/ClrScheme.cpp
+++ b/OOXML/PPTXFormat/Theme/ClrScheme.cpp
@@ -120,6 +120,10 @@ namespace PPTX
 								{
 									variationClrSchemeLst = nodeExt.ReadNodeNoNS(L"variationClrSchemeLst");
 								}
+								else if (uri == L"{2703A3B3-D2E1-43D9-8057-6E9D74E0F44A}")
+								{
+									schemeID = nodeExt.ReadNodeNoNS(L"schemeID");
+								}
 							}
 						}
 					}
@@ -140,6 +144,14 @@ namespace PPTX
 			{
 				oValue.m_strValue += L"<a:extLst>";
 
+				if (schemeID.IsInit())
+				{
+					schemeID->bSchemas = true;
+
+					oValue.m_strValue += L"<a:ext uri=\"{2703A3B3-D2E1-43D9-8057-6E9D74E0F44A}\">";
+					oValue.Write(*schemeID);
+					oValue.m_strValue += L"</a:ext>";
+				}
 				if (bkgnd.IsInit())
 				{
 					oValue.m_strValue += L"<a:ext uri=\"{093E89EA-6996-430E-BFF9-83A9FAAAAB73}\">";
@@ -182,15 +194,25 @@ namespace PPTX
 					pWriter->EndNode(_T("a:") + arr[i]);
 				}
 			}
-			if (bkgnd.IsInit() || variationClrSchemeLst.IsInit())
+			if (bkgnd.IsInit() || variationClrSchemeLst.IsInit() || schemeID.IsInit())
 			{
 				pWriter->StartNode(L"a:extLst");
 				pWriter->EndAttributes();
 
+				if (schemeID.IsInit())
+				{
+					schemeID->bSchemas = true;
+
+					pWriter->StartNode(L"a:ext");
+					pWriter->WriteAttribute(L"uri", L"{2703A3B3-D2E1-43D9-8057-6E9D74E0F44A}");
+					pWriter->EndAttributes();
+					schemeID->toXmlWriter(pWriter);
+					pWriter->EndNode(L"a:ext");
+				}
 				if (bkgnd.IsInit())
 				{
 					pWriter->StartNode(L"a:ext");
-					pWriter->WriteAttribute(L"uri", L"{2703A3B3-D2E1-43D9-8057-6E9D74E0F44A}");
+					pWriter->WriteAttribute(L"uri", L"{093E89EA-6996-430E-BFF9-83A9FAAAAB73}");
 					pWriter->EndAttributes();
 					bkgnd->toXmlWriter(pWriter);
 					pWriter->EndNode(L"a:ext");
@@ -257,6 +279,7 @@ namespace PPTX
 			}
 			pWriter->WriteRecord2(20, bkgnd);
 			pWriter->WriteRecord2(21, variationClrSchemeLst);
+			pWriter->WriteRecord2(22, schemeID);
 		}
 		void ClrScheme::fromPPTY(NSBinPptxRW::CBinaryFileReader* pReader)
 		{
@@ -287,6 +310,11 @@ namespace PPTX
 					variationClrSchemeLst.Init();
 					variationClrSchemeLst->fromPPTY(pReader);
 				}
+				else if (_rec == 22)
+				{
+					schemeID.Init();
+					schemeID->fromPPTY(pReader);
+				}
 				else if (pReader->GetPos() + 4 < _e)
 				{
 					Logic::UniColor color;
@@ -314,6 +342,7 @@ namespace PPTX
 			}
 			bkgnd = oSrc.bkgnd;
 			variationClrSchemeLst = oSrc.variationClrSchemeLst;
+			schemeID = oSrc.schemeID;
 
 			return *this;
 		}
@@ -404,6 +433,7 @@ namespace PPTX
 			}
 			if (bkgnd.IsInit()) bkgnd->SetParentPointer(this);
 			if (variationClrSchemeLst.IsInit()) variationClrSchemeLst->SetParentPointer(this);
+			if (schemeID.IsInit()) schemeID->SetParentPointer(this);
 		}
 	} // namespace nsTheme
 } // namespace PPTX
diff --git a/OOXML/PPTXFormat/Theme/ClrScheme.h b/OOXML/PPTXFormat/Theme/ClrScheme.h
index db05928988..1dba15af34 100644
--- a/OOXML/PPTXFormat/Theme/ClrScheme.h
+++ b/OOXML/PPTXFormat/Theme/ClrScheme.h
@@ -63,6 +63,7 @@ namespace PPTX
 //visio ext
 			nullable<Bkgnd> bkgnd;
 			nullable<VariationClrSchemeLst> variationClrSchemeLst;
+			nullable<SchemeID> schemeID;
 
 			ClrScheme& operator=(const ClrScheme& oSrc);
 
diff --git a/OOXML/PPTXFormat/Theme/ThemeElements.cpp b/OOXML/PPTXFormat/Theme/ThemeElements.cpp
index dda6f11359..62ec1f9ccf 100644
--- a/OOXML/PPTXFormat/Theme/ThemeElements.cpp
+++ b/OOXML/PPTXFormat/Theme/ThemeElements.cpp
@@ -71,15 +71,15 @@ namespace PPTX
 								}
 								else if (uri == L"{D75FF423-9257-4291-A4FE-1B2448832E17}")
 								{
-									//themeScheme - schemeID
+									themeScheme = nodeExt.ReadNodeNoNS(L"themeScheme");
 								}
 								else if (uri == L"{27CD58D4-7086-4B73-B2AB-7AEBE2148A8C}")
 								{
-									//fmtSchemeEx - schemeID
+									fmtSchemeEx = nodeExt.ReadNodeNoNS(L"fmtSchemeEx");
 								}
 								else if (uri == L"{C6430689-8E98-42EC-ADBF-087148533A3F}")
 								{
-									//fmtConnectorSchemeEx - schemeID
+									fmtConnectorSchemeEx = nodeExt.ReadNodeNoNS(L"fmtConnectorSchemeEx"); //- schemeID
 								}
 								else if (uri == L"{56243398-1771-4C39-BF73-A5702A9C147F}")
 								{
@@ -122,6 +122,27 @@ namespace PPTX
 					oValue.Write(*fmtConnectorScheme);
 					oValue.m_strValue += L"</a:ext>";
 				}
+				if (themeScheme.IsInit())
+				{
+					themeScheme->node_name = L"vt:themeScheme";
+					oValue.m_strValue += L"<a:ext uri=\"{D75FF423-9257-4291-A4FE-1B2448832E17}\">";
+					oValue.Write(*themeScheme);
+					oValue.m_strValue += L"</a:ext>";
+				}
+				if (fmtSchemeEx.IsInit())
+				{
+					fmtSchemeEx->node_name = L"vt:fmtSchemeEx";
+					oValue.m_strValue += L"<a:ext uri=\"{27CD58D4-7086-4B73-B2AB-7AEBE2148A8C}\">";
+					oValue.Write(*fmtSchemeEx);
+					oValue.m_strValue += L"</a:ext>";
+				}
+				if (fmtConnectorSchemeEx.IsInit())
+				{
+					fmtConnectorSchemeEx->node_name = L"vt:fmtConnectorSchemeEx";
+					oValue.m_strValue += L"<a:ext uri=\"{C6430689-8E98-42EC-ADBF-087148533A3F}\">";
+					oValue.Write(*fmtConnectorSchemeEx);
+					oValue.m_strValue += L"</a:ext>";
+				}
 				if (fillStyles.IsInit())
 				{
 					oValue.m_strValue += L"<a:ext uri=\"{56243398-1771-4C39-BF73-A5702A9C147F}\">";
@@ -160,6 +181,9 @@ namespace PPTX
 			pWriter->WriteRecord2(5, lineStyles);
 			pWriter->WriteRecord2(6, fontStylesGroup);
 			pWriter->WriteRecord2(7, variationStyleSchemeLst);
+			pWriter->WriteRecord2(8, themeScheme);
+			pWriter->WriteRecord2(9, fmtSchemeEx);
+			pWriter->WriteRecord2(10, fmtConnectorSchemeEx);
 		}
 		void ThemeElements::toXmlWriter(NSBinPptxRW::CXmlWriter* pWriter) const
 		{
@@ -170,7 +194,8 @@ namespace PPTX
 			fontScheme.toXmlWriter(pWriter);
 			fmtScheme.toXmlWriter(pWriter);
 
-			if (fmtConnectorScheme.IsInit() || fillStyles.IsInit() || lineStyles.IsInit() || fontStylesGroup.IsInit() || variationStyleSchemeLst.IsInit())
+			if (fmtConnectorScheme.IsInit() || fillStyles.IsInit() || lineStyles.IsInit() || fontStylesGroup.IsInit() || variationStyleSchemeLst.IsInit() ||
+				themeScheme.IsInit() || fmtSchemeEx.IsInit() || fmtConnectorSchemeEx.IsInit())
 			{
 				pWriter->StartNode(L"a:extLst");
 				pWriter->EndAttributes();
@@ -183,6 +208,33 @@ namespace PPTX
 					fmtConnectorScheme->toXmlWriter(pWriter);
 					pWriter->EndNode(L"a:ext");
 				}
+				if (themeScheme.IsInit())
+				{
+					themeScheme->node_name = L"vt:themeScheme";
+					pWriter->StartNode(L"a:ext");
+					pWriter->WriteAttribute(L"uri", L"{D75FF423-9257-4291-A4FE-1B2448832E17}");
+					pWriter->EndAttributes();
+					themeScheme->toXmlWriter(pWriter);
+					pWriter->EndNode(L"a:ext");
+				}
+				if (fmtSchemeEx.IsInit())
+				{
+					fmtSchemeEx->node_name = L"vt:fmtSchemeEx";
+					pWriter->StartNode(L"a:ext");
+					pWriter->WriteAttribute(L"uri", L"{27CD58D4-7086-4B73-B2AB-7AEBE2148A8C}");
+					pWriter->EndAttributes();
+					fmtSchemeEx->toXmlWriter(pWriter);
+					pWriter->EndNode(L"a:ext");
+				}
+				if (fmtConnectorSchemeEx.IsInit())
+				{
+					fmtConnectorSchemeEx->node_name = L"vt:fmtConnectorSchemeEx";
+					pWriter->StartNode(L"a:ext");
+					pWriter->WriteAttribute(L"uri", L"{C6430689-8E98-42EC-ADBF-087148533A3F}");
+					pWriter->EndAttributes();
+					fmtConnectorSchemeEx->toXmlWriter(pWriter);
+					pWriter->EndNode(L"a:ext");
+				}
 				if (fillStyles.IsInit())
 				{
 					pWriter->StartNode(L"a:ext");
@@ -266,6 +318,21 @@ namespace PPTX
 						variationStyleSchemeLst.Init();
 						variationStyleSchemeLst->fromPPTY(pReader);
 					}break;
+					case 8:
+					{
+						themeScheme.Init();
+						themeScheme->fromPPTY(pReader);
+					}break;
+					case 9:
+					{
+						fmtSchemeEx.Init();
+						fmtSchemeEx->fromPPTY(pReader);
+					}break;
+					case 10:
+					{
+						fmtConnectorSchemeEx.Init();
+						fmtConnectorSchemeEx->fromPPTY(pReader);
+					}break;
 					default:
 						break;
 				}
@@ -284,6 +351,9 @@ namespace PPTX
 			if (lineStyles.IsInit()) lineStyles->SetParentPointer(this);
 			if (fontStylesGroup.IsInit()) fontStylesGroup->SetParentPointer(this);
 			if (variationStyleSchemeLst.IsInit()) variationStyleSchemeLst->SetParentPointer(this);
+			if (themeScheme.IsInit()) themeScheme->SetParentPointer(this);
+			if (fmtSchemeEx.IsInit()) fmtSchemeEx->SetParentPointer(this);
+			if (fmtConnectorSchemeEx.IsInit()) fmtConnectorSchemeEx->SetParentPointer(this);
 		}
 	} // namespace nsTheme
 } // namespace PPTX
diff --git a/OOXML/PPTXFormat/Theme/ThemeElements.h b/OOXML/PPTXFormat/Theme/ThemeElements.h
index 591d14265f..c2eb059583 100644
--- a/OOXML/PPTXFormat/Theme/ThemeElements.h
+++ b/OOXML/PPTXFormat/Theme/ThemeElements.h
@@ -61,6 +61,9 @@ namespace PPTX
 			nullable<LineStyles> lineStyles;
 			nullable<FontStylesGroup> fontStylesGroup;
 			nullable<VariationStyleSchemeLst> variationStyleSchemeLst;
+			nullable<Scheme> themeScheme;
+			nullable<Scheme> fmtSchemeEx;
+			nullable<Scheme> fmtConnectorSchemeEx;
 
 		protected:
 			virtual void FillParentPointersForChilds();
diff --git a/OOXML/PPTXFormat/Theme/VisioThemeElements.cpp b/OOXML/PPTXFormat/Theme/VisioThemeElements.cpp
index 97c8003850..2938a459b6 100644
--- a/OOXML/PPTXFormat/Theme/VisioThemeElements.cpp
+++ b/OOXML/PPTXFormat/Theme/VisioThemeElements.cpp
@@ -1408,5 +1408,162 @@ namespace PPTX
 			}
 			pReader->Seek(_end_rec);
 		}
+//-----------------------------------------------------------------------------------------
+		SchemeID& SchemeID::operator=(const SchemeID& oSrc)
+		{
+			parentFile = oSrc.parentFile;
+			parentElement = oSrc.parentElement;
+
+			schemeEnum = oSrc.schemeEnum;
+			schemeGUID = oSrc.schemeGUID;
+
+			return *this;
+		}
+		void SchemeID::fromXML(XmlUtils::CXmlNode& node)
+		{
+			XmlMacroReadAttributeBase(node, L"schemeEnum", schemeEnum);
+			XmlMacroReadAttributeBase(node, L"schemeGUID", schemeGUID);
+		}
+		std::wstring SchemeID::toXML() const
+		{
+			XmlUtils::CAttribute oAttr;
+			if (bSchemas)
+			{
+				oAttr.Write(L"xmlns:vt", L"http://schemas.microsoft.com/office/visio/2012/theme");
+			}
+			oAttr.Write(L"schemeEnum", schemeEnum);
+			oAttr.Write(L"schemeGUID", schemeGUID);
+
+			XmlUtils::CNodeValue oValue;
+
+			return XmlUtils::CreateNode(L"vt:schemeID", oAttr, oValue);
+		}
+		void SchemeID::toPPTY(NSBinPptxRW::CBinaryFileWriter* pWriter) const
+		{
+			pWriter->WriteBYTE(NSBinPptxRW::g_nodeAttributeStart);
+			pWriter->WriteUInt2(0, schemeEnum);
+			pWriter->WriteString2(1, schemeGUID);
+			pWriter->WriteBYTE(NSBinPptxRW::g_nodeAttributeEnd);
+		}
+		void SchemeID::toXmlWriter(NSBinPptxRW::CXmlWriter* pWriter) const
+		{
+			pWriter->StartNode(L"vt:schemeID");
+			if (bSchemas)
+			{
+				pWriter->WriteAttribute(L"xmlns:vt", L"http://schemas.microsoft.com/office/visio/2012/theme");
+			}
+			pWriter->WriteAttribute2(L"schemeEnum", schemeEnum);
+			pWriter->WriteAttribute2(L"schemeGUID", schemeGUID);
+			pWriter->EndAttributes();
+			pWriter->EndNode(L"vt:schemeID");
+		}
+		void SchemeID::fromPPTY(NSBinPptxRW::CBinaryFileReader* pReader)
+		{
+			LONG _end_rec = pReader->GetPos() + pReader->GetRecordSize() + 4;
+
+			pReader->Skip(1); // start attributes
+			while (true)
+			{
+				BYTE _at = pReader->GetUChar_TypeNode();
+				if (_at == NSBinPptxRW::g_nodeAttributeEnd)
+					break;
+
+				switch (_at)
+				{
+				case 0:
+				{
+					schemeEnum = pReader->GetULong();
+				}break;
+				case 1:
+				{
+					schemeGUID = pReader->GetString2();
+				}break;
+				default:
+					break;
+				}
+			}
+			pReader->Seek(_end_rec);
+		}
+//-----------------------------------------------------------------------------------------
+		Scheme& Scheme::operator=(const Scheme& oSrc)
+		{
+			parentFile = oSrc.parentFile;
+			parentElement = oSrc.parentElement;
+
+			node_name = oSrc.node_name;
+			schemeID = oSrc.schemeID;
+
+			return *this;
+		}
+		void Scheme::fromXML(XmlUtils::CXmlNode& node)
+		{
+			node_name = node.GetName();
+
+			std::vector<XmlUtils::CXmlNode> oNodes;
+			if (node.GetNodes(L"*", oNodes))
+			{
+				for (size_t i = 0; i < oNodes.size(); ++i)
+				{
+					XmlUtils::CXmlNode& oNode = oNodes[i];
+
+					std::wstring strName = XmlUtils::GetNameNoNS(oNode.GetName());
+					if (L"schemeID" == strName)
+					{
+						schemeID = oNode;
+					}
+				}
+			}
+			FillParentPointersForChilds();
+		}
+		std::wstring Scheme::toXML() const
+		{
+			XmlUtils::CAttribute oAttr;
+			oAttr.Write(L"xmlns:vt", L"http://schemas.microsoft.com/office/visio/2012/theme");
+
+			XmlUtils::CNodeValue oValue;
+			oValue.WriteNullable(schemeID);
+
+			return XmlUtils::CreateNode(node_name, oAttr, oValue);
+		}
+		void Scheme::toPPTY(NSBinPptxRW::CBinaryFileWriter* pWriter) const
+		{
+			pWriter->WriteRecord2(0, schemeID);
+		}
+		void Scheme::toXmlWriter(NSBinPptxRW::CXmlWriter* pWriter) const
+		{
+			pWriter->StartNode(node_name);
+			pWriter->WriteAttribute(L"xmlns:vt", L"http://schemas.microsoft.com/office/visio/2012/theme");
+			pWriter->EndAttributes();
+
+			pWriter->Write(schemeID);
+
+			pWriter->EndNode(node_name);
+		}
+		void Scheme::fromPPTY(NSBinPptxRW::CBinaryFileReader* pReader)
+		{
+			LONG _end_rec = pReader->GetPos() + pReader->GetRecordSize() + 4;
+
+			while (pReader->GetPos() < _end_rec)
+			{
+				BYTE _at = pReader->GetUChar();
+				switch (_at)
+				{
+				case 0:
+				{
+					schemeID.Init();
+					schemeID->fromPPTY(pReader);
+				}break;
+				default:
+					break;
+				}
+			}
+
+			pReader->Seek(_end_rec);
+		}
+		void Scheme::FillParentPointersForChilds()
+		{
+			if (schemeID.IsInit())
+				schemeID->SetParentPointer(this);
+		}
 	} // namespace nsTheme
 } // namespace PPTX
diff --git a/OOXML/PPTXFormat/Theme/VisioThemeElements.h b/OOXML/PPTXFormat/Theme/VisioThemeElements.h
index ac663a192b..85e9db6c51 100644
--- a/OOXML/PPTXFormat/Theme/VisioThemeElements.h
+++ b/OOXML/PPTXFormat/Theme/VisioThemeElements.h
@@ -37,7 +37,45 @@
 namespace PPTX
 {
 	namespace nsTheme
-	{		
+	{
+		class SchemeID : public WrapperWritingElement
+		{
+		public:
+			PPTX_LOGIC_BASE(SchemeID)
+			SchemeID& operator=(const SchemeID& oSrc);
+
+			virtual void fromXML(XmlUtils::CXmlNode& node);
+			virtual std::wstring toXML() const;
+
+			virtual void toXmlWriter(NSBinPptxRW::CXmlWriter* pWriter) const;
+
+			virtual void toPPTY(NSBinPptxRW::CBinaryFileWriter* pWriter) const;
+			virtual void fromPPTY(NSBinPptxRW::CBinaryFileReader* pReader);
+
+			nullable_uint schemeEnum;
+			nullable_string schemeGUID;
+
+			bool bSchemas = false;
+		};
+		class Scheme : public WrapperWritingElement
+		{
+		public:
+			PPTX_LOGIC_BASE(Scheme)
+			Scheme& operator=(const Scheme& oSrc);
+
+			virtual void fromXML(XmlUtils::CXmlNode& node);
+			virtual std::wstring toXML() const;
+
+			virtual void toXmlWriter(NSBinPptxRW::CXmlWriter* pWriter) const;
+
+			virtual void toPPTY(NSBinPptxRW::CBinaryFileWriter* pWriter) const;
+			virtual void fromPPTY(NSBinPptxRW::CBinaryFileReader* pReader);
+
+			std::wstring node_name;
+			nullable<SchemeID> schemeID;
+		protected:
+			virtual void FillParentPointersForChilds();
+		};
 		class LineEx : public WrapperWritingElement
 		{
 		public:
diff --git a/OOXML/VsdxFormat/Shapes.cpp b/OOXML/VsdxFormat/Shapes.cpp
index 73b9bacd80..7a3068045b 100644
--- a/OOXML/VsdxFormat/Shapes.cpp
+++ b/OOXML/VsdxFormat/Shapes.cpp
@@ -62,8 +62,8 @@ namespace OOX
 		void CRel::fromXML(XmlUtils::CXmlLiteReader& oReader)
 		{
 			ReadAttributes(oReader);
-			if (oReader.IsEmptyNode())
-				return;
+			if (!oReader.IsEmptyNode())
+				oReader.ReadTillEnd();
 		}
 		void CRel::toXmlWriter(NSBinPptxRW::CXmlWriter* pWriter) const
 		{
@@ -648,8 +648,8 @@ namespace OOX
 		void CText_tp::fromXML(XmlUtils::CXmlLiteReader& oReader)
 		{
 			ReadAttributes(oReader);
-			if (oReader.IsEmptyNode())
-				return;
+			if (!oReader.IsEmptyNode())
+				oReader.ReadTillEnd();
 		}
 		void CText_tp::toPPTY(NSBinPptxRW::CBinaryFileWriter* pWriter) const
 		{
@@ -697,8 +697,8 @@ namespace OOX
 		void CText_pp::fromXML(XmlUtils::CXmlLiteReader& oReader)
 		{
 			ReadAttributes(oReader);
-			if (oReader.IsEmptyNode())
-				return;
+			if (!oReader.IsEmptyNode())
+				oReader.ReadTillEnd();
 		}
 		void CText_pp::toPPTY(NSBinPptxRW::CBinaryFileWriter* pWriter) const
 		{
@@ -746,8 +746,8 @@ namespace OOX
 		void CText_cp::fromXML(XmlUtils::CXmlLiteReader& oReader)
 		{
 			ReadAttributes(oReader);
-			if (oReader.IsEmptyNode())
-				return;
+			if (!oReader.IsEmptyNode())
+				oReader.ReadTillEnd();
 		}
 		void CText_cp::toPPTY(NSBinPptxRW::CBinaryFileWriter* pWriter) const
 		{
@@ -1063,8 +1063,8 @@ namespace OOX
 		void CRefBy::fromXML(XmlUtils::CXmlLiteReader& oReader)
 		{
 			ReadAttributes(oReader);
-			if (oReader.IsEmptyNode())
-				return;
+			if (!oReader.IsEmptyNode())
+				oReader.ReadTillEnd();
 		}
 		void CRefBy::toPPTY(NSBinPptxRW::CBinaryFileWriter* pWriter) const
 		{
@@ -1649,8 +1649,8 @@ namespace OOX
 		void CConnect::fromXML(XmlUtils::CXmlLiteReader& oReader)
 		{
 			ReadAttributes(oReader);
-			if (oReader.IsEmptyNode())
-				return;
+			if (!oReader.IsEmptyNode())
+				oReader.ReadTillEnd();
 		}
 		void CConnect::toPPTY(NSBinPptxRW::CBinaryFileWriter* pWriter) const
 		{
diff --git a/OOXML/VsdxFormat/VisioConnections.cpp b/OOXML/VsdxFormat/VisioConnections.cpp
index 152e3d0345..19509bc63d 100644
--- a/OOXML/VsdxFormat/VisioConnections.cpp
+++ b/OOXML/VsdxFormat/VisioConnections.cpp
@@ -331,8 +331,8 @@ namespace Draw
 	{
 		ReadAttributes(oReader);
 		
-		if (oReader.IsEmptyNode())
-			return;
+		if (!oReader.IsEmptyNode())
+			oReader.ReadTillEnd();
 	}
 	void CDataConnection::toPPTY(NSBinPptxRW::CBinaryFileWriter* pWriter) const
 	{
@@ -887,8 +887,8 @@ namespace Draw
 	{
 		ReadAttributes(oReader);
 
-		if (oReader.IsEmptyNode())
-			return;
+		if (!oReader.IsEmptyNode())
+			oReader.ReadTillEnd();
 	}
 	void CDataColumn::toPPTY(NSBinPptxRW::CBinaryFileWriter* pWriter) const
 	{
@@ -1114,8 +1114,8 @@ namespace Draw
 	{
 		ReadAttributes(oReader);
 
-		if (oReader.IsEmptyNode())
-			return;
+		if (!oReader.IsEmptyNode())
+			oReader.ReadTillEnd();
 	}
 	void CRowKeyValue::toPPTY(NSBinPptxRW::CBinaryFileWriter* pWriter) const
 	{
@@ -1260,8 +1260,8 @@ namespace Draw
 	void CRowMap::fromXML(XmlUtils::CXmlLiteReader& oReader)
 	{
 		ReadAttributes(oReader);
-		if (oReader.IsEmptyNode())
-			return;
+		if (!oReader.IsEmptyNode())
+			oReader.ReadTillEnd();
 	}
 	void CRowMap::toPPTY(NSBinPptxRW::CBinaryFileWriter* pWriter) const
 	{
@@ -1323,8 +1323,8 @@ namespace Draw
 	void CRefreshConflict::fromXML(XmlUtils::CXmlLiteReader& oReader)
 	{
 		ReadAttributes(oReader);
-		if (oReader.IsEmptyNode())
-			return;
+		if (!oReader.IsEmptyNode())
+			oReader.ReadTillEnd();
 	}
 	void CRefreshConflict::toPPTY(NSBinPptxRW::CBinaryFileWriter* pWriter) const
 	{
@@ -1386,8 +1386,8 @@ namespace Draw
 	void CAutoLinkComparison::fromXML(XmlUtils::CXmlLiteReader& oReader)
 	{
 		ReadAttributes(oReader);
-		if (oReader.IsEmptyNode())
-			return;
+		if (!oReader.IsEmptyNode())
+			oReader.ReadTillEnd();
 	}
 	void CAutoLinkComparison::toPPTY(NSBinPptxRW::CBinaryFileWriter* pWriter) const
 	{
diff --git a/OOXML/VsdxFormat/VisioDocument.cpp b/OOXML/VsdxFormat/VisioDocument.cpp
index 26c419d77c..ec77ca475d 100644
--- a/OOXML/VsdxFormat/VisioDocument.cpp
+++ b/OOXML/VsdxFormat/VisioDocument.cpp
@@ -57,8 +57,8 @@ namespace Draw
 	void CPublishedPage::fromXML(XmlUtils::CXmlLiteReader& oReader)
 	{
 		ReadAttributes(oReader);
-		if (oReader.IsEmptyNode())
-			return;
+		if (!oReader.IsEmptyNode())
+			oReader.ReadTillEnd();
 	}
 	void CPublishedPage::toPPTY(NSBinPptxRW::CBinaryFileWriter* pWriter) const
 	{
@@ -106,8 +106,8 @@ namespace Draw
 	void CRefreshableData::fromXML(XmlUtils::CXmlLiteReader& oReader)
 	{
 		ReadAttributes(oReader);
-		if (oReader.IsEmptyNode())
-			return;
+		if (!oReader.IsEmptyNode())
+			oReader.ReadTillEnd();
 	}
 	void CRefreshableData::toPPTY(NSBinPptxRW::CBinaryFileWriter* pWriter) const
 	{
@@ -243,8 +243,8 @@ namespace Draw
 	void CHeaderFooter::fromXML(XmlUtils::CXmlLiteReader& oReader)
 	{
 		ReadAttributes(oReader);
-		if (oReader.IsEmptyNode())
-			return;
+		if (!oReader.IsEmptyNode())
+			oReader.ReadTillEnd();
 	}
 	void CHeaderFooter::toPPTY(NSBinPptxRW::CBinaryFileWriter* pWriter) const
 	{
@@ -512,8 +512,8 @@ namespace Draw
 	void CEventItem::fromXML(XmlUtils::CXmlLiteReader& oReader)
 	{
 		ReadAttributes(oReader);
-		if (oReader.IsEmptyNode())
-			return;
+		if (!oReader.IsEmptyNode())
+			oReader.ReadTillEnd();
 	}
 	void CEventItem::toPPTY(NSBinPptxRW::CBinaryFileWriter* pWriter) const
 	{
@@ -876,8 +876,8 @@ namespace Draw
 	void CColorEntry::fromXML(XmlUtils::CXmlLiteReader& oReader)
 	{
 		ReadAttributes(oReader);
-		if (oReader.IsEmptyNode())
-			return;
+		if (!oReader.IsEmptyNode())
+			oReader.ReadTillEnd();
 	}
 	void CColorEntry::toPPTY(NSBinPptxRW::CBinaryFileWriter* pWriter) const
 	{
@@ -995,8 +995,8 @@ namespace Draw
 	void CFaceName::fromXML(XmlUtils::CXmlLiteReader& oReader)
 	{
 		ReadAttributes(oReader);
-		if (oReader.IsEmptyNode())
-			return;
+		if (!oReader.IsEmptyNode())
+			oReader.ReadTillEnd();
 	}
 	void CFaceName::toPPTY(NSBinPptxRW::CBinaryFileWriter* pWriter) const
 	{
@@ -1148,51 +1148,51 @@ namespace Draw
 			const char* sName = XmlUtils::GetNameNoNS(oReader.GetNameChar());
 			if (strcmp("GlueSettings", sName) == 0)
 			{
-				GlueSettings = oReader.GetText();
+				GlueSettings = oReader.GetText2();
 			}
 			else if (strcmp("SnapSettings", sName) == 0)
 			{
-				SnapSettings = oReader.GetText();
+				SnapSettings = oReader.GetText2();
 			}
 			else if (strcmp("SnapExtensions", sName) == 0)
 			{
-				SnapExtensions = oReader.GetText();
+				SnapExtensions = oReader.GetText2();
 			}
 			else if (strcmp("SnapAngles", sName) == 0)
 			{
-				SnapAngles = oReader.GetText();
+				SnapAngles = oReader;
 			}
 			else if (strcmp("DynamicGridEnabled", sName) == 0)
 			{
-				DynamicGridEnabled = oReader.GetText();
+				DynamicGridEnabled = oReader.GetText2();
 			}
 			else if (strcmp("ProtectStyles", sName) == 0)
 			{
-				ProtectStyles = oReader.GetText();
+				ProtectStyles = oReader.GetText2();
 			}
 			else if (strcmp("ProtectShapes", sName) == 0)
 			{
-				ProtectShapes = oReader.GetText();
+				ProtectShapes = oReader.GetText2();
 			}
 			else if (strcmp("ProtectBkgnds", sName) == 0)
 			{
-				ProtectBkgnds = oReader.GetText();
+				ProtectBkgnds = oReader.GetText2();
 			}
 			else if (strcmp("ProtectMasters", sName) == 0)
 			{
-				ProtectMasters = oReader.GetText();
+				ProtectMasters = oReader.GetText2();
 			}
 			else if (strcmp("CustomMenusFile", sName) == 0)
 			{
-				CustomMenusFile = oReader.GetText();
+				CustomMenusFile = oReader.GetText2();
 			}
 			else if (strcmp("CustomToolbarsFile", sName) == 0)
 			{
-				CustomToolbarsFile = oReader.GetText();
+				CustomToolbarsFile = oReader.GetText2();
 			}
 			else if (strcmp("AttachedToolbars", sName) == 0)
 			{
-				AttachedToolbars = oReader.GetText();
+				AttachedToolbars = oReader.GetText2();
 			}
 		}
 	}
@@ -1207,7 +1207,6 @@ namespace Draw
 			pWriter->WriteInt2(5, GlueSettings);
 			pWriter->WriteInt2(6, SnapSettings);
 			pWriter->WriteInt2(7, SnapExtensions);
-			pWriter->WriteInt2(8, SnapAngles);
 			pWriter->WriteBool2(9, DynamicGridEnabled);
 			pWriter->WriteBool2(10, ProtectStyles);
 			pWriter->WriteBool2(11, ProtectShapes);
@@ -1217,6 +1216,8 @@ namespace Draw
 			pWriter->WriteString2(15, CustomToolbarsFile);
 			pWriter->WriteString2(16, AttachedToolbars);
 		pWriter->WriteBYTE(NSBinPptxRW::g_nodeAttributeEnd);
+		
+		pWriter->WriteRecord2(0, SnapAngles);
 	}
 	void CDocumentSettings::fromPPTY(NSBinPptxRW::CBinaryFileReader* pReader)
 	{
@@ -1261,10 +1262,6 @@ namespace Draw
 			{
 				SnapExtensions = pReader->GetLong();
 			}break;
-			case 8:
-			{
-				SnapAngles = pReader->GetLong();
-			}break;
 			case 9:
 			{
 				DynamicGridEnabled = pReader->GetBool();
@@ -1299,6 +1296,23 @@ namespace Draw
 			}break;
 			}
 		}
+		while (pReader->GetPos() < _end_rec)
+		{
+			BYTE _rec = pReader->GetUChar();
+
+			switch (_rec)
+			{
+			case 0:
+			{
+				SnapAngles.Init();
+				SnapAngles->fromPPTY(pReader);
+			}break;
+			default:
+			{
+				pReader->SkipRecord();
+			}break;
+			}
+		}
 		pReader->Seek(_end_rec);
 	}
 	void CDocumentSettings::toXmlWriter(NSBinPptxRW::CXmlWriter* pWriter) const
@@ -1311,7 +1325,23 @@ namespace Draw
 			pWriter->WriteAttribute2(L"DefaultFillStyle", DefaultFillStyle);
 			pWriter->WriteAttribute2(L"DefaultGuideStyle", DefaultGuideStyle);
 		pWriter->EndAttributes();
-	//todooo
+
+		pWriter->WriteNodeValue(L"GlueSettings", GlueSettings);
+		pWriter->WriteNodeValue(L"SnapSettings", SnapSettings);
+		pWriter->WriteNodeValue(L"SnapExtensions", SnapExtensions);
+
+		if (SnapAngles.IsInit())
+			SnapAngles->toXmlWriter(pWriter);
+
+		pWriter->WriteNodeValue(L"DynamicGridEnabled", DynamicGridEnabled);
+		pWriter->WriteNodeValue(L"ProtectStyles", ProtectStyles);
+		pWriter->WriteNodeValue(L"ProtectShapes", ProtectShapes);
+		pWriter->WriteNodeValue(L"ProtectMasters", ProtectMasters);
+		pWriter->WriteNodeValue(L"ProtectBkgnds", ProtectBkgnds);
+		pWriter->WriteNodeValue(L"CustomMenusFile", CustomMenusFile);
+		pWriter->WriteNodeValue(L"CustomToolbarsFile", CustomToolbarsFile);
+		pWriter->WriteNodeValue(L"AttachedToolbars", AttachedToolbars);
+
 		pWriter->WriteNodeEnd(L"DocumentSettings");
 	}
 //-----------------------------------------------------------------------------------------------------------------------------
diff --git a/OOXML/VsdxFormat/VisioDocument.h b/OOXML/VsdxFormat/VisioDocument.h
index e977d3a8af..ed645a6c06 100644
--- a/OOXML/VsdxFormat/VisioDocument.h
+++ b/OOXML/VsdxFormat/VisioDocument.h
@@ -110,6 +110,46 @@ namespace OOX
 			virtual void fromPPTY(NSBinPptxRW::CBinaryFileReader* pReader);
 			virtual EElementType getType() const;
 		};
+		class CSnapAngle : public WritingElement
+		{
+		public:
+			WritingElement_AdditionMethods(CSnapAngle)
+
+				CSnapAngle() {}
+			virtual ~CSnapAngle() {}
+
+			virtual std::wstring toXML() const { return L""; }
+
+			virtual void fromXML(XmlUtils::CXmlNode& node) {}
+			virtual void fromXML(XmlUtils::CXmlLiteReader& oReader);
+
+			virtual EElementType getType() const;
+
+			virtual void fromPPTY(NSBinPptxRW::CBinaryFileReader* pReader);
+			virtual void toPPTY(NSBinPptxRW::CBinaryFileWriter* pWriter) const;
+			virtual void toXmlWriter(NSBinPptxRW::CXmlWriter* pWriter) const;
+		public:
+			nullable_double content;
+		};
+		class CSnapAngles : public WritingElementWithChilds<CSnapAngle>
+		{
+		public:
+			WritingElement_AdditionMethods(CSnapAngles)
+				CSnapAngles() {}
+			virtual ~CSnapAngles() {}
+
+			virtual std::wstring toXML() const { return L""; }
+			virtual void fromXML(XmlUtils::CXmlNode& node) {}
+			virtual void fromXML(XmlUtils::CXmlLiteReader& oReader);
+			virtual void toXmlWriter(NSBinPptxRW::CXmlWriter* pWriter) const;
+
+			void ReadAttributes(XmlUtils::CXmlLiteReader& oReader);
+
+			virtual EElementType getType() const;
+
+			virtual void fromPPTY(NSBinPptxRW::CBinaryFileReader* pReader);
+			virtual void toPPTY(NSBinPptxRW::CBinaryFileWriter* pWriter) const;
+		};
 		class CDocumentSettings : public WritingElement
 		{
 		public:
@@ -138,7 +178,7 @@ namespace OOX
 			nullable_int GlueSettings;
 			nullable_int SnapSettings;
 			nullable_int SnapExtensions;
-			nullable_int SnapAngles;
+			nullable<CSnapAngles> SnapAngles;
 			nullable_bool DynamicGridEnabled;
 			nullable_bool ProtectStyles;
 			nullable_bool ProtectShapes;
@@ -396,46 +436,6 @@ namespace OOX
 			nullable_string HeaderFooterColor;
 
 		};
-		class CSnapAngle : public WritingElement
-		{
-		public:
-			WritingElement_AdditionMethods(CSnapAngle)
-
-			CSnapAngle() {}
-			virtual ~CSnapAngle() {}
-
-			virtual std::wstring toXML() const { return L""; }
-
-			virtual void fromXML(XmlUtils::CXmlNode& node) {}
-			virtual void fromXML(XmlUtils::CXmlLiteReader& oReader);
-
-			virtual EElementType getType() const;
-
-			virtual void fromPPTY(NSBinPptxRW::CBinaryFileReader* pReader);
-			virtual void toPPTY(NSBinPptxRW::CBinaryFileWriter* pWriter) const;
-			virtual void toXmlWriter(NSBinPptxRW::CXmlWriter* pWriter) const;
-		public:
-			nullable_double content;
-		};
-		class CSnapAngles : public WritingElementWithChilds<CSnapAngle>	
-		{
-		public:
-			WritingElement_AdditionMethods(CSnapAngles)
-			CSnapAngles() {}
-			virtual ~CSnapAngles() {}
-
-			virtual std::wstring toXML() const { return L""; }
-			virtual void fromXML(XmlUtils::CXmlNode& node) {}
-			virtual void fromXML(XmlUtils::CXmlLiteReader& oReader);
-			virtual void toXmlWriter(NSBinPptxRW::CXmlWriter* pWriter) const;
-
-			void ReadAttributes(XmlUtils::CXmlLiteReader& oReader);
-
-			virtual EElementType getType() const;
-
-			virtual void fromPPTY(NSBinPptxRW::CBinaryFileReader* pReader);
-			virtual void toPPTY(NSBinPptxRW::CBinaryFileWriter* pWriter) const;
-		};
 		class CWindow : public WritingElement
 		{
 		public:
diff --git a/OOXML/VsdxFormat/VisioOthers.cpp b/OOXML/VsdxFormat/VisioOthers.cpp
index 844fac6da0..a0167d607b 100644
--- a/OOXML/VsdxFormat/VisioOthers.cpp
+++ b/OOXML/VsdxFormat/VisioOthers.cpp
@@ -1021,8 +1021,8 @@ namespace Draw
 	void CValidationProperties::fromXML(XmlUtils::CXmlLiteReader& oReader)
 	{
 		ReadAttributes(oReader);
-		if (oReader.IsEmptyNode())
-			return;
+		if (!oReader.IsEmptyNode())
+			oReader.ReadTillEnd();
 	}
 	void CValidationProperties::toPPTY(NSBinPptxRW::CBinaryFileWriter* pWriter) const
 	{
@@ -1077,8 +1077,8 @@ namespace Draw
 	void CIssueTarget::fromXML(XmlUtils::CXmlLiteReader& oReader)
 	{
 		ReadAttributes(oReader);
-		if (oReader.IsEmptyNode())
-			return;
+		if (!oReader.IsEmptyNode())
+			oReader.ReadTillEnd();
 	}
 	void CIssueTarget::toPPTY(NSBinPptxRW::CBinaryFileWriter* pWriter) const
 	{
@@ -1134,8 +1134,8 @@ namespace Draw
 	void CRuleInfo::fromXML(XmlUtils::CXmlLiteReader& oReader)
 	{
 		ReadAttributes(oReader);
-		if (oReader.IsEmptyNode())
-			return;
+		if (!oReader.IsEmptyNode())
+			oReader.ReadTillEnd();
 	}
 	void CRuleInfo::toPPTY(NSBinPptxRW::CBinaryFileWriter* pWriter) const
 	{
@@ -1190,8 +1190,8 @@ namespace Draw
 	void CRuleFormula::fromXML(XmlUtils::CXmlLiteReader& oReader)
 	{
 		ReadAttributes(oReader);
-		if (oReader.IsEmptyNode())
-			return;
+		if (!oReader.IsEmptyNode())
+			oReader.ReadTillEnd();
 	}
 	void CRuleFormula::toPPTY(NSBinPptxRW::CBinaryFileWriter* pWriter) const
 	{
@@ -1240,8 +1240,8 @@ namespace Draw
 	void CRuleSetFlags::fromXML(XmlUtils::CXmlLiteReader& oReader)
 	{
 		ReadAttributes(oReader);
-		if (oReader.IsEmptyNode())
-			return;
+		if (!oReader.IsEmptyNode())
+			oReader.ReadTillEnd();
 	}
 	void CRuleSetFlags::toPPTY(NSBinPptxRW::CBinaryFileWriter* pWriter) const
 	{
@@ -1708,8 +1708,8 @@ namespace Draw
 	void CAuthorEntry::fromXML(XmlUtils::CXmlLiteReader& oReader)
 	{
 		ReadAttributes(oReader);
-		if (oReader.IsEmptyNode())
-			return;
+		if (!oReader.IsEmptyNode())
+			oReader.ReadTillEnd();
 	}
 	void CAuthorEntry::toPPTY(NSBinPptxRW::CBinaryFileWriter* pWriter) const
 	{
diff --git a/OOXML/XlsxFormat/Controls/Controls.cpp b/OOXML/XlsxFormat/Controls/Controls.cpp
index c2ae7519a6..8f827b5887 100644
--- a/OOXML/XlsxFormat/Controls/Controls.cpp
+++ b/OOXML/XlsxFormat/Controls/Controls.cpp
@@ -37,6 +37,8 @@
 #include "../../Common/SimpleTypes_Spreadsheet.h"
 
 #include "../../DocxFormat/Drawing/DrawingExt.h"
+#include "../../PPTXFormat/Logic/SpTreeElem.h"
+#include "../../DocxFormat/Logic/Pict.h"
 
 #include "../../XlsbFormat/Biff12_unions/ACTIVEXCONTROLS.h"
 #include "../../XlsbFormat/Biff12_records/ActiveX.h"
diff --git a/OOXML/XlsxFormat/Controls/Controls.h b/OOXML/XlsxFormat/Controls/Controls.h
index 9d7ddbfada..e80acdd0f1 100644
--- a/OOXML/XlsxFormat/Controls/Controls.h
+++ b/OOXML/XlsxFormat/Controls/Controls.h
@@ -52,7 +52,13 @@ namespace SimpleTypes
 		class CEditValidation;
 	}
 }
-
+namespace PPTX
+{
+	namespace Logic
+	{
+		class SpTreeElem;
+	}
+}
 namespace OOX
 {
 	namespace Drawing
@@ -239,6 +245,7 @@ namespace OOX
 			nullable<CControlPr>								m_oControlPr;
 //--for-write-from-bin--------------
 			nullable<CFormControlPr>							m_oFormControlPr;
+			nullable<PPTX::Logic::SpTreeElem>					m_oShape;
 		};
 //------------------------------------------------------------------------------------------------------------------------
 		class CControls : public WritingElement
diff --git a/OOXML/XlsxFormat/Table/Tables.cpp b/OOXML/XlsxFormat/Table/Tables.cpp
index ea97a2801e..ae3268365f 100644
--- a/OOXML/XlsxFormat/Table/Tables.cpp
+++ b/OOXML/XlsxFormat/Table/Tables.cpp
@@ -221,8 +221,8 @@ namespace Spreadsheet
 	{
 		ReadAttributes(oReader);
 
-		if (oReader.IsEmptyNode())
-			return;
+		if (!oReader.IsEmptyNode())
+			oReader.ReadTillEnd();
 	}
 	void CXmlColumnPr::toPPTY(NSBinPptxRW::CBinaryFileWriter* pWriter) const
 	{
@@ -2004,8 +2004,8 @@ xmlns:xr16=\"http://schemas.microsoft.com/office/spreadsheetml/2017/revision16\"
 	{
 		ReadAttributes(oReader);
 
-		if (oReader.IsEmptyNode())
-			return;
+		if (!oReader.IsEmptyNode())
+			oReader.ReadTillEnd();
 	}
 	void CXmlPr::toPPTY(NSBinPptxRW::CBinaryFileWriter* pWriter) const
 	{
diff --git a/OOXML/XlsxFormat/Timelines/Timeline.cpp b/OOXML/XlsxFormat/Timelines/Timeline.cpp
index cf5b6085d1..9049901f06 100644
--- a/OOXML/XlsxFormat/Timelines/Timeline.cpp
+++ b/OOXML/XlsxFormat/Timelines/Timeline.cpp
@@ -70,8 +70,8 @@ namespace OOX
 		{
 			ReadAttributes(oReader);
 
-			if (oReader.IsEmptyNode())
-				return;
+			if (!oReader.IsEmptyNode())
+				oReader.ReadTillEnd();
 		}
 		void CTimelineCachePivotTable::ReadAttributes(XmlUtils::CXmlLiteReader& oReader)
 		{
@@ -107,8 +107,8 @@ namespace OOX
 
 			ReadAttributes(oReader);
 
-			if (oReader.IsEmptyNode())
-				return;
+			if (!oReader.IsEmptyNode())
+				oReader.ReadTillEnd();
 		}
 		void CTimelineRange::ReadAttributes(XmlUtils::CXmlLiteReader& oReader)
 		{
diff --git a/OOXML/XlsxFormat/Workbook/Metadata.cpp b/OOXML/XlsxFormat/Workbook/Metadata.cpp
index af68d8fb6c..63ffad2ed0 100644
--- a/OOXML/XlsxFormat/Workbook/Metadata.cpp
+++ b/OOXML/XlsxFormat/Workbook/Metadata.cpp
@@ -103,8 +103,8 @@ namespace OOX
 		{
 			ReadAttributes(oReader);
 
-			if (oReader.IsEmptyNode())
-				return;
+			if (!oReader.IsEmptyNode())
+				oReader.ReadTillEnd();
 		}
 		void CMdxKPI::ReadAttributes(XmlUtils::CXmlLiteReader& oReader)
 		{
@@ -172,8 +172,8 @@ namespace OOX
 		{
 			ReadAttributes(oReader);
 
-			if (oReader.IsEmptyNode())
-				return;
+			if (!oReader.IsEmptyNode())
+				oReader.ReadTillEnd();
 		}
 		void CMdxMemeberProp::ReadAttributes(XmlUtils::CXmlLiteReader& oReader)
 		{
@@ -328,8 +328,8 @@ namespace OOX
 		{
 			ReadAttributes(oReader);
 
-			if (oReader.IsEmptyNode())
-				return;
+			if (!oReader.IsEmptyNode())
+				oReader.ReadTillEnd();
 		}
 		void CMetadataStringIndex::ReadAttributes(XmlUtils::CXmlLiteReader& oReader)
 		{
@@ -774,8 +774,8 @@ namespace OOX
 		{
 			ReadAttributes(oReader);
 
-			if (oReader.IsEmptyNode())
-				return;
+			if (!oReader.IsEmptyNode())
+				oReader.ReadTillEnd();
 		}
 		void CMetadataString::ReadAttributes(XmlUtils::CXmlLiteReader& oReader)
 		{
@@ -808,8 +808,8 @@ namespace OOX
 		{
 			ReadAttributes(oReader);
 
-			if (oReader.IsEmptyNode())
-				return;
+			if (!oReader.IsEmptyNode())
+				oReader.ReadTillEnd();
 		}
 		void CMetadataRecord::ReadAttributes(XmlUtils::CXmlLiteReader& oReader)
 		{
@@ -1083,8 +1083,8 @@ namespace OOX
 		{
 			ReadAttributes(oReader);
 
-			if (oReader.IsEmptyNode())
-				return;
+			if (!oReader.IsEmptyNode())
+				oReader.ReadTillEnd();
 		}
 		void CMetadataType::ReadAttributes(XmlUtils::CXmlLiteReader& oReader)
 		{
@@ -1617,8 +1617,8 @@ xmlns:xda=\"http://schemas.microsoft.com/office/spreadsheetml/2017/dynamicarray\
 		{
 			ReadAttributes(oReader);
 
-			if (oReader.IsEmptyNode())
-				return;
+			if (!oReader.IsEmptyNode())
+				oReader.ReadTillEnd();
 		}
 		void CDynamicArrayProperties::ReadAttributes(XmlUtils::CXmlLiteReader& oReader)
 		{
@@ -1670,8 +1670,8 @@ xmlns:xda=\"http://schemas.microsoft.com/office/spreadsheetml/2017/dynamicarray\
 		{
 			ReadAttributes(oReader);
 
-			if (oReader.IsEmptyNode())
-				return;
+			if (!oReader.IsEmptyNode())
+				oReader.ReadTillEnd();
 		}
 		void CRichValueBlock::ReadAttributes(XmlUtils::CXmlLiteReader& oReader)
 		{
diff --git a/OOXML/XlsxFormat/Worksheets/ConditionalFormatting.cpp b/OOXML/XlsxFormat/Worksheets/ConditionalFormatting.cpp
index 54a7654c09..397dee6acb 100644
--- a/OOXML/XlsxFormat/Worksheets/ConditionalFormatting.cpp
+++ b/OOXML/XlsxFormat/Worksheets/ConditionalFormatting.cpp
@@ -570,8 +570,8 @@ void CConditionalFormatIconSet::fromXML(XmlUtils::CXmlLiteReader& oReader)
 {
 	ReadAttributes(oReader);
 
-	if (oReader.IsEmptyNode())
-		return;
+    if (!oReader.IsEmptyNode())
+        oReader.ReadTillEnd();
 }
 void CConditionalFormatIconSet::fromBin(XLS::BaseObjectPtr& obj)
 {
diff --git a/OOXML/XlsxFormat/Worksheets/SheetData.cpp b/OOXML/XlsxFormat/Worksheets/SheetData.cpp
index 3284a969a7..1045e7688f 100644
--- a/OOXML/XlsxFormat/Worksheets/SheetData.cpp
+++ b/OOXML/XlsxFormat/Worksheets/SheetData.cpp
@@ -3769,6 +3769,11 @@ namespace OOX
 		}
 		void CRow::toXML(NSStringUtils::CStringBuilder& writer) const
 		{
+            if(m_oDataCache.IsInit() && !(m_oDataCache.get().empty()))
+            {
+                writer.WriteString(m_oDataCache.get());
+                return;
+            }
 			toXMLStart(writer);
 
 			for ( size_t i = 0; i < m_arrItems.size(); ++i)
@@ -3858,6 +3863,13 @@ namespace OOX
 				}
 			}
 		}
+        void CRow::storeXmlCache()
+        {
+            NSStringUtils::CStringBuilder writer;
+            toXML(writer);
+            m_oDataCache = writer.GetData();
+            ClearItems();
+        }
         void CRow::fromBin(XLS::BaseObjectPtr& obj)
         {
             ReadAttributes(obj);
@@ -4416,27 +4428,35 @@ namespace OOX
 		void CSheetData::toXML(NSStringUtils::CStringBuilder& writer) const
 		{
 			toXMLStart(writer);
-			for ( size_t i = 0; i < m_arrItems.size(); ++i)
-			{
-				if (  m_arrItems[i] )
-				{
-					m_arrItems[i]->toXML(writer);
-                    if(m_arrItems[i]->m_oRepeated.IsInit())
+            if(m_oDataCache.IsInit() && m_oDataCache->GetCurSize())
+            {
+                writer.Write(m_oDataCache.get2());
+                m_oDataCache->Clear();
+            }
+            else
+            {
+                for ( size_t i = 0; i < m_arrItems.size(); ++i)
+                {
+                    if (  m_arrItems[i] )
                     {
-                        _INT32 rowTimes = m_arrItems[i]->m_oRepeated.get() - 1;
-                        while(rowTimes > 0)
+                        m_arrItems[i]->toXML(writer);
+                        if(m_arrItems[i]->m_oRepeated.IsInit())
                         {
-                            if(m_arrItems[i]->m_oR.IsInit())
-                                m_arrItems[i]->m_oR = m_arrItems[i]->m_oR->GetValue() + 1;
-                            if(!m_arrItems[i]->m_arrItems.empty() && m_arrItems[i]->m_arrItems.at(0)->m_oRow.IsInit())
-                                m_arrItems[i]->m_arrItems.at(0)->m_oRow = m_arrItems[i]->m_oR->GetValue();
-                            m_arrItems[i]->toXML(writer);
-                            rowTimes--;
-                        }
+                            _INT32 rowTimes = m_arrItems[i]->m_oRepeated.get() - 1;
+                            while(rowTimes > 0)
+                            {
+                                if(m_arrItems[i]->m_oR.IsInit())
+                                    m_arrItems[i]->m_oR = m_arrItems[i]->m_oR->GetValue() + 1;
+                                if(!m_arrItems[i]->m_arrItems.empty() && m_arrItems[i]->m_arrItems.at(0)->m_oRow.IsInit())
+                                    m_arrItems[i]->m_arrItems.at(0)->m_oRow = m_arrItems[i]->m_oR->GetValue();
+                                m_arrItems[i]->toXML(writer);
+                                rowTimes--;
+                            }
 
+                        }
                     }
-				}
-			}
+                }
+            }
 			toXMLEnd(writer);
 		}
 		void CSheetData::toXMLStart(NSStringUtils::CStringBuilder& writer) const
@@ -4447,6 +4467,12 @@ namespace OOX
 		{
 			writer.WriteString(_T("</sheetData>"));
 		}
+        void CSheetData::AddRowToCache(CRow &row)
+        {
+            if(!m_oDataCache.IsInit())
+                m_oDataCache.Init();
+            row.toXML(m_oDataCache.get2());
+        }
         void CSheetData::ReadAttributes(XmlUtils::CXmlLiteReader& oReader)
 		{
 			WritingElement_ReadAttributes_Start(oReader)
diff --git a/OOXML/XlsxFormat/Worksheets/SheetData.h b/OOXML/XlsxFormat/Worksheets/SheetData.h
index c01066637f..2bea57af73 100644
--- a/OOXML/XlsxFormat/Worksheets/SheetData.h
+++ b/OOXML/XlsxFormat/Worksheets/SheetData.h
@@ -311,7 +311,8 @@ namespace OOX
             XLS::BaseObjectPtr toBin(sharedFormula &sharedFormulas);
             void toBin(XLS::StreamCacheWriterPtr& writer);
             void WriteAttributes(XLS::StreamCacheWriterPtr& writer);
-
+            //удалить хранимые ячейки и кэшировать данные для экономии памяти
+            void storeXmlCache();
 			virtual EElementType getType () const;
 
 		private:
@@ -320,6 +321,8 @@ namespace OOX
 			void ReadAttributes(XLS::BaseObjectPtr& obj);
 			void CheckIndex();
             bool compressCell(CCell* pCell);
+            //xml кэш чтобы не хранить ячеки
+            nullable_string           m_oDataCache;
 
 		public:
 			nullable<SimpleTypes::COnOff>					m_oCollapsed;
@@ -352,6 +355,8 @@ namespace OOX
 			virtual void toXML(NSStringUtils::CStringBuilder& writer) const;
 			virtual void toXMLStart(NSStringUtils::CStringBuilder& writer) const;
 			virtual void toXMLEnd(NSStringUtils::CStringBuilder& writer) const;
+            //добавить кэшированное xml значение строки для экономии памяти
+            void AddRowToCache(CRow &row);
 
 			virtual void fromXML(XmlUtils::CXmlLiteReader& oReader);
 			void fromXLSB (NSBinPptxRW::CBinaryFileReader& oStream, _UINT16 nType, CSVWriter* pCSVWriter, NSFile::CStreamWriter& oStreamWriter);
@@ -375,7 +380,7 @@ namespace OOX
 			void fromXLSBToXmlRowEnd (CRow* pRow, CSVWriter* pCSVWriter, NSFile::CStreamWriter& oStreamWriter, bool bLastRow = false);
 			void ReadAttributes(XmlUtils::CXmlLiteReader& oReader);
             bool compressRow(CRow* pRow);
-
+            nullable<NSStringUtils::CStringBuilder>  m_oDataCache;
 	// spreadsheets 2003
 
 			nullable_string m_sStyleID;
diff --git a/OOXML/XlsxFormat/Worksheets/WorksheetChildOther.cpp b/OOXML/XlsxFormat/Worksheets/WorksheetChildOther.cpp
index 4573f24d60..fdc4e9371c 100644
--- a/OOXML/XlsxFormat/Worksheets/WorksheetChildOther.cpp
+++ b/OOXML/XlsxFormat/Worksheets/WorksheetChildOther.cpp
@@ -393,8 +393,8 @@ namespace OOX
 		{
 			ReadAttributes(oReader);
 
-			if (oReader.IsEmptyNode())
-				return;
+			if (!oReader.IsEmptyNode())
+				oReader.ReadTillEnd();
 		}
 		void CCellWatch::fromBin(XLS::BaseObjectPtr& obj)
 		{
diff --git a/OdfFile/Common/readdocelement.cpp b/OdfFile/Common/readdocelement.cpp
index 98295da68e..034ad67a77 100644
--- a/OdfFile/Common/readdocelement.cpp
+++ b/OdfFile/Common/readdocelement.cpp
@@ -84,14 +84,20 @@ bool read_doc_element::read_sax( xml::sax * Reader )
 			case xml::typeWhitespace:
 			{
 				const std::wstring value = Reader->value();
-				add_space(value);
+				if (false == value.empty())
+				{
+					add_space(value);
+				}
 			}
 			break;
 			case xml::typeCDATA:
 			case xml::typeText:
 			{
 				const std::wstring value = Reader->value();
-				add_text(value);
+				if (false == value.empty())
+				{
+					add_text(value);
+				}
 			}
 			break;
         }
diff --git a/OdfFile/Reader/Converter/SMCustomShape2OOXML/TestSMCustomShape/main.cpp b/OdfFile/Reader/Converter/SMCustomShape2OOXML/TestSMCustomShape/main.cpp
index 9211881cb9..be783de483 100644
--- a/OdfFile/Reader/Converter/SMCustomShape2OOXML/TestSMCustomShape/main.cpp
+++ b/OdfFile/Reader/Converter/SMCustomShape2OOXML/TestSMCustomShape/main.cpp
@@ -18,7 +18,7 @@ TEST(SMCustomShapeTest,Plus)
     OdfCustomShape::SMCustomShapeConversion oConvers;
 	oPars.StartParsSMCustomShape(wsString);
 	oConvers.StartConversion(oPars.GetVector(),L"gd35");
-	std::wstring wsXmlString = L"<a:gd name=\"gd35\" fmla=\"+/ left gd2 1 \" />";
+	std::wstring wsXmlString = L"<a:gd name=\"gd35\" fmla=\"+/ 0 gd2 1 \" />";
 	EXPECT_EQ(oConvers.GetStringXml(),wsXmlString);
 }
 TEST(SMCustomShapeTest,Minus)
@@ -28,7 +28,7 @@ TEST(SMCustomShapeTest,Minus)
     OdfCustomShape::SMCustomShapeConversion oConvers;
 	oPars.StartParsSMCustomShape(wsString);
 	oConvers.StartConversion(oPars.GetVector(),L"gd35");
-	std::wstring wsXmlString = L"<a:gd name=\"gd35\" fmla=\"+- 0 bottom gd2 \" />";
+	std::wstring wsXmlString = L"<a:gd name=\"gd35\" fmla=\"+- 0 h gd2 \" />";
 	EXPECT_EQ(oConvers.GetStringXml(),wsXmlString);
 }
 TEST(SMCustomShapeTest,Multi)
@@ -48,7 +48,7 @@ TEST(SMCustomShapeTest,Divide)
     OdfCustomShape::SMCustomShapeConversion oConvers;
 	oPars.StartParsSMCustomShape(wsString);
 	oConvers.StartConversion(oPars.GetVector(),L"gd35");
-	std::wstring wsXmlString = L"<a:gd name=\"gd35.1.1\" fmla=\"+/ 0 pi 8 \" /><a:gd name=\"gd35.1\" fmla=\"cos 1 gd35.1.1 \" /><a:gd name=\"gd35\" fmla=\"+/ 0 10800 gd35.1 \" />";
+	std::wstring wsXmlString = L"<a:gd name=\"gd35.1.1.1\" fmla=\"+/ 0 314 100\" /><a:gd name=\"gd35.1.1\" fmla=\"+/ 0 gd35.1.1.1 8 \" /><a:gd name=\"gd35.1\" fmla=\"cos 1 gd35.1.1 \" /><a:gd name=\"gd35\" fmla=\"+/ 0 10800 gd35.1 \" />";
 	EXPECT_EQ(oConvers.GetStringXml(),wsXmlString);
 }
 TEST(SMCustomShapeTest,Sqrt)
@@ -68,7 +68,7 @@ TEST(SMCustomShapeTest,DoubleBracket)
     OdfCustomShape::SMCustomShapeConversion oConvers;
 	oPars.StartParsSMCustomShape(wsString);
 	oConvers.StartConversion(oPars.GetVector(),L"gd35");
-	std::wstring wsXmlString = L"<a:gd name=\"gd35.1.1.1\" fmla=\"+/ 0 pi 180 \" /><a:gd name=\"gd35.1.1\" fmla=\"*/ gd0 gd35.1.1.1 1 \" /><a:gd name=\"gd35.1\" fmla=\"sin 1 gd35.1.1 \" /><a:gd name=\"gd35\" fmla=\"*/ $0 gd35.1 1 \" />";
+	std::wstring wsXmlString = L"<a:gd name=\"gd35.1.1.1.1\" fmla=\"+/ 0 314 100\" /><a:gd name=\"gd35.1.1.1\" fmla=\"+/ 0 gd35.1.1.1.1 180 \" /><a:gd name=\"gd35.1.1\" fmla=\"*/ gd0 gd35.1.1.1 1 \" /><a:gd name=\"gd35.1\" fmla=\"sin 1 gd35.1.1 \" /><a:gd name=\"gd35\" fmla=\"*/ $0 gd35.1 1 \" />";
 	EXPECT_EQ(oConvers.GetStringXml(),wsXmlString);
 }
 TEST(SMCustomShapeTest,Min)
diff --git a/OdfFile/Reader/Converter/SMCustomShape2OOXML/smcustomshapepars.cpp b/OdfFile/Reader/Converter/SMCustomShape2OOXML/smcustomshapepars.cpp
index 10c042394a..5095348ff5 100644
--- a/OdfFile/Reader/Converter/SMCustomShape2OOXML/smcustomshapepars.cpp
+++ b/OdfFile/Reader/Converter/SMCustomShape2OOXML/smcustomshapepars.cpp
@@ -101,7 +101,7 @@ namespace OdfCustomShape
 	{
 		if(CElementNumber::CheckNumber(wsElement))
 			return new CElementNumber(wsElement);
-		else if(CElementArithmeticOperations::CheckArithmeticOperators(wsElement))
+		else if(CElementArithmeticOperations::CheckArithmeticOperators(wsElement) || wsElement == L"--")
 			return new CElementArithmeticOperations(wsElement);
 		else if(wsElement == L"(")
 			return new CElementBracket();
@@ -143,6 +143,12 @@ namespace OdfCustomShape
 	{
 		if(!pReader->GetElement().empty())
 			pReader->ClearElement();
+		if(m_wsNumber == L"width" || m_wsNumber == L"top")
+			m_wsNumber = L"w";
+		else if(m_wsNumber == L"height" || m_wsNumber == L"bottom")
+			m_wsNumber = L"h";
+		else if(m_wsNumber == L"right" || m_wsNumber == L"left")
+			m_wsNumber = L"0";
 	}
 	bool CElementNumber::CheckNumber(const std::wstring& wsNumber)
 	{
@@ -174,7 +180,7 @@ namespace OdfCustomShape
 	{}
 	CElementArithmeticOperations::CElementArithmeticOperations(const std::wstring& wsSign):m_enTypeSign(TypeElement::empty),m_pSecondSign(nullptr),m_pFirstValue(nullptr),m_pSecondValue(nullptr),m_uiNumberFormula(1)
 	{
-		m_enTypeSign = CElementArithmeticOperations::SetTypeSign(wsSign);
+		m_enTypeSign = wsSign ==L"--" ? TypeElement::plus:CElementArithmeticOperations::SetTypeSign(wsSign);
 		SetBaseType(TypeElement::ArithmeticOperation);
 	}
 	CElementArithmeticOperations::~CElementArithmeticOperations()
@@ -191,7 +197,7 @@ namespace OdfCustomShape
 		if(pElement == nullptr)
 			return;
 		pReader->ReadingNextElement();
-		if(pElement->GetBaseType() != TypeElement::ArithmeticOperation && pElement->GetBaseType() != TypeElement::comma && !ComparingPriorities(pReader->GetElement()))//утечка данных, если тип ариф знаки
+		if(pElement->GetBaseType() != TypeElement::ArithmeticOperation && pElement->GetBaseType() != TypeElement::comma && !ComparingPriorities(pReader->GetElement()))
 		{
 			m_pSecondValue = pElement;
 			pElement = nullptr;
@@ -405,15 +411,30 @@ namespace OdfCustomShape
 	}
 	std::wstring CElementArithmeticOperations::ConversionValueSign(XmlUtils::CXmlWriter *pXmlWriter, CElement* pElement)
 	{
-		if(pElement->GetBaseType() != TypeElement::NumberOrName)
+		if(pElement->GetBaseType() == TypeElement::NumberOrName)
+			return L"";
+		else if(pElement->GetBaseType()== TypeElement::Bracket)
 		{
-			std::wstring wsTempName = GetNameFormula() + L"." + std::to_wstring(m_uiNumberFormula);
-			m_uiNumberFormula++;
+			CElementBracket* pTempBracket = dynamic_cast<CElementBracket*>(pElement);
+			std::vector<CElement*> arTemp = pTempBracket->GetVector();
+			if(!arTemp.empty() && arTemp.size() == 1 && arTemp[0]->GetBaseType() == TypeElement::NumberOrName )
+				return L"";
+			else
+			{
+				std::wstring wsTempName,wsOldName = GetNameFormula();
+				CElementFunction::CalculatingNumberName(wsTempName,wsOldName,m_uiNumberFormula);
+				pElement->ConversionOOXml(pXmlWriter,wsTempName);
+				return pElement->GetNameFormula();
+			}
+		}
+		else
+		{
+			std::wstring wsTempName,wsOldName = GetNameFormula();
+			CElementFunction::CalculatingNumberName(wsTempName,wsOldName,m_uiNumberFormula);
 			pElement->ConversionOOXml(pXmlWriter,wsTempName);
 			return pElement->GetNameFormula();
 		}
-		else
-			return L"";
+		return L"";
 	}
 	void CElementArithmeticOperations::RecordingTheValuesSign(XmlUtils::CXmlWriter *pXmlWriter, const std::wstring &wsNameFirst, const std::wstring &wsNameSecond)
 	{
@@ -454,9 +475,20 @@ namespace OdfCustomShape
 				else
 					continue;
 			}
-			else if(!wsOneElement.empty() && (L'+' == *itStart || L'-' == *itStart || L'*' == *itStart || L'/' == *itStart || L',' == *itStart || L'(' == *itStart || L')' == *itStart))
+			else if(!wsOneElement.empty() && wsOneElement.back() == L'-')
+			{
+				if(L'-' == *itStart)
+				{
+					wsOneElement.push_back(*itStart);
+					itStart++;
+					return wsOneElement;
+				}
+				else
+					return wsOneElement;
+			}
+			else if(!wsOneElement.empty() && (L'+' == *itStart || L'*' == *itStart || L'/' == *itStart || L',' == *itStart || L'(' == *itStart || L')' == *itStart || L'-' == *itStart))
 				return wsOneElement;
-			else if(wsOneElement.empty() && (L'+' == *itStart || L'-' == *itStart || L'*' == *itStart || L'/' == *itStart || L',' == *itStart || L'(' == *itStart || L')' == *itStart))
+			else if(wsOneElement.empty() && (L'+' == *itStart || L'*' == *itStart || L'/' == *itStart || L',' == *itStart || L'(' == *itStart || L')' == *itStart))
 			{
 				wsOneElement.push_back(*itStart);
 				itStart++;
@@ -602,21 +634,26 @@ namespace OdfCustomShape
 			return TypeElement::min;
 		else if(wsFunction == L"max")
 			return TypeElement::max;
-		// else if(wsFunction == L"atan2")
-		// 	return TypeElement::atan2;
 		else if(wsFunction == L"atan")
 			return TypeElement::atan;
+		else if(wsFunction == L"logheight")
+			return TypeElement::logheight;
+		else if(wsFunction == L"logwidth")
+			return TypeElement::logwidth;
+		else if(wsFunction == L"pi")
+			return TypeElement::pi;
 		else
 			return TypeElement::empty;
 	}
 	void CElementFunction::Parse(CSMReader* pReader)
 	{
 		pReader->ClearElement();
-		m_pValue = SMCustomShapePars::ParseElement(pReader);
+		if(m_enTypeFunction != TypeElement::logheight && m_enTypeFunction != TypeElement::logwidth && m_enTypeFunction != TypeElement::pi)
+			m_pValue = SMCustomShapePars::ParseElement(pReader);
 	}
 	void CElementFunction::ConversionOOXml(XmlUtils::CXmlWriter* pXmlWriter, const std::wstring &wsName)
 	{
-		if(m_pValue == nullptr)
+		if(m_pValue == nullptr && m_enTypeFunction != TypeElement::logheight && m_enTypeFunction != TypeElement::logwidth && m_enTypeFunction != TypeElement::pi)
 		{
 			if(!wsName.empty())
 				SMCustomShapeConversion::WritingFormulaXml(pXmlWriter,wsName,L"sqrt 0 ");
@@ -715,22 +752,44 @@ namespace OdfCustomShape
 		case TypeElement::tan:
 		{
 			std::wstring wsFormula;
+
 			if(m_enTypeFunction == TypeElement::sin)
-				wsFormula = L"sin 1 ";
+				wsFormula = L"sin";
 			else if(m_enTypeFunction == TypeElement::cos)
-				wsFormula = L"cos 1 ";
+				wsFormula = L"cos";
 			else if(m_enTypeFunction == TypeElement::tan)
-				wsFormula = L"tan 1 ";
+				wsFormula = L"tan";
 			else
-				wsFormula = L"at2 1 ";
+				wsFormula = L"at2";
+
+			wsFormula += L" 1 ";
 			ConvertBracketsForTrigonometry(pXmlWriter,wsFormula);
 			SMCustomShapeConversion::WritingFormulaXml(pXmlWriter,GetNameFormula(),wsFormula);
 			break;
 		}
+		case TypeElement::logheight:
+		case TypeElement::logwidth:
+		{
+			CalculatingTheLogicalHeightOrWidth(pXmlWriter);
+			break;
+		}
+		case TypeElement::pi:
+		{
+			SMCustomShapeConversion::WritingFormulaXml(pXmlWriter,GetNameFormula(),L"+/ 0 314 100");
+		}
 		default:
 			break;
 		}
 	}
+	void CElementFunction::CalculatingTheLogicalHeightOrWidth(XmlUtils::CXmlWriter* pXmlWriter)
+	{
+		SMCustomShapeConversion::WritingFormulaXml(pXmlWriter,GetNameFormula(),L"*/ " + std::wstring((m_enTypeFunction == TypeElement::logheight) ? L"h":L"w") + L" 25 48 ");
+	}
+	void CElementFunction::CalculatingNumberName(std::wstring &wsNewName, std::wstring& wsOldNameFormula, unsigned int &uiNumberFormula)
+	{
+		wsNewName = wsOldNameFormula + L"." + std::to_wstring(uiNumberFormula);
+		uiNumberFormula++;
+	}
 	void CElementFunction::ConversionElement(XmlUtils::CXmlWriter* pXmlWriter, CElement *pElement, std::wstring &wsFormula)
 	{
 		if(pElement == nullptr)
@@ -742,10 +801,10 @@ namespace OdfCustomShape
 		}
 		else
 		{
-			std::wstring wsNewNameFormula = GetNameFormula() + L"." + std::to_wstring(m_uiNumberFormula);
-			m_uiNumberFormula++;
-			pElement->ConversionOOXml(pXmlWriter,wsNewNameFormula);
-			wsFormula += pElement->GetNameFormula() + L" ";
+			std::wstring wsNewName,wsOldName = GetNameFormula();
+			CElementFunction::CalculatingNumberName(wsNewName,wsOldName,m_uiNumberFormula);
+			wsFormula += wsNewName + L" ";
+			pElement->ConversionOOXml(pXmlWriter,wsNewName);
 		}
 	}
 	void CElementFunction::ConvertBracketsForTrigonometry(XmlUtils::CXmlWriter* pXmlWriter, std::wstring& wsFormula)
diff --git a/OdfFile/Reader/Converter/SMCustomShape2OOXML/smcustomshapepars.h b/OdfFile/Reader/Converter/SMCustomShape2OOXML/smcustomshapepars.h
index 6d64e566ec..cbe9a86158 100644
--- a/OdfFile/Reader/Converter/SMCustomShape2OOXML/smcustomshapepars.h
+++ b/OdfFile/Reader/Converter/SMCustomShape2OOXML/smcustomshapepars.h
@@ -64,6 +64,9 @@ namespace OdfCustomShape
 		If,
 		atan,
 		atan2,
+		logwidth,
+		logheight,
+		pi,
 		empty,
 		comma,
 	};
@@ -192,6 +195,8 @@ namespace OdfCustomShape
 		void ConversionElement(XmlUtils::CXmlWriter* pXmlWriter,CElement* pElement, std::wstring& wsFormula);
 		static TypeElement TypeCheckingByFunction(const std::wstring& wsFunction);
 		void ConvertBracketsForTrigonometry(XmlUtils::CXmlWriter *pXmlWriter, std::wstring &wsFormula);
+		void CalculatingTheLogicalHeightOrWidth(XmlUtils::CXmlWriter* pXmlWriter);
+		static void CalculatingNumberName(std::wstring& wsNewName, std::wstring& wsOldNameFormula, unsigned int& uiNumberFormula);
 	private:
 		TypeElement m_enTypeFunction;
 		CElement* m_pValue;
diff --git a/OdfFile/Reader/Converter/StarMath2OOXML/cooxml2odf.cpp b/OdfFile/Reader/Converter/StarMath2OOXML/cooxml2odf.cpp
index 492bcb2041..949da7ec1c 100644
--- a/OdfFile/Reader/Converter/StarMath2OOXML/cooxml2odf.cpp
+++ b/OdfFile/Reader/Converter/StarMath2OOXML/cooxml2odf.cpp
@@ -324,21 +324,17 @@ namespace StarMath
 			m_pXmlWrite->WriteNodeBegin(L"mtable",false);
 			m_pXmlWrite->WriteNodeBegin(L"mtr",false);
 			m_pXmlWrite->WriteNodeBegin(L"mtd",false);
-			m_wsAnnotationStarMath += L"{ ";
-			ConversionVectorWritingElement(pMf->m_oNum.GetPointer()->m_arrItems);
+			CheckVectorElementsForMf(pMf->m_oNum.GetPointer()->m_arrItems);
 			COOXml2Odf::ComparisonSizeByWidth(stFrac,m_stSize);
 			m_stSize.Zeroing();
-			m_wsAnnotationStarMath += L"} ";
 			m_pXmlWrite->WriteNodeEnd(L"mtd",false,false);
 			m_pXmlWrite->WriteNodeEnd(L"mtr",false,false);
 			m_pXmlWrite->WriteNodeBegin(L"mtr",false);
 			m_pXmlWrite->WriteNodeBegin(L"mtd",false);
-			m_wsAnnotationStarMath += L"{ ";
-			ConversionVectorWritingElement(pMf->m_oDen.GetPointer()->m_arrItems);
+			CheckVectorElementsForMf(pMf->m_oDen.GetPointer()->m_arrItems);
 			COOXml2Odf::ComparisonSizeByWidth(stFrac,m_stSize);
 			COOXml2Odf::ComparisonSizeByHeight(stStart,stFrac);
 			m_stSize = stStart;
-			m_wsAnnotationStarMath += L"} ";
 			m_pXmlWrite->WriteNodeEnd(L"mtd",false,false);
 			m_pXmlWrite->WriteNodeEnd(L"mtr",false,false);
 			m_pXmlWrite->WriteNodeEnd(L"mtable",false,false);
@@ -349,41 +345,37 @@ namespace StarMath
 			if(stPr.m_wsTypeName == L"skw")
 			{
 				m_pXmlWrite->WriteAttribute(L"bevelled",L"true");
-				m_pXmlWrite->WriteNodeEnd(L"w",true,true);
-				m_wsAnnotationStarMath += L"{ ";
-				ConversionVectorWritingElement(pMf->m_oNum.GetPointer()->m_arrItems);
+				m_pXmlWrite->WriteNodeEnd(L"w",true,false);
+				CheckVectorElementsForMf(pMf->m_oNum.GetPointer()->m_arrItems);
 				COOXml2Odf::ComparisonSizeByWidth(stFrac,m_stSize);
 				m_stSize.Zeroing();
-				m_wsAnnotationStarMath += L"} wideslash { ";
-				ConversionVectorWritingElement(pMf->m_oDen.GetPointer()->m_arrItems);
+				m_wsAnnotationStarMath += L"wideslash ";
+				CheckVectorElementsForMf(pMf->m_oDen.GetPointer()->m_arrItems);
 				COOXml2Odf::ComparisonSizeByWidth(stFrac,m_stSize);
 				COOXml2Odf::ComparisonSizeByHeight(stStart,stFrac);
 				m_stSize = stStart;
-				m_wsAnnotationStarMath += L"} ";
 			}
 			else
 			{
 				m_pXmlWrite->WriteNodeEnd(L"w",true,false);
-				m_wsAnnotationStarMath += L"{ ";
-				ConversionVectorWritingElement(pMf->m_oNum.GetPointer()->m_arrItems);
+				CheckVectorElementsForMf(pMf->m_oNum.GetPointer()->m_arrItems);
 				COOXml2Odf::ComparisonSizeByWidth(stFrac,m_stSize);
 				m_stSize.Zeroing();
-				m_wsAnnotationStarMath += L"} over { ";
-				ConversionVectorWritingElement(pMf->m_oDen.GetPointer()->m_arrItems);
+				m_wsAnnotationStarMath += L"over ";
+				CheckVectorElementsForMf(pMf->m_oDen.GetPointer()->m_arrItems);
 				COOXml2Odf::ComparisonSizeByWidth(stFrac,m_stSize);
 				COOXml2Odf::ComparisonSizeByHeight(stStart,stFrac);
 				m_stSize = stStart;
-				m_wsAnnotationStarMath += L"} ";
 			}
 			m_pXmlWrite->WriteNodeEnd(L"mfrac",false,false);
 		}
 		else
 		{
 			m_pXmlWrite->WriteNodeBegin(L"mrow",false);
-			ConversionVectorWritingElement(pMf->m_oNum.GetPointer()->m_arrItems);
+			CheckVectorElementsForMf(pMf->m_oNum.GetPointer()->m_arrItems);
 			RecordingMoNode(L"/",m_pXmlWrite);
 			m_wsAnnotationStarMath += L"/ ";
-			ConversionVectorWritingElement(pMf->m_oDen.GetPointer()->m_arrItems);
+			CheckVectorElementsForMf(pMf->m_oDen.GetPointer()->m_arrItems);
 			COOXml2Odf::ComparisonSizeByHeight(m_stSize,stStart);
 			m_pXmlWrite->WriteNodeEnd(L"mrow",false,false);
 		}
@@ -542,7 +534,7 @@ namespace StarMath
 		}
 		m_wsAnnotationStarMath += L"_ {";
 		ConversionVectorWritingElement(pSub->m_arrItems);
-		stFrac.m_iHeight += m_stSize.m_iHeight;
+		stFrac.m_iHeight += m_stSize.m_iHeight - 0.5;
 		stFrac.m_iWidth += m_stSize.m_iWidth;
 		ComparisonSizeByHeight(stStart,stFrac);
 		m_stSize = stStart;
@@ -580,7 +572,7 @@ namespace StarMath
 		}
 		m_wsAnnotationStarMath+= L"^ {";
 		ConversionVectorWritingElement(pSup->m_arrItems);
-		stFrac.m_iHeight += m_stSize.m_iHeight;
+		stFrac.m_iHeight += m_stSize.m_iHeight - 0.5;
 		stFrac.m_iWidth += m_stSize.m_iWidth;
 		ComparisonSizeByHeight(stStart,stFrac);
 		m_stSize = stStart;
@@ -821,7 +813,7 @@ namespace StarMath
 			m_pXmlWrite->WriteNodeEnd(L"mo",false,false);
 		}
 		m_pXmlWrite->WriteNodeEnd(L"mover",false,false);
-		m_stSize.m_iHeight += 1;
+		m_stSize.m_iHeight += 0.5;
 	}
 	void COOXml2Odf::ConversionFunc(OOX::Logic::CFunc *pFunc)
 	{
@@ -1050,6 +1042,17 @@ namespace StarMath
 		else
 			return false;
 	}
+	void COOXml2Odf::CheckVectorElementsForMf(std::vector<OOX::WritingElement*> arWrElement)
+	{
+		if(!arWrElement.empty())
+		{
+			m_wsAnnotationStarMath += L"{ ";
+			ConversionVectorWritingElement(arWrElement);
+			m_wsAnnotationStarMath += L"} ";
+		}
+		else
+			COOXml2Odf::EmptyBlock(m_pXmlWrite,m_wsAnnotationStarMath,m_stSize);
+	}
 	TFormulaSize COOXml2Odf::GetFormulaSize()
 	{
 		return m_stSize;
@@ -1339,7 +1342,7 @@ namespace StarMath
 			m_wsAnnotationStarMath.clear();
 			m_wsAnnotationStarMath += L"{ ";
 			ConversionDeg(pRad->m_oDeg.GetPointer());
-			stFrac.m_iHeight += m_stSize.m_iHeight;
+			stFrac.m_iHeight += m_stSize.m_iHeight - 0.5;
 			stFrac.m_iWidth += m_stSize.m_iWidth;
 			ComparisonSizeByHeight(stStart,stFrac);
 			m_stSize = stStart;
@@ -1655,8 +1658,6 @@ namespace StarMath
 	}
 	void COOXml2Odf::StyleClosing(const StStyleMenClose &stStyle, XmlUtils::CXmlWriter *pXmlWrite)
 	{
-		if(stStyle.m_bMenClose)
-			pXmlWrite->WriteNodeEnd(L"menclose",false,false);
 		if(stStyle.m_bUnderlineClose)
 		{
 			pXmlWrite->WriteNodeBegin(L"mo",false);
@@ -1664,6 +1665,8 @@ namespace StarMath
 			pXmlWrite->WriteNodeEnd(L"mo",false,false);
 			pXmlWrite->WriteNodeEnd(L"munder",false,false);
 		}
+		if(stStyle.m_bMenClose)
+			pXmlWrite->WriteNodeEnd(L"menclose",false,false);
 		if(stStyle.m_iStyle != 0)
 		{
 			unsigned int k(0);
diff --git a/OdfFile/Reader/Converter/StarMath2OOXML/cooxml2odf.h b/OdfFile/Reader/Converter/StarMath2OOXML/cooxml2odf.h
index 87d4ff8fe4..be98268bcf 100644
--- a/OdfFile/Reader/Converter/StarMath2OOXML/cooxml2odf.h
+++ b/OdfFile/Reader/Converter/StarMath2OOXML/cooxml2odf.h
@@ -146,6 +146,7 @@ namespace StarMath
 		void CreateAttribute(StValuePr*& pAttribute);
 		StarMath::TypeFont FontCheck(const std::wstring& wsFont, bool& bAttribute);
 		static bool ColorCheck(const std::wstring& wsColor,std::wstring& wsRecordColor);
+		void CheckVectorElementsForMf(std::vector<OOX::WritingElement*> arWrElement);
 		TFormulaSize GetFormulaSize();
 		void EndOdf();
 		std::wstring GetOdf();
diff --git a/OdfFile/Reader/Converter/docx_conversion_context.cpp b/OdfFile/Reader/Converter/docx_conversion_context.cpp
index fcfe29782e..eb7eff2c8a 100644
--- a/OdfFile/Reader/Converter/docx_conversion_context.cpp
+++ b/OdfFile/Reader/Converter/docx_conversion_context.cpp
@@ -2435,7 +2435,7 @@ bool docx_conversion_context::set_master_page_name(const std::wstring & MasterPa
 {
 	if (current_master_page_name_ == MasterPageName) return false;
 
-    current_master_page_name_ = MasterPageName;
+    current_master_page_name_ = MasterPageName; 
 	return true;
 }
 
diff --git a/OdfFile/Reader/Converter/docx_drawing.cpp b/OdfFile/Reader/Converter/docx_drawing.cpp
index dffd89fe71..ed51a24894 100644
--- a/OdfFile/Reader/Converter/docx_drawing.cpp
+++ b/OdfFile/Reader/Converter/docx_drawing.cpp
@@ -296,8 +296,8 @@ void docx_serialize_image_child(std::wostream & strm, _docx_drawing & val)
 						CP_XML_ATTR(L"id", val.id + 1);
 						CP_XML_ATTR(L"name", val.name);
 
-						CP_XML_ATTR_OPT(L"title", title);
-						CP_XML_ATTR_OPT(L"descr", descr);
+						CP_XML_ATTR_OPT_ENCODE_STRING(L"title", title);
+						CP_XML_ATTR_OPT_ENCODE_STRING(L"descr", descr);
 					
 						//oox_serialize_action(CP_XML_STREAM(), val.action);
 					}
@@ -413,8 +413,8 @@ void docx_serialize_common(std::wostream & strm, _docx_drawing & val)
 			CP_XML_ATTR(L"name",	val.name);
 			CP_XML_ATTR(L"id",		0xf000 + val.id + 1);
 
-			CP_XML_ATTR_OPT(L"title", title);
-			CP_XML_ATTR_OPT(L"descr", descr);
+			CP_XML_ATTR_OPT_ENCODE_STRING(L"title", title);
+			CP_XML_ATTR_OPT_ENCODE_STRING(L"descr", descr);
 			
 			oox_serialize_action(CP_XML_STREAM(), val.action);
 		}
diff --git a/OdfFile/Reader/Converter/drawing_object_description.h b/OdfFile/Reader/Converter/drawing_object_description.h
index 692fb11fd6..38e9cc66d8 100644
--- a/OdfFile/Reader/Converter/drawing_object_description.h
+++ b/OdfFile/Reader/Converter/drawing_object_description.h
@@ -81,7 +81,6 @@ struct drawing_object_description
 	std::vector<odf_reader::_property>		additional_;	//shape properties
 	
 	std::wstring							xlink_href_;	//ссылка на внешний объект
-	std::wstring							clipping_string_;
 
 	_oox_fill								fill_;
 
diff --git a/OdfFile/Reader/Converter/oox_drawing.cpp b/OdfFile/Reader/Converter/oox_drawing.cpp
index 94e460aa99..89c4ab64bf 100644
--- a/OdfFile/Reader/Converter/oox_drawing.cpp
+++ b/OdfFile/Reader/Converter/oox_drawing.cpp
@@ -384,21 +384,50 @@ void oox_serialize_ln(std::wostream & strm, const std::vector<odf_reader::_prope
 			}
 			if (fill != ns + L":noFill")
 			{
-				_CP_OPT(std::wstring)	strVal;
+				_CP_OPT(std::wstring) strVal;
 
 				if (dash_style.length() > 0 && dash_style != L"solid")
 				{
-					CP_XML_NODE(ns + L":prstDash"){CP_XML_ATTR2(ns_att + L"val", dash_style);}	
+					CP_XML_NODE(ns + L":prstDash")
+					{
+						CP_XML_ATTR2(ns_att + L"val", dash_style);
+					}	
 				}
 				odf_reader::GetProperty(prop,L"marker-start", strVal);	
 				if (strVal)
 				{
-					CP_XML_NODE(ns + L":headEnd"){CP_XML_ATTR2(ns_att + L"type", strVal.get());}
+					CP_XML_NODE(ns + L":headEnd") 
+					{
+						CP_XML_ATTR2(ns_att + L"type", strVal.get());
+						_CP_OPT(double) dWidth;
+						odf_reader::GetProperty(prop, L"marker-start-width", dWidth);
+						if (dWidth && dStrokeWidth)
+						{
+							double kf = *dWidth / *dStrokeWidth;
+							
+							if (kf > 3.5) CP_XML_ATTR2(ns_att + L"w", L"lg");
+							else if (kf < 2.6) CP_XML_ATTR2(ns_att + L"w", L"sm");
+							else CP_XML_ATTR2(ns_att + L"w", L"med");
+						}
+					}
 				}
-				odf_reader::GetProperty(prop,L"marker-end",strVal);	
+				odf_reader::GetProperty(prop,L"marker-end", strVal);	
 				if (strVal)
 				{
-					CP_XML_NODE(ns + L":tailEnd"){CP_XML_ATTR2(ns_att + L"type",strVal.get());}
+					CP_XML_NODE(ns + L":tailEnd")
+					{
+						CP_XML_ATTR2(ns_att + L"type", strVal.get());
+						_CP_OPT(double) dWidth;
+						odf_reader::GetProperty(prop, L"marker-start-width", dWidth);
+						if (dWidth && dStrokeWidth)
+						{
+							double kf = *dWidth / *dStrokeWidth;
+							
+							if (kf > 3.5) CP_XML_ATTR2(ns_att + L"w", L"lg");
+							else if (kf < 2.6) CP_XML_ATTR2(ns_att + L"w", L"sm");
+							else CP_XML_ATTR2(ns_att + L"w", L"med");
+						}
+					}
 				}
 			}
 		}
@@ -768,7 +797,7 @@ void _oox_drawing::serialize_shape(std::wostream & strm)
 				
 				if (sCustomEquations)
 				{
-					CP_XML_STREAM() << *sCustomEquations;
+					CP_XML_STREAM() << L"<a:gdLst>" << *sCustomEquations << L"</a:gdLst>";
 				}
 				CP_XML_NODE(L"a:rect")
 				{
diff --git a/OdfFile/Reader/Converter/oox_drawing_fills.cpp b/OdfFile/Reader/Converter/oox_drawing_fills.cpp
index 18701ae8b9..c3c373613f 100644
--- a/OdfFile/Reader/Converter/oox_drawing_fills.cpp
+++ b/OdfFile/Reader/Converter/oox_drawing_fills.cpp
@@ -37,7 +37,7 @@
 namespace cpdoccore {
 namespace oox {
 
-	oox_bitmap_fill::oox_bitmap_fill() : name_space(L"a"), bStretch(false), bCrop(false), bTile(false), isInternal(true)
+	oox_bitmap_fill::oox_bitmap_fill() : name_space(L"a"), bStretch(true), bCrop(false), bTile(false), isInternal(true)
 	{
 		memset(cropRect, 0, sizeof(double)*4);
 	}
@@ -163,10 +163,9 @@ void oox_serialize_bitmap_fill(std::wostream & strm, const _oox_fill & val, cons
 
 	CP_XML_WRITER(strm)
 	{
-		CP_XML_NODE(std::wstring(val.bitmap->name_space + L":blipFill"))
+		CP_XML_NODE(val.bitmap->name_space + L":blipFill")
 		{
-			//if (val.bitmap->rotate)	CP_XML_ATTR(ns + L":rotWithShape",*(val.bitmap->rotate));
-			//else CP_XML_ATTR(ns + L":rotWithShape",1);
+			CP_XML_ATTR2(ns_att + L"rotWithShape", false);
 
 			if (val.bitmap->dpi)	
 			{
@@ -241,10 +240,16 @@ void oox_serialize_bitmap_fill(std::wostream & strm, const _oox_fill & val, cons
 			}
 			if (val.bitmap->bTile)
 			{
+				if (!val.bitmap->bCrop)
+				{
+					CP_XML_NODE(ns + L":srcRect");
+				}
 				CP_XML_NODE(ns + L":tile")
 				{
-					//tx="0" ty="0" sx="100000" sy="100000"
-					CP_XML_ATTR2(ns_att + L"flip", "none");
+					CP_XML_ATTR2(ns_att + L"tx", 0);
+					CP_XML_ATTR2(ns_att + L"ty", 0);
+					CP_XML_ATTR2(ns_att + L"sx", (int)(val.bitmap->sx.get_value_or(100) * 1000));
+					CP_XML_ATTR2(ns_att + L"sy", (int)(val.bitmap->sy.get_value_or(100) * 1000));
 					CP_XML_ATTR2(ns_att + L"algn", L"ctr");
 				}
 			}
@@ -254,7 +259,16 @@ void oox_serialize_bitmap_fill(std::wostream & strm, const _oox_fill & val, cons
 				{
 					if (!val.bitmap->bCrop)
 					{
-						CP_XML_NODE(ns + L":fillRect");
+						CP_XML_NODE(ns + L":fillRect")
+						{
+							if (val.bitmap->sx && val.bitmap->sy)
+							{ //todooo focus
+								CP_XML_ATTR2(ns_att + L"l", (int)((100 - *val.bitmap->sx) / 2 * 1000));
+								CP_XML_ATTR2(ns_att + L"t", (int)((100 - *val.bitmap->sy) / 2 * 1000));
+								CP_XML_ATTR2(ns_att + L"r", (int)((100 - *val.bitmap->sx) / 2 * 1000));
+								CP_XML_ATTR2(ns_att + L"b", (int)((100 - *val.bitmap->sy) / 2 * 1000));
+							}
+						}
 					}
 				}
 			}	
diff --git a/OdfFile/Reader/Converter/oox_drawing_fills.h b/OdfFile/Reader/Converter/oox_drawing_fills.h
index bd6ee4e1dd..631d24fba8 100644
--- a/OdfFile/Reader/Converter/oox_drawing_fills.h
+++ b/OdfFile/Reader/Converter/oox_drawing_fills.h
@@ -66,9 +66,17 @@ namespace oox {
 		bool			bStretch;
 		bool			bCrop;
 		bool			bTile;
-
-		double			cropRect[4];//0-left, 1 -top, 2- right, 3 - bottom
 		
+		_CP_OPT(double)	sx;
+		_CP_OPT(double)	sy;
+		_CP_OPT(double)	sx_pt;
+		_CP_OPT(double)	sy_pt;
+
+		double cropRect[4]; //0-left, 1 -top, 2- right, 3 - bottom
+		
+		_CP_OPT(int) width;
+		_CP_OPT(int) height;
+
 		_CP_OPT(int) dpi;
 		_CP_OPT(bool) rotate;
 
@@ -131,11 +139,14 @@ namespace oox {
 		_CP_OPT(double) opacity;
 		_CP_OPT(double) image_opacity;
 
+		std::wstring clipping;
+
 		void clear()
 		{
 			type = -1;
 			opacity = boost::none;
 			image_opacity = boost::none;
+			clipping.clear();
 
 			gradient.reset();
 			hatch.reset();
diff --git a/OdfFile/Reader/Converter/pptx_conversion_context.h b/OdfFile/Reader/Converter/pptx_conversion_context.h
index 6dcaf6e116..f208f185d7 100644
--- a/OdfFile/Reader/Converter/pptx_conversion_context.h
+++ b/OdfFile/Reader/Converter/pptx_conversion_context.h
@@ -130,6 +130,7 @@ public:
 	oox_chart_context	& current_chart();
 	math_context		& get_math_context()	{ return math_context_; }
 	pptx_text_context	& get_text_context()	{ return pptx_text_context_; }
+	forms_context		& get_forms_context()	{ return forms_context_; }
 
 	pptx_table_context	& get_table_context()	{ return pptx_table_context_; }
 
@@ -166,7 +167,8 @@ private:
 	pptx_table_context		pptx_table_context_;
 	pptx_comments_context	pptx_comments_context_;
 	math_context			math_context_;
-	
+	forms_context			forms_context_;
+
 	std::vector<oox_chart_context_ptr> charts_;
 	
 	std::vector<pptx_xml_slide_ptr>			slides_;
diff --git a/OdfFile/Reader/Converter/pptx_drawing.cpp b/OdfFile/Reader/Converter/pptx_drawing.cpp
index 5db497eedd..3182caa64b 100644
--- a/OdfFile/Reader/Converter/pptx_drawing.cpp
+++ b/OdfFile/Reader/Converter/pptx_drawing.cpp
@@ -444,7 +444,44 @@ void pptx_serialize_table(std::wostream & strm, _pptx_drawing & val)
 		} // p:graphicFrame
     }  // CP_XML_WRITER  
 }
+void pptx_serialize_control(std::wostream& strm, _pptx_drawing& val)
+{
+	val.fill.type = 0;
 
+	CP_XML_WRITER(strm)
+	{
+		CP_XML_NODE(L"p:sp")
+		{
+			CP_XML_NODE(L"p:nvSpPr")
+			{
+				CP_XML_NODE(L"p:cNvPr")
+				{
+					CP_XML_ATTR(L"id", val.id);//числовое значение val.rId
+					CP_XML_ATTR(L"name", val.name);
+					if (val.hidden) CP_XML_ATTR(L"hidden", true);
+
+					oox_serialize_action(CP_XML_STREAM(), val.action);
+				}
+				CP_XML_NODE(L"p:cNvSpPr")//non visual properies (собственно тока 1 там)
+				{
+					CP_XML_ATTR(L"txBox", 1);
+				}
+				CP_XML_NODE(L"p:nvPr")
+				{
+				}
+			}
+			CP_XML_NODE(L"p:spPr")
+			{
+				val.serialize_xfrm(CP_XML_STREAM(), L"a", true);
+				val.serialize_shape(CP_XML_STREAM());
+
+				oox_serialize_ln(CP_XML_STREAM(), val.additional);
+				oox_serialize_effects(CP_XML_STREAM(), val.additional);
+			}
+			pptx_serialize_text(CP_XML_STREAM(), val);
+		}
+	}  // CP_XML_WRITER  
+}
 
 void pptx_serialize_object(std::wostream & strm, _pptx_drawing & val)
 {
@@ -490,7 +527,36 @@ void pptx_serialize_object(std::wostream & strm, _pptx_drawing & val)
     }  // CP_XML_WRITER  
 }
 
-
+//void _xlsx_drawing::serialize_control(std::wostream& strm)
+//{
+//	if (type != typeControl) return;
+//	CP_XML_WRITER(strm)
+//	{
+//		CP_XML_NODE(L"control")
+//		{
+//			CP_XML_ATTR(L"r:id", objectId);
+//			CP_XML_ATTR(L"shapeId", id);
+//			//CP_XML_ATTR(L"name",	objectProgId);
+//
+//			CP_XML_NODE(L"controlPr")
+//			{
+//				CP_XML_ATTR(L"defaultSize", 0);
+//				if (fill.bitmap)
+//				{
+//					CP_XML_ATTR(L"r:id", fill.bitmap->rId);
+//				}
+//				CP_XML_NODE(L"anchor")
+//				{
+//					CP_XML_ATTR(L"moveWithCells", 1);
+//
+//					from_.serialize(CP_XML_STREAM(), L"", L"xdr");
+//					to_.serialize(CP_XML_STREAM(), L"", L"xdr");
+//
+//				}
+//			}
+//		}
+//	}
+//}
 void _pptx_drawing::serialize(std::wostream & strm)
 {
 	if (type == typeShape)
@@ -516,6 +582,10 @@ void _pptx_drawing::serialize(std::wostream & strm)
 	{
 		pptx_serialize_object(strm, *this);
 	}
+	else if (type == typeControl)
+	{
+		pptx_serialize_control(strm, *this);
+	}
 	else if (type == typeMedia || type == typeAudio || type == typeVideo )
 	{
 		pptx_serialize_media(strm, *this);
diff --git a/OdfFile/Reader/Converter/pptx_drawings.cpp b/OdfFile/Reader/Converter/pptx_drawings.cpp
index b60312ccc2..b6eace5077 100644
--- a/OdfFile/Reader/Converter/pptx_drawings.cpp
+++ b/OdfFile/Reader/Converter/pptx_drawings.cpp
@@ -142,7 +142,8 @@ public:
 			if (pptx_drawing_rels_[i].type == typeUnknown		|| 
 				pptx_drawing_rels_[i].type == typeTable			||
 				pptx_drawing_rels_[i].type == typeShape			||
-				pptx_drawing_rels_[i].type == typeGroupShape)	continue;
+				pptx_drawing_rels_[i].type == typeGroupShape || 
+				pptx_drawing_rels_[i].type == typeControl)	continue;
 
 			if (pptx_drawing_rels_[i].type == typeComment)
 			{
diff --git a/OdfFile/Reader/Converter/pptx_slide_context.cpp b/OdfFile/Reader/Converter/pptx_slide_context.cpp
index 5ff30d2630..31e9333c12 100644
--- a/OdfFile/Reader/Converter/pptx_slide_context.cpp
+++ b/OdfFile/Reader/Converter/pptx_slide_context.cpp
@@ -170,10 +170,10 @@ public:
 	std::wstring  odfPacket_;
     
 	void process_drawings();
+	void process_crop(_oox_fill& fill, const std::wstring& filename);
 
 private:
 	void process_common_properties(drawing_object_description& obj, _pptx_drawing & drawing);
-	void process_crop(const drawing_object_description& obj, _pptx_drawing& drawing, const std::wstring& filename);
 
 	void process_shape	(drawing_object_description& obj, _pptx_drawing & drawing);
     void process_image	(drawing_object_description& obj, _pptx_drawing & drawing);
@@ -181,6 +181,7 @@ private:
 	void process_table	(drawing_object_description& obj, _pptx_drawing & drawing);
 	void process_object	(drawing_object_description& obj, _pptx_drawing & drawing);
 	void process_media	(drawing_object_description& obj, _pptx_drawing & drawing);
+	void process_control(drawing_object_description& obj, _pptx_drawing& drawing);
 	
 	size_t				rId_;
 	mediaitems_ptr		mediaitems_;
@@ -209,6 +210,7 @@ void pptx_slide_context::Impl::process_drawings()
 			case typeShape:			process_shape(objects_[i], drawing);	break;
 			case typeTable:			process_table(objects_[i], drawing);	break;
 			case typeMedia:			process_media(objects_[i], drawing);	break;
+			case typeControl:		process_control(objects_[i], drawing);	break;
 			case typePDF:
 			case typeMsObject:	
 			case typeOleObject:		process_object(objects_[i], drawing);	break;
@@ -289,7 +291,6 @@ void pptx_slide_context::default_set()
 
 	impl_->object_description_.additional_.clear();
 	
-	impl_->object_description_.clipping_string_= L"";
 	impl_->object_description_.svg_rect_	= boost::none;
 	impl_->object_description_.connector_	= false;
 	impl_->object_description_.lined_		= false;
@@ -398,11 +399,6 @@ std::vector<odf_reader::_property> & pptx_slide_context::get_properties()
 {
 	return impl_->object_description_.additional_;
 }
-
-void pptx_slide_context::set_clipping(const std::wstring & str)
-{
-	impl_->object_description_.clipping_string_= str;
-}
 void pptx_slide_context::set_fill(_oox_fill & fill)
 {
 	impl_->object_description_.fill_= fill;
@@ -474,7 +470,11 @@ void pptx_slide_context::add_background(_oox_fill & fill)
 		
 		fill.bitmap->rId = get_mediaitems()->add_or_find(fill.bitmap->xlink_href_, typeImage, isMediaInternal, ref, oox::document_place);
 		add_rels(isMediaInternal, fill.bitmap->rId, ref, typeImage);
-	}	
+		
+		std::wstring fileName = impl_->odfPacket_ + FILE_SEPARATOR_STR + fill.bitmap->xlink_href_;
+
+		impl_->process_crop(fill, fileName);
+	}
 	impl_->background_fill_ = fill;
 }
 
@@ -673,7 +673,7 @@ bool pptx_slide_context::start_frame()
 
 void pptx_slide_context::set_chart(const std::wstring & path)
 {
-	impl_->object_description_.type_		= typeChart;
+	impl_->object_description_.type_ = typeChart;
 	impl_->object_description_.xlink_href_	= path; 
 }
 
@@ -687,7 +687,18 @@ void pptx_slide_context::end_frame()
 		default_set();
 	}
 }
+void pptx_slide_context::start_control(const std::wstring& ctrlPropId, int type)
+{
+	impl_->object_description_.type_ = typeControl;
+	impl_->object_description_.shape_type_ = type; // object type for vml 
 
+	impl_->object_description_.xlink_href_ = ctrlPropId;
+}
+void pptx_slide_context::end_control()
+{
+	impl_->objects_.push_back(impl_->object_description_);
+	default_set();
+}
 
 void pptx_slide_context::end_shape()
 {
@@ -735,7 +746,7 @@ void pptx_slide_context::Impl::process_image(drawing_object_description& obj, _p
 	}
 
 	std::wstring fileName = odfPacket_ + FILE_SEPARATOR_STR + obj.xlink_href_;			
-	process_crop(obj, drawing, fileName);
+	process_crop(drawing.fill, fileName);
 	
 ///////////////////////////////////////////////////////////////////////////////////////////////////			
 	std::wstring ref;/// это ссылка на выходной внешний объект
@@ -778,7 +789,25 @@ void pptx_slide_context::Impl::process_table(drawing_object_description & obj, _
 	add_drawing(drawing, isMediaInternal, rId, ref, drawing.type);
 
 }
+void pptx_slide_context::Impl::process_control(drawing_object_description& obj, _pptx_drawing& drawing)
+{
+	std::wstring ref;
+	bool isMediaInternal = true;
+	if (drawing.fill.bitmap)
+	{
+		drawing.fill.bitmap->rId = get_mediaitems()->add_or_find(drawing.fill.bitmap->xlink_href_, typeImage, isMediaInternal, ref, oox::document_place);
 
+		add_additional_rels(isMediaInternal, drawing.fill.bitmap->rId, ref, typeImage);
+
+		std::wstring fileName = odfPacket_ + FILE_SEPARATOR_STR + drawing.fill.bitmap->xlink_href_;
+		process_crop(drawing.fill, fileName);
+	}
+
+	std::wstring rId = get_mediaitems()->add_or_find(L"", obj.type_, isMediaInternal, ref, oox::document_place);
+
+	add_drawing(drawing, isMediaInternal, rId, ref, drawing.type);
+
+}
 void pptx_slide_context::Impl::process_shape(drawing_object_description & obj, _pptx_drawing & drawing)
 {
 	int PlaceHolderIndex = 1;
@@ -793,7 +822,7 @@ void pptx_slide_context::Impl::process_shape(drawing_object_description & obj, _
 		add_additional_rels(isMediaInternal, drawing.fill.bitmap->rId, ref, typeImage);
 
 		std::wstring fileName = odfPacket_ + FILE_SEPARATOR_STR + drawing.fill.bitmap->xlink_href_;
-		process_crop(obj, drawing, fileName);
+		process_crop(drawing.fill, fileName);
 	}
 		
 	std::wstring rId = get_mediaitems()->add_or_find(L"", typeShape, isMediaInternal, ref, oox::document_place);
@@ -896,10 +925,27 @@ void pptx_slide_context::Impl::process_common_properties(drawing_object_descript
 	drawing.fill		= pic.fill_;
 }
 
-void pptx_slide_context::Impl::process_crop(const drawing_object_description& obj, _pptx_drawing& drawing, const std::wstring& filename)
-{
-	drawing.fill.bitmap->bCrop = odf_reader::parse_clipping(obj.clipping_string_, filename, drawing.fill.bitmap->cropRect, get_mediaitems()->applicationFonts());
-	drawing.fill.bitmap->bStretch = true;
+void pptx_slide_context::Impl::process_crop(_oox_fill & fill, const std::wstring& filename)
+{	
+	if (!fill.bitmap) return;
+
+	_image_file_::GetResolution(filename.c_str(), fill.bitmap->width, fill.bitmap->height, get_mediaitems()->applicationFonts());	
+
+	if (fill.bitmap->width && fill.bitmap->height)
+	{
+		fill.bitmap->bCrop = odf_reader::parse_clipping(fill.clipping, *fill.bitmap->width, *fill.bitmap->height, fill.bitmap->cropRect);
+		
+		if (fill.bitmap->sx_pt && fill.bitmap->sy_pt)
+		{
+			fill.bitmap->sx = (*fill.bitmap->sx_pt * 100. / *fill.bitmap->width) * 4 / 3;
+			fill.bitmap->sy = (*fill.bitmap->sy_pt * 100. / *fill.bitmap->height) * 4 / 3;
+		}
+	}
+
+	if (!fill.bitmap->bTile && fill.bitmap->sx && fill.bitmap->sy)
+	{
+		fill.bitmap->bStretch = true;
+	}
 }
 
 void pptx_slide_context::dump_rels(rels & Rels)
diff --git a/OdfFile/Reader/Converter/pptx_slide_context.h b/OdfFile/Reader/Converter/pptx_slide_context.h
index f7744d1e16..21fa9de67b 100644
--- a/OdfFile/Reader/Converter/pptx_slide_context.h
+++ b/OdfFile/Reader/Converter/pptx_slide_context.h
@@ -71,7 +71,6 @@ public:
 	void set_anchor		(std::wstring anchor, double x_pt, double y_pt);
 	void set_property	(odf_reader::_property p);
 	std::vector<odf_reader::_property> & get_properties();
-    void set_clipping	(const std::wstring & str );
 	void set_fill		(_oox_fill & fill);
 	void set_hidden		(bool val);
 	
@@ -102,6 +101,9 @@ public:
 		void set_media_param(std::wstring name, std::wstring value);
 	void end_frame();
 
+	void start_control(const std::wstring& ctrlPropId, int type);
+	void end_control();
+
 	void start_action	(std::wstring action);
 		void set_link	(std::wstring link, _rels_type typeRels = typeHyperlink); 
 	void end_action		();
diff --git a/OdfFile/Reader/Converter/xlsx_alignment.cpp b/OdfFile/Reader/Converter/xlsx_alignment.cpp
index a53244996e..ed9c12094d 100644
--- a/OdfFile/Reader/Converter/xlsx_alignment.cpp
+++ b/OdfFile/Reader/Converter/xlsx_alignment.cpp
@@ -185,10 +185,9 @@ xlsx_alignment OdfProperties2XlsxAlignment(	xlsx_conversion_context * context,
 
 			alignment.textRotation = angle;       //??? приоритет какой
 		}		
-		if ((cellProp->fo_wrap_option_) &&
-			(cellProp->fo_wrap_option_->get_type() == odf_types::wrap_option::Wrap))		
+		if (cellProp->fo_wrap_option_)
 		{
-			alignment.wrapText = true;
+			alignment.wrapText = cellProp->fo_wrap_option_->get_type() == odf_types::wrap_option::Wrap;
 		}
 		if (cellProp->style_shrink_to_fit_)
 		{
diff --git a/OdfFile/Reader/Converter/xlsx_drawing_context.cpp b/OdfFile/Reader/Converter/xlsx_drawing_context.cpp
index 6d4f781849..5240b5eb36 100644
--- a/OdfFile/Reader/Converter/xlsx_drawing_context.cpp
+++ b/OdfFile/Reader/Converter/xlsx_drawing_context.cpp
@@ -197,7 +197,6 @@ void xlsx_drawing_context::clear()
 	impl_->object_description_.anchor_rel_			= anchor_none;
 	impl_->object_description_.anchor_x_			= 0;
 	impl_->object_description_.anchor_y_			= 0;
-	impl_->object_description_.clipping_string_		= L"";
  	impl_->object_description_.svg_rect_			= boost::none;
  
 	impl_->object_description_.additional_.clear();
@@ -495,15 +494,10 @@ std::vector<odf_reader::_property> & xlsx_drawing_context::get_properties()
 {
 	return impl_->object_description_.additional_;
 }
-void xlsx_drawing_context::set_clipping(const std::wstring & str)
-{
-	impl_->object_description_.clipping_string_= str;
-}
 void xlsx_drawing_context::set_fill(_oox_fill & fill)
 {
 	impl_->object_description_.fill_= fill;
 }
-
 std::wstring xlsx_drawing_context::add_hyperlink(std::wstring const & href)
 {
 	++hlinks_size_;
@@ -666,9 +660,22 @@ void xlsx_drawing_context::process_image(drawing_object_description & obj, _xlsx
 	}
 	std::wstring fileName = odf_packet_path_ + FILE_SEPARATOR_STR +  obj.xlink_href_;			
 	
-	drawing.fill.bitmap->bCrop		= odf_reader::parse_clipping(obj.clipping_string_, fileName, drawing.fill.bitmap->cropRect, impl_->get_mediaitems()->applicationFonts());
-	drawing.fill.bitmap->bStretch	= true;
+	_image_file_::GetResolution(fileName.c_str(), drawing.fill.bitmap->width, drawing.fill.bitmap->height, impl_->get_mediaitems()->applicationFonts());
 
+	if (drawing.fill.bitmap->width && drawing.fill.bitmap->height)
+	{
+		drawing.fill.bitmap->bCrop = odf_reader::parse_clipping(drawing.fill.clipping, *drawing.fill.bitmap->width, *drawing.fill.bitmap->height, drawing.fill.bitmap->cropRect);
+		
+		if (drawing.fill.bitmap->sx_pt && drawing.fill.bitmap->sy_pt)
+		{
+			drawing.fill.bitmap->sx = (*drawing.fill.bitmap->sx_pt * 100. / *drawing.fill.bitmap->width) * 4 / 3;
+			drawing.fill.bitmap->sy = (*drawing.fill.bitmap->sy_pt * 100. / *drawing.fill.bitmap->height) * 4 / 3;
+		}
+	}
+	if (!drawing.fill.bitmap->bTile && drawing.fill.bitmap->sx && drawing.fill.bitmap->sy)
+	{
+		drawing.fill.bitmap->bStretch = true;
+	}
 	std::wstring ref;/// это ссылка на выходной внешний объект
 	bool isMediaInternal = false;
 
@@ -683,7 +690,8 @@ void xlsx_drawing_context::process_image(drawing_object_description & obj, _xlsx
 		
 		xlsx_drawings_->add(drawing, isMediaInternal, rId, ref, typeShape);//объект
 
-	}else
+	}
+	else
 	{
 		xlsx_drawings_->add(drawing, isMediaInternal, drawing.fill.bitmap->rId , ref, typeImage);//объект
 		
diff --git a/OdfFile/Reader/Converter/xlsx_drawing_context.h b/OdfFile/Reader/Converter/xlsx_drawing_context.h
index 8c946d8b7a..4cc9fc1822 100644
--- a/OdfFile/Reader/Converter/xlsx_drawing_context.h
+++ b/OdfFile/Reader/Converter/xlsx_drawing_context.h
@@ -127,8 +127,7 @@ public:
 	void set_anchor_start(std::wstring anchor, double x_pt, double y_pt, bool group = false);
 	void set_anchor_end	(std::wstring anchor, double x_pt, double y_pt, bool group = false);
 	
-	void set_clipping	(const std::wstring & str );
-	void set_fill		(_oox_fill & fill);
+	void set_fill(_oox_fill & fill);
 
 	void set_is_line_shape(bool val);
 	void set_is_connector_shape(bool val);
diff --git a/OdfFile/Reader/Converter/xlsx_fonts.cpp b/OdfFile/Reader/Converter/xlsx_fonts.cpp
index 734fe151fa..596fee9cdb 100644
--- a/OdfFile/Reader/Converter/xlsx_fonts.cpp
+++ b/OdfFile/Reader/Converter/xlsx_fonts.cpp
@@ -112,13 +112,14 @@ size_t xlsx_fonts::Impl::fontId(const odf_reader::text_format_properties_ptr &te
 	fonts_array_t::const_iterator i = fonts_.find(fnt);
     if (i != fonts_.end())
         return i->index;
-    else
+    else if (fnt.bEnabled)
     {
         fnt.index = fonts_.size();
         fonts_.insert(fnt);
-        //fonts_.push_back(OdfFont2XlsxFont(textProp, parProp, cellProp));
         return fnt.index;
     }
+    else
+        return 0;
 }
 
 //const xlsx_font & xlsx_fonts::Impl::getFont(size_t id) const
diff --git a/OdfFile/Reader/Format/draw_common.cpp b/OdfFile/Reader/Format/draw_common.cpp
index 44661eff30..aaa1480371 100644
--- a/OdfFile/Reader/Format/draw_common.cpp
+++ b/OdfFile/Reader/Format/draw_common.cpp
@@ -49,35 +49,47 @@
 #include "odfcontext.h"
 
 /////////////////////////////////////////////////////////////////////////////////
+#include "../../../DesktopEditor/raster/ImageFileFormatChecker.h"
 #include "../../../DesktopEditor/raster/BgraFrame.h"
 #include "../../../DesktopEditor/graphics/pro/Image.h"
 #include "../../../OOXML/Base/Unit.h"
 
 namespace _image_file_
 {
-    bool GetResolution(const wchar_t* fileName, int & Width, int &Height, NSFonts::IApplicationFonts* appFonts)
-	{
-		CBgraFrame image;
-        MetaFile::IMetaFile* meta_file = MetaFile::Create(appFonts);
+    bool GetResolution(const wchar_t* fileName, _CP_OPT(int)& Width, _CP_OPT(int)&Height, NSFonts::IApplicationFonts* appFonts)
+	{ /// todooo fast detect resolutions
+		CImageFileFormatChecker image_checker;
 
-        bool bRet = false;
-        if ( appFonts && meta_file->LoadFromFile(fileName))
+		bool bRet = false;
+		if (image_checker.isImageFile(fileName))
 		{
-			double dX = 0, dY = 0, dW = 0, dH = 0;
-            meta_file->GetBounds(&dX, &dY, &dW, &dH);
-			
-			Width  = dW;
-			Height = dH;
-		}
-		else if ( image.OpenFile(fileName, 0 ))
-		{
-			Width  = image.get_Width();
-			Height = image.get_Height();
+			if (image_checker.eFileType == _CXIMAGE_FORMAT_WMF || image_checker.eFileType == _CXIMAGE_FORMAT_EMF
+				|| image_checker.eFileType == _CXIMAGE_FORMAT_SVM)
+			{
+				MetaFile::IMetaFile* meta_file = MetaFile::Create(appFonts);
 
-            bRet = true;
-		}
+				if (appFonts && meta_file->LoadFromFile(fileName))
+				{
+					double dX = 0, dY = 0, dW = 0, dH = 0;
+					meta_file->GetBounds(&dX, &dY, &dW, &dH);
 
-        RELEASEOBJECT(meta_file);
+					Width = dW;
+					Height = dH;
+				}
+				RELEASEOBJECT(meta_file);
+			}
+			else
+			{
+				CBgraFrame image;
+				if (image.OpenFile(fileName, 0))
+				{
+					Width = image.get_Width();
+					Height = image.get_Height();
+
+					bRet = true;
+				}
+			}
+		}
         return bRet;
 	}
 
@@ -120,11 +132,11 @@ int get_value_emu(double pt)
 {
     return static_cast<int>((pt* 360000 * 2.54) / 72);
 } 
-bool parse_clipping(std::wstring strClipping,std::wstring fileName, double_4 & clip_rect, NSFonts::IApplicationFonts *appFonts)
+bool parse_clipping(std::wstring strClipping, int fileWidth, int fileHeight, double_4& clip_rect)
 {
     memset(clip_rect, 0, 4*sizeof(double));
 
-	if (strClipping.empty() || fileName.empty()) return false;
+	if (strClipping.empty()) return false;
 		
 	//<top>, <right>, <bottom>, <left> - http://www.w3.org/TR/2001/REC-xsl-20011015/xslspec.html#clip
 
@@ -144,10 +156,6 @@ bool parse_clipping(std::wstring strClipping,std::wstring fileName, double_4 & c
 
 	if (!bEnableCrop) return false;
 
-	int fileWidth = 0,fileHeight = 0;
-
-	if (!_image_file_::GetResolution(fileName.data(), fileWidth, fileHeight, appFonts) || fileWidth < 1 || fileHeight < 1)	return false;
-
 	if (Points_pt.size() > 3)//если другое количество точек .. попозже
 	{
 		float dpi_ = 96.;
@@ -514,13 +522,17 @@ void Compute_GraphicFill(const common_draw_fill_attlist & props, const office_el
 				{
 					switch(image->style_repeat_->get_type())
 					{
-						case style_repeat::Repeat	:	
+						case style_repeat::NoRepeat:
+							fill.bitmap->bTile = false;
+							fill.bitmap->bStretch = false;
+						break;
+						case style_repeat::Repeat	:
 							fill.bitmap->bTile		= true;		
 							fill.bitmap->bStretch	= false;	
 						break;
 						case style_repeat::Stretch	:	
 							fill.bitmap->bStretch	= true;	
-							fill.bitmap->bTile		= false;  //?? для background точно выключать
+							fill.bitmap->bTile		= false; 
 						break;
 					}
 				}
@@ -542,29 +554,38 @@ void Compute_GraphicFill(const common_draw_fill_attlist & props, const office_el
 					fill.bitmap->bTile		= true;		
 					fill.bitmap->bStretch	= false;	
 				break;
-				case style_repeat::Stretch	:	
-					fill.bitmap->bStretch	= true;	
+				case style_repeat::NoRepeat	:	
+					fill.bitmap->bTile		= false;
+					fill.bitmap->bStretch	= false;
+				break;
+				case style_repeat::Stretch	:
+					fill.bitmap->bStretch	= true;
 					fill.bitmap->bTile		= false;
 				break;
 			}
 		}
-		else
+		if (props.draw_fill_image_width_ && props.draw_fill_image_height_)
 		{
-			if (props.draw_fill_image_width_ && props.draw_fill_image_height_)
+			if (props.draw_fill_image_width_->get_type() == odf_types::length_or_percent::Percent &&
+				props.draw_fill_image_height_->get_type() == odf_types::length_or_percent::Percent)
 			{
-				if (props.draw_fill_image_width_->get_type() == odf_types::length_or_percent::Percent && 
-					props.draw_fill_image_height_->get_type() == odf_types::length_or_percent::Percent)
+				fill.bitmap->sx = props.draw_fill_image_width_->get_percent().get_value();
+				fill.bitmap->sy = props.draw_fill_image_height_->get_percent().get_value();
+
+				if ( !props.style_repeat_ && props.draw_fill_image_width_->get_percent().get_value() > 99.9 &&
+					props.draw_fill_image_height_->get_percent().get_value() > 99.9 &&
+					props.draw_fill_image_width_->get_percent().get_value() < 100.1 &&
+					props.draw_fill_image_height_->get_percent().get_value() < 100.1)
 				{
-					if (props.draw_fill_image_width_->get_percent().get_value()  > 99.9  && 
-						props.draw_fill_image_height_->get_percent().get_value() > 99.9  && 
-						props.draw_fill_image_width_->get_percent().get_value()  < 100.1 && 
-						props.draw_fill_image_height_->get_percent().get_value() < 100.1 )
-					{
-						fill.bitmap->bStretch	= true;
-						fill.bitmap->bTile		= false;
-					}
+					fill.bitmap->bStretch = true;
+					fill.bitmap->bTile = false;
 				}
 			}
+			else
+			{
+				fill.bitmap->sx_pt = props.draw_fill_image_width_->get_length().get_value_unit(length::pt);
+				fill.bitmap->sy_pt = props.draw_fill_image_height_->get_length().get_value_unit(length::pt);
+			}
 		}
 	}
 	if (props.draw_fill_gradient_name_)
@@ -735,7 +756,7 @@ void docx_convert_transforms(std::wstring transformStr,std::vector<odf_reader::_
 					double x_pt = Points[0].get_value_unit(length::pt);
 					double y_pt = 0;
 					
-					if (Points.size()>1) y_pt = Points[1].get_value_unit(length::pt);	//ее может не быть
+					if (Points.size() > 1) y_pt = Points[1].get_value_unit(length::pt);	//ее может не быть
 
 					//Context.get_drawing_context().set_translate(x_pt,y_pt);
 					additional.push_back(_property(L"svg:translate_x", x_pt));
diff --git a/OdfFile/Reader/Format/draw_common.h b/OdfFile/Reader/Format/draw_common.h
index a1d73409db..9e0d7d198a 100644
--- a/OdfFile/Reader/Format/draw_common.h
+++ b/OdfFile/Reader/Format/draw_common.h
@@ -49,7 +49,7 @@
 
 namespace _image_file_
 {
-    bool GetResolution(const wchar_t* fileName, int & Width, int &Height, NSFonts::IApplicationFonts *appFonts);
+    bool GetResolution(const wchar_t* fileName, _CP_OPT(int) &Width, _CP_OPT(int) &Height, NSFonts::IApplicationFonts *appFonts);
 	void GenerateZeroImage(const std::wstring & fileName);
 }
 
@@ -72,7 +72,7 @@ void Compute_GraphicFill(const odf_types::common_draw_fill_attlist & props,
 						 const office_element_ptr & style_image, odf_document *document, oox::_oox_fill & fill, bool txbx = false, bool reset_fill = true);
 
 typedef double double_4[4];
-bool parse_clipping(std::wstring strClipping, std::wstring fileName, double_4 & clip_rect, NSFonts::IApplicationFonts *appFonts);
+bool parse_clipping(std::wstring strClipping, int width, int height, double_4 & clip_rect);
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 class draw_a : public office_element_impl<draw_a>
 {  
diff --git a/OdfFile/Reader/Format/draw_frame_docx.cpp b/OdfFile/Reader/Format/draw_frame_docx.cpp
index 66b02b9150..0db0bdcd91 100644
--- a/OdfFile/Reader/Format/draw_frame_docx.cpp
+++ b/OdfFile/Reader/Format/draw_frame_docx.cpp
@@ -1289,15 +1289,30 @@ void draw_image::docx_convert(oox::docx_conversion_context & Context)
 ////////////////
 	if (properties)
 	{
-		if (properties->fo_clip_ && drawing->fill.bitmap)
+		std::wstring fileName = Context.root()->get_folder() + FILE_SEPARATOR_STR + xlink_attlist_.href_.get_value_or(L"");
+		_image_file_::GetResolution(fileName.c_str(), drawing->fill.bitmap->width, drawing->fill.bitmap->height, Context.get_mediaitems()->applicationFonts());
+
+		if (drawing->fill.bitmap->width && drawing->fill.bitmap->height)
 		{
-			std::wstring strRectClip = properties->fo_clip_.get();
-			strRectClip = strRectClip.substr(5, strRectClip.length() - 6);
-			
-			std::wstring fileName = Context.root()->get_folder() + FILE_SEPARATOR_STR + xlink_attlist_.href_.get_value_or(L"");
-			
-			drawing->fill.bitmap->bCrop = parse_clipping(strRectClip, fileName, drawing->fill.bitmap->cropRect, Context.get_mediaitems()->applicationFonts());
+			if (properties->fo_clip_)
+			{
+				std::wstring strRectClip = properties->fo_clip_.get();
+				drawing->fill.clipping = strRectClip.length() > 6 ? strRectClip.substr(5, strRectClip.length() - 6) : L"";
+
+				drawing->fill.bitmap->bCrop = odf_reader::parse_clipping(drawing->fill.clipping, *drawing->fill.bitmap->width, *drawing->fill.bitmap->height, drawing->fill.bitmap->cropRect);
+			}
+
+			if (drawing->fill.bitmap->sx_pt && drawing->fill.bitmap->sy_pt)
+			{
+				drawing->fill.bitmap->sx = (*drawing->fill.bitmap->sx_pt * 100. / *drawing->fill.bitmap->width) * 4 /3;
+				drawing->fill.bitmap->sy = (*drawing->fill.bitmap->sy_pt * 100. / *drawing->fill.bitmap->height) * 4 / 3;
+			}
 		}
+		if (!drawing->fill.bitmap->bTile && drawing->fill.bitmap->sx && drawing->fill.bitmap->sy)
+		{
+			drawing->fill.bitmap->bStretch = true;
+		}
+
 		if (properties->common_draw_fill_attlist_.draw_luminance_)
 		{
 			drawing->fill.bitmap->luminance = properties->common_draw_fill_attlist_.draw_luminance_->get_value();
@@ -1434,7 +1449,7 @@ void draw_text_box::docx_convert(oox::docx_conversion_context & Context)
 	}
 	if (auto_fit_shape)
 	{
-		drawing->additional.push_back(_property(L"text-wrap"	, 0));
+		drawing->additional.push_back(_property(L"text-wrap", 0));
 		drawing->additional.push_back(_property(L"auto-grow-height", auto_fit_shape));
 	}
 	else if (auto_fit_text)
diff --git a/OdfFile/Reader/Format/draw_frame_pptx.cpp b/OdfFile/Reader/Format/draw_frame_pptx.cpp
index 7f04c9ed60..b917360343 100644
--- a/OdfFile/Reader/Format/draw_frame_pptx.cpp
+++ b/OdfFile/Reader/Format/draw_frame_pptx.cpp
@@ -142,21 +142,21 @@ void draw_frame::pptx_convert(oox::pptx_conversion_context & Context)
 		//////////////////////////////////////////////
 		std::vector<const odf_reader::style_instance *> instances;
 
-		const std::wstring grStyleName = common_draw_attlist_.draw_style_name_.get_value_or(L"");
-		const std::wstring baseStyleName = common_presentation_attlist_.presentation_style_name_.get_value_or(L"");
+		const std::wstring drawStyleName = common_draw_attlist_.draw_style_name_.get_value_or(L"");
+		const std::wstring presentationStyleName = common_presentation_attlist_.presentation_style_name_.get_value_or(L"");
 
 		odf_reader::style_instance* grStyleInst =
-			Context.root()->odf_context().styleContainer().style_by_name(grStyleName, odf_types::style_family::Graphic, Context.process_masters_);
+			Context.root()->odf_context().styleContainer().style_by_name(drawStyleName, odf_types::style_family::Graphic, Context.process_masters_);
 
 		odf_reader::style_instance* baseStyleInst =
-			Context.root()->odf_context().styleContainer().style_by_name(baseStyleName, odf_types::style_family::Presentation, Context.process_masters_);
+			Context.root()->odf_context().styleContainer().style_by_name(presentationStyleName, odf_types::style_family::Presentation, Context.process_masters_);
 
 		if (baseStyleInst && ((!common_presentation_attlist_.presentation_user_transformed_) ||
 			((common_presentation_attlist_.presentation_user_transformed_) &&
 			(common_presentation_attlist_.presentation_user_transformed_->get() == false))))//векторная фигура презентаций 
 		{
 			style_instance * defaultStyle = Context.root()->odf_context().styleContainer().style_default_by_type(odf_types::style_family::Presentation);
-			if (defaultStyle)instances.push_back(defaultStyle);
+			if (defaultStyle) instances.push_back(defaultStyle);
 			instances.push_back(baseStyleInst);
 		}
 		else if (common_presentation_attlist_.presentation_class_)
@@ -166,7 +166,7 @@ void draw_frame::pptx_convert(oox::pptx_conversion_context & Context)
 		if (grStyleInst)//обычная векторная фигура
 		{
 			style_instance * defaultStyle = Context.root()->odf_context().styleContainer().style_default_by_type(odf_types::style_family::Graphic);
-			if (defaultStyle)instances.push_back(defaultStyle);
+			if (defaultStyle) instances.push_back(defaultStyle);
 
 			instances.push_back(grStyleInst);
 		}
@@ -182,7 +182,7 @@ void draw_frame::pptx_convert(oox::pptx_conversion_context & Context)
 			if (properties->fo_clip_)
 			{
 				std::wstring strRectClip = properties->fo_clip_.get();
-				Context.get_slide_context().set_clipping(strRectClip.substr(5, strRectClip.length() - 6));
+				fill.clipping = strRectClip.length() > 6 ? strRectClip.substr(5, strRectClip.length() - 6) : L"";
 			}
 			
 			Context.get_slide_context().set_property(odf_reader::_property(L"border_width_left", Compute_BorderWidth(properties, sideLeft)));
@@ -226,7 +226,7 @@ void draw_frame::pptx_convert(oox::pptx_conversion_context & Context)
 				Context.get_slide_context().set_is_placeHolder(is_placeholder);
 			}
 
-			if (!textStyleName.empty())
+			if (false == textStyleName.empty())
 			{
 				odf_reader::style_instance* textStyleInst =
 					Context.root()->odf_context().styleContainer().style_by_name(textStyleName, odf_types::style_family::Paragraph, Context.process_masters_);
@@ -265,15 +265,20 @@ void draw_frame::pptx_convert(oox::pptx_conversion_context & Context)
 				}
 			}
 		}
+		bool bOfficeDrawing = (Context.root()->get_office_mime_type() == 7); // office:drawing
+
+		if (bOfficeDrawing)
+		{
+			Context.get_text_context().start_base_style(drawStyleName, odf_types::style_family::Graphic);
+		}
+		else
+		{
+			Context.get_text_context().start_base_style(presentationStyleName, odf_types::style_family::Presentation);
+		}
 
 		if (office_event_listeners_) office_event_listeners_->pptx_convert(Context);
 
-		if (false == textStyleName.empty())
-			Context.get_text_context().start_base_style(textStyleName, odf_types::style_family::Paragraph);
-		else if (false == baseStyleName.empty())
-			Context.get_text_context().start_base_style(baseStyleName, odf_types::style_family::Presentation);
-		else
-			Context.get_text_context().start_base_style(grStyleName, odf_types::style_family::Graphic);
+		
 
 		oox_drawing_ = oox_drawing_ptr(new oox::_pptx_drawing());
 	}
@@ -523,7 +528,6 @@ void draw_object::pptx_convert(oox::pptx_conversion_context & Context)
 			if (!math_content.empty())
 			{
 				std::wstring text_content = L"<a:p><a14:m xmlns:a14=\"http://schemas.microsoft.com/office/drawing/2010/main\">";
-//				text_content += L"<m:oMathPara xmlns:m=\"http://schemas.openxmlformats.org/officeDocument/2006/math\">";
 				text_content += math_content;
 				text_content += L"</a14:m></a:p>";
 
diff --git a/OdfFile/Reader/Format/draw_frame_xlsx.cpp b/OdfFile/Reader/Format/draw_frame_xlsx.cpp
index d4229af0f2..4f73aef629 100644
--- a/OdfFile/Reader/Format/draw_frame_xlsx.cpp
+++ b/OdfFile/Reader/Format/draw_frame_xlsx.cpp
@@ -198,7 +198,7 @@ void draw_frame::xlsx_convert(oox::xlsx_conversion_context & Context)
 			if (properties->fo_clip_)
 			{
 				std::wstring strRectClip = properties->fo_clip_.get();
-				Context.get_drawing_context().set_clipping(strRectClip.substr(5, strRectClip.length() - 6));
+				fill.clipping = strRectClip.length() > 6 ? strRectClip.substr(5, strRectClip.length() - 6) : L"";
 			}
 
 			if (properties->style_mirror_)
@@ -413,7 +413,6 @@ void draw_object::xlsx_convert(oox::xlsx_conversion_context & Context)
 			if (!math_content.empty())
 			{
 				std::wstring text_content = L"<a:p><a14:m xmlns:a14=\"http://schemas.microsoft.com/office/drawing/2010/main\">";
-//				text_content += L"<m:oMathPara xmlns:m=\"http://schemas.openxmlformats.org/officeDocument/2006/math\">";
 				text_content += math_content;
 				text_content += L"</a14:m></a:p>";
 
@@ -421,6 +420,7 @@ void draw_object::xlsx_convert(oox::xlsx_conversion_context & Context)
 				{
 					Context.get_drawing_context().set_property(_property(L"fit-to-size", true));
 					Context.get_drawing_context().set_property(_property(L"text-content", text_content));
+					Context.get_drawing_context().set_property(_property(L"auto-grow-width", true));
 				}
 				else
 				{
diff --git a/OdfFile/Reader/Format/draw_page.cpp b/OdfFile/Reader/Format/draw_page.cpp
index 53bf71e9e7..75aa5b60a3 100644
--- a/OdfFile/Reader/Format/draw_page.cpp
+++ b/OdfFile/Reader/Format/draw_page.cpp
@@ -70,10 +70,18 @@ const wchar_t * draw_page::name = L"page";
 
 void draw_page::add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name)
 {
-	if	CP_CHECK_NAME(L"anim", L"par") 
+	if	CP_CHECK_NAME(L"anim", L"par")
+	{
 		CP_CREATE_ELEMENT(animation_);
-    else if (L"presentation" == Ns && L"notes" == Name)
-        CP_CREATE_ELEMENT(presentation_notes_); 
+	}
+	else if (L"presentation" == Ns && L"notes" == Name)
+	{
+		CP_CREATE_ELEMENT(presentation_notes_);
+	}
+	else if CP_CHECK_NAME(L"office", L"forms")
+	{
+		CP_CREATE_ELEMENT(office_forms_);
+	}
 	else
 		CP_CREATE_ELEMENT(content_);
 }
@@ -138,6 +146,10 @@ void draw_page::pptx_convert(oox::pptx_conversion_context & Context)
 
     Context.start_page(pageName, pageStyleName, layoutName, masterName);
 
+	if (office_forms_)
+	{
+		office_forms_->pptx_convert(Context);
+	}
 	if (attlist_.draw_style_name_)
 	{
 		style_instance * style_inst = Context.root()->odf_context().styleContainer().style_by_name(pageStyleName,style_family::DrawingPage, false);
@@ -150,6 +162,7 @@ void draw_page::pptx_convert(oox::pptx_conversion_context & Context)
 			{				
 				oox::_oox_fill fill;
 				Compute_GraphicFill(properties->content().common_draw_fill_attlist_, office_element_ptr(), Context.root(), fill);
+
 				Context.get_slide_context().add_background(fill);
 
 				bool is_page_visible = properties->content().presentation_visibility_.get_value_or(presentation_visibility::visible).get_type() == presentation_visibility::visible;
diff --git a/OdfFile/Reader/Format/draw_page.h b/OdfFile/Reader/Format/draw_page.h
index 0d8c08b5e3..3efbefdab9 100644
--- a/OdfFile/Reader/Format/draw_page.h
+++ b/OdfFile/Reader/Format/draw_page.h
@@ -74,6 +74,7 @@ public:
 	office_element_ptr_array	content_;
 	office_element_ptr			animation_;
 	office_element_ptr			presentation_notes_;
+    office_element_ptr			office_forms_;
 
 	draw_page_attr				attlist_;
 private:
diff --git a/OdfFile/Reader/Format/draw_shapes.cpp b/OdfFile/Reader/Format/draw_shapes.cpp
index 7b08cb9356..a2be2199a0 100644
--- a/OdfFile/Reader/Format/draw_shapes.cpp
+++ b/OdfFile/Reader/Format/draw_shapes.cpp
@@ -189,7 +189,7 @@ void draw_line::reset_svg_attributes()
 	double x2 = draw_line_attlist_.svg_x2_.get_value_or(length(0)).get_value_unit(length::pt);
 	double y2 = draw_line_attlist_.svg_y2_.get_value_or(length(0)).get_value_unit(length::pt);
 	
-	if (x1 > x2)
+	if (x1 - x2 > 0.5)
 	{
 		common_draw_attlists_.position_.svg_x_	 = draw_line_attlist_.svg_x2_;
 		common_draw_attlists_.rel_size_.common_draw_size_attlist_.svg_width_ = length(x1-x2, length::pt);
@@ -200,7 +200,7 @@ void draw_line::reset_svg_attributes()
 		common_draw_attlists_.position_.svg_x_	 = draw_line_attlist_.svg_x1_;
 		common_draw_attlists_.rel_size_.common_draw_size_attlist_.svg_width_ = length(x2-x1, length::pt);
 	}
-	if (y1 > y2)
+	if (y1 - y2 > 0.5)
 	{
 		common_draw_attlists_.position_.svg_y_	 = draw_line_attlist_.svg_y2_;
 		common_draw_attlists_.rel_size_.common_draw_size_attlist_.svg_height_ = length(y1-y2, length::pt);
@@ -819,46 +819,46 @@ void draw_enhanced_geometry::find_draw_type_oox()
 	else if (attlist_.draw_enhanced_path_)		odf_path_ = attlist_.draw_enhanced_path_.get();
 }
 
-static void process_polylines(std::vector<::svg_path::_polylineS>& polylines, const std::vector<std::pair<std::wstring, std::wstring>>& equations)
+static void process_polylines(std::vector<::svg_path::_polylineS>& polylines, const std::vector<std::wstring>& equation_names)
 {
 	using namespace ::svg_path;
 
-	for (size_t i = 0; i < polylines.size(); i++)
-	{
-		_polylineS& p = polylines[i];
+	//for (size_t i = 0; i < polylines.size(); i++)
+	//{
+	//	_polylineS& p = polylines[i];
 
-		if (p.command == L"a:arcTo" && p.points.size() > 1)
-		{
-			::svg_path::_pointS& pt = p.points[1];
+	//	if (p.command == L"a:arcTo" && p.points.size() > 1)
+	//	{
+	//		::svg_path::_pointS& pt = p.points[1];
 
-			auto x_it = std::find_if(equations.begin(), equations.end(),
-				[&pt](const std::pair<std::wstring, std::wstring>& eq) {return pt.x && eq.first == *pt.x;});
-			auto y_it = std::find_if(equations.begin(), equations.end(),
-				[&pt](const std::pair<std::wstring, std::wstring>& eq) {return pt.y && eq.first == *pt.y; });
+	//		auto x_it = std::find_if(equations.begin(), equations.end(),
+	//			[&pt](const std::pair<std::wstring, std::wstring>& eq) {return pt.x && eq.first == *pt.x;});
+	//		auto y_it = std::find_if(equations.begin(), equations.end(),
+	//			[&pt](const std::pair<std::wstring, std::wstring>& eq) {return pt.y && eq.first == *pt.y; });
 
-			if (x_it != equations.end())
-			{
-				const std::wstring& formula = x_it->second;
+	//		if (x_it != equations.end())
+	//		{
+	//			const std::wstring& formula = x_it->second;
 
-				std::vector<std::wstring> split;
-				boost::split(split, formula, boost::is_any_of("\t "), boost::token_compress_on);
+	//			std::vector<std::wstring> split;
+	//			boost::split(split, formula, boost::is_any_of("\t "), boost::token_compress_on);
 
-				if (split.size() == 4 && split[0] == L"*/" && split[1] == L"1" && boost::starts_with(split[2], L"gd") && split[3] == L"60000")
-					pt.x = split[2];
-			}
+	//			if (split.size() == 4 && split[0] == L"*/" && split[1] == L"1" && boost::starts_with(split[2], L"gd") && split[3] == L"60000")
+	//				pt.x = split[2];
+	//		}
 
-			if (y_it != equations.end())
-			{
-				const std::wstring& formula = y_it->second;
+	//		if (y_it != equations.end())
+	//		{
+	//			const std::wstring& formula = y_it->second;
 
-				std::vector<std::wstring> split;
-				boost::split(split, formula, boost::is_any_of("\t "), boost::token_compress_on);
+	//			std::vector<std::wstring> split;
+	//			boost::split(split, formula, boost::is_any_of("\t "), boost::token_compress_on);
 
-				if (split.size() == 4 && split[0] == L"*/" && split[1] == L"1" && boost::starts_with(split[2], L"gd") && split[3] == L"60000")
-					pt.y = split[2];
-			}
-		}
-	}
+	//			if (split.size() == 4 && split[0] == L"*/" && split[1] == L"1" && boost::starts_with(split[2], L"gd") && split[3] == L"60000")
+	//				pt.y = split[2];
+	//		}
+	//	}
+	//}
 }
 
 bool draw_enhanced_geometry::oox_convert(std::vector<odf_reader::_property>& props)
@@ -893,7 +893,7 @@ bool draw_enhanced_geometry::oox_convert(std::vector<odf_reader::_property>& pro
 		owner_shape->sub_type_ = sub_type_.get();
 		set_shape = true;
 	}
-	std::vector<std::pair<std::wstring, std::wstring>> equations;
+	std::vector<std::wstring> equation_names;
 	if (false == draw_equations_.empty() && !draw_type_oox_index_)
 	{
 		std::wstring oox_formulas;
@@ -907,8 +907,9 @@ bool draw_enhanced_geometry::oox_convert(std::vector<odf_reader::_property>& pro
 				std::wstring value = eq->attlist_.draw_formula_.get_value_or(L"");
 
 				XmlUtils::replace_all(name, L"f", L"gd");
-		
+
 				oox_formulas += OdfCustomShape::convert_formula(value, name);
+				equation_names.push_back(name);
 			}
 		}
 
@@ -921,7 +922,7 @@ bool draw_enhanced_geometry::oox_convert(std::vector<odf_reader::_property>& pro
 	if (!odf_path_.empty())
 	{
 		bool bCPathWithArgs = (std::wstring::npos != odf_path_.find(L"?"));
-		if (bOoxType_ || (bCPathWithArgs && false == equations.empty()))
+		if (bOoxType_ || (bCPathWithArgs && false == equation_names.empty()))
 		{
 			std::vector<::svg_path::_polylineS> o_Polyline;
 
@@ -941,7 +942,7 @@ bool draw_enhanced_geometry::oox_convert(std::vector<odf_reader::_property>& pro
 			{
 				set_shape = true;
 
-				process_polylines(o_Polyline, equations);
+				process_polylines(o_Polyline, equation_names);
 
 				std::wstringstream output_;
 				::svg_path::oox_serialize(output_, o_Polyline);
@@ -1035,7 +1036,7 @@ bool draw_enhanced_geometry::oox_convert(std::vector<odf_reader::_property>& pro
 			props.push_back(odf_reader::_property(L"custom_path_h", h));
 		}
 	}
-	if (attlist_.draw_modifiers_ && ((set_shape && bOoxType_ && !draw_type_oox_index_) || (false == equations.empty())))
+	if (attlist_.draw_modifiers_ && ((set_shape && bOoxType_ && !draw_type_oox_index_) || (false == equation_names.empty())))
 	{
 		props.push_back(_property(L"oox-draw-modifiers", attlist_.draw_modifiers_.get()));
 	}
diff --git a/OdfFile/Reader/Format/draw_shapes.h b/OdfFile/Reader/Format/draw_shapes.h
index 1ebbcd7eab..b5123deb96 100644
--- a/OdfFile/Reader/Format/draw_shapes.h
+++ b/OdfFile/Reader/Format/draw_shapes.h
@@ -713,7 +713,7 @@ public:
 
 	virtual void docx_convert(oox::docx_conversion_context & Context);
 	virtual void xlsx_convert(oox::xlsx_conversion_context & Context);
-    virtual void pptx_convert(oox::pptx_conversion_context & Context){}
+	virtual void pptx_convert(oox::pptx_conversion_context& Context);
 
 	_CP_OPT(std::wstring)	xml_id_;
 	_CP_OPT(std::wstring)	caption_id_;
diff --git a/OdfFile/Reader/Format/draw_shapes_pptx.cpp b/OdfFile/Reader/Format/draw_shapes_pptx.cpp
index 04bc9eb8ed..fd85288c8d 100644
--- a/OdfFile/Reader/Format/draw_shapes_pptx.cpp
+++ b/OdfFile/Reader/Format/draw_shapes_pptx.cpp
@@ -43,6 +43,7 @@
 #include <xml/xmlchar.h>
 #include "odf_document.h"
 
+#include "office_forms.h"
 #include "serialize_elements.h"
 
 #include "style_graphic_properties.h"
@@ -108,14 +109,14 @@ void draw_shape::common_pptx_convert(oox::pptx_conversion_context & Context)
 /////////////////////////////////////////////////////////////////////////////////
 	std::vector<const odf_reader::style_instance *> instances;
 
-	const std::wstring grStyleName		= common_draw_attlist_.draw_style_name_.get_value_or(L"");
-	const std::wstring baseStyleName	= common_draw_attlists_.shape_with_text_and_styles_.common_presentation_attlist_.presentation_style_name_.get_value_or(L"");
+	const std::wstring drawStyleName		= common_draw_attlist_.draw_style_name_.get_value_or(L"");
+	const std::wstring presentationStyleName	= common_draw_attlists_.shape_with_text_and_styles_.common_presentation_attlist_.presentation_style_name_.get_value_or(L"");
 
 	odf_reader::style_instance* grStyleInst = 
-		Context.root()->odf_context().styleContainer().style_by_name(grStyleName, odf_types::style_family::Graphic,Context.process_masters_);
+		Context.root()->odf_context().styleContainer().style_by_name(drawStyleName, odf_types::style_family::Graphic,Context.process_masters_);
 	
 	odf_reader::style_instance* baseStyleInst = 
-		Context.root()->odf_context().styleContainer().style_by_name(baseStyleName, odf_types::style_family::Presentation,Context.process_masters_);
+		Context.root()->odf_context().styleContainer().style_by_name(presentationStyleName, odf_types::style_family::Presentation,Context.process_masters_);
 
 	if (baseStyleInst)//векторная фигура презентаций
 	{
@@ -143,7 +144,7 @@ void draw_shape::common_pptx_convert(oox::pptx_conversion_context & Context)
 		if (properties->fo_clip_)
 		{
 			std::wstring strRectClip = properties->fo_clip_.get();
-			Context.get_slide_context().set_clipping(strRectClip.substr(5, strRectClip.length() - 6));
+			fill.clipping = strRectClip.length() > 6 ? strRectClip.substr(5, strRectClip.length() - 6) : L"";
 		}
 	}
  	for (size_t i = 0; i < additional_.size(); i++)
@@ -189,7 +190,7 @@ void draw_shape::common_pptx_convert(oox::pptx_conversion_context & Context)
 
 	if (!text_content_.empty())
 	{
-		Context.get_slide_context().set_property(_property(L"text-content",text_content_));
+		Context.get_slide_context().set_property(_property(L"text-content", text_content_));
 	}
 }
 void draw_rect::pptx_convert(oox::pptx_conversion_context & Context)
@@ -425,5 +426,128 @@ void dr3d_sphere::pptx_convert(oox::pptx_conversion_context & Context)
 {
 	Context.get_slide_context().start_shape(sub_type_); //reset type
 }
+void draw_control::pptx_convert(oox::pptx_conversion_context& Context)
+{
+	if (!control_id_) return;
+
+	oox::forms_context::_state& state = Context.get_forms_context().get_state_element(*control_id_);
+	if (state.id.empty()) return;
+
+	form_element* control = dynamic_cast<form_element*>(state.element);
+	if (!control) return;
+
+	if (state.ctrlPropId.empty())
+	{
+		std::wstring target;
+		state.ctrlPropId = Context.get_mediaitems()->add_control_props(target);
+
+		//std::wstringstream strm;
+		//control->serialize_control_props(strm);
+
+		//Context.add_control_props(state.ctrlPropId, target, strm.str());
+	}
+
+	Context.get_slide_context().start_control(state.ctrlPropId, control->object_type_);
+
+	common_pptx_convert(Context);
+
+	if (control->linked_cell_)
+	{
+		Context.get_slide_context().set_property(_property(L"linked_cell", control->linked_cell_.get()));
+	}
+	if (control->disabled_)
+	{
+		Context.get_slide_context().set_property(_property(L"disabled", control->disabled_->get()));
+	}
+	if (control->value_)
+	{
+		Context.get_slide_context().set_property(_property(L"value", control->value_.get()));
+	}
+	else if (control->current_value_)
+	{
+		Context.get_slide_context().set_property(_property(L"value", control->current_value_.get()));
+	}
+	if (control->label_)
+	{
+		Context.get_slide_context().set_property(_property(L"label", control->label_.get()));
+
+		Context.get_text_context().start_object();
+		Context.get_text_context().add_text(control->label_.get());
+		
+		std::wstring text_content_ = Context.get_text_context().end_object();
+
+		if (!text_content_.empty())
+		{
+			Context.get_slide_context().set_property(_property(L"text-content", text_content_));
+		}
+	}
+	//if (control->name_)
+	//{
+	//	Context.get_drawing_context().set_name(control->name_.get());
+	//}
+	form_value_range* value_range = dynamic_cast<form_value_range*>(control);
+
+	if (value_range)
+	{
+		if (value_range->min_value_)
+		{
+			Context.get_slide_context().set_property(_property(L"min_value", value_range->min_value_.get()));
+		}
+		if (value_range->max_value_)
+		{
+			Context.get_slide_context().set_property(_property(L"max_value", value_range->max_value_.get()));
+		}
+		if (value_range->step_size_)
+		{
+			Context.get_slide_context().set_property(_property(L"step", value_range->step_size_.get()));
+		}
+		if (value_range->page_step_size_)
+		{
+			Context.get_slide_context().set_property(_property(L"page_step", value_range->page_step_size_.get()));
+		}
+		if (value_range->orientation_)
+		{
+			Context.get_slide_context().set_property(_property(L"orientation", value_range->orientation_.get()));
+		}
+	}
+	form_combobox* combobox = dynamic_cast<form_combobox*>(control);
+
+	if (combobox)
+	{
+		//items_;
+		if (combobox->source_cell_range_)
+		{
+			Context.get_slide_context().set_property(_property(L"cell_range", combobox->source_cell_range_.get()));
+		}
+		if (combobox->list_source_)
+		{
+			Context.get_slide_context().set_property(_property(L"list_source", combobox->list_source_.get()));
+		}
+	}
+	form_listbox* listbox = dynamic_cast<form_listbox*>(control);
+	if (listbox)
+	{
+		if (listbox->source_cell_range_)
+		{
+			Context.get_slide_context().set_property(_property(L"cell_range", listbox->source_cell_range_.get()));
+		}
+		if (listbox->list_source_)
+		{
+			Context.get_slide_context().set_property(_property(L"list_source", listbox->list_source_.get()));
+		}
+	}
+	form_checkbox* checkbox = dynamic_cast<form_checkbox*>(control);
+	if (checkbox)
+	{
+		Context.get_slide_context().set_property(_property(L"checkbox_state", checkbox->current_state_));
+	}
+
+	//_CP_OPT(std::wstring)		label_;
+	//_CP_OPT(std::wstring)		title_;
+	//_CP_OPT(odf_types::Bool)	dropdown_;
+
+	Context.get_slide_context().end_control();
+}
+
 }
 }
diff --git a/OdfFile/Reader/Format/math_elements.cpp b/OdfFile/Reader/Format/math_elements.cpp
index 20117ce141..ea93ff98cd 100644
--- a/OdfFile/Reader/Format/math_elements.cpp
+++ b/OdfFile/Reader/Format/math_elements.cpp
@@ -118,7 +118,7 @@ void math_semantics::oox_convert(oox::math_context &Context, int iTypeConversion
         parser.SetBaseItalic(Context.base_font_italic_);
         parser.SetBaseBold(Context.base_font_bold_);
 
-        /*result = */        converter.StartConversion(parser.Parse(annotation_text,iTypeConversion),parser.GetAlignment());
+        converter.StartConversion(parser.Parse(annotation_text,iTypeConversion),parser.GetAlignment());
 
         auto sizes = parser.GetFormulaSize();
 
@@ -134,11 +134,15 @@ void math_semantics::oox_convert(oox::math_context &Context, int iTypeConversion
 
     if (!result)
     {
+ 		Context.output_stream() << L"<m:oMathPara xmlns:m=\"http://schemas.openxmlformats.org/officeDocument/2006/math\">";
+        Context.output_stream() << L"<m:oMath xmlns:m=\"http://schemas.openxmlformats.org/officeDocument/2006/math\">";
         for (size_t i = 0; i < content_.size(); i++)
         {
             office_math_element* math_element = dynamic_cast<office_math_element*>(content_[i].get());
             math_element->oox_convert(Context);
         }
+        Context.output_stream() << L"</m:oMath>";
+        Context.output_stream() << L"</m:oMathPara>";
     }
 }
 
diff --git a/OdfFile/Reader/Format/odf_document_impl.cpp b/OdfFile/Reader/Format/odf_document_impl.cpp
index 8ae5b40ae5..e1e54cc529 100644
--- a/OdfFile/Reader/Format/odf_document_impl.cpp
+++ b/OdfFile/Reader/Format/odf_document_impl.cpp
@@ -491,7 +491,7 @@ void odf_document::Impl::parse_fonts(office_element *element)
 
             std::vector<std::wstring> fontNames;
             boost::algorithm::split(fontNames, fontNameTmp, boost::algorithm::is_any_of(L","), boost::algorithm::token_compress_on);
-            if (fontNames.empty() || fontNames[0].empty())
+            if (fontNames.empty()) // nextcloud_sync_issue-1.ods
                 fontName = styleName;
             else
                 fontName = fontNames[0];
diff --git a/OdfFile/Reader/Format/odfcontext.h b/OdfFile/Reader/Format/odfcontext.h
index b480b55fe1..81a532daf7 100644
--- a/OdfFile/Reader/Format/odfcontext.h
+++ b/OdfFile/Reader/Format/odfcontext.h
@@ -35,7 +35,6 @@
 #include "templates.h"
 
 #include <vector>
-#include <boost/unordered_map.hpp>
 #include "../../DataTypes/stylefamily.h"
 #include "../../DataTypes/noteclass.h"
 
@@ -321,8 +320,8 @@ public:
     void add_font( font_instance_ptr FontInstance );
 
 private:
-    boost::unordered_map<std::wstring, int> font_names_;
-    boost::unordered_map<std::wstring, int> font_style_names_;
+    std::map<std::wstring, int> font_names_;
+    std::map<std::wstring, int> font_style_names_;
     instances_array instances_;
 
 };
diff --git a/OdfFile/Reader/Format/office_forms.cpp b/OdfFile/Reader/Format/office_forms.cpp
index 29b57596a8..6fd7239ad5 100644
--- a/OdfFile/Reader/Format/office_forms.cpp
+++ b/OdfFile/Reader/Format/office_forms.cpp
@@ -96,6 +96,13 @@ void office_forms::xlsx_convert(oox::xlsx_conversion_context & Context)
         content_[i]->xlsx_convert(Context);
     }
 }
+void office_forms::pptx_convert(oox::pptx_conversion_context& Context)
+{
+	for (size_t i = 0; i < content_.size(); i++)
+	{
+		content_[i]->pptx_convert(Context);
+	}
+}
 // form:form
 //----------------------------------------------------------------------------------
 const wchar_t * form_form::ns = L"form";
@@ -155,6 +162,13 @@ void form_form::xlsx_convert(oox::xlsx_conversion_context & Context)
         content_[i]->xlsx_convert(Context);
     }
 }
+void form_form::pptx_convert(oox::pptx_conversion_context& Context)
+{
+	for (size_t i = 0; i < content_.size(); i++)
+	{
+		content_[i]->pptx_convert(Context);
+	}
+}
 // form:properties
 //----------------------------------------------------------------------------------
 const wchar_t * form_properties::ns = L"form";
@@ -174,6 +188,10 @@ void form_properties::docx_convert(oox::docx_conversion_context & Context)
 void form_properties::xlsx_convert(oox::xlsx_conversion_context & Context)
 {
 
+}
+void form_properties::pptx_convert(oox::pptx_conversion_context& Context)
+{
+
 }
 // form:property
 //----------------------------------------------------------------------------------
@@ -214,6 +232,13 @@ void form_list_property::xlsx_convert(oox::xlsx_conversion_context & Context)
         content_[i]->xlsx_convert(Context);
     }
 }
+void form_list_property::pptx_convert(oox::pptx_conversion_context& Context)
+{
+	for (size_t i = 0; i < content_.size(); i++)
+	{
+		content_[i]->pptx_convert(Context);
+	}
+}
 // form:list-value
 //----------------------------------------------------------------------------------
 const wchar_t * form_list_value::ns = L"form";
@@ -289,6 +314,22 @@ void form_element::xlsx_convert(oox::xlsx_conversion_context & Context)
 
 	Context.get_forms_context().end_element();
 }
+void form_element::pptx_convert(oox::pptx_conversion_context& Context)
+{
+	std::wstring id = id_ ? *id_ : (xml_id_ ? *xml_id_ : L"");
+	Context.get_forms_context().set_id(id);
+
+	if (name_)						Context.get_forms_context().set_name(*name_);
+	if (label_)						Context.get_forms_context().set_label(*label_);
+
+	if (current_value_)				Context.get_forms_context().set_value(*current_value_);
+	else if (value_)				Context.get_forms_context().set_value(*value_);
+
+	if (control_implementation_)	Context.get_forms_context().set_uuid(*control_implementation_);
+
+	Context.get_forms_context().end_element();
+}
+
 // form:frame
 //----------------------------------------------------------------------------------
 const wchar_t * form_frame::ns = L"form";
@@ -312,6 +353,13 @@ void form_frame::xlsx_convert(oox::xlsx_conversion_context & Context)
 
 	form_element::xlsx_convert(Context);
 }
+void form_frame::pptx_convert(oox::pptx_conversion_context& Context)
+{
+	Context.get_forms_context().start_element(oox::formFrame);
+	Context.get_forms_context().set_element(dynamic_cast<form_element*>(this));
+
+	form_element::pptx_convert(Context);
+}
 void form_frame::serialize_control_props(std::wostream & strm)
 {
 	formulasconvert::odf2oox_converter converter;
@@ -351,6 +399,13 @@ void form_button::xlsx_convert(oox::xlsx_conversion_context & Context)
 
 	form_element::xlsx_convert(Context);
 }
+void form_button::pptx_convert(oox::pptx_conversion_context& Context)
+{
+	Context.get_forms_context().start_element(oox::formButton);
+	Context.get_forms_context().set_element(dynamic_cast<form_element*>(this));
+
+	form_element::pptx_convert(Context);
+}
 void form_button::serialize_control_props(std::wostream & strm)
 {
 	formulasconvert::odf2oox_converter converter;
@@ -391,6 +446,13 @@ void form_text::xlsx_convert(oox::xlsx_conversion_context & Context)
 
 	form_element::xlsx_convert(Context);
 }
+void form_text::pptx_convert(oox::pptx_conversion_context& Context)
+{
+	Context.get_forms_context().start_element(oox::formLabel);
+	Context.get_forms_context().set_element(dynamic_cast<form_element*>(this));
+
+	form_element::pptx_convert(Context);
+}
 void form_text::serialize_control_props(std::wostream & strm)
 {
 	CP_XML_WRITER(strm)
@@ -489,6 +551,13 @@ void form_fixed_text::xlsx_convert(oox::xlsx_conversion_context & Context)
 
 	form_element::xlsx_convert(Context);
 }
+void form_fixed_text::pptx_convert(oox::pptx_conversion_context& Context)
+{
+	Context.get_forms_context().start_element(oox::formLabel);
+	Context.get_forms_context().set_element(dynamic_cast<form_element*>(this));
+
+	form_element::pptx_convert(Context);
+}
 void form_fixed_text::serialize_control_props(std::wostream & strm)
 {
 	CP_XML_WRITER(strm)
@@ -590,6 +659,13 @@ void form_checkbox::xlsx_convert(oox::xlsx_conversion_context & Context)
 
 	form_element::xlsx_convert(Context);
 }
+void form_checkbox::pptx_convert(oox::pptx_conversion_context& Context)
+{
+	Context.get_forms_context().start_element(oox::formCheckbox);
+	Context.get_forms_context().set_element(dynamic_cast<form_element*>(this));
+
+	form_element::pptx_convert(Context);
+}
 void form_checkbox::serialize_control_props(std::wostream & strm)
 {
 	CP_XML_WRITER(strm)
@@ -709,6 +785,13 @@ void form_radio::xlsx_convert(oox::xlsx_conversion_context & Context)
 
 	form_element::xlsx_convert(Context);
 }
+void form_radio::pptx_convert(oox::pptx_conversion_context& Context)
+{
+	Context.get_forms_context().start_element(oox::formCheckbox);
+	Context.get_forms_context().set_element(dynamic_cast<form_element*>(this));
+
+	form_element::pptx_convert(Context);
+}
 void form_radio::serialize_control_props(std::wostream & strm)
 {
 	CP_XML_WRITER(strm)
@@ -772,6 +855,13 @@ void form_combobox::xlsx_convert(oox::xlsx_conversion_context & Context)
 
 	form_element::xlsx_convert(Context);
 }
+void form_combobox::pptx_convert(oox::pptx_conversion_context& Context)
+{
+	Context.get_forms_context().start_element(oox::formCombobox);
+	Context.get_forms_context().set_element(dynamic_cast<form_element*>(this));
+
+	form_element::pptx_convert(Context);
+}
 void form_combobox::serialize_control_props(std::wostream & strm)
 {
 	formulasconvert::odf2oox_converter converter;
@@ -893,6 +983,13 @@ void form_listbox::xlsx_convert(oox::xlsx_conversion_context & Context)
 
 	form_element::xlsx_convert(Context);
 }
+void form_listbox::pptx_convert(oox::pptx_conversion_context& Context)
+{
+	Context.get_forms_context().start_element(oox::formListbox);
+	Context.get_forms_context().set_element(dynamic_cast<form_element*>(this));
+
+	form_element::pptx_convert(Context);
+}
 void form_listbox::serialize_control_props(std::wostream & strm)
 {
 	formulasconvert::odf2oox_converter converter;
@@ -955,6 +1052,13 @@ void form_date::xlsx_convert(oox::xlsx_conversion_context & Context)
 
 	form_element::xlsx_convert(Context);
 }
+void form_date::pptx_convert(oox::pptx_conversion_context& Context)
+{
+	Context.get_forms_context().start_element(oox::formDateTime);
+	Context.get_forms_context().set_element(dynamic_cast<form_element*>(this));
+
+	form_element::pptx_convert(Context);
+}
 void form_date::serialize_control_props(std::wostream & strm)
 {
 }
@@ -1030,6 +1134,13 @@ void form_time::xlsx_convert(oox::xlsx_conversion_context & Context)
 
 	form_element::xlsx_convert(Context);
 }
+void form_time::pptx_convert(oox::pptx_conversion_context& Context)
+{
+	Context.get_forms_context().start_element(oox::formDateTime);
+	Context.get_forms_context().set_element(dynamic_cast<form_element*>(this));
+
+	form_element::pptx_convert(Context);
+}
 void form_time::serialize_control_props(std::wostream & strm)
 {
 }
@@ -1107,6 +1218,13 @@ void form_image_frame::xlsx_convert(oox::xlsx_conversion_context & Context)
 
 	form_element::xlsx_convert(Context);
 }
+void form_image_frame::pptx_convert(oox::pptx_conversion_context& Context)
+{
+	Context.get_forms_context().start_element(oox::formImage);
+	Context.get_forms_context().set_element(dynamic_cast<form_element*>(this));
+
+	form_element::pptx_convert(Context);
+}
 void form_image_frame::serialize_control_props(std::wostream & strm)
 {
 }
@@ -1171,6 +1289,19 @@ void form_value_range::xlsx_convert(oox::xlsx_conversion_context & Context)
 
 	form_element::xlsx_convert(Context);
 }
+void form_value_range::pptx_convert(oox::pptx_conversion_context& Context)
+{
+	if (!control_implementation_) return;
+
+	if (control_implementation_->find(L"SpinButton") != std::wstring::npos)
+		Context.get_forms_context().start_element(oox::formSpin);
+	else
+		Context.get_forms_context().start_element(oox::formScroll);
+
+	Context.get_forms_context().set_element(dynamic_cast<form_element*>(this));
+
+	form_element::pptx_convert(Context);
+}
 void form_value_range::serialize_control_props(std::wostream & strm)
 {
 	if (!control_implementation_) return;
diff --git a/OdfFile/Reader/Format/office_forms.h b/OdfFile/Reader/Format/office_forms.h
index 0bddaeffc1..e5efe24594 100644
--- a/OdfFile/Reader/Format/office_forms.h
+++ b/OdfFile/Reader/Format/office_forms.h
@@ -54,9 +54,9 @@ public:
     static const ElementType type = typeOfficeForms;
     CPDOCCORE_DEFINE_VISITABLE();
 
-	virtual void docx_convert(oox::docx_conversion_context & Context) ;
+	virtual void docx_convert(oox::docx_conversion_context & Context);
 	virtual void xlsx_convert(oox::xlsx_conversion_context & Context);
-    virtual void pptx_convert(oox::pptx_conversion_context & Context){}
+	virtual void pptx_convert(oox::pptx_conversion_context& Context);
 private:
     virtual void add_attributes( const xml::attributes_wc_ptr & Attributes );
     virtual void add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name);
@@ -79,9 +79,9 @@ public:
     static const ElementType type = typeFormForm;
     CPDOCCORE_DEFINE_VISITABLE();
 
-	virtual void docx_convert(oox::docx_conversion_context & Context) ;
+	virtual void docx_convert(oox::docx_conversion_context & Context);
 	virtual void xlsx_convert(oox::xlsx_conversion_context & Context);
-    virtual void pptx_convert(oox::pptx_conversion_context & Context){}
+	virtual void pptx_convert(oox::pptx_conversion_context& Context);
 private:
     virtual void add_attributes( const xml::attributes_wc_ptr & Attributes );
     virtual void add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name);
@@ -129,9 +129,9 @@ public:
     static const ElementType type = typeFormProperties;
     CPDOCCORE_DEFINE_VISITABLE();
 
-	virtual void docx_convert(oox::docx_conversion_context & Context) ;
+	virtual void docx_convert(oox::docx_conversion_context & Context);
 	virtual void xlsx_convert(oox::xlsx_conversion_context & Context);
-    virtual void pptx_convert(oox::pptx_conversion_context & Context){}
+	virtual void pptx_convert(oox::pptx_conversion_context& Context);
 private:
 	virtual void add_attributes( const xml::attributes_wc_ptr & Attributes ){}
     virtual void add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name);
@@ -171,9 +171,9 @@ public:
     static const ElementType type = typeFormListProperty;
     CPDOCCORE_DEFINE_VISITABLE();
 
-	virtual void docx_convert(oox::docx_conversion_context & Context) ;
+	virtual void docx_convert(oox::docx_conversion_context & Context);
 	virtual void xlsx_convert(oox::xlsx_conversion_context & Context);
-    virtual void pptx_convert(oox::pptx_conversion_context & Context){}
+	virtual void pptx_convert(oox::pptx_conversion_context& Context);
 private:
     virtual void add_attributes( const xml::attributes_wc_ptr & Attributes );
     virtual void add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name);
@@ -222,7 +222,7 @@ public:
 
 	virtual void docx_convert(oox::docx_conversion_context & Context);
 	virtual void xlsx_convert(oox::xlsx_conversion_context & Context);
-	virtual void pptx_convert(oox::pptx_conversion_context & Context){}
+	virtual void pptx_convert(oox::pptx_conversion_context& Context);
 
 	virtual void docx_convert_sdt	(oox::docx_conversion_context & Context, draw_control* draw) {}
 	virtual void docx_convert_field	(oox::docx_conversion_context & Context, draw_control* draw) {}
@@ -267,7 +267,7 @@ public:
 
 	virtual void docx_convert(oox::docx_conversion_context & Context);
 	virtual void xlsx_convert(oox::xlsx_conversion_context & Context);
-    virtual void pptx_convert(oox::pptx_conversion_context & Context){}
+	virtual void pptx_convert(oox::pptx_conversion_context& Context);
 	
 	virtual void serialize_control_props(std::wostream & strm);
 private:
@@ -287,7 +287,7 @@ public:
 
 	virtual void docx_convert(oox::docx_conversion_context & Context);
 	virtual void xlsx_convert(oox::xlsx_conversion_context & Context);
-    virtual void pptx_convert(oox::pptx_conversion_context & Context){}
+	virtual void pptx_convert(oox::pptx_conversion_context& Context);
 	
 	virtual void serialize_control_props(std::wostream & strm);
 private:
@@ -322,7 +322,7 @@ public:
 
 	virtual void docx_convert(oox::docx_conversion_context & Context);
 	virtual void xlsx_convert(oox::xlsx_conversion_context & Context);
-    virtual void pptx_convert(oox::pptx_conversion_context & Context){}
+	virtual void pptx_convert(oox::pptx_conversion_context& Context);
 	
 	virtual void docx_convert_sdt	(oox::docx_conversion_context & Context, draw_control* draw);
 	virtual void docx_convert_field	(oox::docx_conversion_context & Context, draw_control* draw);
@@ -350,7 +350,7 @@ public:
 
 	virtual void docx_convert(oox::docx_conversion_context & Context);
 	virtual void xlsx_convert(oox::xlsx_conversion_context & Context);
-    virtual void pptx_convert(oox::pptx_conversion_context & Context){}
+	virtual void pptx_convert(oox::pptx_conversion_context& Context);
 	
 	virtual void docx_convert_sdt	(oox::docx_conversion_context & Context, draw_control* draw);
 	virtual void docx_convert_field	(oox::docx_conversion_context & Context, draw_control* draw);
@@ -387,7 +387,7 @@ public:
 
 	virtual void docx_convert(oox::docx_conversion_context & Context);
 	virtual void xlsx_convert(oox::xlsx_conversion_context & Context);
-	virtual void pptx_convert(oox::pptx_conversion_context & Context){}
+	virtual void pptx_convert(oox::pptx_conversion_context& Context);
 	
 	virtual void docx_convert_sdt	(oox::docx_conversion_context & Context, draw_control *draw);
 	virtual void docx_convert_field	(oox::docx_conversion_context & Context, draw_control* draw);
@@ -418,7 +418,7 @@ public:
 
 	virtual void docx_convert(oox::docx_conversion_context & Context);
 	virtual void xlsx_convert(oox::xlsx_conversion_context & Context);
-	virtual void pptx_convert(oox::pptx_conversion_context & Context){}
+	virtual void pptx_convert(oox::pptx_conversion_context& Context);
 	
 	virtual void docx_convert_sdt	(oox::docx_conversion_context & Context, draw_control *draw);
 	virtual void docx_convert_field	(oox::docx_conversion_context & Context, draw_control* draw);
@@ -441,7 +441,7 @@ public:
 
 	virtual void docx_convert(oox::docx_conversion_context & Context);
 	virtual void xlsx_convert(oox::xlsx_conversion_context & Context);
-	virtual void pptx_convert(oox::pptx_conversion_context & Context){}
+	virtual void pptx_convert(oox::pptx_conversion_context& Context);
 	
 	virtual void docx_convert_sdt	(oox::docx_conversion_context & Context, draw_control *draw){}
 	virtual void docx_convert_field	(oox::docx_conversion_context & Context, draw_control* draw){}
@@ -473,7 +473,7 @@ public:
 
 	virtual void docx_convert(oox::docx_conversion_context & Context);
 	virtual void xlsx_convert(oox::xlsx_conversion_context & Context);
-    virtual void pptx_convert(oox::pptx_conversion_context & Context){}
+	virtual void pptx_convert(oox::pptx_conversion_context& Context);
 	
 	virtual void docx_convert_sdt	(oox::docx_conversion_context & Context, draw_control* draw);
 	
@@ -508,7 +508,7 @@ public:
 
 	virtual void docx_convert(oox::docx_conversion_context & Context);
 	virtual void xlsx_convert(oox::xlsx_conversion_context & Context);
-    virtual void pptx_convert(oox::pptx_conversion_context & Context){}
+	virtual void pptx_convert(oox::pptx_conversion_context& Context);
 	virtual void serialize_control_props(std::wostream & strm);
 
 private:
@@ -541,7 +541,7 @@ public:
 
 	virtual void docx_convert(oox::docx_conversion_context & Context);
 	virtual void xlsx_convert(oox::xlsx_conversion_context & Context);
-    virtual void pptx_convert(oox::pptx_conversion_context & Context){}
+	virtual void pptx_convert(oox::pptx_conversion_context& Context);
 	
 	virtual void docx_convert_sdt	(oox::docx_conversion_context & Context, draw_control* draw);
 	
@@ -567,7 +567,7 @@ public:
 
 	virtual void docx_convert(oox::docx_conversion_context & Context);
 	virtual void xlsx_convert(oox::xlsx_conversion_context & Context);
-    virtual void pptx_convert(oox::pptx_conversion_context & Context){}
+	virtual void pptx_convert(oox::pptx_conversion_context& Context);
 	
 	virtual void docx_convert_sdt	(oox::docx_conversion_context & Context, draw_control* draw);
 	
@@ -593,7 +593,7 @@ public:
 
 	virtual void docx_convert(oox::docx_conversion_context & Context);
 	virtual void xlsx_convert(oox::xlsx_conversion_context & Context);
-    virtual void pptx_convert(oox::pptx_conversion_context & Context){}
+	virtual void pptx_convert(oox::pptx_conversion_context& Context);
 	
 	virtual void docx_convert_sdt	(oox::docx_conversion_context & Context, draw_control* draw);
 	
diff --git a/OdfFile/Reader/Format/style_graphic_properties.cpp b/OdfFile/Reader/Format/style_graphic_properties.cpp
index 64d792c4f3..152c579707 100644
--- a/OdfFile/Reader/Format/style_graphic_properties.cpp
+++ b/OdfFile/Reader/Format/style_graphic_properties.cpp
@@ -61,6 +61,8 @@ void graphic_format_properties::add_attributes( const xml::attributes_wc_ptr & A
 	CP_APPLY_ATTR(L"draw:stroke-dash",					draw_stroke_dash_); 
 	CP_APPLY_ATTR(L"draw:marker-start",					draw_marker_start_); 
 	CP_APPLY_ATTR(L"draw:marker-end",					draw_marker_end_); 
+	CP_APPLY_ATTR(L"draw:marker-start-width",			draw_marker_start_width_);
+	CP_APPLY_ATTR(L"draw:marker-end-width",				draw_marker_end_width_);
 
 	CP_APPLY_ATTR(L"draw:stroke-gradient-name",			draw_stroke_gradient_name_);
 
@@ -128,16 +130,18 @@ void graphic_format_properties::apply_to(std::vector<_property> & properties)
 	{
 		properties.push_back(_property(L"marker-start",	draw_marker_start_->get() ));
 	}
+	if (draw_marker_start_width_)
+	{
+		properties.push_back(_property(L"marker-start-width", draw_marker_start_width_->get_value_unit(odf_types::length::pt)));
+	}
 	if (draw_marker_end_)
 	{
-		//const std::wstring style_name = draw_marker_end_->get();
-		//if (!style_name.empty())
-		////if (office_element_ptr style = styles.find_by_style_name(style_name))
-		//{
-			properties.push_back(_property(L"marker-end",	draw_marker_end_->get() ));
-		//}
+		properties.push_back(_property(L"marker-end", draw_marker_end_->get() ));
+	}
+	if (draw_marker_end_width_)
+	{
+		properties.push_back(_property(L"marker-end-width", draw_marker_end_width_->get_value_unit(odf_types::length::pt)));
 	}
-	
 	if (draw_textarea_horizontal_align_)properties.push_back(_property(L"textarea-horizontal_align",draw_textarea_horizontal_align_->get_type() ));
 	if (draw_textarea_vertical_align_)	properties.push_back(_property(L"textarea-vertical_align",	draw_textarea_vertical_align_->get_type() ));
 
@@ -189,7 +193,7 @@ void graphic_format_properties::apply_to(std::vector<_property> & properties)
 	if (fo_wrap_option_)	
 		properties.push_back(_property(L"text-wrap", (int)fo_wrap_option_->get_type()));
 }
-void graphic_format_properties::apply_from(const graphic_format_properties * Other)
+void graphic_format_properties::apply_from(const graphic_format_properties *Other)
 {
 	if (Other == NULL) return;
 
@@ -199,7 +203,9 @@ void graphic_format_properties::apply_from(const graphic_format_properties * Oth
 	_CP_APPLY_PROP3(draw_stroke_dash_); 
 	_CP_APPLY_PROP3(draw_marker_start_); 
 	_CP_APPLY_PROP3(draw_marker_end_); 
-	_CP_APPLY_PROP3(draw_textarea_horizontal_align_); 
+	_CP_APPLY_PROP3(draw_marker_start_width_);
+	_CP_APPLY_PROP3(draw_marker_end_width_);
+	_CP_APPLY_PROP3(draw_textarea_horizontal_align_);
 	_CP_APPLY_PROP3(draw_textarea_vertical_align_); 
 	_CP_APPLY_PROP3(draw_auto_grow_height_);
 	_CP_APPLY_PROP3(draw_auto_grow_width_);
@@ -216,7 +222,8 @@ void graphic_format_properties::apply_from(const graphic_format_properties * Oth
     _CP_APPLY_PROP3(fo_min_height_);
     _CP_APPLY_PROP3(fo_max_width_);
     _CP_APPLY_PROP3(fo_max_height_);
-	_CP_APPLY_PROP3(fo_wrap_option_);
+	
+	fo_wrap_option_ = Other->fo_wrap_option_;
 
     _CP_APPLY_PROP3(style_print_content_);
     _CP_APPLY_PROP3(style_protect_);
diff --git a/OdfFile/Reader/Format/style_graphic_properties.h b/OdfFile/Reader/Format/style_graphic_properties.h
index 7a42aa58fe..43d477f6cf 100644
--- a/OdfFile/Reader/Format/style_graphic_properties.h
+++ b/OdfFile/Reader/Format/style_graphic_properties.h
@@ -83,6 +83,8 @@ public:
 
 	_CP_OPT(odf_types::marker_style)		draw_marker_end_;
 	_CP_OPT(odf_types::marker_style)		draw_marker_start_;
+    _CP_OPT(odf_types::length)              draw_marker_start_width_;
+    _CP_OPT(odf_types::length)              draw_marker_end_width_;
 
 	_CP_OPT(odf_types::text_align)			draw_textarea_horizontal_align_;
 	_CP_OPT(odf_types::vertical_align)		draw_textarea_vertical_align_;
diff --git a/OdfFile/Reader/Format/style_text_properties.cpp b/OdfFile/Reader/Format/style_text_properties.cpp
index 3ffccee423..4464c7baa4 100644
--- a/OdfFile/Reader/Format/style_text_properties.cpp
+++ b/OdfFile/Reader/Format/style_text_properties.cpp
@@ -1597,20 +1597,65 @@ void text_format_properties::apply_from(const text_format_properties & Other)
     _CP_APPLY_PROP(style_text_line_through_text_, Other.style_text_line_through_text_);
     _CP_APPLY_PROP(style_text_line_through_text_style_, Other.style_text_line_through_text_style_);
     _CP_APPLY_PROP(style_text_position_, Other.style_text_position_);
-    _CP_APPLY_PROP(style_font_name_, Other.style_font_name_);
-    _CP_APPLY_PROP(style_font_name_asian_, Other.style_font_name_asian_);
-    _CP_APPLY_PROP(style_font_name_complex_, Other.style_font_name_complex_);
-    _CP_APPLY_PROP(fo_font_family_, Other.fo_font_family_);
-    _CP_APPLY_PROP(style_font_family_asian_, Other.style_font_family_asian_);
-    _CP_APPLY_PROP(style_font_family_complex_, Other.style_font_family_complex_);
-
+   
     _CP_APPLY_PROP(style_font_family_generic_, Other.style_font_family_generic_);
     _CP_APPLY_PROP(style_font_family_generic_asian_, Other.style_font_family_generic_asian_);
     _CP_APPLY_PROP(style_font_family_generic_complex_, Other.style_font_family_generic_complex_);
 
-    _CP_APPLY_PROP(style_font_style_name_, Other.style_font_style_name_);
-    _CP_APPLY_PROP(style_font_style_name_asian_, Other.style_font_style_name_asian_);
-    _CP_APPLY_PROP(style_font_style_name_complex_, Other.style_font_style_name_complex_);
+	if (Other.style_font_name_)
+	{
+		style_font_name_ = Other.style_font_name_;
+		style_font_style_name_.reset();
+		fo_font_family_.reset();
+	}
+	if (Other.style_font_name_asian_)
+	{
+		style_font_name_asian_ = Other.style_font_name_asian_;
+		style_font_style_name_asian_.reset();
+		style_font_family_asian_.reset();
+	}
+	if (Other.style_font_name_complex_)
+	{
+		style_font_name_complex_ = Other.style_font_name_complex_;
+		style_font_style_name_complex_.reset();
+		style_font_family_complex_.reset();
+	}
+	if (Other.style_font_style_name_)
+	{
+		style_font_style_name_ = Other.style_font_style_name_;
+		style_font_name_.reset();
+		fo_font_family_.reset();
+	}
+	if (Other.style_font_style_name_asian_)
+	{
+		style_font_style_name_asian_ = Other.style_font_style_name_asian_;
+		style_font_name_asian_.reset();
+		style_font_family_asian_.reset();
+	}
+	if (Other.style_font_style_name_complex_)
+	{
+		style_font_style_name_complex_ = Other.style_font_style_name_complex_;
+		style_font_name_complex_.reset();
+		style_font_family_complex_.reset();
+	}
+	if (Other.fo_font_family_)
+	{
+		fo_font_family_ = Other.fo_font_family_;
+		style_font_name_.reset();
+		style_font_style_name_.reset();
+	}
+	if (Other.style_font_family_asian_)
+	{
+		style_font_family_asian_ = Other.style_font_family_asian_;
+		style_font_name_asian_.reset();
+		style_font_style_name_asian_.reset();
+	}
+	if (Other.style_font_family_complex_)
+	{
+		style_font_family_complex_ = Other.style_font_family_complex_;
+		style_font_name_complex_.reset();
+		style_font_style_name_complex_.reset();
+	}
 
     _CP_APPLY_PROP(style_font_pitch_,	Other.style_font_pitch_);
     _CP_APPLY_PROP(style_font_pitch_asian_,		Other.style_font_pitch_asian_);
diff --git a/OdfFile/Reader/Format/styles.h b/OdfFile/Reader/Format/styles.h
index 46a935ba77..cdebbd3297 100644
--- a/OdfFile/Reader/Format/styles.h
+++ b/OdfFile/Reader/Format/styles.h
@@ -105,6 +105,8 @@ public:
 
 	office_element_ptr text_list_style_;
 	odf_types::style_family style_family_;
+
+    bool bDefault = false;
 private:
     office_element_ptr		style_text_properties_;
     office_element_ptr		style_paragraph_properties_;
@@ -129,6 +131,10 @@ public:
     static const ElementType type = typeStyleDefaultStyle;
     CPDOCCORE_DEFINE_VISITABLE();
 
+    default_style() 
+    {
+        content_.bDefault = true;  
+    }
     virtual std::wostream & text_to_stream(std::wostream & _Wostream, bool bXmlEncode = true) const;
 
     style_content content_;
@@ -286,8 +292,7 @@ public:
     office_element_ptr_array content_;
 private:
 	virtual void add_attributes( const xml::attributes_wc_ptr & Attributes );
-    virtual void add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name);
- 
+    virtual void add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name); 
 };
 CP_REGISTER_OFFICE_ELEMENT2(draw_opacity);
 //------------------------------------------------------------------------------------------------
diff --git a/OdfFile/Reader/Format/svg_parser.cpp b/OdfFile/Reader/Format/svg_parser.cpp
index 1239871ab5..9f9cfb85d0 100644
--- a/OdfFile/Reader/Format/svg_parser.cpp
+++ b/OdfFile/Reader/Format/svg_parser.cpp
@@ -638,6 +638,15 @@ namespace svg_path
 						nLastControlY = nY;
                     }                    
 				}break;
+                case 'a':
+                {
+                    bRelative = true;
+                }
+                case 'A':
+                {
+                    skipSpaces(nPos, rSvgDStatement, nLen);
+                    return false;
+                }break;
                 default:
                 {
                      ++nPos;
@@ -1148,6 +1157,16 @@ namespace svg_path
                     nLastControlY = nY;
                 }
             }break;
+            case 'a':
+            {
+                bRelative = true;
+            }
+            case 'A':
+            {
+                skipSpaces(nPos, rSvgDStatement, nLen);
+
+                return false;
+            }break;
             default:
             {
                 ++nPos;
diff --git a/OdfFile/Reader/Format/svg_parser.h b/OdfFile/Reader/Format/svg_parser.h
index afb79db26b..c7a8f02668 100644
--- a/OdfFile/Reader/Format/svg_parser.h
+++ b/OdfFile/Reader/Format/svg_parser.h
@@ -42,6 +42,7 @@ namespace svg_path
 {
 	struct _point
 	{
+		_point() {}
 		_point(double _x, double _y) { x = _x; y = _y; }
 
 		_CP_OPT(double) x;
diff --git a/OdfFile/Reader/Format/table.cpp b/OdfFile/Reader/Format/table.cpp
index 7155a07744..4182e9a6a0 100644
--- a/OdfFile/Reader/Format/table.cpp
+++ b/OdfFile/Reader/Format/table.cpp
@@ -433,10 +433,9 @@ void table_table_cell::add_child_element( xml::sax * Reader, const std::wstring
 		text::p *p = dynamic_cast<text::p*>(content_.elements_.back().get());
 		if (p)
 		{
-			is_present_hyperlink_ = p->paragraph_.is_present_hyperlink_;
-            if (content_.elements_.size() > 1)
-                is_AligmentWrap_ = true;
-        }
+			is_present_hyperlink_ |= p->paragraph_.is_present_hyperlink_;
+            count_paragraph++;
+         }
 	}
 }
 
diff --git a/OdfFile/Reader/Format/table.h b/OdfFile/Reader/Format/table.h
index 783cb4707a..cffff2c6be 100644
--- a/OdfFile/Reader/Format/table.h
+++ b/OdfFile/Reader/Format/table.h
@@ -398,7 +398,7 @@ public:
 
     CPDOCCORE_DEFINE_VISITABLE();
 
-	table_table_cell() : last_cell_(false), is_present_hyperlink_(false) { }
+	table_table_cell() { }
 
     virtual void docx_convert(oox::docx_conversion_context & Context) ;
     virtual void xlsx_convert(oox::xlsx_conversion_context & Context) ;
@@ -412,9 +412,9 @@ private:
     virtual void add_text(const std::wstring & Text);
 
 public:
-    bool is_AligmentWrap_;
-    bool is_present_hyperlink_;
-	bool last_cell_;
+    int count_paragraph = 0;
+    bool is_present_hyperlink_ = false;
+	bool last_cell_ = false;
 	bool empty(bool bWithStyle = true);
 
     table_table_cell_attlist		attlist_;
diff --git a/OdfFile/Reader/Format/table_xlsx.cpp b/OdfFile/Reader/Format/table_xlsx.cpp
index 584f74fd8c..8ac8fd48f9 100644
--- a/OdfFile/Reader/Format/table_xlsx.cpp
+++ b/OdfFile/Reader/Format/table_xlsx.cpp
@@ -548,7 +548,7 @@ void table_table_column::xlsx_convert(oox::xlsx_conversion_context & Context)
 							bool set_default = false;
 							if (columnsRepeated > 100) set_default = true;
 
-							size_t style_ = Context.get_style_manager().xfId(NULL,NULL, &cellFormatProperties, NULL, L"", 0, set_default);	
+							size_t style_ = Context.get_style_manager().xfId(NULL, NULL, &cellFormatProperties, NULL, L"", 0, set_default);	
 
 							//if (set_default)
 							//	CP_XML_ATTR(L"style", style_ );
@@ -943,7 +943,7 @@ void table_table_cell::xlsx_convert(oox::xlsx_conversion_context & Context)
  //----------------------------------------------------------------------------------------------------------------------------------
 	bool is_style_visible = (!cellStyleName.empty() || defaultColumnCellStyle || !num_format.empty()) ? true : false;
 
-	if (is_AligmentWrap_)
+	if (count_paragraph > 1)
 	{
 	   is_style_visible = true;
 	   cellFormatProperties.fo_wrap_option_ = odf_types::wrap_option::Wrap;
@@ -1085,7 +1085,7 @@ void table_table_cell::xlsx_convert(oox::xlsx_conversion_context & Context)
                     }
 					else if ((xlsx_value_type == oox::XlsxCellType::str || xlsx_value_type == oox::XlsxCellType::inlineStr)  && str_val) 
                     {    
-						CP_XML_NODE(L"v")	{ CP_XML_CONTENT(str_val.get()); }
+						CP_XML_NODE(L"v")	{ CP_XML_CONTENT(XmlUtils::EncodeXmlString(str_val.get())); }
 					}
                     else if (!number_val.empty())
                     {
diff --git a/OdfFile/Reader/Format/text_elements.cpp b/OdfFile/Reader/Format/text_elements.cpp
index c1bbd66421..c297457fae 100644
--- a/OdfFile/Reader/Format/text_elements.cpp
+++ b/OdfFile/Reader/Format/text_elements.cpp
@@ -357,7 +357,7 @@ void paragraph::docx_convert(oox::docx_conversion_context & Context, _CP_OPT(std
         }
 		else next_masterPageName = boost::none;
     } 
-	if (next_section_ || next_end_section_) // remove in text::section  - GreekSynopsis.odt
+	if (!Context.process_headers_footers_ && (next_section_ || next_end_section_)) // remove in text::section  - GreekSynopsis.odt
 	{
 		Context.get_section_context().get_last().is_dump_ = true;
 		is_empty = false;
diff --git a/OdfFile/Writer/Converter/ConvertDrawing.cpp b/OdfFile/Writer/Converter/ConvertDrawing.cpp
index 369dc7fcbd..f96182c0b8 100644
--- a/OdfFile/Writer/Converter/ConvertDrawing.cpp
+++ b/OdfFile/Writer/Converter/ConvertDrawing.cpp
@@ -3005,6 +3005,7 @@ void OoxConverter::convert(PPTX::Logic::StyleRef *style_ref, int type)
 	}
 	else if (type == 3) 
 	{
+		index -= 1;
 		if (index >= 0 && index < (int)theme->themeElements.fmtScheme.effectStyleLst.size())
 		{
 			convert(&theme->themeElements.fmtScheme.effectStyleLst[index], nARGB);		
diff --git a/OdfFile/Writer/Format/style_graphic_properties.cpp b/OdfFile/Writer/Format/style_graphic_properties.cpp
index 6bc7e7f32e..e4d6a1364b 100644
--- a/OdfFile/Writer/Format/style_graphic_properties.cpp
+++ b/OdfFile/Writer/Format/style_graphic_properties.cpp
@@ -56,7 +56,9 @@ void graphic_format_properties::apply_from(const graphic_format_properties & Oth
 	_CP_APPLY_PROP2(draw_stroke_dash_); 
 	_CP_APPLY_PROP2(draw_marker_start_); 
 	_CP_APPLY_PROP2(draw_marker_end_); 
-	_CP_APPLY_PROP2(draw_textarea_horizontal_align_); 
+	_CP_APPLY_PROP2(draw_marker_start_width_);
+	_CP_APPLY_PROP2(draw_marker_end_width_);
+	_CP_APPLY_PROP2(draw_textarea_horizontal_align_);
 	_CP_APPLY_PROP2(draw_textarea_vertical_align_); 
 	_CP_APPLY_PROP2(draw_auto_grow_height_);
 	_CP_APPLY_PROP2(draw_auto_grow_width_);
diff --git a/PdfFile/PdfEditor.cpp b/PdfFile/PdfEditor.cpp
index f20adefb59..0778d35b7f 100644
--- a/PdfFile/PdfEditor.cpp
+++ b/PdfFile/PdfEditor.cpp
@@ -847,9 +847,10 @@ bool CObjectsManager::DecRefCount(int nID)
 {
 	if (m_mUniqueRef.find(nID) != m_mUniqueRef.end())
 	{
-		if (m_mUniqueRef[nID].pObj->IsHidden())
-			return false;
-		m_mUniqueRef[nID].pObj->SetHidden();
+		if (m_pDoc)
+			m_pDoc->FreeHidden(m_mUniqueRef[nID].pObj);
+		else
+			m_mUniqueRef[nID].pObj->SetHidden();
 		return true;
 	}
 	return false;
@@ -924,6 +925,7 @@ void CObjectsManager::DeleteObjTree(Object* obj, XRef* xref, int nStartRefID)
 	}
 	}
 }
+void CObjectsManager::SetDoc(PdfWriter::CDocument* pDoc) { m_pDoc = pDoc; }
 
 CPdfEditor::CPdfEditor(const std::wstring& _wsSrcFile, const std::wstring& _wsPassword, const std::wstring& _wsDstFile, CPdfReader* _pReader, CPdfWriter* _pWriter)
 {
@@ -1062,6 +1064,8 @@ bool CPdfEditor::IncrementalUpdates()
 					pDR->Fix();
 					continue;
 				}
+				else if (strcmp("Fields", chKey) == 0)
+					oAcroForm.dictGetVal(nIndex, &oTemp2);
 				else
 					oAcroForm.dictGetValNF(nIndex, &oTemp2);
 				DictToCDictObject(&oTemp2, pAcroForm, chKey);
@@ -1183,7 +1187,13 @@ void CPdfEditor::Close()
 	if (m_wsDstFile.empty())
 		 return;
 
-	if (m_nMode != Mode::WriteAppend)
+	if (m_nMode == Mode::Unknown)
+	{
+		if (m_wsDstFile != m_wsSrcFile && NSSystemPath::NormalizePath(m_wsDstFile) != NSSystemPath::NormalizePath(m_wsSrcFile))
+			NSFile::CFileBinary::Copy(m_wsSrcFile, m_wsDstFile);
+		return;
+	}
+	if (m_nMode == Mode::WriteNew)
 	{
 		m_pWriter->SaveToFile(m_wsDstFile);
 		return;
@@ -1444,12 +1454,14 @@ bool CPdfEditor::EditPage(int _nPageIndex, bool bSet, bool bActualPos)
 		return false;
 	}
 	pXref->Add(pPage, pPageRef.second);
+	bool bResources = false, bMediaBox = false, bCropBox = false, bRotate = false;
 	for (int nIndex = 0; nIndex < pageObj.dictGetLength(); ++nIndex)
 	{
 		Object oTemp;
 		char* chKey = pageObj.dictGetKey(nIndex);
 		if (strcmp("Resources", chKey) == 0)
 		{
+			bResources = true;
 			if (pageObj.dictGetVal(nIndex, &oTemp)->isDict())
 			{
 				PdfWriter::CResourcesDict* pDict = new PdfWriter::CResourcesDict(NULL, true, false);
@@ -1515,11 +1527,61 @@ bool CPdfEditor::EditPage(int _nPageIndex, bool bSet, bool bActualPos)
 		{
 			pageObj.dictGetValNF(nIndex, &oTemp);
 		}
+		else if (strcmp("MediaBox", chKey) == 0)
+		{
+			bMediaBox = true;
+			pageObj.dictGetValNF(nIndex, &oTemp);
+		}
+		else if (strcmp("CropBox", chKey) == 0)
+		{
+			bCropBox = true;
+			pageObj.dictGetValNF(nIndex, &oTemp);
+		}
+		else if (strcmp("Rotate", chKey) == 0)
+		{
+			bRotate = true;
+			pageObj.dictGetValNF(nIndex, &oTemp);
+		}
 		else
 			pageObj.dictGetValNF(nIndex, &oTemp);
 		DictToCDictObject(&oTemp, pPage, chKey);
 		oTemp.free();
 	}
+	if (!bResources || !bMediaBox || !bCropBox || !bRotate)
+	{
+		Page* pOPage = pCatalog->getPage(nPageIndex);
+		if (!bMediaBox)
+		{
+			PDFRectangle* pRect = pOPage->getMediaBox();
+			pPage->Add("MediaBox", PdfWriter::CArrayObject::CreateBox(pRect->x1, pRect->y1, pRect->x2, pRect->y2));
+		}
+
+		if (!bCropBox && pOPage->isCropped())
+		{
+			PDFRectangle* pRect = pOPage->getCropBox();
+			pPage->Add("CropBox", PdfWriter::CArrayObject::CreateBox(pRect->x1, pRect->y1, pRect->x2, pRect->y2));
+		}
+
+		if (!bRotate)
+			pPage->Add("Rotate", pOPage->getRotate());
+
+		if (!bResources)
+		{
+			Dict* pResources = pOPage->getResourceDict();
+			PdfWriter::CResourcesDict* pDict = pDoc->CreateResourcesDict(true, false);
+			pPage->Add("Resources", pDict);
+			for (int nIndex = 0; nIndex < pResources->getLength(); ++nIndex)
+			{
+				Object oRes;
+				char* chKey2 = pResources->getKey(nIndex);
+				if (strcmp("Font", chKey2) == 0 || strcmp("ExtGState", chKey2) == 0 || strcmp("XObject", chKey2) == 0 || strcmp("Shading", chKey2) == 0 || strcmp("Pattern", chKey2) == 0)
+					pResources->getVal(nIndex, &oRes);
+				else
+					pResources->getValNF(nIndex, &oRes);
+				DictToCDictObject(&oRes, pDict, chKey2);
+			}
+		}
+	}
 	pPage->Fix();
 	double dCTM[6] = { 1, 0, 0, 1, 0, 0 };
 	GetCTM(xref, &pageObj, dCTM);
@@ -1533,6 +1595,20 @@ bool CPdfEditor::EditPage(int _nPageIndex, bool bSet, bool bActualPos)
 			m_pWriter->EditPage(pPage);
 			m_nEditPage = _nPageIndex;
 		}
+		if (bCropBox)
+		{
+			Page* pOPage = pCatalog->getPage(nPageIndex);
+			if (pOPage->isCropped())
+			{
+				PDFRectangle* pCropBox = pOPage->getCropBox();
+				PdfWriter::CStream* pStream = pPage->GetStream();
+				pStream->WriteStr("1 0 0 1 ");
+				pStream->WriteReal(pCropBox->x1);
+				pStream->WriteChar(' ');
+				pStream->WriteReal(pCropBox->y2 - pOPage->getMediaBox()->y2);
+				pStream->WriteStr(" cm\012");
+			}
+		}
 		pPage->StartTransform(dCTM[0], dCTM[1], dCTM[2], dCTM[3], dCTM[4], dCTM[5]);
 		pPage->SetStrokeColor(0, 0, 0);
 		pPage->SetFillColor(0, 0, 0);
@@ -1979,6 +2055,7 @@ bool CPdfEditor::SplitPages(const int* arrPageIndex, unsigned int unLength)
 	if (!pPageTree)
 		return false;
 
+	m_mObjManager.SetDoc(pDoc);
 	int nPages = m_pReader->GetNumPages();
 	pPageTree->CreateFakePages(nPages);
 
@@ -2130,6 +2207,7 @@ bool CPdfEditor::MergePages(const std::wstring& wsPath, const std::wstring& wsPr
 	m_nOriginIndex = m_pReader->GetNumPages();
 	PDFDoc* pDocument = m_pReader->GetLastPDFDocument();
 	int nStartRefID = m_pReader->GetStartRefID(pDocument);
+	m_mObjManager.SetDoc(m_pWriter->GetDocument());
 	bool bRes = SplitPages(NULL, 0, pDocument, nStartRefID);
 	if (!bRes)
 		return false;
@@ -2189,7 +2267,7 @@ bool CPdfEditor::DeletePage(int nPageIndex)
 			oRef.initRef(nRefID, pEntry->type == xrefEntryCompressed ? 0 : pEntry->gen);
 			m_mObjManager.DeleteObjTree(&oRef, pPDFDocument->getXRef(), nStartRefID);
 		}
-		pPage->SetHidden();
+		pDoc->FreeHidden(pPage);
 	}
 
 	return pDoc->DeletePage(nPageIndex);
@@ -2522,6 +2600,10 @@ bool CPdfEditor::EditAnnot(int _nPageIndex, int nID)
 }
 bool CPdfEditor::DeleteAnnot(int nID, Object* oAnnots)
 {
+	PdfWriter::CDocument* pDoc = m_pWriter->GetDocument();
+	if (!pDoc)
+		return false;
+
 	PdfWriter::CObjectBase* pObj = m_mObjManager.GetObj(nID);
 	if (pObj)
 	{
@@ -2535,7 +2617,7 @@ bool CPdfEditor::DeleteAnnot(int nID, Object* oAnnots)
 			oRef.initRef(nRefID, pEntry->type == xrefEntryCompressed ? 0 : pEntry->gen);
 			m_mObjManager.DeleteObjTree(&oRef, pPDFDocument->getXRef(), nStartRefID);
 		}
-		pObj->SetHidden();
+		pDoc->FreeHidden(pObj);
 		return true;
 	}
 	if (m_nMode == Mode::WriteNew)
@@ -2543,8 +2625,7 @@ bool CPdfEditor::DeleteAnnot(int nID, Object* oAnnots)
 
 	PDFDoc* pPDFDocument = NULL;
 	int nPageIndex = m_pReader->GetPageIndex(m_nEditPage, &pPDFDocument);
-	PdfWriter::CDocument* pDoc = m_pWriter->GetDocument();
-	if (nPageIndex < 0 || !pPDFDocument || !pDoc)
+	if (nPageIndex < 0 || !pPDFDocument)
 		return false;
 
 	XRef* xref = pPDFDocument->getXRef();
@@ -2891,6 +2972,18 @@ void CPdfEditor::ClearPage()
 	pageObj.free();
 
 	pDoc->ClearPage();
+
+	Page* pOPage = pPDFDocument->getCatalog()->getPage(nPageIndex);
+	if (pOPage->isCropped())
+	{
+		PDFRectangle* pCropBox = pOPage->getCropBox();
+		PdfWriter::CStream* pStream = pDoc->GetCurPage()->GetStream();
+		pStream->WriteStr("1 0 0 1 ");
+		pStream->WriteReal(pCropBox->x1);
+		pStream->WriteChar(' ');
+		pStream->WriteReal(pCropBox->y2 - pOPage->getMediaBox()->y2);
+		pStream->WriteStr(" cm\012");
+	}
 }
 void CPdfEditor::AddShapeXML(const std::string& sXML)
 {
diff --git a/PdfFile/PdfEditor.h b/PdfFile/PdfEditor.h
index 1754fb85a0..6aeb4c646d 100644
--- a/PdfFile/PdfEditor.h
+++ b/PdfFile/PdfEditor.h
@@ -49,16 +49,20 @@ struct CObjectInfo
 class CObjectsManager
 {
 public:
+	CObjectsManager() : m_pDoc(NULL) {}
+
 	void AddObj(int nID, PdfWriter::CObjectBase* pObj);
 	PdfWriter::CObjectBase* GetObj(int nID);
 	bool IncRefCount(int nID);
 	bool DecRefCount(int nID);
 	int FindObj(PdfWriter::CObjectBase* pObj);
 	void DeleteObjTree(Object* obj, XRef* xref, int nStartRefID);
+	void SetDoc(PdfWriter::CDocument* pDoc);
 
 	std::vector<int> m_arrSplitAddPages;
 
 private:
+	PdfWriter::CDocument* m_pDoc;
 	std::map<int, CObjectInfo> m_mUniqueRef; // map уникальных объектов
 };
 
diff --git a/PdfFile/PdfFile.cpp b/PdfFile/PdfFile.cpp
index 4642ff15ba..d8993c2d2e 100644
--- a/PdfFile/PdfFile.cpp
+++ b/PdfFile/PdfFile.cpp
@@ -109,6 +109,8 @@ bool CPdfFile::EditPdf(const std::wstring& wsDstFile)
 	if (wsDstFile.empty() || !m_pInternal->pReader)
 		return false;
 
+	m_pInternal->pReader->CleanUp();
+
 	RELEASEOBJECT(m_pInternal->pWriter);
 	m_pInternal->pWriter = new CPdfWriter(m_pInternal->pAppFonts, false, this, true, m_pInternal->wsTempFolder);
 
@@ -340,7 +342,10 @@ void CPdfFile::GetPageInfo(int nPageIndex, double* pdWidth, double* pdHeight, do
 bool CPdfFile::MergePages(BYTE* data, DWORD length, int nMaxID, const std::string& sPrefixForm)
 {
 	if (!m_pInternal->pReader)
+	{
+		free(data);
 		return false;
+	}
 	return m_pInternal->pReader->MergePages(data, length, L"", nMaxID, sPrefixForm) && (m_pInternal->pReader->GetError() == 0);
 }
 bool CPdfFile::UnmergePages()
diff --git a/PdfFile/PdfFile.h b/PdfFile/PdfFile.h
index bb18e8a98f..717b9a7607 100644
--- a/PdfFile/PdfFile.h
+++ b/PdfFile/PdfFile.h
@@ -127,6 +127,7 @@ public:
 	virtual BYTE* GetLinks(int nPageIndex);
 
 	bool ValidMetaData();
+	// Захватывает полученную память malloc data
 	bool MergePages(BYTE* data, DWORD length, int nMaxID = 0, const std::string& sPrefixForm = "");
 	bool UnmergePages();
 	int GetRotate(int nPageIndex);
diff --git a/PdfFile/PdfReader.cpp b/PdfFile/PdfReader.cpp
index 7e568107e8..754d2e30be 100644
--- a/PdfFile/PdfReader.cpp
+++ b/PdfFile/PdfReader.cpp
@@ -244,6 +244,11 @@ void CPdfReader::Clear()
 		delete pPDFContext;
 	m_vPDFContext.clear();
 }
+void CPdfReader::CleanUp()
+{
+	while(UnmergePages());
+	m_eError = errNone;
+}
 
 bool CPdfReader::IsNeedCMap()
 {
@@ -365,7 +370,7 @@ void CPdfReader::SetCMapMemory(BYTE* pData, DWORD nSizeData)
 	if (m_vPDFContext.empty())
 		return;
 	CPdfReaderContext* pPDFContext = m_vPDFContext.back();
-	std::map<std::wstring, std::wstring> mFonts = PdfReader::CAnnotFonts::GetAllFonts(pPDFContext->m_pDocument, m_pFontManager, pPDFContext->m_pFontList);
+	std::map<std::wstring, std::wstring> mFonts = PdfReader::CAnnotFonts::GetAllFonts(pPDFContext->m_pDocument, m_pFontManager, pPDFContext->m_pFontList, false);
 	m_mFonts.insert(mFonts.begin(), mFonts.end());
 }
 void CPdfReader::SetCMapFolder(const std::wstring& sFolder)
@@ -404,6 +409,12 @@ bool CPdfReader::LoadFromMemory(NSFonts::IApplicationFonts* pAppFonts, BYTE* dat
 	m_eError = errNone;
 	m_nFileLength = length;
 
+	// Все LoadFromMemory копируют память в свои классы
+	// Кроме того MemStream использует malloc/free память
+	BYTE* pCopy = (BYTE*)malloc(length);
+	memcpy(pCopy, data, length);
+	data = pCopy;
+
 	return MergePages(data, length, wsOwnerPassword);
 }
 void CPdfReader::Close()
@@ -591,7 +602,10 @@ bool CPdfReader::ValidMetaData()
 bool CPdfReader::MergePages(BYTE* pData, DWORD nLength, const std::wstring& wsPassword, int nMaxID, const std::string& sPrefixForm)
 {
 	if (m_eError)
+	{
+		free(pData);
 		return false;
+	}
 
 	GString* owner_pswd = NSStrings::CreateString(wsPassword);
 	GString* user_pswd  = NSStrings::CreateString(wsPassword);
@@ -599,7 +613,8 @@ bool CPdfReader::MergePages(BYTE* pData, DWORD nLength, const std::wstring& wsPa
 	Object obj;
 	obj.initNull();
 	// будет освобожден в деструкторе PDFDoc
-	BaseStream *str = new MemStream((char*)pData, 0, nLength, &obj);
+	// Время его жизни > copy и makeSubStream из MemStream
+	BaseStream *str = new MemStream((char*)pData, 0, nLength, &obj, gTrue);
 	CPdfReaderContext* pContext = new CPdfReaderContext();
 	pContext->m_pDocument = new PDFDoc(str, owner_pswd, user_pswd);
 	pContext->m_pFontList = new PdfReader::CPdfFontList();
@@ -617,16 +632,14 @@ bool CPdfReader::MergePages(BYTE* pData, DWORD nLength, const std::wstring& wsPa
 	m_eError = pDoc ? pDoc->getErrorCode() : errMemory;
 	if (!pDoc || !pDoc->isOk())
 	{
+		// pData освобождается
 		delete pContext;
 		m_vPDFContext.pop_back();
 		return false;
 	}
 
-	if (!IsNeedCMap())
-	{
-		std::map<std::wstring, std::wstring> mFonts = PdfReader::CAnnotFonts::GetAllFonts(pDoc, m_pFontManager, pContext->m_pFontList);
-		m_mFonts.insert(mFonts.begin(), mFonts.end());
-	}
+	std::map<std::wstring, std::wstring> mFonts = PdfReader::CAnnotFonts::GetAllFonts(pDoc, m_pFontManager, pContext->m_pFontList, IsNeedCMap());
+	m_mFonts.insert(mFonts.begin(), mFonts.end());
 
 	return true;
 }
@@ -661,17 +674,14 @@ bool CPdfReader::MergePages(const std::wstring& wsFile, const std::wstring& wsPa
 		return false;
 	}
 
-	if (!IsNeedCMap())
-	{
-		std::map<std::wstring, std::wstring> mFonts = PdfReader::CAnnotFonts::GetAllFonts(pDoc, m_pFontManager, pContext->m_pFontList);
-		m_mFonts.insert(mFonts.begin(), mFonts.end());
-	}
+	std::map<std::wstring, std::wstring> mFonts = PdfReader::CAnnotFonts::GetAllFonts(pDoc, m_pFontManager, pContext->m_pFontList, IsNeedCMap());
+	m_mFonts.insert(mFonts.begin(), mFonts.end());
 
 	return true;
 }
 bool CPdfReader::UnmergePages()
 {
-	if (m_vPDFContext.size() < 1)
+	if (m_vPDFContext.size() <= 1)
 		return false;
 	CPdfReaderContext* pPDFContext = m_vPDFContext.back();
 	delete pPDFContext;
diff --git a/PdfFile/PdfReader.h b/PdfFile/PdfReader.h
index 6f34c5d46e..9c0a18c3e0 100644
--- a/PdfFile/PdfReader.h
+++ b/PdfFile/PdfReader.h
@@ -62,6 +62,7 @@ public:
 	bool LoadFromMemory(NSFonts::IApplicationFonts* pAppFonts, BYTE* data, DWORD length, const std::wstring& owner_password = L"", const std::wstring& user_password = L"");
 
 	void Close();
+	void CleanUp();
 
 	void SetParams(COfficeDrawingPageParams* pParams);
 	std::wstring GetTempDirectory();
@@ -77,6 +78,7 @@ public:
 	int GetMaxRefID();
 	int GetNumPages();
 	bool ValidMetaData();
+	// Захватывает полученную память malloc data
 	bool MergePages(BYTE* pData, DWORD nLength, const std::wstring& wsPassword = L"", int nMaxID = 0, const std::string& sPrefixForm = "");
 	bool MergePages(const std::wstring& wsFile, const std::wstring& wsPassword = L"", int nMaxID = 0, const std::string& sPrefixForm = "");
 	bool UnmergePages();
diff --git a/PdfFile/PdfWriter.cpp b/PdfFile/PdfWriter.cpp
index fba724cbbe..d93251a37d 100644
--- a/PdfFile/PdfWriter.cpp
+++ b/PdfFile/PdfWriter.cpp
@@ -1869,10 +1869,14 @@ HRESULT CPdfWriter::AddAnnotField(NSFonts::IApplicationFonts* pAppFonts, CAnnotF
 	double dPageH = pD->GetType() == PdfWriter::object_type_NUMBER ? ((PdfWriter::CNumberObject*)pD)->Get() : ((PdfWriter::CRealObject*)pD)->Get();
 	pD = pPageBox->Get(0);
 	double dPageX = pD->GetType() == PdfWriter::object_type_NUMBER ? ((PdfWriter::CNumberObject*)pD)->Get() : ((PdfWriter::CRealObject*)pD)->Get();
+	pPageBox = (PdfWriter::CArrayObject*)pPage->Get("MediaBox");
+	pD = pPageBox->Get(3);
+	double dPageY = pD->GetType() == PdfWriter::object_type_NUMBER ? ((PdfWriter::CNumberObject*)pD)->Get() : ((PdfWriter::CRealObject*)pD)->Get();
+	dPageY -= dPageH;
 	oInfo.GetBounds(dX1, dY1, dX2, dY2);
 	pAnnot->SetRect({dPageX + dX1, dPageH - dY1, dPageX + dX2, dPageH - dY2});
 
-	pAnnot->SetPage(pPage, pPage->GetWidth(), dPageH, dPageX);
+	pAnnot->SetPage(pPage, pPage->GetWidth(), dPageH, dPageX, dPageY);
 	pAnnot->SetAnnotFlag(oInfo.GetAnnotFlag());
 	pAnnot->SetDocument(m_pDocument);
 
@@ -2204,10 +2208,10 @@ HRESULT CPdfWriter::AddAnnotField(NSFonts::IApplicationFonts* pAppFonts, CAnnotF
 				pPr->GetInRect(dRD1, dRD2, dRD3, dRD4);
 				PdfWriter::CArrayObject* pArray = new PdfWriter::CArrayObject();
 				pAP->Add("BBox", pArray);
-				pArray->Add(dRD1);
-				pArray->Add(MM_2_PT(m_dPageHeight) - dRD4);
-				pArray->Add(dRD3);
-				pArray->Add(MM_2_PT(m_dPageHeight) - dRD2);
+				pArray->Add(dRD1 + dPageX);
+				pArray->Add(dPageH - dRD4);
+				pArray->Add(dRD3 + dPageX);
+				pArray->Add(dPageH - dRD2);
 				pStampAnnot->SetAPStream(pAP);
 			}
 			else if (bRenderCopy)
@@ -2283,6 +2287,8 @@ HRESULT CPdfWriter::AddAnnotField(NSFonts::IApplicationFonts* pAppFonts, CAnnotF
 			pWidgetAnnot->SetParentID(pPr->GetParentID());
 		if (nFlags & (1 << 18))
 			pWidgetAnnot->SetT(pPr->GetT());
+		else
+			pWidgetAnnot->Remove("T");
 		if (nFlags & (1 << 20))
 			pWidgetAnnot->SetOMetadata(pPr->GetOMetadata());
 
@@ -2676,7 +2682,13 @@ HRESULT CPdfWriter::EditWidgetParents(NSFonts::IApplicationFonts* pAppFonts, CWi
 		}
 
 		if (nFlags & (1 << 2))
-			pParentObj->Add("DV", new PdfWriter::CStringObject((U_TO_UTF8(pParent->sDV)).c_str(), true));
+		{
+			std::string sDV = U_TO_UTF8(pParent->sDV);
+			if (sFT == "Btn")
+				pParentObj->Add("DV", sDV.c_str());
+			else
+				pParentObj->Add("DV", new PdfWriter::CStringObject(sDV.c_str(), true));
+		}
 		if (nFlags & (1 << 3))
 		{
 			PdfWriter::CArrayObject* pArray = new PdfWriter::CArrayObject();
@@ -2791,7 +2803,11 @@ HRESULT CPdfWriter::EditWidgetParents(NSFonts::IApplicationFonts* pAppFonts, CWi
 							pKid->SetAP_N_Yes((bRadiosInUnison || nType == PdfWriter::WidgetCheckbox) ? mNameAP_N_Yes[sOptI] : std::to_wstring(i));
 
 						if (((bRadiosInUnison || nType == PdfWriter::WidgetCheckbox) && sOptI == sOpt) || (!bRadiosInUnison && i == nOptIndex))
+						{
+							if (i == nOptIndex)
+								pKid->RenameAP_N_Yes(pParent->sV);
 							sV = pKid->Yes();
+						}
 						else
 							pKid->Off();
 					}
@@ -2917,10 +2933,7 @@ HRESULT CPdfWriter::EditWidgetParents(NSFonts::IApplicationFonts* pAppFonts, CWi
 		if (pPBWidget->m_nI >= 0)
 			DrawButtonWidget(pAppFonts, pPBWidget, 0, arrForm[pPBWidget->m_nI]);
 		if (pPBWidget->m_nRI >= 0)
-		{
-			if (arrForm[pPBWidget->m_nRI])
-				DrawButtonWidget(pAppFonts, pPBWidget, 1, arrForm[pPBWidget->m_nRI]);
-		}
+			DrawButtonWidget(pAppFonts, pPBWidget, 1, arrForm[pPBWidget->m_nRI]);
 		else if (pPBWidget->m_nI >= 0)
 		{
 			PdfWriter::CDictObject* pObj = dynamic_cast<PdfWriter::CDictObject*>(pPBWidget->Get("AP"));
@@ -2932,10 +2945,7 @@ HRESULT CPdfWriter::EditWidgetParents(NSFonts::IApplicationFonts* pAppFonts, CWi
 			}
 		}
 		if (pPBWidget->m_nIX >= 0)
-		{
-			if (arrForm[pPBWidget->m_nIX])
-				DrawButtonWidget(pAppFonts, pPBWidget, 2, arrForm[pPBWidget->m_nIX]);
-		}
+			DrawButtonWidget(pAppFonts, pPBWidget, 2, arrForm[pPBWidget->m_nIX]);
 		else if (pPBWidget->m_nI >= 0)
 		{
 			PdfWriter::CDictObject* pObj = dynamic_cast<PdfWriter::CDictObject*>(pPBWidget->Get("AP"));
@@ -3928,7 +3938,7 @@ PdfWriter::CAnnotAppearanceObject* CPdfWriter::DrawAP(PdfWriter::CAnnotation* pA
 	PdfWriter::CPage* pFakePage = new PdfWriter::CPage(m_pDocument);
 	m_pPage = pFakePage;
 	m_pDocument->SetCurPage(pFakePage);
-	m_pPage->StartTransform(1, 0, 0, 1, -pAnnot->GetPageX(), 0);
+	m_pPage->StartTransform(1, 0, 0, 1, -pAnnot->GetPageX(), pAnnot->GetPageY());
 
 	PdfWriter::CAnnotAppearanceObject* pAP = pAnnot->StartAP(0);
 
@@ -4327,14 +4337,16 @@ void CPdfWriter::DrawButtonWidget(NSFonts::IApplicationFonts* pAppFonts, PdfWrit
 	if (nAP == 0)
 		wsValue = pButtonWidget->GetCA();
 	else if (nAP == 1)
-		wsValue = pButtonWidget->GetRC().empty() ? pButtonWidget->GetCA() : pButtonWidget->GetRC();
+		wsValue = pButtonWidget->GetRC();
 	else
-		wsValue = pButtonWidget->GetAC().empty() ? pButtonWidget->GetCA() : pButtonWidget->GetAC();
+		wsValue = pButtonWidget->GetAC();
 
 	if (!pButtonWidget->HaveBorder() && pButtonWidget->HaveBC())
 		pButtonWidget->SetBorder(0, 1, {});
+	if (nTP != 1 && !pForm)
+		nTP = 0;
 
-	if (!wsValue.empty() && nTP != 1)
+	if (nTP != 1)
 	{
 		PdfWriter::CFontCidTrueType* pFont = pButtonWidget->GetFont();
 		if (!pFont)
@@ -4361,7 +4373,7 @@ void CPdfWriter::DrawButtonWidget(NSFonts::IApplicationFonts* pAppFonts, PdfWrit
 			dShiftBorder = 0;
 
 		bool bFont = GetFontData(pAppFonts, wsValue, pFont, isBold, isItalic, pUnicodes, unLen, pCodes, ppFonts);
-		if (!bFont)
+		if (!wsValue.empty() && !bFont)
 		{
 			RELEASEARRAYOBJECTS(pUnicodes);
 			RELEASEARRAYOBJECTS(pCodes);
diff --git a/PdfFile/SrcReader/PdfAnnot.cpp b/PdfFile/SrcReader/PdfAnnot.cpp
index 2b76414112..0aafb5198f 100644
--- a/PdfFile/SrcReader/PdfAnnot.cpp
+++ b/PdfFile/SrcReader/PdfAnnot.cpp
@@ -527,7 +527,7 @@ bool CAnnotFonts::IsBaseFont(const std::wstring& wsName)
 		   wsName == L"Helvetica-Oblique" || wsName == L"Symbol" || wsName == L"Times-Bold" || wsName == L"Times-BoldItalic" ||
 		   wsName == L"Times-Italic" || wsName == L"Times-Roman" || wsName == L"ZapfDingbats";
 }
-std::map<std::wstring, std::wstring> CAnnotFonts::GetAllFonts(PDFDoc* pdfDoc, NSFonts::IFontManager* pFontManager, CPdfFontList* pFontList)
+std::map<std::wstring, std::wstring> CAnnotFonts::GetAllFonts(PDFDoc* pdfDoc, NSFonts::IFontManager* pFontManager, CPdfFontList* pFontList, bool bIsNeedCMap)
 {
 	std::map<std::wstring, std::wstring> mFonts;
 
@@ -569,7 +569,7 @@ std::map<std::wstring, std::wstring> CAnnotFonts::GetAllFonts(PDFDoc* pdfDoc, NS
 			std::string sActualFontName;
 			std::wstring wsFileName;
 			bool bBold = false, bItalic = false;
-			wsFileName = GetFontData(pdfDoc, pFontManager, pFontList, &oFontRef, sFontName, sActualFontName, bBold, bItalic);
+			wsFileName = GetFontData(pdfDoc, pFontManager, pFontList, &oFontRef, sFontName, sActualFontName, bBold, bItalic, bIsNeedCMap);
 
 			if (!sActualFontName.empty())
 			{
@@ -593,7 +593,7 @@ std::map<std::wstring, std::wstring> CAnnotFonts::GetAllFonts(PDFDoc* pdfDoc, NS
 				std::string sFontKey;
 				if (GetFontFromAP(pdfDoc, pField, &oFontRef, sFontKey) && std::find(arrUniqueFontsRef.begin(), arrUniqueFontsRef.end(), oFontRef.getRefNum()) == arrUniqueFontsRef.end())
 				{
-					wsFileName = GetFontData(pdfDoc, pFontManager, pFontList, &oFontRef, sFontName, sActualFontName, bBold, bItalic);
+					wsFileName = GetFontData(pdfDoc, pFontManager, pFontList, &oFontRef, sFontName, sActualFontName, bBold, bItalic, bIsNeedCMap);
 
 					std::wstring wsFontName = UTF8_TO_U(sFontName);
 					if (sActualFontName.empty() && mFonts.find(wsFontName) == mFonts.end())
@@ -680,7 +680,7 @@ std::map<std::wstring, std::wstring> CAnnotFonts::GetAllFonts(PDFDoc* pdfDoc, NS
 
 	return mFonts;
 }
-std::wstring CAnnotFonts::GetFontData(PDFDoc* pdfDoc, NSFonts::IFontManager* pFontManager, CPdfFontList *pFontList, Object* oFontRef, std::string& sFontName, std::string& sActualFontName, bool& bBold, bool& bItalic)
+std::wstring CAnnotFonts::GetFontData(PDFDoc* pdfDoc, NSFonts::IFontManager* pFontManager, CPdfFontList *pFontList, Object* oFontRef, std::string& sFontName, std::string& sActualFontName, bool& bBold, bool& bItalic, bool bIsNeedCMap)
 {
 	bBold = false, bItalic = false;
 	XRef* xref = pdfDoc->getXRef();
@@ -895,7 +895,16 @@ std::map<std::wstring, std::wstring> CAnnotFonts::GetAnnotFont(PDFDoc* pdfDoc, N
 			continue;
 
 		std::wstring wsFontName = UTF8_TO_U(sFontName);
-		NSFonts::IFontStream* pFontStream = pMemoryStorage ? (NSFonts::IFontStream*)pMemoryStorage->Get(sFontPath) : NULL;
+		NSFonts::IFontStream* pFontStream = NULL;
+		bool bRemoveStream = false;
+		if (pMemoryStorage)
+			pFontStream = (NSFonts::IFontStream*)pMemoryStorage->Get(sFontPath);
+		else
+		{
+			pFontStream = NSFonts::NSStream::Create();
+			pFontStream->CreateFromFile(sFontPath);
+			bRemoveStream = true;
+		}
 		if (pFontStream)
 		{
 			bool bNew = true;
@@ -914,6 +923,8 @@ std::map<std::wstring, std::wstring> CAnnotFonts::GetAnnotFont(PDFDoc* pdfDoc, N
 			if (bNew)
 				pAppFontList->Add(sFontPath, pFontStream);
 		}
+		if (bRemoveStream)
+			RELEASEINTERFACE(pFontStream);
 		mFontFreeText[wsFontName] = sFontPath;
 	}
 
diff --git a/PdfFile/SrcReader/PdfAnnot.h b/PdfFile/SrcReader/PdfAnnot.h
index 39dab706fb..d1ed82e77f 100644
--- a/PdfFile/SrcReader/PdfAnnot.h
+++ b/PdfFile/SrcReader/PdfAnnot.h
@@ -658,8 +658,8 @@ class CAnnotFonts final
 {
 public:
 	static bool IsBaseFont(const std::wstring& wsName);
-	static std::map<std::wstring, std::wstring> GetAllFonts(PDFDoc* pdfDoc, NSFonts::IFontManager* pFontManager, CPdfFontList* pFontList);
-	static std::wstring GetFontData(PDFDoc* pdfDoc, NSFonts::IFontManager* pFontManager, CPdfFontList *pFontList, Object* oFontRef, std::string& sFontName, std::string& sActualFontName, bool& bBold, bool& bItalic);
+	static std::map<std::wstring, std::wstring> GetAllFonts(PDFDoc* pdfDoc, NSFonts::IFontManager* pFontManager, CPdfFontList* pFontList, bool bIsNeedCMap);
+	static std::wstring GetFontData(PDFDoc* pdfDoc, NSFonts::IFontManager* pFontManager, CPdfFontList *pFontList, Object* oFontRef, std::string& sFontName, std::string& sActualFontName, bool& bBold, bool& bItalic, bool bIsNeedCMap = false);
 	static bool GetFontFromAP(PDFDoc* pdfDoc, AcroFormField* pField, Object* oFontRef, std::string& sFontKey);
 	static std::map<std::wstring, std::wstring> GetAnnotFont(PDFDoc* pdfDoc, NSFonts::IFontManager* pFontManager, CPdfFontList *pFontList, Object* oAnnotRef);
 	static std::map<std::wstring, std::wstring> GetFreeTextFont(PDFDoc* pdfDoc, NSFonts::IFontManager* pFontManager, CPdfFontList* pFontList, Object* oAnnotRef, std::vector<CAnnotMarkup::CFontData*>& arrRC);
diff --git a/PdfFile/SrcReader/RendererOutputDev.cpp b/PdfFile/SrcReader/RendererOutputDev.cpp
index 003e6738b5..48fe5b3524 100644
--- a/PdfFile/SrcReader/RendererOutputDev.cpp
+++ b/PdfFile/SrcReader/RendererOutputDev.cpp
@@ -43,6 +43,7 @@
 #include "../lib/xpdf/Stream.h"
 #include "../lib/xpdf/PDFDoc.h"
 #include "../lib/xpdf/CharCodeToUnicode.h"
+#include "../lib/xpdf/TextString.h"
 #include "XmlUtils.h"
 
 #include "../../DesktopEditor/graphics/pro/Graphics.h"
@@ -705,8 +706,15 @@ namespace PdfReader
 		if (oFontObject.isDict())
 		{
 			Dict* pFontDict = oFontObject.getDict();
-			Object oFontDescriptor;
-			if (pFontDict->lookup("FontDescriptor", &oFontDescriptor)->isDict())
+			Object oFontDescriptor, oDescendantFonts;
+			pFontDict->lookup("FontDescriptor", &oFontDescriptor);
+			if (!oFontDescriptor.isDict() && pFontDict->lookup("DescendantFonts", &oDescendantFonts)->isArray())
+			{
+				oFontDescriptor.free(); oFontObject.free();
+				if (oDescendantFonts.arrayGet(0, &oFontObject)->isDict())
+					oFontObject.dictLookup("FontDescriptor", &oFontDescriptor);
+			}
+			if (oFontDescriptor.isDict())
 			{
 				Object oDictItem;
 				oFontDescriptor.dictLookup("FontName", &oDictItem);
@@ -717,6 +725,12 @@ namespace PdfReader
 				oDictItem.free();
 
 				oFontDescriptor.dictLookup("FontFamily", &oDictItem);
+				if (oDictItem.isString())
+				{
+					TextString* s = new TextString(oDictItem.getString());
+					oFontSelect.wsAltName = new std::wstring(NSStringExt::CConverter::GetUnicodeFromUTF32(s->getUnicode(), s->getLength()));
+					delete s;
+				}
 				oDictItem.free();
 
 				oFontDescriptor.dictLookup("FontStretch", &oDictItem);
@@ -777,14 +791,14 @@ namespace PdfReader
 
 				oFontDescriptor.dictLookup("MissingWidth", &oDictItem);
 				oDictItem.free();
-
 			}
 			else
 				oFontSelect.wsName = new std::wstring(wsFontBaseName);
-			oFontDescriptor.free();
+			oFontDescriptor.free(); oDescendantFonts.free();
 		}
 		else
 			oFontSelect.wsName = new std::wstring(wsFontBaseName);
+		oFontObject.free();
 
 		pFontInfo = pFontManager->GetFontInfoByParams(oFontSelect);
 		return pFontInfo;
@@ -2478,6 +2492,7 @@ namespace PdfReader
 				unsigned int lUnicode = (unsigned int)wsUnicodeText[0];
 				long lStyle;
 				m_pRenderer->get_FontStyle(&lStyle);
+				m_pFontManager->SetStringGID(FALSE);
 				m_pFontManager->LoadFontFromFile(sFontPath, 0, dOldSize, 72, 72);
 
 				NSFonts::IFontFile* pFontFile = m_pFontManager->GetFile();
@@ -2514,6 +2529,7 @@ namespace PdfReader
 								return;
 							}
 							m_pRenderer->put_FontPath(wsFileName);
+							m_pFontManager->LoadFontFromFile(wsFileName, 0, dOldSize, 72, 72);
 							bReplace = true;
 						}
 					}
diff --git a/PdfFile/SrcWriter/Annotation.cpp b/PdfFile/SrcWriter/Annotation.cpp
index 1b5dd790b8..03baa7468a 100644
--- a/PdfFile/SrcWriter/Annotation.cpp
+++ b/PdfFile/SrcWriter/Annotation.cpp
@@ -240,12 +240,13 @@ namespace PdfWriter
 	{
 		Add("F", nAnnotFlag);
 	}
-	void CAnnotation::SetPage(CPage* pPage, double dW, double dH, double dX)
+	void CAnnotation::SetPage(CPage* pPage, double dW, double dH, double dX, double dY)
 	{
 		Add("P", pPage);
-		m_dPageWidth  = dW;
+		m_dPageW  = dW;
 		m_dPageH = dH;
 		m_dPageX = dX;
+		m_dPageY = dY;
 	}
 	void CAnnotation::SetBE(BYTE nType, const double& dBE)
 	{
@@ -366,9 +367,9 @@ namespace PdfWriter
 		pAnnot->SetAnnotFlag(28);
 
 		TRect oRect = m_oRect;
-		oRect.fLeft = m_dPageWidth - 100 - (oRect.fRight - oRect.fLeft);
+		oRect.fLeft = m_dPageW - 100 - (oRect.fRight - oRect.fLeft);
 		oRect.fBottom -= 100;
-		oRect.fRight = m_dPageWidth;
+		oRect.fRight = m_dPageW;
 		pAnnot->SetRect(oRect);
 
 		return pAnnot;
@@ -1712,6 +1713,25 @@ namespace PdfWriter
 	}
 	void CPushButtonWidget::SetAP(CXObject* pForm, BYTE nAP, unsigned short* pCodes, unsigned int unCount, double dX, double dY, double dLineW, double dLineH, CFontCidTrueType** ppFonts)
 	{
+		if (!pForm && !pCodes)
+		{
+			CObjectBase* pAP = Get("AP");
+			if (pAP && pAP->GetType() == object_type_DICT)
+			{
+				CDictObject* pDAP = (CDictObject*)pAP;
+				std::string sAP = nAP == 0 ? "N" : (nAP == 1 ? "R" : "D");
+				pDAP->Remove(sAP);
+			}
+			if (m_pMK)
+			{
+				std::string sAP = nAP == 0 ? "I" : (nAP == 1 ? "RI" : "IX");
+				m_pMK->Remove(sAP);
+			}
+			if (nAP != 0)
+				return;
+
+		}
+
 		if (!m_pAppearance)
 		{
 			m_pAppearance = new CAnnotAppearance(m_pXref, this);
@@ -1857,6 +1877,11 @@ namespace PdfWriter
 			std::string sAP = nAP == 0 ? "I" : (nAP == 1 ? "RI" : "IX");
 			m_pMK->Add(sAP, pForm);
 		}
+		else if (m_pMK)
+		{
+			std::string sAP = nAP == 0 ? "I" : (nAP == 1 ? "RI" : "IX");
+			m_pMK->Remove(sAP);
+		}
 
 		if (pCodes)
 		{
diff --git a/PdfFile/SrcWriter/Annotation.h b/PdfFile/SrcWriter/Annotation.h
index f452f3b3b4..d9c00afc15 100644
--- a/PdfFile/SrcWriter/Annotation.h
+++ b/PdfFile/SrcWriter/Annotation.h
@@ -160,9 +160,10 @@ namespace PdfWriter
 
 		CXref* m_pXref;
 		TRect  m_oRect;
-		double m_dPageWidth  = 0;
+		double m_dPageW  = 0;
 		double m_dPageH = 0;
 		double m_dPageX = 0;
+		double m_dPageY = 0;
 		CDocument* m_pDocument;
 		CAnnotAppearance* m_pAppearance;
 
@@ -184,7 +185,7 @@ namespace PdfWriter
 		void SetRect(const TRect& oRect);
 		void SetBorder(BYTE nType, double dWidth, const std::vector<double>& arrDash);
 		void SetAnnotFlag(const int& nAnnotFlag);
-		void SetPage(CPage* pPage, double dW = 0, double dH = 0, double dX = 0);
+		void SetPage(CPage* pPage, double dW = 0, double dH = 0, double dX = 0, double dY = 0);
 		void SetBE(BYTE nType, const double& dBE);
 		void SetContents(const std::wstring& wsText);
 		void SetNM(const std::wstring& wsNM);
@@ -206,6 +207,7 @@ namespace PdfWriter
 		double GetWidth()  { return abs(m_oRect.fRight - m_oRect.fLeft); }
 		double GetHeight() { return abs(m_oRect.fTop - m_oRect.fBottom); }
 		double GetPageX() { return m_dPageX; }
+		double GetPageY() { return m_dPageY; }
 		double GetPageH() { return m_dPageH; }
 	};
 	class CPopupAnnotation : public CAnnotation
diff --git a/PdfFile/SrcWriter/Document.cpp b/PdfFile/SrcWriter/Document.cpp
index 5a2600b6ca..43c89ecfce 100644
--- a/PdfFile/SrcWriter/Document.cpp
+++ b/PdfFile/SrcWriter/Document.cpp
@@ -1314,6 +1314,18 @@ namespace PdfWriter
 	{
 		m_pXref->Add(pObj);
 	}
+	void CDocument::FreeHidden(CObjectBase* pObj)
+	{
+		pObj->SetHidden();
+		if (!pObj->IsIndirect())
+			return;
+		TXrefEntry* pEntry = m_pXref->GetEntryByObjectId(pObj->GetObjId());
+		if (pEntry)
+		{
+			pEntry->nEntryType = 'f'; // FREE_ENTRY
+			pEntry->unGenNo = MAX_GENERATION_NUM;
+		}
+	}
 	bool CDocument::CheckFieldName(CFieldBase* pField, const std::string& sName)
 	{
 		CFieldBase* pBase = m_mFields[sName];
@@ -1326,19 +1338,24 @@ namespace PdfWriter
 				pParent->Add("Ff", pBase->GetFieldFlag());
 				pParent->Add("FT", pBase->GetFieldType());
 
+				CObjectBase* pT = pBase->Get("T");
+				if (pT && pT->GetType() == object_type_STRING)
+					pParent->Add("T", pT->Copy());
+
+				CObjectBase* pV = pBase->Get("V");
+				if (pV && pV->GetType() == object_type_STRING)
+					pParent->Add("V", pV->Copy());
+
+				CObjectBase* pAA = pBase->Get("AA");
+				if (pAA)
+					pParent->Add("AA", pAA->Copy());
+
 				CTextField* pTextField = dynamic_cast<CTextField*>(pBase);
 				int nMaxLen = 0;
-				if (pTextField)
+				if (pTextField && 0 != (nMaxLen = pTextField->GetMaxLen()))
 				{
-					CObjectBase* pT = pBase->Get("T");
-					if (pT && pT->GetType() == object_type_STRING)
-						pParent->Add("V", pT->Copy());
-
-					if (0 != (nMaxLen = pTextField->GetMaxLen()))
-					{
-						pBase->Remove("MaxLen");
-						pParent->Add("MaxLen", nMaxLen);
-					}
+					pBase->Remove("MaxLen");
+					pParent->Add("MaxLen", nMaxLen);
 				}
 
 				pBase->SetParent(pParent);
@@ -1968,7 +1985,9 @@ namespace PdfWriter
 			CArrayObject* pArrayImage = new CArrayObject();
 			pMetaOForm->Add("Image", pArrayImage);
 		}
-		pArrayMeta->Add(new CStringObject(sXML.c_str()));
+		CStringObject* pXML = new CStringObject();
+		pXML->Set(sXML.c_str(), false, false, -1);
+		pArrayMeta->Add(pXML);
 
 		CDictObject* pBDC = new CDictObject();
 		pBDC->Add("MCID", pArrayMeta->GetCount() - 1);
diff --git a/PdfFile/SrcWriter/Document.h b/PdfFile/SrcWriter/Document.h
index eee6dd8b22..7f089b02be 100644
--- a/PdfFile/SrcWriter/Document.h
+++ b/PdfFile/SrcWriter/Document.h
@@ -210,6 +210,7 @@ namespace PdfWriter
 		void              SetAcroForm(CDictObject* pObj);
 		CDictObject*      GetAcroForm() { return m_pAcroForm; }
 		CResourcesDict*   CreateResourcesDict(bool bInline, bool bProcSet);
+		void              FreeHidden(CObjectBase* pObj);
 	private:		  
 					  
 		char*             GetTTFontTag();
diff --git a/PdfFile/SrcWriter/Field.cpp b/PdfFile/SrcWriter/Field.cpp
index 235e50fbdb..bd29d6d50f 100644
--- a/PdfFile/SrcWriter/Field.cpp
+++ b/PdfFile/SrcWriter/Field.cpp
@@ -456,6 +456,7 @@ namespace PdfWriter
 		Remove("FT");
 		Remove("Ff");
 		Remove("V");
+		Remove("AA");
 	}
 	void CFieldBase::SetFieldHint(const std::wstring& wsHint)
 	{
@@ -3244,11 +3245,14 @@ namespace PdfWriter
 			double ca = cos(45.0 / 180.0 * M_PI);
 			double cx = 0, cy = 0, r = dR - dBorder * 1.5;
 			double bezierCircle = 0.55228475 * r;
+			std::string sBG = pAnnot->GetBGforAP(-0.250977, true);
+			if (sBG.empty())
+				sBG = "0.749023 G";
 
 			if (nBorderType == EBorderType::Inset)
 				m_pStream->WriteStr(bN ? "0.501953 G" : "0 G");
 			else // Beveled
-				m_pStream->WriteStr(bN ? "1 G" : pAnnot->GetBGforAP(-0.250977, true).c_str());
+				m_pStream->WriteStr(bN ? "1 G" : sBG.c_str());
 
 			m_pStream->WriteStr("\012q\012");
 			StreamWriteCM(m_pStream, ca, ca, -ca, ca, dCX, dCY);
@@ -3260,7 +3264,7 @@ namespace PdfWriter
 			if (nBorderType == EBorderType::Inset)
 				m_pStream->WriteStr(bN ? "0.75293 G" : "1 G");
 			else // Beveled
-				m_pStream->WriteStr(bN ? pAnnot->GetBGforAP(-0.250977, true).c_str() : "1 G");
+				m_pStream->WriteStr(bN ? sBG.c_str() : "1 G");
 
 			m_pStream->WriteStr("\012q\012");
 			StreamWriteCM(m_pStream, ca, ca, -ca, ca, dCX, dCY);
@@ -3326,10 +3330,14 @@ namespace PdfWriter
 		// Граница
 		if (nBorderType == EBorderType::Beveled || nBorderType == EBorderType::Inset)
 		{
+			std::string sBG = pAnnot->GetBGforAP(-0.250977);
+			if (sBG.empty())
+				sBG = "0.749023 g";
+
 			if (nBorderType == EBorderType::Inset)
 				m_pStream->WriteStr(bN ? "0.501953 g" : "0 g");
 			else // Beveled
-				m_pStream->WriteStr(bN ? "1 g" : pAnnot->GetBGforAP(-0.250977).c_str());
+				m_pStream->WriteStr(bN ? "1 g" : sBG.c_str());
 			m_pStream->WriteStr("\012");
 
 			StreamWriteXYMove(m_pStream, dBorder, dBorder);
@@ -3343,7 +3351,7 @@ namespace PdfWriter
 			if (nBorderType == EBorderType::Inset)
 				m_pStream->WriteStr(bN ? "0.75293 g" : "1 g");
 			else // Beveled
-				m_pStream->WriteStr(bN ? pAnnot->GetBGforAP(-0.250977).c_str() : "1 g");
+				m_pStream->WriteStr(bN ? sBG.c_str() : "1 g");
 			m_pStream->WriteStr("\012");
 
 			StreamWriteXYMove(m_pStream, dW - dBorder, dH - dBorder);
diff --git a/PdfFile/SrcWriter/Image.cpp b/PdfFile/SrcWriter/Image.cpp
index 3da811029c..77ed88c68c 100644
--- a/PdfFile/SrcWriter/Image.cpp
+++ b/PdfFile/SrcWriter/Image.cpp
@@ -110,7 +110,7 @@ namespace PdfWriter
 
         if (pCorrectBuffer != NULL)
         {
-            this->LoadJpeg(pCorrectBuffer, nBufferSize, unWidth, unHeight, bGrayScale);
+            this->LoadJpeg(pCorrectBuffer, nBufferSize, unWidth, unHeight, false);
             free(pCorrectBuffer);
             return;
         }
diff --git a/PdfFile/SrcWriter/Objects.cpp b/PdfFile/SrcWriter/Objects.cpp
index fc43c51df9..b2880d1dcd 100644
--- a/PdfFile/SrcWriter/Objects.cpp
+++ b/PdfFile/SrcWriter/Objects.cpp
@@ -144,12 +144,17 @@ namespace PdfWriter
 		m_unLen  = 0;
 		Set(sValue, isUTF16, isDictValue);
 	}
+	CStringObject::CStringObject()
+	{
+		m_pValue = NULL;
+		m_unLen  = 0;
+	}
 	CStringObject::~CStringObject()
 	{
 		if (m_pValue)
 			delete[] m_pValue;
 	}
-	void CStringObject::Set(const char* sValue, bool isUTF16, bool isDictValue)
+	void CStringObject::Set(const char* sValue, bool isUTF16, bool isDictValue, int nMax)
 	{
 		if (m_pValue)
 		{
@@ -157,7 +162,7 @@ namespace PdfWriter
 			m_unLen = 0;
 		}
 
-		unsigned int unLen = StrLen(sValue, LIMIT_MAX_STRING_LEN);
+		unsigned int unLen = StrLen(sValue, nMax);
 		m_pValue = new BYTE[unLen + 1];
 		StrCpy((char*)m_pValue, (char*)sValue, (char*)(m_pValue + unLen));
 		m_unLen = unLen;
@@ -883,7 +888,7 @@ namespace PdfWriter
 				if (pEntry->nEntryType == FREE_ENTRY)
 				{
 					if (pNextFreeObj)
-						pNextFreeObj->unByteOffset = pXref->m_unStartOffset;
+						pNextFreeObj->unByteOffset = pXref->m_unStartOffset + unIndex;
 					pNextFreeObj = pEntry;
 				}
 				else
diff --git a/PdfFile/SrcWriter/Objects.h b/PdfFile/SrcWriter/Objects.h
index 1c5d9de08a..5b95d7ae7a 100644
--- a/PdfFile/SrcWriter/Objects.h
+++ b/PdfFile/SrcWriter/Objects.h
@@ -297,8 +297,9 @@ namespace PdfWriter
 	{
 	public:
 		CStringObject(const char* sValue, bool isUTF16 = false, bool isDictValue = false);
+		CStringObject();
 		virtual ~CStringObject();
-		void Set(const char* sValue, bool isUTF16, bool isDictValue);
+		void Set(const char* sValue, bool isUTF16, bool isDictValue, int nMax = LIMIT_MAX_STRING_LEN);
 		const BYTE*  GetString() const
 		{
 			return (const BYTE*)m_pValue;
@@ -508,16 +509,16 @@ namespace PdfWriter
 		CXref(CDocument* pDocument, unsigned int unRemoveId, unsigned int unRemoveGen);
 		~CXref();
 
-		TXrefEntry* GetEntry(unsigned int unIndex) const;
-		TXrefEntry* GetEntryByObjectId(unsigned int unObjectId) const;
-		CXref*      GetXrefByObjectId(unsigned int unObjectId);
-		void        Add(CObjectBase* pObject, unsigned int unObjectGen = 0);
-		void        WriteToStream(CStream* pStream, CEncrypt* pEncrypt, bool bStream = false);
-		void        SetPrev(CXref* pPrev)
+		TXrefEntry*  GetEntry(unsigned int unIndex) const;
+		TXrefEntry*  GetEntryByObjectId(unsigned int unObjectId) const;
+		CXref*       GetXrefByObjectId(unsigned int unObjectId);
+		void         Add(CObjectBase* pObject, unsigned int unObjectGen = 0);
+		void         WriteToStream(CStream* pStream, CEncrypt* pEncrypt, bool bStream = false);
+		void         SetPrev(CXref* pPrev)
 		{
-			m_pPrev = pPrev;
+			m_pPrev  = pPrev;
 		}
-		void        SetPrevAddr(unsigned int unAddr)
+		void         SetPrevAddr(unsigned int unAddr)
 		{
 			m_unAddr = unAddr;
 		}
@@ -529,15 +530,15 @@ namespace PdfWriter
 		{
 			return m_unStartOffset + m_arrEntries.size();
 		}
-		int         GetCount() const
+		int          GetCount() const
 		{
 			return m_arrEntries.size();
 		}
-		CDictObject*GetTrailer() const
+		CDictObject* GetTrailer() const
 		{
 			return m_pTrailer;
 		}
-		bool        IsPDFA() const;
+		bool         IsPDFA() const;
 
 	private:
 
diff --git a/PdfFile/lib/xpdf/Annot.cc b/PdfFile/lib/xpdf/Annot.cc
index 07d2917212..17481f95ac 100644
--- a/PdfFile/lib/xpdf/Annot.cc
+++ b/PdfFile/lib/xpdf/Annot.cc
@@ -242,7 +242,7 @@ Annot::Annot(PDFDoc *docA, Dict *dict, Ref *refA, const char* AP, const char* AS
       }
       obj2.free();
     }
-  } else if (type && type->cmp("FreeText")) {
+  } else if (type && type->cmp("FreeText") && type->cmp("Link")) {
     bBorder = gFalse;
   }
   obj1.free();
diff --git a/PdfFile/lib/xpdf/Stream.cc b/PdfFile/lib/xpdf/Stream.cc
index 8119de4f75..60e94518ca 100644
--- a/PdfFile/lib/xpdf/Stream.cc
+++ b/PdfFile/lib/xpdf/Stream.cc
@@ -914,14 +914,14 @@ void FileStream::moveStart(int delta) {
 // MemStream
 //------------------------------------------------------------------------
 
-MemStream::MemStream(char *bufA, Guint startA, Guint lengthA, Object *dictA):
+MemStream::MemStream(char *bufA, Guint startA, Guint lengthA, Object *dictA, GBool needFreeA):
     BaseStream(dictA) {
   buf = bufA;
   start = startA;
   length = lengthA;
   bufEnd = buf + start + length;
   bufPtr = buf + start;
-  needFree = gFalse;
+  needFree = needFreeA;
 }
 
 MemStream::~MemStream() {
diff --git a/PdfFile/lib/xpdf/Stream.h b/PdfFile/lib/xpdf/Stream.h
index 521bcb12e3..8c33892f15 100644
--- a/PdfFile/lib/xpdf/Stream.h
+++ b/PdfFile/lib/xpdf/Stream.h
@@ -347,7 +347,7 @@ private:
 class MemStream: public BaseStream {
 public:
 
-  MemStream(char *bufA, Guint startA, Guint lengthA, Object *dictA);
+  MemStream(char *bufA, Guint startA, Guint lengthA, Object *dictA, GBool needFreeA = gFalse);
   virtual ~MemStream();
   virtual Stream *copy();
   virtual Stream *makeSubStream(GFileOffset start, GBool limited,
diff --git a/RtfFile/Format/RtfProperty.cpp b/RtfFile/Format/RtfProperty.cpp
index c960a78e1a..1969079b65 100644
--- a/RtfFile/Format/RtfProperty.cpp
+++ b/RtfFile/Format/RtfProperty.cpp
@@ -463,13 +463,16 @@ std::wstring RtfColor::RenderToRtf(RenderParameter  oRenderParameter )
 std::wstring RtfColor::RenderToOOX(RenderParameter oRenderParameter)
 {
     std::wstring sResult;
+
+	oRenderParameter.sValue = ToHexColor();
+
 	if( RENDER_TO_OOX_PARAM_COLOR_VALUE == oRenderParameter.nType )
 	{
-		sResult +=  ToHexColor();
+		sResult += oRenderParameter.sValue;
 	}
 	else if( RENDER_TO_OOX_PARAM_COLOR_ATTRIBUTE == oRenderParameter.nType )
 	{
-		sResult +=  oRenderParameter.sValue;
+		sResult += L"w:color=\"" + oRenderParameter.sValue + L"\"";
 	}
 	else if( RENDER_TO_OOX_PARAM_COLOR_TAG == oRenderParameter.nType )
 	{
@@ -481,7 +484,7 @@ std::wstring RtfColor::RenderToOOX(RenderParameter oRenderParameter)
 	}
 	else
 	{
-        sResult += L"<w:color w:val=\"" + ToHexColor() + L"\"/>";
+        sResult += L"<w:color w:val=\"" + oRenderParameter.sValue + L"\"/>";
 	}
 	return sResult;
 }
@@ -1755,7 +1758,7 @@ std::wstring RtfCharProperty::RenderToOOX(RenderParameter oRenderParameter)
 	if(  PROP_DEF != m_nUnderlineColor  )
 	{
 		RtfColor oCurColor;
-		if( true == poRtfDocument->m_oColorTable.GetColor( m_nUnderlineColor, oCurColor ) )
+		if ( true == poRtfDocument->m_oColorTable.GetColor( m_nUnderlineColor, oCurColor ) )
 		{
 			RenderParameter oNewParam = oRenderParameter;
 			oNewParam.nType = RENDER_TO_OOX_PARAM_COLOR_ATTRIBUTE;
diff --git a/X2tConverter/src/lib/csv.h b/X2tConverter/src/lib/csv.h
index c86f7d9c8e..24ff3d6a91 100644
--- a/X2tConverter/src/lib/csv.h
+++ b/X2tConverter/src/lib/csv.h
@@ -54,6 +54,7 @@ namespace NExtractTools
 		SerializeCommon::ReadFileType(params.getXmlOptions(), fileType, nCodePage, sDelimiter, saveFileType, lcid);
 
 		CSVReader csvReader;
+		csvReader.readToxmlCache_ = true;
         _UINT32 nRes = csvReader.Read(sFrom, oXlsx, nCodePage, sDelimiter, lcid);
 
 		if (SUCCEEDED_X2T(nRes))
diff --git a/X2tConverter/src/lib/pdf_image.h b/X2tConverter/src/lib/pdf_image.h
index 8d2d776ae5..6d2431847b 100644
--- a/X2tConverter/src/lib/pdf_image.h
+++ b/X2tConverter/src/lib/pdf_image.h
@@ -707,6 +707,9 @@ namespace NExtractTools
 				password = params.getSavePassword();
 				if (!oPdfResult.LoadFromFile(sFrom, L"", password, password))
 					return false;
+
+				RELEASEOBJECT(params.m_sPassword);
+				params.m_sPassword = new std::wstring(params.getSavePassword());
 			}
 			else
 				return false;
diff --git a/X2tConverter/test/TestOOOXml2Odf/test.cpp b/X2tConverter/test/TestOOOXml2Odf/test.cpp
index 3eff835e5c..d23d2ab397 100644
--- a/X2tConverter/test/TestOOOXml2Odf/test.cpp
+++ b/X2tConverter/test/TestOOOXml2Odf/test.cpp
@@ -112,7 +112,7 @@ TEST(OOXml2OdfTest,FractionWideslash)
 	StMath StCorrect,StResult;
 	StResult.m_wsSemantic = oTest.GetOdf();
 	StResult.m_wsAnnotation = oTest.GetAnnotation();
-	StCorrect.m_wsSemantic = L"<mfrac bevelled=\"true\" /><mn>1</mn><mn>2</mn></mfrac>";
+	StCorrect.m_wsSemantic = L"<mfrac bevelled=\"true\"><mn>1</mn><mn>2</mn></mfrac>";
 	StCorrect.m_wsAnnotation = L"{ 1 } wideslash { 2 } ";
 	EXPECT_EQ(StResult,StCorrect);
 }
@@ -128,7 +128,7 @@ TEST(OOXml2OdfTest,FractionSlash)
 	StResult.m_wsSemantic = oTest.GetOdf();
 	StResult.m_wsAnnotation = oTest.GetAnnotation();
 	StCorrect.m_wsSemantic = L"<mrow><mn>1</mn><mo stretchy=\"false\">/</mo><mn>2</mn></mrow>";
-	StCorrect.m_wsAnnotation = L"1 / 2 ";
+	StCorrect.m_wsAnnotation = L"{ 1 } / { 2 } ";
 	EXPECT_EQ(StResult,StCorrect);
 }
 TEST(OOXml2OdfTest,Delimiter)
@@ -549,7 +549,7 @@ TEST(OOXml2OdfTest,EmptyNumerator)
 		pElement->fromXML(oReader);
 	StarMath::COOXml2Odf oTest;
 	oTest.StartConversion(pElement);
-	std::wstring wsOdf = L"<math xmlns=\"http://www.w3.org/1998/Math/MathML\" display=\"block\"><semantics><mfrac><mn>2</mn></mfrac><annotation encoding=\"StarMath 5.0\">{ } over { 2 } </annotation></semantics></math>";
+	std::wstring wsOdf = L"<math xmlns=\"http://www.w3.org/1998/Math/MathML\" display=\"block\"><semantics><mfrac><mi mathvariant=\"normal\">\u2751</mi><mn>2</mn></mfrac><annotation encoding=\"StarMath 5.0\">{\u0026lt;\u003F\u0026gt;} over { 2 } </annotation></semantics></math>";
 	EXPECT_EQ(oTest.GetOdf(),wsOdf);
 }
 TEST(OOXml2OdfTest,IdentityMatrixDiagonally)