diff --git a/src/lua/parser_imageboard.lua b/src/lua/parser_imageboard.lua index 1e3c097..e62d606 100644 --- a/src/lua/parser_imageboard.lua +++ b/src/lua/parser_imageboard.lua @@ -70,7 +70,7 @@ local grammar = P{ marked = V"spoiler" + V"bold" + V"italic" + V"underline" + V"heading" + V"strike" + V"spoiler2" + V"code", plainline = (V"marked" + word)^0, line = Cs(V"greentext" + V"pinktext" + V"plainline" + P"") * P"\n" / function(a) - return string.format("%s
",a) + return string.format("

%s",a) end, ending = C(P(1)^0) / sanitize, chunk = V"line"^0 * V"plainline" * V"ending" diff --git a/src/lua/parser_plain.lua b/src/lua/parser_plain.lua index c047092..bf67f10 100644 --- a/src/lua/parser_plain.lua +++ b/src/lua/parser_plain.lua @@ -6,7 +6,7 @@ local escapes = { ['"'] = """, ["'"] = "'", --Kinda hacky - ["\n"] = "
", + ["\n"] = "

", } local esctbl = {} for char,_ in pairs(escapes) do @@ -18,5 +18,7 @@ local function sanitize(capture) return escapes[capture] or capture end return function(text) - return string.gsub(text,escapematch,sanitize) + text = string.gsub(text,escapematch,sanitize) + --text = string.gsub(text,"\n\n","

") + return text end diff --git a/src/pages/read.etlua b/src/pages/read.etlua index 7aa7413..649bd16 100644 --- a/src/pages/read.etlua +++ b/src/pages/read.etlua @@ -2,33 +2,33 @@ - <%= title %> + + <%- title %> - -

-

- <%= domain %>/<%= idp %> -

- <% if owner then %> -
- - -
- <% end %> -

+
+ + <% if owner then %> +
+ + +
+ <% end %> +

<%- title %> -

+

+

<% if isanon then %> By Anonymous <% else %> By <%= author %> <% end %> -
- <%- text %> -
-

- + + <%- text %> + +