Skip to content

Commit 747e6a7

Browse files
alandefreitasalandefreitas
committed
adoc anchors use link macro
#fix Asciidoc implementations of <<>> for anchors fail when the anchor text contains ">>", even when properly escaped.
1 parent 840537d commit 747e6a7

File tree

173 files changed

+4343
-4343
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

173 files changed

+4343
-4343
lines changed

‎share/mrdocs/addons/generator/adoc/partials/markup/a.adoc.hbs

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
https://gitlab.com/antora/antora/-/issues/428
55
}}
66
{{#if (starts_with href "#")~}}
7-
<<{{{remove_prefix href "#"}}},{{> @partial-block }}>>
7+
link:{{{ href }}}[{{> @partial-block }}]
88
{{~else if (starts_with href "/")~}}
99
xref:{{{remove_prefix href "/"}}}[{{> @partial-block }}]
1010
{{~else if (starts_with href ".")~}}

‎test-files/golden-tests/config/auto-brief/auto-brief.adoc

+31-31
Original file line numberDiff line numberDiff line change
@@ -10,67 +10,67 @@
1010
|===
1111
| Name
1212
| Description
13-
| <<copyBriefFromCopyBrief,`copyBriefFromCopyBrief`>>
13+
| link:#copyBriefFromCopyBrief[`copyBriefFromCopyBrief`]
1414
| This is the explicit brief&period;
15-
| <<copyBriefFromExplicitBrief,`copyBriefFromExplicitBrief`>>
15+
| link:#copyBriefFromExplicitBrief[`copyBriefFromExplicitBrief`]
1616
| This is the explicit brief&period;
17-
| <<copyBriefFromFirstSentenceAsBrief,`copyBriefFromFirstSentenceAsBrief`>>
17+
| link:#copyBriefFromFirstSentenceAsBrief[`copyBriefFromFirstSentenceAsBrief`]
1818
| This is the brief&period;
19-
| <<copyBriefFromFirstValid,`copyBriefFromFirstValid`>>
19+
| link:#copyBriefFromFirstValid[`copyBriefFromFirstValid`]
2020
| This function has documentation but no brief&period;
21-
| <<copyDetailsFromCopyBrief,`copyDetailsFromCopyBrief`>>
21+
| link:#copyDetailsFromCopyBrief[`copyDetailsFromCopyBrief`]
2222
| Details will be copied
23-
| <<copyDetailsFromDocNoBrief,`copyDetailsFromDocNoBrief`>>
23+
| link:#copyDetailsFromDocNoBrief[`copyDetailsFromDocNoBrief`]
2424
| Custom brief
25-
| <<copyDetailsFromExplicitBrief,`copyDetailsFromExplicitBrief`>>
25+
| link:#copyDetailsFromExplicitBrief[`copyDetailsFromExplicitBrief`]
2626
|
27-
| <<copyDetailsFromFirstSentenceAsBrief,`copyDetailsFromFirstSentenceAsBrief`>>
27+
| link:#copyDetailsFromFirstSentenceAsBrief[`copyDetailsFromFirstSentenceAsBrief`]
2828
|
29-
| <<copyDetailsFromNoDoc,`copyDetailsFromNoDoc`>>
29+
| link:#copyDetailsFromNoDoc[`copyDetailsFromNoDoc`]
3030
| Custom brief
31-
| <<copyDocFromCopyBrief,`copyDocFromCopyBrief`>>
31+
| link:#copyDocFromCopyBrief[`copyDocFromCopyBrief`]
3232
| This is the explicit brief&period;
33-
| <<copyDocFromExplicitBrief,`copyDocFromExplicitBrief`>>
33+
| link:#copyDocFromExplicitBrief[`copyDocFromExplicitBrief`]
3434
| This is the explicit brief&period;
35-
| <<copyDocFromFirstSentenceAsBrief,`copyDocFromFirstSentenceAsBrief`>>
35+
| link:#copyDocFromFirstSentenceAsBrief[`copyDocFromFirstSentenceAsBrief`]
3636
| This is the brief&period;
37-
| <<docNoBriefFunction,`docNoBriefFunction`>>
37+
| link:#docNoBriefFunction[`docNoBriefFunction`]
3838
| This function has documentation but no brief&period;
39-
| <<explicitBriefFunction,`explicitBriefFunction`>>
39+
| link:#explicitBriefFunction[`explicitBriefFunction`]
4040
| This is the explicit brief&period;
41-
| <<explicitBriefFunction2,`explicitBriefFunction2`>>
41+
| link:#explicitBriefFunction2[`explicitBriefFunction2`]
4242
| This is the explicit brief&period;
43-
| <<failCircularReferenceCopyFunction,`failCircularReferenceCopyFunction`>>
43+
| link:#failCircularReferenceCopyFunction[`failCircularReferenceCopyFunction`]
4444
|
45-
| <<failCircularSourceFunctionA,`failCircularSourceFunctionA`>>
45+
| link:#failCircularSourceFunctionA[`failCircularSourceFunctionA`]
4646
|
47-
| <<failCircularSourceFunctionB,`failCircularSourceFunctionB`>>
47+
| link:#failCircularSourceFunctionB[`failCircularSourceFunctionB`]
4848
|
49-
| <<failCopyBriefFromDocNoBrief,`failCopyBriefFromDocNoBrief`>>
49+
| link:#failCopyBriefFromDocNoBrief[`failCopyBriefFromDocNoBrief`]
5050
| This function has documentation but no brief&period;
51-
| <<failCopyBriefFromInvalidReference,`failCopyBriefFromInvalidReference`>>
51+
| link:#failCopyBriefFromInvalidReference[`failCopyBriefFromInvalidReference`]
5252
|
53-
| <<failCopyBriefFromNoDoc,`failCopyBriefFromNoDoc`>>
53+
| link:#failCopyBriefFromNoDoc[`failCopyBriefFromNoDoc`]
5454
|
55-
| <<failCopyDetailsFromInvalidReference,`failCopyDetailsFromInvalidReference`>>
55+
| link:#failCopyDetailsFromInvalidReference[`failCopyDetailsFromInvalidReference`]
5656
|
57-
| <<failCopyDocFromDocNoBrief,`failCopyDocFromDocNoBrief`>>
57+
| link:#failCopyDocFromDocNoBrief[`failCopyDocFromDocNoBrief`]
5858
| This function has documentation but no brief&period;
59-
| <<failCopyDocFromInvalidReference,`failCopyDocFromInvalidReference`>>
59+
| link:#failCopyDocFromInvalidReference[`failCopyDocFromInvalidReference`]
6060
|
61-
| <<failCopyDocFromNoDoc,`failCopyDocFromNoDoc`>>
61+
| link:#failCopyDocFromNoDoc[`failCopyDocFromNoDoc`]
6262
|
63-
| <<failInvalidReferenceCopyFunctions,`failInvalidReferenceCopyFunctions`>>
63+
| link:#failInvalidReferenceCopyFunctions[`failInvalidReferenceCopyFunctions`]
6464
|
65-
| <<firstSentenceAsBriefFunction,`firstSentenceAsBriefFunction`>>
65+
| link:#firstSentenceAsBriefFunction[`firstSentenceAsBriefFunction`]
6666
| This is the brief&period;
67-
| <<noDocFunction,`noDocFunction`>>
67+
| link:#noDocFunction[`noDocFunction`]
6868
|
69-
| <<recursiveReferenceCopyFunction,`recursiveReferenceCopyFunction`>>
69+
| link:#recursiveReferenceCopyFunction[`recursiveReferenceCopyFunction`]
7070
| Final recursive brief
71-
| <<recursiveSourceFunctionA,`recursiveSourceFunctionA`>>
71+
| link:#recursiveSourceFunctionA[`recursiveSourceFunctionA`]
7272
| Final recursive brief
73-
| <<recursiveSourceFunctionB,`recursiveSourceFunctionB`>>
73+
| link:#recursiveSourceFunctionB[`recursiveSourceFunctionB`]
7474
| Final recursive brief
7575
|===
7676

‎test-files/golden-tests/config/auto-brief/no-auto-brief.adoc

+31-31
Original file line numberDiff line numberDiff line change
@@ -10,67 +10,67 @@
1010
|===
1111
| Name
1212
| Description
13-
| <<copyBriefFromCopyBrief,`copyBriefFromCopyBrief`>>
13+
| link:#copyBriefFromCopyBrief[`copyBriefFromCopyBrief`]
1414
| This is the explicit brief&period;
15-
| <<copyBriefFromExplicitBrief,`copyBriefFromExplicitBrief`>>
15+
| link:#copyBriefFromExplicitBrief[`copyBriefFromExplicitBrief`]
1616
| This is the explicit brief&period;
17-
| <<copyBriefFromFirstSentenceAsBrief,`copyBriefFromFirstSentenceAsBrief`>>
17+
| link:#copyBriefFromFirstSentenceAsBrief[`copyBriefFromFirstSentenceAsBrief`]
1818
|
19-
| <<copyBriefFromFirstValid,`copyBriefFromFirstValid`>>
19+
| link:#copyBriefFromFirstValid[`copyBriefFromFirstValid`]
2020
| This is the explicit brief&period;
21-
| <<copyDetailsFromCopyBrief,`copyDetailsFromCopyBrief`>>
21+
| link:#copyDetailsFromCopyBrief[`copyDetailsFromCopyBrief`]
2222
| Details will be copied
23-
| <<copyDetailsFromDocNoBrief,`copyDetailsFromDocNoBrief`>>
23+
| link:#copyDetailsFromDocNoBrief[`copyDetailsFromDocNoBrief`]
2424
| Custom brief
25-
| <<copyDetailsFromExplicitBrief,`copyDetailsFromExplicitBrief`>>
25+
| link:#copyDetailsFromExplicitBrief[`copyDetailsFromExplicitBrief`]
2626
|
27-
| <<copyDetailsFromFirstSentenceAsBrief,`copyDetailsFromFirstSentenceAsBrief`>>
27+
| link:#copyDetailsFromFirstSentenceAsBrief[`copyDetailsFromFirstSentenceAsBrief`]
2828
|
29-
| <<copyDetailsFromNoDoc,`copyDetailsFromNoDoc`>>
29+
| link:#copyDetailsFromNoDoc[`copyDetailsFromNoDoc`]
3030
| Custom brief
31-
| <<copyDocFromCopyBrief,`copyDocFromCopyBrief`>>
31+
| link:#copyDocFromCopyBrief[`copyDocFromCopyBrief`]
3232
| This is the explicit brief&period;
33-
| <<copyDocFromExplicitBrief,`copyDocFromExplicitBrief`>>
33+
| link:#copyDocFromExplicitBrief[`copyDocFromExplicitBrief`]
3434
| This is the explicit brief&period;
35-
| <<copyDocFromFirstSentenceAsBrief,`copyDocFromFirstSentenceAsBrief`>>
35+
| link:#copyDocFromFirstSentenceAsBrief[`copyDocFromFirstSentenceAsBrief`]
3636
|
37-
| <<docNoBriefFunction,`docNoBriefFunction`>>
37+
| link:#docNoBriefFunction[`docNoBriefFunction`]
3838
|
39-
| <<explicitBriefFunction,`explicitBriefFunction`>>
39+
| link:#explicitBriefFunction[`explicitBriefFunction`]
4040
| This is the explicit brief&period;
41-
| <<explicitBriefFunction2,`explicitBriefFunction2`>>
41+
| link:#explicitBriefFunction2[`explicitBriefFunction2`]
4242
| This is the explicit brief&period;
43-
| <<failCircularReferenceCopyFunction,`failCircularReferenceCopyFunction`>>
43+
| link:#failCircularReferenceCopyFunction[`failCircularReferenceCopyFunction`]
4444
|
45-
| <<failCircularSourceFunctionA,`failCircularSourceFunctionA`>>
45+
| link:#failCircularSourceFunctionA[`failCircularSourceFunctionA`]
4646
|
47-
| <<failCircularSourceFunctionB,`failCircularSourceFunctionB`>>
47+
| link:#failCircularSourceFunctionB[`failCircularSourceFunctionB`]
4848
|
49-
| <<failCopyBriefFromDocNoBrief,`failCopyBriefFromDocNoBrief`>>
49+
| link:#failCopyBriefFromDocNoBrief[`failCopyBriefFromDocNoBrief`]
5050
|
51-
| <<failCopyBriefFromInvalidReference,`failCopyBriefFromInvalidReference`>>
51+
| link:#failCopyBriefFromInvalidReference[`failCopyBriefFromInvalidReference`]
5252
|
53-
| <<failCopyBriefFromNoDoc,`failCopyBriefFromNoDoc`>>
53+
| link:#failCopyBriefFromNoDoc[`failCopyBriefFromNoDoc`]
5454
|
55-
| <<failCopyDetailsFromInvalidReference,`failCopyDetailsFromInvalidReference`>>
55+
| link:#failCopyDetailsFromInvalidReference[`failCopyDetailsFromInvalidReference`]
5656
|
57-
| <<failCopyDocFromDocNoBrief,`failCopyDocFromDocNoBrief`>>
57+
| link:#failCopyDocFromDocNoBrief[`failCopyDocFromDocNoBrief`]
5858
|
59-
| <<failCopyDocFromInvalidReference,`failCopyDocFromInvalidReference`>>
59+
| link:#failCopyDocFromInvalidReference[`failCopyDocFromInvalidReference`]
6060
|
61-
| <<failCopyDocFromNoDoc,`failCopyDocFromNoDoc`>>
61+
| link:#failCopyDocFromNoDoc[`failCopyDocFromNoDoc`]
6262
|
63-
| <<failInvalidReferenceCopyFunctions,`failInvalidReferenceCopyFunctions`>>
63+
| link:#failInvalidReferenceCopyFunctions[`failInvalidReferenceCopyFunctions`]
6464
|
65-
| <<firstSentenceAsBriefFunction,`firstSentenceAsBriefFunction`>>
65+
| link:#firstSentenceAsBriefFunction[`firstSentenceAsBriefFunction`]
6666
|
67-
| <<noDocFunction,`noDocFunction`>>
67+
| link:#noDocFunction[`noDocFunction`]
6868
|
69-
| <<recursiveReferenceCopyFunction,`recursiveReferenceCopyFunction`>>
69+
| link:#recursiveReferenceCopyFunction[`recursiveReferenceCopyFunction`]
7070
| Final recursive brief
71-
| <<recursiveSourceFunctionA,`recursiveSourceFunctionA`>>
71+
| link:#recursiveSourceFunctionA[`recursiveSourceFunctionA`]
7272
| Final recursive brief
73-
| <<recursiveSourceFunctionB,`recursiveSourceFunctionB`>>
73+
| link:#recursiveSourceFunctionB[`recursiveSourceFunctionB`]
7474
| Final recursive brief
7575
|===
7676

0 commit comments

Comments
 (0)