Skip to content

fix asciidoc code annotations following pandoc update #12442

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cderv merged 2 commits into from
Apr 3, 2025
Merged

fix asciidoc code annotations following pandoc update #12442

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5f0bb3b
fix test for asciidoc code annotations
cderv Apr 3, 2025
569135a
asciidoc, code annotation - format the annotation marker as raw asciidoc
cderv Apr 3, 2025
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
4 changes: 2 additions & 2 deletions src/resources/filters/quarto-pre/code-annotation.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -529,10 +529,10 @@ function code_annotations()
local dl
if _quarto.format.isAsciiDocOutput() then
local formatted = pandoc.List()
for _i,v in ipairs(items) do
for _,v in ipairs(items) do
local annotationMarker = v[1] .. ' '
local definition = v[2]
tprepend(definition.content, {annotationMarker})
tprepend(definition.content, {pandoc.RawInline('asciidoc', annotationMarker)})
formatted:insert(definition)
end
dl = pandoc.Div(formatted)
Expand Down
7 changes: 6 additions & 1 deletion tests/docs/smoke-all/2023/01/26/asciidoc-annotated-code.qmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,14 @@ format:
asciidoc: default
_quarto:
tests:
asciidoc: default
asciidoc:
ensureFileRegexMatches:
- ['\<1\> First set', 'plt\.show\(\) \<3\>']
- ['\+\+\<\+\+1\+\+\>\+\+']
---

This also covers https://github.com/quarto-dev/quarto-cli/issues/12441

## Annotated Code

```python
Expand Down
Loading