diff --git a/share/mrdocs/addons/generator/adoc/layouts/index.adoc.hbs b/share/mrdocs/addons/generator/adoc/layouts/index.adoc.hbs index 17c6ee8e26..950afd6e41 100644 --- a/share/mrdocs/addons/generator/adoc/layouts/index.adoc.hbs +++ b/share/mrdocs/addons/generator/adoc/layouts/index.adoc.hbs @@ -1,2 +1,2 @@ {{! The section with a symbol in single page output or the symbol page in multi page output }} -{{> symbol symbol=symbol}} +{{> symbol }} diff --git a/share/mrdocs/addons/generator/adoc/partials/signature/using.adoc.hbs b/share/mrdocs/addons/generator/adoc/partials/signature/using.adoc.hbs deleted file mode 100644 index d8ffe7733d..0000000000 --- a/share/mrdocs/addons/generator/adoc/partials/signature/using.adoc.hbs +++ /dev/null @@ -1 +0,0 @@ -using {{#if (eq symbol.class "typename")}}typename {{/if}}{{#if (eq symbol.class "enum")}}enum {{/if}}{{#if symbol.qualifier}}{{>types/name-info symbol.qualifier}}::{{/if}}{{symbol.name~}} \ 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 6afd8eddd0..d23ac993b9 100644 --- a/share/mrdocs/addons/generator/adoc/partials/symbols/alias.adoc.hbs +++ b/share/mrdocs/addons/generator/adoc/partials/symbols/alias.adoc.hbs @@ -10,7 +10,7 @@ [source,cpp,subs="verbatim,macros,-callouts"] ---- -{{>signature/alias symbol=symbol}}; +{{> signature }}; ---- {{#if symbol.doc.description}} 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 d73b89e166..6a23c43eca 100644 --- a/share/mrdocs/addons/generator/adoc/partials/symbols/concept.adoc.hbs +++ b/share/mrdocs/addons/generator/adoc/partials/symbols/concept.adoc.hbs @@ -10,7 +10,7 @@ [source,cpp,subs="verbatim,macros,-callouts"] ---- -{{>signature/concept symbol=symbol}}; +{{> signature }}; ---- {{#if symbol.doc.description}} 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 0cd82fe2af..4845af0532 100644 --- a/share/mrdocs/addons/generator/adoc/partials/symbols/enum.adoc.hbs +++ b/share/mrdocs/addons/generator/adoc/partials/symbols/enum.adoc.hbs @@ -10,7 +10,7 @@ [source,cpp,subs="verbatim,macros,-callouts"] ---- -{{>signature/enum symbol=symbol}}; +{{> signature }}; ---- {{#if symbol.members}} 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 f1ce41bd53..c7b507c599 100644 --- a/share/mrdocs/addons/generator/adoc/partials/symbols/enumerator.adoc.hbs +++ b/share/mrdocs/addons/generator/adoc/partials/symbols/enumerator.adoc.hbs @@ -10,7 +10,7 @@ [source,cpp,subs="verbatim,macros,-callouts"] ---- -{{>signature/enumerator symbol=symbol}} +{{> signature }} ---- 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 09838cc200..7adddb5bed 100644 --- a/share/mrdocs/addons/generator/adoc/partials/symbols/field.adoc.hbs +++ b/share/mrdocs/addons/generator/adoc/partials/symbols/field.adoc.hbs @@ -10,7 +10,7 @@ [source,cpp,subs="verbatim,macros,-callouts"] ---- -{{>signature/field symbol=symbol}}; +{{> signature }}; ---- {{#if symbol.doc.description}} 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 fecd77eebb..06bfcbe18b 100644 --- a/share/mrdocs/addons/generator/adoc/partials/symbols/friend.adoc.hbs +++ b/share/mrdocs/addons/generator/adoc/partials/symbols/friend.adoc.hbs @@ -10,7 +10,7 @@ [source,cpp,subs="verbatim,macros,-callouts"] ---- -{{>signature/friend symbol=symbol}}; +{{> signature }}; ---- {{#if symbol.doc.description}} 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 f98373ad1c..3acfa084a0 100644 --- a/share/mrdocs/addons/generator/adoc/partials/symbols/function.adoc.hbs +++ b/share/mrdocs/addons/generator/adoc/partials/symbols/function.adoc.hbs @@ -10,7 +10,7 @@ [source,cpp,subs="verbatim,macros,-callouts"] ---- -{{>signature/function symbol=symbol}}; +{{> signature }}; ---- {{#if symbol.doc.description}} 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 1ef93f9408..916ad1f7e5 100644 --- a/share/mrdocs/addons/generator/adoc/partials/symbols/guide.adoc.hbs +++ b/share/mrdocs/addons/generator/adoc/partials/symbols/guide.adoc.hbs @@ -10,7 +10,7 @@ [source,cpp,subs="verbatim,macros,-callouts"] ---- -{{>signature/guide symbol=symbol}}; +{{> signature }}; ---- {{#if symbol.doc.description}} diff --git a/share/mrdocs/addons/generator/adoc/partials/symbols/overloads.adoc.hbs b/share/mrdocs/addons/generator/adoc/partials/symbols/overloads.adoc.hbs index e6c9f1d64f..9f08f7dead 100644 --- a/share/mrdocs/addons/generator/adoc/partials/symbols/overloads.adoc.hbs +++ b/share/mrdocs/addons/generator/adoc/partials/symbols/overloads.adoc.hbs @@ -16,7 +16,7 @@ [source,cpp,subs="verbatim,macros,-callouts"] ---- -{{> (concat 'signature' '/' (lookup member 'kind')) symbol=member link=member}}; +{{> signature symbol=member link=member}}; ---- {{/each}} 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 4d710efb5f..56d553f805 100644 --- a/share/mrdocs/addons/generator/adoc/partials/symbols/record.adoc.hbs +++ b/share/mrdocs/addons/generator/adoc/partials/symbols/record.adoc.hbs @@ -10,7 +10,7 @@ [source,cpp,subs="verbatim,macros,-callouts"] ---- -{{>signature/record symbol=symbol}}; +{{> signature }}; ---- {{#with symbol.interface}} 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 70b008f1e4..a477304011 100644 --- a/share/mrdocs/addons/generator/adoc/partials/symbols/typedef.adoc.hbs +++ b/share/mrdocs/addons/generator/adoc/partials/symbols/typedef.adoc.hbs @@ -10,7 +10,7 @@ [source,cpp,subs="verbatim,macros,-callouts"] ---- -{{>signature/typedef symbol=symbol}}; +{{> signature }}; ---- {{#if symbol.doc.description}} 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 fe72dea994..0b98619d16 100644 --- a/share/mrdocs/addons/generator/adoc/partials/symbols/using.adoc.hbs +++ b/share/mrdocs/addons/generator/adoc/partials/symbols/using.adoc.hbs @@ -10,7 +10,7 @@ [source,cpp,subs="verbatim,macros,-callouts"] ---- -{{>signature/using symbol=symbol}}; +{{> signature }}; ---- {{#if symbol.doc.description}} 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 617e54c79b..26b89b06bb 100644 --- a/share/mrdocs/addons/generator/adoc/partials/symbols/variable.adoc.hbs +++ b/share/mrdocs/addons/generator/adoc/partials/symbols/variable.adoc.hbs @@ -10,7 +10,7 @@ [source,cpp,subs="verbatim,macros,-callouts"] ---- -{{>signature/variable symbol=symbol}}; +{{> signature }}; ---- {{#if symbol.doc.description}} diff --git a/share/mrdocs/addons/generator/common/partials/signature.hbs b/share/mrdocs/addons/generator/common/partials/signature.hbs new file mode 100644 index 0000000000..9de33a16db --- /dev/null +++ b/share/mrdocs/addons/generator/common/partials/signature.hbs @@ -0,0 +1 @@ +{{> (concat 'signature' '/' (lookup symbol 'kind')) }} \ No newline at end of file diff --git a/share/mrdocs/addons/generator/adoc/partials/signature/alias.adoc.hbs b/share/mrdocs/addons/generator/common/partials/signature/alias.hbs similarity index 100% rename from share/mrdocs/addons/generator/adoc/partials/signature/alias.adoc.hbs rename to share/mrdocs/addons/generator/common/partials/signature/alias.hbs diff --git a/share/mrdocs/addons/generator/adoc/partials/signature/concept.adoc.hbs b/share/mrdocs/addons/generator/common/partials/signature/concept.hbs similarity index 100% rename from share/mrdocs/addons/generator/adoc/partials/signature/concept.adoc.hbs rename to share/mrdocs/addons/generator/common/partials/signature/concept.hbs diff --git a/share/mrdocs/addons/generator/adoc/partials/signature/enum.adoc.hbs b/share/mrdocs/addons/generator/common/partials/signature/enum.hbs similarity index 100% rename from share/mrdocs/addons/generator/adoc/partials/signature/enum.adoc.hbs rename to share/mrdocs/addons/generator/common/partials/signature/enum.hbs diff --git a/share/mrdocs/addons/generator/adoc/partials/signature/enumerator.adoc.hbs b/share/mrdocs/addons/generator/common/partials/signature/enumerator.hbs similarity index 100% rename from share/mrdocs/addons/generator/adoc/partials/signature/enumerator.adoc.hbs rename to share/mrdocs/addons/generator/common/partials/signature/enumerator.hbs diff --git a/share/mrdocs/addons/generator/adoc/partials/signature/field.adoc.hbs b/share/mrdocs/addons/generator/common/partials/signature/field.hbs similarity index 100% rename from share/mrdocs/addons/generator/adoc/partials/signature/field.adoc.hbs rename to share/mrdocs/addons/generator/common/partials/signature/field.hbs diff --git a/share/mrdocs/addons/generator/adoc/partials/signature/friend.adoc.hbs b/share/mrdocs/addons/generator/common/partials/signature/friend.hbs similarity index 100% rename from share/mrdocs/addons/generator/adoc/partials/signature/friend.adoc.hbs rename to share/mrdocs/addons/generator/common/partials/signature/friend.hbs diff --git a/share/mrdocs/addons/generator/adoc/partials/signature/function.adoc.hbs b/share/mrdocs/addons/generator/common/partials/signature/function.hbs similarity index 100% rename from share/mrdocs/addons/generator/adoc/partials/signature/function.adoc.hbs rename to share/mrdocs/addons/generator/common/partials/signature/function.hbs diff --git a/share/mrdocs/addons/generator/adoc/partials/signature/guide.adoc.hbs b/share/mrdocs/addons/generator/common/partials/signature/guide.hbs similarity index 100% rename from share/mrdocs/addons/generator/adoc/partials/signature/guide.adoc.hbs rename to share/mrdocs/addons/generator/common/partials/signature/guide.hbs diff --git a/share/mrdocs/addons/generator/adoc/partials/signature/namespace.adoc.hbs b/share/mrdocs/addons/generator/common/partials/signature/namespace.hbs similarity index 100% rename from share/mrdocs/addons/generator/adoc/partials/signature/namespace.adoc.hbs rename to share/mrdocs/addons/generator/common/partials/signature/namespace.hbs diff --git a/share/mrdocs/addons/generator/adoc/partials/signature/record.adoc.hbs b/share/mrdocs/addons/generator/common/partials/signature/record.hbs similarity index 100% rename from share/mrdocs/addons/generator/adoc/partials/signature/record.adoc.hbs rename to share/mrdocs/addons/generator/common/partials/signature/record.hbs diff --git a/share/mrdocs/addons/generator/adoc/partials/signature/specialization.adoc.hbs b/share/mrdocs/addons/generator/common/partials/signature/specialization.hbs similarity index 100% rename from share/mrdocs/addons/generator/adoc/partials/signature/specialization.adoc.hbs rename to share/mrdocs/addons/generator/common/partials/signature/specialization.hbs diff --git a/share/mrdocs/addons/generator/adoc/partials/signature/typedef.adoc.hbs b/share/mrdocs/addons/generator/common/partials/signature/typedef.hbs similarity index 100% rename from share/mrdocs/addons/generator/adoc/partials/signature/typedef.adoc.hbs rename to share/mrdocs/addons/generator/common/partials/signature/typedef.hbs diff --git a/share/mrdocs/addons/generator/adoc/partials/signature/undefined.adoc.hbs b/share/mrdocs/addons/generator/common/partials/signature/undefined.hbs similarity index 100% rename from share/mrdocs/addons/generator/adoc/partials/signature/undefined.adoc.hbs rename to share/mrdocs/addons/generator/common/partials/signature/undefined.hbs diff --git a/share/mrdocs/addons/generator/common/partials/signature/using.hbs b/share/mrdocs/addons/generator/common/partials/signature/using.hbs new file mode 100644 index 0000000000..5fe615efa0 --- /dev/null +++ b/share/mrdocs/addons/generator/common/partials/signature/using.hbs @@ -0,0 +1 @@ +using {{#if (contains (arr "typename" "enum") symbol.class)}} {{symbol.class}}{{/if}}{{#if symbol.qualifier}}{{>types/name-info symbol.qualifier}}::{{/if}}{{symbol.name}} \ No newline at end of file diff --git a/share/mrdocs/addons/generator/adoc/partials/signature/variable.adoc.hbs b/share/mrdocs/addons/generator/common/partials/signature/variable.hbs similarity index 100% rename from share/mrdocs/addons/generator/adoc/partials/signature/variable.adoc.hbs rename to share/mrdocs/addons/generator/common/partials/signature/variable.hbs diff --git a/share/mrdocs/addons/generator/common/partials/symbol.hbs b/share/mrdocs/addons/generator/common/partials/symbol.hbs index 7075f01198..824e99b247 100644 --- a/share/mrdocs/addons/generator/common/partials/symbol.hbs +++ b/share/mrdocs/addons/generator/common/partials/symbol.hbs @@ -1 +1 @@ -{{> (concat 'symbols' '/' (lookup symbol 'kind')) symbol=symbol }} \ No newline at end of file +{{> (concat 'symbols' '/' (lookup symbol 'kind')) }} \ No newline at end of file diff --git a/share/mrdocs/addons/generator/common/partials/types/template-args.hbs b/share/mrdocs/addons/generator/common/partials/types/template-args.hbs index d105b29166..68d9d0acf8 100644 --- a/share/mrdocs/addons/generator/common/partials/types/template-args.hbs +++ b/share/mrdocs/addons/generator/common/partials/types/template-args.hbs @@ -1,5 +1,5 @@ {{! Render all template arguments }} -<{{~#each args~}} +{{ str '<' }}{{~#each args~}} {{~>types/template-arg nolink=../nolink~}} {{~#if (not @last)}}, {{/if~}} -{{~/each~}}> \ No newline at end of file +{{~/each~}}{{ str '>' }} \ No newline at end of file diff --git a/share/mrdocs/addons/generator/common/partials/types/template-head.hbs b/share/mrdocs/addons/generator/common/partials/types/template-head.hbs index a568240fb8..685d460e99 100644 --- a/share/mrdocs/addons/generator/common/partials/types/template-head.hbs +++ b/share/mrdocs/addons/generator/common/partials/types/template-head.hbs @@ -1,5 +1,5 @@ {{! Renders the template head for a template declaration. }} -template<{{#each params}}{{#unless (and @first @last)}} +template{{ str '<' }}{{#each params}}{{#unless (and @first @last)}} {{/unless}}{{>types/template-param~}} {{#unless @last}},{{/unless~}} -{{/each}}>{{#if requires}} requires {{requires}}{{/if}} \ No newline at end of file +{{/each}}{{ str '>' }}{{#if requires}} requires {{requires}}{{/if}} \ No newline at end of file diff --git a/share/mrdocs/addons/generator/html/layouts/index.html.hbs b/share/mrdocs/addons/generator/html/layouts/index.html.hbs index 17c6ee8e26..950afd6e41 100644 --- a/share/mrdocs/addons/generator/html/layouts/index.html.hbs +++ b/share/mrdocs/addons/generator/html/layouts/index.html.hbs @@ -1,2 +1,2 @@ {{! The section with a symbol in single page output or the symbol page in multi page output }} -{{> symbol symbol=symbol}} +{{> symbol }} diff --git a/share/mrdocs/addons/generator/html/layouts/wrapper.html.hbs b/share/mrdocs/addons/generator/html/layouts/wrapper.html.hbs index 8905846ce8..aa7eaa9071 100644 --- a/share/mrdocs/addons/generator/html/layouts/wrapper.html.hbs +++ b/share/mrdocs/addons/generator/html/layouts/wrapper.html.hbs @@ -5,6 +5,9 @@
+ {{#unless @root.config.multipage }} +

Reference

+ {{/unless}} {{! Content generated with index.hbs }} {{{contents}}}
diff --git a/share/mrdocs/addons/generator/html/partials/signature/alias.html.hbs b/share/mrdocs/addons/generator/html/partials/signature/alias.html.hbs deleted file mode 100644 index e8ecf62c14..0000000000 --- a/share/mrdocs/addons/generator/html/partials/signature/alias.html.hbs +++ /dev/null @@ -1 +0,0 @@ -namespace {{symbol.name}} = {{>types/name-info symbol.aliasedSymbol}} diff --git a/share/mrdocs/addons/generator/html/partials/signature/concept.html.hbs b/share/mrdocs/addons/generator/html/partials/signature/concept.html.hbs deleted file mode 100644 index b79a44683a..0000000000 --- a/share/mrdocs/addons/generator/html/partials/signature/concept.html.hbs +++ /dev/null @@ -1,3 +0,0 @@ -{{>types/template-head symbol.template}} - -concept {{>types/declarator-id symbol}} = {{symbol.constraint}} \ No newline at end of file diff --git a/share/mrdocs/addons/generator/html/partials/signature/enum.html.hbs b/share/mrdocs/addons/generator/html/partials/signature/enum.html.hbs deleted file mode 100644 index c37e4873ba..0000000000 --- a/share/mrdocs/addons/generator/html/partials/signature/enum.html.hbs +++ /dev/null @@ -1,2 +0,0 @@ -enum {{>types/declarator-id symbol~}} -{{#if symbol.type}} : {{>types/declarator symbol.type}}{{/if}} \ No newline at end of file diff --git a/share/mrdocs/addons/generator/html/partials/signature/enumerator.html.hbs b/share/mrdocs/addons/generator/html/partials/signature/enumerator.html.hbs deleted file mode 100644 index e223c917b9..0000000000 --- a/share/mrdocs/addons/generator/html/partials/signature/enumerator.html.hbs +++ /dev/null @@ -1 +0,0 @@ -{{symbol.name}}{{#if symbol.initializer}} = {{symbol.initializer}}{{~/if}} \ No newline at end of file diff --git a/share/mrdocs/addons/generator/html/partials/signature/field.html.hbs b/share/mrdocs/addons/generator/html/partials/signature/field.html.hbs deleted file mode 100644 index fc3b6f7bfb..0000000000 --- a/share/mrdocs/addons/generator/html/partials/signature/field.html.hbs +++ /dev/null @@ -1,6 +0,0 @@ -{{#if symbol.isMutable}}mutable -{{/if~}} -{{>types/declarator-before symbol.type}} {{>types/declarator-id symbol~}} -{{#if symbol.isBitfield}} : {{symbol.bitfieldWidth}}{{/if~}} -{{#if symbol.default}} = {{symbol.default}}{{/if~}} -{{>types/declarator-after symbol.type}} \ No newline at end of file diff --git a/share/mrdocs/addons/generator/html/partials/signature/friend.html.hbs b/share/mrdocs/addons/generator/html/partials/signature/friend.html.hbs deleted file mode 100644 index e7a92fc675..0000000000 --- a/share/mrdocs/addons/generator/html/partials/signature/friend.html.hbs +++ /dev/null @@ -1,5 +0,0 @@ -{{#if symbol.type~}} -friend {{>types/declarator symbol.type~}} -{{else if symbol.symbol~}} -{{> (concat 'signature' '/' (lookup . 'symbol.symbol.kind')) symbol=symbol.symbol isFriend=true~}} -{{/if}} \ No newline at end of file diff --git a/share/mrdocs/addons/generator/html/partials/signature/function.html.hbs b/share/mrdocs/addons/generator/html/partials/signature/function.html.hbs deleted file mode 100644 index ea262af312..0000000000 --- a/share/mrdocs/addons/generator/html/partials/signature/function.html.hbs +++ /dev/null @@ -1,28 +0,0 @@ -{{#if symbol.template}}{{>types/template-head symbol.template}} -{{/if~}} -{{#if isFriend}}friend -{{/if~}} -{{#if symbol.constexprKind}}{{symbol.constexprKind}} -{{/if~}} -{{#if symbol.storageClass}}{{symbol.storageClass}} -{{/if~}} -{{#if symbol.isVirtual}}virtual -{{/if~}} -{{#if (eq symbol.class "normal")}}{{>types/declarator-before symbol.return}} -{{/if~}} -{{>types/declarator-id symbol link=symbol.template.primary}} -({{#if symbol.isExplicitObjectMemberFunction}}this {{/if}}{{#each symbol.params}}{{#unless (and @first @last)}} - {{/unless}}{{>types/declarator type decl-name=name~}} - {{#if default}} = {{default}}{{/if~}} - {{#unless @last}},{{/unless~}} -{{/each~}}) -{{~#if symbol.isConst}} const{{/if~}} -{{#if symbol.isVolatile}} volatile{{/if~}} -{{#if symbol.refQualifier}} {{symbol.refQualifier}}{{/if~}} -{{#if symbol.exceptionSpec}} {{symbol.exceptionSpec}}{{/if~}} -{{#if (eq symbol.class "normal")}}{{>types/declarator-after symbol.return}}{{/if~}} -{{#if symbol.hasOverrideAttr}} override{{/if~}} -{{#if symbol.isFinal}} final{{/if~}} -{{#if symbol.isPure}} = 0{{/if~}} -{{#if symbol.isDeleted}} = delete{{/if~}} -{{#if symbol.isDefaulted}} = default{{/if}} \ No newline at end of file diff --git a/share/mrdocs/addons/generator/html/partials/signature/guide.html.hbs b/share/mrdocs/addons/generator/html/partials/signature/guide.html.hbs deleted file mode 100644 index 6a594ff10a..0000000000 --- a/share/mrdocs/addons/generator/html/partials/signature/guide.html.hbs +++ /dev/null @@ -1,8 +0,0 @@ -{{#if symbol.template}}{{>types/template-head symbol.template}} -{{/if~}} -{{>types/declarator-id symbol}} -({{#each symbol.params}}{{#unless (and @first @last)}} - {{/unless}}{{>types/declarator type decl-name=name~}} - {{#if default}} = {{default}}{{/if~}} - {{#unless @last}},{{/unless~}} -{{/each~}}) -> {{>types/declarator symbol.deduced}} \ No newline at end of file diff --git a/share/mrdocs/addons/generator/html/partials/signature/namespace.html.hbs b/share/mrdocs/addons/generator/html/partials/signature/namespace.html.hbs deleted file mode 100644 index a58affd9fa..0000000000 --- a/share/mrdocs/addons/generator/html/partials/signature/namespace.html.hbs +++ /dev/null @@ -1 +0,0 @@ -{{!-- namespace --}} \ No newline at end of file diff --git a/share/mrdocs/addons/generator/html/partials/signature/record.html.hbs b/share/mrdocs/addons/generator/html/partials/signature/record.html.hbs deleted file mode 100644 index 17b91fc509..0000000000 --- a/share/mrdocs/addons/generator/html/partials/signature/record.html.hbs +++ /dev/null @@ -1,15 +0,0 @@ -{{#if symbol.template}}{{>types/template-head symbol.template}} -{{/if~}} -{{#if isFriend}}friend {{/if}}{{symbol.tag}} {{>types/declarator-id symbol link=symbol.template.primary~}} -{{#unless symbol.bases~}} -{{else if isFriend~}} -{{else}} - -{{#each symbol.bases~}} - {{#if @first}} - :{{else}} - ,{{/if~}} - {{#unless (eq access ../symbol.defaultAccess)}} {{access}}{{/unless~}} - {{#if isVirtual}} virtual{{/if}} {{>types/declarator type~}} -{{/each~}} -{{/unless}} \ No newline at end of file diff --git a/share/mrdocs/addons/generator/html/partials/signature/specialization.html.hbs b/share/mrdocs/addons/generator/html/partials/signature/specialization.html.hbs deleted file mode 100644 index f94caae567..0000000000 --- a/share/mrdocs/addons/generator/html/partials/signature/specialization.html.hbs +++ /dev/null @@ -1 +0,0 @@ -{{!-- specialization --}} \ No newline at end of file diff --git a/share/mrdocs/addons/generator/html/partials/signature/typedef.html.hbs b/share/mrdocs/addons/generator/html/partials/signature/typedef.html.hbs deleted file mode 100644 index 7b46b9078d..0000000000 --- a/share/mrdocs/addons/generator/html/partials/signature/typedef.html.hbs +++ /dev/null @@ -1,7 +0,0 @@ -{{#if symbol.isUsing~}} - {{#if symbol.template}}{{>types/template-head symbol.template}} - {{/if~}} - using {{symbol.name}} = {{>types/declarator symbol.type}} -{{~else~}} - typedef {{>types/declarator symbol.type decl-name=symbol.name}} -{{~/if}} \ No newline at end of file diff --git a/share/mrdocs/addons/generator/html/partials/signature/undefined.html.hbs b/share/mrdocs/addons/generator/html/partials/signature/undefined.html.hbs deleted file mode 100644 index c1fbd0783e..0000000000 --- a/share/mrdocs/addons/generator/html/partials/signature/undefined.html.hbs +++ /dev/null @@ -1 +0,0 @@ -{{!-- undefined --}} \ No newline at end of file diff --git a/share/mrdocs/addons/generator/html/partials/signature/using.html.hbs b/share/mrdocs/addons/generator/html/partials/signature/using.html.hbs deleted file mode 100644 index 11d306b620..0000000000 --- a/share/mrdocs/addons/generator/html/partials/signature/using.html.hbs +++ /dev/null @@ -1,5 +0,0 @@ -{{#if (eq symbol.class "namespace")}} -using namespace {{#if symbol.qualifier}}{{>types/name-info symbol.qualifier}}::{{/if}}{{symbol.name}} -{{else}} -using {{#if (eq symbol.class "typename")}}typename {{/if}}{{#if (eq symbol.class "enum")}}enum {{/if}}{{#if symbol.qualifier}}{{>types/name-info symbol.qualifier}}::{{/if}}{{symbol.name}} -{{/if}} diff --git a/share/mrdocs/addons/generator/html/partials/signature/variable.html.hbs b/share/mrdocs/addons/generator/html/partials/signature/variable.html.hbs deleted file mode 100644 index 1fbe6f4ece..0000000000 --- a/share/mrdocs/addons/generator/html/partials/signature/variable.html.hbs +++ /dev/null @@ -1,11 +0,0 @@ -{{#if symbol.template}}{{>types/template-head symbol.template}} -{{/if~}} -{{#if symbol.constexprKind}}{{symbol.constexprKind}} -{{/if~}} -{{#if symbol.storageClass}}{{symbol.storageClass}} -{{/if~}} -{{#if symbol.isThreadLocal}}thread_local -{{/if~}} -{{>types/declarator-before symbol.type}} {{>types/declarator-id symbol link=symbol.template.primary~}} -{{>types/declarator-after symbol.type~}} -{{#if symbol.initializer}} = {{symbol.initializer}}{{/if}} \ No newline at end of file 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 2a4af74f29..74596e1cd4 100644 --- a/share/mrdocs/addons/generator/html/partials/symbols/alias.html.hbs +++ b/share/mrdocs/addons/generator/html/partials/symbols/alias.html.hbs @@ -12,7 +12,7 @@ 
-            {{>signature/alias symbol=symbol}};
+            {{> signature }};
{{#if symbol.doc.description}} 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 c66c717f97..1b19386a21 100644 --- a/share/mrdocs/addons/generator/html/partials/symbols/concept.html.hbs +++ b/share/mrdocs/addons/generator/html/partials/symbols/concept.html.hbs @@ -12,7 +12,7 @@ 
-            {{>signature/concept symbol=symbol}};
+            {{> signature }};
{{#if symbol.doc.description}} 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 76661f9866..c3c4ad8373 100644 --- a/share/mrdocs/addons/generator/html/partials/symbols/enum.html.hbs +++ b/share/mrdocs/addons/generator/html/partials/symbols/enum.html.hbs @@ -13,7 +13,7 @@ 
-            {{>signature/enum symbol=symbol}};
+            {{> signature }};
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 ed28a9cc1d..8d4c66ef7c 100644 --- a/share/mrdocs/addons/generator/html/partials/symbols/enumerator.html.hbs +++ b/share/mrdocs/addons/generator/html/partials/symbols/enumerator.html.hbs @@ -13,7 +13,7 @@ 
-            {{>signature/enumerator symbol=symbol}}
+            {{> signature }}
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 739b820190..6ad25419fe 100644 --- a/share/mrdocs/addons/generator/html/partials/symbols/field.html.hbs +++ b/share/mrdocs/addons/generator/html/partials/symbols/field.html.hbs @@ -13,7 +13,7 @@ 
-            {{>signature/field symbol=symbol}};
+            {{> signature }};
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 029d0d12ce..08ab1aed6c 100644 --- a/share/mrdocs/addons/generator/html/partials/symbols/friend.html.hbs +++ b/share/mrdocs/addons/generator/html/partials/symbols/friend.html.hbs @@ -13,7 +13,7 @@ 
-            {{>signature/friend symbol=symbol}};
+            {{> signature }};
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 682824c86f..87c49f910b 100644 --- a/share/mrdocs/addons/generator/html/partials/symbols/function.html.hbs +++ b/share/mrdocs/addons/generator/html/partials/symbols/function.html.hbs @@ -13,7 +13,7 @@ 
-            {{>signature/function symbol=symbol}};
+            {{> signature }};
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 9826a669b1..e98aa2adef 100644 --- a/share/mrdocs/addons/generator/html/partials/symbols/guide.html.hbs +++ b/share/mrdocs/addons/generator/html/partials/symbols/guide.html.hbs @@ -13,7 +13,7 @@ 
-            {{>signature/guide symbol=symbol}};
+            {{> signature }};
diff --git a/share/mrdocs/addons/generator/html/partials/symbols/overloads.html.hbs b/share/mrdocs/addons/generator/html/partials/symbols/overloads.html.hbs index d93852e01a..5277447ebc 100644 --- a/share/mrdocs/addons/generator/html/partials/symbols/overloads.html.hbs +++ b/share/mrdocs/addons/generator/html/partials/symbols/overloads.html.hbs @@ -9,7 +9,7 @@

{{{member.doc.brief}}}

-
{{> (concat 'signature' '/' (lookup member 'kind')) symbol=member}};
+
{{> signature symbol=member }};
» more... {{/each}} 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 effd6a64e6..3571399e72 100644 --- a/share/mrdocs/addons/generator/html/partials/symbols/record.html.hbs +++ b/share/mrdocs/addons/generator/html/partials/symbols/record.html.hbs @@ -13,7 +13,7 @@ 
-            {{>signature/record symbol=symbol}};
+            {{> signature }};
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 51567149e8..eebdfb6384 100644 --- a/share/mrdocs/addons/generator/html/partials/symbols/typedef.html.hbs +++ b/share/mrdocs/addons/generator/html/partials/symbols/typedef.html.hbs @@ -13,7 +13,7 @@ 
-            {{>signature/typedef symbol=symbol}};
+            {{> signature }};
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 a5f9756d96..1c2d9e9884 100644 --- a/share/mrdocs/addons/generator/html/partials/symbols/using.html.hbs +++ b/share/mrdocs/addons/generator/html/partials/symbols/using.html.hbs @@ -13,7 +13,7 @@ 
-            {{>signature/using symbol=symbol}};
+            {{> signature }};
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 0d68f9f086..a2d01019d6 100644 --- a/share/mrdocs/addons/generator/html/partials/symbols/variable.html.hbs +++ b/share/mrdocs/addons/generator/html/partials/symbols/variable.html.hbs @@ -13,7 +13,7 @@ 
-            {{>signature/variable symbol=symbol}};
+            {{> signature }};
diff --git a/test-files/golden-tests/alias-template.html b/test-files/golden-tests/alias-template.html index f0db6071d6..82dd887093 100644 --- a/test-files/golden-tests/alias-template.html +++ b/test-files/golden-tests/alias-template.html @@ -4,6 +4,7 @@
+

Reference

Global namespace

@@ -71,7 +72,7 @@

Synopsis

-            template
+            template<typename T>
 struct A;
@@ -99,9 +100,9 @@

Synopsis

-            template<
+            template<
     typename T,
-    typename U>
+    typename U>
 struct B;
@@ -129,8 +130,8 @@

Synopsis

-            template
-using C = A;
+            template<typename T>
+using C = A<T>;
@@ -153,7 +154,7 @@

Synopsis

-            template
+            template<typename T>
 struct D;
@@ -202,8 +203,8 @@

Synopsis

-            template
-using E = B;
+            template<typename U>
+using E = B<T, U>;
diff --git a/test-files/golden-tests/attributes_1.html b/test-files/golden-tests/attributes_1.html index 4a48ec04ff..13479e4d78 100644 --- a/test-files/golden-tests/attributes_1.html +++ b/test-files/golden-tests/attributes_1.html @@ -4,6 +4,7 @@
+

Reference

Global namespace

diff --git a/test-files/golden-tests/brief-1.html b/test-files/golden-tests/brief-1.html index 42d51623c5..cc5d81c13e 100644 --- a/test-files/golden-tests/brief-1.html +++ b/test-files/golden-tests/brief-1.html @@ -4,6 +4,7 @@
+

Reference

Global namespace

diff --git a/test-files/golden-tests/brief-2.html b/test-files/golden-tests/brief-2.html index 3cd0fe8090..e242661bdc 100644 --- a/test-files/golden-tests/brief-2.html +++ b/test-files/golden-tests/brief-2.html @@ -4,6 +4,7 @@
+

Reference

Global namespace

diff --git a/test-files/golden-tests/canonical_1.html b/test-files/golden-tests/canonical_1.html index b0f885aefd..86bd394a93 100644 --- a/test-files/golden-tests/canonical_1.html +++ b/test-files/golden-tests/canonical_1.html @@ -4,6 +4,7 @@
+

Reference

Global namespace

diff --git a/test-files/golden-tests/class-template-partial-spec.html b/test-files/golden-tests/class-template-partial-spec.html index 22d6898bed..13d3402bf3 100644 --- a/test-files/golden-tests/class-template-partial-spec.html +++ b/test-files/golden-tests/class-template-partial-spec.html @@ -4,6 +4,7 @@
+

Reference

Global namespace

@@ -50,7 +51,7 @@

Synopsis

-            template
+            template<typename T>
 struct A;
@@ -76,14 +77,14 @@

Types

- B + B<U*, T> - B + B<T, long> @@ -113,9 +114,9 @@

Synopsis

-            template<
+            template<
     typename U,
-    typename V>
+    typename V>
 struct B;
@@ -143,8 +144,8 @@

Synopsis

-            template
-struct B;
+            template<typename U>
+struct B<U*, T>;
@@ -171,8 +172,8 @@

Synopsis

-            template<>
-struct B;
+            template<>
+struct B<T, long>;
diff --git a/test-files/golden-tests/class-template-spec.html b/test-files/golden-tests/class-template-spec.html index a7a9e39bbf..cef843cba5 100644 --- a/test-files/golden-tests/class-template-spec.html +++ b/test-files/golden-tests/class-template-spec.html @@ -4,6 +4,7 @@
+

Reference

Global namespace

@@ -29,14 +30,14 @@

Types

- A + A<int> - A + A<long> @@ -50,14 +51,14 @@

Types

- B + B<T*> - B + B<T&> @@ -71,14 +72,14 @@

Types

- C + C<int, int> - C + C<T*, int> @@ -106,7 +107,7 @@

Synopsis

-            template
+            template<typename T>
 struct A;
@@ -182,8 +183,8 @@

Synopsis

-            template<>
-struct A;
+            template<>
+struct A<int>;
@@ -215,7 +216,7 @@

Member Functions

-

Function A::g

+

Function A<int>::g

@@ -258,8 +259,8 @@

Synopsis

-            template<>
-struct A;
+            template<>
+struct A<long>;
@@ -291,7 +292,7 @@

Member Functions

-

Function A::h

+

Function A<long>::h

@@ -334,7 +335,7 @@

Synopsis

-            template
+            template<typename T>
 struct B;
@@ -410,8 +411,8 @@

Synopsis

-            template
-struct B;
+            template<typename T>
+struct B<T*>;
@@ -443,7 +444,7 @@

Member Functions

-

Function B::g

+

Function B<T*>::g

@@ -486,8 +487,8 @@

Synopsis

-            template
-struct B;
+            template<typename T>
+struct B<T&>;
@@ -519,7 +520,7 @@

Member Functions

-

Function B::h

+

Function B<T&>::h

@@ -562,9 +563,9 @@

Synopsis

-            template<
+            template<
     typename T,
-    typename U>
+    typename U>
 struct C;
@@ -640,8 +641,8 @@

Synopsis

-            template<>
-struct C;
+            template<>
+struct C<int, int>;
@@ -673,7 +674,7 @@

Member Functions

-

Function C::g

+

Function C<int, int>::g

@@ -716,8 +717,8 @@

Synopsis

-            template
-struct C;
+            template<typename T>
+struct C<T*, int>;
@@ -749,7 +750,7 @@

Member Functions

-

Function C::h

+

Function C<T*, int>::h

diff --git a/test-files/golden-tests/class-template-specializations-1.html b/test-files/golden-tests/class-template-specializations-1.html index 52fad5d88d..3ee98df582 100644 --- a/test-files/golden-tests/class-template-specializations-1.html +++ b/test-files/golden-tests/class-template-specializations-1.html @@ -4,6 +4,7 @@
+

Reference

Global namespace

@@ -365,21 +366,21 @@

Types

- S0<1, int*> + S0<1, int*> - S0<1, T*> + S0<1, T*> - S0<0> + S0<0> @@ -414,9 +415,9 @@

Synopsis

-            template<
+            template<
     int I,
-    typename T = void>
+    typename T = void>
 struct S0;
@@ -616,9 +617,9 @@

Synopsis

-            template<
+            template<
     int J,
-    typename U = void>
+    typename U = void>
 struct S2;
@@ -797,9 +798,9 @@

Synopsis

-            template<
+            template<
     int K,
-    typename V = void>
+    typename V = void>
 struct S4;
@@ -875,9 +876,9 @@

Synopsis

-            template<
+            template<
     int J,
-    typename U = void>
+    typename U = void>
 struct S5;
@@ -1070,9 +1071,9 @@

Synopsis

-            template<
+            template<
     int K,
-    typename V = void>
+    typename V = void>
 struct S7;
@@ -1251,9 +1252,9 @@

Synopsis

-            template<
+            template<
     int L,
-    typename W = void>
+    typename W = void>
 struct S9;
@@ -1329,8 +1330,8 @@

Synopsis

-            template<>
-struct S0<0>;
+            template<>
+struct S0<0>;
@@ -1357,8 +1358,8 @@

Synopsis

-            template
-struct S0<1, T*>;
+            template<typename T>
+struct S0<1, T*>;
@@ -1385,8 +1386,8 @@

Synopsis

-            template<>
-struct S0<1, int*>;
+            template<>
+struct S0<1, int*>;
@@ -1414,7 +1415,7 @@

Synopsis

             struct R0
-    : S0<-1>;
+    : S0<-1>;
@@ -1491,7 +1492,7 @@

Synopsis

             struct R1
-    : S0<0>;
+    : S0<0>;
@@ -1519,7 +1520,7 @@

Synopsis

             struct R2
-    : S0<1, void*>;
+    : S0<1, void*>;
@@ -1547,7 +1548,7 @@

Synopsis

             struct R3
-    : S0<1, int*>;
+    : S0<1, int*>;
@@ -1575,7 +1576,7 @@

Synopsis

             struct R4
-    : S0<2>::S1;
+    : S0<2>::S1;
@@ -1603,7 +1604,7 @@

Synopsis

             struct R5
-    : S0<3>::S1::S2<-1>;
+    : S0<3>::S1::S2<-1>;
@@ -1631,7 +1632,7 @@

Synopsis

             struct R6
-    : S0<4>::S1::S2<5>;
+    : S0<4>::S1::S2<5>;
@@ -1659,7 +1660,7 @@

Synopsis

             struct R7
-    : S0<6>::S1::S2<7, void*>;
+    : S0<6>::S1::S2<7, void*>;
@@ -1687,7 +1688,7 @@

Synopsis

             struct R8
-    : S0<6>::S1::S2<7, int*>;
+    : S0<6>::S1::S2<7, int*>;
@@ -1715,7 +1716,7 @@

Synopsis

             struct R9
-    : S0<8>::S1::S2<9>::S3;
+    : S0<8>::S1::S2<9>::S3;
@@ -1743,7 +1744,7 @@

Synopsis

             struct R10
-    : S0<10>::S1::S2<11>::S4<-1>;
+    : S0<10>::S1::S2<11>::S4<-1>;
@@ -1771,7 +1772,7 @@

Synopsis

             struct R11
-    : S0<12>::S1::S2<13>::S4<14>;
+    : S0<12>::S1::S2<13>::S4<14>;
@@ -1799,7 +1800,7 @@

Synopsis

             struct R12
-    : S0<15>::S1::S2<16>::S4<17, void*>;
+    : S0<15>::S1::S2<16>::S4<17, void*>;
@@ -1827,7 +1828,7 @@

Synopsis

             struct R13
-    : S0<15>::S1::S2<16>::S4<17, int*>;
+    : S0<15>::S1::S2<16>::S4<17, int*>;
@@ -1855,7 +1856,7 @@

Synopsis

             struct R14
-    : S0<18>::S5<-1>;
+    : S0<18>::S5<-1>;
@@ -1883,7 +1884,7 @@

Synopsis

             struct R15
-    : S0<19>::S5<20>;
+    : S0<19>::S5<20>;
@@ -1911,7 +1912,7 @@

Synopsis

             struct R16
-    : S0<21>::S5<22, void*>;
+    : S0<21>::S5<22, void*>;
@@ -1939,7 +1940,7 @@

Synopsis

             struct R17
-    : S0<21>::S5<22, int*>;
+    : S0<21>::S5<22, int*>;
@@ -1967,7 +1968,7 @@

Synopsis

             struct R18
-    : S0<23>::S5<24>::S6;
+    : S0<23>::S5<24>::S6;
@@ -1995,7 +1996,7 @@

Synopsis

             struct R19
-    : S0<25>::S5<26>::S6::S7<-1>;
+    : S0<25>::S5<26>::S6::S7<-1>;
@@ -2023,7 +2024,7 @@

Synopsis

             struct R20
-    : S0<27>::S5<28>::S6::S7<29, void*>;
+    : S0<27>::S5<28>::S6::S7<29, void*>;
@@ -2051,7 +2052,7 @@

Synopsis

             struct R21
-    : S0<27>::S5<28>::S6::S7<29, int*>;
+    : S0<27>::S5<28>::S6::S7<29, int*>;
@@ -2079,7 +2080,7 @@

Synopsis

             struct R22
-    : S0<30>::S5<31>::S6::S7<32>;
+    : S0<30>::S5<31>::S6::S7<32>;
@@ -2107,7 +2108,7 @@

Synopsis

             struct R23
-    : S0<33>::S5<34>::S6::S7<35>::S8;
+    : S0<33>::S5<34>::S6::S7<35>::S8;
@@ -2135,7 +2136,7 @@

Synopsis

             struct R24
-    : S0<36>::S5<37>::S6::S7<38>::S9<-1>;
+    : S0<36>::S5<37>::S6::S7<38>::S9<-1>;
@@ -2163,7 +2164,7 @@

Synopsis

             struct R25
-    : S0<39>::S5<40>::S6::S7<41>::S9<42, void*>;
+    : S0<39>::S5<40>::S6::S7<41>::S9<42, void*>;
@@ -2191,7 +2192,7 @@

Synopsis

             struct R26
-    : S0<39>::S5<40>::S6::S7<41>::S9<42, int*>;
+    : S0<39>::S5<40>::S6::S7<41>::S9<42, int*>;
@@ -2219,7 +2220,7 @@

Synopsis

             struct R27
-    : S0<43>::S5<44>::S6::S7<45>::S9<46>;
+    : S0<43>::S5<44>::S6::S7<45>::S9<46>;
@@ -2247,7 +2248,7 @@

Synopsis

             struct R28
-    : S0<0, bool>;
+    : S0<0, bool>;
@@ -2324,7 +2325,7 @@

Synopsis

             struct R29
-    : S0<1, int>;
+    : S0<1, int>;
@@ -2401,7 +2402,7 @@

Synopsis

             struct R30
-    : S0<2, bool>::S1;
+    : S0<2, bool>::S1;
@@ -2470,11 +2471,11 @@

Synopsis

-            template<
+            template<
     int I,
-    typename T>
+    typename T>
 struct R31
-    : S0<3, bool>::S1::S2;
+    : S0<3, bool>::S1::S2<I, T>;
@@ -2551,7 +2552,7 @@

Synopsis

             struct R32
-    : S0<4, bool>::S1::S2<5, bool>;
+    : S0<4, bool>::S1::S2<5, bool>;
@@ -2628,7 +2629,7 @@

Synopsis

             struct R33
-    : S0<6, bool>::S1::S2<7, int>;
+    : S0<6, bool>::S1::S2<7, int>;
@@ -2705,7 +2706,7 @@

Synopsis

             struct R34
-    : S0<8, bool>::S1::S2<9, bool>::S3;
+    : S0<8, bool>::S1::S2<9, bool>::S3;
@@ -2753,11 +2754,11 @@

Synopsis

-            template<
+            template<
     int I,
-    typename T>
+    typename T>
 struct R35
-    : S0<10, bool>::S1::S2<11, bool>::S4;
+    : S0<10, bool>::S1::S2<11, bool>::S4<I, T>;
@@ -2806,7 +2807,7 @@

Synopsis

             struct R36
-    : S0<12, bool>::S1::S2<13, bool>::S4<14, bool>;
+    : S0<12, bool>::S1::S2<13, bool>::S4<14, bool>;
@@ -2855,7 +2856,7 @@

Synopsis

             struct R37
-    : S0<15, bool>::S1::S2<16, bool>::S4<17, int>;
+    : S0<15, bool>::S1::S2<16, bool>::S4<17, int>;
@@ -2903,11 +2904,11 @@

Synopsis

-            template<
+            template<
     int I,
-    typename T>
+    typename T>
 struct R38
-    : S0<18, bool>::S5;
+    : S0<18, bool>::S5<I, T>;
@@ -2977,7 +2978,7 @@

Synopsis

             struct R39
-    : S0<19, bool>::S5<20, bool>;
+    : S0<19, bool>::S5<20, bool>;
@@ -3047,7 +3048,7 @@

Synopsis

             struct R40
-    : S0<21, bool>::S5<22, int>;
+    : S0<21, bool>::S5<22, int>;
@@ -3117,7 +3118,7 @@

Synopsis

             struct R41
-    : S0<23, bool>::S5<24, bool>::S6;
+    : S0<23, bool>::S5<24, bool>::S6;
@@ -3186,11 +3187,11 @@

Synopsis

-            template<
+            template<
     int I,
-    typename T>
+    typename T>
 struct R42
-    : S0<25, bool>::S5<26, bool>::S6::S7;
+    : S0<25, bool>::S5<26, bool>::S6::S7<I, T>;
@@ -3267,7 +3268,7 @@

Synopsis

             struct R43
-    : S0<27, bool>::S5<28, bool>::S6::S7<29, int>;
+    : S0<27, bool>::S5<28, bool>::S6::S7<29, int>;
@@ -3344,7 +3345,7 @@

Synopsis

             struct R44
-    : S0<30, bool>::S5<31, bool>::S6::S7<32, bool>;
+    : S0<30, bool>::S5<31, bool>::S6::S7<32, bool>;
@@ -3421,7 +3422,7 @@

Synopsis

             struct R45
-    : S0<33, bool>::S5<34, bool>::S6::S7<35, bool>::S8;
+    : S0<33, bool>::S5<34, bool>::S6::S7<35, bool>::S8;
@@ -3469,11 +3470,11 @@

Synopsis

-            template<
+            template<
     int I,
-    typename T>
+    typename T>
 struct R46
-    : S0<36, bool>::S5<37, bool>::S6::S7<38, bool>::S9;
+    : S0<36, bool>::S5<37, bool>::S6::S7<38, bool>::S9<I, T>;
@@ -3522,7 +3523,7 @@

Synopsis

             struct R47
-    : S0<39, bool>::S5<40, bool>::S6::S7<41, bool>::S9<42, int>;
+    : S0<39, bool>::S5<40, bool>::S6::S7<41, bool>::S9<42, int>;
@@ -3571,7 +3572,7 @@

Synopsis

             struct R48
-    : S0<43, bool>::S5<44, bool>::S6::S7<45, bool>::S9<46, bool>;
+    : S0<43, bool>::S5<44, bool>::S6::S7<45, bool>::S9<46, bool>;
diff --git a/test-files/golden-tests/class-template-specializations-2.html b/test-files/golden-tests/class-template-specializations-2.html index 8a2df23191..35d4d2bb0b 100644 --- a/test-files/golden-tests/class-template-specializations-2.html +++ b/test-files/golden-tests/class-template-specializations-2.html @@ -4,6 +4,7 @@
+

Reference

Global namespace

@@ -29,14 +30,14 @@

Types

- A + A<T*> - A + A<double> @@ -64,7 +65,7 @@

Synopsis

-            template
+            template<typename T>
 struct A;
@@ -92,8 +93,8 @@

Synopsis

-            template
-struct A;
+            template<typename T>
+struct A<T*>;
@@ -118,14 +119,14 @@

Types

- B + B<U*> - B + B<int> @@ -139,7 +140,7 @@

Types

-

Class A::B

+

Class A<T*>::B

@@ -155,7 +156,7 @@

Synopsis

-            template
+            template<typename U>
 struct B;
@@ -167,7 +168,7 @@

Synopsis

-

Class A::B

+

Class A<T*>::B

@@ -183,8 +184,8 @@

Synopsis

-            template
-struct B;
+            template<typename U>
+struct B<U*>;
@@ -216,7 +217,7 @@

Types

-

Class A::B::C

+

Class A<T*>::B<U*>::C

@@ -243,7 +244,7 @@

Synopsis

-

Class A::B

+

Class A<T*>::B

@@ -259,8 +260,8 @@

Synopsis

-            template<>
-struct B;
+            template<>
+struct B<int>;
@@ -287,8 +288,8 @@

Synopsis

-            template<>
-struct A;
+            template<>
+struct A<double>;
@@ -313,7 +314,7 @@

Types

- D + D<float> @@ -327,7 +328,7 @@

Types

-

Class A::D

+

Class A<double>::D

@@ -343,7 +344,7 @@

Synopsis

-            template
+            template<typename U>
 struct D;
@@ -369,7 +370,7 @@

Types

- E + E<T*> @@ -383,7 +384,7 @@

Types

-

Class A::D::E

+

Class A<double>::D::E

@@ -399,7 +400,7 @@

Synopsis

-            template
+            template<typename T>
 struct E;
@@ -411,7 +412,7 @@

Synopsis

-

Class A::D::E

+

Class A<double>::D::E

@@ -427,8 +428,8 @@

Synopsis

-            template
-struct E;
+            template<typename T>
+struct E<T*>;
@@ -460,7 +461,7 @@

Types

-

Class A::D::E::F

+

Class A<double>::D::E<T*>::F

@@ -487,7 +488,7 @@

Synopsis

-

Class A::D

+

Class A<double>::D

@@ -503,8 +504,8 @@

Synopsis

-            template<>
-struct D;
+            template<>
+struct D<float>;
@@ -529,7 +530,7 @@

Types

- G + G<T*> @@ -543,7 +544,7 @@

Types

-

Class A::D::G

+

Class A<double>::D<float>::G

@@ -559,7 +560,7 @@

Synopsis

-            template
+            template<typename T>
 struct G;
@@ -571,7 +572,7 @@

Synopsis

-

Class A::D::G

+

Class A<double>::D<float>::G

@@ -587,8 +588,8 @@

Synopsis

-            template
-struct G;
+            template<typename T>
+struct G<T*>;
diff --git a/test-files/golden-tests/class-template-specializations-3.html b/test-files/golden-tests/class-template-specializations-3.html index 4f3808aa70..edd9bb243e 100644 --- a/test-files/golden-tests/class-template-specializations-3.html +++ b/test-files/golden-tests/class-template-specializations-3.html @@ -4,6 +4,7 @@
+

Reference

Global namespace

@@ -57,7 +58,7 @@

Synopsis

-            template
+            template<typename T>
 struct A;
@@ -83,7 +84,7 @@

Types

- B + B<double> @@ -113,7 +114,7 @@

Synopsis

-            template
+            template<typename U>
 struct B;
@@ -146,7 +147,7 @@

Types

- D + D<bool> @@ -203,7 +204,7 @@

Synopsis

-            template
+            template<typename V>
 struct D;
@@ -231,8 +232,8 @@

Synopsis

-            template<>
-struct D;
+            template<>
+struct D<bool>;
@@ -259,8 +260,8 @@

Synopsis

-            template<>
-struct B;
+            template<>
+struct B<double>;
@@ -292,7 +293,7 @@

Types

- D + D<bool> @@ -306,7 +307,7 @@

Types

-

Class A::B::C

+

Class A::B<double>::C

@@ -333,7 +334,7 @@

Synopsis

-

Class A::B::D

+

Class A::B<double>::D

@@ -349,7 +350,7 @@

Synopsis

-            template
+            template<typename V>
 struct D;
@@ -361,7 +362,7 @@

Synopsis

-

Class A::B::D

+

Class A::B<double>::D

@@ -377,8 +378,8 @@

Synopsis

-            template<>
-struct D;
+            template<>
+struct D<bool>;
@@ -551,7 +552,7 @@

Synopsis

-            A::B m0;
+            A<float>::B<double> m0;
@@ -574,7 +575,7 @@

Synopsis

-            A::B m1;
+            A<long>::B<double> m1;
@@ -597,7 +598,7 @@

Synopsis

-            A::B m2;
+            A<long>::B<float> m2;
@@ -620,7 +621,7 @@

Synopsis

-            A::B m3;
+            A<unsigned int>::B<float> m3;
@@ -643,7 +644,7 @@

Synopsis

-            A::B m4;
+            A<short>::B<void> m4;
@@ -666,7 +667,7 @@

Synopsis

-            A::B::C m5;
+            A<float>::B<double>::C m5;
@@ -689,7 +690,7 @@

Synopsis

-            A::B::C m6;
+            A<long>::B<double>::C m6;
@@ -712,7 +713,7 @@

Synopsis

-            A::B::C m7;
+            A<long>::B<float>::C m7;
@@ -735,7 +736,7 @@

Synopsis

-            A::B::C m8;
+            A<unsigned int>::B<float>::C m8;
@@ -758,7 +759,7 @@

Synopsis

-            A::B::C m9;
+            A<short>::B<void>::C m9;
@@ -781,7 +782,7 @@

Synopsis

-            A::B::D m10;
+            A<float>::B<double>::D<bool> m10;
@@ -804,7 +805,7 @@

Synopsis

-            A::B::D m11;
+            A<long>::B<double>::D<bool> m11;
@@ -827,7 +828,7 @@

Synopsis

-            A::B::D m12;
+            A<long>::B<float>::D<bool> m12;
@@ -850,7 +851,7 @@

Synopsis

-            A::B::D m13;
+            A<unsigned int>::B<float>::D<bool> m13;
@@ -873,7 +874,7 @@

Synopsis

-            A::B::D m14;
+            A<short>::B<void>::D<bool> m14;
diff --git a/test-files/golden-tests/class-template.html b/test-files/golden-tests/class-template.html index 798fb3f85e..82e7785164 100644 --- a/test-files/golden-tests/class-template.html +++ b/test-files/golden-tests/class-template.html @@ -4,6 +4,7 @@
+

Reference

Global namespace

@@ -105,7 +106,7 @@

Synopsis

-            template
+            template<typename T>
 struct C0;
@@ -421,7 +422,7 @@

Synopsis

-            template
+            template<typename T>
 struct N1;
@@ -553,7 +554,7 @@

Synopsis

-            template
+            template<typename T>
 struct C2;
@@ -646,7 +647,7 @@

Synopsis

-            template
+            template<typename U>
 struct N2;
@@ -808,7 +809,7 @@

Synopsis

-            template
+            template<typename T>
 struct C3;
diff --git a/test-files/golden-tests/commands.html b/test-files/golden-tests/commands.html index 9ee4d72c00..0c7952be96 100644 --- a/test-files/golden-tests/commands.html +++ b/test-files/golden-tests/commands.html @@ -4,6 +4,7 @@
+

Reference

Global namespace

diff --git a/test-files/golden-tests/concept.html b/test-files/golden-tests/concept.html index f4a6a1ed91..e80890f4f5 100644 --- a/test-files/golden-tests/concept.html +++ b/test-files/golden-tests/concept.html @@ -4,6 +4,7 @@
+

Reference

Global namespace

@@ -91,7 +92,7 @@

Synopsis

-            template
+            template<typename T>
 concept C = sizeof(T) == sizeof(int);
@@ -114,7 +115,7 @@

Synopsis

-            template<C T>
+            template<C T>
 void
 f();
diff --git a/test-files/golden-tests/dependency-propagation.html b/test-files/golden-tests/dependency-propagation.html index 5d3de56be9..b6adfcf689 100644 --- a/test-files/golden-tests/dependency-propagation.html +++ b/test-files/golden-tests/dependency-propagation.html @@ -4,6 +4,7 @@
+

Reference

Global namespace

@@ -72,7 +73,7 @@

Synopsis

             struct E
-    : N::C;
+    : N::C<int>;
@@ -141,8 +142,8 @@

Synopsis

-            template
-using C = B;
+            template<typename T>
+using C = B<T>;
@@ -165,8 +166,8 @@

Synopsis

-            template
-using B = A;
+            template<typename T>
+using B = A<T>;
@@ -189,7 +190,7 @@

Synopsis

-            template
+            template<typename T>
 struct A;
diff --git a/test-files/golden-tests/duplicate-jdoc.html b/test-files/golden-tests/duplicate-jdoc.html index 8f9f3023b6..3184f3229f 100644 --- a/test-files/golden-tests/duplicate-jdoc.html +++ b/test-files/golden-tests/duplicate-jdoc.html @@ -4,6 +4,7 @@
+

Reference

Global namespace

@@ -257,7 +258,7 @@

Synopsis

-            template
+            template<typename T>
 void
 h0();
@@ -287,7 +288,7 @@

Synopsis

-            template
+            template<typename T>
 void
 h1();
diff --git a/test-files/golden-tests/empty.html b/test-files/golden-tests/empty.html index 3d21a50bd2..06834ab56d 100644 --- a/test-files/golden-tests/empty.html +++ b/test-files/golden-tests/empty.html @@ -4,6 +4,7 @@
+

Reference

Global namespace

diff --git a/test-files/golden-tests/enum.html b/test-files/golden-tests/enum.html index 39ff516708..fa51ee9222 100644 --- a/test-files/golden-tests/enum.html +++ b/test-files/golden-tests/enum.html @@ -4,6 +4,7 @@
+

Reference

Global namespace

diff --git a/test-files/golden-tests/explicit-conv-operator.html b/test-files/golden-tests/explicit-conv-operator.html index 23d0569d5e..db62b72272 100644 --- a/test-files/golden-tests/explicit-conv-operator.html +++ b/test-files/golden-tests/explicit-conv-operator.html @@ -4,6 +4,7 @@
+

Reference

Global namespace

@@ -119,7 +120,8 @@

Synopsis

-            operator bool();
+            explicit
+operator bool();
@@ -193,7 +195,8 @@

Synopsis

-            operator bool();
+            explicit(false)
+operator bool();
@@ -267,7 +270,8 @@

Synopsis

-            operator bool();
+            explicit(true)
+operator bool();
@@ -293,7 +297,7 @@

Synopsis

-            template
+            template<bool B>
 struct ExplicitExpression;
@@ -342,7 +346,8 @@

Synopsis

-            operator bool();
+            explicit(B)
+operator bool();
diff --git a/test-files/golden-tests/explicit-ctor.html b/test-files/golden-tests/explicit-ctor.html index 3cd6115762..4d1dd4ccab 100644 --- a/test-files/golden-tests/explicit-ctor.html +++ b/test-files/golden-tests/explicit-ctor.html @@ -4,6 +4,7 @@
+

Reference

Global namespace

@@ -111,25 +112,29 @@

Members

-
Explicit();
+
explicit
+Explicit();
» more...

-
Explicit(Explicit const&);
+
explicit
+Explicit(Explicit const&);
» more...

-
Explicit(Explicit&&) noexcept;
+
explicit
+Explicit(Explicit&&) noexcept;
» more...

-
Explicit(
+
explicit
+Explicit(
     int,
     int);

 » more...
@@ -154,7 +159,8 @@ 
Synopsis

             
         
-            Explicit();
+            explicit
+Explicit();
@@ -180,7 +186,8 @@

Synopsis

-            Explicit(Explicit const&);
+            explicit
+Explicit(Explicit const&);
@@ -206,7 +213,8 @@

Synopsis

-            Explicit(Explicit&&) noexcept;
+            explicit
+Explicit(Explicit&&) noexcept;
@@ -232,7 +240,8 @@

Synopsis

-            Explicit(
+            explicit
+Explicit(
     int,
     int);
@@ -300,25 +309,29 @@

Members

-
ExplicitTrue();
+
explicit(true)
+ExplicitTrue();
» more...

-
ExplicitTrue(ExplicitTrue const&);
+
explicit(true)
+ExplicitTrue(ExplicitTrue const&);
» more...

-
ExplicitTrue(ExplicitTrue&&) noexcept;
+
explicit(true)
+ExplicitTrue(ExplicitTrue&&) noexcept;
» more...

-
ExplicitTrue(
+
explicit(true)
+ExplicitTrue(
     int,
     int);

 » more...
@@ -343,7 +356,8 @@ 
Synopsis

             
         
         
-            ExplicitTrue();
+            explicit(true)
+ExplicitTrue();
         

     
 
@@ -369,7 +383,8 @@ 
Synopsis

             
         
         
-            ExplicitTrue(ExplicitTrue const&);
+            explicit(true)
+ExplicitTrue(ExplicitTrue const&);
         

     
 
@@ -395,7 +410,8 @@ 
Synopsis

             
         
         
-            ExplicitTrue(ExplicitTrue&&) noexcept;
+            explicit(true)
+ExplicitTrue(ExplicitTrue&&) noexcept;
         

     
 
@@ -421,7 +437,8 @@ 
Synopsis

             
         
         
-            ExplicitTrue(
+            explicit(true)
+ExplicitTrue(
     int,
     int);
         

@@ -489,25 +506,29 @@ 
Members

 
 

 
-
ExplicitFalse();

+
explicit(false)
+ExplicitFalse();

 » more...
 
 
 

 
-
ExplicitFalse(ExplicitFalse const&);

+
explicit(false)
+ExplicitFalse(ExplicitFalse const&);

 » more...
 
 
 

 
-
ExplicitFalse(ExplicitFalse&&) noexcept;

+
explicit(false)
+ExplicitFalse(ExplicitFalse&&) noexcept;

 » more...
 
 
 

 
-
ExplicitFalse(
+
explicit(false)
+ExplicitFalse(
     int,
     int);

 » more...
@@ -532,7 +553,8 @@ 
Synopsis

             
         
         
-            ExplicitFalse();
+            explicit(false)
+ExplicitFalse();
         

     
 
@@ -558,7 +580,8 @@ 
Synopsis

             
         
         
-            ExplicitFalse(ExplicitFalse const&);
+            explicit(false)
+ExplicitFalse(ExplicitFalse const&);
         

     
 
@@ -584,7 +607,8 @@ 
Synopsis

             
         
         
-            ExplicitFalse(ExplicitFalse&&) noexcept;
+            explicit(false)
+ExplicitFalse(ExplicitFalse&&) noexcept;
         

     
 
@@ -610,7 +634,8 @@ 
Synopsis

             
         
         
-            ExplicitFalse(
+            explicit(false)
+ExplicitFalse(
     int,
     int);
         

@@ -638,7 +663,7 @@ 
Synopsis

             
         
         
-            template
+            template<bool B>
 struct ExplicitExpression;
         

     
@@ -679,25 +704,29 @@ 
Members

 
 

 
-
ExplicitExpression();

+
explicit(B)
+ExplicitExpression();

 » more...
 
 
 

 
-
ExplicitExpression(ExplicitExpression const&);

+
explicit(B)
+ExplicitExpression(ExplicitExpression const&);

 » more...
 
 
 

 
-
ExplicitExpression(ExplicitExpression&&) noexcept;

+
explicit(B)
+ExplicitExpression(ExplicitExpression&&) noexcept;

 » more...
 
 
 

 
-
ExplicitExpression(
+
explicit(B)
+ExplicitExpression(
     int,
     int);

 » more...
@@ -722,7 +751,8 @@ 
Synopsis

             
         
         
-            ExplicitExpression();
+            explicit(B)
+ExplicitExpression();
         

     
 
@@ -748,7 +778,8 @@ 
Synopsis

             
         
         
-            ExplicitExpression(ExplicitExpression const&);
+            explicit(B)
+ExplicitExpression(ExplicitExpression const&);
         

     
 
@@ -774,7 +805,8 @@ 
Synopsis

             
         
         
-            ExplicitExpression(ExplicitExpression&&) noexcept;
+            explicit(B)
+ExplicitExpression(ExplicitExpression&&) noexcept;
         

     
 
@@ -800,7 +832,8 @@ 
Synopsis

             
         
         
-            ExplicitExpression(
+            explicit(B)
+ExplicitExpression(
     int,
     int);
         

diff --git a/test-files/golden-tests/explicit-deduct-guide.html b/test-files/golden-tests/explicit-deduct-guide.html
index 4be33cc330..2e76eb4ec3 100644
--- a/test-files/golden-tests/explicit-deduct-guide.html
+++ b/test-files/golden-tests/explicit-deduct-guide.html
@@ -4,6 +4,7 @@
 
 
 

+    
Reference

     

     

         
Global namespace

@@ -43,28 +44,28 @@ 
 Deduction Guides

 
                 
                     
-                        X<0> 
+                        X<0> 
                     
                         
                             
                     
                 
                     
-                        X<0> 
+                        X<0> 
                     
                         
                             
                     
                 
                     
-                        X<0> 
+                        X<0> 
                     
                         
                             
                     
                 
                     
-                        X<0> 
+                        X<0> 
                     
                         
                             
@@ -92,7 +93,7 @@ 
Synopsis

             
         

         
-            template
+            template<int>
 struct X;
         

     

@@ -120,7 +121,7 @@ 
Synopsis

             
         

         
-            X<0>(bool) -> X<0>;
+            X<0>(bool) -> X<0>;
         

     
 
@@ -143,7 +144,7 @@ 
Synopsis

             
         
         
-            X<0>(char) -> X<0>;
+            X<0>(char) -> X<0>;
         

     
 
@@ -166,7 +167,7 @@ 
Synopsis

             
         
         
-            X<0>(int) -> X<0>;
+            X<0>(int) -> X<0>;
         

     
 
@@ -189,8 +190,8 @@ 
Synopsis

             
         
         
-            template
-X<0>(long) -> X<0>;
+            template<bool B = true>
+X<0>(long) -> X<0>;
         

     
 
diff --git a/test-files/golden-tests/explicit-object-parameter.html b/test-files/golden-tests/explicit-object-parameter.html
index 1c81299011..146eab215c 100644
--- a/test-files/golden-tests/explicit-object-parameter.html
+++ b/test-files/golden-tests/explicit-object-parameter.html
@@ -4,6 +4,7 @@
 
 
 

+    
Reference

     

     

         
Global namespace

@@ -88,7 +89,7 @@ 
Members

 
 

 
-
template
+
template<typename Self>
 constexpr
 auto&&
 value(this Self&& self);

@@ -97,7 +98,7 @@ 
Members

 
 

 
-
template
+
template<typename Self>
 constexpr
 auto&&
 value(this 
@@ -125,7 +126,7 @@ 
Synopsis

             
         

         
-            template
+            template<typename Self>
 constexpr
 auto&&
 value(this Self&& self);
@@ -154,7 +155,7 @@ 
Synopsis

             
         

         
-            template
+            template<typename Self>
 constexpr
 auto&&
 value(this 
diff --git a/test-files/golden-tests/filters/blacklist_0.html b/test-files/golden-tests/filters/blacklist_0.html
index 5b3acabde1..0d9c4c667e 100644
--- a/test-files/golden-tests/filters/blacklist_0.html
+++ b/test-files/golden-tests/filters/blacklist_0.html
@@ -4,6 +4,7 @@
 
 
 

+    
Reference

     

     

         
Global namespace

diff --git a/test-files/golden-tests/filters/blacklist_test.html b/test-files/golden-tests/filters/blacklist_test.html
index 27b195c4e9..67b636e6a3 100644
--- a/test-files/golden-tests/filters/blacklist_test.html
+++ b/test-files/golden-tests/filters/blacklist_test.html
@@ -4,6 +4,7 @@
 
 
 

+    
Reference

     

     

         
Global namespace

diff --git a/test-files/golden-tests/filters/filters.html b/test-files/golden-tests/filters/filters.html
index 4b13ec76b5..21fad49a14 100644
--- a/test-files/golden-tests/filters/filters.html
+++ b/test-files/golden-tests/filters/filters.html
@@ -4,6 +4,7 @@
 
 
 

+    
Reference

     

     

         
Global namespace

diff --git a/test-files/golden-tests/filters/whitelist_0.html b/test-files/golden-tests/filters/whitelist_0.html
index 8e1cc2114c..976eb0b4c8 100644
--- a/test-files/golden-tests/filters/whitelist_0.html
+++ b/test-files/golden-tests/filters/whitelist_0.html
@@ -4,6 +4,7 @@
 
 
 

+    
Reference

     

     

         
Global namespace

diff --git a/test-files/golden-tests/filters/whitelist_test.html b/test-files/golden-tests/filters/whitelist_test.html
index c4d24b7978..abf58987bc 100644
--- a/test-files/golden-tests/filters/whitelist_test.html
+++ b/test-files/golden-tests/filters/whitelist_test.html
@@ -4,6 +4,7 @@
 
 
 

+    
Reference

     

     

         
Global namespace

diff --git a/test-files/golden-tests/friend-1.html b/test-files/golden-tests/friend-1.html
index 185f6db9ee..591c823db2 100644
--- a/test-files/golden-tests/friend-1.html
+++ b/test-files/golden-tests/friend-1.html
@@ -4,6 +4,7 @@
 
 
 

+    
Reference

     

     

         
Global namespace

diff --git a/test-files/golden-tests/friend-2.html b/test-files/golden-tests/friend-2.html
index d924361582..0c53cfe3c3 100644
--- a/test-files/golden-tests/friend-2.html
+++ b/test-files/golden-tests/friend-2.html
@@ -4,6 +4,7 @@
 
 
 

+    
Reference

     

     

         
Global namespace

diff --git a/test-files/golden-tests/friend-3.html b/test-files/golden-tests/friend-3.html
index 74ccc7e6e6..f7a4c36c3d 100644
--- a/test-files/golden-tests/friend-3.html
+++ b/test-files/golden-tests/friend-3.html
@@ -4,6 +4,7 @@
 
 
 

+    
Reference

     

     

         
Global namespace

diff --git a/test-files/golden-tests/friend-4.html b/test-files/golden-tests/friend-4.html
index de562b67c4..4561ea4e39 100644
--- a/test-files/golden-tests/friend-4.html
+++ b/test-files/golden-tests/friend-4.html
@@ -4,6 +4,7 @@
 
 
 

+    
Reference

     

     

         
Global namespace

diff --git a/test-files/golden-tests/friend-5.html b/test-files/golden-tests/friend-5.html
index 51313728bc..0e4035ecfc 100644
--- a/test-files/golden-tests/friend-5.html
+++ b/test-files/golden-tests/friend-5.html
@@ -4,6 +4,7 @@
 
 
 

+    
Reference

     

     

         
Global namespace

diff --git a/test-files/golden-tests/friend-6.html b/test-files/golden-tests/friend-6.html
index 56457042b3..3d6fb82270 100644
--- a/test-files/golden-tests/friend-6.html
+++ b/test-files/golden-tests/friend-6.html
@@ -4,6 +4,7 @@
 
 
 

+    
Reference

     

     

         
Global namespace

diff --git a/test-files/golden-tests/function-parm-decay.html b/test-files/golden-tests/function-parm-decay.html
index 17a69fa995..035bf659ac 100644
--- a/test-files/golden-tests/function-parm-decay.html
+++ b/test-files/golden-tests/function-parm-decay.html
@@ -4,6 +4,7 @@
 
 
 

+    
Reference

     

     

         
Global namespace

diff --git a/test-files/golden-tests/function-template.html b/test-files/golden-tests/function-template.html
index cde72f0f56..c1c4520597 100644
--- a/test-files/golden-tests/function-template.html
+++ b/test-files/golden-tests/function-template.html
@@ -4,6 +4,7 @@
 
 
 

+    
Reference

     

     

         
Global namespace

@@ -127,7 +128,7 @@ 
Synopsis

             
         

         
-            template
+            template<typename T>
 void
 f0(int x);
         

@@ -155,7 +156,7 @@ 
Synopsis

             
         

         
-            template
+            template<typename T>
 void
 f1(T t);
         

@@ -183,7 +184,7 @@ 
Synopsis

             
         

         
-            template
+            template<typename T = int>
 void
 f2();
         

@@ -211,9 +212,9 @@ 
Synopsis

             
         

         
-            template<
+            template<
     typename T,
-    class U = int>
+    class U = int>
 void
 f3();
         

@@ -241,7 +242,7 @@ 
Synopsis

             
         

         
-            template
+            template<int I>
 void
 g0(int x);
         

@@ -269,7 +270,7 @@ 
Synopsis

             
         

         
-            template
+            template<int I = 1>
 void
 g1();
         

@@ -297,9 +298,9 @@ 
Synopsis

             
         

         
-            template<
+            template<
     int J,
-    int I = 1>
+    int I = 1>
 void
 g2();
         

@@ -327,7 +328,7 @@ 
Synopsis

             
         

         
-            template
+            template<class x:auto>
 void
 h0(auto x);
         

@@ -355,9 +356,9 @@ 
Synopsis

             
         

         
-            template<
+            template<
     class x:auto,
-    class auto:2>
+    class auto:2>
 void
 h1(
     auto x,
@@ -387,9 +388,9 @@ 
Synopsis

             
         

         
-            template<
+            template<
     typename T = int,
-    int I = 1>
+    int I = 1>
 void
 i();
         

@@ -417,7 +418,7 @@ 
Synopsis

             
         

         
-            template typename T>
+            template<template<typename U> typename T>
 void
 j0();
         

@@ -445,9 +446,9 @@ 
Synopsis

             
         

         
-            template<
-    template typename X,
-    template typename Z>
+            template<
+    template<typename W> typename X,
+    template<typename Y> typename Z>
 void
 j1();
         

diff --git a/test-files/golden-tests/function-tparm-decay.html b/test-files/golden-tests/function-tparm-decay.html
index 8d2ff0557e..270883e4fb 100644
--- a/test-files/golden-tests/function-tparm-decay.html
+++ b/test-files/golden-tests/function-tparm-decay.html
@@ -4,6 +4,7 @@
 
 
 

+    
Reference

     

     

         
Global namespace

@@ -99,7 +100,7 @@ 
Synopsis

             
         

         
-            template
+            template<int x>
 void
 f();
         

@@ -127,7 +128,7 @@ 
Synopsis

             
         

         
-            template
+            template<int x[4]>
 void
 g();
         

@@ -155,7 +156,7 @@ 
Synopsis

             
         

         
-            template
+            template<int(* x)(bool const)>
 void
 h();
         

@@ -229,7 +230,7 @@ 
Synopsis

             
         

         
-            template
+            template<int>
 void
 i();
         

diff --git a/test-files/golden-tests/implicit-instantiation-member-ref.html b/test-files/golden-tests/implicit-instantiation-member-ref.html
index 9588a2a223..2520b5fb83 100644
--- a/test-files/golden-tests/implicit-instantiation-member-ref.html
+++ b/test-files/golden-tests/implicit-instantiation-member-ref.html
@@ -4,6 +4,7 @@
 
 
 

+    
Reference

     

     

         
Global namespace

@@ -127,7 +128,7 @@ 
Synopsis

             
         

         
-            template
+            template<typename T>
 struct S0;
         

     

@@ -247,8 +248,8 @@ 
Synopsis

             
         

         
-            template
-using M1 = S0;
+            template<typename U>
+using M1 = S0<U>;
         

     

 
@@ -271,7 +272,7 @@ 
Synopsis

             
         

         
-            template
+            template<typename U>
 struct S2;
         

     

@@ -391,8 +392,8 @@ 
Synopsis

             
         

         
-            template
-using M3 = S2;
+            template<typename V>
+using M3 = S2<U>;
         

     

 
@@ -415,7 +416,7 @@ 
Synopsis

             
         

         
-            template
+            template<typename V>
 struct S4;
         

     

@@ -487,7 +488,7 @@ 
Synopsis

             
         

         
-            using A0 = S0;
+            using A0 = S0<int>;
         

     

 
@@ -556,7 +557,7 @@ 
Synopsis

             
         

         
-            using A3 = S0::M0;
+            using A3 = S0<long>::M0;
         

     

 
@@ -579,7 +580,7 @@ 
Synopsis

             
         

         
-            using A4 = S0::S1;
+            using A4 = S0<long long>::S1;
         

     

 
@@ -602,7 +603,7 @@ 
Synopsis

             
         

         
-            using A5 = S0;
+            using A5 = S0<void>;
         

     

 
@@ -625,7 +626,7 @@ 
Synopsis

             
         

         
-            using A6 = A5::M1::M0;
+            using A6 = A5::M1<short>::M0;
         

     

 
@@ -648,7 +649,7 @@ 
Synopsis

             
         

         
-            using A7 = A5::S2::M2;
+            using A7 = A5::S2<bool>::M2;
         

     

 
@@ -671,7 +672,7 @@ 
Synopsis

             
         

         
-            using A8 = A5::S2::S3;
+            using A8 = A5::S2<int>::S3;
         

     

 
@@ -694,7 +695,7 @@ 
Synopsis

             
         

         
-            using A9 = A5::S2::M3::M3::M2;
+            using A9 = A5::S2<char>::M3<int>::M3<unsigned int>::M2;
         

     

 
@@ -717,7 +718,7 @@ 
Synopsis

             
         

         
-            using A10 = A5::S2::M3::M3::S4::M4;
+            using A10 = A5::S2<float>::M3<double>::M3<long double>::S4<void>::M4;
         

     

 
diff --git a/test-files/golden-tests/local-class.html b/test-files/golden-tests/local-class.html
index 8daff1c9bc..2e61ee360e 100644
--- a/test-files/golden-tests/local-class.html
+++ b/test-files/golden-tests/local-class.html
@@ -4,6 +4,7 @@
 
 
 

+    
Reference

     

     

         
Global namespace

diff --git a/test-files/golden-tests/mem-fn.html b/test-files/golden-tests/mem-fn.html
index 1ffbd0ddc4..6a687f6367 100644
--- a/test-files/golden-tests/mem-fn.html
+++ b/test-files/golden-tests/mem-fn.html
@@ -4,6 +4,7 @@
 
 
 

+    
Reference

     

     

         
Global namespace

@@ -970,7 +971,7 @@ 
Synopsis

         

         
             void
-f();
+f(...);
         

     

 
@@ -1453,7 +1454,7 @@ 
Synopsis

         
             constexpr
 void
-f1() const volatile noexcept;
+f1(...) const volatile noexcept;
         

     

 
diff --git a/test-files/golden-tests/namespace-alias-1.html b/test-files/golden-tests/namespace-alias-1.html
index 23d0118d2b..82762f128d 100644
--- a/test-files/golden-tests/namespace-alias-1.html
+++ b/test-files/golden-tests/namespace-alias-1.html
@@ -4,6 +4,7 @@
 
 
 

+    
Reference

     

     

         
Global namespace

@@ -56,8 +57,7 @@ 
Synopsis

             
         

         
-            namespace A = LongName
-;
+            namespace A = LongName;
         

     

 

diff --git a/test-files/golden-tests/namespace-alias-2.html b/test-files/golden-tests/namespace-alias-2.html
index 3fd979a145..61d8667ba6 100644
--- a/test-files/golden-tests/namespace-alias-2.html
+++ b/test-files/golden-tests/namespace-alias-2.html
@@ -4,6 +4,7 @@
 
 
 

+    
Reference

     

     

         
Global namespace

@@ -56,8 +57,7 @@ 
Synopsis

             
         

         
-            namespace A = LongName
-;
+            namespace A = LongName;
         

     

 

@@ -78,8 +78,7 @@ 
Synopsis

             
         

         
-            namespace B = LongName
-;
+            namespace B = LongName;
         

     

 

diff --git a/test-files/golden-tests/namespace-alias-3.html b/test-files/golden-tests/namespace-alias-3.html
index 4fe5a7c883..64f270112d 100644
--- a/test-files/golden-tests/namespace-alias-3.html
+++ b/test-files/golden-tests/namespace-alias-3.html
@@ -4,6 +4,7 @@
 
 
 

+    
Reference

     

     

         
Global namespace

@@ -56,8 +57,7 @@ 
Synopsis

             
         

         
-            namespace A = LongName
-;
+            namespace A = LongName;
         

     

 

@@ -78,8 +78,7 @@ 
Synopsis

             
         

         
-            namespace B = A
-;
+            namespace B = A;
         

     

 
diff --git a/test-files/golden-tests/namespace.html b/test-files/golden-tests/namespace.html
index 9f3a71d32b..24ce5e5c07 100644
--- a/test-files/golden-tests/namespace.html
+++ b/test-files/golden-tests/namespace.html
@@ -4,6 +4,7 @@
 
 
 

+    
Reference

     

     

         
Global namespace

diff --git a/test-files/golden-tests/nested-private-template.html b/test-files/golden-tests/nested-private-template.html
index cc69d616b0..be03af4768 100644
--- a/test-files/golden-tests/nested-private-template.html
+++ b/test-files/golden-tests/nested-private-template.html
@@ -4,6 +4,7 @@
 
 
 

+    
Reference

     

     

         
Global namespace

@@ -50,7 +51,7 @@ 
Synopsis

             
         

         
-            template
+            template<class T>
 class range;
         

     

@@ -76,7 +77,7 @@ 
Private Types

                     
                 
                     
-                        impl 
+                        impl<R, false> 
                     
                         
                             
@@ -106,9 +107,9 @@ 
Synopsis

             
         

         
-            template<
+            template<
     class R,
-    bool>
+    bool>
 struct impl;
         

     

@@ -136,8 +137,8 @@ 
Synopsis

             
         

         
-            template
-struct impl;
+            template<class R>
+struct impl<R, false>;
         

     

 
diff --git a/test-files/golden-tests/no_unique_address.html b/test-files/golden-tests/no_unique_address.html
index 6ee55ddd30..ebe790c283 100644
--- a/test-files/golden-tests/no_unique_address.html
+++ b/test-files/golden-tests/no_unique_address.html
@@ -4,6 +4,7 @@
 
 
 

+    
Reference

     

     

         
Global namespace

diff --git a/test-files/golden-tests/noreturn.html b/test-files/golden-tests/noreturn.html
index 90ba856a86..6628d1e15f 100644
--- a/test-files/golden-tests/noreturn.html
+++ b/test-files/golden-tests/noreturn.html
@@ -4,6 +4,7 @@
 
 
 

+    
Reference

     

     

         
Global namespace

diff --git a/test-files/golden-tests/ns-variables.html b/test-files/golden-tests/ns-variables.html
index fa5e33b04a..1fd59235ab 100644
--- a/test-files/golden-tests/ns-variables.html
+++ b/test-files/golden-tests/ns-variables.html
@@ -4,6 +4,7 @@
 
 
 

+    
Reference

     

     

         
Global namespace

diff --git a/test-files/golden-tests/out-of-line-record-def.html b/test-files/golden-tests/out-of-line-record-def.html
index cfd48b067d..cf5059bbea 100644
--- a/test-files/golden-tests/out-of-line-record-def.html
+++ b/test-files/golden-tests/out-of-line-record-def.html
@@ -4,6 +4,7 @@
 
 
 

+    
Reference

     

     

         
Global namespace

diff --git a/test-files/golden-tests/overloaded-op-1.html b/test-files/golden-tests/overloaded-op-1.html
index 69e11301aa..338f94b002 100644
--- a/test-files/golden-tests/overloaded-op-1.html
+++ b/test-files/golden-tests/overloaded-op-1.html
@@ -4,6 +4,7 @@
 
 
 

+    
Reference

     

     

         
Global namespace

diff --git a/test-files/golden-tests/overloaded-op-2.html b/test-files/golden-tests/overloaded-op-2.html
index 0a07e7024d..da23996806 100644
--- a/test-files/golden-tests/overloaded-op-2.html
+++ b/test-files/golden-tests/overloaded-op-2.html
@@ -4,6 +4,7 @@
 
 
 

+    
Reference

     

     

         
Global namespace

diff --git a/test-files/golden-tests/para-1.html b/test-files/golden-tests/para-1.html
index cd904e605b..3ad2170de6 100644
--- a/test-files/golden-tests/para-1.html
+++ b/test-files/golden-tests/para-1.html
@@ -4,6 +4,7 @@
 
 
 

+    
Reference

     

     

         
Global namespace

diff --git a/test-files/golden-tests/para-2.html b/test-files/golden-tests/para-2.html
index d72b17829d..68f94c0d4e 100644
--- a/test-files/golden-tests/para-2.html
+++ b/test-files/golden-tests/para-2.html
@@ -4,6 +4,7 @@
 
 
 

+    
Reference

     

     

         
Global namespace

diff --git a/test-files/golden-tests/param-direction.html b/test-files/golden-tests/param-direction.html
index cf444c2f83..e1936ee8e8 100644
--- a/test-files/golden-tests/param-direction.html
+++ b/test-files/golden-tests/param-direction.html
@@ -4,6 +4,7 @@
 
 
 

+    
Reference

     

     

         
Global namespace

diff --git a/test-files/golden-tests/param.html b/test-files/golden-tests/param.html
index 9ba9479c62..c38680f8ea 100644
--- a/test-files/golden-tests/param.html
+++ b/test-files/golden-tests/param.html
@@ -4,6 +4,7 @@
 
 
 

+    
Reference

     

     

         
Global namespace

diff --git a/test-files/golden-tests/pre-post.html b/test-files/golden-tests/pre-post.html
index fb0ca88d29..1e97a1d12a 100644
--- a/test-files/golden-tests/pre-post.html
+++ b/test-files/golden-tests/pre-post.html
@@ -4,6 +4,7 @@
 
 
 

+    
Reference

     

     

         
Global namespace

diff --git a/test-files/golden-tests/record-1.html b/test-files/golden-tests/record-1.html
index 99a9096532..7b1e85c529 100644
--- a/test-files/golden-tests/record-1.html
+++ b/test-files/golden-tests/record-1.html
@@ -4,6 +4,7 @@
 
 
 

+    
Reference

     

     

         
Global namespace

diff --git a/test-files/golden-tests/record-access.html b/test-files/golden-tests/record-access.html
index dcca5303e7..e2252a1dd4 100644
--- a/test-files/golden-tests/record-access.html
+++ b/test-files/golden-tests/record-access.html
@@ -4,6 +4,7 @@
 
 
 

+    
Reference

     

     

         
Global namespace

diff --git a/test-files/golden-tests/record-data.html b/test-files/golden-tests/record-data.html
index 329089fbe9..0619a030e7 100644
--- a/test-files/golden-tests/record-data.html
+++ b/test-files/golden-tests/record-data.html
@@ -4,6 +4,7 @@
 
 
 

+    
Reference

     

     

         
Global namespace

@@ -557,9 +558,9 @@ 
Synopsis

             
         

         
-            template<
+            template<
     typename P,
-    int I>
+    int I>
 struct X;
         

     

diff --git a/test-files/golden-tests/record-inheritance.html b/test-files/golden-tests/record-inheritance.html
index b88e741c92..3b2e2d3c35 100644
--- a/test-files/golden-tests/record-inheritance.html
+++ b/test-files/golden-tests/record-inheritance.html
@@ -4,6 +4,7 @@
 
 
 

+    
Reference

     

     

         
Global namespace

@@ -574,7 +575,7 @@ 
Synopsis

             
         

         
-            template
+            template<typename... Ts>
 struct S6
     : Ts...;
         

diff --git a/test-files/golden-tests/ref.html b/test-files/golden-tests/ref.html
index f6163dfe8d..07b08a9453 100644
--- a/test-files/golden-tests/ref.html
+++ b/test-files/golden-tests/ref.html
@@ -4,6 +4,7 @@
 
 
 

+    
Reference

     

     

         
Global namespace

@@ -241,7 +242,7 @@ 
Synopsis

             
         

         
-            template
+            template<typename>
 struct B;
         

     

diff --git a/test-files/golden-tests/requires-clause.html b/test-files/golden-tests/requires-clause.html
index 727d4ad4d4..8f62a3c646 100644
--- a/test-files/golden-tests/requires-clause.html
+++ b/test-files/golden-tests/requires-clause.html
@@ -4,6 +4,7 @@
 
 
 

+    
Reference

     

     

         
Global namespace

@@ -67,17 +68,17 @@ 
Members

 
 

 
-
template
+
template<typename T>
 void
-f();

+f() requires (sizeof(T) == 4);

 » more...
 
 
 

 
-
template
+
template<typename T>
 void
-f();

+f() requires (sizeof(T) == 2);

 » more...
 
 
@@ -100,9 +101,9 @@ 
Synopsis

             
         

         
-            template
+            template<typename T>
 void
-f();
+f() requires (sizeof(T) == 4);
         

     

 
@@ -128,9 +129,9 @@ 
Synopsis

             
         

         
-            template
+            template<typename T>
 void
-f();
+f() requires (sizeof(T) == 2);
         

     

 
@@ -147,7 +148,7 @@ 
Members

 
 

 
-
template requires (sizeof(T) == 4)
+
template<typename T> requires (sizeof(T) == 4)
 void
 g();

 » more...
@@ -155,7 +156,7 @@ 
Members

 
 

 
-
template requires (sizeof(U) == 2)
+
template<typename T> requires (sizeof(U) == 2)
 void
 g();

 » more...
@@ -180,7 +181,7 @@ 
Synopsis

             
         

         
-            template requires (sizeof(T) == 4)
+            template<typename T> requires (sizeof(T) == 4)
 void
 g();
         

@@ -208,7 +209,7 @@ 
Synopsis

             
         

         
-            template requires (sizeof(U) == 2)
+            template<typename T> requires (sizeof(U) == 2)
 void
 g();
         

@@ -236,7 +237,7 @@ 
Synopsis

             
         

         
-            template requires (sizeof(U) == 2)
+            template<typename T> requires (sizeof(U) == 2)
 struct A;
         

     

diff --git a/test-files/golden-tests/spec-mem-implicit-instantiation.html b/test-files/golden-tests/spec-mem-implicit-instantiation.html
index f0534ffbd0..7a978d6496 100644
--- a/test-files/golden-tests/spec-mem-implicit-instantiation.html
+++ b/test-files/golden-tests/spec-mem-implicit-instantiation.html
@@ -4,6 +4,7 @@
 
 
 

+    
Reference

     

     

         
Global namespace

@@ -57,7 +58,7 @@ 
Synopsis

             
         

         
-            template
+            template<typename T>
 struct A;
         

     

@@ -161,7 +162,7 @@ 
Synopsis

             
         

         
-            template
+            template<typename U>
 struct B;
         

     

@@ -237,7 +238,7 @@ 
Synopsis

             
         

         
-            template
+            template<typename U>
 struct C;
         

     

@@ -361,7 +362,7 @@ 
Synopsis

             
         

         
-            template
+            template<typename T>
 struct E;
         

     

diff --git a/test-files/golden-tests/static-data-def-constexpr.html b/test-files/golden-tests/static-data-def-constexpr.html
index 481bc49503..4728c19f87 100644
--- a/test-files/golden-tests/static-data-def-constexpr.html
+++ b/test-files/golden-tests/static-data-def-constexpr.html
@@ -4,6 +4,7 @@
 
 
 

+    
Reference

     

     

         
Global namespace

diff --git a/test-files/golden-tests/static-data-def.html b/test-files/golden-tests/static-data-def.html
index 2736465d48..4f86dad441 100644
--- a/test-files/golden-tests/static-data-def.html
+++ b/test-files/golden-tests/static-data-def.html
@@ -4,6 +4,7 @@
 
 
 

+    
Reference

     

     

         
Global namespace

@@ -78,7 +79,7 @@ 
Synopsis

             
         

         
-            template
+            template<typename T>
 struct A;
         

     

diff --git a/test-files/golden-tests/static-data-template.html b/test-files/golden-tests/static-data-template.html
index 8ee45be585..fc663f0712 100644
--- a/test-files/golden-tests/static-data-template.html
+++ b/test-files/golden-tests/static-data-template.html
@@ -4,6 +4,7 @@
 
 
 

+    
Reference

     

     

         
Global namespace

@@ -50,7 +51,7 @@ 
Synopsis

             
         

         
-            template
+            template<typename T>
 struct A;
         

     

@@ -76,14 +77,14 @@ 
 Static Data Members

                     
                 
                     
-                        x 
+                        x<U*, T> 
                     
                         
                             
                     
                 
                     
-                        x 
+                        x<T, long> 
                     
                         
                             
@@ -113,9 +114,9 @@ 
Synopsis

             
         

         
-            template<
+            template<
     typename U,
-    typename V>
+    typename V>
 constexpr
 static
 T const x = 0;
@@ -141,10 +142,10 @@ 
Synopsis

             
         

         
-            template
+            template<typename U>
 constexpr
 static
-T const x = 1;
+T const x<U*, T> = 1;
         

     

 
@@ -167,10 +168,10 @@ 
Synopsis

             
         

         
-            template<>
+            template<>
 constexpr
 static
-bool const x = 2;
+bool const x<T, long> = 2;
         

     

 
diff --git a/test-files/golden-tests/temp/c_mct_expl_inline.html b/test-files/golden-tests/temp/c_mct_expl_inline.html
index 6632247d01..306689ae25 100644
--- a/test-files/golden-tests/temp/c_mct_expl_inline.html
+++ b/test-files/golden-tests/temp/c_mct_expl_inline.html
@@ -4,6 +4,7 @@
 
 
 

+    
Reference

     

     

         
Global namespace

@@ -75,7 +76,7 @@ 
 Types

                     
                 
                     
-                        B 
+                        B<int> 
                     
                         
                             
@@ -105,7 +106,7 @@ 
Synopsis

             
         

         
-            template
+            template<typename T>
 struct B;
         

     

@@ -181,8 +182,8 @@ 
Synopsis

             
         

         
-            template<>
-struct B;
+            template<>
+struct B<int>;
         

     

 
@@ -214,7 +215,7 @@ 
 Member Functions

 

 

     

-        
Function A::B::g

+        
Function A::B<int>::g

         
     

 
diff --git a/test-files/golden-tests/temp/c_mct_expl_outside.html b/test-files/golden-tests/temp/c_mct_expl_outside.html
index 42b5f9709e..80c832b714 100644
--- a/test-files/golden-tests/temp/c_mct_expl_outside.html
+++ b/test-files/golden-tests/temp/c_mct_expl_outside.html
@@ -4,6 +4,7 @@
 
 
 

+    
Reference

     

     

         
Global namespace

@@ -75,7 +76,7 @@ 
 Types

                     
                 
                     
-                        B 
+                        B<int> 
                     
                         
                             
@@ -105,7 +106,7 @@ 
Synopsis

             
         

         
-            template
+            template<typename T>
 struct B;
         

     

@@ -181,8 +182,8 @@ 
Synopsis

             
         

         
-            template<>
-struct B;
+            template<>
+struct B<int>;
         

     

 
@@ -214,7 +215,7 @@ 
 Member Functions

 

 

     

-        
Function A::B::g

+        
Function A::B<int>::g

         
     

 
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 1d7435ab5b..0886b44ee0 100644
--- a/test-files/golden-tests/temp/c_mft_expl_inline.html
+++ b/test-files/golden-tests/temp/c_mft_expl_inline.html
@@ -4,6 +4,7 @@
 
 
 

+    
Reference

     

     

         
Global namespace

@@ -88,7 +89,7 @@ 
Members

 
 

 
-
template
+
template<typename T>
 void
 f();

 » more...
@@ -96,9 +97,9 @@ 
Members

 
 

 
-
template<>
+
template<>
 void
-f();

+f<int>();

 » more...
 
 
@@ -121,7 +122,7 @@ 
Synopsis

             
         

         
-            template
+            template<typename T>
 void
 f();
         

@@ -149,9 +150,9 @@ 
Synopsis

             
         

         
-            template<>
+            template<>
 void
-f();
+f<int>();
         

     

 
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 226a42054f..a96be4d911 100644
--- a/test-files/golden-tests/temp/c_mft_expl_outside.html
+++ b/test-files/golden-tests/temp/c_mft_expl_outside.html
@@ -4,6 +4,7 @@
 
 
 

+    
Reference

     

     

         
Global namespace

@@ -88,7 +89,7 @@ 
Members

 
 

 
-
template
+
template<typename T>
 void
 f();

 » more...
@@ -96,9 +97,9 @@ 
Members

 
 

 
-
template<>
+
template<>
 void
-f();

+f<int>();

 » more...
 
 
@@ -121,7 +122,7 @@ 
Synopsis

             
         

         
-            template
+            template<typename T>
 void
 f();
         

@@ -149,9 +150,9 @@ 
Synopsis

             
         

         
-            template<>
+            template<>
 void
-f();
+f<int>();
         

     

 
diff --git a/test-files/golden-tests/temp/ct_expl.html b/test-files/golden-tests/temp/ct_expl.html
index 21be398c5e..3c5e40d79f 100644
--- a/test-files/golden-tests/temp/ct_expl.html
+++ b/test-files/golden-tests/temp/ct_expl.html
@@ -4,6 +4,7 @@
 
 
 

+    
Reference

     

     

         
Global namespace

@@ -29,7 +30,7 @@ 
 Types

                     
                 
                     
-                        A 
+                        A<int> 
                     
                         
                             
@@ -57,7 +58,7 @@ 
Synopsis

             
         

         
-            template
+            template<typename T>
 struct A;
         

     

@@ -133,8 +134,8 @@ 
Synopsis

             
         

         
-            template<>
-struct A;
+            template<>
+struct A<int>;
         

     

 
@@ -166,7 +167,7 @@ 
 Member Functions

 

 

     

-        
Function A::g

+        
Function A<int>::g

         
     

 
diff --git a/test-files/golden-tests/temp/ct_mc.html b/test-files/golden-tests/temp/ct_mc.html
index 33cd54a92e..e87cb5d713 100644
--- a/test-files/golden-tests/temp/ct_mc.html
+++ b/test-files/golden-tests/temp/ct_mc.html
@@ -4,6 +4,7 @@
 
 
 

+    
Reference

     

     

         
Global namespace

@@ -50,7 +51,7 @@ 
Synopsis

             
         

         
-            template
+            template<typename T>
 struct A;
         

     

diff --git a/test-files/golden-tests/temp/ct_mc_expl_outside.html b/test-files/golden-tests/temp/ct_mc_expl_outside.html
index 4126007e63..8a04a83d54 100644
--- a/test-files/golden-tests/temp/ct_mc_expl_outside.html
+++ b/test-files/golden-tests/temp/ct_mc_expl_outside.html
@@ -4,6 +4,7 @@
 
 
 

+    
Reference

     

     

         
Global namespace

@@ -50,7 +51,7 @@ 
Synopsis

             
         

         
-            template
+            template<typename T>
 struct A;
         

     

diff --git a/test-files/golden-tests/temp/ct_mct.html b/test-files/golden-tests/temp/ct_mct.html
index 3e4f1973d2..47ccfd427f 100644
--- a/test-files/golden-tests/temp/ct_mct.html
+++ b/test-files/golden-tests/temp/ct_mct.html
@@ -4,6 +4,7 @@
 
 
 

+    
Reference

     

     

         
Global namespace

@@ -50,7 +51,7 @@ 
Synopsis

             
         

         
-            template
+            template<typename T>
 struct A;
         

     

@@ -99,7 +100,7 @@ 
Synopsis

             
         

         
-            template
+            template<typename U>
 struct B;
         

     

diff --git a/test-files/golden-tests/temp/ct_mct_expl_inline.html b/test-files/golden-tests/temp/ct_mct_expl_inline.html
index b0c4d6ec5f..696090c1d3 100644
--- a/test-files/golden-tests/temp/ct_mct_expl_inline.html
+++ b/test-files/golden-tests/temp/ct_mct_expl_inline.html
@@ -4,6 +4,7 @@
 
 
 

+    
Reference

     

     

         
Global namespace

@@ -50,7 +51,7 @@ 
Synopsis

             
         

         
-            template
+            template<typename T>
 struct A;
         

     

@@ -76,7 +77,7 @@ 
 Types

                     
                 
                     
-                        B 
+                        B<int> 
                     
                         
                             
@@ -106,7 +107,7 @@ 
Synopsis

             
         

         
-            template
+            template<typename U>
 struct B;
         

     

@@ -182,8 +183,8 @@ 
Synopsis

             
         

         
-            template<>
-struct B;
+            template<>
+struct B<int>;
         

     

 
@@ -215,7 +216,7 @@ 
 Member Functions

 

 

     

-        
Function A::B::g

+        
Function A::B<int>::g

         
     

 
diff --git a/test-files/golden-tests/temp/ct_mct_expl_outside.html b/test-files/golden-tests/temp/ct_mct_expl_outside.html
index 12d38d7b15..3198b46508 100644
--- a/test-files/golden-tests/temp/ct_mct_expl_outside.html
+++ b/test-files/golden-tests/temp/ct_mct_expl_outside.html
@@ -4,6 +4,7 @@
 
 
 

+    
Reference

     

     

         
Global namespace

@@ -50,7 +51,7 @@ 
Synopsis

             
         

         
-            template
+            template<typename T>
 struct A;
         

     

@@ -99,7 +100,7 @@ 
Synopsis

             
         

         
-            template
+            template<typename U>
 struct B;
         

     

diff --git a/test-files/golden-tests/temp/ct_mf.html b/test-files/golden-tests/temp/ct_mf.html
index ca8556878f..e4a7c6114f 100644
--- a/test-files/golden-tests/temp/ct_mf.html
+++ b/test-files/golden-tests/temp/ct_mf.html
@@ -4,6 +4,7 @@
 
 
 

+    
Reference

     

     

         
Global namespace

@@ -50,7 +51,7 @@ 
Synopsis

             
         

         
-            template
+            template<typename T>
 struct A;
         

     

diff --git a/test-files/golden-tests/temp/ct_mf_expl_outside.html b/test-files/golden-tests/temp/ct_mf_expl_outside.html
index 980b463785..44f753621b 100644
--- a/test-files/golden-tests/temp/ct_mf_expl_outside.html
+++ b/test-files/golden-tests/temp/ct_mf_expl_outside.html
@@ -4,6 +4,7 @@
 
 
 

+    
Reference

     

     

         
Global namespace

@@ -50,7 +51,7 @@ 
Synopsis

             
         

         
-            template
+            template<typename T>
 struct A;
         

     

diff --git a/test-files/golden-tests/temp/ct_mft.html b/test-files/golden-tests/temp/ct_mft.html
index e3a7028841..b72b6168ca 100644
--- a/test-files/golden-tests/temp/ct_mft.html
+++ b/test-files/golden-tests/temp/ct_mft.html
@@ -4,6 +4,7 @@
 
 
 

+    
Reference

     

     

         
Global namespace

@@ -50,7 +51,7 @@ 
Synopsis

             
         

         
-            template
+            template<typename T>
 struct A;
         

     

@@ -99,7 +100,7 @@ 
Synopsis

             
         

         
-            template
+            template<typename U>
 void
 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 1c34d0ef38..c9ec09262c 100644
--- a/test-files/golden-tests/temp/ct_mft_expl_inline.html
+++ b/test-files/golden-tests/temp/ct_mft_expl_inline.html
@@ -4,6 +4,7 @@
 
 
 

+    
Reference

     

     

         
Global namespace

@@ -50,7 +51,7 @@ 
Synopsis

             
         

         
-            template
+            template<typename T>
 struct A;
         

     

@@ -89,7 +90,7 @@ 
Members

 
 

 
-
template
+
template<typename U>
 void
 f();

 » more...
@@ -97,9 +98,9 @@ 
Members

 
 

 
-
template<>
+
template<>
 void
-f();

+f<int>();

 » more...
 
 
@@ -122,7 +123,7 @@ 
Synopsis

             
         

         
-            template
+            template<typename U>
 void
 f();
         

@@ -150,9 +151,9 @@ 
Synopsis

             
         

         
-            template<>
+            template<>
 void
-f();
+f<int>();
         

     

 
diff --git a/test-files/golden-tests/temp/ct_mft_expl_outside.html b/test-files/golden-tests/temp/ct_mft_expl_outside.html
index 1207f4c34b..abe981655f 100644
--- a/test-files/golden-tests/temp/ct_mft_expl_outside.html
+++ b/test-files/golden-tests/temp/ct_mft_expl_outside.html
@@ -4,6 +4,7 @@
 
 
 

+    
Reference

     

     

         
Global namespace

@@ -50,7 +51,7 @@ 
Synopsis

             
         

         
-            template
+            template<typename T>
 struct A;
         

     

@@ -99,7 +100,7 @@ 
Synopsis

             
         

         
-            template
+            template<typename U>
 void
 f();
         

diff --git a/test-files/golden-tests/temp/ft_expl.html b/test-files/golden-tests/temp/ft_expl.html
index d6507f3f97..5d98501ec4 100644
--- a/test-files/golden-tests/temp/ft_expl.html
+++ b/test-files/golden-tests/temp/ft_expl.html
@@ -4,6 +4,7 @@
 
 
 

+    
Reference

     

     

         
Global namespace

@@ -40,7 +41,7 @@ 
Members

 
 

 
-
template
+
template<typename T>
 void
 f();

 » more...
@@ -48,9 +49,9 @@ 
Members

 
 

 
-
template<>
+
template<>
 void
-f();

+f<int>();

 » more...
 
 
@@ -73,7 +74,7 @@ 
Synopsis

             
         

         
-            template
+            template<typename T>
 void
 f();
         

@@ -101,9 +102,9 @@ 
Synopsis

             
         

         
-            template<>
+            template<>
 void
-f();
+f<int>();
         

     

 
diff --git a/test-files/golden-tests/type-resolution.html b/test-files/golden-tests/type-resolution.html
index ae47f8f67c..6965ac6a32 100644
--- a/test-files/golden-tests/type-resolution.html
+++ b/test-files/golden-tests/type-resolution.html
@@ -4,6 +4,7 @@
 
 
 

+    
Reference

     

     

         
Global namespace

@@ -434,9 +435,9 @@ 
Synopsis

             
         

         
-            template<
+            template<
     typename T,
-    typename U>
+    typename U>
 struct B;
         

     

@@ -487,7 +488,7 @@ 
Synopsis

             
         

         
-            using D = B;
+            using D = B<short, long>;
         

     

 
@@ -510,8 +511,8 @@ 
Synopsis

             
         

         
-            template
-using E = B;
+            template<typename T>
+using E = B<T, long>;
         

     

 
@@ -1021,7 +1022,7 @@ 
Synopsis

         

         
             void
-h0(B);
+h0(B<short, long>);
         

     

 
@@ -1048,7 +1049,7 @@ 
Synopsis

         

         
             void
-h1(B const);
+h1(B<short, long> const);
         

     

 
@@ -1075,7 +1076,7 @@ 
Synopsis

         

         
             void
-h2(B&);
+h2(B<short, long>&);
         

     

 
@@ -1102,7 +1103,7 @@ 
Synopsis

         

         
             void
-h3(B const&);
+h3(B<short, long> const&);
         

     

 
@@ -1129,7 +1130,7 @@ 
Synopsis

         

         
             void
-h4(B*);
+h4(B<short, long>*);
         

     

 
@@ -1156,7 +1157,7 @@ 
Synopsis

         

         
             void
-h5(B const*);
+h5(B<short, long> const*);
         

     

 
@@ -1183,7 +1184,7 @@ 
Synopsis

         

         
             void
-h6(B**);
+h6(B<short, long>**);
         

     

 
@@ -1210,7 +1211,7 @@ 
Synopsis

         

         
             void
-h7(B const**);
+h7(B<short, long> const**);
         

     

 
@@ -1237,7 +1238,7 @@ 
Synopsis

         

         
             void
-h8(B const const**);
+h8(B<short, long> const const**);
         

     

 
@@ -1507,7 +1508,7 @@ 
Synopsis

         

         
             void
-j0(E);
+j0(E<short>);
         

     

 
@@ -1534,7 +1535,7 @@ 
Synopsis

         

         
             void
-j1(E const);
+j1(E<short> const);
         

     

 
@@ -1561,7 +1562,7 @@ 
Synopsis

         

         
             void
-j2(E&);
+j2(E<short>&);
         

     

 
@@ -1588,7 +1589,7 @@ 
Synopsis

         
         
             void
-j3(E const&);
+j3(E<short> const&);
         

     
 
@@ -1615,7 +1616,7 @@ 
Synopsis

         
         
             void
-j4(E*);
+j4(E<short>*);
         

     
 
@@ -1642,7 +1643,7 @@ 
Synopsis

         
         
             void
-j5(E const*);
+j5(E<short> const*);
         

     
 
@@ -1669,7 +1670,7 @@ 
Synopsis

         
         
             void
-j6(E**);
+j6(E<short>**);
         

     
 
@@ -1696,7 +1697,7 @@ 
Synopsis

         
         
             void
-j7(E const**);
+j7(E<short> const**);
         

     
 
@@ -1723,7 +1724,7 @@ 
Synopsis

         
         
             void
-j8(E const const**);
+j8(E<short> const const**);
         

     
 
diff --git a/test-files/golden-tests/union.html b/test-files/golden-tests/union.html
index 1de7e4a33a..499cdfdc50 100644
--- a/test-files/golden-tests/union.html
+++ b/test-files/golden-tests/union.html
@@ -4,6 +4,7 @@
 
 
 

+    
Reference

     

     

         
Global namespace

diff --git a/test-files/golden-tests/using-1.html b/test-files/golden-tests/using-1.html
index 09199a460a..3e73e75d02 100644
--- a/test-files/golden-tests/using-1.html
+++ b/test-files/golden-tests/using-1.html
@@ -4,6 +4,7 @@
 
 
 

+    
Reference

     

     

         
Global namespace

diff --git a/test-files/golden-tests/using-2.html b/test-files/golden-tests/using-2.html
index 91d7576273..5d01a6fe6d 100644
--- a/test-files/golden-tests/using-2.html
+++ b/test-files/golden-tests/using-2.html
@@ -4,6 +4,7 @@
 
 
 

+    
Reference

     

     

         
Global namespace

@@ -139,8 +140,7 @@ 
Synopsis

             
         

         
-            using LongName::S1
-;
+            using LongName::S1;
         

     

 
@@ -176,8 +176,7 @@ 
Synopsis

             
         

         
-            using LongName::S2
-;
+            using LongName::S2;
         

     

 
diff --git a/test-files/golden-tests/using-3.html b/test-files/golden-tests/using-3.html
index 4d3c97fa7a..6588926612 100644
--- a/test-files/golden-tests/using-3.html
+++ b/test-files/golden-tests/using-3.html
@@ -4,6 +4,7 @@
 
 
 

+    
Reference

     

     

         
Global namespace

@@ -291,8 +292,7 @@ 
Synopsis

             
         

         
-            using A::f
-;
+            using A::f;
         

     

 
@@ -328,8 +328,7 @@ 
Synopsis

             
         

         
-            using B::f
-;
+            using B::f;
         

     

 
diff --git a/test-files/golden-tests/utf-8.html b/test-files/golden-tests/utf-8.html
index 4662e14e94..b846ca973b 100644
--- a/test-files/golden-tests/utf-8.html
+++ b/test-files/golden-tests/utf-8.html
@@ -4,6 +4,7 @@
 
 
 

+    
Reference

     

     

         
Global namespace

diff --git a/test-files/golden-tests/var-template.html b/test-files/golden-tests/var-template.html
index eb10e36b3c..c955d061dd 100644
--- a/test-files/golden-tests/var-template.html
+++ b/test-files/golden-tests/var-template.html
@@ -4,6 +4,7 @@
 
 
 

+    
Reference

     

     

         
Global namespace

@@ -50,14 +51,14 @@ 
Variables

                     
                 
                     
-                        A 
+                        A<void> 
                     
                         
                             
                     
                 
                     
-                        A 
+                        A<T&> 
                     
                         
                             
@@ -85,7 +86,7 @@ 
Synopsis

             
         

         
-            template
+            template<typename T>
 unsigned int A = sizeof(T);
         

     

@@ -109,8 +110,8 @@ 
Synopsis

             
         

         
-            template<>
-unsigned int A = 0;
+            template<>
+unsigned int A<void> = 0;
         

     

 
@@ -133,8 +134,8 @@ 
Synopsis

             
         

         
-            template
-unsigned int A = sizeof(T);
+            template<typename T>
+unsigned int A<T&> = sizeof(T);
         

     

 
@@ -182,14 +183,14 @@ 
 Static Data Members

                     
                 
                     
-                        C 
+                        C<int> 
                     
                         
                             
                     
                 
                     
-                        C 
+                        C<T*> 
                     
                         
                             
@@ -219,7 +220,7 @@ 
Synopsis

             
         

         
-            template
+            template<typename T>
 static
 unsigned int C = 0;
         

@@ -244,9 +245,9 @@ 
Synopsis

             
         

         
-            template<>
+            template<>
 static
-unsigned int C = -1;
+unsigned int C<int> = -1;
         

     

 
@@ -269,9 +270,9 @@ 
Synopsis

             
         

         
-            template
+            template<typename T>
 static
-unsigned int C = sizeof(T);
+unsigned int C<T*> = sizeof(T);
         

     
 
diff --git a/test-files/golden-tests/variadic-function.html b/test-files/golden-tests/variadic-function.html
index dc50d078c8..56787613cd 100644
--- a/test-files/golden-tests/variadic-function.html
+++ b/test-files/golden-tests/variadic-function.html
@@ -4,6 +4,7 @@
 
 
 

+    
Reference

     

     

         
Global namespace

@@ -139,7 +140,7 @@ 
Synopsis

         

         
             void
-f();
+f(...);
         

     

 
@@ -166,7 +167,7 @@ 
Synopsis

         

         
             void
-g(int);
+g(int, ...);
         

     
 
@@ -192,9 +193,9 @@ 
Synopsis

             
         
         
-            template<
+            template<
     typename A = void(...),
-    typename B = void(int, ...)>
+    typename B = void(int, ...)>
 struct C;