fix export to html of list preceded by text (#2276)

giuspen · May 21, 2023 · aa9525a · aa9525a
1 parent b486310
commit aa9525a
Showing 1 changed file with 14 additions and 4 deletions.
diff --git a/src/ct/ct_misc_utils.cc b/src/ct/ct_misc_utils.cc
@@ -433,6 +433,7 @@ void CtTextIterUtil::generic_process_slot(const CtConfig* const pCtConfig,
         curr_end_iter.forward_char();
     }
 
+    bool first_list_info_change{true};
     while (curr_end_iter.forward_char()) {
         if (curr_end_iter.compare(real_end_iter) >= 0) {
             break;
@@ -442,6 +443,18 @@ void CtTextIterUtil::generic_process_slot(const CtConfig* const pCtConfig,
             curr_list_info = CtList{pCtConfig, rTextBuffer}.get_paragraph_list_info(curr_end_iter);
             if (curr_list_info != prev_list_info) {
                 list_info_changed = true;
+                if (first_list_info_change) {
+                    first_list_info_change = false;
+                    if ((curr_end_iter.get_offset() - curr_start_iter.get_offset()) > 1) {
+                        // this means that we are not starting with a list item, there is non-list preceding
+                        curr_end_iter.backward_char();
+                        (void)CtTextIterUtil::rich_text_attributes_update(curr_end_iter, curr_attributes, delta_attributes);
+                        serialize_func(curr_start_iter, curr_end_iter, curr_attributes, &prev_list_info);
+                        for (auto& currDelta : delta_attributes) curr_attributes[currDelta.first] = currDelta.second;
+                        curr_start_iter = curr_end_iter;
+                        curr_end_iter.forward_char();
+                    }
+                }
                 prev_list_info = curr_list_info;
             }
         }
@@ -452,10 +465,7 @@ void CtTextIterUtil::generic_process_slot(const CtConfig* const pCtConfig,
             (list_info and last_was_newline and list_info_changed))
         {
             serialize_func(curr_start_iter, curr_end_iter, curr_attributes, &curr_list_info);
-
-            for (auto& currDelta : delta_attributes) {
-                curr_attributes[currDelta.first] = currDelta.second;
-            }
+            for (auto& currDelta : delta_attributes) curr_attributes[currDelta.first] = currDelta.second;
             curr_start_iter = curr_end_iter;
             if (list_info_changed) list_info_changed = false;
         }