Skip to content

Commit a96ca2c

Browse files
author
Al Manning
committed
more writer updates
1 parent 587c925 commit a96ca2c

File tree

4 files changed

+20
-16
lines changed

4 files changed

+20
-16
lines changed

src/publish/confluence/confluence.ts

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -562,8 +562,17 @@ async function publish(
562562
doOperation = async () =>
563563
(content = await createContent(publishFiles, body));
564564
}
565+
try {
566+
await doWithSpinner(message, doOperation);
567+
} catch (error: any) {
568+
console.info("Error Performing Operation");
569+
console.info("Value to Update", body?.storage?.value);
570+
console.error(error);
571+
if (EXIT_ON_ERROR) {
572+
throw error;
573+
}
574+
}
565575

566-
await doWithSpinner(message, doOperation);
567576
return buildPublishRecordForContent(server, content);
568577
};
569578

src/resources/extensions/quarto/confluence/overrides.lua

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -223,16 +223,12 @@ function TableConfluence(caption, aligns, widths, headers, rows)
223223
return table.concat(buffer,'\n')
224224
end
225225

226-
function BlockQuoteConfluence(source)
227-
return "<blockquote>" .. source .. "</blockquote>"
228-
end
229226

230227
return {
231228
CaptionedImageConfluence = CaptionedImageConfluence,
232229
CodeBlockConfluence = CodeBlockConfluence,
233230
LinkConfluence = LinkConfluence,
234231
TableConfluence = TableConfluence,
235-
BlockQuoteConfluence = BlockQuoteConfluence,
236232
escape = escape,
237233
html_align = html_align,
238234
interpolate = interpolate

src/resources/extensions/quarto/confluence/publish.lua

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,17 @@ function Writer (doc, opts)
4040
local renderString = confluence.CodeBlockConfluence(
4141
codeBlock.text,
4242
codeBlock.classes[1] or '')
43-
return pandoc.RawInline('html', renderString)
43+
return pandoc.RawBlock('html', renderString)
44+
end,
45+
Table = function (tbl)
46+
local caption = tbl.caption.long
47+
tbl.caption = {}
48+
return {tbl} .. caption
4449
end
4550
}
51+
52+
opts = opts or {}
53+
opts.wrap_text = "none"
54+
4655
return pandoc.write(doc:walk(filter), 'html', opts)
4756
end

src/resources/extensions/quarto/confluence/test-suite.lua

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -240,14 +240,4 @@ function TestTableConfluence:testNoColGroupNoWidth()
240240
lu.assertEquals(actual, expected)
241241
end
242242

243-
TestBlockQuoteConfluence = {}
244-
function TestBlockQuoteConfluence:testStandard()
245-
local expected = [[<blockquote>fake-source</blockquote>]]
246-
local source = 'fake-source'
247-
248-
local actual = confluence.BlockQuoteConfluence(source);
249-
250-
lu.assertEquals(actual, expected)
251-
end
252-
253243
os.exit(lu.LuaUnit.run())

0 commit comments

Comments
 (0)