diff --git a/Common/3dParty/html/css/src/CCompiledStyle.cpp b/Common/3dParty/html/css/src/CCompiledStyle.cpp
index aff4f9c69f..3340ba64bc 100644
--- a/Common/3dParty/html/css/src/CCompiledStyle.cpp
+++ b/Common/3dParty/html/css/src/CCompiledStyle.cpp
@@ -444,6 +444,11 @@ namespace NSCSS
 					m_oDisplay.SetVAlign(pPropertie.second, unLevel, bHardMode);
 					break;
 				}
+				CASE(L"white-space"):
+				{
+					m_oDisplay.SetWhiteSpace(pPropertie.second, unLevel, bHardMode);
+					break;
+				}
 				//TRANSFORM
 				CASE(L"transform"):
 				{
diff --git a/Common/3dParty/html/css/src/CCssCalculator_Private.cpp b/Common/3dParty/html/css/src/CCssCalculator_Private.cpp
index c15e55a36d..df8064ab50 100644
--- a/Common/3dParty/html/css/src/CCssCalculator_Private.cpp
+++ b/Common/3dParty/html/css/src/CCssCalculator_Private.cpp
@@ -692,6 +692,16 @@ namespace NSCSS
 			FindPrevAndKindElements(pFoundName, arNextNodes, arFindedElements, wsName, arClasses);
 		}
 
+		const CElement* pFoundAll = m_oStyleStorage.FindElement(L"*");
+
+		if (nullptr != pFoundAll)
+		{
+			if (!pFoundAll->Empty())
+				arFindedElements.push_back(pFoundAll);
+
+			FindPrevAndKindElements(pFoundAll, arNextNodes, arFindedElements, wsName, arClasses);
+		}
+
 		if (arFindedElements.size() > 1)
 		{
 			std::sort(arFindedElements.rbegin(), arFindedElements.rend(),
diff --git a/Common/3dParty/html/css/src/StyleProperties.cpp b/Common/3dParty/html/css/src/StyleProperties.cpp
index f94118dbd8..111cba1147 100644
--- a/Common/3dParty/html/css/src/StyleProperties.cpp
+++ b/Common/3dParty/html/css/src/StyleProperties.cpp
@@ -1328,7 +1328,14 @@ namespace NSCSS
 
 	// DISPLAY
 	CDisplay::CDisplay()
-	{}
+	{
+		m_eWhiteSpace.SetMapping({{L"normal",   EWhiteSpace::Normal  },
+		                          {L"nowrap",   EWhiteSpace::Nowrap  },
+		                          {L"pre",      EWhiteSpace::Pre     },
+		                          {L"pre-line", EWhiteSpace::Pre_Line},
+		                          {L"pre-wrap", EWhiteSpace::Pre_Wrap}},
+		                                        EWhiteSpace::Normal);
+	}
 
 	void CDisplay::Equation(CDisplay &oFirstDisplay, CDisplay &oSecondDisplay)
 	{
@@ -1341,6 +1348,8 @@ namespace NSCSS
 		CString::Equation(oFirstDisplay.m_oHAlign, oSecondDisplay.m_oHAlign);
 
 		CString::Equation(oFirstDisplay.m_oDisplay, oSecondDisplay.m_oDisplay);
+
+		CEnum::Equation(oFirstDisplay.m_eWhiteSpace, oSecondDisplay.m_eWhiteSpace);
 	}
 
 	bool CDisplay::SetX(const std::wstring &wsValue, unsigned int unLevel, bool bHardMode)
@@ -1404,6 +1413,11 @@ namespace NSCSS
 		return m_oDisplay.SetValue(wsValue, NSConstValues::DISPLAY_VALUES, unLevel, bHardMode);
 	}
 
+	bool CDisplay::SetWhiteSpace(const std::wstring& wsValue, unsigned int unLevel, bool bHardMode)
+	{
+		return m_eWhiteSpace.SetValue(wsValue, unLevel, bHardMode);
+	}
+
 	const CDigit& CDisplay::GetX() const
 	{
 		return m_oX;
@@ -1439,34 +1453,42 @@ namespace NSCSS
 		return m_oDisplay;
 	}
 
+	const CEnum& CDisplay::GetWhiteSpace() const
+	{
+		return m_eWhiteSpace;
+	}
+
 	bool CDisplay::Empty() const
 	{
 		return m_oX.Empty() && m_oY.Empty() && m_oWidth.Empty() && m_oHeight.Empty() &&
-		       m_oHeight.Empty() && m_oVAlign.Empty() && m_oDisplay.Empty();
+		       m_oHeight.Empty() && m_oVAlign.Empty() && m_oDisplay.Empty() &&
+		       (m_eWhiteSpace.Empty() || m_eWhiteSpace == EWhiteSpace::Normal);
 	}
 
 	CDisplay &CDisplay::operator+=(const CDisplay &oDisplay)
 	{
-		m_oX       += oDisplay.m_oX;
-		m_oY       += oDisplay.m_oY;
-		m_oWidth   = oDisplay.m_oWidth;
-		m_oHeight  = oDisplay.m_oHeight;
-		m_oHAlign  += oDisplay.m_oHAlign;
-		m_oVAlign  += oDisplay.m_oVAlign;
-		m_oDisplay += oDisplay.m_oDisplay;
+		m_oX          += oDisplay.m_oX;
+		m_oY          += oDisplay.m_oY;
+		m_oWidth       = oDisplay.m_oWidth;
+		m_oHeight      = oDisplay.m_oHeight;
+		m_oHAlign     += oDisplay.m_oHAlign;
+		m_oVAlign     += oDisplay.m_oVAlign;
+		m_oDisplay    += oDisplay.m_oDisplay;
+		m_eWhiteSpace += oDisplay.m_eWhiteSpace;
 
 		return *this;
 	}
 
 	bool CDisplay::operator==(const CDisplay &oDisplay) const
 	{
-		return m_oX       == oDisplay.m_oX      &&
-		       m_oY       == oDisplay.m_oY      &&
-		       m_oWidth   == oDisplay.m_oWidth  &&
-		       m_oHeight  == oDisplay.m_oHeight &&
-		       m_oHAlign  == oDisplay.m_oHAlign &&
-		       m_oVAlign  == oDisplay.m_oVAlign &&
-		       m_oDisplay == oDisplay.m_oDisplay;
+		return m_oX          == oDisplay.m_oX       &&
+		       m_oY          == oDisplay.m_oY       &&
+		       m_oWidth      == oDisplay.m_oWidth   &&
+		       m_oHeight     == oDisplay.m_oHeight  &&
+		       m_oHAlign     == oDisplay.m_oHAlign  &&
+		       m_oVAlign     == oDisplay.m_oVAlign  &&
+		       m_oDisplay    == oDisplay.m_oDisplay &&
+		       m_eWhiteSpace == oDisplay.m_eWhiteSpace.ToInt();
 	}
 
 	// STROKE
diff --git a/Common/3dParty/html/css/src/StyleProperties.h b/Common/3dParty/html/css/src/StyleProperties.h
index 2fa1ce1935..e85c6980e8 100644
--- a/Common/3dParty/html/css/src/StyleProperties.h
+++ b/Common/3dParty/html/css/src/StyleProperties.h
@@ -328,6 +328,15 @@ namespace NSCSS
 	};
 
 	// PROPERTIES
