From b9120f5c29ee797e376cfad8106a5ce1d0a847c8 Mon Sep 17 00:00:00 2001
From: Green <Kirill.Poljakov@onlyoffice.com>
Date: Tue, 3 Jun 2025 12:59:09 +0300
Subject: [PATCH] Improved styles for inserting code into md

---
 Common/3dParty/html/css/src/CCompiledStyle.cpp | 2 +-
 Common/3dParty/md/md2html.cpp                  | 5 ++---
 HtmlFile2/htmlfile2.cpp                        | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/Common/3dParty/html/css/src/CCompiledStyle.cpp b/Common/3dParty/html/css/src/CCompiledStyle.cpp
index e86d3404cc..aff4f9c69f 100644
--- a/Common/3dParty/html/css/src/CCompiledStyle.cpp
+++ b/Common/3dParty/html/css/src/CCompiledStyle.cpp
@@ -12,7 +12,7 @@
 #include "StaticFunctions.h"
 #include "ConstValues.h"
 
-#define DEFAULT_FONT_SIZE 14
+#define DEFAULT_FONT_SIZE 12
 
 namespace NSCSS
 {
diff --git a/Common/3dParty/md/md2html.cpp b/Common/3dParty/md/md2html.cpp
index de664a6d81..4a243e6c87 100644
--- a/Common/3dParty/md/md2html.cpp
+++ b/Common/3dParty/md/md2html.cpp
@@ -29,7 +29,7 @@ void WriteBaseHtmlStyles(NSFile::CFileBinary& oFile)
 	oFile.WriteStringUTF8(L"<style>");
 
 	// Main styles
-	oFile.WriteStringUTF8(L"* { font-family: Arial; }");
+	oFile.WriteStringUTF8(L"* { font-family: Arial; color:black; }");
 	oFile.WriteStringUTF8(L"p { margin: 0 0 10px; display: block; }");
 	oFile.WriteStringUTF8(L"a { color: #0553c1; text-decoration: underline; } a:visited { color: #954f72; text-decoration: underline; }");
 	oFile.WriteStringUTF8(L"ul { margin-top: 0; margin-bottom: 10px; }");
@@ -50,11 +50,10 @@ void WriteBaseHtmlStyles(NSFile::CFileBinary& oFile)
 
 	// Styles for code
 	oFile.WriteStringUTF8(L"code { padding: 2px 4px; font-size: 90%; color: #c7254e; background-color: #f9f2f4; border-radius: 4px; }");
-	oFile.WriteStringUTF8(L"pre code { padding: 0px; white-space: pre-wrap; background-color: transparent; border-radius: 0; color: inherit; }");
+	oFile.WriteStringUTF8(L"pre code { padding: 0px; white-space: pre-wrap; border-radius: 0; background-color: #f5f5f5; color:black; }");
 	oFile.WriteStringUTF8(L"pre { display: block; padding: 9.5px; margin: 0 0 10px; line-height: 1.4; word-break: break-all; word-wrap: break-word; background-color: #f5f5f5; border: 1px solid #ccc; border-radius: 4px; font-size: 1em; }");
 	oFile.WriteStringUTF8(L"code, pre { font-family: Menlo, Monaco, Consolas, \"Courier New\", monospace; }");
 
-
 	// Styles for headings
 	oFile.WriteStringUTF8(L"h1 { font-size: 20pt; color: #0f4761; margin-top: 18pt; margin-bottom: 4pt; }");
 	oFile.WriteStringUTF8(L"h2 { font-size: 16pt; color: #0f4761; margin-top: 8pt; margin-bottom: 4pt; }");
diff --git a/HtmlFile2/htmlfile2.cpp b/HtmlFile2/htmlfile2.cpp
index 775c7fec8c..6cbb124174 100644
--- a/HtmlFile2/htmlfile2.cpp
+++ b/HtmlFile2/htmlfile2.cpp
@@ -2403,6 +2403,7 @@ private:
 		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;
@@ -2619,7 +2620,6 @@ private:
 
 		CTextSettings oTSR(oTS);
 		oTSR.oAdditionalStyle.m_oFont.SetFamily(L"Courier New", UINT_MAX, true);
-		oTSR.oAdditionalStyle.m_oFont.SetSize(20, UINT_MAX, true);
 
 		return readStream(pXml, arSelectors, oTSR);
 	}