Fix link

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

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

@@ -514,9 +514,6 @@ namespace NSCSS
 			return true;
 		}
 
-		if (!arSelectors.back().m_pCompiledStyle->Empty())
-			return true;
-
 		arSelectors.back().m_pCompiledStyle->SetDpi(m_nDpi);
 		unsigned int unStart = 0;
 
@@ -525,8 +522,8 @@ namespace NSCSS
 		if (itFound != arSelectors.crend())
 			unStart = itFound.base() - arSelectors.cbegin();
 
-		std::vector<std::wstring> arNodes = CalculateAllNodes(arSelectors, unStart, arSelectors.size());
-		std::vector<std::wstring> arPrevNodes = CalculateAllNodes(arSelectors, 0, unStart);
+		std::vector<std::wstring> arNodes = CalculateAllNodes(arSelectors, unStart);
+		std::vector<std::wstring> arPrevNodes;
 		bool bInTable = false;
 
 		for (size_t i = 0; i < unStart; ++i)
@@ -551,7 +548,6 @@ namespace NSCSS
 			{
 				arSelectors[i].m_pCompiledStyle->m_oBackground.Clear();
 				arSelectors[i].m_pCompiledStyle->m_oBorder.Clear();
-				arSelectors[i].m_pCompiledStyle->m_oDisplay.Clear();
 			}
 
 			arSelectors[i].m_pCompiledStyle->AddStyle(arSelectors[i].m_mAttributes, i + 1);
@@ -596,14 +592,11 @@ namespace NSCSS
 	}
 	#endif
 
-	std::vector<std::wstring> CCssCalculator_Private::CalculateAllNodes(const std::vector<CNode> &arSelectors, unsigned int unStart, unsigned int unEnd)
+	std::vector<std::wstring> CCssCalculator_Private::CalculateAllNodes(const std::vector<CNode> &arSelectors, unsigned int unStart)
 	{
-		if ((0 != unEnd && (unEnd < unStart || unEnd > arSelectors.size())) || (unStart == unEnd))
-			return std::vector<std::wstring>();
-
 		std::vector<std::wstring> arNodes;
-
-		for (std::vector<CNode>::const_reverse_iterator oNode = arSelectors.rbegin() + ((0 != unEnd) ? (arSelectors.size() - unEnd) : 0); oNode != arSelectors.rend() - unStart; ++oNode)
+		
+		for (std::vector<CNode>::const_reverse_iterator oNode = arSelectors.rbegin(); oNode != arSelectors.rend() - unStart; ++oNode)
 		{
 			if (!oNode->m_wsName.empty())
 				arNodes.push_back(oNode->m_wsName);
@@ -634,7 +627,7 @@ namespace NSCSS
 		if (arNextNodes.empty())
 			return;
 
-		const std::vector<CElement*> arTempPrev = pElement->GetPrevElements(arNextNodes.cbegin(), arNextNodes.cend());
+		const std::vector<CElement*> arTempPrev = pElement->GetPrevElements(arNextNodes.crbegin() + 1, arNextNodes.crend());
 		const std::vector<CElement*> arTempKins = pElement->GetNextOfKin(wsName, arClasses);
 
 		if (!arTempPrev.empty())
@@ -651,19 +644,20 @@ namespace NSCSS
 
 		std::vector<const CElement*> arFindedElements;
 
-		std::wstring wsName, wsClasses, wsId;
+		std::wstring wsName, wsId;
 		std::vector<std::wstring> arClasses;
 
 		if (!arNodes.empty() && arNodes.back()[0] == L'#')
 		{
 			wsId = arNodes.back();
 			arNodes.pop_back();
+			arNextNodes.push_back(wsId);
 		}
 
 		if (!arNodes.empty() && arNodes.back()[0] == L'.')
 		{
-			wsClasses = arNodes.back();
-			arClasses = NS_STATIC_FUNCTIONS::GetWordsW(wsClasses, false, L" ");
+			arClasses = NS_STATIC_FUNCTIONS::GetWordsW(arNodes.back(), false, L" ");
+			arNextNodes.push_back(arNodes.back());
 			arNodes.pop_back();
 		}
 
@@ -671,6 +665,7 @@ namespace NSCSS
 		{
 			wsName = arNodes.back();
 			arNodes.pop_back();
+			arNextNodes.push_back(wsName);
 		}
 
 		if (!wsId.empty())
@@ -729,14 +724,6 @@ namespace NSCSS
 			          { return oFirstElement->GetWeight() > oSecondElement->GetWeight(); });
 		}
 
-		if (!wsId.empty())
-			arNextNodes.push_back(wsId);
-
-		if (!wsClasses.empty())
-			arNextNodes.push_back(wsClasses);
-
-		arNextNodes.push_back(wsName);
-
 		return arFindedElements;
 	}
 
@@ -751,7 +738,7 @@ namespace NSCSS
 		if (arSelectors.empty())
 			return false;
 
-		std::vector<std::wstring> arNodes = CalculateAllNodes(arSelectors, 0, arSelectors.size());
+		std::vector<std::wstring> arNodes = CalculateAllNodes(arSelectors);
 		std::vector<std::wstring> arNextNodes;
 
 		for (size_t i = 0; i < arSelectors.size(); ++i)

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

@@ -110,7 +110,7 @@ namespace NSCSS
 		void ClearPageData();
 		#endif
 
-		std::vector<std::wstring> CalculateAllNodes(const std::vector<CNode>& arSelectors, unsigned int unStart, unsigned int unEnd);
+		std::vector<std::wstring> CalculateAllNodes(const std::vector<CNode>& arSelectors, unsigned int unStart = 0);
 		std::vector<const CElement*> FindElements(std::vector<std::wstring>& arNodes, std::vector<std::wstring>& arNextNodes);
 
 		void AddStyles(const std::string& sStyle);

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

@@ -176,14 +176,14 @@ namespace NSCSS
 		return arElements;
 	}
 
-	std::vector<CElement *> CElement::GetPrevElements(const std::vector<std::wstring>::const_iterator& oNodesBegin, const std::vector<std::wstring>::const_iterator& oNodesEnd) const
+	std::vector<CElement *> CElement::GetPrevElements(const std::vector<std::wstring>::const_reverse_iterator& oNodesRBegin, const std::vector<std::wstring>::const_reverse_iterator& oNodesREnd) const
 	{
-		if (oNodesBegin >= oNodesEnd || m_arPrevElements.empty())
+		if (oNodesRBegin >= oNodesREnd || m_arPrevElements.empty())
 			return std::vector<CElement*>();
 
 		std::vector<CElement*> arElements;
 
-		for (std::vector<std::wstring>::const_iterator iWord = oNodesBegin; iWord != oNodesEnd; ++iWord)
+		for (std::vector<std::wstring>::const_reverse_iterator iWord = oNodesRBegin; iWord != oNodesREnd; ++iWord)
 		{
 			if ((*iWord)[0] == L'.' && ((*iWord).find(L" ") != std::wstring::npos))
 			{
@@ -195,7 +195,7 @@ namespace NSCSS
 						if (oPrevElement->m_sSelector == wsClass)
 						{
 							arElements.push_back(oPrevElement);
-							std::vector<CElement*> arTempElements = oPrevElement->GetPrevElements(iWord + 1, oNodesEnd);
+							std::vector<CElement*> arTempElements = oPrevElement->GetPrevElements(iWord + 1, oNodesREnd);
 							arElements.insert(arElements.end(), arTempElements.begin(), arTempElements.end());
 						}
 					}
@@ -208,8 +208,9 @@ namespace NSCSS
 					if (oPrevElement->m_sSelector == *iWord)
 					{
 						arElements.push_back(oPrevElement);
-						std::vector<CElement*> arTempElements = oPrevElement->GetPrevElements(iWord + 1, oNodesEnd);
+						std::vector<CElement*> arTempElements = oPrevElement->GetPrevElements(iWord + 1, oNodesREnd);
 						arElements.insert(arElements.end(), arTempElements.begin(), arTempElements.end());
+	//                    return arElements;
 					}
 				}
 			}

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

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

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

@@ -18,7 +18,6 @@ namespace NSCSS
 		std::wstring m_wsId;    // Id тэга
 		std::wstring m_wsStyle; // Стиль тэга
 		std::map<std::wstring, std::wstring> m_mAttributes; // Остальные аттрибуты тэга
-		//TODO:: возможно использование std::wstring излишне
 
 		#ifdef CSS_CALCULATOR_WITH_XHTML
 		CCompiledStyle *m_pCompiledStyle;

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

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

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

@@ -436,13 +436,12 @@ namespace NSCSS
 		return true;
 	}
 
-	bool CDigit::SetValue(const double& dValue, UnitMeasure enUnitMeasure, unsigned int unLevel, bool bHardMode)
+	bool CDigit::SetValue(const double& dValue, unsigned int unLevel, bool bHardMode)
 	{
 		if (CHECK_CONDITIONS && !bHardMode)
 			return false;
 
-		m_enUnitMeasure = enUnitMeasure;
-		m_oValue        = dValue;
+		m_oValue  = dValue;
 
 		if (UINT_MAX == unLevel)
 			m_unLevel++;
@@ -1327,23 +1326,6 @@ namespace NSCSS
 		return true;
 	}
 
-	CMatrix& CMatrix::operator+=(const CMatrix& oMatrix)
-	{
-		m_oValue.insert(m_oValue.end(), oMatrix.m_oValue.begin(), oMatrix.m_oValue.end());
-		return *this;
-	}
-
-	CMatrix& CMatrix::operator-=(const CMatrix& oMatrix)
-	{
-		for (MatrixValues::const_reverse_iterator itElement = oMatrix.m_oValue.crbegin(); itElement < oMatrix.m_oValue.crend(); ++itElement)
-		{
-			if (!m_oValue.empty() && m_oValue.back() == *itElement)
-				m_oValue.pop_back();
-		}
-
-		return *this;
-	}
-
 	// DISPLAY
 	CDisplay::CDisplay()
 	{
@@ -1483,21 +1465,6 @@ namespace NSCSS
 		       (m_eWhiteSpace.Empty() || m_eWhiteSpace == EWhiteSpace::Normal);
 	}
 
-	void CDisplay::Clear()
-	{
-		m_oX.Clear();
-		m_oY.Clear();
-		m_oWidth.Clear();
-		m_oHeight.Clear();
-
-		m_oHAlign.Clear();
-		m_oVAlign.Clear();
-
-		m_oDisplay.Clear();
-
-		m_eWhiteSpace.Clear();
-	}
-
 	CDisplay &CDisplay::operator+=(const CDisplay &oDisplay)
 	{
 		m_oX          += oDisplay.m_oX;
@@ -1776,9 +1743,9 @@ namespace NSCSS
 		return m_oWidth.SetValue(wsNewValue, unLevel, bHardMode);
 	}
 
-	bool CBorderSide::SetWidth(const double& dValue, UnitMeasure enUnitMeasure, unsigned int unLevel, bool bHardMode)
+	bool CBorderSide::SetWidth(const double& dValue, unsigned int unLevel, bool bHardMode)
 	{
-		return m_oWidth.SetValue(dValue, enUnitMeasure, unLevel, bHardMode);
+		return m_oWidth.SetValue(dValue, unLevel, bHardMode);
 	}
 
 	bool CBorderSide::SetStyle(const std::wstring &wsValue, unsigned int unLevel, bool bHardMode)
@@ -1954,14 +1921,14 @@ namespace NSCSS
 		return bResult;
 	}
 
-	bool CBorder::SetWidth(const double& dValue, UnitMeasure enUnitMeasure, unsigned int unLevel, bool bHardMode)
+	bool CBorder::SetWidth(const double& dValue, unsigned int unLevel, bool bHardMode)
 	{
 		bool bResult = false;
 
-		if (m_oLeft  .SetWidth(dValue, enUnitMeasure, unLevel, bHardMode)) bResult = true;
-		if (m_oTop   .SetWidth(dValue, enUnitMeasure, unLevel, bHardMode)) bResult = true;
-		if (m_oRight .SetWidth(dValue, enUnitMeasure, unLevel, bHardMode)) bResult = true;
-		if (m_oBottom.SetWidth(dValue, enUnitMeasure, unLevel, bHardMode)) bResult = true;
+		if (m_oLeft  .SetWidth(dValue, unLevel, bHardMode)) bResult = true;
+		if (m_oTop   .SetWidth(dValue, unLevel, bHardMode)) bResult = true;
+		if (m_oRight .SetWidth(dValue, unLevel, bHardMode)) bResult = true;
+		if (m_oBottom.SetWidth(dValue, unLevel, bHardMode)) bResult = true;
 
 		return bResult;
 	}
@@ -2005,9 +1972,9 @@ namespace NSCSS
 		return m_oLeft.SetWidth(wsValue, unLevel, bHardMode);
 	}
 
-	bool CBorder::SetWidthLeftSide(const double& dValue, UnitMeasure enUnitMeasure, unsigned int unLevel, bool bHardMode)
+	bool CBorder::SetWidthLeftSide(const double& dValue, unsigned int unLevel, bool bHardMode)
 	{
-		return m_oLeft.SetWidth(dValue, enUnitMeasure, unLevel, bHardMode);
+		return m_oLeft.SetWidth(dValue, unLevel, bHardMode);
 	}
 
 	bool CBorder::SetStyleLeftSide(const std::wstring &wsValue, unsigned int unLevel, bool bHardMode)
@@ -2030,9 +1997,9 @@ namespace NSCSS
 		return m_oTop.SetWidth(wsValue, unLevel, bHardMode);
 	}
 
-	bool CBorder::SetWidthTopSide(const double& dValue, UnitMeasure enUnitMeasure, unsigned int unLevel, bool bHardMode)
+	bool CBorder::SetWidthTopSide(const double& dValue, unsigned int unLevel, bool bHardMode)
 	{
-		return m_oTop.SetWidth(dValue, enUnitMeasure, unLevel, bHardMode);
+		return m_oTop.SetWidth(dValue, unLevel, bHardMode);
 	}
 
 	bool CBorder::SetStyleTopSide(const std::wstring &wsValue, unsigned int unLevel, bool bHardMode)
@@ -2055,9 +2022,9 @@ namespace NSCSS
 		return m_oRight.SetWidth(wsValue, unLevel, bHardMode);
 	}
 
-	bool CBorder::SetWidthRightSide(const double& dValue, UnitMeasure enUnitMeasure, unsigned int unLevel, bool bHardMode)
+	bool CBorder::SetWidthRightSide(const double& dValue, unsigned int unLevel, bool bHardMode)
 	{
-		return m_oRight.SetWidth(dValue, enUnitMeasure, unLevel, bHardMode);
+		return m_oRight.SetWidth(dValue, unLevel, bHardMode);
 	}
 
 	bool CBorder::SetStyleRightSide(const std::wstring &wsValue, unsigned int unLevel, bool bHardMode)
@@ -2080,9 +2047,9 @@ namespace NSCSS
 		return m_oBottom.SetWidth(wsValue, unLevel, bHardMode);
 	}
 
-	bool CBorder::SetWidthBottomSide(const double& dValue, UnitMeasure enUnitMeasure, unsigned int unLevel, bool bHardMode)
+	bool CBorder::SetWidthBottomSide(const double& dValue, unsigned int unLevel, bool bHardMode)
 	{
-		return m_oBottom.SetWidth(dValue, enUnitMeasure, unLevel, bHardMode);
+		return m_oBottom.SetWidth(dValue, unLevel, bHardMode);
 	}
 
 	bool CBorder::SetStyleBottomSide(const std::wstring &wsValue, unsigned int unLevel, bool bHardMode)
@@ -2381,49 +2348,39 @@ namespace NSCSS
 		return m_oTop.SetValue(wsValue, unLevel, bHardMode);
 	}
 
+	bool CIndent::SetTop(const double& dValue, unsigned int unLevel, bool bHardMode)
+	{
+		return m_oTop.SetValue(dValue, unLevel, bHardMode);
+	}
+
 	bool CIndent::SetRight(const std::wstring &wsValue, unsigned int unLevel, bool bHardMode)
 	{
 		return m_oRight.SetValue(wsValue, unLevel, bHardMode);
 	}
 
+	bool CIndent::SetRight(const double& dValue, unsigned int unLevel, bool bHardMode)
+	{
+		return m_oRight.SetValue(dValue, unLevel, bHardMode);
+	}
+
 	bool CIndent::SetBottom(const std::wstring &wsValue, unsigned int unLevel, bool bHardMode)
 	{
 		return m_oBottom.SetValue(wsValue, unLevel, bHardMode);
 	}
 
+	bool CIndent::SetBottom(const double& dValue, unsigned int unLevel, bool bHardMode)
+	{
+		return m_oBottom.SetValue(dValue, unLevel, bHardMode);
+	}
+
 	bool CIndent::SetLeft(const std::wstring &wsValue, unsigned int unLevel, bool bHardMode)
 	{
 		return m_oLeft.SetValue(wsValue, unLevel, bHardMode);
 	}
 
-	bool CIndent::SetValues(const double& dValue, UnitMeasure enUnitMeasure, unsigned int unLevel, bool bHardMode)
+	bool CIndent::SetLeft(const double& dValue, unsigned int unLevel, bool bHardMode)
 	{
-		const bool bTopResult    = SetTop    (dValue, enUnitMeasure, unLevel, bHardMode);
-		const bool bRightResult  = SetRight  (dValue, enUnitMeasure, unLevel, bHardMode);
-		const bool bBottomResult = SetBottom (dValue, enUnitMeasure, unLevel, bHardMode);
-		const bool bLeftResult   = SetLeft   (dValue, enUnitMeasure, unLevel, bHardMode);
-
-		return bTopResult || bRightResult || bBottomResult || bLeftResult;
-	}
-
-	bool CIndent::SetTop(const double& dValue, UnitMeasure enUnitMeasure, unsigned int unLevel, bool bHardMode)
-	{
-		return m_oTop.SetValue(dValue, enUnitMeasure, unLevel, bHardMode);
-	}
-
-	bool CIndent::SetRight(const double& dValue, UnitMeasure enUnitMeasure, unsigned int unLevel, bool bHardMode)
-	{
-		return m_oRight.SetValue(dValue, enUnitMeasure, unLevel, bHardMode);
-	}
-
-	bool CIndent::SetBottom(const double& dValue, UnitMeasure enUnitMeasure, unsigned int unLevel, bool bHardMode)
-	{
-		return m_oBottom.SetValue(dValue, enUnitMeasure, unLevel, bHardMode);
-	}
-
-	bool CIndent::SetLeft(const double& dValue, UnitMeasure enUnitMeasure, unsigned int unLevel, bool bHardMode)
-	{
-		return m_oLeft.SetValue(dValue, enUnitMeasure, unLevel, bHardMode);
+		return m_oLeft.SetValue(dValue, unLevel, bHardMode);
 	}
 
 	void CIndent::UpdateAll(const double& dParentFontSize, const double& dCoreFontSize)
@@ -2715,9 +2672,9 @@ namespace NSCSS
 		return m_oSize.SetValue(wsNewValue, unLevel, bHardMode);
 	}
 
-	bool CFont:: SetSize(const double& dValue, UnitMeasure enUnitMeasure, unsigned int unLevel, bool bHardMode)
+	bool CFont:: SetSize(const double& dValue, unsigned int unLevel, bool bHardMode)
 	{
-		return m_oSize.SetValue(dValue, enUnitMeasure, unLevel, bHardMode);
+		return m_oSize.SetValue(dValue, unLevel, bHardMode);
 	}
 
 	bool CFont::SetLineHeight(const std::wstring &wsValue, unsigned int unLevel, bool bHardMode)
@@ -3042,31 +2999,6 @@ namespace NSCSS
 		return m_oHeader.SetValue(wsValue, unLevel, bHardMode);
 	}
 
-	bool CPage::SetWidth(const double& dValue, UnitMeasure enUnitMeasure, unsigned int unLevel, bool bHardMode)
-	{
-		return m_oWidth.SetValue(dValue, enUnitMeasure, unLevel, bHardMode);
-	}
-
-	bool CPage::SetHeight(const double& dValue, UnitMeasure enUnitMeasure, unsigned int unLevel, bool bHardMode)
-	{
-		return m_oHeight.SetValue(dValue, enUnitMeasure, unLevel, bHardMode);
-	}
-
-	bool CPage::SetMargin(const double& dValue, UnitMeasure enUnitMeasure, unsigned int unLevel, bool bHardMode)
-	{
-		return m_oMargin.SetValues(dValue, enUnitMeasure, unLevel, bHardMode);
-	}
-
-	bool CPage::SetFooter(const double& dValue, UnitMeasure enUnitMeasure, unsigned int unLevel, bool bHardMode)
-	{
-		return m_oFooter.SetValue(dValue, enUnitMeasure, unLevel, bHardMode);
-	}
-
-	bool CPage::SetHeader(const double& dValue, UnitMeasure enUnitMeasure, unsigned int unLevel, bool bHardMode)
-	{
-		return m_oHeader.SetValue(dValue, enUnitMeasure, unLevel, bHardMode);
-	}
-
 	const CDigit &CPage::GetWidth() const
 	{
 		return m_oWidth;

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

@@ -138,7 +138,7 @@ namespace NSCSS
 
 		bool SetValue(const std::wstring& wsValue, unsigned int unLevel = 0, bool bHardMode = true) override;
 		bool SetValue(const CDigit& oValue);
-		bool SetValue(const double& dValue, UnitMeasure enUnitMeasure, unsigned int unLevel = 0, bool bHardMode = true);
+		bool SetValue(const double& dValue, unsigned int unLevel, bool bHardMode);
 
 		bool Empty() const override;
 		bool Zero() const;
@@ -302,8 +302,6 @@ namespace NSCSS
 		void ApplyTranform(Aggplus::CMatrix& oMatrix, Aggplus::MatrixOrder order = Aggplus::MatrixOrderPrepend) const;
 
 		bool operator==(const CMatrix& oMatrix) const;
-		CMatrix& operator+=(const CMatrix& oMatrix);
-		CMatrix& operator-=(const CMatrix& oMatrix);
 	};
 
 	class CEnum : public CValue<int>
@@ -373,7 +371,6 @@ namespace NSCSS
 		const CEnum& GetWhiteSpace() const;
 
 		bool Empty() const;
-		void Clear();
 
 		CDisplay& operator+=(const CDisplay& oDisplay);
 		bool      operator==(const CDisplay& oDisplay) const;
