Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
19 changes: 19 additions & 0 deletions markdown-tests.lua
Original file line number Diff line number Diff line change
Expand Up @@ -4392,6 +4392,25 @@ This is [an example] [id] reference-style link.
<p><a href="kbs/wes-box-134.md.lp">Wesel - Boxtel [KBS 134]</a></p>
]==]

tests.sven = [[
TASK_CARGO_DISPATCHER
~
<p>TASK_CARGO_DISPATCHER</p>
~
TASK _CARGO_ DISPATCHER
~
<p>TASK<em>CARGO</em>DISPATCHER</p>
~
TASK_CARGO_ DISPATCHER
~
<p>TASK_CARGO_ DISPATCHER</p>
~
TASK*CARGO*DISPATCHER
~
<p>TASK<em>CARGO</em>DISPATCHER</p>
]]


-- Unhandled test: _M*A*S*H_

local quiet_mode
Expand Down
16 changes: 13 additions & 3 deletions markdown.lua
Original file line number Diff line number Diff line change
Expand Up @@ -895,9 +895,19 @@ local function emphasis(text)
text = text:gsub(s .. "([^%s][%*%_]?)" .. s, "<strong>%1</strong>")
text = text:gsub(s .. "([^%s][^<>]-[^%s][%*%_]?)" .. s, "<strong>%1</strong>")
end
for _, s in ipairs {"%*", "%_"} do
text = text:gsub(s .. "([^%s_])" .. s, "<em>%1</em>")
text = text:gsub(s .. "(<strong>[^%s_]</strong>)" .. s, "<em>%1</em>")
for _, s in ipairs {"%_"} do
text = text:gsub("([^%w]+)" .. s .. "([^%s_])" .. s, "%1<em>%2</em> ")
text = text:gsub("([^%w]+)" .. s .. "(<strong>[^%s_]</strong>)" ..s, "%1<em>%2</em>")
text = text:gsub("([^%w]+)" .. s .. "([^%s_][^<>_]-[^%s_])" .. s, "%1<em>%2</em>")
text = text:gsub("([^%w]+)" .. s .. "([^<>_]-<strong>[^<>_]-</strong>[^<>_]-)" .. s, "%1<em>%2</em>")
text = text:gsub("^" .. s .. "([^%s_])" .. s, "<em>%1</em> ")
text = text:gsub("^" .. s .. "(<strong>[^%s_]</strong>)" ..s, "<em>%1</em>")
text = text:gsub("^" .. s .. "([^%s_][^<>_]-[^%s_])" .. s, "<em>%1</em>")
text = text:gsub("^" .. s .. "([^<>_]-<strong>[^<>_]-</strong>[^<>_]-)" .. s, "<em>%1</em>")
end
for _, s in ipairs {"%*"} do
text = text:gsub(s .. "([^%s_])" .. s, "<em>%1</em> ")
text = text:gsub(s .. "(<strong>[^%s_]</strong>)" ..s, "<em>%1</em>")
text = text:gsub(s .. "([^%s_][^<>_]-[^%s_])" .. s, "<em>%1</em>")
text = text:gsub(s .. "([^<>_]-<strong>[^<>_]-</strong>[^<>_]-)" .. s, "<em>%1</em>")
end
Expand Down