Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fenced div separator fix #157

Closed
wants to merge 5 commits into from
Closed

Fenced div separator fix #157

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
de9810b
update test
lostenderman Mar 2, 2024
1b01fa5
update parser
lostenderman Mar 2, 2024
51fbb1d
add group change
lostenderman Mar 2, 2024
42ad4ca
Fix luacheck
Witiko Mar 2, 2024
1177db1
Merge branch 'main' into HEAD
Witiko Mar 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 20 additions & 4 deletions markdown.dtx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30815,6 +30815,8 @@ M.extensions.fenced_divs = function(blank_before_div_fence)
% \begin{macrocode}
self.initialize_named_group("div_level", "0")

self.initialize_named_group("is_top_level", "true")

local function increment_div_level(increment)
local function update_div_level(s, i, current_level) -- luacheck: ignore s i
current_level = tonumber(current_level)
Expand All @@ -30825,12 +30827,20 @@ M.extensions.fenced_divs = function(blank_before_div_fence)
return Cg( Cmt(Cb("div_level"), update_div_level)
, "div_level")
end

local function change_is_top_level(new_value)
local function update_is_top_level(s, i, value) -- luacheck: ignore s i
Witiko marked this conversation as resolved.
Show resolved Hide resolved
return true, new_value
end

return Cg( Cmt(Cb("is_top_level"), update_is_top_level), "is_top_level")
end

local non_fenced_div_block = parsers.check_minimal_indent * V("Block")
local non_fenced_div_block = change_is_top_level("false") * parsers.check_minimal_indent * V("Block")
- parsers.check_minimal_indent_and_trail * fenced_div_end

local non_fenced_div_paragraph = parsers.check_minimal_indent * V("Paragraph")
- parsers.check_minimal_indent_and_trail * fenced_div_end
local non_fenced_div_paragraph = change_is_top_level("true") * parsers.check_minimal_indent * V("Paragraph")
- parsers.check_minimal_indent_and_trail * fenced_div_end - fenced_div_end

local blank = parsers.minimally_indented_blank

Expand Down Expand Up @@ -30863,6 +30873,7 @@ M.extensions.fenced_divs = function(blank_before_div_fence)
* increment_div_level(1)
* parsers.skipblanklines
* Ct(content_loop)
* change_is_top_level("true")
* parsers.minimally_indented_blank^0
* parsers.check_minimal_indent_and_trail * fenced_div_end * increment_div_level(-1)
* (Cc("") / writer.div_end)
Expand All @@ -30887,8 +30898,13 @@ M.extensions.fenced_divs = function(blank_before_div_fence)
return current_level > 0
end

local function check_is_top_level(s, i, current_is_top_level) -- luacheck: ignore s i
return current_is_top_level == "true"
end

local is_inside_div = Cmt(Cb("div_level"), check_div_level)
local fencestart = is_inside_div * fenced_div_end
local is_top_level = Cmt(Cb("is_top_level"), check_is_top_level)
local fencestart = is_inside_div * is_top_level * fenced_div_end

if not blank_before_div_fence then
self.update_rule("EndlineExceptions", function(previous_pattern)
Expand Down
2 changes: 1 addition & 1 deletion tests/testfiles/lunamark-markdown/fenced-divs.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ BEGIN fencedDivAttributeContext
attributeIdentifier: some-identifier
interblockSeparator
blockQuoteBegin
paragraphSeparator
softLineBreak
blockQuoteEnd
interblockSeparator
END fencedDivAttributeContext
Expand Down
Loading