From ad8eac98c1468b30c17c339e79b84c37a7b15517 Mon Sep 17 00:00:00 2001
From: Titus Wormer <tituswormer@gmail.com>
Date: Wed, 13 Jul 2022 10:40:11 +0200
Subject: Fix to close containers before several (blank) line endings

---
 src/compiler.rs         | 23 ++++++++++++-----------
 src/content/document.rs | 24 +++++++++++++++++-------
 2 files changed, 29 insertions(+), 18 deletions(-)

(limited to 'src')

diff --git a/src/compiler.rs b/src/compiler.rs
index 2d42011..4b38c8d 100644
--- a/src/compiler.rs
+++ b/src/compiler.rs
@@ -241,6 +241,7 @@ struct CompileContext<'a> {
     pub tight_stack: Vec<bool>,
     /// Fields used to influance the current compilation.
     pub slurp_one_line_ending: bool,
+    pub slurp_all_line_endings: bool,
     pub tags: bool,
     pub ignore_encode: bool,
     pub last_was_tag: bool,
@@ -275,6 +276,7 @@ impl<'a> CompileContext<'a> {
             definitions: HashMap::new(),
             tight_stack: vec![],
             slurp_one_line_ending: false,
+            slurp_all_line_endings: false,
             tags: true,
             ignore_encode: false,
             last_was_tag: false,
@@ -381,7 +383,6 @@ impl<'a> CompileContext<'a> {
 /// Turn events and codes into a string of HTML.
 #[allow(clippy::too_many_lines)]
 pub fn compile(events: &[Event], codes: &[Code], options: &Options) -> String {
-    // let slurp_all_line_endings = false;
     let mut index = 0;
     let mut line_ending_inferred: Option<LineEnding> = None;
 
@@ -718,7 +719,7 @@ fn on_enter_paragraph(context: &mut CompileContext) {
         context.tag("<p>".to_string());
     }
 
-    // context.slurp_all_line_endings = false;
+    context.slurp_all_line_endings = false;
 }
 
 /// Handle [`Enter`][EventType::Enter]:[`Resource`][Token::Resource].
@@ -784,7 +785,7 @@ fn on_exit_block_quote(context: &mut CompileContext) {
     context.tight_stack.pop();
     context.line_ending_if_needed();
     context.tag("</blockquote>".to_string());
-    // context.slurp_all_line_endings = false;
+    context.slurp_all_line_endings = false;
 }
 
 /// Handle [`Exit`][EventType::Exit]:[`CharacterReferenceMarker`][Token::CharacterReferenceMarker].
@@ -1074,10 +1075,9 @@ fn on_exit_label_text(context: &mut CompileContext) {
 
 /// Handle [`Exit`][EventType::Exit]:[`LineEnding`][Token::LineEnding].
 fn on_exit_line_ending(context: &mut CompileContext) {
-    // if context.slurp_all_line_endings {
-    //     // Empty.
-    // } else
-    if context.slurp_one_line_ending {
+    if context.slurp_all_line_endings {
+        // Empty.
+    } else if context.slurp_one_line_ending {
         context.slurp_one_line_ending = false;
     } else {
         context.push(context.encode_opt(&serialize(
@@ -1156,7 +1156,9 @@ fn on_exit_media(context: &mut CompileContext) {
 fn on_exit_paragraph(context: &mut CompileContext) {
     let tight = context.tight_stack.last().unwrap_or(&false);
 
-    if !tight {
+    if *tight {
+        context.slurp_all_line_endings = true;
+    } else {
         context.tag("</p>".to_string());
     }
 }
@@ -1281,13 +1283,12 @@ fn on_exit_list_item_value(context: &mut CompileContext) {
 
 /// To do.
 fn on_exit_list_item(context: &mut CompileContext) {
-    //  && !context.slurp_all_line_endings
-    if context.last_was_tag {
+    if context.last_was_tag && !context.slurp_all_line_endings {
         context.line_ending_if_needed();
     }
 
     context.tag("</li>".to_string());
-    // context.slurp_all_line_endings = false;
+    context.slurp_all_line_endings = false;
 }
 
 /// To do.
diff --git a/src/content/document.rs b/src/content/document.rs
index 27fb73d..7f8a116 100644
--- a/src/content/document.rs
+++ b/src/content/document.rs
@@ -410,6 +410,7 @@ fn flow_end(
             let mut index = 0;
 
             let add = info.inject[line_index].0.clone();
+            let mut first_line_ending_in_run: Option<usize> = None;
             map.add(0, 0, add);
 
             while index < tokenizer.events.len() {
@@ -419,19 +420,28 @@ fn flow_end(
                     || event.token_type == Token::BlankLineEnding
                 {
                     if event.event_type == EventType::Enter {
+                        first_line_ending_in_run = first_line_ending_in_run.or(Some(index));
                         let mut add = info.inject[line_index].1.clone();
-                        let mut deep_index = 0;
-                        while deep_index < add.len() {
-                            add[deep_index].point = event.point.clone();
-                            add[deep_index].index = event.index;
-                            deep_index += 1;
+                        let mut index = 0;
+                        while index < add.len() {
+                            add[index].point = event.point.clone();
+                            add[index].index = event.index;
+                            index += 1;
+                        }
+                        if !add.is_empty() {
+                            map.add(first_line_ending_in_run.unwrap(), 0, add);
                         }
-                        map.add(index, 0, add);
                     } else {
                         line_index += 1;
                         let add = info.inject[line_index].0.clone();
-                        map.add(index + 1, 0, add);
+                        if !add.is_empty() {
+                            map.add(index + 1, 0, add);
+                        }
                     }
+                } else if event.token_type == Token::SpaceOrTab {
+                    // Empty to allow whitespace in blank lines.
+                } else {
+                    first_line_ending_in_run = None;
                 }
 
                 index += 1;
-- 
cgit