From 5436fd6b4a623c57bcd1d530ad1d56f018e62ef8 Mon Sep 17 00:00:00 2001 From: atusy <30277794+atusy@users.noreply.github.com> Date: Tue, 4 Jul 2023 09:32:04 +0900 Subject: [PATCH 1/6] fix: lost of content from raw inline --- lua/review.lua | 2 +- test/test_reviewlua.rb | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/lua/review.lua b/lua/review.lua index eca2024..ca1a548 100755 --- a/lua/review.lua +++ b/lua/review.lua @@ -586,7 +586,7 @@ function RawInline(format, text) if (format == "tex") then return format_inline("embed", "|latex|" .. text) else - return format_inline("embed", "|" .. format .. "|", text) + return format_inline("embed", "|" .. format .. "|" .. text) end end diff --git a/test/test_reviewlua.rb b/test/test_reviewlua.rb index ff81f61..58958cc 100644 --- a/test/test_reviewlua.rb +++ b/test/test_reviewlua.rb @@ -89,6 +89,10 @@ def test_inline_font assert_equal '@{a\*}', pandoc(src).chomp src = '`<$>`{.haskell}' assert_equal '@{<$>}', pandoc(src).chomp # XXX: ignore attribute + src = '`content`{=tex}' + assert_equal '@{|latex|content}', pandoc(src).chomp + src = '`content`{=latex}' + assert_equal '@{|latex|content}', pandoc(src).chomp src = '~~a~~' assert_equal '@{a}', pandoc(src).chomp src = '[Small]{.smallcaps}' From 91977be54fac6f346433ac5be90a4ee8be86af55 Mon Sep 17 00:00:00 2001 From: atusy <30277794+atusy@users.noreply.github.com> Date: Tue, 4 Jul 2023 09:41:45 +0900 Subject: [PATCH 2/6] fix: avoid unintentional globals --- lua/filters.lua | 2 +- lua/review.lua | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lua/filters.lua b/lua/filters.lua index 8338411..a29f6aa 100644 --- a/lua/filters.lua +++ b/lua/filters.lua @@ -142,7 +142,7 @@ local function caption_div(div) end local function noindent(para) - first = para.content[1] + local first = para.content[1] if (first and (first.tag == "RawInline") and (first.format == "tex") and diff --git a/lua/review.lua b/lua/review.lua index ca1a548..0c473e3 100755 --- a/lua/review.lua +++ b/lua/review.lua @@ -180,7 +180,7 @@ local function attr_classes(attr) end local function attr_scale(attr, key) -- a helper for CaptionedImage - scale = attr_val(attr, key) + local scale, count = attr_val(attr, key), 0 if (scale == "") or (key == "scale") then return scale end @@ -288,7 +288,7 @@ function CodeBlock(s, attr) end command = command or "list" - is_list = command == "list" + local is_list = command == "list" local num = (is_list == false) and "" or ( @@ -411,7 +411,7 @@ function Table(caption, aligns, widths, headers, rows) end local tmp = {} for i, h in pairs(headers) do - align = html_align(aligns[i]) + local align = html_align(aligns[i]) if (config.use_table_align == "true") and (align ~= "") then h = format_inline("dtp", "table align=" .. align) .. h end @@ -422,7 +422,7 @@ function Table(caption, aligns, widths, headers, rows) for _, row in pairs(rows) do tmp = {} for i, c in pairs(row) do - align = html_align(aligns[i]) + local align = html_align(aligns[i]) if (config.use_table_align == "true") and (align ~= "") then c = format_inline("dtp", "table align=" .. align) .. c end From 8ea0760299b21c39d94929c6be370d886201f379 Mon Sep 17 00:00:00 2001 From: atusy <30277794+atusy@users.noreply.github.com> Date: Tue, 4 Jul 2023 09:36:34 +0900 Subject: [PATCH 3/6] refactor: attr_val can be simplified --- lua/review.lua | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/lua/review.lua b/lua/review.lua index 0c473e3..cdb3c77 100755 --- a/lua/review.lua +++ b/lua/review.lua @@ -161,13 +161,7 @@ function Para(s) end local function attr_val(attr, key) - local attr_table = {} - for k, v in pairs(attr) do - if (k == key and v and v ~= "") then - return v - end - end - return "" + return attr[key] or "" end local function attr_classes(attr) From 1abeadf2cdd5d9943ebf7a003d00835d66272e3e Mon Sep 17 00:00:00 2001 From: atusy <30277794+atusy@users.noreply.github.com> Date: Tue, 4 Jul 2023 09:40:59 +0900 Subject: [PATCH 4/6] refactor: prefer string.rep to for-loop on composing headmark --- lua/review.lua | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/lua/review.lua b/lua/review.lua index cdb3c77..70065bc 100755 --- a/lua/review.lua +++ b/lua/review.lua @@ -189,10 +189,7 @@ local function attr_scale(attr, key) -- a helper for CaptionedImage end function Header(level, s, attr) - local headmark = "" - for i = 1, level do - headmark = headmark .. "=" - end + local headmark = string.rep("=", level) local classes = attr_classes(attr) From dfc6b98d8059bb5f723a40baf466eb4cd140c26f Mon Sep 17 00:00:00 2001 From: atusy <30277794+atusy@users.noreply.github.com> Date: Tue, 4 Jul 2023 09:44:57 +0900 Subject: [PATCH 5/6] refactor: rename unused loop vars to _ --- lua/filters.lua | 2 +- lua/review.lua | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lua/filters.lua b/lua/filters.lua index a29f6aa..3302787 100644 --- a/lua/filters.lua +++ b/lua/filters.lua @@ -29,7 +29,7 @@ local function support_blankline(constructor) local n_break = 0 local content = blocks[i].content - for j, elem in ipairs(x.content) do + for _, elem in ipairs(x.content) do if elem.tag == "LineBreak" then -- Count the repeated number of LineBreak n_break = n_break + 1 diff --git a/lua/review.lua b/lua/review.lua index 70065bc..bd93e7b 100755 --- a/lua/review.lua +++ b/lua/review.lua @@ -1,6 +1,6 @@ -- -*- coding: utf-8 -*- -- Re:VIEW Writer for Pandoc --- Copyright 2020-2023 atusy and Kenshi Muto +-- Copyright 2020 Kenshi Muto -- config local config = { @@ -514,7 +514,7 @@ function Div(s, attr) local blankline = attr_val(attr, "blankline") if blankline ~= "" then local buffer = {} - for i = 1, tonumber(blankline) do + for _ = 1, tonumber(blankline) do table.insert(buffer, "//blankline") end return table.concat(buffer, "\n") @@ -609,7 +609,7 @@ local function configure() if (metadata) then -- Load config from YAML - for k,v in pairs(config) do + for k, _ in pairs(config) do if metadata[k] ~= nil then config[k] = stringify(metadata[k]) end From 32286158021927d2415df1f87a0316dca4265549 Mon Sep 17 00:00:00 2001 From: atusy <30277794+atusy@users.noreply.github.com> Date: Wed, 5 Jul 2023 21:49:37 +0900 Subject: [PATCH 6/6] Update lua/review.lua Co-authored-by: Kenshi Muto --- lua/review.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/review.lua b/lua/review.lua index bd93e7b..b9bec19 100755 --- a/lua/review.lua +++ b/lua/review.lua @@ -1,6 +1,6 @@ -- -*- coding: utf-8 -*- -- Re:VIEW Writer for Pandoc --- Copyright 2020 Kenshi Muto +-- Copyright 2020-2023 atusy and Kenshi Muto -- config local config = {