Merge pull request #61 from Omikhleia/fix-immediate-blocquote-in-fenc…

…ed-div Fix immediate blockquote in fenced div
jgm · May 15, 2023 · 104d7fa · 104d7fa
2 parents ae3091a + 38040ee
commit 104d7fa
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/lunamark/reader/markdown.lua b/lunamark/reader/markdown.lua
@@ -1136,10 +1136,14 @@ function M.new(writer, options)
 
     local is_inside_div = Cmt(Cb("div_level"), check_div_level)
 
+    larsers.fenced_div_out = is_inside_div  -- break out of a paragraph when we
+                                            -- are inside a div and see a closing tag
+                           * parsers.fenced_div_end
+
     larsers.fencestart = larsers.fencestart
-                       + is_inside_div  -- break out of a paragraph when we
-                                        -- are inside a div and see a closing tag
-                       * parsers.fenced_div_end
+                       + larsers.fenced_div_out
+  else
+    larsers.fenced_div_out = parsers.fail
   end
 
   larsers.Endline   = parsers.newline * -( -- newline, but not before...
@@ -1359,7 +1363,8 @@ function M.new(writer, options)
   larsers.Blockquote  = Cs((((parsers.leader * parsers.more * parsers.space^-1)/""
                              * parsers.linechar^0 * parsers.newline)^1
                             * (-(parsers.leader * parsers.more
-                                + parsers.blankline) * parsers.linechar^1
+                                + parsers.blankline
+                                + larsers.fenced_div_out) * parsers.linechar^1
                               * parsers.newline)^0 * parsers.blankline^0
                            )^1) / parse_blocks / writer.blockquote
 

diff --git a/tests/lunamark/ext_fenced_divs.test b/tests/lunamark/ext_fenced_divs.test
@@ -83,6 +83,11 @@ This is a div with a fenced code inside
 ```
 :::
 
+::: {#another-identifier}
+> This is a blockquote immediately in a
+> div
+:::
+
 ::: {.cit custom-style=raggedleft}
 I am a _fenced_ div
 :::
@@ -155,6 +160,10 @@ This is the end of a div</div>
 </code></pre>
 </div>
 
+<div id="another-identifier">
+<blockquote>This is a blockquote immediately in a div</blockquote>
+</div>
+
 <div class="cit">I am a <em>fenced</em> div</div>
 
 <div class="cit">