diff --git a/docs/modules/ROOT/pages/generators.adoc b/docs/modules/ROOT/pages/generators.adoc
index 1018d4fe88..6f11805bc2 100644
--- a/docs/modules/ROOT/pages/generators.adoc
+++ b/docs/modules/ROOT/pages/generators.adoc
@@ -47,19 +47,28 @@ The templates used to generate the documentation are located in the `share/mrdoc
 addons: /path/to/custom/addons
 ----
 
-Each symbol goes through a main layout template in the `share/mrdocs/addons/generator/<generator>/layouts` directory. The multipage generator renders the layout as separate pages for each symbol. The single-page generator renders and concatenates the layout.
+Each symbol goes through a main layout template in the `share/mrdocs/addons/generator/<generator>/layouts/single-symbol.<generator>.hbs` directory. This template is a simple entry point that renders the partial relative to the symbol kind.
 
-Each time the generator encounters a symbol, it renders the layout template with the symbol data as the Handlebars context. The layout template can include other partial templates to render the symbol data. These partials are available in the `share/mrdocs/addons/generator/<generator>/partials` directory.
+The partials are located in the `share/mrdocs/addons/generator/<generator>/partials` directory. It contains the following subdirectories:
 
-The Document Object Model (DOM) for each symbol includes all information about the symbol. One advantage of custom templates over post-processing XML files is the ability to access symbols as a graph. If symbol `A` refers to symbol `B`, some properties of symbol `B` are likely to be required in the documentation of `A`. All templates and generators can access a reference to `B` by searching the symbol tree or simply by accessing the elements `A` refers to. All references to other symbols are resolved in the templates.
+* `symbols`: Contains one partial for each symbol kind. The fields of each symbol object are described in the <<symbol-fields,Symbol Object>> section.
+* `signature`: Contains one partial for each symbol kind that renders the signature of the symbol as if declared in {cpp}.
+* `types`: partials for rendering other types of objects in a canonical form. Please refer to the <<dom_reference,Document Object Model Reference>> for more information on each type of object.
 
+The multipage generator renders the layout multiple times as separate pages for each symbol. The single-page generator renders the layout multiple times and concatenates the results in a single page.
+
+Each time the generator encounters a symbol, it renders the layout template with the symbol data as the Handlebars context.The layout template can include other partial templates to render the symbol data.These partials are available in the `share/mrdocs/addons/generator/<generator>/partials` directory.
+
+The Document Object Model (DOM) for each symbol includes all information about the symbol.One advantage of custom templates over post-processing XML files is the ability to access symbols as a graph.If symbol `A` refers to symbol `B`, some properties of symbol `B` are likely to be required in the documentation of `A`.All templates and generators can access a reference to `B` by searching the symbol tree or simply by accessing the elements `A` refers to.All references to other symbols are resolved in the templates.
+
+[#dom_reference]
 == Document Object Model Reference
 
-The Document Object Model (DOM) is a tree structure that represents the symbols extracted from the source code. The DOM is used by the generator to render the documentation.
+The Document Object Model (DOM) is a tree structure that represents the symbols extracted from the source code.The DOM is used by the generator to render the documentation.
 
 === Top-Level Fields
 
-The top-level object in the DOM is the context for a template. The top-level object has the following properties:
+The top-level object in the DOM is the context for a template.The top-level object has the following properties:
 
 |===
 |Property |Type| Description
diff --git a/share/mrdocs/addons/generator/README.adoc b/share/mrdocs/addons/generator/README.adoc
deleted file mode 100644
index 03ed7184a9..0000000000
--- a/share/mrdocs/addons/generator/README.adoc
+++ /dev/null
@@ -1,3 +0,0 @@
-= Addons/Generator
-
-Each installed generator has a corresponding directory here.
diff --git a/share/mrdocs/addons/generator/asciidoc/README.adoc b/share/mrdocs/addons/generator/asciidoc/README.adoc
deleted file mode 100644
index 8f0a8f391e..0000000000
--- a/share/mrdocs/addons/generator/asciidoc/README.adoc
+++ /dev/null
@@ -1,4 +0,0 @@
-= Addons/Generator/Asciidoc
-
-These files are used by the Asciidoc generator.
-
diff --git a/share/mrdocs/addons/generator/asciidoc/layouts/overload-set.adoc.hbs b/share/mrdocs/addons/generator/asciidoc/layouts/overload-set.adoc.hbs
index d2bea48210..7411fdb3e8 100644
--- a/share/mrdocs/addons/generator/asciidoc/layouts/overload-set.adoc.hbs
+++ b/share/mrdocs/addons/generator/asciidoc/layouts/overload-set.adoc.hbs
@@ -1,7 +1,8 @@
+{{! A page when the symbol type is "overloads" }}
 {{#if relfileprefix}}:relfileprefix: {{relfileprefix}}{{/if}}
 [#{{sectionref}}]
 
-={{#unless is_multipage}}={{/unless}} {{#if symbol.name}}{{>nested-name-specifier symbol=symbol.parent includeNamespace=true}}{{symbol.name}}{{else}}Unnamed overload set{{/if}}
+={{#unless is_multipage}}={{/unless}} {{#if symbol.name}}{{>types/nested-name-specifier symbol=symbol.parent includeNamespace=true}}{{symbol.name}}{{else}}Unnamed overload set{{/if}}
 
 {{#if symbol.members.[0]}}
   
diff --git a/share/mrdocs/addons/generator/asciidoc/layouts/page.adoc.hbs b/share/mrdocs/addons/generator/asciidoc/layouts/page.adoc.hbs
deleted file mode 100644
index 266927ee79..0000000000
--- a/share/mrdocs/addons/generator/asciidoc/layouts/page.adoc.hbs
+++ /dev/null
@@ -1,3 +0,0 @@
-={{#unless is_multipage}}={{/unless}} Reference
-:mrdocs:
-{{>symbol}}
diff --git a/share/mrdocs/addons/generator/asciidoc/layouts/single-footer.adoc.hbs b/share/mrdocs/addons/generator/asciidoc/layouts/single-footer.adoc.hbs
index 7638fe4efe..eda16c27e9 100644
--- a/share/mrdocs/addons/generator/asciidoc/layouts/single-footer.adoc.hbs
+++ b/share/mrdocs/addons/generator/asciidoc/layouts/single-footer.adoc.hbs
@@ -1,2 +1,3 @@
+{{! The footer for single page documentation }}
 
 Created with MrDocs
diff --git a/share/mrdocs/addons/generator/asciidoc/layouts/single-header.adoc.hbs b/share/mrdocs/addons/generator/asciidoc/layouts/single-header.adoc.hbs
index f0e8a66701..6d6ad46e19 100644
--- a/share/mrdocs/addons/generator/asciidoc/layouts/single-header.adoc.hbs
+++ b/share/mrdocs/addons/generator/asciidoc/layouts/single-header.adoc.hbs
@@ -1,2 +1,3 @@
+{{! The header for single page documentation }}
 = Reference
 :mrdocs:
diff --git a/share/mrdocs/addons/generator/asciidoc/layouts/single-symbol.adoc.hbs b/share/mrdocs/addons/generator/asciidoc/layouts/single-symbol.adoc.hbs
index d155de2110..db5e44c869 100644
--- a/share/mrdocs/addons/generator/asciidoc/layouts/single-symbol.adoc.hbs
+++ b/share/mrdocs/addons/generator/asciidoc/layouts/single-symbol.adoc.hbs
@@ -1,3 +1,4 @@
+{{! The section with a symbol in single page output or the symbol page in multi page output }}
 {{#if relfileprefix}}:relfileprefix: {{relfileprefix}}{{/if}}
 [#{{sectionref}}]
 
diff --git a/share/mrdocs/addons/generator/asciidoc/partials/declarator-before.adoc.hbs b/share/mrdocs/addons/generator/asciidoc/partials/declarator-before.adoc.hbs
deleted file mode 100644
index 29d9ab88b8..0000000000
--- a/share/mrdocs/addons/generator/asciidoc/partials/declarator-before.adoc.hbs
+++ /dev/null
@@ -1,17 +0,0 @@
-{{#if pointee-type~}}
-    {{~>declarator-before pointee-type nolink=nolink~}}
-    {{#if (or (eq pointee-type.kind "array") (eq pointee-type.kind "function"))}}({{/if~}}
-{{~/if~}}
-{{#if element-type~}}{{~>declarator-before element-type nolink=nolink~}}{{/if~}}
-{{#if return-type~}}{{~>declarator-before return-type nolink=nolink~}}{{/if~}}
-{{#if (eq kind "named")}}{{>name-info name nolink=nolink}}{{/if~}}
-{{#if (eq kind "auto")}}{{#if constraint}}{{>name-info constraint nolink=nolink}} {{/if~}}{{keyword}}{{/if~}}
-{{#if cv-qualifiers~}}
-    {{#if pointee-type}} {{cv-qualifiers}}{{else}} {{cv-qualifiers}}{{/if~}}
-{{/if~}}
-{{#if (eq kind "lvalue-reference")}}&{{/if~}}
-{{#if (eq kind "rvalue-reference")}}&&{{/if~}}
-{{#if (eq kind "pointer")}}*{{/if~}}
-{{#if (eq kind "member-pointer")}}{{>declarator parent-type nolink=nolink}}::*{{/if~}}
-{{#if (eq kind "decltype")}}decltype({{operand}}){{/if~}}
-{{#if is-pack~}}...{{/if}}
\ No newline at end of file
diff --git a/share/mrdocs/addons/generator/asciidoc/partials/declarator.adoc.hbs b/share/mrdocs/addons/generator/asciidoc/partials/declarator.adoc.hbs
deleted file mode 100644
index bbef8fdfe3..0000000000
--- a/share/mrdocs/addons/generator/asciidoc/partials/declarator.adoc.hbs
+++ /dev/null
@@ -1,5 +0,0 @@
-{{>declarator-before nolink=nolink~}}
-{{~#if decl-name}} {{decl-name~}}
-{{~#if decl-name-targs~}}{{>template-args args=decl-name-targs nolink=nolink}}{{~/if~}}
-{{~/if~}}
-{{~>declarator-after nolink=nolink}}
\ No newline at end of file
diff --git a/share/mrdocs/addons/generator/asciidoc/partials/info-member.adoc.hbs b/share/mrdocs/addons/generator/asciidoc/partials/info-member.adoc.hbs
deleted file mode 100644
index 8792011aaf..0000000000
--- a/share/mrdocs/addons/generator/asciidoc/partials/info-member.adoc.hbs
+++ /dev/null
@@ -1,8 +0,0 @@
-¦xref:{{ref}}[`{{>declarator-id . nolink=true}}`] {{>special-name-suffix .}} ¦
-{{#if (ne kind "overload")~}}
-    {{~doc.brief}}
-{{else~}}
-    {{#each (unique (pluck (pluck members "doc") "brief"))~}}
-        {{.}}
-    {{/each~}}
-{{/if}}
\ No newline at end of file
diff --git a/share/mrdocs/addons/generator/asciidoc/partials/nested-name-specifier.adoc.hbs b/share/mrdocs/addons/generator/asciidoc/partials/nested-name-specifier.adoc.hbs
deleted file mode 100644
index 907388c775..0000000000
--- a/share/mrdocs/addons/generator/asciidoc/partials/nested-name-specifier.adoc.hbs
+++ /dev/null
@@ -1,9 +0,0 @@
-{{#if (and symbol (or includeNamespace (ne symbol.kind "namespace")))~}}
-{{#if symbol.parent~}}
-{{>nested-name-specifier symbol=symbol.parent~}}
-{{else~}}
-{{/if~}}
-{{!-- {{#if symbol.name}}xref:{{symbol.ref}}[{{symbol.name}}]::{{/if~}} --}}
-{{!-- {{#if symbol.name}}{{symbol.name}}::{{/if~}} --}}
-{{#if symbol.name}}{{>declarator-id symbol link=symbol}}::{{/if~}}
-{{/if}}
\ No newline at end of file
diff --git a/share/mrdocs/addons/generator/asciidoc/partials/signature/alias.adoc.hbs b/share/mrdocs/addons/generator/asciidoc/partials/signature/alias.adoc.hbs
index 57ce3c593b..75a8755adc 100644
--- a/share/mrdocs/addons/generator/asciidoc/partials/signature/alias.adoc.hbs
+++ b/share/mrdocs/addons/generator/asciidoc/partials/signature/alias.adoc.hbs
@@ -1 +1 @@
-namespace {{symbol.name}} = {{>name-info symbol.aliasedSymbol}}
\ No newline at end of file
+namespace {{symbol.name}} = {{>types/name-info symbol.aliasedSymbol}}
\ No newline at end of file
diff --git a/share/mrdocs/addons/generator/asciidoc/partials/signature/concept.adoc.hbs b/share/mrdocs/addons/generator/asciidoc/partials/signature/concept.adoc.hbs
index 1afada9601..b79a44683a 100644
--- a/share/mrdocs/addons/generator/asciidoc/partials/signature/concept.adoc.hbs
+++ b/share/mrdocs/addons/generator/asciidoc/partials/signature/concept.adoc.hbs
@@ -1,3 +1,3 @@
-{{>template-head symbol.template}}
+{{>types/template-head symbol.template}}
 
-concept {{>declarator-id symbol}} = {{symbol.constraint}}
\ No newline at end of file
+concept {{>types/declarator-id symbol}} = {{symbol.constraint}}
\ No newline at end of file
diff --git a/share/mrdocs/addons/generator/asciidoc/partials/signature/enum.adoc.hbs b/share/mrdocs/addons/generator/asciidoc/partials/signature/enum.adoc.hbs
index 0192f23013..c37e4873ba 100644
--- a/share/mrdocs/addons/generator/asciidoc/partials/signature/enum.adoc.hbs
+++ b/share/mrdocs/addons/generator/asciidoc/partials/signature/enum.adoc.hbs
@@ -1,2 +1,2 @@
-enum {{>declarator-id symbol~}}
-{{#if symbol.type}} : {{>declarator symbol.type}}{{/if}}
\ No newline at end of file
+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/asciidoc/partials/signature/field.adoc.hbs b/share/mrdocs/addons/generator/asciidoc/partials/signature/field.adoc.hbs
index be3c7facb7..fc3b6f7bfb 100644
--- a/share/mrdocs/addons/generator/asciidoc/partials/signature/field.adoc.hbs
+++ b/share/mrdocs/addons/generator/asciidoc/partials/signature/field.adoc.hbs
@@ -1,6 +1,6 @@
 {{#if symbol.isMutable}}mutable
 {{/if~}}
-{{>declarator-before symbol.type}} {{>declarator-id symbol~}}
+{{>types/declarator-before symbol.type}} {{>types/declarator-id symbol~}}
 {{#if symbol.isBitfield}} : {{symbol.bitfieldWidth}}{{/if~}}
 {{#if symbol.default}} = {{symbol.default}}{{/if~}}
-{{>declarator-after symbol.type}}
\ No newline at end of file
+{{>types/declarator-after symbol.type}}
\ No newline at end of file
diff --git a/share/mrdocs/addons/generator/asciidoc/partials/signature/friend.adoc.hbs b/share/mrdocs/addons/generator/asciidoc/partials/signature/friend.adoc.hbs
index 17e146df9b..e7a92fc675 100644
--- a/share/mrdocs/addons/generator/asciidoc/partials/signature/friend.adoc.hbs
+++ b/share/mrdocs/addons/generator/asciidoc/partials/signature/friend.adoc.hbs
@@ -1,5 +1,5 @@
 {{#if symbol.type~}}
-friend {{>declarator 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/asciidoc/partials/signature/function.adoc.hbs b/share/mrdocs/addons/generator/asciidoc/partials/signature/function.adoc.hbs
index 4cd6773b97..22cc8c627a 100644
--- a/share/mrdocs/addons/generator/asciidoc/partials/signature/function.adoc.hbs
+++ b/share/mrdocs/addons/generator/asciidoc/partials/signature/function.adoc.hbs
@@ -1,4 +1,4 @@
-{{#if symbol.template}}{{>template-head symbol.template}}
+{{#if symbol.template}}{{>types/template-head symbol.template}}
 {{/if~}}
 {{#if isFriend}}friend
 {{/if~}}
@@ -10,11 +10,11 @@
 {{/if~}}
 {{#if symbol.explicitSpec}}{{symbol.explicitSpec}}
 {{/if~}}
-{{#if (eq symbol.class "normal")}}{{>declarator-before symbol.return}}
+{{#if (eq symbol.class "normal")}}{{>types/declarator-before symbol.return}}
 {{/if~}}
-{{>declarator-id symbol link=(select link link symbol.template.primary)}}
+{{>types/declarator-id symbol link=(select link link symbol.template.primary)}}
 ({{#if symbol.isExplicitObjectMemberFunction}}this {{/if}}{{#each symbol.params}}{{#unless (and @first @last)}}
-    {{/unless}}{{>declarator type decl-name=name~}}
+    {{/unless}}{{>types/declarator type decl-name=name~}}
     {{#if default}} = {{default}}{{/if~}}
     {{#unless @last}},{{/unless~}}
 {{/each~}}{{#if symbol.isVariadic}}{{#if symbol.params}}, {{/if}}...{{/if}})
@@ -22,7 +22,7 @@
 {{#if symbol.isVolatile}} volatile{{/if~}}
 {{#if symbol.refQualifier}} {{symbol.refQualifier}}{{/if~}}
 {{#if symbol.exceptionSpec}} {{symbol.exceptionSpec}}{{/if~}}
-{{#if (eq symbol.class "normal")}}{{>declarator-after symbol.return}}{{/if~}}
+{{#if (eq symbol.class "normal")}}{{>types/declarator-after symbol.return}}{{/if~}}
 {{#if symbol.requires}} requires {{symbol.requires}}{{/if~}}
 {{#if symbol.hasOverrideAttr}} override{{/if~}}
 {{#if symbol.isFinal}} final{{/if~}}
diff --git a/share/mrdocs/addons/generator/asciidoc/partials/signature/guide.adoc.hbs b/share/mrdocs/addons/generator/asciidoc/partials/signature/guide.adoc.hbs
index 18f29d6e6e..6a594ff10a 100644
--- a/share/mrdocs/addons/generator/asciidoc/partials/signature/guide.adoc.hbs
+++ b/share/mrdocs/addons/generator/asciidoc/partials/signature/guide.adoc.hbs
@@ -1,8 +1,8 @@
-{{#if symbol.template}}{{>template-head symbol.template}}
+{{#if symbol.template}}{{>types/template-head symbol.template}}
 {{/if~}}
-{{>declarator-id symbol}}
+{{>types/declarator-id symbol}}
 ({{#each symbol.params}}{{#unless (and @first @last)}}
-    {{/unless}}{{>declarator type decl-name=name~}}
+    {{/unless}}{{>types/declarator type decl-name=name~}}
     {{#if default}} = {{default}}{{/if~}}
     {{#unless @last}},{{/unless~}}
-{{/each~}}) -> {{>declarator symbol.deduced}}
\ No newline at end of file
+{{/each~}}) -> {{>types/declarator symbol.deduced}}
\ No newline at end of file
diff --git a/share/mrdocs/addons/generator/asciidoc/partials/signature/record.adoc.hbs b/share/mrdocs/addons/generator/asciidoc/partials/signature/record.adoc.hbs
index f9b529080f..2db881a951 100644
--- a/share/mrdocs/addons/generator/asciidoc/partials/signature/record.adoc.hbs
+++ b/share/mrdocs/addons/generator/asciidoc/partials/signature/record.adoc.hbs
@@ -1,6 +1,6 @@
-{{#if symbol.template}}{{>template-head symbol.template}}
+{{#if symbol.template}}{{>types/template-head symbol.template}}
 {{/if~}}
-{{#if isFriend}}friend {{/if}}{{symbol.tag}} {{>declarator-id symbol link=(select link link symbol.template.primary)~}}
+{{#if isFriend}}friend {{/if}}{{symbol.tag}} {{>types/declarator-id symbol link=(select link link symbol.template.primary)~}}
 {{#unless symbol.bases~}}
 {{else if isFriend~}}
 {{else}}
@@ -10,6 +10,6 @@
     :{{else}}
     ,{{/if~}}
     {{#unless (eq access ../symbol.defaultAccess)}} {{access}}{{/unless~}}
-    {{#if isVirtual}} virtual{{/if}} {{>declarator type~}}
+    {{#if isVirtual}} virtual{{/if}} {{>types/declarator type~}}
 {{/each~}}
 {{/unless}}
\ No newline at end of file
diff --git a/share/mrdocs/addons/generator/asciidoc/partials/signature/typedef.adoc.hbs b/share/mrdocs/addons/generator/asciidoc/partials/signature/typedef.adoc.hbs
index debd0e1e40..7b46b9078d 100644
--- a/share/mrdocs/addons/generator/asciidoc/partials/signature/typedef.adoc.hbs
+++ b/share/mrdocs/addons/generator/asciidoc/partials/signature/typedef.adoc.hbs
@@ -1,7 +1,7 @@
 {{#if symbol.isUsing~}}
-    {{#if symbol.template}}{{>template-head symbol.template}}
+    {{#if symbol.template}}{{>types/template-head symbol.template}}
     {{/if~}}
-    using {{symbol.name}} = {{>declarator symbol.type}}
+    using {{symbol.name}} = {{>types/declarator symbol.type}}
 {{~else~}}
-    typedef {{>declarator symbol.type decl-name=symbol.name}}
+    typedef {{>types/declarator symbol.type decl-name=symbol.name}}
 {{~/if}}
\ No newline at end of file
diff --git a/share/mrdocs/addons/generator/asciidoc/partials/signature/using.adoc.hbs b/share/mrdocs/addons/generator/asciidoc/partials/signature/using.adoc.hbs
index a3d8391120..d8ffe7733d 100644
--- a/share/mrdocs/addons/generator/asciidoc/partials/signature/using.adoc.hbs
+++ b/share/mrdocs/addons/generator/asciidoc/partials/signature/using.adoc.hbs
@@ -1 +1 @@
-using {{#if (eq symbol.class "typename")}}typename {{/if}}{{#if (eq symbol.class "enum")}}enum {{/if}}{{#if symbol.qualifier}}{{>name-info symbol.qualifier}}::{{/if}}{{symbol.name~}}
\ No newline at end of file
+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/asciidoc/partials/signature/variable.adoc.hbs b/share/mrdocs/addons/generator/asciidoc/partials/signature/variable.adoc.hbs
index 0c4c74b183..7f349b286e 100644
--- a/share/mrdocs/addons/generator/asciidoc/partials/signature/variable.adoc.hbs
+++ b/share/mrdocs/addons/generator/asciidoc/partials/signature/variable.adoc.hbs
@@ -1,4 +1,4 @@
-{{#if symbol.template}}{{>template-head symbol.template}}
+{{#if symbol.template}}{{>types/template-head symbol.template}}
 {{/if~}}
 {{#if symbol.constexprKind}}{{symbol.constexprKind}}
 {{/if~}}
@@ -6,6 +6,6 @@
 {{/if~}}
 {{#if symbol.isThreadLocal}}thread_local
 {{/if~}}
-{{>declarator-before symbol.type}} {{>declarator-id symbol link=(select link link symbol.template.primary)~}}
-{{>declarator-after symbol.type~}}
+{{>types/declarator-before symbol.type}} {{>types/declarator-id symbol link=(select link 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/asciidoc/partials/source.adoc.hbs b/share/mrdocs/addons/generator/asciidoc/partials/source.adoc.hbs
deleted file mode 100644
index 694597ccaf..0000000000
--- a/share/mrdocs/addons/generator/asciidoc/partials/source.adoc.hbs
+++ /dev/null
@@ -1 +0,0 @@
-Declared in header `<{{#unless (and @root.config.base-url (eq dcl.kind "source"))}}{{dcl.file}}{{else}}{{@root.config.base-url}}{{dcl.file}}#L{{dcl.line}}[{{dcl.file}},window=blank_]{{/unless}}>`
diff --git a/share/mrdocs/addons/generator/asciidoc/partials/symbols/alias.adoc.hbs b/share/mrdocs/addons/generator/asciidoc/partials/symbols/alias.adoc.hbs
index 0f4487aeda..dd35fd342b 100644
--- a/share/mrdocs/addons/generator/asciidoc/partials/symbols/alias.adoc.hbs
+++ b/share/mrdocs/addons/generator/asciidoc/partials/symbols/alias.adoc.hbs
@@ -1,11 +1,11 @@
 {{!-- alias --}}
-={{#unless is_multipage}}={{/unless}} {{>nested-name-specifier symbol=symbol.parent includeNamespace=true}}{{symbol.name}}
+={{#unless is_multipage}}={{/unless}} {{>types/nested-name-specifier symbol=symbol.parent includeNamespace=true}}{{symbol.name}}
 
 {{symbol.doc.brief}}
 
 =={{#unless is_multipage}}={{/unless}} Synopsis
 
-{{>source dcl=(primary_location symbol)}}
+{{>types/source dcl=(primary_location symbol)}}
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
diff --git a/share/mrdocs/addons/generator/asciidoc/partials/symbols/concept.adoc.hbs b/share/mrdocs/addons/generator/asciidoc/partials/symbols/concept.adoc.hbs
index b5374de82e..667a1ba219 100644
--- a/share/mrdocs/addons/generator/asciidoc/partials/symbols/concept.adoc.hbs
+++ b/share/mrdocs/addons/generator/asciidoc/partials/symbols/concept.adoc.hbs
@@ -1,11 +1,11 @@
 {{!-- concept --}}
-= {{>nested-name-specifier symbol=symbol.parent includeNamespace=true}}{{symbol.name}}
+= {{>types/nested-name-specifier symbol=symbol.parent includeNamespace=true}}{{symbol.name}}
 
 {{symbol.doc.brief}}
 
 == Synopsis
 
-{{>source dcl=(primary_location symbol)}}
+{{>types/source dcl=(primary_location symbol)}}
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
diff --git a/share/mrdocs/addons/generator/asciidoc/partials/symbols/enum.adoc.hbs b/share/mrdocs/addons/generator/asciidoc/partials/symbols/enum.adoc.hbs
index 1680e9e66f..37c82f5989 100644
--- a/share/mrdocs/addons/generator/asciidoc/partials/symbols/enum.adoc.hbs
+++ b/share/mrdocs/addons/generator/asciidoc/partials/symbols/enum.adoc.hbs
@@ -1,11 +1,11 @@
 {{!-- enum --}}
-={{#unless is_multipage}}={{/unless}} {{#if symbol.name}}{{>nested-name-specifier symbol=symbol.parent includeNamespace=true}}{{symbol.name}}{{else}}Unnamed enum{{/if}}
+={{#unless is_multipage}}={{/unless}} {{#if symbol.name}}{{>types/nested-name-specifier symbol=symbol.parent includeNamespace=true}}{{symbol.name}}{{else}}Unnamed enum{{/if}}
 
 {{symbol.doc.brief}}
 
 =={{#unless is_multipage}}={{/unless}} Synopsis
 
-{{>source dcl=(primary_location symbol)}}
+{{>types/source dcl=(primary_location symbol)}}
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -18,7 +18,7 @@
 |===
 |Name |Description
 {{#each symbol.members}}
-|xref:{{ref}}[`pass:v[{{>declarator-id . nolink=true}}]`] | {{~doc.brief}}
+|xref:{{ref}}[`pass:v[{{>types/declarator-id . nolink=true}}]`] | {{~doc.brief}}
 {{/each}}
 |===
 {{/if}}
diff --git a/share/mrdocs/addons/generator/asciidoc/partials/symbols/enumerator.adoc.hbs b/share/mrdocs/addons/generator/asciidoc/partials/symbols/enumerator.adoc.hbs
index 04a61119f7..4667265a8c 100644
--- a/share/mrdocs/addons/generator/asciidoc/partials/symbols/enumerator.adoc.hbs
+++ b/share/mrdocs/addons/generator/asciidoc/partials/symbols/enumerator.adoc.hbs
@@ -1,11 +1,11 @@
 {{!-- enumerator --}}
-={{#unless is_multipage}}={{/unless}} {{>nested-name-specifier symbol=symbol.parent includeNamespace=true}}{{symbol.name}}
+={{#unless is_multipage}}={{/unless}} {{>types/nested-name-specifier symbol=symbol.parent includeNamespace=true}}{{symbol.name}}
 
 {{symbol.doc.brief}}
 
 =={{#unless is_multipage}}={{/unless}} Synopsis
 
-{{>source dcl=(primary_location symbol)}}
+{{>types/source dcl=(primary_location symbol)}}
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
diff --git a/share/mrdocs/addons/generator/asciidoc/partials/symbols/field.adoc.hbs b/share/mrdocs/addons/generator/asciidoc/partials/symbols/field.adoc.hbs
index 55b65268f5..a079478b3d 100644
--- a/share/mrdocs/addons/generator/asciidoc/partials/symbols/field.adoc.hbs
+++ b/share/mrdocs/addons/generator/asciidoc/partials/symbols/field.adoc.hbs
@@ -1,11 +1,11 @@
 {{!-- field --}}
-={{#unless is_multipage}}={{/unless}} {{>nested-name-specifier symbol=symbol.parent includeNamespace=true}}{{symbol.name}}
+={{#unless is_multipage}}={{/unless}} {{>types/nested-name-specifier symbol=symbol.parent includeNamespace=true}}{{symbol.name}}
 
 {{symbol.doc.brief}}
 
 =={{#unless is_multipage}}={{/unless}} Synopsis
 
-{{>source dcl=(primary_location symbol)}}
+{{>types/source dcl=(primary_location symbol)}}
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
diff --git a/share/mrdocs/addons/generator/asciidoc/partials/symbols/friend.adoc.hbs b/share/mrdocs/addons/generator/asciidoc/partials/symbols/friend.adoc.hbs
index 25bdae40a6..1684001590 100644
--- a/share/mrdocs/addons/generator/asciidoc/partials/symbols/friend.adoc.hbs
+++ b/share/mrdocs/addons/generator/asciidoc/partials/symbols/friend.adoc.hbs
@@ -1,11 +1,11 @@
 {{!-- friend --}}
-={{#unless is_multipage}}={{/unless}} {{#if symbol.symbol}}{{>nested-name-specifier symbol=symbol.symbol.parent includeNamespace=true}}{{symbol.symbol.name}}{{else}}{{symbol.type.name}}{{/if}}
+={{#unless is_multipage}}={{/unless}} {{#if symbol.symbol}}{{>types/nested-name-specifier symbol=symbol.symbol.parent includeNamespace=true}}{{symbol.symbol.name}}{{else}}{{symbol.type.name}}{{/if}}
 
 {{symbol.doc.brief}}
 
 =={{#unless is_multipage}}={{/unless}} Synopsis
 
-{{>source dcl=(primary_location symbol)}}
+{{>types/source dcl=(primary_location symbol)}}
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
diff --git a/share/mrdocs/addons/generator/asciidoc/partials/symbols/function.adoc.hbs b/share/mrdocs/addons/generator/asciidoc/partials/symbols/function.adoc.hbs
index b9e704e795..6e11edd89b 100644
--- a/share/mrdocs/addons/generator/asciidoc/partials/symbols/function.adoc.hbs
+++ b/share/mrdocs/addons/generator/asciidoc/partials/symbols/function.adoc.hbs
@@ -1,11 +1,11 @@
 {{!-- function --}}
-={{#unless is_multipage}}={{/unless}} {{>nested-name-specifier symbol=symbol.parent includeNamespace=true}}{{symbol.name}}
+={{#unless is_multipage}}={{/unless}} {{>types/nested-name-specifier symbol=symbol.parent includeNamespace=true}}{{symbol.name}}
 
 {{symbol.doc.brief}}
 
 =={{#unless is_multipage}}={{/unless}} Synopsis
 
-{{>source dcl=(primary_location symbol)}}
+{{>types/source dcl=(primary_location symbol)}}
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
diff --git a/share/mrdocs/addons/generator/asciidoc/partials/symbols/guide.adoc.hbs b/share/mrdocs/addons/generator/asciidoc/partials/symbols/guide.adoc.hbs
index 92e2416c23..4a3591dc6f 100644
--- a/share/mrdocs/addons/generator/asciidoc/partials/symbols/guide.adoc.hbs
+++ b/share/mrdocs/addons/generator/asciidoc/partials/symbols/guide.adoc.hbs
@@ -1,11 +1,11 @@
 {{!-- guides --}}
-={{#unless is_multipage}}={{/unless}} {{>nested-name-specifier symbol=symbol.parent includeNamespace=true}}{{symbol.name}}
+={{#unless is_multipage}}={{/unless}} {{>types/nested-name-specifier symbol=symbol.parent includeNamespace=true}}{{symbol.name}}
 
 {{symbol.doc.brief}}
 
 =={{#unless is_multipage}}={{/unless}} Synopsis
 
-{{>source dcl=(primary_location symbol)}}
+{{>types/source dcl=(primary_location symbol)}}
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
diff --git a/share/mrdocs/addons/generator/asciidoc/partials/symbols/namespace.adoc.hbs b/share/mrdocs/addons/generator/asciidoc/partials/symbols/namespace.adoc.hbs
index da635f1ea0..8a622bd651 100644
--- a/share/mrdocs/addons/generator/asciidoc/partials/symbols/namespace.adoc.hbs
+++ b/share/mrdocs/addons/generator/asciidoc/partials/symbols/namespace.adoc.hbs
@@ -1,6 +1,6 @@
 {{!-- namespace --}}
-={{#unless is_multipage}}={{/unless}} {{#if symbol.name}}{{>nested-name-specifier symbol=symbol.parent includeNamespace=true}}{{symbol.name}}{{else if symbol.parent}}Unnamed namespace{{else}}Global namespace{{/if}}
+={{#unless is_multipage}}={{/unless}} {{#if symbol.name}}{{>types/nested-name-specifier symbol=symbol.parent includeNamespace=true}}{{symbol.name}}{{else if symbol.parent}}Unnamed namespace{{else}}Global namespace{{/if}}
 
-{{> tranche tranche=symbol.interface label="" is-namespace=true}}
+{{>types/tranche tranche=symbol.interface label="" is-namespace=true}}
 
-{{>info-list members=symbol.usingDirectives title="Using Directives"}}
\ No newline at end of file
+{{>types/info-list members=symbol.usingDirectives title="Using Directives"}}
\ No newline at end of file
diff --git a/share/mrdocs/addons/generator/asciidoc/partials/symbols/record.adoc.hbs b/share/mrdocs/addons/generator/asciidoc/partials/symbols/record.adoc.hbs
index d8ca9a643f..c55f228f35 100644
--- a/share/mrdocs/addons/generator/asciidoc/partials/symbols/record.adoc.hbs
+++ b/share/mrdocs/addons/generator/asciidoc/partials/symbols/record.adoc.hbs
@@ -1,11 +1,11 @@
 {{!-- record --}}
-={{#unless is_multipage}}={{/unless}} {{#if symbol.name}}{{>nested-name-specifier symbol=symbol.parent includeNamespace=true}}{{symbol.name}}{{else}}Unnamed class{{/if}}
+={{#unless is_multipage}}={{/unless}} {{#if symbol.name}}{{>types/nested-name-specifier symbol=symbol.parent includeNamespace=true}}{{symbol.name}}{{else}}Unnamed class{{/if}}
 
 {{symbol.doc.brief}}
 
 =={{#unless is_multipage}}={{/unless}} Synopsis
 
-{{>source dcl=(primary_location symbol)}}
+{{>types/source dcl=(primary_location symbol)}}
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -13,9 +13,9 @@
 ----
 
 {{#with symbol.interface}}
-{{> tranche tranche=public label="" is-namespace=false}}
-{{> tranche tranche=protected label="Protected" is-namespace=false}}
-{{> tranche tranche=private label="Private" is-namespace=false}}
+{{>types/tranche tranche=public label="" is-namespace=false}}
+{{>types/tranche tranche=protected label="Protected" is-namespace=false}}
+{{>types/tranche tranche=private label="Private" is-namespace=false}}
 {{/with}}
 
 {{#if symbol.doc.description}}
diff --git a/share/mrdocs/addons/generator/asciidoc/partials/symbols/typedef.adoc.hbs b/share/mrdocs/addons/generator/asciidoc/partials/symbols/typedef.adoc.hbs
index 20627d6f85..6d4042b501 100644
--- a/share/mrdocs/addons/generator/asciidoc/partials/symbols/typedef.adoc.hbs
+++ b/share/mrdocs/addons/generator/asciidoc/partials/symbols/typedef.adoc.hbs
@@ -1,11 +1,11 @@
 {{!-- typedef --}}
-={{#unless is_multipage}}={{/unless}} {{>nested-name-specifier symbol=symbol.parent includeNamespace=true}}{{symbol.name}}
+={{#unless is_multipage}}={{/unless}} {{>types/nested-name-specifier symbol=symbol.parent includeNamespace=true}}{{symbol.name}}
 
 {{symbol.doc.brief}}
 
 =={{#unless is_multipage}}={{/unless}} Synopsis
 
-{{>source dcl=(primary_location symbol)}}
+{{>types/source dcl=(primary_location symbol)}}
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
diff --git a/share/mrdocs/addons/generator/asciidoc/partials/symbols/using.adoc.hbs b/share/mrdocs/addons/generator/asciidoc/partials/symbols/using.adoc.hbs
index 63a2286cbd..311c1c8f07 100644
--- a/share/mrdocs/addons/generator/asciidoc/partials/symbols/using.adoc.hbs
+++ b/share/mrdocs/addons/generator/asciidoc/partials/symbols/using.adoc.hbs
@@ -1,11 +1,11 @@
 {{!-- symbols/using.adoc.hbs --}}
-={{#unless is_multipage}}={{/unless}} {{>nested-name-specifier symbol=symbol.parent includeNamespace=true}}{{symbol.name}}
+={{#unless is_multipage}}={{/unless}} {{>types/nested-name-specifier symbol=symbol.parent includeNamespace=true}}{{symbol.name}}
 
 {{symbol.doc.brief}}
 
 =={{#unless is_multipage}}={{/unless}} Synopsis
 
-{{>source dcl=(primary_location symbol)}}
+{{>types/source dcl=(primary_location symbol)}}
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
diff --git a/share/mrdocs/addons/generator/asciidoc/partials/symbols/variable.adoc.hbs b/share/mrdocs/addons/generator/asciidoc/partials/symbols/variable.adoc.hbs
index 4d5b00a409..4b3bd5b26b 100644
--- a/share/mrdocs/addons/generator/asciidoc/partials/symbols/variable.adoc.hbs
+++ b/share/mrdocs/addons/generator/asciidoc/partials/symbols/variable.adoc.hbs
@@ -1,11 +1,11 @@
 {{!-- variable --}}
-={{#unless is_multipage}}={{/unless}} {{>nested-name-specifier symbol=symbol.parent includeNamespace=true}}{{symbol.name}}
+={{#unless is_multipage}}={{/unless}} {{>types/nested-name-specifier symbol=symbol.parent includeNamespace=true}}{{symbol.name}}
 
 {{symbol.doc.brief}}
 
 =={{#unless is_multipage}}={{/unless}} Synopsis
 
-{{>source dcl=(primary_location symbol)}}
+{{>types/source dcl=(primary_location symbol)}}
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
diff --git a/share/mrdocs/addons/generator/asciidoc/partials/template-args.adoc.hbs b/share/mrdocs/addons/generator/asciidoc/partials/template-args.adoc.hbs
deleted file mode 100644
index 4a86d8c008..0000000000
--- a/share/mrdocs/addons/generator/asciidoc/partials/template-args.adoc.hbs
+++ /dev/null
@@ -1,4 +0,0 @@
-<{{~#each args~}}
-{{~>template-arg nolink=../nolink~}}
-{{~#if (not @last)}}, {{/if~}}
-{{~/each~}}>
\ No newline at end of file
diff --git a/share/mrdocs/addons/generator/asciidoc/partials/template-param.adoc.hbs b/share/mrdocs/addons/generator/asciidoc/partials/template-param.adoc.hbs
deleted file mode 100644
index d9136bb37f..0000000000
--- a/share/mrdocs/addons/generator/asciidoc/partials/template-param.adoc.hbs
+++ /dev/null
@@ -1,13 +0,0 @@
-{{#if (eq kind "type")~}}
-    {{#if constraint}}{{>name-info constraint}}{{else}}{{key}}{{/if~}}
-    {{#if is-pack}}...{{/if~}}
-    {{#if name}} {{name}}{{/if~}}
-    {{#if default}} = {{>template-arg default~}}{{/if~}}
-{{else if (eq kind "non-type")~}}
-    {{>declarator type decl-name=name}}{{#if is-pack}}...{{/if~}}
-    {{#if default}} = {{>template-arg default~}}{{/if~}}
-{{else if (eq kind "template")~}}
-    {{>template-head}} typename{{#if is-pack}}...{{/if~}}
-    {{#if name}} {{name}}{{/if~}}
-    {{#if default}} = {{>template-arg default~}}{{/if~}}
-{{/if}}
\ No newline at end of file
diff --git a/share/mrdocs/addons/generator/asciidoc/partials/tranche.adoc.hbs b/share/mrdocs/addons/generator/asciidoc/partials/tranche.adoc.hbs
deleted file mode 100644
index bbaef565a3..0000000000
--- a/share/mrdocs/addons/generator/asciidoc/partials/tranche.adoc.hbs
+++ /dev/null
@@ -1,17 +0,0 @@
-{{>info-list members=tranche.namespaces title="Namespaces"}}
-{{>info-list members=(concat tranche.records tranche.types) title=(concat label " " "Types")}}
-{{>info-list members=tranche.enums title=(concat label " " "Enums")}}
-{{#if is-namespace}}
-{{>info-list members=tranche.overloads title="Functions"}}
-{{>info-list members=tranche.variables title="Variables"}}
-{{>info-list members=tranche.concepts title="Concepts"}}
-{{else}}
-{{>info-list members=tranche.overloads title=(concat label " " "Member Functions")}}
-{{>info-list members=tranche.staticoverloads title=(concat label " " "Static Member Functions")}}
-{{>info-list members=tranche.fields title=(concat label " " "Data Members")}}
-{{>info-list members=tranche.variables title=(concat label " " "Static Data Members")}}
-{{>info-list members=tranche.friends title=(concat label " " "Friends")}}
-{{>info-list members=tranche.aliases title=(concat label " " "Aliases")}}
-{{>info-list members=tranche.usings title=(concat label " " "Using Declarations")}}
-{{/if}}
-{{>info-list members=tranche.guides title=(concat label " " "Deduction Guides")}}
diff --git a/share/mrdocs/addons/generator/asciidoc/partials/declarator-after.adoc.hbs b/share/mrdocs/addons/generator/asciidoc/partials/types/declarator-after.adoc.hbs
similarity index 62%
rename from share/mrdocs/addons/generator/asciidoc/partials/declarator-after.adoc.hbs
rename to share/mrdocs/addons/generator/asciidoc/partials/types/declarator-after.adoc.hbs
index 5f40d6f099..4351dacfe3 100644
--- a/share/mrdocs/addons/generator/asciidoc/partials/declarator-after.adoc.hbs
+++ b/share/mrdocs/addons/generator/asciidoc/partials/types/declarator-after.adoc.hbs
@@ -1,15 +1,16 @@
+{{! Helper for "declarator" partial }}
 {{#if pointee-type~}}
     {{#if (or (eq pointee-type.kind "array") (eq pointee-type.kind "function"))}}){{/if~}}
-    {{~>declarator-after pointee-type nolink=nolink~}}
+    {{~>types/declarator-after pointee-type nolink=nolink~}}
 {{else if (eq kind "array")~}}
     [{{bounds-value}}]
-    {{~>declarator-after element-type nolink=nolink~}}
+    {{~>types/declarator-after element-type nolink=nolink~}}
 {{else if (eq kind "function")~}}
     ({{#each param-types~}}
-        {{~>declarator nolink=../nolink~}}{{~#unless @last}}, {{/unless~}}
+        {{~>types/declarator nolink=../nolink~}}{{~#unless @last}}, {{/unless~}}
     {{/each~}}{{#if is-variadic}}{{#if param-types}}, {{/if}}...{{/if}})
     {{~#if cv-qualifiers}} {{cv-qualifiers}}{{/if~}}
     {{#if (eq ref-qualifier "lvalue")}} &{{else if (eq ref-qualifier "rvalue")}} &&{{/if~}}
     {{#if exception-spec}} {{exception-spec}}{{/if~}}
-    {{~>declarator-after return-type nolink=nolink~}}
+    {{~>types/declarator-after return-type nolink=nolink~}}
 {{/if}}
\ No newline at end of file
diff --git a/share/mrdocs/addons/generator/asciidoc/partials/types/declarator-before.adoc.hbs b/share/mrdocs/addons/generator/asciidoc/partials/types/declarator-before.adoc.hbs
new file mode 100644
index 0000000000..f46216c9e3
--- /dev/null
+++ b/share/mrdocs/addons/generator/asciidoc/partials/types/declarator-before.adoc.hbs
@@ -0,0 +1,18 @@
+{{! Helper for "declarator" partial }}
+{{#if pointee-type~}}
+    {{~>types/declarator-before pointee-type nolink=nolink~}}
+    {{#if (or (eq pointee-type.kind "array") (eq pointee-type.kind "function"))}}({{/if~}}
+{{~/if~}}
+{{#if element-type~}}{{~>types/declarator-before element-type nolink=nolink~}}{{/if~}}
+{{#if return-type~}}{{~>types/declarator-before return-type nolink=nolink~}}{{/if~}}
+{{#if (eq kind "named")}}{{>types/name-info name nolink=nolink}}{{/if~}}
+{{#if (eq kind "auto")}}{{#if constraint}}{{>types/name-info constraint nolink=nolink}} {{/if~}}{{keyword}}{{/if~}}
+{{#if cv-qualifiers~}}
+    {{#if pointee-type}} {{cv-qualifiers}}{{else}} {{cv-qualifiers}}{{/if~}}
+{{/if~}}
+{{#if (eq kind "lvalue-reference")}}&{{/if~}}
+{{#if (eq kind "rvalue-reference")}}&&{{/if~}}
+{{#if (eq kind "pointer")}}*{{/if~}}
+{{#if (eq kind "member-pointer")}}{{>types/declarator parent-type nolink=nolink}}::*{{/if~}}
+{{#if (eq kind "decltype")}}decltype({{operand}}){{/if~}}
+{{#if is-pack~}}...{{/if}}
\ No newline at end of file
diff --git a/share/mrdocs/addons/generator/asciidoc/partials/declarator-id.adoc.hbs b/share/mrdocs/addons/generator/asciidoc/partials/types/declarator-id.adoc.hbs
similarity index 54%
rename from share/mrdocs/addons/generator/asciidoc/partials/declarator-id.adoc.hbs
rename to share/mrdocs/addons/generator/asciidoc/partials/types/declarator-id.adoc.hbs
index 93a188e021..c9d1f97557 100644
--- a/share/mrdocs/addons/generator/asciidoc/partials/declarator-id.adoc.hbs
+++ b/share/mrdocs/addons/generator/asciidoc/partials/types/declarator-id.adoc.hbs
@@ -1,10 +1,11 @@
+{{! The declarator for a symbol: typically the symbol name with a link }}
 {{#if (and (eq kind "function") (eq class "conversion"))~}}
-    operator {{>declarator return nolink=nolink~}}
+    operator {{>types/declarator return nolink=nolink~}}
 {{else if (eq kind "guide")~}}
-    {{>declarator deduced nolink=nolink~}}
+    {{>types/declarator deduced nolink=nolink~}}
 {{else~}}
     {{#if (and link.ref (not nolink))}}xref:{{link.ref}}[pass:[{{name}}]]{{else}}{{name}}{{/if~}}
     {{#if (or (eq template.kind "explicit") (eq template.kind "partial"))~}}
-        {{>template-args args=template.args nolink=nolink~}}
+        {{>types/template-args args=template.args nolink=nolink~}}
     {{/if~}}
 {{/if}}
\ No newline at end of file
diff --git a/share/mrdocs/addons/generator/asciidoc/partials/types/declarator.adoc.hbs b/share/mrdocs/addons/generator/asciidoc/partials/types/declarator.adoc.hbs
new file mode 100644
index 0000000000..dad2b1d446
--- /dev/null
+++ b/share/mrdocs/addons/generator/asciidoc/partials/types/declarator.adoc.hbs
@@ -0,0 +1,6 @@
+{{! Render a type object as a declaration }}
+{{>types/declarator-before nolink=nolink~}}
+{{~#if decl-name}} {{decl-name~}}
+{{~#if decl-name-targs~}}{{>types/template-args args=decl-name-targs nolink=nolink}}{{~/if~}}
+{{~/if~}}
+{{~>types/declarator-after nolink=nolink}}
\ No newline at end of file
diff --git a/share/mrdocs/addons/generator/asciidoc/partials/info-list.adoc.hbs b/share/mrdocs/addons/generator/asciidoc/partials/types/info-list.adoc.hbs
similarity index 69%
rename from share/mrdocs/addons/generator/asciidoc/partials/info-list.adoc.hbs
rename to share/mrdocs/addons/generator/asciidoc/partials/types/info-list.adoc.hbs
index 574320fdd3..6d58d191b6 100644
--- a/share/mrdocs/addons/generator/asciidoc/partials/info-list.adoc.hbs
+++ b/share/mrdocs/addons/generator/asciidoc/partials/types/info-list.adoc.hbs
@@ -1,10 +1,11 @@
+{{! List the "members" of a symbol as a table }}
 {{#if members}}
 =={{#unless is_multipage}}={{/unless}} {{title}}
 [cols=2,separator=¦]
 |===
 ¦Name ¦Description
 {{#each (sort_by members "name")}}
-{{>info-member .}}
+{{>types/info-member .}}
 {{/each}}
 |===
 {{/if}}
\ No newline at end of file
diff --git a/share/mrdocs/addons/generator/asciidoc/partials/types/info-member.adoc.hbs b/share/mrdocs/addons/generator/asciidoc/partials/types/info-member.adoc.hbs
new file mode 100644
index 0000000000..43ff2950d2
--- /dev/null
+++ b/share/mrdocs/addons/generator/asciidoc/partials/types/info-member.adoc.hbs
@@ -0,0 +1,9 @@
+{{! Helper for "info-list": renders a symbol as a row in a table of members }}
+¦xref:{{ref}}[`{{>types/declarator-id . nolink=true}}`] {{>types/special-name-suffix .}} ¦
+{{#if (ne kind "overload")~}}
+    {{~doc.brief}}
+{{else~}}
+    {{#each (unique (pluck (pluck members "doc") "brief"))~}}
+        {{.}}
+    {{/each~}}
+{{/if}}
\ No newline at end of file
diff --git a/share/mrdocs/addons/generator/asciidoc/partials/name-info.adoc.hbs b/share/mrdocs/addons/generator/asciidoc/partials/types/name-info.adoc.hbs
similarity index 54%
rename from share/mrdocs/addons/generator/asciidoc/partials/name-info.adoc.hbs
rename to share/mrdocs/addons/generator/asciidoc/partials/types/name-info.adoc.hbs
index d53ea191f3..c42827aac5 100644
--- a/share/mrdocs/addons/generator/asciidoc/partials/name-info.adoc.hbs
+++ b/share/mrdocs/addons/generator/asciidoc/partials/types/name-info.adoc.hbs
@@ -1,6 +1,7 @@
+{{! Renders a name info object }}
 {{#if prefix~}}
-{{>name-info prefix nolink=nolink~}}::
+{{>types/name-info prefix nolink=nolink~}}::
 {{~/if~}}
 {{#if (or (eq name "see-below") (eq name "implementation-defined"))~}}pass:q[_{{name}}_]{{else~}}
 {{#if (and symbol.ref (not nolink))}}xref:{{symbol.ref}}[{{name}}]{{else~}}
-{{name}}{{/if}}{{#if args}}{{>template-args args=args nolink=nolink}}{{/if~}}{{/if~}}{{/if~}}
\ No newline at end of file
+{{name}}{{/if}}{{#if args}}{{>types/template-args args=args nolink=nolink}}{{/if~}}{{/if~}}
\ No newline at end of file
diff --git a/share/mrdocs/addons/generator/asciidoc/partials/types/nested-name-specifier.adoc.hbs b/share/mrdocs/addons/generator/asciidoc/partials/types/nested-name-specifier.adoc.hbs
new file mode 100644
index 0000000000..83883cdc2c
--- /dev/null
+++ b/share/mrdocs/addons/generator/asciidoc/partials/types/nested-name-specifier.adoc.hbs
@@ -0,0 +1,8 @@
+{{! Print the symbol name with its parent namespace(s) if any. }}
+{{#if (and symbol (or includeNamespace (ne symbol.kind "namespace")))~}}
+{{#if symbol.parent~}}
+{{>types/nested-name-specifier symbol=symbol.parent~}}
+{{else~}}
+{{/if~}}
+{{#if symbol.name}}{{>types/declarator-id symbol link=symbol}}::{{/if~}}
+{{/if}}
\ No newline at end of file
diff --git a/share/mrdocs/addons/generator/asciidoc/partials/qualified-path.adoc.hbs b/share/mrdocs/addons/generator/asciidoc/partials/types/qualified-path.adoc.hbs
similarity index 63%
rename from share/mrdocs/addons/generator/asciidoc/partials/qualified-path.adoc.hbs
rename to share/mrdocs/addons/generator/asciidoc/partials/types/qualified-path.adoc.hbs
index 0c3a1f2f41..1ba51002c8 100644
--- a/share/mrdocs/addons/generator/asciidoc/partials/qualified-path.adoc.hbs
+++ b/share/mrdocs/addons/generator/asciidoc/partials/types/qualified-path.adoc.hbs
@@ -1,6 +1,7 @@
+{{! Renders the qualified path of a symbol with proper links for each component. }}
 {{#unless (or (contains @root.symbol.namespace symbol) (eq @root.symbol symbol))~}}
 {{#if symbol.parent~}}
-{{>qualified-path symbol=symbol.parent nolink=nolink~}}
+{{>types/qualified-path symbol=symbol.parent nolink=nolink~}}
 {{else~}}
 {{/if~}}
 {{#if symbol.name}}{{#if (not nolink)}}xref:{{symbol.ref}}[{{symbol.name}}]{{else}}{{symbol.name}}{{/if}}::{{/if~}}
diff --git a/share/mrdocs/addons/generator/asciidoc/partials/types/source.adoc.hbs b/share/mrdocs/addons/generator/asciidoc/partials/types/source.adoc.hbs
new file mode 100644
index 0000000000..c97ffda63e
--- /dev/null
+++ b/share/mrdocs/addons/generator/asciidoc/partials/types/source.adoc.hbs
@@ -0,0 +1,2 @@
+{{! Renders where the symbol is declared with a link to the source file when the `base-url` config option is defined }}
+Declared in `<{{#unless (and @root.config.base-url (eq dcl.kind "source"))}}{{dcl.file}}{{else}}{{@root.config.base-url}}{{dcl.file}}#L{{dcl.line}}[{{dcl.file}},window=blank_]{{/unless}}>`
diff --git a/share/mrdocs/addons/generator/asciidoc/partials/special-name-suffix.adoc.hbs b/share/mrdocs/addons/generator/asciidoc/partials/types/special-name-suffix.adoc.hbs
similarity index 52%
rename from share/mrdocs/addons/generator/asciidoc/partials/special-name-suffix.adoc.hbs
rename to share/mrdocs/addons/generator/asciidoc/partials/types/special-name-suffix.adoc.hbs
index 4db1d48ec9..08e471c342 100644
--- a/share/mrdocs/addons/generator/asciidoc/partials/special-name-suffix.adoc.hbs
+++ b/share/mrdocs/addons/generator/asciidoc/partials/types/special-name-suffix.adoc.hbs
@@ -1,4 +1,5 @@
-{{#if (eq kind "overload")}}{{>special-name-suffix (front members)~}}
+{{! Renders the name of the symbol with a suffix when the symbol is a special member (e.g., constructor, destructor, overload, variant member) }}
+{{#if (eq kind "overload")}}{{>types/special-name-suffix (front members)~}}
 {{else if (eq kind "function")~}}
 {{#if (eq class "constructor")}}[.small]#[constructor]#
 {{~else if (eq class "destructor")}}[.small]#[destructor]#
diff --git a/share/mrdocs/addons/generator/asciidoc/partials/template-arg.adoc.hbs b/share/mrdocs/addons/generator/asciidoc/partials/types/template-arg.adoc.hbs
similarity index 75%
rename from share/mrdocs/addons/generator/asciidoc/partials/template-arg.adoc.hbs
rename to share/mrdocs/addons/generator/asciidoc/partials/types/template-arg.adoc.hbs
index 130b144a05..e852d4e327 100644
--- a/share/mrdocs/addons/generator/asciidoc/partials/template-arg.adoc.hbs
+++ b/share/mrdocs/addons/generator/asciidoc/partials/types/template-arg.adoc.hbs
@@ -1,5 +1,6 @@
+{{! Renders a template argument }}
 {{#if (eq kind "type")~}}
-{{~>declarator type nolink=nolink~}}
+{{~>types/declarator type nolink=nolink~}}
 {{else if (eq kind "non-type")~}}
 {{~value~}}
 {{else if (eq kind "template")~}}
diff --git a/share/mrdocs/addons/generator/asciidoc/partials/types/template-args.adoc.hbs b/share/mrdocs/addons/generator/asciidoc/partials/types/template-args.adoc.hbs
new file mode 100644
index 0000000000..d105b29166
--- /dev/null
+++ b/share/mrdocs/addons/generator/asciidoc/partials/types/template-args.adoc.hbs
@@ -0,0 +1,5 @@
+{{! Render all template arguments }}
+<{{~#each args~}}
+{{~>types/template-arg nolink=../nolink~}}
+{{~#if (not @last)}}, {{/if~}}
+{{~/each~}}>
\ No newline at end of file
diff --git a/share/mrdocs/addons/generator/asciidoc/partials/template-head.adoc.hbs b/share/mrdocs/addons/generator/asciidoc/partials/types/template-head.adoc.hbs
similarity index 58%
rename from share/mrdocs/addons/generator/asciidoc/partials/template-head.adoc.hbs
rename to share/mrdocs/addons/generator/asciidoc/partials/types/template-head.adoc.hbs
index c912b430d7..a568240fb8 100644
--- a/share/mrdocs/addons/generator/asciidoc/partials/template-head.adoc.hbs
+++ b/share/mrdocs/addons/generator/asciidoc/partials/types/template-head.adoc.hbs
@@ -1,4 +1,5 @@
+{{! Renders the template head for a template declaration. }}
 template<{{#each params}}{{#unless (and @first @last)}}
-    {{/unless}}{{>template-param~}}
+    {{/unless}}{{>types/template-param~}}
     {{#unless @last}},{{/unless~}}
 {{/each}}>{{#if requires}} requires {{requires}}{{/if}}
\ No newline at end of file
diff --git a/share/mrdocs/addons/generator/asciidoc/partials/types/template-param.adoc.hbs b/share/mrdocs/addons/generator/asciidoc/partials/types/template-param.adoc.hbs
new file mode 100644
index 0000000000..29ec264014
--- /dev/null
+++ b/share/mrdocs/addons/generator/asciidoc/partials/types/template-param.adoc.hbs
@@ -0,0 +1,14 @@
+{{! Renders a template parameter }}
+{{#if (eq kind "type")~}}
+    {{#if constraint}}{{>types/name-info constraint}}{{else}}{{key}}{{/if~}}
+    {{#if is-pack}}...{{/if~}}
+    {{#if name}} {{name}}{{/if~}}
+    {{#if default}} = {{>types/template-arg default~}}{{/if~}}
+{{else if (eq kind "non-type")~}}
+    {{>types/declarator type decl-name=name}}{{#if is-pack}}...{{/if~}}
+    {{#if default}} = {{>types/template-arg default~}}{{/if~}}
+{{else if (eq kind "template")~}}
+    {{>types/template-head}} typename{{#if is-pack}}...{{/if~}}
+    {{#if name}} {{name}}{{/if~}}
+    {{#if default}} = {{>types/template-arg default~}}{{/if~}}
+{{/if}}
\ No newline at end of file
diff --git a/share/mrdocs/addons/generator/asciidoc/partials/types/tranche.adoc.hbs b/share/mrdocs/addons/generator/asciidoc/partials/types/tranche.adoc.hbs
new file mode 100644
index 0000000000..33f9c6b602
--- /dev/null
+++ b/share/mrdocs/addons/generator/asciidoc/partials/types/tranche.adoc.hbs
@@ -0,0 +1,18 @@
+{{! Renders an info-list table for each list in a Tranche }}
+{{>types/info-list members=tranche.namespaces title="Namespaces"}}
+{{>types/info-list members=(concat tranche.records tranche.types) title=(concat label " " "Types")}}
+{{>types/info-list members=tranche.enums title=(concat label " " "Enums")}}
+{{#if is-namespace}}
+{{>types/info-list members=tranche.overloads title="Functions"}}
+{{>types/info-list members=tranche.variables title="Variables"}}
+{{>types/info-list members=tranche.concepts title="Concepts"}}
+{{else}}
+{{>types/info-list members=tranche.overloads title=(concat label " " "Member Functions")}}
+{{>types/info-list members=tranche.staticoverloads title=(concat label " " "Static Member Functions")}}
+{{>types/info-list members=tranche.fields title=(concat label " " "Data Members")}}
+{{>types/info-list members=tranche.variables title=(concat label " " "Static Data Members")}}
+{{>types/info-list members=tranche.friends title=(concat label " " "Friends")}}
+{{>types/info-list members=tranche.aliases title=(concat label " " "Aliases")}}
+{{>types/info-list members=tranche.usings title=(concat label " " "Using Declarations")}}
+{{/if}}
+{{>types/info-list members=tranche.guides title=(concat label " " "Deduction Guides")}}
diff --git a/share/mrdocs/addons/generator/html/layouts/overload-set.html.hbs b/share/mrdocs/addons/generator/html/layouts/overload-set.html.hbs
index d1ce02e7dc..7902c76d16 100644
--- a/share/mrdocs/addons/generator/html/layouts/overload-set.html.hbs
+++ b/share/mrdocs/addons/generator/html/layouts/overload-set.html.hbs
@@ -1,7 +1,8 @@
+{{! A page when the symbol type is "overloads" }}
 {{#if relfileprefix}}<meta name="relfileprefix" content="{{relfileprefix}}">{{/if}}
 <div id="{{#if (is_multipage)}}{{symbol.id}}{{else}}{{symbol.ref}}{{/if}}">
 
-<h1>{{#if symbol.name}}Overload set {{>nested-name-specifier symbol=symbol.parent}}{{symbol.name}}{{else}}Unnamed overload set{{/if}}</h1>
+<h1>{{#if symbol.name}}Overload set {{>types/nested-name-specifier symbol=symbol.parent}}{{symbol.name}}{{else}}Unnamed overload set{{/if}}</h1>
 
 <h2>Members</h2>
 
diff --git a/share/mrdocs/addons/generator/html/layouts/page.html.hbs b/share/mrdocs/addons/generator/html/layouts/page.html.hbs
deleted file mode 100644
index 67b7359ed9..0000000000
--- a/share/mrdocs/addons/generator/html/layouts/page.html.hbs
+++ /dev/null
@@ -1,9 +0,0 @@
-</html>
-    <head></head>
-    <body>
-        <div>
-            <h1>Reference</h1>
-            {{>symbol}}
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/share/mrdocs/addons/generator/html/layouts/single-footer.html.hbs b/share/mrdocs/addons/generator/html/layouts/single-footer.html.hbs
index 3fe3a99564..6deb8774e2 100644
--- a/share/mrdocs/addons/generator/html/layouts/single-footer.html.hbs
+++ b/share/mrdocs/addons/generator/html/layouts/single-footer.html.hbs
@@ -1,3 +1,4 @@
+{{! The footer for single page documentation }}
         </div>
         <div><h4>Created with MrDocs</h4></div>
     </body>
diff --git a/share/mrdocs/addons/generator/html/layouts/single-header.html.hbs b/share/mrdocs/addons/generator/html/layouts/single-header.html.hbs
index 3ba446a02a..0fd554f0a2 100644
--- a/share/mrdocs/addons/generator/html/layouts/single-header.html.hbs
+++ b/share/mrdocs/addons/generator/html/layouts/single-header.html.hbs
@@ -1,4 +1,5 @@
-</html>
+{{! The header for single page documentation }}
+<html>
     <head></head>
     <body>
         <div>
diff --git a/share/mrdocs/addons/generator/html/layouts/single-symbol.html.hbs b/share/mrdocs/addons/generator/html/layouts/single-symbol.html.hbs
index b07821eca9..915f24a300 100644
--- a/share/mrdocs/addons/generator/html/layouts/single-symbol.html.hbs
+++ b/share/mrdocs/addons/generator/html/layouts/single-symbol.html.hbs
@@ -1,3 +1,4 @@
+{{! The section with a symbol in single page output or the symbol page in multi page output }}
 {{#if relfileprefix}}:relfileprefix: {{relfileprefix}}{{/if}}
 [#{{#if (is_multipage)}}{{symbol.id}}{{else}}{{symbol.ref}}{{/if}}]
 
diff --git a/share/mrdocs/addons/generator/html/partials/declarator-before.html.hbs b/share/mrdocs/addons/generator/html/partials/declarator-before.html.hbs
deleted file mode 100644
index dd24f09427..0000000000
--- a/share/mrdocs/addons/generator/html/partials/declarator-before.html.hbs
+++ /dev/null
@@ -1,16 +0,0 @@
-{{#if pointee-type~}}
-    {{~>declarator-before pointee-type nolink=nolink~}}
-    {{#if (or (eq pointee-type.kind "array") (eq pointee-type.kind "function"))}}({{/if~}}
-{{~/if~}}
-{{#if element-type~}}{{~>declarator-before element-type nolink=nolink~}}{{/if~}}
-{{#if return-type~}}{{~>declarator-before return-type nolink=nolink~}}{{/if~}}
-{{#if (eq kind "named")}}{{>name-info name nolink=nolink}}{{/if~}}
-{{#if cv-qualifiers~}}
-    {{#if pointee-type}} {{cv-qualifiers}}{{else}} {{cv-qualifiers}}{{/if~}}
-{{/if~}}
-{{#if (eq kind "lvalue-reference")}}&{{/if~}}
-{{#if (eq kind "rvalue-reference")}}&&{{/if~}}
-{{#if (eq kind "pointer")}}*{{/if~}}
-{{#if (eq kind "member-pointer")}}{{>declarator parent-type nolink=nolink}}::*{{/if~}}
-{{#if (eq kind "decltype")}}decltype({{operand}}){{/if~}}
-{{#if is-pack~}}...{{/if}}
\ No newline at end of file
diff --git a/share/mrdocs/addons/generator/html/partials/declarator-id.html.hbs b/share/mrdocs/addons/generator/html/partials/declarator-id.html.hbs
deleted file mode 100644
index 2d467bc3e7..0000000000
--- a/share/mrdocs/addons/generator/html/partials/declarator-id.html.hbs
+++ /dev/null
@@ -1,10 +0,0 @@
-{{#if (and (eq kind "function") (eq class "conversion"))~}}
-    operator {{>declarator return nolink=nolink~}}
-{{else if (eq kind "guide")~}}
-    {{>declarator deduced nolink=nolink~}}
-{{else~}}
-    {{#if (and link.ref (not nolink))}}xref:{{link.ref}}[{{name}}]{{else}}{{name}}{{/if~}}
-    {{#if (or (eq template.kind "explicit") (eq template.kind "partial"))~}}
-        {{>template-args args=template.args nolink=nolink~}}
-    {{/if~}}
-{{/if}}
\ No newline at end of file
diff --git a/share/mrdocs/addons/generator/html/partials/declarator.html.hbs b/share/mrdocs/addons/generator/html/partials/declarator.html.hbs
deleted file mode 100644
index bbef8fdfe3..0000000000
--- a/share/mrdocs/addons/generator/html/partials/declarator.html.hbs
+++ /dev/null
@@ -1,5 +0,0 @@
-{{>declarator-before nolink=nolink~}}
-{{~#if decl-name}} {{decl-name~}}
-{{~#if decl-name-targs~}}{{>template-args args=decl-name-targs nolink=nolink}}{{~/if~}}
-{{~/if~}}
-{{~>declarator-after nolink=nolink}}
\ No newline at end of file
diff --git a/share/mrdocs/addons/generator/html/partials/info-member.html.hbs b/share/mrdocs/addons/generator/html/partials/info-member.html.hbs
deleted file mode 100644
index 48b587f85a..0000000000
--- a/share/mrdocs/addons/generator/html/partials/info-member.html.hbs
+++ /dev/null
@@ -1,8 +0,0 @@
-¦xref:{{ref}}[`{{>declarator-id . nolink=true}}`] ¦
-{{#if (ne kind "overload")~}}
-    {{~doc.brief}}
-{{else~}}
-    {{#each (unique (pluck (pluck members "doc") "brief"))~}}
-        {{.}}
-    {{/each~}}
-{{/if}}
\ No newline at end of file
diff --git a/share/mrdocs/addons/generator/html/partials/name-info.html.hbs b/share/mrdocs/addons/generator/html/partials/name-info.html.hbs
deleted file mode 100644
index 51d6ad9cf2..0000000000
--- a/share/mrdocs/addons/generator/html/partials/name-info.html.hbs
+++ /dev/null
@@ -1,7 +0,0 @@
-{{#if prefix~}}
-{{#unless (or (contains @root.symbol.namespace prefix.symbol) (eq @root.symbol prefix.symbol))~}}
-{{>name-info prefix nolink=nolink~}}::
-{{~/unless~}}
-{{/if~}}
-{{#if (and symbol.ref (not nolink))}}xref:{{symbol.ref}}[{{name}}]{{else~}}
-{{name}}{{/if}}{{#if args}}{{>template-args args=args nolink=nolink}}{{/if~}}
\ No newline at end of file
diff --git a/share/mrdocs/addons/generator/html/partials/nested-name-specifier.html.hbs b/share/mrdocs/addons/generator/html/partials/nested-name-specifier.html.hbs
deleted file mode 100644
index 3e5e702f02..0000000000
--- a/share/mrdocs/addons/generator/html/partials/nested-name-specifier.html.hbs
+++ /dev/null
@@ -1,14 +0,0 @@
-{{#if (and symbol (or includeNamespace (ne symbol.kind "namespace")))~}}
-{{#if symbol.parent~}}
-{{>nested-name-specifier symbol=symbol.parent~}}
-{{else~}}
-{{/if~}}
-{{!--
-{{#if symbol.name}}
-xref:{{symbol.ref}}[{{symbol.name}}]::
-{{/if~}}
---}}
-{{#if symbol.name}}
-<a href="#{{symbol.ref}}">{{symbol.name}}</a>::
-{{/if~}}
-{{/if}}
diff --git a/share/mrdocs/addons/generator/html/partials/qualified-path.html.hbs b/share/mrdocs/addons/generator/html/partials/qualified-path.html.hbs
deleted file mode 100644
index 00e095bc75..0000000000
--- a/share/mrdocs/addons/generator/html/partials/qualified-path.html.hbs
+++ /dev/null
@@ -1,13 +0,0 @@
-{{#unless (or (contains @root.symbol.namespace symbol) (eq @root.symbol symbol))~}}
-    {{#if symbol.parent~}}
-        {{>qualified-path symbol=symbol.parent nolink=nolink~}}
-    {{else~}}
-    {{/if~}}
-    {{#if symbol.name}}
-        {{#if (not nolink)}}
-            <a href="#{{symbol.ref}}">{{symbol.name}}</a>
-        {{else}}
-            {{symbol.name}}
-        {{/if}}::
-    {{/if~}}
-{{/unless}}
diff --git a/share/mrdocs/addons/generator/html/partials/signature/alias.html.hbs b/share/mrdocs/addons/generator/html/partials/signature/alias.html.hbs
index 54204df224..e8ecf62c14 100644
--- a/share/mrdocs/addons/generator/html/partials/signature/alias.html.hbs
+++ b/share/mrdocs/addons/generator/html/partials/signature/alias.html.hbs
@@ -1 +1 @@
-namespace {{symbol.name}} = {{>name-info symbol.aliasedSymbol}}
+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
index 1afada9601..b79a44683a 100644
--- a/share/mrdocs/addons/generator/html/partials/signature/concept.html.hbs
+++ b/share/mrdocs/addons/generator/html/partials/signature/concept.html.hbs
@@ -1,3 +1,3 @@
-{{>template-head symbol.template}}
+{{>types/template-head symbol.template}}
 
-concept {{>declarator-id symbol}} = {{symbol.constraint}}
\ No newline at end of file
+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
index 0192f23013..c37e4873ba 100644
--- a/share/mrdocs/addons/generator/html/partials/signature/enum.html.hbs
+++ b/share/mrdocs/addons/generator/html/partials/signature/enum.html.hbs
@@ -1,2 +1,2 @@
-enum {{>declarator-id symbol~}}
-{{#if symbol.type}} : {{>declarator symbol.type}}{{/if}}
\ No newline at end of file
+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/field.html.hbs b/share/mrdocs/addons/generator/html/partials/signature/field.html.hbs
index be3c7facb7..fc3b6f7bfb 100644
--- a/share/mrdocs/addons/generator/html/partials/signature/field.html.hbs
+++ b/share/mrdocs/addons/generator/html/partials/signature/field.html.hbs
@@ -1,6 +1,6 @@
 {{#if symbol.isMutable}}mutable
 {{/if~}}
-{{>declarator-before symbol.type}} {{>declarator-id symbol~}}
+{{>types/declarator-before symbol.type}} {{>types/declarator-id symbol~}}
 {{#if symbol.isBitfield}} : {{symbol.bitfieldWidth}}{{/if~}}
 {{#if symbol.default}} = {{symbol.default}}{{/if~}}
-{{>declarator-after symbol.type}}
\ No newline at end of file
+{{>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
index 17e146df9b..e7a92fc675 100644
--- a/share/mrdocs/addons/generator/html/partials/signature/friend.html.hbs
+++ b/share/mrdocs/addons/generator/html/partials/signature/friend.html.hbs
@@ -1,5 +1,5 @@
 {{#if symbol.type~}}
-friend {{>declarator 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
index 12c15eefa6..ea262af312 100644
--- a/share/mrdocs/addons/generator/html/partials/signature/function.html.hbs
+++ b/share/mrdocs/addons/generator/html/partials/signature/function.html.hbs
@@ -1,4 +1,4 @@
-{{#if symbol.template}}{{>template-head symbol.template}}
+{{#if symbol.template}}{{>types/template-head symbol.template}}
 {{/if~}}
 {{#if isFriend}}friend
 {{/if~}}
@@ -8,11 +8,11 @@
 {{/if~}}
 {{#if symbol.isVirtual}}virtual
 {{/if~}}
-{{#if (eq symbol.class "normal")}}{{>declarator-before symbol.return}}
+{{#if (eq symbol.class "normal")}}{{>types/declarator-before symbol.return}}
 {{/if~}}
-{{>declarator-id symbol link=symbol.template.primary}}
+{{>types/declarator-id symbol link=symbol.template.primary}}
 ({{#if symbol.isExplicitObjectMemberFunction}}this {{/if}}{{#each symbol.params}}{{#unless (and @first @last)}}
-    {{/unless}}{{>declarator type decl-name=name~}}
+    {{/unless}}{{>types/declarator type decl-name=name~}}
     {{#if default}} = {{default}}{{/if~}}
     {{#unless @last}},{{/unless~}}
 {{/each~}})
@@ -20,7 +20,7 @@
 {{#if symbol.isVolatile}} volatile{{/if~}}
 {{#if symbol.refQualifier}} {{symbol.refQualifier}}{{/if~}}
 {{#if symbol.exceptionSpec}} {{symbol.exceptionSpec}}{{/if~}}
-{{#if (eq symbol.class "normal")}}{{>declarator-after symbol.return}}{{/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~}}
diff --git a/share/mrdocs/addons/generator/html/partials/signature/guide.html.hbs b/share/mrdocs/addons/generator/html/partials/signature/guide.html.hbs
index 18f29d6e6e..6a594ff10a 100644
--- a/share/mrdocs/addons/generator/html/partials/signature/guide.html.hbs
+++ b/share/mrdocs/addons/generator/html/partials/signature/guide.html.hbs
@@ -1,8 +1,8 @@
-{{#if symbol.template}}{{>template-head symbol.template}}
+{{#if symbol.template}}{{>types/template-head symbol.template}}
 {{/if~}}
-{{>declarator-id symbol}}
+{{>types/declarator-id symbol}}
 ({{#each symbol.params}}{{#unless (and @first @last)}}
-    {{/unless}}{{>declarator type decl-name=name~}}
+    {{/unless}}{{>types/declarator type decl-name=name~}}
     {{#if default}} = {{default}}{{/if~}}
     {{#unless @last}},{{/unless~}}
-{{/each~}}) -> {{>declarator symbol.deduced}}
\ No newline at end of file
+{{/each~}}) -> {{>types/declarator symbol.deduced}}
\ 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
index 83195c9b82..17b91fc509 100644
--- a/share/mrdocs/addons/generator/html/partials/signature/record.html.hbs
+++ b/share/mrdocs/addons/generator/html/partials/signature/record.html.hbs
@@ -1,6 +1,6 @@
-{{#if symbol.template}}{{>template-head symbol.template}}
+{{#if symbol.template}}{{>types/template-head symbol.template}}
 {{/if~}}
-{{#if isFriend}}friend {{/if}}{{symbol.tag}} {{>declarator-id symbol link=symbol.template.primary~}}
+{{#if isFriend}}friend {{/if}}{{symbol.tag}} {{>types/declarator-id symbol link=symbol.template.primary~}}
 {{#unless symbol.bases~}}
 {{else if isFriend~}}
 {{else}}
@@ -10,6 +10,6 @@
     :{{else}}
     ,{{/if~}}
     {{#unless (eq access ../symbol.defaultAccess)}} {{access}}{{/unless~}}
-    {{#if isVirtual}} virtual{{/if}} {{>declarator type~}}
+    {{#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/typedef.html.hbs b/share/mrdocs/addons/generator/html/partials/signature/typedef.html.hbs
index debd0e1e40..7b46b9078d 100644
--- a/share/mrdocs/addons/generator/html/partials/signature/typedef.html.hbs
+++ b/share/mrdocs/addons/generator/html/partials/signature/typedef.html.hbs
@@ -1,7 +1,7 @@
 {{#if symbol.isUsing~}}
-    {{#if symbol.template}}{{>template-head symbol.template}}
+    {{#if symbol.template}}{{>types/template-head symbol.template}}
     {{/if~}}
-    using {{symbol.name}} = {{>declarator symbol.type}}
+    using {{symbol.name}} = {{>types/declarator symbol.type}}
 {{~else~}}
-    typedef {{>declarator symbol.type decl-name=symbol.name}}
+    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/using.html.hbs b/share/mrdocs/addons/generator/html/partials/signature/using.html.hbs
index 4258b9f634..11d306b620 100644
--- a/share/mrdocs/addons/generator/html/partials/signature/using.html.hbs
+++ b/share/mrdocs/addons/generator/html/partials/signature/using.html.hbs
@@ -1,5 +1,5 @@
 {{#if (eq symbol.class "namespace")}}
-using namespace {{#if symbol.qualifier}}{{>name-info symbol.qualifier}}::{{/if}}{{symbol.name}}
+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}}{{>name-info symbol.qualifier}}::{{/if}}{{symbol.name}}
+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
index 6cdcd77c97..1fbe6f4ece 100644
--- a/share/mrdocs/addons/generator/html/partials/signature/variable.html.hbs
+++ b/share/mrdocs/addons/generator/html/partials/signature/variable.html.hbs
@@ -1,4 +1,4 @@
-{{#if symbol.template}}{{>template-head symbol.template}}
+{{#if symbol.template}}{{>types/template-head symbol.template}}
 {{/if~}}
 {{#if symbol.constexprKind}}{{symbol.constexprKind}}
 {{/if~}}
@@ -6,6 +6,6 @@
 {{/if~}}
 {{#if symbol.isThreadLocal}}thread_local
 {{/if~}}
-{{>declarator-before symbol.type}} {{>declarator-id symbol link=symbol.template.primary~}}
-{{>declarator-after symbol.type~}}
+{{>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/source.html.hbs b/share/mrdocs/addons/generator/html/partials/source.html.hbs
deleted file mode 100644
index e80811acad..0000000000
--- a/share/mrdocs/addons/generator/html/partials/source.html.hbs
+++ /dev/null
@@ -1,12 +0,0 @@
-{{#if def}}
-    <p>
-        <span>Declared in file &lt;{{def.file}}&gt; at line {{def.line}}</span>
-    </p>
-{{else if decl}}
-    <p>
-        {{#each decl}}
-            <span>Declared in file &lt;{{file}}&gt; at line {{line}}</span>
-        {{/each}}
-    </p>
-{{else}}
-{{/if}}
diff --git a/share/mrdocs/addons/generator/html/partials/special-name-suffix.html.hbs b/share/mrdocs/addons/generator/html/partials/special-name-suffix.html.hbs
deleted file mode 100644
index ce78fee5de..0000000000
--- a/share/mrdocs/addons/generator/html/partials/special-name-suffix.html.hbs
+++ /dev/null
@@ -1,9 +0,0 @@
-{{#if (eq kind "overload")}}
-    {{>special-name-suffix (front members)~}}
-{{else if (eq kind "function")~}}
-    {{#if (eq class "constructor")}}
-        <span class="small">[constructor]</span>
-    {{~else if (eq class "destructor")~}}
-        <span class="small">[destructor]</span>
-    {{~/if~}}
-{{/if}}
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 e9b3545f81..308220cd34 100644
--- a/share/mrdocs/addons/generator/html/partials/symbols/alias.html.hbs
+++ b/share/mrdocs/addons/generator/html/partials/symbols/alias.html.hbs
@@ -1,14 +1,14 @@
 {{!-- alias --}}
 <div id="{{symbol.id}}">
     <div>
-        <h2>{{>nested-name-specifier symbol=symbol.parent}}{{symbol.name}}</h2>
+        <h2>{{>types/nested-name-specifier symbol=symbol.parent}}{{symbol.name}}</h2>
         {{{symbol.doc.brief}}}
     </div>
     <div>
         <h3>Synopsis</h3>
         <div>
             <code>
-                {{>source dcl=(primary_location symbol)}}
+                {{>types/source dcl=(primary_location symbol)}}
             </code>
         </div>
         <pre class="source-code cpp">
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 cebccee2ce..c2898ddbe4 100644
--- a/share/mrdocs/addons/generator/html/partials/symbols/concept.html.hbs
+++ b/share/mrdocs/addons/generator/html/partials/symbols/concept.html.hbs
@@ -1,14 +1,14 @@
 {{!-- concept --}}
 <div id="{{symbol.id}}">
     <div>
-        <h2>{{>nested-name-specifier symbol=symbol.parent includeNamespace=true}}{{symbol.name}}</h2>
+        <h2>{{>types/nested-name-specifier symbol=symbol.parent includeNamespace=true}}{{symbol.name}}</h2>
         {{symbol.doc.brief}}
     </div>
     <div>
         <h3>Synopsis</h3>
         <div>
             <code>
-                {{>source dcl=(primary_location symbol)}}
+                {{>types/source dcl=(primary_location symbol)}}
             </code>
         </div>
         <pre class="source-code cpp">
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 23ba0c433b..048f355446 100644
--- a/share/mrdocs/addons/generator/html/partials/symbols/enum.html.hbs
+++ b/share/mrdocs/addons/generator/html/partials/symbols/enum.html.hbs
@@ -1,7 +1,7 @@
 {{!-- enum --}}
 <div id="{{symbol.id}}">
     <div>
-        <h2>{{#if symbol.name}}Enum {{>nested-name-specifier symbol=symbol.parent}}{{symbol.name}}{{else}}Unnamed enum{{/if}}</h2>
+        <h2>{{#if symbol.name}}Enum {{>types/nested-name-specifier symbol=symbol.parent}}{{symbol.name}}{{else}}Unnamed enum{{/if}}</h2>
         {{{symbol.doc.brief}}}
     </div>
 
@@ -9,7 +9,7 @@
         <h3>Synopsis</h3>
         <div>
             <code>
-                {{>source dcl=(primary_location symbol)}}
+                {{>types/source dcl=(primary_location symbol)}}
             </code>
         </div>
         <pre class="source-code cpp">
@@ -30,7 +30,7 @@
             <tbody>
                 {{#each symbol.members}}
                 <tr>
-                    <td><a href="#{{ref}}">{{>declarator-id . nolink=true}}</a></td>
+                    <td><a href="#{{ref}}">{{>types/declarator-id . nolink=true}}</a></td>
                     <td>{{{doc.brief}}}</td>
                 </tr>
                 {{/each}}
diff --git a/share/mrdocs/addons/generator/html/partials/symbols/enumerator.html.hbs b/share/mrdocs/addons/generator/html/partials/symbols/enumerator.html.hbs
index 96f0c97ffc..1c626b81c5 100644
--- a/share/mrdocs/addons/generator/html/partials/symbols/enumerator.html.hbs
+++ b/share/mrdocs/addons/generator/html/partials/symbols/enumerator.html.hbs
@@ -1,7 +1,7 @@
 {{!-- enumerator --}}
 <div id="{{symbol.id}}">
     <div>
-        <h2>Enumerator {{>nested-name-specifier symbol=symbol.parent}}{{symbol.name}}</h2>
+        <h2>Enumerator {{>types/nested-name-specifier symbol=symbol.parent}}{{symbol.name}}</h2>
         {{{symbol.doc.brief}}}
     </div>
 
@@ -9,7 +9,7 @@
         <h3>Synopsis</h3>
         <div>
             <code>
-                {{>source dcl=(primary_location symbol)}}
+                {{>types/source dcl=(primary_location symbol)}}
             </code>
         </div>
         <pre class="source-code cpp">
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 8b23f378c8..589e8be00a 100644
--- a/share/mrdocs/addons/generator/html/partials/symbols/field.html.hbs
+++ b/share/mrdocs/addons/generator/html/partials/symbols/field.html.hbs
@@ -1,7 +1,7 @@
 {{!-- field --}}
 <div id="{{symbol.id}}">
     <div>
-        <h2>{{>nested-name-specifier symbol=symbol.parent}}{{symbol.name}}</h2>
+        <h2>{{>types/nested-name-specifier symbol=symbol.parent}}{{symbol.name}}</h2>
         {{{symbol.doc.brief}}}
     </div>
 
@@ -9,7 +9,7 @@
         <h3>Synopsis</h3>
         <div>
             <code>
-                {{>source dcl=(primary_location symbol)}}
+                {{>types/source dcl=(primary_location symbol)}}
             </code>
         </div>
         <pre class="source-code cpp">
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 262cf4a570..1082ffa2ba 100644
--- a/share/mrdocs/addons/generator/html/partials/symbols/friend.html.hbs
+++ b/share/mrdocs/addons/generator/html/partials/symbols/friend.html.hbs
@@ -9,7 +9,7 @@
         <h3>Synopsis</h3>
         <div>
             <code>
-                {{>source dcl=(primary_location symbol)}}
+                {{>types/source dcl=(primary_location symbol)}}
             </code>
         </div>
         <pre class="source-code cpp">
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 be1b8cf4ab..1942ab1867 100644
--- a/share/mrdocs/addons/generator/html/partials/symbols/function.html.hbs
+++ b/share/mrdocs/addons/generator/html/partials/symbols/function.html.hbs
@@ -1,7 +1,7 @@
 {{!-- function --}}
 <div id="{{symbol.id}}">
     <div>
-        <h2>Function {{>nested-name-specifier symbol=symbol.parent}}{{symbol.name}}</h2>
+        <h2>Function {{>types/nested-name-specifier symbol=symbol.parent}}{{symbol.name}}</h2>
         {{{symbol.doc.brief}}}
     </div>
 
@@ -9,7 +9,7 @@
         <h3>Synopsis</h3>
         <div>
             <code>
-                {{>source dcl=(primary_location symbol)}}
+                {{>types/source dcl=(primary_location symbol)}}
             </code>
         </div>
         <pre class="source-code cpp">
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 c856d68b77..deb421ff09 100644
--- a/share/mrdocs/addons/generator/html/partials/symbols/guide.html.hbs
+++ b/share/mrdocs/addons/generator/html/partials/symbols/guide.html.hbs
@@ -1,7 +1,7 @@
 {{!-- guides --}}
 <div id="{{symbol.id}}">
     <div>
-        <h2>Deduction guide {{>nested-name-specifier symbol=symbol.parent}}{{symbol.name}}</h2>
+        <h2>Deduction guide {{>types/nested-name-specifier symbol=symbol.parent}}{{symbol.name}}</h2>
         {{{symbol.doc.brief}}}
     </div>
 
@@ -9,7 +9,7 @@
         <h3>Synopsis</h3>
         <div>
             <code>
-                {{>source dcl=(primary_location symbol)}}
+                {{>types/source dcl=(primary_location symbol)}}
             </code>
         </div>
         <pre class="source-code cpp">
diff --git a/share/mrdocs/addons/generator/html/partials/symbols/namespace.html.hbs b/share/mrdocs/addons/generator/html/partials/symbols/namespace.html.hbs
index 3f99d3460a..a71d6e77ba 100644
--- a/share/mrdocs/addons/generator/html/partials/symbols/namespace.html.hbs
+++ b/share/mrdocs/addons/generator/html/partials/symbols/namespace.html.hbs
@@ -1,9 +1,9 @@
 {{!-- namespace --}}
 <div id="{{symbol.id}}">
     <div>
-        <h2>{{#if symbol.name}}Namespace {{>nested-name-specifier symbol=symbol.parent}}{{symbol.name}}{{else if symbol.parent}}Unnamed namespace{{else}}Global namespace{{/if}}</h2>
+        <h2>{{#if symbol.name}}Namespace {{>types/nested-name-specifier symbol=symbol.parent}}{{symbol.name}}{{else if symbol.parent}}Unnamed namespace{{else}}Global namespace{{/if}}</h2>
     </div>
     <div>
-        {{> tranche tranche=symbol.interface label="" is-namespace=true}}
+        {{>types/tranche tranche=symbol.interface label="" is-namespace=true}}
     </div>
 </div>
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 eb4e796591..4dd0c49080 100644
--- a/share/mrdocs/addons/generator/html/partials/symbols/record.html.hbs
+++ b/share/mrdocs/addons/generator/html/partials/symbols/record.html.hbs
@@ -1,7 +1,7 @@
 {{!-- record --}}
 <div id="{{symbol.id}}">
     <div>
-        <h2>{{#if symbol.name}}Class {{>nested-name-specifier symbol=symbol.parent}}{{symbol.name}}{{else}}Unnamed class{{/if}}</h2>
+        <h2>{{#if symbol.name}}Class {{>types/nested-name-specifier symbol=symbol.parent}}{{symbol.name}}{{else}}Unnamed class{{/if}}</h2>
         {{{symbol.doc.brief}}}
     </div>
 
@@ -9,7 +9,7 @@
         <h3>Synopsis</h3>
         <div>
             <code>
-                {{>source dcl=(primary_location symbol)}}
+                {{>types/source dcl=(primary_location symbol)}}
             </code>
         </div>
         <pre class="source-code cpp">
@@ -19,9 +19,9 @@
 
     {{#with symbol.interface}}
     <div>
-        {{> tranche tranche=public label="" is-namespace=false}}
-        {{> tranche tranche=protected label="Protected" is-namespace=false}}
-        {{> tranche tranche=private label="Private" is-namespace=false}}
+        {{>types/tranche tranche=public label="" is-namespace=false}}
+        {{>types/tranche tranche=protected label="Protected" is-namespace=false}}
+        {{>types/tranche tranche=private label="Private" is-namespace=false}}
     </div>
     {{/with}}
 
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 306eb66ef8..2f9d45ea95 100644
--- a/share/mrdocs/addons/generator/html/partials/symbols/typedef.html.hbs
+++ b/share/mrdocs/addons/generator/html/partials/symbols/typedef.html.hbs
@@ -1,7 +1,7 @@
 {{!-- typedef --}}
 <div id="{{symbol.id}}">
     <div>
-        <h2>{{>nested-name-specifier symbol=symbol.parent}}{{symbol.name}}</h2>
+        <h2>{{>types/nested-name-specifier symbol=symbol.parent}}{{symbol.name}}</h2>
         {{{symbol.doc.brief}}}
     </div>
 
@@ -9,7 +9,7 @@
         <h3>Synopsis</h3>
         <div>
             <code>
-                {{>source dcl=(primary_location symbol)}}
+                {{>types/source dcl=(primary_location symbol)}}
             </code>
         </div>
         <pre class="source-code cpp">
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 ed8fe5d7bb..e06142af9f 100644
--- a/share/mrdocs/addons/generator/html/partials/symbols/using.html.hbs
+++ b/share/mrdocs/addons/generator/html/partials/symbols/using.html.hbs
@@ -9,7 +9,7 @@
         <h3>Synopsis</h3>
         <div>
             <code>
-                {{>source dcl=(primary_location symbol)}}
+                {{>types/source dcl=(primary_location symbol)}}
             </code>
         </div>
         <pre class="source-code cpp">
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 7c986d2f8f..0d98635b84 100644
--- a/share/mrdocs/addons/generator/html/partials/symbols/variable.html.hbs
+++ b/share/mrdocs/addons/generator/html/partials/symbols/variable.html.hbs
@@ -1,7 +1,7 @@
 {{!-- variable --}}
 <div id="{{symbol.id}}">
     <div>
-        <h2>{{>nested-name-specifier symbol=symbol.parent}}{{symbol.name}}</h2>
+        <h2>{{>types/nested-name-specifier symbol=symbol.parent}}{{symbol.name}}</h2>
         {{{symbol.doc.brief}}}
     </div>
 
@@ -9,7 +9,7 @@
         <h3>Synopsis</h3>
         <div>
             <code>
-                {{>source dcl=(primary_location symbol)}}
+                {{>types/source dcl=(primary_location symbol)}}
             </code>
         </div>
         <pre class="source-code cpp">
diff --git a/share/mrdocs/addons/generator/html/partials/template-args.html.hbs b/share/mrdocs/addons/generator/html/partials/template-args.html.hbs
deleted file mode 100644
index 4a86d8c008..0000000000
--- a/share/mrdocs/addons/generator/html/partials/template-args.html.hbs
+++ /dev/null
@@ -1,4 +0,0 @@
-<{{~#each args~}}
-{{~>template-arg nolink=../nolink~}}
-{{~#if (not @last)}}, {{/if~}}
-{{~/each~}}>
\ No newline at end of file
diff --git a/share/mrdocs/addons/generator/html/partials/template-head.html.hbs b/share/mrdocs/addons/generator/html/partials/template-head.html.hbs
deleted file mode 100644
index 2774ceeb5a..0000000000
--- a/share/mrdocs/addons/generator/html/partials/template-head.html.hbs
+++ /dev/null
@@ -1,4 +0,0 @@
-template<{{#each params}}{{#unless (and @first @last)}}
-    {{/unless}}{{>template-param~}}
-    {{#unless @last}},{{/unless~}}
-{{/each~}}>
\ No newline at end of file
diff --git a/share/mrdocs/addons/generator/html/partials/template-param.html.hbs b/share/mrdocs/addons/generator/html/partials/template-param.html.hbs
deleted file mode 100644
index 6afd331ff8..0000000000
--- a/share/mrdocs/addons/generator/html/partials/template-param.html.hbs
+++ /dev/null
@@ -1,12 +0,0 @@
-{{#if (eq kind "type")~}}
-    {{key}}{{#if is-pack}}...{{/if~}}
-    {{#if name}} {{name}}{{/if~}}
-    {{#if default}} = {{>template-arg default~}}{{/if~}}
-{{else if (eq kind "non-type")~}}
-    {{>declarator type decl-name=name}}{{#if is-pack}}...{{/if~}}
-    {{#if default}} = {{>template-arg default~}}{{/if~}}
-{{else if (eq kind "template")~}}
-    {{>template-head}} typename{{#if is-pack}}...{{/if~}}
-    {{#if name}} {{name}}{{/if~}}
-    {{#if default}} = {{>template-arg default~}}{{/if~}}
-{{/if}}
\ No newline at end of file
diff --git a/share/mrdocs/addons/generator/html/partials/tranche.html.hbs b/share/mrdocs/addons/generator/html/partials/tranche.html.hbs
deleted file mode 100644
index 22b9b23135..0000000000
--- a/share/mrdocs/addons/generator/html/partials/tranche.html.hbs
+++ /dev/null
@@ -1,82 +0,0 @@
-{{#if tranche.namespaces}}
-    <div>
-        <h3>{{label}} Namespaces</h3>
-        {{>info-list tranche.namespaces}}
-    </div>
-{{/if}}
-{{#if tranche.records}}
-    <div>
-        <h3>{{label}} Types</h3>
-        {{>info-list tranche.records}}
-    </div>
-{{/if}}
-{{#if tranche.types}}
-    <div>
-        {{#if label}}
-            <h3>{{label}} Types</h3>
-        {{else}}
-            <h3>Types</h3>
-        {{/if}}
-        {{>info-list tranche.types}}
-    </div>
-{{/if}}
-{{#if tranche.overloads}}
-    <div>
-        <h3>{{label}} Member Functions</h3>
-        {{>info-list tranche.overloads}}
-    </div>
-{{/if}}
-{{#if tranche.variables}}
-    <div>
-        <h3>{{label}} Variables</h3>
-        {{>info-list tranche.variables}}
-    </div>
-{{/if}}
-{{#if tranche.enums}}
-    <div>
-        <h3>{{label}} Enums</h3>
-        {{>info-list tranche.enums}}
-    </div>
-{{/if}}
-{{#if tranche.fields}}
-    <div>
-        <h3>{{label}} Data Members</h3>
-        {{>info-list tranche.fields}}
-    </div>
-{{/if}}
-{{#if tranche.staticfunctions}}
-    <div>
-        <h3>{{label}} Static Member Functions</h3>
-        {{>info-list tranche.staticfunctions}}
-    </div>
-{{/if}}
-{{#if tranche.staticdata}}
-    <div>
-        <h3>{{label}} Static Data Members</h3>
-        {{>info-list tranche.staticdata}}
-    </div>
-{{/if}}
-{{#if tranche.friends}}
-    <div>
-        <h3>{{label}} Friends</h3>
-        {{>info-list tranche.friends}}
-    </div>
-{{/if}}
-{{#if tranche.aliases}}
-    <div>
-        <h3>{{label}} Aliases</h3>
-        {{>info-list tranche.aliases}}
-    </div>
-{{/if}}
-{{#if tranche.usings}}
-    <div>
-        <h3>{{label}} Using Declarations</h3>
-        {{>info-list tranche.usings}}
-    </div>
-{{/if}}
-{{#if tranche.guides}}
-    <div>
-        <h3>{{label}} Deduction Guides</h3>
-        {{>info-list tranche.guides}}
-    </div>
-{{/if}}
diff --git a/share/mrdocs/addons/generator/html/partials/declarator-after.html.hbs b/share/mrdocs/addons/generator/html/partials/types/declarator-after.html.hbs
similarity index 53%
rename from share/mrdocs/addons/generator/html/partials/declarator-after.html.hbs
rename to share/mrdocs/addons/generator/html/partials/types/declarator-after.html.hbs
index 2b2f27f950..4351dacfe3 100644
--- a/share/mrdocs/addons/generator/html/partials/declarator-after.html.hbs
+++ b/share/mrdocs/addons/generator/html/partials/types/declarator-after.html.hbs
@@ -1,15 +1,16 @@
+{{! Helper for "declarator" partial }}
 {{#if pointee-type~}}
     {{#if (or (eq pointee-type.kind "array") (eq pointee-type.kind "function"))}}){{/if~}}
-    {{~>declarator-after pointee-type nolink=nolink~}}
+    {{~>types/declarator-after pointee-type nolink=nolink~}}
 {{else if (eq kind "array")~}}
     [{{bounds-value}}]
-    {{~>declarator-after element-type nolink=nolink~}}
+    {{~>types/declarator-after element-type nolink=nolink~}}
 {{else if (eq kind "function")~}}
     ({{#each param-types~}}
-        {{~>declarator nolink=../nolink~}}{{~#unless @last}}, {{/unless~}}
-    {{/each~}})
+        {{~>types/declarator nolink=../nolink~}}{{~#unless @last}}, {{/unless~}}
+    {{/each~}}{{#if is-variadic}}{{#if param-types}}, {{/if}}...{{/if}})
     {{~#if cv-qualifiers}} {{cv-qualifiers}}{{/if~}}
     {{#if (eq ref-qualifier "lvalue")}} &{{else if (eq ref-qualifier "rvalue")}} &&{{/if~}}
     {{#if exception-spec}} {{exception-spec}}{{/if~}}
-    {{~>declarator-after return-type nolink=nolink~}}
+    {{~>types/declarator-after return-type nolink=nolink~}}
 {{/if}}
\ No newline at end of file
diff --git a/share/mrdocs/addons/generator/html/partials/types/declarator-before.html.hbs b/share/mrdocs/addons/generator/html/partials/types/declarator-before.html.hbs
new file mode 100644
index 0000000000..f46216c9e3
--- /dev/null
+++ b/share/mrdocs/addons/generator/html/partials/types/declarator-before.html.hbs
@@ -0,0 +1,18 @@
+{{! Helper for "declarator" partial }}
+{{#if pointee-type~}}
+    {{~>types/declarator-before pointee-type nolink=nolink~}}
+    {{#if (or (eq pointee-type.kind "array") (eq pointee-type.kind "function"))}}({{/if~}}
+{{~/if~}}
+{{#if element-type~}}{{~>types/declarator-before element-type nolink=nolink~}}{{/if~}}
+{{#if return-type~}}{{~>types/declarator-before return-type nolink=nolink~}}{{/if~}}
+{{#if (eq kind "named")}}{{>types/name-info name nolink=nolink}}{{/if~}}
+{{#if (eq kind "auto")}}{{#if constraint}}{{>types/name-info constraint nolink=nolink}} {{/if~}}{{keyword}}{{/if~}}
+{{#if cv-qualifiers~}}
+    {{#if pointee-type}} {{cv-qualifiers}}{{else}} {{cv-qualifiers}}{{/if~}}
+{{/if~}}
+{{#if (eq kind "lvalue-reference")}}&{{/if~}}
+{{#if (eq kind "rvalue-reference")}}&&{{/if~}}
+{{#if (eq kind "pointer")}}*{{/if~}}
+{{#if (eq kind "member-pointer")}}{{>types/declarator parent-type nolink=nolink}}::*{{/if~}}
+{{#if (eq kind "decltype")}}decltype({{operand}}){{/if~}}
+{{#if is-pack~}}...{{/if}}
\ No newline at end of file
diff --git a/share/mrdocs/addons/generator/html/partials/types/declarator-id.html.hbs b/share/mrdocs/addons/generator/html/partials/types/declarator-id.html.hbs
new file mode 100644
index 0000000000..cb24069c8e
--- /dev/null
+++ b/share/mrdocs/addons/generator/html/partials/types/declarator-id.html.hbs
@@ -0,0 +1,11 @@
+{{! The declarator for a symbol: typically the symbol name with a link }}
+{{#if (and (eq kind "function") (eq class "conversion"))~}}
+    operator {{>types/declarator return nolink=nolink~}}
+{{else if (eq kind "guide")~}}
+    {{>types/declarator deduced nolink=nolink~}}
+{{else~}}
+    {{#if (and link.ref (not nolink))}}<a href="{{link.ref}}">{{name}}</a>{{else}}{{name}}{{/if~}}
+    {{#if (or (eq template.kind "explicit") (eq template.kind "partial"))~}}
+        {{>types/template-args args=template.args nolink=nolink~}}
+    {{/if~}}
+{{/if}}
\ No newline at end of file
diff --git a/share/mrdocs/addons/generator/html/partials/types/declarator.html.hbs b/share/mrdocs/addons/generator/html/partials/types/declarator.html.hbs
new file mode 100644
index 0000000000..dad2b1d446
--- /dev/null
+++ b/share/mrdocs/addons/generator/html/partials/types/declarator.html.hbs
@@ -0,0 +1,6 @@
+{{! Render a type object as a declaration }}
+{{>types/declarator-before nolink=nolink~}}
+{{~#if decl-name}} {{decl-name~}}
+{{~#if decl-name-targs~}}{{>types/template-args args=decl-name-targs nolink=nolink}}{{~/if~}}
+{{~/if~}}
+{{~>types/declarator-after nolink=nolink}}
\ No newline at end of file
diff --git a/share/mrdocs/addons/generator/html/partials/info-list.html.hbs b/share/mrdocs/addons/generator/html/partials/types/info-list.html.hbs
similarity index 77%
rename from share/mrdocs/addons/generator/html/partials/info-list.html.hbs
rename to share/mrdocs/addons/generator/html/partials/types/info-list.html.hbs
index 89a226ab49..76bb9280d1 100644
--- a/share/mrdocs/addons/generator/html/partials/info-list.html.hbs
+++ b/share/mrdocs/addons/generator/html/partials/types/info-list.html.hbs
@@ -1,3 +1,4 @@
+{{! List the "members" of a symbol as a table }}
 {{#if members}}
 <div>
     <h3>{{title}}</h3>
@@ -14,10 +15,7 @@
         </thead>
         <tbody>
             {{#each (sort_by members "name")}}
-            <tr>
-                <td>{{>xref id=id content=name}}</td>
-                <td>{{{doc.brief}}}</td>
-            </tr>
+                {{>types/info-member .}}
             {{/each}}
         </tbody>
     </table>
diff --git a/share/mrdocs/addons/generator/html/partials/types/info-member.html.hbs b/share/mrdocs/addons/generator/html/partials/types/info-member.html.hbs
new file mode 100644
index 0000000000..95acf8f058
--- /dev/null
+++ b/share/mrdocs/addons/generator/html/partials/types/info-member.html.hbs
@@ -0,0 +1,15 @@
+{{! Helper for "info-list": renders a symbol as a row in a table of members }}
+<tr>
+    <td>
+        <a href="{{ref}}">{{>types/declarator-id . nolink=true}}</a> {{>types/special-name-suffix .}}
+    </td>
+    <td>
+        {{#if (ne kind "overload")~}}
+            {{~doc.brief}}
+        {{else~}}
+            {{#each (unique (pluck (pluck members "doc") "brief"))~}}
+                {{.}}
+            {{/each~}}
+        {{/if}}
+    </td>
+</tr>
\ No newline at end of file
diff --git a/share/mrdocs/addons/generator/html/partials/types/name-info.html.hbs b/share/mrdocs/addons/generator/html/partials/types/name-info.html.hbs
new file mode 100644
index 0000000000..c9e998813e
--- /dev/null
+++ b/share/mrdocs/addons/generator/html/partials/types/name-info.html.hbs
@@ -0,0 +1,7 @@
+{{! Renders a name info object }}
+{{#if prefix~}}
+{{>types/name-info prefix nolink=nolink~}}::
+{{~/if~}}
+{{#if (or (eq name "see-below") (eq name "implementation-defined"))~}}_{{name}}_{{else~}}
+{{#if (and symbol.ref (not nolink))}}<a href="{{symbol.ref}}">{{name}}</a>{{else~}}
+{{name}}{{/if}}{{#if args}}{{>types/template-args args=args nolink=nolink}}{{/if~}}{{/if~}}
\ No newline at end of file
diff --git a/share/mrdocs/addons/generator/html/partials/types/nested-name-specifier.html.hbs b/share/mrdocs/addons/generator/html/partials/types/nested-name-specifier.html.hbs
new file mode 100644
index 0000000000..83883cdc2c
--- /dev/null
+++ b/share/mrdocs/addons/generator/html/partials/types/nested-name-specifier.html.hbs
@@ -0,0 +1,8 @@
+{{! Print the symbol name with its parent namespace(s) if any. }}
+{{#if (and symbol (or includeNamespace (ne symbol.kind "namespace")))~}}
+{{#if symbol.parent~}}
+{{>types/nested-name-specifier symbol=symbol.parent~}}
+{{else~}}
+{{/if~}}
+{{#if symbol.name}}{{>types/declarator-id symbol link=symbol}}::{{/if~}}
+{{/if}}
\ No newline at end of file
diff --git a/share/mrdocs/addons/generator/html/partials/types/qualified-path.html.hbs b/share/mrdocs/addons/generator/html/partials/types/qualified-path.html.hbs
new file mode 100644
index 0000000000..82adcf4367
--- /dev/null
+++ b/share/mrdocs/addons/generator/html/partials/types/qualified-path.html.hbs
@@ -0,0 +1,8 @@
+{{! Renders the qualified path of a symbol with proper links for each component. }}
+{{#unless (or (contains @root.symbol.namespace symbol) (eq @root.symbol symbol))~}}
+{{#if symbol.parent~}}
+{{>types/qualified-path symbol=symbol.parent nolink=nolink~}}
+{{else~}}
+{{/if~}}
+{{#if symbol.name}}{{#if (not nolink)}}<a href="{{symbol.ref}}">{{symbol.name}}</a>{{else}}{{symbol.name}}{{/if}}::{{/if~}}
+{{/unless}}
\ No newline at end of file
diff --git a/share/mrdocs/addons/generator/html/partials/types/source.html.hbs b/share/mrdocs/addons/generator/html/partials/types/source.html.hbs
new file mode 100644
index 0000000000..429bee5cbe
--- /dev/null
+++ b/share/mrdocs/addons/generator/html/partials/types/source.html.hbs
@@ -0,0 +1,7 @@
+{{! Renders where the symbol is declared with a link to the source file when the `base-url` config option is defined }}
+<p>
+    <span>
+        Declared in <code><{{#unless (and @root.config.base-url (eq dcl.kind "source"))}}{{dcl.file}}{{else}}<a href="{{@root.config.base-url}}{{dcl.file}}#L{{dcl.line}}">{{dcl.file}}</a>{{/unless}}></code>
+    </span>
+</p>
+
diff --git a/share/mrdocs/addons/generator/html/partials/types/special-name-suffix.html.hbs b/share/mrdocs/addons/generator/html/partials/types/special-name-suffix.html.hbs
new file mode 100644
index 0000000000..9eed9afd6c
--- /dev/null
+++ b/share/mrdocs/addons/generator/html/partials/types/special-name-suffix.html.hbs
@@ -0,0 +1,11 @@
+{{! Renders the name of the symbol with a suffix when the symbol is a special member (e.g., constructor, destructor, overload, variant member) }}
+{{#if (eq kind "overload")}}{{>types/special-name-suffix (front members)~}}
+{{else if (eq kind "function")~}}
+    {{#if (eq class "constructor")}}
+        <span class="small">[constructor]</span>
+    {{~else if (eq class "destructor")~}}
+        <span class="small">[destructor]</span>
+    {{~/if~}}
+    {{else if (eq kind "field")~}}
+    {{#if isVariant}}<span class="small">[variant member]</span>{{/if~}}
+{{/if}}
diff --git a/share/mrdocs/addons/generator/html/partials/template-arg.html.hbs b/share/mrdocs/addons/generator/html/partials/types/template-arg.html.hbs
similarity index 75%
rename from share/mrdocs/addons/generator/html/partials/template-arg.html.hbs
rename to share/mrdocs/addons/generator/html/partials/types/template-arg.html.hbs
index 130b144a05..e852d4e327 100644
--- a/share/mrdocs/addons/generator/html/partials/template-arg.html.hbs
+++ b/share/mrdocs/addons/generator/html/partials/types/template-arg.html.hbs
@@ -1,5 +1,6 @@
+{{! Renders a template argument }}
 {{#if (eq kind "type")~}}
-{{~>declarator type nolink=nolink~}}
+{{~>types/declarator type nolink=nolink~}}
 {{else if (eq kind "non-type")~}}
 {{~value~}}
 {{else if (eq kind "template")~}}
diff --git a/share/mrdocs/addons/generator/html/partials/types/template-args.html.hbs b/share/mrdocs/addons/generator/html/partials/types/template-args.html.hbs
new file mode 100644
index 0000000000..d105b29166
--- /dev/null
+++ b/share/mrdocs/addons/generator/html/partials/types/template-args.html.hbs
@@ -0,0 +1,5 @@
+{{! Render all template arguments }}
+<{{~#each args~}}
+{{~>types/template-arg nolink=../nolink~}}
+{{~#if (not @last)}}, {{/if~}}
+{{~/each~}}>
\ No newline at end of file
diff --git a/share/mrdocs/addons/generator/html/partials/types/template-head.html.hbs b/share/mrdocs/addons/generator/html/partials/types/template-head.html.hbs
new file mode 100644
index 0000000000..a568240fb8
--- /dev/null
+++ b/share/mrdocs/addons/generator/html/partials/types/template-head.html.hbs
@@ -0,0 +1,5 @@
+{{! Renders the template head for a template declaration. }}
+template<{{#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
diff --git a/share/mrdocs/addons/generator/html/partials/types/template-param.html.hbs b/share/mrdocs/addons/generator/html/partials/types/template-param.html.hbs
new file mode 100644
index 0000000000..29ec264014
--- /dev/null
+++ b/share/mrdocs/addons/generator/html/partials/types/template-param.html.hbs
@@ -0,0 +1,14 @@
+{{! Renders a template parameter }}
+{{#if (eq kind "type")~}}
+    {{#if constraint}}{{>types/name-info constraint}}{{else}}{{key}}{{/if~}}
+    {{#if is-pack}}...{{/if~}}
+    {{#if name}} {{name}}{{/if~}}
+    {{#if default}} = {{>types/template-arg default~}}{{/if~}}
+{{else if (eq kind "non-type")~}}
+    {{>types/declarator type decl-name=name}}{{#if is-pack}}...{{/if~}}
+    {{#if default}} = {{>types/template-arg default~}}{{/if~}}
+{{else if (eq kind "template")~}}
+    {{>types/template-head}} typename{{#if is-pack}}...{{/if~}}
+    {{#if name}} {{name}}{{/if~}}
+    {{#if default}} = {{>types/template-arg default~}}{{/if~}}
+{{/if}}
\ No newline at end of file
diff --git a/share/mrdocs/addons/generator/html/partials/types/tranche.html.hbs b/share/mrdocs/addons/generator/html/partials/types/tranche.html.hbs
new file mode 100644
index 0000000000..11a8a4abd6
--- /dev/null
+++ b/share/mrdocs/addons/generator/html/partials/types/tranche.html.hbs
@@ -0,0 +1,18 @@
+{{! Renders an info-list table for each list in a Tranche }}
+{{>types/info-list members=tranche.namespaces title="Namespaces"}}
+{{>types/info-list members=(concat tranche.records tranche.types) title=(concat label " " "Types")}}
+{{>types/info-list members=tranche.enums title=(concat label " " "Enums")}}
+{{#if is-namespace}}
+    {{>types/info-list members=tranche.overloads title="Functions"}}
+    {{>types/info-list members=tranche.variables title="Variables"}}
+    {{>types/info-list members=tranche.concepts title="Concepts"}}
+{{else}}
+    {{>types/info-list members=tranche.overloads title=(concat label " " "Member Functions")}}
+    {{>types/info-list members=tranche.staticoverloads title=(concat label " " "Static Member Functions")}}
+    {{>types/info-list members=tranche.fields title=(concat label " " "Data Members")}}
+    {{>types/info-list members=tranche.variables title=(concat label " " "Static Data Members")}}
+    {{>types/info-list members=tranche.friends title=(concat label " " "Friends")}}
+    {{>types/info-list members=tranche.aliases title=(concat label " " "Aliases")}}
+    {{>types/info-list members=tranche.usings title=(concat label " " "Using Declarations")}}
+{{/if}}
+{{>types/info-list members=tranche.guides title=(concat label " " "Deduction Guides")}}
diff --git a/src/test/TestRunner.cpp b/src/test/TestRunner.cpp
index dec3394af9..904053c0e2 100644
--- a/src/test/TestRunner.cpp
+++ b/src/test/TestRunner.cpp
@@ -112,7 +112,7 @@ handleFile(
     MrDocsCompilationDatabase compilations(
         llvm::StringRef(parentDir), SingleFileDB(filePath), config, defaultIncludePaths);
 
-    report::setMinimumLevel(report::Level::warn);
+    report::setMinimumLevel(report::Level::error);
     // Build Corpus
     auto corpus = CorpusImpl::build(config, compilations);
     if(! corpus)
diff --git a/test-files/golden-tests/alias-template.adoc b/test-files/golden-tests/alias-template.adoc
index 7a6dbd9cbd..b2c8f96998 100644
--- a/test-files/golden-tests/alias-template.adoc
+++ b/test-files/golden-tests/alias-template.adoc
@@ -28,7 +28,7 @@
 
 === Synopsis
 
-Declared in header `<alias-template.cpp>`
+Declared in `<alias-template.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -48,7 +48,7 @@ struct A;
 
 === Synopsis
 
-Declared in header `<alias-template.cpp>`
+Declared in `<alias-template.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -70,7 +70,7 @@ struct B;
 
 === Synopsis
 
-Declared in header `<alias-template.cpp>`
+Declared in `<alias-template.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -88,7 +88,7 @@ using C = xref:A.adoc[A]<T>;
 
 === Synopsis
 
-Declared in header `<alias-template.cpp>`
+Declared in `<alias-template.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -115,7 +115,7 @@ struct D;
 
 === Synopsis
 
-Declared in header `<alias-template.cpp>`
+Declared in `<alias-template.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
diff --git a/test-files/golden-tests/alias-template.html b/test-files/golden-tests/alias-template.html
index da54332c06..9e401e070d 100644
--- a/test-files/golden-tests/alias-template.html
+++ b/test-files/golden-tests/alias-template.html
@@ -1,4 +1,4 @@
-</html>
+<html>
     <head></head>
     <body>
         <div>
@@ -11,13 +11,52 @@ <h1>Reference</h1>
         <h2>Global namespace</h2>
     </div>
     <div>
-            <div>
-                <h3> Types</h3>
-                    </div>
-    <div>
-            <h3>Types</h3>
-            </div>
-    </div>
+        <div>
+            <h3> Types</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">A</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">B</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">C</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">D</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
+                </div>
 </div>
 
 [#[object Object]]
@@ -32,7 +71,13 @@ <h2>Class A</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><alias-template.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<typename T>
@@ -41,7 +86,7 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-                            </div>
+                                                                                                                </div>
 
 
 </div>
@@ -58,7 +103,13 @@ <h2>Class B</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><alias-template.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<
@@ -69,7 +120,7 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-                            </div>
+                                                                                                                </div>
 
 
 </div>
@@ -86,7 +137,13 @@ <h2>C</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><alias-template.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<typename T>
@@ -108,7 +165,13 @@ <h2>Class D</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><alias-template.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<typename T>
@@ -117,10 +180,31 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-            <div>
-            <h3>Types</h3>
-            </div>
-                    </div>
+        <div>
+            <h3> Types</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">E</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
+                                                                                                        </div>
 
 
 </div>
@@ -129,8 +213,7 @@ <h3>Types</h3>
 
 <div id="[object Object]">
     <div>
-        <h2><a href="#">D</a>::
-E</h2>
+        <h2>D::E</h2>
         
     </div>
 
@@ -138,7 +221,13 @@ <h2><a href="#">D</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><alias-template.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<typename U>
diff --git a/test-files/golden-tests/attributes_1.adoc b/test-files/golden-tests/attributes_1.adoc
index 3bf70e0873..c8433ed186 100644
--- a/test-files/golden-tests/attributes_1.adoc
+++ b/test-files/golden-tests/attributes_1.adoc
@@ -22,7 +22,7 @@
 
 === Synopsis
 
-Declared in header `<attributes_1.cpp>`
+Declared in `<attributes_1.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
diff --git a/test-files/golden-tests/attributes_1.html b/test-files/golden-tests/attributes_1.html
index 87d42047ea..e6392017d7 100644
--- a/test-files/golden-tests/attributes_1.html
+++ b/test-files/golden-tests/attributes_1.html
@@ -1,4 +1,4 @@
-</html>
+<html>
     <head></head>
     <body>
         <div>
@@ -12,9 +12,30 @@ <h2>Global namespace</h2>
     </div>
     <div>
             <div>
-                <h3> Member Functions</h3>
-                    </div>
-    </div>
+                <h3>Functions</h3>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+            </div>
 </div>
 
 [#[object Object]]
@@ -29,7 +50,13 @@ <h2>Function f</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><attributes_1.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             bool
diff --git a/test-files/golden-tests/brief-1.adoc b/test-files/golden-tests/brief-1.adoc
index 06470f5610..f60fc878e8 100644
--- a/test-files/golden-tests/brief-1.adoc
+++ b/test-files/golden-tests/brief-1.adoc
@@ -36,7 +36,7 @@ continues to the line.
 
 === Synopsis
 
-Declared in header `<brief-1.cpp>`
+Declared in `<brief-1.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -62,7 +62,7 @@ brief
 
 === Synopsis
 
-Declared in header `<brief-1.cpp>`
+Declared in `<brief-1.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
diff --git a/test-files/golden-tests/brief-1.html b/test-files/golden-tests/brief-1.html
index 849c310595..830fee2d1f 100644
--- a/test-files/golden-tests/brief-1.html
+++ b/test-files/golden-tests/brief-1.html
@@ -1,4 +1,4 @@
-</html>
+<html>
     <head></head>
     <body>
         <div>
@@ -12,9 +12,41 @@ <h2>Global namespace</h2>
     </div>
     <div>
             <div>
-                <h3> Member Functions</h3>
-                    </div>
-    </div>
+                <h3>Functions</h3>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f5</a> 
+                                </td>
+                                <td>
+<p><span>brief</span> <b>bold</b> <span>it</span> <span>continues to the line.</span></p>
+                            
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">f6</a> 
+                                </td>
+                                <td>
+<p><span>brief</span></p>
+                            
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+            </div>
 </div>
 
 [#[object Object]]
@@ -31,7 +63,13 @@ <h2>Function f5</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><brief-1.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -58,7 +96,13 @@ <h2>Function f6</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><brief-1.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
diff --git a/test-files/golden-tests/brief-2.adoc b/test-files/golden-tests/brief-2.adoc
index ecb4684d2e..91822caf8b 100644
--- a/test-files/golden-tests/brief-2.adoc
+++ b/test-files/golden-tests/brief-2.adoc
@@ -48,7 +48,7 @@ brief
 
 === Synopsis
 
-Declared in header `<brief-2.cpp>`
+Declared in `<brief-2.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -74,7 +74,7 @@ brief
 
 === Synopsis
 
-Declared in header `<brief-2.cpp>`
+Declared in `<brief-2.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -100,7 +100,7 @@ brief
 
 === Synopsis
 
-Declared in header `<brief-2.cpp>`
+Declared in `<brief-2.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -126,7 +126,7 @@ brief                    x
 
 === Synopsis
 
-Declared in header `<brief-2.cpp>`
+Declared in `<brief-2.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -160,7 +160,7 @@ ief
 
 === Synopsis
 
-Declared in header `<brief-2.cpp>`
+Declared in `<brief-2.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -187,7 +187,7 @@ ief
 
 === Synopsis
 
-Declared in header `<brief-2.cpp>`
+Declared in `<brief-2.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
diff --git a/test-files/golden-tests/brief-2.html b/test-files/golden-tests/brief-2.html
index cc5b259729..8c878303b9 100644
--- a/test-files/golden-tests/brief-2.html
+++ b/test-files/golden-tests/brief-2.html
@@ -1,4 +1,4 @@
-</html>
+<html>
     <head></head>
     <body>
         <div>
@@ -12,9 +12,77 @@ <h2>Global namespace</h2>
     </div>
     <div>
             <div>
-                <h3> Member Functions</h3>
-                    </div>
-    </div>
+                <h3>Functions</h3>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f1</a> 
+                                </td>
+                                <td>
+<p><span>brief</span></p>
+                            
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">f2</a> 
+                                </td>
+                                <td>
+<p><span>brief</span></p>
+                            
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">f3</a> 
+                                </td>
+                                <td>
+<p><span>brief</span></p>
+                            
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">f4</a> 
+                                </td>
+                                <td>
+<p><span>brief                    x</span></p>
+                            
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">f5</a> 
+                                </td>
+                                <td>
+<p><span>br</span> <span>ief</span></p>
+                            
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">f6</a> 
+                                </td>
+                                <td>
+<p><span>br</span> <span>ief</span></p>
+                            
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+            </div>
 </div>
 
 [#[object Object]]
@@ -31,7 +99,13 @@ <h2>Function f1</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><brief-2.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -58,7 +132,13 @@ <h2>Function f2</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><brief-2.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -85,7 +165,13 @@ <h2>Function f3</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><brief-2.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -112,7 +198,13 @@ <h2>Function f4</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><brief-2.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -145,7 +237,13 @@ <h2>Function f5</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><brief-2.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -172,7 +270,13 @@ <h2>Function f6</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><brief-2.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
diff --git a/test-files/golden-tests/canonical_1.adoc b/test-files/golden-tests/canonical_1.adoc
index 9a29d9f7c4..fbedfebc66 100644
--- a/test-files/golden-tests/canonical_1.adoc
+++ b/test-files/golden-tests/canonical_1.adoc
@@ -36,7 +36,7 @@
 
 === Synopsis
 
-Declared in header `<canonical_1.cpp>`
+Declared in `<canonical_1.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -55,7 +55,7 @@ struct B;
 
 === Synopsis
 
-Declared in header `<canonical_1.cpp>`
+Declared in `<canonical_1.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -74,7 +74,7 @@ struct b;
 
 === Synopsis
 
-Declared in header `<canonical_1.cpp>`
+Declared in `<canonical_1.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -93,7 +93,7 @@ struct A;
 
 === Synopsis
 
-Declared in header `<canonical_1.cpp>`
+Declared in `<canonical_1.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -112,7 +112,7 @@ struct a;
 
 === Synopsis
 
-Declared in header `<canonical_1.cpp>`
+Declared in `<canonical_1.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -131,7 +131,7 @@ struct Ba;
 
 === Synopsis
 
-Declared in header `<canonical_1.cpp>`
+Declared in `<canonical_1.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -150,7 +150,7 @@ struct bA;
 
 === Synopsis
 
-Declared in header `<canonical_1.cpp>`
+Declared in `<canonical_1.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -169,7 +169,7 @@ struct Bx;
 
 === Synopsis
 
-Declared in header `<canonical_1.cpp>`
+Declared in `<canonical_1.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
diff --git a/test-files/golden-tests/canonical_1.html b/test-files/golden-tests/canonical_1.html
index e10849a11e..ae937a1c71 100644
--- a/test-files/golden-tests/canonical_1.html
+++ b/test-files/golden-tests/canonical_1.html
@@ -1,4 +1,4 @@
-</html>
+<html>
     <head></head>
     <body>
         <div>
@@ -11,10 +11,80 @@ <h1>Reference</h1>
         <h2>Global namespace</h2>
     </div>
     <div>
-            <div>
-                <h3> Types</h3>
-                    </div>
-    </div>
+        <div>
+            <h3> Types</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">A</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">B</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">Ba</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">Bx</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">a</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">b</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">bA</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">ba</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
+                </div>
 </div>
 
 [#[object Object]]
@@ -29,7 +99,13 @@ <h2>Class B</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><canonical_1.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct B;
@@ -37,7 +113,7 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-                            </div>
+                                                                                                                </div>
 
 
 </div>
@@ -54,7 +130,13 @@ <h2>Class b</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><canonical_1.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct b;
@@ -62,7 +144,7 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-                            </div>
+                                                                                                                </div>
 
 
 </div>
@@ -79,7 +161,13 @@ <h2>Class A</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><canonical_1.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct A;
@@ -87,7 +175,7 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-                            </div>
+                                                                                                                </div>
 
 
 </div>
@@ -104,7 +192,13 @@ <h2>Class a</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><canonical_1.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct a;
@@ -112,7 +206,7 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-                            </div>
+                                                                                                                </div>
 
 
 </div>
@@ -129,7 +223,13 @@ <h2>Class Ba</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><canonical_1.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct Ba;
@@ -137,7 +237,7 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-                            </div>
+                                                                                                                </div>
 
 
 </div>
@@ -154,7 +254,13 @@ <h2>Class bA</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><canonical_1.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct bA;
@@ -162,7 +268,7 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-                            </div>
+                                                                                                                </div>
 
 
 </div>
@@ -179,7 +285,13 @@ <h2>Class Bx</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><canonical_1.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct Bx;
@@ -187,7 +299,7 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-                            </div>
+                                                                                                                </div>
 
 
 </div>
@@ -204,7 +316,13 @@ <h2>Class ba</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><canonical_1.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct ba;
@@ -212,7 +330,7 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-                            </div>
+                                                                                                                </div>
 
 
 </div>
diff --git a/test-files/golden-tests/class-template-partial-spec.adoc b/test-files/golden-tests/class-template-partial-spec.adoc
index aaf5985bbe..6730276f57 100644
--- a/test-files/golden-tests/class-template-partial-spec.adoc
+++ b/test-files/golden-tests/class-template-partial-spec.adoc
@@ -22,7 +22,7 @@
 
 === Synopsis
 
-Declared in header `<class-template-partial-spec.cpp>`
+Declared in `<class-template-partial-spec.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -53,7 +53,7 @@ struct A;
 
 === Synopsis
 
-Declared in header `<class-template-partial-spec.cpp>`
+Declared in `<class-template-partial-spec.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -75,7 +75,7 @@ struct B;
 
 === Synopsis
 
-Declared in header `<class-template-partial-spec.cpp>`
+Declared in `<class-template-partial-spec.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -95,7 +95,7 @@ struct xref:A/B-0a.adoc[pass:[B]]<U*, T>;
 
 === Synopsis
 
-Declared in header `<class-template-partial-spec.cpp>`
+Declared in `<class-template-partial-spec.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
diff --git a/test-files/golden-tests/class-template-partial-spec.html b/test-files/golden-tests/class-template-partial-spec.html
index 530871d039..36f1a2a0f9 100644
--- a/test-files/golden-tests/class-template-partial-spec.html
+++ b/test-files/golden-tests/class-template-partial-spec.html
@@ -1,4 +1,4 @@
-</html>
+<html>
     <head></head>
     <body>
         <div>
@@ -11,10 +11,31 @@ <h1>Reference</h1>
         <h2>Global namespace</h2>
     </div>
     <div>
-            <div>
-                <h3> Types</h3>
-                    </div>
-    </div>
+        <div>
+            <h3> Types</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">A</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
+                </div>
 </div>
 
 [#[object Object]]
@@ -29,7 +50,13 @@ <h2>Class A</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-partial-spec.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<typename T>
@@ -38,10 +65,45 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-            <div>
-                <h3> Types</h3>
-                    </div>
-                    </div>
+        <div>
+            <h3> Types</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">B</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">B<U*, T></a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">B<T, long></a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
+                                                                                                        </div>
 
 
 </div>
@@ -50,8 +112,7 @@ <h3> Types</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Class <a href="#">A</a>::
-B</h2>
+        <h2>Class A::B</h2>
         
     </div>
 
@@ -59,7 +120,13 @@ <h2>Class <a href="#">A</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-partial-spec.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<
@@ -70,7 +137,7 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-                            </div>
+                                                                                                                </div>
 
 
 </div>
@@ -79,8 +146,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Class <a href="#">A</a>::
-B</h2>
+        <h2>Class A::B</h2>
         
     </div>
 
@@ -88,7 +154,13 @@ <h2>Class <a href="#">A</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-partial-spec.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<typename U>
@@ -97,7 +169,7 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-                            </div>
+                                                                                                                </div>
 
 
 </div>
@@ -106,8 +178,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Class <a href="#">A</a>::
-B</h2>
+        <h2>Class A::B</h2>
         
     </div>
 
@@ -115,7 +186,13 @@ <h2>Class <a href="#">A</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-partial-spec.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<>
@@ -124,7 +201,7 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-                            </div>
+                                                                                                                </div>
 
 
 </div>
diff --git a/test-files/golden-tests/class-template-spec.adoc b/test-files/golden-tests/class-template-spec.adoc
index 3002e6520e..8a47f5236f 100644
--- a/test-files/golden-tests/class-template-spec.adoc
+++ b/test-files/golden-tests/class-template-spec.adoc
@@ -38,7 +38,7 @@
 
 === Synopsis
 
-Declared in header `<class-template-spec.cpp>`
+Declared in `<class-template-spec.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -65,7 +65,7 @@ struct A;
 
 === Synopsis
 
-Declared in header `<class-template-spec.cpp>`
+Declared in `<class-template-spec.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -89,7 +89,7 @@ f();
 
 === Synopsis
 
-Declared in header `<class-template-spec.cpp>`
+Declared in `<class-template-spec.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -116,7 +116,7 @@ struct xref:A-0e.adoc[pass:[A]]<int>;
 
 === Synopsis
 
-Declared in header `<class-template-spec.cpp>`
+Declared in `<class-template-spec.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -140,7 +140,7 @@ g();
 
 === Synopsis
 
-Declared in header `<class-template-spec.cpp>`
+Declared in `<class-template-spec.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -167,7 +167,7 @@ struct xref:A-0e.adoc[pass:[A]]<long>;
 
 === Synopsis
 
-Declared in header `<class-template-spec.cpp>`
+Declared in `<class-template-spec.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -191,7 +191,7 @@ h();
 
 === Synopsis
 
-Declared in header `<class-template-spec.cpp>`
+Declared in `<class-template-spec.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -218,7 +218,7 @@ struct B;
 
 === Synopsis
 
-Declared in header `<class-template-spec.cpp>`
+Declared in `<class-template-spec.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -242,7 +242,7 @@ f();
 
 === Synopsis
 
-Declared in header `<class-template-spec.cpp>`
+Declared in `<class-template-spec.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -269,7 +269,7 @@ struct xref:B-00.adoc[pass:[B]]<T*>;
 
 === Synopsis
 
-Declared in header `<class-template-spec.cpp>`
+Declared in `<class-template-spec.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -293,7 +293,7 @@ g();
 
 === Synopsis
 
-Declared in header `<class-template-spec.cpp>`
+Declared in `<class-template-spec.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -320,7 +320,7 @@ struct xref:B-00.adoc[pass:[B]]<T&>;
 
 === Synopsis
 
-Declared in header `<class-template-spec.cpp>`
+Declared in `<class-template-spec.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -344,7 +344,7 @@ h();
 
 === Synopsis
 
-Declared in header `<class-template-spec.cpp>`
+Declared in `<class-template-spec.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -373,7 +373,7 @@ struct C;
 
 === Synopsis
 
-Declared in header `<class-template-spec.cpp>`
+Declared in `<class-template-spec.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -397,7 +397,7 @@ f();
 
 === Synopsis
 
-Declared in header `<class-template-spec.cpp>`
+Declared in `<class-template-spec.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -424,7 +424,7 @@ struct xref:C-0f.adoc[pass:[C]]<int, int>;
 
 === Synopsis
 
-Declared in header `<class-template-spec.cpp>`
+Declared in `<class-template-spec.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -448,7 +448,7 @@ g();
 
 === Synopsis
 
-Declared in header `<class-template-spec.cpp>`
+Declared in `<class-template-spec.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -475,7 +475,7 @@ struct xref:C-0f.adoc[pass:[C]]<T*, int>;
 
 === Synopsis
 
-Declared in header `<class-template-spec.cpp>`
+Declared in `<class-template-spec.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
diff --git a/test-files/golden-tests/class-template-spec.html b/test-files/golden-tests/class-template-spec.html
index b0c9f7ae2b..d1ab8146e4 100644
--- a/test-files/golden-tests/class-template-spec.html
+++ b/test-files/golden-tests/class-template-spec.html
@@ -1,4 +1,4 @@
-</html>
+<html>
     <head></head>
     <body>
         <div>
@@ -11,10 +11,87 @@ <h1>Reference</h1>
         <h2>Global namespace</h2>
     </div>
     <div>
-            <div>
-                <h3> Types</h3>
-                    </div>
-    </div>
+        <div>
+            <h3> Types</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">A</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">A<int></a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">A<long></a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">B</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">B<T*></a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">B<T&></a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">C</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">C<int, int></a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">C<T*, int></a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
+                </div>
 </div>
 
 [#[object Object]]
@@ -29,7 +106,13 @@ <h2>Class A</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-spec.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<typename T>
@@ -40,8 +123,29 @@ <h3>Synopsis</h3>
     <div>
             <div>
                 <h3> Member Functions</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                                    </div>
 
 
 </div>
@@ -50,8 +154,7 @@ <h3> Member Functions</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">A</a>::
-f</h2>
+        <h2>Function A::f</h2>
         
     </div>
 
@@ -59,7 +162,13 @@ <h2>Function <a href="#">A</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-spec.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -84,7 +193,13 @@ <h2>Class A</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-spec.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<>
@@ -95,8 +210,29 @@ <h3>Synopsis</h3>
     <div>
             <div>
                 <h3> Member Functions</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">g</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                                    </div>
 
 
 </div>
@@ -105,8 +241,7 @@ <h3> Member Functions</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">A</a>::
-g</h2>
+        <h2>Function A<int>::g</h2>
         
     </div>
 
@@ -114,7 +249,13 @@ <h2>Function <a href="#">A</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-spec.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -139,7 +280,13 @@ <h2>Class A</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-spec.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<>
@@ -150,8 +297,29 @@ <h3>Synopsis</h3>
     <div>
             <div>
                 <h3> Member Functions</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">h</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                                    </div>
 
 
 </div>
@@ -160,8 +328,7 @@ <h3> Member Functions</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">A</a>::
-h</h2>
+        <h2>Function A<long>::h</h2>
         
     </div>
 
@@ -169,7 +336,13 @@ <h2>Function <a href="#">A</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-spec.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -194,7 +367,13 @@ <h2>Class B</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-spec.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<typename T>
@@ -205,8 +384,29 @@ <h3>Synopsis</h3>
     <div>
             <div>
                 <h3> Member Functions</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                                    </div>
 
 
 </div>
@@ -215,8 +415,7 @@ <h3> Member Functions</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">B</a>::
-f</h2>
+        <h2>Function B::f</h2>
         
     </div>
 
@@ -224,7 +423,13 @@ <h2>Function <a href="#">B</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-spec.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -249,7 +454,13 @@ <h2>Class B</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-spec.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<typename T>
@@ -260,8 +471,29 @@ <h3>Synopsis</h3>
     <div>
             <div>
                 <h3> Member Functions</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">g</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                                    </div>
 
 
 </div>
@@ -270,8 +502,7 @@ <h3> Member Functions</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">B</a>::
-g</h2>
+        <h2>Function B<T*>::g</h2>
         
     </div>
 
@@ -279,7 +510,13 @@ <h2>Function <a href="#">B</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-spec.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -304,7 +541,13 @@ <h2>Class B</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-spec.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<typename T>
@@ -315,8 +558,29 @@ <h3>Synopsis</h3>
     <div>
             <div>
                 <h3> Member Functions</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">h</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                                    </div>
 
 
 </div>
@@ -325,8 +589,7 @@ <h3> Member Functions</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">B</a>::
-h</h2>
+        <h2>Function B<T&>::h</h2>
         
     </div>
 
@@ -334,7 +597,13 @@ <h2>Function <a href="#">B</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-spec.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -359,7 +628,13 @@ <h2>Class C</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-spec.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<
@@ -372,8 +647,29 @@ <h3>Synopsis</h3>
     <div>
             <div>
                 <h3> Member Functions</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                                    </div>
 
 
 </div>
@@ -382,8 +678,7 @@ <h3> Member Functions</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">C</a>::
-f</h2>
+        <h2>Function C::f</h2>
         
     </div>
 
@@ -391,7 +686,13 @@ <h2>Function <a href="#">C</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-spec.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -416,7 +717,13 @@ <h2>Class C</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-spec.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<>
@@ -427,8 +734,29 @@ <h3>Synopsis</h3>
     <div>
             <div>
                 <h3> Member Functions</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">g</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                                    </div>
 
 
 </div>
@@ -437,8 +765,7 @@ <h3> Member Functions</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">C</a>::
-g</h2>
+        <h2>Function C<int, int>::g</h2>
         
     </div>
 
@@ -446,7 +773,13 @@ <h2>Function <a href="#">C</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-spec.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -471,7 +804,13 @@ <h2>Class C</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-spec.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<typename T>
@@ -482,8 +821,29 @@ <h3>Synopsis</h3>
     <div>
             <div>
                 <h3> Member Functions</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">h</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                                    </div>
 
 
 </div>
@@ -492,8 +852,7 @@ <h3> Member Functions</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">C</a>::
-h</h2>
+        <h2>Function C<T*, int>::h</h2>
         
     </div>
 
@@ -501,7 +860,13 @@ <h2>Function <a href="#">C</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-spec.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
diff --git a/test-files/golden-tests/class-template-specializations-1.adoc b/test-files/golden-tests/class-template-specializations-1.adoc
index 3098ea9e85..8f0122b942 100644
--- a/test-files/golden-tests/class-template-specializations-1.adoc
+++ b/test-files/golden-tests/class-template-specializations-1.adoc
@@ -126,7 +126,7 @@
 
 === Synopsis
 
-Declared in header `<class-template-specializations-1.cpp>`
+Declared in `<class-template-specializations-1.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -164,7 +164,7 @@ struct S0;
 
 === Synopsis
 
-Declared in header `<class-template-specializations-1.cpp>`
+Declared in `<class-template-specializations-1.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -188,7 +188,7 @@ f0();
 
 === Synopsis
 
-Declared in header `<class-template-specializations-1.cpp>`
+Declared in `<class-template-specializations-1.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -221,7 +221,7 @@ struct S1;
 
 === Synopsis
 
-Declared in header `<class-template-specializations-1.cpp>`
+Declared in `<class-template-specializations-1.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -245,7 +245,7 @@ f1();
 
 === Synopsis
 
-Declared in header `<class-template-specializations-1.cpp>`
+Declared in `<class-template-specializations-1.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -283,7 +283,7 @@ struct S2;
 
 === Synopsis
 
-Declared in header `<class-template-specializations-1.cpp>`
+Declared in `<class-template-specializations-1.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -307,7 +307,7 @@ f2();
 
 === Synopsis
 
-Declared in header `<class-template-specializations-1.cpp>`
+Declared in `<class-template-specializations-1.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -333,7 +333,7 @@ struct S3;
 
 === Synopsis
 
-Declared in header `<class-template-specializations-1.cpp>`
+Declared in `<class-template-specializations-1.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -357,7 +357,7 @@ f3();
 
 === Synopsis
 
-Declared in header `<class-template-specializations-1.cpp>`
+Declared in `<class-template-specializations-1.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -386,7 +386,7 @@ struct S4;
 
 === Synopsis
 
-Declared in header `<class-template-specializations-1.cpp>`
+Declared in `<class-template-specializations-1.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -410,7 +410,7 @@ f4();
 
 === Synopsis
 
-Declared in header `<class-template-specializations-1.cpp>`
+Declared in `<class-template-specializations-1.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -446,7 +446,7 @@ struct S5;
 
 === Synopsis
 
-Declared in header `<class-template-specializations-1.cpp>`
+Declared in `<class-template-specializations-1.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -470,7 +470,7 @@ f5();
 
 === Synopsis
 
-Declared in header `<class-template-specializations-1.cpp>`
+Declared in `<class-template-specializations-1.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -503,7 +503,7 @@ struct S6;
 
 === Synopsis
 
-Declared in header `<class-template-specializations-1.cpp>`
+Declared in `<class-template-specializations-1.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -527,7 +527,7 @@ f6();
 
 === Synopsis
 
-Declared in header `<class-template-specializations-1.cpp>`
+Declared in `<class-template-specializations-1.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -565,7 +565,7 @@ struct S7;
 
 === Synopsis
 
-Declared in header `<class-template-specializations-1.cpp>`
+Declared in `<class-template-specializations-1.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -589,7 +589,7 @@ f7();
 
 === Synopsis
 
-Declared in header `<class-template-specializations-1.cpp>`
+Declared in `<class-template-specializations-1.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -615,7 +615,7 @@ struct S8;
 
 === Synopsis
 
-Declared in header `<class-template-specializations-1.cpp>`
+Declared in `<class-template-specializations-1.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -639,7 +639,7 @@ f8();
 
 === Synopsis
 
-Declared in header `<class-template-specializations-1.cpp>`
+Declared in `<class-template-specializations-1.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -668,7 +668,7 @@ struct S9;
 
 === Synopsis
 
-Declared in header `<class-template-specializations-1.cpp>`
+Declared in `<class-template-specializations-1.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -692,7 +692,7 @@ f9();
 
 === Synopsis
 
-Declared in header `<class-template-specializations-1.cpp>`
+Declared in `<class-template-specializations-1.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -712,7 +712,7 @@ struct xref:S0-0cf.adoc[pass:[S0]]<0>;
 
 === Synopsis
 
-Declared in header `<class-template-specializations-1.cpp>`
+Declared in `<class-template-specializations-1.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -732,7 +732,7 @@ struct xref:S0-0cf.adoc[pass:[S0]]<1, T*>;
 
 === Synopsis
 
-Declared in header `<class-template-specializations-1.cpp>`
+Declared in `<class-template-specializations-1.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -809,7 +809,7 @@ struct xref:S0-0cf.adoc[pass:[S0]]<1, int*>;
 
 === Synopsis
 
-Declared in header `<class-template-specializations-1.cpp>`
+Declared in `<class-template-specializations-1.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -845,7 +845,7 @@ struct R0
 
 === Synopsis
 
-Declared in header `<class-template-specializations-1.cpp>`
+Declared in `<class-template-specializations-1.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -865,7 +865,7 @@ struct R1
 
 === Synopsis
 
-Declared in header `<class-template-specializations-1.cpp>`
+Declared in `<class-template-specializations-1.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -885,7 +885,7 @@ struct R2
 
 === Synopsis
 
-Declared in header `<class-template-specializations-1.cpp>`
+Declared in `<class-template-specializations-1.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -905,7 +905,7 @@ struct R3
 
 === Synopsis
 
-Declared in header `<class-template-specializations-1.cpp>`
+Declared in `<class-template-specializations-1.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -925,7 +925,7 @@ struct R4
 
 === Synopsis
 
-Declared in header `<class-template-specializations-1.cpp>`
+Declared in `<class-template-specializations-1.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -945,7 +945,7 @@ struct R5
 
 === Synopsis
 
-Declared in header `<class-template-specializations-1.cpp>`
+Declared in `<class-template-specializations-1.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -965,7 +965,7 @@ struct R6
 
 === Synopsis
 
-Declared in header `<class-template-specializations-1.cpp>`
+Declared in `<class-template-specializations-1.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -985,7 +985,7 @@ struct R7
 
 === Synopsis
 
-Declared in header `<class-template-specializations-1.cpp>`
+Declared in `<class-template-specializations-1.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -1005,7 +1005,7 @@ struct R8
 
 === Synopsis
 
-Declared in header `<class-template-specializations-1.cpp>`
+Declared in `<class-template-specializations-1.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -1025,7 +1025,7 @@ struct R9
 
 === Synopsis
 
-Declared in header `<class-template-specializations-1.cpp>`
+Declared in `<class-template-specializations-1.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -1045,7 +1045,7 @@ struct R10
 
 === Synopsis
 
-Declared in header `<class-template-specializations-1.cpp>`
+Declared in `<class-template-specializations-1.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -1065,7 +1065,7 @@ struct R11
 
 === Synopsis
 
-Declared in header `<class-template-specializations-1.cpp>`
+Declared in `<class-template-specializations-1.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -1085,7 +1085,7 @@ struct R12
 
 === Synopsis
 
-Declared in header `<class-template-specializations-1.cpp>`
+Declared in `<class-template-specializations-1.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -1105,7 +1105,7 @@ struct R13
 
 === Synopsis
 
-Declared in header `<class-template-specializations-1.cpp>`
+Declared in `<class-template-specializations-1.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -1125,7 +1125,7 @@ struct R14
 
 === Synopsis
 
-Declared in header `<class-template-specializations-1.cpp>`
+Declared in `<class-template-specializations-1.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -1145,7 +1145,7 @@ struct R15
 
 === Synopsis
 
-Declared in header `<class-template-specializations-1.cpp>`
+Declared in `<class-template-specializations-1.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -1165,7 +1165,7 @@ struct R16
 
 === Synopsis
 
-Declared in header `<class-template-specializations-1.cpp>`
+Declared in `<class-template-specializations-1.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -1185,7 +1185,7 @@ struct R17
 
 === Synopsis
 
-Declared in header `<class-template-specializations-1.cpp>`
+Declared in `<class-template-specializations-1.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -1205,7 +1205,7 @@ struct R18
 
 === Synopsis
 
-Declared in header `<class-template-specializations-1.cpp>`
+Declared in `<class-template-specializations-1.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -1225,7 +1225,7 @@ struct R19
 
 === Synopsis
 
-Declared in header `<class-template-specializations-1.cpp>`
+Declared in `<class-template-specializations-1.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -1245,7 +1245,7 @@ struct R20
 
 === Synopsis
 
-Declared in header `<class-template-specializations-1.cpp>`
+Declared in `<class-template-specializations-1.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -1265,7 +1265,7 @@ struct R21
 
 === Synopsis
 
-Declared in header `<class-template-specializations-1.cpp>`
+Declared in `<class-template-specializations-1.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -1285,7 +1285,7 @@ struct R22
 
 === Synopsis
 
-Declared in header `<class-template-specializations-1.cpp>`
+Declared in `<class-template-specializations-1.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -1305,7 +1305,7 @@ struct R23
 
 === Synopsis
 
-Declared in header `<class-template-specializations-1.cpp>`
+Declared in `<class-template-specializations-1.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -1325,7 +1325,7 @@ struct R24
 
 === Synopsis
 
-Declared in header `<class-template-specializations-1.cpp>`
+Declared in `<class-template-specializations-1.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -1345,7 +1345,7 @@ struct R25
 
 === Synopsis
 
-Declared in header `<class-template-specializations-1.cpp>`
+Declared in `<class-template-specializations-1.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -1365,7 +1365,7 @@ struct R26
 
 === Synopsis
 
-Declared in header `<class-template-specializations-1.cpp>`
+Declared in `<class-template-specializations-1.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -1385,7 +1385,7 @@ struct R27
 
 === Synopsis
 
-Declared in header `<class-template-specializations-1.cpp>`
+Declared in `<class-template-specializations-1.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -1421,7 +1421,7 @@ struct R28
 
 === Synopsis
 
-Declared in header `<class-template-specializations-1.cpp>`
+Declared in `<class-template-specializations-1.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -1457,7 +1457,7 @@ struct R29
 
 === Synopsis
 
-Declared in header `<class-template-specializations-1.cpp>`
+Declared in `<class-template-specializations-1.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -1491,7 +1491,7 @@ struct R30
 
 === Synopsis
 
-Declared in header `<class-template-specializations-1.cpp>`
+Declared in `<class-template-specializations-1.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -1530,7 +1530,7 @@ struct R31
 
 === Synopsis
 
-Declared in header `<class-template-specializations-1.cpp>`
+Declared in `<class-template-specializations-1.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -1566,7 +1566,7 @@ struct R32
 
 === Synopsis
 
-Declared in header `<class-template-specializations-1.cpp>`
+Declared in `<class-template-specializations-1.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -1602,7 +1602,7 @@ struct R33
 
 === Synopsis
 
-Declared in header `<class-template-specializations-1.cpp>`
+Declared in `<class-template-specializations-1.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -1629,7 +1629,7 @@ struct R34
 
 === Synopsis
 
-Declared in header `<class-template-specializations-1.cpp>`
+Declared in `<class-template-specializations-1.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -1659,7 +1659,7 @@ struct R35
 
 === Synopsis
 
-Declared in header `<class-template-specializations-1.cpp>`
+Declared in `<class-template-specializations-1.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -1686,7 +1686,7 @@ struct R36
 
 === Synopsis
 
-Declared in header `<class-template-specializations-1.cpp>`
+Declared in `<class-template-specializations-1.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -1713,7 +1713,7 @@ struct R37
 
 === Synopsis
 
-Declared in header `<class-template-specializations-1.cpp>`
+Declared in `<class-template-specializations-1.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -1750,7 +1750,7 @@ struct R38
 
 === Synopsis
 
-Declared in header `<class-template-specializations-1.cpp>`
+Declared in `<class-template-specializations-1.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -1784,7 +1784,7 @@ struct R39
 
 === Synopsis
 
-Declared in header `<class-template-specializations-1.cpp>`
+Declared in `<class-template-specializations-1.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -1818,7 +1818,7 @@ struct R40
 
 === Synopsis
 
-Declared in header `<class-template-specializations-1.cpp>`
+Declared in `<class-template-specializations-1.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -1852,7 +1852,7 @@ struct R41
 
 === Synopsis
 
-Declared in header `<class-template-specializations-1.cpp>`
+Declared in `<class-template-specializations-1.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -1891,7 +1891,7 @@ struct R42
 
 === Synopsis
 
-Declared in header `<class-template-specializations-1.cpp>`
+Declared in `<class-template-specializations-1.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -1927,7 +1927,7 @@ struct R43
 
 === Synopsis
 
-Declared in header `<class-template-specializations-1.cpp>`
+Declared in `<class-template-specializations-1.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -1963,7 +1963,7 @@ struct R44
 
 === Synopsis
 
-Declared in header `<class-template-specializations-1.cpp>`
+Declared in `<class-template-specializations-1.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -1990,7 +1990,7 @@ struct R45
 
 === Synopsis
 
-Declared in header `<class-template-specializations-1.cpp>`
+Declared in `<class-template-specializations-1.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -2020,7 +2020,7 @@ struct R46
 
 === Synopsis
 
-Declared in header `<class-template-specializations-1.cpp>`
+Declared in `<class-template-specializations-1.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -2047,7 +2047,7 @@ struct R47
 
 === Synopsis
 
-Declared in header `<class-template-specializations-1.cpp>`
+Declared in `<class-template-specializations-1.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
diff --git a/test-files/golden-tests/class-template-specializations-1.html b/test-files/golden-tests/class-template-specializations-1.html
index 57cadcb47d..70d0c81591 100644
--- a/test-files/golden-tests/class-template-specializations-1.html
+++ b/test-files/golden-tests/class-template-specializations-1.html
@@ -1,4 +1,4 @@
-</html>
+<html>
     <head></head>
     <body>
         <div>
@@ -11,10 +11,395 @@ <h1>Reference</h1>
         <h2>Global namespace</h2>
     </div>
     <div>
-            <div>
-                <h3> Types</h3>
-                    </div>
-    </div>
+        <div>
+            <h3> Types</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">R0</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">R1</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">R10</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">R11</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">R12</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">R13</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">R14</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">R15</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">R16</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">R17</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">R18</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">R19</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">R2</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">R20</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">R21</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">R22</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">R23</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">R24</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">R25</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">R26</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">R27</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">R28</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">R29</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">R3</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">R30</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">R31</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">R32</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">R33</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">R34</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">R35</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">R36</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">R37</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">R38</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">R39</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">R4</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">R40</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">R41</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">R42</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">R43</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">R44</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">R45</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">R46</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">R47</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">R48</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">R5</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">R6</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">R7</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">R8</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">R9</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">S0<1, int*></a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">S0<1, T*></a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">S0<0></a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">S0</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
+                </div>
 </div>
 
 [#[object Object]]
@@ -29,7 +414,13 @@ <h2>Class S0</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-specializations-1.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<
@@ -40,13 +431,62 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-            <div>
-                <h3> Types</h3>
-                    </div>
+        <div>
+            <h3> Types</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">S1</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">S5</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
     <div>
                 <h3> Member Functions</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f0</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                                    </div>
 
 
 </div>
@@ -55,8 +495,7 @@ <h3> Member Functions</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">S0</a>::
-f0</h2>
+        <h2>Function S0::f0</h2>
         
     </div>
 
@@ -64,7 +503,13 @@ <h2>Function <a href="#">S0</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-specializations-1.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -81,8 +526,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Class <a href="#">S0</a>::
-S1</h2>
+        <h2>Class S0::S1</h2>
         
     </div>
 
@@ -90,7 +534,13 @@ <h2>Class <a href="#">S0</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-specializations-1.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct S1;
@@ -98,13 +548,55 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-            <div>
-                <h3> Types</h3>
-                    </div>
+        <div>
+            <h3> Types</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">S2</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
     <div>
                 <h3> Member Functions</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f1</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                                    </div>
 
 
 </div>
@@ -113,9 +605,7 @@ <h3> Member Functions</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">S0</a>::
-<a href="#">S1</a>::
-f1</h2>
+        <h2>Function S0::S1::f1</h2>
         
     </div>
 
@@ -123,7 +613,13 @@ <h2>Function <a href="#">S0</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-specializations-1.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -140,9 +636,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Class <a href="#">S0</a>::
-<a href="#">S1</a>::
-S2</h2>
+        <h2>Class S0::S1::S2</h2>
         
     </div>
 
@@ -150,7 +644,13 @@ <h2>Class <a href="#">S0</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-specializations-1.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<
@@ -161,13 +661,62 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-            <div>
-                <h3> Types</h3>
-                    </div>
+        <div>
+            <h3> Types</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">S3</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">S4</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
     <div>
                 <h3> Member Functions</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f2</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                                    </div>
 
 
 </div>
@@ -176,10 +725,7 @@ <h3> Member Functions</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">S0</a>::
-<a href="#">S1</a>::
-<a href="#">S2</a>::
-f2</h2>
+        <h2>Function S0::S1::S2::f2</h2>
         
     </div>
 
@@ -187,7 +733,13 @@ <h2>Function <a href="#">S0</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-specializations-1.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -204,10 +756,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Class <a href="#">S0</a>::
-<a href="#">S1</a>::
-<a href="#">S2</a>::
-S3</h2>
+        <h2>Class S0::S1::S2::S3</h2>
         
     </div>
 
@@ -215,7 +764,13 @@ <h2>Class <a href="#">S0</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-specializations-1.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct S3;
@@ -225,8 +780,29 @@ <h3>Synopsis</h3>
     <div>
             <div>
                 <h3> Member Functions</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f3</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                                    </div>
 
 
 </div>
@@ -235,11 +811,7 @@ <h3> Member Functions</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">S0</a>::
-<a href="#">S1</a>::
-<a href="#">S2</a>::
-<a href="#">S3</a>::
-f3</h2>
+        <h2>Function S0::S1::S2::S3::f3</h2>
         
     </div>
 
@@ -247,7 +819,13 @@ <h2>Function <a href="#">S0</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-specializations-1.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -264,10 +842,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Class <a href="#">S0</a>::
-<a href="#">S1</a>::
-<a href="#">S2</a>::
-S4</h2>
+        <h2>Class S0::S1::S2::S4</h2>
         
     </div>
 
@@ -275,7 +850,13 @@ <h2>Class <a href="#">S0</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-specializations-1.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<
@@ -288,8 +869,29 @@ <h3>Synopsis</h3>
     <div>
             <div>
                 <h3> Member Functions</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f4</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                                    </div>
 
 
 </div>
@@ -298,11 +900,7 @@ <h3> Member Functions</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">S0</a>::
-<a href="#">S1</a>::
-<a href="#">S2</a>::
-<a href="#">S4</a>::
-f4</h2>
+        <h2>Function S0::S1::S2::S4::f4</h2>
         
     </div>
 
@@ -310,7 +908,13 @@ <h2>Function <a href="#">S0</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-specializations-1.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -327,8 +931,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Class <a href="#">S0</a>::
-S5</h2>
+        <h2>Class S0::S5</h2>
         
     </div>
 
@@ -336,7 +939,13 @@ <h2>Class <a href="#">S0</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-specializations-1.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<
@@ -347,13 +956,55 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-            <div>
-                <h3> Types</h3>
-                    </div>
+        <div>
+            <h3> Types</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">S6</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
     <div>
                 <h3> Member Functions</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f5</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                                    </div>
 
 
 </div>
@@ -362,9 +1013,7 @@ <h3> Member Functions</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">S0</a>::
-<a href="#">S5</a>::
-f5</h2>
+        <h2>Function S0::S5::f5</h2>
         
     </div>
 
@@ -372,7 +1021,13 @@ <h2>Function <a href="#">S0</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-specializations-1.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -389,9 +1044,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Class <a href="#">S0</a>::
-<a href="#">S5</a>::
-S6</h2>
+        <h2>Class S0::S5::S6</h2>
         
     </div>
 
@@ -399,7 +1052,13 @@ <h2>Class <a href="#">S0</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-specializations-1.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct S6;
@@ -407,13 +1066,55 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-            <div>
-                <h3> Types</h3>
-                    </div>
+        <div>
+            <h3> Types</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">S7</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
     <div>
                 <h3> Member Functions</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f6</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                                    </div>
 
 
 </div>
@@ -422,10 +1123,7 @@ <h3> Member Functions</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">S0</a>::
-<a href="#">S5</a>::
-<a href="#">S6</a>::
-f6</h2>
+        <h2>Function S0::S5::S6::f6</h2>
         
     </div>
 
@@ -433,7 +1131,13 @@ <h2>Function <a href="#">S0</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-specializations-1.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -450,10 +1154,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Class <a href="#">S0</a>::
-<a href="#">S5</a>::
-<a href="#">S6</a>::
-S7</h2>
+        <h2>Class S0::S5::S6::S7</h2>
         
     </div>
 
@@ -461,7 +1162,13 @@ <h2>Class <a href="#">S0</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-specializations-1.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<
@@ -472,13 +1179,62 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-            <div>
-                <h3> Types</h3>
-                    </div>
+        <div>
+            <h3> Types</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">S8</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">S9</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
     <div>
                 <h3> Member Functions</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f7</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                                    </div>
 
 
 </div>
@@ -487,11 +1243,7 @@ <h3> Member Functions</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">S0</a>::
-<a href="#">S5</a>::
-<a href="#">S6</a>::
-<a href="#">S7</a>::
-f7</h2>
+        <h2>Function S0::S5::S6::S7::f7</h2>
         
     </div>
 
@@ -499,7 +1251,13 @@ <h2>Function <a href="#">S0</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-specializations-1.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -516,11 +1274,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Class <a href="#">S0</a>::
-<a href="#">S5</a>::
-<a href="#">S6</a>::
-<a href="#">S7</a>::
-S8</h2>
+        <h2>Class S0::S5::S6::S7::S8</h2>
         
     </div>
 
@@ -528,7 +1282,13 @@ <h2>Class <a href="#">S0</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-specializations-1.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct S8;
@@ -538,8 +1298,29 @@ <h3>Synopsis</h3>
     <div>
             <div>
                 <h3> Member Functions</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f8</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                                    </div>
 
 
 </div>
@@ -548,12 +1329,7 @@ <h3> Member Functions</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">S0</a>::
-<a href="#">S5</a>::
-<a href="#">S6</a>::
-<a href="#">S7</a>::
-<a href="#">S8</a>::
-f8</h2>
+        <h2>Function S0::S5::S6::S7::S8::f8</h2>
         
     </div>
 
@@ -561,7 +1337,13 @@ <h2>Function <a href="#">S0</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-specializations-1.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -578,11 +1360,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Class <a href="#">S0</a>::
-<a href="#">S5</a>::
-<a href="#">S6</a>::
-<a href="#">S7</a>::
-S9</h2>
+        <h2>Class S0::S5::S6::S7::S9</h2>
         
     </div>
 
@@ -590,7 +1368,13 @@ <h2>Class <a href="#">S0</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-specializations-1.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<
@@ -603,8 +1387,29 @@ <h3>Synopsis</h3>
     <div>
             <div>
                 <h3> Member Functions</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f9</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                                    </div>
 
 
 </div>
@@ -613,12 +1418,7 @@ <h3> Member Functions</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">S0</a>::
-<a href="#">S5</a>::
-<a href="#">S6</a>::
-<a href="#">S7</a>::
-<a href="#">S9</a>::
-f9</h2>
+        <h2>Function S0::S5::S6::S7::S9::f9</h2>
         
     </div>
 
@@ -626,7 +1426,13 @@ <h2>Function <a href="#">S0</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-specializations-1.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -651,7 +1457,13 @@ <h2>Class S0</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-specializations-1.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<>
@@ -660,7 +1472,7 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-                            </div>
+                                                                                                                </div>
 
 
 </div>
@@ -677,7 +1489,13 @@ <h2>Class S0</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-specializations-1.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<typename T>
@@ -686,7 +1504,7 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-                            </div>
+                                                                                                                </div>
 
 
 </div>
@@ -703,7 +1521,13 @@ <h2>Class S0</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-specializations-1.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<>
@@ -712,7 +1536,7 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-                            </div>
+                                                                                                                </div>
 
 
 </div>
@@ -786,7 +1610,13 @@ <h2>Class R0</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-specializations-1.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct R0
@@ -795,13 +1625,62 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-            <div>
-                <h3> Types</h3>
-                    </div>
+        <div>
+            <h3> Types</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">S1</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">S5</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
     <div>
                 <h3> Member Functions</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f0</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                                    </div>
 
 
 </div>
@@ -818,7 +1697,13 @@ <h2>Class R1</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-specializations-1.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct R1
@@ -827,7 +1712,7 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-                            </div>
+                                                                                                                </div>
 
 
 </div>
@@ -844,7 +1729,13 @@ <h2>Class R2</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-specializations-1.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct R2
@@ -853,7 +1744,7 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-                            </div>
+                                                                                                                </div>
 
 
 </div>
@@ -870,7 +1761,13 @@ <h2>Class R3</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-specializations-1.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct R3
@@ -879,7 +1776,7 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-                            </div>
+                                                                                                                </div>
 
 
 </div>
@@ -896,7 +1793,13 @@ <h2>Class R4</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-specializations-1.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct R4
@@ -905,7 +1808,7 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-                            </div>
+                                                                                                                </div>
 
 
 </div>
@@ -922,7 +1825,13 @@ <h2>Class R5</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-specializations-1.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct R5
@@ -931,7 +1840,7 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-                            </div>
+                                                                                                                </div>
 
 
 </div>
@@ -948,7 +1857,13 @@ <h2>Class R6</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-specializations-1.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct R6
@@ -957,7 +1872,7 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-                            </div>
+                                                                                                                </div>
 
 
 </div>
@@ -974,7 +1889,13 @@ <h2>Class R7</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-specializations-1.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct R7
@@ -983,7 +1904,7 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-                            </div>
+                                                                                                                </div>
 
 
 </div>
@@ -1000,7 +1921,13 @@ <h2>Class R8</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-specializations-1.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct R8
@@ -1009,7 +1936,7 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-                            </div>
+                                                                                                                </div>
 
 
 </div>
@@ -1026,7 +1953,13 @@ <h2>Class R9</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-specializations-1.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct R9
@@ -1035,7 +1968,7 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-                            </div>
+                                                                                                                </div>
 
 
 </div>
@@ -1052,7 +1985,13 @@ <h2>Class R10</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-specializations-1.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct R10
@@ -1061,7 +2000,7 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-                            </div>
+                                                                                                                </div>
 
 
 </div>
@@ -1078,7 +2017,13 @@ <h2>Class R11</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-specializations-1.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct R11
@@ -1087,7 +2032,7 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-                            </div>
+                                                                                                                </div>
 
 
 </div>
@@ -1104,7 +2049,13 @@ <h2>Class R12</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-specializations-1.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct R12
@@ -1113,7 +2064,7 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-                            </div>
+                                                                                                                </div>
 
 
 </div>
@@ -1130,7 +2081,13 @@ <h2>Class R13</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-specializations-1.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct R13
@@ -1139,7 +2096,7 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-                            </div>
+                                                                                                                </div>
 
 
 </div>
@@ -1156,7 +2113,13 @@ <h2>Class R14</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-specializations-1.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct R14
@@ -1165,7 +2128,7 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-                            </div>
+                                                                                                                </div>
 
 
 </div>
@@ -1182,7 +2145,13 @@ <h2>Class R15</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-specializations-1.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct R15
@@ -1191,7 +2160,7 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-                            </div>
+                                                                                                                </div>
 
 
 </div>
@@ -1208,7 +2177,13 @@ <h2>Class R16</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-specializations-1.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct R16
@@ -1217,7 +2192,7 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-                            </div>
+                                                                                                                </div>
 
 
 </div>
@@ -1234,7 +2209,13 @@ <h2>Class R17</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-specializations-1.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct R17
@@ -1243,7 +2224,7 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-                            </div>
+                                                                                                                </div>
 
 
 </div>
@@ -1260,7 +2241,13 @@ <h2>Class R18</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-specializations-1.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct R18
@@ -1269,7 +2256,7 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-                            </div>
+                                                                                                                </div>
 
 
 </div>
@@ -1286,7 +2273,13 @@ <h2>Class R19</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-specializations-1.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct R19
@@ -1295,7 +2288,7 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-                            </div>
+                                                                                                                </div>
 
 
 </div>
@@ -1312,7 +2305,13 @@ <h2>Class R20</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-specializations-1.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct R20
@@ -1321,7 +2320,7 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-                            </div>
+                                                                                                                </div>
 
 
 </div>
@@ -1338,7 +2337,13 @@ <h2>Class R21</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-specializations-1.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct R21
@@ -1347,7 +2352,7 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-                            </div>
+                                                                                                                </div>
 
 
 </div>
@@ -1364,7 +2369,13 @@ <h2>Class R22</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-specializations-1.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct R22
@@ -1373,7 +2384,7 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-                            </div>
+                                                                                                                </div>
 
 
 </div>
@@ -1390,7 +2401,13 @@ <h2>Class R23</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-specializations-1.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct R23
@@ -1399,7 +2416,7 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-                            </div>
+                                                                                                                </div>
 
 
 </div>
@@ -1416,7 +2433,13 @@ <h2>Class R24</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-specializations-1.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct R24
@@ -1425,7 +2448,7 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-                            </div>
+                                                                                                                </div>
 
 
 </div>
@@ -1442,7 +2465,13 @@ <h2>Class R25</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-specializations-1.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct R25
@@ -1451,7 +2480,7 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-                            </div>
+                                                                                                                </div>
 
 
 </div>
@@ -1468,7 +2497,13 @@ <h2>Class R26</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-specializations-1.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct R26
@@ -1477,7 +2512,7 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-                            </div>
+                                                                                                                </div>
 
 
 </div>
@@ -1494,7 +2529,13 @@ <h2>Class R27</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-specializations-1.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct R27
@@ -1503,7 +2544,7 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-                            </div>
+                                                                                                                </div>
 
 
 </div>
@@ -1520,7 +2561,13 @@ <h2>Class R28</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-specializations-1.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct R28
@@ -1529,13 +2576,62 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-            <div>
-                <h3> Types</h3>
-                    </div>
+        <div>
+            <h3> Types</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">S1</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">S5</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
     <div>
                 <h3> Member Functions</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f0</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                                    </div>
 
 
 </div>
@@ -1552,7 +2648,13 @@ <h2>Class R29</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-specializations-1.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct R29
@@ -1561,13 +2663,62 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-            <div>
-                <h3> Types</h3>
-                    </div>
+        <div>
+            <h3> Types</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">S1</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">S5</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
     <div>
                 <h3> Member Functions</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f0</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                                    </div>
 
 
 </div>
@@ -1584,7 +2735,13 @@ <h2>Class R30</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-specializations-1.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct R30
@@ -1593,13 +2750,55 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-            <div>
-                <h3> Types</h3>
-                    </div>
+        <div>
+            <h3> Types</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">S2</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
     <div>
                 <h3> Member Functions</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f1</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                                    </div>
 
 
 </div>
@@ -1616,7 +2815,13 @@ <h2>Class R31</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-specializations-1.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<
@@ -1628,13 +2833,62 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-            <div>
-                <h3> Types</h3>
-                    </div>
+        <div>
+            <h3> Types</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">S3</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">S4</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
     <div>
                 <h3> Member Functions</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f2</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                                    </div>
 
 
 </div>
@@ -1651,7 +2905,13 @@ <h2>Class R32</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-specializations-1.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct R32
@@ -1660,13 +2920,62 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-            <div>
-                <h3> Types</h3>
-                    </div>
+        <div>
+            <h3> Types</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">S3</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">S4</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
     <div>
                 <h3> Member Functions</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f2</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                                    </div>
 
 
 </div>
@@ -1683,7 +2992,13 @@ <h2>Class R33</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-specializations-1.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct R33
@@ -1692,13 +3007,62 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-            <div>
-                <h3> Types</h3>
-                    </div>
+        <div>
+            <h3> Types</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">S3</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">S4</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
     <div>
                 <h3> Member Functions</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f2</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                                    </div>
 
 
 </div>
@@ -1715,7 +3079,13 @@ <h2>Class R34</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-specializations-1.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct R34
@@ -1726,8 +3096,29 @@ <h3>Synopsis</h3>
     <div>
             <div>
                 <h3> Member Functions</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f3</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                                    </div>
 
 
 </div>
@@ -1744,7 +3135,13 @@ <h2>Class R35</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-specializations-1.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<
@@ -1758,8 +3155,29 @@ <h3>Synopsis</h3>
     <div>
             <div>
                 <h3> Member Functions</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f4</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                                    </div>
 
 
 </div>
@@ -1776,7 +3194,13 @@ <h2>Class R36</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-specializations-1.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct R36
@@ -1787,8 +3211,29 @@ <h3>Synopsis</h3>
     <div>
             <div>
                 <h3> Member Functions</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f4</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                                    </div>
 
 
 </div>
@@ -1805,7 +3250,13 @@ <h2>Class R37</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-specializations-1.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct R37
@@ -1816,8 +3267,29 @@ <h3>Synopsis</h3>
     <div>
             <div>
                 <h3> Member Functions</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f4</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                                    </div>
 
 
 </div>
@@ -1834,7 +3306,13 @@ <h2>Class R38</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-specializations-1.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<
@@ -1846,13 +3324,55 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-            <div>
-                <h3> Types</h3>
-                    </div>
+        <div>
+            <h3> Types</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">S6</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
     <div>
                 <h3> Member Functions</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f5</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                                    </div>
 
 
 </div>
@@ -1869,7 +3389,13 @@ <h2>Class R39</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-specializations-1.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct R39
@@ -1878,13 +3404,55 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-            <div>
-                <h3> Types</h3>
-                    </div>
+        <div>
+            <h3> Types</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">S6</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
     <div>
                 <h3> Member Functions</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f5</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                                    </div>
 
 
 </div>
@@ -1901,7 +3469,13 @@ <h2>Class R40</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-specializations-1.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct R40
@@ -1910,13 +3484,55 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-            <div>
-                <h3> Types</h3>
-                    </div>
+        <div>
+            <h3> Types</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">S6</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
     <div>
                 <h3> Member Functions</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f5</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                                    </div>
 
 
 </div>
@@ -1933,7 +3549,13 @@ <h2>Class R41</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-specializations-1.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct R41
@@ -1942,13 +3564,55 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-            <div>
-                <h3> Types</h3>
-                    </div>
+        <div>
+            <h3> Types</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">S7</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
     <div>
                 <h3> Member Functions</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f6</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                                    </div>
 
 
 </div>
@@ -1965,7 +3629,13 @@ <h2>Class R42</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-specializations-1.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<
@@ -1977,13 +3647,62 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-            <div>
-                <h3> Types</h3>
-                    </div>
+        <div>
+            <h3> Types</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">S8</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">S9</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
     <div>
                 <h3> Member Functions</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f7</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                                    </div>
 
 
 </div>
@@ -2000,7 +3719,13 @@ <h2>Class R43</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-specializations-1.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct R43
@@ -2009,13 +3734,62 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-            <div>
-                <h3> Types</h3>
-                    </div>
+        <div>
+            <h3> Types</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">S8</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">S9</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
     <div>
                 <h3> Member Functions</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f7</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                                    </div>
 
 
 </div>
@@ -2032,7 +3806,13 @@ <h2>Class R44</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-specializations-1.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct R44
@@ -2041,13 +3821,62 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-            <div>
-                <h3> Types</h3>
-                    </div>
+        <div>
+            <h3> Types</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">S8</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">S9</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
     <div>
                 <h3> Member Functions</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f7</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                                    </div>
 
 
 </div>
@@ -2064,7 +3893,13 @@ <h2>Class R45</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-specializations-1.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct R45
@@ -2075,8 +3910,29 @@ <h3>Synopsis</h3>
     <div>
             <div>
                 <h3> Member Functions</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f8</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                                    </div>
 
 
 </div>
@@ -2093,7 +3949,13 @@ <h2>Class R46</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-specializations-1.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<
@@ -2107,8 +3969,29 @@ <h3>Synopsis</h3>
     <div>
             <div>
                 <h3> Member Functions</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f9</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                                    </div>
 
 
 </div>
@@ -2125,7 +4008,13 @@ <h2>Class R47</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-specializations-1.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct R47
@@ -2136,8 +4025,29 @@ <h3>Synopsis</h3>
     <div>
             <div>
                 <h3> Member Functions</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f9</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                                    </div>
 
 
 </div>
@@ -2154,7 +4064,13 @@ <h2>Class R48</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-specializations-1.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct R48
@@ -2165,8 +4081,29 @@ <h3>Synopsis</h3>
     <div>
             <div>
                 <h3> Member Functions</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f9</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                                    </div>
 
 
 </div>
diff --git a/test-files/golden-tests/class-template-specializations-2.adoc b/test-files/golden-tests/class-template-specializations-2.adoc
index fd39d50259..34d2809741 100644
--- a/test-files/golden-tests/class-template-specializations-2.adoc
+++ b/test-files/golden-tests/class-template-specializations-2.adoc
@@ -26,7 +26,7 @@
 
 === Synopsis
 
-Declared in header `<class-template-specializations-2.cpp>`
+Declared in `<class-template-specializations-2.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -46,7 +46,7 @@ struct A;
 
 === Synopsis
 
-Declared in header `<class-template-specializations-2.cpp>`
+Declared in `<class-template-specializations-2.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -77,7 +77,7 @@ struct xref:A-0e.adoc[pass:[A]]<T*>;
 
 === Synopsis
 
-Declared in header `<class-template-specializations-2.cpp>`
+Declared in `<class-template-specializations-2.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -97,7 +97,7 @@ struct B;
 
 === Synopsis
 
-Declared in header `<class-template-specializations-2.cpp>`
+Declared in `<class-template-specializations-2.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -124,7 +124,7 @@ struct xref:A-03/B-05.adoc[pass:[B]]<U*>;
 
 === Synopsis
 
-Declared in header `<class-template-specializations-2.cpp>`
+Declared in `<class-template-specializations-2.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -143,7 +143,7 @@ struct C;
 
 === Synopsis
 
-Declared in header `<class-template-specializations-2.cpp>`
+Declared in `<class-template-specializations-2.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -163,7 +163,7 @@ struct xref:A-03/B-05.adoc[pass:[B]]<int>;
 
 === Synopsis
 
-Declared in header `<class-template-specializations-2.cpp>`
+Declared in `<class-template-specializations-2.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -192,7 +192,7 @@ struct xref:A-0e.adoc[pass:[A]]<double>;
 
 === Synopsis
 
-Declared in header `<class-template-specializations-2.cpp>`
+Declared in `<class-template-specializations-2.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -221,7 +221,7 @@ struct D;
 
 === Synopsis
 
-Declared in header `<class-template-specializations-2.cpp>`
+Declared in `<class-template-specializations-2.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -241,7 +241,7 @@ struct E;
 
 === Synopsis
 
-Declared in header `<class-template-specializations-2.cpp>`
+Declared in `<class-template-specializations-2.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -268,7 +268,7 @@ struct xref:A-06/D-0b/E-01.adoc[pass:[E]]<T*>;
 
 === Synopsis
 
-Declared in header `<class-template-specializations-2.cpp>`
+Declared in `<class-template-specializations-2.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -287,7 +287,7 @@ struct F;
 
 === Synopsis
 
-Declared in header `<class-template-specializations-2.cpp>`
+Declared in `<class-template-specializations-2.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -316,7 +316,7 @@ struct xref:A-06/D-0b.adoc[pass:[D]]<float>;
 
 === Synopsis
 
-Declared in header `<class-template-specializations-2.cpp>`
+Declared in `<class-template-specializations-2.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -336,7 +336,7 @@ struct G;
 
 === Synopsis
 
-Declared in header `<class-template-specializations-2.cpp>`
+Declared in `<class-template-specializations-2.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
diff --git a/test-files/golden-tests/class-template-specializations-2.html b/test-files/golden-tests/class-template-specializations-2.html
index 8bbefdcd98..8e692a3414 100644
--- a/test-files/golden-tests/class-template-specializations-2.html
+++ b/test-files/golden-tests/class-template-specializations-2.html
@@ -1,4 +1,4 @@
-</html>
+<html>
     <head></head>
     <body>
         <div>
@@ -11,10 +11,45 @@ <h1>Reference</h1>
         <h2>Global namespace</h2>
     </div>
     <div>
-            <div>
-                <h3> Types</h3>
-                    </div>
-    </div>
+        <div>
+            <h3> Types</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">A</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">A<T*></a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">A<double></a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
+                </div>
 </div>
 
 [#[object Object]]
@@ -29,7 +64,13 @@ <h2>Class A</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-specializations-2.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<typename T>
@@ -38,7 +79,7 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-                            </div>
+                                                                                                                </div>
 
 
 </div>
@@ -55,7 +96,13 @@ <h2>Class A</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-specializations-2.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<typename T>
@@ -64,10 +111,45 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-            <div>
-                <h3> Types</h3>
-                    </div>
-                    </div>
+        <div>
+            <h3> Types</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">B</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">B<U*></a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">B<int></a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
+                                                                                                        </div>
 
 
 </div>
@@ -76,8 +158,7 @@ <h3> Types</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Class <a href="#">A</a>::
-B</h2>
+        <h2>Class A<T*>::B</h2>
         
     </div>
 
@@ -85,7 +166,13 @@ <h2>Class <a href="#">A</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-specializations-2.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<typename U>
@@ -94,7 +181,7 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-                            </div>
+                                                                                                                </div>
 
 
 </div>
@@ -103,8 +190,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Class <a href="#">A</a>::
-B</h2>
+        <h2>Class A<T*>::B</h2>
         
     </div>
 
@@ -112,7 +198,13 @@ <h2>Class <a href="#">A</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-specializations-2.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<typename U>
@@ -121,10 +213,31 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-            <div>
-                <h3> Types</h3>
-                    </div>
-                    </div>
+        <div>
+            <h3> Types</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">C</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
+                                                                                                        </div>
 
 
 </div>
@@ -133,9 +246,7 @@ <h3> Types</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Class <a href="#">A</a>::
-<a href="#">B</a>::
-C</h2>
+        <h2>Class A<T*>::B<U*>::C</h2>
         
     </div>
 
@@ -143,7 +254,13 @@ <h2>Class <a href="#">A</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-specializations-2.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct C;
@@ -151,7 +268,7 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-                            </div>
+                                                                                                                </div>
 
 
 </div>
@@ -160,8 +277,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Class <a href="#">A</a>::
-B</h2>
+        <h2>Class A<T*>::B</h2>
         
     </div>
 
@@ -169,7 +285,13 @@ <h2>Class <a href="#">A</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-specializations-2.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<>
@@ -178,7 +300,7 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-                            </div>
+                                                                                                                </div>
 
 
 </div>
@@ -195,7 +317,13 @@ <h2>Class A</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-specializations-2.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<>
@@ -204,10 +332,38 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-            <div>
-                <h3> Types</h3>
-                    </div>
-                    </div>
+        <div>
+            <h3> Types</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">D</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">D<float></a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
+                                                                                                        </div>
 
 
 </div>
@@ -216,8 +372,7 @@ <h3> Types</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Class <a href="#">A</a>::
-D</h2>
+        <h2>Class A<double>::D</h2>
         
     </div>
 
@@ -225,7 +380,13 @@ <h2>Class <a href="#">A</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-specializations-2.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<typename U>
@@ -234,10 +395,38 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-            <div>
-                <h3> Types</h3>
-                    </div>
-                    </div>
+        <div>
+            <h3> Types</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">E</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">E<T*></a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
+                                                                                                        </div>
 
 
 </div>
@@ -246,9 +435,7 @@ <h3> Types</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Class <a href="#">A</a>::
-<a href="#">D</a>::
-E</h2>
+        <h2>Class A<double>::D::E</h2>
         
     </div>
 
@@ -256,7 +443,13 @@ <h2>Class <a href="#">A</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-specializations-2.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<typename T>
@@ -265,7 +458,7 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-                            </div>
+                                                                                                                </div>
 
 
 </div>
@@ -274,9 +467,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Class <a href="#">A</a>::
-<a href="#">D</a>::
-E</h2>
+        <h2>Class A<double>::D::E</h2>
         
     </div>
 
@@ -284,7 +475,13 @@ <h2>Class <a href="#">A</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-specializations-2.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<typename T>
@@ -293,10 +490,31 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-            <div>
-                <h3> Types</h3>
-                    </div>
-                    </div>
+        <div>
+            <h3> Types</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">F</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
+                                                                                                        </div>
 
 
 </div>
@@ -305,10 +523,7 @@ <h3> Types</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Class <a href="#">A</a>::
-<a href="#">D</a>::
-<a href="#">E</a>::
-F</h2>
+        <h2>Class A<double>::D::E<T*>::F</h2>
         
     </div>
 
@@ -316,7 +531,13 @@ <h2>Class <a href="#">A</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-specializations-2.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct F;
@@ -324,7 +545,7 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-                            </div>
+                                                                                                                </div>
 
 
 </div>
@@ -333,8 +554,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Class <a href="#">A</a>::
-D</h2>
+        <h2>Class A<double>::D</h2>
         
     </div>
 
@@ -342,7 +562,13 @@ <h2>Class <a href="#">A</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-specializations-2.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<>
@@ -351,10 +577,38 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-            <div>
-                <h3> Types</h3>
-                    </div>
-                    </div>
+        <div>
+            <h3> Types</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">G</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">G<T*></a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
+                                                                                                        </div>
 
 
 </div>
@@ -363,9 +617,7 @@ <h3> Types</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Class <a href="#">A</a>::
-<a href="#">D</a>::
-G</h2>
+        <h2>Class A<double>::D<float>::G</h2>
         
     </div>
 
@@ -373,7 +625,13 @@ <h2>Class <a href="#">A</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-specializations-2.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<typename T>
@@ -382,7 +640,7 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-                            </div>
+                                                                                                                </div>
 
 
 </div>
@@ -391,9 +649,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Class <a href="#">A</a>::
-<a href="#">D</a>::
-G</h2>
+        <h2>Class A<double>::D<float>::G</h2>
         
     </div>
 
@@ -401,7 +657,13 @@ <h2>Class <a href="#">A</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-specializations-2.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<typename T>
@@ -410,7 +672,7 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-                            </div>
+                                                                                                                </div>
 
 
 </div>
diff --git a/test-files/golden-tests/class-template-specializations-3.adoc b/test-files/golden-tests/class-template-specializations-3.adoc
index c2b8105b9e..7748609cb7 100644
--- a/test-files/golden-tests/class-template-specializations-3.adoc
+++ b/test-files/golden-tests/class-template-specializations-3.adoc
@@ -24,7 +24,7 @@
 
 === Synopsis
 
-Declared in header `<class-template-specializations-3.cpp>`
+Declared in `<class-template-specializations-3.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -53,7 +53,7 @@ struct A;
 
 === Synopsis
 
-Declared in header `<class-template-specializations-3.cpp>`
+Declared in `<class-template-specializations-3.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -84,7 +84,7 @@ struct B;
 
 === Synopsis
 
-Declared in header `<class-template-specializations-3.cpp>`
+Declared in `<class-template-specializations-3.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -103,7 +103,7 @@ struct C;
 
 === Synopsis
 
-Declared in header `<class-template-specializations-3.cpp>`
+Declared in `<class-template-specializations-3.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -123,7 +123,7 @@ struct D;
 
 === Synopsis
 
-Declared in header `<class-template-specializations-3.cpp>`
+Declared in `<class-template-specializations-3.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -143,7 +143,7 @@ struct xref:A-0e/B-07/D-09.adoc[pass:[D]]<bool>;
 
 === Synopsis
 
-Declared in header `<class-template-specializations-3.cpp>`
+Declared in `<class-template-specializations-3.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -174,7 +174,7 @@ struct xref:A-0e/B-07.adoc[pass:[B]]<double>;
 
 === Synopsis
 
-Declared in header `<class-template-specializations-3.cpp>`
+Declared in `<class-template-specializations-3.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -193,7 +193,7 @@ struct C;
 
 === Synopsis
 
-Declared in header `<class-template-specializations-3.cpp>`
+Declared in `<class-template-specializations-3.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -213,7 +213,7 @@ struct D;
 
 === Synopsis
 
-Declared in header `<class-template-specializations-3.cpp>`
+Declared in `<class-template-specializations-3.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -239,7 +239,7 @@ struct xref:A-0e/B-00/D-09.adoc[pass:[D]]<bool>;
 
 === Synopsis
 
-Declared in header `<class-template-specializations-3.cpp>`
+Declared in `<class-template-specializations-3.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -293,7 +293,7 @@ struct E;
 
 === Synopsis
 
-Declared in header `<class-template-specializations-3.cpp>`
+Declared in `<class-template-specializations-3.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -310,7 +310,7 @@ xref:A-0e.adoc[A]<float>::xref:A-0e/B-00.adoc[B]<double> m0;
 
 === Synopsis
 
-Declared in header `<class-template-specializations-3.cpp>`
+Declared in `<class-template-specializations-3.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -327,7 +327,7 @@ xref:A-0e.adoc[A]<long>::xref:A-0e/B-00.adoc[B]<double> m1;
 
 === Synopsis
 
-Declared in header `<class-template-specializations-3.cpp>`
+Declared in `<class-template-specializations-3.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -344,7 +344,7 @@ xref:A-0e.adoc[A]<long>::xref:A-0c/B.adoc[B]<float> m2;
 
 === Synopsis
 
-Declared in header `<class-template-specializations-3.cpp>`
+Declared in `<class-template-specializations-3.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -361,7 +361,7 @@ xref:A-0e.adoc[A]<unsigned int>::xref:A-0e/B-07.adoc[B]<float> m3;
 
 === Synopsis
 
-Declared in header `<class-template-specializations-3.cpp>`
+Declared in `<class-template-specializations-3.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -378,7 +378,7 @@ xref:A-0e.adoc[A]<short>::xref:A-00/B.adoc[B]<void> m4;
 
 === Synopsis
 
-Declared in header `<class-template-specializations-3.cpp>`
+Declared in `<class-template-specializations-3.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -395,7 +395,7 @@ xref:A-0e.adoc[A]<float>::xref:A-0e/B-00.adoc[B]<double>::xref:A-0e/B-00/C.adoc[
 
 === Synopsis
 
-Declared in header `<class-template-specializations-3.cpp>`
+Declared in `<class-template-specializations-3.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -412,7 +412,7 @@ xref:A-0e.adoc[A]<long>::xref:A-0e/B-00.adoc[B]<double>::xref:A-0e/B-00/C.adoc[C
 
 === Synopsis
 
-Declared in header `<class-template-specializations-3.cpp>`
+Declared in `<class-template-specializations-3.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -429,7 +429,7 @@ xref:A-0e.adoc[A]<long>::xref:A-0c/B.adoc[B]<float>::xref:A-0c/B/C.adoc[C] m7;
 
 === Synopsis
 
-Declared in header `<class-template-specializations-3.cpp>`
+Declared in `<class-template-specializations-3.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -446,7 +446,7 @@ xref:A-0e.adoc[A]<unsigned int>::xref:A-0e/B-07.adoc[B]<float>::xref:A-0e/B-07/C
 
 === Synopsis
 
-Declared in header `<class-template-specializations-3.cpp>`
+Declared in `<class-template-specializations-3.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -463,7 +463,7 @@ xref:A-0e.adoc[A]<short>::xref:A-00/B.adoc[B]<void>::xref:A-00/B/C.adoc[C] m9;
 
 === Synopsis
 
-Declared in header `<class-template-specializations-3.cpp>`
+Declared in `<class-template-specializations-3.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -480,7 +480,7 @@ xref:A-0e.adoc[A]<float>::xref:A-0e/B-00.adoc[B]<double>::xref:A-0e/B-00/D-0d.ad
 
 === Synopsis
 
-Declared in header `<class-template-specializations-3.cpp>`
+Declared in `<class-template-specializations-3.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -497,7 +497,7 @@ xref:A-0e.adoc[A]<long>::xref:A-0e/B-00.adoc[B]<double>::xref:A-0e/B-00/D-0d.ado
 
 === Synopsis
 
-Declared in header `<class-template-specializations-3.cpp>`
+Declared in `<class-template-specializations-3.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -514,7 +514,7 @@ xref:A-0e.adoc[A]<long>::xref:A-0c/B.adoc[B]<float>::xref:A-0c/B/D-0b.adoc[D]<bo
 
 === Synopsis
 
-Declared in header `<class-template-specializations-3.cpp>`
+Declared in `<class-template-specializations-3.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -531,7 +531,7 @@ xref:A-0e.adoc[A]<unsigned int>::xref:A-0e/B-07.adoc[B]<float>::xref:A-0e/B-07/D
 
 === Synopsis
 
-Declared in header `<class-template-specializations-3.cpp>`
+Declared in `<class-template-specializations-3.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
diff --git a/test-files/golden-tests/class-template-specializations-3.html b/test-files/golden-tests/class-template-specializations-3.html
index 39bd03f6d8..6babede674 100644
--- a/test-files/golden-tests/class-template-specializations-3.html
+++ b/test-files/golden-tests/class-template-specializations-3.html
@@ -1,4 +1,4 @@
-</html>
+<html>
     <head></head>
     <body>
         <div>
@@ -11,10 +11,38 @@ <h1>Reference</h1>
         <h2>Global namespace</h2>
     </div>
     <div>
-            <div>
-                <h3> Types</h3>
-                    </div>
-    </div>
+        <div>
+            <h3> Types</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">A</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">E</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
+                </div>
 </div>
 
 [#[object Object]]
@@ -29,7 +57,13 @@ <h2>Class A</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-specializations-3.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<typename T>
@@ -38,10 +72,38 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-            <div>
-                <h3> Types</h3>
-                    </div>
-                    </div>
+        <div>
+            <h3> Types</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">B</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">B<double></a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
+                                                                                                        </div>
 
 
 </div>
@@ -50,8 +112,7 @@ <h3> Types</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Class <a href="#">A</a>::
-B</h2>
+        <h2>Class A::B</h2>
         
     </div>
 
@@ -59,7 +120,13 @@ <h2>Class <a href="#">A</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-specializations-3.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<typename U>
@@ -68,10 +135,45 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-            <div>
-                <h3> Types</h3>
-                    </div>
-                    </div>
+        <div>
+            <h3> Types</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">C</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">D</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">D<bool></a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
+                                                                                                        </div>
 
 
 </div>
@@ -80,9 +182,7 @@ <h3> Types</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Class <a href="#">A</a>::
-<a href="#">B</a>::
-C</h2>
+        <h2>Class A::B::C</h2>
         
     </div>
 
@@ -90,7 +190,13 @@ <h2>Class <a href="#">A</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-specializations-3.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct C;
@@ -98,7 +204,7 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-                            </div>
+                                                                                                                </div>
 
 
 </div>
@@ -107,9 +213,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Class <a href="#">A</a>::
-<a href="#">B</a>::
-D</h2>
+        <h2>Class A::B::D</h2>
         
     </div>
 
@@ -117,7 +221,13 @@ <h2>Class <a href="#">A</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-specializations-3.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<typename V>
@@ -126,7 +236,7 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-                            </div>
+                                                                                                                </div>
 
 
 </div>
@@ -135,9 +245,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Class <a href="#">A</a>::
-<a href="#">B</a>::
-D</h2>
+        <h2>Class A::B::D</h2>
         
     </div>
 
@@ -145,7 +253,13 @@ <h2>Class <a href="#">A</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-specializations-3.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<>
@@ -154,7 +268,7 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-                            </div>
+                                                                                                                </div>
 
 
 </div>
@@ -163,8 +277,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Class <a href="#">A</a>::
-B</h2>
+        <h2>Class A::B</h2>
         
     </div>
 
@@ -172,7 +285,13 @@ <h2>Class <a href="#">A</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-specializations-3.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<>
@@ -181,10 +300,45 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-            <div>
-                <h3> Types</h3>
-                    </div>
-                    </div>
+        <div>
+            <h3> Types</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">C</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">D</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">D<bool></a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
+                                                                                                        </div>
 
 
 </div>
@@ -193,9 +347,7 @@ <h3> Types</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Class <a href="#">A</a>::
-<a href="#">B</a>::
-C</h2>
+        <h2>Class A::B<double>::C</h2>
         
     </div>
 
@@ -203,7 +355,13 @@ <h2>Class <a href="#">A</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-specializations-3.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct C;
@@ -211,7 +369,7 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-                            </div>
+                                                                                                                </div>
 
 
 </div>
@@ -220,9 +378,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Class <a href="#">A</a>::
-<a href="#">B</a>::
-D</h2>
+        <h2>Class A::B<double>::D</h2>
         
     </div>
 
@@ -230,7 +386,13 @@ <h2>Class <a href="#">A</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-specializations-3.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<typename V>
@@ -239,7 +401,7 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-                            </div>
+                                                                                                                </div>
 
 
 </div>
@@ -248,9 +410,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Class <a href="#">A</a>::
-<a href="#">B</a>::
-D</h2>
+        <h2>Class A::B<double>::D</h2>
         
     </div>
 
@@ -258,7 +418,13 @@ <h2>Class <a href="#">A</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-specializations-3.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<>
@@ -267,7 +433,7 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-                            </div>
+                                                                                                                </div>
 
 
 </div>
@@ -290,7 +456,13 @@ <h2>Class E</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-specializations-3.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct E;
@@ -298,10 +470,129 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-            <div>
+                    <div>
                 <h3> Data Members</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">m0</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">m1</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">m10</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">m11</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">m12</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">m13</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">m14</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">m2</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">m3</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">m4</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">m5</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">m6</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">m7</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">m8</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">m9</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                            </div>
 
 
 </div>
@@ -310,8 +601,7 @@ <h3> Data Members</h3>
 
 <div id="[object Object]">
     <div>
-        <h2><a href="#">E</a>::
-m0</h2>
+        <h2>E::m0</h2>
         
     </div>
 
@@ -319,7 +609,13 @@ <h2><a href="#">E</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-specializations-3.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             A<float>::B<double> m0;
@@ -332,8 +628,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2><a href="#">E</a>::
-m1</h2>
+        <h2>E::m1</h2>
         
     </div>
 
@@ -341,7 +636,13 @@ <h2><a href="#">E</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-specializations-3.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             A<long>::B<double> m1;
@@ -354,8 +655,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2><a href="#">E</a>::
-m2</h2>
+        <h2>E::m2</h2>
         
     </div>
 
@@ -363,7 +663,13 @@ <h2><a href="#">E</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-specializations-3.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             A<long>::B<float> m2;
@@ -376,8 +682,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2><a href="#">E</a>::
-m3</h2>
+        <h2>E::m3</h2>
         
     </div>
 
@@ -385,7 +690,13 @@ <h2><a href="#">E</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-specializations-3.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             A<unsigned int>::B<float> m3;
@@ -398,8 +709,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2><a href="#">E</a>::
-m4</h2>
+        <h2>E::m4</h2>
         
     </div>
 
@@ -407,7 +717,13 @@ <h2><a href="#">E</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-specializations-3.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             A<short>::B<void> m4;
@@ -420,8 +736,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2><a href="#">E</a>::
-m5</h2>
+        <h2>E::m5</h2>
         
     </div>
 
@@ -429,7 +744,13 @@ <h2><a href="#">E</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-specializations-3.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             A<float>::B<double>::C m5;
@@ -442,8 +763,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2><a href="#">E</a>::
-m6</h2>
+        <h2>E::m6</h2>
         
     </div>
 
@@ -451,7 +771,13 @@ <h2><a href="#">E</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-specializations-3.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             A<long>::B<double>::C m6;
@@ -464,8 +790,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2><a href="#">E</a>::
-m7</h2>
+        <h2>E::m7</h2>
         
     </div>
 
@@ -473,7 +798,13 @@ <h2><a href="#">E</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-specializations-3.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             A<long>::B<float>::C m7;
@@ -486,8 +817,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2><a href="#">E</a>::
-m8</h2>
+        <h2>E::m8</h2>
         
     </div>
 
@@ -495,7 +825,13 @@ <h2><a href="#">E</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-specializations-3.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             A<unsigned int>::B<float>::C m8;
@@ -508,8 +844,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2><a href="#">E</a>::
-m9</h2>
+        <h2>E::m9</h2>
         
     </div>
 
@@ -517,7 +852,13 @@ <h2><a href="#">E</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-specializations-3.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             A<short>::B<void>::C m9;
@@ -530,8 +871,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2><a href="#">E</a>::
-m10</h2>
+        <h2>E::m10</h2>
         
     </div>
 
@@ -539,7 +879,13 @@ <h2><a href="#">E</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-specializations-3.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             A<float>::B<double>::D<bool> m10;
@@ -552,8 +898,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2><a href="#">E</a>::
-m11</h2>
+        <h2>E::m11</h2>
         
     </div>
 
@@ -561,7 +906,13 @@ <h2><a href="#">E</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-specializations-3.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             A<long>::B<double>::D<bool> m11;
@@ -574,8 +925,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2><a href="#">E</a>::
-m12</h2>
+        <h2>E::m12</h2>
         
     </div>
 
@@ -583,7 +933,13 @@ <h2><a href="#">E</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-specializations-3.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             A<long>::B<float>::D<bool> m12;
@@ -596,8 +952,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2><a href="#">E</a>::
-m13</h2>
+        <h2>E::m13</h2>
         
     </div>
 
@@ -605,7 +960,13 @@ <h2><a href="#">E</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-specializations-3.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             A<unsigned int>::B<float>::D<bool> m13;
@@ -618,8 +979,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2><a href="#">E</a>::
-m14</h2>
+        <h2>E::m14</h2>
         
     </div>
 
@@ -627,7 +987,13 @@ <h2><a href="#">E</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template-specializations-3.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             A<short>::B<void>::D<bool> m14;
diff --git a/test-files/golden-tests/class-template.adoc b/test-files/golden-tests/class-template.adoc
index 0ebc41ac9b..c43dea9f5d 100644
--- a/test-files/golden-tests/class-template.adoc
+++ b/test-files/golden-tests/class-template.adoc
@@ -30,7 +30,7 @@
 
 === Synopsis
 
-Declared in header `<class-template.cpp>`
+Declared in `<class-template.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -49,7 +49,7 @@ struct S;
 
 === Synopsis
 
-Declared in header `<class-template.cpp>`
+Declared in `<class-template.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -87,7 +87,7 @@ struct C0;
 
 === Synopsis
 
-Declared in header `<class-template.cpp>`
+Declared in `<class-template.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -104,7 +104,7 @@ int w;
 
 === Synopsis
 
-Declared in header `<class-template.cpp>`
+Declared in `<class-template.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -121,7 +121,7 @@ xref:S.adoc[S] x;
 
 === Synopsis
 
-Declared in header `<class-template.cpp>`
+Declared in `<class-template.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -138,7 +138,7 @@ T y;
 
 === Synopsis
 
-Declared in header `<class-template.cpp>`
+Declared in `<class-template.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -164,7 +164,7 @@ struct N0;
 
 === Synopsis
 
-Declared in header `<class-template.cpp>`
+Declared in `<class-template.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -181,7 +181,7 @@ int z;
 
 === Synopsis
 
-Declared in header `<class-template.cpp>`
+Declared in `<class-template.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -214,7 +214,7 @@ struct C1;
 
 === Synopsis
 
-Declared in header `<class-template.cpp>`
+Declared in `<class-template.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -231,7 +231,7 @@ int w;
 
 === Synopsis
 
-Declared in header `<class-template.cpp>`
+Declared in `<class-template.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -262,7 +262,7 @@ struct N1;
 
 === Synopsis
 
-Declared in header `<class-template.cpp>`
+Declared in `<class-template.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -279,7 +279,7 @@ xref:S.adoc[S] x;
 
 === Synopsis
 
-Declared in header `<class-template.cpp>`
+Declared in `<class-template.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -296,7 +296,7 @@ T y;
 
 === Synopsis
 
-Declared in header `<class-template.cpp>`
+Declared in `<class-template.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -313,7 +313,7 @@ int z;
 
 === Synopsis
 
-Declared in header `<class-template.cpp>`
+Declared in `<class-template.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -347,7 +347,7 @@ struct C2;
 
 === Synopsis
 
-Declared in header `<class-template.cpp>`
+Declared in `<class-template.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -364,7 +364,7 @@ int v;
 
 === Synopsis
 
-Declared in header `<class-template.cpp>`
+Declared in `<class-template.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -397,7 +397,7 @@ struct N2;
 
 === Synopsis
 
-Declared in header `<class-template.cpp>`
+Declared in `<class-template.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -414,7 +414,7 @@ xref:S.adoc[S] w;
 
 === Synopsis
 
-Declared in header `<class-template.cpp>`
+Declared in `<class-template.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -431,7 +431,7 @@ T x;
 
 === Synopsis
 
-Declared in header `<class-template.cpp>`
+Declared in `<class-template.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -448,7 +448,7 @@ U y;
 
 === Synopsis
 
-Declared in header `<class-template.cpp>`
+Declared in `<class-template.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -465,7 +465,7 @@ int z;
 
 === Synopsis
 
-Declared in header `<class-template.cpp>`
+Declared in `<class-template.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -492,7 +492,7 @@ struct C3;
 
 === Synopsis
 
-Declared in header `<class-template.cpp>`
+Declared in `<class-template.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
diff --git a/test-files/golden-tests/class-template.html b/test-files/golden-tests/class-template.html
index e1e13a1138..b9c8a3b6d8 100644
--- a/test-files/golden-tests/class-template.html
+++ b/test-files/golden-tests/class-template.html
@@ -1,4 +1,4 @@
-</html>
+<html>
     <head></head>
     <body>
         <div>
@@ -11,10 +11,59 @@ <h1>Reference</h1>
         <h2>Global namespace</h2>
     </div>
     <div>
-            <div>
-                <h3> Types</h3>
-                    </div>
-    </div>
+        <div>
+            <h3> Types</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">C0</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">C1</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">C2</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">C3</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">S</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
+                </div>
 </div>
 
 [#[object Object]]
@@ -29,7 +78,13 @@ <h2>Class S</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct S;
@@ -37,7 +92,7 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-                            </div>
+                                                                                                                </div>
 
 
 </div>
@@ -54,7 +109,13 @@ <h2>Class C0</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<typename T>
@@ -63,13 +124,69 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
+        <div>
+            <h3> Types</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">N0</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
             <div>
-                <h3> Types</h3>
-                    </div>
-    <div>
                 <h3> Data Members</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">w</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">x</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">y</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                            </div>
 
 
 </div>
@@ -78,8 +195,7 @@ <h3> Data Members</h3>
 
 <div id="[object Object]">
     <div>
-        <h2><a href="#">C0</a>::
-w</h2>
+        <h2>C0::w</h2>
         
     </div>
 
@@ -87,7 +203,13 @@ <h2><a href="#">C0</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             int w;
@@ -100,8 +222,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2><a href="#">C0</a>::
-x</h2>
+        <h2>C0::x</h2>
         
     </div>
 
@@ -109,7 +230,13 @@ <h2><a href="#">C0</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             S x;
@@ -122,8 +249,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2><a href="#">C0</a>::
-y</h2>
+        <h2>C0::y</h2>
         
     </div>
 
@@ -131,7 +257,13 @@ <h2><a href="#">C0</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             T y;
@@ -144,8 +276,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Class <a href="#">C0</a>::
-N0</h2>
+        <h2>Class C0::N0</h2>
         
     </div>
 
@@ -153,7 +284,13 @@ <h2>Class <a href="#">C0</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct N0;
@@ -161,10 +298,31 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-            <div>
+                    <div>
                 <h3> Data Members</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">z</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                            </div>
 
 
 </div>
@@ -173,9 +331,7 @@ <h3> Data Members</h3>
 
 <div id="[object Object]">
     <div>
-        <h2><a href="#">C0</a>::
-<a href="#">N0</a>::
-z</h2>
+        <h2>C0::N0::z</h2>
         
     </div>
 
@@ -183,7 +339,13 @@ <h2><a href="#">C0</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             int z;
@@ -204,7 +366,13 @@ <h2>Class C1</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct C1;
@@ -212,13 +380,55 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
+        <div>
+            <h3> Types</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">N1</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
             <div>
-                <h3> Types</h3>
-                    </div>
-    <div>
                 <h3> Data Members</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">w</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                            </div>
 
 
 </div>
@@ -227,8 +437,7 @@ <h3> Data Members</h3>
 
 <div id="[object Object]">
     <div>
-        <h2><a href="#">C1</a>::
-w</h2>
+        <h2>C1::w</h2>
         
     </div>
 
@@ -236,7 +445,13 @@ <h2><a href="#">C1</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             int w;
@@ -249,8 +464,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Class <a href="#">C1</a>::
-N1</h2>
+        <h2>Class C1::N1</h2>
         
     </div>
 
@@ -258,7 +472,13 @@ <h2>Class <a href="#">C1</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<typename T>
@@ -267,10 +487,45 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-            <div>
+                    <div>
                 <h3> Data Members</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">x</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">y</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">z</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                            </div>
 
 
 </div>
@@ -279,9 +534,7 @@ <h3> Data Members</h3>
 
 <div id="[object Object]">
     <div>
-        <h2><a href="#">C1</a>::
-<a href="#">N1</a>::
-x</h2>
+        <h2>C1::N1::x</h2>
         
     </div>
 
@@ -289,7 +542,13 @@ <h2><a href="#">C1</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             S x;
@@ -302,9 +561,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2><a href="#">C1</a>::
-<a href="#">N1</a>::
-y</h2>
+        <h2>C1::N1::y</h2>
         
     </div>
 
@@ -312,7 +569,13 @@ <h2><a href="#">C1</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             T y;
@@ -325,9 +588,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2><a href="#">C1</a>::
-<a href="#">N1</a>::
-z</h2>
+        <h2>C1::N1::z</h2>
         
     </div>
 
@@ -335,7 +596,13 @@ <h2><a href="#">C1</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             int z;
@@ -356,7 +623,13 @@ <h2>Class C2</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<typename T>
@@ -365,13 +638,55 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
+        <div>
+            <h3> Types</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">N2</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
             <div>
-                <h3> Types</h3>
-                    </div>
-    <div>
                 <h3> Data Members</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">v</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                            </div>
 
 
 </div>
@@ -380,8 +695,7 @@ <h3> Data Members</h3>
 
 <div id="[object Object]">
     <div>
-        <h2><a href="#">C2</a>::
-v</h2>
+        <h2>C2::v</h2>
         
     </div>
 
@@ -389,7 +703,13 @@ <h2><a href="#">C2</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             int v;
@@ -402,8 +722,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Class <a href="#">C2</a>::
-N2</h2>
+        <h2>Class C2::N2</h2>
         
     </div>
 
@@ -411,7 +730,13 @@ <h2>Class <a href="#">C2</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<typename U>
@@ -420,10 +745,52 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-            <div>
+                    <div>
                 <h3> Data Members</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">w</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">x</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">y</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">z</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                            </div>
 
 
 </div>
@@ -432,9 +799,7 @@ <h3> Data Members</h3>
 
 <div id="[object Object]">
     <div>
-        <h2><a href="#">C2</a>::
-<a href="#">N2</a>::
-w</h2>
+        <h2>C2::N2::w</h2>
         
     </div>
 
@@ -442,7 +807,13 @@ <h2><a href="#">C2</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             S w;
@@ -455,9 +826,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2><a href="#">C2</a>::
-<a href="#">N2</a>::
-x</h2>
+        <h2>C2::N2::x</h2>
         
     </div>
 
@@ -465,7 +834,13 @@ <h2><a href="#">C2</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             T x;
@@ -478,9 +853,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2><a href="#">C2</a>::
-<a href="#">N2</a>::
-y</h2>
+        <h2>C2::N2::y</h2>
         
     </div>
 
@@ -488,7 +861,13 @@ <h2><a href="#">C2</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             U y;
@@ -501,9 +880,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2><a href="#">C2</a>::
-<a href="#">N2</a>::
-z</h2>
+        <h2>C2::N2::z</h2>
         
     </div>
 
@@ -511,7 +888,13 @@ <h2><a href="#">C2</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             int z;
@@ -532,7 +915,13 @@ <h2>Class C3</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<typename T>
@@ -541,10 +930,31 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-            <div>
+                    <div>
                 <h3> Data Members</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">v</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                            </div>
 
 
 </div>
@@ -553,8 +963,7 @@ <h3> Data Members</h3>
 
 <div id="[object Object]">
     <div>
-        <h2><a href="#">C3</a>::
-v</h2>
+        <h2>C3::v</h2>
         
     </div>
 
@@ -562,7 +971,13 @@ <h2><a href="#">C3</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><class-template.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             int v;
diff --git a/test-files/golden-tests/commands.adoc b/test-files/golden-tests/commands.adoc
index 1bbb13b0ac..290161a5da 100644
--- a/test-files/golden-tests/commands.adoc
+++ b/test-files/golden-tests/commands.adoc
@@ -26,7 +26,7 @@ brief
 
 === Synopsis
 
-Declared in header `<commands.cpp>`
+Declared in `<commands.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
diff --git a/test-files/golden-tests/commands.html b/test-files/golden-tests/commands.html
index 58be6260b9..a8cc360682 100644
--- a/test-files/golden-tests/commands.html
+++ b/test-files/golden-tests/commands.html
@@ -1,4 +1,4 @@
-</html>
+<html>
     <head></head>
     <body>
         <div>
@@ -12,9 +12,32 @@ <h2>Global namespace</h2>
     </div>
     <div>
             <div>
-                <h3> Member Functions</h3>
-                    </div>
-    </div>
+                <h3>Functions</h3>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f1</a> 
+                                </td>
+                                <td>
+<p><span>brief</span></p>
+                            
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+            </div>
 </div>
 
 [#[object Object]]
@@ -31,7 +54,13 @@ <h2>Function f1</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><commands.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
diff --git a/test-files/golden-tests/concept.adoc b/test-files/golden-tests/concept.adoc
index 8e07e7b0b1..d7daf36273 100644
--- a/test-files/golden-tests/concept.adoc
+++ b/test-files/golden-tests/concept.adoc
@@ -36,7 +36,7 @@
 
 == Synopsis
 
-Declared in header `<concept.cpp>`
+Declared in `<concept.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -54,7 +54,7 @@ concept C = sizeof(T) == sizeof(int);
 
 === Synopsis
 
-Declared in header `<concept.cpp>`
+Declared in `<concept.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -79,7 +79,7 @@ f();
 
 === Synopsis
 
-Declared in header `<concept.cpp>`
+Declared in `<concept.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
diff --git a/test-files/golden-tests/concept.html b/test-files/golden-tests/concept.html
index 9f536b6425..bf5bd1814d 100644
--- a/test-files/golden-tests/concept.html
+++ b/test-files/golden-tests/concept.html
@@ -1,4 +1,4 @@
-</html>
+<html>
     <head></head>
     <body>
         <div>
@@ -12,11 +12,77 @@ <h2>Global namespace</h2>
     </div>
     <div>
             <div>
-                <h3> Member Functions</h3>
-                    </div>
+                <h3>Functions</h3>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+    <div>
+                <h3>Variables</h3>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">x</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
     <div>
-                <h3> Variables</h3>
-                    </div>
+                <h3>Concepts</h3>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">C</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
     </div>
 </div>
 
@@ -31,7 +97,13 @@ <h2>C</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><concept.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<typename T>
@@ -52,10 +124,16 @@ <h2>Function f</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><concept.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
-            template<class T>
+            template<C T>
 void
 f();
         </pre>
@@ -78,10 +156,16 @@ <h2>x</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><concept.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
-             x = 0;
+            C auto x = 0;
         </pre>
     </div>
 
diff --git a/test-files/golden-tests/dependency-propagation.adoc b/test-files/golden-tests/dependency-propagation.adoc
index dbc2051694..1320f3358e 100644
--- a/test-files/golden-tests/dependency-propagation.adoc
+++ b/test-files/golden-tests/dependency-propagation.adoc
@@ -29,7 +29,7 @@
 
 === Synopsis
 
-Declared in header `<dependency-propagation.cpp>`
+Declared in `<dependency-propagation.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -66,7 +66,7 @@ struct E
 
 === Synopsis
 
-Declared in header `<dependency-propagation.cpp>`
+Declared in `<dependency-propagation.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -84,7 +84,7 @@ using C = xref:N/B.adoc[B]<T>;
 
 === Synopsis
 
-Declared in header `<dependency-propagation.cpp>`
+Declared in `<dependency-propagation.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -102,7 +102,7 @@ using B = xref:N/A.adoc[A]<T>;
 
 === Synopsis
 
-Declared in header `<dependency-propagation.cpp>`
+Declared in `<dependency-propagation.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
diff --git a/test-files/golden-tests/dependency-propagation.html b/test-files/golden-tests/dependency-propagation.html
index 733ae66cc4..c442e573fb 100644
--- a/test-files/golden-tests/dependency-propagation.html
+++ b/test-files/golden-tests/dependency-propagation.html
@@ -1,4 +1,4 @@
-</html>
+<html>
     <head></head>
     <body>
         <div>
@@ -11,13 +11,55 @@ <h1>Reference</h1>
         <h2>Global namespace</h2>
     </div>
     <div>
-            <div>
-                <h3> Namespaces</h3>
-                    </div>
-    <div>
-                <h3> Types</h3>
-                    </div>
-    </div>
+        <div>
+            <h3>Namespaces</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">N</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
+<div>
+            <h3> Types</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">E</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
+                </div>
 </div>
 
 [#[object Object]]
@@ -32,7 +74,13 @@ <h2>Class E</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><dependency-propagation.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct E
@@ -41,7 +89,7 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-                            </div>
+                                                                                                                </div>
 
 
 </div>
@@ -53,13 +101,45 @@ <h3>Synopsis</h3>
         <h2>Namespace N</h2>
     </div>
     <div>
-            <div>
-                <h3> Types</h3>
-                    </div>
-    <div>
-            <h3>Types</h3>
-            </div>
-    </div>
+        <div>
+            <h3> Types</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">A</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">B</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">C</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
+                </div>
 </div>
 
 [#[object Object]]
@@ -74,7 +154,13 @@ <h2>C</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><dependency-propagation.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<typename T>
@@ -96,7 +182,13 @@ <h2>B</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><dependency-propagation.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<typename T>
@@ -118,7 +210,13 @@ <h2>Class A</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><dependency-propagation.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<typename T>
@@ -127,7 +225,7 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-                            </div>
+                                                                                                                </div>
 
 
 </div>
diff --git a/test-files/golden-tests/duplicate-jdoc.adoc b/test-files/golden-tests/duplicate-jdoc.adoc
index 178d315660..d92b9bb582 100644
--- a/test-files/golden-tests/duplicate-jdoc.adoc
+++ b/test-files/golden-tests/duplicate-jdoc.adoc
@@ -46,7 +46,7 @@ f0 brief
 
 === Synopsis
 
-Declared in header `<duplicate-jdoc.cpp>`
+Declared in `<duplicate-jdoc.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -78,7 +78,7 @@ f1 brief
 
 === Synopsis
 
-Declared in header `<duplicate-jdoc.cpp>`
+Declared in `<duplicate-jdoc.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -110,7 +110,7 @@ g0 brief
 
 === Synopsis
 
-Declared in header `<duplicate-jdoc.cpp>`
+Declared in `<duplicate-jdoc.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -151,7 +151,7 @@ g1 brief
 
 === Synopsis
 
-Declared in header `<duplicate-jdoc.cpp>`
+Declared in `<duplicate-jdoc.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -192,7 +192,7 @@ h0 brief
 
 === Synopsis
 
-Declared in header `<duplicate-jdoc.cpp>`
+Declared in `<duplicate-jdoc.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -234,7 +234,7 @@ h1 brief
 
 === Synopsis
 
-Declared in header `<duplicate-jdoc.cpp>`
+Declared in `<duplicate-jdoc.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
diff --git a/test-files/golden-tests/duplicate-jdoc.html b/test-files/golden-tests/duplicate-jdoc.html
index 02a5be76d9..a8f26f6e95 100644
--- a/test-files/golden-tests/duplicate-jdoc.html
+++ b/test-files/golden-tests/duplicate-jdoc.html
@@ -1,4 +1,4 @@
-</html>
+<html>
     <head></head>
     <body>
         <div>
@@ -12,9 +12,77 @@ <h2>Global namespace</h2>
     </div>
     <div>
             <div>
-                <h3> Member Functions</h3>
-                    </div>
-    </div>
+                <h3>Functions</h3>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f0</a> 
+                                </td>
+                                <td>
+<p><span>f0 brief</span></p>
+                            
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">f1</a> 
+                                </td>
+                                <td>
+<p><span>f1 brief</span></p>
+                            
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">g0</a> 
+                                </td>
+                                <td>
+<p><span>g0 brief</span></p>
+                            
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">g1</a> 
+                                </td>
+                                <td>
+<p><span>g1 brief</span></p>
+                            
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">h0</a> 
+                                </td>
+                                <td>
+<p><span>h0 brief</span></p>
+                            
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">h1</a> 
+                                </td>
+                                <td>
+<p><span>h1 brief</span></p>
+                            
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+            </div>
 </div>
 
 [#[object Object]]
@@ -31,7 +99,13 @@ <h2>Function f0</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><duplicate-jdoc.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             int
@@ -58,7 +132,13 @@ <h2>Function f1</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><duplicate-jdoc.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             int
@@ -85,7 +165,13 @@ <h2>Function g0</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><duplicate-jdoc.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -112,7 +198,13 @@ <h2>Function g1</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><duplicate-jdoc.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -139,7 +231,13 @@ <h2>Function h0</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><duplicate-jdoc.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<typename T>
@@ -167,7 +265,13 @@ <h2>Function h1</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><duplicate-jdoc.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<typename T>
diff --git a/test-files/golden-tests/empty.html b/test-files/golden-tests/empty.html
index 64f0ac5c53..a71296e6fb 100644
--- a/test-files/golden-tests/empty.html
+++ b/test-files/golden-tests/empty.html
@@ -1,4 +1,4 @@
-</html>
+<html>
     <head></head>
     <body>
         <div>
@@ -11,7 +11,7 @@ <h1>Reference</h1>
         <h2>Global namespace</h2>
     </div>
     <div>
-            </div>
+                        </div>
 </div>
         </div>
         <div><h4>Created with MrDocs</h4></div>
diff --git a/test-files/golden-tests/enum.adoc b/test-files/golden-tests/enum.adoc
index d13d55819e..b3597f5789 100644
--- a/test-files/golden-tests/enum.adoc
+++ b/test-files/golden-tests/enum.adoc
@@ -34,7 +34,7 @@ E0 brief.
 
 === Synopsis
 
-Declared in header `<enum.cpp>`
+Declared in `<enum.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -70,7 +70,7 @@ e0 brief.
 
 === Synopsis
 
-Declared in header `<enum.cpp>`
+Declared in `<enum.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -95,7 +95,7 @@ e1 brief.
 
 === Synopsis
 
-Declared in header `<enum.cpp>`
+Declared in `<enum.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -118,7 +118,7 @@ e1 description.
 
 === Synopsis
 
-Declared in header `<enum.cpp>`
+Declared in `<enum.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -143,7 +143,7 @@ enum E1 : char;
 
 === Synopsis
 
-Declared in header `<enum.cpp>`
+Declared in `<enum.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -160,7 +160,7 @@ e2
 
 === Synopsis
 
-Declared in header `<enum.cpp>`
+Declared in `<enum.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -179,7 +179,7 @@ E2 brief.
 
 === Synopsis
 
-Declared in header `<enum.cpp>`
+Declared in `<enum.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -215,7 +215,7 @@ e4 brief.
 
 === Synopsis
 
-Declared in header `<enum.cpp>`
+Declared in `<enum.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -240,7 +240,7 @@ e5 brief.
 
 === Synopsis
 
-Declared in header `<enum.cpp>`
+Declared in `<enum.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -263,7 +263,7 @@ e5 description.
 
 === Synopsis
 
-Declared in header `<enum.cpp>`
+Declared in `<enum.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -288,7 +288,7 @@ enum E3 : char;
 
 === Synopsis
 
-Declared in header `<enum.cpp>`
+Declared in `<enum.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -305,7 +305,7 @@ e6
 
 === Synopsis
 
-Declared in header `<enum.cpp>`
+Declared in `<enum.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
diff --git a/test-files/golden-tests/enum.html b/test-files/golden-tests/enum.html
index f9e8c30064..0cef334b76 100644
--- a/test-files/golden-tests/enum.html
+++ b/test-files/golden-tests/enum.html
@@ -1,4 +1,4 @@
-</html>
+<html>
     <head></head>
     <body>
         <div>
@@ -11,10 +11,56 @@ <h1>Reference</h1>
         <h2>Global namespace</h2>
     </div>
     <div>
-            <div>
-                <h3> Enums</h3>
-                    </div>
-    </div>
+        <div>
+            <h3> Enums</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">E0</a> 
+                            </td>
+                            <td>
+<p><span>E0 brief.</span></p>
+                        
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">E1</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">E2</a> 
+                            </td>
+                            <td>
+<p><span>E2 brief.</span></p>
+                        
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">E3</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
+                </div>
 </div>
 
 [#[object Object]]
@@ -31,7 +77,13 @@ <h2>Enum E0</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><enum.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             enum E0;
@@ -76,8 +128,7 @@ <h3>Description</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Enumerator <a href="#">E0</a>::
-e0</h2>
+        <h2>Enumerator E0::e0</h2>
         <p><span>e0 brief.</span></p>
 
 
@@ -87,7 +138,13 @@ <h2>Enumerator <a href="#">E0</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><enum.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             e0 = 1        </pre>
@@ -105,8 +162,7 @@ <h3>Description</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Enumerator <a href="#">E0</a>::
-e1</h2>
+        <h2>Enumerator E0::e1</h2>
         <p><span>e1 brief.</span></p>
 
 
@@ -116,7 +172,13 @@ <h2>Enumerator <a href="#">E0</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><enum.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             e1        </pre>
@@ -142,7 +204,13 @@ <h2>Enum E1</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><enum.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             enum E1 : char;
@@ -177,8 +245,7 @@ <h3>Members</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Enumerator <a href="#">E1</a>::
-e2</h2>
+        <h2>Enumerator E1::e2</h2>
         
     </div>
 
@@ -186,7 +253,13 @@ <h2>Enumerator <a href="#">E1</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><enum.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             e2        </pre>
@@ -198,8 +271,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Enumerator <a href="#">E1</a>::
-e3</h2>
+        <h2>Enumerator E1::e3</h2>
         
     </div>
 
@@ -207,7 +279,13 @@ <h2>Enumerator <a href="#">E1</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><enum.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             e3        </pre>
@@ -229,7 +307,13 @@ <h2>Enum E2</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><enum.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             enum E2 : int;
@@ -274,8 +358,7 @@ <h3>Description</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Enumerator <a href="#">E2</a>::
-e4</h2>
+        <h2>Enumerator E2::e4</h2>
         <p><span>e4 brief.</span></p>
 
 
@@ -285,7 +368,13 @@ <h2>Enumerator <a href="#">E2</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><enum.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             e4        </pre>
@@ -303,8 +392,7 @@ <h3>Description</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Enumerator <a href="#">E2</a>::
-e5</h2>
+        <h2>Enumerator E2::e5</h2>
         <p><span>e5 brief.</span></p>
 
 
@@ -314,7 +402,13 @@ <h2>Enumerator <a href="#">E2</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><enum.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             e5        </pre>
@@ -340,7 +434,13 @@ <h2>Enum E3</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><enum.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             enum E3 : char;
@@ -375,8 +475,7 @@ <h3>Members</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Enumerator <a href="#">E3</a>::
-e6</h2>
+        <h2>Enumerator E3::e6</h2>
         
     </div>
 
@@ -384,7 +483,13 @@ <h2>Enumerator <a href="#">E3</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><enum.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             e6        </pre>
@@ -396,8 +501,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Enumerator <a href="#">E3</a>::
-e7</h2>
+        <h2>Enumerator E3::e7</h2>
         
     </div>
 
@@ -405,7 +509,13 @@ <h2>Enumerator <a href="#">E3</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><enum.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             e7        </pre>
diff --git a/test-files/golden-tests/explicit-conv-operator.adoc b/test-files/golden-tests/explicit-conv-operator.adoc
index f36934527d..3317a02eb6 100644
--- a/test-files/golden-tests/explicit-conv-operator.adoc
+++ b/test-files/golden-tests/explicit-conv-operator.adoc
@@ -28,7 +28,7 @@
 
 === Synopsis
 
-Declared in header `<explicit-conv-operator.cpp>`
+Declared in `<explicit-conv-operator.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -54,7 +54,7 @@ struct Explicit;
 
 === Synopsis
 
-Declared in header `<explicit-conv-operator.cpp>`
+Declared in `<explicit-conv-operator.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -78,7 +78,7 @@ operator bool();
 
 === Synopsis
 
-Declared in header `<explicit-conv-operator.cpp>`
+Declared in `<explicit-conv-operator.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -104,7 +104,7 @@ struct ExplicitFalse;
 
 === Synopsis
 
-Declared in header `<explicit-conv-operator.cpp>`
+Declared in `<explicit-conv-operator.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -128,7 +128,7 @@ operator bool();
 
 === Synopsis
 
-Declared in header `<explicit-conv-operator.cpp>`
+Declared in `<explicit-conv-operator.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -154,7 +154,7 @@ struct ExplicitTrue;
 
 === Synopsis
 
-Declared in header `<explicit-conv-operator.cpp>`
+Declared in `<explicit-conv-operator.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -178,7 +178,7 @@ operator bool();
 
 === Synopsis
 
-Declared in header `<explicit-conv-operator.cpp>`
+Declared in `<explicit-conv-operator.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -205,7 +205,7 @@ struct ExplicitExpression;
 
 === Synopsis
 
-Declared in header `<explicit-conv-operator.cpp>`
+Declared in `<explicit-conv-operator.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
diff --git a/test-files/golden-tests/explicit-conv-operator.html b/test-files/golden-tests/explicit-conv-operator.html
index 4bb65de02e..a95fe1d901 100644
--- a/test-files/golden-tests/explicit-conv-operator.html
+++ b/test-files/golden-tests/explicit-conv-operator.html
@@ -1,4 +1,4 @@
-</html>
+<html>
     <head></head>
     <body>
         <div>
@@ -11,10 +11,52 @@ <h1>Reference</h1>
         <h2>Global namespace</h2>
     </div>
     <div>
-            <div>
-                <h3> Types</h3>
-                    </div>
-    </div>
+        <div>
+            <h3> Types</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">Explicit</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">ExplicitExpression</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">ExplicitFalse</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">ExplicitTrue</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
+                </div>
 </div>
 
 [#[object Object]]
@@ -29,7 +71,13 @@ <h2>Class Explicit</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><explicit-conv-operator.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct Explicit;
@@ -39,8 +87,29 @@ <h3>Synopsis</h3>
     <div>
             <div>
                 <h3> Member Functions</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">operator bool</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                                    </div>
 
 
 </div>
@@ -49,8 +118,7 @@ <h3> Member Functions</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">Explicit</a>::
-operator bool</h2>
+        <h2>Function Explicit::operator bool</h2>
         
     </div>
 
@@ -58,7 +126,13 @@ <h2>Function <a href="#">Explicit</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><explicit-conv-operator.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             operator bool();
@@ -82,7 +156,13 @@ <h2>Class ExplicitFalse</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><explicit-conv-operator.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct ExplicitFalse;
@@ -92,8 +172,29 @@ <h3>Synopsis</h3>
     <div>
             <div>
                 <h3> Member Functions</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">operator bool</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                                    </div>
 
 
 </div>
@@ -102,8 +203,7 @@ <h3> Member Functions</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">ExplicitFalse</a>::
-operator bool</h2>
+        <h2>Function ExplicitFalse::operator bool</h2>
         
     </div>
 
@@ -111,7 +211,13 @@ <h2>Function <a href="#">ExplicitFalse</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><explicit-conv-operator.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             operator bool();
@@ -135,7 +241,13 @@ <h2>Class ExplicitTrue</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><explicit-conv-operator.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct ExplicitTrue;
@@ -145,8 +257,29 @@ <h3>Synopsis</h3>
     <div>
             <div>
                 <h3> Member Functions</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">operator bool</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                                    </div>
 
 
 </div>
@@ -155,8 +288,7 @@ <h3> Member Functions</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">ExplicitTrue</a>::
-operator bool</h2>
+        <h2>Function ExplicitTrue::operator bool</h2>
         
     </div>
 
@@ -164,7 +296,13 @@ <h2>Function <a href="#">ExplicitTrue</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><explicit-conv-operator.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             operator bool();
@@ -188,7 +326,13 @@ <h2>Class ExplicitExpression</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><explicit-conv-operator.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<bool B>
@@ -199,8 +343,29 @@ <h3>Synopsis</h3>
     <div>
             <div>
                 <h3> Member Functions</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">operator bool</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                                    </div>
 
 
 </div>
@@ -209,8 +374,7 @@ <h3> Member Functions</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">ExplicitExpression</a>::
-operator bool</h2>
+        <h2>Function ExplicitExpression::operator bool</h2>
         
     </div>
 
@@ -218,7 +382,13 @@ <h2>Function <a href="#">ExplicitExpression</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><explicit-conv-operator.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             operator bool();
diff --git a/test-files/golden-tests/explicit-ctor.adoc b/test-files/golden-tests/explicit-ctor.adoc
index 6869892239..f56fc44745 100644
--- a/test-files/golden-tests/explicit-ctor.adoc
+++ b/test-files/golden-tests/explicit-ctor.adoc
@@ -28,7 +28,7 @@
 
 === Synopsis
 
-Declared in header `<explicit-ctor.cpp>`
+Declared in `<explicit-ctor.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -96,7 +96,7 @@ xref:Explicit/2constructor-03.adoc[pass:[Explicit]](
 
 === Synopsis
 
-Declared in header `<explicit-ctor.cpp>`
+Declared in `<explicit-ctor.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -120,7 +120,7 @@ Explicit();
 
 === Synopsis
 
-Declared in header `<explicit-ctor.cpp>`
+Declared in `<explicit-ctor.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -144,7 +144,7 @@ Explicit(xref:Explicit.adoc[Explicit] const&);
 
 === Synopsis
 
-Declared in header `<explicit-ctor.cpp>`
+Declared in `<explicit-ctor.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -168,7 +168,7 @@ Explicit(xref:Explicit.adoc[Explicit]&&) noexcept;
 
 === Synopsis
 
-Declared in header `<explicit-ctor.cpp>`
+Declared in `<explicit-ctor.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -194,7 +194,7 @@ Explicit(
 
 === Synopsis
 
-Declared in header `<explicit-ctor.cpp>`
+Declared in `<explicit-ctor.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -262,7 +262,7 @@ xref:ExplicitTrue/2constructor-05.adoc[pass:[ExplicitTrue]](
 
 === Synopsis
 
-Declared in header `<explicit-ctor.cpp>`
+Declared in `<explicit-ctor.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -286,7 +286,7 @@ ExplicitTrue();
 
 === Synopsis
 
-Declared in header `<explicit-ctor.cpp>`
+Declared in `<explicit-ctor.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -310,7 +310,7 @@ ExplicitTrue(xref:ExplicitTrue.adoc[ExplicitTrue] const&);
 
 === Synopsis
 
-Declared in header `<explicit-ctor.cpp>`
+Declared in `<explicit-ctor.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -334,7 +334,7 @@ ExplicitTrue(xref:ExplicitTrue.adoc[ExplicitTrue]&&) noexcept;
 
 === Synopsis
 
-Declared in header `<explicit-ctor.cpp>`
+Declared in `<explicit-ctor.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -360,7 +360,7 @@ ExplicitTrue(
 
 === Synopsis
 
-Declared in header `<explicit-ctor.cpp>`
+Declared in `<explicit-ctor.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -428,7 +428,7 @@ xref:ExplicitFalse/2constructor-04.adoc[pass:[ExplicitFalse]](
 
 === Synopsis
 
-Declared in header `<explicit-ctor.cpp>`
+Declared in `<explicit-ctor.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -452,7 +452,7 @@ ExplicitFalse();
 
 === Synopsis
 
-Declared in header `<explicit-ctor.cpp>`
+Declared in `<explicit-ctor.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -476,7 +476,7 @@ ExplicitFalse(xref:ExplicitFalse.adoc[ExplicitFalse] const&);
 
 === Synopsis
 
-Declared in header `<explicit-ctor.cpp>`
+Declared in `<explicit-ctor.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -500,7 +500,7 @@ ExplicitFalse(xref:ExplicitFalse.adoc[ExplicitFalse]&&) noexcept;
 
 === Synopsis
 
-Declared in header `<explicit-ctor.cpp>`
+Declared in `<explicit-ctor.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -526,7 +526,7 @@ ExplicitFalse(
 
 === Synopsis
 
-Declared in header `<explicit-ctor.cpp>`
+Declared in `<explicit-ctor.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -595,7 +595,7 @@ xref:ExplicitExpression/2constructor-02.adoc[pass:[ExplicitExpression]](
 
 === Synopsis
 
-Declared in header `<explicit-ctor.cpp>`
+Declared in `<explicit-ctor.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -619,7 +619,7 @@ ExplicitExpression();
 
 === Synopsis
 
-Declared in header `<explicit-ctor.cpp>`
+Declared in `<explicit-ctor.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -643,7 +643,7 @@ ExplicitExpression(xref:ExplicitExpression.adoc[ExplicitExpression] const&);
 
 === Synopsis
 
-Declared in header `<explicit-ctor.cpp>`
+Declared in `<explicit-ctor.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -667,7 +667,7 @@ ExplicitExpression(xref:ExplicitExpression.adoc[ExplicitExpression]&&) noexcept;
 
 === Synopsis
 
-Declared in header `<explicit-ctor.cpp>`
+Declared in `<explicit-ctor.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
diff --git a/test-files/golden-tests/explicit-ctor.html b/test-files/golden-tests/explicit-ctor.html
index 5d9118d7ce..b531b4960b 100644
--- a/test-files/golden-tests/explicit-ctor.html
+++ b/test-files/golden-tests/explicit-ctor.html
@@ -1,4 +1,4 @@
-</html>
+<html>
     <head></head>
     <body>
         <div>
@@ -11,10 +11,52 @@ <h1>Reference</h1>
         <h2>Global namespace</h2>
     </div>
     <div>
-            <div>
-                <h3> Types</h3>
-                    </div>
-    </div>
+        <div>
+            <h3> Types</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">Explicit</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">ExplicitExpression</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">ExplicitFalse</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">ExplicitTrue</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
+                </div>
 </div>
 
 [#[object Object]]
@@ -29,7 +71,13 @@ <h2>Class Explicit</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><explicit-ctor.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct Explicit;
@@ -39,16 +87,35 @@ <h3>Synopsis</h3>
     <div>
             <div>
                 <h3> Member Functions</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">Explicit</a>         <span class="small">[constructor]</span>
+                                </td>
+                                <td>
+    </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                                    </div>
 
 
 </div>
 <meta name="relfileprefix" content="../">
 <div id="">
 
-<h1>Overload set <a href="#">Explicit</a>::
-Explicit</h1>
+<h1>Overload set Explicit::Explicit</h1>
 
 <h2>Members</h2>
 
@@ -85,8 +152,7 @@ <h2>Members</h2>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">Explicit</a>::
-Explicit</h2>
+        <h2>Function Explicit::Explicit</h2>
         
     </div>
 
@@ -94,7 +160,13 @@ <h2>Function <a href="#">Explicit</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><explicit-ctor.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             Explicit();
@@ -110,8 +182,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">Explicit</a>::
-Explicit</h2>
+        <h2>Function Explicit::Explicit</h2>
         
     </div>
 
@@ -119,7 +190,13 @@ <h2>Function <a href="#">Explicit</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><explicit-ctor.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             Explicit(Explicit const&);
@@ -135,8 +212,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">Explicit</a>::
-Explicit</h2>
+        <h2>Function Explicit::Explicit</h2>
         
     </div>
 
@@ -144,7 +220,13 @@ <h2>Function <a href="#">Explicit</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><explicit-ctor.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             Explicit(Explicit&&) noexcept;
@@ -160,8 +242,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">Explicit</a>::
-Explicit</h2>
+        <h2>Function Explicit::Explicit</h2>
         
     </div>
 
@@ -169,7 +250,13 @@ <h2>Function <a href="#">Explicit</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><explicit-ctor.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             Explicit(
@@ -195,7 +282,13 @@ <h2>Class ExplicitTrue</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><explicit-ctor.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct ExplicitTrue;
@@ -205,16 +298,35 @@ <h3>Synopsis</h3>
     <div>
             <div>
                 <h3> Member Functions</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">ExplicitTrue</a>         <span class="small">[constructor]</span>
+                                </td>
+                                <td>
+    </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                                    </div>
 
 
 </div>
 <meta name="relfileprefix" content="../">
 <div id="">
 
-<h1>Overload set <a href="#">ExplicitTrue</a>::
-ExplicitTrue</h1>
+<h1>Overload set ExplicitTrue::ExplicitTrue</h1>
 
 <h2>Members</h2>
 
@@ -251,8 +363,7 @@ <h2>Members</h2>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">ExplicitTrue</a>::
-ExplicitTrue</h2>
+        <h2>Function ExplicitTrue::ExplicitTrue</h2>
         
     </div>
 
@@ -260,7 +371,13 @@ <h2>Function <a href="#">ExplicitTrue</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><explicit-ctor.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             ExplicitTrue();
@@ -276,8 +393,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">ExplicitTrue</a>::
-ExplicitTrue</h2>
+        <h2>Function ExplicitTrue::ExplicitTrue</h2>
         
     </div>
 
@@ -285,7 +401,13 @@ <h2>Function <a href="#">ExplicitTrue</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><explicit-ctor.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             ExplicitTrue(ExplicitTrue const&);
@@ -301,8 +423,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">ExplicitTrue</a>::
-ExplicitTrue</h2>
+        <h2>Function ExplicitTrue::ExplicitTrue</h2>
         
     </div>
 
@@ -310,7 +431,13 @@ <h2>Function <a href="#">ExplicitTrue</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><explicit-ctor.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             ExplicitTrue(ExplicitTrue&&) noexcept;
@@ -326,8 +453,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">ExplicitTrue</a>::
-ExplicitTrue</h2>
+        <h2>Function ExplicitTrue::ExplicitTrue</h2>
         
     </div>
 
@@ -335,7 +461,13 @@ <h2>Function <a href="#">ExplicitTrue</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><explicit-ctor.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             ExplicitTrue(
@@ -361,7 +493,13 @@ <h2>Class ExplicitFalse</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><explicit-ctor.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct ExplicitFalse;
@@ -371,16 +509,35 @@ <h3>Synopsis</h3>
     <div>
             <div>
                 <h3> Member Functions</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">ExplicitFalse</a>         <span class="small">[constructor]</span>
+                                </td>
+                                <td>
+    </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                                    </div>
 
 
 </div>
 <meta name="relfileprefix" content="../">
 <div id="">
 
-<h1>Overload set <a href="#">ExplicitFalse</a>::
-ExplicitFalse</h1>
+<h1>Overload set ExplicitFalse::ExplicitFalse</h1>
 
 <h2>Members</h2>
 
@@ -417,8 +574,7 @@ <h2>Members</h2>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">ExplicitFalse</a>::
-ExplicitFalse</h2>
+        <h2>Function ExplicitFalse::ExplicitFalse</h2>
         
     </div>
 
@@ -426,7 +582,13 @@ <h2>Function <a href="#">ExplicitFalse</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><explicit-ctor.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             ExplicitFalse();
@@ -442,8 +604,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">ExplicitFalse</a>::
-ExplicitFalse</h2>
+        <h2>Function ExplicitFalse::ExplicitFalse</h2>
         
     </div>
 
@@ -451,7 +612,13 @@ <h2>Function <a href="#">ExplicitFalse</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><explicit-ctor.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             ExplicitFalse(ExplicitFalse const&);
@@ -467,8 +634,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">ExplicitFalse</a>::
-ExplicitFalse</h2>
+        <h2>Function ExplicitFalse::ExplicitFalse</h2>
         
     </div>
 
@@ -476,7 +642,13 @@ <h2>Function <a href="#">ExplicitFalse</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><explicit-ctor.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             ExplicitFalse(ExplicitFalse&&) noexcept;
@@ -492,8 +664,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">ExplicitFalse</a>::
-ExplicitFalse</h2>
+        <h2>Function ExplicitFalse::ExplicitFalse</h2>
         
     </div>
 
@@ -501,7 +672,13 @@ <h2>Function <a href="#">ExplicitFalse</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><explicit-ctor.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             ExplicitFalse(
@@ -527,7 +704,13 @@ <h2>Class ExplicitExpression</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><explicit-ctor.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<bool B>
@@ -538,16 +721,35 @@ <h3>Synopsis</h3>
     <div>
             <div>
                 <h3> Member Functions</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">ExplicitExpression</a>         <span class="small">[constructor]</span>
+                                </td>
+                                <td>
+    </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                                    </div>
 
 
 </div>
 <meta name="relfileprefix" content="../">
 <div id="">
 
-<h1>Overload set <a href="#">ExplicitExpression</a>::
-ExplicitExpression</h1>
+<h1>Overload set ExplicitExpression::ExplicitExpression</h1>
 
 <h2>Members</h2>
 
@@ -584,8 +786,7 @@ <h2>Members</h2>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">ExplicitExpression</a>::
-ExplicitExpression</h2>
+        <h2>Function ExplicitExpression::ExplicitExpression</h2>
         
     </div>
 
@@ -593,7 +794,13 @@ <h2>Function <a href="#">ExplicitExpression</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><explicit-ctor.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             ExplicitExpression();
@@ -609,8 +816,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">ExplicitExpression</a>::
-ExplicitExpression</h2>
+        <h2>Function ExplicitExpression::ExplicitExpression</h2>
         
     </div>
 
@@ -618,7 +824,13 @@ <h2>Function <a href="#">ExplicitExpression</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><explicit-ctor.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             ExplicitExpression(ExplicitExpression const&);
@@ -634,8 +846,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">ExplicitExpression</a>::
-ExplicitExpression</h2>
+        <h2>Function ExplicitExpression::ExplicitExpression</h2>
         
     </div>
 
@@ -643,7 +854,13 @@ <h2>Function <a href="#">ExplicitExpression</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><explicit-ctor.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             ExplicitExpression(ExplicitExpression&&) noexcept;
@@ -659,8 +876,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">ExplicitExpression</a>::
-ExplicitExpression</h2>
+        <h2>Function ExplicitExpression::ExplicitExpression</h2>
         
     </div>
 
@@ -668,7 +884,13 @@ <h2>Function <a href="#">ExplicitExpression</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><explicit-ctor.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             ExplicitExpression(
diff --git a/test-files/golden-tests/explicit-deduct-guide.adoc b/test-files/golden-tests/explicit-deduct-guide.adoc
index 11900ab22c..5048ef0602 100644
--- a/test-files/golden-tests/explicit-deduct-guide.adoc
+++ b/test-files/golden-tests/explicit-deduct-guide.adoc
@@ -35,7 +35,7 @@
 
 === Synopsis
 
-Declared in header `<explicit-deduct-guide.cpp>`
+Declared in `<explicit-deduct-guide.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -55,7 +55,7 @@ struct X;
 
 === Synopsis
 
-Declared in header `<explicit-deduct-guide.cpp>`
+Declared in `<explicit-deduct-guide.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -72,7 +72,7 @@ xref:X-0e.adoc[X]<0>(bool) -> xref:X-0e.adoc[X]<0>;
 
 === Synopsis
 
-Declared in header `<explicit-deduct-guide.cpp>`
+Declared in `<explicit-deduct-guide.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -89,7 +89,7 @@ xref:X-0e.adoc[X]<0>(char) -> xref:X-0e.adoc[X]<0>;
 
 === Synopsis
 
-Declared in header `<explicit-deduct-guide.cpp>`
+Declared in `<explicit-deduct-guide.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -106,7 +106,7 @@ xref:X-0e.adoc[X]<0>(int) -> xref:X-0e.adoc[X]<0>;
 
 === Synopsis
 
-Declared in header `<explicit-deduct-guide.cpp>`
+Declared in `<explicit-deduct-guide.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
diff --git a/test-files/golden-tests/explicit-deduct-guide.html b/test-files/golden-tests/explicit-deduct-guide.html
index ab9b4c501d..7288c6baa1 100644
--- a/test-files/golden-tests/explicit-deduct-guide.html
+++ b/test-files/golden-tests/explicit-deduct-guide.html
@@ -1,4 +1,4 @@
-</html>
+<html>
     <head></head>
     <body>
         <div>
@@ -11,12 +11,75 @@ <h1>Reference</h1>
         <h2>Global namespace</h2>
     </div>
     <div>
+        <div>
+            <h3> Types</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">X</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
             <div>
-                <h3> Types</h3>
-                    </div>
-    <div>
-                <h3> Deduction Guides</h3>
-                    </div>
+            <h3> Deduction Guides</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">X<0></a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">X<0></a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">X<0></a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">X<0></a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
     </div>
 </div>
 
@@ -32,7 +95,13 @@ <h2>Class X</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><explicit-deduct-guide.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<int>
@@ -41,7 +110,7 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-                            </div>
+                                                                                                                </div>
 
 
 </div>
@@ -58,7 +127,13 @@ <h2>Deduction guide X</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><explicit-deduct-guide.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             X<0>(bool) -> X<0>;
@@ -79,7 +154,13 @@ <h2>Deduction guide X</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><explicit-deduct-guide.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             X<0>(char) -> X<0>;
@@ -100,7 +181,13 @@ <h2>Deduction guide X</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><explicit-deduct-guide.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             X<0>(int) -> X<0>;
@@ -121,7 +208,13 @@ <h2>Deduction guide X</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><explicit-deduct-guide.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<bool B = true>
diff --git a/test-files/golden-tests/explicit-object-parameter.adoc b/test-files/golden-tests/explicit-object-parameter.adoc
index c7fa18630f..020b29bb1a 100644
--- a/test-files/golden-tests/explicit-object-parameter.adoc
+++ b/test-files/golden-tests/explicit-object-parameter.adoc
@@ -22,7 +22,7 @@
 
 === Synopsis
 
-Declared in header `<explicit-object-parameter.cpp>`
+Declared in `<explicit-object-parameter.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -82,7 +82,7 @@ xref:Optional/value-06.adoc[pass:[value]](this
 
 === Synopsis
 
-Declared in header `<explicit-object-parameter.cpp>`
+Declared in `<explicit-object-parameter.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -108,7 +108,7 @@ value(this Self&& self);
 
 === Synopsis
 
-Declared in header `<explicit-object-parameter.cpp>`
+Declared in `<explicit-object-parameter.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
diff --git a/test-files/golden-tests/explicit-object-parameter.html b/test-files/golden-tests/explicit-object-parameter.html
index 3a9f2e7dde..65a8dd0fa5 100644
--- a/test-files/golden-tests/explicit-object-parameter.html
+++ b/test-files/golden-tests/explicit-object-parameter.html
@@ -1,4 +1,4 @@
-</html>
+<html>
     <head></head>
     <body>
         <div>
@@ -11,10 +11,31 @@ <h1>Reference</h1>
         <h2>Global namespace</h2>
     </div>
     <div>
-            <div>
-                <h3> Types</h3>
-                    </div>
-    </div>
+        <div>
+            <h3> Types</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">Optional</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
+                </div>
 </div>
 
 [#[object Object]]
@@ -29,7 +50,13 @@ <h2>Class Optional</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><explicit-object-parameter.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct Optional;
@@ -39,16 +66,35 @@ <h3>Synopsis</h3>
     <div>
             <div>
                 <h3> Member Functions</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">value</a> 
+                                </td>
+                                <td>
+    </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                                    </div>
 
 
 </div>
 <meta name="relfileprefix" content="../">
 <div id="">
 
-<h1>Overload set <a href="#">Optional</a>::
-value</h1>
+<h1>Overload set Optional::value</h1>
 
 <h2>Members</h2>
 
@@ -57,7 +103,7 @@ <h2>Members</h2>
 
 <pre><code class="language-cpp">template<typename Self>
 constexpr
-&&
+auto&&
 value(this Self&& self);</code></pre>
 <a href=""><em>» more...</em></a>
 
@@ -66,7 +112,7 @@ <h2>Members</h2>
 
 <pre><code class="language-cpp">template<typename Self>
 constexpr
-&&
+auto&&
 value(this 
     Self&& self,
     int x);</code></pre>
@@ -79,8 +125,7 @@ <h2>Members</h2>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">Optional</a>::
-value</h2>
+        <h2>Function Optional::value</h2>
         
     </div>
 
@@ -88,12 +133,18 @@ <h2>Function <a href="#">Optional</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><explicit-object-parameter.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<typename Self>
 constexpr
-&&
+auto&&
 value(this Self&& self);
         </pre>
     </div>
@@ -107,8 +158,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">Optional</a>::
-value</h2>
+        <h2>Function Optional::value</h2>
         
     </div>
 
@@ -116,12 +166,18 @@ <h2>Function <a href="#">Optional</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><explicit-object-parameter.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<typename Self>
 constexpr
-&&
+auto&&
 value(this 
     Self&& self,
     int x);
diff --git a/test-files/golden-tests/filters/blacklist_0.adoc b/test-files/golden-tests/filters/blacklist_0.adoc
index 0abb726646..e22e7b9226 100644
--- a/test-files/golden-tests/filters/blacklist_0.adoc
+++ b/test-files/golden-tests/filters/blacklist_0.adoc
@@ -41,7 +41,7 @@
 
 === Synopsis
 
-Declared in header `<filters/blacklist_0.cpp>`
+Declared in `<filters/blacklist_0.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -99,7 +99,7 @@ f0();
 
 === Synopsis
 
-Declared in header `<filters/blacklist_0.cpp>`
+Declared in `<filters/blacklist_0.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -136,7 +136,7 @@ f1();
 
 === Synopsis
 
-Declared in header `<filters/blacklist_0.cpp>`
+Declared in `<filters/blacklist_0.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -194,7 +194,7 @@ f1();
 
 === Synopsis
 
-Declared in header `<filters/blacklist_0.cpp>`
+Declared in `<filters/blacklist_0.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
diff --git a/test-files/golden-tests/filters/blacklist_0.html b/test-files/golden-tests/filters/blacklist_0.html
index 89189e0c53..1db1954032 100644
--- a/test-files/golden-tests/filters/blacklist_0.html
+++ b/test-files/golden-tests/filters/blacklist_0.html
@@ -1,4 +1,4 @@
-</html>
+<html>
     <head></head>
     <body>
         <div>
@@ -11,10 +11,52 @@ <h1>Reference</h1>
         <h2>Global namespace</h2>
     </div>
     <div>
-            <div>
-                <h3> Namespaces</h3>
-                    </div>
-    </div>
+        <div>
+            <h3>Namespaces</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">N0</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">N3</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">N4</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">N7</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
+                </div>
 </div>
 
 [#[object Object]]
@@ -25,9 +67,30 @@ <h2>Namespace N0</h2>
     </div>
     <div>
             <div>
-                <h3> Member Functions</h3>
-                    </div>
-    </div>
+                <h3>Functions</h3>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f0</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+            </div>
 </div>
 
 [#[object Object]]
@@ -42,7 +105,13 @@ <h2>Function f0</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><filters/blacklist_0.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -62,7 +131,7 @@ <h3>Synopsis</h3>
         <h2>Namespace N3</h2>
     </div>
     <div>
-            </div>
+                        </div>
 </div>
 
 [#[object Object]]
@@ -72,10 +141,38 @@ <h2>Namespace N3</h2>
         <h2>Namespace N4</h2>
     </div>
     <div>
-            <div>
-                <h3> Namespaces</h3>
-                    </div>
-    </div>
+        <div>
+            <h3>Namespaces</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">N5</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">N6</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
+                </div>
 </div>
 
 [#[object Object]]
@@ -86,9 +183,30 @@ <h2>Namespace N5</h2>
     </div>
     <div>
             <div>
-                <h3> Member Functions</h3>
-                    </div>
-    </div>
+                <h3>Functions</h3>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f1</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+            </div>
 </div>
 
 [#[object Object]]
@@ -103,7 +221,13 @@ <h2>Function f1</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><filters/blacklist_0.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -124,9 +248,30 @@ <h2>Namespace N6</h2>
     </div>
     <div>
             <div>
-                <h3> Member Functions</h3>
-                    </div>
-    </div>
+                <h3>Functions</h3>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f1</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+            </div>
 </div>
 
 [#[object Object]]
@@ -141,7 +286,13 @@ <h2>Function f1</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><filters/blacklist_0.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -161,10 +312,38 @@ <h3>Synopsis</h3>
         <h2>Namespace N7</h2>
     </div>
     <div>
-            <div>
-                <h3> Namespaces</h3>
-                    </div>
-    </div>
+        <div>
+            <h3>Namespaces</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">N8</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">N9</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
+                </div>
 </div>
 
 [#[object Object]]
@@ -174,7 +353,7 @@ <h3> Namespaces</h3>
         <h2>Namespace N8</h2>
     </div>
     <div>
-            </div>
+                        </div>
 </div>
 
 [#[object Object]]
@@ -185,9 +364,30 @@ <h2>Namespace N9</h2>
     </div>
     <div>
             <div>
-                <h3> Member Functions</h3>
-                    </div>
-    </div>
+                <h3>Functions</h3>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">g0</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+            </div>
 </div>
 
 [#[object Object]]
@@ -202,7 +402,13 @@ <h2>Function g0</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><filters/blacklist_0.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
diff --git a/test-files/golden-tests/filters/blacklist_test.adoc b/test-files/golden-tests/filters/blacklist_test.adoc
index d69cea2eff..d6b84e73d1 100644
--- a/test-files/golden-tests/filters/blacklist_test.adoc
+++ b/test-files/golden-tests/filters/blacklist_test.adoc
@@ -37,7 +37,7 @@
 
 === Synopsis
 
-Declared in header `<filters/blacklist_test.cpp>`
+Declared in `<filters/blacklist_test.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
diff --git a/test-files/golden-tests/filters/blacklist_test.html b/test-files/golden-tests/filters/blacklist_test.html
index 9ab9b175a9..528755daf0 100644
--- a/test-files/golden-tests/filters/blacklist_test.html
+++ b/test-files/golden-tests/filters/blacklist_test.html
@@ -1,4 +1,4 @@
-</html>
+<html>
     <head></head>
     <body>
         <div>
@@ -11,10 +11,38 @@ <h1>Reference</h1>
         <h2>Global namespace</h2>
     </div>
     <div>
-            <div>
-                <h3> Namespaces</h3>
-                    </div>
-    </div>
+        <div>
+            <h3>Namespaces</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">blacklisted</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">to_be_documented</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
+                </div>
 </div>
 
 [#[object Object]]
@@ -25,9 +53,30 @@ <h2>Namespace to_be_documented</h2>
     </div>
     <div>
             <div>
-                <h3> Member Functions</h3>
-                    </div>
-    </div>
+                <h3>Functions</h3>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">documented_function</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+            </div>
 </div>
 
 [#[object Object]]
@@ -42,7 +91,13 @@ <h2>Function documented_function</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><filters/blacklist_test.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -62,7 +117,7 @@ <h3>Synopsis</h3>
         <h2>Namespace blacklisted</h2>
     </div>
     <div>
-            </div>
+                        </div>
 </div>
         </div>
         <div><h4>Created with MrDocs</h4></div>
diff --git a/test-files/golden-tests/filters/filters.adoc b/test-files/golden-tests/filters/filters.adoc
index 17df24ce66..5b8ff642a1 100644
--- a/test-files/golden-tests/filters/filters.adoc
+++ b/test-files/golden-tests/filters/filters.adoc
@@ -52,7 +52,7 @@
 
 === Synopsis
 
-Declared in header `<filters/filters.cpp>`
+Declared in `<filters/filters.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -89,7 +89,7 @@ f0();
 
 === Synopsis
 
-Declared in header `<filters/filters.cpp>`
+Declared in `<filters/filters.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -133,7 +133,7 @@ g0();
 
 === Synopsis
 
-Declared in header `<filters/filters.cpp>`
+Declared in `<filters/filters.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -157,7 +157,7 @@ f4();
 
 === Synopsis
 
-Declared in header `<filters/filters.cpp>`
+Declared in `<filters/filters.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -190,7 +190,7 @@ struct Y;
 
 === Synopsis
 
-Declared in header `<filters/filters.cpp>`
+Declared in `<filters/filters.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -214,7 +214,7 @@ f6();
 
 === Synopsis
 
-Declared in header `<filters/filters.cpp>`
+Declared in `<filters/filters.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -240,7 +240,7 @@ struct Z;
 
 === Synopsis
 
-Declared in header `<filters/filters.cpp>`
+Declared in `<filters/filters.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -284,7 +284,7 @@ f7();
 
 === Synopsis
 
-Declared in header `<filters/filters.cpp>`
+Declared in `<filters/filters.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -328,7 +328,7 @@ f0();
 
 === Synopsis
 
-Declared in header `<filters/filters.cpp>`
+Declared in `<filters/filters.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -352,7 +352,7 @@ f4();
 
 === Synopsis
 
-Declared in header `<filters/filters.cpp>`
+Declared in `<filters/filters.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -385,7 +385,7 @@ struct Y;
 
 === Synopsis
 
-Declared in header `<filters/filters.cpp>`
+Declared in `<filters/filters.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -409,7 +409,7 @@ f6();
 
 === Synopsis
 
-Declared in header `<filters/filters.cpp>`
+Declared in `<filters/filters.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -435,7 +435,7 @@ struct Z;
 
 === Synopsis
 
-Declared in header `<filters/filters.cpp>`
+Declared in `<filters/filters.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -472,7 +472,7 @@ f7();
 
 === Synopsis
 
-Declared in header `<filters/filters.cpp>`
+Declared in `<filters/filters.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -531,7 +531,7 @@ g0();
 
 === Synopsis
 
-Declared in header `<filters/filters.cpp>`
+Declared in `<filters/filters.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -555,7 +555,7 @@ g0();
 
 === Synopsis
 
-Declared in header `<filters/filters.cpp>`
+Declared in `<filters/filters.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -579,7 +579,7 @@ f1();
 
 === Synopsis
 
-Declared in header `<filters/filters.cpp>`
+Declared in `<filters/filters.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -623,7 +623,7 @@ g1();
 
 === Synopsis
 
-Declared in header `<filters/filters.cpp>`
+Declared in `<filters/filters.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -662,7 +662,7 @@ g0();
 
 === Synopsis
 
-Declared in header `<filters/filters.cpp>`
+Declared in `<filters/filters.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -686,7 +686,7 @@ f1();
 
 === Synopsis
 
-Declared in header `<filters/filters.cpp>`
+Declared in `<filters/filters.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
diff --git a/test-files/golden-tests/filters/filters.html b/test-files/golden-tests/filters/filters.html
index 39743b9135..d80abf098f 100644
--- a/test-files/golden-tests/filters/filters.html
+++ b/test-files/golden-tests/filters/filters.html
@@ -1,4 +1,4 @@
-</html>
+<html>
     <head></head>
     <body>
         <div>
@@ -11,10 +11,59 @@ <h1>Reference</h1>
         <h2>Global namespace</h2>
     </div>
     <div>
-            <div>
-                <h3> Namespaces</h3>
-                    </div>
-    </div>
+        <div>
+            <h3>Namespaces</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">A</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">B</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">C</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">D</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">F</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
+                </div>
 </div>
 
 [#[object Object]]
@@ -24,13 +73,62 @@ <h3> Namespaces</h3>
         <h2>Namespace A</h2>
     </div>
     <div>
-            <div>
-                <h3> Namespaces</h3>
-                    </div>
+        <div>
+            <h3>Namespaces</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">detail</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">detair</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
     <div>
-                <h3> Member Functions</h3>
-                    </div>
-    </div>
+                <h3>Functions</h3>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f0</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+            </div>
 </div>
 
 [#[object Object]]
@@ -45,7 +143,13 @@ <h2>Function f0</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><filters/filters.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -66,9 +170,30 @@ <h2>Namespace detail</h2>
     </div>
     <div>
             <div>
-                <h3> Member Functions</h3>
-                    </div>
-    </div>
+                <h3>Functions</h3>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">g0</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+            </div>
 </div>
 
 [#[object Object]]
@@ -83,7 +208,13 @@ <h2>Function g0</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><filters/filters.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -103,13 +234,55 @@ <h3>Synopsis</h3>
         <h2>Namespace detair</h2>
     </div>
     <div>
-            <div>
-                <h3> Types</h3>
-                    </div>
+        <div>
+            <h3> Types</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">Y</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
     <div>
-                <h3> Member Functions</h3>
-                    </div>
-    </div>
+                <h3>Functions</h3>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f4</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+            </div>
 </div>
 
 [#[object Object]]
@@ -124,7 +297,13 @@ <h2>Function f4</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><filters/filters.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -149,7 +328,13 @@ <h2>Class Y</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><filters/filters.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct Y;
@@ -157,13 +342,55 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-            <div>
-                <h3> Types</h3>
-                    </div>
+        <div>
+            <h3> Types</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">Z</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
     <div>
                 <h3> Member Functions</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f6</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                                    </div>
 
 
 </div>
@@ -172,8 +399,7 @@ <h3> Member Functions</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">Y</a>::
-f6</h2>
+        <h2>Function Y::f6</h2>
         
     </div>
 
@@ -181,7 +407,13 @@ <h2>Function <a href="#">Y</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><filters/filters.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -198,8 +430,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Class <a href="#">Y</a>::
-Z</h2>
+        <h2>Class Y::Z</h2>
         
     </div>
 
@@ -207,7 +438,13 @@ <h2>Class <a href="#">Y</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><filters/filters.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct Z;
@@ -217,8 +454,29 @@ <h3>Synopsis</h3>
     <div>
             <div>
                 <h3> Member Functions</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f7</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                                    </div>
 
 
 </div>
@@ -227,9 +485,7 @@ <h3> Member Functions</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">Y</a>::
-<a href="#">Z</a>::
-f7</h2>
+        <h2>Function Y::Z::f7</h2>
         
     </div>
 
@@ -237,7 +493,13 @@ <h2>Function <a href="#">Y</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><filters/filters.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -257,13 +519,55 @@ <h3>Synopsis</h3>
         <h2>Namespace B</h2>
     </div>
     <div>
-            <div>
-                <h3> Namespaces</h3>
-                    </div>
+        <div>
+            <h3>Namespaces</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">detair</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
     <div>
-                <h3> Member Functions</h3>
-                    </div>
-    </div>
+                <h3>Functions</h3>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f0</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+            </div>
 </div>
 
 [#[object Object]]
@@ -278,7 +582,13 @@ <h2>Function f0</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><filters/filters.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -298,13 +608,55 @@ <h3>Synopsis</h3>
         <h2>Namespace detair</h2>
     </div>
     <div>
-            <div>
-                <h3> Types</h3>
-                    </div>
+        <div>
+            <h3> Types</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">Y</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
     <div>
-                <h3> Member Functions</h3>
-                    </div>
-    </div>
+                <h3>Functions</h3>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f4</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+            </div>
 </div>
 
 [#[object Object]]
@@ -319,7 +671,13 @@ <h2>Function f4</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><filters/filters.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -344,7 +702,13 @@ <h2>Class Y</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><filters/filters.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct Y;
@@ -352,13 +716,55 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-            <div>
-                <h3> Types</h3>
-                    </div>
+        <div>
+            <h3> Types</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">Z</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
     <div>
                 <h3> Member Functions</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f6</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                                    </div>
 
 
 </div>
@@ -367,8 +773,7 @@ <h3> Member Functions</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">Y</a>::
-f6</h2>
+        <h2>Function Y::f6</h2>
         
     </div>
 
@@ -376,7 +781,13 @@ <h2>Function <a href="#">Y</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><filters/filters.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -393,8 +804,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Class <a href="#">Y</a>::
-Z</h2>
+        <h2>Class Y::Z</h2>
         
     </div>
 
@@ -402,7 +812,13 @@ <h2>Class <a href="#">Y</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><filters/filters.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct Z;
@@ -412,8 +828,29 @@ <h3>Synopsis</h3>
     <div>
             <div>
                 <h3> Member Functions</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f7</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                                    </div>
 
 
 </div>
@@ -422,9 +859,7 @@ <h3> Member Functions</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">Y</a>::
-<a href="#">Z</a>::
-f7</h2>
+        <h2>Function Y::Z::f7</h2>
         
     </div>
 
@@ -432,7 +867,13 @@ <h2>Function <a href="#">Y</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><filters/filters.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -453,9 +894,30 @@ <h2>Namespace C</h2>
     </div>
     <div>
             <div>
-                <h3> Member Functions</h3>
-                    </div>
-    </div>
+                <h3>Functions</h3>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">g0</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+            </div>
 </div>
 
 [#[object Object]]
@@ -470,7 +932,13 @@ <h2>Function g0</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><filters/filters.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -490,13 +958,62 @@ <h3>Synopsis</h3>
         <h2>Namespace D</h2>
     </div>
     <div>
-            <div>
-                <h3> Namespaces</h3>
-                    </div>
+        <div>
+            <h3>Namespaces</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">E</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
     <div>
-                <h3> Member Functions</h3>
-                    </div>
-    </div>
+                <h3>Functions</h3>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f1</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">g1</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+            </div>
 </div>
 
 [#[object Object]]
@@ -507,9 +1024,30 @@ <h2>Namespace E</h2>
     </div>
     <div>
             <div>
-                <h3> Member Functions</h3>
-                    </div>
-    </div>
+                <h3>Functions</h3>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">g0</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+            </div>
 </div>
 
 [#[object Object]]
@@ -524,7 +1062,13 @@ <h2>Function g0</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><filters/filters.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -549,7 +1093,13 @@ <h2>Function f1</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><filters/filters.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -574,7 +1124,13 @@ <h2>Function g1</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><filters/filters.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -594,13 +1150,55 @@ <h3>Synopsis</h3>
         <h2>Namespace F</h2>
     </div>
     <div>
-            <div>
-                <h3> Namespaces</h3>
-                    </div>
+        <div>
+            <h3>Namespaces</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">G</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
     <div>
-                <h3> Member Functions</h3>
-                    </div>
-    </div>
+                <h3>Functions</h3>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">g0</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+            </div>
 </div>
 
 [#[object Object]]
@@ -615,7 +1213,13 @@ <h2>Function g0</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><filters/filters.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -636,9 +1240,37 @@ <h2>Namespace G</h2>
     </div>
     <div>
             <div>
-                <h3> Member Functions</h3>
-                    </div>
-    </div>
+                <h3>Functions</h3>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f1</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">g1</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+            </div>
 </div>
 
 [#[object Object]]
@@ -653,7 +1285,13 @@ <h2>Function f1</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><filters/filters.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -678,7 +1316,13 @@ <h2>Function g1</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><filters/filters.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
diff --git a/test-files/golden-tests/filters/whitelist_0.adoc b/test-files/golden-tests/filters/whitelist_0.adoc
index 970324453e..41e8a43b61 100644
--- a/test-files/golden-tests/filters/whitelist_0.adoc
+++ b/test-files/golden-tests/filters/whitelist_0.adoc
@@ -39,7 +39,7 @@
 
 === Synopsis
 
-Declared in header `<filters/whitelist_0.cpp>`
+Declared in `<filters/whitelist_0.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -91,7 +91,7 @@ f0_WL();
 
 === Synopsis
 
-Declared in header `<filters/whitelist_0.cpp>`
+Declared in `<filters/whitelist_0.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -128,7 +128,7 @@ f1_WL();
 
 === Synopsis
 
-Declared in header `<filters/whitelist_0.cpp>`
+Declared in `<filters/whitelist_0.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -172,7 +172,7 @@ f1_WL();
 
 === Synopsis
 
-Declared in header `<filters/whitelist_0.cpp>`
+Declared in `<filters/whitelist_0.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -224,7 +224,7 @@ f0();
 
 === Synopsis
 
-Declared in header `<filters/whitelist_0.cpp>`
+Declared in `<filters/whitelist_0.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -261,7 +261,7 @@ f2_WL();
 
 === Synopsis
 
-Declared in header `<filters/whitelist_0.cpp>`
+Declared in `<filters/whitelist_0.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
diff --git a/test-files/golden-tests/filters/whitelist_0.html b/test-files/golden-tests/filters/whitelist_0.html
index 59e24fcd60..0b4d049741 100644
--- a/test-files/golden-tests/filters/whitelist_0.html
+++ b/test-files/golden-tests/filters/whitelist_0.html
@@ -1,4 +1,4 @@
-</html>
+<html>
     <head></head>
     <body>
         <div>
@@ -11,10 +11,45 @@ <h1>Reference</h1>
         <h2>Global namespace</h2>
     </div>
     <div>
-            <div>
-                <h3> Namespaces</h3>
-                    </div>
-    </div>
+        <div>
+            <h3>Namespaces</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">N0</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">N1</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">N5</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
+                </div>
 </div>
 
 [#[object Object]]
@@ -25,9 +60,30 @@ <h2>Namespace N0</h2>
     </div>
     <div>
             <div>
-                <h3> Member Functions</h3>
-                    </div>
-    </div>
+                <h3>Functions</h3>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f0_WL</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+            </div>
 </div>
 
 [#[object Object]]
@@ -42,7 +98,13 @@ <h2>Function f0_WL</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><filters/whitelist_0.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -62,10 +124,38 @@ <h3>Synopsis</h3>
         <h2>Namespace N1</h2>
     </div>
     <div>
-            <div>
-                <h3> Namespaces</h3>
-                    </div>
-    </div>
+        <div>
+            <h3>Namespaces</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">N3_WL</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">N4</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
+                </div>
 </div>
 
 [#[object Object]]
@@ -76,9 +166,30 @@ <h2>Namespace N3_WL</h2>
     </div>
     <div>
             <div>
-                <h3> Member Functions</h3>
-                    </div>
-    </div>
+                <h3>Functions</h3>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f1_WL</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+            </div>
 </div>
 
 [#[object Object]]
@@ -93,7 +204,13 @@ <h2>Function f1_WL</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><filters/whitelist_0.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -114,9 +231,30 @@ <h2>Namespace N4</h2>
     </div>
     <div>
             <div>
-                <h3> Member Functions</h3>
-                    </div>
-    </div>
+                <h3>Functions</h3>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f1_WL</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+            </div>
 </div>
 
 [#[object Object]]
@@ -131,7 +269,13 @@ <h2>Function f1_WL</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><filters/whitelist_0.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -151,13 +295,55 @@ <h3>Synopsis</h3>
         <h2>Namespace N5</h2>
     </div>
     <div>
-            <div>
-                <h3> Namespaces</h3>
-                    </div>
+        <div>
+            <h3>Namespaces</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">N6_BL</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
     <div>
-                <h3> Member Functions</h3>
-                    </div>
-    </div>
+                <h3>Functions</h3>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f0</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+            </div>
 </div>
 
 [#[object Object]]
@@ -172,7 +358,13 @@ <h2>Function f0</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><filters/whitelist_0.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -192,10 +384,38 @@ <h3>Synopsis</h3>
         <h2>Namespace N6_BL</h2>
     </div>
     <div>
-            <div>
-                <h3> Namespaces</h3>
-                    </div>
-    </div>
+        <div>
+            <h3>Namespaces</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">M7</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">N7</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
+                </div>
 </div>
 
 [#[object Object]]
@@ -206,9 +426,30 @@ <h2>Namespace N7</h2>
     </div>
     <div>
             <div>
-                <h3> Member Functions</h3>
-                    </div>
-    </div>
+                <h3>Functions</h3>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f2_WL</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+            </div>
 </div>
 
 [#[object Object]]
@@ -223,7 +464,13 @@ <h2>Function f2_WL</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><filters/whitelist_0.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -244,9 +491,30 @@ <h2>Namespace M7</h2>
     </div>
     <div>
             <div>
-                <h3> Member Functions</h3>
-                    </div>
-    </div>
+                <h3>Functions</h3>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f2_WL</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+            </div>
 </div>
 
 [#[object Object]]
@@ -261,7 +529,13 @@ <h2>Function f2_WL</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><filters/whitelist_0.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
diff --git a/test-files/golden-tests/filters/whitelist_test.adoc b/test-files/golden-tests/filters/whitelist_test.adoc
index 228ab2a130..c5f85e4b27 100644
--- a/test-files/golden-tests/filters/whitelist_test.adoc
+++ b/test-files/golden-tests/filters/whitelist_test.adoc
@@ -37,7 +37,7 @@
 
 === Synopsis
 
-Declared in header `<filters/whitelist_test.cpp>`
+Declared in `<filters/whitelist_test.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -74,7 +74,7 @@ documented_function();
 
 === Synopsis
 
-Declared in header `<filters/whitelist_test.cpp>`
+Declared in `<filters/whitelist_test.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
diff --git a/test-files/golden-tests/filters/whitelist_test.html b/test-files/golden-tests/filters/whitelist_test.html
index 697c50583e..cf091f0b66 100644
--- a/test-files/golden-tests/filters/whitelist_test.html
+++ b/test-files/golden-tests/filters/whitelist_test.html
@@ -1,4 +1,4 @@
-</html>
+<html>
     <head></head>
     <body>
         <div>
@@ -11,10 +11,38 @@ <h1>Reference</h1>
         <h2>Global namespace</h2>
     </div>
     <div>
-            <div>
-                <h3> Namespaces</h3>
-                    </div>
-    </div>
+        <div>
+            <h3>Namespaces</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">blacklisted</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">to_be_documented</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
+                </div>
 </div>
 
 [#[object Object]]
@@ -25,9 +53,30 @@ <h2>Namespace to_be_documented</h2>
     </div>
     <div>
             <div>
-                <h3> Member Functions</h3>
-                    </div>
-    </div>
+                <h3>Functions</h3>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">documented_function</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+            </div>
 </div>
 
 [#[object Object]]
@@ -42,7 +91,13 @@ <h2>Function documented_function</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><filters/whitelist_test.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -63,9 +118,30 @@ <h2>Namespace blacklisted</h2>
     </div>
     <div>
             <div>
-                <h3> Member Functions</h3>
-                    </div>
-    </div>
+                <h3>Functions</h3>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">whitelisted_function</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+            </div>
 </div>
 
 [#[object Object]]
@@ -80,7 +156,13 @@ <h2>Function whitelisted_function</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><filters/whitelist_test.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
diff --git a/test-files/golden-tests/friend-1.adoc b/test-files/golden-tests/friend-1.adoc
index 8aec359baa..60da8102f3 100644
--- a/test-files/golden-tests/friend-1.adoc
+++ b/test-files/golden-tests/friend-1.adoc
@@ -31,7 +31,7 @@ f
 
 === Synopsis
 
-Declared in header `<friend-1.cpp>`
+Declared in `<friend-1.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -61,7 +61,7 @@ f
 
 === Synopsis
 
-Declared in header `<friend-1.cpp>`
+Declared in `<friend-1.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -82,7 +82,7 @@ f
 
 === Synopsis
 
-Declared in header `<friend-1.cpp>`
+Declared in `<friend-1.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
diff --git a/test-files/golden-tests/friend-1.html b/test-files/golden-tests/friend-1.html
index 740c03cce0..2e638474b9 100644
--- a/test-files/golden-tests/friend-1.html
+++ b/test-files/golden-tests/friend-1.html
@@ -1,4 +1,4 @@
-</html>
+<html>
     <head></head>
     <body>
         <div>
@@ -11,13 +11,57 @@ <h1>Reference</h1>
         <h2>Global namespace</h2>
     </div>
     <div>
-            <div>
-                <h3> Types</h3>
-                    </div>
+        <div>
+            <h3> Types</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">T</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
     <div>
-                <h3> Member Functions</h3>
-                    </div>
-    </div>
+                <h3>Functions</h3>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f</a> 
+                                </td>
+                                <td>
+<p><span>f</span></p>
+                            
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+            </div>
 </div>
 
 [#[object Object]]
@@ -32,7 +76,13 @@ <h2>Class T</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><friend-1.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct T;
@@ -40,10 +90,33 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-            <div>
+                            <div>
                 <h3> Friends</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f</a> 
+                                </td>
+                                <td>
+<p><span>f</span></p>
+                            
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                    </div>
 
 
 </div>
@@ -62,7 +135,13 @@ <h2>Friend f</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><friend-1.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             friend
@@ -87,7 +166,13 @@ <h2>Function f</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><friend-1.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
diff --git a/test-files/golden-tests/friend-2.adoc b/test-files/golden-tests/friend-2.adoc
index 30ff06bfe0..fc2c773cbd 100644
--- a/test-files/golden-tests/friend-2.adoc
+++ b/test-files/golden-tests/friend-2.adoc
@@ -31,7 +31,7 @@ f
 
 === Synopsis
 
-Declared in header `<friend-2.cpp>`
+Declared in `<friend-2.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -61,7 +61,7 @@ f
 
 === Synopsis
 
-Declared in header `<friend-2.cpp>`
+Declared in `<friend-2.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -82,7 +82,7 @@ f
 
 === Synopsis
 
-Declared in header `<friend-2.cpp>`
+Declared in `<friend-2.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
diff --git a/test-files/golden-tests/friend-2.html b/test-files/golden-tests/friend-2.html
index 740c03cce0..96720b644a 100644
--- a/test-files/golden-tests/friend-2.html
+++ b/test-files/golden-tests/friend-2.html
@@ -1,4 +1,4 @@
-</html>
+<html>
     <head></head>
     <body>
         <div>
@@ -11,13 +11,57 @@ <h1>Reference</h1>
         <h2>Global namespace</h2>
     </div>
     <div>
-            <div>
-                <h3> Types</h3>
-                    </div>
+        <div>
+            <h3> Types</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">T</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
     <div>
-                <h3> Member Functions</h3>
-                    </div>
-    </div>
+                <h3>Functions</h3>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f</a> 
+                                </td>
+                                <td>
+<p><span>f</span></p>
+                            
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+            </div>
 </div>
 
 [#[object Object]]
@@ -32,7 +76,13 @@ <h2>Class T</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><friend-2.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct T;
@@ -40,10 +90,33 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-            <div>
+                            <div>
                 <h3> Friends</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f</a> 
+                                </td>
+                                <td>
+<p><span>f</span></p>
+                            
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                    </div>
 
 
 </div>
@@ -62,7 +135,13 @@ <h2>Friend f</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><friend-2.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             friend
@@ -87,7 +166,13 @@ <h2>Function f</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><friend-2.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
diff --git a/test-files/golden-tests/friend-3.adoc b/test-files/golden-tests/friend-3.adoc
index d8019b232c..c7747974c7 100644
--- a/test-files/golden-tests/friend-3.adoc
+++ b/test-files/golden-tests/friend-3.adoc
@@ -33,7 +33,7 @@ T::f
 
 === Synopsis
 
-Declared in header `<friend-3.cpp>`
+Declared in `<friend-3.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -63,7 +63,7 @@ T::f
 
 === Synopsis
 
-Declared in header `<friend-3.cpp>`
+Declared in `<friend-3.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -84,7 +84,7 @@ T::f
 
 === Synopsis
 
-Declared in header `<friend-3.cpp>`
+Declared in `<friend-3.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -108,7 +108,7 @@ f();
 
 === Synopsis
 
-Declared in header `<friend-3.cpp>`
+Declared in `<friend-3.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -134,7 +134,7 @@ struct U;
 
 === Synopsis
 
-Declared in header `<friend-3.cpp>`
+Declared in `<friend-3.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
diff --git a/test-files/golden-tests/friend-3.html b/test-files/golden-tests/friend-3.html
index a4a0c74d63..16cecc0af4 100644
--- a/test-files/golden-tests/friend-3.html
+++ b/test-files/golden-tests/friend-3.html
@@ -1,4 +1,4 @@
-</html>
+<html>
     <head></head>
     <body>
         <div>
@@ -11,13 +11,64 @@ <h1>Reference</h1>
         <h2>Global namespace</h2>
     </div>
     <div>
-            <div>
-                <h3> Types</h3>
-                    </div>
+        <div>
+            <h3> Types</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">T</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">U</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
     <div>
-                <h3> Member Functions</h3>
-                    </div>
-    </div>
+                <h3>Functions</h3>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f</a> 
+                                </td>
+                                <td>
+<p><span>T::f</span></p>
+                            
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+            </div>
 </div>
 
 [#[object Object]]
@@ -32,7 +83,13 @@ <h2>Class T</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><friend-3.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct T;
@@ -40,10 +97,33 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-            <div>
+                            <div>
                 <h3> Friends</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f</a> 
+                                </td>
+                                <td>
+<p><span>T::f</span></p>
+                            
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                    </div>
 
 
 </div>
@@ -62,7 +142,13 @@ <h2>Friend f</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><friend-3.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             friend
@@ -87,7 +173,13 @@ <h2>Function f</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><friend-3.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -112,7 +204,13 @@ <h2>Class U</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><friend-3.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct U;
@@ -120,10 +218,31 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-            <div>
+                            <div>
                 <h3> Friends</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                    </div>
 
 
 </div>
@@ -140,7 +259,13 @@ <h2>Friend f</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><friend-3.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             friend
diff --git a/test-files/golden-tests/friend-4.adoc b/test-files/golden-tests/friend-4.adoc
index 6f26179134..51a6f270d4 100644
--- a/test-files/golden-tests/friend-4.adoc
+++ b/test-files/golden-tests/friend-4.adoc
@@ -33,7 +33,7 @@ U::f
 
 === Synopsis
 
-Declared in header `<friend-4.cpp>`
+Declared in `<friend-4.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -59,7 +59,7 @@ struct T;
 
 === Synopsis
 
-Declared in header `<friend-4.cpp>`
+Declared in `<friend-4.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -80,7 +80,7 @@ U::f
 
 === Synopsis
 
-Declared in header `<friend-4.cpp>`
+Declared in `<friend-4.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -104,7 +104,7 @@ f();
 
 === Synopsis
 
-Declared in header `<friend-4.cpp>`
+Declared in `<friend-4.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -134,7 +134,7 @@ U::f
 
 === Synopsis
 
-Declared in header `<friend-4.cpp>`
+Declared in `<friend-4.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
diff --git a/test-files/golden-tests/friend-4.html b/test-files/golden-tests/friend-4.html
index 45579aaea3..ddc32f8fd6 100644
--- a/test-files/golden-tests/friend-4.html
+++ b/test-files/golden-tests/friend-4.html
@@ -1,4 +1,4 @@
-</html>
+<html>
     <head></head>
     <body>
         <div>
@@ -11,13 +11,64 @@ <h1>Reference</h1>
         <h2>Global namespace</h2>
     </div>
     <div>
-            <div>
-                <h3> Types</h3>
-                    </div>
+        <div>
+            <h3> Types</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">T</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">U</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
     <div>
-                <h3> Member Functions</h3>
-                    </div>
-    </div>
+                <h3>Functions</h3>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f</a> 
+                                </td>
+                                <td>
+<p><span>U::f</span></p>
+                            
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+            </div>
 </div>
 
 [#[object Object]]
@@ -32,7 +83,13 @@ <h2>Class T</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><friend-4.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct T;
@@ -40,10 +97,31 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-            <div>
+                            <div>
                 <h3> Friends</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                    </div>
 
 
 </div>
@@ -60,7 +138,13 @@ <h2>Friend f</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><friend-4.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             friend
@@ -85,7 +169,13 @@ <h2>Function f</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><friend-4.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -110,7 +200,13 @@ <h2>Class U</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><friend-4.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct U;
@@ -118,10 +214,33 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-            <div>
+                            <div>
                 <h3> Friends</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f</a> 
+                                </td>
+                                <td>
+<p><span>U::f</span></p>
+                            
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                    </div>
 
 
 </div>
@@ -140,7 +259,13 @@ <h2>Friend f</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><friend-4.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             friend
diff --git a/test-files/golden-tests/friend-5.adoc b/test-files/golden-tests/friend-5.adoc
index e544e9a02d..5b7461f6ac 100644
--- a/test-files/golden-tests/friend-5.adoc
+++ b/test-files/golden-tests/friend-5.adoc
@@ -33,7 +33,7 @@ f
 
 === Synopsis
 
-Declared in header `<friend-5.cpp>`
+Declared in `<friend-5.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -59,7 +59,7 @@ struct T;
 
 === Synopsis
 
-Declared in header `<friend-5.cpp>`
+Declared in `<friend-5.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -80,7 +80,7 @@ f
 
 === Synopsis
 
-Declared in header `<friend-5.cpp>`
+Declared in `<friend-5.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -104,7 +104,7 @@ f();
 
 === Synopsis
 
-Declared in header `<friend-5.cpp>`
+Declared in `<friend-5.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -130,7 +130,7 @@ struct U;
 
 === Synopsis
 
-Declared in header `<friend-5.cpp>`
+Declared in `<friend-5.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
diff --git a/test-files/golden-tests/friend-5.html b/test-files/golden-tests/friend-5.html
index 22dcc36f04..d5d8547088 100644
--- a/test-files/golden-tests/friend-5.html
+++ b/test-files/golden-tests/friend-5.html
@@ -1,4 +1,4 @@
-</html>
+<html>
     <head></head>
     <body>
         <div>
@@ -11,13 +11,64 @@ <h1>Reference</h1>
         <h2>Global namespace</h2>
     </div>
     <div>
-            <div>
-                <h3> Types</h3>
-                    </div>
+        <div>
+            <h3> Types</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">T</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">U</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
     <div>
-                <h3> Member Functions</h3>
-                    </div>
-    </div>
+                <h3>Functions</h3>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f</a> 
+                                </td>
+                                <td>
+<p><span>f</span></p>
+                            
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+            </div>
 </div>
 
 [#[object Object]]
@@ -32,7 +83,13 @@ <h2>Class T</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><friend-5.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct T;
@@ -40,10 +97,31 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-            <div>
+                            <div>
                 <h3> Friends</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                    </div>
 
 
 </div>
@@ -60,7 +138,13 @@ <h2>Friend f</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><friend-5.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             friend
@@ -85,7 +169,13 @@ <h2>Function f</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><friend-5.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -110,7 +200,13 @@ <h2>Class U</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><friend-5.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct U;
@@ -118,10 +214,31 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-            <div>
+                            <div>
                 <h3> Friends</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                    </div>
 
 
 </div>
@@ -138,7 +255,13 @@ <h2>Friend f</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><friend-5.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             friend
diff --git a/test-files/golden-tests/friend-6.adoc b/test-files/golden-tests/friend-6.adoc
index 80723ec126..858cd2addb 100644
--- a/test-files/golden-tests/friend-6.adoc
+++ b/test-files/golden-tests/friend-6.adoc
@@ -34,7 +34,7 @@ Struct T brief
 
 === Synopsis
 
-Declared in header `<friend-6.cpp>`
+Declared in `<friend-6.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -68,7 +68,7 @@ Friend int brief
 
 === Synopsis
 
-Declared in header `<friend-6.cpp>`
+Declared in `<friend-6.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -87,7 +87,7 @@ Friend class Z brief
 
 === Synopsis
 
-Declared in header `<friend-6.cpp>`
+Declared in `<friend-6.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -106,7 +106,7 @@ Struct U brief
 
 === Synopsis
 
-Declared in header `<friend-6.cpp>`
+Declared in `<friend-6.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -136,7 +136,7 @@ Friend T brief
 
 === Synopsis
 
-Declared in header `<friend-6.cpp>`
+Declared in `<friend-6.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -155,7 +155,7 @@ Struct V brief
 
 === Synopsis
 
-Declared in header `<friend-6.cpp>`
+Declared in `<friend-6.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -185,7 +185,7 @@ Friend struct U brief
 
 === Synopsis
 
-Declared in header `<friend-6.cpp>`
+Declared in `<friend-6.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
diff --git a/test-files/golden-tests/friend-6.html b/test-files/golden-tests/friend-6.html
index 939f03fbcd..34b5355370 100644
--- a/test-files/golden-tests/friend-6.html
+++ b/test-files/golden-tests/friend-6.html
@@ -1,4 +1,4 @@
-</html>
+<html>
     <head></head>
     <body>
         <div>
@@ -11,10 +11,51 @@ <h1>Reference</h1>
         <h2>Global namespace</h2>
     </div>
     <div>
-            <div>
-                <h3> Types</h3>
-                    </div>
-    </div>
+        <div>
+            <h3> Types</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">T</a> 
+                            </td>
+                            <td>
+<p><span>Struct T brief</span></p>
+                        
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">U</a> 
+                            </td>
+                            <td>
+<p><span>Struct U brief</span></p>
+                        
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">V</a> 
+                            </td>
+                            <td>
+<p><span>Struct V brief</span></p>
+                        
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
+                </div>
 </div>
 
 [#[object Object]]
@@ -31,7 +72,13 @@ <h2>Class T</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><friend-6.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct T;
@@ -39,10 +86,42 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-            <div>
+                            <div>
                 <h3> Friends</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">[object Object]</a> 
+                                </td>
+                                <td>
+<p><span>Friend int brief</span></p>
+                            
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">[object Object]</a> 
+                                </td>
+                                <td>
+<p><span>Friend class Z brief</span></p>
+                            
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                    </div>
 
 
 </div>
@@ -61,7 +140,13 @@ <h2>Friend [object Object]</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><friend-6.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             friend int;
@@ -84,7 +169,13 @@ <h2>Friend [object Object]</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><friend-6.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             friend Z;
@@ -107,7 +198,13 @@ <h2>Class U</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><friend-6.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct U;
@@ -115,10 +212,33 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-            <div>
+                            <div>
                 <h3> Friends</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">[object Object]</a> 
+                                </td>
+                                <td>
+<p><span>Friend T brief</span></p>
+                            
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                    </div>
 
 
 </div>
@@ -137,7 +257,13 @@ <h2>Friend [object Object]</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><friend-6.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             friend T;
@@ -160,7 +286,13 @@ <h2>Class V</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><friend-6.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct V;
@@ -168,10 +300,33 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-            <div>
+                            <div>
                 <h3> Friends</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">[object Object]</a> 
+                                </td>
+                                <td>
+<p><span>Friend struct U brief</span></p>
+                            
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                    </div>
 
 
 </div>
@@ -190,7 +345,13 @@ <h2>Friend [object Object]</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><friend-6.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             friend U;
diff --git a/test-files/golden-tests/function-parm-decay.adoc b/test-files/golden-tests/function-parm-decay.adoc
index 79ef5db152..86d5e2c5e0 100644
--- a/test-files/golden-tests/function-parm-decay.adoc
+++ b/test-files/golden-tests/function-parm-decay.adoc
@@ -37,7 +37,7 @@
 
 === Synopsis
 
-Declared in header `<function-parm-decay.cpp>`
+Declared in `<function-parm-decay.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -61,7 +61,7 @@ f(int const x);
 
 === Synopsis
 
-Declared in header `<function-parm-decay.cpp>`
+Declared in `<function-parm-decay.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -85,7 +85,7 @@ g(int* x);
 
 === Synopsis
 
-Declared in header `<function-parm-decay.cpp>`
+Declared in `<function-parm-decay.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -109,7 +109,7 @@ h(int x(bool));
 
 === Synopsis
 
-Declared in header `<function-parm-decay.cpp>`
+Declared in `<function-parm-decay.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -126,7 +126,7 @@ using T = int;
 
 === Synopsis
 
-Declared in header `<function-parm-decay.cpp>`
+Declared in `<function-parm-decay.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -143,7 +143,7 @@ using U = int const;
 
 === Synopsis
 
-Declared in header `<function-parm-decay.cpp>`
+Declared in `<function-parm-decay.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
diff --git a/test-files/golden-tests/function-parm-decay.html b/test-files/golden-tests/function-parm-decay.html
index 702cd47803..59a38f3290 100644
--- a/test-files/golden-tests/function-parm-decay.html
+++ b/test-files/golden-tests/function-parm-decay.html
@@ -1,4 +1,4 @@
-</html>
+<html>
     <head></head>
     <body>
         <div>
@@ -11,13 +11,83 @@ <h1>Reference</h1>
         <h2>Global namespace</h2>
     </div>
     <div>
-            <div>
-            <h3>Types</h3>
-            </div>
+        <div>
+            <h3> Types</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">T</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">U</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
     <div>
-                <h3> Member Functions</h3>
-                    </div>
-    </div>
+                <h3>Functions</h3>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">g</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">h</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">i</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+            </div>
 </div>
 
 [#[object Object]]
@@ -32,7 +102,13 @@ <h2>Function f</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><function-parm-decay.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -57,7 +133,13 @@ <h2>Function g</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><function-parm-decay.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -82,7 +164,13 @@ <h2>Function h</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><function-parm-decay.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -107,7 +195,13 @@ <h2>T</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><function-parm-decay.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             using T = int;
@@ -128,7 +222,13 @@ <h2>U</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><function-parm-decay.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             using U = int const;
@@ -149,7 +249,13 @@ <h2>Function i</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><function-parm-decay.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
diff --git a/test-files/golden-tests/function-template.adoc b/test-files/golden-tests/function-template.adoc
index 3ca23518ea..3b60210f7d 100644
--- a/test-files/golden-tests/function-template.adoc
+++ b/test-files/golden-tests/function-template.adoc
@@ -44,7 +44,7 @@
 
 === Synopsis
 
-Declared in header `<function-template.cpp>`
+Declared in `<function-template.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -69,7 +69,7 @@ f0(int x);
 
 === Synopsis
 
-Declared in header `<function-template.cpp>`
+Declared in `<function-template.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -94,7 +94,7 @@ f1(T t);
 
 === Synopsis
 
-Declared in header `<function-template.cpp>`
+Declared in `<function-template.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -119,7 +119,7 @@ f2();
 
 === Synopsis
 
-Declared in header `<function-template.cpp>`
+Declared in `<function-template.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -146,7 +146,7 @@ f3();
 
 === Synopsis
 
-Declared in header `<function-template.cpp>`
+Declared in `<function-template.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -171,7 +171,7 @@ g0(int x);
 
 === Synopsis
 
-Declared in header `<function-template.cpp>`
+Declared in `<function-template.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -196,7 +196,7 @@ g1();
 
 === Synopsis
 
-Declared in header `<function-template.cpp>`
+Declared in `<function-template.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -223,7 +223,7 @@ g2();
 
 === Synopsis
 
-Declared in header `<function-template.cpp>`
+Declared in `<function-template.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -248,7 +248,7 @@ h0(auto x);
 
 === Synopsis
 
-Declared in header `<function-template.cpp>`
+Declared in `<function-template.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -277,7 +277,7 @@ h1(
 
 === Synopsis
 
-Declared in header `<function-template.cpp>`
+Declared in `<function-template.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -304,7 +304,7 @@ i();
 
 === Synopsis
 
-Declared in header `<function-template.cpp>`
+Declared in `<function-template.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -329,7 +329,7 @@ j0();
 
 === Synopsis
 
-Declared in header `<function-template.cpp>`
+Declared in `<function-template.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
diff --git a/test-files/golden-tests/function-template.html b/test-files/golden-tests/function-template.html
index 5eb1ecc84d..28cf912426 100644
--- a/test-files/golden-tests/function-template.html
+++ b/test-files/golden-tests/function-template.html
@@ -1,4 +1,4 @@
-</html>
+<html>
     <head></head>
     <body>
         <div>
@@ -12,9 +12,107 @@ <h2>Global namespace</h2>
     </div>
     <div>
             <div>
-                <h3> Member Functions</h3>
-                    </div>
-    </div>
+                <h3>Functions</h3>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f0</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">f1</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">f2</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">f3</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">g0</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">g1</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">g2</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">h0</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">h1</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">i</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">j0</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">j1</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+            </div>
 </div>
 
 [#[object Object]]
@@ -29,7 +127,13 @@ <h2>Function f0</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><function-template.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<typename T>
@@ -55,7 +159,13 @@ <h2>Function f1</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><function-template.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<typename T>
@@ -81,7 +191,13 @@ <h2>Function f2</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><function-template.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<typename T = int>
@@ -107,7 +223,13 @@ <h2>Function f3</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><function-template.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<
@@ -135,7 +257,13 @@ <h2>Function g0</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><function-template.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<int I>
@@ -161,7 +289,13 @@ <h2>Function g1</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><function-template.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<int I = 1>
@@ -187,7 +321,13 @@ <h2>Function g2</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><function-template.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<
@@ -215,7 +355,13 @@ <h2>Function h0</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><function-template.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<class x:auto>
@@ -241,7 +387,13 @@ <h2>Function h1</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><function-template.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<
@@ -271,7 +423,13 @@ <h2>Function i</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><function-template.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<
@@ -299,7 +457,13 @@ <h2>Function j0</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><function-template.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<template<typename U> typename T>
@@ -325,7 +489,13 @@ <h2>Function j1</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><function-template.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<
diff --git a/test-files/golden-tests/function-tparm-decay.adoc b/test-files/golden-tests/function-tparm-decay.adoc
index ababc58a92..dc5ff3b21d 100644
--- a/test-files/golden-tests/function-tparm-decay.adoc
+++ b/test-files/golden-tests/function-tparm-decay.adoc
@@ -37,7 +37,7 @@
 
 === Synopsis
 
-Declared in header `<function-tparm-decay.cpp>`
+Declared in `<function-tparm-decay.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -62,7 +62,7 @@ f();
 
 === Synopsis
 
-Declared in header `<function-tparm-decay.cpp>`
+Declared in `<function-tparm-decay.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -87,7 +87,7 @@ g();
 
 === Synopsis
 
-Declared in header `<function-tparm-decay.cpp>`
+Declared in `<function-tparm-decay.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -112,7 +112,7 @@ h();
 
 === Synopsis
 
-Declared in header `<function-tparm-decay.cpp>`
+Declared in `<function-tparm-decay.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -129,7 +129,7 @@ using T = int;
 
 === Synopsis
 
-Declared in header `<function-tparm-decay.cpp>`
+Declared in `<function-tparm-decay.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -146,7 +146,7 @@ using U = int const;
 
 === Synopsis
 
-Declared in header `<function-tparm-decay.cpp>`
+Declared in `<function-tparm-decay.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
diff --git a/test-files/golden-tests/function-tparm-decay.html b/test-files/golden-tests/function-tparm-decay.html
index 2b69df821f..c97ca37059 100644
--- a/test-files/golden-tests/function-tparm-decay.html
+++ b/test-files/golden-tests/function-tparm-decay.html
@@ -1,4 +1,4 @@
-</html>
+<html>
     <head></head>
     <body>
         <div>
@@ -11,13 +11,83 @@ <h1>Reference</h1>
         <h2>Global namespace</h2>
     </div>
     <div>
-            <div>
-            <h3>Types</h3>
-            </div>
+        <div>
+            <h3> Types</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">T</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">U</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
     <div>
-                <h3> Member Functions</h3>
-                    </div>
-    </div>
+                <h3>Functions</h3>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">g</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">h</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">i</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+            </div>
 </div>
 
 [#[object Object]]
@@ -32,7 +102,13 @@ <h2>Function f</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><function-tparm-decay.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<int x>
@@ -58,7 +134,13 @@ <h2>Function g</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><function-tparm-decay.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<int x[4]>
@@ -84,7 +166,13 @@ <h2>Function h</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><function-tparm-decay.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<int(* x)(bool const)>
@@ -110,7 +198,13 @@ <h2>T</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><function-tparm-decay.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             using T = int;
@@ -131,7 +225,13 @@ <h2>U</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><function-tparm-decay.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             using U = int const;
@@ -152,7 +252,13 @@ <h2>Function i</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><function-tparm-decay.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<int>
diff --git a/test-files/golden-tests/implicit-instantiation-member-ref.adoc b/test-files/golden-tests/implicit-instantiation-member-ref.adoc
index 7222e01db6..ba6c8561b2 100644
--- a/test-files/golden-tests/implicit-instantiation-member-ref.adoc
+++ b/test-files/golden-tests/implicit-instantiation-member-ref.adoc
@@ -44,7 +44,7 @@
 
 === Synopsis
 
-Declared in header `<implicit-instantiation-member-ref.cpp>`
+Declared in `<implicit-instantiation-member-ref.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -77,7 +77,7 @@ struct S0;
 
 === Synopsis
 
-Declared in header `<implicit-instantiation-member-ref.cpp>`
+Declared in `<implicit-instantiation-member-ref.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -94,7 +94,7 @@ using M0 = T;
 
 === Synopsis
 
-Declared in header `<implicit-instantiation-member-ref.cpp>`
+Declared in `<implicit-instantiation-member-ref.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -113,7 +113,7 @@ struct S1;
 
 === Synopsis
 
-Declared in header `<implicit-instantiation-member-ref.cpp>`
+Declared in `<implicit-instantiation-member-ref.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -131,7 +131,7 @@ using M1 = xref:S0.adoc[S0]<U>;
 
 === Synopsis
 
-Declared in header `<implicit-instantiation-member-ref.cpp>`
+Declared in `<implicit-instantiation-member-ref.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -164,7 +164,7 @@ struct S2;
 
 === Synopsis
 
-Declared in header `<implicit-instantiation-member-ref.cpp>`
+Declared in `<implicit-instantiation-member-ref.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -181,7 +181,7 @@ using M2 = U;
 
 === Synopsis
 
-Declared in header `<implicit-instantiation-member-ref.cpp>`
+Declared in `<implicit-instantiation-member-ref.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -200,7 +200,7 @@ struct S3;
 
 === Synopsis
 
-Declared in header `<implicit-instantiation-member-ref.cpp>`
+Declared in `<implicit-instantiation-member-ref.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -218,7 +218,7 @@ using M3 = xref:S0/S2.adoc[S2]<U>;
 
 === Synopsis
 
-Declared in header `<implicit-instantiation-member-ref.cpp>`
+Declared in `<implicit-instantiation-member-ref.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -245,7 +245,7 @@ struct S4;
 
 === Synopsis
 
-Declared in header `<implicit-instantiation-member-ref.cpp>`
+Declared in `<implicit-instantiation-member-ref.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -262,7 +262,7 @@ using M4 = V;
 
 === Synopsis
 
-Declared in header `<implicit-instantiation-member-ref.cpp>`
+Declared in `<implicit-instantiation-member-ref.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -279,7 +279,7 @@ using A0 = xref:S0.adoc[S0]<int>;
 
 === Synopsis
 
-Declared in header `<implicit-instantiation-member-ref.cpp>`
+Declared in `<implicit-instantiation-member-ref.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -296,7 +296,7 @@ using A1 = xref:A0.adoc[A0]::xref:S0/M0.adoc[M0];
 
 === Synopsis
 
-Declared in header `<implicit-instantiation-member-ref.cpp>`
+Declared in `<implicit-instantiation-member-ref.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -313,7 +313,7 @@ using A2 = xref:A0.adoc[A0]::xref:S0/S1.adoc[S1];
 
 === Synopsis
 
-Declared in header `<implicit-instantiation-member-ref.cpp>`
+Declared in `<implicit-instantiation-member-ref.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -330,7 +330,7 @@ using A3 = xref:S0.adoc[S0]<long>::xref:S0/M0.adoc[M0];
 
 === Synopsis
 
-Declared in header `<implicit-instantiation-member-ref.cpp>`
+Declared in `<implicit-instantiation-member-ref.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -347,7 +347,7 @@ using A4 = xref:S0.adoc[S0]<long long>::xref:S0/S1.adoc[S1];
 
 === Synopsis
 
-Declared in header `<implicit-instantiation-member-ref.cpp>`
+Declared in `<implicit-instantiation-member-ref.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -364,7 +364,7 @@ using A5 = xref:S0.adoc[S0]<void>;
 
 === Synopsis
 
-Declared in header `<implicit-instantiation-member-ref.cpp>`
+Declared in `<implicit-instantiation-member-ref.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -381,7 +381,7 @@ using A6 = xref:A5.adoc[A5]::xref:S0/M1.adoc[M1]<short>::xref:S0/M0.adoc[M0];
 
 === Synopsis
 
-Declared in header `<implicit-instantiation-member-ref.cpp>`
+Declared in `<implicit-instantiation-member-ref.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -398,7 +398,7 @@ using A7 = xref:A5.adoc[A5]::xref:S0/S2.adoc[S2]<bool>::xref:S0/S2/M2.adoc[M2];
 
 === Synopsis
 
-Declared in header `<implicit-instantiation-member-ref.cpp>`
+Declared in `<implicit-instantiation-member-ref.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -415,7 +415,7 @@ using A8 = xref:A5.adoc[A5]::xref:S0/S2.adoc[S2]<int>::xref:S0/S2/S3.adoc[S3];
 
 === Synopsis
 
-Declared in header `<implicit-instantiation-member-ref.cpp>`
+Declared in `<implicit-instantiation-member-ref.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -432,7 +432,7 @@ using A9 = xref:A5.adoc[A5]::xref:S0/S2.adoc[S2]<char>::xref:S0/S2/M3.adoc[M3]<i
 
 === Synopsis
 
-Declared in header `<implicit-instantiation-member-ref.cpp>`
+Declared in `<implicit-instantiation-member-ref.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
diff --git a/test-files/golden-tests/implicit-instantiation-member-ref.html b/test-files/golden-tests/implicit-instantiation-member-ref.html
index 7d4adc7434..6f7f2889e4 100644
--- a/test-files/golden-tests/implicit-instantiation-member-ref.html
+++ b/test-files/golden-tests/implicit-instantiation-member-ref.html
@@ -1,4 +1,4 @@
-</html>
+<html>
     <head></head>
     <body>
         <div>
@@ -11,13 +11,108 @@ <h1>Reference</h1>
         <h2>Global namespace</h2>
     </div>
     <div>
-            <div>
-                <h3> Types</h3>
-                    </div>
-    <div>
-            <h3>Types</h3>
-            </div>
-    </div>
+        <div>
+            <h3> Types</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">A0</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">A1</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">A10</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">A2</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">A3</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">A4</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">A5</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">A6</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">A7</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">A8</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">A9</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">S0</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
+                </div>
 </div>
 
 [#[object Object]]
@@ -32,7 +127,13 @@ <h2>Class S0</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><implicit-instantiation-member-ref.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<typename T>
@@ -41,13 +142,52 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-            <div>
-                <h3> Types</h3>
-                    </div>
-    <div>
-            <h3>Types</h3>
-            </div>
-                    </div>
+        <div>
+            <h3> Types</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">M0</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">M1</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">S1</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">S2</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
+                                                                                                        </div>
 
 
 </div>
@@ -56,8 +196,7 @@ <h3>Types</h3>
 
 <div id="[object Object]">
     <div>
-        <h2><a href="#">S0</a>::
-M0</h2>
+        <h2>S0::M0</h2>
         
     </div>
 
@@ -65,7 +204,13 @@ <h2><a href="#">S0</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><implicit-instantiation-member-ref.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             using M0 = T;
@@ -78,8 +223,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Class <a href="#">S0</a>::
-S1</h2>
+        <h2>Class S0::S1</h2>
         
     </div>
 
@@ -87,7 +231,13 @@ <h2>Class <a href="#">S0</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><implicit-instantiation-member-ref.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct S1;
@@ -95,7 +245,7 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-                            </div>
+                                                                                                                </div>
 
 
 </div>
@@ -104,8 +254,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2><a href="#">S0</a>::
-M1</h2>
+        <h2>S0::M1</h2>
         
     </div>
 
@@ -113,7 +262,13 @@ <h2><a href="#">S0</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><implicit-instantiation-member-ref.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<typename U>
@@ -127,8 +282,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Class <a href="#">S0</a>::
-S2</h2>
+        <h2>Class S0::S2</h2>
         
     </div>
 
@@ -136,7 +290,13 @@ <h2>Class <a href="#">S0</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><implicit-instantiation-member-ref.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<typename U>
@@ -145,13 +305,52 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-            <div>
-                <h3> Types</h3>
-                    </div>
-    <div>
-            <h3>Types</h3>
-            </div>
-                    </div>
+        <div>
+            <h3> Types</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">M2</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">M3</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">S3</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">S4</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
+                                                                                                        </div>
 
 
 </div>
@@ -160,9 +359,7 @@ <h3>Types</h3>
 
 <div id="[object Object]">
     <div>
-        <h2><a href="#">S0</a>::
-<a href="#">S2</a>::
-M2</h2>
+        <h2>S0::S2::M2</h2>
         
     </div>
 
@@ -170,7 +367,13 @@ <h2><a href="#">S0</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><implicit-instantiation-member-ref.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             using M2 = U;
@@ -183,9 +386,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Class <a href="#">S0</a>::
-<a href="#">S2</a>::
-S3</h2>
+        <h2>Class S0::S2::S3</h2>
         
     </div>
 
@@ -193,7 +394,13 @@ <h2>Class <a href="#">S0</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><implicit-instantiation-member-ref.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct S3;
@@ -201,7 +408,7 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-                            </div>
+                                                                                                                </div>
 
 
 </div>
@@ -210,9 +417,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2><a href="#">S0</a>::
-<a href="#">S2</a>::
-M3</h2>
+        <h2>S0::S2::M3</h2>
         
     </div>
 
@@ -220,7 +425,13 @@ <h2><a href="#">S0</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><implicit-instantiation-member-ref.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<typename V>
@@ -234,9 +445,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Class <a href="#">S0</a>::
-<a href="#">S2</a>::
-S4</h2>
+        <h2>Class S0::S2::S4</h2>
         
     </div>
 
@@ -244,7 +453,13 @@ <h2>Class <a href="#">S0</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><implicit-instantiation-member-ref.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<typename V>
@@ -253,10 +468,31 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-            <div>
-            <h3>Types</h3>
-            </div>
-                    </div>
+        <div>
+            <h3> Types</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">M4</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
+                                                                                                        </div>
 
 
 </div>
@@ -265,10 +501,7 @@ <h3>Types</h3>
 
 <div id="[object Object]">
     <div>
-        <h2><a href="#">S0</a>::
-<a href="#">S2</a>::
-<a href="#">S4</a>::
-M4</h2>
+        <h2>S0::S2::S4::M4</h2>
         
     </div>
 
@@ -276,7 +509,13 @@ <h2><a href="#">S0</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><implicit-instantiation-member-ref.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             using M4 = V;
@@ -297,7 +536,13 @@ <h2>A0</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><implicit-instantiation-member-ref.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             using A0 = S0<int>;
@@ -318,7 +563,13 @@ <h2>A1</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><implicit-instantiation-member-ref.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             using A1 = A0::M0;
@@ -339,7 +590,13 @@ <h2>A2</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><implicit-instantiation-member-ref.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             using A2 = A0::S1;
@@ -360,7 +617,13 @@ <h2>A3</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><implicit-instantiation-member-ref.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             using A3 = S0<long>::M0;
@@ -381,7 +644,13 @@ <h2>A4</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><implicit-instantiation-member-ref.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             using A4 = S0<long long>::S1;
@@ -402,7 +671,13 @@ <h2>A5</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><implicit-instantiation-member-ref.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             using A5 = S0<void>;
@@ -423,7 +698,13 @@ <h2>A6</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><implicit-instantiation-member-ref.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             using A6 = A5::M1<short>::M0;
@@ -444,7 +725,13 @@ <h2>A7</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><implicit-instantiation-member-ref.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             using A7 = A5::S2<bool>::M2;
@@ -465,7 +752,13 @@ <h2>A8</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><implicit-instantiation-member-ref.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             using A8 = A5::S2<int>::S3;
@@ -486,7 +779,13 @@ <h2>A9</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><implicit-instantiation-member-ref.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             using A9 = A5::S2<char>::M3<int>::M3<unsigned int>::M2;
@@ -507,7 +806,13 @@ <h2>A10</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><implicit-instantiation-member-ref.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             using A10 = A5::S2<float>::M3<double>::M3<long double>::S4<void>::M4;
diff --git a/test-files/golden-tests/local-class.adoc b/test-files/golden-tests/local-class.adoc
index 2f1e4d1381..41278671df 100644
--- a/test-files/golden-tests/local-class.adoc
+++ b/test-files/golden-tests/local-class.adoc
@@ -29,7 +29,7 @@
 
 === Synopsis
 
-Declared in header `<local-class.cpp>`
+Declared in `<local-class.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -53,7 +53,7 @@ f();
 
 === Synopsis
 
-Declared in header `<local-class.cpp>`
+Declared in `<local-class.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
diff --git a/test-files/golden-tests/local-class.html b/test-files/golden-tests/local-class.html
index 9f143b745b..46e34b00ac 100644
--- a/test-files/golden-tests/local-class.html
+++ b/test-files/golden-tests/local-class.html
@@ -1,4 +1,4 @@
-</html>
+<html>
     <head></head>
     <body>
         <div>
@@ -11,13 +11,55 @@ <h1>Reference</h1>
         <h2>Global namespace</h2>
     </div>
     <div>
-            <div>
-                <h3> Types</h3>
-                    </div>
+        <div>
+            <h3> Types</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">B</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
     <div>
-                <h3> Member Functions</h3>
-                    </div>
-    </div>
+                <h3>Functions</h3>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+            </div>
 </div>
 
 [#[object Object]]
@@ -32,10 +74,16 @@ <h2>Function f</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><local-class.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
-            
+            auto
 f();
         </pre>
     </div>
@@ -57,7 +105,13 @@ <h2>Class B</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><local-class.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct B
@@ -66,7 +120,7 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-                            </div>
+                                                                                                                </div>
 
 
 </div>
diff --git a/test-files/golden-tests/mem-fn.adoc b/test-files/golden-tests/mem-fn.adoc
index 917452316c..a4d681182f 100644
--- a/test-files/golden-tests/mem-fn.adoc
+++ b/test-files/golden-tests/mem-fn.adoc
@@ -56,7 +56,7 @@
 
 === Synopsis
 
-Declared in header `<mem-fn.cpp>`
+Declared in `<mem-fn.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -82,7 +82,7 @@ struct T01;
 
 === Synopsis
 
-Declared in header `<mem-fn.cpp>`
+Declared in `<mem-fn.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -106,7 +106,7 @@ f();
 
 === Synopsis
 
-Declared in header `<mem-fn.cpp>`
+Declared in `<mem-fn.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -132,7 +132,7 @@ struct T02;
 
 === Synopsis
 
-Declared in header `<mem-fn.cpp>`
+Declared in `<mem-fn.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -157,7 +157,7 @@ f();
 
 === Synopsis
 
-Declared in header `<mem-fn.cpp>`
+Declared in `<mem-fn.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -183,7 +183,7 @@ struct T03;
 
 === Synopsis
 
-Declared in header `<mem-fn.cpp>`
+Declared in `<mem-fn.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -207,7 +207,7 @@ f() &;
 
 === Synopsis
 
-Declared in header `<mem-fn.cpp>`
+Declared in `<mem-fn.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -233,7 +233,7 @@ struct T04;
 
 === Synopsis
 
-Declared in header `<mem-fn.cpp>`
+Declared in `<mem-fn.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -257,7 +257,7 @@ f() &&;
 
 === Synopsis
 
-Declared in header `<mem-fn.cpp>`
+Declared in `<mem-fn.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -283,7 +283,7 @@ struct T05;
 
 === Synopsis
 
-Declared in header `<mem-fn.cpp>`
+Declared in `<mem-fn.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -307,7 +307,7 @@ f() const;
 
 === Synopsis
 
-Declared in header `<mem-fn.cpp>`
+Declared in `<mem-fn.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -333,7 +333,7 @@ struct T06;
 
 === Synopsis
 
-Declared in header `<mem-fn.cpp>`
+Declared in `<mem-fn.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -358,7 +358,7 @@ f();
 
 === Synopsis
 
-Declared in header `<mem-fn.cpp>`
+Declared in `<mem-fn.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -384,7 +384,7 @@ struct T08;
 
 === Synopsis
 
-Declared in header `<mem-fn.cpp>`
+Declared in `<mem-fn.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -408,7 +408,7 @@ f();
 
 === Synopsis
 
-Declared in header `<mem-fn.cpp>`
+Declared in `<mem-fn.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -434,7 +434,7 @@ struct T09;
 
 === Synopsis
 
-Declared in header `<mem-fn.cpp>`
+Declared in `<mem-fn.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -458,7 +458,7 @@ f() noexcept;
 
 === Synopsis
 
-Declared in header `<mem-fn.cpp>`
+Declared in `<mem-fn.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -484,7 +484,7 @@ struct T10;
 
 === Synopsis
 
-Declared in header `<mem-fn.cpp>`
+Declared in `<mem-fn.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -508,7 +508,7 @@ f();
 
 === Synopsis
 
-Declared in header `<mem-fn.cpp>`
+Declared in `<mem-fn.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -534,7 +534,7 @@ struct T11;
 
 === Synopsis
 
-Declared in header `<mem-fn.cpp>`
+Declared in `<mem-fn.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -558,7 +558,7 @@ f();
 
 === Synopsis
 
-Declared in header `<mem-fn.cpp>`
+Declared in `<mem-fn.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -584,7 +584,7 @@ struct T12;
 
 === Synopsis
 
-Declared in header `<mem-fn.cpp>`
+Declared in `<mem-fn.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -608,7 +608,7 @@ f(...);
 
 === Synopsis
 
-Declared in header `<mem-fn.cpp>`
+Declared in `<mem-fn.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -634,7 +634,7 @@ struct T13;
 
 === Synopsis
 
-Declared in header `<mem-fn.cpp>`
+Declared in `<mem-fn.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -659,7 +659,7 @@ f();
 
 === Synopsis
 
-Declared in header `<mem-fn.cpp>`
+Declared in `<mem-fn.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -685,7 +685,7 @@ struct T14;
 
 === Synopsis
 
-Declared in header `<mem-fn.cpp>`
+Declared in `<mem-fn.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -710,7 +710,7 @@ f() = 0;
 
 === Synopsis
 
-Declared in header `<mem-fn.cpp>`
+Declared in `<mem-fn.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -736,7 +736,7 @@ struct T15;
 
 === Synopsis
 
-Declared in header `<mem-fn.cpp>`
+Declared in `<mem-fn.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -760,7 +760,7 @@ f() volatile;
 
 === Synopsis
 
-Declared in header `<mem-fn.cpp>`
+Declared in `<mem-fn.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -786,7 +786,7 @@ struct T16;
 
 === Synopsis
 
-Declared in header `<mem-fn.cpp>`
+Declared in `<mem-fn.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -811,7 +811,7 @@ f();
 
 === Synopsis
 
-Declared in header `<mem-fn.cpp>`
+Declared in `<mem-fn.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -837,7 +837,7 @@ struct T17
 
 === Synopsis
 
-Declared in header `<mem-fn.cpp>`
+Declared in `<mem-fn.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -862,7 +862,7 @@ f() override;
 
 === Synopsis
 
-Declared in header `<mem-fn.cpp>`
+Declared in `<mem-fn.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -897,7 +897,7 @@ struct U;
 
 === Synopsis
 
-Declared in header `<mem-fn.cpp>`
+Declared in `<mem-fn.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -922,7 +922,7 @@ f1(...) const volatile noexcept;
 
 === Synopsis
 
-Declared in header `<mem-fn.cpp>`
+Declared in `<mem-fn.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -948,7 +948,7 @@ f2() noexcept;
 
 === Synopsis
 
-Declared in header `<mem-fn.cpp>`
+Declared in `<mem-fn.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -973,7 +973,7 @@ f3() const volatile noexcept = 0;
 
 === Synopsis
 
-Declared in header `<mem-fn.cpp>`
+Declared in `<mem-fn.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -1008,7 +1008,7 @@ struct V
 
 === Synopsis
 
-Declared in header `<mem-fn.cpp>`
+Declared in `<mem-fn.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
diff --git a/test-files/golden-tests/mem-fn.html b/test-files/golden-tests/mem-fn.html
index f7043f0a6c..93554e3327 100644
--- a/test-files/golden-tests/mem-fn.html
+++ b/test-files/golden-tests/mem-fn.html
@@ -1,4 +1,4 @@
-</html>
+<html>
     <head></head>
     <body>
         <div>
@@ -11,10 +11,150 @@ <h1>Reference</h1>
         <h2>Global namespace</h2>
     </div>
     <div>
-            <div>
-                <h3> Types</h3>
-                    </div>
-    </div>
+        <div>
+            <h3> Types</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">T01</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">T02</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">T03</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">T04</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">T05</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">T06</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">T08</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">T09</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">T10</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">T11</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">T12</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">T13</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">T14</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">T15</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">T16</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">T17</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">U</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">V</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
+                </div>
 </div>
 
 [#[object Object]]
@@ -29,7 +169,13 @@ <h2>Class T01</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><mem-fn.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct T01;
@@ -39,8 +185,29 @@ <h3>Synopsis</h3>
     <div>
             <div>
                 <h3> Member Functions</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                                    </div>
 
 
 </div>
@@ -49,8 +216,7 @@ <h3> Member Functions</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">T01</a>::
-f</h2>
+        <h2>Function T01::f</h2>
         
     </div>
 
@@ -58,7 +224,13 @@ <h2>Function <a href="#">T01</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><mem-fn.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -83,7 +255,13 @@ <h2>Class T02</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><mem-fn.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct T02;
@@ -91,7 +269,31 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-                            </div>
+                <div>
+                <h3> Static Member Functions</h3>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                                </div>
 
 
 </div>
@@ -100,8 +302,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">T02</a>::
-f</h2>
+        <h2>Function T02::f</h2>
         
     </div>
 
@@ -109,7 +310,13 @@ <h2>Function <a href="#">T02</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><mem-fn.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             static
@@ -135,7 +342,13 @@ <h2>Class T03</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><mem-fn.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct T03;
@@ -145,8 +358,29 @@ <h3>Synopsis</h3>
     <div>
             <div>
                 <h3> Member Functions</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                                    </div>
 
 
 </div>
@@ -155,8 +389,7 @@ <h3> Member Functions</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">T03</a>::
-f</h2>
+        <h2>Function T03::f</h2>
         
     </div>
 
@@ -164,7 +397,13 @@ <h2>Function <a href="#">T03</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><mem-fn.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -189,7 +428,13 @@ <h2>Class T04</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><mem-fn.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct T04;
@@ -199,8 +444,29 @@ <h3>Synopsis</h3>
     <div>
             <div>
                 <h3> Member Functions</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                                    </div>
 
 
 </div>
@@ -209,8 +475,7 @@ <h3> Member Functions</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">T04</a>::
-f</h2>
+        <h2>Function T04::f</h2>
         
     </div>
 
@@ -218,7 +483,13 @@ <h2>Function <a href="#">T04</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><mem-fn.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -243,7 +514,13 @@ <h2>Class T05</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><mem-fn.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct T05;
@@ -253,8 +530,29 @@ <h3>Synopsis</h3>
     <div>
             <div>
                 <h3> Member Functions</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                                    </div>
 
 
 </div>
@@ -263,8 +561,7 @@ <h3> Member Functions</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">T05</a>::
-f</h2>
+        <h2>Function T05::f</h2>
         
     </div>
 
@@ -272,7 +569,13 @@ <h2>Function <a href="#">T05</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><mem-fn.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -297,7 +600,13 @@ <h2>Class T06</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><mem-fn.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct T06;
@@ -307,8 +616,29 @@ <h3>Synopsis</h3>
     <div>
             <div>
                 <h3> Member Functions</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                                    </div>
 
 
 </div>
@@ -317,8 +647,7 @@ <h3> Member Functions</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">T06</a>::
-f</h2>
+        <h2>Function T06::f</h2>
         
     </div>
 
@@ -326,7 +655,13 @@ <h2>Function <a href="#">T06</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><mem-fn.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             constexpr
@@ -352,7 +687,13 @@ <h2>Class T08</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><mem-fn.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct T08;
@@ -362,8 +703,29 @@ <h3>Synopsis</h3>
     <div>
             <div>
                 <h3> Member Functions</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                                    </div>
 
 
 </div>
@@ -372,8 +734,7 @@ <h3> Member Functions</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">T08</a>::
-f</h2>
+        <h2>Function T08::f</h2>
         
     </div>
 
@@ -381,7 +742,13 @@ <h2>Function <a href="#">T08</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><mem-fn.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -406,7 +773,13 @@ <h2>Class T09</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><mem-fn.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct T09;
@@ -416,8 +789,29 @@ <h3>Synopsis</h3>
     <div>
             <div>
                 <h3> Member Functions</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                                    </div>
 
 
 </div>
@@ -426,8 +820,7 @@ <h3> Member Functions</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">T09</a>::
-f</h2>
+        <h2>Function T09::f</h2>
         
     </div>
 
@@ -435,7 +828,13 @@ <h2>Function <a href="#">T09</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><mem-fn.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -460,7 +859,13 @@ <h2>Class T10</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><mem-fn.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct T10;
@@ -470,8 +875,29 @@ <h3>Synopsis</h3>
     <div>
             <div>
                 <h3> Member Functions</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                                    </div>
 
 
 </div>
@@ -480,8 +906,7 @@ <h3> Member Functions</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">T10</a>::
-f</h2>
+        <h2>Function T10::f</h2>
         
     </div>
 
@@ -489,7 +914,13 @@ <h2>Function <a href="#">T10</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><mem-fn.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -514,7 +945,13 @@ <h2>Class T11</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><mem-fn.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct T11;
@@ -524,8 +961,29 @@ <h3>Synopsis</h3>
     <div>
             <div>
                 <h3> Member Functions</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                                    </div>
 
 
 </div>
@@ -534,8 +992,7 @@ <h3> Member Functions</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">T11</a>::
-f</h2>
+        <h2>Function T11::f</h2>
         
     </div>
 
@@ -543,7 +1000,13 @@ <h2>Function <a href="#">T11</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><mem-fn.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             int
@@ -568,7 +1031,13 @@ <h2>Class T12</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><mem-fn.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct T12;
@@ -578,8 +1047,29 @@ <h3>Synopsis</h3>
     <div>
             <div>
                 <h3> Member Functions</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                                    </div>
 
 
 </div>
@@ -588,8 +1078,7 @@ <h3> Member Functions</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">T12</a>::
-f</h2>
+        <h2>Function T12::f</h2>
         
     </div>
 
@@ -597,7 +1086,13 @@ <h2>Function <a href="#">T12</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><mem-fn.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -622,7 +1117,13 @@ <h2>Class T13</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><mem-fn.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct T13;
@@ -632,8 +1133,29 @@ <h3>Synopsis</h3>
     <div>
             <div>
                 <h3> Member Functions</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                                    </div>
 
 
 </div>
@@ -642,8 +1164,7 @@ <h3> Member Functions</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">T13</a>::
-f</h2>
+        <h2>Function T13::f</h2>
         
     </div>
 
@@ -651,7 +1172,13 @@ <h2>Function <a href="#">T13</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><mem-fn.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             virtual
@@ -677,7 +1204,13 @@ <h2>Class T14</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><mem-fn.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct T14;
@@ -687,8 +1220,29 @@ <h3>Synopsis</h3>
     <div>
             <div>
                 <h3> Member Functions</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                                    </div>
 
 
 </div>
@@ -697,8 +1251,7 @@ <h3> Member Functions</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">T14</a>::
-f</h2>
+        <h2>Function T14::f</h2>
         
     </div>
 
@@ -706,7 +1259,13 @@ <h2>Function <a href="#">T14</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><mem-fn.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             virtual
@@ -732,7 +1291,13 @@ <h2>Class T15</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><mem-fn.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct T15;
@@ -742,8 +1307,29 @@ <h3>Synopsis</h3>
     <div>
             <div>
                 <h3> Member Functions</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                                    </div>
 
 
 </div>
@@ -752,8 +1338,7 @@ <h3> Member Functions</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">T15</a>::
-f</h2>
+        <h2>Function T15::f</h2>
         
     </div>
 
@@ -761,7 +1346,13 @@ <h2>Function <a href="#">T15</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><mem-fn.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -786,7 +1377,13 @@ <h2>Class T16</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><mem-fn.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct T16;
@@ -794,7 +1391,31 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-                            </div>
+                <div>
+                <h3> Static Member Functions</h3>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                                </div>
 
 
 </div>
@@ -803,8 +1424,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">T16</a>::
-f</h2>
+        <h2>Function T16::f</h2>
         
     </div>
 
@@ -812,7 +1432,13 @@ <h2>Function <a href="#">T16</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><mem-fn.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             static
@@ -838,7 +1464,13 @@ <h2>Class T17</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><mem-fn.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct T17
@@ -849,8 +1481,28 @@ <h3>Synopsis</h3>
     <div>
             <div>
                 <h3> Member Functions</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f</a> 
+                                </td>
+                                <td>
+    </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                                    </div>
 
 
 </div>
@@ -859,8 +1511,7 @@ <h3> Member Functions</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">T17</a>::
-f</h2>
+        <h2>Function T17::f</h2>
         
     </div>
 
@@ -868,7 +1519,13 @@ <h2>Function <a href="#">T17</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><mem-fn.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             virtual
@@ -894,7 +1551,13 @@ <h2>Class U</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><mem-fn.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct U;
@@ -904,8 +1567,60 @@ <h3>Synopsis</h3>
     <div>
             <div>
                 <h3> Member Functions</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f1</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">f3</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+    <div>
+                <h3> Static Member Functions</h3>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f2</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                                </div>
 
 
 </div>
@@ -914,8 +1629,7 @@ <h3> Member Functions</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">U</a>::
-f1</h2>
+        <h2>Function U::f1</h2>
         
     </div>
 
@@ -923,7 +1637,13 @@ <h2>Function <a href="#">U</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><mem-fn.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             constexpr
@@ -941,8 +1661,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">U</a>::
-f2</h2>
+        <h2>Function U::f2</h2>
         
     </div>
 
@@ -950,7 +1669,13 @@ <h2>Function <a href="#">U</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><mem-fn.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             constexpr
@@ -969,8 +1694,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">U</a>::
-f3</h2>
+        <h2>Function U::f3</h2>
         
     </div>
 
@@ -978,7 +1702,13 @@ <h2>Function <a href="#">U</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><mem-fn.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             virtual
@@ -1004,7 +1734,13 @@ <h2>Class V</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><mem-fn.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct V
@@ -1015,8 +1751,59 @@ <h3>Synopsis</h3>
     <div>
             <div>
                 <h3> Member Functions</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f1</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">f3</a> 
+                                </td>
+                                <td>
+    </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+    <div>
+                <h3> Static Member Functions</h3>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f2</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                                </div>
 
 
 </div>
@@ -1025,8 +1812,7 @@ <h3> Member Functions</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">V</a>::
-f3</h2>
+        <h2>Function V::f3</h2>
         
     </div>
 
@@ -1034,7 +1820,13 @@ <h2>Function <a href="#">V</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><mem-fn.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             virtual
diff --git a/test-files/golden-tests/namespace-alias-1.adoc b/test-files/golden-tests/namespace-alias-1.adoc
index 342d01e5e6..5938f3a314 100644
--- a/test-files/golden-tests/namespace-alias-1.adoc
+++ b/test-files/golden-tests/namespace-alias-1.adoc
@@ -28,7 +28,7 @@
 
 === Synopsis
 
-Declared in header `<namespace-alias-1.cpp>`
+Declared in `<namespace-alias-1.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
diff --git a/test-files/golden-tests/namespace-alias-1.html b/test-files/golden-tests/namespace-alias-1.html
index 16be186e09..5fa3d65676 100644
--- a/test-files/golden-tests/namespace-alias-1.html
+++ b/test-files/golden-tests/namespace-alias-1.html
@@ -1,4 +1,4 @@
-</html>
+<html>
     <head></head>
     <body>
         <div>
@@ -11,13 +11,31 @@ <h1>Reference</h1>
         <h2>Global namespace</h2>
     </div>
     <div>
-            <div>
-                <h3> Namespaces</h3>
-                    </div>
-    <div>
-                <h3> Aliases</h3>
-                    </div>
-    </div>
+        <div>
+            <h3>Namespaces</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">LongName</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
+                </div>
 </div>
 
 [#[object Object]]
@@ -27,7 +45,7 @@ <h3> Aliases</h3>
         <h2>Namespace LongName</h2>
     </div>
     <div>
-            </div>
+                        </div>
 </div>
 
 [#[object Object]]
@@ -41,7 +59,13 @@ <h2>A</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><namespace-alias-1.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             namespace A = LongName
diff --git a/test-files/golden-tests/namespace-alias-2.adoc b/test-files/golden-tests/namespace-alias-2.adoc
index 1bfecd0030..fbc87b58ab 100644
--- a/test-files/golden-tests/namespace-alias-2.adoc
+++ b/test-files/golden-tests/namespace-alias-2.adoc
@@ -28,7 +28,7 @@
 
 === Synopsis
 
-Declared in header `<namespace-alias-2.cpp>`
+Declared in `<namespace-alias-2.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -45,7 +45,7 @@ namespace A = xref:LongName.adoc[LongName];
 
 === Synopsis
 
-Declared in header `<namespace-alias-2.cpp>`
+Declared in `<namespace-alias-2.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
diff --git a/test-files/golden-tests/namespace-alias-2.html b/test-files/golden-tests/namespace-alias-2.html
index bb0d4df027..5f9ba2bb75 100644
--- a/test-files/golden-tests/namespace-alias-2.html
+++ b/test-files/golden-tests/namespace-alias-2.html
@@ -1,4 +1,4 @@
-</html>
+<html>
     <head></head>
     <body>
         <div>
@@ -11,13 +11,31 @@ <h1>Reference</h1>
         <h2>Global namespace</h2>
     </div>
     <div>
-            <div>
-                <h3> Namespaces</h3>
-                    </div>
-    <div>
-                <h3> Aliases</h3>
-                    </div>
-    </div>
+        <div>
+            <h3>Namespaces</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">LongName</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
+                </div>
 </div>
 
 [#[object Object]]
@@ -27,7 +45,7 @@ <h3> Aliases</h3>
         <h2>Namespace LongName</h2>
     </div>
     <div>
-            </div>
+                        </div>
 </div>
 
 [#[object Object]]
@@ -41,7 +59,13 @@ <h2>A</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><namespace-alias-2.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             namespace A = LongName
@@ -61,7 +85,13 @@ <h2>B</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><namespace-alias-2.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             namespace B = LongName
diff --git a/test-files/golden-tests/namespace-alias-3.adoc b/test-files/golden-tests/namespace-alias-3.adoc
index db9502e474..211e34b146 100644
--- a/test-files/golden-tests/namespace-alias-3.adoc
+++ b/test-files/golden-tests/namespace-alias-3.adoc
@@ -28,7 +28,7 @@
 
 === Synopsis
 
-Declared in header `<namespace-alias-3.cpp>`
+Declared in `<namespace-alias-3.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -45,7 +45,7 @@ namespace A = xref:LongName.adoc[LongName];
 
 === Synopsis
 
-Declared in header `<namespace-alias-3.cpp>`
+Declared in `<namespace-alias-3.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
diff --git a/test-files/golden-tests/namespace-alias-3.html b/test-files/golden-tests/namespace-alias-3.html
index 8b214b9a22..08c84fc0af 100644
--- a/test-files/golden-tests/namespace-alias-3.html
+++ b/test-files/golden-tests/namespace-alias-3.html
@@ -1,4 +1,4 @@
-</html>
+<html>
     <head></head>
     <body>
         <div>
@@ -11,13 +11,31 @@ <h1>Reference</h1>
         <h2>Global namespace</h2>
     </div>
     <div>
-            <div>
-                <h3> Namespaces</h3>
-                    </div>
-    <div>
-                <h3> Aliases</h3>
-                    </div>
-    </div>
+        <div>
+            <h3>Namespaces</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">LongName</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
+                </div>
 </div>
 
 [#[object Object]]
@@ -27,7 +45,7 @@ <h3> Aliases</h3>
         <h2>Namespace LongName</h2>
     </div>
     <div>
-            </div>
+                        </div>
 </div>
 
 [#[object Object]]
@@ -41,7 +59,13 @@ <h2>A</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><namespace-alias-3.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             namespace A = LongName
@@ -61,7 +85,13 @@ <h2>B</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><namespace-alias-3.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             namespace B = A
diff --git a/test-files/golden-tests/namespace.adoc b/test-files/golden-tests/namespace.adoc
index 8bdd25c07a..01c106e4c7 100644
--- a/test-files/golden-tests/namespace.adoc
+++ b/test-files/golden-tests/namespace.adoc
@@ -52,7 +52,7 @@
 
 === Synopsis
 
-Declared in header `<namespace.cpp>`
+Declared in `<namespace.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -89,7 +89,7 @@ f0();
 
 === Synopsis
 
-Declared in header `<namespace.cpp>`
+Declared in `<namespace.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -126,7 +126,7 @@ f1();
 
 === Synopsis
 
-Declared in header `<namespace.cpp>`
+Declared in `<namespace.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -163,7 +163,7 @@ f2();
 
 === Synopsis
 
-Declared in header `<namespace.cpp>`
+Declared in `<namespace.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -211,7 +211,7 @@ f3();
 
 === Synopsis
 
-Declared in header `<namespace.cpp>`
+Declared in `<namespace.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -248,7 +248,7 @@ f5();
 
 === Synopsis
 
-Declared in header `<namespace.cpp>`
+Declared in `<namespace.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -285,7 +285,7 @@ f6();
 
 === Synopsis
 
-Declared in header `<namespace.cpp>`
+Declared in `<namespace.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -322,7 +322,7 @@ f7();
 
 === Synopsis
 
-Declared in header `<namespace.cpp>`
+Declared in `<namespace.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -368,7 +368,7 @@ f8();
 
 === Synopsis
 
-Declared in header `<namespace.cpp>`
+Declared in `<namespace.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -405,7 +405,7 @@ f10();
 
 === Synopsis
 
-Declared in header `<namespace.cpp>`
+Declared in `<namespace.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -442,7 +442,7 @@ f11();
 
 === Synopsis
 
-Declared in header `<namespace.cpp>`
+Declared in `<namespace.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -492,7 +492,7 @@ f12();
 
 === Synopsis
 
-Declared in header `<namespace.cpp>`
+Declared in `<namespace.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
diff --git a/test-files/golden-tests/namespace.html b/test-files/golden-tests/namespace.html
index 30b798c38b..f3405aabb0 100644
--- a/test-files/golden-tests/namespace.html
+++ b/test-files/golden-tests/namespace.html
@@ -1,4 +1,4 @@
-</html>
+<html>
     <head></head>
     <body>
         <div>
@@ -11,10 +11,52 @@ <h1>Reference</h1>
         <h2>Global namespace</h2>
     </div>
     <div>
-            <div>
-                <h3> Namespaces</h3>
-                    </div>
-    </div>
+        <div>
+            <h3>Namespaces</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href=""></a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">A</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">D</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">I</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
+                </div>
 </div>
 
 [#[object Object]]
@@ -24,13 +66,69 @@ <h3> Namespaces</h3>
         <h2>Namespace A</h2>
     </div>
     <div>
-            <div>
-                <h3> Namespaces</h3>
-                    </div>
+        <div>
+            <h3>Namespaces</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href=""></a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">B</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">C</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
     <div>
-                <h3> Member Functions</h3>
-                    </div>
-    </div>
+                <h3>Functions</h3>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f0</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+            </div>
 </div>
 
 [#[object Object]]
@@ -45,7 +143,13 @@ <h2>Function f0</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><namespace.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -66,9 +170,30 @@ <h2>Namespace B</h2>
     </div>
     <div>
             <div>
-                <h3> Member Functions</h3>
-                    </div>
-    </div>
+                <h3>Functions</h3>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f1</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+            </div>
 </div>
 
 [#[object Object]]
@@ -83,7 +208,13 @@ <h2>Function f1</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><namespace.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -104,9 +235,30 @@ <h2>Namespace C</h2>
     </div>
     <div>
             <div>
-                <h3> Member Functions</h3>
-                    </div>
-    </div>
+                <h3>Functions</h3>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f2</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+            </div>
 </div>
 
 [#[object Object]]
@@ -121,7 +273,13 @@ <h2>Function f2</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><namespace.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -142,9 +300,30 @@ <h2>Unnamed namespace</h2>
     </div>
     <div>
             <div>
-                <h3> Member Functions</h3>
-                    </div>
-    </div>
+                <h3>Functions</h3>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f3</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+            </div>
 </div>
 
 [#[object Object]]
@@ -159,7 +338,13 @@ <h2>Function f3</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><namespace.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -179,13 +364,69 @@ <h3>Synopsis</h3>
         <h2>Namespace D</h2>
     </div>
     <div>
-            <div>
-                <h3> Namespaces</h3>
-                    </div>
+        <div>
+            <h3>Namespaces</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href=""></a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">E</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">F</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
     <div>
-                <h3> Member Functions</h3>
-                    </div>
-    </div>
+                <h3>Functions</h3>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f5</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+            </div>
 </div>
 
 [#[object Object]]
@@ -200,7 +441,13 @@ <h2>Function f5</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><namespace.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -221,9 +468,30 @@ <h2>Namespace E</h2>
     </div>
     <div>
             <div>
-                <h3> Member Functions</h3>
-                    </div>
-    </div>
+                <h3>Functions</h3>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f6</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+            </div>
 </div>
 
 [#[object Object]]
@@ -238,7 +506,13 @@ <h2>Function f6</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><namespace.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -259,9 +533,30 @@ <h2>Namespace F</h2>
     </div>
     <div>
             <div>
-                <h3> Member Functions</h3>
-                    </div>
-    </div>
+                <h3>Functions</h3>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f7</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+            </div>
 </div>
 
 [#[object Object]]
@@ -276,7 +571,13 @@ <h2>Function f7</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><namespace.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -297,9 +598,30 @@ <h2>Unnamed namespace</h2>
     </div>
     <div>
             <div>
-                <h3> Member Functions</h3>
-                    </div>
-    </div>
+                <h3>Functions</h3>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f8</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+            </div>
 </div>
 
 [#[object Object]]
@@ -314,7 +636,13 @@ <h2>Function f8</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><namespace.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -334,13 +662,62 @@ <h3>Synopsis</h3>
         <h2>Unnamed namespace</h2>
     </div>
     <div>
-            <div>
-                <h3> Namespaces</h3>
-                    </div>
+        <div>
+            <h3>Namespaces</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">G</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">H</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
     <div>
-                <h3> Member Functions</h3>
-                    </div>
-    </div>
+                <h3>Functions</h3>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f10</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+            </div>
 </div>
 
 [#[object Object]]
@@ -355,7 +732,13 @@ <h2>Function f10</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><namespace.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -376,9 +759,30 @@ <h2>Namespace G</h2>
     </div>
     <div>
             <div>
-                <h3> Member Functions</h3>
-                    </div>
-    </div>
+                <h3>Functions</h3>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f11</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+            </div>
 </div>
 
 [#[object Object]]
@@ -393,7 +797,13 @@ <h2>Function f11</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><namespace.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -414,9 +824,30 @@ <h2>Namespace H</h2>
     </div>
     <div>
             <div>
-                <h3> Member Functions</h3>
-                    </div>
-    </div>
+                <h3>Functions</h3>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f12</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+            </div>
 </div>
 
 [#[object Object]]
@@ -431,7 +862,13 @@ <h2>Function f12</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><namespace.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -451,10 +888,31 @@ <h3>Synopsis</h3>
         <h2>Namespace I</h2>
     </div>
     <div>
-            <div>
-                <h3> Namespaces</h3>
-                    </div>
-    </div>
+        <div>
+            <h3>Namespaces</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href=""></a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
+                </div>
 </div>
 
 [#[object Object]]
@@ -465,9 +923,30 @@ <h2>Unnamed namespace</h2>
     </div>
     <div>
             <div>
-                <h3> Member Functions</h3>
-                    </div>
-    </div>
+                <h3>Functions</h3>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f14</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+            </div>
 </div>
 
 [#[object Object]]
@@ -482,7 +961,13 @@ <h2>Function f14</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><namespace.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
diff --git a/test-files/golden-tests/nested-private-template.adoc b/test-files/golden-tests/nested-private-template.adoc
index b8e5dcb3f7..83e386cf9a 100644
--- a/test-files/golden-tests/nested-private-template.adoc
+++ b/test-files/golden-tests/nested-private-template.adoc
@@ -22,7 +22,7 @@
 
 === Synopsis
 
-Declared in header `<nested-private-template.cpp>`
+Declared in `<nested-private-template.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -51,7 +51,7 @@ class range;
 
 === Synopsis
 
-Declared in header `<nested-private-template.cpp>`
+Declared in `<nested-private-template.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -73,7 +73,7 @@ struct impl;
 
 === Synopsis
 
-Declared in header `<nested-private-template.cpp>`
+Declared in `<nested-private-template.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
diff --git a/test-files/golden-tests/nested-private-template.html b/test-files/golden-tests/nested-private-template.html
index 1f0c205fed..7725ab046f 100644
--- a/test-files/golden-tests/nested-private-template.html
+++ b/test-files/golden-tests/nested-private-template.html
@@ -1,4 +1,4 @@
-</html>
+<html>
     <head></head>
     <body>
         <div>
@@ -11,10 +11,31 @@ <h1>Reference</h1>
         <h2>Global namespace</h2>
     </div>
     <div>
-            <div>
-                <h3> Types</h3>
-                    </div>
-    </div>
+        <div>
+            <h3> Types</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">range</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
+                </div>
 </div>
 
 [#[object Object]]
@@ -29,7 +50,13 @@ <h2>Class range</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><nested-private-template.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<class T>
@@ -38,10 +65,38 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-                            <div>
-                <h3>Private Types</h3>
-                    </div>
-    </div>
+                                                                                <div>
+            <h3>Private Types</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">impl</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">impl<R, false></a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
+                                </div>
 
 
 </div>
@@ -50,8 +105,7 @@ <h3>Private Types</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Class <a href="#">range</a>::
-impl</h2>
+        <h2>Class range::impl</h2>
         
     </div>
 
@@ -59,7 +113,13 @@ <h2>Class <a href="#">range</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><nested-private-template.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<
@@ -70,7 +130,7 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-                            </div>
+                                                                                                                </div>
 
 
 </div>
@@ -79,8 +139,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Class <a href="#">range</a>::
-impl</h2>
+        <h2>Class range::impl</h2>
         
     </div>
 
@@ -88,7 +147,13 @@ <h2>Class <a href="#">range</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><nested-private-template.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<class R>
@@ -97,7 +162,7 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-                            </div>
+                                                                                                                </div>
 
 
 </div>
diff --git a/test-files/golden-tests/no_unique_address.adoc b/test-files/golden-tests/no_unique_address.adoc
index 7cee4e8976..e42611bd65 100644
--- a/test-files/golden-tests/no_unique_address.adoc
+++ b/test-files/golden-tests/no_unique_address.adoc
@@ -24,7 +24,7 @@
 
 === Synopsis
 
-Declared in header `<no_unique_address.cpp>`
+Declared in `<no_unique_address.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -43,7 +43,7 @@ struct Empty;
 
 === Synopsis
 
-Declared in header `<no_unique_address.cpp>`
+Declared in `<no_unique_address.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -71,7 +71,7 @@ struct T;
 
 === Synopsis
 
-Declared in header `<no_unique_address.cpp>`
+Declared in `<no_unique_address.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -88,7 +88,7 @@ int i;
 
 === Synopsis
 
-Declared in header `<no_unique_address.cpp>`
+Declared in `<no_unique_address.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
diff --git a/test-files/golden-tests/no_unique_address.html b/test-files/golden-tests/no_unique_address.html
index 0cfc422b6f..28c423334c 100644
--- a/test-files/golden-tests/no_unique_address.html
+++ b/test-files/golden-tests/no_unique_address.html
@@ -1,4 +1,4 @@
-</html>
+<html>
     <head></head>
     <body>
         <div>
@@ -11,10 +11,38 @@ <h1>Reference</h1>
         <h2>Global namespace</h2>
     </div>
     <div>
-            <div>
-                <h3> Types</h3>
-                    </div>
-    </div>
+        <div>
+            <h3> Types</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">Empty</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">T</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
+                </div>
 </div>
 
 [#[object Object]]
@@ -29,7 +57,13 @@ <h2>Class Empty</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><no_unique_address.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct Empty;
@@ -37,7 +71,7 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-                            </div>
+                                                                                                                </div>
 
 
 </div>
@@ -54,7 +88,13 @@ <h2>Class T</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><no_unique_address.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct T;
@@ -62,10 +102,38 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-            <div>
+                    <div>
                 <h3> Data Members</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">e</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">i</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                            </div>
 
 
 </div>
@@ -74,8 +142,7 @@ <h3> Data Members</h3>
 
 <div id="[object Object]">
     <div>
-        <h2><a href="#">T</a>::
-i</h2>
+        <h2>T::i</h2>
         
     </div>
 
@@ -83,7 +150,13 @@ <h2><a href="#">T</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><no_unique_address.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             int i;
@@ -96,8 +169,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2><a href="#">T</a>::
-e</h2>
+        <h2>T::e</h2>
         
     </div>
 
@@ -105,7 +177,13 @@ <h2><a href="#">T</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><no_unique_address.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             Empty e = Empty{};
diff --git a/test-files/golden-tests/noreturn.adoc b/test-files/golden-tests/noreturn.adoc
index 485ce935fc..086f9bff60 100644
--- a/test-files/golden-tests/noreturn.adoc
+++ b/test-files/golden-tests/noreturn.adoc
@@ -29,7 +29,7 @@
 
 === Synopsis
 
-Declared in header `<noreturn.cpp>`
+Declared in `<noreturn.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -53,7 +53,7 @@ f1();
 
 === Synopsis
 
-Declared in header `<noreturn.cpp>`
+Declared in `<noreturn.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -93,7 +93,7 @@ struct T;
 
 === Synopsis
 
-Declared in header `<noreturn.cpp>`
+Declared in `<noreturn.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -118,7 +118,7 @@ f2();
 
 === Synopsis
 
-Declared in header `<noreturn.cpp>`
+Declared in `<noreturn.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -142,7 +142,7 @@ f3();
 
 === Synopsis
 
-Declared in header `<noreturn.cpp>`
+Declared in `<noreturn.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
diff --git a/test-files/golden-tests/noreturn.html b/test-files/golden-tests/noreturn.html
index 0bc649b732..0099fd1445 100644
--- a/test-files/golden-tests/noreturn.html
+++ b/test-files/golden-tests/noreturn.html
@@ -1,4 +1,4 @@
-</html>
+<html>
     <head></head>
     <body>
         <div>
@@ -11,13 +11,55 @@ <h1>Reference</h1>
         <h2>Global namespace</h2>
     </div>
     <div>
-            <div>
-                <h3> Types</h3>
-                    </div>
+        <div>
+            <h3> Types</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">T</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
     <div>
-                <h3> Member Functions</h3>
-                    </div>
-    </div>
+                <h3>Functions</h3>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f1</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+            </div>
 </div>
 
 [#[object Object]]
@@ -32,7 +74,13 @@ <h2>Function f1</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><noreturn.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -57,7 +105,13 @@ <h2>Class T</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><noreturn.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct T;
@@ -67,11 +121,77 @@ <h3>Synopsis</h3>
     <div>
             <div>
                 <h3> Member Functions</h3>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f3</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
     <div>
+                <h3> Static Member Functions</h3>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f2</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+            <div>
                 <h3> Friends</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f1</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                    </div>
 
 
 </div>
@@ -80,8 +200,7 @@ <h3> Friends</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">T</a>::
-f2</h2>
+        <h2>Function T::f2</h2>
         
     </div>
 
@@ -89,7 +208,13 @@ <h2>Function <a href="#">T</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><noreturn.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             static
@@ -107,8 +232,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">T</a>::
-f3</h2>
+        <h2>Function T::f3</h2>
         
     </div>
 
@@ -116,7 +240,13 @@ <h2>Function <a href="#">T</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><noreturn.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -141,7 +271,13 @@ <h2>Friend f1</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><noreturn.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             friend
diff --git a/test-files/golden-tests/ns-variables.adoc b/test-files/golden-tests/ns-variables.adoc
index a76cd3d89b..88599d4cb2 100644
--- a/test-files/golden-tests/ns-variables.adoc
+++ b/test-files/golden-tests/ns-variables.adoc
@@ -45,7 +45,7 @@
 
 === Synopsis
 
-Declared in header `<ns-variables.cpp>`
+Declared in `<ns-variables.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -63,7 +63,7 @@ int const i = 0;
 
 === Synopsis
 
-Declared in header `<ns-variables.cpp>`
+Declared in `<ns-variables.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -80,7 +80,7 @@ int j = 0;
 
 === Synopsis
 
-Declared in header `<ns-variables.cpp>`
+Declared in `<ns-variables.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -99,7 +99,7 @@ int const k = 1;
 
 === Synopsis
 
-Declared in header `<ns-variables.cpp>`
+Declared in `<ns-variables.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -117,7 +117,7 @@ int l = 1;
 
 === Synopsis
 
-Declared in header `<ns-variables.cpp>`
+Declared in `<ns-variables.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -134,7 +134,7 @@ double pi = 3.14;
 
 === Synopsis
 
-Declared in header `<ns-variables.cpp>`
+Declared in `<ns-variables.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -153,7 +153,7 @@ struct T;
 
 === Synopsis
 
-Declared in header `<ns-variables.cpp>`
+Declared in `<ns-variables.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -171,7 +171,7 @@ xref:T.adoc[T] t;
 
 === Synopsis
 
-Declared in header `<ns-variables.cpp>`
+Declared in `<ns-variables.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -189,7 +189,7 @@ int x0 = 0;
 
 === Synopsis
 
-Declared in header `<ns-variables.cpp>`
+Declared in `<ns-variables.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -208,7 +208,7 @@ int x1 = 0;
 
 === Synopsis
 
-Declared in header `<ns-variables.cpp>`
+Declared in `<ns-variables.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
diff --git a/test-files/golden-tests/ns-variables.html b/test-files/golden-tests/ns-variables.html
index b84f011ad8..1b3785de0b 100644
--- a/test-files/golden-tests/ns-variables.html
+++ b/test-files/golden-tests/ns-variables.html
@@ -1,4 +1,4 @@
-</html>
+<html>
     <head></head>
     <body>
         <div>
@@ -11,13 +11,111 @@ <h1>Reference</h1>
         <h2>Global namespace</h2>
     </div>
     <div>
-            <div>
-                <h3> Types</h3>
-                    </div>
-    <div>
-                <h3> Variables</h3>
-                    </div>
-    </div>
+        <div>
+            <h3> Types</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">T</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
+        <div>
+                <h3>Variables</h3>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">i</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">j</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">k</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">l</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">pi</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">t</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">x0</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">x1</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">x2</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+        </div>
 </div>
 
 [#[object Object]]
@@ -32,7 +130,13 @@ <h2>i</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><ns-variables.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             constexpr
@@ -54,7 +158,13 @@ <h2>j</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><ns-variables.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             int j = 0;
@@ -75,7 +185,13 @@ <h2>k</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><ns-variables.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             constexpr
@@ -98,7 +214,13 @@ <h2>l</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><ns-variables.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             extern
@@ -120,7 +242,13 @@ <h2>pi</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><ns-variables.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             double pi = 3.14;
@@ -141,7 +269,13 @@ <h2>Class T</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><ns-variables.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct T;
@@ -149,7 +283,7 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-                            </div>
+                                                                                                                </div>
 
 
 </div>
@@ -166,7 +300,13 @@ <h2>t</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><ns-variables.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             extern
@@ -188,7 +328,13 @@ <h2>x0</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><ns-variables.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             thread_local
@@ -210,7 +356,13 @@ <h2>x1</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><ns-variables.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             static
@@ -233,7 +385,13 @@ <h2>x2</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><ns-variables.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             constexpr
diff --git a/test-files/golden-tests/out-of-line-record-def.adoc b/test-files/golden-tests/out-of-line-record-def.adoc
index 56aef250ad..29669863ff 100644
--- a/test-files/golden-tests/out-of-line-record-def.adoc
+++ b/test-files/golden-tests/out-of-line-record-def.adoc
@@ -35,7 +35,7 @@
 
 === Synopsis
 
-Declared in header `<out-of-line-record-def.cpp>`
+Declared in `<out-of-line-record-def.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
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 0374113b58..f71a0c9a57 100644
--- a/test-files/golden-tests/out-of-line-record-def.html
+++ b/test-files/golden-tests/out-of-line-record-def.html
@@ -1,4 +1,4 @@
-</html>
+<html>
     <head></head>
     <body>
         <div>
@@ -11,10 +11,31 @@ <h1>Reference</h1>
         <h2>Global namespace</h2>
     </div>
     <div>
-            <div>
-                <h3> Namespaces</h3>
-                    </div>
-    </div>
+        <div>
+            <h3>Namespaces</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">N</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
+                </div>
 </div>
 
 [#[object Object]]
@@ -24,10 +45,31 @@ <h3> Namespaces</h3>
         <h2>Namespace N</h2>
     </div>
     <div>
-            <div>
-                <h3> Types</h3>
-                    </div>
-    </div>
+        <div>
+            <h3> Types</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">S</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
+                </div>
 </div>
 
 [#[object Object]]
@@ -42,7 +84,13 @@ <h2>Class S</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><out-of-line-record-def.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct S;
@@ -50,7 +98,7 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-                            </div>
+                                                                                                                </div>
 
 
 </div>
diff --git a/test-files/golden-tests/overloaded-op-1.adoc b/test-files/golden-tests/overloaded-op-1.adoc
index ba313bc956..3feb6910e3 100644
--- a/test-files/golden-tests/overloaded-op-1.adoc
+++ b/test-files/golden-tests/overloaded-op-1.adoc
@@ -22,7 +22,7 @@
 
 === Synopsis
 
-Declared in header `<overloaded-op-1.cpp>`
+Declared in `<overloaded-op-1.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -48,7 +48,7 @@ struct T;
 
 === Synopsis
 
-Declared in header `<overloaded-op-1.cpp>`
+Declared in `<overloaded-op-1.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
diff --git a/test-files/golden-tests/overloaded-op-1.html b/test-files/golden-tests/overloaded-op-1.html
index f11a391c7c..8eb0e00fcc 100644
--- a/test-files/golden-tests/overloaded-op-1.html
+++ b/test-files/golden-tests/overloaded-op-1.html
@@ -1,4 +1,4 @@
-</html>
+<html>
     <head></head>
     <body>
         <div>
@@ -11,10 +11,31 @@ <h1>Reference</h1>
         <h2>Global namespace</h2>
     </div>
     <div>
-            <div>
-                <h3> Types</h3>
-                    </div>
-    </div>
+        <div>
+            <h3> Types</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">T</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
+                </div>
 </div>
 
 [#[object Object]]
@@ -29,7 +50,13 @@ <h2>Class T</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><overloaded-op-1.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct T;
@@ -39,8 +66,29 @@ <h3>Synopsis</h3>
     <div>
             <div>
                 <h3> Member Functions</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">operator+</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                                    </div>
 
 
 </div>
@@ -49,8 +97,7 @@ <h3> Member Functions</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">T</a>::
-operator+</h2>
+        <h2>Function T::operator+</h2>
         
     </div>
 
@@ -58,7 +105,13 @@ <h2>Function <a href="#">T</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><overloaded-op-1.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             T
diff --git a/test-files/golden-tests/overloaded-op-2.adoc b/test-files/golden-tests/overloaded-op-2.adoc
index 220e93b064..eadf357947 100644
--- a/test-files/golden-tests/overloaded-op-2.adoc
+++ b/test-files/golden-tests/overloaded-op-2.adoc
@@ -22,7 +22,7 @@
 
 === Synopsis
 
-Declared in header `<overloaded-op-2.cpp>`
+Declared in `<overloaded-op-2.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -48,7 +48,7 @@ struct T;
 
 === Synopsis
 
-Declared in header `<overloaded-op-2.cpp>`
+Declared in `<overloaded-op-2.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
diff --git a/test-files/golden-tests/overloaded-op-2.html b/test-files/golden-tests/overloaded-op-2.html
index 1bc80f289a..717c9872db 100644
--- a/test-files/golden-tests/overloaded-op-2.html
+++ b/test-files/golden-tests/overloaded-op-2.html
@@ -1,4 +1,4 @@
-</html>
+<html>
     <head></head>
     <body>
         <div>
@@ -11,10 +11,31 @@ <h1>Reference</h1>
         <h2>Global namespace</h2>
     </div>
     <div>
-            <div>
-                <h3> Types</h3>
-                    </div>
-    </div>
+        <div>
+            <h3> Types</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">T</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
+                </div>
 </div>
 
 [#[object Object]]
@@ -29,7 +50,13 @@ <h2>Class T</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><overloaded-op-2.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct T;
@@ -39,8 +66,29 @@ <h3>Synopsis</h3>
     <div>
             <div>
                 <h3> Member Functions</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">operator+</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                                    </div>
 
 
 </div>
@@ -49,8 +97,7 @@ <h3> Member Functions</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">T</a>::
-operator+</h2>
+        <h2>Function T::operator+</h2>
         
     </div>
 
@@ -58,7 +105,13 @@ <h2>Function <a href="#">T</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><overloaded-op-2.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             T
diff --git a/test-files/golden-tests/para-1.adoc b/test-files/golden-tests/para-1.adoc
index afe59cb805..d326ce867c 100644
--- a/test-files/golden-tests/para-1.adoc
+++ b/test-files/golden-tests/para-1.adoc
@@ -30,7 +30,7 @@ brief
 
 === Synopsis
 
-Declared in header `<para-1.cpp>`
+Declared in `<para-1.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -54,7 +54,7 @@ f1();
 
 === Synopsis
 
-Declared in header `<para-1.cpp>`
+Declared in `<para-1.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -78,7 +78,7 @@ f2();
 
 === Synopsis
 
-Declared in header `<para-1.cpp>`
+Declared in `<para-1.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -104,7 +104,7 @@ brief
 
 === Synopsis
 
-Declared in header `<para-1.cpp>`
+Declared in `<para-1.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
diff --git a/test-files/golden-tests/para-1.html b/test-files/golden-tests/para-1.html
index 317c8bd2aa..eecfc028ec 100644
--- a/test-files/golden-tests/para-1.html
+++ b/test-files/golden-tests/para-1.html
@@ -1,4 +1,4 @@
-</html>
+<html>
     <head></head>
     <body>
         <div>
@@ -12,9 +12,53 @@ <h2>Global namespace</h2>
     </div>
     <div>
             <div>
-                <h3> Member Functions</h3>
-                    </div>
-    </div>
+                <h3>Functions</h3>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f1</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">f2</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">f3</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">f4</a> 
+                                </td>
+                                <td>
+<p><span>brief</span></p>
+                            
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+            </div>
 </div>
 
 [#[object Object]]
@@ -29,7 +73,13 @@ <h2>Function f1</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><para-1.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -54,7 +104,13 @@ <h2>Function f2</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><para-1.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -79,7 +135,13 @@ <h2>Function f3</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><para-1.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -106,7 +168,13 @@ <h2>Function f4</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><para-1.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
diff --git a/test-files/golden-tests/para-2.adoc b/test-files/golden-tests/para-2.adoc
index 5bde4744ba..ab36a43c78 100644
--- a/test-files/golden-tests/para-2.adoc
+++ b/test-files/golden-tests/para-2.adoc
@@ -26,7 +26,7 @@ brief
 
 === Synopsis
 
-Declared in header `<para-2.cpp>`
+Declared in `<para-2.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
diff --git a/test-files/golden-tests/para-2.html b/test-files/golden-tests/para-2.html
index a13de0f641..4f17d7a201 100644
--- a/test-files/golden-tests/para-2.html
+++ b/test-files/golden-tests/para-2.html
@@ -1,4 +1,4 @@
-</html>
+<html>
     <head></head>
     <body>
         <div>
@@ -12,9 +12,32 @@ <h2>Global namespace</h2>
     </div>
     <div>
             <div>
-                <h3> Member Functions</h3>
-                    </div>
-    </div>
+                <h3>Functions</h3>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f1</a> 
+                                </td>
+                                <td>
+<p><span>brief</span></p>
+                            
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+            </div>
 </div>
 
 [#[object Object]]
@@ -31,7 +54,13 @@ <h2>Function f1</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><para-2.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
diff --git a/test-files/golden-tests/param-direction.adoc b/test-files/golden-tests/param-direction.adoc
index 2bbdfc1ae0..2ea829f4dc 100644
--- a/test-files/golden-tests/param-direction.adoc
+++ b/test-files/golden-tests/param-direction.adoc
@@ -40,7 +40,7 @@
 
 === Synopsis
 
-Declared in header `<param-direction.cpp>`
+Declared in `<param-direction.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -73,7 +73,7 @@ f(int x0);
 
 === Synopsis
 
-Declared in header `<param-direction.cpp>`
+Declared in `<param-direction.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -110,7 +110,7 @@ g(
 
 === Synopsis
 
-Declared in header `<param-direction.cpp>`
+Declared in `<param-direction.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -147,7 +147,7 @@ h(
 
 === Synopsis
 
-Declared in header `<param-direction.cpp>`
+Declared in `<param-direction.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -184,7 +184,7 @@ i(
 
 === Synopsis
 
-Declared in header `<param-direction.cpp>`
+Declared in `<param-direction.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -221,7 +221,7 @@ j(
 
 === Synopsis
 
-Declared in header `<param-direction.cpp>`
+Declared in `<param-direction.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -261,7 +261,7 @@ k(
 
 === Synopsis
 
-Declared in header `<param-direction.cpp>`
+Declared in `<param-direction.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -302,7 +302,7 @@ l(
 
 === Synopsis
 
-Declared in header `<param-direction.cpp>`
+Declared in `<param-direction.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -339,7 +339,7 @@ m(
 
 === Synopsis
 
-Declared in header `<param-direction.cpp>`
+Declared in `<param-direction.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -372,7 +372,7 @@ n(int x8);
 
 === Synopsis
 
-Declared in header `<param-direction.cpp>`
+Declared in `<param-direction.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
diff --git a/test-files/golden-tests/param-direction.html b/test-files/golden-tests/param-direction.html
index 4248fb1a15..eeb8da9ab3 100644
--- a/test-files/golden-tests/param-direction.html
+++ b/test-files/golden-tests/param-direction.html
@@ -1,4 +1,4 @@
-</html>
+<html>
     <head></head>
     <body>
         <div>
@@ -12,9 +12,93 @@ <h2>Global namespace</h2>
     </div>
     <div>
             <div>
-                <h3> Member Functions</h3>
-                    </div>
-    </div>
+                <h3>Functions</h3>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">g</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">h</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">i</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">j</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">k</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">l</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">m</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">n</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">o</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+            </div>
 </div>
 
 [#[object Object]]
@@ -29,7 +113,13 @@ <h2>Function f</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><param-direction.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -54,7 +144,13 @@ <h2>Function g</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><param-direction.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -81,7 +177,13 @@ <h2>Function h</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><param-direction.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -108,7 +210,13 @@ <h2>Function i</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><param-direction.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -135,7 +243,13 @@ <h2>Function j</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><param-direction.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -162,7 +276,13 @@ <h2>Function k</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><param-direction.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -190,7 +310,13 @@ <h2>Function l</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><param-direction.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -219,7 +345,13 @@ <h2>Function m</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><param-direction.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -246,7 +378,13 @@ <h2>Function n</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><param-direction.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -271,7 +409,13 @@ <h2>Function o</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><param-direction.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
diff --git a/test-files/golden-tests/param.adoc b/test-files/golden-tests/param.adoc
index 896ca5d0d9..c15947879e 100644
--- a/test-files/golden-tests/param.adoc
+++ b/test-files/golden-tests/param.adoc
@@ -28,7 +28,7 @@
 
 === Synopsis
 
-Declared in header `<param.cpp>`
+Declared in `<param.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -61,7 +61,7 @@ f(int x);
 
 === Synopsis
 
-Declared in header `<param.cpp>`
+Declared in `<param.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -98,7 +98,7 @@ g(
 
 === Synopsis
 
-Declared in header `<param.cpp>`
+Declared in `<param.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -138,7 +138,7 @@ h(
 
 === Synopsis
 
-Declared in header `<param.cpp>`
+Declared in `<param.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
diff --git a/test-files/golden-tests/param.html b/test-files/golden-tests/param.html
index f2b4281457..cfde8949f3 100644
--- a/test-files/golden-tests/param.html
+++ b/test-files/golden-tests/param.html
@@ -1,4 +1,4 @@
-</html>
+<html>
     <head></head>
     <body>
         <div>
@@ -12,9 +12,51 @@ <h2>Global namespace</h2>
     </div>
     <div>
             <div>
-                <h3> Member Functions</h3>
-                    </div>
-    </div>
+                <h3>Functions</h3>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">g</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">h</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">i</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+            </div>
 </div>
 
 [#[object Object]]
@@ -29,7 +71,13 @@ <h2>Function f</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><param.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -54,7 +102,13 @@ <h2>Function g</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><param.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -81,7 +135,13 @@ <h2>Function h</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><param.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -109,7 +169,13 @@ <h2>Function i</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><param.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
diff --git a/test-files/golden-tests/pre-post.adoc b/test-files/golden-tests/pre-post.adoc
index 9794818c18..2289ecb8cd 100644
--- a/test-files/golden-tests/pre-post.adoc
+++ b/test-files/golden-tests/pre-post.adoc
@@ -22,7 +22,7 @@
 
 === Synopsis
 
-Declared in header `<pre-post.cpp>`
+Declared in `<pre-post.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
diff --git a/test-files/golden-tests/pre-post.html b/test-files/golden-tests/pre-post.html
index 8510fcd49a..e14f685dde 100644
--- a/test-files/golden-tests/pre-post.html
+++ b/test-files/golden-tests/pre-post.html
@@ -1,4 +1,4 @@
-</html>
+<html>
     <head></head>
     <body>
         <div>
@@ -12,9 +12,30 @@ <h2>Global namespace</h2>
     </div>
     <div>
             <div>
-                <h3> Member Functions</h3>
-                    </div>
-    </div>
+                <h3>Functions</h3>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+            </div>
 </div>
 
 [#[object Object]]
@@ -29,7 +50,13 @@ <h2>Function f</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><pre-post.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
diff --git a/test-files/golden-tests/record-1.adoc b/test-files/golden-tests/record-1.adoc
index 928b889413..0dff5beb60 100644
--- a/test-files/golden-tests/record-1.adoc
+++ b/test-files/golden-tests/record-1.adoc
@@ -22,7 +22,7 @@
 
 === Synopsis
 
-Declared in header `<record-1.cpp>`
+Declared in `<record-1.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -78,7 +78,7 @@ brief-g3
 
 === Synopsis
 
-Declared in header `<record-1.cpp>`
+Declared in `<record-1.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -95,7 +95,7 @@ using U1 = int;
 
 === Synopsis
 
-Declared in header `<record-1.cpp>`
+Declared in `<record-1.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -112,7 +112,7 @@ typedef char U2;
 
 === Synopsis
 
-Declared in header `<record-1.cpp>`
+Declared in `<record-1.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -136,7 +136,7 @@ f1();
 
 === Synopsis
 
-Declared in header `<record-1.cpp>`
+Declared in `<record-1.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -160,7 +160,7 @@ f2();
 
 === Synopsis
 
-Declared in header `<record-1.cpp>`
+Declared in `<record-1.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -186,7 +186,7 @@ brief-g1
 
 === Synopsis
 
-Declared in header `<record-1.cpp>`
+Declared in `<record-1.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -218,7 +218,7 @@ brief-g2
 
 === Synopsis
 
-Declared in header `<record-1.cpp>`
+Declared in `<record-1.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -250,7 +250,7 @@ brief-g3
 
 === Synopsis
 
-Declared in header `<record-1.cpp>`
+Declared in `<record-1.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
diff --git a/test-files/golden-tests/record-1.html b/test-files/golden-tests/record-1.html
index d3d1d44365..21a937b779 100644
--- a/test-files/golden-tests/record-1.html
+++ b/test-files/golden-tests/record-1.html
@@ -1,4 +1,4 @@
-</html>
+<html>
     <head></head>
     <body>
         <div>
@@ -11,10 +11,31 @@ <h1>Reference</h1>
         <h2>Global namespace</h2>
     </div>
     <div>
-            <div>
-                <h3> Types</h3>
-                    </div>
-    </div>
+        <div>
+            <h3> Types</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">T</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
+                </div>
 </div>
 
 [#[object Object]]
@@ -29,7 +50,13 @@ <h2>Class T</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><record-1.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct T;
@@ -37,16 +64,120 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-            <div>
-            <h3>Types</h3>
-            </div>
+        <div>
+            <h3> Types</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">U1</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">U2</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
     <div>
                 <h3> Member Functions</h3>
-                    </div>
-            <div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f1</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">f2</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">f3</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                    <div>
                 <h3>Protected Member Functions</h3>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">g1</a> 
+                                </td>
+                                <td>
+<p><span>brief-g1</span></p>
+                            
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">g2</a> 
+                                </td>
+                                <td>
+<p><span>brief-g2</span></p>
+                            
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">g3</a> 
+                                </td>
+                                <td>
+<p><span>brief-g3</span></p>
+                            
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
             </div>
+                                                                </div>
 
 
 </div>
@@ -55,8 +186,7 @@ <h3>Protected Member Functions</h3>
 
 <div id="[object Object]">
     <div>
-        <h2><a href="#">T</a>::
-U1</h2>
+        <h2>T::U1</h2>
         
     </div>
 
@@ -64,7 +194,13 @@ <h2><a href="#">T</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><record-1.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             using U1 = int;
@@ -77,8 +213,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2><a href="#">T</a>::
-U2</h2>
+        <h2>T::U2</h2>
         
     </div>
 
@@ -86,7 +221,13 @@ <h2><a href="#">T</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><record-1.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             typedef char U2;
@@ -99,8 +240,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">T</a>::
-f1</h2>
+        <h2>Function T::f1</h2>
         
     </div>
 
@@ -108,7 +248,13 @@ <h2>Function <a href="#">T</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><record-1.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -125,8 +271,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">T</a>::
-f2</h2>
+        <h2>Function T::f2</h2>
         
     </div>
 
@@ -134,7 +279,13 @@ <h2>Function <a href="#">T</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><record-1.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             int
@@ -151,8 +302,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">T</a>::
-f3</h2>
+        <h2>Function T::f3</h2>
         
     </div>
 
@@ -160,7 +310,13 @@ <h2>Function <a href="#">T</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><record-1.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             char
@@ -177,8 +333,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">T</a>::
-g1</h2>
+        <h2>Function T::g1</h2>
         <p><span>brief-g1</span></p>
 
 
@@ -188,7 +343,13 @@ <h2>Function <a href="#">T</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><record-1.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -211,8 +372,7 @@ <h3>Description</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">T</a>::
-g2</h2>
+        <h2>Function T::g2</h2>
         <p><span>brief-g2</span></p>
 
 
@@ -222,7 +382,13 @@ <h2>Function <a href="#">T</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><record-1.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             int
@@ -239,8 +405,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">T</a>::
-g3</h2>
+        <h2>Function T::g3</h2>
         <p><span>brief-g3</span></p>
 
 
@@ -250,7 +415,13 @@ <h2>Function <a href="#">T</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><record-1.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             char
diff --git a/test-files/golden-tests/record-access.adoc b/test-files/golden-tests/record-access.adoc
index be9906f522..5ec4e30802 100644
--- a/test-files/golden-tests/record-access.adoc
+++ b/test-files/golden-tests/record-access.adoc
@@ -26,7 +26,7 @@
 
 === Synopsis
 
-Declared in header `<record-access.cpp>`
+Declared in `<record-access.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -66,7 +66,7 @@ struct S0;
 
 === Synopsis
 
-Declared in header `<record-access.cpp>`
+Declared in `<record-access.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -90,7 +90,7 @@ f0();
 
 === Synopsis
 
-Declared in header `<record-access.cpp>`
+Declared in `<record-access.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -114,7 +114,7 @@ f1();
 
 === Synopsis
 
-Declared in header `<record-access.cpp>`
+Declared in `<record-access.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -138,7 +138,7 @@ f2();
 
 === Synopsis
 
-Declared in header `<record-access.cpp>`
+Declared in `<record-access.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -178,7 +178,7 @@ class C0;
 
 === Synopsis
 
-Declared in header `<record-access.cpp>`
+Declared in `<record-access.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -202,7 +202,7 @@ f0();
 
 === Synopsis
 
-Declared in header `<record-access.cpp>`
+Declared in `<record-access.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -226,7 +226,7 @@ f1();
 
 === Synopsis
 
-Declared in header `<record-access.cpp>`
+Declared in `<record-access.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -250,7 +250,7 @@ f2();
 
 === Synopsis
 
-Declared in header `<record-access.cpp>`
+Declared in `<record-access.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -290,7 +290,7 @@ union U0;
 
 === Synopsis
 
-Declared in header `<record-access.cpp>`
+Declared in `<record-access.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -314,7 +314,7 @@ f0();
 
 === Synopsis
 
-Declared in header `<record-access.cpp>`
+Declared in `<record-access.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -338,7 +338,7 @@ f1();
 
 === Synopsis
 
-Declared in header `<record-access.cpp>`
+Declared in `<record-access.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
diff --git a/test-files/golden-tests/record-access.html b/test-files/golden-tests/record-access.html
index 8daa6b11ce..5fde22e186 100644
--- a/test-files/golden-tests/record-access.html
+++ b/test-files/golden-tests/record-access.html
@@ -1,4 +1,4 @@
-</html>
+<html>
     <head></head>
     <body>
         <div>
@@ -11,10 +11,45 @@ <h1>Reference</h1>
         <h2>Global namespace</h2>
     </div>
     <div>
-            <div>
-                <h3> Types</h3>
-                    </div>
-    </div>
+        <div>
+            <h3> Types</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">C0</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">S0</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">U0</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
+                </div>
 </div>
 
 [#[object Object]]
@@ -29,7 +64,13 @@ <h2>Class S0</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><record-access.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct S0;
@@ -39,14 +80,77 @@ <h3>Synopsis</h3>
     <div>
             <div>
                 <h3> Member Functions</h3>
-                    </div>
-            <div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f0</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                    <div>
                 <h3>Protected Member Functions</h3>
-                    </div>
-            <div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f1</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                    <div>
                 <h3>Private Member Functions</h3>
-                    </div>
-    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f2</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                            </div>
 
 
 </div>
@@ -55,8 +159,7 @@ <h3>Private Member Functions</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">S0</a>::
-f0</h2>
+        <h2>Function S0::f0</h2>
         
     </div>
 
@@ -64,7 +167,13 @@ <h2>Function <a href="#">S0</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><record-access.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -81,8 +190,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">S0</a>::
-f1</h2>
+        <h2>Function S0::f1</h2>
         
     </div>
 
@@ -90,7 +198,13 @@ <h2>Function <a href="#">S0</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><record-access.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -107,8 +221,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">S0</a>::
-f2</h2>
+        <h2>Function S0::f2</h2>
         
     </div>
 
@@ -116,7 +229,13 @@ <h2>Function <a href="#">S0</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><record-access.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -141,7 +260,13 @@ <h2>Class C0</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><record-access.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             class C0;
@@ -151,14 +276,77 @@ <h3>Synopsis</h3>
     <div>
             <div>
                 <h3> Member Functions</h3>
-                    </div>
-            <div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f2</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                    <div>
                 <h3>Protected Member Functions</h3>
-                    </div>
-            <div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f1</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                    <div>
                 <h3>Private Member Functions</h3>
-                    </div>
-    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f0</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                            </div>
 
 
 </div>
@@ -167,8 +355,7 @@ <h3>Private Member Functions</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">C0</a>::
-f0</h2>
+        <h2>Function C0::f0</h2>
         
     </div>
 
@@ -176,7 +363,13 @@ <h2>Function <a href="#">C0</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><record-access.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -193,8 +386,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">C0</a>::
-f1</h2>
+        <h2>Function C0::f1</h2>
         
     </div>
 
@@ -202,7 +394,13 @@ <h2>Function <a href="#">C0</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><record-access.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -219,8 +417,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">C0</a>::
-f2</h2>
+        <h2>Function C0::f2</h2>
         
     </div>
 
@@ -228,7 +425,13 @@ <h2>Function <a href="#">C0</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><record-access.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -253,7 +456,13 @@ <h2>Class U0</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><record-access.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             union U0;
@@ -263,14 +472,77 @@ <h3>Synopsis</h3>
     <div>
             <div>
                 <h3> Member Functions</h3>
-                    </div>
-            <div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f0</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                    <div>
                 <h3>Protected Member Functions</h3>
-                    </div>
-            <div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f1</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                    <div>
                 <h3>Private Member Functions</h3>
-                    </div>
-    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f2</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                            </div>
 
 
 </div>
@@ -279,8 +551,7 @@ <h3>Private Member Functions</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">U0</a>::
-f0</h2>
+        <h2>Function U0::f0</h2>
         
     </div>
 
@@ -288,7 +559,13 @@ <h2>Function <a href="#">U0</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><record-access.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -305,8 +582,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">U0</a>::
-f1</h2>
+        <h2>Function U0::f1</h2>
         
     </div>
 
@@ -314,7 +590,13 @@ <h2>Function <a href="#">U0</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><record-access.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -331,8 +613,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">U0</a>::
-f2</h2>
+        <h2>Function U0::f2</h2>
         
     </div>
 
@@ -340,7 +621,13 @@ <h2>Function <a href="#">U0</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><record-access.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
diff --git a/test-files/golden-tests/record-data.adoc b/test-files/golden-tests/record-data.adoc
index 579fe4a14d..9ca4a783da 100644
--- a/test-files/golden-tests/record-data.adoc
+++ b/test-files/golden-tests/record-data.adoc
@@ -30,7 +30,7 @@
 
 === Synopsis
 
-Declared in header `<record-data.cpp>`
+Declared in `<record-data.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -64,7 +64,7 @@ struct T;
 
 === Synopsis
 
-Declared in header `<record-data.cpp>`
+Declared in `<record-data.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -81,7 +81,7 @@ int i;
 
 === Synopsis
 
-Declared in header `<record-data.cpp>`
+Declared in `<record-data.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -98,7 +98,7 @@ double j;
 
 === Synopsis
 
-Declared in header `<record-data.cpp>`
+Declared in `<record-data.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -116,7 +116,7 @@ int k;
 
 === Synopsis
 
-Declared in header `<record-data.cpp>`
+Declared in `<record-data.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -133,7 +133,7 @@ int l : 8;
 
 === Synopsis
 
-Declared in header `<record-data.cpp>`
+Declared in `<record-data.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -150,7 +150,7 @@ int m : 4 + 4;
 
 === Synopsis
 
-Declared in header `<record-data.cpp>`
+Declared in `<record-data.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -176,7 +176,7 @@ struct U;
 
 === Synopsis
 
-Declared in header `<record-data.cpp>`
+Declared in `<record-data.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -193,7 +193,7 @@ xref:T.adoc[T] t;
 
 === Synopsis
 
-Declared in header `<record-data.cpp>`
+Declared in `<record-data.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -228,7 +228,7 @@ class V;
 
 === Synopsis
 
-Declared in header `<record-data.cpp>`
+Declared in `<record-data.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -245,7 +245,7 @@ int i;
 
 === Synopsis
 
-Declared in header `<record-data.cpp>`
+Declared in `<record-data.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -262,7 +262,7 @@ unsigned long j;
 
 === Synopsis
 
-Declared in header `<record-data.cpp>`
+Declared in `<record-data.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -279,7 +279,7 @@ double k;
 
 === Synopsis
 
-Declared in header `<record-data.cpp>`
+Declared in `<record-data.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -305,7 +305,7 @@ struct W;
 
 === Synopsis
 
-Declared in header `<record-data.cpp>`
+Declared in `<record-data.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -322,7 +322,7 @@ char buf[64];
 
 === Synopsis
 
-Declared in header `<record-data.cpp>`
+Declared in `<record-data.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -366,7 +366,7 @@ struct X;
 
 === Synopsis
 
-Declared in header `<record-data.cpp>`
+Declared in `<record-data.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -383,7 +383,7 @@ using Q = P;
 
 === Synopsis
 
-Declared in header `<record-data.cpp>`
+Declared in `<record-data.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -400,7 +400,7 @@ int x0 = 0;
 
 === Synopsis
 
-Declared in header `<record-data.cpp>`
+Declared in `<record-data.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -417,7 +417,7 @@ P x1;
 
 === Synopsis
 
-Declared in header `<record-data.cpp>`
+Declared in `<record-data.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -434,7 +434,7 @@ P const x2[32];
 
 === Synopsis
 
-Declared in header `<record-data.cpp>`
+Declared in `<record-data.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -451,7 +451,7 @@ xref:X/Q.adoc[Q] x3;
 
 === Synopsis
 
-Declared in header `<record-data.cpp>`
+Declared in `<record-data.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
diff --git a/test-files/golden-tests/record-data.html b/test-files/golden-tests/record-data.html
index f446a2dbd4..90c96b6f7d 100644
--- a/test-files/golden-tests/record-data.html
+++ b/test-files/golden-tests/record-data.html
@@ -1,4 +1,4 @@
-</html>
+<html>
     <head></head>
     <body>
         <div>
@@ -11,10 +11,59 @@ <h1>Reference</h1>
         <h2>Global namespace</h2>
     </div>
     <div>
-            <div>
-                <h3> Types</h3>
-                    </div>
-    </div>
+        <div>
+            <h3> Types</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">T</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">U</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">V</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">W</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">X</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
+                </div>
 </div>
 
 [#[object Object]]
@@ -29,7 +78,13 @@ <h2>Class T</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><record-data.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct T;
@@ -37,10 +92,59 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-            <div>
+                    <div>
                 <h3> Data Members</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">i</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">j</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">k</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">l</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">m</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                            </div>
 
 
 </div>
@@ -49,8 +153,7 @@ <h3> Data Members</h3>
 
 <div id="[object Object]">
     <div>
-        <h2><a href="#">T</a>::
-i</h2>
+        <h2>T::i</h2>
         
     </div>
 
@@ -58,7 +161,13 @@ <h2><a href="#">T</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><record-data.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             int i;
@@ -71,8 +180,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2><a href="#">T</a>::
-j</h2>
+        <h2>T::j</h2>
         
     </div>
 
@@ -80,7 +188,13 @@ <h2><a href="#">T</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><record-data.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             double j;
@@ -93,8 +207,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2><a href="#">T</a>::
-k</h2>
+        <h2>T::k</h2>
         
     </div>
 
@@ -102,7 +215,13 @@ <h2><a href="#">T</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><record-data.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             mutable
@@ -116,8 +235,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2><a href="#">T</a>::
-l</h2>
+        <h2>T::l</h2>
         
     </div>
 
@@ -125,7 +243,13 @@ <h2><a href="#">T</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><record-data.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             int l : 8;
@@ -138,8 +262,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2><a href="#">T</a>::
-m</h2>
+        <h2>T::m</h2>
         
     </div>
 
@@ -147,7 +270,13 @@ <h2><a href="#">T</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><record-data.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             int m : 4 + 4;
@@ -168,7 +297,13 @@ <h2>Class U</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><record-data.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct U;
@@ -176,10 +311,31 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-            <div>
+                    <div>
                 <h3> Data Members</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">t</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                            </div>
 
 
 </div>
@@ -188,8 +344,7 @@ <h3> Data Members</h3>
 
 <div id="[object Object]">
     <div>
-        <h2><a href="#">U</a>::
-t</h2>
+        <h2>U::t</h2>
         
     </div>
 
@@ -197,7 +352,13 @@ <h2><a href="#">U</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><record-data.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             T t;
@@ -218,7 +379,13 @@ <h2>Class V</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><record-data.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             class V;
@@ -226,13 +393,62 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-                    <div>
+                                                        <div>
                 <h3>Protected Data Members</h3>
-                    </div>
-            <div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">j</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                    <div>
                 <h3>Private Data Members</h3>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">i</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">k</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
                     </div>
-    </div>
 
 
 </div>
@@ -241,8 +457,7 @@ <h3>Private Data Members</h3>
 
 <div id="[object Object]">
     <div>
-        <h2><a href="#">V</a>::
-i</h2>
+        <h2>V::i</h2>
         
     </div>
 
@@ -250,7 +465,13 @@ <h2><a href="#">V</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><record-data.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             int i;
@@ -263,8 +484,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2><a href="#">V</a>::
-j</h2>
+        <h2>V::j</h2>
         
     </div>
 
@@ -272,7 +492,13 @@ <h2><a href="#">V</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><record-data.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             unsigned long j;
@@ -285,8 +511,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2><a href="#">V</a>::
-k</h2>
+        <h2>V::k</h2>
         
     </div>
 
@@ -294,7 +519,13 @@ <h2><a href="#">V</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><record-data.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             double k;
@@ -315,7 +546,13 @@ <h2>Class W</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><record-data.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct W;
@@ -323,10 +560,31 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-            <div>
+                    <div>
                 <h3> Data Members</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">buf</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                            </div>
 
 
 </div>
@@ -335,8 +593,7 @@ <h3> Data Members</h3>
 
 <div id="[object Object]">
     <div>
-        <h2><a href="#">W</a>::
-buf</h2>
+        <h2>W::buf</h2>
         
     </div>
 
@@ -344,7 +601,13 @@ <h2><a href="#">W</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><record-data.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             char buf[64];
@@ -365,7 +628,13 @@ <h2>Class X</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><record-data.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<
@@ -376,13 +645,83 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
+        <div>
+            <h3> Types</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">Q</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
             <div>
-            <h3>Types</h3>
-            </div>
-    <div>
                 <h3> Data Members</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">x0</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">x1</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">x2</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">x3</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">x4</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                            </div>
 
 
 </div>
@@ -391,8 +730,7 @@ <h3> Data Members</h3>
 
 <div id="[object Object]">
     <div>
-        <h2><a href="#">X</a>::
-Q</h2>
+        <h2>X::Q</h2>
         
     </div>
 
@@ -400,7 +738,13 @@ <h2><a href="#">X</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><record-data.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             using Q = P;
@@ -413,8 +757,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2><a href="#">X</a>::
-x0</h2>
+        <h2>X::x0</h2>
         
     </div>
 
@@ -422,7 +765,13 @@ <h2><a href="#">X</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><record-data.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             int x0 = 0;
@@ -435,8 +784,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2><a href="#">X</a>::
-x1</h2>
+        <h2>X::x1</h2>
         
     </div>
 
@@ -444,7 +792,13 @@ <h2><a href="#">X</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><record-data.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             P x1;
@@ -457,8 +811,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2><a href="#">X</a>::
-x2</h2>
+        <h2>X::x2</h2>
         
     </div>
 
@@ -466,7 +819,13 @@ <h2><a href="#">X</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><record-data.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             P const x2[32];
@@ -479,8 +838,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2><a href="#">X</a>::
-x3</h2>
+        <h2>X::x3</h2>
         
     </div>
 
@@ -488,7 +846,13 @@ <h2><a href="#">X</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><record-data.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             Q x3;
@@ -501,8 +865,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2><a href="#">X</a>::
-x4</h2>
+        <h2>X::x4</h2>
         
     </div>
 
@@ -510,7 +873,13 @@ <h2><a href="#">X</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><record-data.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             int x4 : I + 4;
diff --git a/test-files/golden-tests/record-inheritance.adoc b/test-files/golden-tests/record-inheritance.adoc
index 36ea26f4e1..1034026217 100644
--- a/test-files/golden-tests/record-inheritance.adoc
+++ b/test-files/golden-tests/record-inheritance.adoc
@@ -52,7 +52,7 @@
 
 === Synopsis
 
-Declared in header `<record-inheritance.cpp>`
+Declared in `<record-inheritance.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -71,7 +71,7 @@ struct S0;
 
 === Synopsis
 
-Declared in header `<record-inheritance.cpp>`
+Declared in `<record-inheritance.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -90,7 +90,7 @@ class C0;
 
 === Synopsis
 
-Declared in header `<record-inheritance.cpp>`
+Declared in `<record-inheritance.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -109,7 +109,7 @@ union U0;
 
 === Synopsis
 
-Declared in header `<record-inheritance.cpp>`
+Declared in `<record-inheritance.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -128,7 +128,7 @@ struct S1;
 
 === Synopsis
 
-Declared in header `<record-inheritance.cpp>`
+Declared in `<record-inheritance.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -148,7 +148,7 @@ struct S2
 
 === Synopsis
 
-Declared in header `<record-inheritance.cpp>`
+Declared in `<record-inheritance.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -168,7 +168,7 @@ struct S3
 
 === Synopsis
 
-Declared in header `<record-inheritance.cpp>`
+Declared in `<record-inheritance.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -189,7 +189,7 @@ struct S4
 
 === Synopsis
 
-Declared in header `<record-inheritance.cpp>`
+Declared in `<record-inheritance.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -209,7 +209,7 @@ class C1
 
 === Synopsis
 
-Declared in header `<record-inheritance.cpp>`
+Declared in `<record-inheritance.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -229,7 +229,7 @@ class C2
 
 === Synopsis
 
-Declared in header `<record-inheritance.cpp>`
+Declared in `<record-inheritance.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -249,7 +249,7 @@ class C3
 
 === Synopsis
 
-Declared in header `<record-inheritance.cpp>`
+Declared in `<record-inheritance.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -269,7 +269,7 @@ class C4
 
 === Synopsis
 
-Declared in header `<record-inheritance.cpp>`
+Declared in `<record-inheritance.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -289,7 +289,7 @@ class C5
 
 === Synopsis
 
-Declared in header `<record-inheritance.cpp>`
+Declared in `<record-inheritance.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -309,7 +309,7 @@ class C6
 
 === Synopsis
 
-Declared in header `<record-inheritance.cpp>`
+Declared in `<record-inheritance.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -330,7 +330,7 @@ class C7
 
 === Synopsis
 
-Declared in header `<record-inheritance.cpp>`
+Declared in `<record-inheritance.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -351,7 +351,7 @@ struct S5
 
 === Synopsis
 
-Declared in header `<record-inheritance.cpp>`
+Declared in `<record-inheritance.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
diff --git a/test-files/golden-tests/record-inheritance.html b/test-files/golden-tests/record-inheritance.html
index 38dc0a3e4a..d53c7f2ceb 100644
--- a/test-files/golden-tests/record-inheritance.html
+++ b/test-files/golden-tests/record-inheritance.html
@@ -1,4 +1,4 @@
-</html>
+<html>
     <head></head>
     <body>
         <div>
@@ -11,10 +11,136 @@ <h1>Reference</h1>
         <h2>Global namespace</h2>
     </div>
     <div>
-            <div>
-                <h3> Types</h3>
-                    </div>
-    </div>
+        <div>
+            <h3> Types</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">C0</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">C1</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">C2</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">C3</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">C4</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">C5</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">C6</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">C7</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">S0</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">S1</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">S2</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">S3</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">S4</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">S5</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">S6</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">U0</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
+                </div>
 </div>
 
 [#[object Object]]
@@ -29,7 +155,13 @@ <h2>Class S0</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><record-inheritance.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct S0;
@@ -37,7 +169,7 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-                            </div>
+                                                                                                                </div>
 
 
 </div>
@@ -54,7 +186,13 @@ <h2>Class C0</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><record-inheritance.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             class C0;
@@ -62,7 +200,7 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-                            </div>
+                                                                                                                </div>
 
 
 </div>
@@ -79,7 +217,13 @@ <h2>Class U0</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><record-inheritance.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             union U0;
@@ -87,7 +231,7 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-                            </div>
+                                                                                                                </div>
 
 
 </div>
@@ -104,7 +248,13 @@ <h2>Class S1</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><record-inheritance.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct S1;
@@ -112,7 +262,7 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-                            </div>
+                                                                                                                </div>
 
 
 </div>
@@ -129,7 +279,13 @@ <h2>Class S2</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><record-inheritance.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct S2
@@ -138,7 +294,7 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-                            </div>
+                                                                                                                </div>
 
 
 </div>
@@ -155,7 +311,13 @@ <h2>Class S3</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><record-inheritance.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct S3
@@ -164,7 +326,7 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-                            </div>
+                                                                                                                </div>
 
 
 </div>
@@ -181,7 +343,13 @@ <h2>Class S4</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><record-inheritance.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct S4
@@ -191,7 +359,7 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-                            </div>
+                                                                                                                </div>
 
 
 </div>
@@ -208,7 +376,13 @@ <h2>Class C1</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><record-inheritance.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             class C1
@@ -217,7 +391,7 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-                            </div>
+                                                                                                                </div>
 
 
 </div>
@@ -234,7 +408,13 @@ <h2>Class C2</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><record-inheritance.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             class C2
@@ -243,7 +423,7 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-                            </div>
+                                                                                                                </div>
 
 
 </div>
@@ -260,7 +440,13 @@ <h2>Class C3</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><record-inheritance.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             class C3
@@ -269,7 +455,7 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-                            </div>
+                                                                                                                </div>
 
 
 </div>
@@ -286,7 +472,13 @@ <h2>Class C4</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><record-inheritance.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             class C4
@@ -295,7 +487,7 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-                            </div>
+                                                                                                                </div>
 
 
 </div>
@@ -312,7 +504,13 @@ <h2>Class C5</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><record-inheritance.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             class C5
@@ -321,7 +519,7 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-                            </div>
+                                                                                                                </div>
 
 
 </div>
@@ -338,7 +536,13 @@ <h2>Class C6</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><record-inheritance.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             class C6
@@ -347,7 +551,7 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-                            </div>
+                                                                                                                </div>
 
 
 </div>
@@ -364,7 +568,13 @@ <h2>Class C7</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><record-inheritance.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             class C7
@@ -374,7 +584,7 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-                            </div>
+                                                                                                                </div>
 
 
 </div>
@@ -391,7 +601,13 @@ <h2>Class S5</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><record-inheritance.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct S5
@@ -401,7 +617,7 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-                            </div>
+                                                                                                                </div>
 
 
 </div>
@@ -418,7 +634,13 @@ <h2>Class S6</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><record-inheritance.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<typename... Ts>
@@ -428,7 +650,7 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-                            </div>
+                                                                                                                </div>
 
 
 </div>
diff --git a/test-files/golden-tests/ref.adoc b/test-files/golden-tests/ref.adoc
index ce30898d66..d1e83b9936 100644
--- a/test-files/golden-tests/ref.adoc
+++ b/test-files/golden-tests/ref.adoc
@@ -46,7 +46,7 @@ xref:F/operator_bitnot.adoc[F::operator~]
 
 === Synopsis
 
-Declared in header `<ref.cpp>`
+Declared in `<ref.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -103,7 +103,7 @@ xref:f0.adoc[f0]
 
 === Synopsis
 
-Declared in header `<ref.cpp>`
+Declared in `<ref.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -137,7 +137,7 @@ xref:A/f1.adoc[f1]
 
 === Synopsis
 
-Declared in header `<ref.cpp>`
+Declared in `<ref.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -174,7 +174,7 @@ xref:A/f1.adoc[::A::f1]
 
 === Synopsis
 
-Declared in header `<ref.cpp>`
+Declared in `<ref.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -198,7 +198,7 @@ f2();
 
 === Synopsis
 
-Declared in header `<ref.cpp>`
+Declared in `<ref.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -226,7 +226,7 @@ struct C;
 
 === Synopsis
 
-Declared in header `<ref.cpp>`
+Declared in `<ref.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -250,7 +250,7 @@ f3();
 
 === Synopsis
 
-Declared in header `<ref.cpp>`
+Declared in `<ref.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -274,7 +274,7 @@ f4();
 
 === Synopsis
 
-Declared in header `<ref.cpp>`
+Declared in `<ref.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -312,7 +312,7 @@ xref:A/C/f3.adoc[f3]
 
 === Synopsis
 
-Declared in header `<ref.cpp>`
+Declared in `<ref.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -339,7 +339,7 @@ xref:A/C/f3.adoc[f3]
 
 === Synopsis
 
-Declared in header `<ref.cpp>`
+Declared in `<ref.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -371,7 +371,7 @@ xref:A/f1.adoc[A::f1]
 
 === Synopsis
 
-Declared in header `<ref.cpp>`
+Declared in `<ref.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -402,7 +402,7 @@ xref:A/f1.adoc[::A::f1]
 
 === Synopsis
 
-Declared in header `<ref.cpp>`
+Declared in `<ref.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -504,7 +504,7 @@ struct F;
 
 === Synopsis
 
-Declared in header `<ref.cpp>`
+Declared in `<ref.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -528,7 +528,7 @@ operator~();
 
 === Synopsis
 
-Declared in header `<ref.cpp>`
+Declared in `<ref.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -552,7 +552,7 @@ operator,(xref:F.adoc[F]&);
 
 === Synopsis
 
-Declared in header `<ref.cpp>`
+Declared in `<ref.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -576,7 +576,7 @@ operator()(xref:F.adoc[F]&);
 
 === Synopsis
 
-Declared in header `<ref.cpp>`
+Declared in `<ref.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -600,7 +600,7 @@ operator[](xref:F.adoc[F]&);
 
 === Synopsis
 
-Declared in header `<ref.cpp>`
+Declared in `<ref.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -624,7 +624,7 @@ operator+(xref:F.adoc[F]&);
 
 === Synopsis
 
-Declared in header `<ref.cpp>`
+Declared in `<ref.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -648,7 +648,7 @@ operator++();
 
 === Synopsis
 
-Declared in header `<ref.cpp>`
+Declared in `<ref.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -672,7 +672,7 @@ operator+=(xref:F.adoc[F]&);
 
 === Synopsis
 
-Declared in header `<ref.cpp>`
+Declared in `<ref.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -696,7 +696,7 @@ operator&(xref:F.adoc[F]&);
 
 === Synopsis
 
-Declared in header `<ref.cpp>`
+Declared in `<ref.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -720,7 +720,7 @@ operator&&(xref:F.adoc[F]&);
 
 === Synopsis
 
-Declared in header `<ref.cpp>`
+Declared in `<ref.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -744,7 +744,7 @@ operator&=(xref:F.adoc[F]&);
 
 === Synopsis
 
-Declared in header `<ref.cpp>`
+Declared in `<ref.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -768,7 +768,7 @@ operator|(xref:F.adoc[F]&);
 
 === Synopsis
 
-Declared in header `<ref.cpp>`
+Declared in `<ref.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -792,7 +792,7 @@ operator||(xref:F.adoc[F]&);
 
 === Synopsis
 
-Declared in header `<ref.cpp>`
+Declared in `<ref.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -816,7 +816,7 @@ operator|=(xref:F.adoc[F]&);
 
 === Synopsis
 
-Declared in header `<ref.cpp>`
+Declared in `<ref.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -840,7 +840,7 @@ operator-(xref:F.adoc[F]&);
 
 === Synopsis
 
-Declared in header `<ref.cpp>`
+Declared in `<ref.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -864,7 +864,7 @@ operator--();
 
 === Synopsis
 
-Declared in header `<ref.cpp>`
+Declared in `<ref.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -888,7 +888,7 @@ operator-=(xref:F.adoc[F]&);
 
 === Synopsis
 
-Declared in header `<ref.cpp>`
+Declared in `<ref.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -912,7 +912,7 @@ operator->();
 
 === Synopsis
 
-Declared in header `<ref.cpp>`
+Declared in `<ref.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -936,7 +936,7 @@ operator->*(xref:F.adoc[F]&);
 
 === Synopsis
 
-Declared in header `<ref.cpp>`
+Declared in `<ref.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -960,7 +960,7 @@ operator<(xref:F.adoc[F]&);
 
 === Synopsis
 
-Declared in header `<ref.cpp>`
+Declared in `<ref.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -984,7 +984,7 @@ operator<<(xref:F.adoc[F]&);
 
 === Synopsis
 
-Declared in header `<ref.cpp>`
+Declared in `<ref.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -1008,7 +1008,7 @@ operator<<=(xref:F.adoc[F]&);
 
 === Synopsis
 
-Declared in header `<ref.cpp>`
+Declared in `<ref.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -1032,7 +1032,7 @@ operator<=(xref:F.adoc[F]&);
 
 === Synopsis
 
-Declared in header `<ref.cpp>`
+Declared in `<ref.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -1056,7 +1056,7 @@ operator<=>(xref:F.adoc[F]&);
 
 === Synopsis
 
-Declared in header `<ref.cpp>`
+Declared in `<ref.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -1080,7 +1080,7 @@ operator>(xref:F.adoc[F]&);
 
 === Synopsis
 
-Declared in header `<ref.cpp>`
+Declared in `<ref.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -1104,7 +1104,7 @@ operator>>(xref:F.adoc[F]&);
 
 === Synopsis
 
-Declared in header `<ref.cpp>`
+Declared in `<ref.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -1128,7 +1128,7 @@ operator>>=(xref:F.adoc[F]&);
 
 === Synopsis
 
-Declared in header `<ref.cpp>`
+Declared in `<ref.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -1152,7 +1152,7 @@ operator>=(xref:F.adoc[F]&);
 
 === Synopsis
 
-Declared in header `<ref.cpp>`
+Declared in `<ref.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -1176,7 +1176,7 @@ operator*(xref:F.adoc[F]&);
 
 === Synopsis
 
-Declared in header `<ref.cpp>`
+Declared in `<ref.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -1200,7 +1200,7 @@ operator*=(xref:F.adoc[F]&);
 
 === Synopsis
 
-Declared in header `<ref.cpp>`
+Declared in `<ref.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -1224,7 +1224,7 @@ operator%(xref:F.adoc[F]&);
 
 === Synopsis
 
-Declared in header `<ref.cpp>`
+Declared in `<ref.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -1248,7 +1248,7 @@ operator%=(xref:F.adoc[F]&);
 
 === Synopsis
 
-Declared in header `<ref.cpp>`
+Declared in `<ref.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -1272,7 +1272,7 @@ operator/(xref:F.adoc[F]&);
 
 === Synopsis
 
-Declared in header `<ref.cpp>`
+Declared in `<ref.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -1296,7 +1296,7 @@ operator/=(xref:F.adoc[F]&);
 
 === Synopsis
 
-Declared in header `<ref.cpp>`
+Declared in `<ref.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -1320,7 +1320,7 @@ operator^(xref:F.adoc[F]&);
 
 === Synopsis
 
-Declared in header `<ref.cpp>`
+Declared in `<ref.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -1344,7 +1344,7 @@ operator^=(xref:F.adoc[F]&);
 
 === Synopsis
 
-Declared in header `<ref.cpp>`
+Declared in `<ref.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -1368,7 +1368,7 @@ operator=(xref:F.adoc[F]&);
 
 === Synopsis
 
-Declared in header `<ref.cpp>`
+Declared in `<ref.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -1392,7 +1392,7 @@ operator==(xref:F.adoc[F]&);
 
 === Synopsis
 
-Declared in header `<ref.cpp>`
+Declared in `<ref.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -1416,7 +1416,7 @@ operator!();
 
 === Synopsis
 
-Declared in header `<ref.cpp>`
+Declared in `<ref.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -1443,7 +1443,7 @@ xref:F/operator_bitnot.adoc[F::operator~]
 
 === Synopsis
 
-Declared in header `<ref.cpp>`
+Declared in `<ref.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
diff --git a/test-files/golden-tests/ref.html b/test-files/golden-tests/ref.html
index e233215930..d0eac4e1d4 100644
--- a/test-files/golden-tests/ref.html
+++ b/test-files/golden-tests/ref.html
@@ -1,4 +1,4 @@
-</html>
+<html>
     <head></head>
     <body>
         <div>
@@ -11,16 +11,97 @@ <h1>Reference</h1>
         <h2>Global namespace</h2>
     </div>
     <div>
-            <div>
-                <h3> Namespaces</h3>
-                    </div>
-    <div>
-                <h3> Types</h3>
-                    </div>
+        <div>
+            <h3>Namespaces</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">A</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
+<div>
+            <h3> Types</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">F</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
     <div>
-                <h3> Member Functions</h3>
-                    </div>
-    </div>
+                <h3>Functions</h3>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f0</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">f5</a> 
+                                </td>
+                                <td>
+<p><span>See</span> <span>A::f1</span></p>
+                            
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">f6</a> 
+                                </td>
+                                <td>
+<p><span>See</span> <span>F::operator~</span></p>
+                            
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+            </div>
 </div>
 
 [#[object Object]]
@@ -35,7 +116,13 @@ <h2>Function f0</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><ref.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -55,13 +142,73 @@ <h3>Synopsis</h3>
         <h2>Namespace A</h2>
     </div>
     <div>
-            <div>
-                <h3> Types</h3>
-                    </div>
+        <div>
+            <h3> Types</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">B</a> 
+                            </td>
+                            <td>
+<p><span>See</span> <span>f1</span></p>
+                        
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">C</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">D</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
     <div>
-                <h3> Member Functions</h3>
-                    </div>
-    </div>
+                <h3>Functions</h3>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f1</a> 
+                                </td>
+                                <td>
+<p><span>See</span> <span>f0</span></p>
+                            
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+            </div>
 </div>
 
 [#[object Object]]
@@ -78,7 +225,13 @@ <h2>Function f1</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><ref.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -111,7 +264,13 @@ <h2>Class B</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><ref.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<typename>
@@ -122,8 +281,29 @@ <h3>Synopsis</h3>
     <div>
             <div>
                 <h3> Member Functions</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f2</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                                    </div>
 
     <div>
         <h3>Description</h3>
@@ -140,8 +320,7 @@ <h3>Description</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">B</a>::
-f2</h2>
+        <h2>Function B::f2</h2>
         
     </div>
 
@@ -149,7 +328,13 @@ <h2>Function <a href="#">B</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><ref.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -174,7 +359,13 @@ <h2>Class C</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><ref.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct C;
@@ -184,8 +375,36 @@ <h3>Synopsis</h3>
     <div>
             <div>
                 <h3> Member Functions</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f3</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">f4</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                                    </div>
 
 
 </div>
@@ -194,8 +413,7 @@ <h3> Member Functions</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">C</a>::
-f3</h2>
+        <h2>Function C::f3</h2>
         
     </div>
 
@@ -203,7 +421,13 @@ <h2>Function <a href="#">C</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><ref.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -220,8 +444,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">C</a>::
-f4</h2>
+        <h2>Function C::f4</h2>
         
     </div>
 
@@ -229,7 +452,13 @@ <h2>Function <a href="#">C</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><ref.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -254,7 +483,13 @@ <h2>Class D</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><ref.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct D
@@ -263,13 +498,63 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-            <div>
-                <h3> Types</h3>
-                    </div>
+        <div>
+            <h3> Types</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">E</a> 
+                            </td>
+                            <td>
+<p><span>See</span> <span>f3</span></p>
+                        
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
     <div>
                 <h3> Member Functions</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f3</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">f4</a> 
+                                </td>
+                                <td>
+    </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                                    </div>
 
 
 </div>
@@ -278,8 +563,7 @@ <h3> Member Functions</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">D</a>::
-f4</h2>
+        <h2>Function D::f4</h2>
         
     </div>
 
@@ -287,7 +571,13 @@ <h2>Function <a href="#">D</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><ref.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -304,8 +594,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Class <a href="#">D</a>::
-E</h2>
+        <h2>Class D::E</h2>
         <p><span>See</span> <span>f3</span></p>
 
 
@@ -315,7 +604,13 @@ <h2>Class <a href="#">D</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><ref.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct E;
@@ -323,7 +618,7 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-                            </div>
+                                                                                                                </div>
 
     <div>
         <h3>Description</h3>
@@ -350,7 +645,13 @@ <h2>Function f5</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><ref.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -381,7 +682,13 @@ <h2>Class F</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><ref.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct F;
@@ -391,8 +698,295 @@ <h3>Synopsis</h3>
     <div>
             <div>
                 <h3> Member Functions</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">operator!</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">operator!=</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">operator%</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">operator%=</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">operator&</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">operator&&</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">operator&=</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">operator()</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">operator*</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">operator*=</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">operator+</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">operator++</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">operator+=</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">operator,</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">operator-</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">operator--</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">operator-=</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">operator-></a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">operator->*</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">operator/</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">operator/=</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">operator<</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">operator<<</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">operator<<=</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">operator<=</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">operator<=></a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">operator=</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">operator==</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">operator></a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">operator>=</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">operator>></a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">operator>>=</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">operator[]</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">operator^</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">operator^=</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">operator|</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">operator|=</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">operator||</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">operator~</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                                    </div>
 
 
 </div>
@@ -401,8 +995,7 @@ <h3> Member Functions</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">F</a>::
-operator~</h2>
+        <h2>Function F::operator~</h2>
         
     </div>
 
@@ -410,7 +1003,13 @@ <h2>Function <a href="#">F</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><ref.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -427,8 +1026,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">F</a>::
-operator,</h2>
+        <h2>Function F::operator,</h2>
         
     </div>
 
@@ -436,7 +1034,13 @@ <h2>Function <a href="#">F</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><ref.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -453,8 +1057,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">F</a>::
-operator()</h2>
+        <h2>Function F::operator()</h2>
         
     </div>
 
@@ -462,7 +1065,13 @@ <h2>Function <a href="#">F</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><ref.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -479,8 +1088,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">F</a>::
-operator[]</h2>
+        <h2>Function F::operator[]</h2>
         
     </div>
 
@@ -488,7 +1096,13 @@ <h2>Function <a href="#">F</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><ref.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -505,8 +1119,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">F</a>::
-operator+</h2>
+        <h2>Function F::operator+</h2>
         
     </div>
 
@@ -514,7 +1127,13 @@ <h2>Function <a href="#">F</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><ref.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -531,8 +1150,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">F</a>::
-operator++</h2>
+        <h2>Function F::operator++</h2>
         
     </div>
 
@@ -540,7 +1158,13 @@ <h2>Function <a href="#">F</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><ref.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -557,8 +1181,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">F</a>::
-operator+=</h2>
+        <h2>Function F::operator+=</h2>
         
     </div>
 
@@ -566,7 +1189,13 @@ <h2>Function <a href="#">F</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><ref.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -583,8 +1212,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">F</a>::
-operator&</h2>
+        <h2>Function F::operator&</h2>
         
     </div>
 
@@ -592,7 +1220,13 @@ <h2>Function <a href="#">F</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><ref.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -609,8 +1243,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">F</a>::
-operator&&</h2>
+        <h2>Function F::operator&&</h2>
         
     </div>
 
@@ -618,7 +1251,13 @@ <h2>Function <a href="#">F</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><ref.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -635,8 +1274,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">F</a>::
-operator&=</h2>
+        <h2>Function F::operator&=</h2>
         
     </div>
 
@@ -644,7 +1282,13 @@ <h2>Function <a href="#">F</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><ref.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -661,8 +1305,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">F</a>::
-operator|</h2>
+        <h2>Function F::operator|</h2>
         
     </div>
 
@@ -670,7 +1313,13 @@ <h2>Function <a href="#">F</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><ref.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -687,8 +1336,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">F</a>::
-operator||</h2>
+        <h2>Function F::operator||</h2>
         
     </div>
 
@@ -696,7 +1344,13 @@ <h2>Function <a href="#">F</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><ref.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -713,8 +1367,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">F</a>::
-operator|=</h2>
+        <h2>Function F::operator|=</h2>
         
     </div>
 
@@ -722,7 +1375,13 @@ <h2>Function <a href="#">F</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><ref.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -739,8 +1398,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">F</a>::
-operator-</h2>
+        <h2>Function F::operator-</h2>
         
     </div>
 
@@ -748,7 +1406,13 @@ <h2>Function <a href="#">F</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><ref.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -765,8 +1429,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">F</a>::
-operator--</h2>
+        <h2>Function F::operator--</h2>
         
     </div>
 
@@ -774,7 +1437,13 @@ <h2>Function <a href="#">F</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><ref.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -791,8 +1460,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">F</a>::
-operator-=</h2>
+        <h2>Function F::operator-=</h2>
         
     </div>
 
@@ -800,7 +1468,13 @@ <h2>Function <a href="#">F</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><ref.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -817,8 +1491,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">F</a>::
-operator-></h2>
+        <h2>Function F::operator-></h2>
         
     </div>
 
@@ -826,7 +1499,13 @@ <h2>Function <a href="#">F</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><ref.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -843,8 +1522,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">F</a>::
-operator->*</h2>
+        <h2>Function F::operator->*</h2>
         
     </div>
 
@@ -852,7 +1530,13 @@ <h2>Function <a href="#">F</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><ref.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -869,8 +1553,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">F</a>::
-operator<</h2>
+        <h2>Function F::operator<</h2>
         
     </div>
 
@@ -878,7 +1561,13 @@ <h2>Function <a href="#">F</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><ref.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -895,8 +1584,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">F</a>::
-operator<<</h2>
+        <h2>Function F::operator<<</h2>
         
     </div>
 
@@ -904,7 +1592,13 @@ <h2>Function <a href="#">F</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><ref.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -921,8 +1615,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">F</a>::
-operator<<=</h2>
+        <h2>Function F::operator<<=</h2>
         
     </div>
 
@@ -930,7 +1623,13 @@ <h2>Function <a href="#">F</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><ref.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -947,8 +1646,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">F</a>::
-operator<=</h2>
+        <h2>Function F::operator<=</h2>
         
     </div>
 
@@ -956,7 +1654,13 @@ <h2>Function <a href="#">F</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><ref.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -973,8 +1677,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">F</a>::
-operator<=></h2>
+        <h2>Function F::operator<=></h2>
         
     </div>
 
@@ -982,7 +1685,13 @@ <h2>Function <a href="#">F</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><ref.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -999,8 +1708,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">F</a>::
-operator></h2>
+        <h2>Function F::operator></h2>
         
     </div>
 
@@ -1008,7 +1716,13 @@ <h2>Function <a href="#">F</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><ref.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -1025,8 +1739,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">F</a>::
-operator>></h2>
+        <h2>Function F::operator>></h2>
         
     </div>
 
@@ -1034,7 +1747,13 @@ <h2>Function <a href="#">F</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><ref.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -1051,8 +1770,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">F</a>::
-operator>>=</h2>
+        <h2>Function F::operator>>=</h2>
         
     </div>
 
@@ -1060,7 +1778,13 @@ <h2>Function <a href="#">F</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><ref.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -1077,8 +1801,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">F</a>::
-operator>=</h2>
+        <h2>Function F::operator>=</h2>
         
     </div>
 
@@ -1086,7 +1809,13 @@ <h2>Function <a href="#">F</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><ref.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -1103,8 +1832,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">F</a>::
-operator*</h2>
+        <h2>Function F::operator*</h2>
         
     </div>
 
@@ -1112,7 +1840,13 @@ <h2>Function <a href="#">F</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><ref.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -1129,8 +1863,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">F</a>::
-operator*=</h2>
+        <h2>Function F::operator*=</h2>
         
     </div>
 
@@ -1138,7 +1871,13 @@ <h2>Function <a href="#">F</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><ref.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -1155,8 +1894,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">F</a>::
-operator%</h2>
+        <h2>Function F::operator%</h2>
         
     </div>
 
@@ -1164,7 +1902,13 @@ <h2>Function <a href="#">F</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><ref.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -1181,8 +1925,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">F</a>::
-operator%=</h2>
+        <h2>Function F::operator%=</h2>
         
     </div>
 
@@ -1190,7 +1933,13 @@ <h2>Function <a href="#">F</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><ref.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -1207,8 +1956,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">F</a>::
-operator/</h2>
+        <h2>Function F::operator/</h2>
         
     </div>
 
@@ -1216,7 +1964,13 @@ <h2>Function <a href="#">F</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><ref.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -1233,8 +1987,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">F</a>::
-operator/=</h2>
+        <h2>Function F::operator/=</h2>
         
     </div>
 
@@ -1242,7 +1995,13 @@ <h2>Function <a href="#">F</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><ref.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -1259,8 +2018,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">F</a>::
-operator^</h2>
+        <h2>Function F::operator^</h2>
         
     </div>
 
@@ -1268,7 +2026,13 @@ <h2>Function <a href="#">F</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><ref.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -1285,8 +2049,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">F</a>::
-operator^=</h2>
+        <h2>Function F::operator^=</h2>
         
     </div>
 
@@ -1294,7 +2057,13 @@ <h2>Function <a href="#">F</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><ref.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -1311,8 +2080,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">F</a>::
-operator=</h2>
+        <h2>Function F::operator=</h2>
         
     </div>
 
@@ -1320,7 +2088,13 @@ <h2>Function <a href="#">F</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><ref.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -1337,8 +2111,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">F</a>::
-operator==</h2>
+        <h2>Function F::operator==</h2>
         
     </div>
 
@@ -1346,7 +2119,13 @@ <h2>Function <a href="#">F</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><ref.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -1363,8 +2142,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">F</a>::
-operator!</h2>
+        <h2>Function F::operator!</h2>
         
     </div>
 
@@ -1372,7 +2150,13 @@ <h2>Function <a href="#">F</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><ref.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -1389,8 +2173,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">F</a>::
-operator!=</h2>
+        <h2>Function F::operator!=</h2>
         
     </div>
 
@@ -1398,7 +2181,13 @@ <h2>Function <a href="#">F</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><ref.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -1425,7 +2214,13 @@ <h2>Function f6</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><ref.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
diff --git a/test-files/golden-tests/requires-clause.adoc b/test-files/golden-tests/requires-clause.adoc
index 764f4e8b8d..41f1ddc421 100644
--- a/test-files/golden-tests/requires-clause.adoc
+++ b/test-files/golden-tests/requires-clause.adoc
@@ -60,7 +60,7 @@ xref:f-08.adoc[pass:[f]]() requires (sizeof(T) == 2);
 
 === Synopsis
 
-Declared in header `<requires-clause.cpp>`
+Declared in `<requires-clause.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -85,7 +85,7 @@ f() requires (sizeof(T) == 4);
 
 === Synopsis
 
-Declared in header `<requires-clause.cpp>`
+Declared in `<requires-clause.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -141,7 +141,7 @@ xref:g-0c.adoc[pass:[g]]();
 
 === Synopsis
 
-Declared in header `<requires-clause.cpp>`
+Declared in `<requires-clause.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -166,7 +166,7 @@ g();
 
 === Synopsis
 
-Declared in header `<requires-clause.cpp>`
+Declared in `<requires-clause.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -191,7 +191,7 @@ g();
 
 === Synopsis
 
-Declared in header `<requires-clause.cpp>`
+Declared in `<requires-clause.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
diff --git a/test-files/golden-tests/requires-clause.html b/test-files/golden-tests/requires-clause.html
index 177c290fe0..b6dadf12b6 100644
--- a/test-files/golden-tests/requires-clause.html
+++ b/test-files/golden-tests/requires-clause.html
@@ -1,4 +1,4 @@
-</html>
+<html>
     <head></head>
     <body>
         <div>
@@ -11,13 +11,60 @@ <h1>Reference</h1>
         <h2>Global namespace</h2>
     </div>
     <div>
-            <div>
-                <h3> Types</h3>
-                    </div>
+        <div>
+            <h3> Types</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">A</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
     <div>
-                <h3> Member Functions</h3>
-                    </div>
-    </div>
+                <h3>Functions</h3>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f</a> 
+                                </td>
+                                <td>
+    </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">g</a> 
+                                </td>
+                                <td>
+    </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+            </div>
 </div>
 
 <div id="">
@@ -57,7 +104,13 @@ <h2>Function f</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><requires-clause.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<typename T>
@@ -83,7 +136,13 @@ <h2>Function f</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><requires-clause.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<typename T>
@@ -106,7 +165,7 @@ <h2>Members</h2>
 
 <p></p>
 
-<pre><code class="language-cpp">template<typename T>
+<pre><code class="language-cpp">template<typename T> requires (sizeof(T) == 4)
 void
 g();</code></pre>
 <a href=""><em>» more...</em></a>
@@ -114,7 +173,7 @@ <h2>Members</h2>
 
 <p></p>
 
-<pre><code class="language-cpp">template<typename T>
+<pre><code class="language-cpp">template<typename T> requires (sizeof(U) == 2)
 void
 g();</code></pre>
 <a href=""><em>» more...</em></a>
@@ -134,10 +193,16 @@ <h2>Function g</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><requires-clause.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
-            template<typename T>
+            template<typename T> requires (sizeof(T) == 4)
 void
 g();
         </pre>
@@ -160,10 +225,16 @@ <h2>Function g</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><requires-clause.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
-            template<typename T>
+            template<typename T> requires (sizeof(U) == 2)
 void
 g();
         </pre>
@@ -186,16 +257,22 @@ <h2>Class A</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><requires-clause.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
-            template<typename T>
+            template<typename T> requires (sizeof(U) == 2)
 struct A;
         </pre>
     </div>
 
     <div>
-                            </div>
+                                                                                                                </div>
 
 
 </div>
diff --git a/test-files/golden-tests/spec-mem-implicit-instantiation.adoc b/test-files/golden-tests/spec-mem-implicit-instantiation.adoc
index 42a547ae79..e3d268e833 100644
--- a/test-files/golden-tests/spec-mem-implicit-instantiation.adoc
+++ b/test-files/golden-tests/spec-mem-implicit-instantiation.adoc
@@ -24,7 +24,7 @@
 
 === Synopsis
 
-Declared in header `<spec-mem-implicit-instantiation.cpp>`
+Declared in `<spec-mem-implicit-instantiation.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -60,7 +60,7 @@ struct A;
 
 === Synopsis
 
-Declared in header `<spec-mem-implicit-instantiation.cpp>`
+Declared in `<spec-mem-implicit-instantiation.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -84,7 +84,7 @@ f();
 
 === Synopsis
 
-Declared in header `<spec-mem-implicit-instantiation.cpp>`
+Declared in `<spec-mem-implicit-instantiation.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -111,7 +111,7 @@ struct B;
 
 === Synopsis
 
-Declared in header `<spec-mem-implicit-instantiation.cpp>`
+Declared in `<spec-mem-implicit-instantiation.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -135,7 +135,7 @@ g();
 
 === Synopsis
 
-Declared in header `<spec-mem-implicit-instantiation.cpp>`
+Declared in `<spec-mem-implicit-instantiation.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -162,7 +162,7 @@ struct C;
 
 === Synopsis
 
-Declared in header `<spec-mem-implicit-instantiation.cpp>`
+Declared in `<spec-mem-implicit-instantiation.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -195,7 +195,7 @@ h();
 
 === Synopsis
 
-Declared in header `<spec-mem-implicit-instantiation.cpp>`
+Declared in `<spec-mem-implicit-instantiation.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -221,7 +221,7 @@ struct D;
 
 === Synopsis
 
-Declared in header `<spec-mem-implicit-instantiation.cpp>`
+Declared in `<spec-mem-implicit-instantiation.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -248,7 +248,7 @@ struct E;
 
 === Synopsis
 
-Declared in header `<spec-mem-implicit-instantiation.cpp>`
+Declared in `<spec-mem-implicit-instantiation.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
diff --git a/test-files/golden-tests/spec-mem-implicit-instantiation.html b/test-files/golden-tests/spec-mem-implicit-instantiation.html
index c20eac7009..ea89ba14d7 100644
--- a/test-files/golden-tests/spec-mem-implicit-instantiation.html
+++ b/test-files/golden-tests/spec-mem-implicit-instantiation.html
@@ -1,4 +1,4 @@
-</html>
+<html>
     <head></head>
     <body>
         <div>
@@ -11,10 +11,38 @@ <h1>Reference</h1>
         <h2>Global namespace</h2>
     </div>
     <div>
-            <div>
-                <h3> Types</h3>
-                    </div>
-    </div>
+        <div>
+            <h3> Types</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">A</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">D</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
+                </div>
 </div>
 
 [#[object Object]]
@@ -29,7 +57,13 @@ <h2>Class A</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><spec-mem-implicit-instantiation.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<typename T>
@@ -38,13 +72,62 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-            <div>
-                <h3> Types</h3>
-                    </div>
+        <div>
+            <h3> Types</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">B</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">C</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
     <div>
                 <h3> Member Functions</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                                    </div>
 
 
 </div>
@@ -53,8 +136,7 @@ <h3> Member Functions</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">A</a>::
-f</h2>
+        <h2>Function A::f</h2>
         
     </div>
 
@@ -62,7 +144,13 @@ <h2>Function <a href="#">A</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><spec-mem-implicit-instantiation.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -79,8 +167,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Class <a href="#">A</a>::
-B</h2>
+        <h2>Class A::B</h2>
         
     </div>
 
@@ -88,7 +175,13 @@ <h2>Class <a href="#">A</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><spec-mem-implicit-instantiation.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<typename U>
@@ -99,8 +192,29 @@ <h3>Synopsis</h3>
     <div>
             <div>
                 <h3> Member Functions</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">g</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                                    </div>
 
 
 </div>
@@ -109,9 +223,7 @@ <h3> Member Functions</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">A</a>::
-<a href="#">B</a>::
-g</h2>
+        <h2>Function A::B::g</h2>
         
     </div>
 
@@ -119,7 +231,13 @@ <h2>Function <a href="#">A</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><spec-mem-implicit-instantiation.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -136,8 +254,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Class <a href="#">A</a>::
-C</h2>
+        <h2>Class A::C</h2>
         
     </div>
 
@@ -145,7 +262,13 @@ <h2>Class <a href="#">A</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><spec-mem-implicit-instantiation.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<typename U>
@@ -156,8 +279,29 @@ <h3>Synopsis</h3>
     <div>
             <div>
                 <h3> Member Functions</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">h</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                                    </div>
 
 
 </div>
@@ -166,9 +310,7 @@ <h3> Member Functions</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">A</a>::
-<a href="#">C</a>::
-h</h2>
+        <h2>Function A::C::h</h2>
         
     </div>
 
@@ -176,7 +318,13 @@ <h2>Function <a href="#">A</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><spec-mem-implicit-instantiation.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -210,7 +358,13 @@ <h2>Class D</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><spec-mem-implicit-instantiation.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct D;
@@ -218,10 +372,31 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-            <div>
-                <h3> Types</h3>
-                    </div>
-                    </div>
+        <div>
+            <h3> Types</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">E</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
+                                                                                                        </div>
 
 
 </div>
@@ -230,8 +405,7 @@ <h3> Types</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Class <a href="#">D</a>::
-E</h2>
+        <h2>Class D::E</h2>
         
     </div>
 
@@ -239,7 +413,13 @@ <h2>Class <a href="#">D</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><spec-mem-implicit-instantiation.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<typename T>
@@ -250,8 +430,29 @@ <h3>Synopsis</h3>
     <div>
             <div>
                 <h3> Member Functions</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">k</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                                    </div>
 
 
 </div>
@@ -260,9 +461,7 @@ <h3> Member Functions</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">D</a>::
-<a href="#">E</a>::
-k</h2>
+        <h2>Function D::E::k</h2>
         
     </div>
 
@@ -270,7 +469,13 @@ <h2>Function <a href="#">D</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><spec-mem-implicit-instantiation.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
diff --git a/test-files/golden-tests/static-data-def-constexpr.adoc b/test-files/golden-tests/static-data-def-constexpr.adoc
index 67c500eeb3..90fc84210f 100644
--- a/test-files/golden-tests/static-data-def-constexpr.adoc
+++ b/test-files/golden-tests/static-data-def-constexpr.adoc
@@ -24,7 +24,7 @@
 
 === Synopsis
 
-Declared in header `<static-data-def-constexpr.cpp>`
+Declared in `<static-data-def-constexpr.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -50,7 +50,7 @@ struct S;
 
 === Synopsis
 
-Declared in header `<static-data-def-constexpr.cpp>`
+Declared in `<static-data-def-constexpr.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -69,7 +69,7 @@ xref:S.adoc[S] const s = S{};
 
 === Synopsis
 
-Declared in header `<static-data-def-constexpr.cpp>`
+Declared in `<static-data-def-constexpr.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -95,7 +95,7 @@ struct T;
 
 === Synopsis
 
-Declared in header `<static-data-def-constexpr.cpp>`
+Declared in `<static-data-def-constexpr.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
diff --git a/test-files/golden-tests/static-data-def-constexpr.html b/test-files/golden-tests/static-data-def-constexpr.html
index 3f6ad4f74d..577c34ff57 100644
--- a/test-files/golden-tests/static-data-def-constexpr.html
+++ b/test-files/golden-tests/static-data-def-constexpr.html
@@ -1,4 +1,4 @@
-</html>
+<html>
     <head></head>
     <body>
         <div>
@@ -11,10 +11,38 @@ <h1>Reference</h1>
         <h2>Global namespace</h2>
     </div>
     <div>
-            <div>
-                <h3> Types</h3>
-                    </div>
-    </div>
+        <div>
+            <h3> Types</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">S</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">T</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
+                </div>
 </div>
 
 [#[object Object]]
@@ -29,7 +57,13 @@ <h2>Class S</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><static-data-def-constexpr.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct S;
@@ -37,10 +71,31 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-            <div>
-                <h3> Variables</h3>
-                    </div>
-                    </div>
+                        <div>
+                <h3> Static Data Members</h3>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">s</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                        </div>
 
 
 </div>
@@ -49,8 +104,7 @@ <h3> Variables</h3>
 
 <div id="[object Object]">
     <div>
-        <h2><a href="#">S</a>::
-s</h2>
+        <h2>S::s</h2>
         
     </div>
 
@@ -58,7 +112,13 @@ <h2><a href="#">S</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><static-data-def-constexpr.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             constexpr
@@ -81,7 +141,13 @@ <h2>Class T</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><static-data-def-constexpr.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct T;
@@ -89,10 +155,31 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-            <div>
-                <h3> Variables</h3>
-                    </div>
-                    </div>
+                        <div>
+                <h3> Static Data Members</h3>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">t</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                        </div>
 
 
 </div>
@@ -101,8 +188,7 @@ <h3> Variables</h3>
 
 <div id="[object Object]">
     <div>
-        <h2><a href="#">T</a>::
-t</h2>
+        <h2>T::t</h2>
         
     </div>
 
@@ -110,7 +196,13 @@ <h2><a href="#">T</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><static-data-def-constexpr.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             constexpr
diff --git a/test-files/golden-tests/static-data-def.adoc b/test-files/golden-tests/static-data-def.adoc
index a55a926570..2f22a7b8cc 100644
--- a/test-files/golden-tests/static-data-def.adoc
+++ b/test-files/golden-tests/static-data-def.adoc
@@ -31,7 +31,7 @@
 
 === Synopsis
 
-Declared in header `<static-data-def.cpp>`
+Declared in `<static-data-def.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -72,7 +72,7 @@ struct A;
 
 === Synopsis
 
-Declared in header `<static-data-def.cpp>`
+Declared in `<static-data-def.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -90,7 +90,7 @@ int v0 = 0;
 
 === Synopsis
 
-Declared in header `<static-data-def.cpp>`
+Declared in `<static-data-def.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -108,7 +108,7 @@ int v1 = 1;
 
 === Synopsis
 
-Declared in header `<static-data-def.cpp>`
+Declared in `<static-data-def.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -127,7 +127,7 @@ int const v2 = 2;
 
 === Synopsis
 
-Declared in header `<static-data-def.cpp>`
+Declared in `<static-data-def.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -145,7 +145,7 @@ int const v3 = 3;
 
 === Synopsis
 
-Declared in header `<static-data-def.cpp>`
+Declared in `<static-data-def.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -163,7 +163,7 @@ int const v4 = 4;
 
 === Synopsis
 
-Declared in header `<static-data-def.cpp>`
+Declared in `<static-data-def.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -181,7 +181,7 @@ int v5 = 5;
 
 === Synopsis
 
-Declared in header `<static-data-def.cpp>`
+Declared in `<static-data-def.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -199,7 +199,7 @@ int const v6 = 6;
 
 === Synopsis
 
-Declared in header `<static-data-def.cpp>`
+Declared in `<static-data-def.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -218,7 +218,7 @@ int const v7 = 7;
 
 === Synopsis
 
-Declared in header `<static-data-def.cpp>`
+Declared in `<static-data-def.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -246,7 +246,7 @@ struct B;
 
 === Synopsis
 
-Declared in header `<static-data-def.cpp>`
+Declared in `<static-data-def.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -265,7 +265,7 @@ int const x0 = 0;
 
 === Synopsis
 
-Declared in header `<static-data-def.cpp>`
+Declared in `<static-data-def.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -285,7 +285,7 @@ int const x1 = 0;
 
 === Synopsis
 
-Declared in header `<static-data-def.cpp>`
+Declared in `<static-data-def.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
diff --git a/test-files/golden-tests/static-data-def.html b/test-files/golden-tests/static-data-def.html
index 187e371028..78bb08e7e2 100644
--- a/test-files/golden-tests/static-data-def.html
+++ b/test-files/golden-tests/static-data-def.html
@@ -1,4 +1,4 @@
-</html>
+<html>
     <head></head>
     <body>
         <div>
@@ -11,13 +11,62 @@ <h1>Reference</h1>
         <h2>Global namespace</h2>
     </div>
     <div>
-            <div>
-                <h3> Types</h3>
-                    </div>
+        <div>
+            <h3> Types</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">A</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">B</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
     <div>
-                <h3> Member Functions</h3>
-                    </div>
-    </div>
+                <h3>Functions</h3>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+            </div>
 </div>
 
 [#[object Object]]
@@ -32,7 +81,13 @@ <h2>Class A</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><static-data-def.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<typename T>
@@ -41,10 +96,80 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-            <div>
-                <h3> Variables</h3>
-                    </div>
-                    </div>
+                        <div>
+                <h3> Static Data Members</h3>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">v0</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">v1</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">v2</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">v3</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">v4</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">v5</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">v6</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">v7</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                        </div>
 
 
 </div>
@@ -53,8 +178,7 @@ <h3> Variables</h3>
 
 <div id="[object Object]">
     <div>
-        <h2><a href="#">A</a>::
-v0</h2>
+        <h2>A::v0</h2>
         
     </div>
 
@@ -62,7 +186,13 @@ <h2><a href="#">A</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><static-data-def.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             static
@@ -76,8 +206,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2><a href="#">A</a>::
-v1</h2>
+        <h2>A::v1</h2>
         
     </div>
 
@@ -85,7 +214,13 @@ <h2><a href="#">A</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><static-data-def.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             static
@@ -99,8 +234,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2><a href="#">A</a>::
-v2</h2>
+        <h2>A::v2</h2>
         
     </div>
 
@@ -108,7 +242,13 @@ <h2><a href="#">A</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><static-data-def.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             constexpr
@@ -123,8 +263,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2><a href="#">A</a>::
-v3</h2>
+        <h2>A::v3</h2>
         
     </div>
 
@@ -132,7 +271,13 @@ <h2><a href="#">A</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><static-data-def.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             static
@@ -146,8 +291,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2><a href="#">A</a>::
-v4</h2>
+        <h2>A::v4</h2>
         
     </div>
 
@@ -155,7 +299,13 @@ <h2><a href="#">A</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><static-data-def.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             static
@@ -169,8 +319,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2><a href="#">A</a>::
-v5</h2>
+        <h2>A::v5</h2>
         
     </div>
 
@@ -178,7 +327,13 @@ <h2><a href="#">A</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><static-data-def.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             static
@@ -192,8 +347,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2><a href="#">A</a>::
-v6</h2>
+        <h2>A::v6</h2>
         
     </div>
 
@@ -201,7 +355,13 @@ <h2><a href="#">A</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><static-data-def.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             static
@@ -215,8 +375,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2><a href="#">A</a>::
-v7</h2>
+        <h2>A::v7</h2>
         
     </div>
 
@@ -224,7 +383,13 @@ <h2><a href="#">A</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><static-data-def.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             constexpr
@@ -247,7 +412,13 @@ <h2>Class B</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><static-data-def.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct B;
@@ -255,10 +426,38 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-            <div>
-                <h3> Variables</h3>
-                    </div>
-                    </div>
+                        <div>
+                <h3> Static Data Members</h3>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">x0</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">x1</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                        </div>
 
 
 </div>
@@ -267,8 +466,7 @@ <h3> Variables</h3>
 
 <div id="[object Object]">
     <div>
-        <h2><a href="#">B</a>::
-x0</h2>
+        <h2>B::x0</h2>
         
     </div>
 
@@ -276,7 +474,13 @@ <h2><a href="#">B</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><static-data-def.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             static
@@ -291,8 +495,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2><a href="#">B</a>::
-x1</h2>
+        <h2>B::x1</h2>
         
     </div>
 
@@ -300,7 +503,13 @@ <h2><a href="#">B</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><static-data-def.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             constexpr
@@ -324,10 +533,16 @@ <h2>Function f</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><static-data-def.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
-            
+            auto
 f();
         </pre>
     </div>
diff --git a/test-files/golden-tests/static-data-template.adoc b/test-files/golden-tests/static-data-template.adoc
index e73b2eba04..a16a620c3a 100644
--- a/test-files/golden-tests/static-data-template.adoc
+++ b/test-files/golden-tests/static-data-template.adoc
@@ -22,7 +22,7 @@
 
 === Synopsis
 
-Declared in header `<static-data-template.cpp>`
+Declared in `<static-data-template.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -53,7 +53,7 @@ struct A;
 
 === Synopsis
 
-Declared in header `<static-data-template.cpp>`
+Declared in `<static-data-template.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -75,7 +75,7 @@ T const x = 0;
 
 === Synopsis
 
-Declared in header `<static-data-template.cpp>`
+Declared in `<static-data-template.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -95,7 +95,7 @@ T const xref:A/x-0e.adoc[pass:[x]]<U*, T> = 1;
 
 === Synopsis
 
-Declared in header `<static-data-template.cpp>`
+Declared in `<static-data-template.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
diff --git a/test-files/golden-tests/static-data-template.html b/test-files/golden-tests/static-data-template.html
index 5f05c31895..f95e6b3578 100644
--- a/test-files/golden-tests/static-data-template.html
+++ b/test-files/golden-tests/static-data-template.html
@@ -1,4 +1,4 @@
-</html>
+<html>
     <head></head>
     <body>
         <div>
@@ -11,10 +11,31 @@ <h1>Reference</h1>
         <h2>Global namespace</h2>
     </div>
     <div>
-            <div>
-                <h3> Types</h3>
-                    </div>
-    </div>
+        <div>
+            <h3> Types</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">A</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
+                </div>
 </div>
 
 [#[object Object]]
@@ -29,7 +50,13 @@ <h2>Class A</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><static-data-template.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<typename T>
@@ -38,10 +65,45 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-            <div>
-                <h3> Variables</h3>
-                    </div>
-                    </div>
+                        <div>
+                <h3> Static Data Members</h3>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">x</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">x<U*, T></a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">x<T, long></a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                        </div>
 
 
 </div>
@@ -50,8 +112,7 @@ <h3> Variables</h3>
 
 <div id="[object Object]">
     <div>
-        <h2><a href="#">A</a>::
-x</h2>
+        <h2>A::x</h2>
         
     </div>
 
@@ -59,7 +120,13 @@ <h2><a href="#">A</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><static-data-template.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<
@@ -77,8 +144,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2><a href="#">A</a>::
-x</h2>
+        <h2>A::x</h2>
         
     </div>
 
@@ -86,7 +152,13 @@ <h2><a href="#">A</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><static-data-template.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<typename U>
@@ -102,8 +174,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2><a href="#">A</a>::
-x</h2>
+        <h2>A::x</h2>
         
     </div>
 
@@ -111,7 +182,13 @@ <h2><a href="#">A</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><static-data-template.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<>
diff --git a/test-files/golden-tests/temp/c_mct_expl_inline.adoc b/test-files/golden-tests/temp/c_mct_expl_inline.adoc
index 2444b86a9e..8a43e145bc 100644
--- a/test-files/golden-tests/temp/c_mct_expl_inline.adoc
+++ b/test-files/golden-tests/temp/c_mct_expl_inline.adoc
@@ -22,7 +22,7 @@
 
 === Synopsis
 
-Declared in header `<temp/c_mct_expl_inline.cpp>`
+Declared in `<temp/c_mct_expl_inline.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -50,7 +50,7 @@ struct A;
 
 === Synopsis
 
-Declared in header `<temp/c_mct_expl_inline.cpp>`
+Declared in `<temp/c_mct_expl_inline.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -77,7 +77,7 @@ struct B;
 
 === Synopsis
 
-Declared in header `<temp/c_mct_expl_inline.cpp>`
+Declared in `<temp/c_mct_expl_inline.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -101,7 +101,7 @@ f();
 
 === Synopsis
 
-Declared in header `<temp/c_mct_expl_inline.cpp>`
+Declared in `<temp/c_mct_expl_inline.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -128,7 +128,7 @@ struct xref:A/B-04.adoc[pass:[B]]<int>;
 
 === Synopsis
 
-Declared in header `<temp/c_mct_expl_inline.cpp>`
+Declared in `<temp/c_mct_expl_inline.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
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 538e46aae0..a3c6d7fcb8 100644
--- a/test-files/golden-tests/temp/c_mct_expl_inline.html
+++ b/test-files/golden-tests/temp/c_mct_expl_inline.html
@@ -1,4 +1,4 @@
-</html>
+<html>
     <head></head>
     <body>
         <div>
@@ -11,10 +11,31 @@ <h1>Reference</h1>
         <h2>Global namespace</h2>
     </div>
     <div>
-            <div>
-                <h3> Types</h3>
-                    </div>
-    </div>
+        <div>
+            <h3> Types</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">A</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
+                </div>
 </div>
 
 [#[object Object]]
@@ -29,7 +50,13 @@ <h2>Class A</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><temp/c_mct_expl_inline.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct A;
@@ -37,10 +64,38 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-            <div>
-                <h3> Types</h3>
-                    </div>
-                    </div>
+        <div>
+            <h3> Types</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">B</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">B<int></a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
+                                                                                                        </div>
 
 
 </div>
@@ -49,8 +104,7 @@ <h3> Types</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Class <a href="#">A</a>::
-B</h2>
+        <h2>Class A::B</h2>
         
     </div>
 
@@ -58,7 +112,13 @@ <h2>Class <a href="#">A</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><temp/c_mct_expl_inline.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<typename T>
@@ -69,8 +129,29 @@ <h3>Synopsis</h3>
     <div>
             <div>
                 <h3> Member Functions</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                                    </div>
 
 
 </div>
@@ -79,9 +160,7 @@ <h3> Member Functions</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">A</a>::
-<a href="#">B</a>::
-f</h2>
+        <h2>Function A::B::f</h2>
         
     </div>
 
@@ -89,7 +168,13 @@ <h2>Function <a href="#">A</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><temp/c_mct_expl_inline.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -106,8 +191,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Class <a href="#">A</a>::
-B</h2>
+        <h2>Class A::B</h2>
         
     </div>
 
@@ -115,7 +199,13 @@ <h2>Class <a href="#">A</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><temp/c_mct_expl_inline.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<>
@@ -126,8 +216,29 @@ <h3>Synopsis</h3>
     <div>
             <div>
                 <h3> Member Functions</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">g</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                                    </div>
 
 
 </div>
@@ -136,9 +247,7 @@ <h3> Member Functions</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">A</a>::
-<a href="#">B</a>::
-g</h2>
+        <h2>Function A::B<int>::g</h2>
         
     </div>
 
@@ -146,7 +255,13 @@ <h2>Function <a href="#">A</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><temp/c_mct_expl_inline.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
diff --git a/test-files/golden-tests/temp/c_mct_expl_outside.adoc b/test-files/golden-tests/temp/c_mct_expl_outside.adoc
index dc17ea6cff..683d542f3c 100644
--- a/test-files/golden-tests/temp/c_mct_expl_outside.adoc
+++ b/test-files/golden-tests/temp/c_mct_expl_outside.adoc
@@ -22,7 +22,7 @@
 
 === Synopsis
 
-Declared in header `<temp/c_mct_expl_outside.cpp>`
+Declared in `<temp/c_mct_expl_outside.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -50,7 +50,7 @@ struct A;
 
 === Synopsis
 
-Declared in header `<temp/c_mct_expl_outside.cpp>`
+Declared in `<temp/c_mct_expl_outside.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -77,7 +77,7 @@ struct B;
 
 === Synopsis
 
-Declared in header `<temp/c_mct_expl_outside.cpp>`
+Declared in `<temp/c_mct_expl_outside.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -101,7 +101,7 @@ f();
 
 === Synopsis
 
-Declared in header `<temp/c_mct_expl_outside.cpp>`
+Declared in `<temp/c_mct_expl_outside.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -128,7 +128,7 @@ struct xref:A/B-04.adoc[pass:[B]]<int>;
 
 === Synopsis
 
-Declared in header `<temp/c_mct_expl_outside.cpp>`
+Declared in `<temp/c_mct_expl_outside.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
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 538e46aae0..8c8792fa4b 100644
--- a/test-files/golden-tests/temp/c_mct_expl_outside.html
+++ b/test-files/golden-tests/temp/c_mct_expl_outside.html
@@ -1,4 +1,4 @@
-</html>
+<html>
     <head></head>
     <body>
         <div>
@@ -11,10 +11,31 @@ <h1>Reference</h1>
         <h2>Global namespace</h2>
     </div>
     <div>
-            <div>
-                <h3> Types</h3>
-                    </div>
-    </div>
+        <div>
+            <h3> Types</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">A</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
+                </div>
 </div>
 
 [#[object Object]]
@@ -29,7 +50,13 @@ <h2>Class A</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><temp/c_mct_expl_outside.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct A;
@@ -37,10 +64,38 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-            <div>
-                <h3> Types</h3>
-                    </div>
-                    </div>
+        <div>
+            <h3> Types</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">B</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">B<int></a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
+                                                                                                        </div>
 
 
 </div>
@@ -49,8 +104,7 @@ <h3> Types</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Class <a href="#">A</a>::
-B</h2>
+        <h2>Class A::B</h2>
         
     </div>
 
@@ -58,7 +112,13 @@ <h2>Class <a href="#">A</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><temp/c_mct_expl_outside.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<typename T>
@@ -69,8 +129,29 @@ <h3>Synopsis</h3>
     <div>
             <div>
                 <h3> Member Functions</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                                    </div>
 
 
 </div>
@@ -79,9 +160,7 @@ <h3> Member Functions</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">A</a>::
-<a href="#">B</a>::
-f</h2>
+        <h2>Function A::B::f</h2>
         
     </div>
 
@@ -89,7 +168,13 @@ <h2>Function <a href="#">A</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><temp/c_mct_expl_outside.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -106,8 +191,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Class <a href="#">A</a>::
-B</h2>
+        <h2>Class A::B</h2>
         
     </div>
 
@@ -115,7 +199,13 @@ <h2>Class <a href="#">A</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><temp/c_mct_expl_outside.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<>
@@ -126,8 +216,29 @@ <h3>Synopsis</h3>
     <div>
             <div>
                 <h3> Member Functions</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">g</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                                    </div>
 
 
 </div>
@@ -136,9 +247,7 @@ <h3> Member Functions</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">A</a>::
-<a href="#">B</a>::
-g</h2>
+        <h2>Function A::B<int>::g</h2>
         
     </div>
 
@@ -146,7 +255,13 @@ <h2>Function <a href="#">A</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><temp/c_mct_expl_outside.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
diff --git a/test-files/golden-tests/temp/c_mft_expl_inline.adoc b/test-files/golden-tests/temp/c_mft_expl_inline.adoc
index d4f16fb16b..671ce058a3 100644
--- a/test-files/golden-tests/temp/c_mft_expl_inline.adoc
+++ b/test-files/golden-tests/temp/c_mft_expl_inline.adoc
@@ -22,7 +22,7 @@
 
 === Synopsis
 
-Declared in header `<temp/c_mft_expl_inline.cpp>`
+Declared in `<temp/c_mft_expl_inline.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -78,7 +78,7 @@ xref:A/f-0b.adoc[pass:[f]]<int>();
 
 === Synopsis
 
-Declared in header `<temp/c_mft_expl_inline.cpp>`
+Declared in `<temp/c_mft_expl_inline.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -103,7 +103,7 @@ f();
 
 === Synopsis
 
-Declared in header `<temp/c_mft_expl_inline.cpp>`
+Declared in `<temp/c_mft_expl_inline.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
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 dccb526218..e5cac3a2b9 100644
--- a/test-files/golden-tests/temp/c_mft_expl_inline.html
+++ b/test-files/golden-tests/temp/c_mft_expl_inline.html
@@ -1,4 +1,4 @@
-</html>
+<html>
     <head></head>
     <body>
         <div>
@@ -11,10 +11,31 @@ <h1>Reference</h1>
         <h2>Global namespace</h2>
     </div>
     <div>
-            <div>
-                <h3> Types</h3>
-                    </div>
-    </div>
+        <div>
+            <h3> Types</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">A</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
+                </div>
 </div>
 
 [#[object Object]]
@@ -29,7 +50,13 @@ <h2>Class A</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><temp/c_mft_expl_inline.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct A;
@@ -39,16 +66,35 @@ <h3>Synopsis</h3>
     <div>
             <div>
                 <h3> Member Functions</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f</a> 
+                                </td>
+                                <td>
+    </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                                    </div>
 
 
 </div>
 <meta name="relfileprefix" content="../">
 <div id="">
 
-<h1>Overload set <a href="#">A</a>::
-f</h1>
+<h1>Overload set A::f</h1>
 
 <h2>Members</h2>
 
@@ -75,8 +121,7 @@ <h2>Members</h2>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">A</a>::
-f</h2>
+        <h2>Function A::f</h2>
         
     </div>
 
@@ -84,7 +129,13 @@ <h2>Function <a href="#">A</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><temp/c_mft_expl_inline.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<typename T>
@@ -102,8 +153,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">A</a>::
-f</h2>
+        <h2>Function A::f</h2>
         
     </div>
 
@@ -111,7 +161,13 @@ <h2>Function <a href="#">A</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><temp/c_mft_expl_inline.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<>
diff --git a/test-files/golden-tests/temp/c_mft_expl_outside.adoc b/test-files/golden-tests/temp/c_mft_expl_outside.adoc
index 13cf5d890d..e83035010a 100644
--- a/test-files/golden-tests/temp/c_mft_expl_outside.adoc
+++ b/test-files/golden-tests/temp/c_mft_expl_outside.adoc
@@ -22,7 +22,7 @@
 
 === Synopsis
 
-Declared in header `<temp/c_mft_expl_outside.cpp>`
+Declared in `<temp/c_mft_expl_outside.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -78,7 +78,7 @@ xref:A/f-0b.adoc[pass:[f]]<int>();
 
 === Synopsis
 
-Declared in header `<temp/c_mft_expl_outside.cpp>`
+Declared in `<temp/c_mft_expl_outside.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -103,7 +103,7 @@ f();
 
 === Synopsis
 
-Declared in header `<temp/c_mft_expl_outside.cpp>`
+Declared in `<temp/c_mft_expl_outside.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
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 dccb526218..aeb51d005c 100644
--- a/test-files/golden-tests/temp/c_mft_expl_outside.html
+++ b/test-files/golden-tests/temp/c_mft_expl_outside.html
@@ -1,4 +1,4 @@
-</html>
+<html>
     <head></head>
     <body>
         <div>
@@ -11,10 +11,31 @@ <h1>Reference</h1>
         <h2>Global namespace</h2>
     </div>
     <div>
-            <div>
-                <h3> Types</h3>
-                    </div>
-    </div>
+        <div>
+            <h3> Types</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">A</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
+                </div>
 </div>
 
 [#[object Object]]
@@ -29,7 +50,13 @@ <h2>Class A</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><temp/c_mft_expl_outside.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct A;
@@ -39,16 +66,35 @@ <h3>Synopsis</h3>
     <div>
             <div>
                 <h3> Member Functions</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f</a> 
+                                </td>
+                                <td>
+    </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                                    </div>
 
 
 </div>
 <meta name="relfileprefix" content="../">
 <div id="">
 
-<h1>Overload set <a href="#">A</a>::
-f</h1>
+<h1>Overload set A::f</h1>
 
 <h2>Members</h2>
 
@@ -75,8 +121,7 @@ <h2>Members</h2>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">A</a>::
-f</h2>
+        <h2>Function A::f</h2>
         
     </div>
 
@@ -84,7 +129,13 @@ <h2>Function <a href="#">A</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><temp/c_mft_expl_outside.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<typename T>
@@ -102,8 +153,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">A</a>::
-f</h2>
+        <h2>Function A::f</h2>
         
     </div>
 
@@ -111,7 +161,13 @@ <h2>Function <a href="#">A</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><temp/c_mft_expl_outside.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<>
diff --git a/test-files/golden-tests/temp/ct_expl.adoc b/test-files/golden-tests/temp/ct_expl.adoc
index 1be05e01c7..768210f452 100644
--- a/test-files/golden-tests/temp/ct_expl.adoc
+++ b/test-files/golden-tests/temp/ct_expl.adoc
@@ -24,7 +24,7 @@
 
 === Synopsis
 
-Declared in header `<temp/ct_expl.cpp>`
+Declared in `<temp/ct_expl.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -51,7 +51,7 @@ struct A;
 
 === Synopsis
 
-Declared in header `<temp/ct_expl.cpp>`
+Declared in `<temp/ct_expl.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -75,7 +75,7 @@ f();
 
 === Synopsis
 
-Declared in header `<temp/ct_expl.cpp>`
+Declared in `<temp/ct_expl.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -102,7 +102,7 @@ struct xref:A-0e.adoc[pass:[A]]<int>;
 
 === Synopsis
 
-Declared in header `<temp/ct_expl.cpp>`
+Declared in `<temp/ct_expl.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
diff --git a/test-files/golden-tests/temp/ct_expl.html b/test-files/golden-tests/temp/ct_expl.html
index 5d7933ee5e..bec7ec5608 100644
--- a/test-files/golden-tests/temp/ct_expl.html
+++ b/test-files/golden-tests/temp/ct_expl.html
@@ -1,4 +1,4 @@
-</html>
+<html>
     <head></head>
     <body>
         <div>
@@ -11,10 +11,38 @@ <h1>Reference</h1>
         <h2>Global namespace</h2>
     </div>
     <div>
-            <div>
-                <h3> Types</h3>
-                    </div>
-    </div>
+        <div>
+            <h3> Types</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">A</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">A<int></a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
+                </div>
 </div>
 
 [#[object Object]]
@@ -29,7 +57,13 @@ <h2>Class A</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><temp/ct_expl.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<typename T>
@@ -40,8 +74,29 @@ <h3>Synopsis</h3>
     <div>
             <div>
                 <h3> Member Functions</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                                    </div>
 
 
 </div>
@@ -50,8 +105,7 @@ <h3> Member Functions</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">A</a>::
-f</h2>
+        <h2>Function A::f</h2>
         
     </div>
 
@@ -59,7 +113,13 @@ <h2>Function <a href="#">A</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><temp/ct_expl.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -84,7 +144,13 @@ <h2>Class A</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><temp/ct_expl.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<>
@@ -95,8 +161,29 @@ <h3>Synopsis</h3>
     <div>
             <div>
                 <h3> Member Functions</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">g</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                                    </div>
 
 
 </div>
@@ -105,8 +192,7 @@ <h3> Member Functions</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">A</a>::
-g</h2>
+        <h2>Function A<int>::g</h2>
         
     </div>
 
@@ -114,7 +200,13 @@ <h2>Function <a href="#">A</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><temp/ct_expl.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
diff --git a/test-files/golden-tests/temp/ct_mc.adoc b/test-files/golden-tests/temp/ct_mc.adoc
index 47400beef8..348550500e 100644
--- a/test-files/golden-tests/temp/ct_mc.adoc
+++ b/test-files/golden-tests/temp/ct_mc.adoc
@@ -22,7 +22,7 @@
 
 === Synopsis
 
-Declared in header `<temp/ct_mc.cpp>`
+Declared in `<temp/ct_mc.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -49,7 +49,7 @@ struct A;
 
 === Synopsis
 
-Declared in header `<temp/ct_mc.cpp>`
+Declared in `<temp/ct_mc.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -75,7 +75,7 @@ struct B;
 
 === Synopsis
 
-Declared in header `<temp/ct_mc.cpp>`
+Declared in `<temp/ct_mc.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
diff --git a/test-files/golden-tests/temp/ct_mc.html b/test-files/golden-tests/temp/ct_mc.html
index 745eec4579..e7a0ce9a06 100644
--- a/test-files/golden-tests/temp/ct_mc.html
+++ b/test-files/golden-tests/temp/ct_mc.html
@@ -1,4 +1,4 @@
-</html>
+<html>
     <head></head>
     <body>
         <div>
@@ -11,10 +11,31 @@ <h1>Reference</h1>
         <h2>Global namespace</h2>
     </div>
     <div>
-            <div>
-                <h3> Types</h3>
-                    </div>
-    </div>
+        <div>
+            <h3> Types</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">A</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
+                </div>
 </div>
 
 [#[object Object]]
@@ -29,7 +50,13 @@ <h2>Class A</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><temp/ct_mc.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<typename T>
@@ -38,10 +65,31 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-            <div>
-                <h3> Types</h3>
-                    </div>
-                    </div>
+        <div>
+            <h3> Types</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">B</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
+                                                                                                        </div>
 
 
 </div>
@@ -50,8 +98,7 @@ <h3> Types</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Class <a href="#">A</a>::
-B</h2>
+        <h2>Class A::B</h2>
         
     </div>
 
@@ -59,7 +106,13 @@ <h2>Class <a href="#">A</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><temp/ct_mc.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct B;
@@ -69,8 +122,29 @@ <h3>Synopsis</h3>
     <div>
             <div>
                 <h3> Member Functions</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                                    </div>
 
 
 </div>
@@ -79,9 +153,7 @@ <h3> Member Functions</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">A</a>::
-<a href="#">B</a>::
-f</h2>
+        <h2>Function A::B::f</h2>
         
     </div>
 
@@ -89,7 +161,13 @@ <h2>Function <a href="#">A</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><temp/ct_mc.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
diff --git a/test-files/golden-tests/temp/ct_mc_expl_outside.adoc b/test-files/golden-tests/temp/ct_mc_expl_outside.adoc
index ec0ac46888..860a805484 100644
--- a/test-files/golden-tests/temp/ct_mc_expl_outside.adoc
+++ b/test-files/golden-tests/temp/ct_mc_expl_outside.adoc
@@ -22,7 +22,7 @@
 
 === Synopsis
 
-Declared in header `<temp/ct_mc_expl_outside.cpp>`
+Declared in `<temp/ct_mc_expl_outside.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -49,7 +49,7 @@ struct A;
 
 === Synopsis
 
-Declared in header `<temp/ct_mc_expl_outside.cpp>`
+Declared in `<temp/ct_mc_expl_outside.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -75,7 +75,7 @@ struct B;
 
 === Synopsis
 
-Declared in header `<temp/ct_mc_expl_outside.cpp>`
+Declared in `<temp/ct_mc_expl_outside.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
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 7e4c3a69bc..dab4dc8f01 100644
--- a/test-files/golden-tests/temp/ct_mc_expl_outside.html
+++ b/test-files/golden-tests/temp/ct_mc_expl_outside.html
@@ -1,4 +1,4 @@
-</html>
+<html>
     <head></head>
     <body>
         <div>
@@ -11,10 +11,31 @@ <h1>Reference</h1>
         <h2>Global namespace</h2>
     </div>
     <div>
-            <div>
-                <h3> Types</h3>
-                    </div>
-    </div>
+        <div>
+            <h3> Types</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">A</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
+                </div>
 </div>
 
 [#[object Object]]
@@ -29,7 +50,13 @@ <h2>Class A</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><temp/ct_mc_expl_outside.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<typename T>
@@ -38,10 +65,31 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-            <div>
-                <h3> Types</h3>
-                    </div>
-                    </div>
+        <div>
+            <h3> Types</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">B</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
+                                                                                                        </div>
 
 
 </div>
@@ -50,8 +98,7 @@ <h3> Types</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Class <a href="#">A</a>::
-B</h2>
+        <h2>Class A::B</h2>
         
     </div>
 
@@ -59,7 +106,13 @@ <h2>Class <a href="#">A</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><temp/ct_mc_expl_outside.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct B;
@@ -69,8 +122,29 @@ <h3>Synopsis</h3>
     <div>
             <div>
                 <h3> Member Functions</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                                    </div>
 
 
 </div>
@@ -79,9 +153,7 @@ <h3> Member Functions</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">A</a>::
-<a href="#">B</a>::
-f</h2>
+        <h2>Function A::B::f</h2>
         
     </div>
 
@@ -89,7 +161,13 @@ <h2>Function <a href="#">A</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><temp/ct_mc_expl_outside.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
diff --git a/test-files/golden-tests/temp/ct_mct.adoc b/test-files/golden-tests/temp/ct_mct.adoc
index ea4f39fc2b..5f7b88f5a4 100644
--- a/test-files/golden-tests/temp/ct_mct.adoc
+++ b/test-files/golden-tests/temp/ct_mct.adoc
@@ -22,7 +22,7 @@
 
 === Synopsis
 
-Declared in header `<temp/ct_mct.cpp>`
+Declared in `<temp/ct_mct.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -49,7 +49,7 @@ struct A;
 
 === Synopsis
 
-Declared in header `<temp/ct_mct.cpp>`
+Declared in `<temp/ct_mct.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -76,7 +76,7 @@ struct B;
 
 === Synopsis
 
-Declared in header `<temp/ct_mct.cpp>`
+Declared in `<temp/ct_mct.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
diff --git a/test-files/golden-tests/temp/ct_mct.html b/test-files/golden-tests/temp/ct_mct.html
index df79ed9f57..33b5b00204 100644
--- a/test-files/golden-tests/temp/ct_mct.html
+++ b/test-files/golden-tests/temp/ct_mct.html
@@ -1,4 +1,4 @@
-</html>
+<html>
     <head></head>
     <body>
         <div>
@@ -11,10 +11,31 @@ <h1>Reference</h1>
         <h2>Global namespace</h2>
     </div>
     <div>
-            <div>
-                <h3> Types</h3>
-                    </div>
-    </div>
+        <div>
+            <h3> Types</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">A</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
+                </div>
 </div>
 
 [#[object Object]]
@@ -29,7 +50,13 @@ <h2>Class A</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><temp/ct_mct.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<typename T>
@@ -38,10 +65,31 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-            <div>
-                <h3> Types</h3>
-                    </div>
-                    </div>
+        <div>
+            <h3> Types</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">B</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
+                                                                                                        </div>
 
 
 </div>
@@ -50,8 +98,7 @@ <h3> Types</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Class <a href="#">A</a>::
-B</h2>
+        <h2>Class A::B</h2>
         
     </div>
 
@@ -59,7 +106,13 @@ <h2>Class <a href="#">A</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><temp/ct_mct.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<typename U>
@@ -70,8 +123,29 @@ <h3>Synopsis</h3>
     <div>
             <div>
                 <h3> Member Functions</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                                    </div>
 
 
 </div>
@@ -80,9 +154,7 @@ <h3> Member Functions</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">A</a>::
-<a href="#">B</a>::
-f</h2>
+        <h2>Function A::B::f</h2>
         
     </div>
 
@@ -90,7 +162,13 @@ <h2>Function <a href="#">A</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><temp/ct_mct.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
diff --git a/test-files/golden-tests/temp/ct_mct_expl_inline.adoc b/test-files/golden-tests/temp/ct_mct_expl_inline.adoc
index 511b14249c..e61a48be65 100644
--- a/test-files/golden-tests/temp/ct_mct_expl_inline.adoc
+++ b/test-files/golden-tests/temp/ct_mct_expl_inline.adoc
@@ -22,7 +22,7 @@
 
 === Synopsis
 
-Declared in header `<temp/ct_mct_expl_inline.cpp>`
+Declared in `<temp/ct_mct_expl_inline.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -51,7 +51,7 @@ struct A;
 
 === Synopsis
 
-Declared in header `<temp/ct_mct_expl_inline.cpp>`
+Declared in `<temp/ct_mct_expl_inline.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -78,7 +78,7 @@ struct B;
 
 === Synopsis
 
-Declared in header `<temp/ct_mct_expl_inline.cpp>`
+Declared in `<temp/ct_mct_expl_inline.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -102,7 +102,7 @@ f();
 
 === Synopsis
 
-Declared in header `<temp/ct_mct_expl_inline.cpp>`
+Declared in `<temp/ct_mct_expl_inline.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -129,7 +129,7 @@ struct xref:A/B-07.adoc[pass:[B]]<int>;
 
 === Synopsis
 
-Declared in header `<temp/ct_mct_expl_inline.cpp>`
+Declared in `<temp/ct_mct_expl_inline.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
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 ca65f13748..4986ea5a79 100644
--- a/test-files/golden-tests/temp/ct_mct_expl_inline.html
+++ b/test-files/golden-tests/temp/ct_mct_expl_inline.html
@@ -1,4 +1,4 @@
-</html>
+<html>
     <head></head>
     <body>
         <div>
@@ -11,10 +11,31 @@ <h1>Reference</h1>
         <h2>Global namespace</h2>
     </div>
     <div>
-            <div>
-                <h3> Types</h3>
-                    </div>
-    </div>
+        <div>
+            <h3> Types</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">A</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
+                </div>
 </div>
 
 [#[object Object]]
@@ -29,7 +50,13 @@ <h2>Class A</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><temp/ct_mct_expl_inline.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<typename T>
@@ -38,10 +65,38 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-            <div>
-                <h3> Types</h3>
-                    </div>
-                    </div>
+        <div>
+            <h3> Types</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">B</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">B<int></a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
+                                                                                                        </div>
 
 
 </div>
@@ -50,8 +105,7 @@ <h3> Types</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Class <a href="#">A</a>::
-B</h2>
+        <h2>Class A::B</h2>
         
     </div>
 
@@ -59,7 +113,13 @@ <h2>Class <a href="#">A</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><temp/ct_mct_expl_inline.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<typename U>
@@ -70,8 +130,29 @@ <h3>Synopsis</h3>
     <div>
             <div>
                 <h3> Member Functions</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                                    </div>
 
 
 </div>
@@ -80,9 +161,7 @@ <h3> Member Functions</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">A</a>::
-<a href="#">B</a>::
-f</h2>
+        <h2>Function A::B::f</h2>
         
     </div>
 
@@ -90,7 +169,13 @@ <h2>Function <a href="#">A</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><temp/ct_mct_expl_inline.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -107,8 +192,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Class <a href="#">A</a>::
-B</h2>
+        <h2>Class A::B</h2>
         
     </div>
 
@@ -116,7 +200,13 @@ <h2>Class <a href="#">A</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><temp/ct_mct_expl_inline.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<>
@@ -127,8 +217,29 @@ <h3>Synopsis</h3>
     <div>
             <div>
                 <h3> Member Functions</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">g</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                                    </div>
 
 
 </div>
@@ -137,9 +248,7 @@ <h3> Member Functions</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">A</a>::
-<a href="#">B</a>::
-g</h2>
+        <h2>Function A::B<int>::g</h2>
         
     </div>
 
@@ -147,7 +256,13 @@ <h2>Function <a href="#">A</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><temp/ct_mct_expl_inline.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
diff --git a/test-files/golden-tests/temp/ct_mct_expl_outside.adoc b/test-files/golden-tests/temp/ct_mct_expl_outside.adoc
index daf0ad343e..28b572b71b 100644
--- a/test-files/golden-tests/temp/ct_mct_expl_outside.adoc
+++ b/test-files/golden-tests/temp/ct_mct_expl_outside.adoc
@@ -22,7 +22,7 @@
 
 === Synopsis
 
-Declared in header `<temp/ct_mct_expl_outside.cpp>`
+Declared in `<temp/ct_mct_expl_outside.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -49,7 +49,7 @@ struct A;
 
 === Synopsis
 
-Declared in header `<temp/ct_mct_expl_outside.cpp>`
+Declared in `<temp/ct_mct_expl_outside.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -76,7 +76,7 @@ struct B;
 
 === Synopsis
 
-Declared in header `<temp/ct_mct_expl_outside.cpp>`
+Declared in `<temp/ct_mct_expl_outside.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
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 b3a491a729..6089f838c9 100644
--- a/test-files/golden-tests/temp/ct_mct_expl_outside.html
+++ b/test-files/golden-tests/temp/ct_mct_expl_outside.html
@@ -1,4 +1,4 @@
-</html>
+<html>
     <head></head>
     <body>
         <div>
@@ -11,10 +11,31 @@ <h1>Reference</h1>
         <h2>Global namespace</h2>
     </div>
     <div>
-            <div>
-                <h3> Types</h3>
-                    </div>
-    </div>
+        <div>
+            <h3> Types</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">A</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
+                </div>
 </div>
 
 [#[object Object]]
@@ -29,7 +50,13 @@ <h2>Class A</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><temp/ct_mct_expl_outside.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<typename T>
@@ -38,10 +65,31 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-            <div>
-                <h3> Types</h3>
-                    </div>
-                    </div>
+        <div>
+            <h3> Types</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">B</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
+                                                                                                        </div>
 
 
 </div>
@@ -50,8 +98,7 @@ <h3> Types</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Class <a href="#">A</a>::
-B</h2>
+        <h2>Class A::B</h2>
         
     </div>
 
@@ -59,7 +106,13 @@ <h2>Class <a href="#">A</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><temp/ct_mct_expl_outside.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<typename U>
@@ -70,8 +123,29 @@ <h3>Synopsis</h3>
     <div>
             <div>
                 <h3> Member Functions</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                                    </div>
 
 
 </div>
@@ -80,9 +154,7 @@ <h3> Member Functions</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">A</a>::
-<a href="#">B</a>::
-f</h2>
+        <h2>Function A::B::f</h2>
         
     </div>
 
@@ -90,7 +162,13 @@ <h2>Function <a href="#">A</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><temp/ct_mct_expl_outside.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
diff --git a/test-files/golden-tests/temp/ct_mf.adoc b/test-files/golden-tests/temp/ct_mf.adoc
index d30027a1d7..b23c0951de 100644
--- a/test-files/golden-tests/temp/ct_mf.adoc
+++ b/test-files/golden-tests/temp/ct_mf.adoc
@@ -22,7 +22,7 @@
 
 === Synopsis
 
-Declared in header `<temp/ct_mf.cpp>`
+Declared in `<temp/ct_mf.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -49,7 +49,7 @@ struct A;
 
 === Synopsis
 
-Declared in header `<temp/ct_mf.cpp>`
+Declared in `<temp/ct_mf.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
diff --git a/test-files/golden-tests/temp/ct_mf.html b/test-files/golden-tests/temp/ct_mf.html
index 1b4cbd477c..cfe60cf00c 100644
--- a/test-files/golden-tests/temp/ct_mf.html
+++ b/test-files/golden-tests/temp/ct_mf.html
@@ -1,4 +1,4 @@
-</html>
+<html>
     <head></head>
     <body>
         <div>
@@ -11,10 +11,31 @@ <h1>Reference</h1>
         <h2>Global namespace</h2>
     </div>
     <div>
-            <div>
-                <h3> Types</h3>
-                    </div>
-    </div>
+        <div>
+            <h3> Types</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">A</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
+                </div>
 </div>
 
 [#[object Object]]
@@ -29,7 +50,13 @@ <h2>Class A</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><temp/ct_mf.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<typename T>
@@ -40,8 +67,29 @@ <h3>Synopsis</h3>
     <div>
             <div>
                 <h3> Member Functions</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                                    </div>
 
 
 </div>
@@ -50,8 +98,7 @@ <h3> Member Functions</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">A</a>::
-f</h2>
+        <h2>Function A::f</h2>
         
     </div>
 
@@ -59,7 +106,13 @@ <h2>Function <a href="#">A</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><temp/ct_mf.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
diff --git a/test-files/golden-tests/temp/ct_mf_expl_outside.adoc b/test-files/golden-tests/temp/ct_mf_expl_outside.adoc
index 87909ba852..1900b3b6c9 100644
--- a/test-files/golden-tests/temp/ct_mf_expl_outside.adoc
+++ b/test-files/golden-tests/temp/ct_mf_expl_outside.adoc
@@ -22,7 +22,7 @@
 
 === Synopsis
 
-Declared in header `<temp/ct_mf_expl_outside.cpp>`
+Declared in `<temp/ct_mf_expl_outside.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -49,7 +49,7 @@ struct A;
 
 === Synopsis
 
-Declared in header `<temp/ct_mf_expl_outside.cpp>`
+Declared in `<temp/ct_mf_expl_outside.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
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 2f6f608ad4..c0254412f5 100644
--- a/test-files/golden-tests/temp/ct_mf_expl_outside.html
+++ b/test-files/golden-tests/temp/ct_mf_expl_outside.html
@@ -1,4 +1,4 @@
-</html>
+<html>
     <head></head>
     <body>
         <div>
@@ -11,10 +11,31 @@ <h1>Reference</h1>
         <h2>Global namespace</h2>
     </div>
     <div>
-            <div>
-                <h3> Types</h3>
-                    </div>
-    </div>
+        <div>
+            <h3> Types</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">A</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
+                </div>
 </div>
 
 [#[object Object]]
@@ -29,7 +50,13 @@ <h2>Class A</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><temp/ct_mf_expl_outside.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<typename T>
@@ -40,8 +67,29 @@ <h3>Synopsis</h3>
     <div>
             <div>
                 <h3> Member Functions</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                                    </div>
 
 
 </div>
@@ -50,8 +98,7 @@ <h3> Member Functions</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">A</a>::
-f</h2>
+        <h2>Function A::f</h2>
         
     </div>
 
@@ -59,7 +106,13 @@ <h2>Function <a href="#">A</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><temp/ct_mf_expl_outside.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
diff --git a/test-files/golden-tests/temp/ct_mft.adoc b/test-files/golden-tests/temp/ct_mft.adoc
index 3ea22b5df5..998e3b8526 100644
--- a/test-files/golden-tests/temp/ct_mft.adoc
+++ b/test-files/golden-tests/temp/ct_mft.adoc
@@ -22,7 +22,7 @@
 
 === Synopsis
 
-Declared in header `<temp/ct_mft.cpp>`
+Declared in `<temp/ct_mft.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -49,7 +49,7 @@ struct A;
 
 === Synopsis
 
-Declared in header `<temp/ct_mft.cpp>`
+Declared in `<temp/ct_mft.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
diff --git a/test-files/golden-tests/temp/ct_mft.html b/test-files/golden-tests/temp/ct_mft.html
index 58d1eb5a95..ed697e41db 100644
--- a/test-files/golden-tests/temp/ct_mft.html
+++ b/test-files/golden-tests/temp/ct_mft.html
@@ -1,4 +1,4 @@
-</html>
+<html>
     <head></head>
     <body>
         <div>
@@ -11,10 +11,31 @@ <h1>Reference</h1>
         <h2>Global namespace</h2>
     </div>
     <div>
-            <div>
-                <h3> Types</h3>
-                    </div>
-    </div>
+        <div>
+            <h3> Types</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">A</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
+                </div>
 </div>
 
 [#[object Object]]
@@ -29,7 +50,13 @@ <h2>Class A</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><temp/ct_mft.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<typename T>
@@ -40,8 +67,29 @@ <h3>Synopsis</h3>
     <div>
             <div>
                 <h3> Member Functions</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                                    </div>
 
 
 </div>
@@ -50,8 +98,7 @@ <h3> Member Functions</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">A</a>::
-f</h2>
+        <h2>Function A::f</h2>
         
     </div>
 
@@ -59,7 +106,13 @@ <h2>Function <a href="#">A</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><temp/ct_mft.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<typename U>
diff --git a/test-files/golden-tests/temp/ct_mft_expl_inline.adoc b/test-files/golden-tests/temp/ct_mft_expl_inline.adoc
index 89c14bb30a..201ceb6efc 100644
--- a/test-files/golden-tests/temp/ct_mft_expl_inline.adoc
+++ b/test-files/golden-tests/temp/ct_mft_expl_inline.adoc
@@ -22,7 +22,7 @@
 
 === Synopsis
 
-Declared in header `<temp/ct_mft_expl_inline.cpp>`
+Declared in `<temp/ct_mft_expl_inline.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -79,7 +79,7 @@ xref:A/f-04.adoc[pass:[f]]<int>();
 
 === Synopsis
 
-Declared in header `<temp/ct_mft_expl_inline.cpp>`
+Declared in `<temp/ct_mft_expl_inline.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -104,7 +104,7 @@ f();
 
 === Synopsis
 
-Declared in header `<temp/ct_mft_expl_inline.cpp>`
+Declared in `<temp/ct_mft_expl_inline.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
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 f0ab755472..c03553bdc7 100644
--- a/test-files/golden-tests/temp/ct_mft_expl_inline.html
+++ b/test-files/golden-tests/temp/ct_mft_expl_inline.html
@@ -1,4 +1,4 @@
-</html>
+<html>
     <head></head>
     <body>
         <div>
@@ -11,10 +11,31 @@ <h1>Reference</h1>
         <h2>Global namespace</h2>
     </div>
     <div>
-            <div>
-                <h3> Types</h3>
-                    </div>
-    </div>
+        <div>
+            <h3> Types</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">A</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
+                </div>
 </div>
 
 [#[object Object]]
@@ -29,7 +50,13 @@ <h2>Class A</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><temp/ct_mft_expl_inline.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<typename T>
@@ -40,16 +67,35 @@ <h3>Synopsis</h3>
     <div>
             <div>
                 <h3> Member Functions</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f</a> 
+                                </td>
+                                <td>
+    </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                                    </div>
 
 
 </div>
 <meta name="relfileprefix" content="../">
 <div id="">
 
-<h1>Overload set <a href="#">A</a>::
-f</h1>
+<h1>Overload set A::f</h1>
 
 <h2>Members</h2>
 
@@ -76,8 +122,7 @@ <h2>Members</h2>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">A</a>::
-f</h2>
+        <h2>Function A::f</h2>
         
     </div>
 
@@ -85,7 +130,13 @@ <h2>Function <a href="#">A</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><temp/ct_mft_expl_inline.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<typename U>
@@ -103,8 +154,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">A</a>::
-f</h2>
+        <h2>Function A::f</h2>
         
     </div>
 
@@ -112,7 +162,13 @@ <h2>Function <a href="#">A</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><temp/ct_mft_expl_inline.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<>
diff --git a/test-files/golden-tests/temp/ct_mft_expl_outside.adoc b/test-files/golden-tests/temp/ct_mft_expl_outside.adoc
index d6703619b8..c4276acaa2 100644
--- a/test-files/golden-tests/temp/ct_mft_expl_outside.adoc
+++ b/test-files/golden-tests/temp/ct_mft_expl_outside.adoc
@@ -22,7 +22,7 @@
 
 === Synopsis
 
-Declared in header `<temp/ct_mft_expl_outside.cpp>`
+Declared in `<temp/ct_mft_expl_outside.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -49,7 +49,7 @@ struct A;
 
 === Synopsis
 
-Declared in header `<temp/ct_mft_expl_outside.cpp>`
+Declared in `<temp/ct_mft_expl_outside.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
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 cb419636c9..02dedf12f5 100644
--- a/test-files/golden-tests/temp/ct_mft_expl_outside.html
+++ b/test-files/golden-tests/temp/ct_mft_expl_outside.html
@@ -1,4 +1,4 @@
-</html>
+<html>
     <head></head>
     <body>
         <div>
@@ -11,10 +11,31 @@ <h1>Reference</h1>
         <h2>Global namespace</h2>
     </div>
     <div>
-            <div>
-                <h3> Types</h3>
-                    </div>
-    </div>
+        <div>
+            <h3> Types</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">A</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
+                </div>
 </div>
 
 [#[object Object]]
@@ -29,7 +50,13 @@ <h2>Class A</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><temp/ct_mft_expl_outside.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<typename T>
@@ -40,8 +67,29 @@ <h3>Synopsis</h3>
     <div>
             <div>
                 <h3> Member Functions</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                                    </div>
 
 
 </div>
@@ -50,8 +98,7 @@ <h3> Member Functions</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">A</a>::
-f</h2>
+        <h2>Function A::f</h2>
         
     </div>
 
@@ -59,7 +106,13 @@ <h2>Function <a href="#">A</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><temp/ct_mft_expl_outside.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<typename U>
diff --git a/test-files/golden-tests/temp/ft_expl.adoc b/test-files/golden-tests/temp/ft_expl.adoc
index 72225b6650..035f2278db 100644
--- a/test-files/golden-tests/temp/ft_expl.adoc
+++ b/test-files/golden-tests/temp/ft_expl.adoc
@@ -52,7 +52,7 @@ xref:f-0c.adoc[pass:[f]]<int>();
 
 === Synopsis
 
-Declared in header `<temp/ft_expl.cpp>`
+Declared in `<temp/ft_expl.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -77,7 +77,7 @@ f();
 
 === Synopsis
 
-Declared in header `<temp/ft_expl.cpp>`
+Declared in `<temp/ft_expl.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
diff --git a/test-files/golden-tests/temp/ft_expl.html b/test-files/golden-tests/temp/ft_expl.html
index 2e9632ed16..f6ff07970c 100644
--- a/test-files/golden-tests/temp/ft_expl.html
+++ b/test-files/golden-tests/temp/ft_expl.html
@@ -1,4 +1,4 @@
-</html>
+<html>
     <head></head>
     <body>
         <div>
@@ -12,9 +12,29 @@ <h2>Global namespace</h2>
     </div>
     <div>
             <div>
-                <h3> Member Functions</h3>
-                    </div>
-    </div>
+                <h3>Functions</h3>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f</a> 
+                                </td>
+                                <td>
+    </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+            </div>
 </div>
 
 <div id="">
@@ -54,7 +74,13 @@ <h2>Function f</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><temp/ft_expl.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<typename T>
@@ -80,7 +106,13 @@ <h2>Function f</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><temp/ft_expl.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<>
diff --git a/test-files/golden-tests/type-resolution.adoc b/test-files/golden-tests/type-resolution.adoc
index c9c9a538f2..89c63f6adc 100644
--- a/test-files/golden-tests/type-resolution.adoc
+++ b/test-files/golden-tests/type-resolution.adoc
@@ -125,7 +125,7 @@
 
 === Synopsis
 
-Declared in header `<type-resolution.cpp>`
+Declared in `<type-resolution.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -144,7 +144,7 @@ struct A;
 
 === Synopsis
 
-Declared in header `<type-resolution.cpp>`
+Declared in `<type-resolution.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -166,7 +166,7 @@ struct B;
 
 === Synopsis
 
-Declared in header `<type-resolution.cpp>`
+Declared in `<type-resolution.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -183,7 +183,7 @@ using C = xref:A.adoc[A];
 
 === Synopsis
 
-Declared in header `<type-resolution.cpp>`
+Declared in `<type-resolution.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -200,7 +200,7 @@ using D = xref:B.adoc[B]<short, long>;
 
 === Synopsis
 
-Declared in header `<type-resolution.cpp>`
+Declared in `<type-resolution.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -218,7 +218,7 @@ using E = xref:B.adoc[B]<T, long>;
 
 === Synopsis
 
-Declared in header `<type-resolution.cpp>`
+Declared in `<type-resolution.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -242,7 +242,7 @@ f0(xref:A.adoc[A]);
 
 === Synopsis
 
-Declared in header `<type-resolution.cpp>`
+Declared in `<type-resolution.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -266,7 +266,7 @@ f1(xref:A.adoc[A] const);
 
 === Synopsis
 
-Declared in header `<type-resolution.cpp>`
+Declared in `<type-resolution.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -290,7 +290,7 @@ f2(xref:A.adoc[A]&);
 
 === Synopsis
 
-Declared in header `<type-resolution.cpp>`
+Declared in `<type-resolution.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -314,7 +314,7 @@ f3(xref:A.adoc[A] const&);
 
 === Synopsis
 
-Declared in header `<type-resolution.cpp>`
+Declared in `<type-resolution.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -338,7 +338,7 @@ f4(xref:A.adoc[A]*);
 
 === Synopsis
 
-Declared in header `<type-resolution.cpp>`
+Declared in `<type-resolution.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -362,7 +362,7 @@ f5(xref:A.adoc[A] const*);
 
 === Synopsis
 
-Declared in header `<type-resolution.cpp>`
+Declared in `<type-resolution.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -386,7 +386,7 @@ f6(xref:A.adoc[A]**);
 
 === Synopsis
 
-Declared in header `<type-resolution.cpp>`
+Declared in `<type-resolution.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -410,7 +410,7 @@ f7(xref:A.adoc[A] const**);
 
 === Synopsis
 
-Declared in header `<type-resolution.cpp>`
+Declared in `<type-resolution.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -434,7 +434,7 @@ f8(xref:A.adoc[A] const const**);
 
 === Synopsis
 
-Declared in header `<type-resolution.cpp>`
+Declared in `<type-resolution.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -458,7 +458,7 @@ g0(xref:C.adoc[C]);
 
 === Synopsis
 
-Declared in header `<type-resolution.cpp>`
+Declared in `<type-resolution.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -482,7 +482,7 @@ g1(xref:C.adoc[C] const);
 
 === Synopsis
 
-Declared in header `<type-resolution.cpp>`
+Declared in `<type-resolution.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -506,7 +506,7 @@ g2(xref:C.adoc[C]&);
 
 === Synopsis
 
-Declared in header `<type-resolution.cpp>`
+Declared in `<type-resolution.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -530,7 +530,7 @@ g3(xref:C.adoc[C] const&);
 
 === Synopsis
 
-Declared in header `<type-resolution.cpp>`
+Declared in `<type-resolution.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -554,7 +554,7 @@ g4(xref:C.adoc[C]*);
 
 === Synopsis
 
-Declared in header `<type-resolution.cpp>`
+Declared in `<type-resolution.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -578,7 +578,7 @@ g5(xref:C.adoc[C] const*);
 
 === Synopsis
 
-Declared in header `<type-resolution.cpp>`
+Declared in `<type-resolution.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -602,7 +602,7 @@ g6(xref:C.adoc[C]**);
 
 === Synopsis
 
-Declared in header `<type-resolution.cpp>`
+Declared in `<type-resolution.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -626,7 +626,7 @@ g7(xref:C.adoc[C] const**);
 
 === Synopsis
 
-Declared in header `<type-resolution.cpp>`
+Declared in `<type-resolution.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -650,7 +650,7 @@ g8(xref:C.adoc[C] const const**);
 
 === Synopsis
 
-Declared in header `<type-resolution.cpp>`
+Declared in `<type-resolution.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -674,7 +674,7 @@ h0(xref:B.adoc[B]<short, long>);
 
 === Synopsis
 
-Declared in header `<type-resolution.cpp>`
+Declared in `<type-resolution.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -698,7 +698,7 @@ h1(xref:B.adoc[B]<short, long> const);
 
 === Synopsis
 
-Declared in header `<type-resolution.cpp>`
+Declared in `<type-resolution.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -722,7 +722,7 @@ h2(xref:B.adoc[B]<short, long>&);
 
 === Synopsis
 
-Declared in header `<type-resolution.cpp>`
+Declared in `<type-resolution.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -746,7 +746,7 @@ h3(xref:B.adoc[B]<short, long> const&);
 
 === Synopsis
 
-Declared in header `<type-resolution.cpp>`
+Declared in `<type-resolution.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -770,7 +770,7 @@ h4(xref:B.adoc[B]<short, long>*);
 
 === Synopsis
 
-Declared in header `<type-resolution.cpp>`
+Declared in `<type-resolution.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -794,7 +794,7 @@ h5(xref:B.adoc[B]<short, long> const*);
 
 === Synopsis
 
-Declared in header `<type-resolution.cpp>`
+Declared in `<type-resolution.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -818,7 +818,7 @@ h6(xref:B.adoc[B]<short, long>**);
 
 === Synopsis
 
-Declared in header `<type-resolution.cpp>`
+Declared in `<type-resolution.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -842,7 +842,7 @@ h7(xref:B.adoc[B]<short, long> const**);
 
 === Synopsis
 
-Declared in header `<type-resolution.cpp>`
+Declared in `<type-resolution.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -866,7 +866,7 @@ h8(xref:B.adoc[B]<short, long> const const**);
 
 === Synopsis
 
-Declared in header `<type-resolution.cpp>`
+Declared in `<type-resolution.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -890,7 +890,7 @@ i0(xref:D.adoc[D]);
 
 === Synopsis
 
-Declared in header `<type-resolution.cpp>`
+Declared in `<type-resolution.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -914,7 +914,7 @@ i1(xref:D.adoc[D] const);
 
 === Synopsis
 
-Declared in header `<type-resolution.cpp>`
+Declared in `<type-resolution.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -938,7 +938,7 @@ i2(xref:D.adoc[D]&);
 
 === Synopsis
 
-Declared in header `<type-resolution.cpp>`
+Declared in `<type-resolution.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -962,7 +962,7 @@ i3(xref:D.adoc[D] const&);
 
 === Synopsis
 
-Declared in header `<type-resolution.cpp>`
+Declared in `<type-resolution.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -986,7 +986,7 @@ i4(xref:D.adoc[D]*);
 
 === Synopsis
 
-Declared in header `<type-resolution.cpp>`
+Declared in `<type-resolution.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -1010,7 +1010,7 @@ i5(xref:D.adoc[D] const*);
 
 === Synopsis
 
-Declared in header `<type-resolution.cpp>`
+Declared in `<type-resolution.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -1034,7 +1034,7 @@ i6(xref:D.adoc[D]**);
 
 === Synopsis
 
-Declared in header `<type-resolution.cpp>`
+Declared in `<type-resolution.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -1058,7 +1058,7 @@ i7(xref:D.adoc[D] const**);
 
 === Synopsis
 
-Declared in header `<type-resolution.cpp>`
+Declared in `<type-resolution.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -1082,7 +1082,7 @@ i8(xref:D.adoc[D] const const**);
 
 === Synopsis
 
-Declared in header `<type-resolution.cpp>`
+Declared in `<type-resolution.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -1106,7 +1106,7 @@ j0(xref:E.adoc[E]<short>);
 
 === Synopsis
 
-Declared in header `<type-resolution.cpp>`
+Declared in `<type-resolution.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -1130,7 +1130,7 @@ j1(xref:E.adoc[E]<short> const);
 
 === Synopsis
 
-Declared in header `<type-resolution.cpp>`
+Declared in `<type-resolution.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -1154,7 +1154,7 @@ j2(xref:E.adoc[E]<short>&);
 
 === Synopsis
 
-Declared in header `<type-resolution.cpp>`
+Declared in `<type-resolution.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -1178,7 +1178,7 @@ j3(xref:E.adoc[E]<short> const&);
 
 === Synopsis
 
-Declared in header `<type-resolution.cpp>`
+Declared in `<type-resolution.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -1202,7 +1202,7 @@ j4(xref:E.adoc[E]<short>*);
 
 === Synopsis
 
-Declared in header `<type-resolution.cpp>`
+Declared in `<type-resolution.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -1226,7 +1226,7 @@ j5(xref:E.adoc[E]<short> const*);
 
 === Synopsis
 
-Declared in header `<type-resolution.cpp>`
+Declared in `<type-resolution.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -1250,7 +1250,7 @@ j6(xref:E.adoc[E]<short>**);
 
 === Synopsis
 
-Declared in header `<type-resolution.cpp>`
+Declared in `<type-resolution.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -1274,7 +1274,7 @@ j7(xref:E.adoc[E]<short> const**);
 
 === Synopsis
 
-Declared in header `<type-resolution.cpp>`
+Declared in `<type-resolution.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
diff --git a/test-files/golden-tests/type-resolution.html b/test-files/golden-tests/type-resolution.html
index 69c2361e20..10d2a5a5fc 100644
--- a/test-files/golden-tests/type-resolution.html
+++ b/test-files/golden-tests/type-resolution.html
@@ -1,4 +1,4 @@
-</html>
+<html>
     <head></head>
     <body>
         <div>
@@ -11,16 +11,391 @@ <h1>Reference</h1>
         <h2>Global namespace</h2>
     </div>
     <div>
-            <div>
-                <h3> Types</h3>
-                    </div>
+        <div>
+            <h3> Types</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">A</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">B</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">C</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">D</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">E</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
     <div>
-            <h3>Types</h3>
+                <h3>Functions</h3>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f0</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">f1</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">f2</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">f3</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">f4</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">f5</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">f6</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">f7</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">f8</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">g0</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">g1</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">g2</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">g3</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">g4</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">g5</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">g6</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">g7</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">g8</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">h0</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">h1</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">h2</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">h3</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">h4</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">h5</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">h6</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">h7</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">h8</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">i0</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">i1</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">i2</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">i3</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">i4</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">i5</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">i6</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">i7</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">i8</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">j0</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">j1</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">j2</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">j3</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">j4</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">j5</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">j6</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">j7</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">j8</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
             </div>
-    <div>
-                <h3> Member Functions</h3>
-                    </div>
-    </div>
 </div>
 
 [#[object Object]]
@@ -35,7 +410,13 @@ <h2>Class A</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><type-resolution.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct A;
@@ -43,7 +424,7 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-                            </div>
+                                                                                                                </div>
 
 
 </div>
@@ -60,7 +441,13 @@ <h2>Class B</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><type-resolution.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<
@@ -71,7 +458,7 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-                            </div>
+                                                                                                                </div>
 
 
 </div>
@@ -88,7 +475,13 @@ <h2>C</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><type-resolution.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             using C = A;
@@ -109,7 +502,13 @@ <h2>D</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><type-resolution.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             using D = B<short, long>;
@@ -130,7 +529,13 @@ <h2>E</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><type-resolution.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<typename T>
@@ -152,7 +557,13 @@ <h2>Function f0</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><type-resolution.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -177,7 +588,13 @@ <h2>Function f1</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><type-resolution.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -202,7 +619,13 @@ <h2>Function f2</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><type-resolution.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -227,7 +650,13 @@ <h2>Function f3</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><type-resolution.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -252,7 +681,13 @@ <h2>Function f4</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><type-resolution.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -277,7 +712,13 @@ <h2>Function f5</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><type-resolution.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -302,7 +743,13 @@ <h2>Function f6</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><type-resolution.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -327,7 +774,13 @@ <h2>Function f7</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><type-resolution.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -352,7 +805,13 @@ <h2>Function f8</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><type-resolution.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -377,7 +836,13 @@ <h2>Function g0</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><type-resolution.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -402,7 +867,13 @@ <h2>Function g1</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><type-resolution.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -427,7 +898,13 @@ <h2>Function g2</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><type-resolution.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -452,7 +929,13 @@ <h2>Function g3</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><type-resolution.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -477,7 +960,13 @@ <h2>Function g4</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><type-resolution.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -502,7 +991,13 @@ <h2>Function g5</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><type-resolution.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -527,7 +1022,13 @@ <h2>Function g6</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><type-resolution.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -552,7 +1053,13 @@ <h2>Function g7</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><type-resolution.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -577,7 +1084,13 @@ <h2>Function g8</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><type-resolution.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -602,7 +1115,13 @@ <h2>Function h0</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><type-resolution.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -627,7 +1146,13 @@ <h2>Function h1</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><type-resolution.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -652,7 +1177,13 @@ <h2>Function h2</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><type-resolution.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -677,7 +1208,13 @@ <h2>Function h3</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><type-resolution.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -702,7 +1239,13 @@ <h2>Function h4</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><type-resolution.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -727,7 +1270,13 @@ <h2>Function h5</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><type-resolution.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -752,7 +1301,13 @@ <h2>Function h6</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><type-resolution.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -777,7 +1332,13 @@ <h2>Function h7</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><type-resolution.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -802,7 +1363,13 @@ <h2>Function h8</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><type-resolution.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -827,7 +1394,13 @@ <h2>Function i0</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><type-resolution.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -852,7 +1425,13 @@ <h2>Function i1</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><type-resolution.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -877,7 +1456,13 @@ <h2>Function i2</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><type-resolution.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -902,7 +1487,13 @@ <h2>Function i3</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><type-resolution.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -927,7 +1518,13 @@ <h2>Function i4</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><type-resolution.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -952,7 +1549,13 @@ <h2>Function i5</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><type-resolution.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -977,7 +1580,13 @@ <h2>Function i6</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><type-resolution.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -1002,7 +1611,13 @@ <h2>Function i7</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><type-resolution.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -1027,7 +1642,13 @@ <h2>Function i8</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><type-resolution.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -1052,7 +1673,13 @@ <h2>Function j0</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><type-resolution.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -1077,7 +1704,13 @@ <h2>Function j1</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><type-resolution.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -1102,7 +1735,13 @@ <h2>Function j2</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><type-resolution.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -1127,7 +1766,13 @@ <h2>Function j3</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><type-resolution.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -1152,7 +1797,13 @@ <h2>Function j4</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><type-resolution.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -1177,7 +1828,13 @@ <h2>Function j5</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><type-resolution.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -1202,7 +1859,13 @@ <h2>Function j6</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><type-resolution.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -1227,7 +1890,13 @@ <h2>Function j7</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><type-resolution.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -1252,7 +1921,13 @@ <h2>Function j8</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><type-resolution.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
diff --git a/test-files/golden-tests/union.adoc b/test-files/golden-tests/union.adoc
index 0d805f284c..73a3ddb5c9 100644
--- a/test-files/golden-tests/union.adoc
+++ b/test-files/golden-tests/union.adoc
@@ -24,7 +24,7 @@
 
 === Synopsis
 
-Declared in header `<union.cpp>`
+Declared in `<union.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -52,7 +52,7 @@ union A;
 
 === Synopsis
 
-Declared in header `<union.cpp>`
+Declared in `<union.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -69,7 +69,7 @@ int x;
 
 === Synopsis
 
-Declared in header `<union.cpp>`
+Declared in `<union.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -86,7 +86,7 @@ bool y;
 
 === Synopsis
 
-Declared in header `<union.cpp>`
+Declared in `<union.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -116,7 +116,7 @@ struct B;
 
 === Synopsis
 
-Declared in header `<union.cpp>`
+Declared in `<union.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -133,7 +133,7 @@ int x;
 
 === Synopsis
 
-Declared in header `<union.cpp>`
+Declared in `<union.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -150,7 +150,7 @@ bool y;
 
 === Synopsis
 
-Declared in header `<union.cpp>`
+Declared in `<union.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
diff --git a/test-files/golden-tests/union.html b/test-files/golden-tests/union.html
index 132dd659e8..76318a47ea 100644
--- a/test-files/golden-tests/union.html
+++ b/test-files/golden-tests/union.html
@@ -1,4 +1,4 @@
-</html>
+<html>
     <head></head>
     <body>
         <div>
@@ -11,10 +11,38 @@ <h1>Reference</h1>
         <h2>Global namespace</h2>
     </div>
     <div>
-            <div>
-                <h3> Types</h3>
-                    </div>
-    </div>
+        <div>
+            <h3> Types</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">A</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">B</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
+                </div>
 </div>
 
 [#[object Object]]
@@ -29,7 +57,13 @@ <h2>Class A</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><union.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             union A;
@@ -37,10 +71,38 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-            <div>
+                    <div>
                 <h3> Data Members</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">x</a> <span class="small">[variant member]</span>
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">y</a> <span class="small">[variant member]</span>
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                            </div>
 
 
 </div>
@@ -49,8 +111,7 @@ <h3> Data Members</h3>
 
 <div id="[object Object]">
     <div>
-        <h2><a href="#">A</a>::
-x</h2>
+        <h2>A::x</h2>
         
     </div>
 
@@ -58,7 +119,13 @@ <h2><a href="#">A</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><union.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             int x;
@@ -71,8 +138,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2><a href="#">A</a>::
-y</h2>
+        <h2>A::y</h2>
         
     </div>
 
@@ -80,7 +146,13 @@ <h2><a href="#">A</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><union.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             bool y;
@@ -101,7 +173,13 @@ <h2>Class B</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><union.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct B;
@@ -109,10 +187,45 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-            <div>
+                    <div>
                 <h3> Data Members</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">x</a> <span class="small">[variant member]</span>
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">y</a> <span class="small">[variant member]</span>
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">z</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                            </div>
 
 
 </div>
@@ -121,8 +234,7 @@ <h3> Data Members</h3>
 
 <div id="[object Object]">
     <div>
-        <h2><a href="#">B</a>::
-x</h2>
+        <h2>B::x</h2>
         
     </div>
 
@@ -130,7 +242,13 @@ <h2><a href="#">B</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><union.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             int x;
@@ -143,8 +261,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2><a href="#">B</a>::
-y</h2>
+        <h2>B::y</h2>
         
     </div>
 
@@ -152,7 +269,13 @@ <h2><a href="#">B</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><union.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             bool y;
@@ -165,8 +288,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2><a href="#">B</a>::
-z</h2>
+        <h2>B::z</h2>
         
     </div>
 
@@ -174,7 +296,13 @@ <h2><a href="#">B</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><union.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             int z;
diff --git a/test-files/golden-tests/using-1.html b/test-files/golden-tests/using-1.html
index 21aaa5de6d..99e790d6f7 100644
--- a/test-files/golden-tests/using-1.html
+++ b/test-files/golden-tests/using-1.html
@@ -1,4 +1,4 @@
-</html>
+<html>
     <head></head>
     <body>
         <div>
@@ -11,10 +11,31 @@ <h1>Reference</h1>
         <h2>Global namespace</h2>
     </div>
     <div>
-            <div>
-                <h3> Namespaces</h3>
-                    </div>
-    </div>
+        <div>
+            <h3>Namespaces</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">LongName</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
+                </div>
 </div>
 
 [#[object Object]]
@@ -24,7 +45,7 @@ <h3> Namespaces</h3>
         <h2>Namespace LongName</h2>
     </div>
     <div>
-            </div>
+                        </div>
 </div>
         </div>
         <div><h4>Created with MrDocs</h4></div>
diff --git a/test-files/golden-tests/using-2.adoc b/test-files/golden-tests/using-2.adoc
index 1f31689421..849d57230c 100644
--- a/test-files/golden-tests/using-2.adoc
+++ b/test-files/golden-tests/using-2.adoc
@@ -37,7 +37,7 @@
 
 === Synopsis
 
-Declared in header `<using-2.cpp>`
+Declared in `<using-2.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -56,7 +56,7 @@ struct S1;
 
 === Synopsis
 
-Declared in header `<using-2.cpp>`
+Declared in `<using-2.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -75,7 +75,7 @@ struct S2;
 
 === Synopsis
 
-Declared in header `<using-2.cpp>`
+Declared in `<using-2.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -100,7 +100,7 @@ using xref:LongName.adoc[LongName]::S1;
 
 === Synopsis
 
-Declared in header `<using-2.cpp>`
+Declared in `<using-2.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
diff --git a/test-files/golden-tests/using-2.html b/test-files/golden-tests/using-2.html
index ee4c3a2511..ea775cdf95 100644
--- a/test-files/golden-tests/using-2.html
+++ b/test-files/golden-tests/using-2.html
@@ -1,4 +1,4 @@
-</html>
+<html>
     <head></head>
     <body>
         <div>
@@ -11,13 +11,31 @@ <h1>Reference</h1>
         <h2>Global namespace</h2>
     </div>
     <div>
-            <div>
-                <h3> Namespaces</h3>
-                    </div>
-    <div>
-                <h3> Using Declarations</h3>
-                    </div>
-    </div>
+        <div>
+            <h3>Namespaces</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">LongName</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
+                </div>
 </div>
 
 [#[object Object]]
@@ -27,10 +45,38 @@ <h3> Using Declarations</h3>
         <h2>Namespace LongName</h2>
     </div>
     <div>
-            <div>
-                <h3> Types</h3>
-                    </div>
-    </div>
+        <div>
+            <h3> Types</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">S1</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">S2</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
+                </div>
 </div>
 
 [#[object Object]]
@@ -45,7 +91,13 @@ <h2>Class S1</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><using-2.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct S1;
@@ -53,7 +105,7 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-                            </div>
+                                                                                                                </div>
 
 
 </div>
@@ -70,7 +122,13 @@ <h2>Class S2</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><using-2.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct S2;
@@ -78,7 +136,7 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-                            </div>
+                                                                                                                </div>
 
 
 </div>
@@ -95,7 +153,13 @@ <h2>Using Declaration: S1</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><using-2.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             using LongName::S1
@@ -130,7 +194,13 @@ <h2>Using Declaration: S2</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><using-2.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             using LongName::S2
diff --git a/test-files/golden-tests/using-3.adoc b/test-files/golden-tests/using-3.adoc
index 18da6e1ade..cf8f3a1014 100644
--- a/test-files/golden-tests/using-3.adoc
+++ b/test-files/golden-tests/using-3.adoc
@@ -26,7 +26,7 @@
 
 === Synopsis
 
-Declared in header `<using-3.cpp>`
+Declared in `<using-3.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -52,7 +52,7 @@ struct A;
 
 === Synopsis
 
-Declared in header `<using-3.cpp>`
+Declared in `<using-3.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -76,7 +76,7 @@ f(int);
 
 === Synopsis
 
-Declared in header `<using-3.cpp>`
+Declared in `<using-3.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -102,7 +102,7 @@ struct B;
 
 === Synopsis
 
-Declared in header `<using-3.cpp>`
+Declared in `<using-3.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -126,7 +126,7 @@ f(bool);
 
 === Synopsis
 
-Declared in header `<using-3.cpp>`
+Declared in `<using-3.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -162,7 +162,7 @@ struct C
 
 === Synopsis
 
-Declared in header `<using-3.cpp>`
+Declared in `<using-3.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -187,7 +187,7 @@ using xref:A.adoc[A]::f;
 
 === Synopsis
 
-Declared in header `<using-3.cpp>`
+Declared in `<using-3.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
diff --git a/test-files/golden-tests/using-3.html b/test-files/golden-tests/using-3.html
index 30f736f169..1fc6af4bb3 100644
--- a/test-files/golden-tests/using-3.html
+++ b/test-files/golden-tests/using-3.html
@@ -1,4 +1,4 @@
-</html>
+<html>
     <head></head>
     <body>
         <div>
@@ -11,10 +11,45 @@ <h1>Reference</h1>
         <h2>Global namespace</h2>
     </div>
     <div>
-            <div>
-                <h3> Types</h3>
-                    </div>
-    </div>
+        <div>
+            <h3> Types</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">A</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">B</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">C</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
+                </div>
 </div>
 
 [#[object Object]]
@@ -29,7 +64,13 @@ <h2>Class A</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><using-3.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct A;
@@ -39,8 +80,29 @@ <h3>Synopsis</h3>
     <div>
             <div>
                 <h3> Member Functions</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                                    </div>
 
 
 </div>
@@ -49,8 +111,7 @@ <h3> Member Functions</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">A</a>::
-f</h2>
+        <h2>Function A::f</h2>
         
     </div>
 
@@ -58,7 +119,13 @@ <h2>Function <a href="#">A</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><using-3.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -83,7 +150,13 @@ <h2>Class B</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><using-3.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct B;
@@ -93,8 +166,29 @@ <h3>Synopsis</h3>
     <div>
             <div>
                 <h3> Member Functions</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                                    </div>
 
 
 </div>
@@ -103,8 +197,7 @@ <h3> Member Functions</h3>
 
 <div id="[object Object]">
     <div>
-        <h2>Function <a href="#">B</a>::
-f</h2>
+        <h2>Function B::f</h2>
         
     </div>
 
@@ -112,7 +205,13 @@ <h2>Function <a href="#">B</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><using-3.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -137,7 +236,13 @@ <h2>Class C</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><using-3.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct C
@@ -149,11 +254,59 @@ <h3>Synopsis</h3>
     <div>
             <div>
                 <h3> Member Functions</h3>
-                    </div>
-    <div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f</a> 
+                                </td>
+                                <td>
+    </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                        <div>
                 <h3> Using Declarations</h3>
-                    </div>
-                    </div>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">f</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                            </div>
 
 
 </div>
@@ -170,7 +323,13 @@ <h2>Using Declaration: f</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><using-3.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             using A::f
@@ -205,7 +364,13 @@ <h2>Using Declaration: f</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><using-3.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             using B::f
diff --git a/test-files/golden-tests/utf-8.adoc b/test-files/golden-tests/utf-8.adoc
index 6bb822f7aa..da4a311a80 100644
--- a/test-files/golden-tests/utf-8.adoc
+++ b/test-files/golden-tests/utf-8.adoc
@@ -22,7 +22,7 @@
 
 === Synopsis
 
-Declared in header `<utf-8.cpp>`
+Declared in `<utf-8.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
diff --git a/test-files/golden-tests/utf-8.html b/test-files/golden-tests/utf-8.html
index cbf4e8886e..0815ae2b0b 100644
--- a/test-files/golden-tests/utf-8.html
+++ b/test-files/golden-tests/utf-8.html
@@ -1,4 +1,4 @@
-</html>
+<html>
     <head></head>
     <body>
         <div>
@@ -12,9 +12,30 @@ <h2>Global namespace</h2>
     </div>
     <div>
             <div>
-                <h3> Member Functions</h3>
-                    </div>
-    </div>
+                <h3>Functions</h3>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">Христос_воскрес</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+            </div>
 </div>
 
 [#[object Object]]
@@ -29,7 +50,13 @@ <h2>Function Христос_воскрес</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><utf-8.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             bool
diff --git a/test-files/golden-tests/var-template.adoc b/test-files/golden-tests/var-template.adoc
index f071f9ff76..483649589b 100644
--- a/test-files/golden-tests/var-template.adoc
+++ b/test-files/golden-tests/var-template.adoc
@@ -33,7 +33,7 @@
 
 === Synopsis
 
-Declared in header `<var-template.cpp>`
+Declared in `<var-template.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -51,7 +51,7 @@ unsigned int A = sizeof(T);
 
 === Synopsis
 
-Declared in header `<var-template.cpp>`
+Declared in `<var-template.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -69,7 +69,7 @@ unsigned int xref:A-084.adoc[pass:[A]]<void> = 0;
 
 === Synopsis
 
-Declared in header `<var-template.cpp>`
+Declared in `<var-template.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -87,7 +87,7 @@ unsigned int xref:A-084.adoc[pass:[A]]<T&> = sizeof(T);
 
 === Synopsis
 
-Declared in header `<var-template.cpp>`
+Declared in `<var-template.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -117,7 +117,7 @@ struct B;
 
 === Synopsis
 
-Declared in header `<var-template.cpp>`
+Declared in `<var-template.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -136,7 +136,7 @@ unsigned int C = 0;
 
 === Synopsis
 
-Declared in header `<var-template.cpp>`
+Declared in `<var-template.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -155,7 +155,7 @@ unsigned int xref:B/C-0e.adoc[pass:[C]]<int> = -1;
 
 === Synopsis
 
-Declared in header `<var-template.cpp>`
+Declared in `<var-template.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
diff --git a/test-files/golden-tests/var-template.html b/test-files/golden-tests/var-template.html
index c7c7471d24..0c18241a0e 100644
--- a/test-files/golden-tests/var-template.html
+++ b/test-files/golden-tests/var-template.html
@@ -1,4 +1,4 @@
-</html>
+<html>
     <head></head>
     <body>
         <div>
@@ -11,13 +11,69 @@ <h1>Reference</h1>
         <h2>Global namespace</h2>
     </div>
     <div>
-            <div>
-                <h3> Types</h3>
-                    </div>
-    <div>
-                <h3> Variables</h3>
-                    </div>
-    </div>
+        <div>
+            <h3> Types</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">B</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
+        <div>
+                <h3>Variables</h3>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">A</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">A<void></a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">A<T&></a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+        </div>
 </div>
 
 [#[object Object]]
@@ -32,7 +88,13 @@ <h2>A</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><var-template.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<typename T>
@@ -54,7 +116,13 @@ <h2>A</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><var-template.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<>
@@ -76,7 +144,13 @@ <h2>A</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><var-template.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<typename T>
@@ -98,7 +172,13 @@ <h2>Class B</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><var-template.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             struct B;
@@ -106,10 +186,45 @@ <h3>Synopsis</h3>
     </div>
 
     <div>
-            <div>
-                <h3> Variables</h3>
-                    </div>
-                    </div>
+                        <div>
+                <h3> Static Data Members</h3>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">C</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">C<int></a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">C<T*></a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
+                                                                                        </div>
 
 
 </div>
@@ -118,8 +233,7 @@ <h3> Variables</h3>
 
 <div id="[object Object]">
     <div>
-        <h2><a href="#">B</a>::
-C</h2>
+        <h2>B::C</h2>
         
     </div>
 
@@ -127,7 +241,13 @@ <h2><a href="#">B</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><var-template.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<typename T>
@@ -142,8 +262,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2><a href="#">B</a>::
-C</h2>
+        <h2>B::C</h2>
         
     </div>
 
@@ -151,7 +270,13 @@ <h2><a href="#">B</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><var-template.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<>
@@ -166,8 +291,7 @@ <h3>Synopsis</h3>
 
 <div id="[object Object]">
     <div>
-        <h2><a href="#">B</a>::
-C</h2>
+        <h2>B::C</h2>
         
     </div>
 
@@ -175,7 +299,13 @@ <h2><a href="#">B</a>::
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><var-template.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<typename T>
diff --git a/test-files/golden-tests/variadic-function.adoc b/test-files/golden-tests/variadic-function.adoc
index 43998d2640..baf3cdf1f4 100644
--- a/test-files/golden-tests/variadic-function.adoc
+++ b/test-files/golden-tests/variadic-function.adoc
@@ -35,7 +35,7 @@
 
 === Synopsis
 
-Declared in header `<variadic-function.cpp>`
+Declared in `<variadic-function.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -52,7 +52,7 @@ using T = void(...);
 
 === Synopsis
 
-Declared in header `<variadic-function.cpp>`
+Declared in `<variadic-function.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -69,7 +69,7 @@ using U = void(int, ...);
 
 === Synopsis
 
-Declared in header `<variadic-function.cpp>`
+Declared in `<variadic-function.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -93,7 +93,7 @@ f(...);
 
 === Synopsis
 
-Declared in header `<variadic-function.cpp>`
+Declared in `<variadic-function.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
@@ -117,7 +117,7 @@ g(int, ...);
 
 === Synopsis
 
-Declared in header `<variadic-function.cpp>`
+Declared in `<variadic-function.cpp>`
 
 [source,cpp,subs="verbatim,macros,-callouts"]
 ----
diff --git a/test-files/golden-tests/variadic-function.html b/test-files/golden-tests/variadic-function.html
index b13d08e136..b4177513c8 100644
--- a/test-files/golden-tests/variadic-function.html
+++ b/test-files/golden-tests/variadic-function.html
@@ -1,4 +1,4 @@
-</html>
+<html>
     <head></head>
     <body>
         <div>
@@ -11,16 +11,76 @@ <h1>Reference</h1>
         <h2>Global namespace</h2>
     </div>
     <div>
-            <div>
-                <h3> Types</h3>
-                    </div>
+        <div>
+            <h3> Types</h3>
+            <table>
+                <colgroup>
+                    <col style="width: 50%;">
+                    <col style="width: 50%;">
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+                <tbody>
+                <tr>
+                            <td>
+                                <a href="">C</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">T</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>                <tr>
+                            <td>
+                                <a href="">U</a> 
+                            </td>
+                            <td>
+
+                                    </td>
+                        </tr>        </tbody>
+            </table>
+        </div>
     <div>
-            <h3>Types</h3>
+                <h3>Functions</h3>
+                <table>
+                    <colgroup>
+                        <col style="width: 50%;">
+                        <col style="width: 50%;">
+                    </colgroup>
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                <tr>
+                                <td>
+                                    <a href="">f</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>                <tr>
+                                <td>
+                                    <a href="">g</a> 
+                                </td>
+                                <td>
+
+                                        </td>
+                            </tr>        </tbody>
+                </table>
+            </div>
             </div>
-    <div>
-                <h3> Member Functions</h3>
-                    </div>
-    </div>
 </div>
 
 [#[object Object]]
@@ -35,10 +95,16 @@ <h2>T</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><variadic-function.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
-            using T = void();
+            using T = void(...);
         </pre>
     </div>
 
@@ -56,10 +122,16 @@ <h2>U</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><variadic-function.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
-            using U = void(int);
+            using U = void(int, ...);
         </pre>
     </div>
 
@@ -77,7 +149,13 @@ <h2>Function f</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><variadic-function.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -102,7 +180,13 @@ <h2>Function g</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><variadic-function.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             void
@@ -127,18 +211,24 @@ <h2>Class C</h2>
         <h3>Synopsis</h3>
         <div>
             <code>
-                            </code>
+                <p>
+                    <span>
+                        Declared in <code><variadic-function.cpp></code>
+                    </span>
+                </p>
+                
+            </code>
         </div>
         <pre class="source-code cpp">
             template<
-    typename A = void(),
-    typename B = void(int)>
+    typename A = void(...),
+    typename B = void(int, ...)>
 struct C;
         </pre>
     </div>
 
     <div>
-                            </div>
+                                                                                                                </div>
 
 
 </div>