Skip to content

Commit 18cc853

Browse files
committed
Use asciidoc and asciidoctor as aliases
This will coerce `asciidoc` to literal Pandoc `asciidoctor` output. We’re doing this since Asciidco <> Asciidoctor have merged into a single formally specified syntax which we support here (and Pandoc supports as Asciidoctor)
1 parent 5f43ffc commit 18cc853

File tree

4 files changed

+8
-9
lines changed

4 files changed

+8
-9
lines changed

src/format/asciidoc/format-asciidoc.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ export function asciidocFormat(): Format {
6363
"template.asciidoc",
6464
),
6565
),
66+
to: "asciidoctor",
6667
},
6768
extensions: {
6869
book: asciidocBookExtension,

src/format/formats.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -123,11 +123,8 @@ export function defaultWriterFormat(to: string): Format {
123123
break;
124124

125125
case "asciidoc":
126-
writerFormat = asciidocFormat();
127-
break;
128-
129126
case "asciidoctor":
130-
writerFormat = plaintextFormat("Asciidoctor", "adoc");
127+
writerFormat = asciidocFormat();
131128
break;
132129

133130
case "docbook":

src/resources/filters/quarto-post/render-asciidoc.lua

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44

55
local kAsciidocNativeCites = 'use-asciidoc-native-cites'
6-
local kAsciiDocFormat = "asciidoc"
76

87
function renderAsciidoc()
98

@@ -39,18 +38,18 @@ function renderAsciidoc()
3938
local admonitionType = el.type:upper();
4039

4140
-- render the callout contents
42-
local admonitionContents = pandoc.write(pandoc.Pandoc(el.content), kAsciiDocFormat)
41+
local admonitionContents = pandoc.write(pandoc.Pandoc(el.content), "asciidoc")
4342

4443
local admonitionStr;
4544
if el.caption then
4645
-- A captioned admonition
47-
local admonitionCaption = pandoc.write(pandoc.Pandoc(el.caption), kAsciiDocFormat)
46+
local admonitionCaption = pandoc.write(pandoc.Pandoc(el.caption), "asciidoc")
4847
admonitionStr = "[" .. admonitionType .. "]\n." .. admonitionCaption .. "====\n" .. admonitionContents .. "====\n\n"
4948
else
5049
-- A captionless admonition
5150
admonitionStr = "[" .. admonitionType .. "]\n====\n" .. admonitionContents .. "====\n\n"
5251
end
53-
return pandoc.RawBlock(kAsciiDocFormat, admonitionStr)
52+
return pandoc.RawBlock("asciidoc", admonitionStr)
5453
end
5554
}
5655
end

src/resources/pandoc/datadir/_format.lua

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ local function isLatexOutput()
3131
end
3232

3333
local function isAsciiDocOutput()
34-
return FORMAT == "asciidoc"
34+
return FORMAT == "asciidoc" or FORMAT == "asciidoctor"
3535
end
3636

3737
local function isBeamerOutput()
@@ -167,6 +167,8 @@ local function isFormat(to)
167167
-- markdown: markdown*, commonmark*, gfm, markua
168168
elseif to == "markdown" then
169169
return isMarkdownOutput()
170+
elseif to == "asciidoc" or to == "asciidoctor" then
171+
return isAsciiDocOutput()
170172
else
171173
return false
172174
end

0 commit comments

Comments
 (0)