+	typedef enum
+	{
+		Normal,
+		Nowrap,
+		Pre,
+		Pre_Line,
+		Pre_Wrap
+	} EWhiteSpace;
+
 	class CDisplay
 	{
 	public:
@@ -347,6 +356,8 @@ namespace NSCSS
 
 		bool SetDisplay(const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
 
+		bool SetWhiteSpace(const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
+
 		const CDigit& GetX()      const;
 		const CDigit& GetY()      const;
 		const CDigit& GetWidth()  const;
@@ -357,6 +368,8 @@ namespace NSCSS
 
 		const CString& GetDisplay() const;
 
+		const CEnum& GetWhiteSpace() const;
+
 		bool Empty() const;
 
 		CDisplay& operator+=(const CDisplay& oDisplay);
@@ -371,6 +384,8 @@ namespace NSCSS
 		CString m_oVAlign;
 
 		CString m_oDisplay;
+
+		CEnum m_eWhiteSpace;
 	};
 
 	class CStroke
diff --git a/Common/3dParty/md/md2html.cpp b/Common/3dParty/md/md2html.cpp
index 4a243e6c87..d3be666e7f 100644
--- a/Common/3dParty/md/md2html.cpp
+++ b/Common/3dParty/md/md2html.cpp
@@ -29,7 +29,7 @@ void WriteBaseHtmlStyles(NSFile::CFileBinary& oFile)
 	oFile.WriteStringUTF8(L"<style>");
 
 	// Main styles
-	oFile.WriteStringUTF8(L"* { font-family: Arial; color:black; }");
+	oFile.WriteStringUTF8(L"* { font-family: Arial; color:black; white-space:pre; }");
 	oFile.WriteStringUTF8(L"p { margin: 0 0 10px; display: block; }");
 	oFile.WriteStringUTF8(L"a { color: #0553c1; text-decoration: underline; } a:visited { color: #954f72; text-decoration: underline; }");
 	oFile.WriteStringUTF8(L"ul { margin-top: 0; margin-bottom: 10px; }");
diff --git a/HtmlFile2/htmlfile2.cpp b/HtmlFile2/htmlfile2.cpp
index 6cbb124174..0809c630f8 100644
--- a/HtmlFile2/htmlfile2.cpp
+++ b/HtmlFile2/htmlfile2.cpp
@@ -2384,7 +2384,30 @@ private:
 
 		std::wstring sText = m_oLightReader.GetText();
 
-		if (sText.end() == std::find_if_not(sText.begin(), sText.end(), [](wchar_t wchChar){ return iswspace(wchChar) && 0xa0 != wchChar;}))
+		if (sText.empty())
+			return false;
+
+		m_oStylesCalculator.CalculateCompiledStyle(arSelectors);
+
+		bool bPre = oTS.bPre;
+
+		if (!bPre && nullptr != arSelectors.back().m_pCompiledStyle)
+		{
+			NSCSS::CCompiledStyle* pCompiledStyle{arSelectors.back().m_pCompiledStyle};
+
+			// TODO::поведение должно быть немного разное (реализовать)
+			switch(pCompiledStyle->m_oDisplay.GetWhiteSpace().ToInt())
+			{
+				case NSCSS::NSProperties::EWhiteSpace::Pre:
+				case NSCSS::NSProperties::EWhiteSpace::Pre_Wrap:
+				case NSCSS::NSProperties::EWhiteSpace::Pre_Line:
+					bPre = true;
+				default:
+					break;
+			}
+		}
+
+		if (!bPre && sText.end() == std::find_if_not(sText.begin(), sText.end(), [](wchar_t wchChar){ return iswspace(wchChar) && 0xa0 != wchChar;}))
 			return false;
 
 		if(oTS.bBdo)
@@ -2392,23 +2415,14 @@ private:
 
 		const bool bInT = m_oState.m_bInT;
 
-		if (oTS.bPre)
-		{
-			CloseT(pXml);
-			CloseR(pXml);
-		}
-
 		GetSubClass(pXml, arSelectors);
 
-		if (oTS.bAddSpaces && m_oState.m_bInP && !m_oState.m_bInR && !iswspace(sText.front()) && !m_oState.m_bWasSpace && CTextSettings::Normal == oTS.eTextMode)
-			WriteSpace(pXml);
-
 		//TODO:: сделать так, чтобы параграф (со своими стилями) открывался при чтении сооответствующей ноды, а не при чтении текста
 		OpenP(pXml);
 
 		NSStringUtils::CStringBuilder oPPr;
 
-		std::wstring sPStyle = wrP(&oPPr, arSelectors, oTS);
+		const std::wstring sPStyle = wrP(&oPPr, arSelectors, oTS);
 
 		WriteToStringBuilder(oPPr, *pXml);
 
@@ -2428,89 +2442,79 @@ private:
 		if (oTS.bQ)
 			pXml->WriteString(L"<w:t xml:space=\"preserve\">&quot;</w:t>");
 
-		if(oTS.bPre)
+		if (!bPre && oTS.bAddSpaces && m_oState.m_bInP && !m_oState.m_bInR && !iswspace(sText.front()) && !iswpunct(sText.front()) && !m_oState.m_bWasSpace && CTextSettings::Normal == oTS.eTextMode)
+			WriteSpace(pXml);
+
+		if(bPre)
 		{
-			if (L'\n' == sText.front() || L'\r' == sText.front())
-				sText.erase(0, 1);
+			size_t unBegin = 0, unEnd = sText.find_first_of(L"\n\r\t");
 
-			size_t nAfter = sText.find_first_of(L"\n\r\t");
-			while(nAfter != std::wstring::npos)
+			while (std::wstring::npos != unBegin)
 			{
-				if (L'\t' == sText[0])
+				if (OpenR(pXml))
 				{
-					pXml->WriteString(L"<w:tab/>");
-					sText.erase(0, 1);
-
-					if (0 == nAfter)
-					{
-						nAfter = sText.find_first_of(L"\n\r\t");
-						continue;
-					}
-
-					nAfter--;
+					pXml->WriteString(L"<w:test/>");
+					WriteToStringBuilder(oRPr, *pXml);
 				}
 
 				OpenT(pXml);
-				pXml->WriteEncodeXmlString(sText.c_str(), nAfter);
-				CloseT(pXml);
-				CloseR(pXml);
-
-				if (L'\t' == sText[nAfter])
+				if (unEnd == std::wstring::npos)
 				{
-					sText.erase(0, nAfter);
-					nAfter = 1;
+					pXml->WriteEncodeXmlString(sText.c_str() + unBegin, sText.length() - unBegin);
+					break;
 				}
-				else
-				{
-					CloseP(pXml, arSelectors);
-					OpenP(pXml);
-					WriteToStringBuilder(oPPr, *pXml);
-					sText.erase(0, nAfter + 1);
-					nAfter = 0;
-				}
-				OpenR(pXml);
-				WriteToStringBuilder(oRPr, *pXml);
-				nAfter = sText.find_first_of(L"\n\r\t", nAfter);
-			}
 
-			if (sText.empty())
-			{
-				arSelectors.pop_back();
-				return true;
+				if (unBegin != unEnd)
+				{
+					pXml->WriteEncodeXmlString(sText.c_str() + unBegin, unEnd - unBegin);
+					CloseT(pXml);
+				}
+
+				if (L'\n' == sText[unEnd])
+				{
+					pXml->WriteString(L"<w:br/>");
+				}
+				else if (L'\t' == sText[unEnd])
+				{
+					pXml->WriteString(L"<w:tab/>");
+				}
+
+				unBegin = unEnd + 1;
+				unEnd = sText.find_first_of(L"\n\r\t", unBegin);
 			}
 		}
 		else
+		{
 			ReplaceSpaces(sText);
 
-		if (!sText.empty() && L'\t' == sText[0])
-		{
-			pXml->WriteString(L"<w:tab/>");
-			sText.erase(0, 1);
-		}
+			if (!sText.empty() && L'\t' == sText[0])
+			{
+				pXml->WriteString(L"<w:tab/>");
+				sText.erase(0, 1);
+			}
 
-		if (!oTS.bPre && !sText.empty() && std::iswspace(sText.front()) && m_oState.m_bWasSpace)
-			sText.erase(0, 1);
+			if (!sText.empty() && std::iswspace(sText.front()) && m_oState.m_bWasSpace)
+				sText.erase(0, 1);
 
-		if (!sText.empty())
-		{
 			OpenT(pXml);
 
-			if (oTS.bMergeText && !m_oState.m_bWasSpace && bInT && !oTS.bPre)
+			if (oTS.bMergeText && !m_oState.m_bWasSpace && bInT && !bPre)
 				pXml->WriteEncodeXmlString(L" ");
 
-			m_oState.m_bWasSpace = std::iswspace(sText.back());
-
-			pXml->WriteEncodeXmlString(sText);
+			if (!sText.empty())
+			{
+				m_oState.m_bWasSpace = std::iswspace(sText.back());
+				pXml->WriteEncodeXmlString(sText);
+			}
 		}
 
 		if (oTS.bQ)
 			pXml->WriteString(L"<w:t xml:space=\"preserve\">&quot;</w:t>");
 
+		CloseT(pXml);
+
 		if (!oTS.bMergeText)
-		{
-			CloseT(pXml);
 			CloseR(pXml);
-		}
 
 		arSelectors.pop_back();
 		return true;
@@ -2760,7 +2764,10 @@ private:
 		if (NULL == pXml || arSelectors.empty() || arSelectors.back().m_wsClass == L"MsoFootnoteReference")
 			return false;
 
-		return readStream(pXml, arSelectors, oTS);
+		CTextSettings oTSR(oTS);
+		oTSR.bAddSpaces = false;
+
+		return readStream(pXml, arSelectors, oTSR);
 	}
 
 	bool ReadNobr(NSStringUtils::CStringBuilder* pXml, std::vector<NSCSS::CNode>& arSelectors, CTextSettings& oTS)
@@ -4098,6 +4105,8 @@ private:
 		{
 			if (m_oState.m_bInHyperlink)
 			{
+				CloseT(oXml);
+				CloseR(oXml);
 				oXml->WriteString(L"</w:hyperlink>");
 				m_oState.m_bInHyperlink = false;
 			}