From 90977bba7adda1d6467d29df8a7f25787cf4b564 Mon Sep 17 00:00:00 2001
From: even1024 <roman.porozhnetov@gmail.com>
Date: Fri, 23 Feb 2024 11:02:00 +0100
Subject: [PATCH 1/2] line cr

---
 .../molecule/src/molecule_cdxml_loader.cpp    | 71 ++++++++++---------
 1 file changed, 38 insertions(+), 33 deletions(-)

diff --git a/core/indigo-core/molecule/src/molecule_cdxml_loader.cpp b/core/indigo-core/molecule/src/molecule_cdxml_loader.cpp
index ddd5971cd8..6c757f4dae 100644
--- a/core/indigo-core/molecule/src/molecule_cdxml_loader.cpp
+++ b/core/indigo-core/molecule/src/molecule_cdxml_loader.cpp
@@ -1220,51 +1220,56 @@ void MoleculeCdxmlLoader::_parseText(CDXElement elem, std::vector<std::pair<Vec3
     for (auto text_style = elem.firstChildElement(); text_style.hasContent(); text_style = text_style.nextSiblingElement())
     {
         std::string text_element = text_style.name();
-        auto& ket_text_line = ket_text_lines.back();
         if (text_element == "s")
         {
-            std::string label_part = text_style.getText();
-            if (label_part == "+")
+            std::string style_text = text_style.getText();
+            if (style_text == "+")
             {
                 _pluses.push_back(text_bbox.center());
                 return;
             }
 
-            ket_text_line.text_styles.emplace_back();
-            auto& ket_text_style = ket_text_line.text_styles.back();
+            auto lines = split(style_text, '\n');
+            for (int i = 0; i < lines.size(); ++i)
+            {
+                const auto& label_part = lines[i];
+                auto& ket_text_line = ket_text_lines.back();
+                ket_text_line.text_styles.emplace_back();
+                auto& ket_text_style = ket_text_line.text_styles.back();
 
-            auto initial_size = label_part.size();
-            label_part.erase(std::remove_if(label_part.begin(), label_part.end(), [](auto ch) { return (ch == '\n' || ch == '\r'); }), label_part.end());
-            if (initial_size > label_part.size()) // line break
-                ket_text_lines.emplace_back();
+                auto initial_size = label_part.size();
 
-            ket_text_style.offset = ket_text_line.text.size();
-            ket_text_style.size = label_part.size();
-            ket_text_line.text += label_part;
+                ket_text_style.offset = ket_text_line.text.size();
+                ket_text_style.size = label_part.size();
+                ket_text_line.text += label_part;
 
-            font_face = 0;
-            font_size = 0.0;
-            auto style = text_style.firstProperty();
-            applyDispatcher(style, style_dispatcher);
+                font_face = 0;
+                font_size = 0.0;
+                auto style = text_style.firstProperty();
+                applyDispatcher(style, style_dispatcher);
 
-            CDXMLFontStyle fs(font_face);
-            if (font_face == KCDXMLChemicalFontStyle)
-            {
-                // special case
-            }
-            else
-            {
-                if (fs.is_bold)
-                    ket_text_style.styles.push_back(KETFontBoldStr);
-                if (fs.is_italic)
-                    ket_text_style.styles.push_back(KETFontItalicStr);
-                if (fs.is_superscript)
-                    ket_text_style.styles.push_back(KETFontSuperscriptStr);
-                if (fs.is_subscript)
-                    ket_text_style.styles.push_back(KETFontSubscriptStr);
+                CDXMLFontStyle fs(font_face);
+                if (font_face == KCDXMLChemicalFontStyle)
+                {
+                    // special case
+                }
+                else
+                {
+                    if (fs.is_bold)
+                        ket_text_style.styles.push_back(KETFontBoldStr);
+                    if (fs.is_italic)
+                        ket_text_style.styles.push_back(KETFontItalicStr);
+                    if (fs.is_superscript)
+                        ket_text_style.styles.push_back(KETFontSuperscriptStr);
+                    if (fs.is_subscript)
+                        ket_text_style.styles.push_back(KETFontSubscriptStr);
+                }
+                if (font_size > 0 && (int)font_size != KETDefaultFontSize)
+                    ket_text_style.styles.push_back(std::string(KETFontCustomSizeStr) + "_" + std::to_string((int)ceil(font_size)) + "px");
+
+                if (i < lines.size() - 1)
+                    ket_text_lines.emplace_back();
             }
-            if (font_size > 0 && (int)font_size != KETDefaultFontSize)
-                ket_text_style.styles.push_back(std::string(KETFontCustomSizeStr) + "_" + std::to_string((int)ceil(font_size)) + "px");
         }
     }
 

From c95357159f4f034b9bac20a835f955509d085f54 Mon Sep 17 00:00:00 2001
From: even1024 <roman.porozhnetov@gmail.com>
Date: Fri, 23 Feb 2024 11:36:07 +0100
Subject: [PATCH 2/2] line cr

---
 core/indigo-core/molecule/src/molecule_cdxml_loader.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/indigo-core/molecule/src/molecule_cdxml_loader.cpp b/core/indigo-core/molecule/src/molecule_cdxml_loader.cpp
index 6c757f4dae..eed093647a 100644
--- a/core/indigo-core/molecule/src/molecule_cdxml_loader.cpp
+++ b/core/indigo-core/molecule/src/molecule_cdxml_loader.cpp
@@ -1230,7 +1230,7 @@ void MoleculeCdxmlLoader::_parseText(CDXElement elem, std::vector<std::pair<Vec3
             }
 
             auto lines = split(style_text, '\n');
-            for (int i = 0; i < lines.size(); ++i)
+            for (auto i = 0; i < lines.size(); ++i)
             {
                 const auto& label_part = lines[i];
                 auto& ket_text_line = ket_text_lines.back();