diff --git a/docs/modules/ROOT/pages/generators.adoc b/docs/modules/ROOT/pages/generators.adoc index 81aefb1ec9..4d83848303 100644 --- a/docs/modules/ROOT/pages/generators.adoc +++ b/docs/modules/ROOT/pages/generators.adoc @@ -83,17 +83,10 @@ The top-level object in the DOM is the context for a template.The top-level obje |`<>` |The symbol being rendered. -|`relfileprefix` -|`string` -|The relative file prefix for the output file. - |`config` |`<>` |The configuration object. -|`sectionref` -|`string` -|The section reference. |=== [#symbol-fields] @@ -138,6 +131,21 @@ The `Symbol` object represents a symbol extracted from the source code.The symbo |=== +Handlebars generators extend each symbol with the following fields: + +|=== +|Property |Type| Description + +| `url` +| `string` +| The URL of the symbol. If the documentation is a single page, this is the anchor link to the symbol starting with `#`. If the documentation is multipage, this is the path to the symbol starting with `/`. + +| `anchor` +| `string` +| The anchor link to the symbol. This is used for section IDs in the documentation. + +|=== + The `Symbol` object has additional properties based on the kind of symbol. The following table lists the additional properties for symbols that contain information about their scope (such as Namespaces and Classes): |=== diff --git a/include/mrdocs/Metadata/DomCorpus.hpp b/include/mrdocs/Metadata/DomCorpus.hpp index d9207285c5..ee9b8831e8 100644 --- a/include/mrdocs/Metadata/DomCorpus.hpp +++ b/include/mrdocs/Metadata/DomCorpus.hpp @@ -84,6 +84,17 @@ class MRDOCS_DECL dom::Object construct(Info const& I) const; + /** Return a Dom value representing an overload set. + + A @ref Generator should override this member + and return suitable @ref dom::Value representing + the overload set. + */ + virtual + dom::Object + construct( + OverloadSet const& os) const; + /** Return a Dom object representing the given symbol. @return A value containing the symbol @@ -103,19 +114,7 @@ class MRDOCS_DECL */ virtual dom::Value - getJavadoc( - Javadoc const& jd) const; - - /** Return a Dom value representing an overload set. - - A @ref Generator should override this member - and return suitable @ref dom::Value representing - the overload set. - */ - virtual - dom::Object - getOverloads( - OverloadSet const& os) const; + getJavadoc(Javadoc const& jd) const; }; } // mrdocs diff --git a/share/mrdocs/addons/generator/adoc/layouts/index-overload-set.adoc.hbs b/share/mrdocs/addons/generator/adoc/layouts/index-overload-set.adoc.hbs index 700486845b..591c185d8c 100644 --- a/share/mrdocs/addons/generator/adoc/layouts/index-overload-set.adoc.hbs +++ b/share/mrdocs/addons/generator/adoc/layouts/index-overload-set.adoc.hbs @@ -1,7 +1,5 @@ {{! A page when the symbol type is "overloads" }} -{{#if relfileprefix}}:relfileprefix: {{relfileprefix}}{{/if}} -[#{{sectionref}}] - +[#{{symbol.anchor}}] ={{#unless @root.config.multipage}}={{/unless}} {{#if symbol.name}}{{>types/nested-name-specifier symbol=symbol.parent includeNamespace=true}}{{symbol.name}}{{else}}Unnamed overload set{{/if}} {{#if symbol.members.[0]}} diff --git a/share/mrdocs/addons/generator/adoc/layouts/index.adoc.hbs b/share/mrdocs/addons/generator/adoc/layouts/index.adoc.hbs index 256c388b08..17c6ee8e26 100644 --- a/share/mrdocs/addons/generator/adoc/layouts/index.adoc.hbs +++ b/share/mrdocs/addons/generator/adoc/layouts/index.adoc.hbs @@ -1,5 +1,2 @@ {{! The section with a symbol in single page output or the symbol page in multi page output }} -{{#if relfileprefix}}:relfileprefix: {{relfileprefix}}{{/if}} - -[#{{{sectionref}}}] {{> symbol symbol=symbol}} diff --git a/share/mrdocs/addons/generator/adoc/partials/markup/a.adoc.hbs b/share/mrdocs/addons/generator/adoc/partials/markup/a.adoc.hbs index 8230baca3a..42acfaaad9 100644 --- a/share/mrdocs/addons/generator/adoc/partials/markup/a.adoc.hbs +++ b/share/mrdocs/addons/generator/adoc/partials/markup/a.adoc.hbs @@ -1 +1 @@ -xref:{{{href}}}[{{> @partial-block }}] \ No newline at end of file +{{#if (starts_with href "#")}}<<{{{href}}},{{> @partial-block }}>>{{else}}xref:{{{href}}}[{{> @partial-block }}]{{/if}} \ No newline at end of file diff --git a/share/mrdocs/addons/generator/adoc/partials/symbols/alias.adoc.hbs b/share/mrdocs/addons/generator/adoc/partials/symbols/alias.adoc.hbs index 3157fe6d5c..6afd8eddd0 100644 --- a/share/mrdocs/addons/generator/adoc/partials/symbols/alias.adoc.hbs +++ b/share/mrdocs/addons/generator/adoc/partials/symbols/alias.adoc.hbs @@ -1,4 +1,5 @@ {{!-- alias --}} +[#{{{symbol.anchor}}}] ={{#unless @root.config.multipage}}={{/unless}} {{>types/nested-name-specifier symbol=symbol.parent includeNamespace=true}}{{symbol.name}} {{{symbol.doc.brief}}} diff --git a/share/mrdocs/addons/generator/adoc/partials/symbols/concept.adoc.hbs b/share/mrdocs/addons/generator/adoc/partials/symbols/concept.adoc.hbs index 792acdbbaf..d73b89e166 100644 --- a/share/mrdocs/addons/generator/adoc/partials/symbols/concept.adoc.hbs +++ b/share/mrdocs/addons/generator/adoc/partials/symbols/concept.adoc.hbs @@ -1,4 +1,5 @@ {{!-- concept --}} +[#{{{symbol.anchor}}}] = {{>types/nested-name-specifier symbol=symbol.parent includeNamespace=true}}{{symbol.name}} {{{symbol.doc.brief}}} diff --git a/share/mrdocs/addons/generator/adoc/partials/symbols/enum.adoc.hbs b/share/mrdocs/addons/generator/adoc/partials/symbols/enum.adoc.hbs index 08f87766a4..0cd82fe2af 100644 --- a/share/mrdocs/addons/generator/adoc/partials/symbols/enum.adoc.hbs +++ b/share/mrdocs/addons/generator/adoc/partials/symbols/enum.adoc.hbs @@ -1,4 +1,5 @@ {{!-- enum --}} +[#{{{symbol.anchor}}}] ={{#unless @root.config.multipage}}={{/unless}} {{#if symbol.name}}{{>types/nested-name-specifier symbol=symbol.parent includeNamespace=true}}{{symbol.name}}{{else}}Unnamed enum{{/if}} {{{symbol.doc.brief}}} @@ -18,7 +19,7 @@ |=== |Name |Description {{#each symbol.members}} -|xref:{{{ref}}}[`pass:v[{{>types/declarator-id . nolink=true}}]`] | {{~doc.brief}} +|xref:{{{anchor}}}[`pass:v[{{>types/declarator-id . nolink=true}}]`] | {{~doc.brief}} {{/each}} |=== {{/if}} diff --git a/share/mrdocs/addons/generator/adoc/partials/symbols/enumerator.adoc.hbs b/share/mrdocs/addons/generator/adoc/partials/symbols/enumerator.adoc.hbs index f43899234a..f1ce41bd53 100644 --- a/share/mrdocs/addons/generator/adoc/partials/symbols/enumerator.adoc.hbs +++ b/share/mrdocs/addons/generator/adoc/partials/symbols/enumerator.adoc.hbs @@ -1,4 +1,5 @@ {{!-- enumerator --}} +[#{{{symbol.anchor}}}] ={{#unless @root.config.multipage}}={{/unless}} {{>types/nested-name-specifier symbol=symbol.parent includeNamespace=true}}{{symbol.name}} {{{symbol.doc.brief}}} diff --git a/share/mrdocs/addons/generator/adoc/partials/symbols/field.adoc.hbs b/share/mrdocs/addons/generator/adoc/partials/symbols/field.adoc.hbs index 137922f14f..09838cc200 100644 --- a/share/mrdocs/addons/generator/adoc/partials/symbols/field.adoc.hbs +++ b/share/mrdocs/addons/generator/adoc/partials/symbols/field.adoc.hbs @@ -1,4 +1,5 @@ {{!-- field --}} +[#{{{symbol.anchor}}}] ={{#unless @root.config.multipage}}={{/unless}} {{>types/nested-name-specifier symbol=symbol.parent includeNamespace=true}}{{symbol.name}} {{{symbol.doc.brief}}} diff --git a/share/mrdocs/addons/generator/adoc/partials/symbols/friend.adoc.hbs b/share/mrdocs/addons/generator/adoc/partials/symbols/friend.adoc.hbs index d2726c7cb8..fecd77eebb 100644 --- a/share/mrdocs/addons/generator/adoc/partials/symbols/friend.adoc.hbs +++ b/share/mrdocs/addons/generator/adoc/partials/symbols/friend.adoc.hbs @@ -1,4 +1,5 @@ {{!-- friend --}} +[#{{{symbol.anchor}}}] ={{#unless @root.config.multipage}}={{/unless}} {{#if symbol.symbol}}{{>types/nested-name-specifier symbol=symbol.symbol.parent includeNamespace=true}}{{symbol.symbol.name}}{{else}}{{symbol.type.name}}{{/if}} {{{symbol.doc.brief}}} diff --git a/share/mrdocs/addons/generator/adoc/partials/symbols/function.adoc.hbs b/share/mrdocs/addons/generator/adoc/partials/symbols/function.adoc.hbs index cf42c95d79..f98373ad1c 100644 --- a/share/mrdocs/addons/generator/adoc/partials/symbols/function.adoc.hbs +++ b/share/mrdocs/addons/generator/adoc/partials/symbols/function.adoc.hbs @@ -1,4 +1,5 @@ {{!-- function --}} +[#{{{symbol.anchor}}}] ={{#unless @root.config.multipage}}={{/unless}} {{>types/nested-name-specifier symbol=symbol.parent includeNamespace=true}}{{symbol.name}} {{{symbol.doc.brief}}} diff --git a/share/mrdocs/addons/generator/adoc/partials/symbols/guide.adoc.hbs b/share/mrdocs/addons/generator/adoc/partials/symbols/guide.adoc.hbs index 87e7b6f2a4..1ef93f9408 100644 --- a/share/mrdocs/addons/generator/adoc/partials/symbols/guide.adoc.hbs +++ b/share/mrdocs/addons/generator/adoc/partials/symbols/guide.adoc.hbs @@ -1,4 +1,5 @@ {{!-- guides --}} +[#{{{symbol.anchor}}}] ={{#unless @root.config.multipage}}={{/unless}} {{>types/nested-name-specifier symbol=symbol.parent includeNamespace=true}}{{symbol.name}} {{{symbol.doc.brief}}} diff --git a/share/mrdocs/addons/generator/adoc/partials/symbols/namespace.adoc.hbs b/share/mrdocs/addons/generator/adoc/partials/symbols/namespace.adoc.hbs index 0585142359..6712e33c5a 100644 --- a/share/mrdocs/addons/generator/adoc/partials/symbols/namespace.adoc.hbs +++ b/share/mrdocs/addons/generator/adoc/partials/symbols/namespace.adoc.hbs @@ -1,4 +1,5 @@ {{!-- namespace --}} +[#{{{symbol.anchor}}}] ={{#unless @root.config.multipage}}={{/unless}} {{#if symbol.name}}{{>types/nested-name-specifier symbol=symbol.parent includeNamespace=true}}{{symbol.name}}{{else if symbol.parent}}Unnamed namespace{{else}}Global namespace{{/if}} {{>types/tranche tranche=symbol.interface label="" is-namespace=true}} diff --git a/share/mrdocs/addons/generator/adoc/partials/symbols/record.adoc.hbs b/share/mrdocs/addons/generator/adoc/partials/symbols/record.adoc.hbs index c30af1aa7f..4d710efb5f 100644 --- a/share/mrdocs/addons/generator/adoc/partials/symbols/record.adoc.hbs +++ b/share/mrdocs/addons/generator/adoc/partials/symbols/record.adoc.hbs @@ -1,4 +1,5 @@ {{!-- record --}} +[#{{{symbol.anchor}}}] ={{#unless @root.config.multipage}}={{/unless}} {{#if symbol.name}}{{>types/nested-name-specifier symbol=symbol.parent includeNamespace=true}}{{symbol.name}}{{else}}Unnamed class{{/if}} {{{symbol.doc.brief}}} diff --git a/share/mrdocs/addons/generator/adoc/partials/symbols/typedef.adoc.hbs b/share/mrdocs/addons/generator/adoc/partials/symbols/typedef.adoc.hbs index b8be8f82fd..70b008f1e4 100644 --- a/share/mrdocs/addons/generator/adoc/partials/symbols/typedef.adoc.hbs +++ b/share/mrdocs/addons/generator/adoc/partials/symbols/typedef.adoc.hbs @@ -1,4 +1,5 @@ {{!-- typedef --}} +[#{{{symbol.anchor}}}] ={{#unless @root.config.multipage}}={{/unless}} {{>types/nested-name-specifier symbol=symbol.parent includeNamespace=true}}{{symbol.name}} {{{symbol.doc.brief}}} diff --git a/share/mrdocs/addons/generator/adoc/partials/symbols/undefined.adoc.hbs b/share/mrdocs/addons/generator/adoc/partials/symbols/undefined.adoc.hbs index 5eccaf178d..882798a4c8 100644 --- a/share/mrdocs/addons/generator/adoc/partials/symbols/undefined.adoc.hbs +++ b/share/mrdocs/addons/generator/adoc/partials/symbols/undefined.adoc.hbs @@ -1 +1,2 @@ {{!-- undefined --}} +[#{{{symbol.anchor}}}] diff --git a/share/mrdocs/addons/generator/adoc/partials/symbols/using.adoc.hbs b/share/mrdocs/addons/generator/adoc/partials/symbols/using.adoc.hbs index 2a0517a81e..fe72dea994 100644 --- a/share/mrdocs/addons/generator/adoc/partials/symbols/using.adoc.hbs +++ b/share/mrdocs/addons/generator/adoc/partials/symbols/using.adoc.hbs @@ -1,4 +1,5 @@ {{!-- symbols/using.adoc.hbs --}} +[#{{{symbol.anchor}}}] ={{#unless @root.config.multipage}}={{/unless}} {{>types/nested-name-specifier symbol=symbol.parent includeNamespace=true}}{{symbol.name}} {{{symbol.doc.brief}}} diff --git a/share/mrdocs/addons/generator/adoc/partials/symbols/variable.adoc.hbs b/share/mrdocs/addons/generator/adoc/partials/symbols/variable.adoc.hbs index 628b2be50f..617e54c79b 100644 --- a/share/mrdocs/addons/generator/adoc/partials/symbols/variable.adoc.hbs +++ b/share/mrdocs/addons/generator/adoc/partials/symbols/variable.adoc.hbs @@ -1,4 +1,5 @@ {{!-- variable --}} +[#{{{symbol.anchor}}}] ={{#unless @root.config.multipage}}={{/unless}} {{>types/nested-name-specifier symbol=symbol.parent includeNamespace=true}}{{symbol.name}} {{{symbol.doc.brief}}} diff --git a/share/mrdocs/addons/generator/common/partials/types/declarator-id.hbs b/share/mrdocs/addons/generator/common/partials/types/declarator-id.hbs index 250aea6035..32e56aa5b8 100644 --- a/share/mrdocs/addons/generator/common/partials/types/declarator-id.hbs +++ b/share/mrdocs/addons/generator/common/partials/types/declarator-id.hbs @@ -4,7 +4,7 @@ {{else if (eq kind "guide")~}} {{>types/declarator deduced nolink=nolink~}} {{else~}} - {{#if (and link.ref (not nolink))}}{{#>markup/a href=link.ref}}{{name}}{{/markup/a}}{{else}}{{name}}{{/if~}} + {{#if (and link.url (not nolink))}}{{#>markup/a href=(relativize link.url)}}{{name}}{{/markup/a}}{{else}}{{name}}{{/if~}} {{#if (or (eq template.kind "explicit") (eq template.kind "partial"))~}} {{>types/template-args args=template.args nolink=nolink~}} {{/if~}} diff --git a/share/mrdocs/addons/generator/common/partials/types/info-member.hbs b/share/mrdocs/addons/generator/common/partials/types/info-member.hbs index 25b91c8491..4a5a4b2926 100644 --- a/share/mrdocs/addons/generator/common/partials/types/info-member.hbs +++ b/share/mrdocs/addons/generator/common/partials/types/info-member.hbs @@ -1,7 +1,7 @@ {{! Helper for "info-list": renders a symbol as a row in a table of members }} {{#>markup/tr~}} {{#>markup/td~}} - {{#>markup/a href=ref}}{{#>markup/code}}{{>types/declarator-id . nolink=true}}{{/markup/code}}{{/markup/a}} {{>types/special-name-suffix .}} + {{#>markup/a href=(relativize url)}}{{#>markup/code}}{{>types/declarator-id . nolink=true}}{{/markup/code}}{{/markup/a}} {{>types/special-name-suffix .}} {{~/markup/td}} {{#>markup/td~}} {{#if (ne kind "overload")~}} diff --git a/share/mrdocs/addons/generator/common/partials/types/name-info.hbs b/share/mrdocs/addons/generator/common/partials/types/name-info.hbs index ce6b968f7b..fbabcbb167 100644 --- a/share/mrdocs/addons/generator/common/partials/types/name-info.hbs +++ b/share/mrdocs/addons/generator/common/partials/types/name-info.hbs @@ -3,5 +3,5 @@ {{>types/name-info prefix nolink=nolink~}}:: {{~/if~}} {{#if (or (eq name "see-below") (eq name "implementation-defined"))~}}{{ str '_'}}{{name}}{{ str '_'}}{{else~}} -{{#if (and symbol.ref (not nolink))}}{{#>markup/a href=symbol.ref}}{{name}}{{/markup/a}}{{else~}} +{{#if (and symbol.url (not nolink))}}{{#>markup/a href=(relativize symbol.url)}}{{name}}{{/markup/a}}{{else~}} {{name}}{{/if}}{{#if args}}{{>types/template-args args=args nolink=nolink}}{{/if~}}{{/if~}} \ No newline at end of file diff --git a/share/mrdocs/addons/generator/common/partials/types/qualified-path.hbs b/share/mrdocs/addons/generator/common/partials/types/qualified-path.hbs index d65f141a90..6b75458332 100644 --- a/share/mrdocs/addons/generator/common/partials/types/qualified-path.hbs +++ b/share/mrdocs/addons/generator/common/partials/types/qualified-path.hbs @@ -4,5 +4,5 @@ {{>types/qualified-path symbol=symbol.parent nolink=nolink~}} {{else~}} {{/if~}} -{{#if symbol.name}}{{#if (not nolink)}}{{#>markup/a href=symbol.ref}}{{symbol.name}}{{/markup/a}}{{else}}{{symbol.name}}{{/if}}::{{/if~}} +{{#if symbol.name}}{{#if (not nolink)}}{{#>markup/a href=(relativize symbol.url)}}{{symbol.name}}{{/markup/a}}{{else}}{{symbol.name}}{{/if}}::{{/if~}} {{/unless}} \ No newline at end of file diff --git a/share/mrdocs/addons/generator/common/partials/types/source.hbs b/share/mrdocs/addons/generator/common/partials/types/source.hbs index 2cfce3fb03..beb9a55474 100644 --- a/share/mrdocs/addons/generator/common/partials/types/source.hbs +++ b/share/mrdocs/addons/generator/common/partials/types/source.hbs @@ -9,7 +9,7 @@ {{ str "<" }}{{#unless (and @root.config.base-url (eq dcl.kind "source"))~}} {{dcl.file}} {{~else~}} - {{#>markup/a href=(concat @root.config.base-url dcl.file '#L' dcl.line)}}{{dcl.file}}{{/markup/a}}> + {{#>markup/a href=(concat @root.config.base-url dcl.file '#L' dcl.line)}}{{dcl.file}}{{/markup/a}} {{~/unless~}}{{ str ">" }} {{~/markup/code}} {{~/markup/span}} diff --git a/share/mrdocs/addons/generator/common/partials/types/template-arg.hbs b/share/mrdocs/addons/generator/common/partials/types/template-arg.hbs index e852d4e327..d0df22bde5 100644 --- a/share/mrdocs/addons/generator/common/partials/types/template-arg.hbs +++ b/share/mrdocs/addons/generator/common/partials/types/template-arg.hbs @@ -4,6 +4,6 @@ {{else if (eq kind "non-type")~}} {{~value~}} {{else if (eq kind "template")~}} -{{#if (and template (not nolink))}}xref:{{template.ref}}[{{name~}}]{{else~}}{{name~}}{{/if~}} +{{#if (and template (not nolink))}}{{#>markup/a href=(relativize template.url)}}{{name}}{{/markup/a}}{{else~}}{{name~}}{{/if~}} {{/if~}} {{~#if is-pack}}...{{/if~}} diff --git a/share/mrdocs/addons/generator/html/layouts/index-overload-set.html.hbs b/share/mrdocs/addons/generator/html/layouts/index-overload-set.html.hbs index 414e169331..0153eb7694 100644 --- a/share/mrdocs/addons/generator/html/layouts/index-overload-set.html.hbs +++ b/share/mrdocs/addons/generator/html/layouts/index-overload-set.html.hbs @@ -1,6 +1,5 @@ {{! A page when the symbol type is "overloads" }} -{{#if relfileprefix}}{{/if}} -
+

{{#if symbol.name}}Overload set {{>types/nested-name-specifier symbol=symbol.parent}}{{symbol.name}}{{else}}Unnamed overload set{{/if}}

@@ -11,7 +10,7 @@

{{member.doc.brief}}

{{> (concat 'signature' '/' (lookup member 'kind')) symbol=member}};
-» more... +» more... {{/each}} diff --git a/share/mrdocs/addons/generator/html/partials/symbols/alias.html.hbs b/share/mrdocs/addons/generator/html/partials/symbols/alias.html.hbs index cca2c2c403..74cb773cb3 100644 --- a/share/mrdocs/addons/generator/html/partials/symbols/alias.html.hbs +++ b/share/mrdocs/addons/generator/html/partials/symbols/alias.html.hbs @@ -1,5 +1,5 @@ {{!-- alias --}} -
+

{{>types/nested-name-specifier symbol=symbol.parent}}{{symbol.name}}

{{{symbol.doc.brief}}} diff --git a/share/mrdocs/addons/generator/html/partials/symbols/concept.html.hbs b/share/mrdocs/addons/generator/html/partials/symbols/concept.html.hbs index 9bb2fd5ec3..9474a70121 100644 --- a/share/mrdocs/addons/generator/html/partials/symbols/concept.html.hbs +++ b/share/mrdocs/addons/generator/html/partials/symbols/concept.html.hbs @@ -1,5 +1,5 @@ {{!-- concept --}} -
+

{{>types/nested-name-specifier symbol=symbol.parent includeNamespace=true}}{{symbol.name}}

{{{symbol.doc.brief}}} diff --git a/share/mrdocs/addons/generator/html/partials/symbols/enum.html.hbs b/share/mrdocs/addons/generator/html/partials/symbols/enum.html.hbs index 742ec243fa..47e1cbd707 100644 --- a/share/mrdocs/addons/generator/html/partials/symbols/enum.html.hbs +++ b/share/mrdocs/addons/generator/html/partials/symbols/enum.html.hbs @@ -1,5 +1,5 @@ {{!-- enum --}} -
+

{{#if symbol.name}}Enum {{>types/nested-name-specifier symbol=symbol.parent}}{{symbol.name}}{{else}}Unnamed enum{{/if}}

{{{symbol.doc.brief}}} @@ -30,7 +30,7 @@ {{#each symbol.members}} - {{>types/declarator-id . nolink=true}} + {{>types/declarator-id . nolink=true}} {{{doc.brief}}} {{/each}} diff --git a/share/mrdocs/addons/generator/html/partials/symbols/enumerator.html.hbs b/share/mrdocs/addons/generator/html/partials/symbols/enumerator.html.hbs index a41686249d..0e562f6536 100644 --- a/share/mrdocs/addons/generator/html/partials/symbols/enumerator.html.hbs +++ b/share/mrdocs/addons/generator/html/partials/symbols/enumerator.html.hbs @@ -1,5 +1,5 @@ {{!-- enumerator --}} -
+

Enumerator {{>types/nested-name-specifier symbol=symbol.parent}}{{symbol.name}}

{{{symbol.doc.brief}}} diff --git a/share/mrdocs/addons/generator/html/partials/symbols/field.html.hbs b/share/mrdocs/addons/generator/html/partials/symbols/field.html.hbs index 96dadaf0dc..481bf60d4a 100644 --- a/share/mrdocs/addons/generator/html/partials/symbols/field.html.hbs +++ b/share/mrdocs/addons/generator/html/partials/symbols/field.html.hbs @@ -1,5 +1,5 @@ {{!-- field --}} -
+

{{>types/nested-name-specifier symbol=symbol.parent}}{{symbol.name}}

{{{symbol.doc.brief}}} diff --git a/share/mrdocs/addons/generator/html/partials/symbols/friend.html.hbs b/share/mrdocs/addons/generator/html/partials/symbols/friend.html.hbs index 18284214ee..a7549cd2dc 100644 --- a/share/mrdocs/addons/generator/html/partials/symbols/friend.html.hbs +++ b/share/mrdocs/addons/generator/html/partials/symbols/friend.html.hbs @@ -1,5 +1,5 @@ {{!-- friend --}} -
+

Friend {{#if symbol.symbol}}{{symbol.symbol.name}}{{else}}{{symbol.type.name}}{{/if}}

{{{symbol.doc.brief}}} diff --git a/share/mrdocs/addons/generator/html/partials/symbols/function.html.hbs b/share/mrdocs/addons/generator/html/partials/symbols/function.html.hbs index cd1843752e..e73ae70987 100644 --- a/share/mrdocs/addons/generator/html/partials/symbols/function.html.hbs +++ b/share/mrdocs/addons/generator/html/partials/symbols/function.html.hbs @@ -1,5 +1,5 @@ {{!-- function --}} -
+

Function {{>types/nested-name-specifier symbol=symbol.parent}}{{symbol.name}}

{{{symbol.doc.brief}}} diff --git a/share/mrdocs/addons/generator/html/partials/symbols/guide.html.hbs b/share/mrdocs/addons/generator/html/partials/symbols/guide.html.hbs index c4bb7a5354..2946d69c18 100644 --- a/share/mrdocs/addons/generator/html/partials/symbols/guide.html.hbs +++ b/share/mrdocs/addons/generator/html/partials/symbols/guide.html.hbs @@ -1,5 +1,5 @@ {{!-- guides --}} -
+

Deduction guide {{>types/nested-name-specifier symbol=symbol.parent}}{{symbol.name}}

{{{symbol.doc.brief}}} diff --git a/share/mrdocs/addons/generator/html/partials/symbols/namespace.html.hbs b/share/mrdocs/addons/generator/html/partials/symbols/namespace.html.hbs index 736c9799a9..43de63bda5 100644 --- a/share/mrdocs/addons/generator/html/partials/symbols/namespace.html.hbs +++ b/share/mrdocs/addons/generator/html/partials/symbols/namespace.html.hbs @@ -1,5 +1,5 @@ {{!-- namespace --}} -
+

{{#if symbol.name}}Namespace {{>types/nested-name-specifier symbol=symbol.parent}}{{symbol.name}}{{else if symbol.parent}}Unnamed namespace{{else}}Global namespace{{/if}}

diff --git a/share/mrdocs/addons/generator/html/partials/symbols/record.html.hbs b/share/mrdocs/addons/generator/html/partials/symbols/record.html.hbs index edb886d40b..cdea000515 100644 --- a/share/mrdocs/addons/generator/html/partials/symbols/record.html.hbs +++ b/share/mrdocs/addons/generator/html/partials/symbols/record.html.hbs @@ -1,5 +1,5 @@ {{!-- record --}} -
+

{{#if symbol.name}}Class {{>types/nested-name-specifier symbol=symbol.parent}}{{symbol.name}}{{else}}Unnamed class{{/if}}

{{{symbol.doc.brief}}} diff --git a/share/mrdocs/addons/generator/html/partials/symbols/typedef.html.hbs b/share/mrdocs/addons/generator/html/partials/symbols/typedef.html.hbs index 31f5c3c335..3d8fa678ea 100644 --- a/share/mrdocs/addons/generator/html/partials/symbols/typedef.html.hbs +++ b/share/mrdocs/addons/generator/html/partials/symbols/typedef.html.hbs @@ -1,5 +1,5 @@ {{!-- typedef --}} -
+

{{>types/nested-name-specifier symbol=symbol.parent}}{{symbol.name}}

{{{symbol.doc.brief}}} diff --git a/share/mrdocs/addons/generator/html/partials/symbols/using.html.hbs b/share/mrdocs/addons/generator/html/partials/symbols/using.html.hbs index 395ca55874..b63c0fdb4f 100644 --- a/share/mrdocs/addons/generator/html/partials/symbols/using.html.hbs +++ b/share/mrdocs/addons/generator/html/partials/symbols/using.html.hbs @@ -1,5 +1,5 @@ {{!-- symbols/using.html.hbs --}} -
+

Using {{#if (eq symbol.class "namespace")}}Directive: {{symbol.qualifier.name}}{{else}}Declaration: {{symbol.name}}{{/if}}

{{{symbol.doc.brief}}} diff --git a/share/mrdocs/addons/generator/html/partials/symbols/variable.html.hbs b/share/mrdocs/addons/generator/html/partials/symbols/variable.html.hbs index dced19b8f7..cf5bb15466 100644 --- a/share/mrdocs/addons/generator/html/partials/symbols/variable.html.hbs +++ b/share/mrdocs/addons/generator/html/partials/symbols/variable.html.hbs @@ -1,5 +1,5 @@ {{!-- variable --}} -
+

{{>types/nested-name-specifier symbol=symbol.parent}}{{symbol.name}}

{{{symbol.doc.brief}}} diff --git a/src/lib/Gen/adoc/DocVisitor.cpp b/src/lib/Gen/adoc/DocVisitor.cpp index edba062748..0191034b21 100644 --- a/src/lib/Gen/adoc/DocVisitor.cpp +++ b/src/lib/Gen/adoc/DocVisitor.cpp @@ -260,7 +260,7 @@ operator()(doc::Reference const& I) if(I.id == SymbolID::invalid) return (*this)(static_cast(I)); fmt::format_to(std::back_inserter(dest_), "xref:{}[{}]", - corpus_.getXref(corpus_->get(I.id)), escapeAdoc(I.string)); + corpus_.getURL(corpus_->get(I.id)), escapeAdoc(I.string)); } std::size_t diff --git a/src/lib/Gen/hbs/Builder.cpp b/src/lib/Gen/hbs/Builder.cpp index b4a39a9655..19a1786678 100644 --- a/src/lib/Gen/hbs/Builder.cpp +++ b/src/lib/Gen/hbs/Builder.cpp @@ -67,8 +67,102 @@ loadPartials( exp.error().Throw(); } } + +/* Make a URL relative to another URL. + + This function is a version of the Antora `relativize` helper, + used to create relative URLs between two paths in Antora projects. + + The function takes two paths, `to` and `from`, and returns a + relative path from `from` to `to`. + + If `from` is not provided, then the URL of the symbol being + rendered is used as the `from` path. + + @see https://gitlab.com/antora/antora-ui-default/-/blob/master/src/helpers/relativize.js + */ +dom::Value +relativize_fn(dom::Value to0, dom::Value from0, dom::Value options) +{ + if (!to0) + { + return "#"; + } + + if (!to0.isString()) + { + return to0; + } + + std::string_view to = to0.getString().get(); + if (!to.starts_with('/')) + { + return to0; + } + + // Single argument invocation + bool const singleArg = !options; + if (singleArg) + { + // NOTE only legacy invocation provides both to and from0 + options = from0; + from0 = options.lookup("data.root.symbol.url"); + } + + // If `from` is still not set as a string + if (!from0.isString() || from0.getString().empty()) + { + return to; + } + std::string_view from = from0.getString().get(); + + // Find anchor in URL + std::string_view hash; + std::size_t hashIdx = to.find('#'); + if (hashIdx != std::string_view::npos) + { + hash = to.substr(hashIdx); + to = to.substr(0, hashIdx); + } + + // Handle the case where they are the same URL + if (to == from) + { + if (!hash.empty()) + { + return hash; + } + else if (files::isDirsy(to)) + { + return "./"; + } + return files::getFileName(to); + } + + // Handle the general case + std::string fromDir = files::getParentDir(from); + std::string relativePath = std::filesystem::path(to).lexically_relative(fromDir).generic_string(); + if (relativePath.empty()) + { + relativePath = "."; + } + if (!relativePath.starts_with("../") && !relativePath.starts_with("./")) + { + relativePath = "./" + relativePath; + } + relativePath += hash; + + if (relativePath == "/boost.adoc") + { + relativePath = "." + relativePath; + } + return relativePath; } +} // (anon) + + + Builder:: Builder( HandlebarsCorpus const& corpus, @@ -143,6 +237,7 @@ Builder( helpers::registerAntoraHelpers(hbs_); helpers::registerLogicalHelpers(hbs_); helpers::registerContainerHelpers(hbs_); + hbs_.registerHelper("relativize", dom::makeInvocable(relativize_fn)); // load templates exp = forEachFile(layoutDir(), false, @@ -218,23 +313,18 @@ createContext( { dom::Object ctx; ctx.set("symbol", domCorpus.get(I.id)); - ctx.set("relfileprefix", getRelPrefix(I.Namespace.size())); ctx.set("config", domCorpus->config.object()); - ctx.set("sectionref", domCorpus.names_.getQualified(I.id, '-')); return ctx; } dom::Object Builder:: createContext( - OverloadSet const& OS) + OverloadSet const& I) { dom::Object ctx; - ctx.set("symbol", domCorpus.getOverloads(OS)); - const Info& Parent = domCorpus->get(OS.Parent); - ctx.set("relfileprefix", getRelPrefix(Parent.Namespace.size() + 1)); + ctx.set("symbol", domCorpus.construct(I)); ctx.set("config", domCorpus->config.object()); - ctx.set("sectionref", domCorpus.names_.getQualified(OS, '-')); return ctx; } diff --git a/src/lib/Gen/hbs/HandlebarsCorpus.cpp b/src/lib/Gen/hbs/HandlebarsCorpus.cpp index 36c6edf20c..4aa93f98bf 100644 --- a/src/lib/Gen/hbs/HandlebarsCorpus.cpp +++ b/src/lib/Gen/hbs/HandlebarsCorpus.cpp @@ -11,7 +11,6 @@ // #include "HandlebarsCorpus.hpp" -#include "lib/Support/Radix.hpp" #include #include #include @@ -106,53 +105,58 @@ HandlebarsCorpus:: construct(Info const& I) const { dom::Object obj = this->DomCorpus::construct(I); - obj.set("ref", getXref(I)); + obj.set("url", getURL(I)); + obj.set("anchor", names_.getQualified(I.id, '-')); return obj; } -std::string +dom::Object HandlebarsCorpus:: -getXref(Info const& I) const +construct( + OverloadSet const& I) const { - bool multipage = getCorpus().config->multipage; - // use '/' as the seperator for multipage, and '-' for single-page - std::string xref; - if(!multipage) - { - xref += "#"; - } - char delim = multipage ? '/' : '-'; - xref += names_.getQualified(I.id, delim); - // add the file extension if in multipage mode - if(multipage) - { - xref.append("."); - xref.append(fileExtension); - } - return xref; + auto obj = this->DomCorpus::construct(I); + obj.set("url", getURL(I)); + obj.set("anchor", names_.getQualified(I, '-')); + return obj; } +template +requires std::derived_from || std::same_as std::string HandlebarsCorpus:: -getXref(OverloadSet const& os) const +getURL(T const& I) const { - bool multipage = getCorpus().config->multipage; - // use '/' as the seperator for multipage, and '-' for single-page - std::string xref = names_.getQualified( - os, multipage ? '/' : '-'); - // add the file extension if in multipage mode - if(multipage) + bool const multipage = getCorpus().config->multipage; + char const prefix = multipage ? '/' : '#'; + char const delim = multipage ? '/' : '-'; + std::string href(1, prefix); + if constexpr (std::derived_from) + { + href += names_.getQualified(I.id, delim); + } + else if constexpr (std::same_as) + { + href += names_.getQualified(I, delim); + } + if (multipage) { - xref.append("."); - xref.append(fileExtension); + href.append("."); + href.append(fileExtension); } - return xref; + return href; } +// Define Builder::operator() for each Info type +#define INFO(T) template std::string HandlebarsCorpus::getURL(T##Info const&) const; +#include + +template std::string HandlebarsCorpus::getURL(OverloadSet const&) const; + + dom::Value HandlebarsCorpus:: -getJavadoc( - Javadoc const& jd) const +getJavadoc(Javadoc const& jd) const { dom::Object::storage_type objKeyValues; objKeyValues.reserve(2); @@ -225,21 +229,6 @@ getJavadoc( return dom::Object(std::move(objKeyValues)); } -dom::Object -HandlebarsCorpus:: -getOverloads( - OverloadSet const& os) const -{ - auto obj = DomCorpus::getOverloads(os); - // KRYSTIAN FIXME: need a better way to generate IDs - // std::string xref = - obj.set("ref", getXref(os)); - // std::replace(xref.begin(), xref.end(), '/', '-'); - obj.set("id", fmt::format("{}-{}", - toBase16(os.Parent), os.Name)); - return obj; -} - } // hbs } // mrdocs } // clang diff --git a/src/lib/Gen/hbs/HandlebarsCorpus.hpp b/src/lib/Gen/hbs/HandlebarsCorpus.hpp index 482f4f15d6..e4e39ddb57 100644 --- a/src/lib/Gen/hbs/HandlebarsCorpus.hpp +++ b/src/lib/Gen/hbs/HandlebarsCorpus.hpp @@ -67,21 +67,24 @@ class HandlebarsCorpus : public DomCorpus dom::Object construct(Info const& I) const override; - /** Get the cross-reference for the given Info. + /** Construct a dom::Object from the given OverloadSet. - @param I The Info object to get the cross-reference for. - @return A string representing the cross-reference. + @param os The OverloadSet to get the overloads for. + @return A dom::Object representing the overloads. */ - std::string - getXref(Info const& I) const; + dom::Object + construct( + OverloadSet const& os) const override; - /** Get the cross-reference for the given OverloadSet. + /** Get the cross-reference for the given Info. - @param os The OverloadSet to get the cross-reference for. + @param I The Info object to get the cross-reference for. @return A string representing the cross-reference. */ + template + requires std::derived_from || std::same_as std::string - getXref(OverloadSet const& os) const; + getURL(T const& I) const; /** Return a Dom value representing the Javadoc. @@ -89,17 +92,7 @@ class HandlebarsCorpus : public DomCorpus @return A dom::Value representing the Javadoc. */ dom::Value - getJavadoc( - Javadoc const& jd) const override; - - /** Return a Dom value representing an overload set. - - @param os The OverloadSet to get the overloads for. - @return A dom::Object representing the overloads. - */ - dom::Object - getOverloads( - OverloadSet const& os) const override; + getJavadoc(Javadoc const& jd) const override; }; } // hbs diff --git a/src/lib/Gen/hbs/MultiPageVisitor.cpp b/src/lib/Gen/hbs/MultiPageVisitor.cpp index ca521fcce2..e93164e2b4 100644 --- a/src/lib/Gen/hbs/MultiPageVisitor.cpp +++ b/src/lib/Gen/hbs/MultiPageVisitor.cpp @@ -43,7 +43,7 @@ operator()(T const& I0) // =================================== // Open the output file // =================================== - std::string path = files::appendPath(outputPath_, builder.domCorpus.getXref(I)); + std::string path = files::appendPath(outputPath_, builder.domCorpus.getURL(I)); std::string dir = files::getParentDir(path); if (auto exp = files::createDirectory(dir); !exp) { diff --git a/src/lib/Gen/html/DocVisitor.cpp b/src/lib/Gen/html/DocVisitor.cpp index 29741830bc..6297c8d272 100644 --- a/src/lib/Gen/html/DocVisitor.cpp +++ b/src/lib/Gen/html/DocVisitor.cpp @@ -212,7 +212,7 @@ operator()(doc::Reference const& I) if(I.id == SymbolID::invalid) return (*this)(static_cast(I)); fmt::format_to(std::back_inserter(dest_), "{}", - corpus_.getXref(corpus_->get(I.id)), I.string); + corpus_.getURL(corpus_->get(I.id)), I.string); } void diff --git a/src/lib/Metadata/DomCorpus.cpp b/src/lib/Metadata/DomCorpus.cpp index 57057c9c93..9cb7c0f0b5 100644 --- a/src/lib/Metadata/DomCorpus.cpp +++ b/src/lib/Metadata/DomCorpus.cpp @@ -104,6 +104,14 @@ construct(Info const& I) const return dom::ValueFrom(I, this).getObject(); } +dom::Object +DomCorpus:: +construct( + OverloadSet const& overloads) const +{ + return dom::ValueFrom(overloads, this).getObject(); +} + dom::Value DomCorpus:: get(SymbolID const& id) const @@ -115,20 +123,11 @@ get(SymbolID const& id) const dom::Value DomCorpus:: -getJavadoc( - Javadoc const& jd) const +getJavadoc(Javadoc const&) const { // Default implementation returns null. return nullptr; } -dom::Object -DomCorpus:: -getOverloads( - OverloadSet const& overloads) const -{ - return dom::ValueFrom(overloads, this).getObject(); -} - } // mrdocs } // clang diff --git a/src/lib/Metadata/Overloads.cpp b/src/lib/Metadata/Overloads.cpp index 13731fa218..510311cde1 100644 --- a/src/lib/Metadata/Overloads.cpp +++ b/src/lib/Metadata/Overloads.cpp @@ -16,6 +16,7 @@ #include #include #include +#include "lib/Support/Radix.hpp" namespace clang { namespace mrdocs { @@ -34,6 +35,8 @@ tag_invoke( * by the `Info` tag_invoke. */ v = dom::Object({ + // KRYSTIAN FIXME: need a better way to generate IDs + { "id", fmt::format("{}-{}", toBase16(overloads.Parent), overloads.Name) }, { "kind", "overload"}, { "name", overloads.Name }, { "members", dom::LazyArray(overloads.Members, domCorpus) }, diff --git a/src/lib/Metadata/Scope.cpp b/src/lib/Metadata/Scope.cpp index f53b0dc113..4bec3ddb2a 100644 --- a/src/lib/Metadata/Scope.cpp +++ b/src/lib/Metadata/Scope.cpp @@ -37,7 +37,7 @@ generateScopeOverloadsArray( } else /* if constexpr(std::is_same_v) */ { - res.push_back(domCorpus.getOverloads(C)); + res.push_back(domCorpus.construct(C)); } }); return res; diff --git a/src/lib/Support/Handlebars.cpp b/src/lib/Support/Handlebars.cpp index 369883e312..22a87bb71b 100644 --- a/src/lib/Support/Handlebars.cpp +++ b/src/lib/Support/Handlebars.cpp @@ -1880,6 +1880,15 @@ evalExpr( dom::Object cb = dom::newObject(); cb.set("name", helper); cb.set("context", context); + dom::Object data; + if (!state.context.empty()) + { + data = createFrame(state.context); + } + data.set("root", state.rootContext); + cb.set("data", data); + cb.set("root", state.rootContext); + cb.set("log", logger_); setupArgs(all, context, state, args, cb, opt); return Res{fn.call(args).value(), true, false, true}; MRDOCS_UNREACHABLE(); @@ -2414,7 +2423,13 @@ renderExpression( dom::Object cb = dom::newObject(); cb.set("name", tag.helper); cb.set("context", context); - cb.set("data", state.context); + dom::Object data; + if (!state.context.empty()) + { + data = createFrame(state.context); + } + data.set("root", state.rootContext); + cb.set("data", data); cb.set("log", logger_); HandlebarsOptions noStrict = opt; noStrict.strict = false; @@ -2449,7 +2464,13 @@ renderExpression( dom::Object cb = dom::newObject(); cb.set("name", helper_expr); cb.set("context", context); - cb.set("data", state.context); + dom::Object data; + if (!state.context.empty()) + { + data = createFrame(state.context); + } + data.set("root", state.rootContext); + cb.set("data", data); cb.set("log", logger_); HandlebarsOptions noStrict = opt; noStrict.strict = false; @@ -2487,7 +2508,13 @@ renderExpression( dom::Object cb = dom::newObject(); cb.set("name", helper_expr); cb.set("context", context); - cb.set("data", state.context); + dom::Object data; + if (!state.context.empty()) + { + data = createFrame(state.context); + } + data.set("root", state.rootContext); + cb.set("data", data); cb.set("log", logger_); HandlebarsOptions noStrict = opt; noStrict.strict = false; @@ -3071,7 +3098,13 @@ renderBlock( dom::Object cb = dom::newObject(); cb.set("name", tag.helper); cb.set("context", context); - cb.set("data", state.context); + dom::Object data; + if (!state.context.empty()) + { + data = createFrame(state.context); + } + data.set("root", state.rootContext); + cb.set("data", data); cb.set("log", logger_); HandlebarsOptions noStrict = opt; noStrict.strict = opt.strict && emulateMustache; @@ -3779,7 +3812,6 @@ registerAntoraHelpers(Handlebars& hbs) hbs.registerHelper("ne", dom::makeVariadicInvocable(ne_fn)); hbs.registerHelper("not", dom::makeVariadicInvocable(not_fn)); hbs.registerHelper("or", dom::makeVariadicInvocable(or_fn)); - hbs.registerHelper("relativize", dom::makeInvocable(relativize_fn)); hbs.registerHelper("year", dom::makeInvocable(year_fn)); } @@ -3915,89 +3947,6 @@ detag_fn(dom::Value html) return result; } -dom::Value -relativize_fn(dom::Value to, dom::Value from, dom::Value context) -{ - // https://gitlab.com/antora/antora-ui-default/-/blob/master/src/helpers/relativize.js - if (!to) - { - return "#"; - } - - if (to.isString() && !std::string_view(to.getString()).starts_with('/')) - { - return to; - } - - if (!context) - { - // NOTE only legacy invocation provides both to and from - context = from; - from = context.lookup("data.root.page.url"); - } - - if (!from) - { - dom::Value sitePath = context.lookup("data.root.site.path"); - if (sitePath) - { - return sitePath + to; - } - return to; - } - - dom::Value hash = ""; - std::size_t hashIdx = to.getString().get().find('#'); - if (hashIdx != std::string_view::npos) - { - hash = to.getString().get().substr(hashIdx); - to = to.getString().get().substr(0, hashIdx); - } - - /// return to === from - // ? hash || (isDir(to) ? './' : path.basename(to)) - // : (path.relative(path.dirname(from + '.'), to) || '.') + (isDir(to) ? '/' + hash : hash) - if (to == from) - { - if (hash) { - return hash; - } - else if (to.isString() && files::isDirsy(to.getString().get())) - { - return "./"; - } - else if (to.isString()) - { - return files::getFileName(to.getString().get()); - } - else - { - return to; - } - } - else - { - // AFREITAS: Implement this functionality without std::filesystem - if (!to.isString() || !from.isString()) { - return to; - } - std::string relativePath = std::filesystem::relative( - std::filesystem::path(std::string_view(to.getString())), - std::filesystem::path(std::string_view(from.getString()))).generic_string(); - if (relativePath.empty()) - { - relativePath = "."; - } - if (files::isDirsy(to.getString())) { - return relativePath + '/' + hash; - } - else - { - return relativePath + hash; - } - } -} - int year_fn() { std::chrono::system_clock::time_point now = std::chrono::system_clock::now(); diff --git a/src/lib/Support/Radix.cpp b/src/lib/Support/Radix.cpp index b115e1620f..679bd29d32 100644 --- a/src/lib/Support/Radix.cpp +++ b/src/lib/Support/Radix.cpp @@ -115,13 +115,12 @@ class BigInteger //------------------------------------------------ -static constexpr char baseFNDigits[] = +constexpr char baseFNDigits[] = "0123456789" "abcdefghijklmnopqrstuvwxyz"; -static constexpr std::size_t baseFN = sizeof(baseFNDigits) - 1; +constexpr std::size_t baseFN = sizeof(baseFNDigits) - 1; -static std::size_t constexpr baseFNEncodedSize( std::size_t n) @@ -138,7 +137,6 @@ baseFNEncodedSize( @return The number of characters written to `out`. This will exclude any null termination. */ -static std::size_t baseFNEncode( void* dest, @@ -159,7 +157,6 @@ baseFNEncode( //------------------------------------------------ -static std::size_t constexpr base64EncodedSize( std::size_t n) @@ -175,7 +172,6 @@ base64EncodedSize( @return The number of characters written to `out`. This will exclude any null termination. */ -static std::size_t base64Encode(void* dest, void const* src, std::size_t len) { @@ -240,7 +236,7 @@ toBaseFN( { dest.resize(baseFNEncodedSize(src.size())); auto n = baseFNEncode(&dest[0], src.data(), src.size()); - return llvm::StringRef(dest.data(), n); + return {dest.data(), n}; } std::string_view diff --git a/test-files/golden-tests/alias-template.adoc b/test-files/golden-tests/alias-template.adoc index 4c6c3e5695..7bb918d4d0 100644 --- a/test-files/golden-tests/alias-template.adoc +++ b/test-files/golden-tests/alias-template.adoc @@ -1,7 +1,5 @@ = Reference :mrdocs: - - [#index] == Global namespace @@ -10,22 +8,20 @@ |=== | Name | Description -| xref:#A[`A`] +| <<#A,`A`>> | -| xref:#B[`B`] +| <<#B,`B`>> | -| xref:#C[`C`] +| <<#C,`C`>> | -| xref:#D[`D`] +| <<#D,`D`>> | |=== - - [#A] == A @@ -44,8 +40,6 @@ struct A; - - [#B] == B @@ -66,8 +60,6 @@ struct B; - - [#C] == C @@ -80,12 +72,10 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- template -using C = xref:#A[A]; +using C = <<#A,A>>; ---- - - [#D] == D @@ -106,17 +96,15 @@ struct D; |=== | Name | Description -| xref:#D-E[`E`] +| <<#D-E,`E`>> | |=== - - [#D-E] -== xref:#D[D]::E +== <<#D,D>>::E @@ -127,7 +115,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- template -using E = xref:#B[B]; +using E = <<#B,B>>; ---- diff --git a/test-files/golden-tests/attributes_1.adoc b/test-files/golden-tests/attributes_1.adoc index 55fcc97933..607c7a4828 100644 --- a/test-files/golden-tests/attributes_1.adoc +++ b/test-files/golden-tests/attributes_1.adoc @@ -1,7 +1,5 @@ = Reference :mrdocs: - - [#index] == Global namespace @@ -10,13 +8,11 @@ |=== | Name | Description -| xref:#f[`f`] +| <<#f,`f`>> | |=== - - [#f] == f diff --git a/test-files/golden-tests/brief-1.adoc b/test-files/golden-tests/brief-1.adoc index 8a9bc4eced..eb77130f39 100644 --- a/test-files/golden-tests/brief-1.adoc +++ b/test-files/golden-tests/brief-1.adoc @@ -1,7 +1,5 @@ = Reference :mrdocs: - - [#index] == Global namespace @@ -10,7 +8,7 @@ |=== | Name | Description -| xref:#f5[`f5`] +| <<#f5,`f5`>> | brief *bold* @@ -18,15 +16,13 @@ it continues to the line. -| xref:#f6[`f6`] +| <<#f6,`f6`>> | brief |=== - - [#f5] == f5 @@ -54,8 +50,6 @@ f5(); - - [#f6] == f6 diff --git a/test-files/golden-tests/brief-2.adoc b/test-files/golden-tests/brief-2.adoc index c92aa40c31..8b1aa0c9c0 100644 --- a/test-files/golden-tests/brief-2.adoc +++ b/test-files/golden-tests/brief-2.adoc @@ -1,7 +1,5 @@ = Reference :mrdocs: - - [#index] == Global namespace @@ -10,33 +8,33 @@ |=== | Name | Description -| xref:#f1[`f1`] +| <<#f1,`f1`>> | brief -| xref:#f2[`f2`] +| <<#f2,`f2`>> | brief -| xref:#f3[`f3`] +| <<#f3,`f3`>> | brief -| xref:#f4[`f4`] +| <<#f4,`f4`>> | brief x -| xref:#f5[`f5`] +| <<#f5,`f5`>> | br ief -| xref:#f6[`f6`] +| <<#f6,`f6`>> | br ief @@ -44,8 +42,6 @@ ief |=== - - [#f1] == f1 @@ -70,8 +66,6 @@ f1(); - - [#f2] == f2 @@ -96,8 +90,6 @@ f2(); - - [#f3] == f3 @@ -122,8 +114,6 @@ f3(); - - [#f4] == f4 @@ -155,8 +145,6 @@ ief - - [#f5] == f5 @@ -182,8 +170,6 @@ f5(); - - [#f6] == f6 diff --git a/test-files/golden-tests/canonical_1.adoc b/test-files/golden-tests/canonical_1.adoc index c91c1bdb4c..641f7a2660 100644 --- a/test-files/golden-tests/canonical_1.adoc +++ b/test-files/golden-tests/canonical_1.adoc @@ -1,7 +1,5 @@ = Reference :mrdocs: - - [#index] == Global namespace @@ -10,34 +8,32 @@ |=== | Name | Description -| xref:#A[`A`] +| <<#A,`A`>> | -| xref:#B[`B`] +| <<#B,`B`>> | -| xref:#Ba[`Ba`] +| <<#Ba,`Ba`>> | -| xref:#Bx[`Bx`] +| <<#Bx,`Bx`>> | -| xref:#a[`a`] +| <<#a,`a`>> | -| xref:#b[`b`] +| <<#b,`b`>> | -| xref:#bA[`bA`] +| <<#bA,`bA`>> | -| xref:#ba[`ba`] +| <<#ba,`ba`>> | |=== - - [#B] == B @@ -55,8 +51,6 @@ struct B; - - [#b] == b @@ -74,8 +68,6 @@ struct b; - - [#A] == A @@ -93,8 +85,6 @@ struct A; - - [#a] == a @@ -112,8 +102,6 @@ struct a; - - [#Ba] == Ba @@ -131,8 +119,6 @@ struct Ba; - - [#bA] == bA @@ -150,8 +136,6 @@ struct bA; - - [#Bx] == Bx @@ -169,8 +153,6 @@ struct Bx; - - [#ba] == ba diff --git a/test-files/golden-tests/class-template-partial-spec.adoc b/test-files/golden-tests/class-template-partial-spec.adoc index 99c74c7c3a..ba22378807 100644 --- a/test-files/golden-tests/class-template-partial-spec.adoc +++ b/test-files/golden-tests/class-template-partial-spec.adoc @@ -1,7 +1,5 @@ = Reference :mrdocs: - - [#index] == Global namespace @@ -10,13 +8,11 @@ |=== | Name | Description -| xref:#A[`A`] +| <<#A,`A`>> | |=== - - [#A] == A @@ -37,23 +33,21 @@ struct A; |=== | Name | Description -| xref:#A-B-0a[`B`] +| <<#A-B-0a,`B`>> | -| xref:#A-B-06[`B`] +| <<#A-B-06,`B`>> | -| xref:#A-B-04[`B`] +| <<#A-B-04,`B`>> | |=== - - [#A-B-0a] -== xref:#A[A]::B +== <<#A,A>>::B @@ -72,10 +66,8 @@ struct B; - - [#A-B-06] -== xref:#A[A]::B +== <<#A,A>>::B @@ -86,16 +78,14 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- template -struct xref:#A-B-0a[B]; +struct <<#A-B-0a,B>>; ---- - - [#A-B-04] -== xref:#A[A]::B +== <<#A,A>>::B @@ -106,7 +96,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- template<> -struct xref:#A-B-0a[B]; +struct <<#A-B-0a,B>>; ---- diff --git a/test-files/golden-tests/class-template-spec.adoc b/test-files/golden-tests/class-template-spec.adoc index 53223729af..6cc158ceed 100644 --- a/test-files/golden-tests/class-template-spec.adoc +++ b/test-files/golden-tests/class-template-spec.adoc @@ -1,7 +1,5 @@ = Reference :mrdocs: - - [#index] == Global namespace @@ -10,37 +8,35 @@ |=== | Name | Description -| xref:#A-0e[`A`] +| <<#A-0e,`A`>> | -| xref:#A-00[`A`] +| <<#A-00,`A`>> | -| xref:#A-0c[`A`] +| <<#A-0c,`A`>> | -| xref:#B-00[`B`] +| <<#B-00,`B`>> | -| xref:#B-07[`B`] +| <<#B-07,`B`>> | -| xref:#B-06[`B`] +| <<#B-06,`B`>> | -| xref:#C-0f[`C`] +| <<#C-0f,`C`>> | -| xref:#C-0a[`C`] +| <<#C-0a,`C`>> | -| xref:#C-0e[`C`] +| <<#C-0e,`C`>> | |=== - - [#A-0e] == A @@ -61,17 +57,15 @@ struct A; |=== | Name | Description -| xref:#A-0e-f[`f`] +| <<#A-0e-f,`f`>> | |=== - - [#A-0e-f] -== xref:#A-0e[A]::f +== <<#A-0e,A>>::f @@ -92,8 +86,6 @@ f(); - - [#A-00] == A @@ -106,7 +98,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- template<> -struct xref:#A-0e[A]; +struct <<#A-0e,A>>; ---- === Member Functions @@ -114,17 +106,15 @@ struct xref:#A-0e[A]; |=== | Name | Description -| xref:#A-00-g[`g`] +| <<#A-00-g,`g`>> | |=== - - [#A-00-g] -== xref:#A-00[A]::g +== <<#A-00,A>>::g @@ -145,8 +135,6 @@ g(); - - [#A-0c] == A @@ -159,7 +147,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- template<> -struct xref:#A-0e[A]; +struct <<#A-0e,A>>; ---- === Member Functions @@ -167,17 +155,15 @@ struct xref:#A-0e[A]; |=== | Name | Description -| xref:#A-0c-h[`h`] +| <<#A-0c-h,`h`>> | |=== - - [#A-0c-h] -== xref:#A-0c[A]::h +== <<#A-0c,A>>::h @@ -198,8 +184,6 @@ h(); - - [#B-00] == B @@ -220,17 +204,15 @@ struct B; |=== | Name | Description -| xref:#B-00-f[`f`] +| <<#B-00-f,`f`>> | |=== - - [#B-00-f] -== xref:#B-00[B]::f +== <<#B-00,B>>::f @@ -251,8 +233,6 @@ f(); - - [#B-07] == B @@ -265,7 +245,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- template -struct xref:#B-00[B]; +struct <<#B-00,B>>; ---- === Member Functions @@ -273,17 +253,15 @@ struct xref:#B-00[B]; |=== | Name | Description -| xref:#B-07-g[`g`] +| <<#B-07-g,`g`>> | |=== - - [#B-07-g] -== xref:#B-07[B]::g +== <<#B-07,B>>::g @@ -304,8 +282,6 @@ g(); - - [#B-06] == B @@ -318,7 +294,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- template -struct xref:#B-00[B]; +struct <<#B-00,B>>; ---- === Member Functions @@ -326,17 +302,15 @@ struct xref:#B-00[B]; |=== | Name | Description -| xref:#B-06-h[`h`] +| <<#B-06-h,`h`>> | |=== - - [#B-06-h] -== xref:#B-06[B]::h +== <<#B-06,B>>::h @@ -357,8 +331,6 @@ h(); - - [#C-0f] == C @@ -381,17 +353,15 @@ struct C; |=== | Name | Description -| xref:#C-0f-f[`f`] +| <<#C-0f-f,`f`>> | |=== - - [#C-0f-f] -== xref:#C-0f[C]::f +== <<#C-0f,C>>::f @@ -412,8 +382,6 @@ f(); - - [#C-0a] == C @@ -426,7 +394,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- template<> -struct xref:#C-0f[C]; +struct <<#C-0f,C>>; ---- === Member Functions @@ -434,17 +402,15 @@ struct xref:#C-0f[C]; |=== | Name | Description -| xref:#C-0a-g[`g`] +| <<#C-0a-g,`g`>> | |=== - - [#C-0a-g] -== xref:#C-0a[C]::g +== <<#C-0a,C>>::g @@ -465,8 +431,6 @@ g(); - - [#C-0e] == C @@ -479,7 +443,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- template -struct xref:#C-0f[C]; +struct <<#C-0f,C>>; ---- === Member Functions @@ -487,17 +451,15 @@ struct xref:#C-0f[C]; |=== | Name | Description -| xref:#C-0e-h[`h`] +| <<#C-0e-h,`h`>> | |=== - - [#C-0e-h] -== xref:#C-0e[C]::h +== <<#C-0e,C>>::h diff --git a/test-files/golden-tests/class-template-specializations-1.adoc b/test-files/golden-tests/class-template-specializations-1.adoc index 372f8f2ba8..b7a93a66c9 100644 --- a/test-files/golden-tests/class-template-specializations-1.adoc +++ b/test-files/golden-tests/class-template-specializations-1.adoc @@ -1,7 +1,5 @@ = Reference :mrdocs: - - [#index] == Global namespace @@ -10,169 +8,167 @@ |=== | Name | Description -| xref:#R0[`R0`] +| <<#R0,`R0`>> | -| xref:#R1[`R1`] +| <<#R1,`R1`>> | -| xref:#R10[`R10`] +| <<#R10,`R10`>> | -| xref:#R11[`R11`] +| <<#R11,`R11`>> | -| xref:#R12[`R12`] +| <<#R12,`R12`>> | -| xref:#R13[`R13`] +| <<#R13,`R13`>> | -| xref:#R14[`R14`] +| <<#R14,`R14`>> | -| xref:#R15[`R15`] +| <<#R15,`R15`>> | -| xref:#R16[`R16`] +| <<#R16,`R16`>> | -| xref:#R17[`R17`] +| <<#R17,`R17`>> | -| xref:#R18[`R18`] +| <<#R18,`R18`>> | -| xref:#R19[`R19`] +| <<#R19,`R19`>> | -| xref:#R2[`R2`] +| <<#R2,`R2`>> | -| xref:#R20[`R20`] +| <<#R20,`R20`>> | -| xref:#R21[`R21`] +| <<#R21,`R21`>> | -| xref:#R22[`R22`] +| <<#R22,`R22`>> | -| xref:#R23[`R23`] +| <<#R23,`R23`>> | -| xref:#R24[`R24`] +| <<#R24,`R24`>> | -| xref:#R25[`R25`] +| <<#R25,`R25`>> | -| xref:#R26[`R26`] +| <<#R26,`R26`>> | -| xref:#R27[`R27`] +| <<#R27,`R27`>> | -| xref:#R28[`R28`] +| <<#R28,`R28`>> | -| xref:#R29[`R29`] +| <<#R29,`R29`>> | -| xref:#R3[`R3`] +| <<#R3,`R3`>> | -| xref:#R30[`R30`] +| <<#R30,`R30`>> | -| xref:#R31[`R31`] +| <<#R31,`R31`>> | -| xref:#R32[`R32`] +| <<#R32,`R32`>> | -| xref:#R33[`R33`] +| <<#R33,`R33`>> | -| xref:#R34[`R34`] +| <<#R34,`R34`>> | -| xref:#R35[`R35`] +| <<#R35,`R35`>> | -| xref:#R36[`R36`] +| <<#R36,`R36`>> | -| xref:#R37[`R37`] +| <<#R37,`R37`>> | -| xref:#R38[`R38`] +| <<#R38,`R38`>> | -| xref:#R39[`R39`] +| <<#R39,`R39`>> | -| xref:#R4[`R4`] +| <<#R4,`R4`>> | -| xref:#R40[`R40`] +| <<#R40,`R40`>> | -| xref:#R41[`R41`] +| <<#R41,`R41`>> | -| xref:#R42[`R42`] +| <<#R42,`R42`>> | -| xref:#R43[`R43`] +| <<#R43,`R43`>> | -| xref:#R44[`R44`] +| <<#R44,`R44`>> | -| xref:#R45[`R45`] +| <<#R45,`R45`>> | -| xref:#R46[`R46`] +| <<#R46,`R46`>> | -| xref:#R47[`R47`] +| <<#R47,`R47`>> | -| xref:#R48[`R48`] +| <<#R48,`R48`>> | -| xref:#R5[`R5`] +| <<#R5,`R5`>> | -| xref:#R6[`R6`] +| <<#R6,`R6`>> | -| xref:#R7[`R7`] +| <<#R7,`R7`>> | -| xref:#R8[`R8`] +| <<#R8,`R8`>> | -| xref:#R9[`R9`] +| <<#R9,`R9`>> | -| xref:#S0-02[`S0<1, int*>`] +| <<#S0-02,`S0<1, int*>`>> | -| xref:#S0-0c4[`S0<1, T*>`] +| <<#S0-0c4,`S0<1, T*>`>> | -| xref:#S0-0be[`S0<0>`] +| <<#S0-0be,`S0<0>`>> | -| xref:#S0-0cf[`S0`] +| <<#S0-0cf,`S0`>> | |=== - - [#S0-0cf] == S0 @@ -195,10 +191,10 @@ struct S0; |=== | Name | Description -| xref:#S0-0cf-S1[`S1`] +| <<#S0-0cf-S1,`S1`>> | -| xref:#S0-0cf-S5[`S5`] +| <<#S0-0cf-S5,`S5`>> | |=== @@ -207,17 +203,15 @@ struct S0; |=== | Name | Description -| xref:#S0-0cf-f0[`f0`] +| <<#S0-0cf-f0,`f0`>> | |=== - - [#S0-0cf-f0] -== xref:#S0-0cf[S0]::f0 +== <<#S0-0cf,S0>>::f0 @@ -238,10 +232,8 @@ f0(); - - [#S0-0cf-S1] -== xref:#S0-0cf[S0]::S1 +== <<#S0-0cf,S0>>::S1 @@ -259,7 +251,7 @@ struct S1; |=== | Name | Description -| xref:#S0-0cf-S1-S2[`S2`] +| <<#S0-0cf-S1-S2,`S2`>> | |=== @@ -268,17 +260,15 @@ struct S1; |=== | Name | Description -| xref:#S0-0cf-S1-f1[`f1`] +| <<#S0-0cf-S1-f1,`f1`>> | |=== - - [#S0-0cf-S1-f1] -== xref:#S0-0cf[S0]::xref:#S0-0cf-S1[S1]::f1 +== <<#S0-0cf,S0>>::<<#S0-0cf-S1,S1>>::f1 @@ -299,10 +289,8 @@ f1(); - - [#S0-0cf-S1-S2] -== xref:#S0-0cf[S0]::xref:#S0-0cf-S1[S1]::S2 +== <<#S0-0cf,S0>>::<<#S0-0cf-S1,S1>>::S2 @@ -323,10 +311,10 @@ struct S2; |=== | Name | Description -| xref:#S0-0cf-S1-S2-S3[`S3`] +| <<#S0-0cf-S1-S2-S3,`S3`>> | -| xref:#S0-0cf-S1-S2-S4[`S4`] +| <<#S0-0cf-S1-S2-S4,`S4`>> | |=== @@ -335,17 +323,15 @@ struct S2; |=== | Name | Description -| xref:#S0-0cf-S1-S2-f2[`f2`] +| <<#S0-0cf-S1-S2-f2,`f2`>> | |=== - - [#S0-0cf-S1-S2-f2] -== xref:#S0-0cf[S0]::xref:#S0-0cf-S1[S1]::xref:#S0-0cf-S1-S2[S2]::f2 +== <<#S0-0cf,S0>>::<<#S0-0cf-S1,S1>>::<<#S0-0cf-S1-S2,S2>>::f2 @@ -366,10 +352,8 @@ f2(); - - [#S0-0cf-S1-S2-S3] -== xref:#S0-0cf[S0]::xref:#S0-0cf-S1[S1]::xref:#S0-0cf-S1-S2[S2]::S3 +== <<#S0-0cf,S0>>::<<#S0-0cf-S1,S1>>::<<#S0-0cf-S1-S2,S2>>::S3 @@ -387,17 +371,15 @@ struct S3; |=== | Name | Description -| xref:#S0-0cf-S1-S2-S3-f3[`f3`] +| <<#S0-0cf-S1-S2-S3-f3,`f3`>> | |=== - - [#S0-0cf-S1-S2-S3-f3] -== xref:#S0-0cf[S0]::xref:#S0-0cf-S1[S1]::xref:#S0-0cf-S1-S2[S2]::xref:#S0-0cf-S1-S2-S3[S3]::f3 +== <<#S0-0cf,S0>>::<<#S0-0cf-S1,S1>>::<<#S0-0cf-S1-S2,S2>>::<<#S0-0cf-S1-S2-S3,S3>>::f3 @@ -418,10 +400,8 @@ f3(); - - [#S0-0cf-S1-S2-S4] -== xref:#S0-0cf[S0]::xref:#S0-0cf-S1[S1]::xref:#S0-0cf-S1-S2[S2]::S4 +== <<#S0-0cf,S0>>::<<#S0-0cf-S1,S1>>::<<#S0-0cf-S1-S2,S2>>::S4 @@ -442,17 +422,15 @@ struct S4; |=== | Name | Description -| xref:#S0-0cf-S1-S2-S4-f4[`f4`] +| <<#S0-0cf-S1-S2-S4-f4,`f4`>> | |=== - - [#S0-0cf-S1-S2-S4-f4] -== xref:#S0-0cf[S0]::xref:#S0-0cf-S1[S1]::xref:#S0-0cf-S1-S2[S2]::xref:#S0-0cf-S1-S2-S4[S4]::f4 +== <<#S0-0cf,S0>>::<<#S0-0cf-S1,S1>>::<<#S0-0cf-S1-S2,S2>>::<<#S0-0cf-S1-S2-S4,S4>>::f4 @@ -473,10 +451,8 @@ f4(); - - [#S0-0cf-S5] -== xref:#S0-0cf[S0]::S5 +== <<#S0-0cf,S0>>::S5 @@ -497,7 +473,7 @@ struct S5; |=== | Name | Description -| xref:#S0-0cf-S5-S6[`S6`] +| <<#S0-0cf-S5-S6,`S6`>> | |=== @@ -506,17 +482,15 @@ struct S5; |=== | Name | Description -| xref:#S0-0cf-S5-f5[`f5`] +| <<#S0-0cf-S5-f5,`f5`>> | |=== - - [#S0-0cf-S5-f5] -== xref:#S0-0cf[S0]::xref:#S0-0cf-S5[S5]::f5 +== <<#S0-0cf,S0>>::<<#S0-0cf-S5,S5>>::f5 @@ -537,10 +511,8 @@ f5(); - - [#S0-0cf-S5-S6] -== xref:#S0-0cf[S0]::xref:#S0-0cf-S5[S5]::S6 +== <<#S0-0cf,S0>>::<<#S0-0cf-S5,S5>>::S6 @@ -558,7 +530,7 @@ struct S6; |=== | Name | Description -| xref:#S0-0cf-S5-S6-S7[`S7`] +| <<#S0-0cf-S5-S6-S7,`S7`>> | |=== @@ -567,17 +539,15 @@ struct S6; |=== | Name | Description -| xref:#S0-0cf-S5-S6-f6[`f6`] +| <<#S0-0cf-S5-S6-f6,`f6`>> | |=== - - [#S0-0cf-S5-S6-f6] -== xref:#S0-0cf[S0]::xref:#S0-0cf-S5[S5]::xref:#S0-0cf-S5-S6[S6]::f6 +== <<#S0-0cf,S0>>::<<#S0-0cf-S5,S5>>::<<#S0-0cf-S5-S6,S6>>::f6 @@ -598,10 +568,8 @@ f6(); - - [#S0-0cf-S5-S6-S7] -== xref:#S0-0cf[S0]::xref:#S0-0cf-S5[S5]::xref:#S0-0cf-S5-S6[S6]::S7 +== <<#S0-0cf,S0>>::<<#S0-0cf-S5,S5>>::<<#S0-0cf-S5-S6,S6>>::S7 @@ -622,10 +590,10 @@ struct S7; |=== | Name | Description -| xref:#S0-0cf-S5-S6-S7-S8[`S8`] +| <<#S0-0cf-S5-S6-S7-S8,`S8`>> | -| xref:#S0-0cf-S5-S6-S7-S9[`S9`] +| <<#S0-0cf-S5-S6-S7-S9,`S9`>> | |=== @@ -634,17 +602,15 @@ struct S7; |=== | Name | Description -| xref:#S0-0cf-S5-S6-S7-f7[`f7`] +| <<#S0-0cf-S5-S6-S7-f7,`f7`>> | |=== - - [#S0-0cf-S5-S6-S7-f7] -== xref:#S0-0cf[S0]::xref:#S0-0cf-S5[S5]::xref:#S0-0cf-S5-S6[S6]::xref:#S0-0cf-S5-S6-S7[S7]::f7 +== <<#S0-0cf,S0>>::<<#S0-0cf-S5,S5>>::<<#S0-0cf-S5-S6,S6>>::<<#S0-0cf-S5-S6-S7,S7>>::f7 @@ -665,10 +631,8 @@ f7(); - - [#S0-0cf-S5-S6-S7-S8] -== xref:#S0-0cf[S0]::xref:#S0-0cf-S5[S5]::xref:#S0-0cf-S5-S6[S6]::xref:#S0-0cf-S5-S6-S7[S7]::S8 +== <<#S0-0cf,S0>>::<<#S0-0cf-S5,S5>>::<<#S0-0cf-S5-S6,S6>>::<<#S0-0cf-S5-S6-S7,S7>>::S8 @@ -686,17 +650,15 @@ struct S8; |=== | Name | Description -| xref:#S0-0cf-S5-S6-S7-S8-f8[`f8`] +| <<#S0-0cf-S5-S6-S7-S8-f8,`f8`>> | |=== - - [#S0-0cf-S5-S6-S7-S8-f8] -== xref:#S0-0cf[S0]::xref:#S0-0cf-S5[S5]::xref:#S0-0cf-S5-S6[S6]::xref:#S0-0cf-S5-S6-S7[S7]::xref:#S0-0cf-S5-S6-S7-S8[S8]::f8 +== <<#S0-0cf,S0>>::<<#S0-0cf-S5,S5>>::<<#S0-0cf-S5-S6,S6>>::<<#S0-0cf-S5-S6-S7,S7>>::<<#S0-0cf-S5-S6-S7-S8,S8>>::f8 @@ -717,10 +679,8 @@ f8(); - - [#S0-0cf-S5-S6-S7-S9] -== xref:#S0-0cf[S0]::xref:#S0-0cf-S5[S5]::xref:#S0-0cf-S5-S6[S6]::xref:#S0-0cf-S5-S6-S7[S7]::S9 +== <<#S0-0cf,S0>>::<<#S0-0cf-S5,S5>>::<<#S0-0cf-S5-S6,S6>>::<<#S0-0cf-S5-S6-S7,S7>>::S9 @@ -741,17 +701,15 @@ struct S9; |=== | Name | Description -| xref:#S0-0cf-S5-S6-S7-S9-f9[`f9`] +| <<#S0-0cf-S5-S6-S7-S9-f9,`f9`>> | |=== - - [#S0-0cf-S5-S6-S7-S9-f9] -== xref:#S0-0cf[S0]::xref:#S0-0cf-S5[S5]::xref:#S0-0cf-S5-S6[S6]::xref:#S0-0cf-S5-S6-S7[S7]::xref:#S0-0cf-S5-S6-S7-S9[S9]::f9 +== <<#S0-0cf,S0>>::<<#S0-0cf-S5,S5>>::<<#S0-0cf-S5-S6,S6>>::<<#S0-0cf-S5-S6-S7,S7>>::<<#S0-0cf-S5-S6-S7-S9,S9>>::f9 @@ -772,8 +730,6 @@ f9(); - - [#S0-0be] == S0 @@ -786,14 +742,12 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- template<> -struct xref:#S0-0cf[S0]<0>; +struct <<#S0-0cf,S0>><0>; ---- - - [#S0-0c4] == S0 @@ -806,14 +760,12 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- template -struct xref:#S0-0cf[S0]<1, T*>; +struct <<#S0-0cf,S0>><1, T*>; ---- - - [#S0-02] == S0 @@ -826,71 +778,12 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- template<> -struct xref:#S0-0cf[S0]<1, int*>; +struct <<#S0-0cf,S0>><1, int*>; ---- - - -[#S0-09c] - - -[#S0-073] - - -[#S0-0a1] - - -[#S0-07e] - - -[#S0-0a3] - - -[#S0-08] - - -[#S0-0e] - - -[#S0-09e4] - - -[#S0-07a] - - -[#S0-0a7] - - -[#S0-031] - - -[#S0-05] - - -[#S0-0a2] - - -[#S0-09e2] - - -[#S0-01] - - -[#S0-09ee] - - -[#S0-033] - - -[#S0-06] - - -[#S0-0ba] - - [#R0] == R0 @@ -903,7 +796,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- struct R0 - : xref:#S0-0cf[S0]; + : <<#S0-0cf,S0>>; ---- === Types @@ -911,10 +804,10 @@ struct R0 |=== | Name | Description -| xref:#S0-0cf-S1[`S1`] +| <<#S0-0cf-S1,`S1`>> | -| xref:#S0-0cf-S5[`S5`] +| <<#S0-0cf-S5,`S5`>> | |=== @@ -923,15 +816,13 @@ struct R0 |=== | Name | Description -| xref:#S0-0cf-f0[`f0`] +| <<#S0-0cf-f0,`f0`>> | |=== - - [#R1] == R1 @@ -944,14 +835,12 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- struct R1 - : xref:#S0-0be[S0]<0>; + : <<#S0-0be,S0>><0>; ---- - - [#R2] == R2 @@ -964,14 +853,12 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- struct R2 - : xref:#S0-0c4[S0]<1, void*>; + : <<#S0-0c4,S0>><1, void*>; ---- - - [#R3] == R3 @@ -984,14 +871,12 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- struct R3 - : xref:#S0-02[S0]<1, int*>; + : <<#S0-02,S0>><1, int*>; ---- - - [#R4] == R4 @@ -1004,14 +889,12 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- struct R4 - : xref:#S0-0cf[S0]<2>::xref:#S0-09c-S1[S1]; + : <<#S0-0cf,S0>><2>::<<#S0-09c-S1,S1>>; ---- - - [#R5] == R5 @@ -1024,14 +907,12 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- struct R5 - : xref:#S0-0cf[S0]<3>::xref:#S0-0cf-S1[S1]::xref:#S0-073-S1-S2[S2]; + : <<#S0-0cf,S0>><3>::<<#S0-0cf-S1,S1>>::<<#S0-073-S1-S2,S2>>; ---- - - [#R6] == R6 @@ -1044,14 +925,12 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- struct R6 - : xref:#S0-0cf[S0]<4>::xref:#S0-0cf-S1[S1]::xref:#S0-0a1-S1-S2[S2]<5>; + : <<#S0-0cf,S0>><4>::<<#S0-0cf-S1,S1>>::<<#S0-0a1-S1-S2,S2>><5>; ---- - - [#R7] == R7 @@ -1064,14 +943,12 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- struct R7 - : xref:#S0-0cf[S0]<6>::xref:#S0-0cf-S1[S1]::xref:#S0-07e-S1-S2-06[S2]<7, void*>; + : <<#S0-0cf,S0>><6>::<<#S0-0cf-S1,S1>>::<<#S0-07e-S1-S2-06,S2>><7, void*>; ---- - - [#R8] == R8 @@ -1084,14 +961,12 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- struct R8 - : xref:#S0-0cf[S0]<6>::xref:#S0-0cf-S1[S1]::xref:#S0-07e-S1-S2-07[S2]<7, int*>; + : <<#S0-0cf,S0>><6>::<<#S0-0cf-S1,S1>>::<<#S0-07e-S1-S2-07,S2>><7, int*>; ---- - - [#R9] == R9 @@ -1104,14 +979,12 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- struct R9 - : xref:#S0-0cf[S0]<8>::xref:#S0-0cf-S1[S1]::xref:#S0-0cf-S1-S2[S2]<9>::xref:#S0-0a3-S1-S2-S3[S3]; + : <<#S0-0cf,S0>><8>::<<#S0-0cf-S1,S1>>::<<#S0-0cf-S1-S2,S2>><9>::<<#S0-0a3-S1-S2-S3,S3>>; ---- - - [#R10] == R10 @@ -1124,14 +997,12 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- struct R10 - : xref:#S0-0cf[S0]<10>::xref:#S0-0cf-S1[S1]::xref:#S0-0cf-S1-S2[S2]<11>::xref:#S0-08-S1-S2-S4[S4]; + : <<#S0-0cf,S0>><10>::<<#S0-0cf-S1,S1>>::<<#S0-0cf-S1-S2,S2>><11>::<<#S0-08-S1-S2-S4,S4>>; ---- - - [#R11] == R11 @@ -1144,14 +1015,12 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- struct R11 - : xref:#S0-0cf[S0]<12>::xref:#S0-0cf-S1[S1]::xref:#S0-0cf-S1-S2[S2]<13>::xref:#S0-0e-S1-S2-S4[S4]<14>; + : <<#S0-0cf,S0>><12>::<<#S0-0cf-S1,S1>>::<<#S0-0cf-S1-S2,S2>><13>::<<#S0-0e-S1-S2-S4,S4>><14>; ---- - - [#R12] == R12 @@ -1164,14 +1033,12 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- struct R12 - : xref:#S0-0cf[S0]<15>::xref:#S0-0cf-S1[S1]::xref:#S0-0cf-S1-S2[S2]<16>::xref:#S0-09e4-S1-S2-S4-07[S4]<17, void*>; + : <<#S0-0cf,S0>><15>::<<#S0-0cf-S1,S1>>::<<#S0-0cf-S1-S2,S2>><16>::<<#S0-09e4-S1-S2-S4-07,S4>><17, void*>; ---- - - [#R13] == R13 @@ -1184,14 +1051,12 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- struct R13 - : xref:#S0-0cf[S0]<15>::xref:#S0-0cf-S1[S1]::xref:#S0-0cf-S1-S2[S2]<16>::xref:#S0-09e4-S1-S2-S4-02[S4]<17, int*>; + : <<#S0-0cf,S0>><15>::<<#S0-0cf-S1,S1>>::<<#S0-0cf-S1-S2,S2>><16>::<<#S0-09e4-S1-S2-S4-02,S4>><17, int*>; ---- - - [#R14] == R14 @@ -1204,14 +1069,12 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- struct R14 - : xref:#S0-0cf[S0]<18>::xref:#S0-07a-S5[S5]; + : <<#S0-0cf,S0>><18>::<<#S0-07a-S5,S5>>; ---- - - [#R15] == R15 @@ -1224,14 +1087,12 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- struct R15 - : xref:#S0-0cf[S0]<19>::xref:#S0-0a7-S5[S5]<20>; + : <<#S0-0cf,S0>><19>::<<#S0-0a7-S5,S5>><20>; ---- - - [#R16] == R16 @@ -1244,14 +1105,12 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- struct R16 - : xref:#S0-0cf[S0]<21>::xref:#S0-031-S5-0b[S5]<22, void*>; + : <<#S0-0cf,S0>><21>::<<#S0-031-S5-0b,S5>><22, void*>; ---- - - [#R17] == R17 @@ -1264,14 +1123,12 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- struct R17 - : xref:#S0-0cf[S0]<21>::xref:#S0-031-S5-03[S5]<22, int*>; + : <<#S0-0cf,S0>><21>::<<#S0-031-S5-03,S5>><22, int*>; ---- - - [#R18] == R18 @@ -1284,14 +1141,12 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- struct R18 - : xref:#S0-0cf[S0]<23>::xref:#S0-0cf-S5[S5]<24>::xref:#S0-05-S5-S6[S6]; + : <<#S0-0cf,S0>><23>::<<#S0-0cf-S5,S5>><24>::<<#S0-05-S5-S6,S6>>; ---- - - [#R19] == R19 @@ -1304,14 +1159,12 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- struct R19 - : xref:#S0-0cf[S0]<25>::xref:#S0-0cf-S5[S5]<26>::xref:#S0-0cf-S5-S6[S6]::xref:#S0-0a2-S5-S6-S7[S7]; + : <<#S0-0cf,S0>><25>::<<#S0-0cf-S5,S5>><26>::<<#S0-0cf-S5-S6,S6>>::<<#S0-0a2-S5-S6-S7,S7>>; ---- - - [#R20] == R20 @@ -1324,14 +1177,12 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- struct R20 - : xref:#S0-0cf[S0]<27>::xref:#S0-0cf-S5[S5]<28>::xref:#S0-0cf-S5-S6[S6]::xref:#S0-09e2-S5-S6-S7-0a[S7]<29, void*>; + : <<#S0-0cf,S0>><27>::<<#S0-0cf-S5,S5>><28>::<<#S0-0cf-S5-S6,S6>>::<<#S0-09e2-S5-S6-S7-0a,S7>><29, void*>; ---- - - [#R21] == R21 @@ -1344,14 +1195,12 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- struct R21 - : xref:#S0-0cf[S0]<27>::xref:#S0-0cf-S5[S5]<28>::xref:#S0-0cf-S5-S6[S6]::xref:#S0-09e2-S5-S6-S7-0d[S7]<29, int*>; + : <<#S0-0cf,S0>><27>::<<#S0-0cf-S5,S5>><28>::<<#S0-0cf-S5-S6,S6>>::<<#S0-09e2-S5-S6-S7-0d,S7>><29, int*>; ---- - - [#R22] == R22 @@ -1364,14 +1213,12 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- struct R22 - : xref:#S0-0cf[S0]<30>::xref:#S0-0cf-S5[S5]<31>::xref:#S0-0cf-S5-S6[S6]::xref:#S0-01-S5-S6-S7[S7]<32>; + : <<#S0-0cf,S0>><30>::<<#S0-0cf-S5,S5>><31>::<<#S0-0cf-S5-S6,S6>>::<<#S0-01-S5-S6-S7,S7>><32>; ---- - - [#R23] == R23 @@ -1384,14 +1231,12 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- struct R23 - : xref:#S0-0cf[S0]<33>::xref:#S0-0cf-S5[S5]<34>::xref:#S0-0cf-S5-S6[S6]::xref:#S0-0cf-S5-S6-S7[S7]<35>::xref:#S0-09ee-S5-S6-S7-S8[S8]; + : <<#S0-0cf,S0>><33>::<<#S0-0cf-S5,S5>><34>::<<#S0-0cf-S5-S6,S6>>::<<#S0-0cf-S5-S6-S7,S7>><35>::<<#S0-09ee-S5-S6-S7-S8,S8>>; ---- - - [#R24] == R24 @@ -1404,14 +1249,12 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- struct R24 - : xref:#S0-0cf[S0]<36>::xref:#S0-0cf-S5[S5]<37>::xref:#S0-0cf-S5-S6[S6]::xref:#S0-0cf-S5-S6-S7[S7]<38>::xref:#S0-033-S5-S6-S7-S9[S9]; + : <<#S0-0cf,S0>><36>::<<#S0-0cf-S5,S5>><37>::<<#S0-0cf-S5-S6,S6>>::<<#S0-0cf-S5-S6-S7,S7>><38>::<<#S0-033-S5-S6-S7-S9,S9>>; ---- - - [#R25] == R25 @@ -1424,14 +1267,12 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- struct R25 - : xref:#S0-0cf[S0]<39>::xref:#S0-0cf-S5[S5]<40>::xref:#S0-0cf-S5-S6[S6]::xref:#S0-0cf-S5-S6-S7[S7]<41>::xref:#S0-06-S5-S6-S7-S9-00[S9]<42, void*>; + : <<#S0-0cf,S0>><39>::<<#S0-0cf-S5,S5>><40>::<<#S0-0cf-S5-S6,S6>>::<<#S0-0cf-S5-S6-S7,S7>><41>::<<#S0-06-S5-S6-S7-S9-00,S9>><42, void*>; ---- - - [#R26] == R26 @@ -1444,14 +1285,12 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- struct R26 - : xref:#S0-0cf[S0]<39>::xref:#S0-0cf-S5[S5]<40>::xref:#S0-0cf-S5-S6[S6]::xref:#S0-0cf-S5-S6-S7[S7]<41>::xref:#S0-06-S5-S6-S7-S9-08[S9]<42, int*>; + : <<#S0-0cf,S0>><39>::<<#S0-0cf-S5,S5>><40>::<<#S0-0cf-S5-S6,S6>>::<<#S0-0cf-S5-S6-S7,S7>><41>::<<#S0-06-S5-S6-S7-S9-08,S9>><42, int*>; ---- - - [#R27] == R27 @@ -1464,14 +1303,12 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- struct R27 - : xref:#S0-0cf[S0]<43>::xref:#S0-0cf-S5[S5]<44>::xref:#S0-0cf-S5-S6[S6]::xref:#S0-0cf-S5-S6-S7[S7]<45>::xref:#S0-0ba-S5-S6-S7-S9[S9]<46>; + : <<#S0-0cf,S0>><43>::<<#S0-0cf-S5,S5>><44>::<<#S0-0cf-S5-S6,S6>>::<<#S0-0cf-S5-S6-S7,S7>><45>::<<#S0-0ba-S5-S6-S7-S9,S9>><46>; ---- - - [#R28] == R28 @@ -1484,7 +1321,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- struct R28 - : xref:#S0-0cf[S0]<0, bool>; + : <<#S0-0cf,S0>><0, bool>; ---- === Types @@ -1492,10 +1329,10 @@ struct R28 |=== | Name | Description -| xref:#S0-0cf-S1[`S1`] +| <<#S0-0cf-S1,`S1`>> | -| xref:#S0-0cf-S5[`S5`] +| <<#S0-0cf-S5,`S5`>> | |=== @@ -1504,15 +1341,13 @@ struct R28 |=== | Name | Description -| xref:#S0-0cf-f0[`f0`] +| <<#S0-0cf-f0,`f0`>> | |=== - - [#R29] == R29 @@ -1525,7 +1360,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- struct R29 - : xref:#S0-0cf[S0]<1, int>; + : <<#S0-0cf,S0>><1, int>; ---- === Types @@ -1533,10 +1368,10 @@ struct R29 |=== | Name | Description -| xref:#S0-0cf-S1[`S1`] +| <<#S0-0cf-S1,`S1`>> | -| xref:#S0-0cf-S5[`S5`] +| <<#S0-0cf-S5,`S5`>> | |=== @@ -1545,15 +1380,13 @@ struct R29 |=== | Name | Description -| xref:#S0-0cf-f0[`f0`] +| <<#S0-0cf-f0,`f0`>> | |=== - - [#R30] == R30 @@ -1566,7 +1399,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- struct R30 - : xref:#S0-0cf[S0]<2, bool>::xref:#S0-0cf-S1[S1]; + : <<#S0-0cf,S0>><2, bool>::<<#S0-0cf-S1,S1>>; ---- === Types @@ -1574,7 +1407,7 @@ struct R30 |=== | Name | Description -| xref:#S0-0cf-S1-S2[`S2`] +| <<#S0-0cf-S1-S2,`S2`>> | |=== @@ -1583,15 +1416,13 @@ struct R30 |=== | Name | Description -| xref:#S0-0cf-S1-f1[`f1`] +| <<#S0-0cf-S1-f1,`f1`>> | |=== - - [#R31] == R31 @@ -1607,7 +1438,7 @@ template< int I, typename T> struct R31 - : xref:#S0-0cf[S0]<3, bool>::xref:#S0-0cf-S1[S1]::xref:#S0-0cf-S1-S2[S2]; + : <<#S0-0cf,S0>><3, bool>::<<#S0-0cf-S1,S1>>::<<#S0-0cf-S1-S2,S2>>; ---- === Types @@ -1615,10 +1446,10 @@ struct R31 |=== | Name | Description -| xref:#S0-0cf-S1-S2-S3[`S3`] +| <<#S0-0cf-S1-S2-S3,`S3`>> | -| xref:#S0-0cf-S1-S2-S4[`S4`] +| <<#S0-0cf-S1-S2-S4,`S4`>> | |=== @@ -1627,15 +1458,13 @@ struct R31 |=== | Name | Description -| xref:#S0-0cf-S1-S2-f2[`f2`] +| <<#S0-0cf-S1-S2-f2,`f2`>> | |=== - - [#R32] == R32 @@ -1648,7 +1477,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- struct R32 - : xref:#S0-0cf[S0]<4, bool>::xref:#S0-0cf-S1[S1]::xref:#S0-0cf-S1-S2[S2]<5, bool>; + : <<#S0-0cf,S0>><4, bool>::<<#S0-0cf-S1,S1>>::<<#S0-0cf-S1-S2,S2>><5, bool>; ---- === Types @@ -1656,10 +1485,10 @@ struct R32 |=== | Name | Description -| xref:#S0-0cf-S1-S2-S3[`S3`] +| <<#S0-0cf-S1-S2-S3,`S3`>> | -| xref:#S0-0cf-S1-S2-S4[`S4`] +| <<#S0-0cf-S1-S2-S4,`S4`>> | |=== @@ -1668,15 +1497,13 @@ struct R32 |=== | Name | Description -| xref:#S0-0cf-S1-S2-f2[`f2`] +| <<#S0-0cf-S1-S2-f2,`f2`>> | |=== - - [#R33] == R33 @@ -1689,7 +1516,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- struct R33 - : xref:#S0-0cf[S0]<6, bool>::xref:#S0-0cf-S1[S1]::xref:#S0-0cf-S1-S2[S2]<7, int>; + : <<#S0-0cf,S0>><6, bool>::<<#S0-0cf-S1,S1>>::<<#S0-0cf-S1-S2,S2>><7, int>; ---- === Types @@ -1697,10 +1524,10 @@ struct R33 |=== | Name | Description -| xref:#S0-0cf-S1-S2-S3[`S3`] +| <<#S0-0cf-S1-S2-S3,`S3`>> | -| xref:#S0-0cf-S1-S2-S4[`S4`] +| <<#S0-0cf-S1-S2-S4,`S4`>> | |=== @@ -1709,15 +1536,13 @@ struct R33 |=== | Name | Description -| xref:#S0-0cf-S1-S2-f2[`f2`] +| <<#S0-0cf-S1-S2-f2,`f2`>> | |=== - - [#R34] == R34 @@ -1730,7 +1555,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- struct R34 - : xref:#S0-0cf[S0]<8, bool>::xref:#S0-0cf-S1[S1]::xref:#S0-0cf-S1-S2[S2]<9, bool>::xref:#S0-0cf-S1-S2-S3[S3]; + : <<#S0-0cf,S0>><8, bool>::<<#S0-0cf-S1,S1>>::<<#S0-0cf-S1-S2,S2>><9, bool>::<<#S0-0cf-S1-S2-S3,S3>>; ---- === Member Functions @@ -1738,15 +1563,13 @@ struct R34 |=== | Name | Description -| xref:#S0-0cf-S1-S2-S3-f3[`f3`] +| <<#S0-0cf-S1-S2-S3-f3,`f3`>> | |=== - - [#R35] == R35 @@ -1762,7 +1585,7 @@ template< int I, typename T> struct R35 - : xref:#S0-0cf[S0]<10, bool>::xref:#S0-0cf-S1[S1]::xref:#S0-0cf-S1-S2[S2]<11, bool>::xref:#S0-0cf-S1-S2-S4[S4]; + : <<#S0-0cf,S0>><10, bool>::<<#S0-0cf-S1,S1>>::<<#S0-0cf-S1-S2,S2>><11, bool>::<<#S0-0cf-S1-S2-S4,S4>>; ---- === Member Functions @@ -1770,15 +1593,13 @@ struct R35 |=== | Name | Description -| xref:#S0-0cf-S1-S2-S4-f4[`f4`] +| <<#S0-0cf-S1-S2-S4-f4,`f4`>> | |=== - - [#R36] == R36 @@ -1791,7 +1612,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- struct R36 - : xref:#S0-0cf[S0]<12, bool>::xref:#S0-0cf-S1[S1]::xref:#S0-0cf-S1-S2[S2]<13, bool>::xref:#S0-0cf-S1-S2-S4[S4]<14, bool>; + : <<#S0-0cf,S0>><12, bool>::<<#S0-0cf-S1,S1>>::<<#S0-0cf-S1-S2,S2>><13, bool>::<<#S0-0cf-S1-S2-S4,S4>><14, bool>; ---- === Member Functions @@ -1799,15 +1620,13 @@ struct R36 |=== | Name | Description -| xref:#S0-0cf-S1-S2-S4-f4[`f4`] +| <<#S0-0cf-S1-S2-S4-f4,`f4`>> | |=== - - [#R37] == R37 @@ -1820,7 +1639,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- struct R37 - : xref:#S0-0cf[S0]<15, bool>::xref:#S0-0cf-S1[S1]::xref:#S0-0cf-S1-S2[S2]<16, bool>::xref:#S0-0cf-S1-S2-S4[S4]<17, int>; + : <<#S0-0cf,S0>><15, bool>::<<#S0-0cf-S1,S1>>::<<#S0-0cf-S1-S2,S2>><16, bool>::<<#S0-0cf-S1-S2-S4,S4>><17, int>; ---- === Member Functions @@ -1828,15 +1647,13 @@ struct R37 |=== | Name | Description -| xref:#S0-0cf-S1-S2-S4-f4[`f4`] +| <<#S0-0cf-S1-S2-S4-f4,`f4`>> | |=== - - [#R38] == R38 @@ -1852,7 +1669,7 @@ template< int I, typename T> struct R38 - : xref:#S0-0cf[S0]<18, bool>::xref:#S0-0cf-S5[S5]; + : <<#S0-0cf,S0>><18, bool>::<<#S0-0cf-S5,S5>>; ---- === Types @@ -1860,7 +1677,7 @@ struct R38 |=== | Name | Description -| xref:#S0-0cf-S5-S6[`S6`] +| <<#S0-0cf-S5-S6,`S6`>> | |=== @@ -1869,15 +1686,13 @@ struct R38 |=== | Name | Description -| xref:#S0-0cf-S5-f5[`f5`] +| <<#S0-0cf-S5-f5,`f5`>> | |=== - - [#R39] == R39 @@ -1890,7 +1705,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- struct R39 - : xref:#S0-0cf[S0]<19, bool>::xref:#S0-0cf-S5[S5]<20, bool>; + : <<#S0-0cf,S0>><19, bool>::<<#S0-0cf-S5,S5>><20, bool>; ---- === Types @@ -1898,7 +1713,7 @@ struct R39 |=== | Name | Description -| xref:#S0-0cf-S5-S6[`S6`] +| <<#S0-0cf-S5-S6,`S6`>> | |=== @@ -1907,15 +1722,13 @@ struct R39 |=== | Name | Description -| xref:#S0-0cf-S5-f5[`f5`] +| <<#S0-0cf-S5-f5,`f5`>> | |=== - - [#R40] == R40 @@ -1928,7 +1741,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- struct R40 - : xref:#S0-0cf[S0]<21, bool>::xref:#S0-0cf-S5[S5]<22, int>; + : <<#S0-0cf,S0>><21, bool>::<<#S0-0cf-S5,S5>><22, int>; ---- === Types @@ -1936,7 +1749,7 @@ struct R40 |=== | Name | Description -| xref:#S0-0cf-S5-S6[`S6`] +| <<#S0-0cf-S5-S6,`S6`>> | |=== @@ -1945,15 +1758,13 @@ struct R40 |=== | Name | Description -| xref:#S0-0cf-S5-f5[`f5`] +| <<#S0-0cf-S5-f5,`f5`>> | |=== - - [#R41] == R41 @@ -1966,7 +1777,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- struct R41 - : xref:#S0-0cf[S0]<23, bool>::xref:#S0-0cf-S5[S5]<24, bool>::xref:#S0-0cf-S5-S6[S6]; + : <<#S0-0cf,S0>><23, bool>::<<#S0-0cf-S5,S5>><24, bool>::<<#S0-0cf-S5-S6,S6>>; ---- === Types @@ -1974,7 +1785,7 @@ struct R41 |=== | Name | Description -| xref:#S0-0cf-S5-S6-S7[`S7`] +| <<#S0-0cf-S5-S6-S7,`S7`>> | |=== @@ -1983,15 +1794,13 @@ struct R41 |=== | Name | Description -| xref:#S0-0cf-S5-S6-f6[`f6`] +| <<#S0-0cf-S5-S6-f6,`f6`>> | |=== - - [#R42] == R42 @@ -2007,7 +1816,7 @@ template< int I, typename T> struct R42 - : xref:#S0-0cf[S0]<25, bool>::xref:#S0-0cf-S5[S5]<26, bool>::xref:#S0-0cf-S5-S6[S6]::xref:#S0-0cf-S5-S6-S7[S7]; + : <<#S0-0cf,S0>><25, bool>::<<#S0-0cf-S5,S5>><26, bool>::<<#S0-0cf-S5-S6,S6>>::<<#S0-0cf-S5-S6-S7,S7>>; ---- === Types @@ -2015,10 +1824,10 @@ struct R42 |=== | Name | Description -| xref:#S0-0cf-S5-S6-S7-S8[`S8`] +| <<#S0-0cf-S5-S6-S7-S8,`S8`>> | -| xref:#S0-0cf-S5-S6-S7-S9[`S9`] +| <<#S0-0cf-S5-S6-S7-S9,`S9`>> | |=== @@ -2027,15 +1836,13 @@ struct R42 |=== | Name | Description -| xref:#S0-0cf-S5-S6-S7-f7[`f7`] +| <<#S0-0cf-S5-S6-S7-f7,`f7`>> | |=== - - [#R43] == R43 @@ -2048,7 +1855,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- struct R43 - : xref:#S0-0cf[S0]<27, bool>::xref:#S0-0cf-S5[S5]<28, bool>::xref:#S0-0cf-S5-S6[S6]::xref:#S0-0cf-S5-S6-S7[S7]<29, int>; + : <<#S0-0cf,S0>><27, bool>::<<#S0-0cf-S5,S5>><28, bool>::<<#S0-0cf-S5-S6,S6>>::<<#S0-0cf-S5-S6-S7,S7>><29, int>; ---- === Types @@ -2056,10 +1863,10 @@ struct R43 |=== | Name | Description -| xref:#S0-0cf-S5-S6-S7-S8[`S8`] +| <<#S0-0cf-S5-S6-S7-S8,`S8`>> | -| xref:#S0-0cf-S5-S6-S7-S9[`S9`] +| <<#S0-0cf-S5-S6-S7-S9,`S9`>> | |=== @@ -2068,15 +1875,13 @@ struct R43 |=== | Name | Description -| xref:#S0-0cf-S5-S6-S7-f7[`f7`] +| <<#S0-0cf-S5-S6-S7-f7,`f7`>> | |=== - - [#R44] == R44 @@ -2089,7 +1894,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- struct R44 - : xref:#S0-0cf[S0]<30, bool>::xref:#S0-0cf-S5[S5]<31, bool>::xref:#S0-0cf-S5-S6[S6]::xref:#S0-0cf-S5-S6-S7[S7]<32, bool>; + : <<#S0-0cf,S0>><30, bool>::<<#S0-0cf-S5,S5>><31, bool>::<<#S0-0cf-S5-S6,S6>>::<<#S0-0cf-S5-S6-S7,S7>><32, bool>; ---- === Types @@ -2097,10 +1902,10 @@ struct R44 |=== | Name | Description -| xref:#S0-0cf-S5-S6-S7-S8[`S8`] +| <<#S0-0cf-S5-S6-S7-S8,`S8`>> | -| xref:#S0-0cf-S5-S6-S7-S9[`S9`] +| <<#S0-0cf-S5-S6-S7-S9,`S9`>> | |=== @@ -2109,15 +1914,13 @@ struct R44 |=== | Name | Description -| xref:#S0-0cf-S5-S6-S7-f7[`f7`] +| <<#S0-0cf-S5-S6-S7-f7,`f7`>> | |=== - - [#R45] == R45 @@ -2130,7 +1933,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- struct R45 - : xref:#S0-0cf[S0]<33, bool>::xref:#S0-0cf-S5[S5]<34, bool>::xref:#S0-0cf-S5-S6[S6]::xref:#S0-0cf-S5-S6-S7[S7]<35, bool>::xref:#S0-0cf-S5-S6-S7-S8[S8]; + : <<#S0-0cf,S0>><33, bool>::<<#S0-0cf-S5,S5>><34, bool>::<<#S0-0cf-S5-S6,S6>>::<<#S0-0cf-S5-S6-S7,S7>><35, bool>::<<#S0-0cf-S5-S6-S7-S8,S8>>; ---- === Member Functions @@ -2138,15 +1941,13 @@ struct R45 |=== | Name | Description -| xref:#S0-0cf-S5-S6-S7-S8-f8[`f8`] +| <<#S0-0cf-S5-S6-S7-S8-f8,`f8`>> | |=== - - [#R46] == R46 @@ -2162,7 +1963,7 @@ template< int I, typename T> struct R46 - : xref:#S0-0cf[S0]<36, bool>::xref:#S0-0cf-S5[S5]<37, bool>::xref:#S0-0cf-S5-S6[S6]::xref:#S0-0cf-S5-S6-S7[S7]<38, bool>::xref:#S0-0cf-S5-S6-S7-S9[S9]; + : <<#S0-0cf,S0>><36, bool>::<<#S0-0cf-S5,S5>><37, bool>::<<#S0-0cf-S5-S6,S6>>::<<#S0-0cf-S5-S6-S7,S7>><38, bool>::<<#S0-0cf-S5-S6-S7-S9,S9>>; ---- === Member Functions @@ -2170,15 +1971,13 @@ struct R46 |=== | Name | Description -| xref:#S0-0cf-S5-S6-S7-S9-f9[`f9`] +| <<#S0-0cf-S5-S6-S7-S9-f9,`f9`>> | |=== - - [#R47] == R47 @@ -2191,7 +1990,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- struct R47 - : xref:#S0-0cf[S0]<39, bool>::xref:#S0-0cf-S5[S5]<40, bool>::xref:#S0-0cf-S5-S6[S6]::xref:#S0-0cf-S5-S6-S7[S7]<41, bool>::xref:#S0-0cf-S5-S6-S7-S9[S9]<42, int>; + : <<#S0-0cf,S0>><39, bool>::<<#S0-0cf-S5,S5>><40, bool>::<<#S0-0cf-S5-S6,S6>>::<<#S0-0cf-S5-S6-S7,S7>><41, bool>::<<#S0-0cf-S5-S6-S7-S9,S9>><42, int>; ---- === Member Functions @@ -2199,15 +1998,13 @@ struct R47 |=== | Name | Description -| xref:#S0-0cf-S5-S6-S7-S9-f9[`f9`] +| <<#S0-0cf-S5-S6-S7-S9-f9,`f9`>> | |=== - - [#R48] == R48 @@ -2220,7 +2017,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- struct R48 - : xref:#S0-0cf[S0]<43, bool>::xref:#S0-0cf-S5[S5]<44, bool>::xref:#S0-0cf-S5-S6[S6]::xref:#S0-0cf-S5-S6-S7[S7]<45, bool>::xref:#S0-0cf-S5-S6-S7-S9[S9]<46, bool>; + : <<#S0-0cf,S0>><43, bool>::<<#S0-0cf-S5,S5>><44, bool>::<<#S0-0cf-S5-S6,S6>>::<<#S0-0cf-S5-S6-S7,S7>><45, bool>::<<#S0-0cf-S5-S6-S7-S9,S9>><46, bool>; ---- === Member Functions @@ -2228,7 +2025,7 @@ struct R48 |=== | Name | Description -| xref:#S0-0cf-S5-S6-S7-S9-f9[`f9`] +| <<#S0-0cf-S5-S6-S7-S9-f9,`f9`>> | |=== diff --git a/test-files/golden-tests/class-template-specializations-2.adoc b/test-files/golden-tests/class-template-specializations-2.adoc index 069260d2be..c8297ba3b8 100644 --- a/test-files/golden-tests/class-template-specializations-2.adoc +++ b/test-files/golden-tests/class-template-specializations-2.adoc @@ -1,7 +1,5 @@ = Reference :mrdocs: - - [#index] == Global namespace @@ -10,19 +8,17 @@ |=== | Name | Description -| xref:#A-0e[`A`] +| <<#A-0e,`A`>> | -| xref:#A-03[`A`] +| <<#A-03,`A`>> | -| xref:#A-06[`A`] +| <<#A-06,`A`>> | |=== - - [#A-0e] == A @@ -41,8 +37,6 @@ struct A; - - [#A-03] == A @@ -55,7 +49,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- template -struct xref:#A-0e[A]; +struct <<#A-0e,A>>; ---- === Types @@ -63,23 +57,21 @@ struct xref:#A-0e[A]; |=== | Name | Description -| xref:#A-03-B-05[`B`] +| <<#A-03-B-05,`B`>> | -| xref:#A-03-B-01[`B`] +| <<#A-03-B-01,`B`>> | -| xref:#A-03-B-0b[`B`] +| <<#A-03-B-0b,`B`>> | |=== - - [#A-03-B-05] -== xref:#A-03[A]::B +== <<#A-03,A>>::B @@ -96,10 +88,8 @@ struct B; - - [#A-03-B-01] -== xref:#A-03[A]::B +== <<#A-03,A>>::B @@ -110,7 +100,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- template -struct xref:#A-03-B-05[B]; +struct <<#A-03-B-05,B>>; ---- === Types @@ -118,17 +108,15 @@ struct xref:#A-03-B-05[B]; |=== | Name | Description -| xref:#A-03-B-01-C[`C`] +| <<#A-03-B-01-C,`C`>> | |=== - - [#A-03-B-01-C] -== xref:#A-03[A]::xref:#A-03-B-01[B]::C +== <<#A-03,A>>::<<#A-03-B-01,B>>::C @@ -144,10 +132,8 @@ struct C; - - [#A-03-B-0b] -== xref:#A-03[A]::B +== <<#A-03,A>>::B @@ -158,14 +144,12 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- template<> -struct xref:#A-03-B-05[B]; +struct <<#A-03-B-05,B>>; ---- - - [#A-06] == A @@ -178,7 +162,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- template<> -struct xref:#A-0e[A]; +struct <<#A-0e,A>>; ---- === Types @@ -186,20 +170,18 @@ struct xref:#A-0e[A]; |=== | Name | Description -| xref:#A-06-D-0b[`D`] +| <<#A-06-D-0b,`D`>> | -| xref:#A-06-D-04[`D`] +| <<#A-06-D-04,`D`>> | |=== - - [#A-06-D-0b] -== xref:#A-06[A]::D +== <<#A-06,A>>::D @@ -218,20 +200,18 @@ struct D; |=== | Name | Description -| xref:#A-06-D-0b-E-01[`E`] +| <<#A-06-D-0b-E-01,`E`>> | -| xref:#A-06-D-0b-E-04[`E`] +| <<#A-06-D-0b-E-04,`E`>> | |=== - - [#A-06-D-0b-E-01] -== xref:#A-06[A]::xref:#A-06-D-0b[D]::E +== <<#A-06,A>>::<<#A-06-D-0b,D>>::E @@ -248,10 +228,8 @@ struct E; - - [#A-06-D-0b-E-04] -== xref:#A-06[A]::xref:#A-06-D-0b[D]::E +== <<#A-06,A>>::<<#A-06-D-0b,D>>::E @@ -262,7 +240,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- template -struct xref:#A-06-D-0b-E-01[E]; +struct <<#A-06-D-0b-E-01,E>>; ---- === Types @@ -270,17 +248,15 @@ struct xref:#A-06-D-0b-E-01[E]; |=== | Name | Description -| xref:#A-06-D-0b-E-04-F[`F`] +| <<#A-06-D-0b-E-04-F,`F`>> | |=== - - [#A-06-D-0b-E-04-F] -== xref:#A-06[A]::xref:#A-06-D-0b[D]::xref:#A-06-D-0b-E-04[E]::F +== <<#A-06,A>>::<<#A-06-D-0b,D>>::<<#A-06-D-0b-E-04,E>>::F @@ -296,10 +272,8 @@ struct F; - - [#A-06-D-04] -== xref:#A-06[A]::D +== <<#A-06,A>>::D @@ -310,7 +284,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- template<> -struct xref:#A-06-D-0b[D]; +struct <<#A-06-D-0b,D>>; ---- === Types @@ -318,20 +292,18 @@ struct xref:#A-06-D-0b[D]; |=== | Name | Description -| xref:#A-06-D-04-G-06[`G`] +| <<#A-06-D-04-G-06,`G`>> | -| xref:#A-06-D-04-G-0c[`G`] +| <<#A-06-D-04-G-0c,`G`>> | |=== - - [#A-06-D-04-G-06] -== xref:#A-06[A]::xref:#A-06-D-04[D]::G +== <<#A-06,A>>::<<#A-06-D-04,D>>::G @@ -348,10 +320,8 @@ struct G; - - [#A-06-D-04-G-0c] -== xref:#A-06[A]::xref:#A-06-D-04[D]::G +== <<#A-06,A>>::<<#A-06-D-04,D>>::G @@ -362,7 +332,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- template -struct xref:#A-06-D-04-G-06[G]; +struct <<#A-06-D-04-G-06,G>>; ---- @@ -370,10 +340,4 @@ struct xref:#A-06-D-04-G-06[G]; -[#A-06-D-07] - - -[#A-02] - - [.small]#Created with https://www.mrdocs.com[MrDocs]# diff --git a/test-files/golden-tests/class-template-specializations-3.adoc b/test-files/golden-tests/class-template-specializations-3.adoc index fe3b87c4dd..92bd83c9f4 100644 --- a/test-files/golden-tests/class-template-specializations-3.adoc +++ b/test-files/golden-tests/class-template-specializations-3.adoc @@ -1,7 +1,5 @@ = Reference :mrdocs: - - [#index] == Global namespace @@ -10,16 +8,14 @@ |=== | Name | Description -| xref:#A-0e[`A`] +| <<#A-0e,`A`>> | -| xref:#E[`E`] +| <<#E,`E`>> | |=== - - [#A-0e] == A @@ -40,20 +36,18 @@ struct A; |=== | Name | Description -| xref:#A-0e-B-07[`B`] +| <<#A-0e-B-07,`B`>> | -| xref:#A-0e-B-00[`B`] +| <<#A-0e-B-00,`B`>> | |=== - - [#A-0e-B-07] -== xref:#A-0e[A]::B +== <<#A-0e,A>>::B @@ -72,23 +66,21 @@ struct B; |=== | Name | Description -| xref:#A-0e-B-07-C[`C`] +| <<#A-0e-B-07-C,`C`>> | -| xref:#A-0e-B-07-D-09[`D`] +| <<#A-0e-B-07-D-09,`D`>> | -| xref:#A-0e-B-07-D-0f[`D`] +| <<#A-0e-B-07-D-0f,`D`>> | |=== - - [#A-0e-B-07-C] -== xref:#A-0e[A]::xref:#A-0e-B-07[B]::C +== <<#A-0e,A>>::<<#A-0e-B-07,B>>::C @@ -104,10 +96,8 @@ struct C; - - [#A-0e-B-07-D-09] -== xref:#A-0e[A]::xref:#A-0e-B-07[B]::D +== <<#A-0e,A>>::<<#A-0e-B-07,B>>::D @@ -124,10 +114,8 @@ struct D; - - [#A-0e-B-07-D-0f] -== xref:#A-0e[A]::xref:#A-0e-B-07[B]::D +== <<#A-0e,A>>::<<#A-0e-B-07,B>>::D @@ -138,16 +126,14 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- template<> -struct xref:#A-0e-B-07-D-09[D]; +struct <<#A-0e-B-07-D-09,D>>; ---- - - [#A-0e-B-00] -== xref:#A-0e[A]::B +== <<#A-0e,A>>::B @@ -158,7 +144,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- template<> -struct xref:#A-0e-B-07[B]; +struct <<#A-0e-B-07,B>>; ---- === Types @@ -166,23 +152,21 @@ struct xref:#A-0e-B-07[B]; |=== | Name | Description -| xref:#A-0e-B-00-C[`C`] +| <<#A-0e-B-00-C,`C`>> | -| xref:#A-0e-B-00-D-09[`D`] +| <<#A-0e-B-00-D-09,`D`>> | -| xref:#A-0e-B-00-D-0d[`D`] +| <<#A-0e-B-00-D-0d,`D`>> | |=== - - [#A-0e-B-00-C] -== xref:#A-0e[A]::xref:#A-0e-B-00[B]::C +== <<#A-0e,A>>::<<#A-0e-B-00,B>>::C @@ -198,10 +182,8 @@ struct C; - - [#A-0e-B-00-D-09] -== xref:#A-0e[A]::xref:#A-0e-B-00[B]::D +== <<#A-0e,A>>::<<#A-0e-B-00,B>>::D @@ -218,10 +200,8 @@ struct D; - - [#A-0e-B-00-D-0d] -== xref:#A-0e[A]::xref:#A-0e-B-00[B]::D +== <<#A-0e,A>>::<<#A-0e-B-00,B>>::D @@ -232,20 +212,12 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- template<> -struct xref:#A-0e-B-00-D-09[D]; +struct <<#A-0e-B-00-D-09,D>>; ---- - - -[#A-0c] - - -[#A-00] - - [#E] == E @@ -265,59 +237,57 @@ struct E; |=== | Name | Description -| xref:#E-m0[`m0`] +| <<#E-m0,`m0`>> | -| xref:#E-m1[`m1`] +| <<#E-m1,`m1`>> | -| xref:#E-m10[`m10`] +| <<#E-m10,`m10`>> | -| xref:#E-m11[`m11`] +| <<#E-m11,`m11`>> | -| xref:#E-m12[`m12`] +| <<#E-m12,`m12`>> | -| xref:#E-m13[`m13`] +| <<#E-m13,`m13`>> | -| xref:#E-m14[`m14`] +| <<#E-m14,`m14`>> | -| xref:#E-m2[`m2`] +| <<#E-m2,`m2`>> | -| xref:#E-m3[`m3`] +| <<#E-m3,`m3`>> | -| xref:#E-m4[`m4`] +| <<#E-m4,`m4`>> | -| xref:#E-m5[`m5`] +| <<#E-m5,`m5`>> | -| xref:#E-m6[`m6`] +| <<#E-m6,`m6`>> | -| xref:#E-m7[`m7`] +| <<#E-m7,`m7`>> | -| xref:#E-m8[`m8`] +| <<#E-m8,`m8`>> | -| xref:#E-m9[`m9`] +| <<#E-m9,`m9`>> | |=== - - [#E-m0] -== xref:#E[E]::m0 +== <<#E,E>>::m0 @@ -327,14 +297,12 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- -xref:#A-0e[A]::xref:#A-0e-B-00[B] m0; +<<#A-0e,A>>::<<#A-0e-B-00,B>> m0; ---- - - [#E-m1] -== xref:#E[E]::m1 +== <<#E,E>>::m1 @@ -344,14 +312,12 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- -xref:#A-0e[A]::xref:#A-0e-B-00[B] m1; +<<#A-0e,A>>::<<#A-0e-B-00,B>> m1; ---- - - [#E-m2] -== xref:#E[E]::m2 +== <<#E,E>>::m2 @@ -361,14 +327,12 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- -xref:#A-0e[A]::xref:#A-0c-B[B] m2; +<<#A-0e,A>>::<<#A-0c-B,B>> m2; ---- - - [#E-m3] -== xref:#E[E]::m3 +== <<#E,E>>::m3 @@ -378,14 +342,12 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- -xref:#A-0e[A]::xref:#A-0e-B-07[B] m3; +<<#A-0e,A>>::<<#A-0e-B-07,B>> m3; ---- - - [#E-m4] -== xref:#E[E]::m4 +== <<#E,E>>::m4 @@ -395,14 +357,12 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- -xref:#A-0e[A]::xref:#A-00-B[B] m4; +<<#A-0e,A>>::<<#A-00-B,B>> m4; ---- - - [#E-m5] -== xref:#E[E]::m5 +== <<#E,E>>::m5 @@ -412,14 +372,12 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- -xref:#A-0e[A]::xref:#A-0e-B-00[B]::xref:#A-0e-B-00-C[C] m5; +<<#A-0e,A>>::<<#A-0e-B-00,B>>::<<#A-0e-B-00-C,C>> m5; ---- - - [#E-m6] -== xref:#E[E]::m6 +== <<#E,E>>::m6 @@ -429,14 +387,12 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- -xref:#A-0e[A]::xref:#A-0e-B-00[B]::xref:#A-0e-B-00-C[C] m6; +<<#A-0e,A>>::<<#A-0e-B-00,B>>::<<#A-0e-B-00-C,C>> m6; ---- - - [#E-m7] -== xref:#E[E]::m7 +== <<#E,E>>::m7 @@ -446,14 +402,12 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- -xref:#A-0e[A]::xref:#A-0c-B[B]::xref:#A-0c-B-C[C] m7; +<<#A-0e,A>>::<<#A-0c-B,B>>::<<#A-0c-B-C,C>> m7; ---- - - [#E-m8] -== xref:#E[E]::m8 +== <<#E,E>>::m8 @@ -463,14 +417,12 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- -xref:#A-0e[A]::xref:#A-0e-B-07[B]::xref:#A-0e-B-07-C[C] m8; +<<#A-0e,A>>::<<#A-0e-B-07,B>>::<<#A-0e-B-07-C,C>> m8; ---- - - [#E-m9] -== xref:#E[E]::m9 +== <<#E,E>>::m9 @@ -480,14 +432,12 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- -xref:#A-0e[A]::xref:#A-00-B[B]::xref:#A-00-B-C[C] m9; +<<#A-0e,A>>::<<#A-00-B,B>>::<<#A-00-B-C,C>> m9; ---- - - [#E-m10] -== xref:#E[E]::m10 +== <<#E,E>>::m10 @@ -497,14 +447,12 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- -xref:#A-0e[A]::xref:#A-0e-B-00[B]::xref:#A-0e-B-00-D-0d[D] m10; +<<#A-0e,A>>::<<#A-0e-B-00,B>>::<<#A-0e-B-00-D-0d,D>> m10; ---- - - [#E-m11] -== xref:#E[E]::m11 +== <<#E,E>>::m11 @@ -514,14 +462,12 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- -xref:#A-0e[A]::xref:#A-0e-B-00[B]::xref:#A-0e-B-00-D-0d[D] m11; +<<#A-0e,A>>::<<#A-0e-B-00,B>>::<<#A-0e-B-00-D-0d,D>> m11; ---- - - [#E-m12] -== xref:#E[E]::m12 +== <<#E,E>>::m12 @@ -531,14 +477,12 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- -xref:#A-0e[A]::xref:#A-0c-B[B]::xref:#A-0c-B-D-0b[D] m12; +<<#A-0e,A>>::<<#A-0c-B,B>>::<<#A-0c-B-D-0b,D>> m12; ---- - - [#E-m13] -== xref:#E[E]::m13 +== <<#E,E>>::m13 @@ -548,14 +492,12 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- -xref:#A-0e[A]::xref:#A-0e-B-07[B]::xref:#A-0e-B-07-D-0f[D] m13; +<<#A-0e,A>>::<<#A-0e-B-07,B>>::<<#A-0e-B-07-D-0f,D>> m13; ---- - - [#E-m14] -== xref:#E[E]::m14 +== <<#E,E>>::m14 @@ -565,7 +507,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- -xref:#A-0e[A]::xref:#A-00-B[B]::xref:#A-00-B-D-07[D] m14; +<<#A-0e,A>>::<<#A-00-B,B>>::<<#A-00-B-D-07,D>> m14; ---- diff --git a/test-files/golden-tests/class-template.adoc b/test-files/golden-tests/class-template.adoc index b053eee6ec..da21f48964 100644 --- a/test-files/golden-tests/class-template.adoc +++ b/test-files/golden-tests/class-template.adoc @@ -1,7 +1,5 @@ = Reference :mrdocs: - - [#index] == Global namespace @@ -10,25 +8,23 @@ |=== | Name | Description -| xref:#C0[`C0`] +| <<#C0,`C0`>> | -| xref:#C1[`C1`] +| <<#C1,`C1`>> | -| xref:#C2[`C2`] +| <<#C2,`C2`>> | -| xref:#C3[`C3`] +| <<#C3,`C3`>> | -| xref:#S[`S`] +| <<#S,`S`>> | |=== - - [#S] == S @@ -46,8 +42,6 @@ struct S; - - [#C0] == C0 @@ -68,7 +62,7 @@ struct C0; |=== | Name | Description -| xref:#C0-N0[`N0`] +| <<#C0-N0,`N0`>> | |=== @@ -77,23 +71,21 @@ struct C0; |=== | Name | Description -| xref:#C0-w[`w`] +| <<#C0-w,`w`>> | -| xref:#C0-x[`x`] +| <<#C0-x,`x`>> | -| xref:#C0-y[`y`] +| <<#C0-y,`y`>> | |=== - - [#C0-w] -== xref:#C0[C0]::w +== <<#C0,C0>>::w @@ -107,10 +99,8 @@ int w; ---- - - [#C0-x] -== xref:#C0[C0]::x +== <<#C0,C0>>::x @@ -120,14 +110,12 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- -xref:#S[S] x; +<<#S,S>> x; ---- - - [#C0-y] -== xref:#C0[C0]::y +== <<#C0,C0>>::y @@ -141,10 +129,8 @@ T y; ---- - - [#C0-N0] -== xref:#C0[C0]::N0 +== <<#C0,C0>>::N0 @@ -162,17 +148,15 @@ struct N0; |=== | Name | Description -| xref:#C0-N0-z[`z`] +| <<#C0-N0-z,`z`>> | |=== - - [#C0-N0-z] -== xref:#C0[C0]::xref:#C0-N0[N0]::z +== <<#C0,C0>>::<<#C0-N0,N0>>::z @@ -186,8 +170,6 @@ int z; ---- - - [#C1] == C1 @@ -207,7 +189,7 @@ struct C1; |=== | Name | Description -| xref:#C1-N1[`N1`] +| <<#C1-N1,`N1`>> | |=== @@ -216,17 +198,15 @@ struct C1; |=== | Name | Description -| xref:#C1-w[`w`] +| <<#C1-w,`w`>> | |=== - - [#C1-w] -== xref:#C1[C1]::w +== <<#C1,C1>>::w @@ -240,10 +220,8 @@ int w; ---- - - [#C1-N1] -== xref:#C1[C1]::N1 +== <<#C1,C1>>::N1 @@ -262,23 +240,21 @@ struct N1; |=== | Name | Description -| xref:#C1-N1-x[`x`] +| <<#C1-N1-x,`x`>> | -| xref:#C1-N1-y[`y`] +| <<#C1-N1-y,`y`>> | -| xref:#C1-N1-z[`z`] +| <<#C1-N1-z,`z`>> | |=== - - [#C1-N1-x] -== xref:#C1[C1]::xref:#C1-N1[N1]::x +== <<#C1,C1>>::<<#C1-N1,N1>>::x @@ -288,14 +264,12 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- -xref:#S[S] x; +<<#S,S>> x; ---- - - [#C1-N1-y] -== xref:#C1[C1]::xref:#C1-N1[N1]::y +== <<#C1,C1>>::<<#C1-N1,N1>>::y @@ -309,10 +283,8 @@ T y; ---- - - [#C1-N1-z] -== xref:#C1[C1]::xref:#C1-N1[N1]::z +== <<#C1,C1>>::<<#C1-N1,N1>>::z @@ -326,8 +298,6 @@ int z; ---- - - [#C2] == C2 @@ -348,7 +318,7 @@ struct C2; |=== | Name | Description -| xref:#C2-N2[`N2`] +| <<#C2-N2,`N2`>> | |=== @@ -357,17 +327,15 @@ struct C2; |=== | Name | Description -| xref:#C2-v[`v`] +| <<#C2-v,`v`>> | |=== - - [#C2-v] -== xref:#C2[C2]::v +== <<#C2,C2>>::v @@ -381,10 +349,8 @@ int v; ---- - - [#C2-N2] -== xref:#C2[C2]::N2 +== <<#C2,C2>>::N2 @@ -403,26 +369,24 @@ struct N2; |=== | Name | Description -| xref:#C2-N2-w[`w`] +| <<#C2-N2-w,`w`>> | -| xref:#C2-N2-x[`x`] +| <<#C2-N2-x,`x`>> | -| xref:#C2-N2-y[`y`] +| <<#C2-N2-y,`y`>> | -| xref:#C2-N2-z[`z`] +| <<#C2-N2-z,`z`>> | |=== - - [#C2-N2-w] -== xref:#C2[C2]::xref:#C2-N2[N2]::w +== <<#C2,C2>>::<<#C2-N2,N2>>::w @@ -432,14 +396,12 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- -xref:#S[S] w; +<<#S,S>> w; ---- - - [#C2-N2-x] -== xref:#C2[C2]::xref:#C2-N2[N2]::x +== <<#C2,C2>>::<<#C2-N2,N2>>::x @@ -453,10 +415,8 @@ T x; ---- - - [#C2-N2-y] -== xref:#C2[C2]::xref:#C2-N2[N2]::y +== <<#C2,C2>>::<<#C2-N2,N2>>::y @@ -470,10 +430,8 @@ U y; ---- - - [#C2-N2-z] -== xref:#C2[C2]::xref:#C2-N2[N2]::z +== <<#C2,C2>>::<<#C2-N2,N2>>::z @@ -487,8 +445,6 @@ int z; ---- - - [#C3] == C3 @@ -509,17 +465,15 @@ struct C3; |=== | Name | Description -| xref:#C3-v[`v`] +| <<#C3-v,`v`>> | |=== - - [#C3-v] -== xref:#C3[C3]::v +== <<#C3,C3>>::v diff --git a/test-files/golden-tests/commands.adoc b/test-files/golden-tests/commands.adoc index f5a13b3288..d9948660b6 100644 --- a/test-files/golden-tests/commands.adoc +++ b/test-files/golden-tests/commands.adoc @@ -1,7 +1,5 @@ = Reference :mrdocs: - - [#index] == Global namespace @@ -10,15 +8,13 @@ |=== | Name | Description -| xref:#f1[`f1`] +| <<#f1,`f1`>> | brief |=== - - [#f1] == f1 diff --git a/test-files/golden-tests/concept.adoc b/test-files/golden-tests/concept.adoc index 18bab6bd88..361f85081b 100644 --- a/test-files/golden-tests/concept.adoc +++ b/test-files/golden-tests/concept.adoc @@ -1,7 +1,5 @@ = Reference :mrdocs: - - [#index] == Global namespace @@ -10,7 +8,7 @@ |=== | Name | Description -| xref:#f[`f`] +| <<#f,`f`>> | |=== @@ -19,7 +17,7 @@ |=== | Name | Description -| xref:#x[`x`] +| <<#x,`x`>> | |=== @@ -28,13 +26,11 @@ |=== | Name | Description -| xref:#C[`C`] +| <<#C,`C`>> | |=== - - [#C] = C @@ -51,8 +47,6 @@ concept C = pass:[sizeof(T) == sizeof(int)]; ---- - - [#f] == f @@ -64,7 +58,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- -template +template<<<#C,C>> T> void f(); ---- @@ -76,8 +70,6 @@ f(); - - [#x] == x @@ -89,7 +81,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- -xref:#C[C] auto x = 0; +<<#C,C>> auto x = 0; ---- diff --git a/test-files/golden-tests/dependency-propagation.adoc b/test-files/golden-tests/dependency-propagation.adoc index b4cd04add9..a7ea99479f 100644 --- a/test-files/golden-tests/dependency-propagation.adoc +++ b/test-files/golden-tests/dependency-propagation.adoc @@ -1,7 +1,5 @@ = Reference :mrdocs: - - [#index] == Global namespace @@ -10,7 +8,7 @@ |=== | Name | Description -| xref:#N[`N`] +| <<#N,`N`>> | |=== @@ -19,13 +17,11 @@ |=== | Name | Description -| xref:#E[`E`] +| <<#E,`E`>> | |=== - - [#E] == E @@ -38,14 +34,12 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- struct E - : xref:#N[N]::xref:#N-C[C]; + : <<#N,N>>::<<#N-C,C>>; ---- - - [#N] == N @@ -54,21 +48,19 @@ struct E |=== | Name | Description -| xref:#N-A[`A`] +| <<#N-A,`A`>> | -| xref:#N-B[`B`] +| <<#N-B,`B`>> | -| xref:#N-C[`C`] +| <<#N-C,`C`>> | |=== - - [#N-C] -== xref:#N[N]::C +== <<#N,N>>::C @@ -79,14 +71,12 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- template -using C = xref:#N-B[B]; +using C = <<#N-B,B>>; ---- - - [#N-B] -== xref:#N[N]::B +== <<#N,N>>::B @@ -97,14 +87,12 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- template -using B = xref:#N-A[A]; +using B = <<#N-A,A>>; ---- - - [#N-A] -== xref:#N[N]::A +== <<#N,N>>::A diff --git a/test-files/golden-tests/duplicate-jdoc.adoc b/test-files/golden-tests/duplicate-jdoc.adoc index 70546356bc..4c5fa3a962 100644 --- a/test-files/golden-tests/duplicate-jdoc.adoc +++ b/test-files/golden-tests/duplicate-jdoc.adoc @@ -1,7 +1,5 @@ = Reference :mrdocs: - - [#index] == Global namespace @@ -10,40 +8,38 @@ |=== | Name | Description -| xref:#f0[`f0`] +| <<#f0,`f0`>> | f0 brief -| xref:#f1[`f1`] +| <<#f1,`f1`>> | f1 brief -| xref:#g0[`g0`] +| <<#g0,`g0`>> | g0 brief -| xref:#g1[`g1`] +| <<#g1,`g1`>> | g1 brief -| xref:#h0[`h0`] +| <<#h0,`h0`>> | h0 brief -| xref:#h1[`h1`] +| <<#h1,`h1`>> | h1 brief |=== - - [#f0] == f0 @@ -74,8 +70,6 @@ int - - [#f1] == f1 @@ -106,8 +100,6 @@ bool - - [#g0] == g0 @@ -147,8 +139,6 @@ one - - [#g1] == g1 @@ -188,8 +178,6 @@ two - - [#h0] == h0 @@ -230,8 +218,6 @@ one - - [#h1] == h1 diff --git a/test-files/golden-tests/empty.adoc b/test-files/golden-tests/empty.adoc index 7a88af4b86..cf41aa73c2 100644 --- a/test-files/golden-tests/empty.adoc +++ b/test-files/golden-tests/empty.adoc @@ -1,7 +1,5 @@ = Reference :mrdocs: - - [#index] == Global namespace diff --git a/test-files/golden-tests/enum.adoc b/test-files/golden-tests/enum.adoc index 1bce3d6dfc..4179c6c9c3 100644 --- a/test-files/golden-tests/enum.adoc +++ b/test-files/golden-tests/enum.adoc @@ -1,7 +1,5 @@ = Reference :mrdocs: - - [#index] == Global namespace @@ -10,26 +8,24 @@ |=== | Name | Description -| xref:#E0[`E0`] +| <<#E0,`E0`>> | E0 brief. -| xref:#E1[`E1`] +| <<#E1,`E1`>> | -| xref:#E2[`E2`] +| <<#E2,`E2`>> | E2 brief. -| xref:#E3[`E3`] +| <<#E3,`E3`>> | |=== - - [#E0] == E0 @@ -50,10 +46,10 @@ enum E0; [,cols=2] |=== |Name |Description -|xref:#E0-e0[`pass:v[e0]`] |pass:[ +|xref:E0-e0[`pass:v[e0]`] |pass:[ e0 brief. ] -|xref:#E0-e1[`pass:v[e1]`] |pass:[ +|xref:E0-e1[`pass:v[e1]`] |pass:[ e1 brief. ] |=== @@ -64,10 +60,8 @@ pass:[ E0 description. ] - - [#E0-e0] -== xref:#E0[E0]::e0 +== <<#E0,E0>>::e0 e0 brief. @@ -89,10 +83,8 @@ e0 description. ] - - [#E0-e1] -== xref:#E0[E0]::e1 +== <<#E0,E0>>::e1 e1 brief. @@ -114,8 +106,6 @@ e1 description. ] - - [#E1] == E1 @@ -134,15 +124,13 @@ enum E1 : char; [,cols=2] |=== |Name |Description -|xref:#E1-e2[`pass:v[e2]`] | -|xref:#E1-e3[`pass:v[e3]`] | +|xref:E1-e2[`pass:v[e2]`] | +|xref:E1-e3[`pass:v[e3]`] | |=== - - [#E1-e2] -== xref:#E1[E1]::e2 +== <<#E1,E1>>::e2 @@ -156,10 +144,8 @@ e2 ---- - - [#E1-e3] -== xref:#E1[E1]::e3 +== <<#E1,E1>>::e3 @@ -173,8 +159,6 @@ e3 ---- - - [#E2] == E2 @@ -195,10 +179,10 @@ enum E2 : int; [,cols=2] |=== |Name |Description -|xref:#E2-e4[`pass:v[e4]`] |pass:[ +|xref:E2-e4[`pass:v[e4]`] |pass:[ e4 brief. ] -|xref:#E2-e5[`pass:v[e5]`] |pass:[ +|xref:E2-e5[`pass:v[e5]`] |pass:[ e5 brief. ] |=== @@ -209,10 +193,8 @@ pass:[ E2 description. ] - - [#E2-e4] -== xref:#E2[E2]::e4 +== <<#E2,E2>>::e4 e4 brief. @@ -234,10 +216,8 @@ e4 description. ] - - [#E2-e5] -== xref:#E2[E2]::e5 +== <<#E2,E2>>::e5 e5 brief. @@ -259,8 +239,6 @@ e5 description. ] - - [#E3] == E3 @@ -279,15 +257,13 @@ enum E3 : char; [,cols=2] |=== |Name |Description -|xref:#E3-e6[`pass:v[e6]`] | -|xref:#E3-e7[`pass:v[e7]`] | +|xref:E3-e6[`pass:v[e6]`] | +|xref:E3-e7[`pass:v[e7]`] | |=== - - [#E3-e6] -== xref:#E3[E3]::e6 +== <<#E3,E3>>::e6 @@ -301,10 +277,8 @@ e6 ---- - - [#E3-e7] -== xref:#E3[E3]::e7 +== <<#E3,E3>>::e7 diff --git a/test-files/golden-tests/enum.html b/test-files/golden-tests/enum.html index 9b3bad0ca7..39ff516708 100644 --- a/test-files/golden-tests/enum.html +++ b/test-files/golden-tests/enum.html @@ -92,13 +92,13 @@

Members

- e0 + e0

e0 brief.

- e1 + e1

e1 brief.

@@ -207,11 +207,11 @@

Members

- e2 + e2 - e3 + e3 @@ -298,13 +298,13 @@

Members

- e4 + e4

e4 brief.

- e5 + e5

e5 brief.

@@ -413,11 +413,11 @@

Members

- e6 + e6 - e7 + e7 diff --git a/test-files/golden-tests/explicit-conv-operator.adoc b/test-files/golden-tests/explicit-conv-operator.adoc index cc68849c16..982909094a 100644 --- a/test-files/golden-tests/explicit-conv-operator.adoc +++ b/test-files/golden-tests/explicit-conv-operator.adoc @@ -1,7 +1,5 @@ = Reference :mrdocs: - - [#index] == Global namespace @@ -10,22 +8,20 @@ |=== | Name | Description -| xref:#Explicit[`Explicit`] +| <<#Explicit,`Explicit`>> | -| xref:#ExplicitExpression[`ExplicitExpression`] +| <<#ExplicitExpression,`ExplicitExpression`>> | -| xref:#ExplicitFalse[`ExplicitFalse`] +| <<#ExplicitFalse,`ExplicitFalse`>> | -| xref:#ExplicitTrue[`ExplicitTrue`] +| <<#ExplicitTrue,`ExplicitTrue`>> | |=== - - [#Explicit] == Explicit @@ -45,17 +41,15 @@ struct Explicit; |=== | Name | Description -| xref:#Explicit-2conversion[`operator bool`] +| <<#Explicit-2conversion,`operator bool`>> | |=== - - [#Explicit-2conversion] -== xref:#Explicit[Explicit]::operator bool +== <<#Explicit,Explicit>>::operator bool @@ -76,8 +70,6 @@ operator bool(); - - [#ExplicitFalse] == ExplicitFalse @@ -97,17 +89,15 @@ struct ExplicitFalse; |=== | Name | Description -| xref:#ExplicitFalse-2conversion[`operator bool`] +| <<#ExplicitFalse-2conversion,`operator bool`>> | |=== - - [#ExplicitFalse-2conversion] -== xref:#ExplicitFalse[ExplicitFalse]::operator bool +== <<#ExplicitFalse,ExplicitFalse>>::operator bool @@ -128,8 +118,6 @@ operator bool(); - - [#ExplicitTrue] == ExplicitTrue @@ -149,17 +137,15 @@ struct ExplicitTrue; |=== | Name | Description -| xref:#ExplicitTrue-2conversion[`operator bool`] +| <<#ExplicitTrue-2conversion,`operator bool`>> | |=== - - [#ExplicitTrue-2conversion] -== xref:#ExplicitTrue[ExplicitTrue]::operator bool +== <<#ExplicitTrue,ExplicitTrue>>::operator bool @@ -180,8 +166,6 @@ operator bool(); - - [#ExplicitExpression] == ExplicitExpression @@ -202,17 +186,15 @@ struct ExplicitExpression; |=== | Name | Description -| xref:#ExplicitExpression-2conversion[`operator bool`] +| <<#ExplicitExpression-2conversion,`operator bool`>> | |=== - - [#ExplicitExpression-2conversion] -== xref:#ExplicitExpression[ExplicitExpression]::operator bool +== <<#ExplicitExpression,ExplicitExpression>>::operator bool diff --git a/test-files/golden-tests/explicit-ctor.adoc b/test-files/golden-tests/explicit-ctor.adoc index 8be2e94d3b..8a9a3ade56 100644 --- a/test-files/golden-tests/explicit-ctor.adoc +++ b/test-files/golden-tests/explicit-ctor.adoc @@ -1,7 +1,5 @@ = Reference :mrdocs: - - [#index] == Global namespace @@ -10,22 +8,20 @@ |=== | Name | Description -| xref:#Explicit[`Explicit`] +| <<#Explicit,`Explicit`>> | -| xref:#ExplicitExpression[`ExplicitExpression`] +| <<#ExplicitExpression,`ExplicitExpression`>> | -| xref:#ExplicitFalse[`ExplicitFalse`] +| <<#ExplicitFalse,`ExplicitFalse`>> | -| xref:#ExplicitTrue[`ExplicitTrue`] +| <<#ExplicitTrue,`ExplicitTrue`>> | |=== - - [#Explicit] == Explicit @@ -45,16 +41,14 @@ struct Explicit; |=== | Name | Description -| xref:Explicit-2constructor[`Explicit`] [.small]#[constructor]# +| <<#Explicit-2constructor,`Explicit`>> [.small]#[constructor]# | |=== - [#pass:[Explicit-2constructor]] - -== xref:#Explicit[Explicit]::Explicit +== <<#Explicit,Explicit>>::Explicit @@ -64,25 +58,25 @@ struct Explicit; [source,cpp,subs="verbatim,macros,-callouts"] ---- explicit -xref:#Explicit-2constructor-02[Explicit](); +<<#Explicit-2constructor-02,Explicit>>(); ---- [source,cpp,subs="verbatim,macros,-callouts"] ---- explicit -xref:#Explicit-2constructor-00[Explicit](xref:#Explicit[Explicit] const&); +<<#Explicit-2constructor-00,Explicit>>(<<#Explicit,Explicit>> const&); ---- [source,cpp,subs="verbatim,macros,-callouts"] ---- explicit -xref:#Explicit-2constructor-0b[Explicit](xref:#Explicit[Explicit]&&) noexcept; +<<#Explicit-2constructor-0b,Explicit>>(<<#Explicit,Explicit>>&&) noexcept; ---- [source,cpp,subs="verbatim,macros,-callouts"] ---- explicit -xref:#Explicit-2constructor-03[Explicit]( +<<#Explicit-2constructor-03,Explicit>>( int, int); ---- @@ -94,10 +88,8 @@ xref:#Explicit-2constructor-03[Explicit]( - - [#Explicit-2constructor-02] -== xref:#Explicit[Explicit]::Explicit +== <<#Explicit,Explicit>>::Explicit @@ -118,10 +110,8 @@ Explicit(); - - [#Explicit-2constructor-00] -== xref:#Explicit[Explicit]::Explicit +== <<#Explicit,Explicit>>::Explicit @@ -132,7 +122,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- explicit -Explicit(xref:#Explicit[Explicit] const&); +Explicit(<<#Explicit,Explicit>> const&); ---- @@ -142,10 +132,8 @@ Explicit(xref:#Explicit[Explicit] const&); - - [#Explicit-2constructor-0b] -== xref:#Explicit[Explicit]::Explicit +== <<#Explicit,Explicit>>::Explicit @@ -156,7 +144,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- explicit -Explicit(xref:#Explicit[Explicit]&&) noexcept; +Explicit(<<#Explicit,Explicit>>&&) noexcept; ---- @@ -166,10 +154,8 @@ Explicit(xref:#Explicit[Explicit]&&) noexcept; - - [#Explicit-2constructor-03] -== xref:#Explicit[Explicit]::Explicit +== <<#Explicit,Explicit>>::Explicit @@ -192,8 +178,6 @@ Explicit( - - [#ExplicitTrue] == ExplicitTrue @@ -213,16 +197,14 @@ struct ExplicitTrue; |=== | Name | Description -| xref:ExplicitTrue-2constructor[`ExplicitTrue`] [.small]#[constructor]# +| <<#ExplicitTrue-2constructor,`ExplicitTrue`>> [.small]#[constructor]# | |=== - [#pass:[ExplicitTrue-2constructor]] - -== xref:#ExplicitTrue[ExplicitTrue]::ExplicitTrue +== <<#ExplicitTrue,ExplicitTrue>>::ExplicitTrue @@ -232,25 +214,25 @@ struct ExplicitTrue; [source,cpp,subs="verbatim,macros,-callouts"] ---- pass:[explicit(true)] -xref:#ExplicitTrue-2constructor-0d[ExplicitTrue](); +<<#ExplicitTrue-2constructor-0d,ExplicitTrue>>(); ---- [source,cpp,subs="verbatim,macros,-callouts"] ---- pass:[explicit(true)] -xref:#ExplicitTrue-2constructor-04[ExplicitTrue](xref:#ExplicitTrue[ExplicitTrue] const&); +<<#ExplicitTrue-2constructor-04,ExplicitTrue>>(<<#ExplicitTrue,ExplicitTrue>> const&); ---- [source,cpp,subs="verbatim,macros,-callouts"] ---- pass:[explicit(true)] -xref:#ExplicitTrue-2constructor-08[ExplicitTrue](xref:#ExplicitTrue[ExplicitTrue]&&) noexcept; +<<#ExplicitTrue-2constructor-08,ExplicitTrue>>(<<#ExplicitTrue,ExplicitTrue>>&&) noexcept; ---- [source,cpp,subs="verbatim,macros,-callouts"] ---- pass:[explicit(true)] -xref:#ExplicitTrue-2constructor-05[ExplicitTrue]( +<<#ExplicitTrue-2constructor-05,ExplicitTrue>>( int, int); ---- @@ -262,10 +244,8 @@ xref:#ExplicitTrue-2constructor-05[ExplicitTrue]( - - [#ExplicitTrue-2constructor-0d] -== xref:#ExplicitTrue[ExplicitTrue]::ExplicitTrue +== <<#ExplicitTrue,ExplicitTrue>>::ExplicitTrue @@ -286,10 +266,8 @@ ExplicitTrue(); - - [#ExplicitTrue-2constructor-04] -== xref:#ExplicitTrue[ExplicitTrue]::ExplicitTrue +== <<#ExplicitTrue,ExplicitTrue>>::ExplicitTrue @@ -300,7 +278,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- pass:[explicit(true)] -ExplicitTrue(xref:#ExplicitTrue[ExplicitTrue] const&); +ExplicitTrue(<<#ExplicitTrue,ExplicitTrue>> const&); ---- @@ -310,10 +288,8 @@ ExplicitTrue(xref:#ExplicitTrue[ExplicitTrue] const&); - - [#ExplicitTrue-2constructor-08] -== xref:#ExplicitTrue[ExplicitTrue]::ExplicitTrue +== <<#ExplicitTrue,ExplicitTrue>>::ExplicitTrue @@ -324,7 +300,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- pass:[explicit(true)] -ExplicitTrue(xref:#ExplicitTrue[ExplicitTrue]&&) noexcept; +ExplicitTrue(<<#ExplicitTrue,ExplicitTrue>>&&) noexcept; ---- @@ -334,10 +310,8 @@ ExplicitTrue(xref:#ExplicitTrue[ExplicitTrue]&&) noexcept; - - [#ExplicitTrue-2constructor-05] -== xref:#ExplicitTrue[ExplicitTrue]::ExplicitTrue +== <<#ExplicitTrue,ExplicitTrue>>::ExplicitTrue @@ -360,8 +334,6 @@ ExplicitTrue( - - [#ExplicitFalse] == ExplicitFalse @@ -381,16 +353,14 @@ struct ExplicitFalse; |=== | Name | Description -| xref:ExplicitFalse-2constructor[`ExplicitFalse`] [.small]#[constructor]# +| <<#ExplicitFalse-2constructor,`ExplicitFalse`>> [.small]#[constructor]# | |=== - [#pass:[ExplicitFalse-2constructor]] - -== xref:#ExplicitFalse[ExplicitFalse]::ExplicitFalse +== <<#ExplicitFalse,ExplicitFalse>>::ExplicitFalse @@ -400,25 +370,25 @@ struct ExplicitFalse; [source,cpp,subs="verbatim,macros,-callouts"] ---- pass:[explicit(false)] -xref:#ExplicitFalse-2constructor-01[ExplicitFalse](); +<<#ExplicitFalse-2constructor-01,ExplicitFalse>>(); ---- [source,cpp,subs="verbatim,macros,-callouts"] ---- pass:[explicit(false)] -xref:#ExplicitFalse-2constructor-08[ExplicitFalse](xref:#ExplicitFalse[ExplicitFalse] const&); +<<#ExplicitFalse-2constructor-08,ExplicitFalse>>(<<#ExplicitFalse,ExplicitFalse>> const&); ---- [source,cpp,subs="verbatim,macros,-callouts"] ---- pass:[explicit(false)] -xref:#ExplicitFalse-2constructor-0a[ExplicitFalse](xref:#ExplicitFalse[ExplicitFalse]&&) noexcept; +<<#ExplicitFalse-2constructor-0a,ExplicitFalse>>(<<#ExplicitFalse,ExplicitFalse>>&&) noexcept; ---- [source,cpp,subs="verbatim,macros,-callouts"] ---- pass:[explicit(false)] -xref:#ExplicitFalse-2constructor-04[ExplicitFalse]( +<<#ExplicitFalse-2constructor-04,ExplicitFalse>>( int, int); ---- @@ -430,10 +400,8 @@ xref:#ExplicitFalse-2constructor-04[ExplicitFalse]( - - [#ExplicitFalse-2constructor-01] -== xref:#ExplicitFalse[ExplicitFalse]::ExplicitFalse +== <<#ExplicitFalse,ExplicitFalse>>::ExplicitFalse @@ -454,10 +422,8 @@ ExplicitFalse(); - - [#ExplicitFalse-2constructor-08] -== xref:#ExplicitFalse[ExplicitFalse]::ExplicitFalse +== <<#ExplicitFalse,ExplicitFalse>>::ExplicitFalse @@ -468,7 +434,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- pass:[explicit(false)] -ExplicitFalse(xref:#ExplicitFalse[ExplicitFalse] const&); +ExplicitFalse(<<#ExplicitFalse,ExplicitFalse>> const&); ---- @@ -478,10 +444,8 @@ ExplicitFalse(xref:#ExplicitFalse[ExplicitFalse] const&); - - [#ExplicitFalse-2constructor-0a] -== xref:#ExplicitFalse[ExplicitFalse]::ExplicitFalse +== <<#ExplicitFalse,ExplicitFalse>>::ExplicitFalse @@ -492,7 +456,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- pass:[explicit(false)] -ExplicitFalse(xref:#ExplicitFalse[ExplicitFalse]&&) noexcept; +ExplicitFalse(<<#ExplicitFalse,ExplicitFalse>>&&) noexcept; ---- @@ -502,10 +466,8 @@ ExplicitFalse(xref:#ExplicitFalse[ExplicitFalse]&&) noexcept; - - [#ExplicitFalse-2constructor-04] -== xref:#ExplicitFalse[ExplicitFalse]::ExplicitFalse +== <<#ExplicitFalse,ExplicitFalse>>::ExplicitFalse @@ -528,8 +490,6 @@ ExplicitFalse( - - [#ExplicitExpression] == ExplicitExpression @@ -550,16 +510,14 @@ struct ExplicitExpression; |=== | Name | Description -| xref:ExplicitExpression-2constructor[`ExplicitExpression`] [.small]#[constructor]# +| <<#ExplicitExpression-2constructor,`ExplicitExpression`>> [.small]#[constructor]# | |=== - [#pass:[ExplicitExpression-2constructor]] - -== xref:#ExplicitExpression[ExplicitExpression]::ExplicitExpression +== <<#ExplicitExpression,ExplicitExpression>>::ExplicitExpression @@ -569,25 +527,25 @@ struct ExplicitExpression; [source,cpp,subs="verbatim,macros,-callouts"] ---- pass:[explicit(B)] -xref:#ExplicitExpression-2constructor-0b[ExplicitExpression](); +<<#ExplicitExpression-2constructor-0b,ExplicitExpression>>(); ---- [source,cpp,subs="verbatim,macros,-callouts"] ---- pass:[explicit(B)] -xref:#ExplicitExpression-2constructor-04[ExplicitExpression](xref:#ExplicitExpression[ExplicitExpression] const&); +<<#ExplicitExpression-2constructor-04,ExplicitExpression>>(<<#ExplicitExpression,ExplicitExpression>> const&); ---- [source,cpp,subs="verbatim,macros,-callouts"] ---- pass:[explicit(B)] -xref:#ExplicitExpression-2constructor-08[ExplicitExpression](xref:#ExplicitExpression[ExplicitExpression]&&) noexcept; +<<#ExplicitExpression-2constructor-08,ExplicitExpression>>(<<#ExplicitExpression,ExplicitExpression>>&&) noexcept; ---- [source,cpp,subs="verbatim,macros,-callouts"] ---- pass:[explicit(B)] -xref:#ExplicitExpression-2constructor-02[ExplicitExpression]( +<<#ExplicitExpression-2constructor-02,ExplicitExpression>>( int, int); ---- @@ -599,10 +557,8 @@ xref:#ExplicitExpression-2constructor-02[ExplicitExpression]( - - [#ExplicitExpression-2constructor-0b] -== xref:#ExplicitExpression[ExplicitExpression]::ExplicitExpression +== <<#ExplicitExpression,ExplicitExpression>>::ExplicitExpression @@ -623,10 +579,8 @@ ExplicitExpression(); - - [#ExplicitExpression-2constructor-04] -== xref:#ExplicitExpression[ExplicitExpression]::ExplicitExpression +== <<#ExplicitExpression,ExplicitExpression>>::ExplicitExpression @@ -637,7 +591,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- pass:[explicit(B)] -ExplicitExpression(xref:#ExplicitExpression[ExplicitExpression] const&); +ExplicitExpression(<<#ExplicitExpression,ExplicitExpression>> const&); ---- @@ -647,10 +601,8 @@ ExplicitExpression(xref:#ExplicitExpression[ExplicitExpression] const&); - - [#ExplicitExpression-2constructor-08] -== xref:#ExplicitExpression[ExplicitExpression]::ExplicitExpression +== <<#ExplicitExpression,ExplicitExpression>>::ExplicitExpression @@ -661,7 +613,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- pass:[explicit(B)] -ExplicitExpression(xref:#ExplicitExpression[ExplicitExpression]&&) noexcept; +ExplicitExpression(<<#ExplicitExpression,ExplicitExpression>>&&) noexcept; ---- @@ -671,10 +623,8 @@ ExplicitExpression(xref:#ExplicitExpression[ExplicitExpression]&&) noexcept; - - [#ExplicitExpression-2constructor-02] -== xref:#ExplicitExpression[ExplicitExpression]::ExplicitExpression +== <<#ExplicitExpression,ExplicitExpression>>::ExplicitExpression diff --git a/test-files/golden-tests/explicit-ctor.html b/test-files/golden-tests/explicit-ctor.html index 267c9a8a28..3cd6115762 100644 --- a/test-files/golden-tests/explicit-ctor.html +++ b/test-files/golden-tests/explicit-ctor.html @@ -89,7 +89,7 @@

Member Functions

- Explicit + Explicit [constructor] @@ -102,7 +102,6 @@

Member Functions

-

Overload set Explicit::Explicit

@@ -279,7 +278,7 @@

Member Functions

- ExplicitTrue + ExplicitTrue [constructor] @@ -292,7 +291,6 @@

Member Functions

-

Overload set ExplicitTrue::ExplicitTrue

@@ -469,7 +467,7 @@

Member Functions

- ExplicitFalse + ExplicitFalse [constructor] @@ -482,7 +480,6 @@

Member Functions

-

Overload set ExplicitFalse::ExplicitFalse

@@ -660,7 +657,7 @@

Member Functions

- ExplicitExpression + ExplicitExpression [constructor] @@ -673,7 +670,6 @@

Member Functions

-

Overload set ExplicitExpression::ExplicitExpression

diff --git a/test-files/golden-tests/explicit-deduct-guide.adoc b/test-files/golden-tests/explicit-deduct-guide.adoc index 4d846988b2..a91f4605a7 100644 --- a/test-files/golden-tests/explicit-deduct-guide.adoc +++ b/test-files/golden-tests/explicit-deduct-guide.adoc @@ -1,7 +1,5 @@ = Reference :mrdocs: - - [#index] == Global namespace @@ -10,7 +8,7 @@ |=== | Name | Description -| xref:#X-0e[`X`] +| <<#X-0e,`X`>> | |=== @@ -19,22 +17,20 @@ |=== | Name | Description -| xref:#X-0d[`X<0>`] +| <<#X-0d,`X<0>`>> | -| xref:#X-00[`X<0>`] +| <<#X-00,`X<0>`>> | -| xref:#X-0b[`X<0>`] +| <<#X-0b,`X<0>`>> | -| xref:#X-06[`X<0>`] +| <<#X-06,`X<0>`>> | |=== - - [#X-0e] == X @@ -53,8 +49,6 @@ struct X; - - [#X-0d] == X @@ -66,12 +60,10 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- -xref:#X-0e[X]<0>(bool) -> xref:#X-0e[X]<0>; +<<#X-0e,X>><0>(bool) -> <<#X-0e,X>><0>; ---- - - [#X-00] == X @@ -83,12 +75,10 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- -xref:#X-0e[X]<0>(char) -> xref:#X-0e[X]<0>; +<<#X-0e,X>><0>(char) -> <<#X-0e,X>><0>; ---- - - [#X-0b] == X @@ -100,12 +90,10 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- -xref:#X-0e[X]<0>(int) -> xref:#X-0e[X]<0>; +<<#X-0e,X>><0>(int) -> <<#X-0e,X>><0>; ---- - - [#X-06] == X @@ -118,7 +106,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- template -xref:#X-0e[X]<0>(long) -> xref:#X-0e[X]<0>; +<<#X-0e,X>><0>(long) -> <<#X-0e,X>><0>; ---- diff --git a/test-files/golden-tests/explicit-object-parameter.adoc b/test-files/golden-tests/explicit-object-parameter.adoc index 6274a3a996..354927f16b 100644 --- a/test-files/golden-tests/explicit-object-parameter.adoc +++ b/test-files/golden-tests/explicit-object-parameter.adoc @@ -1,7 +1,5 @@ = Reference :mrdocs: - - [#index] == Global namespace @@ -10,13 +8,11 @@ |=== | Name | Description -| xref:#Optional[`Optional`] +| <<#Optional,`Optional`>> | |=== - - [#Optional] == Optional @@ -36,16 +32,14 @@ struct Optional; |=== | Name | Description -| xref:Optional-value[`value`] +| <<#Optional-value,`value`>> | |=== - [#pass:[Optional-value]] - -== xref:#Optional[Optional]::value +== <<#Optional,Optional>>::value @@ -57,7 +51,7 @@ struct Optional; template constexpr auto&& -xref:#Optional-value-05[value](this Self&& self); +<<#Optional-value-05,value>>(this Self&& self); ---- [source,cpp,subs="verbatim,macros,-callouts"] @@ -65,7 +59,7 @@ xref:#Optional-value-05[value](this Self&& self); template constexpr auto&& -xref:#Optional-value-06[value](this +<<#Optional-value-06,value>>(this Self&& self, int x); ---- @@ -77,10 +71,8 @@ xref:#Optional-value-06[value](this - - [#Optional-value-05] -== xref:#Optional[Optional]::value +== <<#Optional,Optional>>::value @@ -103,10 +95,8 @@ value(this Self&& self); - - [#Optional-value-06] -== xref:#Optional[Optional]::value +== <<#Optional,Optional>>::value diff --git a/test-files/golden-tests/explicit-object-parameter.html b/test-files/golden-tests/explicit-object-parameter.html index a32a6cd7a2..1c81299011 100644 --- a/test-files/golden-tests/explicit-object-parameter.html +++ b/test-files/golden-tests/explicit-object-parameter.html @@ -68,7 +68,7 @@

Member Functions

- value + value @@ -79,7 +79,6 @@

Member Functions

-

Overload set Optional::value

diff --git a/test-files/golden-tests/filters/blacklist_0.adoc b/test-files/golden-tests/filters/blacklist_0.adoc index 331c9b3b38..c072ae76a6 100644 --- a/test-files/golden-tests/filters/blacklist_0.adoc +++ b/test-files/golden-tests/filters/blacklist_0.adoc @@ -1,7 +1,5 @@ = Reference :mrdocs: - - [#index] == Global namespace @@ -10,22 +8,20 @@ |=== | Name | Description -| xref:#N0[`N0`] +| <<#N0,`N0`>> | -| xref:#N3[`N3`] +| <<#N3,`N3`>> | -| xref:#N4[`N4`] +| <<#N4,`N4`>> | -| xref:#N7[`N7`] +| <<#N7,`N7`>> | |=== - - [#N0] == N0 @@ -34,15 +30,13 @@ |=== | Name | Description -| xref:#N0-f0[`f0`] +| <<#N0-f0,`f0`>> | |=== - - [#N0-f0] -== xref:#N0[N0]::f0 +== <<#N0,N0>>::f0 @@ -63,14 +57,10 @@ f0(); - - [#N3] == N3 - - [#N4] == N4 @@ -79,33 +69,29 @@ f0(); |=== | Name | Description -| xref:#N4-N5[`N5`] +| <<#N4-N5,`N5`>> | -| xref:#N4-N6[`N6`] +| <<#N4-N6,`N6`>> | |=== - - [#N4-N5] -== xref:#N4[N4]::N5 +== <<#N4,N4>>::N5 === Functions [cols=2] |=== | Name | Description -| xref:#N4-N5-f1[`f1`] +| <<#N4-N5-f1,`f1`>> | |=== - - [#N4-N5-f1] -== xref:#N4[N4]::xref:#N4-N5[N5]::f1 +== <<#N4,N4>>::<<#N4-N5,N5>>::f1 @@ -126,25 +112,21 @@ f1(); - - [#N4-N6] -== xref:#N4[N4]::N6 +== <<#N4,N4>>::N6 === Functions [cols=2] |=== | Name | Description -| xref:#N4-N6-f1[`f1`] +| <<#N4-N6-f1,`f1`>> | |=== - - [#N4-N6-f1] -== xref:#N4[N4]::xref:#N4-N6[N6]::f1 +== <<#N4,N4>>::<<#N4-N6,N6>>::f1 @@ -165,8 +147,6 @@ f1(); - - [#N7] == N7 @@ -175,39 +155,33 @@ f1(); |=== | Name | Description -| xref:#N7-N8[`N8`] +| <<#N7-N8,`N8`>> | -| xref:#N7-N9[`N9`] +| <<#N7-N9,`N9`>> | |=== - - [#N7-N8] -== xref:#N7[N7]::N8 - - +== <<#N7,N7>>::N8 [#N7-N9] -== xref:#N7[N7]::N9 +== <<#N7,N7>>::N9 === Functions [cols=2] |=== | Name | Description -| xref:#N7-N9-g0[`g0`] +| <<#N7-N9-g0,`g0`>> | |=== - - [#N7-N9-g0] -== xref:#N7[N7]::xref:#N7-N9[N9]::g0 +== <<#N7,N7>>::<<#N7-N9,N9>>::g0 diff --git a/test-files/golden-tests/filters/blacklist_test.adoc b/test-files/golden-tests/filters/blacklist_test.adoc index 48d25f47e6..46954ab507 100644 --- a/test-files/golden-tests/filters/blacklist_test.adoc +++ b/test-files/golden-tests/filters/blacklist_test.adoc @@ -1,7 +1,5 @@ = Reference :mrdocs: - - [#index] == Global namespace @@ -10,16 +8,14 @@ |=== | Name | Description -| xref:#blacklisted[`blacklisted`] +| <<#blacklisted,`blacklisted`>> | -| xref:#to_be_documented[`pass:[to_be_documented]`] +| <<#to_be_documented,`pass:[to_be_documented]`>> | |=== - - [#to_be_documented] == pass:[to_be_documented] @@ -28,15 +24,13 @@ |=== | Name | Description -| xref:#to_be_documented-documented_function[`pass:[documented_function]`] +| <<#to_be_documented-documented_function,`pass:[documented_function]`>> | |=== - - [#to_be_documented-documented_function] -== xref:#to_be_documented[pass:[to_be_documented]]::pass:[documented_function] +== <<#to_be_documented,pass:[to_be_documented]>>::pass:[documented_function] @@ -57,8 +51,6 @@ pass:[documented_function](); - - [#blacklisted] == blacklisted diff --git a/test-files/golden-tests/filters/filters.adoc b/test-files/golden-tests/filters/filters.adoc index 279be4fb3c..eb81b59df1 100644 --- a/test-files/golden-tests/filters/filters.adoc +++ b/test-files/golden-tests/filters/filters.adoc @@ -1,7 +1,5 @@ = Reference :mrdocs: - - [#index] == Global namespace @@ -10,25 +8,23 @@ |=== | Name | Description -| xref:#A[`A`] +| <<#A,`A`>> | -| xref:#B[`B`] +| <<#B,`B`>> | -| xref:#C[`C`] +| <<#C,`C`>> | -| xref:#D[`D`] +| <<#D,`D`>> | -| xref:#F[`F`] +| <<#F,`F`>> | |=== - - [#A] == A @@ -37,10 +33,10 @@ |=== | Name | Description -| xref:#A-detail[`detail`] +| <<#A-detail,`detail`>> | -| xref:#A-detair[`detair`] +| <<#A-detair,`detair`>> | |=== @@ -49,15 +45,13 @@ |=== | Name | Description -| xref:#A-f0[`f0`] +| <<#A-f0,`f0`>> | |=== - - [#A-f0] -== xref:#A[A]::f0 +== <<#A,A>>::f0 @@ -78,25 +72,21 @@ f0(); - - [#A-detail] -== xref:#A[A]::detail +== <<#A,A>>::detail === Functions [cols=2] |=== | Name | Description -| xref:#A-detail-g0[`g0`] +| <<#A-detail-g0,`g0`>> | |=== - - [#A-detail-g0] -== xref:#A[A]::xref:#A-detail[detail]::g0 +== <<#A,A>>::<<#A-detail,detail>>::g0 @@ -117,17 +107,15 @@ g0(); - - [#A-detair] -== xref:#A[A]::detair +== <<#A,A>>::detair === Types [cols=2] |=== | Name | Description -| xref:#A-detair-Y[`Y`] +| <<#A-detair-Y,`Y`>> | |=== @@ -136,15 +124,13 @@ g0(); |=== | Name | Description -| xref:#A-detair-f4[`f4`] +| <<#A-detair-f4,`f4`>> | |=== - - [#A-detair-f4] -== xref:#A[A]::xref:#A-detair[detair]::f4 +== <<#A,A>>::<<#A-detair,detair>>::f4 @@ -165,10 +151,8 @@ f4(); - - [#A-detair-Y] -== xref:#A[A]::xref:#A-detair[detair]::Y +== <<#A,A>>::<<#A-detair,detair>>::Y @@ -186,7 +170,7 @@ struct Y; |=== | Name | Description -| xref:#A-detair-Y-Z[`Z`] +| <<#A-detair-Y-Z,`Z`>> | |=== @@ -195,17 +179,15 @@ struct Y; |=== | Name | Description -| xref:#A-detair-Y-f6[`f6`] +| <<#A-detair-Y-f6,`f6`>> | |=== - - [#A-detair-Y-f6] -== xref:#A[A]::xref:#A-detair[detair]::xref:#A-detair-Y[Y]::f6 +== <<#A,A>>::<<#A-detair,detair>>::<<#A-detair-Y,Y>>::f6 @@ -226,10 +208,8 @@ f6(); - - [#A-detair-Y-Z] -== xref:#A[A]::xref:#A-detair[detair]::xref:#A-detair-Y[Y]::Z +== <<#A,A>>::<<#A-detair,detair>>::<<#A-detair-Y,Y>>::Z @@ -247,17 +227,15 @@ struct Z; |=== | Name | Description -| xref:#A-detair-Y-Z-f7[`f7`] +| <<#A-detair-Y-Z-f7,`f7`>> | |=== - - [#A-detair-Y-Z-f7] -== xref:#A[A]::xref:#A-detair[detair]::xref:#A-detair-Y[Y]::xref:#A-detair-Y-Z[Z]::f7 +== <<#A,A>>::<<#A-detair,detair>>::<<#A-detair-Y,Y>>::<<#A-detair-Y-Z,Z>>::f7 @@ -278,8 +256,6 @@ f7(); - - [#B] == B @@ -288,7 +264,7 @@ f7(); |=== | Name | Description -| xref:#B-detair[`detair`] +| <<#B-detair,`detair`>> | |=== @@ -297,15 +273,13 @@ f7(); |=== | Name | Description -| xref:#B-f0[`f0`] +| <<#B-f0,`f0`>> | |=== - - [#B-f0] -== xref:#B[B]::f0 +== <<#B,B>>::f0 @@ -326,17 +300,15 @@ f0(); - - [#B-detair] -== xref:#B[B]::detair +== <<#B,B>>::detair === Types [cols=2] |=== | Name | Description -| xref:#B-detair-Y[`Y`] +| <<#B-detair-Y,`Y`>> | |=== @@ -345,15 +317,13 @@ f0(); |=== | Name | Description -| xref:#B-detair-f4[`f4`] +| <<#B-detair-f4,`f4`>> | |=== - - [#B-detair-f4] -== xref:#B[B]::xref:#B-detair[detair]::f4 +== <<#B,B>>::<<#B-detair,detair>>::f4 @@ -374,10 +344,8 @@ f4(); - - [#B-detair-Y] -== xref:#B[B]::xref:#B-detair[detair]::Y +== <<#B,B>>::<<#B-detair,detair>>::Y @@ -395,7 +363,7 @@ struct Y; |=== | Name | Description -| xref:#B-detair-Y-Z[`Z`] +| <<#B-detair-Y-Z,`Z`>> | |=== @@ -404,17 +372,15 @@ struct Y; |=== | Name | Description -| xref:#B-detair-Y-f6[`f6`] +| <<#B-detair-Y-f6,`f6`>> | |=== - - [#B-detair-Y-f6] -== xref:#B[B]::xref:#B-detair[detair]::xref:#B-detair-Y[Y]::f6 +== <<#B,B>>::<<#B-detair,detair>>::<<#B-detair-Y,Y>>::f6 @@ -435,10 +401,8 @@ f6(); - - [#B-detair-Y-Z] -== xref:#B[B]::xref:#B-detair[detair]::xref:#B-detair-Y[Y]::Z +== <<#B,B>>::<<#B-detair,detair>>::<<#B-detair-Y,Y>>::Z @@ -456,17 +420,15 @@ struct Z; |=== | Name | Description -| xref:#B-detair-Y-Z-f7[`f7`] +| <<#B-detair-Y-Z-f7,`f7`>> | |=== - - [#B-detair-Y-Z-f7] -== xref:#B[B]::xref:#B-detair[detair]::xref:#B-detair-Y[Y]::xref:#B-detair-Y-Z[Z]::f7 +== <<#B,B>>::<<#B-detair,detair>>::<<#B-detair-Y,Y>>::<<#B-detair-Y-Z,Z>>::f7 @@ -487,8 +449,6 @@ f7(); - - [#C] == C @@ -497,15 +457,13 @@ f7(); |=== | Name | Description -| xref:#C-g0[`g0`] +| <<#C-g0,`g0`>> | |=== - - [#C-g0] -== xref:#C[C]::g0 +== <<#C,C>>::g0 @@ -526,8 +484,6 @@ g0(); - - [#D] == D @@ -536,7 +492,7 @@ g0(); |=== | Name | Description -| xref:#D-E[`E`] +| <<#D-E,`E`>> | |=== @@ -545,33 +501,29 @@ g0(); |=== | Name | Description -| xref:#D-f1[`f1`] +| <<#D-f1,`f1`>> | -| xref:#D-g1[`g1`] +| <<#D-g1,`g1`>> | |=== - - [#D-E] -== xref:#D[D]::E +== <<#D,D>>::E === Functions [cols=2] |=== | Name | Description -| xref:#D-E-g0[`g0`] +| <<#D-E-g0,`g0`>> | |=== - - [#D-E-g0] -== xref:#D[D]::xref:#D-E[E]::g0 +== <<#D,D>>::<<#D-E,E>>::g0 @@ -592,10 +544,8 @@ g0(); - - [#D-f1] -== xref:#D[D]::f1 +== <<#D,D>>::f1 @@ -616,10 +566,8 @@ f1(); - - [#D-g1] -== xref:#D[D]::g1 +== <<#D,D>>::g1 @@ -640,8 +588,6 @@ g1(); - - [#F] == F @@ -650,7 +596,7 @@ g1(); |=== | Name | Description -| xref:#F-G[`G`] +| <<#F-G,`G`>> | |=== @@ -659,15 +605,13 @@ g1(); |=== | Name | Description -| xref:#F-g0[`g0`] +| <<#F-g0,`g0`>> | |=== - - [#F-g0] -== xref:#F[F]::g0 +== <<#F,F>>::g0 @@ -688,28 +632,24 @@ g0(); - - [#F-G] -== xref:#F[F]::G +== <<#F,F>>::G === Functions [cols=2] |=== | Name | Description -| xref:#F-G-f1[`f1`] +| <<#F-G-f1,`f1`>> | -| xref:#F-G-g1[`g1`] +| <<#F-G-g1,`g1`>> | |=== - - [#F-G-f1] -== xref:#F[F]::xref:#F-G[G]::f1 +== <<#F,F>>::<<#F-G,G>>::f1 @@ -730,10 +670,8 @@ f1(); - - [#F-G-g1] -== xref:#F[F]::xref:#F-G[G]::g1 +== <<#F,F>>::<<#F-G,G>>::g1 diff --git a/test-files/golden-tests/filters/whitelist_0.adoc b/test-files/golden-tests/filters/whitelist_0.adoc index e8a821c575..2b444c9b8c 100644 --- a/test-files/golden-tests/filters/whitelist_0.adoc +++ b/test-files/golden-tests/filters/whitelist_0.adoc @@ -1,7 +1,5 @@ = Reference :mrdocs: - - [#index] == Global namespace @@ -10,19 +8,17 @@ |=== | Name | Description -| xref:#N0[`N0`] +| <<#N0,`N0`>> | -| xref:#N1[`N1`] +| <<#N1,`N1`>> | -| xref:#N5[`N5`] +| <<#N5,`N5`>> | |=== - - [#N0] == N0 @@ -31,15 +27,13 @@ |=== | Name | Description -| xref:#N0-f0_WL[`pass:[f0_WL]`] +| <<#N0-f0_WL,`pass:[f0_WL]`>> | |=== - - [#N0-f0_WL] -== xref:#N0[N0]::pass:[f0_WL] +== <<#N0,N0>>::pass:[f0_WL] @@ -60,8 +54,6 @@ pass:[f0_WL](); - - [#N1] == N1 @@ -70,33 +62,29 @@ pass:[f0_WL](); |=== | Name | Description -| xref:#N1-N3_WL[`pass:[N3_WL]`] +| <<#N1-N3_WL,`pass:[N3_WL]`>> | -| xref:#N1-N4[`N4`] +| <<#N1-N4,`N4`>> | |=== - - [#N1-N3_WL] -== xref:#N1[N1]::pass:[N3_WL] +== <<#N1,N1>>::pass:[N3_WL] === Functions [cols=2] |=== | Name | Description -| xref:#N1-N3_WL-f1_WL[`pass:[f1_WL]`] +| <<#N1-N3_WL-f1_WL,`pass:[f1_WL]`>> | |=== - - [#N1-N3_WL-f1_WL] -== xref:#N1[N1]::xref:#N1-N3_WL[pass:[N3_WL]]::pass:[f1_WL] +== <<#N1,N1>>::<<#N1-N3_WL,pass:[N3_WL]>>::pass:[f1_WL] @@ -117,25 +105,21 @@ pass:[f1_WL](); - - [#N1-N4] -== xref:#N1[N1]::N4 +== <<#N1,N1>>::N4 === Functions [cols=2] |=== | Name | Description -| xref:#N1-N4-f1_WL[`pass:[f1_WL]`] +| <<#N1-N4-f1_WL,`pass:[f1_WL]`>> | |=== - - [#N1-N4-f1_WL] -== xref:#N1[N1]::xref:#N1-N4[N4]::pass:[f1_WL] +== <<#N1,N1>>::<<#N1-N4,N4>>::pass:[f1_WL] @@ -156,8 +140,6 @@ pass:[f1_WL](); - - [#N5] == N5 @@ -166,7 +148,7 @@ pass:[f1_WL](); |=== | Name | Description -| xref:#N5-N6_BL[`pass:[N6_BL]`] +| <<#N5-N6_BL,`pass:[N6_BL]`>> | |=== @@ -175,15 +157,13 @@ pass:[f1_WL](); |=== | Name | Description -| xref:#N5-f0[`f0`] +| <<#N5-f0,`f0`>> | |=== - - [#N5-f0] -== xref:#N5[N5]::f0 +== <<#N5,N5>>::f0 @@ -204,43 +184,37 @@ f0(); - - [#N5-N6_BL] -== xref:#N5[N5]::pass:[N6_BL] +== <<#N5,N5>>::pass:[N6_BL] === Namespaces [cols=2] |=== | Name | Description -| xref:#N5-N6_BL-M7[`M7`] +| <<#N5-N6_BL-M7,`M7`>> | -| xref:#N5-N6_BL-N7[`N7`] +| <<#N5-N6_BL-N7,`N7`>> | |=== - - [#N5-N6_BL-N7] -== xref:#N5[N5]::xref:#N5-N6_BL[pass:[N6_BL]]::N7 +== <<#N5,N5>>::<<#N5-N6_BL,pass:[N6_BL]>>::N7 === Functions [cols=2] |=== | Name | Description -| xref:#N5-N6_BL-N7-f2_WL[`pass:[f2_WL]`] +| <<#N5-N6_BL-N7-f2_WL,`pass:[f2_WL]`>> | |=== - - [#N5-N6_BL-N7-f2_WL] -== xref:#N5[N5]::xref:#N5-N6_BL[pass:[N6_BL]]::xref:#N5-N6_BL-N7[N7]::pass:[f2_WL] +== <<#N5,N5>>::<<#N5-N6_BL,pass:[N6_BL]>>::<<#N5-N6_BL-N7,N7>>::pass:[f2_WL] @@ -261,25 +235,21 @@ pass:[f2_WL](); - - [#N5-N6_BL-M7] -== xref:#N5[N5]::xref:#N5-N6_BL[pass:[N6_BL]]::M7 +== <<#N5,N5>>::<<#N5-N6_BL,pass:[N6_BL]>>::M7 === Functions [cols=2] |=== | Name | Description -| xref:#N5-N6_BL-M7-f2_WL[`pass:[f2_WL]`] +| <<#N5-N6_BL-M7-f2_WL,`pass:[f2_WL]`>> | |=== - - [#N5-N6_BL-M7-f2_WL] -== xref:#N5[N5]::xref:#N5-N6_BL[pass:[N6_BL]]::xref:#N5-N6_BL-M7[M7]::pass:[f2_WL] +== <<#N5,N5>>::<<#N5-N6_BL,pass:[N6_BL]>>::<<#N5-N6_BL-M7,M7>>::pass:[f2_WL] diff --git a/test-files/golden-tests/filters/whitelist_test.adoc b/test-files/golden-tests/filters/whitelist_test.adoc index 53794d5254..314e05f2f3 100644 --- a/test-files/golden-tests/filters/whitelist_test.adoc +++ b/test-files/golden-tests/filters/whitelist_test.adoc @@ -1,7 +1,5 @@ = Reference :mrdocs: - - [#index] == Global namespace @@ -10,16 +8,14 @@ |=== | Name | Description -| xref:#blacklisted[`blacklisted`] +| <<#blacklisted,`blacklisted`>> | -| xref:#to_be_documented[`pass:[to_be_documented]`] +| <<#to_be_documented,`pass:[to_be_documented]`>> | |=== - - [#to_be_documented] == pass:[to_be_documented] @@ -28,15 +24,13 @@ |=== | Name | Description -| xref:#to_be_documented-documented_function[`pass:[documented_function]`] +| <<#to_be_documented-documented_function,`pass:[documented_function]`>> | |=== - - [#to_be_documented-documented_function] -== xref:#to_be_documented[pass:[to_be_documented]]::pass:[documented_function] +== <<#to_be_documented,pass:[to_be_documented]>>::pass:[documented_function] @@ -57,8 +51,6 @@ pass:[documented_function](); - - [#blacklisted] == blacklisted @@ -67,15 +59,13 @@ pass:[documented_function](); |=== | Name | Description -| xref:#blacklisted-whitelisted_function[`pass:[whitelisted_function]`] +| <<#blacklisted-whitelisted_function,`pass:[whitelisted_function]`>> | |=== - - [#blacklisted-whitelisted_function] -== xref:#blacklisted[blacklisted]::pass:[whitelisted_function] +== <<#blacklisted,blacklisted>>::pass:[whitelisted_function] diff --git a/test-files/golden-tests/friend-1.adoc b/test-files/golden-tests/friend-1.adoc index 954e6872dc..9bcdbb5490 100644 --- a/test-files/golden-tests/friend-1.adoc +++ b/test-files/golden-tests/friend-1.adoc @@ -1,7 +1,5 @@ = Reference :mrdocs: - - [#index] == Global namespace @@ -10,7 +8,7 @@ |=== | Name | Description -| xref:#T[`T`] +| <<#T,`T`>> | |=== @@ -19,15 +17,13 @@ |=== | Name | Description -| xref:#f[`f`] +| <<#f,`f`>> | f |=== - - [#T] == T @@ -47,7 +43,7 @@ struct T; |=== | Name | Description -| xref:#T-08friend[`f`] +| <<#T-08friend,`f`>> | f @@ -56,8 +52,6 @@ f - - [#T-08friend] == f @@ -77,8 +71,6 @@ f(); ---- - - [#f] == f diff --git a/test-files/golden-tests/friend-2.adoc b/test-files/golden-tests/friend-2.adoc index f41b96a152..d59af1f555 100644 --- a/test-files/golden-tests/friend-2.adoc +++ b/test-files/golden-tests/friend-2.adoc @@ -1,7 +1,5 @@ = Reference :mrdocs: - - [#index] == Global namespace @@ -10,7 +8,7 @@ |=== | Name | Description -| xref:#T[`T`] +| <<#T,`T`>> | |=== @@ -19,15 +17,13 @@ |=== | Name | Description -| xref:#f[`f`] +| <<#f,`f`>> | f |=== - - [#T] == T @@ -47,7 +43,7 @@ struct T; |=== | Name | Description -| xref:#T-08friend[`f`] +| <<#T-08friend,`f`>> | f @@ -56,8 +52,6 @@ f - - [#T-08friend] == f @@ -77,8 +71,6 @@ f(); ---- - - [#f] == f diff --git a/test-files/golden-tests/friend-3.adoc b/test-files/golden-tests/friend-3.adoc index c854fb0b8f..3250fab557 100644 --- a/test-files/golden-tests/friend-3.adoc +++ b/test-files/golden-tests/friend-3.adoc @@ -1,7 +1,5 @@ = Reference :mrdocs: - - [#index] == Global namespace @@ -10,10 +8,10 @@ |=== | Name | Description -| xref:#T[`T`] +| <<#T,`T`>> | -| xref:#U[`U`] +| <<#U,`U`>> | |=== @@ -22,15 +20,13 @@ |=== | Name | Description -| xref:#f[`f`] +| <<#f,`f`>> | T::f |=== - - [#T] == T @@ -50,7 +46,7 @@ struct T; |=== | Name | Description -| xref:#T-08friend[`f`] +| <<#T-08friend,`f`>> | T::f @@ -59,8 +55,6 @@ T::f - - [#T-08friend] == f @@ -80,8 +74,6 @@ f(); ---- - - [#f] == f @@ -106,8 +98,6 @@ f(); - - [#U] == U @@ -127,15 +117,13 @@ struct U; |=== | Name | Description -| xref:#U-08friend[`f`] +| <<#U-08friend,`f`>> | |=== - - [#U-08friend] == f diff --git a/test-files/golden-tests/friend-4.adoc b/test-files/golden-tests/friend-4.adoc index 9f323e2ecf..405df650bf 100644 --- a/test-files/golden-tests/friend-4.adoc +++ b/test-files/golden-tests/friend-4.adoc @@ -1,7 +1,5 @@ = Reference :mrdocs: - - [#index] == Global namespace @@ -10,10 +8,10 @@ |=== | Name | Description -| xref:#T[`T`] +| <<#T,`T`>> | -| xref:#U[`U`] +| <<#U,`U`>> | |=== @@ -22,15 +20,13 @@ |=== | Name | Description -| xref:#f[`f`] +| <<#f,`f`>> | U::f |=== - - [#T] == T @@ -50,15 +46,13 @@ struct T; |=== | Name | Description -| xref:#T-08friend[`f`] +| <<#T-08friend,`f`>> | |=== - - [#T-08friend] == f @@ -76,8 +70,6 @@ f(); ---- - - [#f] == f @@ -102,8 +94,6 @@ f(); - - [#U] == U @@ -123,7 +113,7 @@ struct U; |=== | Name | Description -| xref:#U-08friend[`f`] +| <<#U-08friend,`f`>> | U::f @@ -132,8 +122,6 @@ U::f - - [#U-08friend] == f diff --git a/test-files/golden-tests/friend-5.adoc b/test-files/golden-tests/friend-5.adoc index f38ab96dac..65d848b85c 100644 --- a/test-files/golden-tests/friend-5.adoc +++ b/test-files/golden-tests/friend-5.adoc @@ -1,7 +1,5 @@ = Reference :mrdocs: - - [#index] == Global namespace @@ -10,10 +8,10 @@ |=== | Name | Description -| xref:#T[`T`] +| <<#T,`T`>> | -| xref:#U[`U`] +| <<#U,`U`>> | |=== @@ -22,15 +20,13 @@ |=== | Name | Description -| xref:#f[`f`] +| <<#f,`f`>> | f |=== - - [#T] == T @@ -50,15 +46,13 @@ struct T; |=== | Name | Description -| xref:#T-08friend[`f`] +| <<#T-08friend,`f`>> | |=== - - [#T-08friend] == f @@ -76,8 +70,6 @@ f(); ---- - - [#f] == f @@ -102,8 +94,6 @@ f(); - - [#U] == U @@ -123,15 +113,13 @@ struct U; |=== | Name | Description -| xref:#U-08friend[`f`] +| <<#U-08friend,`f`>> | |=== - - [#U-08friend] == f diff --git a/test-files/golden-tests/friend-6.adoc b/test-files/golden-tests/friend-6.adoc index dc25f5e024..0b823e6eb1 100644 --- a/test-files/golden-tests/friend-6.adoc +++ b/test-files/golden-tests/friend-6.adoc @@ -1,7 +1,5 @@ = Reference :mrdocs: - - [#index] == Global namespace @@ -10,25 +8,23 @@ |=== | Name | Description -| xref:#T[`T`] +| <<#T,`T`>> | Struct T brief -| xref:#U[`U`] +| <<#U,`U`>> | Struct U brief -| xref:#V[`V`] +| <<#V,`V`>> | Struct V brief |=== - - [#T] == T @@ -50,12 +46,12 @@ struct T; |=== | Name | Description -| xref:#T-08friend-04ce[`[object Object]`] +| <<#T-08friend-04ce,`[object Object]`>> | Friend int brief -| xref:#T-08friend-04cb[`[object Object]`] +| <<#T-08friend-04cb,`[object Object]`>> | Friend class Z brief @@ -64,8 +60,6 @@ Friend class Z brief - - [#T-08friend-04ce] == [object Object] @@ -83,8 +77,6 @@ friend int; ---- - - [#T-08friend-04cb] == [object Object] @@ -102,8 +94,6 @@ friend Z; ---- - - [#U] == U @@ -125,7 +115,7 @@ struct U; |=== | Name | Description -| xref:#U-08friend[`[object Object]`] +| <<#U-08friend,`[object Object]`>> | Friend T brief @@ -134,8 +124,6 @@ Friend T brief - - [#U-08friend] == [object Object] @@ -149,12 +137,10 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- -friend xref:#T[T]; +friend <<#T,T>>; ---- - - [#V] == V @@ -176,7 +162,7 @@ struct V; |=== | Name | Description -| xref:#V-08friend[`[object Object]`] +| <<#V-08friend,`[object Object]`>> | Friend struct U brief @@ -185,8 +171,6 @@ Friend struct U brief - - [#V-08friend] == [object Object] @@ -200,7 +184,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- -friend xref:#U[U]; +friend <<#U,U>>; ---- diff --git a/test-files/golden-tests/function-parm-decay.adoc b/test-files/golden-tests/function-parm-decay.adoc index e3aff0c515..20c26c5084 100644 --- a/test-files/golden-tests/function-parm-decay.adoc +++ b/test-files/golden-tests/function-parm-decay.adoc @@ -1,7 +1,5 @@ = Reference :mrdocs: - - [#index] == Global namespace @@ -10,10 +8,10 @@ |=== | Name | Description -| xref:#T[`T`] +| <<#T,`T`>> | -| xref:#U[`U`] +| <<#U,`U`>> | |=== @@ -22,22 +20,20 @@ |=== | Name | Description -| xref:#f[`f`] +| <<#f,`f`>> | -| xref:#g[`g`] +| <<#g,`g`>> | -| xref:#h[`h`] +| <<#h,`h`>> | -| xref:#i[`i`] +| <<#i,`i`>> | |=== - - [#f] == f @@ -60,8 +56,6 @@ f(int const x); - - [#g] == g @@ -84,8 +78,6 @@ g(int* x); - - [#h] == h @@ -108,8 +100,6 @@ h(int x(bool)); - - [#T] == T @@ -125,8 +115,6 @@ using T = int; ---- - - [#U] == U @@ -142,8 +130,6 @@ using U = int const; ---- - - [#i] == i @@ -156,7 +142,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- void -i(xref:#T[T]); +i(<<#T,T>>); ---- diff --git a/test-files/golden-tests/function-template.adoc b/test-files/golden-tests/function-template.adoc index de5f921c95..f4f30453e0 100644 --- a/test-files/golden-tests/function-template.adoc +++ b/test-files/golden-tests/function-template.adoc @@ -1,7 +1,5 @@ = Reference :mrdocs: - - [#index] == Global namespace @@ -10,46 +8,44 @@ |=== | Name | Description -| xref:#f0[`f0`] +| <<#f0,`f0`>> | -| xref:#f1[`f1`] +| <<#f1,`f1`>> | -| xref:#f2[`f2`] +| <<#f2,`f2`>> | -| xref:#f3[`f3`] +| <<#f3,`f3`>> | -| xref:#g0[`g0`] +| <<#g0,`g0`>> | -| xref:#g1[`g1`] +| <<#g1,`g1`>> | -| xref:#g2[`g2`] +| <<#g2,`g2`>> | -| xref:#h0[`h0`] +| <<#h0,`h0`>> | -| xref:#h1[`h1`] +| <<#h1,`h1`>> | -| xref:#i[`i`] +| <<#i,`i`>> | -| xref:#j0[`j0`] +| <<#j0,`j0`>> | -| xref:#j1[`j1`] +| <<#j1,`j1`>> | |=== - - [#f0] == f0 @@ -73,8 +69,6 @@ f0(int x); - - [#f1] == f1 @@ -98,8 +92,6 @@ f1(T t); - - [#f2] == f2 @@ -123,8 +115,6 @@ f2(); - - [#f3] == f3 @@ -150,8 +140,6 @@ f3(); - - [#g0] == g0 @@ -175,8 +163,6 @@ g0(int x); - - [#g1] == g1 @@ -200,8 +186,6 @@ g1(); - - [#g2] == g2 @@ -227,8 +211,6 @@ g2(); - - [#h0] == h0 @@ -252,8 +234,6 @@ h0(auto x); - - [#h1] == h1 @@ -281,8 +261,6 @@ h1( - - [#i] == i @@ -308,8 +286,6 @@ i(); - - [#j0] == j0 @@ -333,8 +309,6 @@ j0(); - - [#j1] == j1 diff --git a/test-files/golden-tests/function-tparm-decay.adoc b/test-files/golden-tests/function-tparm-decay.adoc index 9fbbccdd3b..2d2afbf565 100644 --- a/test-files/golden-tests/function-tparm-decay.adoc +++ b/test-files/golden-tests/function-tparm-decay.adoc @@ -1,7 +1,5 @@ = Reference :mrdocs: - - [#index] == Global namespace @@ -10,10 +8,10 @@ |=== | Name | Description -| xref:#T[`T`] +| <<#T,`T`>> | -| xref:#U[`U`] +| <<#U,`U`>> | |=== @@ -22,22 +20,20 @@ |=== | Name | Description -| xref:#f[`f`] +| <<#f,`f`>> | -| xref:#g[`g`] +| <<#g,`g`>> | -| xref:#h[`h`] +| <<#h,`h`>> | -| xref:#i[`i`] +| <<#i,`i`>> | |=== - - [#f] == f @@ -61,8 +57,6 @@ f(); - - [#g] == g @@ -86,8 +80,6 @@ g(); - - [#h] == h @@ -111,8 +103,6 @@ h(); - - [#T] == T @@ -128,8 +118,6 @@ using T = int; ---- - - [#U] == U @@ -145,8 +133,6 @@ using U = int const; ---- - - [#i] == i diff --git a/test-files/golden-tests/implicit-instantiation-member-ref.adoc b/test-files/golden-tests/implicit-instantiation-member-ref.adoc index 80c0516a41..ec279dea98 100644 --- a/test-files/golden-tests/implicit-instantiation-member-ref.adoc +++ b/test-files/golden-tests/implicit-instantiation-member-ref.adoc @@ -1,7 +1,5 @@ = Reference :mrdocs: - - [#index] == Global namespace @@ -10,46 +8,44 @@ |=== | Name | Description -| xref:#A0[`A0`] +| <<#A0,`A0`>> | -| xref:#A1[`A1`] +| <<#A1,`A1`>> | -| xref:#A10[`A10`] +| <<#A10,`A10`>> | -| xref:#A2[`A2`] +| <<#A2,`A2`>> | -| xref:#A3[`A3`] +| <<#A3,`A3`>> | -| xref:#A4[`A4`] +| <<#A4,`A4`>> | -| xref:#A5[`A5`] +| <<#A5,`A5`>> | -| xref:#A6[`A6`] +| <<#A6,`A6`>> | -| xref:#A7[`A7`] +| <<#A7,`A7`>> | -| xref:#A8[`A8`] +| <<#A8,`A8`>> | -| xref:#A9[`A9`] +| <<#A9,`A9`>> | -| xref:#S0[`S0`] +| <<#S0,`S0`>> | |=== - - [#S0] == S0 @@ -70,26 +66,24 @@ struct S0; |=== | Name | Description -| xref:#S0-M0[`M0`] +| <<#S0-M0,`M0`>> | -| xref:#S0-M1[`M1`] +| <<#S0-M1,`M1`>> | -| xref:#S0-S1[`S1`] +| <<#S0-S1,`S1`>> | -| xref:#S0-S2[`S2`] +| <<#S0-S2,`S2`>> | |=== - - [#S0-M0] -== xref:#S0[S0]::M0 +== <<#S0,S0>>::M0 @@ -103,10 +97,8 @@ using M0 = T; ---- - - [#S0-S1] -== xref:#S0[S0]::S1 +== <<#S0,S0>>::S1 @@ -122,10 +114,8 @@ struct S1; - - [#S0-M1] -== xref:#S0[S0]::M1 +== <<#S0,S0>>::M1 @@ -136,14 +126,12 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- template -using M1 = xref:#S0[S0]; +using M1 = <<#S0,S0>>; ---- - - [#S0-S2] -== xref:#S0[S0]::S2 +== <<#S0,S0>>::S2 @@ -162,26 +150,24 @@ struct S2; |=== | Name | Description -| xref:#S0-S2-M2[`M2`] +| <<#S0-S2-M2,`M2`>> | -| xref:#S0-S2-M3[`M3`] +| <<#S0-S2-M3,`M3`>> | -| xref:#S0-S2-S3[`S3`] +| <<#S0-S2-S3,`S3`>> | -| xref:#S0-S2-S4[`S4`] +| <<#S0-S2-S4,`S4`>> | |=== - - [#S0-S2-M2] -== xref:#S0[S0]::xref:#S0-S2[S2]::M2 +== <<#S0,S0>>::<<#S0-S2,S2>>::M2 @@ -195,10 +181,8 @@ using M2 = U; ---- - - [#S0-S2-S3] -== xref:#S0[S0]::xref:#S0-S2[S2]::S3 +== <<#S0,S0>>::<<#S0-S2,S2>>::S3 @@ -214,10 +198,8 @@ struct S3; - - [#S0-S2-M3] -== xref:#S0[S0]::xref:#S0-S2[S2]::M3 +== <<#S0,S0>>::<<#S0-S2,S2>>::M3 @@ -228,14 +210,12 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- template -using M3 = xref:#S0-S2[S2]; +using M3 = <<#S0-S2,S2>>; ---- - - [#S0-S2-S4] -== xref:#S0[S0]::xref:#S0-S2[S2]::S4 +== <<#S0,S0>>::<<#S0-S2,S2>>::S4 @@ -254,17 +234,15 @@ struct S4; |=== | Name | Description -| xref:#S0-S2-S4-M4[`M4`] +| <<#S0-S2-S4-M4,`M4`>> | |=== - - [#S0-S2-S4-M4] -== xref:#S0[S0]::xref:#S0-S2[S2]::xref:#S0-S2-S4[S4]::M4 +== <<#S0,S0>>::<<#S0-S2,S2>>::<<#S0-S2-S4,S4>>::M4 @@ -278,8 +256,6 @@ using M4 = V; ---- - - [#A0] == A0 @@ -291,12 +267,10 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- -using A0 = xref:#S0[S0]; +using A0 = <<#S0,S0>>; ---- - - [#A1] == A1 @@ -308,12 +282,10 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- -using A1 = xref:#A0[A0]::xref:#S0-M0[M0]; +using A1 = <<#A0,A0>>::<<#S0-M0,M0>>; ---- - - [#A2] == A2 @@ -325,12 +297,10 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- -using A2 = xref:#A0[A0]::xref:#S0-S1[S1]; +using A2 = <<#A0,A0>>::<<#S0-S1,S1>>; ---- - - [#A3] == A3 @@ -342,12 +312,10 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- -using A3 = xref:#S0[S0]::xref:#S0-M0[M0]; +using A3 = <<#S0,S0>>::<<#S0-M0,M0>>; ---- - - [#A4] == A4 @@ -359,12 +327,10 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- -using A4 = xref:#S0[S0]::xref:#S0-S1[S1]; +using A4 = <<#S0,S0>>::<<#S0-S1,S1>>; ---- - - [#A5] == A5 @@ -376,12 +342,10 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- -using A5 = xref:#S0[S0]; +using A5 = <<#S0,S0>>; ---- - - [#A6] == A6 @@ -393,12 +357,10 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- -using A6 = xref:#A5[A5]::xref:#S0-M1[M1]::xref:#S0-M0[M0]; +using A6 = <<#A5,A5>>::<<#S0-M1,M1>>::<<#S0-M0,M0>>; ---- - - [#A7] == A7 @@ -410,12 +372,10 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- -using A7 = xref:#A5[A5]::xref:#S0-S2[S2]::xref:#S0-S2-M2[M2]; +using A7 = <<#A5,A5>>::<<#S0-S2,S2>>::<<#S0-S2-M2,M2>>; ---- - - [#A8] == A8 @@ -427,12 +387,10 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- -using A8 = xref:#A5[A5]::xref:#S0-S2[S2]::xref:#S0-S2-S3[S3]; +using A8 = <<#A5,A5>>::<<#S0-S2,S2>>::<<#S0-S2-S3,S3>>; ---- - - [#A9] == A9 @@ -444,12 +402,10 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- -using A9 = xref:#A5[A5]::xref:#S0-S2[S2]::xref:#S0-S2-M3[M3]::xref:#S0-S2-M3[M3]::xref:#S0-S2-M2[M2]; +using A9 = <<#A5,A5>>::<<#S0-S2,S2>>::<<#S0-S2-M3,M3>>::<<#S0-S2-M3,M3>>::<<#S0-S2-M2,M2>>; ---- - - [#A10] == A10 @@ -461,7 +417,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- -using A10 = xref:#A5[A5]::xref:#S0-S2[S2]::xref:#S0-S2-M3[M3]::xref:#S0-S2-M3[M3]::xref:#S0-S2-S4[S4]::xref:#S0-S2-S4-M4[M4]; +using A10 = <<#A5,A5>>::<<#S0-S2,S2>>::<<#S0-S2-M3,M3>>::<<#S0-S2-M3,M3>>::<<#S0-S2-S4,S4>>::<<#S0-S2-S4-M4,M4>>; ---- diff --git a/test-files/golden-tests/local-class.adoc b/test-files/golden-tests/local-class.adoc index 9f844b31cd..15fabda6bb 100644 --- a/test-files/golden-tests/local-class.adoc +++ b/test-files/golden-tests/local-class.adoc @@ -1,7 +1,5 @@ = Reference :mrdocs: - - [#index] == Global namespace @@ -10,7 +8,7 @@ |=== | Name | Description -| xref:#B[`B`] +| <<#B,`B`>> | |=== @@ -19,13 +17,11 @@ |=== | Name | Description -| xref:#f[`f`] +| <<#f,`f`>> | |=== - - [#f] == f @@ -48,8 +44,6 @@ f(); - - [#B] == B diff --git a/test-files/golden-tests/mem-fn.adoc b/test-files/golden-tests/mem-fn.adoc index bb15bac851..a446a3b179 100644 --- a/test-files/golden-tests/mem-fn.adoc +++ b/test-files/golden-tests/mem-fn.adoc @@ -1,7 +1,5 @@ = Reference :mrdocs: - - [#index] == Global namespace @@ -10,64 +8,62 @@ |=== | Name | Description -| xref:#T01[`T01`] +| <<#T01,`T01`>> | -| xref:#T02[`T02`] +| <<#T02,`T02`>> | -| xref:#T03[`T03`] +| <<#T03,`T03`>> | -| xref:#T04[`T04`] +| <<#T04,`T04`>> | -| xref:#T05[`T05`] +| <<#T05,`T05`>> | -| xref:#T06[`T06`] +| <<#T06,`T06`>> | -| xref:#T08[`T08`] +| <<#T08,`T08`>> | -| xref:#T09[`T09`] +| <<#T09,`T09`>> | -| xref:#T10[`T10`] +| <<#T10,`T10`>> | -| xref:#T11[`T11`] +| <<#T11,`T11`>> | -| xref:#T12[`T12`] +| <<#T12,`T12`>> | -| xref:#T13[`T13`] +| <<#T13,`T13`>> | -| xref:#T14[`T14`] +| <<#T14,`T14`>> | -| xref:#T15[`T15`] +| <<#T15,`T15`>> | -| xref:#T16[`T16`] +| <<#T16,`T16`>> | -| xref:#T17[`T17`] +| <<#T17,`T17`>> | -| xref:#U[`U`] +| <<#U,`U`>> | -| xref:#V[`V`] +| <<#V,`V`>> | |=== - - [#T01] == T01 @@ -87,17 +83,15 @@ struct T01; |=== | Name | Description -| xref:#T01-f[`f`] +| <<#T01-f,`f`>> | |=== - - [#T01-f] -== xref:#T01[T01]::f +== <<#T01,T01>>::f @@ -118,8 +112,6 @@ f(); - - [#T02] == T02 @@ -139,17 +131,15 @@ struct T02; |=== | Name | Description -| xref:#T02-f[`f`] +| <<#T02-f,`f`>> | |=== - - [#T02-f] -== xref:#T02[T02]::f +== <<#T02,T02>>::f @@ -171,8 +161,6 @@ f(); - - [#T03] == T03 @@ -192,17 +180,15 @@ struct T03; |=== | Name | Description -| xref:#T03-f[`f`] +| <<#T03-f,`f`>> | |=== - - [#T03-f] -== xref:#T03[T03]::f +== <<#T03,T03>>::f @@ -223,8 +209,6 @@ f() &; - - [#T04] == T04 @@ -244,17 +228,15 @@ struct T04; |=== | Name | Description -| xref:#T04-f[`f`] +| <<#T04-f,`f`>> | |=== - - [#T04-f] -== xref:#T04[T04]::f +== <<#T04,T04>>::f @@ -275,8 +257,6 @@ f() &&; - - [#T05] == T05 @@ -296,17 +276,15 @@ struct T05; |=== | Name | Description -| xref:#T05-f[`f`] +| <<#T05-f,`f`>> | |=== - - [#T05-f] -== xref:#T05[T05]::f +== <<#T05,T05>>::f @@ -327,8 +305,6 @@ f() const; - - [#T06] == T06 @@ -348,17 +324,15 @@ struct T06; |=== | Name | Description -| xref:#T06-f[`f`] +| <<#T06-f,`f`>> | |=== - - [#T06-f] -== xref:#T06[T06]::f +== <<#T06,T06>>::f @@ -380,8 +354,6 @@ f(); - - [#T08] == T08 @@ -401,17 +373,15 @@ struct T08; |=== | Name | Description -| xref:#T08-f[`f`] +| <<#T08-f,`f`>> | |=== - - [#T08-f] -== xref:#T08[T08]::f +== <<#T08,T08>>::f @@ -432,8 +402,6 @@ f(); - - [#T09] == T09 @@ -453,17 +421,15 @@ struct T09; |=== | Name | Description -| xref:#T09-f[`f`] +| <<#T09-f,`f`>> | |=== - - [#T09-f] -== xref:#T09[T09]::f +== <<#T09,T09>>::f @@ -484,8 +450,6 @@ f() noexcept; - - [#T10] == T10 @@ -505,17 +469,15 @@ struct T10; |=== | Name | Description -| xref:#T10-f[`f`] +| <<#T10-f,`f`>> | |=== - - [#T10-f] -== xref:#T10[T10]::f +== <<#T10,T10>>::f @@ -536,8 +498,6 @@ f(); - - [#T11] == T11 @@ -557,17 +517,15 @@ struct T11; |=== | Name | Description -| xref:#T11-f[`f`] +| <<#T11-f,`f`>> | |=== - - [#T11-f] -== xref:#T11[T11]::f +== <<#T11,T11>>::f @@ -588,8 +546,6 @@ f(); - - [#T12] == T12 @@ -609,17 +565,15 @@ struct T12; |=== | Name | Description -| xref:#T12-f[`f`] +| <<#T12-f,`f`>> | |=== - - [#T12-f] -== xref:#T12[T12]::f +== <<#T12,T12>>::f @@ -640,8 +594,6 @@ f(...); - - [#T13] == T13 @@ -661,17 +613,15 @@ struct T13; |=== | Name | Description -| xref:#T13-f[`f`] +| <<#T13-f,`f`>> | |=== - - [#T13-f] -== xref:#T13[T13]::f +== <<#T13,T13>>::f @@ -693,8 +643,6 @@ f(); - - [#T14] == T14 @@ -714,17 +662,15 @@ struct T14; |=== | Name | Description -| xref:#T14-f[`f`] +| <<#T14-f,`f`>> | |=== - - [#T14-f] -== xref:#T14[T14]::f +== <<#T14,T14>>::f @@ -746,8 +692,6 @@ f() = 0; - - [#T15] == T15 @@ -767,17 +711,15 @@ struct T15; |=== | Name | Description -| xref:#T15-f[`f`] +| <<#T15-f,`f`>> | |=== - - [#T15-f] -== xref:#T15[T15]::f +== <<#T15,T15>>::f @@ -798,8 +740,6 @@ f() volatile; - - [#T16] == T16 @@ -819,17 +759,15 @@ struct T16; |=== | Name | Description -| xref:#T16-f[`f`] +| <<#T16-f,`f`>> | |=== - - [#T16-f] -== xref:#T16[T16]::f +== <<#T16,T16>>::f @@ -851,8 +789,6 @@ f(); - - [#T17] == T17 @@ -865,7 +801,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- struct T17 - : xref:#T14[T14]; + : <<#T14,T14>>; ---- === Member Functions @@ -873,16 +809,14 @@ struct T17 |=== | Name | Description -| xref:T14-f[`f`] +| <<#T14-f,`f`>> | |=== - - [#T17-f] -== xref:#T17[T17]::f +== <<#T17,T17>>::f @@ -904,8 +838,6 @@ f() override; - - [#U] == U @@ -925,10 +857,10 @@ struct U; |=== | Name | Description -| xref:#U-f1[`f1`] +| <<#U-f1,`f1`>> | -| xref:#U-f3[`f3`] +| <<#U-f3,`f3`>> | |=== @@ -937,17 +869,15 @@ struct U; |=== | Name | Description -| xref:#U-f2[`f2`] +| <<#U-f2,`f2`>> | |=== - - [#U-f1] -== xref:#U[U]::f1 +== <<#U,U>>::f1 @@ -969,10 +899,8 @@ f1(...) const volatile noexcept; - - [#U-f2] -== xref:#U[U]::f2 +== <<#U,U>>::f2 @@ -995,10 +923,8 @@ f2() noexcept; - - [#U-f3] -== xref:#U[U]::f3 +== <<#U,U>>::f3 @@ -1020,8 +946,6 @@ f3() const volatile noexcept = 0; - - [#V] == V @@ -1034,7 +958,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- struct V - : xref:#U[U]; + : <<#U,U>>; ---- === Member Functions @@ -1042,10 +966,10 @@ struct V |=== | Name | Description -| xref:#U-f1[`f1`] +| <<#U-f1,`f1`>> | -| xref:U-f3[`f3`] +| <<#U-f3,`f3`>> | |=== === Static Member Functions @@ -1053,17 +977,15 @@ struct V |=== | Name | Description -| xref:#U-f2[`f2`] +| <<#U-f2,`f2`>> | |=== - - [#V-f3] -== xref:#V[V]::f3 +== <<#V,V>>::f3 diff --git a/test-files/golden-tests/mem-fn.html b/test-files/golden-tests/mem-fn.html index 1f3569fec7..1ffbd0ddc4 100644 --- a/test-files/golden-tests/mem-fn.html +++ b/test-files/golden-tests/mem-fn.html @@ -1318,7 +1318,7 @@

Member Functions

- f + f @@ -1562,7 +1562,7 @@

Member Functions

- f3 + f3 diff --git a/test-files/golden-tests/namespace-alias-1.adoc b/test-files/golden-tests/namespace-alias-1.adoc index 8902116896..8e9c9b5adf 100644 --- a/test-files/golden-tests/namespace-alias-1.adoc +++ b/test-files/golden-tests/namespace-alias-1.adoc @@ -1,7 +1,5 @@ = Reference :mrdocs: - - [#index] == Global namespace @@ -10,19 +8,15 @@ |=== | Name | Description -| xref:#LongName[`LongName`] +| <<#LongName,`LongName`>> | |=== - - [#LongName] == LongName - - [#A] == A @@ -34,7 +28,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- -namespace A = xref:#LongName[LongName]; +namespace A = <<#LongName,LongName>>; ---- diff --git a/test-files/golden-tests/namespace-alias-2.adoc b/test-files/golden-tests/namespace-alias-2.adoc index d5b1f702cc..6ee6c305c6 100644 --- a/test-files/golden-tests/namespace-alias-2.adoc +++ b/test-files/golden-tests/namespace-alias-2.adoc @@ -1,7 +1,5 @@ = Reference :mrdocs: - - [#index] == Global namespace @@ -10,19 +8,15 @@ |=== | Name | Description -| xref:#LongName[`LongName`] +| <<#LongName,`LongName`>> | |=== - - [#LongName] == LongName - - [#A] == A @@ -34,12 +28,10 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- -namespace A = xref:#LongName[LongName]; +namespace A = <<#LongName,LongName>>; ---- - - [#B] == B @@ -51,7 +43,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- -namespace B = xref:#LongName[LongName]; +namespace B = <<#LongName,LongName>>; ---- diff --git a/test-files/golden-tests/namespace-alias-3.adoc b/test-files/golden-tests/namespace-alias-3.adoc index 805a61e0ab..47abad883d 100644 --- a/test-files/golden-tests/namespace-alias-3.adoc +++ b/test-files/golden-tests/namespace-alias-3.adoc @@ -1,7 +1,5 @@ = Reference :mrdocs: - - [#index] == Global namespace @@ -10,19 +8,15 @@ |=== | Name | Description -| xref:#LongName[`LongName`] +| <<#LongName,`LongName`>> | |=== - - [#LongName] == LongName - - [#A] == A @@ -34,12 +28,10 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- -namespace A = xref:#LongName[LongName]; +namespace A = <<#LongName,LongName>>; ---- - - [#B] == B @@ -51,7 +43,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- -namespace B = xref:#A[A]; +namespace B = <<#A,A>>; ---- diff --git a/test-files/golden-tests/namespace.adoc b/test-files/golden-tests/namespace.adoc index a273cdac3a..f3559245b9 100644 --- a/test-files/golden-tests/namespace.adoc +++ b/test-files/golden-tests/namespace.adoc @@ -1,7 +1,5 @@ = Reference :mrdocs: - - [#index] == Global namespace @@ -10,22 +8,20 @@ |=== | Name | Description -| xref:#00namespace[``] +| <<#00namespace,``>> | -| xref:#A[`A`] +| <<#A,`A`>> | -| xref:#D[`D`] +| <<#D,`D`>> | -| xref:#I[`I`] +| <<#I,`I`>> | |=== - - [#A] == A @@ -34,13 +30,13 @@ |=== | Name | Description -| xref:#A-00namespace[``] +| <<#A-00namespace,``>> | -| xref:#A-B[`B`] +| <<#A-B,`B`>> | -| xref:#A-C[`C`] +| <<#A-C,`C`>> | |=== @@ -49,15 +45,13 @@ |=== | Name | Description -| xref:#A-f0[`f0`] +| <<#A-f0,`f0`>> | |=== - - [#A-f0] -== xref:#A[A]::f0 +== <<#A,A>>::f0 @@ -78,25 +72,21 @@ f0(); - - [#A-B] -== xref:#A[A]::B +== <<#A,A>>::B === Functions [cols=2] |=== | Name | Description -| xref:#A-B-f1[`f1`] +| <<#A-B-f1,`f1`>> | |=== - - [#A-B-f1] -== xref:#A[A]::xref:#A-B[B]::f1 +== <<#A,A>>::<<#A-B,B>>::f1 @@ -117,25 +107,21 @@ f1(); - - [#A-C] -== xref:#A[A]::C +== <<#A,A>>::C === Functions [cols=2] |=== | Name | Description -| xref:#A-C-f2[`f2`] +| <<#A-C-f2,`f2`>> | |=== - - [#A-C-f2] -== xref:#A[A]::xref:#A-C[C]::f2 +== <<#A,A>>::<<#A-C,C>>::f2 @@ -156,8 +142,6 @@ f2(); - - [#A-00namespace] == Unnamed namespace @@ -166,15 +150,13 @@ f2(); |=== | Name | Description -| xref:#A-00namespace-f3[`f3`] +| <<#A-00namespace-f3,`f3`>> | |=== - - [#A-00namespace-f3] -== xref:#A[A]::f3 +== <<#A,A>>::f3 @@ -195,8 +177,6 @@ f3(); - - [#D] == D @@ -205,13 +185,13 @@ f3(); |=== | Name | Description -| xref:#D-00namespace[``] +| <<#D-00namespace,``>> | -| xref:#D-E[`E`] +| <<#D-E,`E`>> | -| xref:#D-F[`F`] +| <<#D-F,`F`>> | |=== @@ -220,15 +200,13 @@ f3(); |=== | Name | Description -| xref:#D-f5[`f5`] +| <<#D-f5,`f5`>> | |=== - - [#D-f5] -== xref:#D[D]::f5 +== <<#D,D>>::f5 @@ -249,25 +227,21 @@ f5(); - - [#D-E] -== xref:#D[D]::E +== <<#D,D>>::E === Functions [cols=2] |=== | Name | Description -| xref:#D-E-f6[`f6`] +| <<#D-E-f6,`f6`>> | |=== - - [#D-E-f6] -== xref:#D[D]::xref:#D-E[E]::f6 +== <<#D,D>>::<<#D-E,E>>::f6 @@ -288,25 +262,21 @@ f6(); - - [#D-F] -== xref:#D[D]::F +== <<#D,D>>::F === Functions [cols=2] |=== | Name | Description -| xref:#D-F-f7[`f7`] +| <<#D-F-f7,`f7`>> | |=== - - [#D-F-f7] -== xref:#D[D]::xref:#D-F[F]::f7 +== <<#D,D>>::<<#D-F,F>>::f7 @@ -327,8 +297,6 @@ f7(); - - [#D-00namespace] == Unnamed namespace @@ -337,15 +305,13 @@ f7(); |=== | Name | Description -| xref:#D-00namespace-f8[`f8`] +| <<#D-00namespace-f8,`f8`>> | |=== - - [#D-00namespace-f8] -== xref:#D[D]::f8 +== <<#D,D>>::f8 @@ -366,8 +332,6 @@ f8(); - - [#00namespace] == Unnamed namespace @@ -376,10 +340,10 @@ f8(); |=== | Name | Description -| xref:#00namespace-G[`G`] +| <<#00namespace-G,`G`>> | -| xref:#00namespace-H[`H`] +| <<#00namespace-H,`H`>> | |=== @@ -388,13 +352,11 @@ f8(); |=== | Name | Description -| xref:#00namespace-f10[`f10`] +| <<#00namespace-f10,`f10`>> | |=== - - [#00namespace-f10] == f10 @@ -417,8 +379,6 @@ f10(); - - [#00namespace-G] == G @@ -427,15 +387,13 @@ f10(); |=== | Name | Description -| xref:#00namespace-G-f11[`f11`] +| <<#00namespace-G-f11,`f11`>> | |=== - - [#00namespace-G-f11] -== xref:#00namespace-G[G]::f11 +== <<#00namespace-G,G>>::f11 @@ -456,8 +414,6 @@ f11(); - - [#00namespace-H] == H @@ -466,15 +422,13 @@ f11(); |=== | Name | Description -| xref:#00namespace-H-f12[`f12`] +| <<#00namespace-H-f12,`f12`>> | |=== - - [#00namespace-H-f12] -== xref:#00namespace-H[H]::f12 +== <<#00namespace-H,H>>::f12 @@ -495,8 +449,6 @@ f12(); - - [#I] == I @@ -505,13 +457,11 @@ f12(); |=== | Name | Description -| xref:#I-00namespace[``] +| <<#I-00namespace,``>> | |=== - - [#I-00namespace] == Unnamed namespace @@ -520,15 +470,13 @@ f12(); |=== | Name | Description -| xref:#I-00namespace-f14[`f14`] +| <<#I-00namespace-f14,`f14`>> | |=== - - [#I-00namespace-f14] -== xref:#I[I]::f14 +== <<#I,I>>::f14 diff --git a/test-files/golden-tests/nested-private-template.adoc b/test-files/golden-tests/nested-private-template.adoc index 2b50f068e4..b8e6630de0 100644 --- a/test-files/golden-tests/nested-private-template.adoc +++ b/test-files/golden-tests/nested-private-template.adoc @@ -1,7 +1,5 @@ = Reference :mrdocs: - - [#index] == Global namespace @@ -10,13 +8,11 @@ |=== | Name | Description -| xref:#range[`range`] +| <<#range,`range`>> | |=== - - [#range] == range @@ -37,20 +33,18 @@ class range; |=== | Name | Description -| xref:#range-impl-0e[`impl`] +| <<#range-impl-0e,`impl`>> | -| xref:#range-impl-00[`impl`] +| <<#range-impl-00,`impl`>> | |=== - - [#range-impl-0e] -== xref:#range[range]::impl +== <<#range,range>>::impl @@ -69,10 +63,8 @@ struct impl; - - [#range-impl-00] -== xref:#range[range]::impl +== <<#range,range>>::impl @@ -83,7 +75,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- template -struct xref:#range-impl-0e[impl]; +struct <<#range-impl-0e,impl>>; ---- diff --git a/test-files/golden-tests/no_unique_address.adoc b/test-files/golden-tests/no_unique_address.adoc index abbb5be355..5a7308da6c 100644 --- a/test-files/golden-tests/no_unique_address.adoc +++ b/test-files/golden-tests/no_unique_address.adoc @@ -1,7 +1,5 @@ = Reference :mrdocs: - - [#index] == Global namespace @@ -10,16 +8,14 @@ |=== | Name | Description -| xref:#Empty[`Empty`] +| <<#Empty,`Empty`>> | -| xref:#T[`T`] +| <<#T,`T`>> | |=== - - [#Empty] == Empty @@ -37,8 +33,6 @@ struct Empty; - - [#T] == T @@ -58,20 +52,18 @@ struct T; |=== | Name | Description -| xref:#T-e[`e`] +| <<#T-e,`e`>> | -| xref:#T-i[`i`] +| <<#T-i,`i`>> | |=== - - [#T-i] -== xref:#T[T]::i +== <<#T,T>>::i @@ -85,10 +77,8 @@ int i; ---- - - [#T-e] -== xref:#T[T]::e +== <<#T,T>>::e @@ -98,7 +88,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- -xref:#Empty[Empty] e = pass:[Empty{}]; +<<#Empty,Empty>> e = pass:[Empty{}]; ---- diff --git a/test-files/golden-tests/noreturn.adoc b/test-files/golden-tests/noreturn.adoc index 271cad7b14..78ff81dea7 100644 --- a/test-files/golden-tests/noreturn.adoc +++ b/test-files/golden-tests/noreturn.adoc @@ -1,7 +1,5 @@ = Reference :mrdocs: - - [#index] == Global namespace @@ -10,7 +8,7 @@ |=== | Name | Description -| xref:#T[`T`] +| <<#T,`T`>> | |=== @@ -19,13 +17,11 @@ |=== | Name | Description -| xref:#f1[`f1`] +| <<#f1,`f1`>> | |=== - - [#f1] == f1 @@ -48,8 +44,6 @@ f1(); - - [#T] == T @@ -69,7 +63,7 @@ struct T; |=== | Name | Description -| xref:#T-f3[`f3`] +| <<#T-f3,`f3`>> | |=== @@ -78,7 +72,7 @@ struct T; |=== | Name | Description -| xref:#T-f2[`f2`] +| <<#T-f2,`f2`>> | |=== @@ -87,17 +81,15 @@ struct T; |=== | Name | Description -| xref:#T-08friend[`f1`] +| <<#T-08friend,`f1`>> | |=== - - [#T-f2] -== xref:#T[T]::f2 +== <<#T,T>>::f2 @@ -119,10 +111,8 @@ f2(); - - [#T-f3] -== xref:#T[T]::f3 +== <<#T,T>>::f3 @@ -143,8 +133,6 @@ f3(); - - [#T-08friend] == f1 diff --git a/test-files/golden-tests/ns-variables.adoc b/test-files/golden-tests/ns-variables.adoc index 9e4debb133..4e334e78cf 100644 --- a/test-files/golden-tests/ns-variables.adoc +++ b/test-files/golden-tests/ns-variables.adoc @@ -1,7 +1,5 @@ = Reference :mrdocs: - - [#index] == Global namespace @@ -10,7 +8,7 @@ |=== | Name | Description -| xref:#T[`T`] +| <<#T,`T`>> | |=== @@ -19,37 +17,35 @@ |=== | Name | Description -| xref:#i[`i`] +| <<#i,`i`>> | -| xref:#j[`j`] +| <<#j,`j`>> | -| xref:#k[`k`] +| <<#k,`k`>> | -| xref:#l[`l`] +| <<#l,`l`>> | -| xref:#pi[`pi`] +| <<#pi,`pi`>> | -| xref:#t[`t`] +| <<#t,`t`>> | -| xref:#x0[`x0`] +| <<#x0,`x0`>> | -| xref:#x1[`x1`] +| <<#x1,`x1`>> | -| xref:#x2[`x2`] +| <<#x2,`x2`>> | |=== - - [#i] == i @@ -66,8 +62,6 @@ int const i = 0; ---- - - [#j] == j @@ -83,8 +77,6 @@ int j = 0; ---- - - [#k] == k @@ -102,8 +94,6 @@ int const k = 1; ---- - - [#l] == l @@ -120,8 +110,6 @@ int l = 1; ---- - - [#pi] == pi @@ -137,8 +125,6 @@ double pi = pass:[3.14]; ---- - - [#T] == T @@ -156,8 +142,6 @@ struct T; - - [#t] == t @@ -170,12 +154,10 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- extern -xref:#T[T] t; +<<#T,T>> t; ---- - - [#x0] == x0 @@ -192,8 +174,6 @@ int x0 = 0; ---- - - [#x1] == x1 @@ -211,8 +191,6 @@ int x1 = 0; ---- - - [#x2] == x2 diff --git a/test-files/golden-tests/out-of-line-record-def.adoc b/test-files/golden-tests/out-of-line-record-def.adoc index 0164b8d73c..7cf69df880 100644 --- a/test-files/golden-tests/out-of-line-record-def.adoc +++ b/test-files/golden-tests/out-of-line-record-def.adoc @@ -1,7 +1,5 @@ = Reference :mrdocs: - - [#index] == Global namespace @@ -10,13 +8,11 @@ |=== | Name | Description -| xref:#N[`N`] +| <<#N,`N`>> | |=== - - [#N] == N @@ -25,15 +21,13 @@ |=== | Name | Description -| xref:#N-S[`S`] +| <<#N-S,`S`>> | |=== - - [#N-S] -== xref:#N[N]::S +== <<#N,N>>::S diff --git a/test-files/golden-tests/overloaded-op-1.adoc b/test-files/golden-tests/overloaded-op-1.adoc index a172a5987f..09b2ba0546 100644 --- a/test-files/golden-tests/overloaded-op-1.adoc +++ b/test-files/golden-tests/overloaded-op-1.adoc @@ -1,7 +1,5 @@ = Reference :mrdocs: - - [#index] == Global namespace @@ -10,13 +8,11 @@ |=== | Name | Description -| xref:#T[`T`] +| <<#T,`T`>> | |=== - - [#T] == T @@ -36,17 +32,15 @@ struct T; |=== | Name | Description -| xref:#T-operator_plus[`pass:[operator+]`] +| <<#T-operator_plus,`pass:[operator+]`>> | |=== - - [#T-operator_plus] -== xref:#T[T]::pass:[operator+] +== <<#T,T>>::pass:[operator+] @@ -56,7 +50,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- -xref:#T[T] +<<#T,T>> pass:[operator+](); ---- diff --git a/test-files/golden-tests/overloaded-op-2.adoc b/test-files/golden-tests/overloaded-op-2.adoc index 00070e58ed..4fede2900a 100644 --- a/test-files/golden-tests/overloaded-op-2.adoc +++ b/test-files/golden-tests/overloaded-op-2.adoc @@ -1,7 +1,5 @@ = Reference :mrdocs: - - [#index] == Global namespace @@ -10,13 +8,11 @@ |=== | Name | Description -| xref:#T[`T`] +| <<#T,`T`>> | |=== - - [#T] == T @@ -36,17 +32,15 @@ struct T; |=== | Name | Description -| xref:#T-operator_plus[`pass:[operator+]`] +| <<#T-operator_plus,`pass:[operator+]`>> | |=== - - [#T-operator_plus] -== xref:#T[T]::pass:[operator+] +== <<#T,T>>::pass:[operator+] @@ -56,8 +50,8 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- -xref:#T[T] -pass:[operator+](xref:#T[T]); +<<#T,T>> +pass:[operator+](<<#T,T>>); ---- diff --git a/test-files/golden-tests/para-1.adoc b/test-files/golden-tests/para-1.adoc index 1987f3ab2f..0b36eaaabf 100644 --- a/test-files/golden-tests/para-1.adoc +++ b/test-files/golden-tests/para-1.adoc @@ -1,7 +1,5 @@ = Reference :mrdocs: - - [#index] == Global namespace @@ -10,24 +8,22 @@ |=== | Name | Description -| xref:#f1[`f1`] +| <<#f1,`f1`>> | -| xref:#f2[`f2`] +| <<#f2,`f2`>> | -| xref:#f3[`f3`] +| <<#f3,`f3`>> | -| xref:#f4[`f4`] +| <<#f4,`f4`>> | brief |=== - - [#f1] == f1 @@ -50,8 +46,6 @@ f1(); - - [#f2] == f2 @@ -74,8 +68,6 @@ f2(); - - [#f3] == f3 @@ -98,8 +90,6 @@ f3(); - - [#f4] == f4 diff --git a/test-files/golden-tests/para-2.adoc b/test-files/golden-tests/para-2.adoc index 6f98034e8d..43174c3d99 100644 --- a/test-files/golden-tests/para-2.adoc +++ b/test-files/golden-tests/para-2.adoc @@ -1,7 +1,5 @@ = Reference :mrdocs: - - [#index] == Global namespace @@ -10,15 +8,13 @@ |=== | Name | Description -| xref:#f1[`f1`] +| <<#f1,`f1`>> | brief |=== - - [#f1] == f1 diff --git a/test-files/golden-tests/param-direction.adoc b/test-files/golden-tests/param-direction.adoc index ad7daedc96..b038d9d3af 100644 --- a/test-files/golden-tests/param-direction.adoc +++ b/test-files/golden-tests/param-direction.adoc @@ -1,7 +1,5 @@ = Reference :mrdocs: - - [#index] == Global namespace @@ -10,40 +8,38 @@ |=== | Name | Description -| xref:#f[`f`] +| <<#f,`f`>> | -| xref:#g[`g`] +| <<#g,`g`>> | -| xref:#h[`h`] +| <<#h,`h`>> | -| xref:#i[`i`] +| <<#i,`i`>> | -| xref:#j[`j`] +| <<#j,`j`>> | -| xref:#k[`k`] +| <<#k,`k`>> | -| xref:#l[`l`] +| <<#l,`l`>> | -| xref:#m[`m`] +| <<#m,`m`>> | -| xref:#n[`n`] +| <<#n,`n`>> | -| xref:#o[`o`] +| <<#o,`o`>> | |=== - - [#f] == f @@ -75,8 +71,6 @@ f(int x0); - - [#g] == g @@ -112,8 +106,6 @@ g( - - [#h] == h @@ -149,8 +141,6 @@ h( - - [#i] == i @@ -186,8 +176,6 @@ i( - - [#j] == j @@ -223,8 +211,6 @@ j( - - [#k] == k @@ -263,8 +249,6 @@ k( - - [#l] == l @@ -304,8 +288,6 @@ l( - - [#m] == m @@ -341,8 +323,6 @@ m( - - [#n] == n @@ -374,8 +354,6 @@ n(int x8); - - [#o] == o diff --git a/test-files/golden-tests/param.adoc b/test-files/golden-tests/param.adoc index 513c883349..32f72ef188 100644 --- a/test-files/golden-tests/param.adoc +++ b/test-files/golden-tests/param.adoc @@ -1,7 +1,5 @@ = Reference :mrdocs: - - [#index] == Global namespace @@ -10,22 +8,20 @@ |=== | Name | Description -| xref:#f[`f`] +| <<#f,`f`>> | -| xref:#g[`g`] +| <<#g,`g`>> | -| xref:#h[`h`] +| <<#h,`h`>> | -| xref:#i[`i`] +| <<#i,`i`>> | |=== - - [#f] == f @@ -57,8 +53,6 @@ f(int x); - - [#g] == g @@ -94,8 +88,6 @@ g( - - [#h] == h @@ -134,8 +126,6 @@ h( - - [#i] == i diff --git a/test-files/golden-tests/pre-post.adoc b/test-files/golden-tests/pre-post.adoc index 67e023f7eb..c24901b010 100644 --- a/test-files/golden-tests/pre-post.adoc +++ b/test-files/golden-tests/pre-post.adoc @@ -1,7 +1,5 @@ = Reference :mrdocs: - - [#index] == Global namespace @@ -10,13 +8,11 @@ |=== | Name | Description -| xref:#f[`f`] +| <<#f,`f`>> | |=== - - [#f] == f diff --git a/test-files/golden-tests/record-1.adoc b/test-files/golden-tests/record-1.adoc index 0ed210cf33..13012b8810 100644 --- a/test-files/golden-tests/record-1.adoc +++ b/test-files/golden-tests/record-1.adoc @@ -1,7 +1,5 @@ = Reference :mrdocs: - - [#index] == Global namespace @@ -10,13 +8,11 @@ |=== | Name | Description -| xref:#T[`T`] +| <<#T,`T`>> | |=== - - [#T] == T @@ -36,10 +32,10 @@ struct T; |=== | Name | Description -| xref:#T-U1[`U1`] +| <<#T-U1,`U1`>> | -| xref:#T-U2[`U2`] +| <<#T-U2,`U2`>> | |=== @@ -48,13 +44,13 @@ struct T; |=== | Name | Description -| xref:#T-f1[`f1`] +| <<#T-f1,`f1`>> | -| xref:#T-f2[`f2`] +| <<#T-f2,`f2`>> | -| xref:#T-f3[`f3`] +| <<#T-f3,`f3`>> | |=== @@ -63,17 +59,17 @@ struct T; |=== | Name | Description -| xref:#T-g1[`g1`] +| <<#T-g1,`g1`>> | brief-g1 -| xref:#T-g2[`g2`] +| <<#T-g2,`g2`>> | brief-g2 -| xref:#T-g3[`g3`] +| <<#T-g3,`g3`>> | brief-g3 @@ -82,10 +78,8 @@ brief-g3 - - [#T-U1] -== xref:#T[T]::U1 +== <<#T,T>>::U1 @@ -99,10 +93,8 @@ using U1 = int; ---- - - [#T-U2] -== xref:#T[T]::U2 +== <<#T,T>>::U2 @@ -116,10 +108,8 @@ typedef char U2; ---- - - [#T-f1] -== xref:#T[T]::f1 +== <<#T,T>>::f1 @@ -140,10 +130,8 @@ f1(); - - [#T-f2] -== xref:#T[T]::f2 +== <<#T,T>>::f2 @@ -164,10 +152,8 @@ f2(); - - [#T-f3] -== xref:#T[T]::f3 +== <<#T,T>>::f3 @@ -188,10 +174,8 @@ f3(); - - [#T-g1] -== xref:#T[T]::g1 +== <<#T,T>>::g1 brief-g1 @@ -220,10 +204,8 @@ desc - - [#T-g2] -== xref:#T[T]::g2 +== <<#T,T>>::g2 brief-g2 @@ -252,10 +234,8 @@ the number 2 - - [#T-g3] -== xref:#T[T]::g3 +== <<#T,T>>::g3 brief-g3 diff --git a/test-files/golden-tests/record-access.adoc b/test-files/golden-tests/record-access.adoc index d2dcbf32ee..61afdb466b 100644 --- a/test-files/golden-tests/record-access.adoc +++ b/test-files/golden-tests/record-access.adoc @@ -1,7 +1,5 @@ = Reference :mrdocs: - - [#index] == Global namespace @@ -10,19 +8,17 @@ |=== | Name | Description -| xref:#C0[`C0`] +| <<#C0,`C0`>> | -| xref:#S0[`S0`] +| <<#S0,`S0`>> | -| xref:#U0[`U0`] +| <<#U0,`U0`>> | |=== - - [#S0] == S0 @@ -42,7 +38,7 @@ struct S0; |=== | Name | Description -| xref:#S0-f0[`f0`] +| <<#S0-f0,`f0`>> | |=== @@ -51,7 +47,7 @@ struct S0; |=== | Name | Description -| xref:#S0-f1[`f1`] +| <<#S0-f1,`f1`>> | |=== @@ -60,17 +56,15 @@ struct S0; |=== | Name | Description -| xref:#S0-f2[`f2`] +| <<#S0-f2,`f2`>> | |=== - - [#S0-f0] -== xref:#S0[S0]::f0 +== <<#S0,S0>>::f0 @@ -91,10 +85,8 @@ f0(); - - [#S0-f1] -== xref:#S0[S0]::f1 +== <<#S0,S0>>::f1 @@ -115,10 +107,8 @@ f1(); - - [#S0-f2] -== xref:#S0[S0]::f2 +== <<#S0,S0>>::f2 @@ -139,8 +129,6 @@ f2(); - - [#C0] == C0 @@ -160,7 +148,7 @@ class C0; |=== | Name | Description -| xref:#C0-f2[`f2`] +| <<#C0-f2,`f2`>> | |=== @@ -169,7 +157,7 @@ class C0; |=== | Name | Description -| xref:#C0-f1[`f1`] +| <<#C0-f1,`f1`>> | |=== @@ -178,17 +166,15 @@ class C0; |=== | Name | Description -| xref:#C0-f0[`f0`] +| <<#C0-f0,`f0`>> | |=== - - [#C0-f0] -== xref:#C0[C0]::f0 +== <<#C0,C0>>::f0 @@ -209,10 +195,8 @@ f0(); - - [#C0-f1] -== xref:#C0[C0]::f1 +== <<#C0,C0>>::f1 @@ -233,10 +217,8 @@ f1(); - - [#C0-f2] -== xref:#C0[C0]::f2 +== <<#C0,C0>>::f2 @@ -257,8 +239,6 @@ f2(); - - [#U0] == U0 @@ -278,7 +258,7 @@ union U0; |=== | Name | Description -| xref:#U0-f0[`f0`] +| <<#U0-f0,`f0`>> | |=== @@ -287,7 +267,7 @@ union U0; |=== | Name | Description -| xref:#U0-f1[`f1`] +| <<#U0-f1,`f1`>> | |=== @@ -296,17 +276,15 @@ union U0; |=== | Name | Description -| xref:#U0-f2[`f2`] +| <<#U0-f2,`f2`>> | |=== - - [#U0-f0] -== xref:#U0[U0]::f0 +== <<#U0,U0>>::f0 @@ -327,10 +305,8 @@ f0(); - - [#U0-f1] -== xref:#U0[U0]::f1 +== <<#U0,U0>>::f1 @@ -351,10 +327,8 @@ f1(); - - [#U0-f2] -== xref:#U0[U0]::f2 +== <<#U0,U0>>::f2 diff --git a/test-files/golden-tests/record-data.adoc b/test-files/golden-tests/record-data.adoc index 8fbb03ac30..1dfac57d30 100644 --- a/test-files/golden-tests/record-data.adoc +++ b/test-files/golden-tests/record-data.adoc @@ -1,7 +1,5 @@ = Reference :mrdocs: - - [#index] == Global namespace @@ -10,25 +8,23 @@ |=== | Name | Description -| xref:#T[`T`] +| <<#T,`T`>> | -| xref:#U[`U`] +| <<#U,`U`>> | -| xref:#V[`V`] +| <<#V,`V`>> | -| xref:#W[`W`] +| <<#W,`W`>> | -| xref:#X[`X`] +| <<#X,`X`>> | |=== - - [#T] == T @@ -48,29 +44,27 @@ struct T; |=== | Name | Description -| xref:#T-i[`i`] +| <<#T-i,`i`>> | -| xref:#T-j[`j`] +| <<#T-j,`j`>> | -| xref:#T-k[`k`] +| <<#T-k,`k`>> | -| xref:#T-l[`l`] +| <<#T-l,`l`>> | -| xref:#T-m[`m`] +| <<#T-m,`m`>> | |=== - - [#T-i] -== xref:#T[T]::i +== <<#T,T>>::i @@ -84,10 +78,8 @@ int i; ---- - - [#T-j] -== xref:#T[T]::j +== <<#T,T>>::j @@ -101,10 +93,8 @@ double j; ---- - - [#T-k] -== xref:#T[T]::k +== <<#T,T>>::k @@ -119,10 +109,8 @@ int k; ---- - - [#T-l] -== xref:#T[T]::l +== <<#T,T>>::l @@ -136,10 +124,8 @@ int l : 8; ---- - - [#T-m] -== xref:#T[T]::m +== <<#T,T>>::m @@ -153,8 +139,6 @@ int m : pass:[4 + 4]; ---- - - [#U] == U @@ -174,17 +158,15 @@ struct U; |=== | Name | Description -| xref:#U-t[`t`] +| <<#U-t,`t`>> | |=== - - [#U-t] -== xref:#U[U]::t +== <<#U,U>>::t @@ -194,12 +176,10 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- -xref:#T[T] t; +<<#T,T>> t; ---- - - [#V] == V @@ -219,7 +199,7 @@ class V; |=== | Name | Description -| xref:#V-j[`j`] +| <<#V-j,`j`>> | |=== @@ -228,20 +208,18 @@ class V; |=== | Name | Description -| xref:#V-i[`i`] +| <<#V-i,`i`>> | -| xref:#V-k[`k`] +| <<#V-k,`k`>> | |=== - - [#V-i] -== xref:#V[V]::i +== <<#V,V>>::i @@ -255,10 +233,8 @@ int i; ---- - - [#V-j] -== xref:#V[V]::j +== <<#V,V>>::j @@ -272,10 +248,8 @@ unsigned long j; ---- - - [#V-k] -== xref:#V[V]::k +== <<#V,V>>::k @@ -289,8 +263,6 @@ double k; ---- - - [#W] == W @@ -310,17 +282,15 @@ struct W; |=== | Name | Description -| xref:#W-buf[`buf`] +| <<#W-buf,`buf`>> | |=== - - [#W-buf] -== xref:#W[W]::buf +== <<#W,W>>::buf @@ -334,8 +304,6 @@ char buf[64]; ---- - - [#X] == X @@ -358,7 +326,7 @@ struct X; |=== | Name | Description -| xref:#X-Q[`Q`] +| <<#X-Q,`Q`>> | |=== @@ -367,29 +335,27 @@ struct X; |=== | Name | Description -| xref:#X-x0[`x0`] +| <<#X-x0,`x0`>> | -| xref:#X-x1[`x1`] +| <<#X-x1,`x1`>> | -| xref:#X-x2[`x2`] +| <<#X-x2,`x2`>> | -| xref:#X-x3[`x3`] +| <<#X-x3,`x3`>> | -| xref:#X-x4[`x4`] +| <<#X-x4,`x4`>> | |=== - - [#X-Q] -== xref:#X[X]::Q +== <<#X,X>>::Q @@ -403,10 +369,8 @@ using Q = P; ---- - - [#X-x0] -== xref:#X[X]::x0 +== <<#X,X>>::x0 @@ -420,10 +384,8 @@ int x0 = 0; ---- - - [#X-x1] -== xref:#X[X]::x1 +== <<#X,X>>::x1 @@ -437,10 +399,8 @@ P x1; ---- - - [#X-x2] -== xref:#X[X]::x2 +== <<#X,X>>::x2 @@ -454,10 +414,8 @@ P const x2[32]; ---- - - [#X-x3] -== xref:#X[X]::x3 +== <<#X,X>>::x3 @@ -467,14 +425,12 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- -xref:#X-Q[Q] x3; +<<#X-Q,Q>> x3; ---- - - [#X-x4] -== xref:#X[X]::x4 +== <<#X,X>>::x4 diff --git a/test-files/golden-tests/record-inheritance.adoc b/test-files/golden-tests/record-inheritance.adoc index f4693d60b0..c35fb1c422 100644 --- a/test-files/golden-tests/record-inheritance.adoc +++ b/test-files/golden-tests/record-inheritance.adoc @@ -1,7 +1,5 @@ = Reference :mrdocs: - - [#index] == Global namespace @@ -10,58 +8,56 @@ |=== | Name | Description -| xref:#C0[`C0`] +| <<#C0,`C0`>> | -| xref:#C1[`C1`] +| <<#C1,`C1`>> | -| xref:#C2[`C2`] +| <<#C2,`C2`>> | -| xref:#C3[`C3`] +| <<#C3,`C3`>> | -| xref:#C4[`C4`] +| <<#C4,`C4`>> | -| xref:#C5[`C5`] +| <<#C5,`C5`>> | -| xref:#C6[`C6`] +| <<#C6,`C6`>> | -| xref:#C7[`C7`] +| <<#C7,`C7`>> | -| xref:#S0[`S0`] +| <<#S0,`S0`>> | -| xref:#S1[`S1`] +| <<#S1,`S1`>> | -| xref:#S2[`S2`] +| <<#S2,`S2`>> | -| xref:#S3[`S3`] +| <<#S3,`S3`>> | -| xref:#S4[`S4`] +| <<#S4,`S4`>> | -| xref:#S5[`S5`] +| <<#S5,`S5`>> | -| xref:#S6[`S6`] +| <<#S6,`S6`>> | -| xref:#U0[`U0`] +| <<#U0,`U0`>> | |=== - - [#S0] == S0 @@ -79,8 +75,6 @@ struct S0; - - [#C0] == C0 @@ -98,8 +92,6 @@ class C0; - - [#U0] == U0 @@ -117,8 +109,6 @@ union U0; - - [#S1] == S1 @@ -136,8 +126,6 @@ struct S1; - - [#S2] == S2 @@ -150,14 +138,12 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- struct S2 - : xref:#S0[S0]; + : <<#S0,S0>>; ---- - - [#S3] == S3 @@ -170,14 +156,12 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- struct S3 - : xref:#S1[S1]; + : <<#S1,S1>>; ---- - - [#S4] == S4 @@ -190,15 +174,13 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- struct S4 - : xref:#S2[S2] - , xref:#S3[S3]; + : <<#S2,S2>> + , <<#S3,S3>>; ---- - - [#C1] == C1 @@ -211,14 +193,12 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- class C1 - : xref:#C0[C0]; + : <<#C0,C0>>; ---- - - [#C2] == C2 @@ -231,14 +211,12 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- class C2 - : public xref:#C0[C0]; + : public <<#C0,C0>>; ---- - - [#C3] == C3 @@ -251,14 +229,12 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- class C3 - : protected xref:#C0[C0]; + : protected <<#C0,C0>>; ---- - - [#C4] == C4 @@ -271,14 +247,12 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- class C4 - : xref:#C0[C0]; + : <<#C0,C0>>; ---- - - [#C5] == C5 @@ -291,14 +265,12 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- class C5 - : virtual xref:#C0[C0]; + : virtual <<#C0,C0>>; ---- - - [#C6] == C6 @@ -311,14 +283,12 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- class C6 - : virtual xref:#C1[C1]; + : virtual <<#C1,C1>>; ---- - - [#C7] == C7 @@ -331,15 +301,13 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- class C7 - : public xref:#C5[C5] - , public xref:#C6[C6]; + : public <<#C5,C5>> + , public <<#C6,C6>>; ---- - - [#S5] == S5 @@ -352,15 +320,13 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- struct S5 - : private xref:#S0[S0] - , protected xref:#S1[S1]; + : private <<#S0,S0>> + , protected <<#S1,S1>>; ---- - - [#S6] == S6 diff --git a/test-files/golden-tests/ref.adoc b/test-files/golden-tests/ref.adoc index 572db14c92..4a4f525af7 100644 --- a/test-files/golden-tests/ref.adoc +++ b/test-files/golden-tests/ref.adoc @@ -1,7 +1,5 @@ = Reference :mrdocs: - - [#index] == Global namespace @@ -10,7 +8,7 @@ |=== | Name | Description -| xref:#A[`A`] +| <<#A,`A`>> | |=== @@ -19,7 +17,7 @@ |=== | Name | Description -| xref:#F[`F`] +| <<#F,`F`>> | |=== @@ -28,16 +26,16 @@ |=== | Name | Description -| xref:#f0[`f0`] +| <<#f0,`f0`>> | -| xref:#f5[`f5`] +| <<#f5,`f5`>> | See xref:#A-f1[A::f1] -| xref:#f6[`f6`] +| <<#f6,`f6`>> | See xref:#F-operator_bitnot[F::operator~] @@ -45,8 +43,6 @@ xref:#F-operator_bitnot[F::operator~] |=== - - [#f0] == f0 @@ -69,8 +65,6 @@ f0(); - - [#A] == A @@ -79,16 +73,16 @@ f0(); |=== | Name | Description -| xref:#A-B[`B`] +| <<#A-B,`B`>> | See xref:#A-f1[f1] -| xref:#A-C[`C`] +| <<#A-C,`C`>> | -| xref:#A-D[`D`] +| <<#A-D,`D`>> | |=== @@ -97,7 +91,7 @@ xref:#A-f1[f1] |=== | Name | Description -| xref:#A-f1[`f1`] +| <<#A-f1,`f1`>> | See xref:#f0[f0] @@ -105,10 +99,8 @@ xref:#f0[f0] |=== - - [#A-f1] -== xref:#A[A]::f1 +== <<#A,A>>::f1 See @@ -139,10 +131,8 @@ xref:#f0[::f0] - - [#A-B] -== xref:#A[A]::B +== <<#A,A>>::B See @@ -164,7 +154,7 @@ struct B; |=== | Name | Description -| xref:#A-B-f2[`f2`] +| <<#A-B-f2,`f2`>> | |=== @@ -181,10 +171,8 @@ xref:#A-f1[::A::f1] - - [#A-B-f2] -== xref:#A[A]::xref:#A-B[B]::f2 +== <<#A,A>>::<<#A-B,B>>::f2 @@ -205,10 +193,8 @@ f2(); - - [#A-C] -== xref:#A[A]::C +== <<#A,A>>::C @@ -226,20 +212,18 @@ struct C; |=== | Name | Description -| xref:#A-C-f3[`f3`] +| <<#A-C-f3,`f3`>> | -| xref:#A-C-f4[`f4`] +| <<#A-C-f4,`f4`>> | |=== - - [#A-C-f3] -== xref:#A[A]::xref:#A-C[C]::f3 +== <<#A,A>>::<<#A-C,C>>::f3 @@ -260,10 +244,8 @@ f3(); - - [#A-C-f4] -== xref:#A[A]::xref:#A-C[C]::f4 +== <<#A,A>>::<<#A-C,C>>::f4 @@ -284,10 +266,8 @@ f4(); - - [#A-D] -== xref:#A[A]::D +== <<#A,A>>::D @@ -298,7 +278,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- struct D - : xref:#A-C[C]; + : <<#A-C,C>>; ---- === Types @@ -306,7 +286,7 @@ struct D |=== | Name | Description -| xref:#A-D-E[`E`] +| <<#A-D-E,`E`>> | See xref:#A-C-f3[f3] @@ -318,19 +298,17 @@ xref:#A-C-f3[f3] |=== | Name | Description -| xref:#A-C-f3[`f3`] +| <<#A-C-f3,`f3`>> | -| xref:A-C-f4[`f4`] +| <<#A-C-f4,`f4`>> | |=== - - [#A-D-f4] -== xref:#A[A]::xref:#A-D[D]::f4 +== <<#A,A>>::<<#A-D,D>>::f4 @@ -351,10 +329,8 @@ f4(); - - [#A-D-E] -== xref:#A[A]::xref:#A-D[D]::E +== <<#A,A>>::<<#A-D,D>>::E See @@ -383,8 +359,6 @@ xref:#A-C-f4[C::f4] - - [#f5] == f5 @@ -417,8 +391,6 @@ xref:#A-f1[::A::f1] - - [#F] == F @@ -438,131 +410,129 @@ struct F; |=== | Name | Description -| xref:#F-operator_not[`pass:[operator!]`] +| <<#F-operator_not,`pass:[operator!]`>> | -| xref:#F-operator_not_eq[`pass:[operator!=]`] +| <<#F-operator_not_eq,`pass:[operator!=]`>> | -| xref:#F-operator_mod[`operator%`] +| <<#F-operator_mod,`operator%`>> | -| xref:#F-operator_mod_eq[`operator%=`] +| <<#F-operator_mod_eq,`operator%=`>> | -| xref:#F-operator_bitand[`operator&`] +| <<#F-operator_bitand,`operator&`>> | -| xref:#F-operator_and[`operator&&`] +| <<#F-operator_and,`operator&&`>> | -| xref:#F-operator_and_eq[`operator&=`] +| <<#F-operator_and_eq,`operator&=`>> | -| xref:#F-operator_call[`pass:[operator()]`] +| <<#F-operator_call,`pass:[operator()]`>> | -| xref:#F-operator_star[`pass:[operator*]`] +| <<#F-operator_star,`pass:[operator*]`>> | -| xref:#F-operator_star_eq[`pass:[operator*=]`] +| <<#F-operator_star_eq,`pass:[operator*=]`>> | -| xref:#F-operator_plus[`pass:[operator+]`] +| <<#F-operator_plus,`pass:[operator+]`>> | -| xref:#F-operator_inc[`pass:[operator++]`] +| <<#F-operator_inc,`pass:[operator++]`>> | -| xref:#F-operator_plus_eq[`pass:[operator+=]`] +| <<#F-operator_plus_eq,`pass:[operator+=]`>> | -| xref:#F-operator_comma[`operator,`] +| <<#F-operator_comma,`operator,`>> | -| xref:#F-operator_minus[`pass:[operator-]`] +| <<#F-operator_minus,`pass:[operator-]`>> | -| xref:#F-operator_dec[`pass:[operator--]`] +| <<#F-operator_dec,`pass:[operator--]`>> | -| xref:#F-operator_minus_eq[`pass:[operator-=]`] +| <<#F-operator_minus_eq,`pass:[operator-=]`>> | -| xref:#F-operator_ptr[`pass:[operator->]`] +| <<#F-operator_ptr,`pass:[operator->]`>> | -| xref:#F-operator_ptrmem[`pass:[operator->*]`] +| <<#F-operator_ptrmem,`pass:[operator->*]`>> | -| xref:#F-operator_slash[`operator/`] +| <<#F-operator_slash,`operator/`>> | -| xref:#F-operator_slash_eq[`operator/=`] +| <<#F-operator_slash_eq,`operator/=`>> | -| xref:#F-operator_lt[`operator<`] +| <<#F-operator_lt,`operator<`>> | -| xref:#F-operator_lshift[`operator<<`] +| <<#F-operator_lshift,`operator<<`>> | -| xref:#F-operator_lshift_eq[`operator<<=`] +| <<#F-operator_lshift_eq,`operator<<=`>> | -| xref:#F-operator_le[`operator<=`] +| <<#F-operator_le,`operator<=`>> | -| xref:#F-operator_3way[`operator<=>`] +| <<#F-operator_3way,`operator<=>`>> | -| xref:#F-operator_assign[`operator=`] +| <<#F-operator_assign,`operator=`>> | -| xref:#F-operator_eq[`operator==`] +| <<#F-operator_eq,`operator==`>> | -| xref:#F-operator_gt[`operator>`] +| <<#F-operator_gt,`operator>`>> | -| xref:#F-operator_ge[`operator>=`] +| <<#F-operator_ge,`operator>=`>> | -| xref:#F-operator_rshift[`operator>>`] +| <<#F-operator_rshift,`operator>>`>> | -| xref:#F-operator_rshift_eq[`operator>>=`] +| <<#F-operator_rshift_eq,`operator>>=`>> | -| xref:#F-operator_subs[`pass:[operator[]]`] +| <<#F-operator_subs,`pass:[operator[]]`>> | -| xref:#F-operator_xor[`operator^`] +| <<#F-operator_xor,`operator^`>> | -| xref:#F-operator_xor_eq[`operator^=`] +| <<#F-operator_xor_eq,`operator^=`>> | -| xref:#F-operator_bitor[`pass:[operator|]`] +| <<#F-operator_bitor,`pass:[operator|]`>> | -| xref:#F-operator_or_eq[`pass:[operator|=]`] +| <<#F-operator_or_eq,`pass:[operator|=]`>> | -| xref:#F-operator_or[`pass:[operator||]`] +| <<#F-operator_or,`pass:[operator||]`>> | -| xref:#F-operator_bitnot[`operator~`] +| <<#F-operator_bitnot,`operator~`>> | |=== - - [#F-operator_bitnot] -== xref:#F[F]::operator~ +== <<#F,F>>::operator~ @@ -583,10 +553,8 @@ operator~(); - - [#F-operator_comma] -== xref:#F[F]::operator, +== <<#F,F>>::operator, @@ -597,7 +565,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- void -operator,(xref:#F[F]&); +operator,(<<#F,F>>&); ---- @@ -607,10 +575,8 @@ operator,(xref:#F[F]&); - - [#F-operator_call] -== xref:#F[F]::pass:[operator()] +== <<#F,F>>::pass:[operator()] @@ -621,7 +587,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- void -pass:[operator()](xref:#F[F]&); +pass:[operator()](<<#F,F>>&); ---- @@ -631,10 +597,8 @@ pass:[operator()](xref:#F[F]&); - - [#F-operator_subs] -== xref:#F[F]::pass:[operator[]] +== <<#F,F>>::pass:[operator[]] @@ -645,7 +609,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- void -pass:[operator[]](xref:#F[F]&); +pass:[operator[]](<<#F,F>>&); ---- @@ -655,10 +619,8 @@ pass:[operator[]](xref:#F[F]&); - - [#F-operator_plus] -== xref:#F[F]::pass:[operator+] +== <<#F,F>>::pass:[operator+] @@ -669,7 +631,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- void -pass:[operator+](xref:#F[F]&); +pass:[operator+](<<#F,F>>&); ---- @@ -679,10 +641,8 @@ pass:[operator+](xref:#F[F]&); - - [#F-operator_inc] -== xref:#F[F]::pass:[operator++] +== <<#F,F>>::pass:[operator++] @@ -703,10 +663,8 @@ pass:[operator++](); - - [#F-operator_plus_eq] -== xref:#F[F]::pass:[operator+=] +== <<#F,F>>::pass:[operator+=] @@ -717,7 +675,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- void -pass:[operator+=](xref:#F[F]&); +pass:[operator+=](<<#F,F>>&); ---- @@ -727,10 +685,8 @@ pass:[operator+=](xref:#F[F]&); - - [#F-operator_bitand] -== xref:#F[F]::operator& +== <<#F,F>>::operator& @@ -741,7 +697,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- void -operator&(xref:#F[F]&); +operator&(<<#F,F>>&); ---- @@ -751,10 +707,8 @@ operator&(xref:#F[F]&); - - [#F-operator_and] -== xref:#F[F]::operator&& +== <<#F,F>>::operator&& @@ -765,7 +719,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- void -operator&&(xref:#F[F]&); +operator&&(<<#F,F>>&); ---- @@ -775,10 +729,8 @@ operator&&(xref:#F[F]&); - - [#F-operator_and_eq] -== xref:#F[F]::operator&= +== <<#F,F>>::operator&= @@ -789,7 +741,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- void -operator&=(xref:#F[F]&); +operator&=(<<#F,F>>&); ---- @@ -799,10 +751,8 @@ operator&=(xref:#F[F]&); - - [#F-operator_bitor] -== xref:#F[F]::pass:[operator|] +== <<#F,F>>::pass:[operator|] @@ -813,7 +763,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- void -pass:[operator|](xref:#F[F]&); +pass:[operator|](<<#F,F>>&); ---- @@ -823,10 +773,8 @@ pass:[operator|](xref:#F[F]&); - - [#F-operator_or] -== xref:#F[F]::pass:[operator||] +== <<#F,F>>::pass:[operator||] @@ -837,7 +785,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- void -pass:[operator||](xref:#F[F]&); +pass:[operator||](<<#F,F>>&); ---- @@ -847,10 +795,8 @@ pass:[operator||](xref:#F[F]&); - - [#F-operator_or_eq] -== xref:#F[F]::pass:[operator|=] +== <<#F,F>>::pass:[operator|=] @@ -861,7 +807,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- void -pass:[operator|=](xref:#F[F]&); +pass:[operator|=](<<#F,F>>&); ---- @@ -871,10 +817,8 @@ pass:[operator|=](xref:#F[F]&); - - [#F-operator_minus] -== xref:#F[F]::pass:[operator-] +== <<#F,F>>::pass:[operator-] @@ -885,7 +829,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- void -pass:[operator-](xref:#F[F]&); +pass:[operator-](<<#F,F>>&); ---- @@ -895,10 +839,8 @@ pass:[operator-](xref:#F[F]&); - - [#F-operator_dec] -== xref:#F[F]::pass:[operator--] +== <<#F,F>>::pass:[operator--] @@ -919,10 +861,8 @@ pass:[operator--](); - - [#F-operator_minus_eq] -== xref:#F[F]::pass:[operator-=] +== <<#F,F>>::pass:[operator-=] @@ -933,7 +873,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- void -pass:[operator-=](xref:#F[F]&); +pass:[operator-=](<<#F,F>>&); ---- @@ -943,10 +883,8 @@ pass:[operator-=](xref:#F[F]&); - - [#F-operator_ptr] -== xref:#F[F]::pass:[operator->] +== <<#F,F>>::pass:[operator->] @@ -967,10 +905,8 @@ pass:[operator->](); - - [#F-operator_ptrmem] -== xref:#F[F]::pass:[operator->*] +== <<#F,F>>::pass:[operator->*] @@ -981,7 +917,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- void -pass:[operator->*](xref:#F[F]&); +pass:[operator->*](<<#F,F>>&); ---- @@ -991,10 +927,8 @@ pass:[operator->*](xref:#F[F]&); - - [#F-operator_lt] -== xref:#F[F]::operator< +== <<#F,F>>::operator< @@ -1005,7 +939,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- void -operator<(xref:#F[F]&); +operator<(<<#F,F>>&); ---- @@ -1015,10 +949,8 @@ operator<(xref:#F[F]&); - - [#F-operator_lshift] -== xref:#F[F]::operator<< +== <<#F,F>>::operator<< @@ -1029,7 +961,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- void -operator<<(xref:#F[F]&); +operator<<(<<#F,F>>&); ---- @@ -1039,10 +971,8 @@ operator<<(xref:#F[F]&); - - [#F-operator_lshift_eq] -== xref:#F[F]::operator<<= +== <<#F,F>>::operator<<= @@ -1053,7 +983,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- void -operator<<=(xref:#F[F]&); +operator<<=(<<#F,F>>&); ---- @@ -1063,10 +993,8 @@ operator<<=(xref:#F[F]&); - - [#F-operator_le] -== xref:#F[F]::operator<= +== <<#F,F>>::operator<= @@ -1077,7 +1005,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- void -operator<=(xref:#F[F]&); +operator<=(<<#F,F>>&); ---- @@ -1087,10 +1015,8 @@ operator<=(xref:#F[F]&); - - [#F-operator_3way] -== xref:#F[F]::operator<=> +== <<#F,F>>::operator<=> @@ -1101,7 +1027,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- void -operator<=>(xref:#F[F]&); +operator<=>(<<#F,F>>&); ---- @@ -1111,10 +1037,8 @@ operator<=>(xref:#F[F]&); - - [#F-operator_gt] -== xref:#F[F]::operator> +== <<#F,F>>::operator> @@ -1125,7 +1049,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- void -operator>(xref:#F[F]&); +operator>(<<#F,F>>&); ---- @@ -1135,10 +1059,8 @@ operator>(xref:#F[F]&); - - [#F-operator_rshift] -== xref:#F[F]::operator>> +== <<#F,F>>::operator>> @@ -1149,7 +1071,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- void -operator>>(xref:#F[F]&); +operator>>(<<#F,F>>&); ---- @@ -1159,10 +1081,8 @@ operator>>(xref:#F[F]&); - - [#F-operator_rshift_eq] -== xref:#F[F]::operator>>= +== <<#F,F>>::operator>>= @@ -1173,7 +1093,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- void -operator>>=(xref:#F[F]&); +operator>>=(<<#F,F>>&); ---- @@ -1183,10 +1103,8 @@ operator>>=(xref:#F[F]&); - - [#F-operator_ge] -== xref:#F[F]::operator>= +== <<#F,F>>::operator>= @@ -1197,7 +1115,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- void -operator>=(xref:#F[F]&); +operator>=(<<#F,F>>&); ---- @@ -1207,10 +1125,8 @@ operator>=(xref:#F[F]&); - - [#F-operator_star] -== xref:#F[F]::pass:[operator*] +== <<#F,F>>::pass:[operator*] @@ -1221,7 +1137,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- void -pass:[operator*](xref:#F[F]&); +pass:[operator*](<<#F,F>>&); ---- @@ -1231,10 +1147,8 @@ pass:[operator*](xref:#F[F]&); - - [#F-operator_star_eq] -== xref:#F[F]::pass:[operator*=] +== <<#F,F>>::pass:[operator*=] @@ -1245,7 +1159,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- void -pass:[operator*=](xref:#F[F]&); +pass:[operator*=](<<#F,F>>&); ---- @@ -1255,10 +1169,8 @@ pass:[operator*=](xref:#F[F]&); - - [#F-operator_mod] -== xref:#F[F]::operator% +== <<#F,F>>::operator% @@ -1269,7 +1181,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- void -operator%(xref:#F[F]&); +operator%(<<#F,F>>&); ---- @@ -1279,10 +1191,8 @@ operator%(xref:#F[F]&); - - [#F-operator_mod_eq] -== xref:#F[F]::operator%= +== <<#F,F>>::operator%= @@ -1293,7 +1203,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- void -operator%=(xref:#F[F]&); +operator%=(<<#F,F>>&); ---- @@ -1303,10 +1213,8 @@ operator%=(xref:#F[F]&); - - [#F-operator_slash] -== xref:#F[F]::operator/ +== <<#F,F>>::operator/ @@ -1317,7 +1225,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- void -operator/(xref:#F[F]&); +operator/(<<#F,F>>&); ---- @@ -1327,10 +1235,8 @@ operator/(xref:#F[F]&); - - [#F-operator_slash_eq] -== xref:#F[F]::operator/= +== <<#F,F>>::operator/= @@ -1341,7 +1247,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- void -operator/=(xref:#F[F]&); +operator/=(<<#F,F>>&); ---- @@ -1351,10 +1257,8 @@ operator/=(xref:#F[F]&); - - [#F-operator_xor] -== xref:#F[F]::operator^ +== <<#F,F>>::operator^ @@ -1365,7 +1269,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- void -operator^(xref:#F[F]&); +operator^(<<#F,F>>&); ---- @@ -1375,10 +1279,8 @@ operator^(xref:#F[F]&); - - [#F-operator_xor_eq] -== xref:#F[F]::operator^= +== <<#F,F>>::operator^= @@ -1389,7 +1291,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- void -operator^=(xref:#F[F]&); +operator^=(<<#F,F>>&); ---- @@ -1399,10 +1301,8 @@ operator^=(xref:#F[F]&); - - [#F-operator_assign] -== xref:#F[F]::operator= +== <<#F,F>>::operator= @@ -1413,7 +1313,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- void -operator=(xref:#F[F]&); +operator=(<<#F,F>>&); ---- @@ -1423,10 +1323,8 @@ operator=(xref:#F[F]&); - - [#F-operator_eq] -== xref:#F[F]::operator== +== <<#F,F>>::operator== @@ -1437,7 +1335,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- void -operator==(xref:#F[F]&); +operator==(<<#F,F>>&); ---- @@ -1447,10 +1345,8 @@ operator==(xref:#F[F]&); - - [#F-operator_not] -== xref:#F[F]::pass:[operator!] +== <<#F,F>>::pass:[operator!] @@ -1471,10 +1367,8 @@ pass:[operator!](); - - [#F-operator_not_eq] -== xref:#F[F]::pass:[operator!=] +== <<#F,F>>::pass:[operator!=] @@ -1485,7 +1379,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- void -pass:[operator!=](xref:#F[F]&); +pass:[operator!=](<<#F,F>>&); ---- @@ -1495,8 +1389,6 @@ pass:[operator!=](xref:#F[F]&); - - [#f6] == f6 diff --git a/test-files/golden-tests/ref.html b/test-files/golden-tests/ref.html index a56e907db9..f6163dfe8d 100644 --- a/test-files/golden-tests/ref.html +++ b/test-files/golden-tests/ref.html @@ -483,7 +483,7 @@

Member Functions

- f4 + f4 diff --git a/test-files/golden-tests/requires-clause.adoc b/test-files/golden-tests/requires-clause.adoc index 1b6f51c25d..92af0e8143 100644 --- a/test-files/golden-tests/requires-clause.adoc +++ b/test-files/golden-tests/requires-clause.adoc @@ -1,7 +1,5 @@ = Reference :mrdocs: - - [#index] == Global namespace @@ -10,7 +8,7 @@ |=== | Name | Description -| xref:#A[`A`] +| <<#A,`A`>> | |=== @@ -19,15 +17,13 @@ |=== | Name | Description -| xref:f[`f`] +| <<#f,`f`>> | -| xref:g[`g`] +| <<#g,`g`>> | |=== - [#f] - == f @@ -39,14 +35,14 @@ ---- template void -xref:#f-05[f]() requires pass:[(sizeof(T) == 4)]; +<<#f-05,f>>() requires pass:[(sizeof(T) == 4)]; ---- [source,cpp,subs="verbatim,macros,-callouts"] ---- template void -xref:#f-08[f]() requires pass:[(sizeof(T) == 2)]; +<<#f-08,f>>() requires pass:[(sizeof(T) == 2)]; ---- @@ -56,8 +52,6 @@ xref:#f-08[f]() requires pass:[(sizeof(T) == 2)]; - - [#f-05] == f @@ -81,8 +75,6 @@ f() requires pass:[(sizeof(T) == 4)]; - - [#f-08] == f @@ -106,9 +98,7 @@ f() requires pass:[(sizeof(T) == 2)]; - [#g] - == g @@ -120,14 +110,14 @@ f() requires pass:[(sizeof(T) == 2)]; ---- template requires pass:[(sizeof(T) == 4)] void -xref:#g-0a[g](); +<<#g-0a,g>>(); ---- [source,cpp,subs="verbatim,macros,-callouts"] ---- template requires pass:[(sizeof(U) == 2)] void -xref:#g-0c[g](); +<<#g-0c,g>>(); ---- @@ -137,8 +127,6 @@ xref:#g-0c[g](); - - [#g-0a] == g @@ -162,8 +150,6 @@ g(); - - [#g-0c] == g @@ -187,8 +173,6 @@ g(); - - [#A] == A diff --git a/test-files/golden-tests/requires-clause.html b/test-files/golden-tests/requires-clause.html index 00ea53095f..727d4ad4d4 100644 --- a/test-files/golden-tests/requires-clause.html +++ b/test-files/golden-tests/requires-clause.html @@ -43,13 +43,13 @@

Functions

- f + f - g + g @@ -58,7 +58,6 @@

Functions

-

Overload set f

@@ -139,7 +138,6 @@

Synopsis

-

Overload set g

diff --git a/test-files/golden-tests/spec-mem-implicit-instantiation.adoc b/test-files/golden-tests/spec-mem-implicit-instantiation.adoc index 2baf6d1929..4698fd57c0 100644 --- a/test-files/golden-tests/spec-mem-implicit-instantiation.adoc +++ b/test-files/golden-tests/spec-mem-implicit-instantiation.adoc @@ -1,7 +1,5 @@ = Reference :mrdocs: - - [#index] == Global namespace @@ -10,16 +8,14 @@ |=== | Name | Description -| xref:#A-0e[`A`] +| <<#A-0e,`A`>> | -| xref:#D[`D`] +| <<#D,`D`>> | |=== - - [#A-0e] == A @@ -40,10 +36,10 @@ struct A; |=== | Name | Description -| xref:#A-0e-B[`B`] +| <<#A-0e-B,`B`>> | -| xref:#A-0e-C[`C`] +| <<#A-0e-C,`C`>> | |=== @@ -52,17 +48,15 @@ struct A; |=== | Name | Description -| xref:#A-0e-f[`f`] +| <<#A-0e-f,`f`>> | |=== - - [#A-0e-f] -== xref:#A-0e[A]::f +== <<#A-0e,A>>::f @@ -83,10 +77,8 @@ f(); - - [#A-0e-B] -== xref:#A-0e[A]::B +== <<#A-0e,A>>::B @@ -105,17 +97,15 @@ struct B; |=== | Name | Description -| xref:#A-0e-B-g[`g`] +| <<#A-0e-B-g,`g`>> | |=== - - [#A-0e-B-g] -== xref:#A-0e[A]::xref:#A-0e-B[B]::g +== <<#A-0e,A>>::<<#A-0e-B,B>>::g @@ -136,10 +126,8 @@ g(); - - [#A-0e-C] -== xref:#A-0e[A]::C +== <<#A-0e,A>>::C @@ -158,17 +146,15 @@ struct C; |=== | Name | Description -| xref:#A-0e-C-h[`h`] +| <<#A-0e-C-h,`h`>> | |=== - - [#A-0e-C-h] -== xref:#A-0e[A]::xref:#A-0e-C[C]::h +== <<#A-0e,A>>::<<#A-0e-C,C>>::h @@ -189,17 +175,6 @@ h(); - - -[#A-000] - - -[#A-00b] - - -[#A-0f] - - [#D] == D @@ -219,17 +194,15 @@ struct D; |=== | Name | Description -| xref:#D-E-0e[`E`] +| <<#D-E-0e,`E`>> | |=== - - [#D-E-0e] -== xref:#D[D]::E +== <<#D,D>>::E @@ -248,17 +221,15 @@ struct E; |=== | Name | Description -| xref:#D-E-0e-k[`k`] +| <<#D-E-0e-k,`k`>> | |=== - - [#D-E-0e-k] -== xref:#D[D]::xref:#D-E-0e[E]::k +== <<#D,D>>::<<#D-E-0e,E>>::k @@ -281,7 +252,4 @@ k(); -[#D-E-0d] - - [.small]#Created with https://www.mrdocs.com[MrDocs]# diff --git a/test-files/golden-tests/static-data-def-constexpr.adoc b/test-files/golden-tests/static-data-def-constexpr.adoc index e98d6a3fed..a62421314a 100644 --- a/test-files/golden-tests/static-data-def-constexpr.adoc +++ b/test-files/golden-tests/static-data-def-constexpr.adoc @@ -1,7 +1,5 @@ = Reference :mrdocs: - - [#index] == Global namespace @@ -10,16 +8,14 @@ |=== | Name | Description -| xref:#S[`S`] +| <<#S,`S`>> | -| xref:#T[`T`] +| <<#T,`T`>> | |=== - - [#S] == S @@ -39,17 +35,15 @@ struct S; |=== | Name | Description -| xref:#S-s[`s`] +| <<#S-s,`s`>> | |=== - - [#S-s] -== xref:#S[S]::s +== <<#S,S>>::s @@ -61,12 +55,10 @@ Declared in `` ---- constexpr static -xref:#S[S] const s = pass:[S{}]; +<<#S,S>> const s = pass:[S{}]; ---- - - [#T] == T @@ -86,17 +78,15 @@ struct T; |=== | Name | Description -| xref:#T-t[`t`] +| <<#T-t,`t`>> | |=== - - [#T-t] -== xref:#T[T]::t +== <<#T,T>>::t diff --git a/test-files/golden-tests/static-data-def.adoc b/test-files/golden-tests/static-data-def.adoc index 3b29b17d34..214172e185 100644 --- a/test-files/golden-tests/static-data-def.adoc +++ b/test-files/golden-tests/static-data-def.adoc @@ -1,7 +1,5 @@ = Reference :mrdocs: - - [#index] == Global namespace @@ -10,10 +8,10 @@ |=== | Name | Description -| xref:#A[`A`] +| <<#A,`A`>> | -| xref:#B[`B`] +| <<#B,`B`>> | |=== @@ -22,13 +20,11 @@ |=== | Name | Description -| xref:#f[`f`] +| <<#f,`f`>> | |=== - - [#A] == A @@ -49,38 +45,36 @@ struct A; |=== | Name | Description -| xref:#A-v0[`v0`] +| <<#A-v0,`v0`>> | -| xref:#A-v1[`v1`] +| <<#A-v1,`v1`>> | -| xref:#A-v2[`v2`] +| <<#A-v2,`v2`>> | -| xref:#A-v3[`v3`] +| <<#A-v3,`v3`>> | -| xref:#A-v4[`v4`] +| <<#A-v4,`v4`>> | -| xref:#A-v5[`v5`] +| <<#A-v5,`v5`>> | -| xref:#A-v6[`v6`] +| <<#A-v6,`v6`>> | -| xref:#A-v7[`v7`] +| <<#A-v7,`v7`>> | |=== - - [#A-v0] -== xref:#A[A]::v0 +== <<#A,A>>::v0 @@ -95,10 +89,8 @@ int v0 = 0; ---- - - [#A-v1] -== xref:#A[A]::v1 +== <<#A,A>>::v1 @@ -113,10 +105,8 @@ int v1 = 1; ---- - - [#A-v2] -== xref:#A[A]::v2 +== <<#A,A>>::v2 @@ -132,10 +122,8 @@ int const v2 = 2; ---- - - [#A-v3] -== xref:#A[A]::v3 +== <<#A,A>>::v3 @@ -150,10 +138,8 @@ int const v3 = 3; ---- - - [#A-v4] -== xref:#A[A]::v4 +== <<#A,A>>::v4 @@ -168,10 +154,8 @@ int const v4 = 4; ---- - - [#A-v5] -== xref:#A[A]::v5 +== <<#A,A>>::v5 @@ -186,10 +170,8 @@ int v5 = 5; ---- - - [#A-v6] -== xref:#A[A]::v6 +== <<#A,A>>::v6 @@ -204,10 +186,8 @@ int const v6 = 6; ---- - - [#A-v7] -== xref:#A[A]::v7 +== <<#A,A>>::v7 @@ -223,8 +203,6 @@ int const v7 = 7; ---- - - [#B] == B @@ -244,20 +222,18 @@ struct B; |=== | Name | Description -| xref:#B-x0[`x0`] +| <<#B-x0,`x0`>> | -| xref:#B-x1[`x1`] +| <<#B-x1,`x1`>> | |=== - - [#B-x0] -== xref:#B[B]::x0 +== <<#B,B>>::x0 @@ -273,10 +249,8 @@ int const x0 = 0; ---- - - [#B-x1] -== xref:#B[B]::x1 +== <<#B,B>>::x1 @@ -293,8 +267,6 @@ int const x1 = 0; ---- - - [#f] == f diff --git a/test-files/golden-tests/static-data-template.adoc b/test-files/golden-tests/static-data-template.adoc index 0c5f998ec5..64be1eb98c 100644 --- a/test-files/golden-tests/static-data-template.adoc +++ b/test-files/golden-tests/static-data-template.adoc @@ -1,7 +1,5 @@ = Reference :mrdocs: - - [#index] == Global namespace @@ -10,13 +8,11 @@ |=== | Name | Description -| xref:#A[`A`] +| <<#A,`A`>> | |=== - - [#A] == A @@ -37,23 +33,21 @@ struct A; |=== | Name | Description -| xref:#A-x-0e[`x`] +| <<#A-x-0e,`x`>> | -| xref:#A-x-0a[`x`] +| <<#A-x-0a,`x`>> | -| xref:#A-x-07[`x`] +| <<#A-x-07,`x`>> | |=== - - [#A-x-0e] -== xref:#A[A]::x +== <<#A,A>>::x @@ -72,10 +66,8 @@ T const x = 0; ---- - - [#A-x-0a] -== xref:#A[A]::x +== <<#A,A>>::x @@ -88,14 +80,12 @@ Declared in `` template constexpr static -T const xref:#A-x-0e[x] = 1; +T const <<#A-x-0e,x>> = 1; ---- - - [#A-x-07] -== xref:#A[A]::x +== <<#A,A>>::x @@ -108,7 +98,7 @@ Declared in `` template<> constexpr static -bool const xref:#A-x-0e[x] = 2; +bool const <<#A-x-0e,x>> = 2; ---- diff --git a/test-files/golden-tests/temp/c_mct_expl_inline.adoc b/test-files/golden-tests/temp/c_mct_expl_inline.adoc index 18f188e729..ca31c18f48 100644 --- a/test-files/golden-tests/temp/c_mct_expl_inline.adoc +++ b/test-files/golden-tests/temp/c_mct_expl_inline.adoc @@ -1,7 +1,5 @@ = Reference :mrdocs: - - [#index] == Global namespace @@ -10,13 +8,11 @@ |=== | Name | Description -| xref:#A[`A`] +| <<#A,`A`>> | |=== - - [#A] == A @@ -36,20 +32,18 @@ struct A; |=== | Name | Description -| xref:#A-B-04[`B`] +| <<#A-B-04,`B`>> | -| xref:#A-B-01[`B`] +| <<#A-B-01,`B`>> | |=== - - [#A-B-04] -== xref:#A[A]::B +== <<#A,A>>::B @@ -68,17 +62,15 @@ struct B; |=== | Name | Description -| xref:#A-B-04-f[`f`] +| <<#A-B-04-f,`f`>> | |=== - - [#A-B-04-f] -== xref:#A[A]::xref:#A-B-04[B]::f +== <<#A,A>>::<<#A-B-04,B>>::f @@ -99,10 +91,8 @@ f(); - - [#A-B-01] -== xref:#A[A]::B +== <<#A,A>>::B @@ -113,7 +103,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- template<> -struct xref:#A-B-04[B]; +struct <<#A-B-04,B>>; ---- === Member Functions @@ -121,17 +111,15 @@ struct xref:#A-B-04[B]; |=== | Name | Description -| xref:#A-B-01-g[`g`] +| <<#A-B-01-g,`g`>> | |=== - - [#A-B-01-g] -== xref:#A[A]::xref:#A-B-01[B]::g +== <<#A,A>>::<<#A-B-01,B>>::g diff --git a/test-files/golden-tests/temp/c_mct_expl_outside.adoc b/test-files/golden-tests/temp/c_mct_expl_outside.adoc index 9fd2e00e60..a675561254 100644 --- a/test-files/golden-tests/temp/c_mct_expl_outside.adoc +++ b/test-files/golden-tests/temp/c_mct_expl_outside.adoc @@ -1,7 +1,5 @@ = Reference :mrdocs: - - [#index] == Global namespace @@ -10,13 +8,11 @@ |=== | Name | Description -| xref:#A[`A`] +| <<#A,`A`>> | |=== - - [#A] == A @@ -36,20 +32,18 @@ struct A; |=== | Name | Description -| xref:#A-B-04[`B`] +| <<#A-B-04,`B`>> | -| xref:#A-B-01[`B`] +| <<#A-B-01,`B`>> | |=== - - [#A-B-04] -== xref:#A[A]::B +== <<#A,A>>::B @@ -68,17 +62,15 @@ struct B; |=== | Name | Description -| xref:#A-B-04-f[`f`] +| <<#A-B-04-f,`f`>> | |=== - - [#A-B-04-f] -== xref:#A[A]::xref:#A-B-04[B]::f +== <<#A,A>>::<<#A-B-04,B>>::f @@ -99,10 +91,8 @@ f(); - - [#A-B-01] -== xref:#A[A]::B +== <<#A,A>>::B @@ -113,7 +103,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- template<> -struct xref:#A-B-04[B]; +struct <<#A-B-04,B>>; ---- === Member Functions @@ -121,17 +111,15 @@ struct xref:#A-B-04[B]; |=== | Name | Description -| xref:#A-B-01-g[`g`] +| <<#A-B-01-g,`g`>> | |=== - - [#A-B-01-g] -== xref:#A[A]::xref:#A-B-01[B]::g +== <<#A,A>>::<<#A-B-01,B>>::g diff --git a/test-files/golden-tests/temp/c_mft_expl_inline.adoc b/test-files/golden-tests/temp/c_mft_expl_inline.adoc index e08ee52475..5ceae94bd8 100644 --- a/test-files/golden-tests/temp/c_mft_expl_inline.adoc +++ b/test-files/golden-tests/temp/c_mft_expl_inline.adoc @@ -1,7 +1,5 @@ = Reference :mrdocs: - - [#index] == Global namespace @@ -10,13 +8,11 @@ |=== | Name | Description -| xref:#A[`A`] +| <<#A,`A`>> | |=== - - [#A] == A @@ -36,16 +32,14 @@ struct A; |=== | Name | Description -| xref:A-f[`f`] +| <<#A-f,`f`>> | |=== - [#pass:[A-f]] - -== xref:#A[A]::f +== <<#A,A>>::f @@ -56,14 +50,14 @@ struct A; ---- template void -xref:#A-f-0e[f](); +<<#A-f-0e,f>>(); ---- [source,cpp,subs="verbatim,macros,-callouts"] ---- template<> void -xref:#A-f-0b[f](); +<<#A-f-0b,f>>(); ---- @@ -73,10 +67,8 @@ xref:#A-f-0b[f](); - - [#A-f-0e] -== xref:#A[A]::f +== <<#A,A>>::f @@ -98,10 +90,8 @@ f(); - - [#A-f-0b] -== xref:#A[A]::f +== <<#A,A>>::f @@ -113,7 +103,7 @@ Declared in `` ---- template<> void -xref:#A-f-0e[f](); +<<#A-f-0e,f>>(); ---- diff --git a/test-files/golden-tests/temp/c_mft_expl_inline.html b/test-files/golden-tests/temp/c_mft_expl_inline.html index 615aeffe3d..1d7435ab5b 100644 --- a/test-files/golden-tests/temp/c_mft_expl_inline.html +++ b/test-files/golden-tests/temp/c_mft_expl_inline.html @@ -68,7 +68,7 @@

Member Functions

- f + f @@ -79,7 +79,6 @@

Member Functions

-

Overload set A::f

diff --git a/test-files/golden-tests/temp/c_mft_expl_outside.adoc b/test-files/golden-tests/temp/c_mft_expl_outside.adoc index 46d8162a09..8abc49196e 100644 --- a/test-files/golden-tests/temp/c_mft_expl_outside.adoc +++ b/test-files/golden-tests/temp/c_mft_expl_outside.adoc @@ -1,7 +1,5 @@ = Reference :mrdocs: - - [#index] == Global namespace @@ -10,13 +8,11 @@ |=== | Name | Description -| xref:#A[`A`] +| <<#A,`A`>> | |=== - - [#A] == A @@ -36,16 +32,14 @@ struct A; |=== | Name | Description -| xref:A-f[`f`] +| <<#A-f,`f`>> | |=== - [#pass:[A-f]] - -== xref:#A[A]::f +== <<#A,A>>::f @@ -56,14 +50,14 @@ struct A; ---- template void -xref:#A-f-0e[f](); +<<#A-f-0e,f>>(); ---- [source,cpp,subs="verbatim,macros,-callouts"] ---- template<> void -xref:#A-f-0b[f](); +<<#A-f-0b,f>>(); ---- @@ -73,10 +67,8 @@ xref:#A-f-0b[f](); - - [#A-f-0e] -== xref:#A[A]::f +== <<#A,A>>::f @@ -98,10 +90,8 @@ f(); - - [#A-f-0b] -== xref:#A[A]::f +== <<#A,A>>::f @@ -113,7 +103,7 @@ Declared in `` ---- template<> void -xref:#A-f-0e[f](); +<<#A-f-0e,f>>(); ---- diff --git a/test-files/golden-tests/temp/c_mft_expl_outside.html b/test-files/golden-tests/temp/c_mft_expl_outside.html index 813fc7c437..226a42054f 100644 --- a/test-files/golden-tests/temp/c_mft_expl_outside.html +++ b/test-files/golden-tests/temp/c_mft_expl_outside.html @@ -68,7 +68,7 @@

Member Functions

- f + f @@ -79,7 +79,6 @@

Member Functions

-

Overload set A::f

diff --git a/test-files/golden-tests/temp/ct_expl.adoc b/test-files/golden-tests/temp/ct_expl.adoc index fa28941e35..bd14641d1b 100644 --- a/test-files/golden-tests/temp/ct_expl.adoc +++ b/test-files/golden-tests/temp/ct_expl.adoc @@ -1,7 +1,5 @@ = Reference :mrdocs: - - [#index] == Global namespace @@ -10,16 +8,14 @@ |=== | Name | Description -| xref:#A-0e[`A`] +| <<#A-0e,`A`>> | -| xref:#A-00[`A`] +| <<#A-00,`A`>> | |=== - - [#A-0e] == A @@ -40,17 +36,15 @@ struct A; |=== | Name | Description -| xref:#A-0e-f[`f`] +| <<#A-0e-f,`f`>> | |=== - - [#A-0e-f] -== xref:#A-0e[A]::f +== <<#A-0e,A>>::f @@ -71,8 +65,6 @@ f(); - - [#A-00] == A @@ -85,7 +77,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- template<> -struct xref:#A-0e[A]; +struct <<#A-0e,A>>; ---- === Member Functions @@ -93,17 +85,15 @@ struct xref:#A-0e[A]; |=== | Name | Description -| xref:#A-00-g[`g`] +| <<#A-00-g,`g`>> | |=== - - [#A-00-g] -== xref:#A-00[A]::g +== <<#A-00,A>>::g diff --git a/test-files/golden-tests/temp/ct_mc.adoc b/test-files/golden-tests/temp/ct_mc.adoc index b8d697b9d5..4afd07e2ec 100644 --- a/test-files/golden-tests/temp/ct_mc.adoc +++ b/test-files/golden-tests/temp/ct_mc.adoc @@ -1,7 +1,5 @@ = Reference :mrdocs: - - [#index] == Global namespace @@ -10,13 +8,11 @@ |=== | Name | Description -| xref:#A[`A`] +| <<#A,`A`>> | |=== - - [#A] == A @@ -37,17 +33,15 @@ struct A; |=== | Name | Description -| xref:#A-B[`B`] +| <<#A-B,`B`>> | |=== - - [#A-B] -== xref:#A[A]::B +== <<#A,A>>::B @@ -65,17 +59,15 @@ struct B; |=== | Name | Description -| xref:#A-B-f[`f`] +| <<#A-B-f,`f`>> | |=== - - [#A-B-f] -== xref:#A[A]::xref:#A-B[B]::f +== <<#A,A>>::<<#A-B,B>>::f diff --git a/test-files/golden-tests/temp/ct_mc_expl_outside.adoc b/test-files/golden-tests/temp/ct_mc_expl_outside.adoc index a7ffb827ea..abf33a7790 100644 --- a/test-files/golden-tests/temp/ct_mc_expl_outside.adoc +++ b/test-files/golden-tests/temp/ct_mc_expl_outside.adoc @@ -1,7 +1,5 @@ = Reference :mrdocs: - - [#index] == Global namespace @@ -10,13 +8,11 @@ |=== | Name | Description -| xref:#A-0e[`A`] +| <<#A-0e,`A`>> | |=== - - [#A-0e] == A @@ -37,17 +33,15 @@ struct A; |=== | Name | Description -| xref:#A-0e-B[`B`] +| <<#A-0e-B,`B`>> | |=== - - [#A-0e-B] -== xref:#A-0e[A]::B +== <<#A-0e,A>>::B @@ -65,17 +59,15 @@ struct B; |=== | Name | Description -| xref:#A-0e-B-f[`f`] +| <<#A-0e-B-f,`f`>> | |=== - - [#A-0e-B-f] -== xref:#A-0e[A]::xref:#A-0e-B[B]::f +== <<#A-0e,A>>::<<#A-0e-B,B>>::f @@ -98,7 +90,4 @@ f(); -[#A-00] - - [.small]#Created with https://www.mrdocs.com[MrDocs]# diff --git a/test-files/golden-tests/temp/ct_mct.adoc b/test-files/golden-tests/temp/ct_mct.adoc index bf9854eed6..46f46545ca 100644 --- a/test-files/golden-tests/temp/ct_mct.adoc +++ b/test-files/golden-tests/temp/ct_mct.adoc @@ -1,7 +1,5 @@ = Reference :mrdocs: - - [#index] == Global namespace @@ -10,13 +8,11 @@ |=== | Name | Description -| xref:#A[`A`] +| <<#A,`A`>> | |=== - - [#A] == A @@ -37,17 +33,15 @@ struct A; |=== | Name | Description -| xref:#A-B[`B`] +| <<#A-B,`B`>> | |=== - - [#A-B] -== xref:#A[A]::B +== <<#A,A>>::B @@ -66,17 +60,15 @@ struct B; |=== | Name | Description -| xref:#A-B-f[`f`] +| <<#A-B-f,`f`>> | |=== - - [#A-B-f] -== xref:#A[A]::xref:#A-B[B]::f +== <<#A,A>>::<<#A-B,B>>::f diff --git a/test-files/golden-tests/temp/ct_mct_expl_inline.adoc b/test-files/golden-tests/temp/ct_mct_expl_inline.adoc index 8d35b0ff9f..84540385c6 100644 --- a/test-files/golden-tests/temp/ct_mct_expl_inline.adoc +++ b/test-files/golden-tests/temp/ct_mct_expl_inline.adoc @@ -1,7 +1,5 @@ = Reference :mrdocs: - - [#index] == Global namespace @@ -10,13 +8,11 @@ |=== | Name | Description -| xref:#A[`A`] +| <<#A,`A`>> | |=== - - [#A] == A @@ -37,20 +33,18 @@ struct A; |=== | Name | Description -| xref:#A-B-07[`B`] +| <<#A-B-07,`B`>> | -| xref:#A-B-06[`B`] +| <<#A-B-06,`B`>> | |=== - - [#A-B-07] -== xref:#A[A]::B +== <<#A,A>>::B @@ -69,17 +63,15 @@ struct B; |=== | Name | Description -| xref:#A-B-07-f[`f`] +| <<#A-B-07-f,`f`>> | |=== - - [#A-B-07-f] -== xref:#A[A]::xref:#A-B-07[B]::f +== <<#A,A>>::<<#A-B-07,B>>::f @@ -100,10 +92,8 @@ f(); - - [#A-B-06] -== xref:#A[A]::B +== <<#A,A>>::B @@ -114,7 +104,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- template<> -struct xref:#A-B-07[B]; +struct <<#A-B-07,B>>; ---- === Member Functions @@ -122,17 +112,15 @@ struct xref:#A-B-07[B]; |=== | Name | Description -| xref:#A-B-06-g[`g`] +| <<#A-B-06-g,`g`>> | |=== - - [#A-B-06-g] -== xref:#A[A]::xref:#A-B-06[B]::g +== <<#A,A>>::<<#A-B-06,B>>::g diff --git a/test-files/golden-tests/temp/ct_mct_expl_outside.adoc b/test-files/golden-tests/temp/ct_mct_expl_outside.adoc index 02495eca79..93f879b6d5 100644 --- a/test-files/golden-tests/temp/ct_mct_expl_outside.adoc +++ b/test-files/golden-tests/temp/ct_mct_expl_outside.adoc @@ -1,7 +1,5 @@ = Reference :mrdocs: - - [#index] == Global namespace @@ -10,13 +8,11 @@ |=== | Name | Description -| xref:#A-0e[`A`] +| <<#A-0e,`A`>> | |=== - - [#A-0e] == A @@ -37,17 +33,15 @@ struct A; |=== | Name | Description -| xref:#A-0e-B[`B`] +| <<#A-0e-B,`B`>> | |=== - - [#A-0e-B] -== xref:#A-0e[A]::B +== <<#A-0e,A>>::B @@ -66,17 +60,15 @@ struct B; |=== | Name | Description -| xref:#A-0e-B-f[`f`] +| <<#A-0e-B-f,`f`>> | |=== - - [#A-0e-B-f] -== xref:#A-0e[A]::xref:#A-0e-B[B]::f +== <<#A-0e,A>>::<<#A-0e-B,B>>::f @@ -99,7 +91,4 @@ f(); -[#A-00] - - [.small]#Created with https://www.mrdocs.com[MrDocs]# diff --git a/test-files/golden-tests/temp/ct_mf.adoc b/test-files/golden-tests/temp/ct_mf.adoc index a99fb65644..fcc3549420 100644 --- a/test-files/golden-tests/temp/ct_mf.adoc +++ b/test-files/golden-tests/temp/ct_mf.adoc @@ -1,7 +1,5 @@ = Reference :mrdocs: - - [#index] == Global namespace @@ -10,13 +8,11 @@ |=== | Name | Description -| xref:#A[`A`] +| <<#A,`A`>> | |=== - - [#A] == A @@ -37,17 +33,15 @@ struct A; |=== | Name | Description -| xref:#A-f[`f`] +| <<#A-f,`f`>> | |=== - - [#A-f] -== xref:#A[A]::f +== <<#A,A>>::f diff --git a/test-files/golden-tests/temp/ct_mf_expl_outside.adoc b/test-files/golden-tests/temp/ct_mf_expl_outside.adoc index bdc483acd0..786997eaae 100644 --- a/test-files/golden-tests/temp/ct_mf_expl_outside.adoc +++ b/test-files/golden-tests/temp/ct_mf_expl_outside.adoc @@ -1,7 +1,5 @@ = Reference :mrdocs: - - [#index] == Global namespace @@ -10,13 +8,11 @@ |=== | Name | Description -| xref:#A-0e[`A`] +| <<#A-0e,`A`>> | |=== - - [#A-0e] == A @@ -37,17 +33,15 @@ struct A; |=== | Name | Description -| xref:#A-0e-f[`f`] +| <<#A-0e-f,`f`>> | |=== - - [#A-0e-f] -== xref:#A-0e[A]::f +== <<#A-0e,A>>::f @@ -70,7 +64,4 @@ f(); -[#A-00] - - [.small]#Created with https://www.mrdocs.com[MrDocs]# diff --git a/test-files/golden-tests/temp/ct_mft.adoc b/test-files/golden-tests/temp/ct_mft.adoc index 3e0ef42954..18ab599dc0 100644 --- a/test-files/golden-tests/temp/ct_mft.adoc +++ b/test-files/golden-tests/temp/ct_mft.adoc @@ -1,7 +1,5 @@ = Reference :mrdocs: - - [#index] == Global namespace @@ -10,13 +8,11 @@ |=== | Name | Description -| xref:#A[`A`] +| <<#A,`A`>> | |=== - - [#A] == A @@ -37,17 +33,15 @@ struct A; |=== | Name | Description -| xref:#A-f[`f`] +| <<#A-f,`f`>> | |=== - - [#A-f] -== xref:#A[A]::f +== <<#A,A>>::f diff --git a/test-files/golden-tests/temp/ct_mft_expl_inline.adoc b/test-files/golden-tests/temp/ct_mft_expl_inline.adoc index 8236e48512..597b0e896c 100644 --- a/test-files/golden-tests/temp/ct_mft_expl_inline.adoc +++ b/test-files/golden-tests/temp/ct_mft_expl_inline.adoc @@ -1,7 +1,5 @@ = Reference :mrdocs: - - [#index] == Global namespace @@ -10,13 +8,11 @@ |=== | Name | Description -| xref:#A[`A`] +| <<#A,`A`>> | |=== - - [#A] == A @@ -37,16 +33,14 @@ struct A; |=== | Name | Description -| xref:A-f[`f`] +| <<#A-f,`f`>> | |=== - [#pass:[A-f]] - -== xref:#A[A]::f +== <<#A,A>>::f @@ -57,14 +51,14 @@ struct A; ---- template void -xref:#A-f-07[f](); +<<#A-f-07,f>>(); ---- [source,cpp,subs="verbatim,macros,-callouts"] ---- template<> void -xref:#A-f-04[f](); +<<#A-f-04,f>>(); ---- @@ -74,10 +68,8 @@ xref:#A-f-04[f](); - - [#A-f-07] -== xref:#A[A]::f +== <<#A,A>>::f @@ -99,10 +91,8 @@ f(); - - [#A-f-04] -== xref:#A[A]::f +== <<#A,A>>::f @@ -114,7 +104,7 @@ Declared in `` ---- template<> void -xref:#A-f-07[f](); +<<#A-f-07,f>>(); ---- diff --git a/test-files/golden-tests/temp/ct_mft_expl_inline.html b/test-files/golden-tests/temp/ct_mft_expl_inline.html index 68493d96c7..1c34d0ef38 100644 --- a/test-files/golden-tests/temp/ct_mft_expl_inline.html +++ b/test-files/golden-tests/temp/ct_mft_expl_inline.html @@ -69,7 +69,7 @@

Member Functions

- f + f @@ -80,7 +80,6 @@

Member Functions

-

Overload set A::f

diff --git a/test-files/golden-tests/temp/ct_mft_expl_outside.adoc b/test-files/golden-tests/temp/ct_mft_expl_outside.adoc index 810d7b60dd..d64132ece2 100644 --- a/test-files/golden-tests/temp/ct_mft_expl_outside.adoc +++ b/test-files/golden-tests/temp/ct_mft_expl_outside.adoc @@ -1,7 +1,5 @@ = Reference :mrdocs: - - [#index] == Global namespace @@ -10,13 +8,11 @@ |=== | Name | Description -| xref:#A-0e[`A`] +| <<#A-0e,`A`>> | |=== - - [#A-0e] == A @@ -37,17 +33,15 @@ struct A; |=== | Name | Description -| xref:#A-0e-f[`f`] +| <<#A-0e-f,`f`>> | |=== - - [#A-0e-f] -== xref:#A-0e[A]::f +== <<#A-0e,A>>::f @@ -71,7 +65,4 @@ f(); -[#A-00] - - [.small]#Created with https://www.mrdocs.com[MrDocs]# diff --git a/test-files/golden-tests/temp/ft_expl.adoc b/test-files/golden-tests/temp/ft_expl.adoc index 2ecdef6a68..c59c73be66 100644 --- a/test-files/golden-tests/temp/ft_expl.adoc +++ b/test-files/golden-tests/temp/ft_expl.adoc @@ -1,7 +1,5 @@ = Reference :mrdocs: - - [#index] == Global namespace @@ -10,13 +8,11 @@ |=== | Name | Description -| xref:f[`f`] +| <<#f,`f`>> | |=== - [#f] - == f @@ -28,14 +24,14 @@ ---- template void -xref:#f-03[f](); +<<#f-03,f>>(); ---- [source,cpp,subs="verbatim,macros,-callouts"] ---- template<> void -xref:#f-0c[f](); +<<#f-0c,f>>(); ---- @@ -45,8 +41,6 @@ xref:#f-0c[f](); - - [#f-03] == f @@ -70,8 +64,6 @@ f(); - - [#f-0c] == f @@ -85,7 +77,7 @@ Declared in `` ---- template<> void -xref:#f-03[f](); +<<#f-03,f>>(); ---- diff --git a/test-files/golden-tests/temp/ft_expl.html b/test-files/golden-tests/temp/ft_expl.html index e81269df59..d6507f3f97 100644 --- a/test-files/golden-tests/temp/ft_expl.html +++ b/test-files/golden-tests/temp/ft_expl.html @@ -22,7 +22,7 @@

Functions

- f + f @@ -31,7 +31,6 @@

Functions

-

Overload set f

diff --git a/test-files/golden-tests/type-resolution.adoc b/test-files/golden-tests/type-resolution.adoc index 0b69b7cd01..e56c859150 100644 --- a/test-files/golden-tests/type-resolution.adoc +++ b/test-files/golden-tests/type-resolution.adoc @@ -1,7 +1,5 @@ = Reference :mrdocs: - - [#index] == Global namespace @@ -10,19 +8,19 @@ |=== | Name | Description -| xref:#A[`A`] +| <<#A,`A`>> | -| xref:#B[`B`] +| <<#B,`B`>> | -| xref:#C[`C`] +| <<#C,`C`>> | -| xref:#D[`D`] +| <<#D,`D`>> | -| xref:#E[`E`] +| <<#E,`E`>> | |=== @@ -31,145 +29,143 @@ |=== | Name | Description -| xref:#f0[`f0`] +| <<#f0,`f0`>> | -| xref:#f1[`f1`] +| <<#f1,`f1`>> | -| xref:#f2[`f2`] +| <<#f2,`f2`>> | -| xref:#f3[`f3`] +| <<#f3,`f3`>> | -| xref:#f4[`f4`] +| <<#f4,`f4`>> | -| xref:#f5[`f5`] +| <<#f5,`f5`>> | -| xref:#f6[`f6`] +| <<#f6,`f6`>> | -| xref:#f7[`f7`] +| <<#f7,`f7`>> | -| xref:#f8[`f8`] +| <<#f8,`f8`>> | -| xref:#g0[`g0`] +| <<#g0,`g0`>> | -| xref:#g1[`g1`] +| <<#g1,`g1`>> | -| xref:#g2[`g2`] +| <<#g2,`g2`>> | -| xref:#g3[`g3`] +| <<#g3,`g3`>> | -| xref:#g4[`g4`] +| <<#g4,`g4`>> | -| xref:#g5[`g5`] +| <<#g5,`g5`>> | -| xref:#g6[`g6`] +| <<#g6,`g6`>> | -| xref:#g7[`g7`] +| <<#g7,`g7`>> | -| xref:#g8[`g8`] +| <<#g8,`g8`>> | -| xref:#h0[`h0`] +| <<#h0,`h0`>> | -| xref:#h1[`h1`] +| <<#h1,`h1`>> | -| xref:#h2[`h2`] +| <<#h2,`h2`>> | -| xref:#h3[`h3`] +| <<#h3,`h3`>> | -| xref:#h4[`h4`] +| <<#h4,`h4`>> | -| xref:#h5[`h5`] +| <<#h5,`h5`>> | -| xref:#h6[`h6`] +| <<#h6,`h6`>> | -| xref:#h7[`h7`] +| <<#h7,`h7`>> | -| xref:#h8[`h8`] +| <<#h8,`h8`>> | -| xref:#i0[`i0`] +| <<#i0,`i0`>> | -| xref:#i1[`i1`] +| <<#i1,`i1`>> | -| xref:#i2[`i2`] +| <<#i2,`i2`>> | -| xref:#i3[`i3`] +| <<#i3,`i3`>> | -| xref:#i4[`i4`] +| <<#i4,`i4`>> | -| xref:#i5[`i5`] +| <<#i5,`i5`>> | -| xref:#i6[`i6`] +| <<#i6,`i6`>> | -| xref:#i7[`i7`] +| <<#i7,`i7`>> | -| xref:#i8[`i8`] +| <<#i8,`i8`>> | -| xref:#j0[`j0`] +| <<#j0,`j0`>> | -| xref:#j1[`j1`] +| <<#j1,`j1`>> | -| xref:#j2[`j2`] +| <<#j2,`j2`>> | -| xref:#j3[`j3`] +| <<#j3,`j3`>> | -| xref:#j4[`j4`] +| <<#j4,`j4`>> | -| xref:#j5[`j5`] +| <<#j5,`j5`>> | -| xref:#j6[`j6`] +| <<#j6,`j6`>> | -| xref:#j7[`j7`] +| <<#j7,`j7`>> | -| xref:#j8[`j8`] +| <<#j8,`j8`>> | |=== - - [#A] == A @@ -187,8 +183,6 @@ struct A; - - [#B] == B @@ -209,8 +203,6 @@ struct B; - - [#C] == C @@ -222,12 +214,10 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- -using C = xref:#A[A]; +using C = <<#A,A>>; ---- - - [#D] == D @@ -239,12 +229,10 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- -using D = xref:#B[B]; +using D = <<#B,B>>; ---- - - [#E] == E @@ -257,12 +245,10 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- template -using E = xref:#B[B]; +using E = <<#B,B>>; ---- - - [#f0] == f0 @@ -275,7 +261,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- void -f0(xref:#A[A]); +f0(<<#A,A>>); ---- @@ -285,8 +271,6 @@ f0(xref:#A[A]); - - [#f1] == f1 @@ -299,7 +283,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- void -f1(xref:#A[A] const); +f1(<<#A,A>> const); ---- @@ -309,8 +293,6 @@ f1(xref:#A[A] const); - - [#f2] == f2 @@ -323,7 +305,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- void -f2(xref:#A[A]&); +f2(<<#A,A>>&); ---- @@ -333,8 +315,6 @@ f2(xref:#A[A]&); - - [#f3] == f3 @@ -347,7 +327,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- void -f3(xref:#A[A] const&); +f3(<<#A,A>> const&); ---- @@ -357,8 +337,6 @@ f3(xref:#A[A] const&); - - [#f4] == f4 @@ -371,7 +349,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- void -f4(xref:#A[A]*); +f4(<<#A,A>>*); ---- @@ -381,8 +359,6 @@ f4(xref:#A[A]*); - - [#f5] == f5 @@ -395,7 +371,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- void -f5(xref:#A[A] const*); +f5(<<#A,A>> const*); ---- @@ -405,8 +381,6 @@ f5(xref:#A[A] const*); - - [#f6] == f6 @@ -419,7 +393,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- void -f6(xref:#A[A]**); +f6(<<#A,A>>**); ---- @@ -429,8 +403,6 @@ f6(xref:#A[A]**); - - [#f7] == f7 @@ -443,7 +415,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- void -f7(xref:#A[A] const**); +f7(<<#A,A>> const**); ---- @@ -453,8 +425,6 @@ f7(xref:#A[A] const**); - - [#f8] == f8 @@ -467,7 +437,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- void -f8(xref:#A[A] const const**); +f8(<<#A,A>> const const**); ---- @@ -477,8 +447,6 @@ f8(xref:#A[A] const const**); - - [#g0] == g0 @@ -491,7 +459,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- void -g0(xref:#C[C]); +g0(<<#C,C>>); ---- @@ -501,8 +469,6 @@ g0(xref:#C[C]); - - [#g1] == g1 @@ -515,7 +481,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- void -g1(xref:#C[C] const); +g1(<<#C,C>> const); ---- @@ -525,8 +491,6 @@ g1(xref:#C[C] const); - - [#g2] == g2 @@ -539,7 +503,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- void -g2(xref:#C[C]&); +g2(<<#C,C>>&); ---- @@ -549,8 +513,6 @@ g2(xref:#C[C]&); - - [#g3] == g3 @@ -563,7 +525,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- void -g3(xref:#C[C] const&); +g3(<<#C,C>> const&); ---- @@ -573,8 +535,6 @@ g3(xref:#C[C] const&); - - [#g4] == g4 @@ -587,7 +547,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- void -g4(xref:#C[C]*); +g4(<<#C,C>>*); ---- @@ -597,8 +557,6 @@ g4(xref:#C[C]*); - - [#g5] == g5 @@ -611,7 +569,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- void -g5(xref:#C[C] const*); +g5(<<#C,C>> const*); ---- @@ -621,8 +579,6 @@ g5(xref:#C[C] const*); - - [#g6] == g6 @@ -635,7 +591,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- void -g6(xref:#C[C]**); +g6(<<#C,C>>**); ---- @@ -645,8 +601,6 @@ g6(xref:#C[C]**); - - [#g7] == g7 @@ -659,7 +613,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- void -g7(xref:#C[C] const**); +g7(<<#C,C>> const**); ---- @@ -669,8 +623,6 @@ g7(xref:#C[C] const**); - - [#g8] == g8 @@ -683,7 +635,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- void -g8(xref:#C[C] const const**); +g8(<<#C,C>> const const**); ---- @@ -693,8 +645,6 @@ g8(xref:#C[C] const const**); - - [#h0] == h0 @@ -707,7 +657,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- void -h0(xref:#B[B]); +h0(<<#B,B>>); ---- @@ -717,8 +667,6 @@ h0(xref:#B[B]); - - [#h1] == h1 @@ -731,7 +679,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- void -h1(xref:#B[B] const); +h1(<<#B,B>> const); ---- @@ -741,8 +689,6 @@ h1(xref:#B[B] const); - - [#h2] == h2 @@ -755,7 +701,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- void -h2(xref:#B[B]&); +h2(<<#B,B>>&); ---- @@ -765,8 +711,6 @@ h2(xref:#B[B]&); - - [#h3] == h3 @@ -779,7 +723,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- void -h3(xref:#B[B] const&); +h3(<<#B,B>> const&); ---- @@ -789,8 +733,6 @@ h3(xref:#B[B] const&); - - [#h4] == h4 @@ -803,7 +745,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- void -h4(xref:#B[B]*); +h4(<<#B,B>>*); ---- @@ -813,8 +755,6 @@ h4(xref:#B[B]*); - - [#h5] == h5 @@ -827,7 +767,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- void -h5(xref:#B[B] const*); +h5(<<#B,B>> const*); ---- @@ -837,8 +777,6 @@ h5(xref:#B[B] const*); - - [#h6] == h6 @@ -851,7 +789,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- void -h6(xref:#B[B]**); +h6(<<#B,B>>**); ---- @@ -861,8 +799,6 @@ h6(xref:#B[B]**); - - [#h7] == h7 @@ -875,7 +811,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- void -h7(xref:#B[B] const**); +h7(<<#B,B>> const**); ---- @@ -885,8 +821,6 @@ h7(xref:#B[B] const**); - - [#h8] == h8 @@ -899,7 +833,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- void -h8(xref:#B[B] const const**); +h8(<<#B,B>> const const**); ---- @@ -909,8 +843,6 @@ h8(xref:#B[B] const const**); - - [#i0] == i0 @@ -923,7 +855,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- void -i0(xref:#D[D]); +i0(<<#D,D>>); ---- @@ -933,8 +865,6 @@ i0(xref:#D[D]); - - [#i1] == i1 @@ -947,7 +877,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- void -i1(xref:#D[D] const); +i1(<<#D,D>> const); ---- @@ -957,8 +887,6 @@ i1(xref:#D[D] const); - - [#i2] == i2 @@ -971,7 +899,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- void -i2(xref:#D[D]&); +i2(<<#D,D>>&); ---- @@ -981,8 +909,6 @@ i2(xref:#D[D]&); - - [#i3] == i3 @@ -995,7 +921,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- void -i3(xref:#D[D] const&); +i3(<<#D,D>> const&); ---- @@ -1005,8 +931,6 @@ i3(xref:#D[D] const&); - - [#i4] == i4 @@ -1019,7 +943,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- void -i4(xref:#D[D]*); +i4(<<#D,D>>*); ---- @@ -1029,8 +953,6 @@ i4(xref:#D[D]*); - - [#i5] == i5 @@ -1043,7 +965,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- void -i5(xref:#D[D] const*); +i5(<<#D,D>> const*); ---- @@ -1053,8 +975,6 @@ i5(xref:#D[D] const*); - - [#i6] == i6 @@ -1067,7 +987,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- void -i6(xref:#D[D]**); +i6(<<#D,D>>**); ---- @@ -1077,8 +997,6 @@ i6(xref:#D[D]**); - - [#i7] == i7 @@ -1091,7 +1009,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- void -i7(xref:#D[D] const**); +i7(<<#D,D>> const**); ---- @@ -1101,8 +1019,6 @@ i7(xref:#D[D] const**); - - [#i8] == i8 @@ -1115,7 +1031,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- void -i8(xref:#D[D] const const**); +i8(<<#D,D>> const const**); ---- @@ -1125,8 +1041,6 @@ i8(xref:#D[D] const const**); - - [#j0] == j0 @@ -1139,7 +1053,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- void -j0(xref:#E[E]); +j0(<<#E,E>>); ---- @@ -1149,8 +1063,6 @@ j0(xref:#E[E]); - - [#j1] == j1 @@ -1163,7 +1075,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- void -j1(xref:#E[E] const); +j1(<<#E,E>> const); ---- @@ -1173,8 +1085,6 @@ j1(xref:#E[E] const); - - [#j2] == j2 @@ -1187,7 +1097,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- void -j2(xref:#E[E]&); +j2(<<#E,E>>&); ---- @@ -1197,8 +1107,6 @@ j2(xref:#E[E]&); - - [#j3] == j3 @@ -1211,7 +1119,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- void -j3(xref:#E[E] const&); +j3(<<#E,E>> const&); ---- @@ -1221,8 +1129,6 @@ j3(xref:#E[E] const&); - - [#j4] == j4 @@ -1235,7 +1141,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- void -j4(xref:#E[E]*); +j4(<<#E,E>>*); ---- @@ -1245,8 +1151,6 @@ j4(xref:#E[E]*); - - [#j5] == j5 @@ -1259,7 +1163,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- void -j5(xref:#E[E] const*); +j5(<<#E,E>> const*); ---- @@ -1269,8 +1173,6 @@ j5(xref:#E[E] const*); - - [#j6] == j6 @@ -1283,7 +1185,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- void -j6(xref:#E[E]**); +j6(<<#E,E>>**); ---- @@ -1293,8 +1195,6 @@ j6(xref:#E[E]**); - - [#j7] == j7 @@ -1307,7 +1207,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- void -j7(xref:#E[E] const**); +j7(<<#E,E>> const**); ---- @@ -1317,8 +1217,6 @@ j7(xref:#E[E] const**); - - [#j8] == j8 @@ -1331,7 +1229,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- void -j8(xref:#E[E] const const**); +j8(<<#E,E>> const const**); ---- diff --git a/test-files/golden-tests/union.adoc b/test-files/golden-tests/union.adoc index b3743a0be4..08637affef 100644 --- a/test-files/golden-tests/union.adoc +++ b/test-files/golden-tests/union.adoc @@ -1,7 +1,5 @@ = Reference :mrdocs: - - [#index] == Global namespace @@ -10,16 +8,14 @@ |=== | Name | Description -| xref:#A[`A`] +| <<#A,`A`>> | -| xref:#B[`B`] +| <<#B,`B`>> | |=== - - [#A] == A @@ -39,20 +35,18 @@ union A; |=== | Name | Description -| xref:#A-x[`x`] [.small]#[variant member]# +| <<#A-x,`x`>> [.small]#[variant member]# | -| xref:#A-y[`y`] [.small]#[variant member]# +| <<#A-y,`y`>> [.small]#[variant member]# | |=== - - [#A-x] -== xref:#A[A]::x +== <<#A,A>>::x @@ -66,10 +60,8 @@ int x; ---- - - [#A-y] -== xref:#A[A]::y +== <<#A,A>>::y @@ -83,8 +75,6 @@ bool y; ---- - - [#B] == B @@ -104,23 +94,21 @@ struct B; |=== | Name | Description -| xref:#B-x[`x`] [.small]#[variant member]# +| <<#B-x,`x`>> [.small]#[variant member]# | -| xref:#B-y[`y`] [.small]#[variant member]# +| <<#B-y,`y`>> [.small]#[variant member]# | -| xref:#B-z[`z`] +| <<#B-z,`z`>> | |=== - - [#B-x] -== xref:#B[B]::x +== <<#B,B>>::x @@ -134,10 +122,8 @@ int x; ---- - - [#B-y] -== xref:#B[B]::y +== <<#B,B>>::y @@ -151,10 +137,8 @@ bool y; ---- - - [#B-z] -== xref:#B[B]::z +== <<#B,B>>::z diff --git a/test-files/golden-tests/using-1.adoc b/test-files/golden-tests/using-1.adoc index 57ec3f4629..2888db6afa 100644 --- a/test-files/golden-tests/using-1.adoc +++ b/test-files/golden-tests/using-1.adoc @@ -1,7 +1,5 @@ = Reference :mrdocs: - - [#index] == Global namespace @@ -10,7 +8,7 @@ |=== | Name | Description -| xref:#LongName[`LongName`] +| <<#LongName,`LongName`>> | |=== @@ -20,12 +18,10 @@ |=== | Name | Description -| xref:#LongName[`LongName`] +| <<#LongName,`LongName`>> | |=== - - [#LongName] == LongName diff --git a/test-files/golden-tests/using-2.adoc b/test-files/golden-tests/using-2.adoc index 39a069f683..492607f8e9 100644 --- a/test-files/golden-tests/using-2.adoc +++ b/test-files/golden-tests/using-2.adoc @@ -1,7 +1,5 @@ = Reference :mrdocs: - - [#index] == Global namespace @@ -10,13 +8,11 @@ |=== | Name | Description -| xref:#LongName[`LongName`] +| <<#LongName,`LongName`>> | |=== - - [#LongName] == LongName @@ -25,18 +21,16 @@ |=== | Name | Description -| xref:#LongName-S1[`S1`] +| <<#LongName-S1,`S1`>> | -| xref:#LongName-S2[`S2`] +| <<#LongName-S2,`S2`>> | |=== - - [#LongName-S1] -== xref:#LongName[LongName]::S1 +== <<#LongName,LongName>>::S1 @@ -52,10 +46,8 @@ struct S1; - - [#LongName-S2] -== xref:#LongName[LongName]::S2 +== <<#LongName,LongName>>::S2 @@ -71,8 +63,6 @@ struct S2; - - [#S1] == S1 @@ -84,7 +74,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- -using xref:#LongName[LongName]::S1; +using <<#LongName,LongName>>::S1; ---- @@ -96,8 +86,6 @@ using xref:#LongName[LongName]::S1; |=== - - [#S2] == S2 @@ -109,7 +97,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- -using xref:#LongName[LongName]::S2; +using <<#LongName,LongName>>::S2; ---- diff --git a/test-files/golden-tests/using-3.adoc b/test-files/golden-tests/using-3.adoc index 9e9ca6e83d..1a6a9e8788 100644 --- a/test-files/golden-tests/using-3.adoc +++ b/test-files/golden-tests/using-3.adoc @@ -1,7 +1,5 @@ = Reference :mrdocs: - - [#index] == Global namespace @@ -10,19 +8,17 @@ |=== | Name | Description -| xref:#A[`A`] +| <<#A,`A`>> | -| xref:#B[`B`] +| <<#B,`B`>> | -| xref:#C[`C`] +| <<#C,`C`>> | |=== - - [#A] == A @@ -42,17 +38,15 @@ struct A; |=== | Name | Description -| xref:#A-f[`f`] +| <<#A-f,`f`>> | |=== - - [#A-f] -== xref:#A[A]::f +== <<#A,A>>::f @@ -73,8 +67,6 @@ f(int); - - [#B] == B @@ -94,17 +86,15 @@ struct B; |=== | Name | Description -| xref:#B-f[`f`] +| <<#B-f,`f`>> | |=== - - [#B-f] -== xref:#B[B]::f +== <<#B,B>>::f @@ -125,8 +115,6 @@ f(bool); - - [#C] == C @@ -139,8 +127,8 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- struct C - : xref:#A[A] - , xref:#B[B]; + : <<#A,A>> + , <<#B,B>>; ---- === Member Functions @@ -148,7 +136,7 @@ struct C |=== | Name | Description -| xref:A-f[`f`] +| <<#A-f,`f`>> | |=== === Using Declarations @@ -156,20 +144,18 @@ struct C |=== | Name | Description -| xref:#C-f-08[`f`] +| <<#C-f-08,`f`>> | -| xref:#C-f-03[`f`] +| <<#C-f-03,`f`>> | |=== - - [#C-f-08] -== xref:#C[C]::f +== <<#C,C>>::f @@ -179,7 +165,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- -using xref:#A[A]::f; +using <<#A,A>>::f; ---- @@ -191,10 +177,8 @@ using xref:#A[A]::f; |=== - - [#C-f-03] -== xref:#C[C]::f +== <<#C,C>>::f @@ -204,7 +188,7 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- -using xref:#B[B]::f; +using <<#B,B>>::f; ---- diff --git a/test-files/golden-tests/using-3.html b/test-files/golden-tests/using-3.html index 718b397f6d..4d3c97fa7a 100644 --- a/test-files/golden-tests/using-3.html +++ b/test-files/golden-tests/using-3.html @@ -234,7 +234,7 @@

Member Functions

- f + f diff --git a/test-files/golden-tests/utf-8.adoc b/test-files/golden-tests/utf-8.adoc index fc771d1192..26dab8e74c 100644 --- a/test-files/golden-tests/utf-8.adoc +++ b/test-files/golden-tests/utf-8.adoc @@ -1,7 +1,5 @@ = Reference :mrdocs: - - [#index] == Global namespace @@ -10,13 +8,11 @@ |=== | Name | Description -| xref:#Христос_воскрес[`pass:[Христос_воскрес]`] +| <<#Христос_воскрес,`pass:[Христос_воскрес]`>> | |=== - - [#Христос_воскрес] == pass:[Христос_воскрес] diff --git a/test-files/golden-tests/var-template.adoc b/test-files/golden-tests/var-template.adoc index c68068c9b3..9f579c72ba 100644 --- a/test-files/golden-tests/var-template.adoc +++ b/test-files/golden-tests/var-template.adoc @@ -1,7 +1,5 @@ = Reference :mrdocs: - - [#index] == Global namespace @@ -10,7 +8,7 @@ |=== | Name | Description -| xref:#B[`B`] +| <<#B,`B`>> | |=== @@ -19,19 +17,17 @@ |=== | Name | Description -| xref:#A-084[`A`] +| <<#A-084,`A`>> | -| xref:#A-08e[`A`] +| <<#A-08e,`A`>> | -| xref:#A-01[`A`] +| <<#A-01,`A`>> | |=== - - [#A-084] == A @@ -48,8 +44,6 @@ unsigned int A = pass:[sizeof(T)]; ---- - - [#A-08e] == A @@ -62,12 +56,10 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- template<> -unsigned int xref:#A-084[A] = 0; +unsigned int <<#A-084,A>> = 0; ---- - - [#A-01] == A @@ -80,12 +72,10 @@ Declared in `` [source,cpp,subs="verbatim,macros,-callouts"] ---- template -unsigned int xref:#A-084[A] = pass:[sizeof(T)]; +unsigned int <<#A-084,A>> = pass:[sizeof(T)]; ---- - - [#B] == B @@ -105,23 +95,21 @@ struct B; |=== | Name | Description -| xref:#B-C-0e[`C`] +| <<#B-C-0e,`C`>> | -| xref:#B-C-05[`C`] +| <<#B-C-05,`C`>> | -| xref:#B-C-0c[`C`] +| <<#B-C-0c,`C`>> | |=== - - [#B-C-0e] -== xref:#B[B]::C +== <<#B,B>>::C @@ -137,10 +125,8 @@ unsigned int C = 0; ---- - - [#B-C-05] -== xref:#B[B]::C +== <<#B,B>>::C @@ -152,14 +138,12 @@ Declared in `` ---- template<> static -unsigned int xref:#B-C-0e[C] = pass:[-1]; +unsigned int <<#B-C-0e,C>> = pass:[-1]; ---- - - [#B-C-0c] -== xref:#B[B]::C +== <<#B,B>>::C @@ -171,7 +155,7 @@ Declared in `` ---- template static -unsigned int xref:#B-C-0e[C] = pass:[sizeof(T)]; +unsigned int <<#B-C-0e,C>> = pass:[sizeof(T)]; ---- diff --git a/test-files/golden-tests/variadic-function.adoc b/test-files/golden-tests/variadic-function.adoc index 766179d0f4..c8649c5c86 100644 --- a/test-files/golden-tests/variadic-function.adoc +++ b/test-files/golden-tests/variadic-function.adoc @@ -1,7 +1,5 @@ = Reference :mrdocs: - - [#index] == Global namespace @@ -10,13 +8,13 @@ |=== | Name | Description -| xref:#C[`C`] +| <<#C,`C`>> | -| xref:#T[`T`] +| <<#T,`T`>> | -| xref:#U[`U`] +| <<#U,`U`>> | |=== @@ -25,16 +23,14 @@ |=== | Name | Description -| xref:#f[`f`] +| <<#f,`f`>> | -| xref:#g[`g`] +| <<#g,`g`>> | |=== - - [#T] == T @@ -50,8 +46,6 @@ using T = void(...); ---- - - [#U] == U @@ -67,8 +61,6 @@ using U = void(int, ...); ---- - - [#f] == f @@ -91,8 +83,6 @@ f(...); - - [#g] == g @@ -115,8 +105,6 @@ g(int, ...); - - [#C] == C