@@ -475,7 +472,7 @@ namespace NSCSS
 
 		bool SetValue(const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
 		bool SetWidth(const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
-		bool SetWidth(const double& dValue, UnitMeasure enUnitMeasure, unsigned int unLevel, bool bHardMode = false);
+		bool SetWidth(const double& dValue, unsigned int unLevel, bool bHardMode = false);
 		bool SetStyle(const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
 		bool SetColor(const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
 
@@ -527,7 +524,7 @@ namespace NSCSS
 
 		bool SetSides(const std::wstring& wsValue,    unsigned int unLevel, bool bHardMode = false);
 		bool SetWidth(const std::wstring& wsValue,    unsigned int unLevel, bool bHardMode = false);
-		bool SetWidth(const double& dValue,           UnitMeasure enUnitMeasure, unsigned int unLevel, bool bHardMode = false);
+		bool SetWidth(const double& dValue,           unsigned int unLevel, bool bHardMode = false);
 		bool SetStyle(const std::wstring& wsValue,    unsigned int unLevel, bool bHardMode = false);
 		bool SetColor(const std::wstring& wsValue,    unsigned int unLevel, bool bHardMode = false);
 		bool SetCollapse(const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
@@ -535,28 +532,28 @@ namespace NSCSS
 		//Left Side
 		bool SetLeftSide       (const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
 		bool SetWidthLeftSide  (const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
-		bool SetWidthLeftSide  (const double& dValue,        UnitMeasure enUnitMeasure, unsigned int unLevel, bool bHardMode = false);
+		bool SetWidthLeftSide  (const double& dValue,        unsigned int unLevel, bool bHardMode = false);
 		bool SetStyleLeftSide  (const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
 		bool SetColorLeftSide  (const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
 
 		//Top Side
 		bool SetTopSide        (const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
 		bool SetWidthTopSide   (const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
-		bool SetWidthTopSide   (const double& dValue,        UnitMeasure enUnitMeasure, unsigned int unLevel, bool bHardMode = false);
+		bool SetWidthTopSide   (const double& dValue,        unsigned int unLevel, bool bHardMode = false);
 		bool SetStyleTopSide   (const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
 		bool SetColorTopSide   (const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
 
 		//Right Side
 		bool SetRightSide      (const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
 		bool SetWidthRightSide (const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
-		bool SetWidthRightSide (const double& dValue,        UnitMeasure enUnitMeasure, unsigned int unLevel, bool bHardMode = false);
+		bool SetWidthRightSide (const double& dValue,        unsigned int unLevel, bool bHardMode = false);
 		bool SetStyleRightSide (const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
 		bool SetColorRightSide (const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
 
 		//Bottom Side
 		bool SetBottomSide     (const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
 		bool SetWidthBottomSide(const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
-		bool SetWidthBottomSide(const double& dValue,        UnitMeasure enUnitMeasure, unsigned int unLevel, bool bHardMode = false);
+		bool SetWidthBottomSide(const double& dValue,        unsigned int unLevel, bool bHardMode = false);
 		bool SetStyleBottomSide(const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
 		bool SetColorBottomSide(const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
 
@@ -669,15 +666,13 @@ namespace NSCSS
 
 		bool SetValues (const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
 		bool SetTop    (const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
+		bool SetTop    (const double& dValue,        unsigned int unLevel, bool bHardMode = false);
 		bool SetRight  (const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
+		bool SetRight  (const double& dValue,        unsigned int unLevel, bool bHardMode = false);
 		bool SetBottom (const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
+		bool SetBottom (const double& dValue,        unsigned int unLevel, bool bHardMode = false);
 		bool SetLeft   (const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
-
-		bool SetValues (const double& dValue, UnitMeasure enUnitMeasure, unsigned int unLevel, bool bHardMode = false);
-		bool SetTop    (const double& dValue, UnitMeasure enUnitMeasure, unsigned int unLevel, bool bHardMode = false);
-		bool SetRight  (const double& dValue, UnitMeasure enUnitMeasure, unsigned int unLevel, bool bHardMode = false);
-		bool SetBottom (const double& dValue, UnitMeasure enUnitMeasure, unsigned int unLevel, bool bHardMode = false);
-		bool SetLeft   (const double& dValue, UnitMeasure enUnitMeasure, unsigned int unLevel, bool bHardMode = false);
+		bool SetLeft   (const double& dValue,        unsigned int unLevel, bool bHardMode = false);
 
 		void UpdateAll   (const double& dParentFontSize, const double& dCoreFontSize);
 		void UpdateTop   (const double& dParentFontSize, const double& dCoreFontSize);
@@ -690,9 +685,6 @@ namespace NSCSS
 		const CDigit& GetBottom() const;
 		const CDigit& GetLeft  () const;
 
-		bool GetAfterAutospacing () const;
-		bool GetBeforeAutospacing() const;
-
 		bool Empty() const;
 		bool Zero() const;
 
@@ -720,7 +712,7 @@ namespace NSCSS
 
 		bool SetValue         (const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
 		bool SetSize          (const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
-		bool SetSize          (const double& dValue,        UnitMeasure enUnitMeasure, unsigned int unLevel, bool bHardMode = false);
+		bool SetSize          (const double& dValue,        unsigned int unLevel, bool bHardMode = false);
 		bool SetLineHeight    (const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
 		bool SetFamily        (const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
 		bool SetStretch       (const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
@@ -770,12 +762,6 @@ namespace NSCSS
 		bool SetFooter (const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
 		bool SetHeader (const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
 
-		bool SetWidth  (const double& dValue, UnitMeasure enUnitMeasure, unsigned int unLevel, bool bHardMode = false);
-		bool SetHeight (const double& dValue, UnitMeasure enUnitMeasure, unsigned int unLevel, bool bHardMode = false);
-		bool SetMargin (const double& dValue, UnitMeasure enUnitMeasure, unsigned int unLevel, bool bHardMode = false);
-		bool SetFooter (const double& dValue, UnitMeasure enUnitMeasure, unsigned int unLevel, bool bHardMode = false);
-		bool SetHeader (const double& dValue, UnitMeasure enUnitMeasure, unsigned int unLevel, bool bHardMode = false);
-
 		const CDigit&  GetWidth()  const;
 		const CDigit&  GetHeight() const;
 		const CIndent& GetMargin() const;

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

@@ -341,14 +341,14 @@ namespace NSCSS
 		sSpacingValue.reserve(128);
 
 		if (!oStyle.m_oMargin.GetTop().Empty() && !oStyle.m_oMargin.GetTop().Zero())
-			sSpacingValue += L"w:before=\""  + std::to_wstring(VALUE_TO_INT(oStyle.m_oMargin.GetTop(), NSCSS::Twips))    + L"\" w:beforeAutospacing=\"1\"";
+			sSpacingValue += L"w:before=\""  + std::to_wstring(VALUE_TO_INT(oStyle.m_oMargin.GetTop(), NSCSS::Twips))    + L"\" w:beforeAutospacing=\"0\"";
 		else if (oStyle.m_oMargin.GetBottom().Zero() || bInTable)
-			sSpacingValue += L"w:before=\"0\" w:beforeAutospacing=\"1\"";
+			sSpacingValue += L"w:before=\"0\" w:beforeAutospacing=\"0\"";
 
 		if (!oStyle.m_oMargin.GetBottom().Empty() && !oStyle.m_oMargin.GetBottom().Zero())
-			sSpacingValue += L" w:after=\""   + std::to_wstring(VALUE_TO_INT(oStyle.m_oMargin.GetBottom(), NSCSS::Twips)) + L"\" w:afterAutospacing=\"1\"";
+			sSpacingValue += L" w:after=\""   + std::to_wstring(VALUE_TO_INT(oStyle.m_oMargin.GetBottom(), NSCSS::Twips)) + L"\" w:afterAutospacing=\"0\"";
 		else if (oStyle.m_oMargin.GetBottom().Zero() || bInTable)
-			sSpacingValue += L" w:after=\"0\" w:afterAutospacing=\"1\"";
+			sSpacingValue += L" w:after=\"0\" w:afterAutospacing=\"0\"";
 
 		if (!oStyle.m_oFont.GetLineHeight().Empty() && !oStyle.m_oFont.GetLineHeight().Zero())
 		{
@@ -509,9 +509,6 @@ namespace NSCSS
 		else if (L"serif" == wsFontFamily)
 			wsFontFamily = L"Times New Roman";
 
-		if (oStyle.m_oDisplay.GetDisplay() == L"none")
-			oXmlElement.AddPropertiesInR(RProperties::R_Vanish, L"true");
-
 		oXmlElement.AddPropertiesInR(RProperties::R_RFonts, oStyle.m_oFont.GetFamily().ToWString());
 		oXmlElement.AddPropertiesInR(RProperties::R_I, oStyle.m_oFont.GetStyle().ToWString());
 		oXmlElement.AddPropertiesInR(RProperties::R_B, oStyle.m_oFont.GetWeight().ToWString());

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

@@ -473,12 +473,6 @@ std::wstring CXmlElement::ConvertRStyle(bool bIsLite) const
 				sRStyle += L"<w:kern w:val=\"" + oItem.second + L"\"/>";
 				break;
 			}
-			case CSSProperties::RunnerProperties::R_Vanish:
-			{
-				if (oItem.second == L"true")
-					sRStyle += L"<w:vanish/>";
-				break;
-			}
 			default:
 				break;
 		}

Common/3dParty/md/md2html.cpp

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

Common/3dParty/socketio/.gitignore

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

Common/3dParty/socketio/patches/sio_client_impl_encode.patch

@@ -1,5 +0,0 @@
-<<<<<<<
-            if((c >= 'a' && c <= 'z') || (c>= 'A' && c<= 'Z') || (c >= '0' && c<= '9')){
-=======
-            if((c >= 'a' && c <= 'z') || (c>= 'A' && c<= 'Z') || (c >= '0' && c<= '9') || ('-' == c) || ('_' == c) || ('.' == c) || ('~' == c)){
->>>>>>>

Common/3dParty/webp/.gitignore

@@ -0,0 +1,2 @@
+build
+libwebp

Common/3dParty/webp/webp.pri

@@ -0,0 +1,26 @@
+WEBP_BUILDS_PLATFORM_PREFIX = $$CORE_BUILDS_PLATFORM_PREFIX
+core_ios : xcframework_platform_ios_simulator {
+	WEBP_BUILDS_PLATFORM_PREFIX = ios_simulator
+}
+
+WEBP_BUILD_PATH = $$PWD/build/$$WEBP_BUILDS_PLATFORM_PREFIX
+
+core_windows {
+	core_win_32 {
+		BUILD_PLATFORM = x86
+	} else {
+		BUILD_PLATFORM = x64
+	}
+
+	core_debug {
+	        LIBS += -L$$WEBP_BUILD_PATH/debug-static/$$BUILD_PLATFORM/lib -llibwebp_debug
+	} else {
+	        LIBS += -L$$WEBP_BUILD_PATH/release-static/$$BUILD_PLATFORM/lib -llibwebp
+	}
+}
+
+core_linux | core_android | core_mac | core_ios {
+        LIBS += \
+	        -L$$WEBP_BUILD_PATH/$$CORE_BUILDS_CONFIGURATION_PREFIX/src/.libs -lwebp \
+			-L$$WEBP_BUILD_PATH/$$CORE_BUILDS_CONFIGURATION_PREFIX/sharpyuv/.libs -lsharpyuv
+}

Common/OfficeFileFormatChecker.h

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

Common/OfficeFileFormatChecker2.cpp

@@ -552,6 +552,15 @@ bool COfficeFileFormatChecker::isPptFormatFile(POLE::Storage *storage)
 	return true;
 }
 
+bool COfficeFileFormatChecker::isCompoundFile(POLE::Storage* storage)
+{
+	if (storage == NULL) return false;
+
+	if (storage->GetAllStreams(L"/").size() == 1) return true;
+
+	return false;
+}
+
 std::wstring COfficeFileFormatChecker::getDocumentID(const std::wstring &_fileName)
 {
 #if defined(_WIN32) || defined(_WIN32_WCE) || defined(_WIN64)
@@ -749,6 +758,11 @@ bool COfficeFileFormatChecker::isOfficeFile(const std::wstring &_fileName)
 			nFileType = AVS_OFFICESTUDIO_FILE_OTHER_MS_VBAPROJECT;
 			return true;
 		}
+		else if (isCompoundFile(&storage))
+		{
+			nFileType = AVS_OFFICESTUDIO_FILE_OTHER_COMPOUND;
+			return true;
+		}
 		else if (isHwpFile(&storage))
 		{
 			nFileType = AVS_OFFICESTUDIO_FILE_DOCUMENT_HWP;

Common/OfficeFileFormats.h

@@ -136,6 +136,7 @@
 #define AVS_OFFICESTUDIO_FILE_OTHER_MS_MITCRYPTO		AVS_OFFICESTUDIO_FILE_OTHER + 0x000b
 #define AVS_OFFICESTUDIO_FILE_OTHER_MS_VBAPROJECT		AVS_OFFICESTUDIO_FILE_OTHER + 0x000c
 #define AVS_OFFICESTUDIO_FILE_OTHER_PACKAGE_IN_OLE		AVS_OFFICESTUDIO_FILE_OTHER + 0x000d
+#define AVS_OFFICESTUDIO_FILE_OTHER_COMPOUND			AVS_OFFICESTUDIO_FILE_OTHER + 0x000e
 
 #define AVS_OFFICESTUDIO_FILE_TEAMLAB					0x1000
 #define AVS_OFFICESTUDIO_FILE_TEAMLAB_DOCY				AVS_OFFICESTUDIO_FILE_TEAMLAB + 0x0001

Common/base.pri

@@ -45,7 +45,6 @@ win32 {
 }
 
 DEFINES += COPYRIGHT_YEAR=$${CURRENT_YEAR}
-#DEFINES += _LOGOUT_ALWAYS
 
 QMAKE_TARGET_COMPANY = $$PUBLISHER_NAME
 QMAKE_TARGET_COPYRIGHT = © $${PUBLISHER_NAME} $${CURRENT_YEAR}. All rights reserved.

DesktopEditor/common/File.h

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

DesktopEditor/common/SystemUtils.h

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

DesktopEditor/cximage/CxImage/tif_xfile.cpp

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

DesktopEditor/cximage/CxImage/ximacfg.h

@@ -51,10 +51,16 @@
 #else
 #define CXIMAGE_SUPPORT_HEIF 0
 #endif
+#ifdef SUPPORT_LIB_WEBP_SOURCES
+#define CXIMAGE_SUPPORT_WEBP 1
+#else
+#define CXIMAGE_SUPPORT_WEBP 0
+#endif
 #define CXIMAGE_SUPPORT_RAW 1
 #else
 #define CXIMAGE_SUPPORT_HEIF 0
 #define CXIMAGE_SUPPORT_RAW 0
+#define CXIMAGE_SUPPORT_WEBP 0
 #endif
 
 #ifdef CXIMAGE_DISABLE_SUPPORT_MNG

DesktopEditor/cximage/CxImage/ximage.h

@@ -136,6 +136,9 @@ CXIMAGE_FORMAR_PIC = 25,
 #if CXIMAGE_SUPPORT_HEIF
 CXIMAGE_FORMAT_HEIF = 26,
 #endif
+#if CXIMAGE_SUPPORT_WEBP
+CXIMAGE_FORMAT_WEBP = 27,
+#endif
 CMAX_IMAGE_FORMATS = CXIMAGE_SUPPORT_BMP + CXIMAGE_SUPPORT_GIF + CXIMAGE_SUPPORT_JPG +
 					 CXIMAGE_SUPPORT_PNG + CXIMAGE_SUPPORT_MNG + CXIMAGE_SUPPORT_ICO +
 					 CXIMAGE_SUPPORT_TIF + CXIMAGE_SUPPORT_TGA + CXIMAGE_SUPPORT_PCX +
@@ -143,7 +146,7 @@ CMAX_IMAGE_FORMATS = CXIMAGE_SUPPORT_BMP + CXIMAGE_SUPPORT_GIF + CXIMAGE_SUPPORT
 					 CXIMAGE_SUPPORT_JBG + CXIMAGE_SUPPORT_JP2 + CXIMAGE_SUPPORT_JPC +
 					 CXIMAGE_SUPPORT_PGX + CXIMAGE_SUPPORT_PNM + CXIMAGE_SUPPORT_RAS +
 					 CXIMAGE_SUPPORT_SKA + CXIMAGE_SUPPORT_RAW + CXIMAGE_SUPPORT_PSD +
-					 CXIMAGE_SUPPORT_HEIF + 1
+					 CXIMAGE_SUPPORT_HEIF + CXIMAGE_SUPPORT_WEBP + 1
 };
 
 #if CXIMAGE_SUPPORT_EXIF

DesktopEditor/doctrenderer/embed/DrawingFileEmbed.cpp

@@ -226,7 +226,7 @@ JSSmart<CJSValue> CDrawingFileEmbed::RedactPage(JSSmart<CJSValue> nPageIndex, JS
 		JSSmart<CJSTypedArray> dataPtr = dataFiller->toTypedArray();
 		CJSDataBuffer buffer = dataPtr->getData();
 
-		result = m_pFile->RedactPage(pageIndex, pBox, nCountBox / 8, buffer.Data, (int)buffer.Len, true);
+		result = m_pFile->RedactPage(pageIndex, pBox, nCountBox / 4, buffer.Data, (int)buffer.Len);
 
 		if (pBox)
 			delete[] pBox;

DesktopEditor/graphics/BooleanOperations.cpp

@@ -768,17 +768,7 @@ bool CBooleanOperations::IsSelfInters(const CGraphicsPath& p)
 
 	GetIntersection();
 
-	if (Locations.empty())
-		return false;
-	else
-	{
-		for (const auto& l : Locations)
-		{
-			if (!isZero(l->Time) && !isZero(l->Time - 1.0) && l->C.Segment2.Index != l->Inters->C.Segment1.Index)
-				return true;
-		}
-	}
-	return false;
+	return !Locations.empty();
 }
 
 void CBooleanOperations::TraceBoolean()
@@ -2348,19 +2338,17 @@ CGraphicsPath CalcBooleanOperation(const CGraphicsPath& path1,
 	std::vector<CGraphicsPath>	paths1 = path1.GetSubPaths(),
 								paths2 = path2.GetSubPaths(),
 								paths;
-	int skip_end1 = -1;
+
 	for (size_t i = 0; i < paths2.size(); i++)
 	{
-		int  skip_end2 = -1;
 		CBooleanOperations o;
-		if (i > skip_end2 && o.IsSelfInters(paths2[i]))
+		if (o.IsSelfInters(paths2[i]))
 		{
 			CBooleanOperations operation(paths2[i], paths2[i], Intersection, fillType, isLuminosity);
 			CGraphicsPath p = std::move(operation.GetResult());
 
 			std::vector<CGraphicsPath> tmp_paths = p.GetSubPaths();
 			paths2[i] = tmp_paths[0];
-			skip_end2 = i + tmp_paths.size() - 1;
 			for (size_t k = 1; k < tmp_paths.size(); k++)
 				paths2.insert(paths2.begin() + i + k, tmp_paths[k]);
 		}
@@ -2368,14 +2356,13 @@ CGraphicsPath CalcBooleanOperation(const CGraphicsPath& path1,
 		for (size_t j = 0; j < paths1.size(); j++)
 		{
 			CBooleanOperations o2;
-			if (j > skip_end1 && o2.IsSelfInters(paths1[j]))
+			if (o2.IsSelfInters(paths1[j]))
 			{
 				CBooleanOperations operation(paths1[j], paths1[j], Intersection, fillType, isLuminosity);
 				CGraphicsPath p = std::move(operation.GetResult());
 
 				std::vector<CGraphicsPath> tmp_paths = p.GetSubPaths();
 				paths1[j] = tmp_paths[0];
-				skip_end1 = j + tmp_paths.size() - 1;
 				for (size_t k = 1; k < tmp_paths.size(); k++)
 					paths1.insert(paths1.begin() + i + k, tmp_paths[k]);
 			}

DesktopEditor/graphics/pro/js/drawingfile.json

@@ -161,7 +161,7 @@
 	},
 	{
 		"folder": "../../../common/",
-		"files": ["File.cpp", "Directory.cpp", "ByteBuilder.cpp", "Base64.cpp", "StringExt.cpp", "Path.cpp", "SystemUtils.cpp", "StringUTF32.cpp", "StringBuilder.cpp"]
+		"files": ["File.cpp", "Directory.cpp", "ByteBuilder.cpp", "Base64.cpp", "StringExt.cpp", "Path.cpp", "SystemUtils.cpp"]
 	},
 	{
 		"folder": "../../../../Common/3dParty/icu/icu/source/common/",
@@ -252,8 +252,8 @@
 		"files": ["BaseItem.cpp", "ContText.cpp", "Paragraph.cpp", "Shape.cpp", "TextLine.cpp", "Table.cpp"]
 	},
 	{
-		"folder": "../../../../OdfFile/Common",
-		"files": ["logging.cpp"]
+		"folder": "../../../common",
+		"files": ["StringUTF32.cpp", "StringBuilder.cpp"]
 	}
 	]
 }

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

@@ -621,7 +621,6 @@ function readAnnotType(reader, rec, readDoubleFunc, readDouble2Func, readStringF
 					oFont["vertical"] = readDoubleFunc.call(reader);
 				if (nFontFlag & (1 << 6))
 					oFont["actual"] = readStringFunc.call(reader);
-				oFont["rtl"] = (nFontFlag >> 7) & 1;
 				oFont["size"] = readDoubleFunc.call(reader);
 				oFont["color"] = [];
 				oFont["color"].push(readDouble2Func.call(reader));

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

@@ -137,7 +137,7 @@ CFile.prototype._UndoMergePages = function()
 
 CFile.prototype._RedactPage = function(pageIndex, box, filler)
 {
-	let dataFiller = (undefined !== filler.byteLength) ? new Uint8Array(filler) : filler;
+	let dataFiller = (undefined !== filler.byteLength) ? new Float64Array(filler) : filler;
 	return g_native_drawing_file["RedactPage"](pageIndex, box, dataFiller);
 };
 

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

@@ -1046,7 +1046,7 @@ int main(int argc, char* argv[])
 	RELEASEARRAYOBJECTS(pFileData);
 
 	// SPLIT & MERGE
-	if (false)
+	if (true)
 	{
 		int nBufferLen = NULL;
 		BYTE* pBuffer = NULL;
@@ -1513,8 +1513,6 @@ int main(int argc, char* argv[])
 								std::cout << "; font-actual:" << std::string((char*)(pAnnots + i), nPathLength) << "; ";
 								i += nPathLength;
 							}
-							if (nFontFlag & (1 << 7))
-								std::cout << "; dir:rtl; ";
 
 							nPathLength = READ_INT(pAnnots + i);
 							i += 4;

DesktopEditor/graphics/pro/metafile.pri

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

DesktopEditor/graphics/pro/raster.pri

@@ -286,6 +286,7 @@ SOURCES += \
 
 !build_xp {
 	CONFIG += support_heif
+	CONFIG += support_webp
 }
 
 support_heif {
@@ -294,6 +295,12 @@ support_heif {
 	SOURCES += $$LIB_GRAPHICS_PRI_PATH/raster/heif/heif.cpp
 }
 
+support_webp {
+	DEFINES += SUPPORT_LIB_WEBP_SOURCES
+	include($$CORE_ROOT_DIR/Common/3dParty/webp/webp.pri)
+	SOURCES += $$LIB_GRAPHICS_PRI_PATH/raster/WebP/webp.cpp
+}
+
 SOURCES += \
 	$$LIB_GRAPHICS_PRI_PATH/cximage/jasper/base/jas_cm.c \
 	$$LIB_GRAPHICS_PRI_PATH/cximage/jasper/base/jas_debug.c \

DesktopEditor/raster/BgraFrame.cpp

@@ -48,6 +48,10 @@
 #include "heif/heif.h"
 #endif
 
+#if CXIMAGE_SUPPORT_WEBP
+#include "WebP/webp.h"
+#endif
+
 #include <cmath>
 #define BGRA_FRAME_CXIMAGE_MAX_MEMORY 67108864 // 256Mb (*4 channel)
 
@@ -462,6 +466,13 @@ bool CBgraFrame::OpenFile(const std::wstring& strFileName, unsigned int nFileTyp
 	}
 #endif
 
+#if CXIMAGE_SUPPORT_WEBP
+	if (CXIMAGE_FORMAT_WEBP == m_nFileType)
+	{
+		return NSWebP::CWebPFile::Open(this, strFileName, m_bIsRGBA);
+	}
+#endif
+
 	NSFile::CFileBinary oFile;
 	if (!oFile.OpenFile(strFileName))
 		return false;
@@ -552,6 +563,13 @@ bool CBgraFrame::Decode(BYTE* pBuffer, int nSize, unsigned int nFileType)
 	}
 #endif
 
+#if CXIMAGE_SUPPORT_WEBP
+	if (CXIMAGE_FORMAT_WEBP == m_nFileType)
+	{
+		return NSWebP::CWebPFile::Open(this, pBuffer, nSize, m_bIsRGBA);
+	}
+#endif
+
 	CxImage img;
 
 	if (!img.Decode(pBuffer, nSize, m_nFileType))
@@ -588,6 +606,13 @@ bool CBgraFrame::SaveFile(const std::wstring& strFileName, unsigned int nFileTyp
 	}
 #endif
 
+#if CXIMAGE_SUPPORT_WEBP
+	if (CXIMAGE_FORMAT_WEBP == nFileType)
+	{
+		return NSWebP::CWebPFile::Save(m_pData, m_lWidth, m_lHeight, strFileName, m_bIsRGBA);
+	}
+#endif
+
 	NSFile::CFileBinary oFile;
 	if (!oFile.CreateFileW(strFileName))
 		return false;

DesktopEditor/raster/ImageFileFormatChecker.cpp

@@ -35,6 +35,9 @@
 #if CXIMAGE_SUPPORT_HEIF
 #include "heif/heif.h"
 #endif
+#if CXIMAGE_SUPPORT_WEBP
+#include "WebP/webp.h"
+#endif
 
 #ifndef IMAGE_CHECKER_DISABLE_XML
 #include "../xml/include/xmlutils.h"
@@ -444,6 +447,15 @@ bool CImageFileFormatChecker::isHeifFile(BYTE* pBuffer, DWORD dwBytes)
 	return false;
 #endif
 }
+
+bool CImageFileFormatChecker::isWebPFile(BYTE* pBuffer, DWORD dwBytes)
+{
+#if CXIMAGE_SUPPORT_WEBP
+	return NSWebP::CWebPFile::isWebP(pBuffer, dwBytes);
+#else
+	return false;
+#endif
+}
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 bool CImageFileFormatChecker::isImageFile(const std::wstring& fileName)
 {
@@ -570,6 +582,10 @@ bool CImageFileFormatChecker::isImageFile(const std::wstring& fileName)
 	{
 		eFileType = _CXIMAGE_FORMAT_HEIF;
 	}
+	else if (isWebPFile(fileName))
+	{
+		eFileType = _CXIMAGE_FORMAT_WEBP;
+	}
 	///////////////////////////////////////////////////////////////////////
 	delete [] buffer;
 
@@ -689,6 +705,10 @@ bool CImageFileFormatChecker::isImageFile(BYTE* buffer, DWORD sizeRead)
 	{
 		eFileType = _CXIMAGE_FORMAT_HEIF;
 	}
+	if (isWebPFile(buffer, sizeRead))
+	{
+		eFileType = _CXIMAGE_FORMAT_WEBP;
+	}
     ///////////////////////////////////////////////////////////////////////
 	if (eFileType) return true;
 	return false;
@@ -815,6 +835,15 @@ bool CImageFileFormatChecker::isHeifFile(const std::wstring& fileName)
 #endif
 }
 
+bool CImageFileFormatChecker::isWebPFile(const std::wstring& fileName)
+{
+#if CXIMAGE_SUPPORT_WEBP
+	return NSWebP::CWebPFile::isWebP(fileName);
+#else
+	return false;
+#endif
+}
+
 std::wstring CImageFileFormatChecker::DetectFormatByData(BYTE *Data, int DataSize)
 {
 	if (isBmpFile(Data,DataSize)) return L"bmp";

DesktopEditor/raster/ImageFileFormatChecker.h

@@ -64,6 +64,7 @@ enum __ENUM_CXIMAGE_FORMATS
 	_CXIMAGE_FORMAT_SVG = 24,
     _CXIMAGE_FORMAT_PIC = 25,
 	_CXIMAGE_FORMAT_HEIF = 26,
+	_CXIMAGE_FORMAT_WEBP = 27,
 };
 
 class GRAPHICS_DECL CImageFileFormatChecker
@@ -84,6 +85,7 @@ public:
 	bool isRawFile(const std::wstring& fileName);
 	bool isSvgFile(const std::wstring& fileName);
 	bool isHeifFile(const std::wstring& fileName);
+	bool isWebPFile(const std::wstring& fileName);
 
 	bool isImageFile(BYTE* pBuffer,DWORD dwBytes);
 	bool isBmpFile(BYTE* pBuffer,DWORD dwBytes);
@@ -114,6 +116,7 @@ public:
 	bool isRawFile(BYTE* pBuffer,DWORD dwBytes);
     bool isPicFile(BYTE* pBuffer,DWORD dwBytes);
 	bool isHeifFile(BYTE* pBuffer, DWORD dwBytes);
+	bool isWebPFile(BYTE* pBuffer, DWORD dwBytes);
 
 	std::wstring DetectFormatByData(BYTE *Data, int DataSize);
 

DesktopEditor/raster/Metafile/Common/IOutputDevice.h

@@ -53,7 +53,7 @@ namespace MetaFile
 		virtual void DrawBitmap(double dX, double dY, double dW, double dH, BYTE* pBuffer, unsigned int unWidth, unsigned int unHeight, unsigned int nBlendMode) = 0;
 
 		virtual void DrawString(std::wstring& wsText, unsigned int unCharsCount, double dX, double dY, double* pDx,
-		                        int iGraphicsMode = 1, double dXScale = 1, double dYScale = 1, bool bUseGID = false) = 0;
+		                        int iGraphicsMode = 1, double dXScale = 1, double dYScale = 1) = 0;
 
 		virtual void DrawDriverString(const std::wstring& wsString, const std::vector<TPointD>& arPoints) = 0;
 

DesktopEditor/raster/Metafile/Common/MetaFileRenderer.h

@@ -352,7 +352,7 @@ namespace MetaFile
 
 		}
 
-		void DrawString(std::wstring& wsText, unsigned int unCharsCount, double _dX, double _dY, double* pDx, int iGraphicsMode, double dXScale, double dYScale, bool bUseGID)
+		void DrawString(std::wstring& wsText, unsigned int unCharsCount, double _dX, double _dY, double* pDx, int iGraphicsMode, double dXScale, double dYScale)
 		{
 			CheckEndPath();
 			const IFont* pFont = m_pFile->GetFont();
@@ -681,12 +681,11 @@ namespace MetaFile
 				m_pRenderer->put_BrushColor1(m_pFile->GetTextColor());
 				m_pRenderer->put_BrushAlpha1(255);
 
-				if (bUseGID)
-					m_pRenderer->put_FontStringGID(TRUE);
-
 				// Рисуем сам текст
 				if (NULL == pDx)
+				{
 					m_pRenderer->CommandDrawText(wsString, dX, dY, 0, 0);
+				}
 				else
 				{
 					unsigned int unUnicodeLen = 0;
@@ -705,9 +704,6 @@ namespace MetaFile
 					}
 				}
 
-				if (bUseGID)
-					m_pRenderer->put_FontStringGID(FALSE);
-
 				if (bChangeCTM)
 					m_pRenderer->ResetTransform();
 			}

DesktopEditor/raster/Metafile/Common/MetaFileUtils.cpp

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

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

@@ -218,7 +218,7 @@ namespace MetaFile
 		void DrawBitmap(double dX, double dY, double dW, double dH, BYTE* pBuffer, unsigned int unWidth, unsigned int unHeight, unsigned int unBlendMode) override {};
 
 		void DrawString(std::wstring& wsText, unsigned int unCharsCount, double dX, double dY, double* pDx,
-						int iGraphicsMode = 1, double dXScale = 1, double dYScale = 1, bool bUseGID = false) override {};
+						int iGraphicsMode = 1, double dXScale = 1, double dYScale = 1) override {};
 
 		void DrawDriverString(const std::wstring& wsString, const std::vector<TPointD>& arPoints) override {};
 

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

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

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

@@ -36,7 +36,7 @@ namespace MetaFile
 		void DrawBitmap(double dX, double dY, double dW, double dH, BYTE* pBuffer, unsigned int unWidth, unsigned int unHeight, unsigned int unBlendMode) override;
 
 		void DrawString(std::wstring& wsText, unsigned int unCharsCount, double dX, double dY, double* pDx,
-						int iGraphicsMode = 1, double dXScale = 1, double dYScale = 1, bool bUseGID = false) override;
+						int iGraphicsMode = 1, double dXScale = 1, double dYScale = 1) override;
 
 		void DrawDriverString(const std::wstring& wsString, const std::vector<TPointD>& arPoints) override;
 

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

@@ -41,10 +41,10 @@ namespace MetaFile
 	}
 
 	void CEmfInterpretatorRender::DrawString(std::wstring &wsText, unsigned int unCharsCount, double dX, double dY, double *pDx,
-	                                         int iGraphicsMode, double dXScale, double dYScale, bool bUseGID)
+	                                         int iGraphicsMode, double dXScale, double dYScale)
 	{
 		if (NULL != m_pMetaFileRenderer)
-			m_pMetaFileRenderer->DrawString(wsText, unCharsCount, dX, dY, pDx, iGraphicsMode, dXScale, dYScale, bUseGID);
+			m_pMetaFileRenderer->DrawString(wsText, unCharsCount, dX, dY, pDx, iGraphicsMode, dXScale, dYScale);
 	}
 
 	void CEmfInterpretatorRender::DrawDriverString(const std::wstring& wsString, const std::vector<TPointD>& arPoints)

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

@@ -22,7 +22,7 @@ namespace MetaFile
 		void DrawBitmap(double dX, double dY, double dW, double dH, BYTE* pBuffer, unsigned int unWidth, unsigned int unHeight, unsigned int unBlendMode) override;
 
 		void DrawString(std::wstring& wsText, unsigned int unCharsCount, double dX, double dY, double* pDx,
-						int iGraphicsMode = 1, double dXScale = 1, double dYScale = 1, bool bUseGID = false) override;
+						int iGraphicsMode = 1, double dXScale = 1, double dYScale = 1) override;
 
 		void DrawDriverString(const std::wstring& wsString, const std::vector<TPointD>& arPoints) override;
 

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

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

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

@@ -202,7 +202,7 @@ namespace MetaFile
 		void End() override {};
 
 		void DrawString(std::wstring& wsText, unsigned int unCharsCount, double dX, double dY, double* pDx,
-		                int iGraphicsMode = 1, double dXScale = 1, double dYScale = 1, bool bUseGID = false) override {};
+		                int iGraphicsMode = 1, double dXScale = 1, double dYScale = 1) override {};
 
 		void DrawDriverString(const std::wstring& wsString, const std::vector<TPointD>& arPoints) override {};
 

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

@@ -216,7 +216,7 @@ namespace MetaFile
 		void DrawBitmap(double dX, double dY, double dW, double dH, BYTE* pBuffer, unsigned int unWidth, unsigned int unHeight, unsigned int unBlendMode) override {};
 
 		void DrawString(std::wstring& wsText, unsigned int unCharsCount, double dX, double dY, double* pDx,
-						int iGraphicsMode = 1, double dXScale = 1, double dYScale = 1, bool bUseGID = false) override {};
+						int iGraphicsMode = 1, double dXScale = 1, double dYScale = 1) override {};
 
 		void DrawDriverString(const std::wstring& wsString, const std::vector<TPointD>& arPoints) override {};
 

DesktopEditor/raster/Metafile/Emf/EmfParser/CEmfParserBase.cpp

@@ -411,7 +411,7 @@ namespace MetaFile
 	}
 
 	void CEmfParserBase::DrawText(std::wstring &wsString, unsigned int unCharsCount, int _nX, int _nY,
-	                              int *pnDx, int iGraphicsMode, TScale oScale, bool bUseGID)
+								  int *pnDx, int iGraphicsMode, TScale oScale)
 	{
 		int nX = _nX;
 		int nY = _nY;
@@ -448,7 +448,7 @@ namespace MetaFile
 				}
 			}
 
-			m_pInterpretator->DrawString(wsString, unCharsCount, dX, dY, pdDx, iGraphicsMode, oScale.X, oScale.Y, bUseGID);
+			m_pInterpretator->DrawString(wsString, unCharsCount, dX, dY, pdDx, iGraphicsMode, oScale.X, oScale.Y);
 
 			if (pdDx)
 				delete[] pdDx;
@@ -480,7 +480,7 @@ namespace MetaFile
 			}
 		}
 
-		DrawText(wsText, oText.unChars, oText.oReference.X, oText.oReference.Y, pDx, iGraphicsMode, oScale, oText.unOptions & 0x00000010);
+		DrawText(wsText, oText.unChars, oText.oReference.X, oText.oReference.Y, pDx, iGraphicsMode, oScale);
 
 		if (pDx)
 			delete[] pDx;
@@ -550,7 +550,7 @@ namespace MetaFile
 		}
 
 		if (unLen)
-			DrawText(wsText, unLen, oText.oReference.X, oText.oReference.Y, pDx, iGraphicsMode, oScale, oText.unOptions & 0x00000010);
+			DrawText(wsText, unLen, oText.oReference.X, oText.oReference.Y, pDx, iGraphicsMode, oScale);
 
 		if (pDx)
 			delete[] pDx;

DesktopEditor/raster/Metafile/Emf/EmfParser/CEmfParserBase.h

@@ -156,7 +156,7 @@ namespace MetaFile
 		void ArcTo(int nL, int nT, int nR, int nB, double dStart, double dSweep);
 
 		void DrawPath(bool bStroke, bool bFill, bool bClosePath = true);
-		void DrawText(std::wstring &wsString, unsigned int unCharsCount, int _nX, int _nY, int *pnDx, int iGraphicsMode, TScale oScale, bool bUseGID);
+		void DrawText(std::wstring &wsString, unsigned int unCharsCount, int _nX, int _nY, int *pnDx, int iGraphicsMode, TScale oScale);
 		void DrawTextA(TEmrTextA &oText, int iGraphicsMode, TScale oScale = TScale(1, 1));
 		void DrawTextW(TEmrTextW &oText, int iGraphicsMode, TScale oScale = TScale(1, 1));
 

DesktopEditor/raster/Metafile/MetaFile.cpp

@@ -68,10 +68,6 @@ namespace MetaFile
 	#ifdef METAFILE_SUPPORT_SVM
 		m_oSvmFile.SetFontManager(m_pFontManager);
 	#endif
-
-	#ifdef METAFILE_SUPPORT_SVG
-		m_oSvgFile.SetFontManager(m_pFontManager);
-	#endif
 		m_lType  = 0;
 	}
 
@@ -88,6 +84,7 @@ namespace MetaFile
 
 	std::wstring CMetaFile::ConvertToSvg(unsigned int unWidth, unsigned int unHeight)
 	{
+
 	#ifdef METAFILE_SUPPORT_WMF_EMF
 		if (c_lMetaWmf == m_lType)
 		{

DesktopEditor/raster/Metafile/Wmf/WmfInterpretator/CInterpretatorSvgBase.cpp

@@ -217,23 +217,15 @@ namespace MetaFile
 		m_pXmlWriter->WriteNodeEnd(wsNodeName, false, false);
 	}
 
-	void UpdateStringByGID(std::wstring &wsValue, const std::wstring& wsFontName, const double& dFontSize, const int& nFontStyle, NSFonts::IFontManager* pFontManeger)
-	{
-		if (nullptr == pFontManeger)
-			return;
-
-		pFontManeger->LoadFontByName(wsFontName, dFontSize, nFontStyle, 96, 96);
-
-		for (wchar_t& wChar : wsValue)
-			wChar = (wchar_t)pFontManeger->GetUnicodeByGID(wChar);
-	}
-
-	void CInterpretatorSvgBase::WriteText(const std::wstring &wsText, const TPointD &oCoord, const TRectL &oBounds, const TPointD &oScale, const std::vector<double>& arDx, bool bUseGID)
+	void CInterpretatorSvgBase::WriteText(const std::wstring &wsText, const TPointD &oCoord, const TRectL &oBounds, const TPointD &oScale, const std::vector<double>& arDx)
 	{
 		if (NULL == m_pParser || NULL == m_pParser->GetFont())
 			return;
 
-		std::wstring wsNormalizedText{wsText};
+		const std::wstring wsNormalizedText = StringNormalization(wsText);
+
+		if (wsNormalizedText.empty())
+			return;
 
 		AddClip();
 
@@ -306,22 +298,6 @@ namespace MetaFile
 				oFontName.WriteEncodeXmlString(pFontInfo->m_wsFontName);
 				oFontName.WriteEncodeXmlString(L"\'");
 			}
-
-			if (bUseGID)
-			{
-				int nStyle = 0;
-				if (pFont->GetWeight() > 550)
-					nStyle |= 0x01;
-				if (pFont->IsItalic())
-					nStyle |= 0x02;
-				if (pFont->IsUnderline())
-					nStyle |= (1 << 2);
-				if (pFont->IsStrikeOut())
-					nStyle |= (1 << 7);
-
-				UpdateStringByGID(wsNormalizedText, (NULL != pFontInfo) ? pFontInfo->m_wsFontName : pFont->GetFaceName(),
-				                  dFontHeight, nStyle, m_pParser->GetFontManager());
-			}
 			#endif
 			arNodeAttributes.Add(L"font-family", oFontName.GetData());
 		}
@@ -448,7 +424,7 @@ namespace MetaFile
 			arNodeAttributes.Add(L"x", wsXCoord);
 			arNodeAttributes.Add(L"y", dYCoord);
 
-			WriteNode(L"text", arNodeAttributes, StringNormalization(wsNormalizedText));
+			WriteNode(L"text", arNodeAttributes, wsNormalizedText);
 		}
 		else
 		{
@@ -460,7 +436,7 @@ namespace MetaFile
 			do
 			{
 				WriteNode(L"tspan", {{L"x", wsXCoord},
-				                     {L"y", ConvertToWString(dYNewCoord)}}, StringNormalization(wsNormalizedText.substr(unStart, unPosLineBreak - unStart)));
+				                     {L"y", ConvertToWString(dYNewCoord)}}, wsNormalizedText.substr(unStart, unPosLineBreak - unStart));
 
 				dYNewCoord += dFontHeight * 1.6;
 				unStart = wsNormalizedText.find_first_not_of(L"\n", unPosLineBreak);

DesktopEditor/raster/Metafile/Wmf/WmfInterpretator/CInterpretatorSvgBase.h

@@ -106,7 +106,7 @@ namespace MetaFile
 		void WriteNode(const std::wstring& wsNodeName, const NodeAttributes& arAttributes, const std::wstring& wsValueNode = L"");
 		void WriteNodeBegin(const std::wstring& wsNodeName, const NodeAttributes& arAttributes);
 		void WriteNodeEnd(const std::wstring& wsNodeName);
-		void WriteText(const std::wstring& wsText, const TPointD& oCoord, const TRectL& oBounds = TRectL(), const TPointD& oScale = TPointD(1, 1), const std::vector<double>& arDx = {}, bool bUseGID = false);
+		void WriteText(const std::wstring& wsText, const TPointD& oCoord, const TRectL& oBounds = TRectL(), const TPointD& oScale = TPointD(1, 1), const std::vector<double>& arDx = {});
 
 		void DrawBitmap(double dX, double dY, double dW, double dH, BYTE* pBuffer, unsigned int unWidth, unsigned int unHeight, unsigned int unBlendMode) override;
 

DesktopEditor/raster/Metafile/Wmf/WmfInterpretator/CWmfInterpretatorRender.cpp

@@ -29,10 +29,10 @@ namespace MetaFile
 	}
 
 	void CWmfInterpretatorRender::DrawString(std::wstring &wsText, unsigned int unCharsCount, double dX, double dY, double *pDx,
-	                                         int iGraphicsMode, double dXScale, double dYScale, bool bUseGID)
+	                                         int iGraphicsMode, double dXScale, double dYScale)
 	{
 		if (NULL != m_pMetaFileRenderer)
-			m_pMetaFileRenderer->DrawString(wsText, unCharsCount, dX, dY, pDx, iGraphicsMode, dXScale, dYScale, bUseGID);
+			m_pMetaFileRenderer->DrawString(wsText, unCharsCount, dX, dY, pDx, iGraphicsMode, dXScale, dYScale);
 	}
 
 	void CWmfInterpretatorRender::DrawDriverString(const std::wstring& wsString, const std::vector<TPointD>& arPoints)

DesktopEditor/raster/Metafile/Wmf/WmfInterpretator/CWmfInterpretatorRender.h

@@ -19,7 +19,7 @@ namespace MetaFile
 		void DrawBitmap(double dX, double dY, double dW, double dH, BYTE* pBuffer, unsigned int unWidth, unsigned int unHeight, unsigned int unBlendMode) override;
 
 		void DrawString(std::wstring& wsText, unsigned int unCharsCount, double dX, double dY, double* pDx,
-		                int iGraphicsMode = 1, double dXScale = 1, double dYScale = 1, bool bUseGID = false) override;
+		                int iGraphicsMode = 1, double dXScale = 1, double dYScale = 1) override;
 
 		void DrawDriverString(const std::wstring& wsString, const std::vector<TPointD>& arPoints) override;
 

DesktopEditor/raster/Metafile/Wmf/WmfInterpretator/CWmfInterpretatorSvg.h

@@ -109,7 +109,7 @@ namespace MetaFile
 		void End() override {};
 
 		void DrawString(std::wstring& wsText, unsigned int unCharsCount, double dX, double dY, double* pDx,
-						int iGraphicsMode = 1, double dXScale = 1, double dYScale = 1, bool bUseGID = false) override {};
+						int iGraphicsMode = 1, double dXScale = 1, double dYScale = 1) override {};
 
 		void DrawDriverString(const std::wstring& wsString, const std::vector<TPointD>& arPoints) override {};
 

DesktopEditor/raster/Metafile/svg/CSvgFile.cpp

@@ -3,13 +3,11 @@
 #include "SvgObjects/CContainer.h"
 #include "SvgObjects/CFont.h"
 
-#include "CSvgParser.h"
-
 #define SVG_FILE_WIDTH  300
 #define SVG_FILE_HEIGHT 150
 
 CSvgFile::CSvgFile()
-	: m_pContainer(NULL), m_pFontManager(NULL)
+	: m_oContainer(L"svg")
 {}
 
 CSvgFile::~CSvgFile()
@@ -26,10 +24,7 @@ bool CSvgFile::ReadFromBuffer(BYTE *pBuffer, unsigned int unSize)
 bool CSvgFile::ReadFromWString(const std::wstring &wsContext)
 {
 	Clear();
-
-	SVG::CSvgParser oSvgParser(m_pFontManager);
-
-	return oSvgParser.LoadFromString(wsContext, m_pContainer, this);
+	return m_oParser.LoadFromString(wsContext, &m_oContainer, this);
 }
 
 bool CSvgFile::OpenFromFile(const std::wstring &wsFile)
@@ -38,14 +33,58 @@ bool CSvgFile::OpenFromFile(const std::wstring &wsFile)
 
 	m_wsWorkingDirectory = NSFile::GetDirectoryName(wsFile);
 
-	SVG::CSvgParser oSvgParser(m_pFontManager);
-
-	return oSvgParser.LoadFromFile(wsFile, m_pContainer, this);
+	return m_oParser.LoadFromFile(wsFile, &m_oContainer, this);
 }
 
 bool CSvgFile::GetBounds(double &dX, double &dY, double &dWidth, double &dHeight) const
 {
-	return CalculateFinalSize(true, dX, dY, dWidth, dHeight);
+	if (m_oContainer.Empty())
+		return false;
+
+	SVG::TRect oWindow = m_oContainer.GetWindow();
+
+	dX = oWindow.m_oX.ToDouble(NSCSS::Pixel, SVG_FILE_WIDTH);
+	dY = oWindow.m_oY.ToDouble(NSCSS::Pixel, SVG_FILE_HEIGHT);
+
+	dWidth  = 0.;
+	dHeight = 0.;
+
+	if (!oWindow.m_oWidth.Empty() && !oWindow.m_oWidth.Zero())
+	{
+		if (NSCSS::Percent == oWindow.m_oWidth.GetUnitMeasure())
+		{
+			if (!m_oContainer.GetViewBox().m_oWidth.Empty() && !m_oContainer.GetViewBox().m_oWidth.Zero())
+				dWidth = oWindow.m_oWidth.ToDouble(NSCSS::Pixel, m_oContainer.GetViewBox().m_oWidth.ToDouble(NSCSS::Pixel));
+			else
+				dWidth = oWindow.m_oWidth.ToDouble(NSCSS::Pixel, SVG_FILE_WIDTH);
+		}
+		else
+			dWidth = oWindow.m_oWidth.ToDouble(NSCSS::Pixel);
+	}
+	else
+		dWidth = m_oContainer.GetViewBox().m_oWidth.ToDouble(NSCSS::Pixel);
+
+	if (!oWindow.m_oHeight.Empty() && !oWindow.m_oHeight.Zero())
+	{
+		if (NSCSS::Percent == oWindow.m_oHeight.GetUnitMeasure())
+		{
+			if (!m_oContainer.GetViewBox().m_oHeight.Empty() && !m_oContainer.GetViewBox().m_oHeight.Zero())
+				dHeight = oWindow.m_oHeight.ToDouble(NSCSS::Pixel, m_oContainer.GetViewBox().m_oHeight.ToDouble(NSCSS::Pixel));
+			else
+				dHeight = oWindow.m_oHeight.ToDouble(NSCSS::Pixel, SVG_FILE_WIDTH);
+		}
+		else
+			dHeight = oWindow.m_oHeight.ToDouble(NSCSS::Pixel);
+	}
+	else
+		dHeight = m_oContainer.GetViewBox().m_oHeight.ToDouble(NSCSS::Pixel);
+
+	if (DBL_EPSILON > dWidth)
+		dWidth  = SVG_FILE_WIDTH;
+	if (DBL_EPSILON > dHeight)
+		dHeight = SVG_FILE_HEIGHT;
+
+	return true;
 }
 
 const SVG::CSvgCalculator *CSvgFile::GetSvgCalculator() const
@@ -55,7 +94,7 @@ const SVG::CSvgCalculator *CSvgFile::GetSvgCalculator() const
 
 void CSvgFile::SetFontManager(NSFonts::IFontManager *pFontManager)
 {
-	m_pFontManager = pFontManager;
+	m_oParser.SetFontManager(pFontManager);
 }
 
 void CSvgFile::SetWorkingDirectory(const std::wstring &wsWorkingDirectory)
@@ -68,13 +107,7 @@ bool CSvgFile::MarkObject(SVG::CObject *pObject)
 	if (NULL == pObject || pObject->GetId().empty())
 		return false;
 
-	pObject->Mark();
-
-	const MarkedMap::const_iterator itFound = m_mMarkedObjects.find(pObject->GetId());
-
-	if (m_mMarkedObjects.cend() != itFound)
-		RELEASEINTERFACE(m_mMarkedObjects[pObject->GetId()])
-
+	pObject->AddRef();
 	m_mMarkedObjects[pObject->GetId()] = pObject;
 
 	return true;
@@ -127,41 +160,69 @@ void CSvgFile::AddFontFace(const SVG::TFontArguments& oArguments, const std::wst
 
 bool CSvgFile::Draw(IRenderer *pRenderer, double dX, double dY, double dWidth, double dHeight)
 {
-	if (NULL == pRenderer || NULL == m_pContainer || m_pContainer->Empty())
+	if (NULL == pRenderer || m_oContainer.Empty())
 		return false;
 
-	double dFileX, dFileY, dFileWidth, dFileHeight;
+	SVG::TRect oWindow  = m_oContainer.GetWindow();
+	SVG::TRect oViewBox = m_oContainer.GetViewBox();
 
-	if (!CalculateFinalSize(false, dFileX, dFileY, dFileWidth, dFileHeight))
+	if (oWindow.m_oWidth.Empty() || oWindow.m_oWidth.Zero())
+	{
+		if (oViewBox.m_oWidth.Empty() || oViewBox.m_oWidth.Zero())
+			oWindow.m_oWidth =  SVG_FILE_WIDTH;
+		else
+		{
+			oWindow.m_oWidth = oViewBox.m_oWidth;
+			oViewBox.m_oWidth.Clear();
+		}
+	}
+
+	if (oWindow.m_oHeight.Empty() || oWindow.m_oHeight.Zero())
+	{
+		if (oViewBox.m_oHeight.Empty() || oViewBox.m_oHeight.Zero())
+			oWindow.m_oHeight =  SVG_FILE_HEIGHT;
+		else
+		{
+			oWindow.m_oHeight = oViewBox.m_oHeight;
+			oViewBox.m_oHeight.Clear();
+		}
+	}
+
+	double dViewBoxWidth  = oViewBox.m_oWidth.ToDouble(NSCSS::Pixel, SVG_FILE_WIDTH);
+	double dViewBoxHeight = oViewBox.m_oHeight.ToDouble(NSCSS::Pixel, SVG_FILE_HEIGHT);
+
+	double dWindowWidth  = oWindow.m_oWidth.ToDouble(NSCSS::Pixel, dViewBoxWidth);
+	double dWindowHeight = oWindow.m_oHeight.ToDouble(NSCSS::Pixel, dViewBoxHeight);
+
+	if (SVG::Equals(0., dWindowWidth) || SVG::Equals(0., dWindowHeight))
 		return false;
 
 	double oldTransform[6];
+	oldTransform[0] = oldTransform[3] = 1;
+	oldTransform[1] = oldTransform[2] = oldTransform[4] = oldTransform[5] = 0;
 
 	pRenderer->GetTransform(&oldTransform[0], &oldTransform[1], &oldTransform[2], &oldTransform[3], &oldTransform[4], &oldTransform[5]);
 	pRenderer->ResetTransform();
 
-	const double dM11 = dWidth  / dFileWidth;
-	const double dM22 = dHeight / dFileHeight;
+	double dM11 = dWidth / dWindowWidth;
+	double dM22 = dHeight / dWindowHeight;
 
-	double dScaleX = 1.,
-	       dScaleY = 1.;
-	double dTranslateX = dFileX * dM11,
-	       dTranslateY = dFileY * dM22;
+	double dScaleX = 1, dScaleY = 1;
 
-	const SVG::TRect oViewBox{m_pContainer->GetViewBox()};
+	if (!SVG::Equals(0., dViewBoxWidth))
+		dScaleX = dWindowWidth / dViewBoxWidth;
 
-	if (!oViewBox.m_oWidth.Empty() && !oViewBox.m_oHeight.Empty())
-	{
-		dScaleX = dFileWidth  / oViewBox.m_oWidth .ToDouble(NSCSS::Pixel, SVG_FILE_WIDTH );
-		dScaleY = dFileHeight / oViewBox.m_oHeight.ToDouble(NSCSS::Pixel, SVG_FILE_HEIGHT);
+	if (!SVG::Equals(0., dViewBoxHeight))
+		dScaleY = dWindowHeight / dViewBoxHeight;
 
-		dTranslateX -= oViewBox.m_oX.ToDouble(NSCSS::Pixel) * dScaleX * dM11;
-		dTranslateY -= oViewBox.m_oY.ToDouble(NSCSS::Pixel) * dScaleY * dM22;
-	}
+	double dMinScale = std::min(dScaleX, dScaleY);
 
-	pRenderer->SetTransform(dM11 * dScaleX, 0, 0, dM22 * dScaleY, dTranslateX, dTranslateY);
+	double dSkipX = -oViewBox.m_oX.ToDouble(NSCSS::Pixel) * dScaleX * dM11;
+	double dSkipY = -oViewBox.m_oY.ToDouble(NSCSS::Pixel) * dScaleY * dM22;
 
-	bool bResult = m_pContainer->Draw(pRenderer, this);
+	pRenderer->SetTransform(dM11 * dMinScale, 0, 0, dM22 * dMinScale, dSkipX, dSkipY);
+
+	bool bResult = m_oContainer.Draw(pRenderer, this);
 
 	pRenderer->SetTransform(oldTransform[0], oldTransform[1], oldTransform[2], oldTransform[3], oldTransform[4], oldTransform[5]);
 
@@ -170,7 +231,7 @@ bool CSvgFile::Draw(IRenderer *pRenderer, double dX, double dY, double dWidth, d
 
 void CSvgFile::Clear()
 {
-	RELEASEINTERFACE(m_pContainer);
+	m_oContainer.Clear();
 	m_oSvgCalculator.Clear();
 
 	for (MarkedMap::reference oIter : m_mMarkedObjects)
@@ -179,141 +240,3 @@ void CSvgFile::Clear()
 	m_mMarkedObjects.clear();
 	m_wsWorkingDirectory.clear();
 }
-
-bool CSvgFile::CalculateFinalSize(bool bUseViewBox, double& dX, double& dY, double& dWidth, double& dHeight) const
-{
-	if (NULL == m_pContainer || m_pContainer->Empty())
-		return false;
-
-	const SVG::TRect oWindow  = m_pContainer->GetWindow();
-	const SVG::TRect oViewBox = m_pContainer->GetViewBox();
-
-	const double dViewBoxWidth {oViewBox.m_oWidth .ToDouble()};
-	const double dViewBoxHeigth{oViewBox.m_oHeight.ToDouble()};
-
-	dX = 0.;
-	dY = 0.;
-
-	dWidth  = 0.;
-	dHeight = 0.;
-
-	#define GET_PREV_WIDTH_VALUE ((NSCSS::UnitMeasure::Em == oWindow.m_oWidth.GetUnitMeasure() || NSCSS::UnitMeasure::Rem == oWindow.m_oWidth.GetUnitMeasure()) ? DEFAULT_FONT_SIZE : ((!SVG::Equals(0., dViewBoxWidth )) ? dViewBoxWidth : SVG_FILE_WIDTH))
-	#define GET_PREV_HEIGHT_VALUE ((NSCSS::UnitMeasure::Em == oWindow.m_oHeight.GetUnitMeasure() || NSCSS::UnitMeasure::Rem == oWindow.m_oHeight.GetUnitMeasure()) ? DEFAULT_FONT_SIZE : ((!SVG::Equals(0., dViewBoxHeigth )) ? dViewBoxHeigth : SVG_FILE_HEIGHT))
-
-	if (!oWindow.m_oWidth.Empty() && !oWindow.m_oHeight.Empty())
-	{
-		dWidth  = oWindow.m_oWidth .ToDouble(NSCSS::Pixel, GET_PREV_WIDTH_VALUE);
-		dHeight = oWindow.m_oHeight.ToDouble(NSCSS::Pixel, GET_PREV_HEIGHT_VALUE);
-		return true;
-	}
-
-	if (bUseViewBox)
-	{
-		if (!oViewBox.m_oWidth.Empty() && !oViewBox.m_oHeight.Empty())
-		{
-			if (!oWindow.m_oWidth.Empty())
-			{
-				dWidth = oWindow.m_oWidth.ToDouble(NSCSS::Pixel, GET_PREV_WIDTH_VALUE);
-				const double dAspectRatio{dViewBoxWidth / dViewBoxHeigth};
-				dHeight = dWidth / dAspectRatio;
-				return true;
-			}
-
-			if (!oWindow.m_oHeight.Empty())
-			{
-				dHeight = oWindow.m_oHeight.ToDouble(NSCSS::Pixel, GET_PREV_HEIGHT_VALUE);
-				const double dAspectRatio{dViewBoxWidth / dViewBoxHeigth};
-				dWidth = dHeight * dAspectRatio;
-				return true;
-			}
-
-			dX = oViewBox.m_oX.ToDouble();
-			dY = oViewBox.m_oY.ToDouble();
-
-			dWidth  = dViewBoxWidth;
-			dHeight = dViewBoxHeigth;
-
-			return true;
-		}
-	}
-
-	if (!oWindow.m_oWidth.Empty() || !oWindow.m_oHeight.Empty())
-	{
-		if (!oViewBox.m_oWidth.Empty() && !oViewBox.m_oHeight.Empty())
-		{
-			const double dAspectRatio{dViewBoxWidth / dViewBoxHeigth};
-
-			if (!oWindow.m_oWidth.Empty())
-			{
-				dWidth  = oWindow.m_oWidth.ToDouble(NSCSS::Pixel, GET_PREV_WIDTH_VALUE);
-				dHeight = dWidth / dAspectRatio;
-			}
-			else if (!oWindow.m_oHeight.Empty())
-			{
-				dHeight = oWindow.m_oHeight.ToDouble(NSCSS::Pixel, GET_PREV_HEIGHT_VALUE);
-				dWidth  = dHeight * dAspectRatio;
-			}
-
-			return true;
-		}
-
-		if (NULL != m_pContainer && !m_pContainer->Empty())
-		{
-			SVG::SvgMatrix oTransform;
-			const SVG::TBounds oBounds{m_pContainer->GetBounds(&oTransform)};
-
-			const double dContentWidth {oBounds.m_dRight  - oBounds.m_dLeft};
-			const double dContentHeight{oBounds.m_dBottom - oBounds.m_dTop };
-
-			const double dAspectRatio{dContentWidth / dContentHeight};
-
-			if (!oWindow.m_oWidth.Empty())
-			{
-				dWidth  = oWindow.m_oWidth.ToDouble(NSCSS::Pixel, GET_PREV_WIDTH_VALUE);
-				dHeight = dWidth / dAspectRatio;
-			}
-			else if (!oWindow.m_oHeight.Empty())
-			{
-				dHeight = oWindow.m_oHeight.ToDouble(NSCSS::Pixel, GET_PREV_HEIGHT_VALUE);
-				dWidth  = dHeight * dAspectRatio;
-			}
-
-			dX = oBounds.m_dLeft;
-			dY = oBounds.m_dTop;
-
-			return true;
-		}
-
-		if (!oWindow.m_oWidth.Empty())
-		{
-			dWidth  = oWindow.m_oWidth.ToDouble(NSCSS::Pixel, GET_PREV_WIDTH_VALUE);
-			dHeight = SVG_FILE_HEIGHT;
-		}
-		else if (!oWindow.m_oHeight.Empty())
-		{
-			dHeight = oWindow.m_oHeight.ToDouble(NSCSS::Pixel, GET_PREV_HEIGHT_VALUE);
-			dWidth  = SVG_FILE_WIDTH;
-		}
-
-		return true;
-	}
-
-	if (NULL != m_pContainer && !m_pContainer->Empty())
-	{
-		SVG::SvgMatrix oTransform;
-		const SVG::TBounds oBounds{m_pContainer->GetBounds(&oTransform)};
-
-		dX = oBounds.m_dLeft;
-		dY = oBounds.m_dTop;
-
-		dWidth  = oBounds.m_dRight  - oBounds.m_dLeft;
-		dHeight = oBounds.m_dBottom - oBounds.m_dTop;
-
-		return true;
-	}
-
-	dWidth  = SVG_FILE_WIDTH;
-	dHeight = SVG_FILE_HEIGHT;
-
-	return true;
-}

DesktopEditor/raster/Metafile/svg/CSvgFile.h

@@ -4,13 +4,13 @@
 #include "../../../graphics/IRenderer.h"
 #include "../../../graphics/pro/Fonts.h"
 
+#include "CSvgParser.h"
 #include "SvgObjects/CStyle.h"
 
 namespace SVG 
 {
 	struct TFontArguments;
 	class CFont;
-	class CGraphicsContainer;
 }
 
 class CSvgFile
@@ -43,11 +43,9 @@ class CSvgFile
 	private:
 		void Clear();
 
-		bool CalculateFinalSize(bool bUseViewBox, double& dX, double& dY, double& dWidth, double& dHeight) const;
-
-		SVG::CGraphicsContainer *m_pContainer;
+		SVG::CSvgParser          m_oParser;
+		SVG::CGraphicsContainer  m_oContainer;
 		SVG::CSvgCalculator      m_oSvgCalculator;
-		NSFonts::IFontManager   *m_pFontManager;
 
 		typedef std::map<std::wstring, SVG::CObject*> MarkedMap;
 

DesktopEditor/raster/Metafile/svg/CSvgParser.cpp

@@ -24,16 +24,16 @@
 #include "SvgObjects/CMask.h"
 #include "SvgObjects/CUse.h"
 
-#include "../../../../Common/3dParty/html/css/src/StaticFunctions.h"
-
 namespace SVG
 {
-	CSvgParser::CSvgParser(NSFonts::IFontManager* pFontManager)
-		: m_pFontManager(pFontManager)
-	{}
+	CSvgParser::CSvgParser()
+	    : m_pFontManager(NULL)
+	{
+	}
 
 	CSvgParser::~CSvgParser()
-	{}
+	{
+	}
 
 	void CSvgParser::SetFontManager(NSFonts::IFontManager *pFontManager)
 	{
@@ -74,7 +74,7 @@ namespace SVG
 		return std::string(itEncodingValueBegin, itEncodingValueEnd);
 	}
 
-	bool CSvgParser::LoadFromFile(const std::wstring &wsFile, CGraphicsContainer*& pContainer, CSvgFile* pFile) const
+	bool CSvgParser::LoadFromFile(const std::wstring &wsFile, CGraphicsContainer* pContainer, CSvgFile* pFile) const
 	{
 		if (wsFile.empty() || NULL == pFile)
 			return false;
@@ -102,54 +102,69 @@ namespace SVG
 		else
 			return false;
 
-		return LoadFromString(wsContent, pContainer, pFile);
+		XmlUtils::IXmlDOMDocument::DisableOutput();
+		bool bResult = LoadFromString(wsContent, pContainer, pFile);
+		XmlUtils::IXmlDOMDocument::EnableOutput();
+
+		return bResult;
 	}
 
-	bool CSvgParser::LoadFromString(const std::wstring &wsContent, CGraphicsContainer*& pContainer, CSvgFile* pFile) const
+	bool CSvgParser::LoadFromString(const std::wstring &wsContentent, CGraphicsContainer* pContainer, CSvgFile* pFile) const
 	{
-		if (wsContent.empty() || NULL == pFile)
+		if (wsContentent.empty() || NULL == pFile)
 			return false;
 
-		CSvgReader oReader;
-		if (!oReader.ReadFromString(wsContent))
+		XmlUtils::CXmlNode oXml;
+		if (!oXml.FromXmlString(wsContentent))
 			return false;
 
-		ScanStyles(oReader, pFile);
-		oReader.MoveToStart();
+		ScanStyles(oXml, pFile);
 
-		RELEASEINTERFACE(pContainer);
+		if (NULL != pContainer)
+			pContainer->SetData(oXml);
 
-		pContainer = CObject::Create<CGraphicsContainer>(oReader, pFile);
-
-		if (NULL == pContainer)
-			return false;
-
-		return ReadChildrens(oReader, pContainer, pFile, pContainer);
+		return LoadFromXmlNode(oXml, pContainer, pFile);
 	}
 
-	bool CSvgParser::ScanStyles(CSvgReader& oReader, CSvgFile *pFile) const
+	bool CSvgParser::LoadFromXmlNode(XmlUtils::CXmlNode &oElement, CGraphicsContainer* pContainer, CSvgFile* pFile) const
 	{
-		if (oReader.IsEmptyNode() || NULL == pFile)
+		if (NULL == pFile || !oElement.IsValid())
 			return false;
 
-		const std::string sElementName = oReader.GetName();
+		const CSvgCalculator *pSvgCalculator = pFile->GetSvgCalculator();
 
-		if ("style" == sElementName)
+		if (NULL != pSvgCalculator)
+			pSvgCalculator->SetData(pContainer);
+
+		return ReadChildrens(oElement, pContainer, pFile, pContainer);
+	}
+
+	bool CSvgParser::ScanStyles(XmlUtils::CXmlNode &oElement, CSvgFile *pFile) const
+	{
+		if (!oElement.IsValid() || NULL == pFile)
+			return false;
+
+		std::wstring wsElementName = oElement.GetName();
+
+		if (L"style" == wsElementName)
 		{
-			ParseStyles(oReader.GetText(), pFile);
+			ParseStyles(oElement.GetText(), pFile);
 			return true;
 		}
 
 		bool bScanResult = false;
 
-		if ("svg" == sElementName || "g" == sElementName || "defs" == sElementName)
+		if (L"svg" == wsElementName || L"g" == wsElementName || L"defs" == wsElementName)
 		{
-			WHILE_READ_NEXT_NODE(oReader)
+			std::vector<XmlUtils::CXmlNode> arChilds;
+
+			oElement.GetChilds(arChilds);
+
+			for (XmlUtils::CXmlNode& oChild : arChilds)
 			{
-				if (ScanStyles(oReader, pFile))
+				if (ScanStyles(oChild, pFile))
 					bScanResult = true;
 			}
-			END_WHILE
 		}
 
 		return bScanResult;
@@ -209,103 +224,155 @@ namespace SVG
 			oSearchStart = oMatch.suffix().first;
 		}
 	}
+
 	template <class ObjectType>
-	bool CSvgParser::ReadObject(CSvgReader& oReader, CContainer<ObjectType> *pContainer, CSvgFile *pFile, CRenderedObject *pParent) const
+	bool CSvgParser::ReadObject(XmlUtils::CXmlNode &oElement, CContainer<ObjectType> *pContainer, CSvgFile *pFile, CRenderedObject *pParent) const
 	{
-		if (NULL == pFile)
+		if (!oElement.IsValid() || NULL == pFile)
 			return false;
 
-		const std::string sElementName = oReader.GetName();
+		std::wstring wsElementName = oElement.GetName();
 
 		CObject *pObject = NULL;
 
-		if ("svg" == sElementName || "g" == sElementName || "a" == sElementName)
+		if (L"svg" == wsElementName || L"g" == wsElementName || L"a" == wsElementName)
 		{
-			pObject = CObject::Create<CGraphicsContainer>(oReader, pFile, pParent);
-			if (!ReadChildrens(oReader, (CGraphicsContainer*)pObject, pFile, (CGraphicsContainer*)pObject))
+			pObject = new CGraphicsContainer(oElement, pParent);
+			if (!ReadChildrens(oElement, (CGraphicsContainer*)pObject, pFile, (CGraphicsContainer*)pObject))
 			{
-				RELEASEINTERFACE(pObject);
+				RELEASEOBJECT(pObject);
 				return false;
 			}
 		}
-		else if ("line" == sElementName)
-			pObject = CObject::Create<CLine>(oReader, pFile, pParent);
-		else if ("rect" == sElementName)
-			pObject = CObject::Create<CRect>(oReader, pFile, pParent);
-		else if ("circle" == sElementName)
-			pObject = CObject::Create<CCircle>(oReader, pFile, pParent);
-		else if ("ellipse" == sElementName)
-			pObject = CObject::Create<CEllipse>(oReader, pFile, pParent);
-		else if ("path" == sElementName)
-			pObject = CObject::Create<CPath>(oReader, pFile, pParent);
-		else if ("polyline" == sElementName)
-			pObject = CObject::Create<CPolyline>(oReader, pFile, pParent);
-		else if ("polygon" == sElementName)
-			pObject = CObject::Create<CPolygon>(oReader, pFile, pParent);
-		else if ("image" == sElementName)
-			pObject = CObject::Create<CImage>(oReader, pFile, pParent);
-		else if ("use" == sElementName)
-			pObject = CObject::Create<CUse>(oReader, pFile, pParent);
-		else if ("text" == sElementName)
-			pObject = CObject::Create<CText>(oReader, pFile, pParent, m_pFontManager);
-		else if ("tspan" == sElementName)
-			pObject = CObject::Create<CTSpan>(oReader, pFile, pParent, m_pFontManager);
-		else if ("textPath" == sElementName)
-			pObject = CObject::Create<CTextPath>(oReader, pFile, pParent, m_pFontManager);
-		else if ("switch" == sElementName)
+		else if (L"line" == wsElementName)
+			pObject = new CLine(oElement, pParent);
+		else if (L"rect" == wsElementName)
+			pObject = new CRect(oElement, pParent);
+		else if (L"circle" == wsElementName)
+			pObject = new CCircle(oElement, pParent);
+		else if (L"ellipse" == wsElementName)
+			pObject = new CEllipse(oElement, pParent);
+		else if (L"path" == wsElementName)
+			pObject = new CPath(oElement, pParent);
+		else if (L"polyline" == wsElementName)
+			pObject = new CPolyline(oElement, pParent);
+		else if (L"polygon" == wsElementName)
+			pObject = new CPolygon(oElement, pParent);
+		else if (L"image" == wsElementName)
+			pObject = new CImage(oElement, pParent);
+		else if (L"use" == wsElementName)
+			pObject = new CUse(oElement, pParent);
+		else if (L"text" == wsElementName)
 		{
-			pObject = CObject::Create<CSwitch>(oReader, pFile, pParent);
-			ReadChildrens(oReader, (CSwitch*)pObject, pFile);
+			pObject = CText::Create(oElement, pParent, m_pFontManager);
+			ReadChildrens(oElement, (CText*)pObject, pFile, (CText*)pObject);
+		}
+		else if (L"tspan" == wsElementName)
+		{
+			pObject = CTSpan::Create(oElement, pParent, m_pFontManager);
+			ReadChildrens(oElement, (CTSpan*)pObject, pFile, (CTSpan*)pObject);
+		}
+		else if (L"textPath" == wsElementName)
+		{
+			pObject = CTextPath::Create(oElement, pParent, m_pFontManager, pFile);
+			ReadChildrens(oElement, (CTextPath*)pObject, pFile);
+		}
+		else if (L"switch" == wsElementName)
+		{
+			pObject = new CSwitch(oElement, pParent);
+			ReadChildrens(oElement, (CSwitch*)pObject, pFile);
 		}
 		//defs
-		else if ("defs" == sElementName)
-			return ReadChildrens<CRenderedObject>(oReader, NULL, pFile);
-		else if("linearGradient" == sElementName)
-			pObject = CObject::Create<CLinearGradient>(oReader, pFile);
-		else if ("radialGradient" == sElementName)
-			pObject = CObject::Create<CRadialGradient>(oReader, pFile);
-		else if ("pattern" == sElementName)
+		else if (L"defs" == wsElementName)
+			return ReadChildrens<CRenderedObject>(oElement, NULL, pFile);
+		else if(L"linearGradient" == wsElementName)
 		{
-			pObject = CObject::Create<CPattern>(oReader, pFile);
-			ReadChildrens(oReader, (CGraphicsContainer*)(&((CPattern*)pObject)->GetContainer()), pFile);
+			pObject = new CLinearGradient(oElement);
+			ReadChildrens(oElement, (CLinearGradient*)pObject, pFile);
 		}
-		else if ("clipPath" == sElementName)
+		else if (L"radialGradient" == wsElementName)
 		{
-			pObject = CObject::Create<CClipPath>(oReader, pFile);
-			ReadChildrens(oReader, (CGraphicsContainer*)(&((CClipPath*)pObject)->GetContainer()), pFile);
+			pObject = new CRadialGradient(oElement);
+			ReadChildrens(oElement, (CRadialGradient*)pObject, pFile);
 		}
-		else if ("marker" == sElementName)
+		else if (L"stop" == wsElementName)
 		{
-			pObject = CObject::Create<CMarker>(oReader, pFile);
-			ReadChildrens(oReader, (CMarker*)pObject, pFile);
+			CStopElement *pStopElement = new CStopElement(oElement);
+			if (AddObject((ObjectType*)pStopElement, pContainer))
+			{
+				UpdateStyles(pStopElement, pFile);
+				return true;
+			}
+			else
+			{
+				RELEASEOBJECT(pStopElement);
+				return false;
+			}
 		}
-		else if ("mask" == sElementName)
+		else if (L"pattern" == wsElementName)
 		{
-			pObject = CObject::Create<CMask>(oReader, pFile);
-			ReadChildrens(oReader, (CGraphicsContainer*)(&((CMask*)pObject)->GetContainer()), pFile);
+			pObject = new CPattern(oElement, m_pFontManager);
+			ReadChildrens(oElement, (CGraphicsContainer*)(&((CPattern*)pObject)->GetContainer()), pFile);
 		}
-		else if ("symbol" == sElementName)
+		else if (L"clipPath" == wsElementName)
 		{
-			pObject = CObject::Create<CSymbol>(oReader, pFile);
-			if (ReadChildrens(oReader, (CSymbol*)pObject, pFile))
+			pObject = new CClipPath(oElement);
+			ReadChildrens(oElement, (CGraphicsContainer*)(&((CClipPath*)pObject)->GetContainer()), pFile);
+		}
+		else if (L"marker" == wsElementName)
+		{
+			pObject = new CMarker(oElement);
+			ReadChildrens(oElement, (CMarker*)pObject, pFile);
+		}
+		else if (L"mask" == wsElementName)
+		{
+			pObject = new CMask(oElement);
+			ReadChildrens(oElement, (CGraphicsContainer*)(&((CMask*)pObject)->GetContainer()), pFile);
+		}
+		else if (L"symbol" == wsElementName)
+		{
+			pObject = new CSymbol(oElement);
+			if (ReadChildrens(oElement, (CSymbol*)pObject, pFile) && MarkObject(pObject, pFile))
 				return true;
 			else
-				RELEASEINTERFACE(pObject);
+				RELEASEOBJECT(pObject);
 		}
-		else if ("font" == sElementName)
+		else if (L"font" == wsElementName)
 		{
-			pObject = CObject::Create<CFont>(oReader, pFile, pFile);
+			pObject = new CFont(oElement);
 		}
 
-		if (NULL == pObject)
+		if (NULL != pObject)
+		{
+			if ((MarkObject(pObject, pFile) && (AppliedObject == pObject->GetType() || NULL == pContainer)) ||
+				(RendererObject == pObject->GetType() && AddObject((ObjectType*)pObject, pContainer)))
+			{
+				UpdateStyles(pObject, pFile);
+				return true;
+			}
+			delete pObject;
+		}
+
+		return false;
+	}
+
+	void CSvgParser::UpdateStyles(CObject *pObject, CSvgFile *pFile) const
+	{
+		if (NULL == pObject || NULL == pFile)
+			return;
+
+		const CSvgCalculator *pSvgCalculator = pFile->GetSvgCalculator();
+
+		if (NULL != pSvgCalculator)
+			pSvgCalculator->SetData(pObject);
+	}
+
+	bool CSvgParser::MarkObject(CObject *pObject, CSvgFile *pFile) const
+	{
+		if (NULL == pObject || NULL == pFile)
 			return false;
 
-		if ((RendererObject == pObject->GetType() && (AddObject((ObjectType*)pObject, pContainer) || pObject->Marked())) ||
-		    AppliedObject == pObject->GetType())
-			return true;
-
-		RELEASEINTERFACE(pObject);
-		return false;
+		return pFile->MarkObject(pObject);
 	}
 
 	template <class ObjectType>
@@ -315,15 +382,18 @@ namespace SVG
 	}
 
 	template <class ObjectType>
-	bool CSvgParser::ReadChildrens(CSvgReader& oReader, CContainer<ObjectType>* pContainer, CSvgFile* pFile, CRenderedObject *pParent) const
+	bool CSvgParser::ReadChildrens(XmlUtils::CXmlNode &oElement, CContainer<ObjectType>* pContainer, CSvgFile* pFile, CRenderedObject *pParent) const
 	{
-		bool bResult = false;
+		std::vector<XmlUtils::CXmlNode> arChilds;
 
-		WHILE_READ_NEXT_NODE(oReader)
-			if (ReadObject(oReader, pContainer, pFile, pParent))
-				bResult = true;
-		END_WHILE
+		oElement.GetChilds(arChilds);
 
-		return bResult;
+		if (arChilds.empty())
+			return false;
+
+		for (XmlUtils::CXmlNode& oChild : arChilds)
+			ReadObject(oChild, pContainer, pFile, pParent);
+
+		return true;
 	}
 }

DesktopEditor/raster/Metafile/svg/CSvgParser.h

@@ -3,9 +3,9 @@
 
 #include "../../../common/Directory.h"
 #include "../../../graphics/pro/Fonts.h"
+#include "../../../xml/include/xmlutils.h"
 
 #include "SvgObjects/CContainer.h"
-#include "SvgReader.h"
 
 class CSvgFile;
 
@@ -14,23 +14,26 @@ namespace SVG
 	class CSvgParser
 	{
 	public:
-		CSvgParser(NSFonts::IFontManager* pFontManager = NULL);
+		CSvgParser();
 		~CSvgParser();
 
 		void SetFontManager(NSFonts::IFontManager* pFontManager);
 
-		bool LoadFromFile(const std::wstring& wsFile, CGraphicsContainer*& pContainer, CSvgFile* pFile) const;
-		bool LoadFromString(const std::wstring& wsContent, CGraphicsContainer*& pContainer, CSvgFile* pFile) const;
+		bool LoadFromFile(const std::wstring& wsFile, CGraphicsContainer* pContainer, CSvgFile* pFile) const;
+		bool LoadFromString(const std::wstring& wsContentent, CGraphicsContainer* pContainer, CSvgFile* pFile) const;
+		bool LoadFromXmlNode(XmlUtils::CXmlNode& oElement, CGraphicsContainer* pContainer, CSvgFile* pFile) const;
 
 		template <class ObjectType>
-		bool ReadObject(CSvgReader& oReader, CContainer<ObjectType>* pContainer, CSvgFile* pFile, CRenderedObject* pParent = NULL) const;
+		bool ReadObject(XmlUtils::CXmlNode& oElement, CContainer<ObjectType>* pContainer, CSvgFile* pFile, CRenderedObject* pParent = NULL) const;
 	private:
 		template <class ObjectType>
-		bool ReadChildrens(CSvgReader& oReader, CContainer<ObjectType>* pContainer, CSvgFile* pFile, CRenderedObject* pParent = NULL) const;
+		bool ReadChildrens(XmlUtils::CXmlNode& oElement, CContainer<ObjectType>* pContainer, CSvgFile* pFile, CRenderedObject* pParent = NULL) const;
 
-		bool ScanStyles(CSvgReader& oReader, CSvgFile* pFile) const;
+		bool ScanStyles(XmlUtils::CXmlNode& oElement, CSvgFile* pFile) const;
 		void ParseStyles(const std::wstring& wsStyles, CSvgFile *pFile) const;
 
+		void UpdateStyles(CObject* pObject, CSvgFile* pFile) const;
+		bool MarkObject(CObject* pObject, CSvgFile* pFile) const;
 		template <class ObjectType>
 		bool AddObject(ObjectType* pObject, CContainer<ObjectType>* pContainer) const;
 

DesktopEditor/raster/Metafile/svg/SvgObjects/CCircle.cpp

@@ -1,27 +1,16 @@
 #include "CCircle.h"
 
 #include "CContainer.h"
+#include "CStyle.h"
 
 namespace SVG
 {
-	CCircle::CCircle(CSvgReader& oReader, CRenderedObject* pParent)
-		: CRenderedObject(oReader, pParent)
+	CCircle::CCircle(XmlUtils::CXmlNode& oNode, CRenderedObject* pParent)
+		: CRenderedObject(oNode, pParent)
 	{
-		START_READ_ATTRIBUTES(oReader)
-			SetAttribute(sAttributeName, oReader);
-		END_READ_ATTRIBUTES(oReader)
-	}
-
-	void CCircle::SetAttribute(const std::string& sName, CSvgReader& oReader)
-	{
-		if ("cx" == sName)
-			m_oCx.SetValue(oReader.GetText());
-		else if ("cy" == sName)
-			m_oCy.SetValue(oReader.GetText());
-		else if ("r" == sName)
-			m_oR.SetValue(oReader.GetText());
-		else
-			CRenderedObject::SetAttribute(sName, oReader);
+		m_oCx.SetValue(oNode.GetAttribute(L"cx"));
+		m_oCy.SetValue(oNode.GetAttribute(L"cy"));
+		m_oR .SetValue(oNode.GetAttribute(L"r"));
 	}
 
 	void CCircle::SetData(const std::map<std::wstring, std::wstring> &mAttributes, unsigned short ushLevel, bool bHardMode)
@@ -62,7 +51,7 @@ namespace SVG
 			nTypePath += c_nWindingFillMode;
 	}
 
-	TBounds CCircle::GetBounds(SvgMatrix* pTransform) const
+	TBounds CCircle::GetBounds() const
 	{
 		TBounds oBounds;
 
@@ -71,16 +60,6 @@ namespace SVG
 		oBounds.m_dRight  = (m_oCx + m_oR).ToDouble(NSCSS::Pixel);
 		oBounds.m_dBottom = (m_oCy + m_oR).ToDouble(NSCSS::Pixel);
 
-		if (nullptr != pTransform)
-		{
-			*pTransform += m_oTransformation.m_oTransform.GetMatrix();
-
-			pTransform->GetFinalValue().TransformPoint(oBounds.m_dLeft,  oBounds.m_dTop   );
-			pTransform->GetFinalValue().TransformPoint(oBounds.m_dRight, oBounds.m_dBottom);
-
-			*pTransform -= m_oTransformation.m_oTransform.GetMatrix();
-		}
-
 		return oBounds;
 	}
 

DesktopEditor/raster/Metafile/svg/SvgObjects/CCircle.h

@@ -7,10 +7,8 @@ namespace SVG
 {
 	class CCircle : public CRenderedObject
 	{
-		friend class CObject;
-		CCircle(CSvgReader& oReader, CRenderedObject* pParent = NULL);
 	public:
-		void SetAttribute(const std::string& sName, CSvgReader& oReader) override;
+		CCircle(XmlUtils::CXmlNode& oNode, CRenderedObject* pParent = NULL);
 
 		void SetData(const std::map<std::wstring, std::wstring>& mAttributes, unsigned short ushLevel, bool bHardMode = false) override;
 
@@ -18,7 +16,7 @@ namespace SVG
 	private:
 		void ApplyStyle(IRenderer* pRenderer, const TSvgStyles* pStyles, const CSvgFile *pFile, int& nTypePath, const CRenderedObject* pContexObject = NULL) const override;
 
-		TBounds GetBounds(SvgMatrix* pTransform = nullptr) const override;
+		TBounds GetBounds() const override;
 
 		SvgDigit m_oCx;
 		SvgDigit m_oCy;

DesktopEditor/raster/Metafile/svg/SvgObjects/CClipPath.cpp

@@ -2,19 +2,13 @@
 
 namespace SVG
 {
-	CClipPath::CClipPath(CSvgReader& oReader)
-		: CAppliedObject(oReader), m_enUnits(ClipU_ObjectBoundingBox)
-	{}
-
-	void CClipPath::SetAttribute(const std::string& sName, CSvgReader& oReader)
+	CClipPath::CClipPath(XmlUtils::CXmlNode &oNode)
+		: CAppliedObject(oNode)
 	{
-		if ("gradientUnits" == sName)
-		{
-			if ("userSpaceOnUse" == oReader.GetTextA())
-				m_enUnits = ClipU_UserSpaceOnUse;
-		}
+		if (L"userSpaceOnUse" == oNode.GetAttribute(L"gradientUnits"))
+			m_enUnits = ClipU_UserSpaceOnUse;
 		else
-			CAppliedObject::SetAttribute(sName, oReader);
+			m_enUnits = ClipU_ObjectBoundingBox;
 	}
 
 	void CClipPath::SetData(const std::map<std::wstring, std::wstring> &mAttributes, unsigned short ushLevel, bool bHardMode)
@@ -31,7 +25,7 @@ namespace SVG
 
 		ApplyClip(pRenderer, &m_oTransformation.m_oClip, pFile, oObjectBounds);
 
-		for (const CRenderedObject* pObject : m_oContainer)
+		for (const CRenderedObject* pObject : m_oContainer.m_arObjects)
 			pObject->Draw(pRenderer, pFile, CommandeModeClip);
 
 		return true;

DesktopEditor/raster/Metafile/svg/SvgObjects/CClipPath.h

@@ -13,10 +13,8 @@ namespace SVG
 
 	class CClipPath : public CAppliedObject
 	{
-		friend class CObject;
-		CClipPath(CSvgReader& oReader);
 	public:
-		void SetAttribute(const std::string& sName, CSvgReader& oReader) override;
+		CClipPath(XmlUtils::CXmlNode& oNode);
 
 		void SetData(const std::map<std::wstring, std::wstring> &mAttributes, unsigned short ushLevel, bool bHardMode) override;
 

DesktopEditor/raster/Metafile/svg/SvgObjects/CContainer.cpp

@@ -5,23 +5,30 @@
 
 namespace SVG
 {
-	CGraphicsContainer::CGraphicsContainer(CSvgReader& oReader, CRenderedObject *pParent)
-		: CRenderedObject(oReader, pParent)
+	CGraphicsContainer::CGraphicsContainer(const std::wstring &wsName)
+		: CRenderedObject(NSCSS::CNode(wsName, L"", L""))
 	{}
 
-	void CGraphicsContainer::SetAttribute(const std::string& sName, CSvgReader& oReader)
+	CGraphicsContainer::~CGraphicsContainer()
 	{
-		if ("x" == sName)
-			m_oWindow.m_oX.SetValue(oReader.GetText());
-		else if ("y" == sName)
-			m_oWindow.m_oY.SetValue(oReader.GetText());
-		else if ("width" == sName)
-			m_oWindow.m_oWidth.SetValue(oReader.GetText());
-		else if ("height" == sName)
-			m_oWindow.m_oHeight.SetValue(oReader.GetText());
-		else if ("viewBox" == sName)
+		for (CRenderedObject* pObject : m_arObjects)
+			pObject->m_pParent = NULL;
+	}
+
+	void CGraphicsContainer::SetData(XmlUtils::CXmlNode &oNode)
+	{
+		SetNodeData(oNode);
+
+		m_oWindow.m_oX     .SetValue(oNode.GetAttribute(L"x"));
+		m_oWindow.m_oY     .SetValue(oNode.GetAttribute(L"y"));
+		m_oWindow.m_oWidth .SetValue(oNode.GetAttribute(L"width"), 0, true);
+		m_oWindow.m_oHeight.SetValue(oNode.GetAttribute(L"height"), 0, true);
+
+		const std::wstring wsViewBox = oNode.GetAttribute(L"viewBox");
+
+		if (!wsViewBox.empty())
 		{
-			const std::vector<double> arValues{StrUtils::ReadDoubleValues(oReader.GetText())};
+			std::vector<double> arValues = StrUtils::ReadDoubleValues(wsViewBox);
 			if (4 == arValues.size())
 			{
 				m_oViewBox.m_oX      = arValues[0];
@@ -31,9 +38,19 @@ namespace SVG
 			}
 		}
 		else
-			CRenderedObject::SetAttribute(sName, oReader);
+			m_oViewBox = m_oWindow;
 	}
 
+	CGraphicsContainer::CGraphicsContainer(XmlUtils::CXmlNode& oNode, CRenderedObject *pParent)
+		: CRenderedObject(oNode, pParent)
+	{
+		SetData(oNode);
+	}
+
+	CGraphicsContainer::CGraphicsContainer(double dWidth, double dHeight, XmlUtils::CXmlNode& oNode, CRenderedObject *pParent)
+		: CRenderedObject(oNode, pParent), m_oWindow{0, 0, dWidth, dHeight}
+	{}
+
 	bool CGraphicsContainer::Draw(IRenderer *pRenderer, const CSvgFile *pFile, CommandeMode oMode, const TSvgStyles *pOtherStyles, const CRenderedObject* pContexObject) const
 	{
 		Aggplus::CMatrix oOldTransform;
@@ -59,7 +76,7 @@ namespace SVG
 		return m_oViewBox;
 	}
 
-	TBounds CGraphicsContainer::GetBounds(SvgMatrix* pTransform) const
+	TBounds CGraphicsContainer::GetBounds() const
 	{
 		TBounds oBounds, oTempBounds;
 
@@ -68,21 +85,15 @@ namespace SVG
 		oBounds.m_dRight  += m_oWindow.m_oWidth.ToDouble(NSCSS::Pixel);
 		oBounds.m_dBottom += m_oWindow.m_oHeight.ToDouble(NSCSS::Pixel);
 
-		if (nullptr != pTransform)
-			*pTransform += m_oTransformation.m_oTransform.GetMatrix();
-
 		for (const CRenderedObject* pObject : m_arObjects)
 		{
-			oTempBounds = pObject->GetBounds(pTransform);
+			oTempBounds = pObject->GetBounds();
 			oBounds.m_dLeft   = std::min(oBounds.m_dLeft, oTempBounds.m_dLeft);
 			oBounds.m_dTop    = std::min(oBounds.m_dTop, oTempBounds.m_dTop);
 			oBounds.m_dRight  = std::max(oBounds.m_dRight, oTempBounds.m_dRight);
 			oBounds.m_dBottom = std::max(oBounds.m_dBottom, oTempBounds.m_dBottom);
 		}
 
-		if (nullptr != pTransform)
-			*pTransform -= m_oTransformation.m_oTransform.GetMatrix();
-
 		return oBounds;
 	}
 

DesktopEditor/raster/Metafile/svg/SvgObjects/CContainer.h

@@ -12,9 +12,8 @@ namespace SVG
 	template<typename TypeObject>
 	class CContainer
 	{
-		using const_iterator = typename std::vector<TypeObject*>::const_iterator;
 	public:
-		CContainer() = default;
+		CContainer(){}
 		virtual ~CContainer()
 		{
 			Clear();
@@ -62,35 +61,39 @@ namespace SVG
 
 			return NULL;
 		}
-
-		const_iterator begin() const
-		{
-			return m_arObjects.cbegin();
-		}
-
-		const_iterator end() const
-		{
-			return m_arObjects.cend();
-		}
-	protected:
+	private:
 		std::vector<TypeObject*> m_arObjects;
+
+		friend class CText;
+		friend class CMask;
+		friend class CTSpan;
+		friend class CMarker;
+		friend class CSwitch;
+		friend class CPattern;
+		friend class CGradient;
+		friend class CClipPath;
+		friend class CTextPath;
+		friend class CLinearGradient;
+		friend class CGraphicsContainer;
 	};
 
 	class CGraphicsContainer : public CContainer<CRenderedObject>, public CRenderedObject
 	{
-		friend class CObject;
-		CGraphicsContainer(CSvgReader& oReader, CRenderedObject* pParent = NULL);
 	public:
-		virtual ~CGraphicsContainer() = default;
+		CGraphicsContainer(const std::wstring& wsName = L"GraphicsContainer");
+		CGraphicsContainer(XmlUtils::CXmlNode& oNode, CRenderedObject* pParent = NULL);
+		CGraphicsContainer(double dWidth, double dHeight, XmlUtils::CXmlNode& oNode, CRenderedObject* pParent = NULL);
 
-		void SetAttribute(const std::string& sName, CSvgReader& oReader) override;
+		virtual ~CGraphicsContainer();
+
+		void SetData(XmlUtils::CXmlNode& oNode);
 
 		bool Draw(IRenderer* pRenderer, const CSvgFile *pFile, CommandeMode oMode = CommandeModeDraw, const TSvgStyles* pOtherStyles = NULL, const CRenderedObject* pContexObject = NULL) const override;
 
 		TRect GetWindow() const;
 		TRect GetViewBox() const;
-		TBounds GetBounds(SvgMatrix* pTransform = nullptr) const override;
 	private:
+		TBounds GetBounds() const override;
 
 		friend class CPattern;
 		friend class CMarker;

DesktopEditor/raster/Metafile/svg/SvgObjects/CEllipse.cpp

@@ -1,12 +1,18 @@
 #include "CEllipse.h"
 
+#include "CStyle.h"
 #include "CContainer.h"
 
 namespace SVG
 {
-	CEllipse::CEllipse(CSvgReader& oReader, CRenderedObject* pParent)
-		: CRenderedObject(oReader, pParent)
-	{}
+	CEllipse::CEllipse(XmlUtils::CXmlNode &oNode, CRenderedObject *pParent)
+		: CRenderedObject(oNode, pParent)
+	{
+		m_oCx.SetValue(oNode.GetAttribute(L"cx"));
+		m_oCy.SetValue(oNode.GetAttribute(L"cy"));
+		m_oRx.SetValue(oNode.GetAttribute(L"rx"));
+		m_oRy.SetValue(oNode.GetAttribute(L"ry"));
+	}
 
 	void CEllipse::SetData(const std::map<std::wstring, std::wstring> &mAttributes, unsigned short ushLevel, bool bHardMode)
 	{
@@ -16,20 +22,6 @@ namespace SVG
 		SetFill(mAttributes, ushLevel, bHardMode);
 	}
 
-	void CEllipse::SetAttribute(const std::string& sName, CSvgReader& oReader)
-	{
-		if ("cx" == sName)
-			m_oCx.SetValue(oReader.GetText());
-		else if ("cy" == sName)
-			m_oCy.SetValue(oReader.GetText());
-		else if ("rx" == sName)
-			m_oRx.SetValue(oReader.GetText());
-		else if ("ry" == sName)
-			m_oRy.SetValue(oReader.GetText());
-		else
-			CRenderedObject::SetAttribute(sName, oReader);
-	}
-
 	bool CEllipse::Draw(IRenderer *pRenderer, const CSvgFile *pFile, CommandeMode oMode, const TSvgStyles *pOtherStyles, const CRenderedObject* pContexObject) const
 	{
 		Aggplus::CMatrix oOldTransform;
@@ -64,7 +56,7 @@ namespace SVG
 			nTypePath += c_nWindingFillMode;
 	}
 
-	TBounds CEllipse::GetBounds(SvgMatrix* pTransform) const
+	TBounds CEllipse::GetBounds() const
 	{
 		TBounds oBounds;
 
@@ -73,16 +65,6 @@ namespace SVG
 		oBounds.m_dRight  = oBounds.m_dLeft + m_oRx.ToDouble(NSCSS::Pixel);
 		oBounds.m_dBottom = oBounds.m_dTop  + m_oRy.ToDouble(NSCSS::Pixel);;
 
-		if (nullptr != pTransform)
-		{
-			*pTransform += m_oTransformation.m_oTransform.GetMatrix();
-
-			pTransform->GetFinalValue().TransformPoint(oBounds.m_dLeft,  oBounds.m_dTop   );
-			pTransform->GetFinalValue().TransformPoint(oBounds.m_dRight, oBounds.m_dBottom);
-
-			*pTransform -= m_oTransformation.m_oTransform.GetMatrix();
-		}
-
 		return oBounds;
 	}
 }

DesktopEditor/raster/Metafile/svg/SvgObjects/CEllipse.h

@@ -1,24 +1,23 @@
 #ifndef CELLIPSE_H
 #define CELLIPSE_H
 
+
 #include "CObjectBase.h"
 
 namespace SVG
 {
 	class CEllipse : public CRenderedObject
 	{
-		friend class CObject;
-		CEllipse(CSvgReader& oReader, CRenderedObject* pParent = NULL);
 	public:
-		void SetData(const std::map<std::wstring, std::wstring>& mAttributes, unsigned short ushLevel, bool bHardMode = false) override;
+		CEllipse(XmlUtils::CXmlNode& oNode, CRenderedObject* pParent = NULL);
 
-		void SetAttribute(const std::string& sName, CSvgReader& oReader) override;
+		void SetData(const std::map<std::wstring, std::wstring>& mAttributes, unsigned short ushLevel, bool bHardMode = false) override;
 
 		bool Draw(IRenderer* pRenderer, const CSvgFile *pFile, CommandeMode oMode = CommandeModeDraw, const TSvgStyles* pOtherStyles = NULL, const CRenderedObject* pContexObject = NULL) const override;
 	private:
 		void ApplyStyle(IRenderer* pRenderer, const TSvgStyles* pStyles, const CSvgFile *pFile, int& nTypePath, const CRenderedObject* pContexObject = NULL) const override;
 
-		TBounds GetBounds(SvgMatrix* pTransform = nullptr) const override;
+		TBounds GetBounds() const override;
 
 		SvgDigit m_oCx;
 		SvgDigit m_oCy;

DesktopEditor/raster/Metafile/svg/SvgObjects/CFont.cpp

@@ -2,23 +2,15 @@
 
 namespace SVG 
 {
-	CGlyph::CGlyph(CSvgReader& oReader, CSvgFile* pFile)
-		: CPath(oReader)
-	{}
-
-	void CGlyph::SetAttribute(const std::string& sName, CSvgReader& oReader)
+	CGlyph::CGlyph(XmlUtils::CXmlNode &oNode)
+		: CPath(oNode)
 	{
-		if ("unicode" == sName)
-		{
-			const std::wstring wsUnicode{oReader.GetText()};
+		std::wstring wsUnicode(oNode.GetAttribute(L"unicode"));
 
-			if (!wsUnicode.empty())
-				m_wchUnicode = wsUnicode[0];
-		}
-		else if ("horiz-adv-x" == sName)
-			m_oHorizAdvX.SetValue(oReader.GetText());
-		else
-			CPath::SetAttribute(sName, oReader);
+		if (!wsUnicode.empty())
+			m_wchUnicode = wsUnicode[0];
+
+		m_oHorizAdvX.SetValue(oNode.GetAttributeOrValue(L"horiz-adv-x"));
 	}
 
 	wchar_t CGlyph::GetUnicode() const
@@ -26,13 +18,21 @@ namespace SVG
 		return m_wchUnicode;
 	}
 
-	CFontFace::CFontFace(CSvgReader& oReader)
-	{}
-
-	CFont::CFont(CSvgReader& oReader, CSvgFile* pFile)
-		: CAppliedObject(oReader), m_pMissingGlyph(NULL)
+	CFontFace::CFontFace(XmlUtils::CXmlNode &oNode)
 	{
-		ParseGlyphs(oReader, pFile);
+		
+	}
+
+	CFont::CFont(XmlUtils::CXmlNode &oNode)
+		: CAppliedObject(oNode), m_pMissingGlyph(NULL)
+	{
+		ParseGlyphs(oNode);
+
+		m_oArguments.m_wsFontVariant = oNode.GetAttribute(L"font-variant");
+		m_oArguments.m_wsFontStyle   = oNode.GetAttribute(L"font-style");
+		m_oArguments.m_wsFontWidght  = oNode.GetAttribute(L"font-weight");
+
+		m_oHorizAdvX.SetValue(oNode.GetAttributeOrValue(L"horiz-adv-x"));
 	}
 
 	CFont::~CFont()
@@ -43,20 +43,6 @@ namespace SVG
 		RELEASEOBJECT(m_pMissingGlyph);
 	}
 
-	void CFont::SetAttribute(const std::string& sName, CSvgReader& oReader)
-	{
-		if ("font-variant" == sName)
-			m_oArguments.m_wsFontVariant = oReader.GetText();
-		else if ("font-style" == sName)
-			m_oArguments.m_wsFontStyle = oReader.GetText();
-		else if ("font-weight" == sName)
-			m_oArguments.m_wsFontWidght = oReader.GetText();
-		else if ("horiz-adv-x" == sName)
-			m_oHorizAdvX.SetValue(oReader.GetText());
-		else
-			CAppliedObject::SetAttribute(sName, oReader);
-	}
-
 	void CFont::SetData(const std::map<std::wstring, std::wstring> &mAttributes, unsigned short ushLevel, bool bHardMode)
 	{
 	}
@@ -96,7 +82,7 @@ namespace SVG
 		{ \
 			oMatrix.Scale(1. / dGlyphScale, -1. / dGlyphScale); \
 			pRenderer->SetTransform(oMatrix.sx(), oMatrix.shy(), oMatrix.shx(), oMatrix.sy(), oMatrix.tx(), oMatrix.ty()); \
-		}
+		} \
 
 		for (wchar_t wchGlyph : wsText)
 		{
@@ -129,13 +115,18 @@ namespace SVG
 		return true;
 	}
 
-	void CFont::ParseGlyphs(CSvgReader& oReader, CSvgFile* pFile)
+	void CFont::ParseGlyphs(XmlUtils::CXmlNode &oNode)
 	{
-		WHILE_READ_NEXT_NODE_WITH_NAME(oReader)
+		std::vector<XmlUtils::CXmlNode> arChilds;
+
+		if (!oNode.GetChilds(arChilds) || arChilds.empty())
+			return;
+
+		for (XmlUtils::CXmlNode& oChild : arChilds)
 		{
-			if ("glyph" == sNodeName)
+			if (L"glyph" == oChild.GetName())
 			{
-				CGlyph *pGlyph = CObject::Create<CGlyph>(oReader, pFile, pFile);
+				CGlyph *pGlyph = new CGlyph(oChild);
 
 				if (NULL == pGlyph)
 					continue;
@@ -145,17 +136,22 @@ namespace SVG
 				else
 					delete pGlyph;
 			}
-			else if ("missing-glyph" == sNodeName)
+			else if (L"missing-glyph" == oChild.GetName())
 			{
-				WHILE_READ_NEXT_NODE_WITH_DEPTH_ONE_NAME(oReader, Child, "path")
+				std::vector<XmlUtils::CXmlNode> arMissingGlyphChilds;
+				if (!oChild.GetChilds(arMissingGlyphChilds) || arMissingGlyphChilds.empty())
+					continue;
+
+				for (XmlUtils::CXmlNode& oChildMissingGlyph : arMissingGlyphChilds)
 				{
-					m_pMissingGlyph = new CPath(oReader);
-					if (NULL != m_pMissingGlyph)
-						break;
+					if (L"path" == oChildMissingGlyph.GetName())
+					{
+						m_pMissingGlyph = new CPath(oChildMissingGlyph);
+						if (NULL != m_pMissingGlyph)
+							break;
+					}
 				}
-				END_WHILE
 			}
 		}
-		END_WHILE
 	}
 }

DesktopEditor/raster/Metafile/svg/SvgObjects/CFont.h

@@ -8,9 +8,7 @@ namespace SVG
 	class CGlyph : public CPath
 	{
 	public:
-		CGlyph(CSvgReader& oReader, CSvgFile* pFile = nullptr);
-
-		void SetAttribute(const std::string& sName, CSvgReader& oReader) override;
+		CGlyph(XmlUtils::CXmlNode& oNode);
 
 		wchar_t GetUnicode() const;
 	private:
@@ -23,7 +21,7 @@ namespace SVG
 	class CFontFace
 	{
 	public:
-		CFontFace(CSvgReader& oReader);
+		CFontFace(XmlUtils::CXmlNode& oNode);
 	private:
 		std::wstring m_wsSrcFaceName;
 	};
@@ -38,19 +36,16 @@ namespace SVG
 
 	class CFont : public CAppliedObject
 	{
-		friend class CObject;
-		CFont(CSvgReader& oReader, CSvgFile* pFile = nullptr);
 	public:
+		CFont(XmlUtils::CXmlNode& oNode);
 		~CFont();
 
-		void SetAttribute(const std::string& sName, CSvgReader& oReader) override;
-
 		void SetData(const std::map<std::wstring, std::wstring> &mAttributes, unsigned short ushLevel, bool bHardMode) override;
 
 		bool Apply(IRenderer* pRenderer, const CSvgFile *pFile, const TBounds &oObjectBounds) override;
 		bool Draw(const std::wstring& wsText, const double& dX, const double& dY, const double& dFontHeight, IRenderer* pRenderer, const CSvgFile *pFile, CommandeMode oMode = CommandeModeDraw, const TSvgStyles* pStyles = NULL, const CRenderedObject* pContexObject = NULL) const;
 	private:
-		void ParseGlyphs(CSvgReader& oReader, CSvgFile* pFile = nullptr);
+		void ParseGlyphs(XmlUtils::CXmlNode& oNode);
 
 		TFontArguments m_oArguments;
 

DesktopEditor/raster/Metafile/svg/SvgObjects/CGradient.cpp

@@ -3,13 +3,13 @@
 
 namespace SVG
 {
-	CStopElement::CStopElement(CSvgReader& oReader)
-		: CObject(oReader)
+	CStopElement::CStopElement(XmlUtils::CXmlNode& oNode)
+		: CObject(oNode)
 	{}
 
 	ObjectType CStopElement::GetType() const
 	{
-		return DataObject;
+		return AppliedObject;
 	}
 
 	SvgDigit CStopElement::GetOffset() const
@@ -34,36 +34,20 @@ namespace SVG
 			m_oColor.SetOpacity(mAttributes.at(L"stop-opacity"));
 	}
 
-	CGradient::CGradient(CSvgReader& oReader)
-	    : CAppliedObject(oReader), m_enGradientUnits(GradU_ObjectBoundingBox)
-	{}
-
-	void CGradient::SetAttribute(const std::string& sName, CSvgReader& oReader)
+	CGradient::CGradient(XmlUtils::CXmlNode &oNode)
+		: CAppliedObject(oNode)
 	{
-		if ("href" == sName || "xlink:href" == sName)
-			m_wsXlinkHref = oReader.GetText();
-		else if ("gradientTransform" == sName)
-			m_oTransform.SetMatrix(oReader.GetText(), 0, true);
-		else if ("gradientUnits" == sName)
-		{
-			if (L"userSpaceOnUse" == oReader.GetText())
-				m_enGradientUnits = GradU_UserSpaceOnUse;
-		}
+		m_wsXlinkHref = oNode.GetAttribute(L"href", oNode.GetAttribute(L"xlink:href"));
+		m_oTransform.SetMatrix(oNode.GetAttribute(L"gradientTransform"), 0, true);
+
+		if (L"userSpaceOnUse" == oNode.GetAttribute(L"gradientUnits"))
+			m_enGradientUnits = GradU_UserSpaceOnUse;
 		else
-			CAppliedObject::SetAttribute(sName, oReader);
+			m_enGradientUnits = GradU_ObjectBoundingBox;
 	}
 
-	void CGradient::SetData(const std::map<std::wstring, std::wstring>& mAttributes, unsigned short ushLevel, bool bHardMode)
-	{}
-
-	void CGradient::ReadChildrens(CSvgReader& oReader, CSvgFile* pSvgFile)
+	void CGradient::SetData(const std::map<std::wstring, std::wstring> &mAttributes, unsigned short ushLevel, bool bHardMode)
 	{
-		if (NULL == pSvgFile || NULL == pSvgFile->GetSvgCalculator())
-			return;
-
-		WHILE_READ_NEXT_NODE_WITH_ONE_NAME(oReader, "stop")
-			AddObject(CObject::Create<CStopElement>(oReader, pSvgFile));
-		END_WHILE
 	}
 
 	bool CGradient::Apply(IRenderer *pRenderer, const CSvgFile *pFile, const TBounds &oObjectBounds)
@@ -133,22 +117,13 @@ namespace SVG
 		return pRefGradient->Apply(pRenderer, pFile, oObjectBounds);
 	}
 
-	CLinearGradient::CLinearGradient(CSvgReader& oReader)
-	    : CGradient(oReader)
-	{}
-
-	void CLinearGradient::SetAttribute(const std::string& sName, CSvgReader& oReader)
+	CLinearGradient::CLinearGradient(XmlUtils::CXmlNode& oNode)
+		: CGradient(oNode)
 	{
-		if ("x1" == sName)
-			m_oX1.SetValue(oReader.GetText());
-		else if ("y1" == sName)
-			m_oY1.SetValue(oReader.GetText());
-		else if ("x2" == sName)
-			m_oX2.SetValue(oReader.GetText());
-		else if ("y2" == sName)
-			m_oY2.SetValue(oReader.GetText());
-		else
-			CGradient::SetAttribute(sName, oReader);
+		m_oX1.SetValue(oNode.GetAttribute(L"x1"));
+		m_oY1.SetValue(oNode.GetAttribute(L"y1"));
+		m_oX2.SetValue(oNode.GetAttribute(L"x2"));
+		m_oY2.SetValue(oNode.GetAttribute(L"y2"));
 	}
 
 	bool CLinearGradient::Apply(IRenderer *pRenderer, const CSvgFile *pFile, const TBounds &oObjectBounds)
@@ -194,20 +169,12 @@ namespace SVG
 		return true;
 	}
 
-	CRadialGradient::CRadialGradient(CSvgReader& oReader)
-	    : CGradient(oReader)
-	{}
-
-	void CRadialGradient::SetAttribute(const std::string& sName, CSvgReader& oReader)
+	CRadialGradient::CRadialGradient(XmlUtils::CXmlNode& oNode)
+		: CGradient(oNode)
 	{
-		if ("cx" == sName)
-			m_oCx.SetValue(oReader.GetText());
-		else if ("cy" == sName)
-			m_oCy.SetValue(oReader.GetText());
-		else if ("r" == sName)
-			m_oR.SetValue(oReader.GetText());
-		else
-			CGradient::SetAttribute(sName, oReader);
+		m_oCx.SetValue(oNode.GetAttribute(L"cx"));
+		m_oCy.SetValue(oNode.GetAttribute(L"cy"));
+		m_oR.SetValue(oNode.GetAttribute(L"r"));
 	}
 
 	bool CRadialGradient::Apply(IRenderer *pRenderer, const CSvgFile *pFile, const TBounds &oObjectBounds)

DesktopEditor/raster/Metafile/svg/SvgObjects/CGradient.h

@@ -22,7 +22,7 @@ namespace SVG
 	class CStopElement : public CObject
 	{
 	public:
-		CStopElement(CSvgReader& oReader);
+		CStopElement(XmlUtils::CXmlNode& oNode);
 
 		ObjectType GetType() const override;
 
@@ -37,18 +37,16 @@ namespace SVG
 
 	class CGradient : public CContainer<CStopElement>, public CAppliedObject
 	{
-	protected:
-		CGradient(CSvgReader& oReader);
+		friend class CLinearGradient;
+		friend class CRadialGradient;
 	public:
-		void SetAttribute(const std::string& sName, CSvgReader& oReader) override;
+		CGradient(XmlUtils::CXmlNode& oNode);
 
 		void SetData(const std::map<std::wstring, std::wstring>& mAttributes, unsigned short ushLevel, bool bHardMode = false) override;
 
-		void ReadChildrens(CSvgReader& oReader, CSvgFile* pSvgFile) override;
-
 		bool Apply(IRenderer* pRenderer, const CSvgFile *pFile, const TBounds &oObjectBounds) override;
 		void ApplyTransform(IRenderer *pRenderer, const TBounds& oBounds, double& dAngle) const;
-	protected:
+	private:
 		CGradient* GetRefGradient(const CSvgFile *pFile) const;
 		bool ApplyRefGradient(IRenderer *pRenderer, const CSvgFile *pFile, const TBounds &oObjectBounds) const;
 
@@ -60,10 +58,8 @@ namespace SVG
 
 	class CLinearGradient : public CGradient
 	{
-		friend class CObject;
-		CLinearGradient(CSvgReader& oReader);
 	public:
-		void SetAttribute(const std::string& sName, CSvgReader& oReader) override;
+		CLinearGradient(XmlUtils::CXmlNode& oNode);
 
 		bool Apply(IRenderer* pRenderer, const CSvgFile *pFile, const TBounds &oObjectBounds) override;
 	private:
@@ -75,10 +71,8 @@ namespace SVG
 
 	class CRadialGradient : public CGradient
 	{
-		friend class CObject;
-		CRadialGradient(CSvgReader& oReader);
 	public:
-		void SetAttribute(const std::string& sName, CSvgReader& oReader) override;
+		CRadialGradient(XmlUtils::CXmlNode& oNode);
 
 		bool Apply(IRenderer* pRenderer, const CSvgFile *pFile, const TBounds &oObjectBounds) override;
 	private:

DesktopEditor/raster/Metafile/svg/SvgObjects/CImage.cpp

@@ -5,29 +5,18 @@
 #include "../../../BgraFrame.h"
 #include "../../../../common/Path.h"
 #include "../../../../common/ProcessEnv.h"
-#include "../../../../common/Base64.h"
-#include "../../../../common/File.h"
 
 namespace SVG
 {
-	CImage::CImage(CSvgReader& oReader, CRenderedObject* pParent)
-		: CRenderedObject(oReader, pParent)
-	{}
-
-	void CImage::SetAttribute(const std::string& sName, CSvgReader& oReader)
+	CImage::CImage(XmlUtils::CXmlNode& oNode, CRenderedObject* pParent)
+		: CRenderedObject(oNode, pParent)
 	{
-		if ("x" == sName)
-			m_oRect.m_oX.SetValue(oReader.GetText());
-		else if ("y" == sName)
-			m_oRect.m_oY.SetValue(oReader.GetText());
-		else if ("width" == sName)
-			m_oRect.m_oWidth.SetValue(oReader.GetText());
-		else if ("height" == sName)
-			m_oRect.m_oHeight.SetValue(oReader.GetText());
-		else if ("href" == sName || "xlink:href" == sName)
-			m_wsHref = oReader.GetText(); // TODO:: В дальнейшем возможно стоит реализовать отдельный класс CHref для всех типов ссылок
-		else
-			CRenderedObject::SetAttribute(sName, oReader);
+		m_oRect.m_oX     .SetValue(oNode.GetAttribute(L"x"));
+		m_oRect.m_oY     .SetValue(oNode.GetAttribute(L"y"));
+		m_oRect.m_oWidth .SetValue(oNode.GetAttribute(L"width"));
+		m_oRect.m_oHeight.SetValue(oNode.GetAttribute(L"height"));
+
+		m_wsHref = oNode.GetAttribute(L"href", oNode.GetAttribute(L"xlink:href")); // TODO:: В дальнейшем возможно стоит реализовать отдельный класс CHref для всех типов ссылок
 	}
 
 	bool CImage::Draw(IRenderer *pRenderer, const CSvgFile *pFile, CommandeMode oMode, const TSvgStyles *pOtherStyles, const CRenderedObject* pContexObject) const
@@ -135,7 +124,7 @@ namespace SVG
 		return true;
 	}
 
-	TBounds CImage::GetBounds(SvgMatrix* pTransform) const
+	TBounds CImage::GetBounds() const
 	{
 		TBounds oBounds;
 
@@ -144,16 +133,6 @@ namespace SVG
 		oBounds.m_dRight  = oBounds.m_dLeft + m_oRect.m_oWidth.ToDouble(NSCSS::Pixel);
 		oBounds.m_dBottom = oBounds.m_dTop  + m_oRect.m_oHeight.ToDouble(NSCSS::Pixel);
 
-		if (nullptr != pTransform)
-		{
-			*pTransform += m_oTransformation.m_oTransform.GetMatrix();
-
-			pTransform->GetFinalValue().TransformPoint(oBounds.m_dLeft,  oBounds.m_dTop   );
-			pTransform->GetFinalValue().TransformPoint(oBounds.m_dRight, oBounds.m_dBottom);
-
-			*pTransform -= m_oTransformation.m_oTransform.GetMatrix();
-		}
-
 		return oBounds;
 	}
 }

DesktopEditor/raster/Metafile/svg/SvgObjects/CImage.h

@@ -7,14 +7,12 @@ namespace SVG
 {
 	class CImage : public CRenderedObject
 	{
-		friend class CObject;
-		CImage(CSvgReader& oReader, CRenderedObject* pParent = NULL);
 	public:
-		void SetAttribute(const std::string& sName, CSvgReader& oReader) override;
+		CImage(XmlUtils::CXmlNode& oNode, CRenderedObject* pParent = NULL);
 
 		bool Draw(IRenderer* pRenderer, const CSvgFile *pFile, CommandeMode oMode = CommandeModeDraw,  const TSvgStyles* pOtherStyles = NULL, const CRenderedObject* pContexObject = NULL) const override;
 	private:
-		TBounds GetBounds(SvgMatrix* pTransform = nullptr) const override;
+		TBounds GetBounds() const override;
 
 		TRect        m_oRect;
 		std::wstring m_wsHref;

DesktopEditor/raster/Metafile/svg/SvgObjects/CLine.cpp

@@ -2,46 +2,21 @@
 
 namespace SVG
 {
-	CLine::CLine(CSvgReader& oReader, CRenderedObject* pParent)
-		: CPath(oReader, pParent)
-	{
-		AddElement(new CMoveElement(Point{0, 0}));
-		AddElement(new CLineElement(Point{0, 0}));
-	}
+	CLine::CLine(XmlUtils::CXmlNode& oNode, CRenderedObject* pParent)
+		: CPath(oNode, pParent, false)
+	{	
+		SvgDigit oX1;
+		SvgDigit oY1;
+		SvgDigit oX2;
+		SvgDigit oY2;
 
-	void CLine::SetAttribute(const std::string& sName, CSvgReader& oReader)
-	{
-		//TODO:: не нравится, подумать как можно сделать иначе
-		if ("x1" == sName)
-		{
-			CMoveElement* pMoveElement{dynamic_cast<CMoveElement*>(operator[](0))};
+		oX1.SetValue(oNode.GetAttribute(L"x1"));
+		oY1.SetValue(oNode.GetAttribute(L"y1"));
+		oX2.SetValue(oNode.GetAttribute(L"x2"));
+		oY2.SetValue(oNode.GetAttribute(L"y2"));
 
-			if (NULL != pMoveElement)
-				pMoveElement->m_oPoint.dX = oReader.GetDouble();
-		}
-		else if ("y1" == sName)
-		{
-			CMoveElement* pMoveElement{dynamic_cast<CMoveElement*>(operator[](0))};
-
-			if (NULL != pMoveElement)
-				pMoveElement->m_oPoint.dY = oReader.GetDouble();
-		}
-		else if ("x2" == sName)
-		{
-			CLineElement* pLineElement{dynamic_cast<CLineElement*>(operator[](1))};
-
-			if (NULL != pLineElement)
-				pLineElement->m_oPoint.dX = oReader.GetDouble();
-		}
-		else if ("y2" == sName)
-		{
-			CLineElement* pLineElement{dynamic_cast<CLineElement*>(operator[](1))};
-
-			if (NULL != pLineElement)
-				pLineElement->m_oPoint.dY = oReader.GetDouble();
-		}
-		else
-			CRenderedObject::SetAttribute(sName, oReader);
+		AddElement(new CMoveElement(Point{oX1.ToDouble(NSCSS::Pixel), oY1.ToDouble(NSCSS::Pixel)}));
+		AddElement(new CLineElement(Point{oX2.ToDouble(NSCSS::Pixel), oY2.ToDouble(NSCSS::Pixel)}));
 	}
 
 	void CLine::SetData(const std::map<std::wstring, std::wstring> &mAttributes, unsigned short ushLevel, bool bHardMode)

DesktopEditor/raster/Metafile/svg/SvgObjects/CLine.h

@@ -7,10 +7,8 @@ namespace SVG
 {
 	class CLine : public CPath
 	{
-		friend class CObject;
-		CLine(CSvgReader& oReader, CRenderedObject* pParent = NULL);
 	public:
-		void SetAttribute(const std::string& sName, CSvgReader& oReader) override;
+		CLine(XmlUtils::CXmlNode& oNode, CRenderedObject* pParent = NULL);
 
 		void SetData(const std::map<std::wstring, std::wstring>& mAttributes, unsigned short ushLevel, bool bHardMode = false) override;
 	private:

DesktopEditor/raster/Metafile/svg/SvgObjects/CMarker.cpp

@@ -1,35 +1,26 @@
 #include "CMarker.h"
 
+#include "../../../graphics/pro/Graphics.h"
 #include "../SvgUtils.h"
 
 namespace SVG
 {
-	CMarker::CMarker(CSvgReader& oReader)
-		: CObject(oReader), m_enUnits{EMarkerUnits::StrokeWidth}, m_enOrient{EMarkerOrient::Angle},
-	      m_dAngle(0.), m_oBounds{0., 0., 0., 0.}
+	CMarker::CMarker(XmlUtils::CXmlNode &oNode)
+		: CObject(oNode), m_dAngle(0.), m_oBounds{0., 0., 0., 0.}
 	{
-		m_oWindow.m_oWidth.SetValue(3);
-		m_oWindow.m_oHeight.SetValue(3);
-	}
+		m_oWindow.m_oX     .SetValue(oNode.GetAttribute(L"refX"));
+		m_oWindow.m_oY     .SetValue(oNode.GetAttribute(L"refY"));
 
-	ObjectType CMarker::GetType() const
-	{
-		return AppliedObject;
-	}
+		m_oWindow.m_oWidth .SetValue(oNode.GetAttribute(L"markerWidth",  L"3"));
+		m_oWindow.m_oHeight.SetValue(oNode.GetAttribute(L"markerHeight", L"3"));
 
-	void CMarker::SetAttribute(const std::string& sName, CSvgReader& oReader)
-	{
-		if ("refX" == sName)
-			m_oWindow.m_oX.SetValue(oReader.GetText());
-		else if ("refY" == sName)
-			m_oWindow.m_oY.SetValue(oReader.GetText());
-		else if ("markerWidth" == sName)
-			m_oWindow.m_oWidth.SetValue(oReader.GetText());
-		else if ("markerHeight" == sName)
-			m_oWindow.m_oHeight.SetValue(oReader.GetText());
-		else if ("viewBox" == sName)
+		m_oViewBox = m_oWindow;
+
+		const std::wstring wsViewBox = oNode.GetAttribute(L"viewBox");
+
+		if (!wsViewBox.empty())
 		{
-			const  std::vector<double> arValues{StrUtils::ReadDoubleValues(oReader.GetText())};
+			std::vector<double> arValues = StrUtils::ReadDoubleValues(wsViewBox);
 			if (4 == arValues.size())
 			{
 				m_oViewBox.m_oX      = arValues[0];
@@ -38,24 +29,35 @@ namespace SVG
 				m_oViewBox.m_oHeight = arValues[3];
 			}
 		}
-		else if ("markerUnits" == sName)
-		{
-			if (L"userSpaceOnUse" == oReader.GetText())
-				m_enUnits = EMarkerUnits::UserSpaceOnUse;
-		}
-		else if ("orient" == sName)
-		{
-			const std::wstring& wsOrient{oReader.GetText()};
 
-			if (L"auto" == wsOrient)
-				m_enOrient = EMarkerOrient::Auto;
-			else if (L"auto-start-reverse" == wsOrient)
-				m_enOrient = EMarkerOrient::Auto_start_reverse;
-			else if (!StrUtils::ReadAngle(wsOrient, m_dAngle))
+		const std::wstring& wsUnits = oNode.GetAttribute(L"markerUnits");
+
+		if (L"userSpaceOnUse" == wsUnits)
+			m_enUnits = EMarkerUnits::UserSpaceOnUse;
+		else
+			m_enUnits = EMarkerUnits::StrokeWidth;
+
+		const std::wstring& wsOrient = oNode.GetAttribute(L"orient");
+
+		if (L"auto" == wsOrient)
+			m_enOrient = EMarkerOrient::Auto;
+		else if (L"auto-start-reverse" == wsOrient)
+			m_enOrient = EMarkerOrient::Auto_start_reverse;
+		else
+		{
+			m_enOrient = EMarkerOrient::Angle;
+			if (!StrUtils::ReadAngle(wsOrient, m_dAngle))
 				StrUtils::ReadDoubleValue(wsOrient, m_dAngle);
 		}
-		else
-			CObject::SetAttribute(sName, oReader);
+	}
+
+	CMarker::~CMarker()
+	{
+	}
+
+	ObjectType CMarker::GetType() const
+	{
+		return AppliedObject;
 	}
 
 	void CMarker::SetData(const std::map<std::wstring, std::wstring> &mAttributes, unsigned short ushLevel, bool bHardMode)
@@ -66,11 +68,7 @@ namespace SVG
 		if (NULL == oExternalData.m_pPoints || oExternalData.m_pPoints->empty() || m_arObjects.empty() || (EMarkerUnits::StrokeWidth == m_enUnits && Equals(0., oExternalData.m_dStroke)))
 			return;
 
-		const double dMaxScale = ((EMarkerUnits::StrokeWidth == m_enUnits) ? oExternalData.m_dStroke : 1.) *
-		                         ((!m_oViewBox.m_oWidth.Empty() && !m_oViewBox.m_oHeight.Empty()) ?
-		                              std::max((m_oWindow.m_oWidth.ToDouble(NSCSS::Pixel) / m_oViewBox.m_oWidth.ToDouble(NSCSS::Pixel)),
-		                                       (m_oWindow.m_oHeight.ToDouble(NSCSS::Pixel) / m_oViewBox.m_oHeight.ToDouble(NSCSS::Pixel))) :
-		                              1.);
+		const double dMaxScale = ((EMarkerUnits::StrokeWidth == m_enUnits) ? oExternalData.m_dStroke : 1.) * std::max((m_oWindow.m_oWidth.ToDouble(NSCSS::Pixel) / m_oViewBox.m_oWidth.ToDouble(NSCSS::Pixel)), (m_oWindow.m_oHeight.ToDouble(NSCSS::Pixel) / m_oViewBox.m_oHeight.ToDouble(NSCSS::Pixel)));
 
 		double dM11, dM12, dM21, dM22, dDx, dDy;
 		pRenderer->GetTransform(&dM11, &dM12, &dM21, &dM22, &dDx, &dDy);

DesktopEditor/raster/Metafile/svg/SvgObjects/CMarker.h

@@ -45,15 +45,12 @@ namespace SVG
 
 	class CMarker : public CObject, public CContainer<CRenderedObject>
 	{
-		friend class CObject;
-		CMarker(CSvgReader& oReader);
 	public:
-		virtual ~CMarker() = default;
+		CMarker(XmlUtils::CXmlNode& oNode);
+		virtual ~CMarker();
 
 		ObjectType GetType() const override;
 
-		void SetAttribute(const std::string& sName, CSvgReader& oReader) override;
-
 		void SetData(const std::map<std::wstring, std::wstring> &mAttributes, unsigned short ushLevel, bool bHardMode) override;
 
 		void Draw(IRenderer* pRenderer, const CSvgFile *pFile, const TMarkerExternData& oExternalData, CommandeMode oMode = CommandeModeDraw, const TSvgStyles* pOtherStyles = NULL, const CRenderedObject* pContexObject = NULL) const;

DesktopEditor/raster/Metafile/svg/SvgObjects/CMask.cpp

@@ -2,8 +2,8 @@
 
 namespace SVG
 {
-	CMask::CMask(CSvgReader& oReader)
-		: CClipPath(oReader)
+	CMask::CMask(XmlUtils::CXmlNode &oNode)
+		: CClipPath(oNode)
 	{}
 
 	bool CMask::Apply(IRenderer *pRenderer, const CSvgFile *pFile, const TBounds &oObjectBounds)
@@ -14,7 +14,7 @@ namespace SVG
 		pRenderer->BeginCommand(c_nMaskType);
 		pRenderer->PathCommandStart();
 
-		for (const CRenderedObject* pObject : m_oContainer)
+		for (const CRenderedObject* pObject : m_oContainer.m_arObjects)
 			pObject->Draw(pRenderer, pFile, CommandeModeMask);
 
 		pRenderer->EndCommand(c_nMaskType);

DesktopEditor/raster/Metafile/svg/SvgObjects/CMask.h

@@ -7,9 +7,9 @@ namespace SVG
 {
 	class CMask : public CClipPath
 	{
-		friend class CObject;
-		CMask(CSvgReader& oReader);
 	public:
+		CMask(XmlUtils::CXmlNode& oNode);
+
 		bool Apply(IRenderer* pRenderer, const CSvgFile *pFile, const TBounds &oObjectBounds) override;
 	};
 }

DesktopEditor/raster/Metafile/svg/SvgObjects/CObjectBase.cpp

@@ -1,8 +1,6 @@
 #include "CObjectBase.h"
 #include "../CSvgFile.h"
 
-#include "../../../../../Common/3dParty/html/css/src/StaticFunctions.h"
-
 namespace SVG
 {
 	TSvgStyles &TSvgStyles::operator+=(const TSvgStyles &oSvgStyles)
@@ -33,42 +31,14 @@ namespace SVG
 		: m_oXmlNode(oData)
 	{}
 
-	CObject::CObject(CSvgReader& oReader)
+	CObject::CObject(XmlUtils::CXmlNode &oNode)
 	{
-		m_oXmlNode.m_wsName = oReader.GetNameW();
+		SetNodeData(oNode);
 	}
 
-	CObject::CObject(const CObject& oObject)
-		: m_oXmlNode(oObject.m_oXmlNode), m_oTransformation(oObject.m_oTransformation)
+	CObject::~CObject()
 	{}
 
-	void CObject::Mark()
-	{
-		this->AddRef();
-	}
-
-	bool CObject::Marked() const
-	{
-		//Так как по логике кода объект может храниться только в одном контейнере и в списке маркированных элементов,
-		//то хватит и такой проверки
-		return 1 != m_lRef;
-	}
-
-	void CObject::SetAttribute(const std::string& sName, CSvgReader& oReader)
-	{
-		if ("class" == sName)
-		{
-			m_oXmlNode.m_wsClass = oReader.GetText();
-			std::transform(m_oXmlNode.m_wsClass.begin(), m_oXmlNode.m_wsClass.end(), m_oXmlNode.m_wsClass.begin(), std::towlower);
-		}
-		else if ("id" == sName)
-			m_oXmlNode.m_wsId = oReader.GetText();
-		else if ("style" == sName)
-			m_oXmlNode.m_wsStyle = oReader.GetText();
-		else
-			m_oXmlNode.m_mAttributes.insert({oReader.GetNameW(), oReader.GetText()});
-	}
-
 	void CObject::SetData(const std::wstring wsStyles, unsigned short ushLevel, bool bHardMode)
 	{
 		if (wsStyles.empty())
@@ -77,11 +47,6 @@ namespace SVG
 		SetData(NSCSS::NS_STATIC_FUNCTIONS::GetRules(wsStyles), ushLevel, bHardMode);
 	}
 
-	void CObject::ReadChildrens(CSvgReader& oReader, CSvgFile* pSvgFile)
-	{
-		//TODO:: реализовано в классах там, где нужно
-	}
-
 	void CObject::SetTransform(const std::map<std::wstring, std::wstring> &mAttributes, unsigned short ushLevel, bool bHardMode)
 	{
 		if (mAttributes.end() != mAttributes.find(L"transform"))
@@ -188,6 +153,33 @@ namespace SVG
 		return pDefObject->Apply(pRenderer, pFile, oBounds);
 	}
 
+	void CObject::SetNodeData(XmlUtils::CXmlNode &oNode)
+	{
+		if (!oNode.IsValid())
+			return;
+
+		std::vector<std::wstring> arProperties, arValues;
+
+		oNode.GetAllAttributes(arProperties, arValues);
+
+		m_oXmlNode.m_wsName = oNode.GetName();
+
+		for (unsigned int unIndex = 0; unIndex < arProperties.size(); ++unIndex)
+		{
+			if (L"class" == arProperties[unIndex])
+			{
+				m_oXmlNode.m_wsClass = arValues[unIndex];
+				std::transform(m_oXmlNode.m_wsClass.begin(), m_oXmlNode.m_wsClass.end(), m_oXmlNode.m_wsClass.begin(), std::towlower);
+			}
+			else if (L"id" == arProperties[unIndex])
+				m_oXmlNode.m_wsId = arValues[unIndex];
+			else if (L"style" == arProperties[unIndex])
+				m_oXmlNode.m_wsStyle = arValues[unIndex];
+			else
+				m_oXmlNode.m_mAttributes.insert({arProperties[unIndex], arValues[unIndex]});
+		}
+	}
+
 	std::wstring CObject::GetId() const
 	{
 		return m_oXmlNode.m_wsId;
@@ -201,18 +193,16 @@ namespace SVG
 	CRenderedObject::CRenderedObject(const NSCSS::CNode &oData, CRenderedObject *pParent)
 		: CObject(oData), m_pParent(pParent)
 	{
-		SetDefaultData();
+		SetDefaultStyles();
 	}
 
-	CRenderedObject::CRenderedObject(CSvgReader& oReader, CRenderedObject *pParent)
-	    : CObject(oReader), m_pParent(pParent)
+	CRenderedObject::CRenderedObject(XmlUtils::CXmlNode &oNode, CRenderedObject *pParent)
+		: CObject(oNode), m_pParent(pParent)
 	{
-		SetDefaultData();
+		SetDefaultStyles();
 	}
 
-	CRenderedObject::CRenderedObject(const CRenderedObject& oRenderedObject)
-		: CObject(oRenderedObject), m_oStyles(oRenderedObject.m_oStyles),
-	      m_pParent(oRenderedObject.m_pParent)
+	CRenderedObject::~CRenderedObject()
 	{}
 
 	ObjectType CRenderedObject::GetType() const
@@ -220,11 +210,6 @@ namespace SVG
 		return RendererObject;
 	}
 
-	void CRenderedObject::SetAttribute(const std::string& sName, CSvgReader& oReader)
-	{
-		CObject::SetAttribute(sName, oReader);
-	}
-
 	void CRenderedObject::SetData(const std::map<std::wstring, std::wstring> &mAttributes, unsigned short ushLevel, bool bHardMode)
 	{
 		SetTransform(mAttributes, ushLevel, bHardMode);
@@ -244,6 +229,20 @@ namespace SVG
 		return arObjects;
 	}
 
+	void CRenderedObject::SetDefaultStyles()
+	{
+		m_oStyles.m_oStroke.m_oLineCap.SetMapping({std::make_pair(L"butt", Aggplus::LineCapFlat), std::make_pair(L"round", Aggplus::LineCapRound), std::make_pair(L"square", Aggplus::LineCapSquare)});
+		m_oStyles.m_oStroke.m_oLineCap = Aggplus::LineCapFlat;
+
+		m_oStyles.m_oStroke.m_oLineJoin.SetMapping({std::make_pair(L"arcs", Aggplus::LineJoinMiter), std::make_pair(L"bevel", Aggplus::LineJoinBevel), std::make_pair(L"miter", Aggplus::LineJoinMiter), std::make_pair(L"miter-clip", Aggplus::LineJoinMiterClipped), std::make_pair(L"round", Aggplus::LineJoinRound)});
+		m_oStyles.m_oStroke.m_oLineCap = Aggplus::LineJoinMiter;
+
+		m_oStyles.m_oStroke.m_oMiterlimit = 4.;
+
+		m_oTransformation.m_oOpacity = 1.;
+		m_oTransformation.m_bDraw = true;
+	}
+
 	void CRenderedObject::SetStroke(const std::map<std::wstring, std::wstring> &mAttributes, unsigned short ushLevel, bool bHardMode)
 	{
 		if (mAttributes.end() != mAttributes.find(L"stroke"))
@@ -448,27 +447,15 @@ namespace SVG
 		return false;
 	}
 
-	void CRenderedObject::SetDefaultData()
-	{
-		m_oStyles.m_oStroke.m_oLineCap.SetMapping({std::make_pair(L"butt", Aggplus::LineCapFlat), std::make_pair(L"round", Aggplus::LineCapRound), std::make_pair(L"square", Aggplus::LineCapSquare)});
-		m_oStyles.m_oStroke.m_oLineCap = Aggplus::LineCapFlat;
+	CAppliedObject::CAppliedObject(XmlUtils::CXmlNode &oNode)
+		: CObject(oNode)
+	{}
 
-		m_oStyles.m_oStroke.m_oLineJoin.SetMapping({std::make_pair(L"arcs", Aggplus::LineJoinMiter), std::make_pair(L"bevel", Aggplus::LineJoinBevel), std::make_pair(L"miter", Aggplus::LineJoinMiter), std::make_pair(L"miter-clip", Aggplus::LineJoinMiterClipped), std::make_pair(L"round", Aggplus::LineJoinRound)});
-		m_oStyles.m_oStroke.m_oLineCap = Aggplus::LineJoinMiter;
-
-		m_oStyles.m_oStroke.m_oMiterlimit = 4.;
-
-		m_oTransformation.m_oOpacity = 1.;
-		m_oTransformation.m_bDraw = true;
-	}
-
-	CAppliedObject::CAppliedObject(CSvgReader& oReader)
-	    : CObject(oReader)
+	CAppliedObject::~CAppliedObject()
 	{}
 
 	ObjectType CAppliedObject::GetType() const
 	{
 		return AppliedObject;
 	}
-
 }

DesktopEditor/raster/Metafile/svg/SvgObjects/CObjectBase.h

@@ -2,14 +2,13 @@
 #define COBJECTBASE_H
 
 #include "../../../../../Common/3dParty/html/css/src/CNode.h"
+#include "../../../../../Common/3dParty/html/css/src/StaticFunctions.h"
+#include "../../../../xml/include/xmlutils.h"
 #include "../../../../graphics/IRenderer.h"
 #include "../../../../common/IGrObject.h"
-
 #include "../SvgTypes.h"
-#include "../SvgReader.h"
-#include "CStyle.h"
 
-#include "../CSvgFile.h"
+class CSvgFile;
 
 namespace SVG
 {
@@ -34,34 +33,22 @@ namespace SVG
 	enum ObjectType
 	{
 		RendererObject,
-		AppliedObject,
-		DataObject
+		AppliedObject
 	};
 
 	class CObject : public IGrObject
 	{
-	protected:
-		CObject(const NSCSS::CNode& oData);
-		CObject(CSvgReader& oReader);
-		CObject(const CObject& oObject);
 	public:
-		virtual ~CObject() = default;
+		CObject(const NSCSS::CNode& oData);
+		CObject(XmlUtils::CXmlNode& oNode);
+		virtual ~CObject();
 
 		virtual ObjectType GetType() const = 0;
 
-		void Mark();
-		bool Marked() const;
-
-		virtual void SetAttribute(const std::string& sName, CSvgReader& oReader);
-
 		void SetData(const std::wstring wsStyles, unsigned short ushLevel, bool bHardMode = false);
 
 		virtual void SetData(const std::map<std::wstring, std::wstring>& mAttributes, unsigned short ushLevel, bool bHardMode = false) = 0;
 
-		template <class T, typename... Args>
-		static T* Create(CSvgReader& oReader, CSvgFile* pSvgFile, Args&&... args);
-		virtual void ReadChildrens(CSvgReader& oReader, CSvgFile* pSvgFile);
-
 		void SetTransform(const std::map<std::wstring, std::wstring>& mAttributes, unsigned short ushLevel, bool bHardMode = false);
 		void SetClip(const std::map<std::wstring, std::wstring>& mAttributes, unsigned short ushLevel, bool bHardMode = false);
 		void SetMask(const std::map<std::wstring, std::wstring>& mAttributes, unsigned short ushLevel, bool bHardMode = false);
@@ -70,49 +57,37 @@ namespace SVG
 
 		std::wstring GetId() const;
 		virtual std::vector<NSCSS::CNode> GetFullPath() const;
-	protected:
+	private:
 		bool ApplyTransform(IRenderer* pRenderer, const SvgTransform* pTransform, Aggplus::CMatrix& oOldMatrix) const;
 		bool ApplyClip(IRenderer* pRenderer, const TClip* pClip, const CSvgFile *pFile, const TBounds& oBounds) const;
 		bool ApplyMask(IRenderer* pRenderer, const SvgColor* pMask, const CSvgFile *pFile, const TBounds& oBounds) const;
 
 		bool ApplyDef(IRenderer* pRenderer, const CSvgFile *pFile, const std::wstring& wsUrl, const TBounds& oBounds) const;
 
+		void SetNodeData(XmlUtils::CXmlNode& oNode);
+
+		friend class CRenderedObject;
+		friend class CAppliedObject;
+
+		friend class CUse;
+		friend class CLine;
+		friend class CRect;
+		friend class CPath;
+		friend class CText;
+		friend class CTSpan;
+		friend class CImage;
+		friend class CCircle;
+		friend class CPolygon;
+		friend class CEllipse;
+		friend class CPolyline;
+		friend class CGraphicsContainer;
+
+		friend class CClipPath;
+
 		NSCSS::CNode       m_oXmlNode;
 		TSvgTransformation m_oTransformation;
 	};
 
-	template<class T, typename... Args>
-	inline T* CObject::Create(CSvgReader& oReader, CSvgFile* pSvgFile, Args&&... args)
-	{
-		T* pObject = new T(oReader, std::forward<Args>(args)...);
-
-		if (NULL == pObject)
-			return NULL;
-
-		START_READ_ATTRIBUTES(oReader)
-			pObject->SetAttribute(sAttributeName, oReader);
-		END_READ_ATTRIBUTES(oReader)
-
-		if (NULL == pSvgFile)
-			return pObject;
-
-		if (DataObject != pObject->GetType() &&
-		    (!pSvgFile->MarkObject(pObject) && AppliedObject == pObject->GetType()))
-		{
-			delete pObject;
-			return NULL;
-		}
-
-		const CSvgCalculator* pSvgCalculator{pSvgFile->GetSvgCalculator()};
-
-		if (NULL != pSvgCalculator)
-			pSvgCalculator->SetData(pObject);
-
-		pObject->ReadChildrens(oReader, pSvgFile);
-
-		return pObject;
-	}
-
 	enum CommandeMode
 	{
 		CommandeModeDraw,
@@ -120,28 +95,25 @@ namespace SVG
 		CommandeModeMask
 	};
 
-	class CSvgCalculator;
-
 	class CRenderedObject : public CObject
 	{
-	protected:
-		CRenderedObject(const NSCSS::CNode& oData, CRenderedObject* pParent = NULL);
-		CRenderedObject(CSvgReader& oReader, CRenderedObject* pParent = NULL);
-		CRenderedObject(const CRenderedObject& oRenderedObject);
 	public:
-		virtual ~CRenderedObject() = default;
+		CRenderedObject(const NSCSS::CNode& oData, CRenderedObject* pParent = NULL);
+		CRenderedObject(XmlUtils::CXmlNode& oNode, CRenderedObject* pParent = NULL);
+		virtual ~CRenderedObject();
 
 		ObjectType GetType() const override;
 
-		virtual void SetAttribute(const std::string& sName, CSvgReader& oReader) override;
 		virtual void SetData(const std::map<std::wstring, std::wstring>& mAttributes, unsigned short ushLevel, bool bHardMode = false) override;
 
 		virtual bool Draw(IRenderer* pRenderer, const CSvgFile *pFile, CommandeMode oMode = CommandeModeDraw, const TSvgStyles* pStyles = NULL, const CRenderedObject* pContextObject = NULL) const = 0;
 
-		virtual TBounds GetBounds(SvgMatrix* pTransform = nullptr) const = 0;
+		virtual TBounds GetBounds() const = 0;
 
 		std::vector<NSCSS::CNode> GetFullPath() const override;
 	private:
+		void SetDefaultStyles();
+
 		void SetStroke(const std::map<std::wstring, std::wstring>& mAttributes, unsigned short ushLevel, bool bHardMode = false);
 		void SetFill(const std::map<std::wstring, std::wstring>& mAttributes, unsigned short ushLevel, bool bHardMode = false);
 
@@ -154,8 +126,6 @@ namespace SVG
 		bool ApplyFill(IRenderer* pRenderer, const SvgColor* pFill, const CSvgFile *pFile, bool bUseDefault = false, const CRenderedObject* pContextObject = NULL) const;
 		bool ApplyOpacity(IRenderer* pRenderer, const SvgDigit* pOpacity) const;
 
-		void SetDefaultData();
-
 		friend class CUse;
 		friend class CLine;
 		friend class CRect;
@@ -178,10 +148,9 @@ namespace SVG
 
 	class CAppliedObject : public CObject
 	{
-	protected:
-		CAppliedObject(CSvgReader& oReader);
 	public:
-		virtual ~CAppliedObject() = default;
+		CAppliedObject(XmlUtils::CXmlNode& oNode);
+		virtual ~CAppliedObject();
 
 		ObjectType GetType() const override;
 

DesktopEditor/raster/Metafile/svg/SvgObjects/CPath.cpp

@@ -8,46 +8,49 @@
 
 namespace SVG
 {
-	#define ISPATHCOMMAND(wchar) L'M' == wchar || L'm' == wchar || L'Z' == wchar || L'z' == wchar || L'L' == wchar || L'l' == wchar || L'H' == wchar || L'h' == wchar || L'V' == wchar || L'v' == wchar || L'C' == wchar || L'c' == wchar || L'S' == wchar || L's' == wchar || L'Q' == wchar || L'q' == wchar || L'T' == wchar || L't' == wchar || L'A' == wchar || L'a' == wchar
-
-	Point IPathElement::GetFirstPoint() const
+	IPathElement::~IPathElement()
 	{
-		switch (GetType())
-		{
-			case Move: return ((CMoveElement*)this)->m_oPoint;
-			case Line: return ((CLineElement*)this)->m_oPoint;
-			case CBezier:
-			case SBezier:
-			case QBezier:
-			case TBezier:
-			case Arc: return ((CCBezierElement*)this)->m_oPoint1;
-			case Close: return Point{0., 0.};
-		}
-
-		return Point{0., 0.};
 	}
 
-	Point IPathElement::GetLastPoint() const
+	#define ISPATHCOMMAND(wchar) L'M' == wchar || L'm' == wchar || L'Z' == wchar || L'z' == wchar || L'L' == wchar || L'l' == wchar || L'H' == wchar || L'h' == wchar || L'V' == wchar || L'v' == wchar || L'C' == wchar || L'c' == wchar || L'S' == wchar || L's' == wchar || L'Q' == wchar || L'q' == wchar || L'T' == wchar || L't' == wchar || L'A' == wchar || L'a' == wchar
+	// IpathElement
+	TBounds IPathElement::GetBounds() const
 	{
-		switch (GetType())
+		TBounds oBounds{DBL_MAX, DBL_MAX, -DBL_MAX, -DBL_MAX};
+
+		for (const Point& oPoint : m_arPoints)
 		{
-			case Move: return ((CMoveElement*)this)->m_oPoint;
-			case Line: return ((CLineElement*)this)->m_oPoint;
-			case CBezier:
-			case SBezier:
-			case QBezier:
-			case TBezier:
-			case Arc: return ((CCBezierElement*)this)->m_oPointE;
-			case Close: return Point{0., 0.};
+			oBounds.m_dLeft   = std::min(oBounds.m_dLeft,   oPoint.dX);
+			oBounds.m_dTop    = std::min(oBounds.m_dTop,    oPoint.dY);
+			oBounds.m_dRight  = std::max(oBounds.m_dRight,  oPoint.dX);
+			oBounds.m_dBottom = std::max(oBounds.m_dBottom, oPoint.dY);
 		}
 
-		return Point{0., 0.};
+		return oBounds;
+	}
+
+	UINT IPathElement::GetPointCount() const
+	{
+		return m_arPoints.size();
+	}
+
+	Point IPathElement::operator[](int nIndex) const
+	{
+		if (m_arPoints.empty() || (nIndex > 0 && nIndex >= m_arPoints.size()) || (nIndex < 0 && -nIndex > m_arPoints.size()))
+			return Point{0., 0.};
+
+		return m_arPoints[(nIndex >= 0) ? nIndex : m_arPoints.size() + nIndex];
 	}
 
 	//CMoveElement
 	CMoveElement::CMoveElement(const Point &oPoint)
-		: m_oPoint(oPoint)
-	{}
+	{
+		m_arPoints.push_back(oPoint);
+	}
+
+	CMoveElement::~CMoveElement()
+	{
+	}
 
 	EPathElement CMoveElement::GetType() const
 	{
@@ -62,7 +65,7 @@ namespace SVG
 		Point oTranslatePoint{0., 0.};
 
 		if (bRelativeCoordinate && NULL != pPrevElement)
-			oTranslatePoint = pPrevElement->GetLastPoint();
+			oTranslatePoint = (*pPrevElement)[-1];
 
 		CMoveElement *pMoveElement = new CMoveElement(Point{arValues[0], arValues[1]} + oTranslatePoint);
 
@@ -73,18 +76,19 @@ namespace SVG
 
 	void CMoveElement::Draw(IRenderer *pRenderer) const
 	{
-		if (NULL != pRenderer)
-			pRenderer->PathCommandMoveTo(m_oPoint.dX, m_oPoint.dY);
-	}
+		if (m_arPoints.empty())
+			return;
 
-	TBounds CMoveElement::GetBounds() const
-	{
-		return TBounds{m_oPoint.dX, m_oPoint.dY, 1, 1};
+		pRenderer->PathCommandMoveTo(m_arPoints[0].dX, m_arPoints[0].dY);
 	}
 
 	//CLineElement
 	CLineElement::CLineElement(const Point &oPoint)
-	    : m_oPoint(oPoint)
+	{
+		m_arPoints.push_back(oPoint);
+	}
+
+	CLineElement::~CLineElement()
 	{}
 
 	EPathElement CLineElement::GetType() const
@@ -100,7 +104,7 @@ namespace SVG
 		Point oTranslatePoint{0., 0.};
 
 		if (bRelativeCoordinate && NULL != pPrevElement)
-			oTranslatePoint = pPrevElement->GetLastPoint();
+			oTranslatePoint = (*pPrevElement)[-1];
 
 		CLineElement *pLineElement = new CLineElement(Point{arValues[0], arValues[1]} + oTranslatePoint);
 
@@ -117,7 +121,7 @@ namespace SVG
 		Point oTranslatePoint{0., 0.};
 
 		if (NULL != pPrevElement)
-			oTranslatePoint = pPrevElement->GetLastPoint();
+			oTranslatePoint = (*pPrevElement)[-1];
 
 		CLineElement *pLineElement = new CLineElement(Point{oTranslatePoint.dX, arValues[0] + ((bRelativeCoordinate) ? oTranslatePoint.dY : 0)});
 
@@ -134,7 +138,7 @@ namespace SVG
 		Point oTranslatePoint{0., 0.};
 
 		if (NULL != pPrevElement)
-			oTranslatePoint = pPrevElement->GetLastPoint();
+			oTranslatePoint = (*pPrevElement)[-1];
 
 		CLineElement *pLineElement = new CLineElement(Point{arValues[0] + ((bRelativeCoordinate) ? oTranslatePoint.dX : 0), oTranslatePoint.dY});
 
@@ -145,19 +149,23 @@ namespace SVG
 
 	void CLineElement::Draw(IRenderer *pRenderer) const
 	{
-		if (NULL != pRenderer)
-			pRenderer->PathCommandLineTo(m_oPoint.dX, m_oPoint.dY);
-	}
+		if (m_arPoints.empty())
+			return;
 
-	TBounds CLineElement::GetBounds() const
-	{
-		return TBounds{m_oPoint.dX, m_oPoint.dY, 1, 1};
+		pRenderer->PathCommandLineTo(m_arPoints[0].dX, m_arPoints[0].dY);
 	}
 
 	//CCurveBezierElement
 	CCBezierElement::CCBezierElement(const Point &oPoint1, const Point &oPoint2, const Point &oPointE, EPathElement enType)
-		: m_oPoint1(oPoint1), m_oPoint2(oPoint2), m_oPointE(oPointE), m_enType(enType)
-	{}
+		: m_enType(enType)
+	{
+		m_arPoints.push_back(oPoint1);
+		m_arPoints.push_back(oPoint2);
+		m_arPoints.push_back(oPointE);
+	}
+	CCBezierElement::~CCBezierElement()
+	{
+	}
 
 	EPathElement CCBezierElement::GetType() const
 	{
@@ -172,11 +180,11 @@ namespace SVG
 		Point oTranslatePoint{0., 0.};
 
 		if (bRelativeCoordinate && NULL != pPrevElement)
-			oTranslatePoint = pPrevElement->GetLastPoint();
+			oTranslatePoint = (*pPrevElement)[-1];
 
 		CCBezierElement *pCBezierElement = new CCBezierElement(Point{arValues[0], arValues[1]} + oTranslatePoint,
-		                                                       Point{arValues[2], arValues[3]} + oTranslatePoint,
-		                                                       Point{arValues[4], arValues[5]} + oTranslatePoint);
+															   Point{arValues[2], arValues[3]} + oTranslatePoint,
+															   Point{arValues[4], arValues[5]} + oTranslatePoint);
 
 		arValues.erase(arValues.begin(), arValues.begin() + 6);
 
@@ -192,19 +200,14 @@ namespace SVG
 
 		if (NULL != pPrevElement)
 		{
-			oFirstPoint = pPrevElement->GetLastPoint();
+			oFirstPoint = (*pPrevElement)[-1];
 			if (bRelativeCoordinate)
 				oTranslatePoint = oFirstPoint;
 		}
 
 		if (EPathElement::SBezier == pPrevElement->GetType() ||
 			EPathElement::CBezier == pPrevElement->GetType())
-		{
-			CCBezierElement *pBezierElement{dynamic_cast<CCBezierElement*>(pPrevElement)};
-
-			if (NULL != pBezierElement)
-				oFirstPoint += oFirstPoint - pBezierElement->m_oPoint2;
-		}
+			oFirstPoint += oFirstPoint - (*pPrevElement)[-2];
 
 		CCBezierElement *pCBezierElement = new CCBezierElement(oFirstPoint,
 															   Point{arValues[0], arValues[1]} + oTranslatePoint,
@@ -225,7 +228,7 @@ namespace SVG
 
 		if (NULL != pPrevElement)
 		{
-			oLastPoint = pPrevElement->GetLastPoint();
+			oLastPoint = (*pPrevElement)[-1];
 			if (bRelativeCoordinate)
 				oTranslatePoint = oLastPoint;
 		}
@@ -237,14 +240,6 @@ namespace SVG
 		return pCBezierElement;
 	}
 
-	bool ItBezierType(EPathElement eType)
-	{
-		return EPathElement::CBezier == eType ||
-		       EPathElement::SBezier == eType ||
-		       EPathElement::QBezier == eType ||
-		       EPathElement::TBezier == eType;
-	}
-
 	IPathElement *CCBezierElement::CreateFromTArray(std::vector<double> &arValues, bool bRelativeCoordinate, IPathElement *pPrevElement)
 	{
 		if (arValues.size() < 2)
@@ -252,29 +247,10 @@ namespace SVG
 
 		Point oFirstPoint{0., 0.}, oSecondPoint{0., 0.}, oTranslatePoint{0., 0.};
 
-		if (EPathElement::SBezier == pPrevElement->GetType() ||
-			EPathElement::CBezier == pPrevElement->GetType())
-		{
-			CCBezierElement *pBezierElement{dynamic_cast<CCBezierElement*>(pPrevElement)};
-
-			if (NULL != pBezierElement)
-				oFirstPoint += oFirstPoint - pBezierElement->m_oPoint2;
-		}
-
 		if (NULL != pPrevElement)
 		{
-			oFirstPoint  = pPrevElement->GetLastPoint();
-
-			if (ItBezierType(pPrevElement->GetType()))
-			{
-				CCBezierElement *pBezierElement{dynamic_cast<CCBezierElement*>(pPrevElement)};
-
-				if (NULL != pBezierElement)
-					oSecondPoint = pBezierElement->m_oPoint2;
-			}
-			else
-				oSecondPoint = oFirstPoint;
-
+			oFirstPoint  = (*pPrevElement)[-1];
+			oSecondPoint = (*pPrevElement)[-2];
 			if (bRelativeCoordinate)
 				oTranslatePoint = oFirstPoint;
 		}
@@ -306,9 +282,9 @@ namespace SVG
 		Point oTranslatePoint{0., 0.};
 
 		if (bRelativeCoordinate && NULL != pPrevElement)
-			oTranslatePoint = pPrevElement->GetLastPoint();
+			oTranslatePoint = (*pPrevElement)[-1];
 
-		Point oSrartPoint{pPrevElement->GetLastPoint()};
+		Point oSrartPoint{(*pPrevElement)[-1]};
 		Point oSecondPoint{arValues[5] + oTranslatePoint.dX, arValues[6] + oTranslatePoint.dY};
 
 		if (oSrartPoint == oSecondPoint)
@@ -385,26 +361,12 @@ namespace SVG
 
 	void CCBezierElement::Draw(IRenderer *pRenderer) const
 	{
-		pRenderer->PathCommandCurveTo(m_oPoint1.dX, m_oPoint1.dY,
-		                              m_oPoint2.dX, m_oPoint2.dY,
-		                              m_oPointE.dX, m_oPointE.dY);
-	}
+		if (3 != m_arPoints.size())
+				return;
 
-	#define CHECK_BOUNDS(bounds, point)\
-	bounds.m_dLeft   = std::min(oBounds.m_dLeft,   point.dX);\
-	bounds.m_dTop    = std::min(oBounds.m_dTop,    point.dY);\
-	bounds.m_dRight  = std::max(oBounds.m_dRight,  point.dX);\
-	bounds.m_dBottom = std::max(oBounds.m_dBottom, point.dY)
-
-	TBounds CCBezierElement::GetBounds() const
-	{
-		TBounds oBounds{DBL_MAX, DBL_MAX, -DBL_MAX, -DBL_MAX};
-
-		CHECK_BOUNDS(oBounds, m_oPoint1);
-		CHECK_BOUNDS(oBounds, m_oPoint2);
-		CHECK_BOUNDS(oBounds, m_oPointE);
-
-		return oBounds;
+		pRenderer->PathCommandCurveTo(m_arPoints[0].dX, m_arPoints[0].dY,
+		                              m_arPoints[1].dX, m_arPoints[1].dY,
+		                              m_arPoints[2].dX, m_arPoints[2].dY);
 	}
 
 	inline double ClampSinCos(const double& d)
@@ -460,6 +422,13 @@ namespace SVG
 	}
 
 	//CCloseElement
+	CCloseElement::CCloseElement()
+	{}
+
+	CCloseElement::~CCloseElement()
+	{
+	}
+
 	EPathElement CCloseElement::GetType() const
 	{
 		return EPathElement::Close;
@@ -470,20 +439,18 @@ namespace SVG
 		pRenderer->PathCommandClose();
 	}
 
-	TBounds CCloseElement::GetBounds() const
-	{
-		return TBounds{0., 0., 0., 0.};
-	}
-
 	#define LASTELEMENT(array) (array.empty()) ? NULL : array.back()
     #define RANGEALIGMENT(value, left, rigth) if (value < left) value = left; else if (value > rigth) value = rigth;
     #define EPSILON 0.05
     #define CURVESTEP 0.05
     #define MINCURVESTEP 0.001
 
-	CPath::CPath(CSvgReader& oReader, CRenderedObject* pParent)
-		: CRenderedObject(oReader, pParent), m_bEvenOddRule(false)
-	{}
+	CPath::CPath(XmlUtils::CXmlNode& oNode, CRenderedObject* pParent, bool bChechCommands)
+		: CRenderedObject(oNode, pParent), m_bEvenOddRule(false)
+	{
+		if (bChechCommands)
+			ReadFromString(oNode.GetAttribute(L"d"));
+	}
 
 	CPath::~CPath()
 	{
@@ -491,14 +458,6 @@ namespace SVG
 			delete pPathElement;
 	}
 
-	void CPath::SetAttribute(const std::string& sName, CSvgReader& oReader)
-	{
-		if ("d" == sName)
-			ReadFromString(oReader.GetText());
-		else
-			CRenderedObject::SetAttribute(sName, oReader);
-	}
-
 	void CPath::SetData(const std::map<std::wstring, std::wstring> &mAttributes, unsigned short ushLevel, bool bHardMode)
 	{
 		CRenderedObject::SetData(mAttributes, ushLevel, bHardMode);
@@ -582,22 +541,17 @@ namespace SVG
 				{
 					const IPathElement* pFirstElement{m_arElements[unIndex]};
 
-					(*oExternalData.m_pPoints)[0].m_oPoint = pFirstElement->GetFirstPoint();
+					(*oExternalData.m_pPoints)[0].m_oPoint = (*pFirstElement)[0];
 
 					if (pStartMarker->NeedExternalAngle())
 					{
-						Point oCurent{pFirstElement->GetFirstPoint()};
+						Point oCurent{(*pFirstElement)[0]};
 						Point oNext;
 
-						if (ItBezierType(pFirstElement->GetType()))
-						{
-							const CCBezierElement* pBezierElement{dynamic_cast<const CCBezierElement*>(pFirstElement)};
-
-							if (NULL != pBezierElement)
-								oNext = pBezierElement->m_oPoint2;
-						}
+						if (pFirstElement->GetPointCount() > 1)
+							oNext = (*pFirstElement)[1];
 						else if (unIndex < m_arElements.size() - 1 && EPathElement::Close != m_arElements[unIndex + 1]->GetType() && EPathElement::Move != m_arElements[unIndex + 1]->GetType())
-							oNext = m_arElements[unIndex + 1]->GetFirstPoint();
+							oNext = (*m_arElements[unIndex + 1])[0];
 
 						(*oExternalData.m_pPoints)[0].m_dAngle = CALCULATE_ANGLE(oCurent, oNext);
 
@@ -623,12 +577,12 @@ namespace SVG
 				for (unsigned int unIndex = 1; unIndex < m_arElements.size() - 1; ++unIndex)
 				{
 					if (EPathElement::Close != m_arElements[unIndex]->GetType())
-						(*oExternalData.m_pPoints)[unIndex - 1].m_oPoint = m_arElements[unIndex]->GetLastPoint();
+						(*oExternalData.m_pPoints)[unIndex - 1].m_oPoint = (*m_arElements[unIndex])[-1];
 
 					if (pMidMarker->NeedExternalAngle())
 					{
-						const Point oCurrent{m_arElements[unIndex]->GetFirstPoint()};
-						const Point oPrev{m_arElements[unIndex + 1]->GetLastPoint()};
+						const Point oCurrent{(*m_arElements[unIndex])[0]};
+						const Point oPrev{(*m_arElements[unIndex + 1])[-1]};
 
 						(*oExternalData.m_pPoints)[unIndex - 1].m_dAngle = CALCULATE_ANGLE(oCurrent, oPrev);
 					}
@@ -654,22 +608,17 @@ namespace SVG
 				{
 					const IPathElement* pLastElement{m_arElements[unIndex]};
 
-					(*oExternalData.m_pPoints)[0].m_oPoint = pLastElement->GetLastPoint();
+					(*oExternalData.m_pPoints)[0].m_oPoint = (*pLastElement)[-1];
 
 					if (pEndMarker->NeedExternalAngle())
 					{
-						Point oCurent{pLastElement->GetLastPoint()};
+						Point oCurent{(*pLastElement)[-1]};
 						Point oPrev;
 
-						if (ItBezierType(pLastElement->GetType()))
-						{
-							const CCBezierElement* pBezierElement{dynamic_cast<const CCBezierElement*>(pLastElement)};
-
-							if (NULL != pBezierElement)
-								oPrev = pBezierElement->m_oPoint2;
-						}
-						else if (unIndex > 0 && EPathElement::Close != m_arElements[unIndex - 1]->GetType())
-							oPrev = m_arElements[unIndex - 1]->GetFirstPoint();
+						if (pLastElement->GetPointCount() > 1)
+							oPrev = (*pLastElement)[-2];
+						else if (unIndex > 0 && EPathElement::Close != m_arElements[unIndex - 1]->GetType() && EPathElement::Move != m_arElements[unIndex - 1]->GetType())
+							oPrev = (*m_arElements[unIndex - 1])[0];
 
 						(*oExternalData.m_pPoints)[0].m_dAngle = CALCULATE_ANGLE(oPrev, oCurent);
 					}
@@ -703,7 +652,7 @@ namespace SVG
 		}
 	}
 
-	TBounds CPath::GetBounds(SvgMatrix* pTransform) const
+	TBounds CPath::GetBounds() const
 	{
 		TBounds oBounds{DBL_MAX, DBL_MAX, -DBL_MAX, -DBL_MAX}, oTempBounds;
 
@@ -717,16 +666,6 @@ namespace SVG
 			oBounds.m_dBottom = std::max(oBounds.m_dBottom, oTempBounds.m_dBottom);
 		}
 
-		if (nullptr != pTransform)
-		{
-			*pTransform += m_oTransformation.m_oTransform.GetMatrix();
-
-			pTransform->GetFinalValue().TransformPoint(oBounds.m_dLeft,  oBounds.m_dTop   );
-			pTransform->GetFinalValue().TransformPoint(oBounds.m_dRight, oBounds.m_dBottom);
-
-			*pTransform -= m_oTransformation.m_oTransform.GetMatrix();
-		}
-
 		return oBounds;
 	}
 
@@ -762,7 +701,7 @@ namespace SVG
 				if (NULL == pMoveElement)
 					return;
 
-				AddElement(new CCloseElement());
+				AddElement(new CCloseElement);
 				oSecondPos = ++oFirstPos;
 				continue;
 			}
@@ -902,13 +841,13 @@ namespace SVG
 		case EPathElement::Move:
 		case  EPathElement::Close:
 		{
-			m_oPosition = m_oLastPoint = m_pCurrentElement->GetFirstPoint();
+			m_oPosition = m_oLastPoint = (*m_pCurrentElement)[0];
 			m_pCurrentElement = (*m_pPath)[m_unIndexElement++];
 			return Move(dX);
 		}
 		case EPathElement::Line:
 		{
-			Point oPoint{m_pCurrentElement->GetFirstPoint()};
+			Point oPoint{(*m_pCurrentElement)[0]};
 
 			double dDx = oPoint.dX - m_oPosition.dX;
 			double dDy = oPoint.dY - m_oPosition.dY;
@@ -935,11 +874,6 @@ namespace SVG
 		case EPathElement::QBezier:
 		case EPathElement::TBezier:
 		{
-			const CCBezierElement* pBezierElement{dynamic_cast<const CCBezierElement*>(m_pCurrentElement)};
-
-			if (NULL == pBezierElement)
-				return false;
-
 			Point oCurvePoint{0., 0.};
 			double dPrevValue = dX;
 
@@ -963,8 +897,8 @@ namespace SVG
 
 				RANGEALIGMENT(m_dCurveIndex, 0., 1.);
 
-				oCurvePoint.dX = std::pow((1. - m_dCurveIndex), 3) * m_oLastPoint.dX + 3 * std::pow((1. - m_dCurveIndex), 2) * m_dCurveIndex * pBezierElement->m_oPoint1.dX + 3 * (1. - m_dCurveIndex)* std::pow(m_dCurveIndex, 2) * pBezierElement->m_oPoint2.dX + std::pow(m_dCurveIndex, 3) * pBezierElement->m_oPointE.dX;
-				oCurvePoint.dY = std::pow((1. - m_dCurveIndex), 3) * m_oLastPoint.dY + 3 * std::pow((1. - m_dCurveIndex), 2) * m_dCurveIndex * pBezierElement->m_oPoint1.dY + 3 * (1. - m_dCurveIndex)* std::pow(m_dCurveIndex, 2) * pBezierElement->m_oPoint2.dY + std::pow(m_dCurveIndex, 3) * pBezierElement->m_oPointE.dY;
+				oCurvePoint.dX = std::pow((1. - m_dCurveIndex), 3) * m_oLastPoint.dX + 3 * std::pow((1. - m_dCurveIndex), 2) * m_dCurveIndex * (*m_pCurrentElement)[0].dX + 3 * (1. - m_dCurveIndex)* std::pow(m_dCurveIndex, 2) * (*m_pCurrentElement)[1].dX + std::pow(m_dCurveIndex, 3) * (*m_pCurrentElement)[2].dX;
+				oCurvePoint.dY = std::pow((1. - m_dCurveIndex), 3) * m_oLastPoint.dY + 3 * std::pow((1. - m_dCurveIndex), 2) * m_dCurveIndex * (*m_pCurrentElement)[0].dY + 3 * (1. - m_dCurveIndex)* std::pow(m_dCurveIndex, 2) * (*m_pCurrentElement)[1].dY + std::pow(m_dCurveIndex, 3) * (*m_pCurrentElement)[2].dY;
 
 				dPrevValue = dX;
 
@@ -973,7 +907,7 @@ namespace SVG
 
 			m_dCurveStep  = CURVESTEP;
 
-			return NextMove(dX, m_pCurrentElement->GetLastPoint());
+			return NextMove(dX, (*m_pCurrentElement)[-1]);
 		}
 		default: return false;
 		}
@@ -988,7 +922,7 @@ namespace SVG
 
 		m_unIndexElement = 0;
 		m_pCurrentElement = (*m_pPath)[m_unIndexElement++];
-		m_oPosition = m_oLastPoint = m_pCurrentElement->GetFirstPoint();
+		m_oPosition = m_oLastPoint = (*m_pCurrentElement)[0];
 		m_dAngle = m_dCurveIndex = 0.;
 		m_dCurveStep = CURVESTEP;
 	}

DesktopEditor/raster/Metafile/svg/SvgObjects/CPath.h

@@ -30,55 +30,57 @@ namespace SVG
 	class IPathElement
 	{
 	public:
-		virtual ~IPathElement() = default;
+		virtual ~IPathElement();
 		virtual EPathElement GetType() const = 0;
 		virtual void Draw(IRenderer* pRenderer) const = 0;
-		virtual TBounds GetBounds() const = 0;
 
-		Point GetFirstPoint() const;
-		Point GetLastPoint() const;
+		TBounds GetBounds() const;
+		UINT    GetPointCount() const;
+		virtual Point operator[](int nIndex) const;
+
+	private:
+		friend class CMoveElement;
+		friend class CLineElement;
+		friend class CVLineElement;
+		friend class CHLineElement;
+		friend class CCBezierElement;
+		friend class CSBezierElement;
+		friend class CQBezierElement;
+		friend class CTBezierElement;
+		friend class CArcElement;
+		friend class CCloseElement;
+		friend class CMovingPath;
+
+		std::vector<Point> m_arPoints;
 	};
 
 	class CMoveElement : public IPathElement
 	{
 	public:
 		CMoveElement(const Point& oPoint);
-		virtual ~CMoveElement() = default;
+		virtual ~CMoveElement();
 		EPathElement GetType() const override;
 		static CMoveElement* CreateFromArray(std::vector<double>& arValues, bool bRelativeCoordinate, IPathElement* pPrevElement = NULL);
 		void Draw(IRenderer* pRenderer) const override;
-		TBounds GetBounds() const override;
-	private:
-		Point m_oPoint;
-
-		friend class IPathElement;
-		friend class CLine;
 	};
 
 	class CLineElement : public IPathElement
 	{
 	public:
 		CLineElement(const Point& oPoint);
-		virtual ~CLineElement() = default;
+		virtual ~CLineElement();
 		EPathElement GetType() const override;
 		static CLineElement* CreateFromArray(std::vector<double>& arValues, bool bRelativeCoordinate, IPathElement* pPrevElement = NULL);
 		static CLineElement* CreateFromVArray(std::vector<double>& arValues, bool bRelativeCoordinate, IPathElement* pPrevElement = NULL);
 		static CLineElement* CreateFromHArray(std::vector<double>& arValues, bool bRelativeCoordinate, IPathElement* pPrevElement = NULL);
 		void Draw(IRenderer* pRenderer) const override;
-		TBounds GetBounds() const override;
-		Point GetPoint() const;
-	private:
-		Point m_oPoint;
-
-		friend class IPathElement;
-		friend class CLine;
 	};
 
 	class CCBezierElement : public IPathElement
 	{
 	public:
 		CCBezierElement(const Point& oPoint1, const Point& oPoint2, const Point& oPointE, EPathElement enType = CBezier);
-		virtual ~CCBezierElement() = default;
+		virtual ~CCBezierElement();
 		EPathElement GetType() const override;
 		static IPathElement* CreateFromArray(std::vector<double>& arValues, bool bRelativeCoordinate, IPathElement* pPrevElement = NULL);
 		static IPathElement* CreateFromSArray(std::vector<double>& arValues, bool bRelativeCoordinate, IPathElement* pPrevElement = NULL);
@@ -86,40 +88,27 @@ namespace SVG
 		static IPathElement* CreateFromTArray(std::vector<double>& arValues, bool bRelativeCoordinate, IPathElement* pPrevElement = NULL);
 		static std::vector<IPathElement*> CreateFromArc(std::vector<double>& arValues, bool bRelativeCoordinate, IPathElement* pPrevElement = NULL);
 		void Draw(IRenderer* pRenderer) const override;
-		TBounds GetBounds() const override;
 	private:
 		static void  CalculateArcData(const Point& oFirst, const Point& oSecond, Point& oRadius, Point& oCenter, double dAngle, bool bLargeArc, bool bSweep, double& dStartAngle, double& dSweep);
 
-		Point m_oPoint1;
-		Point m_oPoint2;
-		Point m_oPointE;
 		EPathElement m_enType;
-
-		friend class IPathElement;
-		friend class CMovingPath;
-		friend class CPath;
 	};
 
 	class CCloseElement : public IPathElement
 	{
 	public:
-		CCloseElement() = default;
-		virtual ~CCloseElement() = default;
+		CCloseElement();
+		virtual ~CCloseElement();
 		EPathElement GetType() const override;
 		void Draw(IRenderer* pRenderer) const override;
-		TBounds GetBounds() const override;
 	};
 
 	class CPath : public CRenderedObject
 	{
-		friend class CObject;
-	protected:
-		CPath(CSvgReader& oReader, CRenderedObject* pParent = NULL);
 	public:
+		CPath(XmlUtils::CXmlNode& oNode, CRenderedObject* pParent = NULL, bool bChechCommands = true);
 		virtual ~CPath();
 
-		void SetAttribute(const std::string& sName, CSvgReader& oReader) override;
-
 		void SetData(const std::map<std::wstring, std::wstring>& mAttributes, unsigned short ushLevel, bool bHardMode = false) override;
 
 		bool Draw(IRenderer* pRenderer, const CSvgFile *pFile, CommandeMode oMode = CommandeModeDraw, const TSvgStyles* pOtherStyles = NULL, const CRenderedObject* pContexObject = NULL) const override;
@@ -129,22 +118,24 @@ namespace SVG
 		void ApplyStyle(IRenderer* pRenderer, const TSvgStyles* pStyles, const CSvgFile *pFile, int& nTypePath, const CRenderedObject* pContexObject = NULL) const override;
 		bool DrawMarkers(IRenderer* pRenderer, const CSvgFile *pFile, CommandeMode oMode = CommandeModeDraw, const TSvgStyles* pOtherStyles = NULL, const CRenderedObject* pContexObject = NULL) const;
 
-		TBounds GetBounds(SvgMatrix* pTransform = nullptr) const override;
+		void SetMarker(const std::map<std::wstring, std::wstring> &mAttributes, unsigned short ushLevel, bool bHardMode);
+
+		TBounds GetBounds() const override;
 
 		const int FindIndexFirstNotEmpty(bool bReverseSearch = false) const;
 
 		void ReadFromString(const std::wstring& wsValue);
+		bool AddElement(IPathElement* pElement);
+
+		friend class CLine;
+		friend class CFont;
+		friend class CPolygon;
+		friend class CPolyline;
 
 		std::vector<IPathElement*> m_arElements;
 
 		TMarkers m_oMarkers;
 		bool m_bEvenOddRule;
-
-		friend class CFont;
-	protected:
-		bool AddElement(IPathElement* pElement);
-
-		void SetMarker(const std::map<std::wstring, std::wstring> &mAttributes, unsigned short ushLevel, bool bHardMode);
 	};
 
 	class CMovingPath

DesktopEditor/raster/Metafile/svg/SvgObjects/CPattern.cpp

@@ -5,9 +5,8 @@
 
 namespace SVG
 {
-	CPattern::CPattern(CSvgReader& oReader, NSFonts::IFontManager *pFontManager)
-		: CAppliedObject(oReader), m_oContainer(oReader), m_pFontManager(pFontManager),
-		  m_pImage(NULL), m_enPatternUnits(objectBoundingBox)
+	CPattern::CPattern(XmlUtils::CXmlNode& oNode, NSFonts::IFontManager *pFontManager)
+		: CAppliedObject(oNode), m_oContainer(oNode), m_pFontManager(pFontManager), m_pImage(NULL), m_enPatternUnits(objectBoundingBox)
 	{}
 
 	CPattern::~CPattern()

DesktopEditor/raster/Metafile/svg/SvgObjects/CPattern.h

@@ -14,9 +14,8 @@ namespace SVG
 
 	class CPattern : public CAppliedObject
 	{
-		friend class CObject;
-		CPattern(CSvgReader& oReader, NSFonts::IFontManager *pFontManager = NULL);
 	public:
+		CPattern(XmlUtils::CXmlNode& oNode, NSFonts::IFontManager *pFontManager = NULL);
 		virtual ~CPattern();
 
 		void SetData(const std::map<std::wstring, std::wstring> &mAttributes, unsigned short ushLevel, bool bHardMode) override;

DesktopEditor/raster/Metafile/svg/SvgObjects/CPolyline.cpp

@@ -1,38 +1,24 @@
 #include "CPolyline.h"
 
-#include "../../../../../Common/3dParty/html/css/src/StaticFunctions.h"
-
 namespace SVG
 {
-	CPolyline::CPolyline(CSvgReader& oReader, CRenderedObject* pParent)
-		: CPath(oReader, pParent)
-	{}
-
-	void CPolyline::SetAttribute(const std::string& sName, CSvgReader& oReader)
+	CPolyline::CPolyline(XmlUtils::CXmlNode& oNode, CRenderedObject* pParent)
+		: CPath(oNode, pParent, false)
 	{
-		if ("points" == sName)
-		{
-			const std::vector<double> arValues = NSCSS::NS_STATIC_FUNCTIONS::ReadDoubleValues(oReader.GetText());
+		std::vector<double> arValues = NSCSS::NS_STATIC_FUNCTIONS::ReadDoubleValues(oNode.GetAttribute(L"points"));
 
-			if (arValues.size() < 4)
-				return;
+		if (arValues.size() < 4)
+			return;
 
-			AddElement(new CMoveElement(Point{arValues[0], arValues[1]}));
+		AddElement(new CMoveElement(Point{arValues[0], arValues[1]}));
 
-			for (unsigned int unIndex = 2; unIndex < arValues.size(); unIndex += 2)
-				AddElement(new CLineElement(Point{arValues[unIndex + 0], arValues[unIndex + 1]}));
-		}
-		else
-			CRenderedObject::SetAttribute(sName, oReader);
+		for (unsigned int unIndex = 2; unIndex < arValues.size(); unIndex += 2)
+			AddElement(new CLineElement(Point{arValues[unIndex + 0], arValues[unIndex + 1]}));
 	}
 
-	CPolygon::CPolygon(CSvgReader& oReader, CRenderedObject* pParent)
-	    : CPolyline(oReader, pParent)
-	{}
-
-	void CPolygon::SetAttribute(const std::string& sName, CSvgReader& oReader)
+	CPolygon::CPolygon(XmlUtils::CXmlNode& oNode, CRenderedObject* pParent)
+		: CPolyline(oNode, pParent)
 	{
-		CPolyline::SetAttribute(sName, oReader);
 		AddElement(new CCloseElement());
 	}
 }

DesktopEditor/raster/Metafile/svg/SvgObjects/CPolyline.h

@@ -7,19 +7,14 @@ namespace SVG
 {
 	class CPolyline : public CPath
 	{
-		friend class CObject;
-	protected:
-		CPolyline(CSvgReader& oReader, CRenderedObject* pParent = NULL);
 	public:
-		void SetAttribute(const std::string& sName, CSvgReader& oReader) override;
+		CPolyline(XmlUtils::CXmlNode& oNode, CRenderedObject* pParent = NULL);
 	};
 
 	class CPolygon : public CPolyline
 	{
-		friend class CObject;
-		CPolygon(CSvgReader& oReader, CRenderedObject* pParent = NULL);
 	public:
-		void SetAttribute(const std::string& sName, CSvgReader& oReader) override;
+		CPolygon(XmlUtils::CXmlNode& oNode, CRenderedObject* pParent = NULL);
 	};
 }
 

DesktopEditor/raster/Metafile/svg/SvgObjects/CRect.cpp

@@ -1,32 +1,20 @@
 #include "CRect.h"
+#include "CStyle.h"
 #include "CContainer.h"
 #include "../SvgTypes.h"
 
 namespace SVG
 {
-	CRect::CRect(CSvgReader& oReader, CRenderedObject *pParent)
-		: CRenderedObject(oReader, pParent)
-	{}
-
-	CRect::~CRect()
-	{}
-
-	void CRect::SetAttribute(const std::string& sName, CSvgReader& oReader)
+	CRect::CRect(XmlUtils::CXmlNode& oNode, CRenderedObject *pParent)
+		: CRenderedObject(oNode, pParent)
 	{
-		if ("x" == sName)
-			m_oRect.m_oX.SetValue(oReader.GetText());
-		else if ("y" == sName)
-			m_oRect.m_oY.SetValue(oReader.GetText());
-		else if ("width" == sName)
-			m_oRect.m_oWidth.SetValue(oReader.GetText());
-		else if ("height" == sName)
-			m_oRect.m_oHeight.SetValue(oReader.GetText());
-		else if ("rx" == sName)
-			m_oRx.SetValue(oReader.GetText());
-		else if ("ry" == sName)
-			m_oRy.SetValue(oReader.GetText());
-		else
-			CRenderedObject::SetAttribute(sName, oReader);
+		m_oRect.m_oX     .SetValue(oNode.GetAttribute(L"x"));
+		m_oRect.m_oY     .SetValue(oNode.GetAttribute(L"y"));
+		m_oRect.m_oWidth .SetValue(oNode.GetAttribute(L"width"));
+		m_oRect.m_oHeight.SetValue(oNode.GetAttribute(L"height"));
+
+		m_oRx.SetValue(oNode.GetAttribute(L"rx"));
+		m_oRy.SetValue(oNode.GetAttribute(L"ry"));
 
 		if (m_oRx.Empty() && !m_oRy.Empty())
 			m_oRx = m_oRy;
@@ -34,6 +22,9 @@ namespace SVG
 			m_oRy = m_oRx;
 	}
 
+	CRect::~CRect()
+	{}
+
 	void CRect::SetData(const std::map<std::wstring, std::wstring> &mAttributes, unsigned short ushLevel, bool bHardMode)
 	{
 		CRenderedObject::SetData(mAttributes, ushLevel, bHardMode);
@@ -103,7 +94,7 @@ namespace SVG
 			nTypePath += c_nWindingFillMode;
 	}
 
-	TBounds CRect::GetBounds(SvgMatrix* pTransform) const
+	TBounds CRect::GetBounds() const
 	{
 		TBounds oBounds;
 
@@ -112,16 +103,6 @@ namespace SVG
 		oBounds.m_dRight  = oBounds.m_dLeft + m_oRect.m_oWidth.ToDouble(NSCSS::Pixel);
 		oBounds.m_dBottom = oBounds.m_dTop  + m_oRect.m_oHeight.ToDouble(NSCSS::Pixel);
 
-		if (nullptr != pTransform)
-		{
-			*pTransform += m_oTransformation.m_oTransform.GetMatrix();
-
-			pTransform->GetFinalValue().TransformPoint(oBounds.m_dLeft,  oBounds.m_dTop   );
-			pTransform->GetFinalValue().TransformPoint(oBounds.m_dRight, oBounds.m_dBottom);
-
-			*pTransform -= m_oTransformation.m_oTransform.GetMatrix();
-		}
-
 		return oBounds;
 	}
 }

DesktopEditor/raster/Metafile/svg/SvgObjects/CRect.h

@@ -7,12 +7,10 @@ namespace SVG
 {
 	class CRect : public CRenderedObject
 	{
-		friend class CObject;
-		CRect(CSvgReader& oReader, CRenderedObject* pParent = NULL);
 	public:
-		virtual ~CRect();
+		CRect(XmlUtils::CXmlNode& oNode, CRenderedObject* pParent = NULL);
 
-		void SetAttribute(const std::string& sName, CSvgReader& oReader) override;
+		virtual ~CRect();
 
 		void SetData(const std::map<std::wstring, std::wstring>& mAttributes, unsigned short ushLevel, bool bHardMode = false) override;
 
@@ -21,7 +19,7 @@ namespace SVG
 	private:
 		void ApplyStyle(IRenderer* pRenderer, const TSvgStyles* pStyles, const CSvgFile* pFile, int& nTypePath, const CRenderedObject* pContexObject = NULL) const override;
 
-		TBounds GetBounds(SvgMatrix* pTransform = nullptr) const override;
+		TBounds GetBounds() const override;
 
 		TRect    m_oRect;
 

DesktopEditor/raster/Metafile/svg/SvgObjects/CStyle.cpp

@@ -1,5 +1,4 @@
 #include "CStyle.h"
-#include "CObjectBase.h"
 
 namespace SVG
 {
@@ -32,7 +31,7 @@ namespace SVG
 
 		const std::vector<NSCSS::CNode> arSelectors = pSvgObject->GetFullPath();
 
-		std::vector<std::wstring> arNodes = m_pInternal->CalculateAllNodes(arSelectors, 0, arSelectors.size());
+		std::vector<std::wstring> arNodes = m_pInternal->CalculateAllNodes(arSelectors);
 		std::vector<std::wstring> arPrevNodes;
 
 		for (size_t i = 0; i < arSelectors.size(); ++i)

DesktopEditor/raster/Metafile/svg/SvgObjects/CStyle.h

@@ -3,10 +3,12 @@
 
 #include <string>
 #include "../../../../../Common/3dParty/html/css/src/CCssCalculator_Private.h"
+#include "CObjectBase.h"
+
+#include <numeric>
 
 namespace SVG
 {
-	class CObject;
 	class CSvgCalculator
 	{
 		NSCSS::CCssCalculator_Private *m_pInternal;

DesktopEditor/raster/Metafile/svg/SvgObjects/CSwitch.cpp

@@ -2,9 +2,10 @@
 
 namespace SVG 
 {
-	CSwitch::CSwitch(CSvgReader& oReader, CRenderedObject *pParent)
-		: CRenderedObject(oReader, pParent)
-	{}
+	CSwitch::CSwitch(XmlUtils::CXmlNode &oNode, CRenderedObject *pParent)
+		: CRenderedObject(oNode, pParent)
+	{
+	}
 
 	bool CSwitch::Draw(IRenderer *pRenderer, const CSvgFile *pFile, CommandeMode oMode, const TSvgStyles *pStyles, const CRenderedObject* pContexObject) const
 	{
@@ -17,7 +18,7 @@ namespace SVG
 		return false;
 	}
 
-	TBounds CSwitch::GetBounds(SvgMatrix* pTransform) const
+	TBounds CSwitch::GetBounds() const
 	{
 		for (const CRenderedObject* pObject : m_arObjects)
 			if (NULL != pObject)

DesktopEditor/raster/Metafile/svg/SvgObjects/CSwitch.h

@@ -7,12 +7,12 @@ namespace SVG
 {
 	class CSwitch : public CRenderedObject, public CContainer<CRenderedObject>
 	{
-		friend class CObject;
-		CSwitch(CSvgReader& oReader, CRenderedObject* pParent = NULL);
 	public:
+		CSwitch(XmlUtils::CXmlNode& oNode, CRenderedObject* pParent = NULL);
+
 		bool Draw(IRenderer* pRenderer, const CSvgFile *pFile, CommandeMode oMode = CommandeModeDraw, const TSvgStyles* pStyles = NULL, const CRenderedObject* pContexObject = NULL) const override;
 
-		TBounds GetBounds(SvgMatrix* pTransform = nullptr) const override;
+		TBounds GetBounds() const override;
 	};
 }
 #endif // CSWITCH_H

DesktopEditor/raster/Metafile/svg/SvgObjects/CSymbol.cpp

@@ -2,8 +2,8 @@
 
 namespace SVG
 {
-	CSymbol::CSymbol(CSvgReader& oReader, CRenderedObject *pParent)
-		: CGraphicsContainer(oReader)
+	CSymbol::CSymbol(XmlUtils::CXmlNode &oNode, CRenderedObject *pParent, NSFonts::IFontManager *pFontManager)
+		: CGraphicsContainer(oNode)
 	{}
 
 	bool CSymbol::Draw(IRenderer *pRenderer, const CSvgFile *pFile, CommandeMode oMode, const TSvgStyles *pOtherStyles, const CRenderedObject* pContexObject) const

DesktopEditor/raster/Metafile/svg/SvgObjects/CSymbol.h

@@ -2,14 +2,15 @@
 #define CSYMBOL_H
 
 #include "CContainer.h"
+#include "../../../graphics/pro/Fonts.h"
 
 namespace SVG
 {
 	class CSymbol : public CGraphicsContainer
 	{
-		friend class CObject;
-		CSymbol(CSvgReader& oReader, CRenderedObject* pParent = NULL);
 	public:
+		CSymbol(XmlUtils::CXmlNode& oNode, CRenderedObject* pParent = NULL, NSFonts::IFontManager *pFontManager = NULL);
+
 		bool Draw(IRenderer* pRenderer, const CSvgFile* pFile, CommandeMode oMode = CommandeModeDraw, const TSvgStyles* pOtherStyles = NULL, const CRenderedObject* pContexObject = NULL) const override;
 	};
 }

DesktopEditor/raster/Metafile/svg/SvgObjects/CText.cpp

@@ -3,13 +3,9 @@
 #include "../CSvgParser.h"
 #include "../SvgUtils.h"
 #include "../CSvgFile.h"
-#include "CObjectBase.h"
 #include "CContainer.h"
 #include "CFont.h"
-
-#include "../../../../Common/3dParty/html/css/src/StaticFunctions.h"
-
-#include <cctype>
+#include "CStyle.h"
 
 #ifndef MININT8
 #define MAXUINT8    ((unsigned char)~((unsigned char)0))
@@ -21,39 +17,83 @@
 
 namespace SVG
 {
+	#define DEFAULT_TSPAN_FONT_SIZE 16
 	#define DefaultFontFamily L"Times New Roman"
 	#define MIN_FONT_SIZE 5
 	#define MAX_FONT_SIZE 100
 	#define MIN_SCALE     0.05
 	#define MAX_SCALE     100
 
-	CTSpan::CTSpan(CSvgReader& oReader, CRenderedObject* pParent, NSFonts::IFontManager* pFontManager, const Point &oPosition)
-		: CRenderedObject(oReader, pParent), m_pFontManager(pFontManager),
-		  m_oX(oPosition.dX), m_oY(oPosition.dY)
-	{}
+	CTSpan::CTSpan(XmlUtils::CXmlNode& oNode, CRenderedObject* pParent, NSFonts::IFontManager* pFontManager, bool bCheckText)
+		: CRenderedObject(oNode, pParent), m_pFontManager(pFontManager)
+	{
+		m_oFont.UpdateSize(DEFAULT_TSPAN_FONT_SIZE,DEFAULT_TSPAN_FONT_SIZE);
 
-	CTSpan::CTSpan(const CTSpan& oTSpan, double dX, const std::wstring& wsText)
-		: CRenderedObject(oTSpan), m_pFontManager(oTSpan.m_pFontManager),
-		  m_oX(dX), m_oY(oTSpan.m_oY), m_wsText(wsText),
-		  m_oFont(oTSpan.m_oFont), m_oText(oTSpan.m_oText)
-	{}
+		if (bCheckText)
+			m_wsText = StrUtils::TrimExtraEnding(oNode.GetText());
+		else
+			m_wsText = oNode.GetText();
 
-	CTSpan::CTSpan(wchar_t wChar, const Point& oPosition, CRenderedObject* pParent, NSFonts::IFontManager* pFontManager)
-		: CRenderedObject(NSCSS::CNode(L"tspan", L"", L""), pParent), m_pFontManager(pFontManager),
-		  m_oX(oPosition.dX), m_oY(oPosition.dY)
-	{}
+		m_oX.SetValue(oNode.GetAttribute(L"x"));
+		m_oY.SetValue(oNode.GetAttribute(L"y"));
+
+		if (NULL != pParent)
+		{
+			TBounds oBounds = pParent->GetBounds();
+
+			CTSpan *pTSpan = dynamic_cast<CTSpan*>(pParent);
+
+			if (NULL == pTSpan)
+				return;
+
+			m_oStyles = pTSpan->m_oStyles;
+
+			if (m_oX.Empty())
+			{
+				if (!pTSpan->m_arObjects.empty())
+					pTSpan = pTSpan->m_arObjects.back();
+
+				m_oX = pTSpan->m_oX.ToDouble(NSCSS::Pixel, oBounds.m_dRight - oBounds.m_dLeft) + pTSpan->GetWidth();
+			}
+
+			if (m_oY.Empty())
+				m_oY = pTSpan->m_oY;
+		}
+	}
+
+	CTSpan::CTSpan(const std::wstring &wsText, const Point &oPosition, CRenderedObject *pParent, NSFonts::IFontManager *pFontManager, bool bCheckText)
+		: CRenderedObject(NSCSS::CNode(L"tspan", L"", L""), pParent), m_pFontManager(pFontManager), m_wsText(wsText)
+	{
+		m_oFont.UpdateSize(DEFAULT_TSPAN_FONT_SIZE, DEFAULT_TSPAN_FONT_SIZE);
+
+		if (bCheckText)
+			m_wsText = StrUtils::TrimExtraEnding(m_wsText);
+
+		m_oX = oPosition.dX;
+		m_oY = oPosition.dY;
+	}
 
 	CTSpan::~CTSpan()
 	{}
 
-	void CTSpan::SetAttribute(const std::string& sName, CSvgReader& oReader)
+	CTSpan *CTSpan::Create(XmlUtils::CXmlNode &oNode, CRenderedObject *pParent, NSFonts::IFontManager *pFontManager)
 	{
-		if ("x" == sName)
-			m_oX.SetValue(oReader.GetText());
-		else if ("y" == sName)
-			m_oY.SetValue(oReader.GetText());
-		else
-			CRenderedObject::SetAttribute(sName, oReader);
+		CTSpan *pTSpanParent = dynamic_cast<CTSpan*>(pParent);
+
+		if (NULL == pTSpanParent)
+			return NULL;
+
+		return new CTSpan(oNode, pTSpanParent, pFontManager);
+	}
+
+	CTSpan *CTSpan::Create(const std::wstring &wsValue, const Point& oPosition, CRenderedObject *pParent, NSFonts::IFontManager *pFontManager, bool bCheckText)
+	{
+		CTSpan *pTSpanParent = dynamic_cast<CTSpan*>(pParent);
+
+		if (NULL == pTSpanParent || wsValue.empty())
+			return NULL;
+
+		return new CTSpan(wsValue, oPosition, pParent, pFontManager, bCheckText);
 	}
 
 	void CTSpan::SetData(const std::map<std::wstring, std::wstring> &mAttributes, unsigned short ushLevel, bool bHardMode)
@@ -65,22 +105,13 @@ namespace SVG
 
 		//FONT
 		if (mAttributes.end() != mAttributes.find(L"font"))
-		{
 			m_oFont.SetValue(mAttributes.at(L"font"), ushLevel, bHardMode);
-			UpdateFontSize();
-		}
 
 		if (mAttributes.end() != mAttributes.find(L"font-size"))
-		{
 			m_oFont.SetSize(mAttributes.at(L"font-size"), ushLevel, bHardMode);
-			UpdateFontSize();
-		}
 
 		if (mAttributes.end() != mAttributes.find(L"font-size-adjust"))
-		{
 			m_oFont.SetSize(mAttributes.at(L"font-size-adjust"), ushLevel, bHardMode);
-			UpdateFontSize();
-		}
 
 		if (mAttributes.end() != mAttributes.find(L"font-stretch"))
 			m_oFont.SetStretch(mAttributes.at(L"font-stretch"), ushLevel, bHardMode);
@@ -98,10 +129,7 @@ namespace SVG
 			m_oFont.SetFamily(mAttributes.at(L"font-family"), ushLevel, bHardMode);
 
 		if (mAttributes.end() != mAttributes.find(L"line-height"))
-		{
 			m_oFont.SetLineHeight(mAttributes.at(L"line-height"), ushLevel, bHardMode);
-			UpdateFontSize();
-		}
 
 		//TEXT
 		if (mAttributes.end() != mAttributes.find(L"text-anchor"))
@@ -119,57 +147,6 @@ namespace SVG
 		}
 	}
 
-	void CTSpan::ReadChildrens(CSvgReader& oReader, CSvgFile* pSvgFile)
-	{
-		const int nDepth = oReader.GetDepth();
-		XmlUtils::XmlNodeType eNodeType = XmlUtils::XmlNodeType_EndElement;
-		while (oReader.Read(eNodeType) && oReader.GetDepth() >= nDepth && XmlUtils::XmlNodeType_EndElement != eNodeType)
-		{
-			if (eNodeType == XmlUtils::XmlNodeType_Text ||
-			    eNodeType == XmlUtils::XmlNodeType_Whitespace ||
-			    eNodeType == XmlUtils::XmlNodeType_SIGNIFICANT_WHITESPACE ||
-			    eNodeType == XmlUtils::XmlNodeType_CDATA)
-			{
-				const char* pValue = oReader.GetTextChar();
-
-				if('\0' != pValue[0])
-				{
-					bool bFoundedSymbol = false;
-					const char* pCheckValue = pValue;
-					while ('\0' != *pCheckValue)
-					{
-						if (std::isprint(static_cast<unsigned char>(*pCheckValue++)))
-						{
-							bFoundedSymbol = true;
-							break;
-						}
-					}
-
-					if (!bFoundedSymbol)
-						continue;
-
-					if (m_wsText.empty())
-					{
-						NSFile::CUtf8Converter::GetUnicodeStringFromUTF8((BYTE*)pValue, (LONG)strlen(pValue), m_wsText);
-						continue;
-					}
-
-					std::wstring wsValue;
-					NSFile::CUtf8Converter::GetUnicodeStringFromUTF8((BYTE*)pValue, (LONG)strlen(pValue), wsValue);
-
-					AddObject(new CTSpan(*this, GetBounds().m_dRight, wsValue));
-				}
-			}
-			else if (eNodeType == XmlUtils::XmlNodeType_Element && "tspan" == oReader.GetName())
-			{
-				const TBounds oBounds{GetBounds()};
-				const Point oPoint{oBounds.m_dRight, oBounds.m_dBottom};
-
-				AddObject(CObject::Create<CTSpan>(oReader, pSvgFile, this, m_pFontManager, oPoint));
-			}
-		}
-	}
-
 	bool CTSpan::Draw(IRenderer *pRenderer, const CSvgFile *pFile, CommandeMode oMode, const TSvgStyles *pOtherStyles, const CRenderedObject* pContexObject) const
 	{
 		if (NULL == pRenderer || (m_wsText.empty() && m_arObjects.empty()))
@@ -187,14 +164,8 @@ namespace SVG
 		{
 			if (!m_wsText.empty())
 			{
-				Aggplus::CMatrix oCurrentMatrix;
-				ApplyFont(pRenderer, dX, dY, oCurrentMatrix);
-
+				ApplyFont(pRenderer, dX, dY);
 				pRenderer->CommandDrawText(m_wsText, dX, dY, 0, 0);
-
-				pRenderer->SetTransform(oCurrentMatrix.sx(),  oCurrentMatrix.shy(),
-				                        oCurrentMatrix.shx(), oCurrentMatrix.sy(),
-				                        oCurrentMatrix.tx(),  oCurrentMatrix.ty());
 			}
 		}
 
@@ -236,12 +207,12 @@ namespace SVG
 			nTypePath += c_nWindingFillMode;
 	}
 
-	void CTSpan::ApplyFont(IRenderer* pRenderer, double& dX, double& dY, Aggplus::CMatrix& oOldMatrix) const
+	void CTSpan::ApplyFont(IRenderer* pRenderer, double& dX, double& dY) const
 	{
 		std::wstring wsFontFamily = DefaultFontFamily;
-		double dFontSize = ((!m_oFont.GetSize().Empty()) ? m_oFont.GetSize().ToDouble(NSCSS::Pixel) : DEFAULT_FONT_SIZE) * 72. / 25.4;
+		double dFontSize = m_oFont.GetSize().ToDouble(NSCSS::Pixel) * 72. / 25.4;
 
-		Normalize(pRenderer, dX, dY, dFontSize, oOldMatrix);
+		Normalize(pRenderer, dX, dY, dFontSize);
 
 		if (!m_oFont.GetFamily().Empty())
 		{
@@ -262,37 +233,34 @@ namespace SVG
 		if (m_oText.Underline())
 			nStyle |= (1 << 2);
 
-		float fW, fUndX1, fUndY1, fUndX2, fUndY2, fUndSize;
+		// Вычиления размеров текста
+		m_pFontManager->LoadFontByName(wsFontFamily, dFontSize, nStyle, 72., 72.);
+		m_pFontManager->SetCharSpacing(0);
+
+		double dKoef     = 25.4 / 72.;
 		double dFHeight  = dFontSize;
 
-		if (NULL != m_pFontManager)
-		{
-			// Вычиления размеров текста
-			m_pFontManager->LoadFontByName(wsFontFamily, dFontSize, nStyle, 72., 72.);
-			m_pFontManager->SetCharSpacing(0);
+		NSFonts::IFontFile* pFontFile = m_pFontManager->GetFile();
 
-			double dKoef     = 25.4 / 72.;
+		if (pFontFile)
+			dFHeight  *= pFontFile->GetHeight() / pFontFile->Units_Per_Em() * dKoef;
 
-			NSFonts::IFontFile* pFontFile = m_pFontManager->GetFile();
+		float fW, fUndX1, fUndY1, fUndX2, fUndY2, fUndSize;
 
-			if (pFontFile)
-				dFHeight  *= pFontFile->GetHeight() / pFontFile->Units_Per_Em() * dKoef;
+		m_pFontManager->LoadString1(m_wsText, 0, 0);
+		TBBox oBox = m_pFontManager->MeasureString2();
+		fW = (float)dKoef * (oBox.fMaxX - oBox.fMinX);
 
-			m_pFontManager->LoadString1(m_wsText, 0, 0);
-			TBBox oBox = m_pFontManager->MeasureString2();
-			fW = (float)dKoef * (oBox.fMaxX - oBox.fMinX);
+		// Просчитаем положение подчеркивания
+		m_pFontManager->GetUnderline(&fUndX1, &fUndY1, &fUndX2, &fUndY2, &fUndSize);
+		fUndX1   *= (float)dKoef;
+		fUndY1   *= (float)dKoef;
+		fUndX2   *= (float)dKoef;
+		fUndY2   *= (float)dKoef;
+		fUndSize *= (float)dKoef / 2;
 
-			// Просчитаем положение подчеркивания
-			m_pFontManager->GetUnderline(&fUndX1, &fUndY1, &fUndX2, &fUndY2, &fUndSize);
-			fUndX1   *= (float)dKoef;
-			fUndY1   *= (float)dKoef;
-			fUndX2   *= (float)dKoef;
-			fUndY2   *= (float)dKoef;
-			fUndSize *= (float)dKoef / 2;
-
-			fUndY1 -= dFHeight / 4;
-			fUndY2 -= dFHeight / 4;
-		}
+		fUndY1 -= dFHeight / 4;
+		fUndY2 -= dFHeight / 4;
 
 		if (L"left" == m_oText.GetAlign().ToWString())
 			dX += -fW;
@@ -335,23 +303,7 @@ namespace SVG
 		pRenderer->put_FontStyle(nStyle);
 		pRenderer->put_BrushType(c_BrushTypeSolid);
 		pRenderer->put_BrushColor1(m_oStyles.m_oFill.ToInt());
-		pRenderer->put_BrushAlpha1(255 * m_oStyles.m_oFill.GetOpacity());
-	}
-
-	void CTSpan::UpdateFontSize()
-	{
-		if (NULL != m_pParent)
-		{
-			const CTSpan* pParentTSpan{dynamic_cast<const CTSpan*>(m_pParent)};
-
-			if (NULL != pParentTSpan)
-			{
-				m_oFont.UpdateSize((!pParentTSpan->m_oFont.GetSize().Empty()) ? pParentTSpan->m_oFont.GetSize().ToDouble(NSCSS::Point) : DEFAULT_FONT_SIZE, DEFAULT_FONT_SIZE);
-				return;
-			}
-		}
-
-		m_oFont.UpdateSize(DEFAULT_FONT_SIZE, DEFAULT_FONT_SIZE);
+		pRenderer->put_BrushAlpha1(255);
 	}
 
 	bool CTSpan::UseExternalFont(const CSvgFile *pFile, double dX, double dY, IRenderer *pRenderer, CommandeMode oMode, const TSvgStyles *pOtherStyles, const CRenderedObject* pContexObject) const
@@ -381,30 +333,21 @@ namespace SVG
 		return true;
 	}
 
-	TBounds CTSpan::GetBounds(SvgMatrix* pTransform) const
+	TBounds CTSpan::GetBounds() const
 	{
 		TBounds oBounds;
 
 		oBounds.m_dLeft   = m_oX.ToDouble(NSCSS::Pixel);
+		oBounds.m_dTop    = m_oY.ToDouble(NSCSS::Pixel);
 		oBounds.m_dRight  = oBounds.m_dLeft + GetWidth();
-
-		oBounds.m_dBottom = m_oY.ToDouble(NSCSS::Pixel);
-		oBounds.m_dTop    = oBounds.m_dBottom + ((!m_oFont.GetSize().Empty()) ? m_oFont.GetSize().ToDouble(NSCSS::Pixel) : DEFAULT_FONT_SIZE);
-
-		if (nullptr != pTransform)
-		{
-			*pTransform += m_oTransformation.m_oTransform.GetMatrix();
-
-			pTransform->GetFinalValue().TransformPoint(oBounds.m_dLeft,  oBounds.m_dTop   );
-			pTransform->GetFinalValue().TransformPoint(oBounds.m_dRight, oBounds.m_dBottom);
-		}
+		oBounds.m_dBottom = oBounds.m_dTop  + m_oFont.GetSize().ToDouble(NSCSS::Pixel) * 72. / 25.4;
 
 		if (!m_arObjects.empty())
 		{
 			TBounds oTempBounds;
 			for (const CRenderedObject* pObject : m_arObjects)
 			{
-				oTempBounds = pObject->GetBounds(pTransform);
+				oTempBounds = pObject->GetBounds();
 				oBounds.m_dLeft   = std::min(oBounds.m_dLeft, oTempBounds.m_dLeft);
 				oBounds.m_dTop    = std::min(oBounds.m_dTop, oTempBounds.m_dTop);
 				oBounds.m_dRight  = std::max(oBounds.m_dRight, oTempBounds.m_dRight);
@@ -412,9 +355,6 @@ namespace SVG
 			}
 		}
 
-		if (nullptr != pTransform)
-			*pTransform -= m_oTransformation.m_oTransform.GetMatrix();
-
 		return oBounds;
 	}
 
@@ -424,7 +364,7 @@ namespace SVG
 			return 0.;
 
 		std::wstring wsName = DefaultFontFamily;
-		const double dSize = (!m_oFont.GetSize().Empty()) ? m_oFont.GetSize().ToDouble(NSCSS::Pixel) : DEFAULT_FONT_SIZE;
+		double dSize = m_oFont.GetSize().ToDouble(NSCSS::Pixel);
 
 		if (!m_oFont.GetFamily().Empty())
 		{
@@ -442,15 +382,11 @@ namespace SVG
 		if (m_oText.Underline())
 			nStyle |= (1 << 2);
 
-		double dWidth = 0;
-		if (NULL != m_pFontManager)
-		{
-			m_pFontManager->LoadFontByName(wsName, dSize, nStyle, 72., 72.);
+		m_pFontManager->LoadFontByName(wsName, dSize, nStyle, 72., 72.);
 
-			m_pFontManager->LoadString1(m_wsText, 0., 0.);
-			TBBox oBox = m_pFontManager->MeasureString2();
-			dWidth = oBox.fMaxX - oBox.fMinX;
-		}
+		m_pFontManager->LoadString1(m_wsText, 0., 0.);
+		TBBox oBox = m_pFontManager->MeasureString2();
+		double dWidth = oBox.fMaxX - oBox.fMinX;
 
 		for (const CTSpan* oTSpan : m_arObjects)
 			dWidth += oTSpan->GetWidth();
@@ -484,7 +420,7 @@ namespace SVG
 		dY = m_oY.ToDouble(NSCSS::Pixel, oBounds.m_dBottom - oBounds.m_dTop);
 	}
 
-	void CTSpan::Normalize(IRenderer *pRenderer, double &dX, double &dY, double &dFontHeight, Aggplus::CMatrix& oOldMatrix) const
+	void CTSpan::Normalize(IRenderer *pRenderer, double &dX, double &dY, double &dFontHeight) const
 	{
 		if (NULL == pRenderer)
 			return;
@@ -527,8 +463,6 @@ namespace SVG
 
 		pRenderer->GetTransform(&dM11, &dM12, &dM21, &dM22, &dDx, &dDy);
 
-		oOldMatrix.SetElements(dM11, dM12, dM21, dM22, dDx, dDy);
-
 		Aggplus::CMatrix oMatrix(dM11, dM12, dM21, dM22, dDx, dDy);
 
 		oMatrix.Scale(dXScale, dYScale);
@@ -542,33 +476,6 @@ namespace SVG
 		m_oY = oPosition.dY;
 	}
 
-	void CTSpan::SetPositionFromParent(CRenderedObject* pParent)
-	{
-		if (NULL == pParent)
-			return;
-
-		const TBounds oBounds{pParent->GetBounds()};
-
-		CTSpan *pTSpan = dynamic_cast<CTSpan*>(pParent);
-
-		if (NULL == pTSpan)
-			return;
-
-		m_oStyles = pTSpan->m_oStyles;
-
-		if (m_oX.Empty())
-		{
-			if (!pTSpan->m_arObjects.empty())
-				pTSpan = pTSpan->m_arObjects.back();
-
-			m_oX = pTSpan->m_oX.ToDouble(NSCSS::Pixel, oBounds.m_dRight - oBounds.m_dLeft) + pTSpan->GetWidth();
-		}
-
-		if (m_oY.Empty())
-			m_oY = pTSpan->m_oY;
-
-	}
-
 	std::vector<CTSpan> CTSpan::Split() const
 	{
 		std::vector<CTSpan> arGlyphs;
@@ -578,17 +485,25 @@ namespace SVG
 
 		for (unsigned int unIndex = 0; unIndex < m_wsText.length(); ++unIndex)
 		{
-			arGlyphs.push_back(CTSpan(m_wsText[unIndex], oPosition, m_pParent, m_pFontManager));
+			arGlyphs.push_back(CTSpan(std::wstring(1, m_wsText[unIndex]), oPosition, m_pParent, m_pFontManager, false));
 			oPosition.dX += arGlyphs[unIndex].GetWidth();
 		}
 
 		return arGlyphs;
 	}
 
-	CText::CText(CSvgReader& oReader, CRenderedObject *pParent, NSFonts::IFontManager* pFontManager)
-	    : CTSpan(oReader, pParent, pFontManager)
+	CText::CText(XmlUtils::CXmlNode &oNode, CRenderedObject *pParent, NSFonts::IFontManager *pFontManager)
+	    : CTSpan(oNode, pParent, pFontManager)
+	{}
+
+	CText *CText::Create(XmlUtils::CXmlNode &oNode, CRenderedObject *pParent, NSFonts::IFontManager *pFontManager)
 	{
-		m_oFont.UpdateSize(DEFAULT_FONT_SIZE, DEFAULT_FONT_SIZE);
+		CTSpan* pTSpan = dynamic_cast<CTSpan*>(pParent);
+
+		if (NULL != pTSpan)
+			return NULL;
+
+		return new CText(oNode, pParent, pFontManager);
 	}
 
 	bool CText::Draw(IRenderer *pRenderer, const CSvgFile *pFile, CommandeMode oMode, const TSvgStyles *pOtherStyles, const CRenderedObject* pContexObject) const
@@ -601,9 +516,20 @@ namespace SVG
 		return true;
 	}
 
-	CTextPath::CTextPath(CSvgReader& oReader, CRenderedObject *pParent, NSFonts::IFontManager* pFontManager)
-	    : CText(oReader, pParent, pFontManager)
+	CTextPath::CTextPath(XmlUtils::CXmlNode &oNode, CRenderedObject *pParent, NSFonts::IFontManager *pFontManager, const CSvgFile* pFile)
+	    : CText(oNode, pParent, pFontManager), m_pPath(NULL)
 	{
+		if (NULL != pFile)
+		{
+			std::wstring wsHref = oNode.GetAttribute(L"href", oNode.GetAttribute(L"xlink:href"));
+			size_t unPosition = wsHref.find(L'#');
+
+			if (std::wstring::npos != unPosition)
+				wsHref.erase(0, unPosition + 1);
+
+			m_pPath = dynamic_cast<const CPath*>(pFile->GetMarkedObject(wsHref));
+		}
+
 		if (NULL != pParent)
 		{
 			CTSpan *pTSpan = dynamic_cast<CTSpan*>(pParent);
@@ -613,32 +539,12 @@ namespace SVG
 		}
 	}
 
-	void CTextPath::SetAttribute(const std::string& sName, CSvgReader& oReader)
-	{
-		if ("href" == sName || "xlink:href" == sName)
-		{
-			m_wsHref = oReader.GetText();
-
-			size_t unPosition = m_wsHref.find(L'#');
-
-			if (std::wstring::npos != unPosition)
-				m_wsHref.erase(0, unPosition + 1);
-		}
-		else
-			CText::SetAttribute(sName, oReader);
-	}
-
 	bool CTextPath::Draw(IRenderer *pRenderer, const CSvgFile *pFile, CommandeMode oMode, const TSvgStyles *pOtherStyles, const CRenderedObject* pContexObject) const
 	{
-		if (NULL == pRenderer || CommandeModeClip == oMode || m_wsHref.empty() || NULL == pFile)
+		if (NULL == pRenderer || CommandeModeClip == oMode || NULL == m_pPath)
 			return false;
 
-		const CPath* pPath = dynamic_cast<const CPath*>(pFile->GetMarkedObject(m_wsHref));
-
-		if (NULL == pPath)
-			return false;
-
-		CMovingPath oMovingPath(pPath);
+		CMovingPath oMovingPath(m_pPath);
 
 		oMovingPath.Move(m_oX.ToDouble(NSCSS::Pixel));
 
@@ -660,6 +566,16 @@ namespace SVG
 
 	}
 
+	CTextPath* CTextPath::Create(XmlUtils::CXmlNode &oNode, CRenderedObject *pParent, NSFonts::IFontManager *pFontManager, const CSvgFile* pFile)
+	{
+		CTSpan *pTSpan = dynamic_cast<CText*>(pParent);
+
+		if (NULL == pTSpan)
+			return NULL;
+
+		return new CTextPath(oNode, pTSpan, pFontManager, pFile);
+	}
+
 	void CTextPath::DrawGlyph(CTSpan* pTSpan, CMovingPath &oMovingPath, IRenderer *pRenderer, const CSvgFile *pFile, CommandeMode oMode, const CRenderedObject* pContexObject) const
 	{
 		if (NULL == pTSpan)

DesktopEditor/raster/Metafile/svg/SvgObjects/CText.h

@@ -12,18 +12,15 @@ namespace SVG
 {
 	class CTSpan : public CRenderedObject, public CContainer<CTSpan>
 	{
-		friend class CObject;
-	protected:
-		CTSpan(CSvgReader& oReader, CRenderedObject* pParent = NULL, NSFonts::IFontManager* pFontManager = NULL, const Point& oPosition = {});
-		CTSpan(const CTSpan& oTSpan, double dX, const std::wstring& wsText);
-		CTSpan(wchar_t wChar, const Point& oPosition, CRenderedObject* pParent = NULL, NSFonts::IFontManager* pFontManager = NULL);
 	public:
+		CTSpan(XmlUtils::CXmlNode& oNode, CRenderedObject* pParent = NULL, NSFonts::IFontManager* pFontManager = NULL, bool bCheckText = true);
+		CTSpan(const std::wstring& wsText, const Point& oPosition, CRenderedObject* pParent = NULL, NSFonts::IFontManager* pFontManager = NULL, bool bCheckText = true);
 		virtual ~CTSpan();
 
-		void SetAttribute(const std::string& sName, CSvgReader& oReader) override;
-		void SetData(const std::map<std::wstring, std::wstring>& mAttributes, unsigned short ushLevel, bool bHardMode = false) override;
+		static CTSpan* Create(XmlUtils::CXmlNode& oNode, CRenderedObject* pParent = NULL, NSFonts::IFontManager* pFontManager = NULL);
+		static CTSpan* Create(const std::wstring& wsValue, const Point& oPosition, CRenderedObject* pParent = NULL, NSFonts::IFontManager* pFontManager = NULL, bool bCheckText = true);
 
-		void ReadChildrens(CSvgReader& oReader, CSvgFile* pSvgFile) override;
+		void SetData(const std::map<std::wstring, std::wstring>& mAttributes, unsigned short ushLevel, bool bHardMode = false) override;
 
 		bool Draw(IRenderer* pRenderer, const CSvgFile* pFile, CommandeMode oMode = CommandeModeDraw, const TSvgStyles* pOtherStyles = NULL, const CRenderedObject* pContexObject = NULL) const override;
 
@@ -32,23 +29,20 @@ namespace SVG
 		void InheritStyles(const CTSpan* pTSpan);
 	private:
 		void ApplyStyle(IRenderer* pRenderer, const TSvgStyles* pStyles, const CSvgFile* pFile, int& nTypePath, const CRenderedObject* pContexObject = NULL) const override;
-		void ApplyFont(IRenderer* pRenderer, double& dX, double& dY, Aggplus::CMatrix& oOldMatrix) const;
+		void ApplyFont(IRenderer* pRenderer, double& dX, double& dY) const;
 
-		void UpdateFontSize();
 		bool UseExternalFont(const CSvgFile* pFile, double dX, double dY, IRenderer* pRenderer, CommandeMode oMode = CommandeModeDraw, const TSvgStyles* pOtherStyles = NULL, const CRenderedObject* pContexObject = NULL) const;
 
-		TBounds GetBounds(SvgMatrix* pTransform = nullptr) const override;
+		TBounds GetBounds() const override;
 
 		double GetWidth() const;
 		void CorrectFontFamily(std::wstring& wsFontFamily) const;
 
 		void CalculatePosition(double& dX, double& dY) const;
 
-		void Normalize(IRenderer* pRenderer, double& dX, double& dY, double& dFontHeight, Aggplus::CMatrix& oOldMatrix) const;
+		void Normalize(IRenderer* pRenderer, double& dX, double& dY, double& dFontHeight) const;
 		void SetPosition(const Point& oPosition);
 
-		void SetPositionFromParent(CRenderedObject* pParent);
-
 		std::vector<CTSpan> Split() const;
 
 		NSFonts::IFontManager* m_pFontManager;
@@ -67,25 +61,26 @@ namespace SVG
 
 	class CText : public CTSpan
 	{
-		friend class CObject;
-	protected:
-		CText(CSvgReader& oReader, CRenderedObject* pParent = NULL, NSFonts::IFontManager* pFontManager = NULL);
 	public:
+		CText(XmlUtils::CXmlNode& oNode, CRenderedObject* pParent = NULL, NSFonts::IFontManager* pFontManager = NULL);
+
+		static CText* Create(XmlUtils::CXmlNode& oNode, CRenderedObject* pParent = NULL, NSFonts::IFontManager* pFontManager = NULL);
+
 		bool Draw(IRenderer* pRenderer, const CSvgFile* pFile, CommandeMode oMode = CommandeModeDraw, const TSvgStyles* pOtherStyles = NULL, const CRenderedObject* pContexObject = NULL) const override;
 	};
 
 	class CTextPath : public CText
 	{
-		friend class CObject;
-		CTextPath(CSvgReader& oReader, CRenderedObject* pParent = NULL, NSFonts::IFontManager* pFontManager = NULL);
 	public:
-		void SetAttribute(const std::string& sName, CSvgReader& oReader) override;
+		CTextPath(XmlUtils::CXmlNode& oNode, CRenderedObject* pParent = NULL, NSFonts::IFontManager* pFontManager = NULL, const CSvgFile* pFile = NULL);
 
 		bool Draw(IRenderer* pRenderer, const CSvgFile* pFile, CommandeMode oMode = CommandeModeDraw, const TSvgStyles* pOtherStyles = NULL, const CRenderedObject* pContexObject = NULL) const override;
+
+		static CTextPath* Create(XmlUtils::CXmlNode& oNode, CRenderedObject* pParent = NULL, NSFonts::IFontManager* pFontManager = NULL, const CSvgFile* pFile = NULL);
 	private:
 		void DrawGlyph(CTSpan* pTSpan, CMovingPath& oMovingPath, IRenderer* pRenderer, const CSvgFile* pFile, CommandeMode oMode, const CRenderedObject* pContexObject = NULL) const;
 
-		std::wstring m_wsHref;
+		const CPath        *m_pPath;
 	};
 }
 

DesktopEditor/raster/Metafile/svg/SvgObjects/CUse.cpp

@@ -3,29 +3,20 @@
 
 namespace SVG
 {
-	CUse::CUse(CSvgReader& oReader, CRenderedObject *pParent)
-		: CRenderedObject(oReader, pParent)
-	{}
+	CUse::CUse(XmlUtils::CXmlNode &oNode, CRenderedObject *pParent)
+		: CRenderedObject(oNode, pParent)
+	{
+		m_wsHref = oNode.GetAttribute(L"href", oNode.GetAttribute(L"xlink:href"));
+
+		m_oX     .SetValue(oNode.GetAttribute(L"x"));
+		m_oY     .SetValue(oNode.GetAttribute(L"y"));
+		m_oWidth .SetValue(oNode.GetAttribute(L"width"));
+		m_oHeight.SetValue(oNode.GetAttribute(L"height"));
+	}
 
 	CUse::~CUse()
 	{}
 
-	void CUse::SetAttribute(const std::string& sName, CSvgReader& oReader)
-	{
-		if ("x" == sName)
-			m_oX.SetValue(oReader.GetText());
-		else if ("y" == sName)
-			m_oY.SetValue(oReader.GetText());
-		else if ("width" == sName)
-			m_oWidth.SetValue(oReader.GetText());
-		else if ("height" == sName)
-			m_oHeight.SetValue(oReader.GetText());
-		else if ("href" == sName || "xlink:href" == sName)
-			m_wsHref = oReader.GetText();
-		else
-			CRenderedObject::SetAttribute(sName, oReader);
-	}
-
 	void CUse::SetData(const std::map<std::wstring, std::wstring> &mAttributes, unsigned short ushLevel, bool bHardMode)
 	{
 		CRenderedObject::SetData(mAttributes, ushLevel, bHardMode);
@@ -73,7 +64,7 @@ namespace SVG
 		return bResult;
 	}
 
-	TBounds CUse::GetBounds(SvgMatrix* pTransform) const
+	TBounds CUse::GetBounds() const
 	{
 		return TBounds{0., 0., 0., 0.};
 	}

DesktopEditor/raster/Metafile/svg/SvgObjects/CUse.h

@@ -8,18 +8,15 @@ namespace SVG
 {
 	class CUse : public CRenderedObject
 	{
-		friend class CObject;
-		CUse(CSvgReader& oReader, CRenderedObject* pParent = NULL);
 	public:
+		CUse(XmlUtils::CXmlNode& oNode, CRenderedObject* pParent = NULL);
 		virtual ~CUse();
 
-		void SetAttribute(const std::string& sName, CSvgReader& oReader) override;
-
 		void SetData(const std::map<std::wstring, std::wstring>& mAttributes, unsigned short ushLevel, bool bHardMode = false) override;
 
 		bool Draw(IRenderer* pRenderer, const CSvgFile* pFile, CommandeMode oMode = CommandeModeDraw, const TSvgStyles* pOtherStyles = NULL, const CRenderedObject* pContexObject = NULL) const override;
 	private:
-		TBounds GetBounds(SvgMatrix* pTransform = nullptr) const override;
+		TBounds GetBounds() const override;
 
 		CRenderedObject *m_pUsedObject;
 

DesktopEditor/raster/Metafile/svg/SvgReader.cpp

@@ -1,353 +0,0 @@
-#include "SvgReader.h"
-
-#include <cmath>
-#include <cctype>
-
-namespace SVG
-{
-int ConvertHexToInt(const std::string& sValue, const int& _default)
-{
-	if (sValue.empty() || "none" == sValue)
-		return _default;
-
-	std::string::const_iterator itStart = sValue.cbegin();
-
-	if ('#' == *itStart)
-		++itStart;
-
-	if (sValue.cend() - itStart != 6)
-		return _default;
-
-	itStart = sValue.cend() - 6;
-
-	int nResult = 0;
-
-	while (itStart != sValue.cend())
-	{
-		if ('0' <= *itStart && *itStart <= '9')
-			nResult = (nResult << 4) | (*itStart++ - '0');
-		else if ('A' <= *itStart && *itStart <= 'F')
-			nResult = (nResult << 4) | (*itStart++ - 'A' + 10);
-		else if ('a' <= *itStart && *itStart <= 'f')
-			nResult = (nResult << 4) | (*itStart++ - 'a' + 10);
-		else
-			return _default;
-	}
-
-	return nResult;
-}
-
-CSvgReader::CSvgReader()
-	: m_pReader(new XmlUtils::CXmlLiteReader), m_bParseAttribute(false)
-{}
-
-CSvgReader::~CSvgReader()
-{
-	if (nullptr != m_pReader)
-		delete m_pReader;
-}
-
-bool SVG::CSvgReader::ReadFromFile(const std::wstring& wsFilePath)
-{
-	return (nullptr != m_pReader) ? m_pReader->FromFile(wsFilePath) : false;
-}
-
-bool SVG::CSvgReader::ReadFromString(const std::wstring& wsSvg)
-{
-	if (nullptr != m_pReader && m_pReader->FromString(wsSvg))
-		return m_pReader->ReadNextNode();
-
-	return false;
-}
-
-// XmlUtils::CXmlLiteReader* CSvgReader::GetReader()
-// {
-// 	return m_pReader;
-// }
-
-unsigned int CSvgReader::GetDepth()
-{
-	return (nullptr != m_pReader) ? m_pReader->GetDepth() : 0;
-}
-
-bool CSvgReader::IsEmptyNode()
-{
-	return (nullptr != m_pReader) ? m_pReader->IsEmptyNode() : true;
-}
-
-bool CSvgReader::GetBool()
-{
-	return "1" == GetTextAValue(*this) || "true" == GetTextAValue(*this);
-}
-
-int StringToInt(const std::string& sValue, const int& _default)
-{
-	std::string::const_iterator itPos{sValue.cbegin()};
-
-	while (std::isspace(*itPos))
-		++itPos;
-
-	if (sValue.cend() == itPos)
-		return _default;
-
-	while (sValue.cend() != itPos && !std::isdigit(*itPos))
-		++itPos;
-
-	if (sValue.cend() == itPos)
-		return _default;
-
-	int nResult = 0;
-
-	while (itPos != sValue.cend() && std::isdigit(*itPos))
-	{
-		nResult = nResult * 10 + (*itPos - '0');
-		++itPos;
-	}
-
-	return ((nResult & 0xFF) << 16) | (((nResult >> 8)  & 0xFF) << 8) | ((nResult >> 16) & 0xFF);
-}
-
-int CSvgReader::GetColor(const int& nDefault)
-{
-	const std::string sValue{GetTextAValue(*this)};
-
-	if (sValue.empty())
-		return nDefault;
-
-	if ('#' == sValue[0])
-		return ConvertHexToInt(sValue, nDefault);
-
-	return StringToInt(sValue, nDefault);
-}
-
-int CSvgReader::GetInt()
-{
-	return GetIntValue(*this);
-}
-
-double CSvgReader::GetDouble()
-{
-	return GetDoubleValue(*this);
-}
-
-std::string CSvgReader::GetTextA()
-{
-	if (nullptr == m_pReader)
-		return std::string();
-
-	return (m_bParseAttribute) ? m_pReader->GetTextA() : m_pReader->GetText2A();
-}
-
-std::wstring CSvgReader::GetText()
-{
-	if (nullptr == m_pReader)
-		return std::wstring();
-
-	return (m_bParseAttribute) ? m_pReader->GetText() : m_pReader->GetText2();
-}
-
-const char* CSvgReader::GetTextChar()
-{
-	if (nullptr == m_pReader)
-		return "";
-
-	return m_pReader->GetTextChar();
-}
-
-template<typename T>
-T CSvgReader::GetAttribute(const std::string& sName, T _default, T (*GetValue)(CSvgReader&))
-{
-	if (!MoveToFirstAttribute())
-		return _default;
-
-	T oValue = _default;
-
-	do
-	{
-		if (sName == m_pReader->GetNameA())
-		{
-			oValue = GetValue(*this);
-			break;
-		}
-	}while(m_pReader->MoveToNextAttribute());
-
-	MoveToElement();
-
-	return oValue;
-}
-
-int CSvgReader::GetAttributeInt(const std::string& sName, int nDefault)
-{
-	return GetAttribute<int>(sName, nDefault, &GetIntValue);
-}
-
-bool CSvgReader::GetAttributeBool(const std::string& sName)
-{
-	return GetAttribute<bool>(sName, false, &GetBoolValue);
-}
-
-double CSvgReader::GetAttributeDouble(const std::string& sName)
-{
-	return GetAttribute<double>(sName, 0., &GetDoubleValue);
-}
-
-std::string CSvgReader::GetAttributeA(const std::string& sName)
-{
-	return GetAttribute<std::string>(sName, "", &GetTextAValue);
-}
-
-std::wstring CSvgReader::GetAttribute(const std::string& sName)
-{
-	return GetAttribute<std::wstring>(sName, L"", &GetTextValue);
-}
-
-bool CSvgReader::MoveToStart()
-{
-	if (nullptr != m_pReader && m_pReader->MoveToStart())
-		return m_pReader->ReadNextNode();
-
-	return false;
-}
-
-bool CSvgReader::MoveToFirstAttribute()
-{
-	if (nullptr == m_pReader || !m_pReader->MoveToFirstAttribute())
-		return false;
-
-	m_bParseAttribute = true;
-
-	return true;
-}
-
-bool CSvgReader::MoveToNextAttribute()
-{
-	return (nullptr != m_pReader) ? m_pReader->MoveToNextAttribute() : false;
-}
-
-bool CSvgReader::MoveToElement()
-{
-	if (nullptr == m_pReader || !m_pReader->MoveToElement())
-		return false;
-
-	m_bParseAttribute = false;
-
-	return true;
-}
-
-std::string CSvgReader::GetName()
-{
-	return (nullptr != m_pReader) ? m_pReader->GetNameA() : std::string();
-}
-
-std::wstring CSvgReader::GetNameW()
-{
-	return (nullptr != m_pReader) ? m_pReader->GetName() : std::wstring();
-}
-
-bool CSvgReader::ReadNextSiblingNode(unsigned int unDepth)
-{
-	return (nullptr != m_pReader) ? m_pReader->ReadNextSiblingNode(unDepth) : false;
-}
-
-bool CSvgReader::ReadNextNode()
-{
-	return (nullptr != m_pReader) ? m_pReader->ReadNextNode() : false;
-}
-
-bool CSvgReader::Read(XmlUtils::XmlNodeType& eNodeType)
-{
-	return (nullptr != m_pReader) ? m_pReader->Read(eNodeType) : false;
-}
-
-int CSvgReader::GetIntValue(CSvgReader& oXmlReader)
-{
-	return std::atoi(oXmlReader.GetTextA().c_str());
-}
-
-bool CSvgReader::GetBoolValue(CSvgReader& oXmlReader)
-{
-	return "1" == oXmlReader.GetTextA();
-}
-
-double CSvgReader::GetDoubleValue(CSvgReader& oXmlReader)
-{
-	const std::string sValue{oXmlReader.GetTextA()};
-	const char* pCur = sValue.c_str();
-
-	while (std::isspace(*pCur))
-		++pCur;
-
-	if (!pCur)
-		return 0.;
-
-	bool bNegative = false;
-
-	while ('-' == *pCur || '+' == *pCur)
-	{
-		if ('-' == *pCur)
-			bNegative = !bNegative;
-
-		++pCur;
-	}
-
-	if (!pCur)
-		return 0.;
-
-	double dResult = 0.;
-
-	while (std::isdigit(*pCur))
-		dResult = dResult * 10. + (*pCur++ - '0');
-
-	if (',' == *pCur || '.' == *pCur)
-	{
-		++pCur;
-
-		double dFraction = 0.0;
-		double dDivisor  = 1.0;
-
-		while (std::isdigit(*pCur))
-		{
-			dFraction = dFraction * 10. + (*pCur++ - '0');
-			dDivisor *= 10;
-		}
-
-		dResult += dFraction / dDivisor;
-	}
-
-	if ('e' == *pCur || 'E' == *pCur)
-	{
-		++pCur;
-
-		bool bExpNegative = false;
-		while ('-' == *pCur || '+' == *pCur)
-		{
-			if ('-' == *pCur)
-				bExpNegative = !bExpNegative;
-
-			++pCur;
-		}
-
-		int nExponent = 0;
-
-		while (std::isdigit(*pCur))
-			nExponent = nExponent * 10 + (*pCur++ - '0');
-
-		if (bExpNegative)
-			nExponent = -nExponent;
-
-		dResult *= std::pow(10., nExponent);
-	}
-
-	return bNegative ? -dResult : dResult;
-}
-
-std::string CSvgReader::GetTextAValue(CSvgReader& oXmlReader)
-{
-	return oXmlReader.GetTextA();
-}
-
-std::wstring CSvgReader::GetTextValue(CSvgReader& oXmlReader)
-{
-	return oXmlReader.GetText();
-}
-}

DesktopEditor/raster/Metafile/svg/SvgReader.h

@@ -1,114 +0,0 @@
-#ifndef SVGREADER_H
-#define SVGREADER_H
-
-#include "../../../xml/include/xmlutils.h"
-
-namespace SVG
-{
-class CSvgReader
-{
-	XmlUtils::CXmlLiteReader *m_pReader;
-
-	bool m_bParseAttribute;
-public:
-	CSvgReader();
-	~CSvgReader();
-
-	// XmlUtils::CXmlLiteReader* GetReader();
-	bool ReadFromFile(const std::wstring& wsFilePath);
-	bool ReadFromString(const std::wstring& wsSvg);
-
-	unsigned int GetDepth();
-	bool IsEmptyNode();
-
-	bool GetBool();
-	int GetColor(const int& nDefault = 0x000000);
-	int GetInt();
-	double GetDouble();
-	std::string GetTextA();
-	std::wstring GetText();
-	const char* GetTextChar();
-
-	int GetAttributeInt(const std::string& sName, int nDefault = 0);
-	bool GetAttributeBool(const std::string& sName);
-	double GetAttributeDouble(const std::string& sName);
-	std::string GetAttributeA(const std::string& sName);
-	std::wstring GetAttribute(const std::string& sName);
-
-	bool MoveToStart();
-
-	bool MoveToFirstAttribute();
-	bool MoveToNextAttribute();
-	bool MoveToElement();
-
-	std::string GetName();
-	std::wstring GetNameW();
-
-	bool ReadNextSiblingNode(unsigned int unDepth);
-	bool ReadNextNode();
-	bool Read(XmlUtils::XmlNodeType& eNodeType);
-private:
-	static int GetIntValue(CSvgReader& oXmlReader);
-	static bool GetBoolValue(CSvgReader& oXmlReader);
-	static double GetDoubleValue(CSvgReader& oXmlReader);
-	static std::string GetTextAValue(CSvgReader& oXmlReader);
-	static std::wstring GetTextValue(CSvgReader& oXmlReader);
-
-	template<typename T>
-	T GetAttribute(const std::string& sName, T _default, T (*GetValue)(CSvgReader& oXmlReader));
-};
-
-#define WHILE_READ_NEXT_NODE_WITH_DEPTH(xml_reader, name_depth)\
-	if (!xml_reader.IsEmptyNode())\
-	{\
-	const int n##name_depth = xml_reader.GetDepth();\
-	while (xml_reader.ReadNextSiblingNode(n##name_depth))\
-	{
-
-#define WHILE_READ_NEXT_NODE_WITH_DEPTH_AND_NAME(xml_reader, name_depth)\
-	if (!xml_reader.IsEmptyNode())\
-	{\
-	const int n##name_depth##Depth = xml_reader.GetDepth();\
-	std::string sNode##name_depth##Name;\
-	while (xml_reader.ReadNextSiblingNode(n##name_depth##Depth))\
-	{\
-		sNode##name_depth##Name = xml_reader.GetName();
-
-#define WHILE_READ_NEXT_NODE(xml_reader) WHILE_READ_NEXT_NODE_WITH_DEPTH(xml_reader, Depth)
-
-#define WHILE_READ_NEXT_NODE_WITH_NAME(xml_reader)\
-	if (!xml_reader.IsEmptyNode())\
-	{\
-	const int nDepth = xml_reader.GetDepth();\
-	std::string sNodeName;\
-	while (xml_reader.ReadNextSiblingNode(nDepth))\
-	{\
-		sNodeName = xml_reader.GetName();
-
-#define WHILE_READ_NEXT_NODE_WITH_DEPTH_ONE_NAME(xml_reader, name_depth, node_name)\
-	WHILE_READ_NEXT_NODE_WITH_DEPTH(xml_reader, name_depth)\
-		if (node_name != xml_reader.GetName())\
-			continue;
-
-#define WHILE_READ_NEXT_NODE_WITH_ONE_NAME(xml_reader, node_name) WHILE_READ_NEXT_NODE_WITH_DEPTH_ONE_NAME(xml_reader, Depth, node_name)
-
-#define END_WHILE } }
-
-#define ATTRIBUTE_NAME sAttributeName
-
-#define START_READ_ATTRIBUTES(xml_reader)\
-	if (xml_reader.MoveToFirstAttribute())\
-	{\
-		std::string ATTRIBUTE_NAME;\
-		do\
-		{\
-			ATTRIBUTE_NAME = xml_reader.GetName();
-
-#define END_READ_ATTRIBUTES(xml_reader)\
-	}\
-	while(xml_reader.MoveToNextAttribute());\
-	xml_reader.MoveToElement();\
-	}
-}
-
-#endif // SVGREADER_H